diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 90b388dcb0c1..36a73658a457 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -65,7 +65,7 @@ FrameGrabber::FrameGrabber( const OUString &rURL ) : "uridecodebin uri=%s ! videoconvert ! videoscale ! appsink " "name=sink caps=\"video/x-raw,format=RGB,pixel-aspect-ratio=1/1\"", #endif - rtl::OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); GError *pError = NULL; mpPipeline = gst_parse_launch( pPipelineStr, &pError ); diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 6d23f2004fb2..14fecf3b5253 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -351,7 +351,7 @@ void Player::preparePlaybin( const OUString& rURL, GstElement *pSink ) else mbFakeVideo = false; - rtl::OString ascURL = OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ); + OString ascURL = OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ); g_object_set( G_OBJECT( mpPlaybin ), "uri", ascURL.getStr() , NULL ); pBus = gst_element_get_bus( mpPlaybin ); diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx index 325e6d4fa676..71e57792c64f 100644 --- a/avmedia/source/viewer/mediawindowbase_impl.cxx +++ b/avmedia/source/viewer/mediawindowbase_impl.cxx @@ -50,7 +50,7 @@ MediaWindowBaseImpl::~MediaWindowBaseImpl() // ------------------------------------------------------------------------- -uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl::OUString& rURL ) +uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const OUString& rURL ) { uno::Reference< media::XPlayer > xPlayer; uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -66,7 +66,7 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl: for( sal_uInt32 i = 0; !xPlayer.is() && i < SAL_N_ELEMENTS( aServiceManagers ); ++i ) { - const rtl::OUString aServiceName( aServiceManagers[ i ], + const OUString aServiceName( aServiceManagers[ i ], strlen( aServiceManagers[ i ] ), RTL_TEXTENCODING_ASCII_US ); diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index 3add351089f2..48413feb9a4c 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -123,13 +123,13 @@ void SAL_CALL SIDEModel::store() throw (io::IOException, uno::RuntimeException) notImplemented(); } -void SAL_CALL SIDEModel::storeAsURL( const ::rtl::OUString&, const uno::Sequence< beans::PropertyValue >& ) +void SAL_CALL SIDEModel::storeAsURL( const OUString&, const uno::Sequence< beans::PropertyValue >& ) throw (io::IOException, uno::RuntimeException) { notImplemented(); } -void SAL_CALL SIDEModel::storeToURL( const ::rtl::OUString&, +void SAL_CALL SIDEModel::storeToURL( const OUString&, const uno::Sequence< beans::PropertyValue >& ) throw (io::IOException, uno::RuntimeException) { diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index cf9eb35d887b..ba1d2193c95d 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -55,10 +55,10 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { notImplemented(); } // XStorable virtual void SAL_CALL store() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeAsURL( const ::rtl::OUString& sURL, + virtual void SAL_CALL storeAsURL( const OUString& sURL, const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& seqArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeToURL( const ::rtl::OUString& sURL, + virtual void SAL_CALL storeToURL( const OUString& sURL, const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& seqArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx index 67fa17f0c433..e397a5cae89f 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx @@ -117,7 +117,7 @@ namespace basegfx @return true, if the string was successfully parsed */ BASEGFX_DLLPUBLIC bool importFromSvgD( B2DPolyPolygon& o_rPolyPoly, - const ::rtl::OUString& rSvgDAttribute, bool bWrongPositionAfterZ = false ); + const OUString& rSvgDAttribute, bool bWrongPositionAfterZ = false ); /** Read poly-polygon from SVG. @@ -134,7 +134,7 @@ namespace basegfx @return true, if the string was successfully parsed */ BASEGFX_DLLPUBLIC bool importFromSvgPoints( B2DPolygon& o_rPoly, - const ::rtl::OUString& rSvgPointsAttribute ); + const OUString& rSvgPointsAttribute ); // grow for polyPolygon. Move all geometry in each point in the direction of the normal in that point @@ -211,7 +211,7 @@ namespace basegfx @return the generated SVG-D statement (the XML d attribute value alone, without any "" or "d="...") */ - BASEGFX_DLLPUBLIC ::rtl::OUString exportToSvgD( const B2DPolyPolygon& rPolyPoly, + BASEGFX_DLLPUBLIC OUString exportToSvgD( const B2DPolyPolygon& rPolyPoly, bool bUseRelativeCoordinates=true, bool bDetectQuadraticBeziers=true ); diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/basegfx/inc/basegfx/tools/unopolypolygon.hxx index 71ddc64323a5..72ed9418663a 100644 --- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx +++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx @@ -70,9 +70,9 @@ namespace unotools virtual void SAL_CALL setBezierSegment( const ::com::sun::star::geometry::RealBezierSegment2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); B2DPolyPolygon getPolyPolygon() const; diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 4abcf6c00468..67ecb3e32d0b 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -55,10 +55,10 @@ namespace basegfx2d class b2dsvgdimpex : public CppUnit::TestFixture { private: - ::rtl::OUString aPath0; - ::rtl::OUString aPath1; - ::rtl::OUString aPath2; - ::rtl::OUString aPath3; + OUString aPath0; + OUString aPath1; + OUString aPath2; + OUString aPath3; public: // initialise your test code values here. @@ -139,7 +139,7 @@ public: void impex() { B2DPolyPolygon aPoly; - ::rtl::OUString aExport; + OUString aExport; CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D", tools::importFromSvgD( aPoly, diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index fb084e85a03c..a296871d7fe9 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -165,7 +165,7 @@ public: B2DPolyPolygon randomPoly; tools::importFromSvgD( randomPoly, - rtl::OUString::createFromAscii(randomSvg)); + OUString::createFromAscii(randomSvg)); std::for_each(randomPoly.begin(), randomPoly.end(), boost::bind( @@ -241,9 +241,9 @@ public: CPPUNIT_ASSERT_MESSAGE(sName, tools::importFromSvgD( aTmp1, - rtl::OUString::createFromAscii(sSvg))); + OUString::createFromAscii(sSvg))); - const rtl::OUString aSvg= + const OUString aSvg= tools::exportToSvgD(toTest.solveCrossovers()); B2DPolyPolygon aTmp2; CPPUNIT_ASSERT_MESSAGE(sName, @@ -320,7 +320,7 @@ public: (void)pName; (void)rPoly; #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( basegfx::tools::exportToSvgD(rPoly), RTL_TEXTENCODING_UTF8).getStr() ); #endif @@ -363,32 +363,32 @@ public: #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s input - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( basegfx::tools::exportToSvgD( genericClip), RTL_TEXTENCODING_UTF8).getStr() ); #endif const B2DPolyPolygon boxClipResult=rRange.solveCrossovers(); - const rtl::OUString boxClipSvg( + const OUString boxClipSvg( basegfx::tools::exportToSvgD( normalizePoly( boxClipResult))); #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s boxclipper - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( boxClipSvg, RTL_TEXTENCODING_UTF8).getStr() ); #endif genericClip = tools::solveCrossovers(genericClip); - const rtl::OUString genericClipSvg( + const OUString genericClipSvg( basegfx::tools::exportToSvgD( normalizePoly( genericClip))); #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s genclipper - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( genericClipSvg, RTL_TEXTENCODING_UTF8).getStr() ); #endif diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx index 54346835c1b5..f2b0ef0e94b7 100644 --- a/basegfx/test/clipstate.cxx +++ b/basegfx/test/clipstate.cxx @@ -94,7 +94,7 @@ public: { #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s - svg:d=\"%s\"\n", - sName, rtl::OUStringToOString( + sName, OUStringToOString( basegfx::tools::exportToSvgD(toTest.getClipPoly()), RTL_TEXTENCODING_UTF8).getStr() ); #endif @@ -103,9 +103,9 @@ public: CPPUNIT_ASSERT_MESSAGE(sName, tools::importFromSvgD( aTmp1, - rtl::OUString::createFromAscii(sSvg))); + OUString::createFromAscii(sSvg))); - const rtl::OUString aSvg= + const OUString aSvg= tools::exportToSvgD(toTest.getClipPoly()); B2DPolyPolygon aTmp2; CPPUNIT_ASSERT_MESSAGE(sName, @@ -143,7 +143,7 @@ public: B2DPolyPolygon aTmp1; tools::importFromSvgD( aTmp1, - rtl::OUString::createFromAscii(unionSvg)); + OUString::createFromAscii(unionSvg)); aMixedClip.intersectPolyPolygon(aTmp1); aMixedClip.subtractRange(B2DRange(-20,-150,20,0)); diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx index 6b62ff5d94de..c1af17d369c5 100644 --- a/basegfx/test/genericclipper.cxx +++ b/basegfx/test/genericclipper.cxx @@ -77,12 +77,12 @@ public: tools::prepareForPolygonOperation(aShiftedRectangle)); #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s input LHS - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( basegfx::tools::exportToSvgD( aSelfIntersect), RTL_TEXTENCODING_UTF8).getStr() ); fprintf(stderr, "%s input RHS - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( basegfx::tools::exportToSvgD( aRect), RTL_TEXTENCODING_UTF8).getStr() ); @@ -93,12 +93,12 @@ public: #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "%s - svg:d=\"%s\"\n", - pName, rtl::OUStringToOString( + pName, OUStringToOString( basegfx::tools::exportToSvgD(aRes), RTL_TEXTENCODING_UTF8).getStr() ); #endif - rtl::OUString aValid=rtl::OUString::createFromAscii(pValidSvgD); + OUString aValid=OUString::createFromAscii(pValidSvgD); CPPUNIT_ASSERT_MESSAGE(pName, basegfx::tools::exportToSvgD(aRes) == aValid); @@ -132,8 +132,8 @@ public: const char* pInputSvgD, const char* pValidSvgD) { - rtl::OUString aInput=rtl::OUString::createFromAscii(pInputSvgD); - rtl::OUString aValid=rtl::OUString::createFromAscii(pValidSvgD); + OUString aInput=OUString::createFromAscii(pInputSvgD); + OUString aValid=OUString::createFromAscii(pValidSvgD); B2DPolyPolygon aInputPoly, aValidPoly; tools::importFromSvgD(aInputPoly, aInput); diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx index 9c731369d1be..12bca4779565 100644 --- a/basic/inc/basic/basmgr.hxx +++ b/basic/inc/basic/basmgr.hxx @@ -205,7 +205,7 @@ public: @param _out_rModuleNames takes the names of modules whose size exceeds the legacy limit */ - bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< rtl::OUString >& _out_rModuleNames ); + bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& _out_rModuleNames ); bool HasExeCode( const OUString& ); /// determines whether the Basic Manager has a given macro, given by fully qualified name bool HasMacro( OUString const& i_fullyQualifiedName ) const; diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx index 5d45d4bbc9c5..4c71d1a5b977 100644 --- a/basic/inc/basic/sbxcore.hxx +++ b/basic/inc/basic/sbxcore.hxx @@ -103,7 +103,7 @@ public: static void RemoveFactory( SbxFactory* ); static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX ); - static SbxObject* CreateObject( const rtl::OUString& ); + static SbxObject* CreateObject( const OUString& ); }; SV_DECL_REF(SbxBase) diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx index ce368dccf3b8..33035cf45c9b 100644 --- a/basic/inc/basic/sbxfac.hxx +++ b/basic/inc/basic/sbxfac.hxx @@ -35,7 +35,7 @@ public: SbxFactory( bool bLast=false ) { bHandleLast = bLast; } bool IsHandleLast( void ) { return bHandleLast; } virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ); - virtual SbxObject* CreateObject( const rtl::OUString& ); + virtual SbxObject* CreateObject( const OUString& ); }; #endif diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx index 56b9ab6a8412..073653b061ae 100644 --- a/basic/qa/cppunit/basic_coverage.cxx +++ b/basic/qa/cppunit/basic_coverage.cxx @@ -77,7 +77,7 @@ void Coverage::test_failed() void Coverage::test_success() { m_nb_tests_ok += 1; - fprintf(stderr,"%s,PASS\n", rtl::OUStringToOString( m_sCurrentTest, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf(stderr,"%s,PASS\n", OUStringToOString( m_sCurrentTest, RTL_TEXTENCODING_UTF8 ).getStr() ); } void Coverage::run_test(OUString sFileURL) diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx index c828f25fb42b..25ed568ce49f 100644 --- a/basic/qa/cppunit/basictest.hxx +++ b/basic/qa/cppunit/basictest.hxx @@ -152,7 +152,7 @@ IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/) { fprintf(stderr,"(%d:%d)\n", StarBASIC::GetLine(), StarBASIC::GetCol1()); - fprintf(stderr,"Basic error: %s\n", rtl::OUStringToOString( StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf(stderr,"Basic error: %s\n", OUStringToOString( StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() ); mbError = true; return 0; } diff --git a/basic/qa/cppunit/test_append.cxx b/basic/qa/cppunit/test_append.cxx index e3d9f6b6704f..ff6a56080bdc 100644 --- a/basic/qa/cppunit/test_append.cxx +++ b/basic/qa/cppunit/test_append.cxx @@ -32,7 +32,7 @@ namespace CPPUNIT_TEST_SUITE_END(); }; -rtl::OUString sTestEnableRuntime( +OUString sTestEnableRuntime( "Function doUnitTest as Integer\n" "Dim Enable as Integer\n" "Enable = 1\n" @@ -41,7 +41,7 @@ rtl::OUString sTestEnableRuntime( "End Function\n" ); -rtl::OUString sTestDimEnable( +OUString sTestDimEnable( "Sub doUnitTest\n" "Dim Enable as String\n" "End Sub\n" diff --git a/basic/qa/cppunit/test_nested_struct.cxx b/basic/qa/cppunit/test_nested_struct.cxx index 8c7fabcdec85..47bd726bd22c 100644 --- a/basic/qa/cppunit/test_nested_struct.cxx +++ b/basic/qa/cppunit/test_nested_struct.cxx @@ -53,7 +53,7 @@ namespace // tests the new behaviour, we should be able to // directly modify the value of the nested 'HorizontalLine' struct -rtl::OUString sTestSource1( +OUString sTestSource1( "Function doUnitTest() as Integer\n" "Dim b0 as new \"com.sun.star.table.TableBorder\"\n" "b0.HorizontalLine.OuterLineWidth = 9\n" @@ -61,7 +61,7 @@ rtl::OUString sTestSource1( "End Function\n" ); -rtl::OUString sTestSource1Alt( +OUString sTestSource1Alt( "Function doUnitTest() as Object\n" "Dim b0 as new \"com.sun.star.table.TableBorder\"\n" "b0.HorizontalLine.OuterLineWidth = 9\n" @@ -75,7 +75,7 @@ rtl::OUString sTestSource1Alt( // b) cloning the new instance with the value of b0.HorizontalLine // c) modifying the new instance // d) setting b0.HorizontalLine with the value of the new instance -rtl::OUString sTestSource2( +OUString sTestSource2( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n" "l = b0.HorizontalLine\n" @@ -85,7 +85,7 @@ rtl::OUString sTestSource2( "End Function\n" ); -rtl::OUString sTestSource2Alt( +OUString sTestSource2Alt( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n" "l = b0.HorizontalLine\n" @@ -99,7 +99,7 @@ rtl::OUString sTestSource2Alt( // a reference copy of b0.HorizontalLine, each one should have an // OuterLineWidth of 4 & 9 respectively and we should be returning // 13 the sum of the two ( hopefully unique values if we haven't copied by reference ) -rtl::OUString sTestSource3( +OUString sTestSource3( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\"\n" "l = b0.HorizontalLine\n" @@ -110,7 +110,7 @@ rtl::OUString sTestSource3( "End Function\n" ); -rtl::OUString sTestSource3Alt( +OUString sTestSource3Alt( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\"\n" "l = b0.HorizontalLine\n" @@ -126,7 +126,7 @@ rtl::OUString sTestSource3Alt( // nearly the same as above but this time for a fixed type // variable -rtl::OUString sTestSource4( +OUString sTestSource4( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n" "l = b0.HorizontalLine\n" @@ -137,7 +137,7 @@ rtl::OUString sTestSource4( "End Function\n" ); -rtl::OUString sTestSource4Alt( +OUString sTestSource4Alt( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n" "l = b0.HorizontalLine\n" @@ -156,7 +156,7 @@ rtl::OUString sTestSource4Alt( // in the debugger shows the expected values ) // We need to additionally check the actual uno struct to see if the // changes made are *really* reflected in the object -rtl::OUString sTestSource5( +OUString sTestSource5( "Function doUnitTest() as Object\n" "Dim aWinDesc as new \"com.sun.star.awt.WindowDescriptor\"\n" "Dim aRect as new \"com.sun.star.awt.Rectangle\"\n" diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 6ff0b9203b78..8a4412d1b5c5 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -351,7 +351,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) for( i = 0; i < nStrings; i++ ) { sal_uInt16 nOff = (sal_uInt16) pStringOff[ i ]; - rtl::OString aStr(rtl::OUStringToOString(rtl::OUString(pStrings + nOff), eCharSet)); + OString aStr(OUStringToOString(OUString(pStrings + nOff), eCharSet)); memcpy( pByteStrings + nOff, aStr.getStr(), (aStr.getLength() + 1) * sizeof( char ) ); } r << (sal_uInt32) nStringSize; diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index abf94b05621e..63347374e08b 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1058,7 +1058,7 @@ SbModule* StarBASIC::MakeModule32( const OUString& rName, const OUString& rSrc ) SbModule* StarBASIC::MakeModule32( const OUString& rName, const ModuleInfo& mInfo, const OUString& rSrc ) { - OSL_TRACE("create module %s type mInfo %d", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType ); + OSL_TRACE("create module %s type mInfo %d", OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType ); SbModule* p = NULL; switch ( mInfo.ModuleType ) { diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index b10d00c63d8f..f16fc449c88c 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -296,7 +296,7 @@ SbUnoObject* createOLEObject_Impl( const OUString& aType ) Any aAny; aAny <<= xOLEObject; pUnoObj = new SbUnoObject( aType, aAny ); - ::rtl::OUString sDfltPropName; + OUString sDfltPropName; if ( SbUnoObject::getDefaultPropName( pUnoObj, sDfltPropName ) ) pUnoObj->SetDfltProperty( sDfltPropName ); diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 7592943d77a5..a48bffca4ba9 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2668,7 +2668,7 @@ void SbUserFormModule::InitObject() aArgs[ 0 ] = uno::Any(); aArgs[ 1 ] <<= m_xDialog; aArgs[ 2 ] <<= m_xModel; - aArgs[ 3 ] <<= rtl::OUString( GetParent()->GetName() ); + aArgs[ 3 ] <<= OUString( GetParent()->GetName() ); pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( "ooo.vba.msforms.UserForm", aArgs ) ) ); uno::Reference< lang::XComponent > xComponent( m_xDialog, uno::UNO_QUERY_THROW ); diff --git a/basic/source/comp/basiccharclass.cxx b/basic/source/comp/basiccharclass.cxx index 23d814409de7..529be3fb287e 100644 --- a/basic/source/comp/basiccharclass.cxx +++ b/basic/source/comp/basiccharclass.cxx @@ -102,7 +102,7 @@ bool BasicCharClass::isLetterUnicode( sal_Unicode c ) if( pCharClass == NULL ) pCharClass = new CharClass( Application::GetSettings().GetLanguageTag() ); // can we get pCharClass to accept a sal_Unicode instead of this waste? - return pCharClass->isLetter( rtl::OUString(c), 0 ); + return pCharClass->isLetter( OUString(c), 0 ); } bool BasicCharClass::isAlpha( sal_Unicode c, bool bCompatible ) diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx index e3312c91e9c4..b08d352eb318 100644 --- a/basic/source/comp/buffer.cxx +++ b/basic/source/comp/buffer.cxx @@ -238,7 +238,7 @@ bool SbiBuffer::operator +=( const OUString& n ) sal_uInt32 len = n.getLength() + 1; if( Check( len ) ) { - rtl::OString aByteStr(rtl::OUStringToOString(n, osl_getThreadTextEncoding())); + OString aByteStr(OUStringToOString(n, osl_getThreadTextEncoding())); memcpy( pCur, aByteStr.getStr(), len ); pCur += len; nOff += len; diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index c17ecbb6648b..32b1d84a9e79 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -243,7 +243,7 @@ void SbiCodeGen::Save() aPropName = aPropName.copy( aIfaceName.getLength() + 1 ); } OSL_TRACE("*** getProcedureProperty for thing %s", - rtl::OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() ); rMod.GetProcedureProperty( aPropName, ePropType ); } if( nPass == 1 ) diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index 3f79a2874092..81f6effee2bf 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -129,7 +129,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, bool bAsNewAlreadyParsed ) // #52709 DIM AS NEW for Uno with full-qualified name if( Peek() == DOT ) { - rtl::OUString aDotStr( '.' ); + OUString aDotStr( '.' ); while( Peek() == DOT ) { aCompleteName += aDotStr; @@ -663,8 +663,8 @@ void SbiParser::DefType( bool bPrivate ) } } - pType->Remove( rtl::OUString("Name"), SbxCLASS_DONTCARE ); - pType->Remove( rtl::OUString("Parent"), SbxCLASS_DONTCARE ); + pType->Remove( OUString("Name"), SbxCLASS_DONTCARE ); + pType->Remove( OUString("Parent"), SbxCLASS_DONTCARE ); rTypeArray->Insert (pType,rTypeArray->Count()); } @@ -800,8 +800,8 @@ void SbiParser::DefEnum( bool bPrivate ) } } - pEnum->Remove( rtl::OUString("Name"), SbxCLASS_DONTCARE ); - pEnum->Remove( rtl::OUString("Parent"), SbxCLASS_DONTCARE ); + pEnum->Remove( OUString("Name"), SbxCLASS_DONTCARE ); + pEnum->Remove( OUString("Parent"), SbxCLASS_DONTCARE ); rEnumArray->Insert( pEnum, rEnumArray->Count() ); } diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index 85d91aeac257..20d5262aafb1 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -223,8 +223,8 @@ static void lcl_ReadIniFile( const char* pIniFileName ) struct TraceTextData { - rtl::OString m_aTraceStr_STMNT; - rtl::OString m_aTraceStr_PCode; + OString m_aTraceStr_STMNT; + OString m_aTraceStr_PCode; }; typedef std::hash_map< sal_Int32, TraceTextData > PCToTextDataMap; typedef std::hash_map< OUString, PCToTextDataMap*, OUStringHash, ::std::equal_to< OUString > > ModuleTraceMap; @@ -257,11 +257,11 @@ const char* lcl_getSpaces( int nSpaceCount ) return pSpacesEnd - nSpaceCount; } -static rtl::OString lcl_toOStringSkipLeadingWhites( const OUString& aStr ) +static OString lcl_toOStringSkipLeadingWhites( const OUString& aStr ) { static sal_Char Buffer[1000]; - rtl::OString aOStr = OUStringToOString( OUString( aStr ), RTL_TEXTENCODING_ASCII_US ); + OString aOStr = OUStringToOString( OUString( aStr ), RTL_TEXTENCODING_ASCII_US ); const sal_Char* pStr = aOStr.getStr(); // Skip whitespace @@ -276,7 +276,7 @@ static rtl::OString lcl_toOStringSkipLeadingWhites( const OUString& aStr ) strncpy( Buffer, pStr, nLen ); Buffer[nLen] = 0; - rtl::OString aORetStr( Buffer ); + OString aORetStr( Buffer ); return aORetStr; } @@ -591,7 +591,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl ) int nIndent = nCallLvl * GnIndentPerCallLevel; const TraceTextData& rTraceTextData = itInner->second; - const rtl::OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT; + const OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT; bool bSTMT = false; if( rStr_STMNT.getLength() ) { @@ -626,7 +626,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl ) } nIndent += GnIndentForPCode; - const rtl::OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode; + const OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode; if( rStr_PCode.getLength() ) { lcl_lineOut( rStr_PCode.getStr(), lcl_getSpaces( nIndent ), @@ -837,7 +837,7 @@ void dbg_traceNotifyError( SbError nTraceErr, const OUString& aTraceErrMsg, #endif GnLastCallLvl = nCallLvl; - rtl::OString aOTraceErrMsg = OUStringToOString( OUString( aTraceErrMsg ), RTL_TEXTENCODING_ASCII_US ); + OString aOTraceErrMsg = OUStringToOString( OUString( aTraceErrMsg ), RTL_TEXTENCODING_ASCII_US ); char Buffer[200]; const char* pHandledStr = bTraceErrHandled ? " / HANDLED" : ""; @@ -864,10 +864,10 @@ void dbg_RegisterTraceTextForPC( SbModule* pModule, sal_uInt32 nPC, TraceTextData aData; - rtl::OString aOTraceStr_STMNT = lcl_toOStringSkipLeadingWhites( aTraceStr_STMNT ); + OString aOTraceStr_STMNT = lcl_toOStringSkipLeadingWhites( aTraceStr_STMNT ); aData.m_aTraceStr_STMNT = aOTraceStr_STMNT; - rtl::OString aOTraceStr_PCode = lcl_toOStringSkipLeadingWhites( aTraceStr_PCode ); + OString aOTraceStr_PCode = lcl_toOStringSkipLeadingWhites( aTraceStr_PCode ); aData.m_aTraceStr_PCode = aOTraceStr_PCode; (*pInnerMap)[nPC] = aData; diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index 005ae381ebcc..0a5e3a22c04c 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -43,7 +43,7 @@ SbiStringPool::SbiStringPool( SbiParser* p ) SbiStringPool::~SbiStringPool() {} -const rtl::OUString& SbiStringPool::Find( sal_uInt32 n ) const +const OUString& SbiStringPool::Find( sal_uInt32 n ) const { if( n == 0 || n > aData.size() ) return aEmpty; //hack, returning a reference to a simulation of null @@ -77,7 +77,7 @@ short SbiStringPool::Add( double n, SbxDataType t ) case SbxDOUBLE: snprintf( buf, sizeof(buf), "%.16g", n ); break; default: break; } - return Add( rtl::OUString::createFromAscii( buf ) ); + return Add( OUString::createFromAscii( buf ) ); } /*************************************************************************** diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx index 2f35789d33e0..d6d6c6aab6bf 100644 --- a/basic/source/inc/iosys.hxx +++ b/basic/source/inc/iosys.hxx @@ -40,7 +40,7 @@ class SbiStream { SvStream* pStrm; sal_uIntPtr nExpandOnWriteTo; // during writing access expand the stream to this size - rtl::OString aLine; + OString aLine; sal_uIntPtr nLine; short nLen; // buffer length short nMode; @@ -51,11 +51,11 @@ class SbiStream public: SbiStream(); ~SbiStream(); - SbError Open( short, const rtl::OString&, short, short, short ); + SbError Open( short, const OString&, short, short, short ); SbError Close(); - SbError Read(rtl::OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false); + SbError Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false); SbError Read( char& ); - SbError Write( const rtl::OString&, sal_uInt16 = 0 ); + SbError Write( const OString&, sal_uInt16 = 0 ); bool IsText() const { return (nMode & SBSTRM_BINARY) == 0; } bool IsRandom() const { return (nMode & SBSTRM_RANDOM) != 0; } @@ -73,27 +73,27 @@ public: class SbiIoSystem { SbiStream* pChan[ CHANNELS ]; - rtl::OString aPrompt; - rtl::OString aIn; - rtl::OString aOut; + OString aPrompt; + OString aIn; + OString aOut; short nChan; SbError nError; - void ReadCon(rtl::OString&); - void WriteCon(const rtl::OString&); + void ReadCon(OString&); + void WriteCon(const OString&); public: SbiIoSystem(); ~SbiIoSystem(); SbError GetError(); void Shutdown(); - void SetPrompt(const rtl::OString& r) { aPrompt = r; } + void SetPrompt(const OString& r) { aPrompt = r; } void SetChannel( short n ) { nChan = n; } short GetChannel() const { return nChan;} void ResetChannel() { nChan = 0; } - void Open( short, const rtl::OString&, short, short, short ); + void Open( short, const OString&, short, short, short ); void Close(); - void Read(rtl::OString&, short = 0); + void Read(OString&, short = 0); char Read(); - void Write(const rtl::OString&, short = 0); + void Write(const OString&, short = 0); // 0 == bad channel or no SvStream (nChannel=0..CHANNELS-1) SbiStream* GetStream( short nChannel ) const; void CloseAll(); // JSM diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx index fd942b0d3815..1eda66c0cfbe 100644 --- a/basic/source/runtime/ddectrl.cxx +++ b/basic/source/runtime/ddectrl.cxx @@ -69,7 +69,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv ) IMPL_LINK_INLINE( SbiDdeControl,Data , DdeData*, pData, { - aData = rtl::OUString::createFromAscii( (const char*)(const void*)*pData ); + aData = OUString::createFromAscii( (const char*)(const void*)*pData ); return 1; } ) diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx index 79b985d28d28..95c02b71cb65 100644 --- a/basic/source/runtime/dllmgr-none.cxx +++ b/basic/source/runtime/dllmgr-none.cxx @@ -43,13 +43,13 @@ struct SbiDllMgr::Impl {}; SbError SbiDllMgr::Call( - rtl::OUString const &, rtl::OUString const &, SbxArray *, SbxVariable &, + OUString const &, OUString const &, SbxArray *, SbxVariable &, bool) { return ERRCODE_BASIC_NOT_IMPLEMENTED; } -void SbiDllMgr::FreeDll(rtl::OUString const &) {} +void SbiDllMgr::FreeDll(OUString const &) {} SbiDllMgr::SbiDllMgr(): impl_(new Impl) {} diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx index 5a8803487995..51cb7cc3fa38 100644 --- a/basic/source/runtime/dllmgr.hxx +++ b/basic/source/runtime/dllmgr.hxx @@ -38,10 +38,10 @@ public: ~SbiDllMgr(); SbError Call( - rtl::OUString const & function, rtl::OUString const & library, + OUString const & function, OUString const & library, SbxArray * arguments, SbxVariable & result, bool cdeclConvention); - void FreeDll(rtl::OUString const & library); + void FreeDll(OUString const & library); private: struct Impl; diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index de08aaacccea..c4a6d649c011 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -554,7 +554,7 @@ void UCBStream::SetSize( sal_uIntPtr nSize ) SbError SbiStream::Open -( short nCh, const rtl::OString& rName, short nStrmMode, short nFlags, short nL ) +( short nCh, const OString& rName, short nStrmMode, short nFlags, short nL ) { nMode = nFlags; nLen = nL; @@ -565,7 +565,7 @@ SbError SbiStream::Open { nStrmMode |= STREAM_NOCREATE; } - OUString aStr(rtl::OStringToOUString(rName, osl_getThreadTextEncoding())); + OUString aStr(OStringToOUString(rName, osl_getThreadTextEncoding())); OUString aNameStr = getFullPath( aStr ); if( hasUno() ) @@ -632,7 +632,7 @@ SbError SbiStream::Close() return nError; } -SbError SbiStream::Read(rtl::OString& rBuf, sal_uInt16 n, bool bForceReadingPerByte) +SbError SbiStream::Read(OString& rBuf, sal_uInt16 n, bool bForceReadingPerByte) { nExpandOnWriteTo = 0; if( !bForceReadingPerByte && IsText() ) @@ -650,7 +650,7 @@ SbError SbiStream::Read(rtl::OString& rBuf, sal_uInt16 n, bool bForceReadingPerB { return nError = SbERR_BAD_RECORD_LENGTH; } - rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*pStrm, n)); + OStringBuffer aBuffer(read_uInt8s_ToOString(*pStrm, n)); //Pad it out with ' ' to the requested length on short read sal_Int32 nRequested = sal::static_int_cast(n); comphelper::string::padToLength(aBuffer, nRequested, ' '); @@ -670,7 +670,7 @@ SbError SbiStream::Read( char& ch ) if (aLine.isEmpty()) { Read( aLine, 0 ); - aLine = aLine + rtl::OString('\n'); + aLine = aLine + OString('\n'); } ch = aLine[0]; aLine = aLine.copy(1); @@ -701,15 +701,15 @@ void SbiStream::ExpandFile() namespace { - void WriteLines(SvStream &rStream, const rtl::OString& rStr) + void WriteLines(SvStream &rStream, const OString& rStr) { - rtl::OString aStr(convertLineEnd(rStr, rStream.GetLineDelimiter()) ); + OString aStr(convertLineEnd(rStr, rStream.GetLineDelimiter()) ); write_uInt8s_FromOString(rStream, aStr); endl( rStream ); } } -SbError SbiStream::Write( const rtl::OString& rBuf, sal_uInt16 n ) +SbError SbiStream::Write( const OString& rBuf, sal_uInt16 n ) { ExpandFile(); if( IsAppend() ) @@ -730,7 +730,7 @@ SbError SbiStream::Write( const rtl::OString& rBuf, sal_uInt16 n ) aLine = aLine.copy(0, nLineLen); } WriteLines(*pStrm, aLine); - aLine = rtl::OString(); + aLine = OString(); } } else @@ -779,7 +779,7 @@ SbError SbiIoSystem::GetError() return n; } -void SbiIoSystem::Open(short nCh, const rtl::OString& rName, short nMode, short nFlags, short nLen) +void SbiIoSystem::Open(short nCh, const OString& rName, short nMode, short nFlags, short nLen) { nError = 0; if( nCh >= CHANNELS || !nCh ) @@ -842,7 +842,7 @@ void SbiIoSystem::Shutdown() // anything left to PRINT? if( !aOut.isEmpty() ) { - OUString aOutStr(rtl::OStringToOUString(aOut, osl_getThreadTextEncoding())); + OUString aOutStr(OStringToOUString(aOut, osl_getThreadTextEncoding())); #if defined __GNUC__ Window* pParent = Application::GetDefDialogParent(); MessBox( pParent, WinBits( WB_OK ), OUString(), aOutStr ).Execute(); @@ -850,11 +850,11 @@ void SbiIoSystem::Shutdown() MessBox( GetpApp()->GetDefDialogParent(), WinBits( WB_OK ), OUString(), aOutStr ).Execute(); #endif } - aOut = rtl::OString(); + aOut = OString(); } -void SbiIoSystem::Read(rtl::OString& rBuf, short n) +void SbiIoSystem::Read(OString& rBuf, short n) { if( !nChan ) { @@ -878,7 +878,7 @@ char SbiIoSystem::Read() if( aIn.isEmpty() ) { ReadCon( aIn ); - aIn = aIn + rtl::OString('\n'); + aIn = aIn + OString('\n'); } ch = aIn[0]; aIn = aIn.copy(1); @@ -894,7 +894,7 @@ char SbiIoSystem::Read() return ch; } -void SbiIoSystem::Write(const rtl::OString& rBuf, short n) +void SbiIoSystem::Write(const OString& rBuf, short n) { if( !nChan ) { @@ -946,9 +946,9 @@ void SbiIoSystem::CloseAll(void) ***************************************************************************/ -void SbiIoSystem::ReadCon(rtl::OString& rIn) +void SbiIoSystem::ReadCon(OString& rIn) { - OUString aPromptStr(rtl::OStringToOUString(aPrompt, osl_getThreadTextEncoding())); + OUString aPromptStr(OStringToOUString(aPrompt, osl_getThreadTextEncoding())); SbiInputDialog aDlg( NULL, aPromptStr ); if( aDlg.Execute() ) { @@ -958,12 +958,12 @@ void SbiIoSystem::ReadCon(rtl::OString& rIn) { nError = SbERR_USER_ABORT; } - aPrompt = rtl::OString(); + aPrompt = OString(); } // output of a MessageBox, if theres a CR in the console-buffer -void SbiIoSystem::WriteCon(const rtl::OString& rText) +void SbiIoSystem::WriteCon(const OString& rText) { aOut += rText; sal_Int32 n1 = aOut.indexOf('\n'); @@ -988,7 +988,7 @@ void SbiIoSystem::WriteCon(const rtl::OString& rText) { aOut = aOut.copy(1); } - OUString aStr(rtl::OStringToOUString(s, osl_getThreadTextEncoding())); + OUString aStr(OStringToOUString(s, osl_getThreadTextEncoding())); { SolarMutexGuard aSolarGuard; if( !MessBox( GetpApp()->GetDefDialogParent(), diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index dc9456692af6..f9872b43616b 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -1063,7 +1063,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, { // without any length information! without end-identifier! // What does that mean for Unicode?! Choosing conversion to ByteString... - rtl::OString aByteStr(rtl::OUStringToOString(rStr, osl_getThreadTextEncoding())); + OString aByteStr(OUStringToOString(rStr, osl_getThreadTextEncoding())); *pStrm << (const char*)aByteStr.getStr(); } } @@ -1322,7 +1322,7 @@ RTLFUNC(Environ) } OUString aResult; // should be ANSI but that's not possible under Win16 in the DLL - rtl::OString aByteStr(rtl::OUStringToOString(rPar.Get(1)->GetOUString(), + OString aByteStr(OUStringToOString(rPar.Get(1)->GetOUString(), osl_getThreadTextEncoding())); const char* pEnvStr = getenv(aByteStr.getStr()); if ( pEnvStr ) @@ -2661,7 +2661,7 @@ RTLFUNC(Round) rPar.Get(0)->PutDouble( dRes ); } -void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const rtl::OUString& sFuncName, SbxVariable* pRet ) +void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const OUString& sFuncName, SbxVariable* pRet ) { static Reference< XFunctionAccess > xFunc; Any aRes; @@ -3268,7 +3268,7 @@ RTLFUNC(Input) return; } - rtl::OString aByteBuffer; + OString aByteBuffer; SbError err = pSbStrm->Read( aByteBuffer, nByteCount, true ); if( !err ) err = pIosys->GetError(); @@ -3278,7 +3278,7 @@ RTLFUNC(Input) StarBASIC::Error( err ); return; } - rPar.Get(0)->PutString(rtl::OStringToOUString(aByteBuffer, osl_getThreadTextEncoding())); + rPar.Get(0)->PutString(OStringToOUString(aByteBuffer, osl_getThreadTextEncoding())); } RTLFUNC(Me) diff --git a/basic/source/runtime/sbdiagnose.cxx b/basic/source/runtime/sbdiagnose.cxx index 2168c04956f2..3fab4909c758 100644 --- a/basic/source/runtime/sbdiagnose.cxx +++ b/basic/source/runtime/sbdiagnose.cxx @@ -63,7 +63,7 @@ void DbgReportAssertion( const sal_Char* i_assertionMessage ) SbxArrayRef const xArguments( new SbxArray( SbxVARIANT ) ); SbxVariableRef const xMessageText = new SbxVariable( SbxSTRING ); - xMessageText->PutString( rtl::OUString::createFromAscii(i_assertionMessage) ); + xMessageText->PutString( OUString::createFromAscii(i_assertionMessage) ); xArguments->Put( xMessageText, 1 ); ErrCode const nError = xAssertionChannelBasic->Call( sCaptureFunctionName, xArguments ); diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index 752e6cd5b854..08158045689e 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -715,7 +715,7 @@ SbiStdObject::SbiStdObject( const OUString& r, StarBASIC* pb ) : SbxObject( r ) if( !p->nHash ) while( p->nArgs != -1 ) { - OUString aName_ = rtl::OUString::createFromAscii( p->pName ); + OUString aName_ = OUString::createFromAscii( p->pName ); p->nHash = SbxVariable::MakeHashCode( aName_ ); p += ( p->nArgs & _ARGSMASK ) + 1; } @@ -791,7 +791,7 @@ SbxVariable* SbiStdObject::Find( const OUString& rName, SbxClassType t ) short nType = ( p->nArgs & _TYPEMASK ); if( p->nArgs & _CONST ) nAccess |= SBX_CONST; - OUString aName_ = rtl::OUString::createFromAscii( p->pName ); + OUString aName_ = OUString::createFromAscii( p->pName ); SbxClassType eCT = SbxCLASS_OBJECT; if( nType & _PROPERTY ) { @@ -866,7 +866,7 @@ SbxInfo* SbiStdObject::GetInfo( short nIdx ) for( short i = 0; i < nPar; i++ ) { p++; - OUString aName_ = rtl::OUString::createFromAscii( p->pName ); + OUString aName_ = OUString::createFromAscii( p->pName ); sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03; if( p->nArgs & _OPT ) { diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx index 413548308c81..37e21162c353 100644 --- a/basic/source/runtime/step0.cxx +++ b/basic/source/runtime/step0.cxx @@ -1307,7 +1307,7 @@ void SbiRuntime::StepLINPUT() pIosys->Read( aInput ); Error( pIosys->GetError() ); SbxVariableRef p = PopVar(); - p->PutString(rtl::OStringToOUString(aInput, osl_getThreadTextEncoding())); + p->PutString(OStringToOUString(aInput, osl_getThreadTextEncoding())); } // end of program @@ -1425,7 +1425,7 @@ void SbiRuntime::StepPRINT() // print TOS s = " "; // one blank before } s += s1; - OString aByteStr(rtl::OUStringToOString(s, osl_getThreadTextEncoding())); + OString aByteStr(OUStringToOString(s, osl_getThreadTextEncoding())); pIosys->Write( aByteStr ); Error( pIosys->GetError() ); } @@ -1469,7 +1469,7 @@ void SbiRuntime::StepWRITE() // write TOS { s += OUString(ch); } - OString aByteStr(rtl::OUStringToOString(s, osl_getThreadTextEncoding())); + OString aByteStr(OUStringToOString(s, osl_getThreadTextEncoding())); pIosys->Write( aByteStr ); Error( pIosys->GetError() ); } @@ -1496,7 +1496,7 @@ void SbiRuntime::StepRENAME() // Rename Tos+1 to Tos void SbiRuntime::StepPROMPT() { SbxVariableRef p = PopVar(); - rtl::OString aStr(rtl::OUStringToOString(p->GetOUString(), osl_getThreadTextEncoding())); + OString aStr(OUStringToOString(p->GetOUString(), osl_getThreadTextEncoding())); pIosys->SetPrompt( aStr ); } diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index f6b39b4952a7..07b94b398ec0 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -170,7 +170,7 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator ) if( nSbxId == 0x65 ) // Dialog Id return new SbxVariable; - rtl::OUString aEmptyStr; + OUString aEmptyStr; if( nCreator == SBXCR_SBX ) switch( nSbxId ) { @@ -198,7 +198,7 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator ) return pNew; } -SbxObject* SbxBase::CreateObject( const rtl::OUString& rClass ) +SbxObject* SbxBase::CreateObject( const OUString& rClass ) { SbxAppData& r = GetSbxData_Impl(); SbxObject* pNew = NULL; @@ -341,7 +341,7 @@ SbxBase* SbxFactory::Create( sal_uInt16, sal_uInt32 ) return NULL; } -SbxObject* SbxFactory::CreateObject( const rtl::OUString& ) +SbxObject* SbxFactory::CreateObject( const OUString& ) { return NULL; } @@ -351,7 +351,7 @@ SbxObject* SbxFactory::CreateObject( const rtl::OUString& ) SbxInfo::~SbxInfo() {} -void SbxInfo::AddParam(const rtl::OUString& rName, SbxDataType eType, sal_uInt16 nFlags) +void SbxInfo::AddParam(const OUString& rName, SbxDataType eType, sal_uInt16 nFlags) { aParams.push_back(new SbxParamInfo(rName, eType, nFlags)); } @@ -377,7 +377,7 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { sal_uInt16 nType, nFlags; sal_uInt32 nUserData = 0; - rtl::OUString aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + OUString aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); rStrm >> nType >> nFlags; if( nVer > 1 ) diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 40b4a9fb2fd7..581d98d2a976 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -37,10 +37,10 @@ SbxCollection::SbxCollection( const OUString& rClass ) { if( !nCountHash ) { - pCount = rtl::OUString::createFromAscii(GetSbxRes( STRING_COUNTPROP )); - pAdd = rtl::OUString::createFromAscii(GetSbxRes( STRING_ADDMETH )); - pItem = rtl::OUString::createFromAscii(GetSbxRes( STRING_ITEMMETH )); - pRemove = rtl::OUString::createFromAscii(GetSbxRes( STRING_REMOVEMETH )); + pCount = OUString::createFromAscii(GetSbxRes( STRING_COUNTPROP )); + pAdd = OUString::createFromAscii(GetSbxRes( STRING_ADDMETH )); + pItem = OUString::createFromAscii(GetSbxRes( STRING_ITEMMETH )); + pRemove = OUString::createFromAscii(GetSbxRes( STRING_REMOVEMETH )); nCountHash = MakeHashCode( pCount ); nAddHash = MakeHashCode( pAdd ); nItemHash = MakeHashCode( pItem ); @@ -101,7 +101,7 @@ SbxVariable* SbxCollection::FindUserData( sal_uInt32 nData ) } } -SbxVariable* SbxCollection::Find( const rtl::OUString& rName, SbxClassType t ) +SbxVariable* SbxCollection::Find( const OUString& rName, SbxClassType t ) { if( GetParameters() ) { diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index 7b4bde230f2e..328bbcf72a9c 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -26,7 +26,7 @@ #include "sbxconv.hxx" -static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal ) +static OUString ImpCurrencyToString( const sal_Int64 &rVal ) { bool isNeg = ( rVal < 0 ); sal_Int64 absVal = isNeg ? -rVal : rVal; @@ -37,8 +37,8 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal ) ImpGetIntntlSep( cDecimalSep, cThousandSep ); #endif - rtl::OUString aAbsStr = rtl::OUString::valueOf( absVal ); - rtl::OUStringBuffer aBuf; + OUString aAbsStr = OUString::valueOf( absVal ); + OUStringBuffer aBuf; sal_Int32 initialLen = aAbsStr.getLength(); @@ -102,7 +102,7 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal ) } -static sal_Int64 ImpStringToCurrency( const rtl::OUString &rStr ) +static sal_Int64 ImpStringToCurrency( const OUString &rStr ) { sal_Int32 nFractDigit = 4; @@ -155,11 +155,11 @@ static sal_Int64 ImpStringToCurrency( const rtl::OUString &rStr ) // we should share some existing ( possibly from calc is there a currency // conversion there ? #TODO check ) - rtl::OUString sTmp( rStr.trim() ); + OUString sTmp( rStr.trim() ); const sal_Unicode* p = sTmp.getStr(); // normalise string number by removeing thousands & decimal point seperators - rtl::OUStringBuffer sNormalisedNumString( sTmp.getLength() + nFractDigit ); + OUStringBuffer sNormalisedNumString( sTmp.getLength() + nFractDigit ); if ( *p == '-' || *p == '+' ) sNormalisedNumString.append( *p ); @@ -430,7 +430,7 @@ start: case SbxSTRING: case SbxLPSTR: if( !p->pOUString ) - p->pOUString = new rtl::OUString; + p->pOUString = new OUString; *p->pOUString = ImpCurrencyToString( r ); break; diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx index de96b62ecd53..3a3d5bfe73db 100644 --- a/basic/source/sbx/sbxform.cxx +++ b/basic/source/sbx/sbxform.cxx @@ -246,7 +246,7 @@ void SbxBasicFormater::InitScan( double _dNum ) InitExp( get_number_of_digits( dNum ) ); // maximum of 15 positions behind the decimal point, example: -1.234000000000000E-001 /*int nCount =*/ sprintf( sBuffer,"%+22.15lE",dNum ); - sSciNumStrg = rtl::OUString::createFromAscii( sBuffer ); + sSciNumStrg = OUString::createFromAscii( sBuffer ); } @@ -255,7 +255,7 @@ void SbxBasicFormater::InitExp( double _dNewExp ) char sBuffer[ MAX_DOUBLE_BUFFER_LENGTH ]; nNumExp = (short)_dNewExp; /*int nCount =*/ sprintf( sBuffer,"%+i",nNumExp ); - sNumExpStrg = rtl::OUString::createFromAscii( sBuffer ); + sNumExpStrg = OUString::createFromAscii( sBuffer ); nExpExp = (short)get_number_of_digits( (double)nNumExp ); } @@ -386,7 +386,7 @@ OUString SbxBasicFormater::GetPosFormatString( const OUString& sFormatStrg, sal_ } OUString aRetStr; - aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING ); + aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING ); return aRetStr; } @@ -413,7 +413,7 @@ OUString SbxBasicFormater::GetNegFormatString( const OUString& sFormatStrg, sal_ } } OUString aRetStr; - aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING ); + aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING ); return aRetStr; } @@ -446,7 +446,7 @@ OUString SbxBasicFormater::Get0FormatString( const OUString& sFormatStrg, sal_Bo } OUString aRetStr; - aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING ); + aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING ); return aRetStr; } @@ -475,7 +475,7 @@ OUString SbxBasicFormater::GetNullFormatString( const OUString& sFormatStrg, sal } OUString aRetStr; - aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING ); + aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING ); return aRetStr; } @@ -961,7 +961,7 @@ OUString SbxBasicFormater::BasicFormatNull( OUString sFormatStrg ) return sNullFormatStrg; } OUString aRetStr; - aRetStr = rtl::OUString::createFromAscii( "null" ); + aRetStr = OUString::createFromAscii( "null" ); return aRetStr; } @@ -972,7 +972,7 @@ OUString SbxBasicFormater::BasicFormat( double dNumber, OUString sFormatStrg ) // analyse format-string concerning predefined formats: if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_GENERALNUMBER ) ) { - sFormatStrg = rtl::OUString::createFromAscii( GENERALNUMBER_FORMAT ); + sFormatStrg = OUString::createFromAscii( GENERALNUMBER_FORMAT ); } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_CURRENCY ) ) { @@ -980,19 +980,19 @@ OUString SbxBasicFormater::BasicFormat( double dNumber, OUString sFormatStrg ) } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_FIXED ) ) { - sFormatStrg = rtl::OUString::createFromAscii( FIXED_FORMAT ); + sFormatStrg = OUString::createFromAscii( FIXED_FORMAT ); } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_STANDARD ) ) { - sFormatStrg = rtl::OUString::createFromAscii( STANDARD_FORMAT ); + sFormatStrg = OUString::createFromAscii( STANDARD_FORMAT ); } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_PERCENT ) ) { - sFormatStrg = rtl::OUString::createFromAscii( PERCENT_FORMAT ); + sFormatStrg = OUString::createFromAscii( PERCENT_FORMAT ); } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_SCIENTIFIC ) ) { - sFormatStrg = rtl::OUString::createFromAscii( SCIENTIFIC_FORMAT ); + sFormatStrg = OUString::createFromAscii( SCIENTIFIC_FORMAT ); } if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_YESNO ) ) { diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 6cbef74a6876..625917eb2fab 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -214,8 +214,8 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t ) #ifdef DBG_UTIL static sal_uInt16 nLvl = 0; static const char* pCls[] = { "DontCare","Array","Value","Variable","Method","Property","Object" }; - rtl::OString aNameStr1(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); - rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aNameStr1(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SBX: Search %.*s %s %s in %s", nLvl++, " ", ( t >= SbxCLASS_DONTCARE && t <= SbxCLASS_OBJECT ) @@ -283,8 +283,8 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t ) nLvl--; if( pRes ) { - rtl::OString aNameStr3(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); - rtl::OString aNameStr4(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aNameStr3(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr4(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SBX: Found %.*s %s in %s", nLvl, " ", aNameStr3.getStr(), aNameStr4.getStr() ); } @@ -499,8 +499,8 @@ void SbxObject::Insert( SbxVariable* pVar ) { aVarName = PTR_CAST(SbxObject,pVar)->GetClassName(); } - rtl::OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); - rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SBX: Insert %s %s in %s", ( pVar->GetClass() >= SbxCLASS_DONTCARE && pVar->GetClass() <= SbxCLASS_OBJECT ) @@ -542,8 +542,8 @@ void SbxObject::QuickInsert( SbxVariable* pVar ) { aVarName = PTR_CAST(SbxObject,pVar)->GetClassName(); } - rtl::OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); - rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SBX: Insert %s %s in %s", ( pVar->GetClass() >= SbxCLASS_DONTCARE && pVar->GetClass() <= SbxCLASS_OBJECT ) @@ -569,8 +569,8 @@ void SbxObject::Remove( SbxVariable* pVar ) { aVarName = PTR_CAST(SbxObject,pVar)->GetClassName(); } - rtl::OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); - rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SBX: Remove %s in %s", aNameStr1.getStr(), aNameStr2.getStr() ); #endif @@ -825,10 +825,10 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) GetAll( SbxCLASS_DONTCARE ); } // Output the data of the object itself - rtl::OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); - rtl::OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US)); + OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US)); rStrm << "Object( " - << rtl::OString::valueOf(reinterpret_cast(this)).getStr()<< "=='" + << OString::valueOf(reinterpret_cast(this)).getStr()<< "=='" << ( aNameStr.isEmpty() ? "" : aNameStr.getStr() ) << "', " << "of class '" << aClassNameStr.getStr() << "', " << "counts " @@ -836,9 +836,9 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) << " refs, "; if ( GetParent() ) { - rtl::OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); rStrm << "in parent " - << rtl::OString::valueOf(reinterpret_cast(GetParent())).getStr() + << OString::valueOf(reinterpret_cast(GetParent())).getStr() << "=='" << ( aParentNameStr.isEmpty() ? "" : aParentNameStr.getStr() ) << "'"; } else @@ -846,14 +846,14 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) rStrm << "no parent "; } rStrm << " )" << endl; - rtl::OString aIndentNameStr(OUStringToOString(aIndent, RTL_TEXTENCODING_ASCII_US)); + OString aIndentNameStr(OUStringToOString(aIndent, RTL_TEXTENCODING_ASCII_US)); rStrm << aIndentNameStr.getStr() << "{" << endl; // Flags OUString aAttrs; if( CollectAttrs( this, aAttrs ) ) { - rtl::OString aAttrStr(OUStringToOString(aAttrs, RTL_TEXTENCODING_ASCII_US)); + OString aAttrStr(OUStringToOString(aAttrs, RTL_TEXTENCODING_ASCII_US)); rStrm << aIndentNameStr.getStr() << "- Flags: " << aAttrStr.getStr() << endl; } diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index e7b02c4043dd..b6927200fb03 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -132,7 +132,7 @@ void removeDimAsNewRecoverItem( SbxVariable* pVar ); SbxVariable::~SbxVariable() { #ifdef DBG_UTIL - OString aBStr(rtl::OUStringToOString(maName, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(maName, RTL_TEXTENCODING_ASCII_US)); DbgOutf( "SbxVariable::Dtor %lx (%s)", (void*)this, aBStr.getStr() ); if ( maName.equalsAscii( "Cells")) { @@ -451,7 +451,7 @@ void SbxVariable::SetParent( SbxObject* p ) aMsg += "].SetParent(["; aMsg += p->GetName(); aMsg += "])"; - rtl::OString aBStr(rtl::OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US)); DbgOut( aBStr.getStr(), DBG_OUT_WARNING, __FILE__, __LINE__); } } @@ -735,11 +735,11 @@ void SbxAlias::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill ) { - rtl::OString aBNameStr(rtl::OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US)); + OString aBNameStr(OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US)); rStrm << "Variable( " - << rtl::OString::valueOf(reinterpret_cast(this)).getStr() << "==" + << OString::valueOf(reinterpret_cast(this)).getStr() << "==" << aBNameStr.getStr(); - rtl::OString aBParentNameStr(rtl::OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aBParentNameStr(OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US)); if ( GetParent() ) { rStrm << " in parent '" << aBParentNameStr.getStr() << "'"; diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 8f663de41228..f983ba71c41e 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -1029,8 +1029,8 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, INetURLObject aPrevUserBasicInetObj_1( aUserBasicInetObj ); aPrevUserBasicInetObj_1.removeSegment(); INetURLObject aPrevUserBasicInetObj_2 = aPrevUserBasicInetObj_1; - aPrevUserBasicInetObj_1.Append( rtl::OString( strPrevFolderName_1 )); - aPrevUserBasicInetObj_2.Append( rtl::OString( strPrevFolderName_2 )); + aPrevUserBasicInetObj_1.Append( OString( strPrevFolderName_1 )); + aPrevUserBasicInetObj_2.Append( OString( strPrevFolderName_2 )); // #i93163 bool bCleanUp = false; @@ -1095,7 +1095,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, OUString aFolderUserBasic = aUserBasicInetObj.GetMainURL( INetURLObject::NO_DECODE ); INetURLObject aUserBasicTmpInetObj( aUserBasicInetObj ); aUserBasicTmpInetObj.removeSegment(); - aUserBasicTmpInetObj.Append( rtl::OString( "__basic_tmp" )); + aUserBasicTmpInetObj.Append( OString( "__basic_tmp" )); OUString aFolderTmp = aUserBasicTmpInetObj.GetMainURL( INetURLObject::NO_DECODE ); mxSFI->move( aFolderUserBasic, aFolderTmp ); @@ -1225,7 +1225,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, static const char strErrorSavFolderName[] = "__basic_80_err"; INetURLObject aPrevUserBasicInetObj_Err( aUserBasicInetObj ); aPrevUserBasicInetObj_Err.removeSegment(); - aPrevUserBasicInetObj_Err.Append( rtl::OString( strErrorSavFolderName )); + aPrevUserBasicInetObj_Err.Append( OString( strErrorSavFolderName )); OUString aPrevFolder_Err = aPrevUserBasicInetObj_Err.GetMainURL( INetURLObject::NO_DECODE ); bool bSaved = false; diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx index be610bbd2a4d..ca05bb0ae1b4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx @@ -385,7 +385,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -479,7 +479,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index 635c7e74c53b..8017045bcb7d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -361,7 +361,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -462,7 +462,7 @@ static typelib_TypeClass cpp_mediate( #endif throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index 0bf81064a588..665415290bcb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -242,7 +242,7 @@ extern "C" void cpp_vtable_call( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -331,7 +331,7 @@ extern "C" void cpp_vtable_call( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index 335e05fad1fc..970431fce11b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -425,7 +425,7 @@ namespace if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -538,7 +538,7 @@ namespace fprintf(stderr,"cpp_mediate6\n"); #endif throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx index 6d57c134f63a..fa96ed3c3704 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx @@ -384,7 +384,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -477,7 +477,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 9404471a1474..a06269a4477c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -381,7 +381,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -482,7 +482,7 @@ static typelib_TypeClass cpp_mediate( #endif throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx index ba384f74472d..5e97cdd35249 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx @@ -349,7 +349,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -443,7 +443,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx index e571bd2a555c..c2bfe5ef912c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx @@ -370,7 +370,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } @@ -464,7 +464,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pCppI ); } } diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx index ea0d05a50c92..689e54f092b2 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx @@ -250,7 +250,7 @@ static typelib_TypeClass cpp_mediate( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -343,7 +343,7 @@ static typelib_TypeClass cpp_mediate( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx index 95acfac20aa5..af5c4a245ee4 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx @@ -245,7 +245,7 @@ static typelib_TypeClass cpp_mediate( "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( rtl::OUString( "illegal vtable index!" ), (XInterface *)pCppI ); + throw RuntimeException( OUString( "illegal vtable index!" ), (XInterface *)pCppI ); } // determine called method @@ -340,7 +340,7 @@ static typelib_TypeClass cpp_mediate( } default: { - throw RuntimeException(rtl::OUString( "no member description found!" ), (XInterface *)pCppI ); + throw RuntimeException(OUString( "no member description found!" ), (XInterface *)pCppI ); } } return eRet; diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index 4129785d39be..a85d756a823f 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -32,9 +32,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; namespace { diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx index b29e3a7dce26..e87512a571fc 100644 --- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx @@ -250,7 +250,7 @@ extern "C" void cpp_vtable_call( if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { throw RuntimeException( - rtl::OUString( "illegal vtable index!" ), + OUString( "illegal vtable index!" ), (XInterface *)pThis ); } @@ -339,7 +339,7 @@ extern "C" void cpp_vtable_call( default: { throw RuntimeException( - rtl::OUString( "no member description found!" ), + OUString( "no member description found!" ), (XInterface *)pThis ); } } diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index 7859fb505092..f9d220931000 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -246,7 +246,7 @@ static typelib_TypeClass __cdecl cpp_mediate( "### illegal vtable index!" ); if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( rtl::OUString("illegal vtable index!"), + throw RuntimeException( OUString("illegal vtable index!"), (XInterface *)pThis ); } @@ -340,7 +340,7 @@ static typelib_TypeClass __cdecl cpp_mediate( default: { throw RuntimeException( - rtl::OUString("no member description found!"), + OUString("no member description found!"), (XInterface *)pThis ); } } @@ -446,7 +446,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( Rtti(): n0(0), n1(0), n2(0), rtti(CPPU_CURRENT_NAMESPACE::msci_getRTTI( - rtl::OUString( + OUString( "com.sun.star.uno.XInterface"))) {} }; diff --git a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx index 73cb40fd3c99..64fd8e71e6bf 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx @@ -35,7 +35,7 @@ const DWORD MSVC_ExceptionCode = 0xe06d7363; const long MSVC_magic_number = 0x19930520L; //============================================================================== -type_info * msci_getRTTI( ::rtl::OUString const & rUNOname ); +type_info * msci_getRTTI( OUString const & rUNOname ); //============================================================================== int msci_filterCppException( diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx index 32c0109757a0..dadae1f64499 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx @@ -242,7 +242,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( OSL_ENSURE( nFunctionIndex < pTD->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" ); if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex ) - throw RuntimeException( rtl::OUString("Illegal vtable index!"), + throw RuntimeException( OUString("Illegal vtable index!"), reinterpret_cast( pCppI ) ); // Determine called method @@ -345,7 +345,7 @@ extern "C" typelib_TypeClass cpp_vtable_call( } default: { - throw RuntimeException( rtl::OUString("No member description found!"), + throw RuntimeException( OUString("No member description found!"), reinterpret_cast( pCppI ) ); } } @@ -456,7 +456,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( Rtti(): n0(0), n1(0), n2(0), rtti(CPPU_CURRENT_NAMESPACE::mscx_getRTTI( - rtl::OUString( + OUString( "com.sun.star.uno.XInterface"))) {} }; diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx index df3fb70110ec..715514ffc7ce 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx @@ -38,7 +38,7 @@ typedef enum { REGPARAM_INT, REGPARAM_FLT } RegParamKind; //============================================================================== -type_info * mscx_getRTTI( ::rtl::OUString const & rUNOname ); +type_info * mscx_getRTTI( OUString const & rUNOname ); //============================================================================== int mscx_filterCppException( diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 53b40f23447c..a293d9937ca0 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -245,7 +245,7 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const strDirectory = "/tmp"; strDirectory += "/.execoooXXXXXX"; - rtl::OString aTmpName = OUStringToOString(strDirectory, osl_getThreadTextEncoding()); + OString aTmpName = OUStringToOString(strDirectory, osl_getThreadTextEncoding()); char *tmpfname = new char[aTmpName.getLength()+1]; strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1); if ((block.fd = mkstemp(tmpfname)) == -1) diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 7b668c17270d..61fc28479585 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -50,9 +50,9 @@ class JNI_info; //============================================================================== struct BridgeRuntimeError { - ::rtl::OUString m_message; + OUString m_message; - inline BridgeRuntimeError( ::rtl::OUString const & message ) + inline BridgeRuntimeError( OUString const & message ) : m_message( message ) {} }; @@ -98,7 +98,7 @@ public: inline void ensure_no_exception() const; // throws BridgeRuntimeError inline bool assert_no_exception() const; // asserts and clears exception - ::rtl::OUString get_stack_trace( jobject jo_exc = 0 ) const; + OUString get_stack_trace( jobject jo_exc = 0 ) const; }; //______________________________________________________________________________ @@ -273,7 +273,7 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref ) { throw BridgeRuntimeError( "cannot get comprehensive type description for " + - ::rtl::OUString::unacquired( &td_ref->pTypeName ) ); + OUString::unacquired( &td_ref->pTypeName ) ); } } diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx index b73866cbc76c..2a24f58d73db 100644 --- a/bridges/source/jni_uno/jni_data.cxx +++ b/bridges/source/jni_uno/jni_data.cxx @@ -1797,7 +1797,7 @@ void Bridge::map_to_java( { // Do not lose information about type arguments of instantiated // polymorphic struct types: - rtl::OUString const & name = rtl::OUString::unacquired( + OUString const & name = OUString::unacquired( &pAny->pType->pTypeName); OSL_ASSERT(!name.isEmpty()); if (name[name.getLength() - 1] == '>') diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h index 2251ad8de057..2d8514592947 100644 --- a/bridges/source/jni_uno/jni_helper.h +++ b/bridges/source/jni_uno/jni_helper.h @@ -57,12 +57,12 @@ inline void jstring_to_ustring( } //------------------------------------------------------------------------------ -inline ::rtl::OUString jstring_to_oustring( +inline OUString jstring_to_oustring( JNI_context const & jni, jstring jstr ) { rtl_uString * ustr = 0; jstring_to_ustring( jni, &ustr, jstr ); - return ::rtl::OUString( ustr, SAL_NO_ACQUIRE ); + return OUString( ustr, SAL_NO_ACQUIRE ); } //------------------------------------------------------------------------------ diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index ecc1cc2d74e8..63ce45dcfd24 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -46,10 +46,10 @@ inline bool type_equals( { if (type1 == type2) return true; - ::rtl::OUString const & name1 = - ::rtl::OUString::unacquired( &type1->pTypeName ); - ::rtl::OUString const & name2 = - ::rtl::OUString::unacquired( &type2->pTypeName ); + OUString const & name1 = + OUString::unacquired( &type1->pTypeName ); + OUString const & name2 = + OUString::unacquired( &type2->pTypeName ); return ((type1->eTypeClass == type2->eTypeClass) && name1.equals( name2 )); } @@ -57,7 +57,7 @@ inline bool type_equals( inline bool is_XInterface( typelib_TypeDescriptionReference * type ) { return ((typelib_TypeClass_INTERFACE == type->eTypeClass) && - ::rtl::OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface"); + OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface"); } //============================================================================== @@ -112,7 +112,7 @@ struct JNI_type_info_holder }; typedef ::boost::unordered_map< - ::rtl::OUString, JNI_type_info_holder, ::rtl::OUStringHash > t_str2type; + OUString, JNI_type_info_holder, OUStringHash > t_str2type; //============================================================================== class JNI_info @@ -211,10 +211,10 @@ public: typelib_TypeDescriptionReference * type ) const; JNI_type_info const * get_type_info( JNI_context const & jni, - ::rtl::OUString const & uno_name ) const; + OUString const & uno_name ) const; // inline static void append_sig( - ::rtl::OStringBuffer * buf, typelib_TypeDescriptionReference * type, + OStringBuffer * buf, typelib_TypeDescriptionReference * type, bool use_Object_for_type_XInterface = true, bool use_slashes = true ); // get this @@ -242,7 +242,7 @@ inline void JNI_info::destroy( JNIEnv * jni_env ) //______________________________________________________________________________ inline void JNI_info::append_sig( - ::rtl::OStringBuffer * buf, typelib_TypeDescriptionReference * type, + OStringBuffer * buf, typelib_TypeDescriptionReference * type, bool use_Object_for_type_XInterface, bool use_slashes ) { switch (type->eTypeClass) @@ -302,20 +302,20 @@ inline void JNI_info::append_sig( case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: { - ::rtl::OUString const & uno_name = - ::rtl::OUString::unacquired( &type->pTypeName ); + OUString const & uno_name = + OUString::unacquired( &type->pTypeName ); buf->append( 'L' ); // Erase type arguments of instantiated polymorphic struct types: sal_Int32 i = uno_name.indexOf( '<' ); if ( i < 0 ) { buf->append( - ::rtl::OUStringToOString( + OUStringToOString( use_slashes ? uno_name.replace( '.', '/' ) : uno_name, RTL_TEXTENCODING_JAVA_UTF8 ) ); } else { - rtl::OUString s( uno_name.copy( 0, i ) ); + OUString s( uno_name.copy( 0, i ) ); buf->append( - ::rtl::OUStringToOString( + OUStringToOString( use_slashes ? s.replace( '.', '/' ) : s, RTL_TEXTENCODING_JAVA_UTF8 ) ); } @@ -342,11 +342,11 @@ inline void JNI_info::append_sig( } else { - ::rtl::OUString const & uno_name = - ::rtl::OUString::unacquired( &type->pTypeName ); + OUString const & uno_name = + OUString::unacquired( &type->pTypeName ); buf->append( 'L' ); buf->append( - ::rtl::OUStringToOString( + OUStringToOString( use_slashes ? uno_name.replace( '.', '/' ) : uno_name, RTL_TEXTENCODING_JAVA_UTF8 ) ); buf->append( ';' ); @@ -355,7 +355,7 @@ inline void JNI_info::append_sig( default: throw BridgeRuntimeError( "unsupported type: " + - ::rtl::OUString::unacquired( &type->pTypeName ) ); + OUString::unacquired( &type->pTypeName ) ); } } diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index a0f5ef65cd91..e88be55b3e01 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -180,19 +180,19 @@ class Service: public cppu::WeakImplHelper3< css::lang::XServiceInfo, css::lang::XMain, test::javauno::acquire::XTest > { public: - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getImplementationName_static(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getSupportedServiceNames_static(); } virtual sal_Int32 SAL_CALL - run(css::uno::Sequence< rtl::OUString > const & arguments) + run(css::uno::Sequence< OUString > const & arguments) throw (css::uno::RuntimeException); virtual void SAL_CALL setInterfaceToInterface( @@ -294,9 +294,9 @@ public: throw (css::uno::RuntimeException) { return obj; } - static rtl::OUString getImplementationName_static(); + static OUString getImplementationName_static(); - static css::uno::Sequence< rtl::OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( @@ -316,10 +316,10 @@ private: } -sal_Bool Service::supportsService(rtl::OUString const & serviceName) +sal_Bool Service::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > names( + css::uno::Sequence< OUString > names( getSupportedServiceNames_static()); for (sal_Int32 i = 0; i< names.getLength(); ++i) { if (names[i] == serviceName) { @@ -341,7 +341,7 @@ template< typename T > void assertNotNull(css::uno::Reference< T > const & ref) } -sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) +sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments) throw (css::uno::RuntimeException) { // - arguments[0] must be the UNO URL to connect to: @@ -477,13 +477,13 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) return 0; } -rtl::OUString Service::getImplementationName_static() { - return rtl::OUString( "com.sun.star.test.bridges.testacquire.impl" ); +OUString Service::getImplementationName_static() { + return OUString( "com.sun.star.test.bridges.testacquire.impl" ); } -css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() { - css::uno::Sequence< rtl::OUString > names(1); - names[0] = rtl::OUString( "com.sun.star.test.bridges.testacquire" ); +css::uno::Sequence< OUString > Service::getSupportedServiceNames_static() { + css::uno::Sequence< OUString > names(1); + names[0] = OUString( "com.sun.star.test.bridges.testacquire" ); return names; } @@ -515,11 +515,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const namespace { -bool writeInfo(void * registryKey, rtl::OUString const & implementationName, - css::uno::Sequence< rtl::OUString > const & serviceNames) { - rtl::OUString keyName( "/" ); +bool writeInfo(void * registryKey, OUString const & implementationName, + css::uno::Sequence< OUString > const & serviceNames) { + OUString keyName( "/" ); keyName += implementationName; - keyName += rtl::OUString( "/UNO/SERVICES" ); + keyName += OUString( "/UNO/SERVICES" ); css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx index fda624987eca..2200e322871a 100644 --- a/bridges/test/java_uno/any/transport.cxx +++ b/bridges/test/java_uno/any/transport.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::uno; using ::test::java_uno::anytest::XTransport; -using ::rtl::OUString; namespace { diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index 5c274934465c..a56e5b928a39 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/bridges/test/java_uno/equals/testequals.cxx @@ -52,28 +52,28 @@ class Service: public cppu::WeakImplHelper2< css::lang::XServiceInfo, test::java_uno::equals::XTestInterface > { public: - virtual inline rtl::OUString SAL_CALL getImplementationName() + virtual inline OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) - { return rtl::OUString::createFromAscii(getImplementationName_static()); } + { return OUString::createFromAscii(getImplementationName_static()); } virtual sal_Bool SAL_CALL supportsService( - rtl::OUString const & rServiceName) throw (css::uno::RuntimeException); + OUString const & rServiceName) throw (css::uno::RuntimeException); - virtual inline css::uno::Sequence< rtl::OUString > SAL_CALL + virtual inline css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getSupportedServiceNames_static(); } - virtual void SAL_CALL connect(rtl::OUString const & rConnection, - rtl::OUString const & rProtocol) + virtual void SAL_CALL connect(OUString const & rConnection, + OUString const & rProtocol) throw (css::uno::Exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL get( - rtl::OUString const & rName) throw (css::uno::RuntimeException); + OUString const & rName) throw (css::uno::RuntimeException); static inline sal_Char const * getImplementationName_static() { return "com.sun.star.test.bridges.testequals.impl"; } - static css::uno::Sequence< rtl::OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( @@ -91,10 +91,10 @@ private: } -sal_Bool Service::supportsService(rtl::OUString const & rServiceName) +sal_Bool Service::supportsService(OUString const & rServiceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > aNames( + css::uno::Sequence< OUString > aNames( getSupportedServiceNames_static()); for (sal_Int32 i = 0; i< aNames.getLength(); ++i) if (aNames[i] == rServiceName) @@ -102,31 +102,31 @@ sal_Bool Service::supportsService(rtl::OUString const & rServiceName) return false; } -void Service::connect(rtl::OUString const & rConnection, - rtl::OUString const & rProtocol) +void Service::connect(OUString const & rConnection, + OUString const & rProtocol) throw (css::uno::Exception) { css::uno::Reference< css::connection::XConnection > xConnection( css::connection::Connector::create(m_xContext)->connect(rConnection)); css::uno::Reference< css::bridge::XBridgeFactory > xBridgeFactory( m_xContext->getServiceManager()->createInstanceWithContext( - rtl::OUString( "com.sun.star.bridge.BridgeFactory" ), + OUString( "com.sun.star.bridge.BridgeFactory" ), m_xContext), css::uno::UNO_QUERY); - m_xBridge = xBridgeFactory->createBridge(rtl::OUString(), rProtocol, + m_xBridge = xBridgeFactory->createBridge(OUString(), rProtocol, xConnection, 0); } css::uno::Reference< css::uno::XInterface > -Service::get(rtl::OUString const & rName) throw (css::uno::RuntimeException) +Service::get(OUString const & rName) throw (css::uno::RuntimeException) { return m_xBridge->getInstance(rName); } -css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() +css::uno::Sequence< OUString > Service::getSupportedServiceNames_static() { - css::uno::Sequence< rtl::OUString > aNames(1); - aNames[0] = rtl::OUString( "com.sun.star.test.bridges.testequals" ); + css::uno::Sequence< OUString > aNames(1); + aNames[0] = OUString( "com.sun.star.test.bridges.testequals" ); return aNames; } @@ -160,7 +160,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char co css::uno::Reference< css::lang::XSingleComponentFactory > xFactory(cppu::createSingleComponentFactory( &Service::createInstance, - rtl::OUString::createFromAscii( + OUString::createFromAscii( Service::getImplementationName_static()), Service::getSupportedServiceNames_static())); if (xFactory.is()) @@ -175,11 +175,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char co namespace { bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName, - css::uno::Sequence< rtl::OUString > const & rServiceNames) + css::uno::Sequence< OUString > const & rServiceNames) { - rtl::OUString aKeyName( "/" ); - aKeyName += rtl::OUString::createFromAscii(pImplementationName); - aKeyName += rtl::OUString( "/UNO/SERVICES" ); + OUString aKeyName( "/" ); + aKeyName += OUString::createFromAscii(pImplementationName); + aKeyName += OUString( "/UNO/SERVICES" ); css::uno::Reference< css::registry::XRegistryKey > xKey; try { diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index 907b4b41f2bd..d5a66169a634 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx @@ -59,7 +59,7 @@ public: private: virtual ~Client() {} - virtual sal_Int32 SAL_CALL run(css::uno::Sequence< rtl::OUString > const &) + virtual sal_Int32 SAL_CALL run(css::uno::Sequence< OUString > const &) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL get() throw (css::uno::RuntimeException); @@ -68,34 +68,34 @@ private: osl::ThreadData data; }; -sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &) +sal_Int32 Client::run(css::uno::Sequence< OUString > const &) throw (css::uno::RuntimeException) { css::uno::Reference< css::lang::XMultiComponentFactory > factory( context->getServiceManager()); if (!factory.is()) { throw new css::uno::RuntimeException( - rtl::OUString( "no component context service manager" ), + OUString( "no component context service manager" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay; try { relay = css::uno::Reference< test::javauno::nativethreadpool::XRelay >( factory->createInstanceWithContext( - rtl::OUString( "test.javauno.nativethreadpool.Relay" ), + OUString( "test.javauno.nativethreadpool.Relay" ), context), css::uno::UNO_QUERY_THROW); } catch (css::uno::RuntimeException &) { throw; } catch (css::uno::Exception & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "creating test.javauno.nativethreadpool.Relay service" ), + OUString( "creating test.javauno.nativethreadpool.Relay service" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } relay->start(this); if (!data.setData(reinterpret_cast< void * >(12345))) { throw new css::uno::RuntimeException( - rtl::OUString( "osl::ThreadData::setData failed" ), + OUString( "osl::ThreadData::setData failed" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XSource > source; @@ -103,19 +103,19 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &) source = css::uno::Reference< test::javauno::nativethreadpool::XSource >( css::bridge::UnoUrlResolver::create(context)->resolve( - rtl::OUString( "uno:socket,host=localhost,port=3830;urp;test" )), + OUString( "uno:socket,host=localhost,port=3830;urp;test" )), css::uno::UNO_QUERY_THROW); } catch (css::connection::NoConnectException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::connection::ConnectionSetupException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::lang::IllegalArgumentException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } bool success = source->get() == 12345; @@ -134,12 +134,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( return static_cast< cppu::OWeakObject * >(new Client(context)); } -rtl::OUString SAL_CALL getImplementationName() { - return rtl::OUString( "test.javauno.nativethreadpool.client" ); +OUString SAL_CALL getImplementationName() { + return OUString( "test.javauno.nativethreadpool.client" ); } -css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() { - return css::uno::Sequence< rtl::OUString >(); +css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() { + return css::uno::Sequence< OUString >(); } cppu::ImplementationEntry entries[] = { diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index 6b7490b7732a..d81876f91895 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx @@ -64,7 +64,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { context->getServiceManager()); if (!factory.is()) { throw new css::uno::RuntimeException( - rtl::OUString( "no component context service manager" ), + OUString( "no component context service manager" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XSource > source; @@ -73,19 +73,19 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { source = css::uno::Reference< test::javauno::nativethreadpool::XSource >( css::bridge::UnoUrlResolver::create(context)->resolve( - rtl::OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )), + OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )), css::uno::UNO_QUERY_THROW); } catch (css::connection::NoConnectException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::connection::ConnectionSetupException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::lang::IllegalArgumentException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } return source->get(); @@ -98,12 +98,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( return static_cast< cppu::OWeakObject * >(new Server(context)); } -rtl::OUString SAL_CALL getImplementationName() { - return rtl::OUString( "test.javauno.nativethreadpool.server" ); +OUString SAL_CALL getImplementationName() { + return OUString( "test.javauno.nativethreadpool.server" ); } -css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() { - return css::uno::Sequence< rtl::OUString >(); +css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() { + return css::uno::Sequence< OUString >(); } cppu::ImplementationEntry entries[] = { diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 08248b0952fe..2ccda76c5c26 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star::bridge; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::test::performance; -using ::rtl::OUString; -using ::rtl::OUStringToOString; #include "testcomp.h" diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h index 67b796d720a4..75bd05e81e4f 100644 --- a/bridges/test/testcomp.h +++ b/bridges/test/testcomp.h @@ -24,13 +24,13 @@ void parseCommandLine( char *argv[] , - ::rtl::OUString *pProtocol , ::rtl::OUString *pConnection , + OUString *pProtocol , OUString *pConnection , sal_Bool *pbLatency , sal_Bool *pbReverse); Reference< XInterface > createComponent( - const ::rtl::OUString &sServiceName, - const ::rtl::OUString &sDllName, + const OUString &sServiceName, + const OUString &sDllName, const Reference < XMultiServiceFactory > & rSMgr ); class OInterfaceTest : @@ -75,16 +75,16 @@ public: void SAL_CALL release()throw() { OWeakObject::release(); } public: // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) + virtual void SAL_CALL call( const OUString& s, sal_Int32 nToDo ) throw(::com::sun::star::uno::RuntimeException, ::test::TestBridgeException); - virtual void SAL_CALL callOneway( const ::rtl::OUString& s, sal_Int32 nToDo ) + virtual void SAL_CALL callOneway( const OUString& s, sal_Int32 nToDo ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL drawLine( sal_Int32 x1, sal_Int32 y1 , sal_Int32 x2 , sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getsAttribute() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setsAttribute( const ::rtl::OUString& _sattribute ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getsAttribute() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setsAttribute( const OUString& _sattribute ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL callAgain( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callAgain, sal_Int32 nToCall ) throw(::com::sun::star::uno::RuntimeException); @@ -92,7 +92,7 @@ public: throw(::com::sun::star::uno::RuntimeException); ::osl::Mutex m_mutex; - ::rtl::OUString m_sAttribute; + OUString m_sAttribute; sal_Int32 m_nLastToDos; }; @@ -136,7 +136,7 @@ public: public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) + getInstance( const OUString& sObjectName ) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx index c9de485bb4d0..fd6dadd0a791 100644 --- a/canvas/inc/canvas/canvastools.hxx +++ b/canvas/inc/canvas/canvastools.hxx @@ -484,7 +484,7 @@ namespace canvas #ifdef DBG_UTIL // Ensure that map entries are sorted (and all lowercase, if this // map is case insensitive) - const ::rtl::OString aStr( pMap->maKey ); + const OString aStr( pMap->maKey ); if( !mbCaseSensitive && aStr != aStr.toAsciiLowerCase() ) { @@ -506,7 +506,7 @@ namespace canvas OSL_FAIL( "ValueMap::ValueMap(): Map is not sorted" ); } - const ::rtl::OString aStr2( pMap[1].maKey ); + const OString aStr2( pMap[1].maKey ); if( !mbCaseSensitive && aStr2 != aStr2.toAsciiLowerCase() ) { diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index 0892ad009a3e..ef0c722efe95 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -93,7 +93,7 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase1_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); private: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > maArguments; @@ -150,7 +150,7 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( BitmapCanvas, GraphicDeviceBase2_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); // BitmapProvider virtual IBitmapSharedPtr getBitmap() const; diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index 4bf1056a2ac5..0db10b88f9be 100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx @@ -74,9 +74,9 @@ namespace dxcanvas virtual void disposeThis(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // BitmapProvider virtual IBitmapSharedPtr getBitmap() const { return mpBitmap; } diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx index 8cf291f3b7ef..1b0d57a5362b 100644 --- a/canvas/source/directx/dx_canvascustomsprite.hxx +++ b/canvas/source/directx/dx_canvascustomsprite.hxx @@ -112,9 +112,9 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // Sprite virtual void redraw() const; diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx index ccff49553a47..c1a0f3371a4a 100644 --- a/canvas/source/directx/dx_canvasfont.hxx +++ b/canvas/source/directx/dx_canvasfont.hxx @@ -72,9 +72,9 @@ namespace dxcanvas virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); double getCellAscent() const; double getEmHeight() const; diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index 117d625f0ff0..7ecfe52b5c8e 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -81,7 +81,7 @@ namespace dxcanvas } catch( const uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -122,13 +122,13 @@ namespace dxcanvas } catch( const uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } } - void DXCanvasItem::Notify( const com::sun::star::uno::Sequence& ) {} + void DXCanvasItem::Notify( const com::sun::star::uno::Sequence& ) {} void DXCanvasItem::Commit() {} bool DXCanvasItem::isDeviceUsable( const DeviceInfo& rDeviceInfo ) const diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx index 6a9056c3c1c6..73b09f1191f6 100644 --- a/canvas/source/directx/dx_config.hxx +++ b/canvas/source/directx/dx_config.hxx @@ -66,7 +66,7 @@ namespace dxcanvas bool isBlacklistCurrentDevice() const; void blacklistDevice( const DeviceInfo& rDeviceInfo ); void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const; - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); virtual void Commit(); private: diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx index dcb786a91419..97ff8b749acb 100644 --- a/canvas/source/directx/dx_spritecanvas.hxx +++ b/canvas/source/directx/dx_spritecanvas.hxx @@ -125,7 +125,7 @@ namespace dxcanvas virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); /// Retrieve rendermodule object for this Canvas const IDXRenderModuleSharedPtr& getRenderModule() const; diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx index 7af73749321a..795280c2aade 100644 --- a/canvas/source/directx/dx_textlayout.hxx +++ b/canvas/source/directx/dx_textlayout.hxx @@ -76,9 +76,9 @@ namespace dxcanvas virtual ::com::sun::star::rendering::StringContext SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); bool draw( const GraphicsSharedPtr& rGraphics, const ::com::sun::star::rendering::ViewState& rViewState, diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 62a124bd9878..791603022ed6 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -201,7 +201,7 @@ namespace dxcanvas const Point aEmptyPoint(0, 0); // create the String - const rtl::OUString aText(rText.Text); + const OUString aText(rText.Text); if( rLogicalAdvancements.getLength() ) { diff --git a/canvas/source/null/null_canvasbitmap.hxx b/canvas/source/null/null_canvasbitmap.hxx index cd2627e5857d..22ca05daf8da 100644 --- a/canvas/source/null/null_canvasbitmap.hxx +++ b/canvas/source/null/null_canvasbitmap.hxx @@ -70,9 +70,9 @@ namespace nullcanvas virtual void disposeThis(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); private: /** MUST hold here, too, since CanvasHelper only contains a diff --git a/canvas/source/null/null_canvascustomsprite.hxx b/canvas/source/null/null_canvascustomsprite.hxx index d7069d002930..38b2985b4688 100644 --- a/canvas/source/null/null_canvascustomsprite.hxx +++ b/canvas/source/null/null_canvascustomsprite.hxx @@ -110,9 +110,9 @@ namespace nullcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // Sprite virtual void redraw() const; diff --git a/canvas/source/null/null_canvasfont.hxx b/canvas/source/null/null_canvasfont.hxx index 95de15a01289..271713b29972 100644 --- a/canvas/source/null/null_canvasfont.hxx +++ b/canvas/source/null/null_canvasfont.hxx @@ -69,9 +69,9 @@ namespace nullcanvas virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); private: ::com::sun::star::rendering::FontRequest maFontRequest; diff --git a/canvas/source/null/null_spritecanvas.hxx b/canvas/source/null/null_spritecanvas.hxx index 333c4a94d097..7e7815922599 100644 --- a/canvas/source/null/null_spritecanvas.hxx +++ b/canvas/source/null/null_spritecanvas.hxx @@ -123,7 +123,7 @@ namespace nullcanvas virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); private: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > maArguments; diff --git a/canvas/source/null/null_textlayout.hxx b/canvas/source/null/null_textlayout.hxx index 08b01ff9bad6..8e2a375dd2e6 100644 --- a/canvas/source/null/null_textlayout.hxx +++ b/canvas/source/null/null_textlayout.hxx @@ -75,9 +75,9 @@ namespace nullcanvas virtual ::com::sun::star::rendering::StringContext SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); bool draw( const ::com::sun::star::rendering::ViewState& rViewState, const ::com::sun::star::rendering::RenderState& rRenderState, diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx index c1375e74d0cf..c1f857a93f64 100644 --- a/canvas/source/tools/surfaceproxy.cxx +++ b/canvas/source/tools/surfaceproxy.cxx @@ -149,10 +149,10 @@ namespace canvas // dump polygons OSL_TRACE( "Original clip polygon: %s\n" "Triangulated polygon: %s\n", - rtl::OUStringToOString( + OUStringToOString( basegfx::tools::exportToSvgD( rClipPoly ), RTL_TEXTENCODING_ASCII_US).getStr(), - rtl::OUStringToOString( + OUStringToOString( basegfx::tools::exportToSvgD( basegfx::B2DPolyPolygon(rTriangulatedPolygon) ), RTL_TEXTENCODING_ASCII_US).getStr() ); diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index 5b89e96a05eb..10bee3b48783 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -98,7 +98,7 @@ namespace vclcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); // RepaintTarget virtual bool repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index d0d884aef88f..176d4faea3bf 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -79,9 +79,9 @@ namespace vclcanvas const OutDevProviderSharedPtr& rOutDevProvider ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // RepaintTarget interface virtual bool repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index c16a9e73cf85..0014c3f91392 100644 --- a/canvas/source/vcl/canvascustomsprite.hxx +++ b/canvas/source/vcl/canvascustomsprite.hxx @@ -99,9 +99,9 @@ namespace vclcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // Sprite virtual void redraw( OutputDevice& rOutDev, diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx index e7a6fcfbb812..c22a193f1c5c 100644 --- a/canvas/source/vcl/canvasfont.hxx +++ b/canvas/source/vcl/canvasfont.hxx @@ -74,9 +74,9 @@ namespace vclcanvas virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); ::Font getVCLFont() const; diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx index c9f7139487e7..053326feb466 100644 --- a/canvas/source/vcl/devicehelper.cxx +++ b/canvas/source/vcl/devicehelper.cxx @@ -213,9 +213,9 @@ namespace vclcanvas if( mpOutDev ) { - rtl::OUString aFilename("dbg_frontbuffer"); - aFilename += rtl::OUString::valueOf(nFilePostfixCount); - aFilename += rtl::OUString(".bmp"); + OUString aFilename("dbg_frontbuffer"); + aFilename += OUString::valueOf(nFilePostfixCount); + aFilename += OUString(".bmp"); SvFileStream aStream( aFilename, STREAM_STD_READWRITE ); diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index b4827a1d540e..5ca1f77d25f0 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -132,7 +132,7 @@ namespace vclcanvas virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); // RepaintTarget virtual bool repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx index e943524b83c3..beaf3545f82a 100644 --- a/canvas/source/vcl/spritedevicehelper.cxx +++ b/canvas/source/vcl/spritedevicehelper.cxx @@ -130,9 +130,9 @@ namespace vclcanvas if( mpBackBuffer ) { - rtl::OUString aFilename("dbg_backbuffer"); - aFilename += rtl::OUString::valueOf(nFilePostfixCount); - aFilename += rtl::OUString(".bmp"); + OUString aFilename("dbg_backbuffer"); + aFilename += OUString::valueOf(nFilePostfixCount); + aFilename += OUString(".bmp"); SvFileStream aStream( aFilename, STREAM_STD_READWRITE ); diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx index f417622e46b6..f48054826d93 100644 --- a/canvas/source/vcl/textlayout.hxx +++ b/canvas/source/vcl/textlayout.hxx @@ -78,9 +78,9 @@ namespace vclcanvas virtual ::com::sun::star::rendering::StringContext SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); bool draw( OutputDevice& rOutDev, const Point& rOutpos, diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx index 8dae44486eae..e738c75ab10a 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx @@ -34,10 +34,10 @@ public: virtual ~AccStatisticsObject(); // ________ XAccessibleContext ________ - virtual ::rtl::OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); // ________ XServiceInfo ________ - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); }; } // accessibility diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index 4d58186cde4f..21d22b3fae05 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -85,17 +85,17 @@ public: throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleContext ________ - virtual ::rtl::OUString SAL_CALL getAccessibleName() + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription() + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleExtendedComponent ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText() + virtual OUString SAL_CALL getTitledBorderText() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTipText() + virtual OUString SAL_CALL getToolTipText() throw (::com::sun::star::uno::RuntimeException); // the following interface is implemented in AccessibleBase, however it is @@ -114,7 +114,7 @@ public: virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException); // ________ XServiceInfo ________ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index a2e206a49929..d6827e30fe80 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -50,7 +50,7 @@ public: virtual ~AccessibleChartShape(); // ________ XServiceInfo ________ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleContext ________ @@ -62,9 +62,9 @@ public: ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription() + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName() + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleComponent ________ @@ -81,9 +81,9 @@ public: // ________ XAccessibleExtendedComponent ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText() + virtual OUString SAL_CALL getTitledBorderText() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTipText() + virtual OUString SAL_CALL getToolTipText() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 946cc3735e75..3b1be85ad49b 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -48,7 +48,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::WeakReference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using osl::MutexGuard; //............................................................................. diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 039b38520cb2..6a2b04235f5c 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index 8fec5d533bf8..feac067d1f62 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -66,7 +66,7 @@ public: ::com::sun::star::uno::RuntimeException); // ____ XShapeDescriptor (base of XShape) ____ - virtual ::rtl::OUString SAL_CALL getShapeType() + virtual OUString SAL_CALL getShapeType() throw (::com::sun::star::uno::RuntimeException); // ____ XComponent ____ diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 65ef53cac25c..f6290969a2a9 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -102,7 +102,7 @@ public: ::com::sun::star::uno::RuntimeException); // ____ XShapeDescriptor (base of XShape) ____ - virtual ::rtl::OUString SAL_CALL getShapeType() + virtual OUString SAL_CALL getShapeType() throw (::com::sun::star::uno::RuntimeException); // ____ XNumberFormatsSupplier ____ diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 13d5316f5c67..f892059f2ea9 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { @@ -233,7 +232,7 @@ awt::Size Chart2ModelContact::GetLegendSize() const if( pProvider ) { uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend( m_xChartModel ) ); - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) ); aSize = ToSize( pProvider->getRectangleOfObject( aCID ) ); } return aSize; @@ -246,7 +245,7 @@ awt::Point Chart2ModelContact::GetLegendPosition() const if( pProvider ) { uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend( m_xChartModel ) ); - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) ); aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) ); } return aPoint; @@ -259,7 +258,7 @@ awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference< ExplicitValueProvider* pProvider( getExplicitValueProvider() ); if( pProvider && xTitle.is() ) { - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) ); aSize = ToSize( pProvider->getRectangleOfObject( aCID ) ); } return aSize; @@ -272,7 +271,7 @@ awt::Point Chart2ModelContact::GetTitlePosition( const uno::Reference< ExplicitValueProvider* pProvider( getExplicitValueProvider() ); if( pProvider && xTitle.is() ) { - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) ); aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) ); } return aPoint; @@ -285,7 +284,7 @@ awt::Size Chart2ModelContact::GetAxisSize( const uno::Reference< ExplicitValueProvider* pProvider( getExplicitValueProvider() ); if( pProvider && xAxis.is() ) { - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) ); aSize = ToSize( pProvider->getRectangleOfObject( aCID ) ); } return aSize; @@ -298,7 +297,7 @@ awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference< ExplicitValueProvider* pProvider( getExplicitValueProvider() ); if( pProvider && xAxis.is() ) { - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) ); aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) ); } return aPoint; diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index a56ee6a07d06..86d9128df4d3 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -149,7 +149,7 @@ private: //member mutable ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xChartView; - typedef std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc. + typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc. tTableMap m_aTableMap; }; diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 44e22077c7e9..0ff551e9d61d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -77,17 +77,17 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) + ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) + ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ @@ -100,16 +100,16 @@ protected: double > >& aData ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< - ::rtl::OUString > SAL_CALL getRowDescriptions() + OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aRowDescriptions ) + OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< - ::rtl::OUString > SAL_CALL getColumnDescriptions() + OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aColumnDescriptions ) + OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartData (base of XChartDataArray) ____ diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index af34ef0dc924..48c39c180279 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -73,7 +73,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index e3dd0f8ca647..09d5596979ed 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -104,14 +104,14 @@ protected: // ____ WrappedPropertySet ____ virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //own methods ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getDataSeries(); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index d7013539cdc6..edb3289c1cce 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -74,7 +74,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; using ::com::sun::star::chart::XAxis; using ::osl::MutexGuard; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index ee3a69017618..87323b186689 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -95,7 +95,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // ____ XDiagram ____ - virtual ::rtl::OUString SAL_CALL getDiagramType() + virtual OUString SAL_CALL getDiagramType() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) @@ -118,7 +118,7 @@ public: ::com::sun::star::uno::RuntimeException); // ____ XShapeDescriptor (base of XShape) ____ - virtual ::rtl::OUString SAL_CALL getShapeType() + virtual OUString SAL_CALL getShapeType() throw (::com::sun::star::uno::RuntimeException); // ____ XAxisSupplier ____ diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 96ccd65e3edf..563817814c09 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -50,7 +50,6 @@ using ::osl::MutexGuard; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; //----------------------------------------------------------------------------- diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 1aed315740a2..94e05bf431b2 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -74,7 +74,7 @@ public: ::com::sun::star::uno::RuntimeException); // ____ XShapeDescriptor (base of XShape) ____ - virtual ::rtl::OUString SAL_CALL getShapeType() + virtual OUString SAL_CALL getShapeType() throw (::com::sun::star::uno::RuntimeException); // ____ XComponent ____ diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index d2b072c98874..29ecbf883db7 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -77,33 +77,33 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); private: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 9c3d4a23f5a7..34af3c4d89f5 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index f8ca9a575468..5a437115de86 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -74,7 +74,7 @@ protected: ::com::sun::star::uno::RuntimeException); // ____ XShapeDescriptor (base of XShape) ____ - virtual ::rtl::OUString SAL_CALL getShapeType() + virtual OUString SAL_CALL getShapeType() throw (::com::sun::star::uno::RuntimeException); // ____ XComponent ____ @@ -93,16 +93,16 @@ protected: throw (::com::sun::star::uno::Exception); // ____ WrappedPropertySet ____ - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index d80169a0a3c6..ed66e266a63f 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -39,7 +39,6 @@ using ::osl::MutexGuard; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index abb5b49ec779..cc63338de0dd 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -76,33 +76,33 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); private: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); @@ -111,7 +111,7 @@ private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::cppu::OInterfaceContainerHelper m_aEventListenerContainer; - rtl::OUString m_aPropertySetName; + OUString m_aPropertySetName; }; } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index c905e665b442..af7f07e34c33 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -23,7 +23,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using namespace ::com::sun::star; //............................................................................. @@ -72,7 +71,7 @@ WrappedBaseDiagramProperty::~WrappedBaseDiagramProperty() void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - rtl::OUString aBaseDiagram; + OUString aBaseDiagram; if( ! (rOuterValue >>= aBaseDiagram) ) throw lang::IllegalArgumentException( "BaseDiagram properties require type OUString", 0, 0 ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 5fcdf8cde1f2..4bdb59ac315c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -29,7 +29,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart @@ -52,7 +51,7 @@ public: }; WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty() - : ::chart::WrappedProperty( "AutomaticPosition" , rtl::OUString() ) + : ::chart::WrappedProperty( "AutomaticPosition" , OUString() ) { } WrappedAutomaticPositionProperty::~WrappedAutomaticPositionProperty() diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 5701dc58b87e..d21f485166fe 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; //............................................................................. namespace chart @@ -286,7 +285,7 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue if( bNewValue ) { - rtl::OUString aTitleText; + OUString aTitleText; TitleHelper::createTitle( m_eTitleType, aTitleText , m_spChart2ModelContact->getChartModel(), m_spChart2ModelContact->m_xContext ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index 1c82ac132c68..a8923502b4c7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index 54d247f07da9..4f40de00153d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -34,7 +34,7 @@ class ReferenceSizePropertyProvider; class WrappedCharacterHeightProperty_Base : public WrappedProperty { public: - WrappedCharacterHeightProperty_Base( const ::rtl::OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider ); + WrappedCharacterHeightProperty_Base( const OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider ); virtual ~WrappedCharacterHeightProperty_Base(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index 6e34e4f7b6d8..5c4765297777 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -31,7 +31,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 67c8f31558fe..77083d950958 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index c2490cd9bd23..e018e72af6f0 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -33,8 +33,8 @@ class WrappedBarPositionProperty_Base : public WrappedDefaultProperty { public: WrappedBarPositionProperty_Base( - const ::rtl::OUString& rOuterName - , const ::rtl::OUString& rInnerSequencePropertyName + const OUString& rOuterName + , const OUString& rInnerSequencePropertyName , sal_Int32 nDefaultValue , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedBarPositionProperty_Base(); @@ -53,7 +53,7 @@ protected: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; sal_Int32 m_nDefaultValue; - ::rtl::OUString m_InnerSequencePropertyName; + OUString m_InnerSequencePropertyName; mutable ::com::sun::star::uno::Any m_aOuterValue; }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index cc0e6c262587..53ec6a5b08bb 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. namespace chart @@ -105,7 +104,7 @@ Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPr //----------------------------------------------------------------------------- WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty( WrappedNumberFormatProperty* pWrappedNumberFormatProperty ) - : WrappedProperty( "LinkNumberFormatToSource", rtl::OUString() ) + : WrappedProperty( "LinkNumberFormatToSource", OUString() ) , m_pWrappedNumberFormatProperty( pWrappedNumberFormatProperty ) { if( m_pWrappedNumberFormatProperty ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index 175adf65b8ae..e3ffbea7331e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -31,7 +31,6 @@ using ::com::sun::star::uno::Any; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::chart::TimeIncrement; //............................................................................. diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 19bdcc0312bf..43fc6ba744dc 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -29,7 +29,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart @@ -55,7 +54,7 @@ private: }; WrappedScaleTextProperty::WrappedScaleTextProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) - : ::chart::WrappedProperty( "ScaleText" , rtl::OUString() ) + : ::chart::WrappedProperty( "ScaleText" , OUString() ) , m_spChart2ModelContact( spChart2ModelContact ) { } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index f2cacc74cf8f..621593c4a878 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; //............................................................................. namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx index 327cc7ce3cd7..f31f14cfeb07 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx @@ -23,7 +23,6 @@ #include "macros.hxx" using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx index b2cfa390925a..9051aded4905 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx @@ -31,17 +31,17 @@ class DataSeriesPointWrapper; class WrappedSeriesAreaOrLineProperty : public WrappedProperty { public: - WrappedSeriesAreaOrLineProperty( const ::rtl::OUString& rOuterName - , const ::rtl::OUString& rInnerAreaTypeName, const ::rtl::OUString& rInnerLineTypeName + WrappedSeriesAreaOrLineProperty( const OUString& rOuterName + , const OUString& rInnerAreaTypeName, const OUString& rInnerLineTypeName , DataSeriesPointWrapper* pDataSeriesPointWrapper ); virtual ~WrappedSeriesAreaOrLineProperty(); - virtual ::rtl::OUString getInnerName() const; + virtual OUString getInnerName() const; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; - ::rtl::OUString m_aInnerAreaTypeName; - ::rtl::OUString m_aInnerLineTypeName; + OUString m_aInnerAreaTypeName; + OUString m_aInnerLineTypeName; }; } //namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 5caee3847f46..3934c8e8bcf0 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -49,10 +49,10 @@ public: virtual PROPERTYTYPE getValueFromSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet ) const =0; virtual void setValueToSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet, PROPERTYTYPE aNewValue ) const =0; - explicit WrappedSeriesOrDiagramProperty( const ::rtl::OUString& rName, const ::com::sun::star::uno::Any& rDefaulValue + explicit WrappedSeriesOrDiagramProperty( const OUString& rName, const ::com::sun::star::uno::Any& rDefaulValue , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact , tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedProperty(rName,::rtl::OUString()) + : WrappedProperty(rName,OUString()) , m_spChart2ModelContact(spChart2ModelContact) , m_aOuterValue(rDefaulValue) , m_aDefaultValue(rDefaulValue) diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 846dd0a5e489..2b0294107fff 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -30,7 +30,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 88dc00d6cfd3..23e7de1fbb19 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -40,7 +40,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 76a461a3d14e..fc8096067b9f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -32,7 +32,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -using ::rtl::OUString; //............................................................................. namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index 9d9ba85a39dd..96fedf6f9b20 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 43ee9d836df4..d751df52992a 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -86,7 +86,7 @@ public: bool bSortByXValues; }; -typedef ::comphelper::MakeMap< ::rtl::OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap; +typedef ::comphelper::MakeMap< OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap; class ChartTypeDialogController : public ChangingResource { @@ -114,13 +114,13 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); - virtual bool isSubType( const rtl::OUString& rServiceName ); - virtual ChartTypeParameter getChartTypeParameterForService( const rtl::OUString& rServiceName, const ::com::sun::star::uno::Reference< + virtual bool isSubType( const OUString& rServiceName ); + virtual ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ); virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter );//if you have different counts of subtypes you may need to adjust the index virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); - virtual rtl::OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; + virtual OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; virtual bool commitToModel( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel ); virtual ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 3d5a5b88a586..a5bfad071e96 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -85,7 +85,7 @@ public: */ double GetCellNumber( long nRow, sal_uInt16 nColumnId ) const; - bool isDateString( rtl::OUString aInputString, double& fOutDateValue ); + bool isDateString( OUString aInputString, double& fOutDateValue ); // Window virtual void Resize(); diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index 83d0be282947..62e3e2ff1af0 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -77,21 +77,21 @@ public: eCellType getCellType( sal_Int32 nAtColumn, sal_Int32 nAtRow ) const; /// If getCellType( nAtColumn, nAtRow ) returns TEXT, the result will be Nan double getCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow ); - ::rtl::OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow ); + OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow ); ::com::sun::star::uno::Any getCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow ); sal_uInt32 getNumberFormatKey( sal_Int32 nAtColumn, sal_Int32 nAtRow ); /// returns if the number could successfully be set at the given position bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue ); /// returns if the text could successfully be set at the given position - bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText ); + bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const OUString & rText ); bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::com::sun::star::uno::Any & aValue ); sal_Int32 getColumnCount() const; sal_Int32 getMaxRowCount() const; // returns the UI string of the corresponding role - ::rtl::OUString getRoleOfColumn( sal_Int32 nColumnIndex ) const; + OUString getRoleOfColumn( sal_Int32 nColumnIndex ) const; bool isCategoriesColumn( sal_Int32 nColumnIndex ) const; struct tDataHeader diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index dc99c398c969..cc0b5aeb29d7 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -56,14 +56,14 @@ public: ~DialogModel(); typedef ::std::pair< - ::rtl::OUString, + OUString, ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > > tSeriesWithChartTypeByName; - typedef ::std::map< ::rtl::OUString, ::rtl::OUString > + typedef ::std::map< OUString, OUString > tRolesWithRanges; void setTemplate( @@ -91,7 +91,7 @@ public: tRolesWithRanges getRolesWithRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, - const ::rtl::OUString & aRoleOfSequenceForLabel, + const OUString & aRoleOfSequenceForLabel, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > & xChartType ) const; @@ -127,12 +127,12 @@ public: void setCategories( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > & xCategories ); - ::rtl::OUString getCategoriesRange() const; + OUString getCategoriesRange() const; bool isCategoryDiagram() const; void detectArguments( - ::rtl::OUString & rOutRangeString, + OUString & rOutRangeString, bool & rOutUseColumns, bool & rOutFirstCellAsLabel, bool & rOutHasCategories ) const; bool allArgumentsForRectRangeDetected() const; @@ -142,12 +142,12 @@ public: void startControllerLockTimer(); - static ::rtl::OUString ConvertRoleFromInternalToUI( const ::rtl::OUString & rRoleString ); - static ::rtl::OUString GetRoleDataLabel(); + static OUString ConvertRoleFromInternalToUI( const OUString & rRoleString ); + static OUString GetRoleDataLabel(); // pass a role string (not translated) and get an index that serves for // relative ordering, to get e.g. x-values and y-values in the right order - static sal_Int32 GetRoleIndexForSorting( const ::rtl::OUString & rInternalRoleString ); + static sal_Int32 GetRoleIndexForSorting( const OUString & rInternalRoleString ); private: ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index 032f0b528760..2662c1d20d9a 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 5fb035bfde94..9406c3bad501 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace chart diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index e7ed3a36cd49..80bc72355acf 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -39,7 +39,6 @@ using namespace ::chart; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // -------------------------------------------------------------------------------- diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 28075c5df2f7..4112ee228dbe 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -34,7 +34,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 11a98c6efe2f..73dd06b475c2 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -316,7 +316,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) else { m_aED_CrossesAtCategory.SetNoSelection(); - m_aED_CrossesAt.SetTextValue(rtl::OUString()); + m_aED_CrossesAt.SetTextValue(OUString()); } } else @@ -438,7 +438,7 @@ void AxisPositionsTabPage::SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCa m_bCrossingAxisIsCategoryAxis = bCrossingAxisIsCategoryAxis; } -void AxisPositionsTabPage::SetCategories( const ::com::sun::star::uno::Sequence< rtl::OUString >& rCategories ) +void AxisPositionsTabPage::SetCategories( const ::com::sun::star::uno::Sequence< OUString >& rCategories ) { m_aCategories = rCategories; } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 7e05ca19d094..aed839bf350b 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -46,7 +46,7 @@ public: void SetNumFormatter( SvNumberFormatter* pFormatter ); void SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCategoryAxis ); - void SetCategories( const ::com::sun::star::uno::Sequence< rtl::OUString >& rCategories ); + void SetCategories( const ::com::sun::star::uno::Sequence< OUString >& rCategories ); void SupportAxisPositioning( bool bSupportAxisPositioning ); @@ -91,7 +91,7 @@ private: //member: SvNumberFormatter* m_pNumFormatter; bool m_bCrossingAxisIsCategoryAxis; - ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories; + ::com::sun::star::uno::Sequence< OUString > m_aCategories; bool m_bSupportAxisPositioning; }; diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 9413046a7d15..13a2fe4517e9 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -50,8 +50,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // -------------------------------------------------------------------------------- diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 8eed40cfe86d..c83e86cdd773 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -93,7 +93,7 @@ protected: DECL_LINK( DownButtonClickedHdl, void* ); // ____ RangeSelectionListenerParent ____ - virtual void listeningFinished( const ::rtl::OUString & rNewRange ); + virtual void listeningFinished( const OUString & rNewRange ); virtual void disposingRangeSelection(); void updateControlState(); @@ -146,7 +146,7 @@ private: RangeEdit m_aEDT_CATEGORIES; RangeSelectionButton m_aIMB_RANGE_CAT; - ::rtl::OUString m_aFixedTextRange; + OUString m_aFixedTextRange; ChartTypeTemplateProvider * m_pTemplateProvider; DialogModel & m_rDialogModel; diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index 602831e464ce..f193943fe60a 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 2f0bc8d683bf..1cff9464e6e5 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -56,7 +56,7 @@ public: virtual ~RangeChooserTabPage(); //RangeSelectionListenerParent - virtual void listeningFinished( const ::rtl::OUString & rNewRange ); + virtual void listeningFinished( const OUString & rNewRange ); virtual void disposingRangeSelection(); void commitPage(); diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 00f2231757d4..ea2ca55ebe38 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -254,7 +254,7 @@ protected: virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException); // has to be implemented by derived classes -// virtual ::rtl::OUString SAL_CALL getAccessibleName() +// virtual OUString SAL_CALL getAccessibleName() // throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() @@ -266,7 +266,7 @@ protected: throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); // has to be implemented by derived classes -// virtual ::rtl::OUString SAL_CALL getAccessibleDescription() +// virtual OUString SAL_CALL getAccessibleDescription() // throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleComponent ________ @@ -293,12 +293,12 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ________ XServiceInfo ________ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // ________ XEventListener ________ diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 2dc75d4ceaa9..205f0257ec05 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -88,13 +88,13 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // ________ XAccessibleContext ________ - virtual ::rtl::OUString SAL_CALL getAccessibleDescription() + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName() + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 7683449b8526..008ac83da0b0 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -82,9 +82,9 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription() + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName() + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index 419f642a2b4a..6acda96287ab 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -45,7 +45,7 @@ public: ::com::sun::star::beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize, - const ::rtl::OUString & rRefSizePropertyName, + const OUString & rRefSizePropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rRefSizePropSet = ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ); @@ -68,7 +68,7 @@ private: SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::com::sun::star::awt::Size > m_pRefSize; SAL_WNODEPRECATED_DECLARATIONS_POP - ::rtl::OUString m_aRefSizePropertyName; + OUString m_aRefSizePropertyName; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xRefSizePropSet; }; diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 685f1e40ab7d..fd9f75ca706c 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -74,8 +74,8 @@ public: void setUpdateAddIn( sal_Bool bUpdateAddIn ); sal_Bool getUpdateAddIn() const; - void setBaseDiagram( const rtl::OUString& rBaseDiagram ); - rtl::OUString getBaseDiagram() const; + void setBaseDiagram( const OUString& rBaseDiagram ); + OUString getBaseDiagram() const; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getAdditionalShapes() const; @@ -112,10 +112,10 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XModel ____ - virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence< + virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL() + virtual OUString SAL_CALL getURL() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs() @@ -167,17 +167,17 @@ protected: // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) + ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( - const ::rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< - ::rtl::OUString > SAL_CALL getAvailableServiceNames() + OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // ____ XAggregation ____ @@ -209,7 +209,7 @@ private: //member ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xArea; ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > m_xAddIn; - rtl::OUString m_aBaseDiagram; + OUString m_aBaseDiagram; sal_Bool m_bUpdateAddIn; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xChartView; diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index 41434d629379..5831a2351909 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -82,7 +82,7 @@ public: SfxItemSet getPositionAndSizeItemSetFromMarkedObject() const; - SdrObject* getNamedSdrObject( const rtl::OUString& rName ) const; + SdrObject* getNamedSdrObject( const OUString& rName ) const; bool IsObjectHit( SdrObject* pObj, const Point& rPnt ) const; virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 6f2eca96f514..d8762bac9c5d 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -82,7 +82,7 @@ public: // typedefs ------------------------------- typedef sal_uInt16 tWhichIdType; - typedef ::rtl::OUString tPropertyNameType; + typedef OUString tPropertyNameType; typedef sal_uInt8 tMemberIdType; typedef ::std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId; diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx index 6c7f066bbec7..2ff51e53f754 100644 --- a/chart2/source/controller/inc/ObjectNameProvider.hxx +++ b/chart2/source/controller/inc/ObjectNameProvider.hxx @@ -37,40 +37,40 @@ namespace chart class ObjectNameProvider { public: - static rtl::OUString getName( ObjectType eObjectType, bool bPlural=false ); - static rtl::OUString getAxisName( const rtl::OUString& rObjectCID + static OUString getName( ObjectType eObjectType, bool bPlural=false ); + static OUString getAxisName( const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString getGridName( const rtl::OUString& rObjectCID + static OUString getGridName( const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString getTitleName( const rtl::OUString& rObjectCID + static OUString getTitleName( const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString getTitleNameByType( TitleHelper::eTitleType eType ); + static OUString getTitleNameByType( TitleHelper::eTitleType eType ); - static rtl::OUString getNameForCID( - const rtl::OUString& rObjectCID, + static OUString getNameForCID( + const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); - static rtl::OUString getName_ObjectForSeries( + static OUString getName_ObjectForSeries( ObjectType eObjectType, - const rtl::OUString& rSeriesCID, + const OUString& rSeriesCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); - static rtl::OUString getName_ObjectForAllSeries( ObjectType eObjectType ); + static OUString getName_ObjectForAllSeries( ObjectType eObjectType ); /** Provides help texts for the various chart elements. The parameter rObjectCID has to be a ClassifiedIdentifier - see class ObjectIdentifier. */ - static rtl::OUString getHelpText( const rtl::OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false ); - static rtl::OUString getHelpText( const rtl::OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument, bool bVerbose=false ); + static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false ); + static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument, bool bVerbose=false ); /** This is used for showing the currently selected object in the status bar (command "Context") */ - static rtl::OUString getSelectedObjectText( const rtl::OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); + static OUString getSelectedObjectText( const OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); }; //............................................................................. diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx index 0b246f432c58..07f9250259c8 100644 --- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx +++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx @@ -40,7 +40,7 @@ public: , const ::com::sun::star::awt::Rectangle& rNewPositionAndSize , const ::com::sun::star::awt::Rectangle& rPageRectangle ); - static bool moveObject( const rtl::OUString& rObjectCID + static bool moveObject( const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , const ::com::sun::star::awt::Rectangle& rNewPositionAndSize , const ::com::sun::star::awt::Rectangle& rPageRectangle ); diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx index f3016fc8f991..3d1456703823 100644 --- a/chart2/source/controller/inc/RangeSelectionHelper.hxx +++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx @@ -48,11 +48,11 @@ public: ::com::sun::star::sheet::XRangeSelection > getRangeSelection(); void raiseRangeSelectionDocument(); bool chooseRange( - const ::rtl::OUString & aCurrentRange, - const ::rtl::OUString & aUIString, + const OUString & aCurrentRange, + const OUString & aUIString, RangeSelectionListenerParent & rListenerParent ); void stopRangeListening( bool bRemoveListener = true ); - bool verifyCellRange( const ::rtl::OUString & rRangeStr ); + bool verifyCellRange( const OUString & rRangeStr ); bool verifyArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments ); private: diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index 4b0c72d679d6..79364423f35c 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -30,7 +30,7 @@ namespace chart class RangeSelectionListenerParent { public: - virtual void listeningFinished( const ::rtl::OUString & rNewRange ) = 0; + virtual void listeningFinished( const OUString & rNewRange ) = 0; virtual void disposingRangeSelection() = 0; protected: @@ -46,7 +46,7 @@ class RangeSelectionListener : public public: explicit RangeSelectionListener( RangeSelectionListenerParent & rParent, - const ::rtl::OUString & rInitialRange, + const OUString & rInitialRange, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModelToLockController ); virtual ~RangeSelectionListener(); @@ -64,7 +64,7 @@ protected: private: RangeSelectionListenerParent & m_rParent; - ::rtl::OUString m_aRange; + OUString m_aRange; ControllerLockGuard m_aControllerLockGuard; }; diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index 96dd48c774ee..c07df8998447 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -38,7 +38,7 @@ struct TitleDialogData { ::com::sun::star::uno::Sequence< sal_Bool > aPossibilityList; ::com::sun::star::uno::Sequence< sal_Bool > aExistenceList; - ::com::sun::star::uno::Sequence< rtl::OUString > aTextList; + ::com::sun::star::uno::Sequence< OUString > aTextList; SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ReferenceSizeProvider > apReferenceSizeProvider; SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index ac3679fa93a4..a7746b0e16e6 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -39,8 +39,8 @@ public: ChartTypeUnoDlg( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); private: @@ -53,7 +53,7 @@ private: // XTypeProvider virtual com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPropertySet diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 5396b2310e50..2c7328787ff0 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -70,7 +70,7 @@ public: APPHELPER_SERVICE_FACTORY_HELPER(CreationWizardUnoDlg) // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -84,12 +84,12 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); DECL_LINK( DialogEventHdl, VclWindowEvent* ); diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index 4c4c75803f83..9d14cac4e674 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -48,7 +48,7 @@ public: ::com::sun::star::frame::XModel >& xChartModel, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xChartView, - const ::rtl::OUString& rSelectedObjectCID ); + const OUString& rSelectedObjectCID ); void FillItemSet( SfxItemSet& rOutAttrs ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 8daa13a7a592..8a8080e96c67 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -32,12 +32,12 @@ namespace chart class ObjectPropertiesDialogParameter { public: - ObjectPropertiesDialogParameter( const rtl::OUString& rObjectCID ); + ObjectPropertiesDialogParameter( const OUString& rObjectCID ); virtual ~ObjectPropertiesDialogParameter(); void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); ObjectType getObjectType() const; - rtl::OUString getLocalizedName() const; + OUString getLocalizedName() const; bool HasGeometryProperties() const; bool HasStatisticProperties() const; @@ -55,7 +55,7 @@ public: bool IsSupportingAxisPositioning() const; bool ShowAxisOrigin() const; bool IsCrossingAxisIsCategoryAxis() const; - const ::com::sun::star::uno::Sequence< rtl::OUString >& GetCategories() const; + const ::com::sun::star::uno::Sequence< OUString >& GetCategories() const; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > getDocument() const; @@ -63,11 +63,11 @@ public: bool IsComplexCategoriesAxis() const; private: - rtl::OUString m_aObjectCID; + OUString m_aObjectCID; ObjectType m_eObjectType; bool m_bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles) - rtl::OUString m_aLocalizedName; + OUString m_aLocalizedName; bool m_bHasGeometryProperties; bool m_bHasStatisticProperties; @@ -86,7 +86,7 @@ private: bool m_bSupportingAxisPositioning; bool m_bShowAxisOrigin; bool m_bIsCrossingAxisIsCategoryAxis; - ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories; + ::com::sun::star::uno::Sequence< OUString > m_aCategories; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDocument; diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 98addc7dfd83..f0ea1c9e4b93 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -69,7 +69,7 @@ public: void FillValueSets(); // ____ RangeSelectionListenerParent ____ - virtual void listeningFinished( const ::rtl::OUString & rNewRange ); + virtual void listeningFinished( const OUString & rNewRange ); virtual void disposingRangeSelection(); private: diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 72cdcf714e54..5a6e5b1ed28e 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -213,7 +213,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) catch( const uno::Exception &ex ) { (void)ex; - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } } diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 21bad8fcafe0..c3e98b01cab5 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -122,7 +122,7 @@ public: */ virtual bool requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - ::rtl::OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) = 0; + OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() = 0; }; @@ -219,7 +219,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> SAL_CALL queryDispatch( const ::com::sun::star::util::URL& rURL - , const rtl::OUString& rTargetFrameName + , const OUString& rTargetFrameName , sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException); @@ -398,16 +398,16 @@ public: // ::com::sun::star::lang XMultiServiceFactory //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - createInstance( const ::rtl::OUString& aServiceSpecifier ) + createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, + createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -453,7 +453,7 @@ public: virtual bool requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - ::rtl::OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ); + OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); @@ -599,9 +599,9 @@ private: //executeDispatch methods void SAL_CALL executeDispatch_ObjectProperties(); - void SAL_CALL executeDispatch_FormatObject( const ::rtl::OUString& rDispatchCommand ); - void SAL_CALL executeDlg_ObjectProperties( const ::rtl::OUString& rObjectCID ); - bool executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl::OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso ); + void SAL_CALL executeDispatch_FormatObject( const OUString& rDispatchCommand ); + void SAL_CALL executeDlg_ObjectProperties( const OUString& rObjectCID ); + bool executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso ); void SAL_CALL executeDispatch_ChartType(); @@ -694,10 +694,10 @@ private: }; /// @return , if resize/move was successful bool impl_moveOrResizeObject( - const ::rtl::OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ); - bool impl_DragDataPoint( const ::rtl::OUString & rCID, double fOffset ); + const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ); + bool impl_DragDataPoint( const OUString & rCID, double fOffset ); - ::std::set< ::rtl::OUString > impl_getAvailableCommands(); + ::std::set< OUString > impl_getAvailableCommands(); /** Creates a helper accesibility class that must be initialized via XInitialization. For parameters see @@ -713,7 +713,7 @@ private: void impl_PasteGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > & xGraphic, const ::Point & aPosition ); void impl_PasteShapes( SdrModel* pModel ); - void impl_PasteStringAsTextShape( const ::rtl::OUString& rString, const ::com::sun::star::awt::Point& rPosition ); + void impl_PasteStringAsTextShape( const OUString& rString, const ::com::sun::star::awt::Point& rPosition ); void impl_SetMousePointer( const MouseEvent & rEvent ); void impl_ClearSelection(); diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 8c7c733ff59b..8741ec9a21b7 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -72,7 +72,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; //............................................................................. diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 8091aa63046f..b0c56b81fe26 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -116,7 +116,7 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectang void SAL_CALL ChartController::executeDispatch_PositionAndSize() { - const ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); + const OUString aCID( m_aSelection.getSelectedCID() ); if( aCID.isEmpty() ) return; diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 145e7e34ca8a..f06c271b5c89 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -69,7 +69,6 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 80056ac468b8..8fd50b0a64d7 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -135,7 +135,7 @@ bool ChartController::EndTextEdit() pOutliner->GetParagraph( 0 ), pOutliner->GetParagraphCount() ); - ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID(); + OUString aObjectCID = m_aSelection.getSelectedCID(); if ( !aObjectCID.isEmpty() ) { uno::Reference< beans::XPropertySet > xPropSet = diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 17581e3b06ab..889be4313877 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -84,7 +84,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -601,7 +600,7 @@ bool ChartController::executeDispatch_Delete() bool bReturn = false; // remove the selected object - rtl::OUString aCID( m_aSelection.getSelectedCID() ); + OUString aCID( m_aSelection.getSelectedCID() ); if( !aCID.isEmpty() ) { if( !isObjectDeleteable( uno::Any( aCID ) ) ) @@ -759,7 +758,7 @@ bool ChartController::executeDispatch_Delete() { UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::DELETE, ::rtl::OUString( String( + ActionDescriptionProvider::DELETE, OUString( String( SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))), m_xUndoManager ); chart2::DataPointLabel aLabel; diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index a104d13b9a60..0c748f13d7c5 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -82,7 +82,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; //............................................................................. namespace chart @@ -134,9 +133,9 @@ bool lcl_MoveObjectLogic( void lcl_insertMenuCommand( const uno::Reference< awt::XPopupMenu > & xMenu, const uno::Reference< awt::XMenuExtended > & xMenuEx, - sal_Int16 nId, const ::rtl::OUString & rCommand ) + sal_Int16 nId, const OUString & rCommand ) { - static ::rtl::OUString aEmptyString; + static OUString aEmptyString; xMenu->insertItem( nId, aEmptyString, 0, -1 ); xMenuEx->setCommand( nId, rCommand ); } @@ -729,7 +728,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) } else { - rtl::OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) ); + OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) ); if( aDragMethodServiceName.equals( ObjectIdentifier::getPieSegmentDragMethodServiceName() ) ) pDragMethod = new DragMethod_PieSegment( *pDrawViewWrapper, m_aSelection.getSelectedCID(), getModel() ); } @@ -936,7 +935,7 @@ void ChartController::execute_DoubleClick( const Point* pMousePixel ) bool bEditText = false; if ( m_aSelection.hasSelection() ) { - ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); + OUString aCID( m_aSelection.getSelectedCID() ); if ( !aCID.isEmpty() ) { ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID ); @@ -1404,7 +1403,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) nCode == KEY_DOWN ) { bDrag = true; - rtl::OUString aParameter( ObjectIdentifier::getDragParameterString( m_aSelection.getSelectedCID() )); + OUString aParameter( ObjectIdentifier::getDragParameterString( m_aSelection.getSelectedCID() )); sal_Int32 nOffsetPercentDummy( 0 ); awt::Point aMinimumPosition( 0, 0 ); awt::Point aMaximumPosition( 0, 0 ); @@ -1577,7 +1576,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) bool ChartController::requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - ::rtl::OUString & rOutQuickHelpText, + OUString & rOutQuickHelpText, awt::Rectangle & rOutEqualRect ) { uno::Reference< frame::XModel > xChartModel; @@ -1587,7 +1586,7 @@ bool ChartController::requestQuickHelp( return false; // help text - ::rtl::OUString aCID; + OUString aCID; if( m_pDrawViewWrapper ) { aCID = SelectionHelper::getHitObjectCID( @@ -1622,9 +1621,9 @@ bool ChartController::requestQuickHelp( if ( rSelection.hasValue() ) { const uno::Type& rType = rSelection.getValueType(); - if ( rType == ::getCppuType( static_cast< const ::rtl::OUString* >( 0 ) ) ) + if ( rType == ::getCppuType( static_cast< const OUString* >( 0 ) ) ) { - ::rtl::OUString aNewCID; + OUString aNewCID; if ( ( rSelection >>= aNewCID ) && m_aSelection.setSelection( aNewCID ) ) { bSuccess = true; @@ -1672,7 +1671,7 @@ bool ChartController::requestQuickHelp( uno::Any aReturn; if ( m_aSelection.hasSelection() ) { - ::rtl::OUString aCID( m_aSelection.getSelectedCID() ); + OUString aCID( m_aSelection.getSelectedCID() ); if ( !aCID.isEmpty() ) { aReturn = uno::makeAny( aCID ); @@ -1746,7 +1745,7 @@ void ChartController::impl_selectObjectAndNotiy() } bool ChartController::impl_moveOrResizeObject( - const ::rtl::OUString & rCID, + const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ) @@ -1829,7 +1828,7 @@ bool ChartController::impl_moveOrResizeObject( return bResult; } -bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double fAdditionalOffset ) +bool ChartController::impl_DragDataPoint( const OUString & rCID, double fAdditionalOffset ) { bool bResult = false; if( fAdditionalOffset < -1.0 || fAdditionalOffset > 1.0 || fAdditionalOffset == 0.0 ) @@ -1985,7 +1984,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) return; } - ::rtl::OUString aHitObjectCID( + OUString aHitObjectCID( SelectionHelper::getHitObjectCID( aMousePos, *m_pDrawViewWrapper, true /*bGetDiagramInsteadOf_Wall*/ )); diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 83d075a045c5..e09c298ddfa0 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index 5b2c03b3aaf6..2e2713ba3b67 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -62,10 +62,10 @@ ChartFrameLoader::~ChartFrameLoader() APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME) - uno::Sequence< rtl::OUString > ChartFrameLoader + uno::Sequence< OUString > ChartFrameLoader ::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_FRAMELOADER_SERVICE_NAME; return aSNS; } @@ -146,7 +146,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL())); if( aIt != aMediaDescriptor.end()) { - ::rtl::OUString aURL( (*aIt).second.get< ::rtl::OUString >()); + OUString aURL( (*aIt).second.get< OUString >()); if( aURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:factory/schart" ))) { diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index efc9782c1874..a1742ea40502 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index d4b78aa7256b..2e1bd460a2e1 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -203,7 +203,7 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt ) { // Point aLogicHitPos = PixelToLogic( rHEvt.GetMousePosPixel()); // old chart: GetPointerPosPixel() Point aLogicHitPos = PixelToLogic( GetPointerPosPixel()); - ::rtl::OUString aQuickHelpText; + OUString aQuickHelpText; awt::Rectangle aHelpRect; bool bIsBalloonHelp( Help::IsBalloonHelpEnabled() ); bHelpHandled = m_pWindowController->requestQuickHelp( aLogicHitPos, bIsBalloonHelp, aQuickHelpText, aHelpRect ); diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index 0f609260aea5..2c547fba4c04 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index c0a82ecb61ca..b1d8b9f14000 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -73,10 +73,10 @@ protected: called with this parameter set to give an initial state. */ virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) = 0; - /** calls fireStatusEvent( ::rtl::OUString, xSingleListener ) + /** calls fireStatusEvent( OUString, xSingleListener ) */ void fireAllStatusEvents( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); @@ -90,12 +90,12 @@ protected: called with this parameter set to give an initial state. */ void fireStatusEventForURL( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Any & rState, bool bEnabled, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >(), - const ::rtl::OUString & rFeatureDescriptor = ::rtl::OUString() ); + const OUString & rFeatureDescriptor = OUString() ); // ____ XDispatch ____ virtual void SAL_CALL dispatch( @@ -130,7 +130,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; private: - typedef ::std::map< ::rtl::OUString, ::cppu::OInterfaceContainerHelper* > + typedef ::std::map< OUString, ::cppu::OInterfaceContainerHelper* > tListenerMap; tListenerMap m_aListeners; diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index 2c02b0261291..483fedf4d9d3 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx index 2e4a3b3131f6..0f568f7bf08c 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.hxx +++ b/chart2/source/controller/main/CommandDispatchContainer.hxx @@ -84,7 +84,7 @@ public: void setChartDispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xChartDispatch, - const ::std::set< ::rtl::OUString > & rChartCommands ); + const ::std::set< OUString > & rChartCommands ); /** Returns the dispatch that is able to do the command given in rURL, if implemented here. If the URL is not implemented here, it should be @@ -117,7 +117,7 @@ public: private: typedef - ::std::map< ::rtl::OUString, + ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > tDispatchMap; @@ -132,9 +132,9 @@ private: ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xChartDispatcher; - ::std::set< ::rtl::OUString > m_aChartCommands; + ::std::set< OUString > m_aChartCommands; - ::std::set< ::rtl::OUString > m_aContainerDocumentCommands; + ::std::set< OUString > m_aContainerDocumentCommands; ChartController* m_pChartController; DrawCommandDispatch* m_pDrawCommandDispatch; diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index 812dbe58a050..31a088120f35 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -57,11 +57,11 @@ public: FieldUnit getFieldUnit(); virtual void Commit(); - virtual void Notify( const uno::Sequence& aPropertyNames); + virtual void Notify( const uno::Sequence& aPropertyNames); }; CalcConfigItem::CalcConfigItem() - : ConfigItem( ::rtl::OUString( "Office.Calc/Layout" )) + : ConfigItem( OUString( "Office.Calc/Layout" )) { } @@ -70,7 +70,7 @@ CalcConfigItem::~CalcConfigItem() } void CalcConfigItem::Commit() {} -void CalcConfigItem::Notify( const uno::Sequence& ) {} +void CalcConfigItem::Notify( const uno::Sequence& ) {} FieldUnit CalcConfigItem::getFieldUnit() { diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index bcde205f12e4..f4c1669c3753 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -701,7 +700,7 @@ bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand ) return false; } -bool ControllerCommandDispatch::isShapeControllerCommandAvailable( const ::rtl::OUString& rCommand ) +bool ControllerCommandDispatch::isShapeControllerCommandAvailable( const OUString& rCommand ) { ShapeController* pShapeController = ( m_pDispatchContainer ? m_pDispatchContainer->getShapeController() : NULL ); if ( pShapeController ) diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index bf0895edfabb..a165bc259b46 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -82,7 +82,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); // ____ XModifyListener ____ @@ -97,13 +97,13 @@ protected: private: void fireStatusEventForURLImpl( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); - bool commandAvailable( const ::rtl::OUString & rCommand ); + bool commandAvailable( const OUString & rCommand ); void updateCommandAvailability(); - bool isShapeControllerCommandAvailable( const ::rtl::OUString& rCommand ); + bool isShapeControllerCommandAvailable( const OUString& rCommand ); ChartController* m_pChartController; ::com::sun::star::uno::Reference< @@ -116,8 +116,8 @@ private: ::std::auto_ptr< impl::ModelState > m_apModelState; ::std::auto_ptr< impl::ControllerState > m_apControllerState; - mutable ::std::map< ::rtl::OUString, bool > m_aCommandAvailability; - mutable ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > m_aCommandArguments; + mutable ::std::map< OUString, bool > m_aCommandAvailability; + mutable ::std::map< OUString, ::com::sun::star::uno::Any > m_aCommandArguments; CommandDispatchContainer* m_pDispatchContainer; }; diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index 0c107d0a3538..2724551354a3 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -41,7 +41,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::WeakReference; DragMethod_Base::DragMethod_Base( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel , ActionDescriptionProvider::ActionType eActionType ) : SdrDragMethod( rDrawViewWrapper ) @@ -61,7 +61,7 @@ Reference< frame::XModel > DragMethod_Base::getChartModel() const return Reference< frame::XModel >( m_xChartModel ); } -rtl::OUString DragMethod_Base::getUndoDescription() const +OUString DragMethod_Base::getUndoDescription() const { return ActionDescriptionProvider::createDescription( m_eActionType, diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index 148378040243..28ffa918d6da 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -33,12 +33,12 @@ namespace chart class DragMethod_Base : public SdrDragMethod { public: - DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const rtl::OUString& rObjectCID + DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::MOVE ); virtual ~DragMethod_Base(); - virtual rtl::OUString getUndoDescription() const; + virtual OUString getUndoDescription() const; virtual void TakeSdrDragComment(String& rStr) const; virtual Pointer GetSdrDragPointer() const; @@ -48,7 +48,7 @@ protected: protected: DrawViewWrapper& m_rDrawViewWrapper; - rtl::OUString m_aObjectCID; + OUString m_aObjectCID; ActionDescriptionProvider::ActionType m_eActionType; private: diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 27267eaab5a6..abf58cbc149e 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -39,7 +39,7 @@ using ::com::sun::star::uno::Reference; using ::basegfx::B2DVector; DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel ) : DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel ) , m_aStartVector(100.0,100.0) @@ -48,7 +48,7 @@ DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper , m_aDragDirection(1000.0,1000.0) , m_fDragRange( 1.0 ) { - rtl::OUString aParameter( ObjectIdentifier::getDragParameterString( m_aObjectCID ) ); + OUString aParameter( ObjectIdentifier::getDragParameterString( m_aObjectCID ) ); sal_Int32 nOffsetPercent(0); awt::Point aMinimumPosition(0,0); @@ -75,7 +75,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment() void DragMethod_PieSegment::TakeSdrDragComment(String& rStr) const { rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED); - rStr.SearchAndReplaceAscii( "%PERCENTVALUE", rtl::OUString::valueOf( static_cast((m_fAdditionalOffset+m_fInitialOffset)*100.0) )); + rStr.SearchAndReplaceAscii( "%PERCENTVALUE", OUString::valueOf( static_cast((m_fAdditionalOffset+m_fInitialOffset)*100.0) )); } bool DragMethod_PieSegment::BeginSdrDrag() { diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx index 022a188dda9a..a92a855e21ce 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.hxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx @@ -28,7 +28,7 @@ namespace chart class DragMethod_PieSegment : public DragMethod_Base { public: - DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const rtl::OUString& rObjectCID + DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); virtual ~DragMethod_PieSegment(); diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index ce8a0e120aaa..00cada78f8a1 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel , RotationDirection eRotationDirection ) : DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel, ActionDescriptionProvider::ROTATE ) diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx index 04d6f6e46cff..e48ff981231a 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx @@ -39,7 +39,7 @@ public: }; DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper - , const rtl::OUString& rObjectCID + , const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , RotationDirection eRotationDirection ); diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 57b629e0fd05..ffe3ccb95cb8 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -59,13 +59,13 @@ namespace //............................................................................. // comparing two PropertyValue instances - struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, ::rtl::OUString, bool > + struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString, bool > { - bool operator() ( const beans::PropertyValue& rPropValue, const ::rtl::OUString& rName ) const + bool operator() ( const beans::PropertyValue& rPropValue, const OUString& rName ) const { return rPropValue.Name.equals( rName ); } - bool operator() ( const ::rtl::OUString& rName, const beans::PropertyValue& rPropValue ) const + bool operator() ( const OUString& rName, const beans::PropertyValue& rPropValue ) const { return rName.equals( rPropValue.Name ); } @@ -97,11 +97,11 @@ void DrawCommandDispatch::initialize() FeatureCommandDispatchBase::initialize(); } -bool DrawCommandDispatch::isFeatureSupported( const ::rtl::OUString& rCommandURL ) +bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL ) { sal_uInt16 nFeatureId = 0; - ::rtl::OUString aBaseCommand; - ::rtl::OUString aCustomShapeType; + OUString aBaseCommand; + OUString aCustomShapeType; return parseCommandURL( rCommandURL, &nFeatureId, &aBaseCommand, &aCustomShapeType ); } @@ -137,7 +137,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj ) sal_Bool bAttributesAppliedFromGallery = sal_False; if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - ::std::vector< ::rtl::OUString > aObjList; + ::std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { for ( sal_uInt16 i = 0; i < aObjList.size(); ++i ) @@ -244,15 +244,15 @@ void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ ) { } -FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand ) +FeatureState DrawCommandDispatch::getState( const OUString& rCommand ) { FeatureState aReturn; aReturn.bEnabled = false; aReturn.aState <<= false; sal_uInt16 nFeatureId = 0; - ::rtl::OUString aBaseCommand; - ::rtl::OUString aCustomShapeType; + OUString aBaseCommand; + OUString aCustomShapeType; if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) ) { switch ( nFeatureId ) @@ -288,7 +288,7 @@ FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand ) return aReturn; } -void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) +void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) { (void)rArgs; @@ -297,8 +297,8 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen bool bCreate = false; sal_uInt16 nFeatureId = 0; - ::rtl::OUString aBaseCommand; - ::rtl::OUString aCustomShapeType; + OUString aBaseCommand; + OUString aCustomShapeType; if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) ) { m_nFeatureId = nFeatureId; @@ -382,7 +382,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen pDrawViewWrapper->SetCreateMode(); } - const ::rtl::OUString sKeyModifier( "KeyModifier" ); + const OUString sKeyModifier( "KeyModifier" ); const beans::PropertyValue* pIter = rArgs.getConstArray(); const beans::PropertyValue* pEnd = pIter + rArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if( @@ -577,7 +577,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID ) } bool DrawCommandDispatch::parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId, - OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType ) + OUString* pBaseCommand, OUString* pCustomShapeType ) { bool bFound = true; sal_uInt16 nFeatureId = 0; diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 1510346f395b..afa6799ab11c 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -45,7 +45,7 @@ public: // late initialisation, especially for adding as listener virtual void initialize(); - virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL ); + virtual bool isFeatureSupported( const OUString& rCommandURL ); void setAttributes( SdrObject* pObj ); void setLineEnds( SfxItemSet& rAttr ); @@ -59,10 +59,10 @@ protected: throw (::com::sun::star::uno::RuntimeException); // state of a feature - virtual FeatureState getState( const ::rtl::OUString& rCommand ); + virtual FeatureState getState( const OUString& rCommand ); // execute a feature - virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); // all the features which should be handled by this class virtual void describeSupportedFeatures(); @@ -71,10 +71,10 @@ private: void setInsertObj( sal_uInt16 eObj ); SdrObject* createDefaultObject( const sal_uInt16 nID ); - bool parseCommandURL( const ::rtl::OUString& rCommandURL, sal_uInt16* pnFeatureId, ::rtl::OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType ); + bool parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId, OUString* pBaseCommand, OUString* pCustomShapeType ); ChartController* m_pChartController; - ::rtl::OUString m_aCustomShapeType; + OUString m_aCustomShapeType; }; //............................................................................. diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index b59945579bbb..2711702d8e7f 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -71,7 +71,7 @@ void lcl_addObjectsToList( const ObjectHierarchy& rHierarchy, const ObjectHierar while( aIt != aChildren.end() ) { ObjectHierarchy::tOID aOID = *aIt; - ::rtl::OUString aCID = aOID.getObjectCID(); + OUString aCID = aOID.getObjectCID(); ListBoxEntryData aEntry; aEntry.OID = aOID; aEntry.UIName += ObjectNameProvider::getNameForCID( aCID, xChartDoc ); @@ -97,7 +97,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() { Reference< view::XSelectionSupplier > xSelectionSupplier( xChartController, uno::UNO_QUERY); ObjectHierarchy::tOID aSelectedOID; - rtl::OUString aSelectedCID; + OUString aSelectedCID; if( xSelectionSupplier.is() ) { aSelectedOID = ObjectIdentifier( xSelectionSupplier->getSelection() ); @@ -123,7 +123,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() { if ( aSelectedOID.isAutoGeneratedObject() ) { - rtl::OUString aSeriesCID = ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::getSeriesParticleFromCID( aSelectedCID ) ); + OUString aSeriesCID = ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::getSeriesParticleFromCID( aSelectedCID ) ); for( aIt = m_aEntries.begin(); aIt != m_aEntries.end(); ++aIt ) { if( aIt->OID.getObjectCID().match( aSeriesCID ) ) @@ -144,8 +144,8 @@ void SelectorListBox::UpdateChartElementsListAndSelection() { ListBoxEntryData aEntry; SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() ); - rtl::OUString aName = pSelectedObj ? pSelectedObj->GetName() : rtl::OUString(); - aEntry.UIName = ( aName.isEmpty() ? ::rtl::OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName ); + OUString aName = pSelectedObj ? pSelectedObj->GetName() : OUString(); + aEntry.UIName = ( aName.isEmpty() ? OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName ); aEntry.OID = aSelectedOID; m_aEntries.push_back( aEntry ); } @@ -252,9 +252,9 @@ Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::Creat APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, lcl_aServiceName ); //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() +Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() { - Sequence< ::rtl::OUString > aServices(1); + Sequence< OUString > aServices(1); aServices[ 0 ] = "com.sun.star.frame.ToolbarController"; return aServices; } diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index f32fa37c32f6..025500f9f2ef 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -37,7 +37,7 @@ namespace chart struct ListBoxEntryData { - rtl::OUString UIName; + OUString UIName; ObjectHierarchy::tOID OID; sal_Int32 nHierarchyDepth; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index 5362827d47f1..c3b3ce7f5f58 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -44,7 +44,7 @@ void FeatureCommandDispatchBase::initialize() fillSupportedFeatures(); } -bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCommandURL ) +bool FeatureCommandDispatchBase::isFeatureSupported( const OUString& rCommandURL ) { SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( rCommandURL ); if ( aIter != m_aSupportedFeatures.end() ) @@ -54,7 +54,7 @@ bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCom return false; } -void FeatureCommandDispatchBase::fireStatusEvent( const ::rtl::OUString& rURL, +void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL, const Reference< frame::XStatusListener >& xSingleListener /* = 0 */ ) { if ( rURL.isEmpty() ) @@ -78,7 +78,7 @@ void FeatureCommandDispatchBase::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) throw (uno::RuntimeException) { - ::rtl::OUString aCommand( URL.Complete ); + OUString aCommand( URL.Complete ); if ( getState( aCommand ).bEnabled ) { execute( aCommand, Arguments ); @@ -89,7 +89,7 @@ void FeatureCommandDispatchBase::implDescribeSupportedFeature( const sal_Char* p sal_uInt16 nId, sal_Int16 nGroup ) { ControllerFeature aFeature; - aFeature.Command = ::rtl::OUString::createFromAscii( pAsciiCommandURL ); + aFeature.Command = OUString::createFromAscii( pAsciiCommandURL ); aFeature.nFeatureId = nId; aFeature.GroupId = nGroup; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index 06a534251cd5..59d1b32451b9 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -33,9 +33,9 @@ struct ControllerFeature: public ::com::sun::star::frame::DispatchInformation sal_uInt16 nFeatureId; }; -typedef ::std::map< ::rtl::OUString, +typedef ::std::map< OUString, ControllerFeature, - ::std::less< ::rtl::OUString > > SupportedFeatures; + ::std::less< OUString > > SupportedFeatures; struct FeatureState { @@ -57,7 +57,7 @@ public: // late initialisation, especially for adding as listener virtual void initialize(); - virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL ); + virtual bool isFeatureSupported( const OUString& rCommandURL ); protected: // XDispatch @@ -65,14 +65,14 @@ protected: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); - virtual void fireStatusEvent( const ::rtl::OUString& rURL, + virtual void fireStatusEvent( const OUString& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xSingleListener ); // state of a feature - virtual FeatureState getState( const ::rtl::OUString& rCommand ) = 0; + virtual FeatureState getState( const OUString& rCommand ) = 0; // execute a feature - virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0; + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0; // all the features which should be handled by this class virtual void describeSupportedFeatures() = 0; diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 6ed11f9f64fd..ebcb60569747 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -375,12 +374,12 @@ void ImplObjectHierarchy::createWallAndFloor( if( bHasWall && bIsThreeD ) { rContainer.push_back( - ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) ) ); + ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) ) ); Reference< beans::XPropertySet > xFloor( xDiagram->getFloor()); if( xFloor.is()) rContainer.push_back( - ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, rtl::OUString() ) ) ); + ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) ) ); } } @@ -443,7 +442,7 @@ void ImplObjectHierarchy::createDataSeriesTree( // data lablels if( DataSeriesHelper::hasDataLabelsAtSeries( xSeries ) ) { - rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); aChildParticle+=("="); aSeriesSubContainer.push_back( ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ) ); diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index 047d55dd5709..fa57560005f7 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -128,7 +128,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType return true; } -bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID +bool PositionAndSizeHelper::moveObject( const OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel , const awt::Rectangle& rNewPositionAndSize , const awt::Rectangle& rPageRectangle diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 16c795875aa6..950c05df949b 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -43,11 +43,11 @@ using namespace ::com::sun::star; namespace { -rtl::OUString lcl_getObjectName( SdrObject* pObj ) +OUString lcl_getObjectName( SdrObject* pObj ) { if(pObj) return pObj->GetName(); - return rtl::OUString(); + return OUString(); } void impl_selectObject( SdrObject* pObjectToSelect, DrawViewWrapper& rDrawViewWrapper ) @@ -71,7 +71,7 @@ bool Selection::hasSelection() return m_aSelectedOID.isValid(); } -rtl::OUString Selection::getSelectedCID() +OUString Selection::getSelectedCID() { return m_aSelectedOID.getObjectCID(); } @@ -86,7 +86,7 @@ ObjectIdentifier Selection::getSelectedOID() const return m_aSelectedOID; } -bool Selection::setSelection( const ::rtl::OUString& rCID ) +bool Selection::setSelection( const OUString& rCID ) { if ( !rCID.equals( m_aSelectedOID.getObjectCID() ) ) { @@ -256,7 +256,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* if ( !m_aSelectedOID.isAdditionalShape() ) { - rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model + OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model if ( !m_aSelectedOID.isAutoGeneratedObject() ) { @@ -264,8 +264,8 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* } //check whether the diagram was hit but not selected (e.g. because it has no filling): - rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); - rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model + OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ); + OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject(); if( bBackGroundHit ) { @@ -283,7 +283,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* //check whether the legend was hit but not selected (e.g. because it has no filling): if( bBackGroundHit || m_aSelectedOID.getObjectCID().equals( aDiagramCID ) ) { - rtl::OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model + OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID ); if( pLegend ) { @@ -338,13 +338,13 @@ bool Selection::isAdditionalShapeSelected() const //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject - , rtl::OUString& rOutName + , OUString& rOutName , bool bGivenObjectMayBeResult ) { SolarMutexGuard aSolarGuard; //find the deepest named group SdrObject* pObj = pInOutObject; - rtl::OUString aName; + OUString aName; if( bGivenObjectMayBeResult ) aName = lcl_getObjectName( pObj ); @@ -374,7 +374,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject , ObjectIdentifier& rOutObject , bool bGivenObjectMayBeResult ) { - rtl::OUString aName; + OUString aName; if ( findNamedParent( pInOutObject, aName, bGivenObjectMayBeResult ) ) { rOutObject = ObjectIdentifier( aName ); @@ -384,7 +384,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject } bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos - , const rtl::OUString& rNameOfSelectedObject + , const OUString& rNameOfSelectedObject , const DrawViewWrapper& rDrawViewWrapper ) { if(rNameOfSelectedObject.isEmpty()) @@ -398,14 +398,14 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos return true; } -::rtl::OUString SelectionHelper::getHitObjectCID( +OUString SelectionHelper::getHitObjectCID( const Point& rMPos, DrawViewWrapper& rDrawViewWrapper, bool bGetDiagramInsteadOf_Wall ) { // //- solar mutex SolarMutexGuard aSolarGuard; - rtl::OUString aRet; + OUString aRet; SdrObject* pNewObj = rDrawViewWrapper.getHitObject(rMPos); aRet = lcl_getObjectName( pNewObj );//name of pNewObj @@ -421,10 +421,10 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos //accept only named objects while searching for the object to select if( !findNamedParent( pNewObj, aRet, true ) ) { - aRet = ::rtl::OUString(); + aRet = OUString(); } - rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model + OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model //get page when nothing was hit if( aRet.isEmpty() && !pNewObj ) { @@ -436,7 +436,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos { if( aRet.equals( aPageCID ) ) { - rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); + OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ); //todo: if more than one diagram is available in future do chack the list of all diagrams here SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID ); if( pDiagram ) @@ -449,11 +449,11 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos } else if( bGetDiagramInsteadOf_Wall ) { - rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model + OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model if( aRet.equals( aWallCID ) ) { - rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ); + OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ); aRet = aDiagramCID; } } @@ -463,7 +463,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos // \\- solar mutex } -bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID +bool SelectionHelper::isRotateableObject( const OUString& rCID , const uno::Reference< frame::XModel >& xChartModel ) { if( !ObjectIdentifier::isRotateableObject( rCID ) ) @@ -497,7 +497,7 @@ SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj ) { if(!pObj) return 0; - rtl::OUString aName( lcl_getObjectName( pObj ) ); + OUString aName( lcl_getObjectName( pObj ) ); if( aName.match("MarkHandles") || aName.match("HandlesOnly") ) return pObj; if( !aName.isEmpty() )//dont't get the markhandles of a different object @@ -643,7 +643,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) if( !pSubList )//no group object !pObj->IsGroupObject() return false; - rtl::OUString aName( lcl_getObjectName( pObj ) ); + OUString aName( lcl_getObjectName( pObj ) ); ObjectType eObjectType( ObjectIdentifier::getObjectType( aName ) ); if( OBJECTTYPE_DATA_POINT == eObjectType || OBJECTTYPE_DATA_LABEL == eObjectType @@ -660,7 +660,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) SdrObject* pSubObj = aIterator.Next(); if( OBJECTTYPE_DATA_SERIES == eObjectType ) { - rtl::OUString aSubName( lcl_getObjectName( pSubObj ) ); + OUString aSubName( lcl_getObjectName( pSubObj ) ); ObjectType eSubObjectType( ObjectIdentifier::getObjectType( aSubName ) ); if( eSubObjectType!=OBJECTTYPE_DATA_POINT ) return false; diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx index 992043f68867..5a4273a7fb2a 100644 --- a/chart2/source/controller/main/SelectionHelper.hxx +++ b/chart2/source/controller/main/SelectionHelper.hxx @@ -41,7 +41,7 @@ class Selection public: //methods bool hasSelection(); - rtl::OUString getSelectedCID(); + OUString getSelectedCID(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getSelectedAdditionalShape(); ObjectIdentifier getSelectedOID() const; @@ -54,7 +54,7 @@ public: //methods bool isAdditionalShapeSelected() const; //returns true if selection has changed - bool setSelection( const ::rtl::OUString& rCID ); + bool setSelection( const OUString& rCID ); bool setSelection( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); @@ -87,7 +87,7 @@ class SelectionHelper : public MarkHandleProvider { public: static bool findNamedParent( SdrObject*& pInOutObject - , rtl::OUString& rOutName + , OUString& rOutName , bool bGivenObjectMayBeResult ); static bool findNamedParent( SdrObject*& pInOutObject , ObjectIdentifier& rOutObject @@ -95,15 +95,15 @@ public: static SdrObject* getMarkHandlesObject( SdrObject* pObj ); static E3dScene* getSceneToRotate( SdrObject* pObj ); static bool isDragableObjectHitTwice( const Point& rMPos - , const rtl::OUString& rNameOfSelectedObject + , const OUString& rNameOfSelectedObject , const DrawViewWrapper& rDrawViewWrapper ); - static ::rtl::OUString getHitObjectCID( + static OUString getHitObjectCID( const Point& rMPos, DrawViewWrapper& rDrawViewWrapper, bool bGetDiagramInsteadOf_Wall=false ); - static bool isRotateableObject( const ::rtl::OUString& rCID + static bool isRotateableObject( const OUString& rCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 49c94d5b129d..1e7adfd522d4 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -83,7 +83,7 @@ void ShapeController::disposing( const lang::EventObject& /* Source */ ) { } -FeatureState ShapeController::getState( const ::rtl::OUString& rCommand ) +FeatureState ShapeController::getState( const OUString& rCommand ) { FeatureState aReturn; aReturn.bEnabled = false; @@ -150,7 +150,7 @@ FeatureState ShapeController::getState( const ::rtl::OUString& rCommand ) return aReturn; } -void ShapeController::execute( const ::rtl::OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) +void ShapeController::execute( const OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs ) { (void)rArgs; @@ -470,7 +470,7 @@ void ShapeController::executeDispatch_RenameObject() SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject(); if ( pSelectedObj ) { - rtl::OUString aName = pSelectedObj->GetName(); + OUString aName = pSelectedObj->GetName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index 268f94e3e1a1..ff3b5a0afc6b 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -55,10 +55,10 @@ protected: throw (::com::sun::star::uno::RuntimeException); // state of a feature - virtual FeatureState getState( const ::rtl::OUString& rCommand ); + virtual FeatureState getState( const OUString& rCommand ); // execute a feature - virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); // all the features which should be handled by this class virtual void describeSupportedFeatures(); diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index f3107688f053..4c5d70df90c8 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -56,7 +56,7 @@ Sequence< OUString > ShapeToolbarController::getSupportedServiceNames_Static() t return aSupported; } -::sal_Bool ShapeToolbarController::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) +::sal_Bool ShapeToolbarController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return ::comphelper::existsValue( ServiceName, getSupportedServiceNames_Static() ); } @@ -198,7 +198,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even { continue; } - ::rtl::OUString aCmd = rTb.GetItemCommand( nId ); + OUString aCmd = rTb.GetItemCommand( nId ); if ( aCmd == Event.FeatureURL.Complete ) { rTb.EnableItem( nId, Event.IsEnabled ); @@ -208,7 +208,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even } else { - ::rtl::OUString aItemText; + OUString aItemText; if ( Event.State >>= aItemText ) { rTb.SetItemText( nId, aItemText ); @@ -246,7 +246,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno m_nSlotId == SID_DRAWTBX_CS_STAR ); } -::rtl::OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) +OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); @@ -255,10 +255,10 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno { return xSub->getSubToolbarName(); } - return ::rtl::OUString(); + return OUString(); } -void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException) +void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 97390e9954db..c8c7d83e1fd8 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -61,15 +61,15 @@ public: virtual void SAL_CALL release() throw (); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // needed by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -82,8 +82,8 @@ public: // ::com::sun::star::frame::XSubToolbarController virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 55da8a8bf1e1..db7cfc9be370 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index bfabd3d785de..39fef92a8ced 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -79,7 +79,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); // ____ XSelectionChangeListener ____ diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index 7aca7704be7e..e27276cf18d0 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; namespace chart { @@ -87,7 +86,7 @@ void SAL_CALL UndoElement::disposing() } // --------------------------------------------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException) +OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException) { return m_sActionString; } @@ -133,10 +132,10 @@ ShapeUndoElement::~ShapeUndoElement() } // --------------------------------------------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) +OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) { if ( !m_pAction ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return m_pAction->GetComment(); } @@ -144,7 +143,7 @@ ShapeUndoElement::~ShapeUndoElement() void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException) { if ( !m_pAction ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); m_pAction->Undo(); } @@ -152,7 +151,7 @@ void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeExce void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException) { if ( !m_pAction ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); m_pAction->Redo(); } diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index cda2b656b1e5..7f3687abdfa0 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -63,13 +63,13 @@ public: is the cloned model from before the changes, which the Undo action represents, have been applied. Upon invoking, the clone model is applied to the document model. */ - UndoElement( const ::rtl::OUString & i_actionString, + UndoElement( const OUString & i_actionString, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_documentModel, const ::boost::shared_ptr< ChartModelClone >& i_modelClone ); // XUndoAction - virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); @@ -83,7 +83,7 @@ private: void impl_toggleModelState(); private: - ::rtl::OUString m_sActionString; + OUString m_sActionString; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocumentModel; ::boost::shared_ptr< ChartModelClone > m_pModelClone; }; @@ -98,7 +98,7 @@ public: ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ); // XUndoAction - virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 27d23d137a44..5d059915da4d 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index f0b9ae769978..88a727521ed1 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -59,7 +59,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); virtual void fireStatusEvent( - const ::rtl::OUString & rURL, + const OUString & rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); private: diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index ac3be8abca98..01727c88b4a7 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx index 85d6923b7eaa..755f38ff85bd 100644 --- a/chart2/source/controller/main/UndoGuard.hxx +++ b/chart2/source/controller/main/UndoGuard.hxx @@ -38,7 +38,7 @@ class UndoGuard { public: explicit UndoGuard( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager, const ModelFacet i_facet = E_MODEL ); @@ -58,7 +58,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; ::boost::shared_ptr< ChartModelClone > m_pDocumentSnapshot; - rtl::OUString m_aUndoString; + OUString m_aUndoString; bool m_bActionPosted; }; @@ -69,7 +69,7 @@ class UndoLiveUpdateGuard : public UndoGuard { public: explicit UndoLiveUpdateGuard( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager ); ~UndoLiveUpdateGuard(); @@ -83,7 +83,7 @@ class UndoLiveUpdateGuardWithData : { public: explicit UndoLiveUpdateGuardWithData( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager ); ~UndoLiveUpdateGuardWithData(); @@ -93,7 +93,7 @@ class UndoGuardWithSelection : public UndoGuard { public: explicit UndoGuardWithSelection( - const ::rtl::OUString& i_undoMessage, + const OUString& i_undoMessage, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager ); virtual ~UndoGuardWithSelection(); diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 5d4ef5e0228d..3fa9ee7b9034 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -75,7 +75,7 @@ public: /** creates a sequence and initializes it with the given string. This is especially useful for labels, which only have one element. */ - explicit CachedDataSequence( const ::rtl::OUString & rSingleText ); + explicit CachedDataSequence( const OUString & rSingleText ); /// Copy CTOR explicit CachedDataSequence( const CachedDataSequence & rSource ); @@ -105,9 +105,9 @@ protected: // ____ XDataSequence ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSourceRangeRepresentation() + virtual OUString SAL_CALL getSourceRangeRepresentation() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL generateLabel( + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) @@ -120,7 +120,7 @@ protected: // ____ XTextualDataSequence ____ /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() @@ -140,7 +140,7 @@ protected: // sal_Int32 m_nNumberFormatKey; - ::rtl::OUString m_sRole; + OUString m_sRole; // enum DataType @@ -161,7 +161,7 @@ private: ::com::sun::star::uno::Sequence< double > Impl_getNumericalData() const; /** is used by interface method getTextualData(). */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > Impl_getTextualData() const; + ::com::sun::star::uno::Sequence< OUString > Impl_getTextualData() const; /** is used by interface method getData(). */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > Impl_getMixedData() const; @@ -170,7 +170,7 @@ private: enum DataType m_eCurrentDataType; ::com::sun::star::uno::Sequence< double > m_aNumericalSequence; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTextualSequence; + ::com::sun::star::uno::Sequence< OUString > m_aTextualSequence; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aMixedSequence; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index 2ea057e012ce..c1165429c2a8 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -79,10 +79,10 @@ public: getAxisType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType , sal_Int32 nDimensionIndex ); - static rtl::OUString getRoleOfSequenceForYAxisNumberFormatDetection( const ::com::sun::star::uno::Reference< + static OUString getRoleOfSequenceForYAxisNumberFormatDetection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); - static rtl::OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const ::com::sun::star::uno::Reference< + static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); static bool shouldLabelNumberFormatKeyBeDetectedFromYAxis( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index cf4d7f069df5..32885299aab4 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -210,7 +210,7 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::chart2::data::XDataSequence > & xDataSequence ); OOO_DLLPUBLIC_CHARTTOOLS -::com::sun::star::uno::Sequence< rtl::OUString > DataSequenceToStringSequence( +::com::sun::star::uno::Sequence< OUString > DataSequenceToStringSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xDataSequence ); @@ -261,9 +261,9 @@ OOO_DLLPUBLIC_CHARTTOOLS sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny ); OOO_DLLPUBLIC_CHARTTOOLS -bool replaceParamterInString( rtl::OUString & rInOutResourceString, - const rtl::OUString & rParamToReplace, - const rtl::OUString & rReplaceWith ); +bool replaceParamterInString( OUString & rInOutResourceString, + const OUString & rParamToReplace, + const OUString & rReplaceWith ); //............................................................................. } //namespace chart diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index a88650d6e797..458d29d7177f 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -70,18 +70,18 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::co }; /** unary function to convert ::com::sun::star::uno::Any into an - ::rtl::OUString. + OUString. */ -struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any, ::rtl::OUString > +struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any, OUString > { - ::rtl::OUString operator() ( const ::com::sun::star::uno::Any & rAny ) + OUString operator() ( const ::com::sun::star::uno::Any & rAny ) { ::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() ); if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE ) { const double* pDouble = reinterpret_cast< const double * >( rAny.getValue() ); if( ::rtl::math::isNan(*pDouble) ) - return ::rtl::OUString(); + return OUString(); return ::rtl::math::doubleToUString( * pDouble, rtl_math_StringFormat_Automatic, @@ -92,20 +92,20 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::co } else if( eClass == ::com::sun::star::uno::TypeClass_STRING ) { - return * reinterpret_cast< const ::rtl::OUString * >( rAny.getValue() ); + return * reinterpret_cast< const OUString * >( rAny.getValue() ); } - return ::rtl::OUString(); + return OUString(); } }; -/** unary function to convert an ::rtl::OUString into a double number. +/** unary function to convert an OUString into a double number.

For conversion rtl::math::StringToDouble is used.

*/ -struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< ::rtl::OUString, double > +struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< OUString, double > { - double operator() ( const ::rtl::OUString & rStr ) + double operator() ( const OUString & rStr ) { rtl_math_ConversionStatus eConversionStatus; double fResult = ::rtl::math::stringToDouble( rStr, '.', ',', & eConversionStatus, NULL ); @@ -117,13 +117,13 @@ struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< } }; -/** unary function to convert a double number into an ::rtl::OUString. +/** unary function to convert a double number into an OUString.

For conversion rtl::math::DoubleToOUString is used.

*/ -struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, ::rtl::OUString > +struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, OUString > { - ::rtl::OUString operator() ( double fNumber ) + OUString operator() ( double fNumber ) { return ::rtl::math::doubleToUString( fNumber, diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index c22df438b4c8..e6d5a3686bce 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -66,7 +66,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ ConfigItemListener ____ - SAL_DLLPRIVATE virtual void notify( const ::rtl::OUString & rPropertyName ); + SAL_DLLPRIVATE virtual void notify( const OUString & rPropertyName ); private: SAL_DLLPRIVATE void retrieveConfigColors(); diff --git a/chart2/source/inc/ConfigItemListener.hxx b/chart2/source/inc/ConfigItemListener.hxx index 4526b4291bd5..d050fa59fcb3 100644 --- a/chart2/source/inc/ConfigItemListener.hxx +++ b/chart2/source/inc/ConfigItemListener.hxx @@ -28,7 +28,7 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS ConfigItemListener { public: - virtual void notify( const ::rtl::OUString & rPropertyName ) = 0; + virtual void notify( const OUString & rPropertyName ) = 0; protected: ~ConfigItemListener() {} diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx index 55c1a2247b0f..c92803097860 100644 --- a/chart2/source/inc/ContainerHelper.hxx +++ b/chart2/source/inc/ContainerHelper.hxx @@ -136,7 +136,7 @@ template< typename T > example: - ::std::multimap< sal_Int32, ::rtl::OUString > aMyMultiMap; + ::std::multimap< sal_Int32, OUString > aMyMultiMap; uno::Sequence< sal_Int32 > aMyKeys( ContainerHelper::MapKeysToSequence( aMyMultiMap )); // note: aMyKeys may contain duplicate keys here */ @@ -154,8 +154,8 @@ template< class Map > example: - ::std::map< sal_Int32, ::rtl::OUString > aMyMultiMap; - uno::Sequence< ::rtl::OUString > aMyValues( ContainerHelper::MapValuesToSequence( aMyMultiMap )); + ::std::map< sal_Int32, OUString > aMyMultiMap; + uno::Sequence< OUString > aMyValues( ContainerHelper::MapValuesToSequence( aMyMultiMap )); */ template< class Map > ::com::sun::star::uno::Sequence< typename Map::mapped_type > MapValuesToSequence( diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index a8a2dc8aa470..02f64f8ee5f3 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -39,7 +39,7 @@ namespace chart namespace DataSeriesHelper { -::rtl::OUString GetRole( +OUString GetRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence ); @@ -56,7 +56,7 @@ namespace DataSeriesHelper OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > getDataSequenceByRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xSource, - ::rtl::OUString aRole, + OUString aRole, bool bMatchPrefix = false ); /** Retrieves all data sequences in the given data source that match the given @@ -73,7 +73,7 @@ OOO_DLLPUBLIC_CHARTTOOLS ::std::vector< getAllDataSequencesByRole( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > & aDataSequences, - ::rtl::OUString aRole, + OUString aRole, bool bMatchPrefix = false ); /** Retrieves all data sequences found in the given data series and puts them @@ -93,14 +93,14 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< The data sequence contained in xSeries that has this role will be used to take its label. */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getDataSeriesLabel( +OOO_DLLPUBLIC_CHARTTOOLS OUString getDataSeriesLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, - const ::rtl::OUString & rLabelSequenceRole ); + const OUString & rLabelSequenceRole ); /** Get the label of a labeled sequence including neccessary automatic generation */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getLabelForLabeledDataSequence( +OOO_DLLPUBLIC_CHARTTOOLS OUString getLabelForLabeledDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > & xLabeledSeq ); @@ -157,13 +157,13 @@ void makeLinesThickOrThin( const ::com::sun::star::uno::Reference< OOO_DLLPUBLIC_CHARTTOOLS void setPropertyAlsoToAllAttributedDataPoints( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rPropertyValue ); OOO_DLLPUBLIC_CHARTTOOLS bool hasAttributedDataPointDifferentValue( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rPropertyValue ); OOO_DLLPUBLIC_CHARTTOOLS bool areAllSeriesAttachedToSameAxis( diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index bfad44998bf2..d5ab613b5ada 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -53,7 +53,7 @@ public: createCachedDataSequence(); static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > - createCachedDataSequence( const ::rtl::OUString & rSingleText ); + createCachedDataSequence( const OUString & rSingleText ); static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > createLabeledDataSequence( @@ -74,12 +74,12 @@ public: static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > createArguments( - const ::rtl::OUString & rRangeRepresentation, + const OUString & rRangeRepresentation, const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories ); SAL_DLLPRIVATE static void readArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments - , ::rtl::OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping + , OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories ); static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > @@ -90,13 +90,13 @@ public: static void addRangeRepresentationsFromLabeledDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence - , ::std::vector< ::rtl::OUString >& rOutRangeRepresentations ); + , ::std::vector< OUString >& rOutRangeRepresentations ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getUsedDataRanges( + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getUsedDataRanges( + static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel ); @@ -113,7 +113,7 @@ public: static bool detectRangeSegmentation( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel - , ::rtl::OUString& rOutRangeString + , OUString& rOutRangeString , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& rOutUseColumns , bool& rOutFirstCellAsLabel @@ -137,15 +137,15 @@ public: static bool allArgumentsForRectRangeDetected( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromLabeledDataSequence( + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromLabeledDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq ); - SAL_DLLPRIVATE static ::rtl::OUString getRangeFromValues( + SAL_DLLPRIVATE static OUString getRangeFromValues( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromDataSource( + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xSource ); }; diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 51896e85b51e..5b1bb7bda23f 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -53,7 +53,7 @@ public: typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate >, - ::rtl::OUString > + OUString > tTemplateWithServiceName; /** tries to find a template in the chart-type manager that matches the @@ -75,7 +75,7 @@ public: ::com::sun::star::chart2::XDiagram > & xDiagram, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xChartTypeManager, - const ::rtl::OUString & rPreferredTemplateName = ::rtl::OUString()); + const OUString & rPreferredTemplateName = OUString()); /** Sets the "SwapXAndYAxis" property at all coordinate systems found in the given diagram. @@ -224,12 +224,12 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); - static ::com::sun::star::uno::Sequence< rtl::OUString > + static ::com::sun::star::uno::Sequence< OUString > getExplicitSimpleCategories( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< rtl::OUString > + SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > generateAutomaticCategoriesFromCooSys( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > & xCooSys ); diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index d96ef67253a1..a8feca551032 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -34,10 +34,10 @@ namespace chart struct OOO_DLLPUBLIC_CHARTTOOLS ComplexCategory { - rtl::OUString Text; + OUString Text; sal_Int32 Count; - ComplexCategory( const rtl::OUString& rText, sal_Int32 nCount ) : Text( rText ), Count (nCount) + ComplexCategory( const OUString& rText, sal_Int32 nCount ) : Text( rText ), Count (nCount) {} }; @@ -47,7 +47,7 @@ public: virtual ~SplitCategoriesProvider(); virtual sal_Int32 getLevelCount() const = 0; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0; + virtual ::com::sun::star::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0; }; struct DatePlusIndex @@ -83,20 +83,20 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > getOriginalCategories(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > getSimpleCategories(); + ::com::sun::star::uno::Sequence< OUString > getSimpleCategories(); const std::vector* getCategoriesByLevel( sal_Int32 nLevel ); - static ::rtl::OUString getCategoryByIndex( + static OUString getCategoryByIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , sal_Int32 nIndex ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getExplicitSimpleCategories( + static ::com::sun::star::uno::Sequence< OUString > getExplicitSimpleCategories( const SplitCategoriesProvider& rSplitCategoriesProvider ); - static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< rtl::OUString >& rOutTexts + static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< OUString >& rOutTexts , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rInAnys , ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xChartModel ); @@ -119,7 +119,7 @@ private: //member ::com::sun::star::chart2::data::XLabeledDataSequence> m_xOriginalCategories; bool m_bIsExplicitCategoriesInited; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aExplicitCategories; + ::com::sun::star::uno::Sequence< OUString > m_aExplicitCategories; ::std::vector< ::std::vector< ComplexCategory > > m_aComplexCats; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList; diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index bb80a956e280..b928db423322 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -32,7 +32,7 @@ public: virtual ~ExponentialRegressionCurveCalculator(); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const; diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx index ae964dc29a0d..0dadc937cea6 100644 --- a/chart2/source/inc/FormattedStringHelper.hxx +++ b/chart2/source/inc/FormattedStringHelper.hxx @@ -38,7 +38,7 @@ public: createFormattedStringSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext - , const ::rtl::OUString & rString + , const OUString & rString , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xTextProperties ) throw(); }; diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index e2f93d4c4f3b..3b6cd9a46da0 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -83,13 +83,13 @@ public: APPHELPER_SERVICE_FACTORY_HELPER(InternalDataProvider) // ____ XInternalDataProvider ____ - virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const ::rtl::OUString& aRange ) + virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL - getDataByRangeRepresentation( const ::rtl::OUString& aRange ) + getDataByRangeRepresentation( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDataByRangeRepresentation( - const ::rtl::OUString& aRange, + const OUString& aRange, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aNewData ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) @@ -124,22 +124,22 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( - const ::rtl::OUString& aRangeRepresentation ) + const OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( - const ::rtl::OUString& aRangeRepresentation ) + const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() throw (::com::sun::star::uno::RuntimeException); // ____ XRangeXMLConversion ____ - virtual ::rtl::OUString SAL_CALL convertRangeToXML( - const ::rtl::OUString& aRangeRepresentation ) + virtual OUString SAL_CALL convertRangeToXML( + const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL convertRangeFromXML( - const ::rtl::OUString& aXMLRange ) + virtual OUString SAL_CALL convertRangeFromXML( + const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -162,17 +162,17 @@ public: throw (::com::sun::star::uno::RuntimeException); // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) + ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) + ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ @@ -181,15 +181,15 @@ public: virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRowDescriptions( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions ) + const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setColumnDescriptions( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) + const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartData (base of XChartDataArray) ____ @@ -214,28 +214,28 @@ public: private: void lcl_addDataSequenceToMap( - const ::rtl::OUString & rRangeRepresentation, + const OUString & rRangeRepresentation, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xSequence ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > - lcl_createDataSequenceAndAddToMap( const ::rtl::OUString & rRangeRepresentation, - const ::rtl::OUString & rRole ); + lcl_createDataSequenceAndAddToMap( const OUString & rRangeRepresentation, + const OUString & rRole ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > - lcl_createDataSequenceAndAddToMap( const ::rtl::OUString & rRangeRepresentation ); + lcl_createDataSequenceAndAddToMap( const OUString & rRangeRepresentation ); - void lcl_deleteMapReferences( const ::rtl::OUString & rRangeRepresentation ); + void lcl_deleteMapReferences( const OUString & rRangeRepresentation ); void lcl_adaptMapReferences( - const ::rtl::OUString & rOldRangeRepresentation, - const ::rtl::OUString & rNewRangeRepresentation ); + const OUString & rOldRangeRepresentation, + const OUString & rNewRangeRepresentation ); void lcl_increaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd ); void lcl_decreaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd ); - typedef ::std::multimap< ::rtl::OUString, + typedef ::std::multimap< OUString, ::com::sun::star::uno::WeakReference< ::com::sun::star::chart2::data::XDataSequence > > tSequenceMap; typedef ::std::pair< tSequenceMap::iterator, tSequenceMap::iterator > tSequenceMapRange; diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index b48c6a3825b8..c2cc8807671b 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -32,7 +32,7 @@ public: virtual ~LinearRegressionCurveCalculator(); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const; diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index 053cb5d8c413..b3709105b1f7 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -32,7 +32,7 @@ public: virtual ~LogarithmicRegressionCurveCalculator(); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const; diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx index 69be677cfe2e..bc842e513b03 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -32,7 +32,7 @@ public: virtual ~MeanValueRegressionCurveCalculator(); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const; diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 0976b1352bb6..48896c7c9003 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -80,34 +80,34 @@ public: //@todo define this for debug only, except URL sal_Bool AsTemplate; //document is a template. sal_Bool ISSET_AsTemplate; - ::rtl::OUString Author; + OUString Author; sal_Bool ISSET_Author; - ::rtl::OUString CharacterSet; //identifier of used character set. + OUString CharacterSet; //identifier of used character set. sal_Bool ISSET_CharacterSet; - ::rtl::OUString Comment; + OUString Comment; sal_Bool ISSET_Comment; ::com::sun::star::uno::Any ComponentData; sal_Bool ISSET_ComponentData; - ::rtl::OUString FileName; //deprecated, same as url + OUString FileName; //deprecated, same as url sal_Bool ISSET_FileName; ::com::sun::star::uno::Any FilterData; sal_Bool ISSET_FilterData; - ::rtl::OUString FilterName; //internal filter name. + OUString FilterName; //internal filter name. sal_Bool ISSET_FilterName; - ::rtl::OUString FilterFlags;//deprecated, + OUString FilterFlags;//deprecated, sal_Bool ISSET_FilterFlags; - ::rtl::OUString FilterOptions; + OUString FilterOptions; sal_Bool ISSET_FilterOptions; //not documented ... @todo remove? - ::rtl::OUString FrameName; //name of target frame. + OUString FrameName; //name of target frame. sal_Bool ISSET_FrameName; sal_Bool Hidden; //load document, invisible. sal_Bool ISSET_Hidden; - ::rtl::OUString HierarchicalDocumentName; + OUString HierarchicalDocumentName; sal_Bool ISSET_HierarchicalDocumentName; @@ -121,17 +121,17 @@ public: InteractionHandler; //::com::sun::star::task::XInteractionHandler sal_Bool ISSET_InteractionHandler; - ::rtl::OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself. + OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself. sal_Bool ISSET_JumpMark; - ::rtl::OUString MediaType; //mime type. + OUString MediaType; //mime type. sal_Bool ISSET_MediaType; - ::rtl::OUString OpenFlags; //deprecated + OUString OpenFlags; //deprecated sal_Bool ISSET_OpenFlags; sal_Bool OpenNewView; //opens a new view for an already loaded document. sal_Bool ISSET_OpenNewView; sal_Bool Overwrite; //opens a new view for an already loaded document. sal_Bool ISSET_Overwrite; - ::rtl::OUString Password; + OUString Password; sal_Bool ISSET_Password; //not documented ... @todo remove? @@ -142,13 +142,13 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > PostData; //contains the data for HTTP post method as a sequence of bytes. sal_Bool ISSET_PostData; - ::rtl::OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes. + OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes. sal_Bool ISSET_PostString; sal_Bool Preview; //show preview. sal_Bool ISSET_Preview; sal_Bool ReadOnly; //open document readonly. sal_Bool ISSET_ReadOnly; - ::rtl::OUString Referer; //name of document referrer. + OUString Referer; //name of document referrer. sal_Bool ISSET_Referer; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > @@ -157,13 +157,13 @@ public: //not documented ... @todo remove? sal_Bool Silent; //prevents dialogs to query for more information. sal_Bool ISSET_Silent; - ::rtl::OUString TemplateName; //deprecated, name of the template instead of the URL. + OUString TemplateName; //deprecated, name of the template instead of the URL. sal_Bool ISSET_TemplateName; - ::rtl::OUString TemplateRegionName; //deprecated, name of the region of the template. + OUString TemplateRegionName; //deprecated, name of the region of the template. sal_Bool ISSET_TemplateRegionName; sal_Bool Unpacked; sal_Bool ISSET_Unpacked; - ::rtl::OUString URL;// FileName, URL of the document. + OUString URL;// FileName, URL of the document. sal_Bool ISSET_URL; sal_Int16 Version; //storage version. sal_Bool ISSET_Version; diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 3ce68aa73a91..029f4521674e 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -35,7 +35,7 @@ namespace chart //............................................................................. OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createNameContainer( - const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName ); + const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); namespace impl { @@ -49,26 +49,26 @@ typedef ::cppu::WeakImplHelper3< class NameContainer : public impl::NameContainer_Base { public: - NameContainer( const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName ); + NameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); explicit NameContainer( const NameContainer & rOther ); virtual ~NameContainer(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL getByName( const rtl::OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw( com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException); // XElementAccess virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException); @@ -82,10 +82,10 @@ private: //methods private: //member const ::com::sun::star::uno::Type m_aType; - const rtl::OUString m_aServicename; - const rtl::OUString m_aImplementationName; + const OUString m_aServicename; + const OUString m_aImplementationName; - typedef ::std::map< ::rtl::OUString, com::sun::star::uno::Any > tContentMap; + typedef ::std::map< OUString, com::sun::star::uno::Any > tContentMap; tContentMap m_aMap; }; diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx index d4f6441bcb1b..f15f65150464 100644 --- a/chart2/source/inc/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/NumberFormatterWrapper.hxx @@ -43,7 +43,7 @@ public: ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier > getNumberFormatsSupplier() { return m_xNumberFormatsSupplier; }; - rtl::OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; + OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; Date getNullDate() const; private: //private member @@ -62,7 +62,7 @@ public: , sal_Int32 nNumberFormatKey ); virtual ~FixedNumberFormatter(); - rtl::OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; + OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const; private: NumberFormatterWrapper m_aNumberFormatterWrapper; diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 5e26b7482d60..cc226a5031bd 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -172,19 +172,19 @@ protected: // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL - getPropertyState( const ::rtl::OUString& PropertyName ) + getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL - getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) + getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - setPropertyToDefault( const ::rtl::OUString& PropertyName ) + setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL - getPropertyDefault( const ::rtl::OUString& aPropertyName ) + getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -196,11 +196,11 @@ protected: setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL - getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -214,7 +214,7 @@ protected: // ____ XMultiPropertySet ____ virtual void SAL_CALL setPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, + const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index 0c4b3c516621..b2e127dbb6be 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -93,7 +93,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS ObjectIdentifier public: ObjectIdentifier(); - ObjectIdentifier( const ::rtl::OUString& rObjectCID ); + ObjectIdentifier( const OUString& rObjectCID ); ObjectIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); ObjectIdentifier( const ::com::sun::star::uno::Any& rAny ); virtual ~ObjectIdentifier(); @@ -104,152 +104,152 @@ public: bool operator!=( const ObjectIdentifier& rOID ) const; bool operator<( const ObjectIdentifier& rOID ) const; - static rtl::OUString createClassifiedIdentifierForObject( + static OUString createClassifiedIdentifierForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xObject , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString createClassifiedIdentifierForParticle( - const rtl::OUString& rParticle ); + static OUString createClassifiedIdentifierForParticle( + const OUString& rParticle ); - static rtl::OUString createClassifiedIdentifierForParticles( - const rtl::OUString& rParentParticle - , const rtl::OUString& rChildParticle - , const rtl::OUString& rDragMethodServiceName = rtl::OUString() - , const rtl::OUString& rDragParameterString = rtl::OUString() ); + static OUString createClassifiedIdentifierForParticles( + const OUString& rParentParticle + , const OUString& rChildParticle + , const OUString& rDragMethodServiceName = OUString() + , const OUString& rDragParameterString = OUString() ); - static rtl::OUString createClassifiedIdentifierForGrid( + static OUString createClassifiedIdentifierForGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc - SAL_DLLPRIVATE static rtl::OUString createParticleForDiagram( + SAL_DLLPRIVATE static OUString createParticleForDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString createParticleForCoordinateSystem( + static OUString createParticleForCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSys , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString createParticleForAxis( + static OUString createParticleForAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - static rtl::OUString createParticleForGrid( + static OUString createParticleForGrid( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - static rtl::OUString createParticleForSeries( sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex + static OUString createParticleForSeries( sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex , sal_Int32 nChartTypeIndex, sal_Int32 nSeriesIndex ); - static rtl::OUString createParticleForLegend( + static OUString createParticleForLegend( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend >& xLegend , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static rtl::OUString addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle ); - static rtl::OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex ); - static sal_Int32 getIndexFromParticleOrCID( const rtl::OUString& rParticleOrCID ); + static OUString addChildParticle( const OUString& rParticle, const OUString& rChildParticle ); + static OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex ); + static sal_Int32 getIndexFromParticleOrCID( const OUString& rParticleOrCID ); - static rtl::OUString createClassifiedIdentifier( + static OUString createClassifiedIdentifier( enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_SERIES - , const rtl::OUString& rParticleID );//e.g. SeriesID + , const OUString& rParticleID );//e.g. SeriesID - static rtl::OUString createClassifiedIdentifierWithParent( + static OUString createClassifiedIdentifierWithParent( enum ObjectType //e.g. OBJECTTYPE_DATA_POINT or OBJECTTYPE_GRID - , const rtl::OUString& rParticleID //for points or subgrids this is an Index or otherwise an identifier from the model object - , const rtl::OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId" - , const rtl::OUString& rDragMethodServiceName = rtl::OUString() - , const rtl::OUString& rDragParameterString = rtl::OUString() + , const OUString& rParticleID //for points or subgrids this is an Index or otherwise an identifier from the model object + , const OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId" + , const OUString& rDragMethodServiceName = OUString() + , const OUString& rDragParameterString = OUString() ); - static bool isCID( const rtl::OUString& rName ); - static rtl::OUString getDragMethodServiceName( const rtl::OUString& rClassifiedIdentifier ); - static rtl::OUString getDragParameterString( const rtl::OUString& rCID ); - static bool isDragableObject( const rtl::OUString& rClassifiedIdentifier ); + static bool isCID( const OUString& rName ); + static OUString getDragMethodServiceName( const OUString& rClassifiedIdentifier ); + static OUString getDragParameterString( const OUString& rCID ); + static bool isDragableObject( const OUString& rClassifiedIdentifier ); bool isDragableObject(); - static bool isRotateableObject( const rtl::OUString& rClassifiedIdentifier ); - static bool isMultiClickObject( const rtl::OUString& rClassifiedIdentifier ); - static bool areSiblings( const rtl::OUString& rCID1, const rtl::OUString& rCID2 );//identical object is no sibling - static bool areIdenticalObjects( const ::rtl::OUString& rCID1, const ::rtl::OUString& rCID2 ); + static bool isRotateableObject( const OUString& rClassifiedIdentifier ); + static bool isMultiClickObject( const OUString& rClassifiedIdentifier ); + static bool areSiblings( const OUString& rCID1, const OUString& rCID2 );//identical object is no sibling + static bool areIdenticalObjects( const OUString& rCID1, const OUString& rCID2 ); - static rtl::OUString getStringForType( ObjectType eObjectType ); - static ObjectType getObjectType( const rtl::OUString& rCID ); + static OUString getStringForType( ObjectType eObjectType ); + static ObjectType getObjectType( const OUString& rCID ); ObjectType getObjectType(); - static rtl::OUString createSeriesSubObjectStub( ObjectType eSubObjectType - , const rtl::OUString& rSeriesParticle - , const rtl::OUString& rDragMethodServiceName = rtl::OUString() - , const rtl::OUString& rDragParameterString = rtl::OUString() ); - static rtl::OUString createPointCID( const rtl::OUString& rPointCID_Stub, sal_Int32 nIndex ); + static OUString createSeriesSubObjectStub( ObjectType eSubObjectType + , const OUString& rSeriesParticle + , const OUString& rDragMethodServiceName = OUString() + , const OUString& rDragParameterString = OUString() ); + static OUString createPointCID( const OUString& rPointCID_Stub, sal_Int32 nIndex ); - static rtl::OUString createDataCurveCID( const rtl::OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine ); - static rtl::OUString createDataCurveEquationCID( const rtl::OUString& rSeriesParticle, sal_Int32 nCurveIndex ); + static OUString createDataCurveCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine ); + static OUString createDataCurveEquationCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex ); - SAL_DLLPRIVATE static rtl::OUString getObjectID( const rtl::OUString& rCID ); - static rtl::OUString getParticleID( const rtl::OUString& rCID ); - static rtl::OUString getFullParentParticle( const rtl::OUString& rCID ); + SAL_DLLPRIVATE static OUString getObjectID( const OUString& rCID ); + static OUString getParticleID( const OUString& rCID ); + static OUString getFullParentParticle( const OUString& rCID ); //returns the series particle of a CID when the CID is a child of the series - static rtl::OUString getSeriesParticleFromCID( const rtl::OUString& rCID ); + static OUString getSeriesParticleFromCID( const OUString& rCID ); //return the model object that is indicated by rObjectCID static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getObjectPropertySet( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getObjectPropertySet( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); //return the axis object that belongs to rObjectCID if any static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxisForCID( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); //return the series object that belongs to rObjectCID if any static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getDataSeriesForCID( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > getDiagramForCID( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static const ::rtl::OUString& getPieSegmentDragMethodServiceName(); - static ::rtl::OUString createPieSegmentDragParameterString( + static const OUString& getPieSegmentDragMethodServiceName(); + static OUString createPieSegmentDragParameterString( sal_Int32 nOffsetPercent , const ::com::sun::star::awt::Point& rMinimumPosition , const ::com::sun::star::awt::Point& rMaximumPosition ); - static bool parsePieSegmentDragParameterString( const rtl::OUString& rDragParameterString + static bool parsePieSegmentDragParameterString( const OUString& rDragParameterString , sal_Int32& rOffsetPercent , ::com::sun::star::awt::Point& rMinimumPosition , ::com::sun::star::awt::Point& rMaximumPosition ); - static TitleHelper::eTitleType getTitleTypeForCID( const ::rtl::OUString& rCID ); + static TitleHelper::eTitleType getTitleTypeForCID( const OUString& rCID ); - static ::rtl::OUString getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward ); + static OUString getMovedSeriesCID( const OUString& rObjectCID, sal_Bool bForward ); bool isValid() const; bool isAutoGeneratedObject() const; bool isAdditionalShape() const; - ::rtl::OUString getObjectCID() const; + OUString getObjectCID() const; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const; ::com::sun::star::uno::Any getAny() const; @@ -259,7 +259,7 @@ private: // for all other objects m_xAdditionalShape is set. // Note, that if m_aObjectCID is set, m_xAdditionalShape must be empty // and vice versa. - ::rtl::OUString m_aObjectCID; + OUString m_aObjectCID; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xAdditionalShape; }; diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 452c96987f35..10a999047cbe 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -34,7 +34,7 @@ public: virtual ~PotentialRegressionCurveCalculator(); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const; diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index ae3add738262..9bbcb84c3e01 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -44,22 +44,22 @@ namespace PropertyHelper @return The name used for storing this element in the table */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addLineDashUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS OUString addLineDashUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, - const ::rtl::OUString & rPreferredName ); + const OUString & rPreferredName ); /** adds a gradient with a unique name to the gradient obtained by the given factory. @return The name used for storing this element in the table */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addGradientUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS OUString addGradientUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, - const ::rtl::OUString & rPreferredName ); + const OUString & rPreferredName ); /** adds a transparency gradient with a unique name to the gradient obtained by the given factory. @@ -67,33 +67,33 @@ OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addGradientUniqueNameToTable( @return The name used for storing this element in the table */ OOO_DLLPUBLIC_CHARTTOOLS -::rtl::OUString addTransparencyGradientUniqueNameToTable( +OUString addTransparencyGradientUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, - const ::rtl::OUString & rPreferredName ); + const OUString & rPreferredName ); /** adds a hatch with a unique name to the gradient obtained by the given factory. @return The name used for storing this element in the table */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addHatchUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS OUString addHatchUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, - const ::rtl::OUString & rPreferredName ); + const OUString & rPreferredName ); /** adds a bitmap with a unique name to the gradient obtained by the given factory. @return The name used for storing this element in the table */ -OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addBitmapUniqueNameToTable( +OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable( const ::com::sun::star::uno::Any & rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFact, - const ::rtl::OUString & rPreferredName ); + const OUString & rPreferredName ); // -------------------------------------------------------------------------------- @@ -170,7 +170,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS PropertyLess : public ::std::binary_function< struct OOO_DLLPUBLIC_CHARTTOOLS PropertyValueNameEquals : public ::std::unary_function< ::com::sun::star::beans::PropertyValue, bool > { - explicit PropertyValueNameEquals( const ::rtl::OUString & rName ) : + explicit PropertyValueNameEquals( const OUString & rName ) : m_aName( rName ) {} @@ -180,7 +180,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS PropertyValueNameEquals : public ::std::unary_fu } private: - ::rtl::OUString m_aName; + OUString m_aName; }; } // namespace chart diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 01291c104c61..27af18bd5830 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -40,11 +40,11 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > & xScaling ); protected: - virtual ::rtl::OUString ImplGetRepresentation( + virtual OUString ImplGetRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const = 0; - ::rtl::OUString getFormattedString( + OUString getFormattedString( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey, double fNumber ) const; @@ -71,9 +71,9 @@ protected: ::com::sun::star::uno::RuntimeException); virtual double SAL_CALL getCorrelationCoefficient() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRepresentation() + virtual OUString SAL_CALL getRepresentation() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormattedRepresentation( + virtual OUString SAL_CALL getFormattedRepresentation( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumFmtSupplier, ::sal_Int32 nNumberFormatKey ) throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 725112a20af7..743f0bd990d2 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -50,7 +50,7 @@ public: createRegressionCurveByServiceName( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, - ::rtl::OUString aServiceName ); + OUString aServiceName ); // ------------------------------------------------------------ @@ -163,7 +163,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurveCalculator > createRegressionCurveCalculatorByServiceName( - ::rtl::OUString aServiceName ); + OUString aServiceName ); /** recalculates the regression parameters according to the data given in the data source. @@ -200,7 +200,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ); - static ::rtl::OUString getUINameForRegressionCurve( const ::com::sun::star::uno::Reference< + static OUString getUINameForRegressionCurve( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve >& xCurve ); static ::std::vector< ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 5a0ae97806cb..ac25d268d8a6 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -63,7 +63,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: @@ -105,7 +105,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: @@ -145,7 +145,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: @@ -186,7 +186,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index 9e0bba409be4..ab60ee5a6c04 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -23,7 +23,7 @@ to use these macros the supported services and the implementation name needs to be static especially you need to implement (declaration is contained in macro already): -static com::sun::star::uno::Sequence< rtl::OUString > +static com::sun::star::uno::Sequence< OUString > Class::getSupportedServiceNames_Static(); */ @@ -36,18 +36,18 @@ namespace apphelper { #define APPHELPER_XSERVICEINFO_DECL() \ - virtual ::rtl::OUString SAL_CALL \ + virtual OUString SAL_CALL \ getImplementationName() \ throw( ::com::sun::star::uno::RuntimeException ); \ virtual sal_Bool SAL_CALL \ - supportsService( const ::rtl::OUString& ServiceName ) \ + supportsService( const OUString& ServiceName ) \ throw( ::com::sun::star::uno::RuntimeException ); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL \ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL \ getSupportedServiceNames() \ throw( ::com::sun::star::uno::RuntimeException ); \ \ - static ::rtl::OUString getImplementationName_Static(); \ - static ::com::sun::star::uno::Sequence< ::rtl::OUString > \ + static OUString getImplementationName_Static(); \ + static ::com::sun::star::uno::Sequence< OUString > \ getSupportedServiceNames_Static(); //========================================================================= @@ -57,24 +57,24 @@ namespace apphelper //========================================================================= #define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ -::rtl::OUString SAL_CALL Class::getImplementationName() \ +OUString SAL_CALL Class::getImplementationName() \ throw( ::com::sun::star::uno::RuntimeException ) \ { \ return getImplementationName_Static(); \ } \ \ -::rtl::OUString Class::getImplementationName_Static() \ +OUString Class::getImplementationName_Static() \ { \ return ImplName; \ } \ \ sal_Bool SAL_CALL \ -Class::supportsService( const ::rtl::OUString& ServiceName ) \ +Class::supportsService( const OUString& ServiceName ) \ throw( ::com::sun::star::uno::RuntimeException ) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL = \ + ::com::sun::star::uno::Sequence< OUString > aSNL = \ getSupportedServiceNames(); \ - const ::rtl::OUString* pArray = aSNL.getArray(); \ + const OUString* pArray = aSNL.getArray(); \ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) \ { \ if( pArray[ i ] == ServiceName ) \ @@ -84,7 +84,7 @@ Class::supportsService( const ::rtl::OUString& ServiceName ) \ return sal_False; \ } \ \ -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL \ +::com::sun::star::uno::Sequence< OUString > SAL_CALL \ Class::getSupportedServiceNames() \ throw( ::com::sun::star::uno::RuntimeException ) \ { \ diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index 695f22ff26fb..87c1b6099c53 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -76,10 +76,10 @@ public: ::com::sun::star::chart2::data::XDataSource > & xDataSource, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > & xDataProvider, - const ::rtl::OUString & rNewRange, + const OUString & rNewRange, bool bPositiveValue, bool bYError = true, - ::rtl::OUString * pXMLRange = 0 ); + OUString * pXMLRange = 0 ); /// @return the newly created or existing error bar object static ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index fd4ef07c22e9..ec9db23e2401 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -60,7 +60,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > createTitle( eTitleType nTitleIndex - , const rtl::OUString& rTitleText + , const OUString& rTitleText , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel , const ::com::sun::star::uno::Reference< @@ -71,9 +71,9 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); - static rtl::OUString getCompleteString( const ::com::sun::star::uno::Reference< + static OUString getCompleteString( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& xTitle ); - static void setCompleteString( const rtl::OUString& rNewText + static void setCompleteString( const OUString& rNewText , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& xTitle , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index 6b3e8a4bd7ca..6dc447be4045 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -75,12 +75,12 @@ public: UncachedDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv, - const ::rtl::OUString & rRangeRepresentation ); + const OUString & rRangeRepresentation ); UncachedDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv, - const ::rtl::OUString & rRangeRepresentation, - const ::rtl::OUString & rRole ); + const OUString & rRangeRepresentation, + const OUString & rRole ); UncachedDataSequence( const UncachedDataSequence & rSource ); virtual ~UncachedDataSequence(); @@ -105,9 +105,9 @@ protected: // ____ XDataSequence ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSourceRangeRepresentation() + virtual OUString SAL_CALL getSourceRangeRepresentation() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL generateLabel( + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) @@ -120,7 +120,7 @@ protected: // ____ XTextualDataSequence ____ /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); // ____ XIndexReplace ____ virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) @@ -144,9 +144,9 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XNamed (for setting a new range representation) ____ - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ @@ -174,8 +174,8 @@ protected: // sal_Int32 m_nNumberFormatKey; - ::rtl::OUString m_sRole; - ::rtl::OUString m_aXMLRange; + OUString m_sRole; + OUString m_aXMLRange; // /** This method registers all properties. It should be called by all @@ -186,7 +186,7 @@ protected: private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > m_xDataProvider; - ::rtl::OUString m_aSourceRepresentation; + OUString m_aSourceRepresentation; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx index 961031f6663d..b90961f985c7 100644 --- a/chart2/source/inc/WrappedDefaultProperty.hxx +++ b/chart2/source/inc/WrappedDefaultProperty.hxx @@ -29,7 +29,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedDefaultProperty : public WrappedProperty { public: explicit WrappedDefaultProperty( - const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName, + const OUString& rOuterName, const OUString& rInnerName, const ::com::sun::star::uno::Any& rNewOuterDefault ); virtual ~WrappedDefaultProperty(); diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index cac3dd38d774..f292272b09b6 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -30,7 +30,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedDirectStateProperty : { public: explicit WrappedDirectStateProperty( - const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName ); + const OUString& rOuterName, const OUString& rInnerName ); virtual ~WrappedDirectStateProperty(); virtual ::com::sun::star::beans::PropertyState getPropertyState( diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index c95b3a143a94..9d55c8a94025 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -32,7 +32,7 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty : public WrappedProperty { public: - WrappedIgnoreProperty( const ::rtl::OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue ); + WrappedIgnoreProperty( const OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue ); virtual ~WrappedIgnoreProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index d24d6ff2b7f5..1410ee1e37e6 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -36,11 +36,11 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedProperty a corresponding property of the inner PropertySet. Use this class to do the conversion between the two. */ public: - WrappedProperty( const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName ); + WrappedProperty( const OUString& rOuterName, const OUString& rInnerName ); virtual ~WrappedProperty(); - const ::rtl::OUString& getOuterName() const; - virtual ::rtl::OUString getInnerName() const; + const OUString& getOuterName() const; + virtual OUString getInnerName() const; virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -62,8 +62,8 @@ protected: virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const; protected: - ::rtl::OUString m_aOuterName; - ::rtl::OUString m_aInnerName; + OUString m_aOuterName; + OUString m_aInnerName; }; //............................................................................. diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 9eed3075692b..6968f319ff9f 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -61,33 +61,33 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); protected: //methods /** give all the properties that should be visible to the outer side @@ -108,7 +108,7 @@ protected: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); SAL_DLLPRIVATE tWrappedPropertyMap& getWrappedPropertyMap(); - const WrappedProperty* getWrappedProperty( const ::rtl::OUString& rOuterName ); + const WrappedProperty* getWrappedProperty( const OUString& rOuterName ); const WrappedProperty* getWrappedProperty( sal_Int32 nHandle ); protected: //member diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx index ce95dc13a2ff..e583f5a67fd2 100644 --- a/chart2/source/inc/XMLRangeHelper.hxx +++ b/chart2/source/inc/XMLRangeHelper.hxx @@ -51,12 +51,12 @@ struct OOO_DLLPUBLIC_CHARTTOOLS CellRange { Cell aUpperLeft; Cell aLowerRight; - ::rtl::OUString aTableName; + OUString aTableName; }; -CellRange getCellRangeFromXMLString( const ::rtl::OUString & rXMLString ); +CellRange getCellRangeFromXMLString( const OUString & rXMLString ); -::rtl::OUString getXMLStringFromCellRange( const CellRange & rRange ); +OUString getXMLStringFromCellRange( const CellRange & rRange ); } // namespace XMLRangeHelper diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 1e89f8c442fa..1872ed49534b 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -94,7 +94,7 @@ public: XHatchListRef GetHatchList() const; XBitmapListRef GetBitmapList() const; - SdrObject* getNamedSdrObject( const rtl::OUString& rName ); + SdrObject* getNamedSdrObject( const OUString& rName ); static SdrObject* getNamedSdrObject( const String& rName, SdrObjList* pObjList ); static bool removeShape( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index 4c518843cd41..dfe7afccaaad 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -58,12 +58,12 @@ public: if bSnapRect is set to true you get the resulting visible position (left-top) and size */ virtual ::com::sun::star::awt::Rectangle - getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect=false )=0; + getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false )=0; virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes()=0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - getShapeForCID( const rtl::OUString& rObjectCID )=0; + getShapeForCID( const OUString& rObjectCID )=0; virtual ::boost::shared_ptr< DrawModelWrapper > getDrawModelWrapper() = 0; diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 2555b25395e8..7ba2ca95da54 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -57,7 +57,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::osl::MutexGuard; // ---------------------------------------- @@ -90,7 +89,7 @@ LOCAL_CONST_STR( sXML_import_chart_oasis_meta_service, "com.sun.star.comp.C uno::Reference< embed::XStorage > lcl_getWriteStorage( const Sequence< beans::PropertyValue >& rMediaDescriptor, - const uno::Reference< uno::XComponentContext >& xContext,const ::rtl::OUString& _sMediaType) + const uno::Reference< uno::XComponentContext >& xContext,const OUString& _sMediaType) { uno::Reference< embed::XStorage > xStorage; try @@ -793,7 +792,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes rOutOASIS = aMDHelper.FilterName == "chart8"; } // ----------------------------------------------------------------------------- -::rtl::OUString XMLFilter::getMediaType(bool _bOasis) +OUString XMLFilter::getMediaType(bool _bOasis) { return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART : MIMETYPE_VND_SUN_XML_CHART; } @@ -809,7 +808,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue > rOutOASIS = aMDHelper.FilterName == "StarOffice XML (Base) Report Chart"; } // ----------------------------------------------------------------------------- -::rtl::OUString XMLReportFilterHelper::getMediaType(bool ) +OUString XMLReportFilterHelper::getMediaType(bool ) { return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART; } diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index c702c6db366b..cfa3e66c4ce5 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -37,9 +37,9 @@ public: virtual ~CartesianCoordinateSystem(); // ____ XCoordinateSystem ____ - virtual ::rtl::OUString SAL_CALL getCoordinateSystemType() + virtual OUString SAL_CALL getCoordinateSystemType() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getViewServiceName() + virtual OUString SAL_CALL getViewServiceName() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index 6035d5ddc899..63fc3a7643d0 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -50,18 +50,18 @@ public: protected: // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) + ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( - const ::rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< - ::rtl::OUString > SAL_CALL getAvailableServiceNames() + OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // ____ XChartTypeManager ____ diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index 1efe95e31ea7..f69d2b550306 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -37,9 +37,9 @@ public: virtual ~PolarCoordinateSystem(); // ____ XCoordinateSystem ____ - virtual ::rtl::OUString SAL_CALL getCoordinateSystemType() + virtual OUString SAL_CALL getCoordinateSystemType() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getViewServiceName() + virtual OUString SAL_CALL getViewServiceName() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 76f0ef19553e..ad8e32f35f19 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -91,10 +91,10 @@ protected: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - inline ::rtl::OUString getDocumentHandler() const { return m_sDocumentHandler; } - inline void setDocumentHandler(const ::rtl::OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } + inline OUString getDocumentHandler() const { return m_sDocumentHandler; } + inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } - virtual ::rtl::OUString getMediaType(bool _bOasis); + virtual OUString getMediaType(bool _bOasis); /** fills the oasis flag only when a filtername was set * @@ -114,8 +114,8 @@ private: ::com::sun::star::beans::PropertyValue > & aMediaDescriptor ); /// @return a warning code, or 0 for successful operation sal_Int32 impl_ImportStream( - const ::rtl::OUString & rStreamName, - const ::rtl::OUString & rServiceName, + const OUString & rStreamName, + const OUString & rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > & xStorage, const ::com::sun::star::uno::Reference< @@ -134,8 +134,8 @@ private: ::com::sun::star::beans::PropertyValue > & aMediaDescriptor ); /// @return a warning code, or 0 for successful operation sal_Int32 impl_ExportStream( - const ::rtl::OUString & rStreamName, - const ::rtl::OUString & rServiceName, + const OUString & rStreamName, + const OUString & rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > & xStorage, const ::com::sun::star::uno::Reference< @@ -152,7 +152,7 @@ private: ::com::sun::star::lang::XComponent > m_xTargetDoc; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xSourceDoc; - ::rtl::OUString m_sDocumentHandler; // when set it will be set as doc handler + OUString m_sDocumentHandler; // when set it will be set as doc handler volatile bool m_bCancelOperation; ::osl::Mutex m_aMutex; @@ -179,7 +179,7 @@ public: return OUString( "com.sun.star.comp.chart2.report.XMLFilter" ); } protected: - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) { @@ -207,7 +207,7 @@ protected: XMLFilter::setSourceDocument(Document); } - virtual ::rtl::OUString getMediaType(bool _bOasis); + virtual OUString getMediaType(bool _bOasis); }; } // namespace chart diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index b7ff37ad9171..59e3d126ea2a 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 048f38d4e579..7067a4f33726 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; namespace diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index db85d75bf644..e64a1ea40e13 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 0f15ee72ac11..e2157c4f2daa 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -66,7 +66,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::osl::MutexGuard; using namespace ::com::sun::star; @@ -203,12 +202,12 @@ void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ ) // private methods //----------------------------------------------------------------- -::rtl::OUString ChartModel::impl_g_getLocation() +OUString ChartModel::impl_g_getLocation() { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) - return ::rtl::OUString(); //behave passive if already disposed or closed or throw exception @todo? + return OUString(); //behave passive if already disposed or closed or throw exception @todo? //mutex is acquired return m_aResource; } @@ -310,9 +309,9 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV APPHELPER_XSERVICEINFO_IMPL(ChartModel,CHART_MODEL_SERVICE_IMPLEMENTATION_NAME) -uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static() +uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 3 ); + uno::Sequence< OUString > aSNS( 3 ); aSNS[0] = CHART_MODEL_SERVICE_NAME; aSNS[1] = "com.sun.star.document.OfficeDocument"; aSNS[2] = "com.sun.star.chart.ChartDocument"; @@ -324,7 +323,7 @@ uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static() // frame::XModel (required interface) //----------------------------------------------------------------- -sal_Bool SAL_CALL ChartModel::attachResource( const ::rtl::OUString& rURL +sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL , const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) throw(uno::RuntimeException) { @@ -350,7 +349,7 @@ sal_Bool SAL_CALL ChartModel::attachResource( const ::rtl::OUString& rURL return sal_True; } -::rtl::OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException) +OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException) { return impl_g_getLocation(); } @@ -508,7 +507,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr if ( xSelectionSupl.is() ) { uno::Any aSel = xSelectionSupl->getSelection(); - rtl::OUString aObjectCID; + OUString aObjectCID; if( aSel >>= aObjectCID ) xReturn.set( ObjectIdentifier::getObjectPropertySet( aObjectCID, Reference< XChartDocument >(this))); } @@ -1181,8 +1180,8 @@ enum eServiceType SERVICE_NAMESPACE_MAP }; -typedef ::std::map< ::rtl::OUString, enum eServiceType > tServiceNameMap; -typedef ::comphelper::MakeMap< ::rtl::OUString, enum eServiceType > tMakeServiceNameMap; +typedef ::std::map< OUString, enum eServiceType > tServiceNameMap; +typedef ::comphelper::MakeMap< OUString, enum eServiceType > tMakeServiceNameMap; tServiceNameMap & lcl_getStaticServiceNameMap() { @@ -1257,7 +1256,7 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments( Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aResult; + uno::Sequence< OUString > aResult; if( m_xOldModelAgg.is()) { @@ -1347,7 +1346,7 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM } //XDumper -rtl::OUString SAL_CALL ChartModel::dump() +OUString SAL_CALL ChartModel::dump() throw (uno::RuntimeException) { uno::Reference< qa::XDumper > xDumper( @@ -1355,7 +1354,7 @@ rtl::OUString SAL_CALL ChartModel::dump() if (xDumper.is()) return xDumper->dump(); - return rtl::OUString(); + return OUString(); } } // namespace chart diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx index 1af220bce72b..f7d81b8dff92 100644 --- a/chart2/source/model/main/ChartModel.hxx +++ b/chart2/source/model/main/ChartModel.hxx @@ -122,7 +122,7 @@ private: sal_Int32 m_nInLoad; sal_Bool volatile m_bUpdateNotificationsPending; - ::rtl::OUString m_aResource; + OUString m_aResource; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aMediaDescriptor; ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocumentProperties; ::rtl::Reference< UndoManager > m_pUndoManager; @@ -174,7 +174,7 @@ private: private: //private methods - ::rtl::OUString impl_g_getLocation(); + OUString impl_g_getLocation(); sal_Bool impl_isControllerConnected( const com::sun::star::uno::Reference< @@ -248,12 +248,12 @@ public: //----------------------------------------------------------------- virtual sal_Bool SAL_CALL - attachResource( const ::rtl::OUString& rURL + attachResource( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getURL() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL @@ -346,7 +346,7 @@ public: virtual sal_Bool SAL_CALL hasLocation() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL @@ -357,14 +357,14 @@ public: , ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - storeAsURL( const ::rtl::OUString& rURL + storeAsURL( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::io::IOException , ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - storeToURL( const ::rtl::OUString& rURL + storeToURL( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::io::IOException @@ -468,7 +468,7 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getUsedRangeRepresentations() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL getUsedData() throw (::com::sun::star::uno::RuntimeException); @@ -534,13 +534,13 @@ public: // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - createInstance( const ::rtl::OUString& aServiceSpecifier ) + createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier + createInstanceWithArguments( const OUString& ServiceSpecifier , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // ____ XStorageBasedDocument ____ @@ -602,7 +602,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // XDumper - virtual rtl::OUString SAL_CALL dump() + virtual OUString SAL_CALL dump() throw (com::sun::star::uno::RuntimeException); }; diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 2bc5cde61bf1..2984fdb8c944 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::osl::MutexGuard; namespace @@ -223,7 +222,7 @@ sal_Bool SAL_CALL ChartModel::hasLocation() return !m_aResource.isEmpty(); } -::rtl::OUString SAL_CALL ChartModel::getLocation() +OUString SAL_CALL ChartModel::getLocation() throw(uno::RuntimeException) { return impl_g_getLocation(); @@ -244,7 +243,7 @@ void SAL_CALL ChartModel::store() if(!aGuard.startApiCall(sal_True)) //start LongLastingCall return; //behave passive if already disposed or closed or throw exception @todo? - ::rtl::OUString aLocation = m_aResource; + OUString aLocation = m_aResource; if( aLocation.isEmpty() ) throw io::IOException( "no location specified", static_cast< ::cppu::OWeakObject* >(this)); @@ -259,7 +258,7 @@ void SAL_CALL ChartModel::store() } void SAL_CALL ChartModel::storeAsURL( - const ::rtl::OUString& rURL, + const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) throw(io::IOException, uno::RuntimeException) { @@ -285,7 +284,7 @@ void SAL_CALL ChartModel::storeAsURL( } void SAL_CALL ChartModel::storeToURL( - const ::rtl::OUString& rURL, + const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) throw(io::IOException, uno::RuntimeException) @@ -618,7 +617,7 @@ void ChartModel::impl_loadGraphics( if( xGraphicsStorage.is() ) { - const uno::Sequence< ::rtl::OUString > aElementNames( + const uno::Sequence< OUString > aElementNames( xGraphicsStorage->getElementNames() ); for( int i = 0; i < aElementNames.getLength(); ++i ) diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 2537dba9f869..bcd7c4b02b75 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -37,7 +37,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -using ::rtl::OUString; // ____________________________________________________________ diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index fb11ece86a93..de4f0b6e62f4 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -77,7 +77,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "TransparencyGradientName", PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); @@ -85,7 +85,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "GradientName", PROP_DATAPOINT_GRADIENT_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); @@ -101,7 +101,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "HatchName", PROP_DATAPOINT_HATCH_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); @@ -109,7 +109,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "FillBitmapName", PROP_DATAPOINT_FILL_BITMAP_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); @@ -144,7 +144,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "BorderDashName", PROP_DATAPOINT_BORDER_DASH_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( @@ -177,7 +177,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "LineDashName", LineProperties::PROP_LINE_DASH_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); @@ -277,7 +277,7 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "LabelSeparator", PROP_DATAPOINT_LABEL_SEPARATOR, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -406,7 +406,7 @@ void DataPointProperties::AddDefaultsToMap( sal_False // ShowLegendSymbol )); - PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " ); + PropertyHelper::setPropertyValueDefault< OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " ); //@todo maybe choose a different one here -> should be dynamically that of the attached axis PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_ERROR_BAR_X, uno::Reference< beans::XPropertySet >()); diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index c292e1822a5f..e6632ec7e235 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -38,7 +38,6 @@ using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::osl::MutexGuard; // ---------------------------------------- diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx index 74ca6183f34c..5a270fcbddac 100644 --- a/chart2/source/model/main/DataSeriesProperties.cxx +++ b/chart2/source/model/main/DataSeriesProperties.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 1d0295a6c8a6..ec1637ba1f51 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index e21beed575df..9505b33d8d0e 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -127,14 +126,14 @@ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone() } // ____ XFormattedString ____ -::rtl::OUString SAL_CALL FormattedString::getString() +OUString SAL_CALL FormattedString::getString() throw (uno::RuntimeException) { MutexGuard aGuard( GetMutex()); return m_aString; } -void SAL_CALL FormattedString::setString( const ::rtl::OUString& String ) +void SAL_CALL FormattedString::setString( const OUString& String ) throw (uno::RuntimeException) { { diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 4f88a7af8996..c88fff0b21f1 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -68,9 +68,9 @@ protected: explicit FormattedString( const FormattedString & rOther ); // ____ XFormattedString ____ - virtual ::rtl::OUString SAL_CALL getString() + virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& String ) + virtual void SAL_CALL setString( const OUString& String ) throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ @@ -114,7 +114,7 @@ protected: void fireModifyEvent(); private: - ::rtl::OUString m_aString; + OUString m_aString; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index b810fe19febe..fd713a9aa5f2 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -35,7 +35,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -using ::rtl::OUString; // ____________________________________________________________ diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 5edead84c863..2173f933c7be 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 050bbc05590b..5728f9c26fef 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -220,9 +220,9 @@ void PageBackground::fireModifyEvent() // ================================================================================ -uno::Sequence< ::rtl::OUString > PageBackground::getSupportedServiceNames_Static() +uno::Sequence< OUString > PageBackground::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = "com.sun.star.chart2.PageBackground"; aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index df77dd7a8e8a..f50c7b31cd7f 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { @@ -58,13 +57,13 @@ PolarCoordinateSystem::~PolarCoordinateSystem() {} // ____ XCoordinateSystem ____ -::rtl::OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType() +OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType() throw (RuntimeException) { return CHART2_COOSYSTEM_POLAR_SERVICE_NAME; } -::rtl::OUString SAL_CALL PolarCoordinateSystem::getViewServiceName() +OUString SAL_CALL PolarCoordinateSystem::getViewServiceName() throw (RuntimeException) { return CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME; diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index ce97bd7db4b7..02d63f9bc7ef 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -232,9 +232,9 @@ void StockBar::fireModifyEvent() // ================================================================================ -uno::Sequence< ::rtl::OUString > StockBar::getSupportedServiceNames_Static() +uno::Sequence< OUString > StockBar::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = "com.sun.star.chart2.StockBar"; aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index c9ed149d4d9f..bd127e899ed9 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -373,9 +373,9 @@ void Title::fireModifyEvent() // ================================================================================ -uno::Sequence< ::rtl::OUString > Title::getSupportedServiceNames_Static() +uno::Sequence< OUString > Title::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 4 ); + uno::Sequence< OUString > aServices( 4 ); aServices[ 0 ] = "com.sun.star.chart2.Title"; aServices[ 1 ] = "com.sun.star.style.ParagraphProperties"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index 82aae3668aea..4809510fbd45 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -143,7 +143,7 @@ namespace chart void UndoManager_Impl::checkDisposed_lck() { if ( m_bDisposed ) - throw DisposedException( ::rtl::OUString(), getThis() ); + throw DisposedException( OUString(), getThis() ); } //============================================================================================================== @@ -240,7 +240,7 @@ namespace chart } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL UndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException) + void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard ); @@ -300,28 +300,28 @@ namespace chart } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentUndoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentRedoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllUndoActionTitles(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllRedoActionTitles(); @@ -395,7 +395,7 @@ namespace chart { UndoManagerMethodGuard aGuard( *m_pImpl ); (void)i_parent; - throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() ); + throw NoSupportException( OUString(), m_pImpl->getThis() ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx index c261b6c85024..2a1cf3035182 100644 --- a/chart2/source/model/main/UndoManager.hxx +++ b/chart2/source/model/main/UndoManager.hxx @@ -58,7 +58,7 @@ namespace chart void disposing(); // XUndoManager - virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -66,10 +66,10 @@ namespace chart virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index ab4570be985d..cc80cf6351a0 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -223,9 +223,9 @@ void Wall::fireModifyEvent() // ================================================================================ -uno::Sequence< ::rtl::OUString > Wall::getSupportedServiceNames_Static() +uno::Sequence< OUString > Wall::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = "com.sun.star.chart2.Wall"; aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index 2a06ac188695..ef0b11485072 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -46,15 +46,15 @@ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL AreaChartType::getChartType() +OUString SAL_CALL AreaChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_AREA; } -uno::Sequence< ::rtl::OUString > AreaChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > AreaChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_AREA; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index dcfffca24506..00a1fc10585f 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -42,7 +42,7 @@ protected: explicit AreaChartType( const AreaChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 27fccbb09058..6bd6e5d89e5e 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -126,7 +125,7 @@ namespace chart AreaChartTypeTemplate::AreaChartTypeTemplate( uno::Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, sal_Int32 nDim /* = 2 */ ) : ChartTypeTemplate( xContext, rServiceName ), @@ -248,9 +247,9 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN // ---------------------------------------- -uno::Sequence< ::rtl::OUString > AreaChartTypeTemplate::getSupportedServiceNames_Static() +uno::Sequence< OUString > AreaChartTypeTemplate::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index d7f347b7fcb7..92fd4b86f054 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -38,7 +38,7 @@ public: explicit AreaChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, sal_Int32 nDim = 2 ); virtual ~AreaChartTypeTemplate(); diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index cec160893c6c..3193cf60b35a 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -47,15 +47,15 @@ uno::Reference< util::XCloneable > SAL_CALL BarChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL BarChartType::getChartType() +OUString SAL_CALL BarChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_BAR; } -uno::Sequence< ::rtl::OUString > BarChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > BarChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BAR; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 649daabbcfe0..3495c6e7560e 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -42,7 +42,7 @@ protected: explicit BarChartType( const BarChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 1c1ec10e069b..3cb469b1c400 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -36,7 +36,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -using ::rtl::OUString; namespace { diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index 68744a4e13af..e8f606169bf7 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -44,7 +44,7 @@ public: explicit BarChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, BarDirection eDirection, sal_Int32 nDim = 2 ); diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index d18219356b6a..dc8302aa6de1 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -158,16 +157,16 @@ Reference< chart2::XCoordinateSystem > SAL_CALL return xResult; } -::rtl::OUString SAL_CALL BubbleChartType::getChartType() +OUString SAL_CALL BubbleChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE; } -uno::Sequence< ::rtl::OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() +uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aMandRolesSeq(4); + uno::Sequence< OUString > aMandRolesSeq(4); aMandRolesSeq.realloc( 4 ); aMandRolesSeq[0] = "label"; aMandRolesSeq[1] = "values-x"; @@ -206,9 +205,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertyS return *StaticBubbleChartTypeInfo::get(); } -uno::Sequence< ::rtl::OUString > BubbleChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > BubbleChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index e648f1479f79..c3e25e8c145f 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -43,16 +43,16 @@ protected: explicit BubbleChartType( const BubbleChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel() + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index c85b12ee6ba3..3fd97691c2f1 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index 867db887a984..4eca50973328 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -36,7 +36,7 @@ public: explicit BubbleChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName ); + const OUString & rServiceName ); virtual ~BubbleChartTypeTemplate(); /// XServiceInfo declarations diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 8dc2ff9b1742..462da8a22d50 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -34,7 +34,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index d1ccc532ef0e..f5b723ffcca1 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -216,13 +215,13 @@ uno::Reference< util::XCloneable > SAL_CALL CandleStickChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL CandleStickChartType::getChartType() +OUString SAL_CALL CandleStickChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK; } -uno::Sequence< ::rtl::OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles() +uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles() throw (uno::RuntimeException) { bool bShowFirst = true; @@ -328,9 +327,9 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( ::property::OPropertySet::setFastPropertyValue_NoBroadcast( nHandle, rValue ); } -uno::Sequence< ::rtl::OUString > CandleStickChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > CandleStickChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index a05890f19689..75df4c24a8e8 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -42,15 +42,15 @@ protected: explicit CandleStickChartType( const CandleStickChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel() + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index d78d16ed0e89..bf8002dbaa12 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index c153a261a349..96f3b8a64c49 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -66,19 +66,19 @@ protected: // ____ XChartType ____ // still abstract ! implement ! - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel() + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() throw (::com::sun::star::uno::RuntimeException); // ____ XDataSeriesContainer ____ diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index c72abbe06993..187d1c4f2717 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 7858edf87cac..2312dc9a0725 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; @@ -130,7 +129,7 @@ namespace chart ChartTypeTemplate::ChartTypeTemplate( Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName ) : + const OUString & rServiceName ) : m_xContext( xContext ), m_aServiceName( rServiceName ) { @@ -523,7 +522,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram } // ____ XServiceName ____ - ::rtl::OUString SAL_CALL ChartTypeTemplate::getServiceName() + OUString SAL_CALL ChartTypeTemplate::getServiceName() throw (uno::RuntimeException) { return m_aServiceName; diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 5e855b4ec5a6..061647d764ff 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -79,7 +79,7 @@ public: explicit ChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName ); + const OUString & rServiceName ); virtual ~ChartTypeTemplate(); APPHELPER_XSERVICEINFO_DECL() @@ -126,7 +126,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); // Methods to overload for automatic creation @@ -265,7 +265,7 @@ protected: ::com::sun::star::chart2::XDataInterpreter > m_xDataInterpreter; private: - const ::rtl::OUString m_aServiceName; + const OUString m_aServiceName; private: /** modifies the given diagram diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 90bf825e42de..0427a844967a 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -148,7 +148,7 @@ uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL ColumnChartType::getChartType() +OUString SAL_CALL ColumnChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_COLUMN; @@ -178,9 +178,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS } -uno::Sequence< ::rtl::OUString > ColumnChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > ColumnChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_COLUMN; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 80f9255000c6..068260d3b545 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -42,7 +42,7 @@ protected: explicit ColumnChartType( const ColumnChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 3355d9ee33a5..1013c0ef96e1 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; @@ -131,7 +130,7 @@ namespace chart ColumnLineChartTypeTemplate::ColumnLineChartTypeTemplate( Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, sal_Int32 nNumberOfLines ) : ChartTypeTemplate( xContext, rServiceName ), @@ -419,9 +418,9 @@ Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInter // ---------------------------------------- -uno::Sequence< ::rtl::OUString > ColumnLineChartTypeTemplate::getSupportedServiceNames_Static() +uno::Sequence< OUString > ColumnLineChartTypeTemplate::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index 14d7a2194e5e..2363a6140b1d 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -38,7 +38,7 @@ public: explicit ColumnLineChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, sal_Int32 nNumberOfLines ); virtual ~ColumnLineChartTypeTemplate(); diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 51fbaf39690f..a111954387b2 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -36,7 +36,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 696e2a1b1c99..5078346a6cc0 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -39,7 +39,6 @@ using namespace ::chart::ContainerHelper; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; #if OSL_DEBUG_LEVEL > 1 namespace diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index f250fd970696..bba38e48e7e9 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -44,19 +44,19 @@ public: APPHELPER_XSERVICEINFO_DECL() // convenience methods - static ::rtl::OUString GetRole( + static OUString GetRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xSeq ); static void SetRole( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xSeq, - const ::rtl::OUString & rRole ); + const OUString & rRole ); static ::com::sun::star::uno::Any GetProperty( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aArguments, - const ::rtl::OUString & rName ); + const OUString & rName ); static bool HasCategories( const ::com::sun::star::uno::Sequence< diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 4c267fe40679..4a71becbcaa3 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -62,15 +61,15 @@ uno::Reference< util::XCloneable > SAL_CALL FilledNetChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL FilledNetChartType::getChartType() +OUString SAL_CALL FilledNetChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET; } -uno::Sequence< ::rtl::OUString > FilledNetChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > FilledNetChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 4a52aee0c929..0c5aeac28d0d 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -41,7 +41,7 @@ protected: explicit FilledNetChartType( const FilledNetChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index d35dde6fe776..e7616c76a76e 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -159,7 +158,7 @@ uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL LineChartType::getChartType() +OUString SAL_CALL LineChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_LINE; @@ -189,9 +188,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySet return *StaticLineChartTypeInfo::get(); } -uno::Sequence< ::rtl::OUString > LineChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > LineChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_LINE; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index df54fb70a974..2df426d13ca0 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -43,7 +43,7 @@ protected: explicit LineChartType( const LineChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index a0d370d36f7d..1b9d635c296d 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; @@ -148,7 +147,7 @@ namespace chart LineChartTypeTemplate::LineChartTypeTemplate( uno::Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, bool bSymbols, bool bHasLines /* = true */, diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index 66dda4a24ccd..b0ed7dd2d7b2 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -38,7 +38,7 @@ public: explicit LineChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, bool bSymbols, bool bHasLines = true, diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index ca3ddc545056..fd593daa6b51 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -168,15 +167,15 @@ uno::Reference< util::XCloneable > SAL_CALL NetChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL NetChartType::getChartType() +OUString SAL_CALL NetChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_NET; } -uno::Sequence< ::rtl::OUString > NetChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > NetChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_NET; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index 210df23e8d91..e4b1a25f2d9d 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -71,7 +71,7 @@ protected: explicit NetChartType( const NetChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 13f01f50fe9b..1672ba23f907 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; @@ -46,7 +45,7 @@ namespace chart NetChartTypeTemplate::NetChartTypeTemplate( Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, bool bSymbols, bool bHasLines , diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index 683950f36cd6..2462f200a6f0 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -31,7 +31,7 @@ public: explicit NetChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StackMode eStackMode, bool bSymbols, bool bHasLines = true, diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index b54d9769d41f..99d01bc8e938 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -152,7 +151,7 @@ uno::Reference< util::XCloneable > SAL_CALL PieChartType::createClone() } // ____ XChartType ____ -::rtl::OUString SAL_CALL PieChartType::getChartType() +OUString SAL_CALL PieChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_PIE; @@ -220,9 +219,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetI return *StaticPieChartTypeInfo::get(); } -uno::Sequence< ::rtl::OUString > PieChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > PieChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_PIE; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index a737ae12ecbf..962da335231f 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -43,7 +43,7 @@ protected: explicit PieChartType( const PieChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index ebf2c690568f..2fe296658cdb 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -159,7 +158,7 @@ namespace chart PieChartTypeTemplate::PieChartTypeTemplate( uno::Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, chart2::PieChartOffsetMode eMode, bool bRings /* = false */, sal_Int32 nDim /* = 2 */ ) : @@ -620,9 +619,9 @@ void PieChartTypeTemplate::adaptDiagram( const uno::Reference< chart2::XDiagram // ---------------------------------------- -uno::Sequence< ::rtl::OUString > PieChartTypeTemplate::getSupportedServiceNames_Static() +uno::Sequence< OUString > PieChartTypeTemplate::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index f0a876c58ac2..697a00f8ab6c 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -38,7 +38,7 @@ public: PieChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, ::com::sun::star::chart2::PieChartOffsetMode eMode, bool bRings = false, sal_Int32 nDim = 2 ); diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 20e89cb15ff7..d4dd2014d8a4 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -208,26 +207,26 @@ Reference< chart2::XCoordinateSystem > SAL_CALL return xResult; } -::rtl::OUString SAL_CALL ScatterChartType::getChartType() +OUString SAL_CALL ScatterChartType::getChartType() throw (uno::RuntimeException) { return CHART2_SERVICE_NAME_CHARTTYPE_SCATTER; } -uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles() +uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aMandRolesSeq(3); + uno::Sequence< OUString > aMandRolesSeq(3); aMandRolesSeq[0] = "label"; aMandRolesSeq[1] = "values-x"; aMandRolesSeq[2] = "values-y"; return aMandRolesSeq; } -uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles() +uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles() throw (uno::RuntimeException) { - return uno::Sequence< ::rtl::OUString >(); + return uno::Sequence< OUString >(); } @@ -255,9 +254,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getProperty return *StaticScatterChartTypeInfo::get(); } -uno::Sequence< ::rtl::OUString > ScatterChartType::getSupportedServiceNames_Static() +uno::Sequence< OUString > ScatterChartType::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 3 ); + uno::Sequence< OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_SCATTER; aServices[ 1 ] = "com.sun.star.chart2.ChartType"; aServices[ 2 ] = "com.sun.star.beans.PropertySet"; diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 8e0ea71642a7..e39265e9497c 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -47,12 +47,12 @@ protected: explicit ScatterChartType( const ScatterChartType & rOther ); // ____ XChartType ____ - virtual ::rtl::OUString SAL_CALL getChartType() + virtual OUString SAL_CALL getChartType() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 7496a5314ba2..da73968d3a15 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index ff26084d9b12..ef7afc26a7b2 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -37,7 +37,7 @@ public: explicit ScatterChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, bool bSymbols, bool bHasLines = true, sal_Int32 nDim = 2 ); diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 951aba452e20..8fb076771ea8 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; @@ -162,7 +161,7 @@ namespace chart StockChartTypeTemplate::StockChartTypeTemplate( uno::Reference< uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StockVariant eVariant, bool bJapaneseStyle ) : ChartTypeTemplate( xContext, rServiceName ), diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index 26b0f217e951..6c203d92d467 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -52,7 +52,7 @@ public: explicit StockChartTypeTemplate( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, StockVariant eVariant, bool bJapaneseStyle ); virtual ~StockChartTypeTemplate(); diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 0cafbd98a14a..ba55fbd2f79d 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -37,7 +37,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using namespace ::chart::ContainerHelper; namespace chart diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index 48d742421d83..3876d2a29d9c 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -34,7 +34,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 614236dff6d7..a91d05ace485 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -232,7 +232,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( Reference< XChartTypeContainer > xCTCnt( xCorrespondingCoordinateSystem, uno::UNO_QUERY_THROW ); if( xCTCnt.is() ) { - ::rtl::OUString aRoleToMatch; + OUString aRoleToMatch; if( nDimensionIndex == 0 ) aRoleToMatch = "values-x"; Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes()); diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 898699d50f19..deada2065cb3 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -37,7 +37,6 @@ using namespace ::chart::ContainerHelper; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::osl::MutexGuard; // necessary for MS compiler diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 241f08add123..40c79a3cb55d 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star; using ::com::sun::star::beans::Property; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx index c4f621e62098..a1817b0313a9 100644 --- a/chart2/source/tools/ChartDebugTrace.cxx +++ b/chart2/source/tools/ChartDebugTrace.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index 51b760de355d..658b6b03ea91 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -50,7 +50,7 @@ bool ChartTypeHelper::isSupportingAxisSideBySide( StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 ); if( eStackMode == StackMode_NONE && !bAmbiguous ) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); bResult = ( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ); } @@ -68,7 +68,7 @@ sal_Bool ChartTypeHelper::isSupportingGeometryProperties( const uno::Reference< { if(nDimensionCount==3) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ) return sal_True; if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) ) @@ -88,7 +88,7 @@ sal_Bool ChartTypeHelper::isSupportingStatisticProperties( const uno::Reference< if(nDimensionCount==3) return sal_False; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return sal_False; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) ) @@ -118,7 +118,7 @@ sal_Bool ChartTypeHelper::isSupportingAreaProperties( const uno::Reference< XCha { if(nDimensionCount==2) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) ) return sal_False; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) ) @@ -142,7 +142,7 @@ sal_Bool ChartTypeHelper::isSupportingSymbolProperties( const uno::Reference< XC if(nDimensionCount==3) return sal_False; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) ) return sal_True; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) ) @@ -161,7 +161,7 @@ sal_Bool ChartTypeHelper::isSupportingMainAxis( const uno::Reference< XChartType //@todo ask charttype itself --> need model change first if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return sal_False; @@ -181,7 +181,7 @@ sal_Bool ChartTypeHelper::isSupportingSecondaryAxis( const uno::Reference< XChar if(nDimensionCount==3) return sal_False; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return sal_False; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) ) @@ -203,7 +203,7 @@ sal_Bool ChartTypeHelper::isSupportingOverlapAndGapWidthProperties( if(nDimensionCount==3) return sal_False; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) ) return sal_True; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ) @@ -229,7 +229,7 @@ sal_Bool ChartTypeHelper::isSupportingBarConnectors( if( eStackMode != StackMode_Y_STACKED || bAmbiguous ) return sal_False; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) ) return sal_True; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ) @@ -248,7 +248,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const if( !xChartType.is() ) return aRet; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) { bool bDonut = false; @@ -359,7 +359,7 @@ sal_Bool ChartTypeHelper::isSupportingRightAngledAxes( const uno::Reference< cha { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return sal_False; } @@ -370,7 +370,7 @@ bool ChartTypeHelper::isSupportingStartingAngle( const uno::Reference< chart2::X { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return true; } @@ -380,7 +380,7 @@ bool ChartTypeHelper::isSupportingBaseValue( const uno::Reference< chart2::XChar { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA) @@ -394,7 +394,7 @@ bool ChartTypeHelper::isSupportingAxisPositioning( const uno::Reference< chart2: { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) ) return false; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) ) @@ -414,7 +414,7 @@ bool ChartTypeHelper::isSupportingDateAxis( const uno::Reference< chart2::XChart sal_Int32 nType = ChartTypeHelper::getAxisType( xChartType, nDimensionIndex ); if( nType != AxisType::CATEGORY ) return false; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return false; if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) ) @@ -429,7 +429,7 @@ bool ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( const uno::Reference< c { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) ) @@ -442,7 +442,7 @@ bool ChartTypeHelper::noBordersForSimpleScheme( const uno::Reference< chart2::XC { if(xChartType.is()) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return sal_True; } @@ -454,7 +454,7 @@ sal_Int32 ChartTypeHelper::getDefaultDirectLightColor( bool bSimple, const uno:: sal_Int32 nRet = static_cast< sal_Int32 >( 0x808080 ); // grey if( xChartType .is() ) { - rtl::OUString aChartType = xChartType->getChartType(); + OUString aChartType = xChartType->getChartType(); if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) { if( bSimple ) @@ -474,7 +474,7 @@ sal_Int32 ChartTypeHelper::getDefaultAmbientLightColor( bool bSimple, const uno: sal_Int32 nRet = static_cast< sal_Int32 >( 0x999999 ); // grey40 if( xChartType .is() ) { - rtl::OUString aChartType = xChartType->getChartType(); + OUString aChartType = xChartType->getChartType(); if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) { if( bSimple ) @@ -491,7 +491,7 @@ drawing::Direction3D ChartTypeHelper::getDefaultSimpleLightDirection( const uno: drawing::Direction3D aRet(0.0, 0.0, 1.0); if( xChartType .is() ) { - rtl::OUString aChartType = xChartType->getChartType(); + OUString aChartType = xChartType->getChartType(); if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) aRet = drawing::Direction3D(0.0, 0.8, 0.5); else if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_LINE) @@ -506,7 +506,7 @@ drawing::Direction3D ChartTypeHelper::getDefaultRealisticLightDirection( const u drawing::Direction3D aRet(0.0, 0.0, 1.0); if( xChartType .is() ) { - rtl::OUString aChartType = xChartType->getChartType(); + OUString aChartType = xChartType->getChartType(); if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) aRet = drawing::Direction3D(0.6, 0.6, 0.6); else if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_LINE) @@ -525,7 +525,7 @@ sal_Int32 ChartTypeHelper::getAxisType( const uno::Reference< if(!xChartType.is()) return AxisType::CATEGORY; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if(2==nDimensionIndex)//z-axis return AxisType::SERIES; if(1==nDimensionIndex)//y-axis @@ -548,7 +548,7 @@ sal_Int32 ChartTypeHelper::getNumberOfDisplayedSeries( { try { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE)) { uno::Reference< beans::XPropertySet > xChartTypeProp( xChartType, uno::UNO_QUERY_THROW ); @@ -580,7 +580,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments( StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 ); bStacked = bFound && (StackMode_Y_STACKED == eStackMode); - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) ) @@ -634,30 +634,30 @@ bool ChartTypeHelper::isSeriesInFrontOfAxisLine( const uno::Reference< XChartTyp { if( xChartType.is() ) { - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) ) return false; } return true; } -rtl::OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const uno::Reference< XChartType >& xChartType ) +OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const uno::Reference< XChartType >& xChartType ) { - rtl::OUString aRet( "values-y" ); + OUString aRet( "values-y" ); if( !xChartType.is() ) return aRet; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) ) aRet = xChartType->getRoleOfSequenceForSeriesLabel(); return aRet; } -rtl::OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const uno::Reference< XChartType >& xChartType ) +OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const uno::Reference< XChartType >& xChartType ) { - rtl::OUString aRet( "values-y" ); + OUString aRet( "values-y" ); if( !xChartType.is() ) return aRet; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) ) aRet = xChartType->getRoleOfSequenceForSeriesLabel(); @@ -667,7 +667,7 @@ rtl::OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetectio bool ChartTypeHelper::shouldLabelNumberFormatKeyBeDetectedFromYAxis( const uno::Reference< XChartType >& xChartType ) { bool bRet = true; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) ) bRet = false; return bRet; @@ -679,7 +679,7 @@ bool ChartTypeHelper::isSupportingOnlyDeepStackingFor3D( const uno::Reference< X if( !xChartType.is() ) return bRet; - rtl::OUString aChartTypeName = xChartType->getChartType(); + OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA) ) diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx index f9c986225893..829780d02519 100644 --- a/chart2/source/tools/CommonConverters.cxx +++ b/chart2/source/tools/CommonConverters.cxx @@ -459,10 +459,10 @@ uno::Sequence< double > DataSequenceToDoubleSequence( return aResult; } -uno::Sequence< rtl::OUString > DataSequenceToStringSequence( +uno::Sequence< OUString > DataSequenceToStringSequence( const uno::Reference< data::XDataSequence >& xDataSequence ) { - uno::Sequence< rtl::OUString > aResult; + uno::Sequence< OUString > aResult; if(!xDataSequence.is()) return aResult; @@ -519,9 +519,9 @@ sal_Int16 getShortForLongAlso( const uno::Any& rAny ) return nRet; } -bool replaceParamterInString( rtl::OUString & rInOutResourceString, - const rtl::OUString & rParamToReplace, - const rtl::OUString & rReplaceWith ) +bool replaceParamterInString( OUString & rInOutResourceString, + const OUString & rParamToReplace, + const OUString & rReplaceWith ) { sal_Int32 nPos = rInOutResourceString.indexOf( rParamToReplace ); if( nPos == -1 ) diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index f56ce504d80d..d1425e9c8dd7 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/tools/ControllerLockGuard.cxx b/chart2/source/tools/ControllerLockGuard.cxx index 727eef634f53..ce57ac442428 100644 --- a/chart2/source/tools/ControllerLockGuard.cxx +++ b/chart2/source/tools/ControllerLockGuard.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index f9a8b64dc792..d7ec4ac688db 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -49,8 +49,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ---------------------------------------- namespace diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 262e6fe2e11e..71b6a5cb40fe 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -21,7 +21,6 @@ #include "DataSource.hxx" #include "LabeledDataSequence.hxx" -using ::rtl::OUString; using ::osl::MutexGuard; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index cef1dc179d89..fab7b55011b8 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -45,11 +45,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { -void lcl_addRanges( ::std::vector< ::rtl::OUString > & rOutResult, +void lcl_addRanges( ::std::vector< OUString > & rOutResult, const uno::Reference< data::XLabeledDataSequence > & xLabeledSeq ) { if( ! xLabeledSeq.is()) @@ -63,7 +62,7 @@ void lcl_addRanges( ::std::vector< ::rtl::OUString > & rOutResult, } void lcl_addDataSourceRanges( - ::std::vector< ::rtl::OUString > & rOutResult, + ::std::vector< OUString > & rOutResult, const uno::Reference< data::XDataSource > & xDataSource ) { if( xDataSource.is() ) @@ -75,7 +74,7 @@ void lcl_addDataSourceRanges( } void lcl_addErrorBarRanges( - ::std::vector< ::rtl::OUString > & rOutResult, + ::std::vector< OUString > & rOutResult, const uno::Reference< XDataSeries > & xDataSeries ) { uno::Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY ); @@ -129,7 +128,7 @@ Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSeque return new ::chart::CachedDataSequence(); } -Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSequence( const ::rtl::OUString& rSingleText ) +Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSequence( const OUString& rSingleText ) { return new ::chart::CachedDataSequence( rSingleText ); } @@ -175,7 +174,7 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( } uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( - const ::rtl::OUString & rRangeRepresentation, + const OUString & rRangeRepresentation, const uno::Sequence< sal_Int32 >& rSequenceMapping, bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories ) { @@ -197,7 +196,7 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( } void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue >& rArguments - , ::rtl::OUString & rRangeRepresentation, uno::Sequence< sal_Int32 >& rSequenceMapping + , OUString & rRangeRepresentation, uno::Sequence< sal_Int32 >& rSequenceMapping , bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories ) { const beans::PropertyValue* pArguments = rArguments.getConstArray(); @@ -269,10 +268,10 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR return new DataSource( aResultSequence ); } -uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges( +uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< chart2::XDiagram > & xDiagram ) { - ::std::vector< ::rtl::OUString > aResult; + ::std::vector< OUString > aResult; if( xDiagram.is()) { @@ -293,7 +292,7 @@ uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges( return ContainerHelper::ContainerToSequence( aResult ); } -uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< frame::XModel > & xChartModel ) +uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< frame::XModel > & xChartModel ) { uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); return getUsedDataRanges( xDiagram ); @@ -334,7 +333,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData( bool DataSourceHelper::detectRangeSegmentation( const uno::Reference< frame::XModel >& xChartModel - , ::rtl::OUString& rOutRangeString + , OUString& rOutRangeString , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping , bool& rOutUseColumns , bool& rOutFirstCellAsLabel @@ -400,7 +399,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected( } else if ( aProperty.Name == "CellRangeRepresentation" ) { - ::rtl::OUString aRange; + OUString aRange; bHasCellRangeRepresentation = (aProperty.Value.hasValue() && (aProperty.Value >>= aRange) && !aRange.isEmpty()); } @@ -435,7 +434,7 @@ void DataSourceHelper::setRangeSegmentation( if( !xTemplateFactory.is() ) return; - ::rtl::OUString aRangeString; + OUString aRangeString; bool bDummy; uno::Sequence< sal_Int32 > aDummy; readArguments( xDataProvider->detectArguments( pressUsedDataIntoRectangularFormat( xChartDocument )), diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 1b54b355edbe..1356237d5515 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -65,7 +65,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::com::sun::star::chart2::XAnyDescriptionAccess; namespace chart @@ -955,12 +954,12 @@ Reference< data::XLabeledDataSequence > } void lcl_generateAutomaticCategoriesFromChartType( - Sequence< rtl::OUString >& rRet, + Sequence< OUString >& rRet, const Reference< XChartType >& xChartType ) { if(!xChartType.is()) return; - rtl::OUString aMainSeq( xChartType->getRoleOfSequenceForSeriesLabel() ); + OUString aMainSeq( xChartType->getRoleOfSequenceForSeriesLabel() ); Reference< XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY ); if( xSeriesCnt.is() ) { @@ -984,9 +983,9 @@ void lcl_generateAutomaticCategoriesFromChartType( } } -Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys( const Reference< XCoordinateSystem > & xCooSys ) +Sequence< OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys( const Reference< XCoordinateSystem > & xCooSys ) { - Sequence< rtl::OUString > aRet; + Sequence< OUString > aRet; Reference< XChartTypeContainer > xTypeCntr( xCooSys, uno::UNO_QUERY ); if( xTypeCntr.is() ) @@ -1002,10 +1001,10 @@ Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys( return aRet; } -Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories( +Sequence< OUString > DiagramHelper::getExplicitSimpleCategories( const Reference< XChartDocument >& xChartDoc ) { - Sequence< rtl::OUString > aRet; + Sequence< OUString > aRet; uno::Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY ); if(xChartModel.is()) { @@ -1251,8 +1250,8 @@ bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartTy if( !xFirstType.is() || !xSecondType.is() ) return false; - ::std::vector< ::rtl::OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) ); - ::std::vector< ::rtl::OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) ); + ::std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) ); + ::std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) ); ::std::sort( aFirstRoles.begin(), aFirstRoles.end() ); ::std::sort( aSecondRoles.begin(), aSecondRoles.end() ); return ( aFirstRoles == aSecondRoles ); @@ -1497,7 +1496,7 @@ bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference< if( xChartType .is() ) { - rtl::OUString aChartType = xChartType->getChartType(); + OUString aChartType = xChartType->getChartType(); if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) return true; } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 3e9a3d7c5e38..29f40e8c9925 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -33,8 +33,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; @@ -327,9 +325,9 @@ void ErrorBar::fireModifyEvent() // ================================================================================ -uno::Sequence< ::rtl::OUString > ErrorBar::getSupportedServiceNames_Static() +uno::Sequence< OUString > ErrorBar::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.ErrorBar"; return aServices; diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 538a9d0dad80..949e18990ade 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::std::vector; @@ -109,7 +108,7 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2: if( !aSeries.empty() ) { uno::Reference< data::XDataSource > xSeriesSource( aSeries.front(), uno::UNO_QUERY ); - ::rtl::OUString aStringDummy; + OUString aStringDummy; bool bDummy; uno::Sequence< sal_Int32 > aSeqDummy; DataSourceHelper::readArguments( xDataProvider->detectArguments( xSeriesSource), @@ -180,7 +179,7 @@ std::vector lcl_getLimitingBorders( const std::vector< ComplexCategor return aLimitingBorders; } -void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< rtl::OUString >& rOutTexts, const uno::Sequence< uno::Any >& rInAnys, Reference< frame::XModel > xChartModel ) +void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< OUString >& rOutTexts, const uno::Sequence< uno::Any >& rInAnys, Reference< frame::XModel > xChartModel ) { sal_Int32 nCount = rInAnys.getLength(); if(!nCount) @@ -207,7 +206,7 @@ void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< rtl:: for(sal_Int32 nN=0;nN getStringsForLevel( sal_Int32 nIndex ) const; + virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const; private: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< @@ -260,9 +259,9 @@ sal_Int32 SplitCategoriesProvider_ForLabeledDataSequences::getLevelCount() const { return m_rSplitCategoriesList.getLength(); } -uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForLabeledDataSequences::getStringsForLevel( sal_Int32 nLevel ) const +uno::Sequence< OUString > SplitCategoriesProvider_ForLabeledDataSequences::getStringsForLevel( sal_Int32 nLevel ) const { - uno::Sequence< rtl::OUString > aRet; + uno::Sequence< OUString > aRet; Reference< data::XLabeledDataSequence > xLabeledDataSequence( m_rSplitCategoriesList[nLevel] ); if( xLabeledDataSequence.is() ) { @@ -274,7 +273,7 @@ uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForLabeledDataSequences:: } std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector( - const uno::Sequence< rtl::OUString >& rStrings + const uno::Sequence< OUString >& rStrings , const std::vector& rLimitingBorders, bool bCreateSingleCategories ) { std::vector< ComplexCategory > aResult; @@ -535,7 +534,7 @@ void ExplicitCategoriesProvider::init() } -Sequence< ::rtl::OUString > ExplicitCategoriesProvider::getSimpleCategories() +Sequence< OUString > ExplicitCategoriesProvider::getSimpleCategories() { if( !m_bIsExplicitCategoriesInited ) { diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index 75e66ce52a32..c76138ac809f 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index 64b822edd314..f70332535489 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -61,7 +61,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s rOutProperties.push_back( Property( "FillTransparenceGradientName", FillProperties::PROP_FILL_TRANSPARENCE_GRADIENT_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -69,7 +69,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s rOutProperties.push_back( Property( "FillGradientName", FillProperties::PROP_FILL_GRADIENT_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -84,7 +84,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s rOutProperties.push_back( Property( "FillHatchName", FillProperties::PROP_FILL_HATCH_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); @@ -104,7 +104,7 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun: rOutProperties.push_back( Property( "FillBitmapName", FillProperties::PROP_FILL_BITMAP_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx index 43593bcd49f7..82ad2392bf69 100644 --- a/chart2/source/tools/FormattedStringHelper.cxx +++ b/chart2/source/tools/FormattedStringHelper.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using rtl::OUString; Sequence< Reference< chart2::XFormattedString > > FormattedStringHelper::createFormattedStringSequence( diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index db2031d52918..27632e1d070d 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index e8d4def8f24d..61dfaa96598f 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -27,7 +27,6 @@ #include using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::std; diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 3a4303b08528..147afc8a2935 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -52,8 +52,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { @@ -329,7 +327,7 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum //data in columns? { - ::rtl::OUString aRangeString; + OUString aRangeString; bool bFirstCellAsLabel = true; bool bHasCategories = true; uno::Sequence< sal_Int32 > aSequenceMapping; @@ -1269,7 +1267,7 @@ public: {} virtual sal_Int32 getLevelCount() const; - virtual uno::Sequence< rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const; + virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const; private: const ::std::vector< ::std::vector< uno::Any > >& m_rComplexDescriptions; @@ -1279,9 +1277,9 @@ sal_Int32 SplitCategoriesProvider_ForComplexDescriptions::getLevelCount() const { return lcl_getInnerLevelCount( m_rComplexDescriptions ); } -uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForComplexDescriptions::getStringsForLevel( sal_Int32 nLevel ) const +uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStringsForLevel( sal_Int32 nLevel ) const { - uno::Sequence< rtl::OUString > aResult; + uno::Sequence< OUString > aResult; if( nLevel < lcl_getInnerLevelCount( m_rComplexDescriptions ) ) { aResult.realloc( m_rComplexDescriptions.size() ); @@ -1354,15 +1352,15 @@ Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDes { return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() ); } -void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException) { m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) ); } -Sequence< Sequence< ::rtl::OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) { return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() ); } -void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) { m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) ); } diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index a7ac13fb9b15..8b8785d5d353 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx index 54de032cf02c..e3c88d9860c3 100644 --- a/chart2/source/tools/LineProperties.cxx +++ b/chart2/source/tools/LineProperties.cxx @@ -54,7 +54,7 @@ void LineProperties::AddPropertiesToVector( rOutProperties.push_back( Property( "LineDashName", PROP_LINE_DASH_NAME, - ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), + ::getCppuType( reinterpret_cast< const OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index f168f63429d3..5b388ee4139e 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index 29ea58f996ff..af56a64e19c6 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 0551cbdbb901..10bebac3c077 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -25,8 +25,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 3cb8953f0c3a..359017940244 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index fe181d360dbd..130d277329f6 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //............................................................................. @@ -34,7 +33,7 @@ namespace chart //............................................................................. uno::Reference< container::XNameContainer > createNameContainer( - const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName ) + const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ) { return new NameContainer( rType, rServicename, rImplementationName ); } diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index 508e2716f489..a1080b34c792 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -46,7 +46,7 @@ FixedNumberFormatter::~FixedNumberFormatter() { } -rtl::OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const +OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const { return m_aNumberFormatterWrapper.getFormattedString( m_nNumberFormatKey, fValue, rLabelColor, rbColorChanged ); @@ -62,7 +62,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNum { uno::Reference xProp(m_xNumberFormatsSupplier,uno::UNO_QUERY); - rtl::OUString sNullDate( "NullDate" ); + OUString sNullDate( "NullDate" ); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sNullDate) ) m_aNullDate = xProp->getPropertyValue(sNullDate); SvNumberFormatsSupplierObj* pSupplierObj = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); @@ -99,7 +99,7 @@ Date NumberFormatterWrapper::getNullDate() const return aRet; } -rtl::OUString NumberFormatterWrapper::getFormattedString( +OUString NumberFormatterWrapper::getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const { String aText; @@ -130,7 +130,7 @@ rtl::OUString NumberFormatterWrapper::getFormattedString( { m_pNumberFormatter->ChangeNullDate(nDay,nMonth,nYear); } - rtl::OUString aRet( aText ); + OUString aRet( aText ); if(pTextColor) { diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index a6f437686add..f244f955a894 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -33,7 +33,6 @@ using ::com::sun::star::style::XStyleSupplier; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::osl::MutexGuard; // needed for MS compiler diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 8779f1dd9942..1097984274e3 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -46,8 +46,6 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -using rtl::OUString; -using rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; @@ -366,11 +364,11 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( if( xAxis.is() ) { Reference< XCoordinateSystem > xCooSys( AxisHelper::getCoordinateSystemOfAxis( xAxis, ChartModelHelper::findDiagram( xChartModel ) ) ); - rtl::OUString aCooSysParticle( createParticleForCoordinateSystem( xCooSys, xChartModel ) ); + OUString aCooSysParticle( createParticleForCoordinateSystem( xCooSys, xChartModel ) ); sal_Int32 nDimensionIndex=-1; sal_Int32 nAxisIndex=-1; AxisHelper::getIndicesForAxis( xAxis, xCooSys, nDimensionIndex, nAxisIndex ); - rtl::OUString aAxisParticle( createParticleForAxis( nDimensionIndex, nAxisIndex ) ); + OUString aAxisParticle( createParticleForAxis( nDimensionIndex, nAxisIndex ) ); return createClassifiedIdentifierForParticles( aCooSysParticle, aAxisParticle ); } @@ -515,8 +513,8 @@ OUString ObjectIdentifier::createClassifiedIdentifierForGrid( { //-1: main grid, 0: first subgrid etc - rtl::OUString aAxisCID( createClassifiedIdentifierForObject( xAxis, xChartModel ) ); - rtl::OUString aGridCID( addChildParticle( aAxisCID + OUString aAxisCID( createClassifiedIdentifierForObject( xAxis, xChartModel ) ); + OUString aGridCID( addChildParticle( aAxisCID , createChildParticleWithIndex( OBJECTTYPE_GRID, 0 ) ) ); if( nSubGridIndex >= 0 ) { @@ -1004,7 +1002,7 @@ OUString ObjectIdentifier::createDataCurveEquationCID( return createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_CURVE_EQUATION, aParticleID, rSeriesParticle ); } -OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle ) +OUString ObjectIdentifier::addChildParticle( const OUString& rParticle, const OUString& rChildParticle ) { OUStringBuffer aRet(rParticle); @@ -1016,7 +1014,7 @@ OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, con return aRet.makeStringAndClear(); } -rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex ) +OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex ) { OUStringBuffer aRet( getStringForType( eObjectType ) ); if( aRet.getLength() ) @@ -1027,7 +1025,7 @@ rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObject return aRet.makeStringAndClear(); } -sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rParticleOrCID ) +sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const OUString& rParticleOrCID ) { sal_Int32 nRet = -1; @@ -1039,9 +1037,9 @@ sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rPar } OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType - , const rtl::OUString& rSeriesParticle - , const rtl::OUString& rDragMethodServiceName - , const rtl::OUString& rDragParameterString ) + , const OUString& rSeriesParticle + , const OUString& rDragMethodServiceName + , const OUString& rDragParameterString ) { OUString aChildParticle( getStringForType( eSubObjectType ) ); aChildParticle+=("="); @@ -1084,7 +1082,7 @@ OUString ObjectIdentifier::getFullParentParticle( const OUString& rCID ) return aRet; } -OUString ObjectIdentifier::getObjectID( const rtl::OUString& rCID ) +OUString ObjectIdentifier::getObjectID( const OUString& rCID ) { OUString aRet; @@ -1341,7 +1339,7 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID( } Reference< XDiagram > ObjectIdentifier::getDiagramForCID( - const rtl::OUString& rObjectCID + const OUString& rObjectCID , const uno::Reference< frame::XModel >& xChartModel ) { Reference< XDiagram > xDiagram; @@ -1385,7 +1383,7 @@ OUString ObjectIdentifier::getSeriesParticleFromCID( const OUString& rCID ) return ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCooSysIndex, nChartTypeIndex, nSeriesIndex ); } -OUString ObjectIdentifier::getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward ) +OUString ObjectIdentifier::getMovedSeriesCID( const OUString& rObjectCID, sal_Bool bForward ) { sal_Int32 nDiagramIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CID/D=" ) ); sal_Int32 nCooSysIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CS=" ) ); diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index b84032790e06..ef53b5dc4a55 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace chart { diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 746cf6a1a35b..fb6b0bfadd84 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 545e4e697626..1d1a1d22edf8 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index f039aa67f7ce..9e41285f2afc 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // ================================================================================ diff --git a/chart2/source/tools/RegressionCalculationHelper.hxx b/chart2/source/tools/RegressionCalculationHelper.hxx index da1c0ca9c5d0..4cf49663e678 100644 --- a/chart2/source/tools/RegressionCalculationHelper.hxx +++ b/chart2/source/tools/RegressionCalculationHelper.hxx @@ -25,7 +25,7 @@ #include #include -#define NUMBER_TO_STR(number) (::rtl::OStringToOUString(::rtl::math::doubleToString( \ +#define NUMBER_TO_STR(number) (OStringToOUString(::rtl::math::doubleToString( \ number, rtl_math_StringFormat_G, 4, '.', true ),RTL_TEXTENCODING_ASCII_US )) #define UC_SPACE (sal_Unicode(' ')) diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 8d811aef8f7d..b2f6b52f6db0 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 4c346c6f6938..08228bc0961f 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -43,7 +43,6 @@ using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::lang::XServiceName; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Exception; -using ::rtl::OUString; namespace { @@ -87,7 +86,7 @@ Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine( Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServiceName( const Reference< XComponentContext > & xContext, - ::rtl::OUString aServiceName ) + OUString aServiceName ) { Reference< XRegressionCurve > xResult; @@ -115,7 +114,7 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ // ------------------------------------------------------------ Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( - ::rtl::OUString aServiceName ) + OUString aServiceName ) { Reference< XRegressionCurveCalculator > xResult; @@ -166,7 +165,7 @@ void RegressionCurveHelper::initializeCurveCalculator( { Reference< data::XDataSequence > xSeq( aDataSeqs[i]->getValues()); Reference< XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - ::rtl::OUString aRole; + OUString aRole; if( xProp->getPropertyValue( "Role" ) >>= aRole ) { if( bUseXValuesIfAvailable && !bXValuesFound && aRole == "values-x" ) @@ -349,7 +348,7 @@ void RegressionCurveHelper::addRegressionCurve( } uno::Reference< chart2::XRegressionCurve > xCurve; - ::rtl::OUString aServiceName( lcl_getServiceNameForType( eType )); + OUString aServiceName( lcl_getServiceNameForType( eType )); if( !aServiceName.isEmpty()) { @@ -508,7 +507,7 @@ RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType( Reference< lang::XServiceName > xServName( xCurve, uno::UNO_QUERY ); if( xServName.is()) { - ::rtl::OUString aServiceName( xServName->getServiceName() ); + OUString aServiceName( xServName->getServiceName() ); if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" ) { diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 7312081755be..0522af8b4cc5 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -32,8 +32,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; @@ -176,7 +174,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< } // ____ XServiceName ____ -::rtl::OUString SAL_CALL RegressionCurveModel::getServiceName() +OUString SAL_CALL RegressionCurveModel::getServiceName() throw (uno::RuntimeException) { switch( m_eRegressionCurveType ) @@ -193,7 +191,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< return OUString("com.sun.star.chart2.PotentialRegressionCurve"); } - return ::rtl::OUString(); + return OUString(); } // ____ XModifyBroadcaster ____ @@ -299,9 +297,9 @@ MeanValueRegressionCurve::MeanValueRegressionCurve( {} MeanValueRegressionCurve::~MeanValueRegressionCurve() {} -uno::Sequence< ::rtl::OUString > MeanValueRegressionCurve::getSupportedServiceNames_Static() +uno::Sequence< OUString > MeanValueRegressionCurve::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.MeanValueRegressionCurve"; return aServices; @@ -327,9 +325,9 @@ LinearRegressionCurve::LinearRegressionCurve( {} LinearRegressionCurve::~LinearRegressionCurve() {} -uno::Sequence< ::rtl::OUString > LinearRegressionCurve::getSupportedServiceNames_Static() +uno::Sequence< OUString > LinearRegressionCurve::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.LinearRegressionCurve"; return aServices; @@ -355,9 +353,9 @@ LogarithmicRegressionCurve::LogarithmicRegressionCurve( {} LogarithmicRegressionCurve::~LogarithmicRegressionCurve() {} -uno::Sequence< ::rtl::OUString > LogarithmicRegressionCurve::getSupportedServiceNames_Static() +uno::Sequence< OUString > LogarithmicRegressionCurve::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.LogarithmicRegressionCurve"; return aServices; @@ -383,9 +381,9 @@ ExponentialRegressionCurve::ExponentialRegressionCurve( {} ExponentialRegressionCurve::~ExponentialRegressionCurve() {} -uno::Sequence< ::rtl::OUString > ExponentialRegressionCurve::getSupportedServiceNames_Static() +uno::Sequence< OUString > ExponentialRegressionCurve::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.ExponentialRegressionCurve"; return aServices; @@ -411,9 +409,9 @@ PotentialRegressionCurve::PotentialRegressionCurve( {} PotentialRegressionCurve::~PotentialRegressionCurve() {} -uno::Sequence< ::rtl::OUString > PotentialRegressionCurve::getSupportedServiceNames_Static() +uno::Sequence< OUString > PotentialRegressionCurve::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aServices( 2 ); + uno::Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; aServices[ 1 ] = "com.sun.star.chart2.PotentialRegressionCurve"; return aServices; diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 1670316defdf..8434d21731de 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -99,7 +99,7 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); // ____ XCloneable ____ diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index ef2c4934d93c..16f771a16729 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -115,7 +115,7 @@ private: ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW, false ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false ); - //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, ::rtl::OUString( sal_Unicode( '\n' ))); + //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, OUString( sal_Unicode( '\n' ))); // override other defaults ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE ); @@ -309,11 +309,11 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< // ================================================================================ -uno::Sequence< ::rtl::OUString > RegressionEquation::getSupportedServiceNames_Static() +uno::Sequence< OUString > RegressionEquation::getSupportedServiceNames_Static() { const sal_Int32 nNumServices( 5 ); sal_Int32 nI = 0; - uno::Sequence< ::rtl::OUString > aServices( nNumServices ); + uno::Sequence< OUString > aServices( nNumServices ); aServices[ nI++ ] = lcl_aServiceName; aServices[ nI++ ] = "com.sun.star.beans.PropertySet"; aServices[ nI++ ] = "com.sun.star.drawing.FillProperties"; diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx index 53883ae0c1f7..bc4dca1bf67a 100644 --- a/chart2/source/tools/RelativeSizeHelper.cxx +++ b/chart2/source/tools/RelativeSizeHelper.cxx @@ -30,7 +30,6 @@ using namespace ::std; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Exception; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 04ce78c5fcb8..5dc408359749 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -74,16 +74,16 @@ LogarithmicScaling::getInverseScaling() return new ExponentialScaling( m_fBase ); } - ::rtl::OUString SAL_CALL + OUString SAL_CALL LogarithmicScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_Logarithmic; } -uno::Sequence< ::rtl::OUString > LogarithmicScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > LogarithmicScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Logarithmic, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_Logarithmic, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -125,16 +125,16 @@ ExponentialScaling::getInverseScaling() return new LogarithmicScaling( m_fBase ); } - ::rtl::OUString SAL_CALL + OUString SAL_CALL ExponentialScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_Exponential; } -uno::Sequence< ::rtl::OUString > ExponentialScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > ExponentialScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Exponential, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_Exponential, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -178,16 +178,16 @@ uno::Reference< XScaling > SAL_CALL return new LinearScaling( 1.0 / m_fSlope, m_fOffset / m_fSlope ); } - ::rtl::OUString SAL_CALL + OUString SAL_CALL LinearScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_Linear; } -uno::Sequence< ::rtl::OUString > LinearScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > LinearScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Linear, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_Linear, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -229,16 +229,16 @@ uno::Reference< XScaling > SAL_CALL return new PowerScaling( 1.0 / m_fExponent ); } - ::rtl::OUString SAL_CALL + OUString SAL_CALL PowerScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_Power; } -uno::Sequence< ::rtl::OUString > PowerScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > PowerScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Power, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_Power, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 81f47e0c2da9..99d9e4267835 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -33,8 +33,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; namespace diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 4805390c4b8c..32406a57770b 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::rtl::math::cos; using ::rtl::math::sin; using ::rtl::math::tan; @@ -1339,8 +1338,8 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); sal_Int32 nSeriesCount = static_cast( aSeriesList.size() ); - rtl::OUString aPercentDiagonalPropertyName( "PercentDiagonal" ); - rtl::OUString aBorderStylePropertyName( "BorderStyle" ); + OUString aPercentDiagonalPropertyName( "PercentDiagonal" ); + OUString aBorderStylePropertyName( "BorderStyle" ); for( sal_Int32 nS = 0; nS < nSeriesCount; ++nS ) { diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index f618780e8876..c5b74b54fcd9 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -132,7 +132,7 @@ uno::Reference< XTitle > TitleHelper::getTitle( TitleHelper::eTitleType nTitleIn uno::Reference< XTitle > TitleHelper::createTitle( TitleHelper::eTitleType eTitleType - , const rtl::OUString& rTitleText + , const OUString& rTitleText , const uno::Reference< frame::XModel >& xModel , const uno::Reference< uno::XComponentContext > & xContext , ReferenceSizeProvider * pRefSizeProvider ) @@ -239,9 +239,9 @@ uno::Reference< XTitle > TitleHelper::createTitle( } -rtl::OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xTitle ) +OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xTitle ) { - rtl::OUString aRet; + OUString aRet; if(!xTitle.is()) return aRet; uno::Sequence< uno::Reference< XFormattedString > > aStringList = xTitle->getText(); @@ -250,7 +250,7 @@ rtl::OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xT return aRet; } -void TitleHelper::setCompleteString( const rtl::OUString& rNewText +void TitleHelper::setCompleteString( const OUString& rNewText , const uno::Reference< XTitle >& xTitle , const uno::Reference< uno::XComponentContext > & xContext , float * pDefaultCharHeight /* = 0 */ ) @@ -259,7 +259,7 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText if(!xTitle.is()) return; - rtl::OUString aNewText = rNewText; + OUString aNewText = rNewText; bool bStacked = false; uno::Reference< beans::XPropertySet > xTitleProperties( xTitle, uno::UNO_QUERY ); @@ -269,8 +269,8 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText if( bStacked ) { //#i99841# remove linebreaks that were added for vertical stacking - rtl::OUStringBuffer aUnstackedStr; - rtl::OUStringBuffer aSource(rNewText); + OUStringBuffer aUnstackedStr; + OUStringBuffer aSource(rNewText); bool bBreakIgnored = false; sal_Int32 nLen = rNewText.getLength(); diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 59c26759add0..33c99e554f2c 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::osl::MutexGuard; // necessary for MS compiler @@ -282,7 +281,7 @@ uno::Type SAL_CALL UncachedDataSequence::getElementType() } // ____ XNamed ____ -::rtl::OUString SAL_CALL UncachedDataSequence::getName() +OUString SAL_CALL UncachedDataSequence::getName() throw (uno::RuntimeException) { return m_aSourceRepresentation; diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index 899e28dd7bb2..0c8b9736c6aa 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index f75c62b4d657..6304660930e2 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx index f98c029d8b07..7ba667b355bf 100644 --- a/chart2/source/tools/WrappedDirectStateProperty.cxx +++ b/chart2/source/tools/WrappedDirectStateProperty.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace chart { diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 069d18ab2b00..101fd03bd3fe 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; //............................................................................. namespace chart @@ -85,7 +84,7 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList ) { rList.push_back( new WrappedIgnoreProperty( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ) ); - rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( rtl::OUString() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( OUString() ) ) ); rList.push_back( new WrappedIgnoreProperty( "LineColor", uno::makeAny( sal_Int32(0) ) ) ); rList.push_back( new WrappedIgnoreProperty( "LineTransparence", uno::makeAny( sal_Int16(0) ) ) ); rList.push_back( new WrappedIgnoreProperty( "LineWidth", uno::makeAny( sal_Int32(0) ) ) ); @@ -103,20 +102,20 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::makeAny( sal_Int32(-1) ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillTransparence", uno::makeAny( sal_Int16(0) ) ) ); - rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( ::rtl::OUString() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( OUString() ) ) ); // rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradient", uno::makeAny( awt::Gradient() ) ) ); - rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( ::rtl::OUString() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( OUString() ) ) ); // rList.push_back( new WrappedIgnoreProperty( "FillGradient", uno::makeAny( awt::Gradient() ) ) ); - rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( ::rtl::OUString() ) ) ); + rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( OUString() ) ) ); // rList.push_back( new WrappedIgnoreProperty( "FillHatch", uno::makeAny( drawing::Hatch() ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::makeAny( sal_Bool(sal_False) ) ) ); } void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList ) { -// rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( ::rtl::OUString() ) ) ); +// rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( OUString() ) ) ); // rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::makeAny( uno::Reference< awt::XBitmap > (0) ) ) ); -// rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( ::rtl::OUString() ) ) ); +// rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( OUString() ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::makeAny( sal_Int16(0) ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::makeAny( sal_Int16(0) ) ) ); rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::makeAny( sal_Int16(0) ) ) ); diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index c4156a4efff7..dd4d6e93a5ec 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; //............................................................................. @@ -47,7 +46,7 @@ const OUString& WrappedProperty::getOuterName() const return m_aOuterName; } -::rtl::OUString WrappedProperty::getInnerName() const +OUString WrappedProperty::getInnerName() const { return m_aInnerName; } @@ -108,7 +107,7 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans:: throw (beans::UnknownPropertyException, uno::RuntimeException) { beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE; - rtl::OUString aInnerName( this->getInnerName() ); + OUString aInnerName( this->getInnerName() ); if( xInnerPropertyState.is() && !aInnerName.isEmpty() ) aState = xInnerPropertyState->getPropertyState( aInnerName ); else diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index 5b82509d70d1..07a0cdfc6147 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; WrappedPropertySet::WrappedPropertySet() : MutexContainer() @@ -248,7 +247,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nNsetPropertyValue( aPropertyName, rValueSeq[nN] ); @@ -276,7 +275,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< { try { - ::rtl::OUString aPropertyName( rNameSeq[nN] ); + OUString aPropertyName( rNameSeq[nN] ); aRetSeq[nN] = this->getPropertyValue( aPropertyName ); } catch( const beans::UnknownPropertyException& ex ) @@ -328,7 +327,7 @@ beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUStri return aState; } -const WrappedProperty* WrappedPropertySet::getWrappedProperty( const ::rtl::OUString& rOuterName ) +const WrappedProperty* WrappedPropertySet::getWrappedProperty( const OUString& rOuterName ) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rOuterName ); return getWrappedProperty( nHandle ); @@ -351,7 +350,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( aRetSeq.realloc( rNameSeq.getLength() ); for(sal_Int32 nN=0; nNgetPropertyState( aPropertyName ); } } @@ -394,7 +393,7 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( ) const Sequence< beans::Property >& rPropSeq = getPropertySequence(); for(sal_Int32 nN=0; nNsetPropertyToDefault( aPropertyName ); } } @@ -403,7 +402,7 @@ void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUStri { for(sal_Int32 nN=0; nNsetPropertyToDefault( aPropertyName ); } } @@ -416,7 +415,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence aRetSeq.realloc( rNameSeq.getLength() ); for(sal_Int32 nN=0; nNgetPropertyDefault( aPropertyName ); } } diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index 77b79820d552..387bfd0fa4c1 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ================================================================================ @@ -39,7 +37,7 @@ namespace class lcl_Escape : public ::std::unary_function< sal_Unicode, void > { public: - lcl_Escape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} + lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} void operator() ( sal_Unicode aChar ) { static const sal_Unicode m_aQuote( '\'' ); @@ -52,7 +50,7 @@ public: } private: - ::rtl::OUStringBuffer & m_aResultBuffer; + OUStringBuffer & m_aResultBuffer; }; // ---------------------------------------- @@ -64,7 +62,7 @@ private: class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void > { public: - lcl_UnEscape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} + lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} void operator() ( sal_Unicode aChar ) { static const sal_Unicode m_aBackslash( '\\' ); @@ -74,12 +72,12 @@ public: } private: - ::rtl::OUStringBuffer & m_aResultBuffer; + OUStringBuffer & m_aResultBuffer; }; // ---------------------------------------- -void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, rtl::OUStringBuffer * output ) +void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStringBuffer * output ) { OSL_ASSERT(output != 0); @@ -113,7 +111,7 @@ void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, rtl:: } void lcl_getSingleCellAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, ::chart::XMLRangeHelper::Cell & rOutCell ) { @@ -121,7 +119,7 @@ void lcl_getSingleCellAddressFromXMLString( static const sal_Unicode aDollar( '$' ); static const sal_Unicode aLetterA( 'A' ); - ::rtl::OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase(); + OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase(); const sal_Unicode* pStrArray = aCellStr.getStr(); sal_Int32 nLength = aCellStr.getLength(); sal_Int32 i = nLength - 1, nColumn = 0; @@ -157,10 +155,10 @@ void lcl_getSingleCellAddressFromXMLString( } bool lcl_getCellAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, ::chart::XMLRangeHelper::Cell & rOutCell, - ::rtl::OUString& rOutTableName ) + OUString& rOutTableName ) { static const sal_Unicode aDot( '.' ); static const sal_Unicode aQuote( '\'' ); @@ -191,7 +189,7 @@ bool lcl_getCellAddressFromXMLString( { // there is a table name before the address - ::rtl::OUStringBuffer aTableNameBuffer; + OUStringBuffer aTableNameBuffer; const sal_Unicode * pTableName = rXMLString.getStr(); // remove escapes from table name @@ -204,7 +202,7 @@ bool lcl_getCellAddressFromXMLString( if( pBuf[ 0 ] == aQuote && pBuf[ aTableNameBuffer.getLength() - 1 ] == aQuote ) { - ::rtl::OUString aName = aTableNameBuffer.makeStringAndClear(); + OUString aName = aTableNameBuffer.makeStringAndClear(); rOutTableName = aName.copy( 1, aName.getLength() - 2 ); } else @@ -232,7 +230,7 @@ bool lcl_getCellAddressFromXMLString( } bool lcl_getCellRangeAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, ::chart::XMLRangeHelper::CellRange & rOutRange ) { @@ -275,7 +273,7 @@ bool lcl_getCellRangeAddressFromXMLString( if( rOutRange.aTableName.isEmpty() ) bResult = false; - ::rtl::OUString sTableSecondName; + OUString sTableSecondName; if( bResult ) { bResult = lcl_getCellAddressFromXMLString( rXMLString, nDelimiterPos + 1, nEndPos, @@ -359,7 +357,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange ) static const sal_Unicode aSpace( ' ' ); static const sal_Unicode aQuote( '\'' ); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if( !(rRange.aTableName).isEmpty()) { diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index 2839c4d51bcf..934a01f85e60 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -99,15 +99,15 @@ uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling() return new InverseDateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } -::rtl::OUString SAL_CALL DateScaling::getServiceName() +OUString SAL_CALL DateScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_DateScaling; } -uno::Sequence< ::rtl::OUString > DateScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > DateScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_DateScaling, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_DateScaling, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static @@ -180,15 +180,15 @@ uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling() return new DateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } -::rtl::OUString SAL_CALL InverseDateScaling::getServiceName() +OUString SAL_CALL InverseDateScaling::getServiceName() throw (uno::RuntimeException) { return lcl_aServiceName_InverseDateScaling; } -uno::Sequence< ::rtl::OUString > InverseDateScaling::getSupportedServiceNames_Static() +uno::Sequence< OUString > InverseDateScaling::getSupportedServiceNames_Static() { - return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_InverseDateScaling, 1 ); + return uno::Sequence< OUString >( & lcl_aServiceName_InverseDateScaling, 1 ); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index 67a92bff985d..1ef6b448ca55 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -58,7 +58,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: @@ -90,7 +90,7 @@ public: getInverseScaling() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index 1fd4e42378e7..ae9a15228601 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -51,7 +51,7 @@ struct TickInfo ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xTextShape; - rtl::OUString aText;//used only for complex categories so far + OUString aText;//used only for complex categories so far sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of complex categories can have more place than a single simple category //methods: diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index c2a12a6bcb7a..48b4f6698004 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -195,7 +195,7 @@ bool VAxisBase::prepareShapeCreation() return true; } -sal_Int32 VAxisBase::getIndexOfLongestLabel( const uno::Sequence< rtl::OUString >& rLabels ) +sal_Int32 VAxisBase::getIndexOfLongestLabel( const uno::Sequence< OUString >& rLabels ) { sal_Int32 nRet = 0; sal_Int32 nLength = 0; diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index fa609241a785..c037ff5cf67b 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -66,7 +66,7 @@ public: //------------------------------------------------------------------------- //------------------------------------------------------------------------- protected: //methods - sal_Int32 getIndexOfLongestLabel( const ::com::sun::star::uno::Sequence< rtl::OUString >& rLabels ); + sal_Int32 getIndexOfLongestLabel( const ::com::sun::star::uno::Sequence< OUString >& rLabels ); void removeTextShapesFromTicks(); void updateUnscaledValuesAtTicks( TickIter& rIter ); @@ -82,7 +82,7 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; AxisProperties m_aAxisProperties; AxisLabelProperties m_aAxisLabelProperties; - ::com::sun::star::uno::Sequence< rtl::OUString > m_aTextLabels; + ::com::sun::star::uno::Sequence< OUString > m_aTextLabels; bool m_bUseTextLabels; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xGroupShape_Shapes; diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index fee4c6b8878c..9d62fac1b35c 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -79,7 +79,7 @@ Reference< drawing::XShape > createSingleLabel( const Reference< lang::XMultiServiceFactory>& xShapeFactory , const Reference< drawing::XShapes >& xTarget , const awt::Point& rAnchorScreenPosition2D - , const rtl::OUString& rLabel + , const OUString& rLabel , const AxisLabelProperties& rAxisLabelProperties , const AxisProperties& rAxisProperties , const tNameSequence& rPropNames @@ -92,7 +92,7 @@ Reference< drawing::XShape > createSingleLabel( // #i78696# use mathematically correct rotation now const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); uno::Any aATransformation = ShapeFactory::makeTransformation( rAnchorScreenPosition2D, fRotationAnglePi ); - rtl::OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters ); + OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters ); Reference< drawing::XShape > xShape2DText = ShapeFactory(xShapeFactory) .createText( xTarget, aLabel, rPropNames, rPropValues, aATransformation ); @@ -447,11 +447,11 @@ bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed( const AxisLabelProperties& struct ComplexCategoryPlacement { - rtl::OUString Text; + OUString Text; sal_Int32 Count; double TickValue; - ComplexCategoryPlacement( const rtl::OUString& rText, sal_Int32 nCount, double fTickValue ) + ComplexCategoryPlacement( const OUString& rText, sal_Int32 nCount, double fTickValue ) : Text(rText), Count(nCount), TickValue(fTickValue) {} }; @@ -629,7 +629,7 @@ bool VCartesianAxis::createTextShapes( } } - uno::Sequence< rtl::OUString >* pCategories = 0; + uno::Sequence< OUString >* pCategories = 0; if( m_bUseTextLabels && !m_aAxisProperties.m_bComplexCategories ) pCategories = &m_aTextLabels; @@ -712,7 +712,7 @@ bool VCartesianAxis::createTextShapes( bool bHasExtraColor=false; sal_Int32 nExtraColor=0; - rtl::OUString aLabel; + OUString aLabel; if(pCategories) { sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->getUnscaledTickValue()) - 1; //first category (index 0) matches with real number 1.0 diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 031d3cc9571f..c79a1a16b3ad 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -43,7 +43,7 @@ class TextualDataProvider : public ::cppu::WeakImplHelper1< > { public: - TextualDataProvider( const uno::Sequence< ::rtl::OUString >& rTextSequence ) + TextualDataProvider( const uno::Sequence< OUString >& rTextSequence ) : m_aTextSequence( rTextSequence ) { } @@ -52,14 +52,14 @@ public: } //XTextualDataSequence - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() + virtual uno::Sequence< OUString > SAL_CALL getTextualData() throw ( uno::RuntimeException) { return m_aTextSequence; } private: //member - uno::Sequence< ::rtl::OUString > m_aTextSequence; + uno::Sequence< OUString > m_aTextSequence; }; //............................................................................. diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 90343690ee59..314d8121e4ef 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -56,7 +56,7 @@ VCoordinateSystem* VCoordinateSystem::createCoordinateSystem( if( !xCooSysModel.is() ) return 0; - rtl::OUString aViewServiceName = xCooSysModel->getViewServiceName(); + OUString aViewServiceName = xCooSysModel->getViewServiceName(); //@todo: in future the coordinatesystems should be instanciated via service factory VCoordinateSystem* pRet=NULL; @@ -125,7 +125,7 @@ void VCoordinateSystem::initPlottingTargets( const Reference< drawing::XShapes m_xShapeFactory = xShapeFactory; } -void VCoordinateSystem::setParticle( const rtl::OUString& rCooSysParticle ) +void VCoordinateSystem::setParticle( const OUString& rCooSysParticle ) { m_aCooSysParticle = rCooSysParticle; } @@ -325,14 +325,14 @@ ExplicitIncrementData VCoordinateSystem::getExplicitIncrement( sal_Int32 nDimens return aRet; } -rtl::OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) +OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) { - rtl::OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) ); + OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) ); return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aCooSysParticle, aAxisParticle ); } -rtl::OUString VCoordinateSystem::createCIDForGrid( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) +OUString VCoordinateSystem::createCIDForGrid( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) { - rtl::OUString aGridParticle( ObjectIdentifier::createParticleForGrid( nDimensionIndex, nAxisIndex ) ); + OUString aGridParticle( ObjectIdentifier::createParticleForGrid( nDimensionIndex, nAxisIndex ) ); return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aCooSysParticle, aGridParticle ); } @@ -574,7 +574,7 @@ bool VCoordinateSystem::needSeriesNamesForAxis() const { return ( m_xCooSysModel.is() && m_xCooSysModel->getDimension() == 3 ); } -void VCoordinateSystem::setSeriesNamesForAxis( const Sequence< rtl::OUString >& rSeriesNames ) +void VCoordinateSystem::setSeriesNamesForAxis( const Sequence< OUString >& rSeriesNames ) { m_aSeriesNamesForZAxis = rSeriesNames; } diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 8d65bc74f392..981a9b6311d7 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -78,7 +78,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( if(pColorAny) *pColorAny >>= nColor; - const uno::Sequence< rtl::OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0; + const uno::Sequence< OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0; //------------------------------------------------ @@ -107,7 +107,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( bool bHasExtraColor=false; sal_Int32 nExtraColor=0; - rtl::OUString aLabel; + OUString aLabel; if(pLabels) { sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->getUnscaledTickValue()) - 1; //first category (index 0) matches with real number 1.0 @@ -133,7 +133,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); uno::Any aATransformation = ShapeFactory::makeTransformation( aAnchorScreenPosition2D, fRotationAnglePi ); - rtl::OUString aStackedLabel = ShapeFactory::getStackedString( aLabel, rAxisLabelProperties.bStackCharacters ); + OUString aStackedLabel = ShapeFactory::getStackedString( aLabel, rAxisLabelProperties.bStackCharacters ); pTickInfo->xTextShape = aShapeFactory.createText( xTarget, aStackedLabel, aPropNames, aPropValues, aATransformation ); } diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index af151e2fede6..67f2dc5715dd 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -73,7 +73,7 @@ void VPolarRadiusAxis::setExplicitScaleAndIncrement( void VPolarRadiusAxis::initPlotter( const uno::Reference< drawing::XShapes >& xLogicTarget , const uno::Reference< drawing::XShapes >& xFinalTarget , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory - , const rtl::OUString& rCID ) + , const OUString& rCID ) throw (uno::RuntimeException) { VPolarAxis::initPlotter( xLogicTarget, xFinalTarget, xShapeFactory, rCID ); diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index cf10f167739c..6114a46f3689 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -49,7 +49,7 @@ public: ::com::sun::star::drawing::XShapes >& xFinalTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID + , const OUString& rCID ) throw (::com::sun::star::uno::RuntimeException ); virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 03f13b17db62..b4b3940a8b73 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -719,13 +719,13 @@ void AreaChart::createShapes() //therefore create an own group for the texts and the error bars to move them to front //(because the text group is created after the series group the texts are displayed on top) - m_xSeriesTarget = createGroupShape( m_xLogicTarget,rtl::OUString() ); + m_xSeriesTarget = createGroupShape( m_xLogicTarget,OUString() ); if( m_bArea ) - m_xErrorBarTarget = createGroupShape( m_xLogicTarget,rtl::OUString() ); + m_xErrorBarTarget = createGroupShape( m_xLogicTarget,OUString() ); else m_xErrorBarTarget = m_xSeriesTarget; - m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ); - m_xRegressionCurveEquationTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ); + m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ); + m_xRegressionCurveEquationTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ); //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? @@ -979,7 +979,7 @@ void AreaChart::createShapes() continue; //create a group shape for this point and add to the series shape: - rtl::OUString aPointCID = ObjectIdentifier::createPointCID( + OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex ); uno::Reference< drawing::XShapes > xPointGroupShape_Shapes( createGroupShape(xSeriesGroupShape_Shapes,aPointCID) ); diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index c78a495506d3..c8942b6049bb 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -419,16 +419,16 @@ void BarChart::createShapes() //to achieve this the regression curve target is created after the series target and before the text target uno::Reference< drawing::XShapes > xSeriesTarget( - createGroupShape( m_xLogicTarget,rtl::OUString() )); + createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xRegressionCurveTarget( - createGroupShape( m_xLogicTarget,rtl::OUString() )); + createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xTextTarget( - m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() )); + m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //--------------------------------------------- uno::Reference< drawing::XShapes > xRegressionCurveEquationTarget( - m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() )); + m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //check necessary here that different Y axis can not be stacked in the same group? ... hm? double fLogicZ = 1.0;//as defined diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index 0352621b3ca4..c06ebd5e7bcf 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -207,9 +207,9 @@ void BubbleChart::createShapes() //therefore create an own group for the texts and the error bars to move them to front //(because the text group is created after the series group the texts are displayed on top) uno::Reference< drawing::XShapes > xSeriesTarget( - createGroupShape( m_xLogicTarget,rtl::OUString() )); + createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xTextTarget( - m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() )); + m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //update/create information for current group double fLogicZ = 1.0;//as defined @@ -311,7 +311,7 @@ void BubbleChart::createShapes() continue; //create a group shape for this point and add to the series shape: - rtl::OUString aPointCID = ObjectIdentifier::createPointCID( + OUString aPointCID = ObjectIdentifier::createPointCID( pSeries->getPointCID_Stub(), nIndex ); uno::Reference< drawing::XShapes > xPointGroupShape_Shapes( createGroupShape(xSeriesGroupShape_Shapes,aPointCID) ); diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 98ad906708e9..1860b39c1874 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace ::rtl::math; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -106,15 +105,15 @@ void CandleStickChart::createShapes() //(because the text group is created after the series group the texts are displayed on top) uno::Reference< drawing::XShapes > xSeriesTarget( - createGroupShape( m_xLogicTarget,rtl::OUString() )); + createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xLossTarget( createGroupShape( m_xLogicTarget, ObjectIdentifier::createClassifiedIdentifier( - OBJECTTYPE_DATA_STOCK_LOSS, rtl::OUString() ))); + OBJECTTYPE_DATA_STOCK_LOSS, OUString() ))); uno::Reference< drawing::XShapes > xGainTarget( createGroupShape( m_xLogicTarget, ObjectIdentifier::createClassifiedIdentifier( - OBJECTTYPE_DATA_STOCK_GAIN, rtl::OUString() ))); + OBJECTTYPE_DATA_STOCK_GAIN, OUString() ))); uno::Reference< drawing::XShapes > xTextTarget( - m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() )); + m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? @@ -242,7 +241,7 @@ void CandleStickChart::createShapes() uno::Reference< beans::XPropertySet > xPointProp( (*aSeriesIter)->getPropertiesOfPoint( nIndex )); uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(0); { - rtl::OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex ); + OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex ); uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes( getSeriesGroupShape(*aSeriesIter, xSeriesTarget) ); xPointGroupShape_Shapes = createGroupShape(xSeriesGroupShape_Shapes,aPointCID); } diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 80ec134a94d3..06be798a46e1 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -324,9 +324,9 @@ void PieChart::createShapes() //therefore create an own group for the texts to move them to front //(because the text group is created after the series group the texts are displayed on top) uno::Reference< drawing::XShapes > xSeriesTarget( - createGroupShape( m_xLogicTarget,rtl::OUString() )); + createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xTextTarget( - m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() )); + m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? @@ -531,7 +531,7 @@ void PieChart::createShapes() aNewOrigin, m_xLogicTarget, m_pShapeFactory, m_nDimension ) ); //enable draging of piesegments - rtl::OUString aPointCIDStub( ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT + OUString aPointCIDStub( ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT , pSeries->getSeriesParticle() , ObjectIdentifier::getPieSegmentDragMethodServiceName() , ObjectIdentifier::createPieSegmentDragParameterString( diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 884df9a6dcd5..a49fed9edddb 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -79,7 +79,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using rtl::OUString; //----------------------------------------------------------------------------- @@ -477,8 +476,8 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re } //prepare text - ::rtl::OUStringBuffer aText; - ::rtl::OUString aSeparator(sal_Unicode(' ')); + OUStringBuffer aText; + OUString aSeparator(sal_Unicode(' ')); double fRotationDegrees = 0.0; try { @@ -1088,7 +1087,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( if( ! (bShowEquation || bShowCorrCoeff)) return; - ::rtl::OUStringBuffer aFormula; + OUStringBuffer aFormula; sal_Int32 nNumberFormatKey = 0; xEquationProperties->getPropertyValue( "NumberFormat") >>= nNumberFormatKey; @@ -1895,11 +1894,11 @@ VDataSeries* VSeriesPlotter::getFirstSeries() const return 0; } -uno::Sequence< rtl::OUString > VSeriesPlotter::getSeriesNames() const +uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const { - ::std::vector< rtl::OUString > aRetVector; + ::std::vector< OUString > aRetVector; - rtl::OUString aRole; + OUString aRole; if( m_xChartTypeModel.is() ) aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel(); @@ -1919,7 +1918,7 @@ uno::Sequence< rtl::OUString > VSeriesPlotter::getSeriesNames() const uno::Reference< XDataSeries > xSeries( pSeries ? pSeries->getModel() : 0 ); if( xSeries.is() ) { - rtl::OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) ); + OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) ); aRetVector.push_back( aSeriesName ); } } @@ -2385,7 +2384,7 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter( , sal_Int32 nDimensionCount , bool bExcludingPositioning ) { - rtl::OUString aChartType = xChartTypeModel->getChartType(); + OUString aChartType = xChartTypeModel->getChartType(); //@todo: in future the plotter should be instanciated via service factory VSeriesPlotter* pRet=NULL; diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 4c26350b802f..5b018c5235c8 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -206,7 +206,7 @@ void VDiagram::createShapes_2d() else { //CID for selection handling - rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model + OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME, uno::makeAny( aWallCID ) ); } } @@ -499,7 +499,7 @@ void VDiagram::createShapes_3d() //------------------------------------------------------------------------- //create additional group to manipulate the aspect ratio of the whole diagram: - xOuterGroup_Shapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, rtl::OUString() ); + xOuterGroup_Shapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, OUString() ); m_xAspectRatio3D = uno::Reference< beans::XPropertySet >( xOuterGroup_Shapes, uno::UNO_QUERY ); @@ -516,9 +516,9 @@ void VDiagram::createShapes_3d() if( m_xDiagram.is() ) xWallProp=uno::Reference< beans::XPropertySet >( m_xDiagram->getWall()); - rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model + OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model if( !bAddFloorAndWall ) - aWallCID = rtl::OUString(); + aWallCID = OUString(); uno::Reference< drawing::XShapes > xWallGroup_Shapes( m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, aWallCID ) ); CuboidPlanePosition eLeftWallPos( ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeftWall( uno::Reference< beans::XPropertySet >( m_xDiagram, uno::UNO_QUERY ) ) ); @@ -657,7 +657,7 @@ void VDiagram::createShapes_3d() } else { - rtl::OUString aFloorCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, rtl::OUString() ) );//@todo read CID from model + OUString aFloorCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) );//@todo read CID from model ShapeFactory::setShapeName( xShape, aFloorCID ); } } diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index 25d0989420da..cb04561deac1 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -53,7 +53,7 @@ public: ::com::sun::star::drawing::XShapes >& xFinalTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID + , const OUString& rCID ) throw (::com::sun::star::uno::RuntimeException ); virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); @@ -72,7 +72,7 @@ protected: //methods ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > createGroupShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , ::rtl::OUString rName=::rtl::OUString() ); + , OUString rName=OUString() ); protected: //member ::com::sun::star::uno::Reference< @@ -82,7 +82,7 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ShapeFactory* m_pShapeFactory; - rtl::OUString m_aCID; + OUString m_aCID; sal_Int32 m_nDimension; // needs to be created and deleted by the derived class diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index 60982bc98004..04159ed9b588 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -32,14 +32,14 @@ namespace chart /** */ -typedef ::std::map< ::rtl::OUString, ::rtl::OUString > tPropertyNameMap; -typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakePropertyNameMap; +typedef ::std::map< OUString, OUString > tPropertyNameMap; +typedef ::comphelper::MakeMap< OUString, OUString > tMakePropertyNameMap; -typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > tPropertyNameValueMap; -typedef ::comphelper::MakeMap< ::rtl::OUString, ::com::sun::star::uno::Any > tMakePropertyNameValueMap; +typedef ::std::map< OUString, ::com::sun::star::uno::Any > tPropertyNameValueMap; +typedef ::comphelper::MakeMap< OUString, ::com::sun::star::uno::Any > tMakePropertyNameValueMap; -typedef ::com::sun::star::uno::Sequence< rtl::OUString > tNameSequence; -typedef ::comphelper::MakeSequence< rtl::OUString > tMakeNameSequence; +typedef ::com::sun::star::uno::Sequence< OUString > tNameSequence; +typedef ::comphelper::MakeSequence< OUString > tMakeNameSequence; typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > tAnySequence; typedef ::comphelper::MakeSequence< ::com::sun::star::uno::Any > tMakeAnySequence; @@ -78,7 +78,7 @@ public: static ::com::sun::star::uno::Any* getValuePointer( tAnySequence& rPropValues , const tNameSequence& rPropNames - , const rtl::OUString& rPropName ); + , const OUString& rPropName ); static ::com::sun::star::uno::Any* getValuePointerForLimitedSpace( tAnySequence& rPropValues diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 7401edd09b2c..83ee1a89ca45 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -49,14 +49,14 @@ public: createGroup2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , ::rtl::OUString aName = ::rtl::OUString() ); + , OUString aName = OUString() ); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > createGroup3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , ::rtl::OUString aName = ::rtl::OUString() ); + , OUString aName = OUString() ); //------ @@ -163,7 +163,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D - , const ::rtl::OUString& rText + , const OUString& rText , const tNameSequence& rPropNames , const tAnySequence& rPropValues , const ::com::sun::star::uno::Any& rATransformation @@ -189,14 +189,14 @@ public: static void setShapeName( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape - , const rtl::OUString& rName ); + , const OUString& rName ); - static rtl::OUString getShapeName( const ::com::sun::star::uno::Reference< + static OUString getShapeName( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); static ::com::sun::star::uno::Any makeTransformation( const ::com::sun::star::awt::Point& rScreenPosition2D, double fRotationAnglePi=0.0 ); - static rtl::OUString getStackedString( const rtl::OUString& rString, bool bStacked=true ); + static OUString getStackedString( const OUString& rString, bool bStacked=true ); static bool hasPolygonAnyLines( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly ); static bool isPolygonEmptyOrSinglePoint( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly ); diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index b6c199d66947..6c33b3719015 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -66,7 +66,7 @@ public: ::com::sun::star::drawing::XShapes >& xLogicTargetForSeriesBehindAxis ) throw (::com::sun::star::uno::RuntimeException); - void setParticle( const rtl::OUString& rCooSysParticle ); + void setParticle( const OUString& rCooSysParticle ); virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen(); @@ -122,7 +122,7 @@ public: sal_Int32 getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) const; virtual bool needSeriesNamesForAxis() const; - void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< rtl::OUString >& rSeriesNames ); + void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< OUString >& rSeriesNames ); protected: //methods VCoordinateSystem( const ::com::sun::star::uno::Reference< @@ -135,10 +135,10 @@ protected: //methods VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - rtl::OUString createCIDForAxis( const ::com::sun::star::uno::Reference< + OUString createCIDForAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); - rtl::OUString createCIDForGrid( const ::com::sun::star::uno::Reference< + OUString createCIDForGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); @@ -155,7 +155,7 @@ protected: //member ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > m_xCooSysModel; - rtl::OUString m_aCooSysParticle; + OUString m_aCooSysParticle; typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis @@ -177,7 +177,7 @@ protected: //member // MergedMinimumAndMaximumSupplier m_aMergedMinimumAndMaximumSupplier; //this is used only for autoscaling purpose - ::com::sun::star::uno::Sequence< rtl::OUString > m_aSeriesNamesForZAxis; + ::com::sun::star::uno::Sequence< OUString > m_aSeriesNamesForZAxis; typedef std::map< tFullAxisIndex, ::boost::shared_ptr< VAxisBase > > tVAxisMap; diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 56aff51b4371..38c7929bc3e7 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -73,7 +73,7 @@ public: ::com::sun::star::chart2::data::XDataSequence >& xValues ); void setXValuesIfNone( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValues ); - void setParticle( const rtl::OUString& rSeriesParticle ); + void setParticle( const OUString& rSeriesParticle ); void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex ); void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); @@ -137,7 +137,7 @@ public: void setStartingAngle( sal_Int32 nStartingAngle ); sal_Int32 getStartingAngle() const; - void setRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::OUString& rRole ); + void setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole ); //this is only temporarily here for area chart: ::com::sun::star::drawing::PolyPolygonShape3D m_aPolyPolygonShape3D; @@ -148,19 +148,19 @@ public: //this is here for deep stacking: double m_fLogicZPos;//from 0 to series count -1 - rtl::OUString getCID() const; - rtl::OUString getSeriesParticle() const; - rtl::OUString getPointCID_Stub() const; - rtl::OUString getErrorBarsCID( bool bYError ) const; - rtl::OUString getLabelsCID() const; - rtl::OUString getLabelCID_Stub() const; - rtl::OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const; + OUString getCID() const; + OUString getSeriesParticle() const; + OUString getPointCID_Stub() const; + OUString getErrorBarsCID( bool bYError ) const; + OUString getLabelsCID() const; + OUString getLabelCID_Stub() const; + OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const; ::com::sun::star::chart2::DataPointLabel* getDataPointLabelIfLabel( sal_Int32 index ) const; bool getTextLabelMultiPropertyLists( sal_Int32 index, tNameSequence*& pPropNames, tAnySequence*& pPropValues ) const; - rtl::OUString getDataCurveEquationCID( sal_Int32 nCurveIndex ) const; + OUString getDataCurveEquationCID( sal_Int32 nCurveIndex ) const; bool isAttributedDataPoint( sal_Int32 index ) const; bool isVaryColorsByPoint() const; @@ -224,10 +224,10 @@ private: //member sal_Int32 m_nStartingAngle; - rtl::OUString m_aSeriesParticle; - rtl::OUString m_aCID; - rtl::OUString m_aPointCID_Stub; - rtl::OUString m_aLabelCID_Stub; + OUString m_aSeriesParticle; + OUString m_aCID; + OUString m_aPointCID_Stub; + OUString m_aLabelCID_Stub; sal_Int32 m_nGlobalSeriesIndex; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index c3bba76ad5aa..ce6596aa0f63 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -251,7 +251,7 @@ public: void setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider ); //get series names for the z axis labels - ::com::sun::star::uno::Sequence< rtl::OUString > getSeriesNames() const; + ::com::sun::star::uno::Sequence< OUString > getSeriesNames() const; void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize ); //better performance for big data @@ -317,7 +317,7 @@ protected: , LabelAlignment eAlignment=LABEL_ALIGN_CENTER , sal_Int32 nOffset=0 ); - ::rtl::OUString getLabelTextForValue( VDataSeries& rDataSeries + OUString getLabelTextForValue( VDataSeries& rDataSeries , sal_Int32 nPointIndex , double fValue , bool bAsPercentage ); @@ -370,7 +370,7 @@ protected: ::com::sun::star::drawing::XShapes >& xEquationTarget , bool bMaySkipPointsInRegressionCalculation ); - virtual void createRegressionCurveEquationShapes( const ::rtl::OUString & rEquationCID + virtual void createRegressionCurveEquationShapes( const OUString & rEquationCID , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xEquationProperties , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 0a55a7ff2c82..620558b06357 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -116,7 +116,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using rtl::OUString; namespace { @@ -366,10 +365,10 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla APPHELPER_XSERVICEINFO_IMPL(ChartView,CHART_VIEW_SERVICE_IMPLEMENTATION_NAME) - uno::Sequence< rtl::OUString > ChartView + uno::Sequence< OUString > ChartView ::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_VIEW_SERVICE_NAME; return aSNS; } @@ -410,7 +409,7 @@ VCoordinateSystem* addCooSysToList( std::vector< VCoordinateSystem* >& rVCooSysL pVCooSys = VCoordinateSystem::createCoordinateSystem(xCooSys ); if(pVCooSys) { - rtl::OUString aCooSysParticle( ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel ) ); + OUString aCooSysParticle( ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel ) ); pVCooSys->setParticle(aCooSysParticle); pVCooSys->setExplicitCategoriesProvider( new ExplicitCategoriesProvider(xCooSys,xChartModel) ); @@ -726,7 +725,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( pSeries->setMissingValueTreatment( nMissingValueTreatment ); - rtl::OUString aSeriesParticle( ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCS, nT, nS ) ); + OUString aSeriesParticle( ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCS, nT, nS ) ); pSeries->setParticle(aSeriesParticle); OUString aRole( ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( xChartType ) ); @@ -769,7 +768,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( //transport seriesnames to the coordinatesystems if needed if( !m_aSeriesPlotterList.empty() ) { - uno::Sequence< rtl::OUString > aSeriesNames; + uno::Sequence< OUString > aSeriesNames; bool bSeriesNamesInitialized = false; for( size_t nC=0; nC < m_rVCooSysList.size(); nC++) { @@ -1224,7 +1223,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod uno::Reference< container::XNameAccess > xPageStyles( xStylesFamilies->getByName( "PageStyles" ), uno::UNO_QUERY ); if( xPageStyles.is() ) { - rtl::OUString aPageStyle; + OUString aPageStyle; uno::Reference< text::XTextDocument > xTextDocument( xParentProps, uno::UNO_QUERY ); if( xTextDocument.is() ) @@ -1238,7 +1237,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod uno::Reference< container::XNameAccess > xEmbeddedObjects( xTextEmbeddedObjectsSupplier->getEmbeddedObjects() ); if( xEmbeddedObjects.is() ) { - uno::Sequence< rtl::OUString > aNames( xEmbeddedObjects->getElementNames() ); + uno::Sequence< OUString > aNames( xEmbeddedObjects->getElementNames() ); sal_Int32 nCount = aNames.getLength(); for( sal_Int32 nN=0; nN pDrawMod uno::Reference< beans::XPropertySet > xEmbeddedProps( xEmbeddedObjects->getByName( aNames[nN] ), uno::UNO_QUERY ); if( xEmbeddedProps.is() ) { - static rtl::OUString aChartCLSID = rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()); - rtl::OUString aCLSID; + static OUString aChartCLSID = OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()); + OUString aCLSID; xEmbeddedProps->getPropertyValue( "CLSID" ) >>= aCLSID; if( aCLSID.equals(aChartCLSID) ) { @@ -1500,7 +1499,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& { //------------ set transformation to plotter / create series VSeriesPlotter* pSeriesPlotter = *aPlotterIter; - rtl::OUString aCID; //III + OUString aCID; //III uno::Reference< drawing::XShapes > xSeriesTarget(0); if( pSeriesPlotter->WantToPlotInFrontOfAxisLine() ) xSeriesTarget = xSeriesTargetInFrontOfAxis; @@ -1701,7 +1700,7 @@ SdrPage* ChartView::getSdrPage() return pPage; } -uno::Reference< drawing::XShape > ChartView::getShapeForCID( const rtl::OUString& rObjectCID ) +uno::Reference< drawing::XShape > ChartView::getShapeForCID( const OUString& rObjectCID ) { SolarMutexGuard aSolarGuard; SdrObject* pObj = DrawModelWrapper::getNamedSdrObject( rObjectCID, this->getSdrPage() ); @@ -1716,7 +1715,7 @@ awt::Rectangle ChartView::getDiagramRectangleExcludingAxes() return m_aResultingDiagramRectangleExcludingAxes; } -awt::Rectangle ChartView::getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect ) +awt::Rectangle ChartView::getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect ) { impl_updateView(); @@ -1828,7 +1827,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( if( !xSeriesOrPointProp.is() ) return nFormat; - rtl::OUString aPropName( "NumberFormat" ); + OUString aPropName( "NumberFormat" ); if( !(xSeriesOrPointProp->getPropertyValue(aPropName) >>= nFormat) ) { uno::Reference< chart2::XChartType > xChartType( DataSeriesHelper::getChartTypeOfSeries( xSeries, xDiagram ) ); @@ -1907,28 +1906,28 @@ awt::Rectangle ExplicitValueProvider::addAxisTitleSizes( if( xTitle_Height.is() ) { - rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) ); + OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) ); nTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height; if( nTitleSpaceHeight ) nTitleSpaceHeight+=lcl_getDiagramTitleSpace(); } if( xTitle_Width.is() ) { - rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) ); + OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) ); nTitleSpaceWidth = pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width; if(nTitleSpaceWidth) nTitleSpaceWidth+=lcl_getDiagramTitleSpace(); } if( xSecondTitle_Height.is() ) { - rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) ); + OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) ); nSecondTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height; if( nSecondTitleSpaceHeight ) nSecondTitleSpaceHeight+=lcl_getDiagramTitleSpace(); } if( xSecondTitle_Width.is() ) { - rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) ); + OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) ); nSecondTitleSpaceWidth += pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width; if( nSecondTitleSpaceWidth ) nSecondTitleSpaceWidth+=lcl_getDiagramTitleSpace(); @@ -1974,28 +1973,28 @@ awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes( if( xTitle_Height.is() ) { - rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) ); + OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) ); nTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height; if( nTitleSpaceHeight ) nTitleSpaceHeight+=lcl_getDiagramTitleSpace(); } if( xTitle_Width.is() ) { - rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) ); + OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) ); nTitleSpaceWidth = pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width; if(nTitleSpaceWidth) nTitleSpaceWidth+=lcl_getDiagramTitleSpace(); } if( xSecondTitle_Height.is() ) { - rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) ); + OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) ); nSecondTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height; if( nSecondTitleSpaceHeight ) nSecondTitleSpaceHeight+=lcl_getDiagramTitleSpace(); } if( xSecondTitle_Width.is() ) { - rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) ); + OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) ); nSecondTitleSpaceWidth += pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width; if( nSecondTitleSpaceWidth ) nSecondTitleSpaceWidth+=lcl_getDiagramTitleSpace(); @@ -2169,12 +2168,12 @@ boost::shared_ptr lcl_createTitle( TitleHelper::eTitleType eType } uno::Reference< XTitle > xTitle( TitleHelper::getTitle( eType, xChartModel ) ); - rtl::OUString aCompleteString( TitleHelper::getCompleteString( xTitle ) ); + OUString aCompleteString( TitleHelper::getCompleteString( xTitle ) ); if( !aCompleteString.isEmpty() ) { //create title apVTitle.reset(new VTitle(xTitle)); - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ) ); + OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ) ); apVTitle->init(xPageShapes,xShapeFactory,aCID); apVTitle->createShapes( awt::Point(0,0), rPageSize ); awt::Size aTitleUnrotatedSize = apVTitle->getUnrotatedSize(); @@ -2349,8 +2348,8 @@ void formatPage( tPropertyNameValueMap aNameValueMap; PropertyMapper::getValueMap( aNameValueMap, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xModelPage ); - rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) ); - aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID rtl::OUString + OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ); + aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID OUString tNameSequence aNames; tAnySequence aValues; @@ -2473,7 +2472,7 @@ void ChartView::createShapes() //create the group shape for diagram and axes first to have title and legends on top of it uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) ); - rtl::OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible + OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible uno::Reference< drawing::XShapes > xDiagramPlusAxesPlusMarkHandlesGroup_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xPageShapes,aDiagramCID) ); uno::Reference< drawing::XShape > xDiagram_MarkHandles( ShapeFactory(m_xShapeFactory).createInvisibleRectangle( @@ -2713,7 +2712,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) uno::Reference< view::XSelectionSupplier > xSelectionSupplier( m_xChartModel->getCurrentController(), uno::UNO_QUERY ); if ( xSelectionSupplier.is() ) { - ::rtl::OUString aSelObjCID; + OUString aSelObjCID; uno::Any aSelObj( xSelectionSupplier->getSelection() ); aSelObj >>= aSelObjCID; if ( !aSelObjCID.isEmpty() ) @@ -2764,7 +2763,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) xModifiable->setModified( sal_True ); } -void ChartView::impl_notifyModeChangeListener( const rtl::OUString& rNewMode ) +void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode ) { try { @@ -2835,7 +2834,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo() return 0; } -void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName +void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName , const Any& rValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException , lang::WrappedTargetException, uno::RuntimeException) @@ -2890,7 +2889,7 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard", 0 ); } -Any SAL_CALL ChartView::getPropertyValue( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; @@ -2904,25 +2903,25 @@ Any SAL_CALL ChartView::getPropertyValue( const ::rtl::OUString& rPropertyName ) } void SAL_CALL ChartView::addPropertyChangeListener( - const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ ) + const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } void SAL_CALL ChartView::removePropertyChangeListener( - const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ ) + const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL ChartView::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) +void SAL_CALL ChartView::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); } -void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) +void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL("not implemented"); @@ -2930,7 +2929,7 @@ void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /* // ____ XMultiServiceFactory ____ -Reference< uno::XInterface > ChartView::createInstance( const ::rtl::OUString& aServiceSpecifier ) +Reference< uno::XInterface > ChartView::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException) { SdrModel* pModel = ( m_pDrawModelWrapper ? &m_pDrawModelWrapper->getSdrModel() : NULL ); @@ -2989,7 +2988,7 @@ Reference< uno::XInterface > ChartView::createInstance( const ::rtl::OUString& a return 0; } -Reference< uno::XInterface > ChartView::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) +Reference< uno::XInterface > ChartView::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException) { OSL_ENSURE( Arguments.getLength(), "ChartView::createInstanceWithArguments: arguments are ignored" ); @@ -2997,9 +2996,9 @@ Reference< uno::XInterface > ChartView::createInstanceWithArguments( const ::rtl return createInstance( ServiceSpecifier ); } -uno::Sequence< ::rtl::OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aServiceNames( 6 ); + uno::Sequence< OUString > aServiceNames( 6 ); aServiceNames[0] = "com.sun.star.drawing.DashTable"; aServiceNames[1] = "com.sun.star.drawing.GradientTable"; @@ -3011,14 +3010,14 @@ uno::Sequence< ::rtl::OUString > ChartView::getAvailableServiceNames() throw (un return aServiceNames; } -rtl::OUString ChartView::dump() throw (uno::RuntimeException) +OUString ChartView::dump() throw (uno::RuntimeException) { impl_updateView(); uno::Reference xPageShapes( ShapeFactory(m_xShapeFactory) .getOrCreateChartRootShape( m_xDrawPage ) ); if (!xPageShapes.is()) - return rtl::OUString(); + return OUString(); else { XShapeDumper dumper; diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx index 5b58d5d3c746..a6e9e916807c 100644 --- a/chart2/source/view/main/ChartView.hxx +++ b/chart2/source/view/main/ChartView.hxx @@ -94,9 +94,9 @@ public: , ExplicitScaleData& rExplicitScale , ExplicitIncrementData& rExplicitIncrement ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > - getShapeForCID( const rtl::OUString& rObjectCID ); + getShapeForCID( const OUString& rObjectCID ); - virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect=false ); + virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false ); virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes(); @@ -147,22 +147,22 @@ public: // ::com::sun::star::beans::XPropertySet //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //----------------------------------------------------------------- // ::com::sun::star::lang::XMultiServiceFactory //----------------------------------------------------------------- - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( - const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) + const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // for ExplicitValueProvider // ____ XUnoTunnel ___ @@ -170,7 +170,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // XDumper - virtual rtl::OUString SAL_CALL dump() + virtual OUString SAL_CALL dump() throw(::com::sun::star::uno::RuntimeException); private: //methods @@ -183,7 +183,7 @@ private: //methods void impl_setChartModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); void impl_deleteCoordinateSystems(); - void impl_notifyModeChangeListener( const rtl::OUString& rNewMode ); + void impl_notifyModeChangeListener( const OUString& rNewMode ); void impl_refreshAddIn(); bool impl_AddInDrawsAllByItself(); diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index ff2a6c8e56ea..2a2bc1838db1 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -353,7 +353,7 @@ XBitmapListRef DrawModelWrapper::GetBitmapList() const return this->SdrModel::GetBitmapList(); } -SdrObject* DrawModelWrapper::getNamedSdrObject( const rtl::OUString& rName ) +SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName ) { if( rName.isEmpty() ) return 0; diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index 709f22fd4b76..0067632842b8 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -48,7 +48,7 @@ PlotterBase::PlotterBase( sal_Int32 nDimensionCount ) void PlotterBase::initPlotter( const uno::Reference< drawing::XShapes >& xLogicTarget , const uno::Reference< drawing::XShapes >& xFinalTarget , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory - , const rtl::OUString& rCID ) + , const OUString& rCID ) throw (uno::RuntimeException) { OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters"); @@ -82,7 +82,7 @@ void PlotterBase::setTransformationSceneToScreen( const drawing::HomogenMatrix& uno::Reference< drawing::XShapes > PlotterBase::createGroupShape( const uno::Reference< drawing::XShapes >& xTarget - , ::rtl::OUString rName ) + , OUString rName ) { if(!m_xShapeFactory.is()) return NULL; diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 08bc546fe16d..811a7de04a2d 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -84,8 +84,8 @@ void PropertyMapper::getValueMap( for( ; aIt != aEnd; ++aIt ) { - rtl::OUString aTarget = aIt->first; - rtl::OUString aSource = aIt->second; + OUString aTarget = aIt->first; + OUString aSource = aIt->second; try { uno::Any aAny( xSourceProp->getPropertyValue(aSource) ); @@ -143,7 +143,7 @@ void PropertyMapper::getMultiPropertyListsFromValueMap( uno::Any* PropertyMapper::getValuePointer( tAnySequence& rPropValues , const tNameSequence& rPropNames - , const rtl::OUString& rPropName ) + , const OUString& rPropName ) { sal_Int32 nCount = rPropNames.getLength(); for( sal_Int32 nN = 0; nN < nCount; nN++ ) @@ -373,7 +373,7 @@ void PropertyMapper::setMultiProperties( try { sal_Int32 nCount = std::max( rNames.getLength(), rValues.getLength() ); - rtl::OUString aPropName; + OUString aPropName; uno::Any aValue; for( sal_Int32 nN = 0; nN < nCount; nN++ ) { @@ -416,7 +416,7 @@ void PropertyMapper::getTextLabelMultiPropertyLists( aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool if( bName ) - aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( rtl::OUString() ) ) ); //CID rtl::OUString - needs to be overwritten for each point + aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( OUString() ) ) ); //CID OUString - needs to be overwritten for each point if( nLimitedSpace > 0 ) { diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index e83445fe8e58..5ce6f7290597 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -67,7 +67,7 @@ namespace chart //----------------------------------------------------------------------------- void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape - , const rtl::OUString& rName ) + , const OUString& rName ) { if(!xShape.is()) return; @@ -89,9 +89,9 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape //----------------------------------------------------------------------------- -rtl::OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape ) +OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape ) { - rtl::OUString aRet; + OUString aRet; uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY ); OSL_ENSURE(xProp.is(), "shape offers no XPropertySet"); @@ -540,7 +540,7 @@ uno::Reference if( !xTarget.is() ) return 0; - Reference< drawing::XShapes > xGroup( ShapeFactory::createGroup3D( xTarget, rtl::OUString() ) ); + Reference< drawing::XShapes > xGroup( ShapeFactory::createGroup3D( xTarget, OUString() ) ); sal_Bool bDoubleSided = false; short nRotatedTexture = 0; @@ -1872,7 +1872,7 @@ uno::Reference< drawing::XShape > uno::Reference< drawing::XShapes > ShapeFactory::createGroup2D( const uno::Reference< drawing::XShapes >& xTarget - , ::rtl::OUString aName ) + , OUString aName ) { if( !xTarget.is() ) return 0; @@ -1907,7 +1907,7 @@ uno::Reference< drawing::XShapes > uno::Reference< drawing::XShapes > ShapeFactory::createGroup3D( const uno::Reference< drawing::XShapes >& xTarget - , ::rtl::OUString aName ) + , OUString aName ) { if( !xTarget.is() ) return 0; @@ -2188,7 +2188,7 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle( uno::Reference< drawing::XShape > ShapeFactory::createText( const uno::Reference< drawing::XShapes >& xTarget - , const ::rtl::OUString& rText + , const OUString& rText , const tNameSequence& rPropNames , const tAnySequence& rPropValues , const uno::Any& rATransformation ) @@ -2230,13 +2230,13 @@ uno::Reference< drawing::XShape > return xShape; } -rtl::OUString ShapeFactory::getStackedString( const rtl::OUString& rString, bool bStacked ) +OUString ShapeFactory::getStackedString( const OUString& rString, bool bStacked ) { sal_Int32 nLen = rString.getLength(); if(!bStacked || !nLen) return rString; - rtl::OUStringBuffer aStackStr; + OUStringBuffer aStackStr; //add a newline after each letter //as we do not no letters here add a newline after each char diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index a5059dcec222..ac6da72da1d2 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -118,7 +118,7 @@ void lcl_clearIfNoValuesButTextIsContained( VDataSequence& rData, const uno::Ref } //no double value is countained //is there any text? - uno::Sequence< rtl::OUString > aStrings( DataSequenceToStringSequence( xDataSequence ) ); + uno::Sequence< OUString > aStrings( DataSequenceToStringSequence( xDataSequence ) ); sal_Int32 nTextCount = aStrings.getLength(); for( sal_Int32 j = 0; j < nTextCount; ++j ) { @@ -216,7 +216,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) try { uno::Any aARole = xProp->getPropertyValue("Role"); - rtl::OUString aRole; + OUString aRole; aARole >>= aRole; if (aRole == "values-x") @@ -363,7 +363,7 @@ void VDataSeries::setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex ) m_nGlobalSeriesIndex = nGlobalSeriesIndex; } -void VDataSeries::setParticle( const rtl::OUString& rSeriesParticle ) +void VDataSeries::setParticle( const OUString& rSeriesParticle ) { m_aSeriesParticle = rSeriesParticle; @@ -372,51 +372,51 @@ void VDataSeries::setParticle( const rtl::OUString& rSeriesParticle ) m_aPointCID_Stub = ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT, m_aSeriesParticle ); m_aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent( - OBJECTTYPE_DATA_LABEL, ::rtl::OUString(), getLabelsCID() ); + OBJECTTYPE_DATA_LABEL, OUString(), getLabelsCID() ); } -rtl::OUString VDataSeries::getSeriesParticle() const +OUString VDataSeries::getSeriesParticle() const { return m_aSeriesParticle; } -rtl::OUString VDataSeries::getCID() const +OUString VDataSeries::getCID() const { return m_aCID; } -rtl::OUString VDataSeries::getPointCID_Stub() const +OUString VDataSeries::getPointCID_Stub() const { return m_aPointCID_Stub; } -rtl::OUString VDataSeries::getErrorBarsCID(bool bYError) const +OUString VDataSeries::getErrorBarsCID(bool bYError) const { - rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( + OUString aChildParticle( ObjectIdentifier::getStringForType( bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X ) ); aChildParticle += "="; return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aSeriesParticle, aChildParticle ); } -rtl::OUString VDataSeries::getLabelsCID() const +OUString VDataSeries::getLabelsCID() const { - rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); aChildParticle += "="; return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aSeriesParticle, aChildParticle ); } -rtl::OUString VDataSeries::getLabelCID_Stub() const +OUString VDataSeries::getLabelCID_Stub() const { return m_aLabelCID_Stub; } -rtl::OUString VDataSeries::getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const +OUString VDataSeries::getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const { - rtl::OUString aRet; + OUString aRet; aRet = ObjectIdentifier::createDataCurveCID( m_aSeriesParticle, nCurveIndex, bAverageLine ); return aRet; } -rtl::OUString VDataSeries::getDataCurveEquationCID( sal_Int32 nCurveIndex ) const +OUString VDataSeries::getDataCurveEquationCID( sal_Int32 nCurveIndex ) const { - rtl::OUString aRet; + OUString aRet; aRet = ObjectIdentifier::createDataCurveEquationCID( m_aSeriesParticle, nCurveIndex ); return aRet; } @@ -555,7 +555,7 @@ sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bFor xPointProp->getPropertyValue(aPropName) >>= nNumberFormat; return nNumberFormat; } -void VDataSeries::setRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::OUString& rRole ) +void VDataSeries::setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole ) { if (rRole == "values-y") m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_Y; diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 764274883e74..4b7d699d9ab0 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; //............................................................................. namespace chart @@ -300,7 +298,7 @@ awt::Size lcl_placeLegendEntries( const sal_Int32 nSymbolToTextDistance = static_cast< sal_Int32 >( std::max( 100.0, fViewFontSize * 0.22 ) );//minimum 1mm const sal_Int32 nSymbolPlusDistanceWidth = rMaxSymbolExtent.Width + nSymbolToTextDistance; sal_Int32 nMaxTextWidth = rAvailableSpace.Width - (2 * nXPadding) - nSymbolPlusDistanceWidth; - rtl::OUString aPropNameTextMaximumFrameWidth( "TextMaximumFrameWidth" ); + OUString aPropNameTextMaximumFrameWidth( "TextMaximumFrameWidth" ); uno::Any* pFrameWidthAny = PropertyMapper::getValuePointer( rTextProperties.second, rTextProperties.first, aPropNameTextMaximumFrameWidth); if(pFrameWidthAny) { diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index a22cd9cffeb2..b3b1a1580cd0 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; namespace { diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 9fcd762d6fff..0fb341b1ef18 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -58,7 +58,7 @@ VTitle::~VTitle() void VTitle::init( const uno::Reference< drawing::XShapes >& xTargetPage , const uno::Reference< lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID ) + , const OUString& rCID ) { m_xTarget = xTargetPage; m_xShapeFactory = xFactory; @@ -159,7 +159,7 @@ void VTitle::createShapes( //set name/classified ObjectID (CID) if( !m_aCID.isEmpty() ) - aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( m_aCID ) ) ); //CID rtl::OUString + aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( m_aCID ) ) ); //CID OUString } //set global title properties @@ -184,7 +184,7 @@ void VTitle::createShapes( //if the characters should be stacked we use only the first character properties for code simplicity if( aStringList.getLength()>0 ) { - rtl::OUString aLabel; + OUString aLabel; for( sal_Int32 nN=0; nNgetString(); aLabel = ShapeFactory::getStackedString( aLabel, bStackCharacters ); diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx index f9e9bb9f7645..f9699cd85548 100644 --- a/chart2/source/view/main/VTitle.hxx +++ b/chart2/source/view/main/VTitle.hxx @@ -42,7 +42,7 @@ public: void init( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTargetPage , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory - , const rtl::OUString& rCID ); + , const OUString& rCID ); void createShapes( const ::com::sun::star::awt::Point& rPos , const ::com::sun::star::awt::Size& rReferenceSize ); @@ -61,7 +61,7 @@ private: ::com::sun::star::chart2::XTitle > m_xTitle; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; - rtl::OUString m_aCID; + OUString m_aCID; double m_fRotationAngleDegree; sal_Int32 m_nXPos; diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx index 0131e060087a..726e9b20d3fa 100644 --- a/chart2/workbench/addin/sampleaddin.cxx +++ b/chart2/workbench/addin/sampleaddin.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star; -using ::rtl::OUString; // code for creating instances of SampleAddIn @@ -163,7 +162,7 @@ OUString SampleAddIn::getImplementationName_Static() return "SampleAddIn"; } -uno::Sequence< ::rtl::OUString > SampleAddIn::getSupportedServiceNames_Static() +uno::Sequence< OUString > SampleAddIn::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq( 4 ); @@ -476,7 +475,7 @@ void SAL_CALL SampleAddIn::setPosition( const awt::Point& aPos ) } // XShapeDescriptor ( ::XShape ::XDiagram ) -rtl::OUString SAL_CALL SampleAddIn::getShapeType() throw( com::sun::star::uno::RuntimeException ) +OUString SAL_CALL SampleAddIn::getShapeType() throw( com::sun::star::uno::RuntimeException ) { return "com.sun.star.chart.SampleAddinShape"; } diff --git a/chart2/workbench/addin/sampleaddin.hxx b/chart2/workbench/addin/sampleaddin.hxx index 0f691ee8d73a..0e50da3cdb04 100644 --- a/chart2/workbench/addin/sampleaddin.hxx +++ b/chart2/workbench/addin/sampleaddin.hxx @@ -62,8 +62,8 @@ public: virtual ~SampleAddIn(); // class specific code - static ::rtl::OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); sal_Bool getLogicalPosition( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xAxis, double fValue, @@ -76,7 +76,7 @@ public: ::com::sun::star::uno::RuntimeException ); // XDiagram - virtual ::rtl::OUString SAL_CALL getDiagramType() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDiagramType() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); @@ -96,7 +96,7 @@ public: throw( ::com::sun::star::uno::RuntimeException ); // XShapeDescriptor ( ::XShape ::XDiagram ) - virtual rtl::OUString SAL_CALL getShapeType() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getShapeType() throw( com::sun::star::uno::RuntimeException ); // XAxisXSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getXAxisTitle() @@ -127,13 +127,13 @@ public: throw( ::com::sun::star::uno::RuntimeException ); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getServiceName() throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XRefreshable diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h index b1d1b09c5dac..85ed6fcab8cc 100755 --- a/cli_ure/source/climaker/climaker_share.h +++ b/cli_ure/source/climaker/climaker_share.h @@ -80,17 +80,17 @@ ref struct Constants }; //------------------------------------------------------------------------------ -inline ::System::String ^ ustring_to_String( ::rtl::OUString const & ustr ) +inline ::System::String ^ ustring_to_String( OUString const & ustr ) { return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() ); } //------------------------------------------------------------------------------ -inline ::rtl::OUString String_to_ustring( ::System::String ^ str ) +inline OUString String_to_ustring( ::System::String ^ str ) { OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) ); pin_ptr chars = PtrToStringChars( str ); - return ::rtl::OUString( chars, str->Length ); + return OUString( chars, str->Length ); } /* If the argument type is a typedef for an interface then the interface diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h index e4aa0cf6babf..3c37f6c4f6bb 100644 --- a/cli_ure/source/native/native_share.h +++ b/cli_ure/source/native/native_share.h @@ -32,16 +32,16 @@ namespace util { //------------------------------------------------------------------------------ -inline ::System::String ^ ustring_to_String( ::rtl::OUString const & ustr ) +inline ::System::String ^ ustring_to_String( OUString const & ustr ) { return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() ); } //------------------------------------------------------------------------------ -inline ::rtl::OUString String_to_ustring( ::System::String ^ str ) +inline OUString String_to_ustring( ::System::String ^ str ) { OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) ); pin_ptr chars = PtrToStringChars( str ); - return ::rtl::OUString( chars, str->Length ); + return OUString( chars, str->Length ); } template< typename T > diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h index b03504fcc90c..441f5adeaf7b 100644 --- a/cli_ure/source/uno_bridge/cli_base.h +++ b/cli_ure/source/uno_bridge/cli_base.h @@ -40,7 +40,7 @@ System::Type^ loadCliType(System::String ^ typeName); System::Type^ mapUnoType(typelib_TypeDescription const * pTD); System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD); typelib_TypeDescriptionReference* mapCliType(System::Type^ cliType); -rtl::OUString mapCliString(System::String ^ data); +OUString mapCliString(System::String ^ data); System::String^ mapUnoString(rtl_uString const * data); System::String^ mapUnoTypeName(rtl_uString const * typeName); @@ -105,9 +105,9 @@ ref struct Constants struct BridgeRuntimeError { - ::rtl::OUString m_message; + OUString m_message; - inline BridgeRuntimeError( ::rtl::OUString const & message ) + inline BridgeRuntimeError( OUString const & message ) : m_message( message ) {} }; @@ -160,7 +160,7 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref ) { throw BridgeRuntimeError( "cannot get comprehensive type description for " + - *reinterpret_cast< ::rtl::OUString const * >( &td_ref->pTypeName ) ); + *reinterpret_cast< OUString const * >( &td_ref->pTypeName ) ); } } diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index b68d04c329e2..6195e2f4967a 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -33,9 +33,6 @@ #include "cli_proxy.h" namespace sri= System::Runtime::InteropServices; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; namespace cli_uno { @@ -147,8 +144,8 @@ void SAL_CALL Mapping_uno2cli( catch (BridgeRuntimeError & err) { #if OSL_DEBUG_LEVEL >= 1 - rtl::OString cstr_msg( - rtl::OUStringToOString( + OString cstr_msg( + OUStringToOString( "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( cstr_msg.getStr() ); #else diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index 828e7f4f41e1..f8b5d4b7c348 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -44,8 +44,6 @@ namespace ucss = unoidl::com::sun::star; using namespace std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace cli_uno @@ -183,7 +181,7 @@ System::Type^ loadCliType(System::String ^ unoName) } catch( System::Exception ^ e) { - rtl::OUString ouMessage(mapCliString(e->Message)); + OUString ouMessage(mapCliString(e->Message)); throw BridgeRuntimeError(ouMessage); } return retVal; @@ -237,7 +235,7 @@ System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD) case typelib_TypeClass_INTERFACE: { //special handling for XInterface, since it does not exist in cli. - rtl::OUString usXInterface("com.sun.star.uno.XInterface"); + OUString usXInterface("com.sun.star.uno.XInterface"); if (usXInterface.equals(pTD->pTypeName)) retVal= System::Object::typeid; else @@ -1072,7 +1070,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data, { typelib_TypeDescriptionReference * member_type= NULL; - rtl::OUString usUnoException("com.sun.star.uno.Exception"); + OUString usUnoException("com.sun.star.uno.Exception"); for (; nPos < nMembers; ++nPos) { member_type= comp_td->ppTypeRefs[nPos]; @@ -1092,7 +1090,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data, // System.Exception property. Type.GetField("Message") returns null if ( ! aField && usUnoException.equals(td.get()->pTypeName)) {// get Exception.Message property - rtl::OUString usMessageMember("Message"); + OUString usMessageMember("Message"); if (usMessageMember.equals(comp_td->ppMemberNames[nPos])) { sr::PropertyInfo^ pi= cliType->GetProperty( @@ -1625,7 +1623,7 @@ void Bridge::map_to_cli( pCTD = pCTD->pBaseTypeDescription; int nPos = -1; - rtl::OUString usMessageMember("Message"); + OUString usMessageMember("Message"); for (int i = 0; i < pCTD->nMembers; i ++) { #if OSL_DEBUG_LEVEL >= 2 @@ -1685,7 +1683,7 @@ void Bridge::map_to_cli( ((typelib_TypeDescription *)comp_td->pBaseTypeDescription)->pWeakRef, nullptr, true); } - rtl::OUString usUnoException("com.sun.star.uno.Exception"); + OUString usUnoException("com.sun.star.uno.Exception"); for (sal_Int32 nPos = comp_td->nMembers; nPos--; ) { typelib_TypeDescriptionReference * member_type = comp_td->ppTypeRefs[ nPos ]; diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 0aa031161daa..f7f865f4b802 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -39,10 +39,6 @@ namespace ucss = unoidl::com::sun::star; using namespace cli_uno; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; -using ::rtl::OUStringBuffer; extern "C" { //------------------------------------------------------------------------------ @@ -651,7 +647,7 @@ srrm::IMessage^ UnoInterfaceProxy::constructReturnMessage( //################################################################################ CliProxy::CliProxy(Bridge const* bridge, System::Object^ cliI, typelib_TypeDescription const* td, - const rtl::OUString& usOid): + const OUString& usOid): m_ref(1), m_bridge(bridge), m_cliI(cliI), @@ -776,7 +772,7 @@ void CliProxy::makeMethodInfos() } sr::MethodInfo^ CliProxy::getMethodInfo(int nUnoFunctionPos, - const rtl::OUString& usMethodName, MethodKind methodKind) + const OUString& usMethodName, MethodKind methodKind) { sr::MethodInfo^ ret = nullptr; #if OSL_DEBUG_LEVEL >= 2 @@ -877,7 +873,7 @@ CliProxy::~CliProxy() uno_Interface* CliProxy::create(Bridge const * bridge, System::Object^ cliI, typelib_TypeDescription const* pTD, - const rtl::OUString& ousOid) + const OUString& ousOid) { uno_Interface* proxy= static_cast( new CliProxy(bridge, cliI, pTD, ousOid)); diff --git a/cli_ure/source/uno_bridge/cli_proxy.h b/cli_ure/source/uno_bridge/cli_proxy.h index 657cc69c0c98..5f63a7581d88 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.h +++ b/cli_ure/source/uno_bridge/cli_proxy.h @@ -99,7 +99,7 @@ public: static System::Object^ create(Bridge * bridge, uno_Interface * pUnoI, typelib_InterfaceTypeDescription* pTd, - const rtl::OUString& oid); + const OUString& oid); /** RealProxy::Invoke */ virtual srrm::IMessage^ Invoke(srrm::IMessage^ msg) override; @@ -139,7 +139,7 @@ private: Bridge * bridge, uno_Interface * pUnoI, typelib_InterfaceTypeDescription* pTD, - const rtl::OUString& oid ); + const OUString& oid ); static srrm::IMessage^ constructReturnMessage(System::Object^ retVal, array^ outArgs, @@ -178,7 +178,7 @@ struct CliProxy: public uno_Interface gcroot m_type; const com::sun::star::uno::TypeDescription m_unoType; const gcroot m_oid; - const rtl::OUString m_usOid; + const OUString m_usOid; enum MethodKind {MK_METHOD = 0, MK_SET, MK_GET}; /** The array contains MethodInfos of the cli object. Each one reflects an @@ -235,13 +235,13 @@ struct CliProxy: public uno_Interface CliProxy( Bridge const* bridge, System::Object^ cliI, typelib_TypeDescription const* pTD, - const rtl::OUString& usOid); + const OUString& usOid); ~CliProxy(); static uno_Interface* create(Bridge const * bridge, System::Object^ cliI, typelib_TypeDescription const * TD, - rtl::OUString const & usOid ); + OUString const & usOid ); /** Prepares an array (m_arMethoInfos) containing MethodInfo object of the interface and all inherited interfaces. At index null is the first @@ -276,7 +276,7 @@ struct CliProxy: public uno_Interface Position of the method in the uno interface. */ sr::MethodInfo^ getMethodInfo(int nUnoFunctionPos, - const rtl::OUString & usMethodName, + const OUString & usMethodName, MethodKind mk); void SAL_CALL uno_DispatchMethod( diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index 93ab81e62328..c1598d98f376 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -24,7 +24,6 @@ namespace sr=System::Reflection; -using ::rtl::OUStringBuffer; namespace cli_uno { diff --git a/codemaker/inc/codemaker/codemaker.hxx b/codemaker/inc/codemaker/codemaker.hxx index a1c3a14eea6c..9a821bea78ba 100644 --- a/codemaker/inc/codemaker/codemaker.hxx +++ b/codemaker/inc/codemaker/codemaker.hxx @@ -36,13 +36,13 @@ class TypeManager; namespace codemaker { -rtl::OString convertString(rtl::OUString const & string); +OString convertString(OUString const & string); codemaker::UnoType::Sort decomposeAndResolve( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type, + rtl::Reference< TypeManager > const & manager, OString const & type, bool resolveTypedefs, bool allowVoid, bool allowExtraEntities, - RTTypeClass * typeClass, rtl::OString * name, sal_Int32 * rank, - std::vector< rtl::OString > * arguments); + RTTypeClass * typeClass, OString * name, sal_Int32 * rank, + std::vector< OString > * arguments); } diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx index 3cfd7133c0f1..4f81f98fff23 100644 --- a/codemaker/inc/codemaker/commoncpp.hxx +++ b/codemaker/inc/codemaker/commoncpp.hxx @@ -33,11 +33,11 @@ namespace codemaker { namespace cpp { Use common namespace aliases instead of fully specified (nested) namespace. currently replaces com::sun::star with css. */ -rtl::OString scopedCppName(rtl::OString const & type, bool ns_alias=true); +OString scopedCppName(OString const & type, bool ns_alias=true); -rtl::OString translateUnoToCppType( +OString translateUnoToCppType( codemaker::UnoType::Sort sort, RTTypeClass typeClass, - rtl::OString const & nucleus, bool shortname); + OString const & nucleus, bool shortname); enum IdentifierTranslationMode { ITM_GLOBAL, @@ -45,10 +45,10 @@ enum IdentifierTranslationMode { ITM_KEYWORDSONLY }; -rtl::OString translateUnoToCppIdentifier( - rtl::OString const & identifier, rtl::OString const & prefix, +OString translateUnoToCppIdentifier( + OString const & identifier, OString const & prefix, IdentifierTranslationMode transmode = ITM_GLOBAL, - rtl::OString const * forbidden = 0); + OString const * forbidden = 0); } } diff --git a/codemaker/inc/codemaker/commonjava.hxx b/codemaker/inc/codemaker/commonjava.hxx index 26c87e123fdb..f2e77ee9d1fa 100644 --- a/codemaker/inc/codemaker/commonjava.hxx +++ b/codemaker/inc/codemaker/commonjava.hxx @@ -24,12 +24,12 @@ namespace codemaker { namespace java { -rtl::OString translateUnoToJavaType( +OString translateUnoToJavaType( codemaker::UnoType::Sort sort, RTTypeClass typeClass, - rtl::OString const & nucleus, bool referenceType); + OString const & nucleus, bool referenceType); -rtl::OString translateUnoToJavaIdentifier( - rtl::OString const & identifier, rtl::OString const & prefix); +OString translateUnoToJavaIdentifier( + OString const & identifier, OString const & prefix); } } diff --git a/codemaker/inc/codemaker/dependencies.hxx b/codemaker/inc/codemaker/dependencies.hxx index c45db676d667..47e5e249c48f 100644 --- a/codemaker/inc/codemaker/dependencies.hxx +++ b/codemaker/inc/codemaker/dependencies.hxx @@ -26,8 +26,8 @@ #include "rtl/ref.hxx" #include "rtl/string.hxx" +#include "rtl/ustring.hxx" -namespace rtl { class OUString; } class TypeManager; /// @HTML @@ -47,7 +47,7 @@ public: */ enum Kind { KIND_NO_BASE, KIND_BASE }; - typedef std::map< rtl::OString, Kind > Map; + typedef std::map< OString, Kind > Map; /** Constructs the dependencies for a given type. @@ -63,7 +63,7 @@ public: */ Dependencies( rtl::Reference< TypeManager > const & manager, - rtl::OString const & type); + OString const & type); ~Dependencies(); @@ -73,7 +73,7 @@ public: @param type a UNO type registry name */ - void add(rtl::OString const & type) { insert(type, false); } + void add(OString const & type) { insert(type, false); } bool isValid() const { return m_valid; } @@ -117,9 +117,9 @@ private: Dependencies(Dependencies &); // not implemented void operator =(Dependencies); // not implemented - void insert(rtl::OUString const & type, bool base); + void insert(OUString const & type, bool base); - void insert(rtl::OString const & type, bool base); + void insert(OString const & type, bool base); Map m_map; bool m_valid; diff --git a/codemaker/inc/codemaker/exceptiontree.hxx b/codemaker/inc/codemaker/exceptiontree.hxx index fed0e5b9e4d7..91a0cae3f839 100644 --- a/codemaker/inc/codemaker/exceptiontree.hxx +++ b/codemaker/inc/codemaker/exceptiontree.hxx @@ -37,7 +37,7 @@ struct ExceptionTreeNode { typedef std::vector< ExceptionTreeNode * > Children; // Internally used by ExceptionTree: - ExceptionTreeNode(rtl::OString const & theName): + ExceptionTreeNode(OString const & theName): name(theName), present(false) {} // Internally used by ExceptionTree: @@ -47,9 +47,9 @@ struct ExceptionTreeNode { void setPresent() { present = true; clearChildren(); } // Internally used by ExceptionTree: - ExceptionTreeNode * add(rtl::OString const & theName); + ExceptionTreeNode * add(OString const & theName); - rtl::OString name; + OString name; bool present; Children children; @@ -94,7 +94,7 @@ public: type managers */ void add( - rtl::OString const & name, + OString const & name, rtl::Reference< TypeManager > const & manager) throw( CannotDumpException ); diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/codemaker/inc/codemaker/generatedtypeset.hxx index 2081fc715ddd..3d1a5615b0b1 100644 --- a/codemaker/inc/codemaker/generatedtypeset.hxx +++ b/codemaker/inc/codemaker/generatedtypeset.hxx @@ -47,7 +47,7 @@ public: @param type a UNO type registry name */ - void add(rtl::OString const & type) { m_set.insert(type); } + void add(OString const & type) { m_set.insert(type); } /** Checks whether a given type has already been generated. @@ -56,14 +56,14 @@ public: @return true iff the given type has already been generated */ - bool contains(rtl::OString const & type) const + bool contains(OString const & type) const { return m_set.find(type) != m_set.end(); } private: GeneratedTypeSet(GeneratedTypeSet &); // not implemented void operator =(GeneratedTypeSet); // not implemented - boost::unordered_set< rtl::OString, rtl::OStringHash > m_set; + boost::unordered_set< OString, OStringHash > m_set; }; } diff --git a/codemaker/inc/codemaker/global.hxx b/codemaker/inc/codemaker/global.hxx index 17f78a886b65..891ed4705e87 100644 --- a/codemaker/inc/codemaker/global.hxx +++ b/codemaker/inc/codemaker/global.hxx @@ -32,7 +32,7 @@ struct EqualString { - sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const + sal_Bool operator()(const OString& str1, const OString& str2) const { return (str1 == str2); } @@ -40,7 +40,7 @@ struct EqualString struct HashString { - size_t operator()(const ::rtl::OString& str) const + size_t operator()(const OString& str) const { return str.hashCode(); } @@ -48,15 +48,15 @@ struct HashString struct LessString { - sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const + sal_Bool operator()(const OString& str1, const OString& str2) const { return (str1 < str2); } }; -typedef ::std::list< ::rtl::OString > StringList; -typedef ::std::vector< ::rtl::OString > StringVector; -typedef ::std::set< ::rtl::OString, LessString > StringSet; +typedef ::std::list< OString > StringList; +typedef ::std::vector< OString > StringVector; +typedef ::std::set< OString, LessString > StringSet; //************************************************************************* // FileStream @@ -77,45 +77,45 @@ public: sal_Bool isValid(); - void createTempFile(const ::rtl::OString& sPath); + void createTempFile(const OString& sPath); void close(); - ::rtl::OString getName() { return m_name; } + OString getName() { return m_name; } bool write(void const * buffer, sal_uInt64 size); // friend functions friend FileStream &operator<<(FileStream& o, sal_uInt32 i); friend FileStream &operator<<(FileStream& o, char const * s); - friend FileStream &operator<<(FileStream& o, ::rtl::OString* s); - friend FileStream &operator<<(FileStream& o, const ::rtl::OString& s); - friend FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer* s); - friend FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s); + friend FileStream &operator<<(FileStream& o, OString* s); + friend FileStream &operator<<(FileStream& o, const OString& s); + friend FileStream &operator<<(FileStream& o, OStringBuffer* s); + friend FileStream &operator<<(FileStream& o, const OStringBuffer& s); private: oslFileHandle m_file; - ::rtl::OString m_name; + OString m_name; }; //************************************************************************* // Helper functions //************************************************************************* -::rtl::OString getTempDir(const ::rtl::OString& sFileName); +OString getTempDir(const OString& sFileName); -::rtl::OString createFileNameFromType(const ::rtl::OString& destination, - const ::rtl::OString type, - const ::rtl::OString postfix, +OString createFileNameFromType(const OString& destination, + const OString type, + const OString postfix, sal_Bool bLowerCase=sal_False, - const ::rtl::OString prefix=""); + const OString prefix=""); -sal_Bool fileExists(const ::rtl::OString& fileName); -sal_Bool makeValidTypeFile(const ::rtl::OString& targetFileName, - const ::rtl::OString& tmpFileName, +sal_Bool fileExists(const OString& fileName); +sal_Bool makeValidTypeFile(const OString& targetFileName, + const OString& tmpFileName, sal_Bool bFileCheck); -sal_Bool removeTypeFile(const ::rtl::OString& fileName); +sal_Bool removeTypeFile(const OString& fileName); -::rtl::OUString convertToFileUrl(const ::rtl::OString& fileName); +OUString convertToFileUrl(const OString& fileName); //************************************************************************* // Global exception to signal problems when a type cannot be dumped @@ -123,10 +123,10 @@ sal_Bool removeTypeFile(const ::rtl::OString& fileName); class CannotDumpException { public: - CannotDumpException(const ::rtl::OString& msg) + CannotDumpException(const OString& msg) : m_message(msg) {} - ::rtl::OString m_message; + OString m_message; }; diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx index 22b09ce00165..053cda9cf44b 100644 --- a/codemaker/inc/codemaker/options.hxx +++ b/codemaker/inc/codemaker/options.hxx @@ -26,8 +26,8 @@ typedef ::boost::unordered_map < - ::rtl::OString, - ::rtl::OString, + OString, + OString, HashString, EqualString > OptionMap; @@ -35,10 +35,10 @@ typedef ::boost::unordered_map class IllegalArgument { public: - IllegalArgument(const ::rtl::OString& msg) + IllegalArgument(const OString& msg) : m_message(msg) {} - ::rtl::OString m_message; + OString m_message; }; class Options @@ -50,11 +50,11 @@ public: virtual sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ) = 0; - virtual ::rtl::OString prepareHelp() = 0; + virtual OString prepareHelp() = 0; - const ::rtl::OString& getProgramName() const; - sal_Bool isValid(const ::rtl::OString& option); - const ::rtl::OString getOption(const ::rtl::OString& option) + const OString& getProgramName() const; + sal_Bool isValid(const OString& option); + const OString getOption(const OString& option) throw( IllegalArgument ); const StringVector& getInputFiles(); @@ -64,7 +64,7 @@ public: inline const StringVector& getExtraInputFiles() const { return m_extra_input_files; } protected: - ::rtl::OString m_program; + OString m_program; StringVector m_inputFiles; StringVector m_extra_input_files; OptionMap m_options; diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx index 1b16115b85da..886aee54648c 100644 --- a/codemaker/inc/codemaker/typemanager.hxx +++ b/codemaker/inc/codemaker/typemanager.hxx @@ -37,7 +37,7 @@ typedef ::std::vector< KeyPair > RegistryKeyList; typedef ::boost::unordered_map < - ::rtl::OString, // Typename + OString, // Typename RTTypeClass, // TypeClass HashString, EqualString @@ -50,38 +50,38 @@ public: sal_Bool init(const StringVector& regFiles, const StringVector& extraFiles = StringVector() ); - ::rtl::OString getTypeName(RegistryKey& rTypeKey) const; + OString getTypeName(RegistryKey& rTypeKey) const; - sal_Bool isValidType(const ::rtl::OString& name) const + sal_Bool isValidType(const OString& name) const { return searchTypeKey(name, 0).isValid(); } RegistryKey getTypeKey( - const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const + const OString& name, sal_Bool * pIsExtraType = 0 ) const { return searchTypeKey(name, pIsExtraType); } - RegistryKeyList getTypeKeys(const ::rtl::OString& name) const; + RegistryKeyList getTypeKeys(const OString& name) const; typereg::Reader getTypeReader( - const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const; + const OString& name, sal_Bool * pIsExtraType = 0 ) const; typereg::Reader getTypeReader(RegistryKey& rTypeKey) const; - RTTypeClass getTypeClass(const ::rtl::OString& name) const; + RTTypeClass getTypeClass(const OString& name) const; RTTypeClass getTypeClass(RegistryKey& rTypeKey) const; - void setBase(const ::rtl::OString& base); - ::rtl::OString getBase() const { return m_base; } + void setBase(const OString& base); + OString getBase() const { return m_base; } sal_Int32 getSize() const { return m_t2TypeClass.size(); } - static sal_Bool isBaseType(const ::rtl::OString& name); + static sal_Bool isBaseType(const OString& name); private: virtual ~TypeManager(); RegistryKey searchTypeKey( - const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const; + const OString& name, sal_Bool * pIsExtraType = 0 ) const; void freeRegistries(); mutable T2TypeClassMap m_t2TypeClass; RegistryList m_registries; RegistryList m_extra_registries; - ::rtl::OString m_base; + OString m_base; }; #endif // INCLUDED_CODEMAKER_TYPEMANAGER_HXX diff --git a/codemaker/inc/codemaker/unotype.hxx b/codemaker/inc/codemaker/unotype.hxx index 23cf0668074e..ce22e62959dd 100644 --- a/codemaker/inc/codemaker/unotype.hxx +++ b/codemaker/inc/codemaker/unotype.hxx @@ -21,11 +21,10 @@ #define INCLUDED_CODEMAKER_UNOTYPE_HXX #include "sal/types.h" +#include #include -namespace rtl { class OString; } - namespace codemaker { namespace UnoType { @@ -64,7 +63,7 @@ namespace UnoType { is a UNO type registry name that denotes something other than a UNO type, SORT_COMPLEX is returned) */ - Sort getSort(rtl::OString const & type); + Sort getSort(OString const & type); /** Determines whether a UNO type name or UNO type registry name denotes a @@ -75,7 +74,7 @@ namespace UnoType { @return true iff the given type denotes a UNO sequence type; the detection is purely syntactical */ - bool isSequenceType(rtl::OString const & type); + bool isSequenceType(OString const & type); /** Decomposes a UNO type name or UNO type registry name. @@ -92,9 +91,9 @@ namespace UnoType { @return the base part of the given type */ - rtl::OString decompose( - rtl::OString const & type, sal_Int32 * rank = 0, - std::vector< rtl::OString > * arguments = 0); + OString decompose( + OString const & type, sal_Int32 * rank = 0, + std::vector< OString > * arguments = 0); } } diff --git a/codemaker/source/codemaker/codemaker.cxx b/codemaker/source/codemaker/codemaker.cxx index b797a2c47358..0412e36d066b 100644 --- a/codemaker/source/codemaker/codemaker.cxx +++ b/codemaker/source/codemaker/codemaker.cxx @@ -39,7 +39,7 @@ namespace { -void checkNoTypeArguments(std::vector< rtl::OString > const & arguments) { +void checkNoTypeArguments(std::vector< OString > const & arguments) { if (!arguments.empty()) { throw CannotDumpException("Bad type information"); //TODO @@ -50,8 +50,8 @@ void checkNoTypeArguments(std::vector< rtl::OString > const & arguments) { namespace codemaker { -rtl::OString convertString(rtl::OUString const & string) { - rtl::OString s; +OString convertString(OUString const & string) { + OString s; if (!string.convertToString( &s, RTL_TEXTENCODING_UTF8, (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR @@ -63,14 +63,14 @@ rtl::OString convertString(rtl::OUString const & string) { } codemaker::UnoType::Sort decomposeAndResolve( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type, + rtl::Reference< TypeManager > const & manager, OString const & type, bool resolveTypedefs, bool allowVoid, bool allowExtraEntities, - RTTypeClass * typeClass, rtl::OString * name, sal_Int32 * rank, - std::vector< rtl::OString > * arguments) + RTTypeClass * typeClass, OString * name, sal_Int32 * rank, + std::vector< OString > * arguments) { OSL_ASSERT(typeClass != 0 && name != 0 && rank != 0 && arguments != 0); *rank = 0; - for (rtl::OString t(type);;) { + for (OString t(type);;) { sal_Int32 n = 0; *name = codemaker::UnoType::decompose(t, &n, arguments); if (n > SAL_MAX_INT32 - *rank) { diff --git a/codemaker/source/codemaker/dependencies.cxx b/codemaker/source/codemaker/dependencies.cxx index d920ac4e7119..143dc98ffdc3 100644 --- a/codemaker/source/codemaker/dependencies.cxx +++ b/codemaker/source/codemaker/dependencies.cxx @@ -42,7 +42,7 @@ struct Bad {}; } Dependencies::Dependencies( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type): + rtl::Reference< TypeManager > const & manager, OString const & type): m_voidDependency(false), m_booleanDependency(false), m_byteDependency(false), m_shortDependency(false), m_unsignedShortDependency(false), m_longDependency(false), @@ -122,8 +122,8 @@ Dependencies::Dependencies( Dependencies::~Dependencies() {} -void Dependencies::insert(rtl::OUString const & type, bool base) { - rtl::OString t; +void Dependencies::insert(OUString const & type, bool base) { + OString t; if (!type.convertToString( &t, RTL_TEXTENCODING_UTF8, (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR @@ -134,10 +134,10 @@ void Dependencies::insert(rtl::OUString const & type, bool base) { insert(t, base); } -void Dependencies::insert(rtl::OString const & type, bool base) { +void Dependencies::insert(OString const & type, bool base) { sal_Int32 rank; - std::vector< rtl::OString > args; - rtl::OString t(UnoType::decompose(type, &rank, &args)); + std::vector< OString > args; + OString t(UnoType::decompose(type, &rank, &args)); if (rank > 0) { m_sequenceDependency = true; } @@ -249,7 +249,7 @@ void Dependencies::insert(rtl::OString const & type, bool base) { case UnoType::SORT_COMPLEX: { - for (std::vector< rtl::OString >::iterator i(args.begin()); + for (std::vector< OString >::iterator i(args.begin()); i != args.end(); ++i) { insert(*i, false); diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx index 52f968493274..1b4915b65224 100644 --- a/codemaker/source/codemaker/exceptiontree.cxx +++ b/codemaker/source/codemaker/exceptiontree.cxx @@ -34,7 +34,7 @@ using codemaker::ExceptionTree; using codemaker::ExceptionTreeNode; -ExceptionTreeNode * ExceptionTreeNode::add(rtl::OString const & theName) { +ExceptionTreeNode * ExceptionTreeNode::add(OString const & theName) { std::auto_ptr< ExceptionTreeNode > node(new ExceptionTreeNode(theName)); children.push_back(node.get()); return node.release(); @@ -48,13 +48,13 @@ void ExceptionTreeNode::clearChildren() { } void ExceptionTree::add( - rtl::OString const & name, rtl::Reference< TypeManager > const & manager) + OString const & name, rtl::Reference< TypeManager > const & manager) throw( CannotDumpException ) { - typedef std::vector< rtl::OString > OStringList; + typedef std::vector< OString > OStringList; OStringList stringlist; bool runtimeException = false; - for (rtl::OString n(name); n != "com/sun/star/uno/Exception";) { + for (OString n(name); n != "com/sun/star/uno/Exception";) { if (n == "com/sun/star/uno/RuntimeException") { runtimeException = true; break; @@ -63,13 +63,13 @@ void ExceptionTree::add( typereg::Reader reader(manager->getTypeReader(n)); if (!reader.isValid()) throw CannotDumpException( - ::rtl::OString("Unknown type '" + n.replace('/', '.') + OString("Unknown type '" + n.replace('/', '.') + "', incomplete type library.")); OSL_ASSERT( reader.getTypeClass() == RT_TYPE_EXCEPTION && reader.getSuperTypeCount() == 1); - n = rtl::OUStringToOString( + n = OUStringToOString( reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } if (!runtimeException) { diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx index 34b0490c7d17..2630ee8b81ce 100644 --- a/codemaker/source/codemaker/global.cxx +++ b/codemaker/source/codemaker/global.cxx @@ -364,23 +364,23 @@ FileStream &operator<<(FileStream& o, char const * s) { osl_writeFile(o.m_file, s, strlen(s), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, ::rtl::OString* s) { +FileStream &operator<<(FileStream& o, OString* s) { sal_uInt64 writtenBytes; osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, const ::rtl::OString& s) { +FileStream &operator<<(FileStream& o, const OString& s) { sal_uInt64 writtenBytes; osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer* s) { +FileStream &operator<<(FileStream& o, OStringBuffer* s) { sal_uInt64 writtenBytes; osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s) { +FileStream &operator<<(FileStream& o, const OStringBuffer& s) { sal_uInt64 writtenBytes; osl_writeFile( o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes); diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index 59706d99c179..d233f6ff0bfc 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -20,7 +20,6 @@ #include "codemaker/options.hxx" -using ::rtl::OString; Options::Options() { diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx index 116684dbfb66..9d4cf63f58f5 100644 --- a/codemaker/source/codemaker/typemanager.cxx +++ b/codemaker/source/codemaker/typemanager.cxx @@ -23,12 +23,8 @@ #include "registry/reader.hxx" #include "registry/version.h" -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; -sal_Bool TypeManager::isBaseType(const ::rtl::OString& name) +sal_Bool TypeManager::isBaseType(const OString& name) { if ( name == "short" ) return sal_True; @@ -108,7 +104,7 @@ sal_Bool TypeManager::init( return sal_True; } -::rtl::OString TypeManager::getTypeName(RegistryKey& rTypeKey) const +OString TypeManager::getTypeName(RegistryKey& rTypeKey) const { OString typeName = OUStringToOString(rTypeKey.getName(), RTL_TEXTENCODING_UTF8); @@ -306,7 +302,7 @@ RegistryKey TypeManager::searchTypeKey(const OString& name_, sal_Bool * pIsExtra return key; } -RegistryKeyList TypeManager::getTypeKeys(const ::rtl::OString& name_) const +RegistryKeyList TypeManager::getTypeKeys(const OString& name_) const { RegistryKeyList keyList= RegistryKeyList(); OString tmpName; diff --git a/codemaker/source/codemaker/unotype.cxx b/codemaker/source/codemaker/unotype.cxx index 9adb9e1bc47b..8f2c89537c77 100644 --- a/codemaker/source/codemaker/unotype.cxx +++ b/codemaker/source/codemaker/unotype.cxx @@ -26,7 +26,7 @@ #include -codemaker::UnoType::Sort codemaker::UnoType::getSort(rtl::OString const & type) +codemaker::UnoType::Sort codemaker::UnoType::getSort(OString const & type) { return type == "void" ? SORT_VOID : type == "boolean" ? SORT_BOOLEAN @@ -46,13 +46,13 @@ codemaker::UnoType::Sort codemaker::UnoType::getSort(rtl::OString const & type) : SORT_COMPLEX; } -bool codemaker::UnoType::isSequenceType(rtl::OString const & type) { +bool codemaker::UnoType::isSequenceType(OString const & type) { return !type.isEmpty() && type[0] == '['; } -rtl::OString codemaker::UnoType::decompose( - rtl::OString const & type, sal_Int32 * rank, - std::vector< rtl::OString > * arguments) +OString codemaker::UnoType::decompose( + OString const & type, sal_Int32 * rank, + std::vector< OString > * arguments) { sal_Int32 len = type.getLength(); sal_Int32 i = 0; diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index 5db10d481c75..6f530409f745 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -56,7 +56,7 @@ OString scopedCppName(OString const & type, bool ns_alias) tmpBuf.append("::" + type.getToken(0, c, nPos)); } while( nPos != -1 ); - rtl::OString s(tmpBuf.makeStringAndClear()); + OString s(tmpBuf.makeStringAndClear()); if (ns_alias && s.indexOf("::com::sun::star::") == 0) { return s.replaceAt(0, 18, "css::"); // nicer shorthand @@ -70,10 +70,10 @@ OString translateUnoToCppType( codemaker::UnoType::Sort sort, RTTypeClass typeClass, OString const & nucleus, bool shortname) { - rtl::OStringBuffer buf; + OStringBuffer buf; if (sort == codemaker::UnoType::SORT_COMPLEX) { if (typeClass == RT_TYPE_INTERFACE - && nucleus == rtl::OString("com/sun/star/uno/XInterface")) + && nucleus == OString("com/sun/star/uno/XInterface")) { buf.append("::com::sun::star::uno::XInterface"); } else { @@ -84,13 +84,13 @@ OString translateUnoToCppType( static char const * const cppTypes[codemaker::UnoType::SORT_ANY + 1] = { "void", "::sal_Bool", "::sal_Int8", "::sal_Int16", "::sal_uInt16", "::sal_Int32", "::sal_uInt32", "::sal_Int64", "::sal_uInt64", - "float", "double", "::sal_Unicode", "::rtl::OUString", + "float", "double", "::sal_Unicode", "rtl::OUString", "::com::sun::star::uno::Type", "::com::sun::star::uno::Any" }; buf.append(cppTypes[sort]); } if (shortname) { - rtl::OString s(buf.makeStringAndClear()); + OString s(buf.makeStringAndClear()); if (s.indexOf("::com::sun::star") == 0) return s.replaceAt(0, 16, "css"); else @@ -100,9 +100,9 @@ OString translateUnoToCppType( return buf.makeStringAndClear(); } -rtl::OString translateUnoToCppIdentifier( - rtl::OString const & unoIdentifier, rtl::OString const & prefix, - IdentifierTranslationMode transmode, rtl::OString const * forbidden) +OString translateUnoToCppIdentifier( + OString const & unoIdentifier, OString const & prefix, + IdentifierTranslationMode transmode, OString const * forbidden) { if (// Keywords: unoIdentifier == "asm" diff --git a/codemaker/source/commonjava/commonjava.cxx b/codemaker/source/commonjava/commonjava.cxx index 8049c98295a0..8c8a630d1bda 100644 --- a/codemaker/source/commonjava/commonjava.cxx +++ b/codemaker/source/commonjava/commonjava.cxx @@ -54,7 +54,7 @@ OString translateUnoToJavaType( buf.append(nucleus); } } else { - rtl::OString const javaTypes[codemaker::UnoType::SORT_ANY + 1][2] = { + OString const javaTypes[codemaker::UnoType::SORT_ANY + 1][2] = { { "void", "java/lang/Void" }, { "boolean", "java/lang/Boolean" }, { "byte", "java/lang/Byte" }, @@ -75,8 +75,8 @@ OString translateUnoToJavaType( return buf.makeStringAndClear(); } -rtl::OString translateUnoToJavaIdentifier( - rtl::OString const & identifier, rtl::OString const & prefix) +OString translateUnoToJavaIdentifier( + OString const & identifier, OString const & prefix) { if (identifier == "abstract" || identifier == "assert" // since Java 1.4 diff --git a/codemaker/source/cppumaker/cppumaker.cxx b/codemaker/source/cppumaker/cppumaker.cxx index d18a952502e1..1f63ef26b5b2 100644 --- a/codemaker/source/cppumaker/cppumaker.cxx +++ b/codemaker/source/cppumaker/cppumaker.cxx @@ -29,14 +29,12 @@ #include "cppuoptions.hxx" #include "cpputype.hxx" -using ::rtl::OString; -using ::rtl::OUString; namespace { -void failed(rtl::OString const & typeName, CppuOptions * options) { +void failed(OString const & typeName, CppuOptions * options) { fprintf(stderr, "%s ERROR: %s\n", options->getProgramName().getStr(), - rtl::OString("cannot dump Type '" + typeName + "'").getStr()); + OString("cannot dump Type '" + typeName + "'").getStr()); exit(99); } @@ -52,7 +50,7 @@ void produce( } void produce( - rtl::OString const & typeName, + OString const & typeName, rtl::Reference< TypeManager > const & typeMgr, codemaker::GeneratedTypeSet & generated, CppuOptions * options) { diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index 10b1d0c2d414..8affab24dd56 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -24,9 +24,6 @@ #include "osl/thread.h" #include "osl/process.h" -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; #ifdef SAL_UNX #define SEPARATOR '/' diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx index f2dd04549d3f..f07e945d1ff5 100644 --- a/codemaker/source/cppumaker/cppuoptions.hxx +++ b/codemaker/source/cppumaker/cppuoptions.hxx @@ -33,9 +33,9 @@ public: sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ); - ::rtl::OString prepareHelp(); + OString prepareHelp(); - ::rtl::OString prepareVersion(); + OString prepareVersion(); protected: }; diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index b5e52681a598..4f90a53139e3 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -43,19 +43,16 @@ using namespace codemaker::cpp; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; namespace { -rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoType=false) { - static rtl::OString const trans[codemaker::UnoType::SORT_COMPLEX + 1] = { +OString translateSimpleUnoType(OString const & unoType, bool cppuUnoType=false) { + static OString const trans[codemaker::UnoType::SORT_COMPLEX + 1] = { "void", "::sal_Bool", "::sal_Int8", "::sal_Int16", "::sal_uInt16", "::sal_Int32", "::sal_uInt32", "::sal_Int64", "::sal_uInt64", "float", - "double", "::sal_Unicode", "::rtl::OUString", + "double", "::sal_Unicode", "rtl::OUString", "::com::sun::star::uno::Type", "::com::sun::star::uno::Any", - rtl::OString() }; + OString() }; const codemaker::UnoType::Sort sort = codemaker::UnoType::getSort(unoType); if (cppuUnoType && @@ -71,7 +68,7 @@ rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoTy return trans[sort]; } -bool isBootstrapType(rtl::OString const & name) { +bool isBootstrapType(OString const & name) { static char const * const names[] = { "com/sun/star/beans/PropertyAttribute", "com/sun/star/beans/PropertyState", @@ -192,7 +189,7 @@ void CppuType::dumpDeclaration(FileStream &) throw (CannotDumpException) { OSL_ASSERT(false); } -bool CppuType::dumpFiles(CppuOptions * options, rtl::OString const & outPath) { +bool CppuType::dumpFiles(CppuOptions * options, OString const & outPath) { return dumpFile(options, ".hdl", m_typeName, outPath) && dumpFile(options, ".hpp", m_typeName, outPath); } @@ -441,15 +438,15 @@ void CppuType::addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes) } void CppuType::dumpInitializer( - FileStream & out, bool parameterized, rtl::OUString const & type) const + FileStream & out, bool parameterized, OUString const & type) const { out << "("; if (!parameterized) { - for (rtl::OString t( - rtl::OUStringToOString(type, RTL_TEXTENCODING_UTF8));;) + for (OString t( + OUStringToOString(type, RTL_TEXTENCODING_UTF8));;) { sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; t = codemaker::UnoType::decompose(t, &rank, &args); if (rank == 0) { switch (codemaker::UnoType::getSort(t)) { @@ -477,7 +474,7 @@ void CppuType::dumpInitializer( typereg::Reader reader(m_typeMgr->getTypeReader(t)); OSL_ASSERT(reader.isValid()); out << scopedCppName(t) << "_" - << rtl::OUStringToOString( + << OUStringToOString( reader.getFieldName(0), RTL_TEXTENCODING_UTF8); break; @@ -600,7 +597,7 @@ void CppuType::dumpNormalGetCppuType(FileStream& o) OString superType; if (m_reader.getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } sal_Bool bIsBaseException = sal_False; @@ -636,10 +633,10 @@ void CppuType::dumpNormalGetCppuType(FileStream& o) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = checkRealBaseType( - rtl::OUStringToOString( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8), sal_True); @@ -711,7 +708,7 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "{\n"; inc(); - o << indent() << "::rtl::OUString sTypeName( \"" + o << indent() << "rtl::OUString sTypeName( \"" << m_typeName.replace('/', '.') << "\" );\n\n"; o << indent() << "// Start inline typedescription generation\n" @@ -719,7 +716,7 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o) OString superType; if (m_reader.getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } if (!superType.isEmpty()) { @@ -748,17 +745,17 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o) continue; } - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = checkRealBaseType( - rtl::OUStringToOString( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8), sal_True); - o << indent() << "::rtl::OUString sMemberType" << i + o << indent() << "rtl::OUString sMemberType" << i << "( \"" << fieldType.replace('/', '.') << "\" );\n"; - o << indent() << "::rtl::OUString sMemberName" << i + o << indent() << "rtl::OUString sMemberName" << i << "( \""; o << fieldName << "\" );\n"; o << indent() << "aMembers[" << i << "].eTypeClass = " @@ -829,8 +826,8 @@ void CppuType::dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag) || (access & RT_ACCESS_PARAMETERIZED_TYPE) != 0) continue; - rtl::OString typeName( - rtl::OUStringToOString( + OString typeName( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if (aFinishedTypes.count(typeName) == 0) { @@ -875,7 +872,7 @@ sal_uInt32 CppuType::checkInheritedMemberCount(const typereg::Reader* pReader) sal_uInt32 count = 0; OString superType; if (pReader->getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( pReader->getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } if (!superType.isEmpty()) @@ -1000,8 +997,8 @@ void CppuType::dumpType(FileStream& o, const OString& type, const throw( CannotDumpException ) { sal_Int32 seqNum; - std::vector< rtl::OString > args; - rtl::OString relType( + std::vector< OString > args; + OString relType( codemaker::UnoType::decompose( checkRealBaseType(type, true), &seqNum, &args)); @@ -1044,7 +1041,7 @@ void CppuType::dumpType(FileStream& o, const OString& type, o << scopedCppName(relType); if (!args.empty()) { o << "< "; - for (std::vector< rtl::OString >::iterator i(args.begin()); + for (std::vector< OString >::iterator i(args.begin()); i != args.end(); ++i) { if (i != args.begin()) { @@ -1070,7 +1067,7 @@ void CppuType::dumpType(FileStream& o, const OString& type, void CppuType::dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDecl, CppuTypeDecl eDeclFlag) { - rtl::OString relType( + OString relType( codemaker::UnoType::decompose(checkRealBaseType(type, true))); if (eDeclFlag == CPPUTYPEDECL_ONLYINTERFACES) @@ -1108,7 +1105,7 @@ void CppuType::dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDec OString CppuType::typeToIdentifier(const OString& type) { sal_Int32 seqNum; - rtl::OString relType(codemaker::UnoType::decompose(type, &seqNum)); + OString relType(codemaker::UnoType::decompose(type, &seqNum)); OString sIdentifier; while( seqNum > 0 ) @@ -1135,8 +1132,8 @@ OString CppuType::typeToIdentifier(const OString& type) return sIdentifier; } -bool CppuType::passByReference(rtl::OString const & unoType) { - rtl::OString type(resolveTypedefs(unoType)); +bool CppuType::passByReference(OString const & unoType) { + OString type(resolveTypedefs(unoType)); switch (codemaker::UnoType::getSort(type)) { default: return false; @@ -1169,7 +1166,7 @@ OString CppuType::resolveTypedefs(const OString& type) const typeClass = reader.getTypeClass(); if (typeClass == RT_TYPE_TYPEDEF) - baseType = rtl::OUStringToOString( + baseType = OUStringToOString( reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); else isTypeDef = sal_False; @@ -1185,7 +1182,7 @@ OString CppuType::resolveTypedefs(const OString& type) const OString CppuType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) const { sal_Int32 rank; - rtl::OString baseType(codemaker::UnoType::decompose(type, &rank)); + OString baseType(codemaker::UnoType::decompose(type, &rank)); RegistryKey key; RTTypeClass typeClass; @@ -1204,7 +1201,7 @@ OString CppuType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOn { sal_Int32 n; baseType = codemaker::UnoType::decompose( - rtl::OUStringToOString( + OUStringToOString( reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8), &n); OSL_ASSERT(n <= SAL_MAX_INT32 - rank); //TODO @@ -1272,7 +1269,7 @@ void CppuType::dumpConstantValue(FileStream& o, sal_uInt16 index) if (constValue.m_value.aHyper == SAL_MIN_INT64) { o << "SAL_MIN_INT64"; } else { - ::rtl::OString tmp(OString::valueOf(constValue.m_value.aHyper)); + OString tmp(OString::valueOf(constValue.m_value.aHyper)); o << "(sal_Int64) SAL_CONST_INT64(" << tmp.getStr() << ")"; } break; @@ -1290,7 +1287,7 @@ void CppuType::dumpConstantValue(FileStream& o, sal_uInt16 index) for (std::vector< char >::reverse_iterator i(buf.rbegin()); i != buf.rend(); ++i) { - o << rtl::OString::valueOf(*i).getStr(); + o << OString::valueOf(*i).getStr(); } } o << ")"; @@ -1298,21 +1295,21 @@ void CppuType::dumpConstantValue(FileStream& o, sal_uInt16 index) break; case RT_TYPE_FLOAT: { - ::rtl::OString tmp( OString::valueOf(constValue.m_value.aFloat) ); + OString tmp( OString::valueOf(constValue.m_value.aFloat) ); o << "(float)" << tmp.getStr(); } break; case RT_TYPE_DOUBLE: { - ::rtl::OString tmp( OString::valueOf(constValue.m_value.aDouble) ); + OString tmp( OString::valueOf(constValue.m_value.aDouble) ); o << "(double)" << tmp.getStr(); } break; case RT_TYPE_STRING: { - ::rtl::OUString aUStr(constValue.m_value.aString); - ::rtl::OString aStr = ::rtl::OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US); - o << "::rtl::OUString( \"" << aStr.getStr() << "\" )"; + OUString aUStr(constValue.m_value.aString); + OString aStr = OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US); + o << "rtl::OUString( \"" << aStr.getStr() << "\" )"; } break; } @@ -1392,7 +1389,7 @@ void InterfaceType::dumpDeclaration(FileStream& o) for (sal_Int16 i = 0; i < m_reader.getSuperTypeCount(); ++i) { o << (i == 0 ? " :" : ",") << " public " - << scopedCppName(rtl::OUStringToOString( + << scopedCppName(OUStringToOString( m_reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8)); } @@ -1458,9 +1455,9 @@ void InterfaceType::dumpAttributes(FileStream& o) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - rtl::OUString name(m_reader.getFieldName(i)); - fieldName = rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + OUString name(m_reader.getFieldName(i)); + fieldName = OUStringToOString(name, RTL_TEXTENCODING_UTF8); + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); bool depr = m_isDeprecated @@ -1517,9 +1514,9 @@ void InterfaceType::dumpMethods(FileStream& o) continue; } - methodName = rtl::OUStringToOString( + methodName = OUStringToOString( m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8); - returnType = rtl::OUStringToOString( + returnType = OUStringToOString( m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8); paramCount = m_reader.getMethodParameterCount(i); @@ -1551,9 +1548,9 @@ void InterfaceType::dumpMethods(FileStream& o) o << " SAL_CALL " << methodName << "( "; for (sal_uInt16 j=0; j < paramCount; j++) { - paramName = rtl::OUStringToOString( + paramName = OUStringToOString( m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8); - paramType = rtl::OUStringToOString( + paramType = OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8); paramMode = m_reader.getMethodParameterFlags(i, j); @@ -1607,7 +1604,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o) o << indent() << "aSuperTypes[" << i << "] = ::cppu::UnoType< "; dumpType( o, - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8), true, false, false, true); o << " >::get().getTypeLibType();\n"; @@ -1651,7 +1648,7 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "{\n"; inc(); - o << indent() << "::rtl::OUString sTypeName( \"" + o << indent() << "rtl::OUString sTypeName( \"" << m_typeName.replace('/', '.') << "\" );\n\n"; o << indent() << "// Start inline typedescription generation\n" @@ -1664,7 +1661,7 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "aSuperTypes[" << i << "] = ::cppu::UnoType< "; dumpType( o, - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8), false, false, false, true); o << " >::get().getTypeLibType();\n"; @@ -1798,10 +1795,10 @@ void InterfaceType::dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - o << indent() << "::rtl::OUString sAttributeName" << i << "( \"" + o << indent() << "rtl::OUString sAttributeName" << i << "( \"" << scope.replace('/', '.') << "::" << fieldName << "\" );\n"; o << indent() << "typelib_typedescriptionreference_new( &pMembers[" << index << "],\n"; @@ -1826,10 +1823,10 @@ void InterfaceType::dumpCppuMethodRefs(FileStream& o, sal_uInt32& index) continue; } - methodName = rtl::OUStringToOString( + methodName = OUStringToOString( m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8); - o << indent() << "::rtl::OUString sMethodName" << i << "( \"" + o << indent() << "rtl::OUString sMethodName" << i << "( \"" << scope.replace('/', '.') << "::" << methodName << "\" );\n"; o << indent() << "typelib_typedescriptionreference_new( &pMembers[" << index << "],\n"; @@ -1878,7 +1875,7 @@ private: void calculate(typereg::Reader const & reader); rtl::Reference< TypeManager > manager; - std::set< rtl::OString > set; + std::set< OString > set; sal_Int32 offset; }; @@ -1895,7 +1892,7 @@ void BaseOffset::calculateBases(typereg::Reader const & reader) { for (sal_Int16 i = 0; i < reader.getSuperTypeCount(); ++i) { typereg::Reader super( manager->getTypeReader( - rtl::OUStringToOString( + OUStringToOString( reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8))); if (super.isValid()) { calculate(super); @@ -1905,7 +1902,7 @@ void BaseOffset::calculateBases(typereg::Reader const & reader) { void BaseOffset::calculate(typereg::Reader const & reader) { if (set.insert( - rtl::OUStringToOString(reader.getTypeName(), RTL_TEXTENCODING_UTF8)) + OUStringToOString(reader.getTypeName(), RTL_TEXTENCODING_UTF8)) .second) { calculateBases(reader); @@ -1980,19 +1977,19 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - rtl::OUString name(m_reader.getFieldName(i)); - fieldName = rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8); + OUString name(m_reader.getFieldName(i)); + fieldName = OUStringToOString(name, RTL_TEXTENCODING_UTF8); fieldType = checkRealBaseType( - rtl::OUStringToOString( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8), sal_True); o << indent() << "{\n"; inc(); - o << indent() << "::rtl::OUString sAttributeType" << i << "( \"" + o << indent() << "rtl::OUString sAttributeType" << i << "( \"" << fieldType.replace('/', '.') << "\" );\n"; - o << indent() << "::rtl::OUString sAttributeName" << i << "( \"" + o << indent() << "rtl::OUString sAttributeName" << i << "( \"" << scope.replace('/', '.') << "::" << fieldName << "\" );\n"; sal_Int32 getExceptions = dumpAttributeExceptionTypeNames( @@ -2048,10 +2045,10 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index) continue; } - methodName = rtl::OUStringToOString( + methodName = OUStringToOString( m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8); returnType = checkRealBaseType( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8), sal_True); paramCount = m_reader.getMethodParameterCount(i); @@ -2071,19 +2068,19 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index) for (sal_uInt16 j = 0; j < paramCount; j++) { - paramName = rtl::OUStringToOString( + paramName = OUStringToOString( m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8); paramType = checkRealBaseType( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8), sal_True); paramMode = m_reader.getMethodParameterFlags(i, j); - o << indent() << "::rtl::OUString sParamName" << j << "( \"" + o << indent() << "rtl::OUString sParamName" << j << "( \"" << paramName << "\" );\n"; - o << indent() << "::rtl::OUString sParamType" << j << "( \"" + o << indent() << "rtl::OUString sParamType" << j << "( \"" << paramType.replace('/', '.') << "\" );\n"; o << indent() << "aParameters[" << j << "].pParamName = sParamName" << j << ".pData;\n"; o << indent() << "aParameters[" << j << "].eTypeClass = (typelib_TypeClass)" @@ -2104,9 +2101,9 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index) sal_Int32 excCount = dumpExceptionTypeNames( o, "", i, bWithRuntimeException); - o << indent() << "::rtl::OUString sReturnType" << i << "( \"" + o << indent() << "rtl::OUString sReturnType" << i << "( \"" << returnType.replace('/', '.') << "\" );\n"; - o << indent() << "::rtl::OUString sMethodName" << i << + o << indent() << "rtl::OUString sMethodName" << i << "( \"" << scope.replace('/', '.') << "::" << methodName << "\" );\n"; o << indent() << "typelib_typedescription_newInterfaceMethod( &pMethod,\n"; @@ -2153,9 +2150,9 @@ void InterfaceType::dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTy if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (pFinishedTypes->count(fieldType) == 0) @@ -2175,7 +2172,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes for (sal_uInt16 i=0; i < methodCount; i++) { - returnType = rtl::OUStringToOString( + returnType = OUStringToOString( m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8); paramCount = m_reader.getMethodParameterCount(i); excCount = m_reader.getMethodExceptionCount(i); @@ -2188,7 +2185,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes sal_uInt16 j; for (j=0; j < paramCount; j++) { - paramType = rtl::OUStringToOString( + paramType = OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8); @@ -2201,7 +2198,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes for (j=0; j < excCount; j++) { - excType = rtl::OUStringToOString( + excType = OUStringToOString( m_reader.getMethodExceptionTypeName(i, j), RTL_TEXTENCODING_UTF8); if (pFinishedTypes->count(excType) == 0) @@ -2230,7 +2227,7 @@ void InterfaceType::dumpExceptionSpecification( sal_uInt16 count = m_reader.getMethodExceptionCount( static_cast< sal_uInt16 >(methodIndex)); for (sal_uInt16 i = 0; i < count; ++i) { - rtl::OUString name( + OUString name( m_reader.getMethodExceptionTypeName( static_cast< sal_uInt16 >(methodIndex), i)); if ( name != "com/sun/star/uno/RuntimeException" ) @@ -2240,7 +2237,7 @@ void InterfaceType::dumpExceptionSpecification( } first = false; out << scopedCppName( - rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8)); + OUStringToOString(name, RTL_TEXTENCODING_UTF8)); } } } @@ -2255,7 +2252,7 @@ void InterfaceType::dumpExceptionSpecification( } void InterfaceType::dumpAttributeExceptionSpecification( - FileStream & out, rtl::OUString const & name, RTMethodMode sort) + FileStream & out, OUString const & name, RTMethodMode sort) { sal_uInt16 methodCount = m_reader.getMethodCount(); for (sal_uInt16 i = 0; i < methodCount; ++i) { @@ -2270,11 +2267,11 @@ void InterfaceType::dumpAttributeExceptionSpecification( } void InterfaceType::dumpExceptionTypeName( - FileStream & out, char const * prefix, sal_uInt32 index, rtl::OUString name) + FileStream & out, char const * prefix, sal_uInt32 index, OUString name) { - out << indent() << "::rtl::OUString the_" << prefix << "ExceptionName" + out << indent() << "rtl::OUString the_" << prefix << "ExceptionName" << index << "( \"" - << rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).replace('/', '.') + << OUStringToOString(name, RTL_TEXTENCODING_UTF8).replace('/', '.') << "\" );\n"; } @@ -2285,7 +2282,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames( sal_Int32 count = 0; sal_uInt16 n = m_reader.getMethodExceptionCount(methodIndex); for (sal_uInt16 i = 0; i < n; ++i) { - rtl::OUString name(m_reader.getMethodExceptionTypeName(methodIndex, i)); + OUString name(m_reader.getMethodExceptionTypeName(methodIndex, i)); if ( name != "com/sun/star/uno/RuntimeException" ) { dumpExceptionTypeName(out, prefix, count++, name); @@ -2294,7 +2291,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames( if (runtimeException) { dumpExceptionTypeName( out, prefix, count++, - rtl::OUString("com/sun/star/uno/RuntimeException")); + OUString("com/sun/star/uno/RuntimeException")); } if (count > 0) { out << indent() << "rtl_uString * the_" << prefix << "Exceptions[] = {"; @@ -2308,7 +2305,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames( } sal_Int32 InterfaceType::dumpAttributeExceptionTypeNames( - FileStream & out, char const * prefix, rtl::OUString const & name, + FileStream & out, char const * prefix, OUString const & name, RTMethodMode sort) { sal_uInt16 methodCount = m_reader.getMethodCount(); @@ -2397,9 +2394,9 @@ void ConstantsType::dumpDeclaration(FileStream& o) OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); o << "static const "; @@ -2429,7 +2426,7 @@ sal_Bool ConstantsType::dumpHxxFile( OString headerDefine(dumpHeaderDefine(o, "HPP", bSpecialDefine)); o << "\n"; - rtl::OString suffix; + OString suffix; if (bSpecialDefine) { suffix = m_name; } @@ -2456,9 +2453,9 @@ ModuleType::~ModuleType() } bool ModuleType::dumpFiles( - CppuOptions * options, rtl::OString const & outPath) + CppuOptions * options, OString const & outPath) { - rtl::OString tmpName(m_typeName); + OString tmpName(m_typeName); if (tmpName == "/") { tmpName = "global"; } else { @@ -2474,7 +2471,7 @@ bool ModuleType::dumpFiles( namespace { -void dumpTypeParameterName(FileStream & out, rtl::OString const & name) { +void dumpTypeParameterName(FileStream & out, OString const & name) { // Prefix all type parameters with "typeparam_" to avoid problems when a // struct member has the same name as a type parameter, as in // struct { T T; }; @@ -2514,9 +2511,9 @@ void StructureType::dumpDeclaration(FileStream& o) o << indent(); dumpTemplateHead(o); o << "struct " << m_name; - rtl::OString base; + OString base; if (m_reader.getSuperTypeCount() != 0) { - base = rtl::OUStringToOString( + base = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); OSL_ASSERT(!base.isEmpty()); //TODO } @@ -2535,8 +2532,8 @@ void StructureType::dumpDeclaration(FileStream& o) o << ", "; } prev = true; - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { @@ -2546,7 +2543,7 @@ void StructureType::dumpDeclaration(FileStream& o) dumpType(o, type, true, true); } o << " " - << rtl::OUStringToOString( + << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8) << "_"; } @@ -2559,8 +2556,8 @@ void StructureType::dumpDeclaration(FileStream& o) bool parameterized = ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0); - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if (parameterized) { dumpTypeParameterName(o, type); @@ -2568,7 +2565,7 @@ void StructureType::dumpDeclaration(FileStream& o) dumpType(o, type); } o << " " - << rtl::OUStringToOString( + << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); if (i == 0 && !base.isEmpty() && type != "double" && type != "hyper" && type != "unsigned hyper") @@ -2609,7 +2606,7 @@ sal_Bool StructureType::dumpHxxFile( inc(); OString superType; if (m_reader.getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } sal_Bool first = sal_True; @@ -2631,7 +2628,7 @@ sal_Bool StructureType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); if (first) @@ -2666,9 +2663,9 @@ sal_Bool StructureType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (superHasMember) @@ -2703,7 +2700,7 @@ sal_Bool StructureType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); if (first) @@ -2734,8 +2731,8 @@ sal_Bool StructureType::dumpHxxFile( if (i > 0) { o << ", "; } - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { @@ -2745,7 +2742,7 @@ sal_Bool StructureType::dumpHxxFile( dumpType(o, type, true, true); } o << " " - << rtl::OUStringToOString( + << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8) << "_"; } @@ -2759,7 +2756,7 @@ sal_Bool StructureType::dumpHxxFile( if (i > 0) { o << ", "; } - o << rtl::OUStringToOString( + o << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8) << "_"; } @@ -2791,16 +2788,16 @@ void StructureType::dumpLightGetCppuType(FileStream & out) { << indent() << "if (the_type == 0) {\n"; inc(); if (isPolymorphic()) { - out << indent() << "::rtl::OStringBuffer the_buffer(\"" + out << indent() << "OStringBuffer the_buffer(\"" << m_typeName.replace('/', '.') << "<\");\n"; sal_uInt16 n = m_reader.getReferenceCount(); for (sal_uInt16 i = 0; i < n; ++i) { out << indent() - << ("the_buffer.append(::rtl::OUStringToOString(" + << ("the_buffer.append(rtl::OUStringToOString(" "::cppu::getTypeFavourChar(static_cast< "); dumpTypeParameterName( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8)); out << " * >(0)).getTypeName(), RTL_TEXTENCODING_UTF8));\n"; if (i != n - 1) { @@ -2835,16 +2832,16 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) { << indent() << "if (the_type == 0) {\n"; inc(); if (isPolymorphic()) { - out << indent() << "::rtl::OStringBuffer the_buffer(\"" + out << indent() << "OStringBuffer the_buffer(\"" << m_typeName.replace('/', '.') << "<\");\n"; sal_uInt16 n = m_reader.getReferenceCount(); for (sal_uInt16 i = 0; i < n; ++i) { out << indent() - << ("the_buffer.append(::rtl::OUStringToOString(" + << ("the_buffer.append(rtl::OUStringToOString(" "::cppu::getTypeFavourChar(static_cast< "); dumpTypeParameterName( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8)); out << " * >(0)).getTypeName(), RTL_TEXTENCODING_UTF8));\n"; if (i != n - 1) { @@ -2859,8 +2856,8 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) { sal_uInt16 fields = m_reader.getFieldCount(); for (sal_uInt16 i = 0; i < fields; ++i) { out << indent(); - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { out << "::cppu::getTypeFavourChar(static_cast< "; @@ -2901,7 +2898,7 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) { out << "::cppu::UnoType< "; dumpType( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8), false, false, false, true); out << " >::get().getTypeLibType()"; @@ -2950,7 +2947,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) << "the_buffer.append(::cppu::getTypeFavourChar(static_cast< "; dumpTypeParameterName( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8)); out << " * >(0)).getTypeName());\n"; if (i != n - 1) { @@ -2969,12 +2966,12 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) << m_typeName.replace('/', '.') << "\" );\n"; } sal_uInt16 fields = m_reader.getFieldCount(); - typedef std::map< rtl::OString, sal_uInt32 > Map; + typedef std::map< OString, sal_uInt32 > Map; Map parameters; Map types; for (sal_uInt16 i = 0; i < fields; ++i) { - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { if (parameters.insert( @@ -2991,7 +2988,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) << "::typelib_TypeClass the_pclass" << n << " = (::typelib_TypeClass) the_ptype" << n << ".getTypeClass();\n" << indent() - << "::rtl::OUString the_pname" << n << "(the_ptype" << n + << "rtl::OUString the_pname" << n << "(the_ptype" << n << ".getTypeName());\n"; } } else if (types.insert( @@ -3013,14 +3010,14 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) // above getCppuType call will make available information about the // resolved type); no extra #include for the resolved type is // needed, as the header for the typedef includes it already: - out << indent() << "::rtl::OUString the_tname" + out << indent() << "rtl::OUString the_tname" << static_cast< sal_uInt32 >(types.size() - 1) << "( \"" << checkRealBaseType(type, true).replace('/', '.') << "\" );\n"; } - out << indent() << "::rtl::OUString the_name" << i + out << indent() << "rtl::OUString the_name" << i << "( \"" - << rtl::OUStringToOString( + << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8).replace( '/', '.') << "\" );\n"; @@ -3029,8 +3026,8 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) inc(); for (sal_uInt16 i = 0; i < fields; ++i) { out << indent() << "{ { "; - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { sal_uInt32 n = parameters.find(type)->second; @@ -3054,7 +3051,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) out << "::cppu::UnoType< "; dumpType( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8), false, false, false, true); out << " >::get().getTypeLibType()"; @@ -3094,9 +3091,9 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType, if (aSuperReader.isValid()) { - rtl::OString superSuper; + OString superSuper; if (aSuperReader.getSuperTypeCount() >= 1) { - superSuper = rtl::OUStringToOString( + superSuper = OUStringToOString( aSuperReader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } hasMember = dumpSuperMember(o, superSuper, bWithType); @@ -3112,9 +3109,9 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType, if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( aSuperReader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( aSuperReader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (hasMember) @@ -3203,7 +3200,7 @@ void StructureType::dumpTemplateHead(FileStream & out) const { out << "typename "; dumpTypeParameterName( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8)); } out << " > "; @@ -3222,7 +3219,7 @@ void StructureType::dumpTemplateParameters(FileStream & out) const { && m_reader.getReferenceSort(i) == RT_REF_TYPE_PARAMETER); dumpTypeParameterName( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8)); } out << " >"; @@ -3259,7 +3256,7 @@ void ExceptionType::dumpDeclaration(FileStream& o) OString superType; if (m_reader.getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } if (!superType.isEmpty()) @@ -3289,9 +3286,9 @@ void ExceptionType::dumpDeclaration(FileStream& o) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (superHasMember) @@ -3317,9 +3314,9 @@ void ExceptionType::dumpDeclaration(FileStream& o) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); o << indent(); @@ -3358,7 +3355,7 @@ sal_Bool ExceptionType::dumpHxxFile( inc(); OString superType; if (m_reader.getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } sal_Bool first = sal_True; @@ -3380,7 +3377,7 @@ sal_Bool ExceptionType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); if (first) @@ -3420,9 +3417,9 @@ sal_Bool ExceptionType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (superHasMember) @@ -3452,7 +3449,7 @@ sal_Bool ExceptionType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); if (first) @@ -3486,8 +3483,8 @@ sal_Bool ExceptionType::dumpHxxFile( first = false; } for (sal_uInt16 i = 0; i < fieldCount; ++i) { - rtl::OString name( - rtl::OUStringToOString( + OString name( + OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)); o << (first ? ": " : ", ") << name << "(the_other." << name << ")"; first = false; @@ -3505,8 +3502,8 @@ sal_Bool ExceptionType::dumpHxxFile( << "::operator =(the_other);\n"; } for (sal_uInt16 i = 0; i < fieldCount; ++i) { - rtl::OString name( - rtl::OUStringToOString( + OString name( + OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)); o << indent() << name << " = the_other." << name << ";\n"; } @@ -3535,9 +3532,9 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType, if (aSuperReader.isValid()) { - rtl::OString superSuper; + OString superSuper; if (aSuperReader.getSuperTypeCount() >= 1) { - superSuper = rtl::OUStringToOString( + superSuper = OUStringToOString( aSuperReader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } hasMember = dumpSuperMember(o, superSuper, bWithType); @@ -3553,9 +3550,9 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType, if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( aSuperReader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( aSuperReader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (hasMember) @@ -3620,7 +3617,7 @@ void EnumType::dumpDeclaration(FileStream& o) if (access != RT_ACCESS_CONST) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); constValue = m_reader.getFieldValue(i); @@ -3669,7 +3666,7 @@ void EnumType::dumpNormalGetCppuType(FileStream& o) inc(31); o << indent() << "\"" << m_typeName.replace('/', '.') << "\",\n" << indent() << scopedCppName(m_typeName) << "_" - << rtl::OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8) + << OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8) << " );\n"; dec(31); dec(); @@ -3697,7 +3694,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "{\n"; inc(); - o << indent() << "::rtl::OUString sTypeName( \"" + o << indent() << "rtl::OUString sTypeName( \"" << m_typeName.replace('/', '.') << "\" );\n\n"; o << indent() << "// Start inline typedescription generation\n" @@ -3708,9 +3705,9 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o) sal_uInt16 i; for (i = 0; i < count; i++) { - o << indent() << "::rtl::OUString sEnumValue" << i + o << indent() << "rtl::OUString sEnumValue" << i << "( \"" - << rtl::OUStringToOString( + << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8) << "\" );\n"; o << indent() << "enumValueNames[" << i << "] = sEnumValue" << i @@ -3736,7 +3733,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "sTypeName.pData,\n" << indent() << "(sal_Int32)" << scopedCppName(m_typeName, sal_False) << "_" - << rtl::OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8) + << OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8) << ",\n" << indent() << count << ", enumValueNames, enumValues );\n\n"; dec(); @@ -3813,7 +3810,7 @@ void TypeDefType::dumpDeclaration(FileStream& o) o << "\ntypedef "; dumpType( o, - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8)); o << " " << m_name << ";\n\n"; } @@ -3845,7 +3842,7 @@ sal_Bool ConstructiveType::dumpHFile( } bool ConstructiveType::dumpFiles( - CppuOptions * options, rtl::OString const & outPath) + CppuOptions * options, OString const & outPath) { return dumpFile(options, ".hpp", m_typeName, outPath); } @@ -3905,7 +3902,7 @@ sal_Bool ServiceType::dumpHxxFile( for (sal_uInt16 j = 0; j < params; ++j) { if (codemaker::UnoType::getSort( codemaker::UnoType::decompose( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterTypeName( i, j), RTL_TEXTENCODING_UTF8), @@ -3922,7 +3919,7 @@ sal_Bool ServiceType::dumpHxxFile( ++j) { tree.add( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodExceptionTypeName(i, j), RTL_TEXTENCODING_UTF8), m_typeMgr); @@ -3935,9 +3932,9 @@ sal_Bool ServiceType::dumpHxxFile( } } } - rtl::OString cppName(translateUnoToCppIdentifier( + OString cppName(translateUnoToCppIdentifier( m_name, "service", isGlobal())); - rtl::OString headerDefine(dumpHeaderDefine(o, "HPP")); + OString headerDefine(dumpHeaderDefine(o, "HPP")); o << "\n"; includes.dump(o, 0); o << "\n"; @@ -3947,12 +3944,12 @@ sal_Bool ServiceType::dumpHxxFile( o << "\nclass " << cppName << " {\n"; inc(); if (ctors > 0) { - rtl::OString fullName(m_typeName.replace('/', '.')); - rtl::OString baseName( - rtl::OUStringToOString( + OString fullName(m_typeName.replace('/', '.')); + OString baseName( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8)); - rtl::OString fullBaseName(baseName.replace('/', '.')); - rtl::OString scopedBaseName(scopedCppName(baseName)); + OString fullBaseName(baseName.replace('/', '.')); + OString scopedBaseName(scopedCppName(baseName)); o << "public:\n"; for (sal_uInt16 i = 0; i < ctors; ++i) { if (isDefaultConstructor(i)) { @@ -3972,7 +3969,7 @@ sal_Bool ServiceType::dumpHxxFile( << "the_instance = ::com::sun::star::uno::Reference< " << scopedBaseName << (" >(the_context->getServiceManager()->" - "createInstanceWithContext(::rtl::OUString(" + "createInstanceWithContext(rtl::OUString(" " \"") << fullName << "\" ), the_context), ::com::sun::star::uno::UNO_QUERY);\n"; @@ -3988,7 +3985,7 @@ sal_Bool ServiceType::dumpHxxFile( inc(); o << indent() << ("throw ::com::sun::star::uno::DeploymentException(" - "::rtl::OUString( " + "rtl::OUString( " "\"component context fails to supply service ") << fullName << " of type " << fullBaseName << ": \" ) + the_exception.Message, the_context);\n"; @@ -3998,7 +3995,7 @@ sal_Bool ServiceType::dumpHxxFile( inc(); o << indent() << ("throw ::com::sun::star::uno::DeploymentException(" - "::rtl::OUString( " + "rtl::OUString( " "\"component context fails to supply service ") << fullName << " of type " << fullBaseName << "\" ), the_context);\n"; @@ -4010,7 +4007,7 @@ sal_Bool ServiceType::dumpHxxFile( o << indent() << "static ::com::sun::star::uno::Reference< " << scopedBaseName << " > " << translateUnoToCppIdentifier( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8), "method", ITM_NONGLOBAL, &cppName) << ("(::com::sun::star::uno::Reference<" @@ -4020,22 +4017,22 @@ sal_Bool ServiceType::dumpHxxFile( bool rest = hasRestParameter(i); for (sal_uInt16 j = 0; j < params; ++j) { o << ", "; - rtl::OStringBuffer buf; + OStringBuffer buf; if ((m_reader.getMethodParameterFlags(i, j) & RT_PARAM_REST) != 0) { buf.append("[]"); } buf.append( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8)); - rtl::OString type(buf.makeStringAndClear()); + OString type(buf.makeStringAndClear()); bool byRef = passByReference(type); dumpType(o, type, byRef, byRef); o << " " << translateUnoToCppIdentifier( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8), "param", ITM_NONGLOBAL); @@ -4050,16 +4047,16 @@ sal_Bool ServiceType::dumpHxxFile( << params << ");\n"; for (sal_uInt16 j = 0; j < params; ++j) { o << indent() << "the_arguments[" << j << "] "; - rtl::OString param( + OString param( translateUnoToCppIdentifier( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8), "param", ITM_NONGLOBAL)); sal_Int32 rank; if (codemaker::UnoType::getSort( codemaker::UnoType::decompose( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterTypeName( i, j), RTL_TEXTENCODING_UTF8), @@ -4088,7 +4085,7 @@ sal_Bool ServiceType::dumpHxxFile( sal_uInt16 exceptions = m_reader.getMethodExceptionCount(i); for (sal_uInt16 j = 0; j < exceptions; ++j) { tree.add( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodExceptionTypeName(i, j), RTL_TEXTENCODING_UTF8), m_typeMgr); @@ -4101,12 +4098,12 @@ sal_Bool ServiceType::dumpHxxFile( << "the_instance = ::com::sun::star::uno::Reference< " << scopedBaseName << (" >(the_context->getServiceManager()->" - "createInstanceWithArgumentsAndContext(::rtl::OUString(" + "createInstanceWithArgumentsAndContext(rtl::OUString(" " \"") << fullName << "\" ), "; if (rest) { o << translateUnoToCppIdentifier( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterName(i, 0), RTL_TEXTENCODING_UTF8), "param", ITM_NONGLOBAL); @@ -4132,7 +4129,7 @@ sal_Bool ServiceType::dumpHxxFile( inc(); o << indent() << ("throw ::com::sun::star::uno::DeploymentException(" - "::rtl::OUString( " + "rtl::OUString( " "\"component context fails to supply service ") << fullName << " of type " << fullBaseName << ": \" ) + the_exception.Message, the_context);\n"; @@ -4143,7 +4140,7 @@ sal_Bool ServiceType::dumpHxxFile( inc(); o << indent() << ("throw ::com::sun::star::uno::DeploymentException(" - "::rtl::OUString( " + "rtl::OUString( " "\"component context fails to supply service ") << fullName << " of type " << fullBaseName << "\" ), the_context);\n"; @@ -4172,7 +4169,7 @@ void ServiceType::addSpecialDependencies() { if (m_reader.getMethodCount() > 0) { OSL_ASSERT(m_reader.getSuperTypeCount() == 1); m_dependencies.add( - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8)); } } @@ -4213,7 +4210,7 @@ void ServiceType::dumpCatchClauses( bool SingletonType::isInterfaceBased() { return (m_typeMgr->getTypeClass( - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8))) == RT_TYPE_INTERFACE; } @@ -4222,15 +4219,15 @@ sal_Bool SingletonType::dumpHxxFile( FileStream & o, codemaker::cppumaker::Includes & includes) throw (CannotDumpException) { - rtl::OString cppName(translateUnoToCppIdentifier( + OString cppName(translateUnoToCppIdentifier( m_name, "singleton", isGlobal())); - rtl::OString fullName(m_typeName.replace('/', '.')); - rtl::OString baseName( - rtl::OUStringToOString( + OString fullName(m_typeName.replace('/', '.')); + OString baseName( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8)); - rtl::OString fullBaseName(baseName.replace('/', '.')); - rtl::OString scopedBaseName(scopedCppName(baseName)); - rtl::OString headerDefine(dumpHeaderDefine(o, "HPP")); + OString fullBaseName(baseName.replace('/', '.')); + OString scopedBaseName(scopedCppName(baseName)); + OString headerDefine(dumpHeaderDefine(o, "HPP")); o << "\n"; //TODO: Decide whether the types added to includes should rather be added to // m_dependencies (and thus be generated during dumpDependedTypes): @@ -4259,12 +4256,12 @@ sal_Bool SingletonType::dumpHxxFile( << "::com::sun::star::uno::Reference< " << scopedBaseName << " > instance;\n" << indent() << ("if (!(the_context->getValueByName(" - "::rtl::OUString( \"/singletons/") + "rtl::OUString( \"/singletons/") << fullName << "\" )) >>= instance) || !instance.is()) {\n"; inc(); o << indent() << ("throw ::com::sun::star::uno::DeploymentException(" - "::rtl::OUString( \"component context" + "rtl::OUString( \"component context" " fails to supply singleton ") << fullName << " of type " << fullBaseName << "\" ), the_context);\n"; dec(); diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx index 09d0e5130ffa..9d92a014b8bd 100644 --- a/codemaker/source/cppumaker/cpputype.hxx +++ b/codemaker/source/cppumaker/cpputype.hxx @@ -29,7 +29,6 @@ #include "rtl/ref.hxx" #include "rtl/string.hxx" -namespace rtl { class OUString; } namespace codemaker { namespace cppumaker { class Includes; } struct ExceptionTreeNode; @@ -50,23 +49,23 @@ class CppuType { public: CppuType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~CppuType(); virtual sal_Bool dump(CppuOptions* pOptions) throw( CannotDumpException ); sal_Bool dumpFile(CppuOptions* pOptions, - const ::rtl::OString& sExtension, - const ::rtl::OString& sName, - const ::rtl::OString& sOutPath ) + const OString& sExtension, + const OString& sName, + const OString& sOutPath ) throw( CannotDumpException ); void dumpDependedTypes( codemaker::GeneratedTypeSet & generated, CppuOptions * options); virtual sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ) = 0; virtual sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ) = 0; - ::rtl::OString dumpHeaderDefine( + OString dumpHeaderDefine( FileStream& o, char const * prefix, sal_Bool bExtended=sal_False); void dumpGetCppuType(FileStream & out); @@ -74,13 +73,13 @@ public: virtual void dumpNormalGetCppuType(FileStream& o); virtual void dumpComprehensiveGetCppuType(FileStream& o); - virtual void dumpType(FileStream& o, const ::rtl::OString& type, bool bConst=false, + virtual void dumpType(FileStream& o, const OString& type, bool bConst=false, bool bRef=false, bool bNative=false, bool cppuUnoType=false) const throw( CannotDumpException ); - ::rtl::OString getTypeClass(const ::rtl::OString& type="", sal_Bool bCStyle=sal_False); - void dumpCppuGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, CppuTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES); + OString getTypeClass(const OString& type="", sal_Bool bCStyle=sal_False); + void dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDecl=sal_False, CppuTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES); - ::rtl::OString typeToIdentifier(const ::rtl::OString& type); + OString typeToIdentifier(const OString& type); void dumpConstantValue(FileStream& o, sal_uInt16 index); @@ -89,15 +88,15 @@ public: void inc(sal_Int32 num=4); void dec(sal_Int32 num=4); - ::rtl::OString indent() const; + OString indent() const; protected: virtual sal_uInt32 checkInheritedMemberCount( const typereg::Reader* pReader); - bool passByReference(rtl::OString const & unoType); + bool passByReference(OString const & unoType); - ::rtl::OString resolveTypedefs(const ::rtl::OString& type) const; - ::rtl::OString checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False) const; + OString resolveTypedefs(const OString& type) const; + OString checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly = sal_False) const; void dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag); codemaker::cpp::IdentifierTranslationMode isGlobal() const; @@ -106,7 +105,7 @@ protected: virtual void addSpecialDependencies() {} - virtual bool dumpFiles(CppuOptions * options, rtl::OString const & outPath); + virtual bool dumpFiles(CppuOptions * options, OString const & outPath); virtual void addLightGetCppuTypeIncludes( codemaker::cppumaker::Includes & includes) const; @@ -131,7 +130,7 @@ protected: void addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes) const; void dumpInitializer( - FileStream & out, bool parameterized, rtl::OUString const & type) const; + FileStream & out, bool parameterized, OUString const & type) const; void dumpHFileContent( FileStream & out, codemaker::cppumaker::Includes & includes); @@ -142,8 +141,8 @@ protected: bool m_cppuTypeLeak; bool m_cppuTypeDynamic; sal_Int32 m_indentLength; - ::rtl::OString m_typeName; - ::rtl::OString m_name; + OString m_typeName; + OString m_name; typereg::Reader m_reader; rtl::Reference< TypeManager > m_typeMgr; codemaker::Dependencies m_dependencies; @@ -157,7 +156,7 @@ class InterfaceType : public CppuType { public: InterfaceType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~InterfaceType(); @@ -199,18 +198,18 @@ private: FileStream & out, sal_uInt32 methodIndex, bool runtimeException); void dumpAttributeExceptionSpecification( - FileStream & out, rtl::OUString const & name, RTMethodMode sort); + FileStream & out, OUString const & name, RTMethodMode sort); void dumpExceptionTypeName( FileStream & out, char const * prefix, sal_uInt32 index, - rtl::OUString name); + OUString name); sal_Int32 dumpExceptionTypeNames( FileStream & out, char const * prefix, sal_uInt16 methodIndex, bool runtimeException); sal_Int32 dumpAttributeExceptionTypeNames( - FileStream & out, char const * prefix, rtl::OUString const & name, + FileStream & out, char const * prefix, OUString const & name, RTMethodMode sort); }; @@ -218,7 +217,7 @@ class ConstantsType : public CppuType { public: ConstantsType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~ConstantsType(); @@ -235,20 +234,20 @@ class ModuleType : public ConstantsType { public: ModuleType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~ModuleType(); protected: - virtual bool dumpFiles(CppuOptions * options, rtl::OString const & outPath); + virtual bool dumpFiles(CppuOptions * options, OString const & outPath); }; class StructureType : public CppuType { public: StructureType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~StructureType(); @@ -263,7 +262,7 @@ public: virtual void dumpComprehensiveGetCppuType(FileStream & out); - sal_Bool dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType); + sal_Bool dumpSuperMember(FileStream& o, const OString& super, sal_Bool bWithType); protected: virtual void addLightGetCppuTypeIncludes( @@ -286,7 +285,7 @@ class ExceptionType : public CppuType { public: ExceptionType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~ExceptionType(); @@ -295,14 +294,14 @@ public: sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - sal_Bool dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType); + sal_Bool dumpSuperMember(FileStream& o, const OString& super, sal_Bool bWithType); }; class EnumType : public CppuType { public: EnumType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~EnumType(); @@ -319,7 +318,7 @@ class TypeDefType : public CppuType { public: TypeDefType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~TypeDefType(); @@ -332,7 +331,7 @@ public: class ConstructiveType: public CppuType { public: ConstructiveType( - typereg::Reader & reader, rtl::OString const & name, + typereg::Reader & reader, OString const & name, rtl::Reference< TypeManager > const & manager): CppuType(reader, name, manager) {} @@ -341,13 +340,13 @@ public: throw (CannotDumpException); protected: - virtual bool dumpFiles(CppuOptions * options, rtl::OString const & outPath); + virtual bool dumpFiles(CppuOptions * options, OString const & outPath); }; class ServiceType: public ConstructiveType { public: ServiceType( - typereg::Reader & reader, rtl::OString const & name, + typereg::Reader & reader, OString const & name, rtl::Reference< TypeManager > const & manager): ConstructiveType(reader, name, manager) {} @@ -371,7 +370,7 @@ private: class SingletonType: public ConstructiveType { public: SingletonType( - typereg::Reader & reader, rtl::OString const & name, + typereg::Reader & reader, OString const & name, rtl::Reference< TypeManager > const & manager): ConstructiveType(reader, name, manager) {} @@ -382,7 +381,7 @@ public: throw (CannotDumpException); }; -bool produceType(const ::rtl::OString& typeName, +bool produceType(const OString& typeName, rtl::Reference< TypeManager > const & typeMgr, codemaker::GeneratedTypeSet & generated, CppuOptions* pOptions) diff --git a/codemaker/source/cppumaker/dumputils.cxx b/codemaker/source/cppumaker/dumputils.cxx index a92aaf5ecc5e..bc1781314789 100644 --- a/codemaker/source/cppumaker/dumputils.cxx +++ b/codemaker/source/cppumaker/dumputils.cxx @@ -30,13 +30,13 @@ namespace codemaker { namespace cppumaker { bool dumpNamespaceOpen( - FileStream & out, rtl::OString const & registryType, bool fullModuleType) + FileStream & out, OString const & registryType, bool fullModuleType) { bool output = false; if (registryType != "/") { bool first = true; for (sal_Int32 i = 0; i >= 0;) { - rtl::OString id(registryType.getToken(0, '/', i)); + OString id(registryType.getToken(0, '/', i)); if (fullModuleType || i >= 0) { if (!first) { out << " "; @@ -51,7 +51,7 @@ bool dumpNamespaceOpen( } bool dumpNamespaceClose( - FileStream & out, rtl::OString const & registryType, bool fullModuleType) + FileStream & out, OString const & registryType, bool fullModuleType) { bool output = false; if (registryType != "/") { @@ -74,7 +74,7 @@ bool dumpNamespaceClose( return output; } -void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType) { +void dumpTypeIdentifier(FileStream & out, OString const & registryType) { out << registryType.copy(registryType.lastIndexOf('/') + 1); } diff --git a/codemaker/source/cppumaker/dumputils.hxx b/codemaker/source/cppumaker/dumputils.hxx index 5705d6a1abea..855e412534de 100644 --- a/codemaker/source/cppumaker/dumputils.hxx +++ b/codemaker/source/cppumaker/dumputils.hxx @@ -20,18 +20,19 @@ #ifndef INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_DUMPUTILS_HXX #define INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_DUMPUTILS_HXX -namespace rtl { class OString; } +#include + class FileStream; namespace codemaker { namespace cppumaker { bool dumpNamespaceOpen( - FileStream & out, rtl::OString const & registryType, bool fullModuleType); + FileStream & out, OString const & registryType, bool fullModuleType); bool dumpNamespaceClose( - FileStream & out, rtl::OString const & registryType, bool fullModuleType); + FileStream & out, OString const & registryType, bool fullModuleType); -void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType); +void dumpTypeIdentifier(FileStream & out, OString const & registryType); } } diff --git a/codemaker/source/cppumaker/includes.cxx b/codemaker/source/cppumaker/includes.cxx index 0b0f83b869b7..34f23e954bf1 100644 --- a/codemaker/source/cppumaker/includes.cxx +++ b/codemaker/source/cppumaker/includes.cxx @@ -68,10 +68,10 @@ Includes::Includes( Includes::~Includes() {} -void Includes::add(rtl::OString const & registryType) { +void Includes::add(OString const & registryType) { sal_Int32 rank; - std::vector< rtl::OString > args; - rtl::OString type( + std::vector< OString > args; + OString type( codemaker::UnoType::decompose(registryType, &rank, &args)); if (rank > 0) { m_includeSequence = true; @@ -119,7 +119,7 @@ void Includes::add(rtl::OString const & registryType) { m_map.insert( codemaker::Dependencies::Map::value_type( type, codemaker::Dependencies::KIND_NO_BASE)); - for (std::vector< rtl::OString >::iterator i(args.begin()); + for (std::vector< OString >::iterator i(args.begin()); i != args.end(); ++i) { add(*i); @@ -144,7 +144,7 @@ void dumpEmptyLineBeforeFirst(FileStream & out, bool * first) { } -void Includes::dump(FileStream & out, rtl::OString const * companionHdl) { +void Includes::dump(FileStream & out, OString const * companionHdl) { OSL_ASSERT(companionHdl == 0 || m_hpp); if (!m_includeReference) { for (codemaker::Dependencies::Map::iterator i(m_map.begin()); @@ -264,8 +264,8 @@ void Includes::dump(FileStream & out, rtl::OString const * companionHdl) { } void Includes::dumpInclude( - FileStream & out, rtl::OString const & registryType, bool hpp, - rtl::OString const & suffix) + FileStream & out, OString const & registryType, bool hpp, + OString const & suffix) { static char const * extension[2] = { "hdl", "hpp" }; out << "#include \"" << registryType; @@ -275,7 +275,7 @@ void Includes::dumpInclude( out << "." << extension[hpp] << "\"\n"; } -bool Includes::isInterfaceType(rtl::OString const & registryType) const { +bool Includes::isInterfaceType(OString const & registryType) const { return m_manager->getTypeClass(registryType) == RT_TYPE_INTERFACE; } diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx index 8fdf44589844..80b842cd09d9 100644 --- a/codemaker/source/cppumaker/includes.hxx +++ b/codemaker/source/cppumaker/includes.hxx @@ -37,7 +37,7 @@ public: ~Includes(); - void add(rtl::OString const & registryType); + void add(OString const & registryType); void addCassert() { m_includeCassert = true; } void addAny() { m_includeAny = true; } void addReference() { m_includeReference = true; } @@ -59,17 +59,17 @@ public: void addTypelibTypeclassH() { m_includeTypelibTypeclassH = true; } void addTypelibTypedescriptionH() { m_includeTypelibTypedescriptionH = true; } - void dump(FileStream & out, rtl::OString const * companionHdl); + void dump(FileStream & out, OString const * companionHdl); static void dumpInclude( - FileStream & out, rtl::OString const & registryType, bool hpp, - rtl::OString const & suffix = rtl::OString()); + FileStream & out, OString const & registryType, bool hpp, + OString const & suffix = OString()); private: Includes(Includes &); // not implemented void operator =(Includes); // not implemented; - bool isInterfaceType(rtl::OString const & registryType) const; + bool isInterfaceType(OString const & registryType) const; rtl::Reference< TypeManager > m_manager; codemaker::Dependencies::Map m_map; diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx index 0f115b20b4bf..c427e96952ae 100644 --- a/codemaker/source/javamaker/classfile.cxx +++ b/codemaker/source/javamaker/classfile.cxx @@ -121,7 +121,7 @@ void ClassFile::Code::instrAconstNull() { appendU1(m_code, 0x01); } -void ClassFile::Code::instrAnewarray(rtl::OString const & type) { +void ClassFile::Code::instrAnewarray(OString const & type) { // anewarray : appendU1(m_code, 0xBD); appendU2(m_code, m_classFile.addClassInfo(type)); @@ -137,7 +137,7 @@ void ClassFile::Code::instrAthrow() { appendU1(m_code, 0xBF); } -void ClassFile::Code::instrCheckcast(rtl::OString const & type) { +void ClassFile::Code::instrCheckcast(OString const & type) { // checkcast : appendU1(m_code, 0xC0); appendU2(m_code, m_classFile.addClassInfo(type)); @@ -149,8 +149,8 @@ void ClassFile::Code::instrDup() { } void ClassFile::Code::instrGetstatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // getstatic : appendU1(m_code, 0xB2); @@ -181,15 +181,15 @@ ClassFile::Code::Branch ClassFile::Code::instrIfnull() { return branch; } -void ClassFile::Code::instrInstanceof(rtl::OString const & type) { +void ClassFile::Code::instrInstanceof(OString const & type) { // instanceof : appendU1(m_code, 0xC1); appendU2(m_code, m_classFile.addClassInfo(type)); } void ClassFile::Code::instrInvokeinterface( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor, sal_uInt8 args) + OString const & type, OString const & name, + OString const & descriptor, sal_uInt8 args) { // invokeinterface 0: appendU1(m_code, 0xB9); @@ -200,8 +200,8 @@ void ClassFile::Code::instrInvokeinterface( } void ClassFile::Code::instrInvokespecial( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // invokespecial : appendU1(m_code, 0xB7); @@ -209,8 +209,8 @@ void ClassFile::Code::instrInvokespecial( } void ClassFile::Code::instrInvokestatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // invokestatic : appendU1(m_code, 0xB8); @@ -218,8 +218,8 @@ void ClassFile::Code::instrInvokestatic( } void ClassFile::Code::instrInvokevirtual( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // invokevirtual : appendU1(m_code, 0xB6); @@ -265,7 +265,7 @@ void ClassFile::Code::instrLookupswitch( } } -void ClassFile::Code::instrNew(rtl::OString const & type) { +void ClassFile::Code::instrNew(OString const & type) { // new : appendU1(m_code, 0xBB); appendU2(m_code, m_classFile.addClassInfo(type)); @@ -288,8 +288,8 @@ void ClassFile::Code::instrPop() { } void ClassFile::Code::instrPutfield( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // putfield : appendU1(m_code, 0xB5); @@ -297,8 +297,8 @@ void ClassFile::Code::instrPutfield( } void ClassFile::Code::instrPutstatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // putstatic : appendU1(m_code, 0xB3); @@ -374,7 +374,7 @@ void ClassFile::Code::loadIntegerConstant(sal_Int32 value) { } } -void ClassFile::Code::loadStringConstant(rtl::OString const & value) { +void ClassFile::Code::loadStringConstant(OString const & value) { ldc(m_classFile.addStringInfo(value)); } @@ -411,7 +411,7 @@ void ClassFile::Code::branchHere(Branch branch) { } void ClassFile::Code::addException( - Position start, Position end, Position handler, rtl::OString const & type) + Position start, Position end, Position handler, OString const & type) { OSL_ASSERT(start < end && end <= m_code.size() && handler <= m_code.size()); if (m_exceptionTableLength == SAL_MAX_UINT16) { @@ -466,8 +466,8 @@ void ClassFile::Code::accessLocal( } ClassFile::ClassFile( - AccessFlags accessFlags, rtl::OString const & thisClass, - rtl::OString const & superClass, rtl::OString const & signature): + AccessFlags accessFlags, OString const & thisClass, + OString const & superClass, OString const & signature): m_constantPoolCount(1), m_accessFlags(accessFlags), m_interfacesCount(0), m_fieldsCount(0), m_methodsCount(0), m_attributesCount(0) { @@ -555,7 +555,7 @@ sal_uInt16 ClassFile::addDoubleInfo(double value) { return index; } -void ClassFile::addInterface(rtl::OString const & interface) { +void ClassFile::addInterface(OString const & interface) { if (m_interfacesCount == SAL_MAX_UINT16) { throw CannotDumpException("Too many interfaces for Java class file format"); } @@ -564,9 +564,9 @@ void ClassFile::addInterface(rtl::OString const & interface) { } void ClassFile::addField( - AccessFlags accessFlags, rtl::OString const & name, - rtl::OString const & descriptor, sal_uInt16 constantValueIndex, - rtl::OString const & signature) + AccessFlags accessFlags, OString const & name, + OString const & descriptor, sal_uInt16 constantValueIndex, + OString const & signature) { if (m_fieldsCount == SAL_MAX_UINT16) { throw CannotDumpException("Too many fields for Java class file format"); @@ -588,10 +588,10 @@ void ClassFile::addField( } void ClassFile::addMethod( - AccessFlags accessFlags, rtl::OString const & name, - rtl::OString const & descriptor, Code const * code, - std::vector< rtl::OString > const & exceptions, - rtl::OString const & signature) + AccessFlags accessFlags, OString const & name, + OString const & descriptor, Code const * code, + std::vector< OString > const & exceptions, + OString const & signature) { if (m_methodsCount == SAL_MAX_UINT16) { throw CannotDumpException("Too many methods for Java class file format"); @@ -600,7 +600,7 @@ void ClassFile::addMethod( appendU2(m_methods, static_cast< sal_uInt16 >(accessFlags)); appendU2(m_methods, addUtf8Info(name)); appendU2(m_methods, addUtf8Info(descriptor)); - std::vector< rtl::OString >::size_type excs = exceptions.size(); + std::vector< OString >::size_type excs = exceptions.size(); if (excs > SAL_MAX_UINT16) { throw CannotDumpException("Too many exception specifications for Java class file format"); } @@ -638,7 +638,7 @@ void ClassFile::addMethod( m_methods, static_cast< sal_uInt32 >(2 + 2 * static_cast< sal_uInt32 >(excs))); appendU2(m_methods, static_cast< sal_uInt16 >(excs)); - for (std::vector< rtl::OString >::const_iterator i(exceptions.begin()); + for (std::vector< OString >::const_iterator i(exceptions.begin()); i != exceptions.end(); ++i) { appendU2(m_methods, addClassInfo(*i)); @@ -676,8 +676,8 @@ sal_uInt16 ClassFile::nextConstantPoolIndex(sal_uInt16 width) { return index; } -sal_uInt16 ClassFile::addUtf8Info(rtl::OString const & value) { - std::map< rtl::OString, sal_uInt16 >::iterator i(m_utf8Infos.find(value)); +sal_uInt16 ClassFile::addUtf8Info(OString const & value) { + std::map< OString, sal_uInt16 >::iterator i(m_utf8Infos.find(value)); if (i != m_utf8Infos.end()) { return i->second; } @@ -691,7 +691,7 @@ sal_uInt16 ClassFile::addUtf8Info(rtl::OString const & value) { appendU1(m_constantPool, static_cast< sal_uInt8 >(value[j])); } if (!m_utf8Infos.insert( - std::map< rtl::OString, sal_uInt16 >::value_type(value, index)). + std::map< OString, sal_uInt16 >::value_type(value, index)). second) { OSL_ASSERT(false); @@ -699,7 +699,7 @@ sal_uInt16 ClassFile::addUtf8Info(rtl::OString const & value) { return index; } -sal_uInt16 ClassFile::addClassInfo(rtl::OString const & type) { +sal_uInt16 ClassFile::addClassInfo(OString const & type) { sal_uInt16 nameIndex = addUtf8Info(type); std::map< sal_uInt16, sal_uInt16 >::iterator i( m_classInfos.find(nameIndex)); @@ -718,7 +718,7 @@ sal_uInt16 ClassFile::addClassInfo(rtl::OString const & type) { return index; } -sal_uInt16 ClassFile::addStringInfo(rtl::OString const & value) { +sal_uInt16 ClassFile::addStringInfo(OString const & value) { sal_uInt16 stringIndex = addUtf8Info(value); std::map< sal_uInt16, sal_uInt16 >::iterator i( m_stringInfos.find(stringIndex)); @@ -738,8 +738,8 @@ sal_uInt16 ClassFile::addStringInfo(rtl::OString const & value) { } sal_uInt16 ClassFile::addFieldrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { sal_uInt16 classIndex = addClassInfo(type); sal_uInt16 nameAndTypeIndex = addNameAndTypeInfo(name, descriptor); @@ -762,8 +762,8 @@ sal_uInt16 ClassFile::addFieldrefInfo( } sal_uInt16 ClassFile::addMethodrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { sal_uInt16 classIndex = addClassInfo(type); sal_uInt16 nameAndTypeIndex = addNameAndTypeInfo(name, descriptor); @@ -786,8 +786,8 @@ sal_uInt16 ClassFile::addMethodrefInfo( } sal_uInt16 ClassFile::addInterfaceMethodrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { sal_uInt16 classIndex = addClassInfo(type); sal_uInt16 nameAndTypeIndex = addNameAndTypeInfo(name, descriptor); @@ -811,7 +811,7 @@ sal_uInt16 ClassFile::addInterfaceMethodrefInfo( } sal_uInt16 ClassFile::addNameAndTypeInfo( - rtl::OString const & name, rtl::OString const & descriptor) + OString const & name, OString const & descriptor) { sal_uInt16 nameIndex = addUtf8Info(name); sal_uInt16 descriptorIndex = addUtf8Info(descriptor); @@ -835,7 +835,7 @@ sal_uInt16 ClassFile::addNameAndTypeInfo( } void ClassFile::appendSignatureAttribute( - std::vector< unsigned char > & stream, rtl::OString const & signature) + std::vector< unsigned char > & stream, OString const & signature) { if (!signature.isEmpty()) { appendU2(stream, addUtf8Info("Signature")); diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx index 18913c22ebb2..488660b7a175 100644 --- a/codemaker/source/javamaker/classfile.hxx +++ b/codemaker/source/javamaker/classfile.hxx @@ -29,7 +29,6 @@ #include class FileStream; -namespace rtl { class OString; } namespace codemaker { namespace javamaker { @@ -56,53 +55,53 @@ public: void instrAastore(); void instrAconstNull(); - void instrAnewarray(rtl::OString const & type); + void instrAnewarray(OString const & type); void instrAreturn(); void instrAthrow(); - void instrCheckcast(rtl::OString const & type); + void instrCheckcast(OString const & type); void instrDup(); void instrGetstatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); Branch instrIfAcmpne(); Branch instrIfeq(); Branch instrIfnull(); - void instrInstanceof(rtl::OString const & type); + void instrInstanceof(OString const & type); void instrInvokeinterface( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor, sal_uInt8 args); + OString const & type, OString const & name, + OString const & descriptor, sal_uInt8 args); void instrInvokespecial( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); void instrInvokestatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); void instrInvokevirtual( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); void instrLookupswitch( Code const * defaultBlock, std::list< std::pair< sal_Int32, Code * > > const & blocks); - void instrNew(rtl::OString const & type); + void instrNew(OString const & type); void instrNewarray(codemaker::UnoType::Sort sort); void instrPop(); void instrPutfield( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); void instrPutstatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); void instrReturn(); void instrSwap(); @@ -112,7 +111,7 @@ public: std::list< Code * > const & blocks); void loadIntegerConstant(sal_Int32 value); - void loadStringConstant(rtl::OString const & value); + void loadStringConstant(OString const & value); void loadLocalInteger(sal_uInt16 index); void loadLocalLong(sal_uInt16 index); void loadLocalFloat(sal_uInt16 index); @@ -123,7 +122,7 @@ public: void addException( Position start, Position end, Position handler, - rtl::OString const & type); + OString const & type); void setMaxStackAndLocals(sal_uInt16 maxStack, sal_uInt16 maxLocals) { m_maxStack = maxStack; m_maxLocals = maxLocals; } @@ -152,8 +151,8 @@ public: }; ClassFile( - AccessFlags accessFlags, rtl::OString const & thisClass, - rtl::OString const & superClass, rtl::OString const & signature); + AccessFlags accessFlags, OString const & thisClass, + OString const & superClass, OString const & signature); ~ClassFile(); @@ -164,53 +163,53 @@ public: sal_uInt16 addLongInfo(sal_Int64 value); sal_uInt16 addDoubleInfo(double value); - void addInterface(rtl::OString const & interface); + void addInterface(OString const & interface); void addField( - AccessFlags accessFlags, rtl::OString const & name, - rtl::OString const & descriptor, sal_uInt16 constantValueIndex, - rtl::OString const & signature); + AccessFlags accessFlags, OString const & name, + OString const & descriptor, sal_uInt16 constantValueIndex, + OString const & signature); void addMethod( - AccessFlags accessFlags, rtl::OString const & name, - rtl::OString const & descriptor, Code const * code, - std::vector< rtl::OString > const & exceptions, - rtl::OString const & signature); + AccessFlags accessFlags, OString const & name, + OString const & descriptor, Code const * code, + std::vector< OString > const & exceptions, + OString const & signature); void write(FileStream & file) const; //TODO private: - typedef std::map< rtl::OString, sal_uInt16 > Map; + typedef std::map< OString, sal_uInt16 > Map; ClassFile(ClassFile &); // not implemented void operator =(ClassFile); // not implemented sal_uInt16 nextConstantPoolIndex(sal_uInt16 width); - sal_uInt16 addUtf8Info(rtl::OString const & value); - sal_uInt16 addClassInfo(rtl::OString const & type); - sal_uInt16 addStringInfo(rtl::OString const & value); + sal_uInt16 addUtf8Info(OString const & value); + sal_uInt16 addClassInfo(OString const & type); + sal_uInt16 addStringInfo(OString const & value); sal_uInt16 addFieldrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); sal_uInt16 addMethodrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); sal_uInt16 addInterfaceMethodrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); sal_uInt16 addNameAndTypeInfo( - rtl::OString const & name, rtl::OString const & descriptor); + OString const & name, OString const & descriptor); void appendSignatureAttribute( - std::vector< unsigned char > & stream, rtl::OString const & signature); + std::vector< unsigned char > & stream, OString const & signature); sal_uInt16 m_constantPoolCount; std::vector< unsigned char > m_constantPool; - std::map< rtl::OString, sal_uInt16 > m_utf8Infos; + std::map< OString, sal_uInt16 > m_utf8Infos; std::map< sal_Int32, sal_uInt16 > m_integerInfos; std::map< sal_Int64, sal_uInt16 > m_longInfos; std::map< float, sal_uInt16 > m_floatInfos; diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx index 549913f9177c..912285ab2f6e 100644 --- a/codemaker/source/javamaker/javamaker.cxx +++ b/codemaker/source/javamaker/javamaker.cxx @@ -28,8 +28,6 @@ #include "javaoptions.hxx" #include "javatype.hxx" -using ::rtl::OUString; -using ::rtl::OString; sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType, rtl::Reference< TypeManager > const & typeMgr, codemaker::GeneratedTypeSet & generated, diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx index addb793a5fa5..fa90256834c3 100644 --- a/codemaker/source/javamaker/javaoptions.cxx +++ b/codemaker/source/javamaker/javaoptions.cxx @@ -23,9 +23,6 @@ #include "osl/process.h" #include "osl/thread.h" -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; #ifdef SAL_UNX #define SEPARATOR '/' diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx index 618e3c2db014..128ebbcd4d6e 100644 --- a/codemaker/source/javamaker/javaoptions.hxx +++ b/codemaker/source/javamaker/javaoptions.hxx @@ -33,9 +33,9 @@ public: sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ); - ::rtl::OString prepareHelp(); + OString prepareHelp(); - ::rtl::OString prepareVersion(); + OString prepareVersion(); protected: }; diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index 61366192a04f..77d3042ac8da 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -59,8 +59,8 @@ namespace { // helper function for createUnoName void appendUnoName( - rtl::Reference< TypeManager > const & manager, rtl::OString const & nucleus, sal_Int32 rank, - std::vector< rtl::OString > const & arguments, rtl::OStringBuffer * buffer) + rtl::Reference< TypeManager > const & manager, OString const & nucleus, sal_Int32 rank, + std::vector< OString > const & arguments, OStringBuffer * buffer) { OSL_ASSERT(rank >= 0 && buffer != 0); for (sal_Int32 i = 0; i < rank; ++i) { @@ -69,16 +69,16 @@ void appendUnoName( buffer->append(nucleus.replace('/', '.')); if (!arguments.empty()) { buffer->append('<'); - for (std::vector< rtl::OString >::const_iterator i(arguments.begin()); + for (std::vector< OString >::const_iterator i(arguments.begin()); i != arguments.end(); ++i) { if (i != arguments.begin()) { buffer->append(','); } RTTypeClass argTypeClass; - rtl::OString argNucleus; + OString argNucleus; sal_Int32 argRank; - std::vector< rtl::OString > argArgs; + std::vector< OString > argArgs; codemaker::decomposeAndResolve( manager, *i, true, false, false, &argTypeClass, &argNucleus, &argRank, &argArgs); @@ -91,11 +91,11 @@ void appendUnoName( // Translate the name of a UNO type registry entity (enum type, plain struct // type, polymorphic struct type template, or interface type, decomposed into // nucleus, rank, and arguments) into a core UNO type name: -rtl::OString createUnoName( - rtl::Reference< TypeManager > const & manager, rtl::OString const & nucleus, sal_Int32 rank, - std::vector< rtl::OString > const & arguments) +OString createUnoName( + rtl::Reference< TypeManager > const & manager, OString const & nucleus, sal_Int32 rank, + std::vector< OString > const & arguments) { - rtl::OStringBuffer buf; + OStringBuffer buf; appendUnoName(manager, nucleus, rank, arguments, &buf); return buf.makeStringAndClear(); } @@ -109,7 +109,7 @@ rtl::OString createUnoName( constant groupds, single-interface--based services, accumulation-based services, interface-based singletons, and service-based singletons. */ -typedef std::set< rtl::OString > Dependencies; +typedef std::set< OString > Dependencies; enum SpecialType { SPECIAL_TYPE_NONE, @@ -122,8 +122,8 @@ bool isSpecialType(SpecialType special) { return special >= SPECIAL_TYPE_UNSIGNED; } -rtl::OString translateUnoTypeToJavaFullyQualifiedName( - rtl::OString const & type, rtl::OString const & prefix) +OString translateUnoTypeToJavaFullyQualifiedName( + OString const & type, OString const & prefix) { sal_Int32 i = type.lastIndexOf('/') + 1; return type.copy(0, i) + @@ -135,22 +135,22 @@ struct PolymorphicUnoType { enum Kind { KIND_NONE, KIND_STRUCT, KIND_SEQUENCE }; Kind kind; - rtl::OString name; + OString name; }; SpecialType translateUnoTypeToDescriptor( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type, + rtl::Reference< TypeManager > const & manager, OString const & type, bool array, bool classType, Dependencies * dependencies, - rtl::OStringBuffer * descriptor, rtl::OStringBuffer * signature, + OStringBuffer * descriptor, OStringBuffer * signature, bool * needsSignature, PolymorphicUnoType * polymorphicUnoType); SpecialType translateUnoTypeToDescriptor( rtl::Reference< TypeManager > const & manager, codemaker::UnoType::Sort sort, RTTypeClass typeClass, - rtl::OString const & nucleus, sal_Int32 rank, - std::vector< rtl::OString > const & arguments, bool array, bool classType, - Dependencies * dependencies, rtl::OStringBuffer * descriptor, - rtl::OStringBuffer * signature, bool * needsSignature, + OString const & nucleus, sal_Int32 rank, + std::vector< OString > const & arguments, bool array, bool classType, + Dependencies * dependencies, OStringBuffer * descriptor, + OStringBuffer * signature, bool * needsSignature, PolymorphicUnoType * polymorphicUnoType) { OSL_ASSERT(rank >= 0 && (signature == 0) == (needsSignature == 0)); @@ -193,7 +193,7 @@ SpecialType translateUnoTypeToDescriptor( signature->append("L" + nucleus); if (!arguments.empty()) { signature->append('<'); - for (std::vector< rtl::OString >::const_iterator i( + for (std::vector< OString >::const_iterator i( arguments.begin()); i != arguments.end(); ++i) { @@ -220,7 +220,7 @@ SpecialType translateUnoTypeToDescriptor( return SPECIAL_TYPE_NONE; } } else { - static rtl::OString const + static OString const simpleTypeDescriptors[codemaker::UnoType::SORT_ANY + 1][2] = { { "V", "Ljava/lang/Void;" }, { "Z", "Ljava/lang/Boolean;" }, @@ -237,7 +237,7 @@ SpecialType translateUnoTypeToDescriptor( { "Ljava/lang/String;", "Ljava/lang/String;" }, { "Lcom/sun/star/uno/Type;", "Lcom/sun/star/uno/Type;" }, { "Ljava/lang/Object;", "Ljava/lang/Object;" } }; - rtl::OString const & s + OString const & s = simpleTypeDescriptors[sort][rank == 0 && classType]; if (descriptor != 0) { descriptor->append(s); @@ -260,15 +260,15 @@ SpecialType translateUnoTypeToDescriptor( } SpecialType translateUnoTypeToDescriptor( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type, + rtl::Reference< TypeManager > const & manager, OString const & type, bool array, bool classType, Dependencies * dependencies, - rtl::OStringBuffer * descriptor, rtl::OStringBuffer * signature, + OStringBuffer * descriptor, OStringBuffer * signature, bool * needsSignature, PolymorphicUnoType * polymorphicUnoType) { RTTypeClass typeClass; - rtl::OString nucleus; + OString nucleus; sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; codemaker::UnoType::Sort sort = codemaker::decomposeAndResolve( manager, type, true, true, false, &typeClass, &nucleus, &rank, &args); OSL_ASSERT(rank < SAL_MAX_INT32); @@ -280,12 +280,12 @@ SpecialType translateUnoTypeToDescriptor( SpecialType getFieldDescriptor( rtl::Reference< TypeManager > const & manager, Dependencies * dependencies, - rtl::OString const & type, rtl::OString * descriptor, - rtl::OString * signature, PolymorphicUnoType * polymorphicUnoType) + OString const & type, OString * descriptor, + OString * signature, PolymorphicUnoType * polymorphicUnoType) { OSL_ASSERT(dependencies != 0 && descriptor != 0); - rtl::OStringBuffer desc; - rtl::OStringBuffer sig; + OStringBuffer desc; + OStringBuffer sig; bool needsSig = false; SpecialType specialType = translateUnoTypeToDescriptor( manager, type, false, false, dependencies, &desc, &sig, &needsSig, @@ -295,7 +295,7 @@ SpecialType getFieldDescriptor( if (needsSig) { *signature = sig.makeStringAndClear(); } else { - *signature = rtl::OString(); + *signature = OString(); } } return specialType; @@ -305,42 +305,42 @@ class MethodDescriptor { public: MethodDescriptor( rtl::Reference< TypeManager > const & manager, - Dependencies * dependencies, rtl::OString const & returnType, + Dependencies * dependencies, OString const & returnType, SpecialType * specialReturnType, PolymorphicUnoType * polymorphicUnoType); SpecialType addParameter( - rtl::OString const & type, bool array, bool dependency, + OString const & type, bool array, bool dependency, PolymorphicUnoType * polymorphicUnoType); - void addTypeParameter(rtl::OString const & name); + void addTypeParameter(OString const & name); - rtl::OString getDescriptor() const; + OString getDescriptor() const; - rtl::OString getSignature() const; + OString getSignature() const; private: rtl::Reference< TypeManager > m_manager; Dependencies * m_dependencies; - rtl::OStringBuffer m_descriptorStart; - rtl::OString m_descriptorEnd; - rtl::OStringBuffer m_signatureStart; - rtl::OString m_signatureEnd; + OStringBuffer m_descriptorStart; + OString m_descriptorEnd; + OStringBuffer m_signatureStart; + OString m_signatureEnd; bool m_needsSignature; }; MethodDescriptor::MethodDescriptor( rtl::Reference< TypeManager > const & manager, Dependencies * dependencies, - rtl::OString const & returnType, SpecialType * specialReturnType, + OString const & returnType, SpecialType * specialReturnType, PolymorphicUnoType * polymorphicUnoType): m_manager(manager), m_dependencies(dependencies), m_needsSignature(false) { OSL_ASSERT(dependencies != 0); m_descriptorStart.append('('); m_signatureStart.append('('); - rtl::OStringBuffer descEnd; + OStringBuffer descEnd; descEnd.append(')'); - rtl::OStringBuffer sigEnd; + OStringBuffer sigEnd; sigEnd.append(')'); SpecialType special = translateUnoTypeToDescriptor( m_manager, returnType, false, false, m_dependencies, &descEnd, &sigEnd, @@ -353,7 +353,7 @@ MethodDescriptor::MethodDescriptor( } SpecialType MethodDescriptor::addParameter( - rtl::OString const & type, bool array, bool dependency, + OString const & type, bool array, bool dependency, PolymorphicUnoType * polymorphicUnoType) { return translateUnoTypeToDescriptor( @@ -368,17 +368,17 @@ void MethodDescriptor::addTypeParameter(OString const & name) { m_needsSignature = true; } -rtl::OString MethodDescriptor::getDescriptor() const { - rtl::OStringBuffer buf(m_descriptorStart); +OString MethodDescriptor::getDescriptor() const { + OStringBuffer buf(m_descriptorStart); buf.append(m_descriptorEnd); return buf.makeStringAndClear(); } -rtl::OString MethodDescriptor::getSignature() const { +OString MethodDescriptor::getSignature() const { if (m_needsSignature) { return m_signatureStart + m_signatureEnd; } else { - return rtl::OString(); + return OString(); } } @@ -393,20 +393,20 @@ public: // KIND_MEMBER: TypeInfo( - rtl::OString const & name, SpecialType specialType, sal_Int32 index, + OString const & name, SpecialType specialType, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType, sal_Int32 typeParameterIndex); // KIND_ATTRIBUTE/METHOD: TypeInfo( - Kind kind, rtl::OString const & name, SpecialType specialType, + Kind kind, OString const & name, SpecialType specialType, Flags flags, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType); // KIND_PARAMETER: TypeInfo( - rtl::OString const & parameterName, SpecialType specialType, - bool inParameter, bool outParameter, rtl::OString const & methodName, + OString const & parameterName, SpecialType specialType, + bool inParameter, bool outParameter, OString const & methodName, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType); sal_uInt16 generateCode(ClassFile::Code & code, Dependencies * dependencies) @@ -417,10 +417,10 @@ public: private: Kind m_kind; - rtl::OString m_name; + OString m_name; sal_Int32 m_flags; sal_Int32 m_index; - rtl::OString m_methodName; + OString m_methodName; PolymorphicUnoType m_polymorphicUnoType; sal_Int32 m_typeParameterIndex; }; @@ -441,7 +441,7 @@ sal_Int32 translateSpecialTypeFlags( } TypeInfo::TypeInfo( - rtl::OString const & name, SpecialType specialType, sal_Int32 index, + OString const & name, SpecialType specialType, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType, sal_Int32 typeParameterIndex): m_kind(KIND_MEMBER), m_name(name), @@ -455,7 +455,7 @@ TypeInfo::TypeInfo( } TypeInfo::TypeInfo( - Kind kind, rtl::OString const & name, SpecialType specialType, + Kind kind, OString const & name, SpecialType specialType, Flags flags, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType): m_kind(kind), m_name(name), @@ -466,8 +466,8 @@ TypeInfo::TypeInfo( } TypeInfo::TypeInfo( - rtl::OString const & parameterName, SpecialType specialType, - bool inParameter, bool outParameter, rtl::OString const & methodName, + OString const & parameterName, SpecialType specialType, + bool inParameter, bool outParameter, OString const & methodName, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType): m_kind(KIND_PARAMETER), m_name(parameterName), m_flags(translateSpecialTypeFlags(specialType, inParameter, outParameter)), @@ -602,7 +602,7 @@ void writeClassFile( if (!tempfile.isValid()) { throw CannotDumpException("Cannot create temporary file for " + filename); } - rtl::OString tempname(tempfile.getName()); + OString tempname(tempfile.getName()); try { classFile.write(tempfile); } catch (...) { @@ -621,7 +621,7 @@ void writeClassFile( } void addTypeInfo( - rtl::OString const & className, std::vector< TypeInfo > const & typeInfo, + OString const & className, std::vector< TypeInfo > const & typeInfo, Dependencies * dependencies, ClassFile * classFile) { OSL_ASSERT(dependencies != 0 && classFile != 0); @@ -661,7 +661,7 @@ void addTypeInfo( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PRIVATE | ClassFile::ACC_STATIC), "", "()V", code.get(), - std::vector< rtl::OString >(), ""); + std::vector< OString >(), ""); } } @@ -682,7 +682,7 @@ void handleEnumType( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString className(codemaker::convertString(reader.getTypeName())); + OString className(codemaker::convertString(reader.getTypeName())); SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< ClassFile > cf( new ClassFile( @@ -691,7 +691,7 @@ void handleEnumType( | ClassFile::ACC_SUPER), className, "com/sun/star/uno/Enum", "")); SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OString classDescriptor("L" + className + ";"); + OString classDescriptor("L" + className + ";"); for (sal_uInt16 i = 0; i < fields; ++i) { RTConstValue fieldValue(reader.getFieldValue(i)); if (fieldValue.m_type != RT_TYPE_INT32 @@ -700,13 +700,13 @@ void handleEnumType( { throw CannotDumpException("Bad type information"); //TODO } - rtl::OString fieldName( + OString fieldName( codemaker::convertString(reader.getFieldName(i))); cf->addField( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC | ClassFile::ACC_FINAL), - fieldName, classDescriptor, 0, rtl::OString()); + fieldName, classDescriptor, 0, OString()); cf->addField( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC @@ -739,7 +739,7 @@ void handleEnumType( code.get(), std::vector< OString >(), ""); code.reset(cf->newCode()); code->loadLocalInteger(0); - std::map< sal_Int32, rtl::OString > map; + std::map< sal_Int32, OString > map; sal_Int32 min = SAL_MAX_INT32; sal_Int32 max = SAL_MIN_INT32; for (sal_uInt16 i = 0; i < fields; ++i) { @@ -747,7 +747,7 @@ void handleEnumType( min = std::min(min, value); max = std::max(max, value); map.insert( - std::map< sal_Int32, rtl::OString >::value_type( + std::map< sal_Int32, OString >::value_type( value, codemaker::convertString(reader.getFieldName(i)))); } sal_uInt64 size = static_cast< sal_uInt64 >(map.size()); @@ -763,7 +763,7 @@ void handleEnumType( std::list< ClassFile::Code * > blocks; //FIXME: pointers contained in blocks may leak sal_Int32 last = SAL_MAX_INT32; - for (std::map< sal_Int32, rtl::OString >::iterator i(map.begin()); + for (std::map< sal_Int32, OString >::iterator i(map.begin()); i != map.end(); ++i) { sal_Int32 value = i->first; @@ -795,7 +795,7 @@ void handleEnumType( defCode->instrAreturn(); std::list< std::pair< sal_Int32, ClassFile::Code * > > blocks; //FIXME: pointers contained in blocks may leak - for (std::map< sal_Int32, rtl::OString >::iterator i(map.begin()); + for (std::map< sal_Int32, OString >::iterator i(map.begin()); i != map.end(); ++i) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -819,7 +819,7 @@ void handleEnumType( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC), "fromInt", "(I)" + classDescriptor, - code.get(), std::vector< rtl::OString >(), ""); + code.get(), std::vector< OString >(), ""); code.reset(cf->newCode()); for (sal_uInt16 i = 0; i < fields; ++i) { code->instrNew(className); @@ -837,19 +837,19 @@ void handleEnumType( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PRIVATE | ClassFile::ACC_STATIC), "", "()V", code.get(), - std::vector< rtl::OString >(), ""); + std::vector< OString >(), ""); writeClassFile(options, className, *cf.get()); } void addField( rtl::Reference< TypeManager > const & manager, Dependencies * dependencies, ClassFile * classFile, std::vector< TypeInfo > * typeInfo, - sal_Int32 typeParameterIndex, rtl::OString const & type, - rtl::OString const & name, sal_Int32 index) + sal_Int32 typeParameterIndex, OString const & type, + OString const & name, sal_Int32 index) { OSL_ASSERT(dependencies != 0 && classFile != 0 && typeInfo != 0); - rtl::OString descriptor; - rtl::OString signature; + OString descriptor; + OString signature; SpecialType specialType; PolymorphicUnoType polymorphicUnoType; if (typeParameterIndex >= 0) { @@ -869,8 +869,8 @@ void addField( sal_uInt16 addFieldInit( rtl::Reference< TypeManager > const & manager, - rtl::OString const & className, rtl::OString const & fieldName, - bool typeParameter, rtl::OString const & fieldType, + OString const & className, OString const & fieldName, + bool typeParameter, OString const & fieldType, Dependencies * dependencies, ClassFile::Code * code) { OSL_ASSERT(dependencies != 0 && code != 0); @@ -878,9 +878,9 @@ sal_uInt16 addFieldInit( return 0; } else { RTTypeClass typeClass; - rtl::OString nucleus; + OString nucleus; sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; codemaker::UnoType::Sort sort = codemaker::decomposeAndResolve( manager, fieldType, true, false, false, &typeClass, &nucleus, &rank, &args); @@ -888,7 +888,7 @@ sal_uInt16 addFieldInit( switch (sort) { case codemaker::UnoType::SORT_STRING: code->loadLocalReference(0); - code->loadStringConstant(rtl::OString()); + code->loadStringConstant(OString()); code->instrPutfield(className, fieldName, "Ljava/lang/String;"); return 2; @@ -913,12 +913,12 @@ sal_uInt16 addFieldInit( if (reader.getFieldCount() == 0) { throw CannotDumpException("Bad type information"); //TODO } - rtl::OStringBuffer descBuf; + OStringBuffer descBuf; translateUnoTypeToDescriptor( manager, sort, typeClass, nucleus, 0, - std::vector< rtl::OString >(), false, false, + std::vector< OString >(), false, false, dependencies, &descBuf, 0, 0, 0); - rtl::OString desc(descBuf.makeStringAndClear()); + OString desc(descBuf.makeStringAndClear()); code->instrGetstatic( nucleus, codemaker::convertString(reader.getFieldName(0)), @@ -933,10 +933,10 @@ sal_uInt16 addFieldInit( code->instrNew(nucleus); code->instrDup(); code->instrInvokespecial(nucleus, "", "()V"); - rtl::OStringBuffer desc; + OStringBuffer desc; translateUnoTypeToDescriptor( manager, sort, typeClass, nucleus, 0, - std::vector< rtl::OString >(), false, false, + std::vector< OString >(), false, false, dependencies, &desc, 0, 0, 0); code->instrPutfield( className, fieldName, desc.makeStringAndClear()); @@ -965,17 +965,17 @@ sal_uInt16 addFieldInit( nucleus, 0)); } } else { - rtl::OStringBuffer desc; + OStringBuffer desc; translateUnoTypeToDescriptor( manager, sort, typeClass, nucleus, rank - 1, - std::vector< rtl::OString >(), false, false, dependencies, + std::vector< OString >(), false, false, dependencies, &desc, 0, 0, 0); code->instrAnewarray(desc.makeStringAndClear()); } - rtl::OStringBuffer desc; + OStringBuffer desc; translateUnoTypeToDescriptor( manager, sort, typeClass, nucleus, rank, - std::vector< rtl::OString >(), false, false, dependencies, + std::vector< OString >(), false, false, dependencies, &desc, 0, 0, 0); code->instrPutfield( className, fieldName, desc.makeStringAndClear()); @@ -986,7 +986,7 @@ sal_uInt16 addFieldInit( sal_uInt16 addLoadLocal( rtl::Reference< TypeManager > const & manager, ClassFile::Code * code, - sal_uInt16 * index, bool typeParameter, rtl::OString const & type, bool any, + sal_uInt16 * index, bool typeParameter, OString const & type, bool any, Dependencies * dependencies) { OSL_ASSERT( @@ -999,9 +999,9 @@ sal_uInt16 addLoadLocal( stack = size = 1; } else { RTTypeClass typeClass; - rtl::OString nucleus; + OString nucleus; sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; codemaker::UnoType::Sort sort = codemaker::decomposeAndResolve( manager, type, true, false, false, &typeClass, &nucleus, &rank, &args); if (rank == 0) { @@ -1327,7 +1327,7 @@ sal_uInt16 addLoadLocal( void addBaseArguments( rtl::Reference< TypeManager > const & manager, Dependencies * dependencies, MethodDescriptor * methodDescriptor, ClassFile::Code * code, - RTTypeClass typeClass, rtl::OString const & type, sal_uInt16 * index) + RTTypeClass typeClass, OString const & type, sal_uInt16 * index) { OSL_ASSERT( dependencies != 0 && methodDescriptor != 0 && code != 0 && index != 0); @@ -1368,7 +1368,7 @@ void addBaseArguments( { throw CannotDumpException("Bad type information"); //TODO } - rtl::OString fieldType( + OString fieldType( codemaker::convertString(reader.getFieldTypeName(i))); methodDescriptor->addParameter(fieldType, false, true, 0); addLoadLocal( @@ -1379,13 +1379,13 @@ void addBaseArguments( sal_uInt16 addDirectArgument( rtl::Reference< TypeManager > const & manager, Dependencies * dependencies, MethodDescriptor * methodDescriptor, ClassFile::Code * code, - sal_uInt16 * index, rtl::OString const & className, - rtl::OString const & fieldName, bool typeParameter, - rtl::OString const & fieldType) + sal_uInt16 * index, OString const & className, + OString const & fieldName, bool typeParameter, + OString const & fieldType) { OSL_ASSERT( dependencies != 0 && methodDescriptor != 0 && code != 0 && index != 0); - rtl::OString desc; + OString desc; if (typeParameter) { methodDescriptor->addTypeParameter(fieldType); desc = "Ljava/lang/Object;"; @@ -1412,13 +1412,13 @@ void handleAggregatingType( //TODO } RTTypeClass typeClass = reader.getTypeClass(); - rtl::OString className(codemaker::convertString(reader.getTypeName())); + OString className(codemaker::convertString(reader.getTypeName())); sal_uInt16 superTypes = reader.getSuperTypeCount(); sal_uInt16 fields = reader.getFieldCount(); sal_uInt16 firstField = 0; sal_uInt16 references = reader.getReferenceCount(); bool runtimeException = false; - rtl::OString superClass; + OString superClass; if (className == "com/sun/star/uno/Exception") { if (typeClass != RT_TYPE_EXCEPTION || superTypes != 0 || fields != 2 @@ -1459,10 +1459,10 @@ void handleAggregatingType( dependencies->insert(superClass); } } - rtl::OString sig; - std::map< rtl::OString, sal_Int32 > typeParameters; + OString sig; + std::map< OString, sal_Int32 > typeParameters; if (references != 0) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append('<'); for (sal_uInt16 i = 0; i < references; ++i) { if (reader.getReferenceFlags(i) != RT_ACCESS_INVALID @@ -1471,11 +1471,11 @@ void handleAggregatingType( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString name( + OString name( codemaker::convertString(reader.getReferenceTypeName(i))); buf.append(name + ":Ljava/lang/Object;"); if (!typeParameters.insert( - std::map< rtl::OString, sal_Int32 >::value_type(name, i)). + std::map< OString, sal_Int32 >::value_type(name, i)). second) { throw CannotDumpException("Bad type information"); @@ -1502,13 +1502,13 @@ void handleAggregatingType( { throw CannotDumpException("Bad type information"); //TODO } - rtl::OString type( + OString type( codemaker::convertString(reader.getFieldTypeName(i))); sal_Int32 typeParameterIndex; if ((flags & RT_ACCESS_PARAMETERIZED_TYPE) == 0) { typeParameterIndex = -1; } else { - std::map< rtl::OString, sal_Int32 >::iterator it( + std::map< OString, sal_Int32 >::iterator it( typeParameters.find(type)); if (it == typeParameters.end()) { throw CannotDumpException("Bad type information"); @@ -1551,7 +1551,7 @@ void handleAggregatingType( cf->addMethod( ClassFile::ACC_PUBLIC, "", "()V", code.get(), - std::vector< rtl::OString >(), ""); + std::vector< OString >(), ""); if (typeClass == RT_TYPE_EXCEPTION) { code.reset(cf->newCode()); code->loadLocalReference(0); @@ -1578,7 +1578,7 @@ void handleAggregatingType( code->instrReturn(); code->setMaxStackAndLocals(stack + 2, 2); cf->addMethod(ClassFile::ACC_PUBLIC, "", "(Ljava/lang/String;)V", - code.get(), std::vector< rtl::OString >(), ""); + code.get(), std::vector< OString >(), ""); } MethodDescriptor desc(manager, dependencies, "void", 0, 0); code.reset(cf->newCode()); @@ -1613,7 +1613,7 @@ void handleAggregatingType( code->instrReturn(); code->setMaxStackAndLocals(maxSize, index); cf->addMethod(ClassFile::ACC_PUBLIC, "", - desc.getDescriptor(), code.get(), std::vector< rtl::OString >(), + desc.getDescriptor(), code.get(), std::vector< OString >(), desc.getSignature()); addTypeInfo(className, typeInfo, dependencies, cf.get()); writeClassFile(options, className, *cf.get()); @@ -1622,13 +1622,13 @@ void handleAggregatingType( void createExceptionsAttribute( rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, sal_uInt16 methodIndex, - Dependencies * dependencies, std::vector< rtl::OString > * exceptions, + Dependencies * dependencies, std::vector< OString > * exceptions, codemaker::ExceptionTree * tree) { OSL_ASSERT(dependencies != 0 && exceptions != 0); sal_uInt16 n = reader.getMethodExceptionCount(methodIndex); for (sal_uInt16 i = 0; i < n; ++i) { - rtl::OString type( + OString type( codemaker::convertString( reader.getMethodExceptionTypeName(methodIndex, i))); dependencies->insert(type); @@ -1646,7 +1646,7 @@ void handleInterfaceType( { OSL_ASSERT(dependencies != 0); - rtl::OString className(codemaker::convertString(reader.getTypeName())); + OString className(codemaker::convertString(reader.getTypeName())); sal_uInt16 superTypes = reader.getSuperTypeCount(); sal_uInt16 fields = reader.getFieldCount(); sal_uInt16 methods = reader.getMethodCount(); @@ -1669,7 +1669,7 @@ void handleInterfaceType( className, "java/lang/Object", "")); SAL_WNODEPRECATED_DECLARATIONS_POP for (sal_uInt16 i = 0; i < superTypes; ++i) { - rtl::OString t(codemaker::convertString(reader.getSuperTypeName(i))); + OString t(codemaker::convertString(reader.getSuperTypeName(i))); dependencies->insert(t); cf->addInterface(t); } @@ -1698,7 +1698,7 @@ void handleInterfaceType( } //TODO: exploit the fact that attribute getter/setter methods preceed // real methods - rtl::OUString attrNameUtf16(reader.getFieldName(i)); + OUString attrNameUtf16(reader.getFieldName(i)); sal_uInt16 getter = SAL_MAX_UINT16; sal_uInt16 setter = SAL_MAX_UINT16; for (sal_uInt16 j = 0; j < methods; ++j) { @@ -1720,19 +1720,19 @@ void handleInterfaceType( (mflags == RT_MODE_ATTRIBUTE_GET ? getter : setter) = j; } } - rtl::OString fieldType( + OString fieldType( codemaker::convertString(reader.getFieldTypeName(i))); SpecialType specialType; PolymorphicUnoType polymorphicUnoType; MethodDescriptor gdesc( manager, dependencies, fieldType, &specialType, &polymorphicUnoType); - std::vector< rtl::OString > exc; + std::vector< OString > exc; if (getter != SAL_MAX_UINT16) { createExceptionsAttribute( manager, reader, getter, dependencies, &exc, 0); } - rtl::OString attrName(codemaker::convertString(attrNameUtf16)); + OString attrName(codemaker::convertString(attrNameUtf16)); cf->addMethod( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PUBLIC | ClassFile::ACC_ABSTRACT), @@ -1741,7 +1741,7 @@ void handleInterfaceType( MethodDescriptor sdesc( manager, dependencies, "void", 0, 0); sdesc.addParameter(fieldType, false, true, 0); - std::vector< rtl::OString > exc2; + std::vector< OString > exc2; if (setter != SAL_MAX_UINT16) { createExceptionsAttribute( manager, reader, setter, dependencies, &exc2, 0); @@ -1768,7 +1768,7 @@ void handleInterfaceType( case RT_MODE_ONEWAY: case RT_MODE_TWOWAY: { - rtl::OString methodName( + OString methodName( codemaker::convertString(reader.getMethodName(i))); SpecialType specialReturnType; PolymorphicUnoType polymorphicUnoReturnType; @@ -1825,7 +1825,7 @@ void handleInterfaceType( polymorphicUnoType)); } } - std::vector< rtl::OString > exc2; + std::vector< OString > exc2; createExceptionsAttribute( manager, reader, i, dependencies, &exc2, 0); cf->addMethod( @@ -1841,7 +1841,7 @@ void handleInterfaceType( { //TODO: exploit the fact that attribute getter/setter methods // are ordered the same way as the attribute fields themselves - rtl::OUString methodNameUtf16(reader.getMethodName(i)); + OUString methodNameUtf16(reader.getMethodName(i)); bool found = false; for (sal_uInt16 j = 0; j < fields; ++j) { if (reader.getFieldName(j) == methodNameUtf16) { @@ -1874,9 +1874,9 @@ void handleTypedef( //TODO } RTTypeClass typeClass; - rtl::OString nucleus; + OString nucleus; sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; if (codemaker::decomposeAndResolve( manager, codemaker::convertString(reader.getSuperTypeName(0)), false, false, false, &typeClass, &nucleus, &rank, &args) @@ -1917,9 +1917,9 @@ void addConstant( RTConstValue fieldValue(reader.getFieldValue(index)); sal_uInt16 valueIndex; RTTypeClass typeClass; - rtl::OString nucleus; + OString nucleus; sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; switch (codemaker::decomposeAndResolve( manager, codemaker::convertString(reader.getFieldTypeName(index)), @@ -2002,8 +2002,8 @@ void addConstant( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString desc; - rtl::OString sig; + OString desc; + OString sig; getFieldDescriptor( manager, dependencies, codemaker::convertString(reader.getFieldTypeName(index)), @@ -2028,7 +2028,7 @@ void handleConstantGroup( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString className(codemaker::convertString(reader.getTypeName())); + OString className(codemaker::convertString(reader.getTypeName())); SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< ClassFile > cf( new ClassFile( @@ -2056,10 +2056,10 @@ void handleModule( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString prefix(codemaker::convertString(reader.getTypeName()) + "/"); + OString prefix(codemaker::convertString(reader.getTypeName()) + "/"); sal_uInt16 fields = reader.getFieldCount(); for (sal_uInt16 i = 0; i < fields; ++i) { - rtl::OString className( + OString className( prefix + codemaker::convertString(reader.getFieldName(i))); SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< ClassFile > cf( @@ -2094,10 +2094,10 @@ void addExceptionHandlers( void addConstructor( rtl::Reference< TypeManager > const & manager, - rtl::OString const & realJavaBaseName, rtl::OString const & unoName, - rtl::OString const & className, typereg::Reader const & reader, - sal_uInt16 methodIndex, rtl::OString const & methodName, - rtl::OString const & returnType, bool defaultConstructor, + OString const & realJavaBaseName, OString const & unoName, + OString const & className, typereg::Reader const & reader, + sal_uInt16 methodIndex, OString const & methodName, + OString const & returnType, bool defaultConstructor, Dependencies * dependencies, ClassFile * classFile) { OSL_ASSERT(dependencies != 0 && classFile != 0); @@ -2116,7 +2116,7 @@ void addConstructor( codemaker::ExceptionTree tree; ClassFile::Code::Position tryStart; ClassFile::Code::Position tryEnd; - std::vector< rtl::OString > exc; + std::vector< OString > exc; sal_uInt16 stack; sal_uInt16 localIndex = 1; ClassFile::AccessFlags access = static_cast< ClassFile::AccessFlags >( @@ -2153,7 +2153,7 @@ void addConstructor( for (sal_uInt16 i = 0; i < parameters; ++i) { RTParamMode flags = reader.getMethodParameterFlags( methodIndex, i); - rtl::OString paramType( + OString paramType( codemaker::convertString( reader.getMethodParameterTypeName(methodIndex, i))); if ((flags != RT_PARAM_IN @@ -2258,8 +2258,8 @@ void handleService( if (superTypes == 0) { return; } - rtl::OString unoName(codemaker::convertString(reader.getTypeName())); - rtl::OString className( + OString unoName(codemaker::convertString(reader.getTypeName())); + OString className( translateUnoTypeToJavaFullyQualifiedName(unoName, "service")); unoName = unoName.replace('/', '.'); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -2271,16 +2271,16 @@ void handleService( className, "java/lang/Object", "")); SAL_WNODEPRECATED_DECLARATIONS_POP if (methods > 0) { - rtl::OString base(codemaker::convertString( + OString base(codemaker::convertString( reader.getSuperTypeName(0))); - rtl::OString realJavaBaseName(base.replace('/', '.')); + OString realJavaBaseName(base.replace('/', '.')); dependencies->insert(base); dependencies->insert("com/sun/star/lang/XMultiComponentFactory"); dependencies->insert("com/sun/star/uno/DeploymentException"); dependencies->insert("com/sun/star/uno/TypeClass"); dependencies->insert("com/sun/star/uno/XComponentContext"); for (sal_uInt16 i = 0; i < methods; ++i) { - rtl::OString name(codemaker::convertString( + OString name(codemaker::convertString( reader.getMethodName(i))); bool defaultCtor = name.isEmpty(); if (reader.getMethodFlags(i) != RT_MODE_TWOWAY @@ -2351,7 +2351,7 @@ void handleService( | ClassFile::ACC_SYNTHETIC), "$castInstance", "(Ljava/lang/Object;Lcom/sun/star/uno/" "XComponentContext;)Ljava/lang/Object;", - code.get(), std::vector< rtl::OString >(), ""); + code.get(), std::vector< OString >(), ""); } } writeClassFile(options, className, *cf.get()); @@ -2369,8 +2369,8 @@ void handleSingleton( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString base(codemaker::convertString(reader.getSuperTypeName(0))); - rtl::OString realJavaBaseName(base.replace('/', '.')); + OString base(codemaker::convertString(reader.getSuperTypeName(0))); + OString realJavaBaseName(base.replace('/', '.')); switch (manager->getTypeReader(base).getTypeClass()) { case RT_TYPE_INTERFACE: break; @@ -2475,14 +2475,14 @@ void handleSingleton( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC), "get", desc.getDescriptor(), - code.get(), std::vector< rtl::OString >(), desc.getSignature()); + code.get(), std::vector< OString >(), desc.getSignature()); writeClassFile(options, className, *cf.get()); } } bool produceType( - rtl::OString const & type, rtl::Reference< TypeManager > const & manager, + OString const & type, rtl::Reference< TypeManager > const & manager, codemaker::GeneratedTypeSet & generated, JavaOptions * options) { OSL_ASSERT(options != 0); @@ -2556,7 +2556,7 @@ bool produceType( rtl::Reference< TypeManager > const & manager, codemaker::GeneratedTypeSet & generated, JavaOptions * options) { - ::rtl::OString typeName = manager->getTypeName(rTypeKey); + OString typeName = manager->getTypeName(rTypeKey); OSL_ASSERT(options != 0); if (typeName == "/" || typeName == manager->getBase() diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx index 5161628d8b82..6d53bd747ef3 100644 --- a/codemaker/source/javamaker/javatype.hxx +++ b/codemaker/source/javamaker/javatype.hxx @@ -23,15 +23,15 @@ #include "sal/config.h" #include "rtl/ref.hxx" +#include "rtl/string.hxx" namespace codemaker { class GeneratedTypeSet; } -namespace rtl { class OString; } class JavaOptions; class TypeManager; class RegistryKey; bool produceType( - rtl::OString const & type, rtl::Reference< TypeManager > const & manager, + OString const & type, rtl::Reference< TypeManager > const & manager, codemaker::GeneratedTypeSet & generated, JavaOptions * pOptions); bool produceType(RegistryKey& typeName, bool bIsExtraType, rtl::Reference< TypeManager > const & typeMgr, diff --git a/comphelper/inc/comphelper/ChainablePropertySet.hxx b/comphelper/inc/comphelper/ChainablePropertySet.hxx index b281151558e6..2dfe5f3ca256 100644 --- a/comphelper/inc/comphelper/ChainablePropertySet.hxx +++ b/comphelper/inc/comphelper/ChainablePropertySet.hxx @@ -97,39 +97,39 @@ namespace comphelper // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx index 51cfd9ea433e..ce28803036d5 100644 --- a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx +++ b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx @@ -52,15 +52,15 @@ namespace comphelper void add( PropertyInfo* pMap, sal_Int32 nCount = -1 ) throw(); - void remove( const rtl::OUString& aName ) + void remove( const OUString& aName ) throw(); // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException); }; } diff --git a/comphelper/inc/comphelper/MasterPropertySet.hxx b/comphelper/inc/comphelper/MasterPropertySet.hxx index 03fdd4a8ccea..266137fdb9b4 100644 --- a/comphelper/inc/comphelper/MasterPropertySet.hxx +++ b/comphelper/inc/comphelper/MasterPropertySet.hxx @@ -102,39 +102,39 @@ namespace comphelper // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx index 48740daa2ab0..d2c772e2c5d5 100644 --- a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx +++ b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx @@ -48,9 +48,9 @@ namespace comphelper // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException); }; } diff --git a/comphelper/inc/comphelper/PropertyInfoHash.hxx b/comphelper/inc/comphelper/PropertyInfoHash.hxx index 41671b71532d..3241560b4a94 100644 --- a/comphelper/inc/comphelper/PropertyInfoHash.hxx +++ b/comphelper/inc/comphelper/PropertyInfoHash.hxx @@ -44,21 +44,21 @@ namespace comphelper }; struct eqFunc { - sal_Bool operator()( const rtl::OUString &r1, - const rtl::OUString &r2) const + sal_Bool operator()( const OUString &r1, + const OUString &r2) const { return r1 == r2; } }; } -typedef boost::unordered_map < ::rtl::OUString, +typedef boost::unordered_map < OUString, ::comphelper::PropertyInfo*, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::eqFunc > PropertyInfoHash; -typedef boost::unordered_map < ::rtl::OUString, +typedef boost::unordered_map < OUString, ::comphelper::PropertyData*, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::eqFunc > PropertyDataHash; #endif diff --git a/comphelper/inc/comphelper/SettingsHelper.hxx b/comphelper/inc/comphelper/SettingsHelper.hxx index 661a4a0c8341..d623fa3e5494 100644 --- a/comphelper/inc/comphelper/SettingsHelper.hxx +++ b/comphelper/inc/comphelper/SettingsHelper.hxx @@ -58,39 +58,39 @@ namespace comphelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return ComphelperBase::getPropertySetInfo(); } - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ComphelperBase::setPropertyValue ( aPropertyName, aValue ); } - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return ComphelperBase::getPropertyValue ( PropertyName ); } - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ComphelperBase::addPropertyChangeListener ( aPropertyName, xListener ); } - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ComphelperBase::removePropertyChangeListener ( aPropertyName, aListener ); } - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ComphelperBase::addVetoableChangeListener ( PropertyName, aListener ); } - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ComphelperBase::removeVetoableChangeListener ( PropertyName, aListener ); } // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ComphelperBase::setPropertyValues ( aPropertyNames, aValues ); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException) { return ComphelperBase::getPropertyValues ( aPropertyNames ); } - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException) { ComphelperBase::addPropertiesChangeListener ( aPropertyNames, xListener ); } virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException) { ComphelperBase::removePropertiesChangeListener ( xListener ); } - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException) { ComphelperBase::firePropertiesChangeEvent ( aPropertyNames, xListener ); } }; diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/comphelper/inc/comphelper/accessiblecontexthelper.hxx index ae7712126504..5ca27baddabf 100644 --- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx +++ b/comphelper/inc/comphelper/accessiblecontexthelper.hxx @@ -160,8 +160,8 @@ namespace comphelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException) = 0; virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException) = 0; diff --git a/comphelper/inc/comphelper/accessibletexthelper.hxx b/comphelper/inc/comphelper/accessibletexthelper.hxx index 502b0b178127..ea3f505ee7fe 100644 --- a/comphelper/inc/comphelper/accessibletexthelper.hxx +++ b/comphelper/inc/comphelper/accessibletexthelper.hxx @@ -55,7 +55,7 @@ namespace comphelper sal_Bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); virtual sal_Bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); virtual sal_Bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); - virtual ::rtl::OUString implGetText() = 0; + virtual OUString implGetText() = 0; virtual ::com::sun::star::lang::Locale implGetLocale() = 0; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0; virtual void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); @@ -68,11 +68,11 @@ namespace comphelper */ sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -90,8 +90,8 @@ namespace comphelper ::com::sun::star::accessibility::TextSegment */ static bool implInitTextChangedEvent( - const rtl::OUString& rOldString, - const rtl::OUString& rNewString, + const OUString& rOldString, + const OUString& rNewString, /*out*/ ::com::sun::star::uno::Any& rDeleted, /*out*/ ::com::sun::star::uno::Any& rInserted); // throw() }; @@ -125,11 +125,11 @@ namespace comphelper // XAccessibleText virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/comphelper/inc/comphelper/accessiblewrapper.hxx index 0867ab5594e9..fbd65d638899 100644 --- a/comphelper/inc/comphelper/accessiblewrapper.hxx +++ b/comphelper/inc/comphelper/accessiblewrapper.hxx @@ -280,8 +280,8 @@ namespace comphelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); diff --git a/comphelper/inc/comphelper/anycompare.hxx b/comphelper/inc/comphelper/anycompare.hxx index 5ae1d938cae8..fb17b7ca67ec 100644 --- a/comphelper/inc/comphelper/anycompare.hxx +++ b/comphelper/inc/comphelper/anycompare.hxx @@ -93,7 +93,7 @@ namespace comphelper public: virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const { - ::rtl::OUString lhs, rhs; + OUString lhs, rhs; if ( !( _lhs >>= lhs ) || !( _rhs >>= rhs ) ) @@ -115,7 +115,7 @@ namespace comphelper virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const { - ::rtl::OUString lhs, rhs; + OUString lhs, rhs; if ( !( _lhs >>= lhs ) || !( _rhs >>= rhs ) ) diff --git a/comphelper/inc/comphelper/anytostring.hxx b/comphelper/inc/comphelper/anytostring.hxx index ff34c02f18f3..e68779854292 100644 --- a/comphelper/inc/comphelper/anytostring.hxx +++ b/comphelper/inc/comphelper/anytostring.hxx @@ -34,7 +34,7 @@ namespace comphelper @return STRING representation of given ANY value */ -COMPHELPER_DLLPUBLIC ::rtl::OUString anyToString( ::com::sun::star::uno::Any const & value ); +COMPHELPER_DLLPUBLIC OUString anyToString( ::com::sun::star::uno::Any const & value ); } diff --git a/comphelper/inc/comphelper/attributelist.hxx b/comphelper/inc/comphelper/attributelist.hxx index a309264a52e4..dd10e13c70ab 100644 --- a/comphelper/inc/comphelper/attributelist.hxx +++ b/comphelper/inc/comphelper/attributelist.hxx @@ -41,20 +41,20 @@ public: virtual ~AttributeList(); // methods that are not contained in any interface - void AddAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sType , const ::rtl::OUString &sValue ); + void AddAttribute( const OUString &sName , const OUString &sType , const OUString &sValue ); // ::com::sun::star::xml::sax::XAttributeList virtual sal_Int16 SAL_CALL getLength(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); }; diff --git a/comphelper/inc/comphelper/basicio.hxx b/comphelper/inc/comphelper/basicio.hxx index 626466bceba4..42eea8076e47 100644 --- a/comphelper/inc/comphelper/basicio.hxx +++ b/comphelper/inc/comphelper/basicio.hxx @@ -37,9 +37,9 @@ namespace starawt = ::com::sun::star::awt; COMPHELPER_DLLPUBLIC const staruno::Reference& operator >> (const staruno::Reference& _rxInStream, sal_Bool& _rVal); COMPHELPER_DLLPUBLIC const staruno::Reference& operator << (const staruno::Reference& _rxOutStream, sal_Bool _bVal); -// ::rtl::OUString -COMPHELPER_DLLPUBLIC const staruno::Reference& operator >> (const staruno::Reference& _rxInStream, ::rtl::OUString& _rStr); -COMPHELPER_DLLPUBLIC const staruno::Reference& operator << (const staruno::Reference& _rxOutStream, const ::rtl::OUString& _rStr); +// OUString +COMPHELPER_DLLPUBLIC const staruno::Reference& operator >> (const staruno::Reference& _rxInStream, OUString& _rStr); +COMPHELPER_DLLPUBLIC const staruno::Reference& operator << (const staruno::Reference& _rxOutStream, const OUString& _rStr); // sal_Int16 COMPHELPER_DLLPUBLIC const staruno::Reference& operator >> (const staruno::Reference& _rxInStream, sal_Int16& _rValue); diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/comphelper/inc/comphelper/componentcontext.hxx index c617f8b1811c..d6461502be54 100644 --- a/comphelper/inc/comphelper/componentcontext.hxx +++ b/comphelper/inc/comphelper/componentcontext.hxx @@ -80,7 +80,7 @@ namespace comphelper if and only if the component could be successfully created */ template < typename INTERFACE > - bool createComponent( const ::rtl::OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const + bool createComponent( const OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const { _out_rxComponent.clear(); _out_rxComponent = _out_rxComponent.query( @@ -97,7 +97,7 @@ namespace comphelper template < typename INTERFACE > bool createComponent( const sal_Char* _pAsciiServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const { - return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent ); + return createComponent( OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent ); } /** creates a component using our component factory/context, passing creation arguments @@ -106,7 +106,7 @@ namespace comphelper if and only if the component could be successfully created */ template < typename INTERFACE > - bool createComponentWithArguments( const ::rtl::OUString& _rServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const + bool createComponentWithArguments( const OUString& _rServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const { _out_rxComponent.clear(); _out_rxComponent = _out_rxComponent.query( @@ -123,7 +123,7 @@ namespace comphelper template < typename INTERFACE > bool createComponentWithArguments( const sal_Char* _pAsciiServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const { - return createComponentWithArguments( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _rArguments, _out_rxComponent ); + return createComponentWithArguments( OUString::createFromAscii( _pAsciiServiceName ), _rArguments, _out_rxComponent ); } /** creates a component using our component factory/context @@ -135,7 +135,7 @@ namespace comphelper @return the newly created component. Is never . */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const ::rtl::OUString& _rServiceName ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const OUString& _rServiceName ) const; /** creates a component using our component factory/context @@ -148,7 +148,7 @@ namespace comphelper */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const sal_Char* _pAsciiServiceName ) const { - return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ) ); + return createComponent( OUString::createFromAscii( _pAsciiServiceName ) ); } /** creates a component using our component factory/context, passing creation arguments @@ -161,7 +161,7 @@ namespace comphelper the newly created component. Is never . */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponentWithArguments( - const ::rtl::OUString& _rServiceName, + const OUString& _rServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments ) const; @@ -179,7 +179,7 @@ namespace comphelper const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments ) const { - return createComponentWithArguments( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _rArguments ); + return createComponentWithArguments( OUString::createFromAscii( _pAsciiServiceName ), _rArguments ); } /** retrieves a singleton instance from the context @@ -187,7 +187,7 @@ namespace comphelper Singletons are collected below the /singletons key in a component context, so accessing them means retrieving the value under /singletons/<instance_name>. */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const ::rtl::OUString& _rInstanceName ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const OUString& _rInstanceName ) const; /** retrieves a singleton instance from the context @@ -196,7 +196,7 @@ namespace comphelper */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const sal_Char* _pAsciiInstanceName ) const { - return getSingleton( ::rtl::OUString::createFromAscii( _pAsciiInstanceName ) ); + return getSingleton( OUString::createFromAscii( _pAsciiInstanceName ) ); } /** returns the ->XMultiServiceFactory interface of ->m_xORB, for passing to @@ -216,7 +216,7 @@ namespace comphelper @seealso getContextValueByAsciiName */ ::com::sun::star::uno::Any - getContextValueByName( const ::rtl::OUString& _rName ) const; + getContextValueByName( const OUString& _rName ) const; /** retrieves a value from our component context, specified by 8-bit ASCII string @param _rName @@ -229,7 +229,7 @@ namespace comphelper inline ::com::sun::star::uno::Any getContextValueByAsciiName( const sal_Char* _pAsciiName ) const { - return getContextValueByName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); + return getContextValueByName( OUString::createFromAscii( _pAsciiName ) ); } }; diff --git a/comphelper/inc/comphelper/componentguard.hxx b/comphelper/inc/comphelper/componentguard.hxx index 3fc17f94dfe7..eb1cfbcc24a8 100644 --- a/comphelper/inc/comphelper/componentguard.hxx +++ b/comphelper/inc/comphelper/componentguard.hxx @@ -40,7 +40,7 @@ namespace comphelper :m_aGuard( i_broadcastHelper.rMutex ) { if ( i_broadcastHelper.bDisposed ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), &i_component ); + throw ::com::sun::star::lang::DisposedException( OUString(), &i_component ); } ~ComponentGuard() diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx index e01a133f7027..7e577705a805 100644 --- a/comphelper/inc/comphelper/componentmodule.hxx +++ b/comphelper/inc/comphelper/componentmodule.hxx @@ -41,8 +41,8 @@ namespace comphelper typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > (SAL_CALL *FactoryInstantiation) ( ::cppu::ComponentFactoryFunc _pFactoryFunc, - ::rtl::OUString const& _rComponentName, - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & _rServiceNames, + OUString const& _rComponentName, + ::com::sun::star::uno::Sequence< OUString > const & _rServiceNames, rtl_ModuleCount* _pModuleCounter ) SAL_THROW(()); @@ -52,13 +52,13 @@ namespace comphelper struct COMPHELPER_DLLPUBLIC ComponentDescription { /// the implementation name of the component - ::rtl::OUString sImplementationName; + OUString sImplementationName; /// the services supported by the component implementation - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupportedServices; + ::com::sun::star::uno::Sequence< OUString > aSupportedServices; /** the name under which the component implementation should be registered as singleton, or empty if the component does not implement a singleton. */ - ::rtl::OUString sSingletonName; + OUString sSingletonName; /// the function to create an instance of the component ::cppu::ComponentFactoryFunc pComponentCreationFunc; /// the function to create a factory for the component (usually ::cppu::createSingleComponentFactory) @@ -74,9 +74,9 @@ namespace comphelper } ComponentDescription( - const ::rtl::OUString& _rImplementationName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSupportedServices, - const ::rtl::OUString& _rSingletonName, + const OUString& _rImplementationName, + const ::com::sun::star::uno::Sequence< OUString >& _rSupportedServices, + const OUString& _rSingletonName, ::cppu::ComponentFactoryFunc _pComponentCreationFunc, FactoryInstantiation _pFactoryCreationFunc ) @@ -118,8 +118,8 @@ namespace comphelper a function for creating a factory for that component */ void registerImplementation( - const ::rtl::OUString& _rImplementationName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentFactoryFunc _pCreateFunction, FactoryInstantiation _pFactoryFunction = ::cppu::createSingleComponentFactory ); @@ -135,7 +135,7 @@ namespace comphelper the XInterface access to a factory for the component */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( - const ::rtl::OUString& _rImplementationName ); + const OUString& _rImplementationName ); /** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call */ @@ -191,8 +191,8 @@ namespace comphelper /** automatically provides all component information to an OModule instance

Assumed that the template argument has the three methods

    -
  • static ::rtl::OUString getImplementationName_static()
  • -
  • static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static()
  • +
  • static OUString getImplementationName_static()
  • +
  • static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static()
  • static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)
    • @@ -226,9 +226,9 @@ namespace comphelper

    Assumed that the template argument has the three methods

      -
    • static ::rtl::OUString getImplementationName_static()
    • -
    • static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static()
    • -
    • static ::rtl::OUString getSingletonName_static()
      • +
    • static OUString getImplementationName_static()
    • +
    • static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static()
    • +
    • static OUString getSingletonName_static()
    • static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)
      • diff --git a/comphelper/inc/comphelper/configuration.hxx b/comphelper/inc/comphelper/configuration.hxx index d70b3901b550..92d5e1d1bd83 100644 --- a/comphelper/inc/comphelper/configuration.hxx +++ b/comphelper/inc/comphelper/configuration.hxx @@ -80,16 +80,16 @@ private: const & context); SAL_DLLPRIVATE void setPropertyValue( - rtl::OUString const & path, com::sun::star::uno::Any const & value) + OUString const & path, com::sun::star::uno::Any const & value) const; SAL_DLLPRIVATE com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameReplace > - getGroup(rtl::OUString const & path) const; + getGroup(OUString const & path) const; SAL_DLLPRIVATE com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > - getSet(rtl::OUString const & path) const; + getSet(OUString const & path) const; com::sun::star::uno::Reference< com::sun::star::configuration::XReadWriteAccess > access_; @@ -112,38 +112,38 @@ public: SAL_DLLPRIVATE ~ConfigurationWrapper(); - com::sun::star::uno::Any getPropertyValue(rtl::OUString const & path) const; + com::sun::star::uno::Any getPropertyValue(OUString const & path) const; void setPropertyValue( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path, com::sun::star::uno::Any const & value) + OUString const & path, com::sun::star::uno::Any const & value) const; com::sun::star::uno::Any getLocalizedPropertyValue( - rtl::OUString const & path) const; + OUString const & path) const; void setLocalizedPropertyValue( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path, com::sun::star::uno::Any const & value) + OUString const & path, com::sun::star::uno::Any const & value) const; com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > - getGroupReadOnly(rtl::OUString const & path) const; + getGroupReadOnly(OUString const & path) const; com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameReplace > getGroupReadWrite( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path) const; + OUString const & path) const; com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > - getSetReadOnly(rtl::OUString const & path) const; + getSetReadOnly(OUString const & path) const; com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > getSetReadWrite( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path) const; + OUString const & path) const; boost::shared_ptr< ConfigurationChanges > createChanges() const; diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx index 3ad6b44398dd..b267e4c0c564 100644 --- a/comphelper/inc/comphelper/configurationhelper.hxx +++ b/comphelper/inc/comphelper/configurationhelper.hxx @@ -88,7 +88,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * E.g. css::uno::Exception if the configuration could not be opened. */ static css::uno::Reference< css::uno::XInterface > openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sPackage, + const OUString& sPackage, sal_Int32 eMode ); //----------------------------------------------- @@ -117,8 +117,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * key does not exists. */ static css::uno::Any readRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG , - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey ); + const OUString& sRelPath, + const OUString& sKey ); //----------------------------------------------- /** writes a new value for an existing(!) configuration key, @@ -147,8 +147,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * access does not allow writing for this key. */ static void writeRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG , - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey , + const OUString& sRelPath, + const OUString& sKey , const css::uno::Any& aValue ); //----------------------------------------------- @@ -181,8 +181,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * access does not allow writing for this set. */ static css::uno::Reference< css::uno::XInterface > makeSureSetNodeExists(const css::uno::Reference< css::uno::XInterface > xCFG , - const ::rtl::OUString& sRelPathToSet, - const ::rtl::OUString& sSetNode ); + const OUString& sRelPathToSet, + const OUString& sSetNode ); //----------------------------------------------- /** commit all changes made on the specified configuration access. @@ -210,9 +210,9 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * (Excepting these keys exists inside different configuration packages ...)) */ static css::uno::Any readDirectKey(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sPackage, - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey , + const OUString& sPackage, + const OUString& sRelPath, + const OUString& sKey , sal_Int32 eMode ); //----------------------------------------------- @@ -226,9 +226,9 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper * (Excepting these keys exists inside different configuration packages ...)) */ static void writeDirectKey(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sPackage, - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey , + const OUString& sPackage, + const OUString& sRelPath, + const OUString& sKey , const css::uno::Any& aValue , sal_Int32 eMode ); }; diff --git a/comphelper/inc/comphelper/container.hxx b/comphelper/inc/comphelper/container.hxx index 62903dd7fdbe..d6c5be927873 100644 --- a/comphelper/inc/comphelper/container.hxx +++ b/comphelper/inc/comphelper/container.hxx @@ -47,7 +47,7 @@ protected: // so I have to remember where each child is in relation to its parent. // That is the path from the root node to m_xCurrentObject - ::rtl::OUString m_ustrProperty; + OUString m_ustrProperty; // The Name of the requested property public: diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx index f44838ee37a8..24fd868c0735 100644 --- a/comphelper/inc/comphelper/docpasswordhelper.hxx +++ b/comphelper/inc/comphelper/docpasswordhelper.hxx @@ -73,7 +73,7 @@ public: occurred while password verification. The password request loop will be aborted. */ - virtual DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0; + virtual DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0; /** Will be called everytime an encryption data needs to be verified. @@ -115,7 +115,7 @@ public: */ static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - GenerateNewModifyPasswordInfo( const ::rtl::OUString& aPassword ); + GenerateNewModifyPasswordInfo( const OUString& aPassword ); // ------------------------------------------------------------------------ @@ -134,7 +134,7 @@ public: */ static sal_Bool IsModifyPasswordCorrect( - const ::rtl::OUString& aPassword, + const OUString& aPassword, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aInfo ); @@ -151,7 +151,7 @@ public: */ static sal_uInt32 GetWordHashAsUINT32( - const ::rtl::OUString& aString ); + const OUString& aString ); // ------------------------------------------------------------------------ @@ -171,7 +171,7 @@ public: */ static sal_uInt16 GetXLHashAsUINT16( - const ::rtl::OUString& aString, + const OUString& aString, rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 ); // ------------------------------------------------------------------------ @@ -192,7 +192,7 @@ public: */ static ::com::sun::star::uno::Sequence< sal_Int8 > GetXLHashAsSequence( - const ::rtl::OUString& aString, + const OUString& aString, rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 ); // ------------------------------------------------------------------------ @@ -211,7 +211,7 @@ public: */ static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateStd97Key( - const ::rtl::OUString& aPassword, + const OUString& aPassword, const ::com::sun::star::uno::Sequence< sal_Int8 >& aDocId ); // ------------------------------------------------------------------------ @@ -282,12 +282,12 @@ public: static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestAndVerifyDocPassword( IDocPasswordVerifier& rVerifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rMediaEncData, - const ::rtl::OUString& rMediaPassword, + const OUString& rMediaPassword, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& rxInteractHandler, - const ::rtl::OUString& rDocumentName, + const OUString& rDocumentName, DocPasswordRequestType eRequestType, - const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0, + const ::std::vector< OUString >* pDefaultPasswords = 0, bool* pbIsDefaultPassword = 0 ); // ------------------------------------------------------------------------ @@ -336,7 +336,7 @@ public: IDocPasswordVerifier& rVerifier, MediaDescriptor& rMediaDesc, DocPasswordRequestType eRequestType, - const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0 ); + const ::std::vector< OUString >* pDefaultPasswords = 0 ); // ------------------------------------------------------------------------ diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx index fd3232279867..54a32f522ae6 100644 --- a/comphelper/inc/comphelper/docpasswordrequest.hxx +++ b/comphelper/inc/comphelper/docpasswordrequest.hxx @@ -58,7 +58,7 @@ public: sal_Bool isPassword() const; - ::rtl::OUString getPassword() const; + OUString getPassword() const; private: // XInteractionRequest @@ -85,7 +85,7 @@ public: explicit DocPasswordRequest( DocPasswordRequestType eType, ::com::sun::star::task::PasswordRequestMode eMode, - const ::rtl::OUString& rDocumentName, + const OUString& rDocumentName, sal_Bool bPasswordToModify = sal_False ); virtual ~DocPasswordRequest(); @@ -96,9 +96,9 @@ public: sal_Bool isPassword() const; - ::rtl::OUString getPassword() const; + OUString getPassword() const; - ::rtl::OUString getPasswordToModify() const; + OUString getPasswordToModify() const; sal_Bool getRecommendReadOnly() const; private: diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx index 1f8dbd2f14ef..2bc00220995f 100644 --- a/comphelper/inc/comphelper/documentconstants.hxx +++ b/comphelper/inc/comphelper/documentconstants.hxx @@ -32,15 +32,15 @@ #define MIMETYPE_VND_SUN_XML_MATH_ASCII "application/vnd.sun.xml.math" #define MIMETYPE_VND_SUN_XML_BASE_ASCII "application/vnd.sun.xml.base" -#define MIMETYPE_VND_SUN_XML_WRITER ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII ) -#define MIMETYPE_VND_SUN_XML_WRITER_WEB ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII ) -#define MIMETYPE_VND_SUN_XML_WRITER_GLOBAL ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII ) -#define MIMETYPE_VND_SUN_XML_DRAW ::rtl::OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII ) -#define MIMETYPE_VND_SUN_XML_IMPRESS ::rtl::OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) -#define MIMETYPE_VND_SUN_XML_CALC ::rtl::OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII ) -#define MIMETYPE_VND_SUN_XML_CHART ::rtl::OUString( MIMETYPE_VND_SUN_XML_CHART_ASCII ) -#define MIMETYPE_VND_SUN_XML_MATH ::rtl::OUString( MIMETYPE_VND_SUN_XML_MATH_ASCII ) -#define MIMETYPE_VND_SUN_XML_BASE ::rtl::OUString( MIMETYPE_VND_SUN_XML_BASE_ASCII ) +#define MIMETYPE_VND_SUN_XML_WRITER OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII ) +#define MIMETYPE_VND_SUN_XML_WRITER_WEB OUString( MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII ) +#define MIMETYPE_VND_SUN_XML_WRITER_GLOBAL OUString( MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII ) +#define MIMETYPE_VND_SUN_XML_DRAW OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII ) +#define MIMETYPE_VND_SUN_XML_IMPRESS OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) +#define MIMETYPE_VND_SUN_XML_CALC OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII ) +#define MIMETYPE_VND_SUN_XML_CHART OUString( MIMETYPE_VND_SUN_XML_CHART_ASCII ) +#define MIMETYPE_VND_SUN_XML_MATH OUString( MIMETYPE_VND_SUN_XML_MATH_ASCII ) +#define MIMETYPE_VND_SUN_XML_BASE OUString( MIMETYPE_VND_SUN_XML_BASE_ASCII ) // template formats of SO6/7 #define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII "application/vnd.sun.xml.writer.template" @@ -48,10 +48,10 @@ #define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII "application/vnd.sun.xml.impress.template" #define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII "application/vnd.sun.xml.calc.template" -#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII ) -#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE ::rtl::OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII ) -#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE ::rtl::OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) -#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE ::rtl::OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII ) +#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII ) +#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII ) +#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) +#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII ) // formats of SO8 #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII "application/vnd.oasis.opendocument.text" @@ -66,17 +66,17 @@ #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII "application/vnd.sun.xml.report" #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII "application/vnd.sun.xml.report.chart" -#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) -#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ) -#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ) -#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ) -#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ) -#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ) -#define MIMETYPE_OASIS_OPENDOCUMENT_CHART ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) -#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) -#define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) -#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) -#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION OUString( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET OUString( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_CHART OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA OUString( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE OUString( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) // template formats of SO8 #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII "application/vnd.oasis.opendocument.text-template" @@ -98,9 +98,9 @@ #define ODFVER_011_TEXT_ASCII "1.1" #define ODFVER_012_TEXT_ASCII "1.2" -#define ODFVER_010_TEXT ::rtl::OUString( ODFVER_010_TEXT_ASCII ) -#define ODFVER_011_TEXT ::rtl::OUString( ODFVER_011_TEXT_ASCII ) -#define ODFVER_012_TEXT ::rtl::OUString( ODFVER_012_TEXT_ASCII ) +#define ODFVER_010_TEXT OUString( ODFVER_010_TEXT_ASCII ) +#define ODFVER_011_TEXT OUString( ODFVER_011_TEXT_ASCII ) +#define ODFVER_012_TEXT OUString( ODFVER_012_TEXT_ASCII ) #endif // filter flags diff --git a/comphelper/inc/comphelper/documentinfo.hxx b/comphelper/inc/comphelper/documentinfo.hxx index e97b749443b2..48bc39a8cc00 100644 --- a/comphelper/inc/comphelper/documentinfo.hxx +++ b/comphelper/inc/comphelper/documentinfo.hxx @@ -36,7 +36,7 @@ namespace comphelper { public: /** retrieves the UI title of the given document */ - static ::rtl::OUString getDocumentTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument ); + static OUString getDocumentTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument ); private: DocumentInfo(); // never implemented diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx index 2312b2d072fa..0347e12ba2c2 100644 --- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx +++ b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx @@ -53,15 +53,15 @@ class COMPHELPER_DLLPUBLIC EmbeddedObjectContainer { EmbedImpl* pImpl; - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > Get_Impl( const ::rtl::OUString&, + ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > Get_Impl( const OUString&, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xCopy); public: // add an embedded object to the container storage - sal_Bool StoreEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString&, sal_Bool ); + sal_Bool StoreEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString&, sal_Bool ); // add an embedded object that has been imported from the container storage - should only be called by filters! - void AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, const ::rtl::OUString& ); + void AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, const OUString& ); EmbeddedObjectContainer(); EmbeddedObjectContainer( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& ); @@ -73,86 +73,86 @@ public: sal_Bool CommitImageSubStorage(); void ReleaseImageSubStorage(); - ::rtl::OUString CreateUniqueObjectName(); + OUString CreateUniqueObjectName(); // get a list of object names that have been added so far - com::sun::star::uno::Sequence < ::rtl::OUString > GetObjectNames(); + com::sun::star::uno::Sequence < OUString > GetObjectNames(); // check for existence of objects at all sal_Bool HasEmbeddedObjects(); // check existence of an object - either by identity or by name - sal_Bool HasEmbeddedObject( const ::rtl::OUString& ); + sal_Bool HasEmbeddedObject( const OUString& ); sal_Bool HasEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); - sal_Bool HasInstantiatedEmbeddedObject( const ::rtl::OUString& ); + sal_Bool HasInstantiatedEmbeddedObject( const OUString& ); // get the object name of an object - this is the persist name if the object has persistence - ::rtl::OUString GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); + OUString GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); // retrieve an embedded object by name that either has been added already or is available in the container storage - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > GetEmbeddedObject( const ::rtl::OUString& ); + ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > GetEmbeddedObject( const OUString& ); // create an object from a ClassId ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > - CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&, ::rtl::OUString& ); + CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&, OUString& ); ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&, - const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, ::rtl::OUString& ); + const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, OUString& ); // insert an embedded object into the container - objects persistent representation will be added to the storage - sal_Bool InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& ); + sal_Bool InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& ); // load an embedded object from a MediaDescriptor and insert it into the container // a new object will be created from the new content and returned ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > - InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, ::rtl::OUString& ); + InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, OUString& ); // create an embedded link based on a MediaDescriptor and insert it into the container // a new object will be created from the new content and returned ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > - InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, ::rtl::OUString& ); + InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, OUString& ); // create an object from a stream that contains its persistent representation and insert it as usual (usually called from clipboard) // a new object will be created from the new content and returned ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > - InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >&, ::rtl::OUString& ); + InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >&, OUString& ); // copy an embedded object into the storage, open the new copy and return it - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, /* TODO const ::rtl::OUString& aOrigName,*/ ::rtl::OUString& rName ); + ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, /* TODO const OUString& aOrigName,*/ OUString& rName ); // move an embedded object from one container to another one - sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& ); + sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& ); // remove an embedded object from the container and from the storage; if object can't be closed - sal_Bool RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose=sal_True ); + sal_Bool RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose=sal_True ); sal_Bool RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose=sal_True ); // close and remove an embedded object from the container without removing it from the storage sal_Bool CloseEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); // move an embedded object to another container (keep the persistent name) - sal_Bool MoveEmbeddedObject( const ::rtl::OUString& rName, EmbeddedObjectContainer& ); + sal_Bool MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& ); // get the stored graphical representation for the object - com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString* pMediaType=0 ); + com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString* pMediaType=0 ); // get the stored graphical representation by the object name - com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::rtl::OUString& aName, ::rtl::OUString* pMediaType=0 ); + com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const OUString& aName, OUString* pMediaType=0 ); // add a graphical representation for an object - sal_Bool InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const ::rtl::OUString& rMediaType ); + sal_Bool InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ); // try to add a graphical representation for an object in optimized way ( might fail ) - sal_Bool InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType ); + sal_Bool InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ); // remove a graphical representation for an object - sal_Bool RemoveGraphicStream( const ::rtl::OUString& rObjectName ); + sal_Bool RemoveGraphicStream( const OUString& rObjectName ); // copy the graphical representation from different container sal_Bool TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc, - const ::rtl::OUString& aOrigName, - const ::rtl::OUString& aTargetName ); + const OUString& aOrigName, + const OUString& aTargetName ); void CloseEmbeddedObjects(); sal_Bool StoreChildren(sal_Bool _bOasisFormat,sal_Bool _bObjectsOnly); @@ -163,7 +163,7 @@ public: static com::sun::star::uno::Reference< com::sun::star::io::XInputStream > GetGraphicReplacementStream( sal_Int64 nViewAspect, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, - ::rtl::OUString* pMediaType ); + OUString* pMediaType ); /** call setPersistentEntry for each embedded object in the container * diff --git a/comphelper/inc/comphelper/enumhelper.hxx b/comphelper/inc/comphelper/enumhelper.hxx index f8ff700f60a1..9870291b22f5 100644 --- a/comphelper/inc/comphelper/enumhelper.hxx +++ b/comphelper/inc/comphelper/enumhelper.hxx @@ -58,7 +58,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock , public ::cppu::WeakImplHelper2< starcontainer::XEnumeration , starlang::XEventListener > { - staruno::Sequence< ::rtl::OUString > m_aNames; + staruno::Sequence< OUString > m_aNames; sal_Int32 m_nPos; staruno::Reference< starcontainer::XNameAccess > m_xAccess; sal_Bool m_bListening; @@ -66,7 +66,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock public: OEnumerationByName(const staruno::Reference< starcontainer::XNameAccess >& _rxAccess); OEnumerationByName(const staruno::Reference< starcontainer::XNameAccess >& _rxAccess, - const staruno::Sequence< ::rtl::OUString >& _aNames ); + const staruno::Sequence< OUString >& _aNames ); virtual ~OEnumerationByName(); virtual sal_Bool SAL_CALL hasMoreElements( ) throw(staruno::RuntimeException); diff --git a/comphelper/inc/comphelper/evtmethodhelper.hxx b/comphelper/inc/comphelper/evtmethodhelper.hxx index f2aec5cdfef0..7ecf08a0fc57 100644 --- a/comphelper/inc/comphelper/evtmethodhelper.hxx +++ b/comphelper/inc/comphelper/evtmethodhelper.hxx @@ -22,7 +22,7 @@ //........................................................................ namespace comphelper { - COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type); + COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type); //........................................................................ } // namespace comphelper diff --git a/comphelper/inc/comphelper/ihwrapnofilter.hxx b/comphelper/inc/comphelper/ihwrapnofilter.hxx index 2ac1ac93d761..eb0b13957874 100644 --- a/comphelper/inc/comphelper/ihwrapnofilter.hxx +++ b/comphelper/inc/comphelper/ihwrapnofilter.hxx @@ -52,8 +52,8 @@ namespace comphelper { OIHWrapNoFilterDialog( com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteraction ); ~OIHWrapNoFilterDialog(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static OUString SAL_CALL impl_staticGetImplementationName(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); //____________________________________________________________________________________________________ @@ -83,13 +83,13 @@ namespace comphelper { // XServiceInfo //____________________________________________________________________________________________________ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException ); }; diff --git a/comphelper/inc/comphelper/interaction.hxx b/comphelper/inc/comphelper/interaction.hxx index 230604ef87c9..bbd925efd3fa 100644 --- a/comphelper/inc/comphelper/interaction.hxx +++ b/comphelper/inc/comphelper/interaction.hxx @@ -113,17 +113,17 @@ namespace comphelper { } - OInteractionPassword( const ::rtl::OUString& _rInitialPassword ) + OInteractionPassword( const OUString& _rInitialPassword ) :m_sPassword( _rInitialPassword ) { } // XInteractionPassword - virtual void SAL_CALL setPassword( const ::rtl::OUString& _Password ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPassword( const OUString& _Password ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException); private: - ::rtl::OUString m_sPassword; + OUString m_sPassword; }; //========================================================================= diff --git a/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx index 56bebab74145..b6356384af3d 100644 --- a/comphelper/inc/comphelper/logging.hxx +++ b/comphelper/inc/comphelper/logging.hxx @@ -41,23 +41,23 @@ namespace comphelper namespace log { namespace convert { - inline const ::rtl::OUString& convertLogArgToString( const ::rtl::OUString& _rValue ) + inline const OUString& convertLogArgToString( const OUString& _rValue ) { return _rValue; } - inline ::rtl::OUString convertLogArgToString( const sal_Char* _pAsciiValue ) + inline OUString convertLogArgToString( const sal_Char* _pAsciiValue ) { - return ::rtl::OUString::createFromAscii( _pAsciiValue ); + return OUString::createFromAscii( _pAsciiValue ); } - inline ::rtl::OUString convertLogArgToString( double _nValue ) { return ::rtl::OUString::valueOf( _nValue ); } - inline ::rtl::OUString convertLogArgToString( float _nValue ) { return ::rtl::OUString::valueOf( _nValue ); } - inline ::rtl::OUString convertLogArgToString( sal_Int64 _nValue ) { return ::rtl::OUString::valueOf( _nValue ); } - inline ::rtl::OUString convertLogArgToString( sal_Int32 _nValue ) { return ::rtl::OUString::valueOf( _nValue ); } - inline ::rtl::OUString convertLogArgToString( sal_Int16 _nValue ) { return ::rtl::OUString::valueOf( (sal_Int32)_nValue ); } - inline ::rtl::OUString convertLogArgToString( sal_Unicode _nValue ) { return ::rtl::OUString::valueOf( _nValue ); } - inline ::rtl::OUString convertLogArgToString( sal_Bool _nValue ) { return ::rtl::OUString::valueOf( _nValue ); } + inline OUString convertLogArgToString( double _nValue ) { return OUString::valueOf( _nValue ); } + inline OUString convertLogArgToString( float _nValue ) { return OUString::valueOf( _nValue ); } + inline OUString convertLogArgToString( sal_Int64 _nValue ) { return OUString::valueOf( _nValue ); } + inline OUString convertLogArgToString( sal_Int32 _nValue ) { return OUString::valueOf( _nValue ); } + inline OUString convertLogArgToString( sal_Int16 _nValue ) { return OUString::valueOf( (sal_Int32)_nValue ); } + inline OUString convertLogArgToString( sal_Unicode _nValue ) { return OUString::valueOf( _nValue ); } + inline OUString convertLogArgToString( sal_Bool _nValue ) { return OUString::valueOf( _nValue ); } } } // namespace log::convert @@ -65,7 +65,7 @@ namespace comphelper //= EventLogger //==================================================================== class EventLogger_Impl; - typedef ::boost::optional< ::rtl::OUString > OptionalString; + typedef ::boost::optional< OUString > OptionalString; /** encapsulates an XLogger @@ -120,7 +120,7 @@ namespace comphelper //- string messages /// logs a given message, without any arguments, or source class/method names - bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage ) const + bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, NULL, NULL, _rMessage ); @@ -135,7 +135,7 @@ namespace comphelper is searched in the message string, and replaced with the argument string. */ template< typename ARGTYPE1 > - bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1 ) const + bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, NULL, NULL, _rMessage, @@ -145,7 +145,7 @@ namespace comphelper /// logs a given message, replacing 2 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2 > - bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const + bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, NULL, NULL, _rMessage, @@ -156,7 +156,7 @@ namespace comphelper /// logs a given message, replacing 3 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 > - bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const + bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, NULL, NULL, _rMessage, @@ -168,7 +168,7 @@ namespace comphelper /// logs a given message, replacing 4 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 > - bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const + bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, NULL, NULL, _rMessage, @@ -181,7 +181,7 @@ namespace comphelper /// logs a given message, replacing 5 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 > - bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const + bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, NULL, NULL, _rMessage, @@ -195,7 +195,7 @@ namespace comphelper /// logs a given message, replacing 6 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 > - bool log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const + bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, NULL, NULL, _rMessage, @@ -216,7 +216,7 @@ namespace comphelper bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ) ); + return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ) ); return false; } @@ -231,7 +231,7 @@ namespace comphelper bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ), + return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ) ); return false; } @@ -241,7 +241,7 @@ namespace comphelper bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ), + return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ), OptionalString( log::convert::convertLogArgToString( _argument2 ) ) ); return false; @@ -252,7 +252,7 @@ namespace comphelper bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ), + return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ), OptionalString( log::convert::convertLogArgToString( _argument2 ) ), OptionalString( log::convert::convertLogArgToString( _argument3 ) ) ); @@ -264,7 +264,7 @@ namespace comphelper bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ), + return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ), OptionalString( log::convert::convertLogArgToString( _argument2 ) ), OptionalString( log::convert::convertLogArgToString( _argument3 ) ), @@ -277,7 +277,7 @@ namespace comphelper bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ), + return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ), OptionalString( log::convert::convertLogArgToString( _argument2 ) ), OptionalString( log::convert::convertLogArgToString( _argument3 ) ), @@ -291,7 +291,7 @@ namespace comphelper bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ), + return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ), OptionalString( log::convert::convertLogArgToString( _argument2 ) ), OptionalString( log::convert::convertLogArgToString( _argument3 ) ), @@ -306,7 +306,7 @@ namespace comphelper //- string messages /// logs a given message, without any arguments, or source class/method names - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage ) const + bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage ); @@ -321,7 +321,7 @@ namespace comphelper is searched in the message string, and replaced with the argument string. */ template< typename ARGTYPE1 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1 ) const + bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -331,7 +331,7 @@ namespace comphelper /// logs a given message, replacing 2 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const + bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -342,7 +342,7 @@ namespace comphelper /// logs a given message, replacing 3 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const + bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -354,7 +354,7 @@ namespace comphelper /// logs a given message, replacing 4 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const + bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -367,7 +367,7 @@ namespace comphelper /// logs a given message, replacing 5 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const + bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -381,7 +381,7 @@ namespace comphelper /// logs a given message, replacing 6 placeholders in the message with respective values template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 > - bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const + bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const { if ( isLoggable( _nLogLevel ) ) return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, @@ -402,7 +402,7 @@ namespace comphelper bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ) ); + return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ) ); return false; } @@ -417,7 +417,7 @@ namespace comphelper bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ), + return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ) ); return false; } @@ -427,7 +427,7 @@ namespace comphelper bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ), + return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ), OptionalString( log::convert::convertLogArgToString( _argument2 ) ) ); return false; @@ -438,7 +438,7 @@ namespace comphelper bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ), + return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ), OptionalString( log::convert::convertLogArgToString( _argument2 ) ), OptionalString( log::convert::convertLogArgToString( _argument3 ) ) ); @@ -450,7 +450,7 @@ namespace comphelper bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ), + return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ), OptionalString( log::convert::convertLogArgToString( _argument2 ) ), OptionalString( log::convert::convertLogArgToString( _argument3 ) ), @@ -463,7 +463,7 @@ namespace comphelper bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ), + return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ), OptionalString( log::convert::convertLogArgToString( _argument2 ) ), OptionalString( log::convert::convertLogArgToString( _argument3 ) ), @@ -477,7 +477,7 @@ namespace comphelper bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const { if ( isLoggable( _nLogLevel ) ) - return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ), + return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), OptionalString( log::convert::convertLogArgToString( _argument1 ) ), OptionalString( log::convert::convertLogArgToString( _argument2 ) ), OptionalString( log::convert::convertLogArgToString( _argument3 ) ), @@ -492,7 +492,7 @@ namespace comphelper const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, - const ::rtl::OUString& _rMessage, + const OUString& _rMessage, const OptionalString& _rArgument1 = OptionalString(), const OptionalString& _rArgument2 = OptionalString(), const OptionalString& _rArgument3 = OptionalString(), @@ -714,7 +714,7 @@ namespace comphelper } private: - ::rtl::OUString impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const; + OUString impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const; }; //........................................................................ diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx index ac045dc2c4a0..7c7174644292 100644 --- a/comphelper/inc/comphelper/mediadescriptor.hxx +++ b/comphelper/inc/comphelper/mediadescriptor.hxx @@ -52,47 +52,47 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap does not work as expected under windows (under unix it works as well) these way must be used :-( */ - static const ::rtl::OUString& PROP_ABORTED(); - static const ::rtl::OUString& PROP_ASTEMPLATE(); - static const ::rtl::OUString& PROP_COMPONENTDATA(); - static const ::rtl::OUString& PROP_DOCUMENTSERVICE(); - static const ::rtl::OUString& PROP_ENCRYPTIONDATA(); - static const ::rtl::OUString& PROP_FILENAME(); - static const ::rtl::OUString& PROP_FILTERNAME(); - static const ::rtl::OUString& PROP_FILTERPROVIDER(); - static const ::rtl::OUString& PROP_FILTEROPTIONS(); - static const ::rtl::OUString& PROP_FRAME(); - static const ::rtl::OUString& PROP_FRAMENAME(); - static const ::rtl::OUString& PROP_HIDDEN(); - static const ::rtl::OUString& PROP_INPUTSTREAM(); - static const ::rtl::OUString& PROP_INTERACTIONHANDLER(); - static const ::rtl::OUString& PROP_JUMPMARK(); - static const ::rtl::OUString& PROP_MACROEXECUTIONMODE(); - static const ::rtl::OUString& PROP_MEDIATYPE(); - static const ::rtl::OUString& PROP_MINIMIZED(); - static const ::rtl::OUString& PROP_NOAUTOSAVE(); - static const ::rtl::OUString& PROP_OPENNEWVIEW(); - static const ::rtl::OUString& PROP_OUTPUTSTREAM(); - static const ::rtl::OUString& PROP_PASSWORD(); - static const ::rtl::OUString& PROP_POSTDATA(); - static const ::rtl::OUString& PROP_PREVIEW(); - static const ::rtl::OUString& PROP_READONLY(); - static const ::rtl::OUString& PROP_REFERRER(); - static const ::rtl::OUString& PROP_SALVAGEDFILE(); - static const ::rtl::OUString& PROP_STATUSINDICATOR(); - static const ::rtl::OUString& PROP_STREAM(); - static const ::rtl::OUString& PROP_STREAMFOROUTPUT(); - static const ::rtl::OUString& PROP_TEMPLATENAME(); - static const ::rtl::OUString& PROP_TITLE(); - static const ::rtl::OUString& PROP_TYPENAME(); - static const ::rtl::OUString& PROP_UCBCONTENT(); - static const ::rtl::OUString& PROP_UPDATEDOCMODE(); - static const ::rtl::OUString& PROP_URL(); - static const ::rtl::OUString& PROP_VERSION(); - static const ::rtl::OUString& PROP_DOCUMENTTITLE(); - static const ::rtl::OUString& PROP_MODEL(); - static const ::rtl::OUString& PROP_VIEWONLY(); - static const ::rtl::OUString& PROP_DOCUMENTBASEURL(); + static const OUString& PROP_ABORTED(); + static const OUString& PROP_ASTEMPLATE(); + static const OUString& PROP_COMPONENTDATA(); + static const OUString& PROP_DOCUMENTSERVICE(); + static const OUString& PROP_ENCRYPTIONDATA(); + static const OUString& PROP_FILENAME(); + static const OUString& PROP_FILTERNAME(); + static const OUString& PROP_FILTERPROVIDER(); + static const OUString& PROP_FILTEROPTIONS(); + static const OUString& PROP_FRAME(); + static const OUString& PROP_FRAMENAME(); + static const OUString& PROP_HIDDEN(); + static const OUString& PROP_INPUTSTREAM(); + static const OUString& PROP_INTERACTIONHANDLER(); + static const OUString& PROP_JUMPMARK(); + static const OUString& PROP_MACROEXECUTIONMODE(); + static const OUString& PROP_MEDIATYPE(); + static const OUString& PROP_MINIMIZED(); + static const OUString& PROP_NOAUTOSAVE(); + static const OUString& PROP_OPENNEWVIEW(); + static const OUString& PROP_OUTPUTSTREAM(); + static const OUString& PROP_PASSWORD(); + static const OUString& PROP_POSTDATA(); + static const OUString& PROP_PREVIEW(); + static const OUString& PROP_READONLY(); + static const OUString& PROP_REFERRER(); + static const OUString& PROP_SALVAGEDFILE(); + static const OUString& PROP_STATUSINDICATOR(); + static const OUString& PROP_STREAM(); + static const OUString& PROP_STREAMFOROUTPUT(); + static const OUString& PROP_TEMPLATENAME(); + static const OUString& PROP_TITLE(); + static const OUString& PROP_TYPENAME(); + static const OUString& PROP_UCBCONTENT(); + static const OUString& PROP_UPDATEDOCMODE(); + static const OUString& PROP_URL(); + static const OUString& PROP_VERSION(); + static const OUString& PROP_DOCUMENTTITLE(); + static const OUString& PROP_MODEL(); + static const OUString& PROP_VIEWONLY(); + static const OUString& PROP_DOCUMENTBASEURL(); static const OUString& PROP_DEEPDETECTION(); @@ -179,7 +179,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap Any. */ ::com::sun::star::uno::Any getComponentDataEntry( - const ::rtl::OUString& rName ) const; + const OUString& rName ) const; //--------------------------------------- /** Inserts a value into the sequence contained in the property @@ -198,7 +198,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap 'ComponentData' property. */ void setComponentDataEntry( - const ::rtl::OUString& rName, + const OUString& rName, const ::com::sun::star::uno::Any& rValue ); //--------------------------------------- @@ -214,7 +214,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap of the 'ComponentData' property. */ void clearComponentDataEntry( - const ::rtl::OUString& rName ); + const OUString& rName ); //------------------------------------------- // helper @@ -267,7 +267,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap if the MediaDescriptor seems to be invalid! */ COMPHELPER_DLLPRIVATE sal_Bool impl_openStreamWithURL( - const ::rtl::OUString& sURL, + const OUString& sURL, sal_Bool bLockFile ) throw(::com::sun::star::uno::RuntimeException); @@ -281,7 +281,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap @return [string] the "normalized" URL (e.g. without jumpmark) */ - COMPHELPER_DLLPRIVATE ::rtl::OUString impl_normalizeURL(const ::rtl::OUString& sURL); + COMPHELPER_DLLPRIVATE OUString impl_normalizeURL(const OUString& sURL); //--------------------------------------- /** @short it checks if the descriptor already has a valid diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx index 8cf7953394e7..6e2b128d5a23 100644 --- a/comphelper/inc/comphelper/mimeconfighelper.hxx +++ b/comphelper/inc/comphelper/mimeconfighelper.hxx @@ -51,13 +51,13 @@ public: MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); - static ::rtl::OUString GetStringClassIDRepresentation( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID ); + static OUString GetStringClassIDRepresentation( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID ); - static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassIDRepresentation( const ::rtl::OUString& aClassID ); + static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassIDRepresentation( const OUString& aClassID ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - GetConfigurationByPath( const ::rtl::OUString& aPath ); + GetConfigurationByPath( const OUString& aPath ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetObjConfiguration(); @@ -65,61 +65,61 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetMediaTypeConfiguration(); - ::rtl::OUString GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName ); + OUString GetDocServiceNameFromFilter( const OUString& aFilterName ); - ::rtl::OUString GetDocServiceNameFromMediaType( const ::rtl::OUString& aMediaType ); + OUString GetDocServiceNameFromMediaType( const OUString& aMediaType ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjPropsFromConfigEntry( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xObjectProps ); - sal_Bool GetVerbByShortcut( const ::rtl::OUString& aVerbShortcut, + sal_Bool GetVerbByShortcut( const OUString& aVerbShortcut, ::com::sun::star::embed::VerbDescriptor& aDescriptor ); - ::rtl::OUString GetExplicitlyRegisteredObjClassID( const ::rtl::OUString& aMediaType ); + OUString GetExplicitlyRegisteredObjClassID( const OUString& aMediaType ); // retrieving object description from configuration ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByStringClassID( - const ::rtl::OUString& aStringClassID ); + const OUString& aStringClassID ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByClassID( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByMediaType( - const ::rtl::OUString& aMediaType ); + const OUString& aMediaType ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByFilter( - const ::rtl::OUString& aFilterName ); + const OUString& aFilterName ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByDocumentName( - const ::rtl::OUString& aDocumentName ); + const OUString& aDocumentName ); // retrieving object factory from configuration - ::rtl::OUString GetFactoryNameByStringClassID( const ::rtl::OUString& aStringClassID ); - ::rtl::OUString GetFactoryNameByClassID( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID ); - ::rtl::OUString GetFactoryNameByDocumentName( const ::rtl::OUString& aDocName ); - ::rtl::OUString GetFactoryNameByMediaType( const ::rtl::OUString& aMediaType ); + OUString GetFactoryNameByStringClassID( const OUString& aStringClassID ); + OUString GetFactoryNameByClassID( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID ); + OUString GetFactoryNameByDocumentName( const OUString& aDocName ); + OUString GetFactoryNameByMediaType( const OUString& aMediaType ); // typedetection related ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetFilterFactory(); - ::rtl::OUString UpdateMediaDescriptorWithFilterName( + OUString UpdateMediaDescriptorWithFilterName( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, sal_Bool bIgnoreType ); - ::rtl::OUString UpdateMediaDescriptorWithFilterName( + OUString UpdateMediaDescriptorWithFilterName( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObject ); #ifdef WNT - sal_Int32 GetFilterFlags( const ::rtl::OUString& aFilterName ); + sal_Int32 GetFilterFlags( const OUString& aFilterName ); sal_Bool AddFilterNameCheckOwnFile( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ); #endif - ::rtl::OUString GetDefaultFilterFromServiceName( const ::rtl::OUString& aServName, sal_Int32 nVersion ); + OUString GetDefaultFilterFromServiceName( const OUString& aServName, sal_Int32 nVersion ); - ::rtl::OUString GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName ); + OUString GetExportFilterFromImportFilter( const OUString& aImportFilterName ); static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery, diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx index f42602bfccb4..93b53dd14c6c 100644 --- a/comphelper/inc/comphelper/namedvaluecollection.hxx +++ b/comphelper/inc/comphelper/namedvaluecollection.hxx @@ -132,7 +132,7 @@ namespace comphelper /** returns the names of all elements in the collection */ - ::std::vector< ::rtl::OUString > + ::std::vector< OUString > getNames() const; /** merges the content of another collection into |this| @@ -171,11 +171,11 @@ namespace comphelper template < typename VALUE_TYPE > bool get_ensureType( const sal_Char* _pAsciiValueName, VALUE_TYPE& _out_rValue ) const { - return get_ensureType( ::rtl::OUString::createFromAscii( _pAsciiValueName ), &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() ); + return get_ensureType( OUString::createFromAscii( _pAsciiValueName ), &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() ); } template < typename VALUE_TYPE > - bool get_ensureType( const ::rtl::OUString& _rValueName, VALUE_TYPE& _out_rValue ) const + bool get_ensureType( const OUString& _rValueName, VALUE_TYPE& _out_rValue ) const { return get_ensureType( _rValueName, &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() ); } @@ -186,11 +186,11 @@ namespace comphelper template < typename VALUE_TYPE > VALUE_TYPE getOrDefault( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rDefault ) const { - return getOrDefault( ::rtl::OUString::createFromAscii( _pAsciiValueName ), _rDefault ); + return getOrDefault( OUString::createFromAscii( _pAsciiValueName ), _rDefault ); } template < typename VALUE_TYPE > - VALUE_TYPE getOrDefault( const ::rtl::OUString& _rValueName, const VALUE_TYPE& _rDefault ) const + VALUE_TYPE getOrDefault( const OUString& _rValueName, const VALUE_TYPE& _rDefault ) const { VALUE_TYPE retVal( _rDefault ); get_ensureType( _rValueName, retVal ); @@ -204,7 +204,7 @@ namespace comphelper */ const ::com::sun::star::uno::Any& get( const sal_Char* _pAsciiValueName ) const { - return get( ::rtl::OUString::createFromAscii( _pAsciiValueName ) ); + return get( OUString::createFromAscii( _pAsciiValueName ) ); } /** retrieves a (untyped) value with a given name @@ -212,7 +212,7 @@ namespace comphelper If the collection does not contain a value with the given name, an empty Any is returned. */ - const ::com::sun::star::uno::Any& get( const ::rtl::OUString& _rValueName ) const + const ::com::sun::star::uno::Any& get( const OUString& _rValueName ) const { return impl_get( _rValueName ); } @@ -220,11 +220,11 @@ namespace comphelper /// determines whether a value with a given name is present in the collection inline bool has( const sal_Char* _pAsciiValueName ) const { - return impl_has( ::rtl::OUString::createFromAscii( _pAsciiValueName ) ); + return impl_has( OUString::createFromAscii( _pAsciiValueName ) ); } /// determines whether a value with a given name is present in the collection - inline bool has( const ::rtl::OUString& _rValueName ) const + inline bool has( const OUString& _rValueName ) const { return impl_has( _rValueName ); } @@ -237,7 +237,7 @@ namespace comphelper template < typename VALUE_TYPE > inline bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue ) { - return impl_put( ::rtl::OUString::createFromAscii( _pAsciiValueName ), ::com::sun::star::uno::makeAny( _rValue ) ); + return impl_put( OUString::createFromAscii( _pAsciiValueName ), ::com::sun::star::uno::makeAny( _rValue ) ); } /** puts a value into the collection @@ -246,17 +246,17 @@ namespace comphelper which case it has been overwritten. */ template < typename VALUE_TYPE > - inline bool put( const ::rtl::OUString& _rValueName, const VALUE_TYPE& _rValue ) + inline bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue ) { return impl_put( _rValueName, ::com::sun::star::uno::makeAny( _rValue ) ); } inline bool put( const sal_Char* _pAsciiValueName, const ::com::sun::star::uno::Any& _rValue ) { - return impl_put( ::rtl::OUString::createFromAscii( _pAsciiValueName ), _rValue ); + return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue ); } - inline bool put( const ::rtl::OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue ) + inline bool put( const OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue ) { return impl_put( _rValueName, _rValue ); } @@ -267,14 +267,14 @@ namespace comphelper */ inline bool remove( const sal_Char* _pAsciiValueName ) { - return impl_remove( ::rtl::OUString::createFromAscii( _pAsciiValueName ) ); + return impl_remove( OUString::createFromAscii( _pAsciiValueName ) ); } /** removes the value with the given name from the collection @return if and only if a value with the given name existed in the collection. */ - inline bool remove( const ::rtl::OUString& _rValueName ) + inline bool remove( const OUString& _rValueName ) { return impl_remove( _rValueName ); } @@ -336,19 +336,19 @@ namespace comphelper void impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rArguments ); bool get_ensureType( - const ::rtl::OUString& _rValueName, + const OUString& _rValueName, void* _pValueLocation, const ::com::sun::star::uno::Type& _rExpectedValueType ) const; const ::com::sun::star::uno::Any& - impl_get( const ::rtl::OUString& _rValueName ) const; + impl_get( const OUString& _rValueName ) const; - bool impl_has( const ::rtl::OUString& _rValueName ) const; + bool impl_has( const OUString& _rValueName ) const; - bool impl_put( const ::rtl::OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue ); + bool impl_put( const OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue ); - bool impl_remove( const ::rtl::OUString& _rValueName ); + bool impl_remove( const OUString& _rValueName ); template< class VALUE_TYPE > ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > impl_wrap() const diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx index 59183e460b9e..6a311767658d 100644 --- a/comphelper/inc/comphelper/numberedcollection.hxx +++ b/comphelper/inc/comphelper/numberedcollection.hxx @@ -104,7 +104,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex @param sPrefix the new prefix for untitled components. */ - void setUntitledPrefix(const ::rtl::OUString& sPrefix); + void setUntitledPrefix(const OUString& sPrefix); //--------------------------------------- /** @see css.frame.XUntitledNumbers */ @@ -126,7 +126,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex //--------------------------------------- /** @see css.frame.XUntitledNumbers */ - virtual ::rtl::OUString SAL_CALL getUntitledPrefix() + virtual OUString SAL_CALL getUntitledPrefix() throw (css::uno::RuntimeException); //------------------------------------------- @@ -160,7 +160,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex private: /// localized string to be used for untitled components - ::rtl::OUString m_sUntitledPrefix; + OUString m_sUntitledPrefix; /// cache of all "leased numbers" and its bound components TNumberedItemHash m_lComponents; diff --git a/comphelper/inc/comphelper/numbers.hxx b/comphelper/inc/comphelper/numbers.hxx index 87ae613a1084..b64fe341da4f 100644 --- a/comphelper/inc/comphelper/numbers.hxx +++ b/comphelper/inc/comphelper/numbers.hxx @@ -55,7 +55,7 @@ namespace comphelper COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Any getNumberFormatProperty( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, sal_Int32 _nKey, - const rtl::OUString& _rPropertyName + const OUString& _rPropertyName ); //......................................................................... diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/comphelper/inc/comphelper/officeresourcebundle.hxx index 8bec9326524b..5e6d9e1bccc5 100644 --- a/comphelper/inc/comphelper/officeresourcebundle.hxx +++ b/comphelper/inc/comphelper/officeresourcebundle.hxx @@ -73,7 +73,7 @@ namespace comphelper an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this then. */ - ::rtl::OUString loadString( sal_Int32 _resourceId ) const; + OUString loadString( sal_Int32 _resourceId ) const; /** determines whether the resource bundle has a string with the given id @param _resourceId diff --git a/comphelper/inc/comphelper/ofopxmlhelper.hxx b/comphelper/inc/comphelper/ofopxmlhelper.hxx index c263022166cd..e054d0dbc909 100644 --- a/comphelper/inc/comphelper/ofopxmlhelper.hxx +++ b/comphelper/inc/comphelper/ofopxmlhelper.hxx @@ -37,28 +37,28 @@ class COMPHELPER_DLLPUBLIC OFOPXMLHelper : public cppu::WeakImplHelper1 < com::s sal_uInt16 m_nFormat; // which format to parse // Relations info related strings - ::rtl::OUString m_aRelListElement; - ::rtl::OUString m_aRelElement; - ::rtl::OUString m_aIDAttr; - ::rtl::OUString m_aTypeAttr; - ::rtl::OUString m_aTargetModeAttr; - ::rtl::OUString m_aTargetAttr; + OUString m_aRelListElement; + OUString m_aRelElement; + OUString m_aIDAttr; + OUString m_aTypeAttr; + OUString m_aTargetModeAttr; + OUString m_aTargetAttr; // ContentType related strings - ::rtl::OUString m_aTypesElement; - ::rtl::OUString m_aDefaultElement; - ::rtl::OUString m_aOverrideElement; - ::rtl::OUString m_aExtensionAttr; - ::rtl::OUString m_aPartNameAttr; - ::rtl::OUString m_aContentTypeAttr; + OUString m_aTypesElement; + OUString m_aDefaultElement; + OUString m_aOverrideElement; + OUString m_aExtensionAttr; + OUString m_aPartNameAttr; + OUString m_aContentTypeAttr; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aResultSeq; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aElementsSeq; // stack of elements being parsed + ::com::sun::star::uno::Sequence< OUString > m_aElementsSeq; // stack of elements being parsed OFOPXMLHelper( sal_uInt16 nFormat ); // must not be created directly ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > GetParsingResult(); - static COMPHELPER_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL ReadSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, sal_uInt16 nFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) + static COMPHELPER_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL ReadSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const OUString& aStringID, sal_uInt16 nFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) throw( ::com::sun::star::uno::Exception ); public: @@ -72,7 +72,7 @@ public: SAL_CALL ReadRelationsInfoSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, - const ::rtl::OUString aStreamName, + const OUString aStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) throw( ::com::sun::star::uno::Exception ); @@ -115,11 +115,11 @@ public: // XDocumentHandler virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); }; diff --git a/comphelper/inc/comphelper/propagg.hxx b/comphelper/inc/comphelper/propagg.hxx index f499b2091a33..e49f589990e7 100644 --- a/comphelper/inc/comphelper/propagg.hxx +++ b/comphelper/inc/comphelper/propagg.hxx @@ -73,7 +73,7 @@ public: @return the handle the property should be refered by, or -1 if there are no preferences for the given property */ - virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName) = 0; + virtual sal_Int32 getPreferedPropertyId(const OUString& _rName) = 0; protected: ~IPropertyInfoService() {} @@ -125,21 +125,21 @@ public: /// inherited from IPropertyArrayHelper - virtual sal_Bool SAL_CALL fillPropertyMembersByHandle( ::rtl::OUString* _pPropName, sal_Int16* _pAttributes, + virtual sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle) ; /// inherited from IPropertyArrayHelper virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> SAL_CALL getProperties(); /// inherited from IPropertyArrayHelper - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const ::rtl::OUString& _rPropertyName) + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& _rPropertyName) throw(::com::sun::star::beans::UnknownPropertyException); /// inherited from IPropertyArrayHelper - virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& _rPropertyName) ; + virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& _rPropertyName) ; /// inherited from IPropertyArrayHelper - virtual sal_Int32 SAL_CALL getHandleByName(const ::rtl::OUString & _rPropertyName); + virtual sal_Int32 SAL_CALL getHandleByName(const OUString & _rPropertyName); /// inherited from IPropertyArrayHelper - virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropNames ); + virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< OUString >& _rPropNames ); /** returns information about a property of the aggregate. @param _pPropName points to a string to recieve the property name. No name is returned if this is NULL. @@ -149,7 +149,7 @@ public: @return sal_True, if _nHandle marks an aggregate property, otherwise sal_False */ - virtual bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, + virtual bool SAL_CALL fillAggregatePropertyInfoByHandle(OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const; /** returns information about a property given by handle @@ -175,10 +175,10 @@ public: When using the XPropertySetInfo of the aggregate set to determine the existence of a property, then this would return false positives.

      */ - PropertyOrigin classifyProperty( const ::rtl::OUString& _rName ); + PropertyOrigin classifyProperty( const OUString& _rName ); protected: - const ::com::sun::star::beans::Property* findPropertyByName(const ::rtl::OUString& _rName) const; + const ::com::sun::star::beans::Property* findPropertyByName(const OUString& _rName) const; }; //================================================================== @@ -221,8 +221,8 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertySet - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertiesChangeListener virtual void SAL_CALL propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt) throw(::com::sun::star::uno::RuntimeException); @@ -231,13 +231,13 @@ public: virtual void SAL_CALL vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& aEvent) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // OPropertySetHelper /** still waiting to be overwritten ... @@ -262,7 +262,7 @@ protected: virtual void SAL_CALL disposing(); sal_Int32 getOriginalHandle( sal_Int32 _nHandle ) const; - ::rtl::OUString getPropertyName( sal_Int32 _nHandle ) const; + OUString getPropertyName( sal_Int32 _nHandle ) const; /** declares the property with the given (public) handle as one to be forwarded to the aggregate diff --git a/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx index 29ff7b2b9eca..e8d75c7ed3d6 100644 --- a/comphelper/inc/comphelper/property.hxx +++ b/comphelper/inc/comphelper/property.hxx @@ -55,15 +55,15 @@ namespace comphelper //-------------------------------------------------------------------------- /** compare two properties by name */ - struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool > + struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, OUString, bool > { // ................................................................ - inline bool operator()( const ::com::sun::star::beans::Property& lhs, const ::rtl::OUString& rhs ) const + inline bool operator()( const ::com::sun::star::beans::Property& lhs, const OUString& rhs ) const { return lhs.Name == rhs ; } // ................................................................ - inline bool operator()( const ::rtl::OUString& lhs, const ::com::sun::star::beans::Property& rhs ) const + inline bool operator()( const OUString& lhs, const ::com::sun::star::beans::Property& rhs ) const { return lhs == rhs.Name ; } @@ -80,7 +80,7 @@ namespace comphelper //------------------------------------------------------------------ /// remove the property with the given name from the given sequence -COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence& seqProps, const ::rtl::OUString& _rPropName); +COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence& seqProps, const OUString& _rPropName); //------------------------------------------------------------------ /** within the given property sequence, modify attributes of a special property @@ -89,12 +89,12 @@ COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence& @param _nAddAttrib the attributes which should be added @param _nRemoveAttrib the attributes which should be removed */ -COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence& _rProps, const ::rtl::OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib); +COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence& _rProps, const OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib); //------------------------------------------------------------------ /** check if the given set has the given property. */ -COMPHELPER_DLLPUBLIC sal_Bool hasProperty(const rtl::OUString& _rName, const staruno::Reference& _rxSet); +COMPHELPER_DLLPUBLIC sal_Bool hasProperty(const OUString& _rName, const staruno::Reference& _rxSet); //------------------------------------------------------------------ /** copy properties between property sets, in compliance with the property diff --git a/comphelper/inc/comphelper/propertybag.hxx b/comphelper/inc/comphelper/propertybag.hxx index 997b9e37015a..92c0026ba845 100644 --- a/comphelper/inc/comphelper/propertybag.hxx +++ b/comphelper/inc/comphelper/propertybag.hxx @@ -78,7 +78,7 @@ namespace comphelper if the name is empty */ void addProperty( - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Any& _rInitialValue @@ -106,7 +106,7 @@ namespace comphelper if the name is empty */ void addVoidProperty( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Type& _rType, sal_Int32 _nHandle, sal_Int32 _nAttributes @@ -123,7 +123,7 @@ namespace comphelper call. */ void removeProperty( - const ::rtl::OUString& _rName + const OUString& _rName ); /** describes all properties in the bag @@ -202,7 +202,7 @@ namespace comphelper /** determines whether a property with a given name is part of the bag */ - inline bool hasPropertyByName( const ::rtl::OUString& _rName ) const + inline bool hasPropertyByName( const OUString& _rName ) const { return isRegisteredProperty( _rName ); } diff --git a/comphelper/inc/comphelper/propertycontainerhelper.hxx b/comphelper/inc/comphelper/propertycontainerhelper.hxx index 97e581a3d5c2..dacefd8737a6 100644 --- a/comphelper/inc/comphelper/propertycontainerhelper.hxx +++ b/comphelper/inc/comphelper/propertycontainerhelper.hxx @@ -54,7 +54,7 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription LocationAccess aLocation; // access to the property value PropertyDescription() - :aProperty( ::rtl::OUString(), -1, ::com::sun::star::uno::Type(), 0 ) + :aProperty( OUString(), -1, ::com::sun::star::uno::Type(), 0 ) ,eLocated( ltHoldMyself ) { aLocation.nOwnClassVectorIndex = -1; @@ -101,7 +101,7 @@ protected: @param _rMemberType the cppu type of the property represented by the object to which _pPointerToMember points. */ - void registerProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, + void registerProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType); @@ -115,7 +115,7 @@ protected: @param _rExpectedType the expected type of the property. NOT the type of the object to which _pPointerToMember points (this is always an Any). */ - void registerMayBeVoidProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, + void registerMayBeVoidProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType); /** register a property. The repository will create an own object holding this property, so there is no @@ -128,7 +128,7 @@ protected: the ::com::sun::star::beans::PropertyAttribute::MAYBEVOID flag. Else it must be a pointer to an object of the type described by _rType. */ - void registerPropertyNoMember(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, + void registerPropertyNoMember(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue); /** revokes a previously registered property @@ -142,7 +142,7 @@ protected: sal_Bool isRegisteredProperty( sal_Int32 _nHandle ) const; /// checkes whether a property with the given name has been registered - sal_Bool isRegisteredProperty( const ::rtl::OUString& _rName ) const; + sal_Bool isRegisteredProperty( const OUString& _rName ) const; // helper for implementing OPropertySetHelper overridables @@ -180,7 +180,7 @@ protected: if no property with the given name is registered */ const ::com::sun::star::beans::Property& - getProperty( const ::rtl::OUString& _rName ) const; + getProperty( const OUString& _rName ) const; private: /// insertion of _rProp into m_aProperties, keeping the sort order diff --git a/comphelper/inc/comphelper/propertysethelper.hxx b/comphelper/inc/comphelper/propertysethelper.hxx index c9f1b4da5f78..ecc600c37d3c 100644 --- a/comphelper/inc/comphelper/propertysethelper.hxx +++ b/comphelper/inc/comphelper/propertysethelper.hxx @@ -60,26 +60,26 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; //......................................................................... diff --git a/comphelper/inc/comphelper/propertysetinfo.hxx b/comphelper/inc/comphelper/propertysetinfo.hxx index a9056fb270a2..e0b863e8f2ca 100644 --- a/comphelper/inc/comphelper/propertysetinfo.hxx +++ b/comphelper/inc/comphelper/propertysetinfo.hxx @@ -71,11 +71,11 @@ public: void add( PropertyMapEntry* pMap ) throw(); /** removes an already added PropertyMapEntry which string in mpName equals to aName */ - void remove( const rtl::OUString& aName ) throw(); + void remove( const OUString& aName ) throw(); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException); }; //......................................................................... diff --git a/comphelper/inc/comphelper/propertystatecontainer.hxx b/comphelper/inc/comphelper/propertystatecontainer.hxx index e21b3a372827..acd368646628 100644 --- a/comphelper/inc/comphelper/propertystatecontainer.hxx +++ b/comphelper/inc/comphelper/propertystatecontainer.hxx @@ -59,10 +59,10 @@ namespace comphelper // ................................................................ // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ................................................................ // own overridables @@ -102,7 +102,7 @@ namespace comphelper @throw UnknownPropertyException if the given name is not a registered property */ - sal_Int32 getHandleForName( const ::rtl::OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) ); + sal_Int32 getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) ); }; //......................................................................... diff --git a/comphelper/inc/comphelper/propmultiplex.hxx b/comphelper/inc/comphelper/propmultiplex.hxx index 51484ce04e16..28795e57ce8a 100644 --- a/comphelper/inc/comphelper/propmultiplex.hxx +++ b/comphelper/inc/comphelper/propmultiplex.hxx @@ -71,7 +71,7 @@ namespace comphelper class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer :public cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> { friend class OPropertyChangeListener; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aProperties; + ::com::sun::star::uno::Sequence< OUString > m_aProperties; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSet; OPropertyChangeListener* m_pListener; sal_Int32 m_nLockCount; @@ -96,7 +96,7 @@ namespace comphelper /// get the lock count sal_Int32 locked() const { return m_nLockCount; } - void addProperty(const ::rtl::OUString& aPropertyName); + void addProperty(const OUString& aPropertyName); void dispose(); }; diff --git a/comphelper/inc/comphelper/propstate.hxx b/comphelper/inc/comphelper/propstate.hxx index b0e14c517f09..727f40d96824 100644 --- a/comphelper/inc/comphelper/propstate.hxx +++ b/comphelper/inc/comphelper/propstate.hxx @@ -57,13 +57,13 @@ namespace comphelper // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL - getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL - getPropertyStates(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL - setPropertyToDefault(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL - getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // access via handle virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); diff --git a/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx index 9dc41b7cc68a..ad1e8943b952 100644 --- a/comphelper/inc/comphelper/sequence.hxx +++ b/comphelper/inc/comphelper/sequence.hxx @@ -38,7 +38,7 @@ namespace comphelper /** search the given string within the given sequence, return the positions where it was found. if _bOnlyFirst is sal_True, only the first occurrence will be returned. */ - COMPHELPER_DLLPUBLIC staruno::Sequence findValue(const staruno::Sequence< ::rtl::OUString >& _rList, const ::rtl::OUString& _rValue, sal_Bool _bOnlyFirst = sal_False); + COMPHELPER_DLLPUBLIC staruno::Sequence findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, sal_Bool _bOnlyFirst = sal_False); /** Checks if the name exists * @@ -46,7 +46,7 @@ namespace comphelper * \param _aList The list in which to search for the value. * \return if the value can be found, otherwise . */ - COMPHELPER_DLLPUBLIC sal_Bool existsValue(const ::rtl::OUString& Value,const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _aList); + COMPHELPER_DLLPUBLIC sal_Bool existsValue(const OUString& Value,const ::com::sun::star::uno::Sequence< OUString >& _aList); //------------------------------------------------------------------------- diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx index acf61f1a9031..0c8353776931 100644 --- a/comphelper/inc/comphelper/sequenceashashmap.hxx +++ b/comphelper/inc/comphelper/sequenceashashmap.hxx @@ -43,10 +43,10 @@ namespace comphelper{ */ struct SequenceAsHashMapBase : public ::boost::unordered_map< - ::rtl::OUString , + OUString , ::com::sun::star::uno::Any , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > + OUStringHash , + ::std::equal_to< OUString > > { }; @@ -226,7 +226,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @attention "unpacked" means the Any content of every iterator->second! */ template< class TValueType > - TValueType getUnpackedValueOrDefault(const ::rtl::OUString& sKey , + TValueType getUnpackedValueOrDefault(const OUString& sKey , const TValueType& aDefault) const { const_iterator pIt = find(sKey); @@ -262,7 +262,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase FALSE if it already exists. */ template< class TValueType > - sal_Bool createItemIfMissing(const ::rtl::OUString& sKey , + sal_Bool createItemIfMissing(const OUString& sKey , const TValueType& aValue) { if (find(sKey) == end()) diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx index d02e47fba612..be3b275cf215 100644 --- a/comphelper/inc/comphelper/servicedecl.hxx +++ b/comphelper/inc/comphelper/servicedecl.hxx @@ -120,14 +120,14 @@ public: void * getFactory( sal_Char const* pImplName ) const; /// @return supported service names - ::com::sun::star::uno::Sequence< ::rtl::OUString> + ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames() const; /// @return whether name is in set of supported service names - bool supportsService( ::rtl::OUString const& name ) const; + bool supportsService( OUString const& name ) const; /// @return implementation name - ::rtl::OUString getImplementationName() const; + OUString getImplementationName() const; private: class Factory; @@ -165,15 +165,15 @@ public: : BaseT(xContext), m_rServiceDecl(rServiceDecl) {} // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return m_rServiceDecl.getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService( ::rtl::OUString const& name ) + virtual sal_Bool SAL_CALL supportsService( OUString const& name ) throw (css::uno::RuntimeException) { return m_rServiceDecl.supportsService(name); } - virtual css::uno::Sequence< ::rtl::OUString> + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return m_rServiceDecl.getSupportedServiceNames(); } diff --git a/comphelper/inc/comphelper/serviceinfohelper.hxx b/comphelper/inc/comphelper/serviceinfohelper.hxx index 5c78f69e37a6..25169d1043a0 100644 --- a/comphelper/inc/comphelper/serviceinfohelper.hxx +++ b/comphelper/inc/comphelper/serviceinfohelper.hxx @@ -35,13 +35,13 @@ class COMPHELPER_DLLPUBLIC ServiceInfoHelper : public ::com::sun::star::lang::XS { public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // helper - static void addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw(); - static sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw(); + static void addToSequence( ::com::sun::star::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw(); + static sal_Bool SAL_CALL supportsService( const OUString& ServiceName, const ::com::sun::star::uno::Sequence< OUString >& SupportedServices ) throw(); protected: ~ServiceInfoHelper() {} diff --git a/comphelper/inc/comphelper/stl_types.hxx b/comphelper/inc/comphelper/stl_types.hxx index 1292f698a54a..cef5afdff3f2 100644 --- a/comphelper/inc/comphelper/stl_types.hxx +++ b/comphelper/inc/comphelper/stl_types.hxx @@ -46,17 +46,17 @@ namespace comphelper // comparisation functions //------------------------------------------------------------------------ - struct UStringLess : public ::std::binary_function< ::rtl::OUString, ::rtl::OUString, bool> + struct UStringLess : public ::std::binary_function< OUString, OUString, bool> { - bool operator() (const ::rtl::OUString& x, const ::rtl::OUString& y) const { return x < y ? true : false;} // construct prevents a MSVC6 warning + bool operator() (const OUString& x, const OUString& y) const { return x < y ? true : false;} // construct prevents a MSVC6 warning }; //------------------------------------------------------------------------ -struct UStringMixLess : public ::std::binary_function< ::rtl::OUString, ::rtl::OUString, bool> +struct UStringMixLess : public ::std::binary_function< OUString, OUString, bool> { bool m_bCaseSensitive; public: UStringMixLess(bool bCaseSensitive = true):m_bCaseSensitive(bCaseSensitive){} - bool operator() (const ::rtl::OUString& x, const ::rtl::OUString& y) const + bool operator() (const OUString& x, const OUString& y) const { if (m_bCaseSensitive) return rtl_ustr_compare(x.getStr(), y.getStr()) < 0 ? true : false; @@ -69,13 +69,13 @@ public: //------------------------------------------------------------------------ struct UStringEqual { - sal_Bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const { return lhs.equals( rhs );} + sal_Bool operator() (const OUString& lhs, const OUString& rhs) const { return lhs.equals( rhs );} }; //------------------------------------------------------------------------ struct UStringIEqual { - sal_Bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const { return lhs.equalsIgnoreAsciiCase( rhs );} + sal_Bool operator() (const OUString& lhs, const OUString& rhs) const { return lhs.equalsIgnoreAsciiCase( rhs );} }; //------------------------------------------------------------------------ @@ -85,14 +85,14 @@ class UStringMixEqual public: UStringMixEqual(sal_Bool bCaseSensitive = sal_True):m_bCaseSensitive(bCaseSensitive){} - sal_Bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const + sal_Bool operator() (const OUString& lhs, const OUString& rhs) const { return m_bCaseSensitive ? lhs.equals( rhs ) : lhs.equalsIgnoreAsciiCase( rhs ); } sal_Bool isCaseSensitive() const {return m_bCaseSensitive;} }; //------------------------------------------------------------------------ -class TStringMixEqualFunctor : public ::std::binary_function< ::rtl::OUString,::rtl::OUString,bool> +class TStringMixEqualFunctor : public ::std::binary_function< OUString,OUString,bool> { sal_Bool m_bCaseSensitive; @@ -100,30 +100,30 @@ public: TStringMixEqualFunctor(sal_Bool bCaseSensitive = sal_True) :m_bCaseSensitive(bCaseSensitive) {} - bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const + bool operator() (const OUString& lhs, const OUString& rhs) const { return !!(m_bCaseSensitive ? lhs.equals( rhs ) : lhs.equalsIgnoreAsciiCase( rhs )); } sal_Bool isCaseSensitive() const {return m_bCaseSensitive;} }; //------------------------------------------------------------------------ -class TPropertyValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,::rtl::OUString,bool> +class TPropertyValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,OUString,bool> { public: TPropertyValueEqualFunctor() {} - bool operator() (const ::com::sun::star::beans::PropertyValue& lhs, const ::rtl::OUString& rhs) const + bool operator() (const ::com::sun::star::beans::PropertyValue& lhs, const OUString& rhs) const { return !!(lhs.Name == rhs); } }; //------------------------------------------------------------------------ -class TNamedValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::NamedValue,::rtl::OUString,bool> +class TNamedValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::NamedValue,OUString,bool> { public: TNamedValueEqualFunctor() {} - bool operator() (const ::com::sun::star::beans::NamedValue& lhs, const ::rtl::OUString& rhs) const + bool operator() (const ::com::sun::star::beans::NamedValue& lhs, const OUString& rhs) const { return !!(lhs.Name == rhs); } @@ -135,7 +135,7 @@ class UStringMixHash public: UStringMixHash(sal_Bool bCaseSensitive = sal_True):m_bCaseSensitive(bCaseSensitive){} - size_t operator() (const ::rtl::OUString& rStr) const + size_t operator() (const OUString& rStr) const { return m_bCaseSensitive ? rStr.hashCode() : rStr.toAsciiUpperCase().hashCode(); } @@ -195,9 +195,9 @@ public: typedef void pointer; typedef size_t difference_type; - OUStringBufferAppender(::rtl::OUStringBuffer & i_rBuffer) + OUStringBufferAppender(OUStringBuffer & i_rBuffer) : m_rBuffer(i_rBuffer) { } - Self & operator=(::rtl::OUString const & i_rStr) + Self & operator=(OUString const & i_rStr) { m_rBuffer.append( i_rStr ); return *this; @@ -207,7 +207,7 @@ public: Self & operator++(int) { return *this; } private: - ::rtl::OUStringBuffer & m_rBuffer; + OUStringBuffer & m_rBuffer; }; //......................................................................... @@ -258,7 +258,7 @@ OutputIter intersperse( DECLARE_STL_ITERATORS(classname) \ #define DECLARE_STL_USTRINGACCESS_MAP(valuetype, classname) \ - DECLARE_STL_MAP(::rtl::OUString, valuetype, ::comphelper::UStringLess, classname) \ + DECLARE_STL_MAP(OUString, valuetype, ::comphelper::UStringLess, classname) \ #define DECLARE_STL_STDKEY_SET(valuetype, classname) \ typedef ::std::set< valuetype > classname; \ diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx index b3351aa2b553..093038e6e5ed 100644 --- a/comphelper/inc/comphelper/storagehelper.hxx +++ b/comphelper/inc/comphelper/storagehelper.hxx @@ -27,13 +27,13 @@ #include "comphelper/comphelperdllapi.h" -#define PACKAGE_STORAGE_FORMAT_STRING ::rtl::OUString( "PackageFormat" ) -#define ZIP_STORAGE_FORMAT_STRING ::rtl::OUString( "ZipFormat" ) -#define OFOPXML_STORAGE_FORMAT_STRING ::rtl::OUString( "OFOPXMLFormat" ) +#define PACKAGE_STORAGE_FORMAT_STRING OUString( "PackageFormat" ) +#define ZIP_STORAGE_FORMAT_STRING OUString( "ZipFormat" ) +#define OFOPXML_STORAGE_FORMAT_STRING OUString( "OFOPXMLFormat" ) -#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 ::rtl::OUString( "PackageSHA256UTF8EncryptionKey" ) -#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 ::rtl::OUString( "PackageSHA1UTF8EncryptionKey" ) -#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString( "PackageSHA1MS1252EncryptionKey" ) +#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 OUString( "PackageSHA256UTF8EncryptionKey" ) +#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 OUString( "PackageSHA1UTF8EncryptionKey" ) +#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 OUString( "PackageSHA1MS1252EncryptionKey" ) namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } @@ -89,7 +89,7 @@ public: /// this one will only return Storage static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorageFromURL( - const ::rtl::OUString& aURL, + const OUString& aURL, sal_Int32 nStorageMode, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) @@ -98,7 +98,7 @@ public: /// this one will return either Storage or FileSystemStorage static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorageFromURL2( - const ::rtl::OUString& aURL, + const OUString& aURL, sal_Int32 nStorageMode, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) @@ -127,7 +127,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetInputStreamFromURL( - const ::rtl::OUString& aURL, + const OUString& aURL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& context ) throw ( ::com::sun::star::uno::Exception ); @@ -143,8 +143,8 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorageOfFormatFromURL( - const ::rtl::OUString& aFormat, - const ::rtl::OUString& aURL, + const OUString& aFormat, + const OUString& aURL, sal_Int32 nStorageMode, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(), @@ -153,7 +153,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorageOfFormatFromInputStream( - const ::rtl::OUString& aFormat, + const OUString& aFormat, const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xStream, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(), @@ -162,7 +162,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorageOfFormatFromStream( - const ::rtl::OUString& aFormat, + const OUString& aFormat, const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xStream, sal_Int32 nStorageMode = ::com::sun::star::embed::ElementModes::READWRITE, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext @@ -172,24 +172,24 @@ public: static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > CreatePackageEncryptionData( - const ::rtl::OUString& aPassword ); + const OUString& aPassword ); - static sal_Bool IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed ); + static sal_Bool IsValidZipEntryFileName( const OUString& aName, sal_Bool bSlashAllowed ); static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed ); - static sal_Bool PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment ); + static sal_Bool PathHasSegment( const OUString& aPath, const OUString& aSegment ); // Methods to allow easy use of hierachical names inside storages static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorageAtPath( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage, - const ::rtl::OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ); + const OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ); static ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStreamAtPath( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage, - const ::rtl::OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ); + const OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ); static ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStreamAtPackageURL( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage, - const ::rtl::OUString& rURL, sal_uInt32 const nOpenMode, + const OUString& rURL, sal_uInt32 const nOpenMode, LifecycleProxy & rNastiness ); }; diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx index 6e28895f7d90..85b0816b895e 100644 --- a/comphelper/inc/comphelper/string.hxx +++ b/comphelper/inc/comphelper/string.hxx @@ -33,7 +33,7 @@ #include #include -// rtl::OUString helper functions that are not widespread or mature enough to +// OUString helper functions that are not widespread or mature enough to // go into the stable URE API: namespace comphelper { namespace string { @@ -44,7 +44,7 @@ namespace comphelper { namespace string { @return true if rIn has one char and its equal to c */ -inline bool equals(const rtl::OString& rIn, sal_Char c) +inline bool equals(const OString& rIn, sal_Char c) { return rIn.getLength() == 1 && rIn[0] == c; } /** Compare an OUString to a single char @@ -54,12 +54,12 @@ inline bool equals(const rtl::OString& rIn, sal_Char c) @return true if rIn has one char and its equal to c */ -inline bool equals(const rtl::OUString& rIn, sal_Unicode c) +inline bool equals(const OUString& rIn, sal_Unicode c) { return rIn.getLength() == 1 && rIn[0] == c; } /** Removes all occurrences of a character from within the source string - @deprecated Use rtl::OString::replaceAll(rtl::OString(c), rtl::OString()) + @deprecated Use OString::replaceAll(OString(c), OString()) instead. @param rIn The input OString @@ -67,23 +67,23 @@ inline bool equals(const rtl::OUString& rIn, sal_Unicode c) @return The resulting OString */ -inline rtl::OString remove(const rtl::OString &rIn, +inline OString remove(const OString &rIn, sal_Char c) -{ return rIn.replaceAll(rtl::OString(c), rtl::OString()); } +{ return rIn.replaceAll(OString(c), OString()); } /** Removes all occurrences of a character from within the source string @deprecated Use - rtl::OUString::replaceAll(rtl::OUString(c), rtl::OUString()) instead. + OUString::replaceAll(OUString(c), OUString()) instead. @param rIn The input OUString @param c The character to be removed @return The resulting OUString */ -inline rtl::OUString remove(const rtl::OUString &rIn, +inline OUString remove(const OUString &rIn, sal_Unicode c) -{ return rIn.replaceAll(rtl::OUString(c), rtl::OUString()); } +{ return rIn.replaceAll(OUString(c), OUString()); } /** Strips occurrences of a character from the start of the source string @@ -92,7 +92,7 @@ inline rtl::OUString remove(const rtl::OUString &rIn, @return The resulting OString */ -COMPHELPER_DLLPUBLIC rtl::OString stripStart(const rtl::OString &rIn, +COMPHELPER_DLLPUBLIC OString stripStart(const OString &rIn, sal_Char c); /** Strips occurrences of a character from the start of the source string @@ -102,7 +102,7 @@ COMPHELPER_DLLPUBLIC rtl::OString stripStart(const rtl::OString &rIn, @return The resulting OUString */ -COMPHELPER_DLLPUBLIC rtl::OUString stripStart(const rtl::OUString &rIn, +COMPHELPER_DLLPUBLIC OUString stripStart(const OUString &rIn, sal_Unicode c); /** Strips occurrences of a character from the end of the source string @@ -112,7 +112,7 @@ COMPHELPER_DLLPUBLIC rtl::OUString stripStart(const rtl::OUString &rIn, @return The resulting OString */ -COMPHELPER_DLLPUBLIC rtl::OString stripEnd(const rtl::OString &rIn, +COMPHELPER_DLLPUBLIC OString stripEnd(const OString &rIn, sal_Char c); /** Strips occurrences of a character from the end of the source string @@ -122,7 +122,7 @@ COMPHELPER_DLLPUBLIC rtl::OString stripEnd(const rtl::OString &rIn, @return The resulting OUString */ -COMPHELPER_DLLPUBLIC rtl::OUString stripEnd(const rtl::OUString &rIn, +COMPHELPER_DLLPUBLIC OUString stripEnd(const OUString &rIn, sal_Unicode c); /** Strips occurrences of a character from the start and end of the source string @@ -132,7 +132,7 @@ COMPHELPER_DLLPUBLIC rtl::OUString stripEnd(const rtl::OUString &rIn, @return The resulting OString */ -COMPHELPER_DLLPUBLIC rtl::OString strip(const rtl::OString &rIn, +COMPHELPER_DLLPUBLIC OString strip(const OString &rIn, sal_Char c); /** Strips occurrences of a character from the start and end of the source string @@ -142,12 +142,12 @@ COMPHELPER_DLLPUBLIC rtl::OString strip(const rtl::OString &rIn, @return The resulting OUString */ -COMPHELPER_DLLPUBLIC rtl::OUString strip(const rtl::OUString &rIn, +COMPHELPER_DLLPUBLIC OUString strip(const OUString &rIn, sal_Unicode c); /** Returns a token in an OString - @deprecated Use rtl::OString::getToken(nToken, cTok) instead. + @deprecated Use OString::getToken(nToken, cTok) instead. @param rIn the input OString @param nToken the number of the token to return @@ -155,7 +155,7 @@ COMPHELPER_DLLPUBLIC rtl::OUString strip(const rtl::OUString &rIn, @return the token if token is negative or doesn't exist an empty token is returned */ -inline rtl::OString getToken(const rtl::OString &rIn, +inline OString getToken(const OString &rIn, sal_Int32 nToken, sal_Char cTok) SAL_THROW(()) { return rIn.getToken(nToken, cTok); @@ -163,7 +163,7 @@ inline rtl::OString getToken(const rtl::OString &rIn, /** Returns a token in an OUString - @deprecated Use rtl::OUString::getToken(nToken, cTok) instead. + @deprecated Use OUString::getToken(nToken, cTok) instead. @param rIn the input OUString @param nToken the number of the token to return @@ -171,7 +171,7 @@ inline rtl::OString getToken(const rtl::OString &rIn, @return the token if token is negative or doesn't exist an empty token is returned */ -inline rtl::OUString getToken(const rtl::OUString &rIn, +inline OUString getToken(const OUString &rIn, sal_Int32 nToken, sal_Unicode cTok) SAL_THROW(()) { return rIn.getToken(nToken, cTok); @@ -183,7 +183,7 @@ inline rtl::OUString getToken(const rtl::OUString &rIn, @param cTok the character which seperate the tokens. @return the number of tokens */ -COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const rtl::OString &rIn, sal_Char cTok); +COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok); /** Returns number of tokens in an OUString @@ -191,21 +191,21 @@ COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const rtl::OString &rIn, sal_Char c @param cTok the character which seperate the tokens. @return the number of tokens */ -COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const rtl::OUString &rIn, sal_Unicode cTok); +COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok); /** Reverse an OUString @param rIn the input OUString @return the reversed input */ -COMPHELPER_DLLPUBLIC rtl::OUString reverseString(const rtl::OUString &rStr); +COMPHELPER_DLLPUBLIC OUString reverseString(const OUString &rStr); /** Reverse an OString @param rIn the input OString @return the reversed input */ -COMPHELPER_DLLPUBLIC rtl::OString reverseString(const rtl::OString &rStr); +COMPHELPER_DLLPUBLIC OString reverseString(const OString &rStr); namespace detail @@ -230,14 +230,14 @@ namespace detail @return rBuf; */ -COMPHELPER_DLLPUBLIC inline rtl::OStringBuffer& truncateToLength( - rtl::OStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(()) +COMPHELPER_DLLPUBLIC inline OStringBuffer& truncateToLength( + OStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(()) { return detail::truncateToLength(rBuffer, nLength); } -COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& truncateToLength( - rtl::OUStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(()) +COMPHELPER_DLLPUBLIC inline OUStringBuffer& truncateToLength( + OUStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(()) { return detail::truncateToLength(rBuffer, nLength); } @@ -271,15 +271,15 @@ namespace detail @return rBuf; */ -COMPHELPER_DLLPUBLIC inline rtl::OStringBuffer& padToLength( - rtl::OStringBuffer& rBuffer, sal_Int32 nLength, +COMPHELPER_DLLPUBLIC inline OStringBuffer& padToLength( + OStringBuffer& rBuffer, sal_Int32 nLength, sal_Char cFill = '\0') SAL_THROW(()) { return detail::padToLength(rBuffer, nLength, cFill); } -COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& padToLength( - rtl::OUStringBuffer& rBuffer, sal_Int32 nLength, +COMPHELPER_DLLPUBLIC inline OUStringBuffer& padToLength( + OUStringBuffer& rBuffer, sal_Int32 nLength, sal_Unicode cFill = '\0') SAL_THROW(()) { return detail::padToLength(rBuffer, nLength, cFill); @@ -293,7 +293,7 @@ COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& padToLength( @return position of first occurrence of any of the elements of pChars or -1 if none of the code units occur in the string */ -COMPHELPER_DLLPUBLIC sal_Int32 indexOfAny(rtl::OUString const& rIn, +COMPHELPER_DLLPUBLIC sal_Int32 indexOfAny(OUString const& rIn, sal_Unicode const*const pChars, sal_Int32 const nPos = 0); /** Convert a sequence of strings to a single comma separated string. @@ -305,8 +305,8 @@ COMPHELPER_DLLPUBLIC sal_Int32 indexOfAny(rtl::OUString const& rIn, @return A single string containing the concatenation of the given list, interspersed with the string ", ". */ -COMPHELPER_DLLPUBLIC ::rtl::OUString convertCommaSeparated( - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & i_rSeq); +COMPHELPER_DLLPUBLIC OUString convertCommaSeparated( + ::com::sun::star::uno::Sequence< OUString > const & i_rSeq); /** Convert a decimal string to a number. @@ -319,7 +319,7 @@ COMPHELPER_DLLPUBLIC ::rtl::OUString convertCommaSeparated( gives unspecified results If your string is guaranteed to contain only ASCII digit - use rtl::OUString::toInt32 instead. + use OUString::toInt32 instead. @param str The string to convert containing only decimal digit codepoints. @@ -327,7 +327,7 @@ COMPHELPER_DLLPUBLIC ::rtl::OUString convertCommaSeparated( @return The value of the string as an int32. */ COMPHELPER_DLLPUBLIC sal_uInt32 decimalStringToNumber( - ::rtl::OUString const & str ); + OUString const & str ); /** Convert a single comma separated string to a sequence of strings. @@ -338,8 +338,8 @@ COMPHELPER_DLLPUBLIC sal_uInt32 decimalStringToNumber( @return A sequence of strings resulting from splitting the given string at ',' tokens and stripping whitespace. */ -COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > - convertCommaSeparated( ::rtl::OUString const & i_rString ); +COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > + convertCommaSeparated( OUString const & i_rString ); /** Compares two strings using natural order. @@ -357,7 +357,7 @@ COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > < 0 - if this string is less than the string argument > 0 - if this string is greater than the string argument */ -COMPHELPER_DLLPUBLIC sal_Int32 compareNatural( const ::rtl::OUString &rLHS, const ::rtl::OUString &rRHS, +COMPHELPER_DLLPUBLIC sal_Int32 compareNatural( const OUString &rLHS, const OUString &rRHS, const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > &rCollator, const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > &rBI, const ::com::sun::star::lang::Locale &rLocale ); @@ -372,7 +372,7 @@ public: NaturalStringSorter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext, const ::com::sun::star::lang::Locale &rLocale); - sal_Int32 compare(const rtl::OUString &rLHS, const rtl::OUString &rRHS) const + sal_Int32 compare(const OUString &rLHS, const OUString &rRHS) const { return compareNatural(rLHS, rRHS, m_xCollator, m_xBI, m_aLocale); } @@ -387,7 +387,7 @@ public: the ASCII '0'-'9' range true otherwise, including for empty string */ -COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OString &rString); +COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OString &rString); /** Determine if an OUString contains solely ASCII numeric digits @@ -397,7 +397,7 @@ COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OString &rString); the ASCII '0'-'9' range true otherwise, including for empty string */ -COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OUString &rString); +COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OUString &rString); COMPHELPER_DLLPUBLIC inline bool isdigitAscii(sal_Unicode c) { @@ -437,9 +437,9 @@ struct COMPHELPER_DLLPUBLIC ConstAsciiString const sal_Char* ascii; sal_Int32 length; - operator rtl::OUString() const + operator OUString() const { - return rtl::OUString(ascii, length, RTL_TEXTENCODING_ASCII_US); + return OUString(ascii, length, RTL_TEXTENCODING_ASCII_US); } }; diff --git a/comphelper/inc/comphelper/synchronousdispatch.hxx b/comphelper/inc/comphelper/synchronousdispatch.hxx index 3b3f4a6e4482..fc5c5fe59f4b 100644 --- a/comphelper/inc/comphelper/synchronousdispatch.hxx +++ b/comphelper/inc/comphelper/synchronousdispatch.hxx @@ -52,8 +52,8 @@ namespace comphelper public: static COMPHELPER_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::lang::XComponent > dispatch( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &xStartPoint, - const rtl::OUString &sURL, - const rtl::OUString &sTarget, + const OUString &sURL, + const OUString &sTarget, const sal_Int32 nFlags, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &lArguments ); }; diff --git a/comphelper/inc/comphelper/types.hxx b/comphelper/inc/comphelper/types.hxx index 2f5ad6d353a1..66c6a9e0bcfb 100644 --- a/comphelper/inc/comphelper/types.hxx +++ b/comphelper/inc/comphelper/types.hxx @@ -44,7 +44,7 @@ namespace comphelper namespace starlang = ::com::sun::star::lang; typedef staruno::Reference< staruno::XInterface > InterfaceRef; - typedef staruno::Sequence< ::rtl::OUString > StringSequence; + typedef staruno::Sequence< OUString > StringSequence; //------------------------------------------------------------------------- /** compare the two given Anys @@ -152,7 +152,7 @@ namespace comphelper COMPHELPER_DLLPUBLIC sal_Int16 getINT16(const staruno::Any& _rAny); COMPHELPER_DLLPUBLIC double getDouble(const staruno::Any& _rAny); COMPHELPER_DLLPUBLIC float getFloat(const staruno::Any& _rAny); - COMPHELPER_DLLPUBLIC ::rtl::OUString getString(const staruno::Any& _rAny); + COMPHELPER_DLLPUBLIC OUString getString(const staruno::Any& _rAny); COMPHELPER_DLLPUBLIC sal_Bool getBOOL(const staruno::Any& _rAny); COMPHELPER_DLLPUBLIC sal_Int32 getEnumAsINT32(const staruno::Any& _rAny) throw(starlang::IllegalArgumentException); diff --git a/comphelper/inc/comphelper/unwrapargs.hxx b/comphelper/inc/comphelper/unwrapargs.hxx index ca4681b8992c..c4885f3883d9 100644 --- a/comphelper/inc/comphelper/unwrapargs.hxx +++ b/comphelper/inc/comphelper/unwrapargs.hxx @@ -51,7 +51,7 @@ inline void extract( xErrorContext, static_cast(nArg) ); } if (! (seq[nArg] >>= v)) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( "Cannot extract ANY { " ); buf.append( seq[nArg].getValueType().getTypeName() ); buf.append( " } to " ); diff --git a/comphelper/inc/comphelper/xmltools.hxx b/comphelper/inc/comphelper/xmltools.hxx index c333ecf6acf3..988e8558542c 100644 --- a/comphelper/inc/comphelper/xmltools.hxx +++ b/comphelper/inc/comphelper/xmltools.hxx @@ -39,7 +39,7 @@ namespace comphelper { namespace xml { - COMPHELPER_DLLPUBLIC rtl::OString makeXMLChaff(); + COMPHELPER_DLLPUBLIC OString makeXMLChaff(); } } diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index dd22c4b64875..f89db16f16ca 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -62,25 +62,25 @@ public: void TestString::testDecimalStringToNumber() { - rtl::OUString s1("1234"); + OUString s1("1234"); CPPUNIT_ASSERT_EQUAL((sal_uInt32)1234, comphelper::string::decimalStringToNumber(s1)); - s1 += rtl::OUString(static_cast(0x07C6)); + s1 += OUString(static_cast(0x07C6)); CPPUNIT_ASSERT_EQUAL((sal_uInt32)12346, comphelper::string::decimalStringToNumber(s1)); // Codepoints on 2 16bits words sal_uInt32 utf16String[] = { 0x1D7FE /* 8 */, 0x1D7F7 /* 1 */}; - s1 = rtl::OUString(utf16String, 2); + s1 = OUString(utf16String, 2); CPPUNIT_ASSERT_EQUAL((sal_uInt32)81, comphelper::string::decimalStringToNumber(s1)); } void TestString::testIsdigitAsciiString() { - rtl::OString s1("1234"); + OString s1("1234"); CPPUNIT_ASSERT_EQUAL(comphelper::string::isdigitAsciiString(s1), true); - rtl::OString s2("1A34"); + OString s2("1A34"); CPPUNIT_ASSERT_EQUAL(comphelper::string::isdigitAsciiString(s2), false); - rtl::OString s3; + OString s3; CPPUNIT_ASSERT_EQUAL(comphelper::string::isdigitAsciiString(s3), true); } @@ -90,29 +90,29 @@ class testCollator : public cppu::WeakImplHelper1< i18n::XCollator > { public: virtual sal_Int32 SAL_CALL compareSubstring( - const rtl::OUString& str1, sal_Int32 off1, sal_Int32 len1, - const rtl::OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException) + const OUString& str1, sal_Int32 off1, sal_Int32 len1, + const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException) { return str1.copy(off1, len1).compareTo(str2.copy(off2, len2)); } virtual sal_Int32 SAL_CALL compareString( - const rtl::OUString& str1, - const rtl::OUString& str2) throw(uno::RuntimeException) + const OUString& str1, + const OUString& str2) throw(uno::RuntimeException) { return str1.compareTo(str2); } virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32) throw(uno::RuntimeException) {return 0;} - virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const rtl::OUString&, + virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const OUString&, const lang::Locale&, sal_Int32) throw(uno::RuntimeException) {return 0;} - virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const rtl::OUString&, + virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const OUString&, const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException) {} - virtual uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&) + virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&) throw(uno::RuntimeException) { - return uno::Sequence< rtl::OUString >(); + return uno::Sequence< OUString >(); } - virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const rtl::OUString&) + virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&) throw(uno::RuntimeException) { return uno::Sequence< sal_Int32 >(); @@ -124,42 +124,42 @@ public: class testBreakIterator : public cppu::WeakImplHelper1< i18n::XBreakIterator > { public: - virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString&, sal_Int32, + virtual sal_Int32 SAL_CALL nextCharacters( const OUString&, sal_Int32, const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) throw(uno::RuntimeException) {return -1;} - virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString&, sal_Int32, + virtual sal_Int32 SAL_CALL previousCharacters( const OUString&, sal_Int32, const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) throw(uno::RuntimeException) {return -1;} - virtual i18n::Boundary SAL_CALL previousWord( const rtl::OUString&, sal_Int32, + virtual i18n::Boundary SAL_CALL previousWord( const OUString&, sal_Int32, const lang::Locale&, sal_Int16) throw(uno::RuntimeException) { return i18n::Boundary(); } - virtual i18n::Boundary SAL_CALL nextWord( const rtl::OUString&, sal_Int32, + virtual i18n::Boundary SAL_CALL nextWord( const OUString&, sal_Int32, const lang::Locale&, sal_Int16) throw(uno::RuntimeException) { return i18n::Boundary(); } - virtual i18n::Boundary SAL_CALL getWordBoundary( const rtl::OUString&, sal_Int32, + virtual i18n::Boundary SAL_CALL getWordBoundary( const OUString&, sal_Int32, const lang::Locale&, sal_Int16, sal_Bool ) throw(uno::RuntimeException) { return i18n::Boundary(); } - virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString&, sal_Int32, + virtual sal_Bool SAL_CALL isBeginWord( const OUString&, sal_Int32, const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return false; } - virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString&, sal_Int32, + virtual sal_Bool SAL_CALL isEndWord( const OUString&, sal_Int32, const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException) { return false; } - virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString&, sal_Int32, + virtual sal_Int16 SAL_CALL getWordType( const OUString&, sal_Int32, const lang::Locale& ) throw(uno::RuntimeException) { return 0; } - virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString&, sal_Int32, + virtual sal_Int32 SAL_CALL beginOfSentence( const OUString&, sal_Int32, const lang::Locale& ) throw(uno::RuntimeException) { return 0; } - virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& rText, sal_Int32, + virtual sal_Int32 SAL_CALL endOfSentence( const OUString& rText, sal_Int32, const lang::Locale& ) throw(uno::RuntimeException) { return rText.getLength(); } - virtual i18n::LineBreakResults SAL_CALL getLineBreak( const rtl::OUString&, sal_Int32, + virtual i18n::LineBreakResults SAL_CALL getLineBreak( const OUString&, sal_Int32, const lang::Locale&, sal_Int32, const i18n::LineBreakHyphenationOptions&, const i18n::LineBreakUserOptions&) @@ -168,20 +168,20 @@ public: return i18n::LineBreakResults(); } - virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString&, sal_Int32 ) + virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 ) throw(uno::RuntimeException) { return -1; } - virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString&, sal_Int32, + virtual sal_Int32 SAL_CALL beginOfScript( const OUString&, sal_Int32, sal_Int16 ) throw(uno::RuntimeException) { return -1; } - virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString&, sal_Int32, + virtual sal_Int32 SAL_CALL endOfScript( const OUString&, sal_Int32, sal_Int16 ) throw(uno::RuntimeException) { return -1; } - virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString&, sal_Int32, + virtual sal_Int32 SAL_CALL previousScript( const OUString&, sal_Int32, sal_Int16 ) throw(uno::RuntimeException) { return -1; } - virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString&, sal_Int32, + virtual sal_Int32 SAL_CALL nextScript( const OUString&, sal_Int32, sal_Int16 ) throw(uno::RuntimeException) { return -1; } - virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString&, sal_Int32, + virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString&, sal_Int32, const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; } - virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& rText, sal_Int32 nStartPos, const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException) { const sal_Unicode *pStr = rText.getStr()+nStartPos; @@ -195,9 +195,9 @@ public: } return -1; } - virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString&, sal_Int32, + virtual sal_Int32 SAL_CALL previousCharBlock( const OUString&, sal_Int32, const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; } - virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos, + virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& rText, sal_Int32 nStartPos, const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException) { const sal_Unicode *pStr = rText.getStr()+nStartPos; @@ -280,8 +280,8 @@ void TestString::testNatural() void TestString::testRemove() { - ::rtl::OString aIn("abc"); - ::rtl::OString aOut; + OString aIn("abc"); + OString aOut; aOut = ::comphelper::string::remove(aIn, 'b'); CPPUNIT_ASSERT(aOut == "ac"); @@ -294,8 +294,8 @@ void TestString::testRemove() void TestString::testStripStart() { - ::rtl::OString aIn("abc"); - ::rtl::OString aOut; + OString aIn("abc"); + OString aOut; aOut = ::comphelper::string::stripStart(aIn, 'b'); CPPUNIT_ASSERT(aOut == "abc"); @@ -314,8 +314,8 @@ void TestString::testStripStart() void TestString::testStripEnd() { - ::rtl::OString aIn("abc"); - ::rtl::OString aOut; + OString aIn("abc"); + OString aOut; aOut = ::comphelper::string::stripEnd(aIn, 'b'); CPPUNIT_ASSERT(aOut == "abc"); @@ -334,8 +334,8 @@ void TestString::testStripEnd() void TestString::testStrip() { - ::rtl::OString aIn("abc"); - ::rtl::OString aOut; + OString aIn("abc"); + OString aOut; aOut = ::comphelper::string::strip(aIn, 'b'); CPPUNIT_ASSERT(aOut == "abc"); @@ -354,8 +354,8 @@ void TestString::testStrip() void TestString::testToken() { - ::rtl::OString aIn("10.11.12"); - ::rtl::OString aOut; + OString aIn("10.11.12"); + OString aOut; aOut = ::comphelper::string::getToken(aIn, -1, '.'); CPPUNIT_ASSERT(aOut.isEmpty()); @@ -375,7 +375,7 @@ void TestString::testToken() void TestString::testTokenCount() { - ::rtl::OString aIn("10.11.12"); + OString aIn("10.11.12"); sal_Int32 nOut; nOut = ::comphelper::string::getTokenCount(aIn, '.'); @@ -384,26 +384,26 @@ void TestString::testTokenCount() nOut = ::comphelper::string::getTokenCount(aIn, 'X'); CPPUNIT_ASSERT(nOut == 1); - nOut = ::comphelper::string::getTokenCount(rtl::OString(), 'X'); + nOut = ::comphelper::string::getTokenCount(OString(), 'X'); CPPUNIT_ASSERT(nOut == 0); } void TestString::testReverseString() { - ::rtl::OString aIn("ABC"); - ::rtl::OString aOut = ::comphelper::string::reverseString(aIn); + OString aIn("ABC"); + OString aOut = ::comphelper::string::reverseString(aIn); CPPUNIT_ASSERT(aOut == "CBA"); } void TestString::testEqualsString() { - ::rtl::OString aIn("A"); + OString aIn("A"); CPPUNIT_ASSERT(::comphelper::string::equals(aIn, 'A')); CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'B')); - aIn = ::rtl::OString("AA"); + aIn = OString("AA"); CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'A')); - aIn = ::rtl::OString(); + aIn = OString(); CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'A')); } diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index f9653e5d6008..31d7d798da1e 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::lang; using namespace com::sun::star::i18n; -using ::rtl::OUString; //============================================================================= @@ -84,8 +83,8 @@ public: virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& ); }; diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index 6e2062598f7f..38dca1d9ff62 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -65,13 +65,13 @@ public: throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); private: @@ -214,7 +214,7 @@ sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements( ) } //XServiceInfo -::rtl::OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return getImplementationName_static(); } @@ -224,19 +224,19 @@ OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName_static( return OUString( "IndexedPropertyValuesContainer" ); } -sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" ); return aServiceName == ServiceName; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { return getSupportedServiceNames_static(); } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames_static( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames_static( ) { const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" ); const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 83c1a395cfa6..61ff126ee849 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -42,25 +42,25 @@ public: virtual ~NamedPropertyValuesContainer() throw(); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -70,13 +70,13 @@ public: throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); private: @@ -92,7 +92,7 @@ NamedPropertyValuesContainer::~NamedPropertyValuesContainer() throw() } // XNameContainer -void SAL_CALL NamedPropertyValuesContainer::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -106,7 +106,7 @@ void SAL_CALL NamedPropertyValuesContainer::insertByName( const rtl::OUString& a maProperties.insert( NamedPropertyValues::value_type(aName ,aProps) ); } -void SAL_CALL NamedPropertyValuesContainer::removeByName( const ::rtl::OUString& Name ) +void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -118,7 +118,7 @@ void SAL_CALL NamedPropertyValuesContainer::removeByName( const ::rtl::OUString& } // XNameReplace -void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) +void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -134,7 +134,7 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString } // XNameAccess -::com::sun::star::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const ::rtl::OUString& aName ) +::com::sun::star::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -149,14 +149,14 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString return aElement; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames( ) throw(::com::sun::star::uno::RuntimeException) { NamedPropertyValues::iterator aIter = maProperties.begin(); const NamedPropertyValues::iterator aEnd = maProperties.end(); - uno::Sequence< rtl::OUString > aNames( maProperties.size() ); - rtl::OUString* pNames = aNames.getArray(); + uno::Sequence< OUString > aNames( maProperties.size() ); + OUString* pNames = aNames.getArray(); while( aIter != aEnd ) { @@ -166,7 +166,7 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString return aNames; } -sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); @@ -187,7 +187,7 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements( ) } //XServiceInfo -::rtl::OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return getImplementationName_static(); } @@ -203,13 +203,13 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& return aServiceName == ServiceName; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { return getSupportedServiceNames_static(); } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames_static( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames_static( ) { const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" ); const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index ad55865f6982..87b214e03cbc 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -53,7 +53,7 @@ namespace comphelper struct hashObjectName_Impl { - size_t operator()(const ::rtl::OUString Str) const + size_t operator()(const OUString Str) const { return (size_t)Str.hashCode(); } @@ -61,7 +61,7 @@ struct hashObjectName_Impl struct eqObjectName_Impl { - sal_Bool operator()(const ::rtl::OUString Str1, const ::rtl::OUString Str2) const + sal_Bool operator()(const OUString Str1, const OUString Str2) const { return ( Str1 == Str2 ); } @@ -69,7 +69,7 @@ struct eqObjectName_Impl typedef boost::unordered_map < - ::rtl::OUString, + OUString, ::com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >, hashObjectName_Impl, eqObjectName_Impl @@ -246,9 +246,9 @@ OUString EmbeddedObjectContainer::CreateUniqueObjectName() return aStr; } -uno::Sequence < ::rtl::OUString > EmbeddedObjectContainer::GetObjectNames() +uno::Sequence < OUString > EmbeddedObjectContainer::GetObjectNames() { - uno::Sequence < ::rtl::OUString > aSeq( pImpl->maObjectContainer.size() ); + uno::Sequence < OUString > aSeq( pImpl->maObjectContainer.size() ); EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin(); sal_Int32 nIdx=0; while ( aIt != pImpl->maObjectContainer.end() ) @@ -261,7 +261,7 @@ sal_Bool EmbeddedObjectContainer::HasEmbeddedObjects() return pImpl->maObjectContainer.size() != 0; } -sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const ::rtl::OUString& rName ) +sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const OUString& rName ) { EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.find( rName ); if ( aIt == pImpl->maObjectContainer.end() ) @@ -287,7 +287,7 @@ sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const uno::Reference < embe return sal_False; } -sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OUString& rName ) +sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const OUString& rName ) { // allows to detect whether the object was already instantiated // currently the filter instantiate it on loading, so this method allows @@ -296,7 +296,7 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU return ( aIt != pImpl->maObjectContainer.end() ); } -::rtl::OUString EmbeddedObjectContainer::GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj ) +OUString EmbeddedObjectContainer::GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj ) { EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin(); while ( aIt != pImpl->maObjectContainer.end() ) @@ -308,10 +308,10 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU } OSL_FAIL( "Unknown object!" ); - return ::rtl::OUString(); + return OUString(); } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedObject( const ::rtl::OUString& rName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedObject( const OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::GetEmbeddedObject" ); @@ -322,9 +322,9 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedOb #if OSL_DEBUG_LEVEL > 1 uno::Reference < container::XNameAccess > xAccess( pImpl->mxStorage, uno::UNO_QUERY ); - uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + uno::Sequence< OUString> aSeq = xAccess->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { (void)*pIter; @@ -341,7 +341,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedOb return xObj; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( const ::rtl::OUString& rName, const uno::Reference < embed::XEmbeddedObject >& xCopy ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( const OUString& rName, const uno::Reference < embed::XEmbeddedObject >& xCopy ) { uno::Reference < embed::XEmbeddedObject > xObj; try @@ -390,7 +390,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( con } uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, - const uno::Sequence < beans::PropertyValue >& rArgs, ::rtl::OUString& rNewName ) + const uno::Sequence < beans::PropertyValue >& rArgs, OUString& rNewName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CreateEmbeddedObject" ); @@ -410,7 +410,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde aObjDescr[0].Value <<= pImpl->m_xModel.get(); ::std::copy( rArgs.getConstArray(), rArgs.getConstArray() + rArgs.getLength(), aObjDescr.getArray() + 1 ); xObj = uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew( - rClassId, ::rtl::OUString(), pImpl->mxStorage, rNewName, + rClassId, OUString(), pImpl->mxStorage, rNewName, aObjDescr ), uno::UNO_QUERY ); AddEmbeddedObject( xObj, rNewName ); @@ -427,12 +427,12 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde return xObj; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, ::rtl::OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, OUString& rNewName ) { return CreateEmbeddedObject( rClassId, uno::Sequence < beans::PropertyValue >(), rNewName ); } -void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, const ::rtl::OUString& rName ) +void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, const OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::AddEmbeddedObject" ); @@ -463,8 +463,8 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re if ( (*aIt).second == xObj ) { // copy replacement image from temporary container (if there is any) - ::rtl::OUString aTempName = (*aIt).first; - ::rtl::OUString aMediaType; + OUString aTempName = (*aIt).first; + OUString aMediaType; uno::Reference < io::XInputStream > xStream = pImpl->mpTempObjectContainer->GetGraphicStream( xObj, &aMediaType ); if ( xStream.is() ) { @@ -496,7 +496,7 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re } } -sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName, sal_Bool bCopy ) +sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName, sal_Bool bCopy ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::StoreEmbeddedObject" ); @@ -538,7 +538,7 @@ sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < em return sal_True; } -sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName ) +sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( Object )" ); // store it into the container storage @@ -552,7 +552,7 @@ sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < e return sal_False; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < io::XInputStream >& xStm, ::rtl::OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < io::XInputStream >& xStm, OUString& rNewName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( InputStream )" ); @@ -616,7 +616,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde return xRet; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, ::rtl::OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, OUString& rNewName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( MediaDescriptor )" ); @@ -650,7 +650,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde return xObj; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, ::rtl::OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, OUString& rNewName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedLink" ); @@ -688,8 +688,8 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde } sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc, - const ::rtl::OUString& aOrigName, - const ::rtl::OUString& aTargetName ) + const OUString& aOrigName, + const OUString& aTargetName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::TryToCopyGraphReplacement" ); @@ -697,7 +697,7 @@ sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectConta if ( ( &rSrc != this || !aOrigName.equals( aTargetName ) ) && !aOrigName.isEmpty() && !aTargetName.isEmpty() ) { - ::rtl::OUString aMediaType; + OUString aMediaType; uno::Reference < io::XInputStream > xGrStream = rSrc.GetGraphicStream( aOrigName, &aMediaType ); if ( xGrStream.is() ) bResult = InsertGraphicStream( xGrStream, aTargetName, aMediaType ); @@ -706,7 +706,7 @@ sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectConta return bResult; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CopyAndGetEmbeddedObject" ); @@ -714,7 +714,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb // TODO/LATER: For now only objects that implement XEmbedPersist have a replacement image, it might change in future // do an incompatible change so that object name is provided in all the move and copy methods - ::rtl::OUString aOrigName; + OUString aOrigName; try { uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY_THROW ); @@ -741,7 +741,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb if ( xOrigLinkage.is() && xOrigLinkage->isLink() ) { // this is a OOo link, it has no persistence - ::rtl::OUString aURL = xOrigLinkage->getLinkURL(); + OUString aURL = xOrigLinkage->getLinkURL(); if ( aURL.isEmpty() ) throw uno::RuntimeException(); @@ -859,13 +859,13 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb return xResult; } -sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName ) +sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Object )" ); // get the object name before(!) it is assigned to a new storage uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); - ::rtl::OUString aName; + OUString aName; if ( xPersist.is() ) aName = xPersist->getEntryName(); @@ -923,7 +923,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r return bRet; } -sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose ) +sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Name )" ); @@ -934,7 +934,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& r return sal_False; } -sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const ::rtl::OUString& rName, EmbeddedObjectContainer& rCnt ) +sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& rCnt ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Name )" ); @@ -955,7 +955,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const ::rtl::OUString& rNa if ( xObj.is() ) { // move object - ::rtl::OUString aName( rName ); + OUString aName( rName ); rCnt.InsertEmbeddedObject( xObj, aName ); pImpl->maObjectContainer.erase( aIt ); uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); @@ -992,7 +992,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Object )" ); uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); - ::rtl::OUString aName; + OUString aName; if ( xPersist.is() ) aName = xPersist->getEntryName(); @@ -1033,7 +1033,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e uno::Sequence < beans::PropertyValue > aSeq; OUString aTmpPersistName = "Object "; - aTmpPersistName += ::rtl::OUString::valueOf( (sal_Int32) pImpl->maTempObjectContainer.size() ); + aTmpPersistName += OUString::valueOf( (sal_Int32) pImpl->maTempObjectContainer.size() ); xPersist->storeAsEntry( pImpl->mxTempStorage, aTmpPersistName, aSeq, aSeq ); xPersist->saveCompleted( sal_True ); @@ -1048,7 +1048,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e { // TODO/LATER: in future probably the temporary container will have two storages ( of two formats ) // the media type will be provided with object insertion - ::rtl::OUString aOrigStorMediaType; + OUString aOrigStorMediaType; uno::Reference< beans::XPropertySet > xStorProps( pImpl->mxStorage, uno::UNO_QUERY_THROW ); static const OUString s_sMediaType("MediaType"); xStorProps->getPropertyValue( s_sMediaType ) >>= aOrigStorMediaType; @@ -1066,7 +1066,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e } } - ::rtl::OUString aTempName, aMediaType; + OUString aTempName, aMediaType; pImpl->mpTempObjectContainer->InsertEmbeddedObject( xObj, aTempName ); uno::Reference < io::XInputStream > xStream = GetGraphicStream( xObj, &aMediaType ); @@ -1167,7 +1167,7 @@ sal_Bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < em return bFound; } -uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const ::rtl::OUString& aName, rtl::OUString* pMediaType ) +uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const OUString& aName, OUString* pMediaType ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::GetGraphicStream( Name )" ); @@ -1199,12 +1199,12 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c return xStream; } -uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, rtl::OUString* pMediaType ) +uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, OUString* pMediaType ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::GetGraphicStream( Object )" ); // get the object name - ::rtl::OUString aName; + OUString aName; EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin(); while ( aIt != pImpl->maObjectContainer.end() ) { @@ -1221,7 +1221,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c return GetGraphicStream( aName, pMediaType ); } -sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType ) +sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertGraphicStream" ); @@ -1258,7 +1258,7 @@ sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno return sal_True; } -sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType ) +sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertGraphicStreamDirectly" ); @@ -1290,7 +1290,7 @@ sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::s } -sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const ::rtl::OUString& rObjectName ) +sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveGraphicStream" ); @@ -1309,7 +1309,7 @@ sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const ::rtl::OUString& rO namespace { void InsertStreamIntoPicturesStorage_Impl( const uno::Reference< embed::XStorage >& xDocStor, const uno::Reference< io::XInputStream >& xInStream, - const ::rtl::OUString& aStreamName ) + const OUString& aStreamName ) { OSL_ENSURE( !aStreamName.isEmpty() && xInStream.is() && xDocStor.is(), "Misuse of the method!\n" ); @@ -1345,9 +1345,9 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo try { comphelper::EmbeddedObjectContainer aCnt( _xStorage ); - const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const uno::Sequence < OUString > aNames = GetObjectNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); @@ -1358,7 +1358,7 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo uno::Reference< embed::XLinkageSupport > xLink( xObj, uno::UNO_QUERY ); uno::Reference < io::XInputStream > xStream; - ::rtl::OUString aMediaType; + OUString aMediaType; sal_Int32 nCurState = xObj->getCurrentState(); if ( nCurState == embed::EmbedStates::LOADED || nCurState == embed::EmbedStates::RUNNING ) @@ -1460,9 +1460,9 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool _bObjectsOnly) { sal_Bool bResult = sal_True; - const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const uno::Sequence < OUString > aNames = GetObjectNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); @@ -1474,7 +1474,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool { // means that the object is active // the image must be regenerated - ::rtl::OUString aMediaType; + OUString aMediaType; // TODO/LATER: another aspect could be used uno::Reference < io::XInputStream > xStream = @@ -1521,7 +1521,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool uno::Reference< embed::XLinkageSupport > xLink( xObj, uno::UNO_QUERY ); if ( xLink.is() && xLink->isLink() ) { - ::rtl::OUString aMediaType; + OUString aMediaType; uno::Reference < io::XInputStream > xInStream = GetGraphicStream( xObj, &aMediaType ); if ( xInStream.is() ) InsertStreamIntoPicturesStorage_Impl( pImpl->mxStorage, xInStream, *pIter ); @@ -1558,7 +1558,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool uno::Reference< io::XInputStream > EmbeddedObjectContainer::GetGraphicReplacementStream( sal_Int64 nViewAspect, const uno::Reference< embed::XEmbeddedObject >& xObj, - ::rtl::OUString* pMediaType ) + OUString* pMediaType ) { uno::Reference< io::XInputStream > xInStream; if ( xObj.is() ) @@ -1585,9 +1585,9 @@ uno::Reference< io::XInputStream > EmbeddedObjectContainer::GetGraphicReplacemen sal_Bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed::XStorage >& _xStorage,bool _bClearModifedFlag) { sal_Bool bError = sal_False; - const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const uno::Sequence < OUString > aNames = GetObjectNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index ad2b9c9888c4..e79f2a0875c7 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -214,14 +214,14 @@ namespace comphelper virtual ::sal_Bool SAL_CALL hasElements() throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); public: // XServiceInfo, static version (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static( ); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ); + static OUString SAL_CALL getImplementationName_static( ); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& ); private: @@ -491,7 +491,7 @@ namespace comphelper if ( !bValid ) { - ::rtl::OUStringBuffer aMessage; + OUStringBuffer aMessage; aMessage.appendAscii( "Incompatible value type. Found '" ); aMessage.append( _value.getValueTypeName() ); aMessage.appendAscii( "', where '" ); @@ -688,15 +688,15 @@ namespace comphelper } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EnumerableMap::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL EnumerableMap::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL EnumerableMap::supportsService( const ::rtl::OUString& _serviceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() ); + Sequence< OUString > aServices( getSupportedServiceNames() ); for ( sal_Int32 i=0; i SAL_CALL EnumerableMap::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } @@ -736,7 +736,7 @@ namespace comphelper ::sal_Bool MapEnumerator::hasMoreElements() { if ( m_disposed ) - throw DisposedException( ::rtl::OUString(), m_rParent ); + throw DisposedException( OUString(), m_rParent ); return m_mapPos != m_rMapData.m_pValues->end(); } diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index 2dd9ec940e73..b48e67eae2ed 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.cxx @@ -40,7 +40,7 @@ OEnumerationByName::OEnumerationByName(const staruno::Reference& _rxAccess, - const staruno::Sequence< ::rtl::OUString >& _aNames ) + const staruno::Sequence< OUString >& _aNames ) :m_aNames(_aNames) ,m_nPos(0) ,m_xAccess(_rxAccess) diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index 28bd6a5be7c6..f1ee4150e391 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -41,25 +41,25 @@ namespace comphelper virtual ~NameContainer(); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -92,7 +92,7 @@ NameContainer::~NameContainer() } // XNameContainer -void SAL_CALL NameContainer::insertByName( const rtl::OUString& aName, const Any& aElement ) +void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { @@ -107,7 +107,7 @@ void SAL_CALL NameContainer::insertByName( const rtl::OUString& aName, const Any maProperties.insert( SvGenericNameContainerMapImpl::value_type(aName,aElement)); } -void SAL_CALL NameContainer::removeByName( const ::rtl::OUString& Name ) +void SAL_CALL NameContainer::removeByName( const OUString& Name ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -122,7 +122,7 @@ void SAL_CALL NameContainer::removeByName( const ::rtl::OUString& Name ) // XNameReplace -void SAL_CALL NameContainer::replaceByName( const ::rtl::OUString& aName, const Any& aElement ) +void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -140,7 +140,7 @@ void SAL_CALL NameContainer::replaceByName( const ::rtl::OUString& aName, const // XNameAccess -Any SAL_CALL NameContainer::getByName( const ::rtl::OUString& aName ) +Any SAL_CALL NameContainer::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -153,7 +153,7 @@ Any SAL_CALL NameContainer::getByName( const ::rtl::OUString& aName ) return (*aIter).second; } -Sequence< ::rtl::OUString > SAL_CALL NameContainer::getElementNames( ) +Sequence< OUString > SAL_CALL NameContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard( maMutex ); @@ -161,8 +161,8 @@ Sequence< ::rtl::OUString > SAL_CALL NameContainer::getElementNames( ) SvGenericNameContainerMapImpl::iterator aIter = maProperties.begin(); const SvGenericNameContainerMapImpl::iterator aEnd = maProperties.end(); - Sequence< rtl::OUString > aNames( maProperties.size() ); - rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames( maProperties.size() ); + OUString* pNames = aNames.getArray(); while( aIter != aEnd ) { @@ -172,7 +172,7 @@ Sequence< ::rtl::OUString > SAL_CALL NameContainer::getElementNames( ) return aNames; } -sal_Bool SAL_CALL NameContainer::hasByName( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName ) throw(RuntimeException) { MutexGuard aGuard( maMutex ); diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 0fea4be3a072..512e6fb786f3 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -59,7 +59,6 @@ using namespace com::sun::star::reflection; using namespace cppu; using namespace osl; -using ::rtl::OUString; namespace comphelper { diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index c355d50c53f6..b3169fd77be0 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -292,7 +292,7 @@ namespace comphelper xParentContext = xParent->getAccessibleContext(); if ( !xParentContext.is() ) - throw IllegalAccessibleComponentStateException( ::rtl::OUString(), *this ); + throw IllegalAccessibleComponentStateException( OUString(), *this ); return xParentContext->getLocale(); } diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index ab77650a7710..a724fdfe185e 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -104,7 +104,7 @@ namespace comphelper void OCommonAccessibleText::implGetGlyphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( implIsValidIndex( nIndex, sText.getLength() ) ) { @@ -136,7 +136,7 @@ namespace comphelper sal_Bool OCommonAccessibleText::implGetWordBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { sal_Bool bWord = sal_False; - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( implIsValidIndex( nIndex, sText.getLength() ) ) { @@ -168,7 +168,7 @@ namespace comphelper void OCommonAccessibleText::implGetSentenceBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( implIsValidIndex( nIndex, sText.getLength() ) ) { @@ -191,7 +191,7 @@ namespace comphelper void OCommonAccessibleText::implGetParagraphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( implIsValidIndex( nIndex, sText.getLength() ) ) { @@ -217,7 +217,7 @@ namespace comphelper void OCommonAccessibleText::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength ) @@ -236,7 +236,7 @@ namespace comphelper sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( !implIsValidIndex( nIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); @@ -253,9 +253,9 @@ namespace comphelper // ----------------------------------------------------------------------------- - ::rtl::OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException) + OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException) { - ::rtl::OUString sText; + OUString sText; sal_Int32 nStartIndex; sal_Int32 nEndIndex; @@ -298,16 +298,16 @@ namespace comphelper // ----------------------------------------------------------------------------- - ::rtl::OUString OCommonAccessibleText::getText() throw (RuntimeException) + OUString OCommonAccessibleText::getText() throw (RuntimeException) { return implGetText(); } // ----------------------------------------------------------------------------- - ::rtl::OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); @@ -322,7 +322,7 @@ namespace comphelper TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); if ( !implIsValidIndex( nIndex, nLength ) && nIndex != nLength ) @@ -427,7 +427,7 @@ namespace comphelper TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); if ( !implIsValidIndex( nIndex, nLength ) && nIndex != nLength ) @@ -552,7 +552,7 @@ namespace comphelper TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); if ( !implIsValidIndex( nIndex, nLength ) && nIndex != nLength ) @@ -679,8 +679,8 @@ namespace comphelper // ----------------------------------------------------------------------------- bool OCommonAccessibleText::implInitTextChangedEvent( - const rtl::OUString& rOldString, - const rtl::OUString& rNewString, + const OUString& rOldString, + const OUString& rNewString, ::com::sun::star::uno::Any& rDeleted, ::com::sun::star::uno::Any& rInserted) // throw() { @@ -811,7 +811,7 @@ namespace comphelper // ----------------------------------------------------------------------------- - ::rtl::OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException) + OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -838,7 +838,7 @@ namespace comphelper // ----------------------------------------------------------------------------- - ::rtl::OUString OAccessibleTextHelper::getText() throw (RuntimeException) + OUString OAccessibleTextHelper::getText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -847,7 +847,7 @@ namespace comphelper // ----------------------------------------------------------------------------- - ::rtl::OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 4996cb2d5d84..7f47f62f246a 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -278,8 +278,8 @@ namespace comphelper if ( xContext.is() ) { //TODO: do something - //::rtl::OUString sName = xContext->getAccessibleName(); - //::rtl::OUString sDescription = xContext->getAccessibleDescription(); + //OUString sName = xContext->getAccessibleName(); + //OUString sDescription = xContext->getAccessibleDescription(); //sal_Int32 nPlaceYourBreakpointHere = 0; } } @@ -573,13 +573,13 @@ namespace comphelper } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription( ) throw (RuntimeException) { return m_xInnerContext->getAccessibleDescription(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName( ) throw (RuntimeException) { return m_xInnerContext->getAccessibleName(); } diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx index 030ca27eaa01..c9ddbeea5487 100644 --- a/comphelper/source/misc/anytostring.cxx +++ b/comphelper/source/misc/anytostring.cxx @@ -30,14 +30,14 @@ namespace comphelper { namespace { void appendTypeError( - rtl::OUStringBuffer & buf, typelib_TypeDescriptionReference * typeRef ) + OUStringBuffer & buf, typelib_TypeDescriptionReference * typeRef ) { buf.append( "pTypeName ) ); buf.append( static_cast< sal_Unicode >('>') ); } -inline void appendChar( rtl::OUStringBuffer & buf, sal_Unicode c ) +inline void appendChar( OUStringBuffer & buf, sal_Unicode c ) { if (c < ' ' || c > '~') { buf.append( "\\X" ); @@ -53,7 +53,7 @@ inline void appendChar( rtl::OUStringBuffer & buf, sal_Unicode c ) } //------------------------------------------------------------------------------ -void appendValue( rtl::OUStringBuffer & buf, +void appendValue( OUStringBuffer & buf, void const * val, typelib_TypeDescriptionReference * typeRef, bool prependType ) { @@ -202,7 +202,7 @@ void appendValue( rtl::OUStringBuffer & buf, break; case typelib_TypeClass_STRING: { buf.append( static_cast< sal_Unicode >('\"') ); - rtl::OUString const & str = rtl::OUString::unacquired( + OUString const & str = OUString::unacquired( static_cast< rtl_uString * const * >(val) ); sal_Int32 len = str.getLength(); for ( sal_Int32 pos = 0; pos < len; ++pos ) @@ -311,9 +311,9 @@ void appendValue( rtl::OUStringBuffer & buf, } // anon namespace //============================================================================== -rtl::OUString anyToString( uno::Any const & value ) +OUString anyToString( uno::Any const & value ) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; appendValue( buf, value.getValue(), value.getValueTypeRef(), true ); return buf.makeStringAndClear(); } diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx index 23318ba1bde1..d5066fbbbf65 100644 --- a/comphelper/source/misc/componentbase.cxx +++ b/comphelper/source/misc/componentbase.cxx @@ -40,14 +40,14 @@ namespace comphelper void ComponentBase::impl_checkDisposed_throw() const { if ( m_rBHelper.bDisposed ) - throw DisposedException( ::rtl::OUString(), getComponent() ); + throw DisposedException( OUString(), getComponent() ); } //-------------------------------------------------------------------- void ComponentBase::impl_checkInitialized_throw() const { if ( !m_bInitialized ) - throw NotInitializedException( ::rtl::OUString(), getComponent() ); + throw NotInitializedException( OUString(), getComponent() ); } //-------------------------------------------------------------------- diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx index 4a5abe05859f..dded964ed549 100644 --- a/comphelper/source/misc/componentcontext.cxx +++ b/comphelper/source/misc/componentcontext.cxx @@ -64,7 +64,7 @@ namespace comphelper } //------------------------------------------------------------------------ - Any ComponentContext::getContextValueByName( const ::rtl::OUString& _rName ) const + Any ComponentContext::getContextValueByName( const OUString& _rName ) const { Any aReturn; try @@ -79,7 +79,7 @@ namespace comphelper } //------------------------------------------------------------------------ - Reference< XInterface > ComponentContext::createComponent( const ::rtl::OUString& _rServiceName ) const + Reference< XInterface > ComponentContext::createComponent( const OUString& _rServiceName ) const { Reference< XInterface > xComponent( m_xORB->createInstanceWithContext( _rServiceName, m_xContext ) @@ -90,7 +90,7 @@ namespace comphelper } //------------------------------------------------------------------------ - Reference< XInterface > ComponentContext::createComponentWithArguments( const ::rtl::OUString& _rServiceName, const Sequence< Any >& _rArguments ) const + Reference< XInterface > ComponentContext::createComponentWithArguments( const OUString& _rServiceName, const Sequence< Any >& _rArguments ) const { Reference< XInterface > xComponent( m_xORB->createInstanceWithArgumentsAndContext( _rServiceName, _rArguments, m_xContext ) diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index 0f686b21e9ef..a35a6779cb9d 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -116,10 +116,10 @@ namespace comphelper } //-------------------------------------------------------------------------- - void OModule::registerImplementation( const ::rtl::OUString& _rImplementationName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames, + void OModule::registerImplementation( const OUString& _rImplementationName, const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentFactoryFunc _pCreateFunction, FactoryInstantiation _pFactoryFunction ) { - ComponentDescription aComponent( _rImplementationName, _rServiceNames, ::rtl::OUString(), _pCreateFunction, _pFactoryFunction ); + ComponentDescription aComponent( _rImplementationName, _rServiceNames, OUString(), _pCreateFunction, _pFactoryFunction ); registerImplementation( aComponent ); } @@ -127,12 +127,12 @@ namespace comphelper void* OModule::getComponentFactory( const sal_Char* _pImplementationName ) { Reference< XInterface > xFactory( getComponentFactory( - ::rtl::OUString::createFromAscii( _pImplementationName ) ) ); + OUString::createFromAscii( _pImplementationName ) ) ); return xFactory.get(); } //-------------------------------------------------------------------------- - Reference< XInterface > OModule::getComponentFactory( const ::rtl::OUString& _rImplementationName ) + Reference< XInterface > OModule::getComponentFactory( const OUString& _rImplementationName ) { Reference< XInterface > xReturn; diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx index 2935c4b0ce80..ea7643d36df9 100644 --- a/comphelper/source/misc/configuration.cxx +++ b/comphelper/source/misc/configuration.cxx @@ -71,7 +71,7 @@ OUString getDefaultLocale( } OUString extendLocalizedPath(OUString const & path, OUString const & locale) { - rtl::OUStringBuffer buf(path); + OUStringBuffer buf(path); buf.append("/['*"); SAL_WARN_IF( locale.match("*"), "comphelper", @@ -108,20 +108,20 @@ comphelper::ConfigurationChanges::ConfigurationChanges( {} void comphelper::ConfigurationChanges::setPropertyValue( - rtl::OUString const & path, css::uno::Any const & value) const + OUString const & path, css::uno::Any const & value) const { access_->replaceByHierarchicalName(path, value); } css::uno::Reference< css::container::XHierarchicalNameReplace > -comphelper::ConfigurationChanges::getGroup(rtl::OUString const & path) const +comphelper::ConfigurationChanges::getGroup(OUString const & path) const { return css::uno::Reference< css::container::XHierarchicalNameReplace >( access_->getByHierarchicalName(path), css::uno::UNO_QUERY_THROW); } css::uno::Reference< css::container::XNameContainer > -comphelper::ConfigurationChanges::getSet(rtl::OUString const & path) const +comphelper::ConfigurationChanges::getSet(OUString const & path) const { return css::uno::Reference< css::container::XNameContainer >( access_->getByHierarchicalName(path), css::uno::UNO_QUERY_THROW); @@ -143,14 +143,14 @@ comphelper::detail::ConfigurationWrapper::ConfigurationWrapper( comphelper::detail::ConfigurationWrapper::~ConfigurationWrapper() {} css::uno::Any comphelper::detail::ConfigurationWrapper::getPropertyValue( - rtl::OUString const & path) const + OUString const & path) const { return access_->getByHierarchicalName(path); } void comphelper::detail::ConfigurationWrapper::setPropertyValue( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path, com::sun::star::uno::Any const & value) const + OUString const & path, com::sun::star::uno::Any const & value) const { assert(batch.get() != 0); batch->setPropertyValue(path, value); @@ -158,7 +158,7 @@ void comphelper::detail::ConfigurationWrapper::setPropertyValue( css::uno::Any comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue( - rtl::OUString const & path) const + OUString const & path) const { return access_->getByHierarchicalName( extendLocalizedPath(path, getDefaultLocale(context_))); @@ -166,7 +166,7 @@ comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue( void comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path, com::sun::star::uno::Any const & value) const + OUString const & path, com::sun::star::uno::Any const & value) const { assert(batch.get() != 0); batch->setPropertyValue(path, value); @@ -174,7 +174,7 @@ void comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue( css::uno::Reference< css::container::XHierarchicalNameAccess > comphelper::detail::ConfigurationWrapper::getGroupReadOnly( - rtl::OUString const & path) const + OUString const & path) const { return css::uno::Reference< css::container::XHierarchicalNameAccess >( (css::configuration::ReadOnlyAccess::create( @@ -186,7 +186,7 @@ comphelper::detail::ConfigurationWrapper::getGroupReadOnly( css::uno::Reference< css::container::XHierarchicalNameReplace > comphelper::detail::ConfigurationWrapper::getGroupReadWrite( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path) const + OUString const & path) const { assert(batch.get() != 0); return batch->getGroup(path); @@ -194,7 +194,7 @@ comphelper::detail::ConfigurationWrapper::getGroupReadWrite( css::uno::Reference< css::container::XNameAccess > comphelper::detail::ConfigurationWrapper::getSetReadOnly( - rtl::OUString const & path) const + OUString const & path) const { return css::uno::Reference< css::container::XNameAccess >( (css::configuration::ReadOnlyAccess::create( @@ -206,7 +206,7 @@ comphelper::detail::ConfigurationWrapper::getSetReadOnly( css::uno::Reference< css::container::XNameContainer > comphelper::detail::ConfigurationWrapper::getSetReadWrite( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path) const + OUString const & path) const { assert(batch.get() != 0); return batch->getSet(path); diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index e42a324eb58f..14b82de407ff 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.cxx @@ -76,8 +76,8 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons //----------------------------------------------- css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG , - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey ) + const OUString& sRelPath, + const OUString& sKey ) { css::uno::Reference< css::container::XHierarchicalNameAccess > xAccess(xCFG, css::uno::UNO_QUERY_THROW); @@ -85,7 +85,7 @@ css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< cs xAccess->getByHierarchicalName(sRelPath) >>= xProps; if (!xProps.is()) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("The requested path \""); sMsg.append (sRelPath ); sMsg.appendAscii("\" does not exists." ); @@ -99,8 +99,8 @@ css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< cs //----------------------------------------------- void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG , - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey , + const OUString& sRelPath, + const OUString& sKey , const css::uno::Any& aValue ) { css::uno::Reference< css::container::XHierarchicalNameAccess > xAccess(xCFG, css::uno::UNO_QUERY_THROW); @@ -109,7 +109,7 @@ void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno:: xAccess->getByHierarchicalName(sRelPath) >>= xProps; if (!xProps.is()) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("The requested path \""); sMsg.append (sRelPath ); sMsg.appendAscii("\" does not exists." ); @@ -123,15 +123,15 @@ void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno:: //----------------------------------------------- css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNodeExists(const css::uno::Reference< css::uno::XInterface > xCFG , - const ::rtl::OUString& sRelPathToSet, - const ::rtl::OUString& sSetNode ) + const OUString& sRelPathToSet, + const OUString& sSetNode ) { css::uno::Reference< css::container::XHierarchicalNameAccess > xAccess(xCFG, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameAccess > xSet; xAccess->getByHierarchicalName(sRelPathToSet) >>= xSet; if (!xSet.is()) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("The requested path \""); sMsg.append (sRelPathToSet ); sMsg.appendAscii("\" does not exists." ); @@ -157,9 +157,9 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNode //----------------------------------------------- css::uno::Any ConfigurationHelper::readDirectKey(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sPackage, - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey , + const OUString& sPackage, + const OUString& sRelPath, + const OUString& sKey , sal_Int32 eMode ) { css::uno::Reference< css::uno::XInterface > xCFG = ConfigurationHelper::openConfig(rxContext, sPackage, eMode); @@ -168,9 +168,9 @@ css::uno::Any ConfigurationHelper::readDirectKey(const css::uno::Reference< css: //----------------------------------------------- void ConfigurationHelper::writeDirectKey(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sPackage, - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey , + const OUString& sPackage, + const OUString& sRelPath, + const OUString& sKey , const css::uno::Any& aValue , sal_Int32 eMode ) { diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 7ab4865e1bdb..b941cbd15049 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -27,7 +27,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; @@ -44,13 +43,13 @@ namespace comphelper { // ============================================================================ -static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength ) +static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength ) { uno::Sequence< sal_Int8 > aResult; if ( !aPassword.isEmpty() && aSalt.getLength() && nCount && nHashLength ) { - ::rtl::OString aBytePass = ::rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ); + OString aBytePass = OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ); aResult.realloc( 16 ); rtl_digest_PBKDF2( reinterpret_cast < sal_uInt8 * > ( aResult.getArray() ), aResult.getLength(), @@ -71,7 +70,7 @@ IDocPasswordVerifier::~IDocPasswordVerifier() } // ============================================================================ -uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswordInfo( const ::rtl::OUString& aPassword ) +uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswordInfo( const OUString& aPassword ) { uno::Sequence< beans::PropertyValue > aResult; @@ -96,12 +95,12 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo } // ============================================================================ -sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const ::rtl::OUString& aPassword, const uno::Sequence< beans::PropertyValue >& aInfo ) +sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const OUString& aPassword, const uno::Sequence< beans::PropertyValue >& aInfo ) { sal_Bool bResult = sal_False; if ( !aPassword.isEmpty() && aInfo.getLength() ) { - ::rtl::OUString sAlgorithm; + OUString sAlgorithm; uno::Sequence< sal_Int8 > aSalt; uno::Sequence< sal_Int8 > aHash; sal_Int32 nCount = 0; @@ -134,7 +133,7 @@ sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const ::rtl::OUString& aPas // ============================================================================ sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32( - const ::rtl::OUString& aUString ) + const OUString& aUString ) { static sal_uInt16 pInitialCode[] = { 0xE1F0, // 1 @@ -211,12 +210,12 @@ sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32( // ============================================================================ sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16( - const ::rtl::OUString& aUString, + const OUString& aUString, rtl_TextEncoding nEnc ) { sal_uInt16 nResult = 0; - ::rtl::OString aString = ::rtl::OUStringToOString( aUString, nEnc ); + OString aString = OUStringToOString( aUString, nEnc ); if ( !aString.isEmpty() && aString.getLength() <= SAL_MAX_UINT16 ) { @@ -236,7 +235,7 @@ sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16( // ============================================================================ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( - const ::rtl::OUString& aUString, + const OUString& aUString, rtl_TextEncoding nEnc ) { sal_uInt16 nHash = GetXLHashAsUINT16( aUString, nEnc ); @@ -264,7 +263,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( // ============================================================================ -/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aDocId ) +/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const OUString& aPassword, const uno::Sequence< sal_Int8 >& aDocId ) { uno::Sequence< sal_Int8 > aResultKey; if ( !aPassword.isEmpty() && aDocId.getLength() == 16 ) diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index fbfc42ad3fbe..a674f7246026 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.cxx @@ -25,7 +25,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Type; using ::com::sun::star::uno::Reference; diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx index 5039c2d9d805..a436575fda7a 100644 --- a/comphelper/source/misc/documentinfo.cxx +++ b/comphelper/source/misc/documentinfo.cxx @@ -59,12 +59,12 @@ namespace comphelper { //==================================================================== namespace { - ::rtl::OUString lcl_getTitle( const Reference< XInterface >& _rxComponent ) + OUString lcl_getTitle( const Reference< XInterface >& _rxComponent ) { Reference< XTitle > xTitle( _rxComponent, UNO_QUERY ); if ( xTitle.is() ) return xTitle->getTitle(); - return ::rtl::OUString(); + return OUString(); } } @@ -72,14 +72,14 @@ namespace comphelper { //= DocumentInfo //==================================================================== //-------------------------------------------------------------------- - ::rtl::OUString DocumentInfo::getDocumentTitle( const Reference< XModel >& _rxDocument ) + OUString DocumentInfo::getDocumentTitle( const Reference< XModel >& _rxDocument ) { - ::rtl::OUString sTitle; + OUString sTitle; if ( !_rxDocument.is() ) return sTitle; - ::rtl::OUString sDocURL; + OUString sDocURL; try { // 1. ask the model and the controller for their XTitle::getTitle @@ -96,7 +96,7 @@ namespace comphelper { // private:object as URL sDocURL = _rxDocument->getURL(); if ( sDocURL.matchAsciiL( "private:", 8 ) ) - sDocURL = ::rtl::OUString(); + sDocURL = OUString(); // 2. if the document is not saved, yet, check the frame title if ( sDocURL.isEmpty() ) @@ -161,13 +161,13 @@ namespace comphelper { catch ( const Exception& ) { ::com::sun::star::uno::Any caught( ::cppu::getCaughtException() ); - ::rtl::OString sMessage( "caught an exception!" ); + OString sMessage( "caught an exception!" ); sMessage += "\ntype : "; - sMessage += ::rtl::OString( caught.getValueTypeName().getStr(), caught.getValueTypeName().getLength(), osl_getThreadTextEncoding() ); + sMessage += OString( caught.getValueTypeName().getStr(), caught.getValueTypeName().getLength(), osl_getThreadTextEncoding() ); sMessage += "\nmessage: "; ::com::sun::star::uno::Exception exception; caught >>= exception; - sMessage += ::rtl::OString( exception.Message.getStr(), exception.Message.getLength(), osl_getThreadTextEncoding() ); + sMessage += OString( exception.Message.getStr(), exception.Message.getLength(), osl_getThreadTextEncoding() ); sMessage += "\nin function:\n"; sMessage += BOOST_CURRENT_FUNCTION; sMessage += "\n"; diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx index e9429b4a62bd..28df327710d9 100644 --- a/comphelper/source/misc/documentiologring.cxx +++ b/comphelper/source/misc/documentiologring.cxx @@ -45,9 +45,9 @@ OSimpleLogRing::~OSimpleLogRing() } // ---------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static() +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static() { - uno::Sequence< rtl::OUString > aResult( 1 ); + uno::Sequence< OUString > aResult( 1 ); aResult[0] = getServiceName_static(); return aResult; } @@ -78,7 +78,7 @@ uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( SAL_UNUSED_PA // XSimpleLogRing // ---------------------------------------------------------- -void SAL_CALL OSimpleLogRing::logString( const ::rtl::OUString& aMessage ) throw (uno::RuntimeException) +void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -94,13 +94,13 @@ void SAL_CALL OSimpleLogRing::logString( const ::rtl::OUString& aMessage ) throw } // ---------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nResLen = m_bFull ? m_aMessages.getLength() : m_nPos; sal_Int32 nStart = m_bFull ? m_nPos : 0; - uno::Sequence< ::rtl::OUString > aResult( nResLen ); + uno::Sequence< OUString > aResult( nResLen ); for ( sal_Int32 nInd = 0; nInd < nResLen; nInd++ ) aResult[nInd] = m_aMessages[ ( nStart + nInd ) % m_aMessages.getLength() ]; @@ -136,15 +136,15 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu // XServiceInfo // ---------------------------------------------------------- -::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException) { return getImplementationName_static(); } // ---------------------------------------------------------- -::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) { - const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static(); + const uno::Sequence< OUString > & aSupportedNames = getSupportedServiceNames_static(); for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ ) { if ( aSupportedNames[ nInd ].equals( aServiceName ) ) @@ -155,7 +155,7 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu } // ---------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 467d864b6709..99915c6dfc3d 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -37,7 +37,7 @@ class OSimpleLogRing : public ::cppu::WeakImplHelper3< ::com::sun::star::logging ::com::sun::star::lang::XServiceInfo > { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMessages; + ::com::sun::star::uno::Sequence< OUString > m_aMessages; sal_Bool m_bInitialized; sal_Bool m_bFull; @@ -47,29 +47,29 @@ public: OSimpleLogRing(); virtual ~OSimpleLogRing(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static ::rtl::OUString SAL_CALL getImplementationName_static(); + static OUString SAL_CALL getImplementationName_static(); - static ::rtl::OUString SAL_CALL getSingletonName_static(); + static OUString SAL_CALL getSingletonName_static(); - static ::rtl::OUString SAL_CALL getServiceName_static(); + static OUString SAL_CALL getServiceName_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XSimpleLogRing - virtual void SAL_CALL logString( const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCollectedLog() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL logString( const OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCollectedLog() throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/comphelper/source/misc/evtmethodhelper.cxx b/comphelper/source/misc/evtmethodhelper.cxx index 4a18372e8834..d69bdfd7c944 100644 --- a/comphelper/source/misc/evtmethodhelper.cxx +++ b/comphelper/source/misc/evtmethodhelper.cxx @@ -26,16 +26,16 @@ using ::com::sun::star::uno::Type; namespace comphelper { - Sequence< ::rtl::OUString> getEventMethodsForType(const Type& type) + Sequence< OUString> getEventMethodsForType(const Type& type) { typelib_InterfaceTypeDescription *pType=0; type.getDescription( (typelib_TypeDescription**)&pType); if(!pType) - return Sequence< ::rtl::OUString>(); + return Sequence< OUString>(); - Sequence< ::rtl::OUString> aNames(pType->nMembers); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString> aNames(pType->nMembers); + OUString* pNames = aNames.getArray(); for(sal_Int32 i=0;inMembers;i++,++pNames) { // the decription reference diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx index c6b6697eeb47..7999bbdcc835 100644 --- a/comphelper/source/misc/ihwrapnofilter.cxx +++ b/comphelper/source/misc/ihwrapnofilter.cxx @@ -102,16 +102,16 @@ namespace comphelper // XServiceInfo //---------------------------------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OIHWrapNoFilterDialog::getImplementationName() + OUString SAL_CALL OIHWrapNoFilterDialog::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } - ::sal_Bool SAL_CALL OIHWrapNoFilterDialog::supportsService( const ::rtl::OUString& ServiceName ) + ::sal_Bool SAL_CALL OIHWrapNoFilterDialog::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -120,7 +120,7 @@ namespace comphelper return sal_False; } - uno::Sequence< ::rtl::OUString > SAL_CALL OIHWrapNoFilterDialog::getSupportedServiceNames() + uno::Sequence< OUString > SAL_CALL OIHWrapNoFilterDialog::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index a42852fa2b0c..f14be18a0ba1 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -190,17 +190,17 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg // XServiceInfo // -------------------------------------------------------- -::rtl::OUString SAL_CALL OInstanceLocker::getImplementationName( ) +OUString SAL_CALL OInstanceLocker::getImplementationName( ) throw (uno::RuntimeException) { return getImplementationName_static(); } // -------------------------------------------------------- -::sal_Bool SAL_CALL OInstanceLocker::supportsService( const ::rtl::OUString& ServiceName ) +::sal_Bool SAL_CALL OInstanceLocker::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSeq = getSupportedServiceNames(); + uno::Sequence< OUString > aSeq = getSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -210,7 +210,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg } // -------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames() throw (uno::RuntimeException) { return getSupportedServiceNames_static(); diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index 7e5fd1430b01..ba80ce39ee8d 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -58,10 +58,10 @@ public: OInstanceLocker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); ~OInstanceLocker(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static ::rtl::OUString SAL_CALL getImplementationName_static(); + static OUString SAL_CALL getImplementationName_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( @@ -76,9 +76,9 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx index 4f922b3e8d7d..916858317bab 100644 --- a/comphelper/source/misc/interaction.cxx +++ b/comphelper/source/misc/interaction.cxx @@ -32,13 +32,13 @@ namespace comphelper //= OInteractionPassword //========================================================================= //-------------------------------------------------------------------- - void SAL_CALL OInteractionPassword::setPassword( const ::rtl::OUString& _Password ) throw (RuntimeException) + void SAL_CALL OInteractionPassword::setPassword( const OUString& _Password ) throw (RuntimeException) { m_sPassword = _Password; } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OInteractionPassword::getPassword( ) throw (RuntimeException) + OUString SAL_CALL OInteractionPassword::getPassword( ) throw (RuntimeException) { return m_sPassword; } diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index bd3a09251880..98f38d878a9b 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.cxx @@ -53,11 +53,11 @@ namespace comphelper { private: Reference< XComponentContext > m_aContext; - ::rtl::OUString m_sLoggerName; + OUString m_sLoggerName; Reference< XLogger > m_xLogger; public: - EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rLoggerName ) + EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName ) :m_aContext( _rxContext ) ,m_sLoggerName( _rLoggerName ) { @@ -65,7 +65,7 @@ namespace comphelper } inline bool isValid() const { return m_xLogger.is(); } - inline const ::rtl::OUString& getName() const { return m_sLoggerName; } + inline const OUString& getName() const { return m_sLoggerName; } inline const Reference< XLogger >& getLogger() const { return m_xLogger; } inline Reference< XComponentContext > getContext() const { return m_aContext; } @@ -99,7 +99,7 @@ namespace comphelper //==================================================================== //-------------------------------------------------------------------- EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pAsciiLoggerName ) - :m_pImpl( new EventLogger_Impl( _rxContext, ::rtl::OUString::createFromAscii( _pAsciiLoggerName ) ) ) + :m_pImpl( new EventLogger_Impl( _rxContext, OUString::createFromAscii( _pAsciiLoggerName ) ) ) { } @@ -130,7 +130,7 @@ namespace comphelper //-------------------------------------------------------------------- namespace { - void lcl_replaceParameter( ::rtl::OUString& _inout_Message, const ::rtl::OUString& _rPlaceHolder, const ::rtl::OUString& _rReplacement ) + void lcl_replaceParameter( OUString& _inout_Message, const OUString& _rPlaceHolder, const OUString& _rReplacement ) { sal_Int32 nPlaceholderPosition = _inout_Message.indexOf( _rPlaceHolder ); OSL_ENSURE( nPlaceholderPosition >= 0, "lcl_replaceParameter: placeholder not found!" ); @@ -143,20 +143,20 @@ namespace comphelper //-------------------------------------------------------------------- bool EventLogger::impl_log( const sal_Int32 _nLogLevel, - const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, + const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, const OptionalString& _rArgument1, const OptionalString& _rArgument2, const OptionalString& _rArgument3, const OptionalString& _rArgument4, const OptionalString& _rArgument5, const OptionalString& _rArgument6 ) const { - // (if ::rtl::OUString had an indexOfAscii, we could save those ugly statics ...) - static ::rtl::OUString sPH1( "$1$" ); - static ::rtl::OUString sPH2( "$2$" ); - static ::rtl::OUString sPH3( "$3$" ); - static ::rtl::OUString sPH4( "$4$" ); - static ::rtl::OUString sPH5( "$5$" ); - static ::rtl::OUString sPH6( "$6$" ); + // (if OUString had an indexOfAscii, we could save those ugly statics ...) + static OUString sPH1( "$1$" ); + static OUString sPH2( "$2$" ); + static OUString sPH3( "$3$" ); + static OUString sPH4( "$4$" ); + static OUString sPH5( "$5$" ); + static OUString sPH6( "$6$" ); - ::rtl::OUString sMessage( _rMessage ); + OUString sMessage( _rMessage ); if ( !!_rArgument1 ) lcl_replaceParameter( sMessage, sPH1, *_rArgument1 ); @@ -183,8 +183,8 @@ namespace comphelper { xLogger->logp( _nLogLevel, - ::rtl::OUString::createFromAscii( _pSourceClass ), - ::rtl::OUString::createFromAscii( _pSourceMethod ), + OUString::createFromAscii( _pSourceClass ), + OUString::createFromAscii( _pSourceMethod ), sMessage ); } @@ -208,7 +208,7 @@ namespace comphelper struct ResourceBasedEventLogger_Data { /// the base name of the resource bundle - ::rtl::OUString sBundleBaseName; + OUString sBundleBaseName; /// did we already attempt to load the bundle? bool bBundleLoaded; /// the lazily loaded bundle @@ -248,13 +248,13 @@ namespace comphelper } //-------------------------------------------------------------------- - ::rtl::OUString lcl_loadString_nothrow( const Reference< XResourceBundle >& _rxBundle, const sal_Int32 _nMessageResID ) + OUString lcl_loadString_nothrow( const Reference< XResourceBundle >& _rxBundle, const sal_Int32 _nMessageResID ) { OSL_PRECOND( _rxBundle.is(), "lcl_loadString_nothrow: this will crash!" ); - ::rtl::OUString sMessage; + OUString sMessage; try { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "string:" ); aBuffer.append( _nMessageResID ); OSL_VERIFY( _rxBundle->getDirectElement( aBuffer.makeStringAndClear() ) >>= sMessage ); @@ -276,18 +276,18 @@ namespace comphelper :EventLogger( _rxContext, _pAsciiLoggerName ) ,m_pData( new ResourceBasedEventLogger_Data ) { - m_pData->sBundleBaseName = ::rtl::OUString::createFromAscii( _pResourceBundleBaseName ); + m_pData->sBundleBaseName = OUString::createFromAscii( _pResourceBundleBaseName ); } //-------------------------------------------------------------------- - ::rtl::OUString ResourceBasedEventLogger::impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const + OUString ResourceBasedEventLogger::impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const { - ::rtl::OUString sMessage; + OUString sMessage; if ( lcl_loadBundle_nothrow( m_pImpl->getContext(), *m_pData ) ) sMessage = lcl_loadString_nothrow( m_pData->xBundle, _nMessageResID ); if ( sMessage.isEmpty() ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "sBundleBaseName ); aBuffer.appendAscii( ":" ); diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 9cd4a15956a9..586f6fcb1675 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -50,45 +50,45 @@ namespace comphelper{ -const ::rtl::OUString& MediaDescriptor::PROP_ABORTED() +const OUString& MediaDescriptor::PROP_ABORTED() { - static const ::rtl::OUString sProp("Aborted"); + static const OUString sProp("Aborted"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_ASTEMPLATE() +const OUString& MediaDescriptor::PROP_ASTEMPLATE() { - static const ::rtl::OUString sProp("AsTemplate"); + static const OUString sProp("AsTemplate"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_COMPONENTDATA() +const OUString& MediaDescriptor::PROP_COMPONENTDATA() { - static const ::rtl::OUString sProp("ComponentData"); + static const OUString sProp("ComponentData"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_DOCUMENTSERVICE() +const OUString& MediaDescriptor::PROP_DOCUMENTSERVICE() { - static const ::rtl::OUString sProp("DocumentService"); + static const OUString sProp("DocumentService"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_ENCRYPTIONDATA() +const OUString& MediaDescriptor::PROP_ENCRYPTIONDATA() { - static const ::rtl::OUString sProp("EncryptionData"); + static const OUString sProp("EncryptionData"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FILENAME() +const OUString& MediaDescriptor::PROP_FILENAME() { - static const ::rtl::OUString sProp("FileName"); + static const OUString sProp("FileName"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FILTERNAME() +const OUString& MediaDescriptor::PROP_FILTERNAME() { - static const ::rtl::OUString sProp("FilterName"); + static const OUString sProp("FilterName"); return sProp; } @@ -98,57 +98,57 @@ const OUString& MediaDescriptor::PROP_FILTERPROVIDER() return aProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FILTEROPTIONS() +const OUString& MediaDescriptor::PROP_FILTEROPTIONS() { - static const ::rtl::OUString sProp("FilterOptions"); + static const OUString sProp("FilterOptions"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FRAME() +const OUString& MediaDescriptor::PROP_FRAME() { - static const ::rtl::OUString sProp("Frame"); + static const OUString sProp("Frame"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FRAMENAME() +const OUString& MediaDescriptor::PROP_FRAMENAME() { - static const ::rtl::OUString sProp("FrameName"); + static const OUString sProp("FrameName"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_HIDDEN() +const OUString& MediaDescriptor::PROP_HIDDEN() { - static const ::rtl::OUString sProp("Hidden"); + static const OUString sProp("Hidden"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_INPUTSTREAM() +const OUString& MediaDescriptor::PROP_INPUTSTREAM() { - static const ::rtl::OUString sProp("InputStream"); + static const OUString sProp("InputStream"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_INTERACTIONHANDLER() +const OUString& MediaDescriptor::PROP_INTERACTIONHANDLER() { - static const ::rtl::OUString sProp("InteractionHandler"); + static const OUString sProp("InteractionHandler"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_JUMPMARK() +const OUString& MediaDescriptor::PROP_JUMPMARK() { - static const ::rtl::OUString sProp("JumpMark"); + static const OUString sProp("JumpMark"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_MACROEXECUTIONMODE() +const OUString& MediaDescriptor::PROP_MACROEXECUTIONMODE() { - static const ::rtl::OUString sProp("MacroExecutionMode"); + static const OUString sProp("MacroExecutionMode"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_MEDIATYPE() +const OUString& MediaDescriptor::PROP_MEDIATYPE() { - static const ::rtl::OUString sProp("MediaType"); + static const OUString sProp("MediaType"); return sProp; } @@ -348,7 +348,7 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const if (xContent.is()) { css::uno::Reference< css::ucb::XContentIdentifier > xId(xContent->getIdentifier(), css::uno::UNO_QUERY); - ::rtl::OUString aScheme; + OUString aScheme; if (xId.is()) aScheme = xId->getContentProviderScheme(); @@ -371,7 +371,7 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const // ---------------------------------------------------------------------------- -css::uno::Any MediaDescriptor::getComponentDataEntry( const ::rtl::OUString& rName ) const +css::uno::Any MediaDescriptor::getComponentDataEntry( const OUString& rName ) const { css::uno::Any aEntry; SequenceAsHashMap::const_iterator aPropertyIter = find( PROP_COMPONENTDATA() ); @@ -380,7 +380,7 @@ css::uno::Any MediaDescriptor::getComponentDataEntry( const ::rtl::OUString& rNa return css::uno::Any(); } -void MediaDescriptor::setComponentDataEntry( const ::rtl::OUString& rName, const css::uno::Any& rValue ) +void MediaDescriptor::setComponentDataEntry( const OUString& rName, const css::uno::Any& rValue ) { if( rValue.hasValue() ) { @@ -406,7 +406,7 @@ void MediaDescriptor::setComponentDataEntry( const ::rtl::OUString& rName, const } } -void MediaDescriptor::clearComponentDataEntry( const ::rtl::OUString& rName ) +void MediaDescriptor::clearComponentDataEntry( const OUString& rName ) { SequenceAsHashMap::iterator aPropertyIter = find( PROP_COMPONENTDATA() ); if( aPropertyIter != end() ) @@ -464,22 +464,22 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile ) } // b) ... or we must get it from the given URL - ::rtl::OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString()); + OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), OUString()); if (sURL.isEmpty()) throw css::uno::Exception( OUString( "Found no URL." ), css::uno::Reference< css::uno::XInterface >()); // Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble - ::rtl::OUString sNormalizedURL = impl_normalizeURL( sURL ); + OUString sNormalizedURL = impl_normalizeURL( sURL ); return impl_openStreamWithURL( sNormalizedURL, bLockFile ); } #if OSL_DEBUG_LEVEL > 0 catch(const css::uno::Exception& ex) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("Invalid MediaDescriptor detected:\n"); sMsg.append (ex.Message ); - OSL_FAIL(::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); + OSL_FAIL(OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); } #else catch(const css::uno::Exception&) @@ -508,7 +508,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference css::uno::Reference< css::ucb::XCommandEnvironment > xCommandEnv(static_cast< css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY); // media type - ::rtl::OUString sMediaType = getUnpackedValueOrDefault(MediaDescriptor::PROP_MEDIATYPE(), ::rtl::OUString()); + OUString sMediaType = getUnpackedValueOrDefault(MediaDescriptor::PROP_MEDIATYPE(), OUString()); if (sMediaType.isEmpty()) { sMediaType = "application/x-www-form-urlencoded"; @@ -535,7 +535,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference css::uno::Reference< css::io::XActiveDataSink > xSink( new ucbhelper::ActiveDataSink ); aPostArgument.Sink = xSink; aPostArgument.MediaType = sMediaType; - aPostArgument.Referer = getUnpackedValueOrDefault( PROP_REFERRER(), ::rtl::OUString() ); + aPostArgument.Referer = getUnpackedValueOrDefault( PROP_REFERRER(), OUString() ); OUString sCommandName( "post" ); aContent.executeCommand( sCommandName, css::uno::makeAny( aPostArgument ) ); @@ -694,7 +694,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool return xInputStream.is(); } -::rtl::OUString MediaDescriptor::impl_normalizeURL(const ::rtl::OUString& sURL) +OUString MediaDescriptor::impl_normalizeURL(const OUString& sURL) { /* Remove Jumpmarks (fragments) of an URL only here. They are not part of any URL and as a result may be diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index c483c1ea4654..733bf2645873 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -42,7 +42,7 @@ MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< uno::XCo } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Sequence< sal_Int8 >& aClassID ) +OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Sequence< sal_Int8 >& aClassID ) { OUString aResult; @@ -55,8 +55,8 @@ MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< uno::XCo sal_Int32 nDigit1 = (sal_Int32)( (sal_uInt8)aClassID[nInd] / 16 ); sal_Int32 nDigit2 = (sal_uInt8)aClassID[nInd] % 16; - aResult += ::rtl::OUString::valueOf( nDigit1, 16 ); - aResult += ::rtl::OUString::valueOf( nDigit2, 16 ); + aResult += OUString::valueOf( nDigit1, 16 ); + aResult += OUString::valueOf( nDigit2, 16 ); } } @@ -77,12 +77,12 @@ sal_uInt8 GetDigit_Impl( sal_Char aChar ) } //----------------------------------------------------------------------- -uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentation( const ::rtl::OUString& aClassID ) +uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentation( const OUString& aClassID ) { sal_Int32 nLength = aClassID.getLength(); if ( nLength == 36 ) { - ::rtl::OString aCharClassID = ::rtl::OUStringToOString( aClassID, RTL_TEXTENCODING_ASCII_US ); + OString aCharClassID = OUStringToOString( aClassID, RTL_TEXTENCODING_ASCII_US ); const sal_Char* pString = aCharClassID.getStr(); if ( pString ) { @@ -113,7 +113,7 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentat } //----------------------------------------------------------------------- -uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurationByPath( const ::rtl::OUString& aPath ) +uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurationByPath( const OUString& aPath ) { osl::MutexGuard aGuard( m_aMutex ); @@ -173,7 +173,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo if ( !m_xMediaTypeConfig.is() ) m_xMediaTypeConfig = GetConfigurationByPath( - ::rtl::OUString( "/org.openoffice.Office.Embedding/MimeTypeClassIDRelations" )); + OUString( "/org.openoffice.Office.Embedding/MimeTypeClassIDRelations" )); return m_xMediaTypeConfig; } @@ -192,9 +192,9 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto } //------------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName ) +OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const OUString& aFilterName ) { - ::rtl::OUString aDocServiceName; + OUString aDocServiceName; try { @@ -218,7 +218,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto } //------------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const ::rtl::OUString& aMediaType ) +OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const OUString& aMediaType ) { uno::Reference< container::XContainerQuery > xTypeCFG( m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", m_xContext), @@ -257,11 +257,11 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto {} } - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------- -sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const ::rtl::OUString& aVerbShortcut, +sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortcut, embed::VerbDescriptor& aDescriptor ) { sal_Bool bResult = sal_False; @@ -301,7 +301,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi { try { - uno::Sequence< ::rtl::OUString > aObjPropNames = xObjectProps->getElementNames(); + uno::Sequence< OUString > aObjPropNames = xObjectProps->getElementNames(); aResult.realloc( aObjPropNames.getLength() + 1 ); aResult[0].Name = "ClassID"; @@ -313,7 +313,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi if ( aObjPropNames[nInd] == "ObjectVerbs" ) { - uno::Sequence< ::rtl::OUString > aVerbShortcuts; + uno::Sequence< OUString > aVerbShortcuts; if ( xObjectProps->getByName( aObjPropNames[nInd] ) >>= aVerbShortcuts ) { uno::Sequence< embed::VerbDescriptor > aVerbDescriptors( aVerbShortcuts.getLength() ); @@ -340,9 +340,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetExplicitlyRegisteredObjClassID( const ::rtl::OUString& aMediaType ) +OUString MimeConfigurationHelper::GetExplicitlyRegisteredObjClassID( const OUString& aMediaType ) { - ::rtl::OUString aStringClassID; + OUString aStringClassID; uno::Reference< container::XNameAccess > xMediaTypeConfig = GetMediaTypeConfiguration(); try @@ -360,7 +360,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi //----------------------------------------------------------------------- uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByStringClassID( - const ::rtl::OUString& aStringClassID ) + const OUString& aStringClassID ) { uno::Sequence< beans::NamedValue > aObjProps; @@ -402,12 +402,12 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByClas { aObjProps.realloc(2); aObjProps[0].Name = "ObjectFactory"; - aObjProps[0].Value <<= ::rtl::OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ); + aObjProps[0].Value <<= OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ); aObjProps[1].Name = "ClassID"; aObjProps[1].Value <<= aClassID; } - ::rtl::OUString aStringClassID = GetStringClassIDRepresentation( aClassID ); + OUString aStringClassID = GetStringClassIDRepresentation( aClassID ); if ( !aStringClassID.isEmpty() ) { uno::Reference< container::XNameAccess > xObjConfig = GetObjConfiguration(); @@ -426,14 +426,14 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByClas } //----------------------------------------------------------------------- -uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMediaType( const ::rtl::OUString& aMediaType ) +uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMediaType( const OUString& aMediaType ) { uno::Sequence< beans::NamedValue > aObject = GetObjectPropsByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) ); if ( aObject.getLength() ) return aObject; - ::rtl::OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType ); + OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType ); if ( !aDocumentName.isEmpty() ) return GetObjectPropsByDocumentName( aDocumentName ); @@ -441,9 +441,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMedi } //----------------------------------------------------------------------- -uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByFilter( const ::rtl::OUString& aFilterName ) +uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByFilter( const OUString& aFilterName ) { - ::rtl::OUString aDocumentName = GetDocServiceNameFromFilter( aFilterName ); + OUString aDocumentName = GetDocServiceNameFromFilter( aFilterName ); if ( !aDocumentName.isEmpty() ) return GetObjectPropsByDocumentName( aDocumentName ); @@ -460,7 +460,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu { try { - uno::Sequence< ::rtl::OUString > aClassIDs = xObjConfig->getElementNames(); + uno::Sequence< OUString > aClassIDs = xObjConfig->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aClassIDs.getLength(); nInd++ ) { uno::Reference< container::XNameAccess > xObjectProps; @@ -484,15 +484,15 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetFactoryNameByClassID( const uno::Sequence< sal_Int8 >& aClassID ) +OUString MimeConfigurationHelper::GetFactoryNameByClassID( const uno::Sequence< sal_Int8 >& aClassID ) { return GetFactoryNameByStringClassID( GetStringClassIDRepresentation( aClassID ) ); } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const ::rtl::OUString& aStringClassID ) +OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const OUString& aStringClassID ) { - ::rtl::OUString aResult; + OUString aResult; if ( !aStringClassID.isEmpty() ) { @@ -501,13 +501,13 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu try { if ( xObjConfig.is() && ( xObjConfig->getByName( aStringClassID.toAsciiUpperCase() ) >>= xObjectProps ) && xObjectProps.is() ) - xObjectProps->getByName( ::rtl::OUString( "ObjectFactory" ) ) >>= aResult; + xObjectProps->getByName( OUString( "ObjectFactory" ) ) >>= aResult; } catch( uno::Exception& ) { uno::Sequence< sal_Int8 > aClassID = GetSequenceClassIDRepresentation( aStringClassID ); if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_DUMMY_CLASSID ) ) ) - return ::rtl::OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ); + return OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ); } } @@ -515,9 +515,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const ::rtl::OUString& aDocName ) +OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString& aDocName ) { - ::rtl::OUString aResult; + OUString aResult; if ( !aDocName.isEmpty() ) { @@ -526,7 +526,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu { try { - uno::Sequence< ::rtl::OUString > aClassIDs = xObjConfig->getElementNames(); + uno::Sequence< OUString > aClassIDs = xObjConfig->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aClassIDs.getLength(); nInd++ ) { uno::Reference< container::XNameAccess > xObjectProps; @@ -552,13 +552,13 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetFactoryNameByMediaType( const ::rtl::OUString& aMediaType ) +OUString MimeConfigurationHelper::GetFactoryNameByMediaType( const OUString& aMediaType ) { - ::rtl::OUString aResult = GetFactoryNameByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) ); + OUString aResult = GetFactoryNameByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) ); if ( aResult.isEmpty() ) { - ::rtl::OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType ); + OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType ); if ( !aDocumentName.isEmpty() ) aResult = GetFactoryNameByDocumentName( aDocumentName ); } @@ -567,11 +567,11 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( +OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( uno::Sequence< beans::PropertyValue >& aMediaDescr, sal_Bool bIgnoreType ) { - ::rtl::OUString aFilterName; + OUString aFilterName; for ( sal_Int32 nInd = 0; nInd < aMediaDescr.getLength(); nInd++ ) if ( aMediaDescr[nInd].Name == "FilterName" ) @@ -592,7 +592,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu uno::Sequence< beans::PropertyValue > aTempMD( aMediaDescr ); // get TypeName - ::rtl::OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aTempMD, sal_True ); + OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aTempMD, sal_True ); // get FilterName for ( sal_Int32 nInd = 0; nInd < aTempMD.getLength(); nInd++ ) @@ -632,11 +632,11 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu return aFilterName; } -::rtl::OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( +OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( uno::Sequence< beans::PropertyValue >& aMediaDescr, uno::Sequence< beans::NamedValue >& aObject ) { - ::rtl::OUString aDocName; + OUString aDocName; for ( sal_Int32 nInd = 0; nInd < aObject.getLength(); nInd++ ) if ( aObject[nInd].Name == "ObjectDocumentServiceName" ) { @@ -669,7 +669,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu #ifdef WNT -sal_Int32 MimeConfigurationHelper::GetFilterFlags( const ::rtl::OUString& aFilterName ) +sal_Int32 MimeConfigurationHelper::GetFilterFlags( const OUString& aFilterName ) { sal_Int32 nFlags = 0; try @@ -699,7 +699,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile( { sal_Bool bResult = sal_False; - ::rtl::OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False ); + OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False ); if ( !aFilterName.isEmpty() ) { sal_Int32 nFlags = GetFilterFlags( aFilterName ); @@ -712,9 +712,9 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile( #endif //----------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const ::rtl::OUString& aServiceName, sal_Int32 nVersion ) +OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUString& aServiceName, sal_Int32 nVersion ) { - rtl::OUString aResult; + OUString aResult; if ( !aServiceName.isEmpty() && nVersion ) try @@ -764,9 +764,9 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile( } //------------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName ) +OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const OUString& aImportFilterName ) { - ::rtl::OUString aExportFilterName; + OUString aExportFilterName; try { @@ -851,7 +851,7 @@ uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter( if ( xFilterEnum->nextElement() >>= aProps ) { SequenceAsHashMap aPropsHM( aProps ); - sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), + sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) ) { diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 8b390d7fdd7a..c0d3d0342889 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -58,7 +58,7 @@ namespace comphelper //==================================================================== //= NamedValueCollection_Impl //==================================================================== - typedef ::boost::unordered_map< ::rtl::OUString, Any, ::rtl::OUStringHash > NamedValueRepository; + typedef ::boost::unordered_map< OUString, Any, OUStringHash > NamedValueRepository; struct NamedValueCollection_Impl { @@ -162,9 +162,9 @@ namespace comphelper } //-------------------------------------------------------------------- - ::std::vector< ::rtl::OUString > NamedValueCollection::getNames() const + ::std::vector< OUString > NamedValueCollection::getNames() const { - ::std::vector< ::rtl::OUString > aNames; + ::std::vector< OUString > aNames; for ( NamedValueRepository::const_iterator it = m_pImpl->aValues.begin(), end = m_pImpl->aValues.end(); it != end; ++it ) { aNames.push_back( it->first ); @@ -251,7 +251,7 @@ namespace comphelper } //-------------------------------------------------------------------- - bool NamedValueCollection::get_ensureType( const ::rtl::OUString& _rValueName, void* _pValueLocation, const Type& _rExpectedValueType ) const + bool NamedValueCollection::get_ensureType( const OUString& _rValueName, void* _pValueLocation, const Type& _rExpectedValueType ) const { NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName ); if ( pos != m_pImpl->aValues.end() ) @@ -267,7 +267,7 @@ namespace comphelper return true; // argument exists, but is of wrong type - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "Invalid value type for '" ); aBuffer.append ( _rValueName ); aBuffer.appendAscii( "'.\nExpected: " ); @@ -287,7 +287,7 @@ namespace comphelper } //-------------------------------------------------------------------- - const Any& NamedValueCollection::impl_get( const ::rtl::OUString& _rValueName ) const + const Any& NamedValueCollection::impl_get( const OUString& _rValueName ) const { NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName ); if ( pos != m_pImpl->aValues.end() ) @@ -297,14 +297,14 @@ namespace comphelper } //-------------------------------------------------------------------- - bool NamedValueCollection::impl_has( const ::rtl::OUString& _rValueName ) const + bool NamedValueCollection::impl_has( const OUString& _rValueName ) const { NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName ); return ( pos != m_pImpl->aValues.end() ); } //-------------------------------------------------------------------- - bool NamedValueCollection::impl_put( const ::rtl::OUString& _rValueName, const Any& _rValue ) + bool NamedValueCollection::impl_put( const OUString& _rValueName, const Any& _rValue ) { bool bHas = impl_has( _rValueName ); m_pImpl->aValues[ _rValueName ] = _rValue; @@ -312,7 +312,7 @@ namespace comphelper } //-------------------------------------------------------------------- - bool NamedValueCollection::impl_remove( const ::rtl::OUString& _rValueName ) + bool NamedValueCollection::impl_remove( const OUString& _rValueName ) { NamedValueRepository::iterator pos = m_pImpl->aValues.find( _rValueName ); if ( pos == m_pImpl->aValues.end() ) diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index aa9d43578283..f7f4d122c009 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -53,7 +53,7 @@ void NumberedCollection::setOwner(const css::uno::Reference< css::uno::XInterfac } //----------------------------------------------- -void NumberedCollection::setUntitledPrefix(const ::rtl::OUString& sPrefix) +void NumberedCollection::setUntitledPrefix(const OUString& sPrefix) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -72,7 +72,7 @@ void NumberedCollection::setUntitledPrefix(const ::rtl::OUString& sPrefix) ::osl::ResettableMutexGuard aLock(m_aMutex); if ( ! xComponent.is ()) - throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1); + throw css::lang::IllegalArgumentException (OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1); long pComponent = (long) xComponent.get (); TNumberedItemHash::const_iterator pIt = m_lComponents.find (pComponent); @@ -148,7 +148,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe ::osl::ResettableMutexGuard aLock(m_aMutex); if ( ! xComponent.is ()) - throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1); + throw css::lang::IllegalArgumentException (OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1); long pComponent = (long) xComponent.get (); TNumberedItemHash::iterator pIt = m_lComponents.find (pComponent); @@ -164,7 +164,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe } //----------------------------------------------- -::rtl::OUString SAL_CALL NumberedCollection::getUntitledPrefix() +OUString SAL_CALL NumberedCollection::getUntitledPrefix() throw (css::uno::RuntimeException) { // SYNCHRONIZED -> diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx index 48b232ba334f..8bd744f77946 100644 --- a/comphelper/source/misc/numbers.cxx +++ b/comphelper/source/misc/numbers.cxx @@ -72,7 +72,7 @@ staruno::Any getNumberFormatDecimals(const staruno::Reference xFormat( xFormats->getByKey(nKey)); if (xFormat.is()) { - static ::rtl::OUString PROPERTY_DECIMALS( "Decimals" ); + static OUString PROPERTY_DECIMALS( "Decimals" ); return xFormat->getPropertyValue(PROPERTY_DECIMALS); } } @@ -105,7 +105,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; //------------------------------------------------------------------------------ -Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter, sal_Int32 _nKey, const rtl::OUString& _rPropertyName ) +Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter, sal_Int32 _nKey, const OUString& _rPropertyName ) { Any aReturn; diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx index 384b809dee99..01b4e98ccf69 100644 --- a/comphelper/source/misc/officeresourcebundle.cxx +++ b/comphelper/source/misc/officeresourcebundle.cxx @@ -48,13 +48,13 @@ namespace comphelper { private: Reference< XComponentContext > m_xContext; - ::rtl::OUString m_sBaseName; + OUString m_sBaseName; Reference< XResourceBundle > m_xBundle; bool m_bAttemptedCreate; mutable ::osl::Mutex m_aMutex; public: - ResourceBundle_Impl( const Reference< XComponentContext >& _context, const ::rtl::OUString& _baseName ) + ResourceBundle_Impl( const Reference< XComponentContext >& _context, const OUString& _baseName ) :m_xContext( _context ) ,m_sBaseName( _baseName ) ,m_bAttemptedCreate( false ) @@ -70,7 +70,7 @@ namespace comphelper an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this then. */ - ::rtl::OUString loadString( sal_Int32 _resourceId ) const; + OUString loadString( sal_Int32 _resourceId ) const; /** determines whether the resource bundle has a string with the given id @param _resourceId @@ -94,25 +94,25 @@ namespace comphelper /** returns the resource bundle key for a string with a given resource id */ - static ::rtl::OUString + static OUString impl_getStringResourceKey( sal_Int32 _resourceId ); }; //-------------------------------------------------------------------- - ::rtl::OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId ) + OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId ) { - ::rtl::OUStringBuffer key; + OUStringBuffer key; key.appendAscii( "string:" ); key.append( _resourceId ); return key.makeStringAndClear(); } //-------------------------------------------------------------------- - ::rtl::OUString ResourceBundle_Impl::loadString( sal_Int32 _resourceId ) const + OUString ResourceBundle_Impl::loadString( sal_Int32 _resourceId ) const { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString sString; + OUString sString; if ( const_cast< ResourceBundle_Impl* >( this )->impl_loadBundle_nothrow() ) { @@ -189,7 +189,7 @@ namespace comphelper //==================================================================== //-------------------------------------------------------------------- OfficeResourceBundle::OfficeResourceBundle( const Reference< XComponentContext >& _context, const sal_Char* _bundleBaseAsciiName ) - :m_pImpl( new ResourceBundle_Impl( _context, ::rtl::OUString::createFromAscii( _bundleBaseAsciiName ) ) ) + :m_pImpl( new ResourceBundle_Impl( _context, OUString::createFromAscii( _bundleBaseAsciiName ) ) ) { if ( !_context.is() ) throw NullPointerException(); @@ -201,7 +201,7 @@ namespace comphelper } //-------------------------------------------------------------------- - ::rtl::OUString OfficeResourceBundle::loadString( sal_Int32 _resourceId ) const + OUString OfficeResourceBundle::loadString( sal_Int32 _resourceId ) const { return m_pImpl->loadString( _resourceId ); } diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index fed0410ab134..8bde58a3b321 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -32,9 +32,9 @@ namespace comphelper { // ---------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames_static() +uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames_static() { - uno::Sequence< rtl::OUString > aResult( 1 ); + uno::Sequence< OUString > aResult( 1 ); aResult[0] = getServiceName_static(); return aResult; } @@ -133,7 +133,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) // Turn Quickstarter veto off uno::Reference< beans::XPropertySet > xPropertySet( xDesktop, uno::UNO_QUERY_THROW ); - ::rtl::OUString aVetoPropName( "SuspendQuickstartVeto" ); + OUString aVetoPropName( "SuspendQuickstartVeto" ); uno::Any aValue; aValue <<= (sal_Bool)sal_True; xPropertySet->setPropertyValue( aVetoPropName, aValue ); @@ -163,15 +163,15 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) // XServiceInfo // ---------------------------------------------------------- -::rtl::OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException) { return getImplementationName_static(); } // ---------------------------------------------------------- -::sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) { - const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static(); + const uno::Sequence< OUString > & aSupportedNames = getSupportedServiceNames_static(); for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ ) { if ( aSupportedNames[ nInd ].equals( aServiceName ) ) @@ -182,7 +182,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) } // ---------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index f4594f590aab..536484952b59 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -51,14 +51,14 @@ public: virtual ~OOfficeRestartManager() {} - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static ::rtl::OUString SAL_CALL getImplementationName_static(); + static OUString SAL_CALL getImplementationName_static(); - static ::rtl::OUString SAL_CALL getSingletonName_static(); + static OUString SAL_CALL getSingletonName_static(); - static ::rtl::OUString SAL_CALL getServiceName_static(); + static OUString SAL_CALL getServiceName_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); @@ -71,9 +71,9 @@ public: virtual void SAL_CALL notify( const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx index 3d3bac67e39b..da1eb7f4058c 100644 --- a/comphelper/source/misc/scopeguard.cxx +++ b/comphelper/source/misc/scopeguard.cxx @@ -36,7 +36,7 @@ ScopeGuard::~ScopeGuard() catch (com::sun::star::uno::Exception & exc) { (void) exc; // avoid warning about unused variable OSL_FAIL( - rtl::OUStringToOString( "UNO exception occurred: " + + OUStringToOString( "UNO exception occurred: " + exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } catch (...) { diff --git a/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx index dacba9d62be6..9c412390db12 100644 --- a/comphelper/source/misc/sequence.cxx +++ b/comphelper/source/misc/sequence.cxx @@ -25,7 +25,7 @@ namespace comphelper //......................................................................... //------------------------------------------------------------------------------ -staruno::Sequence findValue(const staruno::Sequence< ::rtl::OUString >& _rList, const ::rtl::OUString& _rValue, sal_Bool _bOnlyFirst) +staruno::Sequence findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, sal_Bool _bOnlyFirst) { sal_Int32 nLength = _rList.getLength(); @@ -34,7 +34,7 @@ staruno::Sequence findValue(const staruno::Sequence< ::rtl::OUString ////////////////////////////////////////////////////////////////////// // An welcher Position finde ich den Wert? sal_Int32 nPos = -1; - const ::rtl::OUString* pTArray = _rList.getConstArray(); + const OUString* pTArray = _rList.getConstArray(); for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray) { if( pTArray->equals(_rValue) ) @@ -64,7 +64,7 @@ staruno::Sequence findValue(const staruno::Sequence< ::rtl::OUString ////////////////////////////////////////////////////////////////////// // Wie oft kommt der Wert vor? - const ::rtl::OUString* pTArray = _rList.getConstArray(); + const OUString* pTArray = _rList.getConstArray(); for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray) { if( pTArray->equals(_rValue) ) @@ -80,10 +80,10 @@ staruno::Sequence findValue(const staruno::Sequence< ::rtl::OUString } } // ----------------------------------------------------------------------------- -sal_Bool existsValue(const ::rtl::OUString& Value,const staruno::Sequence< ::rtl::OUString >& _aList) +sal_Bool existsValue(const OUString& Value,const staruno::Sequence< OUString >& _aList) { - const ::rtl::OUString * pIter = _aList.getConstArray(); - const ::rtl::OUString * pEnd = pIter + _aList.getLength(); + const OUString * pIter = _aList.getConstArray(); + const OUString * pEnd = pIter + _aList.getLength(); return ::std::find(pIter,pEnd,Value) != pEnd; } diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index 61f39c74a8bc..24dd7edc9637 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.cxx @@ -211,7 +211,7 @@ sal_Bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const pCheck != rCheck.end() ; ++pCheck ) { - const ::rtl::OUString& sCheckName = pCheck->first; + const OUString& sCheckName = pCheck->first; const css::uno::Any& aCheckValue = pCheck->second; const_iterator pFound = find(sCheckName); @@ -233,7 +233,7 @@ void SequenceAsHashMap::update(const SequenceAsHashMap& rUpdate) pUpdate != rUpdate.end() ; ++pUpdate ) { - const ::rtl::OUString& sName = pUpdate->first; + const OUString& sName = pUpdate->first; const css::uno::Any& aValue = pUpdate->second; (*this)[sName] = aValue; diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index b5fd79948020..d48fd4c41789 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -42,11 +42,11 @@ public: : m_rServiceDecl(rServiceDecl) {} // XServiceInfo: - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( rtl::OUString const& name ) + virtual sal_Bool SAL_CALL supportsService( OUString const& name ) throw (uno::RuntimeException); - virtual uno::Sequence SAL_CALL getSupportedServiceNames() + virtual uno::Sequence SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // XSingleComponentFactory: virtual uno::Reference SAL_CALL createInstanceWithContext( @@ -69,19 +69,19 @@ ServiceDecl::Factory::~Factory() } // XServiceInfo: -rtl::OUString ServiceDecl::Factory::getImplementationName() +OUString ServiceDecl::Factory::getImplementationName() throw (uno::RuntimeException) { return m_rServiceDecl.getImplementationName(); } -sal_Bool ServiceDecl::Factory::supportsService( rtl::OUString const& name ) +sal_Bool ServiceDecl::Factory::supportsService( OUString const& name ) throw (uno::RuntimeException) { return m_rServiceDecl.supportsService(name); } -uno::Sequence ServiceDecl::Factory::getSupportedServiceNames() +uno::Sequence ServiceDecl::Factory::getSupportedServiceNames() throw (uno::RuntimeException) { return m_rServiceDecl.getSupportedServiceNames(); @@ -116,15 +116,15 @@ void * ServiceDecl::getFactory( sal_Char const* pImplName ) const return 0; } -uno::Sequence ServiceDecl::getSupportedServiceNames() const +uno::Sequence ServiceDecl::getSupportedServiceNames() const { - std::vector vec; + std::vector vec; - rtl::OString const str(m_pServiceNames); + OString const str(m_pServiceNames); sal_Int32 nIndex = 0; do { - rtl::OString const token( str.getToken( 0, m_cDelim, nIndex ) ); - vec.push_back( rtl::OUString( token.getStr(), token.getLength(), + OString const token( str.getToken( 0, m_cDelim, nIndex ) ); + vec.push_back( OUString( token.getStr(), token.getLength(), RTL_TEXTENCODING_ASCII_US ) ); } while (nIndex >= 0); @@ -132,12 +132,12 @@ uno::Sequence ServiceDecl::getSupportedServiceNames() const return comphelper::containerToSequence(vec); } -bool ServiceDecl::supportsService( ::rtl::OUString const& name ) const +bool ServiceDecl::supportsService( OUString const& name ) const { - rtl::OString const str(m_pServiceNames); + OString const str(m_pServiceNames); sal_Int32 nIndex = 0; do { - rtl::OString const token( str.getToken( 0, m_cDelim, nIndex ) ); + OString const token( str.getToken( 0, m_cDelim, nIndex ) ); if (name.equalsAsciiL( token.getStr(), token.getLength() )) return true; } @@ -145,9 +145,9 @@ bool ServiceDecl::supportsService( ::rtl::OUString const& name ) const return false; } -rtl::OUString ServiceDecl::getImplementationName() const +OUString ServiceDecl::getImplementationName() const { - return rtl::OUString::createFromAscii(m_pImplName); + return OUString::createFromAscii(m_pImplName); } } // namespace service_decl diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index 1aef59a036d5..896a9296ac5e 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -27,20 +27,20 @@ namespace comphelper { /** returns an empty UString(). most times sufficient */ -::rtl::OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString(); + return OUString(); } /** the base implementation iterates over the service names from getSupportedServiceNames */ -sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { return supportsService( ServiceName, getSupportedServiceNames() ); } -sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw() +sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const OUString& ServiceName, const ::com::sun::star::uno::Sequence< OUString >& SupportedServices ) throw() { - const ::rtl::OUString * pArray = SupportedServices.getConstArray(); + const OUString * pArray = SupportedServices.getConstArray(); for( sal_Int32 i = 0; i < SupportedServices.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -48,25 +48,25 @@ sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& Ser } /** the base implementation has no supported services */ -::com::sun::star::uno::Sequence< ::rtl::OUString > ServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) +::com::sun::star::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq(0); + ::com::sun::star::uno::Sequence< OUString> aSeq(0); return aSeq; } /** this method adds a variable number of char pointer to a given Sequence */ -void ServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw() +void ServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw() { sal_uInt32 nCount = rSeq.getLength(); rSeq.realloc( nCount + nServices ); - rtl::OUString* pStrings = rSeq.getArray(); + OUString* pStrings = rSeq.getArray(); va_list marker; va_start( marker, nServices ); for( sal_uInt16 i = 0 ; i < nServices; i++ ) - pStrings[nCount++] = rtl::OUString::createFromAscii(va_arg( marker, char*)); + pStrings[nCount++] = OUString::createFromAscii(va_arg( marker, char*)); va_end( marker ); } diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 45f1d79c5d34..d9077ab882f6 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -85,7 +85,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetTemporaryStorage( // ---------------------------------------------------------------------- uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL( - const ::rtl::OUString& aURL, + const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) throw ( uno::Exception ) @@ -104,7 +104,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL( // ---------------------------------------------------------------------- uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2( - const ::rtl::OUString& aURL, + const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) throw ( uno::Exception ) @@ -199,7 +199,7 @@ void OStorageHelper::CopyInputToOutput( // ---------------------------------------------------------------------- uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL( - const ::rtl::OUString& aURL, + const OUString& aURL, const uno::Reference< uno::XComponentContext >& context ) throw ( uno::Exception ) { @@ -282,8 +282,8 @@ sal_Int32 OStorageHelper::GetXStorageFormat( // ---------------------------------------------------------------------- uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL( - const ::rtl::OUString& aFormat, - const ::rtl::OUString& aURL, + const OUString& aFormat, + const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext, sal_Bool bRepairStorage ) @@ -314,7 +314,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL( // ---------------------------------------------------------------------- uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStream( - const ::rtl::OUString& aFormat, + const OUString& aFormat, const uno::Reference < io::XInputStream >& xStream, const uno::Reference< uno::XComponentContext >& rxContext, sal_Bool bRepairStorage ) @@ -345,7 +345,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStr // ---------------------------------------------------------------------- uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream( - const ::rtl::OUString& aFormat, + const OUString& aFormat, const uno::Reference < io::XStream >& xStream, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext, @@ -376,7 +376,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream( } // ---------------------------------------------------------------------- -uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const ::rtl::OUString& aPassword ) +uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const OUString& aPassword ) { // TODO/LATER: Should not the method be part of DocPasswordHelper? uno::Sequence< beans::NamedValue > aEncryptionData; @@ -391,7 +391,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( uno::Reference< xml::crypto::XNSSInitializer > xDigestContextSupplier = xml::crypto::NSSInitializer::create(xContext); uno::Reference< xml::crypto::XDigestContext > xDigestContext( xDigestContextSupplier->getDigestContext( xml::crypto::DigestID::SHA256, uno::Sequence< beans::NamedValue >() ), uno::UNO_SET_THROW ); - ::rtl::OString aUTF8Password( ::rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ) ); + OString aUTF8Password( OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ) ); xDigestContext->updateDigest( uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aUTF8Password.getStr() ), aUTF8Password.getLength() ) ); uno::Sequence< sal_Int8 > aDigest = xDigestContext->finalizeDigestAndDispose(); @@ -415,7 +415,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( for ( sal_Int32 nInd = 0; nInd < 2; nInd++ ) { - ::rtl::OString aByteStrPass = ::rtl::OUStringToOString( aPassword, pEncoding[nInd] ); + OString aByteStrPass = OUStringToOString( aPassword, pEncoding[nInd] ); sal_uInt8 pBuffer[RTL_DIGEST_LENGTH_SHA1]; rtlDigestError nError = rtl_digest_SHA1( aByteStrPass.getStr(), @@ -437,7 +437,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( } // ---------------------------------------------------------------------- -sal_Bool OStorageHelper::IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed ) +sal_Bool OStorageHelper::IsValidZipEntryFileName( const OUString& aName, sal_Bool bSlashAllowed ) { return IsValidZipEntryFileName( aName.getStr(), aName.getLength(), bSlashAllowed ); } @@ -471,7 +471,7 @@ sal_Bool OStorageHelper::IsValidZipEntryFileName( } // ---------------------------------------------------------------------- -sal_Bool OStorageHelper::PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment ) +sal_Bool OStorageHelper::PathHasSegment( const OUString& aPath, const OUString& aSegment ) { sal_Bool bResult = sal_False; const sal_Int32 nPathLen = aPath.getLength(); @@ -521,8 +521,8 @@ void LifecycleProxy::commitStorages() } } -static void splitPath( std::vector &rElems, - const ::rtl::OUString& rPath ) +static void splitPath( std::vector &rElems, + const OUString& rPath ) { for (sal_Int32 i = 0; i >= 0;) rElems.push_back( rPath.getToken( 0, '/', i ) ); @@ -530,7 +530,7 @@ static void splitPath( std::vector &rElems, static uno::Reference< embed::XStorage > LookupStorageAtPath( const uno::Reference< embed::XStorage > &xParentStorage, - std::vector &rElems, sal_uInt32 nOpenMode, + std::vector &rElems, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ) { uno::Reference< embed::XStorage > xStorage( xParentStorage ); @@ -545,22 +545,22 @@ static uno::Reference< embed::XStorage > LookupStorageAtPath( uno::Reference< embed::XStorage > OStorageHelper::GetStorageAtPath( const uno::Reference< embed::XStorage > &xStorage, - const ::rtl::OUString& rPath, sal_uInt32 nOpenMode, + const OUString& rPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ) { - std::vector aElems; + std::vector aElems; splitPath( aElems, rPath ); return LookupStorageAtPath( xStorage, aElems, nOpenMode, rNastiness ); } uno::Reference< io::XStream > OStorageHelper::GetStreamAtPath( const uno::Reference< embed::XStorage > &xParentStorage, - const ::rtl::OUString& rPath, sal_uInt32 nOpenMode, + const OUString& rPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ) { - std::vector aElems; + std::vector aElems; splitPath( aElems, rPath ); - rtl::OUString aName( aElems.back() ); + OUString aName( aElems.back() ); aElems.pop_back(); sal_uInt32 nStorageMode = nOpenMode & ~embed::ElementModes::TRUNCATE; uno::Reference< embed::XStorage > xStorage( @@ -571,7 +571,7 @@ uno::Reference< io::XStream > OStorageHelper::GetStreamAtPath( uno::Reference< io::XStream > OStorageHelper::GetStreamAtPackageURL( uno::Reference< embed::XStorage > const& xParentStorage, - const ::rtl::OUString& rURL, sal_uInt32 const nOpenMode, + const OUString& rURL, sal_uInt32 const nOpenMode, LifecycleProxy & rNastiness) { static char const s_PkgScheme[] = "vnd.sun.star.Package:"; @@ -579,7 +579,7 @@ uno::Reference< io::XStream > OStorageHelper::GetStreamAtPackageURL( rURL.getStr(), rURL.getLength(), s_PkgScheme, SAL_N_ELEMENTS(s_PkgScheme) - 1)) { - ::rtl::OUString const path(rURL.copy(SAL_N_ELEMENTS(s_PkgScheme)-1)); + OUString const path(rURL.copy(SAL_N_ELEMENTS(s_PkgScheme)-1)); return GetStreamAtPath(xParentStorage, path, nOpenMode, rNastiness); } return 0; diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 8af97dc75685..fc15b09f17a1 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.cxx @@ -62,14 +62,14 @@ namespace } } -rtl::OString stripStart(const rtl::OString &rIn, sal_Char c) +OString stripStart(const OString &rIn, sal_Char c) { - return tmpl_stripStart(rIn, c); + return tmpl_stripStart(rIn, c); } -rtl::OUString stripStart(const rtl::OUString &rIn, sal_Unicode c) +OUString stripStart(const OUString &rIn, sal_Unicode c) { - return tmpl_stripStart(rIn, c); + return tmpl_stripStart(rIn, c); } namespace @@ -93,22 +93,22 @@ namespace } } -rtl::OString stripEnd(const rtl::OString &rIn, sal_Char c) +OString stripEnd(const OString &rIn, sal_Char c) { - return tmpl_stripEnd(rIn, c); + return tmpl_stripEnd(rIn, c); } -rtl::OUString stripEnd(const rtl::OUString &rIn, sal_Unicode c) +OUString stripEnd(const OUString &rIn, sal_Unicode c) { - return tmpl_stripEnd(rIn, c); + return tmpl_stripEnd(rIn, c); } -rtl::OString strip(const rtl::OString &rIn, sal_Char c) +OString strip(const OString &rIn, sal_Char c) { return stripEnd(stripStart(rIn, c), c); } -rtl::OUString strip(const rtl::OUString &rIn, sal_Unicode c) +OUString strip(const OUString &rIn, sal_Unicode c) { return stripEnd(stripStart(rIn, c), c); } @@ -132,18 +132,18 @@ namespace } } -sal_Int32 getTokenCount(const rtl::OString &rIn, sal_Char cTok) +sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok) { - return tmpl_getTokenCount(rIn, cTok); + return tmpl_getTokenCount(rIn, cTok); } -sal_Int32 getTokenCount(const rtl::OUString &rIn, sal_Unicode cTok) +sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok) { - return tmpl_getTokenCount(rIn, cTok); + return tmpl_getTokenCount(rIn, cTok); } sal_uInt32 decimalStringToNumber( - ::rtl::OUString const & str ) + OUString const & str ) { sal_uInt32 result = 0; for( sal_Int32 i = 0 ; i < str.getLength() ; ) @@ -243,10 +243,10 @@ using namespace ::com::sun::star; // convert between sequence of string and comma separated string -::rtl::OUString convertCommaSeparated( - uno::Sequence< ::rtl::OUString > const& i_rSeq) +OUString convertCommaSeparated( + uno::Sequence< OUString > const& i_rSeq) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::comphelper::intersperse( ::comphelper::stl_begin(i_rSeq), ::comphelper::stl_end(i_rSeq), ::comphelper::OUStringBufferAppender(buf), @@ -254,26 +254,26 @@ using namespace ::com::sun::star; return buf.makeStringAndClear(); } -uno::Sequence< ::rtl::OUString > - convertCommaSeparated( ::rtl::OUString const& i_rString ) +uno::Sequence< OUString > + convertCommaSeparated( OUString const& i_rString ) { - std::vector< ::rtl::OUString > vec; + std::vector< OUString > vec; sal_Int32 idx = 0; do { - ::rtl::OUString kw = + OUString kw = i_rString.getToken(0, static_cast (','), idx); kw = kw.trim(); if (!kw.isEmpty()) { vec.push_back(kw); } } while (idx >= 0); - uno::Sequence< ::rtl::OUString > kws(vec.size()); + uno::Sequence< OUString > kws(vec.size()); std::copy(vec.begin(), vec.end(), stl_begin(kws)); return kws; } -sal_Int32 compareNatural( const ::rtl::OUString & rLHS, const ::rtl::OUString & rRHS, +sal_Int32 compareNatural( const OUString & rLHS, const OUString & rRHS, const uno::Reference< i18n::XCollator > &rCollator, const uno::Reference< i18n::XBreakIterator > &rBI, const lang::Locale &rLocale ) @@ -365,12 +365,12 @@ namespace } } -bool isdigitAsciiString(const rtl::OString &rString) +bool isdigitAsciiString(const OString &rString) { return tmpl_is_OPER_AsciiString(rString); } -bool isdigitAsciiString(const rtl::OUString &rString) +bool isdigitAsciiString(const OUString &rString) { return tmpl_is_OPER_AsciiString(rString); } @@ -390,17 +390,17 @@ namespace } } -rtl::OUString reverseString(const rtl::OUString &rStr) +OUString reverseString(const OUString &rStr) { - return tmpl_reverseString(rStr); + return tmpl_reverseString(rStr); } -rtl::OString reverseString(const rtl::OString &rStr) +OString reverseString(const OString &rStr) { - return tmpl_reverseString(rStr); + return tmpl_reverseString(rStr); } -sal_Int32 indexOfAny(rtl::OUString const& rIn, +sal_Int32 indexOfAny(OUString const& rIn, sal_Unicode const*const pChars, sal_Int32 const nPos) { for (sal_Int32 i = nPos; i < rIn.getLength(); ++i) diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx index d56f78b680b6..265c052b1436 100644 --- a/comphelper/source/misc/synchronousdispatch.cxx +++ b/comphelper/source/misc/synchronousdispatch.cxx @@ -41,8 +41,8 @@ using namespace ::com::sun::star; uno::Reference< lang::XComponent > SynchronousDispatch::dispatch( const uno::Reference< uno::XInterface > &xStartPoint, - const rtl::OUString &sURL, - const rtl::OUString &sTarget, + const OUString &sURL, + const OUString &sTarget, const sal_Int32 nFlags, const uno::Sequence< beans::PropertyValue > &lArguments ) { diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index 62d24e9e78e6..e77176fb2351 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -111,9 +111,9 @@ float getFloat(const Any& _rAny) } //------------------------------------------------------------------------------ -::rtl::OUString getString(const Any& _rAny) +OUString getString(const Any& _rAny) { - ::rtl::OUString nReturn; + OUString nReturn; OSL_VERIFY( _rAny >>= nReturn ); return nReturn; } @@ -229,7 +229,7 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) } case TypeClass_STRING: { - ::rtl::OUString aDummy; + OUString aDummy; bConversionSuccess = tryCompare(pData, _rValue, bRes, aDummy); break; } @@ -393,20 +393,20 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) memcmp(rLeftSeq.getConstArray(), rRightSeq.getConstArray(), rLeftSeq.getLength()*sizeof(sal_uInt32)) == 0; } } - else if (isA(_rType, static_cast< Sequence< ::rtl::OUString >* >(NULL))) + else if (isA(_rType, static_cast< Sequence< OUString >* >(NULL))) { - Sequence< ::rtl::OUString > aTemp; + Sequence< OUString > aTemp; bConversionSuccess = _rValue >>= aTemp; if (bConversionSuccess) { - const Sequence< ::rtl::OUString >& rLeftSeq = *reinterpret_cast*>(pData); - const Sequence< ::rtl::OUString >& rRightSeq = aTemp; + const Sequence< OUString >& rLeftSeq = *reinterpret_cast*>(pData); + const Sequence< OUString >& rRightSeq = aTemp; sal_Int32 nSeqLen = rLeftSeq.getLength(); bRes = ( nSeqLen == rRightSeq.getLength() ); for ( sal_Int32 n = 0; bRes && ( n < nSeqLen ); n++ ) { - const ::rtl::OUString& rS1 = rLeftSeq.getConstArray()[n]; - const ::rtl::OUString& rS2 = rRightSeq.getConstArray()[n]; + const OUString& rS1 = rLeftSeq.getConstArray()[n]; + const OUString& rS2 = rRightSeq.getConstArray()[n]; bRes = ( rS1 == rS2 ); } } diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index e04b6801026a..30915a7a0a28 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -41,13 +41,13 @@ using namespace comphelper; //========================================================================= //========================================================================= -static bool makeCanonicalFileURL( rtl::OUString & rURL ) +static bool makeCanonicalFileURL( OUString & rURL ) { OSL_ENSURE( rURL.matchAsciiL( "file:", sizeof( "file:" ) - 1 , 0 ) , "File URL expected!" ); - rtl::OUString aNormalizedURL; - if ( osl::FileBase::getAbsoluteFileURL( rtl::OUString(), + OUString aNormalizedURL; + if ( osl::FileBase::getAbsoluteFileURL( OUString(), rURL, aNormalizedURL ) == osl::DirectoryItem::E_None ) @@ -113,42 +113,42 @@ OfficeInstallationDirectories::~OfficeInstallationDirectories() //========================================================================= // virtual -rtl::OUString SAL_CALL +OUString SAL_CALL OfficeInstallationDirectories::getOfficeInstallationDirectoryURL() throw ( uno::RuntimeException ) { initDirs(); - return rtl::OUString( *m_pOfficeBrandDir ); + return OUString( *m_pOfficeBrandDir ); } //========================================================================= // virtual -rtl::OUString SAL_CALL +OUString SAL_CALL OfficeInstallationDirectories::getOfficeUserDataDirectoryURL() throw ( uno::RuntimeException ) { initDirs(); - return rtl::OUString( *m_pUserDir ); + return OUString( *m_pUserDir ); } //========================================================================= // virtual -rtl::OUString SAL_CALL -OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL ) +OUString SAL_CALL +OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL ) throw ( uno::RuntimeException ) { if ( !URL.isEmpty() ) { initDirs(); - rtl::OUString aCanonicalURL( URL ); + OUString aCanonicalURL( URL ); makeCanonicalFileURL( aCanonicalURL ); sal_Int32 nIndex = aCanonicalURL.indexOf( *m_pOfficeBrandDir ); if ( nIndex != -1 ) { - return rtl::OUString( + return OUString( aCanonicalURL.replaceAt( nIndex, m_pOfficeBrandDir->getLength(), m_aOfficeBrandDirMacro ) ); @@ -158,20 +158,20 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL ) nIndex = aCanonicalURL.indexOf( *m_pUserDir ); if ( nIndex != -1 ) { - return rtl::OUString( + return OUString( aCanonicalURL.replaceAt( nIndex, m_pUserDir->getLength(), m_aUserDirMacro ) ); } } } - return rtl::OUString( URL ); + return OUString( URL ); } //========================================================================= // virtual -rtl::OUString SAL_CALL -OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL ) +OUString SAL_CALL +OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL ) throw ( uno::RuntimeException ) { if ( !URL.isEmpty() ) @@ -181,7 +181,7 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL ) { initDirs(); - return rtl::OUString( + return OUString( URL.replaceAt( nIndex, m_aOfficeBrandDirMacro.getLength(), *m_pOfficeBrandDir ) ); @@ -193,14 +193,14 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL ) { initDirs(); - return rtl::OUString( + return OUString( URL.replaceAt( nIndex, m_aUserDirMacro.getLength(), *m_pUserDir ) ); } } } - return rtl::OUString( URL ); + return OUString( URL ); } //========================================================================= @@ -208,7 +208,7 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL ) //========================================================================= // virtual -rtl::OUString SAL_CALL +OUString SAL_CALL OfficeInstallationDirectories::getImplementationName() throw ( uno::RuntimeException ) { @@ -218,12 +218,12 @@ OfficeInstallationDirectories::getImplementationName() //========================================================================= // virtual sal_Bool SAL_CALL -OfficeInstallationDirectories::supportsService( const rtl::OUString& ServiceName ) +OfficeInstallationDirectories::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - const uno::Sequence< rtl::OUString > & aNames + const uno::Sequence< OUString > & aNames = getSupportedServiceNames(); - const rtl::OUString * p = aNames.getConstArray(); + const OUString * p = aNames.getConstArray(); for ( sal_Int32 nPos = 0; nPos < aNames.getLength(); nPos++ ) { if ( p[ nPos ].equals( ServiceName ) ) @@ -235,7 +235,7 @@ OfficeInstallationDirectories::supportsService( const rtl::OUString& ServiceName //========================================================================= // virtual -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL OfficeInstallationDirectories::getSupportedServiceNames() throw ( uno::RuntimeException ) { @@ -244,7 +244,7 @@ OfficeInstallationDirectories::getSupportedServiceNames() //========================================================================= // static -rtl::OUString SAL_CALL +OUString SAL_CALL OfficeInstallationDirectories::getImplementationName_static() { return OUString("com.sun.star.comp.util.OfficeInstallationDirectories"); @@ -287,8 +287,8 @@ void OfficeInstallationDirectories::initDirs() osl::MutexGuard aGuard( m_aMutex ); if ( m_pOfficeBrandDir == 0 ) { - m_pOfficeBrandDir = new rtl::OUString; - m_pUserDir = new rtl::OUString; + m_pOfficeBrandDir = new OUString; + m_pUserDir = new OUString; uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(m_xCtx); diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index a9cc4d736463..22517fa0e1ab 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -49,36 +49,36 @@ public: virtual ~OfficeInstallationDirectories(); // XOfficeInstallationDirectories - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getOfficeInstallationDirectoryURL() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getOfficeUserDataDirectoryURL() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL - makeRelocatableURL( const ::rtl::OUString& URL ) + virtual OUString SAL_CALL + makeRelocatableURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL - makeAbsoluteURL( const ::rtl::OUString& URL ) + virtual OUString SAL_CALL + makeAbsoluteURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL + static OUString SAL_CALL getImplementationName_static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static ::rtl::OUString SAL_CALL + static OUString SAL_CALL getSingletonName_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); @@ -86,13 +86,13 @@ public: private: void initDirs(); - rtl::OUString m_aOfficeBrandDirMacro; - rtl::OUString m_aOfficeBaseDirMacro; - rtl::OUString m_aUserDirMacro; + OUString m_aOfficeBrandDirMacro; + OUString m_aOfficeBaseDirMacro; + OUString m_aUserDirMacro; com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xCtx; - rtl::OUString * m_pOfficeBrandDir; - rtl::OUString * m_pUserDir; + OUString * m_pOfficeBrandDir; + OUString * m_pUserDir; }; } // namespace comphelper diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index 1fb16b302f6f..cd078a9f59e9 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -51,7 +51,7 @@ Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo( return mxInfo; } -void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue ) +void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -69,7 +69,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPr _postSetValues(); } -Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -90,32 +90,32 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPro return aAny; } -void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) +void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) +void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) +void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) +void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } // XMultiPropertySet -void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) +void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -149,7 +149,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OU } } -Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) +Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -183,7 +183,7 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence return aValues; } -void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) +void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo @@ -195,14 +195,14 @@ void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Refere // todo } -void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) +void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } // XPropertyState -PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUString& PropertyName ) +PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find( PropertyName ); @@ -218,7 +218,7 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUSt return aState; } -Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames ) +Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) throw(UnknownPropertyException, RuntimeException) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -244,7 +244,7 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons return aStates; } -void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) +void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -254,7 +254,7 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString& _setPropertyToDefault( *((*aIter).second) ); } -Any SAL_CALL ChainablePropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx index 413651814157..c645af7c1c15 100644 --- a/comphelper/source/property/ChainablePropertySetInfo.cxx +++ b/comphelper/source/property/ChainablePropertySetInfo.cxx @@ -20,7 +20,6 @@ #include #include -using ::rtl::OUString; using ::comphelper::PropertyInfo; using ::comphelper::GenerateCppuType; using ::comphelper::ChainablePropertySetInfo; @@ -67,7 +66,7 @@ void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount ) } } -void ChainablePropertySetInfo::remove( const rtl::OUString& aName ) +void ChainablePropertySetInfo::remove( const OUString& aName ) throw() { maMap.erase ( aName ); @@ -99,7 +98,7 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() return maProperties; } -Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) +Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& rName ) throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { PropertyInfoHash::iterator aIter = maMap.find( rName ); @@ -118,7 +117,7 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUSt return aProperty; } -sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) +sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() ); diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index 1cc524b95a88..f996e8b1fc7d 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -101,7 +101,7 @@ void MasterPropertySet::registerSlave ( ChainablePropertySet *pNewSet ) mpInfo->add ( pNewSet->mpInfo->maMap, mnLastId ); } -void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue ) +void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -135,7 +135,7 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope } } -Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -171,32 +171,32 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper return aAny; } -void SAL_CALL MasterPropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) +void SAL_CALL MasterPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL MasterPropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) +void SAL_CALL MasterPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL MasterPropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) +void SAL_CALL MasterPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) +void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } // XMultiPropertySet -void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) +void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -262,7 +262,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr } } -Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) +Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -328,7 +328,7 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< : return aValues; } -void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) +void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo @@ -340,14 +340,14 @@ void SAL_CALL MasterPropertySet::removePropertiesChangeListener( const Reference // todo } -void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) +void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } // XPropertyState -PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUString& PropertyName ) +PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find( PropertyName ); @@ -379,7 +379,7 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUStrin return aState; } -Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames ) +Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) throw(UnknownPropertyException, RuntimeException) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -426,7 +426,7 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S return aStates; } -void SAL_CALL MasterPropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) +void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -436,7 +436,7 @@ void SAL_CALL MasterPropertySet::setPropertyToDefault( const ::rtl::OUString& rP _setPropertyToDefault( *((*aIter).second->mpInfo) ); } -Any SAL_CALL MasterPropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index e59d907d163f..e85d7402eb3a 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.cxx @@ -20,7 +20,6 @@ #include #include -using ::rtl::OUString; using ::comphelper::PropertyInfo; using ::comphelper::GenerateCppuType; using ::comphelper::MasterPropertySetInfo; @@ -116,7 +115,7 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() return maProperties; } -Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) +Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rName ) throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { PropertyDataHash::iterator aIter = maMap.find( rName ); @@ -136,7 +135,7 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUStrin return aProperty; } -sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) +sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() ); diff --git a/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx index 6925c67848ae..a5b27bc66d87 100644 --- a/comphelper/source/property/TypeGeneration.cxx +++ b/comphelper/source/property/TypeGeneration.cxx @@ -123,7 +123,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -204,7 +203,7 @@ namespace comphelper case CPPUTYPE_REFTXTTABLE: pType = &::getCppuType( (Reference*)0 ); break; case CPPUTYPE_AWTPOINT: pType = &::getCppuType( (awt::Point*)0 ); break; case CPPUTYPE_REFLIBCONTAINER: pType = &::getCppuType( (Reference< script::XLibraryContainer >*)0); break; - case CPPUTYPE_OUSTRINGS: pType = &::getCppuType( (Sequence< ::rtl::OUString >*)0); break; + case CPPUTYPE_OUSTRINGS: pType = &::getCppuType( (Sequence< OUString >*)0); break; case CPPUTYPE_SEQANY: pType = &::getCppuType( (Sequence< uno::Any >*)0); break; case CPPUTYPE_REFRESULTSET: pType = &::getCppuType( (Reference< sdbc::XResultSet >*)0); break; case CPPUTYPE_REFCONNECTION: pType = &::getCppuType( (Reference< sdbc::XConnection >*)0); break; diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 92f220787392..831dc5908e00 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -57,7 +57,7 @@ namespace comphelper { private: GenericAnyMapImpl maAnyMap; - ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, ::rtl::OUStringHash,UStringEqual> m_aListener; + ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, OUStringHash,UStringEqual> m_aListener; protected: virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ); @@ -78,13 +78,13 @@ namespace comphelper virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw( RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); // XPropertySet - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; } @@ -100,7 +100,7 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw() GenericPropertySet::~GenericPropertySet() throw() { } -void SAL_CALL GenericPropertySet::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); if ( xInfo.is() ) @@ -122,7 +122,7 @@ void SAL_CALL GenericPropertySet::addPropertyChangeListener( const ::rtl::OUStri } } -void SAL_CALL GenericPropertySet::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard( maMutex ); Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index f7418ba148d1..a3d3a64d501e 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -121,22 +121,22 @@ namespace comphelper } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException) + OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL OPropertyBag::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames_static() ); - const ::rtl::OUString* pStart = aServices.getConstArray(); - const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength(); + Sequence< OUString > aServices( getSupportedServiceNames_static() ); + const OUString* pStart = aServices.getConstArray(); + const OUString* pEnd = aServices.getConstArray() + aServices.getLength(); return ::std::find( pStart, pEnd, rServiceName ) != pEnd; } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } @@ -225,7 +225,7 @@ namespace comphelper // If we ever have a smarter XPropertyContainer::addProperty interface, we can remove this, ehm, well, hack. Property aProperty; if ( !( _element >>= aProperty ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); ::osl::ClearableMutexGuard g( m_aMutex ); @@ -234,7 +234,7 @@ namespace comphelper if ( !m_aAllowedTypes.empty() && m_aAllowedTypes.find( aProperty.Type ) == m_aAllowedTypes.end() ) - throw IllegalTypeException( ::rtl::OUString(), *this ); + throw IllegalTypeException( OUString(), *this ); m_aDynamicProperties.addVoidProperty( aProperty.Name, aProperty.Type, findFreeHandle(), aProperty.Attributes ); @@ -250,7 +250,7 @@ namespace comphelper { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); } @@ -332,7 +332,7 @@ namespace comphelper } //-------------------------------------------------------------------- - void SAL_CALL OPropertyBag::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) + void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -343,7 +343,7 @@ namespace comphelper && !m_aAllowedTypes.empty() && m_aAllowedTypes.find( aPropertyType ) == m_aAllowedTypes.end() ) - throw IllegalTypeException( ::rtl::OUString(), *this ); + throw IllegalTypeException( OUString(), *this ); m_aDynamicProperties.addProperty( _rName, findFreeHandle(), _nAttributes, _rInitialValue ); @@ -355,7 +355,7 @@ namespace comphelper } //-------------------------------------------------------------------- - void SAL_CALL OPropertyBag::removeProperty( const ::rtl::OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) + void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -380,9 +380,9 @@ namespace comphelper }; template< typename CLASS > - struct TransformPropertyToName : public ::std::unary_function< CLASS, ::rtl::OUString > + struct TransformPropertyToName : public ::std::unary_function< CLASS, OUString > { - const ::rtl::OUString& operator()( const CLASS& _rProp ) + const OUString& operator()( const CLASS& _rProp ) { return _rProp.Name; } @@ -407,7 +407,7 @@ namespace comphelper m_aDynamicProperties.describeProperties( aProperties ); // their names - Sequence< ::rtl::OUString > aNames( aProperties.getLength() ); + Sequence< OUString > aNames( aProperties.getLength() ); ::std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), @@ -436,8 +436,8 @@ namespace comphelper ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper(); Sequence< PropertyValue > aPropertyValues( aNames.getLength() ); - const ::rtl::OUString* pName = aNames.getConstArray(); - const ::rtl::OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); + const OUString* pName = aNames.getConstArray(); + const OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); const Any* pValue = aValues.getArray(); PropertyValue* pPropertyValue = aPropertyValues.getArray(); @@ -464,7 +464,7 @@ namespace comphelper ); // a sequence of names - Sequence< ::rtl::OUString > aNames( aProperties.getLength() ); + Sequence< OUString > aNames( aProperties.getLength() ); ::std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), @@ -485,7 +485,7 @@ namespace comphelper Sequence< sal_Int32 > aHandles( nCount ); sal_Int32* pHandle = aHandles.getArray(); const PropertyValue* pProperty = aProperties.getConstArray(); - for ( const ::rtl::OUString* pName = aNames.getConstArray(); + for ( const OUString* pName = aNames.getConstArray(); pName != aNames.getConstArray() + aNames.getLength(); ++pName, ++pHandle, ++pProperty ) @@ -526,7 +526,7 @@ namespace comphelper catch( const UnknownPropertyException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + throw WrappedTargetException( OUString(), *this, ::cppu::getCaughtException() ); } } diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 2127c6611c94..93fa44510921 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -96,8 +96,8 @@ namespace comphelper public: // XServiceInfo - static versions - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -112,9 +112,9 @@ namespace comphelper virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XModifiable: virtual ::sal_Bool SAL_CALL isModified( ) @@ -134,8 +134,8 @@ namespace comphelper throw (::com::sun::star::uno::RuntimeException); // XPropertyContainer - virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeProperty( const ::rtl::OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index bc24d9499527..983b2bba4c91 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -45,7 +45,7 @@ namespace comphelper //------------------------------------------------------------------------------ namespace { - const Property* lcl_findPropertyByName( const Sequence< Property >& _rProps, const ::rtl::OUString& _rName ) + const Property* lcl_findPropertyByName( const Sequence< Property >& _rProps, const OUString& _rName ) { sal_Int32 nLen = _rProps.getLength(); const Property* pProperties = _rProps.getConstArray(); @@ -80,7 +80,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( // if properties are present both at the delegatee and the aggregate, then the former are supposed to win. // So, we'll need an existence check. - ::std::set< ::rtl::OUString > aDelegatorProps; + ::std::set< OUString > aDelegatorProps; // create the map for the delegator properties sal_Int32 nMPLoop = 0; @@ -148,7 +148,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( } //------------------------------------------------------------------ -OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper::classifyProperty( const ::rtl::OUString& _rName ) +OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper::classifyProperty( const OUString& _rName ) { PropertyOrigin eOrigin = UNKNOWN_PROPERTY; // look up the name @@ -167,7 +167,7 @@ OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper: } //------------------------------------------------------------------ -Property OPropertyArrayAggregationHelper::getPropertyByName( const ::rtl::OUString& _rPropertyName ) throw( UnknownPropertyException ) +Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rPropertyName ) throw( UnknownPropertyException ) { const Property* pProperty = findPropertyByName( _rPropertyName ); @@ -178,19 +178,19 @@ Property OPropertyArrayAggregationHelper::getPropertyByName( const ::rtl::OUStri } //------------------------------------------------------------------------------ -sal_Bool OPropertyArrayAggregationHelper::hasPropertyByName(const ::rtl::OUString& _rPropertyName) +sal_Bool OPropertyArrayAggregationHelper::hasPropertyByName(const OUString& _rPropertyName) { return NULL != findPropertyByName( _rPropertyName ); } //------------------------------------------------------------------------------ -const Property* OPropertyArrayAggregationHelper::findPropertyByName(const :: rtl::OUString& _rName ) const +const Property* OPropertyArrayAggregationHelper::findPropertyByName(const :: OUString& _rName ) const { return lcl_findPropertyByName( m_aProperties, _rName ); } //------------------------------------------------------------------------------ -sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const ::rtl::OUString& _rPropertyName) +sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const OUString& _rPropertyName) { const Property* pProperty = findPropertyByName( _rPropertyName ); return pProperty ? pProperty->Handle : -1; @@ -198,7 +198,7 @@ sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const ::rtl::OUString //------------------------------------------------------------------------------ sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle( - ::rtl::OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle) + OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle) { ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle); sal_Bool bRet = i != m_aPropertyAccessors.end(); @@ -227,7 +227,7 @@ sal_Bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandl //------------------------------------------------------------------------------ bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( - ::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const + OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const { ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle); bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate; @@ -255,21 +255,21 @@ bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( //------------------------------------------------------------------------------ sal_Int32 OPropertyArrayAggregationHelper::fillHandles( - sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropNames ) + sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< OUString >& _rPropNames ) { sal_Int32 nHitCount = 0; - const ::rtl::OUString* pReqProps = _rPropNames.getConstArray(); + const OUString* pReqProps = _rPropNames.getConstArray(); sal_Int32 nReqLen = _rPropNames.getLength(); #if OSL_DEBUG_LEVEL > 0 // assure that the sequence is sorted { - const ::rtl::OUString* pLookup = _rPropNames.getConstArray(); - const ::rtl::OUString* pEnd = _rPropNames.getConstArray() + _rPropNames.getLength() - 1; + const OUString* pLookup = _rPropNames.getConstArray(); + const OUString* pEnd = _rPropNames.getConstArray() + _rPropNames.getLength() - 1; for (; pLookup < pEnd; ++pLookup) { - const ::rtl::OUString* pCompare = pLookup + 1; - const ::rtl::OUString* pCompareEnd = pEnd + 1; + const OUString* pCompare = pLookup + 1; + const OUString* pCompareEnd = pEnd + 1; for (; pCompare < pCompareEnd; ++pCompare) { OSL_ENSURE(pLookup->compareTo(*pCompare) < 0, "OPropertyArrayAggregationHelper::fillHandles : property names are not sorted!"); @@ -477,7 +477,7 @@ void OPropertySetAggregationHelper::disposing() { // register as a single listener m_xAggregateMultiSet->removePropertiesChangeListener(this); - m_xAggregateSet->removeVetoableChangeListener(::rtl::OUString(), this); + m_xAggregateSet->removeVetoableChangeListener(OUString(), this); m_bListening = sal_False; } @@ -564,7 +564,7 @@ void OPropertySetAggregationHelper::setAggregation(const ::com::sun::star::uno: if (m_bListening && m_xAggregateSet.is()) { m_xAggregateMultiSet->removePropertiesChangeListener(this); - m_xAggregateSet->removeVetoableChangeListener(::rtl::OUString(), this); + m_xAggregateSet->removeVetoableChangeListener(OUString(), this); m_bListening = sal_False; } @@ -586,16 +586,16 @@ void OPropertySetAggregationHelper::startListening() if (!m_bListening && m_xAggregateSet.is()) { // register as a single listener - ::com::sun::star::uno::Sequence< ::rtl::OUString > aPropertyNames; + ::com::sun::star::uno::Sequence< OUString > aPropertyNames; m_xAggregateMultiSet->addPropertiesChangeListener(aPropertyNames, this); - m_xAggregateSet->addVetoableChangeListener(::rtl::OUString(), this); + m_xAggregateSet->addVetoableChangeListener(OUString(), this); m_bListening = sal_True; } } //------------------------------------------------------------------------------ -void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const ::rtl::OUString& _rPropertyName, +void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& _rxListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -605,7 +605,7 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const ::r } //------------------------------------------------------------------------------ -void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const ::rtl::OUString& _rPropertyName, +void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& _rxListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -615,7 +615,7 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const ::r } //------------------------------------------------------------------------------ -void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropertyNames, +void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener>& _rxListener) throw( ::com::sun::star::uno::RuntimeException) { @@ -634,7 +634,7 @@ sal_Int32 OPropertySetAggregationHelper::getOriginalHandle(sal_Int32 nHandle) co } //-------------------------------------------------------------------------- -::rtl::OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) const +OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) const { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( const_cast(this)->getInfoHelper() ); Property aProperty; @@ -649,7 +649,7 @@ void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHa ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; // does the handle belong to the aggregation ? @@ -666,7 +666,7 @@ void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHa void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const { OPropertyArrayAggregationHelper& rPH = (OPropertyArrayAggregationHelper&)const_cast(this)->getInfoHelper(); - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) @@ -691,7 +691,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; ::com::sun::star::uno::Any aValue; @@ -710,7 +710,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: //------------------------------------------------------------------------------ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( - const Sequence< ::rtl::OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) + const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) { OSL_ENSURE( !rBHelper.bInDispose, "OPropertySetAggregationHelper::setPropertyValues : do not use within the dispose call !"); @@ -729,9 +729,9 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( { // by definition of XMultiPropertySet::setPropertyValues, unknown properties are to be ignored #if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer aMessage; + OStringBuffer aMessage; aMessage.append( "OPropertySetAggregationHelper::setPropertyValues: unknown property '" ); - aMessage.append( ::rtl::OUStringToOString( _rPropertyNames[0], RTL_TEXTENCODING_ASCII_US ) ); + aMessage.append( OUStringToOString( _rPropertyNames[0], RTL_TEXTENCODING_ASCII_US ) ); aMessage.append( "'" ); aMessage.append( "\n(implementation " ); aMessage.append( typeid( *this ).name() ); @@ -745,7 +745,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); // determine which properties belong to the aggregate, and which ones to the delegator - const ::rtl::OUString* pNames = _rPropertyNames.getConstArray(); + const OUString* pNames = _rPropertyNames.getConstArray(); sal_Int32 nAggCount(0); sal_Int32 nLen(_rPropertyNames.getLength()); @@ -753,7 +753,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( { OPropertyArrayAggregationHelper::PropertyOrigin ePropOrg = rPH.classifyProperty( *pNames ); if ( OPropertyArrayAggregationHelper::UNKNOWN_PROPERTY == ePropOrg ) - throw WrappedTargetException( ::rtl::OUString(), static_cast< XMultiPropertySet* >( this ), makeAny( UnknownPropertyException( ) ) ); + throw WrappedTargetException( OUString(), static_cast< XMultiPropertySet* >( this ), makeAny( UnknownPropertyException( ) ) ); // due to a flaw in the API design, this method is not allowed to throw an UnknownPropertyException // so we wrap it into a WrappedTargetException @@ -784,15 +784,15 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( // dividing the Names and _rValues // aggregate's names - Sequence< ::rtl::OUString > AggPropertyNames( nAggCount ); - ::rtl::OUString* pAggNames = AggPropertyNames.getArray(); + Sequence< OUString > AggPropertyNames( nAggCount ); + OUString* pAggNames = AggPropertyNames.getArray(); // aggregate's values Sequence< Any > AggValues( nAggCount ); Any* pAggValues = AggValues.getArray(); // delegator names - Sequence< ::rtl::OUString > DelPropertyNames( nLen - nAggCount ); - ::rtl::OUString* pDelNames = DelPropertyNames.getArray(); + Sequence< OUString > DelPropertyNames( nLen - nAggCount ); + OUString* pDelNames = DelPropertyNames.getArray(); // delegator values Sequence< Any > DelValues( nLen - nAggCount ); @@ -896,7 +896,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( // XPropertyState //------------------------------------------------------------------------------ - ::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const ::rtl::OUString& _rPropertyName) + ::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); @@ -907,7 +907,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( throw ::com::sun::star::beans::UnknownPropertyException(); } - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { @@ -921,7 +921,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( } //------------------------------------------------------------------------------ -void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::OUString& _rPropertyName) +void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); @@ -931,7 +931,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O throw ::com::sun::star::beans::UnknownPropertyException(); } - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { @@ -954,7 +954,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O } //------------------------------------------------------------------------------ - ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const ::rtl::OUString& aPropertyName) + ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); @@ -963,7 +963,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O if ( nHandle == -1 ) throw ::com::sun::star::beans::UnknownPropertyException(); - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx index 669a28bf4470..f1c544f3c93b 100644 --- a/comphelper/source/property/property.cxx +++ b/comphelper/source/property/property.cxx @@ -91,15 +91,15 @@ void copyProperties(const Reference& _rxSource, catch (Exception&) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer aBuffer; + OStringBuffer aBuffer; aBuffer.append( "::comphelper::copyProperties: could not copy property '" ); - aBuffer.append( ::rtl::OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ) ); + aBuffer.append( OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ) ); aBuffer.append( "' to the destination set (a '" ); Reference< XServiceInfo > xSI( _rxDest, UNO_QUERY ); if ( xSI.is() ) { - aBuffer.append( ::rtl::OUStringToOString( xSI->getImplementationName(), osl_getThreadTextEncoding() ) ); + aBuffer.append( OUStringToOString( xSI->getImplementationName(), osl_getThreadTextEncoding() ) ); } else { @@ -109,15 +109,15 @@ void copyProperties(const Reference& _rxSource, Any aException( ::cppu::getCaughtException() ); aBuffer.append( "Caught an exception of type '" ); - ::rtl::OUString sExceptionType( aException.getValueTypeName() ); - aBuffer.append( ::rtl::OString( sExceptionType.getStr(), sExceptionType.getLength(), RTL_TEXTENCODING_ASCII_US ) ); + OUString sExceptionType( aException.getValueTypeName() ); + aBuffer.append( OString( sExceptionType.getStr(), sExceptionType.getLength(), RTL_TEXTENCODING_ASCII_US ) ); aBuffer.append( "'" ); Exception aBaseException; if ( ( aException >>= aBaseException ) && !aBaseException.Message.isEmpty() ) { aBuffer.append( ", saying '" ); - aBuffer.append( ::rtl::OString( aBaseException.Message.getStr(), aBaseException.Message.getLength(), osl_getThreadTextEncoding() ) ); + aBuffer.append( OString( aBaseException.Message.getStr(), aBaseException.Message.getLength(), osl_getThreadTextEncoding() ) ); aBuffer.append( "'" ); } aBuffer.append( "." ); @@ -130,7 +130,7 @@ void copyProperties(const Reference& _rxSource, } //------------------------------------------------------------------ -sal_Bool hasProperty(const rtl::OUString& _rName, const Reference& _rxSet) +sal_Bool hasProperty(const OUString& _rName, const Reference& _rxSet) { if (_rxSet.is()) { @@ -141,7 +141,7 @@ sal_Bool hasProperty(const rtl::OUString& _rName, const Reference& } //------------------------------------------------------------------ -void RemoveProperty(Sequence& _rProps, const rtl::OUString& _rPropName) +void RemoveProperty(Sequence& _rProps, const OUString& _rPropName) { sal_Int32 nLen = _rProps.getLength(); @@ -159,7 +159,7 @@ void RemoveProperty(Sequence& _rProps, const rtl::OUString& _rPropName } //------------------------------------------------------------------ -void ModifyPropertyAttributes(Sequence& seqProps, const ::rtl::OUString& sPropName, sal_Int16 nAddAttrib, sal_Int16 nRemoveAttrib) +void ModifyPropertyAttributes(Sequence& seqProps, const OUString& sPropName, sal_Int16 nAddAttrib, sal_Int16 nRemoveAttrib) { sal_Int32 nLen = seqProps.getLength(); diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx index ba612a53db8e..79225fc492e6 100644 --- a/comphelper/source/property/propertybag.cxx +++ b/comphelper/source/property/propertybag.cxx @@ -77,7 +77,7 @@ namespace comphelper //-------------------------------------------------------------------- namespace { - void lcl_checkForEmptyName( const bool _allowEmpty, const ::rtl::OUString& _name ) + void lcl_checkForEmptyName( const bool _allowEmpty, const OUString& _name ) { if ( !_allowEmpty && _name.isEmpty() ) throw IllegalArgumentException( @@ -88,7 +88,7 @@ namespace comphelper ); } - void lcl_checkNameAndHandle( const ::rtl::OUString& _name, const sal_Int32 _handle, const PropertyBag& _container ) + void lcl_checkNameAndHandle( const OUString& _name, const sal_Int32 _handle, const PropertyBag& _container ) { if ( _container.hasPropertyByName( _name ) || _container.hasPropertyByHandle( _handle ) ) throw PropertyExistException( @@ -100,7 +100,7 @@ namespace comphelper } //-------------------------------------------------------------------- - void PropertyBag::addVoidProperty( const ::rtl::OUString& _rName, const Type& _rType, sal_Int32 _nHandle, sal_Int32 _nAttributes ) + void PropertyBag::addVoidProperty( const OUString& _rName, const Type& _rType, sal_Int32 _nHandle, sal_Int32 _nAttributes ) { if ( _rType.getTypeClass() == TypeClass_VOID ) throw IllegalArgumentException( @@ -123,7 +123,7 @@ namespace comphelper } //-------------------------------------------------------------------- - void PropertyBag::addProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Any& _rInitialValue ) + void PropertyBag::addProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Any& _rInitialValue ) { // check type sanity Type aPropertyType = _rInitialValue.getValueType(); @@ -146,12 +146,12 @@ namespace comphelper } //-------------------------------------------------------------------- - void PropertyBag::removeProperty( const ::rtl::OUString& _rName ) + void PropertyBag::removeProperty( const OUString& _rName ) { const Property& rProp = getProperty( _rName ); // will throw an UnknownPropertyException if necessary if ( ( rProp.Attributes & PropertyAttribute::REMOVABLE ) == 0 ) - throw NotRemoveableException( ::rtl::OUString(), NULL ); + throw NotRemoveableException( OUString(), NULL ); const sal_Int32 nHandle = rProp.Handle; revokeProperty( nHandle ); diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index 9720762c5657..6715567276d0 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -59,8 +59,8 @@ namespace // comparing two property descriptions (by name) struct PropertyDescriptionNameMatch : public ::std::unary_function< PropertyDescription, bool > { - ::rtl::OUString m_rCompare; - PropertyDescriptionNameMatch( const ::rtl::OUString& _rCompare ) : m_rCompare( _rCompare ) { } + OUString m_rCompare; + PropertyDescriptionNameMatch( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } bool operator() (const PropertyDescription& x ) const { @@ -84,7 +84,7 @@ OPropertyContainerHelper::~OPropertyContainerHelper() } //-------------------------------------------------------------------------- -void OPropertyContainerHelper::registerProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, +void OPropertyContainerHelper::registerProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType) { OSL_ENSURE((_nAttributes & PropertyAttribute::MAYBEVOID) == 0, @@ -112,7 +112,7 @@ void OPropertyContainerHelper::revokeProperty( sal_Int32 _nHandle ) } //-------------------------------------------------------------------------- -void OPropertyContainerHelper::registerMayBeVoidProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, +void OPropertyContainerHelper::registerMayBeVoidProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, Any* _pPointerToMember, const Type& _rExpectedType) { OSL_ENSURE((_nAttributes & PropertyAttribute::MAYBEVOID) != 0, @@ -134,7 +134,7 @@ void OPropertyContainerHelper::registerMayBeVoidProperty(const ::rtl::OUString& //-------------------------------------------------------------------------- -void OPropertyContainerHelper::registerPropertyNoMember(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, +void OPropertyContainerHelper::registerPropertyNoMember(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Type& _rType, const void* _pInitialValue) { OSL_ENSURE(!_rType.equals(::getCppuType(static_cast< Any* >(NULL))), @@ -161,7 +161,7 @@ sal_Bool OPropertyContainerHelper::isRegisteredProperty( sal_Int32 _nHandle ) co } //-------------------------------------------------------------------------- -sal_Bool OPropertyContainerHelper::isRegisteredProperty( const ::rtl::OUString& _rName ) const +sal_Bool OPropertyContainerHelper::isRegisteredProperty( const OUString& _rName ) const { // TODO: the current structure is from a time where properties were // static, not dynamic. Since we allow that properties are also dynamic, @@ -214,7 +214,7 @@ namespace { void lcl_throwIllegalPropertyValueTypeException( const PropertyDescription& _rProperty, const Any& _rValue ) { - ::rtl::OUStringBuffer aErrorMessage; + OUStringBuffer aErrorMessage; aErrorMessage.appendAscii( "The given value cannot be converted to the required property type." ); aErrorMessage.appendAscii( "\n(property name \"" ); aErrorMessage.append( _rProperty.aProperty.Name ); @@ -464,7 +464,7 @@ OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHan } //-------------------------------------------------------------------------- -const Property& OPropertyContainerHelper::getProperty( const ::rtl::OUString& _rName ) const +const Property& OPropertyContainerHelper::getProperty( const OUString& _rName ) const { ConstPropertiesIterator pos = ::std::find_if( m_aProperties.begin(), diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index 27b4c0eeb5b7..e1422cf21f3f 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -82,7 +82,7 @@ Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) return mp->mpInfo; } -void SAL_CALL PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { PropertyMapEntry* aEntries[2]; aEntries[0] = mp->find( aPropertyName ); @@ -95,7 +95,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPrope _setPropertyValues( (const PropertyMapEntry**)aEntries, &aValue ); } -Any SAL_CALL PropertySetHelper::getPropertyValue( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertyMapEntry* aEntries[2]; aEntries[0] = mp->find( PropertyName ); @@ -111,28 +111,28 @@ Any SAL_CALL PropertySetHelper::getPropertyValue( const ::rtl::OUString& Propert return aAny; } -void SAL_CALL PropertySetHelper::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL PropertySetHelper::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL PropertySetHelper::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } // XMultiPropertySet -void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { const sal_Int32 nCount = aPropertyNames.getLength(); @@ -163,7 +163,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< ::rtl::OUStr } } -Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) throw(RuntimeException) +Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException) { const sal_Int32 nCount = aPropertyNames.getLength(); @@ -197,7 +197,7 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< : return aValues; } -void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) +void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } @@ -207,13 +207,13 @@ void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference // todo } -void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) +void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } // XPropertyState -PropertyState SAL_CALL PropertySetHelper::getPropertyState( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) +PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyMapEntry* aEntries[2]; @@ -229,7 +229,7 @@ PropertyState SAL_CALL PropertySetHelper::getPropertyState( const ::rtl::OUStrin return aState; } -Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< ::rtl::OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException) +Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException) { const sal_Int32 nCount = aPropertyName.getLength(); @@ -264,7 +264,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S return aStates; } -void SAL_CALL PropertySetHelper::setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyMapEntry *pEntry = mp->find( PropertyName ); if( NULL == pEntry ) @@ -273,7 +273,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const ::rtl::OUString& Pr _setPropertyToDefault( pEntry ); } -Any SAL_CALL PropertySetHelper::getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertyMapEntry* pEntry = mp->find( aPropertyName ); if( NULL == pEntry ) diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index c38c1f877360..2567a0630109 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -173,7 +173,7 @@ void PropertySetInfo::add( PropertyMapEntry* pMap ) throw() mpMap->add( pMap ); } -void PropertySetInfo::remove( const rtl::OUString& aName ) throw() +void PropertySetInfo::remove( const OUString& aName ) throw() { mpMap->remove( aName ); } @@ -183,12 +183,12 @@ Sequence< ::com::sun::star::beans::Property > SAL_CALL PropertySetInfo::getPrope return mpMap->getProperties(); } -Property SAL_CALL PropertySetInfo::getPropertyByName( const ::rtl::OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { return mpMap->getPropertyByName( aName ); } -sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException) { return mpMap->hasPropertyByName( Name ); } diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx index 257c3eb821dc..2155d555e180 100644 --- a/comphelper/source/property/propertystatecontainer.cxx +++ b/comphelper/source/property/propertystatecontainer.cxx @@ -31,13 +31,13 @@ namespace comphelper namespace { - static ::rtl::OUString lcl_getUnknownPropertyErrorMessage( const ::rtl::OUString& _rPropertyName ) + static OUString lcl_getUnknownPropertyErrorMessage( const OUString& _rPropertyName ) { // TODO: perhaps it's time to think about resources in the comphelper module? // Would be nice to have localized exception strings (a simply resource file containing // strings only would suffice, and could be realized with an UNO service, so we do not // need the dependency to the Tools project) - ::rtl::OUStringBuffer sMessage; + OUStringBuffer sMessage; sMessage.appendAscii( "The property \"" ); sMessage.append( _rPropertyName ); sMessage.appendAscii( "\" is unknown." ); @@ -67,7 +67,7 @@ namespace comphelper IMPLEMENT_FORWARD_XTYPEPROVIDER2( OPropertyStateContainer, OPropertyContainer, OPropertyStateContainer_TBase ) //-------------------------------------------------------------------- - sal_Int32 OPropertyStateContainer::getHandleForName( const ::rtl::OUString& _rPropertyName ) SAL_THROW( ( UnknownPropertyException ) ) + sal_Int32 OPropertyStateContainer::getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( UnknownPropertyException ) ) { // look up the handle for the name ::cppu::IPropertyArrayHelper& rPH = getInfoHelper(); @@ -80,13 +80,13 @@ namespace comphelper } //-------------------------------------------------------------------- - PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { return getPropertyStateByHandle( getHandleForName( _rPropertyName ) ); } //-------------------------------------------------------------------- - Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< ::rtl::OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException) + Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException) { sal_Int32 nProperties = _rPropertyNames.getLength(); Sequence< PropertyState> aStates( nProperties ); @@ -96,17 +96,17 @@ namespace comphelper #ifdef _DEBUG // precondition: property sequence is sorted (the algorythm below relies on this) { - const ::rtl::OUString* pNames = _rPropertyNames.getConstArray(); - const ::rtl::OUString* pNamesCompare = pNames + 1; - const ::rtl::OUString* pNamesEnd = _rPropertyNames.getConstArray() + _rPropertyNames.getLength(); + const OUString* pNames = _rPropertyNames.getConstArray(); + const OUString* pNamesCompare = pNames + 1; + const OUString* pNamesEnd = _rPropertyNames.getConstArray() + _rPropertyNames.getLength(); for ( ; pNamesCompare != pNamesEnd; ++pNames, ++pNamesCompare ) OSL_PRECOND( pNames->compareTo( *pNamesCompare ) < 0, "OPropertyStateContainer::getPropertyStates: property sequence not sorted!" ); } #endif - const ::rtl::OUString* pLookup = _rPropertyNames.getConstArray(); - const ::rtl::OUString* pLookupEnd = pLookup + nProperties; + const OUString* pLookup = _rPropertyNames.getConstArray(); + const OUString* pLookupEnd = pLookup + nProperties; PropertyState* pStates = aStates.getArray(); cppu::IPropertyArrayHelper& rHelper = getInfoHelper(); @@ -139,13 +139,13 @@ namespace comphelper } //-------------------------------------------------------------------- - void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { setPropertyToDefaultByHandle( getHandleForName( _rPropertyName ) ); } //-------------------------------------------------------------------- - Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { Any aDefault; getPropertyDefaultByHandle( getHandleForName( _rPropertyName ), aDefault ); diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx index 7efee0cf33e5..e6cd40f0f344 100644 --- a/comphelper/source/property/propmultiplex.cxx +++ b/comphelper/source/property/propmultiplex.cxx @@ -111,7 +111,7 @@ void OPropertyChangeMultiplexer::dispose() { Reference< XPropertyChangeListener> xPreventDelete(this); - const ::rtl::OUString* pProperties = m_aProperties.getConstArray(); + const OUString* pProperties = m_aProperties.getConstArray(); for (sal_Int32 i = 0; i < m_aProperties.getLength(); ++i, ++pProperties) m_xSet->removePropertyChangeListener(*pProperties, static_cast< XPropertyChangeListener*>(this)); @@ -155,7 +155,7 @@ void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const PropertyChangeE } //------------------------------------------------------------------ -void OPropertyChangeMultiplexer::addProperty(const ::rtl::OUString& _sPropertyName) +void OPropertyChangeMultiplexer::addProperty(const OUString& _sPropertyName) { if (m_xSet.is()) { diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index dbc36ce2c41c..1b4e1324936a 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -83,7 +83,7 @@ namespace comphelper // XPropertyState //--------------------------------------------------------------------- - ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const ::rtl::OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -95,7 +95,7 @@ namespace comphelper } //--------------------------------------------------------------------- - void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const ::rtl::OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -107,7 +107,7 @@ namespace comphelper } //--------------------------------------------------------------------- - ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const ::rtl::OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -119,12 +119,12 @@ namespace comphelper } //--------------------------------------------------------------------- - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { sal_Int32 nLen = _rPropertyNames.getLength(); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> aRet(nLen); ::com::sun::star::beans::PropertyState* pValues = aRet.getArray(); - const ::rtl::OUString* pNames = _rPropertyNames.getConstArray(); + const OUString* pNames = _rPropertyNames.getConstArray(); cppu::IPropertyArrayHelper& rHelper = getInfoHelper(); diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx index 8c39c2902c51..8a683a738570 100644 --- a/comphelper/source/streaming/basicio.cxx +++ b/comphelper/source/streaming/basicio.cxx @@ -89,14 +89,14 @@ const staruno::Reference& operator << (const starun } //------------------------------------------------------------------------------ -const staruno::Reference& operator >> (const staruno::Reference& _rxInStream, ::rtl::OUString& rStr) +const staruno::Reference& operator >> (const staruno::Reference& _rxInStream, OUString& rStr) { rStr = _rxInStream->readUTF(); return _rxInStream; } //------------------------------------------------------------------------------ -const staruno::Reference& operator << (const staruno::Reference& _rxOutStream, const ::rtl::OUString& rStr) +const staruno::Reference& operator << (const staruno::Reference& _rxOutStream, const OUString& rStr) { _rxOutStream->writeUTF(rStr); return _rxOutStream; diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index fb654abb4f23..572715e334d1 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -29,7 +29,6 @@ #include #include -using ::rtl::OUString; using ::cppu::OWeakObject; using ::cppu::WeakImplHelper4; using namespace ::com::sun::star::io; @@ -71,8 +70,8 @@ public: virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > SAL_CALL Create( const Reference< ::com::sun::star::uno::XComponentContext >& ); private: @@ -210,12 +209,12 @@ void SAL_CALL UNOMemoryStream::truncate() throw (IOException, RuntimeException) mnCursor = 0; } -::rtl::OUString SAL_CALL UNOMemoryStream::getImplementationName_static() +OUString SAL_CALL UNOMemoryStream::getImplementationName_static() { - return ::rtl::OUString("com.sun.star.comp.MemoryStream"); + return OUString("com.sun.star.comp.MemoryStream"); } -Sequence< ::rtl::OUString > SAL_CALL UNOMemoryStream::getSupportedServiceNames_static() +Sequence< OUString > SAL_CALL UNOMemoryStream::getSupportedServiceNames_static() { Sequence< OUString > aSeq(1); aSeq[0] = getImplementationName_static(); diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index 419362bbab3d..23764161a316 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -41,10 +41,10 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) { if (!m_pFile) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); ::osl::MutexGuard aGuard( m_aMutex ); @@ -53,7 +53,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 sal_uInt64 nRead = 0; FileBase::RC eError = m_pFile->read((void*)aData.getArray(), nBytesToRead, nRead); if (eError != FileBase::E_None) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); // Wenn gelesene Zeichen < MaxLength, staruno::Sequence anpassen if (nRead < (sal_uInt32)nBytesToRead) @@ -66,10 +66,10 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) { if (!m_pFile) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); if (nMaxBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); return readBytes(aData, nMaxBytesToRead); } @@ -79,7 +79,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); sal_uInt64 nCurrentPos; m_pFile->getPos(nCurrentPos); @@ -88,7 +88,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st FileBase::RC eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos); if (eError != FileBase::E_None) { - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); } } @@ -97,27 +97,27 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnecte { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); sal_uInt64 nPos; FileBase::RC eError = m_pFile->getPos(nPos); if (eError != FileBase::E_None) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); sal_uInt64 nDummy = 0; eError = m_pFile->setPos(osl_Pos_End, nDummy); if (eError != FileBase::E_None) - throw stario::NotConnectedException(::rtl::OUString(),static_cast(this)); + throw stario::NotConnectedException(OUString(),static_cast(this)); sal_uInt64 nAvailable; eError = m_pFile->getPos(nAvailable); if (eError != FileBase::E_None) - throw stario::NotConnectedException(::rtl::OUString(),static_cast(this)); + throw stario::NotConnectedException(OUString(),static_cast(this)); nAvailable = nAvailable - nPos; eError = m_pFile->setPos(osl_Pos_Absolut, nPos); if (eError != FileBase::E_None) - throw stario::NotConnectedException(::rtl::OUString(),static_cast(this)); + throw stario::NotConnectedException(OUString(),static_cast(this)); return sal::static_int_cast< sal_Int32 >( std::max(nAvailable, sal::static_int_cast< sal_uInt64 >(SAL_MAX_INT32))); } @@ -126,7 +126,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnecte void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException ) { if (!m_pFile) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); m_pFile->close(); @@ -150,7 +150,7 @@ void SAL_CALL OSLOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_In if (eError != FileBase::E_None || nWritten != sal::static_int_cast< sal_uInt32 >(aData.getLength())) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); } } diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index c26c7bd9bbff..de10a03d686d 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -48,13 +48,13 @@ public: explicit SequenceInputStreamService(); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString & ServiceName ) 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 & ServiceName ) throw ( uno::RuntimeException ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException ); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); // ::com::sun::star::io::XInputStream: @@ -90,7 +90,7 @@ SequenceInputStreamService::SequenceInputStreamService() {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException ) +OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException ) { return getImplementationName_static(); } @@ -100,9 +100,9 @@ OUString SAL_CALL SequenceInputStreamService::getImplementationName_static() return OUString( "com.sun.star.comp.SequenceInputStreamService" ); } -::sal_Bool SAL_CALL SequenceInputStreamService::supportsService( ::rtl::OUString const & serviceName ) throw ( uno::RuntimeException ) +::sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > serviceNames = getSupportedServiceNames(); + uno::Sequence< OUString > serviceNames = getSupportedServiceNames(); for ( ::sal_Int32 i = 0; i < serviceNames.getLength(); ++i ) { if ( serviceNames[i] == serviceName ) return sal_True; @@ -110,7 +110,7 @@ OUString SAL_CALL SequenceInputStreamService::getImplementationName_static() return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException ) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index 9dc868b461e9..1acb945f2e11 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -42,13 +42,13 @@ public: explicit SequenceOutputStreamService(); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString & ServiceName ) 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 & ServiceName ) throw ( uno::RuntimeException ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException ); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); // ::com::sun::star::io::XOutputStream: @@ -76,7 +76,7 @@ SequenceOutputStreamService::SequenceOutputStreamService() } // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException ) +OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException ) { return getImplementationName_static(); } @@ -86,9 +86,9 @@ OUString SAL_CALL SequenceOutputStreamService::getImplementationName_static() return OUString("com.sun.star.comp.SequenceOutputStreamService"); } -::sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( ::rtl::OUString const & serviceName ) throw ( uno::RuntimeException ) +::sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > serviceNames = getSupportedServiceNames(); + uno::Sequence< OUString > serviceNames = getSupportedServiceNames(); for ( ::sal_Int32 i = 0; i < serviceNames.getLength(); ++i ) { if ( serviceNames[i] == serviceName ) return sal_True; @@ -96,7 +96,7 @@ OUString SAL_CALL SequenceOutputStreamService::getImplementationName_static() return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException ) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index b2680793febb..242af3a39b4c 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -44,7 +44,7 @@ SequenceInputStream::SequenceInputStream(const ByteSequence& rData) inline sal_Int32 SequenceInputStream::avail() { if (m_nPos == -1) - throw NotConnectedException(::rtl::OUString(), *this); + throw NotConnectedException(OUString(), *this); return m_aData.getLength() - m_nPos; } @@ -60,7 +60,7 @@ sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence& aData, sa sal_Int32 nAvail = avail(); if (nBytesToRead < 0) - throw BufferSizeExceededException(::rtl::OUString(),*this); + throw BufferSizeExceededException(OUString(),*this); if (nAvail < nBytesToRead) nBytesToRead = nAvail; @@ -91,7 +91,7 @@ void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 nAvail = avail(); if (nBytesToSkip < 0) - throw BufferSizeExceededException(::rtl::OUString(),*this); + throw BufferSizeExceededException(OUString(),*this); if (nAvail < nBytesToSkip) nBytesToSkip = nAvail; @@ -113,7 +113,7 @@ void SAL_CALL SequenceInputStream::closeInput( ) throw(NotConnectedException, IOException, RuntimeException) { if (m_nPos == -1) - throw NotConnectedException(::rtl::OUString(), *this); + throw NotConnectedException(OUString(), *this); m_nPos = -1; } diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index b6f95c7bf9bd..33157cf92df0 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -25,7 +25,6 @@ using namespace osl; using namespace com::sun::star; -using ::rtl::OUString; namespace comphelper { diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index 609ae165a8c6..6a98d305cf9b 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; namespace comphelper { // ----------------------------------- -uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString aStreamName, const uno::Reference< uno::XComponentContext > xContext ) +uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const OUString aStreamName, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { OUString aStringID = OUString( "_rels/" ); @@ -126,14 +126,14 @@ void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOu xWriter->setOutputStream( xOutStream ); - ::rtl::OUString aTypesElement( "Types" ); - ::rtl::OUString aDefaultElement( "Default" ); - ::rtl::OUString aOverrideElement( "Override" ); - ::rtl::OUString aExtensionAttr( "Extension" ); - ::rtl::OUString aPartNameAttr( "PartName" ); - ::rtl::OUString aContentTypeAttr( "ContentType" ); - ::rtl::OUString aCDATAString( "CDATA" ); - ::rtl::OUString aWhiteSpace( " " ); + OUString aTypesElement( "Types" ); + OUString aDefaultElement( "Default" ); + OUString aOverrideElement( "Override" ); + OUString aExtensionAttr( "Extension" ); + OUString aPartNameAttr( "PartName" ); + OUString aContentTypeAttr( "ContentType" ); + OUString aCDATAString( "CDATA" ); + OUString aWhiteSpace( " " ); // write the namespace AttributeList* pRootAttrList = new AttributeList; @@ -179,7 +179,7 @@ void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOu // ================================================================================== // ----------------------------------- -uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< uno::XComponentContext > xContext ) +uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { if ( !xContext.is() || !xInStream.is() || nFormat > FORMAT_MAX_ID ) @@ -246,7 +246,7 @@ void SAL_CALL OFOPXMLHelper::endDocument() } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) +void SAL_CALL OFOPXMLHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw( xml::sax::SAXException, uno::RuntimeException ) { if ( m_nFormat == RELATIONINFO_FORMAT ) @@ -277,13 +277,13 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u sal_Int32 nAttrNum = 0; m_aResultSeq[nNewEntryNum-1].realloc( 4 ); // the maximal expected number of arguments is 4 - ::rtl::OUString aIDValue = xAttribs->getValueByName( m_aIDAttr ); + OUString aIDValue = xAttribs->getValueByName( m_aIDAttr ); if ( aIDValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the ID value must present - ::rtl::OUString aTypeValue = xAttribs->getValueByName( m_aTypeAttr ); - ::rtl::OUString aTargetValue = xAttribs->getValueByName( m_aTargetAttr ); - ::rtl::OUString aTargetModeValue = xAttribs->getValueByName( m_aTargetModeAttr ); + OUString aTypeValue = xAttribs->getValueByName( m_aTypeAttr ); + OUString aTargetValue = xAttribs->getValueByName( m_aTargetAttr ); + OUString aTargetModeValue = xAttribs->getValueByName( m_aTargetModeAttr ); m_aResultSeq[nNewEntryNum-1][++nAttrNum - 1].First = m_aIDAttr; m_aResultSeq[nNewEntryNum-1][nAttrNum - 1].Second = aIDValue; @@ -343,11 +343,11 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u if ( m_aResultSeq.getLength() != 2 ) throw uno::RuntimeException(); - ::rtl::OUString aExtensionValue = xAttribs->getValueByName( m_aExtensionAttr ); + OUString aExtensionValue = xAttribs->getValueByName( m_aExtensionAttr ); if ( aExtensionValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the Extension value must present - ::rtl::OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr ); + OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr ); if ( aContentTypeValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the ContentType value must present @@ -372,11 +372,11 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u if ( m_aResultSeq.getLength() != 2 ) throw uno::RuntimeException(); - ::rtl::OUString aPartNameValue = xAttribs->getValueByName( m_aPartNameAttr ); + OUString aPartNameValue = xAttribs->getValueByName( m_aPartNameAttr ); if ( aPartNameValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the PartName value must present - ::rtl::OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr ); + OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr ); if ( aContentTypeValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the ContentType value must present @@ -394,7 +394,7 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName ) +void SAL_CALL OFOPXMLHelper::endElement( const OUString& aName ) throw( xml::sax::SAXException, uno::RuntimeException ) { if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT ) @@ -411,19 +411,19 @@ void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName ) } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::characters( const ::rtl::OUString& /*aChars*/ ) +void SAL_CALL OFOPXMLHelper::characters( const OUString& /*aChars*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) +void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) +void SAL_CALL OFOPXMLHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } diff --git a/comphelper/source/xml/xmltools.cxx b/comphelper/source/xml/xmltools.cxx index 1f5f2c3c20d1..a73a4535fee8 100644 --- a/comphelper/source/xml/xmltools.cxx +++ b/comphelper/source/xml/xmltools.cxx @@ -94,7 +94,7 @@ namespace comphelper { namespace xml { - rtl::OString makeXMLChaff() + OString makeXMLChaff() { rtlRandomPool pool = rtl_random_createPool(); @@ -110,7 +110,7 @@ namespace comphelper encodeChaff(aChaff); - return rtl::OString(reinterpret_cast(&aChaff[0]), nLength); + return OString(reinterpret_cast(&aChaff[0]), nLength); } } } diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index 1b6a9e426b5d..1e609a302277 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -58,15 +58,15 @@ namespace { void normalize( - rtl::OUString const & path, rtl::OUString const & relative, - rtl::OUString * normalizedPath, rtl::OUString * name) + OUString const & path, OUString const & relative, + OUString * normalizedPath, OUString * name) { sal_Int32 i = relative.lastIndexOf('/'); if (i == -1) { *normalizedPath = path; *name = relative; } else { - rtl::OUStringBuffer buf(path); + OUStringBuffer buf(path); buf.append(sal_Unicode('/')); buf.append(relative.copy(0, i)); *normalizedPath = buf.makeStringAndClear(); @@ -89,19 +89,19 @@ public: void testCrossThreads(); css::uno::Any getKey( - rtl::OUString const & path, rtl::OUString const & relative) const; + OUString const & path, OUString const & relative) const; void setKey( - rtl::OUString const & path, rtl::OUString const & name, + OUString const & path, OUString const & name, css::uno::Any const & value) const; - bool resetKey(rtl::OUString const & path, rtl::OUString const & name) const; + bool resetKey(OUString const & path, OUString const & name) const; css::uno::Reference< css::uno::XInterface > createViewAccess( - rtl::OUString const & path) const; + OUString const & path) const; css::uno::Reference< css::uno::XInterface > createUpdateAccess( - rtl::OUString const & path) const; + OUString const & path) const; CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST(testKeyFetch); @@ -159,20 +159,20 @@ void TestThread::run() { class ReaderThread: public TestThread { public: ReaderThread( - osl::Condition & stop, Test const & test, rtl::OUString const & path, - rtl::OUString const & relative); + osl::Condition & stop, Test const & test, OUString const & path, + OUString const & relative); private: virtual bool iteration(); Test const & test_; - rtl::OUString path_; - rtl::OUString relative_; + OUString path_; + OUString relative_; }; ReaderThread::ReaderThread( - osl::Condition & stop, Test const & test, rtl::OUString const & path, - rtl::OUString const & relative): + osl::Condition & stop, Test const & test, OUString const & path, + OUString const & relative): TestThread(stop), test_(test), path_(path), relative_(relative) { create(); @@ -185,21 +185,21 @@ bool ReaderThread::iteration() { class WriterThread: public TestThread { public: WriterThread( - osl::Condition & stop, Test const & test, rtl::OUString const & path, - rtl::OUString const & relative); + osl::Condition & stop, Test const & test, OUString const & path, + OUString const & relative); private: virtual bool iteration(); Test const & test_; - rtl::OUString path_; - rtl::OUString name_; + OUString path_; + OUString name_; std::size_t index_; }; WriterThread::WriterThread( - osl::Condition & stop, Test const & test, rtl::OUString const & path, - rtl::OUString const & relative): + osl::Condition & stop, Test const & test, OUString const & path, + OUString const & relative): TestThread(stop), test_(test), index_(0) { normalize(path, relative, &path_, &name_); @@ -207,13 +207,13 @@ WriterThread::WriterThread( } bool WriterThread::iteration() { - rtl::OUString options[] = { - rtl::OUString("fish"), - rtl::OUString("chips"), - rtl::OUString("kippers"), - rtl::OUString("bloaters") }; + OUString options[] = { + OUString("fish"), + OUString("chips"), + OUString("kippers"), + OUString("bloaters") }; test_.setKey(path_, name_, css::uno::makeAny(options[index_])); - index_ = (index_ + 1) % (sizeof options / sizeof (rtl::OUString)); + index_ = (index_ + 1) % (sizeof options / sizeof (OUString)); return true; } @@ -253,13 +253,13 @@ RecursiveTest::RecursiveTest( void RecursiveTest::test() { properties_ = css::uno::Reference< css::beans::XPropertySet >( test_.createUpdateAccess( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" "dotuno:WebHtml"))), css::uno::UNO_QUERY_THROW); properties_->addPropertyChangeListener( - rtl::OUString("Label"), this); + OUString("Label"), this); step(); CPPUNIT_ASSERT(count_ == 0); css::uno::Reference< css::lang::XComponent >( @@ -302,12 +302,12 @@ SimpleRecursiveTest::SimpleRecursiveTest( void SimpleRecursiveTest::step() const { test_.setKey( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" "dotuno:WebHtml")), - rtl::OUString("Label"), - css::uno::makeAny(rtl::OUString("step"))); + OUString("Label"), + css::uno::makeAny(OUString("step"))); } class CrossThreadTest: public RecursiveTest { @@ -328,17 +328,17 @@ void CrossThreadTest::step() const { stop.set(); WriterThread( stop, test_, - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" "dotuno:WebHtml")), - rtl::OUString("Label")).join(); + OUString("Label")).join(); test_.resetKey( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" "dotuno:WebHtml")), - rtl::OUString("Label")); + OUString("Label")); } void Test::setUp() { @@ -354,9 +354,9 @@ void Test::setUp() { context_ = css::uno::Reference< css::uno::XComponentContext >( css::uno::Reference< css::beans::XPropertySet >( cppu::createRegistryServiceFactory( - rtl::OUString(registry, SAL_NO_ACQUIRE)), + OUString(registry, SAL_NO_ACQUIRE)), css::uno::UNO_QUERY_THROW)->getPropertyValue( - rtl::OUString("DefaultContext")), + OUString("DefaultContext")), css::uno::UNO_QUERY_THROW); provider_ = css::configuration::theDefaultProvider::get(context_); } @@ -367,74 +367,74 @@ void Test::tearDown() { } void Test::testKeyFetch() { - rtl::OUString s; + OUString s; CPPUNIT_ASSERT( getKey( - rtl::OUString("/org.openoffice.Setup"), - rtl::OUString("L10N/ooLocale")) >>= + OUString("/org.openoffice.Setup"), + OUString("L10N/ooLocale")) >>= s); CPPUNIT_ASSERT( getKey( - rtl::OUString("/org.openoffice.Setup"), - rtl::OUString("Test/AString")) >>= + OUString("/org.openoffice.Setup"), + OUString("Test/AString")) >>= s); } void Test::testKeySet() { setKey( - rtl::OUString("/org.openoffice.Setup/Test"), - rtl::OUString("AString"), - css::uno::makeAny(rtl::OUString("baa"))); - rtl::OUString s; + OUString("/org.openoffice.Setup/Test"), + OUString("AString"), + css::uno::makeAny(OUString("baa"))); + OUString s; CPPUNIT_ASSERT( getKey( - rtl::OUString("/org.openoffice.Setup/Test"), - rtl::OUString("AString")) >>= + OUString("/org.openoffice.Setup/Test"), + OUString("AString")) >>= s); CPPUNIT_ASSERT( s == "baa" ); } void Test::testKeyReset() { if (resetKey( - rtl::OUString("/org.openoffice.Setup/Test"), - rtl::OUString("AString"))) + OUString("/org.openoffice.Setup/Test"), + OUString("AString"))) { - rtl::OUString s; + OUString s; CPPUNIT_ASSERT( getKey( - rtl::OUString("/org.openoffice.Setup/Test"), - rtl::OUString("AString")) >>= + OUString("/org.openoffice.Setup/Test"), + OUString("AString")) >>= s); CPPUNIT_ASSERT( s == "Foo" ); } } void Test::testSetSetMemberName() { - rtl::OUString s; + OUString s; CPPUNIT_ASSERT( getKey( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" ".uno:FontworkShapeType")), - rtl::OUString("Label")) >>= + OUString("Label")) >>= s); CPPUNIT_ASSERT( s == "Fontwork Shape" ); css::uno::Reference< css::container::XNameAccess > access( createUpdateAccess( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/" "Commands"))), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNamed > member; access->getByName( - rtl::OUString(".uno:FontworkGalleryFloater")) >>= + OUString(".uno:FontworkGalleryFloater")) >>= member; CPPUNIT_ASSERT(member.is()); member->setName( - rtl::OUString(".uno:FontworkShapeType")); + OUString(".uno:FontworkShapeType")); css::uno::Reference< css::util::XChangesBatch >( access, css::uno::UNO_QUERY_THROW)->commitChanges(); css::uno::Reference< css::lang::XComponent >( @@ -442,11 +442,11 @@ void Test::testSetSetMemberName() { CPPUNIT_ASSERT( getKey( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" ".uno:FontworkShapeType")), - rtl::OUString("Label")) >>= + OUString("Label")) >>= s); CPPUNIT_ASSERT( s == "Fontwork Gallery" ); } @@ -454,12 +454,12 @@ void Test::testSetSetMemberName() { void Test::testReadCommands() { css::uno::Reference< css::container::XNameAccess > access( createViewAccess( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.UI.GenericCommands/UserInterface/" "Commands"))), css::uno::UNO_QUERY_THROW); - css::uno::Sequence< rtl::OUString > names(access->getElementNames()); + css::uno::Sequence< OUString > names(access->getElementNames()); CPPUNIT_ASSERT(names.getLength() == 695); // testSetSetMemberName() already removed ".uno:FontworkGalleryFloater" sal_uInt32 n = osl_getGlobalTimer(); @@ -469,11 +469,11 @@ void Test::testReadCommands() { if (access->getByName(names[j]) >>= child) { CPPUNIT_ASSERT(child.is()); child->getByName( - rtl::OUString("Label")); + OUString("Label")); child->getByName( - rtl::OUString("ContextLabel")); + OUString("ContextLabel")); child->getByName( - rtl::OUString("Properties")); + OUString("Properties")); } } } @@ -484,28 +484,28 @@ void Test::testReadCommands() { } void Test::testThreads() { - struct Entry { rtl::OUString path; rtl::OUString relative; }; + struct Entry { OUString path; OUString relative; }; Entry list[] = { - { rtl::OUString("/org.openoffice.Setup"), - rtl::OUString("Test/AString") }, - { rtl::OUString("/org.openoffice.Setup"), - rtl::OUString("Test/AString") }, - { rtl::OUString( + { OUString("/org.openoffice.Setup"), + OUString("Test/AString") }, + { OUString("/org.openoffice.Setup"), + OUString("Test/AString") }, + { OUString( "/org.openoffice.UI.GenericCommands"), - rtl::OUString( + OUString( "UserInterface/Commands/dotuno:WebHtml/Label") }, - { rtl::OUString( + { OUString( "/org.openoffice.UI.GenericCommands"), - rtl::OUString( + OUString( "UserInterface/Commands/dotuno:NewPresentation/Label") }, - { rtl::OUString( + { OUString( "/org.openoffice.UI.GenericCommands"), - rtl::OUString( + OUString( "UserInterface/Commands/dotuno:RecentFileList/Label") }, - { rtl::OUString("/org.openoffice.Setup"), - rtl::OUString("L10N/ooLocale") }, - { rtl::OUString("/org.openoffice.Setup"), - rtl::OUString("Test/ABoolean") } + { OUString("/org.openoffice.Setup"), + OUString("L10N/ooLocale") }, + { OUString("/org.openoffice.Setup"), + OUString("Test/ABoolean") } }; std::size_t const numReaders = sizeof list / sizeof (Entry); std::size_t const numWriters = numReaders - 2; @@ -523,8 +523,8 @@ void Test::testThreads() { } for (int i = 0; i < 5; ++i) { for (std::size_t j = 0; j < numReaders; ++j) { - rtl::OUString path; - rtl::OUString name; + OUString path; + OUString name; normalize(list[j].path, list[j].relative, &path, &name); resetKey(path, name); osl::Thread::yield(); @@ -560,7 +560,7 @@ void Test::testCrossThreads() { } css::uno::Any Test::getKey( - rtl::OUString const & path, rtl::OUString const & relative) const + OUString const & path, OUString const & relative) const { css::uno::Reference< css::container::XHierarchicalNameAccess > access( createViewAccess(path), css::uno::UNO_QUERY_THROW); @@ -571,7 +571,7 @@ css::uno::Any Test::getKey( } void Test::setKey( - rtl::OUString const & path, rtl::OUString const & name, + OUString const & path, OUString const & name, css::uno::Any const & value) const { css::uno::Reference< css::container::XNameReplace > access( @@ -583,7 +583,7 @@ void Test::setKey( access, css::uno::UNO_QUERY_THROW)->dispose(); } -bool Test::resetKey(rtl::OUString const & path, rtl::OUString const & name) +bool Test::resetKey(OUString const & path, OUString const & name) const { //TODO: support setPropertyToDefault @@ -602,29 +602,29 @@ bool Test::resetKey(rtl::OUString const & path, rtl::OUString const & name) } css::uno::Reference< css::uno::XInterface > Test::createViewAccess( - rtl::OUString const & path) const + OUString const & path) const { css::uno::Any arg( css::uno::makeAny( css::beans::NamedValue( - rtl::OUString("nodepath"), + OUString("nodepath"), css::uno::makeAny(path)))); return provider_->createInstanceWithArguments( - rtl::OUString( + OUString( "com.sun.star.configuration.ConfigurationAccess"), css::uno::Sequence< css::uno::Any >(&arg, 1)); } css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess( - rtl::OUString const & path) const + OUString const & path) const { css::uno::Any arg( css::uno::makeAny( css::beans::NamedValue( - rtl::OUString("nodepath"), + OUString("nodepath"), css::uno::makeAny(path)))); return provider_->createInstanceWithArguments( - rtl::OUString( + OUString( "com.sun.star.configuration.ConfigurationUpdateAccess"), css::uno::Sequence< css::uno::Any >(&arg, 1)); } diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx index 76d4ec088eb8..15b756c30dca 100644 --- a/configmgr/source/valueparser.cxx +++ b/configmgr/source/valueparser.cxx @@ -90,10 +90,10 @@ bool parseValue(xmlreader::Span const & text, sal_Int16 * value) { rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"), RTL_CONSTASCII_LENGTH("0X")) == 0 ? - rtl::OString( + OString( text.begin + RTL_CONSTASCII_LENGTH("0X"), text.length - RTL_CONSTASCII_LENGTH("0X")).toInt32(16) : - rtl::OString(text.begin, text.length).toInt32(); + OString(text.begin, text.length).toInt32(); //TODO: check valid lexical representation if (n >= SAL_MIN_INT16 && n <= SAL_MAX_INT16) { *value = static_cast< sal_Int16 >(n); @@ -109,10 +109,10 @@ bool parseValue(xmlreader::Span const & text, sal_Int32 * value) { rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"), RTL_CONSTASCII_LENGTH("0X")) == 0 ? - rtl::OString( + OString( text.begin + RTL_CONSTASCII_LENGTH("0X"), text.length - RTL_CONSTASCII_LENGTH("0X")).toInt32(16) : - rtl::OString(text.begin, text.length).toInt32(); + OString(text.begin, text.length).toInt32(); //TODO: check valid lexical representation return true; } @@ -124,17 +124,17 @@ bool parseValue(xmlreader::Span const & text, sal_Int64 * value) { rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"), RTL_CONSTASCII_LENGTH("0X")) == 0 ? - rtl::OString( + OString( text.begin + RTL_CONSTASCII_LENGTH("0X"), text.length - RTL_CONSTASCII_LENGTH("0X")).toInt64(16) : - rtl::OString(text.begin, text.length).toInt64(); + OString(text.begin, text.length).toInt64(); //TODO: check valid lexical representation return true; } bool parseValue(xmlreader::Span const & text, double * value) { assert(text.is() && value != 0); - *value = rtl::OString(text.begin, text.length).toDouble(); + *value = OString(text.begin, text.length).toDouble(); //TODO: check valid lexical representation return true; } @@ -180,7 +180,7 @@ template< typename T > css::uno::Any parseSingleValue( } template< typename T > css::uno::Any parseListValue( - rtl::OString const & separator, xmlreader::Span const & text) + OString const & separator, xmlreader::Span const & text) { comphelper::SequenceAsVector< T > seq; xmlreader::Span sep; @@ -213,7 +213,7 @@ template< typename T > css::uno::Any parseListValue( } css::uno::Any parseValue( - rtl::OString const & separator, xmlreader::Span const & text, Type type) + OString const & separator, xmlreader::Span const & text, Type type) { switch (type) { case TYPE_ANY: @@ -418,7 +418,7 @@ bool ValueParser::endElement() { assert(false); // this cannot happen break; } - separator_ = rtl::OString(); + separator_ = OString(); node_.clear(); } break; @@ -428,7 +428,7 @@ bool ValueParser::endElement() { break; case STATE_IT: items_.push_back( - parseValue(rtl::OString(), pad_.get(), elementType(type_))); + parseValue(OString(), pad_.get(), elementType(type_))); pad_.clear(); state_ = STATE_TEXT; break; diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx index 3697b136fd80..45db2db9712b 100644 --- a/configmgr/source/valueparser.hxx +++ b/configmgr/source/valueparser.hxx @@ -66,7 +66,7 @@ public: int getLayer() const; Type type_; - rtl::OString separator_; + OString separator_; private: template< typename T > com::sun::star::uno::Any convertItems(); diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx index 191e45dd9d9e..daae55c2d860 100644 --- a/configmgr/source/writemodfile.cxx +++ b/configmgr/source/writemodfile.cxx @@ -57,11 +57,11 @@ class Components; namespace { -rtl::OString convertToUtf8( +OString convertToUtf8( OUString const & text, sal_Int32 offset, sal_Int32 length) { assert(offset <= text.getLength() && text.getLength() - offset >= length); - rtl::OString s; + OString s; if (!rtl_convertUStringToString( &s.pData, text.pData->buffer + offset, length, RTL_TEXTENCODING_UTF8, @@ -115,7 +115,7 @@ void writeData(oslFileHandle handle, char const * begin, sal_Int32 length) { } } -void writeData(oslFileHandle handle, rtl::OString const & text) { +void writeData(oslFileHandle handle, OString const & text) { writeData(handle, text.getStr(), text.getLength()); } @@ -177,15 +177,15 @@ void writeValueContent(oslFileHandle handle, sal_Int16 value) { } void writeValueContent(oslFileHandle handle, sal_Int32 value) { - writeData(handle, rtl::OString::valueOf(value)); + writeData(handle, OString::valueOf(value)); } void writeValueContent(oslFileHandle handle, sal_Int64 value) { - writeData(handle, rtl::OString::valueOf(value)); + writeData(handle, OString::valueOf(value)); } void writeValueContent(oslFileHandle handle, double value) { - writeData(handle, rtl::OString::valueOf(value)); + writeData(handle, OString::valueOf(value)); } void writeValueContent(oslFileHandle handle, OUString const & value) { diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx index aee9fbaa675d..c0b4296d4dda 100644 --- a/configmgr/source/xcsparser.cxx +++ b/configmgr/source/xcsparser.cxx @@ -346,7 +346,7 @@ void XcsParser::characters(xmlreader::Span const & text) { void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) { //TODO: oor:version, xml:lang attributes - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append('.'); bool hasPackage = false; bool hasName = false; @@ -531,7 +531,7 @@ void XcsParser::handlePropValue( } } } - valueParser_.separator_ = rtl::OString( + valueParser_.separator_ = OString( attrSeparator.begin, attrSeparator.length); valueParser_.start(property); } diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx index 5a659d15b980..c8a2acfd1850 100644 --- a/configmgr/source/xcuparser.cxx +++ b/configmgr/source/xcuparser.cxx @@ -253,7 +253,7 @@ XcuParser::Operation XcuParser::parseOperation(xmlreader::Span const & text) { } void XcuParser::handleComponentData(xmlreader::XmlReader & reader) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append('.'); bool hasPackage = false; bool hasName = false; @@ -417,7 +417,7 @@ void XcuParser::handlePropValue( xmlreader::XmlReader & reader, PropertyNode * prop) { bool nil = false; - rtl::OString separator; + OString separator; OUString external; for (;;) { int attrNsId; @@ -451,7 +451,7 @@ void XcuParser::handlePropValue( reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } - separator = rtl::OString(s.begin, s.length); + separator = OString(s.begin, s.length); } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("external"))) { @@ -493,7 +493,7 @@ void XcuParser::handleLocpropValue( { OUString name; bool nil = false; - rtl::OString separator; + OString separator; Operation op = OPERATION_FUSE; for (;;) { int attrNsId; @@ -531,7 +531,7 @@ void XcuParser::handleLocpropValue( reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } - separator = rtl::OString(s.begin, s.length); + separator = OString(s.begin, s.length); } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op"))) { diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx index a2c4e60f149f..c13b97dc7050 100644 --- a/connectivity/inc/connectivity/CommonTools.hxx +++ b/connectivity/inc/connectivity/CommonTools.hxx @@ -49,20 +49,20 @@ namespace connectivity { //------------------------------------------------------------------------------ OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape); - inline sal_Bool match(const ::rtl::OUString &rWild, const ::rtl::OUString &rStr, const sal_Unicode cEscape) + inline sal_Bool match(const OUString &rWild, const OUString &rStr, const sal_Unicode cEscape) { return match(rWild.getStr(), rStr.getStr(), cEscape); } //------------------------------------------------------------------------------ - OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate); - OOO_DLLPUBLIC_DBTOOLS rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime); - OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime); + OOO_DLLPUBLIC_DBTOOLS OUString toDateString(const ::com::sun::star::util::Date& rDate); + OOO_DLLPUBLIC_DBTOOLS OUString toTimeString(const ::com::sun::star::util::Time& rTime); + OOO_DLLPUBLIC_DBTOOLS OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime); // typedefs typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> OSQLTable; - DECLARE_STL_MAP(::rtl::OUString,OSQLTable,comphelper::UStringMixLess, OSQLTables); + DECLARE_STL_MAP(OUString,OSQLTable,comphelper::UStringMixLess, OSQLTables); // ------------------------------------------------------------------------- // class ORefVector allows reference counting on a std::vector @@ -135,7 +135,7 @@ namespace connectivity OOO_DLLPUBLIC_DBTOOLS OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, - const ::rtl::OUString& _rVal, + const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); // ======================================================================================= // search from __first to __last the column with the realname _rVal @@ -143,7 +143,7 @@ namespace connectivity OOO_DLLPUBLIC_DBTOOLS OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, - const ::rtl::OUString& _rVal, + const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); // ======================================================================================= @@ -154,8 +154,8 @@ namespace connectivity OOO_DLLPUBLIC_DBTOOLS OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, - const ::rtl::OUString& _rProp, - const ::rtl::OUString& _rVal, + const OUString& _rProp, + const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); @@ -175,33 +175,33 @@ namespace connectivity @param _sClassName The class name to look for. */ - OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const ::rtl::OUString& _sClassName ); + OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ); #endif } //================================================================================== #define DECLARE_SERVICE_INFO() \ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ #define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ + return OUString::createFromAscii(implasciiname); \ } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(1); \ + aSupported[0] = OUString::createFromAscii(serviceasciiname); \ return aSupported; \ } \ - sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ + sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ { \ - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ - const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); \ + Sequence< OUString > aSupported(getSupportedServiceNames()); \ + const OUString* pSupported = aSupported.getConstArray(); \ + const OUString* pEnd = pSupported + aSupported.getLength(); \ for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) \ ; \ \ diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx index df89160d5c0d..84a828800a9c 100644 --- a/connectivity/inc/connectivity/ConnectionWrapper.hxx +++ b/connectivity/inc/connectivity/ConnectionWrapper.hxx @@ -80,11 +80,11 @@ namespace connectivity @param _rPassword The password. */ - static void createUniqueId( const ::rtl::OUString& _rURL + static void createUniqueId( const OUString& _rURL ,::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ,sal_uInt8* _pBuffer - ,const ::rtl::OUString& _rUserName = ::rtl::OUString() - ,const ::rtl::OUString& _rPassword = ::rtl::OUString()); + ,const OUString& _rUserName = OUString() + ,const OUString& _rPassword = OUString()); }; } #endif // _CONNECTIVITY_ZCONNECTIONWRAPPER_HXX_ diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx index 72b22386e57a..69c28cacbb02 100644 --- a/connectivity/inc/connectivity/DriversConfig.hxx +++ b/connectivity/inc/connectivity/DriversConfig.hxx @@ -34,8 +34,8 @@ namespace connectivity ::comphelper::NamedValueCollection aProperties; ::comphelper::NamedValueCollection aFeatures; ::comphelper::NamedValueCollection aMetaData; - ::rtl::OUString sDriverFactory; - ::rtl::OUString sDriverTypeDisplayName; + OUString sDriverFactory; + OUString sDriverTypeDisplayName; } TInstalledDriver; DECLARE_STL_USTRINGACCESS_MAP( TInstalledDriver, TInstalledDrivers); @@ -56,7 +56,7 @@ namespace connectivity { typedef salhelper::SingletonRef OSharedConfigNode; - const ::comphelper::NamedValueCollection& impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const; + const ::comphelper::NamedValueCollection& impl_get(const OUString& _sURL,sal_Int32 _nProps) const; public: DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); ~DriversConfig(); @@ -64,12 +64,12 @@ namespace connectivity DriversConfig( const DriversConfig& ); DriversConfig& operator=( const DriversConfig& ); - ::rtl::OUString getDriverFactoryName(const ::rtl::OUString& _sUrl) const; - ::rtl::OUString getDriverTypeDisplayName(const ::rtl::OUString& _sUrl) const; - const ::comphelper::NamedValueCollection& getProperties(const ::rtl::OUString& _sURL) const; - const ::comphelper::NamedValueCollection& getFeatures(const ::rtl::OUString& _sURL) const; - const ::comphelper::NamedValueCollection& getMetaData(const ::rtl::OUString& _sURL) const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > getURLs() const; + OUString getDriverFactoryName(const OUString& _sUrl) const; + OUString getDriverTypeDisplayName(const OUString& _sUrl) const; + const ::comphelper::NamedValueCollection& getProperties(const OUString& _sURL) const; + const ::comphelper::NamedValueCollection& getFeatures(const OUString& _sURL) const; + const ::comphelper::NamedValueCollection& getMetaData(const OUString& _sURL) const; + ::com::sun::star::uno::Sequence< OUString > getURLs() const; private: OSharedConfigNode m_aNode; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB; diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx index b425fe079f3b..34e73612bfa1 100644 --- a/connectivity/inc/connectivity/FValue.hxx +++ b/connectivity/inc/connectivity/FValue.hxx @@ -99,7 +99,7 @@ namespace connectivity operator=(_rRH); } - ORowSetValue(const ::rtl::OUString& _rRH) + ORowSetValue(const OUString& _rRH) :m_eTypeKind(::com::sun::star::sdbc::DataType::VARCHAR) ,m_bNull(true) ,m_bBound(true) @@ -308,7 +308,7 @@ namespace connectivity ORowSetValue& operator=(const ::com::sun::star::util::Time& _rRH); ORowSetValue& operator=(const ::com::sun::star::util::DateTime& _rRH); - ORowSetValue& operator=(const ::rtl::OUString& _rRH); + ORowSetValue& operator=(const OUString& _rRH); // the type isn't set it will be set to VARCHAR if the type is different change it ORowSetValue& operator=(const ::com::sun::star::uno::Sequence& _rRH); // we the possiblity to save a any for bookmarks @@ -330,9 +330,9 @@ namespace connectivity operator float() const { return isNull() ? (float)0.0: getFloat(); } operator double() const { return isNull() ? 0.0 : getDouble(); } - operator ::rtl::OUString() const + operator OUString() const { - return isNull() ? ::rtl::OUString() : getString(); + return isNull() ? OUString() : getString(); } operator ::com::sun::star::util::Date() const @@ -403,7 +403,7 @@ namespace connectivity double getDouble() const; float getFloat() const; - ::rtl::OUString getString() const; // makes a automatic conversion if type isn't a string + OUString getString() const; // makes a automatic conversion if type isn't a string ::com::sun::star::util::Date getDate() const; ::com::sun::star::util::Time getTime() const; ::com::sun::star::util::DateTime getDateTime() const; diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx index 794996b7ad07..0352ed8ec39f 100644 --- a/connectivity/inc/connectivity/IParseContext.hxx +++ b/connectivity/inc/connectivity/IParseContext.hxx @@ -81,13 +81,13 @@ namespace connectivity public: // retrieves language specific error messages - virtual ::rtl::OUString getErrorMessage(ErrorCode _eCodes) const = 0; + virtual OUString getErrorMessage(ErrorCode _eCodes) const = 0; // retrieves language specific keyword strings (only ASCII allowed) - virtual ::rtl::OString getIntlKeywordAscii(InternationalKeyCode _eKey) const = 0; + virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const = 0; // finds out, if we have an international keyword (only ASCII allowed) - virtual InternationalKeyCode getIntlKeyCode(const ::rtl::OString& rToken) const = 0; + virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const = 0; /** get's a locale instance which should be used when parsing in the context specified by this instance

      if this is not overridden by derived classes, it returns the static default locale.

      diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx index 7da2c0691769..a54cb809ca29 100644 --- a/connectivity/inc/connectivity/PColumn.hxx +++ b/connectivity/inc/connectivity/PColumn.hxx @@ -40,8 +40,8 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OParseColumn : public OParseColumn_BASE, public OParseColumn_PROP { - ::rtl::OUString m_aRealName; - ::rtl::OUString m_sLabel; + OUString m_aRealName; + OUString m_sLabel; sal_Bool m_bFunction; sal_Bool m_bDbasePrecisionChanged; sal_Bool m_bAggregateFunction; @@ -54,10 +54,10 @@ namespace connectivity virtual ~OParseColumn(); public: OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase); - OParseColumn(const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, - const ::rtl::OUString& _Description, + OParseColumn(const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, + const OUString& _Description, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -65,23 +65,23 @@ namespace connectivity sal_Bool _IsAutoIncrement, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName); + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName); virtual void construct(); - void setRealName(const ::rtl::OUString& _rName) { m_aRealName = _rName; } - void setLabel(const ::rtl::OUString& i_sLabel) { m_sLabel = i_sLabel; } - void setTableName(const ::rtl::OUString& _rName) { m_TableName = _rName; } + void setRealName(const OUString& _rName) { m_aRealName = _rName; } + void setLabel(const OUString& i_sLabel) { m_sLabel = i_sLabel; } + void setTableName(const OUString& _rName) { m_TableName = _rName; } void setFunction(sal_Bool _bFunction) { m_bFunction = _bFunction; } void setAggregateFunction(sal_Bool _bFunction) { m_bAggregateFunction = _bFunction; } void setIsSearchable( sal_Bool _bIsSearchable ) { m_bIsSearchable = _bIsSearchable; } void setDbasePrecisionChanged(sal_Bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; } - const ::rtl::OUString& getRealName() const { return m_aRealName; } - const ::rtl::OUString& getLabel() const { return m_sLabel; } - const ::rtl::OUString& getTableName() const { return m_TableName; } + const OUString& getRealName() const { return m_aRealName; } + const OUString& getLabel() const { return m_sLabel; } + const OUString& getTableName() const { return m_TableName; } sal_Bool getFunction() const { return m_bFunction; } sal_Bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } @@ -129,7 +129,7 @@ namespace connectivity public: OOrderColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, - const ::rtl::OUString& i_rOriginatingTableName, + const OUString& i_rOriginatingTableName, sal_Bool _bCase, sal_Bool _bAscending ); @@ -142,7 +142,7 @@ namespace connectivity virtual void construct(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); private: using OOrderColumn_BASE::createArrayHelper; }; diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/connectivity/inc/connectivity/SQLStatementHelper.hxx index eca8b615fa91..a7c358e3adb4 100644 --- a/connectivity/inc/connectivity/SQLStatementHelper.hxx +++ b/connectivity/inc/connectivity/SQLStatementHelper.hxx @@ -32,7 +32,7 @@ namespace dbtools class OOO_DLLPUBLIC_DBTOOLS ISQLStatementHelper { public: - virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,::rtl::OUStringBuffer& _rOut) = 0; + virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,OUStringBuffer& _rOut) = 0; protected: ~ISQLStatementHelper() {} diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/connectivity/inc/connectivity/StdTypeDefs.hxx index d957f225f5df..d6cf10a75d6f 100644 --- a/connectivity/inc/connectivity/StdTypeDefs.hxx +++ b/connectivity/inc/connectivity/StdTypeDefs.hxx @@ -29,11 +29,11 @@ namespace rtl { class OUString; } namespace connectivity { - typedef ::std::vector< ::rtl::OUString> TStringVector; + typedef ::std::vector< OUString> TStringVector; typedef ::std::vector< sal_Int32> TIntVector; typedef ::std::map TInt2IntMap; - typedef ::std::map< ::rtl::OUString,sal_Int32> TString2IntMap; - typedef ::std::map< sal_Int32,::rtl::OUString> TInt2StringMap; + typedef ::std::map< OUString,sal_Int32> TString2IntMap; + typedef ::std::map< sal_Int32,OUString> TInt2StringMap; } #endif // CONNECTIVITY_STDTYPEDEFS_HXX diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx index 3e874f966fbf..5fe1dd0eb845 100644 --- a/connectivity/inc/connectivity/TColumnsHelper.hxx +++ b/connectivity/inc/connectivity/TColumnsHelper.hxx @@ -37,11 +37,11 @@ namespace connectivity protected: OTableHelper* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OColumnsHelper( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase diff --git a/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx index 331a9426f20e..b8502af9c5ec 100644 --- a/connectivity/inc/connectivity/TIndex.hxx +++ b/connectivity/inc/connectivity/TIndex.hxx @@ -35,8 +35,8 @@ namespace connectivity public: OIndexHelper( OTableHelper* _pTable); OIndexHelper( OTableHelper* _pTable, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Catalog, + const OUString& _Name, + const OUString& _Catalog, sal_Bool _isUnique, sal_Bool _isPrimaryKeyIndex, sal_Bool _isClustered diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx index 2bf459dc6920..31b0ecfe3ca5 100644 --- a/connectivity/inc/connectivity/TIndexColumns.hxx +++ b/connectivity/inc/connectivity/TIndexColumns.hxx @@ -30,13 +30,13 @@ namespace connectivity { OIndexHelper* m_pIndex; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OIndexColumns( OIndexHelper* _pIndex, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector); + const ::std::vector< OUString> &_rVector); }; } #endif // CONNECTIVITY_INDEXCOLUMNSHELPER_HXX diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx index 4566a607d397..c558c709c8e8 100644 --- a/connectivity/inc/connectivity/TIndexes.hxx +++ b/connectivity/inc/connectivity/TIndexes.hxx @@ -31,15 +31,15 @@ namespace connectivity { OTableHelper* m_pTable; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OIndexesHelper(OTableHelper* _pTable, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ); }; diff --git a/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx index 5099245ef06f..9b24e41c3126 100644 --- a/connectivity/inc/connectivity/TKey.hxx +++ b/connectivity/inc/connectivity/TKey.hxx @@ -35,7 +35,7 @@ namespace connectivity public: OTableKeyHelper( OTableHelper* _pTable); OTableKeyHelper( OTableHelper* _pTable - ,const ::rtl::OUString& _Name + ,const OUString& _Name ,const sdbcx::TKeyProperties& _rProps ); inline OTableHelper* getTable() const { return m_pTable; } diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx index d7a2f8fff47c..6dbb041805b4 100644 --- a/connectivity/inc/connectivity/TKeyColumns.hxx +++ b/connectivity/inc/connectivity/TKeyColumns.hxx @@ -30,13 +30,13 @@ namespace connectivity { OTableKeyHelper* m_pKey; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OKeyColumnsHelper( OTableKeyHelper* _pKey, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector); + const ::std::vector< OUString> &_rVector); }; } #endif // CONNECTIVITY_TKEYCOLUMNS_HXX diff --git a/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx index 26024e792800..817b24da3a42 100644 --- a/connectivity/inc/connectivity/TKeys.hxx +++ b/connectivity/inc/connectivity/TKeys.hxx @@ -32,13 +32,13 @@ namespace connectivity { OTableHelper* m_pTable; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); - virtual ::rtl::OUString getDropForeignKey() const; + virtual OUString getDropForeignKey() const; public: OKeysHelper( OTableHelper* _pTable, diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx index 2155893601f5..aeb58cb4dd0c 100644 --- a/connectivity/inc/connectivity/TTableHelper.hxx +++ b/connectivity/inc/connectivity/TTableHelper.hxx @@ -35,10 +35,10 @@ namespace connectivity typedef sal_Int32 OrdinalPosition; struct ColumnDesc { - ::rtl::OUString sName; - ::rtl::OUString aField6; - ::rtl::OUString sField12; // REMARKS - ::rtl::OUString sField13; + OUString sName; + OUString aField6; + OUString sField12; // REMARKS + OUString sField13; sal_Int32 nField5 , nField7 , nField9 @@ -47,14 +47,14 @@ namespace connectivity OrdinalPosition nOrdinalPosition; ColumnDesc() {} - ColumnDesc( const ::rtl::OUString& _rName + ColumnDesc( const OUString& _rName , sal_Int32 _nField5 - , const ::rtl::OUString& _aField6 + , const OUString& _aField6 , sal_Int32 _nField7 , sal_Int32 _nField9 , sal_Int32 _nField11 - , const ::rtl::OUString& _sField12 - , const ::rtl::OUString& _sField13 + , const OUString& _sField12 + , const OUString& _sField13 ,OrdinalPosition _nPosition ) :sName( _rName ) ,aField6(_aField6) @@ -70,7 +70,7 @@ namespace connectivity }; typedef connectivity::sdbcx::OTable OTable_TYPEDEF; - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); + OOO_DLLPUBLIC_DBTOOLS OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); DECLARE_STL_USTRINGACCESS_MAP( sdbcx::TKeyProperties , TKeyMap); @@ -110,7 +110,7 @@ namespace connectivity * * \return The start of the rename statement. */ - virtual ::rtl::OUString getRenameStart() const; + virtual OUString getRenameStart() const; virtual ~OTableHelper(); @@ -119,7 +119,7 @@ namespace connectivity virtual void refreshKeys(); virtual void refreshIndexes(); - const ColumnDesc* getColumnDescription(const ::rtl::OUString& _sName) const; + const ColumnDesc* getColumnDescription(const OUString& _sName) const; public: OTableHelper( sdbcx::OCollection* _pTables, @@ -128,11 +128,11 @@ namespace connectivity OTableHelper( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, sal_Bool _bCase, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const; @@ -142,18 +142,18 @@ namespace connectivity virtual void SAL_CALL release() throw(); // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // XAlterTable virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); // helper method to get key properties - sdbcx::TKeyProperties getKeyProperties(const ::rtl::OUString& _sName) const; - void addKey(const ::rtl::OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties); + sdbcx::TKeyProperties getKeyProperties(const OUString& _sName) const; + void addKey(const OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties); - virtual ::rtl::OUString getTypeCreatePattern() const; + virtual OUString getTypeCreatePattern() const; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableRename> getRenameService() const; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableAlteration> getAlterService() const; diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx index 6ed56b685455..712c44abddb4 100644 --- a/connectivity/inc/connectivity/dbcharset.hxx +++ b/connectivity/inc/connectivity/dbcharset.hxx @@ -77,7 +77,7 @@ namespace dbtools /** find the given IANA name in the map. @return the end iterator if the IANA name could not be found. */ - CharsetIterator find(const ::rtl::OUString& _rIanaName, const IANA&) const; + CharsetIterator find(const OUString& _rIanaName, const IANA&) const; std::size_t size() const { ensureConstructed( ); return m_aEncodings.size(); } @@ -102,16 +102,16 @@ namespace dbtools friend class OCharsetMap::CharsetIterator; rtl_TextEncoding m_eEncoding; - ::rtl::OUString m_aIanaName; + OUString m_aIanaName; public: CharsetIteratorDerefHelper(const CharsetIteratorDerefHelper& _rSource); rtl_TextEncoding getEncoding() const { return m_eEncoding; } - ::rtl::OUString getIanaName() const { return m_aIanaName; } + OUString getIanaName() const { return m_aIanaName; } protected: - CharsetIteratorDerefHelper( const rtl_TextEncoding _eEncoding, const ::rtl::OUString& _rIanaName ); + CharsetIteratorDerefHelper( const rtl_TextEncoding _eEncoding, const OUString& _rIanaName ); }; diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx index 78df8d04a0ff..61fa3260c87c 100644 --- a/connectivity/inc/connectivity/dbconversion.hxx +++ b/connectivity/inc/connectivity/dbconversion.hxx @@ -80,7 +80,7 @@ namespace dbtools static void setValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>& xVariant, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter, const ::com::sun::star::util::Date& rNullDate, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nKey, sal_Int16 nFieldType, sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException); @@ -94,13 +94,13 @@ namespace dbtools // get the columnvalue as string with a default format given by the column or a default format // for the type - static ::rtl::OUString getFormattedValue( + static OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter, const ::com::sun::star::lang::Locale& _rLocale, const ::com::sun::star::util::Date& rNullDate); - static ::rtl::OUString getFormattedValue( + static OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _xColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter, const ::com::sun::star::util::Date& rNullDate, @@ -108,11 +108,11 @@ namespace dbtools sal_Int16 nKeyType); static ::com::sun::star::util::Date toDate(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); - static ::com::sun::star::util::Date toDate(const ::rtl::OUString& _sSQLDate); + static ::com::sun::star::util::Date toDate(const OUString& _sSQLDate); static ::com::sun::star::util::Time toTime(double dVal); - static ::com::sun::star::util::Time toTime(const ::rtl::OUString& _sSQLDate); + static ::com::sun::star::util::Time toTime(const OUString& _sSQLDate); static ::com::sun::star::util::DateTime toDateTime(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); - static ::com::sun::star::util::DateTime toDateTime(const ::rtl::OUString& _sSQLDate); + static ::com::sun::star::util::DateTime toDateTime(const OUString& _sSQLDate); static sal_Int32 getMsFromTime(const ::com::sun::star::util::Time& rVal); @@ -142,13 +142,13 @@ namespace dbtools static ::com::sun::star::util::Date getNULLDate(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > &xSupplier); // return the date in the format %04d-%02d-%02d - static ::rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate); + static OUString toDateString(const ::com::sun::star::util::Date& rDate); // return the time in the format %02d:%02d:%02d - static ::rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime); + static OUString toTimeString(const ::com::sun::star::util::Time& rTime); // return the DateTime in the format %04d-%02d-%02d %02d:%02d:%02d - static ::rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime& _rDateTime); + static OUString toDateTimeString(const ::com::sun::star::util::DateTime& _rDateTime); // return the any in an sql standard format - static ::rtl::OUString toSQLString(sal_Int32 eType, const ::com::sun::star::uno::Any& _rVal, sal_Bool bQuote, + static OUString toSQLString(sal_Int32 eType, const ::com::sun::star::uno::Any& _rVal, sal_Bool bQuote, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >& _rxTypeConverter); /** converts a Unicode string into a 8-bit string, using the given encoding @@ -168,8 +168,8 @@ namespace dbtools the length of the converted string */ static sal_Int32 convertUnicodeString( - const ::rtl::OUString& _rSource, - ::rtl::OString& _rDest, + const OUString& _rSource, + OString& _rDest, rtl_TextEncoding _eEncoding ) SAL_THROW((::com::sun::star::sdbc::SQLException)); @@ -198,8 +198,8 @@ namespace dbtools the length of the converted string */ static sal_Int32 convertUnicodeStringToLength( - const ::rtl::OUString& _rSource, - ::rtl::OString& _rDest, + const OUString& _rSource, + OString& _rDest, sal_Int32 _nMaxLen, rtl_TextEncoding _eEncoding ) diff --git a/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx index 90a5e5eb7a9e..a84450b607d8 100644 --- a/connectivity/inc/connectivity/dbexception.hxx +++ b/connectivity/inc/connectivity/dbexception.hxx @@ -81,7 +81,7 @@ public: In those cases, you can use this constructor, which behaves as if you would have used an SQLException containing exactly the given error message. */ - SQLExceptionInfo( const ::rtl::OUString& _rSimpleErrorMessage ); + SQLExceptionInfo( const OUString& _rSimpleErrorMessage ); SQLExceptionInfo(const SQLExceptionInfo& _rCopySource); @@ -97,7 +97,7 @@ public: @param _nErrorCode the ErrorCode of the to-be-constructed SQLException */ - void prepend( const ::rtl::OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 ); + void prepend( const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 ); /** appends a plain message to the chain of exceptions @param _eType @@ -110,7 +110,7 @@ public: @param _nErrorCode the error code of the exception to append */ - void append( TYPE _eType, const ::rtl::OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 ); + void append( TYPE _eType, const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 ); /** throws (properly typed) the exception contained in the object @precond @@ -221,7 +221,7 @@ public: @raises RuntimeException in case of an internal error */ -OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getStandardSQLState( StandardSQLState _eState ); +OOO_DLLPUBLIC_DBTOOLS OUString getStandardSQLState( StandardSQLState _eState ); //---------------------------------------------------------------------------------- /** returns a standard ASCII string for a given SQLState @@ -237,7 +237,7 @@ OOO_DLLPUBLIC_DBTOOLS const sal_Char* getStandardSQLStateAscii( StandardSQLState //---------------------------------------------------------------------------------- OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedException( - const ::rtl::OUString& _rMsg, + const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context, const ::com::sun::star::uno::Any& _Next = ::com::sun::star::uno::Any() ) @@ -275,7 +275,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwInvalidIndexException( /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException */ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( - const ::rtl::OUString& _rMsg, + const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource ) throw (::com::sun::star::sdbc::SQLException); @@ -284,7 +284,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException */ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( - const ::rtl::OUString& _rMsg, + const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource, const ::com::sun::star::uno::Any& _rNextException ) @@ -335,7 +335,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( /** throws an SQLException */ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( - const ::rtl::OUString& _rMessage, + const OUString& _rMessage, StandardSQLState _eSQLState, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const sal_Int32 _nErrorCode = 0, diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx index cc4cd02e5216..565854ba7ed8 100644 --- a/connectivity/inc/connectivity/dbmetadata.hxx +++ b/connectivity/inc/connectivity/dbmetadata.hxx @@ -95,10 +95,10 @@ namespace dbtools } /// wraps XDatabaseMetaData::getIdentifierQuoteString - const ::rtl::OUString& getIdentifierQuoteString() const; + const OUString& getIdentifierQuoteString() const; /// wraps XDatabaseMetaData::getCatalogSeparator - const ::rtl::OUString& getCatalogSeparator() const; + const OUString& getCatalogSeparator() const; /** determines whether the database supports sub queries in the FROM part of a SELECT clause are supported. diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index 78734d8abe27..823efaa52db4 100644 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.hxx @@ -192,9 +192,9 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) throw (::com::sun::star::uno::RuntimeException); OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, - const ::rtl::OUString& _rPwd, + const OUString& _rDataSourceName, + const OUString& _rUser, + const OUString& _rPwd, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext) SAL_THROW ( (::com::sun::star::sdbc::SQLException) ); @@ -211,7 +211,7 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getTableFields( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, - const ::rtl::OUString& _rName + const OUString& _rName ); /** returns the primary key columns of the table @@ -267,7 +267,7 @@ namespace dbtools getFieldsByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ); @@ -300,11 +300,11 @@ namespace dbtools @return an array of strings containing the names of the columns (aka fields) of the object */ - OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Sequence< ::rtl::OUString > + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Sequence< OUString > getFieldNamesByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ); @@ -312,13 +312,13 @@ namespace dbtools /** create a new ::com::sun::star::sdbc::SQLContext, fill it with the given descriptions and the given source, and append _rException (i.e. put it into the NextException member of the SQLContext). */ - OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdb::SQLContext prependContextInfo(const ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::rtl::OUString& _rContextDescription, const ::rtl::OUString& _rContextDetails ); + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdb::SQLContext prependContextInfo(const ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const OUString& _rContextDescription, const OUString& _rContextDetails ); OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdbc::SQLException prependErrorInfo( const ::com::sun::star::sdbc::SQLException& _rChainedException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::rtl::OUString& _rAdditionalError, + const OUString& _rAdditionalError, const StandardSQLState _eSQLState = SQL_ERROR_UNSPECIFIED, const sal_Int32 _nErrorCode = 0); @@ -345,7 +345,7 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS sal_Bool isDataSourcePropertyEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xProp - ,const ::rtl::OUString& _sProperty, + ,const OUString& _sProperty, sal_Bool _bDefault = sal_False); /** retrieves a particular indirect data source setting @@ -371,21 +371,21 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS bool getDataSourceSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDataSource, - const ::rtl::OUString& _sSettingsName, + const OUString& _sSettingsName, ::com::sun::star::uno::Any& /* [out] */ _rSettingsValue ); - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); + OOO_DLLPUBLIC_DBTOOLS OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); /** quote the given name with the given quote string. */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName); + OOO_DLLPUBLIC_DBTOOLS OUString quoteName(const OUString& _rQuote, const OUString& _rName); /** quote the given table name (which may contain a catalog and a schema) according to the rules provided by the meta data */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString quoteTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta - , const ::rtl::OUString& _rName + OUString quoteTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta + , const OUString& _rName ,EComposeRule _eComposeRule); /** split a fully qualified table name (including catalog and schema, if appliable) into it's component parts. @@ -397,7 +397,7 @@ namespace dbtools @param _eComposeRule where do you need the name for */ OOO_DLLPUBLIC_DBTOOLS void qualifiedNameComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConnMetaData, - const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule); + const OUString& _rQualifiedName, OUString& _rCatalog, OUString& _rSchema, OUString& _rName,EComposeRule _eComposeRule); /** calculate a NumberFormatsSupplier for use with an given connection @param _rxConn the connection for which the formatter is requested @@ -453,10 +453,10 @@ namespace dbtools //---------------------------------------------------------------------------------- /** compose a complete table name from it's up to three parts, regarding to the database meta data composing rules */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData, - const ::rtl::OUString& _rCatalog, - const ::rtl::OUString& _rSchema, - const ::rtl::OUString& _rName, + OOO_DLLPUBLIC_DBTOOLS OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData, + const OUString& _rCatalog, + const OUString& _rSchema, + const OUString& _rName, sal_Bool _bQuote, EComposeRule _eComposeRule); @@ -466,11 +466,11 @@ namespace dbtools the settings "UseCatalogInSelect" and "UseSchemaInSelect", which might be present in the data source which the connection belongs to. */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableNameForSelect( + OOO_DLLPUBLIC_DBTOOLS OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString& _rCatalog, - const ::rtl::OUString& _rSchema, - const ::rtl::OUString& _rName ); + const OUString& _rCatalog, + const OUString& _rSchema, + const OUString& _rName ); /** composes a table name for usage in a SELECT statement @@ -478,7 +478,7 @@ namespace dbtools the settings "UseCatalogInSelect" and "UseSchemaInSelect", which might be present in the data source which the connection belongs to. */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableNameForSelect( + OOO_DLLPUBLIC_DBTOOLS OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ); //---------------------------------------------------------------------------------- @@ -488,7 +488,7 @@ namespace dbtools @param _xTable The table. */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName( + OOO_DLLPUBLIC_DBTOOLS OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable, EComposeRule _eComposeRule, @@ -500,7 +500,7 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS sal_Int32 getSearchColumnFlag( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, sal_Int32 _nDataType); // return the datasource for the given datasource name - OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> getDataSource(const ::rtl::OUString& _rsDataSourceName, + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> getDataSource(const OUString& _rsDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); /** search for a name that is NOT in the NameAcces @@ -514,15 +514,15 @@ namespace dbtools A name which doesn't exist in the collection. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxContainer, - const ::rtl::OUString& _rBaseName, + OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxContainer, + const OUString& _rBaseName, sal_Bool _bStartWithNumber = sal_True); /** creates a unique name which is not already used in the given name array */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString createUniqueName( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rNames, - const ::rtl::OUString& _rBaseName, + OOO_DLLPUBLIC_DBTOOLS OUString createUniqueName( + const ::com::sun::star::uno::Sequence< OUString >& _rNames, + const OUString& _rBaseName, sal_Bool _bStartWithNumber = sal_True ); @@ -532,7 +532,7 @@ namespace dbtools @see isValidSQLName */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString convertName2SQLName(const ::rtl::OUString& _rName,const ::rtl::OUString& _rSpecials); + OOO_DLLPUBLIC_DBTOOLS OUString convertName2SQLName(const OUString& _rName,const OUString& _rSpecials); /** checks whether the given name is a valid SQL name @@ -541,7 +541,7 @@ namespace dbtools @see convertName2SQLName */ - OOO_DLLPUBLIC_DBTOOLS sal_Bool isValidSQLName( const ::rtl::OUString& _rName, const ::rtl::OUString& _rSpecials ); + OOO_DLLPUBLIC_DBTOOLS sal_Bool isValidSQLName( const OUString& _rName, const OUString& _rSpecials ); OOO_DLLPUBLIC_DBTOOLS void showError( const SQLExceptionInfo& _rInfo, @@ -634,10 +634,10 @@ namespace dbtools The scale will also be added when the value is 0. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createStandardCreateStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, + OUString createStandardCreateStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, ISQLStatementHelper* _pHelper, - const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); + const OUString& _sCreatePattern = OUString()); /** creates the standard sql statement for the key part of a create table statement. @param descriptor @@ -646,7 +646,7 @@ namespace dbtools The connection. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createStandardKeyStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, + OUString createStandardKeyStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** creates the standard sql statement for the column part of a create table statement. @@ -660,10 +660,10 @@ namespace dbtools Allow to add special SQL constructs. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createStandardColumnPart( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor + OUString createStandardColumnPart( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ,ISQLStatementHelper* _pHelper = NULL - ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); + ,const OUString& _sCreatePattern = OUString()); /** creates a SQL CREATE TABLE statement @@ -679,10 +679,10 @@ namespace dbtools The CREATE TABLE statement. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createSqlCreateTableStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor + OUString createSqlCreateTableStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ,ISQLStatementHelper* _pHelper = NULL - ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); + ,const OUString& _sCreatePattern = OUString()); /** creates a SDBC column with the help of getColumns. @param _xTable @@ -704,7 +704,7 @@ namespace dbtools ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createSDBCXColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Bool _bCase, sal_Bool _bQueryForInfo = sal_True, sal_Bool _bIsAutoIncrement = sal_False, @@ -722,7 +722,7 @@ namespace dbtools The datadefintion object. */ OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> getDataDefinitionByURLAndConnection( - const ::rtl::OUString& _rsUrl, + const OUString& _rsUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); @@ -738,13 +738,13 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS sal_Int32 getTablePrivileges(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, - const ::rtl::OUString& _sCatalog, - const ::rtl::OUString& _sSchema, - const ::rtl::OUString& _sTable); + const OUString& _sCatalog, + const OUString& _sSchema, + const OUString& _sTable); typedef ::std::pair TBoolPair; typedef ::std::pair< TBoolPair,sal_Int32 > ColumnInformation; - typedef ::std::multimap< ::rtl::OUString, ColumnInformation, ::comphelper::UStringMixLess> ColumnInformationMap; + typedef ::std::multimap< OUString, ColumnInformation, ::comphelper::UStringMixLess> ColumnInformationMap; /** collects the information about auto increment, currency and data type for the given column name. The column must be quoted, * is also valid. @param _xConnection @@ -758,8 +758,8 @@ namespace dbtools */ OOO_DLLPUBLIC_DBTOOLS void collectColumnInformation( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _sComposedTableName, - const ::rtl::OUString& _rName, + const OUString& _sComposedTableName, + const OUString& _rName, ColumnInformationMap& _rInfo); @@ -776,10 +776,10 @@ namespace dbtools the buffer to which the comparison predicate will be appended */ OOO_DLLPUBLIC_DBTOOLS void getBoleanComparisonPredicate( - const ::rtl::OUString& _rExpression, + const OUString& _rExpression, const sal_Bool _bValue, const sal_Int32 _nBooleanComparisonMode, - ::rtl::OUStringBuffer& _out_rSQLPredicate + OUStringBuffer& _out_rSQLPredicate ); //......................................................................... diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx index f52d6d6727e1..c489a91e5033 100644 --- a/connectivity/inc/connectivity/filtermanager.hxx +++ b/connectivity/inc/connectivity/filtermanager.hxx @@ -74,7 +74,7 @@ namespace dbtools m_xORB; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponentAggregate; - ::std::vector< ::rtl::OUString > m_aFilterComponents; + ::std::vector< OUString > m_aFilterComponents; sal_Bool m_bApplyPublicFilter; public: @@ -89,8 +89,8 @@ namespace dbtools /// makes the object forgetting the references to the database component void dispose( ); - const ::rtl::OUString& getFilterComponent( FilterComponent _eWhich ) const; - void setFilterComponent( FilterComponent _eWhich, const ::rtl::OUString& _rComponent ); + const OUString& getFilterComponent( FilterComponent _eWhich ) const; + void setFilterComponent( FilterComponent _eWhich, const OUString& _rComponent ); inline sal_Bool isApplyPublicFilter( ) const { return m_bApplyPublicFilter; } void setApplyPublicFilter( sal_Bool _bApply ); @@ -98,14 +98,14 @@ namespace dbtools private: /** retrieves a filter which is a conjunction of all single filter components */ - ::rtl::OUString getComposedFilter( ) const; + OUString getComposedFilter( ) const; /** appends one filter component to the statement in our composer */ - void appendFilterComponent( ::rtl::OUStringBuffer& io_appendTo, const ::rtl::OUString& i_component ) const; + void appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ) const; /// checks whether there is only one (or even no) non-empty filter component - bool isThereAtMostOneComponent( ::rtl::OUStringBuffer& o_singleComponent ) const; + bool isThereAtMostOneComponent( OUStringBuffer& o_singleComponent ) const; /// returns the index of the first filter component which should be considered when building the composed filter inline sal_Int32 getFirstApplicableFilterIndex() const diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx index 11d121fa56a2..fe5c4dbfff52 100644 --- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx +++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx @@ -94,8 +94,8 @@ namespace dbtools virtual const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate >& getColumnUpdate() const; - virtual bool setFormattedValue( const ::rtl::OUString& _rFormattedStringValue ) const; - virtual ::rtl::OUString getFormattedValue() const; + virtual bool setFormattedValue( const OUString& _rFormattedStringValue ) const; + virtual OUString getFormattedValue() const; private: ::std::auto_ptr< FormattedColumnValue_Data > m_pData; diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx index 648f8df361e0..6e99b9392053 100644 --- a/connectivity/inc/connectivity/parameters.hxx +++ b/connectivity/inc/connectivity/parameters.hxx @@ -95,7 +95,7 @@ namespace dbtools } }; - typedef ::std::map< ::rtl::OUString, ParameterMetaData > ParameterInformation; + typedef ::std::map< OUString, ParameterMetaData > ParameterInformation; private: ::osl::Mutex& m_rMutex; @@ -122,11 +122,11 @@ namespace dbtools ParameterInformation m_aParameterInformation; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; + ::com::sun::star::uno::Sequence< OUString > m_aMasterFields; + ::com::sun::star::uno::Sequence< OUString > m_aDetailFields; - ::rtl::OUString m_sIdentifierQuoteString; - ::rtl::OUString m_sSpecialCharacters; + OUString m_sIdentifierQuoteString; + OUString m_sSpecialCharacters; ::std::vector< bool > m_aParametersVisited; @@ -220,7 +220,7 @@ namespace dbtools // XParameters equivalents void setNull ( sal_Int32 _nIndex, sal_Int32 sqlType); - void setObjectNull ( sal_Int32 _nIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName); + void setObjectNull ( sal_Int32 _nIndex, sal_Int32 sqlType, const OUString& typeName); void setBoolean ( sal_Int32 _nIndex, sal_Bool x); void setByte ( sal_Int32 _nIndex, sal_Int8 x); void setShort ( sal_Int32 _nIndex, sal_Int16 x); @@ -228,7 +228,7 @@ namespace dbtools void setLong ( sal_Int32 _nIndex, sal_Int64 x); void setFloat ( sal_Int32 _nIndex, float x); void setDouble ( sal_Int32 _nIndex, double x); - void setString ( sal_Int32 _nIndex, const ::rtl::OUString& x); + void setString ( sal_Int32 _nIndex, const OUString& x); void setBytes ( sal_Int32 _nIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x); void setDate ( sal_Int32 _nIndex, const ::com::sun::star::util::Date& x); void setTime ( sal_Int32 _nIndex, const ::com::sun::star::util::Time& x); @@ -249,11 +249,11 @@ namespace dbtools /** creates a filter expression from a master-detail link where the detail denotes a column name */ - ::rtl::OUString + OUString createFilterConditionFromColumnLink( - const ::rtl::OUString& /* [in] */ _rMasterColumn, - const ::rtl::OUString& /* [in] */ _rDetailColumn, - ::rtl::OUString& /* [out] */ _rNewParamName + const OUString& /* [in] */ _rMasterColumn, + const OUString& /* [in] */ _rDetailColumn, + OUString& /* [out] */ _rNewParamName ); /** initializes our query composer, and the collection of inner parameter columns @@ -315,7 +315,7 @@ namespace dbtools void classifyLinks( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxParentColumns, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns, - ::std::vector< ::rtl::OUString >& _out_rAdditionalFilterComponents + ::std::vector< OUString >& _out_rAdditionalFilterComponents ) SAL_THROW(( ::com::sun::star::uno::Exception )); /** finalizes our m_pOuterParameters so that it can be used for diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx index f2f6354708f7..69347e9c4e6d 100644 --- a/connectivity/inc/connectivity/paramwrapper.hxx +++ b/connectivity/inc/connectivity/paramwrapper.hxx @@ -111,7 +111,7 @@ namespace param using ::cppu::OPropertySetHelper::getFastPropertyValue; private: - ::rtl::OUString impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const; + OUString impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const; private: ParameterWrapper(); // not implemented diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx index 776e357261b2..629419c9719d 100644 --- a/connectivity/inc/connectivity/predicateinput.hxx +++ b/connectivity/inc/connectivity/predicateinput.hxx @@ -69,9 +69,9 @@ namespace dbtools points to. */ sal_Bool normalizePredicateString( - ::rtl::OUString& _rPredicateValue, + OUString& _rPredicateValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, - ::rtl::OUString* _pErrorMessage = NULL + OUString* _pErrorMessage = NULL ) const; /** get's a value of the predicate which can be used in a WHERE clause. @@ -87,23 +87,23 @@ namespace dbtools points to. @see normalizePredicateString */ - ::rtl::OUString getPredicateValue( - const ::rtl::OUString& _rPredicateValue, + OUString getPredicateValue( + const OUString& _rPredicateValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField, sal_Bool _bForStatementUse, - ::rtl::OUString* _pErrorMessage = NULL + OUString* _pErrorMessage = NULL ) const; - ::rtl::OUString getPredicateValue( - const ::rtl::OUString& _sField - , const ::rtl::OUString& _rPredicateValue + OUString getPredicateValue( + const OUString& _sField + , const OUString& _rPredicateValue , sal_Bool _bForStatementUse - , ::rtl::OUString* _pErrorMessage = NULL) const; + , OUString* _pErrorMessage = NULL) const; private: ::connectivity::OSQLParseNode* implPredicateTree( - ::rtl::OUString& _rErrorMessage, - const ::rtl::OUString& _rStatement, + OUString& _rErrorMessage, + const OUString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField ) const; @@ -113,7 +113,7 @@ namespace dbtools sal_Unicode& _rThdSep ) const; - ::rtl::OUString implParseNode(::connectivity::OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const; + OUString implParseNode(::connectivity::OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const; }; //......................................................................... diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx index 7004554cc08a..14840400b385 100644 --- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx @@ -77,7 +77,7 @@ namespace connectivity @param _xRow The current row from the resultset given to fillNames. */ - virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); + virtual OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); /** fills a vector with the necessary names which can be used in combination with the collections. For each row buildName will be called. diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx index 77424f74a3d1..e30075f009e9 100644 --- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx @@ -66,23 +66,23 @@ namespace connectivity public: virtual ~IObjectCollection(); virtual void reserve(size_t nLength) = 0; - virtual bool exists(const ::rtl::OUString& _sName ) = 0; + virtual bool exists(const OUString& _sName ) = 0; virtual bool empty() = 0; virtual void swapAll() = 0; virtual void swap() = 0; virtual void clear() = 0; virtual void reFill(const TStringVector &_rVector) = 0; - virtual void insert(const ::rtl::OUString& _sName,const ObjectType& _xObject) = 0; - virtual bool rename(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName) = 0; + virtual void insert(const OUString& _sName,const ObjectType& _xObject) = 0; + virtual bool rename(const OUString _sOldName,const OUString _sNewName) = 0; virtual sal_Int32 size() = 0; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getElementNames() = 0; - virtual ::rtl::OUString getName(sal_Int32 _nIndex) = 0; + virtual ::com::sun::star::uno::Sequence< OUString > getElementNames() = 0; + virtual OUString getName(sal_Int32 _nIndex) = 0; virtual void disposeAndErase(sal_Int32 _nIndex) = 0; virtual void disposeElements() = 0; - virtual sal_Int32 findColumn( const ::rtl::OUString& columnName ) = 0; - virtual ::rtl::OUString findColumnAtIndex( sal_Int32 _nIndex) = 0; + virtual sal_Int32 findColumn( const OUString& columnName ) = 0; + virtual OUString findColumnAtIndex( sal_Int32 _nIndex) = 0; virtual ObjectType getObject(sal_Int32 _nIndex) = 0; - virtual ObjectType getObject(const ::rtl::OUString& columnName) = 0; + virtual ObjectType getObject(const OUString& columnName) = 0; virtual void setObject(sal_Int32 _nIndex,const ObjectType& _xObject) = 0; virtual sal_Bool isCaseSensitive() const = 0; }; @@ -107,7 +107,7 @@ namespace connectivity virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) = 0; // will be called when a object was requested by one of the accessing methods like getByIndex - virtual ObjectType createObject(const ::rtl::OUString& _rName) = 0; + virtual ObjectType createObject(const OUString& _rName) = 0; // will be called when a new object should be generated by a call of createDataDescriptor // the returned object is empty will be filled outside and added to the collection @@ -124,16 +124,16 @@ namespace connectivity the new object which is to be inserted into the collection. This might be the result of a call of createObject( _rForName ), or a clone of the descriptor. */ - virtual ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); // called when XDrop was called - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); /** returns the name for the object. The default implementation ask for the property NAME. If this doesn't satisfy, it has to be overloaded. @param _xObject The object where the name should be extracted. @return The name of the object. */ - virtual ::rtl::OUString getNameForObject(const ObjectType& _xObject); + virtual OUString getNameForObject(const ObjectType& _xObject); /** clones the given descriptor @@ -160,11 +160,11 @@ namespace connectivity /** insert a new element into the collection */ - void insertElement(const ::rtl::OUString& _sElementName,const ObjectType& _xElement); + void insertElement(const OUString& _sElementName,const ObjectType& _xElement); /** return the name of element at index _nIndex */ - inline ::rtl::OUString getElementName(sal_Int32 _nIndex) + inline OUString getElementName(sal_Int32 _nIndex) { return m_pElements->findColumnAtIndex(_nIndex); } @@ -183,7 +183,7 @@ namespace connectivity void reFill(const TStringVector &_rVector); inline sal_Bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); } - void renameObject(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName); + void renameObject(const OUString _sOldName,const OUString _sNewName); // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); @@ -203,9 +203,9 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XRefreshable @@ -217,15 +217,15 @@ namespace connectivity // XAppend virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // XDrop - virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dropByName( const OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); private: - void notifyElementRemoved(const ::rtl::OUString& _sName); + void notifyElementRemoved(const OUString& _sName); void disposeElements(); void dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop = sal_True); }; diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx index ca7a0bcc0b1c..42cddc51c041 100644 --- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx @@ -50,9 +50,9 @@ namespace connectivity public ODescriptor { protected: - ::rtl::OUString m_TypeName; - ::rtl::OUString m_Description; - ::rtl::OUString m_DefaultValue; + OUString m_TypeName; + OUString m_Description; + OUString m_DefaultValue; sal_Int32 m_IsNullable; sal_Int32 m_Precision; @@ -63,9 +63,9 @@ namespace connectivity sal_Bool m_IsRowVersion; sal_Bool m_IsCurrency; - ::rtl::OUString m_CatalogName; - ::rtl::OUString m_SchemaName; - ::rtl::OUString m_TableName; + OUString m_CatalogName; + OUString m_SchemaName; + OUString m_TableName; using OColumnDescriptor_BASE::rBHelper; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; @@ -77,10 +77,10 @@ namespace connectivity virtual void SAL_CALL release() throw(); OColumn( sal_Bool _bCase); - OColumn( const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, - const ::rtl::OUString& _Description, + OColumn( const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, + const OUString& _Description, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -89,9 +89,9 @@ namespace connectivity sal_Bool _IsRowVersion, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName); + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName); DECLARE_SERVICE_INFO(); //XInterface @@ -105,8 +105,8 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx index 12f0e4b0cfbd..aa04b5229ac9 100644 --- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx +++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx @@ -41,7 +41,7 @@ namespace connectivity ,public ::com::sun::star::lang::XUnoTunnel { protected: - ::rtl::OUString m_Name; + OUString m_Name; /** helper for derived classes to implement OPropertyArrayUsageHelper::createArrayHelper @@ -74,7 +74,7 @@ namespace connectivity virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // compare - inline sal_Bool operator == ( const ::rtl::OUString & _rRH ) + inline sal_Bool operator == ( const OUString & _rRH ) { return m_aCase(m_Name,_rRH); } diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx index 139c6240797d..6e4ba2355d62 100644 --- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx +++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx @@ -65,7 +65,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: OGroup(sal_Bool _bCase); - OGroup( const ::rtl::OUString& _Name,sal_Bool _bCase); + OGroup( const OUString& _Name,sal_Bool _bCase); virtual ~OGroup(); DECLARE_SERVICE_INFO(); @@ -85,14 +85,14 @@ namespace connectivity // XUsersSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException); // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx index 6fddc6c374ba..3e50ddf9459c 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx @@ -52,7 +52,7 @@ namespace connectivity public OIndex_BASE { protected: - ::rtl::OUString m_Catalog; + OUString m_Catalog; sal_Bool m_IsUnique; sal_Bool m_IsPrimaryKeyIndex; sal_Bool m_IsClustered; @@ -66,8 +66,8 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: OIndex(sal_Bool _bCase); - OIndex( const ::rtl::OUString& _Name, - const ::rtl::OUString& _Catalog, + OIndex( const OUString& _Name, + const OUString& _Catalog, sal_Bool _isUnique, sal_Bool _isPrimaryKeyIndex, sal_Bool _isClustered, @@ -93,8 +93,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx index bdccd128f172..a4de9e6bf5bd 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx @@ -40,9 +40,9 @@ namespace connectivity public: OIndexColumn( sal_Bool _bCase); OIndexColumn( sal_Bool _IsAscending, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, + const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -51,9 +51,9 @@ namespace connectivity sal_Bool _IsRowVersion, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName); + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName); virtual void construct(); DECLARE_SERVICE_INFO(); diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx index eb95420e35f0..24d85dfb2614 100644 --- a/connectivity/inc/connectivity/sdbcx/VKey.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx @@ -40,12 +40,12 @@ namespace connectivity struct OOO_DLLPUBLIC_DBTOOLS KeyProperties { - ::std::vector< ::rtl::OUString> m_aKeyColumnNames; - ::rtl::OUString m_ReferencedTable; + ::std::vector< OUString> m_aKeyColumnNames; + OUString m_ReferencedTable; sal_Int32 m_Type; sal_Int32 m_UpdateRule; sal_Int32 m_DeleteRule; - KeyProperties(const ::rtl::OUString& _ReferencedTable, + KeyProperties(const OUString& _ReferencedTable, sal_Int32 _Type, sal_Int32 _UpdateRule, sal_Int32 _DeleteRule) @@ -79,9 +79,9 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: OKey(sal_Bool _bCase); - OKey(const ::rtl::OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase); - /*OKey( const ::rtl::OUString& _Name, - const ::rtl::OUString& _ReferencedTable, + OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase); + /*OKey( const OUString& _Name, + const OUString& _ReferencedTable, sal_Int32 _Type, sal_Int32 _UpdateRule, sal_Int32 _DeleteRule, @@ -107,8 +107,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx index b3624bd69a3a..b22ea3247941 100644 --- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx @@ -34,15 +34,15 @@ namespace connectivity public OColumn, public OKeyColumn_PROP { protected: - ::rtl::OUString m_ReferencedColumn; + OUString m_ReferencedColumn; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: OKeyColumn(sal_Bool _bCase); - OKeyColumn( const ::rtl::OUString& _ReferencedColumn, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, + OKeyColumn( const OUString& _ReferencedColumn, + const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -51,9 +51,9 @@ namespace connectivity sal_Bool _IsRowVersion, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName); + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName); // just to make it not inline virtual ~OKeyColumn(); diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx index 47d589578e68..0be41a9cd22f 100644 --- a/connectivity/inc/connectivity/sdbcx/VTable.hxx +++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx @@ -67,10 +67,10 @@ namespace connectivity public ODescriptor { protected: - ::rtl::OUString m_CatalogName; - ::rtl::OUString m_SchemaName; - ::rtl::OUString m_Description; - ::rtl::OUString m_Type; + OUString m_CatalogName; + OUString m_SchemaName; + OUString m_Description; + OUString m_Type; OCollection* m_pKeys; OCollection* m_pColumns; @@ -88,11 +88,11 @@ namespace connectivity sal_Bool _bCase); OTable( OCollection* _pTables, sal_Bool _bCase, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString()); + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString()); virtual ~OTable(); @@ -118,16 +118,16 @@ namespace connectivity // XKeysSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getKeys( ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( void ) throw(::com::sun::star::uno::RuntimeException); // XIndexesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getIndexes( ) throw(::com::sun::star::uno::RuntimeException); // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // XAlterTable - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // helper method diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx index d953d6a2b714..01bafc0d177c 100644 --- a/connectivity/inc/connectivity/sdbcx/VUser.hxx +++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx @@ -62,7 +62,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: OUser(sal_Bool _bCase); - OUser(const ::rtl::OUString& _Name,sal_Bool _bCase); + OUser(const OUString& _Name,sal_Bool _bCase); virtual ~OUser( ); @@ -79,18 +79,18 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XUser - virtual void SAL_CALL changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XGroupsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups( ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx index 1772ac3acf1b..6134ddc4bb69 100644 --- a/connectivity/inc/connectivity/sdbcx/VView.hxx +++ b/connectivity/inc/connectivity/sdbcx/VView.hxx @@ -50,9 +50,9 @@ namespace connectivity public ODescriptor { protected: - ::rtl::OUString m_CatalogName; - ::rtl::OUString m_SchemaName; - ::rtl::OUString m_Command; + OUString m_CatalogName; + OUString m_SchemaName; + OUString m_Command; sal_Int32 m_CheckOption; // need for the getName method ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; @@ -67,12 +67,12 @@ namespace connectivity OView(sal_Bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData); OView( sal_Bool _bCase, - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData, sal_Int32 _nCheckOption = 0, - const ::rtl::OUString& _rCommand = ::rtl::OUString(), - const ::rtl::OUString& _rSchemaName = ::rtl::OUString(), - const ::rtl::OUString& _rCatalogName = ::rtl::OUString()); + const OUString& _rCommand = OUString(), + const OUString& _rSchemaName = OUString(), + const OUString& _rCatalogName = OUString()); virtual ~OView(); // ODescriptor @@ -90,8 +90,8 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& ) throw(::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx index fae9b2a05870..ccad18a88d0f 100644 --- a/connectivity/inc/connectivity/sqlerror.hxx +++ b/connectivity/inc/connectivity/sqlerror.hxx @@ -67,13 +67,13 @@ namespace connectivity // -------------------------------------------------------------------- /** convenience wrapper around boost::optional, allowing implicit construction */ - class ParamValue : public ::boost::optional< ::rtl::OUString > + class ParamValue : public ::boost::optional< OUString > { - typedef ::boost::optional< ::rtl::OUString > base_type; + typedef ::boost::optional< OUString > base_type; public: ParamValue( ) : base_type( ) { } - ParamValue( ::rtl::OUString const& val ) : base_type( val ) { } + ParamValue( OUString const& val ) : base_type( val ) { } ParamValue( ParamValue const& rhs ) : base_type( (base_type const&)rhs ) { } bool is() const { return !base_type::operator!(); } @@ -118,7 +118,7 @@ namespace connectivity @see ::com::sun::star::sdb::ErrorCondition */ - ::rtl::OUString getErrorMessage( + OUString getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1 = ParamValue(), const ParamValue& _rParamValue2 = ParamValue(), @@ -143,7 +143,7 @@ namespace connectivity prefix before presenting the message to the user, or use it to determine whether a concrete error has been raised by a OpenOffice.org core component. */ - static const ::rtl::OUString& + static const OUString& getMessagePrefix(); diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx index 261607030685..ee967dd7d7a3 100644 --- a/connectivity/inc/connectivity/sqliterator.hxx +++ b/connectivity/inc/connectivity/sqliterator.hxx @@ -69,21 +69,21 @@ namespace connectivity ::std::auto_ptr< OSQLParseTreeIteratorImpl > m_pImpl; - void traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const ::rtl::OUString& _aColumnName, ::rtl::OUString& _aTableRange, const ::rtl::OUString& _rColumnAlias); + void traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const OUString& _aColumnName, OUString& _aTableRange, const OUString& _rColumnAlias); // inserts a table into the map - void traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const ::rtl::OUString & rTableRange ); + void traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const OUString & rTableRange ); void traverseSearchCondition(OSQLParseNode * pSearchCondition); void traverseOnePredicate( OSQLParseNode * pColumnRef, - ::rtl::OUString& aValue, + OUString& aValue, OSQLParseNode * pParameter); void traverseByColumnNames(const OSQLParseNode* pSelectNode,sal_Bool _bOrder); void traverseParameters(const OSQLParseNode* pSelectNode); - const OSQLParseNode* getTableNode( OSQLTables& _rTables, const OSQLParseNode* pTableRef, ::rtl::OUString& aTableRange ); - void getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, ::rtl::OUString& aTableRange ); + const OSQLParseNode* getTableNode( OSQLTables& _rTables, const OSQLParseNode* pTableRef, OUString& aTableRange ); + void getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, OUString& aTableRange ); void getSelect_statement(OSQLTables& _rTables,const OSQLParseNode* pSelect); - ::rtl::OUString getUniqueColumnName(const ::rtl::OUString & rColumnName) const; + OUString getUniqueColumnName(const OUString & rColumnName) const; /** finds the column with a given name, belonging to a given table, in a given tables collection @param _rTables @@ -96,7 +96,7 @@ namespace connectivity the desired column object, or if no such column could be found */ static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findColumn( - const OSQLTables& _rTables, const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange ); + const OSQLTables& _rTables, const OUString & rColumnName, OUString & rTableRange ); /** finds a column with a given name, belonging to a given table @param rColumnName @@ -109,11 +109,11 @@ namespace connectivity @return */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findColumn( - const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange, bool _bLookInSubTables ); + const OUString & rColumnName, OUString & rTableRange, bool _bLookInSubTables ); protected: - void setSelectColumnName(::rtl::Reference& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False); - void appendColumns(::rtl::Reference& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable); + void setSelectColumnName(::rtl::Reference& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False); + void appendColumns(::rtl::Reference& _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable); // Other member variables that should be available in the "set" functions // can be defined in the derived class. They can be initialized // in its constructor and, after the "traverse" routines have been used, @@ -219,8 +219,8 @@ namespace connectivity The table range to be set. */ void getColumnRange( const OSQLParseNode* _pColumnRef, - ::rtl::OUString &_rColumnName, - ::rtl::OUString& _rTableRange) const; + OUString &_rColumnName, + OUString& _rTableRange) const; /** retrieves a column's name, table range, and alias @@ -235,9 +235,9 @@ namespace connectivity this alias is returned here. */ void getColumnRange( const OSQLParseNode* _pColumnRef, - ::rtl::OUString& _out_rColumnName, - ::rtl::OUString& _out_rTableRange, - ::rtl::OUString& _out_rColumnAliasIfPresent + OUString& _out_rColumnName, + OUString& _out_rTableRange, + OUString& _out_rColumnAliasIfPresent ) const; /** return the alias name of a column @@ -246,7 +246,7 @@ namespace connectivity @return The alias name of the column or an empty string. */ - static ::rtl::OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn); + static OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn); /** return the columname and the table range @param _pColumnRef @@ -260,11 +260,11 @@ namespace connectivity */ static void getColumnRange( const OSQLParseNode* _pColumnRef, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - ::rtl::OUString &_rColumnName, - ::rtl::OUString& _rTableRange); + OUString &_rColumnName, + OUString& _rTableRange); // empty if ambiguous - sal_Bool getColumnTableRange(const OSQLParseNode* pNode, ::rtl::OUString &rTableRange) const; + sal_Bool getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const; // return true when the tableNode is a rule like catalog_name, schema_name or table_name sal_Bool isTableNode(const OSQLParseNode* _pTableNode) const; @@ -303,12 +303,12 @@ namespace connectivity only used when we're iterating through a CREATE TABLE statement */ OSQLTable impl_createTableObject( - const ::rtl::OUString& rTableName, const ::rtl::OUString& rCatalogName, const ::rtl::OUString& rSchemaName ); + const OUString& rTableName, const OUString& rCatalogName, const OUString& rSchemaName ); /** locates a record source (a table or query) with the given name */ OSQLTable impl_locateRecordSource( - const ::rtl::OUString& _rComposedName + const OUString& _rComposedName ); /** implementation for both traverseAll and traverseSome @@ -319,8 +319,8 @@ namespace connectivity */ void impl_getQueryParameterColumns( const OSQLTable& _rQuery ); - void setOrderByColumnName(const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange, sal_Bool bAscending); - void setGroupByColumnName(const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange); + void setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, sal_Bool bAscending); + void setGroupByColumnName(const OUString & rColumnName, OUString & rTableRange); private: /** appends an SQLException corresponding to the given error code to our error collection @@ -335,7 +335,7 @@ namespace connectivity in the error message will be replaced with _rReplaceToken2 */ void impl_appendError( IParseContext::ErrorCode _eError, - const ::rtl::OUString* _pReplaceToken1 = NULL, const ::rtl::OUString* _pReplaceToken2 = NULL ); + const OUString* _pReplaceToken1 = NULL, const OUString* _pReplaceToken2 = NULL ); /** appends an SQLException corresponding to the given error code to our error collection */ diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx index a74c8abe84e7..45a46997d194 100644 --- a/connectivity/inc/connectivity/sqlnode.hxx +++ b/connectivity/inc/connectivity/sqlnode.hxx @@ -74,7 +74,7 @@ namespace connectivity SQL_NODE_EQUAL,SQL_NODE_LESS,SQL_NODE_GREAT,SQL_NODE_LESSEQ,SQL_NODE_GREATEQ,SQL_NODE_NOTEQUAL, SQL_NODE_PUNCTUATION, SQL_NODE_AMMSC, SQL_NODE_ACCESS_DATE,SQL_NODE_DATE,SQL_NODE_CONCAT}; - typedef ::std::set< ::rtl::OUString > QueryNameSet; + typedef ::std::set< OUString > QueryNameSet; //================================================================== //= SQLParseNodeParameter //================================================================== @@ -118,9 +118,9 @@ namespace connectivity OSQLParseNodes m_aChildren; OSQLParseNode* m_pParent; // pParent for reverse linkage in the tree - ::rtl::OUString m_aNodeValue; // token name, or empty in case of rules, - // or ::rtl::OUString in case of - // ::rtl::OUString, INT, etc. + OUString m_aNodeValue; // token name, or empty in case of rules, + // or OUString in case of + // OUString, INT, etc. SQLNodeType m_eNodeType; // see above sal_uInt32 m_nNodeID; // ::com::sun::star::chaos::Rule ID (if IsRule()) // or Token ID (if !IsRule()) @@ -241,11 +241,11 @@ namespace connectivity SQLNodeType _eNodeType, sal_uInt32 _nNodeID = 0); - OSQLParseNode(const ::rtl::OString& _rValue, + OSQLParseNode(const OString& _rValue, SQLNodeType eNewNodeType, sal_uInt32 nNewNodeID=0); - OSQLParseNode(const ::rtl::OUString& _rValue, + OSQLParseNode(const OUString& _rValue, SQLNodeType _eNodeType, sal_uInt32 _nNodeID = 0); @@ -272,7 +272,7 @@ namespace connectivity OSQLParseNode* removeAt(sal_uInt32 nPos); - void replaceNodeValue(const ::rtl::OUString& rTableAlias,const ::rtl::OUString& rColumnName); + void replaceNodeValue(const OUString& rTableAlias,const OUString& rColumnName); /** parses the node to a string which can be passed to a driver's connection for execution @@ -310,26 +310,26 @@ namespace connectivity If this method returns , you're encouraged to check and handle the error in _pErrorHolder. */ - bool parseNodeToExecutableStatement( ::rtl::OUString& _out_rString, + bool parseNodeToExecutableStatement( OUString& _out_rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, OSQLParser& _rParser, ::com::sun::star::sdbc::SQLException* _pErrorHolder ) const; - void parseNodeToStr(::rtl::OUString& rString, + void parseNodeToStr(OUString& rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const IParseContext* pContext = NULL, sal_Bool _bIntl = sal_False, sal_Bool _bQuote= sal_True) const; // quoted and internationalised - void parseNodeToPredicateStr(::rtl::OUString& rString, + void parseNodeToPredicateStr(OUString& rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const ::com::sun::star::lang::Locale& rIntl, sal_Char _cDec, const IParseContext* pContext = NULL ) const; - void parseNodeToPredicateStr(::rtl::OUString& rString, + void parseNodeToPredicateStr(OUString& rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField, @@ -341,8 +341,8 @@ namespace connectivity #if OSL_DEBUG_LEVEL > 1 // shows the ParseTree with tabs and linefeeds - void showParseTree( ::rtl::OUString& rString ) const; - void showParseTree( ::rtl::OUStringBuffer& _inout_rBuf, sal_uInt32 nLevel ) const; + void showParseTree( OUString& rString ) const; + void showParseTree( OUStringBuffer& _inout_rBuf, sal_uInt32 nLevel ) const; #endif SQLNodeType getNodeType() const {return m_eNodeType;}; @@ -367,9 +367,9 @@ namespace connectivity // IsToken tests whether a Node is a Token (Terminal but not a rule) sal_Bool isToken() const {return !isRule();} - const ::rtl::OUString& getTokenValue() const {return m_aNodeValue;} + const OUString& getTokenValue() const {return m_aNodeValue;} - void setTokenValue(const ::rtl::OUString& rString) { if (isToken()) m_aNodeValue = rString;} + void setTokenValue(const OUString& rString) { if (isToken()) m_aNodeValue = rString;} sal_Bool isLeaf() const {return m_aChildren.empty();} @@ -396,8 +396,8 @@ namespace connectivity // _pTableNode must be a rule of that above or a SQL_TOKEN_NAME static sal_Bool getTableComponents(const OSQLParseNode* _pTableNode, ::com::sun::star::uno::Any &_rCatalog, - ::rtl::OUString &_rSchema, - ::rtl::OUString &_rTable + OUString &_rSchema, + OUString &_rTable ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData); // substitute all occurrences of :var or [name] into the dynamic parameter ? @@ -406,11 +406,11 @@ namespace connectivity /** return a table range when it exists. */ - static ::rtl::OUString getTableRange(const OSQLParseNode* _pTableRef); + static OUString getTableRange(const OSQLParseNode* _pTableRef); protected: // ParseNodeToStr concatenates all Tokens (leaves) of the ParseNodes. - void parseNodeToStr(::rtl::OUString& rString, + void parseNodeToStr(OUString& rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField, @@ -423,22 +423,22 @@ namespace connectivity bool _bSubstitute) const; private: - void impl_parseNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; - void impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; - void impl_parseTableRangeNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; + void impl_parseNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; + void impl_parseLikeNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; + void impl_parseTableRangeNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; /** parses a table_name node into a SQL statement particle. @return if and only if parsing was successful, if default handling should be applied. */ - bool impl_parseTableNameNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; + bool impl_parseTableNameNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const; - sal_Bool addDateValue(::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; - ::rtl::OUString convertDateTimeString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const; - ::rtl::OUString convertDateString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const; - ::rtl::OUString convertTimeString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const; - void parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; + sal_Bool addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; + OUString convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const; + OUString convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const; + OUString convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const; + void parseLeaf(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const; }; //----------------------------------------------------------------------------- diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx index 173c669c3f0b..892d3ecb8db5 100644 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.hxx @@ -76,13 +76,13 @@ namespace connectivity virtual ~OParseContext(); // retrieves language specific error messages - virtual ::rtl::OUString getErrorMessage(ErrorCode _eCodes) const; + virtual OUString getErrorMessage(ErrorCode _eCodes) const; // retrieves language specific keyword strings (only ASCII allowed) - virtual ::rtl::OString getIntlKeywordAscii(InternationalKeyCode _eKey) const; + virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const; // finds out, if we have an international keyword (only ASCII allowed) - virtual InternationalKeyCode getIntlKeyCode(const ::rtl::OString& rToken) const; + virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const; // determines the default international setting static const ::com::sun::star::lang::Locale& getDefaultLocale(); @@ -151,8 +151,8 @@ namespace connectivity OSQLParseNode* m_pParseTree; // result from parsing ::std::auto_ptr< OSQLParser_Data > m_pData; - ::rtl::OUString m_sFieldName; // current field name for a predicate - ::rtl::OUString m_sErrorMessage;// current error msg + OUString m_sFieldName; // current field name for a predicate + OUString m_sErrorMessage;// current error msg ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xField; // current field @@ -166,7 +166,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData> xDummy; // can be deleted after 627 // convert a string into double trim it to scale of _nscale and than transform it back to string - ::rtl::OUString stringToDouble(const ::rtl::OUString& _rValue,sal_Int16 _nScale); + OUString stringToDouble(const OUString& _rValue,sal_Int16 _nScale); OSQLParseNode* buildDate(sal_Int32 _nType,OSQLParseNode*& pLiteral); bool extractDate(OSQLParseNode* pLiteral,double& _rfValue); void killThousandSeparator(OSQLParseNode* pLiteral); @@ -184,12 +184,12 @@ namespace connectivity ~OSQLParser(); // Parsing an SQLStatement - OSQLParseNode* parseTree(::rtl::OUString& rErrorMessage, - const ::rtl::OUString& rStatement, + OSQLParseNode* parseTree(OUString& rErrorMessage, + const OUString& rStatement, sal_Bool bInternational = sal_False); // Check a Predicate - OSQLParseNode* predicateTree(::rtl::OUString& rErrorMessage, const ::rtl::OUString& rStatement, + OSQLParseNode* predicateTree(OUString& rErrorMessage, const OUString& rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xField); @@ -200,24 +200,24 @@ namespace connectivity const SQLError& getErrorHelper() const; // TokenIDToStr: token name belonging to a token number. - static ::rtl::OString TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext = NULL); + static OString TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext = NULL); #if OSL_DEBUG_LEVEL > 1 // (empty string if not found) - static ::rtl::OUString RuleIDToStr(sal_uInt32 nRuleID); + static OUString RuleIDToStr(sal_uInt32 nRuleID); #endif - // StrToRuleID calculates the RuleID for a ::rtl::OUString (that is, ::com::sun::star::sdbcx::Index in yytname) + // StrToRuleID calculates the RuleID for a OUString (that is, ::com::sun::star::sdbcx::Index in yytname) // (0 if not found). The search for an ID based on a String is - // extremely inefficient (sequential search for ::rtl::OUString)! - static sal_uInt32 StrToRuleID(const ::rtl::OString & rValue); + // extremely inefficient (sequential search for OUString)! + static sal_uInt32 StrToRuleID(const OString & rValue); static OSQLParseNode::Rule RuleIDToRule( sal_uInt32 _nRule ); // RuleId with enum, far more efficient static sal_uInt32 RuleID(OSQLParseNode::Rule eRule); // compares the _sFunctionName with all known function names and return the DataType of the return value - static sal_Int32 getFunctionReturnType(const ::rtl::OUString& _sFunctionName, const IParseContext* pContext = NULL); + static sal_Int32 getFunctionReturnType(const OUString& _sFunctionName, const IParseContext* pContext = NULL); // returns the type for a parameter in a given function name static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos); @@ -230,7 +230,7 @@ namespace connectivity // Is the parse in a special mode? // Predicate chack is used to check a condition for a field sal_Bool inPredicateCheck() const {return m_xField.is();} - const ::rtl::OUString& getFieldName() const {return m_sFieldName;} + const OUString& getFieldName() const {return m_sFieldName;} void reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank); // does not change the pLiteral argument diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx index f2ba862821ad..56b10ebd0d11 100644 --- a/connectivity/inc/connectivity/statementcomposer.hxx +++ b/connectivity/inc/connectivity/statementcomposer.hxx @@ -51,7 +51,7 @@ namespace dbtools */ StatementComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing ); @@ -67,8 +67,8 @@ namespace dbtools */ void setDisposeComposer( bool _bDoDispose ); - void setFilter( const ::rtl::OUString& _rFilter ); - void setOrder( const ::rtl::OUString& _rOrder ); + void setFilter( const OUString& _rFilter ); + void setOrder( const OUString& _rOrder ); /** returns the composer which has been fed with the current settings @@ -86,7 +86,7 @@ namespace dbtools @throws ::com::sun::star::sdbc::SQLException if such an exception occurs while creating the composer */ - ::rtl::OUString + OUString getQuery(); private: diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx index 1e12e9a60fd9..352c98d7a8c4 100644 --- a/connectivity/inc/connectivity/virtualdbtools.hxx +++ b/connectivity/inc/connectivity/virtualdbtools.hxx @@ -117,9 +117,9 @@ namespace connectivity { public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, - const ::rtl::OUString& _rPwd, + const OUString& _rDataSourceName, + const OUString& _rUser, + const OUString& _rPwd, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ) = 0; @@ -152,19 +152,19 @@ namespace connectivity const ::com::sun::star::lang::Locale& _rLocale ) const = 0; - virtual ::rtl::OUString quoteName( - const ::rtl::OUString& _rQuote, - const ::rtl::OUString& _rName + virtual OUString quoteName( + const OUString& _rQuote, + const OUString& _rName ) const = 0; - virtual ::rtl::OUString composeTableNameForSelect( + virtual OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString& _rCatalog, - const ::rtl::OUString& _rSchema, - const ::rtl::OUString& _rName + const OUString& _rCatalog, + const OUString& _rSchema, + const OUString& _rName ) const = 0; - virtual ::rtl::OUString composeTableNameForSelect( + virtual OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ) const = 0; @@ -172,12 +172,12 @@ namespace connectivity virtual ::com::sun::star::sdb::SQLContext prependContextInfo( ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::rtl::OUString& _rContextDescription, - const ::rtl::OUString& _rContextDetails + const OUString& _rContextDescription, + const OUString& _rContextDetails ) const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource( - const ::rtl::OUString& _rsRegisteredName, + const OUString& _rsRegisteredName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const = 0; @@ -185,16 +185,16 @@ namespace connectivity getFieldsByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ) = 0; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getFieldNamesByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ) = 0; @@ -259,14 +259,14 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant, const ::com::sun::star::util::Date& rNullDate ) const = 0; - virtual ::rtl::OUString getFormattedValue( + virtual OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::util::Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const = 0; - virtual ::rtl::OUString getFormattedValue( + virtual OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter, const ::com::sun::star::lang::Locale& _rLocale, @@ -285,12 +285,12 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS ISQLParseNode : public ::rtl::IReference { public: - virtual void parseNodeToStr(::rtl::OUString& _rString, + virtual void parseNodeToStr(OUString& _rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const IParseContext* _pContext ) const = 0; - virtual void parseNodeToPredicateStr(::rtl::OUString& _rString, + virtual void parseNodeToPredicateStr(OUString& _rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, @@ -312,8 +312,8 @@ namespace connectivity { public: virtual ::rtl::Reference< ISQLParseNode > predicateTree( - ::rtl::OUString& rErrorMessage, - const ::rtl::OUString& rStatement, + OUString& rErrorMessage, + const OUString& rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField ) const = 0; diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx index 63ebc4106a7e..5a013f9a5145 100644 --- a/connectivity/inc/connectivity/warningscontainer.hxx +++ b/connectivity/inc/connectivity/warningscontainer.hxx @@ -79,7 +79,7 @@ namespace dbtools the context of the warning */ void appendWarning( - const ::rtl::OUString& _rWarning, + const OUString& _rWarning, const sal_Char* _pAsciiSQLState, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext ); diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx index ffbb348dcd60..78b5f729761e 100644 --- a/connectivity/source/commontools/AutoRetrievingBase.cxx +++ b/connectivity/source/commontools/AutoRetrievingBase.cxx @@ -21,16 +21,16 @@ namespace connectivity { - ::rtl::OUString OAutoRetrievingBase::getTransformedGeneratedStatement(const ::rtl::OUString& _sInsertStatement) const + OUString OAutoRetrievingBase::getTransformedGeneratedStatement(const OUString& _sInsertStatement) const { OSL_ENSURE( m_bAutoRetrievingEnabled,"Illegal call here. isAutoRetrievingEnabled is false!"); - ::rtl::OUString sStmt = _sInsertStatement.toAsciiUpperCase(); - ::rtl::OUString sStatement; + OUString sStmt = _sInsertStatement.toAsciiUpperCase(); + OUString sStatement; if ( sStmt.startsWith("INSERT") ) { sStatement = m_sGeneratedValueStatement; - static const ::rtl::OUString sColumn("$column"); - static const ::rtl::OUString sTable("$table"); + static const OUString sColumn("$column"); + static const OUString sTable("$table"); sal_Int32 nIndex = 0; nIndex = sStatement.indexOf(sColumn,nIndex); if ( -1 != nIndex ) @@ -50,7 +50,7 @@ namespace connectivity while (sStmt.indexOf(' ') == 0 ); nIntoIndex = 0; - ::rtl::OUString sTableName = sStmt.getToken(0,' ',nIntoIndex); + OUString sTableName = sStmt.getToken(0,' ',nIntoIndex); sStatement = sStatement.replaceAt(nIndex,sTable.getLength(),sTableName); } } diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index 909e411a8d76..48357f28999f 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -111,7 +111,7 @@ namespace connectivity return ( *pStr == 0 ) && ( *pWild == 0 ); } //------------------------------------------------------------------ - rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate) + OUString toDateString(const ::com::sun::star::util::Date& rDate) { sal_Char s[11]; snprintf(s, @@ -121,11 +121,11 @@ namespace connectivity (int)rDate.Month, (int)rDate.Day); s[10] = 0; - return rtl::OUString::createFromAscii(s); + return OUString::createFromAscii(s); } //------------------------------------------------------------------ - rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime) + OUString toTimeString(const ::com::sun::star::util::Time& rTime) { sal_Char s[9]; snprintf(s, @@ -135,11 +135,11 @@ namespace connectivity (int)rTime.Minutes, (int)rTime.Seconds); s[8] = 0; - return rtl::OUString::createFromAscii(s); + return OUString::createFromAscii(s); } //------------------------------------------------------------------ - rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime) + OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime) { sal_Char s[20]; snprintf(s, @@ -152,7 +152,7 @@ namespace connectivity (int)rDateTime.Minutes, (int)rDateTime.Seconds); s[19] = 0; - return rtl::OUString::createFromAscii(s); + return OUString::createFromAscii(s); } #ifdef SOLAR_JAVA @@ -198,7 +198,7 @@ namespace connectivity return aRet; } //------------------------------------------------------------------------------ - sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const ::rtl::OUString& _sClassName ) + sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ) { sal_Bool bRet = sal_False; if ( _pJVM.is() ) @@ -207,7 +207,7 @@ namespace connectivity JNIEnv* pEnv = aGuard.getEnvironment(); if( pEnv ) { - ::rtl::OString sClassName = ::rtl::OUStringToOString(_sClassName, RTL_TEXTENCODING_ASCII_US); + OString sClassName = OUStringToOString(_sClassName, RTL_TEXTENCODING_ASCII_US); sClassName = sClassName.replace('.','/'); jobject out = pEnv->FindClass(sClassName.getStr()); bRet = out != NULL; @@ -223,7 +223,7 @@ namespace connectivity namespace dbtools { //------------------------------------------------------------------ -sal_Bool isCharOk(sal_Unicode c,const ::rtl::OUString& _rSpecials) +sal_Bool isCharOk(sal_Unicode c,const OUString& _rSpecials) { return ( ((c >= 97) && (c <= 122)) || ((c >= 65) && (c <= 90)) || ((c >= 48) && (c <= 57)) || @@ -231,7 +231,7 @@ sal_Bool isCharOk(sal_Unicode c,const ::rtl::OUString& _rSpecials) } //------------------------------------------------------------------------------ -sal_Bool isValidSQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSpecials) +sal_Bool isValidSQLName(const OUString& rName,const OUString& _rSpecials) { // Test for correct naming (in SQL sense) // This is important for table names for example @@ -260,11 +260,11 @@ sal_Bool isValidSQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSp } //------------------------------------------------------------------ // Creates a new name if necessary -::rtl::OUString convertName2SQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSpecials) +OUString convertName2SQLName(const OUString& rName,const OUString& _rSpecials) { if(isValidSQLName(rName,_rSpecials)) return rName; - ::rtl::OUString aNewName(rName); + OUString aNewName(rName); const sal_Unicode* pStr = rName.getStr(); sal_Int32 nLength = rName.getLength(); sal_Bool bValid(*pStr < 128 && !isdigit(*pStr)); @@ -276,14 +276,14 @@ sal_Bool isValidSQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSp } if ( !bValid ) - aNewName = ::rtl::OUString(); + aNewName = OUString(); return aNewName; } //------------------------------------------------------------------------------ -::rtl::OUString quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName) +OUString quoteName(const OUString& _rQuote, const OUString& _rName) { - ::rtl::OUString sName = _rName; + OUString sName = _rName; if( !_rQuote.isEmpty() && _rQuote.toChar() != ' ') sName = _rQuote + _rName + _rQuote; return sName; diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index a8408fe83cb6..8506fef0b7dd 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -104,21 +104,21 @@ OConnectionWrapper::~OConnectionWrapper() // XServiceInfo // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" ); + return OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" ); } // -------------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { // first collect the services which are supported by our aggregate - Sequence< ::rtl::OUString > aSupported; + Sequence< OUString > aSupported; if ( m_xServiceInfo.is() ) aSupported = m_xServiceInfo->getSupportedServiceNames(); // append our own service, if necessary - ::rtl::OUString sConnectionService( "com.sun.star.sdbc.Connection" ); + OUString sConnectionService( "com.sun.star.sdbc.Connection" ); if ( 0 == ::comphelper::findValue( aSupported, sConnectionService, sal_True ).getLength() ) { sal_Int32 nLen = aSupported.getLength(); @@ -131,7 +131,7 @@ OConnectionWrapper::~OConnectionWrapper() } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL OConnectionWrapper::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) { return ::comphelper::findValue( getSupportedServiceNames(), _rServiceName, sal_True ).getLength() != 0; } @@ -195,11 +195,11 @@ namespace // ----------------------------------------------------------------------------- // creates a unique id out of the url and sequence of properties -void OConnectionWrapper::createUniqueId( const ::rtl::OUString& _rURL +void OConnectionWrapper::createUniqueId( const OUString& _rURL ,Sequence< PropertyValue >& _rInfo ,sal_uInt8* _pBuffer - ,const ::rtl::OUString& _rUserName - ,const ::rtl::OUString& _rPassword) + ,const OUString& _rUserName + ,const OUString& _rPassword) { // first we create the digest we want to have rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 ); @@ -218,21 +218,21 @@ void OConnectionWrapper::createUniqueId( const ::rtl::OUString& _rURL for (; pBegin != pEnd; ++pBegin) { // we only include strings an integer values - ::rtl::OUString sValue; + OUString sValue; if ( pBegin->Value >>= sValue ) ; else { sal_Int32 nValue = 0; if ( pBegin->Value >>= nValue ) - sValue = ::rtl::OUString::valueOf(nValue); + sValue = OUString::valueOf(nValue); else { - Sequence< ::rtl::OUString> aSeq; + Sequence< OUString> aSeq; if ( pBegin->Value >>= aSeq ) { - const ::rtl::OUString* pSBegin = aSeq.getConstArray(); - const ::rtl::OUString* pSEnd = pSBegin + aSeq.getLength(); + const OUString* pSBegin = aSeq.getConstArray(); + const OUString* pSEnd = pSBegin + aSeq.getLength(); for(;pSBegin != pSEnd;++pSBegin) rtl_digest_update(aDigest,pSBegin->getStr(),pSBegin->getLength()*sizeof(sal_Unicode)); } diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index b9c0b3d98f04..9746196d0336 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -45,10 +45,10 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::com::sun::star::uno; // ----------------------------------------------------------------------------- -::rtl::OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, sal_Bool bQuote, +OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, sal_Bool bQuote, const Reference< XTypeConverter >& _rxTypeConverter) { - ::rtl::OUStringBuffer aRet; + OUStringBuffer aRet; if (_rVal.hasValue()) { try @@ -69,7 +69,7 @@ using namespace ::com::sun::star::uno; } else { - ::rtl::OUString sTemp; + OUString sTemp; _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= sTemp; aRet.append(sTemp); } @@ -80,11 +80,11 @@ using namespace ::com::sun::star::uno; if (bQuote) aRet.appendAscii("'"); { - ::rtl::OUString aTemp; + OUString aTemp; _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aTemp; sal_Int32 nIndex = (sal_Int32)-1; - const ::rtl::OUString sQuot("\'"); - const ::rtl::OUString sQuotToReplace("\'\'"); + const OUString sQuot("\'"); + const OUString sQuotToReplace("\'\'"); do { nIndex += 2; @@ -105,7 +105,7 @@ using namespace ::com::sun::star::uno; case DataType::BIGINT: default: { - ::rtl::OUString sTemp; + OUString sTemp; _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= sTemp; aRet.append(sTemp); } @@ -123,7 +123,7 @@ using namespace ::com::sun::star::uno; } else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING) { - ::rtl::OUString sValue; + OUString sValue; _rVal >>= sValue; aDateTime = DBTypeConversion::toDateTime(sValue); bOk = true; @@ -157,7 +157,7 @@ using namespace ::com::sun::star::uno; } else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING) { - ::rtl::OUString sValue; + OUString sValue; _rVal >>= sValue; aDate = DBTypeConversion::toDate(sValue); bOk = true; @@ -184,7 +184,7 @@ using namespace ::com::sun::star::uno; } else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING) { - ::rtl::OUString sValue; + OUString sValue; _rVal >>= sValue; aTime = DBTypeConversion::toTime(sValue); bOk = true; @@ -219,7 +219,7 @@ Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xS { // get the null date Date aDate; - xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString("NullDate")) >>= aDate; + xSupplier->getNumberFormatSettings()->getPropertyValue(OUString("NullDate")) >>= aDate; return aDate; } catch ( const Exception& ) @@ -233,7 +233,7 @@ Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xS void DBTypeConversion::setValue(const Reference& xVariant, const Reference& xFormatter, const Date& rNullDate, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nKey, sal_Int16 nFieldType, sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException) @@ -257,8 +257,8 @@ void DBTypeConversion::setValue(const Reference& xVariant, // and again a special treatment, this time for percent formats if ((NumberFormat::NUMBER == nRealUsedTypeClass) && (NumberFormat::PERCENT == nTypeClass)) { // formatting should be "percent", but the String provides just a simple number -> adjust - ::rtl::OUString sExpanded(rString); - static ::rtl::OUString s_sPercentSymbol( "%" ); + OUString sExpanded(rString); + static OUString s_sPercentSymbol( "%" ); // need a method to add a sal_Unicode to a string, 'til then we use a static string sExpanded += s_sPercentSymbol; fValue = xFormatter->convertStringToNumber(nKeyToUse, sExpanded); @@ -397,14 +397,14 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D } } //------------------------------------------------------------------------------ -::rtl::OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xColumn, +OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xColumn, const Reference& _xFormatter, const ::com::sun::star::lang::Locale& _rLocale, const Date& _rNullDate) { OSL_ENSURE(_xColumn.is() && _xFormatter.is(), "DBTypeConversion::getFormattedValue: invalid arg !"); if (!_xColumn.is() || !_xFormatter.is()) - return ::rtl::OUString(); + return OUString(); sal_Int32 nKey(0); try @@ -433,13 +433,13 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D } //------------------------------------------------------------------------------ -::rtl::OUString DBTypeConversion::getFormattedValue(const Reference& xVariant, +OUString DBTypeConversion::getFormattedValue(const Reference& xVariant, const Reference& xFormatter, const Date& rNullDate, sal_Int32 nKey, sal_Int16 nKeyType) { - ::rtl::OUString aString; + OUString aString; if (xVariant.is()) { try @@ -459,7 +459,7 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D { Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier(), UNO_SET_THROW ); Reference< XPropertySet > xFormatterSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW ); - OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= aFormatterNullDate ); + OSL_VERIFY( xFormatterSettings->getPropertyValue( OUString( "NullDate" ) ) >>= aFormatterNullDate ); } catch( const Exception& ) { diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx index 1bdf05ee6fce..7d0f5768540f 100644 --- a/connectivity/source/commontools/DriversConfig.cxx +++ b/connectivity/source/commontools/DriversConfig.cxx @@ -25,28 +25,28 @@ using namespace ::com::sun::star; namespace { - void lcl_convert(const uno::Sequence< ::rtl::OUString >& _aSource,uno::Any& _rDest) + void lcl_convert(const uno::Sequence< OUString >& _aSource,uno::Any& _rDest) { uno::Sequence aRet(_aSource.getLength()); uno::Any* pAny = aRet.getArray(); - const ::rtl::OUString* pIter = _aSource.getConstArray(); - const ::rtl::OUString* pEnd = pIter + _aSource.getLength(); + const OUString* pIter = _aSource.getConstArray(); + const OUString* pEnd = pIter + _aSource.getLength(); for (;pIter != pEnd ; ++pIter,++pAny) { *pAny <<= *pIter; } _rDest <<= aRet; } - void lcl_fillValues(const ::utl::OConfigurationNode& _aURLPatternNode,const ::rtl::OUString& _sNode,::comphelper::NamedValueCollection& _rValues) + void lcl_fillValues(const ::utl::OConfigurationNode& _aURLPatternNode,const OUString& _sNode,::comphelper::NamedValueCollection& _rValues) { const ::utl::OConfigurationNode aPropertiesNode = _aURLPatternNode.openNode(_sNode); if ( aPropertiesNode.isValid() ) { - uno::Sequence< ::rtl::OUString > aStringSeq; - static const ::rtl::OUString s_sValue("/Value"); - const uno::Sequence< ::rtl::OUString > aProperties = aPropertiesNode.getNodeNames(); - const ::rtl::OUString* pPropertiesIter = aProperties.getConstArray(); - const ::rtl::OUString* pPropertiesEnd = pPropertiesIter + aProperties.getLength(); + uno::Sequence< OUString > aStringSeq; + static const OUString s_sValue("/Value"); + const uno::Sequence< OUString > aProperties = aPropertiesNode.getNodeNames(); + const OUString* pPropertiesIter = aProperties.getConstArray(); + const OUString* pPropertiesEnd = pPropertiesIter + aProperties.getLength(); for (;pPropertiesIter != pPropertiesEnd ; ++pPropertiesIter) { uno::Any aValue = aPropertiesNode.getNodeValue(*pPropertiesIter + s_sValue); @@ -58,22 +58,22 @@ namespace } // for (;pPropertiesIter != pPropertiesEnd ; ++pPropertiesIter,++pNamedIter) } // if ( aPropertiesNode.isValid() ) } - void lcl_readURLPatternNode(const ::utl::OConfigurationTreeRoot& _aInstalled,const ::rtl::OUString& _sEntry,TInstalledDriver& _rInstalledDriver) + void lcl_readURLPatternNode(const ::utl::OConfigurationTreeRoot& _aInstalled,const OUString& _sEntry,TInstalledDriver& _rInstalledDriver) { const ::utl::OConfigurationNode aURLPatternNode = _aInstalled.openNode(_sEntry); if ( aURLPatternNode.isValid() ) { - ::rtl::OUString sParentURLPattern; + OUString sParentURLPattern; aURLPatternNode.getNodeValue("ParentURLPattern") >>= sParentURLPattern; if ( !sParentURLPattern.isEmpty() ) lcl_readURLPatternNode(_aInstalled,sParentURLPattern,_rInstalledDriver); - ::rtl::OUString sDriverFactory; + OUString sDriverFactory; aURLPatternNode.getNodeValue("Driver") >>= sDriverFactory; if ( !sDriverFactory.isEmpty() ) _rInstalledDriver.sDriverFactory = sDriverFactory; - ::rtl::OUString sDriverTypeDisplayName; + OUString sDriverTypeDisplayName; aURLPatternNode.getNodeValue("DriverTypeDisplayName") >>= sDriverTypeDisplayName; OSL_ENSURE(!sDriverTypeDisplayName.isEmpty(),"No valid DriverTypeDisplayName property!"); if ( !sDriverTypeDisplayName.isEmpty() ) @@ -96,15 +96,15 @@ void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rx { if ( !m_aInstalled.isValid() ) { - static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess.Drivers/Installed"); ///Installed + static const OUString s_sNodeName("org.openoffice.Office.DataAccess.Drivers/Installed"); ///Installed m_aInstalled = ::utl::OConfigurationTreeRoot::createWithComponentContext(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); } if ( m_aInstalled.isValid() ) { - const uno::Sequence< ::rtl::OUString > aURLPatterns = m_aInstalled.getNodeNames(); - const ::rtl::OUString* pPatternIter = aURLPatterns.getConstArray(); - const ::rtl::OUString* pPatternEnd = pPatternIter + aURLPatterns.getLength(); + const uno::Sequence< OUString > aURLPatterns = m_aInstalled.getNodeNames(); + const OUString* pPatternIter = aURLPatterns.getConstArray(); + const OUString* pPatternEnd = pPatternIter + aURLPatterns.getLength(); for (;pPatternIter != pPatternEnd ; ++pPatternIter) { TInstalledDriver aInstalledDriver; @@ -143,11 +143,11 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs ) } // ----------------------------------------------------------------------------- -::rtl::OUString DriversConfig::getDriverFactoryName(const ::rtl::OUString& _sURL) const +OUString DriversConfig::getDriverFactoryName(const OUString& _sURL) const { const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB); - ::rtl::OUString sRet; - ::rtl::OUString sOldPattern; + OUString sRet; + OUString sOldPattern; TInstalledDrivers::const_iterator aIter = rDrivers.begin(); TInstalledDrivers::const_iterator aEnd = rDrivers.end(); for(;aIter != aEnd;++aIter) @@ -163,11 +163,11 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs ) return sRet; } // ----------------------------------------------------------------------------- -::rtl::OUString DriversConfig::getDriverTypeDisplayName(const ::rtl::OUString& _sURL) const +OUString DriversConfig::getDriverTypeDisplayName(const OUString& _sURL) const { const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB); - ::rtl::OUString sRet; - ::rtl::OUString sOldPattern; + OUString sRet; + OUString sOldPattern; TInstalledDrivers::const_iterator aIter = rDrivers.begin(); TInstalledDrivers::const_iterator aEnd = rDrivers.end(); for(;aIter != aEnd;++aIter) @@ -183,26 +183,26 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs ) return sRet; } // ----------------------------------------------------------------------------- -const ::comphelper::NamedValueCollection& DriversConfig::getProperties(const ::rtl::OUString& _sURL) const +const ::comphelper::NamedValueCollection& DriversConfig::getProperties(const OUString& _sURL) const { return impl_get(_sURL,1); } // ----------------------------------------------------------------------------- -const ::comphelper::NamedValueCollection& DriversConfig::getFeatures(const ::rtl::OUString& _sURL) const +const ::comphelper::NamedValueCollection& DriversConfig::getFeatures(const OUString& _sURL) const { return impl_get(_sURL,0); } // ----------------------------------------------------------------------------- -const ::comphelper::NamedValueCollection& DriversConfig::getMetaData(const ::rtl::OUString& _sURL) const +const ::comphelper::NamedValueCollection& DriversConfig::getMetaData(const OUString& _sURL) const { return impl_get(_sURL,2); } // ----------------------------------------------------------------------------- -const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const +const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const OUString& _sURL,sal_Int32 _nProps) const { const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB); const ::comphelper::NamedValueCollection* pRet = NULL; - ::rtl::OUString sOldPattern; + OUString sOldPattern; TInstalledDrivers::const_iterator aIter = rDrivers.begin(); TInstalledDrivers::const_iterator aEnd = rDrivers.end(); for(;aIter != aEnd;++aIter) @@ -233,11 +233,11 @@ const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const ::rtl::O return *pRet; } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > DriversConfig::getURLs() const +uno::Sequence< OUString > DriversConfig::getURLs() const { const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB); - uno::Sequence< ::rtl::OUString > aRet(rDrivers.size()); - ::rtl::OUString* pIter = aRet.getArray(); + uno::Sequence< OUString > aRet(rDrivers.size()); + OUString* pIter = aRet.getArray(); TInstalledDrivers::const_iterator aIter = rDrivers.begin(); TInstalledDrivers::const_iterator aEnd = rDrivers.end(); for(;aIter != aEnd;++aIter,++pIter) diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 284d2cff0505..b25e3bd25929 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -158,7 +158,7 @@ void ODatabaseMetaDataResultSet::setRows(const ORows& _rRows) m_bEOF = m_aRows.empty(); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -295,7 +295,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } @@ -666,55 +666,55 @@ ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getBasicValue() // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getSelectValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("SELECT")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("SELECT")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getInsertValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("INSERT")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("INSERT")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDeleteValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("DELETE")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("DELETE")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getUpdateValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("UPDATE")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("UPDATE")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getCreateValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("CREATE")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("CREATE")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getReadValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("READ")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("READ")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getAlterValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("ALTER")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("ALTER")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDropValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("DROP")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("DROP")); return aValueRef; } // ----------------------------------------------------------------------------- ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getQuoteValue() { - static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("'")); + static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("'")); return aValueRef; } // ----------------------------------------------------------------------------- @@ -796,7 +796,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA break; case TypeClass_STRING: { - ::rtl::OUString sValue; + OUString sValue; *pRowIter >>= sValue; aValue = new ORowSetValueDecorator(ORowSetValue(sValue)); } @@ -816,9 +816,9 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA // XServiceInfo // -------------------------------------------------------------------------------- //------------------------------------------------------------------------------ - rtl::OUString ODatabaseMetaDataResultSet::getImplementationName_Static( ) throw(RuntimeException) + OUString ODatabaseMetaDataResultSet::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet"); + return OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet"); } //------------------------------------------------------------------------------ Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( ) throw (RuntimeException) @@ -828,24 +828,24 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA return aSNS; } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ - sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; return pSupported != pEnd; } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -869,7 +869,6 @@ namespace { 0, 0, 0, 0, 0, 0 } }; } -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::registry::XRegistryKey; diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx index 470d27a0ffd2..816a1a453bbc 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx @@ -61,49 +61,49 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 return sal_True; } -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnName(); - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getTableName(); - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnTypeName(); - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnLabel(); return getColumnName(column); } -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnServiceName(); - return ::rtl::OUString(); + return OUString(); } sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 65ef48317858..ef968fb9261e 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -418,7 +418,7 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH) case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - (*this) = ::rtl::OUString(_rRH.m_aValue.m_pString); + (*this) = OUString(_rRH.m_aValue.m_pString); break; case DataType::DATE: (*this) = *(Date*)_rRH.m_aValue.m_pValue; @@ -536,7 +536,7 @@ ORowSetValue& ORowSetValue::operator=(const DateTime& _rRH) } // ------------------------------------------------------------------------- -ORowSetValue& ORowSetValue::operator=(const ::rtl::OUString& _rRH) +ORowSetValue& ORowSetValue::operator=(const OUString& _rRH) { if(m_eTypeKind != DataType::VARCHAR || m_aValue.m_pString != _rRH.pData) { @@ -796,8 +796,8 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const case DataType::CHAR: case DataType::LONGVARCHAR: { - ::rtl::OUString aVal1(m_aValue.m_pString); - ::rtl::OUString aVal2(_rRH.m_aValue.m_pString); + OUString aVal1(m_aValue.m_pString); + OUString aVal2(_rRH.m_aValue.m_pString); return aVal1 == aVal2; } default: @@ -811,8 +811,8 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const case DataType::DECIMAL: case DataType::NUMERIC: { - ::rtl::OUString aVal1(m_aValue.m_pString); - ::rtl::OUString aVal2(_rRH.m_aValue.m_pString); + OUString aVal1(m_aValue.m_pString); + OUString aVal2(_rRH.m_aValue.m_pString); bRet = aVal1 == aVal2; } break; @@ -881,7 +881,7 @@ Any ORowSetValue::makeAny() const case DataType::NUMERIC: case DataType::LONGVARCHAR: OSL_ENSURE(m_aValue.m_pString,"Value is null!"); - rValue <<= (::rtl::OUString)m_aValue.m_pString; + rValue <<= (OUString)m_aValue.m_pString; break; case DataType::FLOAT: rValue <<= m_aValue.m_nFloat; @@ -961,10 +961,10 @@ Any ORowSetValue::makeAny() const return rValue; } // ------------------------------------------------------------------------- -::rtl::OUString ORowSetValue::getString( ) const +OUString ORowSetValue::getString( ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getString" ); - ::rtl::OUString aRet; + OUString aRet; if(!m_bNull) { switch(getTypeKind()) @@ -996,7 +996,7 @@ Any ORowSetValue::makeAny() const case DataType::VARBINARY: case DataType::LONGVARBINARY: { - ::rtl::OUStringBuffer sVal(::rtl::OUString("0x")); + OUStringBuffer sVal(OUString("0x")); Sequence aSeq(getSequence()); const sal_Int8* pBegin = aSeq.getConstArray(); const sal_Int8* pEnd = pBegin + aSeq.getLength(); @@ -1059,9 +1059,9 @@ bool ORowSetValue::getBool() const case DataType::VARCHAR: case DataType::LONGVARCHAR: { - const ::rtl::OUString sValue(m_aValue.m_pString); - const static ::rtl::OUString s_sTrue("true"); - const static ::rtl::OUString s_sFalse("false"); + const OUString sValue(m_aValue.m_pString); + const static OUString s_sTrue("true"); + const static OUString s_sFalse("false"); if ( sValue.equalsIgnoreAsciiCase(s_sTrue) ) { bRet = sal_True; @@ -1077,7 +1077,7 @@ bool ORowSetValue::getBool() const case DataType::DECIMAL: case DataType::NUMERIC: - bRet = ::rtl::OUString(m_aValue.m_pString).toInt32() != 0; + bRet = OUString(m_aValue.m_pString).toInt32() != 0; break; case DataType::FLOAT: bRet = m_aValue.m_nFloat != 0.0; @@ -1137,7 +1137,7 @@ sal_Int8 ORowSetValue::getInt8() const case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - nRet = sal_Int8(::rtl::OUString(m_aValue.m_pString).toInt32()); + nRet = sal_Int8(OUString(m_aValue.m_pString).toInt32()); break; case DataType::FLOAT: nRet = sal_Int8(m_aValue.m_nFloat); @@ -1208,7 +1208,7 @@ sal_uInt8 ORowSetValue::getUInt8() const case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - nRet = sal_uInt8(::rtl::OUString(m_aValue.m_pString).toInt32()); + nRet = sal_uInt8(OUString(m_aValue.m_pString).toInt32()); break; case DataType::FLOAT: nRet = sal_uInt8(m_aValue.m_nFloat); @@ -1283,7 +1283,7 @@ sal_Int16 ORowSetValue::getInt16() const case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - nRet = sal_Int16(::rtl::OUString(m_aValue.m_pString).toInt32()); + nRet = sal_Int16(OUString(m_aValue.m_pString).toInt32()); break; case DataType::FLOAT: nRet = sal_Int16(m_aValue.m_nFloat); @@ -1354,7 +1354,7 @@ sal_uInt16 ORowSetValue::getUInt16() const case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - nRet = sal_uInt16(::rtl::OUString(m_aValue.m_pString).toInt32()); + nRet = sal_uInt16(OUString(m_aValue.m_pString).toInt32()); break; case DataType::FLOAT: nRet = sal_uInt16(m_aValue.m_nFloat); @@ -1426,7 +1426,7 @@ sal_Int32 ORowSetValue::getInt32() const case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - nRet = ::rtl::OUString(m_aValue.m_pString).toInt32(); + nRet = OUString(m_aValue.m_pString).toInt32(); break; case DataType::FLOAT: nRet = sal_Int32(m_aValue.m_nFloat); @@ -1499,7 +1499,7 @@ sal_uInt32 ORowSetValue::getUInt32() const case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - nRet = ::rtl::OUString(m_aValue.m_pString).toInt32(); + nRet = OUString(m_aValue.m_pString).toInt32(); break; case DataType::FLOAT: nRet = sal_uInt32(m_aValue.m_nFloat); @@ -1573,7 +1573,7 @@ sal_Int64 ORowSetValue::getLong() const case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - nRet = ::rtl::OUString(m_aValue.m_pString).toInt64(); + nRet = OUString(m_aValue.m_pString).toInt64(); break; case DataType::FLOAT: nRet = sal_Int64(m_aValue.m_nFloat); @@ -1646,7 +1646,7 @@ sal_uInt64 ORowSetValue::getULong() const case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - nRet = static_cast(::rtl::OUString(m_aValue.m_pString).toInt64()); + nRet = static_cast(OUString(m_aValue.m_pString).toInt64()); break; case DataType::FLOAT: nRet = sal_uInt64(m_aValue.m_nFloat); @@ -1720,7 +1720,7 @@ float ORowSetValue::getFloat() const case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - nRet = ::rtl::OUString(m_aValue.m_pString).toFloat(); + nRet = OUString(m_aValue.m_pString).toFloat(); break; case DataType::FLOAT: nRet = m_aValue.m_nFloat; @@ -1799,7 +1799,7 @@ double ORowSetValue::getDouble() const case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - nRet = ::rtl::OUString(m_aValue.m_pString).toDouble(); + nRet = OUString(m_aValue.m_pString).toDouble(); break; case DataType::FLOAT: nRet = m_aValue.m_nFloat; @@ -1915,7 +1915,7 @@ Sequence ORowSetValue::getSequence() const case DataType::VARCHAR: case DataType::LONGVARCHAR: { - ::rtl::OUString sVal(m_aValue.m_pString); + OUString sVal(m_aValue.m_pString); aSeq = Sequence(reinterpret_cast(sVal.getStr()),sizeof(sal_Unicode)*sVal.getLength()); } break; @@ -2152,7 +2152,7 @@ namespace detail class SAL_NO_VTABLE IValueSource { public: - virtual ::rtl::OUString getString() const = 0; + virtual OUString getString() const = 0; virtual bool getBoolean() const = 0; virtual sal_Int8 getByte() const = 0; virtual sal_Int16 getShort() const = 0; @@ -2184,7 +2184,7 @@ namespace detail } // IValueSource - virtual ::rtl::OUString getString() const { return m_xRow->getString( m_nPos ); }; + virtual OUString getString() const { return m_xRow->getString( m_nPos ); }; virtual bool getBoolean() const { return m_xRow->getBoolean( m_nPos ); }; virtual sal_Int8 getByte() const { return m_xRow->getByte( m_nPos ); }; virtual sal_Int16 getShort() const { return m_xRow->getShort( m_nPos ); } @@ -2217,7 +2217,7 @@ namespace detail } // IValueSource - virtual ::rtl::OUString getString() const { return m_xColumn->getString(); }; + virtual OUString getString() const { return m_xColumn->getString(); }; virtual bool getBoolean() const { return m_xColumn->getBoolean(); }; virtual sal_Int8 getByte() const { return m_xColumn->getByte(); }; virtual sal_Int16 getShort() const { return m_xColumn->getShort(); } @@ -2372,12 +2372,12 @@ void ORowSetValue::fill(const Any& _rValue) { sal_Unicode aDummy(0); _rValue >>= aDummy; - (*this) = ::rtl::OUString(aDummy); + (*this) = OUString(aDummy); break; } case TypeClass_STRING: { - ::rtl::OUString sDummy; + OUString sDummy; _rValue >>= sDummy; (*this) = sDummy; break; diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx index aa487606b5d0..15ad7c9ad9ea 100644 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ b/connectivity/source/commontools/ParamterSubstitution.cxx @@ -35,32 +35,32 @@ namespace connectivity ::osl::MutexGuard aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); uno::Reference< sdbc::XConnection > xConnection; - xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString("ActiveConnection"),xConnection); + xConnection = aArgs.getUnpackedValueOrDefault(OUString("ActiveConnection"),xConnection); m_xConnection = xConnection; } //------------------------------------------------------------------------------ - rtl::OUString ParameterSubstitution::getImplementationName_Static( ) throw(RuntimeException) + OUString ParameterSubstitution::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution"); + return OUString("org.openoffice.comp.helper.ParameterSubstitution"); } //------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ParameterSubstitution::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL ParameterSubstitution::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ - sal_Bool SAL_CALL ParameterSubstitution::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; return pSupported != pEnd; } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -78,17 +78,17 @@ namespace connectivity return *(new ParameterSubstitution(_xContext)); } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ParameterSubstitution::substituteVariables( const ::rtl::OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sRet = _sText; + OUString sRet = _sText; uno::Reference< sdbc::XConnection > xConnection = m_xConnection; if ( xConnection.is() ) { try { OSQLParser aParser( m_xContext ); - ::rtl::OUString sErrorMessage; - ::rtl::OUString sNewSql; + OUString sErrorMessage; + OUString sNewSql; OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sText); if(pNode) { // special handling for parameters @@ -105,12 +105,12 @@ namespace connectivity return sRet; } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const ::rtl::OUString& _sText ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) throw (::com::sun::star::uno::RuntimeException) { return _sText; } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const ::rtl::OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) { throw container::NoSuchElementException(); } diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index 95c280befd20..9f1c7c2ed1a6 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -177,7 +177,7 @@ public: } void operator()( StringIteratorT rFirst,StringIteratorT rSecond) const { - rtl::OUString sVal( rFirst, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); + OUString sVal( rFirst, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new ConstantValueExpression( new ORowSetValueDecorator( sVal ) ) ) ); } }; @@ -199,7 +199,7 @@ public: } void operator()( StringIteratorT rFirst,StringIteratorT rSecond) const { - rtl::OUString sVal( rFirst, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); + OUString sVal( rFirst, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); (void)sVal; } }; @@ -443,13 +443,13 @@ const ParserContextSharedPtr& getParserContext() #endif } -ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& _sFunction) +ExpressionNodeSharedPtr FunctionParser::parseFunction( const OUString& _sFunction) { // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiFunction( - rtl::OUStringToOString( _sFunction, RTL_TEXTENCODING_ASCII_US ) ); + const OString& rAsciiFunction( + OUStringToOString( _sFunction, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiFunction.getStr() ); StringIteratorT aEnd( rAsciiFunction.getStr()+rAsciiFunction.getLength() ); diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 8f68406813c3..8d97941e869f 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -76,7 +76,7 @@ OColumnsHelper::~OColumnsHelper() } // ----------------------------------------------------------------------------- -sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OColumnsHelper::createObject(const OUString& _rName) { OSL_ENSURE(m_pTable,"NO Table set. Error!"); Reference xConnection = m_pTable->getConnection(); @@ -92,8 +92,8 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) ColumnInformationMap::iterator aFind = m_pImpl->m_aColumnInfo.find(_rName); if ( aFind == m_pImpl->m_aColumnInfo.end() ) // we have to fill it { - ::rtl::OUString sComposedName = ::dbtools::composeTableNameForSelect( xConnection, m_pTable ); - collectColumnInformation(xConnection,sComposedName,::rtl::OUString("*") ,m_pImpl->m_aColumnInfo); + OUString sComposedName = ::dbtools::composeTableNameForSelect( xConnection, m_pTable ); + collectColumnInformation(xConnection,sComposedName,OUString("*") ,m_pImpl->m_aColumnInfo); aFind = m_pImpl->m_aColumnInfo.find(_rName); } if ( aFind != m_pImpl->m_aColumnInfo.end() ) @@ -116,7 +116,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) nField11 = ColumnValue::NO_NULLS; } // if ( xKeys.is() ) ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUString aCatalog, aSchema, aTable; + OUString aCatalog, aSchema, aTable; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= aCatalog; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; @@ -169,7 +169,7 @@ Reference< XPropertySet > OColumnsHelper::createDescriptor() } // ----------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OColumnsHelper::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_rMutex); OSL_ENSURE(m_pTable,"OColumnsHelper::appendByDescriptor: Table is null!"); @@ -177,10 +177,10 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName return cloneDescriptor( descriptor ); Reference xMetaData = m_pTable->getConnection()->getMetaData(); - ::rtl::OUString aSql( "ALTER TABLE " ); + OUString aSql( "ALTER TABLE " ); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); - aSql += ::rtl::OUString(" ADD "); + aSql += OUString(" ADD "); aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern()); Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); @@ -193,17 +193,17 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName } // ------------------------------------------------------------------------- // XDrop -void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) +void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { OSL_ENSURE(m_pTable,"OColumnsHelper::dropByName: Table is null!"); if ( m_pTable && !m_pTable->isNew() ) { - ::rtl::OUString aSql( "ALTER TABLE " ); + OUString aSql( "ALTER TABLE " ); Reference xMetaData = m_pTable->getConnection()->getMetaData(); - ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); + OUString aQuote = xMetaData->getIdentifierQuoteString( ); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); - aSql += ::rtl::OUString(" DROP "); + aSql += OUString(" DROP "); aSql += ::dbtools::quoteName( aQuote,_sElementName); Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx index d8b57472b017..dd1a60cf9bad 100644 --- a/connectivity/source/commontools/TConnection.cxx +++ b/connectivity/source/commontools/TConnection.cxx @@ -86,7 +86,7 @@ Sequence< sal_Int8 > OMetaConnection::getUnoTunnelImplementationId() // ----------------------------------------------------------------------------- void OMetaConnection::throwGenericSQLException( sal_uInt16 _nErrorResourceId,const Reference< XInterface>& _xContext ) { - ::rtl::OUString sErrorMessage; + OUString sErrorMessage; if ( _nErrorResourceId ) sErrorMessage = m_aResources.getResourceString( _nErrorResourceId ); Reference< XInterface> xContext = _xContext; diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx index 210b642faac3..9918cf15839a 100644 --- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx +++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx @@ -39,8 +39,8 @@ using namespace connectivity; ODatabaseMetaDataBase::ODatabaseMetaDataBase(const Reference< XConnection >& _rxConnection,const Sequence< PropertyValue >& _rInfo) : m_aConnectionInfo(_rInfo) ,m_isCatalogAtStart(false,sal_False) - ,m_sCatalogSeparator(false,::rtl::OUString()) - ,m_sIdentifierQuoteString(false,::rtl::OUString()) + ,m_sCatalogSeparator(false,OUString()) + ,m_sIdentifierQuoteString(false,OUString()) ,m_supportsCatalogsInTableDefinitions(false,sal_False) ,m_supportsSchemasInTableDefinitions(false,sal_False) ,m_supportsCatalogsInDataManipulation(false,sal_False) @@ -90,7 +90,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ Reference< XRow > xRow(xRet,UNO_QUERY); ::comphelper::SequenceAsHashMap aMap(m_aConnectionInfo); Sequence< Any > aTypeInfoSettings; - aTypeInfoSettings = aMap.getUnpackedValueOrDefault(::rtl::OUString("TypeInfoSettings"),aTypeInfoSettings); + aTypeInfoSettings = aMap.getUnpackedValueOrDefault(OUString("TypeInfoSettings"),aTypeInfoSettings); if ( xRow.is() ) { @@ -127,7 +127,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ catch(ParseError&) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_FORMULA_WRONG)); + const OUString sError( aResources.getResourceString(STR_FORMULA_WRONG)); ::dbtools::throwGenericSQLException(sError,*this); } } @@ -169,41 +169,41 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getExportedKeys( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getImportedKeys( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getPrimaryKeys( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getIndexInfo( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/, + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/, sal_Bool /*unique*/, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getBestRowIdentifier( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/, sal_Int32 /*scope*/, + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/, sal_Int32 /*scope*/, sal_Bool /*nullable*/ ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCrossReference( - const Any& /*primaryCatalog*/, const ::rtl::OUString& /*primarySchema*/, - const ::rtl::OUString& /*primaryTable*/, const Any& /*foreignCatalog*/, - const ::rtl::OUString& /*foreignSchema*/, const ::rtl::OUString& /*foreignTable*/ ) throw(SQLException, RuntimeException) + const Any& /*primaryCatalog*/, const OUString& /*primarySchema*/, + const OUString& /*primaryTable*/, const Any& /*foreignCatalog*/, + const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/ ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } @@ -214,21 +214,21 @@ Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection( ) throw } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedureColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, - const ::rtl::OUString& /*procedureNamePattern*/, const ::rtl::OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, + const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedures( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, - const ::rtl::OUString& /*procedureNamePattern*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, + const OUString& /*procedureNamePattern*/ ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getVersionColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns ); } @@ -239,14 +239,14 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas( ) throw(SQL } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getColumnPrivileges( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/, - const ::rtl::OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/, + const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTablePrivileges( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } @@ -256,9 +256,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs( ) throw(SQ return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs ); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) { - return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< ::rtl::OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw)); + return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw)); } // ----------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( ) throw(SQLException, RuntimeException) @@ -266,9 +266,9 @@ sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( ) throw(SQLException return callImplMethod(m_isCatalogAtStart,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw)); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( ) throw(SQLException, RuntimeException) { - return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< ::rtl::OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw)); + return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw)); } // ----------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx index 9beb8007a7ab..b63dd4699dca 100644 --- a/connectivity/source/commontools/TIndex.cxx +++ b/connectivity/source/commontools/TIndex.cxx @@ -36,13 +36,13 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex , m_pTable(_pTable) { construct(); - ::std::vector< ::rtl::OUString> aVector; + ::std::vector< OUString> aVector; m_pColumns = new OIndexColumns(this,m_aMutex,aVector); } // ------------------------------------------------------------------------- OIndexHelper::OIndexHelper( OTableHelper* _pTable, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Catalog, + const OUString& _Name, + const OUString& _Catalog, sal_Bool _isUnique, sal_Bool _isPrimaryKeyIndex, sal_Bool _isClustered @@ -63,11 +63,11 @@ void OIndexHelper::refreshColumns() if ( !m_pTable ) return; - ::std::vector< ::rtl::OUString> aVector; + ::std::vector< OUString> aVector; if ( !isNew() ) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUString aSchema,aTable; + OUString aSchema,aTable; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; @@ -78,7 +78,7 @@ void OIndexHelper::refreshColumns() if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aColName; + OUString aColName; while( xResult->next() ) { if ( xRow->getString(6) == m_Name ) diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index eb04b27eb391..93a395acc53c 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.cxx @@ -38,16 +38,16 @@ using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- OIndexColumns::OIndexColumns( OIndexHelper* _pIndex, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector) + const ::std::vector< OUString> &_rVector) : connectivity::sdbcx::OCollection(*_pIndex,sal_True,_rMutex,_rVector) ,m_pIndex(_pIndex) { } // ------------------------------------------------------------------------- -sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OIndexColumns::createObject(const OUString& _rName) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUString aCatalog, aSchema, aTable; + OUString aCatalog, aSchema, aTable; ::com::sun::star::uno::Any Catalog(m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME))); Catalog >>= aCatalog; m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; @@ -60,7 +60,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aD("D"); + OUString aD("D"); while( xResult->next() ) { if(xRow->getString(9) == _rName) @@ -80,11 +80,11 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) if ( xRow->getString(4) == _rName ) { sal_Int32 nDataType = xRow->getInt(5); - ::rtl::OUString aTypeName(xRow->getString(6)); + OUString aTypeName(xRow->getString(6)); sal_Int32 nSize = xRow->getInt(7); sal_Int32 nDec = xRow->getInt(9); sal_Int32 nNull = xRow->getInt(11); - ::rtl::OUString aColumnDef(xRow->getString(13)); + OUString aColumnDef(xRow->getString(13)); OIndexColumn* pRet = new OIndexColumn(bAsc, _rName, diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index d1db21506511..6c89a81b3458 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -40,7 +40,7 @@ using namespace cppu; // ----------------------------------------------------------------------------- OIndexesHelper::OIndexesHelper(OTableHelper* _pTable, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ) : OCollection(*_pTable,sal_True,_rMutex,_rVector) ,m_pTable(_pTable) @@ -48,14 +48,14 @@ OIndexesHelper::OIndexesHelper(OTableHelper* _pTable, } // ----------------------------------------------------------------------------- -sdbcx::ObjectType OIndexesHelper::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OIndexesHelper::createObject(const OUString& _rName) { Reference< XConnection> xConnection = m_pTable->getConnection(); if ( !xConnection.is() ) return NULL; sdbcx::ObjectType xRet; - ::rtl::OUString aName,aQualifier; + OUString aName,aQualifier; sal_Int32 nLen = _rName.indexOf('.'); if ( nLen != -1 ) { @@ -66,7 +66,7 @@ sdbcx::ObjectType OIndexesHelper::createObject(const ::rtl::OUString& _rName) aName = _rName; ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUString aSchema,aTable; + OUString aSchema,aTable; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; @@ -121,7 +121,7 @@ Reference< XPropertySet > OIndexesHelper::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { Reference< XConnection> xConnection = m_pTable->getConnection(); if ( !xConnection.is() ) @@ -136,18 +136,18 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName else { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUStringBuffer aSql( ::rtl::OUString("CREATE ")); - ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); - ::rtl::OUString aDot( "." ); + OUStringBuffer aSql( OUString("CREATE ")); + OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); + OUString aDot( "." ); if(comphelper::getBOOL(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISUNIQUE)))) aSql.appendAscii("UNIQUE "); aSql.appendAscii("INDEX "); - ::rtl::OUString aCatalog,aSchema,aTable; + OUString aCatalog,aSchema,aTable; dbtools::qualifiedNameComponents(m_pTable->getMetaData(),m_pTable->getName(),aCatalog,aSchema,aTable,::dbtools::eInDataManipulation); - ::rtl::OUString aComposedName; + OUString aComposedName; aComposedName = dbtools::composeTableName(m_pTable->getMetaData(),aCatalog,aSchema,aTable,sal_True,::dbtools::eInIndexDefinitions); if (!_rForName.isEmpty() ) @@ -199,7 +199,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); if ( xStmt.is() ) { - ::rtl::OUString sSql = aSql.makeStringAndClear(); + OUString sSql = aSql.makeStringAndClear(); xStmt->execute(sSql); ::comphelper::disposeComponent(xStmt); } @@ -209,7 +209,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName } // ------------------------------------------------------------------------- // XDrop -void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) +void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { Reference< XConnection> xConnection = m_pTable->getConnection(); if( xConnection.is() && !m_pTable->isNew()) @@ -220,20 +220,20 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem } else { - ::rtl::OUString aName,aSchema; + OUString aName,aSchema; sal_Int32 nLen = _sElementName.indexOf('.'); if(nLen != -1) aSchema = _sElementName.copy(0,nLen); aName = _sElementName.copy(nLen+1); - ::rtl::OUString aSql( "DROP INDEX " ); + OUString aSql( "DROP INDEX " ); - ::rtl::OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true ); - ::rtl::OUString sIndexName,sTemp; + OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true ); + OUString sIndexName,sTemp; sIndexName = dbtools::composeTableName( m_pTable->getMetaData(), sTemp, aSchema, aName, sal_True, ::dbtools::eInIndexDefinitions ); aSql += sIndexName - + ::rtl::OUString(" ON ") + + OUString(" ON ") + aComposedName; Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx index 0eac87020541..b09b5fee1b40 100644 --- a/connectivity/source/commontools/TKey.cxx +++ b/connectivity/source/commontools/TKey.cxx @@ -38,7 +38,7 @@ OTableKeyHelper::OTableKeyHelper(OTableHelper* _pTable) : connectivity::sdbcx::O } // ------------------------------------------------------------------------- OTableKeyHelper::OTableKeyHelper( OTableHelper* _pTable - ,const ::rtl::OUString& _Name + ,const OUString& _Name ,const sdbcx::TKeyProperties& _rProps ) : connectivity::sdbcx::OKey(_Name,_rProps,sal_True) ,m_pTable(_pTable) @@ -52,14 +52,14 @@ void OTableKeyHelper::refreshColumns() if ( !m_pTable ) return; - ::std::vector< ::rtl::OUString> aVector; + ::std::vector< OUString> aVector; if ( !isNew() ) { aVector = m_aProps->m_aKeyColumnNames; if ( aVector.empty() ) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUString aSchema,aTable; + OUString aSchema,aTable; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; @@ -74,7 +74,7 @@ void OTableKeyHelper::refreshColumns() Reference< XRow > xRow(xResult,UNO_QUERY); while( xResult->next() ) { - ::rtl::OUString aForeignKeyColumn = xRow->getString(8); + OUString aForeignKeyColumn = xRow->getString(8); if(xRow->getString(12) == m_Name) aVector.push_back(aForeignKeyColumn); } diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index bb5a36a38f2a..9325b080fee5 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.cxx @@ -39,16 +39,16 @@ using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- OKeyColumnsHelper::OKeyColumnsHelper( OTableKeyHelper* _pKey, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector) + const ::std::vector< OUString> &_rVector) : connectivity::sdbcx::OCollection(*_pKey,sal_True,_rMutex,_rVector) ,m_pKey(_pKey) { } // ------------------------------------------------------------------------- -sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OKeyColumnsHelper::createObject(const OUString& _rName) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUString aCatalog, aSchema, aTable; + OUString aCatalog, aSchema, aTable; ::com::sun::star::uno::Any Catalog(m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME))); Catalog >>= aCatalog; m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; @@ -58,11 +58,11 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName) Reference< XResultSet > xResult = m_pKey->getTable()->getMetaData()->getImportedKeys( Catalog, aSchema, aTable); - ::rtl::OUString aRefColumnName; + OUString aRefColumnName; if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aTemp; + OUString aTemp; while(xResult->next()) { aTemp = xRow->getString(4); @@ -87,11 +87,11 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName) if ( xRow->getString(4) == _rName ) { sal_Int32 nDataType = xRow->getInt(5); - ::rtl::OUString aTypeName(xRow->getString(6)); + OUString aTypeName(xRow->getString(6)); sal_Int32 nSize = xRow->getInt(7); sal_Int32 nDec = xRow->getInt(9); sal_Int32 nNull = xRow->getInt(11); - ::rtl::OUString sColumnDef; + OUString sColumnDef; try { sColumnDef = xRow->getString(13); diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 1c8b6490ab02..7466d5b3513d 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -51,7 +51,7 @@ OKeysHelper::OKeysHelper( OTableHelper* _pTable, { } // ------------------------------------------------------------------------- -sdbcx::ObjectType OKeysHelper::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName) { sdbcx::ObjectType xRet = NULL; @@ -82,7 +82,7 @@ Reference< XPropertySet > OKeysHelper::createDescriptor() // ----------------------------------------------------------------------------- /** returns the keyrule string for the primary key */ -::rtl::OUString getKeyRuleString(sal_Bool _bUpdate,sal_Int32 _nKeyRule) +OUString getKeyRuleString(sal_Bool _bUpdate,sal_Int32 _nKeyRule) { const char* pKeyRule = NULL; switch ( _nKeyRule ) @@ -102,9 +102,9 @@ Reference< XPropertySet > OKeysHelper::createDescriptor() default: ; } - ::rtl::OUString sRet; + OUString sRet; if ( pKeyRule ) - sRet = ::rtl::OUString::createFromAscii(pKeyRule); + sRet = OUString::createFromAscii(pKeyRule); return sRet; } // ------------------------------------------------------------------------- @@ -125,7 +125,7 @@ void OKeysHelper::cloneDescriptorColumns( const sdbcx::ObjectType& _rSourceDescr } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { Reference< XConnection> xConnection = m_pTable->getConnection(); if ( !xConnection.is() ) @@ -140,7 +140,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c const ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); sal_Int32 nKeyType = getINT32(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))); sal_Int32 nUpdateRule = 0, nDeleteRule = 0; - ::rtl::OUString sReferencedName; + OUString sReferencedName; if ( nKeyType == KeyType::FOREIGN ) { @@ -157,9 +157,9 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c { // if we're here, we belong to a table which is not new, i.e. already exists in the database. // In this case, really append the new index. - ::rtl::OUStringBuffer aSql; + OUStringBuffer aSql; aSql.appendAscii("ALTER TABLE "); - ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( ); + OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( ); aSql.append(composeTableName( m_pTable->getConnection()->getMetaData(), m_pTable, ::dbtools::eInTableDefinitions, false, false, true )); aSql.appendAscii(" ADD "); @@ -211,10 +211,10 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c xStmt->execute(aSql.makeStringAndClear()); } // find the name which the database gave the new key - ::rtl::OUString sNewName( _rForName ); + OUString sNewName( _rForName ); try { - ::rtl::OUString aSchema,aTable; + OUString aSchema,aTable; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; Reference< XResultSet > xResult; @@ -235,7 +235,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c Reference< XRow > xRow(xResult,UNO_QUERY); while( xResult->next() ) { - ::rtl::OUString sName = xRow->getString(nColumn); + OUString sName = xRow->getString(nColumn); if ( !m_pElements->exists(sName) ) // this name wasn't inserted yet so it must be te new one { descriptor->setPropertyValue( rPropMap.getNameByIndex( PROPERTY_ID_NAME ), makeAny( sName ) ); @@ -255,13 +255,13 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c return createObject( sNewName ); } // ----------------------------------------------------------------------------- -::rtl::OUString OKeysHelper::getDropForeignKey() const +OUString OKeysHelper::getDropForeignKey() const { - return ::rtl::OUString(" DROP CONSTRAINT "); + return OUString(" DROP CONSTRAINT "); } // ------------------------------------------------------------------------- // XDrop -void OKeysHelper::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OKeysHelper::dropObject(sal_Int32 _nPos,const OUString _sElementName) { Reference< XConnection> xConnection = m_pTable->getConnection(); if ( xConnection.is() && !m_pTable->isNew() ) @@ -273,7 +273,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName } else { - ::rtl::OUStringBuffer aSql; + OUStringBuffer aSql; aSql.appendAscii("ALTER TABLE "); aSql.append( composeTableName( m_pTable->getConnection()->getMetaData(), m_pTable,::dbtools::eInTableDefinitions, false, false, true )); @@ -291,7 +291,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName else { aSql.append(getDropForeignKey()); - const ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(); + const OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(); aSql.append( ::dbtools::quoteName( aQuote,_sElementName) ); } diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx index 3aec1f8aa7c6..c26a61eec22f 100644 --- a/connectivity/source/commontools/TPrivilegesResultSet.cxx +++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx @@ -30,14 +30,14 @@ using namespace ::com::sun::star::lang; //------------------------------------------------------------------------------ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& _rxMeta , const Any& catalog - , const ::rtl::OUString& schemaPattern - , const ::rtl::OUString& tableNamePattern) + , const OUString& schemaPattern + , const OUString& tableNamePattern) : ODatabaseMetaDataResultSet(eTablePrivileges) , m_bResetValues(sal_True) { osl_atomic_increment( &m_refCount ); { - ::rtl::OUString sUserWorkingFor; + OUString sUserWorkingFor; Sequence< OUString > sTableTypes(3); // we want all catalogues, all schemas, all tables sTableTypes[0] = "VIEW"; @@ -58,7 +58,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& static ODatabaseMetaDataResultSet::ORow aRow(8); aRow[5] = new ORowSetValueDecorator(sUserWorkingFor); aRow[6] = ODatabaseMetaDataResultSet::getSelectValue(); - aRow[7] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[7] = new ORowSetValueDecorator(OUString("YES")); aRows.push_back(aRow); aRow[6] = ODatabaseMetaDataResultSet::getInsertValue(); aRows.push_back(aRow); @@ -74,7 +74,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& aRows.push_back(aRow); aRow[6] = ODatabaseMetaDataResultSet::getDropValue(); aRows.push_back(aRow); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("REFERENCE")); + aRow[6] = new ORowSetValueDecorator(OUString("REFERENCE")); aRows.push_back(aRow); setRows(aRows); diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index e17eaa5a013c..8442a2619930 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -53,7 +53,7 @@ typedef ::cppu::WeakImplHelper1 < XContainerListener > OTableContainerListener_B class OTableContainerListener : public OTableContainerListener_BASE { OTableHelper* m_pComponent; - ::std::map< ::rtl::OUString,bool> m_aRefNames; + ::std::map< OUString,bool> m_aRefNames; OTableContainerListener(const OTableContainerListener&); void operator =(const OTableContainerListener&); @@ -66,14 +66,14 @@ public: } virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException) { - ::rtl::OUString sName; + OUString sName; Event.Accessor >>= sName; if ( m_aRefNames.find(sName) != m_aRefNames.end() ) m_pComponent->refreshKeys(); } virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException) { - ::rtl::OUString sOldComposedName,sNewComposedName; + OUString sOldComposedName,sNewComposedName; Event.ReplacedElement >>= sOldComposedName; Event.Accessor >>= sNewComposedName; if ( sOldComposedName != sNewComposedName && m_aRefNames.find(sOldComposedName) != m_aRefNames.end() ) @@ -84,14 +84,14 @@ public: { } void clear() { m_pComponent = NULL; } - inline void add(const ::rtl::OUString& _sRefName) { m_aRefNames.insert(::std::map< ::rtl::OUString,bool>::value_type(_sRefName,true)); } + inline void add(const OUString& _sRefName) { m_aRefNames.insert(::std::map< OUString,bool>::value_type(_sRefName,true)); } }; } namespace connectivity { - ::rtl::OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::rtl::OUString& i_sSetting) + OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& i_sSetting) { - ::rtl::OUString sSupportService; + OUString sSupportService; Any aValue; if ( ::dbtools::getDataSourceSetting(_xConnection,i_sSetting,aValue) ) { @@ -122,13 +122,13 @@ namespace connectivity Reference xFac(_xConnection,UNO_QUERY); if ( xFac.is() ) { - static const ::rtl::OUString s_sTableRename("TableRenameServiceName"); + static const OUString s_sTableRename("TableRenameServiceName"); m_xRename.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableRename)),UNO_QUERY); - static const ::rtl::OUString s_sTableAlteration("TableAlterationServiceName"); + static const OUString s_sTableAlteration("TableAlterationServiceName"); m_xAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableAlteration)),UNO_QUERY); - static const ::rtl::OUString s_sKeyAlteration("KeyAlterationServiceName"); + static const OUString s_sKeyAlteration("KeyAlterationServiceName"); m_xKeyAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sKeyAlteration)),UNO_QUERY); - static const ::rtl::OUString s_sIndexAlteration("IndexAlterationServiceName"); + static const OUString s_sIndexAlteration("IndexAlterationServiceName"); m_xIndexAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sIndexAlteration)),UNO_QUERY); } } @@ -150,11 +150,11 @@ OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, sal_Bool _bCase, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName ) : OTable_TYPEDEF(_pTables, _bCase, _Name, @@ -194,17 +194,17 @@ namespace void lcl_collectColumnDescs_throw( const Reference< XResultSet >& _rxResult, ::std::vector< ColumnDesc >& _out_rColumns ) { Reference< XRow > xRow( _rxResult, UNO_QUERY_THROW ); - ::rtl::OUString sName; + OUString sName; OrdinalPosition nOrdinalPosition( 0 ); while ( _rxResult->next() ) { sName = xRow->getString( 4 ); // COLUMN_NAME sal_Int32 nField5 = xRow->getInt(5); - ::rtl::OUString aField6 = xRow->getString(6); + OUString aField6 = xRow->getString(6); sal_Int32 nField7 = xRow->getInt(7) , nField9 = xRow->getInt(9) , nField11= xRow->getInt(11); - ::rtl::OUString sField12 = xRow->getString(12) + OUString sField12 = xRow->getString(12) ,sField13 = xRow->getString(13); nOrdinalPosition = xRow->getInt( 17 ); // ORDINAL_POSITION _out_rColumns.push_back( ColumnDesc( sName,nField5,aField6,nField7,nField9,nField11,sField12,sField13, nOrdinalPosition ) ); @@ -272,7 +272,7 @@ void OTableHelper::refreshColumns() aCatalog, m_SchemaName, m_Name, - ::rtl::OUString("%") + OUString("%") ) ); // collect the column names, together with their ordinal position @@ -283,7 +283,7 @@ void OTableHelper::refreshColumns() lcl_sanitizeColumnDescs( m_pImpl->m_aColumnDesc ); // sort by ordinal position - ::std::map< OrdinalPosition, ::rtl::OUString > aSortedColumns; + ::std::map< OrdinalPosition, OUString > aSortedColumns; for ( ::std::vector< ColumnDesc >::const_iterator copy = m_pImpl->m_aColumnDesc.begin(); copy != m_pImpl->m_aColumnDesc.end(); ++copy @@ -295,7 +295,7 @@ void OTableHelper::refreshColumns() aSortedColumns.begin(), aSortedColumns.end(), ::std::insert_iterator< TStringVector >( aVector, aVector.begin() ), - ::o3tl::select2nd< ::std::map< OrdinalPosition, ::rtl::OUString >::value_type >() + ::o3tl::select2nd< ::std::map< OrdinalPosition, OUString >::value_type >() ); } @@ -305,7 +305,7 @@ void OTableHelper::refreshColumns() m_pColumns = createColumns(aVector); } // ----------------------------------------------------------------------------- -const ColumnDesc* OTableHelper::getColumnDescription(const ::rtl::OUString& _sName) const +const ColumnDesc* OTableHelper::getColumnDescription(const OUString& _sName) const { const ColumnDesc* pRet = NULL; ::std::vector< ColumnDesc >::const_iterator aEnd = m_pImpl->m_aColumnDesc.end(); @@ -329,8 +329,8 @@ void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames) if ( xResult.is() ) { - sdbcx::TKeyProperties pKeyProps(new sdbcx::KeyProperties(::rtl::OUString(),KeyType::PRIMARY,0,0)); - ::rtl::OUString aPkName; + sdbcx::TKeyProperties pKeyProps(new sdbcx::KeyProperties(OUString(),KeyType::PRIMARY,0,0)); + OUString aPkName; bool bAlreadyFetched = false; const Reference< XRow > xRow(xResult,UNO_QUERY); while ( xResult->next() ) @@ -360,20 +360,20 @@ void OTableHelper::refreshForeignKeys(TStringVector& _rNames) if ( xRow.is() ) { sdbcx::TKeyProperties pKeyProps; - ::rtl::OUString aName,sCatalog,aSchema,sOldFKName; + OUString aName,sCatalog,aSchema,sOldFKName; while( xResult->next() ) { // this must be outsid the "if" because we have to call in a right order sCatalog = xRow->getString(1); if ( xRow->wasNull() ) - sCatalog = ::rtl::OUString(); + sCatalog = OUString(); aSchema = xRow->getString(2); aName = xRow->getString(3); - const ::rtl::OUString sForeignKeyColumn = xRow->getString(8); + const OUString sForeignKeyColumn = xRow->getString(8); const sal_Int32 nUpdateRule = xRow->getInt(10); const sal_Int32 nDeleteRule = xRow->getInt(11); - const ::rtl::OUString sFkName = xRow->getString(12); + const OUString sFkName = xRow->getString(12); if ( pKeyProps.get() ) { @@ -387,7 +387,7 @@ void OTableHelper::refreshForeignKeys(TStringVector& _rNames) if ( pKeyProps.get() ) m_pImpl->m_aKeys.insert(TKeyMap::value_type(sOldFKName,pKeyProps)); - const ::rtl::OUString sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,sal_False,::dbtools::eInDataManipulation); + const OUString sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,sal_False,::dbtools::eInDataManipulation); pKeyProps.reset(new sdbcx::KeyProperties(sReferencedName,KeyType::FOREIGN,nUpdateRule,nDeleteRule)); pKeyProps->m_aKeyColumnNames.push_back(sForeignKeyColumn); _rNames.push_back(sFkName); @@ -446,9 +446,9 @@ void OTableHelper::refreshIndexes() if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aName; - ::rtl::OUString sCatalogSep = getMetaData()->getCatalogSeparator(); - ::rtl::OUString sPreviousRoundName; + OUString aName; + OUString sCatalogSep = getMetaData()->getCatalogSeparator(); + OUString sPreviousRoundName; while( xResult->next() ) { aName = xRow->getString(5); @@ -473,19 +473,19 @@ void OTableHelper::refreshIndexes() m_pIndexes = createIndexes(aVector); } // ----------------------------------------------------------------------------- -::rtl::OUString OTableHelper::getRenameStart() const +OUString OTableHelper::getRenameStart() const { - ::rtl::OUString sSql("RENAME "); - if ( m_Type == ::rtl::OUString("VIEW") ) - sSql += ::rtl::OUString(" VIEW "); + OUString sSql("RENAME "); + if ( m_Type == OUString("VIEW") ) + sSql += OUString(" VIEW "); else - sSql += ::rtl::OUString(" TABLE "); + sSql += OUString(" TABLE "); return sSql; } // ------------------------------------------------------------------------- // XRename -void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -504,15 +504,15 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx } else { - ::rtl::OUString sSql = getRenameStart(); + OUString sSql = getRenameStart(); - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(getMetaData(),newName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sComposedName; + OUString sComposedName; sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_True,::dbtools::eInDataManipulation); sSql += sComposedName - + ::rtl::OUString(" TO "); + + OUString(" TO "); sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sal_True,::dbtools::eInDataManipulation); sSql += sComposedName; @@ -552,9 +552,9 @@ void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OTableHelper::getName() throw(RuntimeException) +OUString SAL_CALL OTableHelper::getName() throw(RuntimeException) { - ::rtl::OUString sComposedName; + OUString sComposedName; sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_False,::dbtools::eInDataManipulation); return sComposedName; } @@ -569,7 +569,7 @@ void SAL_CALL OTableHelper::release() throw() OTable_TYPEDEF::release(); } // ----------------------------------------------------------------------------- -sdbcx::TKeyProperties OTableHelper::getKeyProperties(const ::rtl::OUString& _sName) const +sdbcx::TKeyProperties OTableHelper::getKeyProperties(const OUString& _sName) const { sdbcx::TKeyProperties pKeyProps; TKeyMap::const_iterator aFind = m_pImpl->m_aKeys.find(_sName); @@ -586,14 +586,14 @@ sdbcx::TKeyProperties OTableHelper::getKeyProperties(const ::rtl::OUString& _sNa return pKeyProps; } // ----------------------------------------------------------------------------- -void OTableHelper::addKey(const ::rtl::OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties) +void OTableHelper::addKey(const OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties) { m_pImpl->m_aKeys.insert(TKeyMap::value_type(_sName,_aKeyProperties)); } // ----------------------------------------------------------------------------- -::rtl::OUString OTableHelper::getTypeCreatePattern() const +OUString OTableHelper::getTypeCreatePattern() const { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- Reference< XConnection> OTableHelper::getConnection() const diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index 2da06c8f9179..05e6a448122a 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.cxx @@ -33,9 +33,9 @@ namespace dbtools using namespace ::com::sun::star::lang; //===================================================================== - static const ::rtl::OUString& getActiveConnectionPropertyName() + static const OUString& getActiveConnectionPropertyName() { - static const ::rtl::OUString s_sActiveConnectionPropertyName( "ActiveConnection" ); + static const OUString s_sActiveConnectionPropertyName( "ActiveConnection" ); return s_sActiveConnectionPropertyName; } diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx index 93fac347ed4a..04c9aec71b10 100644 --- a/connectivity/source/commontools/dbcharset.cxx +++ b/connectivity/source/commontools/dbcharset.cxx @@ -99,7 +99,7 @@ namespace dbtools } //------------------------------------------------------------------------- - OCharsetMap::CharsetIterator OCharsetMap::find(const ::rtl::OUString& _rIanaName, const IANA&) const + OCharsetMap::CharsetIterator OCharsetMap::find(const OUString& _rIanaName, const IANA&) const { ensureConstructed( ); @@ -107,7 +107,7 @@ namespace dbtools if ( !_rIanaName.isEmpty() ) { // byte string conversion - ::rtl::OString sMimeByteString( _rIanaName.getStr(), _rIanaName.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString sMimeByteString( _rIanaName.getStr(), _rIanaName.getLength(), RTL_TEXTENCODING_ASCII_US ); // look up eEncoding = rtl_getTextEncodingFromMimeCharset( sMimeByteString.getStr() ); @@ -139,7 +139,7 @@ namespace dbtools } //------------------------------------------------------------------------- - CharsetIteratorDerefHelper:: CharsetIteratorDerefHelper(const rtl_TextEncoding _eEncoding, const ::rtl::OUString& _rIanaName ) + CharsetIteratorDerefHelper:: CharsetIteratorDerefHelper(const rtl_TextEncoding _eEncoding, const OUString& _rIanaName ) :m_eEncoding( _eEncoding ) ,m_aIanaName( _rIanaName ) { @@ -174,14 +174,14 @@ namespace dbtools OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.end(), "OCharsetMap::CharsetIterator::operator*: invalid position!"); rtl_TextEncoding eEncoding = *m_aPos; - ::rtl::OUString sIanaName; + OUString sIanaName; if ( RTL_TEXTENCODING_DONTKNOW != eEncoding ) { // it's not the virtual "system charset" const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( eEncoding ); OSL_ENSURE( pIanaName, "OCharsetMap::CharsetIterator: invalid mime name!" ); if ( pIanaName ) - sIanaName = ::rtl::OUString::createFromAscii( pIanaName ); + sIanaName = OUString::createFromAscii( pIanaName ); } return CharsetIteratorDerefHelper( eEncoding, sIanaName ); } diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index 698ce2e37e18..0af54185befd 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -53,7 +53,7 @@ namespace dbtools return STANDARD_DB_DATE; } //------------------------------------------------------------------------------ - ::rtl::OUString DBTypeConversion::toDateString(const Date& rDate) + OUString DBTypeConversion::toDateString(const Date& rDate) { sal_Char s[11]; snprintf(s, @@ -63,10 +63,10 @@ namespace dbtools (int)rDate.Month, (int)rDate.Day); s[10] = 0; - return ::rtl::OUString::createFromAscii(s); + return OUString::createFromAscii(s); } //------------------------------------------------------------------ - ::rtl::OUString DBTypeConversion::toTimeString(const Time& rTime) + OUString DBTypeConversion::toTimeString(const Time& rTime) { sal_Char s[9]; snprintf(s, @@ -76,14 +76,14 @@ namespace dbtools (int)rTime.Minutes, (int)rTime.Seconds); s[8] = 0; - return ::rtl::OUString::createFromAscii(s); + return OUString::createFromAscii(s); } //------------------------------------------------------------------ - ::rtl::OUString DBTypeConversion::toDateTimeString(const DateTime& _rDateTime) + OUString DBTypeConversion::toDateTimeString(const DateTime& _rDateTime) { Date aDate(_rDateTime.Day,_rDateTime.Month,_rDateTime.Year); - ::rtl::OUStringBuffer aTemp(toDateString(aDate)); + OUStringBuffer aTemp(toDateString(aDate)); aTemp.appendAscii(" "); Time aTime(0,_rDateTime.Seconds,_rDateTime.Minutes,_rDateTime.Hours); aTemp.append( toTimeString(aTime) ); @@ -381,7 +381,7 @@ namespace dbtools return xRet; } //------------------------------------------------------------------------------ - Date DBTypeConversion::toDate(const ::rtl::OUString& _sSQLString) + Date DBTypeConversion::toDate(const OUString& _sSQLString) { // get the token out of a string static sal_Unicode sDateSep = '-'; @@ -402,7 +402,7 @@ namespace dbtools } //----------------------------------------------------------------------------- - DateTime DBTypeConversion::toDateTime(const ::rtl::OUString& _sSQLString) + DateTime DBTypeConversion::toDateTime(const OUString& _sSQLString) { //@see http://java.sun.com/j2se/1.4.2/docs/api/java/sql/Timestamp.html#valueOf(java.lang.String) //@see http://java.sun.com/j2se/1.4.2/docs/api/java/sql/Date.html#valueOf(java.lang.String) @@ -419,7 +419,7 @@ namespace dbtools } //----------------------------------------------------------------------------- - Time DBTypeConversion::toTime(const ::rtl::OUString& _sSQLString) + Time DBTypeConversion::toTime(const OUString& _sSQLString) { static sal_Unicode sTimeSep = ':'; @@ -436,12 +436,12 @@ namespace dbtools { nSecond = (sal_uInt16)_sSQLString.getToken(0,sTimeSep,nIndex).toInt32(); nIndex = 0; - ::rtl::OUString sNano(_sSQLString.getToken(1,'.',nIndex)); + OUString sNano(_sSQLString.getToken(1,'.',nIndex)); if ( !sNano.isEmpty() ) { // our time struct only supports hundredth seconds sNano = sNano.copy(0,::std::min(sNano.getLength(),2)); - const static ::rtl::OUString s_Zeros("00"); + const static OUString s_Zeros("00"); sNano += s_Zeros.copy(0,s_Zeros.getLength() - sNano.getLength()); nHundredthSeconds = static_cast(sNano.toInt32()); } diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index 02ae48c75d83..5dcac1bec49c 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -70,7 +70,7 @@ SQLExceptionInfo::SQLExceptionInfo(const ::com::sun::star::sdb::SQLContext& _rEr } //------------------------------------------------------------------------------ -SQLExceptionInfo::SQLExceptionInfo( const ::rtl::OUString& _rSimpleErrorMessage ) +SQLExceptionInfo::SQLExceptionInfo( const OUString& _rSimpleErrorMessage ) { SQLException aError; aError.Message = _rSimpleErrorMessage; @@ -198,12 +198,12 @@ SQLExceptionInfo::operator const ::com::sun::star::sdb::SQLContext*() const } //------------------------------------------------------------------------------ -void SQLExceptionInfo::prepend( const ::rtl::OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode ) +void SQLExceptionInfo::prepend( const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode ) { SQLException aException; aException.Message = _rErrorMessage; aException.ErrorCode = _nErrorCode; - aException.SQLState = _pAsciiSQLState ? ::rtl::OUString::createFromAscii( _pAsciiSQLState ) : ::rtl::OUString("S1000" ); + aException.SQLState = _pAsciiSQLState ? OUString::createFromAscii( _pAsciiSQLState ) : OUString("S1000" ); aException.NextException = m_aContent; m_aContent <<= aException; @@ -211,7 +211,7 @@ void SQLExceptionInfo::prepend( const ::rtl::OUString& _rErrorMessage, const sal } //------------------------------------------------------------------------------ -void SQLExceptionInfo::append( TYPE _eType, const ::rtl::OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode ) +void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode ) { // create the to-be-appended exception Any aAppend; @@ -227,7 +227,7 @@ void SQLExceptionInfo::append( TYPE _eType, const ::rtl::OUString& _rErrorMessag SQLException* pAppendException( static_cast< SQLException* >( const_cast< void* >( aAppend.getValue() ) ) ); pAppendException->Message = _rErrorMessage; - pAppendException->SQLState = ::rtl::OUString::createFromAscii( _pAsciiSQLState ); + pAppendException->SQLState = OUString::createFromAscii( _pAsciiSQLState ); pAppendException->ErrorCode = _nErrorCode; // find the end of the current chain @@ -386,7 +386,7 @@ void throwInvalidIndexException(const ::com::sun::star::uno::Reference< ::com::s ); } // ----------------------------------------------------------------------------- -void throwFunctionNotSupportedException(const ::rtl::OUString& _rMsg, +void throwFunctionNotSupportedException(const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context, const ::com::sun::star::uno::Any& _Next) throw ( ::com::sun::star::sdbc::SQLException ) { @@ -403,9 +403,9 @@ void throwFunctionNotSupportedException( const sal_Char* _pAsciiFunctionName, co const ::com::sun::star::uno::Any* _pNextException ) throw ( ::com::sun::star::sdbc::SQLException ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_UNSUPPORTED_FUNCTION, - "$functionname$", ::rtl::OUString::createFromAscii( _pAsciiFunctionName ) + "$functionname$", OUString::createFromAscii( _pAsciiFunctionName ) ) ); throwFunctionNotSupportedException( sError, @@ -414,14 +414,14 @@ void throwFunctionNotSupportedException( const sal_Char* _pAsciiFunctionName, co ); } // ----------------------------------------------------------------------------- -void throwGenericSQLException(const ::rtl::OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource) +void throwGenericSQLException(const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource) throw (::com::sun::star::sdbc::SQLException) { throwGenericSQLException(_rMsg, _rxSource, Any()); } // ----------------------------------------------------------------------------- -void throwGenericSQLException(const ::rtl::OUString& _rMsg, const Reference< XInterface >& _rxSource, const Any& _rNextException) +void throwGenericSQLException(const OUString& _rMsg, const Reference< XInterface >& _rxSource, const Any& _rNextException) throw (SQLException) { throw SQLException( _rMsg, _rxSource, getStandardSQLState( SQL_GENERAL_ERROR ), 0, _rNextException); @@ -432,9 +432,9 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co throw (SQLException) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_UNSUPPORTED_FEATURE, - "$featurename$", ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + "$featurename$", OUString::createFromAscii( _pAsciiFeatureName ) ) ); throw SQLException( @@ -451,9 +451,9 @@ void throwSQLException( const sal_Char* _pAsciiMessage, const sal_Char* _pAsciiS const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException ) throw (SQLException) { throw SQLException( - ::rtl::OUString::createFromAscii( _pAsciiMessage ), + OUString::createFromAscii( _pAsciiMessage ), _rxContext, - ::rtl::OUString::createFromAscii( _pAsciiState ), + OUString::createFromAscii( _pAsciiState ), _nErrorCode, _pNextException ? *_pNextException : Any() ); @@ -468,7 +468,7 @@ void throwSQLException( const sal_Char* _pAsciiMessage, StandardSQLState _eSQLSt } // ----------------------------------------------------------------------------- -void throwSQLException( const ::rtl::OUString& _rMessage, StandardSQLState _eSQLState, +void throwSQLException( const OUString& _rMessage, StandardSQLState _eSQLState, const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException ) throw (SQLException) { @@ -518,9 +518,9 @@ const sal_Char* getStandardSQLStateAscii( StandardSQLState _eState ) } // ----------------------------------------------------------------------------- -::rtl::OUString getStandardSQLState( StandardSQLState _eState ) +OUString getStandardSQLState( StandardSQLState _eState ) { - return ::rtl::OUString::createFromAscii( getStandardSQLStateAscii( _eState ) ); + return OUString::createFromAscii( getStandardSQLStateAscii( _eState ) ); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index 35030118ab74..79881a425d73 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.cxx @@ -81,8 +81,8 @@ namespace dbtools Reference< XDatabaseMetaData > xConnectionMetaData; ::connectivity::DriversConfig aDriverConfig; - ::boost::optional< ::rtl::OUString > sCachedIdentifierQuoteString; - ::boost::optional< ::rtl::OUString > sCachedCatalogSeparator; + ::boost::optional< OUString > sCachedIdentifierQuoteString; + ::boost::optional< OUString > sCachedCatalogSeparator; DatabaseMetaData_Impl() :xConnection() @@ -115,7 +115,7 @@ namespace dbtools if ( !_metaDataImpl.xConnection.is() || !_metaDataImpl.xConnectionMetaData.is() ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_NO_CONNECTION_GIVEN)); + const OUString sError( aResources.getResourceString(STR_NO_CONNECTION_GIVEN)); throwSQLException( sError, SQL_CONNECTION_DOES_NOT_EXIST, NULL ); } } @@ -141,10 +141,10 @@ namespace dbtools { Reference< XPropertySet > xDataSource( xConnectionAsChild->getParent(), UNO_QUERY_THROW ); Reference< XPropertySet > xDataSourceSettings( - xDataSource->getPropertyValue( ::rtl::OUString( "Settings" ) ), + xDataSource->getPropertyValue( OUString( "Settings" ) ), UNO_QUERY_THROW ); - _out_setting = xDataSourceSettings->getPropertyValue( ::rtl::OUString::createFromAscii( _asciiName ) ); + _out_setting = xDataSourceSettings->getPropertyValue( OUString::createFromAscii( _asciiName ) ); } else { @@ -163,9 +163,9 @@ namespace dbtools } //................................................................ - static const ::rtl::OUString& lcl_getConnectionStringSetting( - const DatabaseMetaData_Impl& _metaData, ::boost::optional< ::rtl::OUString >& _cachedSetting, - ::rtl::OUString (SAL_CALL XDatabaseMetaData::*_getter)() ) + static const OUString& lcl_getConnectionStringSetting( + const DatabaseMetaData_Impl& _metaData, ::boost::optional< OUString >& _cachedSetting, + OUString (SAL_CALL XDatabaseMetaData::*_getter)() ) { if ( !_cachedSetting ) { @@ -265,13 +265,13 @@ namespace dbtools } //-------------------------------------------------------------------- - const ::rtl::OUString& DatabaseMetaData::getIdentifierQuoteString() const + const OUString& DatabaseMetaData::getIdentifierQuoteString() const { return lcl_getConnectionStringSetting( *m_pImpl, m_pImpl->sCachedIdentifierQuoteString, &XDatabaseMetaData::getIdentifierQuoteString ); } //-------------------------------------------------------------------- - const ::rtl::OUString& DatabaseMetaData::getCatalogSeparator() const + const OUString& DatabaseMetaData::getCatalogSeparator() const { return lcl_getConnectionStringSetting( *m_pImpl, m_pImpl->sCachedCatalogSeparator, &XDatabaseMetaData::getCatalogSeparator ); } @@ -341,7 +341,7 @@ namespace dbtools { if ( !bSupport ) { - const ::rtl::OUString url = m_pImpl->xConnectionMetaData->getURL(); + const OUString url = m_pImpl->xConnectionMetaData->getURL(); char pMySQL[] = "sdbc:mysql"; bSupport = url.matchAsciiL(pMySQL,(sizeof(pMySQL)/sizeof(pMySQL[0]))-1); } @@ -404,7 +404,7 @@ namespace dbtools try { Reference< XDatabaseMetaData > xMeta( m_pImpl->xConnectionMetaData, UNO_SET_THROW ); - ::rtl::OUString sConnectionURL( xMeta->getURL() ); + OUString sConnectionURL( xMeta->getURL() ); doDisplay = sConnectionURL.startsWith( "sdbc:mysql:mysqlc" ); } catch( const Exception& ) @@ -421,7 +421,7 @@ namespace dbtools try { Reference< XDatabaseMetaData > xMeta( m_pImpl->xConnectionMetaData, UNO_SET_THROW ); - ::rtl::OUString sConnectionURL( xMeta->getURL() ); + OUString sConnectionURL( xMeta->getURL() ); bSupported = !sConnectionURL.startsWith( "sdbc:mysql:mysqlc" ); } catch( const Exception& ) diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 8e6513dc7abd..f362bff17be2 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -133,10 +133,10 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn, try { // determine the datatype of the column - _xColumn->getPropertyValue(::rtl::OUString("Type")) >>= nDataType; + _xColumn->getPropertyValue(OUString("Type")) >>= nDataType; if (DataType::NUMERIC == nDataType || DataType::DECIMAL == nDataType) - _xColumn->getPropertyValue(::rtl::OUString("Scale")) >>= nScale; + _xColumn->getPropertyValue(OUString("Scale")) >>= nScale; } catch (Exception&) { @@ -144,7 +144,7 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn, } return getDefaultNumberFormat(nDataType, nScale, - ::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString("IsCurrency"))), + ::cppu::any2bool(_xColumn->getPropertyValue(OUString("IsCurrency"))), _xTypes, _rLocale); } @@ -185,7 +185,7 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, { // generate a new format if necessary Reference< XNumberFormats > xFormats(_xTypes, UNO_QUERY); - ::rtl::OUString sNewFormat = xFormats->generateFormat( 0L, _rLocale, sal_False, sal_False, (sal_Int16)_nScale, sal_True); + OUString sNewFormat = xFormats->generateFormat( 0L, _rLocale, sal_False, sal_False, (sal_Int16)_nScale, sal_True); // and add it to the formatter if necessary nFormat = xFormats->queryKey(sNewFormat, _rLocale, sal_False); @@ -247,7 +247,7 @@ Reference< XConnection> findConnection(const Reference< XInterface >& xParent) //------------------------------------------------------------------------------ Reference< XDataSource> getDataSource_allowException( - const ::rtl::OUString& _rsTitleOrPath, + const OUString& _rsTitleOrPath, const Reference< XComponentContext >& _rxContext ) { ENSURE_OR_RETURN( !_rsTitleOrPath.isEmpty(), "getDataSource_allowException: invalid arg !", NULL ); @@ -259,7 +259,7 @@ Reference< XDataSource> getDataSource_allowException( //------------------------------------------------------------------------------ Reference< XDataSource > getDataSource( - const ::rtl::OUString& _rsTitleOrPath, + const OUString& _rsTitleOrPath, const Reference< XComponentContext >& _rxContext ) { Reference< XDataSource > xDS; @@ -277,9 +277,9 @@ Reference< XDataSource > getDataSource( //------------------------------------------------------------------------------ Reference< XConnection > getConnection_allowException( - const ::rtl::OUString& _rsTitleOrPath, - const ::rtl::OUString& _rsUser, - const ::rtl::OUString& _rsPwd, + const OUString& _rsTitleOrPath, + const OUString& _rsUser, + const OUString& _rsPwd, const Reference< XComponentContext>& _rxContext) { Reference< XDataSource> xDataSource( getDataSource_allowException(_rsTitleOrPath, _rxContext) ); @@ -290,13 +290,13 @@ Reference< XConnection > getConnection_allowException( if(_rsUser.isEmpty() || _rsPwd.isEmpty()) { Reference xProp(xDataSource,UNO_QUERY); - ::rtl::OUString sPwd, sUser; + OUString sPwd, sUser; sal_Bool bPwdReq = sal_False; try { xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd; - bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString("IsPasswordRequired"))); - xProp->getPropertyValue(::rtl::OUString("User")) >>= sUser; + bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(OUString("IsPasswordRequired"))); + xProp->getPropertyValue(OUString("User")) >>= sUser; } catch(Exception&) { @@ -322,8 +322,8 @@ Reference< XConnection > getConnection_allowException( } //------------------------------------------------------------------------------ -Reference< XConnection> getConnection_withFeedback(const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, const Reference< XComponentContext>& _rxContext) +Reference< XConnection> getConnection_withFeedback(const OUString& _rDataSourceName, + const OUString& _rUser, const OUString& _rPwd, const Reference< XComponentContext>& _rxContext) SAL_THROW ( (SQLException) ) { Reference< XConnection > xReturn; @@ -349,7 +349,7 @@ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) thro Reference< XConnection> xReturn; Reference< XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY); if (xRowSetProps.is()) - xRowSetProps->getPropertyValue(::rtl::OUString("ActiveConnection")) >>= xReturn; + xRowSetProps->getPropertyValue(OUString("ActiveConnection")) >>= xReturn; return xReturn; } @@ -371,7 +371,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R // 1. already connected? Reference< XConnection > xExistingConn( - xRowSetProps->getPropertyValue( ::rtl::OUString( "ActiveConnection" ) ), + xRowSetProps->getPropertyValue( OUString( "ActiveConnection" ) ), UNO_QUERY ); if ( xExistingConn.is() @@ -383,7 +383,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R { if ( _bSetAsActiveConnection ) { - xRowSetProps->setPropertyValue( ::rtl::OUString( "ActiveConnection" ), makeAny( xExistingConn ) ); + xRowSetProps->setPropertyValue( OUString( "ActiveConnection" ), makeAny( xExistingConn ) ); // no auto disposer needed, since we did not create the connection } @@ -393,17 +393,17 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R // build a connection with it's current settings (4. data source name, or 5. URL) - const ::rtl::OUString sUserProp( "User" ); - ::rtl::OUString sDataSourceName; - xRowSetProps->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName; - ::rtl::OUString sURL; - xRowSetProps->getPropertyValue(::rtl::OUString("URL")) >>= sURL; + const OUString sUserProp( "User" ); + OUString sDataSourceName; + xRowSetProps->getPropertyValue(OUString("DataSourceName")) >>= sDataSourceName; + OUString sURL; + xRowSetProps->getPropertyValue(OUString("URL")) >>= sURL; Reference< XConnection > xPureConnection; if (!sDataSourceName.isEmpty()) { // the row set's data source property is set // -> try to connect, get user and pwd setting for that - ::rtl::OUString sUser, sPwd; + OUString sUser, sPwd; if (hasProperty(sUserProp, xRowSetProps)) xRowSetProps->getPropertyValue(sUserProp) >>= sUser; @@ -421,7 +421,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R } catch( const Exception& ) { } if (xDriverManager.is()) { - ::rtl::OUString sUser, sPwd; + OUString sUser, sPwd; if (hasProperty(sUserProp, xRowSetProps)) xRowSetProps->getPropertyValue(sUserProp) >>= sUser; if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), xRowSetProps)) @@ -458,7 +458,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R } else xRowSetProps->setPropertyValue( - ::rtl::OUString( "ActiveConnection" ), + OUString( "ActiveConnection" ), makeAny( xConnection.getTyped() ) ); } @@ -489,7 +489,7 @@ SharedConnection ensureRowSetConnection(const Reference< XRowSet>& _rxRowSet, co } //------------------------------------------------------------------------------ -Reference< XNameAccess> getTableFields(const Reference< XConnection>& _rxConn,const ::rtl::OUString& _rName) +Reference< XNameAccess> getTableFields(const Reference< XConnection>& _rxConn,const OUString& _rName) { Reference< XComponent > xDummy; return getFieldsByCommandDescriptor( _rxConn, CommandType::TABLE, _rName, xDummy ); @@ -511,7 +511,7 @@ Reference< XNameAccess> getPrimaryKeyColumns_throw(const Reference< XPropertySet if ( xKeys.is() ) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - const ::rtl::OUString sPropName = rPropMap.getNameByIndex(PROPERTY_ID_TYPE); + const OUString sPropName = rPropMap.getNameByIndex(PROPERTY_ID_TYPE); Reference xProp; const sal_Int32 nCount = xKeys->getCount(); for(sal_Int32 i = 0;i< nCount;++i) @@ -546,7 +546,7 @@ namespace //------------------------------------------------------------------------------ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection, - const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand, + const sal_Int32 _nCommandType, const OUString& _rCommand, Reference< XComponent >& _rxKeepFieldsAlive, SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) { OSL_PRECOND( _rxConnection.is(), "::dbtools::getFieldsByCommandDescriptor: invalid connection!" ); @@ -656,7 +656,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect case HANDLE_SQL: { - ::rtl::OUString sStatementToExecute( _rCommand ); + OUString sStatementToExecute( _rCommand ); // well, the main problem here is to handle statements which contain a parameter // If we would simply execute a parametrized statement, then this will fail because @@ -672,14 +672,14 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect if ( xComposerFac.is() ) { - Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( ::rtl::OUString("com.sun.star.sdb.SingleSelectQueryComposer")),UNO_QUERY); + Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( OUString("com.sun.star.sdb.SingleSelectQueryComposer")),UNO_QUERY); if ( xComposer.is() ) { xComposer->setQuery( sStatementToExecute ); // Now set the filter to a dummy restriction which will result in an empty // result set. - xComposer->setFilter( ::rtl::OUString( "0=1" ) ); + xComposer->setFilter( OUString( "0=1" ) ); sStatementToExecute = xComposer->getQuery( ); } } @@ -703,7 +703,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect { if ( xStatementProps.is() ) xStatementProps->setPropertyValue( - ::rtl::OUString( "MaxRows" ), + OUString( "MaxRows" ), makeAny( sal_Int32( 0 ) ) ); } @@ -741,8 +741,8 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > getFieldNamesByCommandDescriptor( const Reference< XConnection >& _rxConnection, - const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand, +Sequence< OUString > getFieldNamesByCommandDescriptor( const Reference< XConnection >& _rxConnection, + const sal_Int32 _nCommandType, const OUString& _rCommand, SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) { // get the container for the fields @@ -750,7 +750,7 @@ Sequence< ::rtl::OUString > getFieldNamesByCommandDescriptor( const Reference< X Reference< XNameAccess > xFieldContainer = getFieldsByCommandDescriptor( _rxConnection, _nCommandType, _rCommand, xKeepFieldsAlive, _pErrorInfo ); // get the names of the fields - Sequence< ::rtl::OUString > aNames; + Sequence< OUString > aNames; if ( xFieldContainer.is() ) aNames = xFieldContainer->getElementNames(); @@ -762,16 +762,16 @@ Sequence< ::rtl::OUString > getFieldNamesByCommandDescriptor( const Reference< X } //------------------------------------------------------------------------------ -SQLContext prependContextInfo(const SQLException& _rException, const Reference< XInterface >& _rxContext, const ::rtl::OUString& _rContextDescription, const ::rtl::OUString& _rContextDetails) +SQLContext prependContextInfo(const SQLException& _rException, const Reference< XInterface >& _rxContext, const OUString& _rContextDescription, const OUString& _rContextDetails) { - return SQLContext( _rContextDescription, _rxContext, ::rtl::OUString(), 0, makeAny( _rException ), _rContextDetails ); + return SQLContext( _rContextDescription, _rxContext, OUString(), 0, makeAny( _rException ), _rContextDetails ); } //------------------------------------------------------------------------------ SQLException prependErrorInfo( const SQLException& _rChainedException, const Reference< XInterface >& _rxContext, - const ::rtl::OUString& _rAdditionalError, const StandardSQLState _eSQLState, const sal_Int32 _nErrorCode ) + const OUString& _rAdditionalError, const StandardSQLState _eSQLState, const sal_Int32 _nErrorCode ) { return SQLException( _rAdditionalError, _rxContext, - _eSQLState == SQL_ERROR_UNSPECIFIED ? ::rtl::OUString() : getStandardSQLState( _eSQLState ), + _eSQLState == SQL_ERROR_UNSPECIFIED ? OUString() : getStandardSQLState( _eSQLState ), _nErrorCode, makeAny( _rChainedException ) ); } @@ -837,21 +837,21 @@ namespace } //-------------------------------------------------------------------------- -static ::rtl::OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, - const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName, +static OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, + const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName, sal_Bool _bQuote, EComposeRule _eComposeRule ) { OSL_ENSURE(_rxMetaData.is(), "impl_doComposeTableName : invalid meta data !"); if ( !_rxMetaData.is() ) - return ::rtl::OUString(); + return OUString(); OSL_ENSURE(!_rName.isEmpty(), "impl_doComposeTableName : at least the name should be non-empty !"); - const ::rtl::OUString sQuoteString = _rxMetaData->getIdentifierQuoteString(); + const OUString sQuoteString = _rxMetaData->getIdentifierQuoteString(); const NameComponentSupport aNameComps( lcl_getNameComponentSupport( _rxMetaData, _eComposeRule ) ); - ::rtl::OUStringBuffer aComposedName; + OUStringBuffer aComposedName; - ::rtl::OUString sCatalogSep; + OUString sCatalogSep; sal_Bool bCatlogAtStart = sal_True; if ( !_rCatalog.isEmpty() && aNameComps.bCatalogs ) { @@ -887,25 +887,25 @@ static ::rtl::OUString impl_doComposeTableName( const Reference< XDatabaseMetaDa } //------------------------------------------------------------------------------ -::rtl::OUString quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta - , const ::rtl::OUString& _rName +OUString quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta + , const OUString& _rName , EComposeRule _eComposeRule) { - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; qualifiedNameComponents(_rxMeta,_rName,sCatalog,sSchema,sTable,_eComposeRule); return impl_doComposeTableName( _rxMeta, sCatalog, sSchema, sTable, sal_True, _eComposeRule ); } //------------------------------------------------------------------------------ -void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaData, const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule) +void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaData, const OUString& _rQualifiedName, OUString& _rCatalog, OUString& _rSchema, OUString& _rName,EComposeRule _eComposeRule) { OSL_ENSURE(_rxConnMetaData.is(), "QualifiedNameComponents : invalid meta data!"); NameComponentSupport aNameComps( lcl_getNameComponentSupport( _rxConnMetaData, _eComposeRule ) ); - ::rtl::OUString sSeparator = _rxConnMetaData->getCatalogSeparator(); + OUString sSeparator = _rxConnMetaData->getCatalogSeparator(); - ::rtl::OUString sName(_rQualifiedName); + OUString sName(_rQualifiedName); // do we have catalogs ? if ( aNameComps.bCatalogs ) { @@ -952,7 +952,7 @@ Reference< XNumberFormatsSupplier> getNumberFormats( // ask the parent of the connection (should be an DatabaseAccess) Reference< XNumberFormatsSupplier> xReturn; Reference< XChild> xConnAsChild(_rxConn, UNO_QUERY); - ::rtl::OUString sPropFormatsSupplier( "NumberFormatsSupplier" ); + OUString sPropFormatsSupplier( "NumberFormatsSupplier" ); if (xConnAsChild.is()) { Reference< XPropertySet> xConnParentProps(xConnAsChild->getParent(), UNO_QUERY); @@ -990,22 +990,22 @@ try Property* pOldProps = aOldProperties.getArray(); Property* pNewProps = aNewProperties.getArray(); - ::rtl::OUString sPropDefaultControl("DefaultControl"); - ::rtl::OUString sPropLabelControl("LabelControl"); - ::rtl::OUString sPropFormatsSupplier("FormatsSupplier"); - ::rtl::OUString sPropCurrencySymbol("CurrencySymbol"); - ::rtl::OUString sPropDecimals("Decimals"); - ::rtl::OUString sPropEffectiveMin("EffectiveMin"); - ::rtl::OUString sPropEffectiveMax("EffectiveMax"); - ::rtl::OUString sPropEffectiveDefault("EffectiveDefault"); - ::rtl::OUString sPropDefaultText("DefaultText"); - ::rtl::OUString sPropDefaultDate("DefaultDate"); - ::rtl::OUString sPropDefaultTime("DefaultTime"); - ::rtl::OUString sPropValueMin("ValueMin"); - ::rtl::OUString sPropValueMax("ValueMax"); - ::rtl::OUString sPropDecimalAccuracy("DecimalAccuracy"); - ::rtl::OUString sPropClassId("ClassId"); - ::rtl::OUString sFormattedServiceName( "com.sun.star.form.component.FormattedField" ); + OUString sPropDefaultControl("DefaultControl"); + OUString sPropLabelControl("LabelControl"); + OUString sPropFormatsSupplier("FormatsSupplier"); + OUString sPropCurrencySymbol("CurrencySymbol"); + OUString sPropDecimals("Decimals"); + OUString sPropEffectiveMin("EffectiveMin"); + OUString sPropEffectiveMax("EffectiveMax"); + OUString sPropEffectiveDefault("EffectiveDefault"); + OUString sPropDefaultText("DefaultText"); + OUString sPropDefaultDate("DefaultDate"); + OUString sPropDefaultTime("DefaultTime"); + OUString sPropValueMin("ValueMin"); + OUString sPropValueMax("ValueMax"); + OUString sPropDecimalAccuracy("DecimalAccuracy"); + OUString sPropClassId("ClassId"); + OUString sFormattedServiceName( "com.sun.star.form.component.FormattedField" ); for (sal_Int16 i=0; iName; - sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")); - OSL_FAIL(::rtl::OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US).getStr()); + sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM("\"")); + OSL_FAIL(OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US).getStr()); #endif } } @@ -1109,7 +1109,7 @@ try // The Effective-Properties should always be void or string or double .... if (hasProperty(sPropDefaultDate, xNewProps) && !bIsString) - { // (to convert a ::rtl::OUString into a date will not always succeed, because it might be bound to a text-column, + { // (to convert a OUString into a date will not always succeed, because it might be bound to a text-column, // but we can work with a double) Date aDate = DBTypeConversion::toDate(getDouble(aEffectiveDefault)); xNewProps->setPropertyValue(sPropDefaultDate, makeAny(aDate)); @@ -1127,11 +1127,11 @@ try } if (hasProperty(sPropDefaultText, xNewProps) && bIsString) - { // and here the ::rtl::OUString + { // and here the OUString xNewProps->setPropertyValue(sPropDefaultText, aEffectiveDefault); } - // nyi: The translation between doubles and ::rtl::OUString would offer more alternatives + // nyi: The translation between doubles and OUString would offer more alternatives } } @@ -1178,7 +1178,7 @@ try } // With this we can generate a new format ... - ::rtl::OUString sNewFormat = xFormats->generateFormat(nBaseKey, _rLocale, sal_False, sal_False, nDecimals, 0); + OUString sNewFormat = xFormats->generateFormat(nBaseKey, _rLocale, sal_False, sal_False, nDecimals, 0); // No thousands separator, negative numbers are not in red, no leading zeros // ... and add at FormatsSupplier (if needed) @@ -1216,7 +1216,7 @@ try aNewDefault <<= DBTypeConversion::toDouble(*(Time*)aTime.getValue()); } - // double or ::rtl::OUString will be copied directly + // double or OUString will be copied directly if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), xOldProps)) aNewDefault = xOldProps->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)); if (hasProperty(sPropDefaultText, xOldProps)) @@ -1235,19 +1235,19 @@ catch(const Exception&) //------------------------------------------------------------------------------ sal_Bool canInsert(const Reference< XPropertySet>& _rxCursorSet) { - return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::INSERT) != 0)); + return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(OUString("Privileges"))) & Privilege::INSERT) != 0)); } //------------------------------------------------------------------------------ sal_Bool canUpdate(const Reference< XPropertySet>& _rxCursorSet) { - return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::UPDATE) != 0)); + return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(OUString("Privileges"))) & Privilege::UPDATE) != 0)); } //------------------------------------------------------------------------------ sal_Bool canDelete(const Reference< XPropertySet>& _rxCursorSet) { - return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::DELETE) != 0)); + return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(OUString("Privileges"))) & Privilege::DELETE) != 0)); } // ----------------------------------------------------------------------------- Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent) @@ -1281,22 +1281,22 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere // as this reflects the status after the last execute, not the currently set properties) sal_Int32 nCommandType = CommandType::COMMAND; - ::rtl::OUString sCommand; + OUString sCommand; sal_Bool bEscapeProcessing = sal_False; - OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "CommandType" ) ) >>= nCommandType ); - OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "Command" ) ) >>= sCommand ); - OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "EscapeProcessing" ) ) >>= bEscapeProcessing ); + OSL_VERIFY( _rxRowSet->getPropertyValue( OUString( "CommandType" ) ) >>= nCommandType ); + OSL_VERIFY( _rxRowSet->getPropertyValue( OUString( "Command" ) ) >>= sCommand ); + OSL_VERIFY( _rxRowSet->getPropertyValue( OUString( "EscapeProcessing" ) ) >>= bEscapeProcessing ); StatementComposer aComposer( xConn, sCommand, nCommandType, bEscapeProcessing ); // append sort - aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString( "Order" ) ) ) ); + aComposer.setOrder( getString( _rxRowSet->getPropertyValue( OUString( "Order" ) ) ) ); // append filter sal_Bool bApplyFilter = sal_True; - _rxRowSet->getPropertyValue( ::rtl::OUString( "ApplyFilter" ) ) >>= bApplyFilter; + _rxRowSet->getPropertyValue( OUString( "ApplyFilter" ) ) >>= bApplyFilter; if ( bApplyFilter ) - aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString( "Filter" ) ) ) ); + aComposer.setFilter( getString( _rxRowSet->getPropertyValue( OUString( "Filter" ) ) ) ); aComposer.getQuery(); @@ -1338,10 +1338,10 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer( return xReturn; } //-------------------------------------------------------------------------- -::rtl::OUString composeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, - const ::rtl::OUString& _rCatalog, - const ::rtl::OUString& _rSchema, - const ::rtl::OUString& _rName, +OUString composeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, + const OUString& _rCatalog, + const OUString& _rSchema, + const OUString& _rName, sal_Bool _bQuote, EComposeRule _eComposeRule) { @@ -1349,16 +1349,16 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer( } // ----------------------------------------------------------------------------- -::rtl::OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, - const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName ) +OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, + const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName ) { - sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( "UseCatalogInSelect" ), sal_True ); - sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( "UseSchemaInSelect" ), sal_True ); + sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, OUString( "UseCatalogInSelect" ), sal_True ); + sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, OUString( "UseSchemaInSelect" ), sal_True ); return impl_doComposeTableName( _rxConnection->getMetaData(), - bUseCatalogInSelect ? _rCatalog : ::rtl::OUString(), - bUseSchemaInSelect ? _rSchema : ::rtl::OUString(), + bUseCatalogInSelect ? _rCatalog : OUString(), + bUseSchemaInSelect ? _rSchema : OUString(), _rName, true, eInDataManipulation @@ -1369,7 +1369,7 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer( namespace { static void lcl_getTableNameComponents( const Reference& _xTable, - ::rtl::OUString& _out_rCatalog, ::rtl::OUString& _out_rSchema, ::rtl::OUString& _out_rName ) + OUString& _out_rCatalog, OUString& _out_rSchema, OUString& _out_rName ) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); Reference< XPropertySetInfo > xInfo; @@ -1392,29 +1392,29 @@ namespace } // ----------------------------------------------------------------------------- -::rtl::OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference& _xTable ) +OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference& _xTable ) { - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; lcl_getTableNameComponents( _xTable, sCatalog, sSchema, sName ); return composeTableNameForSelect( _rxConnection, sCatalog, sSchema, sName ); } // ----------------------------------------------------------------------------- -::rtl::OUString composeTableName(const Reference& _xMetaData, +OUString composeTableName(const Reference& _xMetaData, const Reference& _xTable, EComposeRule _eComposeRule, bool _bSuppressCatalog, bool _bSuppressSchema, bool _bQuote ) { - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; lcl_getTableNameComponents( _xTable, sCatalog, sSchema, sName ); return impl_doComposeTableName( _xMetaData, - _bSuppressCatalog ? ::rtl::OUString() : sCatalog, - _bSuppressSchema ? ::rtl::OUString() : sSchema, + _bSuppressCatalog ? OUString() : sCatalog, + _bSuppressSchema ? OUString() : sSchema, sName, _bQuote, _eComposeRule @@ -1441,32 +1441,32 @@ sal_Int32 getSearchColumnFlag( const Reference< XConnection>& _rxConn,sal_Int32 } // ----------------------------------------------------------------------------- -::rtl::OUString createUniqueName( const Sequence< ::rtl::OUString >& _rNames, const ::rtl::OUString& _rBaseName, sal_Bool _bStartWithNumber ) +OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString& _rBaseName, sal_Bool _bStartWithNumber ) { - ::std::set< ::rtl::OUString > aUsedNames; + ::std::set< OUString > aUsedNames; ::std::copy( _rNames.getConstArray(), _rNames.getConstArray() + _rNames.getLength(), - ::std::insert_iterator< ::std::set< ::rtl::OUString > >( aUsedNames, aUsedNames.end() ) + ::std::insert_iterator< ::std::set< OUString > >( aUsedNames, aUsedNames.end() ) ); - ::rtl::OUString sName( _rBaseName ); + OUString sName( _rBaseName ); sal_Int32 nPos = 1; if ( _bStartWithNumber ) - sName += ::rtl::OUString::valueOf( nPos ); + sName += OUString::valueOf( nPos ); while ( aUsedNames.find( sName ) != aUsedNames.end() ) { sName = _rBaseName; - sName += ::rtl::OUString::valueOf( ++nPos ); + sName += OUString::valueOf( ++nPos ); } return sName; } // ----------------------------------------------------------------------------- -::rtl::OUString createUniqueName(const Reference& _rxContainer,const ::rtl::OUString& _rBaseName,sal_Bool _bStartWithNumber) +OUString createUniqueName(const Reference& _rxContainer,const OUString& _rBaseName,sal_Bool _bStartWithNumber) { - Sequence< ::rtl::OUString > aElementNames; + Sequence< OUString > aElementNames; OSL_ENSURE( _rxContainer.is(), "createUniqueName: invalid container!" ); if ( _rxContainer.is() ) @@ -1514,7 +1514,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, break; case TypeClass_STRING: - _rxUpdatedObject->updateString(_nColumnIndex, *(rtl::OUString*)_rValue.getValue()); + _rxUpdatedObject->updateString(_nColumnIndex, *(OUString*)_rValue.getValue()); break; case TypeClass_BOOLEAN: @@ -1531,7 +1531,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, break; case TypeClass_CHAR: - _rxUpdatedObject->updateString(_nColumnIndex,::rtl::OUString((sal_Unicode *)_rValue.getValue(),1)); + _rxUpdatedObject->updateString(_nColumnIndex,OUString((sal_Unicode *)_rValue.getValue(),1)); break; case TypeClass_UNSIGNED_LONG: @@ -1615,7 +1615,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, break; case TypeClass_STRING: - _rxParameters->setString(_nColumnIndex, *(rtl::OUString*)_rValue.getValue()); + _rxParameters->setString(_nColumnIndex, *(OUString*)_rValue.getValue()); break; case TypeClass_BOOLEAN: @@ -1632,7 +1632,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, break; case TypeClass_CHAR: - _rxParameters->setString(_nColumnIndex, ::rtl::OUString((sal_Unicode *)_rValue.getValue(),1)); + _rxParameters->setString(_nColumnIndex, OUString((sal_Unicode *)_rValue.getValue(),1)); break; case TypeClass_UNSIGNED_LONG: @@ -1756,14 +1756,14 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, ::std::vector > aNewParameterSet( _aParametersSet ); if ( nParamCount && ::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount ) { - static const ::rtl::OUString PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)); + static const OUString PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)); aNewParameterSet.resize(nParamCount ,false); - typedef ::std::map< ::rtl::OUString, ::std::vector > TParameterPositions; + typedef ::std::map< OUString, ::std::vector > TParameterPositions; TParameterPositions aParameterNames; for(sal_Int32 i = 0; i < nParamCount; ++i) { Reference xParam(xParamsAsIndicies->getByIndex(i),UNO_QUERY); - ::rtl::OUString sName; + OUString sName; xParam->getPropertyValue(PROPERTY_NAME) >>= sName; TParameterPositions::iterator aFind = aParameterNames.find(sName); @@ -1805,7 +1805,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, Reference< XPropertySet > xParamColumn(xWrappedParameters->getByIndex(i),UNO_QUERY); if (xParamColumn.is()) { - ::rtl::OUString sName; + OUString sName; xParamColumn->getPropertyValue(PROPERTY_NAME) >>= sName; OSL_ENSURE(sName.equals(pFinalValues->Name), "::dbaui::askForParameters: inconsistent parameter names!"); @@ -1867,7 +1867,7 @@ void setObjectWithInfo(const Reference& _xParams, case DataType::CLOB: { Any x(_rValue.makeAny()); - ::rtl::OUString sValue; + OUString sValue; if ( x >>= sValue ) _xParams->setString(parameterIndex,sValue); else @@ -1961,9 +1961,9 @@ void setObjectWithInfo(const Reference& _xParams, default: { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_UNKNOWN_PARA_TYPE, - "$position$", ::rtl::OUString::valueOf(parameterIndex) + "$position$", OUString::valueOf(parameterIndex) ) ); ::dbtools::throwGenericSQLException(sError,NULL); } @@ -1972,8 +1972,8 @@ void setObjectWithInfo(const Reference& _xParams, } // -------------------------------------------------------------------- -void getBoleanComparisonPredicate( const ::rtl::OUString& _rExpression, const sal_Bool _bValue, const sal_Int32 _nBooleanComparisonMode, - ::rtl::OUStringBuffer& _out_rSQLPredicate ) +void getBoleanComparisonPredicate( const OUString& _rExpression, const sal_Bool _bValue, const sal_Int32 _nBooleanComparisonMode, + OUStringBuffer& _out_rSQLPredicate ) { switch ( _nBooleanComparisonMode ) { @@ -2073,26 +2073,26 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) // ------------------------------------------------------------------------- OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, - const ::rtl::OUString& _rVal, + const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) { - ::rtl::OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); return find(__first,__last,sName,_rVal,_rCase); } // ------------------------------------------------------------------------- OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, - const ::rtl::OUString& _rVal, + const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) { - ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); + OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); return find(__first,__last,sRealName,_rVal,_rCase); } // ------------------------------------------------------------------------- OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, - const ::rtl::OUString& _rProp, - const ::rtl::OUString& _rVal, + const OUString& _rProp, + const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) { while (__first != __last && !_rCase(getString((*__first)->getPropertyValue(_rProp)),_rVal)) diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index fdccc155312f..df243d3b169c 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -60,20 +60,20 @@ namespace dbtools using namespace connectivity; using namespace comphelper; -::rtl::OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern) +OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const OUString& _sCreatePattern) { Reference xMetaData = _xConnection->getMetaData(); ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUString sTypeName; + OUString sTypeName; sal_Int32 nDataType = 0; sal_Int32 nPrecision = 0; sal_Int32 nScale = 0; - const ::rtl::OUString sQuoteString = xMetaData->getIdentifierQuoteString(); - ::rtl::OUStringBuffer aSql = ::dbtools::quoteName(sQuoteString,::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)))); + const OUString sQuoteString = xMetaData->getIdentifierQuoteString(); + OUStringBuffer aSql = ::dbtools::quoteName(sQuoteString,::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)))); aSql.appendAscii(" "); @@ -86,13 +86,13 @@ namespace dbtools xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bIsAutoIncrement; // check if the user enter a specific string to create autoincrement values - ::rtl::OUString sAutoIncrementValue; + OUString sAutoIncrementValue; Reference xPropInfo = xColProp->getPropertySetInfo(); if ( xPropInfo.is() && xPropInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION)) ) xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION)) >>= sAutoIncrementValue; // look if we have to use precisions sal_Bool bUseLiteral = sal_False; - ::rtl::OUString sPreFix,sPostFix,sCreateParams; + OUString sPreFix,sPostFix,sCreateParams; { Reference xRes = xMetaData->getTypeInfo(); if(xRes.is()) @@ -100,7 +100,7 @@ namespace dbtools Reference xRow(xRes,UNO_QUERY); while(xRes->next()) { - ::rtl::OUString sTypeName2Cmp = xRow->getString(1); + OUString sTypeName2Cmp = xRow->getString(1); sal_Int32 nType = xRow->getShort(2); sPreFix = xRow->getString (4); sPostFix = xRow->getString (5); @@ -121,7 +121,7 @@ namespace dbtools sal_Int32 nIndex = 0; if ( !sAutoIncrementValue.isEmpty() && (nIndex = sTypeName.indexOf(sAutoIncrementValue)) != -1 ) { - sTypeName = sTypeName.replaceAt(nIndex,sTypeName.getLength() - nIndex,::rtl::OUString()); + sTypeName = sTypeName.replaceAt(nIndex,sTypeName.getLength() - nIndex,OUString()); } if ( (nPrecision > 0 || nScale > 0) && bUseLiteral ) @@ -157,17 +157,17 @@ namespace dbtools else aSql.append(sTypeName); // simply add the type name - ::rtl::OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE))); + OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE))); if ( !aDefault.isEmpty() ) { - aSql.append(::rtl::OUString(" DEFAULT ")); + aSql.append(OUString(" DEFAULT ")); aSql.append(sPreFix); aSql.append(aDefault); aSql.append(sPostFix); } // if ( aDefault.getLength() ) if(::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS) - aSql.append(::rtl::OUString(" NOT NULL")); + aSql.append(OUString(" NOT NULL")); if ( bIsAutoIncrement && !sAutoIncrementValue.isEmpty()) { @@ -182,10 +182,10 @@ namespace dbtools } // ----------------------------------------------------------------------------- -::rtl::OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern) +OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const OUString& _sCreatePattern) { - ::rtl::OUStringBuffer aSql(::rtl::OUString("CREATE TABLE ")); - ::rtl::OUString sCatalog,sSchema,sTable,sComposedName; + OUStringBuffer aSql(OUString("CREATE TABLE ")); + OUString sCatalog,sSchema,sTable,sComposedName; Reference xMetaData = _xConnection->getMetaData(); ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); @@ -199,7 +199,7 @@ namespace dbtools ::dbtools::throwFunctionSequenceException(_xConnection); aSql.append(sComposedName); - aSql.append(::rtl::OUString(" (")); + aSql.append(OUString(" (")); // columns Reference xColumnSup(descriptor,UNO_QUERY); @@ -223,13 +223,13 @@ namespace dbtools } namespace { - ::rtl::OUString generateColumnNames(const Reference& _xColumns,const Reference& _xMetaData) + OUString generateColumnNames(const Reference& _xColumns,const Reference& _xMetaData) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - static const ::rtl::OUString sComma(::rtl::OUString(",")); + static const OUString sComma(OUString(",")); - const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString()); - ::rtl::OUString sSql( " (" ); + const OUString sQuote(_xMetaData->getIdentifierQuoteString()); + OUString sSql( " (" ); Reference< XPropertySet > xColProp; sal_Int32 nColCount = _xColumns->getCount(); @@ -241,17 +241,17 @@ namespace } if ( nColCount ) - sSql = sSql.replaceAt(sSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + sSql = sSql.replaceAt(sSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); return sSql; } } // ----------------------------------------------------------------------------- -::rtl::OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection) +OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection) { Reference xMetaData = _xConnection->getMetaData(); ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - ::rtl::OUStringBuffer aSql; + OUStringBuffer aSql; // keys Reference xKeySup(descriptor,UNO_QUERY); Reference xKeys = xKeySup->getKeys(); @@ -260,7 +260,7 @@ namespace Reference< XPropertySet > xColProp; Reference xColumns; Reference xColumnSup; - ::rtl::OUString sCatalog,sSchema,sTable,sComposedName; + OUString sCatalog,sSchema,sTable,sComposedName; sal_Bool bPKey = sal_False; for(sal_Int32 i=0;igetCount();++i) { @@ -280,7 +280,7 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - aSql.append(::rtl::OUString(" PRIMARY KEY ")); + aSql.append(OUString(" PRIMARY KEY ")); aSql.append(generateColumnNames(xColumns,xMetaData)); } else if(nKeyType == KeyType::UNIQUE) @@ -290,7 +290,7 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - aSql.append(::rtl::OUString(" UNIQUE ")); + aSql.append(OUString(" UNIQUE ")); aSql.append(generateColumnNames(xColumns,xMetaData)); } else if(nKeyType == KeyType::FOREIGN) @@ -302,8 +302,8 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - aSql.append(::rtl::OUString(" FOREIGN KEY ")); - ::rtl::OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE))); + aSql.append(OUString(" FOREIGN KEY ")); + OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE))); ::dbtools::qualifiedNameComponents(xMetaData, sRefTable, sCatalog, @@ -321,16 +321,16 @@ namespace switch(nDeleteRule) { case KeyRule::CASCADE: - aSql.append(::rtl::OUString(" ON DELETE CASCADE ")); + aSql.append(OUString(" ON DELETE CASCADE ")); break; case KeyRule::RESTRICT: - aSql.append(::rtl::OUString(" ON DELETE RESTRICT ")); + aSql.append(OUString(" ON DELETE RESTRICT ")); break; case KeyRule::SET_NULL: - aSql.append(::rtl::OUString(" ON DELETE SET NULL ")); + aSql.append(OUString(" ON DELETE SET NULL ")); break; case KeyRule::SET_DEFAULT: - aSql.append(::rtl::OUString(" ON DELETE SET DEFAULT ")); + aSql.append(OUString(" ON DELETE SET DEFAULT ")); break; default: ; @@ -352,21 +352,21 @@ namespace } // ----------------------------------------------------------------------------- -::rtl::OUString createSqlCreateTableStatement( const Reference< XPropertySet >& descriptor, +OUString createSqlCreateTableStatement( const Reference< XPropertySet >& descriptor, const Reference< XConnection>& _xConnection, ISQLStatementHelper* _pHelper, - const ::rtl::OUString& _sCreatePattern) + const OUString& _sCreatePattern) { - ::rtl::OUString aSql = ::dbtools::createStandardCreateStatement(descriptor,_xConnection,_pHelper,_sCreatePattern); - const ::rtl::OUString sKeyStmt = ::dbtools::createStandardKeyStatement(descriptor,_xConnection); + OUString aSql = ::dbtools::createStandardCreateStatement(descriptor,_xConnection,_pHelper,_sCreatePattern); + const OUString sKeyStmt = ::dbtools::createStandardKeyStatement(descriptor,_xConnection); if ( !sKeyStmt.isEmpty() ) aSql += sKeyStmt; else { if ( aSql.lastIndexOf(',') == (aSql.getLength()-1) ) - aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); else - aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + aSql += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } return aSql; } @@ -375,10 +375,10 @@ namespace Reference lcl_createSDBCXColumn(const Reference& _xPrimaryKeyColumns, const Reference& _xConnection, const Any& _aCatalog, - const ::rtl::OUString& _aSchema, - const ::rtl::OUString& _aTable, - const ::rtl::OUString& _rQueryName, - const ::rtl::OUString& _rName, + const OUString& _aSchema, + const OUString& _aTable, + const OUString& _rQueryName, + const OUString& _rName, sal_Bool _bCase, sal_Bool _bQueryForInfo, sal_Bool _bIsAutoIncrement, @@ -388,7 +388,7 @@ namespace Reference xProp; Reference xMetaData = _xConnection->getMetaData(); Reference< XResultSet > xResult = xMetaData->getColumns(_aCatalog, _aSchema, _aTable, _rQueryName); - ::rtl::OUString sCatalog; + OUString sCatalog; _aCatalog >>= sCatalog; if ( xResult.is() ) @@ -400,11 +400,11 @@ namespace if ( aMixCompare(xRow->getString(4),_rName) ) { sal_Int32 nField5 = xRow->getInt(5); - ::rtl::OUString aField6 = xRow->getString(6); + OUString aField6 = xRow->getString(6); sal_Int32 nField7 = xRow->getInt(7) , nField9 = xRow->getInt(9) , nField11= xRow->getInt(11); - ::rtl::OUString sField12 = xRow->getString(12), + OUString sField12 = xRow->getString(12), sField13 = xRow->getString(13); ::comphelper::disposeComponent(xRow); @@ -412,9 +412,9 @@ namespace ,bIsCurrency = _bIsCurrency; if ( _bQueryForInfo ) { - const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); - ::rtl::OUString sQuotedName = ::dbtools::quoteName(sQuote,_rName); - ::rtl::OUString sComposedName; + const OUString sQuote = xMetaData->getIdentifierQuoteString(); + OUString sQuotedName = ::dbtools::quoteName(sQuote,_rName); + OUString sComposedName; sComposedName = composeTableNameForSelect(_xConnection, getString( _aCatalog ), _aSchema, _aTable ); ColumnInformationMap aInfo(_bCase); @@ -447,7 +447,7 @@ namespace Reference< XRow > xPKeyRow( xPKeys, UNO_QUERY_THROW ); while( xPKeys->next() ) // there can be only one primary key { - ::rtl::OUString sKeyColumn = xPKeyRow->getString(4); + OUString sKeyColumn = xPKeyRow->getString(4); if ( aMixCompare(_rName,sKeyColumn) ) { nField11 = ColumnValue::NO_NULLS; @@ -503,7 +503,7 @@ namespace // ----------------------------------------------------------------------------- Reference createSDBCXColumn(const Reference& _xTable, const Reference& _xConnection, - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Bool _bCase, sal_Bool _bQueryForInfo, sal_Bool _bIsAutoIncrement, @@ -519,10 +519,10 @@ Reference createSDBCXColumn(const Reference& _xTable Reference xMetaData = _xConnection->getMetaData(); Any aCatalog; aCatalog = _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)); - ::rtl::OUString sCatalog; + OUString sCatalog; aCatalog >>= sCatalog; - ::rtl::OUString aSchema, aTable; + OUString aSchema, aTable; _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; @@ -531,10 +531,10 @@ Reference createSDBCXColumn(const Reference& _xTable xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, _rName,_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); if ( !xProp.is() ) { - xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString("%"),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); + xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, OUString("%"),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); if ( !xProp.is() ) xProp = new connectivity::sdbcx::OColumn(_rName, - ::rtl::OUString(),::rtl::OUString(),::rtl::OUString(), + OUString(),OUString(),OUString(), ColumnValue::NULLABLE_UNKNOWN, 0, 0, @@ -563,10 +563,10 @@ bool getBooleanDataSourceSetting( const Reference< XConnection >& _rxConnection, if ( xDataSourceProperties.is() ) { Reference< XPropertySet > xSettings( - xDataSourceProperties->getPropertyValue( ::rtl::OUString( "Settings") ), + xDataSourceProperties->getPropertyValue( OUString( "Settings") ), UNO_QUERY_THROW ); - OSL_VERIFY( xSettings->getPropertyValue( ::rtl::OUString::createFromAscii( _pAsciiSettingName ) ) >>= bValue ); + OSL_VERIFY( xSettings->getPropertyValue( OUString::createFromAscii( _pAsciiSettingName ) ) >>= bValue ); } } catch( const Exception& ) @@ -576,7 +576,7 @@ bool getBooleanDataSourceSetting( const Reference< XConnection >& _rxConnection, return bValue; } // ------------------------------------------------------------------------- -bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl::OUString& _sAsciiSettingsName, +bool getDataSourceSetting( const Reference< XInterface >& _xChild, const OUString& _sAsciiSettingsName, Any& /* [out] */ _rSettingsValue ) { bool bIsPresent = false; @@ -587,7 +587,7 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl:: return false; const Reference< XPropertySet > xSettings( - xDataSourceProperties->getPropertyValue( ::rtl::OUString( "Settings") ), + xDataSourceProperties->getPropertyValue( OUString( "Settings") ), UNO_QUERY_THROW ); @@ -604,11 +604,11 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl:: bool getDataSourceSetting( const Reference< XInterface >& _rxDataSource, const sal_Char* _pAsciiSettingsName, Any& /* [out] */ _rSettingsValue ) { - ::rtl::OUString sAsciiSettingsName = ::rtl::OUString::createFromAscii(_pAsciiSettingsName); + OUString sAsciiSettingsName = OUString::createFromAscii(_pAsciiSettingsName); return getDataSourceSetting( _rxDataSource, sAsciiSettingsName,_rSettingsValue ); } // ----------------------------------------------------------------------------- -sal_Bool isDataSourcePropertyEnabled(const Reference& _xProp,const ::rtl::OUString& _sProperty,sal_Bool _bDefault) +sal_Bool isDataSourcePropertyEnabled(const Reference& _xProp,const OUString& _sProperty,sal_Bool _bDefault) { sal_Bool bEnabled = _bDefault; try @@ -617,7 +617,7 @@ sal_Bool isDataSourcePropertyEnabled(const Reference& _xProp,const : if ( xProp.is() ) { Sequence< PropertyValue > aInfo; - xProp->getPropertyValue(::rtl::OUString("Info")) >>= aInfo; + xProp->getPropertyValue(OUString("Info")) >>= aInfo; const PropertyValue* pValue =::std::find_if(aInfo.getConstArray(), aInfo.getConstArray() + aInfo.getLength(), ::std::bind2nd(TPropertyValueEqualFunctor(),_sProperty)); @@ -633,7 +633,7 @@ sal_Bool isDataSourcePropertyEnabled(const Reference& _xProp,const : } // ----------------------------------------------------------------------------- Reference< XTablesSupplier> getDataDefinitionByURLAndConnection( - const ::rtl::OUString& _rsUrl, + const OUString& _rsUrl, const Reference< XConnection>& _xConnection, const Reference< XComponentContext >& _rxContext) { @@ -658,9 +658,9 @@ Reference< XTablesSupplier> getDataDefinitionByURLAndConnection( // ----------------------------------------------------------------------------- sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, - const ::rtl::OUString& _sCatalog, - const ::rtl::OUString& _sSchema, - const ::rtl::OUString& _sTable) + const OUString& _sCatalog, + const OUString& _sSchema, + const OUString& _sTable) { OSL_ENSURE(_xMetaData.is(),"Invalid metadata!"); sal_Int32 nPrivileges = 0; @@ -672,25 +672,25 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, Reference< XResultSet > xPrivileges = _xMetaData->getTablePrivileges(aVal, _sSchema, _sTable); Reference< XRow > xCurrentRow(xPrivileges, UNO_QUERY); - const ::rtl::OUString sUserWorkingFor = _xMetaData->getUserName(); - static const ::rtl::OUString sSELECT( "SELECT" ); - static const ::rtl::OUString sINSERT( "INSERT" ); - static const ::rtl::OUString sUPDATE( "UPDATE" ); - static const ::rtl::OUString sDELETE( "DELETE" ); - static const ::rtl::OUString sREAD( "READ" ); - static const ::rtl::OUString sCREATE( "CREATE" ); - static const ::rtl::OUString sALTER( "ALTER" ); - static const ::rtl::OUString sREFERENCE( "REFERENCE" ); - static const ::rtl::OUString sDROP( "DROP" ); + const OUString sUserWorkingFor = _xMetaData->getUserName(); + static const OUString sSELECT( "SELECT" ); + static const OUString sINSERT( "INSERT" ); + static const OUString sUPDATE( "UPDATE" ); + static const OUString sDELETE( "DELETE" ); + static const OUString sREAD( "READ" ); + static const OUString sCREATE( "CREATE" ); + static const OUString sALTER( "ALTER" ); + static const OUString sREFERENCE( "REFERENCE" ); + static const OUString sDROP( "DROP" ); if ( xCurrentRow.is() ) { // after creation the set is positioned before the first record, per definition - ::rtl::OUString sPrivilege, sGrantee; + OUString sPrivilege, sGrantee; while ( xPrivileges->next() ) { #ifdef DBG_UTIL - ::rtl::OUString sCat, sSchema, sName, sGrantor, sGrantable; + OUString sCat, sSchema, sName, sGrantor, sGrantable; sCat = xCurrentRow->getString(1); sSchema = xCurrentRow->getString(2); sName = xCurrentRow->getString(3); @@ -730,16 +730,16 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, // Some drivers put a table privilege as soon as any column has the privilege, // some drivers only if all columns have the privilege. // To unifiy the situation, collect column privileges here, too. - Reference< XResultSet > xColumnPrivileges = _xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, ::rtl::OUString("%")); + Reference< XResultSet > xColumnPrivileges = _xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, OUString("%")); Reference< XRow > xColumnCurrentRow(xColumnPrivileges, UNO_QUERY); if ( xColumnCurrentRow.is() ) { // after creation the set is positioned before the first record, per definition - ::rtl::OUString sPrivilege, sGrantee; + OUString sPrivilege, sGrantee; while ( xColumnPrivileges->next() ) { #ifdef DBG_UTIL - ::rtl::OUString sCat, sSchema, sTableName, sColumnName, sGrantor, sGrantable; + OUString sCat, sSchema, sTableName, sColumnName, sGrantor, sGrantable; sCat = xColumnCurrentRow->getString(1); sSchema = xColumnCurrentRow->getString(2); sTableName = xColumnCurrentRow->getString(3); @@ -779,7 +779,7 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, } catch(const SQLException& e) { - static ::rtl::OUString sNotSupportedState( "IM001" ); + static OUString sNotSupportedState( "IM001" ); // some drivers don't support any privileges so we assume that we are allowed to do all we want :-) if(e.SQLState == sNotSupportedState) nPrivileges |= Privilege::DROP | @@ -799,18 +799,18 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, // ----------------------------------------------------------------------------- // we need some more information about the column void collectColumnInformation(const Reference< XConnection>& _xConnection, - const ::rtl::OUString& _sComposedName, - const ::rtl::OUString& _rName, + const OUString& _sComposedName, + const OUString& _rName, ColumnInformationMap& _rInfo) { - static ::rtl::OUString STR_WHERE = ::rtl::OUString(" WHERE "); + static OUString STR_WHERE = OUString(" WHERE "); - ::rtl::OUString sSelect = ::rtl::OUString("SELECT "); + OUString sSelect = OUString("SELECT "); sSelect += _rName; - sSelect += ::rtl::OUString(" FROM "); + sSelect += OUString(" FROM "); sSelect += _sComposedName; sSelect += STR_WHERE; - sSelect += ::rtl::OUString("0 = 1"); + sSelect += OUString("0 = 1"); try { @@ -880,9 +880,9 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc // ----------------------------------------------------------------------------- namespace { - ::rtl::OUString lcl_getEncodingName( rtl_TextEncoding _eEncoding ) + OUString lcl_getEncodingName( rtl_TextEncoding _eEncoding ) { - ::rtl::OUString sEncodingName; + OUString sEncodingName; OCharsetMap aCharsets; OCharsetMap::CharsetIterator aEncodingPos = aCharsets.find( _eEncoding ); @@ -895,7 +895,7 @@ namespace } // ----------------------------------------------------------------------------- -sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSource, ::rtl::OString& _rDest, rtl_TextEncoding _eEncoding ) SAL_THROW((com::sun::star::sdbc::SQLException)) +sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OString& _rDest, rtl_TextEncoding _eEncoding ) SAL_THROW((com::sun::star::sdbc::SQLException)) { if ( !rtl_convertUStringToString( &_rDest.pData, _rSource.getStr(), _rSource.getLength(), _eEncoding, @@ -906,7 +906,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc ) { SharedResources aResources; - ::rtl::OUString sMessage = aResources.getResourceStringWithSubstitution( STR_CANNOT_CONVERT_STRING, + OUString sMessage = aResources.getResourceStringWithSubstitution( STR_CANNOT_CONVERT_STRING, "$string$", _rSource, "$charset$", lcl_getEncodingName( _eEncoding ) ); @@ -914,7 +914,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc throw SQLException( sMessage, NULL, - ::rtl::OUString( "22018" ), + OUString( "22018" ), 22018, Any() ); @@ -924,23 +924,23 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc } // ----------------------------------------------------------------------------- -sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& _rSource, ::rtl::OString& _rDest, +sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSource, OString& _rDest, sal_Int32 _nMaxLen, rtl_TextEncoding _eEncoding ) SAL_THROW((SQLException)) { sal_Int32 nLen = convertUnicodeString( _rSource, _rDest, _eEncoding ); if ( nLen > _nMaxLen ) { SharedResources aResources; - ::rtl::OUString sMessage = aResources.getResourceStringWithSubstitution( STR_STRING_LENGTH_EXCEEDED, + OUString sMessage = aResources.getResourceStringWithSubstitution( STR_STRING_LENGTH_EXCEEDED, "$string$", _rSource, - "$maxlen$", ::rtl::OUString::valueOf( _nMaxLen ), + "$maxlen$", OUString::valueOf( _nMaxLen ), "$charset$", lcl_getEncodingName( _eEncoding ) ); throw SQLException( sMessage, NULL, - ::rtl::OUString( "22001" ), + OUString( "22001" ), 22001, Any() ); @@ -948,32 +948,32 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& return nLen; } -::rtl::OUString lcl_getReportEngines() +OUString lcl_getReportEngines() { - static ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/ReportEngines"); + static OUString s_sNodeName("org.openoffice.Office.DataAccess/ReportEngines"); return s_sNodeName; } // ----------------------------------------------------------------------------- -::rtl::OUString lcl_getDefaultReportEngine() +OUString lcl_getDefaultReportEngine() { - static ::rtl::OUString s_sNodeName("DefaultReportEngine"); + static OUString s_sNodeName("DefaultReportEngine"); return s_sNodeName; } // ----------------------------------------------------------------------------- -::rtl::OUString lcl_getReportEngineNames() +OUString lcl_getReportEngineNames() { - static ::rtl::OUString s_sNodeName("ReportEngineNames"); + static OUString s_sNodeName("ReportEngineNames"); return s_sNodeName; } // ----------------------------------------------------------------------------- -::rtl::OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >& _rxORB) +OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >& _rxORB) { ::utl::OConfigurationTreeRoot aReportEngines = ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxORB, lcl_getReportEngines(), -1, ::utl::OConfigurationTreeRoot::CM_READONLY); if ( aReportEngines.isValid() ) { - ::rtl::OUString sDefaultReportEngineName; + OUString sDefaultReportEngineName; aReportEngines.getNodeValue(lcl_getDefaultReportEngine()) >>= sDefaultReportEngineName; if ( !sDefaultReportEngineName.isEmpty() ) { @@ -983,19 +983,19 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& ::utl::OConfigurationNode aReportEngine = aReportEngineNames.openNode(sDefaultReportEngineName); if ( aReportEngine.isValid() ) { - ::rtl::OUString sRet; - const static ::rtl::OUString s_sService("ServiceName"); + OUString sRet; + const static OUString s_sService("ServiceName"); aReportEngine.getNodeValue(s_sService) >>= sRet; return sRet; } } } else - return ::rtl::OUString("org.libreoffice.report.pentaho.SOReportJobFactory"); + return OUString("org.libreoffice.report.pentaho.SOReportJobFactory"); } else - return ::rtl::OUString("org.libreoffice.report.pentaho.SOReportJobFactory"); - return ::rtl::OUString(); + return OUString("org.libreoffice.report.pentaho.SOReportJobFactory"); + return OUString(); } // ----------------------------------------------------------------------------- //......................................................................... diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx index 1388c5b69c29..be526c38409e 100644 --- a/connectivity/source/commontools/filtermanager.cxx +++ b/connectivity/source/commontools/filtermanager.cxx @@ -66,13 +66,13 @@ namespace dbtools } //-------------------------------------------------------------------- - const ::rtl::OUString& FilterManager::getFilterComponent( FilterComponent _eWhich ) const + const OUString& FilterManager::getFilterComponent( FilterComponent _eWhich ) const { return m_aFilterComponents[ _eWhich ]; } //-------------------------------------------------------------------- - void FilterManager::setFilterComponent( FilterComponent _eWhich, const ::rtl::OUString& _rComponent ) + void FilterManager::setFilterComponent( FilterComponent _eWhich, const OUString& _rComponent ) { m_aFilterComponents[ _eWhich ] = _rComponent; try @@ -108,7 +108,7 @@ namespace dbtools } //-------------------------------------------------------------------- - void FilterManager::appendFilterComponent( ::rtl::OUStringBuffer& io_appendTo, const ::rtl::OUString& i_component ) const + void FilterManager::appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ) const { if ( io_appendTo.getLength() > 0 ) { @@ -123,7 +123,7 @@ namespace dbtools } //-------------------------------------------------------------------- - bool FilterManager::isThereAtMostOneComponent( ::rtl::OUStringBuffer& o_singleComponent ) const + bool FilterManager::isThereAtMostOneComponent( OUStringBuffer& o_singleComponent ) const { sal_Int32 nOnlyNonEmpty = -1; sal_Int32 i; @@ -154,9 +154,9 @@ namespace dbtools } //-------------------------------------------------------------------- - ::rtl::OUString FilterManager::getComposedFilter( ) const + OUString FilterManager::getComposedFilter( ) const { - ::rtl::OUStringBuffer aComposedFilter; + OUStringBuffer aComposedFilter; // if we have only one non-empty component, then there's no need to compose anything if ( !isThereAtMostOneComponent( aComposedFilter ) ) diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index f079083150bd..daff9098e88a 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -129,7 +129,7 @@ namespace dbtools _rData.m_xColumnUpdate.set( _rxColumn, UNO_QUERY ); // determine the field type, and whether it's a numeric field - OSL_VERIFY( _rxColumn->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= _rData.m_nFieldType ); + OSL_VERIFY( _rxColumn->getPropertyValue( OUString( "Type" ) ) >>= _rData.m_nFieldType ); switch ( _rData.m_nFieldType ) { @@ -156,7 +156,7 @@ namespace dbtools // get the format key of our bound field Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_QUERY_THROW ); bool bHaveFieldFormat = false; - const ::rtl::OUString sFormatKeyProperty( ::rtl::OUString( "FormatKey" ) ); + const OUString sFormatKeyProperty( OUString( "FormatKey" ) ); if ( xPSI->hasPropertyByName( sFormatKeyProperty ) ) { bHaveFieldFormat = ( _rxColumn->getPropertyValue( sFormatKeyProperty ) >>= _rData.m_nFormatKey ); @@ -172,7 +172,7 @@ namespace dbtools // some more formatter settings _rData.m_nKeyType = ::comphelper::getNumberFormatType( xNumberFormatsSupp->getNumberFormats(), _rData.m_nFormatKey ); Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_QUERY_THROW ); - OSL_VERIFY( xFormatSettings->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= _rData.m_aNullDate ); + OSL_VERIFY( xFormatSettings->getPropertyValue( OUString( "NullDate" ) ) >>= _rData.m_aNullDate ); // remember the formatter _rData.m_xFormatter = i_rNumberFormatter; @@ -273,7 +273,7 @@ namespace dbtools } //-------------------------------------------------------------------- - bool FormattedColumnValue::setFormattedValue( const ::rtl::OUString& _rFormattedStringValue ) const + bool FormattedColumnValue::setFormattedValue( const OUString& _rFormattedStringValue ) const { OSL_PRECOND( m_pData->m_xColumnUpdate.is(), "FormattedColumnValue::setFormattedValue: no column!" ); if ( !m_pData->m_xColumnUpdate.is() ) @@ -300,11 +300,11 @@ namespace dbtools } //-------------------------------------------------------------------- - ::rtl::OUString FormattedColumnValue::getFormattedValue() const + OUString FormattedColumnValue::getFormattedValue() const { OSL_PRECOND( m_pData->m_xColumn.is(), "FormattedColumnValue::setFormattedValue: no column!" ); - ::rtl::OUString sStringValue; + OUString sStringValue; if ( m_pData->m_xColumn.is() ) { if ( m_pData->m_bNumericField ) diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 5f2a7079f193..32ac6e89ee54 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -112,7 +112,7 @@ namespace dbtools m_aParameterInformation.swap( aEmptyInfo ); m_aMasterFields.realloc( 0 ); m_aDetailFields.realloc( 0 ); - m_sIdentifierQuoteString = ::rtl::OUString(); + m_sIdentifierQuoteString = OUString(); ::std::vector< bool > aEmptyArray; m_aParametersVisited.swap( aEmptyArray ); m_bUpToDate = false; @@ -194,7 +194,7 @@ namespace dbtools xParam.clear(); m_xInnerParamColumns->getByIndex( i ) >>= xParam; - ::rtl::OUString sName; + OUString sName; xParam->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME) ) >>= sName; // only append additonal parameters when they are not already in the list @@ -220,22 +220,22 @@ namespace dbtools } //-------------------------------------------------------------------- - ::rtl::OUString ParameterManager::createFilterConditionFromColumnLink( - const ::rtl::OUString& _rMasterColumn, const ::rtl::OUString& _rDetailLink, ::rtl::OUString& _rNewParamName ) + OUString ParameterManager::createFilterConditionFromColumnLink( + const OUString& _rMasterColumn, const OUString& _rDetailLink, OUString& _rNewParamName ) { - ::rtl::OUString sFilter; + OUString sFilter; // format is: // = : sFilter = quoteName( m_sIdentifierQuoteString, _rDetailLink ); - sFilter += ::rtl::OUString( " = :" ); + sFilter += OUString( " = :" ); // generate a parameter name which is not already used - _rNewParamName = ::rtl::OUString( "link_from_" ); + _rNewParamName = OUString( "link_from_" ); _rNewParamName += convertName2SQLName( _rMasterColumn, m_sSpecialCharacters ); while ( m_aParameterInformation.find( _rNewParamName ) != m_aParameterInformation.end() ) { - _rNewParamName += ::rtl::OUString( "_" ); + _rNewParamName += OUString( "_" ); } return sFilter += _rNewParamName; @@ -243,7 +243,7 @@ namespace dbtools //-------------------------------------------------------------------- void ParameterManager::classifyLinks( const Reference< XNameAccess >& _rxParentColumns, - const Reference< XNameAccess >& _rxColumns, ::std::vector< ::rtl::OUString >& _out_rAdditionalFilterComponents ) SAL_THROW(( Exception )) + const Reference< XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents ) SAL_THROW(( Exception )) { OSL_PRECOND( m_aMasterFields.getLength() == m_aDetailFields.getLength(), "ParameterManager::classifyLinks: master and detail fields should have the same length!" ); @@ -254,15 +254,15 @@ namespace dbtools // we may need to strip any links which are invalid, so here go the containers // for temporarirly holding the new pairs - ::std::vector< ::rtl::OUString > aStrippedMasterFields; - ::std::vector< ::rtl::OUString > aStrippedDetailFields; + ::std::vector< OUString > aStrippedMasterFields; + ::std::vector< OUString > aStrippedDetailFields; bool bNeedExchangeLinks = false; // classify the links - const ::rtl::OUString* pMasterFields = m_aMasterFields.getConstArray(); - const ::rtl::OUString* pDetailFields = m_aDetailFields.getConstArray(); - const ::rtl::OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength(); + const OUString* pMasterFields = m_aMasterFields.getConstArray(); + const OUString* pDetailFields = m_aDetailFields.getConstArray(); + const OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength(); for ( ; pDetailFields < pDetailFieldsEnd; ++pDetailFields, ++pMasterFields ) { if ( pMasterFields->isEmpty() || pDetailFields->isEmpty() ) @@ -292,8 +292,8 @@ namespace dbtools // does the detail name denote a column? if ( _rxColumns->hasByName( *pDetailFields ) ) { - ::rtl::OUString sNewParamName; - const ::rtl::OUString sFilterCondition = createFilterConditionFromColumnLink( *pMasterFields, *pDetailFields, sNewParamName ); + OUString sNewParamName; + const OUString sFilterCondition = createFilterConditionFromColumnLink( *pMasterFields, *pDetailFields, sNewParamName ); OSL_PRECOND( !sNewParamName.isEmpty(), "ParameterManager::classifyLinks: createFilterConditionFromColumnLink returned nonsense!" ); // remember meta information about this new parameter @@ -327,10 +327,10 @@ namespace dbtools if ( bNeedExchangeLinks ) { - ::rtl::OUString *pFields = aStrippedMasterFields.empty() ? 0 : &aStrippedMasterFields[0]; - m_aMasterFields = Sequence< ::rtl::OUString >( pFields, aStrippedMasterFields.size() ); + OUString *pFields = aStrippedMasterFields.empty() ? 0 : &aStrippedMasterFields[0]; + m_aMasterFields = Sequence< OUString >( pFields, aStrippedMasterFields.size() ); pFields = aStrippedDetailFields.empty() ? 0 : &aStrippedDetailFields[0]; - m_aDetailFields = Sequence< ::rtl::OUString >( pFields, aStrippedDetailFields.size() ); + m_aDetailFields = Sequence< OUString >( pFields, aStrippedDetailFields.size() ); } } @@ -374,16 +374,16 @@ namespace dbtools return; // classify the links - depending on what the detail fields in each link pair denotes - ::std::vector< ::rtl::OUString > aAdditionalFilterComponents; + ::std::vector< OUString > aAdditionalFilterComponents; classifyLinks( xParentColumns, xColumns, aAdditionalFilterComponents ); // did we find links where the detail field refers to a detail column (instead of a parameter name)? if ( !aAdditionalFilterComponents.empty() ) { - const static ::rtl::OUString s_sAnd( " AND " ); + const static OUString s_sAnd( " AND " ); // build a conjunction of all the filter components - ::rtl::OUStringBuffer sAdditionalFilter; - for ( ::std::vector< ::rtl::OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin(); + OUStringBuffer sAdditionalFilter; + for ( ::std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin(); aComponent != aAdditionalFilterComponents.end(); ++aComponent ) @@ -547,8 +547,8 @@ namespace dbtools try { // the master and detail field( name)s of the - const ::rtl::OUString* pMasterFields = m_aMasterFields.getConstArray(); - const ::rtl::OUString* pDetailFields = m_aDetailFields.getConstArray(); + const OUString* pMasterFields = m_aMasterFields.getConstArray(); + const OUString* pDetailFields = m_aDetailFields.getConstArray(); sal_Int32 nMasterLen = m_aMasterFields.getLength(); Any aParamType, aScale, aValue; @@ -667,7 +667,7 @@ namespace dbtools if ( xParamColumn.is() ) { #ifdef DBG_UTIL - ::rtl::OUString sName; + OUString sName; xParamColumn->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME) ) >>= sName; OSL_ENSURE( sName == pFinalValues->Name, "ParameterManager::completeParameters: inconsistent parameter names!" ); #endif @@ -870,14 +870,14 @@ namespace dbtools return; // loop through all links pairs - const ::rtl::OUString* pMasterFields = m_aMasterFields.getConstArray(); - const ::rtl::OUString* pDetailFields = m_aDetailFields.getConstArray(); + const OUString* pMasterFields = m_aMasterFields.getConstArray(); + const OUString* pDetailFields = m_aDetailFields.getConstArray(); Reference< XPropertySet > xMasterField; Reference< XPropertySet > xDetailField; // now really .... - const ::rtl::OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength(); + const OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength(); for ( ; pDetailFields < pDetailFieldsEnd; ++pDetailFields, ++pMasterFields ) { if ( !xParentColumns->hasByName( *pMasterFields ) ) @@ -914,7 +914,7 @@ namespace dbtools if ( !xInnerParameter.is() ) continue; - ::rtl::OUString sParamColumnRealName; + OUString sParamColumnRealName; xInnerParameter->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME) ) >>= sParamColumnRealName; if ( xColumns->hasByName( sParamColumnRealName ) ) { // our own columns have a column which's name equals the real name of the param column @@ -960,7 +960,7 @@ namespace dbtools } //-------------------------------------------------------------------- - void ParameterManager::setObjectNull( sal_Int32 _nIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) + void ParameterManager::setObjectNull( sal_Int32 _nIndex, sal_Int32 sqlType, const OUString& typeName ) { VISIT_PARAMETER( setObjectNull( _nIndex, sqlType, typeName ) ); } @@ -1008,7 +1008,7 @@ namespace dbtools } //-------------------------------------------------------------------- - void ParameterManager::setString( sal_Int32 _nIndex, const ::rtl::OUString& x ) + void ParameterManager::setString( sal_Int32 _nIndex, const OUString& x ) { VISIT_PARAMETER( setString( _nIndex, x ) ); } diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index 25215c93b0c7..bcf49827364c 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -115,7 +115,7 @@ namespace param IMPLEMENT_GET_IMPLEMENTATION_ID( ParameterWrapper ) //-------------------------------------------------------------------- - ::rtl::OUString ParameterWrapper::impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const + OUString ParameterWrapper::impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const { Reference< XPropertySetInfo > xInfo = const_cast( this )->getPropertySetInfo(); Sequence< Property > aProperties = xInfo->getProperties(); @@ -127,7 +127,7 @@ namespace param } OSL_FAIL( "ParameterWrapper::impl_getPseudoAggregatePropertyName: invalid argument!" ); - return ::rtl::OUString(); + return OUString(); } //-------------------------------------------------------------------- @@ -148,7 +148,7 @@ namespace param sal_Int32 nProperties( aProperties.getLength() ); aProperties.realloc( nProperties + 1 ); aProperties[ nProperties ] = Property( - ::rtl::OUString( "Value" ), + OUString( "Value" ), PROPERTY_ID_VALUE, ::cppu::UnoType< Any >::get(), PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID @@ -185,11 +185,11 @@ namespace param { // TODO : aParamType & nScale can be obtained within the constructor .... sal_Int32 nParamType = DataType::VARCHAR; - OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nParamType ); + OSL_VERIFY( m_xDelegator->getPropertyValue( OUString( "Type" ) ) >>= nParamType ); sal_Int32 nScale = 0; - if ( m_xDelegatorPSI->hasPropertyByName( ::rtl::OUString( "Scale" ) ) ) - OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( "Scale" ) ) >>= nScale ); + if ( m_xDelegatorPSI->hasPropertyByName( OUString( "Scale" ) ) ) + OSL_VERIFY( m_xDelegator->getPropertyValue( OUString( "Scale" ) ) >>= nScale ); if ( m_xValueDestination.is() ) { @@ -213,7 +213,7 @@ namespace param } else { - ::rtl::OUString aName = impl_getPseudoAggregatePropertyName( nHandle ); + OUString aName = impl_getPseudoAggregatePropertyName( nHandle ); m_xDelegator->setPropertyValue( aName, rValue ); } } @@ -227,7 +227,7 @@ namespace param } else { - ::rtl::OUString aName = impl_getPseudoAggregatePropertyName( nHandle ); + OUString aName = impl_getPseudoAggregatePropertyName( nHandle ); rValue = m_xDelegator->getPropertyValue( aName ); } } @@ -323,7 +323,7 @@ namespace param void ParameterWrapperContainer::impl_checkDisposed_throw() { if ( rBHelper.bDisposed ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); } //-------------------------------------------------------------------- diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index ba5ed7692625..a7f8f04f2b57 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -61,7 +61,7 @@ namespace dbtools //===================================================================== //--------------------------------------------------------------------- - static sal_Unicode lcl_getSeparatorChar( const ::rtl::OUString& _rSeparator, sal_Unicode _nFallback ) + static sal_Unicode lcl_getSeparatorChar( const OUString& _rSeparator, sal_Unicode _nFallback ) { OSL_ENSURE( !_rSeparator.isEmpty(), "::lcl_getSeparatorChar: invalid separator string!" ); @@ -134,13 +134,13 @@ namespace dbtools } //--------------------------------------------------------------------- - OSQLParseNode* OPredicateInputController::implPredicateTree(::rtl::OUString& _rErrorMessage, const ::rtl::OUString& _rStatement, const Reference< XPropertySet > & _rxField) const + OSQLParseNode* OPredicateInputController::implPredicateTree(OUString& _rErrorMessage, const OUString& _rStatement, const Reference< XPropertySet > & _rxField) const { OSQLParseNode* pReturn = const_cast< OSQLParser& >( m_aParser ).predicateTree( _rErrorMessage, _rStatement, m_xFormatter, _rxField ); if ( !pReturn ) { // is it a text field ? sal_Int32 nType = DataType::OTHER; - _rxField->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nType; + _rxField->getPropertyValue( OUString( "Type" ) ) >>= nType; if ( ( DataType::CHAR == nType ) || ( DataType::VARCHAR == nType ) @@ -148,15 +148,15 @@ namespace dbtools || ( DataType::CLOB == nType ) ) { // yes -> force a quoted text and try again - ::rtl::OUString sQuoted( _rStatement ); + OUString sQuoted( _rStatement ); if ( !sQuoted.isEmpty() && ( (sQuoted.getStr()[0] != '\'') || (sQuoted.getStr()[ sQuoted.getLength() - 1 ] != '\'' ) ) ) { - static const ::rtl::OUString sSingleQuote( "'" ); - static const ::rtl::OUString sDoubleQuote( "''" ); + static const OUString sSingleQuote( "'" ); + static const OUString sDoubleQuote( "''" ); sal_Int32 nIndex = -1; sal_Int32 nTemp = 0; @@ -166,7 +166,7 @@ namespace dbtools nTemp = nIndex+2; } - ::rtl::OUString sTemp( sSingleQuote ); + OUString sTemp( sSingleQuote ); ( sTemp += sQuoted ) += sSingleQuote; sQuoted = sTemp; } @@ -199,17 +199,17 @@ namespace dbtools try { Reference< XPropertySetInfo > xPSI( _rxField->getPropertySetInfo() ); - if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString( "FormatKey" ) ) ) + if ( xPSI.is() && xPSI->hasPropertyByName( OUString( "FormatKey" ) ) ) { sal_Int32 nFormatKey = 0; - _rxField->getPropertyValue( ::rtl::OUString( "FormatKey" ) ) >>= nFormatKey; + _rxField->getPropertyValue( OUString( "FormatKey" ) ) >>= nFormatKey; if ( nFormatKey && m_xFormatter.is() ) { Locale aFormatLocale; ::comphelper::getNumberFormatProperty( m_xFormatter, nFormatKey, - ::rtl::OUString( "Locale" ) + OUString( "Locale" ) ) >>= aFormatLocale; // valid locale @@ -230,7 +230,7 @@ namespace dbtools if ( bDecDiffers || bFmtDiffers ) { // okay, at least one differs // "translate" the value into the "format locale" - ::rtl::OUString sTranslated( _rStatement ); + OUString sTranslated( _rStatement ); const sal_Unicode nIntermediate( '_' ); sTranslated = sTranslated.replace( nCtxDecSep, nIntermediate ); sTranslated = sTranslated.replace( nCtxThdSep, nFmtThdSep ); @@ -245,7 +245,7 @@ namespace dbtools //--------------------------------------------------------------------- sal_Bool OPredicateInputController::normalizePredicateString( - ::rtl::OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField, ::rtl::OUString* _pErrorMessage ) const + OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField, OUString* _pErrorMessage ) const { OSL_ENSURE( m_xConnection.is() && m_xFormatter.is() && _rxField.is(), "OPredicateInputController::normalizePredicateString: invalid state or params!" ); @@ -254,8 +254,8 @@ namespace dbtools if ( m_xConnection.is() && m_xFormatter.is() && _rxField.is() ) { // parse the string - ::rtl::OUString sError; - ::rtl::OUString sTransformedText( _rPredicateValue ); + OUString sError; + OUString sTransformedText( _rPredicateValue ); OSQLParseNode* pParseNode = implPredicateTree( sError, sTransformedText, _rxField ); if ( _pErrorMessage ) *_pErrorMessage = sError; @@ -266,7 +266,7 @@ namespace dbtools getSeparatorChars( rParseContext.getPreferredLocale(), nDecSeparator, nThousandSeparator ); // translate it back into a string - sTransformedText = ::rtl::OUString(); + sTransformedText = OUString(); pParseNode->parseNodeToPredicateStr( sTransformedText, m_xConnection, m_xFormatter, _rxField, rParseContext.getPreferredLocale(), (sal_Char)nDecSeparator, &rParseContext @@ -282,15 +282,15 @@ namespace dbtools } //--------------------------------------------------------------------- - ::rtl::OUString OPredicateInputController::getPredicateValue( - const ::rtl::OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField, - sal_Bool _bForStatementUse, ::rtl::OUString* _pErrorMessage ) const + OUString OPredicateInputController::getPredicateValue( + const OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField, + sal_Bool _bForStatementUse, OUString* _pErrorMessage ) const { OSL_ENSURE( _rxField.is(), "OPredicateInputController::getPredicateValue: invalid params!" ); - ::rtl::OUString sReturn; + OUString sReturn; if ( _rxField.is() ) { - ::rtl::OUString sValue( _rPredicateValue ); + OUString sValue( _rPredicateValue ); // a little problem : if the field is a text field, the normalizePredicateString added two // '-characters to the text. If we would give this to predicateTree this would add @@ -305,8 +305,8 @@ namespace dbtools if ( bValidQuotedText ) { sValue = sValue.copy( 1, sValue.getLength() - 2 ); - static const ::rtl::OUString sSingleQuote( "'" ); - static const ::rtl::OUString sDoubleQuote( "''" ); + static const OUString sSingleQuote( "'" ); + static const OUString sDoubleQuote( "''" ); sal_Int32 nIndex = -1; sal_Int32 nTemp = 0; @@ -320,7 +320,7 @@ namespace dbtools // The following is mostly stolen from the former implementation in the parameter dialog // (dbaccess/source/ui/dlg/paramdialog.cxx). I do not fully understand this ..... - ::rtl::OUString sError; + OUString sError; OSQLParseNode* pParseNode = implPredicateTree( sError, sValue, _rxField ); if ( _pErrorMessage ) *_pErrorMessage = sError; @@ -331,12 +331,12 @@ namespace dbtools return sReturn; } - ::rtl::OUString OPredicateInputController::getPredicateValue( - const ::rtl::OUString& _sField, const ::rtl::OUString& _rPredicateValue, sal_Bool _bForStatementUse, ::rtl::OUString* _pErrorMessage ) const + OUString OPredicateInputController::getPredicateValue( + const OUString& _sField, const OUString& _rPredicateValue, sal_Bool _bForStatementUse, OUString* _pErrorMessage ) const { - ::rtl::OUString sReturn = _rPredicateValue; - ::rtl::OUString sError; - ::rtl::OUString sField = _sField; + OUString sReturn = _rPredicateValue; + OUString sError; + OUString sField = _sField; sal_Int32 nIndex = 0; sField = sField.getToken(0,'(',nIndex); if(nIndex == -1) @@ -345,9 +345,9 @@ namespace dbtools if ( nType == DataType::OTHER || sField.isEmpty() ) { // first try the international version - ::rtl::OUString sSql; - sSql += ::rtl::OUString("SELECT * "); - sSql += ::rtl::OUString(" FROM x WHERE "); + OUString sSql; + sSql += OUString("SELECT * "); + sSql += OUString(" FROM x WHERE "); sSql += sField; sSql += _rPredicateValue; ::std::auto_ptr pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, sal_True ) ); @@ -363,9 +363,9 @@ namespace dbtools Reference xMeta = m_xConnection->getMetaData(); parse::OParseColumn* pColumn = new parse::OParseColumn( sField, - ::rtl::OUString(), - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), + OUString(), ColumnValue::NULLABLE_UNKNOWN, 0, 0, @@ -373,9 +373,9 @@ namespace dbtools sal_False, sal_False, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(), - ::rtl::OUString(), - ::rtl::OUString(), - ::rtl::OUString()); + OUString(), + OUString(), + OUString()); Reference xColumn = pColumn; pColumn->setFunction(sal_True); pColumn->setRealName(sField); @@ -386,9 +386,9 @@ namespace dbtools return pParseNode ? implParseNode(pParseNode,_bForStatementUse) : sReturn; } - ::rtl::OUString OPredicateInputController::implParseNode(OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const + OUString OPredicateInputController::implParseNode(OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const { - ::rtl::OUString sReturn; + OUString sReturn; if ( pParseNode ) { boost::shared_ptr xTakeOwnership(pParseNode); diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx index 9534664d650f..30df7cb335ae 100644 --- a/connectivity/source/commontools/propertyids.cxx +++ b/connectivity/source/commontools/propertyids.cxx @@ -101,9 +101,9 @@ namespace dbtools rtl_uString_release(aIter->second); } // ------------------------------------------------------------------------------ - ::rtl::OUString OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const + OUString OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const { - ::rtl::OUString sRet; + OUString sRet; ::std::map::const_iterator aIter = m_aPropertyMap.find(_nIndex); if(aIter == m_aPropertyMap.end()) sRet = const_cast(this)->fillValue(_nIndex); @@ -112,7 +112,7 @@ namespace dbtools return sRet; } // ------------------------------------------------------------------------------ - ::rtl::OUString OPropertyMap::fillValue(sal_Int32 _nIndex) + OUString OPropertyMap::fillValue(sal_Int32 _nIndex) { rtl_uString* pStr = NULL; switch(_nIndex) diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 435472aed1a6..bcf4a2cf18cc 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -61,9 +61,9 @@ namespace connectivity ~SQLError_Impl(); // versions of the public SQLError methods which are just delegated to this impl-class - static const ::rtl::OUString& getMessagePrefix(); - ::rtl::OUString getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ); - ::rtl::OUString getSQLState( const ErrorCondition _eCondition ); + static const OUString& getMessagePrefix(); + OUString getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ); + OUString getSQLState( const ErrorCondition _eCondition ); static ErrorCode getErrorCode( const ErrorCondition _eCondition ); void raiseException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ); void raiseException( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ); @@ -72,11 +72,11 @@ namespace connectivity private: /// returns the basic error message associated with the given error condition, without any parameter replacements - ::rtl::OUString + OUString impl_getErrorMessage( const ErrorCondition& _eCondition ); /// returns the SQLState associated with the given error condition - ::rtl::OUString + OUString impl_getSQLState( const ErrorCondition& _eCondition ); /// returns an SQLException describing the given error condition @@ -111,9 +111,9 @@ namespace connectivity } //-------------------------------------------------------------------- - const ::rtl::OUString& SQLError_Impl::getMessagePrefix() + const OUString& SQLError_Impl::getMessagePrefix() { - static ::rtl::OUString s_sMessagePrefix( "[OOoBase]" ); + static OUString s_sMessagePrefix( "[OOoBase]" ); return s_sMessagePrefix; } @@ -123,7 +123,7 @@ namespace connectivity //................................................................ /** substitutes a given placeholder in the given message with the given value */ - void lcl_substitutePlaceholder( ::rtl::OUString& _rMessage, const sal_Char* _pPlaceholder, ParamValue _rParamValue ) + void lcl_substitutePlaceholder( OUString& _rMessage, const sal_Char* _pPlaceholder, ParamValue _rParamValue ) { size_t nPlaceholderLen( strlen( _pPlaceholder ) ); sal_Int32 nIndex = _rMessage.indexOfAsciiL( _pPlaceholder, nPlaceholderLen ); @@ -146,9 +146,9 @@ namespace connectivity } //-------------------------------------------------------------------- - ::rtl::OUString SQLError_Impl::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) + OUString SQLError_Impl::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) { - ::rtl::OUString sErrorMessage( impl_getErrorMessage( _eCondition ) ); + OUString sErrorMessage( impl_getErrorMessage( _eCondition ) ); lcl_substitutePlaceholder( sErrorMessage, "$1$", _rParamValue1 ); lcl_substitutePlaceholder( sErrorMessage, "$2$", _rParamValue2 ); @@ -158,7 +158,7 @@ namespace connectivity } //-------------------------------------------------------------------- - ::rtl::OUString SQLError_Impl::getSQLState( const ErrorCondition _eCondition ) + OUString SQLError_Impl::getSQLState( const ErrorCondition _eCondition ) { return impl_getSQLState( _eCondition ); } @@ -234,13 +234,13 @@ namespace connectivity } //-------------------------------------------------------------------- - ::rtl::OUString SQLError_Impl::impl_getErrorMessage( const ErrorCondition& _eCondition ) + OUString SQLError_Impl::impl_getErrorMessage( const ErrorCondition& _eCondition ) { - ::rtl::OUStringBuffer aMessage; + OUStringBuffer aMessage; if ( impl_initResources() ) { - ::rtl::OUString sResMessage( m_pResources->loadString( lcl_getResourceID( _eCondition, false ) ) ); + OUString sResMessage( m_pResources->loadString( lcl_getResourceID( _eCondition, false ) ) ); OSL_ENSURE( !sResMessage.isEmpty(), "SQLError_Impl::impl_getErrorMessage: illegal error condition, or invalid resource!" ); aMessage.append( getMessagePrefix() ).appendAscii( " " ).append( sResMessage ); } @@ -249,9 +249,9 @@ namespace connectivity } //-------------------------------------------------------------------- - ::rtl::OUString SQLError_Impl::impl_getSQLState( const ErrorCondition& _eCondition ) + OUString SQLError_Impl::impl_getSQLState( const ErrorCondition& _eCondition ) { - ::rtl::OUString sState; + OUString sState; if ( impl_initResources() ) { @@ -261,7 +261,7 @@ namespace connectivity } if ( sState.isEmpty() ) - sState = ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) ); + sState = OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) ); return sState; } @@ -296,13 +296,13 @@ namespace connectivity } //-------------------------------------------------------------------- - const ::rtl::OUString& SQLError::getMessagePrefix() + const OUString& SQLError::getMessagePrefix() { return SQLError_Impl::getMessagePrefix(); } //-------------------------------------------------------------------- - ::rtl::OUString SQLError::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) const + OUString SQLError::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) const { return m_pImpl->getErrorMessage( _eCondition, _rParamValue1, _rParamValue2, _rParamValue3 ); } diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index d92adb8072f2..0954fd02de9f 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.cxx @@ -59,9 +59,9 @@ namespace dbtools { const Reference< XConnection > xConnection; Reference< XSingleSelectQueryComposer > xComposer; - ::rtl::OUString sCommand; - ::rtl::OUString sFilter; - ::rtl::OUString sOrder; + OUString sCommand; + OUString sFilter; + OUString sOrder; sal_Int32 nCommandType; sal_Bool bEscapeProcessing; bool bComposerDirty; @@ -112,7 +112,7 @@ namespace dbtools try { - ::rtl::OUString sStatement; + OUString sStatement; switch ( _rData.nCommandType ) { case CommandType::COMMAND: @@ -126,9 +126,9 @@ namespace dbtools if ( _rData.sCommand.isEmpty() ) break; - sStatement = ::rtl::OUString( "SELECT * FROM " ); + sStatement = OUString( "SELECT * FROM " ); - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; qualifiedNameComponents( _rData.xConnection->getMetaData(), _rData.sCommand, sCatalog, sSchema, sTable, eInDataManipulation ); sStatement += composeTableNameForSelect( _rData.xConnection, sCatalog, sSchema, sTable ); @@ -148,12 +148,12 @@ namespace dbtools // a native query ? sal_Bool bQueryEscapeProcessing = sal_False; - xQuery->getPropertyValue( ::rtl::OUString( "EscapeProcessing" ) ) >>= bQueryEscapeProcessing; + xQuery->getPropertyValue( OUString( "EscapeProcessing" ) ) >>= bQueryEscapeProcessing; if ( !bQueryEscapeProcessing ) break; // the command used by the query - xQuery->getPropertyValue( ::rtl::OUString( "Command" ) ) >>= sStatement; + xQuery->getPropertyValue( OUString( "Command" ) ) >>= sStatement; if ( sStatement.isEmpty() ) break; @@ -161,7 +161,7 @@ namespace dbtools Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW ); ::utl::SharedUNOComponent< XSingleSelectQueryComposer > xComposer; xComposer.set( - xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), + xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY_THROW ); @@ -169,17 +169,17 @@ namespace dbtools xComposer->setElementaryQuery( sStatement ); // the sort order - const ::rtl::OUString sPropOrder( ::rtl::OUString( "Order" ) ); + const OUString sPropOrder( OUString( "Order" ) ); if ( ::comphelper::hasProperty( sPropOrder, xQuery ) ) { - ::rtl::OUString sOrder; + OUString sOrder; OSL_VERIFY( xQuery->getPropertyValue( sPropOrder ) >>= sOrder ); xComposer->setOrder( sOrder ); } // the filter sal_Bool bApplyFilter = sal_True; - const ::rtl::OUString sPropApply( "ApplyFilter" ); + const OUString sPropApply( "ApplyFilter" ); if ( ::comphelper::hasProperty( sPropApply, xQuery ) ) { OSL_VERIFY( xQuery->getPropertyValue( sPropApply ) >>= bApplyFilter ); @@ -187,8 +187,8 @@ namespace dbtools if ( bApplyFilter ) { - ::rtl::OUString sFilter; - OSL_VERIFY( xQuery->getPropertyValue( ::rtl::OUString( "Filter" ) ) >>= sFilter ); + OUString sFilter; + OSL_VERIFY( xQuery->getPropertyValue( OUString( "Filter" ) ) >>= sFilter ); xComposer->setFilter( sFilter ); } @@ -206,7 +206,7 @@ namespace dbtools { // create an composer Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW ); - Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), + Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY_THROW ); xComposer->setElementaryQuery( sStatement ); @@ -238,7 +238,7 @@ namespace dbtools //==================================================================== //-------------------------------------------------------------------- StatementComposer::StatementComposer( const Reference< XConnection >& _rxConnection, - const ::rtl::OUString& _rCommand, const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing ) + const OUString& _rCommand, const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing ) :m_pData( new StatementComposer_Data( _rxConnection ) ) { OSL_PRECOND( _rxConnection.is(), "StatementComposer::StatementComposer: illegal connection!" ); @@ -260,14 +260,14 @@ namespace dbtools } //-------------------------------------------------------------------- - void StatementComposer::setFilter( const ::rtl::OUString& _rFilter ) + void StatementComposer::setFilter( const OUString& _rFilter ) { m_pData->sFilter = _rFilter; m_pData->bComposerDirty = true; } //-------------------------------------------------------------------- - void StatementComposer::setOrder( const ::rtl::OUString& _rOrder ) + void StatementComposer::setOrder( const OUString& _rOrder ) { m_pData->sOrder = _rOrder; m_pData->bComposerDirty = true; @@ -281,14 +281,14 @@ namespace dbtools } //-------------------------------------------------------------------- - ::rtl::OUString StatementComposer::getQuery() + OUString StatementComposer::getQuery() { if ( lcl_ensureUpToDateComposer_nothrow( *m_pData ) ) { return m_pData->xComposer->getQuery(); } - return ::rtl::OUString(); + return OUString(); } //........................................................................ diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx index 3a65fc438173..44b7a69de9e8 100644 --- a/connectivity/source/commontools/warningscontainer.cxx +++ b/connectivity/source/commontools/warningscontainer.cxx @@ -103,9 +103,9 @@ namespace dbtools } //-------------------------------------------------------------------- - void WarningsContainer::appendWarning( const ::rtl::OUString& _rWarning, const sal_Char* _pAsciiSQLState, const Reference< XInterface >& _rxContext ) + void WarningsContainer::appendWarning( const OUString& _rWarning, const sal_Char* _pAsciiSQLState, const Reference< XInterface >& _rxContext ) { - appendWarning( SQLWarning( _rWarning, _rxContext, ::rtl::OUString::createFromAscii( _pAsciiSQLState ), 0, Any() ) ); + appendWarning( SQLWarning( _rWarning, _rxContext, OUString::createFromAscii( _pAsciiSQLState ), 0, Any() ) ); } //........................................................................ diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index 83879188af38..476106b7606d 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -51,9 +51,9 @@ void SAL_CALL OPoolTimer::onShot() namespace { //-------------------------------------------------------------------- - static const ::rtl::OUString& getTimeoutNodeName() + static const OUString& getTimeoutNodeName() { - static ::rtl::OUString s_sNodeName( "Timeout" ); + static OUString s_sNodeName( "Timeout" ); return s_sNodeName; } @@ -167,7 +167,7 @@ m_xDriverNode.clear(); m_xDriver.clear(); } //-------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -209,7 +209,7 @@ void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObj } } // ----------------------------------------------------------------------------- -Reference< XConnection> OConnectionPool::createNewConnection(const ::rtl::OUString& _rURL,const Sequence< PropertyValue >& _rInfo) +Reference< XConnection> OConnectionPool::createNewConnection(const OUString& _rURL,const Sequence< PropertyValue >& _rInfo) { // create new pooled conenction Reference< XPooledConnection > xPooledConnection = new ::connectivity::OPooledConnection(m_xDriver->connect(_rURL,_rInfo),m_xProxyFactory); diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index a18579df980c..6a4d4c8711e5 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -117,7 +117,7 @@ namespace connectivity sal_Int32 m_nALiveCount; private: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> createNewConnection(const ::rtl::OUString& _rURL, + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> createNewConnection(const OUString& _rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getPooledConnection(TConnectionMap::iterator& _rIter); // calculate the timeout and the corresponding ALiveCount @@ -133,7 +133,7 @@ namespace connectivity // delete all refs void clear(sal_Bool _bDispose); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // XPropertyChangeListener diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx index 5666afce188c..e9cd16616293 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.cxx +++ b/connectivity/source/cpool/ZConnectionWrapper.cxx @@ -61,7 +61,7 @@ Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement( ) thr return m_xConnection->createStatement(); } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -70,7 +70,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatemen return m_xConnection->prepareStatement(sql); } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -79,7 +79,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( co return m_xConnection->prepareCall(sql); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -157,7 +157,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly( ) throw(SQLException, Run return m_xConnection->isReadOnly(); } // -------------------------------------------------------------------------------- -void SAL_CALL OConnectionWeakWrapper::setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException) +void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -166,7 +166,7 @@ void SAL_CALL OConnectionWeakWrapper::setCatalog( const ::rtl::OUString& catalog m_xConnection->setCatalog(catalog); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnectionWeakWrapper::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnectionWeakWrapper::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index e9e62000c191..89bac01b2f0e 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -54,9 +54,9 @@ namespace connectivity // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -65,8 +65,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx index 12887634dec5..f039de4934dd 100644 --- a/connectivity/source/cpool/ZDriverWrapper.cxx +++ b/connectivity/source/cpool/ZDriverWrapper.cxx @@ -79,7 +79,7 @@ namespace connectivity } //-------------------------------------------------------------------- - Reference< XConnection > SAL_CALL ODriverWrapper::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Reference< XConnection > SAL_CALL ODriverWrapper::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { Reference< XConnection > xConnection; if (m_pConnectionPool) @@ -92,13 +92,13 @@ namespace connectivity } //-------------------------------------------------------------------- - sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const ::rtl::OUString& url ) throw (SQLException, RuntimeException) + sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException) { return m_xDriver.is() && m_xDriver->acceptsURL(url); } //-------------------------------------------------------------------- - Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { Sequence< DriverPropertyInfo > aInfo; if (m_xDriver.is()) diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx index e44be72ceb69..a4ffdc93e9ff 100644 --- a/connectivity/source/cpool/ZDriverWrapper.hxx +++ b/connectivity/source/cpool/ZDriverWrapper.hxx @@ -65,9 +65,9 @@ namespace connectivity /// dtor virtual ~ODriverWrapper(); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 59de7dbeb58c..0a5aa4b8e849 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -42,33 +42,33 @@ using namespace ::osl; using namespace connectivity; //-------------------------------------------------------------------- -static const ::rtl::OUString& getConnectionPoolNodeName() +static const OUString& getConnectionPoolNodeName() { - static ::rtl::OUString s_sNodeName( "org.openoffice.Office.DataAccess/ConnectionPool" ); + static OUString s_sNodeName( "org.openoffice.Office.DataAccess/ConnectionPool" ); return s_sNodeName; } //-------------------------------------------------------------------- -static const ::rtl::OUString& getEnablePoolingNodeName() +static const OUString& getEnablePoolingNodeName() { - static ::rtl::OUString s_sNodeName( "EnablePooling" ); + static OUString s_sNodeName( "EnablePooling" ); return s_sNodeName; } //-------------------------------------------------------------------- -static const ::rtl::OUString& getDriverNameNodeName() +static const OUString& getDriverNameNodeName() { - static ::rtl::OUString s_sNodeName( "DriverName" ); + static OUString s_sNodeName( "DriverName" ); return s_sNodeName; } // ----------------------------------------------------------------------------- -static const ::rtl::OUString& getDriverSettingsNodeName() +static const OUString& getDriverSettingsNodeName() { - static ::rtl::OUString s_sNodeName( "DriverSettings" ); + static OUString s_sNodeName( "DriverSettings" ); return s_sNodeName; } //-------------------------------------------------------------------------- -static const ::rtl::OUString& getEnableNodeName() +static const OUString& getEnableNodeName() { - static ::rtl::OUString s_sNodeName( "Enable" ); + static OUString s_sNodeName( "Enable" ); return s_sNodeName; } @@ -100,18 +100,18 @@ OPoolCollection::~OPoolCollection() clearConnectionPools(sal_False); } // ----------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const ::rtl::OUString& _rURL ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException) { return getConnectionWithInfo(_rURL,Sequence< PropertyValue >()); } // ----------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); Reference< XConnection > xConnection; Reference< XDriver > xDriver; Reference< XInterface > xDriverNode; - ::rtl::OUString sImplName; + OUString sImplName; if(isPoolingEnabledByUrl(_rURL,xDriver,sImplName,xDriverNode) && xDriver.is()) { OConnectionPool* pConnectionPool = getConnectionPool(sImplName,xDriver,xDriverNode); @@ -137,18 +137,18 @@ sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout( ) throw(RuntimeException) return m_xManager->getLoginTimeout(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OPoolCollection::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OPoolCollection::getImplementationName( ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); return getImplementationName_Static(); } //-------------------------------------------------------------------------- -sal_Bool SAL_CALL OPoolCollection::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OPoolCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -156,7 +156,7 @@ sal_Bool SAL_CALL OPoolCollection::supportsService( const ::rtl::OUString& _rSer } //-------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL OPoolCollection::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -168,27 +168,27 @@ Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OPoolCollection::getImplementationName_Static( ) throw(RuntimeException) +OUString SAL_CALL OPoolCollection::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.sdbc.OConnectionPool"); + return OUString("com.sun.star.sdbc.OConnectionPool"); } //-------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ConnectionPool"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.sdbc.ConnectionPool"); return aSupported; } // ----------------------------------------------------------------------------- -Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const ::rtl::OUString& _rURL ) throw(RuntimeException) +Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _rURL ) throw(RuntimeException) { // returns the original driver when no connection pooling is enabled else it returns the proxy MutexGuard aGuard(m_aMutex); Reference< XDriver > xDriver; Reference< XInterface > xDriverNode; - ::rtl::OUString sImplName; + OUString sImplName; if(isPoolingEnabledByUrl(_rURL,xDriver,sImplName,xDriverNode)) { Reference< XDriver > xExistentProxy; @@ -223,7 +223,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const ::rtl::OUSt return xDriver; } // ----------------------------------------------------------------------------- -sal_Bool OPoolCollection::isDriverPoolingEnabled(const ::rtl::OUString& _sDriverImplName, +sal_Bool OPoolCollection::isDriverPoolingEnabled(const OUString& _sDriverImplName, Reference< XInterface >& _rxDriverNode) { sal_Bool bEnabled = sal_False; @@ -233,9 +233,9 @@ sal_Bool OPoolCollection::isDriverPoolingEnabled(const ::rtl::OUString& _sDriver if(xDirectAccess.is()) { - Sequence< ::rtl::OUString > aDriverKeys = xDirectAccess->getElementNames(); - const ::rtl::OUString* pDriverKeys = aDriverKeys.getConstArray(); - const ::rtl::OUString* pDriverKeysEnd = pDriverKeys + aDriverKeys.getLength(); + Sequence< OUString > aDriverKeys = xDirectAccess->getElementNames(); + const OUString* pDriverKeys = aDriverKeys.getConstArray(); + const OUString* pDriverKeysEnd = pDriverKeys + aDriverKeys.getLength(); for (;pDriverKeys != pDriverKeysEnd; ++pDriverKeys) { // the name of the driver in this round @@ -270,9 +270,9 @@ Reference OPoolCollection::getConfigPoolRoot() return m_xConfigNode; } // ----------------------------------------------------------------------------- -sal_Bool OPoolCollection::isPoolingEnabledByUrl(const ::rtl::OUString& _sUrl, +sal_Bool OPoolCollection::isPoolingEnabledByUrl(const OUString& _sUrl, Reference< XDriver >& _rxDriver, - ::rtl::OUString& _rsImplName, + OUString& _rsImplName, Reference< XInterface >& _rxDriverNode) { sal_Bool bEnabled = sal_False; @@ -299,13 +299,13 @@ void OPoolCollection::clearConnectionPools(sal_Bool _bDispose) { aIter->second->clear(_bDispose); aIter->second->release(); - ::rtl::OUString sKeyValue = aIter->first; + OUString sKeyValue = aIter->first; ++aIter; m_aPools.erase(sKeyValue); } } // ----------------------------------------------------------------------------- -OConnectionPool* OPoolCollection::getConnectionPool(const ::rtl::OUString& _sImplName, +OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName, const Reference< XDriver >& _xDriver, const Reference< XInterface >& _xDriverNode) { @@ -329,7 +329,7 @@ OConnectionPool* OPoolCollection::getConnectionPool(const ::rtl::OUString& _sImp return pRet; } // ----------------------------------------------------------------------------- -Reference< XInterface > OPoolCollection::createWithServiceFactory(const ::rtl::OUString& _rPath) const +Reference< XInterface > OPoolCollection::createWithServiceFactory(const OUString& _rPath) const { return createWithProvider( com::sun::star::configuration::theDefaultProvider::get(m_xContext), @@ -337,17 +337,17 @@ Reference< XInterface > OPoolCollection::createWithServiceFactory(const ::rtl::O } //------------------------------------------------------------------------ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, - const ::rtl::OUString& _rPath) const + const OUString& _rPath) const { OSL_ASSERT(_rxConfProvider.is()); Sequence< Any > args(1); args[0] = makeAny( NamedValue( - rtl::OUString("nodepath"), + OUString("nodepath"), makeAny(_rPath))); Reference< XInterface > xInterface( _rxConfProvider->createInstanceWithArguments( - rtl::OUString( "com.sun.star.configuration.ConfigurationAccess"), + OUString( "com.sun.star.configuration.ConfigurationAccess"), args)); OSL_ENSURE( xInterface.is(), @@ -355,7 +355,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu return xInterface; } // ----------------------------------------------------------------------------- -Reference OPoolCollection::openNode(const ::rtl::OUString& _rPath,const Reference& _xTreeNode) const throw() +Reference OPoolCollection::openNode(const OUString& _rPath,const Reference& _xTreeNode) const throw() { Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY); Reference< XNameAccess > xDirectAccess(_xTreeNode, UNO_QUERY); @@ -387,7 +387,7 @@ Reference OPoolCollection::openNode(const ::rtl::OUString& _rPath,co return xNode; } // ----------------------------------------------------------------------------- -Any OPoolCollection::getNodeValue(const ::rtl::OUString& _rPath,const Reference& _xTreeNode) throw() +Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference& _xTreeNode) throw() { Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY); Reference< XNameAccess > xDirectAccess(_xTreeNode, UNO_QUERY); @@ -476,7 +476,7 @@ void SAL_CALL OPoolCollection::propertyChange( const ::com::sun::star::beans::Pr evt.NewValue >>= bEnabled; if(!bEnabled) { - ::rtl::OUString sThisDriverName; + OUString sThisDriverName; getNodeValue(getDriverNameNodeName(),evt.Source) >>= sThisDriverName; // 1nd relase the driver // look if we already have a proxy for this driver diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index b601c53a21e2..b6cc41b825b3 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -81,21 +81,21 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // some configuration helper methods - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithServiceFactory(const ::rtl::OUString& _rPath) const; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getConfigPoolRoot(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider, - const ::rtl::OUString& _rPath) const; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const ::rtl::OUString& _rPath, + const OUString& _rPath) const; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const OUString& _rPath, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xTreeNode) const throw(); sal_Bool isPoolingEnabled(); - sal_Bool isDriverPoolingEnabled(const ::rtl::OUString& _sDriverImplName, + sal_Bool isDriverPoolingEnabled(const OUString& _sDriverImplName, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode); - sal_Bool isPoolingEnabledByUrl( const ::rtl::OUString& _sUrl, + sal_Bool isPoolingEnabledByUrl( const OUString& _sUrl, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _rxDriver, - ::rtl::OUString& _rsImplName, + OUString& _rsImplName, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode); - OConnectionPool* getConnectionPool( const ::rtl::OUString& _sImplName, + OConnectionPool* getConnectionPool( const OUString& _sImplName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _xDriver, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode); void clearConnectionPools(sal_Bool _bDispose); @@ -104,26 +104,26 @@ namespace connectivity virtual ~OPoolCollection(); public: - static ::com::sun::star::uno::Any getNodeValue( const ::rtl::OUString& _rPath, + static ::com::sun::star::uno::Any getNodeValue( const OUString& _rPath, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xTreeNode)throw(); // XDriverManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(::com::sun::star::uno::RuntimeException); //XDriverAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SAL_CALL getDriverByURL( const ::rtl::OUString& url ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL CreateInstance(const::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); - static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index 5bd0ffb0c403..882b1d57bdbd 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -37,7 +37,7 @@ IMPLEMENT_SERVICE_INFO(OCallableStatement,"com.sun.star.sdbcx.ACallableStatement //************************************************************** //************ Class: java.sql.CallableStatement //************************************************************** -OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const ::rtl::OUString& sql ) +OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql ) : OPreparedStatement( _pConnection, _TypeInfo, sql ) { m_Command.put_CommandType(adCmdStoredProc); @@ -124,7 +124,7 @@ sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(S } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; @@ -145,7 +145,7 @@ sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(S } // ------------------------------------------------------------------------- -void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { ADOParameter* pParam = NULL; m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam); diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx index 1de00a08f04e..4583503f8b7a 100644 --- a/connectivity/source/drivers/ado/ACatalog.cxx +++ b/connectivity/source/drivers/ado/ACatalog.cxx @@ -59,7 +59,7 @@ void OCatalog::refreshTables() WpADOTable aElement = aTables.GetItem(i); if ( aElement.IsValid() ) { - ::rtl::OUString sTypeName = aElement.get_Type(); + OUString sTypeName = aElement.get_Type(); if ( !sTypeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("SYSTEM TABLE")) && !sTypeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("ACCESS TABLE")) ) aVector.push_back(aElement.get_Name()); diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 7dcd8cffff43..2706f08d5ca0 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -106,7 +106,7 @@ void OAdoColumn::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, nAttrib,&m_IsAscending, ::getBooleanCppuType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< OUString*>(0))); } // ----------------------------------------------------------------------------- void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) @@ -122,14 +122,14 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r break; case PROPERTY_ID_RELATEDCOLUMN: { - ::rtl::OUString aVal; + OUString aVal; rValue >>= aVal; m_aColumn.put_RelatedColumn(aVal); } break; case PROPERTY_ID_NAME: { - ::rtl::OUString aVal; + OUString aVal; rValue >>= aVal; m_aColumn.put_Name(aVal); } @@ -171,7 +171,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r break; case PROPERTY_ID_ISAUTOINCREMENT: - OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString( "Autoincrement" ), getBOOL( rValue ) ); + OTools::putValue( m_aColumn.get_Properties(), OUString( "Autoincrement" ), getBOOL( rValue ) ); break; case PROPERTY_ID_IM001: @@ -185,7 +185,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r } if ( pAdoPropertyName ) - OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString::createFromAscii( pAdoPropertyName ), getString( rValue ) ); + OTools::putValue( m_aColumn.get_Properties(), OUString::createFromAscii( pAdoPropertyName ), getString( rValue ) ); } OColumn_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue); } @@ -209,7 +209,7 @@ void OAdoColumn::fillPropertyValues() sal_Bool bForceTo = sal_True; const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo(); - const OExtendedTypeInfo* pTypeInfo = OConnection::getTypeInfoFromType(*m_pConnection->getTypeInfo(),eType,::rtl::OUString(),m_Precision,m_Scale,bForceTo); + const OExtendedTypeInfo* pTypeInfo = OConnection::getTypeInfoFromType(*m_pConnection->getTypeInfo(),eType,OUString(),m_Precision,m_Scale,bForceTo); if ( pTypeInfo ) m_TypeName = pTypeInfo->aSimpleType.aTypeName; else if ( eType == adVarBinary && ADOS::isJetEngine(m_pConnection->getEngineType()) ) @@ -218,7 +218,7 @@ void OAdoColumn::fillPropertyValues() OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), ::o3tl::compose1( - ::std::bind2nd(aCase, ::rtl::OUString("VarBinary")), + ::std::bind2nd(aCase, OUString("VarBinary")), ::o3tl::compose1( ::std::mem_fun(&OExtendedTypeInfo::getDBName), ::o3tl::select2nd()) @@ -234,7 +234,7 @@ void OAdoColumn::fillPropertyValues() if ( !pTypeInfo ) { - pTypeInfo = OConnection::getTypeInfoFromType(*m_pConnection->getTypeInfo(),adBinary,::rtl::OUString(),m_Precision,m_Scale,bForceTo); + pTypeInfo = OConnection::getTypeInfoFromType(*m_pConnection->getTypeInfo(),adBinary,OUString(),m_Precision,m_Scale,bForceTo); eType = adBinary; } @@ -252,19 +252,19 @@ void OAdoColumn::fillPropertyValues() if ( aProps.IsValid() ) { - m_IsAutoIncrement = OTools::getValue( aProps, ::rtl::OUString("Autoincrement") ); + m_IsAutoIncrement = OTools::getValue( aProps, OUString("Autoincrement") ); - m_Description = OTools::getValue( aProps, ::rtl::OUString("Description") ); + m_Description = OTools::getValue( aProps, OUString("Description") ); - m_DefaultValue = OTools::getValue( aProps, ::rtl::OUString("Default") ); + m_DefaultValue = OTools::getValue( aProps, OUString("Default") ); #if OSL_DEBUG_LEVEL > 0 sal_Int32 nCount = aProps.GetItemCount(); for (sal_Int32 i = 0; i OColumns::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { OAdoColumn* pColumn = NULL; Reference< XPropertySet > xColumn; @@ -82,7 +82,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc nType = ADOS::MapADOType2Jdbc(aColumn.get_Type()); #endif - ::rtl::OUString sTypeName; + OUString sTypeName; pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sTypeName; const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo(); @@ -110,7 +110,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc sal_Bool bAutoIncrement = sal_False; pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; if ( bAutoIncrement ) - OTools::putValue( aAddedColumn.get_Properties(), ::rtl::OUString("Autoincrement"), bAutoIncrement ); + OTools::putValue( aAddedColumn.get_Properties(), OUString("Autoincrement"), bAutoIncrement ); if ( aFind != pTypeInfoMap->end() && aColumn.get_Type() != aAddedColumn.get_Type() ) // change column type if necessary aColumn.put_Type(aFind->first); @@ -127,7 +127,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc } // ------------------------------------------------------------------------- // XDrop -void OColumns::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) +void OColumns::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { if(!m_aCollection.Delete(_sElementName)) ADOS::ThrowException(*m_pConnection->getConnection(),static_cast(this)); diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 019935d344b4..ee00d3adf862 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -97,7 +97,7 @@ OConnection::~OConnection() { } //----------------------------------------------------------------------------- -void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) +void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) { osl_atomic_increment( &m_refCount ); @@ -105,7 +105,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); - ::rtl::OUString aDSN(url.copy(nLen+1)),aUID,aPWD; + OUString aDSN(url.copy(nLen+1)),aUID,aPWD; if ( aDSN.startsWith("access:") ) aDSN = aDSN.copy(7); @@ -138,8 +138,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV WpADOProperties aProps = m_pAdoConnection->get_Properties(); if(aProps.IsValid()) { - OTools::putValue(aProps,::rtl::OUString("Jet OLEDB:ODBC Parsing"),sal_True); - OLEVariant aVar(OTools::getValue(aProps,::rtl::OUString("Jet OLEDB:Engine Type"))); + OTools::putValue(aProps,OUString("Jet OLEDB:ODBC Parsing"),sal_True); + OLEVariant aVar(OTools::getValue(aProps,OUString("Jet OLEDB:Engine Type"))); if(!aVar.isNull() && !aVar.isEmpty()) m_nEngineType = aVar; } @@ -174,7 +174,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return pStmt; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -186,7 +186,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const :: return xPStmt; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -198,17 +198,17 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl:: return xPStmt; } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& _sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); - ::rtl::OUString sql = _sql; + OUString sql = _sql; WpADOProperties aProps = m_pAdoConnection->get_Properties(); if(aProps.IsValid()) { - OTools::putValue(aProps,::rtl::OUString("Jet OLEDB:ODBC Parsing"),sal_True); + OTools::putValue(aProps,OUString("Jet OLEDB:ODBC Parsing"),sal_True); WpADOCommand aCommand; aCommand.Create(); aCommand.put_ActiveConnection((IDispatch*)*m_pAdoConnection); @@ -302,7 +302,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return m_pAdoConnection->get_Mode() == adModeRead; } // -------------------------------------------------------------------------------- -void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -311,7 +311,7 @@ void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& catalog ) throw(SQ ADOS::ThrowException(*m_pAdoConnection,*this); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -435,7 +435,7 @@ void OConnection::buildTypeInfo() throw( SQLException) if ( bOk ) { // HACK for access - static const ::rtl::OUString s_sVarChar("VarChar"); + static const OUString s_sVarChar("VarChar"); do { sal_Int32 nPos = 1; @@ -527,7 +527,7 @@ Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId() // ----------------------------------------------------------------------------- const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, DataTypeEnum _nType, - const ::rtl::OUString& _sTypeName, + const OUString& _sTypeName, sal_Int32 _nPrecision, sal_Int32 _nScale, sal_Bool& _brForceToType) @@ -544,7 +544,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r // search the best matching type OExtendedTypeInfo* pInfo = aIter->second; #ifdef DBG_UTIL - ::rtl::OUString sDBTypeName = pInfo->aSimpleType.aTypeName; + OUString sDBTypeName = pInfo->aSimpleType.aTypeName; sal_Int32 nDBTypePrecision = pInfo->aSimpleType.nPrecision; (void)nDBTypePrecision; sal_Int32 nDBTypeScale = pInfo->aSimpleType.nMaximumScale; (void)nDBTypeScale; sal_Int32 nAdoType = pInfo->eType; (void)nAdoType; @@ -571,11 +571,11 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r { // we can not assert here because we could be in d&d /* - OSL_FAIL(( ::rtl::OString("getTypeInfoFromType: assuming column type ") - += ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), osl_getThreadTextEncoding()) - += ::rtl::OString("\" (expected type name ") - += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), osl_getThreadTextEncoding()) - += ::rtl::OString(" matches the type's local name).")).getStr()); + OSL_FAIL(( OString("getTypeInfoFromType: assuming column type ") + += OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), osl_getThreadTextEncoding()) + += OString("\" (expected type name ") + += OString(_sTypeName.getStr(), _sTypeName.getLength(), osl_getThreadTextEncoding()) + += OString(" matches the type's local name).")).getStr()); */ break; } diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index df38f9e2cfb8..cda9dc531b26 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -46,7 +46,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) { } // ------------------------------------------------------------------------- -sal_Int32 ODatabaseMetaData::getInt32Property(const ::rtl::OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); // ADOS::ThrowException(*m_pADOConnection,*this); @@ -59,7 +59,7 @@ sal_Int32 ODatabaseMetaData::getInt32Property(const ::rtl::OUString& _aProperty) } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::getBoolProperty(const ::rtl::OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); ADOS::ThrowException(*m_pADOConnection,*this); @@ -68,14 +68,14 @@ sal_Bool ODatabaseMetaData::getBoolProperty(const ::rtl::OUString& _aProperty) return (!aVar.isNull() && !aVar.isEmpty() ? aVar.getBool() : sal_False); } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::getStringProperty(const ::rtl::OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); ADOS::ThrowException(*m_pADOConnection,*this); OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection"); ADO_PROP(_aProperty); - ::rtl::OUString aValue; + OUString aValue; if(!aVar.isNull() && !aVar.isEmpty() && aVar.getType() == VT_BSTR) aValue = aVar; @@ -110,7 +110,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) throw(SQLExc return xRef; } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) { return getLiteral(DBLITERAL_CATALOG_SEPARATOR); } @@ -133,8 +133,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLExce } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = m_pADOConnection->getColumnPrivileges(catalog,schema,table,columnNamePattern); ADOS::ThrowException(*m_pADOConnection,*this); @@ -148,8 +148,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = m_pADOConnection->getColumns(catalog,schemaPattern,tableNamePattern,columnNamePattern); ADOS::ThrowException(*m_pADOConnection,*this); @@ -164,8 +164,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( - const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = m_pADOConnection->getTables(catalog,schemaPattern,tableNamePattern,types); ADOS::ThrowException(*m_pADOConnection,*this); @@ -180,8 +180,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( - const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = m_pADOConnection->getProcedureColumns(catalog,schemaPattern,procedureNamePattern,columnNamePattern); ADOS::ThrowException(*m_pADOConnection,*this); @@ -196,8 +196,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( - const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern ) throw(SQLException, RuntimeException) { // Create elements used in the array ADORecordset *pRecordset = m_pADOConnection->getProcedures(catalog,schemaPattern,procedureNamePattern); @@ -219,7 +219,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLExc // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Maximum Row Size")); + return getInt32Property(OUString("Maximum Row Size")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) @@ -249,12 +249,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLExcept // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Active Sessions")); + return getInt32Property(OUString("Active Sessions")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Max Columns in Table")); + return getInt32Property(OUString("Max Columns in Table")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) @@ -269,11 +269,11 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLExcepti // ------------------------------------------------------------------------- sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { - return getInt32Property(::rtl::OUString("Maximum Tables in SELECT")); + return getInt32Property(OUString("Maximum Tables in SELECT")); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = m_pADOConnection->getExportedKeys(catalog,schema,table); ADOS::ThrowException(*m_pADOConnection,*this); @@ -287,7 +287,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = m_pADOConnection->getImportedKeys(catalog,schema,table); ADOS::ThrowException(*m_pADOConnection,*this); @@ -302,7 +302,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = m_pADOConnection->getPrimaryKeys(catalog,schema,table); ADOS::ThrowException(*m_pADOConnection,*this); @@ -317,7 +317,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, + const Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = m_pADOConnection->getIndexInfo(catalog,schema,table,unique,approximate); @@ -333,7 +333,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; if(!ADOS::isJetEngine(m_pConnection->getEngineType())) @@ -362,7 +362,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName()); aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getSelectValue(); - aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO")); + aRow[7] = new ::connectivity::ORowSetValueDecorator(OUString("NO")); aRows.push_back(aRow); aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getInsertValue(); @@ -386,9 +386,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( - const Any& primaryCatalog, const ::rtl::OUString& primarySchema, - const ::rtl::OUString& primaryTable, const Any& foreignCatalog, - const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(SQLException, RuntimeException) + const Any& primaryCatalog, const OUString& primarySchema, + const OUString& primaryTable, const Any& foreignCatalog, + const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = m_pADOConnection->getCrossReference(primaryCatalog,primarySchema,primaryTable,foreignCatalog,foreignSchema,foreignTable); ADOS::ThrowException(*m_pADOConnection,*this); @@ -404,37 +404,37 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString("Maximum Row Size Includes BLOB")); + return getBoolProperty(OUString("Maximum Row Size Includes BLOB")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; + return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; + return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { - return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; + return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; + return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; + return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; + return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) @@ -449,28 +449,28 @@ sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Maximum Index Size")); + return getInt32Property(OUString("Maximum Index Size")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL; + return getInt32Property(OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString("Catalog Term")); + return getStringProperty(OUString("Catalog Term")); } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { return getLiteral(DBLITERAL_QUOTE_PREFIX); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) @@ -480,27 +480,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) { - return getInt32Property(::rtl::OUString("Catalog Location")) == DBPROPVAL_CL_START; + return getInt32Property(OUString("Catalog Location")) == DBPROPVAL_CL_START; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE; + return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT; + return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DML; + return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DML; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_ALL; + return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_ALL; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) @@ -515,29 +515,29 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLExcep // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE; + return getInt32Property(OUString("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE; + return getInt32Property(OUString("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Isolation Retention")) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT; + return (getInt32Property(OUString("Isolation Retention")) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Isolation Retention")) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT; + return (getInt32Property(OUString("Isolation Retention")) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException) { sal_Bool bValue(sal_False); - sal_Int32 nTxn = getInt32Property(::rtl::OUString("Isolation Levels")); + sal_Int32 nTxn = getInt32Property(OUString("Isolation Levels")); if(level == TransactionIsolation::NONE) bValue = sal_True; else if(level == TransactionIsolation::READ_UNCOMMITTED) @@ -554,35 +554,35 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3 // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { - return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS; + return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); + sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); + sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); + sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION; + return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { - return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION; + return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) @@ -604,7 +604,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return sal_True; - return getBoolProperty(::rtl::OUString("Outer Join Capabilities")); + return getBoolProperty(OUString("Outer Join Capabilities")); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) @@ -629,7 +629,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLExcept // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_NONE; + return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_NONE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) @@ -654,7 +654,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLExcepti // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString("Read-Only Data Source")); + return getBoolProperty(OUString("Read-Only Data Source")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) @@ -674,7 +674,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLExcepti // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL; + return getInt32Property(OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) @@ -689,27 +689,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQL // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString("Rowset Conversions on Command")); + return getBoolProperty(OUString("Rowset Conversions on Command")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString("ORDER BY Columns in Select List")); + return getBoolProperty(OUString("ORDER BY Columns in Select List")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("GROUP BY Support")) != DBPROPVAL_GB_NOT_SUPPORTED; + return getInt32Property(OUString("GROUP BY Support")) != DBPROPVAL_GB_NOT_SUPPORTED; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("GROUP BY Support")) != DBPROPVAL_GB_CONTAINS_SELECT; + return getInt32Property(OUString("GROUP BY Support")) != DBPROPVAL_GB_CONTAINS_SELECT; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("GROUP BY Support")) == DBPROPVAL_GB_NO_RELATION; + return getInt32Property(OUString("GROUP BY Support")) == DBPROPVAL_GB_NO_RELATION; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) @@ -729,7 +729,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLExcep // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) { - return getBoolProperty(::rtl::OUString("ORDER BY Columns in Select List")); + return getBoolProperty(OUString("ORDER BY Columns in Select List")); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) @@ -744,32 +744,32 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, Ru // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; + return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) { - return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; + return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END; + return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START; + return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH; + return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW; + return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) @@ -779,7 +779,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(S // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; + return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) @@ -794,73 +794,73 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES; + return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON; + return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS; + return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN; + return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) { - return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED; + return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); + sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString("sdbc:ado:")+ m_pADOConnection->GetConnectionString(); + return OUString("sdbc:ado:")+ m_pADOConnection->GetConnectionString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString("User Name")); + return getStringProperty(OUString("User Name")); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString("Provider Friendly Name")); + return getStringProperty(OUString("Provider Friendly Name")); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString("Provider Version")); + return getStringProperty(OUString("Provider Version")); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString("DBMS Version")); + return getStringProperty(OUString("DBMS Version")); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString("DBMS Name")); + return getStringProperty(OUString("DBMS Name")); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString("Procedure Term")); + return getStringProperty(OUString("Procedure Term")); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(::rtl::OUString("Schema Term")); + return getStringProperty(OUString("Schema Term")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) @@ -896,7 +896,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = NULL; OLEVariant vtEmpty; @@ -910,7 +910,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc aRecordset.MoveFirst(); OLEVariant aValue; - ::rtl::OUString aRet, aComma(RTL_CONSTASCII_USTRINGPARAM(",")); + OUString aRet, aComma(RTL_CONSTASCII_USTRINGPARAM(",")); while(!aRecordset.IsAtEOF()) { WpOLEAppendCollection aFields(aRecordset.GetFields()); @@ -923,53 +923,53 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc if ( !aRet.isEmpty() ) return aRet.copy(0,aRet.lastIndexOf(',')); } - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { return getLiteral(DBLITERAL_ESCAPE_PERCENT); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue.copy(0,aValue.lastIndexOf(',')); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue.copy(0,aValue.lastIndexOf(',')); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); + sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); + sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support")); + sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM); } // ------------------------------------------------------------------------- @@ -977,7 +977,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLExcepti { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return sal_True; - return (getInt32Property(::rtl::OUString("Outer Join Capabilities")) & 0x00000004L) == 0x00000004L; + return (getInt32Property(OUString("Outer Join Capabilities")) & 0x00000004L) == 0x00000004L; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) @@ -987,12 +987,12 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLExce // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Max Columns in GROUP BY")); + return getInt32Property(OUString("Max Columns in GROUP BY")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(::rtl::OUString("Max Columns in ORDER BY")); + return getInt32Property(OUString("Max Columns in ORDER BY")); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) @@ -1065,7 +1065,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException return sal_True; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XDatabaseMetaData::getUDTs", *this ); return Reference< XResultSet >(); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index e2ca3ef77a4e..8b91a62fbb34 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -103,11 +103,11 @@ sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId) } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId) +OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId) { if(!m_aLiteralInfo.size()) fillLiterals(); - ::rtl::OUString sStr; + OUString sStr; ::std::map::const_iterator aIter = m_aLiteralInfo.find(_nId); if(aIter != m_aLiteralInfo.end() && (*aIter).second.fSupported) sStr = (*aIter).second.pwszLiteralValue; @@ -117,7 +117,7 @@ sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId) // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() { - m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString("IS_GRANTABLE"), + m_mColumns[8] = OColumn(OUString(),OUString("IS_GRANTABLE"), ColumnValue::NULLABLE, 3,3,0, DataType::VARCHAR); @@ -125,31 +125,31 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setColumnsMap() { - m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("TYPE_NAME"), + m_mColumns[6] = OColumn(OUString(),OUString("TYPE_NAME"), ColumnValue::NO_NULLS, 0,0,0, DataType::VARCHAR); - m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"), + m_mColumns[11] = OColumn(OUString(),OUString("NULLABLE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"), + m_mColumns[12] = OColumn(OUString(),OUString("REMARKS"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString("COLUMN_DEF"), + m_mColumns[13] = OColumn(OUString(),OUString("COLUMN_DEF"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATA_TYPE"), + m_mColumns[14] = OColumn(OUString(),OUString("SQL_DATA_TYPE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATETIME_SUB"), + m_mColumns[15] = OColumn(OUString(),OUString("SQL_DATETIME_SUB"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString("CHAR_OCTET_LENGTH"), + m_mColumns[16] = OColumn(OUString(),OUString("CHAR_OCTET_LENGTH"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -157,7 +157,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTablesMap() { - m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"), + m_mColumns[5] = OColumn(OUString(),OUString("REMARKS"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -165,7 +165,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() { - m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"), + m_mColumns[12] = OColumn(OUString(),OUString("NULLABLE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -173,11 +173,11 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() { - m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("KEY_SEQ"), + m_mColumns[5] = OColumn(OUString(),OUString("KEY_SEQ"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("PK_NAME"), + m_mColumns[6] = OColumn(OUString(),OUString("PK_NAME"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -185,15 +185,15 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() { - m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString("NON_UNIQUE"), + m_mColumns[4] = OColumn(OUString(),OUString("NON_UNIQUE"), ColumnValue::NO_NULLS, 1,1,0, DataType::BIT); - m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("INDEX_QUALIFIER"), + m_mColumns[5] = OColumn(OUString(),OUString("INDEX_QUALIFIER"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString("ASC_OR_DESC"), + m_mColumns[10] = OColumn(OUString(),OUString("ASC_OR_DESC"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -201,11 +201,11 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() { - m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("PRIVILEGE"), + m_mColumns[6] = OColumn(OUString(),OUString("PRIVILEGE"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("IS_GRANTABLE"), + m_mColumns[7] = OColumn(OUString(),OUString("IS_GRANTABLE"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -213,7 +213,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() { - m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString("KEY_SEQ"), + m_mColumns[9] = OColumn(OUString(),OUString("KEY_SEQ"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -221,27 +221,27 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() { - m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString("PRECISION"), + m_mColumns[3] = OColumn(OUString(),OUString("PRECISION"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"), + m_mColumns[7] = OColumn(OUString(),OUString("NULLABLE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("AUTO_INCREMENT"), + m_mColumns[12] = OColumn(OUString(),OUString("AUTO_INCREMENT"), ColumnValue::NO_NULLS, 1,1,0, DataType::BIT); - m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATA_TYPE"), + m_mColumns[16] = OColumn(OUString(),OUString("SQL_DATA_TYPE"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATETIME_SUB"), + m_mColumns[17] = OColumn(OUString(),OUString("SQL_DATETIME_SUB"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString("NUM_PREC_RADIX"), + m_mColumns[18] = OColumn(OUString(),OUString("NUM_PREC_RADIX"), ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -249,7 +249,7 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSetMetaData::setProceduresMap() { - m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"), + m_mColumns[7] = OColumn(OUString(),OUString("REMARKS"), ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -269,32 +269,32 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnServiceName(); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getTableName(); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getCatalogName(); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnTypeName(); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- @@ -306,11 +306,11 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getSchemaName(); - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- @@ -547,7 +547,7 @@ void WpADOTable::Create() } } // ------------------------------------------------------------------------- -::rtl::OUString WpADOCatalog::GetObjectOwner(const ::rtl::OUString& _rName, ObjectTypeEnum _eNum) +OUString WpADOCatalog::GetObjectOwner(const OUString& _rName, ObjectTypeEnum _eNum) { OLEVariant _rVar; _rVar.setNoArg(); @@ -571,7 +571,7 @@ void OAdoTable::fillPropertyValues() { WpADOProperties aProps = m_aTable.get_Properties(); if(aProps.IsValid()) - m_Description = OTools::getValue(aProps,::rtl::OUString("Description")); + m_Description = OTools::getValue(aProps,OUString("Description")); } } } diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index ce04f82e5128..4fd2d06caca5 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -115,7 +115,7 @@ void ODatabaseMetaDataResultSet::checkRecordSet() throw(SQLException) } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -347,7 +347,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -356,7 +356,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) columnIndex = mapColumn(columnIndex); if(m_aValue.isNull()) - return ::rtl::OUString(); + return OUString(); if(m_aIntValueRange.size() && (m_aIntValueRangeIter = m_aIntValueRange.find(columnIndex)) != m_aIntValueRange.end()) return (*m_aIntValueRangeIter).second[m_aValue]; @@ -675,10 +675,10 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const return nValue; } //------------------------------------------------------------------------------ -::rtl::OUString ODatabaseMetaDataResultSet::getCursorName() const +OUString ODatabaseMetaDataResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------ @@ -701,7 +701,7 @@ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) Sequence< com::sun::star::beans::Property > aProps(5); com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); @@ -901,9 +901,9 @@ void ODatabaseMetaDataResultSet::setColumnsMap() m_aValueRange[12] = aMap; - ::std::map< sal_Int32,::rtl::OUString> aMap2; - aMap2[0] = ::rtl::OUString("YES"); - aMap2[1] = ::rtl::OUString("NO"); + ::std::map< sal_Int32,OUString> aMap2; + aMap2[0] = OUString("YES"); + aMap2[1] = OUString("NO"); m_aIntValueRange[18] = aMap2; ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this); @@ -1034,10 +1034,10 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap() aMap[1] = 0; m_aValueRange[8] = aMap2; - ::std::map< sal_Int32,::rtl::OUString> aMap3; - aMap3[0] = ::rtl::OUString(); - aMap3[DB_COLLATION_ASC] = ::rtl::OUString("A"); - aMap3[DB_COLLATION_DESC] = ::rtl::OUString("D"); + ::std::map< sal_Int32,OUString> aMap3; + aMap3[0] = OUString(); + aMap3[DB_COLLATION_ASC] = OUString("A"); + aMap3[DB_COLLATION_DESC] = OUString("D"); m_aIntValueRange[21] = aMap3; @@ -1057,9 +1057,9 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap() m_aColMapping.push_back(6); m_aColMapping.push_back(7); - ::std::map< sal_Int32,::rtl::OUString> aMap; - aMap[0] = ::rtl::OUString("YES"); - aMap[1] = ::rtl::OUString("NO"); + ::std::map< sal_Int32,OUString> aMap; + aMap[0] = OUString("YES"); + aMap[1] = OUString("NO"); m_aIntValueRange[7] = aMap; @@ -1084,12 +1084,12 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap() m_aColMapping.push_back(16); m_aColMapping.push_back(18); - ::std::map< ::rtl::OUString,sal_Int32> aMap; - aMap[ ::rtl::OUString("CASCADE")] = KeyRule::CASCADE; - aMap[ ::rtl::OUString("RESTRICT")] = KeyRule::RESTRICT; - aMap[ ::rtl::OUString("SET NULL")] = KeyRule::SET_NULL; - aMap[ ::rtl::OUString("SET DEFAULT")] = KeyRule::SET_DEFAULT; - aMap[ ::rtl::OUString("NO ACTION")] = KeyRule::NO_ACTION; + ::std::map< OUString,sal_Int32> aMap; + aMap[ OUString("CASCADE")] = KeyRule::CASCADE; + aMap[ OUString("RESTRICT")] = KeyRule::RESTRICT; + aMap[ OUString("SET NULL")] = KeyRule::SET_NULL; + aMap[ OUString("SET DEFAULT")] = KeyRule::SET_DEFAULT; + aMap[ OUString("NO ACTION")] = KeyRule::NO_ACTION; m_aStrValueRange[14] = aMap; m_aStrValueRange[15] = aMap; @@ -1105,8 +1105,8 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(sal_Bool _bJetEngine) for(;i<19;i++) m_aColMapping.push_back(i); - ::std::map< ::rtl::OUString,sal_Int32> aMap1; - aMap1[ ::rtl::OUString()] = 10; + ::std::map< OUString,sal_Int32> aMap1; + aMap1[ OUString()] = 10; m_aStrValueRange[18] = aMap1; diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index 136b073cafc0..e0905ed37f02 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx @@ -83,20 +83,20 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw( } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnName(); if(!m_pRecordSet) - return ::rtl::OUString(); + return OUString(); WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]); if(aField.IsValid()) return aField.GetName(); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnLabel(); diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 74717ba9a0a0..e96311f022ca 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -82,16 +82,16 @@ void ODriver::disposing() } // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.comp.sdbc.ado.ODriver"); + return OUString("com.sun.star.comp.sdbc.ado.ODriver"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); - aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver"); + Sequence< OUString > aSNS( 2 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); + aSNS[1] = OUString("com.sun.star.sdbcx.Driver"); return aSNS; } //------------------------------------------------------------------ @@ -101,17 +101,17 @@ Sequence< ::rtl::OUString > ODriver::getSupportedServiceNames_Static( ) throw ( } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL ODriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL ODriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -119,13 +119,13 @@ sal_Bool SAL_CALL ODriver::supportsService( const ::rtl::OUString& _rServiceName } // -------------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL ODriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { if ( ! acceptsURL(url) ) return NULL; @@ -138,53 +138,53 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { return url.startsWith("sdbc:ado:"); } // ----------------------------------------------------------------------------- -void ODriver::impl_checkURL_throw(const ::rtl::OUString& _sUrl) +void ODriver::impl_checkURL_throw(const OUString& _sUrl) { if ( !acceptsURL(_sUrl) ) { SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); } // if ( !acceptsURL(_sUrl) ) } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { impl_checkURL_throw(url); if ( acceptsURL(url) ) { ::std::vector< DriverPropertyInfo > aDriverInfo; - Sequence< ::rtl::OUString > aBooleanValues(2); - aBooleanValues[0] = ::rtl::OUString( "false" ); - aBooleanValues[1] = ::rtl::OUString( "true" ); + Sequence< OUString > aBooleanValues(2); + aBooleanValues[0] = OUString( "false" ); + aBooleanValues[1] = OUString( "true" ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("IgnoreDriverPrivileges") - ,::rtl::OUString("Ignore the privileges from the database driver.") + OUString("IgnoreDriverPrivileges") + ,OUString("Ignore the privileges from the database driver.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("EscapeDateTime") - ,::rtl::OUString("Escape date time format.") + OUString("EscapeDateTime") + ,OUString("Escape date time format.") ,sal_False - ,::rtl::OUString( "true" ) + ,OUString( "true" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("TypeInfoSettings") - ,::rtl::OUString("Defines how the type info of the database metadata should be manipulated.") + OUString("TypeInfoSettings") + ,OUString("Defines how the type info of the database metadata should be manipulated.") ,sal_False - ,::rtl::OUString( ) - ,Sequence< ::rtl::OUString > ()) + ,OUString( ) + ,Sequence< OUString > ()) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } @@ -242,7 +242,7 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co return xTab; } // -------------------------------------------------------------------------------- -Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { impl_checkURL_throw(url); return getDataDefinitionByConnection(connect(url,info)); diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index ea54a1ff035c..1ef7304ddaef 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -62,7 +62,7 @@ OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, ADOGroup* _pGroup) : } // ------------------------------------------------------------------------- -OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString& _Name) : OGroup_ADO(_Name,_bCase),m_pCatalog(_pParent) +OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) : OGroup_ADO(_Name,_bCase),m_pCatalog(_pParent) { construct(); m_aGroup.Create(); @@ -116,7 +116,7 @@ void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV { case PROPERTY_ID_NAME: { - ::rtl::OUString aVal; + OUString aVal; rValue >>= aVal; m_aGroup.put_Name(aVal); } @@ -139,12 +139,12 @@ void OAdoGroup::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { return MapRight(m_aGroup.GetPermissions(objName,MapObjectType(objType))); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { RightsEnum eNum = m_aGroup.GetPermissions(objName,MapObjectType(objType)); if(eNum & adRightWithGrant) @@ -152,12 +152,12 @@ sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const ::rtl::OUString& obj return 0; } // ------------------------------------------------------------------------- -void SAL_CALL OAdoGroup::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessGrant,Map2Right(objPrivileges)); } // ------------------------------------------------------------------------- -void SAL_CALL OAdoGroup::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessDeny,Map2Right(objPrivileges)); } diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index 36d4659c7de1..33531fc4c2b6 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.cxx @@ -39,7 +39,7 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::container; // ------------------------------------------------------------------------- -sdbcx::ObjectType OGroups::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OGroups::createObject(const OUString& _rName) { return new OAdoGroup(m_pCatalog,isCaseSensitive(),_rName); } @@ -55,7 +55,7 @@ Reference< XPropertySet > OGroups::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OGroups::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { OAdoGroup* pGroup = NULL; if ( !getImplementation(pGroup,descriptor) || pGroup == NULL ) @@ -66,7 +66,7 @@ sdbcx::ObjectType OGroups::appendObject( const ::rtl::OUString& _rForName, const } // ------------------------------------------------------------------------- // XDrop -void OGroups::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) +void OGroups::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { m_aCollection.Delete(_sElementName); } diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index 125508528a4e..065a7e41a8b5 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star::sdbc; // ------------------------------------------------------------------------- OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex) - : OIndex_ADO(::rtl::OUString(),::rtl::OUString(),sal_False,sal_False,sal_False,_bCase) + : OIndex_ADO(OUString(),OUString(),sal_False,sal_False,sal_False,_bCase) ,m_pConnection(_pConnection) { construct(); @@ -105,14 +105,14 @@ void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons { case PROPERTY_ID_NAME: { - ::rtl::OUString aVal; + OUString aVal; rValue >>= aVal; m_aIndex.put_Name(aVal); } break; case PROPERTY_ID_CATALOG: { - ::rtl::OUString aVal; + OUString aVal; rValue >>= aVal; m_aIndex.put_Name(aVal); } diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx index 7351c9a72304..f5d5c49d5875 100644 --- a/connectivity/source/drivers/ado/AIndexes.cxx +++ b/connectivity/source/drivers/ado/AIndexes.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::container; -sdbcx::ObjectType OIndexes::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OIndexes::createObject(const OUString& _rName) { return new OAdoIndex(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName)); } @@ -54,7 +54,7 @@ Reference< XPropertySet > OIndexes::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { OAdoIndex* pIndex = NULL; if ( !getImplementation(pIndex,descriptor) || pIndex == NULL ) @@ -71,7 +71,7 @@ sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, cons } // ------------------------------------------------------------------------- // XDrop -void OIndexes::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) +void OIndexes::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { m_aCollection.Delete(_sElementName); } diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index 00dfd0077d15..d92ca58646e1 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -99,7 +99,7 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal { case PROPERTY_ID_NAME: { - ::rtl::OUString aVal; + OUString aVal; rValue >>= aVal; m_aKey.put_Name(aVal); ADOS::ThrowException(*m_pConnection->getConnection(),*this); @@ -115,7 +115,7 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal break; case PROPERTY_ID_REFERENCEDTABLE: { - ::rtl::OUString aVal; + OUString aVal; rValue >>= aVal; m_aKey.put_RelatedTable(aVal); ADOS::ThrowException(*m_pConnection->getConnection(),*this); diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index 18da7981c1b0..bda4efcaadeb 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -44,7 +44,7 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; using namespace com::sun::star::container; -sdbcx::ObjectType OKeys::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OKeys::createObject(const OUString& _rName) { return new OAdoKey(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName)); } @@ -60,7 +60,7 @@ Reference< XPropertySet > OKeys::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { OAdoKey* pKey = NULL; if ( !getImplementation( pKey, descriptor ) || pKey == NULL) @@ -79,9 +79,9 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference< #endif WpADOKey aKey = pKey->getImpl(); - ::rtl::OUString sName = aKey.get_Name(); + OUString sName = aKey.get_Name(); if(!sName.getLength()) - aKey.put_Name(::rtl::OUString("PrimaryKey") ); + aKey.put_Name(OUString("PrimaryKey") ); ADOKeys* pKeys = m_aCollection; if ( FAILED(pKeys->Append(OLEVariant((ADOKey*)aKey), @@ -97,7 +97,7 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference< } // ------------------------------------------------------------------------- // XDrop -void OKeys::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) +void OKeys::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { if(!m_aCollection.Delete(OLEVariant(_sElementName))) ADOS::ThrowException(*m_pConnection->getConnection(),static_cast(this)); diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index cca5f6ae001f..dad996bed71e 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -54,21 +54,21 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.APreparedStatement","com.sun.star.sdbc.PreparedStatement"); -OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const ::rtl::OUString& sql) +OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql) : OStatement_Base( _pConnection ) ,m_aTypeInfo(_TypeInfo) { osl_atomic_increment( &m_refCount ); OSQLParser aParser(comphelper::getComponentContext(_pConnection->getDriver()->getORB())); - ::rtl::OUString sErrorMessage; - ::rtl::OUString sNewSql; + OUString sErrorMessage; + OUString sNewSql; OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,sql); if(pNode) { // special handling for parameters /* we recusive replace all occurrences of ? in the statement and replace them with name like "æ¬å" */ sal_Int32 nParameterCount = 0; - ::rtl::OUString sDefaultName( "parame" ); + OUString sDefaultName( "parame" ); replaceParameterNodeName(pNode,sDefaultName,nParameterCount); pNode->parseNodeToStr( sNewSql, _pConnection ); delete pNode; @@ -215,8 +215,8 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn m_pParameters->get_Count(&nCount); if(nCount < (parameterIndex-1)) { - ::rtl::OUString sDefaultName( "parame" ); - sDefaultName += ::rtl::OUString::valueOf(parameterIndex); + OUString sDefaultName( "parame" ); + sDefaultName += OUString::valueOf(parameterIndex); ADOParameter* pParam = m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,_Val); if(pParam) { @@ -241,7 +241,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn if(pParam) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OUString sParam = aParam.GetName(); + OUString sParam = aParam.GetName(); #endif // OSL_DEBUG_LEVEL @@ -264,7 +264,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn ADOS::ThrowException(*m_pConnection->getConnection(),*this); } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { setParameter( parameterIndex, adLongVarWChar, ::std::numeric_limits< sal_Int32 >::max(), x ); } @@ -420,7 +420,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { setNull(parameterIndex,sqlType); } @@ -430,9 +430,9 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any { if(!::dbtools::implSetObject(this,parameterIndex,x)) { - const ::rtl::OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( STR_UNKNOWN_PARA_TYPE, - "$position$", ::rtl::OUString::valueOf(parameterIndex) + "$position$", OUString::valueOf(parameterIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } @@ -491,7 +491,7 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim WpADOParameter aParam(pParam); if(pParam) { - ::rtl::OUString sParam = aParam.GetName(); + OUString sParam = aParam.GetName(); CHECK_RETURN(aParam.PutValue(aVal)); } } @@ -529,7 +529,7 @@ void SAL_CALL OPreparedStatement::release() throw() } // ----------------------------------------------------------------------------- void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode, - const ::rtl::OUString& _sDefaultName, + const OUString& _sDefaultName, sal_Int32& _rParameterCount) { sal_Int32 nCount = _pNode->count(); @@ -538,10 +538,10 @@ void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode, OSQLParseNode* pChildNode = _pNode->getChild(i); if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() == 1) { - OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(":") ,SQL_NODE_PUNCTUATION,0); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString(":") ,SQL_NODE_PUNCTUATION,0); delete pChildNode->replace(pChildNode->getChild(0),pNewNode); - ::rtl::OUString sParameterName = _sDefaultName; - sParameterName += ::rtl::OUString::valueOf(++_rParameterCount); + OUString sParameterName = _sDefaultName; + sParameterName += OUString::valueOf(++_rParameterCount); pChildNode->append(new OSQLParseNode( sParameterName,SQL_NODE_NAME,0)); } else diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 804105772a16..b3dc37278b04 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -52,24 +52,24 @@ using namespace com::sun::star::sdbc; //------------------------------------------------------------------------------ // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet"); -::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ +OUString SAL_CALL OResultSet::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ { - return ::rtl::OUString("com.sun.star.sdbcx.ado.ResultSet"); + return OUString("com.sun.star.sdbcx.ado.ResultSet"); } // ------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); - aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); + ::com::sun::star::uno::Sequence< OUString > aSupported(2); + aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -153,7 +153,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -339,7 +339,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } @@ -753,7 +753,7 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw( updateValue(columnIndex,x); } // ------------------------------------------------------------------------- -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } @@ -901,7 +901,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, Runtim ADOS::ThrowException(*((OConnection*)m_pStmt->getConnection().get())->getConnection(),*this); OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection"); - WpADOProperty aProp(aProps.GetItem(::rtl::OUString("Bookmarks Ordered"))); + WpADOProperty aProp(aProps.GetItem(OUString("Bookmarks Ordered"))); OLEVariant aVar; if(aProp.IsValid()) aVar = aProp.GetValue(); @@ -1033,10 +1033,10 @@ sal_Int32 OResultSet::getFetchSize() const return nValue; } //------------------------------------------------------------------------------ -::rtl::OUString OResultSet::getCursorName() const +OUString OResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------ @@ -1058,7 +1058,7 @@ void OResultSet::setFetchSize(sal_Int32 _par0) com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - // DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + // DECL_PROP1IMPL(CURSORNAME, OUString) PropertyAttribute::READONLY); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index 31e5938e866e..22461245b5bb 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -84,59 +84,59 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( { WpADOProperties aProps( aField.get_Properties() ); if ( aProps.IsValid() ) - bRet = OTools::getValue( aProps, ::rtl::OUString("ISCASESENSITIVE") ); + bRet = OTools::getValue( aProps, OUString("ISCASESENSITIVE") ); } return bRet; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) return aField.GetName(); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) { - ::rtl::OUString sTableName; + OUString sTableName; WpADOField aField = ADOS::getField(m_pRecordSet,column); if ( aField.IsValid() ) { WpADOProperties aProps( aField.get_Properties() ); if ( aProps.IsValid() ) - sTableName = OTools::getValue( aProps, ::rtl::OUString("BASETABLENAME") ); + sTableName = OTools::getValue( aProps, OUString("BASETABLENAME") ); } return sTableName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { return getColumnName(column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- @@ -160,14 +160,14 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( WpADOProperties aProps( aField.get_Properties() ); if ( aProps.IsValid() ) { - bRet = OTools::getValue( aProps, ::rtl::OUString("ISAUTOINCREMENT") ); + bRet = OTools::getValue( aProps, OUString("ISAUTOINCREMENT") ); #if OSL_DEBUG_LEVEL > 0 sal_Int32 nCount = aProps.GetItemCount(); for (sal_Int32 i = 0; i SAL_CALL OStatement_Base::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -334,7 +334,7 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep } // ------------------------------------------------------------------------- -void SAL_CALL OStatement::addBatch( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -351,10 +351,10 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, reset(); - ::rtl::OUString aBatchSql; + OUString aBatchSql; sal_Int32 nLen = 0; - for(::std::list< ::rtl::OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) - aBatchSql = aBatchSql + *i + ::rtl::OUString(";"); + for(::std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) + aBatchSql = aBatchSql + *i + OUString(";"); if ( m_RecordSet.IsValid() ) @@ -389,7 +389,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -559,7 +559,7 @@ sal_Int32 OStatement_Base::getMaxFieldSize() const throw(SQLException, RuntimeEx return 0; } //------------------------------------------------------------------------------ -::rtl::OUString OStatement_Base::getCursorName() const throw(SQLException, RuntimeException) +OUString OStatement_Base::getCursorName() const throw(SQLException, RuntimeException) { return m_Command.GetName(); } @@ -640,7 +640,7 @@ void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) throw(SQLException, R ::dbtools::throwFeatureNotImplementedException( "Statement::MaxFieldSize", *this ); } //------------------------------------------------------------------------------ -void OStatement_Base::setCursorName(const ::rtl::OUString &_par0) throw(SQLException, RuntimeException) +void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -654,7 +654,7 @@ void OStatement_Base::setCursorName(const ::rtl::OUString &_par0) throw(SQLExcep Sequence< com::sun::star::beans::Property > aProps(10); com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index e0c51af338b2..680140525188 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -149,7 +149,7 @@ sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run } // ------------------------------------------------------------------------- // XRename -void SAL_CALL OAdoTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL OAdoTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); @@ -166,7 +166,7 @@ Reference< XDatabaseMetaData> OAdoTable::getMetaData() const } // ------------------------------------------------------------------------- // XAlterTable -void SAL_CALL OAdoTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); @@ -215,7 +215,7 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV case PROPERTY_ID_DESCRIPTION: OTools::putValue( m_aTable.get_Properties(), - ::rtl::OUString("Description"), + OUString("Description"), getString(rValue)); break; @@ -239,7 +239,7 @@ void SAL_CALL OAdoTable::release() throw() OTable_TYPEDEF::release(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OAdoTable::getName() throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OAdoTable::getName() throw(::com::sun::star::uno::RuntimeException) { return m_aTable.get_Name(); } diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx index 1dcb977457a3..ff8d6f292189 100644 --- a/connectivity/source/drivers/ado/ATables.cxx +++ b/connectivity/source/drivers/ado/ATables.cxx @@ -43,7 +43,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::container; -sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OTables::createObject(const OUString& _rName) { OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); return new OAdoTable(this,isCaseSensitive(),m_pCatalog,m_aCollection.GetItem(_rName)); @@ -62,7 +62,7 @@ Reference< XPropertySet > OTables::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OTables::appendObject( const ::rtl::OUString&, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OTables::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { OAdoTable* pTable = NULL; if ( !getImplementation( pTable, descriptor ) || pTable == NULL ) @@ -77,14 +77,14 @@ sdbcx::ObjectType OTables::appendObject( const ::rtl::OUString&, const Reference } // ------------------------------------------------------------------------- // XDrop -void OTables::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) +void OTables::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); if ( !m_aCollection.Delete(_sElementName) ) ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),static_cast(this)); } // ----------------------------------------------------------------------------- -void OTables::appendNew(const ::rtl::OUString& _rsNewTable) +void OTables::appendNew(const OUString& _rsNewTable) { OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); m_aCollection.Refresh(); diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index b5529202e83b..6fc7c92f22cd 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -46,7 +46,7 @@ OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser) m_aUser.Create(); } // ------------------------------------------------------------------------- -OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString& _Name) +OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) : OUser_TYPEDEF(_Name,_bCase) , m_pCatalog(_pParent) { @@ -100,7 +100,7 @@ void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVa { case PROPERTY_ID_NAME: { - ::rtl::OUString aVal; + OUString aVal; rValue >>= aVal; m_aUser.put_Name(aVal); } @@ -127,7 +127,7 @@ OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser) { } // ------------------------------------------------------------------------- -OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString& _Name) +OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) : OAdoUser(_pParent,_bCase,_Name) { } @@ -136,7 +136,7 @@ OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUStri void OUserExtend::construct() { OUser_TYPEDEF::construct(); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0))); } // ----------------------------------------------------------------------------- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const @@ -162,7 +162,7 @@ void SAL_CALL OAdoUser::release() throw() OUser_TYPEDEF::release(); } // ----------------------------------------------------------------------------- -sal_Int32 SAL_CALL OAdoUser::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -170,7 +170,7 @@ sal_Int32 SAL_CALL OAdoUser::getPrivileges( const ::rtl::OUString& objName, sal_ return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType))); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -183,7 +183,7 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const ::rtl::OUString& objN return nRights; } // ------------------------------------------------------------------------- -void SAL_CALL OAdoUser::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) +void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -191,7 +191,7 @@ void SAL_CALL OAdoUser::grantPrivileges( const ::rtl::OUString& objName, sal_Int ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } // ------------------------------------------------------------------------- -void SAL_CALL OAdoUser::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) +void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -200,7 +200,7 @@ void SAL_CALL OAdoUser::revokePrivileges( const ::rtl::OUString& objName, sal_In } // ----------------------------------------------------------------------------- // XUser -void SAL_CALL OAdoUser::changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(SQLException, RuntimeException) +void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUString& newPassword ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx index c5d4c0548d26..285a4551bf28 100644 --- a/connectivity/source/drivers/ado/AUsers.cxx +++ b/connectivity/source/drivers/ado/AUsers.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::container; -sdbcx::ObjectType OUsers::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OUsers::createObject(const OUString& _rName) { return new OAdoUser(m_pCatalog,isCaseSensitive(),_rName); } @@ -53,7 +53,7 @@ Reference< XPropertySet > OUsers::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { OUserExtend* pUser = NULL; if ( !getImplementation( pUser, descriptor ) || pUser == NULL ) @@ -66,7 +66,7 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const } // ------------------------------------------------------------------------- // XDrop -void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) +void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { m_aCollection.Delete(_sElementName); } diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index 814fca8bc15d..fcc156e073a9 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -89,7 +89,7 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const ADOCommand* pCom = (ADOCommand*)aVar.getIDispatch(); OLEString aBSTR; pCom->get_CommandText(&aBSTR); - rValue <<= (::rtl::OUString) aBSTR; + rValue <<= (OUString) aBSTR; } } break; diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx index b7c261597a80..cea3507a47fd 100644 --- a/connectivity/source/drivers/ado/AViews.cxx +++ b/connectivity/source/drivers/ado/AViews.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::container; -sdbcx::ObjectType OViews::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OViews::createObject(const OUString& _rName) { OAdoView* pView = new OAdoView(isCaseSensitive(),m_aCollection.GetItem(_rName)); pView->setNew(sal_False); @@ -57,7 +57,7 @@ Reference< XPropertySet > OViews::createDescriptor() // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OViews::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { OAdoView* pView = NULL; if ( !getImplementation( pView, descriptor ) || pView == NULL ) @@ -68,7 +68,7 @@ sdbcx::ObjectType OViews::appendObject( const ::rtl::OUString& _rForName, const if ( !aCommand.IsValid() ) m_pCatalog->getConnection()->throwGenericSQLException( STR_VIEW_NO_COMMAND_ERROR,static_cast(this) ); - ::rtl::OUString sName( _rForName ); + OUString sName( _rForName ); aCommand.put_Name(sName); aCommand.put_CommandText(getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)))); ADOViews* pViews = (ADOViews*)m_aCollection; @@ -83,7 +83,7 @@ sdbcx::ObjectType OViews::appendObject( const ::rtl::OUString& _rForName, const } // ------------------------------------------------------------------------- // XDrop -void OViews::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) +void OViews::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { if(!m_aCollection.Delete(_sElementName)) ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),static_cast(this)); diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index 1a24260b7f7e..d2a29516c5be 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::uno; using namespace com::sun::star::bridge::oleautomation; using namespace connectivity::ado; -using ::rtl::OUString; OLEString::OLEString() :m_sStr(NULL) @@ -45,7 +44,7 @@ OLEString::OLEString(const BSTR& _sBStr) :m_sStr(_sBStr) { } -OLEString::OLEString(const ::rtl::OUString& _sBStr) +OLEString::OLEString(const OUString& _sBStr) { m_sStr = ::SysAllocString(reinterpret_cast(_sBStr.getStr())); } @@ -54,7 +53,7 @@ OLEString::~OLEString() if(m_sStr) ::SysFreeString(m_sStr); } -OLEString& OLEString::operator=(const ::rtl::OUString& _rSrc) +OLEString& OLEString::operator=(const OUString& _rSrc) { if(m_sStr) ::SysFreeString(m_sStr); @@ -78,9 +77,9 @@ OLEString& OLEString::operator=(const BSTR& _rSrc) m_sStr = _rSrc; return *this; } -OLEString::operator ::rtl::OUString() const +OLEString::operator OUString() const { - return (m_sStr != NULL) ? ::rtl::OUString(reinterpret_cast(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : ::rtl::OUString(); + return (m_sStr != NULL) ? OUString(reinterpret_cast(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : OUString(); } OLEString::operator BSTR() const { @@ -120,7 +119,7 @@ OLEVariant::OLEVariant(sal_Int16 n) { VariantInit(this); vt = VT_ OLEVariant::OLEVariant(sal_Int32 n) { VariantInit(this); vt = VT_I4; lVal = n;} OLEVariant::OLEVariant(sal_Int64 x) { VariantInit(this); vt = VT_I4; lVal = (LONG)x;} -OLEVariant::OLEVariant(const rtl::OUString& us) +OLEVariant::OLEVariant(const OUString& us) { ::VariantInit(this); vt = VT_BSTR; @@ -289,7 +288,7 @@ void OLEVariant::setBool(sal_Bool b) vt = VT_BOOL; boolVal = b ? VARIANT_TRUE : VARIANT_FALSE; } -void OLEVariant::setString(const rtl::OUString& us) +void OLEVariant::setString(const OUString& us) { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); @@ -398,13 +397,13 @@ void OLEVariant::set(double n) } } -OLEVariant::operator rtl::OUString() const +OLEVariant::operator OUString() const { if (V_VT(this) == VT_BSTR) return reinterpret_cast(LPCOLESTR(V_BSTR(this))); if(isNull()) - return ::rtl::OUString(); + return OUString(); OLEVariant varDest; @@ -432,11 +431,11 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) vartype ) ) ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_TYPE_NOT_CONVERT)); + const OUString sError( aResources.getResourceString(STR_TYPE_NOT_CONVERT)); throw ::com::sun::star::sdbc::SQLException( sError, NULL, - ::rtl::OUString( "S1000" ), + OUString( "S1000" ), 1000, ::com::sun::star::uno::Any() ); @@ -486,10 +485,10 @@ OLEVariant::operator ::com::sun::star::uno::Sequence< sal_Int8 >() const return aRet; } // ----------------------------------------------------------------------------- -::rtl::OUString OLEVariant::getString() const +OUString OLEVariant::getString() const { if(isNull()) - return ::rtl::OUString(); + return OUString(); else return *this; } diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index ec5cebe70c12..0e6c8485a6ba 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -21,7 +21,6 @@ #include using namespace connectivity::ado; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx index 5d38e0a8b0a9..660c7dd6b5df 100644 --- a/connectivity/source/drivers/ado/Awrapado.cxx +++ b/connectivity/source/drivers/ado/Awrapado.cxx @@ -58,7 +58,7 @@ WpADOProperties WpADOConnection::get_Properties() const return aProps; } -rtl::OUString WpADOConnection::GetConnectionString() const +OUString WpADOConnection::GetConnectionString() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -66,7 +66,7 @@ rtl::OUString WpADOConnection::GetConnectionString() const return aBSTR; } -sal_Bool WpADOConnection::PutConnectionString(const ::rtl::OUString &aCon) const +sal_Bool WpADOConnection::PutConnectionString(const OUString &aCon) const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(aCon); @@ -109,7 +109,7 @@ sal_Bool WpADOConnection::Close( ) return (SUCCEEDED(pInterface->Close())); } -sal_Bool WpADOConnection::Execute(const ::rtl::OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset) +sal_Bool WpADOConnection::Execute(const OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString sStr1(_CommandText); @@ -136,7 +136,7 @@ sal_Bool WpADOConnection::RollbackTrans( ) return SUCCEEDED(pInterface->RollbackTrans()); } -sal_Bool WpADOConnection::Open(const ::rtl::OUString& ConnectionString, const ::rtl::OUString& UserID,const ::rtl::OUString& Password,long Options) +sal_Bool WpADOConnection::Open(const OUString& ConnectionString, const OUString& UserID,const OUString& Password,long Options) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString sStr1(ConnectionString); @@ -152,14 +152,14 @@ sal_Bool WpADOConnection::GetErrors(ADOErrors** pErrors) return SUCCEEDED(pInterface->get_Errors(pErrors)); } -::rtl::OUString WpADOConnection::GetDefaultDatabase() const +OUString WpADOConnection::GetDefaultDatabase() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; pInterface->get_DefaultDatabase(&aBSTR); return aBSTR; } -sal_Bool WpADOConnection::PutDefaultDatabase(const ::rtl::OUString& _bstr) +sal_Bool WpADOConnection::PutDefaultDatabase(const OUString& _bstr) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_bstr); @@ -224,14 +224,14 @@ sal_Bool WpADOConnection::put_Mode(const ConnectModeEnum &eNum) return SUCCEEDED(pInterface->put_Mode(eNum)); } -::rtl::OUString WpADOConnection::get_Provider() const +OUString WpADOConnection::get_Provider() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; pInterface->get_Provider(&aBSTR); return aBSTR; } -sal_Bool WpADOConnection::put_Provider(const ::rtl::OUString& _bstr) +sal_Bool WpADOConnection::put_Provider(const OUString& _bstr) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_bstr); @@ -252,7 +252,7 @@ sal_Bool WpADOConnection::OpenSchema(SchemaEnum eNum,OLEVariant& Restrictions,OL return SUCCEEDED(pInterface->OpenSchema(eNum,Restrictions,SchemaID,pprset)); } -::rtl::OUString WpADOConnection::get_Version() const +OUString WpADOConnection::get_Version() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -313,7 +313,7 @@ sal_Int32 WpADOCommand::get_State() const return nRet; } -::rtl::OUString WpADOCommand::get_CommandText() const +OUString WpADOCommand::get_CommandText() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -321,7 +321,7 @@ sal_Int32 WpADOCommand::get_State() const return aBSTR; } -sal_Bool WpADOCommand::put_CommandText(const ::rtl::OUString &aCon) +sal_Bool WpADOCommand::put_CommandText(const OUString &aCon) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(aCon); @@ -364,7 +364,7 @@ sal_Bool WpADOCommand::Execute(OLEVariant& RecordsAffected,OLEVariant& Params,lo return SUCCEEDED(pInterface->Execute(&RecordsAffected,&Params,Options,ppiRset)); } -ADOParameter* WpADOCommand::CreateParameter(const ::rtl::OUString &_bstr,DataTypeEnum Type,ParameterDirectionEnum Direction,long nSize,const OLEVariant &Value) +ADOParameter* WpADOCommand::CreateParameter(const OUString &_bstr,DataTypeEnum Type,ParameterDirectionEnum Direction,long nSize,const OLEVariant &Value) { OSL_ENSURE(pInterface,"Interface is null!"); ADOParameter* pPara = NULL; @@ -397,7 +397,7 @@ CommandTypeEnum WpADOCommand::get_CommandType( ) const } // returns the name of the field -::rtl::OUString WpADOCommand::GetName() const +OUString WpADOCommand::GetName() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -405,7 +405,7 @@ CommandTypeEnum WpADOCommand::get_CommandType( ) const return aBSTR; } -sal_Bool WpADOCommand::put_Name(const ::rtl::OUString& _Name) +sal_Bool WpADOCommand::put_Name(const OUString& _Name) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_Name); @@ -419,7 +419,7 @@ sal_Bool WpADOCommand::Cancel() return SUCCEEDED(pInterface->Cancel()); } -::rtl::OUString WpADOError::GetDescription() const +OUString WpADOError::GetDescription() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -427,7 +427,7 @@ sal_Bool WpADOCommand::Cancel() return aBSTR; } - ::rtl::OUString WpADOError::GetSource() const + OUString WpADOError::GetSource() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -443,7 +443,7 @@ sal_Bool WpADOCommand::Cancel() return nErrNr; } - ::rtl::OUString WpADOError::GetSQLState() const + OUString WpADOError::GetSQLState() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -502,7 +502,7 @@ sal_Int32 WpADOField::GetDefinedSize() const } // returns the name of the field -::rtl::OUString WpADOField::GetName() const +OUString WpADOField::GetName() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -655,7 +655,7 @@ sal_Bool WpADOProperty::PutValue(const OLEVariant &aValVar) return (SUCCEEDED(pInterface->put_Value(aValVar))); } - ::rtl::OUString WpADOProperty::GetName() const + OUString WpADOProperty::GetName() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -944,7 +944,7 @@ WpADOProperties WpADORecordset::get_Properties() const return SUCCEEDED(pInterface->UpdateBatch(AffectRecords)); } - ::rtl::OUString WpADOParameter::GetName() const + OUString WpADOParameter::GetName() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -1028,7 +1028,7 @@ sal_Bool WpADOParameter::put_Size(const sal_Int32& _nSize) return (SUCCEEDED(pInterface->put_Size(_nSize))); } -::rtl::OUString WpADOColumn::get_Name() const +OUString WpADOColumn::get_Name() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -1036,7 +1036,7 @@ sal_Bool WpADOParameter::put_Size(const sal_Int32& _nSize) return aBSTR; } -::rtl::OUString WpADOColumn::get_RelatedColumn() const +OUString WpADOColumn::get_RelatedColumn() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -1044,14 +1044,14 @@ sal_Bool WpADOParameter::put_Size(const sal_Int32& _nSize) return aBSTR; } -void WpADOColumn::put_Name(const ::rtl::OUString& _rName) +void WpADOColumn::put_Name(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr)); (void)bErg; } -void WpADOColumn::put_RelatedColumn(const ::rtl::OUString& _rName) +void WpADOColumn::put_RelatedColumn(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); @@ -1147,7 +1147,7 @@ WpADOProperties WpADOColumn::get_Properties() const return aProps; } -::rtl::OUString WpADOKey::get_Name() const +OUString WpADOKey::get_Name() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -1155,7 +1155,7 @@ WpADOProperties WpADOColumn::get_Properties() const return aBSTR; } -void WpADOKey::put_Name(const ::rtl::OUString& _rName) +void WpADOKey::put_Name(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); @@ -1177,7 +1177,7 @@ void WpADOKey::put_Type(const KeyTypeEnum& _eNum) pInterface->put_Type(_eNum); } -::rtl::OUString WpADOKey::get_RelatedTable() const +OUString WpADOKey::get_RelatedTable() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -1185,7 +1185,7 @@ void WpADOKey::put_Type(const KeyTypeEnum& _eNum) return aBSTR; } -void WpADOKey::put_RelatedTable(const ::rtl::OUString& _rName) +void WpADOKey::put_RelatedTable(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); @@ -1231,7 +1231,7 @@ WpADOColumns WpADOKey::get_Columns() const return aCols; } -::rtl::OUString WpADOIndex::get_Name() const +OUString WpADOIndex::get_Name() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -1239,7 +1239,7 @@ WpADOColumns WpADOKey::get_Columns() const return aBSTR; } -void WpADOIndex::put_Name(const ::rtl::OUString& _rName) +void WpADOIndex::put_Name(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); @@ -1353,7 +1353,7 @@ ADOProcedures* WpADOCatalog::get_Procedures() return pRet; } -::rtl::OUString WpADOTable::get_Name() const +OUString WpADOTable::get_Name() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -1361,7 +1361,7 @@ ADOProcedures* WpADOCatalog::get_Procedures() return aBSTR; } -void WpADOTable::put_Name(const ::rtl::OUString& _rName) +void WpADOTable::put_Name(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); @@ -1369,7 +1369,7 @@ void WpADOTable::put_Name(const ::rtl::OUString& _rName) (void)bErg; } -::rtl::OUString WpADOTable::get_Type() const +OUString WpADOTable::get_Type() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -1427,7 +1427,7 @@ WpADOProperties WpADOTable::get_Properties() const return aProps; } -::rtl::OUString WpADOView::get_Name() const +OUString WpADOView::get_Name() const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString aBSTR; @@ -1446,14 +1446,14 @@ void WpADOView::put_Command(OLEVariant& _rVar) pInterface->put_Command(_rVar); } -::rtl::OUString WpADOGroup::get_Name() const +OUString WpADOGroup::get_Name() const { OLEString aBSTR; pInterface->get_Name(&aBSTR); return aBSTR; } -void WpADOGroup::put_Name(const ::rtl::OUString& _rName) +void WpADOGroup::put_Name(const OUString& _rName) { OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr)); @@ -1491,21 +1491,21 @@ WpADOUsers WpADOGroup::get_Users( ) return aRet; } -::rtl::OUString WpADOUser::get_Name() const +OUString WpADOUser::get_Name() const { OLEString aBSTR; pInterface->get_Name(&aBSTR); return aBSTR; } -void WpADOUser::put_Name(const ::rtl::OUString& _rName) +void WpADOUser::put_Name(const OUString& _rName) { OLEString bstr(_rName); sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr)); (void)bErg; } -sal_Bool WpADOUser::ChangePassword(const ::rtl::OUString& _rPwd,const ::rtl::OUString& _rNewPwd) +sal_Bool WpADOUser::ChangePassword(const OUString& _rPwd,const OUString& _rNewPwd) { OLEString sStr1(_rPwd); OLEString sStr2(_rNewPwd); @@ -1620,7 +1620,7 @@ WpBase::operator IDispatch*() return pIUnknown; } -ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) +ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; @@ -1660,7 +1660,7 @@ ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any return pRecordset; } // ----------------------------------------------------------------------------- -ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) +ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; @@ -1702,7 +1702,7 @@ ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any } // ----------------------------------------------------------------------------- -ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) +ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; @@ -1741,7 +1741,7 @@ ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& } // ----------------------------------------------------------------------------- ADORecordset* WpADOConnection::getIndexInfo( - const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, + const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool /*unique*/, sal_Bool /*approximate*/ ) { // Create elements used in the array @@ -1784,8 +1784,8 @@ ADORecordset* WpADOConnection::getIndexInfo( } // ----------------------------------------------------------------------------- ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern ) + const OUString& schemaPattern, + const OUString& tableNamePattern ) { SAFEARRAYBOUND rgsabound[1]; SAFEARRAY *psa = NULL; @@ -1826,11 +1826,11 @@ ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno:: } // ----------------------------------------------------------------------------- ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, - const ::rtl::OUString& primarySchema, - const ::rtl::OUString& primaryTable, + const OUString& primarySchema, + const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, - const ::rtl::OUString& foreignSchema, - const ::rtl::OUString& foreignTable) + const OUString& foreignSchema, + const OUString& foreignTable) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; @@ -1879,8 +1879,8 @@ ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::A } // ----------------------------------------------------------------------------- ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern ) + const OUString& schemaPattern, + const OUString& procedureNamePattern ) { SAFEARRAYBOUND rgsabound[1]; SAFEARRAY *psa = NULL; @@ -1918,9 +1918,9 @@ ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any& } // ----------------------------------------------------------------------------- ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern, - const ::rtl::OUString& columnNamePattern ) + const OUString& schemaPattern, + const OUString& procedureNamePattern, + const OUString& columnNamePattern ) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; @@ -1963,16 +1963,16 @@ ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno: } // ----------------------------------------------------------------------------- ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) + const OUString& schemaPattern, + const OUString& tableNamePattern, + const ::com::sun::star::uno::Sequence< OUString >& types ) { // Create elements used in the array HRESULT hr = S_OK; OLEVariant varCriteria[4]; sal_Int32 nPos=0; - ::rtl::OUString sCatalog; + OUString sCatalog; if ( catalog.hasValue() && (catalog >>= sCatalog) ) varCriteria[nPos].setString(sCatalog); @@ -1985,10 +1985,10 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata varCriteria[nPos].setString(tableNamePattern); ++nPos; - ::rtl::OUStringBuffer aTypes; - ::rtl::OUString aComma( "," ); - const ::rtl::OUString* pIter = types.getConstArray(); - const ::rtl::OUString* pEnd = pIter + types.getLength(); + OUStringBuffer aTypes; + OUString aComma( "," ); + const OUString* pIter = types.getConstArray(); + const OUString* pEnd = pIter + types.getLength(); for( ; pIter != pEnd ; ++pIter) { if ( aTypes.getLength() ) @@ -1996,7 +1996,7 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata aTypes.append(*pIter); } - ::rtl::OUString sTypeNames = aTypes.makeStringAndClear(); + OUString sTypeNames = aTypes.makeStringAndClear(); if ( sTypeNames.getLength() ) varCriteria[nPos].setString(sTypeNames); @@ -2027,9 +2027,9 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata } // ----------------------------------------------------------------------------- ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) + const OUString& schemaPattern, + const OUString& tableNamePattern, + const OUString& columnNamePattern ) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; @@ -2071,9 +2071,9 @@ ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& cat } // ----------------------------------------------------------------------------- ADORecordset* WpADOConnection::getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schema, - const ::rtl::OUString& table, - const ::rtl::OUString& columnNamePattern ) + const OUString& schema, + const OUString& table, + const OUString& columnNamePattern ) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index 37b6636df462..9ca1a0223393 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -69,7 +69,7 @@ const IID ADOS::IID_ADOVIEW_25 = MYADOID(0x00000613); OLEString& ADOS::GetKeyStr() { - static OLEString sKeyStr(::rtl::OUString("gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz")); + static OLEString sKeyStr(OUString("gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz")); return sKeyStr; } diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx index 2d0ed7431800..e7478ab55aad 100644 --- a/connectivity/source/drivers/calc/CCatalog.cxx +++ b/connectivity/source/drivers/calc/CCatalog.cxx @@ -42,10 +42,10 @@ void OCalcCatalog::refreshTables() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcCatalog::refreshTables" ); TStringVector aVector; - Sequence< ::rtl::OUString > aTypes; + Sequence< OUString > aTypes; OCalcConnection::ODocHolder aDocHodler(((OCalcConnection*)m_pConnection)); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); + OUString("%"),OUString("%"),aTypes); if(xResult.is()) { diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx index 859fb97d4826..f5542d74c83d 100644 --- a/connectivity/source/drivers/calc/CColumns.cxx +++ b/connectivity/source/drivers/calc/CColumns.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -sdbcx::ObjectType OCalcColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OCalcColumns::createObject(const OUString& _rName) { OCalcTable* pTable = (OCalcTable*)m_pTable; ::rtl::Reference aCols = pTable->getTableColumns(); diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 3ba98f43182c..bae573fcaf28 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -63,7 +63,7 @@ OCalcConnection::~OCalcConnection() { } -void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) +void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcConnection::construct" ); @@ -71,7 +71,7 @@ void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< Prope sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); - ::rtl::OUString aDSN(url.copy(nLen+1)); + OUString aDSN(url.copy(nLen+1)); m_aFileName = aDSN; INetURLObject aURL; @@ -88,7 +88,7 @@ void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< Prope } m_aFileName = aURL.GetMainURL(INetURLObject::NO_DECODE); - m_sPassword = ::rtl::OUString(); + m_sPassword = OUString(); const char* pPwd = "password"; const PropertyValue *pIter = info.getConstArray(); @@ -115,16 +115,16 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc() } // open read-only as long as updating isn't implemented Sequence aArgs(2); - aArgs[0].Name = ::rtl::OUString("Hidden"); + aArgs[0].Name = OUString("Hidden"); aArgs[0].Value <<= (sal_Bool) sal_True; - aArgs[1].Name = ::rtl::OUString("ReadOnly"); + aArgs[1].Name = OUString("ReadOnly"); aArgs[1].Value <<= (sal_Bool) sal_True; if ( !m_sPassword.isEmpty() ) { const sal_Int32 nPos = aArgs.getLength(); aArgs.realloc(nPos+1); - aArgs[nPos].Name = ::rtl::OUString("Password"); + aArgs[nPos].Name = OUString("Password"); aArgs[nPos].Value <<= m_sPassword; } @@ -134,7 +134,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc() try { xComponent = xDesktop->loadComponentFromURL( - m_aFileName, ::rtl::OUString("_blank"), 0, aArgs ); + m_aFileName, OUString("_blank"), 0, aArgs ); } catch( const Exception& ) { @@ -162,7 +162,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc() aErrorDetails <<= aDetailException; } - const ::rtl::OUString sError( m_aResources.getResourceStringWithSubstitution( + const OUString sError( m_aResources.getResourceStringWithSubstitution( STR_COULD_NOT_LOAD_FILE, "$filename$", m_aFileName ) ); @@ -246,7 +246,7 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLE // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const ::rtl::OUString& sql ) +Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcConnection::prepareStatement" ); @@ -263,7 +263,7 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) +Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcConnection::prepareCall" ); diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index 9afd1b1843c9..2d18d449a2f7 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -78,7 +78,7 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( ) aRow.reserve(18); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); + aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)65535)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -100,35 +100,35 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( ) aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL")); + aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL")); aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL); aRow[3] = ODatabaseMetaDataResultSet::get0Value(); aRow[9] = ODatabaseMetaDataResultSet::getBasicValue(); aRow[15] = ODatabaseMetaDataResultSet::get0Value(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOL")); + aRow[1] = new ORowSetValueDecorator(OUString("BOOL")); aRow[2] = new ORowSetValueDecorator(DataType::BIT); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[9] = ODatabaseMetaDataResultSet::getBasicValue(); aRow[15] = new ORowSetValueDecorator((sal_Int32)15); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE")); + aRow[1] = new ORowSetValueDecorator(OUString("DATE")); aRow[2] = new ORowSetValueDecorator(DataType::DATE); aRow[3] = ODatabaseMetaDataResultSet::get0Value(); aRow[9] = ODatabaseMetaDataResultSet::getBasicValue(); aRow[15] = ODatabaseMetaDataResultSet::get0Value(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIME")); + aRow[1] = new ORowSetValueDecorator(OUString("TIME")); aRow[2] = new ORowSetValueDecorator(DataType::TIME); aRow[3] = ODatabaseMetaDataResultSet::get0Value(); aRow[9] = ODatabaseMetaDataResultSet::getBasicValue(); aRow[15] = ODatabaseMetaDataResultSet::get0Value(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP); aRow[3] = ODatabaseMetaDataResultSet::get0Value(); aRow[9] = ODatabaseMetaDataResultSet::getBasicValue(); @@ -143,8 +143,8 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( ) // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::getColumns" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -163,9 +163,9 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( aRow[10] = new ORowSetValueDecorator((sal_Int32)10); - Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames()); - const ::rtl::OUString* pTabIter = aTabNames.getConstArray(); - const ::rtl::OUString* pTabEnd = pTabIter + aTabNames.getLength(); + Sequence< OUString> aTabNames(xNames->getElementNames()); + const OUString* pTabIter = aTabNames.getConstArray(); + const OUString* pTabEnd = pTabIter + aTabNames.getLength(); for(;pTabIter != pTabEnd;++pTabIter) { if(match(tableNamePattern,*pTabIter,'\0')) @@ -178,10 +178,10 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( if(!xColumns.is()) throw SQLException(); - const Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames()); + const Sequence< OUString> aColNames(xColumns->getElementNames()); - const ::rtl::OUString* pColumnIter = aColNames.getConstArray(); - const ::rtl::OUString* pEnd = pColumnIter + aColNames.getLength(); + const OUString* pColumnIter = aColNames.getConstArray(); + const OUString* pEnd = pColumnIter + aColNames.getLength(); Reference< XPropertySet> xColumn; for(sal_Int32 i=1;pColumnIter != pEnd;++pColumnIter,++i) { @@ -217,13 +217,13 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( switch(sal_Int32(aRow[11]->getValue())) { case ColumnValue::NO_NULLS: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("NO")); + aRow[18] = new ORowSetValueDecorator(OUString("NO")); break; case ColumnValue::NULLABLE: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); break; default: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString()); + aRow[18] = new ORowSetValueDecorator(OUString()); } aRows.push_back(aRow); } @@ -240,12 +240,12 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::getURL" ); ::osl::MutexGuard aGuard( m_aMutex ); - return ::rtl::OUString("sdbc:calc:") + m_pConnection->getURL(); + return OUString("sdbc:calc:") + m_pConnection->getURL(); } // ------------------------------------------------------------------------- @@ -284,7 +284,7 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLExce // ------------------------------------------------------------------------- -static sal_Bool lcl_IsEmptyOrHidden( const Reference& xSheets, const ::rtl::OUString& rName ) +static sal_Bool lcl_IsEmptyOrHidden( const Reference& xSheets, const OUString& rName ) { Any aAny = xSheets->getByName( rName ); Reference xSheet; @@ -296,7 +296,7 @@ static sal_Bool lcl_IsEmptyOrHidden( const Reference& xSheets, co if (xProp.is()) { sal_Bool bVisible = sal_Bool(); - Any aVisAny = xProp->getPropertyValue( ::rtl::OUString("IsVisible") ); + Any aVisAny = xProp->getPropertyValue( OUString("IsVisible") ); if ( aVisAny >>= bVisible ) if (!bVisible) return sal_True; // hidden @@ -326,7 +326,7 @@ static sal_Bool lcl_IsEmptyOrHidden( const Reference& xSheets, co return sal_False; } -static sal_Bool lcl_IsUnnamed( const Reference& xRanges, const ::rtl::OUString& rName ) +static sal_Bool lcl_IsUnnamed( const Reference& xRanges, const OUString& rName ) { sal_Bool bUnnamed = sal_False; @@ -339,7 +339,7 @@ static sal_Bool lcl_IsUnnamed( const Reference& xRanges, const { try { - Any aUserAny = xRangeProp->getPropertyValue( ::rtl::OUString("IsUserDefined") ); + Any aUserAny = xRangeProp->getPropertyValue( OUString("IsUserDefined") ); sal_Bool bUserDefined = sal_Bool(); if ( aUserAny >>= bUserDefined ) bUnnamed = !bUserDefined; @@ -357,8 +357,8 @@ static sal_Bool lcl_IsUnnamed( const Reference& xRanges, const // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, - const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, + const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::getTables" ); @@ -370,7 +370,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( // check if ORowSetValue type is given // when no types are given then we have to return all tables e.g. TABLE - ::rtl::OUString aTable("TABLE"); + OUString aTable("TABLE"); sal_Bool bTableFound = sal_True; sal_Int32 nLength = types.getLength(); @@ -378,8 +378,8 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( { bTableFound = sal_False; - const ::rtl::OUString* pIter = types.getConstArray(); - const ::rtl::OUString* pEnd = pIter + nLength; + const OUString* pIter = types.getConstArray(); + const OUString* pEnd = pIter + nLength; for(;pIter != pEnd;++pIter) { if(*pIter == aTable) @@ -401,13 +401,13 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( Reference xSheets = xDoc->getSheets(); if ( !xSheets.is() ) throw SQLException(); - Sequence< ::rtl::OUString > aSheetNames = xSheets->getElementNames(); + Sequence< OUString > aSheetNames = xSheets->getElementNames(); ODatabaseMetaDataResultSet::ORows aRows; sal_Int32 nSheetCount = aSheetNames.getLength(); for (sal_Int32 nSheet=0; nSheet SAL_CALL OCalcDatabaseMetaData::getTables( Reference xDocProp( xDoc, UNO_QUERY ); if ( xDocProp.is() ) { - Any aRangesAny = xDocProp->getPropertyValue( ::rtl::OUString("DatabaseRanges") ); + Any aRangesAny = xDocProp->getPropertyValue( OUString("DatabaseRanges") ); Reference xRanges; if ( aRangesAny >>= xRanges ) { - Sequence< ::rtl::OUString > aDBNames = xRanges->getElementNames(); + Sequence< OUString > aDBNames = xRanges->getElementNames(); sal_Int32 nDBCount = aDBNames.getLength(); for (sal_Int32 nRange=0; nRange SAL_CALL ODriver::connect( const ::rtl::OUString& url, +Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -75,18 +75,18 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, return xCon; } -sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { return url.startsWith("sdbc:calc:"); } -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( !acceptsURL(url) ) { SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); } return Sequence< DriverPropertyInfo >(); diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx index 193be29a4a0d..d110297ff083 100644 --- a/connectivity/source/drivers/calc/CResultSet.cxx +++ b/connectivity/source/drivers/calc/CResultSet.cxx @@ -42,24 +42,24 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, ::getBooleanCppuType()); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException) +OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException) { - return ::rtl::OUString("com.sun.star.sdbcx.calc.ResultSet"); + return OUString("com.sun.star.sdbcx.calc.ResultSet"); } // ------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException) +Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); - aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); + Sequence< OUString > aSupported(2); + aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OCalcResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index ff3c33319a48..1e37cc38ecc3 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -146,7 +146,7 @@ static CellContentType lcl_GetContentOrResultType( const Reference& xCell CellContentType eCellType = xCell->getType(); if ( eCellType == CellContentType_FORMULA ) { - static const ::rtl::OUString s_sFormulaResultType("FormulaResultType"); + static const OUString s_sFormulaResultType("FormulaResultType"); Reference xProp( xCell, UNO_QUERY ); try { @@ -228,7 +228,7 @@ static bool lcl_HasTextInColumn( const Reference& xSheet, sal_Int3 static void lcl_GetColumnInfo( const Reference& xSheet, const Reference& xFormats, sal_Int32 nDocColumn, sal_Int32 nStartRow, sal_Bool bHasHeaders, - ::rtl::OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency ) + OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetColumnInfo" ); //! avoid duplicate field names @@ -265,7 +265,7 @@ static void lcl_GetColumnInfo( const Reference& xSheet, const Refe sal_Int16 nNumType = NumberFormat::NUMBER; try { - static ::rtl::OUString s_NumberFormat("NumberFormat"); + static OUString s_NumberFormat("NumberFormat"); sal_Int32 nKey = 0; if ( xProp->getPropertyValue( s_NumberFormat ) >>= nKey ) @@ -431,14 +431,14 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference& x // ------------------------------------------------------------------------- -static ::rtl::OUString lcl_GetColumnStr( sal_Int32 nColumn ) +static OUString lcl_GetColumnStr( sal_Int32 nColumn ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetColumnStr" ); if ( nColumn < 26 ) - return ::rtl::OUString::valueOf( (sal_Unicode) ( 'A' + nColumn ) ); + return OUString::valueOf( (sal_Unicode) ( 'A' + nColumn ) ); else { - ::rtl::OUStringBuffer aBuffer(2); + OUStringBuffer aBuffer(2); aBuffer.setLength( 2 ); aBuffer[0] = (sal_Unicode) ( 'A' + ( nColumn / 26 ) - 1 ); aBuffer[1] = (sal_Unicode) ( 'A' + ( nColumn % 26 ) ); @@ -454,13 +454,13 @@ void OCalcTable::fillColumns() String aStrFieldName; aStrFieldName.AssignAscii("Column"); - ::rtl::OUString aTypeName; + OUString aTypeName; ::comphelper::UStringMixEqual aCase(m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers()); const sal_Bool bStoresMixedCaseQuotedIdentifiers = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(); for (sal_Int32 i = 0; i < m_nDataCols; i++) { - ::rtl::OUString aColumnName; + OUString aColumnName; sal_Int32 eType = DataType::OTHER; sal_Bool bCurrency = sal_False; @@ -477,41 +477,41 @@ void OCalcTable::fillColumns() { case DataType::VARCHAR: { - static const ::rtl::OUString s_sType("VARCHAR"); + static const OUString s_sType("VARCHAR"); aTypeName = s_sType; } break; case DataType::DECIMAL: - aTypeName = ::rtl::OUString("DECIMAL"); + aTypeName = OUString("DECIMAL"); break; case DataType::BIT: - aTypeName = ::rtl::OUString("BOOL"); + aTypeName = OUString("BOOL"); break; case DataType::DATE: - aTypeName = ::rtl::OUString("DATE"); + aTypeName = OUString("DATE"); break; case DataType::TIME: - aTypeName = ::rtl::OUString("TIME"); + aTypeName = OUString("TIME"); break; case DataType::TIMESTAMP: - aTypeName = ::rtl::OUString("TIMESTAMP"); + aTypeName = OUString("TIMESTAMP"); break; default: OSL_FAIL("missing type name"); - aTypeName = ::rtl::OUString(); + aTypeName = OUString(); } // check if the column name already exists - ::rtl::OUString aAlias = aColumnName; + OUString aAlias = aColumnName; OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); sal_Int32 nExprCnt = 0; while(aFind != m_aColumns->get().end()) { - (aAlias = aColumnName) += ::rtl::OUString::valueOf((sal_Int32)++nExprCnt); + (aAlias = aColumnName) += OUString::valueOf((sal_Int32)++nExprCnt); aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); } - sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, ::rtl::OUString(),::rtl::OUString(), + sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, OUString(),OUString(), ColumnValue::NULLABLE, nPrecision, nDecimals, eType, sal_False, sal_False, bCurrency, bStoresMixedCaseQuotedIdentifiers, @@ -526,11 +526,11 @@ void OCalcTable::fillColumns() // ------------------------------------------------------------------------- OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName ) : OCalcTable_BASE(_pTables,_pConnection,_Name, _Type, _Description, @@ -570,7 +570,7 @@ void OCalcTable::construct() Reference xDocProp( xDoc, UNO_QUERY ); if ( xDocProp.is() ) { - Reference xRanges(xDocProp->getPropertyValue( ::rtl::OUString("DatabaseRanges") ),UNO_QUERY); + Reference xRanges(xDocProp->getPropertyValue( OUString("DatabaseRanges") ),UNO_QUERY); if ( xRanges.is() && xRanges->hasByName( m_Name ) ) { @@ -584,7 +584,7 @@ void OCalcTable::construct() sal_Bool bRangeHeader = sal_True; Reference xFiltProp( xDBRange->getFilterDescriptor(), UNO_QUERY ); if ( xFiltProp.is() ) - xFiltProp->getPropertyValue(::rtl::OUString("ContainsHeader")) >>= bRangeHeader; + xFiltProp->getPropertyValue(OUString("ContainsHeader")) >>= bRangeHeader; Reference xSheetRange( xRefer->getReferredCells(), UNO_QUERY ); Reference xAddr( xSheetRange, UNO_QUERY ); @@ -618,7 +618,7 @@ void OCalcTable::construct() if (xProp.is()) { ::com::sun::star::util::Date aDateStruct; - if ( xProp->getPropertyValue( ::rtl::OUString("NullDate") ) >>= aDateStruct ) + if ( xProp->getPropertyValue( OUString("NullDate") ) >>= aDateStruct ) m_aNullDate = ::Date( aDateStruct.Day, aDateStruct.Month, aDateStruct.Year ); } } diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx index 54eb644dad0d..9ad139186b47 100644 --- a/connectivity/source/drivers/calc/CTables.cxx +++ b/connectivity/source/drivers/calc/CTables.cxx @@ -36,11 +36,11 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -sdbcx::ObjectType OCalcTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OCalcTables::createObject(const OUString& _rName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTables::createObject" ); OCalcTable* pTable = new OCalcTable(this,(OCalcConnection*)static_cast(m_rParent).getConnection(), - _rName,::rtl::OUString("TABLE")); + _rName,OUString("TABLE")); sdbcx::ObjectType xRet = pTable; pTable->construct(); return xRet; diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx index 8c1fc82f713c..1bfbc36731d8 100644 --- a/connectivity/source/drivers/calc/Cservices.cxx +++ b/connectivity/source/drivers/calc/Cservices.cxx @@ -21,7 +21,6 @@ #include using namespace connectivity::calc; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx index 981be00e2855..6c67969ed46f 100644 --- a/connectivity/source/drivers/dbase/DCatalog.cxx +++ b/connectivity/source/drivers/dbase/DCatalog.cxx @@ -39,9 +39,9 @@ ODbaseCatalog::ODbaseCatalog(ODbaseConnection* _pCon) : file::OFileCatalog(_pCon void ODbaseCatalog::refreshTables() { TStringVector aVector; - Sequence< ::rtl::OUString > aTypes; + Sequence< OUString > aTypes; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); + OUString("%"),OUString("%"),aTypes); if(xResult.is()) { diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx index d10da503da97..9d9b0827eab9 100644 --- a/connectivity/source/drivers/dbase/DCode.cxx +++ b/connectivity/source/drivers/dbase/DCode.cxx @@ -48,13 +48,13 @@ OFILEOperandAttr::OFILEOperandAttr(sal_uInt16 _nPos, { if(_xIndexes.is()) { - ::rtl::OUString sName; + OUString sName; Reference xColInfo = _xColumn->getPropertySetInfo(); Reference xIndex; - Sequence< ::rtl::OUString> aSeq = _xIndexes->getElementNames(); - const ::rtl::OUString* pBegin = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aSeq.getLength(); + Sequence< OUString> aSeq = _xIndexes->getElementNames(); + const OUString* pBegin = aSeq.getConstArray(); + const OUString* pEnd = pBegin + aSeq.getLength(); for(;pBegin != pEnd;++pBegin) { _xIndexes->getByName(*pBegin) >>= xIndex; diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx index 9bdffaa6f48c..eaa6d1a605e1 100644 --- a/connectivity/source/drivers/dbase/DColumns.cxx +++ b/connectivity/source/drivers/dbase/DColumns.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -sdbcx::ObjectType ODbaseColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ODbaseColumns::createObject(const OUString& _rName) { ODbaseTable* pTable = (ODbaseTable*)m_pTable; @@ -59,7 +59,7 @@ Reference< XPropertySet > ODbaseColumns::createDescriptor() // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType ODbaseColumns::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType ODbaseColumns::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { if ( m_pTable->isNew() ) return cloneDescriptor( descriptor ); @@ -70,7 +70,7 @@ sdbcx::ObjectType ODbaseColumns::appendObject( const ::rtl::OUString& _rForName, // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- // XDrop -void ODbaseColumns::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) +void ODbaseColumns::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/) { if(!m_pTable->isNew()) m_pTable->dropColumn(_nPos); diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx index aa88ae2290bf..99658b39e542 100644 --- a/connectivity/source/drivers/dbase/DConnection.cxx +++ b/connectivity/source/drivers/dbase/DConnection.cxx @@ -45,7 +45,7 @@ DBG_NAME(ODbaseConnection) ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver) { DBG_CTOR(ODbaseConnection,NULL); - m_aFilenameExtension = rtl::OUString("dbf"); + m_aFilenameExtension = OUString("dbf"); } //----------------------------------------------------------------------------- ODbaseConnection::~ODbaseConnection() @@ -98,7 +98,7 @@ Reference< XStatement > SAL_CALL ODbaseConnection::createStatement( ) throw(SQL return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -111,7 +111,7 @@ Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( con return pStmt; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index 9cd9613a082d..c4623c0fa2fa 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -70,19 +70,19 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( ) aRow.reserve(18); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); + aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)254)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("length"))); + aRow.push_back(new ORowSetValueDecorator(OUString("length"))); aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnValue::NULLABLE)); aRow.push_back(ODatabaseMetaDataResultSet::get1Value()); aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnSearch::FULL)); aRow.push_back(ODatabaseMetaDataResultSet::get1Value()); aRow.push_back(ODatabaseMetaDataResultSet::get0Value()); aRow.push_back(ODatabaseMetaDataResultSet::get0Value()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("C"))); + aRow.push_back(new ORowSetValueDecorator(OUString("C"))); aRow.push_back(ODatabaseMetaDataResultSet::get0Value()); aRow.push_back(ODatabaseMetaDataResultSet::get0Value()); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); @@ -91,62 +91,62 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( ) aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("LONGVARCHAR")); + aRow[1] = new ORowSetValueDecorator(OUString("LONGVARCHAR")); aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR); aRow[3] = new ORowSetValueDecorator((sal_Int32)2147483647); aRow[6] = new ORowSetValueDecorator(); - aRow[13] = new ORowSetValueDecorator(::rtl::OUString("M")); + aRow[13] = new ORowSetValueDecorator(OUString("M")); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE")); + aRow[1] = new ORowSetValueDecorator(OUString("DATE")); aRow[2] = new ORowSetValueDecorator(DataType::DATE); aRow[3] = new ORowSetValueDecorator((sal_Int32)10); - aRow[13] = new ORowSetValueDecorator(::rtl::OUString("D")); + aRow[13] = new ORowSetValueDecorator(OUString("D")); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOLEAN")); + aRow[1] = new ORowSetValueDecorator(OUString("BOOLEAN")); aRow[2] = new ORowSetValueDecorator(DataType::BIT); aRow[3] = ODatabaseMetaDataResultSet::get1Value(); aRow[4] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue(); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString()); + aRow[6] = new ORowSetValueDecorator(OUString()); aRow[9] = ODatabaseMetaDataResultSet::getBasicValue(); - aRow[13] = new ORowSetValueDecorator(::rtl::OUString("L")); + aRow[13] = new ORowSetValueDecorator(OUString("L")); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DOUBLE")); + aRow[1] = new ORowSetValueDecorator(OUString("DOUBLE")); aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE); aRow[3] = new ORowSetValueDecorator((sal_Int32)8); - aRow[13] = new ORowSetValueDecorator(::rtl::OUString("B")); + aRow[13] = new ORowSetValueDecorator(OUString("B")); aRows.push_back(aRow); aRow[11] = new ORowSetValueDecorator(sal_True); - aRow[13] = new ORowSetValueDecorator(::rtl::OUString("Y")); + aRow[13] = new ORowSetValueDecorator(OUString("Y")); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP); aRow[11] = new ORowSetValueDecorator(sal_False); - aRow[13] = new ORowSetValueDecorator(::rtl::OUString("T")); + aRow[13] = new ORowSetValueDecorator(OUString("T")); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("INTEGER")); + aRow[1] = new ORowSetValueDecorator(OUString("INTEGER")); aRow[2] = new ORowSetValueDecorator(DataType::INTEGER); aRow[3] = new ORowSetValueDecorator((sal_Int32)10); - aRow[13] = new ORowSetValueDecorator(::rtl::OUString("I")); + aRow[13] = new ORowSetValueDecorator(OUString("I")); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL")); + aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL")); aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("length,scale")); - aRow[13] = new ORowSetValueDecorator(::rtl::OUString("F")); + aRow[6] = new ORowSetValueDecorator(OUString("length,scale")); + aRow[13] = new ORowSetValueDecorator(OUString("F")); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("NUMERIC")); + aRow[1] = new ORowSetValueDecorator(OUString("NUMERIC")); aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL); aRow[3] = new ORowSetValueDecorator((sal_Int32)16); - aRow[13] = new ORowSetValueDecorator(::rtl::OUString("N")); + aRow[13] = new ORowSetValueDecorator(OUString("N")); aRow[15] = new ORowSetValueDecorator((sal_Int32)16); aRows.push_back(aRow); } @@ -156,8 +156,8 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::getColumns" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -175,9 +175,9 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( ODatabaseMetaDataResultSet::ORow aRow(19); aRow[10] = new ORowSetValueDecorator((sal_Int32)10); - Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames()); - const ::rtl::OUString* pTabBegin = aTabNames.getConstArray(); - const ::rtl::OUString* pTabEnd = pTabBegin + aTabNames.getLength(); + Sequence< OUString> aTabNames(xNames->getElementNames()); + const OUString* pTabBegin = aTabNames.getConstArray(); + const OUString* pTabEnd = pTabBegin + aTabNames.getLength(); for(;pTabBegin != pTabEnd;++pTabBegin) { if(match(tableNamePattern,*pTabBegin,'\0')) @@ -191,10 +191,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( if(!xColumns.is()) throw SQLException(); - Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames()); + Sequence< OUString> aColNames(xColumns->getElementNames()); - const ::rtl::OUString* pBegin = aColNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aColNames.getLength(); + const OUString* pBegin = aColNames.getConstArray(); + const OUString* pEnd = pBegin + aColNames.getLength(); Reference< XPropertySet> xColumn; for(sal_Int32 i=1;pBegin != pEnd;++pBegin,++i) { @@ -226,13 +226,13 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( switch(sal_Int32(aRow[11]->getValue())) { case ColumnValue::NO_NULLS: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("NO")); + aRow[18] = new ORowSetValueDecorator(OUString("NO")); break; case ColumnValue::NULLABLE: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); break; default: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString()); + aRow[18] = new ORowSetValueDecorator(OUString()); } aRows.push_back(aRow); } @@ -247,7 +247,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( - const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& table, + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& table, sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::getIndexInfo" ); @@ -264,8 +264,8 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(14); - aRow[5] = new ORowSetValueDecorator(::rtl::OUString()); - aRow[10] = new ORowSetValueDecorator(::rtl::OUString("A")); + aRow[5] = new ORowSetValueDecorator(OUString()); + aRow[10] = new ORowSetValueDecorator(OUString("A")); Reference< XIndexesSupplier> xTable; ::cppu::extractInterface(xTable,xNames->getByName(table)); @@ -276,10 +276,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( if(!xIndexes.is()) throw SQLException(); - Sequence< ::rtl::OUString> aIdxNames(xIndexes->getElementNames()); + Sequence< OUString> aIdxNames(xIndexes->getElementNames()); - const ::rtl::OUString* pBegin = aIdxNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aIdxNames.getLength(); + const OUString* pBegin = aIdxNames.getConstArray(); + const OUString* pEnd = pBegin + aIdxNames.getLength(); Reference< XPropertySet> xIndex; for(;pBegin != pEnd;++pBegin) { @@ -304,10 +304,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( Reference xColumnsSup(xIndex,UNO_QUERY); Reference< XNameAccess> xColumns = xColumnsSup->getColumns(); - Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames()); + Sequence< OUString> aColNames(xColumns->getElementNames()); - const ::rtl::OUString* pColBegin = aColNames.getConstArray(); - const ::rtl::OUString* pColEnd = pColBegin + aColNames.getLength(); + const OUString* pColBegin = aColNames.getConstArray(); + const OUString* pColEnd = pColBegin + aColNames.getLength(); Reference< XPropertySet> xColumn; for(sal_Int32 j=1;pColBegin != pColEnd;++pColBegin,++j) { @@ -323,11 +323,11 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( return xRef; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::getURL" ); ::osl::MutexGuard aGuard( m_aMutex ); - return ::rtl::OUString("sdbc:dbase:") + m_pConnection->getURL(); + return OUString("sdbc:dbase:") + m_pConnection->getURL(); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) @@ -378,7 +378,7 @@ sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, Run ::osl::MutexGuard aGuard( m_aMutex ); sal_Bool bReadOnly = sal_False; - static ::rtl::OUString sReadOnly( "IsReadOnly" ); + static OUString sReadOnly( "IsReadOnly" ); ::ucbhelper::Content aFile(m_pConnection->getContent(),Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext()); aFile.getPropertyValue(sReadOnly) >>= bReadOnly; diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index 6da0aa49118f..02837f09ef2e 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -34,13 +34,13 @@ using namespace ::com::sun::star::lang; // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.comp.sdbc.dbase.ODriver"); + return OUString("com.sun.star.comp.sdbc.dbase.ODriver"); } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } @@ -51,7 +51,7 @@ rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) return *(new ODriver(_rxFactory)); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -68,47 +68,47 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { return url.startsWith("sdbc:dbase:"); } // ----------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( acceptsURL(url) ) { ::std::vector< DriverPropertyInfo > aDriverInfo; - Sequence< ::rtl::OUString > aBoolean(2); - aBoolean[0] = ::rtl::OUString("0"); - aBoolean[1] = ::rtl::OUString("1"); + Sequence< OUString > aBoolean(2); + aBoolean[0] = OUString("0"); + aBoolean[1] = OUString("1"); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("CharSet") - ,::rtl::OUString("CharSet of the database.") + OUString("CharSet") + ,OUString("CharSet of the database.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ShowDeleted") - ,::rtl::OUString("Display inactive records.") + OUString("ShowDeleted") + ,OUString("Display inactive records.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("EnableSQL92Check") - ,::rtl::OUString("Use SQL92 naming constraints.") + OUString("EnableSQL92Check") + ,OUString("Use SQL92 naming constraints.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); } SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); return Sequence< DriverPropertyInfo >(); } diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 1e70a5cb84a9..bd2ce0d8a351 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -68,8 +68,8 @@ ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable) : OIndex(sal_True/*_pTable->getCo // ------------------------------------------------------------------------- ODbaseIndex::ODbaseIndex( ODbaseTable* _pTable, const NDXHeader& _rHeader, - const ::rtl::OUString& _rName) - :OIndex(_rName,::rtl::OUString(),_rHeader.db_unique,sal_False,sal_False,sal_True) + const OUString& _rName) + :OIndex(_rName,OUString(),_rHeader.db_unique,sal_False,sal_False,sal_True) ,m_pFileStream(NULL) ,m_aHeader(_rHeader) ,m_nCurNode(NODE_NOTFOUND) @@ -92,7 +92,7 @@ void ODbaseIndex::refreshColumns() { OSL_ENSURE(m_pFileStream,"FileStream is not opened!"); OSL_ENSURE(m_aHeader.db_name[0] != '\0',"Invalid name for the column!"); - aVector.push_back(::rtl::OUString::createFromAscii(m_aHeader.db_name)); + aVector.push_back(OUString::createFromAscii(m_aHeader.db_name)); } if(m_pColumns) @@ -141,7 +141,7 @@ sal_Bool ODbaseIndex::openIndexFile() { if(!m_pFileStream) { - ::rtl::OUString sFile = getCompletePath(); + OUString sFile = getCompletePath(); if(UCBContentHelper::Exists(sFile)) { m_pFileStream = OFileTable::createStream_simpleError(sFile, STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE); @@ -156,7 +156,7 @@ sal_Bool ODbaseIndex::openIndexFile() } if(!m_pFileStream) { - const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution( STR_COULD_NOT_LOAD_FILE, "$filename$", sFile ) ); @@ -363,12 +363,12 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, ODbaseIndex& rInd return rStream; } // ------------------------------------------------------------------------- -::rtl::OUString ODbaseIndex::getCompletePath() +OUString ODbaseIndex::getCompletePath() { - ::rtl::OUString sDir = m_pTable->getConnection()->getURL(); + OUString sDir = m_pTable->getConnection()->getURL(); sDir += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER); sDir += m_Name; - sDir += ::rtl::OUString(".ndx"); + sDir += OUString(".ndx"); return sDir; } //------------------------------------------------------------------ @@ -376,44 +376,44 @@ void ODbaseIndex::createINFEntry() { // synchronize inf-file String sEntry = m_Name; - sEntry += rtl::OUString(".ndx"); + sEntry += OUString(".ndx"); - ::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL()); + OUString sCfgFile(m_pTable->getConnection()->getURL()); sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER); sCfgFile += m_pTable->getName(); - sCfgFile += ::rtl::OUString(".inf"); + sCfgFile += OUString(".inf"); - rtl::OUString sPhysicalPath; + OUString sPhysicalPath; LocalFileHelper::ConvertURLToPhysicalName(sCfgFile,sPhysicalPath); Config aInfFile(sPhysicalPath); aInfFile.SetGroup(dBASE_III_GROUP); sal_uInt16 nSuffix = aInfFile.GetKeyCount(); - rtl::OString aNewEntry,aKeyName; + OString aNewEntry,aKeyName; sal_Bool bCase = isCaseSensitive(); while (aNewEntry.isEmpty()) { - aNewEntry = rtl::OString(RTL_CONSTASCII_STRINGPARAM("NDX")); + aNewEntry = OString(RTL_CONSTASCII_STRINGPARAM("NDX")); aNewEntry += OString::number(++nSuffix); for (sal_uInt16 i = 0; i < aInfFile.GetKeyCount(); i++) { aKeyName = aInfFile.GetKeyName(i); if (bCase ? aKeyName.equals(aNewEntry) : aKeyName.equalsIgnoreAsciiCase(aNewEntry)) { - aNewEntry = rtl::OString(); + aNewEntry = OString(); break; } } } - aInfFile.WriteKey(aNewEntry, rtl::OUStringToOString(sEntry, m_pTable->getConnection()->getTextEncoding())); + aInfFile.WriteKey(aNewEntry, OUStringToOString(sEntry, m_pTable->getConnection()->getTextEncoding())); } // ------------------------------------------------------------------------- sal_Bool ODbaseIndex::DropImpl() { closeImpl(); - ::rtl::OUString sPath = getCompletePath(); + OUString sPath = getCompletePath(); if(UCBContentHelper::Exists(sPath)) { if(!UCBContentHelper::Kill(sPath)) @@ -421,21 +421,21 @@ sal_Bool ODbaseIndex::DropImpl() } // synchronize inf-file - ::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL()); + OUString sCfgFile(m_pTable->getConnection()->getURL()); sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER); sCfgFile += m_pTable->getName(); - sCfgFile += ::rtl::OUString(".inf"); + sCfgFile += OUString(".inf"); - rtl::OUString sPhysicalPath; + OUString sPhysicalPath; OSL_VERIFY_RES( LocalFileHelper::ConvertURLToPhysicalName(sCfgFile, sPhysicalPath), "Can not convert Config Filename into Physical Name!"); Config aInfFile(sPhysicalPath); aInfFile.SetGroup(dBASE_III_GROUP); sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); - rtl::OString aKeyName; + OString aKeyName; String sEntry = m_Name; - sEntry += rtl::OUString(".ndx"); + sEntry += OUString(".ndx"); // delete entries from the inf file for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++) @@ -444,7 +444,7 @@ sal_Bool ODbaseIndex::DropImpl() aKeyName = aInfFile.GetKeyName( nKey ); if (aKeyName.copy(0,3).equalsL(RTL_CONSTASCII_STRINGPARAM("NDX"))) { - if(sEntry == String(rtl::OStringToOUString(aInfFile.ReadKey(aKeyName),m_pTable->getConnection()->getTextEncoding()))) + if(sEntry == String(OStringToOUString(aInfFile.ReadKey(aKeyName),m_pTable->getConnection()->getTextEncoding()))) { aInfFile.DeleteKey(aKeyName); break; @@ -454,7 +454,7 @@ sal_Bool ODbaseIndex::DropImpl() return sal_True; } // ------------------------------------------------------------------------- -void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::rtl::OUString& _sFile) +void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile) { closeImpl(); if(UCBContentHelper::Exists(_sFile)) @@ -465,10 +465,10 @@ void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const :: sal_Bool ODbaseIndex::CreateImpl() { // Create the Index - const ::rtl::OUString sFile = getCompletePath(); + const OUString sFile = getCompletePath(); if(UCBContentHelper::Exists(sFile)) { - const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution( STR_COULD_NOT_CREATE_INDEX_NAME, "$filename$", sFile ) ); @@ -488,7 +488,7 @@ sal_Bool ODbaseIndex::CreateImpl() m_pFileStream = OFileTable::createStream_simpleError(sFile,STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC); if (!m_pFileStream) { - const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution( STR_COULD_NOT_LOAD_FILE, "$filename$", sFile ) ); @@ -552,7 +552,7 @@ sal_Bool ODbaseIndex::CreateImpl() m_pFileStream->SetStreamSize(DINDEX_PAGE_SIZE); - rtl::OString aCol(rtl::OUStringToOString(aName, m_pTable->getConnection()->getTextEncoding())); + OString aCol(OUStringToOString(aName, m_pTable->getConnection()->getTextEncoding())); strncpy(m_aHeader.db_name, aCol.getStr(), std::min(sizeof(m_aHeader.db_name), aCol.getLength())); m_aHeader.db_unique = m_IsUnique ? 1: 0; m_aHeader.db_keyrec = m_aHeader.db_keylen + 8; diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index 73aa3d525cda..9a2da6e39659 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName) { const ODbaseTable* pTable = m_pIndex->getTable(); @@ -51,7 +51,7 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName sdbcx::ObjectType xRet = new sdbcx::OIndexColumn(sal_True,_rName ,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) - ,::rtl::OUString() + ,OUString() ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))) ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))) @@ -78,7 +78,7 @@ Reference< XPropertySet > ODbaseIndexColumns::createDescriptor() return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()); } // ------------------------------------------------------------------------- -sdbcx::ObjectType ODbaseIndexColumns::appendObject( const ::rtl::OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType ODbaseIndexColumns::appendObject( const OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor ) { return cloneDescriptor( descriptor ); } diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx index 154e67b2db47..f96224e43c86 100644 --- a/connectivity/source/drivers/dbase/DIndexes.cxx +++ b/connectivity/source/drivers/dbase/DIndexes.cxx @@ -37,15 +37,15 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -sdbcx::ObjectType ODbaseIndexes::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ODbaseIndexes::createObject(const OUString& _rName) { - ::rtl::OUString sFile = m_pTable->getConnection()->getURL(); + OUString sFile = m_pTable->getConnection()->getURL(); sFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER); sFile += _rName; - sFile += ::rtl::OUString(".ndx"); + sFile += OUString(".ndx"); if ( !UCBContentHelper::Exists(sFile) ) { - const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution( STR_COULD_NOT_LOAD_FILE, "$filename$", sFile ) ); @@ -70,7 +70,7 @@ sdbcx::ObjectType ODbaseIndexes::createObject(const ::rtl::OUString& _rName) } else { - const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution( STR_COULD_NOT_LOAD_FILE, "$filename$", sFile ) ); @@ -91,7 +91,7 @@ Reference< XPropertySet > ODbaseIndexes::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType ODbaseIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType ODbaseIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { Reference xTunnel(descriptor,UNO_QUERY); if(xTunnel.is()) @@ -105,7 +105,7 @@ sdbcx::ObjectType ODbaseIndexes::appendObject( const ::rtl::OUString& _rForName, } // ------------------------------------------------------------------------- // XDrop -void ODbaseIndexes::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) +void ODbaseIndexes::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/) { Reference< XUnoTunnel> xTunnel(getObject(_nPos),UNO_QUERY); if ( xTunnel.is() ) diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index df8bc000008e..b5e0d13563f5 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -46,24 +46,24 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, ::getBooleanCppuType()); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODbaseResultSet::getImplementationName( ) throw ( RuntimeException) +OUString SAL_CALL ODbaseResultSet::getImplementationName( ) throw ( RuntimeException) { - return ::rtl::OUString("com.sun.star.sdbcx.dbase.ResultSet"); + return OUString("com.sun.star.sdbcx.dbase.ResultSet"); } // ------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) throw( RuntimeException) +Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); - aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); + Sequence< OUString > aSupported(2); + aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL ODbaseResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -123,7 +123,7 @@ sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& if ( !( lhs >>= nFirst ) || !( rhs >>= nSecond ) ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_INVALID_BOOKMARK); + const OUString sMessage = aResources.getResourceString(STR_INVALID_BOOKMARK); ::dbtools::throwGenericSQLException(sMessage ,*this); } // if ( !( lhs >>= nFirst ) || !( rhs >>= nSecond ) ) diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 386d802a1764..61f3c8d01e71 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -320,7 +320,7 @@ void ODbaseTable::fillColumns() String aStrFieldName; aStrFieldName.AssignAscii("Column"); - ::rtl::OUString aTypeName; + OUString aTypeName; const sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(); const bool bFoxPro = m_aHeader.db_typ == VisualFoxPro || m_aHeader.db_typ == VisualFoxProAuto || m_aHeader.db_typ == FoxProMemo; @@ -343,7 +343,7 @@ void ODbaseTable::fillColumns() char cType[2]; cType[0] = aDBFColumn.db_typ; cType[1] = 0; - aTypeName = ::rtl::OUString::createFromAscii(cType); + aTypeName = OUString::createFromAscii(cType); OSL_TRACE("column type: %c",aDBFColumn.db_typ); switch (aDBFColumn.db_typ) @@ -427,8 +427,8 @@ OSL_TRACE("column type: %c",aDBFColumn.db_typ); Reference< XPropertySet> xCol = new sdbcx::OColumn(aColumnName, aTypeName, - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), ColumnValue::NULLABLE, nPrecision, aDBFColumn.db_dez, @@ -458,11 +458,11 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables,ODbaseConnection* _pConnec } // ------------------------------------------------------------------------- ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables,ODbaseConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName ) : ODbaseTable_BASE(_pTables,_pConnection,_Name, _Type, _Description, @@ -609,18 +609,18 @@ sal_Bool ODbaseTable::ReadMemoHeader() return sal_True; } // ------------------------------------------------------------------------- -String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _sName ) +String ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::getEntry" ); - ::rtl::OUString sURL; + OUString sURL; try { Reference< XResultSet > xDir = _pConnection->getDir()->getStaticResultSet(); Reference< XRow> xRow(xDir,UNO_QUERY); - ::rtl::OUString sName; - ::rtl::OUString sExt; + OUString sName; + OUString sExt; INetURLObject aURL; - static const ::rtl::OUString s_sSeparator("/"); + static const OUString s_sSeparator("/"); xDir->beforeFirst(); while(xDir->next()) { @@ -635,7 +635,7 @@ String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _s // name and extension have to coincide if ( _pConnection->matchesExtension( sExt ) ) { - sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,::rtl::OUString()); + sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,OUString()); if ( sName == _sName ) { Reference< XContentAccess > xContentAccess( xDir, UNO_QUERY ); @@ -683,7 +683,7 @@ void ODbaseTable::refreshIndexes() Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT)); aInfFile.SetGroup(dBASE_III_GROUP); sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); - rtl::OString aKeyName; + OString aKeyName; for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++) { @@ -692,8 +692,8 @@ void ODbaseTable::refreshIndexes() //...if yes, add the index list of the table if (aKeyName.copy(0,3).equalsL(RTL_CONSTASCII_STRINGPARAM("NDX"))) { - rtl::OString aIndexName = aInfFile.ReadKey(aKeyName); - aURL.setName(rtl::OStringToOUString(aIndexName, m_eEncoding)); + OString aIndexName = aInfFile.ReadKey(aKeyName); + aURL.setName(OStringToOUString(aIndexName, m_eEncoding)); try { Content aCnt(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference(), comphelper::getProcessComponentContext()); @@ -873,7 +873,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s else { // Commit the string. Use intern() to ref-count it. - *(_rRow->get())[i] = ::rtl::OUString::intern(pData, static_cast(nLastPos+1), m_eEncoding); + *(_rRow->get())[i] = OUString::intern(pData, static_cast(nLastPos+1), m_eEncoding); } } // if (nType == DataType::CHAR || nType == DataType::VARCHAR) else if ( DataType::TIMESTAMP == nType ) @@ -946,7 +946,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s continue; } - ::rtl::OUString aStr = ::rtl::OUString::intern(pData+nPos1, nPos2-nPos1+1, m_eEncoding); + OUString aStr = OUString::intern(pData+nPos1, nPos2-nPos1+1, m_eEncoding); switch (nType) { @@ -1026,9 +1026,9 @@ sal_Bool ODbaseTable::CreateImpl() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateImpl" ); OSL_ENSURE(!m_pFileStream, "SequenceError"); - if ( m_pConnection->isCheckEnabled() && ::dbtools::convertName2SQLName(m_Name,::rtl::OUString()) != m_Name ) + if ( m_pConnection->isCheckEnabled() && ::dbtools::convertName2SQLName(m_Name,OUString()) != m_Name ) { - const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_SQL_NAME_ERROR, "$name$", m_Name ) ); @@ -1040,7 +1040,7 @@ sal_Bool ODbaseTable::CreateImpl() String aName = getEntry(m_pConnection,m_Name); if(!aName.Len()) { - ::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier(); + OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier(); if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) ) aIdent += "/"; aIdent += m_Name; @@ -1114,7 +1114,7 @@ sal_Bool ODbaseTable::CreateImpl() catch(const Exception&) { - const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_COULD_NOT_DELETE_FILE, "$name$", aName ) ); @@ -1136,7 +1136,7 @@ sal_Bool ODbaseTable::CreateImpl() return sal_True; } // ----------------------------------------------------------------------------- -void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl::OUString& _sColumnName) +void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::throwInvalidColumnType" ); try @@ -1148,7 +1148,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl: { } - const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( _nErrorId, "$columnname$", _sColumnName ) ); @@ -1170,7 +1170,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe sal_uInt8 nDbaseType = dBaseIII; Reference xColumns(getColumns(),UNO_QUERY); Reference xCol; - const ::rtl::OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); + const OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); try { @@ -1223,10 +1223,10 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe sal_uInt16 nRecLength = 1; // Length 1 for deleted flag sal_Int32 nMaxFieldLength = m_pConnection->getMetaData()->getMaxColumnNameLength(); - ::rtl::OUString aName; - const ::rtl::OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - const ::rtl::OUString sPropPrec = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION); - const ::rtl::OUString sPropScale = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE); + OUString aName; + const OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + const OUString sPropPrec = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION); + const OUString sPropScale = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE); try { @@ -1240,7 +1240,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe xCol->getPropertyValue(sPropName) >>= aName; - ::rtl::OString aCol; + OString aCol; if ( DBTypeConversion::convertUnicodeString( aName, aCol, m_eEncoding ) > nMaxFieldLength) { throwInvalidColumnType( STR_INVALID_COLUMN_NAME_LENGTH, aName ); @@ -1425,7 +1425,7 @@ sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile) return sal_True; } //------------------------------------------------------------------ -sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes ) +sal_Bool ODbaseTable::Drop_Static(const OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::Drop_Static" ); INetURLObject aURL; @@ -1595,7 +1595,7 @@ sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols) return sal_False; Reference xCol; - ::rtl::OUString aColName; + OUString aColName; ::comphelper::UStringMixEqual aCase(isCaseSensitive()); for (sal_uInt16 i = 0; i < m_pColumns->getCount(); i++) { @@ -1644,7 +1644,7 @@ Reference ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos) Reference xCol; m_pColumns->getByIndex(_nColumnPos) >>= xCol; OSL_ENSURE(xCol.is(),"ODbaseTable::isUniqueByColumnName column is null!"); - ::rtl::OUString sColName; + OUString sColName; xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sColName; Reference xIndex; @@ -1663,7 +1663,7 @@ Reference ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos) return Reference(); } //------------------------------------------------------------------ -static double toDouble(const rtl::OString& rString) +static double toDouble(const OString& rString) { return ::rtl::math::stringToDouble( rString, '.', ',', NULL, NULL ); } @@ -1681,7 +1681,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, Reference xCol; Reference xIndex; sal_uInt16 i; - ::rtl::OUString aColName; + OUString aColName; const sal_Int32 nColumnCount = m_pColumns->getCount(); ::std::vector< Reference > aIndexedCols(nColumnCount); @@ -1735,7 +1735,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName; xCol.clear(); } // if ( !aColName.getLength() ) - const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_DUPLICATE_VALUE_IN_COLUMN ,"$columnname$", aColName ) ); @@ -1913,7 +1913,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, // one, because const_cast GetFormatPrecision on SvNumberFormat is not constant, // even though it really could and should be - const rtl::OString aDefaultValue( ::rtl::math::doubleToString( n, rtl_math_StringFormat_F, nScale, '.', NULL, 0)); + const OString aDefaultValue( ::rtl::math::doubleToString( n, rtl_math_StringFormat_F, nScale, '.', NULL, 0)); const sal_Int32 nValueLen = aDefaultValue.getLength(); if ( nValueLen <= nLen ) { @@ -1927,13 +1927,13 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, m_pColumns->getByIndex(i) >>= xCol; OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!"); xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName; - ::std::list< ::std::pair > aStringToSubstitutes; - aStringToSubstitutes.push_back(::std::pair("$columnname$", aColName)); + ::std::list< ::std::pair > aStringToSubstitutes; + aStringToSubstitutes.push_back(::std::pair("$columnname$", aColName)); aStringToSubstitutes.push_back(::std::pair("$precision$", OUString::number(nLen))); aStringToSubstitutes.push_back(::std::pair("$scale$", OUString::number(nScale))); - aStringToSubstitutes.push_back(::std::pair("$value$", ::rtl::OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8))); + aStringToSubstitutes.push_back(::std::pair("$value$", OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8))); - const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMN_DECIMAL_VALUE ,aStringToSubstitutes ) ); @@ -1956,9 +1956,9 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, if (!m_pMemoStream || !WriteMemo(thisColVal, nBlockNo)) break; - rtl::OString aBlock(OString::number(nBlockNo)); + OString aBlock(OString::number(nBlockNo)); //align aBlock at the right of a nLen sequence, fill to the left with '0' - rtl::OStringBuffer aStr; + OStringBuffer aStr; comphelper::string::padToLength(aStr, nLen - aBlock.getLength(), '0'); aStr.append(aBlock); @@ -1969,10 +1969,10 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, { memset(pData,' ',nLen); // Clear to NULL - ::rtl::OUString sStringToWrite( thisColVal.getString() ); + OUString sStringToWrite( thisColVal.getString() ); // convert the string, using the connection's encoding - ::rtl::OString sEncoded; + OString sEncoded; DBTypeConversion::convertUnicodeStringToLength( sStringToWrite, sEncoded, nLen, m_eEncoding ); memcpy( pData, sEncoded.getStr(), sEncoded.getLength() ); @@ -1992,7 +1992,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, if ( xCol.is() ) xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName; - const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMN_VALUE, "$columnname$", aColName ) ); @@ -2011,7 +2011,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteMemo" ); // if the BlockNo 0 is given, the block will be appended at the end sal_uIntPtr nSize = 0; - ::rtl::OString aStr; + OString aStr; ::com::sun::star::uno::Sequence aValue; sal_uInt8 nHeader[4]; const bool bBinary = aVariable.getTypeKind() == DataType::LONGVARBINARY && m_aMemoHeader.db_typ == MemoFoxPro; @@ -2142,7 +2142,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo // ----------------------------------------------------------------------------- // XAlterTable -void SAL_CALL ODbaseTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::alterColumnByName" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -2196,7 +2196,7 @@ void ODbaseTable::alterColumn(sal_Int32 index, pNewTable = new ODbaseTable(m_pTables,static_cast(m_pConnection)); Reference xHoldTable = pNewTable; - pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName))); + pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(OUString(sTempName))); Reference xAppend(pNewTable->getColumns(),UNO_QUERY); OSL_ENSURE(xAppend.is(),"ODbaseTable::alterColumn: No XAppend interface!"); @@ -2235,7 +2235,7 @@ void ODbaseTable::alterColumn(sal_Int32 index, // construct the new table if(!pNewTable->CreateImpl()) { - const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_COLUMN_NOT_ALTERABLE, "$columnname$", ::comphelper::getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) ) ); @@ -2283,7 +2283,7 @@ Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const return getConnection()->getMetaData(); } // ------------------------------------------------------------------------- -void SAL_CALL ODbaseTable::rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::rename" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -2302,15 +2302,15 @@ void SAL_CALL ODbaseTable::rename( const ::rtl::OUString& newName ) throw(::com: } namespace { - void renameFile(OConnection* _pConenction,const ::rtl::OUString& oldName, - const ::rtl::OUString& newName,const String& _sExtension) + void renameFile(OConnection* _pConenction,const OUString& oldName, + const OUString& newName,const String& _sExtension) { String aName = ODbaseTable::getEntry(_pConenction,oldName); if(!aName.Len()) { - ::rtl::OUString aIdent = _pConenction->getContent()->getIdentifier()->getContentIdentifier(); + OUString aIdent = _pConenction->getContent()->getIdentifier()->getContentIdentifier(); if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) ) - aIdent += ::rtl::OUString("/"); + aIdent += OUString("/"); aIdent += oldName; aName = aIdent; } @@ -2329,7 +2329,7 @@ namespace Sequence< PropertyValue > aProps( 1 ); aProps[0].Name = "Title"; aProps[0].Handle = -1; // n/a - aProps[0].Value = makeAny( ::rtl::OUString(sNewName) ); + aProps[0].Value = makeAny( OUString(sNewName) ); Sequence< Any > aValues; aContent.executeCommand( "setPropertyValues",makeAny(aProps) ) >>= aValues; if(aValues.getLength() && aValues[0].hasValue()) @@ -2342,7 +2342,7 @@ namespace } } // ------------------------------------------------------------------------- -void SAL_CALL ODbaseTable::renameImpl( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::getEntry" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -2353,7 +2353,7 @@ void SAL_CALL ODbaseTable::renameImpl( const ::rtl::OUString& newName ) throw(:: renameFile(m_pConnection,m_Name,newName,m_pConnection->getExtension()); if ( HasMemoFields() ) { // delete the memo fields - rtl::OUString sExt("dbt"); + OUString sExt("dbt"); renameFile(m_pConnection,m_Name,newName,sExt); } } @@ -2365,7 +2365,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn) ODbaseTable* pNewTable = new ODbaseTable(m_pTables,static_cast(m_pConnection)); Reference< XPropertySet > xHold = pNewTable; - pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName))); + pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(OUString(sTempName))); { Reference xAppend(pNewTable->getColumns(),UNO_QUERY); sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(); @@ -2394,7 +2394,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn) // construct the new table if(!pNewTable->CreateImpl()) { - const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_COLUMN_NOT_ADDABLE, "$columnname$", ::comphelper::getString(_xNewColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) ) ); @@ -2438,7 +2438,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos) ODbaseTable* pNewTable = new ODbaseTable(m_pTables,static_cast(m_pConnection)); Reference< XPropertySet > xHold = pNewTable; - pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName))); + pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(OUString(sTempName))); { Reference xAppend(pNewTable->getColumns(),UNO_QUERY); sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(); @@ -2467,7 +2467,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos) if(!pNewTable->CreateImpl()) { xHold = pNewTable = NULL; - const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_COLUMN_NOT_DROP, "$position$", OUString::number(_nPos) ) ); @@ -2490,7 +2490,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos) String ODbaseTable::createTempFile() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::createTempFile" ); - ::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier(); + OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier(); if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) ) aIdent += "/"; String sTempName(aIdent); @@ -2576,7 +2576,7 @@ void ODbaseTable::throwInvalidDbaseFormat() FileClose(); // no dbase file - const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_DBASE_FILE, "$filename$", getEntry(m_pConnection,m_Name) ) ); @@ -2685,7 +2685,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable) case MemodBaseIII: // dBase III-Memofield, ends with Ctrl-Z { const char cEOF = (char) DBF_EOL; - rtl::OStringBuffer aBStr; + OStringBuffer aBStr; static char aBuf[514]; aBuf[512] = 0; // avoid random value sal_Bool bReady = sal_False; @@ -2704,7 +2704,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable) } while (!bReady && !m_pMemoStream->IsEof()); - aVariable = rtl::OStringToOUString(aBStr.makeStringAndClear(), + aVariable = OStringToOUString(aBStr.makeStringAndClear(), m_eEncoding); } break; @@ -2733,11 +2733,11 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable) { if ( bIsText ) { - rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*m_pMemoStream, nLength)); + OStringBuffer aBuffer(read_uInt8s_ToOString(*m_pMemoStream, nLength)); //pad it out with ' ' to expected length on short read sal_Int32 nRequested = sal::static_int_cast(nLength); comphelper::string::padToLength(aBuffer, nRequested, ' '); - aVariable = rtl::OStringToOUString(aBuffer.makeStringAndClear(), m_eEncoding); + aVariable = OStringToOUString(aBuffer.makeStringAndClear(), m_eEncoding); } // if ( bIsText ) else { diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index 18c9f96f3a58..79cd308cd438 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -43,10 +43,10 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -sdbcx::ObjectType ODbaseTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName) { ODbaseTable* pRet = new ODbaseTable(this,(ODbaseConnection*)static_cast(m_rParent).getConnection(), - _rName,::rtl::OUString("TABLE")); + _rName,OUString("TABLE")); sdbcx::ObjectType xRet = pRet; pRet->construct(); @@ -64,7 +64,7 @@ Reference< XPropertySet > ODbaseTables::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType ODbaseTables::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType ODbaseTables::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { Reference xTunnel(descriptor,UNO_QUERY); if(xTunnel.is()) @@ -92,7 +92,7 @@ sdbcx::ObjectType ODbaseTables::appendObject( const ::rtl::OUString& _rForName, } // ------------------------------------------------------------------------- // XDrop -void ODbaseTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void ODbaseTables::dropObject(sal_Int32 _nPos,const OUString _sElementName) { Reference< XUnoTunnel> xTunnel; try @@ -113,7 +113,7 @@ void ODbaseTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementNam } else { - const ::rtl::OUString sError( static_cast(m_rParent).getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( static_cast(m_rParent).getConnection()->getResources().getResourceStringWithSubstitution( STR_TABLE_NOT_DROP, "$tablename$", _sElementName ) ); diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx index 7f861137d7d1..f38922058754 100644 --- a/connectivity/source/drivers/dbase/Dservices.cxx +++ b/connectivity/source/drivers/dbase/Dservices.cxx @@ -21,7 +21,6 @@ #include using namespace connectivity::dbase; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index f2ec9c8e3aab..75f959e48dc2 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -45,7 +45,7 @@ ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec) { } // ----------------------------------------------------------------------------- -ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec) +ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec) : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR) ,nRecord(nRec) { @@ -665,12 +665,12 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex) else { sal_uInt16 nLen = rIndex.getHeader().db_keylen; - rtl::OString aBuf = read_uInt8s_ToOString(rStream, nLen); + OString aBuf = read_uInt8s_ToOString(rStream, nLen); //get length minus trailing whitespace sal_Int32 nContentLen = aBuf.getLength(); while (nContentLen && aBuf[nContentLen-1] == ' ') --nContentLen; - aKey = ONDXKey(::rtl::OUString(aBuf.getStr(), nContentLen, rIndex.m_pTable->getConnection()->getTextEncoding()) ,aKey.nRecord); + aKey = ONDXKey(OUString(aBuf.getStr(), nContentLen, rIndex.m_pTable->getConnection()->getTextEncoding()) ,aKey.nRecord); } rStream >> aChild; } @@ -706,8 +706,8 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const memset(&pBuf[0], 0x20, nLen); if (!aKey.getValue().isNull()) { - ::rtl::OUString sValue = aKey.getValue(); - rtl::OString aText(rtl::OUStringToOString(sValue, rIndex.m_pTable->getConnection()->getTextEncoding())); + OUString sValue = aKey.getValue(); + OString aText(OUStringToOString(sValue, rIndex.m_pTable->getConnection()->getTextEncoding())); strncpy(reinterpret_cast(&pBuf[0]), aText.getStr(), std::min(nLen, aText.getLength())); } @@ -909,7 +909,7 @@ void ONDXPage::PrintPage() } else { - OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), rtl::OUStringToOString(rKey.getValue().getString(), rIndex.m_pTable->getConnection()->getTextEncoding()).getStr(),rNode.GetChild().GetPagePos()); + OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), OUStringToOString(rKey.getValue().getString(), rIndex.m_pTable->getConnection()->getTextEncoding()).getStr(),rNode.GetChild().GetPagePos()); } } OSL_TRACE("SDB: -----------------------------------------------"); diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index 8b7b5cd1bc00..f8b904852c6e 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.cxx @@ -131,7 +131,7 @@ bool EApiInit() for( guint j = 0; j < G_N_ELEMENTS( eBookLibNames ); j++ ) { - aModule = osl_loadModule( rtl::OUString::createFromAscii + aModule = osl_loadModule( OUString::createFromAscii ( eBookLibNames[ j ] ).pData, SAL_LOADMODULE_DEFAULT ); diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx index 4d035ff4c903..06be9242db79 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.cxx @@ -42,15 +42,15 @@ OEvoabCatalog::OEvoabCatalog(OEvoabConnection* _pCon) : void OEvoabCatalog::refreshTables() { TStringVector aVector; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("TABLE"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("TABLE"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); + OUString("%"),OUString("%"),aTypes); if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aName; + OUString aName; while(xResult->next()) { diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx index b131bc36bb95..9f05ea22a80b 100644 --- a/connectivity/source/drivers/evoab2/NColumns.cxx +++ b/connectivity/source/drivers/evoab2/NColumns.cxx @@ -35,12 +35,12 @@ using namespace ::com::sun::star::lang; using namespace connectivity::evoab; // ------------------------------------------------------------------------- -sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName) { const Any aCatalog; - const ::rtl::OUString sCatalogName; - const ::rtl::OUString sSchemaName(m_pTable->getSchema()); - const ::rtl::OUString sTableName(m_pTable->getTableName()); + const OUString sCatalogName; + const OUString sSchemaName(m_pTable->getSchema()); + const OUString sTableName(m_pTable->getTableName()); Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns( aCatalog, sSchemaName, diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index b5a183484b05..0d5c9a03ed42 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.hxx @@ -32,7 +32,7 @@ namespace connectivity protected: OEvoabTable* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index 2602f34480a5..680a8ea2d121 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -40,27 +40,27 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; -::rtl::OUString implGetExceptionMsg( Exception& e, const ::rtl::OUString& aExceptionType_ ) +OUString implGetExceptionMsg( Exception& e, const OUString& aExceptionType_ ) { - ::rtl::OUString aExceptionType = aExceptionType_; + OUString aExceptionType = aExceptionType_; if( aExceptionType.isEmpty() ) - aExceptionType = ::rtl::OUString("Unknown") ; + aExceptionType = OUString("Unknown") ; - ::rtl::OUString aTypeLine( "\nType: " ); + OUString aTypeLine( "\nType: " ); aTypeLine += aExceptionType; - ::rtl::OUString aMessageLine( "\nMessage: " ); - aMessageLine += ::rtl::OUString( e.Message ); + OUString aMessageLine( "\nMessage: " ); + aMessageLine += OUString( e.Message ); - ::rtl::OUString aMsg(aTypeLine); + OUString aMsg(aTypeLine); aMsg += aMessageLine; return aMsg; } // Exception type unknown -::rtl::OUString implGetExceptionMsg( Exception& e ) +OUString implGetExceptionMsg( Exception& e ) { - ::rtl::OUString aMsg = implGetExceptionMsg( e, ::rtl::OUString() ); + OUString aMsg = implGetExceptionMsg( e, OUString() ); return aMsg; } @@ -93,12 +93,12 @@ void SAL_CALL OEvoabConnection::release() throw() IMPLEMENT_SERVICE_INFO(OEvoabConnection, "com.sun.star.sdbc.drivers.evoab.Connection", "com.sun.star.sdbc.Connection") //----------------------------------------------------------------------------- -void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info) throw(SQLException) +void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) throw(SQLException) { osl_atomic_increment( &m_refCount ); SAL_INFO("evoab2", "OEvoabConnection::construct()::url = " << url ); - ::rtl::OUString sPassword; + OUString sPassword; const char* pPwd = "password"; const PropertyValue *pIter = info.getConstArray(); @@ -119,12 +119,12 @@ void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< Pro else setSDBCAddressType(SDBCAddress::EVO_LOCAL); setURL(url); - setPassword(::rtl::OUStringToOString(sPassword,RTL_TEXTENCODING_UTF8)); + setPassword(OUStringToOString(sPassword,RTL_TEXTENCODING_UTF8)); osl_atomic_decrement( &m_refCount ); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) { // when you need to transform SQL92 to you driver specific you can do it here return _sSql; @@ -170,7 +170,7 @@ Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) throw(SQL return xStmt; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -183,7 +183,7 @@ Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( con return xStmt; } -Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw( SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ ) throw( SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; @@ -248,14 +248,14 @@ sal_Bool SAL_CALL OEvoabConnection::isReadOnly( ) throw(SQLException, RuntimeEx { return sal_False; } -void SAL_CALL OEvoabConnection::setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } -::rtl::OUString SAL_CALL OEvoabConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabConnection::getCatalog( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) { diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index 1fc9764cb60b..772bfce483b1 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -58,17 +58,17 @@ namespace connectivity SDBCAddress::sdbc_address_type m_eSDBCAddressType; ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > m_xCatalog; - ::rtl::OString m_aPassword; + OString m_aPassword; ::dbtools::WarningsContainer m_aWarnings; virtual ~OEvoabConnection(); public: OEvoabConnection( OEvoabDriver& _rDriver ); - virtual void construct(const ::rtl::OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); + virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); - inline rtl::OString getPassword() { return m_aPassword; } - inline void setPassword( rtl::OString aStr ) { m_aPassword = aStr; } + inline OString getPassword() { return m_aPassword; } + inline void setPassword( OString aStr ) { m_aPassword = aStr; } // own methods inline const OEvoabDriver& getDriver() const { return m_rDriver; } @@ -86,9 +86,9 @@ namespace connectivity // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -97,8 +97,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index a214bd106019..8f3198234c26 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -177,14 +177,14 @@ namespace connectivity return nType == G_TYPE_STRING ? DataType::VARCHAR : DataType::BIT; } - guint findEvoabField(const rtl::OUString& aColName) + guint findEvoabField(const OUString& aColName) { guint nRet = (guint)-1; sal_Bool bFound = sal_False; initFields(); for (guint i=0;(i < nFields) && !bFound;i++) { - rtl::OUString aName = getFieldName(i); + OUString aName = getFieldName(i); if (aName == aColName) { nRet = i; @@ -194,30 +194,30 @@ namespace connectivity return nRet; } - rtl::OUString + OUString getFieldTypeName( guint nCol ) { switch( getFieldType( nCol ) ) { case DataType::BIT: - return ::rtl::OUString("BIT"); + return OUString("BIT"); case DataType::VARCHAR: - return ::rtl::OUString("VARCHAR"); + return OUString("VARCHAR"); default: break; } - return ::rtl::OUString(); + return OUString(); } - rtl::OUString + OUString getFieldName( guint nCol ) { const GParamSpec *pSpec = getField( nCol )->pField; - rtl::OUString aName; + OUString aName; initFields(); if( pSpec ) - aName = rtl::OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ), + aName = OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ), RTL_TEXTENCODING_UTF8 ); aName = aName.replace( '-', '_' ); return aName; @@ -259,7 +259,7 @@ OEvoabDatabaseMetaData::~OEvoabDatabaseMetaData() } // ------------------------------------------------------------------------- -ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const ::rtl::OUString& columnNamePattern ) +ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const OUString& columnNamePattern ) { static ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(19); @@ -270,9 +270,9 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const // **************************************************** // Catalog - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("")); + aRow[1] = new ORowSetValueDecorator(OUString("")); // Schema - aRow[2] = new ORowSetValueDecorator(::rtl::OUString("")); + aRow[2] = new ORowSetValueDecorator(OUString("")); // COLUMN_SIZE aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE); // BUFFER_LENGTH, not used @@ -294,10 +294,10 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const // CHAR_OCTET_LENGTH, refer to [5] aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH); // IS_NULLABLE - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); - aRow[3] = new ORowSetValueDecorator(::rtl::OUString("TABLE")); + aRow[3] = new ORowSetValueDecorator(OUString("TABLE")); ::osl::MutexGuard aGuard( m_aMutex ); initFields(); @@ -320,9 +320,9 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const return aRows ; } // ------------------------------------------------------------------------- -::rtl::OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) @@ -442,22 +442,22 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(S return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " - ::rtl::OUString aVal("\""); + OUString aVal("\""); return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- @@ -791,52 +791,52 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL( ) thro return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)1); + OUString aValue = OUString::valueOf((sal_Int32)1); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)0); + OUString aValue = OUString::valueOf((sal_Int32)0); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- @@ -855,36 +855,36 @@ sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion( ) throw(Runti return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) @@ -1002,16 +1002,16 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw /* Dont need to change as evoab driver supports only table */ // there exists no possibility to get table types so we have to check - static ::rtl::OUString sTableTypes[] = + static OUString sTableTypes[] = { - ::rtl::OUString("TABLE"), + OUString("TABLE"), // Currently we only support a 'TABLE' nothing more complex }; ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; // here we fill the rows which should be visible when ask for data from the resultset returned here - sal_Int32 nSize = sizeof(sTableTypes) / sizeof(::rtl::OUString); + sal_Int32 nSize = sizeof(sTableTypes) / sizeof(OUString); ODatabaseMetaDataResultSet::ORows aRows; for(sal_Int32 i=0;i < nSize;++i) { @@ -1043,7 +1043,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.reserve(19); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); + aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -1065,7 +1065,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR")); + aRow[1] = new ORowSetValueDecorator(OUString("VARCHAR")); aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR); aRow[3] = new ORowSetValueDecorator((sal_Int32)65535); aRows.push_back(aRow); @@ -1075,8 +1075,8 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*tableNamePattern*/, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -1097,8 +1097,8 @@ bool isSourceBackend(ESource *pSource, const char *backendname) } Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, - const ::rtl::OUString& /*tableNamePattern*/, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, + const OUString& /*tableNamePattern*/, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1108,7 +1108,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( // check if any type is given // when no types are given then we have to return all tables e.g. TABLE - const ::rtl::OUString aTable("TABLE"); + const OUString aTable("TABLE"); sal_Bool bTableFound = sal_True; sal_Int32 nLength = types.getLength(); @@ -1116,8 +1116,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( { bTableFound = sal_False; - const ::rtl::OUString* pBegin = types.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + nLength; + const OUString* pBegin = types.getConstArray(); + const OUString* pEnd = pBegin + nLength; for(;pBegin != pEnd;++pBegin) { if(*pBegin == aTable) @@ -1212,7 +1212,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( { ESource *pSource = E_SOURCE (s->data); - rtl::OUString aName = rtl::OStringToOUString( e_source_peek_name( pSource ), + OUString aName = OStringToOUString( e_source_peek_name( pSource ), RTL_TEXTENCODING_UTF8 ); ODatabaseMetaDataResultSet::ORow aRow(3); @@ -1230,7 +1230,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XDatabaseMetaDaza::getUDTs", *this ); return NULL; diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index 7079bf30a511..87ded8659ef2 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -54,9 +54,9 @@ namespace connectivity const ColumnProperty *getField(guint n); GType getGFieldType(guint nCol) ; sal_Int32 getFieldType(guint nCol) ; - rtl::OUString getFieldTypeName(guint nCol) ; - rtl::OUString getFieldName(guint nCol) ; - guint findEvoabField(const rtl::OUString& aColName); + OUString getFieldTypeName(guint nCol) ; + OUString getFieldName(guint nCol) ; + guint findEvoabField(const OUString& aColName); void free_column_resources(); @@ -64,14 +64,14 @@ namespace connectivity { OEvoabConnection* m_pConnection; - ODatabaseMetaDataResultSet::ORows& getColumnRows( const ::rtl::OUString& columnNamePattern ); + ODatabaseMetaDataResultSet::ORows& getColumnRows( const OUString& columnNamePattern ); protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information - virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual ::rtl::OUString impl_getCatalogSeparator_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); @@ -93,17 +93,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -116,13 +116,13 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -148,9 +148,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -198,9 +198,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -213,7 +213,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index 86f36afd6db6..601a111630c5 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -78,40 +78,40 @@ void OEvoabDriver::disposing() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString(EVOAB_DRIVER_IMPL_NAME); + return OUString(EVOAB_DRIVER_IMPL_NAME); // this name is referenced in the configuration and in the evoab.xml // Please take care when changing it. } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported // for more information @see com.sun.star.sdbc.Driver - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL OEvoabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OEvoabDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL OEvoabDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; return pSupported != pEnd; } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -122,7 +122,7 @@ Sequence< ::rtl::OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) return *(new OEvoabDriver(_rxFactory)); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL OEvoabDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -139,19 +139,19 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const ::rtl::OUString& return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { return acceptsURL_Stat(url); } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( ! acceptsURL(url) ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); } // if ( ! acceptsURL(url) ) @@ -170,7 +170,7 @@ sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException) return 0; } // -------------------------------------------------------------------------------- -sal_Bool OEvoabDriver::acceptsURL_Stat( const ::rtl::OUString& url ) +sal_Bool OEvoabDriver::acceptsURL_Stat( const OUString& url ) { return ( url == "sdbc:address:evolution:local" || url == "sdbc:address:evolution:groupwise" || url == "sdbc:address:evolution:ldap" ) && EApiInit(); } diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index a6bcf2ed85e2..60802e64697c 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -62,19 +62,19 @@ namespace connectivity virtual void SAL_CALL disposing(void); // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); @@ -85,7 +85,7 @@ namespace connectivity getComponentContext( ) const { return comphelper::getComponentContext( m_xFactory ); } // static methods - static sal_Bool acceptsURL_Stat( const ::rtl::OUString& url ); + static sal_Bool acceptsURL_Stat( const OUString& url ); }; } diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 3265547c84f6..e067c8d06806 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -51,7 +51,7 @@ OEvoabPreparedStatement::OEvoabPreparedStatement( OEvoabConnection* _pConnection } // ----------------------------------------------------------------------------- -void OEvoabPreparedStatement::construct( const ::rtl::OUString& _sql ) +void OEvoabPreparedStatement::construct( const OUString& _sql ) { m_sSqlStatement = _sql; @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) throw(SQLException } // ------------------------------------------------------------------------- -void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const ::rtl::OUString& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setString", *this ); } @@ -260,7 +260,7 @@ void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterI } // ------------------------------------------------------------------------- -void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setObjectNull", *this ); } @@ -270,9 +270,9 @@ void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, cons { if(!::dbtools::implSetObject(this,parameterIndex,x)) { - const ::rtl::OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_UNKNOWN_PARA_TYPE, - "$position$", ::rtl::OUString::valueOf(parameterIndex) + "$position$", OUString::valueOf(parameterIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index c6ab7939dc3d..468b8130571b 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -63,7 +63,7 @@ namespace connectivity //==================================================================== // our SQL statement - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; // the EBookQuery we're working with QueryData m_aQueryData; // our meta data @@ -75,7 +75,7 @@ namespace connectivity public: OEvoabPreparedStatement( OEvoabConnection* _pConnection ); - void construct( const ::rtl::OUString& _sql ); + void construct( const OUString& _sql ); protected: DECLARE_SERVICE_INFO(); @@ -93,7 +93,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -101,7 +101,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index f3a5ca33d552..364db8cae361 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -64,23 +64,23 @@ using namespace com::sun::star::io; namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition; //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) \ +OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) \ { - return ::rtl::OUString("com.sun.star.sdbcx.evoab.ResultSet"); + return OUString("com.sun.star.sdbcx.evoab.ResultSet"); } // ------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException) + Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OEvoabResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -99,12 +99,12 @@ struct ComparisonData } }; -static ::rtl::OUString +static OUString valueToOUString( GValue& _rValue ) { const char *pStr = g_value_get_string( &_rValue ); - rtl::OString aStr( pStr ? pStr : "" ); - ::rtl::OUString sResult( ::rtl::OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 ) ); + OString aStr( pStr ? pStr : "" ); + OUString sResult( OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 ) ); g_value_unset( &_rValue ); return sResult; } @@ -317,7 +317,7 @@ int CompareContacts( gconstpointer _lhs, gconstpointer _rhs, gpointer _userData bool bLhsNull = true; bool bRhsNull = true; - ::rtl::OUString sLhs, sRhs; + OUString sLhs, sRhs; bool bLhs(false), bRhs(false); const ComparisonData& rCompData = *static_cast< const ComparisonData* >( _userData ); @@ -578,7 +578,7 @@ public: if( isAuthRequired( pBook ) ) { - rtl::OString aUser( getUserName( pBook ) ); + OString aUser( getUserName( pBook ) ); const char *pAuth = e_source_get_property( pSource, "auth" ); bAuthSuccess = e_book_authenticate_user( pBook, aUser.getStr(), rPassword.getStr(), pAuth, NULL ); } @@ -693,7 +693,7 @@ void OEvoabResultSet::construct( const QueryData& _rData ) } if ( bExecuteQuery ) { - rtl::OString aPassword = m_pConnection->getPassword(); + OString aPassword = m_pConnection->getPassword(); m_pVersionHelper->executeQuery(pBook, _rData.getQuery(), aPassword); m_pConnection->setPassword( aPassword ); @@ -752,11 +752,11 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) throw( RuntimeException) * If the equivalent NResultSetMetaData.cxx marks the columntype of * nColumnNum as DataType::VARCHAR this accessor is used. */ -::rtl::OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - rtl::OUString aResult; + OUString aResult; if ( m_xMetaData.is()) { OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get(); @@ -1113,7 +1113,7 @@ Any SAL_CALL OEvoabResultSet::getWarnings( ) throw(SQLException, RuntimeExcepti } // ------------------------------------------------------------------------- //XColumnLocate Interface -sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 678f123dea3c..4b8bf638d8d7 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -157,7 +157,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -186,7 +186,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 02cf66fd43f5..889c9269eccc 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -28,7 +28,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; -OEvoabResultSetMetaData::OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName) +OEvoabResultSetMetaData::OEvoabResultSetMetaData(const OUString& _aTableName) : m_aTableName(_aTableName), m_aEvoabFields() { @@ -42,18 +42,18 @@ OEvoabResultSetMetaData::~OEvoabResultSetMetaData() void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference &xColumns) throw(SQLException) { OSQLColumns::Vector::const_iterator aIter; - static const ::rtl::OUString aName("Name"); + static const OUString aName("Name"); for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter) { - ::rtl::OUString aFieldName; + OUString aFieldName; (*aIter)->getPropertyValue(aName) >>= aFieldName; guint nFieldNumber = findEvoabField(aFieldName); if (nFieldNumber == (guint)-1) { connectivity::SharedResources aResource; - const ::rtl::OUString sError( aResource.getResourceStringWithSubstitution( + const OUString sError( aResource.getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", aFieldName ) ); @@ -85,49 +85,49 @@ sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnN return sal_True; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; return evoab::getFieldName( nField ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; return evoab::getFieldTypeName( nField ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; const ColumnProperty *pSpecs = getField(nField); GParamSpec *pSpec = pSpecs->pField; - rtl::OUString aLabel; + OUString aLabel; if( pSpec ) - aLabel = rtl::OStringToOUString( g_param_spec_get_nick( (GParamSpec *) pSpec ), + aLabel = OStringToOUString( g_param_spec_get_nick( (GParamSpec *) pSpec ), RTL_TEXTENCODING_UTF8 ); return aLabel; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) { - return m_aTableName;//::rtl::OUString("TABLE"); + return m_aTableName;//OUString("TABLE"); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index 9ef3b859f8cd..54bef44cd470 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx @@ -36,13 +36,13 @@ namespace connectivity class OEvoabResultSetMetaData : public OResultSetMetaData_BASE { - ::rtl::OUString m_aTableName; + OUString m_aTableName; ::std::vector m_aEvoabFields; protected: virtual ~OEvoabResultSetMetaData(); public: - OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName); + OEvoabResultSetMetaData(const OUString& _aTableName); void setEvoabFields(const ::rtl::Reference &xColumns) throw(::com::sun::star::sdbc::SQLException); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aEvoabFields[columnIndex - 1]; } @@ -60,19 +60,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index e922073df08b..dc3a242fec32 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -22,7 +22,6 @@ #include using namespace connectivity::evoab; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 949a4e6a737e..0252794604df 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -159,12 +159,12 @@ OCommonStatement::createTrue() } EBookQuery * -OCommonStatement::createTest( const ::rtl::OUString &aColumnName, +OCommonStatement::createTest( const OUString &aColumnName, EBookQueryTest eTest, - const ::rtl::OUString &aMatch ) + const OUString &aMatch ) { - ::rtl::OString sMatch = rtl::OUStringToOString( aMatch, RTL_TEXTENCODING_UTF8 ); - ::rtl::OString sColumnName = rtl::OUStringToOString( aColumnName, RTL_TEXTENCODING_UTF8 ); + OString sMatch = OUStringToOString( aMatch, RTL_TEXTENCODING_UTF8 ); + OString sColumnName = OUStringToOString( aColumnName, RTL_TEXTENCODING_UTF8 ); return e_book_query_field_test( e_contact_field_id( sColumnName.getStr() ), eTest, sMatch.getStr() ); @@ -172,11 +172,11 @@ OCommonStatement::createTest( const ::rtl::OUString &aColumnName, // ------------------------------------------------------------------------- -::rtl::OUString OCommonStatement::impl_getColumnRefColumnName_throw( const OSQLParseNode& _rColumnRef ) +OUString OCommonStatement::impl_getColumnRefColumnName_throw( const OSQLParseNode& _rColumnRef ) { ENSURE_OR_THROW( SQL_ISRULE( &_rColumnRef, column_ref ), "internal error: only column_refs supported as LHS" ); - ::rtl::OUString sColumnName; + OUString sColumnName; switch ( _rColumnRef.count() ) { case 3: // SQL_TOKEN_NAME '.' column_val @@ -233,7 +233,7 @@ void OCommonStatement::orderByAnalysis( const OSQLParseNode* _pOrderByClause, So // column name -> column field if ( !SQL_ISRULE( pColumnRef, column_ref ) ) m_pConnection->throwGenericSQLException( STR_SORT_BY_COL_ONLY, *this ); - const ::rtl::OUString sColumnName( impl_getColumnRefColumnName_throw( *pColumnRef ) ); + const OUString sColumnName( impl_getColumnRefColumnName_throw( *pColumnRef ) ); guint nField = evoab::findEvoabField( sColumnName ); // ascending/descending? bool bAscending = true; @@ -324,9 +324,9 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) return ( nLHS == nRHS ) ? createTrue() : NULL; } - ::rtl::OUString aColumnName( impl_getColumnRefColumnName_throw( *pLHS ) ); + OUString aColumnName( impl_getColumnRefColumnName_throw( *pLHS ) ); - ::rtl::OUString aMatchString; + OUString aMatchString; if ( pRHS->isToken() ) aMatchString = pRHS->getTokenValue(); else @@ -346,7 +346,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) if( ! SQL_ISRULE( parseTree->getChild( 0 ), column_ref) ) m_pConnection->throwGenericSQLException(STR_QUERY_INVALID_LIKE_COLUMN,*this); - ::rtl::OUString aColumnName( impl_getColumnRefColumnName_throw( *parseTree->getChild( 0 ) ) ); + OUString aColumnName( impl_getColumnRefColumnName_throw( *parseTree->getChild( 0 ) ) ); OSQLParseNode *pAtom = pPart2->getChild( pPart2->count() - 2 ); // Match String bool bNotLike = pPart2->getChild(0)->isToken(); @@ -363,15 +363,15 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) const sal_Unicode WILDCARD = '%'; - rtl::OUString aMatchString; + OUString aMatchString; aMatchString = pAtom->getTokenValue(); // Determine where '%' character is... - if( aMatchString.equals( ::rtl::OUString::valueOf( WILDCARD ) ) ) + if( aMatchString.equals( OUString::valueOf( WILDCARD ) ) ) { // String containing only a '%' and nothing else matches everything pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS, - rtl::OUString("") ); + OUString("") ); } else if( aMatchString.indexOf( WILDCARD ) == -1 ) { // Simple string , eg. "to match" "contains in evo" @@ -410,14 +410,14 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) return pResult; } -rtl::OUString OCommonStatement::getTableName() +OUString OCommonStatement::getTableName() { - ::rtl::OUString aTableName; + OUString aTableName; if( m_pParseTree && m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT ) { Any aCatalog; - ::rtl::OUString aSchema; + OUString aSchema; const OSQLParseNode *pSelectStmnt = m_aSQLIterator.getParseTree(); const OSQLParseNode *pAllTableNames = pSelectStmnt->getChild( 3 )->getChild( 0 )->getChild( 1 ); @@ -443,13 +443,13 @@ rtl::OUString OCommonStatement::getTableName() return aTableName; } -void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQueryData ) +void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData ) { SAL_INFO( "evoab2", "parsing " << sql ); _out_rQueryData.eFilterType = eFilterOther; - ::rtl::OUString aErr; + OUString aErr; m_pParseTree = m_aParser.parseTree( aErr, sql ); m_aSQLIterator.setParseTree( m_pParseTree ); m_aSQLIterator.traverseAll(); @@ -461,7 +461,7 @@ void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQuer if ( pOrderByClause ) { #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sTreeDebug; + OUString sTreeDebug; pOrderByClause->showParseTree( sTreeDebug ); SAL_INFO( "evoab2", "found order-by tree:\n" << sTreeDebug ); #endif @@ -472,7 +472,7 @@ void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQuer if ( pWhereClause && SQL_ISRULE( pWhereClause, where_clause ) ) { #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sTreeDebug; + OUString sTreeDebug; pWhereClause->showParseTree( sTreeDebug ); SAL_INFO( "evoab2", "found where tree:\n" << sTreeDebug ); #endif @@ -544,7 +544,7 @@ void SAL_CALL OCommonStatement::release() throw() } // ------------------------------------------------------------------------- -QueryData OCommonStatement::impl_getEBookQuery_throw( const ::rtl::OUString& _rSql ) +QueryData OCommonStatement::impl_getEBookQuery_throw( const OUString& _rSql ) { QueryData aData; parseSql( _rSql, aData ); @@ -580,7 +580,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const QueryDa } // ------------------------------------------------------------------------- -Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const ::rtl::OUString& _rSql ) +Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUString& _rSql ) { SAL_INFO( "evoab2", "OCommonStatement::impl_executeQuery_throw(" << _rSql << "%s)\n" ); @@ -611,7 +611,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OCommonStatement, OStatement_IBase ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OCommonStatement, OStatement_IBase ) // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& _sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -621,7 +621,7 @@ sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& _sql ) throw(SQLEx } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL OStatement::executeQuery( const ::rtl::OUString& _sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -630,7 +630,7 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const ::rtl::OUString } // ----------------------------------------------------------------------------- -sal_Int32 SAL_CALL OStatement::executeUpdate( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 187b1fde70d6..4529aae671e1 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -75,7 +75,7 @@ namespace connectivity EBookQuery* pQuery; public: - ::rtl::OUString sTable; + OUString sTable; QueryFilterType eFilterType; ::rtl::Reference< ::connectivity::OSQLColumns > xSelectColumns; SortDescriptor aSortOrder; @@ -153,7 +153,7 @@ namespace connectivity connectivity::OSQLParseNode *m_pParseTree; // - ::rtl::OUString m_aCursorName; + OUString m_aCursorName; sal_Int32 m_nMaxFieldSize; sal_Int32 m_nMaxRows; sal_Int32 m_nQueryTimeOut; @@ -176,14 +176,14 @@ namespace connectivity virtual ~OCommonStatement(); protected: - void parseSql( const ::rtl::OUString& sql, QueryData& _out_rQueryData ); + void parseSql( const OUString& sql, QueryData& _out_rQueryData ); EBookQuery *whereAnalysis( const OSQLParseNode* parseTree ); void orderByAnalysis( const OSQLParseNode* _pOrderByClause, SortDescriptor& _out_rSort ); - rtl::OUString getTableName(); + OUString getTableName(); EBookQuery *createTrue(); - EBookQuery *createTest( const ::rtl::OUString &aColumnName, + EBookQuery *createTest( const OUString &aColumnName, EBookQueryTest eTest, - const ::rtl::OUString &aMatch ); + const OUString &aMatch ); public: @@ -221,10 +221,10 @@ namespace connectivity Also, all statement dependent members (such as the parser/iterator) will be inited afterwards. */ QueryData - impl_getEBookQuery_throw( const ::rtl::OUString& _rSql ); + impl_getEBookQuery_throw( const OUString& _rSql ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > - impl_executeQuery_throw( const ::rtl::OUString& _rSql ); + impl_executeQuery_throw( const OUString& _rSql ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_executeQuery_throw( const QueryData& _rData ); @@ -232,7 +232,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > impl_getConnection() { return ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >( (::com::sun::star::sdbc::XConnection*)m_pConnection ); } - ::rtl::OUString + OUString impl_getColumnRefColumnName_throw( const ::connectivity::OSQLParseNode& _rColumnRef ); }; @@ -263,9 +263,9 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; }; } diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx index 2d7481413ed8..4b13fa3f8539 100644 --- a/connectivity/source/drivers/evoab2/NTable.cxx +++ b/connectivity/source/drivers/evoab2/NTable.cxx @@ -35,11 +35,11 @@ using namespace connectivity::evoab; // ------------------------------------------------------------------------- OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName ) : OEvoabTable_TYPEDEF(_pTables,sal_True, _Name, _Type, @@ -61,7 +61,7 @@ void OEvoabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString("%")); + OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx index 4ce421c87bbf..e1b22f1c7df2 100644 --- a/connectivity/source/drivers/evoab2/NTable.hxx +++ b/connectivity/source/drivers/evoab2/NTable.hxx @@ -29,7 +29,7 @@ namespace connectivity { typedef connectivity::sdbcx::OTable OEvoabTable_TYPEDEF; - ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); + OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class OEvoabTable : public OEvoabTable_TYPEDEF { @@ -39,19 +39,19 @@ namespace connectivity public: OEvoabTable( sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); OEvoabConnection* getConnection() { return m_pConnection;} virtual void refreshColumns(); - ::rtl::OUString getTableName() const { return m_Name; } - ::rtl::OUString getSchema() const { return m_SchemaName; } + OUString getTableName() const { return m_Name; } + OUString getSchema() const { return m_SchemaName; } }; } } diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index a0f2fa5fcacb..c756cb6dfdcb 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -45,13 +45,13 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace dbtools; -ObjectType OEvoabTables::createObject(const ::rtl::OUString& aName) +ObjectType OEvoabTables::createObject(const OUString& aName) { - ::rtl::OUString aSchema( "%" ); + OUString aSchema( "%" ); - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("TABLE"); - ::rtl::OUString sEmpty; + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("TABLE"); + OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index 3827182abed4..caced2a8d23f 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.hxx @@ -29,7 +29,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OEvoabTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData, diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx index b7173ef703f6..58d122cdddeb 100644 --- a/connectivity/source/drivers/file/FCatalog.cxx +++ b/connectivity/source/drivers/file/FCatalog.cxx @@ -49,7 +49,7 @@ m_xMetaData.clear(); OFileCatalog_BASE::disposing(); } // ----------------------------------------------------------------------------- -::rtl::OUString OFileCatalog::buildName(const Reference< XRow >& _xRow) +OUString OFileCatalog::buildName(const Reference< XRow >& _xRow) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileCatalog::buildName" ); return _xRow->getString(3); @@ -59,9 +59,9 @@ void OFileCatalog::refreshTables() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileCatalog::refreshTables" ); TStringVector aVector; - Sequence< ::rtl::OUString > aTypes; + Sequence< OUString > aTypes; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); + OUString("%"),OUString("%"),aTypes); fillNames(xResult,aVector); if(m_pTables) diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx index 199c0acda4d3..c134c14ce162 100644 --- a/connectivity/source/drivers/file/FColumns.cxx +++ b/connectivity/source/drivers/file/FColumns.cxx @@ -35,12 +35,12 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OColumns::createObject(const OUString& _rName) { const Any aCatalog; - const ::rtl::OUString sCatalogName; - const ::rtl::OUString sSchemaName(m_pTable->getSchema()); - const ::rtl::OUString sTableName(m_pTable->getName()); + const OUString sCatalogName; + const OUString sSchemaName(m_pTable->getSchema()); + const OUString sTableName(m_pTable->getName()); Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(Any(), sSchemaName, sTableName, _rName); diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index 0683af96b69a..447a6dc435e3 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -53,7 +53,6 @@ using namespace com::sun::star::sdbcx; using namespace com::sun::star::container; using namespace com::sun::star::ucb; using namespace ::ucbhelper; -using rtl::OUString; typedef connectivity::OMetaConnection OConnection_BASE; // -------------------------------------------------------------------------------- OConnection::OConnection(OFileDriver* _pDriver) @@ -94,11 +93,11 @@ sal_Bool OConnection::matchesExtension( const String& _rExt ) const } //----------------------------------------------------------------------------- -void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) +void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { osl_atomic_increment( &m_refCount ); - ::rtl::OUString aExt; + OUString aExt; const PropertyValue *pIter = info.getConstArray(); const PropertyValue *pEnd = pIter + info.getLength(); for(;pIter != pEnd;++pIter) @@ -107,7 +106,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV OSL_VERIFY( pIter->Value >>= aExt ); else if(0 == pIter->Name.compareToAscii("CharSet")) { - ::rtl::OUString sIanaName; + OUString sIanaName; OSL_VERIFY( pIter->Value >>= sIanaName ); ::dbtools::OCharsetMap aLookupIanaName; @@ -130,7 +129,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV { sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); - ::rtl::OUString aDSN(url.copy(nLen+1)); + OUString aDSN(url.copy(nLen+1)); String aFileName = aDSN; INetURLObject aURL; @@ -199,7 +198,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV throwUrlNotValid(getURL(),e.Message); } if(!m_xDir.is() || !m_xContent.is()) - throwUrlNotValid(getURL(),::rtl::OUString()); + throwUrlNotValid(getURL(),OUString()); if (m_aFilenameExtension.Search('*') != STRING_NOTFOUND || m_aFilenameExtension.Search('?') != STRING_NOTFOUND) throw SQLException(); @@ -228,7 +227,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -241,13 +240,13 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const :: return pStmt; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) { return sql; } @@ -317,14 +316,14 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return m_bReadOnly; } // -------------------------------------------------------------------------------- -void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) { throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // -------------------------------------------------------------------------------- void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) @@ -395,9 +394,9 @@ Reference< XTablesSupplier > OConnection::createCatalog() Reference< XDynamicResultSet > OConnection::getDir() const { Reference xContent; - Sequence< ::rtl::OUString > aProps(1); - ::rtl::OUString* pProps = aProps.getArray(); - pProps[ 0 ] = ::rtl::OUString("Title"); + Sequence< OUString > aProps(1); + OUString* pProps = aProps.getArray(); + pProps[ 0 ] = OUString("Title"); try { Reference xIdent = getContent()->getIdentifier(); @@ -432,7 +431,7 @@ Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId() return pId->getImplementationId(); } // ----------------------------------------------------------------------------- -void OConnection::throwUrlNotValid(const ::rtl::OUString & _rsUrl,const ::rtl::OUString & _rsMessage) +void OConnection::throwUrlNotValid(const OUString & _rsUrl,const OUString & _rsMessage) { SQLException aError; aError.Message = getResources().getResourceStringWithSubstitution( @@ -440,11 +439,11 @@ void OConnection::throwUrlNotValid(const ::rtl::OUString & _rsUrl,const ::rtl::O "$URL$", _rsUrl ); - aError.SQLState = ::rtl::OUString("S1000"); + aError.SQLState = OUString("S1000"); aError.ErrorCode = 0; aError.Context = static_cast< XConnection* >(this); if (!_rsMessage.isEmpty()) - aError.NextException <<= SQLException(_rsMessage, aError.Context, ::rtl::OUString(), 0, Any()); + aError.NextException <<= SQLException(_rsMessage, aError.Context, OUString(), 0, Any()); throw aError; } diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 1bd1a49a2f5a..9448cac04089 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -65,15 +65,15 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTypeInfo ); } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_getCatalogSeparator_throw" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*tableNamePattern*/, - const ::rtl::OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/, + const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getColumns" ); OSL_FAIL("Should be overloaded!"); @@ -165,8 +165,8 @@ namespace // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, - const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, + const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getTables" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -178,7 +178,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( // check if any type is given // when no types are given then we have to return all tables e.g. TABLE - static const ::rtl::OUString aTable("TABLE"); + static const OUString aTable("TABLE"); sal_Bool bTableFound = sal_True; sal_Int32 nLength = types.getLength(); @@ -186,8 +186,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( { bTableFound = sal_False; - const ::rtl::OUString* pBegin = types.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + nLength; + const OUString* pBegin = types.getConstArray(); + const OUString* pEnd = pBegin + nLength; for(;pBegin != pEnd;++pBegin) { if(*pBegin == aTable) @@ -220,7 +220,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( String sThisContentExtension; ODatabaseMetaDataResultSet::ORows aRows; // scan the directory for tables - ::rtl::OUString aName; + OUString aName; INetURLObject aURL; xResultSet->beforeFirst(); @@ -232,7 +232,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( { aName = xRow->getString(1); aURL.SetSmartProtocol(INET_PROT_FILE); - String sUrl = m_pConnection->getURL() + ::rtl::OUString("/") + aName; + String sUrl = m_pConnection->getURL() + OUString("/") + aName; aURL.SetSmartURL( sUrl ); sThisContentExtension = aURL.getExtension(); @@ -270,7 +270,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( if ( sThisContentExtension == aFilenameExtension ) { - aName = aName.replaceAt(aName.getLength()-(aFilenameExtension.Len()+1),aFilenameExtension.Len()+1,::rtl::OUString()); + aName = aName.replaceAt(aName.getLength()-(aFilenameExtension.Len()+1),aFilenameExtension.Len()+1,OUString()); sal_Unicode nChar = aName.toChar(); if ( match(tableNamePattern,aName,'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) { @@ -289,7 +289,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( sal_Unicode nChar = aURL.getBase().getStr()[0]; if(match(tableNamePattern,aURL.getBase(),'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) { - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(aURL.getBase()))); + aRow.push_back(new ORowSetValueDecorator(OUString(aURL.getBase()))); bNewRow = sal_True; } break; @@ -388,7 +388,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getTablePrivileges" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -402,9 +402,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( if( xTabSup.is()) { Reference< XNameAccess> xNames = xTabSup->getTables(); - Sequence< ::rtl::OUString > aNames = xNames->getElementNames(); - const ::rtl::OUString* pBegin = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); + Sequence< OUString > aNames = xNames->getElementNames(); + const OUString* pBegin = aNames.getConstArray(); + const OUString* pEnd = pBegin + aNames.getLength(); for(;pBegin != pEnd;++pBegin) { if(match(tableNamePattern,*pBegin,'\0')) @@ -413,7 +413,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[2] = new ORowSetValueDecorator(*pBegin); aRow[6] = ODatabaseMetaDataResultSet::getSelectValue(); - aRow[7] = new ORowSetValueDecorator(::rtl::OUString("NO")); + aRow[7] = new ORowSetValueDecorator(OUString("NO")); aRows.push_back(aRow); Reference< XPropertySet> xTable; @@ -523,23 +523,23 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getCatalogTerm" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_getIdentifierQuoteString_throw" ); - static const ::rtl::OUString sQuote("\""); + static const OUString sQuote("\""); return sQuote; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getExtraNameCharacters" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) @@ -692,7 +692,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE { ODatabaseMetaDataResultSet::ORow aRow; aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("TABLE"))); + aRow.push_back(new ORowSetValueDecorator(OUString("TABLE"))); aRows.push_back(aRow); } pResult->setRows(aRows); @@ -951,53 +951,53 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQL return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getURL" ); - static const ::rtl::OUString aValue( "sdbc:file:" ); + static const OUString aValue( "sdbc:file:" ); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getUserName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDriverName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDriverVersion" ); - return ::rtl::OUString::valueOf((sal_Int32)1); + return OUString::valueOf((sal_Int32)1); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDatabaseProductVersion" ); - return ::rtl::OUString::valueOf((sal_Int32)0); + return OUString::valueOf((sal_Int32)0); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDatabaseProductName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getProcedureTerm" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSchemaTerm" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) @@ -1018,40 +1018,40 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSQLKeywords" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSearchStringEscape" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getStringFunctions" ); - return ::rtl::OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT"); + return OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT"); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getTimeDateFunctions" ); - return ::rtl::OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW"); + return OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW"); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSystemFunctions" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getNumericFunctions" ); - return ::rtl::OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS"); + return OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS"); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) @@ -1196,7 +1196,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException return sal_False; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getUDTs" ); return NULL; diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx index 925cd763c47c..03256f7ab7cc 100644 --- a/connectivity/source/drivers/file/FDateFunctions.cxx +++ b/connectivity/source/drivers/file/FDateFunctions.cxx @@ -97,32 +97,32 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::rtl::OUString sRet; + OUString sRet; ::com::sun::star::util::Date aD = lhs; Date aDate(aD.Day,aD.Month,aD.Year); DayOfWeek eDayOfWeek = aDate.GetDayOfWeek(); switch(eDayOfWeek) { case MONDAY: - sRet = ::rtl::OUString("Monday"); + sRet = OUString("Monday"); break; case TUESDAY: - sRet = ::rtl::OUString("Tuesday"); + sRet = OUString("Tuesday"); break; case WEDNESDAY: - sRet = ::rtl::OUString("Wednesday"); + sRet = OUString("Wednesday"); break; case THURSDAY: - sRet = ::rtl::OUString("Thursday"); + sRet = OUString("Thursday"); break; case FRIDAY: - sRet = ::rtl::OUString("Friday"); + sRet = OUString("Friday"); break; case SATURDAY: - sRet = ::rtl::OUString("Saturday"); + sRet = OUString("Saturday"); break; case SUNDAY: - sRet = ::rtl::OUString("Sunday"); + sRet = OUString("Sunday"); break; default: OSL_FAIL("Error in enum values for date"); @@ -135,45 +135,45 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::rtl::OUString sRet; + OUString sRet; ::com::sun::star::util::Date aD = lhs; switch(aD.Month) { case 1: - sRet = ::rtl::OUString("January"); + sRet = OUString("January"); break; case 2: - sRet = ::rtl::OUString("February"); + sRet = OUString("February"); break; case 3: - sRet = ::rtl::OUString("March"); + sRet = OUString("March"); break; case 4: - sRet = ::rtl::OUString("April"); + sRet = OUString("April"); break; case 5: - sRet = ::rtl::OUString("May"); + sRet = OUString("May"); break; case 6: - sRet = ::rtl::OUString("June"); + sRet = OUString("June"); break; case 7: - sRet = ::rtl::OUString("July"); + sRet = OUString("July"); break; case 8: - sRet = ::rtl::OUString("August"); + sRet = OUString("August"); break; case 9: - sRet = ::rtl::OUString("September"); + sRet = OUString("September"); break; case 10: - sRet = ::rtl::OUString("October"); + sRet = OUString("October"); break; case 11: - sRet = ::rtl::OUString("November"); + sRet = OUString("November"); break; case 12: - sRet = ::rtl::OUString("December"); + sRet = OUString("December"); break; } return sRet; diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 21a0d9dda5ec..79912f3ed308 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -62,31 +62,31 @@ void OFileDriver::disposing() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString OFileDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString OFileDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdbc.driver.file.Driver"); + return OUString("com.sun.star.sdbc.driver.file.Driver"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); - aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver"); + Sequence< OUString > aSNS( 2 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); + aSNS[1] = OUString("com.sun.star.sdbcx.Driver"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL OFileDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OFileDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL OFileDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -94,13 +94,13 @@ sal_Bool SAL_CALL OFileDriver::supportsService( const ::rtl::OUString& _rService } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL OFileDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::connect" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -114,71 +114,71 @@ Reference< XConnection > SAL_CALL OFileDriver::connect( const ::rtl::OUString& u return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL OFileDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL OFileDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::acceptsURL" ); return url.startsWith("sdbc:file:"); } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::getPropertyInfo" ); if ( acceptsURL(url) ) { ::std::vector< DriverPropertyInfo > aDriverInfo; - Sequence< ::rtl::OUString > aBoolean(2); - aBoolean[0] = ::rtl::OUString("0"); - aBoolean[1] = ::rtl::OUString("1"); + Sequence< OUString > aBoolean(2); + aBoolean[0] = OUString("0"); + aBoolean[1] = OUString("1"); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("CharSet") - ,::rtl::OUString("CharSet of the database.") + OUString("CharSet") + ,OUString("CharSet of the database.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("Extension") - ,::rtl::OUString("Extension of the file format.") + OUString("Extension") + ,OUString("Extension of the file format.") ,sal_False - ,::rtl::OUString(".*") - ,Sequence< ::rtl::OUString >()) + ,OUString(".*") + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ShowDeleted") - ,::rtl::OUString("Display inactive records.") + OUString("ShowDeleted") + ,OUString("Display inactive records.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("EnableSQL92Check") - ,::rtl::OUString("Use SQL92 naming constraints.") + OUString("EnableSQL92Check") + ,OUString("Use SQL92 naming constraints.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("UseRelativePath") - ,::rtl::OUString("Handle the connection url as relative path.") + OUString("UseRelativePath") + ,OUString("Handle the connection url as relative path.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("URL") - ,::rtl::OUString("The URL of the database document which is used to create an absolute path.") + OUString("URL") + ,OUString("The URL of the database document which is used to create an absolute path.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); } // if ( acceptsURL(url) ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); } // if ( ! acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); @@ -226,13 +226,13 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection } // -------------------------------------------------------------------------------- -Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::getDataDefinitionByURL" ); if ( ! acceptsURL(url) ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); } return getDataDefinitionByConnection(connect(url,info)); diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 37307f6dd7ae..f63d4e0cfc86 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -95,7 +95,7 @@ void OPreparedStatement::disposing() } // ------------------------------------------------------------------------- -void OPreparedStatement::construct(const ::rtl::OUString& sql) throw(SQLException, RuntimeException) +void OPreparedStatement::construct(const OUString& sql) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::construct" ); OStatement_Base::construct(sql); @@ -191,7 +191,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::setString" ); setParameter(parameterIndex,x); @@ -337,7 +337,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::setObjectNull" ); setNull(parameterIndex,sqlType); @@ -349,9 +349,9 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::setObject" ); if(!::dbtools::implSetObject(this,parameterIndex,x)) { - const ::rtl::OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( STR_UNKNOWN_PARA_TYPE, - "$position$", ::rtl::OUString::valueOf(parameterIndex) + "$position$", OUString::valueOf(parameterIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } @@ -477,7 +477,7 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re OSL_UNUSED( pMark ); #endif - ::rtl::OUString sParameterName; + OUString sParameterName; // set up Parameter-Column: sal_Int32 eType = DataType::VARCHAR; sal_uInt32 nPrecision = 255; @@ -497,9 +497,9 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re } Reference xParaColumn = new connectivity::parse::OParseColumn(sParameterName - ,::rtl::OUString() - ,::rtl::OUString() - ,::rtl::OUString() + ,OUString() + ,OUString() + ,OUString() ,nNullable ,nPrecision ,nScale @@ -507,9 +507,9 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re ,sal_False ,sal_False ,m_aSQLIterator.isCaseSensitive() - ,::rtl::OUString() - ,::rtl::OUString() - ,::rtl::OUString()); + ,OUString() + ,OUString() + ,OUString()); m_xParamColumns->get().push_back(xParaColumn); return m_xParamColumns->get().size(); } @@ -520,7 +520,7 @@ void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode Reference xProp; if(SQL_ISRULE(_pNode,column_ref)) { - ::rtl::OUString sColumnName,sTableRange; + OUString sColumnName,sTableRange; m_aSQLIterator.getColumnRange(_pNode,sColumnName,sTableRange); if ( !sColumnName.isEmpty() ) { diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 9e00758c66b6..14b195c056da 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -68,7 +68,7 @@ namespace void lcl_throwError(sal_uInt16 _nErrorId,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xContext) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(_nErrorId); + const OUString sMessage = aResources.getResourceString(_nErrorId); ::dbtools::throwGenericSQLException(sMessage ,_xContext); } } @@ -203,7 +203,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException) } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::findColumn" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -375,7 +375,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept return getValue(columnIndex); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::getString" ); return getValue(columnIndex); @@ -795,7 +795,7 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw( updateValue(columnIndex,x); } // ------------------------------------------------------------------------- -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::updateString" ); updateValue(columnIndex,x); @@ -1634,11 +1634,11 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); Reference xTableColumn; - ::rtl::OUString sTableColumnName, sSelectColumnRealName; + OUString sTableColumnName, sSelectColumnRealName; - const ::rtl::OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - const ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); - const ::rtl::OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); + const OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); + const OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); typedef ::std::map IterMap; IterMap aSelectIters; @@ -1657,7 +1657,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, if (xTableColumn.is()) xTableColumn->getPropertyValue(sName) >>= sTableColumnName; else - sTableColumnName = ::rtl::OUString(); + sTableColumnName = OUString(); // look if we have such a select column // TODO: would like to have a O(log n) search here ... @@ -1703,7 +1703,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, if ( _bSetColumnMapping && aSelectIters.size() != _rColMapping.size() ) { Reference xNameAccess(_xNames,UNO_QUERY); - Sequence< ::rtl::OUString > aSelectColumns = xNameAccess->getElementNames(); + Sequence< OUString > aSelectColumns = xNameAccess->getElementNames(); for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); aIter != _rxColumns->get().end(); @@ -1721,8 +1721,8 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, { aSelectIters.insert(IterMap::value_type(aIter,sal_True)); sal_Int32 nSelectColumnPos = aIter - _rxColumns->get().begin() + 1; - const ::rtl::OUString* pBegin = aSelectColumns.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aSelectColumns.getLength(); + const OUString* pBegin = aSelectColumns.getConstArray(); + const OUString* pEnd = pBegin + aSelectColumns.getLength(); for(sal_Int32 i=0;pBegin != pEnd;++pBegin,++i) { if ( aCase(*pBegin, sSelectColumnRealName) ) diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index 42a1a2def4ee..8b015ed8bbda 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable) +OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference& _rxColumns,const OUString& _aTableName,OFileTable* _pTable) :m_aTableName(_aTableName) ,m_xColumns(_rxColumns) ,m_pTable(_pTable) @@ -86,14 +86,14 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getSchemaName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnName" ); checkColumnIndex(column); @@ -102,35 +102,35 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th return aName.hasValue() ? getString(aName) : getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getTableName" ); return m_aTableName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getCatalogName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnTypeName" ); checkColumnIndex(column); return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnLabel" ); return getColumnName(column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnServiceName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 7d247247b7c7..af620b2875b2 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -82,7 +82,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) sal_Int32 nAttrib = 0; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(static_cast< OUString*>(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(static_cast(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(static_cast(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(static_cast(0))); @@ -284,7 +284,7 @@ void SAL_CALL OStatement::release() throw() } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -295,7 +295,7 @@ sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& sql ) throw(SQLExc // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL OStatement::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -317,7 +317,7 @@ Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLExcepti return (Reference< XConnection >)m_pConnection; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OStatement::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -398,7 +398,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, OSQLParseNode* pAscendingDescending) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::setOrderbyColumn" ); - ::rtl::OUString aColumnName; + OUString aColumnName; if (pColumnRef->count() == 1) aColumnName = pColumnRef->getChild(0)->getTokenValue(); else if (pColumnRef->count() == 3) @@ -427,10 +427,10 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, } // ----------------------------------------------------------------------------- -void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, RuntimeException) +void OStatement_Base::construct(const OUString& sql) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::construct" ); - ::rtl::OUString aErr; + OUString aErr; m_pParseTree = m_aParser.parseTree(aErr,sql); if(m_pParseTree) { @@ -503,7 +503,7 @@ void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, anylizeSQL(); } else - throw SQLException(aErr,*this,::rtl::OUString(),0,Any()); + throw SQLException(aErr,*this,OUString(),0,Any()); } // ----------------------------------------------------------------------------- void OStatement_Base::createColumnMapping() @@ -573,9 +573,9 @@ void OStatement_Base::GetAssignValues() OSL_ENSURE(SQL_ISRULE(pOptColumnCommalist,opt_column_commalist),"OResultSet: Fehler im Parse Tree"); if (pOptColumnCommalist->count() == 0) { - const Sequence< ::rtl::OUString>& aNames = m_xColNames->getElementNames(); - const ::rtl::OUString* pBegin = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); + const Sequence< OUString>& aNames = m_xColNames->getElementNames(); + const OUString* pBegin = aNames.getConstArray(); + const OUString* pEnd = pBegin + aNames.getLength(); for (; pBegin != pEnd; ++pBegin) aColumnNameList.push_back(*pBegin); } diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx index e5283967814c..eb3e5c915c30 100644 --- a/connectivity/source/drivers/file/FStringFunctions.cxx +++ b/connectivity/source/drivers/file/FStringFunctions.cxx @@ -48,7 +48,7 @@ ORowSetValue OOp_Ascii::operate(const ORowSetValue& lhs) const RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOp_Ascii::operate" ); if ( lhs.isNull() ) return lhs; - ::rtl::OString sStr(::rtl::OUStringToOString(lhs,RTL_TEXTENCODING_ASCII_US)); + OString sStr(OUStringToOString(lhs,RTL_TEXTENCODING_ASCII_US)); sal_Int32 nAscii = sStr.toChar(); return nAscii; } @@ -68,7 +68,7 @@ ORowSetValue OOp_Char::operate(const ::std::vector& lhs) const if ( lhs.empty() ) return ORowSetValue(); - ::rtl::OUString sRet; + OUString sRet; ::std::vector::const_reverse_iterator aIter = lhs.rbegin(); ::std::vector::const_reverse_iterator aEnd = lhs.rend(); for (; aIter != aEnd; ++aIter) @@ -77,7 +77,7 @@ ORowSetValue OOp_Char::operate(const ::std::vector& lhs) const { sal_Char c = static_cast(static_cast(*aIter)); - sRet += ::rtl::OUString(&c,1,RTL_TEXTENCODING_ASCII_US); + sRet += OUString(&c,1,RTL_TEXTENCODING_ASCII_US); } } @@ -90,7 +90,7 @@ ORowSetValue OOp_Concat::operate(const ::std::vector& lhs) const if ( lhs.empty() ) return ORowSetValue(); - ::rtl::OUStringBuffer sRet; + OUStringBuffer sRet; ::std::vector::const_reverse_iterator aIter = lhs.rbegin(); ::std::vector::const_reverse_iterator aEnd = lhs.rend(); for (; aIter != aEnd; ++aIter) @@ -98,7 +98,7 @@ ORowSetValue OOp_Concat::operate(const ::std::vector& lhs) const if ( aIter->isNull() ) return ORowSetValue(); - sRet.append(aIter->operator ::rtl::OUString()); + sRet.append(aIter->operator OUString()); } return sRet.makeStringAndClear(); @@ -115,7 +115,7 @@ ORowSetValue OOp_Locate::operate(const ::std::vector& lhs) const return ORowSetValue(); } if ( lhs.size() == 2 ) - return ::rtl::OUString::valueOf(lhs[0].getString().indexOf(lhs[1].getString())+1); + return OUString::valueOf(lhs[0].getString().indexOf(lhs[1].getString())+1); else if ( lhs.size() != 3 ) return ORowSetValue(); @@ -148,8 +148,8 @@ ORowSetValue OOp_LTrim::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::rtl::OUString sRet = lhs; - ::rtl::OUString sNew = sRet.trim(); + OUString sRet = lhs; + OUString sNew = sRet.trim(); return sRet.copy(sRet.indexOf(sNew)); } //------------------------------------------------------------------ @@ -159,8 +159,8 @@ ORowSetValue OOp_RTrim::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::rtl::OUString sRet = lhs; - ::rtl::OUString sNew = sRet.trim(); + OUString sRet = lhs; + OUString sNew = sRet.trim(); return sRet.copy(0,sRet.lastIndexOf(sNew.getStr()[sNew.getLength()-1])+1); } //------------------------------------------------------------------ @@ -171,7 +171,7 @@ ORowSetValue OOp_Space::operate(const ORowSetValue& lhs) const return lhs; const sal_Char c = ' '; - ::rtl::OUStringBuffer sRet; + OUStringBuffer sRet; sal_Int32 nCount = lhs; for (sal_Int32 i=0; i < nCount; ++i) { @@ -186,9 +186,9 @@ ORowSetValue OOp_Replace::operate(const ::std::vector& lhs) const if ( lhs.size() != 3 ) return ORowSetValue(); - ::rtl::OUString sStr = lhs[2]; - ::rtl::OUString sFrom = lhs[1]; - ::rtl::OUString sTo = lhs[0]; + OUString sStr = lhs[2]; + OUString sFrom = lhs[1]; + OUString sTo = lhs[0]; sal_Int32 nIndexOf = sStr.indexOf(sFrom); while( nIndexOf != -1 ) { @@ -205,7 +205,7 @@ ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs if ( lhs.isNull() || rhs.isNull() ) return lhs; - ::rtl::OUString sRet; + OUString sRet; sal_Int32 nCount = rhs; for (sal_Int32 i=0; i < nCount; ++i) { @@ -220,7 +220,7 @@ ORowSetValue OOp_Insert::operate(const ::std::vector& lhs) const if ( lhs.size() != 4 ) return ORowSetValue(); - ::rtl::OUString sStr = lhs[3]; + OUString sStr = lhs[3]; sal_Int32 nStart = static_cast(lhs[2]); if ( nStart < 1 ) @@ -234,7 +234,7 @@ ORowSetValue OOp_Left::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) if ( lhs.isNull() || rhs.isNull() ) return lhs; - ::rtl::OUString sRet = lhs; + OUString sRet = lhs; sal_Int32 nCount = rhs; if ( nCount < 0 ) return ORowSetValue(); @@ -248,7 +248,7 @@ ORowSetValue OOp_Right::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) return lhs; sal_Int32 nCount = rhs; - ::rtl::OUString sRet = lhs; + OUString sRet = lhs; if ( nCount < 0 || nCount >= sRet.getLength() ) return ORowSetValue(); diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 8dc2c7106544..3350d8babe92 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -55,11 +55,11 @@ OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection) } // ------------------------------------------------------------------------- OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers(), _Name, _Type, @@ -90,7 +90,7 @@ void OFileTable::refreshColumns() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::refreshColumns" ); TStringVector aVector; Reference< XResultSet > xResult = m_pConnection->getMetaData()->getColumns(Any(), - m_SchemaName,m_Name,::rtl::OUString("%")); + m_SchemaName,m_Name,OUString("%")); if(xResult.is()) { diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx index 78ff160ad042..cba822e2bb0f 100644 --- a/connectivity/source/drivers/file/FTables.cxx +++ b/connectivity/source/drivers/file/FTables.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& /*_rName*/) +sdbcx::ObjectType OTables::createObject(const OUString& /*_rName*/) { return sdbcx::ObjectType(); } diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index 5ef103f04202..d125c1eb5c9b 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -106,7 +106,7 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode) { // push one element for each column of our table const Reference< XNameAccess > xColumnNames( m_aCompiler->getOrigColumns() ); - const Sequence< ::rtl::OUString > aColumnNames( xColumnNames->getElementNames() ); + const Sequence< OUString > aColumnNames( xColumnNames->getElementNames() ); for ( sal_Int32 j=0; jbuffer, diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index 5419402bf76e..5b395aebcbe2 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -428,7 +428,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr if (SQL_ISRULE(pPredicateNode,column_ref)) { - ::rtl::OUString aColumnName; + OUString aColumnName; if (pPredicateNode->count() == 1) { aColumnName = pPredicateNode->getChild(0)->getTokenValue(); @@ -443,7 +443,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr if(!m_orgColumns->hasByName(aColumnName)) { - const ::rtl::OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", aColumnName ) ); @@ -458,7 +458,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr } else {// Column doesn't exist in the Result-set - const ::rtl::OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", aColumnName ) ); @@ -488,7 +488,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr (SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"+") || SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"-")) && pPredicateNode->getChild(1)->getNodeType() == SQL_NODE_INTNUM) { // if -1 or +1 is there - ::rtl::OUString aValue(pPredicateNode->getChild(0)->getTokenValue()); + OUString aValue(pPredicateNode->getChild(0)->getTokenValue()); aValue += pPredicateNode->getChild(1)->getTokenValue(); pOperand = new OOperandConst(*pPredicateNode->getChild(1), aValue); } @@ -503,7 +503,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr SQL_ISTOKEN(pODBCNodeChild,T) || SQL_ISTOKEN(pODBCNodeChild,TS) )) { - ::rtl::OUString sDateTime = pODBCNode->getChild(1)->getTokenValue(); + OUString sDateTime = pODBCNode->getChild(1)->getTokenValue(); pOperand = new OOperandConst(*pODBCNode->getChild(1), sDateTime); if(SQL_ISTOKEN(pODBCNodeChild,D)) { diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx index b8d9c6bc03f2..2d199e0a9186 100644 --- a/connectivity/source/drivers/file/quotedstring.cxx +++ b/connectivity/source/drivers/file/quotedstring.cxx @@ -79,7 +79,7 @@ namespace connectivity } } } - //OSL_TRACE("QuotedTokenizedString::nTokCount = %d\n", ((OUtoCStr(::rtl::OUString(nTokCount))) ? (OUtoCStr(::rtl::OUString(nTokCount))):("NULL")) ); + //OSL_TRACE("QuotedTokenizedString::nTokCount = %d\n", ((OUtoCStr(OUString(nTokCount))) ? (OUtoCStr(OUString(nTokCount))):("NULL")) ); return nTokCount; } diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx index 24b897b91bfa..397bf78d5dbb 100644 --- a/connectivity/source/drivers/flat/ECatalog.cxx +++ b/connectivity/source/drivers/flat/ECatalog.cxx @@ -40,9 +40,9 @@ OFlatCatalog::OFlatCatalog(OFlatConnection* _pCon) : file::OFileCatalog(_pCon) void OFlatCatalog::refreshTables() { TStringVector aVector; - Sequence< ::rtl::OUString > aTypes; + Sequence< OUString > aTypes; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); + OUString("%"),OUString("%"),aTypes); if(xResult.is()) { diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx index 4283627006b3..0772f65bb342 100644 --- a/connectivity/source/drivers/flat/EColumns.cxx +++ b/connectivity/source/drivers/flat/EColumns.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -sdbcx::ObjectType OFlatColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OFlatColumns::createObject(const OUString& _rName) { OFlatTable* pTable = (OFlatTable*)m_pTable; diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx index 8122f4cb0e58..c76d2d6751ae 100644 --- a/connectivity/source/drivers/flat/EConnection.cxx +++ b/connectivity/source/drivers/flat/EConnection.cxx @@ -59,7 +59,7 @@ OFlatConnection::~OFlatConnection() IMPLEMENT_SERVICE_INFO(OFlatConnection, "com.sun.star.sdbc.drivers.flat.Connection", "com.sun.star.sdbc.Connection") //----------------------------------------------------------------------------- -void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) +void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { osl_atomic_increment( &m_refCount ); @@ -71,25 +71,25 @@ void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< Prope OSL_VERIFY( pBegin->Value >>= m_bHeaderLine ); else if(!pBegin->Name.compareToAscii("FieldDelimiter")) { - ::rtl::OUString aVal; + OUString aVal; OSL_VERIFY( pBegin->Value >>= aVal ); m_cFieldDelimiter = aVal.toChar(); } else if(!pBegin->Name.compareToAscii("StringDelimiter")) { - ::rtl::OUString aVal; + OUString aVal; OSL_VERIFY( pBegin->Value >>= aVal ); m_cStringDelimiter = aVal.toChar(); } else if(!pBegin->Name.compareToAscii("DecimalDelimiter")) { - ::rtl::OUString aVal; + OUString aVal; OSL_VERIFY( pBegin->Value >>= aVal ); m_cDecimalDelimiter = aVal.toChar(); } else if(!pBegin->Name.compareToAscii("ThousandDelimiter")) { - ::rtl::OUString aVal; + OUString aVal; OSL_VERIFY( pBegin->Value >>= aVal ); m_cThousandDelimiter = aVal.toChar(); } @@ -145,7 +145,7 @@ Reference< XStatement > SAL_CALL OFlatConnection::createStatement( ) throw(SQLE return xStmt; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); @@ -159,7 +159,7 @@ Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( cons return xStmt; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx index d2ac25a18200..8a44c4949085 100644 --- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx +++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx @@ -67,7 +67,7 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("CHAR"))); + aRow.push_back(new ORowSetValueDecorator(OUString("CHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::CHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)254)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -88,60 +88,60 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw( ) aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR")); + aRow[1] = new ORowSetValueDecorator(OUString("VARCHAR")); aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("LONGVARCHAR")); + aRow[1] = new ORowSetValueDecorator(OUString("LONGVARCHAR")); aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR); aRow[3] = new ORowSetValueDecorator((sal_Int32)65535); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE")); + aRow[1] = new ORowSetValueDecorator(OUString("DATE")); aRow[2] = new ORowSetValueDecorator(DataType::DATE); aRow[3] = new ORowSetValueDecorator((sal_Int32)10); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIME")); + aRow[1] = new ORowSetValueDecorator(OUString("TIME")); aRow[2] = new ORowSetValueDecorator(DataType::TIME); aRow[3] = new ORowSetValueDecorator((sal_Int32)8); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP); aRow[3] = new ORowSetValueDecorator((sal_Int32)19); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOL")); + aRow[1] = new ORowSetValueDecorator(OUString("BOOL")); aRow[2] = new ORowSetValueDecorator(DataType::BIT); aRow[3] = ODatabaseMetaDataResultSet::get1Value(); aRow[9] = ODatabaseMetaDataResultSet::getBasicValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL")); + aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL")); aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[15] = new ORowSetValueDecorator((sal_Int32)15); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DOUBLE")); + aRow[1] = new ORowSetValueDecorator(OUString("DOUBLE")); aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[15] = ODatabaseMetaDataResultSet::get0Value(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("NUMERIC")); + aRow[1] = new ORowSetValueDecorator(OUString("NUMERIC")); aRow[2] = new ORowSetValueDecorator(DataType::NUMERIC); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[15] = new ORowSetValueDecorator((sal_Int32)20); @@ -153,8 +153,8 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatDatabaseMetaData::getColumns" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -170,9 +170,9 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(19); aRow[10] = new ORowSetValueDecorator((sal_Int32)10); - Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames()); - const ::rtl::OUString* pTabBegin = aTabNames.getConstArray(); - const ::rtl::OUString* pTabEnd = pTabBegin + aTabNames.getLength(); + Sequence< OUString> aTabNames(xNames->getElementNames()); + const OUString* pTabBegin = aTabNames.getConstArray(); + const OUString* pTabEnd = pTabBegin + aTabNames.getLength(); for(;pTabBegin != pTabEnd;++pTabBegin) { if(match(tableNamePattern,*pTabBegin,'\0')) @@ -185,10 +185,10 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( if(!xColumns.is()) throw SQLException(); - Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames()); + Sequence< OUString> aColNames(xColumns->getElementNames()); - const ::rtl::OUString* pBegin = aColNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aColNames.getLength(); + const OUString* pBegin = aColNames.getConstArray(); + const OUString* pEnd = pBegin + aColNames.getLength(); Reference< XPropertySet> xColumn; for(sal_Int32 i=1;pBegin != pEnd;++pBegin,++i) { @@ -221,13 +221,13 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( switch(sal_Int32(aRow[11]->getValue())) { case ColumnValue::NO_NULLS: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("NO")); + aRow[18] = new ORowSetValueDecorator(OUString("NO")); break; case ColumnValue::NULLABLE: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); break; default: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString()); + aRow[18] = new ORowSetValueDecorator(OUString()); } aRows.push_back(aRow); } @@ -242,11 +242,11 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( return xRef; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatDatabaseMetaData::getURL" ); ::osl::MutexGuard aGuard( m_aMutex ); - return ::rtl::OUString("sdbc:flat:") + m_pConnection->getURL(); + return OUString("sdbc:flat:") + m_pConnection->getURL(); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 86bf8fe5ed27..d83e435216b7 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -37,13 +37,13 @@ using namespace ::com::sun::star::lang; // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.comp.sdbc.flat.ODriver"); + return OUString("com.sun.star.comp.sdbc.flat.ODriver"); } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } @@ -54,7 +54,7 @@ rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) return *(new ODriver(_rxFactory)); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -71,62 +71,62 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { return url.startsWith("sdbc:flat:"); } // ----------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { if ( acceptsURL(url) ) { ::std::vector< DriverPropertyInfo > aDriverInfo; - Sequence< ::rtl::OUString > aBoolean(2); - aBoolean[0] = ::rtl::OUString("0"); - aBoolean[1] = ::rtl::OUString("1"); + Sequence< OUString > aBoolean(2); + aBoolean[0] = OUString("0"); + aBoolean[1] = OUString("1"); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("FieldDelimiter") - ,::rtl::OUString("Field separator.") + OUString("FieldDelimiter") + ,OUString("Field separator.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("HeaderLine") - ,::rtl::OUString("Text contains headers.") + OUString("HeaderLine") + ,OUString("Text contains headers.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("StringDelimiter") - ,::rtl::OUString("Text separator.") + OUString("StringDelimiter") + ,OUString("Text separator.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("DecimalDelimiter") - ,::rtl::OUString("Decimal separator.") + OUString("DecimalDelimiter") + ,OUString("Decimal separator.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ThousandDelimiter") - ,::rtl::OUString("Thousands separator.") + OUString("ThousandDelimiter") + ,OUString("Thousands separator.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); return ::comphelper::concatSequences(OFileDriver::getPropertyInfo(url,info ), Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size())); } ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); return Sequence< DriverPropertyInfo >(); } diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index 6bccb2cad31c..8e4f17c1b50f 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -43,24 +43,24 @@ OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, ::getBooleanCppuType()); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OFlatResultSet::getImplementationName( ) throw ( RuntimeException) +OUString SAL_CALL OFlatResultSet::getImplementationName( ) throw ( RuntimeException) { - return ::rtl::OUString("com.sun.star.sdbcx.flat.ResultSet"); + return OUString("com.sun.star.sdbcx.flat.ResultSet"); } // ------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw( RuntimeException) +Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); - aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); + Sequence< OUString > aSupported(2); + aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OFlatResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 570dab66ec84..66398509f465 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -164,7 +164,7 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); } - sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,m_aTypeNames[i],::rtl::OUString(),::rtl::OUString(), + sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,m_aTypeNames[i],OUString(),OUString(), ColumnValue::NULLABLE, m_aPrecisions[i], m_aScales[i], @@ -315,13 +315,13 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x if(io_nPrecisions) { io_nType = DataType::DECIMAL; - static const ::rtl::OUString s_sDECIMAL("DECIMAL"); + static const OUString s_sDECIMAL("DECIMAL"); o_sTypeName = s_sDECIMAL; } else { io_nType = DataType::DOUBLE; - static const ::rtl::OUString s_sDOUBLE("DOUBLE"); + static const OUString s_sDOUBLE("DOUBLE"); o_sTypeName = s_sDOUBLE; } } @@ -340,21 +340,21 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x case NUMBERFORMAT_DATE: io_nType = DataType::DATE; { - static const ::rtl::OUString s_sDATE("DATE"); + static const OUString s_sDATE("DATE"); o_sTypeName = s_sDATE; } break; case NUMBERFORMAT_DATETIME: io_nType = DataType::TIMESTAMP; { - static const ::rtl::OUString s_sTIMESTAMP("TIMESTAMP"); + static const OUString s_sTIMESTAMP("TIMESTAMP"); o_sTypeName = s_sTIMESTAMP; } break; case NUMBERFORMAT_TIME: io_nType = DataType::TIME; { - static const ::rtl::OUString s_sTIME("TIME"); + static const OUString s_sTIME("TIME"); o_sTypeName = s_sTIME; } break; @@ -363,7 +363,7 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x io_nPrecisions = 0; // nyi: Data can be longer! io_nScales = 0; { - static const ::rtl::OUString s_sVARCHAR("VARCHAR"); + static const OUString s_sVARCHAR("VARCHAR"); o_sTypeName = s_sVARCHAR; } }; @@ -390,11 +390,11 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x } // ------------------------------------------------------------------------- OFlatTable::OFlatTable(sdbcx::OCollection* _pTables,OFlatConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName ) : OFlatTable_BASE(_pTables,_pConnection,_Name, _Type, _Description, @@ -423,12 +423,12 @@ void OFlatTable::construct() UNO_QUERY_THROW); m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier); Reference xProp(xSupplier->getNumberFormatSettings(),UNO_QUERY); - xProp->getPropertyValue(::rtl::OUString("NullDate")) >>= m_aNullDate; + xProp->getPropertyValue(OUString("NullDate")) >>= m_aNullDate; INetURLObject aURL; aURL.SetURL(getEntry()); - if(aURL.getExtension() != rtl::OUString(m_pConnection->getExtension())) + if(aURL.getExtension() != OUString(m_pConnection->getExtension())) aURL.setExtension(m_pConnection->getExtension()); String aFileName = aURL.GetMainURL(INetURLObject::NO_DECODE); @@ -458,17 +458,17 @@ void OFlatTable::construct() String OFlatTable::getEntry() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatTable::getEntry" ); - ::rtl::OUString sURL; + OUString sURL; try { Reference< XResultSet > xDir = m_pConnection->getDir()->getStaticResultSet(); Reference< XRow> xRow(xDir,UNO_QUERY); - ::rtl::OUString sName; - ::rtl::OUString sExt; + OUString sName; + OUString sExt; INetURLObject aURL; xDir->beforeFirst(); - static const ::rtl::OUString s_sSeparator("/"); + static const OUString s_sSeparator("/"); while(xDir->next()) { sName = xRow->getString(1); @@ -483,7 +483,7 @@ String OFlatTable::getEntry() if ( m_pConnection->matchesExtension( sExt ) ) { if ( !sExt.isEmpty() ) - sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,::rtl::OUString()); + sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,OUString()); if ( sName == m_Name ) { Reference< XContentAccess > xContentAccess( xDir, UNO_QUERY ); diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx index a791a2b65389..aee4095cb9ab 100644 --- a/connectivity/source/drivers/flat/ETables.cxx +++ b/connectivity/source/drivers/flat/ETables.cxx @@ -39,10 +39,10 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -sdbcx::ObjectType OFlatTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OFlatTables::createObject(const OUString& _rName) { OFlatTable* pRet = new OFlatTable(this,(OFlatConnection*)static_cast(m_rParent).getConnection(), - _rName,::rtl::OUString("TABLE")); + _rName,OUString("TABLE")); sdbcx::ObjectType xRet = pRet; pRet->construct(); return xRet; diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx index 7ef8a28e1cf6..b6b17955f3cd 100644 --- a/connectivity/source/drivers/flat/Eservices.cxx +++ b/connectivity/source/drivers/flat/Eservices.cxx @@ -21,7 +21,6 @@ #include using namespace connectivity::flat; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index 22f5a0057834..9c12e10e9fb2 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -41,11 +41,11 @@ OHCatalog::OHCatalog(const Reference< XConnection >& _xConnection) : sdbcx::OCat { } // ----------------------------------------------------------------------------- -void OHCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames) +void OHCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TStringVector& _rNames) { Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"), - ::rtl::OUString("%"), + OUString("%"), + OUString("%"), _sKindOfObject); fillNames(xResult,_rNames); } @@ -53,10 +53,10 @@ void OHCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject void OHCatalog::refreshTables() { TStringVector aVector; - static const ::rtl::OUString s_sTableTypeView("VIEW"); - static const ::rtl::OUString s_sTableTypeTable("TABLE"); + static const OUString s_sTableTypeView("VIEW"); + static const OUString s_sTableTypeTable("TABLE"); - Sequence< ::rtl::OUString > sTableTypes(2); + Sequence< OUString > sTableTypes(2); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; @@ -70,8 +70,8 @@ void OHCatalog::refreshTables() // ------------------------------------------------------------------------- void OHCatalog::refreshViews() { - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("VIEW"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("VIEW"); sal_Bool bSupportsViews = sal_False; try @@ -108,7 +108,7 @@ void OHCatalog::refreshUsers() { TStringVector aVector; Reference< XStatement > xStmt = m_xConnection->createStatement( ); - Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString("select User from hsqldb.user group by User")); + Reference< XResultSet > xResult = xStmt->executeQuery(OUString("select User from hsqldb.user group by User")); if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx index 44d815c4f43e..07e3fb47aecf 100644 --- a/connectivity/source/drivers/hsqldb/HColumns.cxx +++ b/connectivity/source/drivers/hsqldb/HColumns.cxx @@ -55,7 +55,7 @@ OHSQLColumn::OHSQLColumn( sal_Bool _bCase) // ------------------------------------------------------------------------- void OHSQLColumn::construct() { - m_sAutoIncrement = ::rtl::OUString("IDENTITY"); + m_sAutoIncrement = OUString("IDENTITY"); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); } // ----------------------------------------------------------------------------- @@ -69,10 +69,10 @@ void OHSQLColumn::construct() return *OHSQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Column"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.sdbcx.Column"); return aSupported; } diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 4fdbc0bb5a95..6d4577c40256 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -180,7 +180,7 @@ namespace connectivity { namespace hsqldb if ( !m_bReadOnly ) { Reference< XStatement > xStmt( m_xConnection->createStatement(), UNO_QUERY_THROW ); - xStmt->execute( ::rtl::OUString( "CHECKPOINT DEFRAG" ) ); + xStmt->execute( OUString( "CHECKPOINT DEFRAG" ) ); } } @@ -208,7 +208,7 @@ namespace connectivity { namespace hsqldb } // ------------------------------------------------------------------- - Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const ::rtl::OUString& _TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException) + Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -220,7 +220,7 @@ namespace connectivity { namespace hsqldb } // ------------------------------------------------------------------- - Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const ::rtl::OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException) + Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException) { MethodGuard aGuard( *this ); @@ -231,7 +231,7 @@ namespace connectivity { namespace hsqldb if ( !_DocumentUI.is() ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_NO_DOCUMENTUI)); + const OUString sError( aResources.getResourceString(STR_NO_DOCUMENTUI)); throw IllegalArgumentException( sError, *this, @@ -261,7 +261,7 @@ namespace connectivity { namespace hsqldb catch( const Exception& ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_NO_TABLE_CONTAINER)); + const OUString sError( aResources.getResourceString(STR_NO_TABLE_CONTAINER)); throw WrappedTargetException( sError ,*this, ::cppu::getCaughtException() ); } @@ -271,7 +271,7 @@ namespace connectivity { namespace hsqldb //TODO: resource // ------------------------------------------------------------------- - void OHsqlConnection::impl_checkExistingTable_throw( const ::rtl::OUString& _rTableName ) + void OHsqlConnection::impl_checkExistingTable_throw( const OUString& _rTableName ) { bool bDoesExist = false; try @@ -290,7 +290,7 @@ namespace connectivity { namespace hsqldb if ( !bDoesExist ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_NO_TABLENAME, "$tablename$", _rTableName )); @@ -299,7 +299,7 @@ namespace connectivity { namespace hsqldb } // ------------------------------------------------------------------- - bool OHsqlConnection::impl_isTextTable_nothrow( const ::rtl::OUString& _rTableName ) + bool OHsqlConnection::impl_isTextTable_nothrow( const OUString& _rTableName ) { bool bIsTextTable = false; try @@ -308,11 +308,11 @@ namespace connectivity { namespace hsqldb // split the fully qualified name Reference< XDatabaseMetaData > xMetaData( xMe->getMetaData(), UNO_QUERY_THROW ); - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; ::dbtools::qualifiedNameComponents( xMetaData, _rTableName, sCatalog, sSchema, sName, ::dbtools::eComplete ); // get the table information - ::rtl::OUStringBuffer sSQL; + OUStringBuffer sSQL; sSQL.appendAscii( "SELECT HSQLDB_TYPE FROM INFORMATION_SCHEMA.SYSTEM_TABLES" ); HTools::appendTableFilterCrit( sSQL, sCatalog, sSchema, sName, true ); sSQL.appendAscii( " AND TABLE_TYPE = 'TABLE'" ); @@ -323,7 +323,7 @@ namespace connectivity { namespace hsqldb if ( xTableHsqlType->next() ) // might not succeed in case of VIEWs { Reference< XRow > xValueAccess( xTableHsqlType, UNO_QUERY_THROW ); - ::rtl::OUString sTableType = xValueAccess->getString( 1 ); + OUString sTableType = xValueAccess->getString( 1 ); bIsTextTable = sTableType == "TEXT"; } } @@ -347,18 +347,18 @@ namespace connectivity { namespace hsqldb xProvider.set( GraphicProvider::create(m_xContext) ); // assemble the image URL - ::rtl::OUStringBuffer aImageURL; + OUStringBuffer aImageURL; // load the graphic from the global graphic repository aImageURL.appendAscii( "private:graphicrepository/" ); // the relative path within the images.zip aImageURL.appendAscii( "database/" ); aImageURL.appendAscii( LINKED_TEXT_TABLE_IMAGE_RESOURCE ); // the name of the graphic to use - ::rtl::OUString sImageURL( aImageURL.makeStringAndClear() ); + OUString sImageURL( aImageURL.makeStringAndClear() ); // ask the provider to obtain a graphic Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString( "URL" ); + aMediaProperties[0].Name = OUString( "URL" ); aMediaProperties[0].Value <<= sImageURL; xGraphic = xProvider->queryGraphic( aMediaProperties ); OSL_ENSURE( xGraphic.is(), "OHsqlConnection::impl_getTextTableIcon_nothrow: the provider did not give us a graphic object!" ); diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 9126a81f9394..d296773404b8 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -131,7 +131,7 @@ namespace connectivity { if ( !m_xDriver.is() ) { - ::rtl::OUString sURL("jdbc:hsqldb:db"); + OUString sURL("jdbc:hsqldb:db"); Reference xDriverAccess = DriverManager::create( m_xContext ); m_xDriver = xDriverAccess->getDriverByURL(sURL); } @@ -142,23 +142,23 @@ namespace connectivity //-------------------------------------------------------------------- namespace { - ::rtl::OUString lcl_getPermittedJavaMethods_nothrow( const Reference< XComponentContext >& _rxContext ) + OUString lcl_getPermittedJavaMethods_nothrow( const Reference< XComponentContext >& _rxContext ) { - ::rtl::OUStringBuffer aConfigPath; + OUStringBuffer aConfigPath; aConfigPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" ); aConfigPath.append ( ODriverDelegator::getImplementationName_Static() ); aConfigPath.appendAscii( "/PermittedJavaMethods" ); ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, aConfigPath.makeStringAndClear() ) ); - ::rtl::OUStringBuffer aPermittedMethods; - Sequence< ::rtl::OUString > aNodeNames( aConfig.getNodeNames() ); - for ( const ::rtl::OUString* pNodeNames = aNodeNames.getConstArray(); + OUStringBuffer aPermittedMethods; + Sequence< OUString > aNodeNames( aConfig.getNodeNames() ); + for ( const OUString* pNodeNames = aNodeNames.getConstArray(); pNodeNames != aNodeNames.getConstArray() + aNodeNames.getLength(); ++pNodeNames ) { - ::rtl::OUString sPermittedMethod; + OUString sPermittedMethod; OSL_VERIFY( aConfig.getNodeValue( *pNodeNames ) >>= sPermittedMethod ); if ( !aPermittedMethods.isEmpty() ) @@ -171,7 +171,7 @@ namespace connectivity } //-------------------------------------------------------------------- - Reference< XConnection > SAL_CALL ODriverDelegator::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { Reference< XConnection > xConnection; if ( acceptsURL(url) ) @@ -179,7 +179,7 @@ namespace connectivity Reference< XDriver > xDriver = loadDriver(); if ( xDriver.is() ) { - ::rtl::OUString sURL; + OUString sURL; Reference xStorage; const PropertyValue* pIter = info.getConstArray(); const PropertyValue* pEnd = pIter + info.getLength(); @@ -199,17 +199,17 @@ namespace connectivity if ( !xStorage.is() || sURL.isEmpty() ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_NO_STROAGE); + const OUString sMessage = aResources.getResourceString(STR_NO_STROAGE); ::dbtools::throwGenericSQLException(sMessage ,*this); } - ::rtl::OUString sSystemPath; + OUString sSystemPath; osl_getSystemPathFromFileURL( sURL.pData, &sSystemPath.pData ); sal_Int32 nIndex = sSystemPath.lastIndexOf('.'); if ( sURL.isEmpty() || sSystemPath.isEmpty() ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_INVALID_FILE_URL); + const OUString sMessage = aResources.getResourceString(STR_INVALID_FILE_URL); ::dbtools::throwGenericSQLException(sMessage ,*this); } @@ -218,19 +218,19 @@ namespace connectivity ::comphelper::NamedValueCollection aProperties; // properties for accessing the embedded storage - ::rtl::OUString sConnPartURL = sSystemPath.copy( 0, ::std::max< sal_Int32 >( nIndex, sSystemPath.getLength() ) ); - ::rtl::OUString sKey = StorageContainer::registerStorage( xStorage, sConnPartURL ); + OUString sConnPartURL = sSystemPath.copy( 0, ::std::max< sal_Int32 >( nIndex, sSystemPath.getLength() ) ); + OUString sKey = StorageContainer::registerStorage( xStorage, sConnPartURL ); aProperties.put( "storage_key", sKey ); aProperties.put( "storage_class_name", - ::rtl::OUString( "com.sun.star.sdbcx.comp.hsqldb.StorageAccess" ) ); + OUString( "com.sun.star.sdbcx.comp.hsqldb.StorageAccess" ) ); aProperties.put( "fileaccess_class_name", - ::rtl::OUString( "com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess" ) ); + OUString( "com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess" ) ); // JDBC driver and driver's classpath aProperties.put( "JavaDriverClass", - ::rtl::OUString( "org.hsqldb.jdbcDriver" ) ); + OUString( "org.hsqldb.jdbcDriver" ) ); aProperties.put( "JavaDriverClassPath", - ::rtl::OUString( + OUString( #ifdef SYSTEM_HSQLDB HSQLDB_JAR " vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar" @@ -243,22 +243,22 @@ namespace connectivity // auto increment handling aProperties.put( "IsAutoRetrievingEnabled", true ); aProperties.put( "AutoRetrievingStatement", - ::rtl::OUString( "CALL IDENTITY()" ) ); + OUString( "CALL IDENTITY()" ) ); aProperties.put( "IgnoreDriverPrivileges", true ); // don't want to expose HSQLDB's schema capabilities which exist since 1.8.0RC10 aProperties.put( "default_schema", - ::rtl::OUString( "true" ) ); + OUString( "true" ) ); // security: permitted Java classes NamedValue aPermittedClasses( - ::rtl::OUString( "hsqldb.method_class_names" ), + OUString( "hsqldb.method_class_names" ), makeAny( lcl_getPermittedJavaMethods_nothrow( m_xContext ) ) ); aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) ); - const ::rtl::OUString sProperties( "properties" ); - ::rtl::OUString sMessage; + const OUString sProperties( "properties" ); + OUString sMessage; try { if ( !bIsNewDatabase && xStorage->isStreamElement(sProperties) ) @@ -269,14 +269,14 @@ namespace connectivity ::std::auto_ptr pStream( ::utl::UcbStreamHelper::CreateStream(xStream) ); if ( pStream.get() ) { - rtl::OString sLine; - rtl::OString sVersionString; + OString sLine; + OString sVersionString; while ( pStream->ReadLine(sLine) ) { if ( sLine.isEmpty() ) continue; - const rtl::OString sIniKey = comphelper::string::getToken(sLine, 0, '='); - const rtl::OString sValue = comphelper::string::getToken(sLine, 1, '='); + const OString sIniKey = comphelper::string::getToken(sLine, 0, '='); + const OString sValue = comphelper::string::getToken(sLine, 1, '='); if (sIniKey.equalsL(RTL_CONSTASCII_STRINGPARAM("hsqldb.compatible_version"))) { sVersionString = sValue; @@ -323,17 +323,17 @@ namespace connectivity if ( xProp.is() ) { sal_Int32 nMode = 0; - xProp->getPropertyValue(::rtl::OUString("OpenMode")) >>= nMode; + xProp->getPropertyValue(OUString("OpenMode")) >>= nMode; if ( (nMode & ElementModes::WRITE) != ElementModes::WRITE ) { - aProperties.put( "readonly", ::rtl::OUString( "true" ) ); + aProperties.put( "readonly", OUString( "true" ) ); } } Sequence< PropertyValue > aConnectionArgs; aProperties >>= aConnectionArgs; - ::rtl::OUString sConnectURL("jdbc:hsqldb:"); + OUString sConnectURL("jdbc:hsqldb:"); sConnectURL += sConnPartURL; Reference xOrig; @@ -395,7 +395,7 @@ namespace connectivity } //-------------------------------------------------------------------- - sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const ::rtl::OUString& url ) throw (SQLException, RuntimeException) + sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException) { sal_Bool bEnabled = sal_False; OSL_VERIFY_EQUALS( jfw_getEnabled( &bEnabled ), JFW_E_NONE, "error in jfw_getEnabled" ); @@ -403,31 +403,31 @@ namespace connectivity } //-------------------------------------------------------------------- - Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException) + Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException) { if ( !acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); ::std::vector< DriverPropertyInfo > aDriverInfo; aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("Storage") - ,::rtl::OUString("Defines the storage where the database will be stored.") + OUString("Storage") + ,OUString("Defines the storage where the database will be stored.") ,sal_True - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("URL") - ,::rtl::OUString("Defines the url of the data source.") + OUString("URL") + ,OUString("Defines the url of the data source.") ,sal_True - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("AutoRetrievingStatement") - ,::rtl::OUString("Defines the statement which will be executed to retrieve auto increment values.") + OUString("AutoRetrievingStatement") + ,OUString("Defines the statement which will be executed to retrieve auto increment values.") ,sal_False - ,::rtl::OUString("CALL IDENTITY()") - ,Sequence< ::rtl::OUString >()) + ,OUString("CALL IDENTITY()") + ,Sequence< OUString >()) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } @@ -471,12 +471,12 @@ namespace connectivity } //-------------------------------------------------------------------- - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { if ( ! acceptsURL(url) ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); } @@ -486,37 +486,37 @@ namespace connectivity // XServiceInfo // -------------------------------------------------------------------------------- //------------------------------------------------------------------------------ - rtl::OUString ODriverDelegator::getImplementationName_Static( ) throw(RuntimeException) + OUString ODriverDelegator::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdbcx.comp.hsqldb.Driver"); + return OUString("com.sun.star.sdbcx.comp.hsqldb.Driver"); } //------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) + Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); - aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver"); + Sequence< OUString > aSNS( 2 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); + aSNS[1] = OUString("com.sun.star.sdbcx.Driver"); return aSNS; } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ - sal_Bool SAL_CALL ODriverDelegator::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; return pSupported != pEnd; } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -539,12 +539,12 @@ namespace connectivity Reference xStmt = _xConnection->createStatement(); if ( xStmt.is() ) { - Reference xRes(xStmt->executeQuery(::rtl::OUString("SELECT COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_SESSIONS WHERE USER_NAME ='SA'")),UNO_QUERY); + Reference xRes(xStmt->executeQuery(OUString("SELECT COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_SESSIONS WHERE USER_NAME ='SA'")),UNO_QUERY); Reference xRow(xRes,UNO_QUERY); if ( xRow.is() && xRes->next() ) bLastOne = xRow->getInt(1) == 1; if ( bLastOne ) - xStmt->execute(::rtl::OUString("SHUTDOWN")); + xStmt->execute(OUString("SHUTDOWN")); } } } @@ -582,9 +582,9 @@ namespace connectivity Reference< XStorage> xStorage(Source.Source,UNO_QUERY); if ( xStorage.is() ) { - ::rtl::OUString sKey = StorageContainer::getRegisteredKey(xStorage); + OUString sKey = StorageContainer::getRegisteredKey(xStorage); TWeakPairVector::iterator i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(),::o3tl::compose1( - ::std::bind2nd(::std::equal_to< ::rtl::OUString >(),sKey) + ::std::bind2nd(::std::equal_to< OUString >(),sKey) ,::o3tl::compose1(::o3tl::select1st(),::o3tl::select2nd< TWeakPair >()))); if ( i != m_aConnections.end() ) shutdownConnection(i); @@ -632,11 +632,11 @@ namespace connectivity ::osl::MutexGuard aGuard(m_aMutex); Reference< XStorage> xStorage(aEvent.Source,UNO_QUERY); - ::rtl::OUString sKey = StorageContainer::getRegisteredKey(xStorage); + OUString sKey = StorageContainer::getRegisteredKey(xStorage); if ( !sKey.isEmpty() ) { TWeakPairVector::iterator i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(),::o3tl::compose1( - ::std::bind2nd(::std::equal_to< ::rtl::OUString >(),sKey) + ::std::bind2nd(::std::equal_to< OUString >(),sKey) ,::o3tl::compose1(::o3tl::select1st(),::o3tl::select2nd< TWeakPair >()))); OSL_ENSURE( i != m_aConnections.end(), "ODriverDelegator::preCommit: they're committing a storage which I do not know!" ); if ( i != m_aConnections.end() ) @@ -649,7 +649,7 @@ namespace connectivity Reference< XStatement> xStmt = xConnection->createStatement(); OSL_ENSURE( xStmt.is(), "ODriverDelegator::preCommit: no statement!" ); if ( xStmt.is() ) - xStmt->execute( ::rtl::OUString( "SET WRITE_DELAY 0" ) ); + xStmt->execute( OUString( "SET WRITE_DELAY 0" ) ); sal_Bool bPreviousAutoCommit = xConnection->getAutoCommit(); xConnection->setAutoCommit( sal_False ); @@ -657,7 +657,7 @@ namespace connectivity xConnection->setAutoCommit( bPreviousAutoCommit ); if ( xStmt.is() ) - xStmt->execute( ::rtl::OUString( "SET WRITE_DELAY 60" ) ); + xStmt->execute( OUString( "SET WRITE_DELAY 60" ) ); } } catch(Exception&) @@ -683,7 +683,7 @@ namespace connectivity namespace { //.............................................................. - const sal_Char* lcl_getCollationForLocale( const ::rtl::OUString& _rLocaleString, bool _bAcceptCountryMismatch = false ) + const sal_Char* lcl_getCollationForLocale( const OUString& _rLocaleString, bool _bAcceptCountryMismatch = false ) { static const sal_Char* pTranslations[] = { @@ -783,7 +783,7 @@ namespace connectivity NULL, NULL }; - ::rtl::OUString sLocaleString( _rLocaleString ); + OUString sLocaleString( _rLocaleString ); sal_Char nCompareTermination = 0; if ( _bAcceptCountryMismatch ) @@ -818,9 +818,9 @@ namespace connectivity } //.............................................................. - ::rtl::OUString lcl_getSystemLocale( const Reference< XComponentContext >& _rxContext ) + OUString lcl_getSystemLocale( const Reference< XComponentContext >& _rxContext ) { - ::rtl::OUString sLocaleString = ::rtl::OUString( "en-US" ); + OUString sLocaleString = OUString( "en-US" ); try { //......................................................... @@ -831,13 +831,13 @@ namespace connectivity // arguments for creating the config access Sequence< Any > aArguments(2); // the path to the node to open - ::rtl::OUString sNodePath("/org.openoffice.Setup/L10N" ); - aArguments[0] <<= PropertyValue( ::rtl::OUString("nodepath"), 0, + OUString sNodePath("/org.openoffice.Setup/L10N" ); + aArguments[0] <<= PropertyValue( OUString("nodepath"), 0, makeAny( sNodePath ), PropertyState_DIRECT_VALUE ); // the depth: -1 means unlimited aArguments[1] <<= PropertyValue( - ::rtl::OUString("depth"), 0, + OUString("depth"), 0, makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE ); @@ -845,7 +845,7 @@ namespace connectivity // create the access Reference< XPropertySet > xNode( xConfigProvider->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"), + OUString("com.sun.star.configuration.ConfigurationAccess"), aArguments ), UNO_QUERY ); OSL_ENSURE( xNode.is(), "lcl_getSystemLocale: invalid access returned (should throw an exception instead)!" ); @@ -853,7 +853,7 @@ namespace connectivity //......................................................... // ask for the system locale setting if ( xNode.is() ) - xNode->getPropertyValue( ::rtl::OUString( "ooSetupSystemLocale" ) ) >>= sLocaleString; + xNode->getPropertyValue( OUString( "ooSetupSystemLocale" ) ) >>= sLocaleString; } catch( const Exception& ) { @@ -877,7 +877,7 @@ namespace connectivity OSL_ENSURE( xStatement.is(), "ODriverDelegator::onConnectedNewDatabase: could not create a statement!" ); if ( xStatement.is() ) { - ::rtl::OUStringBuffer aStatement; + OUStringBuffer aStatement; aStatement.appendAscii( "SET DATABASE COLLATION \"" ); aStatement.appendAscii( lcl_getCollationForLocale( lcl_getSystemLocale( m_xContext ) ) ); aStatement.appendAscii( "\"" ); diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 125681bbe860..91dd98ee21fd 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -67,8 +67,8 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc { #ifdef HSQLDB_DBG { - ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); - ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); + OUString sKey = StorageContainer::jstring2ustring(env,key); + OUString sName = StorageContainer::jstring2ustring(env,name); } #endif ::boost::shared_ptr pHelper = StorageContainer::getRegisteredStream(env,name,key); @@ -213,8 +213,8 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js OSL_UNUSED( logger ); #ifdef HSQLDB_DBG { - ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); - ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); + OUString sKey = StorageContainer::jstring2ustring(env,key); + OUString sName = StorageContainer::jstring2ustring(env,name); } #endif ::boost::shared_ptr pHelper = StorageContainer::getRegisteredStream(env,name,key); diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index b7309b852cbc..75f804e93df6 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -107,20 +107,20 @@ namespace connectivity return s_aMap; } // ----------------------------------------------------------------------------- - ::rtl::OUString lcl_getNextCount() + OUString lcl_getNextCount() { static sal_Int32 s_nCount = 0; - return ::rtl::OUString::valueOf(s_nCount++); + return OUString::valueOf(s_nCount++); } // ----------------------------------------------------------------------------- - ::rtl::OUString StorageContainer::removeURLPrefix(const ::rtl::OUString& _sURL,const ::rtl::OUString& _sFileURL) + OUString StorageContainer::removeURLPrefix(const OUString& _sURL,const OUString& _sFileURL) { return _sURL.copy(_sFileURL.getLength()+1); } // ----------------------------------------------------------------------------- - ::rtl::OUString StorageContainer::removeOldURLPrefix(const ::rtl::OUString& _sURL) + OUString StorageContainer::removeOldURLPrefix(const OUString& _sURL) { - ::rtl::OUString sRet = _sURL; + OUString sRet = _sURL; #if defined(WNT) sal_Int32 nIndex = sRet.lastIndexOf('\\'); #else @@ -136,20 +136,20 @@ namespace connectivity /*****************************************************************************/ /* convert jstring to rtl_uString */ - ::rtl::OUString StorageContainer::jstring2ustring(JNIEnv * env, jstring jstr) + OUString StorageContainer::jstring2ustring(JNIEnv * env, jstring jstr) { if (JNI_FALSE != env->ExceptionCheck()) { env->ExceptionClear(); OSL_FAIL("ExceptionClear"); } - ::rtl::OUString aStr; + OUString aStr; if ( jstr ) { jboolean bCopy(sal_True); const jchar* pChar = env->GetStringChars(jstr,&bCopy); jsize len = env->GetStringLength(jstr); - aStr = ::rtl::OUString(pChar,len); + aStr = OUString(pChar,len); if(bCopy) env->ReleaseStringChars(jstr,pChar); @@ -164,7 +164,7 @@ namespace connectivity } // ----------------------------------------------------------------------------- - ::rtl::OUString StorageContainer::registerStorage(const Reference< XStorage>& _xStorage,const ::rtl::OUString& _sURL) + OUString StorageContainer::registerStorage(const Reference< XStorage>& _xStorage,const OUString& _sURL) { OSL_ENSURE(_xStorage.is(),"Storage is NULL!"); TStorages& rMap = lcl_getStorageMap(); @@ -182,7 +182,7 @@ namespace connectivity return aFind->first; } // ----------------------------------------------------------------------------- - TStorages::mapped_type StorageContainer::getRegisteredStorage(const ::rtl::OUString& _sKey) + TStorages::mapped_type StorageContainer::getRegisteredStorage(const OUString& _sKey) { TStorages::mapped_type aRet; TStorages& rMap = lcl_getStorageMap(); @@ -194,9 +194,9 @@ namespace connectivity return aRet; } // ----------------------------------------------------------------------------- - ::rtl::OUString StorageContainer::getRegisteredKey(const Reference< XStorage>& _xStorage) + OUString StorageContainer::getRegisteredKey(const Reference< XStorage>& _xStorage) { - ::rtl::OUString sKey; + OUString sKey; OSL_ENSURE(_xStorage.is(),"Storage is NULL!"); TStorages& rMap = lcl_getStorageMap(); // check if the storage is already in our map @@ -210,7 +210,7 @@ namespace connectivity return sKey; } // ----------------------------------------------------------------------------- - void StorageContainer::revokeStorage(const ::rtl::OUString& _sKey,const Reference& _xListener) + void StorageContainer::revokeStorage(const OUString& _sKey,const Reference& _xListener) { TStorages& rMap = lcl_getStorageMap(); TStorages::iterator aFind = rMap.find(_sKey); @@ -239,7 +239,7 @@ namespace connectivity { TStreamMap::mapped_type pHelper; TStorages& rMap = lcl_getStorageMap(); - ::rtl::OUString sKey = jstring2ustring(env,key); + OUString sKey = jstring2ustring(env,key); TStorages::iterator aFind = rMap.find(sKey); OSL_ENSURE(aFind != rMap.end(),"Storage could not be found in list!"); if ( aFind != rMap.end() ) @@ -248,8 +248,8 @@ namespace connectivity OSL_ENSURE(aStoragePair.first.first.is(),"No Storage available!"); if ( aStoragePair.first.first.is() ) { - ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name); - ::rtl::OUString sName = removeURLPrefix(sOrgName,aStoragePair.first.second); + OUString sOrgName = StorageContainer::jstring2ustring(env,name); + OUString sName = removeURLPrefix(sOrgName,aStoragePair.first.second); TStreamMap::iterator aStreamFind = aFind->second.second.find(sName); OSL_ENSURE( aStreamFind == aFind->second.second.end(),"A Stream was already registered for this object!"); if ( aStreamFind != aFind->second.second.end() ) @@ -266,7 +266,7 @@ namespace connectivity } catch(const Exception&) { - ::rtl::OUString sStrippedName = removeOldURLPrefix(sOrgName); + OUString sStrippedName = removeOldURLPrefix(sOrgName); if ( ((_nMode & ElementModes::WRITE) != ElementModes::WRITE ) ) { @@ -289,13 +289,13 @@ namespace connectivity catch(const Exception& e) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "[HSQLDB-SDBC] caught an exception while opening a stream\n" ); + OString sMessage( "[HSQLDB-SDBC] caught an exception while opening a stream\n" ); sMessage += "Name: "; - sMessage += ::rtl::OString( sName.getStr(), sName.getLength(), osl_getThreadTextEncoding() ); + sMessage += OString( sName.getStr(), sName.getLength(), osl_getThreadTextEncoding() ); sMessage += "\nMode: 0x"; if ( _nMode < 16 ) sMessage += "0"; - sMessage += ::rtl::OString::valueOf( _nMode, 16 ).toAsciiUpperCase(); + sMessage += OString::valueOf( _nMode, 16 ).toAsciiUpperCase(); OSL_FAIL( sMessage.getStr() ); #endif StorageContainer::throwJavaException(e,env); @@ -335,7 +335,7 @@ namespace connectivity { if (JNI_FALSE != env->ExceptionCheck()) env->ExceptionClear(); - ::rtl::OString cstr( ::rtl::OUStringToOString(_aException.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); + OString cstr( OUStringToOString(_aException.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr()); } diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 5bb035620b59..13b636fc645e 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -73,11 +73,11 @@ OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, // ------------------------------------------------------------------------- OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName, + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName, sal_Int32 _nPrivileges ) : OTableHelper( _pTables, _xConnection, @@ -151,7 +151,7 @@ sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru } // ------------------------------------------------------------------------- // XAlterTable -void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -173,7 +173,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con m_pColumns->getByName(colName) >>= xProp; // first check the types sal_Int32 nOldType = 0,nNewType = 0,nOldPrec = 0,nNewPrec = 0,nOldScale = 0,nNewScale = 0; - ::rtl::OUString sOldTypeName, sNewTypeName; + OUString sOldTypeName, sNewTypeName; ::dbtools::OPropertyMap& rProp = OMetaConnection::getPropMap(); @@ -200,17 +200,17 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; // now we should look if the name of the column changed - ::rtl::OUString sNewColumnName; + OUString sNewColumnName; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_NAME)) >>= sNewColumnName; if ( !sNewColumnName.equals(colName) ) { - const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); + const OUString sQuote = getMetaData()->getIdentifierQuoteString( ); - ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(" ALTER COLUMN "); + OUString sSql = getAlterTableColumnPart(); + sSql += OUString(" ALTER COLUMN "); sSql += ::dbtools::quoteName(sQuote,colName); - sSql += ::rtl::OUString(" RENAME TO "); + sSql += OUString(" RENAME TO "); sSql += ::dbtools::quoteName(sQuote,sNewColumnName); executeStatement(sSql); @@ -233,7 +233,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con } // third: check the default values - ::rtl::OUString sNewDefault,sOldDefault; + OUString sNewDefault,sOldDefault; xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault; @@ -259,15 +259,15 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con } // ----------------------------------------------------------------------------- -void OHSQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rColName, const Reference& _xDescriptor) +void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, const Reference& _xDescriptor) { - ::rtl::OUString sSql = getAlterTableColumnPart(); + OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(" ALTER COLUMN "); + sSql += OUString(" ALTER COLUMN "); #if OSL_DEBUG_LEVEL > 0 try { - ::rtl::OUString sDescriptorName; + OUString sDescriptorName; OSL_ENSURE( _xDescriptor.is() && ( _xDescriptor->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_NAME ) ) >>= sDescriptorName ) && ( sDescriptorName == _rColName ), @@ -290,46 +290,46 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rCol executeStatement(sSql); } // ----------------------------------------------------------------------------- -void OHSQLTable::alterDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName) +void OHSQLTable::alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName) { - ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(" ALTER COLUMN "); + OUString sSql = getAlterTableColumnPart(); + sSql += OUString(" ALTER COLUMN "); - const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); + const OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,_rColName); - sSql += ::rtl::OUString(" SET DEFAULT '") + _sNewDefault; - sSql += ::rtl::OUString("'"); + sSql += OUString(" SET DEFAULT '") + _sNewDefault; + sSql += OUString("'"); executeStatement(sSql); } // ----------------------------------------------------------------------------- -void OHSQLTable::dropDefaultValue(const ::rtl::OUString& _rColName) +void OHSQLTable::dropDefaultValue(const OUString& _rColName) { - ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(" ALTER COLUMN "); + OUString sSql = getAlterTableColumnPart(); + sSql += OUString(" ALTER COLUMN "); - const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); + const OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,_rColName); - sSql += ::rtl::OUString(" DROP DEFAULT"); + sSql += OUString(" DROP DEFAULT"); executeStatement(sSql); } // ----------------------------------------------------------------------------- -::rtl::OUString OHSQLTable::getAlterTableColumnPart() +OUString OHSQLTable::getAlterTableColumnPart() { - ::rtl::OUString sSql( "ALTER TABLE " ); + OUString sSql( "ALTER TABLE " ); - ::rtl::OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) ); + OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) ); sSql += sComposedName; return sSql; } // ----------------------------------------------------------------------------- -void OHSQLTable::executeStatement(const ::rtl::OUString& _rStatement ) +void OHSQLTable::executeStatement(const OUString& _rStatement ) { - ::rtl::OUString sSQL = _rStatement; + OUString sSQL = _rStatement; if(sSQL.lastIndexOf(',') == (sSQL.getLength()-1)) - sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,::rtl::OUString(")")); + sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,OUString(")")); Reference< XStatement > xStmt = getConnection()->createStatement( ); if ( xStmt.is() ) @@ -367,7 +367,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException) } // ------------------------------------------------------------------------- // XRename -void SAL_CALL OHSQLTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -380,19 +380,19 @@ void SAL_CALL OHSQLTable::rename( const ::rtl::OUString& newName ) throw(SQLExce if(!isNew()) { - ::rtl::OUString sSql = ::rtl::OUString("ALTER "); - if ( m_Type == ::rtl::OUString("VIEW") ) - sSql += ::rtl::OUString(" VIEW "); + OUString sSql = OUString("ALTER "); + if ( m_Type == OUString("VIEW") ) + sSql += OUString(" VIEW "); else - sSql += ::rtl::OUString(" TABLE "); + sSql += OUString(" TABLE "); - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(getMetaData(),newName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sComposedName( + OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInDataManipulation ) ); sSql += sComposedName - + ::rtl::OUString(" RENAME TO "); + + OUString(" RENAME TO "); sSql += ::dbtools::composeTableName( getMetaData(), sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ); executeStatement(sSql); diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index 7ca0aab0c609..a68f24a44aa0 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.cxx @@ -46,16 +46,16 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace dbtools; -sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OTables::createObject(const OUString& _rName) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData,_rName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - static const ::rtl::OUString s_sTableTypeView("VIEW"); - static const ::rtl::OUString s_sTableTypeTable("TABLE"); - static const ::rtl::OUString s_sAll("%"); + static const OUString s_sTableTypeView("VIEW"); + static const OUString s_sTableTypeTable("TABLE"); + static const OUString s_sAll("%"); - Sequence< ::rtl::OUString > sTableTypes(3); + Sequence< OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; sTableTypes[2] = s_sAll; // just to be sure to include anything else .... @@ -109,14 +109,14 @@ Reference< XPropertySet > OTables::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OTables::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OTables::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { createTable(descriptor); return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop -void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName) { Reference< XInterface > xObject( getObject( _nPos ) ); sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject ); @@ -125,19 +125,19 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) Reference< XConnection > xConnection = static_cast(m_rParent).getConnection(); - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData,_sElementName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString aSql( "DROP " ); + OUString aSql( "DROP " ); Reference xProp(xObject,UNO_QUERY); sal_Bool bIsView; - if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString("VIEW")))) // here we have a view - aSql += ::rtl::OUString("VIEW "); + if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == OUString("VIEW")))) // here we have a view + aSql += OUString("VIEW "); else - aSql += ::rtl::OUString("TABLE "); + aSql += OUString("TABLE "); - ::rtl::OUString sComposedName( + OUString sComposedName( ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) ); aSql += sComposedName; Reference< XStatement > xStmt = xConnection->createStatement( ); @@ -159,7 +159,7 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) void OTables::createTable( const Reference< XPropertySet >& descriptor ) { Reference< XConnection > xConnection = static_cast(m_rParent).getConnection(); - ::rtl::OUString aSql = ::dbtools::createSqlCreateTableStatement(descriptor,xConnection); + OUString aSql = ::dbtools::createSqlCreateTableStatement(descriptor,xConnection); Reference< XStatement > xStmt = xConnection->createStatement( ); if ( xStmt.is() ) @@ -169,7 +169,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor ) } } // ----------------------------------------------------------------------------- -void OTables::appendNew(const ::rtl::OUString& _rsNewTable) +void OTables::appendNew(const OUString& _rsNewTable) { insertElement(_rsNewTable,NULL); @@ -180,7 +180,7 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable) static_cast(aListenerLoop.next())->elementInserted(aEvent); } // ----------------------------------------------------------------------------- -::rtl::OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject) +OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject) { OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!"); return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false ); diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx index c674c64a3fea..0a24620a25b2 100644 --- a/connectivity/source/drivers/hsqldb/HTools.cxx +++ b/connectivity/source/drivers/hsqldb/HTools.cxx @@ -26,8 +26,8 @@ namespace connectivity { namespace hsqldb //= HTools //==================================================================== //-------------------------------------------------------------------- - void HTools::appendTableFilterCrit( ::rtl::OUStringBuffer& _inout_rBuffer, const ::rtl::OUString& _rCatalog, - const ::rtl::OUString _rSchema, const ::rtl::OUString _rName, bool _bShortForm ) + void HTools::appendTableFilterCrit( OUStringBuffer& _inout_rBuffer, const OUString& _rCatalog, + const OUString _rSchema, const OUString _rName, bool _bShortForm ) { _inout_rBuffer.appendAscii( " WHERE " ); if ( !_rCatalog.isEmpty() ) diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index daa4a307240b..8d3a7fa0d681 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.cxx @@ -43,7 +43,7 @@ OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star } // ------------------------------------------------------------------------- OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::rtl::OUString& _Name + const OUString& _Name ) : connectivity::sdbcx::OUser(_Name,sal_True) ,m_xConnection(_xConnection) { @@ -61,7 +61,7 @@ OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun:: // ------------------------------------------------------------------------- void OUserExtend::construct() { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0))); } // ----------------------------------------------------------------------------- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const @@ -77,7 +77,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper() } typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER; // ----------------------------------------------------------------------------- -sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -87,12 +87,12 @@ sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const ::rtl::OUString& objName, sal return nRights; } // ----------------------------------------------------------------------------- -void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException) +void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException) { nRightsWithGrant = nRights = 0; // first we need to create the sql stmt to select the privs Reference xMeta = m_xConnection->getMetaData(); - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMeta,objName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); Reference xRes; switch(objType) @@ -112,32 +112,32 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, Any aCatalog; if ( !sCatalog.isEmpty() ) aCatalog <<= sCatalog; - xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,::rtl::OUString("%")); + xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,OUString("%")); } break; } if ( xRes.is() ) { - static const ::rtl::OUString sSELECT( "SELECT" ); - static const ::rtl::OUString sINSERT( "INSERT" ); - static const ::rtl::OUString sUPDATE( "UPDATE" ); - static const ::rtl::OUString sDELETE( "DELETE" ); - static const ::rtl::OUString sREAD( "READ" ); - static const ::rtl::OUString sCREATE( "CREATE" ); - static const ::rtl::OUString sALTER( "ALTER" ); - static const ::rtl::OUString sREFERENCE( "REFERENCE" ); - static const ::rtl::OUString sDROP( "DROP" ); - static const ::rtl::OUString sYes( "YES" ); + static const OUString sSELECT( "SELECT" ); + static const OUString sINSERT( "INSERT" ); + static const OUString sUPDATE( "UPDATE" ); + static const OUString sDELETE( "DELETE" ); + static const OUString sREAD( "READ" ); + static const OUString sCREATE( "CREATE" ); + static const OUString sALTER( "ALTER" ); + static const OUString sREFERENCE( "REFERENCE" ); + static const OUString sDROP( "DROP" ); + static const OUString sYes( "YES" ); nRightsWithGrant = nRights = 0; Reference xCurrentRow(xRes,UNO_QUERY); while( xCurrentRow.is() && xRes->next() ) { - ::rtl::OUString sGrantee = xCurrentRow->getString(5); - ::rtl::OUString sPrivilege = xCurrentRow->getString(6); - ::rtl::OUString sGrantable = xCurrentRow->getString(7); + OUString sGrantee = xCurrentRow->getString(5); + OUString sPrivilege = xCurrentRow->getString(6); + OUString sGrantable = xCurrentRow->getString(7); if (!m_Name.equalsIgnoreAsciiCase(sGrantee)) continue; @@ -201,7 +201,7 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, } } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -211,28 +211,28 @@ sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const ::rtl::OUString& obj return nRightsWithGrant; } // ------------------------------------------------------------------------- -void SAL_CALL OHSQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) +void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { if ( objType != PrivilegeObject::TABLE ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_GRANTED)); + const OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_GRANTED)); ::dbtools::throwGenericSQLException(sError,*this); } // if ( objType != PrivilegeObject::TABLE ) ::osl::MutexGuard aGuard(m_aMutex); - ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges); + OUString sPrivs = getPrivilegeString(objPrivileges); if(!sPrivs.isEmpty()) { - ::rtl::OUString sGrant; - sGrant += ::rtl::OUString("GRANT "); + OUString sGrant; + sGrant += OUString("GRANT "); sGrant += sPrivs; - sGrant += ::rtl::OUString(" ON "); + sGrant += OUString(" ON "); Reference xMeta = m_xConnection->getMetaData(); sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); - sGrant += ::rtl::OUString(" TO "); + sGrant += OUString(" TO "); sGrant += m_Name; Reference xStmt = m_xConnection->createStatement(); @@ -242,27 +242,27 @@ void SAL_CALL OHSQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_In } } // ------------------------------------------------------------------------- -void SAL_CALL OHSQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) +void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { if ( objType != PrivilegeObject::TABLE ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_REVOKED)); + const OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_REVOKED)); ::dbtools::throwGenericSQLException(sError,*this); } // if ( objType != PrivilegeObject::TABLE ) ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); - ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges); + OUString sPrivs = getPrivilegeString(objPrivileges); if(!sPrivs.isEmpty()) { - ::rtl::OUString sGrant; - sGrant += ::rtl::OUString("REVOKE "); + OUString sGrant; + sGrant += OUString("REVOKE "); sGrant += sPrivs; - sGrant += ::rtl::OUString(" ON "); + sGrant += OUString(" ON "); Reference xMeta = m_xConnection->getMetaData(); sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); - sGrant += ::rtl::OUString(" FROM "); + sGrant += OUString(" FROM "); sGrant += m_Name; Reference xStmt = m_xConnection->createStatement(); @@ -273,16 +273,16 @@ void SAL_CALL OHSQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_I } // ----------------------------------------------------------------------------- // XUser -void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/, const ::rtl::OUString& newPassword ) throw(SQLException, RuntimeException) +void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); - ::rtl::OUString sAlterPwd; - sAlterPwd = ::rtl::OUString("SET PASSWORD FOR "); + OUString sAlterPwd; + sAlterPwd = OUString("SET PASSWORD FOR "); sAlterPwd += m_Name; - sAlterPwd += ::rtl::OUString("@\"%\" = PASSWORD('") ; + sAlterPwd += OUString("@\"%\" = PASSWORD('") ; sAlterPwd += newPassword; - sAlterPwd += ::rtl::OUString("')") ; + sAlterPwd += OUString("')") ; Reference xStmt = m_xConnection->createStatement(); @@ -293,45 +293,45 @@ void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/, } } // ----------------------------------------------------------------------------- -::rtl::OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) const +OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) const { - ::rtl::OUString sPrivs; + OUString sPrivs; if((nRights & Privilege::INSERT) == Privilege::INSERT) - sPrivs += ::rtl::OUString("INSERT"); + sPrivs += OUString("INSERT"); if((nRights & Privilege::DELETE) == Privilege::DELETE) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(","); - sPrivs += ::rtl::OUString("DELETE"); + sPrivs += OUString(","); + sPrivs += OUString("DELETE"); } if((nRights & Privilege::UPDATE) == Privilege::UPDATE) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(","); - sPrivs += ::rtl::OUString("UPDATE"); + sPrivs += OUString(","); + sPrivs += OUString("UPDATE"); } if((nRights & Privilege::ALTER) == Privilege::ALTER) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(","); - sPrivs += ::rtl::OUString("ALTER"); + sPrivs += OUString(","); + sPrivs += OUString("ALTER"); } if((nRights & Privilege::SELECT) == Privilege::SELECT) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(","); - sPrivs += ::rtl::OUString("SELECT"); + sPrivs += OUString(","); + sPrivs += OUString("SELECT"); } if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(","); - sPrivs += ::rtl::OUString("REFERENCES"); + sPrivs += OUString(","); + sPrivs += OUString("REFERENCES"); } return sPrivs; diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index 405657d3cf74..609b87504cf7 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.cxx @@ -49,7 +49,7 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent, } // ----------------------------------------------------------------------------- -sdbcx::ObjectType OUsers::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OUsers::createObject(const OUString& _rName) { return new OHSQLUser(m_xConnection,_rName); } @@ -66,20 +66,20 @@ Reference< XPropertySet > OUsers::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aSql( "GRANT USAGE ON * TO " ); - ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); - ::rtl::OUString sUserName( _rForName ); + OUString aSql( "GRANT USAGE ON * TO " ); + OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); + OUString sUserName( _rForName ); aSql += ::dbtools::quoteName(aQuote,sUserName) - + ::rtl::OUString(" @\"%\" "); - ::rtl::OUString sPassword; + + OUString(" @\"%\" "); + OUString sPassword; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword; if ( !sPassword.isEmpty() ) { - aSql += ::rtl::OUString(" IDENTIFIED BY '"); + aSql += OUString(" IDENTIFIED BY '"); aSql += sPassword; - aSql += ::rtl::OUString("'"); + aSql += OUString("'"); } Reference< XStatement > xStmt = m_xConnection->createStatement( ); @@ -91,11 +91,11 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const } // ------------------------------------------------------------------------- // XDrop -void OUsers::dropObject(sal_Int32 /*nPos*/,const ::rtl::OUString _sElementName) +void OUsers::dropObject(sal_Int32 /*nPos*/,const OUString _sElementName) { { - ::rtl::OUString aSql( "REVOKE ALL ON * FROM " ); - ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); + OUString aSql( "REVOKE ALL ON * FROM " ); + OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); aSql += ::dbtools::quoteName(aQuote,_sElementName); Reference< XStatement > xStmt = m_xConnection->createStatement( ); diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx index 9074f600ca92..dc640e16c588 100644 --- a/connectivity/source/drivers/hsqldb/HView.cxx +++ b/connectivity/source/drivers/hsqldb/HView.cxx @@ -60,8 +60,8 @@ namespace connectivity { namespace hsqldb //==================================================================== //-------------------------------------------------------------------- HView::HView( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive, - const ::rtl::OUString& _rSchemaName, const ::rtl::OUString& _rName ) - :HView_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, ::rtl::OUString(), _rSchemaName, ::rtl::OUString() ) + const OUString& _rSchemaName, const OUString& _rName ) + :HView_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, OUString() ) ,m_xConnection( _rxConnection ) { } @@ -76,7 +76,7 @@ namespace connectivity { namespace hsqldb IMPLEMENT_FORWARD_XTYPEPROVIDER2( HView, HView_Base, HView_IBASE ) //-------------------------------------------------------------------- - void SAL_CALL HView::alterCommand( const ::rtl::OUString& _rNewCommand ) throw (SQLException, RuntimeException) + void SAL_CALL HView::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException) { // not really atomic ... as long as we do not have something like // ALTER VIEW TO @@ -90,25 +90,25 @@ namespace connectivity { namespace hsqldb // However, there's not much chance to prevent this kind of errors without // backend support. - ::rtl::OUString sQualifiedName( ::dbtools::composeTableName( + OUString sQualifiedName( ::dbtools::composeTableName( m_xMetaData, m_CatalogName, m_SchemaName, m_Name, true, ::dbtools::eInDataManipulation ) ); ::utl::SharedUNOComponent< XStatement > xStatement; xStatement.set( m_xConnection->createStatement(), UNO_QUERY_THROW ); // create a statement which can be used to re-create the original view, in case // dropping it succeeds, but creating it with a new statement fails - ::rtl::OUStringBuffer aRestoreCommand; + OUStringBuffer aRestoreCommand; aRestoreCommand.appendAscii( "CREATE VIEW " ); aRestoreCommand.append ( sQualifiedName ); aRestoreCommand.appendAscii( " AS " ); aRestoreCommand.append ( impl_getCommand_throw( true ) ); - ::rtl::OUString sRestoreCommand( aRestoreCommand.makeStringAndClear() ); + OUString sRestoreCommand( aRestoreCommand.makeStringAndClear() ); bool bDropSucceeded( false ); try { // drop the existing view - ::rtl::OUStringBuffer aCommand; + OUStringBuffer aCommand; aCommand.appendAscii( "DROP VIEW " ); aCommand.append ( sQualifiedName ); xStatement->execute( aCommand.makeStringAndClear() ); @@ -158,13 +158,13 @@ namespace connectivity { namespace hsqldb } //-------------------------------------------------------------------- - ::rtl::OUString HView::impl_getCommand_throw( bool _bAllowSQLException ) const + OUString HView::impl_getCommand_throw( bool _bAllowSQLException ) const { - ::rtl::OUString sCommand; + OUString sCommand; try { - ::rtl::OUStringBuffer aCommand; + OUStringBuffer aCommand; aCommand.appendAscii( "SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.SYSTEM_VIEWS " ); HTools::appendTableFilterCrit( aCommand, m_CatalogName, m_SchemaName, m_Name, false ); ::utl::SharedUNOComponent< XStatement > xStatement; xStatement.set( m_xConnection->createStatement(), UNO_QUERY_THROW ); diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index 1da4d9a32336..265981fda0ff 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.cxx @@ -60,9 +60,9 @@ HViews::HViews( const Reference< XConnection >& _rxConnection, ::cppu::OWeakObje } // ------------------------------------------------------------------------- -sdbcx::ObjectType HViews::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType HViews::createObject(const OUString& _rName) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, sCatalog, @@ -92,14 +92,14 @@ Reference< XPropertySet > HViews::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType HViews::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType HViews::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { createView(descriptor); return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop -void HViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) +void HViews::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/) { if ( m_bInDrop ) return; @@ -108,7 +108,7 @@ void HViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject ); if (!bIsNew) { - ::rtl::OUString aSql( "DROP VIEW" ); + OUString aSql( "DROP VIEW" ); Reference xProp(xObject,UNO_QUERY); aSql += ::dbtools::composeTableName( m_xMetaData, xProp, ::dbtools::eInTableDefinitions, false, false, true ); @@ -120,7 +120,7 @@ void HViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) } } // ----------------------------------------------------------------------------- -void HViews::dropByNameImpl(const ::rtl::OUString& elementName) +void HViews::dropByNameImpl(const OUString& elementName) { m_bInDrop = sal_True; OCollection_TYPE::dropByName(elementName); @@ -131,12 +131,12 @@ void HViews::createView( const Reference< XPropertySet >& descriptor ) { Reference xConnection = static_cast(m_rParent).getConnection(); - ::rtl::OUString aSql( "CREATE VIEW " ); - ::rtl::OUString sCommand; + OUString aSql( "CREATE VIEW " ); + OUString sCommand; aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); - aSql += ::rtl::OUString(" AS "); + aSql += OUString(" AS "); descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand; aSql += sCommand; @@ -151,7 +151,7 @@ void HViews::createView( const Reference< XPropertySet >& descriptor ) OTables* pTables = static_cast(static_cast(m_rParent).getPrivateTables()); if ( pTables ) { - ::rtl::OUString sName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInDataManipulation, false, false, false ); + OUString sName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInDataManipulation, false, false, false ); pTables->appendNew(sName); } } diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index 0a7ef5b2c048..a043185a682e 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.cxx @@ -22,7 +22,6 @@ #include using namespace connectivity::hsqldb; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index 05c5556814ba..a579ce6be60f 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -48,10 +48,10 @@ SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileA { try { - ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); + OUString sName = StorageContainer::jstring2ustring(env,name); try { - ::rtl::OUString sOldName = StorageContainer::removeOldURLPrefix(sName); + OUString sOldName = StorageContainer::removeOldURLPrefix(sName); if ( aStoragePair.first.first->isStreamElement(sOldName) ) { try @@ -79,7 +79,7 @@ SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileA OSL_FAIL("Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement"); if (JNI_FALSE != env->ExceptionCheck()) env->ExceptionClear(); - ::rtl::OString cstr( ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); + OString cstr( OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); } } @@ -97,8 +97,8 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAcces { #ifdef HSQLDB_DBG { - ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); - ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); + OUString sKey = StorageContainer::jstring2ustring(env,key); + OUString sName = StorageContainer::jstring2ustring(env,name); } #endif TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); @@ -132,9 +132,9 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAcces { #ifdef HSQLDB_DBG { - ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); - ::rtl::OUString sNewName = StorageContainer::jstring2ustring(env,newname); - ::rtl::OUString sOldName = StorageContainer::jstring2ustring(env,oldname); + OUString sKey = StorageContainer::jstring2ustring(env,key); + OUString sNewName = StorageContainer::jstring2ustring(env,newname); + OUString sOldName = StorageContainer::jstring2ustring(env,oldname); } #endif TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); @@ -148,7 +148,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAcces ); #ifdef HSQLDB_DBG { - ::rtl::OUString sNewName = StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second); + OUString sNewName = StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second); OSL_ENSURE(aStoragePair.first.first->isStreamElement(sNewName),"Stream could not be renamed"); } #endif diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx index 61295b3c1a4e..9a878d445a4c 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx @@ -168,8 +168,8 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora #ifdef HSQLDB_DBG OperationLogFile( env, name, "output" ).logOperation( "flush" ); - ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); - ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); + OUString sKey = StorageContainer::jstring2ustring(env,key); + OUString sName = StorageContainer::jstring2ustring(env,name); #endif } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx index bb0a279743cf..075a32d1bd8f 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.cxx +++ b/connectivity/source/drivers/hsqldb/accesslog.cxx @@ -37,8 +37,8 @@ namespace connectivity { namespace hsqldb LogFile::LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix ) { m_sFileName = StorageContainer::jstring2ustring(env,streamName); - m_sFileName += ::rtl::OUString("."); - m_sFileName += ::rtl::OUString::createFromAscii( _pAsciiSuffix ); + m_sFileName += OUString("."); + m_sFileName += OUString::createFromAscii( _pAsciiSuffix ); } //--------------------------------------------------------------------- @@ -47,7 +47,7 @@ namespace connectivity { namespace hsqldb FILE*& pLogFile = getStreams()[m_sFileName]; if ( !pLogFile ) { - ::rtl::OString sByteLogName = ::rtl::OUStringToOString(m_sFileName,osl_getThreadTextEncoding()); + OString sByteLogName = OUStringToOString(m_sFileName,osl_getThreadTextEncoding()); pLogFile = fopen( sByteLogName.getStr(), "a+" ); } return pLogFile; diff --git a/connectivity/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx index d836bfa38943..8175ac56370f 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.hxx +++ b/connectivity/source/drivers/hsqldb/accesslog.hxx @@ -32,7 +32,7 @@ namespace connectivity { namespace hsqldb class LogFile { private: - ::rtl::OUString m_sFileName; + OUString m_sFileName; public: LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix ); @@ -50,7 +50,7 @@ namespace connectivity { namespace hsqldb { public: OperationLogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix ) - :LogFile( env, streamName, ( ::rtl::OString( _pAsciiSuffix ) += ".op" ).getStr() ) + :LogFile( env, streamName, ( OString( _pAsciiSuffix ) += ".op" ).getStr() ) { } @@ -61,24 +61,24 @@ namespace connectivity { namespace hsqldb void logOperation( const sal_Char* _pOp, jlong _nLongArg ) { - ::rtl::OString sLine( _pOp ); + OString sLine( _pOp ); sLine += "( "; - sLine += ::rtl::OString::valueOf( _nLongArg ); + sLine += OString::valueOf( _nLongArg ); sLine += " )"; writeString( sLine.getStr(), true ); } void logReturn( jlong _nRetVal ) { - ::rtl::OString sLine( " -> " ); - sLine += ::rtl::OString::valueOf( _nRetVal ); + OString sLine( " -> " ); + sLine += OString::valueOf( _nRetVal ); writeString( sLine.getStr(), true ); } void logReturn( jint _nRetVal ) { - ::rtl::OString sLine( " -> " ); - sLine += ::rtl::OString::valueOf( _nRetVal ); + OString sLine( " -> " ); + sLine += OString::valueOf( _nRetVal ); writeString( sLine.getStr(), true ); } diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index d1e9cbd1a5a8..d5c71fa8d4fc 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -40,7 +40,7 @@ jclass java_sql_Array::getMyClass() const return theClass; } -::rtl::OUString SAL_CALL java_sql_Array::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL java_sql_Array::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { static jmethodID mID(NULL); return callStringMethod("getBaseTypeName",mID); diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index 73de2c931c32..7ab349f3e1fa 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -43,7 +43,7 @@ IMPLEMENT_SERVICE_INFO(java_sql_CallableStatement,"com.sun.star.sdbcx.ACallableS //************************************************************** //************ Class: java.sql.CallableStatement //************************************************************** -java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const ::rtl::OUString& sql ) +java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const OUString& sql ) : java_sql_PreparedStatement( pEnv, _rCon, sql ) { } @@ -167,7 +167,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) return callMethodWithIntArg(pCallMethod,"getShort","(I)S",mID,columnIndex); } -::rtl::OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -197,7 +197,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) return out ? static_cast (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime(); } -void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(starsdbc::SQLException, RuntimeException) +void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(starsdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx index ec19bb5cd61b..5d03bd3448da 100644 --- a/connectivity/source/drivers/jdbc/Class.cxx +++ b/connectivity/source/drivers/jdbc/Class.cxx @@ -39,13 +39,13 @@ jclass java_lang_Class::getMyClass() const return theClass; } -java_lang_Class * java_lang_Class::forName( const ::rtl::OUString& _par0 ) +java_lang_Class * java_lang_Class::forName( const OUString& _par0 ) { jobject out(NULL); SDBThreadAttach t; { - ::rtl::OString sClassName = ::rtl::OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8); + OString sClassName = OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8); sClassName = sClassName.replace('.','/'); out = t.pEnv->FindClass(sClassName.getStr()); ThrowSQLException(t.pEnv,0); diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index fd781de276e8..d707c572ca69 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.cxx @@ -67,11 +67,11 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx return (sal_Int64)out; } -::rtl::OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::getSubString" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - ::rtl::OUString aStr; + OUString aStr; { // initialize temporary variable static const char * cSignature = "(JI)Ljava/lang/String;"; @@ -98,7 +98,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx return out==0 ? 0 : new java_io_Reader( t.pEnv, out ); } -sal_Int64 SAL_CALL java_sql_Clob::position( const ::rtl::OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::position" ); jlong out(0); diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx index 4f0b748c8c49..550db58ec1ec 100644 --- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx +++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx @@ -83,34 +83,34 @@ namespace comphelper { namespace log { namespace convert using ::com::sun::star::util::DateTime; //-------------------------------------------------------------------- - ::rtl::OUString convertLogArgToString( const Date& _rDate ) + OUString convertLogArgToString( const Date& _rDate ) { char buffer[ 30 ]; const size_t buffer_size = sizeof( buffer ); snprintf( buffer, buffer_size, "%04i-%02i-%02i", (int)_rDate.Year, (int)_rDate.Month, (int)_rDate.Day ); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } //-------------------------------------------------------------------- - ::rtl::OUString convertLogArgToString( const Time& _rTime ) + OUString convertLogArgToString( const Time& _rTime ) { char buffer[ 30 ]; const size_t buffer_size = sizeof( buffer ); snprintf( buffer, buffer_size, "%02i:%02i:%02i.%02i", (int)_rTime.Hours, (int)_rTime.Minutes, (int)_rTime.Seconds, (int)_rTime.HundredthSeconds ); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } //-------------------------------------------------------------------- - ::rtl::OUString convertLogArgToString( const DateTime& _rDateTime ) + OUString convertLogArgToString( const DateTime& _rDateTime ) { char buffer[ 30 ]; const size_t buffer_size = sizeof( buffer ); snprintf( buffer, buffer_size, "%04i-%02i-%02i %02i:%02i:%02i.%02i", (int)_rDateTime.Year, (int)_rDateTime.Month, (int)_rDateTime.Day, (int)_rDateTime.Hours, (int)_rDateTime.Minutes, (int)_rDateTime.Seconds, (int)_rDateTime.HundredthSeconds ); - return ::rtl::OUString::createFromAscii( buffer ); + return OUString::createFromAscii( buffer ); } //........................................................................ diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 61722dd1df4d..ce6d2fd00c4e 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -80,7 +80,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs( ) thro return impl_callResultSetMethod( "getCatalogs", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw( ) { static jmethodID mID(NULL); return impl_callStringMethod( "getCatalogSeparator", mID ); @@ -93,14 +93,14 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas( ) throw } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumnPrivileges( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getColumnPrivileges", mID, catalog, schema, table, &columnNamePattern ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getColumns", mID, catalog, schemaPattern, tableNamePattern, &columnNamePattern ); @@ -108,7 +108,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns( // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& _types ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) throw(SQLException, RuntimeException) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Ljava/sql/ResultSet;"; static const char * cMethodName = "getTables"; @@ -131,7 +131,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( { jobjectArray pObjArray = static_cast< jobjectArray >( t.pEnv->NewObjectArray( (jsize)typeFilterCount, java_lang_String::st_getMyClass(), 0 ) ); OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" ); - const ::rtl::OUString* typeFilter = _types.getConstArray(); + const OUString* typeFilter = _types.getConstArray(); bool bIncludeAllTypes = false; for ( sal_Int32 i=0; i SAL_CALL java_sql_DatabaseMetaData::getTables( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedureColumns( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getProcedureColumns", mID, catalog, schemaPattern, procedureNamePattern, &columnNamePattern ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedures( const Any& - catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(SQLException, RuntimeException) + catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getProcedures", mID, catalog, schemaPattern, procedureNamePattern ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getVersionColumns( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getVersionColumns", mID, catalog, schema, table ); @@ -315,28 +315,28 @@ sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getExportedKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getExportedKeys", mID, catalog, schema, table ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getImportedKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getImportedKeys", mID, catalog, schema, table ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getPrimaryKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getPrimaryKeys", mID, catalog, schema, table ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, + const Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Ljava/sql/ResultSet;"; @@ -377,7 +377,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, + const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(SQLException, RuntimeException) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)Ljava/sql/ResultSet;"; @@ -417,7 +417,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() ) return new OResultSetPrivileges(this,catalog,schemaPattern,tableNamePattern); @@ -436,17 +436,17 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( { // here we know that the count of column doesn't match ::std::map aColumnMatching; - static const ::rtl::OUString sPrivs[] = { - ::rtl::OUString("TABLE_CAT"), - ::rtl::OUString("TABLE_SCHEM"), - ::rtl::OUString("TABLE_NAME"), - ::rtl::OUString("GRANTOR"), - ::rtl::OUString("GRANTEE"), - ::rtl::OUString("PRIVILEGE"), - ::rtl::OUString("IS_GRANTABLE") + static const OUString sPrivs[] = { + OUString("TABLE_CAT"), + OUString("TABLE_SCHEM"), + OUString("TABLE_NAME"), + OUString("GRANTOR"), + OUString("GRANTEE"), + OUString("PRIVILEGE"), + OUString("IS_GRANTABLE") }; - ::rtl::OUString sColumnName; + OUString sColumnName; sal_Int32 nCount = xMeta->getColumnCount(); for (sal_Int32 i = 1 ; i <= nCount ; ++i) { @@ -467,7 +467,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( xReturn = pNewPrivRes; ODatabaseMetaDataResultSet::ORows aRows; Reference< XRow > xRow(xTemp,UNO_QUERY); - ::rtl::OUString sValue; + OUString sValue; ODatabaseMetaDataResultSet::ORow aRow(8); while ( xRow.is() && xTemp->next() ) @@ -493,9 +493,9 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference( - const Any& primaryCatalog, const ::rtl::OUString& primarySchema, - const ::rtl::OUString& primaryTable, const Any& foreignCatalog, - const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(SQLException, RuntimeException) + const Any& primaryCatalog, const OUString& primarySchema, + const OUString& primaryTable, const Any& foreignCatalog, + const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/sql/ResultSet;"; static const char * cMethodName = "getCrossReference"; @@ -551,16 +551,16 @@ sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethod } // ------------------------------------------------------------------------- -::rtl::OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) +OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) { m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName ); - const ::rtl::OUString sReturn( callStringMethod(_pMethodName,_inout_MethodID) ); + const OUString sReturn( callStringMethod(_pMethodName,_inout_MethodID) ); if ( m_aLogger.isLoggable( LogLevel::FINEST ) ) { - ::rtl::OUString sLoggedResult( sReturn ); + OUString sLoggedResult( sReturn ); if ( sLoggedResult.isEmpty() ) - sLoggedResult = ::rtl::OUString( "" ); + sLoggedResult = OUString( "" ); m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, sLoggedResult ); } @@ -599,11 +599,11 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethod( con // ------------------------------------------------------------------------- Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithStrings( const char* _pMethodName, jmethodID& _inout_MethodID, - const Any& _rCatalog, const ::rtl::OUString& _rSchemaPattern, const ::rtl::OUString& _rLeastPattern, - const ::rtl::OUString* _pOptionalAdditionalString ) + const Any& _rCatalog, const OUString& _rSchemaPattern, const OUString& _rLeastPattern, + const OUString* _pOptionalAdditionalString ) { bool bCatalog = _rCatalog.hasValue(); - ::rtl::OUString sCatalog; + OUString sCatalog; _rCatalog >>= sCatalog; bool bSchema = _rSchemaPattern.toChar() != '%'; @@ -611,8 +611,8 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS // log the call if ( m_aLogger.isLoggable( LogLevel::FINEST ) ) { - ::rtl::OUString sCatalogLog = bCatalog ? sCatalog : ::rtl::OUString( "null" ); - ::rtl::OUString sSchemaLog = bSchema ? _rSchemaPattern : ::rtl::OUString( "null" ); + OUString sCatalogLog = bCatalog ? sCatalog : OUString( "null" ); + OUString sSchemaLog = bSchema ? _rSchemaPattern : OUString( "null" ); if ( _pOptionalAdditionalString ) m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG4, _pMethodName, sCatalogLog, sSchemaLog, _rLeastPattern, *_pOptionalAdditionalString ); else @@ -735,19 +735,19 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns( ) thro return impl_callBooleanMethod( "supportsNonNullableColumns", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getCatalogTerm", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { static jmethodID mID(NULL); return impl_callStringMethod( "getIdentifierQuoteString", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getExtraNameCharacters", mID ); @@ -1163,9 +1163,9 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) t return impl_callBooleanMethod( "supportsANSI92IntermediateSQL", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { - ::rtl::OUString sURL = m_pConnection->getURL(); + OUString sURL = m_pConnection->getURL(); if ( sURL.isEmpty() ) { static jmethodID mID(NULL); @@ -1174,43 +1174,43 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) t return sURL; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getUserName", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getDriverName", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getDriverVersion", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getDatabaseProductVersion", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getDatabaseProductName", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getProcedureTerm", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getSchemaTerm", mID ); @@ -1234,37 +1234,37 @@ sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion( ) throw(Ru return impl_callIntMethod( "getDriverMinorVersion", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getSQLKeywords", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getSearchStringEscape", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getStringFunctions", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getTimeDateFunctions", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getSystemFunctions", mID ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); return impl_callStringMethod( "getNumericFunctions", mID ); @@ -1410,7 +1410,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates( ) throw(SQLE } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, + const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException) { jobject out(0); diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx index c60f92a270cc..f510d8cc93d9 100644 --- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx @@ -60,9 +60,9 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo() return aInfo; } // -------------------------------------------------------------------------------- -::rtl::OUString java_sql_DriverPropertyInfo::name() +OUString java_sql_DriverPropertyInfo::name() { - ::rtl::OUString aStr; + OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -73,9 +73,9 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo() return aStr; } // -------------------------------------------------------------------------------- -::rtl::OUString java_sql_DriverPropertyInfo::description() +OUString java_sql_DriverPropertyInfo::description() { - ::rtl::OUString aStr; + OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -86,9 +86,9 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo() return aStr; } // -------------------------------------------------------------------------------- -::rtl::OUString java_sql_DriverPropertyInfo::value() +OUString java_sql_DriverPropertyInfo::value() { - ::rtl::OUString aStr; + OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -112,7 +112,7 @@ sal_Bool java_sql_DriverPropertyInfo::required() return out; } // -------------------------------------------------------------------------------- -Sequence< ::rtl::OUString> java_sql_DriverPropertyInfo::choices() +Sequence< OUString> java_sql_DriverPropertyInfo::choices() { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -121,11 +121,11 @@ Sequence< ::rtl::OUString> java_sql_DriverPropertyInfo::choices() if(id) { const java_lang_String * pEmpty = NULL; - const ::rtl::OUString * pEmpty2 = NULL; + const OUString * pEmpty2 = NULL; return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), pEmpty2, pEmpty); } } //t.pEnv - return Sequence< ::rtl::OUString>(); + return Sequence< OUString>(); } // -------------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index 5332c063a66c..c274d51f5835 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -72,7 +72,7 @@ void SAL_CALL java_io_InputStream::closeInput( ) throw(::com::sun::star::io::No sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { if (nBytesToRead < 0) - throw ::com::sun::star::io::BufferSizeExceededException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), *this ); + throw ::com::sun::star::io::BufferSizeExceededException( OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), *this ); jint out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx index 9dd05410ddc1..67ab1772ae6f 100644 --- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx +++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx @@ -38,7 +38,7 @@ jclass java_math_BigDecimal::getMyClass() const return theClass; } -java_math_BigDecimal::java_math_BigDecimal( const ::rtl::OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL ) +java_math_BigDecimal::java_math_BigDecimal( const OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL ) { SDBThreadAttach t; if( !t.pEnv ) diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index ec2e62bbce4d..db94bbe18ba9 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -59,12 +59,12 @@ namespace { struct ClassMapEntry { ClassMapEntry( - rtl::OUString const & theClassPath, rtl::OUString const & theClassName): + OUString const & theClassPath, OUString const & theClassName): classPath(theClassPath), className(theClassName), classLoader(NULL), classObject(NULL) {} - rtl::OUString classPath; - rtl::OUString className; + OUString classPath; + OUString className; jweak classLoader; jweak classObject; }; @@ -125,7 +125,7 @@ bool getLocalFromWeakRef( jweak& _weak, LocalRef< T >& _inout_local ) // If false is returned, a (still pending) JNI exception occurred. bool loadClass( Reference< XComponentContext > const & context, JNIEnv& environment, - rtl::OUString const & classPath, rtl::OUString const & name, + OUString const & classPath, OUString const & name, LocalRef< jobject > * classLoaderPtr, LocalRef< jclass > * classPtr) { OSL_ASSERT(classLoaderPtr != NULL); @@ -321,7 +321,7 @@ jclass java_sql_Connection::getMyClass() const } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_Connection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_Connection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -379,7 +379,7 @@ sal_Bool SAL_CALL java_sql_Connection::isReadOnly( ) throw(SQLException, Runtim return callBooleanMethod( "isReadOnly", mID ); } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_Connection::setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException) { static jmethodID mID(NULL); callVoidMethodWithStringArg("setCatalog",mID,catalog); @@ -463,16 +463,16 @@ Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) throw( return xStmt; } // ----------------------------------------------------------------------------- -::rtl::OUString java_sql_Connection::transFormPreparedStatement(const ::rtl::OUString& _sSQL) +OUString java_sql_Connection::transFormPreparedStatement(const OUString& _sSQL) { - ::rtl::OUString sSqlStatement = _sSQL; + OUString sSqlStatement = _sSQL; if ( m_bParameterSubstitution ) { try { OSQLParser aParser( m_pDriver->getContext() ); - ::rtl::OUString sErrorMessage; - ::rtl::OUString sNewSql; + OUString sErrorMessage; + OUString sNewSql; OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sSQL); if(pNode) { // special handling for parameters @@ -489,14 +489,14 @@ Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) throw( return sSqlStatement; } // ------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINE, STR_LOG_PREPARE_STATEMENT, sql ); SDBThreadAttach t; - ::rtl::OUString sSqlStatement = sql; + OUString sSqlStatement = sql; sSqlStatement = transFormPreparedStatement( sSqlStatement ); java_sql_PreparedStatement* pStatement = new java_sql_PreparedStatement( t.pEnv, *this, sSqlStatement ); @@ -507,14 +507,14 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( return xReturn; } // ------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINE, STR_LOG_PREPARE_CALL, sql ); SDBThreadAttach t; - ::rtl::OUString sSqlStatement = sql; + OUString sSqlStatement = sql; sSqlStatement = transFormPreparedStatement( sSqlStatement ); java_sql_CallableStatement* pStatement = new java_sql_CallableStatement( t.pEnv, *this, sSqlStatement ); @@ -525,12 +525,12 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const return xStmt; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_Connection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); - ::rtl::OUString aStr; + OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -590,15 +590,15 @@ Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeExc // ----------------------------------------------------------------------------- namespace { - ::rtl::OUString lcl_getDriverLoadErrorMessage( const ::connectivity::SharedResources& _aResource,const ::rtl::OUString& _rDriverClass, const ::rtl::OUString& _rDriverClassPath ) + OUString lcl_getDriverLoadErrorMessage( const ::connectivity::SharedResources& _aResource,const OUString& _rDriverClass, const OUString& _rDriverClassPath ) { - ::rtl::OUString sError1( _aResource.getResourceStringWithSubstitution( + OUString sError1( _aResource.getResourceStringWithSubstitution( STR_NO_CLASSNAME, "$classname$", _rDriverClass ) ); if ( !_rDriverClassPath.isEmpty() ) { - const ::rtl::OUString sError2( _aResource.getResourceStringWithSubstitution( + const OUString sError2( _aResource.getResourceStringWithSubstitution( STR_NO_CLASSNAME_PATH, "$classpath$", _rDriverClassPath ) ); @@ -636,7 +636,7 @@ namespace ++pSystemProp ) { - ::rtl::OUString sValue; + OUString sValue; OSL_VERIFY( pSystemProp->Value >>= sValue ); _rLogger.log( LogLevel::FINER, STR_LOG_SETTING_SYSTEM_PROPERTY, pSystemProp->Name, sValue ); @@ -655,11 +655,11 @@ namespace } // ----------------------------------------------------------------------------- -void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDriverClass, const ::rtl::OUString& _sDriverClassPath, +void java_sql_Connection::loadDriverFromProperties( const OUString& _sDriverClass, const OUString& _sDriverClassPath, const Sequence< NamedValue >& _rSystemProperties ) { // contains the statement which should be used when query for automatically generated values - ::rtl::OUString sGeneratedValueStatement; + OUString sGeneratedValueStatement; // set to when we should allow to query for generated values sal_Bool bAutoRetrievingEnabled = sal_False; @@ -738,7 +738,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri throw SQLException( lcl_getDriverLoadErrorMessage( getResources(),_sDriverClass, _sDriverClassPath ), *this, - ::rtl::OUString(), + OUString(), 1000, makeAny(e) ); @@ -755,12 +755,12 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri setAutoRetrievingStatement( sGeneratedValueStatement ); } // ----------------------------------------------------------------------------- -::rtl::OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const ::rtl::OUString& _sDriverClass) +OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const OUString& _sDriverClass) { - static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths"); + static const OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths"); ::utl::OConfigurationTreeRoot aNamesRoot = ::utl::OConfigurationTreeRoot::createWithComponentContext( m_pDriver->getContext(), s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); - ::rtl::OUString sURL; + OUString sURL; if ( aNamesRoot.isValid() && aNamesRoot.hasByName( _sDriverClass ) ) { ::utl::OConfigurationNode aRegisterObj = aNamesRoot.openNode( _sDriverClass ); @@ -769,7 +769,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri return sURL; } // ----------------------------------------------------------------------------- -sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url, +sal_Bool java_sql_Connection::construct(const OUString& url, const Sequence< PropertyValue >& info) { { // initialize the java vm @@ -782,9 +782,9 @@ sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url, if ( !t.pEnv ) throwGenericSQLException(STR_NO_JAVA,*this); - ::rtl::OUString sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values + OUString sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values sal_Bool bAutoRetrievingEnabled = sal_False; // set to when we should allow to query for generated values - ::rtl::OUString sDriverClassPath,sDriverClass; + OUString sDriverClassPath,sDriverClass; Sequence< NamedValue > aSystemProperties; ::comphelper::NamedValueCollection aSettings( info ); diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index d99dfee7d22c..d0759c10ef68 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -52,17 +52,17 @@ java_sql_Driver::~java_sql_Driver() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString java_sql_Driver::getImplementationName_Static( ) throw(RuntimeException) +OUString java_sql_Driver::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.sdbc.JDBCDriver"); + return OUString("com.sun.star.comp.sdbc.JDBCDriver"); // this name is referenced in the configuration and in the jdbc.xml // Please take care when changing it. } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > java_sql_Driver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); return aSNS; } //------------------------------------------------------------------ @@ -71,17 +71,17 @@ Sequence< ::rtl::OUString > java_sql_Driver::getSupportedServiceNames_Static( ) return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory))); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_Driver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL java_sql_Driver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_Driver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -89,12 +89,12 @@ sal_Bool SAL_CALL java_sql_Driver::supportsService( const ::rtl::OUString& _rSer } // -------------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // ------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL java_sql_Driver::connect( const ::rtl::OUString& url, const +Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { m_aLogger.log( LogLevel::INFO, STR_LOG_DRIVER_CONNECTING_URL, url ); @@ -112,7 +112,7 @@ Reference< XConnection > SAL_CALL java_sql_Driver::connect( const ::rtl::OUStrin return xOut; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { // don't ask the real driver for the url // I feel responsible for all jdbc url's @@ -121,112 +121,112 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const ::rtl::OUString& url ) thro return bEnabled && url.startsWith("jdbc:"); } // ------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const ::rtl::OUString& url, +Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( acceptsURL(url) ) { ::std::vector< DriverPropertyInfo > aDriverInfo; - Sequence< ::rtl::OUString > aBooleanValues(2); - aBooleanValues[0] = ::rtl::OUString( "false" ); - aBooleanValues[1] = ::rtl::OUString( "true" ); + Sequence< OUString > aBooleanValues(2); + aBooleanValues[0] = OUString( "false" ); + aBooleanValues[1] = OUString( "true" ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("JavaDriverClass") - ,::rtl::OUString("The JDBC driver class name.") + OUString("JavaDriverClass") + ,OUString("The JDBC driver class name.") ,sal_True - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("JavaDriverClassPath") - ,::rtl::OUString("The class path where to look for the JDBC driver.") + OUString("JavaDriverClassPath") + ,OUString("The class path where to look for the JDBC driver.") ,sal_True - ,::rtl::OUString( "" ) - ,Sequence< ::rtl::OUString >()) + ,OUString( "" ) + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("SystemProperties") - ,::rtl::OUString("Additional properties to set at java.lang.System before loading the driver.") + OUString("SystemProperties") + ,OUString("Additional properties to set at java.lang.System before loading the driver.") ,sal_True - ,::rtl::OUString( "" ) - ,Sequence< ::rtl::OUString >()) + ,OUString( "" ) + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ParameterNameSubstitution") - ,::rtl::OUString("Change named parameters with '?'.") + OUString("ParameterNameSubstitution") + ,OUString("Change named parameters with '?'.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("IgnoreDriverPrivileges") - ,::rtl::OUString("Ignore the privileges from the database driver.") + OUString("IgnoreDriverPrivileges") + ,OUString("Ignore the privileges from the database driver.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("IsAutoRetrievingEnabled") - ,::rtl::OUString("Retrieve generated values.") + OUString("IsAutoRetrievingEnabled") + ,OUString("Retrieve generated values.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("AutoRetrievingStatement") - ,::rtl::OUString("Auto-increment statement.") + OUString("AutoRetrievingStatement") + ,OUString("Auto-increment statement.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("GenerateASBeforeCorrelationName") - ,::rtl::OUString("Generate AS before table correlation names.") + OUString("GenerateASBeforeCorrelationName") + ,OUString("Generate AS before table correlation names.") ,sal_False - ,::rtl::OUString( "true" ) + ,OUString( "true" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("IgnoreCurrency") - ,::rtl::OUString("Ignore the currency field from the ResultsetMetaData.") + OUString("IgnoreCurrency") + ,OUString("Ignore the currency field from the ResultsetMetaData.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("EscapeDateTime") - ,::rtl::OUString("Escape date time format.") + OUString("EscapeDateTime") + ,OUString("Escape date time format.") ,sal_False - ,::rtl::OUString( "true" ) + ,OUString( "true" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("TypeInfoSettings") - ,::rtl::OUString("Defines how the type info of the database metadata should be manipulated.") + OUString("TypeInfoSettings") + ,OUString("Defines how the type info of the database metadata should be manipulated.") ,sal_False - ,::rtl::OUString( ) - ,Sequence< ::rtl::OUString > ()) + ,OUString( ) + ,Sequence< OUString > ()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ImplicitCatalogRestriction") - ,::rtl::OUString("The catalog which should be used in getTables calls, when the caller passed NULL.") + OUString("ImplicitCatalogRestriction") + ,OUString("The catalog which should be used in getTables calls, when the caller passed NULL.") ,sal_False - ,::rtl::OUString( ) - ,Sequence< ::rtl::OUString > ()) + ,OUString( ) + ,Sequence< OUString > ()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ImplicitSchemaRestriction") - ,::rtl::OUString("The schema which should be used in getTables calls, when the caller passed NULL.") + OUString("ImplicitSchemaRestriction") + ,OUString("The schema which should be used in getTables calls, when the caller passed NULL.") ,sal_False - ,::rtl::OUString( ) - ,Sequence< ::rtl::OUString > ()) + ,OUString( ) + ,Sequence< OUString > ()) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); return Sequence< DriverPropertyInfo >(); } diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index e0d4c45b727a..d4ec58907326 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -170,7 +170,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) OSL_ENSURE( m_pConnection && m_pConnection->isAutoRetrievingEnabled(),"Illegal call here. isAutoRetrievingEnabled is false!"); if ( m_pConnection ) { - ::rtl::OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement); + OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement); if ( !sStmt.isEmpty() ) { m_aLogger.log( LogLevel::FINER, STR_LOG_GENERATED_VALUES_FALLBACK, sStmt ); @@ -219,7 +219,7 @@ void SAL_CALL java_sql_Statement::clearBatch( ) throw(::com::sun::star::sdbc::S } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL java_sql_Statement_Base::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_STATEMENT, sql ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -253,7 +253,7 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const ::rtl::OUString& sql ) } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -303,7 +303,7 @@ Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) throw(Runt } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_Statement::addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -337,7 +337,7 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(::com: // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -473,7 +473,7 @@ sal_Int32 java_sql_Statement_Base::getMaxFieldSize() throw(SQLException, Runtime return impl_getProperty("getMaxFieldSize",mID); } //------------------------------------------------------------------------------ -::rtl::OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeException) +OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -487,7 +487,7 @@ sal_Int32 java_sql_Statement_Base::getMaxFieldSize() throw(SQLException, Runtime catch(const SQLException&) { } - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLException, RuntimeException) @@ -578,7 +578,7 @@ void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLExceptio callVoidMethodWithIntArg("setMaxFieldSize",mID,_par0,true); } //------------------------------------------------------------------------------ -void java_sql_Statement_Base::setCursorName(const ::rtl::OUString &_par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -596,7 +596,7 @@ void java_sql_Statement_Base::setCursorName(const ::rtl::OUString &_par0) throw( Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 9395a11771ac..ed6d2ea03de2 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -151,7 +151,7 @@ void java_lang_Object::saveRef( JNIEnv * pXEnv, jobject myObj ) } -::rtl::OUString java_lang_Object::toString() const +OUString java_lang_Object::toString() const { static jmethodID mID(NULL); return callStringMethod("toString",mID); @@ -183,12 +183,12 @@ namespace #if OSL_DEBUG_LEVEL > 0 pThrow->printStackTrace(); #endif - ::rtl::OUString sMessage = pThrow->getMessage(); + OUString sMessage = pThrow->getMessage(); if ( sMessage.isEmpty() ) sMessage = pThrow->getLocalizedMessage(); if( sMessage.isEmpty() ) sMessage = pThrow->toString(); - _out_rException = SQLException( sMessage, _rxContext, ::rtl::OUString(), -1, Any() ); + _out_rException = SQLException( sMessage, _rxContext, OUString(), -1, Any() ); return true; } else @@ -328,7 +328,7 @@ void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmet ThrowSQLException( t.pEnv, NULL ); } // ----------------------------------------------------------------------------- -::rtl::OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const +OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const { SDBThreadAttach t; OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" ); @@ -358,7 +358,7 @@ jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char* return out; } // ----------------------------------------------------------------------------- -::rtl::OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const +OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const { SDBThreadAttach t; OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" ); @@ -366,7 +366,7 @@ jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char* return JavaString2String( t.pEnv, out ); } // ------------------------------------------------------------------------- -void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const ::rtl::OUString& _nArgument ) const +void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const { SDBThreadAttach t; OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" ); @@ -378,7 +378,7 @@ void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jm ThrowSQLException( t.pEnv, NULL ); } // ------------------------------------------------------------------------- -sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const ::rtl::OUString& _nArgument ) const +sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const { SDBThreadAttach t; OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethodWithStringArg: no Java enviroment anymore!" ); diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 22966688ee23..0458ad7d5af4 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::lang; //************************************************************** IMPLEMENT_SERVICE_INFO(java_sql_PreparedStatement,"com.sun.star.sdbcx.JPreparedStatement","com.sun.star.sdbc.PreparedStatement"); -java_sql_PreparedStatement::java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const ::rtl::OUString& sql ) +java_sql_PreparedStatement::java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const OUString& sql ) : OStatement_BASE2( pEnv, _rCon ) { m_sSqlStatement = sql; @@ -111,7 +111,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(::com::su } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -346,7 +346,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter { ORowSetValue aValue; aValue.fill(x); - const ::rtl::OUString sValue = aValue; + const OUString sValue = aValue; if ( !sValue.isEmpty() ) pBigDecimal.reset(new java_math_BigDecimal(sValue)); else @@ -370,7 +370,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const ::rtl::OUString& /*typeName*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -387,9 +387,9 @@ void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, c { if(!::dbtools::implSetObject(this,parameterIndex,x)) { - const ::rtl::OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( STR_UNKNOWN_PARA_TYPE, - "$position$", ::rtl::OUString::valueOf(parameterIndex) + "$position$", OUString::valueOf(parameterIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx index 46c95a58353f..cc7bbcd0a7a3 100644 --- a/connectivity/source/drivers/jdbc/Ref.cxx +++ b/connectivity/source/drivers/jdbc/Ref.cxx @@ -43,7 +43,7 @@ jclass java_sql_Ref::getMyClass() const return theClass; } -::rtl::OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { static jmethodID mID(NULL); return callStringMethod("getBaseTypeName",mID); diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 035b3306e219..13b9de190fe2 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -135,7 +135,7 @@ m_xMetaData.clear(); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::findColumn" ); static jmethodID mID(NULL); @@ -340,7 +340,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen if ( t.pEnv->IsInstanceOf(out,java_lang_String::st_getMyClass()) ) { java_lang_String aVal(t.pEnv,out); - aRet <<= (::rtl::OUString)aVal; + aRet <<= (OUString)aVal; } else if ( t.pEnv->IsInstanceOf(out,java_lang_Boolean::st_getMyClass()) ) { @@ -381,7 +381,7 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::getString" ); static jmethodID mID(NULL); @@ -687,7 +687,7 @@ void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::updateString" ); SDBThreadAttach t; @@ -841,9 +841,9 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::c if(!::dbtools::implUpdateObject(this,columnIndex,x)) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_UNKNOWN_COLUMN_TYPE, - "$position$", ::rtl::OUString::valueOf(columnIndex) + "$position$", OUString::valueOf(columnIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } @@ -921,7 +921,7 @@ sal_Int32 java_sql_ResultSet::getFetchSize() const throw(::com::sun::star::sdbc: return callIntMethod("getFetchSize",mID,true); } //------------------------------------------------------------------------------ -::rtl::OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::getCursorName" ); static jmethodID mID(NULL); @@ -956,7 +956,7 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s Sequence< Property > aProps(5); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP1IMPL(CURSORNAME, OUString) PropertyAttribute::READONLY); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index 351099937dfd..62ee5728dd19 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -94,7 +94,7 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column return callBooleanMethodWithIntArg( "isCaseSensitive", mID,column ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getSchemaName" ); static jmethodID mID(NULL); @@ -102,42 +102,42 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getColumnName",mID,column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getTableName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getTableName",mID,column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getCatalogName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getCatalogName",mID,column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnTypeName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getColumnTypeName",mID,column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnLabel" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getColumnLabel",mID,column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnServiceName" ); static jmethodID mID(NULL); diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx index 59e57f333278..c8857ab2beef 100644 --- a/connectivity/source/drivers/jdbc/SQLException.cxx +++ b/connectivity/source/drivers/jdbc/SQLException.cxx @@ -76,7 +76,7 @@ starsdbc::SQLException java_sql_SQLException_BASE::getNextException() const return starsdbc::SQLException(); } -::rtl::OUString java_sql_SQLException_BASE::getSQLState() const +OUString java_sql_SQLException_BASE::getSQLState() const { static jmethodID mID(NULL); return callStringMethod("getSQLState",mID); diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx index fbc33d360a03..ce9d464ecf3e 100644 --- a/connectivity/source/drivers/jdbc/String.cxx +++ b/connectivity/source/drivers/jdbc/String.cxx @@ -42,11 +42,11 @@ jclass java_lang_String::st_getMyClass() } //-------------------------------------------------------------------------- -java_lang_String::operator ::rtl::OUString() +java_lang_String::operator OUString() { SDBThreadAttach t; if(!t.pEnv) - return ::rtl::OUString(); + return OUString(); return JavaString2String(t.pEnv,(jstring)object); } diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx index e943aec88067..90b4a015e673 100644 --- a/connectivity/source/drivers/jdbc/Throwable.cxx +++ b/connectivity/source/drivers/jdbc/Throwable.cxx @@ -42,14 +42,14 @@ jclass java_lang_Throwable::st_getMyClass() } // ----------------------------------------------------------------------------- -::rtl::OUString java_lang_Throwable::getMessage() const +OUString java_lang_Throwable::getMessage() const { static jmethodID mID(NULL); return callStringMethod("getMessage",mID); } // ----------------------------------------------------------------------------- -::rtl::OUString java_lang_Throwable::getLocalizedMessage() const +OUString java_lang_Throwable::getLocalizedMessage() const { static jmethodID mID(NULL); return callStringMethod("getLocalizedMessage",mID); diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index 1d541d8f4f2a..a1d1bcd5e92e 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.cxx @@ -36,7 +36,7 @@ java_sql_Date::java_sql_Date( const ::com::sun::star::util::Date& _rOut ) : java return; jvalue args[1]; // Convert parameters - ::rtl::OUString sDateStr; + OUString sDateStr; sDateStr = ::dbtools::DBTypeConversion::toDateString(_rOut); args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr); @@ -102,7 +102,7 @@ java_sql_Time::java_sql_Time( const ::com::sun::star::util::Time& _rOut ): java_ return; jvalue args[1]; // Convert parameters - ::rtl::OUString sDateStr; + OUString sDateStr; sDateStr = ::dbtools::DBTypeConversion::toTimeString(_rOut); args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr); @@ -155,7 +155,7 @@ java_sql_Timestamp::java_sql_Timestamp(const ::com::sun::star::util::DateTime& _ return; jvalue args[1]; // Convert parameters - ::rtl::OUString sDateStr; + OUString sDateStr; sDateStr = ::dbtools::DBTypeConversion::toDateTimeString(_rOut); args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr); diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index 90302e3a0004..53358a6cf7b6 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -21,7 +21,6 @@ #include using namespace connectivity; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index ee4cac4a7585..02a8094ae36d 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -void java_util_Properties::setProperty(const ::rtl::OUString key, const ::rtl::OUString& value) +void java_util_Properties::setProperty(const OUString key, const OUString& value) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); jobject out(0); @@ -92,7 +92,7 @@ java_util_Properties::java_util_Properties( ): java_lang_Object( NULL, (jobject) } // -------------------------------------------------------------------------------- -jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const ::rtl::OUString& _rTemp) +jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& _rTemp) { OSL_ENSURE(pEnv,"Environment is NULL!"); jstring pStr = pEnv->NewString(_rTemp.getStr(), _rTemp.getLength()); @@ -145,7 +145,7 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr && pBegin->Name.compareToAscii( "RespectDriverResultSetType" ) ) { - ::rtl::OUString aStr; + OUString aStr; OSL_VERIFY( pBegin->Value >>= aStr ); pProps->setProperty(pBegin->Name,aStr); } @@ -153,15 +153,15 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr return pProps; } // -------------------------------------------------------------------------------- -::rtl::OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring _Str) +OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring _Str) { - ::rtl::OUString aStr; + OUString aStr; if(_Str) { jboolean bCopy(sal_True); const jchar* pChar = pEnv->GetStringChars(_Str,&bCopy); jsize len = pEnv->GetStringLength(_Str); - aStr = ::rtl::OUString(pChar,len); + aStr = OUString(pChar,len); if(bCopy) pEnv->ReleaseStringChars(_Str,pChar); @@ -174,7 +174,7 @@ jobject connectivity::convertTypeMapToJavaMap(JNIEnv* /*pEnv*/,const Reference< { if ( _rMap.is() ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = _rMap->getElementNames(); + ::com::sun::star::uno::Sequence< OUString > aNames = _rMap->getElementNames(); if ( aNames.getLength() > 0 ) ::dbtools::throwFeatureNotImplementedException( "Type maps", NULL ); } @@ -197,7 +197,7 @@ sal_Bool connectivity::isExceptionOccurred(JNIEnv *pEnv,sal_Bool _bClear) { java_sql_SQLException_BASE* pException = new java_sql_SQLException_BASE(pEnv,pThrowable); - ::rtl::OUString sError = pException->getMessage(); + OUString sError = pException->getMessage(); delete pException; } #else diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx index de5be71cdc23..fb6e330fac6a 100644 --- a/connectivity/source/drivers/kab/KCatalog.cxx +++ b/connectivity/source/drivers/kab/KCatalog.cxx @@ -42,18 +42,18 @@ KabCatalog::KabCatalog(KabConnection* _pCon) void KabCatalog::refreshTables() { TStringVector aVector; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables( Any(), - ::rtl::OUString("%"), - ::rtl::OUString("%"), + OUString("%"), + OUString("%"), aTypes); if (xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aName; + OUString aName; while (xResult->next()) { diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx index 5ab9598073ee..a73f813d357f 100644 --- a/connectivity/source/drivers/kab/KColumns.cxx +++ b/connectivity/source/drivers/kab/KColumns.cxx @@ -35,12 +35,12 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -sdbcx::ObjectType KabColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType KabColumns::createObject(const OUString& _rName) { const Any aCatalog; - const ::rtl::OUString sCatalogName; - const ::rtl::OUString sSchemaName(m_pTable->getSchema()); - const ::rtl::OUString sTableName(m_pTable->getTableName()); + const OUString sCatalogName; + const OUString sSchemaName(m_pTable->getSchema()); + const OUString sTableName(m_pTable->getTableName()); Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns( aCatalog, sSchemaName, sTableName, _rName); diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx index 5e3cfdce365a..67bde9627db1 100644 --- a/connectivity/source/drivers/kab/KColumns.hxx +++ b/connectivity/source/drivers/kab/KColumns.hxx @@ -32,7 +32,7 @@ namespace connectivity protected: KabTable* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx index ffabd1e1c42c..0e0cc690083b 100644 --- a/connectivity/source/drivers/kab/KConnection.cxx +++ b/connectivity/source/drivers/kab/KConnection.cxx @@ -61,7 +61,7 @@ void SAL_CALL KabConnection::release() throw() relase_ChildImpl(); } // ----------------------------------------------------------------------------- -void KabConnection::construct(const ::rtl::OUString&, const Sequence< PropertyValue >&) throw(SQLException) +void KabConnection::construct(const OUString&, const Sequence< PropertyValue >&) throw(SQLException) { osl_atomic_increment( &m_refCount ); @@ -87,7 +87,7 @@ Reference< XStatement > SAL_CALL KabConnection::createStatement( ) throw(SQLExc return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -99,7 +99,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const ::rtl::OUString& ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -108,7 +108,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const ::rtl return NULL; } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here @@ -191,7 +191,7 @@ sal_Bool SAL_CALL KabConnection::isReadOnly( ) throw(SQLException, RuntimeExcep return sal_False; } // -------------------------------------------------------------------------------- -void SAL_CALL KabConnection::setCatalog( const ::rtl::OUString& ) throw(SQLException, RuntimeException) +void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -199,14 +199,14 @@ void SAL_CALL KabConnection::setCatalog( const ::rtl::OUString& ) throw(SQLExcep // if your database doesn't work with catalogs you go to next method otherwise you kjnow what to do } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabConnection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); // return your current catalog - return ::rtl::OUString(); + return OUString(); } // -------------------------------------------------------------------------------- void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index b14bbac334f9..0c3244355db7 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.hxx @@ -74,7 +74,7 @@ namespace connectivity m_xCatalog; // needed for the SQL interpreter public: - virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); KabConnection(KabDriver* _pDriver); virtual ~KabConnection(); @@ -92,9 +92,9 @@ namespace connectivity // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -103,8 +103,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx index 304ef30d0833..486eaff38e66 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx @@ -49,17 +49,17 @@ KabDatabaseMetaData::~KabDatabaseMetaData() { } // ------------------------------------------------------------------------- -const ::rtl::OUString & KabDatabaseMetaData::getAddressBookTableName() +const OUString & KabDatabaseMetaData::getAddressBookTableName() { - static const ::rtl::OUString aAddressBookTableName - (::rtl::OUString::createFromAscii( i18n("Address Book") )); + static const OUString aAddressBookTableName + (OUString::createFromAscii( i18n("Address Book") )); return aAddressBookTableName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; if (m_bUseCatalog) { // do some special here for you database } @@ -197,25 +197,25 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLE return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; if (m_bUseCatalog) { } return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) { // normally this is " - ::rtl::OUString aVal("\""); + OUString aVal("\""); return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- @@ -552,53 +552,53 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(S return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { // if someday we support more than the default address book, // this method should return the URL which was used to create it - ::rtl::OUString aValue( "sdbc:address:kab:" ); + OUString aValue( "sdbc:address:kab:" ); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue( "kab" ); + OUString aValue( "kab" ); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { - ::rtl::OUString aValue(KAB_DRIVER_VERSION); + OUString aValue(KAB_DRIVER_VERSION); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- @@ -617,36 +617,36 @@ sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeE return KAB_DRIVER_VERSION_MINOR; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) @@ -781,7 +781,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) throw(SQ Reference< XResultSet > xRef = pResult; static ODatabaseMetaDataResultSet::ORows aRows; - static const ::rtl::OUString aTable("TABLE"); + static const OUString aTable("TABLE"); if (aRows.empty()) { @@ -805,7 +805,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) throw(SQLE ODatabaseMetaDataResultSet::ORow aRow(19); aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue(); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("CHAR")); + aRow[1] = new ORowSetValueDecorator(OUString("CHAR")); aRow[2] = new ORowSetValueDecorator(DataType::CHAR); aRow[3] = new ORowSetValueDecorator((sal_Int32) 254); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); @@ -842,17 +842,17 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas( ) throw(SQLEx } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, - const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString&, + const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( const Any&, - const ::rtl::OUString&, - const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern) throw(SQLException, RuntimeException) + const OUString&, + const OUString& tableNamePattern, + const OUString& columnNamePattern) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); Reference< XResultSet > xRef = pResult; @@ -876,11 +876,11 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( aRow[14] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[15] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[16] = new ORowSetValueDecorator((sal_Int32) 254); - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); sal_Int32 nPosition = 1; QString aQtName; - ::rtl::OUString sName; + OUString sName; aQtName = ::KABC::Addressee::revisionLabel(); sName = (const sal_Unicode *) aQtName.ucs2(); @@ -888,7 +888,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( { aRow[4] = new ORowSetValueDecorator(sName); aRow[5] = new ORowSetValueDecorator(DataType::TIMESTAMP); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[6] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRow[17] = new ORowSetValueDecorator(nPosition++); aRows.push_back(aRow); } @@ -906,7 +906,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( { aRow[4] = new ORowSetValueDecorator(sName); aRow[5] = new ORowSetValueDecorator(DataType::CHAR); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("CHAR")); + aRow[6] = new ORowSetValueDecorator(OUString("CHAR")); aRow[7] = new ORowSetValueDecorator((sal_Int32) 256); // Might be VARCHAR and not CHAR[256]... aRow[17] = new ORowSetValueDecorator(nPosition); @@ -920,9 +920,9 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( const Any&, - const ::rtl::OUString&, - const ::rtl::OUString&, - const Sequence< ::rtl::OUString >& types) throw(SQLException, RuntimeException) + const OUString&, + const OUString&, + const Sequence< OUString >& types) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables); Reference< XResultSet > xRef = pResult; @@ -930,9 +930,9 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( // check whether we have tables in the requested types // for the moment, we answer only the "TABLE" table type // when no types are given at all, we return all the tables - static const ::rtl::OUString aTable("TABLE"); + static const OUString aTable("TABLE"); sal_Bool bTableFound = sal_False; - const ::rtl::OUString* p = types.getConstArray(), + const OUString* p = types.getConstArray(), * pEnd = p + types.getLength(); if (p == pEnd) @@ -970,21 +970,21 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, + const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, + const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); @@ -996,14 +996,14 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( { ODatabaseMetaDataResultSet::ORow aRow( 9 ); QString aQtName = ::KABC::Addressee::revisionLabel(); - ::rtl::OUString sName = (const sal_Unicode *) aQtName.ucs2(); + OUString sName = (const sal_Unicode *) aQtName.ucs2(); aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[1] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[2] = new ORowSetValueDecorator(sName); aRow[3] = new ORowSetValueDecorator(DataType::TIMESTAMP); - aRow[4] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[4] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[6] = ODatabaseMetaDataResultSet::getEmptyValue(); @@ -1017,52 +1017,52 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, + const Any&, const OUString&, const OUString&, sal_Bool, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, + const Any&, const OUString&, const OUString&, sal_Int32, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString&, const Any&, - const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, + const OUString&, const Any&, + const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException) { OSL_FAIL("Not implemented yet!"); throw SQLException(); diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx index 0e3787b5de60..6cd891493889 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx @@ -42,24 +42,24 @@ namespace connectivity public: KabDatabaseMetaData(KabConnection* _pCon); - static const ::rtl::OUString & getAddressBookTableName(); + static const OUString & getAddressBookTableName(); virtual ~KabDatabaseMetaData(); // this interface is really BIG // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -72,14 +72,14 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -107,11 +107,11 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -165,23 +165,23 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -194,7 +194,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index d086838af909..44b946d1ea63 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -91,12 +91,12 @@ namespace if ( _rModule ) { // - const ::rtl::OUString sSymbolName = ::rtl::OUString::createFromAscii( _pAsciiSymbolName ); + const OUString sSymbolName = OUString::createFromAscii( _pAsciiSymbolName ); _rFunction = (FUNCTION)( osl_getSymbol( _rModule, sSymbolName.pData ) ); if ( !_rFunction ) { // did not find the symbol - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; aBuf.append( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ); aBuf.append( _pAsciiSymbolName ); OSL_FAIL( aBuf.makeStringAndClear().getStr() ); @@ -119,7 +119,7 @@ bool KabImplModule::impl_loadModule() OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc && !m_pApplicationInitFunc && !m_pApplicationShutdownFunc && !m_pKDEVersionCheckFunc, "KabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!"); - const ::rtl::OUString sModuleName( SAL_MODULENAME( "kabdrv1" )); + const OUString sModuleName( SAL_MODULENAME( "kabdrv1" )); m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# OSL_ENSURE( m_hConnectorModule, "KabImplModule::impl_loadModule: could not load the implementation library!" ); if ( !m_hConnectorModule ) @@ -184,17 +184,17 @@ bool KabImplModule::impl_doAllowNewKDEVersion() com::sun::star::configuration::theDefaultProvider::get( m_xContext ) ); Sequence< Any > aCreationArgs(1); aCreationArgs[0] <<= PropertyValue( - ::rtl::OUString( "nodepath" ), + OUString( "nodepath" ), 0, makeAny( KabDriver::impl_getConfigurationSettingsPath() ), PropertyState_DIRECT_VALUE ); Reference< XPropertySet > xSettings( xConfigProvider->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" ), + OUString( "com.sun.star.configuration.ConfigurationAccess" ), aCreationArgs ), UNO_QUERY_THROW ); sal_Bool bDisableCheck = sal_False; - xSettings->getPropertyValue( ::rtl::OUString( "DisableKDEMaximumVersionCheck" ) ) >>= bDisableCheck; + xSettings->getPropertyValue( OUString( "DisableKDEMaximumVersionCheck" ) ) >>= bDisableCheck; return bDisableCheck != sal_False; } @@ -209,7 +209,7 @@ bool KabImplModule::impl_doAllowNewKDEVersion() void KabImplModule::impl_throwNoKdeException() { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_NO_KDE_INST ) ); impl_throwGenericSQLException( sError ); @@ -219,20 +219,20 @@ void KabImplModule::impl_throwNoKdeException() void KabImplModule::impl_throwKdeTooOldException() { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_KDE_VERSION_TOO_OLD, - "$major$",::rtl::OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MAJOR), - "$minor$",::rtl::OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MINOR) + "$major$",OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MAJOR), + "$minor$",OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MINOR) ) ); impl_throwGenericSQLException( sError ); } // -------------------------------------------------------------------------------- -void KabImplModule::impl_throwGenericSQLException( const ::rtl::OUString& _rMessage ) +void KabImplModule::impl_throwGenericSQLException( const OUString& _rMessage ) { SQLException aError; aError.Message = _rMessage; - aError.SQLState = ::rtl::OUString( "S1000" ); + aError.SQLState = OUString( "S1000" ); aError.ErrorCode = 0; throw aError; } @@ -245,14 +245,14 @@ void KabImplModule::impl_throwKdeTooNewException() SQLException aError; aError.Message = aResources.getResourceStringWithSubstitution( STR_KDE_VERSION_TOO_NEW, - "$major$",::rtl::OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MAJOR), - "$minor$",::rtl::OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MINOR) + "$major$",OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MAJOR), + "$minor$",OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MINOR) ); - aError.SQLState = ::rtl::OUString( "S1000" ); + aError.SQLState = OUString( "S1000" ); aError.ErrorCode = 0; SQLContext aDetails; - ::rtl::OUStringBuffer aMessage; + OUStringBuffer aMessage; aMessage.append( aResources.getResourceString(STR_KDE_VERSION_TOO_NEW_WORK_AROUND) ); aMessage.appendAscii( "Sub disableKDEMaxVersionCheck\n" ); @@ -340,43 +340,43 @@ void KabDriver::disposing() } // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString KabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString KabDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii( impl_getAsciiImplementationName() ); + return OUString::createFromAscii( impl_getAsciiImplementationName() ); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > KabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > KabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported // for more information @see com.sun.star.sdbc.Driver - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL KabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL KabDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL KabDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); while (pSupported != pEnd && !pSupported->equals(_rServiceName)) ++pSupported; return pSupported != pEnd; } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL KabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL KabDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL KabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -399,7 +399,7 @@ Reference< XConnection > SAL_CALL KabDriver::connect( const ::rtl::OUString& url return xConnection; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL KabDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -411,7 +411,7 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const ::rtl::OUString& url ) return url.startsWith("sdbc:address:kab:"); } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const ::rtl::OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) { // if you have something special to say, return it here :-) return Sequence< DriverPropertyInfo >(); @@ -449,9 +449,9 @@ const sal_Char* KabDriver::impl_getAsciiImplementationName() // Please be careful when changing it. } // -------------------------------------------------------------------------------- -::rtl::OUString KabDriver::impl_getConfigurationSettingsPath() +OUString KabDriver::impl_getConfigurationSettingsPath() { - ::rtl::OUStringBuffer aPath; + OUStringBuffer aPath; aPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" ); aPath.appendAscii( "com.sun.star.comp.sdbc.kab.Driver" ); return aPath.makeStringAndClear(); diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index 678f5a835924..5b7614116a77 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.hxx @@ -132,7 +132,7 @@ namespace connectivity /** throws a generic SQL exception with SQLState S1000 and error code 0 */ - void impl_throwGenericSQLException( const ::rtl::OUString& _rMessage ); + void impl_throwGenericSQLException( const OUString& _rMessage ); /** determines whether it's allowed to run on a too-new (not confirmed to work) version */ @@ -159,8 +159,8 @@ namespace connectivity static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext() const { return m_xContext; } @@ -171,7 +171,7 @@ namespace connectivity /** returns the path of our configuration settings */ - static ::rtl::OUString impl_getConfigurationSettingsPath(); + static OUString impl_getConfigurationSettingsPath(); protected: KabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); @@ -180,14 +180,14 @@ namespace connectivity virtual void SAL_CALL disposing(void); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx index be7efa0224fc..85a254b6b69c 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx @@ -53,7 +53,7 @@ void KabPreparedStatement::setKabFields() const throw(SQLException) if (!xColumns.is()) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_INVALID_COLUMN_SELECTION ) ); ::dbtools::throwGenericSQLException(sError,NULL); @@ -66,12 +66,12 @@ void KabPreparedStatement::resetParameters() const throw(SQLException) m_nParameterIndex = 0; } // ------------------------------------------------------------------------- -void KabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const throw(SQLException) +void KabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException) { if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size()) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_INVALID_PARA_COUNT ) ); ::dbtools::throwGenericSQLException(sError,*(KabPreparedStatement *) this); @@ -84,7 +84,7 @@ void KabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const t // ------------------------------------------------------------------------- KabPreparedStatement::KabPreparedStatement( KabConnection* _pConnection, - const ::rtl::OUString& sql) + const OUString& sql) : KabPreparedStatement_BASE(_pConnection), m_sSqlStatement(sql), m_bPrepared(sal_False), @@ -187,7 +187,7 @@ void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) (m_aParameterRow->get())[parameterIndex - 1].setNull(); } // ------------------------------------------------------------------------- -void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException) { @@ -251,7 +251,7 @@ void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLExcept ::dbtools::throwFunctionNotSupportedException("setDouble", NULL); } // ------------------------------------------------------------------------- -void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const ::rtl::OUString &x) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx index 9011b29b9a8c..5c0d274d10bb 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.hxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx @@ -40,7 +40,7 @@ namespace connectivity class KabPreparedStatement : public KabPreparedStatement_BASE { protected: - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; ::rtl::Reference< KabResultSetMetaData > m_xMetaData; sal_Bool m_bPrepared; @@ -56,12 +56,12 @@ namespace connectivity const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); - virtual void getNextParameter(::rtl::OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); + virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); virtual ~KabPreparedStatement(); public: DECLARE_SERVICE_INFO(); - KabPreparedStatement(KabConnection* _pConnection, const ::rtl::OUString& sql); + KabPreparedStatement(KabConnection* _pConnection, const OUString& sql); // OComponentHelper virtual void SAL_CALL disposing(); @@ -77,7 +77,7 @@ namespace connectivity // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -85,7 +85,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index 5841932f2057..0ba7e01518c4 100644 --- a/connectivity/source/drivers/kab/KResultSet.cxx +++ b/connectivity/source/drivers/kab/KResultSet.cxx @@ -148,7 +148,7 @@ Sequence< Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException) return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL KabResultSet::findColumn(const ::rtl::OUString& columnName) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -164,7 +164,7 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const ::rtl::OUString& columnName) t return i; ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$",columnName ) ); @@ -175,12 +175,12 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const ::rtl::OUString& columnName) t return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString aRet; + OUString aRet; sal_Int32 nAddressees = m_aKabAddressees.size(); ::KABC::Field::List aFields = ::KABC::Field::allFields(); @@ -203,7 +203,7 @@ return aRet; if (!aQtName.isNull()) { m_bWasNull = false; - aRet = ::rtl::OUString((const sal_Unicode *) aQtName.ucs2()); + aRet = OUString((const sal_Unicode *) aQtName.ucs2()); return aRet; } } @@ -732,7 +732,7 @@ void SAL_CALL KabResultSet::updateDouble(sal_Int32, double) throw(SQLException, checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- -void SAL_CALL KabResultSet::updateString(sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -803,7 +803,7 @@ Any SAL_CALL KabResultSet::getBookmark() throw( SQLException, RuntimeException) if (m_nRowPos != -1 && m_nRowPos != nAddressees) { QString aQtName = m_aKabAddressees[m_nRowPos].uid(); - ::rtl::OUString sUniqueIdentifier = ::rtl::OUString((const sal_Unicode *) aQtName.ucs2()); + OUString sUniqueIdentifier = OUString((const sal_Unicode *) aQtName.ucs2()); return makeAny(sUniqueIdentifier); } return Any(); @@ -814,13 +814,13 @@ sal_Bool SAL_CALL KabResultSet::moveToBookmark(const Any& bookmark) throw( SQLE ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString sBookmark = comphelper::getString(bookmark); + OUString sBookmark = comphelper::getString(bookmark); sal_Int32 nAddressees = m_aKabAddressees.size(); for (sal_Int32 nRow = 0; nRow < nAddressees; nRow++) { QString aQtName = m_aKabAddressees[nRow].uid(); - ::rtl::OUString sUniqueIdentifier = ::rtl::OUString((const sal_Unicode *) aQtName.ucs2()); + OUString sUniqueIdentifier = OUString((const sal_Unicode *) aQtName.ucs2()); if (sUniqueIdentifier == sBookmark) { @@ -857,8 +857,8 @@ sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const Any& firstItem, const ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString sFirst = comphelper::getString(firstItem); - ::rtl::OUString sSecond = comphelper::getString(secondItem); + OUString sFirst = comphelper::getString(firstItem); + OUString sSecond = comphelper::getString(secondItem); if (sFirst < sSecond) return CompareBookmark::LESS; @@ -877,7 +877,7 @@ sal_Int32 SAL_CALL KabResultSet::hashBookmark(const Any& bookmark) throw( SQLEx ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString sBookmark = comphelper::getString(bookmark); + OUString sBookmark = comphelper::getString(bookmark); return sBookmark.hashCode(); } @@ -896,7 +896,7 @@ IPropertyArrayHelper* KabResultSet::createArrayHelper() const Sequence< Property > aProps(6); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP1IMPL(CURSORNAME, OUString) PropertyAttribute::READONLY); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index c6413b8a70cf..f4071342e0aa 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -141,7 +141,7 @@ namespace connectivity // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -190,7 +190,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -201,7 +201,7 @@ namespace connectivity virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx index 14fc35296b20..ed384ba19801 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx @@ -39,11 +39,11 @@ KabResultSetMetaData::~KabResultSetMetaData() void KabResultSetMetaData::setKabFields(const ::rtl::Reference &xColumns) throw(SQLException) { OSQLColumns::Vector::const_iterator aIter; - static const ::rtl::OUString aName("Name"); + static const OUString aName("Name"); for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter) { - ::rtl::OUString aFieldName; + OUString aFieldName; sal_uInt32 nFieldNumber; (*aIter)->getPropertyValue(aName) >>= aFieldName; @@ -72,12 +72,12 @@ sal_Bool SAL_CALL KabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLExce return sal_True; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL KabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException) +OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException) { sal_uInt32 nFieldNumber = m_aKabFields[column - 1]; ::KABC::Field::List aFields = ::KABC::Field::allFields(); @@ -91,34 +91,34 @@ sal_Bool SAL_CALL KabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLExce default: aQtName = aFields[nFieldNumber - KAB_DATA_FIELDS]->label(); } - ::rtl::OUString aName((const sal_Unicode *) aQtName.ucs2()); + OUString aName((const sal_Unicode *) aQtName.ucs2()); return aName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL KabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException) { return KabDatabaseMetaData::getAddressBookTableName(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL KabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL KabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL KabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL KabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL KabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL KabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx index 4738106f3e3a..4c341f324679 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx @@ -62,19 +62,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx index 66badd5bb624..e1174efa485d 100644 --- a/connectivity/source/drivers/kab/KServices.cxx +++ b/connectivity/source/drivers/kab/KServices.cxx @@ -22,7 +22,6 @@ #include using namespace connectivity::kab; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index b4933423bc92..99a08dd58b8e 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -32,7 +32,7 @@ #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -52,7 +52,7 @@ namespace void lcl_throwError(sal_uInt16 _nErrorId) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(_nErrorId) ); + const OUString sError( aResources.getResourceString(_nErrorId) ); ::dbtools::throwGenericSQLException(sError,NULL); } } @@ -85,7 +85,7 @@ void KabCommonStatement::resetParameters() const throw(::com::sun::star::sdbc::S lcl_throwError(STR_PARA_ONLY_PREPARED); } // ----------------------------------------------------------------------------- -void KabCommonStatement::getNextParameter(::rtl::OUString &) const throw(::com::sun::star::sdbc::SQLException) +void KabCommonStatement::getNextParameter(OUString &) const throw(::com::sun::star::sdbc::SQLException) { lcl_throwError(STR_PARA_ONLY_PREPARED); } @@ -124,14 +124,14 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse } else if (SQL_ISRULE(pLeft, column_ref)) { - ::rtl::OUString sColumnName, + OUString sColumnName, sTableRange; m_aSQLIterator.getColumnRange(pLeft, sColumnName, sTableRange); if (pRight->isToken() || SQL_ISRULE(pRight, parameter)) { - ::rtl::OUString sMatchString; + OUString sMatchString; if (pRight->isToken()) // WHERE Name = 'Doe' sMatchString = pRight->getTokenValue(); @@ -189,7 +189,7 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse SQL_ISTOKEN(pMiddleLeft, IS) && SQL_ISTOKEN(pRight, NULL)) { - ::rtl::OUString sColumnName, + OUString sColumnName, sTableRange; m_aSQLIterator.getColumnRange(pLeft, sColumnName, sTableRange); @@ -210,14 +210,14 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse { if (SQL_ISRULE(pLeft, column_ref)) { - ::rtl::OUString sColumnName, + OUString sColumnName, sTableRange; m_aSQLIterator.getColumnRange(pLeft, sColumnName, sTableRange); if (pMiddleRight->isToken() || SQL_ISRULE(pMiddleRight, parameter)) { - ::rtl::OUString sMatchString; + OUString sMatchString; if (pMiddleRight->isToken()) // WHERE Name LIKE 'Sm%' sMatchString = pMiddleRight->getTokenValue(); @@ -267,7 +267,7 @@ KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNo if (pColumnRef->count() == 1) { - ::rtl::OUString sColumnName = + OUString sColumnName = pColumnRef->getChild(0)->getTokenValue(); sal_Bool bAscending = SQL_ISTOKEN(pAscendingDescending, DESC)? @@ -388,7 +388,7 @@ void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException } // ------------------------------------------------------------------------- sal_Bool SAL_CALL KabCommonStatement::execute( - const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -399,7 +399,7 @@ sal_Bool SAL_CALL KabCommonStatement::execute( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery( - const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -408,7 +408,7 @@ OSL_TRACE("KDE Address book - SQL Request: %s", OUtoCStr(sql)); KabResultSet* pResult = new KabResultSet(this); Reference< XResultSet > xRS = pResult; - ::rtl::OUString aErr; + OUString aErr; m_pParseTree = m_aParser.parseTree(aErr, sql); if (m_pParseTree == NULL) @@ -448,7 +448,7 @@ Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQ return (Reference< XConnection >) m_pConnection; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const ::rtl::OUString& ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -480,7 +480,7 @@ void SAL_CALL KabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeE Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index 62a1b27f5795..3baadee733ea 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -52,7 +52,7 @@ namespace connectivity ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< ::rtl::OUString> m_aBatchList; + ::std::list< OUString> m_aBatchList; connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; connectivity::OSQLParseNode* m_pParseTree; @@ -87,7 +87,7 @@ namespace connectivity using OPropertySetHelper::getFastPropertyValue; virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); - virtual void getNextParameter(::rtl::OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); + virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); virtual ~KabCommonStatement(); public: @@ -116,11 +116,11 @@ namespace connectivity // XStatement virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( - const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL executeUpdate( - const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL execute( - const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx index 0014e7961acd..0469acbc61bd 100644 --- a/connectivity/source/drivers/kab/KTable.cxx +++ b/connectivity/source/drivers/kab/KTable.cxx @@ -36,11 +36,11 @@ using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- KabTable::KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName ) : KabTable_TYPEDEF(_pTables,sal_True, _Name, _Type, @@ -62,7 +62,7 @@ void KabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString("%")); + OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx index 63c33d162861..fb2b5a4241db 100644 --- a/connectivity/source/drivers/kab/KTable.hxx +++ b/connectivity/source/drivers/kab/KTable.hxx @@ -29,7 +29,7 @@ namespace connectivity { typedef connectivity::sdbcx::OTable KabTable_TYPEDEF; - ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); + OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class KabTable : public KabTable_TYPEDEF { @@ -39,19 +39,19 @@ namespace connectivity public: KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); KabConnection* getConnection() { return m_pConnection;} virtual void refreshColumns(); - ::rtl::OUString getTableName() const { return m_Name; } - ::rtl::OUString getSchema() const { return m_SchemaName; } + OUString getTableName() const { return m_Name; } + OUString getSchema() const { return m_SchemaName; } }; } } diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx index 52ed23db9ab3..285759543cbb 100644 --- a/connectivity/source/drivers/kab/KTables.cxx +++ b/connectivity/source/drivers/kab/KTables.cxx @@ -35,15 +35,15 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -sdbcx::ObjectType KabTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType KabTables::createObject(const OUString& _rName) { - ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString("%"); + OUString aName,aSchema; + aSchema = OUString("%"); aName = _rName; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); - ::rtl::OUString sEmpty; + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); + OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes); diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx index b3e59a44572d..73ca2fd7e048 100644 --- a/connectivity/source/drivers/kab/KTables.hxx +++ b/connectivity/source/drivers/kab/KTables.hxx @@ -32,7 +32,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx index 2aaf81736642..ab0273c7dbfc 100644 --- a/connectivity/source/drivers/kab/kcondition.cxx +++ b/connectivity/source/drivers/kab/kcondition.cxx @@ -50,7 +50,7 @@ sal_Bool KabConditionConstant::eval(const ::KABC::Addressee &) const return m_bValue; } // ----------------------------------------------------------------------------- -KabConditionColumn::KabConditionColumn(const ::rtl::OUString &sColumnName) throw(SQLException) +KabConditionColumn::KabConditionColumn(const OUString &sColumnName) throw(SQLException) : KabCondition(), m_nFieldNumber(findKabField(sColumnName)) { @@ -68,7 +68,7 @@ sal_Bool KabConditionColumn::isAlwaysFalse() const return sal_False; } // ----------------------------------------------------------------------------- -KabConditionNull::KabConditionNull(const ::rtl::OUString &sColumnName) throw(SQLException) +KabConditionNull::KabConditionNull(const OUString &sColumnName) throw(SQLException) : KabConditionColumn(sColumnName) { } @@ -82,7 +82,7 @@ sal_Bool KabConditionNull::eval(const ::KABC::Addressee &aAddressee) const // But it might do it someday } // ----------------------------------------------------------------------------- -KabConditionNotNull::KabConditionNotNull(const ::rtl::OUString &sColumnName) throw(SQLException) +KabConditionNotNull::KabConditionNotNull(const OUString &sColumnName) throw(SQLException) : KabConditionColumn(sColumnName) { } @@ -96,13 +96,13 @@ sal_Bool KabConditionNotNull::eval(const ::KABC::Addressee &aAddressee) const // But it might do it someday } // ----------------------------------------------------------------------------- -KabConditionCompare::KabConditionCompare(const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +KabConditionCompare::KabConditionCompare(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : KabConditionColumn(sColumnName), m_sMatchString(sMatchString) { } // ----------------------------------------------------------------------------- -KabConditionEqual::KabConditionEqual(const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +KabConditionEqual::KabConditionEqual(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : KabConditionCompare(sColumnName, sMatchString) { } @@ -117,11 +117,11 @@ sal_Bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const if (aQtName.isNull()) return sal_False; - ::rtl::OUString sValue((const sal_Unicode *) aQtName.ucs2()); + OUString sValue((const sal_Unicode *) aQtName.ucs2()); return sValue == m_sMatchString; } // ----------------------------------------------------------------------------- -KabConditionDifferent::KabConditionDifferent(const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +KabConditionDifferent::KabConditionDifferent(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : KabConditionCompare(sColumnName, sMatchString) { } @@ -132,11 +132,11 @@ sal_Bool KabConditionDifferent::eval(const ::KABC::Addressee &aAddressee) const if (aQtName.isNull()) return sal_False; - ::rtl::OUString sValue((const sal_Unicode *) aQtName.ucs2()); + OUString sValue((const sal_Unicode *) aQtName.ucs2()); return sValue != m_sMatchString; } // ----------------------------------------------------------------------------- -KabConditionSimilar::KabConditionSimilar(const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +KabConditionSimilar::KabConditionSimilar(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : KabConditionCompare(sColumnName, sMatchString) { } @@ -147,7 +147,7 @@ sal_Bool KabConditionSimilar::eval(const ::KABC::Addressee &aAddressee) const if (aQtName.isNull()) return sal_False; - ::rtl::OUString sValue((const sal_Unicode *) aQtName.ucs2()); + OUString sValue((const sal_Unicode *) aQtName.ucs2()); return match(m_sMatchString, sValue, '\0'); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index 04015aee2577..b9a60fb0e1a3 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -59,7 +59,7 @@ class KabConditionColumn : public KabCondition public: KabConditionColumn( - const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysFalse() const; }; @@ -68,7 +68,7 @@ class KabConditionNull : public KabConditionColumn { public: KabConditionNull( - const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- @@ -76,27 +76,27 @@ class KabConditionNotNull : public KabConditionColumn { public: KabConditionNotNull( - const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- class KabConditionCompare : public KabConditionColumn { protected: - const ::rtl::OUString m_sMatchString; + const OUString m_sMatchString; public: KabConditionCompare( - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); }; // ----------------------------------------------------------------------------- class KabConditionEqual : public KabConditionCompare { public: KabConditionEqual( - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- @@ -104,8 +104,8 @@ class KabConditionDifferent : public KabConditionCompare { public: KabConditionDifferent( - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- @@ -113,8 +113,8 @@ class KabConditionSimilar : public KabConditionCompare { public: KabConditionSimilar( - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx index a27d0acb9a21..e1576c6a1f42 100644 --- a/connectivity/source/drivers/kab/kfields.cxx +++ b/connectivity/source/drivers/kab/kfields.cxx @@ -44,13 +44,13 @@ QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNum } // ------------------------------------------------------------------------------ // search the KDE address book field number of a given column name -sal_uInt32 findKabField(const ::rtl::OUString& columnName) throw(SQLException) +sal_uInt32 findKabField(const OUString& columnName) throw(SQLException) { QString aQtName; - ::rtl::OUString aName; + OUString aName; aQtName = KABC::Addressee::revisionLabel(); - aName = ::rtl::OUString((const sal_Unicode *) aQtName.ucs2()); + aName = OUString((const sal_Unicode *) aQtName.ucs2()); if (columnName == aName) return KAB_FIELD_REVISION; @@ -63,14 +63,14 @@ sal_uInt32 findKabField(const ::rtl::OUString& columnName) throw(SQLException) ++aField, ++nResult) { aQtName = (*aField)->label(); - aName = ::rtl::OUString((const sal_Unicode *) aQtName.ucs2()); + aName = OUString((const sal_Unicode *) aQtName.ucs2()); if (columnName == aName) return nResult; } ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$",columnName ) ); diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx index d6a9ecb99fac..c50537959145 100644 --- a/connectivity/source/drivers/kab/kfields.hxx +++ b/connectivity/source/drivers/kab/kfields.hxx @@ -32,7 +32,7 @@ namespace connectivity namespace kab { QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNumber); - sal_uInt32 findKabField(const ::rtl::OUString& columnName) throw(::com::sun::star::sdbc::SQLException); + sal_uInt32 findKabField(const OUString& columnName) throw(::com::sun::star::sdbc::SQLException); } } diff --git a/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx index e3716c4d427b..3a8e42fcebeb 100644 --- a/connectivity/source/drivers/kab/korder.cxx +++ b/connectivity/source/drivers/kab/korder.cxx @@ -27,7 +27,7 @@ KabOrder::~KabOrder() { } // ----------------------------------------------------------------------------- -KabSimpleOrder::KabSimpleOrder(::rtl::OUString &sColumnName, sal_Bool bAscending) +KabSimpleOrder::KabSimpleOrder(OUString &sColumnName, sal_Bool bAscending) : KabOrder(), m_nFieldNumber(findKabField(sColumnName)), m_bAscending(bAscending) diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx index f00715c8f71f..2d1aecb481fc 100644 --- a/connectivity/source/drivers/kab/korder.hxx +++ b/connectivity/source/drivers/kab/korder.hxx @@ -44,7 +44,7 @@ namespace connectivity QString value(const ::KABC::Addressee &aAddressee) const; public: - KabSimpleOrder(::rtl::OUString &sColumnName, sal_Bool bAscending); + KabSimpleOrder(OUString &sColumnName, sal_Bool bAscending); virtual sal_Int32 compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const; }; diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx index 5f9d393d29cf..b337f4ccc79d 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.cxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx @@ -66,11 +66,11 @@ MacabAddressBook::~MacabAddressBook() /* Get the address book's default table name. This is the table name that * refers to the table containing _all_ records in the address book. */ -const ::rtl::OUString & MacabAddressBook::getDefaultTableName() +const OUString & MacabAddressBook::getDefaultTableName() { /* This string probably needs to be localized. */ - static const ::rtl::OUString aDefaultTableName - (::rtl::OUString("Address Book")); + static const OUString aDefaultTableName + (OUString("Address Book")); return aDefaultTableName; } @@ -93,7 +93,7 @@ MacabRecords *MacabAddressBook::getMacabRecords() /* Get the MacabRecords for a given name: either a group name or the * default table name. */ -MacabRecords *MacabAddressBook::getMacabRecords(const ::rtl::OUString _tableName) +MacabRecords *MacabAddressBook::getMacabRecords(const OUString _tableName) { if(_tableName == getDefaultTableName()) { @@ -106,7 +106,7 @@ MacabRecords *MacabAddressBook::getMacabRecords(const ::rtl::OUString _tableName } // ----------------------------------------------------------------------------- -MacabRecords *MacabAddressBook::getMacabRecordsMatch(const ::rtl::OUString _tableName) +MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString _tableName) { if(match(_tableName, getDefaultTableName(), '\0')) { @@ -155,7 +155,7 @@ MacabRecords *MacabAddressBook::getMacabRecordsMatch(const ::rtl::OUString _tabl } // ----------------------------------------------------------------------------- -MacabGroup *MacabAddressBook::getMacabGroup(::rtl::OUString _groupName) +MacabGroup *MacabAddressBook::getMacabGroup(OUString _groupName) { // initialize groups if not already initialized if(m_bRetrievedGroups == sal_False) @@ -179,7 +179,7 @@ MacabGroup *MacabAddressBook::getMacabGroup(::rtl::OUString _groupName) } // ----------------------------------------------------------------------------- -MacabGroup *MacabAddressBook::getMacabGroupMatch(::rtl::OUString _groupName) +MacabGroup *MacabAddressBook::getMacabGroupMatch(OUString _groupName) { // initialize groups if not already initialized if(m_bRetrievedGroups == sal_False) @@ -235,10 +235,10 @@ void MacabAddressBook::manageDuplicateGroups(::std::vector _xGroup // duplicate! if(count != 1) { - ::rtl::OUString sName = (*iter1)->getName(); - sName += ::rtl::OUString(" (") + - ::rtl::OUString::valueOf(count) + - ::rtl::OUString(")"); + OUString sName = (*iter1)->getName(); + sName += OUString(" (") + + OUString::valueOf(count) + + OUString(")"); (*iter1)->setName(sName); } } diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx index 92f65ae534f9..dbb9477669ff 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.hxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx @@ -46,16 +46,16 @@ namespace connectivity public: MacabAddressBook(); ~MacabAddressBook(); - static const ::rtl::OUString & getDefaultTableName(); + static const OUString & getDefaultTableName(); MacabRecords *getMacabRecords(); ::std::vector getMacabGroups(); - MacabGroup *getMacabGroup(::rtl::OUString _groupName); - MacabRecords *getMacabRecords(const ::rtl::OUString _tableName); + MacabGroup *getMacabGroup(OUString _groupName); + MacabRecords *getMacabRecords(const OUString _tableName); - MacabGroup *getMacabGroupMatch(::rtl::OUString _groupName); - MacabRecords *getMacabRecordsMatch(const ::rtl::OUString _tableName); + MacabGroup *getMacabGroupMatch(OUString _groupName); + MacabRecords *getMacabRecordsMatch(const OUString _tableName); }; } diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index 9bfe86a46ca0..1061782d9c93 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.cxx @@ -42,19 +42,19 @@ MacabCatalog::MacabCatalog(MacabConnection* _pCon) void MacabCatalog::refreshTables() { TStringVector aVector; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables( Any(), - ::rtl::OUString("%"), - ::rtl::OUString("%"), + OUString("%"), + OUString("%"), aTypes); if (xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aName; - // const ::rtl::OUString& sDot = MacabCatalog::getDot(); + OUString aName; + // const OUString& sDot = MacabCatalog::getDot(); while (xResult->next()) { @@ -82,9 +82,9 @@ void MacabCatalog::refreshUsers() { } // ------------------------------------------------------------------------- -const ::rtl::OUString& MacabCatalog::getDot() +const OUString& MacabCatalog::getDot() { - static const ::rtl::OUString sDot = ::rtl::OUString("."); + static const OUString sDot = OUString("."); return sDot; } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index e36b17490bdb..61cdec31b880 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.hxx @@ -38,7 +38,7 @@ namespace connectivity inline MacabConnection* getConnection() const { return m_pConnection; } - static const ::rtl::OUString& getDot(); + static const OUString& getDot(); // implementation of the pure virtual methods virtual void refreshTables(); diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index 107ab4575784..38d6e5606051 100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.cxx @@ -35,12 +35,12 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -sdbcx::ObjectType MacabColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType MacabColumns::createObject(const OUString& _rName) { const Any aCatalog; - const ::rtl::OUString sCatalogName; - const ::rtl::OUString sSchemaName(m_pTable->getSchema()); - const ::rtl::OUString sTableName(m_pTable->getTableName()); + const OUString sCatalogName; + const OUString sSchemaName(m_pTable->getSchema()); + const OUString sTableName(m_pTable->getTableName()); Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns( aCatalog, sSchemaName, sTableName, _rName); diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx index 0979cf7212e9..4044d6988f94 100644 --- a/connectivity/source/drivers/macab/MacabColumns.hxx +++ b/connectivity/source/drivers/macab/MacabColumns.hxx @@ -32,7 +32,7 @@ namespace connectivity protected: MacabTable* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx index 5b4db40ff89d..6932f5aea724 100644 --- a/connectivity/source/drivers/macab/MacabConnection.cxx +++ b/connectivity/source/drivers/macab/MacabConnection.cxx @@ -59,7 +59,7 @@ void SAL_CALL MacabConnection::release() throw() relase_ChildImpl(); } // ----------------------------------------------------------------------------- -void MacabConnection::construct(const ::rtl::OUString&, const Sequence< PropertyValue >&) throw(SQLException) +void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >&) throw(SQLException) { osl_atomic_increment( &m_refCount ); @@ -82,7 +82,7 @@ Reference< XStatement > SAL_CALL MacabConnection::createStatement( ) throw(SQLE return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -94,7 +94,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( cons return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const ::rtl::OUString& ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -103,7 +103,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const ::r return NULL; } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here @@ -186,7 +186,7 @@ sal_Bool SAL_CALL MacabConnection::isReadOnly( ) throw(SQLException, RuntimeExc return sal_False; } // -------------------------------------------------------------------------------- -void SAL_CALL MacabConnection::setCatalog( const ::rtl::OUString& ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -194,14 +194,14 @@ void SAL_CALL MacabConnection::setCatalog( const ::rtl::OUString& ) throw(SQLExc // if your database doesn't work with catalogs you go to next method otherwise you kjnow what to do } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabConnection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); // return your current catalog - return ::rtl::OUString(); + return OUString(); } // -------------------------------------------------------------------------------- void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 66c592f5482d..853628625845 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -65,7 +65,7 @@ namespace connectivity m_xCatalog; // needed for the SQL interpreter public: - virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); MacabConnection(MacabDriver* _pDriver); virtual ~MacabConnection(); @@ -83,9 +83,9 @@ namespace connectivity // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -94,8 +94,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index 7ce636312732..a832c33faec7 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -54,9 +54,9 @@ MacabDatabaseMetaData::~MacabDatabaseMetaData() { } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; if (m_bUseCatalog) { // do some special here for you database } @@ -194,25 +194,25 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQ return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; if (m_bUseCatalog) { } return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) { // normally this is " - ::rtl::OUString aVal("\""); + OUString aVal("\""); return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- @@ -549,53 +549,53 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { // if someday we support more than the default address book, // this method should return the URL which was used to create it - ::rtl::OUString aValue( "sdbc:address:macab:" ); + OUString aValue( "sdbc:address:macab:" ); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue( "macab" ); + OUString aValue( "macab" ); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { - ::rtl::OUString aValue(MACAB_DRIVER_VERSION); + OUString aValue(MACAB_DRIVER_VERSION); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- @@ -614,36 +614,36 @@ sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMinorVersion( ) throw(Runtim return MACAB_DRIVER_VERSION_MINOR; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) @@ -778,7 +778,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes( ) throw( Reference< XResultSet > xRef = pResult; static ODatabaseMetaDataResultSet::ORows aRows; - static const ::rtl::OUString aTable("TABLE"); + static const OUString aTable("TABLE"); if (aRows.empty()) { @@ -803,7 +803,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( ) throw(SQ // We support four types: char, timestamp, integer, float aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue(); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("CHAR")); + aRow[1] = new ORowSetValueDecorator(OUString("CHAR")); aRow[2] = new ORowSetValueDecorator(DataType::CHAR); aRow[3] = new ORowSetValueDecorator((sal_Int32) 254); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); @@ -824,20 +824,20 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( ) throw(SQ aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP); aRow[3] = new ORowSetValueDecorator((sal_Int32)19); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("INTEGER")); + aRow[1] = new ORowSetValueDecorator(OUString("INTEGER")); aRow[2] = new ORowSetValueDecorator(DataType::INTEGER); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[15] = new ORowSetValueDecorator((sal_Int32)20); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("FLOAT")); + aRow[1] = new ORowSetValueDecorator(OUString("FLOAT")); aRow[2] = new ORowSetValueDecorator(DataType::FLOAT); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[15] = new ORowSetValueDecorator((sal_Int32)15); @@ -858,22 +858,22 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas( ) throw(SQL } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumnPrivileges( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, - const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString&, + const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( const Any&, - const ::rtl::OUString&, - const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern) throw(SQLException, RuntimeException) + const OUString&, + const OUString& tableNamePattern, + const OUString& columnNamePattern) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); Reference< XResultSet > xRef = pResult; MacabRecords *aRecords; - ::rtl::OUString sTableName; + OUString sTableName; aRecords = m_xConnection->getAddressBook()->getMacabRecordsMatch(tableNamePattern); @@ -898,10 +898,10 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( aRow[14] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[15] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[16] = new ORowSetValueDecorator((sal_Int32) 254); - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); sal_Int32 nPosition = 1; - ::rtl::OUString sName; + OUString sName; MacabHeader::iterator aField; @@ -919,24 +919,24 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( { case kABStringProperty: aRow[5] = new ORowSetValueDecorator(DataType::CHAR); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("CHAR")); + aRow[6] = new ORowSetValueDecorator(OUString("CHAR")); aRow[7] = new ORowSetValueDecorator((sal_Int32) 256); aRows.push_back(aRow); break; case kABDateProperty: aRow[5] = new ORowSetValueDecorator(DataType::TIMESTAMP); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[6] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRows.push_back(aRow); break; case kABIntegerProperty: aRow[5] = new ORowSetValueDecorator(DataType::INTEGER); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("INTEGER")); + aRow[6] = new ORowSetValueDecorator(OUString("INTEGER")); aRow[7] = new ORowSetValueDecorator((sal_Int32) 20); aRows.push_back(aRow); break; case kABRealProperty: aRow[5] = new ORowSetValueDecorator(DataType::FLOAT); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("FLOAT")); + aRow[6] = new ORowSetValueDecorator(OUString("FLOAT")); aRow[7] = new ORowSetValueDecorator((sal_Int32) 15); aRows.push_back(aRow); break; @@ -953,9 +953,9 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( const Any&, - const ::rtl::OUString&, - const ::rtl::OUString&, - const Sequence< ::rtl::OUString >& types) throw(SQLException, RuntimeException) + const OUString&, + const OUString&, + const Sequence< OUString >& types) throw(SQLException, RuntimeException) { ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables); Reference< XResultSet > xRef = pResult; @@ -963,9 +963,9 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( // check whether we have tables in the requested types // for the moment, we answer only the "TABLE" table type // when no types are given at all, we return all the tables - static const ::rtl::OUString aTable("TABLE"); + static const OUString aTable("TABLE"); sal_Bool bTableFound = sal_False; - const ::rtl::OUString* p = types.getConstArray(), + const OUString* p = types.getConstArray(), * pEnd = p + types.getLength(); if (p == pEnd) @@ -1014,21 +1014,21 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, + const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, + const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); Reference< XResultSet > xRef = pResult; @@ -1039,13 +1039,13 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( { ODatabaseMetaDataResultSet::ORow aRow( 9 ); - ::rtl::OUString sName = CFStringToOUString(kABModificationDateProperty); + OUString sName = CFStringToOUString(kABModificationDateProperty); aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[1] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[2] = new ORowSetValueDecorator(sName); aRow[3] = new ORowSetValueDecorator(DataType::TIMESTAMP); - aRow[4] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP")); + aRow[4] = new ORowSetValueDecorator(OUString("TIMESTAMP")); aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[6] = ODatabaseMetaDataResultSet::getEmptyValue(); @@ -1059,52 +1059,52 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getImportedKeys( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getPrimaryKeys( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getIndexInfo( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, + const Any&, const OUString&, const OUString&, sal_Bool, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getBestRowIdentifier( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, + const Any&, const OUString&, const OUString&, sal_Int32, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges( - const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCrossReference( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString&, const Any&, - const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, + const OUString&, const Any&, + const OUString&, const OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException) { OSL_FAIL("Not implemented yet!"); throw SQLException(); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index 54a626c4adaa..20b75f1da632 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx @@ -50,17 +50,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -73,14 +73,14 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -108,11 +108,11 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -166,23 +166,23 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -195,7 +195,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 4a547660b540..a8d736eb8374 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -64,12 +64,12 @@ namespace if ( _rModule ) { // - const ::rtl::OUString sSymbolName = ::rtl::OUString::createFromAscii( _pAsciiSymbolName ); + const OUString sSymbolName = OUString::createFromAscii( _pAsciiSymbolName ); _rFunction = (FUNCTION)( osl_getSymbol( _rModule, sSymbolName.pData ) ); if ( !_rFunction ) { // did not find the symbol - OSL_FAIL( ::rtl::OString( ::rtl::OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + ::rtl::OString( _pAsciiSymbolName ) ).getStr() ); + OSL_FAIL( OString( OString( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) + OString( _pAsciiSymbolName ) ).getStr() ); osl_unloadModule( _rModule ); _rModule = NULL; } @@ -89,7 +89,7 @@ bool MacabImplModule::impl_loadModule() OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc, "MacabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!"); - const ::rtl::OUString sModuleName( SAL_MODULENAME( "macabdrv1" ) ); + const OUString sModuleName( SAL_MODULENAME( "macabdrv1" ) ); m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# OSL_ENSURE( m_hConnectorModule, "MacabImplModule::impl_loadModule: could not load the implementation library!" ); if ( !m_hConnectorModule ) @@ -129,18 +129,18 @@ void MacabImplModule::init() void MacabImplModule::impl_throwNoMacOSException() { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_NO_MAC_OS_FOUND ) ); impl_throwGenericSQLException( sError ); } // -------------------------------------------------------------------------------- -void MacabImplModule::impl_throwGenericSQLException( const ::rtl::OUString& _rMessage ) +void MacabImplModule::impl_throwGenericSQLException( const OUString& _rMessage ) { SQLException aError; aError.Message = _rMessage; - aError.SQLState = ::rtl::OUString( "S1000" ); + aError.SQLState = OUString( "S1000" ); aError.ErrorCode = 0; throw aError; } @@ -208,43 +208,43 @@ void MacabDriver::disposing() } // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString MacabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString MacabDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii( impl_getAsciiImplementationName() ); + return OUString::createFromAscii( impl_getAsciiImplementationName() ); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > MacabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > MacabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported // for more information @see com.sun.star.sdbc.Driver - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL MacabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL MacabDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL MacabDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL MacabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); while (pSupported != pEnd && !pSupported->equals(_rServiceName)) ++pSupported; return pSupported != pEnd; } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL MacabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL MacabDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL MacabDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -267,7 +267,7 @@ Reference< XConnection > SAL_CALL MacabDriver::connect( const ::rtl::OUString& u return xConnection; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL MacabDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -279,7 +279,7 @@ sal_Bool SAL_CALL MacabDriver::acceptsURL( const ::rtl::OUString& url ) return url.startsWith("sdbc:address:macab:"); } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const ::rtl::OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) { // if you have something special to say, return it here :-) return Sequence< DriverPropertyInfo >(); @@ -317,9 +317,9 @@ const sal_Char* MacabDriver::impl_getAsciiImplementationName() // Please be careful when changing it. } // -------------------------------------------------------------------------------- -::rtl::OUString MacabDriver::impl_getConfigurationSettingsPath() +OUString MacabDriver::impl_getConfigurationSettingsPath() { - ::rtl::OUStringBuffer aPath; + OUStringBuffer aPath; aPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" ); aPath.appendAscii( "com.sun.star.comp.sdbc.macab.Driver" ); return aPath.makeStringAndClear(); diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index 2f08b685c2e2..124cf38852ec 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -105,7 +105,7 @@ namespace connectivity /** throws a generic SQL exception with SQLState S1000 and error code 0 */ - void impl_throwGenericSQLException( const ::rtl::OUString& _rMessage ); + void impl_throwGenericSQLException( const OUString& _rMessage ); }; @@ -129,8 +129,8 @@ namespace connectivity static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext() const { return m_xContext; } @@ -141,7 +141,7 @@ namespace connectivity /** returns the path of our configuration settings */ - static ::rtl::OUString impl_getConfigurationSettingsPath(); + static OUString impl_getConfigurationSettingsPath(); protected: MacabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); @@ -150,14 +150,14 @@ namespace connectivity virtual void SAL_CALL disposing(void); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx index c8d4112d1098..419e35101e14 100644 --- a/connectivity/source/drivers/macab/MacabHeader.cxx +++ b/connectivity/source/drivers/macab/MacabHeader.cxx @@ -140,14 +140,14 @@ void MacabHeader::operator+= (const MacabHeader *r) } // ------------------------------------------------------------------------- -::rtl::OUString MacabHeader::getString(const sal_Int32 i) const +OUString MacabHeader::getString(const sal_Int32 i) const { - ::rtl::OUString nRet; + OUString nRet; if(i < size) { if(fields[i] == NULL || fields[i]->value == NULL || CFGetTypeID(fields[i]->value) != CFStringGetTypeID()) - return ::rtl::OUString(); + return OUString(); try { nRet = CFStringToOUString( (CFStringRef) fields[i]->value); @@ -264,7 +264,7 @@ sal_Int32 MacabHeader::compareFields(const macabfield *_field1, const macabfield } // ------------------------------------------------------------------------- -sal_Int32 MacabHeader::getColumnNumber(const ::rtl::OUString s) const +sal_Int32 MacabHeader::getColumnNumber(const OUString s) const { sal_Int32 i; for(i = 0; i < size; i++) diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx index c61428059e38..c3284842ec02 100644 --- a/connectivity/source/drivers/macab/MacabHeader.hxx +++ b/connectivity/source/drivers/macab/MacabHeader.hxx @@ -35,9 +35,9 @@ namespace connectivity MacabHeader(const sal_Int32 _size, macabfield **_fields); virtual ~MacabHeader(); void operator+= (const MacabHeader *r); - ::rtl::OUString getString(const sal_Int32 i) const; + OUString getString(const sal_Int32 i) const; void sortRecord(); - sal_Int32 getColumnNumber(const ::rtl::OUString s) const; + sal_Int32 getColumnNumber(const OUString s) const; static sal_Int32 compareFields(const macabfield *_field1, const macabfield *_field2); diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 79a65cc74438..152bd3fd7ee3 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -54,7 +54,7 @@ void MacabPreparedStatement::setMacabFields() const throw(SQLException) if (!xColumns.is()) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_INVALID_COLUMN_SELECTION ) ); ::dbtools::throwGenericSQLException(sError,NULL); @@ -67,12 +67,12 @@ void MacabPreparedStatement::resetParameters() const throw(SQLException) m_nParameterIndex = 0; } // ------------------------------------------------------------------------- -void MacabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const throw(SQLException) +void MacabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException) { if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size()) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_INVALID_PARA_COUNT ) ); ::dbtools::throwGenericSQLException(sError,*(MacabPreparedStatement *) this); @@ -85,7 +85,7 @@ void MacabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const // ------------------------------------------------------------------------- MacabPreparedStatement::MacabPreparedStatement( MacabConnection* _pConnection, - const ::rtl::OUString& sql) + const OUString& sql) : MacabPreparedStatement_BASE(_pConnection), m_sSqlStatement(sql), m_bPrepared(sal_False), @@ -118,7 +118,7 @@ Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() t if (!m_xMetaData.is()) { const OSQLTables& xTabs = m_aSQLIterator.getTables(); - ::rtl::OUString sTableName = MacabAddressBook::getDefaultTableName(); + OUString sTableName = MacabAddressBook::getDefaultTableName(); if(! xTabs.empty() ) { @@ -200,7 +200,7 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3 (m_aParameterRow->get())[parameterIndex - 1].setNull(); } // ------------------------------------------------------------------------- -void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException) { @@ -264,7 +264,7 @@ void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLExce ::dbtools::throwFunctionNotSupportedException("setDouble", NULL); } // ------------------------------------------------------------------------- -void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const ::rtl::OUString &x) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -326,9 +326,9 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const { if(!::dbtools::implSetObject(this,parameterIndex,x)) { - const ::rtl::OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( STR_UNKNOWN_PARA_TYPE, - "$position$", ::rtl::OUString::valueOf(parameterIndex) + "$position$", OUString::valueOf(parameterIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx index 6b605727072c..d043622b2148 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx @@ -40,7 +40,7 @@ namespace connectivity class MacabPreparedStatement : public MacabPreparedStatement_BASE { protected: - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; ::rtl::Reference< MacabResultSetMetaData > m_xMetaData; sal_Bool m_bPrepared; @@ -56,12 +56,12 @@ namespace connectivity const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); - virtual void getNextParameter(::rtl::OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); + virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); virtual ~MacabPreparedStatement(); public: DECLARE_SERVICE_INFO(); - MacabPreparedStatement(MacabConnection* _pConnection, const ::rtl::OUString& sql); + MacabPreparedStatement(MacabConnection* _pConnection, const OUString& sql); // OComponentHelper virtual void SAL_CALL disposing(); @@ -78,7 +78,7 @@ namespace connectivity // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -86,7 +86,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx index e9ad40b8038b..b814b4415242 100644 --- a/connectivity/source/drivers/macab/MacabRecord.cxx +++ b/connectivity/source/drivers/macab/MacabRecord.cxx @@ -223,7 +223,7 @@ sal_Int32 MacabRecord::compareFields(const macabfield *_field1, const macabfield * between an OUString and a macabfield (for use when creating and handling * SQL statement). */ -macabfield *MacabRecord::createMacabField(const ::rtl::OUString _newFieldString, const ABPropertyType _abType) +macabfield *MacabRecord::createMacabField(const OUString _newFieldString, const ABPropertyType _abType) { macabfield *newField = NULL; switch(_abType) @@ -291,12 +291,12 @@ macabfield *MacabRecord::createMacabField(const ::rtl::OUString _newFieldString, * between an OUString and a macabfield (for use when creating and handling * SQL statement). */ -::rtl::OUString MacabRecord::fieldToString(const macabfield *_aField) +OUString MacabRecord::fieldToString(const macabfield *_aField) { if(_aField == NULL) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString fieldString; + OUString fieldString; switch(_aField->type) { @@ -316,7 +316,7 @@ macabfield *MacabRecord::createMacabField(const ::rtl::OUString _newFieldString, // Should we check for the wrong type here, e.g., a float? sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal); if(m_bSuccess != sal_False) - fieldString = ::rtl::OUString::valueOf(nVal); + fieldString = OUString::valueOf(nVal); } break; case kABRealProperty: @@ -326,7 +326,7 @@ macabfield *MacabRecord::createMacabField(const ::rtl::OUString _newFieldString, // Should we check for the wrong type here, e.g., an int? sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef) _aField->value, numberType, &nVal); if(m_bSuccess != sal_False) - fieldString = ::rtl::OUString::valueOf(nVal); + fieldString = OUString::valueOf(nVal); } break; default: diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx index 859761707335..9d96a52cdc8a 100644 --- a/connectivity/source/drivers/macab/MacabRecord.hxx +++ b/connectivity/source/drivers/macab/MacabRecord.hxx @@ -59,8 +59,8 @@ namespace connectivity macabfield *get(const sal_Int32 i) const; static sal_Int32 compareFields(const macabfield *_field1, const macabfield *_field2); - static macabfield *createMacabField(const ::rtl::OUString _newFieldString, const ABPropertyType _abtype); - static ::rtl::OUString fieldToString(const macabfield *_aField); + static macabfield *createMacabField(const OUString _newFieldString, const ABPropertyType _abtype); + static OUString fieldToString(const macabfield *_aField); }; } diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx index 5ecb54fd84ab..1f4769b3f505 100644 --- a/connectivity/source/drivers/macab/MacabRecords.cxx +++ b/connectivity/source/drivers/macab/MacabRecords.cxx @@ -229,7 +229,7 @@ macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const sal_Int3 } // ------------------------------------------------------------------------- -macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const ::rtl::OUString _columnName) const +macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const OUString _columnName) const { if(header != NULL) { @@ -247,7 +247,7 @@ macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const ::rtl::O } // ------------------------------------------------------------------------- -sal_Int32 MacabRecords::getFieldNumber(const ::rtl::OUString _columnName) const +sal_Int32 MacabRecords::getFieldNumber(const OUString _columnName) const { if(header != NULL) return header->getColumnNumber(_columnName); @@ -437,8 +437,8 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, else { // Couldn't find a required property... - OSL_FAIL(::rtl::OString(::rtl::OString("MacabRecords::createHeaderForRecordType: could not find required property: ") + - ::rtl::OUStringToOString(CFStringToOUString(requiredProperties[i]), RTL_TEXTENCODING_ASCII_US)).getStr()); + OSL_FAIL(OString(OString("MacabRecords::createHeaderForRecordType: could not find required property: ") + + OUStringToOString(CFStringToOUString(requiredProperties[i]), RTL_TEXTENCODING_ASCII_US)).getStr()); } } @@ -538,9 +538,9 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert sal_Int32 multiLength = ABMultiValueCount((ABMutableMultiValueRef) _propertyValue); CFStringRef multiLabel, localizedMultiLabel; - ::rtl::OUString multiLabelString; - ::rtl::OUString multiPropertyString; - ::rtl::OUString headerNameString; + OUString multiLabelString; + OUString multiPropertyString; + OUString headerNameString; ABPropertyType multiType = (ABPropertyType) (ABMultiValuePropertyType((ABMutableMultiValueRef) _propertyValue) - 0x100); length = multiLength; @@ -557,7 +557,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert multiLabelString = CFStringToOUString(localizedMultiLabel); CFRelease(multiLabel); CFRelease(localizedMultiLabel); - headerNameString = multiPropertyString + ::rtl::OUString(": ") + fixLabel(multiLabelString); + headerNameString = multiPropertyString + OUString(": ") + fixLabel(multiLabelString); headerNames[i] = new macabfield; headerNames[i]->value = OUStringToCFString(headerNameString); headerNames[i]->type = multiType; @@ -587,8 +587,8 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert CFStringRef multiLabel, localizedMultiLabel; CFTypeRef multiValue; - ::rtl::OUString multiLabelString; - ::rtl::OUString multiPropertyString; + OUString multiLabelString; + OUString multiPropertyString; MacabHeader **multiHeaders = new MacabHeader *[multiLengthFirstLevel]; ABPropertyType multiType = (ABPropertyType) (ABMultiValuePropertyType((ABMutableMultiValueRef) _propertyValue) - 0x100); @@ -608,7 +608,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert if(multiValue && multiLabel) { localizedMultiLabel = ABCopyLocalizedPropertyOrLabel(multiLabel); - multiLabelString = multiPropertyString + ::rtl::OUString(": ") + fixLabel(CFStringToOUString(localizedMultiLabel)); + multiLabelString = multiPropertyString + OUString(": ") + fixLabel(CFStringToOUString(localizedMultiLabel)); CFRelease(multiLabel); CFRelease(localizedMultiLabel); multiLabel = OUStringToCFString(multiLabelString); @@ -668,10 +668,10 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert CFTypeRef *dictValues; sal_Int32 i,j,k; - ::rtl::OUString dictKeyString, propertyNameString; + OUString dictKeyString, propertyNameString; ABPropertyType dictType; MacabHeader **dictHeaders = new MacabHeader *[numRecords]; - ::rtl::OUString dictLabelString; + OUString dictLabelString; CFStringRef dictLabel, localizedDictKey; /* Get the keys and values */ @@ -696,7 +696,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert dictType = (ABPropertyType) getABTypeFromCFType( CFGetTypeID(dictValues[i]) ); localizedDictKey = ABCopyLocalizedPropertyOrLabel(dictKeys[i]); dictKeyString = CFStringToOUString(localizedDictKey); - dictLabelString = propertyNameString + ::rtl::OUString(": ") + fixLabel(dictKeyString); + dictLabelString = propertyNameString + OUString(": ") + fixLabel(dictKeyString); dictLabel = OUStringToCFString(dictLabelString); dictHeaders[i] = createHeaderForProperty(dictType, dictValues[i], dictLabel); if (!dictHeaders[i]) @@ -743,8 +743,8 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert CFTypeRef arrValue; ABPropertyType arrType; MacabHeader **arrHeaders = new MacabHeader *[arrLength]; - ::rtl::OUString propertyNameString = CFStringToOUString(_propertyName); - ::rtl::OUString arrLabelString; + OUString propertyNameString = CFStringToOUString(_propertyName); + OUString arrLabelString; CFStringRef arrLabel; length = 0; @@ -761,7 +761,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert { arrValue = (CFTypeRef) CFArrayGetValueAtIndex( (CFArrayRef) _propertyValue, i); arrType = (ABPropertyType) getABTypeFromCFType( CFGetTypeID(arrValue) ); - arrLabelString = propertyNameString + ::rtl::OUString::valueOf(i); + arrLabelString = propertyNameString + OUString::valueOf(i); arrLabel = OUStringToCFString(arrLabelString); arrHeaders[i] = createHeaderForProperty(arrType, arrValue, arrLabel); if (!arrHeaders[i]) @@ -834,9 +834,9 @@ void MacabRecords::manageDuplicateHeaders(macabfield **_headerNames, const sal_I if(count != 1) { // There is probably a better way to do this... - ::rtl::OUString newName = CFStringToOUString((CFStringRef) _headerNames[i]->value); + OUString newName = CFStringToOUString((CFStringRef) _headerNames[i]->value); CFRelease(_headerNames[i]->value); - newName += ::rtl::OUString(" (") + ::rtl::OUString::valueOf(count) + ::rtl::OUString(")"); + newName += OUString(" (") + OUString::valueOf(count) + OUString(")"); _headerNames[i]->value = OUStringToCFString(newName); } } @@ -866,7 +866,7 @@ MacabRecord *MacabRecords::createMacabRecord(const ABRecordRef _abrecord, const ABPropertyType propertyType; CFStringRef propertyName, localizedPropertyName; - ::rtl::OUString propertyNameString; + OUString propertyNameString; for(i = 0; i < numProperties; i++) { propertyName = (CFStringRef) CFArrayGetValueAtIndex(recordProperties, i); @@ -895,7 +895,7 @@ MacabRecord *MacabRecords::createMacabRecord(const ABRecordRef _abrecord, const * receives the property value). It is called when we aren't given the * property's type already. */ -void MacabRecords::insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const MacabHeader *_header, const ::rtl::OUString _propertyName, const CFTypeRef _propertyValue) const +void MacabRecords::insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const MacabHeader *_header, const OUString _propertyName, const CFTypeRef _propertyValue) const { CFTypeID cf_type = CFGetTypeID(_propertyValue); ABPropertyType ab_type = getABTypeFromCFType( cf_type ); @@ -908,7 +908,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const M /* Inserts a given property into a MacabRecord. This method is recursive * because properties can contain many sub-properties. */ -void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyType, MacabRecord *_abrecord, const MacabHeader *_header, const ::rtl::OUString _propertyName, const CFTypeRef _propertyValue) const +void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyType, MacabRecord *_abrecord, const MacabHeader *_header, const OUString _propertyName, const CFTypeRef _propertyValue) const { /* If there is no value, return */ if(_propertyValue == NULL) @@ -942,7 +942,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT * property into the record. */ sal_Bool bPlaced = sal_False; - ::rtl::OUString columnName = ::rtl::OUString(_propertyName); + OUString columnName = OUString(_propertyName); sal_Int32 i = 1; // A big safeguard to prevent two fields from having the same name. @@ -957,7 +957,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT { bPlaced = sal_False; i++; - columnName = ::rtl::OUString(_propertyName) + ::rtl::OUString(" (") + ::rtl::OUString::valueOf(i) + ::rtl::OUString(")"); + columnName = OUString(_propertyName) + OUString(" (") + OUString::valueOf(i) + OUString(")"); } // success! @@ -980,13 +980,13 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT sal_Int32 arrLength = (sal_Int32) CFArrayGetCount( (CFArrayRef) _propertyValue); sal_Int32 i; const void *arrValue; - ::rtl::OUString newPropertyName; + OUString newPropertyName; /* Going through each element... */ for(i = 0; i < arrLength; i++) { arrValue = CFArrayGetValueAtIndex( (CFArrayRef) _propertyValue, i); - newPropertyName = _propertyName + ::rtl::OUString::valueOf(i); + newPropertyName = _propertyName + OUString::valueOf(i); insertPropertyIntoMacabRecord(_abrecord, _header, newPropertyName, arrValue); CFRelease(arrValue); } @@ -1008,9 +1008,9 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT */ sal_Int32 numRecords = (sal_Int32) CFDictionaryGetCount((CFDictionaryRef) _propertyValue); - ::rtl::OUString dictKeyString; + OUString dictKeyString; sal_Int32 i; - ::rtl::OUString newPropertyName; + OUString newPropertyName; /* Unfortunately, the only way to get both keys and values out * of a dictionary in Carbon is to get them all at once, so we @@ -1029,7 +1029,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT localizedDictKey = ABCopyLocalizedPropertyOrLabel(dictKeys[i]); dictKeyString = CFStringToOUString(localizedDictKey); CFRelease(localizedDictKey); - newPropertyName = _propertyName + ::rtl::OUString(": ") + fixLabel(dictKeyString); + newPropertyName = _propertyName + OUString(": ") + fixLabel(dictKeyString); insertPropertyIntoMacabRecord(_abrecord, _header, newPropertyName, dictValues[i]); } @@ -1060,7 +1060,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT sal_Int32 multiLength = ABMultiValueCount((ABMutableMultiValueRef) _propertyValue); CFStringRef multiLabel, localizedMultiLabel; CFTypeRef multiValue; - ::rtl::OUString multiLabelString, newPropertyName; + OUString multiLabelString, newPropertyName; ABPropertyType multiType = (ABPropertyType) (ABMultiValuePropertyType((ABMutableMultiValueRef) _propertyValue) - 0x100); /* Go through each element... */ @@ -1072,7 +1072,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT localizedMultiLabel = ABCopyLocalizedPropertyOrLabel(multiLabel); multiLabelString = CFStringToOUString(localizedMultiLabel); - newPropertyName = _propertyName + ::rtl::OUString(": ") + fixLabel(multiLabelString); + newPropertyName = _propertyName + OUString(": ") + fixLabel(multiLabelString); insertPropertyIntoMacabRecord(multiType, _abrecord, _header, newPropertyName, multiValue); /* free our variables */ @@ -1190,13 +1190,13 @@ void MacabRecords::swap(const sal_Int32 _id1, const sal_Int32 _id2) } // ------------------------------------------------------------------------- -void MacabRecords::setName(const ::rtl::OUString _sName) +void MacabRecords::setName(const OUString _sName) { m_sName = _sName; } // ------------------------------------------------------------------------- -::rtl::OUString MacabRecords::getName() const +OUString MacabRecords::getName() const { return m_sName; } diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx index 902a8d870279..730dc57a6b4f 100644 --- a/connectivity/source/drivers/macab/MacabRecords.hxx +++ b/connectivity/source/drivers/macab/MacabRecords.hxx @@ -53,7 +53,7 @@ namespace connectivity MacabHeader *header; MacabRecord **records; ABAddressBookRef addressBook; - ::rtl::OUString m_sName; + OUString m_sName; /* For converting CF types to AB types */ sal_Int32 lcl_CFTypesLength; @@ -75,8 +75,8 @@ namespace connectivity MacabHeader *createHeaderForProperty(const ABPropertyType _propertyType, const CFTypeRef _propertyValue, const CFStringRef _propertyName) const; void manageDuplicateHeaders(macabfield **_headerNames, const sal_Int32 _length) const; ABPropertyType getABTypeFromCFType(const CFTypeID cf_type ) const; - void insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const MacabHeader *_header, const ::rtl::OUString _propertyName, const CFTypeRef _propertyValue) const; - void insertPropertyIntoMacabRecord(const ABPropertyType _propertyType, MacabRecord *_abrecord, const MacabHeader *_header, const ::rtl::OUString _propertyName, const CFTypeRef _propertyValue) const; + void insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const MacabHeader *_header, const OUString _propertyName, const CFTypeRef _propertyValue) const; + void insertPropertyIntoMacabRecord(const ABPropertyType _propertyType, MacabRecord *_abrecord, const MacabHeader *_header, const OUString _propertyName, const CFTypeRef _propertyValue) const; public: MacabRecords(const ABAddressBookRef _addressBook, MacabHeader *_header, MacabRecord **_records, sal_Int32 _numRecords); MacabRecords(const MacabRecords *_copy); @@ -88,8 +88,8 @@ namespace connectivity void setHeader(MacabHeader *_header); MacabHeader *getHeader() const; - void setName(const ::rtl::OUString _sName); - ::rtl::OUString getName() const; + void setName(const OUString _sName); + OUString getName() const; MacabRecord *insertRecord(MacabRecord *_newRecord, const sal_Int32 _location); void insertRecord(MacabRecord *_newRecord); @@ -97,8 +97,8 @@ namespace connectivity void swap(const sal_Int32 _id1, const sal_Int32 _id2); macabfield *getField(const sal_Int32 _recordNumber, const sal_Int32 _columnNumber) const; - macabfield *getField(const sal_Int32 _recordNumber, const ::rtl::OUString _columnName) const; - sal_Int32 getFieldNumber(const ::rtl::OUString _columnName) const; + macabfield *getField(const sal_Int32 _recordNumber, const OUString _columnName) const; + sal_Int32 getFieldNumber(const OUString _columnName) const; sal_Int32 size() const; diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index 02c32addfde7..7a743742c733 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -127,7 +127,7 @@ void MacabResultSet::sortMacabRecords(const MacabOrder *pOrder) } // ------------------------------------------------------------------------- -void MacabResultSet::setTableName(::rtl::OUString _sTableName) +void MacabResultSet::setTableName(OUString _sTableName) { m_sTableName = _sTableName; } @@ -175,7 +175,7 @@ Sequence< Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException) return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL MacabResultSet::findColumn(const ::rtl::OUString& columnName) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -191,7 +191,7 @@ sal_Int32 SAL_CALL MacabResultSet::findColumn(const ::rtl::OUString& columnName) return i; ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_NO_ELEMENT_NAME, "$name$", columnName ) ); @@ -201,12 +201,12 @@ sal_Int32 SAL_CALL MacabResultSet::findColumn(const ::rtl::OUString& columnName) return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString aRet; + OUString aRet; sal_Int32 nRecords = m_aMacabRecords->size(); m_bWasNull = true; @@ -809,7 +809,7 @@ void SAL_CALL MacabResultSet::updateDouble(sal_Int32, double) throw(SQLException checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- -void SAL_CALL MacabResultSet::updateString(sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -879,7 +879,7 @@ Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException, RuntimeExceptio if (m_nRowPos != -1 && m_nRowPos != nRecords) { - macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,::rtl::OUString("UID")); + macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,OUString("UID")); if(uidField != NULL) { if(uidField->type == kABStringProperty) @@ -896,17 +896,17 @@ sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const Any& bookmark) throw( SQ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString sBookmark = comphelper::getString(bookmark); + OUString sBookmark = comphelper::getString(bookmark); sal_Int32 nRecords = m_aMacabRecords->size(); for (sal_Int32 nRow = 0; nRow < nRecords; nRow++) { - macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,::rtl::OUString("UID")); + macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,OUString("UID")); if(uidField != NULL) { if(uidField->type == kABStringProperty) { - ::rtl::OUString sUniqueIdentifier = CFStringToOUString( (CFStringRef) uidField->value ); + OUString sUniqueIdentifier = CFStringToOUString( (CFStringRef) uidField->value ); if (sUniqueIdentifier == sBookmark) { m_nRowPos = nRow; @@ -944,8 +944,8 @@ sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const Any& firstItem, const ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString sFirst = comphelper::getString(firstItem); - ::rtl::OUString sSecond = comphelper::getString(secondItem); + OUString sFirst = comphelper::getString(firstItem); + OUString sSecond = comphelper::getString(secondItem); if (sFirst < sSecond) return CompareBookmark::LESS; @@ -964,7 +964,7 @@ sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const Any& bookmark) throw( SQL ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - ::rtl::OUString sBookmark = comphelper::getString(bookmark); + OUString sBookmark = comphelper::getString(bookmark); return sBookmark.hashCode(); } @@ -983,7 +983,7 @@ IPropertyArrayHelper* MacabResultSet::createArrayHelper() const Sequence< Property > aProps(6); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP1IMPL(CURSORNAME, OUString) PropertyAttribute::READONLY); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 3a34437d1cd3..84c8788b7042 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx @@ -63,7 +63,7 @@ namespace connectivity MacabRecords * m_aMacabRecords; // address book entries matching the query sal_Int32 m_nRowPos; // the current row within the result set sal_Bool m_bWasNull; // last entry retrieved from this result set was NULL - ::rtl::OUString m_sTableName; + OUString m_sTableName; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; @@ -101,7 +101,7 @@ namespace connectivity void allMacabRecords(); void someMacabRecords(const class MacabCondition *pCondition); void sortMacabRecords(const class MacabOrder *pOrder); - void setTableName(const ::rtl::OUString _sTableName); + void setTableName(const OUString _sTableName); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); @@ -139,7 +139,7 @@ namespace connectivity // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -188,7 +188,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -199,7 +199,7 @@ namespace connectivity virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 9311f63dd87d..c3199ebe8670 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; -MacabResultSetMetaData::MacabResultSetMetaData(MacabConnection* _pConnection, ::rtl::OUString _sTableName) +MacabResultSetMetaData::MacabResultSetMetaData(MacabConnection* _pConnection, OUString _sTableName) : m_pConnection(_pConnection), m_sTableName(_sTableName), m_aMacabFields() @@ -44,7 +44,7 @@ MacabResultSetMetaData::~MacabResultSetMetaData() void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference &xColumns) throw(SQLException) { OSQLColumns::Vector::const_iterator aIter; - static const ::rtl::OUString aName("Name"); + static const OUString aName("Name"); MacabRecords *aRecords; MacabHeader *aHeader; @@ -60,7 +60,7 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Referenceget().begin(); aIter != xColumns->get().end(); ++aIter) { - ::rtl::OUString aFieldName; + OUString aFieldName; sal_uInt32 nFieldNumber; (*aIter)->getPropertyValue(aName) >>= aFieldName; @@ -112,12 +112,12 @@ sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLEx return sal_True; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException) { sal_uInt32 nFieldNumber = m_aMacabFields[column - 1]; MacabRecords *aRecords; @@ -132,34 +132,34 @@ sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLEx } aHeader = aRecords->getHeader(); - ::rtl::OUString aName = aHeader->getString(nFieldNumber); + OUString aName = aHeader->getString(nFieldNumber); return aName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException) { return m_sTableName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL MacabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index 0b24b1fac3e6..c3ea852c414f 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx @@ -39,7 +39,7 @@ namespace connectivity class MacabResultSetMetaData : public MacabResultSetMetaData_BASE { MacabConnection* m_pConnection; - ::rtl::OUString m_sTableName; + OUString m_sTableName; ::std::vector m_aMacabFields; // for each selected column, contains the number // of the corresponding AddressBook field @@ -47,7 +47,7 @@ namespace connectivity virtual ~MacabResultSetMetaData(); public: - MacabResultSetMetaData(MacabConnection* _pConnection, ::rtl::OUString _sTableName); + MacabResultSetMetaData(MacabConnection* _pConnection, OUString _sTableName); // avoid ambigous cast error from the compiler inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() @@ -66,19 +66,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index 3944bf872e40..cff50dd32f88 100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx @@ -22,7 +22,6 @@ #include using namespace connectivity::macab; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 170608c2fdf9..026e69dc28cb 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -32,7 +32,7 @@ #include "resource/macab_res.hrc" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -54,7 +54,7 @@ namespace connectivity void impl_throwError(sal_uInt16 _nErrorId) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(_nErrorId) ); + const OUString sError( aResources.getResourceString(_nErrorId) ); ::dbtools::throwGenericSQLException(sError,NULL); } } @@ -88,7 +88,7 @@ void MacabCommonStatement::resetParameters() const throw(::com::sun::star::sdbc: impl_throwError(STR_PARA_ONLY_PREPARED); } // ----------------------------------------------------------------------------- -void MacabCommonStatement::getNextParameter(::rtl::OUString &) const throw(::com::sun::star::sdbc::SQLException) +void MacabCommonStatement::getNextParameter(OUString &) const throw(::com::sun::star::sdbc::SQLException) { impl_throwError(STR_PARA_ONLY_PREPARED); } @@ -127,14 +127,14 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP } else if (SQL_ISRULE(pLeft, column_ref)) { - ::rtl::OUString sColumnName, + OUString sColumnName, sTableRange; m_aSQLIterator.getColumnRange(pLeft, sColumnName, sTableRange); if (pRight->isToken() || SQL_ISRULE(pRight, parameter)) { - ::rtl::OUString sMatchString; + OUString sMatchString; if (pRight->isToken()) // WHERE Name = 'Doe' sMatchString = pRight->getTokenValue(); @@ -192,7 +192,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP SQL_ISTOKEN(pMiddleLeft, IS) && SQL_ISTOKEN(pRight, NULL)) { - ::rtl::OUString sColumnName, + OUString sColumnName, sTableRange; m_aSQLIterator.getColumnRange(pLeft, sColumnName, sTableRange); @@ -213,14 +213,14 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP { if (SQL_ISRULE(pLeft, column_ref)) { - ::rtl::OUString sColumnName, + OUString sColumnName, sTableRange; m_aSQLIterator.getColumnRange(pLeft, sColumnName, sTableRange); if (pMiddleRight->isToken() || SQL_ISRULE(pMiddleRight, parameter)) { - ::rtl::OUString sMatchString; + OUString sMatchString; if (pMiddleRight->isToken()) // WHERE Name LIKE 'Sm%' sMatchString = pMiddleRight->getTokenValue(); @@ -268,7 +268,7 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar if (pColumnRef->count() == 1) { - ::rtl::OUString sColumnName = + OUString sColumnName = pColumnRef->getChild(0)->getTokenValue(); sal_Bool bAscending = SQL_ISTOKEN(pAscendingDescending, DESC)? @@ -286,16 +286,16 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar return 0; } //------------------------------------------------------------------------------ -::rtl::OUString MacabCommonStatement::getTableName() const +OUString MacabCommonStatement::getTableName() const { const OSQLTables& xTabs = m_aSQLIterator.getTables(); if( xTabs.empty() ) - return ::rtl::OUString(); + return OUString(); // can only deal with one table at a time if(xTabs.size() > 1 || m_aSQLIterator.hasErrors() ) - return ::rtl::OUString(); + return OUString(); return xTabs.begin()->first; } @@ -309,7 +309,7 @@ void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(S if (!xColumns.is()) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString( + const OUString sError( aResources.getResourceString( STR_INVALID_COLUMN_SELECTION ) ); ::dbtools::throwGenericSQLException(sError,NULL); @@ -398,7 +398,7 @@ void SAL_CALL MacabCommonStatement::close( ) throw(SQLException, RuntimeExcepti } // ------------------------------------------------------------------------- sal_Bool SAL_CALL MacabCommonStatement::execute( - const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -409,7 +409,7 @@ sal_Bool SAL_CALL MacabCommonStatement::execute( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL MacabCommonStatement::executeQuery( - const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -418,7 +418,7 @@ OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql)); MacabResultSet* pResult = new MacabResultSet(this); Reference< XResultSet > xRS = pResult; - ::rtl::OUString aErr; + OUString aErr; m_pParseTree = m_aParser.parseTree(aErr, sql); if (m_pParseTree == NULL) @@ -430,7 +430,7 @@ OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql)); { case SQL_STATEMENT_SELECT: { - ::rtl::OUString sTableName = getTableName(); // FROM which table ? + OUString sTableName = getTableName(); // FROM which table ? if (sTableName.getLength() != 0) // a match { MacabRecords *aRecords; @@ -477,7 +477,7 @@ Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( ) throw( return (Reference< XConnection >) m_pConnection; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const ::rtl::OUString& ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -509,7 +509,7 @@ void SAL_CALL MacabCommonStatement::clearWarnings( ) throw(SQLException, Runtim Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 5fb3d510c257..75da079ea67f 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -53,7 +53,7 @@ namespace connectivity ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< ::rtl::OUString> m_aBatchList; + ::std::list< OUString> m_aBatchList; connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; connectivity::OSQLParseNode* m_pParseTree; @@ -67,7 +67,7 @@ namespace connectivity const OSQLParseNode *pParseNode) const throw(::com::sun::star::sdbc::SQLException); class MacabOrder *analyseOrderByClause( const OSQLParseNode *pParseNode) const throw(::com::sun::star::sdbc::SQLException); - ::rtl::OUString getTableName( ) const; + OUString getTableName( ) const; void setMacabFields(class MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); void selectRecords(MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); void sortRecords(MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); @@ -90,7 +90,7 @@ namespace connectivity sal_Int32 nHandle) const; virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); - virtual void getNextParameter(::rtl::OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); + virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); virtual ~MacabCommonStatement(); public: @@ -119,11 +119,11 @@ namespace connectivity // XStatement virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( - const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL executeUpdate( - const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL execute( - const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx index a5fec27c8550..341b2ff5e87b 100644 --- a/connectivity/source/drivers/macab/MacabTable.cxx +++ b/connectivity/source/drivers/macab/MacabTable.cxx @@ -43,11 +43,11 @@ MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnect // ------------------------------------------------------------------------- MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName ) : MacabTable_TYPEDEF(_pTables,sal_True, _Name, _Type, @@ -69,7 +69,7 @@ void MacabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString("%")); + OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx index a1c63d57f31a..ca22067cd069 100644 --- a/connectivity/source/drivers/macab/MacabTable.hxx +++ b/connectivity/source/drivers/macab/MacabTable.hxx @@ -29,7 +29,7 @@ namespace connectivity { typedef connectivity::sdbcx::OTable MacabTable_TYPEDEF; - ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); + OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class MacabTable : public MacabTable_TYPEDEF { @@ -40,19 +40,19 @@ namespace connectivity MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection); MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); MacabConnection* getConnection() { return m_pConnection;} virtual void refreshColumns(); - ::rtl::OUString getTableName() const { return m_Name; } - ::rtl::OUString getSchema() const { return m_SchemaName; } + OUString getTableName() const { return m_Name; } + OUString getSchema() const { return m_SchemaName; } }; } } diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index a9f7d9685f0c..285d6d992a58 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.cxx @@ -35,15 +35,15 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -sdbcx::ObjectType MacabTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType MacabTables::createObject(const OUString& _rName) { - ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString("%"); + OUString aName,aSchema; + aSchema = OUString("%"); aName = _rName; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); - ::rtl::OUString sEmpty; + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); + OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes); diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 993a79f37ac4..d33d23098b8d 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -32,7 +32,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx index 2d68567af781..175076ea6447 100644 --- a/connectivity/source/drivers/macab/macabcondition.cxx +++ b/connectivity/source/drivers/macab/macabcondition.cxx @@ -51,7 +51,7 @@ sal_Bool MacabConditionConstant::eval(const MacabRecord *) const return m_bValue; } // ----------------------------------------------------------------------------- -MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const ::rtl::OUString &sColumnName) throw(SQLException) +MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) : MacabCondition(), m_nFieldNumber(header->getColumnNumber(sColumnName)) { @@ -69,7 +69,7 @@ sal_Bool MacabConditionColumn::isAlwaysFalse() const return sal_False; } // ----------------------------------------------------------------------------- -MacabConditionNull::MacabConditionNull(const MacabHeader *header, const ::rtl::OUString &sColumnName) throw(SQLException) +MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) : MacabConditionColumn(header, sColumnName) { } @@ -86,7 +86,7 @@ sal_Bool MacabConditionNull::eval(const MacabRecord *aRecord) const return sal_False; } // ----------------------------------------------------------------------------- -MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const ::rtl::OUString &sColumnName) throw(SQLException) +MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) : MacabConditionColumn(header, sColumnName) { } @@ -103,13 +103,13 @@ sal_Bool MacabConditionNotNull::eval(const MacabRecord *aRecord) const return sal_True; } // ----------------------------------------------------------------------------- -MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : MacabConditionColumn(header, sColumnName), m_sMatchString(sMatchString) { } // ----------------------------------------------------------------------------- -MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : MacabConditionCompare(header, sColumnName, sMatchString) { } @@ -132,7 +132,7 @@ sal_Bool MacabConditionEqual::eval(const MacabRecord *aRecord) const return nReturn == 0; } // ----------------------------------------------------------------------------- -MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : MacabConditionCompare(header, sColumnName, sMatchString) { } @@ -155,7 +155,7 @@ sal_Bool MacabConditionDifferent::eval(const MacabRecord *aRecord) const return nReturn != 0; } // ----------------------------------------------------------------------------- -MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const ::rtl::OUString &sColumnName, const ::rtl::OUString &sMatchString) throw(SQLException) +MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) : MacabConditionCompare(header, sColumnName, sMatchString) { } @@ -167,7 +167,7 @@ sal_Bool MacabConditionSimilar::eval(const MacabRecord *aRecord) const if(aValue == NULL) return sal_False; - ::rtl::OUString sName = MacabRecord::fieldToString(aValue); + OUString sName = MacabRecord::fieldToString(aValue); return match(m_sMatchString, sName, '\0'); } diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index 506707c2b08e..76acf95056d0 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.hxx @@ -60,7 +60,7 @@ class MacabConditionColumn : public MacabCondition public: MacabConditionColumn( const MacabHeader *header, - const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysFalse() const; }; @@ -70,7 +70,7 @@ class MacabConditionNull : public MacabConditionColumn public: MacabConditionNull( const MacabHeader *header, - const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; // ----------------------------------------------------------------------------- @@ -79,20 +79,20 @@ class MacabConditionNotNull : public MacabConditionColumn public: MacabConditionNotNull( const MacabHeader *header, - const ::rtl::OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; // ----------------------------------------------------------------------------- class MacabConditionCompare : public MacabConditionColumn { protected: - const ::rtl::OUString m_sMatchString; + const OUString m_sMatchString; public: MacabConditionCompare( const MacabHeader *header, - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); }; // ----------------------------------------------------------------------------- class MacabConditionEqual : public MacabConditionCompare @@ -100,8 +100,8 @@ class MacabConditionEqual : public MacabConditionCompare public: MacabConditionEqual( const MacabHeader *header, - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; // ----------------------------------------------------------------------------- @@ -110,8 +110,8 @@ class MacabConditionDifferent : public MacabConditionCompare public: MacabConditionDifferent( const MacabHeader *header, - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; // ----------------------------------------------------------------------------- @@ -120,8 +120,8 @@ class MacabConditionSimilar : public MacabConditionCompare public: MacabConditionSimilar( const MacabHeader *header, - const ::rtl::OUString &sColumnName, - const ::rtl::OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName, + const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx index ebcc6421e09a..79dd1c18619d 100644 --- a/connectivity/source/drivers/macab/macaborder.cxx +++ b/connectivity/source/drivers/macab/macaborder.cxx @@ -28,7 +28,7 @@ MacabOrder::~MacabOrder() { } // ----------------------------------------------------------------------------- -MacabSimpleOrder::MacabSimpleOrder(MacabHeader *header, ::rtl::OUString &sColumnName, sal_Bool bAscending) +MacabSimpleOrder::MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, sal_Bool bAscending) : MacabOrder(), m_nFieldNumber(header->getColumnNumber(sColumnName)), m_bAscending(bAscending) diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx index b813d118fbcc..f53969349d5c 100644 --- a/connectivity/source/drivers/macab/macaborder.hxx +++ b/connectivity/source/drivers/macab/macaborder.hxx @@ -44,7 +44,7 @@ namespace connectivity sal_Bool m_bAscending; public: - MacabSimpleOrder(MacabHeader *header, ::rtl::OUString &sColumnName, sal_Bool bAscending); + MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, sal_Bool bAscending); virtual sal_Int32 compare(const MacabRecord *record1, const MacabRecord *record2) const; }; diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx index d2b2ed28a412..b6afd1cbbe5f 100644 --- a/connectivity/source/drivers/macab/macabutilities.hxx +++ b/connectivity/source/drivers/macab/macabutilities.hxx @@ -34,7 +34,7 @@ namespace connectivity namespace macab { // ------------------------------------------------------------------------- - inline ::rtl::OUString CFStringToOUString(const CFStringRef sOrig) + inline OUString CFStringToOUString(const CFStringRef sOrig) { /* Copied all-but directly from code by Florian Heckl in * cws_src680_aquafilepicker01 @@ -43,7 +43,7 @@ namespace connectivity * names. */ if (NULL == sOrig) { - return rtl::OUString(); + return OUString(); } CFRetain(sOrig); @@ -57,11 +57,11 @@ namespace connectivity CFStringGetCharacters (sOrig, CFRangeMake(0,nStringLength), unichars); CFRelease(sOrig); - return rtl::OUString(unichars); + return OUString(unichars); } // ------------------------------------------------------------------------- - inline CFStringRef OUStringToCFString(const ::rtl::OUString& aString) + inline CFStringRef OUStringToCFString(const OUString& aString) { /* Copied directly from code by Florian Heckl in * cws_src680_aquafilepicker01 @@ -97,7 +97,7 @@ namespace connectivity } // ------------------------------------------------------------------------- - inline ::rtl::OUString fixLabel(const ::rtl::OUString _originalLabel) + inline OUString fixLabel(const OUString _originalLabel) { /* Get the length, and make sure that there is actually a string * here. diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx index 26ac1f5f3027..869cdb44164a 100644 --- a/connectivity/source/drivers/mork/MCatalog.cxx +++ b/connectivity/source/drivers/mork/MCatalog.cxx @@ -50,15 +50,15 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) void OCatalog::refreshTables() { TStringVector aVector; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); + OUString("%"),OUString("%"),aTypes); if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aName; + OUString aName; while(xResult->next()) { aName = xRow->getString(3); diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx index 624b5ab88e43..96af40bf706b 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.cxx +++ b/connectivity/source/drivers/mork/MColumnAlias.cxx @@ -82,7 +82,7 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun:: }; for ( size_t i = 0; i < sizeof( s_pProgrammaticNames ) / sizeof( s_pProgrammaticNames[0] ); ++i ) - m_aAliasMap[ ::rtl::OUString::createFromAscii( s_pProgrammaticNames[i] ) ] = AliasEntry( s_pProgrammaticNames[i], i ); + m_aAliasMap[ OUString::createFromAscii( s_pProgrammaticNames[i] ) ] = AliasEntry( s_pProgrammaticNames[i], i ); initialize( _rxORB ); } @@ -126,13 +126,13 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su } //------------------------------------------------------------------ -::rtl::OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const ::rtl::OUString& _rAlias ) const +OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const { AliasMap::const_iterator pos = m_aAliasMap.find( _rAlias ); if ( pos == m_aAliasMap.end() ) { OSL_FAIL( "OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias: no programmatic name for this alias!" ); - return ::rtl::OUStringToOString( _rAlias, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( _rAlias, RTL_TEXTENCODING_UTF8 ); } return pos->second.programmaticAsciiName; } diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index 4f50a44ef954..9dbcd6b32814 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -36,7 +36,7 @@ namespace connectivity public: struct AliasEntry { - ::rtl::OString programmaticAsciiName; + OString programmaticAsciiName; size_t columnPosition; AliasEntry() @@ -50,7 +50,7 @@ namespace connectivity { } }; - typedef ::boost::unordered_map< ::rtl::OUString, AliasEntry, ::rtl::OUStringHash > AliasMap; + typedef ::boost::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap; private: AliasMap m_aAliasMap; @@ -58,11 +58,11 @@ namespace connectivity public: OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); - inline bool hasAlias( const ::rtl::OUString& _rAlias ) const + inline bool hasAlias( const OUString& _rAlias ) const { return m_aAliasMap.find( _rAlias ) != m_aAliasMap.end(); } - ::rtl::OString getProgrammaticNameOrFallbackToUTF8Alias( const ::rtl::OUString& _rAlias ) const; + OString getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const; inline AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); } inline AliasMap::const_iterator end() const { return m_aAliasMap.end(); } diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx index 22a2dd7f4495..009ed6b998ad 100644 --- a/connectivity/source/drivers/mork/MColumns.cxx +++ b/connectivity/source/drivers/mork/MColumns.cxx @@ -40,12 +40,12 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OColumns::createObject(const OUString& _rName) { const Any aCatalog; - const ::rtl::OUString sCatalogName; - const ::rtl::OUString sSchemaName(m_pTable->getSchema()); - const ::rtl::OUString sTableName(m_pTable->getTableName()); + const OUString sCatalogName; + const OUString sSchemaName(m_pTable->getSchema()); + const OUString sTableName(m_pTable->getTableName()); Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns( aCatalog, sSchemaName, sTableName, _rName); @@ -58,7 +58,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) if(xRow->getString(4) == _rName) { sal_Int32 nType = xRow->getInt(5); - ::rtl::OUString sTypeName = xRow->getString(6); + OUString sTypeName = xRow->getString(6); sal_Int32 nPrec = xRow->getInt(7); OColumn* pRet = new OColumn(_rName, diff --git a/connectivity/source/drivers/mork/MColumns.hxx b/connectivity/source/drivers/mork/MColumns.hxx index 63d982fcedb7..64856bd28a92 100644 --- a/connectivity/source/drivers/mork/MColumns.hxx +++ b/connectivity/source/drivers/mork/MColumns.hxx @@ -34,7 +34,7 @@ namespace connectivity protected: OTable* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OColumns( OTable* _pTable, diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index cecff41ca8db..8e5e623ed779 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -73,7 +73,7 @@ void SAL_CALL OConnection::release() throw() } // ----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) +void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { (void) info; // avoid warnings SAL_INFO("connectivity.mork", "=> OConnection::construct()" ); @@ -124,7 +124,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV path = m_pProfileAccess->getProfilePath(::com::sun::star::mozilla::MozillaProductType_Thunderbird, defaultProfile); SAL_INFO("connectivity.mork", "DefaultProfile: " << defaultProfile); SAL_INFO("connectivity.mork", "ProfilePath: " << path); - path += rtl::OUString( "/abook.mab" ); + path += OUString( "/abook.mab" ); } else { @@ -133,7 +133,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV SAL_INFO("connectivity.mork", "AdressbookPath: " << path); - rtl::OString strPath = ::rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8 ); + OString strPath = OUStringToOString(path, RTL_TEXTENCODING_UTF8 ); // Open and parse mork file if (!m_pMork->open(strPath.getStr())) @@ -175,7 +175,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) { SAL_INFO("connectivity.mork", "=> OConnection::prepareStatement()" ); SAL_INFO("connectivity.mork", "OConnection::prepareStatement( " << _sSql << " )"); @@ -195,7 +195,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const :: return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException) { SAL_INFO("connectivity.mork", "=> OConnection::prepareCall()" ); SAL_INFO("connectivity.mork", "sql: " << _sSql); @@ -205,7 +205,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl:: return NULL; } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) { SAL_INFO("connectivity.mork", "=> OConnection::nativeSQL()" ); SAL_INFO("connectivity.mork", "sql: " << _sSql); @@ -278,14 +278,14 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return sal_False; } // -------------------------------------------------------------------------------- -void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // -------------------------------------------------------------------------------- void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) @@ -366,10 +366,10 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer OSL_ENSURE( ( _rError.getErrorCondition() == 0 ), "OConnection::throwSQLException: unsupported error code combination!" ); - ::rtl::OUString sParameter( _rError.getParameter() ); + OUString sParameter( _rError.getParameter() ); if ( !sParameter.isEmpty() ) { - const ::rtl::OUString sError( getResources().getResourceStringWithSubstitution( + const OUString sError( getResources().getResourceStringWithSubstitution( _rError.getResId(), "$1$", sParameter ) ); @@ -384,7 +384,7 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer if ( _rError.getErrorCondition() != 0 ) { SQLError aErrorHelper( comphelper::getComponentContext(getDriver()->getFactory()) ); - ::rtl::OUString sParameter( _rError.getParameter() ); + OUString sParameter( _rError.getParameter() ); if ( !sParameter.isEmpty() ) aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext, sParameter ); else diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index ff2f359bb48e..8043648e9df8 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -58,7 +58,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; public: - virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); OConnection(MorkDriver* const driver); virtual ~OConnection(); @@ -75,9 +75,9 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -86,8 +86,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -100,7 +100,7 @@ namespace connectivity const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } - static ::rtl::OUString getDriverImplementationName(); + static OUString getDriverImplementationName(); sal_Bool getForceLoadTables() {return true;} diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index a2b6297c5936..cbac0a065ca2 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -60,8 +60,8 @@ ODatabaseMetaData::~ODatabaseMetaData() // ------------------------------------------------------------------------- ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( - const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException) + const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getColumnRows()" ); SAL_INFO("connectivity.mork", "tableNamePattern: " << tableNamePattern); @@ -72,13 +72,13 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( aRows.clear(); ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > tables; + ::std::vector< OUString > tables; if (!m_pMetaDataHelper->getTableStrings(m_pConnection, tables)) { ::connectivity::SharedResources aResources; // TODO: // get better message here? - const ::rtl::OUString sMessage = aResources.getResourceString(STR_UNKNOWN_COLUMN_TYPE); + const OUString sMessage = aResources.getResourceString(STR_UNKNOWN_COLUMN_TYPE); ::dbtools::throwGenericSQLException(sMessage ,*this); } @@ -87,13 +87,13 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // **************************************************** // Catalog - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("")); + aRow[1] = new ORowSetValueDecorator(OUString("")); // Schema - aRow[2] = new ORowSetValueDecorator(::rtl::OUString("")); + aRow[2] = new ORowSetValueDecorator(OUString("")); // DATA_TYPE aRow[5] = new ORowSetValueDecorator(static_cast(DataType::VARCHAR)); // TYPE_NAME, not used - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR")); + aRow[6] = new ORowSetValueDecorator(OUString("VARCHAR")); // COLUMN_SIZE aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE); // BUFFER_LENGTH, not used @@ -115,7 +115,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // CHAR_OCTET_LENGTH, refer to [5] aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH); // IS_NULLABLE - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); // Iterate over all tables for(size_t j = 0; j < tables.size(); j++ ) { @@ -148,9 +148,9 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( return( aRows ); } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) @@ -281,21 +281,21 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("\"")); + return OUString( RTL_CONSTASCII_USTRINGPARAM("\"")); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- @@ -633,52 +633,52 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQL return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)1); + OUString aValue = OUString::valueOf((sal_Int32)1); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)0); + OUString aValue = OUString::valueOf((sal_Int32)0); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- @@ -697,36 +697,36 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) @@ -846,23 +846,23 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) { // there exists no possibility to get table types so we have to check - static ::rtl::OUString sTableTypes[] = + static OUString sTableTypes[] = { - ::rtl::OUString("TABLE"), - ::rtl::OUString("VIEW") + OUString("TABLE"), + OUString("VIEW") // Currently we only support a 'TABLE' and 'VIEW' nothing more complex // - // ::rtl::OUString("SYSTEM TABLE"), - // ::rtl::OUString("GLOBAL TEMPORARY"), - // ::rtl::OUString("LOCAL TEMPORARY"), - // ::rtl::OUString("ALIAS"), - // ::rtl::OUString("SYNONYM") + // OUString("SYSTEM TABLE"), + // OUString("GLOBAL TEMPORARY"), + // OUString("LOCAL TEMPORARY"), + // OUString("ALIAS"), + // OUString("SYNONYM") }; ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; // here we fill the rows which should be visible when ask for data from the resultset returned here - const sal_Int32 nSize = sizeof(sTableTypes) / sizeof(::rtl::OUString); + const sal_Int32 nSize = sizeof(sTableTypes) / sizeof(OUString); ODatabaseMetaDataResultSet::ORows aRows; for(sal_Int32 i=0;i < nSize;++i) { @@ -890,7 +890,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.reserve(19); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); + aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -918,8 +918,8 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -930,8 +930,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, - const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& /*types*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, + const OUString& tableNamePattern, const Sequence< OUString >& /*types*/ ) throw(SQLException, RuntimeException) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTables()" ); // this returns an empty resultset where the column-names are already set @@ -947,7 +947,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( ::connectivity::SharedResources aResources; // TODO: // get better message here? - const ::rtl::OUString sMessage = aResources.getResourceString(STR_UNKNOWN_COLUMN_TYPE); + const OUString sMessage = aResources.getResourceString(STR_UNKNOWN_COLUMN_TYPE); ::dbtools::throwGenericSQLException(sMessage ,*this); } pResultSet->setRows( _rRows ); @@ -956,19 +956,19 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTablePrivileges()" ); ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges); Reference< XResultSet > xRef = pResult; - ::std::vector< ::rtl::OUString > tables; + ::std::vector< OUString > tables; if ( !m_pMetaDataHelper->getTableStrings( m_pConnection, tables) ) { ::connectivity::SharedResources aResources; // TODO: // get better message here? - const ::rtl::OUString sMessage = aResources.getResourceString(STR_UNKNOWN_COLUMN_TYPE); + const OUString sMessage = aResources.getResourceString(STR_UNKNOWN_COLUMN_TYPE); ::dbtools::throwGenericSQLException(sMessage ,*this); } @@ -980,7 +980,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[3] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName()); - aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO")); + aRow[7] = new ::connectivity::ORowSetValueDecorator(OUString("NO")); // Iterate over all tables @@ -1014,7 +1014,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { return NULL; } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index 28c84de23b0e..ba2a4eb0d87d 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -39,7 +39,7 @@ namespace connectivity OConnection* m_pConnection; MDatabaseMetaDataHelper* m_pMetaDataHelper; - ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw( ::com::sun::star::sdbc::SQLException ); + ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) throw( ::com::sun::star::sdbc::SQLException ); protected: virtual ~ODatabaseMetaData(); @@ -52,9 +52,9 @@ namespace connectivity private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information - virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual ::rtl::OUString impl_getCatalogSeparator_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); @@ -70,17 +70,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -91,13 +91,13 @@ namespace connectivity virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -123,9 +123,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -174,10 +174,10 @@ namespace connectivity virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -192,7 +192,7 @@ namespace connectivity virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx index 46627c0e460f..eededed803e6 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx @@ -48,7 +48,7 @@ MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper() } sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* _pCon, - ::std::vector< ::rtl::OUString >& _rStrings) + ::std::vector< OUString >& _rStrings) { SAL_INFO("connectivity.mork", "=> MDatabaseMetaDataHelper::getTableStrings()"); @@ -70,7 +70,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* } sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, - const ::rtl::OUString& tableNamePattern, + const OUString& tableNamePattern, ODatabaseMetaDataResultSet::ORows& _rRows) { @@ -85,7 +85,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, ODatabaseMetaDataResultSet::ORows().swap(aRows); // this makes real clear where memory is freed as well aRows.clear(); - ::std::vector< ::rtl::OUString > tables; + ::std::vector< OUString > tables; if ( !getTableStrings( _pCon, tables ) ) return sal_False; @@ -93,7 +93,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, for ( size_t i = 0; i < tables.size(); i++ ) { ODatabaseMetaDataResultSet::ORow aRow(3); - ::rtl::OUString aTableName = tables[i]; + OUString aTableName = tables[i]; SAL_INFO("connectivity.mork", "TableName: " << aTableName ); diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx index d855315de56e..2faa92402c4e 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx @@ -32,10 +32,10 @@ namespace connectivity // sal_Bool getTableStrings( OConnection* _pCon, - ::std::vector< ::rtl::OUString >& _rStrings); + ::std::vector< OUString >& _rStrings); sal_Bool getTables( OConnection* _pCon, - const ::rtl::OUString& tableNamePattern, + const OUString& tableNamePattern, ODatabaseMetaDataResultSet::ORows& _rRows); }; } diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 9e96464b178e..5e94ecc59fc3 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -39,45 +39,45 @@ MorkDriver::MorkDriver(css::uno::Reference< css::uno::XComponentContext > const // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString MorkDriver::getImplementationName_Static( ) throw(css::uno::RuntimeException) +OUString MorkDriver::getImplementationName_Static( ) throw(css::uno::RuntimeException) { - return rtl::OUString(MORK_DRIVER_IMPL_NAME); + return OUString(MORK_DRIVER_IMPL_NAME); } //------------------------------------------------------------------------------ -css::uno::Sequence< ::rtl::OUString > MorkDriver::getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > aSNS(1); - aSNS[0] = ::rtl::OUString( "com.sun.star.sdbc.Driver"); + css::uno::Sequence< OUString > aSNS(1); + aSNS[0] = OUString( "com.sun.star.sdbc.Driver"); return aSNS; } -rtl::OUString SAL_CALL MorkDriver::getImplementationName() +OUString SAL_CALL MorkDriver::getImplementationName() throw (css::uno::RuntimeException) { return getImplementationName_Static(); } -sal_Bool SAL_CALL MorkDriver::supportsService(const rtl::OUString& serviceName) +sal_Bool SAL_CALL MorkDriver::supportsService(const OUString& serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + css::uno::Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(serviceName); ++pSupported) ; return pSupported != pEnd; } -css::uno::Sequence< rtl::OUString > MorkDriver::getSupportedServiceNames() +css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames() throw (css::uno::RuntimeException) { return getSupportedServiceNames_Static(); } css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( - rtl::OUString const & url, + OUString const & url, css::uno::Sequence< css::beans::PropertyValue > const & info) throw (css::sdbc::SQLException, css::uno::RuntimeException) { @@ -91,7 +91,7 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( return xCon; } -sal_Bool MorkDriver::acceptsURL(rtl::OUString const & url) +sal_Bool MorkDriver::acceptsURL(OUString const & url) throw (css::sdbc::SQLException, css::uno::RuntimeException) { SAL_INFO("connectivity.mork", "=> MorkDriver::acceptsURL()" ); @@ -134,7 +134,7 @@ sal_Bool MorkDriver::acceptsURL(rtl::OUString const & url) } css::uno::Sequence< css::sdbc::DriverPropertyInfo > MorkDriver::getPropertyInfo( - rtl::OUString const & url, + OUString const & url, css::uno::Sequence< css::beans::PropertyValue > const & info) throw (css::sdbc::SQLException, css::uno::RuntimeException) { diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index 994b2769e02f..5636b5d01f6b 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -53,9 +53,9 @@ class MorkDriver: { public: MorkDriver(css::uno::Reference< css::uno::XComponentContext > const context); - static ::rtl::OUString getImplementationName_Static() + static OUString getImplementationName_Static() throw(css::uno::RuntimeException); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw (css::uno::RuntimeException); css::uno::Reference< com::sun::star::lang::XMultiServiceFactory > getFactory(){return m_xFactory;} @@ -64,27 +64,27 @@ private: ProfileAccess* m_ProfileAccess; virtual ~MorkDriver() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( - rtl::OUString const & url, + OUString const & url, css::uno::Sequence< css::beans::PropertyValue > const & info) throw (css::sdbc::SQLException, css::uno::RuntimeException); virtual sal_Bool SAL_CALL acceptsURL( - rtl::OUString const & url) + OUString const & url) throw (css::sdbc::SQLException, css::uno::RuntimeException); virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( - rtl::OUString const & url, + OUString const & url, css::uno::Sequence< css::beans::PropertyValue > const & info) throw (css::sdbc::SQLException, css::uno::RuntimeException); diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx b/connectivity/source/drivers/mork/MErrorResource.hxx index d0e4263e73b8..31a7eaff1624 100644 --- a/connectivity/source/drivers/mork/MErrorResource.hxx +++ b/connectivity/source/drivers/mork/MErrorResource.hxx @@ -31,7 +31,7 @@ namespace connectivity private: sal_uInt16 m_nErrorResourceId; sal_Int32 m_nErrorCondition; - ::rtl::OUString m_sParameter; + OUString m_sParameter; public: ErrorDescriptor() @@ -41,7 +41,7 @@ namespace connectivity { } - inline void set( const sal_uInt16 _nErrorResourceId, const sal_Int32 _nErrorCondition, const ::rtl::OUString& _rParam ) + inline void set( const sal_uInt16 _nErrorResourceId, const sal_Int32 _nErrorCondition, const OUString& _rParam ) { m_nErrorResourceId = _nErrorResourceId; m_nErrorCondition = _nErrorCondition; @@ -59,7 +59,7 @@ namespace connectivity inline sal_uInt16 getResId() const { return m_nErrorResourceId; } inline sal_Int32 getErrorCondition() const { return m_nErrorCondition; } - inline const ::rtl::OUString& getParameter() const { return m_sParameter; } + inline const OUString& getParameter() const { return m_sParameter; } inline bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); } }; diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx index 561b1ce5afab..029d9e39be67 100644 --- a/connectivity/source/drivers/mork/MNSFolders.cxx +++ b/connectivity/source/drivers/mork/MNSFolders.cxx @@ -42,10 +42,10 @@ using namespace ::com::sun::star::mozilla; namespace { // ------------------------------------------------------------------- - static ::rtl::OUString lcl_getUserDataDirectory() + static OUString lcl_getUserDataDirectory() { ::osl::Security aSecurity; - ::rtl::OUString aConfigPath; + OUString aConfigPath; #if defined(XP_WIN) || defined(MACOSX) aSecurity.getConfigDir( aConfigPath ); @@ -56,7 +56,7 @@ namespace aSecurity.getHomeDir( aConfigPath ); #endif - return aConfigPath + ::rtl::OUString("/"); + return aConfigPath + OUString("/"); } // ------------------------------------------------------------------- @@ -88,26 +88,26 @@ namespace }; // ------------------------------------------------------------------- - static ::rtl::OUString lcl_guessProfileRoot( MozillaProductType _product ) + static OUString lcl_guessProfileRoot( MozillaProductType _product ) { size_t productIndex = _product - 1; - static ::rtl::OUString s_productDirectories[NB_PRODUCTS]; + static OUString s_productDirectories[NB_PRODUCTS]; if ( s_productDirectories[ productIndex ].isEmpty() ) { - ::rtl::OUString sProductPath; + OUString sProductPath; // check whether we have an anevironment variable which helps us const char* pProfileByEnv = getenv( ProductRootEnvironmentVariable[ productIndex ] ); if ( pProfileByEnv ) { - sProductPath = ::rtl::OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() ); + sProductPath = OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() ); // asume that this is fine, no further checks } else { - ::rtl::OUString sProductDirCandidate; + OUString sProductDirCandidate; const char* pProfileRegistry = "profiles.ini"; // check all possible candidates @@ -117,11 +117,11 @@ namespace break; sProductDirCandidate = lcl_getUserDataDirectory() + - ::rtl::OUString::createFromAscii( DefaultProductDir[ productIndex ][ i ] ); + OUString::createFromAscii( DefaultProductDir[ productIndex ][ i ] ); // check existence ::osl::DirectoryItem aRegistryItem; - ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + ::rtl::OUString::createFromAscii( pProfileRegistry ), aRegistryItem ); + ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + OUString::createFromAscii( pProfileRegistry ), aRegistryItem ); if ( result == ::osl::FileBase::E_None ) { ::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate ); @@ -145,10 +145,10 @@ namespace } // ----------------------------------------------------------------------- -::rtl::OUString getRegistryDir(MozillaProductType product) +OUString getRegistryDir(MozillaProductType product) { if (product == MozillaProductType_Default) - return ::rtl::OUString(); + return OUString(); return lcl_guessProfileRoot( product ); } diff --git a/connectivity/source/drivers/mork/MNSFolders.hxx b/connectivity/source/drivers/mork/MNSFolders.hxx index 609d0ea24e89..552fc2bc3d01 100644 --- a/connectivity/source/drivers/mork/MNSFolders.hxx +++ b/connectivity/source/drivers/mork/MNSFolders.hxx @@ -27,7 +27,7 @@ #include -::rtl::OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product); +OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product); #endif diff --git a/connectivity/source/drivers/mork/MNSINIParser.hxx b/connectivity/source/drivers/mork/MNSINIParser.hxx index e6941bcc5bad..7f078a776e94 100644 --- a/connectivity/source/drivers/mork/MNSINIParser.hxx +++ b/connectivity/source/drivers/mork/MNSINIParser.hxx @@ -30,13 +30,10 @@ #include #endif -using ::rtl::OUString; -using ::rtl::OString; - struct ini_NameValue { - rtl::OUString sName; - rtl::OUString sValue; + OUString sName; + OUString sValue; inline ini_NameValue() SAL_THROW(()) {} @@ -53,10 +50,10 @@ typedef std::list< struct ini_Section { - rtl::OUString sName; + OUString sName; NameValueList lList; }; -typedef std::mapIniSectionMap; diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx index e517f4eae494..5984677dbb73 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx @@ -27,15 +27,15 @@ namespace connectivity { namespace mork { - ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName, - const ::rtl::OUString& aProfilePath + ProfileStruct::ProfileStruct(MozillaProductType aProduct,OUString aProfileName, + const OUString& aProfilePath ) { product=aProduct; profileName = aProfileName; profilePath = aProfilePath; } - ::rtl::OUString ProfileStruct::getProfilePath() + OUString ProfileStruct::getProfilePath() { return profilePath; } @@ -67,9 +67,9 @@ namespace connectivity sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; - ::rtl::OUString regDir = getRegistryDir(product); - ::rtl::OUString profilesIni( regDir ); - profilesIni += ::rtl::OUString("profiles.ini"); + OUString regDir = getRegistryDir(product); + OUString profilesIni( regDir ); + profilesIni += OUString("profiles.ini"); IniParser parser( profilesIni ); IniSectionMap &mAllSection = *(parser.getAllSection()); @@ -78,10 +78,10 @@ namespace connectivity for(;iBegin != iEnd;++iBegin) { ini_Section *aSection = &(*iBegin).second; - ::rtl::OUString profileName; - ::rtl::OUString profilePath; - ::rtl::OUString sIsRelative; - ::rtl::OUString sIsDefault; + OUString profileName; + OUString profilePath; + OUString sIsRelative; + OUString sIsDefault; for(NameValueList::iterator itor=aSection->lList.begin(); itor != aSection->lList.end(); @@ -113,7 +113,7 @@ namespace connectivity isRelative = sIsRelative.toInt32(); } - rtl::OUString fullProfilePath; + OUString fullProfilePath; if(isRelative) { fullProfilePath = regDir + profilePath; @@ -142,20 +142,20 @@ namespace connectivity return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } - ::rtl::OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) { //Profile not found - return ::rtl::OUString(); + return OUString(); } else return m_Product.mProfileList[profileName]->getProfilePath(); } - ::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; @@ -167,7 +167,7 @@ namespace connectivity if (m_Product.mProfileList.empty()) { //there are not any profiles - return ::rtl::OUString(); + return OUString(); } ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second; return aProfile->getProfileName(); diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx index be9562712da7..2ad9843a7f28 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx @@ -41,7 +41,7 @@ namespace connectivity class ProfileStruct; } } -typedef ::std::map < ::rtl::OUString, ::connectivity::mork::ProfileStruct* > ProfileList; +typedef ::std::map < OUString, ::connectivity::mork::ProfileStruct* > ProfileList; namespace connectivity { namespace mork @@ -49,24 +49,24 @@ namespace connectivity class ProfileStruct { public: - ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName, - const ::rtl::OUString &aProfilePath + ProfileStruct(MozillaProductType aProduct,OUString aProfileName, + const OUString &aProfilePath ); MozillaProductType getProductType() { return product;} - ::rtl::OUString getProfileName(){ return profileName;} - ::rtl::OUString getProfilePath() ; + OUString getProfileName(){ return profileName;} + OUString getProfilePath() ; protected: MozillaProductType product; - ::rtl::OUString profileName; - ::rtl::OUString profilePath; + OUString profileName; + OUString profilePath; }; class ProductStruct { public: - void setCurrentProfile(::rtl::OUString aProfileName){mCurrentProfileName = aProfileName;} + void setCurrentProfile(OUString aProfileName){mCurrentProfileName = aProfileName;} - ::rtl::OUString mCurrentProfileName; + OUString mCurrentProfileName; ProfileList mProfileList; }; @@ -78,8 +78,8 @@ namespace connectivity virtual ~ProfileAccess(); ProfileAccess(); - ::rtl::OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); + OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); protected: ProductStruct m_ProductProfileList[4]; sal_Int32 LoadProductsInfo(); diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 803b9606b1d0..00bf3ca1ec70 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -23,7 +23,7 @@ #include "diagnose_ex.h" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -43,7 +43,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mork.PreparedStatement","com.sun.star.sdbc.PreparedStatement"); -OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql) +OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString& sql) :OCommonStatement(_pConnection) ,m_nNumParams(0) ,m_sSqlStatement(sql) @@ -78,7 +78,7 @@ void SAL_CALL OPreparedStatement::disposing() } // ----------------------------------------------------------------------------- -OCommonStatement::StatementType OPreparedStatement::parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted ) +OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , sal_Bool bAdjusted ) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) { SAL_INFO("connectivity.mork", "=> OPreparedStatement::parseSql()" ); @@ -186,7 +186,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -315,7 +315,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex* } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { setNull(parameterIndex,sqlType); } @@ -411,7 +411,7 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere OSL_UNUSED( pMark ); #endif - ::rtl::OUString sParameterName; + OUString sParameterName; // set up Parameter-Column: sal_Int32 eType = DataType::VARCHAR; @@ -432,9 +432,9 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere } Reference xParaColumn = new connectivity::sdbcx::OColumn(sParameterName - ,::rtl::OUString() - ,::rtl::OUString() - ,::rtl::OUString() + ,OUString() + ,OUString() + ,OUString() ,nNullable ,nPrecision ,nScale @@ -443,9 +443,9 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere ,sal_False ,sal_False ,m_pSQLIterator->isCaseSensitive() - ,::rtl::OUString() - ,::rtl::OUString() - ,::rtl::OUString()); + ,OUString() + ,OUString() + ,OUString()); m_xParamColumns->get().push_back(xParaColumn); return nParameter; } @@ -456,7 +456,7 @@ _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable) Reference xProp; if(SQL_ISRULE(_pNode,column_ref)) { - ::rtl::OUString sColumnName,sTableRange; + OUString sColumnName,sTableRange; m_pSQLIterator->getColumnRange(_pNode,sColumnName,sTableRange); if(!sColumnName.isEmpty()) { diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index 0c38cbacb78b..2a00a993d4e7 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -61,7 +61,7 @@ namespace connectivity //==================================================================== sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; sal_Bool m_bPrepared; ::rtl::Reference< OResultSet > m_pResultSet; @@ -78,7 +78,7 @@ namespace connectivity // OCommonStatement overridables virtual StatementType - parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + parseSql( const OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); virtual void initializeResultSet( OResultSet* _pResult ); virtual void clearCachedResultSet(); virtual void cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ); @@ -96,7 +96,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); // A ctor need for returning the object - OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql); + OPreparedStatement( OConnection* _pConnection,const OUString& sql); void lateInit(); //XInterface @@ -113,7 +113,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -121,7 +121,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index d4e3b6009691..4bb1c0c5f3b4 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -53,12 +53,12 @@ MQueryHelperResultEntry::~MQueryHelperResultEntry() { } -rtl::OUString MQueryHelperResultEntry::getValue( const rtl::OString &key ) const +OUString MQueryHelperResultEntry::getValue( const OString &key ) const { FieldMap::const_iterator iter = m_Fields.find( key ); if ( iter == m_Fields.end() ) { - return rtl::OUString(); + return OUString(); } else { @@ -66,7 +66,7 @@ rtl::OUString MQueryHelperResultEntry::getValue( const rtl::OString &key ) const } } -void MQueryHelperResultEntry::setValue( const rtl::OString &key, const rtl::OUString & rValue) +void MQueryHelperResultEntry::setValue( const OString &key, const OUString & rValue) { // SAL_INFO("connectivity.mork", "MQueryHelper::setValue()" ); // SAL_INFO("connectivity.mork", "key: " << &key << " value: " << &rValue); @@ -93,7 +93,7 @@ MQueryHelper::~MQueryHelper() } // ------------------------------------------------------------------------- -void MQueryHelper::setAddressbook(::rtl::OUString &ab) +void MQueryHelper::setAddressbook(OUString &ab) { SAL_INFO("connectivity.mork", "MQueryHelper::setAddressbook()"); @@ -186,7 +186,7 @@ sal_Bool MQueryHelper::checkRowAvailable( sal_Int32 nDBRow ) } -sal_Bool MQueryHelper::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString& aDBColumnName, sal_Int32 nType ) +sal_Bool MQueryHelper::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) { SAL_INFO("connectivity.mork", "MQueryHelper::getRowValue()" ); MQueryHelperResultEntry* xResEntry = getByIndex( nDBRow ); @@ -216,7 +216,7 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection) SAL_INFO("connectivity.mork", "MQueryHelper::executeQuery()" ); reset(); - rtl::OString oStringTable = OUStringToOString( m_aAddressbook, RTL_TEXTENCODING_UTF8 ); + OString oStringTable = OUStringToOString( m_aAddressbook, RTL_TEXTENCODING_UTF8 ); std::set listRecords; bool handleListTable = false; @@ -264,7 +264,7 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection) std::string value = xConnection->getMorkParser()->getValue(CellsIter->second); OString key(column.c_str(), static_cast(column.size())); OString valueOString(value.c_str(), static_cast(value.size())); - rtl::OUString valueOUString = OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 ); + OUString valueOUString = OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 ); entry->setValue(key, valueOUString); } ::std::vector< sal_Bool > vector = entryMatchedByExpression(this, &m_aExpr, entry); @@ -298,10 +298,10 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection) if ( (*evIter)->isStringExpr() ) { MQueryExpressionString* evStr = static_cast (*evIter); // Set the 'name' property of the boolString. - rtl::OString attrName = _aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias( evStr->getName() ); + OString attrName = _aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias( evStr->getName() ); SAL_INFO("connectivity.mork", "Name = " << attrName.getStr()); sal_Bool requiresValue = sal_True; - rtl::OUString currentValue = entry->getValue(attrName); + OUString currentValue = entry->getValue(attrName); if (evStr->getCond() == MQueryOp::Exists || evStr->getCond() == MQueryOp::DoesNotExist) { requiresValue = sal_False; @@ -309,7 +309,7 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection) if (requiresValue) { SAL_INFO("connectivity.mork", "Value = " << evStr->getValue() ); - rtl::OUString searchedValue = evStr->getValue(); + OUString searchedValue = evStr->getValue(); if (evStr->getCond() == MQueryOp::Is) { SAL_INFO("connectivity.mork", "MQueryOp::Is; done"); resultVector.push_back((currentValue == searchedValue) ? sal_True : sal_False); diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 9ba91cac1108..2baea4ef02c4 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -76,15 +76,15 @@ namespace connectivity class MQueryExpressionString : public MQueryExpressionBase { protected: - ::rtl::OUString m_aName; // LHS + OUString m_aName; // LHS MQueryOp::cond_type m_aBooleanCondition; - ::rtl::OUString m_aValue; // RHS + OUString m_aValue; // RHS public: - MQueryExpressionString( ::rtl::OUString& lhs, + MQueryExpressionString( OUString& lhs, MQueryOp::cond_type cond, - ::rtl::OUString rhs ) + OUString rhs ) : MQueryExpressionBase( MQueryExpressionBase::StringExpr ) , m_aName( lhs ) , m_aBooleanCondition( cond ) @@ -92,18 +92,18 @@ namespace connectivity { } - MQueryExpressionString( ::rtl::OUString& lhs, + MQueryExpressionString( OUString& lhs, MQueryOp::cond_type cond ) : MQueryExpressionBase( MQueryExpressionBase::StringExpr ) , m_aName( lhs ) , m_aBooleanCondition( cond ) - , m_aValue( ::rtl::OUString() ) + , m_aValue( OUString() ) { } - const ::rtl::OUString& getName() const { return m_aName; } + const OUString& getName() const { return m_aName; } MQueryOp::cond_type getCond() const { return m_aBooleanCondition; } - const ::rtl::OUString& getValue() const { return m_aValue; } + const OUString& getValue() const { return m_aValue; } }; class MQueryExpression : public MQueryExpressionBase @@ -146,7 +146,7 @@ namespace connectivity class MQueryHelperResultEntry { private: - typedef ::boost::unordered_map< ::rtl::OString, ::rtl::OUString, ::rtl::OStringHash > FieldMap; + typedef ::boost::unordered_map< OString, OUString, OStringHash > FieldMap; mutable ::osl::Mutex m_aMutex; FieldMap m_Fields; @@ -155,8 +155,8 @@ namespace connectivity MQueryHelperResultEntry(); ~MQueryHelperResultEntry(); - rtl::OUString getValue( const rtl::OString &key ) const; - void setValue( const rtl::OString &key, const rtl::OUString & rValue); + OUString getValue( const OString &key ) const; + void setValue( const OString &key, const OUString & rValue); }; class MQueryHelper @@ -174,7 +174,7 @@ namespace connectivity void clear_results(); OColumnAlias m_rColumnAlias; ErrorDescriptor m_aError; - ::rtl::OUString m_aAddressbook; + OUString m_aAddressbook; MQueryExpression m_aExpr; /* @@ -185,7 +185,7 @@ namespace connectivity */ sal_Int32 doQueryDefaultTable(OConnection* xConnection); - sal_Int32 doQueryListTable(OConnection* xConnection, rtl::OString& ouStringTable); + sal_Int32 doQueryListTable(OConnection* xConnection, OString& ouStringTable); public: MQueryHelper(const OColumnAlias& _ca); @@ -197,13 +197,13 @@ namespace connectivity sal_Bool queryComplete() const; sal_Int32 getResultCount() const; sal_Bool checkRowAvailable( sal_Int32 nDBRow ); - sal_Bool getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString& aDBColumnName, sal_Int32 nType ); + sal_Bool getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ); sal_Int32 executeQuery(OConnection* xConnection); const OColumnAlias& getColumnAlias() const { return m_rColumnAlias; } bool hadError() const { return m_aError.is(); } inline ErrorDescriptor& getError() { return m_aError; } - void setAddressbook( ::rtl::OUString&); + void setAddressbook( OUString&); void setExpression( MQueryExpression &_expr ); }; diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index ece7f291ded7..40dfc494298a 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -43,7 +43,7 @@ #include "resource/common_res.hrc" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -62,24 +62,24 @@ using namespace com::sun::star::util; //------------------------------------------------------------------------------ // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ +OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { - return ::rtl::OUString("com.sun.star.sdbcx.mork.ResultSet"); + return OUString("com.sun.star.sdbcx.mork.ResultSet"); } // ------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); + ::com::sun::star::uno::Sequence< OUString > aSupported(2); aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -163,12 +163,12 @@ void OResultSet::methodEntry() if ( !m_pTable ) { OSL_FAIL( "OResultSet::methodEntry: looks like we're disposed, but how is this possible?" ); - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); } } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -421,7 +421,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -727,17 +727,17 @@ void SAL_CALL OResultSet::release() throw() } // ------------------------------------------------------------------------- -void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMatchString ) +void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchString ) { OSL_ENSURE(pNode->count() > 0,"Error parsing parameter in Parse Tree"); OSQLParseNode *pMark = pNode->getChild(0); // Initialize to empty string - rMatchString = ::rtl::OUString(""); + rMatchString = OUString(""); - rtl::OUString aParameterName; + OUString aParameterName; if (SQL_ISPUNCTUATION(pMark,"?")) { - aParameterName = ::rtl::OUString("?"); + aParameterName = OUString("?"); } else if (SQL_ISPUNCTUATION(pMark,":")) { aParameterName = pNode->getChild(1)->getTokenValue(); @@ -763,9 +763,9 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat void OResultSet::analyseWhereClause( const OSQLParseNode* parseTree, MQueryExpression &queryExpression) { - ::rtl::OUString columnName; + OUString columnName; MQueryOp::cond_type op( MQueryOp::Is ); - ::rtl::OUString matchString; + OUString matchString; if ( parseTree == NULL ) return; @@ -774,7 +774,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT ::rtl::Reference xColumns = m_pSQLIterator->getParameters(); if(xColumns.is()) { - ::rtl::OUString aColName, aParameterValue; + OUString aColName, aParameterValue; OSQLColumns::Vector::iterator aIter = xColumns->get().begin(); sal_Int32 i = 1; for(;aIter != xColumns->get().end();++aIter) @@ -857,7 +857,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT else if (pPrec->getNodeType() == SQL_NODE_NOTEQUAL) op = MQueryOp::IsNot; - ::rtl::OUString sTableRange; + OUString sTableRange; if(SQL_ISRULE(parseTree->getChild(0),column_ref)) m_pSQLIterator->getColumnRange(parseTree->getChild(0),columnName,sTableRange); else if(parseTree->getChild(0)->isToken()) @@ -915,7 +915,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT const sal_Unicode ALT_WILDCARD = '*'; const sal_Unicode MATCHCHAR = '_'; - ::rtl::OUString sTableRange; + OUString sTableRange; if(SQL_ISRULE(pColumn,column_ref)) m_pSQLIterator->getColumnRange(pColumn,columnName,sTableRange); @@ -934,12 +934,12 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT // Determine where '%' character is... - if ( matchString.equals( ::rtl::OUString::valueOf( WILDCARD ) ) ) + if ( matchString.equals( OUString::valueOf( WILDCARD ) ) ) { // String containing only a '%' and nothing else op = MQueryOp::Exists; // Will be ignored for Exists case, but clear anyway. - matchString = ::rtl::OUString(""); + matchString = OUString(""); } else if ( matchString.indexOf ( WILDCARD ) == -1 && matchString.indexOf ( MATCHCHAR ) == -1 ) @@ -958,8 +958,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT { // Relatively simple "%string%" - ie, contains... // Cut '%' from front and rear - matchString = matchString.replaceAt( 0, 1, rtl::OUString() ); - matchString = matchString.replaceAt( matchString.getLength() -1 , 1, rtl::OUString() ); + matchString = matchString.replaceAt( 0, 1, OUString() ); + matchString = matchString.replaceAt( matchString.getLength() -1 , 1, OUString() ); if (bNot) op = MQueryOp::DoesNotContain; @@ -982,17 +982,17 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT if ( matchString.indexOf ( WILDCARD ) == 0 ) { op = MQueryOp::EndsWith; - matchString = matchString.replaceAt( 0, 1, rtl::OUString()); + matchString = matchString.replaceAt( 0, 1, OUString()); } else if ( matchString.indexOf ( WILDCARD ) == matchString.getLength() -1 ) { op = MQueryOp::BeginsWith; - matchString = matchString.replaceAt( matchString.getLength() -1 , 1, rtl::OUString() ); + matchString = matchString.replaceAt( matchString.getLength() -1 , 1, OUString() ); } else { sal_Int32 pos = matchString.indexOf ( WILDCARD ); - matchString = matchString.replaceAt( pos, 1,::rtl::OUString(".*") ); + matchString = matchString.replaceAt( pos, 1,OUString(".*") ); op = MQueryOp::RegExp; } @@ -1003,13 +1003,13 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT sal_Int32 pos = matchString.indexOf ( WILDCARD ); while ( (pos = matchString.indexOf ( WILDCARD )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".*") ); + matchString = matchString.replaceAt( pos, 1, OUString(".*") ); } pos = matchString.indexOf ( MATCHCHAR ); while ( (pos = matchString.indexOf( MATCHCHAR )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".") ); + matchString = matchString.replaceAt( pos, 1, OUString(".") ); } op = MQueryOp::RegExp; @@ -1038,7 +1038,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT op = MQueryOp::DoesNotExist; } - ::rtl::OUString sTableRange; + OUString sTableRange; m_pSQLIterator->getColumnRange(parseTree->getChild(0),columnName,sTableRange); queryExpression.getExpressions().push_back( new MQueryExpressionString( columnName, op )); @@ -1066,8 +1066,8 @@ void OResultSet::fillRowData() OSL_ENSURE(m_xColumns.is(), "Need the Columns!!"); OSQLColumns::Vector::const_iterator aIter = m_xColumns->get().begin(); - const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - ::rtl::OUString sName; + const OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + OUString sName; m_aAttributeStrings.clear(); m_aAttributeStrings.reserve(m_xColumns->get().size()); for (sal_Int32 i = 1; aIter != m_xColumns->get().end();++aIter, i++) @@ -1100,7 +1100,7 @@ void OResultSet::fillRowData() m_aQueryHelper.setExpression( queryExpression ); - rtl::OUString aStr( m_pTable->getName() ); + OUString aStr( m_pTable->getName() ); m_aQueryHelper.setAddressbook( aStr ); sal_Int32 rv = m_aQueryHelper.executeQuery(xConnection); @@ -1348,12 +1348,12 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); Reference xTableColumn; - ::rtl::OUString sTableColumnName, sSelectColumnRealName; + OUString sTableColumnName, sSelectColumnRealName; - const ::rtl::OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - const ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); + const OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); - ::std::vector< ::rtl::OUString> aColumnNames; + ::std::vector< OUString> aColumnNames; aColumnNames.reserve(_rxColumns->get().size()); OValueVector::Vector::iterator aRowIter = _rRow->get().begin()+1; for (sal_Int32 i=0; // the first column is the bookmark column @@ -1369,7 +1369,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, if (xTableColumn.is()) xTableColumn->getPropertyValue(sName) >>= sTableColumnName; else - sTableColumnName = ::rtl::OUString(); + sTableColumnName = OUString(); // look if we have such a select column // TODO: would like to have a O(log n) search here ... @@ -1650,9 +1650,9 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException) if ((m_nNewRow && nCurrentRow != m_nNewRow) || ( m_nUpdatedRow && m_nUpdatedRow != nCurrentRow)) { - const ::rtl::OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_COMMIT_ROW, - "$position$", ::rtl::OUString::valueOf(nCurrentRow) + "$position$", OUString::valueOf(nCurrentRow) ) ); ::dbtools::throwGenericSQLException(sError,*this); } @@ -1734,7 +1734,7 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw( updateValue(columnIndex,x); } // ------------------------------------------------------------------------- -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } @@ -1783,9 +1783,9 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { - const ::rtl::OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_COLUMN_NOT_UPDATEABLE, - "$position$", ::rtl::OUString::valueOf(columnIndex) + "$position$", OUString::valueOf(columnIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } // if (!::dbtools::implUpdateObject(this, columnIndex, x)) @@ -1796,9 +1796,9 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { - const ::rtl::OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_COLUMN_NOT_UPDATEABLE, - "$position$", ::rtl::OUString::valueOf(columnIndex) + "$position$", OUString::valueOf(columnIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index e4feaeebe200..2ab027fba1f1 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -153,7 +153,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -182,7 +182,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XResultSetUpdate virtual void SAL_CALL insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -200,7 +200,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -230,10 +230,10 @@ protected: ::std::vector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime ::std::vector m_aOrderbyColumnNumber; ::std::vector m_aOrderbyAscending; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aColumnNames; + ::com::sun::star::uno::Sequence< OUString> m_aColumnNames; OValueRow m_aRow; OValueRow m_aParameterRow; - ::std::vector< ::rtl::OUString> m_aAttributeStrings; + ::std::vector< OUString> m_aAttributeStrings; sal_Int32 m_nParamIndex; sal_Bool m_bIsAlwaysFalseQuery; ::rtl::Reference m_pKeySet; @@ -247,7 +247,7 @@ protected: ::rtl::Reference m_xColumns; // this are the select columns ::rtl::Reference m_xParamColumns; - void parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMatchString ); + void parseParameter( const OSQLParseNode* pNode, OUString& rMatchString ); void fillRowData() throw( ::com::sun::star::sdbc::SQLException ); void analyseWhereClause( const OSQLParseNode* parseTree, MQueryExpression &queryExpression); diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx index 778bdae69ac6..2e7763227c12 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx @@ -71,17 +71,17 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - ::rtl::OUString sColumnName; + OUString sColumnName; try { Reference< XPropertySet > xColumnProps( (m_xColumns->get())[column-1], UNO_QUERY_THROW ); @@ -94,30 +94,30 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th return sColumnName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return m_aTableName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { return getColumnName(column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx index 89b50cf6fa1b..9b94b2b718e8 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx @@ -37,7 +37,7 @@ namespace connectivity class OResultSetMetaData : public OResultSetMetaData_BASE { - ::rtl::OUString m_aTableName; + OUString m_aTableName; ::rtl::Reference m_xColumns; OTable* m_pTable; sal_Bool m_bReadOnly; @@ -48,7 +48,7 @@ namespace connectivity // a constructor that is needed to return the object: // OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){} OResultSetMetaData(const ::rtl::Reference& _rxColumns, - const ::rtl::OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly + const OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly ) :m_aTableName(_aTableName) ,m_xColumns(_rxColumns) @@ -70,19 +70,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 2beacfecd95a..04aeb2225d96 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -49,7 +49,7 @@ #include "resource/common_res.hrc" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -153,22 +153,22 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) { const OSQLTables& xTabs = m_pSQLIterator->getTables(); OSL_ENSURE( !xTabs.empty(), "Need a Table"); - ::rtl::OUString ouTableName=xTabs.begin()->first; + OUString ouTableName=xTabs.begin()->first; xCreateColumn = m_pSQLIterator->getCreateColumns(); OSL_ENSURE(xCreateColumn.is(), "Need the Columns!!"); const OColumnAlias& aColumnAlias = m_pConnection->getColumnAlias(); OSQLColumns::Vector::const_iterator aIter = xCreateColumn->get().begin(); - const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - ::rtl::OUString sName; + const OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + OUString sName; for (sal_Int32 i = 1; aIter != xCreateColumn->get().end();++aIter, i++) { (*aIter)->getPropertyValue(sProprtyName) >>= sName; if ( !aColumnAlias.hasAlias( sName ) ) { - const ::rtl::OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", sName ) ); @@ -190,12 +190,12 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) */ } // ------------------------------------------------------------------------- -OCommonStatement::StatementType OCommonStatement::parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted) +OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , sal_Bool bAdjusted) throw ( SQLException, RuntimeException ) { SAL_INFO("connectivity.mork", "=> OCommonStatement::parseSql()" ); - ::rtl::OUString aErr; + OUString aErr; m_pParseTree = m_aParser.parseTree(aErr,sql); @@ -258,7 +258,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const ::rtl::OUStrin else if(!bAdjusted) //Our sql parser does not support a statement like "create table foo" // So we append ("E-mail" varchar) to the last of it to make it work { - return parseSql(sql + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True); + return parseSql(sql + OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True); } getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); @@ -319,7 +319,7 @@ void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pR } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OCommonStatement::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException) { SAL_INFO("connectivity.mork", "=> OCommonStatement::execute()" ); @@ -334,7 +334,7 @@ sal_Bool SAL_CALL OCommonStatement::execute( const ::rtl::OUString& sql ) throw( } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) { SAL_INFO("connectivity.mork", "=> OCommonStatement::executeQuery()" ); @@ -373,7 +373,7 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep return aRet; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this ); return 0; @@ -406,7 +406,7 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc Sequence< Property > aProps(9); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); @@ -555,7 +555,7 @@ void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef, { SAL_INFO("connectivity.mork", "=> OCommonStatement::setOrderbyColumn()" ); - ::rtl::OUString aColumnName; + OUString aColumnName; if (pColumnRef->count() == 1) aColumnName = pColumnRef->getChild(0)->getTokenValue(); else if (pColumnRef->count() == 3) diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 8fb3c08561b2..84b0560eca65 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -75,7 +75,7 @@ namespace connectivity // for this Statement - ::std::list< ::rtl::OUString> m_aBatchList; + ::std::list< OUString> m_aBatchList; OTable* m_pTable; OConnection* m_pConnection; // The owning Connection object @@ -122,7 +122,7 @@ namespace connectivity /** called to do the parsing of a to-be-executed SQL statement, and set all members as needed */ virtual StatementType - parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + parseSql( const OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** called to initialize a result set, according to a previously parsed SQL statement */ virtual void initializeResultSet( OResultSet* _pResult ); @@ -167,9 +167,9 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mork/MTable.cxx b/connectivity/source/drivers/mork/MTable.cxx index af142fe4210a..e90dc3cd0b85 100644 --- a/connectivity/source/drivers/mork/MTable.cxx +++ b/connectivity/source/drivers/mork/MTable.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, - const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, const ::rtl::OUString& _Description ) + const OUString& _Name, const OUString& _Type, const OUString& _Description ) :OTable_Base(_pTables, _pConnection, sal_True, _Name, _Type, _Description ) ,m_pConnection( _pConnection ) { diff --git a/connectivity/source/drivers/mork/MTable.hxx b/connectivity/source/drivers/mork/MTable.hxx index 18d051034341..7d8cd138a5f1 100644 --- a/connectivity/source/drivers/mork/MTable.hxx +++ b/connectivity/source/drivers/mork/MTable.hxx @@ -37,16 +37,16 @@ namespace connectivity public: OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description ); + const OUString& _Name, + const OUString& _Type, + const OUString& _Description ); OConnection* getConnection() { return m_pConnection;} sal_Bool isReadOnly() const { return sal_False; } - ::rtl::OUString getTableName() const { return m_Name; } - ::rtl::OUString getSchema() const { return m_SchemaName; } + OUString getTableName() const { return m_Name; } + OUString getSchema() const { return m_SchemaName; } // OTableHelper overridables virtual sdbcx::OCollection* createColumns( const TStringVector& _rNames ); diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx index 62e0ba0adc08..e1f8bfae0c69 100644 --- a/connectivity/source/drivers/mork/MTables.cxx +++ b/connectivity/source/drivers/mork/MTables.cxx @@ -44,14 +44,14 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace dbtools; -sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OTables::createObject(const OUString& _rName) { - ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString("%"); + OUString aName,aSchema; + aSchema = OUString("%"); aName = _rName; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx index d72a6d372dd8..28e15691e689 100644 --- a/connectivity/source/drivers/mork/MTables.hxx +++ b/connectivity/source/drivers/mork/MTables.hxx @@ -30,7 +30,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // OCatalog* m_pParent; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/drivers/mork/mork_helper.cxx b/connectivity/source/drivers/mork/mork_helper.cxx index df2758147f05..f0d09b125186 100644 --- a/connectivity/source/drivers/mork/mork_helper.cxx +++ b/connectivity/source/drivers/mork/mork_helper.cxx @@ -40,15 +40,15 @@ int main( int argc, const char* argv[] ) x++; argv++; ProfileAccess* access = new ProfileAccess(); - ::rtl::OUString defaultProfile = access->getDefaultProfile(::com::sun::star::mozilla::MozillaProductType_Thunderbird); + OUString defaultProfile = access->getDefaultProfile(::com::sun::star::mozilla::MozillaProductType_Thunderbird); SAL_INFO("connectivity.mork", "DefaultProfile: " << defaultProfile); - ::rtl::OUString profilePath = access->getProfilePath(::com::sun::star::mozilla::MozillaProductType_Thunderbird, defaultProfile); + OUString profilePath = access->getProfilePath(::com::sun::star::mozilla::MozillaProductType_Thunderbird, defaultProfile); SAL_INFO("connectivity.mork", "ProfilePath: " << profilePath); - profilePath += rtl::OUString( "/abook.mab" ); + profilePath += OUString( "/abook.mab" ); SAL_INFO("connectivity.mork", "abook.mab: " << profilePath); - rtl::OString aOString = ::rtl::OUStringToOString( profilePath, RTL_TEXTENCODING_UTF8 ); + OString aOString = OUStringToOString( profilePath, RTL_TEXTENCODING_UTF8 ); openAddressBook(aOString.getStr()); } diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx index 668a41f76993..06cf96816710 100644 --- a/connectivity/source/drivers/mozab/MCatalog.cxx +++ b/connectivity/source/drivers/mozab/MCatalog.cxx @@ -50,15 +50,15 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) void OCatalog::refreshTables() { TStringVector aVector; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); + OUString("%"),OUString("%"),aTypes); if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aName; + OUString aName; while(xResult->next()) { aName = xRow->getString(3); diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx index 871cbbf22a3a..cad5f7ed77ff 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.cxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx @@ -82,7 +82,7 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun:: }; for ( size_t i = 0; i < sizeof( s_pProgrammaticNames ) / sizeof( s_pProgrammaticNames[0] ); ++i ) - m_aAliasMap[ ::rtl::OUString::createFromAscii( s_pProgrammaticNames[i] ) ] = AliasEntry( s_pProgrammaticNames[i], i ); + m_aAliasMap[ OUString::createFromAscii( s_pProgrammaticNames[i] ) ] = AliasEntry( s_pProgrammaticNames[i], i ); initialize( _rxORB ); } @@ -100,19 +100,19 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su { //............................................................. Reference< XNameAccess > xAliasesNode; - xDriverNode->getPropertyValue( ::rtl::OUString("ColumnAliases") ) >>= xAliasesNode; + xDriverNode->getPropertyValue( OUString("ColumnAliases") ) >>= xAliasesNode; OSL_ENSURE( xAliasesNode.is(), "OColumnAlias::setAlias: missing the aliases node!" ); // this is a set of string nodes - Sequence< ::rtl::OUString > aProgrammaticNames; + Sequence< OUString > aProgrammaticNames; if ( xAliasesNode.is() ) aProgrammaticNames = xAliasesNode->getElementNames(); //............................................................. // travel through all the set elements - const ::rtl::OUString* pProgrammaticNames = aProgrammaticNames.getConstArray(); - const ::rtl::OUString* pProgrammaticNamesEnd = pProgrammaticNames + aProgrammaticNames.getLength(); - ::rtl::OUString sAssignedAlias; + const OUString* pProgrammaticNames = aProgrammaticNames.getConstArray(); + const OUString* pProgrammaticNamesEnd = pProgrammaticNames + aProgrammaticNames.getLength(); + OUString sAssignedAlias; for ( ; pProgrammaticNames < pProgrammaticNamesEnd; ++pProgrammaticNames ) { @@ -123,7 +123,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su if ( sAssignedAlias.isEmpty() ) sAssignedAlias = *pProgrammaticNames; - ::rtl::OString sAsciiProgrammaticName( ::rtl::OUStringToOString( *pProgrammaticNames, RTL_TEXTENCODING_ASCII_US ) ); + OString sAsciiProgrammaticName( OUStringToOString( *pProgrammaticNames, RTL_TEXTENCODING_ASCII_US ) ); //............................................................. #if OSL_DEBUG_LEVEL > 0 bool bFound = false; @@ -158,21 +158,21 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su } //------------------------------------------------------------------ -::rtl::OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const ::rtl::OUString& _rAlias ) const +OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const { AliasMap::const_iterator pos = m_aAliasMap.find( _rAlias ); if ( pos == m_aAliasMap.end() ) { OSL_FAIL( "OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias: no programmatic name for this alias!" ); - return ::rtl::OUStringToOString( _rAlias, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( _rAlias, RTL_TEXTENCODING_UTF8 ); } return pos->second.programmaticAsciiName; } //------------------------------------------------------------------ -bool OColumnAlias::isColumnSearchable( const ::rtl::OUString _alias ) const +bool OColumnAlias::isColumnSearchable( const OUString _alias ) const { - ::rtl::OString sProgrammatic = getProgrammaticNameOrFallbackToUTF8Alias( _alias ); + OString sProgrammatic = getProgrammaticNameOrFallbackToUTF8Alias( _alias ); return ( !sProgrammatic.equals( "HomeCountry" ) && !sProgrammatic.equals( "WorkCountry" ) diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx index 2dd6c42a1a52..51946b410165 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.hxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx @@ -36,7 +36,7 @@ namespace connectivity public: struct AliasEntry { - ::rtl::OString programmaticAsciiName; + OString programmaticAsciiName; size_t columnPosition; AliasEntry() @@ -50,7 +50,7 @@ namespace connectivity { } }; - typedef ::boost::unordered_map< ::rtl::OUString, AliasEntry, ::rtl::OUStringHash > AliasMap; + typedef ::boost::unordered_map< OUString, AliasEntry, OUStringHash > AliasMap; private: AliasMap m_aAliasMap; @@ -58,16 +58,16 @@ namespace connectivity public: OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); - inline bool hasAlias( const ::rtl::OUString& _rAlias ) const + inline bool hasAlias( const OUString& _rAlias ) const { return m_aAliasMap.find( _rAlias ) != m_aAliasMap.end(); } - ::rtl::OString getProgrammaticNameOrFallbackToUTF8Alias( const ::rtl::OUString& _rAlias ) const; + OString getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const; inline AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); } inline AliasMap::const_iterator end() const { return m_aAliasMap.end(); } - bool isColumnSearchable( const ::rtl::OUString _alias ) const; + bool isColumnSearchable( const OUString _alias ) const; private: void initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx index 786280cbbe5e..a7c3b96c5758 100644 --- a/connectivity/source/drivers/mozab/MColumns.cxx +++ b/connectivity/source/drivers/mozab/MColumns.cxx @@ -41,12 +41,12 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OColumns::createObject(const OUString& _rName) { const Any aCatalog; - const ::rtl::OUString sCatalogName; - const ::rtl::OUString sSchemaName(m_pTable->getSchema()); - const ::rtl::OUString sTableName(m_pTable->getTableName()); + const OUString sCatalogName; + const OUString sSchemaName(m_pTable->getSchema()); + const OUString sTableName(m_pTable->getTableName()); Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns( aCatalog, sSchemaName, sTableName, _rName); @@ -59,7 +59,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) if(xRow->getString(4) == _rName) { sal_Int32 nType = xRow->getInt(5); - ::rtl::OUString sTypeName = xRow->getString(6); + OUString sTypeName = xRow->getString(6); sal_Int32 nPrec = xRow->getInt(7); OColumn* pRet = new OColumn(_rName, diff --git a/connectivity/source/drivers/mozab/MColumns.hxx b/connectivity/source/drivers/mozab/MColumns.hxx index d0ee122bae83..f841dd45b799 100644 --- a/connectivity/source/drivers/mozab/MColumns.hxx +++ b/connectivity/source/drivers/mozab/MColumns.hxx @@ -34,7 +34,7 @@ namespace connectivity protected: OTable* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OColumns( OTable* _pTable, diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index d71c6ece474b..2fabd5f97f90 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -46,7 +46,7 @@ namespace connectivity com::sun::star::configuration::theDefaultProvider::get( comphelper::getComponentContext( _rxORB ) ) ); - ::rtl::OUString sCompleteNodePath( "/org.openoffice.Office.DataAccess/DriverSettings/" ); + OUString sCompleteNodePath( "/org.openoffice.Office.DataAccess/DriverSettings/" ); sCompleteNodePath += OConnection::getDriverImplementationName(); //========================================================= @@ -54,14 +54,14 @@ namespace connectivity Sequence< Any > aArguments(2); // the path to the node to open aArguments[0] <<= PropertyValue( - ::rtl::OUString("nodepath"), + OUString("nodepath"), 0, makeAny( sCompleteNodePath ), PropertyState_DIRECT_VALUE ); // the depth: -1 means unlimited aArguments[1] <<= PropertyValue( - ::rtl::OUString("depth"), + OUString("depth"), 0, makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE @@ -70,7 +70,7 @@ namespace connectivity //========================================================= // create the access Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess" ), + OUString("com.sun.star.configuration.ConfigurationAccess" ), aArguments ); OSL_ENSURE( xAccess.is(), "createDriverConfigNode: invalid access returned (should throw an exception instead)!" ); @@ -111,10 +111,10 @@ namespace connectivity } //----------------------------------------------------------------- - ::rtl::OUString getDescription(const sal_Char* sNode,const ::rtl::OUString & sDefault) + OUString getDescription(const sal_Char* sNode,const OUString & sDefault) { - ::rtl::OUString sPreferredName; - ::rtl::OUString sDescription; + OUString sPreferredName; + OUString sDescription; Reference< XMultiServiceFactory > xFactory = getMozabServiceFactory(); OSL_ENSURE( xFactory.is(), "getPreferredProfileName: invalid service factory!" ); @@ -125,12 +125,12 @@ namespace connectivity Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory ); Reference< XPropertySet > xMozPrefsNode; if ( xDriverNode.is() ) - xDriverNode->getPropertyValue( ::rtl::OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; + xDriverNode->getPropertyValue( OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" ); if ( xMozPrefsNode.is() ) - xMozPrefsNode->getPropertyValue( ::rtl::OUString("ProfileName" ) ) >>= sPreferredName; + xMozPrefsNode->getPropertyValue( OUString("ProfileName" ) ) >>= sPreferredName; if ( xMozPrefsNode.is() ) - xMozPrefsNode->getPropertyValue( ::rtl::OUString::createFromAscii(sNode) ) >>= sDescription; + xMozPrefsNode->getPropertyValue( OUString::createFromAscii(sNode) ) >>= sDescription; if (sDescription.getLength() == 0) sDescription = sDefault; } @@ -144,9 +144,9 @@ namespace connectivity return sDescription; } //----------------------------------------------------------------- - ::rtl::OUString getPreferredProfileName( ) + OUString getPreferredProfileName( ) { - ::rtl::OUString sPreferredName; + OUString sPreferredName; Reference< XMultiServiceFactory > xFactory = getMozabServiceFactory(); OSL_ENSURE( xFactory.is(), "getPreferredProfileName: invalid service factory!" ); @@ -157,10 +157,10 @@ namespace connectivity Reference< XPropertySet > xDriverNode = createDriverConfigNode( xFactory ); Reference< XPropertySet > xMozPrefsNode; if ( xDriverNode.is() ) - xDriverNode->getPropertyValue( ::rtl::OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; + xDriverNode->getPropertyValue( OUString("MozillaPreferences" ) ) >>= xMozPrefsNode; OSL_ENSURE( xMozPrefsNode.is(), "getPreferredProfileName: could not access the node for the mozilla preferences!" ); if ( xMozPrefsNode.is() ) - xMozPrefsNode->getPropertyValue( ::rtl::OUString("ProfileName" ) ) >>= sPreferredName; + xMozPrefsNode->getPropertyValue( OUString("ProfileName" ) ) >>= sPreferredName; } catch( const Exception& ) { @@ -178,7 +178,7 @@ namespace connectivity extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) { static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString sUserProfile; + static OUString sUserProfile; if ( !bReadConfig ) { sUserProfile = ::connectivity::mozab::getPreferredProfileName( ); @@ -191,15 +191,15 @@ extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) extern "C" const sal_Char* SAL_CALL getPabDescription( void ) { static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString usPabDescription; - static ::rtl::OString sPabDescription; + static OUString usPabDescription; + static OString sPabDescription; if ( !bReadConfig ) { usPabDescription = ::connectivity::mozab::getDescription( "PabDescription" , - ::rtl::OUString("Personal Address Book" )); - sPabDescription = ::rtl::OUStringToOString( usPabDescription, + OUString("Personal Address Book" )); + sPabDescription = OUStringToOString( usPabDescription, RTL_TEXTENCODING_UTF8); bReadConfig = sal_True; } @@ -211,15 +211,15 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) extern "C" const sal_Char* SAL_CALL getHisDescription( void ) { static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString usHisDescription; - static ::rtl::OString sHisDescription; + static OUString usHisDescription; + static OString sHisDescription; if ( !bReadConfig ) { usHisDescription = ::connectivity::mozab::getDescription( "HisDescription" , - ::rtl::OUString("Collected Addresses" )); - sHisDescription = ::rtl::OUStringToOString( usHisDescription, + OUString("Collected Addresses" )); + sHisDescription = OUStringToOString( usHisDescription, RTL_TEXTENCODING_UTF8); bReadConfig = sal_True; } diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 05cf2479153e..4345f5cf58f3 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -41,7 +41,7 @@ #include #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -89,9 +89,9 @@ const sal_Char* getSdbcScheme( SdbcScheme _eScheme ) return NULL; } // ----------------------------------------------------------------------------- -::rtl::OUString OConnection::getDriverImplementationName() +OUString OConnection::getDriverImplementationName() { - return rtl::OUString(MOZAB_DRIVER_IMPL_NAME); + return OUString(MOZAB_DRIVER_IMPL_NAME); } // ----------------------------------------------------------------------------- @@ -139,7 +139,7 @@ void SAL_CALL OConnection::release() throw() } // ----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) +void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { OSL_TRACE("IN OConnection::construct()" ); // open file @@ -151,11 +151,11 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV nLen = url.indexOf(':',nLen+1); OSL_ENSURE( url.copy( 0, nLen ) == "sdbc:address", "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" ); - ::rtl::OUString aAddrbookURI(url.copy(nLen+1)); + OUString aAddrbookURI(url.copy(nLen+1)); // Get Scheme nLen = aAddrbookURI.indexOf(':'); - ::rtl::OUString aAddrbookScheme; - ::rtl::OUString sAdditionalInfo; + OUString aAddrbookScheme; + OUString sAdditionalInfo; if ( nLen == -1 ) { // There isn't any subschema: - but could be just subschema @@ -192,12 +192,12 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV // * for windows system address book // "sdbc:address:outlookexp:" -> aboutlookdirectory://oe/ // - m_sBindDN = rtl::OUString( ""); - m_sPassword = rtl::OUString( ""); + m_sBindDN = OUString( ""); + m_sPassword = OUString( ""); m_bUseSSL = sal_False; if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_MOZILLA ) ) == 0 ) { - m_sMozillaURI = rtl::OUString::createFromAscii( getSchemeURI( SCHEME_MOZILLA ) ); + m_sMozillaURI = OUString::createFromAscii( getSchemeURI( SCHEME_MOZILLA ) ); m_eSDBCAddressType = SDBCAddress::Mozilla; if(!sAdditionalInfo.isEmpty()) m_sMozillaProfile = sAdditionalInfo; @@ -205,16 +205,16 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV else if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_THUNDERBIRD ) ) == 0 ) { //Yes. I am sure it is SCHEME_MOZILLA - m_sMozillaURI = rtl::OUString::createFromAscii( getSchemeURI( SCHEME_MOZILLA ) ); + m_sMozillaURI = OUString::createFromAscii( getSchemeURI( SCHEME_MOZILLA ) ); m_eSDBCAddressType = SDBCAddress::ThunderBird; if(!sAdditionalInfo.isEmpty()) m_sMozillaProfile = sAdditionalInfo; } else if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_LDAP ) ) == 0 ) { - rtl::OUString sBaseDN; + OUString sBaseDN; sal_Int32 nPortNumber = -1; - m_sMozillaURI = rtl::OUString::createFromAscii( getSchemeURI( SCHEME_LDAP ) ); + m_sMozillaURI = OUString::createFromAscii( getSchemeURI( SCHEME_LDAP ) ); m_eSDBCAddressType = SDBCAddress::LDAP; if ( m_sHostName.isEmpty() ) @@ -280,27 +280,27 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV throwSQLException( STR_NO_HOSTNAME, *this ); if ( nPortNumber > 0 ) { - m_sMozillaURI += rtl::OUString( ":" ); - m_sMozillaURI += rtl::OUString::valueOf( nPortNumber ); + m_sMozillaURI += OUString( ":" ); + m_sMozillaURI += OUString::valueOf( nPortNumber ); } if ( !sBaseDN.isEmpty() ) { - m_sMozillaURI += rtl::OUString( "/" ); + m_sMozillaURI += OUString( "/" ); m_sMozillaURI += sBaseDN; } else throwSQLException( STR_NO_BASEDN, *this ); // Addition of a fake query to enable the Mozilla LDAP directory to work correctly. - m_sMozillaURI += ::rtl::OUString( "?(or(DisplayName,=,DontDoThisAtHome)))"); + m_sMozillaURI += OUString( "?(or(DisplayName,=,DontDoThisAtHome)))"); } else if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_OUTLOOK_MAPI ) ) == 0 ) { - m_sMozillaURI = ::rtl::OUString::createFromAscii( getSchemeURI( SCHEME_OUTLOOK_MAPI ) ); + m_sMozillaURI = OUString::createFromAscii( getSchemeURI( SCHEME_OUTLOOK_MAPI ) ); m_eSDBCAddressType = SDBCAddress::Outlook; } else if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_OUTLOOK_EXPRESS ) ) == 0 ) { - m_sMozillaURI = rtl::OUString::createFromAscii( getSchemeURI( SCHEME_OUTLOOK_EXPRESS ) ); + m_sMozillaURI = OUString::createFromAscii( getSchemeURI( SCHEME_OUTLOOK_EXPRESS ) ); m_eSDBCAddressType = SDBCAddress::OutlookExp; } else @@ -331,8 +331,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV } // Test connection by getting to get the Table Names - ::std::vector< ::rtl::OUString > tables; - ::std::vector< ::rtl::OUString > types; + ::std::vector< OUString > tables; + ::std::vector< OUString > types; if ( !_aDbHelper.getTableStrings( this, tables, types ) ) { throwSQLException( _aDbHelper.getError(), *this ); @@ -356,7 +356,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -373,7 +373,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const :: return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException) { OSL_UNUSED( _sSql ); ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); @@ -381,7 +381,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl:: return NULL; } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here @@ -449,15 +449,15 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return sal_False; } // -------------------------------------------------------------------------------- -void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) { // return your current catalog - return ::rtl::OUString(); + return OUString(); } // -------------------------------------------------------------------------------- void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) @@ -555,10 +555,10 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer OSL_ENSURE( ( _rError.getErrorCondition() == 0 ), "OConnection::throwSQLException: unsupported error code combination!" ); - ::rtl::OUString sParameter( _rError.getParameter() ); + OUString sParameter( _rError.getParameter() ); if ( !sParameter.isEmpty() ) { - const ::rtl::OUString sError( getResources().getResourceStringWithSubstitution( + const OUString sError( getResources().getResourceStringWithSubstitution( _rError.getResId(), "$1$", sParameter ) ); @@ -573,7 +573,7 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer if ( _rError.getErrorCondition() != 0 ) { SQLError aErrorHelper( comphelper::getComponentContext(getDriver()->getMSFactory()) ); - ::rtl::OUString sParameter( _rError.getParameter() ); + OUString sParameter( _rError.getParameter() ); if ( !sParameter.isEmpty() ) aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext, sParameter ); else diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 4bc92c9443f2..b9fe754779ff 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -110,23 +110,23 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; // Start of Additions from the land of mozilla OColumnAlias m_aColumnAlias; - rtl::OUString m_sMozillaURI; - rtl::OUString m_sMozillaProfile; + OUString m_sMozillaURI; + OUString m_sMozillaProfile; sal_Int32 m_nMaxResultRecords; MNameMapper* m_aNameMapper; //LDAP only - rtl::OUString m_sHostName; + OUString m_sHostName; sal_Bool m_bUseSSL; - rtl::OUString m_sBindDN; - rtl::OUString m_sUser; // the user name - rtl::OUString m_sPassword; + OUString m_sBindDN; + OUString m_sUser; // the user name + OUString m_sPassword; SDBCAddress::sdbc_address_type m_eSDBCAddressType; sal_Bool m_bForceLoadTable; public: - virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); OConnection(MozabDriver* _pDriver); virtual ~OConnection(); @@ -141,9 +141,9 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -152,8 +152,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -172,9 +172,9 @@ namespace connectivity // Additions from the land of mozilla - rtl::OUString getMozURI() const { return m_sMozillaURI; } - rtl::OUString getMozProfile() const { return m_sMozillaProfile; } - void setMozProfile(rtl::OUString &aNewProfile) { m_sMozillaProfile = aNewProfile; } + OUString getMozURI() const { return m_sMozillaURI; } + OUString getMozProfile() const { return m_sMozillaProfile; } + void setMozProfile(OUString &aNewProfile) { m_sMozillaProfile = aNewProfile; } ::com::sun::star::mozilla::MozillaProductType getProduct() { @@ -184,11 +184,11 @@ namespace connectivity } // Get Ldap BindDN (user name) - rtl::OUString getBindDN() const { return m_sBindDN; } + OUString getBindDN() const { return m_sBindDN; } // Get Ldap Password - rtl::OUString getPassword() const { return m_sPassword; } + OUString getPassword() const { return m_sPassword; } // Get Ldap Host name - rtl::OUString getHost() const { return m_sHostName; } + OUString getHost() const { return m_sHostName; } // Get whether use ssl to connect to ldap sal_Bool getUseSSL() const {return m_bUseSSL;} @@ -203,7 +203,7 @@ namespace connectivity const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } - static ::rtl::OUString getDriverImplementationName(); + static OUString getDriverImplementationName(); MNameMapper* getNameMapper(); void setForceLoadTables(sal_Bool aForce){ m_bForceLoadTable = aForce;} diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index 8492941706ca..c9241a6c83bc 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -31,7 +31,7 @@ #include #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -72,8 +72,8 @@ ODatabaseMetaData::~ODatabaseMetaData() // ------------------------------------------------------------------------- ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( - const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException) + const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException) { static ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(19); @@ -81,8 +81,8 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > tables; - ::std::vector< ::rtl::OUString > types; + ::std::vector< OUString > tables; + ::std::vector< OUString > types; if ( !m_pDbMetaDataHelper->getTableStrings( m_pConnection, tables, types) ) { getOwnConnection()->throwSQLException( m_pDbMetaDataHelper->getError(), *this ); } @@ -92,13 +92,13 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // **************************************************** // Catalog - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("")); + aRow[1] = new ORowSetValueDecorator(OUString("")); // Schema - aRow[2] = new ORowSetValueDecorator(::rtl::OUString("")); + aRow[2] = new ORowSetValueDecorator(OUString("")); // DATA_TYPE aRow[5] = new ORowSetValueDecorator(static_cast(DataType::VARCHAR)); // TYPE_NAME, not used - aRow[6] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR")); + aRow[6] = new ORowSetValueDecorator(OUString("VARCHAR")); // COLUMN_SIZE aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE); // BUFFER_LENGTH, not used @@ -120,7 +120,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( // CHAR_OCTET_LENGTH, refer to [5] aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH); // IS_NULLABLE - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); const OColumnAlias& colNames = m_pConnection->getColumnAlias(); @@ -153,9 +153,9 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( return( aRows ); } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) @@ -286,21 +286,21 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("\"")); + return OUString( RTL_CONSTASCII_USTRINGPARAM("\"")); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- @@ -638,52 +638,52 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQL return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)1); + OUString aValue = OUString::valueOf((sal_Int32)1); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)0); + OUString aValue = OUString::valueOf((sal_Int32)0); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- @@ -702,36 +702,36 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) @@ -851,23 +851,23 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) { // there exists no possibility to get table types so we have to check - static ::rtl::OUString sTableTypes[] = + static OUString sTableTypes[] = { - ::rtl::OUString("TABLE"), - ::rtl::OUString("VIEW") + OUString("TABLE"), + OUString("VIEW") // Currently we only support a 'TABLE' and 'VIEW' nothing more complex // - // ::rtl::OUString("SYSTEM TABLE"), - // ::rtl::OUString("GLOBAL TEMPORARY"), - // ::rtl::OUString("LOCAL TEMPORARY"), - // ::rtl::OUString("ALIAS"), - // ::rtl::OUString("SYNONYM") + // OUString("SYSTEM TABLE"), + // OUString("GLOBAL TEMPORARY"), + // OUString("LOCAL TEMPORARY"), + // OUString("ALIAS"), + // OUString("SYNONYM") }; ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; // here we fill the rows which should be visible when ask for data from the resultset returned here - const sal_Int32 nSize = sizeof(sTableTypes) / sizeof(::rtl::OUString); + const sal_Int32 nSize = sizeof(sTableTypes) / sizeof(OUString); ODatabaseMetaDataResultSet::ORows aRows; for(sal_Int32 i=0;i < nSize;++i) { @@ -895,7 +895,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.reserve(19); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); + aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -923,8 +923,8 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -935,8 +935,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, - const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, + const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -956,14 +956,14 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges); Reference< XResultSet > xRef = pResult; - ::std::vector< ::rtl::OUString > tables; - ::std::vector< ::rtl::OUString > types; + ::std::vector< OUString > tables; + ::std::vector< OUString > types; if ( !m_pDbMetaDataHelper->getTableStrings( m_pConnection, tables, types ) ) getOwnConnection()->throwSQLException( m_pDbMetaDataHelper->getError(), *this ); @@ -975,7 +975,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[3] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue(); aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName()); - aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO")); + aRow[7] = new ::connectivity::ORowSetValueDecorator(OUString("NO")); // Iterate over all tables @@ -1010,7 +1010,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { return NULL; } diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx index 4d4cb0935ac1..5d56c82b2242 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx @@ -35,7 +35,7 @@ namespace connectivity OConnection* m_pConnection; MDatabaseMetaDataHelper* m_pDbMetaDataHelper; - ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw( ::com::sun::star::sdbc::SQLException ); + ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) throw( ::com::sun::star::sdbc::SQLException ); protected: virtual ~ODatabaseMetaData(); @@ -48,9 +48,9 @@ namespace connectivity private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information - virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual ::rtl::OUString impl_getCatalogSeparator_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); @@ -66,17 +66,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -87,13 +87,13 @@ namespace connectivity virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -119,9 +119,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -170,10 +170,10 @@ namespace connectivity virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -188,7 +188,7 @@ namespace connectivity virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index 2aa7fdbc42b0..1e56e719ad12 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -80,34 +80,34 @@ void MozabDriver::disposing() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString MozabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString MozabDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString(MOZAB_DRIVER_IMPL_NAME); + return OUString(MOZAB_DRIVER_IMPL_NAME); // this name is referenced in the configuration and in the mozab.xml // Please take care when changing it. } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > MozabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > MozabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported // for more information @see com.sun.star.sdbc.Driver - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( "com.sun.star.sdbc.Driver"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString( "com.sun.star.sdbc.Driver"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL MozabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL MozabDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL MozabDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL MozabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -115,13 +115,13 @@ sal_Bool SAL_CALL MozabDriver::supportsService( const ::rtl::OUString& _rService } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL MozabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL MozabDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MozabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { if ( !ensureInit() ) return NULL; @@ -134,7 +134,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u { ::osl::MutexGuard aGuard(m_aMutex); //We must make sure we create an com.sun.star.mozilla.MozillaBootstrap brfore call any mozilla codes - Reference xInstance = m_xMSFactory->createInstance(::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap") ); + Reference xInstance = m_xMSFactory->createInstance(OUString( "com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); OConnection* pCon = reinterpret_cast((*m_pCreationFunc)(this)); @@ -146,9 +146,9 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u else { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_COULD_NOT_LOAD_LIB, - "$libname$", ::rtl::OUString( SVLIBRARY( "mozabdrv" ) ) + "$libname$", OUString( SVLIBRARY( "mozabdrv" ) ) ) ); ::dbtools::throwGenericSQLException(sError,*this); @@ -157,7 +157,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL MozabDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL MozabDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { if ( !ensureInit() ) @@ -167,7 +167,7 @@ sal_Bool SAL_CALL MozabDriver::acceptsURL( const ::rtl::OUString& url ) return impl_classifyURL(url) != Unknown; } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( !ensureInit() ) return Sequence< DriverPropertyInfo >(); @@ -179,23 +179,23 @@ Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const ::rt ::std::vector< DriverPropertyInfo > aDriverInfo; aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("BaseDN") - ,::rtl::OUString("Base DN.") + OUString("BaseDN") + ,OUString("Base DN.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("MaxRowCount") - ,::rtl::OUString("Records (max.)") + OUString("MaxRowCount") + ,OUString("Records (max.)") ,sal_False - ,::rtl::OUString("100") - ,Sequence< ::rtl::OUString >()) + ,OUString("100") + ,Sequence< OUString >()) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); // if you have something special to say return it here :-) return Sequence< DriverPropertyInfo >(); @@ -211,22 +211,22 @@ sal_Int32 SAL_CALL MozabDriver::getMinorVersion( ) throw(RuntimeException) return 0; // depends on you } // -------------------------------------------------------------------------------- -EDriverType MozabDriver::impl_classifyURL( const ::rtl::OUString& url ) +EDriverType MozabDriver::impl_classifyURL( const OUString& url ) { // Skip 'sdbc:mozab: part of URL // sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); - ::rtl::OUString aAddrbookURI(url.copy(nLen+1)); + OUString aAddrbookURI(url.copy(nLen+1)); // Get Scheme nLen = aAddrbookURI.indexOf(':'); - ::rtl::OUString aAddrbookScheme; + OUString aAddrbookScheme; if ( nLen == -1 ) { // There isn't any subschema: - but could be just subschema if ( !aAddrbookURI.isEmpty() ) aAddrbookScheme= aAddrbookURI; - else if(url == ::rtl::OUString("sdbc:address:") ) + else if(url == OUString("sdbc:address:") ) return Unknown; // TODO check else return Unknown; @@ -267,12 +267,12 @@ namespace _rFunction = NULL; if ( _rModule ) { - const ::rtl::OUString sSymbolName = ::rtl::OUString::createFromAscii( _pAsciiSymbolName ); + const OUString sSymbolName = OUString::createFromAscii( _pAsciiSymbolName ); _rFunction = (FUNCTION)( osl_getFunctionSymbol( _rModule, sSymbolName.pData ) ); if ( !_rFunction ) { // did not find the symbol - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " ); aBuf.append( sSymbolName ); OSL_FAIL( aBuf.makeStringAndClear().getStr() ); @@ -293,7 +293,7 @@ bool MozabDriver::ensureInit() OSL_ENSURE(NULL == m_pCreationFunc, "MozabDriver::ensureInit: inconsistence: already have a factory function!"); - const ::rtl::OUString sModuleName(SVLIBRARY( "mozabdrv" )); + const OUString sModuleName(SVLIBRARY( "mozabdrv" )); // load the mozabdrv library m_hModule = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx index 2a1bd71b5431..75899a3e163b 100644 --- a/connectivity/source/drivers/mozab/MDriver.hxx +++ b/connectivity/source/drivers/mozab/MDriver.hxx @@ -74,18 +74,18 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); @@ -93,7 +93,7 @@ namespace connectivity & getMSFactory(void) const { return m_xMSFactory; } private: - EDriverType impl_classifyURL( const ::rtl::OUString& url ); + EDriverType impl_classifyURL( const OUString& url ); }; } diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx index 971749d03cc0..346c6bda8ff1 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx @@ -33,7 +33,7 @@ #include "diagnose_ex.h" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -53,7 +53,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mozab.PreparedStatement","com.sun.star.sdbc.PreparedStatement"); -OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql) +OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString& sql) :OCommonStatement(_pConnection) ,m_nNumParams(0) ,m_sSqlStatement(sql) @@ -88,7 +88,7 @@ void SAL_CALL OPreparedStatement::disposing() } // ----------------------------------------------------------------------------- -OCommonStatement::StatementType OPreparedStatement::parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted ) +OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , sal_Bool bAdjusted ) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) { StatementType eStatementType = OCommonStatement::parseSql( sql, bAdjusted ); @@ -189,7 +189,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -316,7 +316,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex* } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { setNull(parameterIndex,sqlType); } @@ -412,7 +412,7 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere OSL_UNUSED( pMark ); #endif - ::rtl::OUString sParameterName; + OUString sParameterName; // set up Parameter-Column: sal_Int32 eType = DataType::VARCHAR; @@ -433,9 +433,9 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere } Reference xParaColumn = new connectivity::sdbcx::OColumn(sParameterName - ,::rtl::OUString() - ,::rtl::OUString() - ,::rtl::OUString() + ,OUString() + ,OUString() + ,OUString() ,nNullable ,nPrecision ,nScale @@ -444,9 +444,9 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere ,sal_False ,sal_False ,m_pSQLIterator->isCaseSensitive() - ,::rtl::OUString() - ,::rtl::OUString() - ,::rtl::OUString()); + ,OUString() + ,OUString() + ,OUString()); m_xParamColumns->get().push_back(xParaColumn); return nParameter; } @@ -457,7 +457,7 @@ _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable) Reference xProp; if(SQL_ISRULE(_pNode,column_ref)) { - ::rtl::OUString sColumnName,sTableRange; + OUString sColumnName,sTableRange; m_pSQLIterator->getColumnRange(_pNode,sColumnName,sTableRange); if(!sColumnName.isEmpty()) { diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx index 3d3b15ace898..4c6de31cef42 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx @@ -61,7 +61,7 @@ namespace connectivity //==================================================================== sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; sal_Bool m_bPrepared; ::rtl::Reference< OResultSet > m_pResultSet; @@ -78,7 +78,7 @@ namespace connectivity // OCommonStatement overridables virtual StatementType - parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + parseSql( const OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); virtual void initializeResultSet( OResultSet* _pResult ); virtual void clearCachedResultSet(); virtual void cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ); @@ -96,7 +96,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); // A ctor need for returning the object - OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql); + OPreparedStatement( OConnection* _pConnection,const OUString& sql); void lateInit(); //XInterface @@ -113,7 +113,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -121,7 +121,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index 06ae1ca0fe1a..6f071dd0f0a1 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -42,7 +42,7 @@ #include "resource/common_res.hrc" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -61,24 +61,24 @@ using namespace com::sun::star::util; //------------------------------------------------------------------------------ // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ +OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { - return ::rtl::OUString("com.sun.star.sdbcx.mozab.ResultSet"); + return OUString("com.sun.star.sdbcx.mozab.ResultSet"); } // ------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); - aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); + ::com::sun::star::uno::Sequence< OUString > aSupported(2); + aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -162,12 +162,12 @@ void OResultSet::methodEntry() if ( !m_pTable ) { OSL_FAIL( "OResultSet::methodEntry: looks like we're disposed, but how is this possible?" ); - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); } } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -412,7 +412,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -710,17 +710,17 @@ void SAL_CALL OResultSet::release() throw() } // ------------------------------------------------------------------------- -void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMatchString ) +void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchString ) { OSL_ENSURE(pNode->count() > 0,"Error parsing parameter in Parse Tree"); OSQLParseNode *pMark = pNode->getChild(0); // Initialize to empty string - rMatchString = ::rtl::OUString(""); + rMatchString = OUString(""); - rtl::OUString aParameterName; + OUString aParameterName; if (SQL_ISPUNCTUATION(pMark,"?")) { - aParameterName = ::rtl::OUString("?"); + aParameterName = OUString("?"); } else if (SQL_ISPUNCTUATION(pMark,":")) { aParameterName = pNode->getChild(1)->getTokenValue(); @@ -746,9 +746,9 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat void OResultSet::analyseWhereClause( const OSQLParseNode* parseTree, MQueryExpression &queryExpression) { - ::rtl::OUString columnName; + OUString columnName; MQueryOp::cond_type op( MQueryOp::Is ); - ::rtl::OUString matchString; + OUString matchString; if ( parseTree == NULL ) return; @@ -757,7 +757,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT ::rtl::Reference xColumns = m_pSQLIterator->getParameters(); if(xColumns.is()) { - ::rtl::OUString aColName, aParameterValue; + OUString aColName, aParameterValue; OSQLColumns::Vector::iterator aIter = xColumns->get().begin(); sal_Int32 i = 1; for(;aIter != xColumns->get().end();++aIter) @@ -840,7 +840,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT else if (pPrec->getNodeType() == SQL_NODE_NOTEQUAL) op = MQueryOp::IsNot; - ::rtl::OUString sTableRange; + OUString sTableRange; if(SQL_ISRULE(parseTree->getChild(0),column_ref)) m_pSQLIterator->getColumnRange(parseTree->getChild(0),columnName,sTableRange); else if(parseTree->getChild(0)->isToken()) @@ -898,7 +898,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT const sal_Unicode ALT_WILDCARD = '*'; const sal_Unicode MATCHCHAR = '_'; - ::rtl::OUString sTableRange; + OUString sTableRange; if(SQL_ISRULE(pColumn,column_ref)) m_pSQLIterator->getColumnRange(pColumn,columnName,sTableRange); @@ -917,12 +917,12 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT // Determine where '%' character is... - if ( matchString.equals( ::rtl::OUString::valueOf( WILDCARD ) ) ) + if ( matchString.equals( OUString::valueOf( WILDCARD ) ) ) { // String containing only a '%' and nothing else op = MQueryOp::Exists; // Will be ignored for Exists case, but clear anyway. - matchString = ::rtl::OUString(""); + matchString = OUString(""); } else if ( matchString.indexOf ( WILDCARD ) == -1 && matchString.indexOf ( MATCHCHAR ) == -1 ) @@ -941,8 +941,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT { // Relatively simple "%string%" - ie, contains... // Cut '%' from front and rear - matchString = matchString.replaceAt( 0, 1, rtl::OUString() ); - matchString = matchString.replaceAt( matchString.getLength() -1 , 1, rtl::OUString() ); + matchString = matchString.replaceAt( 0, 1, OUString() ); + matchString = matchString.replaceAt( matchString.getLength() -1 , 1, OUString() ); if (bNot) op = MQueryOp::DoesNotContain; @@ -965,17 +965,17 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT if ( matchString.indexOf ( WILDCARD ) == 0 ) { op = MQueryOp::EndsWith; - matchString = matchString.replaceAt( 0, 1, rtl::OUString()); + matchString = matchString.replaceAt( 0, 1, OUString()); } else if ( matchString.indexOf ( WILDCARD ) == matchString.getLength() -1 ) { op = MQueryOp::BeginsWith; - matchString = matchString.replaceAt( matchString.getLength() -1 , 1, rtl::OUString() ); + matchString = matchString.replaceAt( matchString.getLength() -1 , 1, OUString() ); } else { sal_Int32 pos = matchString.indexOf ( WILDCARD ); - matchString = matchString.replaceAt( pos, 1,::rtl::OUString(".*") ); + matchString = matchString.replaceAt( pos, 1,OUString(".*") ); op = MQueryOp::RegExp; } @@ -986,13 +986,13 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT sal_Int32 pos = matchString.indexOf ( WILDCARD ); while ( (pos = matchString.indexOf ( WILDCARD )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".*") ); + matchString = matchString.replaceAt( pos, 1, OUString(".*") ); } pos = matchString.indexOf ( MATCHCHAR ); while ( (pos = matchString.indexOf( MATCHCHAR )) != -1 ) { - matchString = matchString.replaceAt( pos, 1, ::rtl::OUString(".") ); + matchString = matchString.replaceAt( pos, 1, OUString(".") ); } op = MQueryOp::RegExp; @@ -1019,7 +1019,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT else op = MQueryOp::DoesNotExist; - ::rtl::OUString sTableRange; + OUString sTableRange; m_pSQLIterator->getColumnRange(parseTree->getChild(0),columnName,sTableRange); queryExpression.getExpressions().push_back( new MQueryExpressionString( columnName, op )); @@ -1048,8 +1048,8 @@ void OResultSet::fillRowData() OSL_ENSURE(m_xColumns.is(), "Need the Columns!!"); OSQLColumns::Vector::const_iterator aIter = m_xColumns->get().begin(); - const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - ::rtl::OUString sName; + const OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + OUString sName; m_aAttributeStrings.clear(); m_aAttributeStrings.reserve(m_xColumns->get().size()); for (sal_Int32 i = 1; aIter != m_xColumns->get().end();++aIter, i++) @@ -1087,11 +1087,11 @@ void OResultSet::fillRowData() // For other types we stick to the old behaviour of using // card:nsIAbCard. OSL_ENSURE(m_pStatement, "Cannot determine Parent Statement"); - ::rtl::OUString aStr; + OUString aStr; if (xConnection->isLDAP()) - aStr = ::rtl::OUString("PrimaryEmail"); + aStr = OUString("PrimaryEmail"); else - aStr = ::rtl::OUString("card:nsIAbCard"); + aStr = OUString("card:nsIAbCard"); eVector.push_back( new MQueryExpressionString(aStr, MQueryOp::Exists) ); queryExpression.setExpressions( eVector ); @@ -1106,7 +1106,7 @@ void OResultSet::fillRowData() m_aQuery.setExpression( queryExpression ); - rtl::OUString aStr( m_pTable->getName() ); + OUString aStr( m_pTable->getName() ); m_aQuery.setAddressbook( aStr ); sal_Int32 rv = m_aQuery.executeQuery(xConnection); @@ -1350,12 +1350,12 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); Reference xTableColumn; - ::rtl::OUString sTableColumnName, sSelectColumnRealName; + OUString sTableColumnName, sSelectColumnRealName; - const ::rtl::OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - const ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); + const OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); - ::std::vector< ::rtl::OUString> aColumnNames; + ::std::vector< OUString> aColumnNames; aColumnNames.reserve(_rxColumns->get().size()); OValueVector::Vector::iterator aRowIter = _rRow->get().begin()+1; for (sal_Int32 i=0; // the first column is the bookmark column @@ -1371,7 +1371,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, if (xTableColumn.is()) xTableColumn->getPropertyValue(sName) >>= sTableColumnName; else - sTableColumnName = ::rtl::OUString(); + sTableColumnName = OUString(); // look if we have such a select column // TODO: would like to have a O(log n) search here ... @@ -1648,9 +1648,9 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException) if ((m_nNewRow && nCurrentRow != m_nNewRow) || ( m_nUpdatedRow && m_nUpdatedRow != nCurrentRow)) { - const ::rtl::OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_COMMIT_ROW, - "$position$", ::rtl::OUString::valueOf(nCurrentRow) + "$position$", OUString::valueOf(nCurrentRow) ) ); ::dbtools::throwGenericSQLException(sError,*this); } @@ -1731,7 +1731,7 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw( updateValue(columnIndex,x); } // ------------------------------------------------------------------------- -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } @@ -1780,9 +1780,9 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { - const ::rtl::OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_COLUMN_NOT_UPDATEABLE, - "$position$", ::rtl::OUString::valueOf(columnIndex) + "$position$", OUString::valueOf(columnIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } // if (!::dbtools::implUpdateObject(this, columnIndex, x)) @@ -1793,9 +1793,9 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { - const ::rtl::OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pStatement->getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_COLUMN_NOT_UPDATEABLE, - "$position$", ::rtl::OUString::valueOf(columnIndex) + "$position$", OUString::valueOf(columnIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index 584cb78f830d..1a56e0c655ec 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -154,7 +154,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -183,7 +183,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XResultSetUpdate virtual void SAL_CALL insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -201,7 +201,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -230,10 +230,10 @@ protected: ::std::vector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime ::std::vector m_aOrderbyColumnNumber; ::std::vector m_aOrderbyAscending; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aColumnNames; + ::com::sun::star::uno::Sequence< OUString> m_aColumnNames; OValueRow m_aRow; OValueRow m_aParameterRow; - ::std::vector< ::rtl::OUString> m_aAttributeStrings; + ::std::vector< OUString> m_aAttributeStrings; sal_Int32 m_nParamIndex; sal_Bool m_bIsAlwaysFalseQuery; ::rtl::Reference m_pKeySet; @@ -247,7 +247,7 @@ protected: ::rtl::Reference m_xColumns; // this are the select columns ::rtl::Reference m_xParamColumns; - void parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMatchString ); + void parseParameter( const OSQLParseNode* pNode, OUString& rMatchString ); void fillRowData() throw( ::com::sun::star::sdbc::SQLException ); void analyseWhereClause( const OSQLParseNode* parseTree, MQueryExpression &queryExpression); diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx index cecc0d5dad21..48a888d4316a 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx @@ -71,17 +71,17 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - ::rtl::OUString sColumnName; + OUString sColumnName; try { Reference< XPropertySet > xColumnProps( (m_xColumns->get())[column-1], UNO_QUERY_THROW ); @@ -94,30 +94,30 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th return sColumnName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return m_aTableName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { return getColumnName(column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- @@ -160,7 +160,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException) { - ::rtl::OUString sColumnName( getColumnName( column ) ); + OUString sColumnName( getColumnName( column ) ); if ( !m_pTable || !m_pTable->getConnection() ) { diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx index eb9a5f90295d..9b227f5f6319 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx @@ -37,7 +37,7 @@ namespace connectivity class OResultSetMetaData : public OResultSetMetaData_BASE { - ::rtl::OUString m_aTableName; + OUString m_aTableName; ::rtl::Reference m_xColumns; OTable* m_pTable; sal_Bool m_bReadOnly; @@ -48,7 +48,7 @@ namespace connectivity // a constructor that is needed to return the object: // OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){} OResultSetMetaData(const ::rtl::Reference& _rxColumns, - const ::rtl::OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly + const OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly ) :m_aTableName(_aTableName) ,m_xColumns(_rxColumns) @@ -70,19 +70,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 725a68197fec..44b8b26f272c 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.cxx @@ -26,7 +26,6 @@ #include using namespace connectivity::mozab; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; @@ -84,7 +83,7 @@ struct ProviderRequest typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) { - const ::rtl::OUString sModuleName(SVLIBRARY( "mozabdrv" )); + const OUString sModuleName(SVLIBRARY( "mozabdrv" )); // load the dbtools library oslModule s_hModule = osl_loadModuleRelative( @@ -95,7 +94,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere { // get the symbol for the method creating the factory - const ::rtl::OUString sFactoryCreationFunc = ::rtl::OUString( "OMozillaBootstrap_CreateInstance"); + const OUString sFactoryCreationFunc = OUString( "OMozillaBootstrap_CreateInstance"); // reinterpret_cast removed GNU C OMozillaBootstrap_CreateInstanceFunction s_pCreationFunc = (OMozillaBootstrap_CreateInstanceFunction)osl_getFunctionSymbol(s_hModule, sFactoryCreationFunc.pData); @@ -130,8 +129,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozab_component_getFactory( } else if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" ) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap"); aReq.CREATE_PROVIDER( aImplName, aSNS, diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index 9f6b2d5420d6..431844fbe30a 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -48,7 +48,7 @@ #include "resource/common_res.hrc" #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -143,22 +143,22 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) { const OSQLTables& xTabs = m_pSQLIterator->getTables(); OSL_ENSURE( !xTabs.empty(), "Need a Table"); - ::rtl::OUString ouTableName=xTabs.begin()->first; + OUString ouTableName=xTabs.begin()->first; xCreateColumn = m_pSQLIterator->getCreateColumns(); OSL_ENSURE(xCreateColumn.is(), "Need the Columns!!"); const OColumnAlias& aColumnAlias = m_pConnection->getColumnAlias(); OSQLColumns::Vector::const_iterator aIter = xCreateColumn->get().begin(); - const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - ::rtl::OUString sName; + const OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + OUString sName; for (sal_Int32 i = 1; aIter != xCreateColumn->get().end();++aIter, i++) { (*aIter)->getPropertyValue(sProprtyName) >>= sName; if ( !aColumnAlias.hasAlias( sName ) ) { - const ::rtl::OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", sName ) ); @@ -179,10 +179,10 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); } // ------------------------------------------------------------------------- -OCommonStatement::StatementType OCommonStatement::parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted) +OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , sal_Bool bAdjusted) throw ( SQLException, RuntimeException ) { - ::rtl::OUString aErr; + OUString aErr; m_pParseTree = m_aParser.parseTree(aErr,sql); @@ -242,7 +242,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const ::rtl::OUStrin else if(!bAdjusted) //Our sql parser does not support a statement like "create table foo" // So we append ("E-mail" varchar) to the last of it to make it work { - return parseSql(sql + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True); + return parseSql(sql + OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True); } getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); @@ -305,7 +305,7 @@ void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pR } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OCommonStatement::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -318,7 +318,7 @@ sal_Bool SAL_CALL OCommonStatement::execute( const ::rtl::OUString& sql ) throw( } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_ThreadMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -351,7 +351,7 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep return aRet; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this ); return 0; @@ -384,7 +384,7 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc Sequence< Property > aProps(9); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); @@ -529,7 +529,7 @@ void OCommonStatement::analyseSQL() void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef, OSQLParseNode* pAscendingDescending) { - ::rtl::OUString aColumnName; + OUString aColumnName; if (pColumnRef->count() == 1) aColumnName = pColumnRef->getChild(0)->getTokenValue(); else if (pColumnRef->count() == 3) diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index 233873ded588..0e91ac29bec0 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -75,7 +75,7 @@ namespace connectivity // for this Statement - ::std::list< ::rtl::OUString> m_aBatchList; + ::std::list< OUString> m_aBatchList; OTable* m_pTable; OConnection* m_pConnection; // The owning Connection object @@ -122,7 +122,7 @@ namespace connectivity /** called to do the parsing of a to-be-executed SQL statement, and set all members as needed */ virtual StatementType - parseSql( const ::rtl::OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + parseSql( const OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** called to initialize a result set, according to a previously parsed SQL statement */ virtual void initializeResultSet( OResultSet* _pResult ); @@ -167,9 +167,9 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx index 025cc9d6bf8e..4abecfa5ba64 100644 --- a/connectivity/source/drivers/mozab/MTable.cxx +++ b/connectivity/source/drivers/mozab/MTable.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, - const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, const ::rtl::OUString& _Description ) + const OUString& _Name, const OUString& _Type, const OUString& _Description ) :OTable_Base(_pTables, _pConnection, sal_True, _Name, _Type, _Description ) ,m_pConnection( _pConnection ) { diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx index d6211df05bf2..37c7936b243f 100644 --- a/connectivity/source/drivers/mozab/MTable.hxx +++ b/connectivity/source/drivers/mozab/MTable.hxx @@ -37,16 +37,16 @@ namespace connectivity public: OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description ); + const OUString& _Name, + const OUString& _Type, + const OUString& _Description ); OConnection* getConnection() { return m_pConnection;} sal_Bool isReadOnly() const { return sal_False; } - ::rtl::OUString getTableName() const { return m_Name; } - ::rtl::OUString getSchema() const { return m_SchemaName; } + OUString getTableName() const { return m_Name; } + OUString getSchema() const { return m_SchemaName; } // OTableHelper overridables virtual sdbcx::OCollection* createColumns( const TStringVector& _rNames ); diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index dd6f93bfd3a6..be6239457d0b 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.cxx @@ -44,14 +44,14 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace dbtools; -sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OTables::createObject(const OUString& _rName) { - ::rtl::OUString aName,aSchema; - aSchema = ::rtl::OUString("%"); + OUString aName,aSchema; + aSchema = OUString("%"); aName = _rName; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("%"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("%"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx index e2d907a9cd8c..8a3b8e918fa4 100644 --- a/connectivity/source/drivers/mozab/MTables.hxx +++ b/connectivity/source/drivers/mozab/MTables.hxx @@ -30,7 +30,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // OCatalog* m_pParent; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index 27d328a113cd..b91bb0e7e433 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -72,7 +72,7 @@ void MozillaBootstrap::Init() (void)aProfileExists; /* avoid warning about unused parameter */ #endif m_ProfileAccess = new ProfileAccess(); - bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,rtl::OUString()); + bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,OUString()); } // -------------------------------------------------------------------------------- @@ -84,32 +84,32 @@ void MozillaBootstrap::disposing() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString MozillaBootstrap::getImplementationName_Static( ) throw(RuntimeException) +OUString MozillaBootstrap::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString(MOZAB_MozillaBootstrap_IMPL_NAME); + return OUString(MOZAB_MozillaBootstrap_IMPL_NAME); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported // for more information @see com.sun.star.mozilla.MozillaBootstrap - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL MozillaBootstrap::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL MozillaBootstrap::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL MozillaBootstrap::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -117,7 +117,7 @@ sal_Bool SAL_CALL MozillaBootstrap::supportsService( const ::rtl::OUString& _rSe } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -128,29 +128,29 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( { return m_ProfileAccess->getProfileCount(product); } -::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException) { return m_ProfileAccess->getProfileList(product,list); } -::rtl::OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) { return m_ProfileAccess->getDefaultProfile(product); } -::rtl::OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { return m_ProfileAccess->getProfilePath(product,profileName); } -::sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { return m_ProfileAccess->isProfileLocked(product,profileName); } -::sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { return m_ProfileAccess->getProfileExists(product,profileName); } // XProfileManager -::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->bootupProfile(product,profileName); @@ -176,12 +176,12 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( return ::com::sun::star::mozilla::MozillaProductType_Default; #endif } -::rtl::OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->getCurrentProfile(); #else - return ::rtl::OUString(); + return OUString(); #endif } ::sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException) @@ -192,14 +192,14 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( return true; #endif } -::rtl::OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->setCurrentProfile(product,profileName); #else (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ - return ::rtl::OUString(); + return OUString(); #endif } @@ -207,8 +207,8 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException) { #ifndef MINIMAL_PROFILEDISCOVER - ::rtl::OUString profileName = aCode->getProfileName(); - ::rtl::OUString currProfileName = getCurrentProfile(); + OUString profileName = aCode->getProfileName(); + OUString currProfileName = getCurrentProfile(); ::com::sun::star::mozilla::MozillaProductType currProduct = getCurrentProduct(); //if client provides a profileName, we will use it @@ -246,12 +246,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozbootstrap_component_getFactory if (pServiceManager) { - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplementationName ) ); + OUString aImplName( OUString::createFromAscii( pImplementationName ) ); Reference< XSingleServiceFactory > xFactory; if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" ) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap"); xFactory = ::cppu::createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pServiceManager), diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index b96838f4280e..05ac65bab150 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -53,31 +53,31 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XMozillaBootstrap // XProfileDiscover virtual ::sal_Int32 SAL_CALL getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); // XProfileManager - virtual ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); // XProxyRunner virtual ::sal_Int32 SAL_CALL Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 561b1ce5afab..029d9e39be67 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -42,10 +42,10 @@ using namespace ::com::sun::star::mozilla; namespace { // ------------------------------------------------------------------- - static ::rtl::OUString lcl_getUserDataDirectory() + static OUString lcl_getUserDataDirectory() { ::osl::Security aSecurity; - ::rtl::OUString aConfigPath; + OUString aConfigPath; #if defined(XP_WIN) || defined(MACOSX) aSecurity.getConfigDir( aConfigPath ); @@ -56,7 +56,7 @@ namespace aSecurity.getHomeDir( aConfigPath ); #endif - return aConfigPath + ::rtl::OUString("/"); + return aConfigPath + OUString("/"); } // ------------------------------------------------------------------- @@ -88,26 +88,26 @@ namespace }; // ------------------------------------------------------------------- - static ::rtl::OUString lcl_guessProfileRoot( MozillaProductType _product ) + static OUString lcl_guessProfileRoot( MozillaProductType _product ) { size_t productIndex = _product - 1; - static ::rtl::OUString s_productDirectories[NB_PRODUCTS]; + static OUString s_productDirectories[NB_PRODUCTS]; if ( s_productDirectories[ productIndex ].isEmpty() ) { - ::rtl::OUString sProductPath; + OUString sProductPath; // check whether we have an anevironment variable which helps us const char* pProfileByEnv = getenv( ProductRootEnvironmentVariable[ productIndex ] ); if ( pProfileByEnv ) { - sProductPath = ::rtl::OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() ); + sProductPath = OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() ); // asume that this is fine, no further checks } else { - ::rtl::OUString sProductDirCandidate; + OUString sProductDirCandidate; const char* pProfileRegistry = "profiles.ini"; // check all possible candidates @@ -117,11 +117,11 @@ namespace break; sProductDirCandidate = lcl_getUserDataDirectory() + - ::rtl::OUString::createFromAscii( DefaultProductDir[ productIndex ][ i ] ); + OUString::createFromAscii( DefaultProductDir[ productIndex ][ i ] ); // check existence ::osl::DirectoryItem aRegistryItem; - ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + ::rtl::OUString::createFromAscii( pProfileRegistry ), aRegistryItem ); + ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + OUString::createFromAscii( pProfileRegistry ), aRegistryItem ); if ( result == ::osl::FileBase::E_None ) { ::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate ); @@ -145,10 +145,10 @@ namespace } // ----------------------------------------------------------------------- -::rtl::OUString getRegistryDir(MozillaProductType product) +OUString getRegistryDir(MozillaProductType product) { if (product == MozillaProductType_Default) - return ::rtl::OUString(); + return OUString(); return lcl_guessProfileRoot( product ); } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx index 609d0ea24e89..552fc2bc3d01 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx @@ -27,7 +27,7 @@ #include -::rtl::OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product); +OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product); #endif diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index e6941bcc5bad..7f078a776e94 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -30,13 +30,10 @@ #include #endif -using ::rtl::OUString; -using ::rtl::OString; - struct ini_NameValue { - rtl::OUString sName; - rtl::OUString sValue; + OUString sName; + OUString sValue; inline ini_NameValue() SAL_THROW(()) {} @@ -53,10 +50,10 @@ typedef std::list< struct ini_Section { - rtl::OUString sName; + OUString sName; NameValueList lList; }; -typedef std::mapIniSectionMap; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx index 09d665bde55f..f432f33b46f4 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx @@ -114,9 +114,9 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists) { nsCOMPtr binDir; // Note: if path3 construction fails, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2() - rtl::OUString path1("$BRAND_BASE_DIR/program"); + OUString path1("$BRAND_BASE_DIR/program"); rtl::Bootstrap::expandMacros(path1); - rtl::OString path2; + OString path2; if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == osl::FileBase::E_None) && path1.convertToString( diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx index cf9bb13b3dd9..9e91043dd41a 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::mozilla; -using ::rtl::OUString; // Interfaces Needed @@ -62,7 +61,7 @@ nsProfile::nsProfile() Reference xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); + Reference xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference(xInstance,UNO_QUERY); @@ -135,7 +134,7 @@ NS_IMETHODIMP nsProfile::GetProfileList(PRUint32 *length, PRUnichar ***profileNa NS_ENSURE_ARG_POINTER(profileNames); *profileNames = nsnull; - ::com::sun::star::uno::Sequence< ::rtl::OUString > list; + ::com::sun::star::uno::Sequence< OUString > list; *length = xMozillaBootstrap->getProfileList(xMozillaBootstrap->getCurrentProduct(),list); @@ -182,7 +181,7 @@ nsProfile::GetCurrentProfile(PRUnichar **profileName) *profileName = (PRUnichar *)nsMemory::Clone(mCurrentProfileName.get(),(mCurrentProfileName.Length() + 1) * sizeof(PRUnichar )); else { - rtl::OUString profile = xMozillaBootstrap->getDefaultProfile(xMozillaBootstrap->getCurrentProduct()); + OUString profile = xMozillaBootstrap->getDefaultProfile(xMozillaBootstrap->getCurrentProduct()); *profileName = (PRUnichar *)nsMemory::Clone(profile.getStr(),( profile.getLength() + 1) * sizeof(PRUnichar )); SetCurrentProfile(*profileName); } @@ -451,7 +450,7 @@ NS_IMETHODIMP nsProfile::GetProfileDir(const PRUnichar *profileName, nsIFile **p *profileDir = nsnull; // PRUnichar != sal_Unicode in mingw - rtl::OUString path = xMozillaBootstrap->getProfilePath(xMozillaBootstrap->getCurrentProduct(),reinterpret_cast_mingw_only(profileName)); + OUString path = xMozillaBootstrap->getProfilePath(xMozillaBootstrap->getCurrentProduct(),reinterpret_cast_mingw_only(profileName)); nsCOMPtr localFile; // PRUnichar != sal_Unicode in mingw diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index 8640ba11bd41..6338eff8b4da 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -85,9 +85,9 @@ namespace connectivity { namespace mozab { - ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName, + ProfileStruct::ProfileStruct(MozillaProductType aProduct,OUString aProfileName, #ifdef MINIMAL_PROFILEDISCOVER - const ::rtl::OUString& aProfilePath + const OUString& aProfilePath #else nsILocalFile * aProfilePath #endif @@ -97,7 +97,7 @@ namespace connectivity profileName = aProfileName; profilePath = aProfilePath; } - ::rtl::OUString ProfileStruct::getProfilePath() + OUString ProfileStruct::getProfilePath() { #ifdef MINIMAL_PROFILEDISCOVER return profilePath; @@ -106,12 +106,12 @@ namespace connectivity { nsAutoString path; nsresult rv = profilePath->GetPath(path); - NS_ENSURE_SUCCESS(rv, ::rtl::OUString()); + NS_ENSURE_SUCCESS(rv, OUString()); // PRUnichar != sal_Unicode in mingw - return ::rtl::OUString(reinterpret_cast_mingw_only(path.get())); + return OUString(reinterpret_cast_mingw_only(path.get())); } else - return ::rtl::OUString(); + return OUString(); #endif } @@ -145,9 +145,9 @@ namespace connectivity #ifndef MINIMAL_PROFILEDISCOVER nsresult rv; #endif - ::rtl::OUString regDir = getRegistryDir(product); - ::rtl::OUString profilesIni( regDir ); - profilesIni += ::rtl::OUString("profiles.ini"); + OUString regDir = getRegistryDir(product); + OUString profilesIni( regDir ); + profilesIni += OUString("profiles.ini"); IniParser parser( profilesIni ); IniSectionMap &mAllSection = *(parser.getAllSection()); @@ -156,10 +156,10 @@ namespace connectivity for(;iBegin != iEnd;++iBegin) { ini_Section *aSection = &(*iBegin).second; - ::rtl::OUString profileName; - ::rtl::OUString profilePath; - ::rtl::OUString sIsRelative; - ::rtl::OUString sIsDefault; + OUString profileName; + OUString profilePath; + OUString sIsRelative; + OUString sIsDefault; for(NameValueList::iterator itor=aSection->lList.begin(); itor != aSection->lList.end(); @@ -213,7 +213,7 @@ namespace connectivity } if (NS_FAILED(rv)) continue; #else - rtl::OUString fullProfilePath; + OUString fullProfilePath; if(isRelative) { fullProfilePath = regDir + profilePath; @@ -247,14 +247,14 @@ namespace connectivity return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } - ::rtl::OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) { //Profile not found - return ::rtl::OUString(); + return OUString(); } else return m_Product.mProfileList[profileName]->getProfilePath(); @@ -266,7 +266,7 @@ namespace connectivity ProductStruct &m_Product = m_ProductProfileList[index]; return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } - ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; @@ -284,7 +284,7 @@ namespace connectivity return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } - ::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; @@ -296,7 +296,7 @@ namespace connectivity if (m_Product.mProfileList.empty()) { //there are not any profiles - return ::rtl::OUString(); + return OUString(); } ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second; return aProfile->getProfileName(); @@ -361,14 +361,14 @@ namespace connectivity } #endif - ::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + ::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { #ifdef MINIMAL_PROFILEDISCOVER (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ return sal_True; #else - ::rtl::OUString path = getProfilePath(product,profileName); + OUString path = getProfilePath(product,profileName); if (path.isEmpty()) return sal_True; @@ -395,7 +395,7 @@ namespace connectivity #endif } - ::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + ::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index ffdb9ecf53d9..7a4afef4dd29 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -43,7 +43,7 @@ namespace connectivity class ProfileStruct; } } -typedef ::std::map < ::rtl::OUString, ::connectivity::mozab::ProfileStruct* > ProfileList; +typedef ::std::map < OUString, ::connectivity::mozab::ProfileStruct* > ProfileList; namespace connectivity { namespace mozab @@ -51,24 +51,24 @@ namespace connectivity class ProfileStruct { public: - ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName, + ProfileStruct(MozillaProductType aProduct,OUString aProfileName, #ifdef MINIMAL_PROFILEDISCOVER - const ::rtl::OUString &aProfilePath + const OUString &aProfilePath #else nsILocalFile * aProfilePath #endif ); MozillaProductType getProductType() { return product;} - ::rtl::OUString getProfileName(){ return profileName;} - ::rtl::OUString getProfilePath() ; + OUString getProfileName(){ return profileName;} + OUString getProfilePath() ; #ifndef MINIMAL_PROFILEDISCOVER nsILocalFile *getProfileLocal(){ return profilePath;} #endif protected: MozillaProductType product; - ::rtl::OUString profileName; + OUString profileName; #ifdef MINIMAL_PROFILEDISCOVER - ::rtl::OUString profilePath; + OUString profilePath; #else nsCOMPtr profilePath; #endif @@ -77,9 +77,9 @@ namespace connectivity class ProductStruct { public: - void setCurrentProfile(::rtl::OUString aProfileName){mCurrentProfileName = aProfileName;} + void setCurrentProfile(OUString aProfileName){mCurrentProfileName = aProfileName;} - ::rtl::OUString mCurrentProfileName; + OUString mCurrentProfileName; ProfileList mProfileList; }; @@ -91,12 +91,12 @@ namespace connectivity virtual ~ProfileAccess(); ProfileAccess(); - ::rtl::OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); ::sal_Int32 getProfileCount( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Int32 getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Int32 getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException); + OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); protected: ProductStruct m_ProductProfileList[4]; sal_Int32 LoadProductsInfo(); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx index 8615e2edb071..45999d06a4f0 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx @@ -41,7 +41,7 @@ namespace connectivity ,aProfile(NULL) { } - ::sal_Int32 ProfileManager::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 ProfileManager::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { if (!aProfile) { @@ -60,22 +60,22 @@ namespace connectivity { return m_CurrentProduct; } - ::rtl::OUString ProfileManager::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileManager::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) { nsresult rv; nsCOMPtr theProfile(do_GetService(NS_PROFILE_CONTRACTID,&rv)); - if (NS_FAILED(rv)) return ::rtl::OUString(); + if (NS_FAILED(rv)) return OUString(); nsXPIDLString currentProfileStr; //call GetCurrentProfile before call SetCurrentProfile will get the default profile rv = theProfile->GetCurrentProfile(getter_Copies(currentProfileStr)); if (NS_FAILED(rv) || currentProfileStr.get() == nsnull) - return ::rtl::OUString(); + return OUString(); // PRUnichar != sal_Unicode in mingw - return ::rtl::OUString(reinterpret_cast_mingw_only(currentProfileStr.get())); + return OUString(reinterpret_cast_mingw_only(currentProfileStr.get())); } - ::rtl::OUString ProfileManager::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileManager::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) { - ::rtl::OUString currentProfile = getCurrentProfile(); + OUString currentProfile = getCurrentProfile(); //if profileName not given, then skip and return curernt profile if (profileName.isEmpty() && m_CurrentProduct == product) return currentProfile; @@ -88,13 +88,13 @@ namespace connectivity //get profile mozilla profile service nsresult rv; nsCOMPtr theProfile(do_GetService(NS_PROFILE_CONTRACTID,&rv)); - if (NS_FAILED(rv)) return ::rtl::OUString(); + if (NS_FAILED(rv)) return OUString(); // PRUnichar != sal_Unicode in mingw const PRUnichar* pUsedProfile = reinterpret_cast_mingw_only(profileName.getStr()); //set current profile rv = theProfile->SetCurrentProfile( pUsedProfile ); - if (NS_FAILED(rv)) return ::rtl::OUString(); + if (NS_FAILED(rv)) return OUString(); return currentProfile; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx index ae752de5f09c..3a93c3b682aa 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx @@ -46,11 +46,11 @@ namespace connectivity virtual ~ProfileManager(); ProfileManager(); - ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ; + ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ; ::sal_Int32 SAL_CALL shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException) ; ::com::sun::star::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException) ; - ::rtl::OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) ; - ::rtl::OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ; + OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) ; + OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ; protected: ::com::sun::star::mozilla::MozillaProductType m_CurrentProduct; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 23a721742b63..35e625d53898 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -58,7 +58,7 @@ static ::osl::Mutex m_aMetaMutex; #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -108,7 +108,7 @@ MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper() Reference xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); + Reference xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference(xInstance,UNO_QUERY); m_bProfileExists = xMozillaBootstrap->shutdownProfile() > 0; @@ -200,7 +200,7 @@ static nsresult insertPABDescription() // ------------------------------------------------------------------------- // Case where we get a parent uri, and need to list its children. -static nsresult getSubsFromParent(const rtl::OString& aParent, nsIEnumerator **aSubs) +static nsresult getSubsFromParent(const OString& aParent, nsIEnumerator **aSubs) { if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; } @@ -218,7 +218,7 @@ static nsresult getSubsFromParent(const rtl::OString& aParent, nsIEnumerator **a nsCOMPtr rdfDirectory ; - rtl::OString dir("rdf:addressdirectory"); + OString dir("rdf:addressdirectory"); retCode = rdfService->GetDataSource(dir.getStr(),getter_AddRefs(rdfDirectory)) ; @@ -267,7 +267,7 @@ static nsresult enumSubs(nsISimpleEnumerator * subDirs,nsISupportsArray * array) } // Case where we get a factory uri and need to have it build the directories. -static nsresult getSubsFromFactory(const rtl::OString& aFactory, nsIEnumerator **aSubs) +static nsresult getSubsFromFactory(const OString& aFactory, nsIEnumerator **aSubs) { if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; } *aSubs = nsnull ; @@ -299,7 +299,7 @@ static nsresult getSubsFromFactory(const rtl::OString& aFactory, nsIEnumerator * } // Case where the uri itself is the directory we're looking for. -static nsresult getSubsFromURI(const rtl::OString& aUri, nsIEnumerator **aSubs) +static nsresult getSubsFromURI(const OString& aUri, nsIEnumerator **aSubs) { if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; } *aSubs = nsnull ; @@ -370,8 +370,8 @@ namespace } nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap, - ::std::vector< ::rtl::OUString >* _rStrings, - ::std::vector< ::rtl::OUString >* _rTypes, + ::std::vector< OUString >* _rStrings, + ::std::vector< OUString >* _rTypes, sal_Int32* pErrorId ) { if (!sAbURI || !nmap || !_rStrings || !_rTypes || !pErrorId) @@ -408,7 +408,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp PRUnichar *name = nsnull; PRBool bIsMailList = PR_FALSE; - ::rtl::OUString aTableName; + OUString aTableName; nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)) ; NS_ENSURE_SUCCESS(rv, rv) ; @@ -440,7 +440,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp // Insert table into map if ( aTableName.isEmpty() ) - aTableName = rtl::OUString("AddressBook"); + aTableName = OUString("AddressBook"); OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) ); @@ -454,12 +454,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp //map mailing lists as views _rStrings->push_back( aTableName ); // Table name if (!bIsMailList) { - ::rtl::OUString aTableType(::rtl::OUString("TABLE")); + OUString aTableType(OUString("TABLE")); _rTypes->push_back( aTableType ); // Table type } else { - ::rtl::OUString aTableType(::rtl::OUString("VIEW")); + OUString aTableType(OUString("VIEW")); _rTypes->push_back( aTableType ); // Table type } } @@ -469,12 +469,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp return( NS_OK ); } sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* _pCon, - ::std::vector< ::rtl::OUString >& _rStrings, - ::std::vector< ::rtl::OUString >& _rTypes) + ::std::vector< OUString >& _rStrings, + ::std::vector< OUString >& _rTypes) { sal_Bool bGivenURI; - ::rtl::OUString sAbURI; - ::rtl::OString sAbURIString; + OUString sAbURI; + OString sAbURIString; OSL_TRACE( "IN MDatabaseMetaDataHelper::getTableStrings( 0x%08X, %s)", _pCon, _pCon->getForceLoadTables()?"True":"False" ); @@ -495,7 +495,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* if ( sAbURI.isEmpty() ) bGivenURI = sal_False; else { - sAbURIString = ::rtl::OUStringToOString( sAbURI, + sAbURIString = OUStringToOString( sAbURI, RTL_TEXTENCODING_ASCII_US); bGivenURI = sal_True; } @@ -550,7 +550,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* Reference xMozillaBootstrap; Reference xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - Reference xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); + Reference xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = Reference(xInstance,UNO_QUERY); m_bProfileExists = sal_False; @@ -609,8 +609,8 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* } sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, - const ::rtl::OUString& tableNamePattern, - const Sequence< ::rtl::OUString >& types, + const OUString& tableNamePattern, + const Sequence< OUString >& types, ODatabaseMetaDataResultSet::ORows& _rRows) { @@ -622,9 +622,9 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, ODatabaseMetaDataResultSet::ORows().swap(aRows); // this makes real clear where memory is freed as well aRows.clear(); - ::std::vector< ::rtl::OUString > tables; - ::std::vector< ::rtl::OUString > tabletypes; - ::rtl::OUString matchAny = rtl::OUString("%"); + ::std::vector< OUString > tables; + ::std::vector< OUString > tabletypes; + OUString matchAny = OUString("%"); if ( !getTableStrings( _pCon, tables,tabletypes ) ) return sal_False; @@ -632,8 +632,8 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, for ( size_t i = 0; i < tables.size(); i++ ) { ODatabaseMetaDataResultSet::ORow aRow(3); - ::rtl::OUString aTableName = tables[i]; - ::rtl::OUString aTableType = tabletypes[i]; + OUString aTableName = tables[i]; + OUString aTableType = tabletypes[i]; OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) ); @@ -643,7 +643,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, 0 != ::comphelper::findValue( types, aTableType, sal_True ).getLength() || 0 != ::comphelper::findValue( types, matchAny, sal_True ).getLength())) { if ( aTableName.isEmpty() ) { - aTableName = rtl::OUString("AddressBook"); + aTableName = OUString("AddressBook"); } OSL_TRACE( "TableName = %s ; TableType = %s", OUtoCStr(aTableName), OUtoCStr(aTableType) ); @@ -668,9 +668,9 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) const sal_Char* MOZ_SCHEMA = "moz-abldapdirectory://"; const sal_Char* LDAP_SCHEMA = "ldap://"; - rtl::OString sAbURI; - rtl::OUString sAbBindDN; - rtl::OUString sAbPassword; + OString sAbURI; + OUString sAbBindDN; + OUString sAbPassword; sal_Bool useSSL = _pCon->getUseSSL(); nsresult rv(0); @@ -682,13 +682,13 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) sal_Int32 pos = sAbURI.indexOf( MOZ_SCHEMA ); if ( pos != -1 ) { - sAbURI = sAbURI.replaceAt (pos, rtl_str_getLength( MOZ_SCHEMA ), ::rtl::OString(LDAP_SCHEMA) ); + sAbURI = sAbURI.replaceAt (pos, rtl_str_getLength( MOZ_SCHEMA ), OString(LDAP_SCHEMA) ); } pos = sAbURI.indexOf( QUERY_CHAR ); if ( pos != -1 ) { sal_Int32 len = sAbURI.getLength(); - sAbURI = sAbURI.replaceAt( pos, len - pos, ::rtl::OString("") ); + sAbURI = sAbURI.replaceAt( pos, len - pos, OString("") ); } const sal_Unicode* bindDN=nsnull; if (!sAbBindDN.isEmpty()) @@ -705,7 +705,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) args.arg4 = (void*)&useSSL; MNSMozabProxy xMProxy; - rv = xMProxy.StartProxy( &args, m_ProductType, ::rtl::OUString() ); + rv = xMProxy.StartProxy( &args, m_ProductType, OUString() ); if ( NS_SUCCEEDED( rv ) ) //Init LDAP,pass OUString() to StarProxy to ignore profile switch { args.funcIndex = ProxiedFunc::FUNC_TESTLDAP_IS_LDAP_CONNECTED; @@ -713,7 +713,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) sal_Int32 times=0; while ( times++ < 30 ) { - rv = xMProxy.StartProxy( &args, m_ProductType, ::rtl::OUString() ); + rv = xMProxy.StartProxy( &args, m_ProductType, OUString() ); if ( NS_SUCCEEDED( rv ) ) // connected successfully break; @@ -730,7 +730,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) return NS_SUCCEEDED( rv ) ? sal_True : sal_False; } -sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl::OUString & aTableName) +sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const OUString & aTableName) { sal_Bool bIsMozillaAB; @@ -759,19 +759,19 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl: } else if (NS_FAILED(rv)) { - m_aError.set( STR_COULD_NOT_CREATE_ADDRESSBOOK, 0, ::rtl::OUString::valueOf( sal_Int32(rv), 16 ) ); + m_aError.set( STR_COULD_NOT_CREATE_ADDRESSBOOK, 0, OUString::valueOf( sal_Int32(rv), 16 ) ); } OSL_TRACE( "OUT MDatabaseMetaDataHelper::NewAddressBook()" ); return( NS_SUCCEEDED(rv) ? sal_True : sal_False ); } -nsresult NewAddressBook(const ::rtl::OUString * aName) +nsresult NewAddressBook(const OUString * aName) { if (isProfileLocked(NULL)) return NS_ERROR_FILE_IS_LOCKED; nsresult rv; nsCOMPtr aProperties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &rv); NS_ENSURE_ARG_POINTER(aProperties); - const ::rtl::OUString& uName = *aName; + const OUString& uName = *aName; nsString nsName; MTypeConverter::ouStringToNsString(uName,nsName); aProperties->SetDescription(nsName); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx index 284ee9ab1694..4aa86de5bf92 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx @@ -37,10 +37,10 @@ namespace connectivity { private: sal_Bool m_bProfileExists ; - ::std::vector< ::rtl::OUString > m_aTableNames; - ::std::vector< ::rtl::OUString > m_aTableTypes; + ::std::vector< OUString > m_aTableNames; + ::std::vector< OUString > m_aTableTypes; ::com::sun::star::mozilla::MozillaProductType m_ProductType; - ::rtl::OUString m_ProfileName; + OUString m_ProfileName; ErrorDescriptor m_aError; public: @@ -49,15 +49,15 @@ namespace connectivity // sal_Bool getTableStrings( OConnection* _pCon, - ::std::vector< ::rtl::OUString >& _rStrings, - ::std::vector< ::rtl::OUString >& _rTypes); + ::std::vector< OUString >& _rStrings, + ::std::vector< OUString >& _rTypes); sal_Bool getTables( OConnection* _pCon, - const ::rtl::OUString& tableNamePattern, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types, + const OUString& tableNamePattern, + const ::com::sun::star::uno::Sequence< OUString >& types, ODatabaseMetaDataResultSet::ORows& _rRows); sal_Bool testLDAPConnection( OConnection* _pCon ); - sal_Bool NewAddressBook( OConnection* _pCon,const ::rtl::OUString & aTableName); + sal_Bool NewAddressBook( OConnection* _pCon,const OUString & aTableName); inline const ErrorDescriptor& getError() const { return m_aError; } }; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx index c7739c935c6b..61ec08337514 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx @@ -31,7 +31,7 @@ namespace connectivity private: sal_uInt16 m_nErrorResourceId; sal_Int32 m_nErrorCondition; - ::rtl::OUString m_sParameter; + OUString m_sParameter; public: ErrorDescriptor() @@ -41,7 +41,7 @@ namespace connectivity { } - inline void set( const sal_uInt16 _nErrorResourceId, const sal_Int32 _nErrorCondition, const ::rtl::OUString& _rParam ) + inline void set( const sal_uInt16 _nErrorResourceId, const sal_Int32 _nErrorCondition, const OUString& _rParam ) { m_nErrorResourceId = _nErrorResourceId; m_nErrorCondition = _nErrorCondition; @@ -59,7 +59,7 @@ namespace connectivity inline sal_uInt16 getResId() const { return m_nErrorResourceId; } inline sal_Int32 getErrorCondition() const { return m_nErrorCondition; } - inline const ::rtl::OUString& getParameter() const { return m_sParameter; } + inline const OUString& getParameter() const { return m_sParameter; } inline bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); } }; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index fd5e15c51551..add19e6852ba 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -62,7 +62,7 @@ namespace connectivity { namespace mozab { } }; - typedef ::boost::unordered_map< ::rtl::OString, CardPropertyData, ::rtl::OStringHash > MapPropertiesToAttributes; + typedef ::boost::unordered_map< OString, CardPropertyData, OStringHash > MapPropertiesToAttributes; #define DEF_CARD_ACCESS( PropertyName ) \ &nsIAbCard::Get##PropertyName, &nsIAbCard::Set##PropertyName @@ -122,7 +122,7 @@ namespace connectivity { namespace mozab { const MapEntry* loop = aEntries; while ( loop->pAsciiPropertyName ) { - aMap[ ::rtl::OString( loop->pAsciiPropertyName ) ] = + aMap[ OString( loop->pAsciiPropertyName ) ] = CardPropertyData( loop->pAsciiAttrributeList, loop->PropGetter, loop->PropSetter ); ++loop; } @@ -158,7 +158,7 @@ namespace connectivity { namespace mozab { // ------------------------------------------------------------------- NS_IMETHODIMP MLdapAttributeMap::GetAttributeList(const nsACString & aProperty, nsACString & _retval) { - ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); + OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty ); @@ -188,7 +188,7 @@ namespace connectivity { namespace mozab { // ------------------------------------------------------------------- NS_IMETHODIMP MLdapAttributeMap::GetFirstAttribute(const nsACString & aProperty, nsACString & _retval) { - ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); + OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty ); @@ -200,7 +200,7 @@ namespace connectivity { namespace mozab { else { sal_Int32 tokenPos(0); - ::rtl::OString sAttributeList( pos->second.pLDAPAttributeList ); + OString sAttributeList( pos->second.pLDAPAttributeList ); MTypeConverter::asciiToNsACString( sAttributeList.getToken( 0, ',', tokenPos ).getStr(), _retval ); } @@ -231,7 +231,7 @@ namespace connectivity { namespace mozab { { const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); - ::rtl::OStringBuffer aAllAttributes; + OStringBuffer aAllAttributes; for ( MapPropertiesToAttributes::const_iterator loop = rPropertyMap.begin(); loop != rPropertyMap.end(); ++loop @@ -277,8 +277,8 @@ namespace connectivity { namespace mozab { ) { // split the list of attributes for the current property - ::rtl::OString sAttributeList( prop->second.pLDAPAttributeList ); - ::rtl::OString sAttribute; + OString sAttributeList( prop->second.pLDAPAttributeList ); + OString sAttribute; sal_Int32 tokenPos = 0; while ( tokenPos != -1 ) @@ -352,7 +352,7 @@ namespace connectivity { namespace mozab { { _card.SetPreferMailFormat( nsIAbPreferMailFormat::unknown ); - ::rtl::OUString resultValue; + OUString resultValue; const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); for ( MapPropertiesToAttributes::const_iterator prop = rPropertyMap.begin(); @@ -395,7 +395,7 @@ namespace connectivity { namespace mozab { void MLdapAttributeMap::fillResultFromCard( MQueryHelperResultEntry& _result, nsIAbCard& _card ) { nsXPIDLString value; - ::rtl::OUString resultValue; + OUString resultValue; const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); for ( MapPropertiesToAttributes::const_iterator prop = rPropertyMap.begin(); @@ -422,7 +422,7 @@ namespace connectivity { namespace mozab { { if ( format == pMailFormatType->formatType ) { - resultValue = ::rtl::OUString::createFromAscii( pMailFormatType->description ); + resultValue = OUString::createFromAscii( pMailFormatType->description ); break; } ++pMailFormatType; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index 305b0da6ccf3..b086571a2e1b 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -53,7 +53,7 @@ using namespace connectivity::mozab; /* Implementation file */ static ::osl::Mutex m_aThreadMutex; -extern nsresult NewAddressBook(const ::rtl::OUString * aName); +extern nsresult NewAddressBook(const OUString * aName); MNSMozabProxy::MNSMozabProxy() @@ -69,7 +69,7 @@ MNSMozabProxy::~MNSMozabProxy() { } -sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const ::rtl::OUString &aProfile) +sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const OUString &aProfile) { OSL_TRACE( "IN : MNSMozabProxy::StartProxy()" ); ::osl::MutexGuard aGuard(m_aThreadMutex); @@ -80,7 +80,7 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo { Reference xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - ::com::sun::star::uno::Reference xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); + ::com::sun::star::uno::Reference xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xRunner = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner >(xInstance,UNO_QUERY); } @@ -89,15 +89,15 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo } extern nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap, - ::std::vector< ::rtl::OUString >* _rStrings, - ::std::vector< ::rtl::OUString >* _rTypes, + ::std::vector< OUString >* _rStrings, + ::std::vector< OUString >* _rTypes, sal_Int32* pErrorId ); ::com::sun::star::mozilla::MozillaProductType SAL_CALL MNSMozabProxy::getProductType( ) throw (::com::sun::star::uno::RuntimeException) { return m_Product; } -::rtl::OUString SAL_CALL MNSMozabProxy::getProfileName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MNSMozabProxy::getProfileName( ) throw (::com::sun::star::uno::RuntimeException) { return m_Profile; } @@ -123,8 +123,8 @@ sal_Int32 SAL_CALL MNSMozabProxy::run( ) throw (::com::sun::star::uno::RuntimeE rv = getTableStringsProxied((const sal_Char*)m_Args->arg1, (sal_Int32 *)m_Args->arg2, (MNameMapper *)m_Args->arg3, - (::std::vector< ::rtl::OUString >*)m_Args->arg4, - (::std::vector< ::rtl::OUString >*)m_Args->arg5, + (::std::vector< OUString >*)m_Args->arg4, + (::std::vector< OUString >*)m_Args->arg5, (sal_Int32 *)m_Args->arg6); break; case ProxiedFunc::FUNC_EXECUTE_QUERY: @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL MNSMozabProxy::run( ) throw (::com::sun::star::uno::RuntimeE case ProxiedFunc::FUNC_NEW_ADDRESS_BOOK: if (m_Args->arg1) { - rv = NewAddressBook((const ::rtl::OUString*)m_Args->arg1 ); + rv = NewAddressBook((const OUString*)m_Args->arg1 ); } break; default: diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx index 2683b157c852..4e8c0241621c 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx @@ -81,10 +81,10 @@ namespace connectivity //XCodeProxy virtual sal_Int32 SAL_CALL run( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::mozilla::MozillaProductType SAL_CALL getProductType( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProfileName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProfileName( ) throw (::com::sun::star::uno::RuntimeException); public: - sal_Int32 StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const ::rtl::OUString &aProfile); //Call this to start proxy + sal_Int32 StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const OUString &aProfile); //Call this to start proxy protected: nsresult testLDAPConnection(); @@ -95,7 +95,7 @@ namespace connectivity RunArgs * m_Args; ::com::sun::star::mozilla::MozillaProductType m_Product; - ::rtl::OUString m_Profile; + OUString m_Profile; #if OSL_DEBUG_LEVEL > 0 oslThreadIdentifier m_oThreadID; #endif diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx index 2a568130606d..f10b41f5c5ca 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx @@ -20,7 +20,7 @@ #include #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -29,7 +29,7 @@ using namespace connectivity::mozab; bool -MNameMapper::ltstr::operator()( const ::rtl::OUString &s1, const ::rtl::OUString &s2) const +MNameMapper::ltstr::operator()( const OUString &s1, const OUString &s2) const { return s1.compareTo(s2) < 0; } @@ -76,7 +76,7 @@ const char * getURI(const nsIAbDirectory* directory) // May modify the name passed in so that it's unique nsresult -MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook ) +MNameMapper::add( OUString& str, nsIAbDirectory* abook ) { MNameMapper::dirMap::iterator iter; @@ -87,18 +87,18 @@ MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook ) return NS_ERROR_NULL_POINTER; } - ::rtl::OUString ouUri=::rtl::OUString::createFromAscii(getURI(abook)); + OUString ouUri=OUString::createFromAscii(getURI(abook)); if ( mUriMap->find (ouUri) != mUriMap->end() ) //There's already an entry with same uri { return NS_ERROR_FILE_NOT_FOUND; } mUriMap->insert( MNameMapper::uriMap::value_type( ouUri, abook ) ); - ::rtl::OUString tempStr=str; + OUString tempStr=str; long count =1; while ( mDirMap->find( tempStr ) != mDirMap->end() ) { - tempStr = str + ::rtl::OUString::valueOf(count); + tempStr = str + OUString::valueOf(count); count ++; } str = tempStr; @@ -109,7 +109,7 @@ MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook ) } bool -MNameMapper::getDir( const ::rtl::OUString& str, nsIAbDirectory* *abook ) +MNameMapper::getDir( const OUString& str, nsIAbDirectory* *abook ) { MNameMapper::dirMap::iterator iter; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx index 25dd13e911d3..85aefb5f6079 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx @@ -38,12 +38,12 @@ namespace connectivity struct ltstr { - bool operator()( const ::rtl::OUString &s1, const ::rtl::OUString &s2) const; + bool operator()( const OUString &s1, const OUString &s2) const; }; - typedef ::std::multimap< ::rtl::OUString, nsIAbDirectory *, ltstr > dirMap; - typedef ::std::multimap< ::rtl::OUString, nsIAbDirectory *, ltstr > uriMap; + typedef ::std::multimap< OUString, nsIAbDirectory *, ltstr > dirMap; + typedef ::std::multimap< OUString, nsIAbDirectory *, ltstr > uriMap; static MNameMapper *instance; dirMap *mDirMap; @@ -59,13 +59,13 @@ namespace connectivity ~MNameMapper(); // May modify the name passed in so that it's unique - nsresult add( ::rtl::OUString& str, nsIAbDirectory* abook ); + nsresult add( OUString& str, nsIAbDirectory* abook ); //reset dirs void reset(); // Get the directory corresponding to str - bool getDir( const ::rtl::OUString& str, nsIAbDirectory* *abook ); + bool getDir( const OUString& str, nsIAbDirectory* *abook ); }; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 21bed90e07dc..4be34d8f9cba 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -31,7 +31,7 @@ #include #if OSL_DEBUG_LEVEL > 0 -# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) +# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) #else /* OSL_DEBUG_LEVEL */ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ @@ -113,7 +113,7 @@ void MQuery::construct() NS_IF_ADDREF( m_aQueryHelper); } // ------------------------------------------------------------------------- -void MQuery::setAddressbook(::rtl::OUString &ab) +void MQuery::setAddressbook(OUString &ab) { OSL_TRACE("IN MQuery::setAddressbook()"); ::osl::MutexGuard aGuard(m_aMutex); @@ -166,7 +166,7 @@ static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression* _aExpr, // Set the 'name' property of the boolString. // Check if it's an alias first... - rtl::OString attrName = _aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias( evStr->getName() ); + OString attrName = _aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias( evStr->getName() ); boolString->SetName( strdup( attrName.getStr() ) ); OSL_TRACE("Name = %s ;", attrName.getStr() ); // Set the 'matchType' property of the boolString. Check for equal length. @@ -256,9 +256,9 @@ sal_uInt32 MQuery::InsertLoginInfo(OConnection* _pCon) { nsresult rv; // Store return values. - rtl::OUString nameAB = _pCon->getHost().replace('.','_'); - rtl::OUString bindDN = _pCon->getBindDN(); - rtl::OUString password = _pCon->getPassword(); + OUString nameAB = _pCon->getHost().replace('.','_'); + OUString bindDN = _pCon->getBindDN(); + OUString password = _pCon->getPassword(); sal_Bool useSSL = _pCon->getUseSSL(); nsCOMPtr prefs = do_GetService(NS_PREF_CONTRACTID, &rv); @@ -301,7 +301,7 @@ sal_Bool isProfileLocked(OConnection* _pCon) ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") ); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); xMozillaBootstrap = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XMozillaBootstrap >(xInstance,::com::sun::star::uno::UNO_QUERY); if (_pCon) @@ -620,7 +620,7 @@ MQuery::checkRowAvailable( sal_Int32 nDBRow ) } // ------------------------------------------------------------------------- sal_Bool -MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString& aDBColumnName, sal_Int32 nType ) const +MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const { MQueryHelperResultEntry* xResEntry = m_aQueryHelper->getByIndex( nDBRow ); @@ -645,7 +645,7 @@ MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString& // ------------------------------------------------------------------------- sal_Bool -MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString& aDBColumnName, sal_Int32 nType ) const +MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const { MQueryHelperResultEntry* xResEntry = m_aQueryHelper->getByIndex( nDBRow ); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx index c6d38529f93f..b9de6e148eaf 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx @@ -73,15 +73,15 @@ namespace connectivity class MQueryExpressionString : public MQueryExpressionBase { protected: - ::rtl::OUString m_aName; // LHS + OUString m_aName; // LHS MQueryOp::cond_type m_aBooleanCondition; - ::rtl::OUString m_aValue; // RHS + OUString m_aValue; // RHS public: - MQueryExpressionString( ::rtl::OUString& lhs, + MQueryExpressionString( OUString& lhs, MQueryOp::cond_type cond, - ::rtl::OUString rhs ) + OUString rhs ) : MQueryExpressionBase( MQueryExpressionBase::StringExpr ) , m_aName( lhs ) , m_aBooleanCondition( cond ) @@ -89,18 +89,18 @@ namespace connectivity { } - MQueryExpressionString( ::rtl::OUString& lhs, + MQueryExpressionString( OUString& lhs, MQueryOp::cond_type cond ) : MQueryExpressionBase( MQueryExpressionBase::StringExpr ) , m_aName( lhs ) , m_aBooleanCondition( cond ) - , m_aValue( ::rtl::OUString() ) + , m_aValue( OUString() ) { } - const ::rtl::OUString& getName() const { return m_aName; } + const OUString& getName() const { return m_aName; } MQueryOp::cond_type getCond() const { return m_aBooleanCondition; } - const ::rtl::OUString& getValue() const { return m_aValue; } + const OUString& getValue() const { return m_aValue; } }; class MQuery; @@ -192,14 +192,14 @@ namespace connectivity private: MQueryDirectory *m_aQueryDirectory; MQueryHelper *m_aQueryHelper; - ::rtl::OUString m_aAddressbook; + OUString m_aAddressbook; sal_Int32 m_nMaxNrOfReturns; sal_Bool m_bQuerySubDirs; MQueryExpression m_aExpr; const OColumnAlias& m_rColumnAlias; ::com::sun::star::mozilla::MozillaProductType m_Product; - ::rtl::OUString m_Profile; + OUString m_Profile; ErrorDescriptor m_aError; void construct(); @@ -226,7 +226,7 @@ namespace connectivity sal_uInt32 InsertLoginInfo(OConnection* _pCon); - void setAddressbook( ::rtl::OUString&); + void setAddressbook( OUString&); const OColumnAlias& getColumnAlias() const { return m_rColumnAlias; } @@ -241,11 +241,11 @@ namespace connectivity sal_Bool checkRowAvailable( sal_Int32 nDBRow ); sal_Bool getRowValue( connectivity::ORowSetValue& rValue, sal_Int32 nDBRow, - const rtl::OUString& aDBColumnName, + const OUString& aDBColumnName, sal_Int32 nType ) const; sal_Bool setRowValue( connectivity::ORowSetValue& rValue, sal_Int32 nDBRow, - const rtl::OUString& aDBColumnName, + const OUString& aDBColumnName, sal_Int32 nType ) const; sal_Int32 getRowStates(sal_Int32 nDBRow); sal_Bool setRowStates(sal_Int32 nDBRow,sal_Int32 aState); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index 588ec2f5fc06..71ff4f07fb9c 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -60,17 +60,17 @@ MQueryHelperResultEntry::getCard() { return m_Card; } -void MQueryHelperResultEntry::insert( const rtl::OString &key, rtl::OUString &value ) +void MQueryHelperResultEntry::insert( const OString &key, OUString &value ) { m_Fields[ key ] = value; } -rtl::OUString MQueryHelperResultEntry::getValue( const rtl::OString &key ) const +OUString MQueryHelperResultEntry::getValue( const OString &key ) const { FieldMap::const_iterator iter = m_Fields.find( key ); if ( iter == m_Fields.end() ) { - return rtl::OUString(); + return OUString(); } else { @@ -78,7 +78,7 @@ rtl::OUString MQueryHelperResultEntry::getValue( const rtl::OString &key ) const } } -void MQueryHelperResultEntry::setValue( const rtl::OString &key, const rtl::OUString & rValue) +void MQueryHelperResultEntry::setValue( const OString &key, const OUString & rValue) { m_Fields[ key ] = rValue; } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx index 3d8169659a1e..17bb8475aca7 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx @@ -38,7 +38,7 @@ namespace connectivity class MQueryHelperResultEntry { private: - typedef ::boost::unordered_map< ::rtl::OString, ::rtl::OUString, ::rtl::OStringHash > FieldMap; + typedef ::boost::unordered_map< OString, OUString, OStringHash > FieldMap; mutable ::osl::Mutex m_aMutex; FieldMap m_Fields; @@ -49,9 +49,9 @@ namespace connectivity MQueryHelperResultEntry(); ~MQueryHelperResultEntry(); - void insert( const rtl::OString &key, rtl::OUString &value ); - rtl::OUString getValue( const rtl::OString &key ) const; - void setValue( const rtl::OString &key, const rtl::OUString & rValue); + void insert( const OString &key, OUString &value ); + OUString getValue( const OString &key ) const; + void setValue( const OString &key, const OUString & rValue); void setCard(nsIAbCard *card); nsIAbCard *getCard(); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx index 701e403b2d93..813d67b09179 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx @@ -25,10 +25,10 @@ using namespace connectivity::mozab; // ------------------------------------------------------------------------- -void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &nss) +void MTypeConverter::ouStringToNsString(OUString const &ous, nsString &nss) { - // Convert to ::rtl::OString (utf-8 encoding). - ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_UTF8)); + // Convert to OString (utf-8 encoding). + OString os(OUStringToOString(ous, RTL_TEXTENCODING_UTF8)); const char *cs = os.getStr(); PRUint32 csLen = os.getLength(); @@ -38,11 +38,11 @@ void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &ns nss = mozString; // temp. } // ------------------------------------------------------------------------- -::rtl::OString MTypeConverter::nsACStringToOString( const nsACString& _source ) +OString MTypeConverter::nsACStringToOString( const nsACString& _source ) { const char* buffer = _source.BeginReading(); const char* bufferEnd = _source.EndReading(); - return ::rtl::OString( buffer, static_cast(bufferEnd - buffer) ); + return OString( buffer, static_cast(bufferEnd - buffer) ); } // ------------------------------------------------------------------------- void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest ) @@ -51,7 +51,7 @@ void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString _dest.AppendASCII( _asciiString ); } // ------------------------------------------------------------------------- -void MTypeConverter::nsStringToOUString(nsString const &nss, ::rtl::OUString &ous) +void MTypeConverter::nsStringToOUString(nsString const &nss, OUString &ous) { // Get clone of buffer. PRUnichar *uc = ToNewUnicode(nss); @@ -59,24 +59,24 @@ void MTypeConverter::nsStringToOUString(nsString const &nss, ::rtl::OUString &ou // TODO check if this is ok. // PRUnichar != sal_Unicode in mingw - ::rtl::OUString _ous(reinterpret_cast_mingw_only(uc), nssLen); + OUString _ous(reinterpret_cast_mingw_only(uc), nssLen); ous = _ous; nsMemory::Free(uc); } // ------------------------------------------------------------------------- -void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, ::rtl::OUString &ous) +void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, OUString &ous) { // TODO, specify length. // PRUnichar != sal_Unicode in mingw - ::rtl::OUString _ous(reinterpret_cast_mingw_only(pru)); + OUString _ous(reinterpret_cast_mingw_only(pru)); ous = _ous; } // ------------------------------------------------------------------------- -char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous) +char *MTypeConverter::ouStringToCCharStringAscii(OUString const &ous) { - // Convert ::rtl::OUString to ::rtl::OString, - ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_ASCII_US)); + // Convert OUString to OString, + OString os(OUStringToOString(ous, RTL_TEXTENCODING_ASCII_US)); return(strdup(os.getStr())); } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx index 7ff358f82436..758983dddfd5 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx @@ -32,18 +32,18 @@ namespace connectivity class MTypeConverter { public: - static void ouStringToNsString(const ::rtl::OUString&, nsString&); - static void nsStringToOUString(const nsString&, ::rtl::OUString&); - static void prUnicharToOUString(const PRUnichar*, ::rtl::OUString&); + static void ouStringToNsString(const OUString&, nsString&); + static void nsStringToOUString(const nsString&, OUString&); + static void prUnicharToOUString(const PRUnichar*, OUString&); // Use free() for the following 3 calls. - static char *ouStringToCCharStringAscii(const ::rtl::OUString&); + static char *ouStringToCCharStringAscii(const OUString&); static char *nsStringToCCharStringAscii(const nsString&); - static char *ouStringToCCharStringUtf8(const ::rtl::OUString&); + static char *ouStringToCCharStringUtf8(const OUString&); // Convert to stl-string. - static ::std::string ouStringToStlString(const ::rtl::OUString&); + static ::std::string ouStringToStlString(const OUString&); static ::std::string nsStringToStlString(const nsString&); - static ::rtl::OString nsACStringToOString( const nsACString& _source ); + static OString nsACStringToOString( const nsACString& _source ); static void asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest ); private: diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index cb0bd5a86e62..cab7b9d0045f 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -42,11 +42,11 @@ OMySQLCatalog::OMySQLCatalog(const Reference< XConnection >& _xConnection) : OCa { } // ----------------------------------------------------------------------------- -void OMySQLCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames) +void OMySQLCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TStringVector& _rNames) { Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"), - ::rtl::OUString("%"), + OUString("%"), + OUString("%"), _sKindOfObject); fillNames(xResult,_rNames); } @@ -54,11 +54,11 @@ void OMySQLCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfOb void OMySQLCatalog::refreshTables() { TStringVector aVector; - static const ::rtl::OUString s_sTableTypeView("VIEW"); - static const ::rtl::OUString s_sTableTypeTable("TABLE"); - static const ::rtl::OUString s_sAll("%"); + static const OUString s_sTableTypeView("VIEW"); + static const OUString s_sTableTypeTable("TABLE"); + static const OUString s_sAll("%"); - Sequence< ::rtl::OUString > sTableTypes(3); + Sequence< OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; sTableTypes[2] = s_sAll; // just to be sure to include anything else .... @@ -73,8 +73,8 @@ void OMySQLCatalog::refreshTables() // ------------------------------------------------------------------------- void OMySQLCatalog::refreshViews() { - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("VIEW"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("VIEW"); // let's simply assume the server is new enough to support views. Current drivers // as of this writing might not return the proper information in getTableTypes, so @@ -100,7 +100,7 @@ void OMySQLCatalog::refreshUsers() { TStringVector aVector; Reference< XStatement > xStmt = m_xConnection->createStatement( ); - Reference< XResultSet > xResult = xStmt->executeQuery(::rtl::OUString("select User from mysql.user group by User")); + Reference< XResultSet > xResult = xStmt->executeQuery(OUString("select User from mysql.user group by User")); if ( xResult.is() ) { Reference< XRow > xRow(xResult,UNO_QUERY); diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx index 6e05cca99f25..169bdc57c0de 100644 --- a/connectivity/source/drivers/mysql/YColumns.cxx +++ b/connectivity/source/drivers/mysql/YColumns.cxx @@ -55,7 +55,7 @@ OMySQLColumn::OMySQLColumn( sal_Bool _bCase) // ------------------------------------------------------------------------- void OMySQLColumn::construct() { - m_sAutoIncrement = ::rtl::OUString("auto_increment"); + m_sAutoIncrement = OUString("auto_increment"); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); } // ----------------------------------------------------------------------------- @@ -69,10 +69,10 @@ void OMySQLColumn::construct() return *OMySQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Column"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.sdbcx.Column"); return aSupported; } diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 600a9855affc..bd826e073504 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -103,17 +103,17 @@ namespace connectivity D_NATIVE } T_DRIVERTYPE; - sal_Bool isOdbcUrl(const ::rtl::OUString& _sUrl) + sal_Bool isOdbcUrl(const OUString& _sUrl) { return _sUrl.copy(0,16) == "sdbc:mysql:odbc:"; } //-------------------------------------------------------------------- - sal_Bool isNativeUrl(const ::rtl::OUString& _sUrl) + sal_Bool isNativeUrl(const OUString& _sUrl) { - return (!_sUrl.compareTo(::rtl::OUString("sdbc:mysql:mysqlc:"), sizeof("sdbc:mysql:mysqlc:")-1)); + return (!_sUrl.compareTo(OUString("sdbc:mysql:mysqlc:"), sizeof("sdbc:mysql:mysqlc:")-1)); } //-------------------------------------------------------------------- - T_DRIVERTYPE lcl_getDriverType(const ::rtl::OUString& _sUrl) + T_DRIVERTYPE lcl_getDriverType(const OUString& _sUrl) { T_DRIVERTYPE eRet = D_JDBC; if ( isOdbcUrl(_sUrl ) ) @@ -123,18 +123,18 @@ namespace connectivity return eRet; } //-------------------------------------------------------------------- - ::rtl::OUString transformUrl(const ::rtl::OUString& _sUrl) + OUString transformUrl(const OUString& _sUrl) { - ::rtl::OUString sNewUrl = _sUrl.copy(11); + OUString sNewUrl = _sUrl.copy(11); if ( isOdbcUrl( _sUrl ) ) - sNewUrl = ::rtl::OUString("sdbc:") + sNewUrl; + sNewUrl = OUString("sdbc:") + sNewUrl; else if ( isNativeUrl( _sUrl ) ) - sNewUrl = ::rtl::OUString("sdbc:") + sNewUrl; + sNewUrl = OUString("sdbc:") + sNewUrl; else { sNewUrl = sNewUrl.copy(5); - ::rtl::OUString sTempUrl = ::rtl::OUString("jdbc:mysql://"); + OUString sTempUrl = OUString("jdbc:mysql://"); sTempUrl += sNewUrl; sNewUrl = sTempUrl; @@ -142,14 +142,14 @@ namespace connectivity return sNewUrl; } //-------------------------------------------------------------------- - Reference< XDriver > lcl_loadDriver(const Reference< XComponentContext >& _rxContext,const ::rtl::OUString& _sUrl) + Reference< XDriver > lcl_loadDriver(const Reference< XComponentContext >& _rxContext,const OUString& _sUrl) { Reference xDriverAccess = DriverManager::create(_rxContext); Reference< XDriver > xDriver = xDriverAccess->getDriverByURL(_sUrl); return xDriver; } //-------------------------------------------------------------------- - Sequence< PropertyValue > lcl_convertProperties(T_DRIVERTYPE _eType,const Sequence< PropertyValue >& info,const ::rtl::OUString& _sUrl) + Sequence< PropertyValue > lcl_convertProperties(T_DRIVERTYPE _eType,const Sequence< PropertyValue >& info,const OUString& _sUrl) { ::std::vector aProps; const PropertyValue* pSupported = info.getConstArray(); @@ -164,12 +164,12 @@ namespace connectivity if ( _eType == D_ODBC ) { aProps.push_back( PropertyValue( - ::rtl::OUString("Silent") + OUString("Silent") ,0 ,makeAny(sal_True) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - ::rtl::OUString("PreventGetVersionColumns") + OUString("PreventGetVersionColumns") ,0 ,makeAny(sal_True) ,PropertyState_DIRECT_VALUE) ); @@ -177,31 +177,31 @@ namespace connectivity else if ( _eType == D_JDBC ) { aProps.push_back( PropertyValue( - ::rtl::OUString("JavaDriverClass") + OUString("JavaDriverClass") ,0 - ,makeAny(::rtl::OUString("com.mysql.jdbc.Driver")) + ,makeAny(OUString("com.mysql.jdbc.Driver")) ,PropertyState_DIRECT_VALUE) ); } else { aProps.push_back( PropertyValue( - ::rtl::OUString("PublicConnectionURL") + OUString("PublicConnectionURL") ,0 ,makeAny(_sUrl) ,PropertyState_DIRECT_VALUE) ); } aProps.push_back( PropertyValue( - ::rtl::OUString("IsAutoRetrievingEnabled") + OUString("IsAutoRetrievingEnabled") ,0 ,makeAny(sal_True) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - ::rtl::OUString("AutoRetrievingStatement") + OUString("AutoRetrievingStatement") ,0 - ,makeAny(::rtl::OUString("SELECT LAST_INSERT_ID()")) + ,makeAny(OUString("SELECT LAST_INSERT_ID()")) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - ::rtl::OUString("ParameterNameSubstitution") + OUString("ParameterNameSubstitution") ,0 ,makeAny(sal_True) ,PropertyState_DIRECT_VALUE) ); @@ -210,10 +210,10 @@ namespace connectivity } } //-------------------------------------------------------------------- - Reference< XDriver > ODriverDelegator::loadDriver( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) + Reference< XDriver > ODriverDelegator::loadDriver( const OUString& url, const Sequence< PropertyValue >& info ) { Reference< XDriver > xDriver; - const ::rtl::OUString sCuttedUrl = transformUrl(url); + const OUString sCuttedUrl = transformUrl(url); const T_DRIVERTYPE eType = lcl_getDriverType( url ); if ( eType == D_ODBC ) { @@ -230,7 +230,7 @@ namespace connectivity else { ::comphelper::NamedValueCollection aSettings( info ); - ::rtl::OUString sDriverClass("com.mysql.jdbc.Driver"); + OUString sDriverClass("com.mysql.jdbc.Driver"); sDriverClass = aSettings.getOrDefault( "JavaDriverClass", sDriverClass ); TJDBCDrivers::iterator aFind = m_aJdbcDrivers.find(sDriverClass); @@ -243,7 +243,7 @@ namespace connectivity } //-------------------------------------------------------------------- - Reference< XConnection > SAL_CALL ODriverDelegator::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { Reference< XConnection > xConnection; if ( acceptsURL(url) ) @@ -252,34 +252,34 @@ namespace connectivity xDriver = loadDriver(url,info); if ( xDriver.is() ) { - ::rtl::OUString sCuttedUrl = transformUrl(url); + OUString sCuttedUrl = transformUrl(url); const T_DRIVERTYPE eType = lcl_getDriverType( url ); Sequence< PropertyValue > aConvertedProperties = lcl_convertProperties(eType,info,url); if ( eType == D_JDBC ) { ::comphelper::NamedValueCollection aSettings( info ); - ::rtl::OUString sIanaName = aSettings.getOrDefault( "CharSet", ::rtl::OUString() ); + OUString sIanaName = aSettings.getOrDefault( "CharSet", OUString() ); if ( !sIanaName.isEmpty() ) { ::dbtools::OCharsetMap aLookupIanaName; ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.find(sIanaName, ::dbtools::OCharsetMap::IANA()); if (aLookup != aLookupIanaName.end() ) { - ::rtl::OUString sAdd; + OUString sAdd; if ( RTL_TEXTENCODING_UTF8 == (*aLookup).getEncoding() ) { - static const ::rtl::OUString s_sCharSetOp("useUnicode=true&"); + static const OUString s_sCharSetOp("useUnicode=true&"); if ( !sCuttedUrl.matchIgnoreAsciiCase(s_sCharSetOp) ) { sAdd = s_sCharSetOp; } // if ( !sCuttedUrl.matchIgnoreAsciiCase(s_sCharSetOp) ) } // if ( RTL_TEXTENCODING_UTF8 == (*aLookup).getEncoding() ) if ( sCuttedUrl.indexOf('?') == -1 ) - sCuttedUrl += ::rtl::OUString("?"); + sCuttedUrl += OUString("?"); else - sCuttedUrl += ::rtl::OUString("&"); + sCuttedUrl += OUString("&"); sCuttedUrl += sAdd; - sCuttedUrl += ::rtl::OUString("characterEncoding="); + sCuttedUrl += OUString("characterEncoding="); sCuttedUrl += sIanaName; } } @@ -305,7 +305,7 @@ namespace connectivity } //-------------------------------------------------------------------- - sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const ::rtl::OUString& url ) throw (SQLException, RuntimeException) + sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException) { Sequence< PropertyValue > info; @@ -318,40 +318,40 @@ namespace connectivity } //-------------------------------------------------------------------- - Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException) + Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException) { ::std::vector< DriverPropertyInfo > aDriverInfo; if ( !acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); - Sequence< ::rtl::OUString > aBoolean(2); - aBoolean[0] = ::rtl::OUString("0"); - aBoolean[1] = ::rtl::OUString("1"); + Sequence< OUString > aBoolean(2); + aBoolean[0] = OUString("0"); + aBoolean[1] = OUString("1"); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("CharSet") - ,::rtl::OUString("CharSet of the database.") + OUString("CharSet") + ,OUString("CharSet of the database.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("SuppressVersionColumns") - ,::rtl::OUString("Display version columns (when available).") + OUString("SuppressVersionColumns") + ,OUString("Display version columns (when available).") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); const T_DRIVERTYPE eType = lcl_getDriverType( url ); if ( eType == D_JDBC ) { aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("JavaDriverClass") - ,::rtl::OUString("The JDBC driver class name.") + OUString("JavaDriverClass") + ,OUString("The JDBC driver class name.") ,sal_True - ,::rtl::OUString("com.mysql.jdbc.Driver") - ,Sequence< ::rtl::OUString >()) + ,OUString("com.mysql.jdbc.Driver") + ,Sequence< OUString >()) ); } @@ -421,12 +421,12 @@ namespace connectivity } //-------------------------------------------------------------------- - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { if ( ! acceptsURL(url) ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); } // if ( ! acceptsURL(url) ) @@ -436,37 +436,37 @@ namespace connectivity // XServiceInfo // -------------------------------------------------------------------------------- //------------------------------------------------------------------------------ - rtl::OUString ODriverDelegator::getImplementationName_Static( ) throw(RuntimeException) + OUString ODriverDelegator::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString("org.openoffice.comp.drivers.MySQL.Driver"); + return OUString("org.openoffice.comp.drivers.MySQL.Driver"); } //------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) + Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); - aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver"); + Sequence< OUString > aSNS( 2 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); + aSNS[1] = OUString("com.sun.star.sdbcx.Driver"); return aSNS; } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ - sal_Bool SAL_CALL ODriverDelegator::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; return pSupported != pEnd; } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index 9b8f38d83e53..efc80a2ae4c9 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -59,9 +59,9 @@ namespace connectivity { protected: // ----------------------------------------------------------------------------- - virtual ::rtl::OUString getDropForeignKey() const + virtual OUString getDropForeignKey() const { - return ::rtl::OUString(" DROP FOREIGN KEY "); + return OUString(" DROP FOREIGN KEY "); } public: OMySQLKeysHelper( OTableHelper* _pTable, @@ -92,11 +92,11 @@ OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables, // ------------------------------------------------------------------------- OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName, + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName, sal_Int32 _nPrivileges ) : OTableHelper( _pTables, _xConnection, @@ -170,7 +170,7 @@ sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (R } // ------------------------------------------------------------------------- // XAlterTable -void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -211,7 +211,7 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bOldAutoIncrement; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; bool bColumnNameChanged = false; - ::rtl::OUString sOldDesc,sNewDesc; + OUString sOldDesc,sNewDesc; xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sOldDesc; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sNewDesc; @@ -226,15 +226,15 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co // if a column should be an auto_incmrement one if ( bOldAutoIncrement != bAutoIncrement ) { - ::rtl::OUString sTypeName; + OUString sTypeName; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sTypeName; - static ::rtl::OUString s_sAutoIncrement("auto_increment"); + static OUString s_sAutoIncrement("auto_increment"); if ( bAutoIncrement ) { if ( sTypeName.indexOf(s_sAutoIncrement) == -1 ) { - sTypeName += ::rtl::OUString(" "); + sTypeName += OUString(" "); sTypeName += s_sAutoIncrement; } } @@ -253,7 +253,7 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co } // third: check the default values - ::rtl::OUString sNewDefault,sOldDefault; + OUString sNewDefault,sOldDefault; xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault; @@ -267,15 +267,15 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co alterDefaultValue(sNewDefault,colName); // now we should look if the name of the column changed - ::rtl::OUString sNewColumnName; + OUString sNewColumnName; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_NAME)) >>= sNewColumnName; if ( !sNewColumnName.equalsIgnoreAsciiCase(colName) && !bColumnNameChanged ) { - ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(" CHANGE "); - const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); + OUString sSql = getAlterTableColumnPart(); + sSql += OUString(" CHANGE "); + const OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,colName); - sSql += ::rtl::OUString(" "); + sSql += OUString(" "); sSql += OTables::adjustSQL(::dbtools::createStandardColumnPart(descriptor,getConnection(),static_cast(m_pTables),getTypeCreatePattern())); executeStatement(sSql); } @@ -292,13 +292,13 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co } // ----------------------------------------------------------------------------- -void OMySQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rColName, const Reference& _xDescriptor) +void OMySQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, const Reference& _xDescriptor) { - ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(" CHANGE "); - const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); + OUString sSql = getAlterTableColumnPart(); + sSql += OUString(" CHANGE "); + const OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,_rColName); - sSql += ::rtl::OUString(" "); + sSql += OUString(" "); OColumn* pColumn = new OColumn(sal_True); Reference xProp = pColumn; @@ -309,53 +309,53 @@ void OMySQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rCo executeStatement(sSql); } // ----------------------------------------------------------------------------- -::rtl::OUString OMySQLTable::getTypeCreatePattern() const +OUString OMySQLTable::getTypeCreatePattern() const { - static const ::rtl::OUString s_sCreatePattern("(M,D)"); + static const OUString s_sCreatePattern("(M,D)"); return s_sCreatePattern; } // ----------------------------------------------------------------------------- -void OMySQLTable::alterDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName) +void OMySQLTable::alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName) { - ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(" ALTER "); + OUString sSql = getAlterTableColumnPart(); + sSql += OUString(" ALTER "); - const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); + const OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,_rColName); - sSql += ::rtl::OUString(" SET DEFAULT '") + _sNewDefault; - sSql += ::rtl::OUString("'"); + sSql += OUString(" SET DEFAULT '") + _sNewDefault; + sSql += OUString("'"); executeStatement(sSql); } // ----------------------------------------------------------------------------- -void OMySQLTable::dropDefaultValue(const ::rtl::OUString& _rColName) +void OMySQLTable::dropDefaultValue(const OUString& _rColName) { - ::rtl::OUString sSql = getAlterTableColumnPart(); - sSql += ::rtl::OUString(" ALTER "); + OUString sSql = getAlterTableColumnPart(); + sSql += OUString(" ALTER "); - const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( ); + const OUString sQuote = getMetaData()->getIdentifierQuoteString( ); sSql += ::dbtools::quoteName(sQuote,_rColName); - sSql += ::rtl::OUString(" DROP DEFAULT"); + sSql += OUString(" DROP DEFAULT"); executeStatement(sSql); } // ----------------------------------------------------------------------------- -::rtl::OUString OMySQLTable::getAlterTableColumnPart() +OUString OMySQLTable::getAlterTableColumnPart() { - ::rtl::OUString sSql( "ALTER TABLE " ); + OUString sSql( "ALTER TABLE " ); - ::rtl::OUString sComposedName( + OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) ); sSql += sComposedName; return sSql; } // ----------------------------------------------------------------------------- -void OMySQLTable::executeStatement(const ::rtl::OUString& _rStatement ) +void OMySQLTable::executeStatement(const OUString& _rStatement ) { - ::rtl::OUString sSQL = _rStatement; + OUString sSQL = _rStatement; if(sSQL.lastIndexOf(',') == (sSQL.getLength()-1)) - sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,::rtl::OUString(")")); + sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,OUString(")")); Reference< XStatement > xStmt = getConnection()->createStatement( ); if ( xStmt.is() ) @@ -365,9 +365,9 @@ void OMySQLTable::executeStatement(const ::rtl::OUString& _rStatement ) } } // ----------------------------------------------------------------------------- -::rtl::OUString OMySQLTable::getRenameStart() const +OUString OMySQLTable::getRenameStart() const { - return ::rtl::OUString("RENAME TABLE "); + return OUString("RENAME TABLE "); } diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index fea4e7090de8..776c260671ef 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.cxx @@ -46,16 +46,16 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace dbtools; -sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OTables::createObject(const OUString& _rName) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData,_rName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - static const ::rtl::OUString s_sTableTypeView("VIEW"); - static const ::rtl::OUString s_sTableTypeTable("TABLE"); - static const ::rtl::OUString s_sAll("%"); + static const OUString s_sTableTypeView("VIEW"); + static const OUString s_sTableTypeTable("TABLE"); + static const OUString s_sAll("%"); - Sequence< ::rtl::OUString > sTableTypes(3); + Sequence< OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; sTableTypes[2] = s_sAll; // just to be sure to include anything else .... @@ -114,14 +114,14 @@ Reference< XPropertySet > OTables::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OTables::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OTables::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { createTable(descriptor); return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop -void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName) { Reference< XInterface > xObject( getObject( _nPos ) ); sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject ); @@ -130,19 +130,19 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) Reference< XConnection > xConnection = static_cast(m_rParent).getConnection(); - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData,_sElementName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString aSql( "DROP " ); + OUString aSql( "DROP " ); Reference xProp(xObject,UNO_QUERY); - sal_Bool bIsView = xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString("VIEW"); + sal_Bool bIsView = xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == OUString("VIEW"); if(bIsView) // here we have a view - aSql += ::rtl::OUString("VIEW "); + aSql += OUString("VIEW "); else - aSql += ::rtl::OUString("TABLE "); + aSql += OUString("TABLE "); - ::rtl::OUString sComposedName( + OUString sComposedName( ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) ); aSql += sComposedName; Reference< XStatement > xStmt = xConnection->createStatement( ); @@ -161,16 +161,16 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) } } // ------------------------------------------------------------------------- -::rtl::OUString OTables::adjustSQL(const ::rtl::OUString& _sSql) +OUString OTables::adjustSQL(const OUString& _sSql) { - ::rtl::OUString sSQL = _sSql; - static const ::rtl::OUString s_sUNSIGNED("UNSIGNED"); + OUString sSQL = _sSql; + static const OUString s_sUNSIGNED("UNSIGNED"); sal_Int32 nIndex = sSQL.indexOf(s_sUNSIGNED); while(nIndex != -1 ) { sal_Int32 nParen = sSQL.indexOf(')',nIndex); sal_Int32 nPos = nIndex + s_sUNSIGNED.getLength(); - ::rtl::OUString sNewUnsigned( sSQL.copy(nPos,nParen - nPos + 1)); + OUString sNewUnsigned( sSQL.copy(nPos,nParen - nPos + 1)); sSQL = sSQL.replaceAt(nIndex,s_sUNSIGNED.getLength()+sNewUnsigned.getLength(),sNewUnsigned + s_sUNSIGNED); nIndex = sSQL.indexOf(s_sUNSIGNED,nIndex + s_sUNSIGNED.getLength()+sNewUnsigned.getLength()); } @@ -180,8 +180,8 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) void OTables::createTable( const Reference< XPropertySet >& descriptor ) { const Reference< XConnection > xConnection = static_cast(m_rParent).getConnection(); - static const ::rtl::OUString s_sCreatePattern("(M,D)"); - const ::rtl::OUString aSql = adjustSQL(::dbtools::createSqlCreateTableStatement(descriptor,xConnection,this,s_sCreatePattern)); + static const OUString s_sCreatePattern("(M,D)"); + const OUString aSql = adjustSQL(::dbtools::createSqlCreateTableStatement(descriptor,xConnection,this,s_sCreatePattern)); Reference< XStatement > xStmt = xConnection->createStatement( ); if ( xStmt.is() ) { @@ -190,7 +190,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor ) } } // ----------------------------------------------------------------------------- -void OTables::appendNew(const ::rtl::OUString& _rsNewTable) +void OTables::appendNew(const OUString& _rsNewTable) { insertElement(_rsNewTable,NULL); @@ -201,15 +201,15 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable) static_cast(aListenerLoop.next())->elementInserted(aEvent); } // ----------------------------------------------------------------------------- -::rtl::OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject) +OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject) { OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!"); return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false ); } // ----------------------------------------------------------------------------- -void OTables::addComment(const Reference< XPropertySet >& descriptor,::rtl::OUStringBuffer& _rOut) +void OTables::addComment(const Reference< XPropertySet >& descriptor,OUStringBuffer& _rOut) { - ::rtl::OUString sDesc; + OUString sDesc; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sDesc; if ( !sDesc.isEmpty() ) { diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index d184230cb120..5f300a3b0672 100644 --- a/connectivity/source/drivers/mysql/YUser.cxx +++ b/connectivity/source/drivers/mysql/YUser.cxx @@ -43,7 +43,7 @@ OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star } // ------------------------------------------------------------------------- OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::rtl::OUString& _Name + const OUString& _Name ) : connectivity::sdbcx::OUser(_Name,sal_True) ,m_xConnection(_xConnection) { @@ -61,7 +61,7 @@ OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun:: // ------------------------------------------------------------------------- void OUserExtend::construct() { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0))); } // ----------------------------------------------------------------------------- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const @@ -77,7 +77,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper() } typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER; // ----------------------------------------------------------------------------- -sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -87,12 +87,12 @@ sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const ::rtl::OUString& objName, sa return nRights; } // ----------------------------------------------------------------------------- -void OMySQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException) +void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException) { nRightsWithGrant = nRights = 0; // first we need to create the sql stmt to select the privs Reference xMeta = m_xConnection->getMetaData(); - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMeta,objName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); Reference xRes; switch(objType) @@ -112,32 +112,32 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName Any aCatalog; if ( !sCatalog.isEmpty() ) aCatalog <<= sCatalog; - xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,::rtl::OUString("%")); + xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,OUString("%")); } break; } if ( xRes.is() ) { - static const ::rtl::OUString sSELECT( "SELECT" ); - static const ::rtl::OUString sINSERT( "INSERT" ); - static const ::rtl::OUString sUPDATE( "UPDATE" ); - static const ::rtl::OUString sDELETE( "DELETE" ); - static const ::rtl::OUString sREAD( "READ" ); - static const ::rtl::OUString sCREATE( "CREATE" ); - static const ::rtl::OUString sALTER( "ALTER" ); - static const ::rtl::OUString sREFERENCE( "REFERENCE" ); - static const ::rtl::OUString sDROP( "DROP" ); - static const ::rtl::OUString sYes( "YES" ); + static const OUString sSELECT( "SELECT" ); + static const OUString sINSERT( "INSERT" ); + static const OUString sUPDATE( "UPDATE" ); + static const OUString sDELETE( "DELETE" ); + static const OUString sREAD( "READ" ); + static const OUString sCREATE( "CREATE" ); + static const OUString sALTER( "ALTER" ); + static const OUString sREFERENCE( "REFERENCE" ); + static const OUString sDROP( "DROP" ); + static const OUString sYes( "YES" ); nRightsWithGrant = nRights = 0; Reference xCurrentRow(xRes,UNO_QUERY); while( xCurrentRow.is() && xRes->next() ) { - ::rtl::OUString sGrantee = xCurrentRow->getString(5); - ::rtl::OUString sPrivilege = xCurrentRow->getString(6); - ::rtl::OUString sGrantable = xCurrentRow->getString(7); + OUString sGrantee = xCurrentRow->getString(5); + OUString sPrivilege = xCurrentRow->getString(6); + OUString sGrantable = xCurrentRow->getString(7); if (!m_Name.equalsIgnoreAsciiCase(sGrantee)) continue; @@ -201,7 +201,7 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName } } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -211,27 +211,27 @@ sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const ::rtl::OUString& ob return nRightsWithGrant; } // ------------------------------------------------------------------------- -void SAL_CALL OMySQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) +void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { if ( objType != PrivilegeObject::TABLE ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_GRANTED)); + const OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_GRANTED)); ::dbtools::throwGenericSQLException(sError,*this); } // if ( objType != PrivilegeObject::TABLE ) ::osl::MutexGuard aGuard(m_aMutex); - ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges); + OUString sPrivs = getPrivilegeString(objPrivileges); if(!sPrivs.isEmpty()) { - ::rtl::OUString sGrant; - sGrant += ::rtl::OUString("GRANT "); + OUString sGrant; + sGrant += OUString("GRANT "); sGrant += sPrivs; - sGrant += ::rtl::OUString(" ON "); + sGrant += OUString(" ON "); Reference xMeta = m_xConnection->getMetaData(); sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); - sGrant += ::rtl::OUString(" TO "); + sGrant += OUString(" TO "); sGrant += m_Name; Reference xStmt = m_xConnection->createStatement(); @@ -241,27 +241,27 @@ void SAL_CALL OMySQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_I } } // ------------------------------------------------------------------------- -void SAL_CALL OMySQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) +void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { if ( objType != PrivilegeObject::TABLE ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_REVOKED)); + const OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_REVOKED)); ::dbtools::throwGenericSQLException(sError,*this); } ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); - ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges); + OUString sPrivs = getPrivilegeString(objPrivileges); if(!sPrivs.isEmpty()) { - ::rtl::OUString sGrant; - sGrant += ::rtl::OUString("REVOKE "); + OUString sGrant; + sGrant += OUString("REVOKE "); sGrant += sPrivs; - sGrant += ::rtl::OUString(" ON "); + sGrant += OUString(" ON "); Reference xMeta = m_xConnection->getMetaData(); sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); - sGrant += ::rtl::OUString(" FROM "); + sGrant += OUString(" FROM "); sGrant += m_Name; Reference xStmt = m_xConnection->createStatement(); @@ -272,16 +272,16 @@ void SAL_CALL OMySQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_ } // ----------------------------------------------------------------------------- // XUser -void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/, const ::rtl::OUString& newPassword ) throw(SQLException, RuntimeException) +void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); - ::rtl::OUString sAlterPwd; - sAlterPwd = ::rtl::OUString("SET PASSWORD FOR "); + OUString sAlterPwd; + sAlterPwd = OUString("SET PASSWORD FOR "); sAlterPwd += m_Name; - sAlterPwd += ::rtl::OUString("@\"%\" = PASSWORD('") ; + sAlterPwd += OUString("@\"%\" = PASSWORD('") ; sAlterPwd += newPassword; - sAlterPwd += ::rtl::OUString("')") ; + sAlterPwd += OUString("')") ; Reference xStmt = m_xConnection->createStatement(); @@ -292,45 +292,45 @@ void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/ } } // ----------------------------------------------------------------------------- -::rtl::OUString OMySQLUser::getPrivilegeString(sal_Int32 nRights) const +OUString OMySQLUser::getPrivilegeString(sal_Int32 nRights) const { - ::rtl::OUString sPrivs; + OUString sPrivs; if((nRights & Privilege::INSERT) == Privilege::INSERT) - sPrivs += ::rtl::OUString("INSERT"); + sPrivs += OUString("INSERT"); if((nRights & Privilege::DELETE) == Privilege::DELETE) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(","); - sPrivs += ::rtl::OUString("DELETE"); + sPrivs += OUString(","); + sPrivs += OUString("DELETE"); } if((nRights & Privilege::UPDATE) == Privilege::UPDATE) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(","); - sPrivs += ::rtl::OUString("UPDATE"); + sPrivs += OUString(","); + sPrivs += OUString("UPDATE"); } if((nRights & Privilege::ALTER) == Privilege::ALTER) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(","); - sPrivs += ::rtl::OUString("ALTER"); + sPrivs += OUString(","); + sPrivs += OUString("ALTER"); } if((nRights & Privilege::SELECT) == Privilege::SELECT) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(","); - sPrivs += ::rtl::OUString("SELECT"); + sPrivs += OUString(","); + sPrivs += OUString("SELECT"); } if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE) { if(!sPrivs.isEmpty()) - sPrivs += ::rtl::OUString(","); - sPrivs += ::rtl::OUString("REFERENCES"); + sPrivs += OUString(","); + sPrivs += OUString("REFERENCES"); } return sPrivs; diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index 02197483ba13..e2e54e85d0f3 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.cxx @@ -49,7 +49,7 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent, } // ----------------------------------------------------------------------------- -sdbcx::ObjectType OUsers::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OUsers::createObject(const OUString& _rName) { return new OMySQLUser(m_xConnection,_rName); } @@ -66,20 +66,20 @@ Reference< XPropertySet > OUsers::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aSql( "GRANT USAGE ON * TO " ); - ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); - ::rtl::OUString sUserName( _rForName ); + OUString aSql( "GRANT USAGE ON * TO " ); + OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); + OUString sUserName( _rForName ); aSql += ::dbtools::quoteName(aQuote,sUserName) - + ::rtl::OUString(" @\"%\" "); - ::rtl::OUString sPassword; + + OUString(" @\"%\" "); + OUString sPassword; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword; if ( !sPassword.isEmpty() ) { - aSql += ::rtl::OUString(" IDENTIFIED BY '"); + aSql += OUString(" IDENTIFIED BY '"); aSql += sPassword; - aSql += ::rtl::OUString("'"); + aSql += OUString("'"); } Reference< XStatement > xStmt = m_xConnection->createStatement( ); @@ -91,10 +91,10 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const } // ------------------------------------------------------------------------- // XDrop -void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) +void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { - ::rtl::OUString aSql( "REVOKE ALL ON * FROM " ); - ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); + OUString aSql( "REVOKE ALL ON * FROM " ); + OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); aSql += ::dbtools::quoteName(aQuote,_sElementName); Reference< XStatement > xStmt = m_xConnection->createStatement( ); diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx index 765b6d745739..8ff2a1b971aa 100644 --- a/connectivity/source/drivers/mysql/YViews.cxx +++ b/connectivity/source/drivers/mysql/YViews.cxx @@ -48,9 +48,9 @@ using namespace ::com::sun::star::lang; using namespace dbtools; typedef connectivity::sdbcx::OCollection OCollection_TYPE; -sdbcx::ObjectType OViews::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OViews::createObject(const OUString& _rName) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, sCatalog, @@ -61,7 +61,7 @@ sdbcx::ObjectType OViews::createObject(const ::rtl::OUString& _rName) sTable, m_xMetaData, 0, - ::rtl::OUString(), + OUString(), sSchema, sCatalog ); @@ -86,14 +86,14 @@ Reference< XPropertySet > OViews::createDescriptor() } // ------------------------------------------------------------------------- // XAppend -sdbcx::ObjectType OViews::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { createView(descriptor); return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop -void OViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) +void OViews::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/) { if ( m_bInDrop ) return; @@ -102,7 +102,7 @@ void OViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject ); if (!bIsNew) { - ::rtl::OUString aSql( "DROP VIEW" ); + OUString aSql( "DROP VIEW" ); Reference xProp(xObject,UNO_QUERY); aSql += ::dbtools::composeTableName( m_xMetaData, xProp, ::dbtools::eInTableDefinitions, false, false, true ); @@ -114,7 +114,7 @@ void OViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) } } // ----------------------------------------------------------------------------- -void OViews::dropByNameImpl(const ::rtl::OUString& elementName) +void OViews::dropByNameImpl(const OUString& elementName) { m_bInDrop = sal_True; OCollection_TYPE::dropByName(elementName); @@ -125,12 +125,12 @@ void OViews::createView( const Reference< XPropertySet >& descriptor ) { Reference xConnection = static_cast(m_rParent).getConnection(); - ::rtl::OUString aSql( "CREATE VIEW " ); - ::rtl::OUString sCommand; + OUString aSql( "CREATE VIEW " ); + OUString sCommand; aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); - aSql += ::rtl::OUString(" AS "); + aSql += OUString(" AS "); descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand; aSql += sCommand; @@ -145,7 +145,7 @@ void OViews::createView( const Reference< XPropertySet >& descriptor ) OTables* pTables = static_cast(static_cast(m_rParent).getPrivateTables()); if ( pTables ) { - ::rtl::OUString sName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInDataManipulation, false, false, false ); + OUString sName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInDataManipulation, false, false, false ); pTables->appendNew(sName); } } diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx index dfb5215311a5..d9dc9561753d 100644 --- a/connectivity/source/drivers/mysql/Yservices.cxx +++ b/connectivity/source/drivers/mysql/Yservices.cxx @@ -21,7 +21,6 @@ #include using namespace connectivity::mysql; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx index f5e0ee8d6aa5..36b3930ba870 100644 --- a/connectivity/source/drivers/odbc/OFunctions.cxx +++ b/connectivity/source/drivers/odbc/OFunctions.cxx @@ -83,7 +83,7 @@ sal_Bool LoadFunctions(oslModule pODBCso); // ------------------------------------------------------------------------- // Take care of Dynamicly loading of the DLL/shared lib and Addresses: // Returns sal_True at success -sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) +sal_Bool LoadLibrary_ODBC3(OUString &_rPath) { static sal_Bool bLoaded = sal_False; static oslModule pODBCso = NULL; @@ -91,16 +91,16 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) if (bLoaded) return sal_True; #ifdef WNT - _rPath = ::rtl::OUString("ODBC32.DLL"); + _rPath = OUString("ODBC32.DLL"); #endif #ifdef UNX #ifdef MACOSX - _rPath = ::rtl::OUString("libiodbc.dylib"); + _rPath = OUString("libiodbc.dylib"); #else - _rPath = ::rtl::OUString("libodbc.so.1"); + _rPath = OUString("libodbc.so.1"); pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if ( !pODBCso ) - _rPath = ::rtl::OUString("libodbc.so"); + _rPath = OUString("libodbc.so"); #endif /* MACOSX */ #endif @@ -116,113 +116,113 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) sal_Bool LoadFunctions(oslModule pODBCso) { - if( ( pODBC3SQLAllocHandle = (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLAllocHandle").pData )) == NULL ) + if( ( pODBC3SQLAllocHandle = (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, OUString("SQLAllocHandle").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLConnect = (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLConnect").pData )) == NULL ) + if( ( pODBC3SQLConnect = (T3SQLConnect)osl_getFunctionSymbol(pODBCso, OUString("SQLConnect").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLDriverConnect = (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLDriverConnect").pData )) == NULL ) + if( ( pODBC3SQLDriverConnect = (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, OUString("SQLDriverConnect").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLBrowseConnect = (T3SQLBrowseConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLBrowseConnect").pData )) == NULL ) + if( ( pODBC3SQLBrowseConnect = (T3SQLBrowseConnect)osl_getFunctionSymbol(pODBCso, OUString("SQLBrowseConnect").pData )) == NULL ) return sal_False; - if(( pODBC3SQLDataSources = (T3SQLDataSources)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLDataSources").pData )) == NULL ) + if(( pODBC3SQLDataSources = (T3SQLDataSources)osl_getFunctionSymbol(pODBCso, OUString("SQLDataSources").pData )) == NULL ) return sal_False; - if(( pODBC3SQLDrivers = (T3SQLDrivers)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLDrivers").pData )) == NULL ) + if(( pODBC3SQLDrivers = (T3SQLDrivers)osl_getFunctionSymbol(pODBCso, OUString("SQLDrivers").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetInfo = (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLGetInfo").pData )) == NULL ) + if( ( pODBC3SQLGetInfo = (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, OUString("SQLGetInfo").pData )) == NULL ) return sal_False; - if(( pODBC3SQLGetFunctions = (T3SQLGetFunctions)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLGetFunctions").pData )) == NULL ) + if(( pODBC3SQLGetFunctions = (T3SQLGetFunctions)osl_getFunctionSymbol(pODBCso, OUString("SQLGetFunctions").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetTypeInfo = (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLGetTypeInfo").pData )) == NULL ) + if( ( pODBC3SQLGetTypeInfo = (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, OUString("SQLGetTypeInfo").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetConnectAttr = (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLSetConnectAttr").pData )) == NULL ) + if( ( pODBC3SQLSetConnectAttr = (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, OUString("SQLSetConnectAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetConnectAttr = (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLGetConnectAttr").pData )) == NULL ) + if( ( pODBC3SQLGetConnectAttr = (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, OUString("SQLGetConnectAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetEnvAttr = (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLSetEnvAttr").pData )) == NULL ) + if( ( pODBC3SQLSetEnvAttr = (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, OUString("SQLSetEnvAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetEnvAttr = (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLGetEnvAttr").pData )) == NULL ) + if( ( pODBC3SQLGetEnvAttr = (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, OUString("SQLGetEnvAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetStmtAttr = (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLSetStmtAttr").pData )) == NULL ) + if( ( pODBC3SQLSetStmtAttr = (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, OUString("SQLSetStmtAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetStmtAttr = (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLGetStmtAttr").pData )) == NULL ) + if( ( pODBC3SQLGetStmtAttr = (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, OUString("SQLGetStmtAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLPrepare = (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLPrepare").pData )) == NULL ) + if( ( pODBC3SQLPrepare = (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, OUString("SQLPrepare").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLBindParameter = (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLBindParameter").pData )) == NULL ) + if( ( pODBC3SQLBindParameter = (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, OUString("SQLBindParameter").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetCursorName = (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLSetCursorName").pData )) == NULL ) + if( ( pODBC3SQLSetCursorName = (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, OUString("SQLSetCursorName").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLExecute = (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLExecute").pData )) == NULL ) + if( ( pODBC3SQLExecute = (T3SQLExecute)osl_getFunctionSymbol(pODBCso, OUString("SQLExecute").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLExecDirect = (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLExecDirect").pData )) == NULL ) + if( ( pODBC3SQLExecDirect = (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, OUString("SQLExecDirect").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLDescribeParam = (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLDescribeParam").pData )) == NULL ) + if( ( pODBC3SQLDescribeParam = (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, OUString("SQLDescribeParam").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLNumParams = (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLNumParams").pData )) == NULL ) + if( ( pODBC3SQLNumParams = (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, OUString("SQLNumParams").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLParamData = (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLParamData").pData )) == NULL ) + if( ( pODBC3SQLParamData = (T3SQLParamData)osl_getFunctionSymbol(pODBCso, OUString("SQLParamData").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLPutData = (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLPutData").pData )) == NULL ) + if( ( pODBC3SQLPutData = (T3SQLPutData)osl_getFunctionSymbol(pODBCso, OUString("SQLPutData").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLRowCount = (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLRowCount").pData )) == NULL ) + if( ( pODBC3SQLRowCount = (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, OUString("SQLRowCount").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLNumResultCols = (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLNumResultCols").pData )) == NULL ) + if( ( pODBC3SQLNumResultCols = (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, OUString("SQLNumResultCols").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLDescribeCol = (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLDescribeCol").pData )) == NULL ) + if( ( pODBC3SQLDescribeCol = (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, OUString("SQLDescribeCol").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLColAttribute = (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLColAttribute").pData )) == NULL ) + if( ( pODBC3SQLColAttribute = (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, OUString("SQLColAttribute").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLBindCol = (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLBindCol").pData )) == NULL ) + if( ( pODBC3SQLBindCol = (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, OUString("SQLBindCol").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFetch = (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLFetch").pData )) == NULL ) + if( ( pODBC3SQLFetch = (T3SQLFetch)osl_getFunctionSymbol(pODBCso, OUString("SQLFetch").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFetchScroll = (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLFetchScroll").pData )) == NULL ) + if( ( pODBC3SQLFetchScroll = (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, OUString("SQLFetchScroll").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetData = (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLGetData").pData )) == NULL ) + if( ( pODBC3SQLGetData = (T3SQLGetData)osl_getFunctionSymbol(pODBCso, OUString("SQLGetData").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetPos = (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLSetPos").pData )) == NULL ) + if( ( pODBC3SQLSetPos = (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, OUString("SQLSetPos").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLBulkOperations = (T3SQLBulkOperations)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLBulkOperations").pData )) == NULL ) + if( ( pODBC3SQLBulkOperations = (T3SQLBulkOperations)osl_getFunctionSymbol(pODBCso, OUString("SQLBulkOperations").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLMoreResults = (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLMoreResults").pData )) == NULL ) + if( ( pODBC3SQLMoreResults = (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, OUString("SQLMoreResults").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetDiagRec = (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLGetDiagRec").pData )) == NULL ) + if( ( pODBC3SQLGetDiagRec = (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, OUString("SQLGetDiagRec").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLColumnPrivileges").pData )) == NULL ) + if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, OUString("SQLColumnPrivileges").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLColumns = (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLColumns").pData )) == NULL ) + if( ( pODBC3SQLColumns = (T3SQLColumns)osl_getFunctionSymbol(pODBCso, OUString("SQLColumns").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLForeignKeys = (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLForeignKeys").pData )) == NULL ) + if( ( pODBC3SQLForeignKeys = (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, OUString("SQLForeignKeys").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLPrimaryKeys = (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLPrimaryKeys").pData )) == NULL ) + if( ( pODBC3SQLPrimaryKeys = (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, OUString("SQLPrimaryKeys").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLProcedureColumns = (T3SQLProcedureColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLProcedureColumns").pData )) == NULL ) + if( ( pODBC3SQLProcedureColumns = (T3SQLProcedureColumns)osl_getFunctionSymbol(pODBCso, OUString("SQLProcedureColumns").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLProcedures = (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLProcedures").pData )) == NULL ) + if( ( pODBC3SQLProcedures = (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, OUString("SQLProcedures").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSpecialColumns = (T3SQLSpecialColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLSpecialColumns").pData )) == NULL ) + if( ( pODBC3SQLSpecialColumns = (T3SQLSpecialColumns)osl_getFunctionSymbol(pODBCso, OUString("SQLSpecialColumns").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLStatistics = (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLStatistics").pData )) == NULL ) + if( ( pODBC3SQLStatistics = (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, OUString("SQLStatistics").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLTablePrivileges = (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLTablePrivileges").pData )) == NULL ) + if( ( pODBC3SQLTablePrivileges = (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, OUString("SQLTablePrivileges").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLTables = (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLTables").pData )) == NULL ) + if( ( pODBC3SQLTables = (T3SQLTables)osl_getFunctionSymbol(pODBCso, OUString("SQLTables").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFreeStmt = (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLFreeStmt").pData )) == NULL ) + if( ( pODBC3SQLFreeStmt = (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, OUString("SQLFreeStmt").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLCloseCursor = (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLCloseCursor").pData )) == NULL ) + if( ( pODBC3SQLCloseCursor = (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, OUString("SQLCloseCursor").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLCancel = (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLCancel").pData )) == NULL ) + if( ( pODBC3SQLCancel = (T3SQLCancel)osl_getFunctionSymbol(pODBCso, OUString("SQLCancel").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLEndTran = (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLEndTran").pData )) == NULL ) + if( ( pODBC3SQLEndTran = (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, OUString("SQLEndTran").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLDisconnect = (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLDisconnect").pData )) == NULL ) + if( ( pODBC3SQLDisconnect = (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, OUString("SQLDisconnect").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFreeHandle = (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLFreeHandle").pData )) == NULL ) + if( ( pODBC3SQLFreeHandle = (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, OUString("SQLFreeHandle").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLGetCursorName").pData )) == NULL ) + if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, OUString("SQLGetCursorName").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString("SQLNativeSql").pData )) == NULL ) + if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, OUString("SQLNativeSql").pData )) == NULL ) return sal_False; return sal_True; diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx index 3560f16b06b6..c1c2ceec58a3 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.cxx +++ b/connectivity/source/drivers/odbc/ORealDriver.cxx @@ -26,7 +26,7 @@ namespace connectivity { sal_Bool LoadFunctions(oslModule pODBCso); - sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath); + sal_Bool LoadLibrary_ODBC3(OUString &_rPath); // extern declaration of the function pointer extern T3SQLAllocHandle pODBC3SQLAllocHandle; extern T3SQLConnect pODBC3SQLConnect; @@ -97,7 +97,7 @@ namespace connectivity { protected: virtual oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const; - virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath); + virtual SQLHANDLE EnvironmentHandle(OUString &_rPath); public: ORealObdcDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {} }; @@ -331,7 +331,7 @@ oslGenericFunction ORealObdcDriver::getOdbcFunction(sal_Int32 _nIndex) const } // ----------------------------------------------------------------------------- // ODBC Environment (common for all Connections): -SQLHANDLE ORealObdcDriver::EnvironmentHandle(::rtl::OUString &_rPath) +SQLHANDLE ORealObdcDriver::EnvironmentHandle(OUString &_rPath) { // Is (for this instance) already a Enviroment made? if (!m_pDriverHandle) diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index 014030c08bf9..7e20110cadc4 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.cxx @@ -22,7 +22,6 @@ #include using namespace connectivity::odbc; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx index 70edeb7b4f53..dfe22be49b5b 100644 --- a/connectivity/source/drivers/odbcbase/OConnection.cxx +++ b/connectivity/source/drivers/odbcbase/OConnection.cxx @@ -95,7 +95,7 @@ oslGenericFunction OConnection::getOdbcFunction(sal_Int32 _nIndex) const return m_pDriver->getOdbcFunction(_nIndex); } //----------------------------------------------------------------------------- -SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent) +SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -108,7 +108,7 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int SQLSMALLINT cbConnStrOut; memset(szConnStrOut,'\0',4096); memset(szConnStrIn,'\0',2048); - ::rtl::OString aConStr(::rtl::OUStringToOString(aConnectStr,getTextEncoding())); + OString aConStr(OUStringToOString(aConnectStr,getTextEncoding())); memcpy(szConnStrIn, (SDB_ODBC_CHAR*) aConStr.getStr(), ::std::min((sal_Int32)2048,aConStr.getLength())); #ifndef MACOSX @@ -149,7 +149,7 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int try { - ::rtl::OUString aVal; + OUString aVal; OTools::GetInfo(this,m_aConnectionHandle,SQL_DATA_SOURCE_READ_ONLY,aVal,*this,getTextEncoding()); m_bReadOnly = !aVal.compareToAscii("Y"); } @@ -159,9 +159,9 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int } try { - ::rtl::OUString sVersion; + OUString sVersion; OTools::GetInfo(this,m_aConnectionHandle,SQL_DRIVER_ODBC_VER,sVersion,*this,getTextEncoding()); - m_bUseOldDateFormat = sVersion == ::rtl::OUString("02.50") || sVersion == ::rtl::OUString("02.00"); + m_bUseOldDateFormat = sVersion == OUString("02.50") || sVersion == OUString("02.00"); } catch(Exception&) { @@ -176,7 +176,7 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int return nSQLRETURN; } //----------------------------------------------------------------------------- -SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) +SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { m_aConnectionHandle = SQL_NULL_HANDLE; m_sURL = url; @@ -188,7 +188,7 @@ SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< Prop sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); - ::rtl::OUString aDSN("DSN="), aUID, aPWD, aSysDrvSettings; + OUString aDSN("DSN="), aUID, aPWD, aSysDrvSettings; aDSN += url.copy(nLen+1); const char* pUser = "user"; @@ -228,19 +228,19 @@ SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< Prop } else if(!pBegin->Name.compareToAscii(pRetriStmt)) { - ::rtl::OUString sGeneratedValueStatement; + OUString sGeneratedValueStatement; OSL_VERIFY( pBegin->Value >>= sGeneratedValueStatement ); setAutoRetrievingStatement(sGeneratedValueStatement); } else if(!pBegin->Name.compareToAscii(pUser)) { OSL_VERIFY( pBegin->Value >>= aUID ); - aDSN = aDSN + ::rtl::OUString(";UID=") + aUID; + aDSN = aDSN + OUString(";UID=") + aUID; } else if(!pBegin->Name.compareToAscii(pPwd)) { OSL_VERIFY( pBegin->Value >>= aPWD ); - aDSN = aDSN + ::rtl::OUString(";PWD=") + aPWD; + aDSN = aDSN + OUString(";PWD=") + aPWD; } else if(!pBegin->Name.compareToAscii(pUseCatalog)) { @@ -249,12 +249,12 @@ SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< Prop else if(!pBegin->Name.compareToAscii(pSysDrv)) { OSL_VERIFY( pBegin->Value >>= aSysDrvSettings ); - aDSN += ::rtl::OUString(";"); + aDSN += OUString(";"); aDSN += aSysDrvSettings; } else if(0 == pBegin->Name.compareToAscii(pCharSet)) { - ::rtl::OUString sIanaName; + OUString sIanaName; OSL_VERIFY( pBegin->Value >>= sIanaName ); ::dbtools::OCharsetMap aLookupIanaName; @@ -291,7 +291,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -301,21 +301,21 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const :: return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OString aSql(::rtl::OUStringToOString(sql.getStr(),getTextEncoding())); + OString aSql(OUStringToOString(sql.getStr(),getTextEncoding())); char pOut[2048]; SQLINTEGER nOutLen; OTools::ThrowException(this,N3SQLNativeSql(m_aConnectionHandle,(SDB_ODBC_CHAR*)aSql.getStr(),aSql.getLength(),(SDB_ODBC_CHAR*)pOut,sizeof pOut - 1,&nOutLen),m_aConnectionHandle,SQL_HANDLE_DBC,*this); - return ::rtl::OUString(pOut,nOutLen,getTextEncoding()); + return OUString(pOut,nOutLen,getTextEncoding()); } // -------------------------------------------------------------------------------- void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException) @@ -399,19 +399,19 @@ sal_Bool SAL_CALL OConnection::isReadOnly() throw(SQLException, RuntimeException return m_bReadOnly; } // -------------------------------------------------------------------------------- -void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); - ::rtl::OString aCat(::rtl::OUStringToOString(catalog.getStr(),getTextEncoding())); + OString aCat(OUStringToOString(catalog.getStr(),getTextEncoding())); OTools::ThrowException(this, N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_CURRENT_CATALOG,(SDB_ODBC_CHAR*)aCat.getStr(),SQL_NTS), m_aConnectionHandle,SQL_HANDLE_DBC,*this); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -423,7 +423,7 @@ void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& catalog ) throw(SQ N3SQLGetConnectAttr(m_aConnectionHandle,SQL_ATTR_CURRENT_CATALOG,(SDB_ODBC_CHAR*)pCat,(sizeof pCat)-1,&nValueLen), m_aConnectionHandle,SQL_HANDLE_DBC,*this); - return ::rtl::OUString(pCat,nValueLen,getTextEncoding()); + return OUString(pCat,nValueLen,getTextEncoding()); } // -------------------------------------------------------------------------------- void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx index 9b88aea0df5d..df7cf2aee687 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx @@ -50,8 +50,8 @@ ODatabaseMetaData::ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon try { m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); - ::rtl::OUString sVersion = getDriverVersion(); - m_bOdbc3 = sVersion != ::rtl::OUString("02.50") && sVersion != ::rtl::OUString("02.00"); + OUString sVersion = getDriverVersion(); + m_bOdbc3 = sVersion != OUString("02.50") && sVersion != OUString("02.00"); } catch(SQLException& ) { // doesn't matter here @@ -105,9 +105,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) throw(SQLExc return xRef; } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) { - ::rtl::OUString aVal; + OUString aVal; if ( m_bUseCatalog ) OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CATALOG_NAME_SEPARATOR,aVal,*this,m_pConnection->getTextEncoding()); @@ -131,8 +131,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLExce } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; try @@ -149,8 +149,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; try @@ -167,8 +167,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( - const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; try @@ -185,8 +185,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( - const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; try @@ -203,8 +203,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( - const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; try @@ -221,7 +221,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; bool bSuccess = false; @@ -332,7 +332,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; try @@ -349,7 +349,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; try @@ -366,7 +366,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; try @@ -383,7 +383,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, + const Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; @@ -401,7 +401,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( - const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, + const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; @@ -419,7 +419,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() ) { @@ -432,9 +432,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( - const Any& primaryCatalog, const ::rtl::OUString& primarySchema, - const ::rtl::OUString& primaryTable, const Any& foreignCatalog, - const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(SQLException, RuntimeException) + const Any& primaryCatalog, const OUString& primarySchema, + const OUString& primaryTable, const Any& foreignCatalog, + const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; try @@ -453,7 +453,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_ROW_SIZE_INCLUDES_LONG,aVal,*this,m_pConnection->getTextEncoding()); return aVal.toChar() == 'Y'; } @@ -530,24 +530,24 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc return nValue == SQL_NNC_NON_NULL; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; if(m_bUseCatalog) OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CATALOG_TERM,aVal,*this,m_pConnection->getTextEncoding()); return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { - ::rtl::OUString aVal; + OUString aVal; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_QUOTE_CHAR,aVal,*this,m_pConnection->getTextEncoding()); return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SPECIAL_CHARACTERS,aVal,*this,m_pConnection->getTextEncoding()); return aVal; } @@ -667,7 +667,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLEx // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aStr; + OUString aStr; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_INTEGRITY,aStr,*this,m_pConnection->getTextEncoding()); return aStr.toChar() == 'Y'; } @@ -763,14 +763,14 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ACCESSIBLE_PROCEDURES,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_PROCEDURES,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } @@ -784,7 +784,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLExcept // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ACCESSIBLE_TABLES,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } @@ -824,7 +824,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLExceptio // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_COLUMN_ALIAS,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } @@ -994,7 +994,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_EXPRESSIONS_IN_ORDERBY,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } @@ -1022,28 +1022,28 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLExcep // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MULTIPLE_ACTIVE_TXN,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MULT_RESULT_SETS,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_LIKE_ESCAPE_CLAUSE,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ORDER_BY_COLUMNS_IN_SELECT,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'N'; } @@ -1176,76 +1176,76 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQL return nValue == SQL_SC_SQL92_INTERMEDIATE; } // ----------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::getURLImpl() +OUString ODatabaseMetaData::getURLImpl() { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DATA_SOURCE_NAME,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = m_pConnection->getURL(); + OUString aValue = m_pConnection->getURL(); if ( aValue.isEmpty() ) { - aValue = ::rtl::OUString("sdbc:odbc:"); + aValue = OUString("sdbc:odbc:"); aValue += getURLImpl(); } return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_USER_NAME,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_NAME,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_ODBC_VER,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DBMS_NAME,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_PROCEDURE_TERM,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_TERM,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); return aValue.copy(0,aValue.indexOf('.')).toInt32(); } @@ -1259,29 +1259,29 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(S // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); return aValue.copy(0,aValue.lastIndexOf('.')).toInt32(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_KEYWORDS,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SEARCH_PATTERN_ESCAPE,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { SQLUINTEGER nValue; - ::rtl::OUStringBuffer aValue; + OUStringBuffer aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_STRING_FUNCTIONS,nValue,*this); if(nValue & SQL_FN_STR_ASCII) aValue.appendAscii("ASCII,"); @@ -1339,10 +1339,10 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc return aValue.makeStringAndClear(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { SQLUINTEGER nValue; - ::rtl::OUStringBuffer aValue; + OUStringBuffer aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TIMEDATE_FUNCTIONS,nValue,*this); if(nValue & SQL_FN_TD_CURRENT_DATE) @@ -1394,10 +1394,10 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc return aValue.makeStringAndClear(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { SQLUINTEGER nValue; - ::rtl::OUStringBuffer aValue; + OUStringBuffer aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SYSTEM_FUNCTIONS,nValue,*this); if(nValue & SQL_FN_SYS_DBNAME) @@ -1413,10 +1413,10 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc return aValue.makeStringAndClear(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { SQLUINTEGER nValue; - ::rtl::OUStringBuffer aValue; + OUStringBuffer aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NUMERIC_FUNCTIONS,nValue,*this); if(nValue & SQL_FN_NUM_ABS) @@ -1699,7 +1699,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException return sal_False; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { return NULL; } diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx index 085e8321f1d6..4e5a11350221 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx @@ -146,7 +146,7 @@ sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -253,7 +253,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co case DataType::VARCHAR: case DataType::LONGVARCHAR: { - ::rtl::OUString aRet = OTools::getStringValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_BINARY,m_bWasNull,**this,m_nTextEncoding); + OUString aRet = OTools::getStringValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_BINARY,m_bWasNull,**this,m_nTextEncoding); return Sequence(reinterpret_cast(aRet.getStr()),sizeof(sal_Unicode)*aRet.getLength()); } } @@ -385,7 +385,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -393,7 +393,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) columnIndex = mapColumn(columnIndex); - ::rtl::OUString aVal; + OUString aVal; if(columnIndex <= m_nDriverColumnCount) aVal = OTools::getStringValue(m_pConnection,m_aStatementHandle,columnIndex,impl_getColumnType_nothrow(columnIndex),m_bWasNull,**this,m_nTextEncoding); else @@ -713,9 +713,9 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const throw(SQLException, R return nValue; } //------------------------------------------------------------------------------ -::rtl::OUString ODatabaseMetaDataResultSet::getCursorName() const throw(SQLException, RuntimeException) +OUString ODatabaseMetaDataResultSet::getCursorName() const throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- @@ -725,7 +725,7 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const throw(SQLException, R Sequence< com::sun::star::beans::Property > aProps(5); com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); @@ -841,12 +841,12 @@ void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeExcep checkColumnCount(); } //----------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, - const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern, + const Sequence< OUString >& types ) throw(SQLException, RuntimeException) { - ::rtl::OString aPKQ,aPKO,aPKN,aCOL; - const ::rtl::OUString *pSchemaPat = NULL; + OString aPKQ,aPKO,aPKN,aCOL; + const OUString *pSchemaPat = NULL; if(schemaPattern.toChar() != '%') pSchemaPat = &schemaPattern; @@ -854,9 +854,9 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const ::rtl::OUS pSchemaPat = NULL; if ( catalog.hasValue() ) - aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); - aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding); + aPKQ = OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); + aPKO = OUStringToOString(schemaPattern,m_nTextEncoding); + aPKN = OUStringToOString(tableNamePattern,m_nTextEncoding); const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, @@ -865,11 +865,11 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const ::rtl::OUS const char *pCOL = NULL; const char* pComma = ","; - const ::rtl::OUString* pBegin = types.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + types.getLength(); + const OUString* pBegin = types.getConstArray(); + const OUString* pEnd = pBegin + types.getLength(); for(;pBegin != pEnd;++pBegin) { - aCOL += ::rtl::OUStringToOString(*pBegin,m_nTextEncoding); + aCOL += OUStringToOString(*pBegin,m_nTextEncoding); aCOL += pComma; } if ( !aCOL.isEmpty() ) @@ -939,24 +939,24 @@ void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException, RuntimeExcept checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) +void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, const OUString& schema, + const OUString& table, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { - const ::rtl::OUString *pSchemaPat = NULL; + const OUString *pSchemaPat = NULL; if(schema.toChar() != '%') pSchemaPat = &schema; else pSchemaPat = NULL; - ::rtl::OString aPKQ,aPKO,aPKN,aCOL; + OString aPKQ,aPKO,aPKN,aCOL; if ( catalog.hasValue() ) - aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); - aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); - aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding); - aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding); + aPKQ = OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); + aPKO = OUStringToOString(schema,m_nTextEncoding); + aPKN = OUStringToOString(table,m_nTextEncoding); + aCOL = OUStringToOString(columnNamePattern,m_nTextEncoding); const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, @@ -974,23 +974,23 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, cons checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) +void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { - const ::rtl::OUString *pSchemaPat = NULL; + const OUString *pSchemaPat = NULL; if(schemaPattern.toChar() != '%') pSchemaPat = &schemaPattern; else pSchemaPat = NULL; - ::rtl::OString aPKQ,aPKO,aPKN,aCOL; + OString aPKQ,aPKO,aPKN,aCOL; if ( catalog.hasValue() ) - aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); - aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding); - aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding); + aPKQ = OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); + aPKO = OUStringToOString(schemaPattern,m_nTextEncoding); + aPKN = OUStringToOString(tableNamePattern,m_nTextEncoding); + aCOL = OUStringToOString(columnNamePattern,m_nTextEncoding); const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && !pSchemaPat->isEmpty() && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, @@ -1042,23 +1042,23 @@ void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern,const ::rtl::OUString& columnNamePattern ) +void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern,const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { - const ::rtl::OUString *pSchemaPat = NULL; + const OUString *pSchemaPat = NULL; if(schemaPattern.toChar() != '%') pSchemaPat = &schemaPattern; else pSchemaPat = NULL; - ::rtl::OString aPKQ,aPKO,aPKN,aCOL; + OString aPKQ,aPKO,aPKN,aCOL; if ( catalog.hasValue() ) - aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); - aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding); - aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding); + aPKQ = OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); + aPKO = OUStringToOString(schemaPattern,m_nTextEncoding); + aPKN = OUStringToOString(procedureNamePattern,m_nTextEncoding); + aCOL = OUStringToOString(columnNamePattern,m_nTextEncoding); const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, @@ -1076,23 +1076,23 @@ void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern) +void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern) throw(SQLException, RuntimeException) { - const ::rtl::OUString *pSchemaPat = NULL; + const OUString *pSchemaPat = NULL; if(schemaPattern.toChar() != '%') pSchemaPat = &schemaPattern; else pSchemaPat = NULL; - ::rtl::OString aPKQ,aPKO,aPKN; + OString aPKQ,aPKO,aPKN; if ( catalog.hasValue() ) - aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); - aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding); + aPKQ = OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); + aPKO = OUStringToOString(schemaPattern,m_nTextEncoding); + aPKN = OUStringToOString(procedureNamePattern,m_nTextEncoding); const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, @@ -1107,8 +1107,8 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const ::rtl: checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table,sal_Int32 scope, sal_Bool nullable ) +void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any& catalog, const OUString& schema, + const OUString& table,sal_Int32 scope, sal_Bool nullable ) throw(SQLException, RuntimeException) { // Some ODBC drivers really don't like getting an empty string as tableName @@ -1117,25 +1117,25 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any& { const char errMsg[] = "ODBC: Trying to get special columns of empty table name"; const char SQLState[] = "HY009"; - throw SQLException( ::rtl::OUString(errMsg, sizeof(errMsg) - sizeof(errMsg[0]), RTL_TEXTENCODING_ASCII_US), + throw SQLException( OUString(errMsg, sizeof(errMsg) - sizeof(errMsg[0]), RTL_TEXTENCODING_ASCII_US), *this, - ::rtl::OUString(SQLState, sizeof(SQLState) - sizeof(SQLState[0]), RTL_TEXTENCODING_ASCII_US), + OUString(SQLState, sizeof(SQLState) - sizeof(SQLState[0]), RTL_TEXTENCODING_ASCII_US), -1, Any() ); } - const ::rtl::OUString *pSchemaPat = NULL; + const OUString *pSchemaPat = NULL; if(schema.toChar() != '%') pSchemaPat = &schema; else pSchemaPat = NULL; - ::rtl::OString aPKQ,aPKO,aPKN; + OString aPKQ,aPKO,aPKN; if ( catalog.hasValue() ) - aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); - aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); - aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding); + aPKQ = OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); + aPKO = OUStringToOString(schema,m_nTextEncoding); + aPKN = OUStringToOString(table,m_nTextEncoding); const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, @@ -1152,35 +1152,35 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any& checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openVersionColumns(const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openVersionColumns(const Any& catalog, const OUString& schema, + const OUString& table) throw(SQLException, RuntimeException) { openSpecialColumns(sal_True,catalog,schema,table,SQL_SCOPE_TRANSACTION,sal_False); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openBestRowIdentifier( const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table,sal_Int32 scope,sal_Bool nullable ) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openBestRowIdentifier( const Any& catalog, const OUString& schema, + const OUString& table,sal_Int32 scope,sal_Bool nullable ) throw(SQLException, RuntimeException) { openSpecialColumns(sal_False,catalog,schema,table,scope,nullable); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const ::rtl::OUString* schema, - const ::rtl::OUString* table, - const Any& catalog2, const ::rtl::OUString* schema2, - const ::rtl::OUString* table2) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const OUString* schema, + const OUString* table, + const Any& catalog2, const OUString* schema2, + const OUString* table2) throw(SQLException, RuntimeException) { - ::rtl::OString aPKQ, aPKN, aFKQ, aFKO, aFKN; + OString aPKQ, aPKN, aFKQ, aFKO, aFKN; if ( catalog.hasValue() ) - aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); + aPKQ = OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); if ( catalog2.hasValue() ) - aFKQ = ::rtl::OUStringToOString(comphelper::getString(catalog2),m_nTextEncoding); + aFKQ = OUStringToOString(comphelper::getString(catalog2),m_nTextEncoding); const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, - *pPKO = schema && !schema->isEmpty() ? ::rtl::OUStringToOString(*schema,m_nTextEncoding).getStr() : NULL, - *pPKN = table ? (aPKN = ::rtl::OUStringToOString(*table,m_nTextEncoding)).getStr(): NULL, + *pPKO = schema && !schema->isEmpty() ? OUStringToOString(*schema,m_nTextEncoding).getStr() : NULL, + *pPKN = table ? (aPKN = OUStringToOString(*table,m_nTextEncoding)).getStr(): NULL, *pFKQ = catalog2.hasValue() && !aFKQ.isEmpty() ? aFKQ.getStr() : NULL, - *pFKO = schema2 && !schema2->isEmpty() ? (aFKO = ::rtl::OUStringToOString(*schema2,m_nTextEncoding)).getStr() : NULL, - *pFKN = table2 ? (aFKN = ::rtl::OUStringToOString(*table2,m_nTextEncoding)).getStr() : NULL; + *pFKO = schema2 && !schema2->isEmpty() ? (aFKO = OUStringToOString(*schema2,m_nTextEncoding)).getStr() : NULL, + *pFKN = table2 ? (aFKN = OUStringToOString(*table2,m_nTextEncoding)).getStr() : NULL; SQLRETURN nRetcode = N3SQLForeignKeys(m_aStatementHandle, @@ -1195,38 +1195,38 @@ void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const ::rt checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openImportedKeys(const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openImportedKeys(const Any& catalog, const OUString& schema, + const OUString& table) throw(SQLException, RuntimeException) { openForeignKeys(Any(),NULL,NULL,catalog,!schema.compareToAscii("%") ? &schema : NULL,&table); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openExportedKeys(const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openExportedKeys(const Any& catalog, const OUString& schema, + const OUString& table) throw(SQLException, RuntimeException) { openForeignKeys(catalog,!schema.compareToAscii("%") ? &schema : NULL,&table,Any(),NULL,NULL); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUString& schema, + const OUString& table) throw(SQLException, RuntimeException) { - const ::rtl::OUString *pSchemaPat = NULL; + const OUString *pSchemaPat = NULL; if(schema.toChar() != '%') pSchemaPat = &schema; else pSchemaPat = NULL; - ::rtl::OString aPKQ,aPKO,aPKN; + OString aPKQ,aPKO,aPKN; if ( catalog.hasValue() ) - aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); - aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); + aPKQ = OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); + aPKO = OUStringToOString(schema,m_nTextEncoding); const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, - *pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(); + *pPKN = (aPKN = OUStringToOString(table,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLPrimaryKeys(m_aStatementHandle, @@ -1237,25 +1237,25 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const ::rtl checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern) throw(SQLException, RuntimeException) { - const ::rtl::OUString *pSchemaPat = NULL; + const OUString *pSchemaPat = NULL; if(schemaPattern.toChar() != '%') pSchemaPat = &schemaPattern; else pSchemaPat = NULL; - ::rtl::OString aPKQ,aPKO,aPKN; + OString aPKQ,aPKO,aPKN; if ( catalog.hasValue() ) - aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); - aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); + aPKQ = OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); + aPKO = OUStringToOString(schemaPattern,m_nTextEncoding); const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, - *pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr(); + *pPKN = (aPKN = OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLTablePrivileges(m_aStatementHandle, @@ -1266,26 +1266,26 @@ void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const : checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table,sal_Bool unique,sal_Bool approximate ) +void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const OUString& schema, + const OUString& table,sal_Bool unique,sal_Bool approximate ) throw(SQLException, RuntimeException) { - const ::rtl::OUString *pSchemaPat = NULL; + const OUString *pSchemaPat = NULL; if(schema.toChar() != '%') pSchemaPat = &schema; else pSchemaPat = NULL; - ::rtl::OString aPKQ,aPKO,aPKN; + OString aPKQ,aPKO,aPKN; if ( catalog.hasValue() ) - aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); - aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); + aPKQ = OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); + aPKO = OUStringToOString(schema,m_nTextEncoding); const char *pPKQ = catalog.hasValue() && !aPKQ.isEmpty() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && !pSchemaPat->isEmpty() ? aPKO.getStr() : NULL, - *pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(); + *pPKN = (aPKN = OUStringToOString(table,m_nTextEncoding)).getStr(); SQLRETURN nRetcode = N3SQLStatistics(m_aStatementHandle, diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx index ba469451fe19..2c04fa253568 100644 --- a/connectivity/source/drivers/odbcbase/ODriver.cxx +++ b/connectivity/source/drivers/odbcbase/ODriver.cxx @@ -56,33 +56,33 @@ void ODBCDriver::disposing() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString ODBCDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODBCDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.comp.sdbc.ODBCDriver"); + return OUString("com.sun.star.comp.sdbc.ODBCDriver"); // this name is referenced in the configuration and in the odbc.xml // Please take care when changing it. } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL ODBCDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL ODBCDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL ODBCDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL ODBCDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -90,22 +90,22 @@ sal_Bool SAL_CALL ODBCDriver::supportsService( const ::rtl::OUString& _rServiceN } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL ODBCDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL ODBCDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL ODBCDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { if ( ! acceptsURL(url) ) return NULL; if(!m_pDriverHandle) { - ::rtl::OUString aPath; + OUString aPath; if(!EnvironmentHandle(aPath)) - throw SQLException(aPath,*this,::rtl::OUString(),1000,Any()); + throw SQLException(aPath,*this,OUString(),1000,Any()); } OConnection* pCon = new OConnection(m_pDriverHandle,this); Reference< XConnection > xCon = pCon; @@ -115,90 +115,90 @@ Reference< XConnection > SAL_CALL ODBCDriver::connect( const ::rtl::OUString& ur return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL ODBCDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL ODBCDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { return url.startsWith("sdbc:odbc:"); } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( acceptsURL(url) ) { ::std::vector< DriverPropertyInfo > aDriverInfo; - Sequence< ::rtl::OUString > aBooleanValues(2); - aBooleanValues[0] = ::rtl::OUString( "false" ); - aBooleanValues[1] = ::rtl::OUString( "true" ); + Sequence< OUString > aBooleanValues(2); + aBooleanValues[0] = OUString( "false" ); + aBooleanValues[1] = OUString( "true" ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("CharSet") - ,::rtl::OUString("CharSet of the database.") + OUString("CharSet") + ,OUString("CharSet of the database.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("UseCatalog") - ,::rtl::OUString("Use catalog for file-based databases.") + OUString("UseCatalog") + ,OUString("Use catalog for file-based databases.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("SystemDriverSettings") - ,::rtl::OUString("Driver settings.") + OUString("SystemDriverSettings") + ,OUString("Driver settings.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ParameterNameSubstitution") - ,::rtl::OUString("Change named parameters with '?'.") + OUString("ParameterNameSubstitution") + ,OUString("Change named parameters with '?'.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("IgnoreDriverPrivileges") - ,::rtl::OUString("Ignore the privileges from the database driver.") + OUString("IgnoreDriverPrivileges") + ,OUString("Ignore the privileges from the database driver.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("IsAutoRetrievingEnabled") - ,::rtl::OUString("Retrieve generated values.") + OUString("IsAutoRetrievingEnabled") + ,OUString("Retrieve generated values.") ,sal_False - ,::rtl::OUString( "false" ) + ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("AutoRetrievingStatement") - ,::rtl::OUString("Auto-increment statement.") + OUString("AutoRetrievingStatement") + ,OUString("Auto-increment statement.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("GenerateASBeforeCorrelationName") - ,::rtl::OUString("Generate AS before table correlation names.") + OUString("GenerateASBeforeCorrelationName") + ,OUString("Generate AS before table correlation names.") ,sal_False - ,::rtl::OUString( "true" ) + ,OUString( "true" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("EscapeDateTime") - ,::rtl::OUString("Escape date time format.") + OUString("EscapeDateTime") + ,OUString("Escape date time format.") ,sal_False - ,::rtl::OUString( "true" ) + ,OUString( "true" ) ,aBooleanValues) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); return Sequence< DriverPropertyInfo >(); } diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx index 1e467932072b..9cca1903fe17 100644 --- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx @@ -63,7 +63,7 @@ namespace const bool useWChar = false; } -OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql) +OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString& sql) :OStatement_BASE2(_pConnection) ,numParams(0) ,boundParams(NULL) @@ -75,8 +75,8 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const ::rtl::O if(_pConnection->isParameterSubstitutionEnabled()) { OSQLParser aParser( comphelper::getComponentContext(_pConnection->getDriver()->getORB()) ); - ::rtl::OUString sErrorMessage; - ::rtl::OUString sNewSql; + OUString sErrorMessage; + OUString sNewSql; ::std::auto_ptr pNode( aParser.parseTree(sErrorMessage,sql) ); if ( pNode.get() ) { // special handling for parameters @@ -241,7 +241,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex, DataType::CHAR, invalid_scale, x); } @@ -306,7 +306,7 @@ template void OPreparedStatement::setScalarParameter(const sal_Int3 } // ------------------------------------------------------------------------- -void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_Int32 _nType, const sal_Int16 _nScale, const ::rtl::OUString &_sData) +void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_Int32 _nType, const sal_Int16 _nScale, const OUString &_sData) { ::osl::MutexGuard aGuard( m_aMutex ); setParameterPre(parameterIndex); @@ -342,7 +342,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_ } else { - ::rtl::OString sOData( ::rtl::OUStringToOString(_sData, getOwnConnection()->getTextEncoding()) ); + OString sOData( OUStringToOString(_sData, getOwnConnection()->getTextEncoding()) ); nCharLen = sOData.getLength(); nByteLen = nCharLen; pData = allocBindBuf(parameterIndex, nByteLen); @@ -553,7 +553,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c case DataType::LONGVARCHAR: if(x.hasValue()) { - ::rtl::OUString sStr; + OUString sStr; x >>= sStr; setParameter(parameterIndex, sqlType, scale, sStr); } @@ -578,7 +578,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { setNull(parameterIndex,sqlType); } @@ -747,8 +747,8 @@ void OPreparedStatement::putParamData (sal_Int32 index) throw(SQLException) if ( !inputStream.is() ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_NO_INPUTSTREAM)); - throw SQLException (sError, *this,::rtl::OUString(),0,Any()); + const OUString sError( aResources.getResourceString(STR_NO_INPUTSTREAM)); + throw SQLException (sError, *this,OUString(),0,Any()); } sal_Int32 maxBytesLeft = boundParams[index - 1].getInputStreamLen (); @@ -786,7 +786,7 @@ void OPreparedStatement::putParamData (sal_Int32 index) throw(SQLException) // If an I/O exception was generated, turn // it into a SQLException - throw SQLException(ex.Message,*this,::rtl::OUString(),0,Any()); + throw SQLException(ex.Message,*this,OUString(),0,Any()); } } // ------------------------------------------------------------------------- @@ -891,7 +891,7 @@ void OPreparedStatement::prepareStatement() if(!isPrepared()) { OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); - ::rtl::OString aSql(::rtl::OUStringToOString(m_sSqlStatement,getOwnConnection()->getTextEncoding())); + OString aSql(OUStringToOString(m_sSqlStatement,getOwnConnection()->getTextEncoding())); SQLRETURN nReturn = N3SQLPrepare(m_aStatementHandle,(SDB_ODBC_CHAR *) aSql.getStr(),aSql.getLength()); OTools::ThrowException(m_pConnection,nReturn,m_aStatementHandle,SQL_HANDLE_STMT,*this); m_bPrepared = sal_True; @@ -906,11 +906,11 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex) _parameterIndex > std::numeric_limits::max() ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(STR_WRONG_PARAM_INDEX, - "$pos$", ::rtl::OUString::valueOf(_parameterIndex), - "$count$", ::rtl::OUString::valueOf((sal_Int32)numParams) + const OUString sError( aResources.getResourceStringWithSubstitution(STR_WRONG_PARAM_INDEX, + "$pos$", OUString::valueOf(_parameterIndex), + "$count$", OUString::valueOf((sal_Int32)numParams) )); - SQLException aNext(sError,*this, ::rtl::OUString(),0,Any()); + SQLException aNext(sError,*this, OUString(),0,Any()); ::dbtools::throwInvalidIndexException(*this,makeAny(aNext)); } diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx index 4dbf90fcf2a1..dcc7c88909b5 100644 --- a/connectivity/source/drivers/odbcbase/OResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx @@ -67,24 +67,24 @@ namespace //------------------------------------------------------------------------------ // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) +OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) { - return ::rtl::OUString("com.sun.star.sdbcx.odbc.ResultSet"); + return OUString("com.sun.star.sdbcx.odbc.ResultSet"); } // ------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); - aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet"); + Sequence< OUString > aSupported(2); + aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); + aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -222,14 +222,14 @@ SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle) { case DataType::CHAR: case DataType::VARCHAR: - delete static_cast< ::rtl::OString* >(reinterpret_cast< void * >(pValue->first)); + delete static_cast< OString* >(reinterpret_cast< void * >(pValue->first)); break; case DataType::BIGINT: delete static_cast< sal_Int64* >(reinterpret_cast< void * >(pValue->first)); break; case DataType::DECIMAL: case DataType::NUMERIC: - delete static_cast< ::rtl::OString* >(reinterpret_cast< void * >(pValue->first)); + delete static_cast< OString* >(reinterpret_cast< void * >(pValue->first)); break; case DataType::REAL: case DataType::DOUBLE: @@ -285,14 +285,14 @@ TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex) { case DataType::CHAR: case DataType::VARCHAR: - aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new ::rtl::OString()),_nType); + aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new OString()),_nType); break; case DataType::BIGINT: aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new sal_Int64(0)),_nType); break; case DataType::DECIMAL: case DataType::NUMERIC: - aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new ::rtl::OString()),_nType); + aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new OString()),_nType); break; case DataType::REAL: case DataType::DOUBLE: @@ -384,7 +384,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::findColumn" ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -503,7 +503,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro break; default: { - rtl::OUString sRet; + OUString sRet; sRet = m_aRow[columnIndex].getString(); nRet = Sequence(reinterpret_cast(sRet.getStr()),sizeof(sal_Unicode)*sRet.getLength()); } @@ -523,7 +523,7 @@ Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex ) throw(SQ case SQL_CHAR: case SQL_LONGVARCHAR: { - rtl::OUString aRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,nColumnType,m_bWasNull,**this,m_nTextEncoding); + OUString aRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,nColumnType,m_bWasNull,**this,m_nTextEncoding); return Sequence(reinterpret_cast(aRet.getStr()),sizeof(sal_Unicode)*aRet.getLength()); } default: @@ -635,15 +635,15 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::co return getValue( columnIndex ).makeAny(); } // ------------------------------------------------------------------------- -::rtl::OUString OResultSet::impl_getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString OResultSet::impl_getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex); return OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,nColumnType,m_bWasNull,**this,m_nTextEncoding); } -::rtl::OUString OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - return getValue( columnIndex ); + return getValue( columnIndex ); } // ------------------------------------------------------------------------- Time OResultSet::impl_getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) @@ -1084,7 +1084,7 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw( updateValue(columnIndex,SQL_DOUBLE,&x); } // ------------------------------------------------------------------------- -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) { sal_Int32 nType = m_aRow[columnIndex].getTypeKind(); SQLSMALLINT nOdbcType = OTools::jdbcTypeToOdbc(nType); @@ -1353,12 +1353,12 @@ sal_Int32 OResultSet::getFetchSize() const return getStmtOption(SQL_ATTR_ROW_ARRAY_SIZE); } //------------------------------------------------------------------------------ -::rtl::OUString OResultSet::getCursorName() const +OUString OResultSet::getCursorName() const { SQLCHAR pName[258]; SQLSMALLINT nRealLen = 0; N3SQLGetCursorName(m_aStatementHandle,(SQLCHAR*)pName,256,&nRealLen); - return ::rtl::OUString::createFromAscii((const char*)pName); + return OUString::createFromAscii((const char*)pName); } // ------------------------------------------------------------------------- sal_Bool OResultSet::isBookmarkable() const @@ -1432,7 +1432,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const Sequence< Property > aProps(6); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP1IMPL(CURSORNAME, OUString) PropertyAttribute::READONLY); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); @@ -1817,7 +1817,7 @@ void OResultSet::fillNeededData(SQLRETURN _nRet) break; case SQL_WLONGVARCHAR: { - ::rtl::OUString sRet; + OUString sRet; sRet = m_aRow[nColumnIndex].getString(); nRet = N3SQLPutData (m_aStatementHandle, (SQLPOINTER)sRet.getStr(), sizeof(sal_Unicode)*sRet.getLength()); break; @@ -1825,9 +1825,9 @@ void OResultSet::fillNeededData(SQLRETURN _nRet) case DataType::LONGVARCHAR: case DataType::CLOB: { - ::rtl::OUString sRet; + OUString sRet; sRet = m_aRow[nColumnIndex].getString(); - ::rtl::OString aString(::rtl::OUStringToOString(sRet,m_nTextEncoding)); + OString aString(OUStringToOString(sRet,m_nTextEncoding)); nRet = N3SQLPutData (m_aStatementHandle, (SQLPOINTER)aString.getStr(), aString.getLength()); break; } diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx index 864d4c0a4032..fc90ad098e0f 100644 --- a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx +++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx @@ -31,7 +31,7 @@ OResultSetMetaData::~OResultSetMetaData() { } // ------------------------------------------------------------------------- -::rtl::OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident) throw(SQLException, RuntimeException) +OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident) throw(SQLException, RuntimeException) { sal_Int32 column = _column; if(_column <(sal_Int32) m_vMapping.size()) // use mapping @@ -48,12 +48,12 @@ OResultSetMetaData::~OResultSetMetaData() &nRealLen, NULL ); - ::rtl::OUString sValue; + OUString sValue; if ( nRet == SQL_SUCCESS ) { if ( nRealLen < 0 ) nRealLen = BUFFER_LEN; - sValue = ::rtl::OUString(pName,nRealLen,m_pConnection->getTextEncoding()); + sValue = OUString(pName,nRealLen,m_pConnection->getTextEncoding()); } delete [] pName; OTools::ThrowException(m_pConnection,nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this); @@ -69,7 +69,7 @@ OResultSetMetaData::~OResultSetMetaData() NULL ); if ( nRet == SQL_SUCCESS && nRealLen > 0) - sValue = ::rtl::OUString(pName,nRealLen,m_pConnection->getTextEncoding()); + sValue = OUString(pName,nRealLen,m_pConnection->getTextEncoding()); delete [] pName; OTools::ThrowException(m_pConnection,nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this); } @@ -177,43 +177,43 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) { return getCharColAttrib(column,SQL_DESC_SCHEMA_NAME); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { return getCharColAttrib(column,SQL_DESC_NAME); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) { return getCharColAttrib(column,SQL_DESC_TABLE_NAME); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) { return getCharColAttrib(column,SQL_DESC_CATALOG_NAME); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnTypeName" ); return getCharColAttrib(column,SQL_DESC_TYPE_NAME); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnLabel" ); return getCharColAttrib(column,SQL_DESC_LABEL); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnServiceName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx index fabc0f26e7ef..2406aea6eaff 100644 --- a/connectivity/source/drivers/odbcbase/OStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OStatement.cxx @@ -159,7 +159,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getGeneratedValues( ) throw ( Reference< XResultSet > xRes; if ( m_pConnection ) { - ::rtl::OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement); + OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement); if ( !sStmt.isEmpty() ) { ::comphelper::disposeComponent(m_xGeneratedStatement); @@ -258,13 +258,13 @@ SQLLEN OStatement_Base::getRowCount () throw( SQLException) // true if the concurrency has been changed //-------------------------------------------------------------------- -sal_Bool OStatement_Base::lockIfNecessary (const ::rtl::OUString& sql) throw( SQLException) +sal_Bool OStatement_Base::lockIfNecessary (const OUString& sql) throw( SQLException) { sal_Bool rc = sal_False; // First, convert the statement to upper case - ::rtl::OUString sqlStatement = sql.toAsciiUpperCase (); + OUString sqlStatement = sql.toAsciiUpperCase (); // Now, look for the FOR UPDATE keywords. If there is any extra white // space between the FOR and UPDATE, this will fail. @@ -329,14 +329,14 @@ sal_Int32 OStatement_Base::getColumnCount () throw( SQLException) } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); m_sSqlStatement = sql; - ::rtl::OString aSql(::rtl::OUStringToOString(sql,getOwnConnection()->getTextEncoding())); + OString aSql(OUStringToOString(sql,getOwnConnection()->getTextEncoding())); sal_Bool hasResultSet = sal_False; SQLWarning aWarning; @@ -439,7 +439,7 @@ template < typename T, SQLINTEGER BufferLength > SQLRETURN OStatement_Base::setS } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -480,7 +480,7 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep } // ------------------------------------------------------------------------- -void SAL_CALL OStatement::addBatch( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -495,11 +495,11 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, checkDisposed(OStatement_BASE::rBHelper.bDisposed); - ::rtl::OString aBatchSql; + OString aBatchSql; sal_Int32 nLen = 0; - for(::std::list< ::rtl::OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) + for(::std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) { - aBatchSql += ::rtl::OUStringToOString(*i,getOwnConnection()->getTextEncoding()); + aBatchSql += OUStringToOString(*i,getOwnConnection()->getTextEncoding()); aBatchSql += ";"; } @@ -523,7 +523,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -543,8 +543,8 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const ::rtl::OUString& sql ) // an exception ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceString(STR_NO_ROWCOUNT)); - throw SQLException (sError, *this,::rtl::OUString(),0,Any()); + const OUString sError( aResources.getResourceString(STR_NO_ROWCOUNT)); + throw SQLException (sError, *this,OUString(),0,Any()); } return numRows; @@ -725,14 +725,14 @@ sal_Int64 OStatement_Base::getMaxFieldSize() const return getStmtOption(SQL_ATTR_MAX_LENGTH); } //------------------------------------------------------------------------------ -::rtl::OUString OStatement_Base::getCursorName() const +OUString OStatement_Base::getCursorName() const { OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); SQLCHAR pName[258]; SQLSMALLINT nRealLen = 0; SQLRETURN nRetCode = N3SQLGetCursorName(m_aStatementHandle,(SQLCHAR*)pName,256,&nRealLen); OSL_UNUSED( nRetCode ); - return ::rtl::OUString::createFromAscii((const char*)pName); + return OUString::createFromAscii((const char*)pName); } //------------------------------------------------------------------------------ void OStatement_Base::setQueryTimeOut(sal_Int64 seconds) @@ -857,10 +857,10 @@ void OStatement_Base::setMaxFieldSize(sal_Int64 _par0) setStmtOption(SQL_ATTR_MAX_LENGTH, _par0); } //------------------------------------------------------------------------------ -void OStatement_Base::setCursorName(const ::rtl::OUString &_par0) +void OStatement_Base::setCursorName(const OUString &_par0) { OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); - ::rtl::OString aName(::rtl::OUStringToOString(_par0,getOwnConnection()->getTextEncoding())); + OString aName(OUStringToOString(_par0,getOwnConnection()->getTextEncoding())); N3SQLSetCursorName(m_aStatementHandle,(SDB_ODBC_CHAR*)aName.getStr(),(SQLSMALLINT)aName.getLength()); } // ------------------------------------------------------------------------- @@ -888,7 +888,7 @@ void OStatement_Base::setUsingBookmarks(sal_Bool _bUseBookmark) Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx index 2ec58b36b49b..3e3f39311d4d 100644 --- a/connectivity/source/drivers/odbcbase/OTools.cxx +++ b/connectivity/source/drivers/odbcbase/OTools.cxx @@ -195,9 +195,9 @@ void OTools::bindValue( OConnection* _pConnection, case SQL_CHAR: case SQL_VARCHAR: { - ::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding)); + OString aString(OUStringToOString(*(OUString*)_pValue,_nTextEncoding)); *pLen = SQL_NTS; - *((::rtl::OString*)_pData) = aString; + *((OString*)_pData) = aString; _nMaxLen = (SQLSMALLINT)aString.getLength(); // Pointer on Char* @@ -210,12 +210,12 @@ void OTools::bindValue( OConnection* _pConnection, case SQL_DECIMAL: case SQL_NUMERIC: { - ::rtl::OString aString = ::rtl::OString::valueOf(*(double*)_pValue); + OString aString = OString::valueOf(*(double*)_pValue); _nMaxLen = (SQLSMALLINT)aString.getLength(); *pLen = _nMaxLen; - *((::rtl::OString*)_pData) = aString; + *((OString*)_pData) = aString; // Pointer on Char* - _pData = (void*)((::rtl::OString*)_pData)->getStr(); + _pData = (void*)((OString*)_pData)->getStr(); } break; case SQL_BIT: case SQL_TINYINT: @@ -258,7 +258,7 @@ void OTools::bindValue( OConnection* _pConnection, { _pData = (void*)(sal_IntPtr)(columnIndex); sal_Int32 nLen = 0; - nLen = ((::rtl::OUString*)_pValue)->getLength(); + nLen = ((OUString*)_pValue)->getLength(); *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen); } break; case SQL_DATE: @@ -342,9 +342,9 @@ void OTools::ThrowException(const OConnection* _pConnection, OSL_ENSURE(n == SQL_SUCCESS || n == SQL_SUCCESS_WITH_INFO || n == SQL_NO_DATA_FOUND || n == SQL_ERROR,"SdbODBC3_SetStatus: SQLError failed"); // For the Return Code of SQLError see ODBC 2.0 Programmer's Reference Page 287ff - throw SQLException( ::rtl::OUString((char *)szErrorMessage,pcbErrorMsg,_nTextEncoding), + throw SQLException( OUString((char *)szErrorMessage,pcbErrorMsg,_nTextEncoding), _xInterface, - ::rtl::OUString((char *)szSqlState,5,_nTextEncoding), + OUString((char *)szSqlState,5,_nTextEncoding), pfNativeError, Any() ); @@ -404,7 +404,7 @@ Sequence OTools::getBytesValue(const OConnection* _pConnection, return aData; } // ------------------------------------------------------------------------- -::rtl::OUString OTools::getStringValue(OConnection* _pConnection, +OUString OTools::getStringValue(OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _fSqlType, @@ -413,7 +413,7 @@ Sequence OTools::getBytesValue(const OConnection* _pConnection, rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getStringValue" ); - ::rtl::OUStringBuffer aData; + OUStringBuffer aData; switch(_fSqlType) { case SQL_WVARCHAR: @@ -441,7 +441,7 @@ Sequence OTools::getBytesValue(const OConnection* _pConnection, _aStatementHandle,SQL_HANDLE_STMT,_xInterface); _bWasNull = pcbValue == SQL_NULL_DATA; if(_bWasNull) - return ::rtl::OUString(); + return OUString(); SQLLEN nReadChars; OSL_ENSURE( (pcbValue < 0) || (pcbValue % 2 == 0), @@ -486,7 +486,7 @@ Sequence OTools::getBytesValue(const OConnection* _pConnection, _aStatementHandle,SQL_HANDLE_STMT,_xInterface); _bWasNull = pcbValue == SQL_NULL_DATA; if(_bWasNull) - return ::rtl::OUString(); + return OUString(); SQLLEN nReadChars; if ( (pcbValue == SQL_NO_TOTAL) || (pcbValue >= nMaxLen) ) @@ -504,7 +504,7 @@ Sequence OTools::getBytesValue(const OConnection* _pConnection, nReadChars = pcbValue; } - aData.append(::rtl::OUString(aCharArray, nReadChars, _nTextEncoding)); + aData.append(OUString(aCharArray, nReadChars, _nTextEncoding)); } break; @@ -517,7 +517,7 @@ Sequence OTools::getBytesValue(const OConnection* _pConnection, void OTools::GetInfo(OConnection* _pConnection, SQLHANDLE _aConnectionHandle, SQLUSMALLINT _nInfo, - ::rtl::OUString &_rValue, + OUString &_rValue, const Reference< XInterface >& _xInterface, rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException) { @@ -527,7 +527,7 @@ void OTools::GetInfo(OConnection* _pConnection, (*(T3SQLGetInfo)_pConnection->getOdbcFunction(ODBC3SQLGetInfo))(_aConnectionHandle,_nInfo,aValue,(sizeof aValue)-1,&nValueLen), _aConnectionHandle,SQL_HANDLE_DBC,_xInterface); - _rValue = ::rtl::OUString(aValue,nValueLen,_nTextEncoding); + _rValue = OUString(aValue,nValueLen,_nTextEncoding); } // ------------------------------------------------------------------------- void OTools::GetInfo(OConnection* _pConnection, diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx index 9344bd266fb6..dd485a5ffe86 100644 --- a/connectivity/source/drivers/postgresql/pq_array.cxx +++ b/connectivity/source/drivers/postgresql/pq_array.cxx @@ -65,7 +65,6 @@ #include "pq_statics.hxx" #include "pq_sequenceresultset.hxx" -using rtl::OUString; using com::sun::star::sdbc::SQLException; using com::sun::star::uno::Any; @@ -75,7 +74,7 @@ namespace pq_sdbc_driver { -::rtl::OUString Array::getBaseTypeName( ) +OUString Array::getBaseTypeName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return OUString( "varchar" ); @@ -137,7 +136,7 @@ void Array::checkRange( sal_Int32 index, sal_Int32 count ) { if( index >= 1 && index -1 + count <= m_data.getLength() ) return; - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Array::getArrayAtIndex(): allowed range for index + count " ) ); buf.append( m_data.getLength() ); buf.appendAscii( ", got " ); @@ -145,7 +144,7 @@ void Array::checkRange( sal_Int32 index, sal_Int32 count ) buf.appendAscii( " + " ); buf.append( count ); - throw SQLException( buf.makeStringAndClear() , *this, rtl::OUString(), 1, Any()); + throw SQLException( buf.makeStringAndClear() , *this, OUString(), 1, Any()); } diff --git a/connectivity/source/drivers/postgresql/pq_array.hxx b/connectivity/source/drivers/postgresql/pq_array.hxx index d19969afdbef..21589021e41d 100644 --- a/connectivity/source/drivers/postgresql/pq_array.hxx +++ b/connectivity/source/drivers/postgresql/pq_array.hxx @@ -87,7 +87,7 @@ public: public: // XArray // Methods - virtual ::rtl::OUString SAL_CALL getBaseTypeName( ) + virtual OUString SAL_CALL getBaseTypeName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getBaseType( ) diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 0f9e0aeac4bd..c64f459b6ca6 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -73,10 +73,6 @@ using osl::Mutex; using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringToOString; -using rtl::OUStringBuffer; -using rtl::OString; using com::sun::star::beans::XPropertySetInfo; using com::sun::star::beans::XPropertySet; @@ -550,7 +546,7 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex ) else { // if this is a binary, it must contain escaped data ! - OString val = rtl::OUStringToOString( ustr, RTL_TEXTENCODING_ASCII_US ); + OString val = OUStringToOString( ustr, RTL_TEXTENCODING_ASCII_US ); size_t length; char * res = (char*) PQunescapeBytea( (unsigned char *)val.getStr() , &length); diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx index 928b5be3a77d..6e6b27fdf432 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx @@ -187,7 +187,7 @@ public: // XResultSet public: // XRow virtual sal_Bool SAL_CALL wasNull( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -229,7 +229,7 @@ public: // XRow throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: // XColumnLocate -// virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) +// virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) // throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; public: // OPropertySetHelper diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index e0060e9cd6ee..4bc15e4d0646 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -85,11 +85,6 @@ #include #include -using rtl::OUStringBuffer; -using rtl::OUString; -using rtl::OString; -using rtl::OStringBuffer; -using rtl::OUStringToOString; using osl::MutexGuard; using com::sun::star::container::XNameAccess; @@ -162,7 +157,7 @@ OUString ConnectionGetImplementationName() { return OUString( "org.openoffice.comp.connectivity.pq.Connection.noext" ); } -com::sun::star::uno::Sequence ConnectionGetSupportedServiceNames(void) +com::sun::star::uno::Sequence ConnectionGetSupportedServiceNames(void) { OUString serv( "com.sun.star.sdbc.Connection" ); return Sequence< OUString> (&serv,1); @@ -310,13 +305,13 @@ Reference< XStatement > Connection::createStatement() throw (SQLException, Runti return ret; } -Reference< XPreparedStatement > Connection::prepareStatement( const ::rtl::OUString& sql ) +Reference< XPreparedStatement > Connection::prepareStatement( const OUString& sql ) throw (SQLException, RuntimeException) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); - rtl::OString byteSql = OUStringToOString( sql, m_settings.encoding ); + OString byteSql = OUStringToOString( sql, m_settings.encoding ); PreparedStatement *stmt = new PreparedStatement( m_refMutex, this, &m_settings, byteSql ); Reference< XPreparedStatement > ret = stmt; @@ -327,7 +322,7 @@ Reference< XPreparedStatement > Connection::prepareStatement( const ::rtl::OUStr return ret; } -Reference< XPreparedStatement > Connection::prepareCall( const ::rtl::OUString& ) +Reference< XPreparedStatement > Connection::prepareCall( const OUString& ) throw (SQLException, RuntimeException) { throw SQLException( @@ -336,7 +331,7 @@ Reference< XPreparedStatement > Connection::prepareCall( const ::rtl::OUString& } -::rtl::OUString Connection::nativeSQL( const ::rtl::OUString& sql ) +OUString Connection::nativeSQL( const OUString& sql ) throw (SQLException, RuntimeException) { return sql; @@ -390,13 +385,13 @@ sal_Bool Connection::isReadOnly() throw (SQLException, RuntimeException) return sal_False; } -void Connection::setCatalog( const ::rtl::OUString& ) +void Connection::setCatalog( const OUString& ) throw (SQLException, RuntimeException) { // UNSUPPORTED } -::rtl::OUString Connection::getCatalog() throw (SQLException, RuntimeException) +OUString Connection::getCatalog() throw (SQLException, RuntimeException) { MutexGuard guard( m_refMutex->mutex ); if( m_settings.pConnection == 0 ) @@ -523,13 +518,13 @@ static void properties2arrays( const Sequence< PropertyValue > & args, { append = false; // ignore for now - OSL_TRACE("sdbc-postgresql: unknown argument '%s'", ::rtl::OUStringToOString( args[i].Name, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("sdbc-postgresql: unknown argument '%s'", OUStringToOString( args[i].Name, RTL_TEXTENCODING_UTF8 ).getStr() ); } if( append ) { OUString value; tc->convertTo( args[i].Value, getCppuType( &value) ) >>= value; - char *v = strdup(rtl::OUStringToOString(value, enc).getStr()); + char *v = strdup(OUStringToOString(value, enc).getStr()); values.push_back ( v ); } } diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index bf356887a9a6..50b5407691a1 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -111,7 +111,7 @@ static const sal_Int32 INFO = 3; static const sal_Int32 DATA = 4; } bool isLog( ConnectionSettings *settings, int loglevel ); -void log( ConnectionSettings *settings, sal_Int32 level, const rtl::OUString &logString ); +void log( ConnectionSettings *settings, sal_Int32 level, const OUString &logString ); void log( ConnectionSettings *settings, sal_Int32 level, const char *str ); //-------------------------------------------------- @@ -138,8 +138,8 @@ struct ConnectionSettings ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > views; Tables *pTablesImpl; // needed to implement renaming of tables / views Views *pViewsImpl; // needed to implement renaming of tables / views - ::rtl::OUString user; - ::rtl::OUString catalog; + OUString user; + OUString catalog; sal_Bool showSystemColumns; FILE *logFile; sal_Int32 loglevel; @@ -170,17 +170,17 @@ typedef ::boost::unordered_map< ::std::equal_to< ::rtl::ByteSequence >, Allocator< std::pair< const ::rtl::ByteSequence,::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable > > > > WeakHashMap; -typedef ::std::vector< rtl::OString, Allocator< ::rtl::OString > > OStringVector; +typedef ::std::vector< OString, Allocator< OString > > OStringVector; typedef ::boost::unordered_map < const sal_Int32, - rtl::OUString, + OUString, ::boost::hash< sal_Int32 >, ::std::equal_to< sal_Int32 >, - Allocator< ::std::pair< sal_Int32, ::rtl::OUString > > + Allocator< ::std::pair< sal_Int32, OUString > > > Int2StringMap; class Connection : public ConnectionBase @@ -212,12 +212,12 @@ public: // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( - const ::rtl::OUString& sql ) + const OUString& sql ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( - const ::rtl::OUString& sql ) + const OUString& sql ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -235,9 +235,9 @@ public: // XConnection throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) + virtual OUString SAL_CALL getCatalog( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index a7b63df958a5..71dd2f3c511d 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -107,7 +107,6 @@ using ::osl::MutexGuard; -using ::rtl::OUString; using namespace com::sun::star::sdbc; @@ -238,7 +237,7 @@ OUString DatabaseMetaData::getDatabaseProductName( ) throw (SQLException, Runti OUString DatabaseMetaData::getDatabaseProductVersion( ) throw (SQLException, RuntimeException) { - return rtl::OUString::createFromAscii( PQparameterStatus( m_pSettings->pConnection, "server_version" ) ); + return OUString::createFromAscii( PQparameterStatus( m_pSettings->pConnection, "server_version" ) ); } OUString DatabaseMetaData::getDriverName( ) throw (SQLException, RuntimeException) { @@ -1182,7 +1181,7 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc if( isLog( m_pSettings, LogLevel::INFO ) ) { - rtl::OUStringBuffer buf( 128 ); + OUStringBuffer buf( 128 ); buf.appendAscii( "DatabaseMetaData::getTables got called with " ); buf.append( schemaPattern ); buf.appendAscii( "." ); @@ -1466,7 +1465,7 @@ static void columnMetaData2DatabaseTypeDescription( { Reference< XRow > row( rs, UNO_QUERY_THROW ); int domains = 0; - rtl::OUStringBuffer queryBuf(128); + OUStringBuffer queryBuf(128); queryBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SELECT oid,typtype,typname FROM pg_TYPE WHERE " ) ); while( rs->next() ) { @@ -1513,7 +1512,7 @@ static void columnMetaData2DatabaseTypeDescription( if( isLog( m_pSettings, LogLevel::INFO ) ) { - rtl::OUStringBuffer buf( 128 ); + OUStringBuffer buf( 128 ); buf.appendAscii( "DatabaseMetaData::getColumns got called with " ); buf.append( schemaPattern ); buf.appendAscii( "." ); @@ -1697,7 +1696,7 @@ static void columnMetaData2DatabaseTypeDescription( if( isLog( m_pSettings, LogLevel::INFO ) ) { - rtl::OUStringBuffer buf( 128 ); + OUStringBuffer buf( 128 ); buf.appendAscii( "DatabaseMetaData::getColumnPrivileges got called with " ); buf.append( schema ); buf.appendAscii( "." ); @@ -1728,7 +1727,7 @@ static void columnMetaData2DatabaseTypeDescription( if( isLog( m_pSettings, LogLevel::INFO ) ) { - rtl::OUStringBuffer buf( 128 ); + OUStringBuffer buf( 128 ); buf.appendAscii( "DatabaseMetaData::getTablePrivileges got called with " ); buf.append( schemaPattern ); buf.appendAscii( "." ); @@ -1792,7 +1791,7 @@ static void columnMetaData2DatabaseTypeDescription( if( isLog( m_pSettings, LogLevel::INFO ) ) { - rtl::OUStringBuffer buf( 128 ); + OUStringBuffer buf( 128 ); buf.appendAscii( "DatabaseMetaData::getPrimaryKeys got called with " ); buf.append( schema ); buf.appendAscii( "." ); @@ -2060,7 +2059,7 @@ void DatabaseMetaData::init_getReferences_stmt () void DatabaseMetaData::init_getPrivs_stmt () { - rtl::OUStringBuffer sSQL(300); + OUStringBuffer sSQL(300); sSQL.append( " SELECT dp.TABLE_CAT, dp.TABLE_SCHEM, dp.TABLE_NAME, dp.GRANTOR, pr.rolname AS GRANTEE, dp.privilege, dp.is_grantable " " FROM (" diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx index b957197b96dc..9c226272bfde 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx @@ -78,12 +78,12 @@ class DatabaseMetaData : ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_getColumnPrivs_stmt; void checkClosed() throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getIntSetting(::rtl::OUString settingName) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getIntSetting(OUString settingName) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getMaxIndexKeys() throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getMaxNameLength() throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > getImportedExportedKeys( - const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, - const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) + const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, + const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void init_getReferences_stmt (); void init_getPrivs_stmt (); @@ -99,17 +99,17 @@ public: // Methods virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -122,14 +122,14 @@ public: virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getIdentifierQuoteString( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -157,11 +157,11 @@ public: virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogSeparator( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -215,23 +215,23 @@ public: virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -244,7 +244,7 @@ public: virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 2d2d03daacef..ea5f62ceb244 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -65,8 +65,6 @@ #include "pq_driver.hxx" -using rtl::OUString; -using rtl::OUStringToOString; using osl::MutexGuard; using cppu::WeakComponentImplHelper2; @@ -138,7 +136,7 @@ Reference< XConnection > Driver::connect( UNO_QUERY ); } -sal_Bool Driver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool Driver::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException) { return url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdbc:postgresql:" ) ); @@ -201,7 +199,7 @@ Reference< XTablesSupplier > Driver::getDataDefinitionByConnection( } Reference< XTablesSupplier > Driver::getDataDefinitionByURL( - const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) + const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { return Reference< XTablesSupplier > ( connect( url, info ), UNO_QUERY ); @@ -317,8 +315,8 @@ void OOneInstanceComponentFactory::disposing() // Reference< XSingleComponentFactory > createOneInstanceComponentFactory( // cppu::ComponentFactoryFunc fptr, -// ::rtl::OUString const & rImplementationName, -// ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames, +// OUString const & rImplementationName, +// ::com::sun::star::uno::Sequence< OUString > const & rServiceNames, // rtl_ModuleCount * pModCount = 0 ) // SAL_THROW(()) // { diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx index 0657867eb44c..7129fdeda49d 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.hxx +++ b/connectivity/source/drivers/postgresql/pq_driver.hxx @@ -103,15 +103,15 @@ public: public: // XDriver virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( - const ::rtl::OUString& url, + const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( - const ::rtl::OUString& url, + const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -120,12 +120,12 @@ public: // XDriver public: // XServiceInfo // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException); public: // XDataDefinitionSupplier @@ -135,7 +135,7 @@ public: // XDataDefinitionSupplier throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( - const ::rtl::OUString& url, + const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx index 1c413d9d2f61..bb01e453588a 100644 --- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx @@ -61,7 +61,6 @@ using osl::MutexGuard; -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::makeAny; @@ -86,9 +85,9 @@ FakedUpdateableResultSet::FakedUpdateableResultSet( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, ConnectionSettings **pSettings, PGresult *result, - const rtl::OUString &schema, - const rtl::OUString &table, - const rtl::OUString &aReason ) + const OUString &schema, + const OUString &table, + const OUString &aReason ) : ResultSet( mutex, owner, pSettings, result, schema, table ), m_aReason( aReason ) {} @@ -215,7 +214,7 @@ void FakedUpdateableResultSet::updateDouble( sal_Int32 /* columnIndex */, double throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const ::rtl::OUString& /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const OUString& /* x */ ) throw (SQLException, RuntimeException) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx index c5c37b67d632..162c83e1f809 100644 --- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx @@ -73,7 +73,7 @@ class FakedUpdateableResultSet : public com::sun::star::sdbc::XResultSetUpdate, public com::sun::star::sdbc::XRowUpdate { - ::rtl::OUString m_aReason; + OUString m_aReason; public: FakedUpdateableResultSet( @@ -81,9 +81,9 @@ public: const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, ConnectionSettings **pSettings, PGresult *result, - const rtl::OUString &schema, - const rtl::OUString &table, - const rtl::OUString &aReason ); + const OUString &schema, + const OUString &table, + const OUString &aReason ); public: // XInterface virtual void SAL_CALL acquire() throw() { ResultSet::acquire(); } @@ -115,7 +115,7 @@ public: // XRowUpdate virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index a8a4058c94c4..538fa64136b1 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -78,12 +78,6 @@ using osl::Mutex; using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringToOString; -using rtl::OStringToOUString; -using rtl::OUStringBuffer; -using rtl::OStringBuffer; -using rtl::OString; using com::sun::star::uno::Any; using com::sun::star::uno::makeAny; @@ -176,13 +170,13 @@ static bool isOperator( char c ) return *w != 0; } -static bool isNamedParameterStart( const rtl::OString & o , int index ) +static bool isNamedParameterStart( const OString & o , int index ) { return o[index] == ':' && ( isWhitespace( o[index-1] ) || isOperator(o[index-1]) ); } -static bool isQuoted( const rtl::OString & str ) +static bool isQuoted( const OString & str ) { return str[0] == '"' || str[0] == '\''; } @@ -191,7 +185,7 @@ PreparedStatement::PreparedStatement( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< XConnection > & conn, struct ConnectionSettings *pSettings, - const ::rtl::OString & stmt ) + const OString & stmt ) : OComponentHelper( refMutex->mutex ), OPropertySetHelper( OComponentHelper::rBHelper ), m_connection( conn ), @@ -354,7 +348,7 @@ void PreparedStatement::raiseSQLException( buf.appendAscii( "]" ); } buf.append( - rtl::OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) ); + OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) ); buf.appendAscii( " (caused by statement '" ); buf.appendAscii( m_executedStatement.getStr() ); buf.appendAscii( "')" ); @@ -448,7 +442,7 @@ sal_Bool PreparedStatement::execute( ) m_executedStatement = buf.makeStringAndClear(); m_lastResultset.clear(); - m_lastTableInserted = rtl::OUString(); + m_lastTableInserted = OUString(); struct CommandData data; data.refMutex = m_refMutex; @@ -490,7 +484,7 @@ void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) } void PreparedStatement::setObjectNull( - sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) + sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw (SQLException, RuntimeException) { (void) sqlType; (void) typeName; @@ -578,7 +572,7 @@ void PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) m_vars[parameterIndex-1] = buf.makeStringAndClear(); } -void PreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) +void PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw (SQLException, RuntimeException) { // printf( "setString %d %s\n ", parameterIndex, diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx index e9284d7804bb..eee107754af2 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx @@ -101,16 +101,16 @@ private: com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > m_connection; ConnectionSettings *m_pSettings; ::com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > m_lastResultset; - ::rtl::OString m_stmt; - ::rtl::OString m_executedStatement; + OString m_stmt; + OString m_executedStatement; ::rtl::Reference< RefCountedMutex > m_refMutex; OStringVector m_vars; OStringVector m_splittedStatement; sal_Bool m_multipleResultAvailable; sal_Int32 m_multipleResultUpdateCount; sal_Int32 m_lastOidInserted; - rtl::OUString m_lastTableInserted; - rtl::OString m_lastQuery; + OUString m_lastTableInserted; + OString m_lastQuery; public: /** @@ -120,7 +120,7 @@ public: PreparedStatement( const rtl::Reference< RefCountedMutex > & refMutex, const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection> & con, struct ConnectionSettings *pSettings, - const rtl::OString &stmt ); + const OString &stmt ); virtual ~PreparedStatement(); public: // XInterface @@ -146,7 +146,7 @@ public: // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setObjectNull( - sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) + sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -162,7 +162,7 @@ public: // XParameters throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) @@ -274,7 +274,7 @@ private: void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException); void raiseSQLException( const char * errorMsg, const char *errorType = 0 ) throw ( com::sun::star::sdbc::SQLException ); -// PGresult *pgExecute( ::rtl::OString *pQuery ); +// PGresult *pgExecute( OString *pQuery ); }; } diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx index f80be22611e5..40c729f16ed5 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx @@ -63,8 +63,6 @@ #include #include -using rtl::OUString; -using rtl::OUStringToOString; using osl::MutexGuard; @@ -102,8 +100,8 @@ ResultSet::ResultSet( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< XInterface > & owner, ConnectionSettings **ppSettings, PGresult * result, - const rtl::OUString &schema, - const rtl::OUString &table) + const OUString &schema, + const OUString &table) : BaseResultSet( refMutex, owner, PQntuples( result ), PQnfields( result ),(*ppSettings)->tc ), @@ -140,7 +138,7 @@ Any ResultSet::getValue( sal_Int32 columnIndex ) else { m_wasNull = false; - ret <<= ::rtl::OUString( + ret <<= OUString( PQgetvalue( m_result, m_row , columnIndex -1 ) , PQgetlength( m_result, m_row , columnIndex -1 ) , (*m_ppSettings)->encoding ); @@ -176,7 +174,7 @@ Reference< XResultSetMetaData > ResultSet::getMetaData( ) throw (SQLException, m_refMutex, this, this, m_ppSettings, m_result, m_schema, m_table ); } -sal_Int32 ResultSet::findColumn( const ::rtl::OUString& columnName ) +sal_Int32 ResultSet::findColumn( const OUString& columnName ) throw (SQLException, RuntimeException) { MutexGuard guard( m_refMutex->mutex ); diff --git a/connectivity/source/drivers/postgresql/pq_resultset.hxx b/connectivity/source/drivers/postgresql/pq_resultset.hxx index f9df7d9fdec5..50ecf96cc2eb 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.hxx @@ -75,8 +75,8 @@ class ResultSet : public BaseResultSet { protected: PGresult *m_result; - ::rtl::OUString m_schema; - ::rtl::OUString m_table; + OUString m_schema; + OUString m_table; ConnectionSettings **m_ppSettings; protected: @@ -95,8 +95,8 @@ public: const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, ConnectionSettings **pSettings, PGresult *result, - const rtl::OUString &schema, - const rtl::OUString &table ); + const OUString &schema, + const OUString &table ); ~ResultSet(); public: // XCloseable @@ -108,7 +108,7 @@ public: // XResultSetMetaDataSupplier throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx index 352a7d7a7c73..a483f98f3371 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -71,9 +71,6 @@ using osl::Mutex; using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OString; using com::sun::star::uno::Any; using com::sun::star::uno::RuntimeException; @@ -100,9 +97,9 @@ namespace pq_sdbc_driver // struct ColumnMetaData // { -// rtl::OUString tableName; -// rtl::OUString schemaTableName; -// rtl::OUString typeName; +// OUString tableName; +// OUString schemaTableName; +// OUString typeName; // com::sun::star::sdbc::DataType type; // sal_Int32 precision; // sal_Int32 scale; @@ -144,8 +141,8 @@ ResultSetMetaData::ResultSetMetaData( ResultSet * pResultSet, ConnectionSettings **ppSettings, PGresult *pResult, - const rtl::OUString &schemaName, - const rtl::OUString &tableName ) : + const OUString &schemaName, + const OUString &tableName ) : m_refMutex( refMutex ), m_ppSettings( ppSettings ), m_origin( origin ), @@ -245,7 +242,7 @@ void ResultSetMetaData::checkTable() } } -sal_Int32 ResultSetMetaData::getIntColumnProperty( const rtl::OUString & name, int index, int def ) +sal_Int32 ResultSetMetaData::getIntColumnProperty( const OUString & name, int index, int def ) { sal_Int32 ret = def; // give defensive answers, when data is not available try @@ -265,7 +262,7 @@ sal_Int32 ResultSetMetaData::getIntColumnProperty( const rtl::OUString & name, i return ret; } -sal_Bool ResultSetMetaData::getBoolColumnProperty( const rtl::OUString & name, int index, sal_Bool def ) +sal_Bool ResultSetMetaData::getBoolColumnProperty( const OUString & name, int index, sal_Bool def ) { sal_Bool ret = def; try @@ -361,13 +358,13 @@ sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) return m_colDesc[column-1].displaySize; } -::rtl::OUString ResultSetMetaData::getColumnLabel( sal_Int32 column ) +OUString ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw (SQLException, RuntimeException) { return getColumnName( column); } -::rtl::OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException) +OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -376,7 +373,7 @@ sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) return m_colDesc[column-1].name; } -::rtl::OUString ResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException) +OUString ResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException) { (void) column; return m_schemaName; @@ -400,12 +397,12 @@ sal_Int32 ResultSetMetaData::getScale( sal_Int32 column ) return m_colDesc[column-1].scale; } -::rtl::OUString ResultSetMetaData::getTableName( sal_Int32 column ) +OUString ResultSetMetaData::getTableName( sal_Int32 column ) throw (SQLException, RuntimeException) { (void) column; // LEM TODO This is very fishy.. Should probably return the table to which that column belongs! - rtl::OUString ret; + OUString ret; if( m_tableName.getLength() ) { OUStringBuffer buf( 128 ); @@ -417,7 +414,7 @@ sal_Int32 ResultSetMetaData::getScale( sal_Int32 column ) return ret; } -::rtl::OUString ResultSetMetaData::getCatalogName( sal_Int32 column ) +OUString ResultSetMetaData::getCatalogName( sal_Int32 column ) throw (SQLException, RuntimeException) { (void) column; @@ -438,10 +435,10 @@ sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column ) return ret; } -::rtl::OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column ) +OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw (SQLException, RuntimeException) { - ::rtl::OUString ret; // give defensive answers, when data is not available + OUString ret; // give defensive answers, when data is not available try { MutexGuard guard( m_refMutex->mutex ); @@ -483,7 +480,7 @@ sal_Bool ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { return isWritable(column); // uhh, now it becomes really esoteric .... } -::rtl::OUString ResultSetMetaData::getColumnServiceName( sal_Int32 column ) +OUString ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw (SQLException, RuntimeException) { (void) column; diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx index 2282d1a3073c..aaf10c40efea 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx @@ -71,12 +71,12 @@ namespace pq_sdbc_driver struct ColDesc { - rtl::OUString name; + OUString name; sal_Int32 precision; sal_Int32 scale; sal_Int32 displaySize; Oid typeOid; - rtl::OUString typeName; + OUString typeName; sal_Int32 type; }; @@ -92,8 +92,8 @@ class ResultSetMetaData : ConnectionSettings **m_ppSettings; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_origin; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_table; - ::rtl::OUString m_tableName; - ::rtl::OUString m_schemaName; + OUString m_tableName; + OUString m_schemaName; ColDescVector m_colDesc; ResultSet *m_pResultSet; @@ -110,8 +110,8 @@ class ResultSetMetaData : void checkForTypes(); com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > getColumnByIndex( int index ); - sal_Int32 getIntColumnProperty( const rtl::OUString & name, int index, int def ); - sal_Bool getBoolColumnProperty( const rtl::OUString & name, int index, sal_Bool def ); + sal_Int32 getIntColumnProperty( const OUString & name, int index, int def ); + sal_Bool getBoolColumnProperty( const OUString & name, int index, sal_Bool def ); public: ResultSetMetaData( @@ -120,8 +120,8 @@ public: ResultSet *pResultSet, ConnectionSettings **pSettings, PGresult *pResult, - const rtl::OUString &schemaName, - const rtl::OUString &tableName ); + const OUString &schemaName, + const OUString &tableName ); public: // Methods @@ -133,19 +133,19 @@ public: virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx index f9fb5f1f949f..5623c72d0d48 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx @@ -60,7 +60,6 @@ #include "pq_sequenceresultsetmetadata.hxx" -using rtl::OUString; using com::sun::star::sdbc::XResultSetMetaData; @@ -131,7 +130,7 @@ Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( ) sal_Int32 SAL_CALL SequenceResultSet::findColumn( - const ::rtl::OUString& columnName ) + const OUString& columnName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { // no need to guard, as all members are readonly ! diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx index 2b582be6c48d..0bb5e141d584 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx @@ -77,7 +77,7 @@ class SequenceResultSet : public BaseResultSet protected: ::com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > m_data; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_columnNames; + ::com::sun::star::uno::Sequence< OUString > m_columnNames; ::com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > m_meta; protected: @@ -94,7 +94,7 @@ public: SequenceResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, - const com::sun::star::uno::Sequence< rtl::OUString > &colNames, + const com::sun::star::uno::Sequence< OUString > &colNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > > &data, const com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > &tc, const ColumnMetaDataVector *pVec = 0); @@ -109,7 +109,7 @@ public: // XResultSetMetaDataSupplier throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx index a538e9e22c90..16a034d2037f 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx @@ -59,8 +59,6 @@ #include -using rtl::OUStringBuffer; -using rtl::OUString; using com::sun::star::uno::Any; using com::sun::star::uno::RuntimeException; @@ -132,20 +130,20 @@ sal_Int32 SequenceResultSetMetaData::getColumnDisplaySize( sal_Int32 /* column * return 50; } -::rtl::OUString SequenceResultSetMetaData::getColumnLabel( sal_Int32 column ) +OUString SequenceResultSetMetaData::getColumnLabel( sal_Int32 column ) throw (SQLException, RuntimeException) { checkColumnIndex( column ); return m_columnData[column-1].columnName; } -::rtl::OUString SequenceResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException) +OUString SequenceResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException) { checkColumnIndex( column ); return m_columnData[column-1].columnName; } -::rtl::OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException) +OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException) { checkColumnIndex( column ); return m_columnData[column-1].schemaTableName; @@ -167,14 +165,14 @@ sal_Int32 SequenceResultSetMetaData::getScale( sal_Int32 column ) return m_columnData[column-1].scale; } -::rtl::OUString SequenceResultSetMetaData::getTableName( sal_Int32 column ) +OUString SequenceResultSetMetaData::getTableName( sal_Int32 column ) throw (SQLException, RuntimeException) { checkColumnIndex( column ); return m_columnData[column-1].tableName; } -::rtl::OUString SequenceResultSetMetaData::getCatalogName( sal_Int32 /* column */ ) +OUString SequenceResultSetMetaData::getCatalogName( sal_Int32 /* column */ ) throw (SQLException, RuntimeException) { // can do this through XConnection.getCatalog() ! @@ -187,7 +185,7 @@ sal_Int32 SequenceResultSetMetaData::getColumnType( sal_Int32 column ) return m_columnData[column-1].type; } -::rtl::OUString SequenceResultSetMetaData::getColumnTypeName( sal_Int32 column ) +OUString SequenceResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw (SQLException, RuntimeException) { checkColumnIndex( column ); @@ -212,7 +210,7 @@ sal_Bool SequenceResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { return isWritable(column); // uhh, now it becomes really esoteric .... } -::rtl::OUString SequenceResultSetMetaData::getColumnServiceName( sal_Int32 /* column */ ) +OUString SequenceResultSetMetaData::getColumnServiceName( sal_Int32 /* column */ ) throw (SQLException, RuntimeException) { return OUString(); diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx index 53d18d0a5d36..f027196d2bb1 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx @@ -68,8 +68,8 @@ namespace pq_sdbc_driver { ::rtl::Reference< RefCountedMutex > m_refMutex; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_origin; - ::rtl::OUString m_tableName; - ::rtl::OUString m_schemaName; + OUString m_tableName; + OUString m_schemaName; ColumnMetaDataVector m_columnData; sal_Int32 m_colCount; @@ -92,19 +92,19 @@ namespace pq_sdbc_driver virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 49b82ae63282..6326da34ec2a 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -88,11 +88,6 @@ using osl::Mutex; using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; -using rtl::OStringToOUString; -using rtl::OString; using com::sun::star::uno::Any; using com::sun::star::uno::makeAny; @@ -304,7 +299,7 @@ void Statement::raiseSQLException( buf.appendAscii( "]" ); } buf.append( - rtl::OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) ); + OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) ); buf.appendAscii( " (caused by statement '" ); buf.append( sql ); buf.appendAscii( "')" ); @@ -355,9 +350,9 @@ static void raiseSQLException( buf.appendAscii( "]" ); } buf.append( - rtl::OUString( errorMsg, strlen(errorMsg) , pSettings->encoding ) ); + OUString( errorMsg, strlen(errorMsg) , pSettings->encoding ) ); buf.appendAscii( " (caused by statement '" ); - buf.append( rtl::OStringToOUString( sql, pSettings->encoding ) ); + buf.append( OStringToOUString( sql, pSettings->encoding ) ); buf.appendAscii( "')" ); OUString error = buf.makeStringAndClear(); log( pSettings, LogLevel::ERROR, error ); @@ -367,14 +362,14 @@ static void raiseSQLException( // returns the elements of the primary key of the given table // static Sequence< Reference< com::sun::star::beans::XPropertySet > > lookupKeys( -static Sequence< ::rtl::OUString > lookupKeys( +static Sequence< OUString > lookupKeys( const Reference< com::sun::star::container::XNameAccess > &tables, const OUString & table, OUString *pSchema, OUString *pTable, ConnectionSettings *pSettings) { - Sequence< ::rtl::OUString > ret; + Sequence< OUString > ret; Reference< XKeysSupplier > keySupplier; Statics & st = getStatics(); @@ -393,7 +388,7 @@ static Sequence< ::rtl::OUString > lookupKeys( Reference< XPropertySet > set; enumeration->nextElement() >>= set; OUString name; -// ::rtl::OUString schema; +// OUString schema; if( set->getPropertyValue( st.NAME ) >>= name ) { @@ -410,7 +405,7 @@ static Sequence< ::rtl::OUString > lookupKeys( keySupplier.clear(); if( isLog( pSettings, LogLevel::INFO ) ) { - rtl::OStringBuffer buf( 128 ); + OStringBuffer buf( 128 ); buf.append( "Can't offer updateable result set because table " ); buf.append( OUStringToOString(name, pSettings->encoding) ); buf.append( " is duplicated, add schema to resolve ambiguity" ); @@ -427,7 +422,7 @@ static Sequence< ::rtl::OUString > lookupKeys( { if( isLog( pSettings, LogLevel::INFO ) ) { - rtl::OStringBuffer buf( 128 ); + OStringBuffer buf( 128 ); buf.append( "Can't offer updateable result set ( table " ); buf.append( OUStringToOString(table, pSettings->encoding) ); buf.append( " is unknown)" ); @@ -474,7 +469,7 @@ static Sequence< ::rtl::OUString > lookupKeys( { if( isLog( pSettings, LogLevel::INFO ) ) { - rtl::OStringBuffer buf( 128 ); + OStringBuffer buf( 128 ); buf.append( "Can't offer updateable result set ( table " ); buf.append( OUStringToOString(table, pSettings->encoding) ); buf.append( " does not have a primary key)" ); @@ -485,7 +480,7 @@ static Sequence< ::rtl::OUString > lookupKeys( return ret; } -bool executePostgresCommand( const rtl::OString & cmd, struct CommandData *data ) +bool executePostgresCommand( const OString & cmd, struct CommandData *data ) { ConnectionSettings *pSettings = *(data->ppSettings); @@ -498,7 +493,7 @@ bool executePostgresCommand( const rtl::OString & cmd, struct CommandData *data ExecStatusType state = PQresultStatus( result ); *(data->pLastOidInserted) = 0; - *(data->pLastTableInserted) = rtl::OUString(); + *(data->pLastTableInserted) = OUString(); *(data->pLastQuery) = cmd; sal_Bool ret = sal_False; @@ -518,7 +513,7 @@ bool executePostgresCommand( const rtl::OString & cmd, struct CommandData *data extractTableFromInsert( OStringToOUString( cmd, pSettings->encoding ) ); if( isLog( pSettings, LogLevel::SQL ) ) { - rtl::OStringBuffer buf( 128 ); + OStringBuffer buf( 128 ); buf.append( "executed command '" ); buf.append( cmd.getStr() ); buf.append( "' successfully (" ); @@ -545,7 +540,7 @@ bool executePostgresCommand( const rtl::OString & cmd, struct CommandData *data // In case it is a single table, it has a primary key and all columns // belonging to the primary key are in the result set, allow updateable result sets // otherwise, don't - rtl::OUString table, schema; + OUString table, schema; Sequence< OUString > sourceTableKeys; OStringVector vec; tokenizeSQL( cmd, vec ); @@ -589,7 +584,7 @@ bool executePostgresCommand( const rtl::OString & cmd, struct CommandData *data } else if( ! table.getLength() ) { - rtl::OStringBuffer buf( 128 ); + OStringBuffer buf( 128 ); buf.append( RTL_CONSTASCII_STRINGPARAM( "can't support updateable resultset, because a single table in the " @@ -600,35 +595,35 @@ bool executePostgresCommand( const rtl::OString & cmd, struct CommandData *data } else if( sourceTableKeys.getLength() ) { - ::rtl::OStringBuffer buf( 128 ); + OStringBuffer buf( 128 ); buf.append( RTL_CONSTASCII_STRINGPARAM( "can't support updateable resultset for table " ) ); - buf.append( rtl::OUStringToOString( schema, pSettings->encoding ) ); + buf.append( OUStringToOString( schema, pSettings->encoding ) ); buf.append( RTL_CONSTASCII_STRINGPARAM( "." ) ); - buf.append( rtl::OUStringToOString( table, pSettings->encoding ) ); + buf.append( OUStringToOString( table, pSettings->encoding ) ); buf.append( RTL_CONSTASCII_STRINGPARAM( ", because resultset does not contain a part of the primary key ( column " ) ); - buf.append( rtl::OUStringToOString( sourceTableKeys[i], pSettings->encoding ) ); + buf.append( OUStringToOString( sourceTableKeys[i], pSettings->encoding ) ); buf.append( RTL_CONSTASCII_STRINGPARAM( " is missing )") ); aReason = buf.makeStringAndClear(); } else { - ::rtl::OStringBuffer buf( 128 ); + OStringBuffer buf( 128 ); buf.append( RTL_CONSTASCII_STRINGPARAM( "can't support updateable resultset for table " ) ); - buf.append( rtl::OUStringToOString( schema, pSettings->encoding ) ); + buf.append( OUStringToOString( schema, pSettings->encoding ) ); buf.append( RTL_CONSTASCII_STRINGPARAM( "." ) ); - buf.append( rtl::OUStringToOString( table, pSettings->encoding ) ); + buf.append( OUStringToOString( table, pSettings->encoding ) ); buf.append( RTL_CONSTASCII_STRINGPARAM( ", because resultset table does not have a primary key " ) ); aReason = buf.makeStringAndClear(); } } else { - ::rtl::OStringBuffer buf( 128 ); + OStringBuffer buf( 128 ); buf.append( RTL_CONSTASCII_STRINGPARAM( "can't support updateable result for selects with multiple tables (" ) ); @@ -669,7 +664,7 @@ bool executePostgresCommand( const rtl::OString & cmd, struct CommandData *data ret = sal_True; if( isLog( pSettings, LogLevel::SQL ) ) { - rtl::OStringBuffer buf( 128 ); + OStringBuffer buf( 128 ); buf.append( RTL_CONSTASCII_STRINGPARAM("executed query '") ); buf.append( cmd ); buf.append( RTL_CONSTASCII_STRINGPARAM("' successfully") ); @@ -763,8 +758,8 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert( ConnectionSettings *pConnectionSettings, const Reference< XConnection > &connection, sal_Int32 nLastOid, - const rtl::OUString & lastTableInserted, - const rtl::OString & lastQuery ) + const OUString & lastTableInserted, + const OString & lastQuery ) { Reference< XResultSet > ret; OUString query; @@ -791,7 +786,7 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert( extractNameValuePairsFromInsert( namedValues, lastQuery ); // debug ... -// rtl::OStringBuffer buf( 128); +// OStringBuffer buf( 128); // buf.append( "extracting name/value from '" ); // buf.append( lastQuery.getStr() ); // buf.append( "' to [" ); @@ -900,7 +895,7 @@ sal_Bool Statement::execute( const OUString& sql ) OString cmd = OUStringToOString( sql, m_pSettings ); m_lastResultset.clear(); - m_lastTableInserted = rtl::OUString(); + m_lastTableInserted = OUString(); struct CommandData data; data.refMutex = m_refMutex; diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx index 5bbb5d7b50e4..1f6d229f3e70 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.hxx +++ b/connectivity/source/drivers/postgresql/pq_statement.hxx @@ -100,8 +100,8 @@ private: sal_Bool m_multipleResultAvailable; sal_Int32 m_multipleResultUpdateCount; sal_Int32 m_lastOidInserted; - rtl::OUString m_lastTableInserted; - rtl::OString m_lastQuery; + OUString m_lastTableInserted; + OString m_lastQuery; public: /** @@ -125,11 +125,11 @@ public: // XCloseable public: // XStatement virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( - const ::rtl::OUString& sql ) + const OUString& sql ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -194,7 +194,7 @@ public: // XResultSetMetaDataSupplier (is required by framework (see private: void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException); - void raiseSQLException( const ::rtl::OUString & sql, const char * errorMsg, const char *errorType = 0 ) + void raiseSQLException( const OUString & sql, const char * errorMsg, const char *errorType = 0 ) throw ( com::sun::star::sdbc::SQLException ); }; @@ -205,22 +205,22 @@ struct CommandData sal_Int32 *pLastOidInserted; sal_Int32 *pMultipleResultUpdateCount; sal_Bool *pMultipleResultAvailable; - ::rtl::OUString *pLastTableInserted; + OUString *pLastTableInserted; ::com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > *pLastResultset; - ::rtl::OString *pLastQuery; + OString *pLastQuery; ::rtl::Reference< RefCountedMutex > refMutex; ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > owner; ::com::sun::star::uno::Reference< com::sun::star::sdbcx::XTablesSupplier > tableSupplier; sal_Int32 concurrency; }; -bool executePostgresCommand( const rtl::OString & cmd, struct CommandData *data ); +bool executePostgresCommand( const OString & cmd, struct CommandData *data ); com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > getGeneratedValuesFromLastInsert( ConnectionSettings *pConnectionSettings, const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &connection, sal_Int32 nLastOid, - const rtl::OUString & lastTableInserted, - const rtl::OString & lastQuery ); + const OUString & lastTableInserted, + const OString & lastQuery ); } diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx index 07bff82827c9..20180abb707f 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.cxx +++ b/connectivity/source/drivers/postgresql/pq_statics.cxx @@ -62,7 +62,6 @@ #include -using rtl::OUString; using com::sun::star::uno::Sequence; using com::sun::star::uno::Any; using com::sun::star::uno::Type; @@ -110,7 +109,7 @@ struct PropertyDef { PropertyDef( const OUString &str, const Type &t ) : name( str ) , type( t ) {} - ::rtl::OUString name; + OUString name; com::sun::star::uno::Type type; }; @@ -219,10 +218,10 @@ Statics & getStatics() statics.CATALOG = "Catalog"; - Type tString = getCppuType( (rtl::OUString *) 0 ); + Type tString = getCppuType( (OUString *) 0 ); Type tInt = getCppuType( (sal_Int32 * ) 0 ); Type tBool = getBooleanCppuType(); - Type tStringSequence = getCppuType( (com::sun::star::uno::Sequence< ::rtl::OUString > *) 0); + Type tStringSequence = getCppuType( (com::sun::star::uno::Sequence< OUString > *) 0); // Table props set ImplementationStatics &ist = statics.refl.table; @@ -728,10 +727,10 @@ Statics & getStatics() { statics.typeInfoMetaData.push_back( ColumnMetaData( - rtl::OUString::createFromAscii( defTypeInfoMetaData[i].columnName ), - rtl::OUString::createFromAscii( defTypeInfoMetaData[i].tableName ), - rtl::OUString::createFromAscii( defTypeInfoMetaData[i].schemaTableName ), - rtl::OUString::createFromAscii( defTypeInfoMetaData[i].typeName ), + OUString::createFromAscii( defTypeInfoMetaData[i].columnName ), + OUString::createFromAscii( defTypeInfoMetaData[i].tableName ), + OUString::createFromAscii( defTypeInfoMetaData[i].schemaTableName ), + OUString::createFromAscii( defTypeInfoMetaData[i].typeName ), defTypeInfoMetaData[i].type, defTypeInfoMetaData[i].precision, defTypeInfoMetaData[i].scale, diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx index 9404c27a19eb..ca8103e4c23a 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.hxx +++ b/connectivity/source/drivers/postgresql/pq_statics.hxx @@ -77,10 +77,10 @@ namespace pq_sdbc_driver struct ColumnMetaData { ColumnMetaData( - const rtl::OUString &_columnName, - const rtl::OUString &_tableName, - const rtl::OUString &_schemaTableName, - const rtl::OUString &_typeName, + const OUString &_columnName, + const OUString &_tableName, + const OUString &_schemaTableName, + const OUString &_typeName, sal_Int32 _type, sal_Int32 _precision, sal_Int32 _scale, @@ -103,10 +103,10 @@ struct ColumnMetaData isSigned( _isSigned ) {} - rtl::OUString columnName; - rtl::OUString tableName; - rtl::OUString schemaTableName; - rtl::OUString typeName; + OUString columnName; + OUString tableName; + OUString schemaTableName; + OUString typeName; sal_Int32 type; sal_Int32 precision; sal_Int32 scale; @@ -130,11 +130,11 @@ struct TypeDetails typedef ::boost::unordered_map < - rtl::OUString, + OUString, sal_Int32, - rtl::OUStringHash, - ::std::equal_to< rtl::OUString >, - Allocator< ::std::pair< const ::rtl::OUString , sal_Int32 > > + OUStringHash, + ::std::equal_to< OUString >, + Allocator< ::std::pair< const OUString , sal_Int32 > > > BaseTypeMap; @@ -147,8 +147,8 @@ struct ImplementationStatics rtl_createUuid( (sal_uInt8*)implementationId.getArray(), 0 , sal_False ); } - rtl::OUString implName; - com::sun::star::uno::Sequence< ::rtl::OUString > serviceNames; + OUString implName; + com::sun::star::uno::Sequence< OUString > serviceNames; com::sun::star::uno::Sequence< sal_Int8 > implementationId; cppu::IPropertyArrayHelper *pProps; com::sun::star::uno::Sequence< com::sun::star::uno::Type > types; @@ -185,98 +185,98 @@ static const sal_Int32 TABLE_INDEX_REMARKS = 4; struct Statics { - ::rtl::OUString SYSTEM_TABLE; - ::rtl::OUString TABLE; - ::rtl::OUString VIEW; - ::rtl::OUString UNKNOWN; - ::rtl::OUString YES; - ::rtl::OUString NO; - ::rtl::OUString NO_NULLS; - ::rtl::OUString NULABLE; - ::rtl::OUString NULLABLE_UNKNOWN; - ::rtl::OUString SELECT; - ::rtl::OUString UPDATE; - ::rtl::OUString INSERT; - ::rtl::OUString DELETE; - ::rtl::OUString RULE; - ::rtl::OUString REFERENCES; - ::rtl::OUString TRIGGER; - ::rtl::OUString EXECUTE; - ::rtl::OUString USAGE; - ::rtl::OUString CREATE; - ::rtl::OUString TEMPORARY; - ::rtl::OUString INDEX; - ::rtl::OUString INDEX_COLUMN; + OUString SYSTEM_TABLE; + OUString TABLE; + OUString VIEW; + OUString UNKNOWN; + OUString YES; + OUString NO; + OUString NO_NULLS; + OUString NULABLE; + OUString NULLABLE_UNKNOWN; + OUString SELECT; + OUString UPDATE; + OUString INSERT; + OUString DELETE; + OUString RULE; + OUString REFERENCES; + OUString TRIGGER; + OUString EXECUTE; + OUString USAGE; + OUString CREATE; + OUString TEMPORARY; + OUString INDEX; + OUString INDEX_COLUMN; - ::rtl::OUString NAME; - ::rtl::OUString SCHEMA_NAME; - ::rtl::OUString CATALOG_NAME; - ::rtl::OUString DESCRIPTION; - ::rtl::OUString TYPE; - ::rtl::OUString TYPE_NAME; - ::rtl::OUString PRIVILEGES; + OUString NAME; + OUString SCHEMA_NAME; + OUString CATALOG_NAME; + OUString DESCRIPTION; + OUString TYPE; + OUString TYPE_NAME; + OUString PRIVILEGES; - ::rtl::OUString DEFAULT_VALUE; - ::rtl::OUString IS_AUTO_INCREMENT; - ::rtl::OUString IS_CURRENCY; - ::rtl::OUString IS_NULLABLE; - ::rtl::OUString IS_ROW_VERSISON; - ::rtl::OUString PRECISION; - ::rtl::OUString SCALE; + OUString DEFAULT_VALUE; + OUString IS_AUTO_INCREMENT; + OUString IS_CURRENCY; + OUString IS_NULLABLE; + OUString IS_ROW_VERSISON; + OUString PRECISION; + OUString SCALE; - ::rtl::OUString cPERCENT; + OUString cPERCENT; - ::rtl::OUString BEGIN; - ::rtl::OUString ROLLBACK; - ::rtl::OUString COMMIT; + OUString BEGIN; + OUString ROLLBACK; + OUString COMMIT; - ::rtl::OUString KEY; - ::rtl::OUString REFERENCED_TABLE; - ::rtl::OUString UPDATE_RULE; - ::rtl::OUString DELETE_RULE; - ::rtl::OUString PRIVATE_COLUMNS; - ::rtl::OUString PRIVATE_FOREIGN_COLUMNS; + OUString KEY; + OUString REFERENCED_TABLE; + OUString UPDATE_RULE; + OUString DELETE_RULE; + OUString PRIVATE_COLUMNS; + OUString PRIVATE_FOREIGN_COLUMNS; - ::rtl::OUString KEY_COLUMN; - ::rtl::OUString RELATED_COLUMN; + OUString KEY_COLUMN; + OUString RELATED_COLUMN; - ::rtl::OUString PASSWORD; - ::rtl::OUString USER; + OUString PASSWORD; + OUString USER; - ::rtl::OUString CURSOR_NAME; - ::rtl::OUString ESCAPE_PROCESSING; - ::rtl::OUString FETCH_DIRECTION; - ::rtl::OUString FETCH_SIZE; - ::rtl::OUString IS_BOOKMARKABLE; - ::rtl::OUString RESULT_SET_CONCURRENCY; - ::rtl::OUString RESULT_SET_TYPE; + OUString CURSOR_NAME; + OUString ESCAPE_PROCESSING; + OUString FETCH_DIRECTION; + OUString FETCH_SIZE; + OUString IS_BOOKMARKABLE; + OUString RESULT_SET_CONCURRENCY; + OUString RESULT_SET_TYPE; - ::rtl::OUString COMMAND; - ::rtl::OUString CHECK_OPTION; + OUString COMMAND; + OUString CHECK_OPTION; - ::rtl::OUString TRUE; - ::rtl::OUString FALSE; + OUString TRUE; + OUString FALSE; - ::rtl::OUString IS_PRIMARY_KEY_INDEX; - ::rtl::OUString IS_CLUSTERED; - ::rtl::OUString IS_UNIQUE; - ::rtl::OUString PRIVATE_COLUMN_INDEXES; - ::rtl::OUString HELP_TEXT; + OUString IS_PRIMARY_KEY_INDEX; + OUString IS_CLUSTERED; + OUString IS_UNIQUE; + OUString PRIVATE_COLUMN_INDEXES; + OUString HELP_TEXT; - ::rtl::OUString CATALOG; - ::rtl::OUString IS_ASCENDING; + OUString CATALOG; + OUString IS_ASCENDING; ReflectionImplementations refl; - com::sun::star::uno::Sequence< ::rtl::OUString > tablesRowNames; - com::sun::star::uno::Sequence< ::rtl::OUString > columnRowNames; - com::sun::star::uno::Sequence< ::rtl::OUString > primaryKeyNames; - com::sun::star::uno::Sequence< ::rtl::OUString > tablePrivilegesNames; - com::sun::star::uno::Sequence< ::rtl::OUString > schemaNames; - com::sun::star::uno::Sequence< ::rtl::OUString > tableTypeNames; - com::sun::star::uno::Sequence< ::rtl::OUString > typeinfoColumnNames; - com::sun::star::uno::Sequence< ::rtl::OUString > indexinfoColumnNames; - com::sun::star::uno::Sequence< ::rtl::OUString > importedKeysColumnNames; - com::sun::star::uno::Sequence< ::rtl::OUString > resultSetArrayColumnNames; + com::sun::star::uno::Sequence< OUString > tablesRowNames; + com::sun::star::uno::Sequence< OUString > columnRowNames; + com::sun::star::uno::Sequence< OUString > primaryKeyNames; + com::sun::star::uno::Sequence< OUString > tablePrivilegesNames; + com::sun::star::uno::Sequence< OUString > schemaNames; + com::sun::star::uno::Sequence< OUString > tableTypeNames; + com::sun::star::uno::Sequence< OUString > typeinfoColumnNames; + com::sun::star::uno::Sequence< OUString > indexinfoColumnNames; + com::sun::star::uno::Sequence< OUString > importedKeysColumnNames; + com::sun::star::uno::Sequence< OUString > resultSetArrayColumnNames; com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > > tableTypeData; ColumnMetaDataVector typeInfoMetaData; diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index 2cb273678019..cf650668c126 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -75,8 +75,6 @@ #include #include -using rtl::OUString; -using rtl::OUStringBuffer; using com::sun::star::beans::XPropertySet; @@ -107,14 +105,14 @@ using com::sun::star::container::XEnumerationAccess; namespace pq_sdbc_driver { -rtl::OUString date2String( const com::sun::star::util::Date & x ) +OUString date2String( const com::sun::star::util::Date & x ) { char buffer[64]; sprintf( buffer, "%d-%02d-%02d", x.Year, x.Month, x.Day ); return OUString::createFromAscii( buffer ); } -com::sun::star::util::Date string2Date( const rtl::OUString &date ) +com::sun::star::util::Date string2Date( const OUString &date ) { // Format: Year-Month-Day com::sun::star::util::Date ret; @@ -135,7 +133,7 @@ com::sun::star::util::Date string2Date( const rtl::OUString &date ) return ret; } -rtl::OUString time2String( const com::sun::star::util::Time & x ) +OUString time2String( const com::sun::star::util::Time & x ) { char buffer[64]; sprintf( buffer, "%02d:%02d:%02d.%02d", x.Hours, x.Minutes, x.Seconds, x.HundredthSeconds ); @@ -144,7 +142,7 @@ rtl::OUString time2String( const com::sun::star::util::Time & x ) } -com::sun::star::util::Time string2Time( const rtl::OUString & time ) +com::sun::star::util::Time string2Time( const OUString & time ) { com::sun::star::util::Time ret; @@ -173,7 +171,7 @@ com::sun::star::util::Time string2Time( const rtl::OUString & time ) -rtl::OUString dateTime2String( const com::sun::star::util::DateTime & x ) +OUString dateTime2String( const com::sun::star::util::DateTime & x ) { char buffer[128]; sprintf( buffer, "%d-%02d-%02d %02d:%02d:%02d.%02d", @@ -183,7 +181,7 @@ rtl::OUString dateTime2String( const com::sun::star::util::DateTime & x ) } -com::sun::star::util::DateTime string2DateTime( const rtl::OUString & dateTime ) +com::sun::star::util::DateTime string2DateTime( const OUString & dateTime ) { int space = dateTime.indexOf( ' ' ); com::sun::star::util::DateTime ret; @@ -204,29 +202,29 @@ com::sun::star::util::DateTime string2DateTime( const rtl::OUString & dateTime ) return ret; } -rtl::OUString concatQualified( const rtl::OUString & a, const rtl::OUString &b) +OUString concatQualified( const OUString & a, const OUString &b) { - rtl::OUStringBuffer buf( a.getLength() + 2 + b.getLength() ); + OUStringBuffer buf( a.getLength() + 2 + b.getLength() ); buf.append( a ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "." ) ); buf.append( b ); return buf.makeStringAndClear(); } -static inline rtl::OString iOUStringToOString( const rtl::OUString str, ConnectionSettings *settings) { +static inline OString iOUStringToOString( const OUString str, ConnectionSettings *settings) { OSL_ENSURE(settings, "pgsql-sdbc: OUStringToOString got NULL settings"); - return rtl::OUStringToOString( str, settings->encoding ); + return OUStringToOString( str, settings->encoding ); } -rtl::OString OUStringToOString( const rtl::OUString str, ConnectionSettings *settings) { +OString OUStringToOString( const OUString str, ConnectionSettings *settings) { return iOUStringToOString( str, settings ); } -void bufferEscapeConstant( rtl::OUStringBuffer & buf, const rtl::OUString & value, ConnectionSettings *settings ) +void bufferEscapeConstant( OUStringBuffer & buf, const OUString & value, ConnectionSettings *settings ) { - rtl::OString y = iOUStringToOString( value, settings ); - rtl::OStringBuffer strbuf( y.getLength() * 2 + 2 ); + OString y = iOUStringToOString( value, settings ); + OStringBuffer strbuf( y.getLength() * 2 + 2 ); int error; int len = PQescapeStringConn(settings->pConnection, ((char*)strbuf.getStr()), y.getStr() , y.getLength(), &error ); if ( error ) @@ -246,22 +244,22 @@ void bufferEscapeConstant( rtl::OUStringBuffer & buf, const rtl::OUString & valu strbuf.setLength( len ); // Previously here RTL_TEXTENCODING_ASCII_US; as we set the PostgreSQL client_encoding to UTF8, // we get UTF8 here, too. I'm not sure why it worked well before... - buf.append( rtl::OStringToOUString( strbuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) ); + buf.append( OStringToOUString( strbuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) ); } -static inline void ibufferQuoteConstant( rtl::OUStringBuffer & buf, const rtl::OUString & value, ConnectionSettings *settings ) +static inline void ibufferQuoteConstant( OUStringBuffer & buf, const OUString & value, ConnectionSettings *settings ) { buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "'" ) ); bufferEscapeConstant( buf, value, settings ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "'" ) ); } -void bufferQuoteConstant( rtl::OUStringBuffer & buf, const rtl::OUString & value, ConnectionSettings *settings ) +void bufferQuoteConstant( OUStringBuffer & buf, const OUString & value, ConnectionSettings *settings ) { return ibufferQuoteConstant( buf, value, settings ); } -void bufferQuoteAnyConstant( rtl::OUStringBuffer & buf, const Any &val, ConnectionSettings *settings ) +void bufferQuoteAnyConstant( OUStringBuffer & buf, const Any &val, ConnectionSettings *settings ) { if( val.hasValue() ) { @@ -273,11 +271,11 @@ void bufferQuoteAnyConstant( rtl::OUStringBuffer & buf, const Any &val, Connecti buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "NULL" ) ); } -static inline void ibufferQuoteIdentifier( rtl::OUStringBuffer & buf, const rtl::OUString &toQuote, ConnectionSettings *settings ) +static inline void ibufferQuoteIdentifier( OUStringBuffer & buf, const OUString &toQuote, ConnectionSettings *settings ) { OSL_ENSURE(settings, "pgsql-sdbc: bufferQuoteIdentifier got NULL settings"); - rtl::OString y = iOUStringToOString( toQuote, settings ); + OString y = iOUStringToOString( toQuote, settings ); char *cstr = PQescapeIdentifier(settings->pConnection, y.getStr(), y.getLength()); if ( cstr == NULL ) { @@ -289,18 +287,18 @@ static inline void ibufferQuoteIdentifier( rtl::OUStringBuffer & buf, const rtl: -1, Any()); } - buf.append( rtl::OStringToOUString( cstr, RTL_TEXTENCODING_UTF8 ) ); + buf.append( OStringToOUString( cstr, RTL_TEXTENCODING_UTF8 ) ); PQfreemem( cstr ); } -void bufferQuoteIdentifier( rtl::OUStringBuffer & buf, const rtl::OUString &toQuote, ConnectionSettings *settings ) +void bufferQuoteIdentifier( OUStringBuffer & buf, const OUString &toQuote, ConnectionSettings *settings ) { return ibufferQuoteIdentifier(buf, toQuote, settings); } void bufferQuoteQualifiedIdentifier( - rtl::OUStringBuffer & buf, const rtl::OUString &schema, const rtl::OUString &table, ConnectionSettings *settings ) + OUStringBuffer & buf, const OUString &schema, const OUString &table, ConnectionSettings *settings ) { ibufferQuoteIdentifier(buf, schema, settings); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "." ) ); @@ -308,10 +306,10 @@ void bufferQuoteQualifiedIdentifier( } void bufferQuoteQualifiedIdentifier( - rtl::OUStringBuffer & buf, - const rtl::OUString &schema, - const rtl::OUString &table, - const rtl::OUString &col, + OUStringBuffer & buf, + const OUString &schema, + const OUString &table, + const OUString &col, ConnectionSettings *settings) { ibufferQuoteIdentifier(buf, schema, settings); @@ -322,16 +320,16 @@ void bufferQuoteQualifiedIdentifier( } -rtl::OUString extractStringProperty( - const Reference< XPropertySet > & descriptor, const rtl::OUString &name ) +OUString extractStringProperty( + const Reference< XPropertySet > & descriptor, const OUString &name ) { - rtl::OUString value; + OUString value; descriptor->getPropertyValue( name ) >>= value; return value; } sal_Bool extractBoolProperty( - const Reference< XPropertySet > & descriptor, const rtl::OUString &name ) + const Reference< XPropertySet > & descriptor, const OUString &name ) { sal_Bool value = sal_False; descriptor->getPropertyValue( name ) >>= value; @@ -339,7 +337,7 @@ sal_Bool extractBoolProperty( } sal_Int32 extractIntProperty( - const Reference< XPropertySet > & descriptor, const rtl::OUString &name ) + const Reference< XPropertySet > & descriptor, const OUString &name ) { sal_Int32 ret = 0; descriptor->getPropertyValue( name ) >>= ret; @@ -381,7 +379,7 @@ Reference< XConnection > extractConnectionFromStatement( const Reference< XInter if( ! ret.is() ) throw SQLException( "PQSDBC: Couldn't retrieve connection from statement", - Reference< XInterface > () , rtl::OUString(), 0 , com::sun::star::uno::Any() ); + Reference< XInterface > () , OUString(), 0 , com::sun::star::uno::Any() ); } return ret; @@ -410,7 +408,7 @@ void TransactionGuard::commit() m_commited = sal_True; } -void TransactionGuard::executeUpdate( const rtl::OUString & sql ) +void TransactionGuard::executeUpdate( const OUString & sql ) { m_stmt->executeUpdate( sql ); } @@ -436,9 +434,9 @@ bool isWhitespace( sal_Unicode c ) return ' ' == c || 9 == c || 10 == c || 13 == c; } -::rtl::OUString extractTableFromInsert( const rtl::OUString & sql ) +OUString extractTableFromInsert( const OUString & sql ) { - rtl::OUString ret; + OUString ret; int i = 0; for( ; i < sql.getLength() && isWhitespace(sql[i]) ; i++ ); @@ -484,7 +482,7 @@ bool isWhitespace( sal_Unicode c ) } } } - ret = rtl::OUString( &sql.getStr()[start], i - start ).trim(); + ret = OUString( &sql.getStr()[start], i - start ).trim(); // printf( "pq_statement: parsed table name %s from insert\n" , // OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US).getStr() ); } @@ -524,7 +522,7 @@ static bool isOperator( char c ) return ret; } -void splitSQL( const rtl::OString & sql, OStringVector &vec ) +void splitSQL( const OString & sql, OStringVector &vec ) { int length = sql.getLength(); @@ -539,7 +537,7 @@ void splitSQL( const rtl::OString & sql, OStringVector &vec ) { if( '"' == c ) { - vec.push_back( rtl::OString( &sql.getStr()[start], i-start+1 ) ); + vec.push_back( OString( &sql.getStr()[start], i-start+1 ) ); start = i + 1; doubleQuote = false; } @@ -554,7 +552,7 @@ void splitSQL( const rtl::OString & sql, OStringVector &vec ) } else if( '\'' == c ) { - vec.push_back( rtl::OString( &sql.getStr()[start], i - start +1 ) ); + vec.push_back( OString( &sql.getStr()[start], i - start +1 ) ); start = i + 1; // leave single quotes ! singleQuote = false; } @@ -563,20 +561,20 @@ void splitSQL( const rtl::OString & sql, OStringVector &vec ) { if( '"' == c ) { - vec.push_back( rtl::OString( &sql.getStr()[start], i - start ) ); + vec.push_back( OString( &sql.getStr()[start], i - start ) ); doubleQuote = true; start = i; } else if( '\'' == c ) { - vec.push_back( rtl::OString( &sql.getStr()[start], i - start ) ); + vec.push_back( OString( &sql.getStr()[start], i - start ) ); singleQuote = true; start = i; } } } if( start < i ) - vec.push_back( rtl::OString( &sql.getStr()[start] , i - start ) ); + vec.push_back( OString( &sql.getStr()[start] , i - start ) ); // for( i = 0 ; i < vec.size() ; i ++ ) // printf( "%s!" , vec[i].getStr() ); @@ -584,7 +582,7 @@ void splitSQL( const rtl::OString & sql, OStringVector &vec ) } -void tokenizeSQL( const rtl::OString & sql, OStringVector &vec ) +void tokenizeSQL( const OString & sql, OStringVector &vec ) { int length = sql.getLength(); @@ -599,7 +597,7 @@ void tokenizeSQL( const rtl::OString & sql, OStringVector &vec ) { if( '"' == c ) { - vec.push_back( rtl::OString( &sql.getStr()[start], i-start ) ); + vec.push_back( OString( &sql.getStr()[start], i-start ) ); start = i + 1; doubleQuote = false; } @@ -608,7 +606,7 @@ void tokenizeSQL( const rtl::OString & sql, OStringVector &vec ) { if( '\'' == c ) { - vec.push_back( rtl::OString( &sql.getStr()[start], i - start +1 ) ); + vec.push_back( OString( &sql.getStr()[start], i - start +1 ) ); start = i + 1; // leave single quotes ! singleQuote = false; } @@ -631,15 +629,15 @@ void tokenizeSQL( const rtl::OString & sql, OStringVector &vec ) start ++; // skip additional whitespace else { - vec.push_back( rtl::OString( &sql.getStr()[start], i - start ) ); + vec.push_back( OString( &sql.getStr()[start], i - start ) ); start = i +1; } } else if( ',' == c || isOperator( c ) || '(' == c || ')' == c ) { if( i - start ) - vec.push_back( rtl::OString( &sql.getStr()[start], i - start ) ); - vec.push_back( rtl::OString( &sql.getStr()[i], 1 ) ); + vec.push_back( OString( &sql.getStr()[start], i - start ) ); + vec.push_back( OString( &sql.getStr()[i], 1 ) ); start = i + 1; } else if( '.' == c ) @@ -652,15 +650,15 @@ void tokenizeSQL( const rtl::OString & sql, OStringVector &vec ) else { if( i - start ) - vec.push_back( rtl::OString( &sql.getStr()[start], i - start ) ); - vec.push_back( rtl::OString( RTL_CONSTASCII_STRINGPARAM( "." ) ) ); + vec.push_back( OString( &sql.getStr()[start], i - start ) ); + vec.push_back( OString( RTL_CONSTASCII_STRINGPARAM( "." ) ) ); start = i + 1; } } } } if( start < i ) - vec.push_back( rtl::OString( &sql.getStr()[start] , i - start ) ); + vec.push_back( OString( &sql.getStr()[start] , i - start ) ); // for( i = 0 ; i < vec.size() ; i ++ ) // printf( "%s!" , vec[i].getStr() ); @@ -668,21 +666,21 @@ void tokenizeSQL( const rtl::OString & sql, OStringVector &vec ) } -void splitConcatenatedIdentifier( const rtl::OUString & source, rtl::OUString *first, rtl::OUString *second) +void splitConcatenatedIdentifier( const OUString & source, OUString *first, OUString *second) { OStringVector vec; - tokenizeSQL( rtl::OUStringToOString( source, RTL_TEXTENCODING_UTF8 ), vec ); + tokenizeSQL( OUStringToOString( source, RTL_TEXTENCODING_UTF8 ), vec ); if( vec.size() == 3 ) { - *first = rtl::OStringToOUString( vec[0] , RTL_TEXTENCODING_UTF8 ); - *second = rtl::OStringToOUString( vec[2], RTL_TEXTENCODING_UTF8 ); + *first = OStringToOUString( vec[0] , RTL_TEXTENCODING_UTF8 ); + *second = OStringToOUString( vec[2], RTL_TEXTENCODING_UTF8 ); } } typedef std::vector< sal_Int32 , Allocator< sal_Int32 > > IntVector; -rtl::OUString array2String( const com::sun::star::uno::Sequence< Any > &seq ) +OUString array2String( const com::sun::star::uno::Sequence< Any > &seq ) { OUStringBuffer buf(128); int len = seq.getLength(); @@ -718,7 +716,7 @@ std::vector Allocator< com::sun::star::uno::Any > > AnyVector; -com::sun::star::uno::Sequence< Any > parseArray( const rtl::OUString & str ) throw( SQLException ) +com::sun::star::uno::Sequence< Any > parseArray( const OUString & str ) throw( SQLException ) { com::sun::star::uno::Sequence< Any > ret; @@ -769,7 +767,7 @@ com::sun::star::uno::Sequence< Any > parseArray( const rtl::OUString & str ) thr buf.appendAscii( "')" ); throw SQLException( buf.makeStringAndClear(), - Reference< XInterface > (), rtl::OUString(), 1, Any() ); + Reference< XInterface > (), OUString(), 1, Any() ); } if( brackets == 0 ) { @@ -818,7 +816,7 @@ com::sun::star::uno::Sequence< Any > parseArray( const rtl::OUString & str ) thr return sequence_of_vector(elements); } -com::sun::star::uno::Sequence< sal_Int32 > parseIntArray( const ::rtl::OUString & str ) +com::sun::star::uno::Sequence< sal_Int32 > parseIntArray( const OUString & str ) { sal_Int32 start = 0; IntVector vec; @@ -837,8 +835,8 @@ com::sun::star::uno::Sequence< sal_Int32 > parseIntArray( const ::rtl::OUString void fillAttnum2attnameMap( Int2StringMap &map, const Reference< com::sun::star::sdbc::XConnection > &conn, - const rtl::OUString &schema, - const rtl::OUString &table ) + const OUString &schema, + const OUString &table ) { Reference< XPreparedStatement > prep = conn->prepareStatement( "SELECT attname,attnum " @@ -859,9 +857,9 @@ void fillAttnum2attnameMap( } } -::rtl::OString extractSingleTableFromSelect( const OStringVector &vec ) +OString extractSingleTableFromSelect( const OStringVector &vec ) { - rtl::OString ret; + OString ret; if( 0 == rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( vec[0].pData->buffer, vec[0].pData->length, "select" , 6 , 6 ) ) @@ -890,7 +888,7 @@ void fillAttnum2attnameMap( RTL_CONSTASCII_STRINGPARAM("(") ) ) { // it is a table or a function name - rtl::OStringBuffer buf(128); + OStringBuffer buf(128); if( '"' == vec[token][0] ) buf.append( &(vec[token].getStr()[1]) , vec[token].getLength() -2 ); else @@ -924,7 +922,7 @@ void fillAttnum2attnameMap( RTL_CONSTASCII_STRINGPARAM( "(" ) ) == 0 ) { // whoops, it is a function - ret = rtl::OString(); + ret = OString(); } else { @@ -944,7 +942,7 @@ void fillAttnum2attnameMap( RTL_CONSTASCII_STRINGPARAM( "," ) ) == 0 ) { // whoops, multiple tables are used - ret = rtl::OString(); + ret = OString(); } else { @@ -958,7 +956,7 @@ void fillAttnum2attnameMap( strlen(forbiddenKeywords[i]) ) ) { // whoops, it is a join - ret = rtl::OString(); + ret = OString(); } } } @@ -970,7 +968,7 @@ void fillAttnum2attnameMap( } -com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const ::rtl::OUString & str ) +com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const OUString & str ) { com::sun::star::uno::Sequence< sal_Int32 > ret; const sal_Int32 strlen = str.getLength(); @@ -991,7 +989,7 @@ com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const ::rtl::OUStrin std::vector< sal_Int32, Allocator< sal_Int32 > > vec; do { - ::rtl::OUString digits; + OUString digits; sal_Int32 c; while ( isdigit( c = str.iterateCodePoints(&start) ) ) { @@ -1017,10 +1015,10 @@ com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const ::rtl::OUStrin } -Sequence< rtl::OUString > convertMappedIntArray2StringArray( +Sequence< OUString > convertMappedIntArray2StringArray( const Int2StringMap &map, const Sequence< sal_Int32 > &intArray ) { - Sequence< ::rtl::OUString > ret( intArray.getLength() ); + Sequence< OUString > ret( intArray.getLength() ); for( int i = 0; i < intArray.getLength() ; i ++ ) { Int2StringMap::const_iterator ii = map.find( intArray[i] ); @@ -1031,7 +1029,7 @@ Sequence< rtl::OUString > convertMappedIntArray2StringArray( } -::rtl::OUString sqltype2string( const Reference< XPropertySet > & desc ) +OUString sqltype2string( const Reference< XPropertySet > & desc ) { OUStringBuffer typeName; typeName.append( extractStringProperty( desc, getStatics().TYPE_NAME ) ); @@ -1183,13 +1181,13 @@ void bufferKey2TableConstraint( } -static bool equalsIgnoreCase( const rtl::OString & str, const char *str2, int length2 ) +static bool equalsIgnoreCase( const OString & str, const char *str2, int length2 ) { return 0 == rtl_str_compareIgnoreAsciiCase_WithLength( str.pData->buffer, str.pData->length, str2, length2 ); } -void extractNameValuePairsFromInsert( String2StringMap & map, const rtl::OString & lastQuery ) +void extractNameValuePairsFromInsert( String2StringMap & map, const OString & lastQuery ) { OStringVector vec; tokenizeSQL( lastQuery, vec ); @@ -1204,7 +1202,7 @@ void extractNameValuePairsFromInsert( String2StringMap & map, const rtl::OString // printf( "1a\n" ); // extract table name - rtl::OString tableName; + OString tableName; if( equalsIgnoreCase( vec[n+1], RTL_CONSTASCII_STRINGPARAM( "." ) ) ) { tableName = vec[n]; @@ -1255,9 +1253,9 @@ void extractNameValuePairsFromInsert( String2StringMap & map, const rtl::OString } } -rtl::OUString querySingleValue( +OUString querySingleValue( const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &connection, - const rtl::OUString &query ) + const OUString &query ) { OUString ret; Reference< XStatement > stmt = connection->createStatement(); @@ -1289,7 +1287,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, break; case typelib_TypeClass_STRING: - _rxParameters->setString(_nColumnIndex, *(rtl::OUString*)_rValue.getValue()); + _rxParameters->setString(_nColumnIndex, *(OUString*)_rValue.getValue()); break; case typelib_TypeClass_BOOLEAN: @@ -1306,7 +1304,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, break; case typelib_TypeClass_CHAR: - _rxParameters->setString(_nColumnIndex, ::rtl::OUString((sal_Unicode *)_rValue.getValue(),1)); + _rxParameters->setString(_nColumnIndex, OUString((sal_Unicode *)_rValue.getValue(),1)); break; case typelib_TypeClass_UNSIGNED_LONG: diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index fd72b8082395..13a3b11a7244 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -72,102 +72,102 @@ namespace pq_sdbc_driver { bool isWhitespace( sal_Unicode c ); -rtl::OUString date2String( const com::sun::star::util::Date & date ); -com::sun::star::util::Date string2Date( const rtl::OUString & str ); +OUString date2String( const com::sun::star::util::Date & date ); +com::sun::star::util::Date string2Date( const OUString & str ); -rtl::OUString time2String( const com::sun::star::util::Time & time ); -com::sun::star::util::Time string2Time( const rtl::OUString & str ); +OUString time2String( const com::sun::star::util::Time & time ); +com::sun::star::util::Time string2Time( const OUString & str ); -rtl::OUString dateTime2String( const com::sun::star::util::DateTime & dateTime ); -com::sun::star::util::DateTime string2DateTime( const rtl::OUString & dateTime ); +OUString dateTime2String( const com::sun::star::util::DateTime & dateTime ); +com::sun::star::util::DateTime string2DateTime( const OUString & dateTime ); -rtl::OUString concatQualified( const rtl::OUString & a, const rtl::OUString &b); +OUString concatQualified( const OUString & a, const OUString &b); -rtl::OString OUStringToOString( rtl::OUString str, ConnectionSettings *settings); +OString OUStringToOString( OUString str, ConnectionSettings *settings); -void bufferQuoteConstant( rtl::OUStringBuffer & buf, const rtl::OUString & str, ConnectionSettings *settings ); -void bufferQuoteAnyConstant( rtl::OUStringBuffer & buf, const com::sun::star::uno::Any &val, ConnectionSettings *settings ); +void bufferQuoteConstant( OUStringBuffer & buf, const OUString & str, ConnectionSettings *settings ); +void bufferQuoteAnyConstant( OUStringBuffer & buf, const com::sun::star::uno::Any &val, ConnectionSettings *settings ); -void bufferEscapeConstant( rtl::OUStringBuffer & buf, const rtl::OUString & str, ConnectionSettings *settings ); +void bufferEscapeConstant( OUStringBuffer & buf, const OUString & str, ConnectionSettings *settings ); -::rtl::OUString sqltype2string( +OUString sqltype2string( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & column ); void bufferQuoteQualifiedIdentifier( - rtl::OUStringBuffer & buf, const rtl::OUString &schema, const rtl::OUString &name, ConnectionSettings *settings ); + OUStringBuffer & buf, const OUString &schema, const OUString &name, ConnectionSettings *settings ); void bufferQuoteQualifiedIdentifier( - rtl::OUStringBuffer & buf, - const rtl::OUString &schema, - const rtl::OUString &name, - const rtl::OUString &col, + OUStringBuffer & buf, + const OUString &schema, + const OUString &name, + const OUString &col, ConnectionSettings *settings ); -void bufferQuoteIdentifier( rtl::OUStringBuffer & buf, const rtl::OUString &toQuote, ConnectionSettings *settings ); +void bufferQuoteIdentifier( OUStringBuffer & buf, const OUString &toQuote, ConnectionSettings *settings ); void bufferKey2TableConstraint( - rtl::OUStringBuffer &buf, + OUStringBuffer &buf, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > &key, ConnectionSettings *settings ); -rtl::OUString extractStringProperty( +OUString extractStringProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & descriptor, - const rtl::OUString &name ); + const OUString &name ); sal_Int32 extractIntProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & descriptor, - const rtl::OUString &name ); + const OUString &name ); sal_Bool extractBoolProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & descriptor, - const rtl::OUString &name ); + const OUString &name ); void disposeNoThrow( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & r ); void disposeObject( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & r ); -::rtl::OUString extractTableFromInsert( const rtl::OUString & sql ); -::rtl::OString extractSingleTableFromSelect( const OStringVector &vec ); +OUString extractTableFromInsert( const OUString & sql ); +OString extractSingleTableFromSelect( const OStringVector &vec ); -void tokenizeSQL( const rtl::OString & sql, OStringVector &vec ); -void splitSQL( const rtl::OString & sql, OStringVector &vec ); -com::sun::star::uno::Sequence< sal_Int32 > parseIntArray( const ::rtl::OUString & str ); -com::sun::star::uno::Sequence< com::sun::star::uno::Any > parseArray( const ::rtl::OUString & str ) +void tokenizeSQL( const OString & sql, OStringVector &vec ); +void splitSQL( const OString & sql, OStringVector &vec ); +com::sun::star::uno::Sequence< sal_Int32 > parseIntArray( const OUString & str ); +com::sun::star::uno::Sequence< com::sun::star::uno::Any > parseArray( const OUString & str ) throw( com::sun::star::sdbc::SQLException ); -rtl::OUString array2String( const com::sun::star::uno::Sequence< com::sun::star::uno::Any > &seq ); +OUString array2String( const com::sun::star::uno::Sequence< com::sun::star::uno::Any > &seq ); com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > extractConnectionFromStatement( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & stmt ); -void splitConcatenatedIdentifier( const rtl::OUString & source, rtl::OUString *first, rtl::OUString *second); +void splitConcatenatedIdentifier( const OUString & source, OUString *first, OUString *second); void fillAttnum2attnameMap( Int2StringMap &map, const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &conn, - const rtl::OUString &schema, - const rtl::OUString &table ); + const OUString &schema, + const OUString &table ); -com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const ::rtl::OUString & str ); +com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const OUString & str ); -com::sun::star::uno::Sequence< rtl::OUString > convertMappedIntArray2StringArray( +com::sun::star::uno::Sequence< OUString > convertMappedIntArray2StringArray( const Int2StringMap &map, const com::sun::star::uno::Sequence< sal_Int32> &source ); typedef ::boost::unordered_map < - ::rtl::OString, - ::rtl::OString, - ::rtl::OStringHash, - ::std::equal_to< rtl::OString >, - Allocator< ::std::pair< rtl::OString, ::rtl::OString > > + OString, + OString, + OStringHash, + ::std::equal_to< OString >, + Allocator< ::std::pair< OString, OString > > > String2StringMap; -rtl::OUString querySingleValue( +OUString querySingleValue( const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &connection, - const rtl::OUString &query ); + const OUString &query ); -void extractNameValuePairsFromInsert( String2StringMap & map, const rtl::OString & lastQuery ); -sal_Int32 typeNameToDataType( const rtl::OUString &typeName, const rtl::OUString &typtype ); +void extractNameValuePairsFromInsert( String2StringMap & map, const OString & lastQuery ); +sal_Int32 typeNameToDataType( const OUString &typeName, const OUString &typtype ); // copied from connectivity/source/dbtools, can't use the function directly bool implSetObject( const com::sun::star::uno::Reference< com::sun::star::sdbc::XParameters >& _rxParameters, @@ -192,7 +192,7 @@ public: ~TransactionGuard( ); void commit(); - void executeUpdate( const rtl::OUString & sql ); + void executeUpdate( const OUString & sql ); }; template < typename T, typename Allocator > com::sun::star::uno::Sequence sequence_of_vector ( const std::vector &vec ) diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx index dbbec1ef68b9..855ae54c00f6 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx @@ -72,10 +72,6 @@ using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OStringBuffer; -using rtl::OString; using com::sun::star::uno::Reference; using com::sun::star::uno::makeAny; @@ -109,9 +105,9 @@ com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > UpdateableRes const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, ConnectionSettings **ppSettings, PGresult *result, - const rtl::OUString &schema, - const rtl::OUString &table, - const com::sun::star::uno::Sequence< ::rtl::OUString > &primaryKey ) + const OUString &schema, + const OUString &table, + const com::sun::star::uno::Sequence< OUString > &primaryKey ) { ConnectionSettings *pSettings = *ppSettings; sal_Int32 columnCount = PQnfields( result ); @@ -120,7 +116,7 @@ com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > UpdateableRes for( int i = 0 ; i < columnCount ; i ++ ) { char * name = PQfname( result, i ); - columnNames[i] = rtl::OUString( name, strlen(name), pSettings->encoding ); + columnNames[i] = OUString( name, strlen(name), pSettings->encoding ); } Sequence< Sequence< Any > > data( rowCount ); @@ -136,7 +132,7 @@ com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > UpdateableRes char * val = PQgetvalue( result, row, col ); aRow[col] = makeAny( - rtl::OUString( val, strlen( val ) , (*ppSettings)->encoding ) ); + OUString( val, strlen( val ) , (*ppSettings)->encoding ) ); } } data[row] = aRow; @@ -269,7 +265,7 @@ void UpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException) // OUString val; // m_updateableField[i].value >>= val; // buf.append( val ); -// rtl::OStringToOUString(val, (*m_ppSettings)->encoding ) ); +// OStringToOUString(val, (*m_ppSettings)->encoding ) ); } } @@ -505,7 +501,7 @@ void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw m_updateableField[columnIndex-1].value <<= OUString::valueOf( x ); } -void UpdateableResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw (SQLException, RuntimeException) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx index d9460f6868f7..6e2ab362e9a2 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx @@ -84,9 +84,9 @@ class UpdateableResultSet : public com::sun::star::sdbc::XRowUpdate { ConnectionSettings **m_ppSettings; - rtl::OUString m_schema; - rtl::OUString m_table; - com::sun::star::uno::Sequence< rtl::OUString > m_primaryKey; + OUString m_schema; + OUString m_table; + com::sun::star::uno::Sequence< OUString > m_primaryKey; UpdateableFieldVector m_updateableField; com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > m_meta; bool m_insertRow; @@ -95,12 +95,12 @@ protected: UpdateableResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, - const com::sun::star::uno::Sequence< rtl::OUString > &colNames, + const com::sun::star::uno::Sequence< OUString > &colNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > > &data, ConnectionSettings **ppSettings, - const rtl::OUString &schema, - const rtl::OUString &table, - const com::sun::star::uno::Sequence< ::rtl::OUString > &primaryKey) + const OUString &schema, + const OUString &table, + const com::sun::star::uno::Sequence< OUString > &primaryKey) : SequenceResultSet( mutex, owner, colNames, data, (*ppSettings)->tc ), m_ppSettings( ppSettings ), m_schema( schema ), @@ -129,7 +129,7 @@ protected: com::sun::star::sdbc::ResultSetType::SCROLL_INSENSITIVE ); } - rtl::OUString buildWhereClause(); + OUString buildWhereClause(); void checkUpdate( sal_Int32 column ); public: @@ -138,9 +138,9 @@ public: const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, ConnectionSettings **ppSettings, PGresult *result, - const rtl::OUString &schema, - const rtl::OUString &table, - const com::sun::star::uno::Sequence< ::rtl::OUString > &primaryKey ); + const OUString &schema, + const OUString &table, + const com::sun::star::uno::Sequence< OUString > &primaryKey ); public: // XInterface virtual void SAL_CALL acquire() throw() { SequenceResultSet::acquire(); } @@ -172,7 +172,7 @@ public: // XRowUpdate virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index b07315bd7289..b4d5ee3b167d 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -78,8 +78,8 @@ namespace pq_sdbc_driver { ReflectionBase::ReflectionBase( - const ::rtl::OUString &implName, - const ::com::sun::star::uno::Sequence< rtl::OUString > &supportedServices, + const OUString &implName, + const ::com::sun::star::uno::Sequence< OUString > &supportedServices, const ::rtl::Reference< RefCountedMutex > refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &conn, ConnectionSettings *pSettings, @@ -115,12 +115,12 @@ sal_Bool ReflectionBase::convertFastPropertyValue( } void ReflectionBase::setPropertyValue_NoBroadcast_public( - const rtl::OUString & name, const com::sun::star::uno::Any & value ) + const OUString & name, const com::sun::star::uno::Any & value ) { sal_Int32 nHandle = m_propsDesc.getHandleByName( name ); if( -1 == nHandle ) { - rtl::OUStringBuffer buf(128); + OUStringBuffer buf(128); buf.appendAscii( "Unknown property '" ); buf.append( name ); buf.appendAscii( "' in " ); @@ -135,10 +135,10 @@ void ReflectionBase::setFastPropertyValue_NoBroadcast( const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) { -// rtl::OUString s; +// OUString s; // rValue >>= s; // printf( "setting value (handle %d):%s\n" , -// nHandle, rtl::OUStringToOString(s, RTL_TEXTENCODING_ASCII_US).getStr() ); +// nHandle, OUStringToOString(s, RTL_TEXTENCODING_ASCII_US).getStr() ); m_values[nHandle] = rValue; } @@ -147,10 +147,10 @@ void ReflectionBase::getFastPropertyValue( sal_Int32 nHandle ) const { rValue = m_values[nHandle]; -// rtl::OUString s; +// OUString s; // rValue >>= s; // printf( "getting value (handle %d):%s\n" , -// nHandle, rtl::OUStringToOString(s, RTL_TEXTENCODING_ASCII_US).getStr() ); +// nHandle, OUStringToOString(s, RTL_TEXTENCODING_ASCII_US).getStr() ); } @@ -160,13 +160,13 @@ Reference < ::com::sun::star::beans::XPropertySetInfo > ReflectionBase::getProp return OPropertySetHelper::createPropertySetInfo( m_propsDesc ); } -rtl::OUString ReflectionBase::getImplementationName() +OUString ReflectionBase::getImplementationName() throw(::com::sun::star::uno::RuntimeException) { return m_implName; } -sal_Bool ReflectionBase::supportsService(const rtl::OUString& ServiceName) +sal_Bool ReflectionBase::supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException) { for( int i = 0 ; i < m_supportedServices.getLength() ; i ++ ) @@ -175,7 +175,7 @@ sal_Bool ReflectionBase::supportsService(const rtl::OUString& ServiceName) return sal_False; } -Sequence< rtl::OUString > ReflectionBase::getSupportedServiceNames(void) +Sequence< OUString > ReflectionBase::getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException) { return m_supportedServices; @@ -249,7 +249,7 @@ void ReflectionBase::copyValuesFrom( const Reference< XPropertySet > & set ) } } -::rtl::OUString ReflectionBase::getName( ) throw (::com::sun::star::uno::RuntimeException) +OUString ReflectionBase::getName( ) throw (::com::sun::star::uno::RuntimeException) { Statics & st = getStatics(); if( getInfoHelper().hasPropertyByName( st.SCHEMA_NAME ) ) @@ -261,11 +261,11 @@ void ReflectionBase::copyValuesFrom( const Reference< XPropertySet > & set ) } -void ReflectionBase::setName( const ::rtl::OUString& /* aName */ ) +void ReflectionBase::setName( const OUString& /* aName */ ) throw (::com::sun::star::uno::RuntimeException) { throw RuntimeException( - rtl::OUString( "pq_sdbc::ReflectionBase::setName not implemented" ), + OUString( "pq_sdbc::ReflectionBase::setName not implemented" ), *this ); //setPropertyValue( getStatics().NAME , makeAny( aName ) ); } diff --git a/connectivity/source/drivers/postgresql/pq_xbase.hxx b/connectivity/source/drivers/postgresql/pq_xbase.hxx index 47f900934511..b46959cc507a 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.hxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx @@ -76,8 +76,8 @@ class ReflectionBase : public com::sun::star::container::XNamed { protected: - const rtl::OUString m_implName; - const ::com::sun::star::uno::Sequence< rtl::OUString > m_supportedServices; + const OUString m_implName; + const ::com::sun::star::uno::Sequence< OUString > m_supportedServices; ::rtl::Reference< RefCountedMutex > m_refMutex; ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > m_conn; ConnectionSettings *m_pSettings; @@ -85,8 +85,8 @@ protected: com::sun::star::uno::Sequence< com::sun::star::uno::Any > m_values; public: ReflectionBase( - const ::rtl::OUString &implName, - const ::com::sun::star::uno::Sequence< rtl::OUString > &supportedServices, + const OUString &implName, + const ::com::sun::star::uno::Sequence< OUString > &supportedServices, const ::rtl::Reference< RefCountedMutex > refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &conn, ConnectionSettings *pSettings, @@ -97,7 +97,7 @@ public: public: // for initialization purposes only, not exported via an interface ! void setPropertyValue_NoBroadcast_public( - const rtl::OUString & name, const com::sun::star::uno::Any & value ); + const OUString & name, const com::sun::star::uno::Any & value ); public: //XInterface virtual void SAL_CALL acquire() throw() { OComponentHelper::acquire(); } @@ -132,11 +132,11 @@ public: // OPropertySetHelper throw(com::sun::star::uno::RuntimeException); public: // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException); public: // XTypeProvider, first implemented by OPropertySetHelper @@ -150,8 +150,8 @@ public: // XDataDescriptorFactory createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException) = 0; public: // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx index 15e9690ec516..d5d253f8a6e1 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx @@ -72,9 +72,6 @@ using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; using com::sun::star::beans::XPropertySet; using com::sun::star::beans::XPropertyChangeListener; @@ -104,19 +101,19 @@ using com::sun::star::sdbc::SQLException; namespace pq_sdbc_driver { -static Any isCurrency( const rtl::OUString & typeName ) +static Any isCurrency( const OUString & typeName ) { sal_Bool b = typeName.equalsIgnoreAsciiCase("money"); return Any( &b, getBooleanCppuType() ); } -// static sal_Bool isAutoIncrement8( const rtl::OUString & typeName ) +// static sal_Bool isAutoIncrement8( const OUString & typeName ) // { // return typeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("serial8")) || // typeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("bigserial")); // } -static Any isAutoIncrement( const rtl::OUString & defaultValue ) +static Any isAutoIncrement( const OUString & defaultValue ) { sal_Bool ret = defaultValue.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "nextval(" ) ); // printf( "%s %d\n", @@ -139,8 +136,8 @@ Columns::Columns( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName) + const OUString &schemaName, + const OUString &tableName) : Container( refMutex, origin, pSettings, "COLUMN" ), m_schemaName( schemaName ), m_tableName( tableName ) @@ -149,7 +146,7 @@ Columns::Columns( Columns::~Columns() {} -rtl::OUString columnMetaData2SDBCX( +OUString columnMetaData2SDBCX( ReflectionBase *pBase, const com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > &xRow ) { Statics & st = getStatics(); @@ -261,18 +258,18 @@ rtl::OUString columnMetaData2SDBCX( // ::rtl::Reference< RefCountedMutex > m_refMutex; // ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > m_connection; // ConnectionSettings *m_pSettings; -// rtl::OUString m_schema; -// rtl::OUString m_table; -// rtl::OUString m_column; +// OUString m_schema; +// OUString m_table; +// OUString m_column; // public: // CommentChanger( // const ::rtl::Reference< RefCountedMutex > & refMutex, // const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, // ConnectionSettings *pSettings, -// const rtl::OUString & schema, -// const rtl::OUString & table, -// const rtl::OUString & column ) : +// const OUString & schema, +// const OUString & table, +// const OUString & column ) : // m_refMutex( refMutex ), // m_connection( connection ), // m_pSettings( pSettings ), @@ -315,7 +312,7 @@ void Columns::refresh() { if( isLog( m_pSettings, LogLevel::INFO ) ) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append( "sdbcx.Columns get refreshed for table " ); buf.append( OUStringToOString( m_schemaName, m_pSettings->encoding ) ); buf.append( "." ); @@ -511,7 +508,7 @@ void Columns::appendByDescriptor( refresh(); } -// void Columns::dropByName( const ::rtl::OUString& elementName ) +// void Columns::dropByName( const OUString& elementName ) // throw (::com::sun::star::sdbc::SQLException, // ::com::sun::star::container::NoSuchElementException, // ::com::sun::star::uno::RuntimeException) @@ -580,8 +577,8 @@ Reference< com::sun::star::container::XNameAccess > Columns::create( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName, + const OUString &schemaName, + const OUString &tableName, Columns **ppColumns) { *ppColumns = new Columns( diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx index 5bd26c819afe..4549d7163838 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx @@ -65,28 +65,28 @@ namespace pq_sdbc_driver { void alterColumnByDescriptor( - const rtl::OUString & schemaName, - const rtl::OUString & tableName, + const OUString & schemaName, + const OUString & tableName, ConnectionSettings *settings, const com::sun::star::uno::Reference< com::sun::star::sdbc::XStatement > &stmt, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & past, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & future); -rtl::OUString columnMetaData2SDBCX( +OUString columnMetaData2SDBCX( ReflectionBase *pBase, const com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > &xRow ); class Columns : public Container { - rtl::OUString m_schemaName; - rtl::OUString m_tableName; + OUString m_schemaName; + OUString m_tableName; public: // instances Columns 'exception safe' static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName, + const OUString &schemaName, + const OUString &tableName, Columns **pColumns); protected: @@ -94,8 +94,8 @@ protected: const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName); + const OUString &schemaName, + const OUString &tableName); virtual ~Columns(); @@ -108,7 +108,7 @@ public: // XAppend ::com::sun::star::uno::RuntimeException); // public: // XDrop -// virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) +// virtual void SAL_CALL dropByName( const OUString& elementName ) // throw (::com::sun::star::sdbc::SQLException, // ::com::sun::star::container::NoSuchElementException, // ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx index c88bdeb2079b..34150fae7706 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx @@ -69,9 +69,6 @@ using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; using com::sun::star::beans::XPropertySet; @@ -110,9 +107,9 @@ class ReplacedBroadcaster : public EventBroadcastHelper public: ReplacedBroadcaster( const Reference< XInterface > & source, - const rtl::OUString & name, + const OUString & name, const Any & newElement, - const rtl::OUString & oldElement ) : + const OUString & oldElement ) : m_event( source, makeAny( name ), newElement, makeAny(oldElement) ) {} @@ -132,7 +129,7 @@ public: ContainerEvent m_event; InsertedBroadcaster( const Reference< XInterface > & source, - const rtl::OUString & name, + const OUString & name, const Any & newElement ) : m_event( source, makeAny( name ), newElement, Any() ) {} @@ -154,7 +151,7 @@ public: ContainerEvent m_event; RemovedBroadcaster( const Reference< XInterface > & source, - const rtl::OUString & name) : + const OUString & name) : m_event( source, makeAny( name ), Any(), Any() ) {} @@ -173,7 +170,7 @@ Container::Container( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const ::rtl::OUString &type) + const OUString &type) : ContainerBase( refMutex->mutex ), m_refMutex( refMutex ), m_pSettings( pSettings ), @@ -182,7 +179,7 @@ Container::Container( { } -Any Container::getByName( const ::rtl::OUString& aName ) +Any Container::getByName( const OUString& aName ) throw (NoSuchElementException,WrappedTargetException,RuntimeException) { String2IntMap::const_iterator ii = m_name2index.find( aName ); @@ -215,7 +212,7 @@ Sequence< OUString > Container::getElementNames( ) return ret; } -sal_Bool Container::hasByName( const ::rtl::OUString& aName ) +sal_Bool Container::hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException) { return m_name2index.find( aName ) != m_name2index.end(); @@ -325,7 +322,7 @@ void Container::disposing() m_origin.clear(); } -void Container::rename( const rtl::OUString &oldName, const rtl::OUString &newName ) +void Container::rename( const OUString &oldName, const OUString &newName ) { Any newValue; { @@ -343,7 +340,7 @@ void Container::rename( const rtl::OUString &oldName, const rtl::OUString &newNa fire( RefreshedBroadcaster( *this ) ); } -void Container::dropByName( const ::rtl::OUString& elementName ) +void Container::dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) @@ -423,7 +420,7 @@ void Container::dropByIndex( sal_Int32 index ) } void Container::append( - const rtl::OUString & name, + const OUString & name, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw ( ::com::sun::star::container::ElementExistException ) diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index c99a8e55ee4b..07730d861ff1 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -109,11 +109,11 @@ public: typedef ::boost::unordered_map < - rtl::OUString, + OUString, sal_Int32, - rtl::OUStringHash, - ::std::equal_to< rtl::OUString >, - Allocator< ::std::pair< const ::rtl::OUString , sal_Int32 > > + OUStringHash, + ::std::equal_to< OUString >, + Allocator< ::std::pair< const OUString , sal_Int32 > > > String2IntMap; typedef ::cppu::WeakComponentImplHelper8 @@ -136,14 +136,14 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_origin; String2IntMap m_name2index; // maps the element name to an index ::com::sun::star::uno::Sequence< com::sun::star::uno::Any > m_values; // contains the real values - ::rtl::OUString m_type; + OUString m_type; public: Container( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const ::rtl::OUString & type // for exception messages + const OUString & type // for exception messages ); public: // XIndexAccess @@ -159,13 +159,13 @@ public: // XEnumerationAccess SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException); public: // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // Methods virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) @@ -185,13 +185,13 @@ public: // XAppend // helper method ! void append( - const rtl::OUString & str, + const OUString & str, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw ( ::com::sun::star::container::ElementExistException ); public: // XDrop - virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) + virtual void SAL_CALL dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -226,7 +226,7 @@ public: virtual void SAL_CALL disposing(); public: - void rename( const rtl::OUString & oldName, const rtl::OUString &newName ); + void rename( const OUString & oldName, const OUString &newName ); protected: void fire( const EventBroadcastHelper & helper ); diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx index 11d7b421de12..6addb264b038 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx @@ -73,8 +73,6 @@ using osl::MutexGuard; using osl::Mutex; -using rtl::OUString; -using rtl::OUStringBuffer; using com::sun::star::container::XNameAccess; using com::sun::star::container::XIndexAccess; @@ -112,8 +110,8 @@ namespace pq_sdbc_driver Index::Index( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings, - const rtl::OUString & schemaName, - const rtl::OUString & tableName ) + const OUString & schemaName, + const OUString & tableName ) : ReflectionBase( getStatics().refl.index.implName, getStatics().refl.index.serviceNames, diff --git a/connectivity/source/drivers/postgresql/pq_xindex.hxx b/connectivity/source/drivers/postgresql/pq_xindex.hxx index 99de00860295..a7a29abed1ba 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.hxx @@ -77,15 +77,15 @@ class Index : public ReflectionBase, ::com::sun::star::uno::Reference< com::sun::star::sdbc::XDatabaseMetaData > m_meta; ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_indexColumns; - rtl::OUString m_schemaName; - rtl::OUString m_tableName; + OUString m_schemaName; + OUString m_tableName; public: Index( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName); + const OUString &schemaName, + const OUString &tableName); public: // XInterface virtual void SAL_CALL acquire() throw() { OComponentHelper::acquire(); } diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx index b654171f27d5..2dc1e49da23e 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx @@ -73,9 +73,6 @@ using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; using com::sun::star::beans::XPropertySet; @@ -107,10 +104,10 @@ IndexColumns::IndexColumns( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName, - const rtl::OUString &indexName, - const com::sun::star::uno::Sequence< rtl::OUString > &columns ) + const OUString &schemaName, + const OUString &tableName, + const OUString &indexName, + const com::sun::star::uno::Sequence< OUString > &columns ) : Container( refMutex, origin, pSettings, "INDEX_COLUMN" ), m_schemaName( schemaName ), m_tableName( tableName ), @@ -121,7 +118,7 @@ IndexColumns::IndexColumns( IndexColumns::~IndexColumns() {} -static sal_Int32 findInSequence( const Sequence< rtl::OUString > & seq , const rtl::OUString &str) +static sal_Int32 findInSequence( const Sequence< OUString > & seq , const OUString &str) { int index; for( index = 0 ; index < seq.getLength() ; index ++ ) @@ -139,7 +136,7 @@ void IndexColumns::refresh() { if( isLog( m_pSettings, LogLevel::INFO ) ) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append( "sdbcx.IndexColumns get refreshed for index " ); buf.append( OUStringToOString( m_indexName, m_pSettings->encoding ) ); log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear().getStr() ); @@ -204,7 +201,7 @@ void IndexColumns::appendByDescriptor( } -void IndexColumns::dropByName( const ::rtl::OUString& elementName ) +void IndexColumns::dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) @@ -280,10 +277,10 @@ Reference< com::sun::star::container::XNameAccess > IndexColumns::create( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName, - const rtl::OUString &indexName, - const Sequence< rtl::OUString > &columns ) + const OUString &schemaName, + const OUString &tableName, + const OUString &indexName, + const Sequence< OUString > &columns ) { IndexColumns *pIndexColumns = new IndexColumns( refMutex, origin, pSettings, schemaName, tableName, indexName, columns ); diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx index 7c2c92803d3c..b9bd6ca3e704 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx @@ -65,30 +65,30 @@ namespace pq_sdbc_driver class IndexColumns : public Container { - rtl::OUString m_schemaName; - rtl::OUString m_tableName; - rtl::OUString m_indexName; - com::sun::star::uno::Sequence< rtl::OUString > m_columns; + OUString m_schemaName; + OUString m_tableName; + OUString m_indexName; + com::sun::star::uno::Sequence< OUString > m_columns; public: // instances IndexColumns 'exception safe' static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName, - const rtl::OUString &indexName, - const com::sun::star::uno::Sequence< ::rtl::OUString > &columns ); + const OUString &schemaName, + const OUString &tableName, + const OUString &indexName, + const com::sun::star::uno::Sequence< OUString > &columns ); protected: IndexColumns( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName, - const rtl::OUString &indexName, - const com::sun::star::uno::Sequence< ::rtl::OUString > &columns ); + const OUString &schemaName, + const OUString &tableName, + const OUString &indexName, + const com::sun::star::uno::Sequence< OUString > &columns ); virtual ~IndexColumns(); @@ -100,7 +100,7 @@ public: // XAppend ::com::sun::star::uno::RuntimeException); public: // XDrop - virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) + virtual void SAL_CALL dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx index 96a1079d4f52..0ea2884bd477 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx @@ -70,9 +70,6 @@ using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; using com::sun::star::beans::XPropertySet; @@ -108,8 +105,8 @@ Indexes::Indexes( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName) + const OUString &schemaName, + const OUString &tableName) : Container( refMutex, origin, pSettings, getStatics().KEY ), m_schemaName( schemaName ), m_tableName( tableName ) @@ -126,7 +123,7 @@ void Indexes::refresh() { if( isLog( m_pSettings, LogLevel::INFO ) ) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append( "sdbcx.Indexes get refreshed for table " ); buf.append( OUStringToOString( m_schemaName, m_pSettings->encoding ) ); buf.append( "." ); @@ -315,8 +312,8 @@ Reference< com::sun::star::container::XNameAccess > Indexes::create( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString & schemaName, - const rtl::OUString & tableName) + const OUString & schemaName, + const OUString & tableName) { Indexes *pIndexes = new Indexes( refMutex, origin, pSettings, schemaName, tableName ); Reference< com::sun::star::container::XNameAccess > ret = pIndexes; diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.hxx b/connectivity/source/drivers/postgresql/pq_xindexes.hxx index fc30c760ce75..b214ea6742ab 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.hxx @@ -64,24 +64,24 @@ namespace pq_sdbc_driver { class Indexes : public Container { - rtl::OUString m_schemaName; - rtl::OUString m_tableName; + OUString m_schemaName; + OUString m_tableName; public: // instances Columns 'exception safe' static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName); + const OUString &schemaName, + const OUString &tableName); protected: Indexes( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName); + const OUString &schemaName, + const OUString &tableName); virtual ~Indexes(); diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx index a89dc114e478..12d5b6ba06d2 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx @@ -73,8 +73,6 @@ using osl::MutexGuard; using osl::Mutex; -using rtl::OUString; -using rtl::OUStringBuffer; using com::sun::star::container::XNameAccess; using com::sun::star::container::XIndexAccess; @@ -112,8 +110,8 @@ namespace pq_sdbc_driver Key::Key( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings, - const rtl::OUString & schemaName, - const rtl::OUString & tableName ) + const OUString & schemaName, + const OUString & tableName ) : ReflectionBase( getStatics().refl.key.implName, getStatics().refl.key.serviceNames, diff --git a/connectivity/source/drivers/postgresql/pq_xkey.hxx b/connectivity/source/drivers/postgresql/pq_xkey.hxx index 57d754b56c39..cd8b611e3f63 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.hxx @@ -77,15 +77,15 @@ class Key : public ReflectionBase, ::com::sun::star::uno::Reference< com::sun::star::sdbc::XDatabaseMetaData > m_meta; ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_keyColumns; - rtl::OUString m_schemaName; - rtl::OUString m_tableName; + OUString m_schemaName; + OUString m_tableName; public: Key( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName); + const OUString &schemaName, + const OUString &tableName); public: // XInterface virtual void SAL_CALL acquire() throw() { OComponentHelper::acquire(); } diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx index c6db5f5e2c47..21c70199000d 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx @@ -71,9 +71,6 @@ using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; using com::sun::star::beans::XPropertySet; @@ -105,10 +102,10 @@ KeyColumns::KeyColumns( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName, - const Sequence< rtl::OUString > &columnNames, - const Sequence< rtl::OUString > &foreignColumnNames ) + const OUString &schemaName, + const OUString &tableName, + const Sequence< OUString > &columnNames, + const Sequence< OUString > &foreignColumnNames ) : Container( refMutex, origin, pSettings, "KEY_COLUMN" ), m_schemaName( schemaName ), m_tableName( tableName ), @@ -127,7 +124,7 @@ void KeyColumns::refresh() { if( isLog( m_pSettings, LogLevel::INFO ) ) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append( "sdbcx.KeyColumns get refreshed for table " ); buf.append( OUStringToOString( m_schemaName, m_pSettings->encoding ) ); buf.append( "." ); @@ -380,10 +377,10 @@ Reference< com::sun::star::container::XNameAccess > KeyColumns::create( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName, - const Sequence< rtl::OUString > &columnNames , - const Sequence< rtl::OUString > &foreignColumnNames ) + const OUString &schemaName, + const OUString &tableName, + const Sequence< OUString > &columnNames , + const Sequence< OUString > &foreignColumnNames ) { KeyColumns *pKeyColumns = new KeyColumns( refMutex, origin, pSettings, schemaName, tableName, columnNames, foreignColumnNames ); diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx index bf7a3f87f69f..9d5dd6af46ef 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx @@ -65,30 +65,30 @@ namespace pq_sdbc_driver class KeyColumns : public Container { - rtl::OUString m_schemaName; - rtl::OUString m_tableName; - com::sun::star::uno::Sequence< rtl::OUString > m_columnNames; - com::sun::star::uno::Sequence< rtl::OUString > m_foreignColumnNames; + OUString m_schemaName; + OUString m_tableName; + com::sun::star::uno::Sequence< OUString > m_columnNames; + com::sun::star::uno::Sequence< OUString > m_foreignColumnNames; public: // instances KeyColumns 'exception safe' static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName, - const com::sun::star::uno::Sequence< rtl::OUString > &keyColumns, - const com::sun::star::uno::Sequence< rtl::OUString > &foreignColumnNames ); + const OUString &schemaName, + const OUString &tableName, + const com::sun::star::uno::Sequence< OUString > &keyColumns, + const com::sun::star::uno::Sequence< OUString > &foreignColumnNames ); protected: KeyColumns( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName, - const com::sun::star::uno::Sequence< rtl::OUString > &keyColumns, - const com::sun::star::uno::Sequence< rtl::OUString > &foreignColumnNames); + const OUString &schemaName, + const OUString &tableName, + const com::sun::star::uno::Sequence< OUString > &keyColumns, + const com::sun::star::uno::Sequence< OUString > &foreignColumnNames); virtual ~KeyColumns(); diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx index 2a8d52165530..49756206e882 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx @@ -70,9 +70,6 @@ using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; using com::sun::star::beans::XPropertySet; @@ -103,8 +100,8 @@ Keys::Keys( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName) + const OUString &schemaName, + const OUString &tableName) : Container( refMutex, origin, pSettings, getStatics().KEY ), m_schemaName( schemaName ), m_tableName( tableName ) @@ -113,7 +110,7 @@ Keys::Keys( Keys::~Keys() {} -static sal_Int32 string2keytype( const rtl::OUString &type ) +static sal_Int32 string2keytype( const OUString &type ) { sal_Int32 ret = com::sun::star::sdbcx::KeyType::UNIQUE; if ( type == "p" ) @@ -123,7 +120,7 @@ static sal_Int32 string2keytype( const rtl::OUString &type ) return ret; } -static sal_Int32 string2keyrule( const rtl::OUString & rule ) +static sal_Int32 string2keyrule( const OUString & rule ) { sal_Int32 ret = com::sun::star::sdbc::KeyRule::NO_ACTION; if( rule == "r" ) @@ -300,8 +297,8 @@ Reference< com::sun::star::container::XIndexAccess > Keys::create( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString & schemaName, - const rtl::OUString & tableName) + const OUString & schemaName, + const OUString & tableName) { Keys *pKeys = new Keys( refMutex, origin, pSettings, schemaName, tableName ); Reference< com::sun::star::container::XIndexAccess > ret = pKeys; diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.hxx b/connectivity/source/drivers/postgresql/pq_xkeys.hxx index 13affbd7a104..f61692c045f6 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.hxx @@ -64,24 +64,24 @@ namespace pq_sdbc_driver { class Keys : public Container { - rtl::OUString m_schemaName; - rtl::OUString m_tableName; + OUString m_schemaName; + OUString m_tableName; public: // instances Columns 'exception safe' static com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName); + const OUString &schemaName, + const OUString &tableName); protected: Keys( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, ConnectionSettings *pSettings, - const rtl::OUString &schemaName, - const rtl::OUString &tableName); + const OUString &schemaName, + const OUString &tableName); virtual ~Keys(); diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx index 7ba75f8131dd..3370f74c59e0 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx @@ -175,7 +175,7 @@ Reference< XIndexAccess > Table::getKeys( ) throw (::com::sun::star::uno::Runti return m_keys; } -void Table::rename( const ::rtl::OUString& newName ) +void Table::rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException) @@ -183,9 +183,9 @@ void Table::rename( const ::rtl::OUString& newName ) MutexGuard guard( m_refMutex->mutex ); Statics & st = getStatics(); - ::rtl::OUString oldName = extractStringProperty(this,st.NAME ); - ::rtl::OUString schema = extractStringProperty(this,st.SCHEMA_NAME ); - ::rtl::OUString fullOldName = concatQualified( schema, oldName ); + OUString oldName = extractStringProperty(this,st.NAME ); + OUString schema = extractStringProperty(this,st.SCHEMA_NAME ); + OUString fullOldName = concatQualified( schema, oldName ); OUString newTableName; OUString newSchemaName; @@ -201,7 +201,7 @@ void Table::rename( const ::rtl::OUString& newName ) newTableName = newName; newSchemaName = schema; } - ::rtl::OUString fullNewName = concatQualified( newSchemaName, newTableName ); + OUString fullNewName = concatQualified( newSchemaName, newTableName ); if( extractStringProperty( this, st.TYPE ).equals( st.VIEW ) && m_pSettings->views.is() ) { @@ -262,7 +262,7 @@ void Table::rename( const ::rtl::OUString& newName ) } void Table::alterColumnByName( - const ::rtl::OUString& colName, + const OUString& colName, const Reference< XPropertySet >& descriptor ) throw (SQLException,NoSuchElementException,RuntimeException) { @@ -346,14 +346,14 @@ Any Table::queryInterface( const Type & reqType ) throw (RuntimeException) return ret; } -::com::sun::star::uno::Any Table::getPropertyValue(const ::rtl::OUString& aPropertyName) +::com::sun::star::uno::Any Table::getPropertyValue(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return ReflectionBase::getPropertyValue( aPropertyName ); } -::rtl::OUString Table::getName( ) throw (::com::sun::star::uno::RuntimeException) +OUString Table::getName( ) throw (::com::sun::star::uno::RuntimeException) { Statics & st = getStatics(); return concatQualified( @@ -361,7 +361,7 @@ Any Table::queryInterface( const Type & reqType ) throw (RuntimeException) extractStringProperty( this, st.NAME ) ); } -void Table::setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException) +void Table::setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException) { rename( aName ); } diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx index d367bf864d8b..c96440ec0387 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -127,7 +127,7 @@ public: // XKeysSupplier getKeys( ) throw (::com::sun::star::uno::RuntimeException); public: // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) + virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); @@ -135,7 +135,7 @@ public: // XRename public: // XAlterTable // Methods virtual void SAL_CALL alterColumnByName( - const ::rtl::OUString& colName, + const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, @@ -149,12 +149,12 @@ public: // XAlterTable ::com::sun::star::uno::RuntimeException); public: // TODO: remove again - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/source/drivers/postgresql/pq_xtables.hxx b/connectivity/source/drivers/postgresql/pq_xtables.hxx index 28069ff0170f..54cd3a78fe18 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.hxx @@ -89,7 +89,7 @@ public: // XAppend ::com::sun::star::uno::RuntimeException); public: // XDrop -// virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) +// virtual void SAL_CALL dropByName( const OUString& elementName ) // throw (::com::sun::star::sdbc::SQLException, // ::com::sun::star::container::NoSuchElementException, // ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx index b96450a7bd94..3eed58192137 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.cxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx @@ -163,11 +163,11 @@ Any User::queryInterface( const Type & reqType ) throw (RuntimeException) void User::changePassword( - const ::rtl::OUString& oldPassword, const ::rtl::OUString& newPassword ) + const OUString& oldPassword, const OUString& newPassword ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { (void) oldPassword; - rtl::OUStringBuffer buf(128); + OUStringBuffer buf(128); buf.append( "ALTER USER " ); bufferQuoteIdentifier( buf, extractStringProperty( this, getStatics().NAME ), m_pSettings ); buf.append( " PASSWORD " ); @@ -177,7 +177,7 @@ void User::changePassword( stmt->executeUpdate( buf.makeStringAndClear() ); } -sal_Int32 User::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) +sal_Int32 User::getPrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { sal_Int32 ret = 0xffffffff; @@ -185,7 +185,7 @@ sal_Int32 User::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType { Statics & st = getStatics(); - rtl::OUStringBuffer buf( 128 ); + OUStringBuffer buf( 128 ); buf.append( "User::getPrivileges[" + extractStringProperty( this, st.NAME ) + "] got called for " + objName + "(type=" + OUString::number(objType) + ")"); @@ -195,7 +195,7 @@ sal_Int32 User::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType return ret; } -sal_Int32 User::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) +sal_Int32 User::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { (void) objName; (void) objType; @@ -203,7 +203,7 @@ sal_Int32 User::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int3 return 0xffffffff; } -void User::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) +void User::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { (void) objName; (void) objType; (void) objPrivileges; @@ -211,7 +211,7 @@ void User::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, s *this, OUString(), 1, Any() ); } -void User::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) +void User::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { (void) objName; (void) objType; (void) objPrivileges; diff --git a/connectivity/source/drivers/postgresql/pq_xuser.hxx b/connectivity/source/drivers/postgresql/pq_xuser.hxx index 1be25e2e87ad..072d09262e7e 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.hxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx @@ -100,11 +100,11 @@ public: // XDataDescriptorFactory public: // XUser : XAuthorizable // Methods - virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL changePassword( const ::rtl::OUString& oldPassword, const ::rtl::OUString& newPassword ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx index fcc17d0f6112..63153675d91e 100644 --- a/connectivity/source/drivers/postgresql/pq_xusers.cxx +++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx @@ -68,9 +68,6 @@ using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; using com::sun::star::beans::XPropertySet; @@ -172,7 +169,7 @@ void Users::appendByDescriptor( stmt->executeUpdate( update.makeStringAndClear() ); } -void Users::dropByName( const ::rtl::OUString& elementName ) +void Users::dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) diff --git a/connectivity/source/drivers/postgresql/pq_xusers.hxx b/connectivity/source/drivers/postgresql/pq_xusers.hxx index 6d72e12f08a9..6da25fa530e0 100644 --- a/connectivity/source/drivers/postgresql/pq_xusers.hxx +++ b/connectivity/source/drivers/postgresql/pq_xusers.hxx @@ -88,7 +88,7 @@ public: // XAppend ::com::sun::star::uno::RuntimeException); public: // XDrop - virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) + virtual void SAL_CALL dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx index baee259e6c30..1f84f2b3efeb 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.cxx +++ b/connectivity/source/drivers/postgresql/pq_xview.cxx @@ -128,7 +128,7 @@ Reference< XPropertySet > View::createDataDescriptor( ) throw (RuntimeException return Reference< XPropertySet > ( pView ); } -void View::rename( const ::rtl::OUString& newName ) +void View::rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException) @@ -137,9 +137,9 @@ void View::rename( const ::rtl::OUString& newName ) Statics & st = getStatics(); - ::rtl::OUString oldName = extractStringProperty(this,st.NAME ); - ::rtl::OUString schema = extractStringProperty(this,st.SCHEMA_NAME ); - ::rtl::OUString fullOldName = concatQualified( schema, oldName ); + OUString oldName = extractStringProperty(this,st.NAME ); + OUString schema = extractStringProperty(this,st.SCHEMA_NAME ); + OUString fullOldName = concatQualified( schema, oldName ); OUString newTableName; OUString newSchemaName; @@ -155,7 +155,7 @@ void View::rename( const ::rtl::OUString& newName ) newTableName = newName; newSchemaName = schema; } - ::rtl::OUString fullNewName = concatQualified( newSchemaName, newTableName ); + OUString fullNewName = concatQualified( newSchemaName, newTableName ); if( ! schema.equals( newSchemaName ) ) { @@ -234,7 +234,7 @@ Any View::queryInterface( const Type & reqType ) throw (RuntimeException) return ret; } -::rtl::OUString View::getName( ) throw (::com::sun::star::uno::RuntimeException) +OUString View::getName( ) throw (::com::sun::star::uno::RuntimeException) { Statics & st = getStatics(); return concatQualified( @@ -242,7 +242,7 @@ Any View::queryInterface( const Type & reqType ) throw (RuntimeException) extractStringProperty( this, st.NAME ) ); } -void View::setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException) +void View::setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException) { rename( aName ); } diff --git a/connectivity/source/drivers/postgresql/pq_xview.hxx b/connectivity/source/drivers/postgresql/pq_xview.hxx index 94b4745c0225..001180916f64 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.hxx +++ b/connectivity/source/drivers/postgresql/pq_xview.hxx @@ -98,14 +98,14 @@ public: // XDataDescriptorFactory createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); public: // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) + virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); public: // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx index 39c6856df2e7..e375a8b8e342 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.cxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx @@ -69,9 +69,6 @@ using osl::MutexGuard; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; using com::sun::star::beans::XPropertySet; @@ -137,7 +134,7 @@ void Views::refresh() while( rs->next() ) { - rtl::OUString table, schema, command; + OUString table, schema, command; schema = xRow->getString( 1 ); table = xRow->getString( 2 ); command = xRow->getString( 3 ); @@ -201,7 +198,7 @@ void Views::appendByDescriptor( } } -void Views::dropByName( const ::rtl::OUString& elementName ) +void Views::dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) diff --git a/connectivity/source/drivers/postgresql/pq_xviews.hxx b/connectivity/source/drivers/postgresql/pq_xviews.hxx index ca2640b500a1..3400fa1fa4d0 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.hxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.hxx @@ -89,7 +89,7 @@ public: // XAppend ::com::sun::star::uno::RuntimeException); public: // XDrop - virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) + virtual void SAL_CALL dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx index ba1a0cfb7ccc..b97558b1a82f 100644 --- a/connectivity/source/inc/AutoRetrievingBase.hxx +++ b/connectivity/source/inc/AutoRetrievingBase.hxx @@ -26,17 +26,17 @@ namespace connectivity { class OOO_DLLPUBLIC_DBTOOLS OAutoRetrievingBase { - ::rtl::OUString m_sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values + OUString m_sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values sal_Bool m_bAutoRetrievingEnabled; // set to when we should allow to query for generated values protected: OAutoRetrievingBase() : m_bAutoRetrievingEnabled(sal_False) {} virtual ~OAutoRetrievingBase(){} inline void enableAutoRetrievingEnabled(sal_Bool _bAutoEnable) { m_bAutoRetrievingEnabled = _bAutoEnable; } - inline void setAutoRetrievingStatement(const ::rtl::OUString& _sStmt) { m_sGeneratedValueStatement = _sStmt; } + inline void setAutoRetrievingStatement(const OUString& _sStmt) { m_sGeneratedValueStatement = _sStmt; } public: inline sal_Bool isAutoRetrievingEnabled() const { return m_bAutoRetrievingEnabled; } - inline const ::rtl::OUString& getAutoRetrievingStatement() const { return m_sGeneratedValueStatement; } + inline const OUString& getAutoRetrievingStatement() const { return m_sGeneratedValueStatement; } /** transform the statement to query for auto generated values @param _sInsertStatement @@ -44,7 +44,7 @@ namespace connectivity @return The transformed generated statement. */ - ::rtl::OUString getTransformedGeneratedStatement(const ::rtl::OUString& _sInsertStatement) const; + OUString getTransformedGeneratedStatement(const OUString& _sInsertStatement) const; }; } #endif // _CONNECTIVITY_AUTOKEYRETRIEVINGBASE_HXX_ diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx index a7faf0e1775d..a503bae2a3d4 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx @@ -147,13 +147,13 @@ namespace connectivity // XServiceInfo - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); protected: - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); // XInterface @@ -183,7 +183,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -212,7 +212,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index 2244e7ad8d13..a50fcda95dd4 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -63,19 +63,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // methods to set the right column mapping void setColumnPrivilegesMap(); diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx index 434dd68bd691..479762da8e24 100644 --- a/connectivity/source/inc/OColumn.hxx +++ b/connectivity/source/inc/OColumn.hxx @@ -28,13 +28,13 @@ namespace connectivity { class OOO_DLLPUBLIC_DBTOOLS OColumn { - ::rtl::OUString m_CatalogName; - ::rtl::OUString m_SchemaName; - ::rtl::OUString m_TableName; - ::rtl::OUString m_ColumnName; - ::rtl::OUString m_ColumnLabel; - ::rtl::OUString m_ColumnTypeName; - ::rtl::OUString m_ColumnServiceName; + OUString m_CatalogName; + OUString m_SchemaName; + OUString m_TableName; + OUString m_ColumnName; + OUString m_ColumnLabel; + OUString m_ColumnTypeName; + OUString m_ColumnServiceName; sal_Int32 m_Nullable; sal_Int32 m_ColumnDisplaySize; @@ -53,8 +53,8 @@ namespace connectivity public: OColumn() {} - OColumn(const ::rtl::OUString &_aTableName, - const ::rtl::OUString &_aColumnName, + OColumn(const OUString &_aTableName, + const OUString &_aColumnName, sal_Int32 _aNullable=0, sal_Int32 _aColumnDisplaySize=0, @@ -71,9 +71,9 @@ namespace connectivity sal_Bool _aWritable=sal_False, sal_Bool _aDefinitelyWritable=sal_False, - const ::rtl::OUString &_aColumnLabel = ::rtl::OUString(), - const ::rtl::OUString &_aColumnTypeName = ::rtl::OUString(), - const ::rtl::OUString &_aColumnServiceName = ::rtl::OUString()) + const OUString &_aColumnLabel = OUString(), + const OUString &_aColumnTypeName = OUString(), + const OUString &_aColumnServiceName = OUString()) : m_TableName(_aTableName), m_ColumnName(_aColumnName), m_ColumnLabel(_aColumnLabel), @@ -123,13 +123,13 @@ namespace connectivity sal_Int32 getScale() const { return m_Scale; } sal_Int32 getColumnType() const { return m_ColumnType; } - const ::rtl::OUString& getColumnLabel() const { return m_ColumnLabel; } - const ::rtl::OUString& getColumnName() const { return m_ColumnName; } - const ::rtl::OUString& getSchemaName() const { return m_SchemaName; } - const ::rtl::OUString& getTableName() const { return m_TableName; } - const ::rtl::OUString& getCatalogName() const { return m_CatalogName; } - const ::rtl::OUString& getColumnTypeName() const { return m_ColumnTypeName; } - const ::rtl::OUString& getColumnServiceName() const { return m_ColumnServiceName; } + const OUString& getColumnLabel() const { return m_ColumnLabel; } + const OUString& getColumnName() const { return m_ColumnName; } + const OUString& getSchemaName() const { return m_SchemaName; } + const OUString& getTableName() const { return m_TableName; } + const OUString& getCatalogName() const { return m_CatalogName; } + const OUString& getColumnTypeName() const { return m_ColumnTypeName; } + const OUString& getColumnServiceName() const { return m_ColumnServiceName; } }; } diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index 4b9e71bb63b3..754f791be320 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -28,11 +28,11 @@ namespace connectivity { struct OTypeInfo { - ::rtl::OUString aTypeName; // Name of the type in the database - ::rtl::OUString aLiteralPrefix; // Prefix for quoting - ::rtl::OUString aLiteralSuffix; // Suffix for quoting - ::rtl::OUString aCreateParams; // Parameter for creating - ::rtl::OUString aLocalTypeName; + OUString aTypeName; // Name of the type in the database + OUString aLiteralPrefix; // Prefix for quoting + OUString aLiteralSuffix; // Suffix for quoting + OUString aCreateParams; // Parameter for creating + OUString aLocalTypeName; sal_Int32 nPrecision; // Length of the type @@ -76,7 +76,7 @@ namespace connectivity sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } sal_Bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; } - inline ::rtl::OUString getDBName() const { return aTypeName; } + inline OUString getDBName() const { return aTypeName; } }; } #endif // _CONNECTIVITY_OTYPEINFO_HXX_ diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx index 0e197a56fcb9..2c37895a090e 100644 --- a/connectivity/source/inc/ParameterSubstitution.hxx +++ b/connectivity/source/inc/ParameterSubstitution.hxx @@ -38,24 +38,24 @@ namespace connectivity ParameterSubstitution& operator=( const ParameterSubstitution& ); public: - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext); protected: ParameterSubstitution(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); virtual ~ParameterSubstitution(){} // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XStringSubstitution - virtual ::rtl::OUString SAL_CALL substituteVariables( const ::rtl::OUString& aText, ::sal_Bool bSubstRequired ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL reSubstituteVariables( const ::rtl::OUString& aText ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubstituteVariableValue( const ::rtl::OUString& variable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL substituteVariables( const OUString& aText, ::sal_Bool bSubstRequired ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); }; // ================================== } // connectivity diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index 4e53af53e594..be13d467b496 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.hxx @@ -124,7 +124,7 @@ public: @return the generated function object. */ - static ExpressionNodeSharedPtr parseFunction( const ::rtl::OUString& _sFunction); + static ExpressionNodeSharedPtr parseFunction( const OUString& _sFunction); private: // disabled constructor/destructor, since this is diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index fba3d0e49ea0..f05164e459ee 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.hxx @@ -50,7 +50,7 @@ namespace connectivity connectivity::OWeakRefArray m_aStatements; // vector containing a list // of all the Statement objects // for this Connection - ::rtl::OUString m_sURL; + OUString m_sURL; rtl_TextEncoding m_nTextEncoding; // the encoding which is used for all text conversions ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; @@ -62,8 +62,8 @@ namespace connectivity OMetaConnection(); inline rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; } - inline ::rtl::OUString getURL() const { return m_sURL; } - inline void setURL(const ::rtl::OUString& _rsUrl) { m_sURL = _rsUrl; } + inline OUString getURL() const { return m_sURL; } + inline void setURL(const OUString& _rsUrl) { m_sURL = _rsUrl; } void throwGenericSQLException( sal_uInt16 _nErrorResourceId,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xContext ); const SharedResources& getResources() const { return m_aResources;} diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx index 334fffc9e3b3..9ec1ad192aa8 100644 --- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx +++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx @@ -42,8 +42,8 @@ namespace connectivity // cached database information ::std::pair m_isCatalogAtStart; - ::std::pair m_sCatalogSeparator; - ::std::pair m_sIdentifierQuoteString; + ::std::pair m_sCatalogSeparator; + ::std::pair m_sIdentifierQuoteString; ::std::pair m_supportsCatalogsInTableDefinitions; ::std::pair m_supportsSchemasInTableDefinitions; ::std::pair m_supportsCatalogsInDataManipulation; @@ -74,9 +74,9 @@ namespace connectivity protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() = 0; // cached database information - virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ) = 0; + virtual OUString impl_getIdentifierQuoteString_throw( ) = 0; virtual sal_Bool impl_isCatalogAtStart_throw( ) = 0; - virtual ::rtl::OUString impl_getCatalogSeparator_throw( ) = 0; + virtual OUString impl_getCatalogSeparator_throw( ) = 0; virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ) = 0; virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) = 0; virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ) = 0; @@ -100,25 +100,25 @@ namespace connectivity virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // cached database information - virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index b1df68b85209..eee4a5ced37c 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.hxx @@ -54,7 +54,7 @@ namespace connectivity } inline void setValue(sal_Int32 nVal) { m_nValue = nVal; } - ::rtl::OUString getKeyString(::std::vector::size_type i) const + OUString getKeyString(::std::vector::size_type i) const { OSL_ENSURE(m_aKeys.size() > i,"Wrong index for KEyValue"); return m_aKeys[i]->getValue(); diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx index a9d03a67d0d5..c47b616610b1 100644 --- a/connectivity/source/inc/TPrivilegesResultSet.hxx +++ b/connectivity/source/inc/TPrivilegesResultSet.hxx @@ -35,7 +35,7 @@ namespace connectivity virtual const ORowSetValue& getValue(sal_Int32 columnIndex); public: OResultSetPrivileges(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta - ,const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern); + ,const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx index fa7836d8a24a..edd8b97822b4 100644 --- a/connectivity/source/inc/ado/ACallableStatement.hxx +++ b/connectivity/source/inc/ado/ACallableStatement.hxx @@ -42,7 +42,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); virtual ~OCallableStatement() {} ; // a Constructor, that is needed for when Returning the Object is needed: - OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const ::rtl::OUString& sql ); + OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql ); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); @@ -50,7 +50,7 @@ namespace connectivity // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -70,7 +70,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XOutParameters - virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx index eb6875cf2a7a..7f910be18da7 100644 --- a/connectivity/source/inc/ado/AColumn.hxx +++ b/connectivity/source/inc/ado/AColumn.hxx @@ -33,7 +33,7 @@ namespace connectivity { WpADOColumn m_aColumn; OConnection* m_pConnection; - ::rtl::OUString m_ReferencedColumn; + OUString m_ReferencedColumn; sal_Bool m_IsAscending; void fillPropertyValues(); diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx index c369dfea1eaa..21ecda58f87e 100644 --- a/connectivity/source/inc/ado/AColumns.hxx +++ b/connectivity/source/inc/ado/AColumns.hxx @@ -36,11 +36,11 @@ namespace connectivity WpADOColumns m_aCollection; OConnection* m_pConnection; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OColumns( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 417eeb798421..71d6c92621ca 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -38,7 +38,7 @@ namespace connectivity ::connectivity::OTypeInfo aSimpleType; // the general type info DataTypeEnum eType; - inline ::rtl::OUString getDBName() const { return aSimpleType.aTypeName; } + inline OUString getDBName() const { return aSimpleType.aTypeName; } }; class WpADOConnection; @@ -76,7 +76,7 @@ namespace connectivity OConnection(ODriver* _pDriver) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OConnection(const SQLHANDLE _pConnectionHandle); ~OConnection(); - void construct(const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info); + void construct(const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); @@ -92,9 +92,9 @@ namespace connectivity // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -103,8 +103,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -132,7 +132,7 @@ namespace connectivity static const OExtendedTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, DataTypeEnum _nType, - const ::rtl::OUString& _sTypeName, + const OUString& _sTypeName, sal_Int32 _nPrecision, sal_Int32 _nScale, sal_Bool& _brForceToType); diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx index 4f4369bcc5c5..790b3cdc1db8 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx @@ -40,7 +40,7 @@ namespace connectivity { typedef struct _LiteralInfo { - ::rtl::OUString pwszLiteralValue; + OUString pwszLiteralValue; sal_uInt32 cchMaxLen; sal_Bool fSupported; } LiteralInfo; @@ -53,18 +53,18 @@ namespace connectivity // get information out of rowset sal_Int32 getMaxSize(sal_uInt32 _nId); sal_Bool isCapable(sal_uInt32 _nId); - ::rtl::OUString getLiteral(sal_uInt32 _nProperty); + OUString getLiteral(sal_uInt32 _nProperty); // get info out of propertyst - ::rtl::OUString getStringProperty(const ::rtl::OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getInt32Property(const ::rtl::OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Bool getBoolProperty(const ::rtl::OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString getStringProperty(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getInt32Property(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Bool getBoolProperty(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information - virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual ::rtl::OUString impl_getCatalogSeparator_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); @@ -82,17 +82,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -105,13 +105,13 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -137,9 +137,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -187,20 +187,20 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -213,7 +213,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index 187d4d2b78f1..d40e73fd3ed3 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -60,11 +60,11 @@ namespace connectivity ::std::map m_aValueRange; ::std::map::iterator m_aValueRangeIter; - ::std::map > m_aStrValueRange; - ::std::map >::iterator m_aStrValueRangeIter; + ::std::map > m_aStrValueRange; + ::std::map >::iterator m_aStrValueRangeIter; - ::std::map > m_aIntValueRange; - ::std::map >::iterator m_aIntValueRangeIter; + ::std::map > m_aIntValueRange; + ::std::map >::iterator m_aIntValueRangeIter; ADORecordset* m_pRecordSet; ::com::sun::star::uno::WeakReferenceHelper m_aStatement; @@ -79,7 +79,7 @@ namespace connectivity sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -147,7 +147,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -176,7 +176,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); const ::std::vector& getColumnMapping() { return m_aColMapping; } diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index 1bb0f85bdd1d..7e09c6c60d81 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx @@ -88,19 +88,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx index 61dcf8450c93..fb2b23c147a1 100644 --- a/connectivity/source/inc/ado/ADriver.hxx +++ b/connectivity/source/inc/ado/ADriver.hxx @@ -54,28 +54,28 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xORB; } private: - void impl_checkURL_throw(const ::rtl::OUString& _sUrl); + void impl_checkURL_throw(const OUString& _sUrl); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); // XDataDefinitionSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx index 92c5985ff27b..3b17687cb262 100644 --- a/connectivity/source/inc/ado/AGroup.hxx +++ b/connectivity/source/inc/ado/AGroup.hxx @@ -46,7 +46,7 @@ namespace connectivity virtual void refreshUsers(); public: OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, ADOGroup* _pGroup=NULL); - OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString& _Name); + OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); @@ -55,10 +55,10 @@ namespace connectivity static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); WpADOGroup getImpl() const { return m_aGroup; } }; diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx index bf120d26e031..296de9520cd5 100644 --- a/connectivity/source/inc/ado/AGroups.hxx +++ b/connectivity/source/inc/ado/AGroups.hxx @@ -34,11 +34,11 @@ namespace connectivity OCatalog* m_pCatalog; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OGroups(OCatalog* _pParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx index ab3025388a6a..16347b2c5fbd 100644 --- a/connectivity/source/inc/ado/AIndexes.hxx +++ b/connectivity/source/inc/ado/AIndexes.hxx @@ -33,11 +33,11 @@ namespace connectivity WpADOIndexes m_aCollection; OConnection* m_pConnection; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OIndexes(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx index 4ff64389fe9c..c93ffc155dd9 100644 --- a/connectivity/source/inc/ado/AKeys.hxx +++ b/connectivity/source/inc/ado/AKeys.hxx @@ -34,11 +34,11 @@ namespace connectivity OConnection* m_pConnection; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OKeys(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx index c918fed2d8e9..fe07c59a5edc 100644 --- a/connectivity/source/inc/ado/APreparedStatement.hxx +++ b/connectivity/source/inc/ado/APreparedStatement.hxx @@ -45,7 +45,7 @@ namespace connectivity void setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType,const sal_Int32& _nSize,const OLEVariant& _Val) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void replaceParameterNodeName( OSQLParseNode* _pNode, - const ::rtl::OUString& _sDefaultName, + const OUString& _sDefaultName, sal_Int32& _nParameterCount); protected: //==================================================================== @@ -60,7 +60,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); // a Constructor, that is needed for when Returning the Object is needed: - OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const ::rtl::OUString& sql); + OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); @@ -75,7 +75,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -83,7 +83,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index c1643c6172ae..1dceb57185e9 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -78,7 +78,7 @@ namespace connectivity sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -116,9 +116,9 @@ namespace connectivity void construct(); inline void setMetaData(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); @@ -151,7 +151,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -195,7 +195,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -205,7 +205,7 @@ namespace connectivity virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx index df66b0c1d6df..4c12b166f6e1 100644 --- a/connectivity/source/inc/ado/AResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx @@ -65,19 +65,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index 1ea707e3bb38..cc8f5d1d1d0d 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -64,7 +64,7 @@ namespace connectivity ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< ::rtl::OUString> m_aBatchList; + ::std::list< OUString> m_aBatchList; ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created // for this Statement @@ -92,7 +92,7 @@ namespace connectivity sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setQueryTimeOut(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setMaxFieldSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -101,7 +101,7 @@ namespace connectivity void setResultSetType(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void setCursorName(const ::rtl::OUString &_par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void setCursorName(const OUString &_par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: @@ -151,9 +151,9 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -183,7 +183,7 @@ namespace connectivity virtual void SAL_CALL release() throw(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); // XBatchExecution - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx index 4ebea638dfeb..f1d252664b38 100644 --- a/connectivity/source/inc/ado/ATable.hxx +++ b/connectivity/source/inc/ado/ATable.hxx @@ -53,8 +53,8 @@ namespace connectivity OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog); - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString getSchema() const { return m_SchemaName; } + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + OUString getSchema() const { return m_SchemaName; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const; // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); @@ -63,10 +63,10 @@ namespace connectivity virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // XAlterTable - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // sal_Bool create() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx index bb1c7d53a56b..5c8b4a134e50 100644 --- a/connectivity/source/inc/ado/ATables.hxx +++ b/connectivity/source/inc/ado/ATables.hxx @@ -33,12 +33,12 @@ namespace connectivity WpADOTables m_aCollection; OCatalog* m_pCatalog; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); void setComments(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OTables(OCatalog* _pParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, @@ -49,7 +49,7 @@ namespace connectivity { OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); } - void appendNew(const ::rtl::OUString& _rsNewTable); + void appendNew(const OUString& _rsNewTable); }; } } diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx index ac98a9f3ea78..7c451401234c 100644 --- a/connectivity/source/inc/ado/AUser.hxx +++ b/connectivity/source/inc/ado/AUser.hxx @@ -50,7 +50,7 @@ namespace connectivity virtual void refreshGroups(); public: OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser=NULL); - OAdoUser(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString& _Name); + OAdoUser(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); @@ -59,12 +59,12 @@ namespace connectivity virtual void SAL_CALL release() throw(); // XUser - virtual void SAL_CALL changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); WpADOUser getImpl() const { return m_aUser;} }; @@ -76,17 +76,17 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: OUserExtend(OCatalog* _pParent,sal_Bool _bCase,ADOUser* _pUser=NULL); - OUserExtend(OCatalog* _pParent,sal_Bool _bCase,const ::rtl::OUString& _Name); + OUserExtend(OCatalog* _pParent,sal_Bool _bCase,const OUString& _Name); virtual void construct(); - ::rtl::OUString getPassword() const { return m_Password;} + OUString getPassword() const { return m_Password;} }; } } diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx index 3f958d4ad742..761071b6c31d 100644 --- a/connectivity/source/inc/ado/AUsers.hxx +++ b/connectivity/source/inc/ado/AUsers.hxx @@ -34,11 +34,11 @@ namespace connectivity WpADOUsers m_aCollection; OCatalog* m_pCatalog; public: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OUsers( OCatalog* _pParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx index 20899c7ebd9e..b94f9653bf6f 100644 --- a/connectivity/source/inc/ado/AViews.hxx +++ b/connectivity/source/inc/ado/AViews.hxx @@ -35,12 +35,12 @@ namespace connectivity WpADOViews m_aCollection; OCatalog* m_pCatalog; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); void setComments(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OViews(OCatalog* _pParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx index 9df8e34bd97e..b25ce19eb4e4 100644 --- a/connectivity/source/inc/ado/Aolevariant.hxx +++ b/connectivity/source/inc/ado/Aolevariant.hxx @@ -55,16 +55,16 @@ namespace connectivity public: OLEString(); OLEString(const BSTR& _sBStr); - OLEString(const ::rtl::OUString& _sBStr); + OLEString(const OUString& _sBStr); OLEString(const OLEString& _rRh) { OLEString::operator=(_rRh); } ~OLEString(); - OLEString& operator=(const ::rtl::OUString& _rSrc); + OLEString& operator=(const OUString& _rSrc); OLEString& operator=(const BSTR& _rSrc); OLEString& operator=(const OLEString& _rSrc); - operator ::rtl::OUString() const; + operator OUString() const; operator BSTR() const; BSTR* operator &(); sal_Int32 length() const; @@ -82,7 +82,7 @@ namespace connectivity OLEVariant(sal_Int32 n) ; OLEVariant(sal_Int64 x) ; - OLEVariant(const rtl::OUString& us) ; + OLEVariant(const OUString& us) ; ~OLEVariant() ; OLEVariant(const ::com::sun::star::util::Date& x ); OLEVariant(const ::com::sun::star::util::Time& x ); @@ -107,7 +107,7 @@ namespace connectivity void setChar(unsigned char a) ; void setCurrency(double aCur) ; void setBool(sal_Bool b) ; - void setString(const rtl::OUString& us) ; + void setString(const OUString& us) ; void setNoArg() ; void setIDispatch(IDispatch* pDispInterface); @@ -123,7 +123,7 @@ namespace connectivity void ChangeType(VARTYPE vartype, const OLEVariant* pSrc); - operator ::rtl::OUString() const; + operator OUString() const; operator sal_Bool() const { return getBool(); } operator sal_Int8() const { return getInt8(); } @@ -136,7 +136,7 @@ namespace connectivity operator ::com::sun::star::util::Date() const ; operator ::com::sun::star::util::Time() const ; operator ::com::sun::star::util::DateTime()const ; - ::rtl::OUString getString() const; + OUString getString() const; sal_Bool getBool() const; IUnknown* getIUnknown() const; IDispatch* getIDispatch() const; diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index c4462a1eb11a..c51dfc6ae2db 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -170,15 +170,15 @@ namespace connectivity return aRet; } - inline WrapT GetItem(const ::rtl::OUString& sStr) const + inline WrapT GetItem(const OUString& sStr) const { WrapT aRet(NULL); T* pT = NULL; if (FAILED(pInterface->get_Item(OLEVariant(sStr), &pT))) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTemp("Unknown Item: "); - sTemp += ::rtl::OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding()); + OString sTemp("Unknown Item: "); + sTemp += OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding()); OSL_FAIL(sTemp.getStr()); #endif } @@ -222,7 +222,7 @@ namespace connectivity return SUCCEEDED(pInterface->Append(OLEVariant((T*)aWrapT))); }; - inline sal_Bool Delete(const ::rtl::OUString& sName) + inline sal_Bool Delete(const OUString& sName) { return SUCCEEDED(pInterface->Delete(OLEVariant(sName))); }; diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx index 2421548a3ab2..3dad87dd2282 100644 --- a/connectivity/source/inc/ado/Awrapado.hxx +++ b/connectivity/source/inc/ado/Awrapado.hxx @@ -63,23 +63,23 @@ namespace connectivity WpADOProperties get_Properties() const; - rtl::OUString GetConnectionString() const; - sal_Bool PutConnectionString(const ::rtl::OUString &aCon) const; + OUString GetConnectionString() const; + sal_Bool PutConnectionString(const OUString &aCon) const; sal_Int32 GetCommandTimeout() const; void PutCommandTimeout(sal_Int32 nRet); sal_Int32 GetConnectionTimeout() const ; void PutConnectionTimeout(sal_Int32 nRet); sal_Bool Close( ) ; - sal_Bool Execute(const ::rtl::OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset); + sal_Bool Execute(const OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset); sal_Bool BeginTrans(); sal_Bool CommitTrans( ) ; sal_Bool RollbackTrans( ); - sal_Bool Open(const ::rtl::OUString& ConnectionString, const ::rtl::OUString& UserID,const ::rtl::OUString& Password,long Options); + sal_Bool Open(const OUString& ConnectionString, const OUString& UserID,const OUString& Password,long Options); sal_Bool GetErrors(ADOErrors** pErrors); - ::rtl::OUString GetDefaultDatabase() const; - sal_Bool PutDefaultDatabase(const ::rtl::OUString& _bstr); + OUString GetDefaultDatabase() const; + sal_Bool PutDefaultDatabase(const OUString& _bstr); IsolationLevelEnum get_IsolationLevel() const ; sal_Bool put_IsolationLevel(const IsolationLevelEnum& eNum) ; @@ -93,48 +93,48 @@ namespace connectivity ConnectModeEnum get_Mode() const; sal_Bool put_Mode(const ConnectModeEnum &eNum) ; - ::rtl::OUString get_Provider() const; - sal_Bool put_Provider(const ::rtl::OUString& _bstr); + OUString get_Provider() const; + sal_Bool put_Provider(const OUString& _bstr); sal_Int32 get_State() const; sal_Bool OpenSchema(SchemaEnum eNum,OLEVariant& Restrictions,OLEVariant& SchemaID,ADORecordset**pprset); - ::rtl::OUString get_Version() const; + OUString get_Version() const; // special methods - ADORecordset* getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ); - ADORecordset* getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ); - ADORecordset* getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ); - ADORecordset* getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ); + ADORecordset* getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ); + ADORecordset* getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ); + ADORecordset* getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ); + ADORecordset* getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ); ADORecordset* getTablePrivileges( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern ); + const OUString& schemaPattern, + const OUString& tableNamePattern ); ADORecordset* getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, - const ::rtl::OUString& primarySchema, - const ::rtl::OUString& primaryTable, + const OUString& primarySchema, + const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, - const ::rtl::OUString& foreignSchema, - const ::rtl::OUString& foreignTable); + const OUString& foreignSchema, + const OUString& foreignTable); ADORecordset* getProcedures( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern ); + const OUString& schemaPattern, + const OUString& procedureNamePattern ); ADORecordset* getProcedureColumns( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern, - const ::rtl::OUString& columnNamePattern ); + const OUString& schemaPattern, + const OUString& procedureNamePattern, + const OUString& columnNamePattern ); ADORecordset* getTables( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ); + const OUString& schemaPattern, + const OUString& tableNamePattern, + const ::com::sun::star::uno::Sequence< OUString >& types ); ADORecordset* getColumns( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, - const ::rtl::OUString& columnNamePattern ); + const OUString& schemaPattern, + const OUString& tableNamePattern, + const OUString& columnNamePattern ); ADORecordset* getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, - const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& table, - const ::rtl::OUString& columnNamePattern ); + const OUString& schemaPattern, + const OUString& table, + const OUString& columnNamePattern ); ADORecordset* getTypeInfo(DataTypeEnum _eType = adEmpty ); }; @@ -160,21 +160,21 @@ namespace connectivity void put_ActiveConnection(/* [in] */ const OLEVariant& vConn); void Create(); sal_Int32 get_State() const; - ::rtl::OUString get_CommandText() const; - sal_Bool put_CommandText(const ::rtl::OUString &aCon) ; + OUString get_CommandText() const; + sal_Bool put_CommandText(const OUString &aCon) ; sal_Int32 get_CommandTimeout() const; void put_CommandTimeout(sal_Int32 nRet); sal_Bool get_Prepared() const; sal_Bool put_Prepared(VARIANT_BOOL bPrepared) const; sal_Bool Execute(OLEVariant& RecordsAffected,OLEVariant& Parameters,long Options, ADORecordset** ppiRset); - ADOParameter* CreateParameter(const ::rtl::OUString &_bstr,DataTypeEnum Type,ParameterDirectionEnum Direction,long nSize,const OLEVariant &Value); + ADOParameter* CreateParameter(const OUString &_bstr,DataTypeEnum Type,ParameterDirectionEnum Direction,long nSize,const OLEVariant &Value); ADOParameters* get_Parameters() const; sal_Bool put_CommandType( /* [in] */ CommandTypeEnum lCmdType); CommandTypeEnum get_CommandType( ) const ; // Returns the field's name - ::rtl::OUString GetName() const ; - sal_Bool put_Name(const ::rtl::OUString& _Name); + OUString GetName() const ; + sal_Bool put_Name(const OUString& _Name); sal_Bool Cancel(); }; //------------------------------------------------------------------------ @@ -193,10 +193,10 @@ namespace connectivity ////////////////////////////////////////////////////////////////////// - ::rtl::OUString GetDescription() const; - ::rtl::OUString GetSource() const ; + OUString GetDescription() const; + OUString GetSource() const ; sal_Int32 GetNumber() const ; - ::rtl::OUString GetSQLState() const ; + OUString GetSQLState() const ; sal_Int32 GetNativeError() const ; }; @@ -223,7 +223,7 @@ namespace connectivity sal_Int32 GetStatus() const ; sal_Int32 GetDefinedSize() const ; // Returns the field's name - ::rtl::OUString GetName() const ; + OUString GetName() const ; DataTypeEnum GetADOType() const ; void get_Value(OLEVariant& aValVar) const ; OLEVariant get_Value() const; @@ -267,7 +267,7 @@ namespace connectivity OLEVariant GetValue() const; void GetValue(OLEVariant &aValVar) const; sal_Bool PutValue(const OLEVariant &aValVar) ; - ::rtl::OUString GetName() const ; + OUString GetName() const ; DataTypeEnum GetADOType() const ; sal_Int32 GetAttributes() const ; sal_Bool PutAttributes(sal_Int32 _nDefSize); @@ -351,7 +351,7 @@ namespace connectivity {WpOLEBase::operator=(rhs); return *this;} ////////////////////////////////////////////////////////////////////// - ::rtl::OUString GetName() const ; + OUString GetName() const ; DataTypeEnum GetADOType() const ; void put_Type(const DataTypeEnum& _eType); sal_Bool put_Size(const sal_Int32& _nSize); diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx index 1879fbb6c7f1..ec1efa8c624e 100644 --- a/connectivity/source/inc/ado/Awrapadox.hxx +++ b/connectivity/source/inc/ado/Awrapadox.hxx @@ -82,7 +82,7 @@ namespace connectivity inline WpADOView& operator=(const WpADOView& rhs) {WpOLEBase::operator=(rhs); return *this;} - ::rtl::OUString get_Name() const; + OUString get_Name() const; void get_Command(OLEVariant& _rVar) const; void put_Command(OLEVariant& _rVar); }; @@ -98,8 +98,8 @@ namespace connectivity void Create(); - ::rtl::OUString get_Name() const; - void put_Name(const ::rtl::OUString& _rName); + OUString get_Name() const; + void put_Name(const OUString& _rName); RightsEnum GetPermissions( /* [in] */ const OLEVariant& Name, /* [in] */ ObjectTypeEnum ObjectType); @@ -122,9 +122,9 @@ namespace connectivity void Create(); - ::rtl::OUString get_Name() const; - void put_Name(const ::rtl::OUString& _rName); - sal_Bool ChangePassword(const ::rtl::OUString& _rPwd,const ::rtl::OUString& _rNewPwd); + OUString get_Name() const; + void put_Name(const OUString& _rName); + sal_Bool ChangePassword(const OUString& _rPwd,const OUString& _rNewPwd); WpADOGroups get_Groups(); RightsEnum GetPermissions( /* [in] */ const OLEVariant& Name, diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx index 47e8cc73268b..90328725a0d8 100644 --- a/connectivity/source/inc/ado/WrapCatalog.hxx +++ b/connectivity/source/inc/ado/WrapCatalog.hxx @@ -34,7 +34,7 @@ namespace connectivity inline WpADOCatalog& operator=(const WpADOCatalog& rhs) {WpOLEBase<_ADOCatalog>::operator=(rhs); return *this;} - ::rtl::OUString GetObjectOwner(const ::rtl::OUString& _rName, ObjectTypeEnum _eNum); + OUString GetObjectOwner(const OUString& _rName, ObjectTypeEnum _eNum); void putref_ActiveConnection(IDispatch* pCon); WpADOTables get_Tables(); diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx index a0d258dfca80..cbb0bf791023 100644 --- a/connectivity/source/inc/ado/WrapColumn.hxx +++ b/connectivity/source/inc/ado/WrapColumn.hxx @@ -40,10 +40,10 @@ namespace connectivity inline WpADOColumn& operator=(const WpADOColumn& rhs) {WpOLEBase<_ADOColumn>::operator=(rhs); return *this;} - ::rtl::OUString get_Name() const; - ::rtl::OUString get_RelatedColumn() const; - void put_Name(const ::rtl::OUString& _rName); - void put_RelatedColumn(const ::rtl::OUString& _rName); + OUString get_Name() const; + OUString get_RelatedColumn() const; + void put_Name(const OUString& _rName); + void put_RelatedColumn(const OUString& _rName); DataTypeEnum get_Type() const; void put_Type(const DataTypeEnum& _eNum) ; sal_Int32 get_Precision() const; diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx index 0f200ffe50f3..7de600232c92 100644 --- a/connectivity/source/inc/ado/WrapIndex.hxx +++ b/connectivity/source/inc/ado/WrapIndex.hxx @@ -36,8 +36,8 @@ namespace connectivity void Create(); - ::rtl::OUString get_Name() const; - void put_Name(const ::rtl::OUString& _rName); + OUString get_Name() const; + void put_Name(const OUString& _rName); sal_Bool get_Clustered() const; void put_Clustered(sal_Bool _b); sal_Bool get_Unique() const; diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx index f5dc634fc160..f613c64a28af 100644 --- a/connectivity/source/inc/ado/WrapKey.hxx +++ b/connectivity/source/inc/ado/WrapKey.hxx @@ -36,12 +36,12 @@ namespace connectivity void Create(); - ::rtl::OUString get_Name() const; - void put_Name(const ::rtl::OUString& _rName); + OUString get_Name() const; + void put_Name(const OUString& _rName); KeyTypeEnum get_Type() const; void put_Type(const KeyTypeEnum& _eNum) ; - ::rtl::OUString get_RelatedTable() const; - void put_RelatedTable(const ::rtl::OUString& _rName); + OUString get_RelatedTable() const; + void put_RelatedTable(const OUString& _rName); RuleEnum get_DeleteRule() const; void put_DeleteRule(const RuleEnum& _eNum) ; RuleEnum get_UpdateRule() const; diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx index c1f8226e8ae0..71d986453338 100644 --- a/connectivity/source/inc/ado/WrapTable.hxx +++ b/connectivity/source/inc/ado/WrapTable.hxx @@ -38,9 +38,9 @@ namespace connectivity void Create(); - ::rtl::OUString get_Name() const; - void put_Name(const ::rtl::OUString& _rName); - ::rtl::OUString get_Type() const; + OUString get_Name() const; + void put_Name(const OUString& _rName); + OUString get_Type() const; WpADOColumns get_Columns() const; WpADOIndexes get_Indexes() const; WpADOKeys get_Keys() const; diff --git a/connectivity/source/inc/calc/CColumns.hxx b/connectivity/source/inc/calc/CColumns.hxx index 22592e364d4c..38b5b3da9f81 100644 --- a/connectivity/source/inc/calc/CColumns.hxx +++ b/connectivity/source/inc/calc/CColumns.hxx @@ -29,7 +29,7 @@ namespace connectivity class OCalcColumns : public file::OColumns { protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); public: OCalcColumns(file::OFileTable* _pTable, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx index 7699e3fa7890..994799f460e4 100644 --- a/connectivity/source/inc/calc/CConnection.hxx +++ b/connectivity/source/inc/calc/CConnection.hxx @@ -36,7 +36,7 @@ namespace connectivity { // the spreadsheet document: ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > m_xDoc; - ::rtl::OUString m_sPassword; + OUString m_sPassword; String m_aFileName; oslInterlockedCount m_nDocCount; @@ -44,7 +44,7 @@ namespace connectivity OCalcConnection(ODriver* _pDriver); virtual ~OCalcConnection(); - virtual void construct(const ::rtl::OUString& _rUrl, + virtual void construct(const OUString& _rUrl, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); @@ -58,8 +58,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // no interface methods ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument> acquireDoc(); diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx index ade137a506f7..59e7dea48188 100644 --- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx +++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx @@ -33,14 +33,14 @@ namespace connectivity class OCalcDatabaseMetaData : public file::ODatabaseMetaData { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: virtual ~OCalcDatabaseMetaData(); public: diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx index 9a02bd865948..782aa9e3d52e 100644 --- a/connectivity/source/inc/calc/CDriver.hxx +++ b/connectivity/source/inc/calc/CDriver.hxx @@ -38,17 +38,17 @@ namespace connectivity ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : file::OFileDriver(_rxFactory){} - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // XDriver virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL - connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< + connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 1072d426924e..ed9bd30e3476 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -39,7 +39,7 @@ namespace connectivity typedef file::OFileTable OCalcTable_BASE; class OCalcConnection; - typedef ::std::map< ::rtl::OUString, + typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; @@ -69,11 +69,11 @@ namespace connectivity public: OCalcTable( sdbcx::OCollection* _pTables,OCalcConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); virtual sal_Int32 getCurrentLastPos() const; diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx index 0e40a0658139..aa584ed7a69c 100644 --- a/connectivity/source/inc/calc/CTables.hxx +++ b/connectivity/source/inc/calc/CTables.hxx @@ -31,7 +31,7 @@ namespace connectivity class OCalcTables : public OCalcTables_BASE { protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); public: OCalcTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : OCalcTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx index 71e6de1be573..1abf17341fae 100644 --- a/connectivity/source/inc/dbase/DColumns.hxx +++ b/connectivity/source/inc/dbase/DColumns.hxx @@ -29,11 +29,11 @@ namespace connectivity class ODbaseColumns : public file::OColumns { protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: ODbaseColumns(file::OFileTable* _pTable, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx index 402df5296560..50965fc6c7ea 100644 --- a/connectivity/source/inc/dbase/DConnection.hxx +++ b/connectivity/source/inc/dbase/DConnection.hxx @@ -41,8 +41,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx index 58ab370fa6b3..8a664e034ae6 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx @@ -34,9 +34,9 @@ namespace connectivity { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx index 95e3b6994aaf..6e354fd0a249 100644 --- a/connectivity/source/inc/dbase/DDriver.hxx +++ b/connectivity/source/inc/dbase/DDriver.hxx @@ -37,14 +37,14 @@ namespace connectivity ODriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : file::OFileDriver(_rxFactory){} // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - // static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + // static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index 2ecf2723a06c..7a0bb52dc749 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -83,15 +83,15 @@ namespace connectivity ODbaseTable* m_pTable; sal_Bool m_bUseCollector : 1; // Use the Garbage Collector - ::rtl::OUString getCompletePath(); + OUString getCompletePath(); void closeImpl(); // Closes and kills the index file and throws an error - void impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::rtl::OUString& _sFile); + void impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile); protected: virtual ~ODbaseIndex(); public: ODbaseIndex(ODbaseTable* _pTable); - ODbaseIndex(ODbaseTable* _pTable,const NDXHeader& _aHeader,const ::rtl::OUString& _Name); + ODbaseIndex(ODbaseTable* _pTable,const NDXHeader& _aHeader,const OUString& _Name); sal_Bool openIndexFile(); virtual void refreshColumns(); diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx index c1a0853793e5..a6772264da47 100644 --- a/connectivity/source/inc/dbase/DIndexColumns.hxx +++ b/connectivity/source/inc/dbase/DIndexColumns.hxx @@ -32,10 +32,10 @@ namespace connectivity { ODbaseIndex* m_pIndex; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); public: ODbaseIndexColumns( ODbaseIndex* _pIndex, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx index 9db669f6cd60..773797f457a3 100644 --- a/connectivity/source/inc/dbase/DIndexes.hxx +++ b/connectivity/source/inc/dbase/DIndexes.hxx @@ -35,11 +35,11 @@ namespace connectivity { ODbaseTable* m_pTable; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: ODbaseIndexes(ODbaseTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector) diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 691b65469ed2..820a529e0f74 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -33,7 +33,7 @@ namespace connectivity typedef file::OFileTable ODbaseTable_BASE; class ODbaseConnection; - typedef ::std::map< ::rtl::OUString, + typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; class ODbaseTable : public ODbaseTable_BASE @@ -112,8 +112,8 @@ namespace connectivity void AllocBuffer(); void throwInvalidDbaseFormat(); - void SAL_CALL renameImpl( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - void throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl::OUString& _sColumnName); + void SAL_CALL renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + void throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName); protected: virtual void FileClose(); @@ -126,11 +126,11 @@ namespace connectivity public: ODbaseTable( sdbcx::OCollection* _pTables,ODbaseConnection* _pConnection); ODbaseTable( sdbcx::OCollection* _pTables,ODbaseConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); void construct(); // can throw any exception @@ -148,10 +148,10 @@ namespace connectivity virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // XAlterTable - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); sal_Bool DropImpl(); sal_Bool CreateImpl(); @@ -164,8 +164,8 @@ namespace connectivity virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor); virtual void dropColumn(sal_Int32 _nPos); - static String getEntry(file::OConnection* _pConnection,const ::rtl::OUString& _sURL ); - static sal_Bool Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes ); + static String getEntry(file::OConnection* _pConnection,const OUString& _sURL ); + static sal_Bool Drop_Static(const OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes ); virtual void refreshHeader(); diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx index eb08d03fff7e..c71a9669e275 100644 --- a/connectivity/source/inc/dbase/DTables.hxx +++ b/connectivity/source/inc/dbase/DTables.hxx @@ -32,11 +32,11 @@ namespace connectivity class ODbaseTables : public ODbaseTables_BASE { protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: ODbaseTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : ODbaseTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 4547e95ac204..0060c082e53f 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -48,7 +48,7 @@ namespace connectivity public: ONDXKey(sal_uInt32 nRec=0); ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec); - ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec = 0); + ONDXKey(const OUString& aStr, sal_uInt32 nRec = 0); ONDXKey(double aVal, sal_uInt32 nRec = 0); inline ONDXKey(const ONDXKey& rKey); @@ -255,7 +255,7 @@ namespace connectivity // } -// inline ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec) +// inline ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec) // : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR) // ,nRecord(nRec) // { diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx index 5f7f0934cf27..a8a264557e97 100644 --- a/connectivity/source/inc/file/FCatalog.hxx +++ b/connectivity/source/inc/file/FCatalog.hxx @@ -40,7 +40,7 @@ namespace connectivity @param _xRow The current row from the resultset given to fillNames. */ - virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); + virtual OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); public: virtual void refreshTables(); diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx index 38a86b16925f..96432aa14a0c 100644 --- a/connectivity/source/inc/file/FColumns.hxx +++ b/connectivity/source/inc/file/FColumns.hxx @@ -35,7 +35,7 @@ namespace connectivity protected: OFileTable* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OColumns( OFileTable* _pTable, diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 0d5409c57d08..75bedc1fa838 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -72,14 +72,14 @@ namespace connectivity bool m_bDefaultTextEncoding; - void throwUrlNotValid(const ::rtl::OUString & _rsUrl,const ::rtl::OUString & _rsMessage); + void throwUrlNotValid(const OUString & _rsUrl,const OUString & _rsMessage); virtual ~OConnection(); public: OConnection(OFileDriver* _pDriver); - virtual void construct(const ::rtl::OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); + virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); @@ -93,9 +93,9 @@ namespace connectivity // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -104,8 +104,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx index a6a63554062d..9bce3b82693f 100644 --- a/connectivity/source/inc/file/FDatabaseMetaData.hxx +++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx @@ -37,9 +37,9 @@ namespace connectivity { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information - virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual ::rtl::OUString impl_getCatalogSeparator_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); @@ -59,17 +59,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -80,13 +80,13 @@ namespace connectivity virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -112,9 +112,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -163,10 +163,10 @@ namespace connectivity virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -181,7 +181,7 @@ namespace connectivity virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx index 927d07cc5a82..ca31071b41df 100644 --- a/connectivity/source/inc/file/FDriver.hxx +++ b/connectivity/source/inc/file/FDriver.hxx @@ -50,24 +50,24 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); // XDataDefinitionSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getFactory() const { return m_xFactory; } }; diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index 82bf3880265f..8cb06d017c83 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -45,7 +45,7 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - ::rtl::OUString m_aSql; + OUString m_aSql; OValueRefRow m_aParameterRow; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; @@ -74,7 +74,7 @@ namespace connectivity // a Constructor, that is needed for when Returning the Object is needed: OPreparedStatement( OConnection* _pConnection); - virtual void construct(const ::rtl::OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void construct(const OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(void); @@ -92,7 +92,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -100,7 +100,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index ffd457582729..fe60f07e4bf7 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -119,7 +119,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xColsIdx; // table columns - ::rtl::OUString m_aTableRange; + OUString m_aTableRange; rtl_TextEncoding m_nTextEncoding; sal_Int32 m_nRowPos; sal_Int32 m_nFilePos; @@ -213,7 +213,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -257,7 +257,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -267,7 +267,7 @@ namespace connectivity virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx index a18a03724819..8caea102a9e8 100644 --- a/connectivity/source/inc/file/FResultSetMetaData.hxx +++ b/connectivity/source/inc/file/FResultSetMetaData.hxx @@ -39,7 +39,7 @@ namespace connectivity class OOO_DLLPUBLIC_FILE OResultSetMetaData : public OResultSetMetaData_BASE { - ::rtl::OUString m_aTableName; + OUString m_aTableName; ::rtl::Reference m_xColumns; OFileTable* m_pTable; @@ -48,7 +48,7 @@ namespace connectivity virtual ~OResultSetMetaData(); public: // a Constructor, that is needed for when Returning the Object is needed: - OResultSetMetaData(const ::rtl::Reference& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable); + OResultSetMetaData(const ::rtl::Reference& _rxColumns,const OUString& _aTableName,OFileTable* _pTable); /// Avoid ambigous cast error from the compiler. inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() @@ -62,19 +62,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index a0772b3d472f..b11d07dcb190 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -93,7 +93,7 @@ namespace connectivity ORefAssignValues m_aAssignValues; // needed for insert,update and parameters // to compare with the restrictions - ::rtl::OUString m_aCursorName; + OUString m_aCursorName; sal_Int32 m_nMaxFieldSize; sal_Int32 m_nMaxRows; sal_Int32 m_nQueryTimeOut; @@ -147,7 +147,7 @@ namespace connectivity using OStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; - virtual void construct(const ::rtl::OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void construct(const OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(void); @@ -203,9 +203,9 @@ namespace connectivity virtual void SAL_CALL release() throw(); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; }; } diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index c07712029b81..70debbeefd18 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -56,11 +56,11 @@ namespace connectivity public: OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection); OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); //XInterface @@ -85,9 +85,9 @@ namespace connectivity // refresh the header of file based tables to see changes done by someone virtual void refreshHeader(); - ::rtl::OUString SAL_CALL getName() throw() { return m_Name; } + OUString SAL_CALL getName() throw() { return m_Name; } - ::rtl::OUString getSchema() { return m_SchemaName; } + OUString getSchema() { return m_SchemaName; } sal_Bool isReadOnly() const { return !m_bWriteable; } // m_pFileStream && !m_pFileStream->IsWritable(); } // com::sun::star::lang::XUnoTunnel diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx index b496c21853cf..304c6e653e8f 100644 --- a/connectivity/source/inc/file/FTables.hxx +++ b/connectivity/source/inc/file/FTables.hxx @@ -34,7 +34,7 @@ namespace connectivity protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 33ebc032d0b4..752b9a253c1a 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -147,7 +147,7 @@ namespace connectivity class OOperandConst : public OOperandValue { public: - OOperandConst(const connectivity::OSQLParseNode& rColumnRef, const rtl::OUString& aStrValue); + OOperandConst(const connectivity::OSQLParseNode& rColumnRef, const OUString& aStrValue); TYPEINFO(); }; diff --git a/connectivity/source/inc/flat/EColumns.hxx b/connectivity/source/inc/flat/EColumns.hxx index 924958309837..5330db8578c5 100644 --- a/connectivity/source/inc/flat/EColumns.hxx +++ b/connectivity/source/inc/flat/EColumns.hxx @@ -29,7 +29,7 @@ namespace connectivity class OFlatColumns : public file::OColumns { protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); public: OFlatColumns(file::OFileTable* _pTable, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx index 253f94f3ed81..37e68a06a5c8 100644 --- a/connectivity/source/inc/flat/EConnection.hxx +++ b/connectivity/source/inc/flat/EConnection.hxx @@ -40,7 +40,7 @@ namespace connectivity OFlatConnection(ODriver* _pDriver); virtual ~OFlatConnection(); - virtual void construct(const ::rtl::OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); + virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); // own methods inline sal_Bool isHeaderLine() const { return m_bHeaderLine; } @@ -56,8 +56,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx index b1bd5a8df292..6d193047d519 100644 --- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx +++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx @@ -38,8 +38,8 @@ namespace connectivity public: OFlatDatabaseMetaData(file::OConnection* _pCon); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx index c82045ad293f..9c9bc0e23035 100644 --- a/connectivity/source/inc/flat/EDriver.hxx +++ b/connectivity/source/inc/flat/EDriver.hxx @@ -37,14 +37,14 @@ namespace connectivity ODriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : file::OFileDriver(_rxFactory){} // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - // static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + // static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index 74e23954a12d..ea8f504c89f6 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -34,7 +34,7 @@ namespace connectivity typedef file::OFileTable OFlatTable_BASE; class OFlatConnection; - typedef ::std::map< ::rtl::OUString, + typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; typedef ::std::map TRowPositionsInFile; @@ -69,11 +69,11 @@ namespace connectivity public: // DECLARE_CTY_DEFAULTS( OFlatTable_BASE); OFlatTable( sdbcx::OCollection* _pTables,OFlatConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); void construct(); // can throw any exception diff --git a/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx index 21ae70e5c9ef..39be0775bd58 100644 --- a/connectivity/source/inc/flat/ETables.hxx +++ b/connectivity/source/inc/flat/ETables.hxx @@ -32,7 +32,7 @@ namespace connectivity class OFlatTables : public OFlatTables_BASE { protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); public: OFlatTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : OFlatTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx index f60a87f3abc8..91c770c53ebb 100644 --- a/connectivity/source/inc/hsqldb/HCatalog.hxx +++ b/connectivity/source/inc/hsqldb/HCatalog.hxx @@ -38,7 +38,7 @@ namespace connectivity @param _rNames The container for the names to be filled. */ - void refreshObjects(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames); + void refreshObjects(const ::com::sun::star::uno::Sequence< OUString >& _sKindOfObject,TStringVector& _rNames); public: // implementation of the pure virtual methods diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx index f3465f6cb4c5..7b763a3aa054 100644 --- a/connectivity/source/inc/hsqldb/HColumns.hxx +++ b/connectivity/source/inc/hsqldb/HColumns.hxx @@ -45,7 +45,7 @@ namespace connectivity class OHSQLColumn : public OHSQLColumn_BASE, public OHSQLColumn_PROP { - ::rtl::OUString m_sAutoIncrement; + OUString m_sAutoIncrement; protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); @@ -54,7 +54,7 @@ namespace connectivity OHSQLColumn(sal_Bool _bCase); virtual void construct(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index 408d26c4e434..60e37ecae58d 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -90,8 +90,8 @@ namespace connectivity virtual void SAL_CALL removeFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException); // XTableUIProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const ::rtl::OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const ::rtl::OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); private: @@ -116,11 +116,11 @@ namespace connectivity @precond We're not disposed. */ - void impl_checkExistingTable_throw( const ::rtl::OUString& _rTableName ); + void impl_checkExistingTable_throw( const OUString& _rTableName ); /** checks whether the given table name refers to a HSQL TEXT TABLE */ - bool impl_isTextTable_nothrow( const ::rtl::OUString& _rTableName ); + bool impl_isTextTable_nothrow( const OUString& _rTableName ); /** retrieves the icon for HSQL TEXT TABLEs */ diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 45cac22c8cf7..4c6219e7108f 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -48,7 +48,7 @@ namespace connectivity > ODriverDelegator_BASE; typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,::com::sun::star::uno::WeakReferenceHelper> TWeakRefPair; - typedef ::std::pair< ::rtl::OUString ,TWeakRefPair > TWeakConnectionPair; + typedef ::std::pair< OUString ,TWeakRefPair > TWeakConnectionPair; typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; typedef ::std::vector< TWeakPair > TWeakPairVector; @@ -87,19 +87,19 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException); // XDataDefinitionSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XCreateCatalog virtual void SAL_CALL createCatalog( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx index ed5c6bc96bad..19bdad5513cc 100644 --- a/connectivity/source/inc/hsqldb/HStorageMap.hxx +++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx @@ -51,7 +51,7 @@ namespace connectivity DECLARE_STL_USTRINGACCESS_MAP(::boost::shared_ptr,TStreamMap); - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >, ::rtl::OUString > TStorageURLPair; + typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >, OUString > TStorageURLPair; typedef ::std::pair< TStorageURLPair, TStreamMap> TStoragePair; DECLARE_STL_USTRINGACCESS_MAP(TStoragePair,TStorages); /** contains all storages so far accessed. @@ -59,18 +59,18 @@ namespace connectivity class StorageContainer { public: - static ::rtl::OUString registerStorage(const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& _xStorage,const ::rtl::OUString& _sURL); - static TStorages::mapped_type getRegisteredStorage(const ::rtl::OUString& _sKey); - static ::rtl::OUString getRegisteredKey(const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& _xStorage); - static void revokeStorage(const ::rtl::OUString& _sKey,const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener>& _xListener); + static OUString registerStorage(const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& _xStorage,const OUString& _sURL); + static TStorages::mapped_type getRegisteredStorage(const OUString& _sKey); + static OUString getRegisteredKey(const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& _xStorage); + static void revokeStorage(const OUString& _sKey,const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener>& _xListener); static TStreamMap::mapped_type registerStream(JNIEnv * env,jstring name, jstring key,sal_Int32 _nMode); static void revokeStream(JNIEnv * env,jstring name, jstring key); static TStreamMap::mapped_type getRegisteredStream( JNIEnv * env, jstring name, jstring key); - static ::rtl::OUString jstring2ustring(JNIEnv * env, jstring jstr); - static ::rtl::OUString removeURLPrefix(const ::rtl::OUString& _sURL,const ::rtl::OUString& _sFileURL); - static ::rtl::OUString removeOldURLPrefix(const ::rtl::OUString& _sURL); + static OUString jstring2ustring(JNIEnv * env, jstring jstr); + static OUString removeURLPrefix(const OUString& _sURL,const OUString& _sFileURL); + static OUString removeOldURLPrefix(const OUString& _sURL); static void throwJavaException(const ::com::sun::star::uno::Exception& _aException,JNIEnv * env); }; //........................................................................ diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx index 637e4702e831..d1a62e2e393b 100644 --- a/connectivity/source/inc/hsqldb/HTable.hxx +++ b/connectivity/source/inc/hsqldb/HTable.hxx @@ -29,7 +29,7 @@ namespace connectivity namespace hsqldb { - ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); + OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class OHSQLTable; typedef ::comphelper::OIdPropertyArrayUsageHelper< OHSQLTable > OHSQLTable_PROP; @@ -42,7 +42,7 @@ namespace connectivity @param _rStatement The statement to execute. */ - void executeStatement(const ::rtl::OUString& _rStatement ); + void executeStatement(const OUString& _rStatement ); protected: /** creates the column collection for the table @@ -80,11 +80,11 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); OHSQLTable( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString(), + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString(), sal_Int32 _nPrivileges = 0 ); @@ -98,20 +98,20 @@ namespace connectivity //XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // XAlterTable - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); /** returns the ALTER TABLE XXX COLUMN statement */ - ::rtl::OUString getAlterTableColumnPart(); + OUString getAlterTableColumnPart(); // some methods to alter table structures - void alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rColName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor); - void alterDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName); - void dropDefaultValue(const ::rtl::OUString& _sNewDefault); + void alterColumnType(sal_Int32 nNewType,const OUString& _rColName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor); + void alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName); + void dropDefaultValue(const OUString& _sNewDefault); }; } diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx index 2f0e0dfd81e4..e0a90bafa39e 100644 --- a/connectivity/source/inc/hsqldb/HTables.hxx +++ b/connectivity/source/inc/hsqldb/HTables.hxx @@ -30,14 +30,14 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); void createTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual ::rtl::OUString getNameForObject(const sdbcx::ObjectType& _xObject); + virtual OUString getNameForObject(const sdbcx::ObjectType& _xObject); public: OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector) @@ -48,21 +48,21 @@ namespace connectivity virtual void SAL_CALL disposing(void); // XDrop - void appendNew(const ::rtl::OUString& _rsNewTable); + void appendNew(const OUString& _rsNewTable); // some helper functions /** returns a sql string which contains the column definition part for create or alter statements */ - static ::rtl::OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); + static OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); /** returns the "not null" part or the default part of the table statement */ - static ::rtl::OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); + static OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); /** returns the corresponding typename can contain () which have to filled with values */ - static ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); + static OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); }; } } diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx index 03c3c274468e..f243b60247cc 100644 --- a/connectivity/source/inc/hsqldb/HTools.hxx +++ b/connectivity/source/inc/hsqldb/HTools.hxx @@ -41,8 +41,8 @@ namespace connectivity { namespace hsqldb have the short form (TABLE_CAT instead of TABLE_CATALOG, and so on) */ static void appendTableFilterCrit( - ::rtl::OUStringBuffer& _inout_rBuffer, const ::rtl::OUString& _rCatalog, - const ::rtl::OUString _rSchema, const ::rtl::OUString _rName, + OUStringBuffer& _inout_rBuffer, const OUString& _rCatalog, + const OUString _rSchema, const OUString _rName, bool _bShortForm ); }; diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx index c02cc0744aba..9594bf37cb4c 100644 --- a/connectivity/source/inc/hsqldb/HUser.hxx +++ b/connectivity/source/inc/hsqldb/HUser.hxx @@ -33,22 +33,22 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::rtl::OUString getPrivilegeString(sal_Int32 nRights) const; + OUString getPrivilegeString(sal_Int32 nRights) const; // return the privileges and additional the grant rights - void findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: virtual void refreshGroups(); public: OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::rtl::OUString& _Name); + OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& _Name); // XUser - virtual void SAL_CALL changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; class OUserExtend; @@ -58,7 +58,7 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx index f72d774de610..b9a4a4bd100e 100644 --- a/connectivity/source/inc/hsqldb/HUsers.hxx +++ b/connectivity/source/inc/hsqldb/HUsers.hxx @@ -35,11 +35,11 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; connectivity::sdbcx::IRefreshableUsers* m_pParent; public: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx index 52ee16589cca..a6a05e197040 100644 --- a/connectivity/source/inc/hsqldb/HView.hxx +++ b/connectivity/source/inc/hsqldb/HView.hxx @@ -44,8 +44,8 @@ namespace connectivity { namespace hsqldb HView( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, sal_Bool _bCaseSensitive, - const ::rtl::OUString& _rSchemaName, - const ::rtl::OUString& _rName + const OUString& _rSchemaName, + const OUString& _rName ); // UNO @@ -53,7 +53,7 @@ namespace connectivity { namespace hsqldb DECLARE_XTYPEPROVIDER() // XAlterView - virtual void SAL_CALL alterCommand( const ::rtl::OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterCommand( const OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: virtual ~HView(); @@ -72,7 +72,7 @@ namespace connectivity { namespace hsqldb if an error occurs while retrieving the command from the database and _bAllowSQLException is */ - ::rtl::OUString impl_getCommand_throw( bool _bAllowSQLException ) const; + OUString impl_getCommand_throw( bool _bAllowSQLException ) const; private: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx index ff555a45f7e8..a4fc4b348683 100644 --- a/connectivity/source/inc/hsqldb/HViews.hxx +++ b/connectivity/source/inc/hsqldb/HViews.hxx @@ -32,11 +32,11 @@ namespace connectivity sal_Bool m_bInDrop; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); void createView( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); public: @@ -47,7 +47,7 @@ namespace connectivity // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); - void dropByNameImpl(const ::rtl::OUString& elementName); + void dropByNameImpl(const OUString& elementName); }; } } diff --git a/connectivity/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx index 7c75aec93b26..be605e23761c 100644 --- a/connectivity/source/inc/internalnode.hxx +++ b/connectivity/source/inc/internalnode.hxx @@ -35,10 +35,10 @@ namespace connectivity OSQLInternalNode(const sal_Char* pNewValue, SQLNodeType eNodeType, sal_uInt32 nNodeID = 0); - OSQLInternalNode(const ::rtl::OString& _rNewValue, + OSQLInternalNode(const OString& _rNewValue, SQLNodeType eNodeType, sal_uInt32 nNodeID = 0); - OSQLInternalNode(const ::rtl::OUString& _rNewValue, + OSQLInternalNode(const OUString& _rNewValue, SQLNodeType eNodeType, sal_uInt32 nNodeID = 0); diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx index e4abacdaaa9d..136fc2a29543 100644 --- a/connectivity/source/inc/java/lang/Class.hxx +++ b/connectivity/source/inc/java/lang/Class.hxx @@ -36,7 +36,7 @@ namespace connectivity // a Constructor, that is needed for when Returning the Object is needed: java_lang_Class( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} - static java_lang_Class * forName( const ::rtl::OUString &_par0 ); + static java_lang_Class * forName( const OUString &_par0 ); // return the jre object jobject newInstanceObject(); diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index 147567db3488..15779ba49545 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -98,7 +98,7 @@ namespace connectivity void clearObject(JNIEnv& rEnv); void clearObject(); - virtual ::rtl::OUString toString() const; + virtual OUString toString() const; static void ThrowSQLException(JNIEnv * pEnv,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext); static void ThrowLoggedSQLException( @@ -117,13 +117,13 @@ namespace connectivity jobject callResultSetMethod( JNIEnv& _rEnv, const char* _pMethodName, jmethodID& _inout_MethodID ) const; sal_Int32 callIntMethod( const char* _pMethodName, jmethodID& _inout_MethodID,bool _bIgnoreException = false ) const; sal_Int32 callIntMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const; - sal_Int32 callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const ::rtl::OUString& _nArgument ) const; - ::rtl::OUString callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const; - ::rtl::OUString callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const; + sal_Int32 callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const; + OUString callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const; + OUString callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const; void callVoidMethod( const char* _pMethodName, jmethodID& _inout_MethodID) const; void callVoidMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException = false ) const; void callVoidMethodWithBoolArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException = false ) const; - void callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID, const ::rtl::OUString& _nArgument ) const; + void callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID, const OUString& _nArgument ) const; jobject callObjectMethod( JNIEnv * pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID ) const; jobject callObjectMethodWithIntArg( JNIEnv * pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const; diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx index 66fa163af0dd..efb3b1b82b60 100644 --- a/connectivity/source/inc/java/lang/String.hxx +++ b/connectivity/source/inc/java/lang/String.hxx @@ -34,7 +34,7 @@ namespace connectivity // a Constructor, that is needed for when Returning the Object is needed: java_lang_String( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} - operator ::rtl::OUString(); + operator OUString(); static jclass st_getMyClass(); }; diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx index 071695f001e3..483af2beba10 100644 --- a/connectivity/source/inc/java/lang/Throwable.hxx +++ b/connectivity/source/inc/java/lang/Throwable.hxx @@ -36,8 +36,8 @@ namespace connectivity virtual ~java_lang_Throwable(); // a Constructor, that is needed for when Returning the Object is needed: java_lang_Throwable( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} - ::rtl::OUString getMessage() const; - ::rtl::OUString getLocalizedMessage() const; + OUString getMessage() const; + OUString getLocalizedMessage() const; #if OSL_DEBUG_LEVEL > 0 void printStackTrace() const; diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx index 9e4551c9ca16..3a8484e71cb9 100644 --- a/connectivity/source/inc/java/math/BigDecimal.hxx +++ b/connectivity/source/inc/java/math/BigDecimal.hxx @@ -35,7 +35,7 @@ namespace connectivity // a Constructor, that is needed for when Returning the Object is needed: java_math_BigDecimal( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} - java_math_BigDecimal( const ::rtl::OUString& _par0 ); + java_math_BigDecimal( const OUString& _par0 ); java_math_BigDecimal( const double& _par0 ); }; } diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx index 142ea2a25a65..146935ca22e6 100644 --- a/connectivity/source/inc/java/sql/Array.hxx +++ b/connectivity/source/inc/java/sql/Array.hxx @@ -42,7 +42,7 @@ namespace connectivity java_sql_Array( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} // XArray - virtual ::rtl::OUString SAL_CALL getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getBaseType( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getArray( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getArrayAtIndex( sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx index a7f7f3df9e12..fb6d585c795c 100644 --- a/connectivity/source/inc/java/sql/CallableStatement.hxx +++ b/connectivity/source/inc/java/sql/CallableStatement.hxx @@ -45,7 +45,7 @@ namespace connectivity virtual jclass getMyClass() const; // A ctor that is needed for returning the object - java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const ::rtl::OUString& sql ); + java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const OUString& sql ); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); @@ -55,7 +55,7 @@ namespace connectivity // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -75,7 +75,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XOutParameters - virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx index f59d094fef24..812d64cc1481 100644 --- a/connectivity/source/inc/java/sql/Clob.hxx +++ b/connectivity/source/inc/java/sql/Clob.hxx @@ -45,9 +45,9 @@ namespace connectivity // XClob virtual sal_Int64 SAL_CALL length( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubString( sal_Int64 pos, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubString( sal_Int64 pos, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL position( const ::rtl::OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int64 SAL_CALL position( const OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int64 SAL_CALL positionOfClob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& pattern, sal_Int64 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx index 3af3d3c5e849..148a8d7e7195 100644 --- a/connectivity/source/inc/java/sql/Connection.hxx +++ b/connectivity/source/inc/java/sql/Connection.hxx @@ -64,17 +64,17 @@ namespace connectivity @return The new statement witgh unnamed parameters. */ - ::rtl::OUString transFormPreparedStatement(const ::rtl::OUString& _sSQL); + OUString transFormPreparedStatement(const OUString& _sSQL); void loadDriverFromProperties( - const ::rtl::OUString& _sDriverClass, - const ::rtl::OUString& _sDriverClassPath, + const OUString& _sDriverClass, + const OUString& _sDriverClassPath, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rSystemProperties ); /** load driver class path from system configuration. @param _sDriverClass The driver class name to look for in the configuration. */ - ::rtl::OUString impl_getJavaDriverClassPath_nothrow(const ::rtl::OUString& _sDriverClass); + OUString impl_getJavaDriverClassPath_nothrow(const OUString& _sDriverClass); protected: // Static data for the class @@ -88,7 +88,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); // A ctor that is needed for returning the object java_sql_Connection( const java_sql_Driver& _rDriver ); - sal_Bool construct( const ::rtl::OUString& url, + sal_Bool construct( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info); const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& @@ -116,9 +116,9 @@ namespace connectivity // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -127,8 +127,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx index 09fd0508d4c6..49c835bde32a 100644 --- a/connectivity/source/inc/java/sql/ConnectionLog.hxx +++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx @@ -40,9 +40,9 @@ namespace comphelper { namespace log { namespace convert //........................................................................ // helpers for logging more data types than are defined in comphelper/logging.hxx - ::rtl::OUString convertLogArgToString( const ::com::sun::star::util::Date& _rDate ); - ::rtl::OUString convertLogArgToString( const ::com::sun::star::util::Time& _rTime ); - ::rtl::OUString convertLogArgToString( const ::com::sun::star::util::DateTime& _rDateTime ); + OUString convertLogArgToString( const ::com::sun::star::util::Date& _rDate ); + OUString convertLogArgToString( const ::com::sun::star::util::Time& _rTime ); + OUString convertLogArgToString( const ::com::sun::star::util::DateTime& _rDateTime ); //........................................................................ } } } diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx index 697de5b820b3..beff52b65402 100644 --- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx +++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx @@ -50,9 +50,9 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information - virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual ::rtl::OUString impl_getCatalogSeparator_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); @@ -66,17 +66,17 @@ namespace connectivity virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -87,13 +87,13 @@ namespace connectivity virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -119,9 +119,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -169,22 +169,22 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -197,19 +197,19 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); private: sal_Bool impl_callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID ); - ::rtl::OUString impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ); + OUString impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ); sal_Int32 impl_callIntMethod( const char* _pMethodName, jmethodID& _inout_MethodID ); sal_Bool impl_callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_callResultSetMethod( const char* _pMethodName, jmethodID& _inout_MethodID ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_callResultSetMethodWithStrings( const char* _pMethodName, jmethodID& _inout_MethodID, const ::com::sun::star::uno::Any& _rCatalog, - const ::rtl::OUString& _rSchemaPattern, const ::rtl::OUString& _rLeastPattern, - const ::rtl::OUString* _pOptionalAdditionalString = NULL); + const OUString& _rSchemaPattern, const OUString& _rLeastPattern, + const OUString* _pOptionalAdditionalString = NULL); }; } #endif // _CONNECTIVITY_JAVA_SQL_DATABASEMETADATA_HXX_ diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx index 838ce18ef542..1f17a5078432 100644 --- a/connectivity/source/inc/java/sql/Driver.hxx +++ b/connectivity/source/inc/java/sql/Driver.hxx @@ -42,18 +42,18 @@ namespace connectivity public: java_sql_Driver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); - static rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException) ; virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx index c49dc66b60e5..0080bf273e66 100644 --- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx +++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx @@ -41,11 +41,11 @@ namespace connectivity java_sql_DriverPropertyInfo( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} operator ::com::sun::star::sdbc::DriverPropertyInfo(); - ::rtl::OUString name(); - ::rtl::OUString description(); - ::rtl::OUString value(); + OUString name(); + OUString description(); + OUString value(); sal_Bool required(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> choices(); + ::com::sun::star::uno::Sequence< OUString> choices(); }; } diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index 432fcf58a982..ebe18c49ee09 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -67,7 +67,7 @@ namespace connectivity sal_Int32 getResultSetType() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchDirection() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString getCursorName() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setQueryTimeOut(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setMaxFieldSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -76,14 +76,14 @@ namespace connectivity void setResultSetType(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void setCursorName(const ::rtl::OUString &_par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void setCursorName(const OUString &_par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setEscapeProcessing(sal_Bool _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> m_xGeneratedStatement; java_sql_Connection* m_pConnection; java::sql::ConnectionLog m_aLogger; - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; // Properties sal_Int32 m_nResultSetConcurrency; sal_Int32 m_nResultSetType; @@ -143,9 +143,9 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -202,7 +202,7 @@ namespace connectivity virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XBatchExecution - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx index 711490807a61..c6024ad5d514 100644 --- a/connectivity/source/inc/java/sql/PreparedStatement.hxx +++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx @@ -50,7 +50,7 @@ namespace connectivity virtual jclass getMyClass() const; // A ctor that is needed for returning the object - java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const ::rtl::OUString& sql ); + java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const OUString& sql ); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); @@ -65,7 +65,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -73,7 +73,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx index 0f538d9eb306..67d316536414 100644 --- a/connectivity/source/inc/java/sql/Ref.hxx +++ b/connectivity/source/inc/java/sql/Ref.hxx @@ -43,7 +43,7 @@ namespace connectivity java_sql_Ref( JNIEnv * pEnv, jobject myObj ); // XRef - virtual ::rtl::OUString SAL_CALL getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } #endif // _CONNECTIVITY_JAVA_SQL_REF_HXX_ diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index d3ab55447b28..bf78ade2feb6 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.hxx @@ -69,7 +69,7 @@ namespace connectivity sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -136,7 +136,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -180,7 +180,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -190,7 +190,7 @@ namespace connectivity virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: using ::cppu::OPropertySetHelper::getFastPropertyValue; diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx index fc6248963905..0c9f7e81977d 100644 --- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx +++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx @@ -55,19 +55,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } #endif // _CONNECTIVITY_JAVA_SQL_RESULTSETMETADATA_HXX_ diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx index 7e98f6ef0d86..217556cda071 100644 --- a/connectivity/source/inc/java/sql/SQLException.hxx +++ b/connectivity/source/inc/java/sql/SQLException.hxx @@ -48,7 +48,7 @@ namespace connectivity // A ctor that is needed for returning the object java_sql_SQLException_BASE( JNIEnv * pEnv, jobject myObj ); - ::rtl::OUString getSQLState() const; + OUString getSQLState() const; sal_Int32 getErrorCode() const; starsdbc::SQLException getNextException() const; diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index cf5e4ca30361..7f1443e3a2dd 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.hxx @@ -37,8 +37,8 @@ namespace connectivity { - jstring convertwchar_tToJavaString(JNIEnv *pEnv,const ::rtl::OUString& _Temp); - ::rtl::OUString JavaString2String(JNIEnv *pEnv,jstring _Str); + jstring convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& _Temp); + OUString JavaString2String(JNIEnv *pEnv,jstring _Str); class java_util_Properties; java_util_Properties* createStringPropertyArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx index bf8162afdbb5..6e330b61b066 100644 --- a/connectivity/source/inc/java/util/Property.hxx +++ b/connectivity/source/inc/java/util/Property.hxx @@ -34,7 +34,7 @@ namespace connectivity // A ctor that is needed for returning the object java_util_Properties( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} java_util_Properties( ); - void setProperty(const ::rtl::OUString key, const ::rtl::OUString& value); + void setProperty(const OUString key, const OUString& value); }; } diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx index 34fe7afcfbcc..c803b16bc1e7 100644 --- a/connectivity/source/inc/mysql/YCatalog.hxx +++ b/connectivity/source/inc/mysql/YCatalog.hxx @@ -38,7 +38,7 @@ namespace connectivity @param _rNames The container for the names to be filled. */ - void refreshObjects(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames); + void refreshObjects(const ::com::sun::star::uno::Sequence< OUString >& _sKindOfObject,TStringVector& _rNames); public: // implementation of the pure virtual methods diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx index 4c01479e7dd0..bacee8199d61 100644 --- a/connectivity/source/inc/mysql/YColumns.hxx +++ b/connectivity/source/inc/mysql/YColumns.hxx @@ -45,7 +45,7 @@ namespace connectivity class OMySQLColumn : public OMySQLColumn_BASE, public OMySQLColumn_PROP { - ::rtl::OUString m_sAutoIncrement; + OUString m_sAutoIncrement; protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); @@ -54,7 +54,7 @@ namespace connectivity OMySQLColumn(sal_Bool _bCase); virtual void construct(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index a94a1711b381..38cb3b78175f 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -63,7 +63,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xODBCDriver; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xNativeDriver; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sOldDriverClass; + OUString m_sOldDriverClass; /** load the driver we want to delegate. The m_xODBCDriver or m_xDBCDriver may be if the driver could not be loaded. @@ -74,7 +74,7 @@ namespace connectivity @return The driver which was currently selected. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > loadDriver( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > loadDriver( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ); public: /** creates a new delegator for a mysql driver @@ -83,19 +83,19 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException); // XDataDefinitionSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: /// dtor virtual ~ODriverDelegator(); diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx index b28ee84a8bcc..3427feac8e2a 100644 --- a/connectivity/source/inc/mysql/YTable.hxx +++ b/connectivity/source/inc/mysql/YTable.hxx @@ -29,7 +29,7 @@ namespace connectivity namespace mysql { - ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); + OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class OMySQLTable; typedef ::comphelper::OIdPropertyArrayUsageHelper< OMySQLTable > OMySQLTable_PROP; @@ -42,7 +42,7 @@ namespace connectivity @param _rStatement The statement to execute. */ - void executeStatement(const ::rtl::OUString& _rStatement ); + void executeStatement(const OUString& _rStatement ); protected: /** creates the column collection for the table @@ -68,7 +68,7 @@ namespace connectivity * \return The start of the rename statement. * @see http://dev.mysql.com/doc/refman/5.1/de/rename-table.html */ - virtual ::rtl::OUString getRenameStart() const; + virtual OUString getRenameStart() const; /** used to implement the creation of the array helper which is shared amongst all instances of the class. This method needs to be implemented in derived classes. @@ -87,11 +87,11 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); OMySQLTable( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString(), + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString(), sal_Int32 _nPrivileges = 0 ); @@ -102,17 +102,17 @@ namespace connectivity static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // XAlterTable - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); /** returns the ALTER TABLE XXX statement */ - ::rtl::OUString getAlterTableColumnPart(); + OUString getAlterTableColumnPart(); // some methods to alter table structures - void alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rColName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor); - void alterDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName); - void dropDefaultValue(const ::rtl::OUString& _sNewDefault); + void alterColumnType(sal_Int32 nNewType,const OUString& _rColName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor); + void alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName); + void dropDefaultValue(const OUString& _sNewDefault); - virtual ::rtl::OUString getTypeCreatePattern() const; + virtual OUString getTypeCreatePattern() const; }; } } diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx index 38782d0da187..6ebd50782588 100644 --- a/connectivity/source/inc/mysql/YTables.hxx +++ b/connectivity/source/inc/mysql/YTables.hxx @@ -32,14 +32,14 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); void createTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual ::rtl::OUString getNameForObject(const sdbcx::ObjectType& _xObject); + virtual OUString getNameForObject(const sdbcx::ObjectType& _xObject); public: OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector) @@ -50,29 +50,29 @@ namespace connectivity virtual void SAL_CALL disposing(void); // XDrop - void appendNew(const ::rtl::OUString& _rsNewTable); + void appendNew(const OUString& _rsNewTable); // some helper functions /** returns a sql string which contains the column definition part for create or alter statements */ - static ::rtl::OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); + static OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); /** returns the "not null" part or the default part of the table statement */ - static ::rtl::OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); + static OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); /** returns the corresponding typename can contain () which have to filled with values */ - static ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); + static OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); /** convert the sql statement to fit MySQL notation @param _sSql in/out */ - static ::rtl::OUString adjustSQL(const ::rtl::OUString& _sSql); + static OUString adjustSQL(const OUString& _sSql); // ISQLStatementHelper - virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,::rtl::OUStringBuffer& _rOut); + virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,OUStringBuffer& _rOut); }; } } diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx index e95ea1456b58..426446c2710c 100644 --- a/connectivity/source/inc/mysql/YUser.hxx +++ b/connectivity/source/inc/mysql/YUser.hxx @@ -33,22 +33,22 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::rtl::OUString getPrivilegeString(sal_Int32 nRights) const; + OUString getPrivilegeString(sal_Int32 nRights) const; // return the privileges and additional the grant rights - void findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: virtual void refreshGroups(); public: OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::rtl::OUString& _Name); + OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& _Name); // XUser - virtual void SAL_CALL changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; class OUserExtend; @@ -58,7 +58,7 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx index f1c8abda3572..6121dda76cba 100644 --- a/connectivity/source/inc/mysql/YUsers.hxx +++ b/connectivity/source/inc/mysql/YUsers.hxx @@ -35,11 +35,11 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; connectivity::sdbcx::IRefreshableUsers* m_pParent; public: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx index 11f5bb4874fb..83fa235afdac 100644 --- a/connectivity/source/inc/mysql/YViews.hxx +++ b/connectivity/source/inc/mysql/YViews.hxx @@ -31,11 +31,11 @@ namespace connectivity sal_Bool m_bInDrop; // OCatalog* m_pParent; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); void createView( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); public: @@ -48,7 +48,7 @@ namespace connectivity // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); - void dropByNameImpl(const ::rtl::OUString& elementName); + void dropByNameImpl(const OUString& elementName); }; } } diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index acd7c1ca9d94..99126b66ad1f 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -62,7 +62,7 @@ namespace connectivity ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by // an operation - ::rtl::OUString m_sUser; // the user name + OUString m_sUser; // the user name ODBCDriver* m_pDriver; // Pointer to the owning // driver object @@ -78,13 +78,13 @@ namespace connectivity sal_Bool m_bReadOnly; - SQLRETURN OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent); + SQLRETURN OpenConnection(const OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent); virtual OConnection* cloneConnection(); // creates a new connection public: oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const; - virtual SQLRETURN Construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + virtual SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver); // OConnection(const SQLHANDLE _pConnectionHandle); @@ -101,9 +101,9 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -112,8 +112,8 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -134,7 +134,7 @@ namespace connectivity inline sal_Bool useOldDateFormat() const { return m_bUseOldDateFormat; } inline SQLHANDLE getDriverHandle() const { return m_pDriverHandleCopy;} inline ODBCDriver* getDriver() const { return m_pDriver;} - inline ::rtl::OUString getUserName() const { return m_sUser; } + inline OUString getUserName() const { return m_sUser; } SQLHANDLE createStatementHandle(); // close and free the handle and set it to SQL_NULLHANDLE diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx index 513e508992d3..ca89e8667dc9 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx @@ -41,9 +41,9 @@ namespace connectivity sal_Bool m_bOdbc3; // cached database information - virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual ::rtl::OUString impl_getCatalogSeparator_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); @@ -55,7 +55,7 @@ namespace connectivity virtual sal_Int32 impl_getMaxTablesInSelect_throw( ); virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ); protected: - ::rtl::OUString getURLImpl(); + OUString getURLImpl(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); virtual ~ODatabaseMetaData(); public: @@ -73,17 +73,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -96,13 +96,13 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -128,9 +128,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -180,22 +180,22 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -208,7 +208,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index ccbc613628fa..568efef4daa5 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -84,7 +84,7 @@ namespace connectivity sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex); sal_Int32 mapColumn (sal_Int32 column); @@ -158,7 +158,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -187,7 +187,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); const ::connectivity::TIntVector& getColumnMapping() { return m_aColMapping; } @@ -195,32 +195,32 @@ namespace connectivity void openTypeInfo() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void openCatalogs() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void openSchemas() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openTables(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) + void openTables(const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern,const ::rtl::OUString& columnNamePattern )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& procedureNamePattern)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openVersionColumns(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table,sal_Int32 scope,sal_Bool nullable )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openForeignKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString* schema,const ::rtl::OUString* table, - const ::com::sun::star::uno::Any& catalog2, const ::rtl::OUString* schema2,const ::rtl::OUString* table2)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openExportedKeys(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema,const ::rtl::OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openImportedKeys(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema,const ::rtl::OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openPrimaryKeys(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema,const ::rtl::OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openTablePrivileges(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openSpecialColumns(sal_Bool _bRowVer,const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table,sal_Int32 scope, sal_Bool nullable )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void openIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table,sal_Bool unique,sal_Bool approximate )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, + const OUString& table, const OUString& columnNamePattern )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern, const OUString& columnNamePattern )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern,const OUString& columnNamePattern )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openVersionColumns(const ::com::sun::star::uno::Any& catalog, const OUString& schema, + const OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, + const OUString& table,sal_Int32 scope,sal_Bool nullable )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openForeignKeys( const ::com::sun::star::uno::Any& catalog, const OUString* schema,const OUString* table, + const ::com::sun::star::uno::Any& catalog2, const OUString* schema2,const OUString* table2)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openExportedKeys(const ::com::sun::star::uno::Any& catalog, const OUString& schema,const OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openImportedKeys(const ::com::sun::star::uno::Any& catalog, const OUString& schema,const OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openPrimaryKeys(const ::com::sun::star::uno::Any& catalog, const OUString& schema,const OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openTablePrivileges(const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openSpecialColumns(sal_Bool _bRowVer,const ::com::sun::star::uno::Any& catalog, const OUString& schema, + const OUString& table,sal_Int32 scope, sal_Bool nullable )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void openIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, + const OUString& table,sal_Bool unique,sal_Bool approximate )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: using OPropertySetHelper::getFastPropertyValue; diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index 631642ed1aed..3510885e1370 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -46,7 +46,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; SQLHANDLE m_pDriverHandle; - virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath) = 0; + virtual SQLHANDLE EnvironmentHandle(OUString &_rPath) = 0; public: @@ -57,18 +57,18 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx index 3f749d0dd4a4..239869f00b48 100644 --- a/connectivity/source/inc/odbc/OFunctions.hxx +++ b/connectivity/source/inc/odbc/OFunctions.hxx @@ -28,8 +28,8 @@ namespace connectivity { // sal_Bool LoadFunctions(oslModule pODBCso, sal_Bool _bDS=sal_True); -// sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath); -// sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath); +// sal_Bool LoadLibrary_ODBC3(OUString &_rPath); +// sal_Bool LoadLibrary_ADABAS(OUString &_rPath); // Connecting to a data source typedef SQLRETURN (SQL_API *T3SQLAllocHandle) (SQLSMALLINT HandleType,SQLHANDLE InputHandle,SQLHANDLE * OutputHandlePtr); diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index 139ea3fda327..7bda0f98fda4 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -83,7 +83,7 @@ namespace connectivity void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, sal_Int32 _nScale, const void* _pData, SQLULEN _nDataLen, SQLLEN _nDataAllocLen); void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int32 _nColumnSize, sal_Int32 _nByteSize, void* _pData); // Wrappers for special cases - void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int16 _nScale, const ::rtl::OUString &_sData); + void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int16 _nScale, const OUString &_sData); void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, const com::sun::star::uno::Sequence< sal_Int8 > &_Data); sal_Bool isPrepared() const { return m_bPrepared;} @@ -102,7 +102,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); // A ctor, needed to return the object - OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql); + OPreparedStatement( OConnection* _pConnection,const OUString& sql); //XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -118,7 +118,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -126,7 +126,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 5d7a06cf21e4..35959a52795a 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -156,7 +156,7 @@ namespace connectivity sal_Int32 getResultSetType() const; sal_Int32 getFetchDirection() const; sal_Int32 getFetchSize() const; - ::rtl::OUString getCursorName() const; + OUString getCursorName() const; template < typename T, SQLINTEGER BufferLength > T getStmtOption (SQLINTEGER fOption, T dflt = 0) const; void setFetchDirection(sal_Int32 _par0); @@ -188,7 +188,7 @@ namespace connectivity ::com::sun::star::util::Time impl_getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::util::DateTime impl_getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int64 impl_getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString impl_getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString impl_getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence impl_getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -263,7 +263,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -307,7 +307,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -317,7 +317,7 @@ namespace connectivity virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index 54e5c4f18b6f..e87ad175c389 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx @@ -50,7 +50,7 @@ namespace connectivity sal_Int32 m_nColCount; sal_Bool m_bUseODBC2Types; - ::rtl::OUString getCharColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString getCharColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getNumColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: // A ctor that is needed for returning the object @@ -98,19 +98,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 7753dec963c0..84937e41f0f6 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -68,8 +68,8 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> m_xGeneratedStatement; // for this Statement - ::std::list< ::rtl::OUString> m_aBatchList; - ::rtl::OUString m_sSqlStatement; + ::std::list< OUString> m_aBatchList; + OUString m_sSqlStatement; OConnection* m_pConnection;// The owning Connection object SQLHANDLE m_aStatementHandle; @@ -85,7 +85,7 @@ namespace connectivity sal_Int32 getResultSetType() const; sal_Int32 getFetchDirection() const; sal_Int32 getFetchSize() const; - ::rtl::OUString getCursorName() const; + OUString getCursorName() const; sal_Bool isUsingBookmarks() const; sal_Bool getEscapeProcessing() const; template < typename T, SQLINTEGER BufferLength > T getStmtOption (SQLINTEGER fOption, T dflt = 0) const; @@ -95,7 +95,7 @@ namespace connectivity void setMaxRows(sal_Int64 _par0) ; void setFetchDirection(sal_Int32 _par0) ; void setFetchSize(sal_Int32 _par0) ; - void setCursorName(const ::rtl::OUString &_par0); + void setCursorName(const OUString &_par0); void setEscapeProcessing( const sal_Bool _bEscapeProc ); template < typename T, SQLINTEGER BufferLength > SQLRETURN setStmtOption (SQLINTEGER fOption, T value) const; @@ -106,7 +106,7 @@ namespace connectivity void reset () throw( ::com::sun::star::sdbc::SQLException); void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException); void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) throw( ::com::sun::star::sdbc::SQLException); - sal_Bool lockIfNecessary (const ::rtl::OUString& sql) throw( ::com::sun::star::sdbc::SQLException); + sal_Bool lockIfNecessary (const OUString& sql) throw( ::com::sun::star::sdbc::SQLException); sal_Int32 getColumnCount () throw( ::com::sun::star::sdbc::SQLException); //-------------------------------------------------------------------- @@ -167,9 +167,9 @@ namespace connectivity // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -231,7 +231,7 @@ namespace connectivity virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XBatchExecution - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index 68278d667867..79be84caf0d2 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.hxx @@ -109,7 +109,7 @@ namespace connectivity static void GetInfo(OConnection* _pConnection, SQLHANDLE _aConnectionHandle, SQLUSMALLINT _nInfo, - ::rtl::OUString &_rValue, + OUString &_rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -183,7 +183,7 @@ namespace connectivity SQLSMALLINT& fCType, SQLSMALLINT& fSqlType); - static ::rtl::OUString getStringValue( OConnection* _pConnection, + static OUString getStringValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _fSqlType, diff --git a/connectivity/source/inc/parse/sqlbison_exports.hxx b/connectivity/source/inc/parse/sqlbison_exports.hxx index abb47a304cba..c83befeaac19 100644 --- a/connectivity/source/inc/parse/sqlbison_exports.hxx +++ b/connectivity/source/inc/parse/sqlbison_exports.hxx @@ -14,7 +14,7 @@ #include #include -::rtl::OUString ConvertLikeToken(const ::connectivity::OSQLParseNode* pTokenNode, const ::connectivity::OSQLParseNode* pEscapeNode, sal_Bool bInternational); +OUString ConvertLikeToken(const ::connectivity::OSQLParseNode* pTokenNode, const ::connectivity::OSQLParseNode* pEscapeNode, sal_Bool bInternational); int SQLyyparse (void); void setParser( ::connectivity::OSQLParser* ); diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx index de5b4eb223af..d2b7d38180ed 100644 --- a/connectivity/source/inc/propertyids.hxx +++ b/connectivity/source/inc/propertyids.hxx @@ -33,13 +33,13 @@ namespace dbtools { ::std::map m_aPropertyMap; - ::rtl::OUString fillValue(sal_Int32 _nIndex); + OUString fillValue(sal_Int32 _nIndex); public: OPropertyMap() { } ~OPropertyMap(); - ::rtl::OUString getNameByIndex(sal_Int32 _nIndex) const; + OUString getNameByIndex(sal_Int32 _nIndex) const; }; } @@ -55,7 +55,7 @@ namespace connectivity sal_Int32 nLength; UStringDescription(PVFN _fCharFkt); - operator ::rtl::OUString() const { return ::rtl::OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); } + operator OUString() const { return OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); } ~UStringDescription(); private: UStringDescription(); diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx index 7aa65140e487..089788c524ea 100644 --- a/connectivity/source/inc/resource/sharedresources.hxx +++ b/connectivity/source/inc/resource/sharedresources.hxx @@ -48,7 +48,7 @@ namespace connectivity @return the string from the resource file */ - ::rtl::OUString + OUString getResourceString( ResourceId _nResId ) const; @@ -66,11 +66,11 @@ namespace connectivity @return the string from the resource file, with applied string substitution */ - ::rtl::OUString + OUString getResourceStringWithSubstitution( ResourceId _nResId, const sal_Char* _pAsciiPatternToReplace, - const ::rtl::OUString& _rStringToSubstitute + const OUString& _rStringToSubstitute ) const; /** loads a string from the shared resource file, and replaces @@ -90,13 +90,13 @@ namespace connectivity @return the string from the resource file, with applied string substitution */ - ::rtl::OUString + OUString getResourceStringWithSubstitution( ResourceId _nResId, const sal_Char* _pAsciiPatternToReplace1, - const ::rtl::OUString& _rStringToSubstitute1, + const OUString& _rStringToSubstitute1, const sal_Char* _pAsciiPatternToReplace2, - const ::rtl::OUString& _rStringToSubstitute2 + const OUString& _rStringToSubstitute2 ) const; /** loads a string from the shared resource file, and replaces @@ -120,15 +120,15 @@ namespace connectivity @return the string from the resource file, with applied string substitution */ - ::rtl::OUString + OUString getResourceStringWithSubstitution( ResourceId _nResId, const sal_Char* _pAsciiPatternToReplace1, - const ::rtl::OUString& _rStringToSubstitute1, + const OUString& _rStringToSubstitute1, const sal_Char* _pAsciiPatternToReplace2, - const ::rtl::OUString& _rStringToSubstitute2, + const OUString& _rStringToSubstitute2, const sal_Char* _pAsciiPatternToReplace3, - const ::rtl::OUString& _rStringToSubstitute3 + const OUString& _rStringToSubstitute3 ) const; /** loads a string from the shared resource file, and replaces a given ASCII pattern with a given string @@ -141,8 +141,8 @@ namespace connectivity @return the string from the resource file, with applied string substitution */ - ::rtl::OUString getResourceStringWithSubstitution( ResourceId _nResId, - const ::std::list< ::std::pair > _aStringToSubstitutes) const; + OUString getResourceStringWithSubstitution( ResourceId _nResId, + const ::std::list< ::std::pair > _aStringToSubstitutes) const; }; //........................................................................ diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx index d469f827e54d..dd0aa463fb3b 100644 --- a/connectivity/source/inc/sqlscan.hxx +++ b/connectivity/source/inc/sqlscan.hxx @@ -33,8 +33,8 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OSQLScanner { const IParseContext* m_pContext; // context for parse, knows all international stuff - ::rtl::OString m_sStatement; // statement to parse - ::rtl::OUString m_sErrorMessage; + OString m_sStatement; // statement to parse + OUString m_sErrorMessage; sal_Int32 m_nCurrentPos; // next position to read from the statement sal_Bool m_bInternational; // do we have a statement which may uses @@ -60,9 +60,9 @@ namespace connectivity virtual IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const; // setting the new information before scanning - void prepareScan(const ::rtl::OUString & rNewStatement, const IParseContext* pContext, sal_Bool bInternational); - const ::rtl::OUString& getErrorMessage() const {return m_sErrorMessage;} - ::rtl::OString getStatement() const { return m_sStatement; } + void prepareScan(const OUString & rNewStatement, const IParseContext* pContext, sal_Bool bInternational); + const OUString& getErrorMessage() const {return m_sErrorMessage;} + OString getStatement() const { return m_sStatement; } sal_Int32 SQLlex(); // set this as scanner for flex diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index a763d9ff90d5..42c63c605ee2 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::logging; using namespace ::osl; -#define SERVICE_SDBC_DRIVER ::rtl::OUString("com.sun.star.sdbc.Driver") +#define SERVICE_SDBC_DRIVER OUString("com.sun.star.sdbc.Driver") void throwNoSuchElementException() throw(NoSuchElementException) { @@ -153,11 +153,11 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W class AcceptsURL : public ::std::unary_function< SdbcDriver, bool > { protected: - const ::rtl::OUString& m_rURL; + const OUString& m_rURL; public: // ctor - AcceptsURL( const ::rtl::OUString& _rURL ) : m_rURL( _rURL ) { } + AcceptsURL( const OUString& _rURL ) : m_rURL( _rURL ) { } //................................................................. bool operator()( const SdbcDriver& _rDriver ) const @@ -171,16 +171,16 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W } }; - static sal_Int32 lcl_getDriverPrecedence( const ::comphelper::ComponentContext& _rContext, Sequence< ::rtl::OUString >& _rPrecedence ) + static sal_Int32 lcl_getDriverPrecedence( const ::comphelper::ComponentContext& _rContext, Sequence< OUString >& _rPrecedence ) { _rPrecedence.realloc( 0 ); try { // some strings we need - const ::rtl::OUString sDriverManagerConfigLocation( "org.openoffice.Office.DataAccess/DriverManager" ); - const ::rtl::OUString sDriverPreferenceLocation( "DriverPrecedence" ); - const ::rtl::OUString sNodePathArgumentName( "nodepath" ); - const ::rtl::OUString sNodeAccessServiceName( "com.sun.star.configuration.ConfigurationAccess" ); + const OUString sDriverManagerConfigLocation( "org.openoffice.Office.DataAccess/DriverManager" ); + const OUString sDriverPreferenceLocation( "DriverPrecedence" ); + const OUString sNodePathArgumentName( "nodepath" ); + const OUString sNodeAccessServiceName( "com.sun.star.configuration.ConfigurationAccess" ); // create a configuration provider Reference< XMultiServiceFactory > xConfigurationProvider( @@ -225,10 +225,10 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W }; /// and STL argorithm compatible predicate comparing a DriverAccess' impl name to a string - struct EqualDriverAccessToName : public ::std::binary_function< DriverAccess, ::rtl::OUString, bool > + struct EqualDriverAccessToName : public ::std::binary_function< DriverAccess, OUString, bool > { - ::rtl::OUString m_sImplName; - EqualDriverAccessToName(const ::rtl::OUString& _sImplName) : m_sImplName(_sImplName){} + OUString m_sImplName; + EqualDriverAccessToName(const OUString& _sImplName) : m_sImplName(_sImplName){} //................................................................. bool operator()( const DriverAccess& lhs) { @@ -338,7 +338,7 @@ void OSDBCDriverManager::initializeDriverPrecedence() try { // get the precedence of the drivers from the configuration - Sequence< ::rtl::OUString > aDriverOrder; + Sequence< OUString > aDriverOrder; if ( 0 == lcl_getDriverPrecedence( m_aContext, aDriverOrder ) ) // nothing to do return; @@ -359,8 +359,8 @@ void OSDBCDriverManager::initializeDriverPrecedence() ::std::sort( m_aDriversBS.begin(), m_aDriversBS.end(), CompareDriverAccessByName() ); // loop through the names in the precedence order - const ::rtl::OUString* pDriverOrder = aDriverOrder.getConstArray(); - const ::rtl::OUString* pDriverOrderEnd = pDriverOrder + aDriverOrder.getLength(); + const OUString* pDriverOrder = aDriverOrder.getConstArray(); + const OUString* pDriverOrderEnd = pDriverOrder + aDriverOrder.getLength(); // the first driver for which there is no preference DriverAccessArrayIterator aNoPrefDriversStart = m_aDriversBS.begin(); @@ -401,7 +401,7 @@ void OSDBCDriverManager::initializeDriverPrecedence() } //-------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnection( const ::rtl::OUString& _rURL ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -427,7 +427,7 @@ Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnection( const ::rtl } //-------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnectionWithInfo( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -509,17 +509,17 @@ sal_Bool SAL_CALL OSDBCDriverManager::hasElements( ) throw(::com::sun::star::un } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OSDBCDriverManager::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OSDBCDriverManager::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------------- -sal_Bool SAL_CALL OSDBCDriverManager::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OSDBCDriverManager::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -527,7 +527,7 @@ sal_Bool SAL_CALL OSDBCDriverManager::supportsService( const ::rtl::OUString& _r } //-------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } @@ -539,27 +539,27 @@ Reference< XInterface > SAL_CALL OSDBCDriverManager::Create( const Reference< XM } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OSDBCDriverManager::getImplementationName_static( ) throw(RuntimeException) +OUString SAL_CALL OSDBCDriverManager::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.sdbc.OSDBCDriverManager"); + return OUString("com.sun.star.comp.sdbc.OSDBCDriverManager"); } //-------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames_static( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); + Sequence< OUString > aSupported(1); aSupported[0] = getSingletonName_static(); return aSupported; } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OSDBCDriverManager::getSingletonName_static( ) throw(RuntimeException) +OUString SAL_CALL OSDBCDriverManager::getSingletonName_static( ) throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.sdbc.DriverManager" ); + return OUString( "com.sun.star.sdbc.DriverManager" ); } //-------------------------------------------------------------------------- -Reference< XInterface > SAL_CALL OSDBCDriverManager::getRegisteredObject( const ::rtl::OUString& _rName ) throw(Exception, RuntimeException) +Reference< XInterface > SAL_CALL OSDBCDriverManager::getRegisteredObject( const OUString& _rName ) throw(Exception, RuntimeException) { MutexGuard aGuard(m_aMutex); ConstDriverCollectionIterator aSearch = m_aDriversRT.find(_rName); @@ -570,7 +570,7 @@ Reference< XInterface > SAL_CALL OSDBCDriverManager::getRegisteredObject( const } //-------------------------------------------------------------------------- -void SAL_CALL OSDBCDriverManager::registerObject( const ::rtl::OUString& _rName, const Reference< XInterface >& _rxObject ) throw(Exception, RuntimeException) +void SAL_CALL OSDBCDriverManager::registerObject( const OUString& _rName, const Reference< XInterface >& _rxObject ) throw(Exception, RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -598,7 +598,7 @@ void SAL_CALL OSDBCDriverManager::registerObject( const ::rtl::OUString& _rName, } //-------------------------------------------------------------------------- -void SAL_CALL OSDBCDriverManager::revokeObject( const ::rtl::OUString& _rName ) throw(Exception, RuntimeException) +void SAL_CALL OSDBCDriverManager::revokeObject( const OUString& _rName ) throw(Exception, RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -620,7 +620,7 @@ void SAL_CALL OSDBCDriverManager::revokeObject( const ::rtl::OUString& _rName ) } //-------------------------------------------------------------------------- -Reference< XDriver > SAL_CALL OSDBCDriverManager::getDriverByURL( const ::rtl::OUString& _rURL ) throw(RuntimeException) +Reference< XDriver > SAL_CALL OSDBCDriverManager::getDriverByURL( const OUString& _rURL ) throw(RuntimeException) { m_aEventLogger.log( LogLevel::INFO, "driver requested for URL $1$", @@ -639,12 +639,12 @@ Reference< XDriver > SAL_CALL OSDBCDriverManager::getDriverByURL( const ::rtl::O } //-------------------------------------------------------------------------- -Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const ::rtl::OUString& _rURL) +Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const OUString& _rURL) { Reference< XDriver > xReturn; { - const ::rtl::OUString sDriverFactoryName = m_aDriverConfig.getDriverFactoryName(_rURL); + const OUString sDriverFactoryName = m_aDriverConfig.getDriverFactoryName(_rURL); EqualDriverAccessToName aEqual(sDriverFactoryName); DriverAccessArray::iterator aFind = ::std::find_if(m_aDriversBS.begin(),m_aDriversBS.end(),aEqual); diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx index be87e4283da7..864158d0b270 100644 --- a/connectivity/source/manager/mdrivermanager.hxx +++ b/connectivity/source/manager/mdrivermanager.hxx @@ -46,7 +46,7 @@ namespace drivermanager typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > DriverFactory; struct DriverAccess { - ::rtl::OUString sImplementationName; /// the implementation name of the driver + OUString sImplementationName; /// the implementation name of the driver DriverFactory xComponentFactory; /// the factory to create the driver component (if not already done so) SdbcDriver xDriver; /// the driver itself }; @@ -86,13 +86,13 @@ namespace drivermanager public: // XDriverManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(::com::sun::star::uno::RuntimeException); // XDriverAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SAL_CALL getDriverByURL( const ::rtl::OUString& url ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException); @@ -102,23 +102,23 @@ namespace drivermanager virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::rtl::OUString SAL_CALL getSingletonName_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getSingletonName_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxContext ); // XNamingService - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRegisteredObject( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL registerObject( const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Object ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokeObject( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerObject( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Object ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokeObject( const OUString& Name ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > implGetDriverForURL(const ::rtl::OUString& _rURL); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > implGetDriverForURL(const OUString& _rURL); /** retrieve the driver order preferences from the configuration and sort m_aDriversBS accordingly. diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx index 7649044bd168..006a58410b01 100644 --- a/connectivity/source/parse/PColumn.cxx +++ b/connectivity/source/parse/PColumn.cxx @@ -63,10 +63,10 @@ OParseColumn::OParseColumn(const Reference& _xColumn,sal_Bool } // ------------------------------------------------------------------------- -OParseColumn::OParseColumn( const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, - const ::rtl::OUString& _Description, +OParseColumn::OParseColumn( const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, + const OUString& _Description, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -74,9 +74,9 @@ OParseColumn::OParseColumn( const ::rtl::OUString& _Name, sal_Bool _IsAutoIncrement, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName ) : connectivity::sdbcx::OColumn(_Name, _TypeName, _DefaultValue, @@ -115,7 +115,7 @@ OParseColumn::OParseColumn( const ::rtl::OUString& _Name, if ( i_xQueryColumns.is() && i_xQueryColumns->hasByName(pColumn->getRealName()) ) { Reference xColumn(i_xQueryColumns->getByName(pColumn->getRealName()),UNO_QUERY_THROW); - ::rtl::OUString sLabel; + OUString sLabel; xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL)) >>= sLabel; if ( !sLabel.isEmpty() ) pColumn->setLabel(sLabel); @@ -129,16 +129,16 @@ OParseColumn::OParseColumn( const ::rtl::OUString& _Name, OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSetMetaData >& _rxResMetaData, const Reference< XDatabaseMetaData >& _rxDBMetaData, sal_Int32 _nColumnPos, StringMap& _rColumns ) { - ::rtl::OUString sLabel = _rxResMetaData->getColumnLabel( _nColumnPos ); + OUString sLabel = _rxResMetaData->getColumnLabel( _nColumnPos ); // retrieve the name of the column // check for duplicate entries if(_rColumns.find(sLabel) != _rColumns.end()) { - ::rtl::OUString sAlias(sLabel); + OUString sAlias(sLabel); sal_Int32 searchIndex=1; while(_rColumns.find(sAlias) != _rColumns.end()) { - (sAlias = sLabel) += ::rtl::OUString::valueOf(searchIndex++); + (sAlias = sLabel) += OUString::valueOf(searchIndex++); } sLabel = sAlias; } @@ -146,8 +146,8 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe OParseColumn* pColumn = new OParseColumn( sLabel, _rxResMetaData->getColumnTypeName( _nColumnPos ), - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), _rxResMetaData->isNullable( _nColumnPos ), _rxResMetaData->getPrecision( _nColumnPos ), _rxResMetaData->getScale( _nColumnPos ), @@ -192,7 +192,7 @@ void OParseColumn::construct() } // ----------------------------------------------------------------------------- -OOrderColumn::OOrderColumn( const Reference& _xColumn, const ::rtl::OUString& i_rOriginatingTableName, +OOrderColumn::OOrderColumn( const Reference& _xColumn, const OUString& i_rOriginatingTableName, sal_Bool _bCase, sal_Bool _bAscending ) : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))), @@ -266,10 +266,10 @@ void OOrderColumn::construct() return *OOrderColumn_PROP::getArrayHelper(); } // ----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OOrderColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OOrderColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.sdb.OrderColumn"); + ::com::sun::star::uno::Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.sdb.OrderColumn"); return aSupported; } diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx index f46421d90672..57d28b4fb9c0 100644 --- a/connectivity/source/parse/internalnode.cxx +++ b/connectivity/source/parse/internalnode.cxx @@ -35,7 +35,7 @@ OSQLInternalNode::OSQLInternalNode(const sal_Char* pNewValue, } //----------------------------------------------------------------------------- -OSQLInternalNode::OSQLInternalNode(const ::rtl::OString &_NewValue, +OSQLInternalNode::OSQLInternalNode(const OString &_NewValue, SQLNodeType eNodeType, sal_uInt32 nNodeID) :OSQLParseNode(_NewValue,eNodeType,nNodeID) @@ -45,7 +45,7 @@ OSQLInternalNode::OSQLInternalNode(const ::rtl::OString &_NewValue, } //----------------------------------------------------------------------------- -OSQLInternalNode::OSQLInternalNode(const ::rtl::OUString &_NewValue, +OSQLInternalNode::OSQLInternalNode(const OUString &_NewValue, SQLNodeType eNodeType, sal_uInt32 nNodeID) :OSQLParseNode(_NewValue,eNodeType,nNodeID) diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 1901f49cc629..9e512967a687 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -100,7 +100,7 @@ namespace connectivity } public: - inline bool isQueryAllowed( const ::rtl::OUString& _rQueryName ) + inline bool isQueryAllowed( const OUString& _rQueryName ) { if ( !m_pForbiddenQueryNames.get() ) return true; @@ -116,10 +116,10 @@ namespace connectivity class ForbidQueryName { ::boost::shared_ptr< QueryNameSet >& m_rpAllForbiddenNames; - ::rtl::OUString m_sForbiddenQueryName; + OUString m_sForbiddenQueryName; public: - ForbidQueryName( OSQLParseTreeIteratorImpl& _rIteratorImpl, const ::rtl::OUString _rForbiddenQueryName ) + ForbidQueryName( OSQLParseTreeIteratorImpl& _rIteratorImpl, const OUString _rForbiddenQueryName ) :m_rpAllForbiddenNames( _rIteratorImpl.m_pForbiddenQueryNames ) ,m_sForbiddenQueryName( _rForbiddenQueryName ) { @@ -255,33 +255,33 @@ void OSQLParseTreeIterator::setParseTree(const OSQLParseNode * pNewParseTree) namespace { //......................................................................... - static void impl_getRowString( const Reference< XRow >& _rxRow, const sal_Int32 _nColumnIndex, ::rtl::OUString& _out_rString ) + static void impl_getRowString( const Reference< XRow >& _rxRow, const sal_Int32 _nColumnIndex, OUString& _out_rString ) { _out_rString = _rxRow->getString( _nColumnIndex ); if ( _rxRow->wasNull() ) - _out_rString= ::rtl::OUString(); + _out_rString= OUString(); } //......................................................................... - static ::rtl::OUString lcl_findTableInMetaData( - const Reference< XDatabaseMetaData >& _rxDBMeta, const ::rtl::OUString& _rCatalog, - const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rTableName ) + static OUString lcl_findTableInMetaData( + const Reference< XDatabaseMetaData >& _rxDBMeta, const OUString& _rCatalog, + const OUString& _rSchema, const OUString& _rTableName ) { - ::rtl::OUString sComposedName; + OUString sComposedName; - static const ::rtl::OUString s_sTableTypeView("VIEW"); - static const ::rtl::OUString s_sTableTypeTable("TABLE"); - static const ::rtl::OUString s_sWildcard( "%" ); + static const OUString s_sTableTypeView("VIEW"); + static const OUString s_sTableTypeTable("TABLE"); + static const OUString s_sWildcard( "%" ); // we want all catalogues, all schemas, all tables - Sequence< ::rtl::OUString > sTableTypes(3); + Sequence< OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; sTableTypes[2] = s_sWildcard; // just to be sure to include anything else .... if ( _rxDBMeta.is() ) { - sComposedName = ::rtl::OUString(); + sComposedName = OUString(); Reference< XResultSet> xRes = _rxDBMeta->getTables( !_rCatalog.isEmpty() ? makeAny( _rCatalog ) : Any(), !_rSchema.isEmpty() ? _rSchema : s_sWildcard, _rTableName, sTableTypes ); @@ -289,7 +289,7 @@ namespace Reference< XRow > xCurrentRow( xRes, UNO_QUERY ); if ( xCurrentRow.is() && xRes->next() ) { - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; impl_getRowString( xCurrentRow, 1, sCatalog ); impl_getRowString( xCurrentRow, 2, sSchema ); @@ -320,7 +320,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu ::rtl::Reference< OSQLColumns > pSubQueryParameterColumns( new OSQLColumns() ); // get the command and the EscapeProcessing properties from the sub query - ::rtl::OUString sSubQueryCommand; + OUString sSubQueryCommand; sal_Bool bEscapeProcessing = sal_False; try { @@ -339,7 +339,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu if ( !bEscapeProcessing || ( sSubQueryCommand.isEmpty() ) ) break; - ::rtl::OUString sError; + OUString sError; ::std::auto_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >( m_rParser ).parseTree( sError, sSubQueryCommand, sal_False ) ); if ( !pSubQueryNode.get() ) break; @@ -359,7 +359,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu } //----------------------------------------------------------------------------- -OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const ::rtl::OUString& _rComposedName ) +OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const OUString& _rComposedName ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::impl_locateRecordSource" ); if ( _rComposedName.isEmpty() ) @@ -369,11 +369,11 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const ::rtl::OUString& } OSQLTable aReturn; - ::rtl::OUString sComposedName( _rComposedName ); + OUString sComposedName( _rComposedName ); try { - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; qualifiedNameComponents( m_pImpl->m_xDatabaseMetaData, sComposedName, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); // check whether there is a query with the given name @@ -437,7 +437,7 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const ::rtl::OUString& } //----------------------------------------------------------------------------- -void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const ::rtl::OUString & rTableRange ) +void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const OUString & rTableRange ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::traverseOneTableName" ); if ( ( m_pImpl->m_nIncludeMask & TableNames ) != TableNames ) @@ -447,15 +447,15 @@ void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQ OSL_ENSURE(pTableName != NULL,"OSQLParseTreeIterator::traverseOneTableName: pTableName == NULL"); Any aCatalog; - ::rtl::OUString aSchema,aTableName,aComposedName; - ::rtl::OUString aTableRange(rTableRange); + OUString aSchema,aTableName,aComposedName; + OUString aTableRange(rTableRange); // Get table name OSQLParseNode::getTableComponents(pTableName,aCatalog,aSchema,aTableName,m_pImpl->m_xDatabaseMetaData); // create the composed name like DOMAIN.USER.TABLE1 aComposedName = ::dbtools::composeTableName(m_pImpl->m_xDatabaseMetaData, - aCatalog.hasValue() ? ::comphelper::getString(aCatalog) : ::rtl::OUString(), + aCatalog.hasValue() ? ::comphelper::getString(aCatalog) : OUString(), aSchema, aTableName, sal_False, @@ -507,13 +507,13 @@ void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoin return m_pImpl->m_aJoinConditions; } //----------------------------------------------------------------------------- -void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, ::rtl::OUString& aTableRange ) +void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, OUString& aTableRange ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getQualified_join" ); OSL_PRECOND( SQL_ISRULE( pTableRef, cross_union ) || SQL_ISRULE( pTableRef, qualified_join ) , "OSQLParseTreeIterator::getQualified_join: illegal node!" ); - aTableRange = ::rtl::OUString(); + aTableRange = OUString(); const OSQLParseNode* pNode = getTableNode(_rTables,pTableRef->getChild(0),aTableRange); if ( isTableNode( pNode ) ) @@ -550,7 +550,7 @@ void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLP traverseOneTableName( _rTables, pNode, aTableRange ); } //----------------------------------------------------------------------------- -const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables, const OSQLParseNode *pTableRef,::rtl::OUString& rTableRange ) +const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables, const OSQLParseNode *pTableRef,OUString& rTableRange ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getTableNode" ); OSL_PRECOND( SQL_ISRULE( pTableRef, table_ref ) || SQL_ISRULE( pTableRef, joined_table ) @@ -623,10 +623,10 @@ void OSQLParseTreeIterator::getSelect_statement(OSQLTables& _rTables,const OSQLP OSL_ENSURE(SQL_ISRULE(pTableRefCommalist,table_ref_commalist),"OSQLParseTreeIterator: error in parse tree!"); const OSQLParseNode* pTableName = NULL; - ::rtl::OUString aTableRange; + OUString aTableRange; for (sal_uInt32 i = 0; i < pTableRefCommalist->count(); i++) { // Process FROM clause - aTableRange = ::rtl::OUString(); + aTableRange = OUString(); const OSQLParseNode* pTableListElement = pTableRefCommalist->getChild(i); if ( isTableNode( pTableListElement ) ) @@ -693,18 +693,18 @@ bool OSQLParseTreeIterator::traverseTableNames(OSQLTables& _rTables) if ( pTableName ) { - ::rtl::OUString sTableRange; + OUString sTableRange; traverseOneTableName( _rTables, pTableName, sTableRange ); } return !hasErrors(); } //----------------------------------------------------------------------------- -::rtl::OUString OSQLParseTreeIterator::getColumnAlias(const OSQLParseNode* _pDerivedColumn) +OUString OSQLParseTreeIterator::getColumnAlias(const OSQLParseNode* _pDerivedColumn) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getColumnAlias" ); OSL_ENSURE(SQL_ISRULE(_pDerivedColumn,derived_column),"No derived column!"); - ::rtl::OUString sColumnAlias; + OUString sColumnAlias; if(_pDerivedColumn->getChild(1)->count() == 2) sColumnAlias = _pDerivedColumn->getChild(1)->getChild(1)->getTokenValue(); else if(!_pDerivedColumn->getChild(1)->isRule()) @@ -716,10 +716,10 @@ bool OSQLParseTreeIterator::traverseTableNames(OSQLTables& _rTables) namespace { void lcl_getColumnRange( const OSQLParseNode* _pColumnRef, const Reference< XConnection >& _rxConnection, - ::rtl::OUString& _out_rColumnName, ::rtl::OUString& _out_rTableRange, - const OSQLColumns* _pSelectColumns, ::rtl::OUString& _out_rColumnAliasIfPresent ) + OUString& _out_rColumnName, OUString& _out_rTableRange, + const OSQLColumns* _pSelectColumns, OUString& _out_rColumnAliasIfPresent ) { - _out_rColumnName = _out_rTableRange = _out_rColumnAliasIfPresent = ::rtl::OUString(); + _out_rColumnName = _out_rTableRange = _out_rColumnAliasIfPresent = OUString(); if ( SQL_ISRULE( _pColumnRef, column_ref ) ) { if( _pColumnRef->count() > 1 ) @@ -742,7 +742,7 @@ namespace Reference< XPropertySet > xColumn( *lookupColumn ); try { - ::rtl::OUString sName, sTableName; + OUString sName, sTableName; xColumn->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_REALNAME ) ) >>= sName; xColumn->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_TABLENAME ) ) >>= sTableName; if ( sName == _out_rColumnName && sTableName == _out_rTableRange ) @@ -766,19 +766,19 @@ namespace // ----------------------------------------------------------------------------- void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef, - ::rtl::OUString& _rColumnName, - ::rtl::OUString& _rTableRange) const + OUString& _rColumnName, + OUString& _rTableRange) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getColumnRange" ); - ::rtl::OUString sDummy; + OUString sDummy; lcl_getColumnRange( _pColumnRef, m_pImpl->m_xConnection, _rColumnName, _rTableRange, NULL, sDummy ); } // ----------------------------------------------------------------------------- void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef, - ::rtl::OUString& _rColumnName, - ::rtl::OUString& _rTableRange, - ::rtl::OUString& _out_rColumnAliasIfPresent ) const + OUString& _rColumnName, + OUString& _rTableRange, + OUString& _out_rColumnAliasIfPresent ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getColumnRange" ); lcl_getColumnRange( _pColumnRef, m_pImpl->m_xConnection, _rColumnName, _rTableRange, &*m_aSelectColumns, _out_rColumnAliasIfPresent ); @@ -786,21 +786,21 @@ void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef, //----------------------------------------------------------------------------- void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef, - const Reference< XConnection >& _rxConnection, ::rtl::OUString& _out_rColumnName, ::rtl::OUString& _out_rTableRange ) + const Reference< XConnection >& _rxConnection, OUString& _out_rColumnName, OUString& _out_rTableRange ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getColumnRange" ); - ::rtl::OUString sDummy; + OUString sDummy; lcl_getColumnRange( _pColumnRef, _rxConnection, _out_rColumnName, _out_rTableRange, NULL, sDummy ); } //----------------------------------------------------------------------------- -sal_Bool OSQLParseTreeIterator::getColumnTableRange(const OSQLParseNode* pNode, ::rtl::OUString &rTableRange) const +sal_Bool OSQLParseTreeIterator::getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getColumnTableRange" ); // See if all columns belong to one table if (SQL_ISRULE(pNode,column_ref)) { - ::rtl::OUString aColName, aTableRange; + OUString aColName, aTableRange; getColumnRange(pNode, aColName, aTableRange); if (aTableRange.isEmpty()) // None found { @@ -869,8 +869,8 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo if (SQL_ISRULE(pColumnRef,column_def)) { - ::rtl::OUString aColumnName; - ::rtl::OUString aTypeName; + OUString aColumnName; + OUString aTypeName; sal_Int32 nType = DataType::VARCHAR; aColumnName = pColumnRef->getChild(0)->getTokenValue(); @@ -891,15 +891,15 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo } else if(pDatatype && pDatatype->getNodeType() == SQL_NODE_KEYWORD) { - aTypeName = ::rtl::OUString("VARCHAR"); + aTypeName = OUString("VARCHAR"); } if (!aTypeName.isEmpty()) { //TODO:Create a new class for create statement to handle field length - OParseColumn* pColumn = new OParseColumn(aColumnName,aTypeName,::rtl::OUString(),::rtl::OUString(), + OParseColumn* pColumn = new OParseColumn(aColumnName,aTypeName,OUString(),OUString(), ColumnValue::NULLABLE_UNKNOWN,0,0,nType,sal_False,sal_False,isCaseSensitive(), - ::rtl::OUString(),::rtl::OUString(),::rtl::OUString()); + OUString(),OUString(),OUString()); pColumn->setFunction(sal_False); pColumn->setRealName(aColumnName); @@ -929,12 +929,12 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele /*&& traverseSelectColumnNames( pSelectNode->getChild( 3 ) )*/; } - static ::rtl::OUString aEmptyString; + static OUString aEmptyString; // nyi: more checks for correct structure! if (pSelectNode->getChild(2)->isRule() && SQL_ISPUNCTUATION(pSelectNode->getChild(2)->getChild(0),"*")) { // SELECT * ... - setSelectColumnName(m_aSelectColumns,::rtl::OUString("*"), aEmptyString,aEmptyString); + setSelectColumnName(m_aSelectColumns,OUString("*"), aEmptyString,aEmptyString); } else if (SQL_ISRULE(pSelectNode->getChild(2),scalar_exp_commalist)) { @@ -952,16 +952,16 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele SQL_ISPUNCTUATION(pColumnRef->getChild(0)->getChild(2),"*")) { // All the table's columns - ::rtl::OUString aTableRange; + OUString aTableRange; pColumnRef->getChild(0)->parseNodeToStr( aTableRange, m_pImpl->m_xConnection, NULL, sal_False, sal_False ); - setSelectColumnName(m_aSelectColumns,::rtl::OUString("*"), aEmptyString,aTableRange); + setSelectColumnName(m_aSelectColumns,OUString("*"), aEmptyString,aTableRange); continue; } else if (SQL_ISRULE(pColumnRef,derived_column)) { - ::rtl::OUString aColumnAlias(getColumnAlias(pColumnRef)); // can be empty - ::rtl::OUString sColumnName; - ::rtl::OUString aTableRange; + OUString aColumnAlias(getColumnAlias(pColumnRef)); // can be empty + OUString sColumnName; + OUString aTableRange; sal_Int32 nType = DataType::VARCHAR; sal_Bool bFkt(sal_False); pColumnRef = pColumnRef->getChild(0); @@ -1072,8 +1072,8 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo OSL_ENSURE(!_bOrder || SQL_ISRULE(pOrderingSpecCommalist,ordering_spec_commalist),"OSQLParseTreeIterator:ordering_spec_commalist error in parse tree!"); OSL_ENSURE(pOrderingSpecCommalist->count() > 0,"OSQLParseTreeIterator: error in parse tree!"); - ::rtl::OUString sColumnName; - ::rtl::OUString aTableRange; + OUString sColumnName; + OUString aTableRange; sal_uInt32 nCount = pOrderingSpecCommalist->count(); for (sal_uInt32 i = 0; i < nCount; ++i) { @@ -1086,8 +1086,8 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo pColumnRef = pColumnRef->getChild(0); } - aTableRange = ::rtl::OUString(); - sColumnName = ::rtl::OUString(); + aTableRange = OUString(); + sColumnName = OUString(); if ( SQL_ISRULE(pColumnRef,column_ref) ) { // Column name (and TableRange): @@ -1127,15 +1127,15 @@ bool OSQLParseTreeIterator::traverseGroupByColumnNames(const OSQLParseNode* pSel // ----------------------------------------------------------------------------- namespace { - ::rtl::OUString lcl_generateParameterName( const OSQLParseNode& _rParentNode, const OSQLParseNode& _rParamNode ) + OUString lcl_generateParameterName( const OSQLParseNode& _rParentNode, const OSQLParseNode& _rParamNode ) { - ::rtl::OUString sColumnName( "param" ); + OUString sColumnName( "param" ); const sal_Int32 nCount = (sal_Int32)_rParentNode.count(); for ( sal_Int32 i = 0; i < nCount; ++i ) { if ( _rParentNode.getChild(i) == &_rParamNode ) { - sColumnName += ::rtl::OUString::valueOf( i+1 ); + sColumnName += OUString::valueOf( i+1 ); break; } } @@ -1150,7 +1150,7 @@ void OSQLParseTreeIterator::traverseParameters(const OSQLParseNode* _pNode) if ( _pNode == NULL ) return; - ::rtl::OUString sColumnName, sTableRange, aColumnAlias; + OUString sColumnName, sTableRange, aColumnAlias; const OSQLParseNode* pParent = _pNode->getParent(); if ( pParent != NULL ) { @@ -1302,7 +1302,7 @@ void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondi // Else, process single search criteria (like =, !=, ..., LIKE, IS NULL etc.) else if (SQL_ISRULE(pSearchCondition,comparison_predicate) ) { - ::rtl::OUString aValue; + OUString aValue; pSearchCondition->getChild(2)->parseNodeToStr( aValue, m_pImpl->m_xConnection, NULL, sal_False, sal_False ); traverseOnePredicate(pSearchCondition->getChild(0),aValue,pSearchCondition->getChild(2)); impl_fillJoinConditions(pSearchCondition); @@ -1328,7 +1328,7 @@ void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondi return; } - ::rtl::OUString aValue; + OUString aValue; OSQLParseNode * pParam = NULL; if (SQL_ISRULE(pNum_value_exp,parameter)) pParam = pNum_value_exp; @@ -1376,13 +1376,13 @@ void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondi (void)pPart2; OSL_ENSURE(SQL_ISTOKEN(pPart2->getChild(0),IS),"OSQLParseTreeIterator: error in parse tree!"); - ::rtl::OUString aString; + OUString aString; traverseOnePredicate(pSearchCondition->getChild(0),aString,NULL); // if (! aIteratorStatus.IsSuccessful()) return; } else if (SQL_ISRULE(pSearchCondition,num_value_exp) || SQL_ISRULE(pSearchCondition,term)) { - ::rtl::OUString aString; + OUString aString; traverseOnePredicate(pSearchCondition->getChild(0),aString,pSearchCondition->getChild(0)); traverseOnePredicate(pSearchCondition->getChild(2),aString,pSearchCondition->getChild(2)); } @@ -1391,9 +1391,9 @@ void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondi //----------------------------------------------------------------------------- void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode ,const OSQLParseNode* _pParentNode - ,const ::rtl::OUString& _aColumnName - ,::rtl::OUString& _aTableRange - ,const ::rtl::OUString& _rColumnAlias) + ,const OUString& _aColumnName + ,OUString& _aTableRange + ,const OUString& _rColumnAlias) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::traverseParameter" ); if ( !SQL_ISRULE( _pParseNode, parameter ) ) @@ -1405,7 +1405,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode OSL_ENSURE(_pParseNode->count() > 0,"OSQLParseTreeIterator: error in parse tree!"); OSQLParseNode * pMark = _pParseNode->getChild(0); - ::rtl::OUString sParameterName; + OUString sParameterName; if (SQL_ISPUNCTUATION(pMark,"?")) { @@ -1413,7 +1413,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode ? _rColumnAlias : !_aColumnName.isEmpty() ? _aColumnName - : ::rtl::OUString("?"); + : OUString("?"); } else if (SQL_ISPUNCTUATION(pMark,":")) { @@ -1431,7 +1431,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode // found a parameter if ( _pParentNode && (SQL_ISRULE(_pParentNode,general_set_fct) || SQL_ISRULE(_pParentNode,set_fct_spec)) ) {// found a function as column_ref - ::rtl::OUString sFunctionName; + OUString sFunctionName; _pParentNode->getChild(0)->parseNodeToStr( sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False ); const sal_uInt32 nCount = _pParentNode->count(); sal_uInt32 i = 0; @@ -1443,9 +1443,9 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode sal_Int32 nType = ::connectivity::OSQLParser::getFunctionParameterType( _pParentNode->getChild(0)->getTokenID(), i-1); OParseColumn* pColumn = new OParseColumn( sParameterName, - ::rtl::OUString(), - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), + OUString(), ColumnValue::NULLABLE_UNKNOWN, 0, 0, @@ -1453,9 +1453,9 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode sal_False, sal_False, isCaseSensitive(), - ::rtl::OUString(), - ::rtl::OUString(), - ::rtl::OUString()); + OUString(), + OUString(), + OUString()); pColumn->setFunction(sal_True); pColumn->setAggregateFunction(sal_True); pColumn->setRealName(sFunctionName); @@ -1507,12 +1507,12 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode nType = ::connectivity::OSQLParser::getFunctionParameterType( pParent->getChild(0)->getTokenID(), i+1); } - ::rtl::OUString aNewColName( getUniqueColumnName( sParameterName ) ); + OUString aNewColName( getUniqueColumnName( sParameterName ) ); OParseColumn* pColumn = new OParseColumn(aNewColName, - ::rtl::OUString(), - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), + OUString(), ColumnValue::NULLABLE_UNKNOWN, 0, 0, @@ -1520,9 +1520,9 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode sal_False, sal_False, isCaseSensitive(), - ::rtl::OUString(), - ::rtl::OUString(), - ::rtl::OUString()); + OUString(), + OUString(), + OUString()); pColumn->setName(aNewColName); pColumn->setRealName(sParameterName); m_aParameters->get().push_back(pColumn); @@ -1532,7 +1532,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode //----------------------------------------------------------------------------- void OSQLParseTreeIterator::traverseOnePredicate( OSQLParseNode * pColumnRef, - ::rtl::OUString& rValue, + OUString& rValue, OSQLParseNode * pParseNode) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::traverseOnePredicate" ); @@ -1540,10 +1540,10 @@ void OSQLParseTreeIterator::traverseOnePredicate( return; // Column name (and TableRange): - ::rtl::OUString aColumnName, aTableRange, sColumnAlias; + OUString aColumnName, aTableRange, sColumnAlias; getColumnRange( pColumnRef, aColumnName, aTableRange, sColumnAlias); - ::rtl::OUString aName; + OUString aName; /*if (SQL_ISRULE(pParseNode,parameter)) traverseParameter( pParseNode, pColumnRef, aColumnName, aTableRange, sColumnAlias ); @@ -1612,8 +1612,8 @@ void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask ) // Dummy implementations //----------------------------------------------------------------------------- -OSQLTable OSQLParseTreeIterator::impl_createTableObject( const ::rtl::OUString& rTableName, - const ::rtl::OUString& rCatalogName, const ::rtl::OUString& rSchemaName ) +OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableName, + const OUString& rCatalogName, const OUString& rSchemaName ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::impl_createTableObject" ); OSL_PRECOND( m_eStatementType == SQL_STATEMENT_CREATE_TABLE, @@ -1625,15 +1625,15 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const ::rtl::OUString& NULL, sal_False, rTableName, - ::rtl::OUString("Table"), - ::rtl::OUString("New Created Table"), + OUString("Table"), + OUString("New Created Table"), rSchemaName, rCatalogName ); return aReturnTable; } //----------------------------------------------------------------------------- -void OSQLParseTreeIterator::appendColumns(::rtl::Reference& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable) +void OSQLParseTreeIterator::appendColumns(::rtl::Reference& _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::appendColumns" ); @@ -1644,14 +1644,14 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference& _rColum if ( !xColumns.is() ) return; - Sequence< ::rtl::OUString > aColNames = xColumns->getElementNames(); - const ::rtl::OUString* pBegin = aColNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aColNames.getLength(); + Sequence< OUString > aColNames = xColumns->getElementNames(); + const OUString* pBegin = aColNames.getConstArray(); + const OUString* pEnd = pBegin + aColNames.getLength(); for(;pBegin != pEnd;++pBegin) { - ::rtl::OUString aName(getUniqueColumnName(*pBegin)); + OUString aName(getUniqueColumnName(*pBegin)); Reference< XPropertySet > xColumn; if(xColumns->hasByName(*pBegin) && (xColumns->getByName(*pBegin) >>= xColumn) && xColumn.is()) { @@ -1680,7 +1680,7 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference& _rColum } } //----------------------------------------------------------------------------- -void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt,sal_Int32 _nType,sal_Bool bAggFkt) +void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange,sal_Bool bFkt,sal_Int32 _nType,sal_Bool bAggFkt) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::setSelectColumnName" ); if(rColumnName.toChar() == '*' && rTableRange.isEmpty()) @@ -1716,7 +1716,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _ ) continue; - ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias)); + OUString aNewColName(getUniqueColumnName(rColumnAlias)); OParseColumn* pColumn = new OParseColumn(xColumn,isCaseSensitive()); xNewColumn = pColumn; @@ -1731,15 +1731,15 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _ { // no function (due to the above !bFkt), no existing column // => assume an expression - ::rtl::OUString aNewColName( getUniqueColumnName( rColumnAlias ) ); + OUString aNewColName( getUniqueColumnName( rColumnAlias ) ); // did not find a column with this name in any of the tables OParseColumn* pColumn = new OParseColumn( aNewColName, - ::rtl::OUString("VARCHAR"), + OUString("VARCHAR"), // TODO: does this match with _nType? // Or should be fill this from the getTypeInfo of the connection? - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), ColumnValue::NULLABLE_UNKNOWN, 0, 0, @@ -1747,9 +1747,9 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _ sal_False, sal_False, isCaseSensitive(), - ::rtl::OUString(), - ::rtl::OUString(), - ::rtl::OUString() + OUString(), + OUString(), + OUString() ); xNewColumn = pColumn; @@ -1760,11 +1760,11 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _ } else { - ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias)); + OUString aNewColName(getUniqueColumnName(rColumnAlias)); - OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),::rtl::OUString(), + OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(), ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,sal_False,sal_False,isCaseSensitive(), - ::rtl::OUString(),::rtl::OUString(),::rtl::OUString()); + OUString(),OUString(),OUString()); pColumn->setFunction(sal_True); pColumn->setAggregateFunction(bAggFkt); pColumn->setRealName(rColumnName); @@ -1782,11 +1782,11 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _ { if (bFkt) { - ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias)); + OUString aNewColName(getUniqueColumnName(rColumnAlias)); - OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),::rtl::OUString(), + OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(), ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,sal_False,sal_False,isCaseSensitive(), - ::rtl::OUString(),::rtl::OUString(),::rtl::OUString()); + OUString(),OUString(),OUString()); pColumn->setFunction(sal_True); pColumn->setAggregateFunction(bAggFkt); pColumn->setRealName(rColumnName); @@ -1800,7 +1800,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _ Reference< XPropertySet > xColumn; if (aFind->second->getColumns()->hasByName(rColumnName) && (aFind->second->getColumns()->getByName(rColumnName) >>= xColumn)) { - ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias)); + OUString aNewColName(getUniqueColumnName(rColumnAlias)); OParseColumn* pColumn = new OParseColumn(xColumn,isCaseSensitive()); pColumn->setName(aNewColName); @@ -1820,11 +1820,11 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _ // Table does not exist or lacking field if (bError) { - ::rtl::OUString aNewColName(getUniqueColumnName(rColumnAlias)); + OUString aNewColName(getUniqueColumnName(rColumnAlias)); - OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),::rtl::OUString(), + OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(), ColumnValue::NULLABLE_UNKNOWN,0,0,DataType::VARCHAR,sal_False,sal_False,isCaseSensitive(), - ::rtl::OUString(),::rtl::OUString(),::rtl::OUString()); + OUString(),OUString(),OUString()); pColumn->setFunction(sal_True); pColumn->setAggregateFunction(bAggFkt); @@ -1834,10 +1834,10 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _ } } //----------------------------------------------------------------------------- -::rtl::OUString OSQLParseTreeIterator::getUniqueColumnName(const ::rtl::OUString & rColumnName) const +OUString OSQLParseTreeIterator::getUniqueColumnName(const OUString & rColumnName) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getUniqueColumnName" ); - ::rtl::OUString aAlias(rColumnName); + OUString aAlias(rColumnName); OSQLColumns::Vector::const_iterator aIter = find( m_aSelectColumns->get().begin(), @@ -1848,7 +1848,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _ sal_Int32 i=1; while(aIter != m_aSelectColumns->get().end()) { - (aAlias = rColumnName) += ::rtl::OUString::valueOf(i++); + (aAlias = rColumnName) += OUString::valueOf(i++); aIter = find( m_aSelectColumns->get().begin(), m_aSelectColumns->get().end(), @@ -1859,7 +1859,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference& _ return aAlias; } //----------------------------------------------------------------------------- -void OSQLParseTreeIterator::setOrderByColumnName(const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange, sal_Bool bAscending) +void OSQLParseTreeIterator::setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, sal_Bool bAscending) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::setOrderByColumnName" ); Reference xColumn = findColumn( rColumnName, rTableRange, false ); @@ -1881,7 +1881,7 @@ void OSQLParseTreeIterator::setOrderByColumnName(const ::rtl::OUString & rColumn #endif } //----------------------------------------------------------------------------- -void OSQLParseTreeIterator::setGroupByColumnName(const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange) +void OSQLParseTreeIterator::setGroupByColumnName(const OUString & rColumnName, OUString & rTableRange) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::setGroupByColumnName" ); Reference xColumn = findColumn( rColumnName, rTableRange, false ); @@ -2040,7 +2040,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getSimpleHavingTree() const } // ----------------------------------------------------------------------------- -Reference< XPropertySet > OSQLParseTreeIterator::findColumn( const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange, bool _bLookInSubTables ) +Reference< XPropertySet > OSQLParseTreeIterator::findColumn( const OUString & rColumnName, OUString & rTableRange, bool _bLookInSubTables ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::findColumn" ); Reference< XPropertySet > xColumn = findColumn( *m_pImpl->m_pTables, rColumnName, rTableRange ); @@ -2050,7 +2050,7 @@ Reference< XPropertySet > OSQLParseTreeIterator::findColumn( const ::rtl::OUStri } // ----------------------------------------------------------------------------- -Reference< XPropertySet > OSQLParseTreeIterator::findColumn(const OSQLTables& _rTables, const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange) +Reference< XPropertySet > OSQLParseTreeIterator::findColumn(const OSQLTables& _rTables, const OUString & rColumnName, OUString & rTableRange) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::findColumn" ); Reference< XPropertySet > xColumn; @@ -2087,15 +2087,15 @@ Reference< XPropertySet > OSQLParseTreeIterator::findColumn(const OSQLTables& _r } // ----------------------------------------------------------------------------- -void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError, const ::rtl::OUString* _pReplaceToken1, const ::rtl::OUString* _pReplaceToken2 ) +void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError, const OUString* _pReplaceToken1, const OUString* _pReplaceToken2 ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::impl_appendError" ); - ::rtl::OUString sErrorMessage = m_rParser.getContext().getErrorMessage( _eError ); + OUString sErrorMessage = m_rParser.getContext().getErrorMessage( _eError ); if ( _pReplaceToken1 ) { bool bTwoTokens = ( _pReplaceToken2 != NULL ); const sal_Char* pPlaceHolder1 = bTwoTokens ? "#1" : "#"; - const ::rtl::OUString sPlaceHolder1 = ::rtl::OUString::createFromAscii( pPlaceHolder1 ); + const OUString sPlaceHolder1 = OUString::createFromAscii( pPlaceHolder1 ); sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( sPlaceHolder1 ), sPlaceHolder1.getLength(), *_pReplaceToken1 ); if ( _pReplaceToken2 ) @@ -2124,7 +2124,7 @@ void OSQLParseTreeIterator::impl_appendError( const SQLException& _rError ) sal_Int32 OSQLParseTreeIterator::getFunctionReturnType(const OSQLParseNode* _pNode ) { sal_Int32 nType = DataType::OTHER; - ::rtl::OUString sFunctionName; + OUString sFunctionName; if ( SQL_ISRULE(_pNode,length_exp) ) { _pNode->getChild(0)->getChild(0)->parseNodeToStr(sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False ); @@ -2145,8 +2145,8 @@ sal_Int32 OSQLParseTreeIterator::getFunctionReturnType(const OSQLParseNode* _pNo const OSQLParseNode* pValueExp = _pNode->getChild(3); if (SQL_ISRULE(pValueExp,column_ref)) { - ::rtl::OUString sColumnName; - ::rtl::OUString aTableRange; + OUString sColumnName; + OUString aTableRange; getColumnRange(pValueExp,sColumnName,aTableRange); OSL_ENSURE(!sColumnName.isEmpty(),"Columnname must not be empty!"); Reference xColumn = findColumn( sColumnName, aTableRange, true ); diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 5dc857643463..c23e9aefb3cf 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -78,7 +78,7 @@ using namespace ::comphelper; namespace { // ----------------------------------------------------------------------------- - sal_Bool lcl_saveConvertToNumber(const Reference< XNumberFormatter > & _xFormatter,sal_Int32 _nKey,const ::rtl::OUString& _sValue,double& _nrValue) + sal_Bool lcl_saveConvertToNumber(const Reference< XNumberFormatter > & _xFormatter,sal_Int32 _nKey,const OUString& _sValue,double& _nrValue) { sal_Bool bRet = sal_False; try @@ -109,9 +109,9 @@ namespace @return The quoted string. */ - ::rtl::OUString SetQuotation(const ::rtl::OUString& rValue, const ::rtl::OUString& rQuot, const ::rtl::OUString& rQuotToReplace) + OUString SetQuotation(const OUString& rValue, const OUString& rQuot, const OUString& rQuotToReplace) { - ::rtl::OUString rNewValue = rQuot; + OUString rNewValue = rQuot; rNewValue += rValue; sal_Int32 nIndex = (sal_Int32)-1; // Replace quotes with double quotes or the parser gets into problems @@ -166,7 +166,7 @@ SQLParseNodeParameter::~SQLParseNodeParameter() //= OSQLParseNode //============================================================================= //----------------------------------------------------------------------------- -::rtl::OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const +OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::convertDateString" ); Date aDate = DBTypeConversion::toDate(rString); @@ -179,7 +179,7 @@ SQLParseNodeParameter::~SQLParseNodeParameter() } //----------------------------------------------------------------------------- -::rtl::OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const +OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::convertDateTimeString" ); DateTime aDate = DBTypeConversion::toDateTime(rString); @@ -192,7 +192,7 @@ SQLParseNodeParameter::~SQLParseNodeParameter() } //----------------------------------------------------------------------------- -::rtl::OUString OSQLParseNode::convertTimeString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const +OUString OSQLParseNode::convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::convertTimeString" ); Time aTime = DBTypeConversion::toTime(rString); @@ -206,7 +206,7 @@ SQLParseNodeParameter::~SQLParseNodeParameter() } //----------------------------------------------------------------------------- -void OSQLParseNode::parseNodeToStr(::rtl::OUString& rString, +void OSQLParseNode::parseNodeToStr(OUString& rString, const Reference< XConnection >& _rxConnection, const IParseContext* pContext, sal_Bool _bIntl, @@ -221,7 +221,7 @@ void OSQLParseNode::parseNodeToStr(::rtl::OUString& rString, } //----------------------------------------------------------------------------- -void OSQLParseNode::parseNodeToPredicateStr(::rtl::OUString& rString, +void OSQLParseNode::parseNodeToPredicateStr(OUString& rString, const Reference< XConnection >& _rxConnection, const Reference< XNumberFormatter > & xFormatter, const ::com::sun::star::lang::Locale& rIntl, @@ -237,7 +237,7 @@ void OSQLParseNode::parseNodeToPredicateStr(::rtl::OUString& rString, } //----------------------------------------------------------------------------- -void OSQLParseNode::parseNodeToPredicateStr(::rtl::OUString& rString, +void OSQLParseNode::parseNodeToPredicateStr(OUString& rString, const Reference< XConnection > & _rxConnection, const Reference< XNumberFormatter > & xFormatter, const Reference< XPropertySet > & _xField, @@ -254,7 +254,7 @@ void OSQLParseNode::parseNodeToPredicateStr(::rtl::OUString& rString, } //----------------------------------------------------------------------------- -void OSQLParseNode::parseNodeToStr(::rtl::OUString& rString, +void OSQLParseNode::parseNodeToStr(OUString& rString, const Reference< XConnection > & _rxConnection, const Reference< XNumberFormatter > & xFormatter, const Reference< XPropertySet > & _xField, @@ -272,7 +272,7 @@ void OSQLParseNode::parseNodeToStr(::rtl::OUString& rString, if ( _rxConnection.is() ) { - ::rtl::OUStringBuffer sBuffer = rString; + OUStringBuffer sBuffer = rString; try { OSQLParseNode::impl_parseNodeToString_throw( sBuffer, @@ -293,7 +293,7 @@ void OSQLParseNode::parseNodeToStr(::rtl::OUString& rString, } } //----------------------------------------------------------------------------- -bool OSQLParseNode::parseNodeToExecutableStatement( ::rtl::OUString& _out_rString, const Reference< XConnection >& _rxConnection, +bool OSQLParseNode::parseNodeToExecutableStatement( OUString& _out_rString, const Reference< XConnection >& _rxConnection, OSQLParser& _rParser, ::com::sun::star::sdbc::SQLException* _pErrorHolder ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::parseNodeToExecutableStatement" ); @@ -311,8 +311,8 @@ bool OSQLParseNode::parseNodeToExecutableStatement( ::rtl::OUString& _out_rStrin aParseParam.pParser = &_rParser; - _out_rString = ::rtl::OUString(); - ::rtl::OUStringBuffer sBuffer; + _out_rString = OUString(); + OUStringBuffer sBuffer; bool bSuccess = false; try { @@ -338,7 +338,7 @@ namespace } //----------------------------------------------------------------------------- -void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const +void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::getTableRange" ); if ( isToken() ) @@ -394,7 +394,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, if (nCount == 2) { if ( rParam.aMetaData.generateASBeforeCorrelationName() ) - rString.append(::rtl::OUString(" AS ")); + rString.append(OUString(" AS ")); m_aChildren[1]->impl_parseNodeToString_throw( rString, rParam ); } bHandled = true; @@ -429,7 +429,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, m_aChildren[0]->impl_parseNodeToString_throw( rString, aNewParam ); aNewParam.bQuote = rParam.bQuote; //aNewParam.bPredicate = sal_False; // disable [ ] around names // look at i73215 - ::rtl::OUStringBuffer aStringPara; + OUStringBuffer aStringPara; for (sal_uInt32 i=1; igetTokenValue() ); + OUString sTableOrQueryName( getChild(0)->getTokenValue() ); bool bIsQuery = rParam.xQueries->hasByName( sTableOrQueryName ); if ( !bIsQuery ) return false; @@ -588,7 +588,7 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( ::rtl::OUStringBuffer Reference< XPropertySet > xQuery( rParam.xQueries->getByName( sTableOrQueryName ), UNO_QUERY_THROW ); // substitute the query name with the constituting command - ::rtl::OUString sCommand; + OUString sCommand; OSL_VERIFY( xQuery->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_COMMAND ) ) >>= sCommand ); sal_Bool bEscapeProcessing = sal_False; @@ -598,12 +598,12 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( ::rtl::OUStringBuffer OSL_ENSURE( rParam.pParser, "OSQLParseNode::impl_parseTableNameNodeToString_throw: cannot analyze sub queries without a parser!" ); if ( bEscapeProcessing && rParam.pParser ) { - ::rtl::OUString sError; + OUString sError; ::std::auto_ptr< OSQLParseNode > pSubQueryNode( rParam.pParser->parseTree( sError, sCommand, sal_False ) ); if ( pSubQueryNode.get() ) { // parse the sub-select to SDBC level, too - ::rtl::OUStringBuffer sSubSelect; + OUStringBuffer sSubSelect; pSubQueryNode->impl_parseNodeToString_throw( sSubSelect, rParam ); if ( !sSubSelect.isEmpty() ) sCommand = sSubSelect.makeStringAndClear(); @@ -643,18 +643,18 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( ::rtl::OUStringBuffer } //----------------------------------------------------------------------------- -void OSQLParseNode::impl_parseTableRangeNodeToString_throw(::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const +void OSQLParseNode::impl_parseTableRangeNodeToString_throw(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::impl_parseTableRangeNodeToString_throw" ); OSL_PRECOND( ( count() == 2 ) || ( count() == 3 ) || ( count() == 5 ) ,"Illegal count"); - // rString += ::rtl::OUString(" "); + // rString += OUString(" "); ::std::for_each(m_aChildren.begin(),m_aChildren.end(), boost::bind( &OSQLParseNode::impl_parseNodeToString_throw, _1, boost::ref( rString ), boost::cref( rParam ) )); } //----------------------------------------------------------------------------- -void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const +void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::impl_parseLikeNodeToString_throw" ); OSL_ENSURE(count() == 2,"count != 2: Prepare for GPF"); @@ -670,11 +670,11 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rSt if (rParam.xField.is()) { // retrieve the fields name - ::rtl::OUString aFieldName; + OUString aFieldName; try { // retrieve the fields name - rtl::OUString aString; + OUString aString; rParam.xField->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aString; aFieldName = aString.getStr(); } @@ -702,9 +702,9 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rSt if (pParaNode->isToken()) { - ::rtl::OUString aStr = ConvertLikeToken(pParaNode, pEscNode, rParam.bInternational); + OUString aStr = ConvertLikeToken(pParaNode, pEscNode, rParam.bInternational); rString.appendAscii(" "); - rString.append(SetQuotation(aStr,::rtl::OUString("\'"),::rtl::OUString("\'\'"))); + rString.append(SetQuotation(aStr,OUString("\'"),OUString("\'\'"))); } else pParaNode->impl_parseNodeToString_throw( rString, aNewParam ); @@ -716,8 +716,8 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rSt // ----------------------------------------------------------------------------- sal_Bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode, ::com::sun::star::uno::Any &_rCatalog, - ::rtl::OUString &_rSchema, - ::rtl::OUString &_rTable, + OUString &_rSchema, + OUString &_rTable, const Reference< XDatabaseMetaData >& _xMetaData) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::getTableComponents" ); @@ -729,7 +729,7 @@ sal_Bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode, const OSQLParseNode* pTableNode = _pTableNode; // clear the parameter given _rCatalog = Any(); - _rSchema = _rTable = ::rtl::OUString(); + _rSchema = _rTable = OUString(); // see rule catalog_name: in sqlbison.y if (SQL_ISRULE(pTableNode,catalog_name)) { @@ -967,7 +967,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode*& pAppend, OSQLParseNode*& pLi sal_Int16 nScale = 0; try { - Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, ::rtl::OUString("Decimals") ); + Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, OUString("Decimals") ); aValue >>= nScale; } catch( Exception& ) @@ -998,19 +998,19 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode*& pAppend, OSQLParseNode*& pLi //----------------------------------------------------------------------------- OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType) { - ::rtl::OUString aEmptyString; + OUString aEmptyString; OSQLParseNode* pNewNode = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::set_fct_spec)); - pNewNode->append(new OSQLInternalNode(::rtl::OUString("{"), SQL_NODE_PUNCTUATION)); + pNewNode->append(new OSQLInternalNode(OUString("{"), SQL_NODE_PUNCTUATION)); OSQLParseNode* pDateNode = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::odbc_fct_spec)); pNewNode->append(pDateNode); - pNewNode->append(new OSQLInternalNode(::rtl::OUString("}"), SQL_NODE_PUNCTUATION)); + pNewNode->append(new OSQLInternalNode(OUString("}"), SQL_NODE_PUNCTUATION)); switch (nType) { case DataType::DATE: { Date aDate = DBTypeConversion::toDate(fValue,DBTypeConversion::getNULLDate(m_xFormatter->getNumberFormatsSupplier())); - ::rtl::OUString aString = DBTypeConversion::toDateString(aDate); + OUString aString = DBTypeConversion::toDateString(aDate); pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_D)); pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_STRING)); break; @@ -1018,7 +1018,7 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType) case DataType::TIME: { Time aTime = DBTypeConversion::toTime(fValue); - ::rtl::OUString aString = DBTypeConversion::toTimeString(aTime); + OUString aString = DBTypeConversion::toTimeString(aTime); pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_T)); pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_STRING)); break; @@ -1028,7 +1028,7 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType) DateTime aDateTime = DBTypeConversion::toDateTime(fValue,DBTypeConversion::getNULLDate(m_xFormatter->getNumberFormatsSupplier())); if (aDateTime.Seconds || aDateTime.Minutes || aDateTime.Hours) { - ::rtl::OUString aString = DBTypeConversion::toDateTimeString(aDateTime); + OUString aString = DBTypeConversion::toDateTimeString(aDateTime); pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_TS)); pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_STRING)); } @@ -1055,7 +1055,7 @@ OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral) sal_Int16 nScale = 0; try { - Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, ::rtl::OUString("Decimals") ); + Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, OUString("Decimals") ); aValue >>= nScale; } catch( Exception& ) @@ -1073,22 +1073,22 @@ OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral) return pReturn; } // ----------------------------------------------------------------------------- -::rtl::OUString OSQLParser::stringToDouble(const ::rtl::OUString& _rValue,sal_Int16 _nScale) +OUString OSQLParser::stringToDouble(const OUString& _rValue,sal_Int16 _nScale) { - ::rtl::OUString aValue; + OUString aValue; if(!m_xCharClass.is()) m_xCharClass = CharacterClassification::create( m_xContext ); if( s_xLocaleData.is() ) { try { - ParseResult aResult = m_xCharClass->parsePredefinedToken(KParseType::ANY_NUMBER,_rValue,0,m_pData->aLocale,0,::rtl::OUString(),KParseType::ANY_NUMBER,::rtl::OUString()); + ParseResult aResult = m_xCharClass->parsePredefinedToken(KParseType::ANY_NUMBER,_rValue,0,m_pData->aLocale,0,OUString(),KParseType::ANY_NUMBER,OUString()); if((aResult.TokenType & KParseType::IDENTNAME) && aResult.EndPos == _rValue.getLength()) { - aValue = ::rtl::OUString::valueOf(aResult.Value); + aValue = OUString::valueOf(aResult.Value); sal_Int32 nPos = aValue.lastIndexOf('.'); if((nPos+_nScale) < aValue.getLength()) - aValue = aValue.replaceAt(nPos+_nScale,aValue.getLength()-nPos-_nScale,::rtl::OUString()); + aValue = aValue.replaceAt(nPos+_nScale,aValue.getLength()-nPos-_nScale,OUString()); aValue = aValue.replaceAt(aValue.lastIndexOf('.'),1,s_xLocaleData->getLocaleItem(m_pData->aLocale).decimalSeparator); return aValue; } @@ -1108,7 +1108,7 @@ OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral) } //----------------------------------------------------------------------------- -OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const ::rtl::OUString& rStatement, +OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString& rStatement, const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const Reference< XPropertySet > & xField) { @@ -1128,7 +1128,7 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const : try { // get the field name - rtl::OUString aString; + OUString aString; // retrieve the fields name // #75243# use the RealName of the column if there is any otherwise the name which could be the alias @@ -1177,9 +1177,9 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const : if ( xFormats.is() ) { ::com::sun::star::lang::Locale aLocale; - aLocale.Language = ::rtl::OUString("en"); - aLocale.Country = ::rtl::OUString("US"); - ::rtl::OUString sFormat("YYYY-MM-DD"); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); + OUString sFormat("YYYY-MM-DD"); m_nDateFormatKey = xFormats->queryKey(sFormat,aLocale,sal_False); if ( m_nDateFormatKey == sal_Int32(-1) ) m_nDateFormatKey = xFormats->addNew(sFormat, aLocale); @@ -1221,12 +1221,12 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const : SQLyylval.pParseNode = NULL; // SQLyypvt = NULL; m_pParseTree = NULL; - m_sErrorMessage= ::rtl::OUString(); + m_sErrorMessage= OUString(); // Start the parser if (SQLyyparse() != 0) { - m_sFieldName= ::rtl::OUString(); + m_sFieldName= OUString(); m_xField.clear(); m_xFormatter.clear(); m_nFormatKey = 0; @@ -1247,7 +1247,7 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const : { (*s_pGarbageCollector)->clear(); - m_sFieldName= ::rtl::OUString(); + m_sFieldName= OUString(); m_xField.clear(); m_xFormatter.clear(); m_nFormatKey = 0; @@ -1299,7 +1299,7 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star: struct { OSQLParseNode::Rule eRule; // the parse node's ID for the rule - ::rtl::OString sRuleName; // the name of the rule ("select_statement") + OString sRuleName; // the name of the rule ("select_statement") } aRuleDescriptions[] = { { OSQLParseNode::select_statement, "select_statement" }, @@ -1460,7 +1460,7 @@ void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode) OSQLParseNode* pChildNode = _pNode->getChild(i); if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() > 1) { - OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString("?") ,SQL_NODE_PUNCTUATION,0); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString("?") ,SQL_NODE_PUNCTUATION,0); delete pChildNode->replace(pChildNode->getChild(0),pNewNode); sal_Int32 nChildCount = pChildNode->count(); for(sal_Int32 j=1;j < nChildCount;++j) @@ -1486,7 +1486,7 @@ bool OSQLParser::extractDate(OSQLParseNode* pLiteral,double& _rfValue) m_nFormatKey = ::dbtools::getDefaultNumberFormat( m_xField, xFormatTypes, m_pData->aLocale ); } catch( Exception& ) { } - ::rtl::OUString sValue = pLiteral->getTokenValue(); + OUString sValue = pLiteral->getTokenValue(); sal_Int32 nTryFormat = m_nFormatKey; bool bSuccess = lcl_saveConvertToNumber( m_xFormatter, nTryFormat, sValue, _rfValue ); @@ -1553,11 +1553,11 @@ OSQLParseNode::OSQLParseNode(const sal_Char * pNewValue, OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType"); } //----------------------------------------------------------------------------- -OSQLParseNode::OSQLParseNode(const ::rtl::OString &_rNewValue, +OSQLParseNode::OSQLParseNode(const OString &_rNewValue, SQLNodeType eNewNodeType, sal_uInt32 nNewNodeID) :m_pParent(NULL) - ,m_aNodeValue(rtl::OStringToOUString(_rNewValue,RTL_TEXTENCODING_UTF8)) + ,m_aNodeValue(OStringToOUString(_rNewValue,RTL_TEXTENCODING_UTF8)) ,m_eNodeType(eNewNodeType) ,m_nNodeID(nNewNodeID) { @@ -1566,7 +1566,7 @@ OSQLParseNode::OSQLParseNode(const ::rtl::OString &_rNewValue, OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType"); } //----------------------------------------------------------------------------- -OSQLParseNode::OSQLParseNode(const ::rtl::OUString &_rNewValue, +OSQLParseNode::OSQLParseNode(const OUString &_rNewValue, SQLNodeType eNewNodeType, sal_uInt32 nNewNodeID) :m_pParent(NULL) @@ -1670,7 +1670,7 @@ void OSQLParseNode::append(OSQLParseNode* pNewNode) m_aChildren.push_back(pNewNode); } // ----------------------------------------------------------------------------- -sal_Bool OSQLParseNode::addDateValue(::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const +sal_Bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::addDateValue" ); // special display for date/time values @@ -1684,19 +1684,19 @@ sal_Bool OSQLParseNode::addDateValue(::rtl::OUStringBuffer& rString, const SQLPa SQL_ISTOKEN(pODBCNodeChild, T) || SQL_ISTOKEN(pODBCNodeChild, TS) )) { - ::rtl::OUString suQuote(::rtl::OUString("'")); + OUString suQuote(OUString("'")); if (rParam.bPredicate) { if (rParam.aMetaData.shouldEscapeDateTime()) { - suQuote = ::rtl::OUString("#"); + suQuote = OUString("#"); } } else { if (rParam.aMetaData.shouldEscapeDateTime()) { - // suQuote = ::rtl::OUString("'"); + // suQuote = OUString("'"); return sal_False; } } @@ -1704,7 +1704,7 @@ sal_Bool OSQLParseNode::addDateValue(::rtl::OUStringBuffer& rString, const SQLPa if (!rString.isEmpty()) rString.appendAscii(" "); rString.append(suQuote); - const ::rtl::OUString sTokenValue = pODBCNode->m_aChildren[1]->getTokenValue(); + const OUString sTokenValue = pODBCNode->m_aChildren[1]->getTokenValue(); if (SQL_ISTOKEN(pODBCNodeChild, D)) { rString.append(rParam.bPredicate ? convertDateString(rParam, sTokenValue) : sTokenValue); @@ -1724,7 +1724,7 @@ sal_Bool OSQLParseNode::addDateValue(::rtl::OUStringBuffer& rString, const SQLPa return sal_False; } // ----------------------------------------------------------------------------- -void OSQLParseNode::replaceNodeValue(const ::rtl::OUString& rTableAlias,const ::rtl::OUString& rColumnName) +void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias,const OUString& rColumnName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::replaceNodeValue" ); for (sal_uInt32 i=0;iappend(pLeftLeaf); - pNewNode->append(new OSQLParseNode(::rtl::OUString("AND"),SQL_NODE_KEYWORD,SQL_TOKEN_AND)); + pNewNode->append(new OSQLParseNode(OUString("AND"),SQL_NODE_KEYWORD,SQL_TOKEN_AND)); pNewNode->append(pRightLeaf); return pNewNode; } //----------------------------------------------------------------------------- OSQLParseNode* MakeORNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf) { - OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition)); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition)); pNewNode->append(pLeftLeaf); - pNewNode->append(new OSQLParseNode(::rtl::OUString("OR"),SQL_NODE_KEYWORD,SQL_TOKEN_OR)); + pNewNode->append(new OSQLParseNode(OUString("OR"),SQL_NODE_KEYWORD,SQL_TOKEN_OR)); pNewNode->append(pRightLeaf); return pNewNode; } @@ -1869,9 +1869,9 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B OSQLParseNode* pRight = pSearchCondition->getChild(2); if(bNegate) { - OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_term)); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_term)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0)); - pNewNode->append(new OSQLParseNode(::rtl::OUString("AND"),SQL_NODE_KEYWORD,SQL_TOKEN_AND)); + pNewNode->append(new OSQLParseNode(OUString("AND"),SQL_NODE_KEYWORD,SQL_TOKEN_AND)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1)); replaceAndReset(pSearchCondition,pNewNode); @@ -1889,9 +1889,9 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B OSQLParseNode* pRight = pSearchCondition->getChild(2); if(bNegate) { - OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition)); + OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0)); - pNewNode->append(new OSQLParseNode(::rtl::OUString("OR"),SQL_NODE_KEYWORD,SQL_TOKEN_OR)); + pNewNode->append(new OSQLParseNode(OUString("OR"),SQL_NODE_KEYWORD,SQL_TOKEN_OR)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1)); replaceAndReset(pSearchCondition,pNewNode); @@ -1923,22 +1923,22 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B switch(pComparison->getNodeType()) { case SQL_NODE_EQUAL: - pNewComparison = new OSQLParseNode(::rtl::OUString("<>"),SQL_NODE_NOTEQUAL,SQL_NOTEQUAL); + pNewComparison = new OSQLParseNode(OUString("<>"),SQL_NODE_NOTEQUAL,SQL_NOTEQUAL); break; case SQL_NODE_LESS: - pNewComparison = new OSQLParseNode(::rtl::OUString(">="),SQL_NODE_GREATEQ,SQL_GREATEQ); + pNewComparison = new OSQLParseNode(OUString(">="),SQL_NODE_GREATEQ,SQL_GREATEQ); break; case SQL_NODE_GREAT: - pNewComparison = new OSQLParseNode(::rtl::OUString("<="),SQL_NODE_LESSEQ,SQL_LESSEQ); + pNewComparison = new OSQLParseNode(OUString("<="),SQL_NODE_LESSEQ,SQL_LESSEQ); break; case SQL_NODE_LESSEQ: - pNewComparison = new OSQLParseNode(::rtl::OUString(">"),SQL_NODE_GREAT,SQL_GREAT); + pNewComparison = new OSQLParseNode(OUString(">"),SQL_NODE_GREAT,SQL_GREAT); break; case SQL_NODE_GREATEQ: - pNewComparison = new OSQLParseNode(::rtl::OUString("<"),SQL_NODE_LESS,SQL_LESS); + pNewComparison = new OSQLParseNode(OUString("<"),SQL_NODE_LESS,SQL_LESS); break; case SQL_NODE_NOTEQUAL: - pNewComparison = new OSQLParseNode(::rtl::OUString("="),SQL_NODE_EQUAL,SQL_EQUAL); + pNewComparison = new OSQLParseNode(OUString("="),SQL_NODE_EQUAL,SQL_EQUAL); break; default: OSL_FAIL( "OSQLParseNode::negateSearchCondition: unexpected node type!" ); @@ -1963,9 +1963,9 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B OSQLParseNode* pNot = pPart2->getChild(nNotPos); OSQLParseNode* pNotNot = NULL; if(pNot->isRule()) - pNotNot = new OSQLParseNode(::rtl::OUString("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode(OUString("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT); else - pNotNot = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not)); + pNotNot = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not)); pPart2->replace(pNot, pNotNot); delete pNot; } @@ -1974,9 +1974,9 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B OSQLParseNode* pNot = pSearchCondition->getChild( 1 )->getChild( 0 ); OSQLParseNode* pNotNot = NULL; if(pNot->isRule()) - pNotNot = new OSQLParseNode(::rtl::OUString("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode(OUString("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT); else - pNotNot = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not)); + pNotNot = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not)); pSearchCondition->getChild( 1 )->replace(pNot, pNotNot); delete pNot; } @@ -2065,10 +2065,10 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition) OSQLParseNode* p1stAnd = MakeANDNode(pA,pB); OSQLParseNode* p2ndAnd = MakeANDNode(new OSQLParseNode(*pA),pC); pNewNode = MakeORNode(p1stAnd,p2ndAnd); - OSQLParseNode* pNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNode->append(new OSQLParseNode(::rtl::OUString("("),SQL_NODE_PUNCTUATION)); + OSQLParseNode* pNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); + pNode->append(new OSQLParseNode(OUString("("),SQL_NODE_PUNCTUATION)); pNode->append(pNewNode); - pNode->append(new OSQLParseNode(::rtl::OUString(")"),SQL_NODE_PUNCTUATION)); + pNode->append(new OSQLParseNode(OUString(")"),SQL_NODE_PUNCTUATION)); OSQLParseNode::eraseBraces(p1stAnd); OSQLParseNode::eraseBraces(p2ndAnd); replaceAndReset(pSearchCondition,pNode); @@ -2145,10 +2145,10 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pRight = pSearchCondition->getChild(2)->removeAt(2); OSQLParseNode* pNode = MakeORNode(pLeft,pRight); - OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(::rtl::OUString("("),SQL_NODE_PUNCTUATION)); + OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); + pNewRule->append(new OSQLParseNode(OUString("("),SQL_NODE_PUNCTUATION)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(::rtl::OUString(")"),SQL_NODE_PUNCTUATION)); + pNewRule->append(new OSQLParseNode(OUString(")"),SQL_NODE_PUNCTUATION)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2162,10 +2162,10 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pRight = pSearchCondition->getChild(2)->removeAt(2); OSQLParseNode* pNode = MakeORNode(pLeft,pRight); - OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(::rtl::OUString("("),SQL_NODE_PUNCTUATION)); + OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); + pNewRule->append(new OSQLParseNode(OUString("("),SQL_NODE_PUNCTUATION)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(::rtl::OUString(")"),SQL_NODE_PUNCTUATION)); + pNewRule->append(new OSQLParseNode(OUString(")"),SQL_NODE_PUNCTUATION)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2179,10 +2179,10 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pRight = pSearchCondition->getChild(2)->removeAt((sal_uInt32)0); OSQLParseNode* pNode = MakeORNode(pLeft,pRight); - OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(::rtl::OUString("("),SQL_NODE_PUNCTUATION)); + OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); + pNewRule->append(new OSQLParseNode(OUString("("),SQL_NODE_PUNCTUATION)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(::rtl::OUString(")"),SQL_NODE_PUNCTUATION)); + pNewRule->append(new OSQLParseNode(OUString(")"),SQL_NODE_PUNCTUATION)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2196,10 +2196,10 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pRight = pSearchCondition->getChild(2)->removeAt((sal_uInt32)0); OSQLParseNode* pNode = MakeORNode(pLeft,pRight); - OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(::rtl::OUString("("),SQL_NODE_PUNCTUATION)); + OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); + pNewRule->append(new OSQLParseNode(OUString("("),SQL_NODE_PUNCTUATION)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(::rtl::OUString(")"),SQL_NODE_PUNCTUATION)); + pNewRule->append(new OSQLParseNode(OUString(")"),SQL_NODE_PUNCTUATION)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2211,15 +2211,15 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) } #if OSL_DEBUG_LEVEL > 1 // ----------------------------------------------------------------------------- -void OSQLParseNode::showParseTree( ::rtl::OUString& rString ) const +void OSQLParseNode::showParseTree( OUString& rString ) const { - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; showParseTree( aBuf, 0 ); rString = aBuf.makeStringAndClear(); } // ----------------------------------------------------------------------------- -void OSQLParseNode::showParseTree( ::rtl::OUStringBuffer& _inout_rBuffer, sal_uInt32 nLevel ) const +void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nLevel ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::showParseTree" ); @@ -2251,7 +2251,7 @@ void OSQLParseNode::showParseTree( ::rtl::OUStringBuffer& _inout_rBuffer, sal_uI case SQL_NODE_KEYWORD: _inout_rBuffer.appendAscii( "SQL_KEYWORD: " ); - _inout_rBuffer.append( ::rtl::OStringToOUString( OSQLParser::TokenIDToStr( getTokenID() ), RTL_TEXTENCODING_UTF8 ) ); + _inout_rBuffer.append( OStringToOUString( OSQLParser::TokenIDToStr( getTokenID() ), RTL_TEXTENCODING_UTF8 ) ); _inout_rBuffer.append( sal_Unicode( '\n' ) ); break; @@ -2383,7 +2383,7 @@ OSQLParseNode* OSQLParseNode::replace (OSQLParseNode* pOldSubNode, OSQLParseNode return pOldSubNode; } // ----------------------------------------------------------------------------- -void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const +void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::parseLeaf" ); // Found a leaf @@ -2395,13 +2395,13 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode if (!rString.isEmpty()) rString.appendAscii(" "); - const ::rtl::OString sT = OSQLParser::TokenIDToStr(m_nNodeID, rParam.bInternational ? &rParam.m_rContext : NULL); - rString.append(::rtl::OStringToOUString(sT,RTL_TEXTENCODING_UTF8)); + const OString sT = OSQLParser::TokenIDToStr(m_nNodeID, rParam.bInternational ? &rParam.m_rContext : NULL); + rString.append(OStringToOUString(sT,RTL_TEXTENCODING_UTF8)); } break; case SQL_NODE_STRING: if (!rString.isEmpty()) rString.appendAscii(" "); - rString.append(SetQuotation(m_aNodeValue,::rtl::OUString("\'"),::rtl::OUString("\'\'"))); + rString.append(SetQuotation(m_aNodeValue,OUString("\'"),OUString("\'\'"))); break; case SQL_NODE_NAME: if (!rString.isEmpty()) @@ -2443,7 +2443,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode case SQL_NODE_INTNUM: case SQL_NODE_APPROXNUM: { - ::rtl::OUString aTmp = m_aNodeValue; + OUString aTmp = m_aNodeValue; if (rParam.bInternational && rParam.bPredicate && rParam.cDecSep != '.') aTmp = aTmp.replace('.', rParam.cDecSep); @@ -2478,10 +2478,10 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode } // ----------------------------------------------------------------------------- -sal_Int32 OSQLParser::getFunctionReturnType(const ::rtl::OUString& _sFunctionName, const IParseContext* pContext) +sal_Int32 OSQLParser::getFunctionReturnType(const OUString& _sFunctionName, const IParseContext* pContext) { sal_Int32 nType = DataType::VARCHAR; - ::rtl::OString sFunctionName(::rtl::OUStringToOString(_sFunctionName,RTL_TEXTENCODING_UTF8)); + OString sFunctionName(OUStringToOString(_sFunctionName,RTL_TEXTENCODING_UTF8)); if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_ASCII,pContext))) nType = DataType::INTEGER; else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_BIT_LENGTH,pContext))) nType = DataType::INTEGER; @@ -2689,12 +2689,12 @@ OSQLParseNode::Rule OSQLParseNode::getKnownRuleID() const return OSQLParser::RuleIDToRule( getRuleID() ); } // ----------------------------------------------------------------------------- -::rtl::OUString OSQLParseNode::getTableRange(const OSQLParseNode* _pTableRef) +OUString OSQLParseNode::getTableRange(const OSQLParseNode* _pTableRef) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::getTableRange" ); OSL_ENSURE(_pTableRef && _pTableRef->count() > 1 && _pTableRef->getKnownRuleID() == OSQLParseNode::table_ref,"Invalid node give, only table ref is allowed!"); const sal_uInt32 nCount = _pTableRef->count(); - ::rtl::OUString sTableRange; + OUString sTableRange; if ( nCount == 2 || (nCount == 3 && !_pTableRef->getChild(0)->isToken()) || nCount == 5 ) { const OSQLParseNode* pNode = _pTableRef->getChild(nCount - (nCount == 2 ? 1 : 2)); diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index e6eb018b1f47..4de9d4c1d10a 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.cxx @@ -56,7 +56,7 @@ namespace connectivity static SharedResources_Impl& getInstance(); - ::rtl::OUString getResourceString( ResourceId _nId ); + OUString getResourceString( ResourceId _nId ); private: SharedResources_Impl(); @@ -88,12 +88,12 @@ namespace connectivity } //-------------------------------------------------------------------- - ::rtl::OUString SharedResources_Impl::getResourceString( ResourceId _nId ) + OUString SharedResources_Impl::getResourceString( ResourceId _nId ) { if ( m_pResourceBundle.get() == NULL ) // this should never happen, but we gracefully ignore it. It has been reported // in the constructor in non-product builds. - return ::rtl::OUString(); + return OUString(); return m_pResourceBundle->loadString( _nId ); } @@ -132,12 +132,12 @@ namespace connectivity //==================================================================== namespace { - size_t lcl_substitute( ::rtl::OUString& _inout_rString, - const sal_Char* _pAsciiPattern, const ::rtl::OUString& _rReplace ) + size_t lcl_substitute( OUString& _inout_rString, + const sal_Char* _pAsciiPattern, const OUString& _rReplace ) { size_t nOccurrences = 0; - ::rtl::OUString sPattern( ::rtl::OUString::createFromAscii( _pAsciiPattern ) ); + OUString sPattern( OUString::createFromAscii( _pAsciiPattern ) ); sal_Int32 nIndex = 0; while ( ( nIndex = _inout_rString.indexOf( sPattern ) ) > -1 ) { @@ -165,50 +165,50 @@ namespace connectivity } //-------------------------------------------------------------------- - ::rtl::OUString SharedResources::getResourceString( ResourceId _nResId ) const + OUString SharedResources::getResourceString( ResourceId _nResId ) const { return SharedResources_Impl::getInstance().getResourceString( _nResId ); } //-------------------------------------------------------------------- - ::rtl::OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, - const sal_Char* _pAsciiPatternToReplace, const ::rtl::OUString& _rStringToSubstitute ) const + OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, + const sal_Char* _pAsciiPatternToReplace, const OUString& _rStringToSubstitute ) const { - ::rtl::OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); + OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace, _rStringToSubstitute ) ); return sString; } //-------------------------------------------------------------------- - ::rtl::OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, - const sal_Char* _pAsciiPatternToReplace1, const ::rtl::OUString& _rStringToSubstitute1, - const sal_Char* _pAsciiPatternToReplace2, const ::rtl::OUString& _rStringToSubstitute2 ) const + OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, + const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1, + const sal_Char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2 ) const { - ::rtl::OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); + OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace1, _rStringToSubstitute1 ) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace2, _rStringToSubstitute2 ) ); return sString; } //-------------------------------------------------------------------- - ::rtl::OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, - const sal_Char* _pAsciiPatternToReplace1, const ::rtl::OUString& _rStringToSubstitute1, - const sal_Char* _pAsciiPatternToReplace2, const ::rtl::OUString& _rStringToSubstitute2, - const sal_Char* _pAsciiPatternToReplace3, const ::rtl::OUString& _rStringToSubstitute3 ) const + OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, + const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1, + const sal_Char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2, + const sal_Char* _pAsciiPatternToReplace3, const OUString& _rStringToSubstitute3 ) const { - ::rtl::OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); + OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace1, _rStringToSubstitute1 ) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace2, _rStringToSubstitute2 ) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace3, _rStringToSubstitute3 ) ); return sString; } //-------------------------------------------------------------------- - ::rtl::OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, - const ::std::list< ::std::pair > _aStringToSubstitutes) const + OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, + const ::std::list< ::std::pair > _aStringToSubstitutes) const { - ::rtl::OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); - ::std::list< ::std::pair >::const_iterator aIter = _aStringToSubstitutes.begin(); - ::std::list< ::std::pair >::const_iterator aEnd = _aStringToSubstitutes.end(); + OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); + ::std::list< ::std::pair >::const_iterator aIter = _aStringToSubstitutes.begin(); + ::std::list< ::std::pair >::const_iterator aEnd = _aStringToSubstitutes.end(); for(;aIter != aEnd; ++aIter) OSL_VERIFY( lcl_substitute( sString, aIter->first, aIter->second ) ); diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index cae74e276dd0..a51e17a4ca17 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.cxx @@ -185,19 +185,19 @@ Reference< XNameAccess > SAL_CALL OCatalog::getGroups( ) throw(RuntimeException return const_cast(this)->m_pGroups; } // ----------------------------------------------------------------------------- -::rtl::OUString OCatalog::buildName(const Reference< XRow >& _xRow) +OUString OCatalog::buildName(const Reference< XRow >& _xRow) { - ::rtl::OUString sCatalog = _xRow->getString(1); + OUString sCatalog = _xRow->getString(1); if ( _xRow->wasNull() ) - sCatalog = ::rtl::OUString(); - ::rtl::OUString sSchema = _xRow->getString(2); + sCatalog = OUString(); + OUString sSchema = _xRow->getString(2); if ( _xRow->wasNull() ) - sSchema = ::rtl::OUString(); - ::rtl::OUString sTable = _xRow->getString(3); + sSchema = OUString(); + OUString sTable = _xRow->getString(3); if ( _xRow->wasNull() ) - sTable = ::rtl::OUString(); + sTable = OUString(); - ::rtl::OUString sComposedName( + OUString sComposedName( ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation ) ); return sComposedName; } @@ -220,7 +220,7 @@ void OCatalog::fillNames(Reference< XResultSet >& _xResult,TStringVector& _rName void ODescriptor::construct() { sal_Int32 nAttrib = isNew() ? 0 : ::com::sun::star::beans::PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(static_cast< OUString*>(0))); } // ------------------------------------------------------------------------- ODescriptor::~ODescriptor() diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 725a3dba298f..2bf53267d2b7 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -47,7 +47,7 @@ namespace { template < typename T> class OHardRefMap : public connectivity::sdbcx::IObjectCollection { - typedef ::std::multimap< ::rtl::OUString, T , ::comphelper::UStringMixLess> ObjectMap; + typedef ::std::multimap< OUString, T , ::comphelper::UStringMixLess> ObjectMap; typedef typename ObjectMap::iterator ObjectIter; typedef typename ObjectMap::value_type ObjectEntry; @@ -69,7 +69,7 @@ namespace m_aElements.reserve(nLength); } // ----------------------------------------------------------------------------- - virtual bool exists(const ::rtl::OUString& _sName ) + virtual bool exists(const OUString& _sName ) { return m_aNameMap.find(_sName) != m_aNameMap.end(); } @@ -104,7 +104,7 @@ namespace m_aNameMap.clear(); } // ----------------------------------------------------------------------------- - virtual void insert(const ::rtl::OUString& _sName,const ObjectType& _xObject) + virtual void insert(const OUString& _sName,const ObjectType& _xObject) { m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), ObjectEntry(_sName,_xObject))); } @@ -118,7 +118,7 @@ namespace m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), ObjectEntry(*i,ObjectType()))); } // ----------------------------------------------------------------------------- - virtual bool rename(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName) + virtual bool rename(const OUString _sOldName,const OUString _sNewName) { bool bRet = false; ObjectIter aIter = m_aNameMap.find(_sOldName); @@ -141,11 +141,11 @@ namespace return static_cast(m_aNameMap.size()); } // ----------------------------------------------------------------------------- - virtual Sequence< ::rtl::OUString > getElementNames() + virtual Sequence< OUString > getElementNames() { - Sequence< ::rtl::OUString > aNameList(m_aElements.size()); + Sequence< OUString > aNameList(m_aElements.size()); - ::rtl::OUString* pStringArray = aNameList.getArray(); + OUString* pStringArray = aNameList.getArray(); typename ::std::vector< ObjectIter >::const_iterator aEnd = m_aElements.end(); for(typename ::std::vector< ObjectIter >::const_iterator aIter = m_aElements.begin(); aIter != aEnd;++aIter,++pStringArray) *pStringArray = (*aIter)->first; @@ -153,7 +153,7 @@ namespace return aNameList; } // ----------------------------------------------------------------------------- - virtual ::rtl::OUString getName(sal_Int32 _nIndex) + virtual OUString getName(sal_Int32 _nIndex) { return m_aElements[_nIndex]->first; } @@ -165,7 +165,7 @@ namespace ::comphelper::disposeComponent(xComp); m_aElements[_nIndex]->second = T(); - ::rtl::OUString sName = m_aElements[_nIndex]->first; + OUString sName = m_aElements[_nIndex]->first; m_aElements.erase(m_aElements.begin()+_nIndex); m_aNameMap.erase(sName); } @@ -185,14 +185,14 @@ namespace m_aNameMap.clear(); } // ----------------------------------------------------------------------------- - virtual sal_Int32 findColumn( const ::rtl::OUString& columnName ) + virtual sal_Int32 findColumn( const OUString& columnName ) { ObjectIter aIter = m_aNameMap.find(columnName); OSL_ENSURE(aIter != m_aNameMap.end(),"findColumn:: Illegal name!"); return m_aElements.size() - (m_aElements.end() - ::std::find(m_aElements.begin(),m_aElements.end(),aIter)); } // ----------------------------------------------------------------------------- - virtual ::rtl::OUString findColumnAtIndex( sal_Int32 _nIndex) + virtual OUString findColumnAtIndex( sal_Int32 _nIndex) { OSL_ENSURE(_nIndex >= 0 && _nIndex < static_cast(m_aElements.size()),"Illegal argument!"); return m_aElements[_nIndex]->first; @@ -204,7 +204,7 @@ namespace return m_aElements[_nIndex]->second; } // ----------------------------------------------------------------------------- - virtual ObjectType getObject(const ::rtl::OUString& columnName) + virtual ObjectType getObject(const OUString& columnName) { return m_aNameMap.find(columnName)->second; } @@ -310,19 +310,19 @@ Any SAL_CALL OCollection::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsEx { ::osl::MutexGuard aGuard(m_rMutex); if (Index < 0 || Index >= m_pElements->size() ) - throw IndexOutOfBoundsException(::rtl::OUString::valueOf(Index),static_cast(this)); + throw IndexOutOfBoundsException(OUString::valueOf(Index),static_cast(this)); return makeAny(getObject(Index)); } // ------------------------------------------------------------------------- -Any SAL_CALL OCollection::getByName( const ::rtl::OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL OCollection::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); if ( !m_pElements->exists(aName) ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_NO_ELEMENT_NAME, "$name$", aName ) ); @@ -332,7 +332,7 @@ Any SAL_CALL OCollection::getByName( const ::rtl::OUString& aName ) throw(NoSuch return makeAny(getObject(m_pElements->findColumn(aName))); } // ------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL OCollection::getElementNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OCollection::getElementNames( ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); return m_pElements->getElementNames(); @@ -362,10 +362,10 @@ Reference< XPropertySet > SAL_CALL OCollection::createDataDescriptor( ) throw(R return createDescriptor(); } // ----------------------------------------------------------------------------- -::rtl::OUString OCollection::getNameForObject(const ObjectType& _xObject) +OUString OCollection::getNameForObject(const ObjectType& _xObject) { OSL_ENSURE(_xObject.is(),"OCollection::getNameForObject: Object is NULL!"); - ::rtl::OUString sName; + OUString sName; _xObject->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sName; return sName; } @@ -375,7 +375,7 @@ void SAL_CALL OCollection::appendByDescriptor( const Reference< XPropertySet >& { ::osl::ClearableMutexGuard aGuard(m_rMutex); - ::rtl::OUString sName = getNameForObject( descriptor ); + OUString sName = getNameForObject( descriptor ); if ( m_pElements->exists(sName) ) throw ElementExistException(sName,static_cast(this)); @@ -399,7 +399,7 @@ void SAL_CALL OCollection::appendByDescriptor( const Reference< XPropertySet >& } // ------------------------------------------------------------------------- // XDrop -void SAL_CALL OCollection::dropByName( const ::rtl::OUString& elementName ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL OCollection::dropByName( const OUString& elementName ) throw(SQLException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); @@ -413,14 +413,14 @@ void SAL_CALL OCollection::dropByIndex( sal_Int32 index ) throw(SQLException, In { ::osl::MutexGuard aGuard(m_rMutex); if(index <0 || index >= getCount()) - throw IndexOutOfBoundsException(::rtl::OUString::valueOf(index),static_cast(this)); + throw IndexOutOfBoundsException(OUString::valueOf(index),static_cast(this)); dropImpl(index); } // ----------------------------------------------------------------------------- void OCollection::dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop) { - ::rtl::OUString elementName = m_pElements->getName(_nIndex); + OUString elementName = m_pElements->getName(_nIndex); if ( _bReallyDrop ) dropObject(_nIndex,elementName); @@ -431,7 +431,7 @@ void OCollection::dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop) notifyElementRemoved(elementName); } // ----------------------------------------------------------------------------- -void OCollection::notifyElementRemoved(const ::rtl::OUString& _sName) +void OCollection::notifyElementRemoved(const OUString& _sName) { ContainerEvent aEvent(static_cast(this), makeAny(_sName), Any(), Any()); // note that xExistent may be empty, in case somebody removed the data source while it is not alive at this moment @@ -440,12 +440,12 @@ void OCollection::notifyElementRemoved(const ::rtl::OUString& _sName) static_cast(aListenerLoop.next())->elementRemoved(aEvent); } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OCollection::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCollection::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { if ( !m_pElements->exists(columnName) ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + const OUString sError( aResources.getResourceStringWithSubstitution( STR_UNKNOWN_COLUMN_NAME, "$columnname$", columnName ) ); @@ -499,7 +499,7 @@ sal_Int32 SAL_CALL OCollection::getCount( ) throw(RuntimeException) return m_pElements->size(); } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OCollection::hasByName( const ::rtl::OUString& aName ) throw(RuntimeException) +sal_Bool SAL_CALL OCollection::hasByName( const OUString& aName ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); return m_pElements->exists(aName); @@ -515,14 +515,14 @@ void SAL_CALL OCollection::removeRefreshListener( const Reference< XRefreshListe m_aRefreshListeners.removeInterface(l); } // ----------------------------------------------------------------------------- -void OCollection::insertElement(const ::rtl::OUString& _sElementName,const ObjectType& _xElement) +void OCollection::insertElement(const OUString& _sElementName,const ObjectType& _xElement) { OSL_ENSURE(!m_pElements->exists(_sElementName),"Element already exists"); if ( !m_pElements->exists(_sElementName) ) m_pElements->insert(_sElementName,_xElement); } // ----------------------------------------------------------------------------- -void OCollection::renameObject(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName) +void OCollection::renameObject(const OUString _sOldName,const OUString _sNewName) { OSL_ENSURE(m_pElements->exists(_sOldName),"Element doesn't exist"); OSL_ENSURE(!m_pElements->exists(_sNewName),"Element already exists"); @@ -582,12 +582,12 @@ ObjectType OCollection::cloneDescriptor( const ObjectType& _descriptor ) return xNewDescriptor; } // ----------------------------------------------------------------------------- -ObjectType OCollection::appendObject( const ::rtl::OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor ) +ObjectType OCollection::appendObject( const OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor ) { return cloneDescriptor( descriptor ); } // ----------------------------------------------------------------------------- -void OCollection::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString /*_sElementName*/) +void OCollection::dropObject(sal_Int32 /*_nPos*/,const OUString /*_sElementName*/) { } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx index efe31d67a3ab..8f1f858ad040 100644 --- a/connectivity/source/sdbcx/VColumn.cxx +++ b/connectivity/source/sdbcx/VColumn.cxx @@ -32,29 +32,29 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString("com.sun.star.sdbcx.VColumnDescription"); - return ::rtl::OUString("com.sun.star.sdbcx.VColumn"); + return OUString("com.sun.star.sdbcx.VColumnDescription"); + return OUString("com.sun.star.sdbcx.VColumn"); } // ----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); + ::com::sun::star::uno::Sequence< OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.ColumnDescription"); + aSupported[0] = OUString("com.sun.star.sdbcx.ColumnDescription"); else - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Column"); + aSupported[0] = OUString("com.sun.star.sdbcx.Column"); return aSupported; } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OColumn::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OColumn::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -75,10 +75,10 @@ OColumn::OColumn(sal_Bool _bCase) construct(); } // ------------------------------------------------------------------------- -OColumn::OColumn( const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, - const ::rtl::OUString& _Description, +OColumn::OColumn( const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, + const OUString& _Description, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -87,9 +87,9 @@ OColumn::OColumn( const ::rtl::OUString& _Name, sal_Bool _IsRowVersion, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName) + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName) :OColumnDescriptor_BASE(m_aMutex) ,ODescriptor(OColumnDescriptor_BASE::rBHelper,_bCase) ,m_TypeName(_TypeName) @@ -217,12 +217,12 @@ Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor( ) throw(Runti } // ----------------------------------------------------------------------------- // XNamed -::rtl::OUString SAL_CALL OColumn::getName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OColumn::getName( ) throw(::com::sun::star::uno::RuntimeException) { return m_Name; } // ----------------------------------------------------------------------------- -void SAL_CALL OColumn::setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OColumn::setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException) { m_Name = aName; } diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index 70108c162aa2..72a2be7ddb19 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.cxx @@ -44,7 +44,7 @@ OGroup::OGroup(sal_Bool _bCase) : OGroup_BASE(m_aMutex) { } // ------------------------------------------------------------------------- -OGroup::OGroup(const ::rtl::OUString& _Name,sal_Bool _bCase) : OGroup_BASE(m_aMutex) +OGroup::OGroup(const OUString& _Name,sal_Bool _bCase) : OGroup_BASE(m_aMutex) ,ODescriptor(OGroup_BASE::rBHelper,_bCase) ,m_pUsers(NULL) { @@ -113,7 +113,7 @@ Reference< XNameAccess > SAL_CALL OGroup::getUsers( ) throw(RuntimeException) } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OGroup::getPrivileges( const ::rtl::OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL OGroup::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OGroup_BASE::rBHelper.bDisposed); @@ -121,7 +121,7 @@ sal_Int32 SAL_CALL OGroup::getPrivileges( const ::rtl::OUString& /*objName*/, sa return 0; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const ::rtl::OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OGroup_BASE::rBHelper.bDisposed); @@ -129,14 +129,14 @@ sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const ::rtl::OUString& /*objN return 0; } // ------------------------------------------------------------------------- -void SAL_CALL OGroup::grantPrivileges( const ::rtl::OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL OGroup::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OGroup_BASE::rBHelper.bDisposed); throwFeatureNotImplementedException( "XAuthorizable::grantPrivileges", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL OGroup::revokePrivileges( const ::rtl::OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL OGroup::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OGroup_BASE::rBHelper.bDisposed); @@ -148,12 +148,12 @@ void SAL_CALL OGroup::revokePrivileges( const ::rtl::OUString& /*objName*/, sal_ return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OGroup::getName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OGroup::getName( ) throw(::com::sun::star::uno::RuntimeException) { return m_Name; } // ----------------------------------------------------------------------------- -void SAL_CALL OGroup::setName( const ::rtl::OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OGroup::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) { throwFeatureNotImplementedException( "XNamed::setName", *this ); } diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index 54bf29e2ee66..f60731646089 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.cxx @@ -37,29 +37,29 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OIndex::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OIndex::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString("com.sun.star.sdbcx.VIndexDescriptor"); - return ::rtl::OUString("com.sun.star.sdbcx.VIndex"); + return OUString("com.sun.star.sdbcx.VIndexDescriptor"); + return OUString("com.sun.star.sdbcx.VIndex"); } // ----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OIndex::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OIndex::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); + ::com::sun::star::uno::Sequence< OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.IndexDescriptor"); + aSupported[0] = OUString("com.sun.star.sdbcx.IndexDescriptor"); else - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Index"); + aSupported[0] = OUString("com.sun.star.sdbcx.Index"); return aSupported; } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OIndex::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OIndex::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -75,8 +75,8 @@ OIndex::OIndex(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) { } // ------------------------------------------------------------------------- -OIndex::OIndex( const ::rtl::OUString& _Name, - const ::rtl::OUString& _Catalog, +OIndex::OIndex( const OUString& _Name, + const OUString& _Catalog, sal_Bool _isUnique, sal_Bool _isPrimaryKeyIndex, sal_Bool _isClustered, @@ -132,7 +132,7 @@ void OIndex::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(static_cast< OUString*>(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE), PROPERTY_ID_ISUNIQUE, nAttrib,&m_IsUnique, ::getBooleanCppuType()); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISPRIMARYKEYINDEX),PROPERTY_ID_ISPRIMARYKEYINDEX, nAttrib,&m_IsPrimaryKeyIndex, ::getBooleanCppuType()); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED), PROPERTY_ID_ISCLUSTERED, nAttrib,&m_IsClustered, ::getBooleanCppuType()); @@ -185,12 +185,12 @@ Reference< XPropertySet > SAL_CALL OIndex::createDataDescriptor( ) throw(Runtim return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OIndex::getName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OIndex::getName( ) throw(::com::sun::star::uno::RuntimeException) { return m_Name; } // ----------------------------------------------------------------------------- -void SAL_CALL OIndex::setName( const ::rtl::OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OIndex::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) { } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx index 15a20a2dec59..b4952784e872 100644 --- a/connectivity/source/sdbcx/VIndexColumn.cxx +++ b/connectivity/source/sdbcx/VIndexColumn.cxx @@ -25,29 +25,29 @@ using namespace connectivity::sdbcx; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OIndexColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OIndexColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString("com.sun.star.sdbcx.VIndexColumnDescription"); - return ::rtl::OUString("com.sun.star.sdbcx.VIndex"); + return OUString("com.sun.star.sdbcx.VIndexColumnDescription"); + return OUString("com.sun.star.sdbcx.VIndex"); } // ----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OIndexColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OIndexColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); + ::com::sun::star::uno::Sequence< OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.IndexDescription"); + aSupported[0] = OUString("com.sun.star.sdbcx.IndexDescription"); else - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Index"); + aSupported[0] = OUString("com.sun.star.sdbcx.Index"); return aSupported; } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OIndexColumn::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OIndexColumn::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -61,9 +61,9 @@ OIndexColumn::OIndexColumn(sal_Bool _bCase) : OColumn(_bCase), m_IsAscending(sa // ------------------------------------------------------------------------- OIndexColumn::OIndexColumn( sal_Bool _IsAscending, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, + const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -72,13 +72,13 @@ OIndexColumn::OIndexColumn( sal_Bool _IsAscending, sal_Bool _IsRowVersion, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName ) : OColumn(_Name, _TypeName, _DefaultValue, - ::rtl::OUString(), + OUString(), _IsNullable, _Precision, _Scale, diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index cc9b23bf573f..0f1ed7294c53 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.cxx @@ -35,29 +35,29 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OKey::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OKey::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString("com.sun.star.sdbcx.VKeyDescription"); - return ::rtl::OUString("com.sun.star.sdbcx.VKey"); + return OUString("com.sun.star.sdbcx.VKeyDescription"); + return OUString("com.sun.star.sdbcx.VKey"); } // ----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OKey::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OKey::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); + ::com::sun::star::uno::Sequence< OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.KeyDescription"); + aSupported[0] = OUString("com.sun.star.sdbcx.KeyDescription"); else - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Key"); + aSupported[0] = OUString("com.sun.star.sdbcx.Key"); return aSupported; } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OKey::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -71,7 +71,7 @@ OKey::OKey(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) { } // ------------------------------------------------------------------------- -OKey::OKey(const ::rtl::OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase) +OKey::OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase) ,m_aProps(_rProps) @@ -79,8 +79,8 @@ OKey::OKey(const ::rtl::OUString& _Name,const TKeyProperties& _rProps,sal_Bool _ { m_Name = _Name; } -//OKey::OKey( const ::rtl::OUString& _Name, -// const ::rtl::OUString& _ReferencedTable, +//OKey::OKey( const OUString& _Name, +// const OUString& _ReferencedTable, // sal_Int32 _Type, // sal_Int32 _UpdateRule, // sal_Int32 _DeleteRule, @@ -128,7 +128,7 @@ void OKey::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(static_cast< OUString*>(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(static_cast(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(static_cast(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(static_cast(0))); @@ -193,12 +193,12 @@ Reference< XPropertySet > SAL_CALL OKey::createDataDescriptor( ) throw(RuntimeE return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OKey::getName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OKey::getName( ) throw(::com::sun::star::uno::RuntimeException) { return m_Name; } // ----------------------------------------------------------------------------- -void SAL_CALL OKey::setName( const ::rtl::OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OKey::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) { } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx index 48e1df5154f3..f2475fa7bf02 100644 --- a/connectivity/source/sdbcx/VKeyColumn.cxx +++ b/connectivity/source/sdbcx/VKeyColumn.cxx @@ -26,29 +26,29 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace cppu; // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OKeyColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OKeyColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString("com.sun.star.sdbcx.VKeyColumnDescription"); - return ::rtl::OUString("com.sun.star.sdbcx.VKeyColumn"); + return OUString("com.sun.star.sdbcx.VKeyColumnDescription"); + return OUString("com.sun.star.sdbcx.VKeyColumn"); } // ----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OKeyColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OKeyColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); + ::com::sun::star::uno::Sequence< OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.KeyColumnDescription"); + aSupported[0] = OUString("com.sun.star.sdbcx.KeyColumnDescription"); else - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.KeyColumn"); + aSupported[0] = OUString("com.sun.star.sdbcx.KeyColumn"); return aSupported; } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OKeyColumn::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OKeyColumn::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -60,10 +60,10 @@ OKeyColumn::OKeyColumn(sal_Bool _bCase) : OColumn(_bCase) construct(); } // ------------------------------------------------------------------------- -OKeyColumn::OKeyColumn( const ::rtl::OUString& _ReferencedColumn, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _TypeName, - const ::rtl::OUString& _DefaultValue, +OKeyColumn::OKeyColumn( const OUString& _ReferencedColumn, + const OUString& _Name, + const OUString& _TypeName, + const OUString& _DefaultValue, sal_Int32 _IsNullable, sal_Int32 _Precision, sal_Int32 _Scale, @@ -72,13 +72,13 @@ OKeyColumn::OKeyColumn( const ::rtl::OUString& _ReferencedColumn, sal_Bool _IsRowVersion, sal_Bool _IsCurrency, sal_Bool _bCase, - const ::rtl::OUString& _CatalogName, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _TableName + const OUString& _CatalogName, + const OUString& _SchemaName, + const OUString& _TableName ) : OColumn(_Name, _TypeName, _DefaultValue, - ::rtl::OUString(), + OUString(), _IsNullable, _Precision, _Scale, @@ -112,7 +112,7 @@ OKeyColumn::~OKeyColumn() void OKeyColumn::construct() { sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< OUString*>(0))); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index 53aad4a4660e..4bd63af39102 100644 --- a/connectivity/source/sdbcx/VTable.cxx +++ b/connectivity/source/sdbcx/VTable.cxx @@ -40,30 +40,30 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OTable::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OTable::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString("com.sun.star.sdbcx.VTableDescriptor"); - return ::rtl::OUString("com.sun.star.sdbcx.Table"); + return OUString("com.sun.star.sdbcx.VTableDescriptor"); + return OUString("com.sun.star.sdbcx.Table"); } // ----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OTable::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OTable::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); + ::com::sun::star::uno::Sequence< OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.TableDescriptor"); + aSupported[0] = OUString("com.sun.star.sdbcx.TableDescriptor"); else - aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Table"); + aSupported[0] = OUString("com.sun.star.sdbcx.Table"); return aSupported; } // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OTable::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OTable::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -83,9 +83,9 @@ OTable::OTable(OCollection* _pTables, // ----------------------------------------------------------------------------- OTable::OTable( OCollection* _pTables, sal_Bool _bCase, - const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description,const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName) : OTableDescriptor_BASE(m_aMutex) + const OUString& _Name, const OUString& _Type, + const OUString& _Description,const OUString& _SchemaName, + const OUString& _CatalogName) : OTableDescriptor_BASE(m_aMutex) ,ODescriptor(OTableDescriptor_BASE::rBHelper,_bCase) ,m_CatalogName(_CatalogName) ,m_SchemaName(_SchemaName) @@ -112,10 +112,10 @@ void OTable::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(static_cast< OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast< OUString*>(0))); } // ----------------------------------------------------------------------------- void SAL_CALL OTable::acquire() throw() @@ -264,12 +264,12 @@ Reference< XNameAccess > SAL_CALL OTable::getIndexes( ) throw(RuntimeException) } // ------------------------------------------------------------------------- // XRename -void SAL_CALL OTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL OTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); - const ::rtl::OUString sOldComposedName = getName(); + const OUString sOldComposedName = getName(); const Reference< XDatabaseMetaData> xMetaData = getMetaData(); if ( xMetaData.is() ) ::dbtools::qualifiedNameComponents(xMetaData,newName,m_CatalogName,m_SchemaName,m_Name,::dbtools::eInDataManipulation); @@ -285,7 +285,7 @@ Reference< XDatabaseMetaData> OTable::getMetaData() const } // ------------------------------------------------------------------------- // XAlterTable -void SAL_CALL OTable::alterColumnByName( const ::rtl::OUString& /*colName*/, const Reference< XPropertySet >& /*descriptor*/ ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL OTable::alterColumnByName( const OUString& /*colName*/, const Reference< XPropertySet >& /*descriptor*/ ) throw(SQLException, NoSuchElementException, RuntimeException) { throwFeatureNotImplementedException( "XAlterTable::alterColumnByName", *this ); } @@ -300,7 +300,7 @@ void SAL_CALL OTable::alterColumnByIndex( sal_Int32 /*index*/, const Reference< return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OTable::getName() throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OTable::getName() throw(::com::sun::star::uno::RuntimeException) { // this is only correct for tables who haven't a schema or catalog name OSL_ENSURE(m_CatalogName.isEmpty(),"getName(): forgot to overload getName()!"); @@ -308,7 +308,7 @@ void SAL_CALL OTable::alterColumnByIndex( sal_Int32 /*index*/, const Reference< return m_Name; } // ----------------------------------------------------------------------------- -void SAL_CALL OTable::setName( const ::rtl::OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OTable::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) { } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index 23bbae17d690..4614688f7207 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.cxx @@ -45,7 +45,7 @@ OUser::OUser(sal_Bool _bCase) : OUser_BASE(m_aMutex) { } // ------------------------------------------------------------------------- -OUser::OUser(const ::rtl::OUString& _Name,sal_Bool _bCase) : OUser_BASE(m_aMutex) +OUser::OUser(const OUString& _Name,sal_Bool _bCase) : OUser_BASE(m_aMutex) ,ODescriptor(OUser_BASE::rBHelper,_bCase) ,m_pGroups(NULL) { @@ -90,7 +90,7 @@ Sequence< Type > SAL_CALL OUser::getTypes( ) throw(RuntimeException) } // ------------------------------------------------------------------------- // XUser -void SAL_CALL OUser::changePassword( const ::rtl::OUString& /*objPassword*/, const ::rtl::OUString& /*newPassword*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL OUser::changePassword( const OUString& /*objPassword*/, const OUString& /*newPassword*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); @@ -123,7 +123,7 @@ Reference< XNameAccess > SAL_CALL OUser::getGroups( ) throw(RuntimeException) // ------------------------------------------------------------------------- // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OUser::getPrivileges( const ::rtl::OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); @@ -131,7 +131,7 @@ sal_Int32 SAL_CALL OUser::getPrivileges( const ::rtl::OUString& /*objName*/, sal return 0; } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const ::rtl::OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); @@ -139,14 +139,14 @@ sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const ::rtl::OUString& /*objNa return 0; } // ------------------------------------------------------------------------- -void SAL_CALL OUser::grantPrivileges( const ::rtl::OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OUser::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedException( "XAuthorizable::grantPrivileges", *this ); } // ------------------------------------------------------------------------- -void SAL_CALL OUser::revokePrivileges( const ::rtl::OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OUser::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); @@ -158,12 +158,12 @@ void SAL_CALL OUser::revokePrivileges( const ::rtl::OUString& /*objName*/, sal_I return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OUser::getName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OUser::getName( ) throw(::com::sun::star::uno::RuntimeException) { return m_Name; } // ----------------------------------------------------------------------------- -void SAL_CALL OUser::setName( const ::rtl::OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OUser::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) { OSL_FAIL( "OUser::setName: not implemented!" ); // not allowed to throw an SQLException here ... diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx index 903782f278c8..28aeb4aa03be 100644 --- a/connectivity/source/sdbcx/VView.cxx +++ b/connectivity/source/sdbcx/VView.cxx @@ -35,12 +35,12 @@ using namespace ::com::sun::star::lang; IMPLEMENT_SERVICE_INFO(OView,"com.sun.star.sdbcx.VView","com.sun.star.sdbcx.View"); // ------------------------------------------------------------------------- OView::OView(sal_Bool _bCase, - const ::rtl::OUString& _Name, + const OUString& _Name, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData, sal_Int32 _CheckOption, - const ::rtl::OUString& _Command, - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName) : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper,_bCase) + const OUString& _Command, + const OUString& _SchemaName, + const OUString& _CatalogName) : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper,_bCase) ,m_CatalogName(_CatalogName) ,m_SchemaName(_SchemaName) ,m_Command(_Command) @@ -69,9 +69,9 @@ void OView::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(static_cast< OUString*>(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(static_cast< sal_Int32*>(0))); } // ------------------------------------------------------------------------- @@ -103,9 +103,9 @@ Any SAL_CALL OView::queryInterface( const Type & rType ) throw(RuntimeException) return *const_cast(this)->getArrayHelper(isNew() ? 1 : 0); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OView::getName() throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OView::getName() throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sComposedName; + OUString sComposedName; if(m_xMetaData.is()) sComposedName = ::dbtools::composeTableName( m_xMetaData, m_CatalogName, m_SchemaName, m_Name, sal_False, ::dbtools::eInDataManipulation ); else @@ -122,7 +122,7 @@ Any SAL_CALL OView::queryInterface( const Type & rType ) throw(RuntimeException) return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ----------------------------------------------------------------------------- -void SAL_CALL OView::setName( const ::rtl::OUString& ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OView::setName( const OUString& ) throw(::com::sun::star::uno::RuntimeException) { } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx index 2e2b962aca4a..6887cf3c9d32 100644 --- a/connectivity/source/simpledbt/parsenode_s.cxx +++ b/connectivity/source/simpledbt/parsenode_s.cxx @@ -63,13 +63,13 @@ namespace connectivity } //---------------------------------------------------------------- - void OSimpleParseNode::parseNodeToStr(::rtl::OUString& _rString, const Reference< XConnection >& _rxConnection,const IParseContext* _pContext) const + void OSimpleParseNode::parseNodeToStr(OUString& _rString, const Reference< XConnection >& _rxConnection,const IParseContext* _pContext) const { m_pFullNode->parseNodeToStr( _rString, _rxConnection, _pContext ); } //---------------------------------------------------------------- - void OSimpleParseNode::parseNodeToPredicateStr(::rtl::OUString& _rString, const Reference< XConnection >& _rxConnection, + void OSimpleParseNode::parseNodeToPredicateStr(OUString& _rString, const Reference< XConnection >& _rxConnection, const Reference< XNumberFormatter >& _rxFormatter, const Reference< XPropertySet >& _rxField, const Locale& _rIntl, const sal_Char _cDecSeparator,const IParseContext* _pContext) const { diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx index 05a032190293..d8bd6f94a1c2 100644 --- a/connectivity/source/simpledbt/parsenode_s.hxx +++ b/connectivity/source/simpledbt/parsenode_s.hxx @@ -45,12 +45,12 @@ namespace connectivity ~OSimpleParseNode(); // ISQLParseNode - virtual void parseNodeToStr(::rtl::OUString& _rString, + virtual void parseNodeToStr(OUString& _rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const IParseContext* _pContext ) const; - virtual void parseNodeToPredicateStr(::rtl::OUString& _rString, + virtual void parseNodeToPredicateStr(OUString& _rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx index b49c4bfe9a49..b8168c7c4841 100644 --- a/connectivity/source/simpledbt/parser_s.cxx +++ b/connectivity/source/simpledbt/parser_s.cxx @@ -59,7 +59,7 @@ namespace connectivity } //---------------------------------------------------------------- - ::rtl::Reference< simple::ISQLParseNode > OSimpleSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const ::rtl::OUString& rStatement, + ::rtl::Reference< simple::ISQLParseNode > OSimpleSQLParser::predicateTree(OUString& rErrorMessage, const OUString& rStatement, const Reference< XNumberFormatter >& _rxFormatter, const Reference< XPropertySet >& _rxField) const { OSimpleParseNode* pReturn = NULL; diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx index 155ef739b233..c500a6e96ad9 100644 --- a/connectivity/source/simpledbt/parser_s.hxx +++ b/connectivity/source/simpledbt/parser_s.hxx @@ -44,8 +44,8 @@ namespace connectivity // ISQLParser virtual ::rtl::Reference< simple::ISQLParseNode > predicateTree( - ::rtl::OUString& rErrorMessage, - const ::rtl::OUString& rStatement, + OUString& rErrorMessage, + const OUString& rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField ) const; diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx index f40f5e3b6932..9a7485ce9a6f 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.cxx +++ b/connectivity/source/simpledbt/staticdbtools_s.cxx @@ -57,14 +57,14 @@ namespace connectivity } //---------------------------------------------------------------- - ::rtl::OUString ODataAccessStaticTools::getFormattedValue(const Reference< XColumn >& _rxColumn, const Reference< XNumberFormatter >& _rxFormatter, + OUString ODataAccessStaticTools::getFormattedValue(const Reference< XColumn >& _rxColumn, const Reference< XNumberFormatter >& _rxFormatter, const Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const { return ::dbtools::DBTypeConversion::getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType); } //---------------------------------------------------------------- - ::rtl::OUString ODataAccessStaticTools::getFormattedValue( const Reference< XPropertySet>& _rxColumn, const Reference< XNumberFormatter>& _rxFormatter, + OUString ODataAccessStaticTools::getFormattedValue( const Reference< XPropertySet>& _rxColumn, const Reference< XNumberFormatter>& _rxFormatter, const Locale& _rLocale, const Date& _rNullDate ) const { return ::dbtools::DBTypeConversion::getFormattedValue( _rxColumn, _rxFormatter, _rLocale, _rNullDate ); @@ -83,8 +83,8 @@ namespace connectivity } //---------------------------------------------------------------- - Reference< XConnection> ODataAccessStaticTools::getConnection_withFeedback(const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rUser, - const ::rtl::OUString& _rPwd, const Reference< XComponentContext>& _rxContext) const SAL_THROW ( (SQLException) ) + Reference< XConnection> ODataAccessStaticTools::getConnection_withFeedback(const OUString& _rDataSourceName, const OUString& _rUser, + const OUString& _rPwd, const Reference< XComponentContext>& _rxContext) const SAL_THROW ( (SQLException) ) { return ::dbtools::getConnection_withFeedback(_rDataSourceName, _rUser, _rPwd, _rxContext); } @@ -124,32 +124,32 @@ namespace connectivity } //---------------------------------------------------------------- - ::rtl::OUString ODataAccessStaticTools::quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName) const + OUString ODataAccessStaticTools::quoteName(const OUString& _rQuote, const OUString& _rName) const { return ::dbtools::quoteName(_rQuote, _rName); } //---------------------------------------------------------------- - ::rtl::OUString ODataAccessStaticTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName ) const + OUString ODataAccessStaticTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName ) const { return ::dbtools::composeTableNameForSelect( _rxConnection, _rCatalog, _rSchema, _rName ); } //---------------------------------------------------------------- - ::rtl::OUString ODataAccessStaticTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const + OUString ODataAccessStaticTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const { return ::dbtools::composeTableNameForSelect( _rxConnection, _xTable ); } //---------------------------------------------------------------- SQLContext ODataAccessStaticTools::prependContextInfo(SQLException& _rException, const Reference< XInterface >& _rxContext, - const ::rtl::OUString& _rContextDescription, const ::rtl::OUString& _rContextDetails) const + const OUString& _rContextDescription, const OUString& _rContextDetails) const { return ::dbtools::prependContextInfo(_rException, _rxContext, _rContextDescription, _rContextDetails); } //---------------------------------------------------------------- - Reference< XDataSource > ODataAccessStaticTools::getDataSource( const ::rtl::OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const + Reference< XDataSource > ODataAccessStaticTools::getDataSource( const OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const { return ::dbtools::getDataSource( _rsRegisteredName, _rxContext ); } @@ -174,7 +174,7 @@ namespace connectivity //---------------------------------------------------------------- Reference< XNameAccess > ODataAccessStaticTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection, - const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand, + const sal_Int32 _nCommandType, const OUString& _rCommand, Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) { return ::dbtools::getFieldsByCommandDescriptor( _rxConnection, _nCommandType, _rCommand, @@ -182,9 +182,9 @@ namespace connectivity } //---------------------------------------------------------------- - Sequence< ::rtl::OUString > ODataAccessStaticTools::getFieldNamesByCommandDescriptor( + Sequence< OUString > ODataAccessStaticTools::getFieldNamesByCommandDescriptor( const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) + const OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) { return ::dbtools::getFieldNamesByCommandDescriptor( _rxConnection, _nCommandType, _rCommand, _pErrorInfo ); diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx index 83512c46572c..80d0493c2fb4 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.hxx +++ b/connectivity/source/simpledbt/staticdbtools_s.hxx @@ -49,7 +49,7 @@ namespace connectivity const ::com::sun::star::util::Date& rNullDate ) const; // ------------------------------------------------ - virtual ::rtl::OUString getFormattedValue( + virtual OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::util::Date& _rNullDate, @@ -57,7 +57,7 @@ namespace connectivity sal_Int16 _nKeyType) const; // ------------------------------------------------ - virtual ::rtl::OUString getFormattedValue( + virtual OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter, const ::com::sun::star::lang::Locale& _rLocale, @@ -67,9 +67,9 @@ namespace connectivity // IDataAccessTools // ------------------------------------------------ virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, - const ::rtl::OUString& _rPwd, + const OUString& _rDataSourceName, + const OUString& _rUser, + const OUString& _rPwd, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ); @@ -108,21 +108,21 @@ namespace connectivity ) const; // ------------------------------------------------ - virtual ::rtl::OUString quoteName( - const ::rtl::OUString& _rQuote, - const ::rtl::OUString& _rName + virtual OUString quoteName( + const OUString& _rQuote, + const OUString& _rName ) const; // ------------------------------------------------ - virtual ::rtl::OUString composeTableNameForSelect( + virtual OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString& _rCatalog, - const ::rtl::OUString& _rSchema, - const ::rtl::OUString& _rName + const OUString& _rCatalog, + const OUString& _rSchema, + const OUString& _rName ) const; // ------------------------------------------------ - virtual ::rtl::OUString composeTableNameForSelect( + virtual OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ) const; @@ -131,13 +131,13 @@ namespace connectivity virtual ::com::sun::star::sdb::SQLContext prependContextInfo( ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::rtl::OUString& _rContextDescription, - const ::rtl::OUString& _rContextDetails + const OUString& _rContextDescription, + const OUString& _rContextDetails ) const; // ------------------------------------------------ virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource( - const ::rtl::OUString& _rsRegisteredName, + const OUString& _rsRegisteredName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const; @@ -164,17 +164,17 @@ namespace connectivity getFieldsByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ); // ------------------------------------------------ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getFieldNamesByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ); diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx index acd7eaa52640..05dcfa1f1aa5 100644 --- a/connectivity/workben/iniParser/main.cxx +++ b/connectivity/workben/iniParser/main.cxx @@ -25,15 +25,11 @@ #include #include -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; struct ini_NameValue { - rtl::OUString sName; - rtl::OUString sValue; + OUString sName; + OUString sValue; inline ini_NameValue() SAL_THROW(()) {} @@ -50,10 +46,10 @@ typedef std::list< struct ini_Section { - rtl::OUString sName; + OUString sName; NameValueList lList; }; -typedef std::mapIniSectionMap; diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx index e4318ac039a6..d8d00fc6d1d1 100644 --- a/connectivity/workben/little/main.cxx +++ b/connectivity/workben/little/main.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace cppu; -using ::rtl::OUString; #if (defined UNX) @@ -76,7 +75,7 @@ void _cdecl main( int argc, char * argv[] ) Reference xRes = xStmt->executeQuery(OUString("SELECT * FROM Tele")); if(xRes.is()) { - ::rtl::OUString aPat( "%s\t" ); + OUString aPat( "%s\t" ); Reference xRow(xRes,UNO_QUERY); Reference xMeta = Reference(xRes,UNO_QUERY)->getMetaData(); for(sal_Int32 i=1;igetColumnCount();++i) diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx index b3c0267fe0f6..4b70366be345 100644 --- a/connectivity/workben/skeleton/SResultSet.hxx +++ b/connectivity/workben/skeleton/SResultSet.hxx @@ -91,7 +91,7 @@ namespace connectivity sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -168,7 +168,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -212,7 +212,7 @@ namespace connectivity virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -222,7 +222,7 @@ namespace connectivity virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index e65d153abe2d..a5d251c1756e 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -68,9 +68,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; using namespace ::com::sun::star::container; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; #define OUtoCStr( x ) (OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US ).getStr()) #define PRINTSTR(x) printf("%s",x); @@ -178,11 +175,11 @@ Reference< XMultiServiceFactory > InitializeFac( void ) OSL_ASSERT( path.lastIndexOf( '/' ) >= 0 ); - ::rtl::OUStringBuffer bufServices( path.copy( 0, path.lastIndexOf( '/' )+1 ) ); + OUStringBuffer bufServices( path.copy( 0, path.lastIndexOf( '/' )+1 ) ); bufServices.appendAscii("services.rdb"); OUString services = bufServices.makeStringAndClear(); - ::rtl::OUStringBuffer bufTypes( path.copy( 0, path.lastIndexOf( '/' )+1 ) ); + OUStringBuffer bufTypes( path.copy( 0, path.lastIndexOf( '/' )+1 ) ); bufTypes.appendAscii("types.rdb"); OUString types = bufTypes.makeStringAndClear(); @@ -302,7 +299,7 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) makeAny(OUString("")), // Catalog OUString("%"), // Schema OUString("%"), // TabName - Sequence() + Sequence() ); printXResultSets( xRes ); } @@ -390,10 +387,10 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected char hostname[40],basedn[40]; scanf("%s %s",hostname,basedn); aValue.realloc(2); - aValue[0].Name = ::rtl::OUString("HostName"); - aValue[0].Value <<= rtl::OUString::createFromAscii(hostname); - aValue[1].Name = ::rtl::OUString("BaseDN"); - aValue[1].Value <<= rtl::OUString::createFromAscii(basedn); + aValue[0].Name = OUString("HostName"); + aValue[0].Value <<= OUString::createFromAscii(hostname); + aValue[1].Name = OUString("BaseDN"); + aValue[1].Value <<= OUString::createFromAscii(basedn); break; case 3: case 4: @@ -402,10 +399,10 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected //Default LDAP AB url=OUString("sdbc:address:ldap://"); aValue.realloc(2); - aValue[0].Name = ::rtl::OUString("HostName"); - aValue[0].Value <<= rtl::OUString("sun-ds"); - aValue[1].Name = ::rtl::OUString("BaseDN"); - aValue[1].Value <<= rtl::OUString("dc=sun,dc=com"); + aValue[0].Name = OUString("HostName"); + aValue[0].Value <<= OUString("sun-ds"); + aValue[1].Name = OUString("BaseDN"); + aValue[1].Value <<= OUString("dc=sun,dc=com"); break; default: return pConnection; diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx index a3b81b217a7d..dd649a8a1b98 100644 --- a/connectivity/workben/testmoz/mozthread.cxx +++ b/connectivity/workben/testmoz/mozthread.cxx @@ -74,8 +74,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; using namespace ::com::sun::star::container; -using ::rtl::OUString; -using ::rtl::OUStringToOString; extern Reference< XMultiServiceFactory > InitializeFac( void ); Reference< XMultiServiceFactory > mMgr; @@ -196,7 +194,7 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) makeAny(OUString("")), // Catalog OUString("%"), // Schema OUString("%"), // TabName - Sequence() ); + Sequence() ); printXResultSets( xRes ); } OSL_TRACE("Testing getTables() : END"); @@ -232,7 +230,7 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) makeAny(OUString("")), // Catalog OUString("%"), // Schema OUString("%"), // TabName - Sequence() ); + Sequence() ); sal_Int32 nTables = 0; while( xRes.is() && xRes->next()) { @@ -286,10 +284,10 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected case testLDAP: url=OUString("sdbc:address:ldap://"); aValue.realloc(2); - aValue[0].Name = ::rtl::OUString("HostName"); - aValue[0].Value <<= rtl::OUString("sun-ds"); - aValue[1].Name = ::rtl::OUString("BaseDN"); - aValue[1].Value <<= rtl::OUString("dc=sun,dc=com"); + aValue[0].Name = OUString("HostName"); + aValue[0].Value <<= OUString("sun-ds"); + aValue[1].Name = OUString("BaseDN"); + aValue[1].Value <<= OUString("dc=sun,dc=com"); break; case testMozilla: url=OUString("sdbc:address:mozilla://"); diff --git a/cppcanvas/inc/cppcanvas/canvas.hxx b/cppcanvas/inc/cppcanvas/canvas.hxx index a6f05dadc53b..c377417a115d 100644 --- a/cppcanvas/inc/cppcanvas/canvas.hxx +++ b/cppcanvas/inc/cppcanvas/canvas.hxx @@ -89,7 +89,7 @@ namespace cppcanvas */ virtual ::basegfx::B2DPolyPolygon const* getClip() const = 0; - virtual FontSharedPtr createFont( const ::rtl::OUString& rFontName, const double& rCellSize ) const = 0; + virtual FontSharedPtr createFont( const OUString& rFontName, const double& rCellSize ) const = 0; virtual ColorSharedPtr createColor() const = 0; diff --git a/cppcanvas/inc/cppcanvas/font.hxx b/cppcanvas/inc/cppcanvas/font.hxx index 922dd301bd91..9f36f9e19dda 100644 --- a/cppcanvas/inc/cppcanvas/font.hxx +++ b/cppcanvas/inc/cppcanvas/font.hxx @@ -44,7 +44,7 @@ namespace cppcanvas public: virtual ~Font() {} - virtual ::rtl::OUString getName() const = 0; + virtual OUString getName() const = 0; virtual double getCellSize() const = 0; virtual ::com::sun::star::uno::Reference< diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/cppcanvas/inc/cppcanvas/renderer.hxx index edb38d0a9dd5..e260e9400248 100644 --- a/cppcanvas/inc/cppcanvas/renderer.hxx +++ b/cppcanvas/inc/cppcanvas/renderer.hxx @@ -110,7 +110,7 @@ namespace cppcanvas ::boost::optional< Color::IntSRGBA > maTextColor; /// Optionally forces the given fontname for all text actions - ::boost::optional< ::rtl::OUString > maFontName; + ::boost::optional< OUString > maFontName; /** Optionally transforms all text output actions with the given matrix (in addition to the overall canvas diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 2592ffbc5448..17ec217130c0 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -749,9 +749,9 @@ namespace cppcanvas EMFP_DEBUG( mfStream.Seek(0); static int emfp_debug_stream_number = 0; - rtl::OUString emfp_debug_filename("/tmp/emf-embedded-stream"); - emfp_debug_filename += rtl::OUString::valueOf(emfp_debug_stream_number++); - emfp_debug_filename += rtl::OUString(".emf"); + OUString emfp_debug_filename("/tmp/emf-embedded-stream"); + emfp_debug_filename += OUString::valueOf(emfp_debug_stream_number++); + emfp_debug_filename += OUString(".emf"); SvFileStream file( emfp_debug_filename, STREAM_WRITE | STREAM_TRUNC ); @@ -769,7 +769,7 @@ namespace cppcanvas float emSize; sal_uInt32 sizeUnit; sal_Int32 fontFlags; - rtl::OUString family; + OUString family; void Read (SvMemoryStream &s) { @@ -790,8 +790,8 @@ namespace cppcanvas for( sal_uInt32 i = 0; i < length; i++ ) s >> chars[ i ]; - family = ::rtl::OUString( chars, length ); - EMFP_DEBUG (printf ("EMF+\tfamily: %s\n", rtl::OUStringToOString( family, RTL_TEXTENCODING_UTF8).getStr())); + family = OUString( chars, length ); + EMFP_DEBUG (printf ("EMF+\tfamily: %s\n", OUStringToOString( family, RTL_TEXTENCODING_UTF8).getStr())); } } }; @@ -965,7 +965,7 @@ namespace cppcanvas aTexture.Alpha = 1.0; basegfx::ODFGradientInfo aGradInfo; - rtl::OUString aGradientService; + OUString aGradientService; const uno::Sequence< double > aStartColor( ::vcl::unotools::colorToDoubleSequence( brush->solidColor, @@ -1632,7 +1632,7 @@ namespace cppcanvas EMFP_DEBUG (printf ("EMF+ DrawString layoutRect: %f,%f - %fx%f\n", lx, ly, lw, lh)); - rtl::OUString text = read_uInt16s_ToOUString(rMF, stringLength); + OUString text = read_uInt16s_ToOUString(rMF, stringLength); double cellSize = setFont (flags & 0xff, rFactoryParms, rState); SET_TEXT_COLOR( brushId ); @@ -1858,7 +1858,7 @@ namespace cppcanvas float *charsPosX = new float[glyphsCount]; float *charsPosY = new float[glyphsCount]; - rtl::OUString text = read_uInt16s_ToOUString(rMF, glyphsCount); + OUString text = read_uInt16s_ToOUString(rMF, glyphsCount); for( sal_uInt32 i=0; i> charsPosX[i] >> charsPosY[i]; diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 3ab4ba55be20..6d355a81aebb 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -679,7 +679,7 @@ namespace cppcanvas aRot90.rotate(M_PI_2); basegfx::ODFGradientInfo aGradInfo; - rtl::OUString aGradientService; + OUString aGradientService; switch( rGradient.GetStyle() ) { case GradientStyle_LINEAR: @@ -1055,7 +1055,7 @@ namespace cppcanvas pChars[3]=pChars[2]=pChars[1]=pChars[0]; long nStrikeoutWidth = (rParms.mrVDev.GetTextWidth( - rtl::OUString(pChars, SAL_N_ELEMENTS(pChars))) + 2) / 4; + OUString(pChars, SAL_N_ELEMENTS(pChars))) + 2) / 4; if( nStrikeoutWidth <= 0 ) nStrikeoutWidth = 1; @@ -3086,7 +3086,7 @@ namespace cppcanvas } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -3147,7 +3147,7 @@ namespace cppcanvas } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index ab9478e1469f..3feeaa19e814 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -239,7 +239,7 @@ namespace cppcanvas void initArrayAction( rendering::RenderState& o_rRenderState, uno::Reference< rendering::XTextLayout >& o_rTextLayout, const ::basegfx::B2DPoint& rStartPoint, - const ::rtl::OUString& rText, + const OUString& rText, sal_Int32 nStartPos, sal_Int32 nLen, const uno::Sequence< double >& rOffsets, @@ -620,14 +620,14 @@ namespace cppcanvas { public: TextAction( const ::basegfx::B2DPoint& rStartPoint, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStartPos, sal_Int32 nLen, const CanvasSharedPtr& rCanvas, const OutDevState& rState ); TextAction( const ::basegfx::B2DPoint& rStartPoint, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStartPos, sal_Int32 nLen, const CanvasSharedPtr& rCanvas, @@ -660,7 +660,7 @@ namespace cppcanvas }; TextAction::TextAction( const ::basegfx::B2DPoint& rStartPoint, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStartPos, sal_Int32 nLen, const CanvasSharedPtr& rCanvas, @@ -680,7 +680,7 @@ namespace cppcanvas } TextAction::TextAction( const ::basegfx::B2DPoint& rStartPoint, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStartPos, sal_Int32 nLen, const CanvasSharedPtr& rCanvas, @@ -780,7 +780,7 @@ namespace cppcanvas const ::Color& rReliefColor, const ::basegfx::B2DSize& rShadowOffset, const ::Color& rShadowColor, - const ::rtl::OUString& rText, + const OUString& rText, sal_Int32 nStartPos, sal_Int32 nLen, VirtualDevice& rVDev, @@ -792,7 +792,7 @@ namespace cppcanvas const ::Color& rReliefColor, const ::basegfx::B2DSize& rShadowOffset, const ::Color& rShadowColor, - const ::rtl::OUString& rText, + const OUString& rText, sal_Int32 nStartPos, sal_Int32 nLen, VirtualDevice& rVDev, @@ -841,7 +841,7 @@ namespace cppcanvas const ::Color& rReliefColor, const ::basegfx::B2DSize& rShadowOffset, const ::Color& rShadowColor, - const ::rtl::OUString& rText, + const OUString& rText, sal_Int32 nStartPos, sal_Int32 nLen, VirtualDevice& rVDev, @@ -880,7 +880,7 @@ namespace cppcanvas const ::Color& rReliefColor, const ::basegfx::B2DSize& rShadowOffset, const ::Color& rShadowColor, - const ::rtl::OUString& rText, + const OUString& rText, sal_Int32 nStartPos, sal_Int32 nLen, VirtualDevice& rVDev, @@ -1014,7 +1014,7 @@ namespace cppcanvas { public: TextArrayAction( const ::basegfx::B2DPoint& rStartPoint, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStartPos, sal_Int32 nLen, const uno::Sequence< double >& rOffsets, @@ -1022,7 +1022,7 @@ namespace cppcanvas const OutDevState& rState ); TextArrayAction( const ::basegfx::B2DPoint& rStartPoint, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStartPos, sal_Int32 nLen, const uno::Sequence< double >& rOffsets, @@ -1054,7 +1054,7 @@ namespace cppcanvas }; TextArrayAction::TextArrayAction( const ::basegfx::B2DPoint& rStartPoint, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStartPos, sal_Int32 nLen, const uno::Sequence< double >& rOffsets, @@ -1076,7 +1076,7 @@ namespace cppcanvas } TextArrayAction::TextArrayAction( const ::basegfx::B2DPoint& rStartPoint, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStartPos, sal_Int32 nLen, const uno::Sequence< double >& rOffsets, @@ -1199,7 +1199,7 @@ namespace cppcanvas const ::Color& rReliefColor, const ::basegfx::B2DSize& rShadowOffset, const ::Color& rShadowColor, - const ::rtl::OUString& rText, + const OUString& rText, sal_Int32 nStartPos, sal_Int32 nLen, const uno::Sequence< double >& rOffsets, @@ -1211,7 +1211,7 @@ namespace cppcanvas const ::Color& rReliefColor, const ::basegfx::B2DSize& rShadowOffset, const ::Color& rShadowColor, - const ::rtl::OUString& rText, + const OUString& rText, sal_Int32 nStartPos, sal_Int32 nLen, const uno::Sequence< double >& rOffsets, @@ -1258,7 +1258,7 @@ namespace cppcanvas const ::Color& rReliefColor, const ::basegfx::B2DSize& rShadowOffset, const ::Color& rShadowColor, - const ::rtl::OUString& rText, + const OUString& rText, sal_Int32 nStartPos, sal_Int32 nLen, const uno::Sequence< double >& rOffsets, @@ -1298,7 +1298,7 @@ namespace cppcanvas const ::Color& rReliefColor, const ::basegfx::B2DSize& rShadowOffset, const ::Color& rShadowColor, - const ::rtl::OUString& rText, + const OUString& rText, sal_Int32 nStartPos, sal_Int32 nLen, const uno::Sequence< double >& rOffsets, diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx index 29b75d213e0b..70a4c3f24f42 100644 --- a/cppcanvas/source/wrapper/implcanvas.cxx +++ b/cppcanvas/source/wrapper/implcanvas.cxx @@ -84,7 +84,7 @@ namespace cppcanvas return !maClipPolyPolygon ? NULL : &(*maClipPolyPolygon); } - FontSharedPtr ImplCanvas::createFont( const ::rtl::OUString& rFontName, const double& rCellSize ) const + FontSharedPtr ImplCanvas::createFont( const OUString& rFontName, const double& rCellSize ) const { return FontSharedPtr( new ImplFont( getUNOCanvas(), rFontName, rCellSize ) ); } diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx index 5217d61f3558..29e5b82b55d6 100644 --- a/cppcanvas/source/wrapper/implcanvas.hxx +++ b/cppcanvas/source/wrapper/implcanvas.hxx @@ -65,7 +65,7 @@ namespace cppcanvas virtual void setClip(); virtual ::basegfx::B2DPolyPolygon const* getClip() const; - virtual FontSharedPtr createFont( const ::rtl::OUString& rFontName, const double& rCellSize ) const; + virtual FontSharedPtr createFont( const OUString& rFontName, const double& rCellSize ) const; virtual ColorSharedPtr createColor() const; diff --git a/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx index f3a3652c20cc..e62cfa543227 100644 --- a/cppcanvas/source/wrapper/implfont.cxx +++ b/cppcanvas/source/wrapper/implfont.cxx @@ -32,7 +32,7 @@ namespace cppcanvas { ImplFont::ImplFont( const uno::Reference< rendering::XCanvas >& rCanvas, - const ::rtl::OUString& rFontName, + const OUString& rFontName, const double& rCellSize ) : mxCanvas( rCanvas ), mxFont( NULL ) @@ -56,7 +56,7 @@ namespace cppcanvas { } - ::rtl::OUString ImplFont::getName() const + OUString ImplFont::getName() const { OSL_ENSURE( mxFont.is(), "ImplFont::getName(): Invalid Font" ); diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx index 141bed96c782..cda7a50fb867 100644 --- a/cppcanvas/source/wrapper/implfont.hxx +++ b/cppcanvas/source/wrapper/implfont.hxx @@ -50,12 +50,12 @@ namespace cppcanvas public: ImplFont( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& rCanvas, - const ::rtl::OUString& rFontName, + const OUString& rFontName, const double& rCellSize ); virtual ~ImplFont(); - virtual ::rtl::OUString getName() const; + virtual OUString getName() const; virtual double getCellSize() const; virtual ::com::sun::star::uno::Reference< diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index 39d5b22326e7..09b6244bde6c 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -44,6 +44,8 @@ #include "rtl/ref.hxx" #include "rtl/ustring.hxx" +using rtl::OUString; + #include "macro_expander.hxx" #include "paths.hxx" #include "servicemanager.hxx" diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index ce4bf4627025..8affc2b8baba 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -35,11 +35,17 @@ #include "cppuhelper/shlib.hxx" #include "cppuhelper/supportsservice.hxx" #include "osl/file.hxx" -#include "registry/registry.hxx" #include "rtl/ref.hxx" #include "rtl/uri.hxx" #include "rtl/ustring.hxx" +#include "rtl/strbuf.hxx" #include "sal/log.hxx" + +using rtl::OUString; +using rtl::OString; +using rtl::OStringBuffer; + +#include "registry/registry.hxx" #include "xmlreader/xmlreader.hxx" #include "paths.hxx" diff --git a/cppuhelper/source/typedescriptionprovider.cxx b/cppuhelper/source/typedescriptionprovider.cxx index 7dbe5e590b88..b87575da242b 100644 --- a/cppuhelper/source/typedescriptionprovider.cxx +++ b/cppuhelper/source/typedescriptionprovider.cxx @@ -54,6 +54,9 @@ #include "rtl/ref.hxx" #include "rtl/ustring.hxx" #include "sal/types.h" + +using rtl::OUString; + #include "unoidl/unoidl.hxx" #include "unoidl/unoidlprovider.hxx" diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 8c06245c8407..7343aaec5660 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -59,10 +59,6 @@ using namespace com::sun::star::connection; using namespace com::sun::star::bridge; using namespace com::sun::star::container; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; -using ::rtl::OUStringBuffer; namespace unoexe { diff --git a/crashrep/source/win32/soreport.cxx b/crashrep/source/win32/soreport.cxx index a67e43420c98..08038efe09ea 100644 --- a/crashrep/source/win32/soreport.cxx +++ b/crashrep/source/win32/soreport.cxx @@ -159,18 +159,18 @@ static FILE *_tmpfile(void) static BOOL GetCrashDataPath( LPTSTR szBuffer ) { - ::rtl::OUString ustrValue("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); + OUString ustrValue("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); ::rtl::Bootstrap::expandMacros( ustrValue ); if ( !ustrValue.isEmpty() ) { - ustrValue += ::rtl::OUString("/user/crashdata"); + ustrValue += OUString("/user/crashdata"); ::osl::FileBase::RC result = ::osl::Directory::createPath( ustrValue ); if ( ::osl::FileBase::E_None == result || ::osl::FileBase::E_EXIST == result ) { - ::rtl::OUString ustrPath; + OUString ustrPath; result = ::osl::FileBase::getSystemPathFromFileURL( ustrValue, ustrPath ); if ( ::osl::FileBase::E_None == result ) diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index f1dda16992b2..fd8a03bcfbb4 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1430,7 +1430,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) // change te description of the radio button, which switch to the module // dependend accelerator configuration String sButtonText = aModuleButton.GetText(); - sButtonText.SearchAndReplace(rtl::OUString("$(MODULE)"), m_sModuleUIName); + sButtonText.SearchAndReplace(OUString("$(MODULE)"), m_sModuleUIName); aModuleButton.SetText(sButtonText); if (m_xModule.is()) @@ -1515,7 +1515,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const String& sCommand) } else { - String aRet(rtl::OUString("Symbols: ")); + String aRet(OUString("Symbols: ")); xub_StrLen nPos = sCommand.SearchAscii(".uno:InsertSymbol?Symbols:string="); if ( nPos == 0 ) { diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 63497966709d..5928ee39a735 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -92,7 +92,7 @@ #include "dlgname.hxx" -#define PRTSTR(x) rtl::OUStringToOString(x, RTL_TEXTENCODING_ASCII_US).pData->buffer +#define PRTSTR(x) OUStringToOString(x, RTL_TEXTENCODING_ASCII_US).pData->buffer #define ENTRY_HEIGHT 16 @@ -118,7 +118,6 @@ static const char aMenuSeparatorStr[] = " | "; #pragma warning (disable:4355) #endif -using rtl::OUString; namespace uno = com::sun::star::uno; namespace frame = com::sun::star::frame; namespace lang = com::sun::star::lang; @@ -440,7 +439,7 @@ OUString GetModuleName( const OUString& aModuleId ) else if ( aModuleId == "com.sun.star.sdb.DatabaseDocument" ) return OUString("Database" ); - return ::rtl::OUString(); + return OUString(); } OUString GetUIModuleName( const OUString& aModuleId, const uno::Reference< css::frame::XModuleManager2 >& rModuleManager ) @@ -593,7 +592,7 @@ ConvertSvxConfigEntry( uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); aPropSeq[0].Name = aDescriptorCommandURL; - aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() ); + aPropSeq[0].Value <<= OUString( pEntry->GetCommand() ); aPropSeq[1].Name = aDescriptorType; aPropSeq[1].Value <<= css::ui::ItemType::DEFAULT; @@ -636,16 +635,16 @@ ConvertSvxConfigEntry( if ( isDefaultName ) { - aPropSeq[2].Value <<= rtl::OUString(); + aPropSeq[2].Value <<= OUString(); } else { - aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); + aPropSeq[2].Value <<= OUString( pEntry->GetName() ); } } else { - aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); + aPropSeq[2].Value <<= OUString( pEntry->GetName() ); } return aPropSeq; @@ -671,7 +670,7 @@ ConvertToolbarEntry( uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); aPropSeq[0].Name = aDescriptorCommandURL; - aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() ); + aPropSeq[0].Value <<= OUString( pEntry->GetCommand() ); aPropSeq[1].Name = aDescriptorType; aPropSeq[1].Value <<= css::ui::ItemType::DEFAULT; @@ -714,16 +713,16 @@ ConvertToolbarEntry( if ( isDefaultName ) { - aPropSeq[2].Value <<= rtl::OUString(); + aPropSeq[2].Value <<= OUString(); } else { - aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); + aPropSeq[2].Value <<= OUString( pEntry->GetName() ); } } else { - aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); + aPropSeq[2].Value <<= OUString( pEntry->GetName() ); } aPropSeq[3].Name = aIsVisible; @@ -754,7 +753,7 @@ SfxTabPage *CreateSvxEventConfigPage( Window *pParent, const SfxItemSet& rSet ) sal_Bool impl_showKeyConfigTabPage( const css::uno::Reference< css::frame::XFrame >& xFrame ) { - static ::rtl::OUString MODULEID_STARTMODULE ("com.sun.star.frame.StartModule" ); + static OUString MODULEID_STARTMODULE ("com.sun.star.frame.StartModule" ); try { @@ -764,7 +763,7 @@ sal_Bool impl_showKeyConfigTabPage( const css::uno::Reference< css::frame::XFram if (xFrame.is()) { - ::rtl::OUString sModuleId = xMM->identify(xFrame); + OUString sModuleId = xMM->identify(xFrame); if ( ( !sModuleId.isEmpty() ) && (!sModuleId.equals(MODULEID_STARTMODULE)) @@ -1061,8 +1060,8 @@ MenuSaveInData::GetEntries() if ( pRootEntry == NULL ) { pRootEntry = new SvxConfigEntry( - rtl::OUString("MainMenus"), - rtl::OUString(), sal_True); + OUString("MainMenus"), + OUString(), sal_True); if ( m_xMenuSettings.is() ) { @@ -1795,7 +1794,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) try{ aCheckId = xModuleManager->identify( xf ); } catch(const uno::Exception&) - { aCheckId = ::rtl::OUString(); } + { aCheckId = OUString(); } if ( aModuleId.equals( aCheckId ) ) { @@ -1858,9 +1857,9 @@ void SvxConfigPage::Reset( const SfxItemSet& ) } } -::rtl::OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::XFrame >& _inout_rxFrame ) +OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::XFrame >& _inout_rxFrame ) { - ::rtl::OUString sModuleID; + OUString sModuleID; try { uno::Reference< uno::XComponentContext > xContext( @@ -2157,7 +2156,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI( if (pNewEntryData->IsSeparator()) { pNewEntry = aContentsListBox->InsertEntry( - rtl::OUString(aSeparatorStr), + OUString(aSeparatorStr), 0, sal_False, nPos, pNewEntryData); } else @@ -3895,10 +3894,10 @@ bool EntrySort( SvxConfigEntry* a, SvxConfigEntry* b ) SvxEntries* ToolbarSaveInData::GetEntries() { - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, bool, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ToolbarInfo; + OUStringHash, + ::std::equal_to< OUString > > ToolbarInfo; ToolbarInfo aToolbarInfo; @@ -3906,8 +3905,8 @@ SvxEntries* ToolbarSaveInData::GetEntries() { pRootEntry = new SvxConfigEntry( - rtl::OUString("MainToolbars"), - rtl::OUString(), sal_True); + OUString("MainToolbars"), + OUString(), sal_True); uno::Sequence< uno::Sequence < beans::PropertyValue > > info = GetConfigManager()->getUIElementsInfo( @@ -4991,10 +4990,10 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, { FreeResource(); - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, bool, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ImageInfo; + OUStringHash, + ::std::equal_to< OUString > > ImageInfo; aTbSymbol.SetPageScroll( sal_True ); @@ -5015,12 +5014,12 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, graphic::GraphicProvider::create( xComponentContext ) ); uno::Reference< beans::XPropertySet > xPropSet( - xServiceManager->createInstance( ::rtl::OUString("com.sun.star.util.PathSettings" ) ), + xServiceManager->createInstance( OUString("com.sun.star.util.PathSettings" ) ), uno::UNO_QUERY ); - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "UserConfig" ) ); + uno::Any aAny = xPropSet->getPropertyValue( OUString( "UserConfig" ) ); - ::rtl::OUString aDirectory; + OUString aDirectory; aAny >>= aDirectory; @@ -5031,7 +5030,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, sal_Unicode aChar = aDirectory[ aCount-1 ]; if ( aChar != '/') { - aDirectory += ::rtl::OUString( "/" ); + aDirectory += OUString( "/" ); } } else @@ -5039,7 +5038,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, aBtnImport.Enable( sal_False ); } - aDirectory += ::rtl::OUString( "soffice.cfg/import" ); + aDirectory += OUString( "soffice.cfg/import" ); uno::Reference< lang::XSingleServiceFactory > xStorageFactory( ::com::sun::star::embed::FileSystemStorageFactory::create( xComponentContext ) ); @@ -5054,17 +5053,17 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, uno::Sequence< uno::Any > aProp( 2 ); beans::PropertyValue aPropValue; - aPropValue.Name = ::rtl::OUString( "UserConfigStorage" ); + aPropValue.Name = OUString( "UserConfigStorage" ); aPropValue.Value <<= xStorage; aProp[ 0 ] <<= aPropValue; - aPropValue.Name = ::rtl::OUString( "OpenMode" ); + aPropValue.Name = OUString( "OpenMode" ); aPropValue.Value <<= com::sun::star::embed::ElementModes::READWRITE; aProp[ 1 ] <<= aPropValue; m_xImportedImageManager = uno::Reference< com::sun::star::ui::XImageManager >( xServiceManager->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.ui.ImageManager" ), aProp ), + OUString("com.sun.star.ui.ImageManager" ), aProp ), uno::UNO_QUERY ); ImageInfo mImageInfo; @@ -5219,7 +5218,7 @@ IMPL_LINK( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox ) sal_uInt16 nId = aTbSymbol.GetCurItemId(); aTbSymbol.CheckItem( nId ); - ::rtl::OUString aSelImageText = aTbSymbol.GetItemText( nId ); + OUString aSelImageText = aTbSymbol.GetItemText( nId ); if ( m_xImportedImageManager->hasImage( GetImageType(), aSelImageText ) ) { aBtnDelete.Enable( sal_True ); @@ -5251,7 +5250,7 @@ IMPL_LINK( SvxIconSelectorDialog, ImportHdl, PushButton *, pButton ) } aImportDialog.SetCurrentFilter( - rtl::OUString("PNG - Portable Network Graphic")); + OUString("PNG - Portable Network Graphic")); if ( ERRCODE_NONE == aImportDialog.Execute() ) { @@ -5279,7 +5278,7 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton ) if ( aTbSymbol.IsItemChecked( nId ) ) { - ::rtl::OUString aSelImageText = aTbSymbol.GetItemText( nId ); + OUString aSelImageText = aTbSymbol.GetItemText( nId ); uno::Sequence< OUString > URLs(1); URLs[0] = aSelImageText; aTbSymbol.RemoveItem( aTbSymbol.GetItemPos( nId ) ); @@ -5298,7 +5297,7 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton ) } bool SvxIconSelectorDialog::ReplaceGraphicItem( - const ::rtl::OUString& aURL ) + const OUString& aURL ) { uno::Sequence< OUString > URLs(1); uno::Sequence< uno::Reference > aImportGraph( 1 ); @@ -5307,7 +5306,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( uno::Reference< graphic::XGraphic > xGraphic; uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString("URL" ); + aMediaProps[0].Name = OUString("URL" ); aMediaProps[0].Value <<= aURL; com::sun::star::awt::Size aSize; @@ -5386,7 +5385,7 @@ void SvxIconSelectorDialog::ImportGraphics( uno::Sequence< OUString > URLs(1); uno::Sequence< uno::Reference > aImportGraph( 1 ); uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString("URL" ); + aMediaProps[0].Name = OUString("URL" ); uno::Reference< css::ui::XUIConfigurationPersistence > xConfigPer( m_xImportedImageManager, uno::UNO_QUERY ); @@ -5413,13 +5412,13 @@ void SvxIconSelectorDialog::ImportGraphics( } else { - ::rtl::OUString aSourcePath( rPaths[0] ); + OUString aSourcePath( rPaths[0] ); if ( rPaths[0].lastIndexOf( '/' ) != rPaths[0].getLength() -1 ) - aSourcePath = rPaths[0] + ::rtl::OUString("/" ); + aSourcePath = rPaths[0] + OUString("/" ); for ( sal_Int32 i = 1; i < rPaths.getLength(); ++i ) { - ::rtl::OUString aPath = aSourcePath + rPaths[i]; + OUString aPath = aSourcePath + rPaths[i]; if ( m_xImportedImageManager->hasImage( GetImageType(), aPath ) ) { aIndex = rPaths[i].lastIndexOf( '/' ); @@ -5467,7 +5466,7 @@ void SvxIconSelectorDialog::ImportGraphics( OUString newLine("\n"); OUString fPath; if (rejectedCount > 1) - fPath = rPaths[0].copy(8) + ::rtl::OUString("/" ); + fPath = rPaths[0].copy(8) + OUString("/" ); for ( sal_Int32 i = 0; i < rejectedCount; ++i ) { message += fPath + rejected[i]; @@ -5487,7 +5486,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) ++m_nNextId; uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString("URL" ); + aMediaProps[0].Name = OUString("URL" ); uno::Reference< graphic::XGraphic > xGraphic; com::sun::star::awt::Size aSize; @@ -5563,7 +5562,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) * *******************************************************************************/ SvxIconReplacementDialog :: SvxIconReplacementDialog( - Window *pWindow, const rtl::OUString& aMessage, bool /*bYestoAll*/ ) + Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ ) : MessBox( pWindow, WB_DEF_YES, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) ) @@ -5578,7 +5577,7 @@ MessBox( pWindow, WB_DEF_YES, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) } SvxIconReplacementDialog :: SvxIconReplacementDialog( - Window *pWindow, const rtl::OUString& aMessage ) + Window *pWindow, const OUString& aMessage ) : MessBox( pWindow, WB_YES_NO_CANCEL, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) ) { @@ -5586,11 +5585,11 @@ MessBox( pWindow, WB_YES_NO_CANCEL, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CON SetMessText( ReplaceIconName( aMessage )); } -rtl::OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMessage ) +OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMessage ) { - rtl::OUString name; - rtl::OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ); - rtl::OUString placeholder("%ICONNAME" ); + OUString name; + OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ); + OUString placeholder("%ICONNAME" ); sal_Int32 pos = message.indexOf( placeholder ); if ( pos != -1 ) { @@ -5611,7 +5610,7 @@ sal_uInt16 SvxIconReplacementDialog :: ShowDialog() * *******************************************************************************/ SvxIconChangeDialog::SvxIconChangeDialog( - Window *pWindow, const rtl::OUString& aMessage) + Window *pWindow, const OUString& aMessage) : ModalDialog ( pWindow, CUI_RES( MD_ICONCHANGE ) ), aFImageInfo (this, CUI_RES( FI_INFO ) ), diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 742382d4587c..2fce78c05b1e 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -902,7 +902,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected() } Any value = - xPropSet->getPropertyValue( rtl::OUString("URI") ); + xPropSet->getPropertyValue( OUString("URI") ); value >>= uri; String* pScriptURI = new String( uri ); diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index fa994c25cad6..54c8f847995d 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -51,7 +51,6 @@ #include "cfg.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; // ----------------------------------------------------------------------- diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 37a99380354d..2c8f59dbc1c2 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -48,15 +48,15 @@ private: CancelButton maCancelButton; HelpButton maHelpButton; - ::rtl::OUString maURL; + OUString maURL; DECL_LINK(ButtonHandler, void *); public: - AssignComponentDialog( Window * pParent, const ::rtl::OUString& rURL ); + AssignComponentDialog( Window * pParent, const OUString& rURL ); ~AssignComponentDialog(); - ::rtl::OUString getURL( void ) const + OUString getURL( void ) const { return maURL; } }; diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 49e02e527475..9a8e5d026847 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -54,7 +54,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 54a5c1ac78fe..72910c0135fd 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -35,29 +35,29 @@ namespace svx{ struct SpellErrorDescription { bool bIsGrammarError; - ::rtl::OUString sErrorText; - ::rtl::OUString sDialogTitle; - ::rtl::OUString sExplanation; - ::rtl::OUString sExplanationURL; + OUString sErrorText; + OUString sDialogTitle; + OUString sExplanation; + OUString sExplanationURL; ::com::sun::star::lang::Locale aLocale; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > xGrammarChecker; - ::rtl::OUString sServiceName; ///< service name of GrammarChecker/SpellChecker - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSuggestions; - ::rtl::OUString sRuleId; + OUString sServiceName; ///< service name of GrammarChecker/SpellChecker + ::com::sun::star::uno::Sequence< OUString > aSuggestions; + OUString sRuleId; SpellErrorDescription() : bIsGrammarError( false ){} SpellErrorDescription( bool bGrammar, - const ::rtl::OUString& rText, + const OUString& rText, const ::com::sun::star::lang::Locale& rLocale, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSuggestions, + const ::com::sun::star::uno::Sequence< OUString >& rSuggestions, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > rxGrammarChecker, - const ::rtl::OUString& rServiceName, - const ::rtl::OUString* pDialogTitle = 0, - const ::rtl::OUString* pExplanation = 0, - const ::rtl::OUString* pRuleId = 0, - const ::rtl::OUString* pExplanationURL = 0 ) : + const OUString& rServiceName, + const OUString* pDialogTitle = 0, + const OUString* pExplanation = 0, + const OUString* pRuleId = 0, + const OUString* pExplanationURL = 0 ) : bIsGrammarError( bGrammar ), sErrorText( rText ), sDialogTitle( ), diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 9e4afeb144ff..f4238c789011 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -64,7 +64,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::linguistic2; -using ::rtl::OUString; // struct SpellDialog_Impl --------------------------------------------- @@ -99,10 +98,10 @@ class SpellUndoAction_Impl : public SfxUndoAction long m_nOldErrorStart; long m_nOldErrorEnd; bool m_bIsErrorLanguageSelected; - ::rtl::OUString m_sRuleId; + OUString m_sRuleId; //undo of AddToDictionary Reference m_xDictionary; - ::rtl::OUString m_sAddedWord; + OUString m_sAddedWord; //move end of error - ::ChangeMarkedWord() long m_nOffset; @@ -148,14 +147,14 @@ public: void SetDictionary(Reference xDict) { m_xDictionary = xDict; } Reference GetDictionary() const {return m_xDictionary;} - void SetAddedWord(const ::rtl::OUString& rWord) {m_sAddedWord = rWord;} - const ::rtl::OUString& GetAddedWord() const { return m_sAddedWord;} + void SetAddedWord(const OUString& rWord) {m_sAddedWord = rWord;} + const OUString& GetAddedWord() const { return m_sAddedWord;} void SetOffset(long nSet) {m_nOffset = nSet;} long GetOffset() const {return m_nOffset;} - void SetErrorType( const ::rtl::OUString& rId ) { m_sRuleId = rId; } - const ::rtl::OUString& GetErrorType() const { return m_sRuleId; } + void SetErrorType( const OUString& rId ) { m_sRuleId = rId; } + const OUString& GetErrorType() const { return m_sRuleId; } }; }//namespace svx @@ -301,7 +300,7 @@ void SpellDialog::UpdateBoxes_Impl() const SpellErrorDescription* pSpellErrorDescription = m_pSentenceED->GetAlternatives(); LanguageType nAltLanguage = LANGUAGE_NONE; - Sequence< ::rtl::OUString > aNewWords; + Sequence< OUString > aNewWords; bool bIsGrammarError = false; if( pSpellErrorDescription ) { @@ -324,7 +323,7 @@ void SpellDialog::UpdateBoxes_Impl() int nDicts = InitUserDicts(); // enter alternatives - const ::rtl::OUString *pNewWords = aNewWords.getConstArray(); + const OUString *pNewWords = aNewWords.getConstArray(); const sal_Int32 nSize = aNewWords.getLength(); for ( i = 0; i < nSize; ++i ) { @@ -627,7 +626,7 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) String sErrorText(m_pSentenceED->GetErrorText()); sal_uInt8 nAdded = linguistic::AddEntryToDic( aXDictionary, sErrorText, sal_False, - ::rtl::OUString(), LANGUAGE_NONE ); + OUString(), LANGUAGE_NONE ); if(nAdded == DIC_ERR_NONE) { SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl( @@ -797,10 +796,10 @@ void SpellDialog::SetLanguage( sal_uInt16 nLang ) m_pLanguageLB->SelectLanguage( nLang ); } -static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl ) +static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) { Image aRes; - ::rtl::OUString aTmp; + OUString aTmp; osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); Graphic aGraphic; const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) ); @@ -1079,7 +1078,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) if(!aSentence.empty()) { SpellPortions::iterator aStart = aSentence.begin(); - rtl::OUString sText; + OUString sText; while(aStart != aSentence.end()) { // hidden text has to be ignored @@ -1101,7 +1100,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) if(aStart->xAlternatives.is()) { uno::Reference< container::XNamed > xNamed( aStart->xAlternatives, uno::UNO_QUERY ); - ::rtl::OUString sServiceName; + OUString sServiceName; if( xNamed.is() ) sServiceName = xNamed->getName(); SpellErrorDescription aDesc( false, aStart->xAlternatives->getWord(), @@ -1111,7 +1110,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) else if(aStart->bIsGrammarError ) { beans::PropertyValues aProperties = aStart->aGrammarError.aProperties; - rtl::OUString sFullCommentURL; + OUString sFullCommentURL; sal_Int32 i = 0; while ( sFullCommentURL.isEmpty() && i < aProperties.getLength() ) { @@ -1169,7 +1168,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe { if(aStart->xAlternatives.is()) { - const rtl::OUString &rString = aStart->sText; + const OUString &rString = aStart->sText; Reference xEntry = xChangeAll->getEntry(rString); @@ -1750,10 +1749,10 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA DBG_ASSERT(static_cast( GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR)), "no error set?"); - ::rtl::OUString aWord; + OUString aWord; lang::Locale aLocale; - uno::Sequence< ::rtl::OUString > aAlts; - ::rtl::OUString sServiceName; + uno::Sequence< OUString > aAlts; + OUString sServiceName; if (xAlt.is()) { aWord = xAlt->getWord(); @@ -2026,8 +2025,8 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) { - rtl::OUString sURL=pHyperlink->GetURL(); - rtl::OUString sTitle=GetText(); + OUString sURL=pHyperlink->GetURL(); + OUString sTitle=GetText(); if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty return 1; @@ -2035,12 +2034,12 @@ IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) { uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); - xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); } catch ( uno::Exception& ) { uno::Any exc( ::cppu::getCaughtException() ); - rtl::OUString msg( ::comphelper::anyToString( exc ) ); + OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; ErrorBox aErrorBox( NULL, WB_OK, msg ); aErrorBox.SetText( sTitle ); diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 0fcb96b31a5b..ee943f8f4092 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -98,7 +98,7 @@ AboutDialog::AboutDialog(Window* pParent) IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) { - rtl::OUString sURL = ""; + OUString sURL = ""; // Find which button was pressed and from this, get the URL to be opened AboutDialogButton* pDialogButton = (AboutDialogButton*)pButton->GetData(); @@ -117,12 +117,12 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) { Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext() ) ); - xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); } catch (const Exception&) { Any exc( ::cppu::getCaughtException() ); - rtl::OUString msg( ::comphelper::anyToString( exc ) ); + OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; ErrorBox aErrorBox( NULL, WB_OK, msg ); aErrorBox.SetText( GetText() ); @@ -249,9 +249,9 @@ OUString AboutDialog::GetVersionString() return sVersion; } -rtl::OUString AboutDialog::GetCopyrightString() +OUString AboutDialog::GetCopyrightString() { - rtl::OUString aCopyrightString = m_aVendorTextStr; + OUString aCopyrightString = m_aVendorTextStr; aCopyrightString += "\n"; aCopyrightString += m_aCopyrightTextStr; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index c9a2c0926345..c0f0831c1bc8 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -45,7 +45,6 @@ #include #include -using rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; @@ -162,7 +161,7 @@ HexColorControl::HexColorControl( Window* pParent, const ResId& rResId ) void HexColorControl::SetColor( sal_Int32 nColor ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; sax::Converter::convertColor( aBuffer, nColor ); SetText( aBuffer.makeStringAndClear().copy(1) ); } @@ -233,7 +232,7 @@ void HexColorControl::Paste() try { ::com::sun::star::uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; if( !aText.isEmpty() && aText.matchAsciiL( "#", 1, 0 ) ) diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 0b06b97292e9..05559422f7dd 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -292,7 +292,7 @@ void SvxCharacterMap::init() m_pDeleteBtn->Hide(); } - rtl::OUString aDefStr( aFont.GetName() ); + OUString aDefStr( aFont.GetName() ); String aLastName; int nCount = GetDevFontCount(); for ( int i = 0; i < nCount; i++ ) @@ -314,7 +314,7 @@ void SvxCharacterMap::init() sal_Int32 nIndex = 0; do { - rtl::OUString aToken = aDefStr.getToken(0, ';', nIndex); + OUString aToken = aDefStr.getToken(0, ';', nIndex); if ( m_pFontLB->GetEntryPos( aToken ) != LISTBOX_ENTRY_NOTFOUND ) { aDefStr = aToken; @@ -375,7 +375,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, OKHdl) { sal_UCS4 cChar = m_pShowSet->GetSelectCharacter(); // using the new UCS4 constructor - rtl::OUString aOUStr( &cChar, 1 ); + OUString aOUStr( &cChar, 1 ); m_pShowText->SetText( aOUStr ); } EndDialog( sal_True ); @@ -484,7 +484,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl) { sal_UCS4 cChar = m_pShowSet->GetSelectCharacter(); // using the new UCS4 constructor - rtl::OUString aOUStr( &cChar, 1 ); + OUString aOUStr( &cChar, 1 ); m_pShowText->SetText( aText + aOUStr ); } @@ -505,7 +505,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl) if ( bSelect ) { // using the new UCS4 constructor - aText = rtl::OUString( &cChar, 1 ); + aText = OUString( &cChar, 1 ); const Subset* pSubset = NULL; if( pSubsetMap ) @@ -525,7 +525,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl) snprintf( aBuf, sizeof(aBuf), "U+%04X", static_cast(cChar) ); if( cChar < 0x0100 ) snprintf( aBuf+6, sizeof(aBuf)-6, " (%u)", static_cast(cChar) ); - aText = rtl::OUString::createFromAscii(aBuf); + aText = OUString::createFromAscii(aBuf); } m_pCharCodeText->SetText( aText ); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 20496cd892e1..a386b9ccaf96 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -814,8 +814,8 @@ void FmSearchDialog::LoadParams() { FmSearchParams aParams(m_pConfig->getParams()); - const ::rtl::OUString* pHistory = aParams.aHistory.getConstArray(); - const ::rtl::OUString* pHistoryEnd = pHistory + aParams.aHistory.getLength(); + const OUString* pHistory = aParams.aHistory.getConstArray(); + const OUString* pHistoryEnd = pHistory + aParams.aHistory.getLength(); for (; pHistory != pHistoryEnd; ++pHistory) m_cmbSearchText.InsertEntry( *pHistory ); @@ -910,7 +910,7 @@ void FmSearchDialog::SaveParams() const FmSearchParams aCurrentSettings; aCurrentSettings.aHistory.realloc( m_cmbSearchText.GetEntryCount() ); - ::rtl::OUString* pHistory = aCurrentSettings.aHistory.getArray(); + OUString* pHistory = aCurrentSettings.aHistory.getArray(); for (sal_uInt16 i=0; i= 0; ) { - ::rtl::OUString aFilterWildcard( aWildcard ); + OUString aFilterWildcard( aWildcard ); pFilterEntry = new FilterEntry; pFilterEntry->aFilterName = aFilters[ l ].second.getToken( 0, ';', nIndex ); @@ -1008,7 +1008,7 @@ void TPGalleryThemeProperties::SearchFiles() aLbxFound.Clear(); pProgress->SetFileType( aCbbFileType.GetText() ); - pProgress->SetDirectory( rtl::OUString() ); + pProgress->SetDirectory( OUString() ); pProgress->Update(); pProgress->StartExecuteModal( LINK( this, TPGalleryThemeProperties, EndSearchProgressHdl ) ); diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 711a7b4f6fcf..ceb24716263a 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -77,7 +77,7 @@ URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeT maCbbTargets.InsertEntry( *rTargetList[ i ] ); if( !rTarget.Len() ) - maCbbTargets.SetText( rtl::OUString("_self") ); + maCbbTargets.SetText( OUString("_self") ); else maCbbTargets.SetText( rTarget ); } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 87e4b163945e..ebf3a471a2e2 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -52,7 +52,6 @@ namespace svx using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; - using ::rtl::OUString; //------------------------------------------------------------------------- namespace @@ -614,12 +613,12 @@ namespace svx } //------------------------------------------------------------------------- - void HangulHanjaConversionDialog::FillSuggestions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions ) + void HangulHanjaConversionDialog::FillSuggestions( const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions ) { m_aSuggestions.Clear(); - const ::rtl::OUString* pSuggestions = _rSuggestions.getConstArray(); - const ::rtl::OUString* pSuggestionsEnd = _rSuggestions.getConstArray() + _rSuggestions.getLength(); + const OUString* pSuggestions = _rSuggestions.getConstArray(); + const OUString* pSuggestionsEnd = _rSuggestions.getConstArray() + _rSuggestions.getLength(); while ( pSuggestions != pSuggestionsEnd ) m_aSuggestions.InsertEntry( *pSuggestions++ ); @@ -779,7 +778,7 @@ namespace svx //------------------------------------------------------------------------- void HangulHanjaConversionDialog::SetCurrentString( const String& _rNewString, - const Sequence< ::rtl::OUString >& _rSuggestions, bool _bOriginatesFromDocument ) + const Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument ) { m_pPlayground->SetCurrentText( _rNewString ); @@ -941,9 +940,9 @@ namespace svx Reference< XNameAccess > xNameAccess = Reference< XNameAccess >( xNameCont, UNO_QUERY ); if( xNameAccess.is() ) { - Sequence< ::rtl::OUString > aDictNames( xNameAccess->getElementNames() ); + Sequence< OUString > aDictNames( xNameAccess->getElementNames() ); - const ::rtl::OUString* pDic = aDictNames.getConstArray(); + const OUString* pDic = aDictNames.getConstArray(); sal_Int32 nCount = aDictNames.getLength(); sal_Int32 i; diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 203257707898..1a55181f6434 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -167,7 +167,7 @@ void SvxHyperlinkNewDocTp::FillDocumentList () { uno::Sequence< beans::PropertyValue >& rDynamicMenuEntry = aDynamicMenuEntries[ i ]; - rtl::OUString aDocumentUrl, aTitle, aImageId, aTargetName; + OUString aDocumentUrl, aTitle, aImageId, aTargetName; for ( int e = 0; e < rDynamicMenuEntry.getLength(); e++ ) { @@ -338,13 +338,13 @@ void SvxHyperlinkNewDocTp::DoApply () // create items SfxStringItem aName( SID_FILE_NAME, aStrDocName ); - SfxStringItem aReferer( SID_REFERER, rtl::OUString("private:user") ); - SfxStringItem aFrame( SID_TARGETNAME, rtl::OUString("_blank") ); + SfxStringItem aReferer( SID_REFERER, OUString("private:user") ); + SfxStringItem aFrame( SID_TARGETNAME, OUString("_blank") ); - rtl::OUString aStrFlags('S'); + OUString aStrFlags('S'); if ( maRbtEditLater.IsChecked() ) { - aStrFlags += rtl::OUString('H'); + aStrFlags += OUString('H'); } SfxStringItem aFlags (SID_OPTIONS, aStrFlags); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index b270153d320f..e0866fc67165 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -142,9 +142,9 @@ void SvxHyperlinkInternetTp::FillDlgFields ( String& aStrURL ) void SvxHyperlinkInternetTp::setAnonymousFTPUser() { - maEdLogin.SetText(rtl::OUString(sAnonymous)); + maEdLogin.SetText(OUString(sAnonymous)); SvAddressParser aAddress( SvtUserOptions().GetEmail() ); - maEdPassword.SetText( aAddress.Count() ? aAddress.GetEmailAddress(0) : rtl::OUString() ); + maEdPassword.SetText( aAddress.Count() ? aAddress.GetEmailAddress(0) : OUString() ); maFtLogin.Disable (); maFtPassword.Disable (); @@ -336,8 +336,8 @@ void SvxHyperlinkInternetTp::RemoveImproperProtocol(const String& aProperScheme) String SvxHyperlinkInternetTp::GetSchemeFromButtons() const { if( maRbtLinktypFTP.IsChecked() ) - return rtl::OUString(INET_FTP_SCHEME); - return rtl::OUString(INET_HTTP_SCHEME); + return OUString(INET_FTP_SCHEME); + return OUString(INET_HTTP_SCHEME); } INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const @@ -415,8 +415,8 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) ///////////////////////////////////////////////// // Open URL if available - SfxStringItem aName( SID_FILE_NAME, rtl::OUString("http://") ); - SfxStringItem aRefererItem( SID_REFERER, rtl::OUString("private:user") ); + SfxStringItem aName( SID_FILE_NAME, OUString("http://") ); + SfxStringItem aRefererItem( SID_REFERER, OUString("private:user") ); SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True ); SfxBoolItem aSilent( SID_SILENT, sal_True ); SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True ); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 1899ed9c895b..1a5090cf570d 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -161,7 +161,7 @@ String SvxHyperlinkMailTp::CreateAbsoluteURL() const { if ( maEdSubject.GetText() != OUString(aEmptyStr) ) { - String aQuery = rtl::OUString("subject="); + String aQuery = OUString("subject="); aQuery.Append( maEdSubject.GetText() ); aURL.SetParam(aQuery); } @@ -241,8 +241,8 @@ void SvxHyperlinkMailTp::RemoveImproperProtocol(const String& aProperScheme) String SvxHyperlinkMailTp::GetSchemeFromButtons() const { if( maRbtNews.IsChecked() ) - return rtl::OUString(INET_NEWS_SCHEME); - return rtl::OUString(INET_MAILTO_SCHEME); + return OUString(INET_NEWS_SCHEME); + return OUString(INET_MAILTO_SCHEME); } INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 782743d6aaaa..343eb9cbbbe1 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -217,7 +217,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree ( String aStrURL ) xub_StrLen nPos = aStrURL.Search ( sal_Unicode('#') ); if( nPos != 0 ) - aUStrURL = ::rtl::OUString( aStrURL ); + aUStrURL = OUString( aStrURL ); if( !RefreshFromDoc ( aUStrURL ) ) maLbTree.Invalidate(); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 9df36a8892ff..273d89e027bf 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -433,23 +433,23 @@ String SvxHyperlinkTabPageBase::GetSchemeFromURL( String aStrURL ) { if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTP_SCHEME, 0, 7 ) ) { - aStrScheme = rtl::OUString( INET_HTTP_SCHEME ); + aStrScheme = OUString( INET_HTTP_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTPS_SCHEME, 0, 8 ) ) { - aStrScheme = rtl::OUString( INET_HTTPS_SCHEME ); + aStrScheme = OUString( INET_HTTPS_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_FTP_SCHEME, 0, 6 ) ) { - aStrScheme = rtl::OUString( INET_FTP_SCHEME ); + aStrScheme = OUString( INET_FTP_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_MAILTO_SCHEME, 0, 7 ) ) { - aStrScheme = rtl::OUString( INET_MAILTO_SCHEME ); + aStrScheme = OUString( INET_MAILTO_SCHEME ); } else if ( aStrURL.EqualsIgnoreCaseAscii( INET_NEWS_SCHEME, 0, 5 ) ) { - aStrScheme = rtl::OUString( INET_NEWS_SCHEME ); + aStrScheme = OUString( INET_NEWS_SCHEME ); } } else diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 6c24c0c7ec69..1f853ff62483 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -36,17 +36,17 @@ using ::std::vector; // some stuff for easier changes for SvtViewOptions static const sal_Char* pViewOptDataName = "dialog data"; -#define VIEWOPT_DATANAME ::rtl::OUString::createFromAscii( pViewOptDataName ) +#define VIEWOPT_DATANAME OUString::createFromAscii( pViewOptDataName ) static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const String& rData ) { - rOpt.SetUserItem( VIEWOPT_DATANAME, ::com::sun::star::uno::makeAny( ::rtl::OUString( rData ) ) ); + rOpt.SetUserItem( VIEWOPT_DATANAME, ::com::sun::star::uno::makeAny( OUString( rData ) ) ); } static inline String GetViewOptUserItem( const SvtViewOptions& rOpt ) { ::com::sun::star::uno::Any aAny( rOpt.GetUserItem( VIEWOPT_DATANAME ) ); - ::rtl::OUString aUserData; + OUString aUserData; aAny >>= aUserData; return String( aUserData ); @@ -254,7 +254,7 @@ IconChoiceDialog ::~IconChoiceDialog () // save configuration at INI-Manager // and remove pages SvtViewOptions aTabDlgOpt( E_TABDIALOG, OUString::number(nResId) ); - aTabDlgOpt.SetWindowState(::rtl::OStringToOUString(GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); + aTabDlgOpt.SetWindowState(OStringToOUString(GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); aTabDlgOpt.SetPageID( mnCurrentPageId ); for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) @@ -1002,7 +1002,7 @@ void IconChoiceDialog::Start_Impl() if ( aTabDlgOpt.Exists() ) { // possibly position from config - SetWindowState(rtl::OUStringToOString(aTabDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); + SetWindowState(OUStringToOString(aTabDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); // initial TabPage from program/help/config nActPage = (sal_uInt16)aTabDlgOpt.GetPageID(); diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 8d2091d3fa03..80c91331f4f9 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -277,7 +277,7 @@ short SvInsertOleDlg::Execute() // object couldn't be created from file // global Resource from svtools (former so3 resource) String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) ); - aErr.SearchAndReplace( rtl::OUString( '%' ), aFileName ); + aErr.SearchAndReplace( OUString( '%' ), aFileName ); ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute(); } else @@ -285,7 +285,7 @@ short SvInsertOleDlg::Execute() // object couldn't be created // global Resource from svtools (former so3 resource) String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE ) ); - aErr.SearchAndReplace( rtl::OUString( '%' ), aServerName ); + aErr.SearchAndReplace( OUString( '%' ), aServerName ); ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute(); } } @@ -326,7 +326,7 @@ short SvInsertOleDlg::Execute() // object couldn't be created from file // global Resource from svtools (former so3 resource) String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) ); - aErr.SearchAndReplace( rtl::OUString( '%' ), aFileName ); + aErr.SearchAndReplace( OUString( '%' ), aFileName ); ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute(); } } @@ -477,7 +477,7 @@ short SvInsertPlugInDialog::Execute() // PlugIn couldn't be created // global Resource from svtools (former so3 resource) String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_PLUGIN ) ); - aErr.SearchAndReplace( rtl::OUString('%'), aURL ); + aErr.SearchAndReplace( OUString('%'), aURL ); ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute(); } } diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 7efbc486fe80..cf6319cc1cfe 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -32,7 +32,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const return static_cast< sal_uInt16 >( m_pCountEdit->GetValue() ); } -SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& sHelpId ) +SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const OString& sHelpId ) : ModalDialog(pParent, "InsertRowColumnDialog", "cui/ui/insertrowcolumn.ui") , aRow(CUI_RESSTR(RID_SVXSTR_ROW)) , aCol(CUI_RESSTR(RID_SVXSTR_COL)) diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index 74f836117c12..cbd785e3f7cd 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -51,7 +51,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) if ( IsClassPathMode() ) { aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); - aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") ); + aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), OUString("*.jar;*.zip") ); } if ( aDlg.Execute() == ERRCODE_NONE ) diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 3dad7487d74a..33715595cf82 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -96,7 +96,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl) sal_uLong nPos = aRadioLB.GetEntryPos( sInsPath, 1 ); if ( 0xffffffff == nPos ) //See svtools/source/contnr/svtabbx.cxx SvTabListBox::GetEntryPos { - rtl::OUString sNewEntry( '\t' ); + OUString sNewEntry( '\t' ); sNewEntry += sInsPath; SvTreeListEntry* pEntry = aRadioLB.InsertEntry( sNewEntry ); String* pData = new String( aURL ); @@ -284,7 +284,7 @@ void SvxMultiPathDialog::SetPath( const String& rPath ) if ( pImpl->bIsRadioButtonMode ) { - rtl::OUString sEntry( '\t' ); + OUString sEntry( '\t' ); sEntry += (bIsSystemPath ? sSystemPath : OUString(sPath)); SvTreeListEntry* pEntry = aRadioLB.InsertEntry( sEntry ); String* pURL = new String( sPath ); diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index 1597e2bf2826..427c42b5ddb9 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -47,7 +47,7 @@ typedef map< String, StrSet, ltstr > FilterMap; //================================================================================================== -void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequence< rtl::OUString >& rPluginTypes ) +void fillNetscapePluginFilters( Sequence< OUString >& rPluginNames, Sequence< OUString >& rPluginTypes ) { Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); Reference< XPluginManager > xPMgr( PluginManager::create(xContext) ); @@ -74,10 +74,10 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc } } - rPluginNames = Sequence< rtl::OUString >( aMap.size() ); - rPluginTypes = Sequence< rtl::OUString >( aMap.size() ); - rtl::OUString* pPluginNames = rPluginNames.getArray(); - rtl::OUString* pPluginTypes = rPluginTypes.getArray(); + rPluginNames = Sequence< OUString >( aMap.size() ); + rPluginTypes = Sequence< OUString >( aMap.size() ); + OUString* pPluginNames = rPluginNames.getArray(); + OUString* pPluginTypes = rPluginTypes.getArray(); int nIndex = 0; for ( FilterMap::iterator iPos = aMap.begin(); iPos != aMap.end(); ++iPos ) { @@ -95,7 +95,7 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc if ( aType.Len() ) { - aText += rtl::OUString( " (" ); + aText += OUString( " (" ); aText += aType; aText += ')'; pPluginNames[nIndex] = aText; diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 4e2465ec2239..a459ec725c91 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -101,7 +101,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT ); - rtl::OUString aTextStr; + OUString aTextStr; if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) { const SvxPostItTextItem& rText = diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 3ce21e70739b..bb105fa6abeb 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -106,7 +106,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN); bIsHidden = ::comphelper::getBOOL(aHidden); - ::rtl::OUString sName; + OUString sName; xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName; sCurName = sName; } diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 56b0185a4b8d..713bbae4d673 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -53,7 +53,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; // class LookUpComboBox -------------------------------------------------- @@ -533,7 +532,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) // adjust language String aStr( GetText() ); aStr.Erase( aStr.Search( sal_Unicode( '(' ) ) - 1 ); - aStr.Append( rtl::OUString(" (") ); + aStr.Append( OUString(" (") ); aStr += SvtLanguageTable().GetLanguageString( nLanguage ); aStr.Append( sal_Unicode( ')' ) ); SetText( aStr ); // set window title diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index e0dbad90ebca..2e06c45d6379 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -43,7 +43,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; class SvTreeListEntry; class ThesaurusAlternativesCtrl; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 52bb6df63317..041557df8f5c 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -326,7 +326,7 @@ editeng::HangulHanjaConversion::ConversionDirection AbstractHangulHanjaConversio void AbstractHangulHanjaConversionDialog_Impl::SetCurrentString( const String& _rNewString, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, + const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument ) { @@ -391,7 +391,7 @@ sal_Bool AbstractInsertObjectDialog_Impl::IsCreateNew() return pDlg->IsCreateNew(); } -::Reference< ::com::sun::star::io::XInputStream > AbstractInsertObjectDialog_Impl::GetIconIfIconified( ::rtl::OUString* pGraphicMediaType ) +::Reference< ::com::sun::star::io::XInputStream > AbstractInsertObjectDialog_Impl::GetIconIfIconified( OUString* pGraphicMediaType ) { return pDlg->GetIconIfIconified( pGraphicMediaType ); } @@ -729,11 +729,11 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheck else pDlg->SetCheckNameHdl( Link(), bCheckImmediately ); } -void AbstractSvxNameDialog_Impl::SetEditHelpId(const rtl::OString& aHelpId) +void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& aHelpId) { pDlg->SetEditHelpId( aHelpId ); } -void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) +void AbstractSvxNameDialog_Impl::SetHelpId( const OString& aHelpId ) { pDlg->SetHelpId( aHelpId ); } @@ -847,7 +847,7 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle ) pDlg->SetText( rNewTitle ); } -void AbstractSvxMultiFileDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) +void AbstractSvxMultiFileDialog_Impl::SetHelpId( const OString& aHelpId ) { pDlg->SetHelpId( aHelpId ); } @@ -1858,7 +1858,7 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI return 0; } -SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, +SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const OUString& rCommand, const Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList ) { @@ -1872,20 +1872,20 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia if ( pDlg ) { - pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); + pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); return new AbstractInsertObjectDialog_Impl( pDlg ); } return 0; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const OUString& rCommand, const Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) { InsertObjectDialog_Impl* pDlg=0; if ( rCommand == ".uno:InsertObjectFloatingFrame" ) { pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); - pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); + pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); return new CuiVclAbstractDialog_Impl( pDlg ); } return 0; @@ -1922,12 +1922,12 @@ SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( } VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( - Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& /*rApplicationContext*/ ) + Window* pParent, const OUString& rExtensionId, const OUString& /*rApplicationContext*/ ) { return new CuiVclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } -SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) +SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) { return new SvxInsRowColDlg( pParent, bCol, sHelpId ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 369e487946bb..cf29bdf3cac0 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -388,9 +388,9 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog) virtual void GetName( String& rName ) ; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ; - virtual void SetEditHelpId(const rtl::OString&) ; + virtual void SetEditHelpId(const OString&) ; //from class Window - virtual void SetHelpId( const rtl::OString& ) ; + virtual void SetHelpId( const OString& ) ; virtual void SetText( const OUString& rStr ) ; private: Link aCheckNameHdl; @@ -460,7 +460,7 @@ class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog virtual void EnableRadioButtonMode(); virtual void SetTitle( const String& rNewTitle ); //From Class Window - virtual void SetHelpId( const rtl::OString& ) ; + virtual void SetHelpId( const OString& ) ; }; //for SvxMultiFileDialog end @@ -777,9 +777,9 @@ public: virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) ; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const OUString& rExtensionId, const rtl::OUString& rApplicationContext ); + Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ); - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ); virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 87427302a84a..19eba293bef4 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -98,7 +98,7 @@ struct TAccInfo sal_Int32 m_nKeyPos; sal_Int32 m_nListPos; sal_Bool m_bIsConfigurable; - ::rtl::OUString m_sCommand; + OUString m_sCommand; KeyCode m_aKey; }; @@ -146,9 +146,9 @@ private: css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription; css::uno::Reference< css::frame::XFrame > m_xFrame; - ::rtl::OUString m_sModuleLongName; - ::rtl::OUString m_sModuleShortName; - ::rtl::OUString m_sModuleUIName; + OUString m_sModuleLongName; + OUString m_sModuleShortName; + OUString m_sModuleUIName; DECL_LINK(ChangeHdl, void *); DECL_LINK(RemoveHdl, void *); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index abaf70c7f121..1190ffe6aa1e 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -248,7 +248,7 @@ private: String sModify; String sNew; - std::set aFormatText; + std::set aFormatText; DoubleStringTable aDoubleStringTable; CollatorWrapper* pCompareClass; CharClass* pCharClass; @@ -287,8 +287,8 @@ public: struct StringsArrays { - std::vector aAbbrevStrings; - std::vector aDoubleCapsStrings; + std::vector aAbbrevStrings; + std::vector aDoubleCapsStrings; StringsArrays() { } }; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 790dcd654cb6..84ecf045156b 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -100,7 +100,7 @@ public: ::com::sun::star::ui::XUIConfigurationManager >& xCfgMgr, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >& xParentCfgMgr, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ); ~SaveInData() {} @@ -137,9 +137,9 @@ public: com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > m_aSeparatorSeq; - Image GetImage( const rtl::OUString& rCommandURL ); + Image GetImage( const OUString& rCommandURL ); - virtual bool HasURL( const rtl::OUString& aURL ) = 0; + virtual bool HasURL( const OUString& aURL ) = 0; virtual bool HasSettings() = 0; virtual SvxEntries* GetEntries() = 0; virtual void SetEntries( SvxEntries* ) = 0; @@ -151,8 +151,8 @@ class MenuSaveInData : public SaveInData { private: - rtl::OUString m_aMenuResourceURL; - rtl::OUString m_aDescriptorContainer; + OUString m_aMenuResourceURL; + OUString m_aDescriptorContainer; ::com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess > m_xMenuSettings; @@ -185,7 +185,7 @@ private: bool LoadSubMenus( const ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuBarSettings, - const rtl::OUString& rBaseTitle, SvxConfigEntry* pParentData ); + const OUString& rBaseTitle, SvxConfigEntry* pParentData ); public: @@ -194,7 +194,7 @@ public: ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ); ~MenuSaveInData(); @@ -202,7 +202,7 @@ public: /// methods inherited from SaveInData SvxEntries* GetEntries(); void SetEntries( SvxEntries* ); - bool HasURL( const rtl::OUString& URL ) { (void)URL; return sal_False; } + bool HasURL( const OUString& URL ) { (void)URL; return sal_False; } bool HasSettings() { return m_xMenuSettings.is(); } void Reset(); bool Apply(); @@ -214,10 +214,10 @@ private: /// common properties sal_uInt16 nId; - ::rtl::OUString aHelpText; - ::rtl::OUString aLabel; - ::rtl::OUString aCommand; - ::rtl::OUString aHelpURL; + OUString aHelpText; + OUString aLabel; + OUString aCommand; + OUString aHelpURL; bool bPopUp; bool bStrEdited; @@ -236,8 +236,8 @@ private: public: - SvxConfigEntry( const ::rtl::OUString& rDisplayName, - const ::rtl::OUString& rCommandURL, + SvxConfigEntry( const OUString& rDisplayName, + const OUString& rCommandURL, bool bPopup = sal_False, bool bParentData = sal_False ); @@ -256,17 +256,17 @@ public: ~SvxConfigEntry(); - const ::rtl::OUString& GetCommand() const { return aCommand; } + const OUString& GetCommand() const { return aCommand; } void SetCommand( const String& rCmd ) { aCommand = rCmd; } - const ::rtl::OUString& GetName() const { return aLabel; } + const OUString& GetName() const { return aLabel; } void SetName( const String& rStr ) { aLabel = rStr; bStrEdited = sal_True; } bool HasChangedName() const { return bStrEdited; } - const ::rtl::OUString& GetHelpText() ; + const OUString& GetHelpText() ; void SetHelpText( const String& rStr ) { aHelpText = rStr; } - const ::rtl::OUString& GetHelpURL() const { return aHelpURL; } + const OUString& GetHelpURL() const { return aHelpURL; } void SetHelpURL( const String& rStr ) { aHelpURL = rStr; } void SetPopup( bool bOn = sal_True ) { bPopUp = bOn; } @@ -398,7 +398,7 @@ protected: SvxScriptSelectorDialog* pSelectorDlg; /// the ResourceURL to select when opening the dialog - rtl::OUString m_aURLToSelect; + OUString m_aURLToSelect; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; @@ -413,7 +413,7 @@ protected: ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ) = 0; virtual void Init() = 0; @@ -439,7 +439,7 @@ protected: public: - static bool CanConfig( const ::rtl::OUString& rModuleId ); + static bool CanConfig( const OUString& rModuleId ); SaveInData* GetSaveInData() { return pCurrentSaveInData; } @@ -474,7 +474,7 @@ public: If the given frame is not , or an default frame could be successfully determined, then the ModuleManager is asked for the module ID of the component in the frame. */ - static ::rtl::OUString + static OUString GetFrameWithDefaultAndIdentify( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _inout_rxFrame ); }; @@ -505,7 +505,7 @@ public: ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ); }; @@ -618,7 +618,7 @@ public: ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ); }; @@ -627,7 +627,7 @@ class ToolbarSaveInData : public SaveInData private: SvxConfigEntry* pRootEntry; - rtl::OUString m_aDescriptorContainer; + OUString m_aDescriptorContainer; ::com::sun::star::uno::Reference < com::sun::star::container::XNameAccess > m_xPersistentWindowState; @@ -651,7 +651,7 @@ public: ::com::sun::star::ui::XUIConfigurationManager >&, const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XUIConfigurationManager >&, - const rtl::OUString& aModuleId, + const OUString& aModuleId, bool docConfig ); ~ToolbarSaveInData(); @@ -661,22 +661,22 @@ public: void RemoveToolbar( SvxConfigEntry* pToolbar ); void ApplyToolbar( SvxConfigEntry* pToolbar ); - rtl::OUString GetSystemUIName( const rtl::OUString& rResourceURL ); + OUString GetSystemUIName( const OUString& rResourceURL ); - sal_Int32 GetSystemStyle( const rtl::OUString& rResourceURL ); + sal_Int32 GetSystemStyle( const OUString& rResourceURL ); void SetSystemStyle( - const rtl::OUString& rResourceURL, sal_Int32 nStyle ); + const OUString& rResourceURL, sal_Int32 nStyle ); void SetSystemStyle( ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame, - const rtl::OUString& rResourceURL, sal_Int32 nStyle ); + const OUString& rResourceURL, sal_Int32 nStyle ); SvxEntries* GetEntries(); void SetEntries( SvxEntries* ); bool HasSettings(); - bool HasURL( const rtl::OUString& rURL ); + bool HasURL( const OUString& rURL ); void Reset(); bool Apply(); }; @@ -708,7 +708,7 @@ public: m_pBtnOK->Enable( rLink.Call( this ) > 0 ); } - void SetEditHelpId( const rtl::OString& aHelpId) + void SetEditHelpId( const OString& aHelpId) { m_pEdtName->SetHelpId(aHelpId); } @@ -742,12 +742,12 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicProvider > m_xGraphProvider; - bool ReplaceGraphicItem( const ::rtl::OUString& aURL ); + bool ReplaceGraphicItem( const OUString& aURL ); - bool ImportGraphic( const ::rtl::OUString& aURL ); + bool ImportGraphic( const OUString& aURL ); void ImportGraphics( - const com::sun::star::uno::Sequence< rtl::OUString >& aURLs ); + const com::sun::star::uno::Sequence< OUString >& aURLs ); public: @@ -774,14 +774,14 @@ class SvxIconReplacementDialog : public MessBox public: SvxIconReplacementDialog( Window *pWindow, - const rtl::OUString& aMessage, + const OUString& aMessage, bool aYestoAll); SvxIconReplacementDialog( Window *pWindow, - const rtl::OUString& aMessage ); + const OUString& aMessage ); - rtl::OUString ReplaceIconName( const rtl::OUString& ); + OUString ReplaceIconName( const OUString& ); sal_uInt16 ShowDialog(); }; //added for issue83555 @@ -793,7 +793,7 @@ private: FixedText aDescriptionLabel; SvxDescriptionEdit aLineEditDescription; public: - SvxIconChangeDialog(Window *pWindow, const rtl::OUString& aMessage); + SvxIconChangeDialog(Window *pWindow, const OUString& aMessage); }; #endif // _SVXCFG_HXX diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 3f9492f649be..66ea8dbed5e2 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -38,10 +38,10 @@ class SfxMacroInfoItem; struct SfxStyleInfo_Impl { - ::rtl::OUString sFamily; - ::rtl::OUString sStyle; - ::rtl::OUString sCommand; - ::rtl::OUString sLabel; + OUString sFamily; + OUString sStyle; + OUString sCommand; + OUString sLabel; SfxStyleInfo_Impl() {} @@ -70,9 +70,9 @@ struct SfxStylesInfo_Impl void getLabel4Style(SfxStyleInfo_Impl& aStyle); ::std::vector< SfxStyleInfo_Impl > getStyleFamilies(); - ::std::vector< SfxStyleInfo_Impl > getStyles(const ::rtl::OUString& sFamily); + ::std::vector< SfxStyleInfo_Impl > getStyles(const OUString& sFamily); - static ::rtl::OUString generateCommand(const ::rtl::OUString& sFamily, const ::rtl::OUString& sStyle); + static OUString generateCommand(const OUString& sFamily, const OUString& sStyle); }; #define SFX_CFGGROUP_FUNCTION 1 @@ -133,7 +133,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox SfxGroupInfoArr_Impl aArr; sal_uLong nMode; - ::rtl::OUString m_sModuleLongName; + OUString m_sModuleLongName; css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; css::uno::Reference< css::frame::XFrame > m_xFrame; css::uno::Reference< css::container::XNameAccess > m_xGlobalCategoryInfo; @@ -148,7 +148,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, - ::rtl::OUString& docName + OUString& docName ); @@ -156,7 +156,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox void InitBasic(); void InitStyles(); - ::rtl::OUString MapCommand2UIName(const ::rtl::OUString& sCommand); + OUString MapCommand2UIName(const OUString& sCommand); SfxStylesInfo_Impl* pStylesInfo; @@ -174,7 +174,7 @@ public: void Init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sModuleLongName); + const OUString& sModuleLongName); void SetFunctionListBox( SfxConfigFunctionListBox_Impl *pBox ) { pFunctionListBox = pBox; } void Open( SvTreeListEntry*, sal_Bool ); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 71b5542f423c..422ffdff4dfd 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -51,7 +51,7 @@ protected: sal_Bool m_bPreviewBackgroundToCharacter; - SvxCharBasePage(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet& rItemset); + SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); virtual ~SvxCharBasePage(); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 3f7c9894f65e..3157e98911cc 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -292,7 +292,7 @@ class TPGalleryThemeProperties : public SfxTabPage virtual void Reset( const SfxItemSet& /*rSet*/ ) {} virtual sal_Bool FillItemSet( SfxItemSet& /*rSet*/ ) { return sal_True; } - ::rtl::OUString addExtension( const ::rtl::OUString&, const ::rtl::OUString& ); + OUString addExtension( const OUString&, const OUString& ); void FillFilterList(); void SearchFiles(); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 2afb2e1ccb24..a07ff3aca380 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -138,7 +138,7 @@ private: FixedText aSymbolHeightFT; MetricField aSymbolHeightMF; CheckBox aSymbolRatioCB; - std::vector aGrfNames; + std::vector aGrfNames; SvxBmpItemInfoList aGrfBrushItems; sal_Bool bLastWidthModified; Size aSymbolLastSize; diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 62e2b936155b..989dbe021585 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -75,7 +75,7 @@ namespace svx @param _sLocation The location of the file. */ - void insertNewEntry( const ::rtl::OUString& _sName,const ::rtl::OUString& _sLocation, const bool bReadOnly ); + void insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool bReadOnly ); /** opens the LinkDialog to create a register pair @param _sOldName diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 1408f2b40a01..ffe670d830c8 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -65,7 +65,7 @@ public: pBtnOK->Enable( rLink.Call( this ) > 0 ); } - void SetEditHelpId( const rtl::OString& aHelpId) {pEdtName->SetHelpId(aHelpId);} + void SetEditHelpId( const OString& aHelpId) {pEdtName->SetHelpId(aHelpId);} }; /** #i68101# diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index a1acd5053dc3..5927c53106e5 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -156,7 +156,7 @@ namespace svx String GetCurrentString( ) const; void SetCurrentString( const String& _rNewString, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, + const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument = true ); @@ -190,7 +190,7 @@ namespace svx DECL_LINK( ClickByCharacterHdl, CheckBox* ); /// fill the suggestion list box with suggestions for the actual input - void FillSuggestions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions ); + void FillSuggestions( const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions ); }; @@ -327,7 +327,7 @@ namespace svx void EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset ); void EditFocusLost( Edit* _pEdit, sal_uInt8 _nEntryOffset ); - bool DeleteEntryFromDictionary( const ::rtl::OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); + bool DeleteEntryFromDictionary( const OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); public: HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index d9758f43c19c..ec170d3f6550 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -71,7 +71,7 @@ private: sal_uInt16 mnError; protected: - sal_Bool RefreshFromDoc( ::rtl::OUString aURL ); + sal_Bool RefreshFromDoc( OUString aURL ); SvTreeListEntry* FindEntry ( String aStrName ); void ClearTree(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 37fe1e2a7d73..db70d5ccd2d1 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -50,7 +50,7 @@ protected: public: com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() { return m_xObj; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); virtual sal_Bool IsCreateNew() const; }; @@ -89,7 +89,7 @@ public: virtual short Execute(); /// get replacement for the iconified embedded object and the mediatype of the replacement - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType ); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); }; class SvInsertPlugInDialog : public InsertObjectDialog_Impl diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 98f393f082fa..3bc0f1eb39b6 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -36,13 +36,13 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog RadioButton* m_pBeforeBtn; RadioButton* m_pAfterBtn; - rtl::OUString aRow; - rtl::OUString aCol; + OUString aRow; + OUString aCol; bool bColumn; public: - SvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); + SvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ); virtual short Execute(void); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 561e500297ac..9795290f8c9c 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -33,7 +33,7 @@ #include #include -typedef ::boost::unordered_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventsHash; +typedef ::boost::unordered_map< OUString, ::std::pair< OUString, OUString >, OUStringHash, ::std::equal_to< OUString > > EventsHash; struct EventDisplayName { @@ -75,8 +75,8 @@ protected: _SvxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet ); void EnableButtons(); - ::com::sun::star::uno::Any GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash ); - ::std::pair< ::rtl::OUString, ::rtl::OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny ); + ::com::sun::star::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); + ::std::pair< OUString, OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny ); public: diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index a8b0dc22b906..63393d1531ff 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -71,10 +71,10 @@ struct SvxNumSettings_Impl { short nNumberType; short nParentNumbering; - rtl::OUString sPrefix; - rtl::OUString sSuffix; - rtl::OUString sBulletChar; - rtl::OUString sBulletFont; + OUString sPrefix; + OUString sSuffix; + OUString sBulletChar; + OUString sBulletFont; SvxNumSettings_Impl() : nNumberType(0), nParentNumbering(0) diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index cacf1b56c948..d9ff490f55ab 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -46,8 +46,8 @@ #define INPUTMODE_NEWMACRO 2 #define INPUTMODE_RENAME 3 -typedef ::boost::unordered_map < ::rtl::OUString, ::rtl::OUString , - ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > Selection_hash; +typedef ::boost::unordered_map < OUString, OUString , + OUStringHash, ::std::equal_to< OUString > > Selection_hash; class SFEntry; @@ -60,14 +60,14 @@ private: Image m_libImage; Image m_macImage; Image m_docImage; - ::rtl::OUString m_sMyMacros; - ::rtl::OUString m_sProdMacros; + OUString m_sMyMacros; + OUString m_sProdMacros; ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > - getLangNodeFromRootNode( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& root, ::rtl::OUString& language ); + getLangNodeFromRootNode( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& root, OUString& language ); void delUserData( SvTreeListEntry* pEntry ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, OUString& docName ); protected: void ExpandTree( SvTreeListEntry* pRootEntry ); @@ -75,7 +75,7 @@ protected: virtual void ExpandedHdl(); virtual long ExpandingHdl(); public: - void Init( const ::rtl::OUString& language ); + void Init( const OUString& language ); void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); SFTreeListBox(Window* pParent); @@ -89,7 +89,7 @@ public: SvTreeListEntry * pParent, bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, - ::rtl::OUString factoryURL ); + OUString factoryURL ); SvTreeListEntry * insertEntry(String const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent, bool bChildrenOnDemand, @@ -148,7 +148,7 @@ protected: PushButton* m_pRenameButton; PushButton* m_pDelButton; - ::rtl::OUString m_sLanguage; + OUString m_sLanguage; static Selection_hash m_lastSelection; const String m_delErrStr; const String m_delErrTitleStr; @@ -164,7 +164,7 @@ protected: DECL_LINK( MacroSelectHdl, SvTreeListBox * ); DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); DECL_LINK( ButtonHdl, Button * ); - sal_Bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName ); + sal_Bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, OUString& propName ); void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); @@ -181,7 +181,7 @@ protected: public: // prob need another arg in the ctor // to specify the language or provider - SvxScriptOrgDialog( Window* pParent, ::rtl::OUString language ); + SvxScriptOrgDialog( Window* pParent, OUString language ); ~SvxScriptOrgDialog(); virtual short Execute(); @@ -192,9 +192,9 @@ class SvxScriptErrorDialog : public VclAbstractDialog { private: - ::rtl::OUString m_sMessage; + OUString m_sMessage; - DECL_LINK( ShowDialog, ::rtl::OUString* ); + DECL_LINK( ShowDialog, OUString* ); public: diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index ce1f607add8c..4c14e9930a1f 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -44,8 +44,8 @@ struct SvxGroupInfo_Impl sal_uInt16 nOrd; ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > xBrowseNode; - ::rtl::OUString sURL; - ::rtl::OUString sHelpText; + OUString sURL; + OUString sHelpText; sal_Bool bWasOpened; SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr ) @@ -68,7 +68,7 @@ struct SvxGroupInfo_Impl { } - SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const ::rtl::OUString& _rURL, const ::rtl::OUString& _rHelpText ) + SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const OUString& _rURL, const OUString& _rHelpText ) :nKind( n ) ,nOrd( nr ) ,xBrowseNode() @@ -86,7 +86,7 @@ class ImageProvider public: virtual ~ImageProvider() {} - virtual Image GetImage( const rtl::OUString& rCommandURL ) = 0; + virtual Image GetImage( const OUString& rCommandURL ) = 0; }; class SvxConfigFunctionListBox : public SvTreeListBox @@ -136,8 +136,8 @@ class SvxConfigGroupListBox : public SvTreeListBox Image m_libImage; Image m_macImage; Image m_docImage; - ::rtl::OUString m_sMyMacros; - ::rtl::OUString m_sProdMacros; + OUString m_sMyMacros; + OUString m_sProdMacros; Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, @@ -146,7 +146,7 @@ class SvxConfigGroupListBox : public SvTreeListBox ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, - ::rtl::OUString& docName + OUString& docName ); private: diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 5ab74b046251..1b1a58688433 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -154,7 +154,7 @@ public: DECL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox * ); uno::Sequence< uno::Reference< linguistic2::XMeaning > > - queryMeanings_Impl( ::rtl::OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException); + queryMeanings_Impl( OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException); bool UpdateAlternativesBox_Impl(); void LookUp( const String &rText ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 320769407f82..396834566c87 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -33,9 +33,9 @@ CreateTabPage GetSSOCreator( void ); struct OrderedEntry { sal_Int32 m_nIndex; - rtl::OUString m_sId; + OUString m_sId; - OrderedEntry( sal_Int32 nIndex, const rtl::OUString& rId ) : + OrderedEntry( sal_Int32 nIndex, const OUString& rId ) : m_nIndex( nIndex ), m_sId( rId ) {} }; @@ -45,29 +45,29 @@ typedef std::vector< OrderedEntry* > VectorOfOrderedEntries; struct Module { - rtl::OUString m_sName; + OUString m_sName; bool m_bActive; VectorOfOrderedEntries m_aNodeList; - Module( const rtl::OUString& rName ) : m_sName( rName ), m_bActive( false ) {} + Module( const OUString& rName ) : m_sName( rName ), m_bActive( false ) {} }; // struct OptionsLeaf ---------------------------------------------------- struct OptionsLeaf { - rtl::OUString m_sId; - rtl::OUString m_sLabel; - rtl::OUString m_sPageURL; - rtl::OUString m_sEventHdl; - rtl::OUString m_sGroupId; + OUString m_sId; + OUString m_sLabel; + OUString m_sPageURL; + OUString m_sEventHdl; + OUString m_sGroupId; sal_Int32 m_nGroupIndex; - OptionsLeaf( const rtl::OUString& rId, - const rtl::OUString& rLabel, - const rtl::OUString& rPageURL, - const rtl::OUString& rEventHdl, - const rtl::OUString& rGroupId, + OptionsLeaf( const OUString& rId, + const OUString& rLabel, + const OUString& rPageURL, + const OUString& rEventHdl, + const OUString& rGroupId, sal_Int32 nGroupIndex ) : m_sId( rId ), m_sLabel( rLabel ), @@ -84,20 +84,20 @@ typedef ::std::vector< VectorOfLeaves > VectorOfGroupedLeaves; struct OptionsNode { - rtl::OUString m_sId; - rtl::OUString m_sLabel; - rtl::OUString m_sPageURL; + OUString m_sId; + OUString m_sLabel; + OUString m_sPageURL; bool m_bAllModules; - rtl::OUString m_sGroupId; + OUString m_sGroupId; sal_Int32 m_nGroupIndex; VectorOfLeaves m_aLeaves; VectorOfGroupedLeaves m_aGroupedLeaves; - OptionsNode( const rtl::OUString& rId, - const rtl::OUString& rLabel, - const rtl::OUString& rPageURL, + OptionsNode( const OUString& rId, + const OUString& rLabel, + const OUString& rPageURL, bool bAllModules, - const rtl::OUString& rGroupId, + const OUString& rGroupId, sal_Int32 nGroupIndex ) : m_sId( rId ), m_sLabel( rLabel ), @@ -120,8 +120,8 @@ typedef ::std::vector< OptionsNode* > VectorOfNodes; struct LastPageSaver { sal_uInt16 m_nLastPageId; - rtl::OUString m_sLastPageURL_Tools; - rtl::OUString m_sLastPageURL_ExtMgr; + OUString m_sLastPageURL_Tools; + OUString m_sLastPageURL_ExtMgr; LastPageSaver() : m_nLastPageId( USHRT_MAX ) {} }; @@ -179,11 +179,11 @@ private: void Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame ); void ResizeTreeLB( void ); // resizes dialog so that treelistbox has no horizontal scroll bar - void LoadExtensionOptions( const rtl::OUString& rExtensionId ); - rtl::OUString GetModuleIdentifier( const com::sun::star::uno::Reference< + void LoadExtensionOptions( const OUString& rExtensionId ); + OUString GetModuleIdentifier( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame ); - Module* LoadModule( const rtl::OUString& rModuleIdentifier ); - VectorOfNodes LoadNodes( Module* pModule, const rtl::OUString& rExtensionId ); + Module* LoadModule( const OUString& rModuleIdentifier ); + VectorOfNodes LoadNodes( Module* pModule, const OUString& rExtensionId ); void InsertNodes( const VectorOfNodes& rNodeList ); virtual void queue_layout(); @@ -204,7 +204,7 @@ public: OfaTreeOptionsDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame, bool bActivateLastSelection = true ); - OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId ); + OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ); ~OfaTreeOptionsDialog(); OptionsPageInfo* AddTabPage( sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup ); @@ -262,10 +262,10 @@ namespace com { namespace sun { namespace star { namespace awt { class XContaine class ExtensionsTabPage : public TabPage { private: - rtl::OUString m_sPageURL; + OUString m_sPageURL; com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xPage; - rtl::OUString m_sEventHdl; + OUString m_sEventHdl; com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowEventHandler > m_xEventHdl; com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowProvider > @@ -273,12 +273,12 @@ private: bool m_bIsWindowHidden; void CreateDialogWithHandler(); - sal_Bool DispatchAction( const rtl::OUString& rAction ); + sal_Bool DispatchAction( const OUString& rAction ); public: ExtensionsTabPage( Window* pParent, WinBits nStyle, - const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl, + const OUString& rPageURL, const OUString& rEvtHdl, const com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowProvider >& rProvider ); diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 37719bc0f95d..3d3cfda365c3 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -66,10 +66,10 @@ CertPathDialog::CertPathDialog( Window* pParent ) : m_aCertPathList.SvxSimpleTable::SetTabs( aStaticTabs ); - rtl::OUString sProfile(CUI_RESSTR(STR_PROFILE)); - rtl::OUString sDirectory(CUI_RESSTR(STR_DIRECTORY)); + OUString sProfile(CUI_RESSTR(STR_PROFILE)); + OUString sDirectory(CUI_RESSTR(STR_DIRECTORY)); - rtl::OUStringBuffer sHeader; + OUStringBuffer sHeader; sHeader.append('\t').append(sProfile).append('\t').append(sDirectory); m_aCertPathList.InsertHeaderEntry( sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT ); m_aCertPathList.SetCheckButtonHdl( LINK( this, CertPathDialog, CheckHdl_Impl ) ); @@ -98,15 +98,15 @@ CertPathDialog::CertPathDialog( Window* pParent ) : for (sal_Int32 i = 0; i < nProduct; ++i) { - ::rtl::OUString profile = xMozillaBootstrap->getDefaultProfile(productTypes[i]); + OUString profile = xMozillaBootstrap->getDefaultProfile(productTypes[i]); if (!profile.isEmpty()) { - ::rtl::OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile ); - rtl::OUStringBuffer sEntry; + OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile ); + OUStringBuffer sEntry; sEntry.append('\t').appendAscii(productNames[i]).append(':').append(profile).append('\t').append(sProfilePath); SvTreeListEntry *pEntry = m_aCertPathList.InsertEntry(sEntry.makeStringAndClear()); - rtl::OUString* pCertPath = new rtl::OUString(sProfilePath); + OUString* pCertPath = new OUString(sProfilePath); pEntry->SetUserData(pCertPath); } } @@ -124,8 +124,8 @@ CertPathDialog::CertPathDialog( Window* pParent ) : try { - rtl::OUString sUserSetCertPath = - officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(rtl::OUString()); + OUString sUserSetCertPath = + officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString()); if (!sUserSetCertPath.isEmpty()) AddCertPath(m_sManual, sUserSetCertPath); @@ -137,12 +137,12 @@ CertPathDialog::CertPathDialog( Window* pParent ) : const char* pEnv = getenv("MOZILLA_CERTIFICATE_FOLDER"); if (pEnv) - AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", rtl::OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding())); + AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding())); } IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl) { - fprintf(stderr, "dir is %s\n", rtl::OUStringToOString(getDirectory(), RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "dir is %s\n", OUStringToOString(getDirectory(), RTL_TEXTENCODING_UTF8).getStr()); try { @@ -162,11 +162,11 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl) return 0; } -rtl::OUString CertPathDialog::getDirectory() const +OUString CertPathDialog::getDirectory() const { SvTreeListEntry* pEntry = m_aCertPathList.FirstSelected(); void* pCertPath = pEntry ? pEntry->GetUserData() : NULL; - return pCertPath ? *static_cast(pCertPath) : rtl::OUString(); + return pCertPath ? *static_cast(pCertPath) : OUString(); } CertPathDialog::~CertPathDialog() @@ -174,7 +174,7 @@ CertPathDialog::~CertPathDialog() SvTreeListEntry* pEntry = m_aCertPathList.First(); while (pEntry) { - rtl::OUString* pCertPath = static_cast(pEntry->GetUserData()); + OUString* pCertPath = static_cast(pEntry->GetUserData()); delete pCertPath; pEntry = m_aCertPathList.Next( pEntry ); } @@ -209,12 +209,12 @@ void CertPathDialog::HandleCheckEntry( SvTreeListEntry* _pEntry ) m_aCertPathList.SetCheckButtonState(_pEntry, SV_BUTTON_CHECKED); } -void CertPathDialog::AddCertPath(const rtl::OUString &rProfile, const rtl::OUString &rPath) +void CertPathDialog::AddCertPath(const OUString &rProfile, const OUString &rPath) { SvTreeListEntry* pEntry = m_aCertPathList.First(); while (pEntry) { - rtl::OUString* pCertPath = static_cast(pEntry->GetUserData()); + OUString* pCertPath = static_cast(pEntry->GetUserData()); //already exists, just select the original one if (pCertPath->equals(rPath)) { @@ -225,10 +225,10 @@ void CertPathDialog::AddCertPath(const rtl::OUString &rProfile, const rtl::OUStr pEntry = m_aCertPathList.Next(pEntry); } - rtl::OUStringBuffer sEntry; + OUStringBuffer sEntry; sEntry.append('\t').append(rProfile).append('\t').append(rPath); pEntry = m_aCertPathList.InsertEntry(sEntry.makeStringAndClear()); - rtl::OUString* pCertPath = new rtl::OUString(rPath); + OUString* pCertPath = new OUString(rPath); pEntry->SetUserData(pCertPath); m_aCertPathList.SetCheckButtonState(pEntry, SV_BUTTON_CHECKED); HandleCheckEntry(pEntry); @@ -240,7 +240,7 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl) { uno::Reference xFolderPicker = ui::dialogs::FolderPicker::create(comphelper::getProcessComponentContext()); - rtl::OUString sURL; + OUString sURL; osl::Security().getHomeDir(sURL); xFolderPicker->setDisplayDirectory(sURL); xFolderPicker->setDescription(m_sAddDialogText); @@ -248,7 +248,7 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl) if (xFolderPicker->execute() == ui::dialogs::ExecutableDialogResults::OK) { sURL = xFolderPicker->getDirectory(); - rtl::OUString aPath; + OUString aPath; if (osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(sURL, aPath)) AddCertPath(m_sManual, aPath); } diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 65d9a77e1fdb..e8585e528785 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -48,20 +48,20 @@ private: OKButton m_aOKBtn; CancelButton m_aCancelBtn; HelpButton m_aHelpBtn; - rtl::OUString m_sAddDialogText; - rtl::OUString m_sManual; + OUString m_sAddDialogText; + OUString m_sManual; DECL_LINK(CheckHdl_Impl, SvxSimpleTable *); DECL_LINK(AddHdl_Impl, void *); DECL_LINK(OKHdl_Impl, void *); void HandleCheckEntry(SvTreeListEntry* _pEntry); - void AddCertPath(const rtl::OUString &rProfile, const rtl::OUString &rPath); + void AddCertPath(const OUString &rProfile, const OUString &rPath); public: CertPathDialog(Window* pParent); ~CertPathDialog(); - rtl::OUString getDirectory() const; + OUString getDirectory() const; }; #endif diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index a9dcd4aad45e..faac1b594979 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -173,11 +173,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const // ==================== SvxChartOptions::SvxChartOptions() : - ::utl::ConfigItem( rtl::OUString("Office.Chart") ), + ::utl::ConfigItem( OUString("Office.Chart") ), mbIsInitialized( sal_False ) { maPropertyNames.realloc( 1 ); - maPropertyNames[ 0 ] = ::rtl::OUString("DefaultColor/Series"); + maPropertyNames[ 0 ] = OUString("DefaultColor/Series"); } SvxChartOptions::~SvxChartOptions() @@ -201,7 +201,7 @@ sal_Bool SvxChartOptions::RetrieveOptions() { // get sequence containing all properties - uno::Sequence< ::rtl::OUString > aNames = GetPropertyNames(); + uno::Sequence< OUString > aNames = GetPropertyNames(); uno::Sequence< uno::Any > aProperties( aNames.getLength()); aProperties = GetProperties( aNames ); @@ -244,7 +244,7 @@ sal_Bool SvxChartOptions::RetrieveOptions() void SvxChartOptions::Commit() { - uno::Sequence< ::rtl::OUString > aNames = GetPropertyNames(); + uno::Sequence< OUString > aNames = GetPropertyNames(); uno::Sequence< uno::Any > aValues( aNames.getLength()); if( aValues.getLength() >= 1 ) @@ -265,7 +265,7 @@ void SvxChartOptions::Commit() PutProperties( aNames, aValues ); } -void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< OUString >& ) { } diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 1319702a5d46..a8eeed37bd50 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -69,10 +69,10 @@ private: SvxChartColorTable maDefColors; sal_Bool mbIsInitialized; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > maPropertyNames; - inline ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const + inline ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const { return maPropertyNames; } sal_Bool RetrieveOptions(); @@ -84,7 +84,7 @@ public: void SetDefaultColors( const SvxChartColorTable& aCol ); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); }; // ==================== diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index cb93a9724147..25d34e63161d 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -193,7 +193,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) DatabaseRegistration* pRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() ); if ( pRegistration && !pRegistration->sLocation.isEmpty() ) { - ::rtl::OUString sName( pPathBox->GetEntryText( pEntry, 0 ) ); + OUString sName( pPathBox->GetEntryText( pEntry, 0 ) ); OFileNotation aTransformer( pRegistration->sLocation ); aRegistrations[ sName ] = DatabaseRegistration( aTransformer.get( OFileNotation::N_URL ), pRegistration->bReadOnly ); } @@ -389,7 +389,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl) return 0; } // ----------------------------------------------------------------------------- -void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,const ::rtl::OUString& _sLocation, const bool _bReadOnly ) +void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool _bReadOnly ) { String aStr( _sName ); aStr += '\t'; diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index e3a41a85a2fd..77092ace236e 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -56,12 +56,12 @@ namespace svx Reference< XDatabaseContext > xRegistrations( DatabaseContext::create(xContext) ); - Sequence< ::rtl::OUString > aRegistrationNames( xRegistrations->getRegistrationNames() ); - const ::rtl::OUString* pRegistrationName = aRegistrationNames.getConstArray(); - const ::rtl::OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength(); + Sequence< OUString > aRegistrationNames( xRegistrations->getRegistrationNames() ); + const OUString* pRegistrationName = aRegistrationNames.getConstArray(); + const OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength(); for ( ; pRegistrationName != pRegistrationNamesEnd; ++pRegistrationName ) { - ::rtl::OUString sLocation( xRegistrations->getDatabaseLocation( *pRegistrationName ) ); + OUString sLocation( xRegistrations->getDatabaseLocation( *pRegistrationName ) ); aSettings[ *pRegistrationName ] = DatabaseRegistration( sLocation, xRegistrations->isDatabaseRegistrationReadOnly( *pRegistrationName ) ); } @@ -94,8 +94,8 @@ namespace svx ++reg ) { - const ::rtl::OUString sName = reg->first; - const ::rtl::OUString sLocation = reg->second.sLocation; + const OUString sName = reg->first; + const OUString sLocation = reg->second.sLocation; if ( xRegistrations->hasRegisteredDatabase( sName ) ) { @@ -112,9 +112,9 @@ namespace svx } // delete unused entries - Sequence< ::rtl::OUString > aRegistrationNames = xRegistrations->getRegistrationNames(); - const ::rtl::OUString* pRegistrationName = aRegistrationNames.getConstArray(); - const ::rtl::OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength(); + Sequence< OUString > aRegistrationNames = xRegistrations->getRegistrationNames(); + const OUString* pRegistrationName = aRegistrationNames.getConstArray(); + const OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength(); for ( ; pRegistrationName != pRegistrationNamesEnd; ++pRegistrationName ) { if ( rNewRegistrations.find( *pRegistrationName ) == rNewRegistrations.end() ) diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 22411085f19f..692d75f5e378 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -30,7 +30,7 @@ namespace svx struct DatabaseRegistration { - ::rtl::OUString sLocation; + OUString sLocation; bool bReadOnly; DatabaseRegistration() @@ -39,7 +39,7 @@ namespace svx { } - DatabaseRegistration( const ::rtl::OUString& _rLocation, const sal_Bool _bReadOnly ) + DatabaseRegistration( const OUString& _rLocation, const sal_Bool _bReadOnly ) :sLocation( _rLocation ) ,bReadOnly( _bReadOnly ) { @@ -58,7 +58,7 @@ namespace svx } }; - typedef ::std::map< ::rtl::OUString, DatabaseRegistration, ::comphelper::UStringLess > DatabaseRegistrations; + typedef ::std::map< OUString, DatabaseRegistration, ::comphelper::UStringLess > DatabaseRegistrations; //==================================================================== //= DatabaseMapItem diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index d38b872ab27d..8302799b480a 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -62,7 +62,7 @@ namespace svx FreeResource(); - rtl::OUString sTemp("*.odb"); + OUString sTemp("*.odb"); m_aURL.SetFilter(sTemp); m_aName.SetModifyHdl( LINK(this, ODocumentLinkDialog, OnTextModified) ); @@ -103,7 +103,7 @@ namespace svx IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk) { // get the current URL - ::rtl::OUString sURL = m_aURL.GetText(); + OUString sURL = m_aURL.GetText(); OFileNotation aTransformer(sURL); sURL = aTransformer.get(OFileNotation::N_URL); @@ -162,7 +162,7 @@ namespace svx { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); - const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); if ( pFilter ) { aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 0702c99cfe43..ef193e379065 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -182,11 +182,11 @@ sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& ) NonProportionalFontsOnly::set( m_pNonPropFontsOnlyCB->IsChecked(), batch); //font name changes cannot be detected by saved values - rtl::OUString sFontName; + OUString sFontName; if(m_pFontNameLB->GetSelectEntryPos()) sFontName = m_pFontNameLB->GetSelectEntry(); officecfg::Office::Common::Font::SourceViewFont::FontName::set( - boost::optional< rtl::OUString >(sFontName), batch); + boost::optional< OUString >(sFontName), batch); batch->commit(); return sal_False; @@ -224,9 +224,9 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet& ) officecfg::Office::Common::Font::SourceViewFont:: NonProportionalFontsOnly::get()); NonPropFontsHdl(m_pNonPropFontsOnlyCB); - rtl::OUString sFontName( + OUString sFontName( officecfg::Office::Common::Font::SourceViewFont::FontName::get(). - get_value_or(rtl::OUString())); + get_value_or(OUString())); if(!sFontName.isEmpty()) m_pFontNameLB->SelectEntry(sFontName); else diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 66984ca99375..d035daf373f2 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -42,7 +42,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::i18n; using namespace com::sun::star::frame; using namespace com::sun::star::beans; -using rtl::OUString; const sal_Char cIsKernAsianPunctuation[] = "IsKernAsianPunctuation"; const sal_Char cCharacterCompressionType[] = "CharacterCompressionType"; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index b0b284068fbe..e359353ece84 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -190,7 +190,7 @@ private: FixedText *m_pText; public: Chapter(FixedText *pText, bool bShow); - Chapter(Window *pGrid, unsigned nYPos, const rtl::OUString& sDisplayName); + Chapter(Window *pGrid, unsigned nYPos, const OUString& sDisplayName); ~Chapter(); public: void SetBackground(const Wallpaper& W) { m_pText->SetBackground(W); } @@ -569,7 +569,7 @@ void ColorConfigWindow_Impl::CreateEntries() size_t nLineNum = vChapters.size() + vEntries.size() + 1; for (unsigned j = 0; j != nExtGroupCount; ++j) { - rtl::OUString const sComponentName = aExtConfig.GetComponentName(j); + OUString const sComponentName = aExtConfig.GetComponentName(j); vChapters.push_back(boost::shared_ptr(new Chapter( m_pGrid, nLineNum, aExtConfig.GetComponentDisplayName(sComponentName) @@ -698,7 +698,7 @@ void ColorConfigWindow_Impl::Update ( unsigned const nExtCount = pExtConfig->GetComponentCount(); for (unsigned j = 0; j != nExtCount; ++j) { - rtl::OUString sComponentName = pExtConfig->GetComponentName(j); + OUString sComponentName = pExtConfig->GetComponentName(j); unsigned const nColorCount = pExtConfig->GetComponentColorCount(sComponentName); for (unsigned k = 0; i != vEntries.size() && k != nColorCount; ++i, ++k) vEntries[i]->Update( @@ -757,7 +757,7 @@ void ColorConfigWindow_Impl::ColorHdl ( unsigned const nExtCount = pExtConfig->GetComponentCount(); for (unsigned j = 0; j != nExtCount; ++j) { - rtl::OUString sComponentName = pExtConfig->GetComponentName(j); + OUString sComponentName = pExtConfig->GetComponentName(j); unsigned const nColorCount = pExtConfig->GetComponentColorCount(sComponentName); unsigned const nCount = vEntries.size(); for (unsigned k = 0; i != nCount && k != nColorCount; ++i, ++k) @@ -1056,7 +1056,7 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage() //changes need to be undone if(!bFillItemSetCalled && m_pColorSchemeLB->GetSavedValue() != m_pColorSchemeLB->GetSelectEntryPos()) { - rtl::OUString sOldScheme = m_pColorSchemeLB->GetEntry(m_pColorSchemeLB->GetSavedValue()); + OUString sOldScheme = m_pColorSchemeLB->GetEntry(m_pColorSchemeLB->GetSavedValue()); if(!sOldScheme.isEmpty()) { pColorConfig->SetCurrentSchemeName(sOldScheme); @@ -1115,8 +1115,8 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) //has to be called always to speed up accessibility tools m_pColorConfigCT->SetScrollPosition(sUser.ToInt32()); m_pColorSchemeLB->Clear(); - uno::Sequence< ::rtl::OUString > aSchemes = pColorConfig->GetSchemeNames(); - const rtl::OUString* pSchemes = aSchemes.getConstArray(); + uno::Sequence< OUString > aSchemes = pColorConfig->GetSchemeNames(); + const OUString* pSchemes = aSchemes.getConstArray(); for(sal_Int32 i = 0; i < aSchemes.getLength(); i++) m_pColorSchemeLB->InsertEntry(pSchemes[i]); m_pColorSchemeLB->SelectEntry(pColorConfig->GetCurrentSchemeName()); @@ -1179,7 +1179,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) aQuery.SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE))); if(RET_YES == aQuery.Execute()) { - rtl::OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry()); + OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry()); m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectEntryPos()); m_pColorSchemeLB->SelectEntryPos(0); m_pColorSchemeLB->GetSelectHdl().Call(m_pColorSchemeLB); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 86b180f0e887..218b67aec1be 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -54,9 +54,9 @@ static long nStaticTabs[]= // static function ------------------------------------------------------- -static String getNormDicEntry_Impl(const rtl::OUString &rText) +static String getNormDicEntry_Impl(const OUString &rText) { - rtl::OUString aTmp(comphelper::string::stripEnd(rText, '.')); + OUString aTmp(comphelper::string::stripEnd(rText, '.')); return comphelper::string::remove(aTmp, '='); } @@ -606,7 +606,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) //! ...IsVisible should reflect whether the dictionary is a negativ //! or not (hopefully...) sal_Bool bIsNegEntry = aReplaceFT.IsVisible(); - ::rtl::OUString aRplcText; + OUString aRplcText; if(bIsNegEntry) aRplcText = aReplaceStr; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index d495a243231d..e1ab16c88171 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -97,8 +97,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; using namespace ::utl; -using ::rtl::OString; -using ::rtl::OUString; // class OfaMiscTabPage -------------------------------------------------- @@ -362,7 +360,7 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd ) IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd ) { sal_Int64 nNum = m_pYearValueField->GetValue(); - rtl::OUString aOutput(rtl::OUString::number(nNum)); + OUString aOutput(OUString::number(nNum)); m_pYearValueField->SetText(aOutput); m_pYearValueField->SetSelection( Selection( 0, aOutput.getLength() ) ); TwoFigureHdl( pEd ); @@ -623,7 +621,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) // add real theme name to 'auto' theme, e.g. 'auto' => 'auto (classic)' if( m_pIconStyleLB->GetEntryCount() > 1 ) { - ::rtl::OUString aAutoStr( m_pIconStyleLB->GetEntry( 0 ) ); + OUString aAutoStr( m_pIconStyleLB->GetEntry( 0 ) ); aAutoStr += " ("; @@ -636,7 +634,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId[nAutoStyle] ); m_pIconStyleLB->RemoveEntry( 0 ); - m_pIconStyleLB->InsertEntry( aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 ); + m_pIconStyleLB->InsertEntry( aAutoStr += OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 ); // separate auto and other icon themes m_pIconStyleLB->SetSeparatorPos( 0 ); } diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index cc4e667f7e0b..e1a2436f3fcb 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -174,7 +174,7 @@ class OfaLanguagesTabPage : public SfxTabPage sal_Bool m_bOldCtl; LanguageConfig_Impl* pLangConfig; - rtl::OUString m_sUserLocaleValue; + OUString m_sUserLocaleValue; DECL_LINK( SupportHdl, CheckBox* ) ; DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 934f0c841b20..a3f25e0f7986 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -371,11 +371,11 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit ) // updating the initial if (nField < nInits && rShortName.pEdit->IsEnabled()) { - rtl::OUString sShortName = rShortName.pEdit->GetText(); + OUString sShortName = rShortName.pEdit->GetText(); while ((unsigned)sShortName.getLength() < nInits) - sShortName += rtl::OUString(' '); - rtl::OUString sName = pEdit->GetText(); - rtl::OUString sLetter = rtl::OUString(sName.getLength() ? sName.toChar() : ' '); + sShortName += OUString(' '); + OUString sName = pEdit->GetText(); + OUString sLetter = OUString(sName.getLength() ? sName.toChar() : ' '); rShortName.pEdit->SetText(sShortName.replaceAt(nField, 1, sLetter).trim()); } return 0; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index c8bd32a87c2a..668d35490d83 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -93,7 +93,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::sfx2; -using ::rtl::OUString; // static ---------------------------------------------------------------- diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 42b120686dd4..1325c796883a 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -90,14 +90,14 @@ private: String sFromBrowser; - const rtl::OUString aProxyModePN; - const rtl::OUString aHttpProxyPN; - const rtl::OUString aHttpPortPN; - const rtl::OUString aHttpsProxyPN; - const rtl::OUString aHttpsPortPN; - const rtl::OUString aFtpProxyPN; - const rtl::OUString aFtpPortPN; - const rtl::OUString aNoProxyDescPN; + const OUString aProxyModePN; + const OUString aHttpProxyPN; + const OUString aHttpPortPN; + const OUString aHttpsProxyPN; + const OUString aHttpsPortPN; + const OUString aFtpProxyPN; + const OUString aFtpPortPN; + const OUString aNoProxyDescPN; uno::Reference< uno::XInterface > m_xConfigurationUpdateAccess; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 23e37a9fd86c..8f7adca0dd97 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::uno; // ----------------------------------------------------------------------- -bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< ::rtl::OUString >& rListB ) +bool areListsEqual( const Sequence< OUString >& rListA, const Sequence< OUString >& rListB ) { bool bRet = true; const sal_Int32 nLen = rListA.getLength(); @@ -67,8 +67,8 @@ bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< : bRet = false; else { - const ::rtl::OUString* pStringA = rListA.getConstArray(); - const ::rtl::OUString* pStringB = rListB.getConstArray(); + const OUString* pStringA = rListA.getConstArray(); + const OUString* pStringB = rListB.getConstArray(); for ( sal_Int32 i = 0; i < nLen; ++i ) { @@ -268,7 +268,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl) IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) { - Sequence< ::rtl::OUString > aParameterList; + Sequence< OUString > aParameterList; if ( !m_pParamDlg ) { m_pParamDlg = new SvxJavaParameterDlg( this ); @@ -277,11 +277,11 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) { rtl_uString** pParamArr = m_parParameters; aParameterList.realloc( m_nParamSize ); - ::rtl::OUString* pParams = aParameterList.getArray(); + OUString* pParams = aParameterList.getArray(); for ( sal_Int32 i = 0; i < m_nParamSize; ++i ) { rtl_uString* pParam = *pParamArr++; - pParams[i] = ::rtl::OUString( pParam ); + pParams[i] = OUString( pParam ); } m_pParamDlg->SetParameters( aParameterList ); } @@ -324,7 +324,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl) javaFrameworkError eErr = jfw_getUserClassPath( &m_pClassPath ); if ( JFW_E_NONE == eErr && m_pClassPath ) { - sClassPath = String( ::rtl::OUString( m_pClassPath ) ); + sClassPath = String( OUString( m_pClassPath ) ); m_pPathDlg->SetClassPath( sClassPath ); } } @@ -478,7 +478,7 @@ void SvxJavaOptionsPage::LoadJREs() void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) { - rtl::OUStringBuffer sEntry; + OUStringBuffer sEntry; sEntry.append('\t'); sEntry.append(_pInfo->sVendor); sEntry.append('\t'); @@ -487,7 +487,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) if ( ( _pInfo->nFeatures & JFW_FEATURE_ACCESSBRIDGE ) == JFW_FEATURE_ACCESSBRIDGE ) sEntry.append(m_sAccessibilityText); SvTreeListEntry* pEntry = m_pJavaList->InsertEntry(sEntry.makeStringAndClear()); - INetURLObject aLocObj( ::rtl::OUString( _pInfo->sLocation ) ); + INetURLObject aLocObj( OUString( _pInfo->sLocation ) ); String* pLocation = new String( aLocObj.getFSysPath( INetURLObject::FSYS_DETECT ) ); pEntry->SetUserData( pLocation ); } @@ -516,7 +516,7 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) // ----------------------------------------------------------------------- -void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder ) +void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) { bool bStartAgain = true; JavaInfo* pInfo = NULL; @@ -600,11 +600,11 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) javaFrameworkError eErr = JFW_E_NONE; if ( m_pParamDlg ) { - Sequence< ::rtl::OUString > aParamList = m_pParamDlg->GetParameters(); + Sequence< OUString > aParamList = m_pParamDlg->GetParameters(); sal_Int32 i, nSize = aParamList.getLength(); rtl_uString** pParamArr = (rtl_uString**)rtl_allocateMemory( sizeof(rtl_uString*) * nSize ); rtl_uString** pParamArrIter = pParamArr; - const ::rtl::OUString* pList = aParamList.getConstArray(); + const OUString* pList = aParamList.getConstArray(); for ( i = 0; i < nSize; ++i ) pParamArr[i] = pList[i].pData; eErr = jfw_setVMParameters( pParamArrIter, nSize ); @@ -633,7 +633,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) if ( m_pPathDlg ) { - ::rtl::OUString sPath( m_pPathDlg->GetClassPath() ); + OUString sPath( m_pPathDlg->GetClassPath() ); if ( m_pPathDlg->GetOldPath() != String( sPath ) ) { eErr = jfw_setUserClassPath( sPath.pData ); @@ -771,7 +771,7 @@ SvxJavaParameterDlg::~SvxJavaParameterDlg() IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl) { - rtl::OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' '); + OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' '); m_aAssignBtn.Enable(!sParam.isEmpty()); return 0; @@ -781,7 +781,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl) IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl) { - rtl::OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' '); + OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' '); if (!sParam.isEmpty()) { sal_uInt16 nPos = m_aAssignedList.GetEntryPos( sParam ); @@ -846,23 +846,23 @@ short SvxJavaParameterDlg::Execute() // ----------------------------------------------------------------------- -Sequence< ::rtl::OUString > SvxJavaParameterDlg::GetParameters() const +Sequence< OUString > SvxJavaParameterDlg::GetParameters() const { sal_uInt16 nCount = m_aAssignedList.GetEntryCount(); - Sequence< ::rtl::OUString > aParamList( nCount ); - ::rtl::OUString* pArray = aParamList.getArray(); + Sequence< OUString > aParamList( nCount ); + OUString* pArray = aParamList.getArray(); for ( sal_uInt16 i = 0; i < nCount; ++i ) - pArray[i] = ::rtl::OUString( m_aAssignedList.GetEntry(i) ); + pArray[i] = OUString( m_aAssignedList.GetEntry(i) ); return aParamList; } // ----------------------------------------------------------------------- -void SvxJavaParameterDlg::SetParameters( Sequence< ::rtl::OUString >& rParams ) +void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams ) { m_aAssignedList.Clear(); sal_uLong i, nCount = rParams.getLength(); - const ::rtl::OUString* pArray = rParams.getConstArray(); + const OUString* pArray = rParams.getConstArray(); for ( i = 0; i < nCount; ++i ) { String sParam = String( *pArray++ ); @@ -937,7 +937,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl) { sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 ); aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); - aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") ); + aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), OUString("*.jar;*.zip") ); String sFolder; if ( m_aPathList.GetSelectEntryCount() > 0 ) { diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index cdd96b7fdb3c..07fa6be1bfeb 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -89,7 +89,7 @@ private: void LoadJREs(); void AddJRE( JavaInfo* _pInfo ); void HandleCheckEntry( SvTreeListEntry* _pEntry ); - void AddFolder( const ::rtl::OUString& _rFolder ); + void AddFolder( const OUString& _rFolder ); public: SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ); @@ -139,8 +139,8 @@ public: virtual short Execute(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetParameters() const; - void SetParameters( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rParams ); + ::com::sun::star::uno::Sequence< OUString > GetParameters() const; + void SetParameters( ::com::sun::star::uno::Sequence< OUString >& rParams ); }; // class SvxJavaClassPathDlg --------------------------------------------- diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 2ca777b5b3d7..93f3c666e9f1 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -817,7 +817,7 @@ void SvxPathTabPage::SetPathList( pImpl->m_xPathSettings->setPropertyValue( sProp, aValue ); // then the writable path - aValue = makeAny( ::rtl::OUString( _rWritablePath ) ); + aValue = makeAny( OUString( _rWritablePath ) ); sProp = sCfgName; sProp += POSTFIX_WRITABLE; pImpl->m_xPathSettings->setPropertyValue( sProp, aValue ); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index a221e4d176df..9318ba24dd2e 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -458,8 +458,8 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) { (void) e; OSL_FAIL( - rtl::OUStringToOString( - (rtl::OUString( + OUStringToOString( + (OUString( "exception in FilterFactory access: ") + e.Message), RTL_TEXTENCODING_UTF8). diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 375a8d383d95..7cae029e184b 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -91,9 +91,9 @@ SvxOnlineUpdateTabPage::~SvxOnlineUpdateTabPage() // ----------------------------------------------------------------------- void SvxOnlineUpdateTabPage::UpdateLastCheckedText() { - rtl::OUString aDateStr; - rtl::OUString aTimeStr; - rtl::OUString aText; + OUString aDateStr; + OUString aTimeStr; + OUString aText; sal_Int64 lastChecked = 0; m_xUpdateAccess->getByName("LastCheck") >>= lastChecked; @@ -204,7 +204,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) bModified = sal_True; } - rtl::OUString sValue, aURL; + OUString sValue, aURL; m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue; if( ( osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) ) && @@ -254,7 +254,7 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) m_pDestPath->Enable(sal_True); m_pChangePathButton->Enable(sal_True); - rtl::OUString sValue, aPath; + OUString sValue, aPath; m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue; if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(sValue, aPath) ) @@ -289,7 +289,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl) uno::Reference < uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < ui::dialogs::XFolderPicker2 > xFolderPicker = ui::dialogs::FolderPicker::create(xContext); - rtl::OUString aURL; + OUString aURL; if( osl::FileBase::E_None != osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) ) osl::Security().getHomeDir(aURL); @@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl) if ( ui::dialogs::ExecutableDialogResults::OK == nRet ) { - rtl::OUString aFolder; + OUString aFolder; if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(xFolderPicker->getDirectory(), aFolder)) m_pDestPath->SetText( aFolder ); } @@ -341,7 +341,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) uno::Reference< frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(), uno::UNO_QUERY ); - uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0); + uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0); if( xDispatch.is() ) { @@ -352,7 +352,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) catch( const uno::Exception& e ) { OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); } return 0; diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 3323f08bc6fb..bdfb8f7a8e74 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -39,8 +39,8 @@ private: FixedText* m_pDestPath; PushButton* m_pChangePathButton; FixedText* m_pLastChecked; - rtl::OUString m_aNeverChecked; - rtl::OUString m_aLastCheckedTemplate; + OUString m_aNeverChecked; + OUString m_aLastCheckedTemplate; DECL_LINK(FileDialogHdl_Impl, void *) ; DECL_LINK(CheckNowHdl_Impl, void *) ; diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index e210df625df0..939985e6bb1c 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -40,12 +40,12 @@ namespace offapp class ODriverEnumerationImpl { protected: - ::std::vector< ::rtl::OUString > m_aImplNames; + ::std::vector< OUString > m_aImplNames; public: ODriverEnumerationImpl(); - const ::std::vector< ::rtl::OUString >& getDriverImplNames() const { return m_aImplNames; } + const ::std::vector< OUString >& getDriverImplNames() const { return m_aImplNames; } }; //-------------------------------------------------------------------- diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx index e0f61dddccf5..b329a858b780 100644 --- a/cui/source/options/sdbcdriverenum.hxx +++ b/cui/source/options/sdbcdriverenum.hxx @@ -22,14 +22,10 @@ #include +#include #include -namespace rtl -{ - class OUString; -} - //........................................................................ namespace offapp { @@ -52,7 +48,7 @@ namespace offapp public: ODriverEnumeration() throw(); ~ODriverEnumeration() throw(); - typedef ::std::vector< ::rtl::OUString >::const_iterator const_iterator; + typedef ::std::vector< OUString >::const_iterator const_iterator; const_iterator begin() const throw(); const_iterator end() const throw(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index b7bc0b868476..8f5c20f3d5d4 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -114,19 +114,19 @@ LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = NULL; // some stuff for easier changes for SvtViewOptions static const sal_Char* pViewOptDataName = "page data"; -#define VIEWOPT_DATANAME rtl::OUString::createFromAscii( pViewOptDataName ) +#define VIEWOPT_DATANAME OUString::createFromAscii( pViewOptDataName ) static XOutdevItemPool* mpStaticXOutdevItemPool = 0L; static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const String& rData ) { - rOpt.SetUserItem( VIEWOPT_DATANAME, makeAny( rtl::OUString( rData ) ) ); + rOpt.SetUserItem( VIEWOPT_DATANAME, makeAny( OUString( rData ) ) ); } static inline String GetViewOptUserItem( const SvtViewOptions& rOpt ) { Any aAny( rOpt.GetUserItem( VIEWOPT_DATANAME ) ); - rtl::OUString aUserData; + OUString aUserData; aAny >>= aUserData; return String( aUserData ); @@ -159,13 +159,13 @@ static ModuleToGroupNameMap_Impl ModuleMap[] = { NULL, String::EmptyString(), 0xFFFF } }; -static void setGroupName( const rtl::OUString& rModule, const String& rGroupName ) +static void setGroupName( const OUString& rModule, const String& rGroupName ) { sal_uInt16 nIndex = 0; while ( ModuleMap[ nIndex ].m_pModule ) { - rtl::OUString sTemp = - rtl::OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); + OUString sTemp = + OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); if ( sTemp == rModule ) { ModuleMap[ nIndex ].m_sGroupName = rGroupName; @@ -175,14 +175,14 @@ static void setGroupName( const rtl::OUString& rModule, const String& rGroupName } } -static String getGroupName( const rtl::OUString& rModule, bool bForced ) +static String getGroupName( const OUString& rModule, bool bForced ) { String sGroupName; sal_uInt16 nIndex = 0; while ( ModuleMap[ nIndex ].m_pModule ) { - rtl::OUString sTemp = - rtl::OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); + OUString sTemp = + OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); if ( sTemp == rModule ) { sGroupName = ModuleMap[ nIndex ].m_sGroupName; @@ -221,13 +221,13 @@ static void deleteGroupNames() ModuleMap[ nIndex++ ].m_sGroupName = String::EmptyString(); } -static sal_uInt16 getGroupNodeId( const rtl::OUString& rModule ) +static sal_uInt16 getGroupNodeId( const OUString& rModule ) { sal_uInt16 nNodeId = 0xFFFF, nIndex = 0; while ( ModuleMap[ nIndex ].m_pModule ) { - rtl::OUString sTemp = - rtl::OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); + OUString sTemp = + OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule ); if ( sTemp == rModule ) { nNodeId = ModuleMap[ nIndex ].m_nNodeId; @@ -250,7 +250,7 @@ public: virtual ~MailMergeCfg_Impl(); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); sal_Bool IsEmailSupported() const {return bIsEmailSupported;} @@ -260,7 +260,7 @@ MailMergeCfg_Impl::MailMergeCfg_Impl() : utl::ConfigItem("Office.Writer/MailMergeWizard"), bIsEmailSupported(sal_False) { - Sequence aNames(1); + Sequence aNames(1); aNames.getArray()[0] = "EMailSupported"; const Sequence< Any > aValues = GetProperties(aNames); const Any* pValues = aValues.getConstArray(); @@ -276,7 +276,7 @@ void MailMergeCfg_Impl::Commit() { } -void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& ) { } @@ -455,8 +455,8 @@ struct OptionsPageInfo { SfxTabPage* m_pPage; sal_uInt16 m_nPageId; - rtl::OUString m_sPageURL; - rtl::OUString m_sEventHdl; + OUString m_sPageURL; + OUString m_sEventHdl; ExtensionsTabPage* m_pExtPage; OptionsPageInfo( sal_uInt16 nId ) : m_pPage( NULL ), m_nPageId( nId ), m_pExtPage( NULL ) {} @@ -470,13 +470,13 @@ struct OptionsGroupInfo SfxModule* m_pModule; // used to create the ItemSet sal_uInt16 m_nDialogId; // Id of the former dialog sal_Bool m_bLoadError; // load fails? - rtl::OUString m_sPageURL; + OUString m_sPageURL; ExtensionsTabPage* m_pExtPage; OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) : m_pInItemSet( NULL ), m_pOutItemSet( NULL ), m_pShell( pSh ), m_pModule( pMod ), m_nDialogId( nId ), m_bLoadError( sal_False ), - m_sPageURL( rtl::OUString() ), m_pExtPage( NULL ) {} + m_sPageURL( OUString() ), m_pExtPage( NULL ) {} ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; } }; @@ -512,7 +512,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( InitTreeAndHandler(); Initialize( _xFrame ); - LoadExtensionOptions( rtl::OUString() ); + LoadExtensionOptions( OUString() ); ResizeTreeLB(); if (bActivateLastSelection) ActivateLastSelection(); @@ -522,7 +522,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( // Ctor() with ExtensionId ----------------------------------------------- -OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId ) : +OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ) : SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ), INI_LIST() @@ -846,7 +846,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() && sExpand.Match( sPageURL ) == STRING_MATCH ) { // cut protocol - ::rtl::OUString sTemp( sPageURL.Copy( sizeof( EXPAND_PROTOCOL ) -1 ) ); + OUString sTemp( sPageURL.Copy( sizeof( EXPAND_PROTOCOL ) -1 ) ); // decode uri class chars sTemp = ::rtl::Uri::decode( sTemp, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); @@ -1146,7 +1146,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() } { - ::rtl::OUStringBuffer sTitleBuf(sTitle); + OUStringBuffer sTitleBuf(sTitle); sTitleBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - ")); sTitleBuf.append(aTreeLB.GetEntryText(pParent)); sTitleBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - ")); @@ -1265,9 +1265,9 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) nMinTrail = 2; if (xProp.is()) { - xProp->getPropertyValue( rtl::OUString( + xProp->getPropertyValue( OUString( UPN_HYPH_MIN_LEADING) ) >>= nMinLead; - xProp->getPropertyValue( rtl::OUString( + xProp->getPropertyValue( OUString( UPN_HYPH_MIN_TRAILING) ) >>= nMinTrail; } aHyphen.GetMinLead() = (sal_uInt8)nMinLead; @@ -1298,7 +1298,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) sal_Bool bVal = sal_False; if (xProp.is()) { - xProp->getPropertyValue( rtl::OUString( UPN_IS_SPELL_AUTO) ) >>= bVal; + xProp->getPropertyValue( OUString( UPN_IS_SPELL_AUTO) ) >>= bVal; } pRet->Put(SfxBoolItem(SID_AUTOSPELL_CHECK, bVal)); @@ -1438,7 +1438,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) } Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); Reference< XPropertySet > xProp( - xMgr->createInstance( ::rtl::OUString( "com.sun.star.linguistic2.LinguProperties" ) ), + xMgr->createInstance( OUString( "com.sun.star.linguistic2.LinguProperties" ) ), UNO_QUERY ); if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, sal_False, &pItem ) ) { @@ -1447,10 +1447,10 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) if (xProp.is()) { xProp->setPropertyValue( - rtl::OUString(UPN_HYPH_MIN_LEADING), + OUString(UPN_HYPH_MIN_LEADING), makeAny((sal_Int16) pHyphenItem->GetMinLead()) ); xProp->setPropertyValue( - rtl::OUString(UPN_HYPH_MIN_TRAILING), + OUString(UPN_HYPH_MIN_TRAILING), makeAny((sal_Int16) pHyphenItem->GetMinTrail()) ); } bSaveSpellCheck = sal_True; @@ -1486,7 +1486,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) if (xProp.is()) { xProp->setPropertyValue( - rtl::OUString(UPN_IS_SPELL_AUTO), + OUString(UPN_IS_SPELL_AUTO), makeAny(bOnlineSpelling) ); } } @@ -1510,9 +1510,9 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) } } -rtl::OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame ) +OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame ) { - rtl::OUString sIdentifier; + OUString sIdentifier; Reference < XFrame > xCurrentFrame( _xFrame ); Reference < XModuleManager2 > xModuleManager = ModuleManager::create(::comphelper::getProcessComponentContext()); if ( !xCurrentFrame.is() ) @@ -1566,7 +1566,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Disable Online Update page if service not installed if( RID_SVXPAGE_ONLINEUPDATE == nPageId ) { - const ::rtl::OUString sService = "com.sun.star.setup.UpdateCheck"; + const OUString sService = "com.sun.star.setup.UpdateCheck"; try { @@ -1619,8 +1619,8 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) } - rtl::OUString aFactory = getCurrentFactory_Impl( _xFrame ); - rtl::OUString sTemp = GetModuleIdentifier( _xFrame ); + OUString aFactory = getCurrentFactory_Impl( _xFrame ); + OUString sTemp = GetModuleIdentifier( _xFrame ); DBG_ASSERT( sTemp == aFactory, "S H I T!!!" ); // Writer and Writer/Web options @@ -1652,7 +1652,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) AddTabPage( nPageId, rTextArray.GetString(i), nGroup ); } #ifdef DBG_UTIL - AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Internal Test"), nGroup ); + AddTabPage( RID_SW_TP_OPTTEST_PAGE, OUString("Internal Test"), nGroup ); #endif } @@ -1668,7 +1668,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup ); } #ifdef DBG_UTIL - AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Internal Test"), nGroup ); + AddTabPage( RID_SW_TP_OPTTEST_PAGE, OUString("Internal Test"), nGroup ); #endif } } @@ -1941,7 +1941,7 @@ bool isNodeActive( OptionsNode* pNode, Module* pModule ) return false; } -void OfaTreeOptionsDialog::LoadExtensionOptions( const rtl::OUString& rExtensionId ) +void OfaTreeOptionsDialog::LoadExtensionOptions( const OUString& rExtensionId ) { Module* pModule = NULL; @@ -1957,9 +1957,9 @@ void OfaTreeOptionsDialog::LoadExtensionOptions( const rtl::OUString& rExtension delete pModule; } -rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& rFrame ) +OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& rFrame ) { - rtl::OUString sModule; + OUString sModule; Reference < XFrame > xCurrentFrame( rFrame ); Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); Reference < XModuleManager2 > xModuleManager = ModuleManager::create(xContext); @@ -1989,16 +1989,16 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame } Module* OfaTreeOptionsDialog::LoadModule( - const rtl::OUString& rModuleIdentifier ) + const OUString& rModuleIdentifier ) { Module* pModule = NULL; Reference< XNameAccess > xSet( officecfg::Office::OptionsDialog::Modules::get()); - Sequence< rtl::OUString > seqNames = xSet->getElementNames(); + Sequence< OUString > seqNames = xSet->getElementNames(); for ( int i = 0; i < seqNames.getLength(); ++i ) { - rtl::OUString sModule( seqNames[i] ); + OUString sModule( seqNames[i] ); if ( rModuleIdentifier == sModule ) { // current active module found @@ -2014,7 +2014,7 @@ Module* OfaTreeOptionsDialog::LoadModule( xModAccess->getByName( "Nodes" ) >>= xNodeAccess; if ( xNodeAccess.is() ) { - Sequence< rtl::OUString > xTemp = xNodeAccess->getElementNames(); + Sequence< OUString > xTemp = xNodeAccess->getElementNames(); Reference< XNameAccess > xAccess; sal_Int32 nIndex = -1; for ( int x = 0; x < xTemp.getLength(); ++x ) @@ -2052,14 +2052,14 @@ Module* OfaTreeOptionsDialog::LoadModule( } VectorOfNodes OfaTreeOptionsDialog::LoadNodes( - Module* pModule, const rtl::OUString& rExtensionId) + Module* pModule, const OUString& rExtensionId) { VectorOfNodes aOutNodeList; Reference< XNameAccess > xSet( officecfg::Office::OptionsDialog::Nodes::get()); VectorOfNodes aNodeList; - Sequence< rtl::OUString > seqNames = xSet->getElementNames(); + Sequence< OUString > seqNames = xSet->getElementNames(); for ( int i = 0; i < seqNames.getLength(); ++i ) { @@ -2069,7 +2069,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( if ( xNodeAccess.is() ) { - rtl::OUString sNodeId, sLabel, sPageURL, sGroupId; + OUString sNodeId, sLabel, sPageURL, sGroupId; bool bAllModules = false; sal_Int32 nGroupIndex = 0; @@ -2098,7 +2098,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( xNodeAccess->getByName( "Leaves" ) >>= xLeavesSet; if ( xLeavesSet.is() ) { - Sequence< rtl::OUString > seqLeaves = xLeavesSet->getElementNames(); + Sequence< OUString > seqLeaves = xLeavesSet->getElementNames(); for ( int j = 0; j < seqLeaves.getLength(); ++j ) { Reference< XNameAccess > xLeaveAccess; @@ -2106,7 +2106,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( if ( xLeaveAccess.is() ) { - rtl::OUString sId, sLeafLabel, sEventHdl, sLeafURL, sLeafGrpId; + OUString sId, sLeafLabel, sEventHdl, sLeafURL, sLeafGrpId; sal_Int32 nLeafGrpIdx = 0; xLeaveAccess->getByName( "Id" ) >>= sId; @@ -2174,7 +2174,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( sal_uInt32 i = 0, j = 0; for ( ; i < pModule->m_aNodeList.size(); ++i ) { - rtl::OUString sNodeId = pModule->m_aNodeList[i]->m_sId; + OUString sNodeId = pModule->m_aNodeList[i]->m_sId; for ( j = 0; j < aNodeList.size(); ++j ) { OptionsNode* pNode = aNodeList[j]; @@ -2193,7 +2193,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( return aOutNodeList; } -static sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeListBox& rTreeLB ) +static sal_uInt16 lcl_getGroupId( const OUString& rGroupName, const SvTreeListBox& rTreeLB ) { String sGroupName( rGroupName ); sal_uInt16 nRet = 0; @@ -2290,8 +2290,8 @@ short OfaTreeOptionsDialog::Execute() // class ExtensionsTabPage ----------------------------------------------- ExtensionsTabPage::ExtensionsTabPage( - Window* pParent, WinBits nStyle, const rtl::OUString& rPageURL, - const rtl::OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) : + Window* pParent, WinBits nStyle, const OUString& rPageURL, + const OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) : TabPage( pParent, nStyle ), @@ -2331,7 +2331,7 @@ void ExtensionsTabPage::CreateDialogWithHandler() Reference< awt::XWindowPeer > xParent( VCLUnoHelper::GetInterface( this ), UNO_QUERY ); m_xPage = Reference < awt::XWindow >( m_xWinProvider->createContainerWindow( - m_sPageURL, rtl::OUString(), xParent, m_xEventHdl ), UNO_QUERY ); + m_sPageURL, OUString(), xParent, m_xEventHdl ), UNO_QUERY ); Reference< awt::XControl > xPageControl( m_xPage, UNO_QUERY ); if ( xPageControl.is() ) @@ -2358,7 +2358,7 @@ void ExtensionsTabPage::CreateDialogWithHandler() // ----------------------------------------------------------------------- -sal_Bool ExtensionsTabPage::DispatchAction( const rtl::OUString& rAction ) +sal_Bool ExtensionsTabPage::DispatchAction( const OUString& rAction ) { sal_Bool bRet = sal_False; if ( m_xEventHdl.is() ) diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 49a0354bdf86..56ca925ccbfa 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -188,9 +188,9 @@ void WebConnectionInfoDialog::FillPasswordList() for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ ) { - ::rtl::OUString aUIEntry( aUrls[ nURLIdx ] ); - aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); - aUIEntry += ::rtl::OUString( "*" ); + OUString aUIEntry( aUrls[ nURLIdx ] ); + aUIEntry += OUString::valueOf( (sal_Unicode)'\t' ); + aUIEntry += OUString( "*" ); SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry ); pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } @@ -208,8 +208,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl) SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry(); if ( pEntry ) { - ::rtl::OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 ); - ::rtl::OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 ); + OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 ); + OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 ); uno::Reference< task::XPasswordContainer2 > xPasswdContainer( task::PasswordContainer::create(comphelper::getProcessComponentContext())); @@ -264,8 +264,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry(); if ( pEntry ) { - ::rtl::OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 ); - ::rtl::OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 ); + OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 ); + OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 ); ::comphelper::SimplePasswordRequest* pPasswordRequest = new ::comphelper::SimplePasswordRequest( task::PasswordRequestMode_PASSWORD_CREATE ); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 930073fad779..8f134be3192c 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -714,7 +714,7 @@ void SvxBackgroundTabPage::FillUserData() */ { - SetUserData( m_pBtnPreview->IsChecked() ? rtl::OUString('1') : rtl::OUString('0') ); + SetUserData( m_pBtnPreview->IsChecked() ? OUString('1') : OUString('0') ); } //------------------------------------------------------------------------ diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index b7f0e7f701b4..02817b602f44 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -175,7 +175,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() // ----------------------------------------------------------------------- -SvxCharBasePage::SvxCharBasePage(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet& rItemset) +SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, rItemset ) , m_pPreviewWin(NULL) , m_bPreviewBackgroundToCharacter( sal_False ) @@ -3370,7 +3370,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) if ( !bFound ) { - nEntryPos = pBox->InsertEntry( rtl::OUString(cBracket) ); + nEntryPos = pBox->InsertEntry( OUString(cBracket) ); pBox->SelectEntryPos( nEntryPos ); } } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 5fc05943e37c..6c127c4541e7 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -341,13 +341,13 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) if( sScriptURI.CompareToAscii( "vnd.sun.star.script:", 20 ) == COMPARE_EQUAL ) { pThis->aTbl.Insert( - nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_SF ) ) ); + nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_SF ) ) ); } else { OSL_ENSURE( false, "_SfxMacroTabPage::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" ); pThis->aTbl.Insert( - nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) ); + nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) ); } } @@ -420,7 +420,7 @@ void _SfxMacroTabPage::FillMacroList() ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >(), GetFrame(), - ::rtl::OUString() ); + OUString() ); } void _SfxMacroTabPage::FillEvents() diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index f208845d5e46..1a35b045a30a 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -144,7 +144,7 @@ void SvxNumberPreview::Paint( const Rectangle& ) if ( mnPos != STRING_NOTFOUND ) { - long nCharWidth = GetTextWidth( rtl::OUString::valueOf( mnChar ) ); + long nCharWidth = GetTextWidth( OUString::valueOf( mnChar ) ); int nNumCharsToInsert = 0; if (nCharWidth > 0) nNumCharsToInsert = nLeadSpace / nCharWidth; @@ -518,7 +518,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) // is this a calc document Reference< XServiceInfo > xSI( pDocSh->GetModel(), UNO_QUERY ); if ( xSI.is() ) - bUseStarFormat = xSI->supportsService( rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); + bUseStarFormat = xSI->supportsService( OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); } pNumFmtShell->SetUseStarFormat( bUseStarFormat ); @@ -1687,12 +1687,12 @@ void SvxNumberFormatTabPage::SetOkHdl( const Link& rOkHandler ) void SvxNumberFormatTabPage::FillCurrencyBox() { - std::vector aList; + std::vector aList; sal_uInt16 nSelPos=0; pNumFmtShell->GetCurrencySymbols(aList, &nSelPos); - for(std::vector::iterator i = aList.begin() + 1;i != aList.end(); ++i) + for(std::vector::iterator i = aList.begin() + 1;i != aList.end(); ++i) m_pLbCurrency->InsertEntry(*i); m_pLbCurrency->SelectEntryPos(nSelPos); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index dc5431959274..93ef1298b686 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -454,7 +454,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl() pTypeBtn = &aDezTab; aDezChar.Enable(); aDezCharLabel.Enable(); - aDezChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); + aDezChar.SetText( OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); } else if ( aAktTab.GetAdjustment() == SVX_TAB_ADJUST_CENTER ) pTypeBtn = &aCenterTab; @@ -477,7 +477,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl() { pFillBtn = &aFillSpecial; aFillChar.Enable(); - aFillChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetFill() ) ); + aFillChar.SetText( OUString( (sal_Unicode)aAktTab.GetFill() ) ); } pFillBtn->Check(); } @@ -619,7 +619,7 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox ) eAdj = SVX_TAB_ADJUST_DECIMAL; aDezChar.Enable(); aDezCharLabel.Enable(); - aDezChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); + aDezChar.SetText( OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); } aAktTab.GetAdjustment() = eAdj; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index c6716c1798e6..56939ddb7a28 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -2253,7 +2253,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) if( aTsbStepCount.GetState() == STATE_NOCHECK ) { if( aNumFldStepCount.GetText().isEmpty() ) - aNumFldStepCount.SetText(rtl::OUString("64")); + aNumFldStepCount.SetText(OUString("64")); aNumFldStepCount.Enable(); } diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx index 8164dea855ec..60c3591b3d1c 100644 --- a/cui/source/uno/services.cxx +++ b/cui/source/uno/services.cxx @@ -34,13 +34,12 @@ #include "cppuhelper/factory.hxx" #include -using rtl::OUString; using namespace com::sun::star; namespace cui { -extern rtl::OUString SAL_CALL ColorPicker_getImplementationName(); +extern OUString SAL_CALL ColorPicker_getImplementationName(); extern uno::Reference< uno::XInterface > SAL_CALL ColorPicker_createInstance( uno::Reference< uno::XComponentContext > const & ) SAL_THROW( (uno::Exception) ); -extern uno::Sequence< rtl::OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( uno::RuntimeException ); +extern uno::Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( uno::RuntimeException ); } namespace diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx index 9aa7963a899e..d699ef4c6c43 100644 --- a/dbaccess/inc/IController.hxx +++ b/dbaccess/inc/IController.hxx @@ -82,7 +82,7 @@ namespace dbaui @return if the command is allowed, otherwise . */ - virtual sal_Bool isCommandEnabled( const ::rtl::OUString& _rCompleteCommandURL ) const = 0; + virtual sal_Bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const = 0; /** registers a command URL, giving it a unique name @@ -96,7 +96,7 @@ namespace dbaui then 0 is returned. */ virtual sal_uInt16 - registerCommandURL( const ::rtl::OUString& _rCompleteCommandURL ) = 0; + registerCommandURL( const OUString& _rCompleteCommandURL ) = 0; /** notifyHiContrastChanged will be called when the hicontrast mode changed. @param _bHiContrast diff --git a/dbaccess/inc/dbaundomanager.hxx b/dbaccess/inc/dbaundomanager.hxx index cd3bb3a7ff36..a04b57248053 100644 --- a/dbaccess/inc/dbaundomanager.hxx +++ b/dbaccess/inc/dbaundomanager.hxx @@ -56,7 +56,7 @@ namespace dbaui void disposing(); // XUndoManager - virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -64,10 +64,10 @@ namespace dbaui virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/inc/dbsubcomponentcontroller.hxx b/dbaccess/inc/dbsubcomponentcontroller.hxx index b709458d03da..17319cb84325 100644 --- a/dbaccess/inc/dbsubcomponentcontroller.hxx +++ b/dbaccess/inc/dbsubcomponentcontroller.hxx @@ -92,7 +92,7 @@ namespace dbaui // ---------------------------------------------------------------- // access to the data source / document - ::rtl::OUString getDataSourceName() const; + OUString getDataSourceName() const; const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& getDataSource() const; sal_Bool haveDataSource() const; @@ -107,7 +107,7 @@ namespace dbaui /** appends an error in the current environment. */ void appendError( - const ::rtl::OUString& _rErrorMessage, + const OUString& _rErrorMessage, const ::dbtools::StandardSQLState _eSQLState = ::dbtools::SQL_GENERAL_ERROR, const sal_Int32 _nErrorCode = 1000 ); @@ -160,7 +160,7 @@ namespace dbaui virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); protected: DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxORB); diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index e2da361b27de..6a7fd7f4bc2c 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -124,7 +124,7 @@ namespace dbaui optional< bool > bChecked; optional< bool > bInvisible; ::com::sun::star::uno::Any aValue; - optional< ::rtl::OUString > sTitle; + optional< OUString > sTitle; FeatureState() : bEnabled(sal_False) { } }; @@ -140,9 +140,9 @@ namespace dbaui }; // .................................................................... - typedef ::std::map < ::rtl::OUString + typedef ::std::map < OUString , ControllerFeature - , ::std::less< ::rtl::OUString > + , ::std::less< OUString > > SupportedFeatures; // .................................................................... @@ -268,13 +268,13 @@ namespace dbaui @param _nHelpId The help id to dispatch. */ - void openHelpAgent( const rtl::OString& _sHelpId ); + void openHelpAgent( const OString& _sHelpId ); /** open the help agent for the given help url. @param _pHelpStringURL The help url to dispatch. */ - void openHelpAgent( const rtl::OUString& _suHelpStringURL ); + void openHelpAgent( const OUString& _suHelpStringURL ); /** opens the given Help URL in the help agent @@ -342,7 +342,7 @@ namespace dbaui @see IController::registerCommandURL */ - bool isUserDefinedFeature( const ::rtl::OUString& _rFeatureURL ) const; + bool isUserDefinedFeature( const OUString& _rFeatureURL ) const; // connect to a datasource ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > connect( @@ -352,8 +352,8 @@ namespace dbaui // connect to a datasource ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > connect( - const ::rtl::OUString& _rsDataSourceName, - const ::rtl::OUString& _rContextInformation, + const OUString& _rsDataSourceName, + const OUString& _rContextInformation, ::dbtools::SQLExceptionInfo* _pErrorInfo ); @@ -369,7 +369,7 @@ namespace dbaui // XInitialize will be called inside initialize virtual void impl_initialize(); - virtual ::rtl::OUString getPrivateTitle() const { return ::rtl::OUString(); } + virtual OUString getPrivateTitle() const { return OUString(); } ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper_throw(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const @@ -393,7 +393,7 @@ namespace dbaui void ImplInvalidateFeature( sal_Int32 _nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _xListener, sal_Bool _bForceBroadcast ); sal_Bool ImplInvalidateTBItem(sal_uInt16 nId, const FeatureState& rState); - void ImplBroadcastFeatureState(const ::rtl::OUString& _rFeature, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener, sal_Bool _bIgnoreCache); + void ImplBroadcastFeatureState(const OUString& _rFeature, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener, sal_Bool _bIgnoreCache); // link methods DECL_LINK(OnAsyncInvalidateAll, void*); @@ -409,7 +409,7 @@ namespace dbaui // if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state - virtual void InvalidateFeature(const ::rtl::OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False); + virtual void InvalidateFeature(const OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False); // if there is an ::com::sun::star::util::URL translation for the id ('handle') the preceding InvalidateFeature is used. // if there is a toolbar slot with the given id it is updated (the new state is determined via GetState) // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state @@ -435,8 +435,8 @@ namespace dbaui virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const; - virtual sal_Bool isCommandEnabled(const ::rtl::OUString& _rCompleteCommandURL) const; - virtual sal_uInt16 registerCommandURL( const ::rtl::OUString& _rCompleteCommandURL ); + virtual sal_Bool isCommandEnabled(const OUString& _rCompleteCommandURL) const; + virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ); virtual void notifyHiContrastChanged(); virtual sal_Bool isDataSourceReadOnly() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > getXController() throw( ::com::sun::star::uno::RuntimeException ); @@ -457,7 +457,7 @@ namespace dbaui // ::com::sun::star::frame::XController2 virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getComponentWindow() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getViewControllerName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getViewControllerName() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCreationArguments() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XController @@ -481,7 +481,7 @@ namespace dbaui virtual void SAL_CALL setMasterDispatchProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & _xNewProvider) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches(const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent @@ -496,17 +496,17 @@ namespace dbaui virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) = 0; // XDispatchInformationProvider virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 ) throw (::com::sun::star::uno::RuntimeException); // XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); // XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx index 2d0151c88177..7b8498768485 100644 --- a/dbaccess/qa/extras/macros-test.cxx +++ b/dbaccess/qa/extras/macros-test.cxx @@ -52,7 +52,7 @@ class DBAccessTest : public test::BootstrapFixture, public unotest::MacrosTest public: DBAccessTest(); - void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath); + void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); virtual void setUp(); virtual void tearDown(); @@ -66,14 +66,14 @@ public: CPPUNIT_TEST_SUITE_END(); private: - rtl::OUString m_aBaseString; + OUString m_aBaseString; }; -void DBAccessTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) +void DBAccessTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { - rtl::OUString aSep("/"); - rtl::OUStringBuffer aBuffer( getSrcRootURL() ); + OUString aSep("/"); + OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); rFilePath = aBuffer.makeStringAndClear(); @@ -86,9 +86,9 @@ DBAccessTest::DBAccessTest() void DBAccessTest::test() { - const rtl::OUString aFileNameBase("testdb."); - const rtl::OUString aFileExtension("odb"); - rtl::OUString aFileName; + const OUString aFileNameBase("testdb."); + const OUString aFileExtension("odb"); + OUString aFileName; createFileURL(aFileNameBase, aFileExtension, aFileName); uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); CPPUNIT_ASSERT(xComponent.is()); diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index f7f79e28e93d..dce28eba521a 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::osl; -void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::construct" ); OCacheSet::construct(_xDriverSet,i_sRowSetFilter); diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx index c61f40b4644c..2fae48bf178b 100644 --- a/dbaccess/source/core/api/BookmarkSet.hxx +++ b/dbaccess/source/core/api/BookmarkSet.hxx @@ -39,7 +39,7 @@ namespace dbaccess m_xRowLocate = NULL; } - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition); // ::com::sun::star::sdbcx::XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx index 0994d91539dc..dc83d81dd42e 100644 --- a/dbaccess/source/core/api/CIndexes.cxx +++ b/dbaccess/source/core/api/CIndexes.cxx @@ -38,7 +38,7 @@ using namespace dbaccess; using namespace cppu; -ObjectType OIndexes::createObject(const ::rtl::OUString& _rName) +ObjectType OIndexes::createObject(const OUString& _rName) { ObjectType xRet; if ( m_xIndexes.is() && m_xIndexes->hasByName(_rName) ) @@ -59,7 +59,7 @@ Reference< XPropertySet > OIndexes::createDescriptor() } // XAppend -ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +ObjectType OIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { Reference xData( m_xIndexes,UNO_QUERY); if ( !xData.is() ) @@ -70,7 +70,7 @@ ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Refer } // XDrop -void OIndexes::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OIndexes::dropObject(sal_Int32 _nPos,const OUString _sElementName) { if ( m_xIndexes.is() ) { diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx index 33986f1804e8..25c58152f511 100644 --- a/dbaccess/source/core/api/CIndexes.hxx +++ b/dbaccess/source/core/api/CIndexes.hxx @@ -28,14 +28,14 @@ namespace dbaccess { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xIndexes; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OIndexes(connectivity::OTableHelper* _pTable, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes ) : connectivity::OIndexesHelper(_pTable,_rMutex,_rVector) ,m_xIndexes(_rxIndexes) diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 2f4ce681ce08..a1fa8c941fd8 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -37,7 +37,7 @@ namespace dbaccess { ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos, - const Reference< XDatabaseMetaData >& _rxDBMeta, const ::rtl::OUString& _rDescription, const ::rtl::OUString& i_sLabel,ORowSetCacheIterator& _rColumnValue ) + const Reference< XDatabaseMetaData >& _rxDBMeta, const OUString& _rDescription, const OUString& i_sLabel,ORowSetCacheIterator& _rColumnValue ) :ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, _rDescription, i_sLabel,_rColumnValue ) { } @@ -46,7 +46,7 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaDa { BEGIN_PROPERTY_SEQUENCE(21) - DECL_PROP1( CATALOGNAME, ::rtl::OUString, READONLY ); + DECL_PROP1( CATALOGNAME, OUString, READONLY ); DECL_PROP1( DISPLAYSIZE, sal_Int32, READONLY ); DECL_PROP1_BOOL( ISAUTOINCREMENT, READONLY ); DECL_PROP1_BOOL( ISCASESENSITIVE, READONLY ); @@ -58,14 +58,14 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaDa DECL_PROP1_BOOL( ISSEARCHABLE, READONLY ); DECL_PROP1_BOOL( ISSIGNED, READONLY ); DECL_PROP1_BOOL( ISWRITABLE, READONLY ); - DECL_PROP1( LABEL, ::rtl::OUString, READONLY ); + DECL_PROP1( LABEL, OUString, READONLY ); DECL_PROP1( PRECISION, sal_Int32, READONLY ); DECL_PROP1( SCALE, sal_Int32, READONLY ); - DECL_PROP1( SCHEMANAME, ::rtl::OUString, READONLY ); - DECL_PROP1( SERVICENAME, ::rtl::OUString, READONLY ); - DECL_PROP1( TABLENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( SCHEMANAME, OUString, READONLY ); + DECL_PROP1( SERVICENAME, OUString, READONLY ); + DECL_PROP1( TABLENAME, OUString, READONLY ); DECL_PROP1( TYPE, sal_Int32, READONLY ); - DECL_PROP1( TYPENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( TYPENAME, OUString, READONLY ); DECL_PROP2( VALUE, Any, READONLY, BOUND ); END_PROPERTY_SEQUENCE() diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx index ddb134b5c684..c51579c86099 100644 --- a/dbaccess/source/core/api/CRowSetColumn.hxx +++ b/dbaccess/source/core/api/CRowSetColumn.hxx @@ -36,8 +36,8 @@ namespace dbaccess const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow, sal_Int32 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta, - const ::rtl::OUString& _rDescription, - const ::rtl::OUString& i_sLabel, + const OUString& _rDescription, + const OUString& i_sLabel, ORowSetCacheIterator& _rColumnValue); virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index d16c211e13b8..f9b00667a98a 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -45,8 +45,8 @@ ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& const Reference < XRowUpdate >& _xRowUpdate, sal_Int32 _nPos, const Reference< XDatabaseMetaData >& _rxDBMeta, - const ::rtl::OUString& _rDescription, - const ::rtl::OUString& i_sLabel, + const OUString& _rDescription, + const OUString& i_sLabel, const ORowSetCacheIterator& _rColumnValue) :ODataColumn(_xMetaData,_xRow,_xRowUpdate,_nPos,_rxDBMeta) ,m_aColumnValue(_rColumnValue) @@ -68,7 +68,7 @@ ORowSetDataColumn::~ORowSetDataColumn() { BEGIN_PROPERTY_SEQUENCE(21) - DECL_PROP1( CATALOGNAME, ::rtl::OUString, READONLY ); + DECL_PROP1( CATALOGNAME, OUString, READONLY ); DECL_PROP1( DISPLAYSIZE, sal_Int32, READONLY ); DECL_PROP1_BOOL( ISAUTOINCREMENT, READONLY ); DECL_PROP1_BOOL( ISCASESENSITIVE, READONLY ); @@ -80,14 +80,14 @@ ORowSetDataColumn::~ORowSetDataColumn() DECL_PROP1_BOOL( ISSEARCHABLE, READONLY ); DECL_PROP1_BOOL( ISSIGNED, READONLY ); DECL_PROP1_BOOL( ISWRITABLE, READONLY ); - DECL_PROP1( LABEL, ::rtl::OUString, READONLY ); + DECL_PROP1( LABEL, OUString, READONLY ); DECL_PROP1( PRECISION, sal_Int32, READONLY ); DECL_PROP1( SCALE, sal_Int32, READONLY ); - DECL_PROP1( SCHEMANAME, ::rtl::OUString, READONLY ); - DECL_PROP1( SERVICENAME, ::rtl::OUString, READONLY ); - DECL_PROP1( TABLENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( SCHEMANAME, OUString, READONLY ); + DECL_PROP1( SERVICENAME, OUString, READONLY ); + DECL_PROP1( TABLENAME, OUString, READONLY ); DECL_PROP1( TYPE, sal_Int32, READONLY ); - DECL_PROP1( TYPENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( TYPENAME, OUString, READONLY ); DECL_PROP1( VALUE, Any, BOUND ); END_PROPERTY_SEQUENCE() @@ -216,7 +216,7 @@ ORowSetDataColumns::ORowSetDataColumns( const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ) : connectivity::sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aColumns(_rColumns) { @@ -228,7 +228,7 @@ ORowSetDataColumns::~ORowSetDataColumns() DBG_DTOR(ORowSetDataColumns ,NULL); } -sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName) { connectivity::sdbcx::ObjectType xNamed; @@ -246,7 +246,7 @@ void SAL_CALL ORowSetDataColumns::disposing(void) m_aColumns = NULL; } -void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector) +void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector) { m_aColumns = _rColumns; reFill(_rVector); diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx index bc75088bd081..bd87766d707e 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.hxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx @@ -40,8 +40,8 @@ namespace dbaccess ORowSetCacheIterator m_aColumnValue; ::com::sun::star::uno::Any m_aOldValue; - ::rtl::OUString m_sLabel; - ::rtl::OUString m_aDescription; // description + OUString m_sLabel; + OUString m_aDescription; // description ORowSetBase* m_pRowSet; virtual ~ORowSetDataColumn(); @@ -51,8 +51,8 @@ namespace dbaccess const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate >& _xRowUpdate, sal_Int32 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta, - const ::rtl::OUString& _rDescription, - const ::rtl::OUString& i_sLabel, + const OUString& _rDescription, + const OUString& i_sLabel, const ORowSetCacheIterator& _rColumnValue); @@ -81,7 +81,7 @@ namespace dbaccess { ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: ORowSetDataColumns( @@ -89,12 +89,12 @@ namespace dbaccess const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ); virtual ~ORowSetDataColumns(); // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); - void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector); + void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector); }; } diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 1efe897dce16..268854781269 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -69,17 +69,17 @@ OCacheSet::OCacheSet(sal_Int32 i_nMaxRows) } -::rtl::OUString OCacheSet::getIdentifierQuoteString() const +OUString OCacheSet::getIdentifierQuoteString() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getIdentifierQuoteString" ); - ::rtl::OUString sQuote; + OUString sQuote; Reference xMeta; if ( m_xConnection.is() && (xMeta = m_xConnection->getMetaData()).is() ) sQuote = xMeta->getIdentifierQuoteString(); return sQuote; } -void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/) +void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const OUString& /*i_sRowSetFilter*/) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::construct" ); OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet"); @@ -162,10 +162,10 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti OUStringBuffer aSql("INSERT INTO " + m_aComposedTableName + " ( "); // set values and column names - ::rtl::OUStringBuffer aValues(" VALUES ( "); - static ::rtl::OUString aPara("?,"); - ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aComma(","); + OUStringBuffer aValues(" VALUES ( "); + static OUString aPara("?,"); + OUString aQuote = getIdentifierQuoteString(); + static OUString aComma(","); sal_Int32 i = 1; ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rInsertRow->get().begin()+1; connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end(); @@ -200,8 +200,8 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti void OCacheSet::fillParameters( const ORowSetRow& _rRow ,const connectivity::OSQLTable& _xTable - ,::rtl::OUStringBuffer& _sCondition - ,::rtl::OUStringBuffer& _sParameter + ,OUStringBuffer& _sCondition + ,OUStringBuffer& _sParameter ,::std::list< sal_Int32>& _rOrgValues) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::fillParameters" ); @@ -232,18 +232,18 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow } } - ::rtl::OUString aColumnName; + OUString aColumnName; - static ::rtl::OUString aPara("?,"); - static ::rtl::OUString aAnd(" AND "); + static OUString aPara("?,"); + static OUString aAnd(" AND "); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + OUString aQuote = getIdentifierQuoteString(); sal_Int32 nCheckCount = 1; // index for the orginal values sal_Int32 i = 1; - ::rtl::OUString sIsNull(" IS NULL"); - ::rtl::OUString sParam(" = ?"); + OUString sIsNull(" IS NULL"); + OUString sParam(" = ?"); ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rRow->get().begin()+1; ORowVector< ORowSetValue >::Vector::const_iterator aEnd = _rRow->get().end()+1; for(; aIter != aEnd;++aIter,++nCheckCount,++i) @@ -292,7 +292,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR OUStringBuffer aSql("UPDATE " + m_aComposedTableName + " SET "); // list all cloumns that should be set - ::rtl::OUStringBuffer aCondition; + OUStringBuffer aCondition; ::std::list< sal_Int32> aOrgValues; fillParameters(_rInsertRow,_xTable,aCondition,aSql,aOrgValues); aSql[aSql.getLength() - 1] = ' '; @@ -362,7 +362,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti } } - ::rtl::OUStringBuffer aColumnName; + OUStringBuffer aColumnName; ::std::list< sal_Int32> aOrgValues; fillParameters(_rDeleteRow,_xTable,aSql,aColumnName,aOrgValues); @@ -416,7 +416,7 @@ sal_Bool SAL_CALL OCacheSet::wasNull( ) throw(SQLException, RuntimeException) return m_xDriverRow->wasNull(); } -::rtl::OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getString" ); return m_xDriverRow->getString(columnIndex); diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 15040e3c1f00..7b3abf6dfec4 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -52,7 +52,7 @@ namespace dbaccess ::com::sun::star::uno::Sequence m_aSignedFlags; ::com::sun::star::uno::Sequence m_aColumnTypes; ORowSetRow m_aInsertRow; - ::rtl::OUString m_aComposedTableName; + OUString m_aComposedTableName; sal_Int32 m_nMaxRows; sal_Bool m_bInserted; sal_Bool m_bUpdated; @@ -69,21 +69,21 @@ namespace dbaccess ) const; void fillParameters( const ORowSetRow& _rRow ,const connectivity::OSQLTable& _xTable - ,::rtl::OUStringBuffer& _sCondition - ,::rtl::OUStringBuffer& _sParameter + ,OUStringBuffer& _sCondition + ,OUStringBuffer& _sParameter ,::std::list< sal_Int32>& _rOrgValues); void fillTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getIdentifierQuoteString() const; + OUString getIdentifierQuoteString() const; public: // late constructor - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 32691e19be7f..629bb8576652 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -46,13 +46,13 @@ namespace dbaccess /** creates a vector of WildCards and reduce the _rTableFilter of the length of WildsCards */ -sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut) +sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OFilteredContainer::createWildCardVector" ); // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard // for them - ::rtl::OUString* pTableFilters = _rTableFilter.getArray(); - ::rtl::OUString* pEnd = pTableFilters + _rTableFilter.getLength(); + OUString* pTableFilters = _rTableFilter.getArray(); + OUString* pEnd = pTableFilters + _rTableFilter.getLength(); sal_Int32 nShiftPos = 0; for (sal_Int32 i=0; pEnd != pTableFilters; ++pTableFilters,++i) { @@ -74,14 +74,14 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std return nShiftPos; } - bool lcl_isElementAllowed( const ::rtl::OUString& _rName, - const Sequence< ::rtl::OUString >& _rTableFilter, + bool lcl_isElementAllowed( const OUString& _rName, + const Sequence< OUString >& _rTableFilter, const ::std::vector< WildCard >& _rWCSearch ) { sal_Int32 nTableFilterLen = _rTableFilter.getLength(); - const ::rtl::OUString* tableFilter = _rTableFilter.getConstArray(); - const ::rtl::OUString* tableFilterEnd = _rTableFilter.getConstArray() + nTableFilterLen; + const OUString* tableFilter = _rTableFilter.getConstArray(); + const OUString* tableFilterEnd = _rTableFilter.getConstArray() + nTableFilterLen; bool bFilterMatch = ::std::find( tableFilter, tableFilterEnd, _rName ) != tableFilterEnd; // the table is allowed to "pass" if we had no filters at all or any of the non-wildcard filters matches if (!bFilterMatch && !_rWCSearch.empty()) @@ -96,7 +96,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std return bFilterMatch; } - typedef ::boost::optional< ::rtl::OUString > OptionalString; + typedef ::boost::optional< OUString > OptionalString; struct TableInfo { OptionalString sComposedName; @@ -105,13 +105,13 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std OptionalString sSchema; OptionalString sName; - TableInfo( const ::rtl::OUString& _composedName ) + TableInfo( const OUString& _composedName ) :sComposedName( _composedName ) { } - TableInfo( const ::rtl::OUString& _catalog, const ::rtl::OUString& _schema, const ::rtl::OUString& _name, - const ::rtl::OUString& _type ) + TableInfo( const OUString& _catalog, const OUString& _schema, const OUString& _name, + const OUString& _type ) :sComposedName() ,sType( _type ) ,sCatalog( _catalog ) @@ -148,7 +148,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std if ( !_masterContainer.is() ) throw RuntimeException(); - ::rtl::OUString sTypeName; + OUString sTypeName; try { Reference< XPropertySet > xTable( _masterContainer->getByName( *_io_tableInfo.sComposedName ), UNO_QUERY_THROW ); @@ -162,7 +162,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } connectivity::TStringVector lcl_filter( const TableInfos& _unfilteredTables, - const Sequence< ::rtl::OUString >& _tableFilter, const Sequence< ::rtl::OUString >& _tableTypeFilter, + const Sequence< OUString >& _tableFilter, const Sequence< OUString >& _tableTypeFilter, const Reference< XDatabaseMetaData >& _metaData, const Reference< XNameAccess >& _masterContainer ) { TableInfos aFilteredTables; @@ -179,7 +179,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard // for them ::std::vector< WildCard > aWildCardTableFilter; - Sequence< ::rtl::OUString > aNonWildCardTableFilter = _tableFilter; + Sequence< OUString > aNonWildCardTableFilter = _tableFilter; nTableFilterCount = createWildCardVector( aNonWildCardTableFilter, aWildCardTableFilter ); TableInfos aUnfilteredTables( _unfilteredTables ); @@ -207,8 +207,8 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std TableInfos aUnfilteredTables; aUnfilteredTables.swap( aFilteredTables ); - const ::rtl::OUString* pTableTypeFilterBegin = _tableTypeFilter.getConstArray(); - const ::rtl::OUString* pTableTypeFilterEnd = pTableTypeFilterBegin + _tableTypeFilter.getLength(); + const OUString* pTableTypeFilterBegin = _tableTypeFilter.getConstArray(); + const OUString* pTableTypeFilterEnd = pTableTypeFilterBegin + _tableTypeFilter.getLength(); for ( TableInfos::iterator table = aUnfilteredTables.begin(); table != aUnfilteredTables.end(); @@ -245,7 +245,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer ,oslInterlockedCount& _nInAppend) - :OCollection(_rParent,_bCase,_rMutex,::std::vector< ::rtl::OUString>()) + :OCollection(_rParent,_bCase,_rMutex,::std::vector< OUString>()) ,m_bConstructed(sal_False) ,m_pWarningsContainer(_pWarningsContainer) ,m_pRefreshListener(_pRefreshListener) @@ -255,8 +255,8 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } void OFilteredContainer::construct(const Reference< XNameAccess >& _rxMasterContainer, - const Sequence< ::rtl::OUString >& _rTableFilter, - const Sequence< ::rtl::OUString >& _rTableTypeFilter) + const Sequence< OUString >& _rTableFilter, + const Sequence< OUString >& _rTableTypeFilter) { try { @@ -277,9 +277,9 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std TableInfos aUnfilteredTables; - Sequence< ::rtl::OUString > aNames = m_xMasterContainer->getElementNames(); - const ::rtl::OUString* name = aNames.getConstArray(); - const ::rtl::OUString* nameEnd = name + aNames.getLength(); + Sequence< OUString > aNames = m_xMasterContainer->getElementNames(); + const OUString* name = aNames.getConstArray(); + const OUString* nameEnd = name + aNames.getLength(); for ( ; name != nameEnd; ++name ) aUnfilteredTables.push_back( TableInfo( *name ) ); @@ -294,10 +294,10 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } } - void OFilteredContainer::construct(const Sequence< ::rtl::OUString >& _rTableFilter, const Sequence< ::rtl::OUString >& _rTableTypeFilter) + void OFilteredContainer::construct(const Sequence< OUString >& _rTableFilter, const Sequence< OUString >& _rTableTypeFilter) { // build sorted versions of the filter sequences, so the visibility decision is faster - Sequence< ::rtl::OUString > aTableFilter(_rTableFilter); + Sequence< OUString > aTableFilter(_rTableFilter); // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard // for them @@ -312,14 +312,14 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // create a table table filter suitable for the XDatabaseMetaData::getTables call, // taking into account both the externally-provided table type filter, and any // table type restriction which is inherent to the container - Sequence< ::rtl::OUString > aTableTypeFilter; - ::rtl::OUString sInherentTableTypeRestriction( getTableTypeRestriction() ); + Sequence< OUString > aTableTypeFilter; + OUString sInherentTableTypeRestriction( getTableTypeRestriction() ); if ( !sInherentTableTypeRestriction.isEmpty() ) { if ( _rTableTypeFilter.getLength() != 0 ) { - const ::rtl::OUString* tableType = _rTableTypeFilter.getConstArray(); - const ::rtl::OUString* tableTypeEnd = tableType + _rTableTypeFilter.getLength(); + const OUString* tableType = _rTableTypeFilter.getConstArray(); + const OUString* tableTypeEnd = tableType + _rTableTypeFilter.getLength(); for ( ; tableType != tableTypeEnd; ++tableType ) { if ( *tableType == sInherentTableTypeRestriction ) @@ -348,13 +348,13 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } } - static const ::rtl::OUString sAll("%"); + static const OUString sAll("%"); Reference< XResultSet > xTables = m_xMetaData->getTables( Any(), sAll, sAll, aTableTypeFilter ); Reference< XRow > xCurrentRow( xTables, UNO_QUERY_THROW ); TableInfos aUnfilteredTables; - ::rtl::OUString sCatalog, sSchema, sName, sType; + OUString sCatalog, sSchema, sName, sType; while ( xTables->next() ) { sCatalog = xCurrentRow->getString(1); @@ -407,7 +407,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } } - ::rtl::OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject) + OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject) { OSL_ENSURE( _xObject.is(), "OFilteredContainer::getNameForObject: Object is NULL!" ); return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false ); @@ -426,7 +426,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // drivers, even the ones which do not understand the standard #define FILTER_MODE_MIX_ALL 3 - void OFilteredContainer::getAllTableTypeFilter( Sequence< ::rtl::OUString >& /* [out] */ _rFilter ) const + void OFilteredContainer::getAllTableTypeFilter( Sequence< OUString >& /* [out] */ _rFilter ) const { sal_Int32 nFilterMode = FILTER_MODE_MIX_ALL; // for compatibility reasons, this is the default: we used this way before we @@ -439,9 +439,9 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std OSL_VERIFY( aFilterModeSetting >>= nFilterMode ); } - const ::rtl::OUString sAll( "%" ); - const ::rtl::OUString sView( "VIEW" ); - const ::rtl::OUString sTable( "TABLE" ); + const OUString sAll( "%" ); + const OUString sView( "VIEW" ); + const OUString sTable( "TABLE" ); switch ( nFilterMode ) { diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index e16d6dcd4af4..54366b41314a 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -41,7 +41,7 @@ namespace dbaccess sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, sal_Bool _bUseAsIndex ) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector,_bUseAsIndex) ,m_aColumns(_rColumns) @@ -51,9 +51,9 @@ namespace dbaccess OPrivateColumns* OPrivateColumns::createWithIntrinsicNames( const ::rtl::Reference< ::connectivity::OSQLColumns >& _rColumns, sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex ) { - ::std::vector< ::rtl::OUString > aNames; aNames.reserve( _rColumns->get().size() ); + ::std::vector< OUString > aNames; aNames.reserve( _rColumns->get().size() ); - ::rtl::OUString sColumName; + OUString sColumName; for ( ::connectivity::OSQLColumns::Vector::const_iterator column = _rColumns->get().begin(); column != _rColumns->get().end(); ++column @@ -75,7 +75,7 @@ namespace dbaccess OPrivateColumns_Base::disposing(); } - connectivity::sdbcx::ObjectType OPrivateColumns::createObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType OPrivateColumns::createObject(const OUString& _rName) { if ( m_aColumns.is() ) { @@ -91,7 +91,7 @@ namespace dbaccess return NULL; } - connectivity::sdbcx::ObjectType OPrivateTables::createObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType OPrivateTables::createObject(const OUString& _rName) { if ( !m_aTables.empty() ) { diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index c48a8b13ec8e..992b6c23c4ce 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -46,7 +46,7 @@ namespace dbaccess { ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} virtual Reference< XPropertySet > createDescriptor() { @@ -57,7 +57,7 @@ namespace dbaccess sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, sal_Bool _bUseAsIndex = sal_False ); @@ -81,7 +81,7 @@ namespace dbaccess { OSQLTables m_aTables; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} virtual Reference< XPropertySet > createDescriptor() { @@ -92,7 +92,7 @@ namespace dbaccess sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aTables(_rTables) { diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 118579014c67..571add7c163d 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -36,9 +36,9 @@ namespace dbaccess { struct SelectColumnDescription { - ::rtl::OUString sRealName; // may be empty - ::rtl::OUString sTableName; // may be empty - ::rtl::OUString sDefaultValue; + OUString sRealName; // may be empty + OUString sTableName; // may be empty + OUString sDefaultValue; sal_Int32 nPosition; sal_Int32 nType; sal_Int32 nScale; @@ -52,7 +52,7 @@ namespace dbaccess { } - SelectColumnDescription( sal_Int32 _nPosition, sal_Int32 _nType, sal_Int32 _nScale,sal_Bool _bNullable, const ::rtl::OUString& _rDefaultValue ) + SelectColumnDescription( sal_Int32 _nPosition, sal_Int32 _nType, sal_Int32 _nScale,sal_Bool _bNullable, const OUString& _rDefaultValue ) :sDefaultValue( _rDefaultValue ) ,nPosition( _nPosition ) ,nType( _nType ) @@ -61,12 +61,12 @@ namespace dbaccess { } }; - typedef ::std::map< ::rtl::OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData; + typedef ::std::map< OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData; // the elements of _rxQueryColumns must have the properties PROPERTY_REALNAME and PROPERTY_TABLENAME void getColumnPositions(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxQueryColumns, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rColumnNames, - const ::rtl::OUString& _rsUpdateTableName, + const ::com::sun::star::uno::Sequence< OUString >& _rColumnNames, + const OUString& _rsUpdateTableName, SelectColumnsMetaData& o_rColumnNames /* out */, bool i_bAppendTableName = false); @@ -80,7 +80,7 @@ namespace dbaccess OKeySetMatrix m_aKeyMap; OKeySetMatrix::iterator m_aKeyIter; - ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones + ::std::vector< OUString > m_aAutoColumns; // contains all columns which are autoincrement ones OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching ORowSetValueVector m_aParameterValueForCache; @@ -105,9 +105,9 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer; - const ::rtl::OUString m_sUpdateTableName; - ::rtl::OUString m_sRowSetFilter; - ::std::vector< ::rtl::OUString > m_aFilterColumns; + const OUString m_sUpdateTableName; + OUString m_sRowSetFilter; + ::std::vector< OUString > m_aFilterColumns; sal_Int32& m_rRowCount; sal_Bool m_bRowCountFinal; @@ -130,7 +130,7 @@ namespace dbaccess void initColumns(); SAL_WNODEPRECATED_DECLARATIONS_PUSH void findTableColumnsMatching_throw( const ::com::sun::star::uno::Any& i_aTable, - const ::rtl::OUString& i_rUpdateTableName, + const OUString& i_rUpdateTableName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& i_xMeta, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns, ::std::auto_ptr& o_pKeyColumnNames); @@ -142,29 +142,29 @@ namespace dbaccess const connectivity::ORowSetValue &_rValue, sal_Int32 _nType, sal_Int32 _nScale ) const; - ::rtl::OUStringBuffer createKeyFilter( ); + OUStringBuffer createKeyFilter( ); bool doTryRefetch_throw() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);; void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch); - void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector& _aIndexColumnPositions = ::std::vector()); - void executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName = ::rtl::OUString(),bool bRefetch = false); - void executeStatement(::rtl::OUStringBuffer& io_aFilter, ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& io_xAnalyzer); + void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const ::std::vector& _aIndexColumnPositions = ::std::vector()); + void executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQL,const OUString& i_sTableName = OUString(),bool bRefetch = false); + void executeStatement(OUStringBuffer& io_aFilter, ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& io_xAnalyzer); virtual ~OKeySet(); public: OKeySet(const connectivity::OSQLTable& _xTable, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xTableKeys, - const ::rtl::OUString& _rUpdateTableName, + const OUString& _rUpdateTableName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer, const ORowSetValueVector& _aParameterValueForCache, sal_Int32 i_nMaxRows, sal_Int32& o_nRowCount); // late ctor which can throw exceptions - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 8ff2da819b01..be34382fad9e 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -66,12 +66,12 @@ using namespace ::com::sun::star; using namespace ::cppu; using namespace ::osl; -DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUStringBuffer,TSQLStatements); +DECLARE_STL_USTRINGACCESS_MAP(OUStringBuffer,TSQLStatements); namespace { - void lcl_fillKeyCondition(const ::rtl::OUString& i_sTableName,const ::rtl::OUString& i_sQuotedColumnName,const ORowSetValue& i_aValue,TSQLStatements& io_aKeyConditions) + void lcl_fillKeyCondition(const OUString& i_sTableName,const OUString& i_sQuotedColumnName,const ORowSetValue& i_aValue,TSQLStatements& io_aKeyConditions) { - ::rtl::OUStringBuffer& rKeyCondition = io_aKeyConditions[i_sTableName]; + OUStringBuffer& rKeyCondition = io_aKeyConditions[i_sTableName]; if ( !rKeyCondition.isEmpty() ) rKeyCondition.append(" AND "); rKeyCondition.append(i_sQuotedColumnName); @@ -90,7 +90,7 @@ OptimisticSet::OptimisticSet(const Reference& _rContext, const ORowSetValueVector& _aParameterValueForCache, sal_Int32 i_nMaxRows, sal_Int32& o_nRowCount) - :OKeySet(NULL,NULL,::rtl::OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount) + :OKeySet(NULL,NULL,OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount) ,m_aSqlParser( _rContext ) ,m_aSqlIterator( i_xConnection, Reference(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser, NULL ) ,m_bResultSetChanged(false) @@ -104,7 +104,7 @@ OptimisticSet::~OptimisticSet() DBG_DTOR(OptimisticSet,NULL); } -void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::construct" ); @@ -119,9 +119,9 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: const Reference xQueryColumns = xQueryColSup->getColumns(); const Reference xTabSup(m_xComposer,UNO_QUERY); const Reference xTables = xTabSup->getTables(); - const Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames(); - const ::rtl::OUString* pTableNameIter = aTableNames.getConstArray(); - const ::rtl::OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength(); + const Sequence< OUString> aTableNames = xTables->getElementNames(); + const OUString* pTableNameIter = aTableNames.getConstArray(); + const OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength(); for( ; pTableNameIter != pTableNameEnd ; ++pTableNameIter) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -140,15 +140,15 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: void OptimisticSet::makeNewStatement( ) { - ::rtl::OUStringBuffer aFilter = createKeyFilter(); + OUStringBuffer aFilter = createKeyFilter(); Reference< XSingleSelectQueryComposer> xSourceComposer(m_xComposer,UNO_QUERY); Reference< XMultiServiceFactory > xFactory(m_xConnection, UNO_QUERY_THROW); Reference xAnalyzer(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY); - ::rtl::OUString sQuery = xSourceComposer->getQuery(); + OUString sQuery = xSourceComposer->getQuery(); xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery()); // check for joins - ::rtl::OUString aErrorMsg; + OUString aErrorMsg; SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) ); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -156,7 +156,7 @@ void OptimisticSet::makeNewStatement( ) m_aSqlIterator.traverseAll(); fillJoinedColumns_throw(m_aSqlIterator.getJoinConditions()); - const ::rtl::OUString sComposerFilter = m_xComposer->getFilter(); + const OUString sComposerFilter = m_xComposer->getFilter(); if ( !m_sRowSetFilter.isEmpty() || !sComposerFilter.isEmpty() ) { FilterCreator aFilterCreator; @@ -184,10 +184,10 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if ( m_aJoinedKeyColumns.empty() ) throw SQLException(); // list all cloumns that should be set - static ::rtl::OUString s_sPara(" = ?"); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + static OUString s_sPara(" = ?"); + OUString aQuote = getIdentifierQuoteString(); - ::std::map< ::rtl::OUString,bool > aResultSetChanged; + ::std::map< OUString,bool > aResultSetChanged; TSQLStatements aKeyConditions; TSQLStatements aIndexConditions; TSQLStatements aSql; @@ -199,7 +199,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow { if ( aResultSetChanged.find( aIter->second.sTableName ) == aResultSetChanged.end() ) aResultSetChanged[aIter->second.sTableName] = false; - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); if ( m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() ) { aResultSetChanged[aIter->second.sTableName] = m_aJoinedKeyColumns.find(aIter->second.nPosition) != m_aJoinedKeyColumns.end(); @@ -215,7 +215,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow { (_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[aIter->second.nPosition]; } - ::rtl::OUStringBuffer& rPart = aSql[aIter->second.sTableName]; + OUStringBuffer& rPart = aSql[aIter->second.sTableName]; if ( !rPart.isEmpty() ) rPart.append(", "); rPart.append(sQuotedColumnName + s_sPara); @@ -228,8 +228,8 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if( aKeyConditions.empty() ) ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), SQL_GENERAL_ERROR, m_xConnection ); - static const ::rtl::OUString s_sUPDATE("UPDATE "); - static const ::rtl::OUString s_sSET(" SET "); + static const OUString s_sUPDATE("UPDATE "); + static const OUString s_sSET(" SET "); Reference xMetaData = m_xConnection->getMetaData(); @@ -240,11 +240,11 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if ( aSqlIter->second.getLength() ) { m_bResultSetChanged = m_bResultSetChanged || aResultSetChanged[aSqlIter->first]; - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUStringBuffer sSql(s_sUPDATE + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + + OUStringBuffer sSql(s_sUPDATE + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + s_sSET + aSqlIter->second.toString()); - ::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; + OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; if ( !rCondition.isEmpty() ) sSql.append(" WHERE " + rCondition.toString() ); @@ -259,8 +259,8 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn TSQLStatements aSql; TSQLStatements aParameter; TSQLStatements aKeyConditions; - ::std::map< ::rtl::OUString,bool > aResultSetChanged; - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::std::map< OUString,bool > aResultSetChanged; + OUString aQuote = getIdentifierQuoteString(); // here we build the condition part for the update statement SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin(); @@ -270,7 +270,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn if ( aResultSetChanged.find( aIter->second.sTableName ) == aResultSetChanged.end() ) aResultSetChanged[aIter->second.sTableName] = false; - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); if ( (_rInsertRow->get())[aIter->second.nPosition].isModified() ) { if ( m_aJoinedKeyColumns.find(aIter->second.nPosition) != m_aJoinedKeyColumns.end() ) @@ -283,11 +283,11 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn { (_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[aIter->second.nPosition]; } - ::rtl::OUStringBuffer& rPart = aSql[aIter->second.sTableName]; + OUStringBuffer& rPart = aSql[aIter->second.sTableName]; if ( !rPart.isEmpty() ) rPart.append(", "); rPart.append(sQuotedColumnName); - ::rtl::OUStringBuffer& rParam = aParameter[aIter->second.sTableName]; + OUStringBuffer& rParam = aParameter[aIter->second.sTableName]; if ( !rParam.isEmpty() ) rParam.append(", "); rParam.append("?"); @@ -297,8 +297,8 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), SQL_GENERAL_ERROR, m_xConnection ); Reference xMetaData = m_xConnection->getMetaData(); - static const ::rtl::OUString s_sINSERT("INSERT INTO "); - static const ::rtl::OUString s_sVALUES(") VALUES ( "); + static const OUString s_sINSERT("INSERT INTO "); + static const OUString s_sVALUES(") VALUES ( "); TSQLStatements::iterator aSqlIter = aSql.begin(); TSQLStatements::iterator aSqlEnd = aSql.end(); for(;aSqlIter != aSqlEnd ; ++aSqlIter) @@ -306,16 +306,16 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn if ( aSqlIter->second.getLength() ) { m_bResultSetChanged = m_bResultSetChanged || aResultSetChanged[aSqlIter->first]; - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); - ::rtl::OUString sSql(s_sINSERT + sComposedTableName + " ( " + aSqlIter->second.toString() + + OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); + OUString sSql(s_sINSERT + sComposedTableName + " ( " + aSqlIter->second.toString() + s_sVALUES + aParameter[aSqlIter->first].toString() + " )"); - ::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; + OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; if ( !rCondition.isEmpty() ) { - ::rtl::OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + + OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + " WHERE " + rCondition.toString()); try @@ -353,7 +353,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { - ::rtl::OUString aQuote = getIdentifierQuoteString(); + OUString aQuote = getIdentifierQuoteString(); TSQLStatements aKeyConditions; TSQLStatements aIndexConditions; TSQLStatements aSql; @@ -366,7 +366,7 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne if ( m_aJoinedKeyColumns.find(aIter->second.nPosition) == m_aJoinedKeyColumns.end() && m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() ) { // only delete rows which aren't the key in the join - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); lcl_fillKeyCondition(aIter->second.sTableName,sQuotedColumnName,(_rDeleteRow->get())[aIter->second.nPosition],aKeyConditions); } } @@ -375,19 +375,19 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne TSQLStatements::iterator aSqlEnd = aKeyConditions.end(); for(;aSqlIter != aSqlEnd ; ++aSqlIter) { - ::rtl::OUStringBuffer& rCondition = aSqlIter->second; + OUStringBuffer& rCondition = aSqlIter->second; if ( !rCondition.isEmpty() ) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sSql("DELETE FROM " + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + + OUString sSql("DELETE FROM " + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + " WHERE " + rCondition.toString() ); executeDelete(_rDeleteRow, sSql, aSqlIter->first); } } } -void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName) +void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::executeDelete" ); @@ -420,16 +420,16 @@ void OptimisticSet::fillJoinedColumns_throw(const ::std::vector< TNodePair >& i_ ::std::vector< TNodePair >::const_iterator aIter = i_aJoinColumns.begin(); for(;aIter != i_aJoinColumns.end();++aIter) { - ::rtl::OUString sColumnName,sTableName; + OUString sColumnName,sTableName; m_aSqlIterator.getColumnRange(aIter->first,sColumnName,sTableName); - ::rtl::OUString sLeft(sTableName + "." + sColumnName); + OUString sLeft(sTableName + "." + sColumnName); m_aSqlIterator.getColumnRange(aIter->second,sColumnName,sTableName); - ::rtl::OUString sRight(sTableName + "." + sColumnName); + OUString sRight(sTableName + "." + sColumnName); fillJoinedColumns_throw(sLeft, sRight); } } -void OptimisticSet::fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn,const ::rtl::OUString& i_sRightColumn) +void OptimisticSet::fillJoinedColumns_throw(const OUString& i_sLeftColumn,const OUString& i_sRightColumn) { sal_Int32 nLeft = 0,nRight = 0; SelectColumnsMetaData::const_iterator aLeftIter = m_pKeyColumnNames->find(i_sLeftColumn); @@ -478,7 +478,7 @@ bool OptimisticSet::isResultSetChanged() const void OptimisticSet::reset(const Reference< XResultSet>& _xDriverSet) { - OCacheSet::construct(_xDriverSet,::rtl::OUString()); + OCacheSet::construct(_xDriverSet,OUString()); m_bRowCountFinal = sal_False; m_aKeyMap.clear(); OKeySetValue keySetValue((ORowSetValueVector *)NULL,::std::pair >(0,(Reference)NULL)); @@ -515,8 +515,8 @@ namespace }; struct TableNameFunctor : ::std::unary_function { - ::rtl::OUString m_sTableName; - TableNameFunctor(const ::rtl::OUString& i_sTableName) + OUString m_sTableName; + TableNameFunctor(const OUString& i_sTableName) : m_sTableName(i_sTableName) { } @@ -537,7 +537,7 @@ bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCac SelectColumnsMetaData::const_iterator aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),PositionFunctor(*aColIdxIter)); if ( aFind != m_pKeyColumnNames->end() ) { - const ::rtl::OUString sTableName = aFind->second.sTableName; + const OUString sTableName = aFind->second.sTableName; aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),TableNameFunctor(sTableName)); while( aFind != m_pKeyColumnNames->end() ) { @@ -575,7 +575,7 @@ bool OptimisticSet::columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow SelectColumnsMetaData::const_iterator aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),PositionFunctor(aIter->second.nPosition)); if ( aFind != m_pKeyColumnNames->end() ) { - const ::rtl::OUString sTableName = aFind->second.sTableName; + const OUString sTableName = aFind->second.sTableName; aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),TableNameFunctor(sTableName)); while( aFind != m_pKeyColumnNames->end() ) { @@ -608,19 +608,19 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const { TSQLStatements aSql; TSQLStatements aKeyConditions; - ::std::map< ::rtl::OUString,bool > aResultSetChanged; - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::std::map< OUString,bool > aResultSetChanged; + OUString aQuote = getIdentifierQuoteString(); // here we build the condition part for the update statement SelectColumnsMetaData::const_iterator aColIter = m_pColumnNames->begin(); SelectColumnsMetaData::const_iterator aColEnd = m_pColumnNames->end(); for(;aColIter != aColEnd;++aColIter) { - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aColIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aColIter->second.sRealName); if ( m_aJoinedKeyColumns.find(aColIter->second.nPosition) != m_aJoinedKeyColumns.end() ) { lcl_fillKeyCondition(aColIter->second.sTableName,sQuotedColumnName,io_aRow[aColIter->second.nPosition],aKeyConditions); } - ::rtl::OUStringBuffer& rPart = aSql[aColIter->second.sTableName]; + OUStringBuffer& rPart = aSql[aColIter->second.sTableName]; if ( !rPart.isEmpty() ) rPart.append(", "); rPart.append(sQuotedColumnName); @@ -632,13 +632,13 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const { if ( aSqlIter->second.getLength() ) { - ::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; + OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; if ( !rCondition.isEmpty() ) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); - ::rtl::OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + " WHERE " + + OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); + OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + " WHERE " + rCondition.makeStringAndClear()); try diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index da6c034fdeca..83608360d418 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -45,9 +45,9 @@ namespace dbaccess void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData); - void executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName); + void executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName); void fillJoinedColumns_throw(const ::std::vector< ::connectivity::TNodePair>& i_aJoinColumns); - void fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn,const ::rtl::OUString& i_sRightColumn); + void fillJoinedColumns_throw(const OUString& i_sLeftColumn,const OUString& i_sRightColumn); protected: virtual void makeNewStatement( ); virtual ~OptimisticSet(); @@ -60,7 +60,7 @@ namespace dbaccess sal_Int32& o_nRowCount); // late ctor which can throw exceptions - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); // ::com::sun::star::sdbcx::XDeleteRows virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/PrivateRow.cxx b/dbaccess/source/core/api/PrivateRow.cxx index dd2533c5c21f..465fc3e47f7b 100644 --- a/dbaccess/source/core/api/PrivateRow.cxx +++ b/dbaccess/source/core/api/PrivateRow.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; { return m_aRow[m_nPos].isNull(); } - ::rtl::OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) { m_nPos = columnIndex; return m_aRow[m_nPos]; diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx index 80249d5acf2e..2068dfff8af8 100644 --- a/dbaccess/source/core/api/PrivateRow.hxx +++ b/dbaccess/source/core/api/PrivateRow.hxx @@ -34,7 +34,7 @@ namespace dbaccess { } virtual ::sal_Bool SAL_CALL wasNull( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 17437c9d885c..abf7bae375b5 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -475,9 +475,9 @@ Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeExcepti return aRet; } -rtl::OUString ORowSet::getImplementationName_static( ) throw(RuntimeException) +OUString ORowSet::getImplementationName_static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.comp.dba.ORowSet"); + return OUString("com.sun.star.comp.dba.ORowSet"); } // ::com::sun::star::XServiceInfo @@ -493,7 +493,7 @@ sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) thro Sequence< OUString > ORowSet::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< rtl::OUString > aSNS( 5 ); + Sequence< OUString > aSNS( 5 ); aSNS[0] = SERVICE_SDBC_RESULTSET; aSNS[1] = SERVICE_SDBC_ROWSET; aSNS[2] = SERVICE_SDBCX_RESULTSET; @@ -2330,7 +2330,7 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw() } else { - sCommand = rtl::OUString("SELECT * FROM "); + sCommand = OUString("SELECT * FROM "); OUString sCatalog, sSchema, sTable; ::dbtools::qualifiedNameComponents( m_xActiveConnection->getMetaData(), m_aCommand, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation ); sCommand += ::dbtools::composeTableNameForSelect( m_xActiveConnection, sCatalog, sSchema, sTable ); @@ -2559,11 +2559,11 @@ void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Refer try { Sequence aData; - rtl::OUString aDataStr; + OUString aDataStr; // the data is given as character data and the length defines the character length sal_Int32 nSize = x->readBytes(aData, length * sizeof(sal_Unicode)); if (nSize / sizeof(sal_Unicode)) - aDataStr = rtl::OUString((sal_Unicode*)aData.getConstArray(), nSize / sizeof(sal_Unicode)); + aDataStr = OUString((sal_Unicode*)aData.getConstArray(), nSize / sizeof(sal_Unicode)); rParamValue = aDataStr; rParamValue.setTypeKind( DataType::LONGVARCHAR ); x->closeInput(); @@ -2837,9 +2837,9 @@ void ORowSetClone::release() throw() } // XServiceInfo -rtl::OUString ORowSetClone::getImplementationName( ) throw(RuntimeException) +OUString ORowSetClone::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.ORowSetClone"); + return OUString("com.sun.star.sdb.ORowSetClone"); } sal_Bool ORowSetClone::supportsService( const OUString& _rServiceName ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index 0e3558ad6f43..1ae22058b42b 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -99,20 +99,20 @@ namespace dbaccess OTableContainer* m_pTables; - rtl::OUString m_aCommand; - rtl::OUString m_aDataSourceName; - rtl::OUString m_aURL; - rtl::OUString m_aUser; - rtl::OUString m_aPassword; - rtl::OUString m_aFilter; - rtl::OUString m_aHavingClause; - rtl::OUString m_aGroupBy; - rtl::OUString m_aOrder; - rtl::OUString m_aActiveCommand; - rtl::OUString m_aCursorName; - rtl::OUString m_aUpdateCatalogName; // is set by a query - rtl::OUString m_aUpdateSchemaName; // is set by a query - rtl::OUString m_aUpdateTableName; // is set by a query + OUString m_aCommand; + OUString m_aDataSourceName; + OUString m_aURL; + OUString m_aUser; + OUString m_aPassword; + OUString m_aFilter; + OUString m_aHavingClause; + OUString m_aGroupBy; + OUString m_aOrder; + OUString m_aActiveCommand; + OUString m_aCursorName; + OUString m_aUpdateCatalogName; // is set by a query + OUString m_aUpdateSchemaName; // is set by a query + OUString m_aUpdateTableName; // is set by a query sal_Int32 m_nFetchDirection; sal_Int32 m_nFetchSize; @@ -172,7 +172,7 @@ namespace dbaccess @throws com::sun::star::uno::RuntimeException if any of the components involved throws a com::sun::star::uno::RuntimeException */ - sal_Bool impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecute ); + sal_Bool impl_initComposer_throw( OUString& _out_rCommandToExecute ); /** returns the table container of our active connection @@ -261,13 +261,13 @@ namespace dbaccess virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -298,7 +298,7 @@ namespace dbaccess // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -327,7 +327,7 @@ namespace dbaccess virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -369,7 +369,7 @@ namespace dbaccess // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -377,7 +377,7 @@ namespace dbaccess virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -491,9 +491,9 @@ namespace dbaccess virtual void SAL_CALL release() throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 80f2c4660c76..bfeca61b4e68 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -64,16 +64,16 @@ class OEmptyCollection : public sdbcx::OCollection { protected: virtual void impl_refresh() throw(RuntimeException); - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); public: - OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent,sal_True,_rMutex,::std::vector< ::rtl::OUString>()){} + OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent,sal_True,_rMutex,::std::vector< OUString>()){} }; void OEmptyCollection::impl_refresh() throw(RuntimeException) { } -connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const ::rtl::OUString& /*_rName*/) +connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const OUString& /*_rName*/) { return connectivity::sdbcx::ObjectType(); } @@ -279,7 +279,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) return m_aEmptyValue; } -::rtl::OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getString" ); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -592,7 +592,7 @@ Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData( ) throw(SQLE } // XColumnLocate -sal_Int32 SAL_CALL ORowSetBase::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::findColumn" ); ::connectivity::checkDisposed(m_rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 31660e9411ab..185808602f88 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -262,14 +262,14 @@ namespace dbaccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index f6506fae69f6..3d79f2f8f6c5 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -83,11 +83,11 @@ DBG_NAME(ORowSetCache) ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, const Reference& _rContext, - const ::rtl::OUString& _rUpdateTableName, + const OUString& _rUpdateTableName, sal_Bool& _bModified, sal_Bool& _bNew, const ORowSetValueVector& _aParameterValueForCache, - const ::rtl::OUString& i_sRowSetFilter, + const OUString& i_sRowSetFilter, sal_Int32 i_nMaxRows) :m_xSet(_xRs) ,m_xMetaData(Reference< XResultSetMetaDataSupplier >(_xRs,UNO_QUERY)->getMetaData()) @@ -155,7 +155,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, ::comphelper::getINT32(xProp->getPropertyValue(PROPERTY_RESULTSETCONCURRENCY)) == ResultSetConcurrency::READ_ONLY); Reference< XIndexAccess> xUpdateTableKeys; - ::rtl::OUString aUpdateTableName = _rUpdateTableName; + OUString aUpdateTableName = _rUpdateTableName; Reference< XConnection> xConnection; // first we need a connection Reference< XStatement> xStmt(_xRs->getStatement(),UNO_QUERY); @@ -174,7 +174,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, Reference xTabSup(_xAnalyzer,UNO_QUERY); OSL_ENSURE(xTabSup.is(),"ORowSet::execute composer isn't a tablesupplier!"); Reference xTables = xTabSup->getTables(); - Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames(); + Sequence< OUString> aTableNames = xTables->getElementNames(); if ( aTableNames.getLength() > 1 && _rUpdateTableName.isEmpty() && bNeedKeySet ) {// here we have a join or union and nobody told us which table to update, so we update them all m_nPrivileges = Privilege::SELECT|Privilege::DELETE|Privilege::INSERT|Privilege::UPDATE; @@ -298,9 +298,9 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, m_nPrivileges = Privilege::SELECT; sal_Bool bNoInsert = sal_False; - Sequence< ::rtl::OUString> aNames(xColumns->getElementNames()); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames(xColumns->getElementNames()); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { Reference xColumn(xColumns->getByName(*pIter),UNO_QUERY); @@ -1534,7 +1534,7 @@ void ORowSetCache::checkUpdateConditions(sal_Int32 columnIndex) throwFunctionSequenceException(m_xSet.get()); } -sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const ::rtl::OUString& _sUpdateTableName) +sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const OUString& _sUpdateTableName) { sal_Bool bOk = sal_False; if (pNode->count() == 3 && // Ausdruck is geklammert @@ -1561,7 +1561,7 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode { bOk = sal_False; } - ::rtl::OUString sColumnName,sTableRange; + OUString sColumnName,sTableRange; OSQLParseTreeIterator::getColumnRange( pNode->getChild(0), _xConnection, sColumnName, sTableRange ); bOk = sTableRange == _sUpdateTableName; if ( !bOk ) @@ -1575,11 +1575,11 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, - const ::rtl::OUString& _sUpdateTableName ) + const OUString& _sUpdateTableName ) { sal_Bool bOk = sal_False; - ::rtl::OUString sSql = _xAnalyzer->getQuery(); - ::rtl::OUString sErrorMsg; + OUString sSql = _xAnalyzer->getQuery(); + OUString sErrorMsg; ::connectivity::OSQLParser aSqlParser( m_aContext ); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql)); @@ -1618,7 +1618,7 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, pTableRef = pJoin->getChild(3); OSL_ENSURE(SQL_ISRULE(pTableRef,table_ref),"Must be a tableref here!"); - ::rtl::OUString sTableRange = OSQLParseNode::getTableRange(pTableRef); + OUString sTableRange = OSQLParseNode::getTableRange(pTableRef); if(sTableRange.isEmpty()) pTableRef->getChild(0)->parseNodeToStr( sTableRange, _xConnection, NULL, sal_False, sal_False ); bOk = sTableRange == _sUpdateTableName; diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 6eabf0df1e09..67e8757d89d1 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -120,10 +120,10 @@ namespace dbaccess void checkUpdateConditions(sal_Int32 columnIndex); sal_Bool checkJoin( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer, - const ::rtl::OUString& _sUpdateTableName); + const OUString& _sUpdateTableName); sal_Bool checkInnerJoin(const ::connectivity::OSQLParseNode *pNode ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection - ,const ::rtl::OUString& _sUpdateTableName); + ,const OUString& _sUpdateTableName); // clears the insert row void clearInsertRow(); @@ -137,11 +137,11 @@ namespace dbaccess ORowSetCache(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xRs, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xAnalyzer, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, - const ::rtl::OUString& _rUpdateTableName, + const OUString& _rUpdateTableName, sal_Bool& _bModified, sal_Bool& _bNew, const ORowSetValueVector& _aParameterValueForCache, - const ::rtl::OUString& i_sRowSetFilter, + const OUString& i_sRowSetFilter, sal_Int32 i_nMaxRows); ~ORowSetCache(); diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 30eee81a9976..a10188244c86 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -163,7 +163,7 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue( { Any aValue; getFastPropertyValue(aValue,nHandle); - bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(static_cast< ::rtl::OUString*>(0))); + bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(static_cast< OUString*>(0))); } break; // we assume that it works } @@ -409,7 +409,7 @@ Sequence< Type > SAL_CALL ODBTableDecorator::getTypes( ) throw(RuntimeException } // XRename, -void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::rename" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -424,7 +424,7 @@ void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) thro } // XAlterTable, -void SAL_CALL ODBTableDecorator::alterColumnByName( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::alterColumnByName" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -484,7 +484,7 @@ Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException) return m_pColumns; } -::rtl::OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException) +OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getName" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -539,7 +539,7 @@ void ODBTableDecorator::fillPrivileges() const } if ( m_nPrivileges == 0 ) // second chance { - ::rtl::OUString sCatalog,sSchema,sName; + OUString sCatalog,sSchema,sName; xProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; xProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; xProp->getPropertyValue(PROPERTY_NAME) >>= sName; @@ -586,7 +586,7 @@ void ODBTableDecorator::refreshColumns() ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); - ::std::vector< ::rtl::OUString> aVector; + ::std::vector< OUString> aVector; Reference xNames; if(m_xTable.is()) @@ -594,9 +594,9 @@ void ODBTableDecorator::refreshColumns() xNames = m_xTable->getColumns(); if(xNames.is()) { - Sequence< ::rtl::OUString> aNames = xNames->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xNames->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) aVector.push_back(*pIter); } @@ -618,7 +618,7 @@ void ODBTableDecorator::refreshColumns() m_pColumns->reFill(aVector); } -OColumn* ODBTableDecorator::createColumn(const ::rtl::OUString& _rName) const +OColumn* ODBTableDecorator::createColumn(const OUString& _rName) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createColumn" ); OColumn* pReturn = NULL; @@ -648,7 +648,7 @@ void ODBTableDecorator::columnAppended( const Reference< XPropertySet >& /*_rxSo // not interested in } -void ODBTableDecorator::columnDropped(const ::rtl::OUString& _sName) +void ODBTableDecorator::columnDropped(const OUString& _sName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::columnDropped" ); Reference xDrop(m_xColumnDefinitions,UNO_QUERY); @@ -678,7 +678,7 @@ void SAL_CALL ODBTableDecorator::release() throw() OTableDescriptor_BASE::release(); } -void SAL_CALL ODBTableDecorator::setName( const ::rtl::OUString& /*aName*/ ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ ) throw (::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::setName" ); throwFunctionNotSupportedException( "XNamed::setName", *this ); diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index 8523a7020564..82c9d5561a94 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -46,9 +46,9 @@ namespace dbaccess using ::com::sun::star::lang::DisposedException; using ::com::sun::star::sdbc::XRow; - ::rtl::OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::rtl::OUString& i_sSetting) + OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& i_sSetting) { - ::rtl::OUString sSupportService; + OUString sSupportService; Any aValue; if ( dbtools::getDataSourceSetting(_xConnection,i_sSetting,aValue) ) { @@ -60,14 +60,14 @@ namespace dbaccess //= View //==================================================================== View::View( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive, - const ::rtl::OUString& _rCatalogName,const ::rtl::OUString& _rSchemaName, const ::rtl::OUString& _rName ) - :View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, ::rtl::OUString(), _rSchemaName, _rCatalogName ) + const OUString& _rCatalogName,const OUString& _rSchemaName, const OUString& _rName ) + :View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, _rCatalogName ) { m_nCommandHandle = getProperty(PROPERTY_COMMAND).Handle; try { Reference xFac(_rxConnection,UNO_QUERY_THROW); - static const ::rtl::OUString s_sViewAccess("ViewAccessServiceName"); + static const OUString s_sViewAccess("ViewAccessServiceName"); m_xViewAccess.set(xFac->createInstance(lcl_getServiceNameForSetting(_rxConnection,s_sViewAccess)),UNO_QUERY); } catch(const Exception& ) @@ -113,7 +113,7 @@ namespace dbaccess return Sequence< Type >(pTypes, aOwnTypes.size()); } - void SAL_CALL View::alterCommand( const ::rtl::OUString& _rNewCommand ) throw (SQLException, RuntimeException) + void SAL_CALL View::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException) { OSL_ENSURE(m_xViewAccess.is(),"Illegal call to AlterView!"); m_xViewAccess->alterCommand(this,_rNewCommand); diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index d4d600559cf7..6fa18a837ad5 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::osl; -void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::construct" ); OCacheSet::construct(_xDriverSet,i_sRowSetFilter); diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx index 8359b33eb29d..815158b393eb 100644 --- a/dbaccess/source/core/api/WrappedResultSet.hxx +++ b/dbaccess/source/core/api/WrappedResultSet.hxx @@ -42,7 +42,7 @@ namespace dbaccess m_xRowLocate = NULL; } - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition); // ::com::sun::star::sdbcx::XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index ac28dfcb7f76..355bb0bb066a 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -84,23 +84,23 @@ void OCallableStatement::release() throw () } // XServiceInfo -rtl::OUString OCallableStatement::getImplementationName( ) throw(RuntimeException) +OUString OCallableStatement::getImplementationName( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getImplementationName" ); - return rtl::OUString("com.sun.star.sdb.OCallableStatement"); + return OUString("com.sun.star.sdb.OCallableStatement"); } -Sequence< ::rtl::OUString > OCallableStatement::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OCallableStatement::getSupportedServiceNames( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getSupportedServiceNames" ); - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = SERVICE_SDBC_CALLABLESTATEMENT; aSNS.getArray()[1] = SERVICE_SDB_CALLABLESTATEMENT; return aSNS; } // XOutParameters -void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException) +void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::registerOutParameter" ); MutexGuard aGuard(m_aMutex); @@ -129,7 +129,7 @@ sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeExc return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->wasNull(); } -::rtl::OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getString" ); MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 731026a77b94..2b5fabb4225c 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -94,19 +94,19 @@ Sequence< Type > OColumn::getTypes() throw (RuntimeException) IMPLEMENT_FORWARD_XINTERFACE2( OColumn, OColumnBase, ::comphelper::OPropertyContainer ) // ::com::sun::star::lang::XServiceInfo -rtl::OUString OColumn::getImplementationName( ) throw(RuntimeException) +OUString OColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OColumn"); + return OUString("com.sun.star.sdb.OColumn"); } -sal_Bool OColumn::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OColumn::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OColumn::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OColumn::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS[0] = SERVICE_SDBCX_COLUMN; return aSNS; } @@ -123,12 +123,12 @@ Reference< XPropertySetInfo > OColumn::getPropertySetInfo() throw (RuntimeExcept return createPropertySetInfo( getInfoHelper() ) ; } -::rtl::OUString SAL_CALL OColumn::getName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OColumn::getName( ) throw(::com::sun::star::uno::RuntimeException) { return m_sName; } -void SAL_CALL OColumn::setName( const ::rtl::OUString& _rName ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OColumn::setName( const OUString& _rName ) throw(::com::sun::star::uno::RuntimeException) { m_sName = _rName; } @@ -138,17 +138,17 @@ void OColumn::fireValueChange(const ::connectivity::ORowSetValue& /*_rOldValue*/ OSL_FAIL( "OColumn::fireValueChange: not implemented!" ); } -void OColumn::registerProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType ) +void OColumn::registerProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType ) { ::comphelper::OPropertyContainer::registerProperty( _rName, _nHandle, _nAttributes, _pPointerToMember, _rMemberType ); } -void OColumn::registerMayBeVoidProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, Any* _pPointerToMember, const Type& _rExpectedType ) +void OColumn::registerMayBeVoidProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, Any* _pPointerToMember, const Type& _rExpectedType ) { ::comphelper::OPropertyContainer::registerMayBeVoidProperty( _rName, _nHandle, _nAttributes, _pPointerToMember, _rExpectedType ); } -void OColumn::registerPropertyNoMember( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Type& _rType, const void* _pInitialValue ) +void OColumn::registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Type& _rType, const void* _pInitialValue ) { ::comphelper::OPropertyContainer::registerPropertyNoMember( _rName, _nHandle, _nAttributes, _rType, _pInitialValue ); } @@ -160,7 +160,7 @@ DBG_NAME(OColumns); OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - sal_Bool _bCaseSensitive,const ::std::vector< ::rtl::OUString> &_rVector, + sal_Bool _bCaseSensitive,const ::std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn, @@ -180,7 +180,7 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent, OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxDrvColumns, - sal_Bool _bCaseSensitive,const ::std::vector< ::rtl::OUString> &_rVector, + sal_Bool _bCaseSensitive,const ::std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn, @@ -204,25 +204,25 @@ OColumns::~OColumns() } // XServiceInfo -rtl::OUString OColumns::getImplementationName( ) throw(RuntimeException) +OUString OColumns::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OColumns"); + return OUString("com.sun.star.sdb.OColumns"); } -sal_Bool OColumns::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OColumns::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OColumns::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OColumns::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS[0] = SERVICE_SDBCX_CONTAINER; return aSNS; } //------------------------------------------------------------------ -void OColumns::append( const ::rtl::OUString& _rName, OColumn* _pColumn ) +void OColumns::append( const OUString& _rName, OColumn* _pColumn ) { MutexGuard aGuard(m_rMutex); @@ -257,7 +257,7 @@ void OColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeException) m_pRefreshColumns->refreshColumns(); } -connectivity::sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OColumns::createObject(const OUString& _rName) { OSL_ENSURE(m_pColFactoryImpl, "OColumns::createObject: no column factory!"); @@ -369,7 +369,7 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException) } // XAppend -sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OColumns::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { sdbcx::ObjectType xReturn; @@ -407,7 +407,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, cons } // XDrop -void OColumns::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OColumns::dropObject(sal_Int32 _nPos,const OUString _sElementName) { Reference< XDrop > xDrop( m_xDrvColumns, UNO_QUERY ); if ( xDrop.is() ) diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx index a2ade21289c6..5cf277bba674 100644 --- a/dbaccess/source/core/api/columnsettings.cxx +++ b/dbaccess/source/core/api/columnsettings.cxx @@ -72,7 +72,7 @@ namespace dbaccess const sal_Int32 nMayBeVoidAttr = PropertyAttribute::MAYBEVOID | nBoundAttr; const Type& rSalInt32Type = ::getCppuType( static_cast< sal_Int32* >( NULL ) ); - const Type& rStringType = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + const Type& rStringType = ::getCppuType( static_cast< OUString* >( NULL ) ); _rPropertyContainer.registerMayBeVoidProperty( PROPERTY_ALIGN, PROPERTY_ID_ALIGN, nMayBeVoidAttr, &m_aAlignment, rSalInt32Type ); _rPropertyContainer.registerMayBeVoidProperty( PROPERTY_NUMBERFORMAT, PROPERTY_ID_NUMBERFORMAT, nMayBeVoidAttr, &m_aFormatKey, rSalInt32Type ); @@ -131,7 +131,7 @@ namespace dbaccess struct PropertyDescriptor { - ::rtl::OUString sName; + OUString sName; sal_Int32 nHandle; }; PropertyDescriptor aProps[] = diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index 0e94e91306fc..d08f59c81633 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -94,14 +94,14 @@ Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) throw (RuntimeEx } // XServiceInfo -rtl::OUString ODataColumn::getImplementationName( ) throw(RuntimeException) +OUString ODataColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.ODataColumn"); + return OUString("com.sun.star.sdb.ODataColumn"); } -Sequence< ::rtl::OUString > ODataColumn::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > ODataColumn::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 3 ); + Sequence< OUString > aSNS( 3 ); aSNS[0] = SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_RESULTCOLUMN; aSNS[2] = SERVICE_SDB_DATACOLUMN; @@ -126,7 +126,7 @@ sal_Bool ODataColumn::wasNull(void) throw( SQLException, RuntimeException ) return m_xRow->wasNull(); } -rtl::OUString ODataColumn::getString(void) throw( SQLException, RuntimeException ) +OUString ODataColumn::getString(void) throw( SQLException, RuntimeException ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -343,7 +343,7 @@ void ODataColumn::updateDouble(double x) throw( SQLException, RuntimeException ) m_xRowUpdate->updateDouble(m_nPos, x); } -void ODataColumn::updateString(const rtl::OUString& x) throw( SQLException, RuntimeException ) +void ODataColumn::updateString(const OUString& x) throw( SQLException, RuntimeException ) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx index 1c1724519079..60c52ce36320 100644 --- a/dbaccess/source/core/api/datacolumn.hxx +++ b/dbaccess/source/core/api/datacolumn.hxx @@ -57,15 +57,15 @@ namespace dbaccess virtual void SAL_CALL release() throw() { OResultColumn::release(); } // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // cppu::OComponentHelper virtual void SAL_CALL disposing(void); // ::com::sun::star::sdb::XColumn virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -94,7 +94,7 @@ namespace dbaccess virtual void SAL_CALL updateLong( sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index 522da407334a..cfdf5cff3a78 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -143,7 +143,7 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau case PROPERTY_ID_GROUP_BY: case PROPERTY_ID_FILTER: case PROPERTY_ID_ORDER: - _rDefault <<= ::rtl::OUString(); + _rDefault <<= OUString(); break; case PROPERTY_ID_FONT: _rDefault <<= ::comphelper::getDefaultFont(); diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index df9a92a6f69e..3e27c738aa54 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -86,14 +86,14 @@ void OTableColumnDescriptor::impl_registerProperties() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptor ) // ::com::sun::star::lang::XServiceInfo -rtl::OUString OTableColumnDescriptor::getImplementationName( ) throw (RuntimeException) +OUString OTableColumnDescriptor::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumnDescriptor"); + return OUString("com.sun.star.sdb.OTableColumnDescriptor"); } -Sequence< ::rtl::OUString > OTableColumnDescriptor::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = m_bActAsDescriptor ? SERVICE_SDBCX_COLUMNDESCRIPTOR : SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_COLUMNSETTINGS; return aSNS; @@ -135,7 +135,7 @@ void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >& //============================================================ DBG_NAME(OTableColumn); -OTableColumn::OTableColumn( const ::rtl::OUString& _rName ) +OTableColumn::OTableColumn( const OUString& _rName ) :OTableColumnDescriptor( false /* do not act as descriptor */ ) { DBG_CTOR(OTableColumn,NULL); @@ -149,9 +149,9 @@ OTableColumn::~OTableColumn() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn ) -rtl::OUString OTableColumn::getImplementationName( ) throw (RuntimeException) +OUString OTableColumn::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumn"); + return OUString("com.sun.star.sdb.OTableColumn"); } ::cppu::IPropertyArrayHelper& SAL_CALL OTableColumn::getInfoHelper() @@ -169,7 +169,7 @@ rtl::OUString OTableColumn::getImplementationName( ) throw (RuntimeException) // ========================================================================= DBG_NAME( OQueryColumn ); -OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection, const ::rtl::OUString &i_sLabel ) +OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection, const OUString &i_sLabel ) :OTableColumnDescriptor( false /* do not act as descriptor */ ) ,m_sLabel(i_sLabel) { @@ -200,7 +200,7 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co // copy some optional properties from the parser column struct PropertyDescriptor { - ::rtl::OUString sName; + OUString sName; sal_Int32 nHandle; }; PropertyDescriptor aProps[] = @@ -240,14 +240,14 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const { // determine the composed table name, plus the column name, as indicated by the // respective properties - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; OSL_VERIFY( getPropertyValue( PROPERTY_CATALOGNAME ) >>= sCatalog ); OSL_VERIFY( getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema ); OSL_VERIFY( getPropertyValue( PROPERTY_TABLENAME ) >>= sTable ); if ( sCatalog.isEmpty() && sSchema.isEmpty() && sTable.isEmpty() ) return NULL; - ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( + OUString sComposedTableName = ::dbtools::composeTableName( _rxConnection->getMetaData(), sCatalog, sSchema, sTable, sal_False, ::dbtools::eComplete ); // retrieve the table in question @@ -259,7 +259,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const Reference< XColumnsSupplier > xSuppCols( xTables->getByName( sComposedTableName ), UNO_QUERY_THROW ); Reference< XNameAccess > xColumns( xSuppCols->getColumns(), UNO_QUERY_THROW ); - ::rtl::OUString sColumn; + OUString sColumn; OSL_VERIFY( getPropertyValue( PROPERTY_REALNAME ) >>= sColumn ); if ( !xColumns->hasByName( sColumn ) ) return NULL; @@ -275,9 +275,9 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const IMPLEMENT_GET_IMPLEMENTATION_ID( OQueryColumn ) -::rtl::OUString SAL_CALL OQueryColumn::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OQueryColumn::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.dbaccess.OQueryColumn" ); + return OUString( "org.openoffice.comp.dbaccess.OQueryColumn" ); } ::cppu::IPropertyArrayHelper& SAL_CALL OQueryColumn::getInfoHelper() @@ -309,7 +309,7 @@ void SAL_CALL OQueryColumn::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand try { // determine original property name - ::rtl::OUString sPropName; + OUString sPropName; sal_Int16 nAttributes( 0 ); const_cast< OQueryColumn* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, &nAttributes, _nHandle ); OSL_ENSURE( !sPropName.isEmpty(), "OColumnWrapper::impl_getPropertyNameFromHandle: property not found!" ); @@ -356,9 +356,9 @@ OColumnWrapper::~OColumnWrapper() DBG_DTOR(OColumnWrapper,NULL); } -::rtl::OUString OColumnWrapper::impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const +OUString OColumnWrapper::impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const { - ::rtl::OUString sPropName; + OUString sPropName; sal_Int16 nAttributes( 0 ); const_cast< OColumnWrapper* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, &nAttributes, _nHandle ); OSL_ENSURE( !sPropName.isEmpty(), "OColumnWrapper::impl_getPropertyNameFromHandle: property not found!" ); @@ -436,14 +436,14 @@ OTableColumnDescriptorWrapper::OTableColumnDescriptorWrapper( const Reference< X IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptorWrapper ) // ::com::sun::star::lang::XServiceInfo -rtl::OUString OTableColumnDescriptorWrapper::getImplementationName( ) throw (RuntimeException) +OUString OTableColumnDescriptorWrapper::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumnDescriptorWrapper"); + return OUString("com.sun.star.sdb.OTableColumnDescriptorWrapper"); } -Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMNDESCRIPTOR; aSNS[1] = SERVICE_SDB_COLUMNSETTINGS; return aSNS; @@ -465,19 +465,19 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa DECL_PROP0( PRECISION, sal_Int32 ); DECL_PROP0( SCALE, sal_Int32 ); DECL_PROP0( TYPE, sal_Int32 ); - DECL_PROP0( TYPENAME, ::rtl::OUString ); + DECL_PROP0( TYPENAME, OUString ); if ( nId & HAS_AUTOINCREMENT_CREATION ) { - DECL_PROP1( AUTOINCREMENTCREATION, ::rtl::OUString, MAYBEVOID ); + DECL_PROP1( AUTOINCREMENTCREATION, OUString, MAYBEVOID ); } if ( nId & HAS_DEFAULTVALUE ) { - DECL_PROP0( DEFAULTVALUE, ::rtl::OUString ); + DECL_PROP0( DEFAULTVALUE, OUString ); } if ( nId & HAS_DESCRIPTION ) { - DECL_PROP0( DESCRIPTION, ::rtl::OUString ); + DECL_PROP0( DESCRIPTION, OUString ); } if ( nId & HAS_ROWVERSION ) { @@ -485,15 +485,15 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa } if ( nId & HAS_CATALOGNAME ) { - DECL_PROP0( CATALOGNAME, ::rtl::OUString ); + DECL_PROP0( CATALOGNAME, OUString ); } if ( nId & HAS_SCHEMANAME ) { - DECL_PROP0( SCHEMANAME, ::rtl::OUString ); + DECL_PROP0( SCHEMANAME, OUString ); } if ( nId & HAS_TABLENAME ) { - DECL_PROP0( TABLENAME, ::rtl::OUString ); + DECL_PROP0( TABLENAME, OUString ); } END_PROPERTY_SEQUENCE() @@ -603,14 +603,14 @@ OTableColumnWrapper::~OTableColumnWrapper() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnWrapper ) -rtl::OUString OTableColumnWrapper::getImplementationName( ) throw (RuntimeException) +OUString OTableColumnWrapper::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumnWrapper" ); + return OUString("com.sun.star.sdb.OTableColumnWrapper" ); } -Sequence< ::rtl::OUString > OTableColumnWrapper::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_COLUMNSETTINGS; return aSNS; diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index fa624f183cb6..f8f9680b6150 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -52,7 +52,7 @@ OPreparedStatement::OPreparedStatement(const Reference< XConnection > & _xConn, m_xAggregateAsParameters = Reference< XParameters >( m_xAggregateAsSet, UNO_QUERY_THROW ); Reference xMeta = _xConn->getMetaData(); - m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< ::rtl::OUString>(), NULL,NULL); + m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< OUString>(), NULL,NULL); } OPreparedStatement::~OPreparedStatement() @@ -120,19 +120,19 @@ void OPreparedStatement::release() throw () } // XServiceInfo -rtl::OUString OPreparedStatement::getImplementationName( ) throw(RuntimeException) +OUString OPreparedStatement::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OPreparedStatement"); + return OUString("com.sun.star.sdb.OPreparedStatement"); } -sal_Bool OPreparedStatement::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OPreparedStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OPreparedStatement::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OPreparedStatement::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = SERVICE_SDBC_PREPAREDSTATEMENT; aSNS.getArray()[1] = SERVICE_SDB_PREPAREDSTATMENT; return aSNS; @@ -169,7 +169,7 @@ Reference< ::com::sun::star::container::XNameAccess > OPreparedStatement::getCol for (sal_Int32 i = 0, nCount = xMetaData->getColumnCount(); i < nCount; ++i) { // retrieve the name of the column - rtl::OUString aName = xMetaData->getColumnName(i + 1); + OUString aName = xMetaData->getColumnName(i + 1); OResultColumn* pColumn = new OResultColumn(xMetaData, i + 1, xDBMeta); m_pColumns->append(aName, pColumn); } @@ -245,7 +245,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s m_xAggregateAsParameters->setNull(parameterIndex, sqlType); } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -309,7 +309,7 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x m_xAggregateAsParameters->setDouble(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 2d10f929978d..c72f8bf40aad 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -101,7 +101,7 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition OSL_FAIL("OQueryDescriptor_Base::OQueryDescriptor_Base: caught an exception!"); } - m_xCommandDefinition->addPropertyChangeListener(::rtl::OUString(), this); + m_xCommandDefinition->addPropertyChangeListener(OUString(), this); // m_xCommandDefinition->addPropertyChangeListener(PROPERTY_NAME, this); m_xCommandPropInfo = m_xCommandDefinition->getPropertySetInfo(); } @@ -160,7 +160,7 @@ void OQuery::rebuildColumns() Reference< XResultSetMetaData > xResultSetMeta( xResMetaDataSup->getMetaData() ); if ( !xResultSetMeta.is() ) { - ::rtl::OUString sError( DBA_RES( RID_STR_STATEMENT_WITHOUT_RESULT_SET ) ); + OUString sError( DBA_RES( RID_STR_STATEMENT_WITHOUT_RESULT_SET ) ); ::dbtools::throwSQLException( sError, SQL_GENERAL_ERROR, *this ); } @@ -173,13 +173,13 @@ void OQuery::rebuildColumns() throw RuntimeException(); } - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for ( sal_Int32 i = 0;pIter != pEnd; ++pIter,++i) { Reference xSource(xColumns->getByName( *pIter ),UNO_QUERY); - ::rtl::OUString sLabel = *pIter; + OUString sLabel = *pIter; if ( xColumnDefinitions.is() && xColumnDefinitions->hasByName(*pIter) ) { Reference xCommandColumn(xColumnDefinitions->getByName( *pIter ),UNO_QUERY); @@ -260,7 +260,7 @@ void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeExc OSL_ENSURE(_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinition, UNO_QUERY).get(), "OQuery::disposing : where did this call come from ?"); - m_xCommandDefinition->removePropertyChangeListener(::rtl::OUString(), this); + m_xCommandDefinition->removePropertyChangeListener(OUString(), this); m_xCommandDefinition = NULL; } @@ -276,7 +276,7 @@ void SAL_CALL OQuery::disposing() MutexGuard aGuard(m_aMutex); if (m_xCommandDefinition.is()) { - m_xCommandDefinition->removePropertyChangeListener(::rtl::OUString(), this); + m_xCommandDefinition->removePropertyChangeListener(OUString(), this); m_xCommandDefinition = NULL; } disposeColumns(); @@ -287,7 +287,7 @@ void SAL_CALL OQuery::disposing() void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception) { ODataSettings::setFastPropertyValue_NoBroadcast(_nHandle, _rValue); - ::rtl::OUString sAggPropName; + OUString sAggPropName; sal_Int16 nAttr = 0; if (getInfoHelper().fillPropertyMembersByHandle(&sAggPropName,&nAttr,_nHandle) && m_xCommandPropInfo.is() && @@ -322,12 +322,12 @@ Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(Runt return new ::cppu::OPropertyArrayHelper(aProps); } -OColumn* OQuery::createColumn(const ::rtl::OUString& /*_rName*/) const +OColumn* OQuery::createColumn(const OUString& /*_rName*/) const { return NULL; } -void SAL_CALL OQuery::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL OQuery::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) { MutexGuard aGuard(m_aMutex); Reference xRename(m_xCommandDefinition,UNO_QUERY); diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index 7a95a37e902e..a0a8e781954f 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -61,7 +61,7 @@ class OQuery :public OContentHelper friend struct TRelease; public: - typedef ::std::map< ::rtl::OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap; + typedef ::std::map< OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap; protected: // TNameColumnMap m_aColumnMap; // contains all columnnames to columns @@ -139,17 +139,17 @@ public: ::dbtools::IWarningsContainer* getWarningsContainer( ) const { return m_pWarnings; } // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); protected: virtual void SAL_CALL disposing(); - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual void rebuildColumns( ); // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; private: void registerProperties(); diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index c970878a46b0..98d6bc94bed8 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -137,35 +137,35 @@ OUString OQueryComposer::getImplementationName( ) throw(RuntimeException) return OUString("com.sun.star.sdb.dbaccess.OQueryComposer"); } -sal_Bool OQueryComposer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::supportsService" ); return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OQueryComposer::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OQueryComposer::getSupportedServiceNames( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getSupportedServiceNames" ); - Sequence< rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS[0] = SERVICE_SDB_SQLQUERYCOMPOSER; return aSNS; } // XSQLQueryComposer -::rtl::OUString SAL_CALL OQueryComposer::getQuery( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getQuery( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); Reference xProp(m_xComposer,UNO_QUERY); - ::rtl::OUString sQuery; + OUString sQuery; if ( xProp.is() ) xProp->getPropertyValue(PROPERTY_ORIGINAL) >>= sQuery; return sQuery; } -void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(SQLException, RuntimeException) +void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -177,7 +177,7 @@ void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(S m_sOrgOrder = m_xComposer->getOrder(); } -::rtl::OUString SAL_CALL OQueryComposer::getComposedQuery( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getComposedQuery( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getComposedQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -187,7 +187,7 @@ void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(S return m_xComposer->getQuery(); } -::rtl::OUString SAL_CALL OQueryComposer::getFilter( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getFilter( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getFilter" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -206,7 +206,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilt return m_xComposer->getStructuredFilter(); } -::rtl::OUString SAL_CALL OQueryComposer::getOrder( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getOrder( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getOrder" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -224,7 +224,7 @@ void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySe ::osl::MutexGuard aGuard( m_aMutex ); m_xComposerHelper->setQuery(getQuery()); - m_xComposerHelper->setFilter(::rtl::OUString()); + m_xComposerHelper->setFilter(OUString()); m_xComposerHelper->appendFilterByColumn(column, sal_True, SQLFilterOperator::EQUAL); FilterCreator aFilterCreator; @@ -241,7 +241,7 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet ::osl::MutexGuard aGuard( m_aMutex ); m_xComposerHelper->setQuery(getQuery()); - m_xComposerHelper->setOrder(::rtl::OUString()); + m_xComposerHelper->setOrder(OUString()); m_xComposerHelper->appendOrderByColumn(column,ascending); OrderCreator aOrderCreator; @@ -251,7 +251,7 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet setOrder(aOrderCreator.getComposedAndClear()); } -void SAL_CALL OQueryComposer::setFilter( const ::rtl::OUString& filter ) throw(SQLException, RuntimeException) +void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setFilter" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -268,7 +268,7 @@ void SAL_CALL OQueryComposer::setFilter( const ::rtl::OUString& filter ) throw(S m_xComposer->setFilter( aFilterCreator.getComposedAndClear() ); } -void SAL_CALL OQueryComposer::setOrder( const ::rtl::OUString& order ) throw(SQLException, RuntimeException) +void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setOrder" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 984b9e8fe006..4e6d38f959b3 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -89,9 +89,9 @@ OQueryContainer::OQueryContainer( // fill my structures ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); - Sequence< ::rtl::OUString > sDefinitionNames = m_xCommandDefinitions->getElementNames(); - const ::rtl::OUString* pDefinitionName = sDefinitionNames.getConstArray(); - const ::rtl::OUString* pEnd = pDefinitionName + sDefinitionNames.getLength(); + Sequence< OUString > sDefinitionNames = m_xCommandDefinitions->getElementNames(); + const OUString* pDefinitionName = sDefinitionNames.getConstArray(); + const OUString* pEnd = pDefinitionName + sDefinitionNames.getLength(); for ( ; pDefinitionName != pEnd; ++pDefinitionName ) { rDefinitions.insert( *pDefinitionName, TContentPtr() ); @@ -152,7 +152,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet { ResettableMutexGuard aGuard(m_aMutex); if ( !m_xCommandDefinitions.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); // first clone this object's CommandDefinition part Reference< css::sdb::XQueryDefinition > xCommandDefinitionPart = css::sdb::QueryDefinition::create(m_aContext); @@ -163,7 +163,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet // create a wrapper for the object (*before* inserting into our command definition container) Reference< XContent > xNewObject( implCreateWrapper( Reference< XContent>( xCommandDefinitionPart, UNO_QUERY_THROW ) ) ); - ::rtl::OUString sNewObjectName; + OUString sNewObjectName; _rxDesc->getPropertyValue(PROPERTY_NAME) >>= sNewObjectName; try @@ -189,14 +189,14 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet } // XDrop -void SAL_CALL OQueryContainer::dropByName( const ::rtl::OUString& _rName ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL OQueryContainer::dropByName( const OUString& _rName ) throw(SQLException, NoSuchElementException, RuntimeException) { MutexGuard aGuard(m_aMutex); if ( !checkExistence(_rName) ) throw NoSuchElementException(_rName,*this); if ( !m_xCommandDefinitions.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); // now simply forward the remove request to the CommandDefinition container, we're a listener for the removal // and thus we do everything necessary in ::elementRemoved @@ -210,9 +210,9 @@ void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLExcepti throw IndexOutOfBoundsException(); if ( !m_xCommandDefinitions.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); - ::rtl::OUString sName; + OUString sName; Reference xProp(Reference(m_xCommandDefinitions,UNO_QUERY)->getByIndex(_nIndex),UNO_QUERY); if ( xProp.is() ) xProp->getPropertyValue(PROPERTY_NAME) >>= sName; @@ -223,7 +223,7 @@ void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLExcepti void SAL_CALL OQueryContainer::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { Reference< XContent > xNewElement; - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.Accessor >>= sElementName; { MutexGuard aGuard(m_aMutex); @@ -244,7 +244,7 @@ void SAL_CALL OQueryContainer::elementInserted( const ::com::sun::star::containe void SAL_CALL OQueryContainer::elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sAccessor; + OUString sAccessor; _rEvent.Accessor >>= sAccessor; { OSL_ENSURE(!sAccessor.isEmpty(), "OQueryContainer::elementRemoved : invalid name !"); @@ -259,7 +259,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const ::com::sun::star::containe { Reference< XPropertySet > xReplacedElement; Reference< XContent > xNewElement; - ::rtl::OUString sAccessor; + OUString sAccessor; _rEvent.Accessor >>= sAccessor; { @@ -277,7 +277,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const ::com::sun::star::containe Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const ContainerEvent& Event ) throw (WrappedTargetException, RuntimeException) { - ::rtl::OUString sName; + OUString sName; OSL_VERIFY( Event.Accessor >>= sName ); Reference< XContent > xElement( Event.Element, UNO_QUERY_THROW ); @@ -288,7 +288,7 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const Contain } catch( const Exception& ) { - xReturn = new Veto( ::rtl::OUString(), ::cppu::getCaughtException() ); + xReturn = new Veto( OUString(), ::cppu::getCaughtException() ); } return xReturn; } @@ -328,12 +328,12 @@ void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObj } } -::rtl::OUString OQueryContainer::determineContentType() const +OUString OQueryContainer::determineContentType() const { - return ::rtl::OUString( "application/vnd.org.openoffice.DatabaseQueryContainer" ); + return OUString( "application/vnd.org.openoffice.DatabaseQueryContainer" ); } -Reference< XContent > OQueryContainer::implCreateWrapper(const ::rtl::OUString& _rName) +Reference< XContent > OQueryContainer::implCreateWrapper(const OUString& _rName) { Reference< XContent > xObject(m_xCommandDefinitions->getByName(_rName),UNO_QUERY); return implCreateWrapper(xObject); @@ -361,12 +361,12 @@ Reference< XContent > OQueryContainer::implCreateWrapper(const Reference< XConte return xReturn; } -Reference< XContent > OQueryContainer::createObject( const ::rtl::OUString& _rName) +Reference< XContent > OQueryContainer::createObject( const OUString& _rName) { return implCreateWrapper(_rName); } -sal_Bool OQueryContainer::checkExistence(const ::rtl::OUString& _rName) +sal_Bool OQueryContainer::checkExistence(const OUString& _rName) { sal_Bool bRet = sal_False; if ( !m_bInPropertyChange ) @@ -398,7 +398,7 @@ sal_Int32 SAL_CALL OQueryContainer::getCount( ) throw(RuntimeException) return Reference(m_xCommandDefinitions,UNO_QUERY)->getCount(); } -Sequence< ::rtl::OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 8b6db104e3c3..78f549984951 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -123,7 +123,7 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWea ,m_rMutex(_rMutex) { DBG_CTOR(OQueryDescriptor_Base,NULL); - m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< ::rtl::OUString>(), this,this); + m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< OUString>(), this,this); } OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSource,::cppu::OWeakObject& _rMySelf) @@ -131,7 +131,7 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSour ,m_rMutex(_rSource.m_rMutex) { DBG_CTOR(OQueryDescriptor_Base,NULL); - m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< ::rtl::OUString>(), this,this); + m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< OUString>(), this,this); m_sCommand = _rSource.m_sCommand; m_bEscapeProcessing = _rSource.m_bEscapeProcessing; @@ -170,7 +170,7 @@ void OQueryDescriptor_Base::setColumnsOutOfDate( sal_Bool _bOutOfDate ) m_pColumns->setInitialized(); } -void OQueryDescriptor_Base::implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn ) +void OQueryDescriptor_Base::implAppendColumn( const OUString& _rName, OColumn* _pColumn ) { m_pColumns->append( _rName, _pColumn ); } @@ -212,19 +212,19 @@ Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (Ru return m_pColumns; } -::rtl::OUString SAL_CALL OQueryDescriptor_Base::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OQueryDescriptor_Base::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.sdb.OQueryDescriptor"); + return OUString("com.sun.star.sdb.OQueryDescriptor"); } -sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(2); + Sequence< OUString > aSupported(2); aSupported.getArray()[0] = SERVICE_SDB_DATASETTINGS; aSupported.getArray()[1] = SERVICE_SDB_QUERYDESCRIPTOR; return aSupported; @@ -240,7 +240,7 @@ void OQueryDescriptor_Base::columnAppended( const Reference< XPropertySet >& /*_ // not interested in } -void OQueryDescriptor_Base::columnDropped(const ::rtl::OUString& /*_sName*/) +void OQueryDescriptor_Base::columnDropped(const OUString& /*_sName*/) { // not interested in } @@ -264,7 +264,7 @@ void OQueryDescriptor_Base::refreshColumns() rebuildColumns(); } -OColumn* OQueryDescriptor_Base::createColumn( const ::rtl::OUString& /*_rName*/ ) const +OColumn* OQueryDescriptor_Base::createColumn( const OUString& /*_rName*/ ) const { // creating a column/descriptor for a query/descriptor does not make sense at all return NULL; diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index 9bd081084d18..ccd51749c862 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -60,7 +60,7 @@ private: protected: OColumns* m_pColumns; // our column descriptions - ::rtl::OUString m_sElementName; + OUString m_sElementName; virtual ~OQueryDescriptor_Base(); void setColumnsOutOfDate( sal_Bool _bOutOfDate = sal_True ); @@ -69,7 +69,7 @@ protected: sal_Int32 getColumnCount() const { return m_pColumns ? m_pColumns->getCount() : 0; } void clearColumns( ); - void implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn ); + void implAppendColumn( const OUString& _rName, OColumn* _pColumn ); public: OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf); @@ -86,17 +86,17 @@ public: DECLARE_IMPLEMENTATION_ID( ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); protected: // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); - virtual void columnDropped(const ::rtl::OUString& _sName); + virtual void columnDropped(const OUString& _sName); /** rebuild our columns set diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 8d679ec60a92..e2dd8ba86fa5 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -65,7 +65,7 @@ void OResultColumn::impl_determineIsRowVersion_nothrow() try { - ::rtl::OUString sCatalog, sSchema, sTable, sColumnName; + OUString sCatalog, sSchema, sTable, sColumnName; getPropertyValue( PROPERTY_CATALOGNAME ) >>= sCatalog; getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema; getPropertyValue( PROPERTY_TABLENAME ) >>= sTable; @@ -120,14 +120,14 @@ Sequence< sal_Int8 > OResultColumn::getImplementationId() throw (RuntimeExceptio } // XServiceInfo -rtl::OUString OResultColumn::getImplementationName( ) throw(RuntimeException) +OUString OResultColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OResultColumn"); + return OUString("com.sun.star.sdb.OResultColumn"); } -Sequence< ::rtl::OUString > OResultColumn::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OResultColumn::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_RESULTCOLUMN; return aSNS; @@ -146,7 +146,7 @@ void OResultColumn::disposing() ::cppu::IPropertyArrayHelper* OResultColumn::createArrayHelper( ) const { BEGIN_PROPERTY_HELPER(21) - DECL_PROP1(CATALOGNAME, ::rtl::OUString, READONLY); + DECL_PROP1(CATALOGNAME, OUString, READONLY); DECL_PROP1(DISPLAYSIZE, sal_Int32, READONLY); DECL_PROP1_BOOL(ISAUTOINCREMENT, READONLY); DECL_PROP1_BOOL(ISCASESENSITIVE, READONLY); @@ -158,15 +158,15 @@ void OResultColumn::disposing() DECL_PROP1_BOOL(ISSEARCHABLE, READONLY); DECL_PROP1_BOOL(ISSIGNED, READONLY); DECL_PROP1_BOOL(ISWRITABLE, READONLY); - DECL_PROP1(LABEL, ::rtl::OUString, READONLY); - DECL_PROP1(NAME, ::rtl::OUString, READONLY); + DECL_PROP1(LABEL, OUString, READONLY); + DECL_PROP1(NAME, OUString, READONLY); DECL_PROP1(PRECISION, sal_Int32, READONLY); DECL_PROP1(SCALE, sal_Int32, READONLY); - DECL_PROP1(SCHEMANAME, ::rtl::OUString, READONLY); - DECL_PROP1(SERVICENAME, ::rtl::OUString, READONLY); - DECL_PROP1(TABLENAME, ::rtl::OUString, READONLY); + DECL_PROP1(SCHEMANAME, OUString, READONLY); + DECL_PROP1(SERVICENAME, OUString, READONLY); + DECL_PROP1(TABLENAME, OUString, READONLY); DECL_PROP1(TYPE, sal_Int32, READONLY); - DECL_PROP1(TYPENAME, ::rtl::OUString, READONLY); + DECL_PROP1(TYPENAME, OUString, READONLY); END_PROPERTY_HELPER(); } @@ -278,7 +278,7 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const case PROPERTY_ID_SCHEMANAME: case PROPERTY_ID_CATALOGNAME: // empty string'S - rValue <<= rtl::OUString(); + rValue <<= OUString(); break; case PROPERTY_ID_ISROWVERSION: case PROPERTY_ID_ISAUTOINCREMENT: diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index 9a6d2a633045..d5fec73809cd 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -45,7 +45,7 @@ namespace dbaccess mutable ::boost::optional< sal_Bool > m_isDefinitelyWritable; mutable ::boost::optional< sal_Bool > m_isAutoIncrement; mutable ::boost::optional< sal_Int32 > m_isNullable; - mutable ::boost::optional< ::rtl::OUString > m_sColumnLabel; + mutable ::boost::optional< OUString > m_sColumnLabel; mutable ::boost::optional< sal_Int32 > m_nColumnDisplaySize; mutable ::boost::optional< sal_Int32 > m_nColumnType; mutable ::boost::optional< sal_Int32 > m_nPrecision; @@ -62,8 +62,8 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // cppu::OComponentHelper virtual void SAL_CALL disposing(void); diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index b5e3ad0c2a34..e9885fd72b77 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -62,7 +62,7 @@ OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star: RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::OResultSet" ); DBG_CTOR(OResultSet, NULL); - m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< ::rtl::OUString>(), NULL,NULL); + m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), NULL,NULL); try { @@ -185,22 +185,22 @@ void OResultSet::close(void) throw( SQLException, RuntimeException ) } // XServiceInfo -rtl::OUString OResultSet::getImplementationName( ) throw(RuntimeException) +OUString OResultSet::getImplementationName( ) throw(RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getImplementationName" ); - return rtl::OUString("com.sun.star.sdb.OResultSet"); + return OUString("com.sun.star.sdb.OResultSet"); } -sal_Bool OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OResultSet::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::supportsService" ); return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OResultSet::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OResultSet::getSupportedServiceNames( ) throw (RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getSupportedServiceNames" ); - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBC_RESULTSET; aSNS[1] = SERVICE_SDB_RESULTSET; return aSNS; @@ -218,7 +218,7 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::createArrayHelper" ); BEGIN_PROPERTY_HELPER(6) - DECL_PROP1(CURSORNAME, ::rtl::OUString, READONLY); + DECL_PROP1(CURSORNAME, OUString, READONLY); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP1_BOOL(ISBOOKMARKABLE, READONLY); @@ -274,7 +274,7 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const default: { // get the property name - ::rtl::OUString aPropName; + OUString aPropName; sal_Int16 nAttributes; const_cast(this)->getInfoHelper(). fillPropertyMembersByHandle(&aPropName, &nAttributes, nHandle); @@ -314,7 +314,7 @@ Reference< XResultSetMetaData > OResultSet::getMetaData(void) throw( SQLExceptio } // ::com::sun::star::sdbc::XColumnLocate -sal_Int32 OResultSet::findColumn(const rtl::OUString& columnName) throw( SQLException, RuntimeException ) +sal_Int32 OResultSet::findColumn(const OUString& columnName) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::findColumn" ); MutexGuard aGuard(m_aMutex); @@ -371,7 +371,7 @@ Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(voi for ( sal_Int32 i = 0; i < nColCount; ++i) { // retrieve the name of the column - rtl::OUString sName = xMetaData->getColumnName(i + 1); + OUString sName = xMetaData->getColumnName(i + 1); ODataColumn* pColumn = new ODataColumn(xMetaData, m_xDelegatorRow, m_xDelegatorRowUpdate, i + 1, xDBMetaData); // don't silently assume that the name is unique - result set implementations @@ -395,16 +395,16 @@ Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(voi try { const Reference< XNameAccess > xColNames( static_cast< XNameAccess* >( m_pColumns ), UNO_SET_THROW ); - const Sequence< ::rtl::OUString > aNames( xColNames->getElementNames() ); + const Sequence< OUString > aNames( xColNames->getElementNames() ); OSL_POSTCOND( aNames.getLength() == nColCount, "OResultSet::getColumns: invalid column count!" ); - for ( const ::rtl::OUString* pName = aNames.getConstArray(); + for ( const OUString* pName = aNames.getConstArray(); pName != aNames.getConstArray() + aNames.getLength(); ++pName ) { Reference< XPropertySet > xColProps( xColNames->getByName( *pName ), UNO_QUERY_THROW ); - ::rtl::OUString sName; + OUString sName; OSL_VERIFY( xColProps->getPropertyValue( PROPERTY_NAME ) >>= sName ); OSL_POSTCOND( sName == *pName, "OResultSet::getColumns: invalid column name!" ); } @@ -429,7 +429,7 @@ sal_Bool OResultSet::wasNull(void) throw( SQLException, RuntimeException ) return m_xDelegatorRow->wasNull(); } -rtl::OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) +OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getString" ); MutexGuard aGuard(m_aMutex); @@ -689,7 +689,7 @@ void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLExcepti m_xDelegatorRowUpdate->updateDouble(columnIndex, x); } -void OResultSet::updateString(sal_Int32 columnIndex, const rtl::OUString& x) throw( SQLException, RuntimeException ) +void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateString" ); MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index 60d5cf5f7213..c43dc763e9b5 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -96,9 +96,9 @@ namespace dbaccess virtual void SAL_CALL release() throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); @@ -136,14 +136,14 @@ namespace dbaccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -208,7 +208,7 @@ namespace dbaccess virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index f15a3ce958f9..14a37fda575a 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -189,7 +189,7 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::createArrayHelper" ); BEGIN_PROPERTY_HELPER(10) - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_PROP0_BOOL(ESCAPE_PROCESSING); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); @@ -227,7 +227,7 @@ sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any & if ( m_xAggregateAsSet.is() ) { // get the property name - ::rtl::OUString sPropName; + OUString sPropName; getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); // now set the value @@ -266,7 +266,7 @@ void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const default: if ( m_xAggregateAsSet.is() ) { - ::rtl::OUString sPropName; + OUString sPropName; getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); m_xAggregateAsSet->setPropertyValue( sPropName, rValue ); } @@ -292,7 +292,7 @@ void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons default: if ( m_xAggregateAsSet.is() ) { - ::rtl::OUString sPropName; + OUString sPropName; const_cast< OStatementBase* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); rValue = m_xAggregateAsSet->getPropertyValue( sPropName ); } @@ -449,28 +449,28 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OStatementBase, OStatement_IFACE ); IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OStatementBase, OStatement_IFACE ); // XServiceInfo -rtl::OUString OStatement::getImplementationName( ) throw(RuntimeException) +OUString OStatement::getImplementationName( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getImplementationName" ); - return rtl::OUString("com.sun.star.sdb.OStatement"); + return OUString("com.sun.star.sdb.OStatement"); } -sal_Bool OStatement::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::supportsService" ); return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OStatement::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OStatement::getSupportedServiceNames( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getSupportedServiceNames" ); - Sequence< ::rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS.getArray()[0] = SERVICE_SDBC_STATEMENT; return aSNS; } // XStatement -Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::executeQuery" ); MutexGuard aGuard(m_aMutex); @@ -479,7 +479,7 @@ Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) t disposeResultSet(); Reference< XResultSet > xResultSet; - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); Reference< XResultSet > xInnerResultSet = m_xAggregateStatement->executeQuery( sSQL ); Reference< XConnection > xConnection( m_xParent, UNO_QUERY_THROW ); @@ -497,7 +497,7 @@ Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) t return xResultSet; } -sal_Int32 OStatement::executeUpdate( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::executeUpdate" ); MutexGuard aGuard(m_aMutex); @@ -505,11 +505,11 @@ sal_Int32 OStatement::executeUpdate( const rtl::OUString& _rSQL ) throw( SQLExce disposeResultSet(); - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); return m_xAggregateStatement->executeUpdate( sSQL ); } -sal_Bool OStatement::execute( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" ); MutexGuard aGuard(m_aMutex); @@ -517,11 +517,11 @@ sal_Bool OStatement::execute( const rtl::OUString& _rSQL ) throw( SQLException, disposeResultSet(); - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); return m_xAggregateStatement->execute( sSQL ); } -void OStatement::addBatch( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" ); MutexGuard aGuard(m_aMutex); @@ -532,7 +532,7 @@ void OStatement::addBatch( const rtl::OUString& _rSQL ) throw( SQLException, Run if (!xMeta.is() && !xMeta->supportsBatchUpdates()) throwFunctionSequenceException(*this); - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); Reference< XBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->addBatch( sSQL ); } @@ -576,7 +576,7 @@ void SAL_CALL OStatement::disposing() m_xAggregateStatement.clear(); } -::rtl::OUString OStatement::impl_doEscapeProcessing_nothrow( const ::rtl::OUString& _rSQL ) const +OUString OStatement::impl_doEscapeProcessing_nothrow( const OUString& _rSQL ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::impl_doEscapeProcessing_nothrow" ); if ( !m_bEscapeProcessing ) @@ -594,7 +594,7 @@ void SAL_CALL OStatement::disposing() // if we cannot parse it, silently accept this. The driver is probably able to cope with it then return _rSQL; - ::rtl::OUString sLowLevelSQL = m_xComposer->getQueryWithSubstitution(); + OUString sLowLevelSQL = m_xComposer->getQueryWithSubstitution(); return sLowLevelSQL; } catch( const Exception& ) diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 2bb0e7d53a7a..d1977c2fadb7 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -69,11 +69,11 @@ DBG_NAME(ODBTable) ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables ,const Reference< XConnection >& _rxConn - ,const ::rtl::OUString& _rCatalog - ,const ::rtl::OUString& _rSchema - ,const ::rtl::OUString& _rName - ,const ::rtl::OUString& _rType - ,const ::rtl::OUString& _rDesc + ,const OUString& _rCatalog + ,const OUString& _rSchema + ,const OUString& _rName + ,const OUString& _rType + ,const OUString& _rDesc ,const Reference< XNameAccess >& _xColumnDefinitions) throw(SQLException) :OTable_Base(_pTables,_rxConn,_rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers(), _rName, _rType, _rDesc, _rSchema, _rCatalog ) ,m_xColumnDefinitions(_xColumnDefinitions) @@ -106,7 +106,7 @@ ODBTable::~ODBTable() IMPLEMENT_FORWARD_REFCOUNT(ODBTable,OTable_Base) -OColumn* ODBTable::createColumn(const ::rtl::OUString& _rName) const +OColumn* ODBTable::createColumn(const OUString& _rName) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createColumn" ); OColumn* pReturn = NULL; @@ -136,7 +136,7 @@ void ODBTable::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescr // not interested in } -void ODBTable::columnDropped(const ::rtl::OUString& _sName) +void ODBTable::columnDropped(const OUString& _sName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::columnDropped" ); Reference xDrop(m_xColumnDefinitions,UNO_QUERY); @@ -311,7 +311,7 @@ Sequence< Type > SAL_CALL ODBTable::getTypes( ) throw(RuntimeException) } // XRename, -void SAL_CALL ODBTable::rename( const ::rtl::OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::rename" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -325,7 +325,7 @@ void SAL_CALL ODBTable::rename( const ::rtl::OUString& _rNewName ) throw(SQLExce } // XAlterTable, -void SAL_CALL ODBTable::alterColumnByName( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::alterColumnByName" ); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 2bdfb70e9c58..a8af2bbfb0af 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -83,7 +83,7 @@ OViewContainer::~OViewContainer() // XServiceInfo IMPLEMENT_SERVICE_INFO2(OViewContainer, "com.sun.star.sdb.dbaccess.OViewContainer", SERVICE_SDBCX_CONTAINER.ascii, SERVICE_SDBCX_TABLES.ascii) -ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName) +ObjectType OViewContainer::createObject(const OUString& _rName) { ObjectType xProp; if ( m_xMasterContainer.is() && m_xMasterContainer->hasByName(_rName) ) @@ -91,7 +91,7 @@ ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName) if ( !xProp.is() ) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, sCatalog, @@ -125,10 +125,10 @@ Reference< XPropertySet > OViewContainer::createDescriptor() } // XAppend -ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +ObjectType OViewContainer::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { // append the new table with a create stmt - ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME)); + OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME)); Reference xAppend(m_xMasterContainer,UNO_QUERY); Reference< XPropertySet > xProp = descriptor; @@ -142,14 +142,14 @@ ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const } else { - ::rtl::OUString sComposedName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); + OUString sComposedName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); if(sComposedName.isEmpty()) ::dbtools::throwFunctionSequenceException(static_cast(static_cast(this))); - ::rtl::OUString sCommand; + OUString sCommand; descriptor->getPropertyValue(PROPERTY_COMMAND) >>= sCommand; - ::rtl::OUStringBuffer aSQL; + OUStringBuffer aSQL; aSQL.appendAscii( "CREATE VIEW " ); aSQL.append ( sComposedName ); aSQL.appendAscii( " AS " ); @@ -169,7 +169,7 @@ ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const } // XDrop -void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OViewContainer::dropObject(sal_Int32 _nPos,const OUString _sElementName) { if ( !m_bInElementRemoved ) { @@ -178,7 +178,7 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN xDrop->dropByName(_sElementName); else { - ::rtl::OUString sCatalog,sSchema,sTable,sComposedName; + OUString sCatalog,sSchema,sTable,sComposedName; Reference xTable(getObject(_nPos),UNO_QUERY); if ( xTable.is() ) @@ -193,7 +193,7 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN if(sComposedName.isEmpty()) ::dbtools::throwFunctionSequenceException(static_cast(static_cast(this))); - ::rtl::OUString aSql("DROP VIEW "); + OUString aSql("DROP VIEW "); aSql += sComposedName; Reference xCon = m_xConnection; OSL_ENSURE(xCon.is(),"Connection is null!"); @@ -211,16 +211,16 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); - ::rtl::OUString sName; + OUString sName; if ( ( Event.Accessor >>= sName ) && ( !m_nInAppend ) && ( !hasByName( sName ) ) ) { Reference xProp(Event.Element,UNO_QUERY); - ::rtl::OUString sType; + OUString sType; xProp->getPropertyValue(PROPERTY_TYPE) >>= sType; - if ( sType == ::rtl::OUString("VIEW") ) + if ( sType == OUString("VIEW") ) insertElement(sName,createObject(sName)); } } @@ -228,7 +228,7 @@ void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) thr void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); - ::rtl::OUString sName; + OUString sName; if ( (Event.Accessor >>= sName) && hasByName(sName) ) { m_bInElementRemoved = true; @@ -253,10 +253,10 @@ void SAL_CALL OViewContainer::elementReplaced( const ContainerEvent& /*Event*/ ) { } -::rtl::OUString OViewContainer::getTableTypeRestriction() const +OUString OViewContainer::getTableTypeRestriction() const { // no restriction at all (other than the ones provided externally) - return ::rtl::OUString( "VIEW" ); + return OUString( "VIEW" ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 8266b65b2777..490497369c36 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -144,7 +144,7 @@ OComponentDefinition::~OComponentDefinition() OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const Reference< XComponentContext >& _xORB ,const TContentPtr& _pImpl ,sal_Bool _bTable) @@ -168,21 +168,21 @@ OUString OComponentDefinition::getImplementationName_static( ) throw(RuntimeExc return OUString("com.sun.star.comp.dba.OComponentDefinition"); } -::rtl::OUString SAL_CALL OComponentDefinition::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OComponentDefinition::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } -Sequence< ::rtl::OUString > OComponentDefinition::getSupportedServiceNames_static( ) throw(RuntimeException) +Sequence< OUString > OComponentDefinition::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aServices(2); - aServices.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableDefinition"); - aServices.getArray()[1] = ::rtl::OUString("com.sun.star.ucb.Content"); + Sequence< OUString > aServices(2); + aServices.getArray()[0] = OUString("com.sun.star.sdb.TableDefinition"); + aServices.getArray()[1] = OUString("com.sun.star.ucb.Content"); return aServices; } -Sequence< ::rtl::OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } @@ -219,11 +219,11 @@ Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo( return xInfo; } -::rtl::OUString OComponentDefinition::determineContentType() const +OUString OComponentDefinition::determineContentType() const { return m_bTable - ? ::rtl::OUString( "application/vnd.org.openoffice.DatabaseTable" ) - : ::rtl::OUString( "application/vnd.org.openoffice.DatabaseCommandDefinition" ); + ? OUString( "application/vnd.org.openoffice.DatabaseTable" ) + : OUString( "application/vnd.org.openoffice.DatabaseCommandDefinition" ); } Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeException) @@ -233,7 +233,7 @@ Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeExcepti if ( !m_pColumns.get() ) { - ::std::vector< ::rtl::OUString> aNames; + ::std::vector< OUString> aNames; const OComponentDefinition_Impl& rDefinition( getDefinition() ); aNames.reserve( rDefinition.size() ); @@ -249,13 +249,13 @@ Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeExcepti return m_pColumns.get(); } -OColumn* OComponentDefinition::createColumn(const ::rtl::OUString& _rName) const +OColumn* OComponentDefinition::createColumn(const OUString& _rName) const { const OComponentDefinition_Impl& rDefinition( getDefinition() ); OComponentDefinition_Impl::const_iterator aFind = rDefinition.find( _rName ); if ( aFind != rDefinition.end() ) { - aFind->second->addPropertyChangeListener(::rtl::OUString(),m_xColumnPropertyListener.getRef()); + aFind->second->addPropertyChangeListener(OUString(),m_xColumnPropertyListener.getRef()); return new OTableColumnWrapper( aFind->second, aFind->second, true ); } OSL_FAIL( "OComponentDefinition::createColumn: is this a valid case?" ); @@ -274,7 +274,7 @@ void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,co notifyDataSourceModified(); } -void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName) +void OComponentDefinition::columnDropped(const OUString& _sName) { getDefinition().erase( _sName ); notifyDataSourceModified(); @@ -282,7 +282,7 @@ void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName) void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxSourceDescriptor ) { - ::rtl::OUString sName; + OUString sName; _rxSourceDescriptor->getPropertyValue( PROPERTY_NAME ) >>= sName; Reference xColDesc = new OTableColumnDescriptor( true ); diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 0f9ff09320e6..82a5518779f7 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -47,7 +47,7 @@ namespace dbaccess ,public ODataSettings_Base { public: - typedef ::std::map < ::rtl::OUString + typedef ::std::map < OUString , ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > Columns; typedef Columns::iterator iterator; @@ -57,8 +57,8 @@ namespace dbaccess Columns m_aColumns; public: - ::rtl::OUString m_sSchemaName; - ::rtl::OUString m_sCatalogName; + OUString m_sSchemaName; + OUString m_sCatalogName; public: OComponentDefinition_Impl(); @@ -69,11 +69,11 @@ namespace dbaccess inline const_iterator begin() const { return m_aColumns.begin(); } inline const_iterator end() const { return m_aColumns.end(); } - inline const_iterator find( const ::rtl::OUString& _rName ) const { return m_aColumns.find( _rName ); } + inline const_iterator find( const OUString& _rName ) const { return m_aColumns.find( _rName ); } - inline void erase( const ::rtl::OUString& _rName ) { m_aColumns.erase( _rName ); } + inline void erase( const OUString& _rName ) { m_aColumns.erase( _rName ); } - inline void insert( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) + inline void insert( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) { OSL_PRECOND( m_aColumns.find( _rName ) == m_aColumns.end(), "OComponentDefinition_Impl::insert: there's already an element with this name!" ); m_aColumns.insert( Columns::value_type( _rName, _rxColumn ) ); @@ -114,7 +114,7 @@ public: OComponentDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ,const TContentPtr& _pImpl ,sal_Bool _bTable = sal_True @@ -127,11 +127,11 @@ public: DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -148,10 +148,10 @@ public: virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); - virtual void columnDropped(const ::rtl::OUString& _sName); + virtual void columnDropped(const OUString& _sName); virtual void notifyDataSourceModified() { OContentHelper::notifyDataSourceModified(); } protected: @@ -163,7 +163,7 @@ protected: const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; private: void registerProperties(); diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 2fbb2fa7d145..bfe39b79a14d 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -97,9 +97,9 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw return new ::ucbhelper::ContentIdentifier( aIdentifier ); } -::rtl::OUString OContentHelper::impl_getHierarchicalName( bool _includingRootContainer ) const +OUString OContentHelper::impl_getHierarchicalName( bool _includingRootContainer ) const { - ::rtl::OUStringBuffer aHierarchicalName( m_pImpl->m_aProps.aTitle ); + OUStringBuffer aHierarchicalName( m_pImpl->m_aProps.aTitle ); Reference< XInterface > xParent = m_xParentContainer; while( xParent.is() ) { @@ -108,20 +108,20 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw xParent.set( xChild.is() ? xChild->getParent() : Reference< XInterface >(), UNO_QUERY ); if ( xProp.is() && xParent.is() ) { - ::rtl::OUString sName; + OUString sName; xProp->getPropertyValue( PROPERTY_NAME ) >>= sName; - ::rtl::OUString sPrevious = aHierarchicalName.makeStringAndClear(); + OUString sPrevious = aHierarchicalName.makeStringAndClear(); aHierarchicalName.append( sName + "/" + sPrevious ); } } - ::rtl::OUString sHierarchicalName( aHierarchicalName.makeStringAndClear() ); + OUString sHierarchicalName( aHierarchicalName.makeStringAndClear() ); if ( !_includingRootContainer ) sHierarchicalName = sHierarchicalName.copy( sHierarchicalName.indexOf( '/' ) + 1 ); return sHierarchicalName; } -::rtl::OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException) +OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -170,7 +170,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -190,7 +190,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -202,7 +202,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma OSL_FAIL( "No properties!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -232,7 +232,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma ucbhelper::cancelCommandExecution( makeAny( UnsupportedCommandException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -246,44 +246,44 @@ void SAL_CALL OContentHelper::abort( sal_Int32 /*CommandId*/ ) throw (RuntimeExc } // XPropertiesChangeNotifier -void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< ::rtl::OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) +void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); sal_Int32 nCount = PropertyNames.getLength(); if ( !nCount ) { // Note: An empty sequence means a listener for "all" properties. - m_aPropertyChangeListeners.addInterface(::rtl::OUString(), Listener ); + m_aPropertyChangeListeners.addInterface(OUString(), Listener ); } else { - const ::rtl::OUString* pSeq = PropertyNames.getConstArray(); + const OUString* pSeq = PropertyNames.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const ::rtl::OUString& rName = pSeq[ n ]; + const OUString& rName = pSeq[ n ]; if ( !rName.isEmpty() ) m_aPropertyChangeListeners.addInterface(rName, Listener ); } } } -void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< ::rtl::OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) +void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); sal_Int32 nCount = PropertyNames.getLength(); if ( !nCount ) { // Note: An empty sequence means a listener for "all" properties. - m_aPropertyChangeListeners.removeInterface( ::rtl::OUString(), Listener ); + m_aPropertyChangeListeners.removeInterface( OUString(), Listener ); } else { - const ::rtl::OUString* pSeq = PropertyNames.getConstArray(); + const OUString* pSeq = PropertyNames.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const ::rtl::OUString& rName = pSeq[ n ]; + const OUString& rName = pSeq[ n ]; if ( !rName.isEmpty() ) m_aPropertyChangeListeners.removeInterface( rName, Listener ); } @@ -291,12 +291,12 @@ void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< :: } // XPropertyContainer -void SAL_CALL OContentHelper::addProperty( const ::rtl::OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) +void SAL_CALL OContentHelper::addProperty( const OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) { OSL_FAIL( "OContentHelper::addProperty: not implemented!" ); } -void SAL_CALL OContentHelper::removeProperty( const ::rtl::OUString& /*Name*/ ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) +void SAL_CALL OContentHelper::removeProperty( const OUString& /*Name*/ ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) { OSL_FAIL( "OContentHelper::removeProperty: not implemented!" ); } @@ -365,7 +365,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue } else if ( rValue.Name == "Title" ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { if ( aNewValue != m_pImpl->m_aProps.aTitle ) @@ -460,13 +460,13 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >& // Append all Core Properties. xRow->appendString ( Property( "ContentType", -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), getContentType() ); xRow->appendString ( Property( "Title", -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND ), m_pImpl->m_aProps.aTitle ); xRow->appendBoolean( @@ -495,7 +495,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent if ( nCount ) { // First, notify listeners interested in changes of every property. - OInterfaceContainerHelper* pAllPropsContainer = m_aPropertyChangeListeners.getContainer( ::rtl::OUString() ); + OInterfaceContainerHelper* pAllPropsContainer = m_aPropertyChangeListeners.getContainer( OUString() ); if ( pAllPropsContainer ) { OInterfaceIteratorHelper aIter( *pAllPropsContainer ); @@ -517,7 +517,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent for ( sal_Int32 n = 0; n < nCount; ++n, ++propertyChangeEvent ) { const PropertyChangeEvent& rEvent = *propertyChangeEvent; - const ::rtl::OUString& rName = rEvent.PropertyName; + const OUString& rName = rEvent.PropertyName; OInterfaceContainerHelper* pPropsContainer = m_aPropertyChangeListeners.getContainer( rName ); if ( pPropsContainer ) @@ -597,7 +597,7 @@ void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent m_xParentContainer = _xParent; } -void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify ) +void OContentHelper::impl_rename_throw(const OUString& _sNewName,bool _bNotify ) { osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex); if ( _sNewName.equals( m_pImpl->m_aProps.aTitle ) ) @@ -626,7 +626,7 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN } } -void SAL_CALL OContentHelper::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL OContentHelper::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) { impl_rename_throw(newName); diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 6121644f18a8..882f7863da7c 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -116,7 +116,7 @@ DBG_NAME( DocumentStorageAccess ) class DocumentStorageAccess : public ::cppu::WeakImplHelper2< XDocumentSubStorageSupplier , XTransactionListener > { - typedef ::std::map< ::rtl::OUString, Reference< XStorage > > NamedStorages; + typedef ::std::map< OUString, Reference< XStorage > > NamedStorages; ::osl::Mutex m_aMutex; /// all sub storages which we ever gave to the outer world @@ -144,8 +144,8 @@ public: void dispose(); // XDocumentSubStorageSupplier - virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, ::sal_Int32 _nMode ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (IOException, RuntimeException); + virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nMode ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (IOException, RuntimeException); // XTransactionListener virtual void SAL_CALL preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -168,7 +168,7 @@ public: private: /** opens the sub storage with the given name, in the given mode */ - Reference< XStorage > impl_openSubStorage_nothrow( const ::rtl::OUString& _rStorageName, sal_Int32 _nMode ); + Reference< XStorage > impl_openSubStorage_nothrow( const OUString& _rStorageName, sal_Int32 _nMode ); void impl_suspendCommitPropagation() { @@ -209,7 +209,7 @@ void DocumentStorageAccess::dispose() m_pModelImplementation = NULL; } -Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const ::rtl::OUString& _rStorageName, sal_Int32 _nDesiredMode ) +Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const OUString& _rStorageName, sal_Int32 _nDesiredMode ) { OSL_ENSURE( !_rStorageName.isEmpty(),"ODatabaseModelImpl::impl_openSubStorage_nothrow: Invalid storage name!" ); @@ -309,7 +309,7 @@ bool DocumentStorageAccess::commitEmbeddedStorage( bool _bPreventRootCommits ) } -Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const ::rtl::OUString& aStorageName, ::sal_Int32 _nDesiredMode ) throw (RuntimeException) +Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nDesiredMode ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); NamedStorages::iterator pos = m_aExposedStorages.find( aStorageName ); @@ -322,24 +322,24 @@ Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( con return pos->second; } -Sequence< ::rtl::OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames( ) throw (IOException, RuntimeException) +Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames( ) throw (IOException, RuntimeException) { Reference< XStorage > xRootStor( m_pModelImplementation->getRootStorage() ); if ( !xRootStor.is() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - ::std::vector< ::rtl::OUString > aNames; + ::std::vector< OUString > aNames; Reference< XNameAccess > xNames( xRootStor, UNO_QUERY_THROW ); - Sequence< ::rtl::OUString > aElementNames( xNames->getElementNames() ); + Sequence< OUString > aElementNames( xNames->getElementNames() ); for ( sal_Int32 i=0; iisStorageElement( aElementNames[i] ) ) aNames.push_back( aElementNames[i] ); } return aNames.empty() - ? Sequence< ::rtl::OUString >() - : Sequence< ::rtl::OUString >( &aNames[0], aNames.size() ); + ? Sequence< OUString >() + : Sequence< OUString >( &aNames[0], aNames.size() ); } void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException) @@ -436,7 +436,7 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _r } ODatabaseModelImpl::ODatabaseModelImpl( - const ::rtl::OUString& _rRegistrationName, + const OUString& _rRegistrationName, const Reference< XComponentContext >& _rxContext, ODatabaseContext& _rDBContext ) @@ -483,7 +483,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() Type* pAllowedType = aAllowedTypes.getArray(); *pAllowedType++ = ::getCppuType( static_cast< sal_Bool* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< double* >( NULL ) ); - *pAllowedType++ = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + *pAllowedType++ = ::getCppuType( static_cast< OUString* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< sal_Int32* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< sal_Int16* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< Sequence< Any >* >( NULL ) ); @@ -503,7 +503,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() if ( !pSettings->DefaultValue.hasValue() ) { Property aProperty( - ::rtl::OUString::createFromAscii( pSettings->AsciiName ), + OUString::createFromAscii( pSettings->AsciiName ), -1, pSettings->ValueType, PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT | PropertyAttribute::MAYBEVOID @@ -513,7 +513,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() else { xContainer->addProperty( - ::rtl::OUString::createFromAscii( pSettings->AsciiName ), + OUString::createFromAscii( pSettings->AsciiName ), PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT, pSettings->DefaultValue ); @@ -529,7 +529,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() namespace { - ::rtl::OUString lcl_getContainerStorageName_throw( ODatabaseModelImpl::ObjectType _eType ) + OUString lcl_getContainerStorageName_throw( ODatabaseModelImpl::ObjectType _eType ) { const sal_Char* pAsciiName( NULL ); switch ( _eType ) @@ -541,7 +541,7 @@ namespace default: throw RuntimeException(); } - return ::rtl::OUString::createFromAscii( pAsciiName ); + return OUString::createFromAscii( pAsciiName ); } bool lcl_hasObjectWithMacros_throw( const ODefinitionContainer_Impl& _rObjectDefinitions, const Reference< XStorage >& _rxContainerStorage ) @@ -554,11 +554,11 @@ namespace ) { #if OSL_DEBUG_LEVEL > 0 - const ::rtl::OUString& rName( object->first ); (void)rName; + const OUString& rName( object->first ); (void)rName; #endif const TContentPtr& rDefinition( object->second ); - const ::rtl::OUString& rPersistentName( rDefinition->m_aProps.sPersistentName ); + const OUString& rPersistentName( rDefinition->m_aProps.sPersistentName ); if ( rPersistentName.isEmpty() ) { // it's a logical sub folder used to organize the real objects @@ -605,7 +605,7 @@ namespace } } -bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContainerStorage, const ::rtl::OUString& _rPersistentName ) +bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContainerStorage, const OUString& _rPersistentName ) { OSL_PRECOND( _rxContainerStorage.is(), "ODatabaseModelImpl::objectHasMacros: this will crash!" ); @@ -762,13 +762,13 @@ const Reference< XNumberFormatsSupplier > & ODatabaseModelImpl::getNumberFormats return m_xNumberFormatsSupplier; } -void ODatabaseModelImpl::setDocFileLocation( const ::rtl::OUString& i_rLoadedFrom ) +void ODatabaseModelImpl::setDocFileLocation( const OUString& i_rLoadedFrom ) { ENSURE_OR_THROW( !i_rLoadedFrom.isEmpty(), "invalid URL" ); m_sDocFileLocation = i_rLoadedFrom; } -void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, const Sequence< PropertyValue >& _rArgs ) +void ODatabaseModelImpl::setResource( const OUString& i_rDocumentURL, const Sequence< PropertyValue >& _rArgs ) { ENSURE_OR_THROW( !i_rDocumentURL.isEmpty(), "invalid URL" ); @@ -776,7 +776,7 @@ void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, con #if OSL_DEBUG_LEVEL > 0 if ( aMediaDescriptor.has( "SalvagedFile" ) ) { - ::rtl::OUString sSalvagedFile( aMediaDescriptor.getOrDefault( "SalvagedFile", ::rtl::OUString() ) ); + OUString sSalvagedFile( aMediaDescriptor.getOrDefault( "SalvagedFile", OUString() ) ); // If SalvagedFile is an empty string, this indicates "the document is being recovered, but i_rDocumentURL already // is the real document URL, not the temporary document location" if ( sSalvagedFile.isEmpty() ) @@ -1036,40 +1036,40 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings() static const AsciiPropertyValue aKnownSettings[] = { // known JDBC settings - AsciiPropertyValue( "JavaDriverClass", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "JavaDriverClassPath", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "JavaDriverClass", makeAny( OUString() ) ), + AsciiPropertyValue( "JavaDriverClassPath", makeAny( OUString() ) ), AsciiPropertyValue( "IgnoreCurrency", makeAny( (sal_Bool)sal_False ) ), // known settings for file-based drivers - AsciiPropertyValue( "Extension", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "CharSet", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "Extension", makeAny( OUString() ) ), + AsciiPropertyValue( "CharSet", makeAny( OUString() ) ), AsciiPropertyValue( "HeaderLine", makeAny( (sal_Bool)sal_True ) ), AsciiPropertyValue( "FieldDelimiter", makeAny( OUString( "," ) ) ), AsciiPropertyValue( "StringDelimiter", makeAny( OUString( "\"" ) ) ), AsciiPropertyValue( "DecimalDelimiter", makeAny( OUString( "." ) ) ), - AsciiPropertyValue( "ThousandDelimiter", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "ThousandDelimiter", makeAny( OUString() ) ), AsciiPropertyValue( "ShowDeleted", makeAny( (sal_Bool)sal_False ) ), // known ODBC settings - AsciiPropertyValue( "SystemDriverSettings", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "SystemDriverSettings", makeAny( OUString() ) ), AsciiPropertyValue( "UseCatalog", makeAny( (sal_Bool)sal_False ) ), AsciiPropertyValue( "TypeInfoSettings", makeAny( Sequence< Any >()) ), // settings related to auto increment handling - AsciiPropertyValue( "AutoIncrementCreation", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "AutoRetrievingStatement", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "AutoIncrementCreation", makeAny( OUString() ) ), + AsciiPropertyValue( "AutoRetrievingStatement", makeAny( OUString() ) ), AsciiPropertyValue( "IsAutoRetrievingEnabled", makeAny( (sal_Bool)sal_False ) ), // known LDAP driver settings - AsciiPropertyValue( "HostName", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "HostName", makeAny( OUString() ) ), AsciiPropertyValue( "PortNumber", makeAny( (sal_Int32)389 ) ), - AsciiPropertyValue( "BaseDN", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "BaseDN", makeAny( OUString() ) ), AsciiPropertyValue( "MaxRowCount", makeAny( (sal_Int32)100 ) ), // known MySQLNative driver settings - AsciiPropertyValue( "LocalSocket", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "NamedPipe", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "LocalSocket", makeAny( OUString() ) ), + AsciiPropertyValue( "NamedPipe", makeAny( OUString() ) ), // misc known driver settings AsciiPropertyValue( "ParameterNameSubstitution", makeAny( (sal_Bool)sal_False ) ), AsciiPropertyValue( "AddIndexAppendix", makeAny( (sal_Bool)sal_True ) ), AsciiPropertyValue( "IgnoreDriverPrivileges", makeAny( (sal_Bool)sal_True ) ), - AsciiPropertyValue( "ImplicitCatalogRestriction", ::cppu::UnoType< ::rtl::OUString >::get() ), - AsciiPropertyValue( "ImplicitSchemaRestriction", ::cppu::UnoType< ::rtl::OUString >::get() ), + AsciiPropertyValue( "ImplicitCatalogRestriction", ::cppu::UnoType< OUString >::get() ), + AsciiPropertyValue( "ImplicitSchemaRestriction", ::cppu::UnoType< OUString >::get() ), AsciiPropertyValue( "PrimaryKeySupport", ::cppu::UnoType< sal_Bool >::get() ), AsciiPropertyValue( "ShowColumnDescription", makeAny( (sal_Bool)sal_False ) ), // known SDB level settings @@ -1089,15 +1089,15 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings() AsciiPropertyValue( "EscapeDateTime", makeAny( (sal_Bool)sal_True ) ), // known services to handle database tasks - AsciiPropertyValue( "TableAlterationServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "TableRenameServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "ViewAlterationServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "ViewAccessServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "CommandDefinitions", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "Forms", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "Reports", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "KeyAlterationServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "IndexAlterationServiceName", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "TableAlterationServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "TableRenameServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "ViewAlterationServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "ViewAccessServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "CommandDefinitions", makeAny( OUString() ) ), + AsciiPropertyValue( "Forms", makeAny( OUString() ) ), + AsciiPropertyValue( "Reports", makeAny( OUString() ) ), + AsciiPropertyValue( "KeyAlterationServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "IndexAlterationServiceName", makeAny( OUString() ) ), AsciiPropertyValue() }; @@ -1168,7 +1168,7 @@ Reference< XStorageBasedLibraryContainer > ODatabaseModelImpl::getLibraryContain catch( const Exception& ) { throw WrappedTargetRuntimeException( - ::rtl::OUString(), + OUString(), xDocument, ::cppu::getCaughtException() ); @@ -1257,12 +1257,12 @@ Reference< XStorage > ODatabaseModelImpl::impl_switchToStorage_throw( const Refe return m_xDocumentStorage.getTyped(); } -void ODatabaseModelImpl::impl_switchToLogicalURL( const ::rtl::OUString& i_rDocumentURL ) +void ODatabaseModelImpl::impl_switchToLogicalURL( const OUString& i_rDocumentURL ) { if ( i_rDocumentURL == m_sDocumentURL ) return; - const ::rtl::OUString sOldURL( m_sDocumentURL ); + const OUString sOldURL( m_sDocumentURL ); // update our name, if necessary if ( ( m_sName == m_sDocumentURL ) // our name is our old URL || ( m_sName.isEmpty() ) // we do not have a name, yet (i.e. are not registered at the database context) @@ -1293,7 +1293,7 @@ void ODatabaseModelImpl::impl_switchToLogicalURL( const ::rtl::OUString& i_rDocu } } -::rtl::OUString ODatabaseModelImpl::getObjectContainerStorageName( const ObjectType _eType ) +OUString ODatabaseModelImpl::getObjectContainerStorageName( const ObjectType _eType ) { return lcl_getContainerStorageName_throw( _eType ); } @@ -1318,7 +1318,7 @@ sal_Bool ODatabaseModelImpl::setCurrentMacroExecMode( sal_uInt16 nMacroMode ) return sal_True; } -::rtl::OUString ODatabaseModelImpl::getDocumentLocation() const +OUString ODatabaseModelImpl::getDocumentLocation() const { return getURL(); // formerly, we returned getDocFileLocation here, which is the location of the file from which we diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 194b6a23bd2b..49f6a10efdc6 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -199,7 +199,7 @@ private: ::comphelper::NamedValueCollection m_aMediaDescriptor; /// the URL the document was loaded from - ::rtl::OUString m_sDocFileLocation; + OUString m_sDocFileLocation; oslInterlockedCount m_refCount; @@ -220,7 +220,7 @@ private: ->m_sDocumentURL then is the URL of the document which actually had been recovered. */ - ::rtl::OUString m_sDocumentURL; + OUString m_sDocumentURL; public: OWeakConnectionArray m_aConnections; @@ -232,11 +232,11 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - ::rtl::OUString m_sConnectURL; - ::rtl::OUString m_sName; // transient, our creator has to tell us the title - ::rtl::OUString m_sUser; - ::rtl::OUString m_aPassword; // transient ! - ::rtl::OUString m_sFailedPassword; + OUString m_sConnectURL; + OUString m_sName; // transient, our creator has to tell us the title + OUString m_sUser; + OUString m_aPassword; // transient ! + OUString m_sFailedPassword; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; sal_Int32 m_nLoginTimeout; @@ -247,8 +247,8 @@ public: sal_Bool m_bDocumentReadOnly : 1; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyAccess > m_xSettings; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableTypeFilter; OSharedConnectionManager* m_pSharedConnectionManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xSharedConnectionManager; @@ -282,7 +282,7 @@ public: virtual ~ODatabaseModelImpl(); ODatabaseModelImpl( - const ::rtl::OUString& _rRegistrationName, + const OUString& _rRegistrationName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, ODatabaseContext& _rDBContext ); @@ -294,8 +294,8 @@ public: void dispose(); - inline ::rtl::OUString getURL() const { return m_sDocumentURL; } - inline ::rtl::OUString getDocFileLocation() const { return m_sDocFileLocation; } + inline OUString getURL() const { return m_sDocumentURL; } + inline OUString getDocFileLocation() const { return m_sDocFileLocation; } ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getStorage( @@ -312,11 +312,11 @@ public: getMediaDescriptor() const { return m_aMediaDescriptor; } void setResource( - const ::rtl::OUString& _rURL, + const OUString& _rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ); void setDocFileLocation( - const ::rtl::OUString& i_rLoadedFrom + const OUString& i_rLoadedFrom ); static ::comphelper::NamedValueCollection @@ -403,7 +403,7 @@ public: /** returns the name of the storage which is used to stored objects of the given type, if applicable */ - static ::rtl::OUString + static OUString getObjectContainerStorageName( const ObjectType _eType ); /** revokes the data source registration at the database context @@ -414,7 +414,7 @@ public: */ static bool objectHasMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rPersistentName + const OUString& _rPersistentName ); /** determines which kind of embedded macros are present in the document @@ -487,7 +487,7 @@ public: // IMacroDocumentAccess overridables virtual sal_Int16 getCurrentMacroExecMode() const; virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 ); - virtual ::rtl::OUString getDocumentLocation() const; + virtual OUString getDocumentLocation() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getZipStorageToSign(); virtual sal_Bool documentStorageHasMacros() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const; @@ -512,7 +512,7 @@ private: URL where the doc was loaded/recovered from */ void impl_switchToLogicalURL( - const ::rtl::OUString& i_rDocumentURL + const OUString& i_rDocumentURL ); }; diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index e88c617bc121..242741ee5585 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -56,7 +56,7 @@ Reference< XStatement > SAL_CALL OSharedConnection::createStatement( ) throw(SQ return m_xConnection->createStatement(); } -Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -64,7 +64,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( co return m_xConnection->prepareStatement(sql); } -Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -72,7 +72,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const : return m_xConnection->prepareCall(sql); } -::rtl::OUString SAL_CALL OSharedConnection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OSharedConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -130,7 +130,7 @@ sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) throw(SQLException, RuntimeE return m_xConnection->isReadOnly(); } -::rtl::OUString SAL_CALL OSharedConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OSharedConnection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index d81e501745bf..916c4fec8cb8 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -96,7 +96,7 @@ namespace dbaccess { throw ::com::sun::star::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,::com::sun::star::uno::Any()); } - virtual void SAL_CALL setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setCatalog( const OUString& /*catalog*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,::com::sun::star::uno::Any()); } @@ -110,16 +110,16 @@ namespace dbaccess } // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index c22fbd99c6c6..291d9e1507ba 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -90,7 +90,7 @@ OUString SAL_CALL OBookmarkContainer::getImplementationName( ) throw(RuntimeExc return OUString("com.sun.star.comp.dba.OBookmarkContainer"); } -sal_Bool SAL_CALL OBookmarkContainer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL OBookmarkContainer::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); @@ -105,7 +105,7 @@ Sequence< OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames( ) t } // XNameContainer -void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_True); @@ -117,7 +117,7 @@ void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, c throw IllegalArgumentException(); // approve the new object - ::rtl::OUString sNewLink; + OUString sNewLink; if (!(aElement >>= sNewLink)) throw IllegalArgumentException(); @@ -134,9 +134,9 @@ void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, c } } -void SAL_CALL OBookmarkContainer::removeByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL OBookmarkContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - ::rtl::OUString sOldBookmark; + OUString sOldBookmark; { MutexGuard aGuard(m_rMutex); checkValid(sal_True); @@ -166,7 +166,7 @@ void SAL_CALL OBookmarkContainer::removeByName( const ::rtl::OUString& _rName ) } // XNameReplace -void SAL_CALL OBookmarkContainer::replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL OBookmarkContainer::replaceByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { ClearableMutexGuard aGuard(m_rMutex); checkValid(sal_True); @@ -180,12 +180,12 @@ void SAL_CALL OBookmarkContainer::replaceByName( const ::rtl::OUString& _rName, throw NoSuchElementException(); // approve the new object - ::rtl::OUString sNewLink; + OUString sNewLink; if (!(aElement >>= sNewLink)) throw IllegalArgumentException(); // the old element (for the notifications) - ::rtl::OUString sOldLink = m_aBookmarks[_rName]; + OUString sOldLink = m_aBookmarks[_rName]; // do the replace implReplace(_rName, sNewLink); @@ -220,7 +220,7 @@ Type SAL_CALL OBookmarkContainer::getElementType( ) throw (RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); - return ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + return ::getCppuType( static_cast< OUString* >(NULL) ); } sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) throw (RuntimeException) @@ -257,7 +257,7 @@ Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutO return makeAny(m_aBookmarksIndexed[_nIndex]->second); } -Any SAL_CALL OBookmarkContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); @@ -268,13 +268,13 @@ Any SAL_CALL OBookmarkContainer::getByName( const ::rtl::OUString& _rName ) thro return makeAny(m_aBookmarks[_rName]); } -Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); - Sequence< ::rtl::OUString > aNames(m_aBookmarks.size()); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames(m_aBookmarks.size()); + OUString* pNames = aNames.getArray(); ; for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin(); aNameIter != m_aBookmarksIndexed.end(); @@ -287,7 +287,7 @@ Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames( ) thr return aNames; } -sal_Bool SAL_CALL OBookmarkContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException) +sal_Bool SAL_CALL OBookmarkContainer::hasByName( const OUString& _rName ) throw(RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); @@ -295,7 +295,7 @@ sal_Bool SAL_CALL OBookmarkContainer::hasByName( const ::rtl::OUString& _rName ) return checkExistence(_rName); } -void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName) +void OBookmarkContainer::implRemove(const OUString& _rName) { MutexGuard aGuard(m_rMutex); @@ -324,7 +324,7 @@ void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName) m_aBookmarks.erase(aMapPos); } -void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl::OUString& _rDocumentLocation) +void OBookmarkContainer::implAppend(const OUString& _rName, const OUString& _rDocumentLocation) { MutexGuard aGuard(m_rMutex); @@ -332,7 +332,7 @@ void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl:: m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first); } -void OBookmarkContainer::implReplace(const ::rtl::OUString& _rName, const ::rtl::OUString& _rNewLink) +void OBookmarkContainer::implReplace(const OUString& _rName, const OUString& _rNewLink) { MutexGuard aGuard(m_rMutex); OSL_ENSURE(checkExistence(_rName), "OBookmarkContainer::implReplace : invalid name !"); diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index 201903310a59..36a7cb40d057 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -54,7 +54,7 @@ class OBookmarkContainer :public OBookmarkContainer_Base { protected: - DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUString, MapString2String); + DECLARE_STL_USTRINGACCESS_MAP(OUString, MapString2String); DECLARE_STL_VECTOR(MapString2StringIterator, MapIteratorVector); MapString2String m_aBookmarks; // the bookmarks itself @@ -87,9 +87,9 @@ public: virtual void SAL_CALL release( ) throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); @@ -103,16 +103,16 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); @@ -143,22 +143,22 @@ protected: @param _rName the object name to check @return sal_True if there already exists such an object */ - inline sal_Bool checkExistence(const ::rtl::OUString& _rName); + inline sal_Bool checkExistence(const OUString& _rName); void implAppend( - const ::rtl::OUString& _rName, - const ::rtl::OUString& _rDocumentLocation + const OUString& _rName, + const OUString& _rDocumentLocation ); - void implRemove(const ::rtl::OUString& _rName); + void implRemove(const OUString& _rName); void implReplace( - const ::rtl::OUString& _rName, - const ::rtl::OUString& _rNewLink); + const OUString& _rName, + const OUString& _rNewLink); }; -inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName) +inline sal_Bool OBookmarkContainer::checkExistence(const OUString& _rName) { return m_aBookmarks.find(_rName) != m_aBookmarks.end(); } diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index eb4700052c5c..8fe6ec685150 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -62,7 +62,7 @@ OCommandContainer::~OCommandContainer() IMPLEMENT_FORWARD_XINTERFACE2( OCommandContainer,ODefinitionContainer,OCommandContainer_BASE) IMPLEMENT_TYPEPROVIDER2(OCommandContainer,ODefinitionContainer,OCommandContainer_BASE); -Reference< XContent > OCommandContainer::createObject( const ::rtl::OUString& _rName) +Reference< XContent > OCommandContainer::createObject( const OUString& _rName) { const ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); OSL_ENSURE( rDefinitions.find(_rName) != rDefinitions.end(), "OCommandContainer::createObject: Invalid entry in map!" ); diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx index 39ddb15c357e..cf952d78baaf 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.hxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx @@ -61,11 +61,11 @@ protected: virtual ~OCommandContainer(); // ODefinitionContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject(const OUString& _rName); protected: // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; }; } // namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index ba0016be5811..3adf40195ab0 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -72,17 +72,17 @@ void OCommandDefinition::registerProperties() &rCommandDefinition.m_aLayoutInformation, ::getCppuType(&rCommandDefinition.m_aLayoutInformation)); } -rtl::OUString OCommandDefinition::getName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getName() throw( ::com::sun::star::uno::RuntimeException ) { return getDefinition().m_aProps.aTitle; } -rtl::OUString OCommandDefinition::getCommand() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getCommand() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sCommand; } -void OCommandDefinition::setCommand(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setCommand(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_COMMAND, Any(p1) ); } @@ -97,32 +97,32 @@ void OCommandDefinition::setEscapeProcessing(sal_Bool p1) throw( ::com::sun::sta setPropertyValue(PROPERTY_ESCAPE_PROCESSING, Any(p1) ); } -rtl::OUString OCommandDefinition::getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sUpdateTableName; } -void OCommandDefinition::setUpdateTableName(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setUpdateTableName(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_UPDATE_TABLENAME, Any(p1) ); } -rtl::OUString OCommandDefinition::getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sUpdateCatalogName; } -void OCommandDefinition::setUpdateCatalogName(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setUpdateCatalogName(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_UPDATE_CATALOGNAME, Any(p1) ); } -rtl::OUString OCommandDefinition::getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sUpdateSchemaName; } -void OCommandDefinition::setUpdateSchemaName(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setUpdateSchemaName(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_UPDATE_SCHEMANAME, Any(p1) ); } @@ -143,7 +143,7 @@ OCommandDefinition::~OCommandDefinition() } OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const Reference< XComponentContext >& _xORB ,const TContentPtr& _pImpl) :OComponentDefinition(_rxContainer,_rElementName,_xORB,_pImpl,sal_False) @@ -162,7 +162,7 @@ OUString OCommandDefinition::getImplementationName_static( ) throw(RuntimeExcep return OUString("com.sun.star.comp.dba.OCommandDefinition"); } -::rtl::OUString SAL_CALL OCommandDefinition::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OCommandDefinition::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } @@ -176,7 +176,7 @@ Sequence< OUString > OCommandDefinition::getSupportedServiceNames_static( ) thr return aServices; } -Sequence< ::rtl::OUString > SAL_CALL OCommandDefinition::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OCommandDefinition::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } @@ -186,7 +186,7 @@ Reference< XInterface > OCommandDefinition::Create(const Reference< XComponentCo return *(new OCommandDefinition( _rxContext, NULL, TContentPtr( new OCommandDefinition_Impl ) ) ); } -void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL OCommandDefinition::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) { try { diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index ccc956b0c22f..b94e0c7083c0 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -75,7 +75,7 @@ public: OCommandDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ,const TContentPtr& _pImpl ); @@ -87,34 +87,34 @@ public: DECLARE_XINTERFACE( ) // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // overrides to resolve ambiguity - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setPropertyValue(const OUString& p1, const com::sun::star::uno::Any& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OComponentDefinition::setPropertyValue(p1, p2); } - virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return OComponentDefinition::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const com::sun::star::uno::Reference& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const com::sun::star::uno::Reference& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const com::sun::star::uno::Reference& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const com::sun::star::uno::Reference& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::removeVetoableChangeListener(p1, p2); } virtual com::sun::star::uno::Reference SAL_CALL getIdentifier() throw( ::com::sun::star::uno::RuntimeException ) { return OComponentDefinition::getIdentifier(); } - virtual rtl::OUString SAL_CALL getContentType() throw( ::com::sun::star::uno::RuntimeException ) + virtual OUString SAL_CALL getContentType() throw( ::com::sun::star::uno::RuntimeException ) { return OComponentDefinition::getContentType(); } virtual void SAL_CALL addContentEventListener(const com::sun::star::uno::Reference& p1) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::addContentEventListener(p1); } @@ -128,17 +128,17 @@ public: { OComponentDefinition::removeEventListener(p1); } // XQueryDefinition properties - virtual rtl::OUString getName() throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getCommand() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setCommand(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getCommand() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setCommand(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool getEscapeProcessing() throw( ::com::sun::star::uno::RuntimeException ); virtual void setEscapeProcessing(sal_Bool) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setUpdateTableName(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setUpdateCatalogName(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setUpdateSchemaName(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setUpdateTableName(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setUpdateCatalogName(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setUpdateSchemaName(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); // OPropertySetHelper DECLARE_PROPERTYCONTAINER_DEFAULTS( ); diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 14534241917b..856a81d082e7 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -89,8 +89,8 @@ protected: OWeakRefArray m_aComposers; // the filter as set on the parent data link at construction of the connection - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableTypeFilter; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_aContext; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XConnectionTools > m_xConnectionTools; @@ -145,22 +145,22 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer > SAL_CALL createQueryComposer( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdb::XCommandPreparation - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCommand( const ::rtl::OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCommand( const OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -169,8 +169,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -180,9 +180,9 @@ public: virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XUsersSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException); @@ -193,12 +193,12 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableName > SAL_CALL createTableName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XObjectNames > SAL_CALL getObjectNames( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const ::rtl::OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const ::rtl::OUString& command ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException); // XTableUIProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const ::rtl::OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const ::rtl::OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // IRefreshListener virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed); diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index b2f3bc4dbc6e..c34063488680 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -87,9 +87,9 @@ namespace dbaccess DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); protected: ~DataAccessDescriptor(); @@ -106,22 +106,22 @@ namespace dbaccess Reference m_xContext; // - ::rtl::OUString m_sDataSourceName; - ::rtl::OUString m_sDatabaseLocation; - ::rtl::OUString m_sConnectionResource; + OUString m_sDataSourceName; + OUString m_sDatabaseLocation; + OUString m_sConnectionResource; Sequence< PropertyValue > m_aConnectionInfo; Reference< XConnection > m_xActiveConnection; - ::rtl::OUString m_sCommand; + OUString m_sCommand; sal_Int32 m_nCommandType; - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sOrder; - ::rtl::OUString m_sHavingClause; - ::rtl::OUString m_sGroupBy; + OUString m_sFilter; + OUString m_sOrder; + OUString m_sHavingClause; + OUString m_sGroupBy; sal_Bool m_bEscapeProcessing; Reference< XResultSet > m_xResultSet; Sequence< Any > m_aSelection; sal_Bool m_bBookmarkSelection; - ::rtl::OUString m_sColumnName; + OUString m_sColumnName; Reference< XPropertySet > m_xColumn; // }; @@ -184,11 +184,11 @@ namespace dbaccess return OUString( "com.sun.star.comp.dba.DataAccessDescriptor" ); } - ::sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() ); - const ::rtl::OUString* pStart = aServices.getConstArray(); - const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength(); + Sequence< OUString > aServices( getSupportedServiceNames() ); + const OUString* pStart = aServices.getConstArray(); + const OUString* pEnd = aServices.getConstArray() + aServices.getLength(); return ::std::find( pStart, pEnd, rServiceName ) != pEnd; } @@ -227,15 +227,15 @@ namespace dbaccess { public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XServiceInfo - static versions - static Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( RuntimeException ); + static Sequence< OUString > getSupportedServiceNames_static(void) throw( RuntimeException ); + static OUString getImplementationName_static(void) throw( RuntimeException ); static Reference< XInterface > Create(const Reference< XComponentContext >& _rxContext); - static ::rtl::OUString getSingletonName_static(); + static OUString getSingletonName_static(); // XDataAccessDescriptorFactory virtual Reference< XPropertySet > SAL_CALL createDataAccessDescriptor( ) throw (RuntimeException); @@ -262,9 +262,9 @@ namespace dbaccess return OUString( "com.sun.star.sdb.DataAccessDescriptorFactory" ); } - Sequence< ::rtl::OUString > DataAccessDescriptorFactory::getSupportedServiceNames_static() throw( RuntimeException ) + Sequence< OUString > DataAccessDescriptorFactory::getSupportedServiceNames_static() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aServices(1); + Sequence< OUString > aServices(1); aServices[0] = getSingletonName_static(); return aServices; } @@ -279,20 +279,20 @@ namespace dbaccess return *( new DataAccessDescriptorFactory( _rxContext ) ); } - ::rtl::OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName() throw (RuntimeException) + OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName() throw (RuntimeException) { return getImplementationName_static(); } - ::sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames_static() ); - const ::rtl::OUString* pStart = aServices.getConstArray(); - const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength(); + Sequence< OUString > aServices( getSupportedServiceNames_static() ); + const OUString* pStart = aServices.getConstArray(); + const OUString* pEnd = aServices.getConstArray() + aServices.getLength(); return ::std::find( pStart, pEnd, rServiceName ) != pEnd; } - Sequence< ::rtl::OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index a01a901c12e5..bea00d3665fd 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -218,7 +218,7 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe the instance lock to be released before doing synchronous notifications */ void impl_storeAs_throw( - const ::rtl::OUString& _rURL, + const OUString& _rURL, const ::comphelper::NamedValueCollection& _rArguments, const StoreType _eType, DocumentGuard& _rGuard @@ -297,13 +297,13 @@ public: } // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -325,8 +325,8 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XModel - virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException) ; @@ -339,17 +339,17 @@ public: // XModel2 virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL getControllers( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableViewControllerNames( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames( ) throw (::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createDefaultViewController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createViewController( const ::rtl::OUString& ViewName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createViewController( const OUString& ViewName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; // XStorable virtual sal_Bool SAL_CALL hasLocation( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException) ; virtual sal_Bool SAL_CALL isReadonly( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL store( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL storeAsURL( const ::rtl::OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL storeToURL( const ::rtl::OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL storeAsURL( const OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL storeToURL( const OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -366,7 +366,7 @@ public: // XDocumentEventBroadcaster virtual void SAL_CALL addDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XPrintable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (::com::sun::star::uno::RuntimeException) ; @@ -388,8 +388,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (::com::sun::star::uno::RuntimeException); // XDocumentSubStorageSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XOfficeDatabaseDocument virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > SAL_CALL getDataSource() throw (::com::sun::star::uno::RuntimeException); @@ -422,12 +422,12 @@ public: // css.document.XDocumentRecovery virtual ::sal_Bool SAL_CALL wasModifiedSinceLastSave() throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL storeToRecoveryFile( const ::rtl::OUString& i_TargetLocation, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL recoverFromFile( const ::rtl::OUString& i_SourceLocation, const ::rtl::OUString& i_SalvagedFile, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); + virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); + virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); // XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); // XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); @@ -437,7 +437,7 @@ public: virtual ::sal_Int32 SAL_CALL leaseNumber( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL releaseNumberForComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUntitledPrefix( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUntitledPrefix( ) throw (::com::sun::star::uno::RuntimeException); /** clears the given object container @@ -456,7 +456,7 @@ public: inline void checkInitialized() const { if ( !impl_isInitialized() ) - throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), getThis() ); + throw ::com::sun::star::lang::NotInitializedException( OUString(), getThis() ); } /** checks the document is currently in the initialization phase, or already initialized. @@ -468,7 +468,7 @@ public: // fine return; - throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), getThis() ); + throw ::com::sun::star::lang::NotInitializedException( OUString(), getThis() ); } /** checks whether the document is currently being initialized, or already initialized, @@ -477,7 +477,7 @@ public: inline void checkNotInitialized() const { if ( impl_isInitializing() || impl_isInitialized() ) - throw ::com::sun::star::frame::DoubleInitializationException( ::rtl::OUString(), getThis() ); + throw ::com::sun::star::frame::DoubleInitializationException( OUString(), getThis() ); } private: @@ -556,7 +556,7 @@ private: */ ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > impl_createStorageFor_throw( - const ::rtl::OUString& _rURL + const OUString& _rURL ) const; /** sets our "modified" flag @@ -615,7 +615,7 @@ private: is the guard which currently protects the document instance */ sal_Bool impl_attachResource( - const ::rtl::OUString& i_rLogicalDocumentURL, + const OUString& i_rLogicalDocumentURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rMediaDescriptor, DocumentGuard& _rDocGuard ); @@ -625,7 +625,7 @@ private: */ void impl_throwIOExceptionCausedBySave_throw( const ::com::sun::star::uno::Any& i_rError, - const ::rtl::OUString& i_rTargetURL + const OUString& i_rTargetURL ) const; }; diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index e7b271b24e2c..a02c2be89c31 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -84,21 +84,21 @@ namespace dbaccess ~DatabaseRegistrations(); public: - virtual ::sal_Bool SAL_CALL hasRegisteredDatabase( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getRegistrationNames() throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); - virtual void SAL_CALL registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException); - virtual void SAL_CALL revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); - virtual void SAL_CALL changeDatabaseLocation( const ::rtl::OUString& Name, const ::rtl::OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); - virtual ::sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); + virtual ::sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getRegistrationNames() throw (RuntimeException); + virtual OUString SAL_CALL getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); + virtual void SAL_CALL registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException); + virtual void SAL_CALL revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); + virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); + virtual ::sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); virtual void SAL_CALL addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException); virtual void SAL_CALL removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException); private: ::utl::OConfigurationNode - impl_checkValidName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ); + impl_checkValidName_throw( const OUString& _rName, const bool _bMustExist ); - void impl_checkValidLocation_throw( const ::rtl::OUString& _rLocation ); + void impl_checkValidLocation_throw( const OUString& _rLocation ); /** retrieves the configuration node whose "Name" sub node has the given value @@ -117,10 +117,10 @@ namespace dbaccess However, in this case the root node is not yet committed. */ ::utl::OConfigurationNode - impl_getNodeForName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ); + impl_getNodeForName_throw( const OUString& _rName, const bool _bMustExist ); ::utl::OConfigurationNode - impl_getNodeForName_nothrow( const ::rtl::OUString& _rName ); + impl_getNodeForName_nothrow( const OUString& _rName ); private: Reference m_aContext; @@ -144,17 +144,17 @@ namespace dbaccess { } - ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_nothrow( const ::rtl::OUString& _rName ) + ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_nothrow( const OUString& _rName ) { - Sequence< ::rtl::OUString > aNames( m_aConfigurationRoot.getNodeNames() ); - for ( const ::rtl::OUString* pName = aNames.getConstArray(); + Sequence< OUString > aNames( m_aConfigurationRoot.getNodeNames() ); + for ( const OUString* pName = aNames.getConstArray(); pName != aNames.getConstArray() + aNames.getLength(); ++pName ) { ::utl::OConfigurationNode aNodeForName = m_aConfigurationRoot.openNode( *pName ); - ::rtl::OUString sTestName; + OUString sTestName; OSL_VERIFY( aNodeForName.getNodeValue( getNameNodeName() ) >>= sTestName ); if ( sTestName == _rName ) return aNodeForName; @@ -162,7 +162,7 @@ namespace dbaccess return ::utl::OConfigurationNode(); } - ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ) + ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_throw( const OUString& _rName, const bool _bMustExist ) { ::utl::OConfigurationNode aNodeForName( impl_getNodeForName_nothrow( _rName ) ); @@ -177,14 +177,14 @@ namespace dbaccess if ( _bMustExist ) throw NoSuchElementException( _rName, *this ); - ::rtl::OUString sNewNodeName; + OUString sNewNodeName; { - ::rtl::OUStringBuffer aNewNodeName; + OUStringBuffer aNewNodeName; aNewNodeName.appendAscii( "org.openoffice." ); aNewNodeName.append( _rName ); // make unique - ::rtl::OUStringBuffer aReset( aNewNodeName ); + OUStringBuffer aReset( aNewNodeName ); sNewNodeName = aNewNodeName.makeStringAndClear(); sal_Int32 i=2; while ( m_aConfigurationRoot.hasByName( sNewNodeName ) ) @@ -201,45 +201,45 @@ namespace dbaccess return aNewNode; } - ::utl::OConfigurationNode DatabaseRegistrations::impl_checkValidName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ) + ::utl::OConfigurationNode DatabaseRegistrations::impl_checkValidName_throw( const OUString& _rName, const bool _bMustExist ) { if ( !m_aConfigurationRoot.isValid() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); if ( _rName.isEmpty() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); return impl_getNodeForName_throw( _rName, _bMustExist ); } - void DatabaseRegistrations::impl_checkValidLocation_throw( const ::rtl::OUString& _rLocation ) + void DatabaseRegistrations::impl_checkValidLocation_throw( const OUString& _rLocation ) { if ( _rLocation.isEmpty() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 2 ); + throw IllegalArgumentException( OUString(), *this, 2 ); INetURLObject aURL( _rLocation ); if ( aURL.GetProtocol() == INET_PROT_NOT_VALID ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 2 ); + throw IllegalArgumentException( OUString(), *this, 2 ); } - ::sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException) + ::sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aNodeForName = impl_getNodeForName_nothrow( _Name ); return aNodeForName.isValid(); } - Sequence< ::rtl::OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException) + Sequence< OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_aConfigurationRoot.isValid() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); - Sequence< ::rtl::OUString > aProgrammaticNames( m_aConfigurationRoot.getNodeNames() ); - Sequence< ::rtl::OUString > aDisplayNames( aProgrammaticNames.getLength() ); - ::rtl::OUString* pDisplayName = aDisplayNames.getArray(); + Sequence< OUString > aProgrammaticNames( m_aConfigurationRoot.getNodeNames() ); + Sequence< OUString > aDisplayNames( aProgrammaticNames.getLength() ); + OUString* pDisplayName = aDisplayNames.getArray(); - for ( const ::rtl::OUString* pName = aProgrammaticNames.getConstArray(); + for ( const OUString* pName = aProgrammaticNames.getConstArray(); pName != aProgrammaticNames.getConstArray() + aProgrammaticNames.getLength(); ++pName, ++pDisplayName ) @@ -251,20 +251,20 @@ namespace dbaccess return aDisplayNames; } - ::rtl::OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aNodeForName = impl_checkValidName_throw( _Name, true ); - ::rtl::OUString sLocation; + OUString sLocation; OSL_VERIFY( aNodeForName.getNodeValue( getLocationNodeName() ) >>= sLocation ); sLocation = SvtPathOptions().SubstituteVariable( sLocation ); return sLocation; } - void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException) + void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -277,12 +277,12 @@ namespace dbaccess m_aConfigurationRoot.commit(); // notify - DatabaseRegistrationEvent aEvent( *this, _Name, ::rtl::OUString(), _Location ); + DatabaseRegistrationEvent aEvent( *this, _Name, OUString(), _Location ); aGuard.clear(); m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::registeredDatabaseLocation, aEvent ); } - void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) + void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -290,24 +290,24 @@ namespace dbaccess ::utl::OConfigurationNode aNodeForName = impl_checkValidName_throw( _Name, true ); // obtain properties for notification - ::rtl::OUString sLocation; + OUString sLocation; OSL_VERIFY( aNodeForName.getNodeValue( getLocationNodeName() ) >>= sLocation ); // revoke if ( aNodeForName.isReadonly() || !m_aConfigurationRoot.removeNode( aNodeForName.getLocalName() ) ) - throw IllegalAccessException( ::rtl::OUString(), *this ); + throw IllegalAccessException( OUString(), *this ); m_aConfigurationRoot.commit(); // notify - DatabaseRegistrationEvent aEvent( *this, _Name, sLocation, ::rtl::OUString() ); + DatabaseRegistrationEvent aEvent( *this, _Name, sLocation, OUString() ); aGuard.clear(); m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::revokedDatabaseLocation, aEvent ); } - void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) + void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const OUString& _Name, const OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -316,10 +316,10 @@ namespace dbaccess ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw( _Name, true ); if ( aDataSourceRegistration.isReadonly() ) - throw IllegalAccessException( ::rtl::OUString(), *this ); + throw IllegalAccessException( OUString(), *this ); // obtain properties for notification - ::rtl::OUString sOldLocation; + OUString sOldLocation; OSL_VERIFY( aDataSourceRegistration.getNodeValue( getLocationNodeName() ) >>= sOldLocation ); // change @@ -332,7 +332,7 @@ namespace dbaccess m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::changedDatabaseLocation, aEvent ); } - ::sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + ::sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw( _Name, true ); diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index 13f47d26d92f..33e241a36af0 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -107,7 +107,7 @@ public: */ static void setName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDocumentDataSource >& _rxDocument, - const ::rtl::OUString& _rNewName, + const OUString& _rNewName, DBContextAccess ); @@ -128,13 +128,13 @@ public: virtual void SAL_CALL release() throw( ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -169,7 +169,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connectWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XDataSource - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -180,7 +180,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getQueryDefinitions( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XIsolatedConnection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnection( const OUString& user, const OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnectionWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XFlushable @@ -204,14 +204,14 @@ private: manager, so it can be used as a master for a "high level" sdb connection. */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > buildLowLevelConnection( - const ::rtl::OUString& _rUid, const ::rtl::OUString& _rPwd + const OUString& _rUid, const OUString& _rPwd ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > buildIsolatedConnection( - const rtl::OUString& user, const rtl::OUString& password + const OUString& user, const OUString& password ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& user, const ::rtl::OUString& password , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connectWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void clearConnections(); diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 181ac55e6c76..50ef79dc31d6 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -173,7 +173,7 @@ Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames( ) } // XNameContainer -void SAL_CALL ODefinitionContainer::insertByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +void SAL_CALL ODefinitionContainer::insertByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard(m_aMutex); @@ -186,7 +186,7 @@ void SAL_CALL ODefinitionContainer::insertByName( const ::rtl::OUString& _rName, notifyByName( aGuard, _rName, xNewElement, NULL, E_INSERTED, ContainerListemers ); } -void SAL_CALL ODefinitionContainer::removeByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard(m_aMutex); @@ -210,7 +210,7 @@ void SAL_CALL ODefinitionContainer::removeByName( const ::rtl::OUString& _rName } // XNameReplace -void SAL_CALL ODefinitionContainer::replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL ODefinitionContainer::replaceByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard(m_aMutex); @@ -267,7 +267,7 @@ namespace }; } -void ODefinitionContainer::notifyByName( ResettableMutexGuard& _rGuard, const ::rtl::OUString& _rName, +void ODefinitionContainer::notifyByName( ResettableMutexGuard& _rGuard, const OUString& _rName, const Reference< XContent >& _xNewElement, const Reference< XContent >& _xOldElement, ContainerOperation _eOperation, ListenerType _eType ) { @@ -379,14 +379,14 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOu return makeAny(xProp); } -Any SAL_CALL ODefinitionContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL ODefinitionContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard(m_aMutex); return makeAny( implGetByName( _rName, sal_True ) ); } -Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString& _rName, sal_Bool _bReadIfNeccessary) throw (NoSuchElementException) +Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, sal_Bool _bReadIfNeccessary) throw (NoSuchElementException) { Documents::iterator aMapPos = m_aDocumentMap.find(_rName); if (aMapPos == m_aDocumentMap.end()) @@ -407,12 +407,12 @@ Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString& return xProp; } -Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL ODefinitionContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); - Sequence< ::rtl::OUString > aNames(m_aDocumentMap.size()); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames(m_aDocumentMap.size()); + OUString* pNames = aNames.getArray(); Documents::iterator aEnd = m_aDocumentMap.end(); for ( Documents::iterator aNameIter = m_aDocumentMap.begin(); aNameIter != aEnd; @@ -425,7 +425,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames( ) t return aNames; } -sal_Bool SAL_CALL ODefinitionContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException) +sal_Bool SAL_CALL ODefinitionContainer::hasByName( const OUString& _rName ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -450,7 +450,7 @@ void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) thr } } -void ODefinitionContainer::implRemove(const ::rtl::OUString& _rName) +void ODefinitionContainer::implRemove(const OUString& _rName) { // from the object maps Documents::iterator aFind = m_aDocumentMap.find(_rName); @@ -467,7 +467,7 @@ void ODefinitionContainer::implRemove(const ::rtl::OUString& _rName) namespace { - bool lcl_ensureName( const Reference< XContent >& _rxContent, const ::rtl::OUString& _rName ) + bool lcl_ensureName( const Reference< XContent >& _rxContent, const OUString& _rName ) { if ( !_rxContent.is() ) return true; @@ -479,7 +479,7 @@ namespace Reference< XPropertySet > xProps( _rxContent, UNO_QUERY ); if ( xProps.is() ) { - ::rtl::OUString sCurrentName; + OUString sCurrentName; OSL_VERIFY( xProps->getPropertyValue( PROPERTY_NAME ) >>= sCurrentName ); if ( sCurrentName.equals( _rName ) ) return true; @@ -508,7 +508,7 @@ namespace } } -void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Reference< XContent >& _rxNewObject) +void ODefinitionContainer::implAppend(const OUString& _rName, const Reference< XContent >& _rxNewObject) { MutexGuard aGuard(m_aMutex); try @@ -551,7 +551,7 @@ void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Refer } } -void ODefinitionContainer::implReplace(const ::rtl::OUString& _rName, const Reference< XContent >& _rxNewObject) +void ODefinitionContainer::implReplace(const OUString& _rName, const Reference< XContent >& _rxNewObject) { OSL_ENSURE(checkExistence(_rName), "ODefinitionContainer::implReplace : invalid name !"); @@ -561,7 +561,7 @@ void ODefinitionContainer::implReplace(const ::rtl::OUString& _rName, const Refe addObjectListener(aFind->second); } -void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const Reference< XContent >& _rxObject) const +void ODefinitionContainer::approveNewObject(const OUString& _sName,const Reference< XContent >& _rxObject) const { // check the arguments if ( _sName.isEmpty() ) @@ -605,12 +605,12 @@ void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException) { ClearableMutexGuard aGuard(m_aMutex); - if( evt.PropertyName == (rtl::OUString) PROPERTY_NAME || evt.PropertyName == "Title" ) + if( evt.PropertyName == (OUString) PROPERTY_NAME || evt.PropertyName == "Title" ) { m_bInPropertyChange = sal_True; try { - ::rtl::OUString sNewName,sOldName; + OUString sNewName,sOldName; evt.OldValue >>= sOldName; evt.NewValue >>= sNewName; Reference xContent( evt.Source, UNO_QUERY ); @@ -632,9 +632,9 @@ void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& a { MutexGuard aGuard(m_aMutex); - if( aEvent.PropertyName == (rtl::OUString) PROPERTY_NAME || aEvent.PropertyName == "Title" ) + if( aEvent.PropertyName == (OUString) PROPERTY_NAME || aEvent.PropertyName == "Title" ) { - ::rtl::OUString sNewName; + OUString sNewName; aEvent.NewValue >>= sNewName; if(hasByName(sNewName)) throw PropertyVetoException(); @@ -662,7 +662,7 @@ void ODefinitionContainer::removeObjectListener(const Reference< XContent >& _xN } } -sal_Bool ODefinitionContainer::checkExistence(const ::rtl::OUString& _rName) +sal_Bool ODefinitionContainer::checkExistence(const OUString& _rName) { return m_aDocumentMap.find(_rName) != m_aDocumentMap.end(); } diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 92b2ab75ea65..fcd1bec4ccb9 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -652,7 +652,7 @@ OUString SAL_CALL ODocumentContainer::getHierarchicalName() throw (RuntimeExcept OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( getHierarchicalName() ); aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( i_rRelativeName ); diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index 16dcd22cf8ad..2ff2269e1180 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -67,33 +67,33 @@ public: DECLARE_SERVICE_INFO(); // XComponentLoader - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL loadComponentFromURL( const ::rtl::OUString& URL, const ::rtl::OUString& TargetFrameName, sal_Int32 SearchFlags, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL loadComponentFromURL( const OUString& URL, const OUString& TargetFrameName, sal_Int32 SearchFlags, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XCommandProcessor virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException) ; // XHierarchicalNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const ::rtl::OUString& _sName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByHierarchicalName( const ::rtl::OUString& _sName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const OUString& _sName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& _sName ) throw (::com::sun::star::uno::RuntimeException); // XHierarchicalNameContainer - virtual void SAL_CALL insertByHierarchicalName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByHierarchicalName( const ::rtl::OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByHierarchicalName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByHierarchicalName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XHierarchicalName - virtual ::rtl::OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL composeHierarchicalName( const ::rtl::OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL removeByName( const ::rtl::OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XHierarchicalNameReplace - virtual void SAL_CALL replaceByHierarchicalName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByHierarchicalName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -103,13 +103,13 @@ public: virtual void SAL_CALL revert( ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // helper - ::rtl::Reference getContent(const ::rtl::OUString& _sName) const; + ::rtl::Reference getContent(const OUString& _sName) const; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getContainerStorage() const; protected: @@ -117,11 +117,11 @@ protected: /** OContentHelper */ - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; // ODefinitionContainer virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( - const ::rtl::OUString& _rName + const OUString& _rName ); virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index e64ac434d2d0..a1a9b085281d 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -144,10 +144,10 @@ namespace dbaccess namespace { // -------------------------------------------------------------------- - ::rtl::OUString lcl_determineContentType_nothrow( const Reference< XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rEntityName ) + OUString lcl_determineContentType_nothrow( const Reference< XStorage >& _rxContainerStorage, + const OUString& _rEntityName ) { - ::rtl::OUString sContentType; + OUString sContentType; try { Reference< XStorage > xContainerStorage( _rxContainerStorage, UNO_QUERY_THROW ); @@ -352,27 +352,27 @@ namespace dbaccess //================================================================== class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave > { - ::rtl::OUString m_sName; + OUString m_sName; Reference m_xParentContainer; public: ODocumentSaveContinuation() { } inline Reference getContent() const { return m_xParentContainer; } - inline ::rtl::OUString getName() const { return m_sName; } + inline OUString getName() const { return m_sName; } // XInteractionDocumentSave - virtual void SAL_CALL setName( const ::rtl::OUString& _sName,const Reference& _xParent) throw(RuntimeException); + virtual void SAL_CALL setName( const OUString& _sName,const Reference& _xParent) throw(RuntimeException); }; - void SAL_CALL ODocumentSaveContinuation::setName( const ::rtl::OUString& _sName,const Reference& _xParent) throw(RuntimeException) + void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference& _xParent) throw(RuntimeException) { m_sName = _sName; m_xParentContainer = _xParent; } -::rtl::OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const Reference< XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rEntityName, const Reference< XComponentContext >& _rContext, +OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const Reference< XStorage >& _rxContainerStorage, + const OUString& _rEntityName, const Reference< XComponentContext >& _rContext, Sequence< sal_Int8 >& _rClassId ) { return GetDocumentServiceFromMediaType( @@ -380,10 +380,10 @@ namespace dbaccess _rContext, _rClassId ); } -::rtl::OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const ::rtl::OUString& _rMediaType, +OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const OUString& _rMediaType, const Reference< XComponentContext >& _rContext, Sequence< sal_Int8 >& _rClassId ) { - ::rtl::OUString sResult; + OUString sResult; try { ::comphelper::MimeConfigurationHelper aConfigHelper( _rContext ); @@ -394,11 +394,11 @@ namespace dbaccess Reference< XNameAccess > xObjConfig = aConfigHelper.GetObjConfiguration(); if ( xObjConfig.is() ) { - Sequence< ::rtl::OUString > aClassIDs = xObjConfig->getElementNames(); + Sequence< OUString > aClassIDs = xObjConfig->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aClassIDs.getLength(); nInd++ ) { Reference< XNameAccess > xObjectProps; - ::rtl::OUString aEntryDocName; + OUString aEntryDocName; if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is() && ( xObjectProps->getByName("ObjectDocumentServiceName") >>= aEntryDocName ) @@ -414,7 +414,7 @@ namespace dbaccess // alternative, shorter approach const Sequence< NamedValue > aProps( aConfigHelper.GetObjectPropsByMediaType( _rMediaType ) ); const ::comphelper::NamedValueCollection aMediaTypeProps( aProps ); - const ::rtl::OUString sAlternativeResult = aMediaTypeProps.getOrDefault( "ObjectDocumentServiceName", ::rtl::OUString() ); + const OUString sAlternativeResult = aMediaTypeProps.getOrDefault( "ObjectDocumentServiceName", OUString() ); OSL_ENSURE( sAlternativeResult == sResult, "ODocumentDefinition::GetDocumentServiceFromMediaType: failed, this approach is *not* equivalent (1)!" ); const Sequence< sal_Int8 > aAlternativeClassID = aMediaTypeProps.getOrDefault( "ClassID", Sequence< sal_Int8 >() ); OSL_ENSURE( aAlternativeClassID == _rClassId, "ODocumentDefinition::GetDocumentServiceFromMediaType: failed, this approach is *not* equivalent (2)!" ); @@ -534,10 +534,10 @@ void SAL_CALL ODocumentDefinition::getFastPropertyValue( Any& o_rValue, sal_Int3 { if ( i_nHandle == PROPERTY_ID_PERSISTENT_PATH ) { - ::rtl::OUString sPersistentPath; + OUString sPersistentPath; if ( !m_pImpl->m_aProps.sPersistentName.isEmpty() ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( ODatabaseModelImpl::getObjectContainerStorageName( m_bForm ? ODatabaseModelImpl::E_FORM : ODatabaseModelImpl::E_REPORT ) ); aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( m_pImpl->m_aProps.sPersistentName ); @@ -571,7 +571,7 @@ IPropertyArrayHelper* ODocumentDefinition::createArrayHelper( ) const Sequence< Property > aManualProps( 1 ); aManualProps[0].Name = PROPERTY_PERSISTENT_PATH; aManualProps[0].Handle = PROPERTY_ID_PERSISTENT_PATH; - aManualProps[0].Type = ::getCppuType( static_cast< const ::rtl::OUString* >( NULL ) ); + aManualProps[0].Type = ::getCppuType( static_cast< const OUString* >( NULL ) ); aManualProps[0].Attributes = PropertyAttribute::READONLY; return new OPropertyArrayHelper( ::comphelper::concatSequences( aProps, aManualProps ) ); @@ -780,7 +780,7 @@ void ODocumentDefinition::impl_showOrHideComponent_throw( const bool i_bShow ) { default: case EmbedStates::LOADED: - throw embed::WrongStateException( ::rtl::OUString(), *this ); + throw embed::WrongStateException( OUString(), *this ); case EmbedStates::RUNNING: if ( !i_bShow ) @@ -919,7 +919,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons // not supported ucbhelper::cancelCommandExecution( makeAny( UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( nOpenMode ) ) ), _rxEnvironment ); @@ -1054,14 +1054,14 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); // Unreachable } Reference< XStorage> xDest(aIni[0],UNO_QUERY); - ::rtl::OUString sPersistentName; + OUString sPersistentName; aIni[1] >>= sPersistentName; Reference< XStorage> xStorage = getContainerStorage(); @@ -1080,13 +1080,13 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co OSL_FAIL( "Wrong argument count!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); // Unreachable } - ::rtl::OUString sURL; + OUString sURL; aIni[0] >>= sURL; onCommandInsert( sURL, Environment ); } @@ -1152,7 +1152,7 @@ namespace try { Reference< XPropertySet > xFormProps( xForm, UNO_QUERY_THROW ); - xFormProps->setPropertyValue( PROPERTY_DATASOURCENAME, makeAny( ::rtl::OUString() ) ); + xFormProps->setPropertyValue( PROPERTY_DATASOURCENAME, makeAny( OUString() ) ); } catch( const Exception& ) { @@ -1188,7 +1188,7 @@ namespace } } -void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const Reference< XCommandEnvironment >& Environment ) +void ODocumentDefinition::onCommandInsert( const OUString& _sURL, const Reference< XCommandEnvironment >& Environment ) throw( Exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1198,11 +1198,11 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R { OSL_FAIL( "Content::onCommandInsert - property value missing!" ); - Sequence< rtl::OUString > aProps( 1 ); + Sequence< OUString > aProps( 1 ); aProps[ 0 ] = PROPERTY_URL; ucbhelper::cancelCommandExecution( makeAny( MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), Environment ); @@ -1388,13 +1388,13 @@ sal_Bool ODocumentDefinition::saveAs() try { Reference< XStorage> xStorage = getContainerStorage(); - const static ::rtl::OUString sBaseName("Obj"); + const static OUString sBaseName("Obj"); Reference xElements(xStorage,UNO_QUERY_THROW); - ::rtl::OUString sPersistentName = ::dbtools::createUniqueName(xElements,sBaseName); + OUString sPersistentName = ::dbtools::createUniqueName(xElements,sBaseName); xStorage->copyElementTo(m_pImpl->m_aProps.sPersistentName,xStorage,sPersistentName); - ::rtl::OUString sOldName = m_pImpl->m_aProps.aTitle; + OUString sOldName = m_pImpl->m_aProps.aTitle; rename(pDocuSave->getName()); updateDocumentTitle(); @@ -1498,7 +1498,7 @@ sal_Bool ODocumentDefinition::objectSupportsEmbeddedScripts() const return bAllowDocumentMacros; } -::rtl::OUString ODocumentDefinition::determineContentType() const +OUString ODocumentDefinition::determineContentType() const { return lcl_determineContentType_nothrow( getContainerStorage(), m_pImpl->m_aProps.sPersistentName ); } @@ -1614,7 +1614,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_ if ( xStorage.is() ) { Reference< XEmbeddedObjectCreator> xEmbedFactory = OOoEmbeddedObjectFactory::create(m_aContext); - ::rtl::OUString sDocumentService; + OUString sDocumentService; sal_Bool bSetSize = sal_False; sal_Int32 nEntryConnectionMode = EntryInitModes::DEFAULT_INIT; Sequence< sal_Int8 > aClassID = _aClassID; @@ -1632,7 +1632,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_ { // we seem to be a "new style" report, check if report extension is present. Reference< XContentEnumerationAccess > xEnumAccess( m_aContext->getServiceManager(), UNO_QUERY ); - const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_aContext); + const OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_aContext); Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(sReportEngineServiceName); if ( !xEnumDrivers.is() || !xEnumDrivers->hasMoreElements() ) { @@ -1879,7 +1879,7 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor Reference< XComponent > xComponent; try { - ::rtl::OUString sName( impl_getHierarchicalName( false ) ); + OUString sName( impl_getHierarchicalName( false ) ); sal_Int32 nObjectType = m_bForm ? DatabaseObject::FORM : DatabaseObject::REPORT; aGuard.clear(); @@ -1891,7 +1891,7 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + OUString(), *this, ::cppu::getCaughtException() ); } return xComponent; } @@ -1938,7 +1938,7 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + OUString(), *this, ::cppu::getCaughtException() ); } } @@ -1955,27 +1955,27 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + OUString(), *this, ::cppu::getCaughtException() ); } return bSuccess; } -::rtl::OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException) +OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return impl_getHierarchicalName( false ); } -::rtl::OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const ::rtl::OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException) +OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( getHierarchicalName() ); aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( i_rRelativeName ); return aBuffer.makeStringAndClear(); } -void SAL_CALL ODocumentDefinition::rename( const ::rtl::OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException) { try { @@ -2104,7 +2104,7 @@ void ODocumentDefinition::fillReportData( const Reference< XComponentContext >& void ODocumentDefinition::updateDocumentTitle() { - ::rtl::OUString sName = m_pImpl->m_aProps.aTitle; + OUString sName = m_pImpl->m_aProps.aTitle; if ( m_pImpl->m_pDataSource ) { if ( sName.isEmpty() ) @@ -2115,7 +2115,7 @@ void ODocumentDefinition::updateDocumentTitle() sName = DBACORE_RESSTRING( RID_STR_REPORT ); Reference< XUntitledNumbers > xUntitledProvider(m_pImpl->m_pDataSource->getModel_noCreate(), UNO_QUERY ); if ( xUntitledProvider.is() ) - sName += ::rtl::OUString::valueOf( xUntitledProvider->leaseNumber(getComponent()) ); + sName += OUString::valueOf( xUntitledProvider->leaseNumber(getComponent()) ); } Reference< XTitle > xDatabaseDocumentModel(m_pImpl->m_pDataSource->getModel_noCreate(),uno::UNO_QUERY); @@ -2159,7 +2159,7 @@ void ODocumentDefinition::firePropertyChange( sal_Int32 i_nHandle, const Any& i_ // ============================================================================= // NameChangeNotifier // ============================================================================= -NameChangeNotifier::NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, const ::rtl::OUString& i_rNewName, +NameChangeNotifier::NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, const OUString& i_rNewName, ::osl::ResettableMutexGuard& i_rClearForNotify ) :m_rDocumentDefinition( i_rDocumentDefinition ) ,m_aOldValue( makeAny( i_rDocumentDefinition.getCurrentName() ) ) diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index f9e6f71519eb..b3630dfb5f9f 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -121,8 +121,8 @@ public: virtual ::sal_Bool SAL_CALL close( ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XHierarchicalName - virtual ::rtl::OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL composeHierarchicalName( const ::rtl::OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -131,7 +131,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException) ; // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // XCloseListener virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException); @@ -173,20 +173,20 @@ public: static ::com::sun::star::uno::Sequence< sal_Int8 > getDefaultDocumentTypeClassId(); - static ::rtl::OUString GetDocumentServiceFromMediaType( - const ::rtl::OUString& _rMediaType, + static OUString GetDocumentServiceFromMediaType( + const OUString& _rMediaType, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rxContext, ::com::sun::star::uno::Sequence< sal_Int8 >& _rClassId ); - static ::rtl::OUString GetDocumentServiceFromMediaType( + static OUString GetDocumentServiceFromMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rEntityName, + const OUString& _rEntityName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rxContext, ::com::sun::star::uno::Sequence< sal_Int8 >& _rClassId ); struct NotifierAccess { friend class NameChangeNotifier; private: NotifierAccess() { } }; - const ::rtl::OUString& getCurrentName() const { return m_pImpl->m_aProps.aTitle; } + const OUString& getCurrentName() const { return m_pImpl->m_aProps.aTitle; } void firePropertyChange( sal_Int32 i_nHandle, const ::com::sun::star::uno::Any& i_rNewValue, @@ -251,7 +251,7 @@ private: virtual void SAL_CALL disposing(); // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; /** fills the load arguments */ @@ -339,7 +339,7 @@ private: //- commands void onCommandGetDocumentProperties( ::com::sun::star::uno::Any& _rProps ); - void onCommandInsert( const ::rtl::OUString& _sURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( ::com::sun::star::uno::Exception ); + void onCommandInsert( const OUString& _sURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( ::com::sun::star::uno::Exception ); void onCommandPreview( ::com::sun::star::uno::Any& _rImage ); ::com::sun::star::uno::Any onCommandOpenSomething( @@ -356,7 +356,7 @@ class NameChangeNotifier public: NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, - const ::rtl::OUString& i_rNewName, + const OUString& i_rNewName, ::osl::ResettableMutexGuard& i_rClearForNotify ); ~NameChangeNotifier(); diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index 063876e58439..f2d4c32f94a4 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -80,7 +80,7 @@ namespace dbaccess namespace { static void lcl_dispatchScriptURL_throw( DocumentEventExecutor_Data& _rDocExecData, - const ::rtl::OUString& _rScriptURL, const DocumentEvent& _rTrigger ) + const OUString& _rScriptURL, const DocumentEvent& _rTrigger ) { Reference< XModel > xDocument( _rDocExecData.xDocument.get(), UNO_QUERY_THROW ); @@ -104,7 +104,7 @@ namespace dbaccess // we lock the solar mutex here. SolarMutexGuard aSolarGuard; - Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aScriptURL, ::rtl::OUString(), 0 ) ); + Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aScriptURL, OUString(), 0 ) ); if ( !xDispatch.is() ) { OSL_FAIL( "lcl_dispatchScriptURL_throw: no dispatcher for the script URL!" ); @@ -171,10 +171,10 @@ namespace dbaccess const ::comphelper::NamedValueCollection aScriptDescriptor( xDocEvents->getByName( _Event.EventName ) ); - ::rtl::OUString sEventType; + OUString sEventType; bool bScriptAssigned = aScriptDescriptor.get_ensureType( "EventType", sEventType ); - ::rtl::OUString sScript; + OUString sScript; bScriptAssigned = bScriptAssigned && aScriptDescriptor.get_ensureType( "Script", sScript ); if ( !bScriptAssigned ) diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx index 651fb00ef720..18155d0a45a1 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx @@ -107,14 +107,14 @@ namespace dbaccess void onDocumentInitialized(); - void notifyDocumentEvent( const ::rtl::OUString& _EventName, const Reference< XController2 >& _ViewController, + void notifyDocumentEvent( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { impl_notifyEvent_nothrow( DocumentEvent( m_rDocument, _EventName, _ViewController, _Supplement ) ); } - void notifyDocumentEventAsync( const ::rtl::OUString& _EventName, const Reference< XController2 >& _ViewController, + void notifyDocumentEventAsync( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { impl_notifyEventAsync_nothrow( DocumentEvent( @@ -278,13 +278,13 @@ namespace dbaccess m_pImpl->removeDocumentEventListener( _Listener ); } - void DocumentEventNotifier::notifyDocumentEvent( const ::rtl::OUString& _EventName, + void DocumentEventNotifier::notifyDocumentEvent( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { m_pImpl->notifyDocumentEvent( _EventName, _ViewController, _Supplement ); } - void DocumentEventNotifier::notifyDocumentEventAsync( const ::rtl::OUString& _EventName, + void DocumentEventNotifier::notifyDocumentEventAsync( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { m_pImpl->notifyDocumentEventAsync( _EventName, _ViewController, _Supplement ); diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx index 4b4a68537ebf..cd365ed91d24 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx @@ -72,7 +72,7 @@ namespace dbaccess ->onDocumentInitialized has been called */ void notifyDocumentEvent( - const ::rtl::OUString& _EventName, + const OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _rxViewController = NULL, const ::com::sun::star::uno::Any& _Supplement = ::com::sun::star::uno::Any() ); @@ -85,7 +85,7 @@ namespace dbaccess the mutex is locked */ void notifyDocumentEventAsync( - const ::rtl::OUString& _EventName, + const OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController = NULL, const ::com::sun::star::uno::Any& _Supplement = ::com::sun::star::uno::Any() ); @@ -103,7 +103,7 @@ namespace dbaccess const ::com::sun::star::uno::Any& _rSupplement = ::com::sun::star::uno::Any() ) { - notifyDocumentEvent( ::rtl::OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); + notifyDocumentEvent( OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); } /** notifies a document event to all registered listeners, asynchronously @@ -119,7 +119,7 @@ namespace dbaccess const ::com::sun::star::uno::Any& _rSupplement = ::com::sun::star::uno::Any() ) { - notifyDocumentEventAsync( ::rtl::OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); + notifyDocumentEventAsync( OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); } private: diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index 65f54ffa6f02..41a7e416ad37 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -117,7 +117,7 @@ namespace dbaccess const DocumentEventData* pEventData = lcl_getDocumentEventData(); while ( pEventData->pAsciiEventName ) { - ::rtl::OUString sEventName = ::rtl::OUString::createFromAscii( pEventData->pAsciiEventName ); + OUString sEventName = OUString::createFromAscii( pEventData->pAsciiEventName ); DocumentEventsData::iterator existingPos = m_pData->rEventsData.find( sEventName ); if ( existingPos == m_pData->rEventsData.end() ) m_pData->rEventsData[ sEventName ] = Sequence< PropertyValue >(); @@ -139,7 +139,7 @@ namespace dbaccess m_pData->rParent.release(); } - bool DocumentEvents::needsSynchronousNotification( const ::rtl::OUString& _rEventName ) + bool DocumentEvents::needsSynchronousNotification( const OUString& _rEventName ) { const DocumentEventData* pEventData = lcl_getDocumentEventData(); while ( pEventData->pAsciiEventName ) @@ -153,7 +153,7 @@ namespace dbaccess return false; } - void SAL_CALL DocumentEvents::replaceByName( const ::rtl::OUString& _Name, const Any& _Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + void SAL_CALL DocumentEvents::replaceByName( const OUString& _Name, const Any& _Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); @@ -170,14 +170,14 @@ namespace dbaccess ::comphelper::NamedValueCollection aCheck( aEventDescriptor ); if ( aCheck.has( "EventType" ) ) { - ::rtl::OUString sEventType = aCheck.getOrDefault( "EventType", ::rtl::OUString() ); + OUString sEventType = aCheck.getOrDefault( "EventType", OUString() ); OSL_ENSURE( !sEventType.isEmpty(), "DocumentEvents::replaceByName: doing a reset via an empty EventType is weird!" ); if ( sEventType.isEmpty() ) aEventDescriptor.realloc( 0 ); } if ( aCheck.has( "Script" ) ) { - ::rtl::OUString sScript = aCheck.getOrDefault( "Script", ::rtl::OUString() ); + OUString sScript = aCheck.getOrDefault( "Script", OUString() ); OSL_ENSURE( !sScript.isEmpty(), "DocumentEvents::replaceByName: doing a reset via an empty Script is weird!" ); if ( sScript.isEmpty() ) aEventDescriptor.realloc( 0 ); @@ -186,7 +186,7 @@ namespace dbaccess elementPos->second = aEventDescriptor; } - Any SAL_CALL DocumentEvents::getByName( const ::rtl::OUString& _Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL DocumentEvents::getByName( const OUString& _Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); @@ -201,11 +201,11 @@ namespace dbaccess return aReturn; } - Sequence< ::rtl::OUString > SAL_CALL DocumentEvents::getElementNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DocumentEvents::getElementNames( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); - Sequence< ::rtl::OUString > aNames( m_pData->rEventsData.size() ); + Sequence< OUString > aNames( m_pData->rEventsData.size() ); ::std::transform( m_pData->rEventsData.begin(), m_pData->rEventsData.end(), @@ -215,7 +215,7 @@ namespace dbaccess return aNames; } - ::sal_Bool SAL_CALL DocumentEvents::hasByName( const ::rtl::OUString& _Name ) throw (RuntimeException) + ::sal_Bool SAL_CALL DocumentEvents::hasByName( const OUString& _Name ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx index 1ed70b454283..12bd8b8fc5f4 100644 --- a/dbaccess/source/core/dataaccess/documentevents.hxx +++ b/dbaccess/source/core/dataaccess/documentevents.hxx @@ -32,7 +32,7 @@ namespace dbaccess { - typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > + typedef ::std::map< OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > DocumentEventsData; //==================================================================== @@ -50,19 +50,19 @@ namespace dbaccess DocumentEvents( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, DocumentEventsData& _rEventsData ); ~DocumentEvents(); - static bool needsSynchronousNotification( const ::rtl::OUString& _rEventName ); + static bool needsSynchronousNotification( const OUString& _rEventName ); // XInterface virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index cff678137762..af3587b16608 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -311,7 +311,7 @@ void SAL_CALL OInterceptor::removeStatusListener( //XInterceptorInfo -Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) +Sequence< OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) { // now implemented as update return m_aInterceptedURL; @@ -320,12 +320,12 @@ Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) thro // XDispatchProvider -Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,const ::rtl::OUString& TargetFrameName,sal_Int32 SearchFlags ) +Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,const OUString& TargetFrameName,sal_Int32 SearchFlags ) throw (RuntimeException) { osl::MutexGuard aGuard(m_aMutex); - const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const OUString* pIter = m_aInterceptedURL.getConstArray(); + const OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( _URL.Complete == *pIter ) @@ -349,8 +349,8 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons for(sal_Int32 i = 0; i < Requests.getLength(); ++i) { - const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const OUString* pIter = m_aInterceptedURL.getConstArray(); + const OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( Requests[i].FeatureURL.Complete == *pIter ) diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 6229d55d8d6f..0bacec5a7aee 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -75,7 +75,7 @@ public: ); //XInterceptorInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getInterceptedURLs( ) throw ( ::com::sun::star::uno::RuntimeException @@ -86,7 +86,7 @@ public: ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( ::com::sun::star::uno::RuntimeException @@ -146,7 +146,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatchProvider; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aInterceptedURL; + ::com::sun::star::uno::Sequence< OUString > m_aInterceptedURL; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; PropertyChangeListenerContainer* m_pStatCL; diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index b34e981e95df..a8aee2ad40ce 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -50,7 +50,7 @@ namespace dbaccess struct ResultListEntry { - rtl::OUString aId; + OUString aId; Reference< XContentIdentifier > xId; ::rtl::Reference< OContentHelper > xContent; Reference< XRow > xRow; @@ -125,13 +125,13 @@ DataSupplier::~DataSupplier() DBG_DTOR(DataSupplier,NULL); } -rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( (size_t)nIndex < m_pImpl->m_aResults.size() ) { - rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; if ( !aId.isEmpty() ) { // Already cached. @@ -151,7 +151,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) m_pImpl->m_aResults[ nIndex ]->aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } Reference< XContentIdentifier > @@ -169,7 +169,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { Reference< XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( aId ); @@ -200,7 +200,7 @@ DataSupplier::queryContent( sal_uInt32 _nIndex ) try { Reference< XContent > xContent; - ::rtl::OUString sName = xId->getContentIdentifier(); + OUString sName = xId->getContentIdentifier(); sal_Int32 nIndex = sName.lastIndexOf('/') + 1; sName = sName.getToken(0,'/',nIndex); @@ -239,11 +239,11 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) sal_uInt32 nPos = nOldCount; // @@@ Obtain data and put it into result list... - Sequence< ::rtl::OUString> aSeq = m_pImpl->m_xContent->getElementNames(); + Sequence< OUString> aSeq = m_pImpl->m_xContent->getElementNames(); if ( nIndex < sal::static_int_cast< sal_uInt32 >( aSeq.getLength() ) ) { - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(pIter = pIter + nPos;pIter != pEnd;++pIter,++nPos) { m_pImpl->m_aResults.push_back( @@ -288,9 +288,9 @@ sal_uInt32 DataSupplier::totalCount() sal_uInt32 nOldCount = m_pImpl->m_aResults.size(); // @@@ Obtain data and put it into result list... - Sequence< ::rtl::OUString> aSeq = m_pImpl->m_xContent->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + Sequence< OUString> aSeq = m_pImpl->m_xContent->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) m_pImpl->m_aResults.push_back( new ResultListEntry( m_pImpl->m_xContent->getContent(*pIter)->getContentProperties() ) ); diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index 0274d5cc2025..d5a8b2bb770a 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -38,7 +38,7 @@ public: sal_Int32 nOpenMode ); virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index 4d0eeebc8f20..7ccdc646a0ee 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -41,7 +41,7 @@ namespace dbaccess { private: typedef ::rtl::Reference< OPropertyForward > TPropertyForward; - typedef ::std::map< ::rtl::OUString, TPropertyForward > PropertyForwardList; + typedef ::std::map< OUString, TPropertyForward > PropertyForwardList; PropertyForwardList m_aForwardList; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xSettings; // can not be weak ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak @@ -62,7 +62,7 @@ namespace dbaccess virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); - void notifyElementCreated(const ::rtl::OUString& _sElementName + void notifyElementCreated(const OUString& _sElementName ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xElement); private: @@ -74,7 +74,7 @@ namespace dbaccess /** initializes the properties of the given object from its counterpart in our settings container */ void impl_initSettings_nothrow( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDestination ); }; diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 0c352f26ad3e..654d455022ba 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -46,13 +46,13 @@ namespace dbaccess class ODatabaseModelImpl; struct ContentProperties { - ::rtl::OUString aTitle; // Title - ::boost::optional< ::rtl::OUString > + OUString aTitle; // Title + ::boost::optional< OUString > aContentType; // ContentType (aka MediaType aka MimeType) sal_Bool bIsDocument; // IsDocument sal_Bool bIsFolder; // IsFolder sal_Bool bAsTemplate; // AsTemplate - ::rtl::OUString sPersistentName;// persistent name of the document + OUString sPersistentName;// persistent name of the document ContentProperties() :bIsDocument( sal_True ) @@ -75,8 +75,8 @@ namespace dbaccess typedef ::boost::shared_ptr TContentPtr; - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, - ::rtl::OUStringHash, + typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, + OUStringHash, ::comphelper::UStringEqual > PropertyChangeListenerContainer; typedef ::comphelper::OBaseMutex OContentHelper_MBASE; @@ -103,7 +103,7 @@ namespace dbaccess getProperties( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - void impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify = true); + void impl_rename_throw(const OUString& _sNewName,bool _bNotify = true); protected: ::cppu::OInterfaceContainerHelper m_aContentListeners; @@ -128,7 +128,7 @@ namespace dbaccess */ void notifyPropertiesChange( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyChangeEvent >& evt ) const; - ::rtl::OUString impl_getHierarchicalName( bool _includingRootContainer ) const; + OUString impl_getHierarchicalName( bool _includingRootContainer ) const; public: @@ -141,13 +141,13 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); // XContent virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getContentType( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getContentType( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL addContentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentEventListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL removeContentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentEventListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; @@ -157,12 +157,12 @@ namespace dbaccess virtual void SAL_CALL abort( sal_Int32 CommandId ) throw (::com::sun::star::uno::RuntimeException) ; // XPropertiesChangeNotifier - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; // XPropertyContainer - virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL removeProperty( const ::rtl::OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException) ; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -176,7 +176,7 @@ namespace dbaccess virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); inline const ContentProperties& getContentProperties() const { return m_pImpl->m_aProps; } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > @@ -188,7 +188,7 @@ namespace dbaccess inline TContentPtr getImpl() const { return m_pImpl; } protected: - virtual ::rtl::OUString determineContentType() const = 0; + virtual OUString determineContentType() const = 0; }; } // namespace dbaccess diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 5c20906b9ee0..c22ad531f2fd 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -57,8 +57,8 @@ public: explicit DatabaseDataProvider(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); @@ -71,65 +71,65 @@ private: { TDatabaseDataProvider::release(); } // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::chart2::data::XDataProvider: virtual ::sal_Bool SAL_CALL createDataSourcePossible(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aArguments) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xDataSource) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(const ::rtl::OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(const ::rtl::OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); + virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(const OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(const OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::chart2::data::XRangeXMLConversion: - virtual ::rtl::OUString SAL_CALL convertRangeToXML(const ::rtl::OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); - virtual ::rtl::OUString SAL_CALL convertRangeFromXML(const ::rtl::OUString & aXMLRange) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); + virtual OUString SAL_CALL convertRangeToXML(const OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); + virtual OUString SAL_CALL convertRangeFromXML(const OUString & aXMLRange) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); // ::com::sun::star::beans::XPropertySet: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & aPropertyName, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); // ::com::sun::star::chart2::data::XDatabaseDataProvider: - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getMasterFields() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMasterFields(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getDetailFields() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDetailFields(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCommand(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMasterFields(const ::com::sun::star::uno::Sequence< OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDetailFields(const ::com::sun::star::uno::Sequence< OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCommand(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCommandType() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setCommandType(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilter(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilter(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getApplyFilter() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setApplyFilter( ::sal_Bool _applyfilter ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getHavingClause() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHavingClause( const ::rtl::OUString& _havingclause ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getGroupBy() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroupBy( const ::rtl::OUString& _groupby ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOrder() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOrder( const ::rtl::OUString& _order ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHavingClause() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHavingClause( const OUString& _havingclause ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getGroupBy() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroupBy( const OUString& _groupby ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getOrder() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setOrder( const OUString& _order ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getEscapeProcessing() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setEscapeProcessing(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getRowLimit() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRowLimit( ::sal_Int32 _rowlimit ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getActiveConnection() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setActiveConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); - virtual ::rtl::OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataSourceName( const ::rtl::OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException); // com::sun::star::sdbc::XParameters virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -137,7 +137,7 @@ private: virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -182,18 +182,18 @@ private: virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // ____ XComplexDescriptionAccess ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -214,11 +214,11 @@ private: void impl_fillRowSet_throw(); void impl_executeRowSet_throw(::osl::ResettableMutexGuard& _rClearForNotifies); bool impl_fillParameters_nothrow( ::osl::ResettableMutexGuard& _rClearForNotifies); - void impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const ::com::sun::star::uno::Sequence< ::rtl::OUString >& i_aColumnNames); + void impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const ::com::sun::star::uno::Sequence< OUString >& i_aColumnNames); void impl_invalidateParameter_nothrow(); - ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const; + ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const OUString & _sRangeRepresentation) const; - template void set( const ::rtl::OUString& _sProperty + template void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -236,7 +236,7 @@ private: ::dbtools::ParameterManager m_aParameterManager; ::dbtools::FilterManager m_aFilterManager; - ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any> m_aNumberFormats; + ::std::map< OUString, ::com::sun::star::uno::Any> m_aNumberFormats; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; @@ -249,17 +249,17 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xAggregateSet; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_MasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_DetailFields; + ::com::sun::star::uno::Sequence< OUString > m_MasterFields; + ::com::sun::star::uno::Sequence< OUString > m_DetailFields; - ::rtl::OUString m_Command; - ::rtl::OUString m_DataSourceName; + OUString m_Command; + OUString m_DataSourceName; ::sal_Int32 m_CommandType; sal_Int32 m_RowLimit; - ::rtl::OUString m_Filter; - ::rtl::OUString m_HavingClause; - ::rtl::OUString m_Order; - ::rtl::OUString m_GroupBy; + OUString m_Filter; + OUString m_HavingClause; + OUString m_Order; + OUString m_GroupBy; ::sal_Bool m_EscapeProcessing; ::sal_Bool m_ApplyFilter; }; diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx index 049bdbc15103..a166cf977338 100644 --- a/dbaccess/source/core/inc/FilteredContainer.hxx +++ b/dbaccess/source/core/inc/FilteredContainer.hxx @@ -51,7 +51,7 @@ namespace dbaccess /** returns a string denoting the only type of tables allowed in this container, or an empty string if there is no such restriction */ - virtual ::rtl::OUString getTableTypeRestriction() const = 0; + virtual OUString getTableTypeRestriction() const = 0; inline virtual void addMasterContainerListener(){} inline virtual void removeMasterContainerListener(){} @@ -59,7 +59,7 @@ namespace dbaccess // ::connectivity::sdbcx::OCollection virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString getNameForObject(const ::connectivity::sdbcx::ObjectType& _xObject); + virtual OUString getNameForObject(const ::connectivity::sdbcx::ObjectType& _xObject); /** tell the container to free all elements and all additional resources.
      After using this method the object may be reconstructed by calling one of the constrcuct methods. @@ -87,7 +87,7 @@ namespace dbaccess /** retrieve a table type filter to pass to XDatabaseMetaData::getTables, according to the current data source settings */ - void getAllTableTypeFilter( ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rFilter ) const; + void getAllTableTypeFilter( ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rFilter ) const; public: /** ctor of the container. The parent has to support the XConnection @@ -114,8 +114,8 @@ namespace dbaccess filters given (the connection is the parent object you passed in the ctor). */ void construct( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableTypeFilter + const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter, + const ::com::sun::star::uno::Sequence< OUString >& _rTableTypeFilter ); /** late ctor. The container will fill itself with wrapper objects for the tables returned by the given @@ -123,8 +123,8 @@ namespace dbaccess */ void construct( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxMasterContainer, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableTypeFilter + const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter, + const ::com::sun::star::uno::Sequence< OUString >& _rTableTypeFilter ); inline sal_Bool isInitialized() const { return m_bConstructed; } diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index a8edf951da03..df40f3383931 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -43,7 +43,7 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDestContainer; - ::rtl::OUString m_sName; + OUString m_sName; sal_Bool m_bInInsert; protected: @@ -52,8 +52,8 @@ namespace dbaccess public: OPropertyForward( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSource, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xDestContainer, - const ::rtl::OUString& _sName, - const ::std::vector< ::rtl::OUString >& _aPropertyList + const OUString& _sName, + const ::std::vector< OUString >& _aPropertyList ); // ::com::sun::star::beans::XPropertyChangeListener @@ -62,7 +62,7 @@ namespace dbaccess // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException); - inline void setName( const ::rtl::OUString& _sName ) { m_sName = _sName; } + inline void setName( const OUString& _sName ) { m_sName = _sName; } void setDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDest); inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDefinition() const { return m_xDest; } }; diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index b68cbc802854..314c05b18c2a 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -83,7 +83,7 @@ namespace dbaccess ::std::vector m_aColumnsCollection; // used for columns and parameters of old queries ::std::vector m_aTablesCollection; - ::std::vector< ::rtl::OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement + ::std::vector< OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; @@ -97,15 +97,15 @@ namespace dbaccess ::std::vector m_aCurrentColumns; OPrivateTables* m_pTables; // currently used tables - ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having - ::rtl::OUString m_sDecimalSep; - ::rtl::OUString m_sCommand; + OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having + OUString m_sDecimalSep; + OUString m_sCommand; ::com::sun::star::lang::Locale m_aLocale; sal_Int32 m_nBoolCompareMode; // how to compare bool values sal_Int32 m_nCommandType; // - ::rtl::OUString m_sOrignal; + OUString m_sOrignal; // @@ -116,8 +116,8 @@ namespace dbaccess sal_Bool setComparsionPredicate(::connectivity::OSQLParseNode* pCondition, ::connectivity::OSQLParseTreeIterator& _rIterator, ::std::vector < ::com::sun::star::beans::PropertyValue > & rFilters, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const; - ::rtl::OUString getColumnName(::connectivity::OSQLParseNode* pColumnRef,::connectivity::OSQLParseTreeIterator& _rIterator) const; - ::rtl::OUString getTableAlias(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) const; + OUString getColumnName(::connectivity::OSQLParseNode* pColumnRef,::connectivity::OSQLParseTreeIterator& _rIterator) const; + OUString getTableAlias(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) const; sal_Int32 getPredicateType(::connectivity::OSQLParseNode * _pPredicate) const; // clears all Columns,Parameters and tables and insert it to their vectors void clearCurrentCollections(); @@ -128,12 +128,12 @@ namespace dbaccess @param _rIterator the iterator to use. */ - ::rtl::OUString getStatementPart( TGetParseNode& _aGetFunctor, ::connectivity::OSQLParseTreeIterator& _rIterator ); - void setQuery_Impl( const ::rtl::OUString& command ); + OUString getStatementPart( TGetParseNode& _aGetFunctor, ::connectivity::OSQLParseTreeIterator& _rIterator ); + void setQuery_Impl( const OUString& command ); void setConditionByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column , sal_Bool andCriteria - ,::std::mem_fun1_t& _aSetFunctor + ,::std::mem_fun1_t& _aSetFunctor ,sal_Int32 filterOperator); /** getStructuredCondition returns the structured condition for the where or having clause @@ -150,8 +150,8 @@ namespace dbaccess setCurrentColumns( EColumnType _eType, const ::rtl::Reference< ::connectivity::OSQLColumns >& _rCols ); //helper methods for mem_fun_t - inline bool implSetFilter(::rtl::OUString _sFilter) { setFilter(_sFilter); return true;} - inline bool implSetHavingClause(::rtl::OUString _sFilter) { setHavingClause(_sFilter); return true;} + inline bool implSetFilter(OUString _sFilter) { setFilter(_sFilter); return true;} + inline bool implSetHavingClause(OUString _sFilter) { setHavingClause(_sFilter); return true;} /** returns the part of the seelect statement @param _ePart @@ -164,23 +164,23 @@ namespace dbaccess @return The part of the select statement. */ - ::rtl::OUString getSQLPart( SQLPart _ePart, ::connectivity::OSQLParseTreeIterator& _rIterator, sal_Bool _bWithKeyword ); + OUString getSQLPart( SQLPart _ePart, ::connectivity::OSQLParseTreeIterator& _rIterator, sal_Bool _bWithKeyword ); /** retrieves the keyword for the given SQLPart */ - ::rtl::OUString getKeyword( SQLPart _ePart ) const; + OUString getKeyword( SQLPart _ePart ) const; /** sets a single "additive" clause, means a filter/groupby/having/order clause */ - void setSingleAdditiveClause( SQLPart _ePart, const ::rtl::OUString& _rClause ); + void setSingleAdditiveClause( SQLPart _ePart, const OUString& _rClause ); /** composes a statement from m_aPureSelectSQL and the 4 usual clauses */ - ::rtl::OUString composeStatementFromParts( const ::std::vector< ::rtl::OUString >& _rParts ); + OUString composeStatementFromParts( const ::std::vector< OUString >& _rParts ); /** return the name of the column. */ - ::rtl::OUString impl_getColumnName_throw(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column); + OUString impl_getColumnName_throw(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column); protected: virtual ~OSingleSelectQueryComposer(); @@ -206,32 +206,32 @@ namespace dbaccess DECLARE_PROPERTYCONTAINER_DEFAULTS(); // ::com::sun::star::sdb::XSingleSelectQueryComposer - virtual ::rtl::OUString SAL_CALL getElementaryQuery() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setElementaryQuery( const ::rtl::OUString& _rElementary ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilter( const ::rtl::OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getElementaryQuery() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setElementaryQuery( const OUString& _rElementary ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilter( const OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setStructuredFilter( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendFilterByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendGroupByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroup( const ::rtl::OUString& group ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHavingClause( const ::rtl::OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroup( const OUString& group ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHavingClause( const OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setStructuredHavingClause( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendHavingClauseByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendOrderByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool ascending ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOrder( const ::rtl::OUString& order ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setOrder( const OUString& order ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XSingleSelectQueryAnalyzer - virtual ::rtl::OUString SAL_CALL getQuery( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setQuery( const ::rtl::OUString& command ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCommand( const ::rtl::OUString& command,sal_Int32 CommandType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFilter( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getQuery( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setQuery( const OUString& command ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCommand( const OUString& command,sal_Int32 CommandType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFilter( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getStructuredFilter( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getGroup( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getGroup( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getGroupColumns( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getHavingClause( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHavingClause( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getStructuredHavingClause( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOrder( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getOrder( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getOrderColumns( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getQueryWithSubstitution( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getQueryWithSubstitution( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index e6b180c33c94..4e6b6b042e70 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -80,10 +80,10 @@ namespace dbaccess ::connectivity::sdbcx::OCollection* m_pTables; // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); - virtual void columnDropped(const ::rtl::OUString& _sName); + virtual void columnDropped(const OUString& _sName); virtual void refreshColumns(); @@ -142,15 +142,15 @@ namespace dbaccess // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XRename, - virtual void SAL_CALL rename( const ::rtl::OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XAlterTable, - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx index c4a45a04b423..69d4f45975ce 100644 --- a/dbaccess/source/core/inc/View.hxx +++ b/dbaccess/source/core/inc/View.hxx @@ -43,9 +43,9 @@ namespace dbaccess View( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, sal_Bool _bCaseSensitive, - const ::rtl::OUString& _rCatalogName, - const ::rtl::OUString& _rSchemaName, - const ::rtl::OUString& _rName + const OUString& _rCatalogName, + const OUString& _rSchemaName, + const OUString& _rName ); // UNO @@ -53,7 +53,7 @@ namespace dbaccess DECLARE_XTYPEPROVIDER() // XAlterView - virtual void SAL_CALL alterCommand( const ::rtl::OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterCommand( const OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: virtual ~View(); diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx index c01a58fa4f45..1e4ef26b63df 100644 --- a/dbaccess/source/core/inc/callablestatement.hxx +++ b/dbaccess/source/core/inc/callablestatement.hxx @@ -47,16 +47,16 @@ namespace dbaccess virtual void SAL_CALL release() throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XOutParameters - virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index 1619c0429672..fb048127269f 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -74,7 +74,7 @@ namespace dbaccess protected: // - ::rtl::OUString m_sName; + OUString m_sName; // protected: @@ -99,21 +99,21 @@ namespace dbaccess virtual void SAL_CALL disposing(void); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& _rName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& _rName ) throw(::com::sun::star::uno::RuntimeException); virtual void fireValueChange( const ::connectivity::ORowSetValue& _rOldValue ); protected: // IPropertyContainer - virtual void registerProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType ); - virtual void registerMayBeVoidProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType ); - virtual void registerPropertyNoMember( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue ); + virtual void registerProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType ); + virtual void registerMayBeVoidProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType ); + virtual void registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue ); }; //============================================================ @@ -125,7 +125,7 @@ namespace dbaccess /** creates a OColumn object which should represent the column with a given name */ virtual OColumn* - createColumn( const ::rtl::OUString& _rName ) const = 0; + createColumn( const OUString& _rName ) const = 0; /** creates a column descriptor object. @@ -140,7 +140,7 @@ namespace dbaccess /** notifies that a column with a given name has been dropped */ - virtual void columnDropped( const ::rtl::OUString& _sName ) = 0; + virtual void columnDropped( const OUString& _sName ) = 0; protected: ~IColumnFactory() {} @@ -151,7 +151,7 @@ namespace dbaccess //= general columns map, could be used for readonly access //= no appending and dropping is supported //============================================================ - typedef ::boost::unordered_map OColumnMap; + typedef ::boost::unordered_map OColumnMap; typedef ::std::vector OColumnArray; class OContainerMediator; @@ -175,13 +175,13 @@ namespace dbaccess sal_Bool m_bDropColumn : 1; virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: - connectivity::sdbcx::ObjectType createBaseObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType createBaseObject(const OUString& _rName) { return OColumns_BASE::createObject(_rName); } @@ -203,7 +203,7 @@ namespace dbaccess ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, sal_Bool _bCaseSensitive, - const ::std::vector< ::rtl::OUString>& _rVector, + const ::std::vector< OUString>& _rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn = sal_False, @@ -215,7 +215,7 @@ namespace dbaccess ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxDrvColumns, sal_Bool _bCaseSensitive, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn = sal_False, @@ -231,15 +231,15 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - void append(const ::rtl::OUString& rName, OColumn*); + void append(const OUString& rName, OColumn*); void clearColumns(); // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx index fada42c84a34..7f37e12b4e11 100644 --- a/dbaccess/source/core/inc/columnsettings.hxx +++ b/dbaccess/source/core/inc/columnsettings.hxx @@ -30,7 +30,7 @@ namespace dbaccess { public: virtual void registerProperty( - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, @@ -38,7 +38,7 @@ namespace dbaccess ) = 0; virtual void registerMayBeVoidProperty( - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, @@ -46,7 +46,7 @@ namespace dbaccess ) = 0; virtual void registerPropertyNoMember( - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx index 165148e49485..a1c2a9240a9c 100644 --- a/dbaccess/source/core/inc/commandbase.hxx +++ b/dbaccess/source/core/inc/commandbase.hxx @@ -36,11 +36,11 @@ public: // need public access // ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; - ::rtl::OUString m_sCommand; + OUString m_sCommand; sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer - ::rtl::OUString m_sUpdateTableName; - ::rtl::OUString m_sUpdateSchemaName; - ::rtl::OUString m_sUpdateCatalogName; + OUString m_sUpdateTableName; + OUString m_sUpdateSchemaName; + OUString m_sUpdateCatalogName; // protected: diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx index 5549a7049152..1cd475b4833b 100644 --- a/dbaccess/source/core/inc/composertools.hxx +++ b/dbaccess/source/core/inc/composertools.hxx @@ -31,7 +31,7 @@ namespace dbaccess //==================================================================== //= TokenComposer //==================================================================== - struct TokenComposer : public ::std::unary_function< ::rtl::OUString, void > + struct TokenComposer : public ::std::unary_function< OUString, void > { private: #ifdef DBG_UTIL @@ -39,10 +39,10 @@ namespace dbaccess #endif protected: - ::rtl::OUStringBuffer m_aBuffer; + OUStringBuffer m_aBuffer; public: - ::rtl::OUString getComposedAndClear() + OUString getComposedAndClear() { #ifdef DBG_UTIL m_bUsed = true; @@ -70,12 +70,12 @@ namespace dbaccess { } - void operator() (const ::rtl::OUString& lhs) + void operator() (const OUString& lhs) { append(lhs); } - void append( const ::rtl::OUString& lhs ) + void append( const OUString& lhs ) { #ifdef DBG_UTIL OSL_ENSURE( !m_bUsed, "FilterCreator::append: already used up!" ); @@ -90,7 +90,7 @@ namespace dbaccess } /// append the given part. Only to be called when both the part and our buffer so far are not empty - virtual void appendNonEmptyToNonEmpty( const ::rtl::OUString& lhs ) = 0; + virtual void appendNonEmptyToNonEmpty( const OUString& lhs ) = 0; }; //==================================================================== @@ -98,7 +98,7 @@ namespace dbaccess //==================================================================== struct FilterCreator : public TokenComposer { - virtual void appendNonEmptyToNonEmpty( const ::rtl::OUString& lhs ) + virtual void appendNonEmptyToNonEmpty( const OUString& lhs ) { m_aBuffer.insert( 0, (sal_Unicode)' ' ); m_aBuffer.insert( 0, (sal_Unicode)'(' ); @@ -113,7 +113,7 @@ namespace dbaccess //==================================================================== struct OrderCreator : public TokenComposer { - virtual void appendNonEmptyToNonEmpty( const ::rtl::OUString& lhs ) + virtual void appendNonEmptyToNonEmpty( const OUString& lhs ) { m_aBuffer.appendAscii( ", " ); m_aBuffer.append( lhs ); diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx index d3a00c956c8e..0be528513450 100644 --- a/dbaccess/source/core/inc/containerapprove.hxx +++ b/dbaccess/source/core/inc/containerapprove.hxx @@ -53,7 +53,7 @@ namespace dbaccess into the container */ virtual void SAL_CALL approveElement( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) = 0; }; diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index 1061d79316c4..bf161ebf560d 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -40,10 +40,10 @@ class ODataSettings_Base { public: // - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sHavingClause; - ::rtl::OUString m_sGroupBy; - ::rtl::OUString m_sOrder; + OUString m_sFilter; + OUString m_sHavingClause; + OUString m_sGroupBy; + OUString m_sOrder; sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member ! ::com::sun::star::awt::FontDescriptor m_aFont; ::com::sun::star::uno::Any m_aRowHeight; diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index 44d198cd431c..fef0d2c79f67 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -52,10 +52,10 @@ namespace dbaccess protected: // - rtl::OUString m_aTypeName; - rtl::OUString m_aDescription; - rtl::OUString m_aDefaultValue; - rtl::OUString m_aAutoIncrementValue; + OUString m_aTypeName; + OUString m_aDescription; + OUString m_aDefaultValue; + OUString m_aAutoIncrementValue; sal_Int32 m_nType; sal_Int32 m_nPrecision; sal_Int32 m_nScale; @@ -86,8 +86,8 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); @@ -118,13 +118,13 @@ namespace dbaccess virtual ~OTableColumn(); public: - OTableColumn(const ::rtl::OUString& _rName); + OTableColumn(const OUString& _rName); // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -142,11 +142,11 @@ namespace dbaccess ,public OQueryColumn_PBase { // - ::rtl::OUString m_sCatalogName; - ::rtl::OUString m_sSchemaName; - ::rtl::OUString m_sTableName; - ::rtl::OUString m_sRealName; - ::rtl::OUString m_sLabel; + OUString m_sCatalogName; + OUString m_sSchemaName; + OUString m_sTableName; + OUString m_sRealName; + OUString m_sLabel; // ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xOriginalTableColumn; @@ -158,14 +158,14 @@ namespace dbaccess OQueryColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxParserColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString &i_sLabel + const OUString &i_sLabel ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // *Property* virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -221,7 +221,7 @@ namespace dbaccess virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); protected: - ::rtl::OUString impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const; + OUString impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const; protected: using OColumn::getFastPropertyValue; @@ -248,8 +248,8 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // OIdPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; @@ -298,8 +298,8 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // OIdPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index e1ab72f9d960..6a6b3bbb416d 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -46,7 +46,7 @@ namespace dbaccess class ODefinitionContainer_Impl : public OContentHelper_Impl { public: - typedef ::std::map< ::rtl::OUString, TContentPtr > NamedDefinitions; + typedef ::std::map< OUString, TContentPtr > NamedDefinitions; typedef NamedDefinitions::iterator iterator; typedef NamedDefinitions::const_iterator const_iterator; @@ -59,13 +59,13 @@ public: inline const_iterator begin() const { return m_aDefinitions.begin(); } inline const_iterator end() const { return m_aDefinitions.end(); } - inline const_iterator find( const ::rtl::OUString& _rName ) const { return m_aDefinitions.find( _rName ); } + inline const_iterator find( const OUString& _rName ) const { return m_aDefinitions.find( _rName ); } const_iterator find( TContentPtr _pDefinition ) const; - inline void erase( const ::rtl::OUString& _rName ) { m_aDefinitions.erase( _rName ); } + inline void erase( const OUString& _rName ) { m_aDefinitions.erase( _rName ); } void erase( TContentPtr _pDefinition ); - inline void insert( const ::rtl::OUString& _rName, TContentPtr _pDefinition ) + inline void insert( const OUString& _rName, TContentPtr _pDefinition ) { m_aDefinitions.insert( NamedDefinitions::value_type( _rName, _pDefinition ) ); } @@ -165,8 +165,8 @@ public: DECLARE_TYPEPROVIDER( ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); @@ -180,16 +180,16 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); @@ -216,7 +216,7 @@ protected: @return the newly created object or an empty reference if somthing went wrong */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( - const ::rtl::OUString& _rName) = 0; + const OUString& _rName) = 0; /** get the object specified by the given name. If desired, the object will be read if not already done so.
      @param _rName the object name @@ -227,14 +227,14 @@ protected: @see createObject */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > - implGetByName(const ::rtl::OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); + implGetByName(const OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); /** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e. if there is such an object which is not already loaded, it won't be loaded now. @param _rName the object name to check @return sal_True if there already exists such an object */ - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual sal_Bool checkExistence(const OUString& _rName); /** append a new object to the container. No plausibility checks are done, e.g. if the object is non-NULL or if the name is already used by another object or anything like this. This method is for derived classes @@ -248,7 +248,7 @@ protected: @see implRemove */ void implAppend( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject ); @@ -260,7 +260,7 @@ protected: @see implReplace @see implAppend */ - void implRemove(const ::rtl::OUString& _rName); + void implRemove(const OUString& _rName); /** remove a object in the container. No plausibility checks are done, e.g. whether or not there exists an object with the given name or the object is non-NULL. This is the responsibility of the caller.
      @@ -274,7 +274,7 @@ protected: @see implRemove */ void implReplace( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject ); @@ -282,7 +282,7 @@ protected: */ void notifyByName( ::osl::ResettableMutexGuard& _rGuard, - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewElement, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& xOldElement, ContainerOperation _eOperation, @@ -310,7 +310,7 @@ private: if another error occures which prevents insertion of the object into the container */ void approveNewObject( - const ::rtl::OUString& _sName, + const OUString& _sName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxObject ) const; diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx index 68eff1be4637..8a2a077f1867 100644 --- a/dbaccess/source/core/inc/objectnameapproval.hxx +++ b/dbaccess/source/core/inc/objectnameapproval.hxx @@ -68,7 +68,7 @@ namespace dbaccess virtual ~ObjectNameApproval(); // IContainerApprove - virtual void SAL_CALL approveElement( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ); + virtual void SAL_CALL approveElement( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ); }; diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index 300153ce717e..06d8ac0f0a38 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -58,9 +58,9 @@ namespace dbaccess virtual void SAL_CALL release() throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(void); @@ -79,7 +79,7 @@ namespace dbaccess // ::com::sun::star::sdbc::XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -87,7 +87,7 @@ namespace dbaccess virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 0cc4eea8ac75..2ba79a9ee57b 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -47,10 +47,10 @@ namespace dbaccess public OSubComponent, public OQueryComposer_BASE { - ::std::vector< ::rtl::OUString> m_aFilters; - ::std::vector< ::rtl::OUString> m_aOrders; - ::rtl::OUString m_sOrgFilter; - ::rtl::OUString m_sOrgOrder; + ::std::vector< OUString> m_aFilters; + ::std::vector< OUString> m_aOrders; + OUString m_sOrgFilter; + OUString m_sOrgOrder; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xComposer; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xComposerHelper; @@ -72,20 +72,20 @@ namespace dbaccess virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XSQLQueryComposer - virtual ::rtl::OUString SAL_CALL getQuery( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setQuery( const ::rtl::OUString& command ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getComposedQuery( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFilter( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getQuery( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setQuery( const OUString& command ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getComposedQuery( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFilter( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getStructuredFilter( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOrder( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getOrder( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendFilterByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendOrderByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool ascending ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilter( const ::rtl::OUString& filter ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOrder( const ::rtl::OUString& order ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilter( const OUString& filter ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setOrder( const OUString& order ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XTablesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException); // XColumnsSupplier diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index dbd1a735287a..ff89cb4c3688 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -91,8 +91,8 @@ namespace dbaccess }; // ODefinitionContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const ::rtl::OUString& _rName); - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const OUString& _rName); + virtual sal_Bool checkExistence(const OUString& _rName); // helper virtual void SAL_CALL disposing(); @@ -140,7 +140,7 @@ namespace dbaccess virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XDrop - virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dropByName( const OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XElementAccess @@ -148,11 +148,11 @@ namespace dbaccess // ::com::sun::star::container::XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); protected: // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; private: // helper @@ -160,7 +160,7 @@ namespace dbaccess container will be asked for the given name.
      The returned object is acquired once. */ - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const ::rtl::OUString& _rName); + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const OUString& _rName); /// create a query object wrapping a CommandDefinition. The returned object is acquired once. ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxCommandDesc); diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx index 94b258976a78..2bbd99d823bc 100644 --- a/dbaccess/source/core/inc/sdbcoretools.hxx +++ b/dbaccess/source/core/inc/sdbcoretools.hxx @@ -38,7 +38,7 @@ namespace dbaccess /** retrieves a to-be-displayed string for a given caught exception; */ - ::rtl::OUString extractExceptionMessage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, const ::com::sun::star::uno::Any& _rError ); + OUString extractExceptionMessage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, const ::com::sun::star::uno::Any& _rError ); namespace tools { diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index 8f5d489bab05..936ab36de93c 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -152,21 +152,21 @@ public: DECLARE_XTYPEPROVIDER() // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); // XBatchExecution - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -176,7 +176,7 @@ private: /** does escape processing for the given SQL command, if the our EscapeProcessing property allows so. */ - ::rtl::OUString impl_doEscapeProcessing_nothrow( const ::rtl::OUString& _rSQL ) const; + OUString impl_doEscapeProcessing_nothrow( const OUString& _rSQL ) const; bool impl_ensureComposer_nothrow() const; }; diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 51d1d19b7f4c..ff3e179d0114 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -70,10 +70,10 @@ namespace dbaccess virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); - virtual void columnDropped(const ::rtl::OUString& _sName); + virtual void columnDropped(const OUString& _sName); /** creates the column collection for the table @param _rNames @@ -107,11 +107,11 @@ namespace dbaccess */ ODBTable(connectivity::sdbcx::OCollection* _pTables ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn - ,const ::rtl::OUString& _rCatalog - , const ::rtl::OUString& _rSchema - , const ::rtl::OUString& _rName - ,const ::rtl::OUString& _rType - , const ::rtl::OUString& _rDesc + ,const OUString& _rCatalog + , const OUString& _rSchema + , const OUString& _rName + ,const OUString& _rType + , const OUString& _rDesc ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumnDefinitions) throw(::com::sun::star::sdbc::SQLException); @@ -137,10 +137,10 @@ namespace dbaccess virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; // ::com::sun::star::sdbcx::XRename, - virtual void SAL_CALL rename( const ::rtl::OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XAlterTable, - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index 30152ddea9ae..f11dda2612ff 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -57,13 +57,13 @@ namespace dbaccess // OFilteredContainer virtual void addMasterContainerListener(); virtual void removeMasterContainerListener(); - virtual ::rtl::OUString getTableTypeRestriction() const; + virtual OUString getTableTypeRestriction() const; // ::connectivity::sdbcx::OCollection - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); virtual void SAL_CALL disposing(); diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx index 78c7bd137618..0f2a7a9bc5c0 100644 --- a/dbaccess/source/core/inc/veto.hxx +++ b/dbaccess/source/core/inc/veto.hxx @@ -37,13 +37,13 @@ namespace dbaccess class Veto : public Veto_Base { private: - const ::rtl::OUString m_sReason; + const OUString m_sReason; const ::com::sun::star::uno::Any m_aDetails; public: - Veto( const ::rtl::OUString& _rReason, const ::com::sun::star::uno::Any& _rDetails ); + Veto( const OUString& _rReason, const ::com::sun::star::uno::Any& _rDetails ); - virtual ::rtl::OUString SAL_CALL getReason() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getReason() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getDetails() throw (::com::sun::star::uno::RuntimeException); protected: diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index 4d53b542faa6..f91991416c09 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -74,7 +74,7 @@ namespace dbaccess protected: // OFilteredContainer overridables - virtual ::rtl::OUString getTableTypeRestriction() const; + virtual OUString getTableTypeRestriction() const; private: inline virtual void SAL_CALL acquire() throw(){ OFilteredContainer::acquire();} @@ -90,10 +90,10 @@ namespace dbaccess virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // ::connectivity::sdbcx::OCollection - virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual ::connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); using OFilteredContainer::disposing; diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index de4dfa5bc710..d707a618b157 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -110,7 +110,7 @@ void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ::osl::MutexGuard aGuard(m_aMutex); if ( _rEvent.Source == m_xSettings && m_xSettings.is() ) { - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.Accessor >>= sElementName; PropertyForwardList::iterator aFind = m_aForwardList.find(sElementName); if ( aFind != m_aForwardList.end() ) @@ -127,7 +127,7 @@ void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent Reference< XContainer > xContainer = m_xContainer; if ( _rEvent.Source == xContainer && xContainer.is() ) { - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.Accessor >>= sElementName; m_aForwardList.erase(sElementName); try @@ -148,13 +148,13 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent Reference< XContainer > xContainer = m_xContainer; if ( _rEvent.Source == xContainer && xContainer.is() ) { - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.ReplacedElement >>= sElementName; PropertyForwardList::iterator aFind = m_aForwardList.find(sElementName); if ( aFind != m_aForwardList.end() ) { - ::rtl::OUString sNewName; + OUString sNewName; _rEvent.Accessor >>= sNewName; try { @@ -184,7 +184,7 @@ void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) thr } // ----------------------------------------------------------------------------- -void OContainerMediator::impl_initSettings_nothrow( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDestination ) +void OContainerMediator::impl_initSettings_nothrow( const OUString& _rName, const Reference< XPropertySet >& _rxDestination ) { try { @@ -201,7 +201,7 @@ void OContainerMediator::impl_initSettings_nothrow( const ::rtl::OUString& _rNam } // ----------------------------------------------------------------------------- -void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, const Reference< XPropertySet >& _xDest ) +void OContainerMediator::notifyElementCreated( const OUString& _sName, const Reference< XPropertySet >& _xDest ) { if ( !m_xSettings.is() ) return; @@ -215,7 +215,7 @@ void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, co return; } - ::std::vector< ::rtl::OUString > aPropertyList; + ::std::vector< OUString > aPropertyList; try { // initially copy from the settings object (if existent) to the newly created object diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index e84a79df6469..5931c30b2bd6 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -57,7 +57,7 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContex TDatabaseDataProvider(m_aMutex), ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >( context, static_cast< Implements >( - IMPLEMENTS_PROPERTY_SET), uno::Sequence< ::rtl::OUString >()), + IMPLEMENTS_PROPERTY_SET), uno::Sequence< OUString >()), m_aParameterManager( m_aMutex, context ), m_aFilterManager( uno::Reference< lang::XMultiServiceFactory >(context->getServiceManager(),uno::UNO_QUERY) ), m_xContext(context), @@ -112,13 +112,13 @@ OUString DatabaseDataProvider::getImplementationName_Static( ) throw(uno::Runti } // XServiceInfo -::rtl::OUString SAL_CALL DatabaseDataProvider::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- -sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } @@ -131,7 +131,7 @@ uno::Sequence< OUString > DatabaseDataProvider::getSupportedServiceNames_Static( return aSNS; } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } @@ -200,8 +200,8 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat { uno::Reference< chart::XChartDataArray> xChartData( m_xInternal, uno::UNO_QUERY_THROW ); xChartData->setData( uno::Sequence< uno::Sequence< double > >() ); - xChartData->setColumnDescriptions( uno::Sequence< ::rtl::OUString >() ); - if ( m_xInternal->hasDataByRangeRepresentation( ::rtl::OUString::valueOf( sal_Int32(0) ) ) ) + xChartData->setColumnDescriptions( uno::Sequence< OUString >() ); + if ( m_xInternal->hasDataByRangeRepresentation( OUString::valueOf( sal_Int32(0) ) ) ) m_xInternal->deleteSequence(0); } catch( const uno::Exception& ) @@ -211,8 +211,8 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat ::comphelper::NamedValueCollection aArgs( _aArguments ); const sal_Bool bHasCategories = aArgs.getOrDefault( "HasCategories", sal_True ); - uno::Sequence< ::rtl::OUString > aColumnNames = - aArgs.getOrDefault( "ColumnDescriptions", uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aColumnNames = + aArgs.getOrDefault( "ColumnDescriptions", uno::Sequence< OUString >() ); bool bRet = false; if ( !m_Command.isEmpty() && m_xActiveConnection.is() ) @@ -280,20 +280,20 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum } // ----------------------------------------------------------------------------- -::sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const ::rtl::OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException) +::sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException) { return sal_True; } // ----------------------------------------------------------------------------- -uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const +uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const OUString & _sRangeRepresentation) const { - ::std::map< ::rtl::OUString,com::sun::star::uno::Any>::const_iterator aFind = m_aNumberFormats.find(_sRangeRepresentation); + ::std::map< OUString,com::sun::star::uno::Any>::const_iterator aFind = m_aNumberFormats.find(_sRangeRepresentation); if ( aFind != m_aNumberFormats.end() ) return aFind->second; return uno::makeAny(sal_Int32(0)); } // ----------------------------------------------------------------------------- -uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const ::rtl::OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) +uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) { osl::MutexGuard g(m_aMutex); uno::Reference< chart2::data::XDataSequence > xData = m_xInternal->createDataSequenceByRangeRepresentation(_sRangeRepresentation); @@ -306,19 +306,19 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::cre return xData; } -uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException) +uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getComplexRowDescriptions(); } -void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setComplexRowDescriptions(aRowDescriptions); } -uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) +uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getComplexColumnDescriptions(); } -void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< rtl::OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setComplexColumnDescriptions(aColumnDescriptions); } @@ -333,22 +333,22 @@ void SAL_CALL DatabaseDataProvider::setData( const uno::Sequence< uno::Sequence< m_xComplexDescriptionAccess->setData(rDataInRows); } -void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< rtl::OUString >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< OUString >& aRowDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setRowDescriptions(aRowDescriptions); } -void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< rtl::OUString >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< OUString >& aColumnDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setColumnDescriptions(aColumnDescriptions); } -uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getRowDescriptions(); } -uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getColumnDescriptions(); } @@ -387,14 +387,14 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRange } // ----------------------------------------------------------------------------- // chart2::data::XRangeXMLConversion: -::rtl::OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const ::rtl::OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) +OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) { osl::MutexGuard g(m_aMutex); return m_xRangeConversion->convertRangeToXML(_sRangeRepresentation); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const ::rtl::OUString & _sXMLRange) throw (uno::RuntimeException, lang::IllegalArgumentException) +OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const OUString & _sXMLRange) throw (uno::RuntimeException, lang::IllegalArgumentException) { osl::MutexGuard g(m_aMutex); return m_xRangeConversion->convertRangeFromXML(_sXMLRange); @@ -408,72 +408,72 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL DatabaseDataProvider::getProp } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setPropertyValue(const ::rtl::OUString & aPropertyName, const uno::Any & aValue) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::setPropertyValue(const OUString & aPropertyName, const uno::Any & aValue) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::setPropertyValue(aPropertyName, aValue); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const ::rtl::OUString & aPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const OUString & aPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertyValue(aPropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addPropertyChangeListener(aPropertyName, xListener); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removePropertyChangeListener(aPropertyName, xListener); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addVetoableChangeListener(aPropertyName, xListener); } -void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removeVetoableChangeListener(aPropertyName, xListener); } // chart2::data::XDatabaseDataProvider: -uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getMasterFields() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getMasterFields() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_MasterFields; } -void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< ::rtl::OUString > & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< OUString > & the_value) throw (uno::RuntimeException) { impl_invalidateParameter_nothrow(); set(OUString("MasterFields"),the_value,m_MasterFields); } -uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getDetailFields() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getDetailFields() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_DetailFields; } -void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< ::rtl::OUString > & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< OUString > & the_value) throw (uno::RuntimeException) { set("DetailFields",the_value,m_DetailFields); } -::rtl::OUString SAL_CALL DatabaseDataProvider::getCommand() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getCommand() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_Command; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setCommand(const ::rtl::OUString & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value) throw (uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -501,14 +501,14 @@ void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getFilter() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getFilter() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_aFilterManager.getFilterComponent( dbtools::FilterManager::fcPublicFilter ); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setFilter(const ::rtl::OUString & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value) throw (uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -532,13 +532,13 @@ void SAL_CALL DatabaseDataProvider::setApplyFilter( ::sal_Bool the_value ) throw set(PROPERTY_APPLYFILTER,the_value,m_ApplyFilter); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getHavingClause() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getHavingClause() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_HavingClause; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setHavingClause( const ::rtl::OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -547,13 +547,13 @@ void SAL_CALL DatabaseDataProvider::setHavingClause( const ::rtl::OUString& the_ set(PROPERTY_HAVING_CLAUSE,the_value,m_HavingClause); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getGroupBy() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getGroupBy() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_GroupBy; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setGroupBy( const ::rtl::OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -562,13 +562,13 @@ void SAL_CALL DatabaseDataProvider::setGroupBy( const ::rtl::OUString& the_value set(PROPERTY_GROUP_BY,the_value,m_GroupBy); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getOrder() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getOrder() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_Order; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setOrder( const ::rtl::OUString& the_value ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setOrder( const OUString& the_value ) throw (uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -612,13 +612,13 @@ void SAL_CALL DatabaseDataProvider::setActiveConnection(const uno::Reference< sd set(PROPERTY_ACTIVE_CONNECTION,the_value,m_xActiveConnection); } -::rtl::OUString SAL_CALL DatabaseDataProvider::getDataSourceName() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getDataSourceName() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_DataSourceName; } -void SAL_CALL DatabaseDataProvider::setDataSourceName(const ::rtl::OUString& the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setDataSourceName(const OUString& the_value) throw (uno::RuntimeException) { set(PROPERTY_DATASOURCENAME,the_value,m_DataSourceName); } @@ -633,7 +633,7 @@ namespace { struct ColumnDescription { - ::rtl::OUString sName; + OUString sName; sal_Int32 nResultSetPosition; sal_Int32 nDataType; @@ -643,7 +643,7 @@ namespace ,nDataType( sdbc::DataType::VARCHAR ) { } - explicit ColumnDescription( const ::rtl::OUString& i_rName ) + explicit ColumnDescription( const OUString& i_rName ) :sName( i_rName ) ,nResultSetPosition( 0 ) ,nDataType( sdbc::DataType::VARCHAR ) @@ -651,29 +651,29 @@ namespace } }; - struct CreateColumnDescription : public ::std::unary_function< ::rtl::OUString, ColumnDescription > + struct CreateColumnDescription : public ::std::unary_function< OUString, ColumnDescription > { - ColumnDescription operator()( const ::rtl::OUString& i_rName ) + ColumnDescription operator()( const OUString& i_rName ) { return ColumnDescription( i_rName ); } }; - struct SelectColumnName : public ::std::unary_function< ColumnDescription, ::rtl::OUString > + struct SelectColumnName : public ::std::unary_function< ColumnDescription, OUString > { - const ::rtl::OUString& operator()( const ColumnDescription& i_rColumn ) + const OUString& operator()( const ColumnDescription& i_rColumn ) { return i_rColumn.sName; } }; } -void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const uno::Sequence< ::rtl::OUString >& i_aColumnNames) +void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const uno::Sequence< OUString >& i_aColumnNames) { // clear the data before fill the new one uno::Reference< sdbcx::XColumnsSupplier > xColSup(m_xRowSet,uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xColumns( xColSup->getColumns(), uno::UNO_SET_THROW ); - const uno::Sequence< ::rtl::OUString > aRowSetColumnNames( xColumns->getElementNames() ); + const uno::Sequence< OUString > aRowSetColumnNames( xColumns->getElementNames() ); typedef ::std::vector< ColumnDescription > ColumnDescriptions; ColumnDescriptions aColumns; @@ -681,7 +681,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat if ( i_aColumnNames.getLength() ) { // some normalizations ... - uno::Sequence< ::rtl::OUString > aImposedColumnNames( i_aColumnNames ); + uno::Sequence< OUString > aImposedColumnNames( i_aColumnNames ); // strangely, there exist documents where the ColumnDescriptions end with a number of empty strings. /me // thinks they're generated when you have a chart based on a result set with n columns, but remove some @@ -709,7 +709,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat const sal_Int32 nCount = aImposedColumnNames.getLength(); for ( sal_Int32 i = 0 ; i < nCount; ++i ) { - const ::rtl::OUString sColumnName( aImposedColumnNames[i] ); + const OUString sColumnName( aImposedColumnNames[i] ); if ( !xColumns->hasByName( sColumnName ) ) continue; @@ -754,11 +754,11 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_TYPE ) >>= col->nDataType ); const sal_Int32 columnIndex = col - aColumns.begin(); - const ::rtl::OUString sRangeName = ::rtl::OUString::valueOf( columnIndex ); - m_aNumberFormats.insert( ::std::map< ::rtl::OUString, uno::Any >::value_type( sRangeName, aNumberFormat ) ); + const OUString sRangeName = OUString::valueOf( columnIndex ); + m_aNumberFormats.insert( ::std::map< OUString, uno::Any >::value_type( sRangeName, aNumberFormat ) ); } - ::std::vector< ::rtl::OUString > aRowLabels; + ::std::vector< OUString > aRowLabels; ::std::vector< ::std::vector< double > > aDataValues; sal_Int32 nRowCount = 0; ::connectivity::ORowSetValue aValue; @@ -803,7 +803,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat 4.30, 9.02, 6.20 }; for(sal_Int32 h = 0,k = 0; h < nRowCount; ++h,++k ) { - aRowLabels.push_back(::rtl::OUString::valueOf(h+1)); + aRowLabels.push_back(OUString::valueOf(h+1)); ::std::vector< double > aRow; const sal_Int32 nSize = sizeof(fDefaultData)/sizeof(fDefaultData[0]); for (size_t j = 0; j < (aColumns.size()-1); ++j,++k) @@ -817,10 +817,10 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat } uno::Reference< chart::XChartDataArray> xData(m_xInternal,uno::UNO_QUERY); - xData->setRowDescriptions(uno::Sequence< ::rtl::OUString >(&(*aRowLabels.begin()),aRowLabels.size())); + xData->setRowDescriptions(uno::Sequence< OUString >(&(*aRowLabels.begin()),aRowLabels.size())); const size_t nOffset = bFirstColumnIsCategory ? 1 : 0; - uno::Sequence< ::rtl::OUString > aColumnDescriptions( aColumns.size() - nOffset ); + uno::Sequence< OUString > aColumnDescriptions( aColumns.size() - nOffset ); ::std::transform( aColumns.begin() + nOffset, aColumns.end(), @@ -866,7 +866,7 @@ void SAL_CALL DatabaseDataProvider::setNull(sal_Int32 parameterIndex, sal_Int32 } //------------------------------------------------------------------------------ -void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw( SQLException, RuntimeException ) +void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException ) { m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName); } @@ -914,7 +914,7 @@ void SAL_CALL DatabaseDataProvider::setDouble(sal_Int32 parameterIndex, double x } //------------------------------------------------------------------------------ -void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw( SQLException, RuntimeException ) +void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException ) { m_aParameterManager.setString(parameterIndex, x); } diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 2894a7fe73e8..09a3882f6bec 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -45,7 +45,7 @@ namespace dbaccess //------------------------------------------------------------------------ OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer, - const ::rtl::OUString& _sName, const ::std::vector< ::rtl::OUString>& _aPropertyList ) + const OUString& _sName, const ::std::vector< OUString>& _aPropertyList ) :m_xSource( _xSource, UNO_SET_THROW ) ,m_xDestContainer( _xDestContainer, UNO_SET_THROW ) ,m_sName( _sName ) @@ -57,11 +57,11 @@ namespace dbaccess try { if ( _aPropertyList.empty() ) - _xSource->addPropertyChangeListener( ::rtl::OUString(), this ); + _xSource->addPropertyChangeListener( OUString(), this ); else { - ::std::vector< ::rtl::OUString >::const_iterator aIter = _aPropertyList.begin(); - ::std::vector< ::rtl::OUString >::const_iterator aEnd = _aPropertyList.end(); + ::std::vector< OUString >::const_iterator aIter = _aPropertyList.begin(); + ::std::vector< OUString >::const_iterator aEnd = _aPropertyList.end(); for (; aIter != aEnd ; ++aIter ) _xSource->addPropertyChangeListener( *aIter, this ); } @@ -85,7 +85,7 @@ namespace dbaccess ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xDestContainer.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); try { @@ -128,9 +128,9 @@ namespace dbaccess ::osl::MutexGuard aGuard(m_aMutex); if ( !m_xSource.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); - m_xSource->removePropertyChangeListener( ::rtl::OUString(), this ); + m_xSource->removePropertyChangeListener( OUString(), this ); m_xSource = NULL; m_xDestContainer = NULL; m_xDestInfo = NULL; diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx index 6d1e59603864..0a9c241dfc62 100644 --- a/dbaccess/source/core/misc/objectnameapproval.cxx +++ b/dbaccess/source/core/misc/objectnameapproval.cxx @@ -71,7 +71,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL ObjectNameApproval::approveElement( const ::rtl::OUString& _rName, const Reference< XInterface >& /*_rxElement*/ ) + void SAL_CALL ObjectNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ ) { Reference< XConnection > xConnection( m_pImpl->aConnection ); if ( !xConnection.is() ) diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index 490f1bb5957d..1e3891fac5cd 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -80,9 +80,9 @@ namespace dbaccess } // ----------------------------------------------------------------------------- - ::rtl::OUString extractExceptionMessage( const Reference & _rContext, const Any& _rError ) + OUString extractExceptionMessage( const Reference & _rContext, const Any& _rError ) { - ::rtl::OUString sDisplayMessage; + OUString sDisplayMessage; try { @@ -91,7 +91,7 @@ namespace dbaccess ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rError ) ); ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove ); pRequest->addContinuation( pApprove.get() ); - Optional< ::rtl::OUString > aMessage = xStringResolver->getStringFromInformationalRequest( pRequest.get() ); + Optional< OUString > aMessage = xStringResolver->getStringFromInformationalRequest( pRequest.get() ); if ( aMessage.IsPresent ) sDisplayMessage = aMessage.Value; } @@ -105,7 +105,7 @@ namespace dbaccess Exception aExcept; _rError >>= aExcept; - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( _rError.getValueTypeName() ); aBuffer.appendAscii( ":\n" ); aBuffer.append( aExcept.Message ); diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 5b42475750f1..ba98e212aedb 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -95,7 +95,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dba::DbaModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii( pImplementationName ) ); + OUString::createFromAscii( pImplementationName ) ); } if (xRet.is()) diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx index a08e4116c0cf..732f924a2b7a 100644 --- a/dbaccess/source/core/misc/veto.cxx +++ b/dbaccess/source/core/misc/veto.cxx @@ -31,7 +31,7 @@ namespace dbaccess //= Veto //==================================================================== //-------------------------------------------------------------------- - Veto::Veto( const ::rtl::OUString& _rReason, const Any& _rDetails ) + Veto::Veto( const OUString& _rReason, const Any& _rDetails ) :m_sReason( _rReason ) ,m_aDetails( _rDetails ) { @@ -43,7 +43,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL Veto::getReason() throw (RuntimeException) + OUString SAL_CALL Veto::getReason() throw (RuntimeException) { return m_sReason; } diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 409784feccdf..d5b605f3ff5e 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -82,7 +82,7 @@ namespace dbaccess namespace { // ......................................................................... - static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, ::rtl::OUStringBuffer& o_rBuffer ) + static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, OUStringBuffer& o_rBuffer ) { o_rBuffer.append( i_rComponentDesc.first ); o_rBuffer.append( sal_Unicode( '=' ) ); @@ -92,7 +92,7 @@ namespace dbaccess } // ......................................................................... - static bool lcl_extractCompDesc( const ::rtl::OUString& i_rIniLine, ::rtl::OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc ) + static bool lcl_extractCompDesc( const OUString& i_rIniLine, OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc ) { const sal_Int32 nEqualSignPos = i_rIniLine.indexOf( sal_Unicode( '=' ) ); if ( nEqualSignPos < 1 ) @@ -147,7 +147,7 @@ namespace dbaccess ++stor ) { - ::rtl::OUStringBuffer aLine; + OUStringBuffer aLine; lcl_getPersistentRepresentation( *stor, aLine ); aTextOutput.writeLine( aLine.makeStringAndClear() ); @@ -157,7 +157,7 @@ namespace dbaccess } // ......................................................................... - static bool lcl_isSectionStart( const ::rtl::OUString& i_rIniLine, ::rtl::OUString& o_rSectionName ) + static bool lcl_isSectionStart( const OUString& i_rIniLine, OUString& o_rSectionName ) { const sal_Int32 nLen = i_rIniLine.getLength(); if ( ( nLen > 0 ) && ( i_rIniLine.getStr()[0] == '[' ) && ( i_rIniLine.getStr()[ nLen - 1 ] == ']' ) ) @@ -169,7 +169,7 @@ namespace dbaccess } // ......................................................................... - static void lcl_stripTrailingLineFeed( ::rtl::OUString& io_rLine ) + static void lcl_stripTrailingLineFeed( OUString& io_rLine ) { const sal_Int32 nLen = io_rLine.getLength(); if ( ( nLen > 0 ) && ( io_rLine.getStr()[ nLen - 1 ] == '\n' ) ) @@ -194,11 +194,11 @@ namespace dbaccess xTextInput->setEncoding( lcl_getMapStreamEncodingName() ); xTextInput->setInputStream( xIniStream->getInputStream() ); - ::rtl::OUString sCurrentSection; + OUString sCurrentSection; bool bCurrentSectionIsKnownToBeUnsupported = true; while ( !xTextInput->isEOF() ) { - ::rtl::OUString sLine = xTextInput->readLine(); + OUString sLine = xTextInput->readLine(); lcl_stripTrailingLineFeed( sLine ); if ( sLine.isEmpty() ) @@ -220,7 +220,7 @@ namespace dbaccess continue; } - ::rtl::OUString sStorageName; + OUString sStorageName; SubComponentDescriptor aCompDesc; if ( !lcl_extractCompDesc( sLine, sStorageName, aCompDesc ) ) continue; @@ -370,15 +370,15 @@ namespace dbaccess ++stor ) { - const ::rtl::OUString sComponentName( stor->second.sName ); + const OUString sComponentName( stor->second.sName ); if ( !xComponentsStor->hasByName( stor->first ) ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer message; + OStringBuffer message; message.append( "DatabaseDocumentRecovery::recoverSubDocuments: inconsistent recovery storage: storage '" ); - message.append( ::rtl::OUStringToOString( stor->first, RTL_TEXTENCODING_ASCII_US ) ); + message.append( OUStringToOString( stor->first, RTL_TEXTENCODING_ASCII_US ) ); message.append( "' not found in '" ); - message.append( ::rtl::OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) ); + message.append( OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) ); message.append( "', but required per map file!" ); OSL_FAIL( message.getStr() ); #endif diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx index 5fd94023f954..bd9c8b2d09c8 100644 --- a/dbaccess/source/core/recovery/settingsimport.cxx +++ b/dbaccess/source/core/recovery/settingsimport.cxx @@ -82,14 +82,14 @@ namespace dbaccess { } - void SettingsImport::characters( const ::rtl::OUString& i_rCharacters ) + void SettingsImport::characters( const OUString& i_rCharacters ) { m_aCharacters.append( i_rCharacters ); } - void SettingsImport::split( const ::rtl::OUString& i_rElementName, ::rtl::OUString& o_rNamespace, ::rtl::OUString& o_rLocalName ) + void SettingsImport::split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName ) { - o_rNamespace = ::rtl::OUString(); + o_rNamespace = OUString(); o_rLocalName = i_rElementName; const sal_Int32 nSeparatorPos = i_rElementName.indexOf( ':' ); if ( nSeparatorPos > -1 ) @@ -107,7 +107,7 @@ namespace dbaccess //= IgnoringSettingsImport //==================================================================== //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > IgnoringSettingsImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > IgnoringSettingsImport::nextState( const OUString& i_rElementName ) { (void)i_rElementName; return this; @@ -128,19 +128,19 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > OfficeSettingsImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > OfficeSettingsImport::nextState( const OUString& i_rElementName ) { // separate the namespace part from the element name - ::rtl::OUString sNamespace; - ::rtl::OUString sLocalName; + OUString sNamespace; + OUString sLocalName; split( i_rElementName, sNamespace, sLocalName ); if ( sLocalName == "config-item-set" ) return new ConfigItemSetImport( m_rSettings ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "unknown (or unsupported at this place) element name '" ); - sMessage += ::rtl::OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); + OString sMessage( "unknown (or unsupported at this place) element name '" ); + sMessage += OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); sMessage += "', ignoring"; OSL_FAIL( sMessage.getStr() ); #endif @@ -162,7 +162,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > ConfigItemImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > ConfigItemImport::nextState( const OUString& i_rElementName ) { OSL_FAIL( "ConfigItemImport::nextState: unexpected: this class is responsible for child-less items only!" ); (void)i_rElementName; @@ -174,7 +174,7 @@ namespace dbaccess { SettingsImport::endElement(); - const ::rtl::OUString sItemName( getItemName() ); + const OUString sItemName( getItemName() ); ENSURE_OR_RETURN_VOID( !sItemName.isEmpty(), "no item name -> no item value" ); Any aValue; getItemValue( aValue ); @@ -187,10 +187,10 @@ namespace dbaccess o_rValue.clear(); // the characters building up th evalue - ::rtl::OUStringBuffer aCharacters( getAccumulatedCharacters() ); - const ::rtl::OUString sValue = aCharacters.makeStringAndClear(); + OUStringBuffer aCharacters( getAccumulatedCharacters() ); + const OUString sValue = aCharacters.makeStringAndClear(); - const ::rtl::OUString& rItemType( getItemType() ); + const OUString& rItemType( getItemType() ); ENSURE_OR_RETURN_VOID( !rItemType.isEmpty(), "no item type -> no item value" ); if ( ::xmloff::token::IsXMLToken( rItemType, ::xmloff::token::XML_INT ) ) @@ -224,8 +224,8 @@ namespace dbaccess #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sMessage( "ConfigItemImport::getItemValue: unsupported item type '" ); - sMessage += ::rtl::OUStringToOString( rItemType, RTL_TEXTENCODING_UTF8 ); + OString sMessage( "ConfigItemImport::getItemValue: unsupported item type '" ); + sMessage += OUStringToOString( rItemType, RTL_TEXTENCODING_UTF8 ); sMessage += "', ignoring"; OSL_FAIL( sMessage.getStr() ); } @@ -247,11 +247,11 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > ConfigItemSetImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > ConfigItemSetImport::nextState( const OUString& i_rElementName ) { // separate the namespace part from the element name - ::rtl::OUString sNamespace; - ::rtl::OUString sLocalName; + OUString sNamespace; + OUString sLocalName; split( i_rElementName, sNamespace, sLocalName ); if ( sLocalName == "config-item-set" ) @@ -260,8 +260,8 @@ namespace dbaccess return new ConfigItemImport( m_aChildSettings ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "unknown element name '" ); - sMessage += ::rtl::OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); + OString sMessage( "unknown element name '" ); + sMessage += OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); sMessage += "', ignoring"; OSL_FAIL( sMessage.getStr() ); #endif diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx index e0daac2f929b..accad5c714b0 100644 --- a/dbaccess/source/core/recovery/settingsimport.hxx +++ b/dbaccess/source/core/recovery/settingsimport.hxx @@ -50,33 +50,33 @@ namespace dbaccess // own overriables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ) = 0; virtual void startElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& i_rAttributes ); virtual void endElement(); - virtual void characters( const ::rtl::OUString& i_rCharacters ); + virtual void characters( const OUString& i_rCharacters ); protected: virtual ~SettingsImport(); protected: - static void split( const ::rtl::OUString& i_rElementName, ::rtl::OUString& o_rNamespace, ::rtl::OUString& o_rLocalName ); + static void split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName ); protected: - const ::rtl::OUString& getItemName() const { return m_sItemName; } - const ::rtl::OUString& getItemType() const { return m_sItemType; } - const ::rtl::OUStringBuffer& getAccumulatedCharacters() const { return m_aCharacters; } + const OUString& getItemName() const { return m_sItemName; } + const OUString& getItemType() const { return m_sItemType; } + const OUStringBuffer& getAccumulatedCharacters() const { return m_aCharacters; } private: oslInterlockedCount m_refCount; // value of the config:name attribute, if any - ::rtl::OUString m_sItemName; + OUString m_sItemName; // value of the config:type attribute, if any - ::rtl::OUString m_sItemType; + OUString m_sItemType; // accumulated characters, if any - ::rtl::OUStringBuffer m_aCharacters; + OUStringBuffer m_aCharacters; }; //==================================================================== @@ -91,7 +91,7 @@ namespace dbaccess // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); private: @@ -110,7 +110,7 @@ namespace dbaccess // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); protected: @@ -135,7 +135,7 @@ namespace dbaccess public: // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); virtual void endElement(); @@ -163,7 +163,7 @@ namespace dbaccess public: // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); protected: diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx index fec9492b22e7..bac839e28f09 100644 --- a/dbaccess/source/core/recovery/storagestream.cxx +++ b/dbaccess/source/core/recovery/storagestream.cxx @@ -52,7 +52,7 @@ namespace dbaccess //-------------------------------------------------------------------- StorageOutputStream::StorageOutputStream( const Reference& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ) :m_rContext( i_rContext ) { @@ -85,7 +85,7 @@ namespace dbaccess //-------------------------------------------------------------------- StorageInputStream::StorageInputStream( const Reference& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ) :m_rContext( i_rContext ) { diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx index 9f9fb0f013b1..8f655959d43f 100644 --- a/dbaccess/source/core/recovery/storagestream.hxx +++ b/dbaccess/source/core/recovery/storagestream.hxx @@ -41,7 +41,7 @@ namespace dbaccess StorageOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); virtual ~StorageOutputStream(); @@ -73,7 +73,7 @@ namespace dbaccess StorageInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); virtual ~StorageInputStream(); diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx index fcce399dd92a..241e336f2652 100644 --- a/dbaccess/source/core/recovery/storagetextstream.cxx +++ b/dbaccess/source/core/recovery/storagetextstream.cxx @@ -67,9 +67,9 @@ namespace dbaccess } //-------------------------------------------------------------------------------------------------------------- - static const ::rtl::OUString& lcl_getLineFeed() + static const OUString& lcl_getLineFeed() { - static const ::rtl::OUString s_sLineFeed( sal_Unicode( '\n' ) ); + static const OUString s_sLineFeed( sal_Unicode( '\n' ) ); return s_sLineFeed; } } @@ -80,7 +80,7 @@ namespace dbaccess //------------------------------------------------------------------------------------------------------------------ StorageTextOutputStream::StorageTextOutputStream( const Reference& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ) :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName ) ,m_pData( new StorageTextOutputStream_Data ) @@ -96,7 +96,7 @@ namespace dbaccess } //------------------------------------------------------------------------------------------------------------------ - void StorageTextOutputStream::writeLine( const ::rtl::OUString& i_rLine ) + void StorageTextOutputStream::writeLine( const OUString& i_rLine ) { m_pData->xTextOutput->writeString( i_rLine ); m_pData->xTextOutput->writeString( lcl_getLineFeed() ); diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx index 37119d264afa..57c4599a05ba 100644 --- a/dbaccess/source/core/recovery/storagetextstream.hxx +++ b/dbaccess/source/core/recovery/storagetextstream.hxx @@ -39,11 +39,11 @@ namespace dbaccess StorageTextOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); ~StorageTextOutputStream(); - void writeLine( const ::rtl::OUString& i_rLine ); + void writeLine( const OUString& i_rLine ); void writeLine(); private: diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx index d17593bc7a58..39a828ea589e 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.cxx +++ b/dbaccess/source/core/recovery/storagexmlstream.cxx @@ -67,7 +67,7 @@ namespace dbaccess struct StorageXMLOutputStream_Data { Reference< XDocumentHandler > xHandler; - ::std::stack< ::rtl::OUString > aElements; + ::std::stack< OUString > aElements; ::rtl::Reference< SvXMLAttributeList > xAttributes; }; @@ -77,7 +77,7 @@ namespace dbaccess //------------------------------------------------------------------------------------------------------------------ StorageXMLOutputStream::StorageXMLOutputStream( const Reference& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName ) + const OUString& i_rStreamName ) :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName ) ,m_pData( new StorageXMLOutputStream_Data ) { @@ -105,13 +105,13 @@ namespace dbaccess } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::addAttribute( const ::rtl::OUString& i_rName, const ::rtl::OUString& i_rValue ) const + void StorageXMLOutputStream::addAttribute( const OUString& i_rName, const OUString& i_rValue ) const { m_pData->xAttributes->AddAttribute( i_rName, i_rValue ); } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::startElement( const ::rtl::OUString& i_rElementName ) const + void StorageXMLOutputStream::startElement( const OUString& i_rElementName ) const { ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); @@ -126,13 +126,13 @@ namespace dbaccess ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); ENSURE_OR_RETURN_VOID( !m_pData->aElements.empty(), "no element on the stack" ); - const ::rtl::OUString sElementName( m_pData->aElements.top() ); + const OUString sElementName( m_pData->aElements.top() ); m_pData->xHandler->endElement( sElementName ); m_pData->aElements.pop(); } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::ignorableWhitespace( const ::rtl::OUString& i_rWhitespace ) const + void StorageXMLOutputStream::ignorableWhitespace( const OUString& i_rWhitespace ) const { ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); @@ -140,7 +140,7 @@ namespace dbaccess } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::characters( const ::rtl::OUString& i_rCharacters ) const + void StorageXMLOutputStream::characters( const OUString& i_rCharacters ) const { ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); @@ -161,7 +161,7 @@ namespace dbaccess //------------------------------------------------------------------------------------------------------------------ StorageXMLInputStream::StorageXMLInputStream( const Reference& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName ) + const OUString& i_rStreamName ) :StorageInputStream( i_rContext, i_rParentStorage, i_rStreamName ) ,m_pData( new StorageXMLInputStream_Data ) { diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx index a850b225b4fd..8fdb7305e274 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.hxx +++ b/dbaccess/source/core/recovery/storagexmlstream.hxx @@ -42,20 +42,20 @@ namespace dbaccess StorageXMLOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); ~StorageXMLOutputStream(); // StorageOutputStream overridables virtual void close(); - void addAttribute( const ::rtl::OUString& i_rName, const ::rtl::OUString& i_rValue ) const; + void addAttribute( const OUString& i_rName, const OUString& i_rValue ) const; - void startElement( const ::rtl::OUString& i_rElementName ) const; + void startElement( const OUString& i_rElementName ) const; void endElement() const; - void ignorableWhitespace( const ::rtl::OUString& i_rWhitespace ) const; - void characters( const ::rtl::OUString& i_rCharacters ) const; + void ignorableWhitespace( const OUString& i_rWhitespace ) const; + void characters( const OUString& i_rCharacters ) const; private: StorageXMLOutputStream(); // never implemented @@ -76,7 +76,7 @@ namespace dbaccess StorageXMLInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); ~StorageXMLInputStream(); diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index e70acbbf6561..af11780ea5fc 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -87,7 +87,7 @@ namespace dbaccess namespace { // ......................................................................... - static const ::rtl::OUString& lcl_getComponentStorageBaseName( const SubComponentType i_eType ) + static const OUString& lcl_getComponentStorageBaseName( const SubComponentType i_eType ) { static const OUString s_sFormBaseName( "form" ); static const OUString s_sReportBaseName( "report" ); @@ -109,7 +109,7 @@ namespace dbaccess } OSL_FAIL( "lcl_getComponentStorageBaseName: unimplemented case!" ); - static const ::rtl::OUString s_sFallback; + static const OUString s_sFallback; return s_sFallback; } @@ -147,7 +147,7 @@ namespace dbaccess // ......................................................................... static Reference< XCommandProcessor > lcl_getSubComponentDef_nothrow( const Reference< XDatabaseDocumentUI >& i_rAppUI, - const SubComponentType i_eType, const ::rtl::OUString& i_rName ) + const SubComponentType i_eType, const OUString& i_rName ) { Reference< XController > xController( i_rAppUI, UNO_QUERY_THROW ); ENSURE_OR_RETURN( ( i_eType == FORM ) || ( i_eType == REPORT ), "lcl_getSubComponentDef_nothrow: illegal controller", NULL ); @@ -206,19 +206,19 @@ namespace dbaccess } public: - virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue ); + virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ); virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue ); virtual void StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace ); virtual void EndElement ( const sal_Bool i_bIgnoreWhitespace ); - virtual void Characters( const ::rtl::OUString& i_rCharacters ); + virtual void Characters( const OUString& i_rCharacters ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const; private: - ::rtl::OUString impl_prefix( const ::xmloff::token::XMLTokenEnum i_eToken ) + OUString impl_prefix( const ::xmloff::token::XMLTokenEnum i_eToken ) { - ::rtl::OUStringBuffer aQualifiedName( m_aNamespace ); + OUStringBuffer aQualifiedName( m_aNamespace ); aQualifiedName.append( sal_Unicode( ':' ) ); aQualifiedName.append( ::xmloff::token::GetXMLToken( i_eToken ) ); return aQualifiedName.makeStringAndClear(); @@ -227,11 +227,11 @@ namespace dbaccess private: const Reference& m_rContext; const StorageXMLOutputStream& m_rDelegator; - const ::rtl::OUStringBuffer m_aNamespace; + const OUStringBuffer m_aNamespace; }; //-------------------------------------------------------------------- - void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue ) + void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ) { m_rDelegator.addAttribute( impl_prefix( i_eName ), i_rValue ); } @@ -260,7 +260,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SettingsExportContext::Characters( const ::rtl::OUString& i_rCharacters ) + void SettingsExportContext::Characters( const OUString& i_rCharacters ) { m_rDelegator.characters( i_rCharacters ); } @@ -292,11 +292,11 @@ namespace dbaccess // XDocumentHandler virtual void SAL_CALL startDocument( ) throw (SAXException, RuntimeException); virtual void SAL_CALL endDocument( ) throw (SAXException, RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (SAXException, RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (SAXException, RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (SAXException, RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (SAXException, RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (SAXException, RuntimeException); virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException); const ::comphelper::NamedValueCollection& getSettings() const { return m_aSettings; } @@ -317,7 +317,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::startElement( const ::rtl::OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException) { ::rtl::Reference< SettingsImport > pNewState; @@ -349,7 +349,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::endElement( const ::rtl::OUString& i_Name ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name ) throw (SAXException, RuntimeException) { ENSURE_OR_THROW( !m_aStates.empty(), "no active element" ); (void)i_Name; @@ -360,7 +360,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::characters( const ::rtl::OUString& i_Chars ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars ) throw (SAXException, RuntimeException) { ENSURE_OR_THROW( !m_aStates.empty(), "no active element" ); @@ -369,14 +369,14 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException) { // ignore them - that's why they're called "ignorable" (void)aWhitespaces; } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::processingInstruction( const ::rtl::OUString& i_Target, const ::rtl::OUString& i_Data ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data ) throw (SAXException, RuntimeException) { OSL_FAIL( "SettingsDocumentHandler::processingInstruction: unexpected ..." ); (void)i_Target; @@ -393,7 +393,7 @@ namespace dbaccess //= SubComponentRecovery //==================================================================== //-------------------------------------------------------------------- - const ::rtl::OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType ) + const OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType ) { static const OUString s_sFormsStorageName( "forms" ); static const OUString s_sReportsStorageName( "reports" ); @@ -418,7 +418,7 @@ namespace dbaccess } OSL_FAIL( "SubComponentRecovery::getComponentsStorageName: unimplemented case!" ); - static const ::rtl::OUString s_sFallback; + static const OUString s_sFallback; return s_sFallback; } @@ -431,13 +431,13 @@ namespace dbaccess return; // open the sub storage for the given kind of components - const ::rtl::OUString& rStorageName( getComponentsStorageName( m_eType ) ); + const OUString& rStorageName( getComponentsStorageName( m_eType ) ); const Reference< XStorage > xComponentsStorage( i_rRecoveryStorage->openStorageElement( rStorageName, ElementModes::READWRITE ), UNO_QUERY_THROW ); // find a free sub storage name, and create Yet Another Sub Storage - const ::rtl::OUString& rBaseName( lcl_getComponentStorageBaseName( m_eType ) ); - const ::rtl::OUString sStorName = ::dbtools::createUniqueName( xComponentsStorage.get(), rBaseName, true ); + const OUString& rBaseName( lcl_getComponentStorageBaseName( m_eType ) ); + const OUString sStorName = ::dbtools::createUniqueName( xComponentsStorage.get(), rBaseName, true ); const Reference< XStorage > xObjectStor( xComponentsStorage->openStorageElement( sStorName, ElementModes::READWRITE ), UNO_QUERY_THROW ); @@ -473,13 +473,13 @@ namespace dbaccess void SubComponentRecovery::impl_identifyComponent_throw() { // ask the controller - Pair< sal_Int32, ::rtl::OUString > aComponentIdentity = m_xDocumentUI->identifySubComponent( m_xComponent ); + Pair< sal_Int32, OUString > aComponentIdentity = m_xDocumentUI->identifySubComponent( m_xComponent ); m_eType = lcl_databaseObjectToSubComponentType( aComponentIdentity.First ); m_aCompDesc.sName = aComponentIdentity.Second; // what the controller didn't give us is the information whether this is in edit mode or not ... Reference< XModuleManager2 > xModuleManager( ModuleManager::create(m_rContext) ); - const ::rtl::OUString sModuleIdentifier = xModuleManager->identify( m_xComponent ); + const OUString sModuleIdentifier = xModuleManager->identify( m_xComponent ); switch ( m_eType ) { @@ -563,7 +563,7 @@ namespace dbaccess //-------------------------------------------------------------------- Reference< XComponent > SubComponentRecovery::impl_recoverSubDocument_throw( const Reference< XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, const bool i_bForEditing ) + const OUString& i_rComponentName, const bool i_bForEditing ) { Reference< XComponent > xSubComponent; Reference< XCommandProcessor > xDocDefinition; @@ -613,7 +613,7 @@ namespace dbaccess //-------------------------------------------------------------------- Reference< XComponent > SubComponentRecovery::impl_recoverQueryDesign_throw( const Reference< XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, const bool i_bForEditing ) + const OUString& i_rComponentName, const bool i_bForEditing ) { Reference< XComponent > xSubComponent; @@ -667,7 +667,7 @@ namespace dbaccess //-------------------------------------------------------------------- Reference< XComponent > SubComponentRecovery::recoverFromStorage( const Reference< XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, const bool i_bForEditing ) + const OUString& i_rComponentName, const bool i_bForEditing ) { Reference< XComponent > xSubComponent; switch ( m_eType ) diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx index 8e70be04efca..6c4cac5f99f1 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx @@ -72,11 +72,11 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > recoverFromStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, + const OUString& i_rComponentName, const bool i_bForEditing ); - static const ::rtl::OUString getComponentsStorageName( const SubComponentType i_eType ); + static const OUString getComponentsStorageName( const SubComponentType i_eType ); private: void impl_saveSubDocument_throw( @@ -90,14 +90,14 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > impl_recoverSubDocument_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, + const OUString& i_rComponentName, const bool i_bForEditing ); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > impl_recoverQueryDesign_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, + const OUString& i_rComponentName, const bool i_bForEditing ); diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx index 3ff36d791b0c..2682ba81a28e 100644 --- a/dbaccess/source/core/recovery/subcomponents.hxx +++ b/dbaccess/source/core/recovery/subcomponents.hxx @@ -52,7 +52,7 @@ namespace dbaccess // ------------------------------------------------------------------- struct DBACCESS_DLLPRIVATE SubComponentDescriptor { - ::rtl::OUString sName; + OUString sName; bool bForEditing; SubComponentDescriptor() @@ -61,7 +61,7 @@ namespace dbaccess { } - SubComponentDescriptor( const ::rtl::OUString& i_rName, const bool i_bForEditing ) + SubComponentDescriptor( const OUString& i_rName, const bool i_bForEditing ) :sName( i_rName ) ,bForEditing( i_bForEditing ) { @@ -69,7 +69,7 @@ namespace dbaccess }; // ------------------------------------------------------------------- - typedef ::boost::unordered_map< ::rtl::OUString, SubComponentDescriptor, ::rtl::OUStringHash > MapStringToCompDesc; + typedef ::boost::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc; typedef ::std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs; diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx index 1caaec33fae8..98d4cd8273b7 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx @@ -52,7 +52,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( sal_Int32 nNumberFormat = 0; if ( i->maValue >>= nNumberFormat ) { - rtl::OUString sAttrValue = rODBExport.getDataStyleName(nNumberFormat); + OUString sAttrValue = rODBExport.getDataStyleName(nNumberFormat); if ( !sAttrValue.isEmpty() ) { GetExport().AddAttribute( diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index f5939174b184..c99b451751b2 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -44,7 +44,7 @@ DBG_NAME(OXMLColumn) OXMLColumn::OXMLColumn( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const Reference< XNameAccess >& _xParentContainer ,const Reference< XPropertySet >& _xTable @@ -61,13 +61,13 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport const SvXMLTokenMap& rTokenMap = rImport.GetColumnElemTokenMap(); sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - ::rtl::OUString sType; + OUString sType; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx index abe4f956ae7e..95cd7266aa44 100644 --- a/dbaccess/source/filter/xml/xmlColumn.hxx +++ b/dbaccess/source/filter/xml/xmlColumn.hxx @@ -31,10 +31,10 @@ namespace dbaxml ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sName; - ::rtl::OUString m_sStyleName; - ::rtl::OUString m_sCellStyleName; - ::rtl::OUString m_sHelpMessage; + OUString m_sName; + OUString m_sStyleName; + OUString m_sCellStyleName; + OUString m_sHelpMessage; ::com::sun::star::uno::Any m_aDefaultValue; sal_Bool m_bHidden; @@ -43,7 +43,7 @@ namespace dbaxml OXMLColumn( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xTable diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index a78561bd5901..e6626ff9d362 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -39,10 +39,10 @@ DBG_NAME(OXMLComponent) OXMLComponent::OXMLComponent( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const Reference< XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sComponentServiceName + ,const OUString& _sComponentServiceName ) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_bAsTemplate(sal_False) @@ -54,13 +54,13 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport const SvXMLTokenMap& rTokenMap = rImport.GetComponentElemTokenMap(); sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; - static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); + static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx index 9bbe2815d803..55c69d8178a9 100644 --- a/dbaccess/source/filter/xml/xmlComponent.hxx +++ b/dbaccess/source/filter/xml/xmlComponent.hxx @@ -28,9 +28,9 @@ namespace dbaxml class ODBFilter; class OXMLComponent : public SvXMLImportContext { - ::rtl::OUString m_sName; - ::rtl::OUString m_sHREF; - ::rtl::OUString m_sComponentServiceName; + OUString m_sName; + OUString m_sHREF; + OUString m_sComponentServiceName; sal_Bool m_bAsTemplate; ODBFilter& GetOwnImport(); @@ -38,10 +38,10 @@ namespace dbaxml OXMLComponent( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sComponentServiceName + ,const OUString& _sComponentServiceName ); virtual ~OXMLComponent(); }; diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index 27b51d0a6cc9..cc8fbdba4791 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -38,7 +38,7 @@ namespace dbaxml DBG_NAME(OXMLConnectionData) OXMLConnectionData::OXMLConnectionData( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName) : + sal_uInt16 nPrfx, const OUString& _sLocalName) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_bFoundOne(false) { @@ -56,7 +56,7 @@ OXMLConnectionData::~OXMLConnectionData() SvXMLImportContext* OXMLConnectionData::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx index 132342cbd1a9..8bd938d43503 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx @@ -34,11 +34,11 @@ namespace dbaxml public: OXMLConnectionData( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~OXMLConnectionData(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx index 710a6e9bb799..b371a3e6d86f 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx @@ -31,7 +31,7 @@ namespace dbaxml public: OXMLConnectionResource( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~OXMLConnectionResource(); }; diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index d6a4b8194613..d1a763cbf04a 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -38,13 +38,13 @@ namespace dbaxml }; OXMLDataSource( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const UsedFor _eUsedFor = eDataSource ); virtual ~OXMLDataSource(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx index e7be61ffc82a..b7bc57506574 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx @@ -30,7 +30,7 @@ namespace dbaxml public: OXMLDataSourceInfo( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const sal_uInt16 _nToken); virtual ~OXMLDataSourceInfo(); diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index d5d5ff74e328..b9c779a07d25 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -41,7 +41,7 @@ DBG_NAME(OXMLDataSourceSetting) OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,OXMLDataSourceSetting* _pContainer) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) @@ -59,10 +59,10 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -78,7 +78,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< OUString* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); @@ -106,7 +106,7 @@ OXMLDataSourceSetting::~OXMLDataSourceSetting() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; @@ -140,19 +140,19 @@ void OXMLDataSourceSetting::EndElement() // if our property is of type string, but was empty, ensure that // we don't add a VOID value if ( !m_bIsList && ( m_aPropType.getTypeClass() == TypeClass_STRING ) && !m_aSetting.Value.hasValue() ) - m_aSetting.Value <<= ::rtl::OUString(); + m_aSetting.Value <<= OUString(); GetOwnImport().addInfo(m_aSetting); } } // ----------------------------------------------------------------------------- -void OXMLDataSourceSetting::Characters( const ::rtl::OUString& rChars ) +void OXMLDataSourceSetting::Characters( const OUString& rChars ) { if ( m_pContainer ) m_pContainer->addValue(rChars); } // ----------------------------------------------------------------------------- -void OXMLDataSourceSetting::addValue(const ::rtl::OUString& _sValue) +void OXMLDataSourceSetting::addValue(const OUString& _sValue) { Any aValue; if( TypeClass_VOID != m_aPropType.getTypeClass() ) @@ -173,7 +173,7 @@ ODBFilter& OXMLDataSourceSetting::GetOwnImport() return static_cast(GetImport()); } // ----------------------------------------------------------------------------- -Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const ::rtl::OUString& _rReadCharacters) +Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters) { Any aReturn; switch (_rExpectedType.getTypeClass()) diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index b8b5a6b8d40d..e0206fe67e51 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -35,29 +35,29 @@ namespace dbaxml sal_Bool m_bIsList; ODBFilter& GetOwnImport(); - ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const ::rtl::OUString& _rReadCharacters); + ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters); public: OXMLDataSourceSetting( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,OXMLDataSourceSetting* _pContainer = NULL); virtual ~OXMLDataSourceSetting(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); /** adds value to property @param _sValue The value to add. */ - void addValue(const ::rtl::OUString& _sValue); + void addValue(const OUString& _sValue); }; // ----------------------------------------------------------------------------- } // namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index 8495264834ca..4b15c4527662 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx @@ -38,7 +38,7 @@ DBG_NAME(OXMLDataSourceSettings) OXMLDataSourceSettings::OXMLDataSourceSettings( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName) : + ,const OUString& _sLocalName) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) { DBG_CTOR(OXMLDataSourceSettings,NULL); @@ -54,7 +54,7 @@ OXMLDataSourceSettings::~OXMLDataSourceSettings() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx index 30aa29f15b7c..35e8b45830d3 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx @@ -29,11 +29,11 @@ namespace dbaxml ODBFilter& GetOwnImport(); public: - OXMLDataSourceSettings( ODBFilter& rImport, sal_uInt16 nPrfx,const ::rtl::OUString& rLName); + OXMLDataSourceSettings( ODBFilter& rImport, sal_uInt16 nPrfx,const OUString& rLName); virtual ~OXMLDataSourceSettings(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index e848e9e5fdb3..26b727440ff8 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -41,7 +41,7 @@ namespace dbaxml DBG_NAME(OXMLDatabase) OXMLDatabase::OXMLDatabase( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName ) : + sal_uInt16 nPrfx, const OUString& rLName ) : SvXMLImportContext( rImport, nPrfx, rLName ) { DBG_CTOR(OXMLDatabase,NULL); @@ -58,7 +58,7 @@ OXMLDatabase::~OXMLDatabase() SvXMLImportContext* OXMLDatabase::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; @@ -74,7 +74,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Any aValue; - ::rtl::OUString sService; + OUString sService; dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"Forms",aValue); aValue >>= sService; if ( sService.isEmpty() ) @@ -89,7 +89,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Any aValue; - ::rtl::OUString sService; + OUString sService; dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"Reports",aValue); aValue >>= sService; if ( sService.isEmpty() ) @@ -104,7 +104,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); Any aValue; - ::rtl::OUString sService; + OUString sService; dbtools::getDataSourceSetting(GetOwnImport().getDataSource(),"CommandDefinitions",aValue); aValue >>= sService; if ( sService.isEmpty() ) diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx index 2859bc088492..42d170094057 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlDatabase.hxx @@ -30,11 +30,11 @@ namespace dbaxml public: OXMLDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~OXMLDatabase(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index 34336c766fe5..ceb3e3c3d2b8 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx @@ -37,7 +37,7 @@ namespace dbaxml DBG_NAME(OXMLDatabaseDescription) OXMLDatabaseDescription::OXMLDatabaseDescription( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName) : + sal_uInt16 nPrfx, const OUString& _sLocalName) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_bFoundOne(false) { @@ -54,7 +54,7 @@ OXMLDatabaseDescription::~OXMLDatabaseDescription() SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx index 28ca38e304cd..a56d90dedb31 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx @@ -34,11 +34,11 @@ namespace dbaxml public: OXMLDatabaseDescription( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~OXMLDatabaseDescription(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 2b98e8a70e32..ddbae3725845 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.cxx @@ -38,10 +38,10 @@ DBG_NAME(OXMLDocuments) OXMLDocuments::OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - , const ::rtl::OUString& rLName + , const OUString& rLName ,const Reference< XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName - ,const ::rtl::OUString& _sComponentServiceName) : + ,const OUString& _sCollectionServiceName + ,const OUString& _sComponentServiceName) : SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xContainer(_xContainer) ,m_sCollectionServiceName(_sCollectionServiceName) @@ -53,9 +53,9 @@ OXMLDocuments::OXMLDocuments( ODBFilter& rImport // ----------------------------------------------------------------------------- OXMLDocuments::OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - , const ::rtl::OUString& rLName + , const OUString& rLName ,const Reference< XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName + ,const OUString& _sCollectionServiceName ) : SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xContainer(_xContainer) @@ -74,7 +74,7 @@ OXMLDocuments::~OXMLDocuments() SvXMLImportContext* OXMLDocuments::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx index 193fccee42af..d1f3617a2002 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.hxx +++ b/dbaccess/source/filter/xml/xmlDocuments.hxx @@ -30,8 +30,8 @@ namespace dbaxml { private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; - ::rtl::OUString m_sCollectionServiceName; - ::rtl::OUString m_sComponentServiceName; + OUString m_sCollectionServiceName; + OUString m_sComponentServiceName; ODBFilter& GetOwnImport(); public: @@ -39,23 +39,23 @@ namespace dbaxml // for forms and reports OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName - ,const ::rtl::OUString& _sComponentServiceName); + ,const OUString& _sCollectionServiceName + ,const OUString& _sComponentServiceName); // for queries OXMLDocuments( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer - ,const ::rtl::OUString& _sCollectionServiceName = ::rtl::OUString() + ,const OUString& _sCollectionServiceName = OUString() ); virtual ~OXMLDocuments(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 67f2dd8db641..5f24a9fb2bef 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -38,7 +38,7 @@ namespace dbaxml DBG_NAME(OXMLFileBasedDatabase) OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName, + sal_uInt16 nPrfx, const OUString& _sLocalName, const Reference< XAttributeList > & _xAttrList) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) { @@ -53,15 +53,15 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, PropertyValue aProperty; const sal_Int16 nLength = (xDataSource.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0; - ::rtl::OUString sLocation,sMediaType,sFileTypeExtension; + OUString sLocation,sMediaType,sFileTypeExtension; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const OUString sValue = _xAttrList->getValueByIndex( i ); - aProperty.Name = ::rtl::OUString(); + aProperty.Name = OUString(); aProperty.Value = Any(); switch( rTokenMap.Get( nPrefix, sLocalName ) ) @@ -69,7 +69,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, case XML_TOK_DB_HREF: { SvtPathOptions aPathOptions; - rtl::OUString sFileName = aPathOptions.SubstituteVariable(sValue); + OUString sFileName = aPathOptions.SubstituteVariable(sValue); if ( sValue == sFileName ) { const sal_Int32 nFileNameLength = sFileName.getLength(); @@ -101,7 +101,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, if ( !(sLocation.isEmpty() || sMediaType.isEmpty()) ) { ::dbaccess::ODsnTypeCollection aTypeCollection(rImport.GetComponentContext()); - ::rtl::OUString sURL(aTypeCollection.getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); + OUString sURL(aTypeCollection.getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); sURL += sLocation; try { diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx index ebd30ff807c6..0a2626a9988d 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx @@ -31,7 +31,7 @@ namespace dbaxml public: OXMLFileBasedDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~OXMLFileBasedDatabase(); }; diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx index 24668516eea1..7c59d0e57168 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx @@ -33,31 +33,31 @@ namespace dbaxml ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sName; - ::rtl::OUString m_sCollectionServiceName; - ::rtl::OUString m_sComponentServiceName; + OUString m_sName; + OUString m_sCollectionServiceName; + OUString m_sComponentServiceName; ODBFilter& GetOwnImport(); public: OXMLHierarchyCollection( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sCollectionServiceName - ,const ::rtl::OUString& _sComponentServiceName + ,const OUString& _sCollectionServiceName + ,const OUString& _sComponentServiceName ); OXMLHierarchyCollection( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xTable ); virtual ~OXMLHierarchyCollection(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx index 08164da65962..1059296a442c 100644 --- a/dbaccess/source/filter/xml/xmlLogin.hxx +++ b/dbaccess/source/filter/xml/xmlLogin.hxx @@ -30,7 +30,7 @@ namespace dbaxml public: OXMLLogin( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual ~OXMLLogin(); diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index cddb57a11aac..e2a64751e99b 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -40,7 +40,7 @@ DBG_NAME(OXMLQuery) OXMLQuery::OXMLQuery( ODBFilter& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const Reference< XAttributeList > & _xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ) : @@ -56,10 +56,10 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -82,7 +82,7 @@ OXMLQuery::~OXMLQuery() // ----------------------------------------------------------------------------- SvXMLImportContext* OXMLQuery::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext* pContext = OXMLTable::CreateChildContext(nPrefix, rLocalName,xAttrList ); @@ -95,7 +95,7 @@ SvXMLImportContext* OXMLQuery::CreateChildContext( case XML_TOK_UPDATE_TABLE: { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - ::rtl::OUString s1; + OUString s1; fillAttributes(nPrefix, rLocalName,xAttrList,s1,m_sTable,m_sSchema,m_sCatalog); } break; diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx index e9c138f3c080..e2aef52021c2 100644 --- a/dbaccess/source/filter/xml/xmlQuery.hxx +++ b/dbaccess/source/filter/xml/xmlQuery.hxx @@ -28,8 +28,8 @@ namespace dbaxml class ODBFilter; class OXMLQuery : public OXMLTable { - ::rtl::OUString m_sCommand; - ::rtl::OUString m_sTable; + OUString m_sCommand; + OUString m_sTable; sal_Bool m_bEscapeProcessing; protected: virtual void setProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xProp); @@ -37,14 +37,14 @@ namespace dbaxml OXMLQuery( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ); virtual ~OXMLQuery(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx index 22cd0b21df79..84c5272159fe 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx @@ -31,7 +31,7 @@ namespace dbaxml public: OXMLServerDatabase( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~OXMLServerDatabase(); }; diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index 46a7f83d64c3..2d13149ff1e3 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -38,9 +38,9 @@ namespace dbaxml class OTableStyleContext : public XMLPropStyleContext { - ::rtl::OUString m_sDataStyleName; - ::rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; + OUString m_sDataStyleName; + OUString sPageStyle; + const OUString sNumberFormat; SvXMLStylesContext* pStyles; com::sun::star::uno::Any aConditionalFormat; sal_Int32 m_nNumberFormat; @@ -50,15 +50,15 @@ namespace dbaxml protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); OTableStyleContext( ODBFilter& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle = sal_False ); @@ -77,9 +77,9 @@ namespace dbaxml class OTableStylesContext : public SvXMLStylesContext { - const ::rtl::OUString sTableStyleServiceName; - const ::rtl::OUString sColumnStyleServiceName; - const ::rtl::OUString sCellStyleServiceName; + const OUString sTableStyleServiceName; + const OUString sColumnStyleServiceName; + const OUString sCellStyleServiceName; sal_Int32 m_nNumberFormatIndex; sal_Int32 nMasterPageNameIndex; sal_Bool bAutoStyles : 1; @@ -96,7 +96,7 @@ namespace dbaxml virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -104,7 +104,7 @@ namespace dbaxml TYPEINFO(); OTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , - const ::rtl::OUString& rLName , + const OUString& rLName , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bAutoStyles ); virtual ~OTableStylesContext(); @@ -116,7 +116,7 @@ namespace dbaxml virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; - virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const; sal_Int32 GetIndex(const sal_Int16 nContextID); }; diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx index bce2ba477fd8..999c216459c3 100644 --- a/dbaccess/source/filter/xml/xmlTable.hxx +++ b/dbaccess/source/filter/xml/xmlTable.hxx @@ -31,13 +31,13 @@ namespace dbaxml protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sFilterStatement; - ::rtl::OUString m_sOrderStatement; - ::rtl::OUString m_sName; - ::rtl::OUString m_sSchema; - ::rtl::OUString m_sCatalog; - ::rtl::OUString m_sStyleName; - ::rtl::OUString m_sServiceName; + OUString m_sFilterStatement; + OUString m_sOrderStatement; + OUString m_sName; + OUString m_sSchema; + OUString m_sCatalog; + OUString m_sStyleName; + OUString m_sServiceName; sal_Bool m_bApplyFilter; sal_Bool m_bApplyOrder; @@ -45,12 +45,12 @@ namespace dbaxml ODBFilter& GetOwnImport(); void fillAttributes( sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - , ::rtl::OUString& _rsCommand - ,::rtl::OUString& _rsTableName - ,::rtl::OUString& _rsTableSchema - ,::rtl::OUString& _rsTableCatalog + , OUString& _rsCommand + ,OUString& _rsTableName + ,OUString& _rsTableSchema + ,OUString& _rsTableCatalog ); virtual void setProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xProp); @@ -58,15 +58,15 @@ namespace dbaxml OXMLTable( ODBFilter& rImport , sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer - ,const ::rtl::OUString& _sServiceName + ,const OUString& _sServiceName ); virtual ~OXMLTable(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); }; diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index 5e48f3742ada..de8e856ba182 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx @@ -37,7 +37,7 @@ namespace dbaxml using namespace ::com::sun::star::xml::sax; DBG_NAME(OXMLTableFilterList) -OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName ) +OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& _sLocalName ) :SvXMLImportContext( rImport, nPrfx, _sLocalName ) { DBG_CTOR(OXMLTableFilterList,NULL); @@ -53,7 +53,7 @@ OXMLTableFilterList::~OXMLTableFilterList() SvXMLImportContext* OXMLTableFilterList::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const Reference< XAttributeList > & /*xAttrList*/ ) { SvXMLImportContext *pContext = 0; @@ -87,9 +87,9 @@ void OXMLTableFilterList::EndElement() if ( xDataSource.is() ) { if ( !m_aPatterns.empty() ) - xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(Sequence< ::rtl::OUString>(&(*m_aPatterns.begin()),m_aPatterns.size()))); + xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(Sequence< OUString>(&(*m_aPatterns.begin()),m_aPatterns.size()))); if ( !m_aTypes.empty() ) - xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< ::rtl::OUString>(&(*m_aTypes.begin()),m_aTypes.size()))); + xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< OUString>(&(*m_aTypes.begin()),m_aTypes.size()))); } } //---------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index 3f0fddb3995a..ea8e3d826a46 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -27,19 +27,19 @@ namespace dbaxml class ODBFilter; class OXMLTableFilterList : public SvXMLImportContext { - ::std::vector< ::rtl::OUString> m_aPatterns; - ::std::vector< ::rtl::OUString> m_aTypes; + ::std::vector< OUString> m_aPatterns; + ::std::vector< OUString> m_aTypes; ODBFilter& GetOwnImport(); public: OXMLTableFilterList( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~OXMLTableFilterList(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); @@ -48,7 +48,7 @@ namespace dbaxml @param _sTableFilterPattern The new filter pattern. */ - inline void pushTableFilterPattern(const ::rtl::OUString& _sTableFilterPattern) + inline void pushTableFilterPattern(const OUString& _sTableFilterPattern) { m_aPatterns.push_back(_sTableFilterPattern); } @@ -57,7 +57,7 @@ namespace dbaxml @param _sTypeFilter The new type filter. */ - inline void pushTableTypeFilter(const ::rtl::OUString& _sTypeFilter) + inline void pushTableTypeFilter(const OUString& _sTypeFilter) { m_aTypes.push_back(_sTypeFilter); } diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx index c18528b27e65..2c8c0f6af2eb 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx @@ -29,7 +29,7 @@ DBG_NAME(OXMLTableFilterPattern) OXMLTableFilterPattern::OXMLTableFilterPattern( SvXMLImport& rImport, sal_uInt16 nPrfx - ,const ::rtl::OUString& _sLocalName + ,const OUString& _sLocalName ,sal_Bool _bNameFilter ,OXMLTableFilterList& _rParent) :SvXMLImportContext( rImport, nPrfx, _sLocalName ) @@ -47,7 +47,7 @@ OXMLTableFilterPattern::~OXMLTableFilterPattern() DBG_DTOR(OXMLTableFilterPattern,NULL); } // ----------------------------------------------------------------------------- -void OXMLTableFilterPattern::Characters( const ::rtl::OUString& rChars ) +void OXMLTableFilterPattern::Characters( const OUString& rChars ) { if ( m_bNameFilter ) m_rParent.pushTableFilterPattern(rChars); diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx index c6ee32db2d4b..8402cc846a1e 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx @@ -31,13 +31,13 @@ namespace dbaxml public: OXMLTableFilterPattern( SvXMLImport& rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,sal_Bool _bNameFilter ,OXMLTableFilterList& _rParent); virtual ~OXMLTableFilterPattern(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; // ----------------------------------------------------------------------------- } // namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 1b9e65595ab2..d8c29c57fc44 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -99,14 +99,14 @@ private: */ void fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap); - SvXMLImportContext* CreateStylesContext(sal_uInt16 nPrefix,const ::rtl::OUString& rLocalName, + SvXMLImportContext* CreateStylesContext(sal_uInt16 nPrefix,const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ); - SvXMLImportContext* CreateScriptContext( const ::rtl::OUString& rLocalName ); + SvXMLImportContext* CreateScriptContext( const OUString& rLocalName ); protected: // SvXMLImport virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~ODBFilter() throw(); diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 1dc576bf2723..613c9c9990a9 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -67,7 +67,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbaxml_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dbaxml::OModuleRegistration::getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), + OUString::createFromAscii(pImplementationName), static_cast< XMultiServiceFactory* >(pServiceManager)); } diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx index 39236c097644..2228b36b5505 100644 --- a/dbaccess/source/inc/OAuthenticationContinuation.hxx +++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx @@ -41,28 +41,28 @@ class OOO_DLLPUBLIC_DBA OAuthenticationContinuation : sal_Bool m_bRemberPassword : 1; // remember the password for this session ? sal_Bool m_bCanSetUserName; - ::rtl::OUString m_sUser; // the user - ::rtl::OUString m_sPassword; // the user's password + OUString m_sUser; // the user + OUString m_sPassword; // the user's password public: OAuthenticationContinuation(); sal_Bool SAL_CALL canSetRealm( ) throw(com::sun::star::uno::RuntimeException); - void SAL_CALL setRealm( const ::rtl::OUString& Realm ) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL setRealm( const OUString& Realm ) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL canSetUserName( ) throw(com::sun::star::uno::RuntimeException); - void SAL_CALL setUserName( const ::rtl::OUString& UserName ) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL setUserName( const OUString& UserName ) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL canSetPassword( ) throw(com::sun::star::uno::RuntimeException); - void SAL_CALL setPassword( const ::rtl::OUString& Password ) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL setPassword( const OUString& Password ) throw(com::sun::star::uno::RuntimeException); com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > SAL_CALL getRememberPasswordModes( com::sun::star::ucb::RememberAuthentication& Default ) throw(com::sun::star::uno::RuntimeException); void SAL_CALL setRememberPassword( com::sun::star::ucb::RememberAuthentication Remember ) throw(com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL canSetAccount( ) throw(com::sun::star::uno::RuntimeException); - void SAL_CALL setAccount( const ::rtl::OUString& Account ) throw(com::sun::star::uno::RuntimeException); + void SAL_CALL setAccount( const OUString& Account ) throw(com::sun::star::uno::RuntimeException); com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > SAL_CALL getRememberAccountModes( com::sun::star::ucb::RememberAuthentication& Default ) throw(com::sun::star::uno::RuntimeException); void SAL_CALL setRememberAccount( com::sun::star::ucb::RememberAuthentication Remember ) throw(com::sun::star::uno::RuntimeException); void setCanChangeUserName( sal_Bool bVal ) { m_bCanSetUserName = bVal; } - ::rtl::OUString getUser() const { return m_sUser; } - ::rtl::OUString getPassword() const { return m_sPassword; } + OUString getUser() const { return m_sUser; } + OUString getPassword() const { return m_sPassword; } sal_Bool getRememberPassword() const { return m_bRemberPassword; } }; diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 11fff17bf856..c9e663e170a0 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -68,26 +68,26 @@ public: //---------------------------------------------------------------------------------- // (internal - not to be used outside - usually) #define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ + return OUString::createFromAscii(implasciiname); \ } \ #define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ { \ return getImplementationName_Static(); \ } \ - ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \ + OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \ { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ + return OUString::createFromAscii(implasciiname); \ } \ #define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ + sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ - const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(getSupportedServiceNames()); \ + const OUString* pSupported = aSupported.getConstArray(); \ for (sal_Int32 i=0; iequals(_rServiceName)) \ return sal_True; \ @@ -96,54 +96,54 @@ public: } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(1); \ + aSupported[0] = OUString::createFromAscii(serviceasciiname); \ return aSupported; \ } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ { \ return getSupportedServiceNames_Static(); \ } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(1); \ + aSupported[0] = OUString::createFromAscii(serviceasciiname); \ return aSupported; \ } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ { \ return getSupportedServiceNames_Static(); \ } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(2); \ + aSupported[0] = OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = OUString::createFromAscii(serviceasciiname2); \ return aSupported; \ } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(2); \ + aSupported[0] = OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = OUString::createFromAscii(serviceasciiname2); \ return aSupported; \ } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(3); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \ + ::com::sun::star::uno::Sequence< OUString > aSupported(3); \ + aSupported[0] = OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = OUString::createFromAscii(serviceasciiname2); \ + aSupported[2] = OUString::createFromAscii(serviceasciiname3); \ return aSupported; \ } \ @@ -157,14 +157,14 @@ public: //---------------------------------------------------------------------------------- // declare service info methods #define DECLARE_SERVICE_INFO() \ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ #define DECLARE_SERVICE_INFO_STATIC() \ DECLARE_SERVICE_INFO(); \ - static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ + static OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \ diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx index 8670a9737bbd..f556d9da9971 100644 --- a/dbaccess/source/inc/registrationhelper.hxx +++ b/dbaccess/source/inc/registrationhelper.hxx @@ -24,18 +24,18 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager, - const ::rtl::OUString & _rComponentName, + const OUString & _rComponentName, ::cppu::ComponentInstantiation _pCreateFunction, - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, + const ::com::sun::star::uno::Sequence< OUString > & _rServiceNames, rtl_ModuleCount* _p ); //========================================================================== class OModuleRegistration { - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >* s_pSupportedServices; static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; @@ -54,8 +54,8 @@ public: @see revokeComponent */ static void registerComponent( - const ::rtl::OUString& _rImplementationName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction); @@ -63,7 +63,7 @@ public: @param _rImplementationName the implementation name of the component */ static void revokeComponent( - const ::rtl::OUString& _rImplementationName); + const OUString& _rImplementationName); /** creates a Factory for the component with the given implementation name. Usually used from within component_getFactory. @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory @@ -71,7 +71,7 @@ public: @return the XInterface access to a factory for the component */ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager ); }; @@ -82,8 +82,8 @@ class OMultiInstanceAutoRegistration { public: /** assumed that the template argument has the three methods
      - static ::rtl::OUString getImplementationName_Static()
      - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()
      + static OUString getImplementationName_Static()
      + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()
      and
      static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)
      @@ -118,8 +118,8 @@ class OOneInstanceAutoRegistration { public: /** provided that the template argument has three methods
      - static ::rtl::OUString getImplementationName_Static()
      - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()
      + static OUString getImplementationName_Static()
      + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()
      and
      static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)
      diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx index 504944cb14ae..08d9a82db32b 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx @@ -63,17 +63,17 @@ namespace sdbtools virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableName > SAL_CALL createTableName() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XObjectNames > SAL_CALL getObjectNames() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const ::rtl::OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const ::rtl::OUString& command ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index 714156a9fafd..f05a417d796e 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.hxx @@ -64,11 +64,11 @@ namespace sdbtools ); // XObjectNames - virtual ::rtl::OUString SAL_CALL suggestName( ::sal_Int32 CommandType, const ::rtl::OUString& BaseName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL convertToSQLName( const ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isNameUsed( ::sal_Int32 CommandType, const ::rtl::OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isNameValid( ::sal_Int32 CommandType, const ::rtl::OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL checkNameForCreate( ::sal_Int32 CommandType, const ::rtl::OUString& Name ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL suggestName( ::sal_Int32 CommandType, const OUString& BaseName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL convertToSQLName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isNameUsed( ::sal_Int32 CommandType, const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isNameValid( ::sal_Int32 CommandType, const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL checkNameForCreate( ::sal_Int32 CommandType, const OUString& Name ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: virtual ~ObjectNames(); diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index 63c394a49402..653d176b573d 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.hxx @@ -64,17 +64,17 @@ namespace sdbtools ); // XTableName - virtual ::rtl::OUString SAL_CALL getCatalogName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalogName( const ::rtl::OUString& _catalogname ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSchemaName( const ::rtl::OUString& _schemaname ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTableName( const ::rtl::OUString& _tablename ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameForSelect() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalogName( const OUString& _catalogname ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSchemaName( const OUString& _schemaname ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTableName( const OUString& _tablename ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNameForSelect() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getTable() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _table ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getComposedName( ::sal_Int32 Type, ::sal_Bool _Quote ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComposedName( const ::rtl::OUString& ComposedName, ::sal_Int32 Type ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getComposedName( ::sal_Int32 Type, ::sal_Bool _Quote ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setComposedName( const OUString& ComposedName, ::sal_Int32 Type ) throw (::com::sun::star::uno::RuntimeException); protected: virtual ~TableName(); diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 7da24412dc9e..60230f39a445 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -52,7 +52,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::sdbtools::SdbtModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName)); + OUString::createFromAscii(pImplementationName)); } if (xRet.is()) diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx index e915337dfe73..9fdaf34e006e 100644 --- a/dbaccess/source/shared/registrationhelper.cxx +++ b/dbaccess/source/shared/registrationhelper.cxx @@ -27,15 +27,15 @@ using namespace ::com::sun::star; using namespace ::comphelper; using namespace ::cppu; -uno::Sequence< ::rtl::OUString >* OModuleRegistration::s_pImplementationNames = NULL; -uno::Sequence< uno::Sequence< ::rtl::OUString > >* OModuleRegistration::s_pSupportedServices = NULL; +uno::Sequence< OUString >* OModuleRegistration::s_pImplementationNames = NULL; +uno::Sequence< uno::Sequence< OUString > >* OModuleRegistration::s_pSupportedServices = NULL; uno::Sequence< sal_Int64 >* OModuleRegistration::s_pCreationFunctionPointers = NULL; uno::Sequence< sal_Int64 >* OModuleRegistration::s_pFactoryFunctionPointers = NULL; //-------------------------------------------------------------------------- void OModuleRegistration::registerComponent( - const ::rtl::OUString& _rImplementationName, - const uno::Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const uno::Sequence< OUString >& _rServiceNames, ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction) { @@ -43,8 +43,8 @@ void OModuleRegistration::registerComponent( { OSL_ENSURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers, "OModuleRegistration::registerComponent : inconsistent state (the pointers (1)) !"); - s_pImplementationNames = new uno::Sequence< ::rtl::OUString >; - s_pSupportedServices = new uno::Sequence< uno::Sequence< ::rtl::OUString > >; + s_pImplementationNames = new uno::Sequence< OUString >; + s_pSupportedServices = new uno::Sequence< uno::Sequence< OUString > >; s_pCreationFunctionPointers = new uno::Sequence< sal_Int64 >; s_pFactoryFunctionPointers = new uno::Sequence< sal_Int64 >; } @@ -69,7 +69,7 @@ void OModuleRegistration::registerComponent( } //-------------------------------------------------------------------------- -void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementationName) +void OModuleRegistration::revokeComponent(const OUString& _rImplementationName) { if (!s_pImplementationNames) { @@ -84,7 +84,7 @@ void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementatio "OModuleRegistration::revokeComponent : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplNames = s_pImplementationNames->getConstArray(); + const OUString* pImplNames = s_pImplementationNames->getConstArray(); for (sal_Int32 i=0; iequals(_rImplementationName)) @@ -108,7 +108,7 @@ void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementatio //-------------------------------------------------------------------------- uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const uno::Reference< lang::XMultiServiceFactory >& _rxServiceManager) { OSL_ENSURE(_rxServiceManager.is(), "OModuleRegistration::getComponentFactory : invalid argument (service manager) !"); @@ -131,8 +131,8 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray(); - const uno::Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray(); + const OUString* pImplName = s_pImplementationNames->getConstArray(); + const uno::Sequence< OUString >* pServices = s_pSupportedServices->getConstArray(); const sal_Int64* pComponentFunction = s_pCreationFunctionPointers->getConstArray(); const sal_Int64* pFactoryFunction = s_pFactoryFunctionPointers->getConstArray(); diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 2b5d850affdb..f0623e798e9e 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -192,7 +192,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec Reference< XHierarchicalNameContainer > xHierarchyName( xNames, UNO_QUERY ); if ( xNames.is() ) { - rtl::OString sDialogPosition; + OString sDialogPosition; svtools::QueryDeleteResult_Impl eResult = _bConfirm ? svtools::QUERYDELETE_YES : svtools::QUERYDELETE_ALL; // The list of elements to delete is allowed to contain related elements: A given element may diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index ba3971f930d4..486ca96a8baa 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -151,7 +151,7 @@ namespace dbaui @return The new tree. */ - DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage); + DBTreeListBox* createSimpleTree( const OString& _sHelpId, const Image& _rImage); DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); DECL_LINK( OnEntrySelChange, void* ); @@ -221,7 +221,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; + void getSelectionElementNames( ::std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ @@ -241,7 +241,7 @@ namespace dbaui * * \param _aNames the element names */ - void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); + void selectElements(const ::com::sun::star::uno::Sequence< OUString>& _aNames); /** return the qualified name. @param _pEntry @@ -250,7 +250,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; + OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /// return the element of currently select entry ElementType getElementType() const; @@ -294,7 +294,7 @@ namespace dbaui If we insert a table, the connection must be set. */ SvTreeListEntry* elementAdded(ElementType eType - ,const ::rtl::OUString& _rName + ,const OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one @@ -308,8 +308,8 @@ namespace dbaui If we insert a table, the connection must be set. */ void elementReplaced(ElementType eType - ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName ); + ,const OUString& _rOldName + ,const OUString& _rNewName ); /** removes an element from the detail page. @param _eType @@ -320,7 +320,7 @@ namespace dbaui If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType - ,const ::rtl::OUString& _rName ); + ,const OUString& _rName ); /// returns the preview mode @@ -352,8 +352,8 @@ namespace dbaui if it is a table, otherwise @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, - const ::rtl::OUString& _sName, + void showPreview( const OUString& _sDataSourceName, + const OUString& _sName, sal_Bool _bTable); protected: diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index f8bb55627901..67c9b57e9f96 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -89,7 +89,7 @@ namespace dbaui struct TaskEntry { - ::rtl::OUString sUNOCommand; + OUString sUNOCommand; sal_uInt16 nHelpID; String sTitle; bool bHideWhenDisabled; @@ -206,7 +206,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; + OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /** returns if an entry is a leaf @param _pEntry @@ -257,7 +257,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames ) const; + void getSelectionElementNames(::std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ @@ -277,7 +277,7 @@ namespace dbaui * * \param _aNames the element names */ - void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); + void selectElements(const ::com::sun::star::uno::Sequence< OUString>& _aNames); /** adds a new object to the detail page. @param _eType @@ -290,7 +290,7 @@ namespace dbaui If we insert a table, the connection must be set. */ SvTreeListEntry* elementAdded(ElementType eType - ,const ::rtl::OUString& _rName + ,const OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one @@ -306,8 +306,8 @@ namespace dbaui The object which was replaced */ void elementReplaced(ElementType eType - ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName ); + ,const OUString& _rOldName + ,const OUString& _rNewName ); /** removes an element from the detail page. @param _eType @@ -318,7 +318,7 @@ namespace dbaui If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType - ,const ::rtl::OUString& _rName ); + ,const OUString& _rName ); /// returns the preview mode PreviewMode getPreviewMode(); @@ -348,8 +348,8 @@ namespace dbaui if it is a table, otherwise @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, - const ::rtl::OUString& _sName, + void showPreview( const OUString& _sDataSourceName, + const OUString& _sName, sal_Bool _bTable); SvTreeListEntry* getEntry( const Point& _aPoint ) const; diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 2157175cc906..568d585c5758 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -361,7 +361,7 @@ void OApplicationView::paste() pTest->paste(); } // ----------------------------------------------------------------------------- -::rtl::OUString OApplicationView::getQualifiedName( SvTreeListEntry* _pEntry ) const +OUString OApplicationView::getQualifiedName( SvTreeListEntry* _pEntry ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->getQualifiedName( _pEntry ); @@ -427,7 +427,7 @@ sal_Int32 OApplicationView::getElementCount() return getDetailView()->getElementCount(); } // ----------------------------------------------------------------------------- -void OApplicationView::getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const +void OApplicationView::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); getDetailView()->getSelectionElementNames( _rNames ); @@ -445,27 +445,27 @@ void OApplicationView::describeCurrentSelectionForType( const ElementType _eType getDetailView()->describeCurrentSelectionForType( _eType, _out_rSelectedObjects ); } // ----------------------------------------------------------------------------- -void OApplicationView::selectElements(const Sequence< ::rtl::OUString>& _aNames) +void OApplicationView::selectElements(const Sequence< OUString>& _aNames) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); getDetailView()->selectElements( _aNames ); } // ----------------------------------------------------------------------------- -SvTreeListEntry* OApplicationView::elementAdded(ElementType eType,const ::rtl::OUString& _rName, const Any& _rObject ) +SvTreeListEntry* OApplicationView::elementAdded(ElementType eType,const OUString& _rName, const Any& _rObject ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->elementAdded(eType,_rName,_rObject); } // ----------------------------------------------------------------------------- -void OApplicationView::elementRemoved(ElementType eType,const ::rtl::OUString& _rName ) +void OApplicationView::elementRemoved(ElementType eType,const OUString& _rName ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); getDetailView()->elementRemoved(eType,_rName); } // ----------------------------------------------------------------------------- void OApplicationView::elementReplaced(ElementType _eType - ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName ) + ,const OUString& _rOldName + ,const OUString& _rNewName ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); getDetailView()->elementReplaced(_eType, _rOldName, _rNewName ); @@ -517,9 +517,9 @@ void OApplicationView::showPreview(const Reference< XContent >& _xContent) getDetailView()->showPreview(_xContent); } // ----------------------------------------------------------------------------- -void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName, +void OApplicationView::showPreview( const OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _sName, + const OUString& _sName, sal_Bool _bTable) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 9c9cddf0e239..ed82d61ae3b1 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -141,7 +141,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; + OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /** returns if an entry is a leaf @param _pEntry @@ -192,7 +192,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; + void getSelectionElementNames( ::std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ @@ -212,7 +212,7 @@ namespace dbaui * * \param _aNames the element names */ - void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); + void selectElements(const ::com::sun::star::uno::Sequence< OUString>& _aNames); /** adds a new object to the detail page. @param _eType @@ -225,7 +225,7 @@ namespace dbaui If we insert a table, the connection must be set. */ SvTreeListEntry* elementAdded(ElementType _eType - ,const ::rtl::OUString& _rName + ,const OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one @@ -241,8 +241,8 @@ namespace dbaui The object which was replaced */ void elementReplaced(ElementType eType - ,const ::rtl::OUString& _rOldName - ,const ::rtl::OUString& _rNewName ); + ,const OUString& _rOldName + ,const OUString& _rNewName ); /** removes an element from the detail page. @param _eType @@ -253,7 +253,7 @@ namespace dbaui If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType - ,const ::rtl::OUString& _rName ); + ,const OUString& _rName ); /** changes the container which should be displayed. The select handler will also be called. @@ -291,9 +291,9 @@ namespace dbaui if it is a table, otherwise @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _sName, + const OUString& _sName, sal_Bool _bTable); SvTreeListEntry* getEntry( const Point& _aPosPixel ) const; diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index 52981edb0bc3..15a3def5f7ac 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -64,7 +64,7 @@ namespace dbaui // container access void onSubComponentOpened( - const ::rtl::OUString& _rName, + const OUString& _rName, const sal_Int32 _nComponentType, const ElementOpenMode _eOpenMode, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& @@ -79,7 +79,7 @@ namespace dbaui previously */ bool activateSubFrame( - const ::rtl::OUString& _rName, + const OUString& _rName, const sal_Int32 _nComponentType, const ElementOpenMode _eOpenMode, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& o_rComponent @@ -95,7 +95,7 @@ namespace dbaui exist. */ bool closeSubFrames( - const ::rtl::OUString& _rName, + const OUString& _rName, const sal_Int32 _nComponentType ); @@ -112,7 +112,7 @@ namespace dbaui */ bool lookupSubComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& i_rComponent, - ::rtl::OUString& o_rName, + OUString& o_rName, sal_Int32& o_rComponentType ); diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index cf92e7fc68fd..52de673fb1f3 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -602,9 +602,9 @@ void OGenericUnoController::InvalidateFeature_Impl() #if OSL_DEBUG_LEVEL > 0 if ( m_aSupportedFeatures.end() == aFeaturePos ) { - ::rtl::OString sMessage( "OGenericUnoController::InvalidateFeature_Impl: feature id " ); - sMessage += ::rtl::OString::valueOf( aNextFeature.nId ); - sMessage += ::rtl::OString( " has been invalidated, but is not supported!" ); + OString sMessage( "OGenericUnoController::InvalidateFeature_Impl: feature id " ); + sMessage += OString::valueOf( aNextFeature.nId ); + sMessage += OString( " has been invalidated, but is not supported!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -774,9 +774,9 @@ void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyV // #i52602# #ifdef TIMELOG - ::rtl::OString sLog( "OGenericUnoController::dispatch( '" ); - sLog += ::rtl::OString( _aURL.Main.getStr(), _aURL.Main.getLength(), osl_getThreadTextEncoding() ); - sLog += ::rtl::OString( "' )" ); + OString sLog( "OGenericUnoController::dispatch( '" ); + sLog += OString( _aURL.Main.getStr(), _aURL.Main.getLength(), osl_getThreadTextEncoding() ); + sLog += OString( "' )" ); RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", sLog.getStr() ); #endif @@ -1325,7 +1325,7 @@ void OGenericUnoController::openHelpAgent(OUString const& _suHelpStringURL ) openHelpAgent( aURL ); } -void OGenericUnoController::openHelpAgent(const rtl::OString& _sHelpId) +void OGenericUnoController::openHelpAgent(const OString& _sHelpId) { openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _sHelpId ) ); } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index d37e7625323c..4a8eb5a0a6fb 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1907,7 +1907,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue break; case ID_TREE_CLOSE_CONN: - openHelpAgent( rtl::OString( HID_DSBROWSER_DISCONNECTING )); + openHelpAgent( OString( HID_DSBROWSER_DISCONNECTING )); closeConnection( m_pTreeView->getListBox().GetRootLevelParent( m_pTreeView->getListBox().GetCurEntry() ) ); break; diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 288515549f6b..0e0f60960e52 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -158,7 +158,7 @@ sal_Bool OColumnControlWindow::isAutoIncrementValueEnabled() const return m_bAutoIncrementEnabled; } // ----------------------------------------------------------------------------- -::rtl::OUString OColumnControlWindow::getAutoIncrementValue() const +OUString OColumnControlWindow::getAutoIncrementValue() const { return m_sAutoIncrementValue; } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index abe5d59f40e3..4e6bce8dc701 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -259,10 +259,10 @@ OFieldDescControl::~OFieldDescControl() String OFieldDescControl::BoolStringPersistent(const String& rUIString) const { if (rUIString == aNo) - return rtl::OUString('0'); + return OUString('0'); if (rUIString == aYes) - return rtl::OUString('1'); - return rtl::OUString(); + return OUString('1'); + return OUString(); } //------------------------------------------------------------------------------ @@ -526,7 +526,7 @@ String OFieldDescControl::GetControlText( sal_uInt16 nControlId ) break; case FIELD_PROPERTY_TEXTLEN: if (pTextLen) - return rtl::OUString::valueOf(static_cast(pTextLen->GetValue())); + return OUString::valueOf(static_cast(pTextLen->GetValue())); case FIELD_PROPERTY_NUMTYPE: if (pNumType) return pNumType->GetSelectEntry(); @@ -925,7 +925,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) m_nPos++; { sal_uInt32 nMax = EDIT_NOLIMIT; - ::rtl::OUString aTmpString; + OUString aTmpString; try { Reference< XDatabaseMetaData> xMetaData = getMetaData(); @@ -960,11 +960,11 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) pNumType = new OPropListBoxCtrl( this, STR_HELP_NUMERIC_TYPE, FIELD_PROPERTY_NUMTYPE, WB_DROPDOWN ); pNumType->SetDropDownLineCount(5); - pNumType->InsertEntry( rtl::OUString("Byte") ); - pNumType->InsertEntry( rtl::OUString("SmallInt") ); - pNumType->InsertEntry( rtl::OUString("Integer") ); - pNumType->InsertEntry( rtl::OUString("Single") ); - pNumType->InsertEntry( rtl::OUString("Double") ); + pNumType->InsertEntry( OUString("Byte") ); + pNumType->InsertEntry( OUString("SmallInt") ); + pNumType->InsertEntry( OUString("Integer") ); + pNumType->InsertEntry( OUString("Single") ); + pNumType->InsertEntry( OUString("Double") ); pNumType->SelectEntryPos(2); InitializeControl(pNumType,HID_TAB_ENT_NUMTYP,true); break; @@ -1022,7 +1022,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) } } // ----------------------------------------------------------------------------- -void OFieldDescControl::InitializeControl(Control* _pControl,const ::rtl::OString& _sHelpId,bool _bAddChangeHandler) +void OFieldDescControl::InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler) { _pControl->SetHelpId(_sHelpId); if ( _bAddChangeHandler ) @@ -1041,7 +1041,7 @@ FixedText* OFieldDescControl::CreateText(sal_uInt16 _nTextRes) return pFixedText; } // ----------------------------------------------------------------------------- -OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const rtl::OString& _sHelpId) +OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId) { OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER ); pControl->SetDecimalDigits(0); @@ -1287,7 +1287,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) ActivateAggregate( tpScale ); pScale->SetMax(::std::max(pFieldType->nMaximumScale,pFieldDescr->GetScale())); pScale->SetMin(pFieldType->nMinimumScale); - static const ::rtl::OUString s_sPRECISION("PRECISION"); + static const OUString s_sPRECISION("PRECISION"); pScale->SetSpecialReadOnly(pFieldType->aCreateParams.isEmpty() || pFieldType->aCreateParams == s_sPRECISION); } else @@ -1430,7 +1430,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if( pBoolDefault ) { // If pRequired = sal_True then the sal_Bool field must NOT contain <> - ::rtl::OUString sValue; + OUString sValue; pFieldDescr->GetControlDefault() >>= sValue; String sDef = BoolStringUI(sValue); @@ -1445,7 +1445,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) else pBoolDefault->SelectEntry(sDef); - pFieldDescr->SetControlDefault(makeAny(::rtl::OUString(BoolStringPersistent(pBoolDefault->GetSelectEntry())))); + pFieldDescr->SetControlDefault(makeAny(OUString(BoolStringPersistent(pBoolDefault->GetSelectEntry())))); } else if(pBoolDefault->GetEntryCount() < 3) { @@ -1614,7 +1614,7 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr ) ////////////////////////////////////////////////////////////////////// // Read out Controls - ::rtl::OUString sDefault; + OUString sDefault; if (pDefault) { sDefault = pDefault->GetText(); @@ -1786,7 +1786,7 @@ sal_Bool OFieldDescControl::isTextFormat(const OFieldDescription* _pFieldDescr,s // ----------------------------------------------------------------------------- String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDescr ,sal_Bool _bCheck) const { - ::rtl::OUString sDefault; + OUString sDefault; sal_Bool bCheck = !_bCheck || _pFieldDescr->GetControlDefault().hasValue(); if ( bCheck ) { @@ -1809,7 +1809,7 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes } catch(const Exception&) { - return ::rtl::OUString(); // return empty string for format example + return OUString(); // return empty string for format example } } } @@ -1821,13 +1821,13 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes Reference< ::com::sun::star::util::XNumberFormatter> xNumberFormatter = GetFormatter(); Reference xFormSet = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats()->getByKey(nFormatKey); OSL_ENSURE(xFormSet.is(),"XPropertySet is null!"); - ::rtl::OUString sFormat; - xFormSet->getPropertyValue(::rtl::OUString("FormatString")) >>= sFormat; + OUString sFormat; + xFormSet->getPropertyValue(OUString("FormatString")) >>= sFormat; if ( !bTextFormat ) { Locale aLocale; - ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString("Locale")) >>= aLocale; + ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,OUString("Locale")) >>= aLocale; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey); if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index f1ce93fe2091..d61d39e9d986 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -311,7 +311,7 @@ namespace dbaui { DBG_CHKTHIS(ORelationControl,NULL); - rtl::OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL ); + OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL ); Reference< XPropertySet> xDef; switch ( getColumnIdent(nColumnId) ) @@ -390,9 +390,9 @@ namespace dbaui //sal_Int32 nRows = GetRowCount(); Reference xSup(_xDest,UNO_QUERY); Reference xColumns = xSup->getColumns(); - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { m_pListCell->InsertEntry( *pIter ); diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index 04e960292cf6..2e28ddd34684 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -21,7 +21,7 @@ namespace dbaui { //------------------------------------------------------------------ - sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars) + sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars) { return ( (_cChar >= 'A' && _cChar <= 'Z') || @@ -32,8 +32,8 @@ namespace dbaui ); } //------------------------------------------------------------------ - sal_Bool OSQLNameChecker::checkString(const ::rtl::OUString& _sToCheck, - ::rtl::OUString& _rsCorrected) + sal_Bool OSQLNameChecker::checkString(const OUString& _sToCheck, + OUString& _rsCorrected) { sal_Bool bCorrected = sal_False; if ( m_bCheck ) @@ -56,7 +56,7 @@ namespace dbaui //------------------------------------------------------------------ void OSQLNameEdit::Modify() { - ::rtl::OUString sCorrected; + OUString sCorrected; if ( checkString( GetText(),sCorrected ) ) { Selection aSel = GetSelection(); @@ -70,7 +70,7 @@ namespace dbaui //------------------------------------------------------------------ void OSQLNameComboBox::Modify() { - ::rtl::OUString sCorrected; + OUString sCorrected; if ( checkString( GetText(),sCorrected ) ) { Selection aSel = GetSelection(); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 5a27288425a9..9aca17493a21 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -222,7 +222,7 @@ sal_Bool OTableGrantControl::SaveModified() if(nRow == -1 || nRow >= m_aTableNames.getLength()) return sal_False; - ::rtl::OUString sTableName = m_aTableNames[nRow]; + OUString sTableName = m_aTableNames[nRow]; sal_Bool bErg = sal_True; try { @@ -365,7 +365,7 @@ sal_Bool OTableGrantControl::isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivile return bAllowed; } // ----------------------------------------------------------------------------- -void OTableGrantControl::setUserName(const ::rtl::OUString _sUserName) +void OTableGrantControl::setUserName(const OUString _sUserName) { m_sUserName = _sUserName; m_aPrivMap = TTablePrivilegeMap(); diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 41a458c1961b..5723af67c355 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -62,14 +62,14 @@ namespace dbaui using ::com::sun::star::frame::UICommandDescription; using ::com::sun::star::graphic::XGraphic; - String GetCommandText( const sal_Char* _pCommandURL, const ::rtl::OUString& _rModuleName ) + String GetCommandText( const sal_Char* _pCommandURL, const OUString& _rModuleName ) { - ::rtl::OUString sLabel; + OUString sLabel; if ( !_pCommandURL || !*_pCommandURL ) return sLabel; Reference< XNameAccess > xUICommandLabels; - ::rtl::OUString sCommandURL = ::rtl::OUString::createFromAscii( _pCommandURL ); + OUString sCommandURL = OUString::createFromAscii( _pCommandURL ); try { @@ -93,7 +93,7 @@ namespace dbaui sal_Int32 nCount( aProperties.getLength() ); for ( sal_Int32 i=0; i>= sLabel; @@ -111,14 +111,14 @@ namespace dbaui return sLabel; } - Image GetCommandIcon( const sal_Char* _pCommandURL, const ::rtl::OUString& _rModuleName ) + Image GetCommandIcon( const sal_Char* _pCommandURL, const OUString& _rModuleName ) { Image aIcon; if ( !_pCommandURL || !*_pCommandURL ) return aIcon; Reference< XNameAccess > xUICommandLabels; - ::rtl::OUString sCommandURL = ::rtl::OUString::createFromAscii( _pCommandURL ); + OUString sCommandURL = OUString::createFromAscii( _pCommandURL ); try { do @@ -138,7 +138,7 @@ namespace dbaui if ( !xImageManager.is() ) break; - Sequence< ::rtl::OUString > aCommandList( &sCommandURL, 1 ); + Sequence< OUString > aCommandList( &sCommandURL, 1 ); Sequence > xIconList( xImageManager->getImages( 0, aCommandList ) ); if ( !xIconList.hasElements() ) break; @@ -179,7 +179,7 @@ namespace dbaui void OpenDocumentButton::impl_init( const sal_Char* _pAsciiModuleName ) { OSL_ENSURE( _pAsciiModuleName, "OpenDocumentButton::impl_init: invalid module name!" ); - m_sModule = ::rtl::OUString::createFromAscii( _pAsciiModuleName ); + m_sModule = OUString::createFromAscii( _pAsciiModuleName ); // our label should equal the UI text of the "Open" command String sLabel( GetCommandText( ".uno:Open", m_sModule ) ); @@ -220,7 +220,7 @@ namespace dbaui Sequence< Sequence< PropertyValue> > aHistory = SvtHistoryOptions().GetList( ePICKLIST ); Reference< XNameAccess > xFilterFactory; xFilterFactory = xFilterFactory.query( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString( "com.sun.star.document.FilterFactory" ) ) ); + OUString( "com.sun.star.document.FilterFactory" ) ) ); sal_uInt32 nCount = aHistory.getLength(); for ( sal_uInt32 nItem = 0; nItem < nCount; ++nItem ) @@ -229,10 +229,10 @@ namespace dbaui { // Get the current history item's properties. ::comphelper::SequenceAsHashMap aItemProperties( aHistory[ nItem ] ); - ::rtl::OUString sURL = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_URL, ::rtl::OUString() ); - ::rtl::OUString sFilter = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_FILTER, ::rtl::OUString() ); - String sTitle = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_TITLE, ::rtl::OUString() ); - ::rtl::OUString sPassword = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_PASSWORD, ::rtl::OUString() ); + OUString sURL = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_URL, OUString() ); + OUString sFilter = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_FILTER, OUString() ); + String sTitle = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_TITLE, OUString() ); + OUString sPassword = aItemProperties.getUnpackedValueOrDefault( HISTORY_PROPERTYNAME_PASSWORD, OUString() ); // If the entry is an impress file then insert it into the // history list and the list box. @@ -240,8 +240,8 @@ namespace dbaui xFilterFactory->getByName( sFilter ) >>= aProps; ::comphelper::SequenceAsHashMap aFilterProperties( aProps ); - ::rtl::OUString sDocumentService = aFilterProperties.getUnpackedValueOrDefault( - ::rtl::OUString( "DocumentService" ), ::rtl::OUString() ); + OUString sDocumentService = aFilterProperties.getUnpackedValueOrDefault( + OUString( "DocumentService" ), OUString() ); if ( sDocumentService.equalsAscii( _pAsciiModuleName ) ) { // yes, it's a Base document diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 349a50fa3506..11446c9008c0 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -94,9 +94,9 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : osl::MutexGuard g(m_mutex); m_notifier = n; } - css::uno::Sequence< rtl::OUString > s(2); - s[0] = rtl::OUString("FontHeight"); - s[1] = rtl::OUString("FontName"); + css::uno::Sequence< OUString > s(2); + s[0] = OUString("FontHeight"); + s[1] = OUString("FontName"); n->addPropertiesChangeListener(s, m_listener.get()); m_ColorConfig.AddListener(this); @@ -242,9 +242,9 @@ void OSqlEdit::ImplSetFont() { AllSettings aSettings = GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - rtl::OUString sFontName( + OUString sFontName( officecfg::Office::Common::Font::SourceViewFont::FontName::get(). - get_value_or( rtl::OUString() ) ); + get_value_or( OUString() ) ); if ( sFontName.isEmpty() ) { Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguageTag().getLanguageType(), 0 , this ) ); diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 3535ab0d52f1..7d635e324186 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -159,7 +159,7 @@ void OTableTreeListBox::implOnNewConnection( const Reference< XConnection >& _rx //------------------------------------------------------------------------ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConnection ) throw(SQLException) { - Sequence< ::rtl::OUString > sTables, sViews; + Sequence< OUString > sTables, sViews; String sCurrentActionError; try @@ -204,16 +204,16 @@ namespace { struct OViewSetter : public ::std::unary_function< OTableTreeListBox::TNames::value_type, bool> { - const Sequence< ::rtl::OUString> m_aViews; + const Sequence< OUString> m_aViews; ::comphelper::TStringMixEqualFunctor m_aEqualFunctor; - OViewSetter(const Sequence< ::rtl::OUString>& _rViews,sal_Bool _bCase) : m_aViews(_rViews),m_aEqualFunctor(_bCase){} - OTableTreeListBox::TNames::value_type operator() (const ::rtl::OUString& lhs) + OViewSetter(const Sequence< OUString>& _rViews,sal_Bool _bCase) : m_aViews(_rViews),m_aEqualFunctor(_bCase){} + OTableTreeListBox::TNames::value_type operator() (const OUString& lhs) { OTableTreeListBox::TNames::value_type aRet; aRet.first = lhs; - const ::rtl::OUString* pIter = m_aViews.getConstArray(); - const ::rtl::OUString* pEnd = m_aViews.getConstArray() + m_aViews.getLength(); + const OUString* pIter = m_aViews.getConstArray(); + const OUString* pEnd = m_aViews.getConstArray() + m_aViews.getLength(); aRet.second = (::std::find_if(pIter,pEnd,::std::bind2nd(m_aEqualFunctor,lhs)) != pEnd); return aRet; @@ -224,14 +224,14 @@ namespace // ----------------------------------------------------------------------------- void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConnection, - const Sequence< ::rtl::OUString>& _rTables, - const Sequence< ::rtl::OUString>& _rViews + const Sequence< OUString>& _rTables, + const Sequence< OUString>& _rViews ) { TNames aTables; aTables.resize(_rTables.getLength()); - const ::rtl::OUString* pIter = _rTables.getConstArray(); - const ::rtl::OUString* pEnd = _rTables.getConstArray() + _rTables.getLength(); + const OUString* pIter = _rTables.getConstArray(); + const OUString* pEnd = _rTables.getConstArray() + _rTables.getLength(); try { Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW ); @@ -248,9 +248,9 @@ void OTableTreeListBox::UpdateTableList( //------------------------------------------------------------------------ namespace { - ::std::vector< ::rtl::OUString > lcl_getMetaDataStrings_throw( const Reference< XResultSet >& _rxMetaDataResult, sal_Int32 _nColumnIndex ) + ::std::vector< OUString > lcl_getMetaDataStrings_throw( const Reference< XResultSet >& _rxMetaDataResult, sal_Int32 _nColumnIndex ) { - ::std::vector< ::rtl::OUString > aStrings; + ::std::vector< OUString > aStrings; Reference< XRow > xRow( _rxMetaDataResult, UNO_QUERY_THROW ); while ( _rxMetaDataResult->next() ) aStrings.push_back( xRow->getString( _nColumnIndex ) ); @@ -322,12 +322,12 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn // implAddEntry) bool bCatalogs = bSupportsCatalogs && xMeta->isCatalogAtStart(); - ::std::vector< ::rtl::OUString > aFolderNames( lcl_getMetaDataStrings_throw( + ::std::vector< OUString > aFolderNames( lcl_getMetaDataStrings_throw( bCatalogs ? xMeta->getCatalogs() : xMeta->getSchemas(), 1 ) ); sal_Int32 nFolderType = bCatalogs ? DatabaseObjectContainer::CATALOG : DatabaseObjectContainer::SCHEMA; SvTreeListEntry* pRootEntry = getAllObjectsEntry(); - for ( ::std::vector< ::rtl::OUString >::const_iterator folder = aFolderNames.begin(); + for ( ::std::vector< OUString >::const_iterator folder = aFolderNames.begin(); folder != aFolderNames.end(); ++folder ) @@ -439,7 +439,7 @@ void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rSt //------------------------------------------------------------------------ SvTreeListEntry* OTableTreeListBox::implAddEntry( const Reference< XDatabaseMetaData >& _rxMeta, - const ::rtl::OUString& _rTableName, + const OUString& _rTableName, sal_Bool _bCheckName ) { @@ -448,7 +448,7 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry( return NULL; // split the complete name into it's components - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; qualifiedNameComponents( _rxMeta, _rTableName, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); SvTreeListEntry* pParentEntry = getAllObjectsEntry(); @@ -462,9 +462,9 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry( // +- catalog // +- table sal_Bool bCatalogAtStart = _rxMeta->isCatalogAtStart(); - const ::rtl::OUString& rFirstName = bCatalogAtStart ? sCatalog : sSchema; + const OUString& rFirstName = bCatalogAtStart ? sCatalog : sSchema; const sal_Int32 nFirstFolderType = bCatalogAtStart ? DatabaseObjectContainer::CATALOG : DatabaseObjectContainer::SCHEMA; - const ::rtl::OUString& rSecondName = bCatalogAtStart ? sSchema : sCatalog; + const OUString& rSecondName = bCatalogAtStart ? sSchema : sCatalog; const sal_Int32 nSecondFolderType = bCatalogAtStart ? DatabaseObjectContainer::SCHEMA : DatabaseObjectContainer::CATALOG; if ( !rFirstName.isEmpty() ) @@ -515,7 +515,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry SvTreeListEntry* pParent = GetParent( _pEntry ); sal_Int32 nParentEntryType = pParent ? reinterpret_cast< sal_IntPtr >( pParent->GetUserData() ) : -1; - ::rtl::OUStringBuffer buffer; + OUStringBuffer buffer; if ( nEntryType == DatabaseObjectContainer::CATALOG ) { if ( nParentEntryType == DatabaseObjectContainer::SCHEMA ) @@ -545,7 +545,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry } //------------------------------------------------------------------------ -SvTreeListEntry* OTableTreeListBox::addedTable( const ::rtl::OUString& _rName ) +SvTreeListEntry* OTableTreeListBox::addedTable( const OUString& _rName ) { try { @@ -580,9 +580,9 @@ String OTableTreeListBox::getQualifiedTableName( SvTreeListEntry* _pEntry ) cons if ( !impl_getAndAssertMetaData( xMeta ) ) return String(); - ::rtl::OUString sCatalog; - ::rtl::OUString sSchema; - ::rtl::OUString sTable; + OUString sCatalog; + OUString sSchema; + OUString sTable; SvTreeListEntry* pSchema = GetParent( _pEntry ); if ( pSchema ) @@ -616,7 +616,7 @@ String OTableTreeListBox::getQualifiedTableName( SvTreeListEntry* _pEntry ) cons } //------------------------------------------------------------------------ -SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUString& _rName ) +SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const OUString& _rName ) { try { @@ -625,7 +625,7 @@ SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUStri return NULL; // split the complete name into it's components - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; qualifiedNameComponents(xMeta, _rName, sCatalog, sSchema, sName,::dbtools::eInDataManipulation); SvTreeListEntry* pParent = getAllObjectsEntry(); @@ -654,7 +654,7 @@ SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUStri return NULL; } //------------------------------------------------------------------------ -void OTableTreeListBox::removedTable( const ::rtl::OUString& _rName ) +void OTableTreeListBox::removedTable( const OUString& _rName ) { try { diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 6baf9d09bbf3..0bbae366ef9f 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -56,7 +56,7 @@ namespace dbaui namespace { - void lcl_copy(Menu* _pMenu,sal_uInt16 _nMenuId,sal_uInt16 _nMenuPos,ToolBox* _pToolBox,sal_uInt16 _nToolId,const ::rtl::OUString& _sCommand) + void lcl_copy(Menu* _pMenu,sal_uInt16 _nMenuId,sal_uInt16 _nMenuPos,ToolBox* _pToolBox,sal_uInt16 _nToolId,const OUString& _sCommand) { if ( _pMenu->GetItemType(_nMenuPos) != MENUITEM_STRING ) _pToolBox->SetItemImage(_nToolId, _pMenu->GetItemImage(_nMenuId)); @@ -106,19 +106,19 @@ namespace dbaui if ( m_aCommandURL == ".uno:DBNewForm" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewForm") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewView") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewViewSQL") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewQuery") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewQuerySql") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewReport") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewReportAutoPilot"),sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBNewTable") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewForm") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewView") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewViewSQL") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewQuery") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewQuerySql") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewReport") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewReportAutoPilot"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBNewTable") ,sal_True)); } else { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:Refresh") ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:DBRebuildData") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:Refresh") ,sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:DBRebuildData") ,sal_True)); } TCommandState::iterator aIter = m_aStates.begin(); @@ -187,13 +187,13 @@ namespace dbaui try { Reference xModuleCfgMgrSupplier(ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(getServiceManager()))); - Reference xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument")); + Reference xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(OUString("com.sun.star.sdb.OfficeDatabaseDocument")); Reference xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); short nImageType = hasBigImages() ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT; - Sequence< ::rtl::OUString> aSeq(1); + Sequence< OUString> aSeq(1); sal_uInt16 nCount = pMenu->GetItemCount(); for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos) { diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 202c54f9c991..6937b06af57b 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -63,7 +63,7 @@ using namespace comphelper; DBG_NAME(OCollectionView) OCollectionView::OCollectionView( Window * pParent ,const Reference< XContent>& _xContent - ,const ::rtl::OUString& _sDefaultName + ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) : ModalDialog( pParent, ModuleRes(DLG_COLLECTION_VIEW)) , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) @@ -115,12 +115,12 @@ Reference< XContent> OCollectionView::getSelectedFolder() const // ----------------------------------------------------------------------------- IMPL_LINK_NOARG(OCollectionView, Save_Click) { - ::rtl::OUString sName = m_aName.GetText(); + OUString sName = m_aName.GetText(); if ( sName.isEmpty() ) return 0; try { - ::rtl::OUString sSubFolder = m_aView.GetCurrentURL(); + OUString sSubFolder = m_aView.GetCurrentURL(); sal_Int32 nIndex = sName.lastIndexOf('/') + 1; if ( nIndex ) { @@ -154,17 +154,17 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) { Sequence< Any > aValues(2); PropertyValue aValue; - aValue.Name = ::rtl::OUString("ResourceName"); + aValue.Name = OUString("ResourceName"); aValue.Value <<= sSubFolder; aValues[0] <<= aValue; - aValue.Name = ::rtl::OUString("ResourceType"); - aValue.Value <<= ::rtl::OUString("folder"); + aValue.Name = OUString("ResourceType"); + aValue.Value <<= OUString("folder"); aValues[1] <<= aValue; InteractionClassification eClass = InteractionClassification_ERROR; ::com::sun::star::ucb::IOErrorCode eError = IOErrorCode_NOT_EXISTING_PATH; - ::rtl::OUString sTemp; + OUString sTemp; InteractiveAugmentedIOException aException(sTemp,Reference(),eClass,eError,aValues); @@ -253,7 +253,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) Reference xNameAccess(m_xContent,UNO_QUERY); if ( xNameAccess.is() ) { - ::rtl::OUString sSubFolder = m_aView.GetCurrentURL(); + OUString sSubFolder = m_aView.GetCurrentURL(); sal_Int32 nIndex = sSubFolder.lastIndexOf('/') + 1; sSubFolder = sSubFolder.getToken(0,'/',nIndex); if ( !sSubFolder.isEmpty() ) @@ -284,11 +284,11 @@ void OCollectionView::initCurrentPath() { if ( m_xContent.is() ) { - const ::rtl::OUString sCID = m_xContent->getIdentifier()->getContentIdentifier(); - const static ::rtl::OUString s_sFormsCID("private:forms"); - const static ::rtl::OUString s_sReportsCID("private:reports"); + const OUString sCID = m_xContent->getIdentifier()->getContentIdentifier(); + const static OUString s_sFormsCID("private:forms"); + const static OUString s_sReportsCID("private:reports"); m_bCreateForm = s_sFormsCID == sCID ; - ::rtl::OUString sPath("/"); + OUString sPath("/"); if ( m_bCreateForm && sCID.getLength() != s_sFormsCID.getLength()) sPath = sCID.copy(s_sFormsCID.getLength()); else if ( !m_bCreateForm && sCID.getLength() != s_sReportsCID.getLength() ) @@ -306,7 +306,7 @@ void OCollectionView::initCurrentPath() m_aUp.Enable(bEnable); } // ----------------------------------------------------------------------------- -::rtl::OUString OCollectionView::getName() const +OUString OCollectionView::getName() const { return m_aName.GetText(); } diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 442eac5ee225..1423ee136f6c 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -227,7 +227,7 @@ DBG_NAME(OConnectionHelper) break; case ::dbaccess::DST_MSACCESS: { - const ::rtl::OUString sExt("*.mdb"); + const OUString sExt("*.mdb"); String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, @@ -239,7 +239,7 @@ DBG_NAME(OConnectionHelper) break; case ::dbaccess::DST_MSACCESS_2007: { - const ::rtl::OUString sAccdb("*.accdb"); + const OUString sAccdb("*.accdb"); String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, @@ -253,8 +253,8 @@ DBG_NAME(OConnectionHelper) case ::dbaccess::DST_ODBC: { // collect all ODBC data source names - ::rtl::OUString sCurrDatasource = getURLNoPrefix(); - ::rtl::OUString sDataSource; + OUString sCurrDatasource = getURLNoPrefix(); + OUString sDataSource; if ( getSelectedDataSource(sDataSource,sCurrDatasource) && !sDataSource.isEmpty() ) { setURLNoPrefix(sDataSource); @@ -268,8 +268,8 @@ DBG_NAME(OConnectionHelper) #ifdef _ADO_DATALINK_BROWSE_ case ::dbaccess::DST_ADO: { - ::rtl::OUString sOldDataSource=getURLNoPrefix(); - ::rtl::OUString sNewDataSource; + OUString sOldDataSource=getURLNoPrefix(); + OUString sNewDataSource; HWND hWnd = GetParent()->GetSystemData()->hWnd; sNewDataSource = getAdoDatalink((long)hWnd,sOldDataSource); if ( !sNewDataSource.isEmpty() ) @@ -294,10 +294,10 @@ DBG_NAME(OConnectionHelper) Reference xMozillaBootstrap = MozillaBootstrap::create(xContext); // collect all Mozilla Profiles - ::com::sun::star::uno::Sequence< ::rtl::OUString > list; + ::com::sun::star::uno::Sequence< OUString > list; xMozillaBootstrap->getProfileList( profileType, list ); - const ::rtl::OUString * pArray = list.getConstArray(); + const OUString * pArray = list.getConstArray(); sal_Int32 count = list.getLength(); @@ -308,7 +308,7 @@ DBG_NAME(OConnectionHelper) // execute the select dialog ODatasourceSelectDialog aSelector(GetParent(), aProfiles); - ::rtl::OUString sOldProfile=getURLNoPrefix(); + OUString sOldProfile=getURLNoPrefix(); if (!sOldProfile.isEmpty()) aSelector.Select(sOldProfile); @@ -504,7 +504,7 @@ DBG_NAME(OConnectionHelper) } // ----------------------------------------------------------------------------- - IS_PATH_EXIST OConnectionHelper::pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const + IS_PATH_EXIST OConnectionHelper::pathExists(const OUString& _rURL, sal_Bool bIsFile) const { ::ucbhelper::Content aCheckExistence; sal_Bool bExists = sal_False; @@ -564,7 +564,7 @@ DBG_NAME(OConnectionHelper) INetProtocol eProtocol = aParser.GetProtocol(); - ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels + ::std::vector< OUString > aToBeCreated; // the to-be-created levels // search a level which exists IS_PATH_EXIST eParentExists = PATH_NOT_EXIST; @@ -585,27 +585,27 @@ DBG_NAME(OConnectionHelper) Reference< XCommandEnvironment > xEmptyEnv; ::ucbhelper::Content aParent(aParser.GetMainURL(INetURLObject::NO_DECODE), xEmptyEnv, comphelper::getProcessComponentContext()); - ::rtl::OUString sContentType; + OUString sContentType; if ( INET_PROT_FILE == eProtocol ) { - sContentType = ::rtl::OUString("application/vnd.sun.staroffice.fsys-folder"); + sContentType = OUString("application/vnd.sun.staroffice.fsys-folder"); // the file UCP currently does not support the ContentType property } else { - Any aContentType = aParent.getPropertyValue( ::rtl::OUString("ContentType") ); + Any aContentType = aParent.getPropertyValue( OUString("ContentType") ); aContentType >>= sContentType; } // the properties which need to be set on the new content - Sequence< ::rtl::OUString > aNewDirectoryProperties(1); - aNewDirectoryProperties[0] = ::rtl::OUString("Title"); + Sequence< OUString > aNewDirectoryProperties(1); + aNewDirectoryProperties[0] = OUString("Title"); // the values to be set Sequence< Any > aNewDirectoryAttributes(1); // loop - for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); + for ( ::std::vector< OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); aLocalName != aToBeCreated.rend(); ++aLocalName ) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 1497db425d44..2b9e4980f1d5 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -47,7 +47,7 @@ namespace dbaui FixedText m_aFT_Connection; OConnectionURLEdit m_aConnectionURL; PushButton m_aPB_Connection; - ::rtl::OUString m_eType; // the type can't be changed in this class, so we hold it as member. + OUString m_eType; // the type can't be changed in this class, so we hold it as member. public: @@ -78,7 +78,7 @@ namespace dbaui sal_Int32 checkPathExistence(const String& _rURL); - IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const; + IS_PATH_EXIST pathExists(const OUString& _rURL, sal_Bool bIsFile) const; sal_Bool createDirectoryDeep(const String& _rPathNormalized); sal_Bool commitURL(); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index f1cfea4ef953..d46a3504bb8d 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -192,7 +192,7 @@ DBG_NAME(OTextConnectionPageSetup) pCollection = pCollectionItem->getCollection(); OSL_ENSURE(pCollection, "OLDAPConnectionPageSetup::FillItemSet : really need a DSN type collection !"); - OUString sUrl = pCollection->getPrefix( ::rtl::OUString("sdbc:address:ldap:")); + OUString sUrl = pCollection->getPrefix( OUString("sdbc:address:ldap:")); sUrl += m_aETHostServer.GetText(); _rSet.Put(SfxStringItem(DSID_CONNECTURL, sUrl)); bChangedSomething = sal_True; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 405ec96bee38..bcee91b604bc 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -117,9 +117,9 @@ namespace catch(Exception&) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage("ODbAdminDialog::implTranslateProperty: could not set the property "); - sMessage += ::rtl::OString(_rName.getStr(), _rName.getLength(), RTL_TEXTENCODING_ASCII_US); - sMessage += ::rtl::OString("!"); + OString sMessage("ODbAdminDialog::implTranslateProperty: could not set the property "); + sMessage += OString(_rName.getStr(), _rName.getLength(), RTL_TEXTENCODING_ASCII_US); + sMessage += OString("!"); OSL_FAIL(sMessage.getStr()); #endif } @@ -589,9 +589,9 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr catch(Exception&) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString aMessage("ODbDataSourceAdministrationHelper::translateProperties: could not extract the property "); - aMessage += ::rtl::OString(aDirect->second.getStr(), aDirect->second.getLength(), RTL_TEXTENCODING_ASCII_US); - aMessage += ::rtl::OString("!"); + OString aMessage("ODbDataSourceAdministrationHelper::translateProperties: could not extract the property "); + aMessage += OString(aDirect->second.getStr(), aDirect->second.getLength(), RTL_TEXTENCODING_ASCII_US); + aMessage += OString("!"); OSL_FAIL(aMessage.getStr()); #endif } @@ -902,7 +902,7 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty(const Reference< X #if OSL_DEBUG_LEVEL > 0 //------------------------------------------------------------------------- -::rtl::OString ODbDataSourceAdministrationHelper::translatePropertyId( sal_Int32 _nId ) +OString ODbDataSourceAdministrationHelper::translatePropertyId( sal_Int32 _nId ) { OUString aString; @@ -918,7 +918,7 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty(const Reference< X aString = indirectPos->second; } - ::rtl::OString aReturn( aString.getStr(), aString.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString aReturn( aString.getStr(), aString.getLength(), RTL_TEXTENCODING_ASCII_US ); return aReturn; } #endif @@ -937,9 +937,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no string)!" ) ).getStr() ); } @@ -967,9 +967,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no boolean)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no boolean)!" ) ).getStr() ); } @@ -984,9 +984,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no int)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no int)!" ) ).getStr() ); } @@ -1017,9 +1017,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { OSL_FAIL( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string sequence)!" ) + ( OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += OString( translatePropertyId( _nId ) ) + += OString( " should be no string sequence)!" ) ).getStr() ); } diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 983878c1c3ba..e72c40fe9828 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -168,7 +168,7 @@ namespace dbaui sal_Bool hasAuthentication(const SfxItemSet& _rSet) const; #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString translatePropertyId( sal_Int32 _nId ); + OString translatePropertyId( sal_Int32 _nId ); #endif }; diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index e60236d7608b..b613cd697590 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -30,7 +30,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::NamedValue; using namespace dbaui; -void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext, ::std::vector< sal_Int32>& _out_rDetailsIds ) +void ODriversSettings::getSupportedIndirectSettings( const OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext, ::std::vector< sal_Int32>& _out_rDetailsIds ) { // for a number of settings, we do not need to use hard-coded here, but can ask a // central DataSourceUI instance. @@ -67,30 +67,30 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR } } #endif - typedef ::std::pair TProperties; - TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString("ShowDeleted")) - ,TProperties(DSID_CHARSET,::rtl::OUString("CharSet")) - ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString("FieldDelimiter")) - ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString("StringDelimiter")) - ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString("DecimalDelimiter")) - ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString("ThousandDelimiter")) - ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString("Extension")) - ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString("HeaderLine")) - ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString("SystemDriverSettings")) - ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString("ShutdownDatabase")) - ,TProperties(DSID_CONN_DATAINC,::rtl::OUString("DataCacheSizeIncrement")) - ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString("DataCacheSize")) - ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString("ControlUser")) - ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString("ControlPassword")) - ,TProperties(DSID_USECATALOG,::rtl::OUString("UseCatalog")) - ,TProperties(DSID_CONN_SOCKET,::rtl::OUString("LocalSocket")) - ,TProperties(DSID_NAMED_PIPE,::rtl::OUString("NamedPipe")) - ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString("JavaDriverClass")) - ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString("BaseDN")) - ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString("MaxRowCount")) - ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString("UseSSL")) - ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString("IgnoreCurrency")) - ,TProperties(0,::rtl::OUString()) + typedef ::std::pair TProperties; + TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,OUString("ShowDeleted")) + ,TProperties(DSID_CHARSET,OUString("CharSet")) + ,TProperties(DSID_FIELDDELIMITER,OUString("FieldDelimiter")) + ,TProperties(DSID_TEXTDELIMITER,OUString("StringDelimiter")) + ,TProperties(DSID_DECIMALDELIMITER,OUString("DecimalDelimiter")) + ,TProperties(DSID_THOUSANDSDELIMITER,OUString("ThousandDelimiter")) + ,TProperties(DSID_TEXTFILEEXTENSION,OUString("Extension")) + ,TProperties(DSID_TEXTFILEHEADER,OUString("HeaderLine")) + ,TProperties(DSID_ADDITIONALOPTIONS,OUString("SystemDriverSettings")) + ,TProperties(DSID_CONN_SHUTSERVICE,OUString("ShutdownDatabase")) + ,TProperties(DSID_CONN_DATAINC,OUString("DataCacheSizeIncrement")) + ,TProperties(DSID_CONN_CACHESIZE,OUString("DataCacheSize")) + ,TProperties(DSID_CONN_CTRLUSER,OUString("ControlUser")) + ,TProperties(DSID_CONN_CTRLPWD,OUString("ControlPassword")) + ,TProperties(DSID_USECATALOG,OUString("UseCatalog")) + ,TProperties(DSID_CONN_SOCKET,OUString("LocalSocket")) + ,TProperties(DSID_NAMED_PIPE,OUString("NamedPipe")) + ,TProperties(DSID_JDBCDRIVERCLASS,OUString("JavaDriverClass")) + ,TProperties(DSID_CONN_LDAP_BASEDN,OUString("BaseDN")) + ,TProperties(DSID_CONN_LDAP_ROWCOUNT,OUString("MaxRowCount")) + ,TProperties(DSID_CONN_LDAP_USESSL,OUString("UseSSL")) + ,TProperties(DSID_IGNORECURRENCY,OUString("IgnoreCurrency")) + ,TProperties(0,OUString()) }; // TODO: This mapping between IDs and property names already exists - in ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper. // Another mapping (which is also duplicated in ODbDataSourceAdministrationHelper) exists in dsmeta.cxx. We should diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 219dfa106200..21854d52a8a8 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -40,7 +40,7 @@ namespace dbaui @param _out_rDetailsIds Will be filled. */ - static void getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); + static void getSupportedIndirectSettings( const OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); /** Creates the detail page for Dbase */ diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 0d1dad07d5d9..05b6bd961bce 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -437,9 +437,9 @@ DBG_NAME(OTextConnectionHelper) { String sExtension; if (m_aRBAccessTextFiles.IsChecked()) - sExtension = rtl::OUString("txt"); + sExtension = OUString("txt"); else if (m_aRBAccessCSVFiles.IsChecked()) - sExtension = rtl::OUString("csv"); + sExtension = OUString("csv"); else { sExtension = m_aETOwnExtension.GetText(); @@ -458,11 +458,11 @@ DBG_NAME(OTextConnectionHelper) return rBox.GetText().copy(0); if ( !( &m_aTextSeparator == &rBox && nPos == (rBox.GetEntryCount()-1) ) ) - return rtl::OUString( + return OUString( static_cast< sal_Unicode >( rList.GetToken(((nPos*2)+1), nTok ).ToInt32())); // somewhat strange ... translates for instance an "32" into " " - return rtl::OUString(); + return OUString(); } void OTextConnectionHelper::SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ) @@ -473,7 +473,7 @@ DBG_NAME(OTextConnectionHelper) for( i=0 ; i( rList.GetToken( (i+1), nTok ).ToInt32())); diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index a0d074e87aa9..ad921e5e97e5 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -175,8 +175,8 @@ void OUserAdmin::FillUserNames() m_LB_USER.Clear(); m_aUserNames = m_xUsers->getElementNames(); - const ::rtl::OUString* pBegin = m_aUserNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength(); + const OUString* pBegin = m_aUserNames.getConstArray(); + const OUString* pEnd = pBegin + m_aUserNames.getLength(); for(;pBegin != pEnd;++pBegin) m_LB_USER.InsertEntry(*pBegin); @@ -223,8 +223,8 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) Reference xNewUser = xUserFactory->createDataDescriptor(); if(xNewUser.is()) { - xNewUser->setPropertyValue(PROPERTY_NAME,makeAny(rtl::OUString(aPwdDlg.GetUser()))); - xNewUser->setPropertyValue(PROPERTY_PASSWORD,makeAny(rtl::OUString(aPwdDlg.GetPassword()))); + xNewUser->setPropertyValue(PROPERTY_NAME,makeAny(OUString(aPwdDlg.GetUser()))); + xNewUser->setPropertyValue(PROPERTY_PASSWORD,makeAny(OUString(aPwdDlg.GetPassword()))); Reference xAppend(m_xUsers,UNO_QUERY); if(xAppend.is()) xAppend->appendByDescriptor(xNewUser); @@ -241,7 +241,7 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) m_xUsers->getByName(sName) >>= xUser; if(xUser.is()) { - ::rtl::OUString sNewPassword,sOldPassword; + OUString sNewPassword,sOldPassword; OPasswordDialog aDlg(this,sName); if(aDlg.Execute() == RET_OK) { diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 6fa2288c6e8b..1764d77895b5 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -52,7 +52,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames; + ::com::sun::star::uno::Sequence< OUString> m_aUserNames; String m_UserName; diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 404cefcf5a9c..3da067f29509 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -110,7 +110,7 @@ DBG_NAME(OUserAdminDlg) if ( !aMetaData.supportsUserAdministration( getORB() ) ) { String sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); - throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any()); + throw SQLException(sError,NULL,OUString("S1000") ,0,Any()); } } catch(const SQLException&) @@ -172,7 +172,7 @@ DBG_NAME(OUserAdminDlg) return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- - ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const + OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -182,7 +182,7 @@ DBG_NAME(OUserAdminDlg) m_pImpl->clearPassword(); } // ----------------------------------------------------------------------------- - void OUserAdminDlg::setTitle(const ::rtl::OUString& _sTitle) + void OUserAdminDlg::setTitle(const OUString& _sTitle) { SetText(_sTitle); } diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 250a431d6f86..fd2c978b502c 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -168,7 +168,7 @@ namespace dbaui m_aControlDependencies.enableOnRadioCheck( m_aNamedPipeRadio, m_aNamedPipe ); m_aControlDependencies.addController( ::svt::PDialogController( - new TextResetOperatorController( m_aHostName, rtl::OUString("localhost") ) + new TextResetOperatorController( m_aHostName, OUString("localhost") ) ) ); // sockets are available on Unix systems only, named pipes only on Windows diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 558dd9919a9f..3fbebe0a9cd7 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -78,7 +78,7 @@ namespace dbaui } //------------------------------------------------------------------------- - OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const rtl::OString& _rId, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) + OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rUIXMLDescription, _rAttrSet) ,m_abEnableRoadmap(sal_False) ,m_pAdminDialog(NULL) @@ -147,7 +147,7 @@ namespace dbaui return 0L; } // ----------------------------------------------------------------------- - sal_Bool OGenericAdministrationPage::getSelectedDataSource(::rtl::OUString& _sReturn,::rtl::OUString& _sCurr) + sal_Bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn,OUString& _sCurr) { // collect all ODBC data source names StringBag aOdbcDatasources; diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index e9e11c8a853e..2a9d08c4e741 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -109,7 +109,7 @@ namespace dbaui m_xORB; public: OGenericAdministrationPage(Window* _pParent, const ResId& _rId, const SfxItemSet& _rAttrSet); - OGenericAdministrationPage(Window* _pParent, const rtl::OString& _rId, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); + OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); ~OGenericAdministrationPage(); /// set a handler which gets called every time something on the page has been modified @@ -146,7 +146,7 @@ namespace dbaui @return if an error occurred, otherwise */ - sal_Bool getSelectedDataSource(::rtl::OUString& _sReturn,::rtl::OUString& _sCurr); + sal_Bool getSelectedDataSource(OUString& _sReturn,OUString& _sCurr); // svt::IWizardPageController virtual void initializePage(); diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index dcbd89c38dc7..a6dcb45b0f97 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -48,9 +48,9 @@ const CLSID CLSID_DataLinks = { 0x2206CDB2, 0x19C1, 0x11D1, { 0x89, 0xE0, 0x00, BSTR PromptEdit(long hWnd,BSTR connstr); BSTR PromptNew(long hWnd); -::rtl::OUString getAdoDatalink(long hWnd,::rtl::OUString& oldLink) +OUString getAdoDatalink(long hWnd,OUString& oldLink) { - ::rtl::OUString dataLink; + OUString dataLink; if (!oldLink.isEmpty()) { dataLink=reinterpret_cast(PromptEdit(hWnd,(BSTR)oldLink.getStr())); diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx index 523e9a1df854..e5de6c289a28 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.hxx +++ b/dbaccess/source/ui/dlg/adodatalinks.hxx @@ -23,6 +23,6 @@ #include #include "commontypes.hxx" -::rtl::OUString getAdoDatalink(long hWnd,::rtl::OUString& oldLink); +OUString getAdoDatalink(long hWnd,OUString& oldLink); #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 216d8902aaf9..68c5c1a6969c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -100,7 +100,7 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const if ( !pEntry ) return String(); - ::rtl::OUString aCatalog, aSchema, aTableName; + OUString aCatalog, aSchema, aTableName; SvTreeListEntry* pSchema = m_rTableList.GetParent(pEntry); if(pSchema && pSchema != m_rTableList.getAllObjectsEntry()) { @@ -111,7 +111,7 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const } aTableName = m_rTableList.GetEntryText(pEntry); - ::rtl::OUString aComposedName; + OUString aComposedName; try { Reference< XDatabaseMetaData > xMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW ); @@ -121,7 +121,7 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const && !xMeta->supportsSchemasInDataManipulation() ) { aCatalog = aSchema; - aSchema = ::rtl::OUString(); + aSchema = OUString(); } aComposedName = ::dbtools::composeTableName( @@ -160,7 +160,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) Reference< XViewsSupplier > xViewSupp; Reference< XNameAccess > xTables, xViews; - Sequence< ::rtl::OUString > sTables, sViews; + Sequence< OUString > sTables, sViews; xTables = xTableSupp->getTables(); if ( xTables.is() ) @@ -185,18 +185,18 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) // if no views are allowed remove the views also out the table name filter if ( !_bAllowViews ) { - const ::rtl::OUString* pTableBegin = sTables.getConstArray(); - const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength(); - ::std::vector< ::rtl::OUString > aTables(pTableBegin,pTableEnd); + const OUString* pTableBegin = sTables.getConstArray(); + const OUString* pTableEnd = pTableBegin + sTables.getLength(); + ::std::vector< OUString > aTables(pTableBegin,pTableEnd); - const ::rtl::OUString* pViewBegin = sViews.getConstArray(); - const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength(); + const OUString* pViewBegin = sViews.getConstArray(); + const OUString* pViewEnd = pViewBegin + sViews.getLength(); ::comphelper::TStringMixEqualFunctor aEqualFunctor; for(;pViewBegin != pViewEnd;++pViewBegin) aTables.erase(::std::remove_if(aTables.begin(),aTables.end(),::std::bind2nd(aEqualFunctor,*pViewBegin)),aTables.end()); - ::rtl::OUString* pTables = aTables.empty() ? 0 : &aTables[0]; - sTables = Sequence< ::rtl::OUString>(pTables, aTables.size()); - sViews = Sequence< ::rtl::OUString>(); + OUString* pTables = aTables.empty() ? 0 : &aTables[0]; + sTables = Sequence< OUString>(pTables, aTables.size()); + sViews = Sequence< OUString>(); } m_rTableList.UpdateTableList( m_xConnection, sTables, sViews ); @@ -258,7 +258,7 @@ QueryListFacade::~QueryListFacade() void QueryListFacade::_elementInserted( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName; + OUString sName; if ( _rEvent.Accessor >>= sName ) m_rQueryList.InsertEntry( sName ); } @@ -290,10 +290,10 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ ) Reference< XContainer> xContainer(xQueries,UNO_QUERY_THROW); m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer); } - Sequence< ::rtl::OUString > aQueryNames = xQueries->getElementNames(); + Sequence< OUString > aQueryNames = xQueries->getElementNames(); - const ::rtl::OUString* pQuery = aQueryNames.getConstArray(); - const ::rtl::OUString* pQueryEnd = aQueryNames.getConstArray() + aQueryNames.getLength(); + const OUString* pQuery = aQueryNames.getConstArray(); + const OUString* pQueryEnd = aQueryNames.getConstArray() + aQueryNames.getLength(); while ( pQuery != pQueryEnd ) m_rQueryList.InsertEntry( *pQuery++ ); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 0230697af9d3..868d8a82119c 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -463,7 +463,7 @@ namespace dbaui delete pExampleSet; pExampleSet = new SfxItemSet(*GetInputSetImpl()); - const ::rtl::OUString eType = m_pImpl->getDatasourceType(*_pItems); + const OUString eType = m_pImpl->getDatasourceType(*_pItems); DataSourceMetaData aMeta( eType ); const FeatureSet& rFeatures( aMeta.getFeatureSet() ); @@ -489,7 +489,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - bool AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( const ::rtl::OUString& _sURL ) + bool AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( const OUString& _sURL ) { DataSourceMetaData aMeta( _sURL ); const FeatureSet& rFeatures( aMeta.getFeatureSet() ); @@ -556,7 +556,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const + OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -568,7 +568,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - void AdvancedSettingsDialog::setTitle(const ::rtl::OUString& _sTitle) + void AdvancedSettingsDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 759c45faacf8..865e2c80565f 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -240,7 +240,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou SetUpdateMode(sal_True); } // ----------------------------------------------------------------------------- -void ODbAdminDialog::setTitle(const ::rtl::OUString& _sTitle) +void ODbAdminDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } @@ -307,7 +307,7 @@ Reference< XDriver > ODbAdminDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const +OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -324,30 +324,30 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp _rpPool = NULL; _rppDefaults = NULL; - const ::rtl::OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); + const OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); // create and initialize the defaults _rppDefaults = new SfxPoolItem*[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1]; SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults - *pCounter++ = new SfxStringItem(DSID_NAME, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CONNECTURL, rtl::OUString()); - *pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< ::rtl::OUString >(&sFilterAll, 1)); + *pCounter++ = new SfxStringItem(DSID_NAME, OUString()); + *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, OUString()); + *pCounter++ = new SfxStringItem(DSID_CONNECTURL, OUString()); + *pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< OUString >(&sFilterAll, 1)); *pCounter++ = new DbuTypeCollectionItem(DSID_TYPECOLLECTION, _pTypeCollection); *pCounter++ = new SfxBoolItem(DSID_INVALID_SELECTION, sal_False); *pCounter++ = new SfxBoolItem(DSID_READONLY, sal_False); - *pCounter++ = new SfxStringItem(DSID_USER, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_PASSWORD, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CHARSET, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_USER, OUString()); + *pCounter++ = new SfxStringItem(DSID_PASSWORD, OUString()); + *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, OUString()); + *pCounter++ = new SfxStringItem(DSID_CHARSET, OUString()); *pCounter++ = new SfxBoolItem(DSID_PASSWORDREQUIRED, sal_False); *pCounter++ = new SfxBoolItem(DSID_SHOWDELETEDROWS, sal_False); *pCounter++ = new SfxBoolItem(DSID_ALLOWLONGTABLENAMES, sal_False); - *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, rtl::OUString(',')); - *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, rtl::OUString('"')); - *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, rtl::OUString('.')); - *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, rtl::OUString("txt")); + *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, OUString()); + *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, OUString(',')); + *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, OUString('"')); + *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, OUString('.')); + *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, OUString()); + *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, OUString("txt")); *pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, sal_True); *pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, sal_False); *pCounter++ = new SfxInt32Item(DSID_CONN_PORTNUMBER, 8100); @@ -356,16 +356,16 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxBoolItem(DSID_CONN_SHUTSERVICE, sal_False); *pCounter++ = new SfxInt32Item(DSID_CONN_DATAINC, 20); *pCounter++ = new SfxInt32Item(DSID_CONN_CACHESIZE, 20); - *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, OUString()); *pCounter++ = new SfxBoolItem(DSID_USECATALOG, sal_False); - *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, OUString()); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, 389); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, 100); *pCounter++ = new SfxBoolItem(DSID_SQL92CHECK, sal_False); - *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, rtl::OUString()); - *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, OUString()); + *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, OUString()); *pCounter++ = new SfxBoolItem(DSID_AUTORETRIEVEENABLED, sal_False); *pCounter++ = new SfxBoolItem(DSID_APPEND_TABLE_ALIAS, sal_False); *pCounter++ = new SfxInt32Item(DSID_MYSQL_PORTNUMBER, 3306); @@ -377,15 +377,15 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxBoolItem(DSID_SCHEMA, sal_True); *pCounter++ = new SfxBoolItem(DSID_INDEXAPPENDIX, sal_True); *pCounter++ = new SfxBoolItem(DSID_CONN_LDAP_USESSL, sal_False); - *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, OUString()); *pCounter++ = new SfxBoolItem(DSID_DOSLINEENDS, sal_False); - *pCounter++ = new SfxStringItem(DSID_DATABASENAME, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_DATABASENAME, OUString()); *pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, sal_True); *pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, sal_True); *pCounter++ = new SfxBoolItem(DSID_IGNORECURRENCY, sal_False); - *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, OUString()); *pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, sal_True); - *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, rtl::OUString()); + *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, OUString()); *pCounter++ = new OptionalBoolItem( DSID_PRIMARY_KEY_SUPPORT ); *pCounter++ = new SfxInt32Item(DSID_MAX_ROW_SCAN, 100); *pCounter++ = new SfxBoolItem( DSID_RESPECTRESULTSETTYPE,sal_False ); @@ -457,7 +457,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp }; OSL_ENSURE(sizeof(aItemInfos)/sizeof(aItemInfos[0]) == DSID_LAST_ITEM_ID,"Invalid Ids!"); - _rpPool = new SfxItemPool(rtl::OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, + _rpPool = new SfxItemPool(OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID, aItemInfos, _rppDefaults); _rpPool->FreezeIdRanges(); diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index f600a38335b3..574d18063247 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::svt; -const rtl::OString aGroupIdent(RTL_CONSTASCII_STRINGPARAM("dBase III")); +const OString aGroupIdent(RTL_CONSTASCII_STRINGPARAM("dBase III")); // ODbaseIndexDialog ---------------------------------------------------------- DBG_NAME(ODbaseIndexDialog) @@ -309,22 +309,22 @@ void ODbaseIndexDialog::Init() // first assume for all indexes they're free - Sequence< ::rtl::OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder)); + Sequence< OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder)); - ::rtl::OUString aIndexExt("ndx"); - ::rtl::OUString aTableExt("dbf"); + OUString aIndexExt("ndx"); + OUString aTableExt("dbf"); ::std::vector< String > aUsedIndexes; - const ::rtl::OUString *pBegin = aFolderContent.getConstArray(); - const ::rtl::OUString *pEnd = pBegin + aFolderContent.getLength(); + const OUString *pBegin = aFolderContent.getConstArray(); + const OUString *pEnd = pBegin + aFolderContent.getLength(); aURL.SetSmartProtocol(INET_PROT_FILE); for(;pBegin != pEnd;++pBegin) { - rtl::OUString aName; + OUString aName; ::utl::LocalFileHelper::ConvertURLToPhysicalName(pBegin->getStr(),aName); aURL.SetSmartURL(aName); - rtl::OUString aExt = aURL.getExtension(); + OUString aExt = aURL.getExtension(); if (aExt == aIndexExt) { m_aFreeIndexList.push_back( OTableIndex(aURL.getName()) ); @@ -335,15 +335,15 @@ void ODbaseIndexDialog::Init() OTableInfo& rTabInfo = m_aTableInfoList.back(); // open the INF file - aURL.setExtension(rtl::OUString::createFromAscii("inf")); + aURL.setExtension(OUString::createFromAscii("inf")); OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL); Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) ); aInfFile.SetGroup( aGroupIdent ); // fill the indexes list - rtl::OString aNDX; + OString aNDX; sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); - rtl::OString aKeyName; + OString aKeyName; String aEntry; for( sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++ ) @@ -355,7 +355,7 @@ void ODbaseIndexDialog::Init() // yes -> add to the tables index list if (aNDX.equalsL(RTL_CONSTASCII_STRINGPARAM("NDX"))) { - aEntry = rtl::OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding()); + aEntry = OStringToOUString(aInfFile.ReadKey(aKeyName), osl_getThreadTextEncoding()); rTabInfo.aIndexList.push_back( OTableIndex( aEntry ) ); // and remove it from the free index list @@ -439,21 +439,21 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const } aURL.SetSmartURL(aDsn); aURL.Append(aTableName); - aURL.setExtension(rtl::OUString::createFromAscii("inf")); + aURL.setExtension(OUString::createFromAscii("inf")); OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL); Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) ); aInfFile.SetGroup( aGroupIdent ); // first, delete all table indizes - rtl::OString aNDX; + OString aNDX; sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); sal_uInt16 nKey = 0; while( nKey < nKeyCnt ) { // Does the key point to an index file?... - rtl::OString aKeyName = aInfFile.GetKeyName( nKey ); + OString aKeyName = aInfFile.GetKeyName( nKey ); aNDX = aKeyName.copy(0,3); //...if yes, delete index file, nKey is at subsequent key @@ -474,12 +474,12 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const ++aIndex, ++nPos ) { - rtl::OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX")); + OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX")); if( nPos > 0 ) // first index contains no number aKeyName.append(static_cast(nPos)); aInfFile.WriteKey( aKeyName.makeStringAndClear(), - rtl::OUStringToOString(aIndex->GetIndexFileName(), + OUStringToOString(aIndex->GetIndexFileName(), osl_getThreadTextEncoding())); } @@ -491,7 +491,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const try { ::ucbhelper::Content aContent(aURL.GetURLNoPass(),Reference(), comphelper::getProcessComponentContext()); - aContent.executeCommand( rtl::OUString("delete"),makeAny( sal_Bool( sal_True ) ) ); + aContent.executeCommand( OUString("delete"),makeAny( sal_Bool( sal_True ) ) ); } catch (const Exception& e ) { diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index b8e5273be615..639febdf98f7 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -231,7 +231,7 @@ Reference< XDriver > ODbTypeWizDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const +OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -320,7 +320,7 @@ sal_Bool ODbTypeWizDialog::leaveState(WizardState _nState) return sal_True; } // ----------------------------------------------------------------------------- -void ODbTypeWizDialog::setTitle(const ::rtl::OUString& _sTitle) +void ODbTypeWizDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } @@ -342,7 +342,7 @@ sal_Bool ODbTypeWizDialog::saveDatasource() if ( pPage ) pPage->FillItemSet(*m_pOutSet); - ::rtl::OUString sOldURL; + OUString sOldURL; if ( m_pImpl->getCurrentDataSource().is() ) m_pImpl->getCurrentDataSource()->getPropertyValue(PROPERTY_URL) >>= sOldURL; DataSourceInfoConverter::convert( getORB(), m_pCollection,sOldURL,m_eType,m_pImpl->getCurrentDataSource()); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index a0e8983c68f1..89aebb22b3df 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -176,7 +176,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent ::dbaccess::ODsnTypeCollection::TypeIterator aEnd = m_pCollection->end(); for(PathId i = 1;aIter != aEnd;++aIter,++i) { - const ::rtl::OUString sURLPrefix = aIter.getURLPrefix(); + const OUString sURLPrefix = aIter.getURLPrefix(); svt::RoadmapWizardTypes::WizardPath aPath; aPath.push_back(PAGE_DBSETUPWIZARD_INTRO); m_pCollection->fillPageIds(sURLPrefix,aPath); @@ -199,7 +199,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent ActivatePage(); } -void ODbTypeWizDialogSetup::declareAuthDepPath( const ::rtl::OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths) +void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths) { bool bHasAuthentication = DataSourceMetaData::getAuthentication( _sURL ) != AuthNone; @@ -313,7 +313,7 @@ void lcl_removeUnused(const ::comphelper::NamedValueCollection& _aOld,const ::co } } // ----------------------------------------------------------------------------- -void DataSourceInfoConverter::convert(const Reference & xContext, const ::dbaccess::ODsnTypeCollection* _pCollection,const ::rtl::OUString& _sOldURLPrefix,const ::rtl::OUString& _sNewURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDatasource) +void DataSourceInfoConverter::convert(const Reference & xContext, const ::dbaccess::ODsnTypeCollection* _pCollection,const OUString& _sOldURLPrefix,const OUString& _sNewURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDatasource) { if ( _pCollection->getPrefix(_sOldURLPrefix) == _pCollection->getPrefix(_sNewURLPrefix) ) return ; @@ -339,7 +339,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath() { sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf( m_pCollection->getEmbeddedDatabase() ); if ( nCreateNewDBIndex == -1 ) - nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString("sdbc:dbase:") ); + nCreateNewDBIndex = m_pCollection->getIndexOf( OUString("sdbc:dbase:") ); OSL_ENSURE( nCreateNewDBIndex != -1, "ODbTypeWizDialogSetup::activateDatabasePath: the GeneralPage should have prevented this!" ); activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), sal_True ); @@ -349,7 +349,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath() break; case OGeneralPageWizard::eConnectExternal: { - ::rtl::OUString sOld = m_sURL; + OUString sOld = m_sURL; m_sURL = m_pGeneralPage->GetSelectedType(); DataSourceInfoConverter::convert(getORB(), m_pCollection,sOld,m_sURL,m_pImpl->getCurrentDataSource()); ::dbaccess::DATASOURCE_TYPE eType = VerifyDataSourceType(m_pCollection->determineType(m_sURL)); @@ -469,21 +469,21 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const +OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const { - ::rtl::OUString sRet = m_pImpl->getDatasourceType(_rSet); + OUString sRet = m_pImpl->getDatasourceType(_rSet); if (m_pMySQLIntroPage != NULL && m_pMySQLIntroPage->IsVisible() ) { switch( m_pMySQLIntroPage->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_JDBC: - sRet = ::rtl::OUString("sdbc:mysql:jdbc:"); + sRet = OUString("sdbc:mysql:jdbc:"); break; case OMySQLIntroPageSetup::VIA_NATIVE: - sRet = ::rtl::OUString("sdbc:mysql:mysqlc:"); + sRet = OUString("sdbc:mysql:mysqlc:"); break; case OMySQLIntroPageSetup::VIA_ODBC: - sRet = ::rtl::OUString("sdbc:mysql:odbc:"); + sRet = OUString("sdbc:mysql:odbc:"); break; } } @@ -534,16 +534,16 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) break; case PAGE_DBSETUPWIZARD_MYSQL_ODBC: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:odbc:")))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(OUString("sdbc:mysql:odbc:")))); pPage = OConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet); break; case PAGE_DBSETUPWIZARD_MYSQL_JDBC: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:jdbc:")))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(OUString("sdbc:mysql:jdbc:")))); pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( this, *m_pOutSet); break; case PAGE_DBSETUPWIZARD_MYSQL_NATIVE: - m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(::rtl::OUString("sdbc:mysql:mysqlc:")))); + m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix(OUString("sdbc:mysql:mysqlc:")))); pPage = MySQLNativeSetupPage::Create( this, *m_pOutSet); break; @@ -618,17 +618,17 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage*, _ // ----------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup) { - ::rtl::OUString sURLPrefix; + OUString sURLPrefix; switch( _pMySQLIntroPageSetup->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_ODBC: - sURLPrefix = ::rtl::OUString("sdbc:mysql:odbc:"); + sURLPrefix = OUString("sdbc:mysql:odbc:"); break; case OMySQLIntroPageSetup::VIA_JDBC: - sURLPrefix = ::rtl::OUString("sdbc:mysql:jdbc:"); + sURLPrefix = OUString("sdbc:mysql:jdbc:"); break; case OMySQLIntroPageSetup::VIA_NATIVE: - sURLPrefix = ::rtl::OUString("sdbc:mysql:mysqlc:"); + sURLPrefix = OUString("sdbc:mysql:mysqlc:"); break; } activatePath( static_cast(m_pCollection->getIndexOf(sURLPrefix) + 1), sal_True); @@ -699,7 +699,7 @@ sal_Bool ODbTypeWizDialogSetup::leaveState(WizardState _nState) } // ----------------------------------------------------------------------------- -void ODbTypeWizDialogSetup::setTitle(const ::rtl::OUString& /*_sTitle*/) +void ODbTypeWizDialogSetup::setTitle(const OUString& /*_sTitle*/) { OSL_FAIL( "ODbTypeWizDialogSetup::setTitle: not implemented!" ); // why? @@ -746,7 +746,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() aArgs.put( "InteractionHandler", xHandler ); aArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG ); - ::rtl::OUString sPath = m_pImpl->getDocumentUrl( *m_pOutSet ); + OUString sPath = m_pImpl->getDocumentUrl( *m_pOutSet ); xStore->storeAsURL( sPath, aArgs.getPropertyValues() ); if ( !m_pFinalPage || m_pFinalPage->IsDatabaseDocumentToBeRegistered() ) @@ -802,18 +802,18 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } //------------------------------------------------------------------------- - ::rtl::OUString ODbTypeWizDialogSetup::getDefaultDatabaseType() const + OUString ODbTypeWizDialogSetup::getDefaultDatabaseType() const { - ::rtl::OUString sEmbeddedURL = m_pCollection->getEmbeddedDatabase(); + OUString sEmbeddedURL = m_pCollection->getEmbeddedDatabase(); ::connectivity::DriversConfig aDriverConfig(getORB()); try { if ( aDriverConfig.getDriverFactoryName(sEmbeddedURL).isEmpty() || !m_pImpl->getDriver(sEmbeddedURL).is() ) - sEmbeddedURL = ::rtl::OUString("sdbc:dbase:"); + sEmbeddedURL = OUString("sdbc:dbase:"); } catch(const Exception&) { - sEmbeddedURL = ::rtl::OUString("sdbc:dbase:"); + sEmbeddedURL = OUString("sdbc:dbase:"); } return sEmbeddedURL; @@ -822,8 +822,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() //------------------------------------------------------------------------- void ODbTypeWizDialogSetup::CreateDatabase() { - ::rtl::OUString sUrl; - ::rtl::OUString eType = getDefaultDatabaseType(); + OUString sUrl; + OUString eType = getDefaultDatabaseType(); if ( m_pCollection->isEmbeddedDatabase(eType) ) { sUrl = eType; @@ -839,7 +839,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() INetURLObject aDBPathURL(m_sWorkPath); aDBPathURL.Append(m_aDocURL.getBase()); createUniqueFolderName(&aDBPathURL); - ::rtl::OUString sPrefix = eType; + OUString sPrefix = eType; sUrl = aDBPathURL.GetMainURL( INetURLObject::NO_DECODE); xSimpleFileAccess->createFolder(sUrl); sUrl = sPrefix.concat(sUrl); @@ -849,14 +849,14 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } //------------------------------------------------------------------------- - void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(const ::rtl::OUString& _sPath) + void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(const OUString& _sPath) { Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); Reference< XDatabaseContext > xDatabaseContext( DatabaseContext::create(getORB()) ); Reference< XNameAccess > xNameAccessDatabaseContext(xDatabaseContext, UNO_QUERY_THROW ); INetURLObject aURL( _sPath ); - ::rtl::OUString sFilename = aURL.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - ::rtl::OUString sDatabaseName = ::dbtools::createUniqueName(xNameAccessDatabaseContext, sFilename,sal_False); + OUString sFilename = aURL.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString sDatabaseName = ::dbtools::createUniqueName(xNameAccessDatabaseContext, sFilename,sal_False); xDatabaseContext->registerObject(sDatabaseName, xDatasource); } @@ -874,9 +874,9 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() INetURLObject aWorkURL( m_sWorkPath ); aFileDlg.SetDisplayFolder( aWorkURL.GetMainURL( INetURLObject::NO_DECODE )); - ::rtl::OUString sDefaultName = String( ModuleRes( STR_DATABASEDEFAULTNAME ) ); - ::rtl::OUString sExtension = pFilter->GetDefaultExtension(); - sDefaultName += sExtension.replaceAt( 0, 1, ::rtl::OUString() ); + OUString sDefaultName = String( ModuleRes( STR_DATABASEDEFAULTNAME ) ); + OUString sExtension = pFilter->GetDefaultExtension(); + sDefaultName += sExtension.replaceAt( 0, 1, OUString() ); aWorkURL.Append( sDefaultName ); sDefaultName = createUniqueFileName( aWorkURL ); aFileDlg.SetFileName( sDefaultName ); @@ -890,7 +890,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() if( m_aDocURL.GetProtocol() != INET_PROT_NOT_VALID ) { - ::rtl::OUString sFileName = m_aDocURL.GetMainURL( INetURLObject::NO_DECODE ); + OUString sFileName = m_aDocURL.GetMainURL( INetURLObject::NO_DECODE ); if ( ::utl::UCBContentHelper::IsDocument(sFileName) ) ::utl::UCBContentHelper::Kill(sFileName); m_pOutSet->Put(SfxStringItem(DSID_DOCUMENT_URL, sFileName)); @@ -904,7 +904,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() void ODbTypeWizDialogSetup::createUniqueFolderName(INetURLObject* pURL) { Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); - :: rtl::OUString sLastSegmentName = pURL->getName(); + :: OUString sLastSegmentName = pURL->getName(); sal_Bool bFolderExists = sal_True; sal_Int32 i = 1; while (bFolderExists == sal_True) @@ -913,7 +913,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() if (bFolderExists == sal_True) { i++; - pURL->setName(sLastSegmentName.concat(::rtl::OUString::valueOf(i))); + pURL->setName(sLastSegmentName.concat(OUString::valueOf(i))); } } } @@ -922,7 +922,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() String ODbTypeWizDialogSetup::createUniqueFileName(const INetURLObject& _rURL) { Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); - ::rtl::OUString BaseName = _rURL.getBase(); + OUString BaseName = _rURL.getBase(); sal_Bool bElementExists = sal_True; @@ -932,7 +932,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() bElementExists = xSimpleFileAccess->exists( aExistenceCheck.GetMainURL( INetURLObject::NO_DECODE ) ); if ( bElementExists ) { - aExistenceCheck.setBase( BaseName.concat( ::rtl::OUString::valueOf( i ) ) ); + aExistenceCheck.setBase( BaseName.concat( OUString::valueOf( i ) ) ); ++i; } } @@ -957,11 +957,11 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() Reference< XComponentLoader > m_xFrameLoader; Reference< XDesktop2 > m_xDesktop; Reference< XInteractionHandler2 > m_xInteractionHandler; - ::rtl::OUString m_sURL; + OUString m_sURL; OAsyncronousLink m_aAsyncCaller; public: - AsyncLoader( const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rURL ); + AsyncLoader( const Reference< XComponentContext >& _rxORB, const OUString& _rURL ); void doLoadAsync(); @@ -976,7 +976,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() }; // ............................................................................. - AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rURL ) + AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const OUString& _rURL ) :m_sURL( _rURL ) ,m_aAsyncCaller( LINK( this, AsyncLoader, OnOpenDocument ) ) { @@ -1023,7 +1023,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() aLoadArgs >>= aLoadArgPV; m_xFrameLoader->loadComponentFromURL( m_sURL, - ::rtl::OUString( "_default" ), + OUString( "_default" ), FrameSearchFlag::ALL, aLoadArgPV ); diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 61392de4d379..fe5c9721b90f 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -38,7 +38,6 @@ namespace dbaui using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; - using ::rtl::OStringBuffer; //==================================================================== //= LargeEntryListBox @@ -226,7 +225,7 @@ DBG_NAME(DirectSQLDialog) OSL_ENSURE(xStatement.is(), "DirectSQLDialog::implExecuteStatement: no statement returned by the connection!"); // clear the output box - m_aOutput.SetText(rtl::OUString()); + m_aOutput.SetText(OUString()); if (xStatement.is()) { if (OUString(_rStatement).toAsciiUpperCase().startsWith("SELECT") && m_pShowOutput->IsChecked()) @@ -239,7 +238,7 @@ DBG_NAME(DirectSQLDialog) while (xResultSet->next()) { // initialise the output line for each row - String out = ::rtl::OUString(""); + String out = OUString(""); // work along the columns until that are none left int i = 1; try @@ -247,7 +246,7 @@ DBG_NAME(DirectSQLDialog) for (;;) { // be dumb, treat everything as a string - out += xRow->getString(i) + ::rtl::OUString(","); + out += xRow->getString(i) + OUString(","); i++; } } @@ -256,7 +255,7 @@ DBG_NAME(DirectSQLDialog) { } // report the output - addOutputText(::rtl::OUString(out)); + addOutputText(OUString(out)); } } else { // execute it @@ -298,7 +297,7 @@ DBG_NAME(DirectSQLDialog) void DirectSQLDialog::addOutputText(const String& _rMessage) { String sAppendMessage = _rMessage; - sAppendMessage += rtl::OUString("\n"); + sAppendMessage += OUString("\n"); String sCompleteMessage = m_aOutput.GetText(); sCompleteMessage += sAppendMessage; diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index bcb599f97952..18d934094ccc 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -92,11 +92,11 @@ OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, sal_Int32 _nFlags) :m_aDescription(_pParent, ModuleRes (FT_DESCRIPTION)) ,m_aCatalogLbl(_pParent, ModuleRes (FT_CATALOG)) - ,m_aCatalog(_pParent, ModuleRes (ET_CATALOG), ::rtl::OUString()) + ,m_aCatalog(_pParent, ModuleRes (ET_CATALOG), OUString()) ,m_aSchemaLbl(_pParent, ModuleRes (FT_SCHEMA)) - ,m_aSchema(_pParent, ModuleRes (ET_SCHEMA), ::rtl::OUString()) + ,m_aSchema(_pParent, ModuleRes (ET_SCHEMA), OUString()) ,m_aLabel(_pParent, ModuleRes (FT_TITLE)) - ,m_aTitle(_pParent, ModuleRes (ET_TITLE), ::rtl::OUString()) + ,m_aTitle(_pParent, ModuleRes (ET_TITLE), OUString()) ,m_aPB_OK(_pParent, ModuleRes( PB_OK ) ) ,m_aPB_CANCEL(_pParent, ModuleRes( PB_CANCEL )) ,m_aPB_HELP(_pParent, ModuleRes( PB_HELP)) @@ -112,7 +112,7 @@ OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, if ( m_xMetaData.is() ) { - ::rtl::OUString sExtraNameChars( m_xMetaData->getExtraNameCharacters() ); + OUString sExtraNameChars( m_xMetaData->getExtraNameCharacters() ); m_aCatalog.setAllowedChars( sExtraNameChars ); m_aSchema.setAllowedChars( sExtraNameChars ); m_aTitle.setAllowedChars( sExtraNameChars ); @@ -156,7 +156,7 @@ namespace typedef Reference< XResultSet > (SAL_CALL XDatabaseMetaData::*FGetMetaStrings)(); void lcl_fillComboList( ComboBox& _rList, const Reference< XConnection >& _rxConnection, - FGetMetaStrings _GetAll, const ::rtl::OUString& _rCurrent ) + FGetMetaStrings _GetAll, const OUString& _rCurrent ) { try { @@ -164,7 +164,7 @@ namespace Reference< XResultSet > xRes = (xMetaData.get()->*_GetAll)(); Reference< XRow > xRow( xRes, UNO_QUERY_THROW ); - ::rtl::OUString sValue; + OUString sValue; while ( xRes->next() ) { sValue = xRow->getString( 1 ); @@ -248,7 +248,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, OSL_ENSURE(m_pImpl->m_xMetaData.is(),"The metadata can not be null!"); if(m_pImpl->m_aName.Search('.') != STRING_NOTFOUND) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_pImpl->m_xMetaData, m_pImpl->m_aName, sCatalog, @@ -327,7 +327,7 @@ IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton) { m_pImpl->m_aName = m_pImpl->m_aTitle.GetText(); - ::rtl::OUString sNameToCheck( m_pImpl->m_aName ); + OUString sNameToCheck( m_pImpl->m_aName ); if ( m_pImpl->m_nType == CommandType::TABLE ) { diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index db56e6af9465..3fe579f10139 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -142,7 +142,7 @@ IMPL_LINK( ODatasourceSelectDialog, ManageProcessFinished, void*, /**/ ) // ----------------------------------------------------------------------------- void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) { - ::rtl::OUString sSelected; + OUString sSelected; if (m_aDatasource.GetEntryCount()) sSelected = m_aDatasource.GetSelectEntry(); m_aDatasource.Clear(); diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 5117f2ec50bd..fb3bbf162da1 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -58,7 +58,7 @@ namespace dbaui //= OGeneralPage //========================================================================= //------------------------------------------------------------------------- - OGeneralPage::OGeneralPage( Window* pParent, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) + OGeneralPage::OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) :OGenericAdministrationPage( pParent, "PageGeneral", _rUIXMLDescription, _rItems ) ,m_pSpecialMessage ( NULL ) ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN ) diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index a10e5ff10c38..197b1bc5dc22 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -38,7 +38,7 @@ namespace dbaui class OGeneralPage : public OGenericAdministrationPage { protected: - OGeneralPage( Window* pParent, const rtl::OUString& _rUIXMLDescription, const SfxItemSet& _rItems ); + OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ); ~OGeneralPage(); private: diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 50c874248831..0530b1f9cb1e 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -97,9 +97,9 @@ namespace dbaui { } - extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars); + extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars); //------------------------------------------------------------------ - sal_Bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const rtl::OUString& _rNewText ) + sal_Bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const OUString& _rNewText ) { // first check if this is valid SQL92 name if ( isSQL92CheckEnabled(m_xConnection) ) @@ -107,7 +107,7 @@ namespace dbaui Reference xMeta = m_xConnection->getMetaData(); if ( xMeta.is() ) { - ::rtl::OUString sAlias = ::dbtools::convertName2SQLName(_rNewText, xMeta->getExtraNameCharacters()); + OUString sAlias = ::dbtools::convertName2SQLName(_rNewText, xMeta->getExtraNameCharacters()); if ( ( xMeta->supportsMixedCaseQuotedIdentifiers() ) ? sAlias != _rNewText @@ -173,13 +173,13 @@ namespace dbaui //================================================================== DBG_NAME(DbaIndexDialog) //------------------------------------------------------------------ - DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames, + DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< OUString >& _rFieldNames, const Reference< XNameAccess >& _rxIndexes, const Reference< XConnection >& _rxConnection, const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex) :ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN)) ,m_xConnection(_rxConnection) - ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString("dbaccess.tabledesign.indexdialog")) + ,m_aGeometrySettings(E_DIALOG, OUString("dbaccess.tabledesign.indexdialog")) ,m_aActions (this, ModuleRes(TLB_ACTIONS)) ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 4bb717831cad..74b6acd6fd8c 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -219,13 +219,13 @@ DBG_NAME(IndexFieldsControl) sal_Int32 nWidthAsc = GetTextWidth(m_sAscendingText) + GetSettings().GetStyleSettings().GetScrollBarSize(); sal_Int32 nWidthDesc = GetTextWidth(m_sDescendingText) + GetSettings().GetStyleSettings().GetScrollBarSize(); // maximum plus some additional space - return (nWidthAsc > nWidthDesc ? nWidthAsc : nWidthDesc) + GetTextWidth(rtl::OUString('0')) * 2; + return (nWidthAsc > nWidthDesc ? nWidthAsc : nWidthDesc) + GetTextWidth(OUString('0')) * 2; } return EditBrowseBox::GetTotalCellWidth(_nRow, _nColId); } //------------------------------------------------------------------ - void IndexFieldsControl::Init(const Sequence< ::rtl::OUString >& _rAvailableFields) + void IndexFieldsControl::Init(const Sequence< OUString >& _rAvailableFields) { RemoveColumns(); @@ -249,7 +249,7 @@ DBG_NAME(IndexFieldsControl) nOther = GetTextWidth(m_sDescendingText) + GetSettings().GetStyleSettings().GetScrollBarSize(); nSortOrderColumnWidth = nSortOrderColumnWidth > nOther ? nSortOrderColumnWidth : nOther; // (plus some additional space) - nSortOrderColumnWidth += GetTextWidth(rtl::OUString('0')) * 2; + nSortOrderColumnWidth += GetTextWidth(OUString('0')) * 2; InsertDataColumn(COLUMN_ID_ORDER, sColumnName, nSortOrderColumnWidth, HIB_STDSTYLE, 1); m_pSortingCell = new ListBoxControl(&GetDataWindow()); @@ -271,8 +271,8 @@ DBG_NAME(IndexFieldsControl) m_pFieldNameCell = new ListBoxControl(&GetDataWindow()); m_pFieldNameCell->InsertEntry(String()); m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); - const ::rtl::OUString* pFields = _rAvailableFields.getConstArray(); - const ::rtl::OUString* pFieldsEnd = pFields + _rAvailableFields.getLength(); + const OUString* pFields = _rAvailableFields.getConstArray(); + const OUString* pFieldsEnd = pFields + _rAvailableFields.getLength(); for (;pFields < pFieldsEnd; ++pFields) m_pFieldNameCell->InsertEntry(*pFields); } diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index e4a589e8e5b0..d6434010e1ab 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -122,7 +122,7 @@ OOdbcLibWrapper::OOdbcLibWrapper() //------------------------------------------------------------------------- sal_Bool OOdbcLibWrapper::load(const sal_Char* _pLibPath) { - m_sLibPath = ::rtl::OUString::createFromAscii(_pLibPath); + m_sLibPath = OUString::createFromAscii(_pLibPath); #ifdef HAVE_ODBC_SUPPORT // load the module m_pOdbcLib = osl_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW); @@ -147,7 +147,7 @@ void OOdbcLibWrapper::unload() //------------------------------------------------------------------------- oslGenericFunction OOdbcLibWrapper::loadSymbol(const sal_Char* _pFunctionName) { - return osl_getFunctionSymbol(m_pOdbcLib, ::rtl::OUString::createFromAscii(_pFunctionName).pData); + return osl_getFunctionSymbol(m_pOdbcLib, OUString::createFromAscii(_pFunctionName).pData); } //------------------------------------------------------------------------- @@ -281,7 +281,7 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) break; else { - ::rtl::OUString aCurrentDsn(reinterpret_cast(szDSN),pcbDSN, nTextEncoding); + OUString aCurrentDsn(reinterpret_cast(szDSN),pcbDSN, nTextEncoding); _rNames.insert(aCurrentDsn); } } @@ -343,7 +343,7 @@ bool OOdbcManagement::manageDataSources_async() // this is done in an external process, due to #i78733# // (and note this whole functionality is supported on Windows only, ATM) - ::rtl::OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" ); + OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" ); ::rtl::Bootstrap::expandMacros( sExecutableName ); //TODO: detect failure oslProcess hProcessHandle(0); oslProcessError eError = osl_executeProcess( sExecutableName.pData, NULL, 0, 0, NULL, NULL, NULL, 0, &hProcessHandle ); diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 7ecadd29c9e9..1feeab014c40 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -48,7 +48,7 @@ namespace dbaui class OOdbcLibWrapper { oslModule m_pOdbcLib; // the library handle - ::rtl::OUString m_sLibPath; // the path to the library + OUString m_sLibPath; // the path to the library public: #ifdef HAVE_ODBC_SUPPORT @@ -56,7 +56,7 @@ public: #else sal_Bool isLoaded() const { return sal_False; } #endif - ::rtl::OUString getLibraryName() const { return m_sLibPath; } + OUString getLibraryName() const { return m_sLibPath; } protected: #ifndef HAVE_ODBC_SUPPORT diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 130ee03ab2a9..381291e661f8 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -107,9 +107,9 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, try { // ... also write it into the remaining fields - Sequence< ::rtl::OUString> aNames = m_xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = m_xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); Reference xColumn; for(;pIter != pEnd;++pIter) { @@ -306,7 +306,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom sal_Bool bHaving = sal_False; try { - ::rtl::OUString sTableName; + OUString sTableName; sal_Bool bFunction = sal_False; _rFilter.Name = _rField.GetSelectEntry(); Reference< XPropertySet > xColumn = getQueryColumn(_rFilter.Name); @@ -322,26 +322,26 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom { // properly quote all parts of the table name, so // e.g. . becomes ""."
      " - ::rtl::OUString aCatlog,aSchema,aTable; + OUString aCatlog,aSchema,aTable; ::dbtools::qualifiedNameComponents( m_xMetaData, sTableName, aCatlog, aSchema, aTable, ::dbtools::eInDataManipulation ); sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, sal_True, ::dbtools::eInDataManipulation ); } } xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; - static ::rtl::OUString sAgg("AggregateFunction"); + static OUString sAgg("AggregateFunction"); if ( xInfo->hasPropertyByName(sAgg) ) xColumn->getPropertyValue(sAgg) >>= bHaving; - static ::rtl::OUString sFunction("Function"); + static OUString sFunction("Function"); if ( xInfo->hasPropertyByName(sFunction) ) xColumn->getPropertyValue(sFunction) >>= bFunction; } if ( !bFunction ) { - const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); + const OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : OUString(); _rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name); if ( !sTableName.isEmpty() ) { - static ::rtl::OUString sSep("."); + static OUString sSep("."); sTableName += sSep; sTableName += _rFilter.Name; _rFilter.Name = sTableName; @@ -360,12 +360,12 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom if ( _rFilter.Handle == SQLFilterOperator::LIKE || _rFilter.Handle == SQLFilterOperator::NOT_LIKE ) ::Replace_OS_PlaceHolder( sPredicateValue ); - _rFilter.Value <<= ::rtl::OUString(sPredicateValue); + _rFilter.Value <<= OUString(sPredicateValue); } return bHaving; } -Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFieldName ) const +Reference< XPropertySet > DlgFilterCrit::getColumn( const OUString& _rFieldName ) const { Reference< XPropertySet > xColumn; try @@ -376,15 +376,15 @@ Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFie Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns(); if ( xColumns.is() && !xColumn.is() ) { - Sequence< ::rtl::OUString> aSeq = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + Sequence< OUString> aSeq = xColumns->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { Reference xProp(xColumns->getByName(*pIter),UNO_QUERY); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { - ::rtl::OUString sRealName; + OUString sRealName; xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; if ( sRealName == _rFieldName ) { @@ -404,7 +404,7 @@ Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFie return xColumn; } -Reference< XPropertySet > DlgFilterCrit::getQueryColumn( const ::rtl::OUString& _rFieldName ) const +Reference< XPropertySet > DlgFilterCrit::getQueryColumn( const OUString& _rFieldName ) const { Reference< XPropertySet > xColumn; try @@ -424,7 +424,7 @@ Reference< XPropertySet > DlgFilterCrit::getQueryColumn( const ::rtl::OUString& Reference< XPropertySet > DlgFilterCrit::getMatchingColumn( const Edit& _rValueInput ) const { // the name - ::rtl::OUString sField; + OUString sField; if ( &_rValueInput == &aET_WHEREVALUE1 ) { sField = aLB_WHEREFIELD1.GetSelectEntry(); @@ -455,7 +455,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField ) // and normalize it's content if ( xColumn.is() ) { - ::rtl::OUString sText( _pField->GetText() ); + OUString sText( _pField->GetText() ); m_aPredicateInput.normalizePredicateString( sText, xColumn ); _pField->SetText( sText ); } @@ -467,7 +467,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField ) void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Bool _bOr ) { DBG_CHKTHIS(DlgFilterCrit,NULL); - ::rtl::OUString aCondition; + OUString aCondition; _rItem.Value >>= aCondition; String aStr = aCondition; if ( _rItem.Handle == SQLFilterOperator::LIKE || @@ -542,7 +542,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo if ( pColumnListControl && pPredicateListControl && pPredicateValueControl ) { - ::rtl::OUString sName; + OUString sName; if ( xColumn.is() ) xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; else @@ -555,7 +555,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo pPredicateListControl->SelectEntryPos( GetSelectionPos( (sal_Int32)_rItem.Handle, *pPredicateListControl ) ); // initially normalize this value - ::rtl::OUString aString( aStr ); + OUString aString( aStr ); m_aPredicateInput.normalizePredicateString( aString, xColumn ); pPredicateValueControl->SetText( aString ); } diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 33d1bef259c3..60860c32d4cc 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -99,9 +99,9 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent, try { // ... also the remaining fields - Sequence< ::rtl::OUString> aNames = m_xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = m_xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); Reference xColumn; for(;pIter != pEnd;++pIter) { @@ -154,8 +154,8 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() { try { - const ::rtl::OUString sNameProperty = ::rtl::OUString( "Name" ); - const ::rtl::OUString sAscendingProperty = ::rtl::OUString( "IsAscending" ); + const OUString sNameProperty = OUString( "Name" ); + const OUString sAscendingProperty = OUString( "IsAscending" ); Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_QUERY_THROW ); sal_Int32 nColumns = xOrderColumns->getCount(); @@ -166,7 +166,7 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() { Reference< XPropertySet > xColumn( xOrderColumns->getByIndex( i ), UNO_QUERY_THROW ); - ::rtl::OUString sColumnName; + OUString sColumnName; sal_Bool bIsAscending( sal_True ); xColumn->getPropertyValue( sNameProperty ) >>= sColumnName; @@ -215,23 +215,23 @@ void DlgOrderCrit::EnableLines() } } -::rtl::OUString DlgOrderCrit::GetOrderList( ) const +OUString DlgOrderCrit::GetOrderList( ) const { DBG_CHKTHIS(DlgOrderCrit,NULL); Reference xMetaData = m_xConnection->getMetaData(); - ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); - static const ::rtl::OUString sDESC(" DESC "); - static const ::rtl::OUString sASC(" ASC "); + OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : OUString(); + static const OUString sDESC(" DESC "); + static const OUString sASC(" ASC "); Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns(); - ::rtl::OUString sOrder; + OUString sOrder; for( sal_uInt16 i=0 ; iGetSelectEntryPos() != 0) { if(!sOrder.isEmpty()) - sOrder += ::rtl::OUString(","); + sOrder += OUString(","); String sName = m_aColumnList[i]->GetSelectEntry(); try @@ -242,10 +242,10 @@ void DlgOrderCrit::EnableLines() { if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { - ::rtl::OUString sRealName; + OUString sRealName; xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; sName = sRealName; - static ::rtl::OUString sFunction("Function"); + static OUString sFunction("Function"); if ( xColumn->getPropertySetInfo()->hasPropertyByName(sFunction) ) xColumn->getPropertyValue(sFunction) >>= bFunction; } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 4b3c1a51ee2d..d263417cb5e6 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -216,11 +216,11 @@ namespace //------------------------------------------------------------------------------ /// strips the [OOoBase] vendor identifier from the given error message, if applicable - ::rtl::OUString lcl_stripOOoBaseVendor( const ::rtl::OUString& _rErrorMessage ) + OUString lcl_stripOOoBaseVendor( const OUString& _rErrorMessage ) { - ::rtl::OUString sErrorMessage( _rErrorMessage ); + OUString sErrorMessage( _rErrorMessage ); - const ::rtl::OUString sVendorIdentifier( ::connectivity::SQLError::getMessagePrefix() ); + const OUString sVendorIdentifier( ::connectivity::SQLError::getMessagePrefix() ); if ( sErrorMessage.indexOf( sVendorIdentifier ) == 0 ) { // characters to strip @@ -630,14 +630,14 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) { lcl_addButton( *this, BUTTON_HELP, false ); - rtl::OUString aTmp; + OUString aTmp; INetURLObject aHID( m_sHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) aTmp = aHID.GetURLPath(); else aTmp = m_sHelpURL; - SetHelpId( rtl::OUStringToOString( aTmp, RTL_TEXTENCODING_UTF8 ) ); + SetHelpId( OUStringToOString( aTmp, RTL_TEXTENCODING_UTF8 ) ); } } @@ -679,7 +679,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) { SetText( utl::ConfigManager::getProductName() + - rtl::OUString( " Base" ) ); + OUString( " Base" ) ); // position and size the controls and the dialog, depending on whether we have one or two texts to display impl_positionControls(); @@ -704,7 +704,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) } //------------------------------------------------------------------------------ -OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const ::rtl::OUString& _rHelpURL ) +OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const OUString& _rHelpURL ) :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG ) ,m_aInfoImage( this ) ,m_aTitle( this, WB_WORDBREAK | WB_LEFT ) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 7817ddff32c6..d8996a85045f 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -154,7 +154,7 @@ DBG_NAME(OTableSubscriptionPage) } } //------------------------------------------------------------------------ - void OTableSubscriptionPage::implCheckTables(const Sequence< ::rtl::OUString >& _rTables) + void OTableSubscriptionPage::implCheckTables(const Sequence< OUString >& _rTables) { // the meta data for the current connection, used for splitting up table names Reference< XDatabaseMetaData > xMeta; @@ -172,13 +172,13 @@ DBG_NAME(OTableSubscriptionPage) CheckAll(sal_False); // check the ones which are in the list - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; SvTreeListEntry* pRootEntry = m_aTablesList.getAllObjectsEntry(); sal_Bool bAllTables = sal_False; sal_Bool bAllSchemas = sal_False; - const ::rtl::OUString* pIncludeTable = _rTables.getConstArray(); + const OUString* pIncludeTable = _rTables.getConstArray(); for (sal_Int32 i=0; i<_rTables.getLength(); ++i, ++pIncludeTable) { if (xMeta.is()) @@ -221,7 +221,7 @@ DBG_NAME(OTableSubscriptionPage) } //------------------------------------------------------------------------ - void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter ) + void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter ) { if (!_rTableFilter.getLength()) { // no tables visible @@ -304,11 +304,11 @@ DBG_NAME(OTableSubscriptionPage) Reference xModi(getDataSourceOrModel(xProp),UNO_QUERY); sal_Bool bModified = ( xModi.is() && xModi->isModified() ); - Sequence< ::rtl::OUString > aNewTableFilter(1); - aNewTableFilter[0] = ::rtl::OUString("%"); + Sequence< OUString > aNewTableFilter(1); + aNewTableFilter[0] = OUString("%"); xProp->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(aNewTableFilter)); - xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< ::rtl::OUString >() ) ); + xProp->setPropertyValue( PROPERTY_TABLETYPEFILTER, makeAny( Sequence< OUString >() ) ); Reference< ::com::sun::star::lang::XEventListener> xEvt; aErrorInfo = ::dbaui::createConnection(xProp, m_xORB, xEvt, m_xCurrentConnection); @@ -351,7 +351,7 @@ DBG_NAME(OTableSubscriptionPage) else { // in addition, we need some infos about the connection used - m_sCatalogSeparator = ::rtl::OUString("."); // (default) + m_sCatalogSeparator = OUString("."); // (default) m_bCatalogAtStart = sal_True; // (default) try { @@ -376,7 +376,7 @@ DBG_NAME(OTableSubscriptionPage) // get the current table filter SFX_ITEMSET_GET(_rSet, pTableFilter, OStringListItem, DSID_TABLEFILTER, sal_True); - Sequence< ::rtl::OUString > aTableFilter; + Sequence< OUString > aTableFilter; if (pTableFilter) aTableFilter = pTableFilter->getList(); @@ -464,13 +464,13 @@ DBG_NAME(OTableSubscriptionPage) } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > OTableSubscriptionPage::collectDetailedSelection() const + Sequence< OUString > OTableSubscriptionPage::collectDetailedSelection() const { - Sequence< ::rtl::OUString > aTableFilter; - static const ::rtl::OUString sDot("."); - static const ::rtl::OUString sWildcard("%"); + Sequence< OUString > aTableFilter; + static const OUString sDot("."); + static const OUString sWildcard("%"); - ::rtl::OUString sComposedName; + OUString sComposedName; const SvTreeListEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry(); if (!pAllObjectsEntry) return aTableFilter; @@ -484,7 +484,7 @@ DBG_NAME(OTableSubscriptionPage) if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChildren(pEntry)) { // checked and a leaf, which means it's no catalog, no schema, but a real table - ::rtl::OUString sCatalog; + OUString sCatalog; if(m_aTablesList.GetModel()->HasParent(pEntry)) { pSchema = m_aTablesList.GetModel()->GetParent(pEntry); @@ -516,7 +516,7 @@ DBG_NAME(OTableSubscriptionPage) if (bCatalogWildcard) sCatalog = sWildcard; else - sCatalog = ::rtl::OUString(); + sCatalog = OUString(); sCatalog += m_sCatalogSeparator; sCatalog += m_aTablesList.GetEntryText( pCatalog ); } @@ -543,7 +543,7 @@ DBG_NAME(OTableSubscriptionPage) aTableFilter[nOldLen] = sComposedName; // reset the composed name - sComposedName = ::rtl::OUString(); + sComposedName = OUString(); } if (bCatalogWildcard) @@ -584,11 +584,11 @@ DBG_NAME(OTableSubscriptionPage) // create the output string which contains all the table names if ( m_xCurrentConnection.is() ) { // collect the table filter data only if we have a connection - else no tables are displayed at all - Sequence< ::rtl::OUString > aTableFilter; + Sequence< OUString > aTableFilter; if (m_aTablesList.isWildcardChecked(m_aTablesList.getAllObjectsEntry())) { aTableFilter.realloc(1); - aTableFilter[0] = ::rtl::OUString("%", 1, RTL_TEXTENCODING_ASCII_US); + aTableFilter[0] = OUString("%", 1, RTL_TEXTENCODING_ASCII_US); } else { diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 6a64c2e2c31c..9bc084b1e12f 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -46,7 +46,7 @@ namespace dbaui OTableTreeListBox m_aTablesList; FixedText m_aExplanation; - ::rtl::OUString m_sCatalogSeparator; + OUString m_sCatalogSeparator; sal_Bool m_bCatalogAtStart : 1; ::osl::Mutex m_aNotifierMutex; @@ -85,14 +85,14 @@ namespace dbaui /** check the tables in m_aTablesList according to _rTables */ - void implCheckTables(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTables); + void implCheckTables(const ::com::sun::star::uno::Sequence< OUString >& _rTables); /// returns the next sibling, if not available, the next sibling of the parent, a.s.o. SvTreeListEntry* implNextSibling(SvTreeListEntry* _pEntry) const; /** return the current selection in m_aTablesList */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > collectDetailedSelection() const; + ::com::sun::star::uno::Sequence< OUString > collectDetailedSelection() const; /// (un)check all entries void CheckAll( sal_Bool bCheck = sal_True ); @@ -101,7 +101,7 @@ namespace dbaui // checks the tables according to the filter given // in oppsofite to implCheckTables, this method handles the case of an empty sequence, too ... - void implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter ); + void implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter ); }; //......................................................................... diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index cb16f12149c4..6ec8a4140117 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -62,12 +62,12 @@ namespace dbaui public: OCollectionView( Window * pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent - ,const ::rtl::OUString& _sDefaultName + ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); virtual ~OCollectionView(); ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getSelectedFolder() const; - ::rtl::OUString getName() const; + OUString getName() const; }; //......................................................................... } // namespace dbaui diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 81c7d8e20f23..76c290e5f840 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -43,7 +43,7 @@ namespace dbaui mutable TOTypeInfoSP m_pTypeInfo; // default type String m_sTypeNames; // these type names are the ones out of the resource file - ::rtl::OUString m_sAutoIncrementValue; + OUString m_sAutoIncrementValue; sal_Bool m_bAutoIncrementEnabled; protected: virtual void ActivateAggregate( EControlType eType ); @@ -53,7 +53,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const; virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; + virtual OUString getAutoIncrementValue() const; virtual void CellModified(long nRow, sal_uInt16 nColId ); public: diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 88fb3f938a03..8b532c2933b1 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -63,9 +63,9 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); @@ -75,7 +75,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleComponent diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx index bbcdc7f95b62..4ddb87927606 100644 --- a/dbaccess/source/ui/inc/ConnectionLineData.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx @@ -45,8 +45,8 @@ namespace dbaui **/ class OConnectionLineData : public ::salhelper::SimpleReferenceObject { - ::rtl::OUString m_aSourceFieldName; - ::rtl::OUString m_aDestFieldName; + OUString m_aSourceFieldName; + OUString m_aDestFieldName; friend bool operator==(const OConnectionLineData& lhs, const OConnectionLineData& rhs); friend bool operator!=(const OConnectionLineData& lhs, const OConnectionLineData& rhs) { return !(lhs == rhs); } @@ -54,29 +54,29 @@ namespace dbaui virtual ~OConnectionLineData(); public: OConnectionLineData(); - OConnectionLineData( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName ); + OConnectionLineData( const OUString& rSourceFieldName, const OUString& rDestFieldName ); OConnectionLineData( const OConnectionLineData& rConnLineData ); // provide a copy of own instance (this is somehow more acceptable for me compared to a virtual assignment operator void CopyFrom(const OConnectionLineData& rSource); // member access (write) - void SetFieldName(EConnectionSide nWhich, const ::rtl::OUString& strFieldName) + void SetFieldName(EConnectionSide nWhich, const OUString& strFieldName) { if (nWhich==JTCS_FROM) m_aSourceFieldName = strFieldName; else m_aDestFieldName = strFieldName; } - void SetSourceFieldName( const ::rtl::OUString& rSourceFieldName){ SetFieldName(JTCS_FROM, rSourceFieldName); } - void SetDestFieldName( const ::rtl::OUString& rDestFieldName ){ SetFieldName(JTCS_TO, rDestFieldName); } + void SetSourceFieldName( const OUString& rSourceFieldName){ SetFieldName(JTCS_FROM, rSourceFieldName); } + void SetDestFieldName( const OUString& rDestFieldName ){ SetFieldName(JTCS_TO, rDestFieldName); } - inline bool clearSourceFieldName() { SetSourceFieldName(::rtl::OUString()); return true;} - inline bool clearDestFieldName() { SetDestFieldName(::rtl::OUString()); return true;} + inline bool clearSourceFieldName() { SetSourceFieldName(OUString()); return true;} + inline bool clearDestFieldName() { SetDestFieldName(OUString()); return true;} // member access (read) - ::rtl::OUString GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; } - ::rtl::OUString GetSourceFieldName() const { return GetFieldName(JTCS_FROM); } - ::rtl::OUString GetDestFieldName() const { return GetFieldName(JTCS_TO); } + OUString GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; } + OUString GetSourceFieldName() const { return GetFieldName(JTCS_FROM); } + OUString GetDestFieldName() const { return GetFieldName(JTCS_TO); } bool Reset(); OConnectionLineData& operator=( const OConnectionLineData& rConnLineData ); diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 60553194015e..27d27a074eaa 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -55,7 +55,7 @@ namespace dbaui class ODatabaseExport { public: - DECLARE_STL_MAP(::rtl::OUString,OFieldDescription*,::comphelper::UStringMixLess,TColumns); + DECLARE_STL_MAP(OUString,OFieldDescription*,::comphelper::UStringMixLess,TColumns); typedef ::std::vector TColumnVector; typedef ::std::vector< ::std::pair > TPositions; @@ -82,7 +82,7 @@ namespace dbaui SvNumberFormatter* m_pFormatter; SvStream& m_rInputStream; /// for saving the selected tablename - ::rtl::OUString m_sDefaultTableName; + OUString m_sDefaultTableName; String m_sTextToken; ///< cell content String m_sNumToken; ///< SDNUM value @@ -108,7 +108,7 @@ namespace dbaui virtual TypeSelectionPageFactory getTypeSelectionPageFactory() = 0; - void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); + void CreateDefaultColumn(const OUString& _rColumnName); sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat); void adjustFormat(); void eraseTokens(); @@ -125,7 +125,7 @@ namespace dbaui @return true when an error occurs */ - sal_Bool executeWizard( const ::rtl::OUString& _sTableName, + sal_Bool executeWizard( const OUString& _sTableName, const ::com::sun::star::uno::Any& _aTextColor, const ::com::sun::star::awt::FontDescriptor& _rFont); @@ -155,7 +155,7 @@ namespace dbaui void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap); - inline void SetTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName ; } + inline void SetTableName(const OUString &_sTableName){ m_sDefaultTableName = _sTableName ; } virtual void release() = 0; diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index c571a111c8ca..1f2648973dbb 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -46,7 +46,7 @@ namespace dbaui short m_nPos; String m_strHelpText; public: - inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + inline OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); } @@ -60,7 +60,7 @@ namespace dbaui } }; inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, - ::rtl::OUString& _rAllowedChars, + OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 715160b7a5dd..54409082f284 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -133,9 +133,9 @@ namespace dbaui sal_Bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; void Contruct(); - OPropNumericEditCtrl* CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const rtl::OString& _sHelpId); + OPropNumericEditCtrl* CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId); FixedText* CreateText(sal_uInt16 _nTextRes); - void InitializeControl(Control* _pControl,const rtl::OString& _sHelpId,bool _bAddChangeHandler); + void InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler); protected: inline void setRightAligned() { m_bRightAligned = true; } @@ -163,7 +163,7 @@ namespace dbaui virtual const OTypeInfoMap* getTypeInfo() const = 0; virtual sal_Bool isAutoIncrementValueEnabled() const = 0; - virtual ::rtl::OUString getAutoIncrementValue() const = 0; + virtual OUString getAutoIncrementValue() const = 0; String BoolStringPersistent(const String& rUIString) const; String BoolStringUI(const String& rPersistentString) const; diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index 176541510465..56c5c1a1ec4a 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -41,12 +41,12 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; - ::rtl::OUString m_sName; - ::rtl::OUString m_sTypeName; - ::rtl::OUString m_sDescription; - ::rtl::OUString m_sHelpText; + OUString m_sName; + OUString m_sTypeName; + OUString m_sDescription; + OUString m_sHelpText; - ::rtl::OUString m_sAutoIncrementValue; + OUString m_sAutoIncrementValue; sal_Int32 m_nType; // only used when m_pType is null sal_Int32 m_nPrecision; sal_Int32 m_nScale; @@ -65,15 +65,15 @@ namespace dbaui ,sal_Bool _bUseAsDest = sal_False); ~OFieldDescription(); - void SetName(const ::rtl::OUString& _rName); - void SetDescription(const ::rtl::OUString& _rDescription); - void SetHelpText(const ::rtl::OUString& _sHelptext); + void SetName(const OUString& _rName); + void SetDescription(const OUString& _rDescription); + void SetHelpText(const OUString& _sHelptext); void SetDefaultValue(const ::com::sun::star::uno::Any& _rDefaultValue); void SetControlDefault(const ::com::sun::star::uno::Any& _rControlDefault); - void SetAutoIncrementValue(const ::rtl::OUString& _sAutoIncValue); + void SetAutoIncrementValue(const OUString& _sAutoIncValue); void SetType(TOTypeInfoSP _pType); void SetTypeValue(sal_Int32 _nType); - void SetTypeName(const ::rtl::OUString& _sTypeName); + void SetTypeName(const OUString& _sTypeName); void SetPrecision(const sal_Int32& _rPrecision); void SetScale(const sal_Int32& _rScale); void SetIsNullable(const sal_Int32& _rIsNullable); @@ -90,13 +90,13 @@ namespace dbaui void FillFromTypeInfo(const TOTypeInfoSP& _pType,sal_Bool _bForce,sal_Bool _bReset); - ::rtl::OUString GetName() const; - ::rtl::OUString GetDescription() const; - ::rtl::OUString GetHelpText() const; + OUString GetName() const; + OUString GetDescription() const; + OUString GetHelpText() const; ::com::sun::star::uno::Any GetControlDefault() const; - ::rtl::OUString GetAutoIncrementValue() const; + OUString GetAutoIncrementValue() const; sal_Int32 GetType() const; - ::rtl::OUString GetTypeName() const; + OUString GetTypeName() const; sal_Int32 GetPrecision() const; sal_Int32 GetScale() const; sal_Int32 GetIsNullable() const; diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 7bb0c2942300..6a1a60f8de72 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -39,7 +39,7 @@ namespace dbaui TYPEINFO(); OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = String(ModuleRes(nCommentID)); } - virtual rtl::OUString GetComment() const { return m_strComment; } + virtual OUString GetComment() const { return m_strComment; } }; } #endif // DBAUI_GENERALUNDO_HXX diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index b4831ecffc48..537814713b95 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -53,10 +53,10 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const = 0; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() = 0; - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const = 0; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const = 0; virtual void clearPassword() = 0; virtual sal_Bool saveDatasource() = 0; - virtual void setTitle(const ::rtl::OUString& _sTitle) = 0; + virtual void setTitle(const OUString& _sTitle) = 0; /** enables or disables the user's possibility to confirm the settings diff --git a/dbaccess/source/ui/inc/IUpdateHelper.hxx b/dbaccess/source/ui/inc/IUpdateHelper.hxx index a09b429b2173..c3036cd3dfee 100644 --- a/dbaccess/source/ui/inc/IUpdateHelper.hxx +++ b/dbaccess/source/ui/inc/IUpdateHelper.hxx @@ -28,7 +28,7 @@ namespace dbaui class SAL_NO_VTABLE IUpdateHelper { public: - virtual void updateString(sal_Int32 _nPos, const ::rtl::OUString& _sValue) = 0; + virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) = 0; virtual void updateDouble(sal_Int32 _nPos,const double& _nValue) = 0; virtual void updateInt(sal_Int32 _nPos,const sal_Int32& _nValue) = 0; virtual void updateNull(sal_Int32 _nPos, ::sal_Int32 sqlType) = 0; diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index f1aca64ad5cb..0c73e722d489 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -49,9 +49,9 @@ namespace dbaui DECLARE_XTYPEPROVIDER( ) // XServiceInfo - static methods - static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index e10c59782b10..f7477d9ba134 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -151,7 +151,7 @@ namespace dbaui } protected: - TTableWindowData::value_type createTableWindowData(const ::rtl::OUString& _sComposedName,const ::rtl::OUString& _sTableName,const ::rtl::OUString& _sWindowName); + TTableWindowData::value_type createTableWindowData(const OUString& _sComposedName,const OUString& _sTableName,const OUString& _sWindowName); // ask the user if the design should be saved when it is modified virtual short saveModified() = 0; // called when the orignal state should be reseted (first time load) diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 8c972407e05d..6bd1a66f76b6 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -133,7 +133,7 @@ namespace dbaui void NotifyTitleClicked( OTableWindow* pTabWin, const Point rMousePos ); - virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool bNewTable = sal_False); + virtual void AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool bNewTable = sal_False); virtual void RemoveTabWin( OTableWindow* pTabWin ); // hide all TabWins (does NOT delete them; they are put in an UNDO action) @@ -261,9 +261,9 @@ namespace dbaui virtual void EnsureVisible(const OTableWindow* _pWin); virtual void EnsureVisible(const Point& _rPoint,const Size& _rSize); - TTableWindowData::value_type createTableWindowData(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName); + TTableWindowData::value_type createTableWindowData(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName); protected: virtual void MouseButtonUp( const MouseEvent& rEvt ); @@ -281,9 +281,9 @@ namespace dbaui /// resizing) is used, as no scrolling can take place while resizing virtual void Command(const CommandEvent& rEvt); - virtual OTableWindowData* CreateImpl(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName); + virtual OTableWindowData* CreateImpl(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName); /** factory method to create table windows diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index ff95e71a6a2b..4b8821295faa 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -68,7 +68,7 @@ namespace dbaui Splitter m_aSplitter; ::com::sun::star::lang::Locale m_aLocale; - ::rtl::OUString m_sDecimalSep; + OUString m_sDecimalSep; OSelectionBrowseBox* m_pSelectionBox; // presents the lower window ChildFocusState m_eChildFocus; @@ -91,9 +91,9 @@ namespace dbaui // check if the statement is correct when not returning false virtual sal_Bool checkStatement(); // set the statement for representation - virtual void setStatement(const ::rtl::OUString& _rsStatement); + virtual void setStatement(const OUString& _rsStatement); // returns the current sql statement - virtual ::rtl::OUString getStatement(); + virtual OUString getStatement(); /// late construction virtual void Construct(); virtual void initialize(); @@ -106,18 +106,18 @@ namespace dbaui void setNoneVisbleRow(sal_Int32 _nRows); ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} - ::rtl::OUString getDecimalSeparator() const { return m_sDecimalSep;} + OUString getDecimalSeparator() const { return m_sDecimalSep;} SqlParseError InsertField( const OTableFieldDescRef& rInfo, sal_Bool bVis=sal_True, sal_Bool bActivate = sal_True); - bool HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const; + bool HasFieldByAliasName(const OUString& rFieldName, OTableFieldDescRef& rInfo) const; // save the position of the table window and the pos of the splitters // called when fields are deleted - void DeleteFields( const ::rtl::OUString& rAliasName ); + void DeleteFields( const OUString& rAliasName ); // called when a table from tabeview was deleted - void TableDeleted(const ::rtl::OUString& rAliasName); + void TableDeleted(const OUString& rAliasName); sal_Int32 getColWidth( sal_uInt16 _nColPos) const; - void fillValidFields(const ::rtl::OUString& strTableName, ComboBox* pFieldList); + void fillValidFields(const OUString& strTableName, ComboBox* pFieldList); void SaveUIConfig(); void stopTimer(); @@ -142,11 +142,11 @@ namespace dbaui ::connectivity::OSQLParseNode* getPredicateTreeFromEntry( OTableFieldDescRef pEntry, const String& _sCriteria, - ::rtl::OUString& _rsErrorMessage, + OUString& _rsErrorMessage, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn) const; void fillFunctionInfo( const ::connectivity::OSQLParseNode* pNode - ,const ::rtl::OUString& sFunctionTerm + ,const OUString& sFunctionTerm ,OTableFieldDescRef& aInfo); protected: // return the Rectangle where I can paint myself diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index ee7403f176d7..f8d32438165d 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -62,11 +62,11 @@ namespace dbaui /// base class overwritten: create and delete windows /// (not really delete, as it becomes an UndoAction) - virtual void AddTabWin( const ::rtl::OUString& _rTableName, const ::rtl::OUString& _rAliasName, sal_Bool bNewTable = sal_False ); + virtual void AddTabWin( const OUString& _rTableName, const OUString& _rAliasName, sal_Bool bNewTable = sal_False ); virtual void RemoveTabWin(OTableWindow* pTabWin); /// AddTabWin, setting an alias - void AddTabWin(const ::rtl::OUString& strDatabase, const ::rtl::OUString& strTableName, const ::rtl::OUString& strAlias, sal_Bool bNewTable = sal_False); + void AddTabWin(const OUString& strDatabase, const OUString& strTableName, const OUString& strAlias, sal_Bool bNewTable = sal_False); /// search TabWin OQueryTableWindow* FindTable(const String& rAliasName); sal_Bool FindTableFromField(const String& rFieldName, OTableFieldDescRef& rInfo, sal_uInt16& rCnt); @@ -118,9 +118,9 @@ namespace dbaui sal_Bool ExistsAVisitedConn(const OQueryTableWindow* pFrom) const; - virtual OTableWindowData* CreateImpl(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName); + virtual OTableWindowData* CreateImpl(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName); /** opens the join dialog and allows to create a new join connection */ void createNewConnection(); diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index c16e9593d16a..973c011199e0 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -48,8 +48,8 @@ namespace dbaui // check if the statement is correct when not returning false virtual sal_Bool checkStatement(); // set the statement for representation - virtual void setStatement(const ::rtl::OUString& _rsStatement); - virtual ::rtl::OUString getStatement(); + virtual void setStatement(const OUString& _rsStatement); + virtual OUString getStatement(); // allow access to our edit OSqlEdit* getSqlEdit() const { return m_pEdit; } diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx index c8fc0809389b..cc07843424c2 100644 --- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx +++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx @@ -54,9 +54,9 @@ namespace dbaui // check if the statement is correct when not returning false virtual sal_Bool checkStatement(); // set the statement for representation - virtual void setStatement(const ::rtl::OUString& _rsStatement); + virtual void setStatement(const OUString& _rsStatement); // returns the current sql statement - virtual ::rtl::OUString getStatement(); + virtual OUString getStatement(); /// late construction virtual void Construct(); virtual void initialize(); diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 85d997287bb0..1f86862a5bb7 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -59,7 +59,7 @@ namespace dbaui ORelationTableConnectionData( const ORelationTableConnectionData& rConnData ); ORelationTableConnectionData( const TTableWindowData::value_type& _pReferencingTable, const TTableWindowData::value_type& _pReferencedTable, - const ::rtl::OUString& rConnName = ::rtl::OUString() ); + const OUString& rConnName = OUString() ); virtual ~ORelationTableConnectionData(); virtual void CopyFrom(const OTableConnectionData& rSource); diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index df04f1d03190..b62620f3f1b5 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -41,7 +41,7 @@ namespace dbaui ORelationDesignView* getRelationView() { return static_cast( getView() ); } void loadData(); - TTableWindowData::value_type existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase) const; + TTableWindowData::value_type existsTable(const OUString& _rComposedTableName,sal_Bool _bCase) const; // load the window positions out of the datasource void loadLayoutInformation(); @@ -58,11 +58,11 @@ namespace dbaui virtual sal_Bool Construct(Window* pParent); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -75,7 +75,7 @@ namespace dbaui virtual short saveModified(); virtual void reset(); virtual void impl_initialize(); - virtual ::rtl::OUString getPrivateTitle( ) const; + virtual OUString getPrivateTitle( ) const; DECL_LINK( OnThreadFinished, void* ); }; } diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index 50511b09c0da..c783b46c78a1 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -38,7 +38,7 @@ namespace dbaui bool m_bInRemove; virtual void ConnDoubleClicked( OTableConnection* pConnection ); - virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool bNewTable = sal_False); + virtual void AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool bNewTable = sal_False); virtual OTableWindow* createWindow(const TTableWindowData::value_type& _pData); diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index cfe88d0ea838..9d638e7c18c4 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -26,11 +26,11 @@ namespace dbaui { class OSQLNameChecker { - ::rtl::OUString m_sAllowedChars; + OUString m_sAllowedChars; sal_Bool m_bOnlyUpperCase; sal_Bool m_bCheck; // true when we should check for invalid chars public: - OSQLNameChecker(const ::rtl::OUString& _rAllowedChars) + OSQLNameChecker(const OUString& _rAllowedChars) :m_sAllowedChars(_rAllowedChars) ,m_bOnlyUpperCase(sal_False) ,m_bCheck(sal_True) @@ -41,7 +41,7 @@ namespace dbaui { m_bOnlyUpperCase = _bUpper; } - void setAllowedChars(const ::rtl::OUString& _rAllowedChars) + void setAllowedChars(const OUString& _rAllowedChars) { m_sAllowedChars = _rAllowedChars; } @@ -50,19 +50,19 @@ namespace dbaui { m_bCheck = _bCheck; } - sal_Bool checkString(const ::rtl::OUString& _sToCheck,::rtl::OUString& _rsCorrected); + sal_Bool checkString(const OUString& _sToCheck,OUString& _rsCorrected); }; //================================================================== class OSQLNameEdit : public Edit ,public OSQLNameChecker { public: - OSQLNameEdit(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) + OSQLNameEdit(Window* _pParent,const OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) : Edit(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameEdit(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) + OSQLNameEdit(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) : Edit(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { @@ -78,12 +78,12 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameComboBox(Window* _pParent,const ::rtl::OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) + OSQLNameComboBox(Window* _pParent,const OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) : ComboBox(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const ::rtl::OUString& _rAllowedChars = ::rtl::OUString()) + OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) : ComboBox(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index 400a8a7298e6..dd65a4d5f55b 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -71,7 +71,7 @@ namespace dbaui virtual OTableConnectionData* NewInstance() const; sal_Bool SetConnLine( sal_uInt16 nIndex, const String& rSourceFieldName, const String& rDestFieldName ); - sal_Bool AppendConnLine( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName ); + sal_Bool AppendConnLine( const OUString& rSourceFieldName, const OUString& rDestFieldName ); /** Deletes list of ConnLines */ void ResetConnLines(); diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index ed8a2dcf92f8..d6097fad863b 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -44,10 +44,10 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sCatalogName; // catalog for update data - ::rtl::OUString m_sSchemaName; // schema for update data - ::rtl::OUString m_sName; // table for update data - ::rtl::OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource + OUString m_sCatalogName; // catalog for update data + OUString m_sSchemaName; // schema for update data + OUString m_sName; // table for update data + OUString m_sAutoIncrementValue; // the autoincrement value set in the datasource String m_sTypeNames; // these type names are the ones out of the resource file TOTypeInfoSP m_pTypeInfo; // fall back when type is unknown because database driver has a failure @@ -65,7 +65,7 @@ namespace dbaui void alterColumns(); void dropPrimaryKey(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getKeyColumns() const; - ::rtl::OUString createUniqueName(const ::rtl::OUString& _rName); + OUString createUniqueName(const OUString& _rName); void reload(); @@ -78,7 +78,7 @@ namespace dbaui virtual void losingConnection( ); - virtual ::rtl::OUString getPrivateTitle( ) const; + virtual OUString getPrivateTitle( ) const; void doEditIndexes(); sal_Bool doSaveDoc(sal_Bool _bSaveAs); @@ -95,7 +95,7 @@ namespace dbaui bool isAutoIncrementPrimaryKey() const; inline sal_Bool isAutoIncrementValueEnabled() const { return m_bAllowAutoIncrementValue; } - inline const ::rtl::OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } + inline const OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } virtual void impl_onModifyChanged(); @@ -122,11 +122,11 @@ namespace dbaui virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 65326d9a1b74..01835f762a30 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -65,7 +65,7 @@ namespace dbaui { private: OGenericUnoController* m_pController; - ::rtl::OUString m_sTableNameForAppend; + OUString m_sTableNameForAppend; public: // is needed to describe the drop target @@ -74,7 +74,7 @@ namespace dbaui ::svx::ODataAccessDescriptor aDroppedData; //for transfor the tablename - ::rtl::OUString sDefaultTableName; + OUString sDefaultTableName; String aUrl; SotStorageStreamRef aHtmlRtfStorage; @@ -96,7 +96,7 @@ namespace dbaui The name of the dest data source. */ void pasteTable( const TransferableDataHelper& _rTransData - ,const ::rtl::OUString& _sDestDataSourceName + ,const OUString& _sDestDataSourceName ,const SharedConnection& _xConnection); /** pastes a table into the data source @@ -109,7 +109,7 @@ namespace dbaui */ void pasteTable( SotFormatStringId _nFormatId ,const TransferableDataHelper& _rTransData - ,const ::rtl::OUString& _sDestDataSourceName + ,const OUString& _sDestDataSourceName ,const SharedConnection& _xConnection); /** copies a table which was constructed by tags like HTML or RTF @@ -133,7 +133,7 @@ namespace dbaui The connection */ void asyncCopyTagTable( DropDescriptor& _rDesc - ,const ::rtl::OUString& _sDestDataSourceName + ,const OUString& _sDestDataSourceName ,const SharedConnection& _xConnection); /** copies a table which was constructed by tags like HTML or RTF @@ -151,9 +151,9 @@ namespace dbaui /// returns if the clipboard supports a table format, otherwise . sal_Bool isTableFormat(const TransferableDataHelper& _rClipboard) const; - inline void SetTableNameForAppend( const ::rtl::OUString& _rDefaultTableName ) { m_sTableNameForAppend = _rDefaultTableName; } - inline void ResetTableNameForAppend() { SetTableNameForAppend( ::rtl::OUString() ); } - inline const ::rtl::OUString& GetTableNameForAppend() const { return m_sTableNameForAppend ;} + inline void SetTableNameForAppend( const OUString& _rDefaultTableName ) { m_sTableNameForAppend = _rDefaultTableName; } + inline void ResetTableNameForAppend() { SetTableNameForAppend( OUString() ); } + inline const OUString& GetTableNameForAppend() const { return m_sTableNameForAppend ;} private: /** pastes a table into the data source @@ -164,21 +164,21 @@ namespace dbaui */ void pasteTable( const ::svx::ODataAccessDescriptor& _rPasteData, - const ::rtl::OUString& _sDestDataSourceName, + const OUString& _sDestDataSourceName, const SharedConnection& _xDestConnection ); /** insert a table into the data source. The source can eihter be a table or a query */ void insertTable( - const ::rtl::OUString& i_rSourceDataSource, + const OUString& i_rSourceDataSource, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_rSourceConnection, - const ::rtl::OUString& i_rCommand, + const OUString& i_rCommand, const sal_Int32 i_nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& i_rSourceRows, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& i_rSelection, const sal_Bool i_bBookmarkSelection, - const ::rtl::OUString& i_rDestDataSource, + const OUString& i_rDestDataSource, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_rDestConnection ); diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 0ab1a19be4d9..8b9e8e473a69 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -40,14 +40,14 @@ namespace dbaui class OTableFieldDesc : public ::salhelper::SimpleReferenceObject { private: - ::std::vector< ::rtl::OUString > + ::std::vector< OUString > m_aCriteria; - ::rtl::OUString m_aTableName; - ::rtl::OUString m_aAliasName; ///< table range - ::rtl::OUString m_aFieldName; ///< column - ::rtl::OUString m_aFieldAlias; ///< column alias - ::rtl::OUString m_aFunctionName;///< contains the function name (only if m_eFunctionType != FKT_NONE) + OUString m_aTableName; + OUString m_aAliasName; ///< table range + OUString m_aFieldName; ///< column + OUString m_aFieldAlias; ///< column alias + OUString m_aFunctionName;///< contains the function name (only if m_eFunctionType != FKT_NONE) Window* m_pTabWindow; @@ -65,7 +65,7 @@ namespace dbaui public: OTableFieldDesc(); - OTableFieldDesc(const ::rtl::OUString& rTable, const ::rtl::OUString& rField ); + OTableFieldDesc(const OUString& rTable, const OUString& rField ); OTableFieldDesc(const OTableFieldDesc& rRS); ~OTableFieldDesc(); @@ -80,29 +80,29 @@ namespace dbaui void SetVisible( sal_Bool bVis=sal_True ) { m_bVisible = bVis; } void SetGroupBy( sal_Bool bGb=sal_False ) { m_bGroupBy = bGb; } void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin; } - void SetField( const ::rtl::OUString& rF ) { m_aFieldName = rF; } - void SetFieldAlias( const ::rtl::OUString& rF ) { m_aFieldAlias = rF; } - void SetTable( const ::rtl::OUString& rT ) { m_aTableName = rT; } - void SetAlias( const ::rtl::OUString& rT ) { m_aAliasName = rT; } - void SetFunction( const ::rtl::OUString& rT ) { m_aFunctionName = rT; } + void SetField( const OUString& rF ) { m_aFieldName = rF; } + void SetFieldAlias( const OUString& rF ) { m_aFieldAlias = rF; } + void SetTable( const OUString& rT ) { m_aTableName = rT; } + void SetAlias( const OUString& rT ) { m_aAliasName = rT; } + void SetFunction( const OUString& rT ) { m_aFunctionName = rT; } void SetOrderDir( EOrderDir eDir ) { m_eOrderDir = eDir; } void SetDataType( sal_Int32 eTyp ) { m_eDataType = eTyp; } void SetFieldType( ETableFieldType eTyp ) { m_eFieldType = eTyp; } - void SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit ); + void SetCriteria( sal_uInt16 nIdx, const OUString& rCrit ); void SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; } void SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; } void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; } void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; } - ::rtl::OUString GetField() const { return m_aFieldName;} - ::rtl::OUString GetFieldAlias() const { return m_aFieldAlias;} - ::rtl::OUString GetTable() const { return m_aTableName;} - ::rtl::OUString GetAlias() const { return m_aAliasName;} - ::rtl::OUString GetFunction() const { return m_aFunctionName;} + OUString GetField() const { return m_aFieldName;} + OUString GetFieldAlias() const { return m_aFieldAlias;} + OUString GetTable() const { return m_aTableName;} + OUString GetAlias() const { return m_aAliasName;} + OUString GetFunction() const { return m_aFunctionName;} sal_Int32 GetDataType() const { return m_eDataType; } ETableFieldType GetFieldType() const { return m_eFieldType; } EOrderDir GetOrderDir() const { return m_eOrderDir; } - ::rtl::OUString GetCriteria( sal_uInt16 nIdx ) const; + OUString GetCriteria( sal_uInt16 nIdx ) const; sal_Int32 GetColWidth() const { return m_nColWidth; } sal_Int32 GetFieldIndex() const { return m_nIndex; } Window* GetTabWindow() const { return m_pTabWindow;} @@ -118,15 +118,15 @@ namespace dbaui sal_Bool HasCriteria() const { - ::std::vector< ::rtl::OUString>::const_iterator aIter = m_aCriteria.begin(); - ::std::vector< ::rtl::OUString>::const_iterator aEnd = m_aCriteria.end(); + ::std::vector< OUString>::const_iterator aIter = m_aCriteria.begin(); + ::std::vector< OUString>::const_iterator aEnd = m_aCriteria.end(); for(;aIter != aEnd;++aIter) if(!aIter->isEmpty()) break; return aIter != aEnd; } - const ::std::vector< ::rtl::OUString>& GetCriteria() const { return m_aCriteria; } + const ::std::vector< OUString>& GetCriteria() const { return m_aCriteria; } void Load( const ::com::sun::star::beans::PropertyValue& i_rSettings, const bool i_bIncludingCriteria ); void Save( ::comphelper::NamedValueCollection& o_rSettings, const bool i_bIncludingCriteria ); diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 8b054a0c07c5..6d916cfae8af 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -46,10 +46,10 @@ class OTableGrantControl : public ::svt::EditBrowseBox ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable> m_xGrantUser; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aTableNames; + ::com::sun::star::uno::Sequence< OUString> m_aTableNames; mutable TTablePrivilegeMap m_aPrivMap; - ::rtl::OUString m_sUserName; + OUString m_sUserName; ::svt::CheckBoxControl* m_pCheckCell; Edit* m_pEdit; long m_nDataPos; @@ -59,7 +59,7 @@ public: OTableGrantControl( Window* pParent,const ResId& _RsId); virtual ~OTableGrantControl(); void UpdateTables(); - void setUserName(const ::rtl::OUString _sUserName); + void setUserName(const OUString _sUserName); void setGrantUser(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable>& _xGrantUser); void setTablesSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >& _xTablesSup); diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 81d2957eccf3..ae46b51dd00a 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -144,9 +144,9 @@ namespace dbaui void Remove(); sal_Bool IsActiveWindow(){ return m_bActive; } - ::rtl::OUString GetTableName() const { return m_pData->GetTableName(); } - ::rtl::OUString GetWinName() const { return m_pData->GetWinName(); } - ::rtl::OUString GetComposedName() const { return m_pData->GetComposedName(); } + OUString GetTableName() const { return m_pData->GetTableName(); } + OUString GetWinName() const { return m_pData->GetWinName(); } + OUString GetComposedName() const { return m_pData->GetComposedName(); } OTableWindowListBox* GetListBox() const { return m_pListBox; } TTableWindowData::value_type GetData() const { return m_pData; } OTableWindowTitle* GetTitleCtrl() { return &m_aTitle; } @@ -155,7 +155,7 @@ namespace dbaui @return The composed name or the window name. */ - virtual ::rtl::OUString GetName() const = 0; + virtual OUString GetName() const = 0; inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); } inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetTable() const { return m_pData->getTable(); } @@ -186,7 +186,7 @@ namespace dbaui // do I have connections to the outside? sal_Bool ExistsAConn() const; - void EnumValidFields(::std::vector< ::rtl::OUString>& arrstrFields); + void EnumValidFields(::std::vector< OUString>& arrstrFields); /** clears the listbox inside. Must be called be the dtor is called. */ diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index 30867659c6f1..b3ace55ca53a 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -67,12 +67,12 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); @@ -82,14 +82,14 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleExtendedComponent - virtual ::rtl::OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleRelationSet virtual sal_Int32 SAL_CALL getRelationCount( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index 96cf8bbc2c6a..a971611387ad 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -41,9 +41,9 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xKeys; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; - ::rtl::OUString m_aTableName; - ::rtl::OUString m_aWinName; - ::rtl::OUString m_sComposedName; + OUString m_aTableName; + OUString m_aWinName; + OUString m_sComposedName; Point m_aPosition; Size m_aSize; sal_Bool m_bShowAll; @@ -52,9 +52,9 @@ namespace dbaui public: explicit OTableWindowData( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable - ,const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& strTableName - ,const ::rtl::OUString& rWinName = ::rtl::OUString() ); + ,const OUString& _rComposedName + ,const OUString& strTableName + ,const OUString& rWinName = OUString() ); virtual ~OTableWindowData(); /** late constructor @@ -66,9 +66,9 @@ namespace dbaui bool init(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection ,bool _bAllowQueries); - inline ::rtl::OUString GetComposedName() const { return m_sComposedName; } - inline ::rtl::OUString GetTableName() const { return m_aTableName; } - inline ::rtl::OUString GetWinName() const { return m_aWinName; } + inline OUString GetComposedName() const { return m_sComposedName; } + inline OUString GetTableName() const { return m_aTableName; } + inline OUString GetWinName() const { return m_aWinName; } inline Point GetPosition() const { return m_aPosition; } inline Size GetSize() const { return m_aSize; } inline sal_Bool IsShowAll() const { return m_bShowAll; } @@ -77,7 +77,7 @@ namespace dbaui sal_Bool HasPosition() const; sal_Bool HasSize() const; - inline void SetWinName( const ::rtl::OUString& rWinName ) { m_aWinName = rWinName; } + inline void SetWinName( const OUString& rWinName ) { m_aWinName = rWinName; } inline void SetPosition( const Point& rPos ) { m_aPosition=rPos; } inline void SetSize( const Size& rSize ) { m_aSize = rSize; } inline void ShowAll( sal_Bool bAll ) { m_bShowAll = bAll; } diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 4c7480685ff6..f7bbb8205526 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -73,12 +73,12 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sName; + OUString m_sName; //for transfor the tablename - ::rtl::OUString m_sDefaultTableName; + OUString m_sDefaultTableName; - ::rtl::OUString m_sDataSourceName; + OUString m_sDataSourceName; sal_Int32 m_nCommandType; bool m_bNeedToReInitialize; @@ -112,7 +112,7 @@ namespace dbaui void setStream(SvStream* _pStream){ m_pStream = _pStream; } //for set the tablename - void setSTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName; } + void setSTableName(const OUString &_sTableName){ m_sDefaultTableName = _sTableName; } virtual sal_Bool Write(); // Export virtual sal_Bool Read(); // Import @@ -135,7 +135,7 @@ namespace dbaui class ORTFImportExport : public ODatabaseImportExport { - void appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk); + void appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk); public: // export data ORTFImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 2f4a40ad3948..5e8c0d6ebd3f 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -32,7 +32,7 @@ namespace dbaui { //======================================================================== -// Based on these ids the language dependent ::rtl::OUString are fetched from the resource +// Based on these ids the language dependent OUString are fetched from the resource const sal_uInt16 TYPE_UNKNOWN = 0; const sal_uInt16 TYPE_TEXT = 1; const sal_uInt16 TYPE_NUMERIC = 2; @@ -69,12 +69,12 @@ const sal_uInt16 TYPE_BIT = 31; class OTypeInfo { public: - ::rtl::OUString aUIName; // the name which is the user see (a combination of resource text and aTypeName) - ::rtl::OUString aTypeName; // name of type in database - ::rtl::OUString aLiteralPrefix; // prefix for quoting - ::rtl::OUString aLiteralSuffix; // suffix for quoting - ::rtl::OUString aCreateParams; // parameter for creation - ::rtl::OUString aLocalTypeName; + OUString aUIName; // the name which is the user see (a combination of resource text and aTypeName) + OUString aTypeName; // name of type in database + OUString aLiteralPrefix; // prefix for quoting + OUString aLiteralSuffix; // suffix for quoting + OUString aCreateParams; // parameter for creation + OUString aLocalTypeName; sal_Int32 nPrecision; // length of type sal_Int32 nType; // database type @@ -105,7 +105,7 @@ const sal_uInt16 TYPE_BIT = 31; {} sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } sal_Bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; } - inline ::rtl::OUString getDBName() const { return aTypeName; } + inline OUString getDBName() const { return aTypeName; } }; @@ -123,8 +123,8 @@ const sal_uInt16 TYPE_BIT = 31; */ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, sal_Int32 _nType, - const ::rtl::OUString& _sTypeName, - const ::rtl::OUString& _sCreateParams, + const OUString& _sTypeName, + const OUString& _sCreateParams, sal_Int32 _nPrecision, sal_Int32 _nScale, sal_Bool _bAutoIncrement, diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 35350ed1d65e..656997cd4211 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -85,7 +85,7 @@ namespace dbaui @return SQLExceptionInfo contains a SQLException, SQLContext or a SQLWarning when they araised else .isValid() will return false */ ::dbtools::SQLExceptionInfo createConnection( - const ::rtl::OUString& _rsDataSourceName, + const OUString& _rsDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xDatabaseContext, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, @@ -131,13 +131,13 @@ namespace dbaui void setColumnProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, const OFieldDescription* _pFieldDesc); - ::rtl::OUString createDefaultName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, + OUString createDefaultName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTables, - const ::rtl::OUString& _sName); + const OUString& _sName); /** checks if the given name exists in the database context */ - sal_Bool checkDataSourceAvailable( const ::rtl::OUString& _sDataSourceName, + sal_Bool checkDataSourceAvailable( const OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); /** maps SvxCellHorJustify to com::sun::star::awt::TextAlign @@ -164,7 +164,7 @@ namespace dbaui */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSourceByName( - const ::rtl::OUString& _rDataSourceName, + const OUString& _rDataSourceName, Window* _pErrorMessageParent, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo @@ -214,7 +214,7 @@ namespace dbaui @return false when datsource is not available otherwise true */ sal_Bool appendToFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _sName, + const OUString& _sName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, Window* _pParent); @@ -271,7 +271,7 @@ namespace dbaui */ void fillAutoIncrementValue(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDatasource ,sal_Bool& _rAutoIncrementValueEnabled - ,::rtl::OUString& _rsAutoIncrementValue); + ,OUString& _rsAutoIncrementValue); /** fills the bool and string value with information out of the datasource info property @param _xConnection @@ -283,7 +283,7 @@ namespace dbaui */ void fillAutoIncrementValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ,sal_Bool& _rAutoIncrementValueEnabled - ,::rtl::OUString& _rsAutoIncrementValue); + ,OUString& _rsAutoIncrementValue); /** creates the URL or the help agent @param _sModuleName @@ -291,7 +291,7 @@ namespace dbaui @return The URL for the help agent to dispatch. */ - ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const rtl::OString& _rHelpId); + ::com::sun::star::util::URL createHelpAgentURL(const OUString& _sModuleName,const OString& _rHelpId); /** set the evaluation flag at the number formatter @param _rxFormatter @@ -336,7 +336,7 @@ namespace dbaui @return RET_YES, RET_NO, RET_ALL */ - sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const ::rtl::OUString& _sName); + sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const OUString& _sName); /** creates a new view from a query or table @param _sName @@ -348,16 +348,16 @@ namespace dbaui @return The created view. */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createView( const ::rtl::OUString& _sName + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createView( const OUString& _sName ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSourceObject); /** creates a view with the given command */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createView( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - const ::rtl::OUString& _rCommand + const OUString& _rCommand ); /** returns the stripped database name. @@ -368,8 +368,8 @@ namespace dbaui @return The stripped database name either the registered naem or if it is a file url the last segment. */ - ::rtl::OUString getStrippedDatabaseName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource - ,::rtl::OUString& _rsDatabaseName); + OUString getStrippedDatabaseName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDataSource + ,OUString& _rsDatabaseName); /** returns the standard database filter @retrun @@ -418,7 +418,7 @@ namespace dbaui // this completes a help url with the system parameters "Language" and "System" // detect installed locale - void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark ); + void AppendConfigToken( OUString& _rURL, sal_Bool _bQuestionMark ); // ......................................................................... } diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index e54d7e1e8f84..470fa6b95494 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -74,10 +74,10 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); - virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); }; //......................................................................... diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 5a0e78ffc767..bae5fef2ed87 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -89,7 +89,7 @@ namespace dbaui m_aCB_UseHeaderLine.Disable(); } - void setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ); + void setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ); }; } #endif // DBAUI_WIZARD_CPAGE_HXX diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index da275d02ce6d..f960ead3e383 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -53,21 +53,21 @@ namespace dbaui void clearListBox(MultiListBox& _rListBox); void fillColumns( ListBox* pRight, - ::std::vector< ::rtl::OUString> &_rRightColumns); + ::std::vector< OUString> &_rRightColumns); void createNewColumn( ListBox* _pListbox, OFieldDescription* _pSrcField, - ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, + ::std::vector< OUString>& _rRightColumns, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase); void moveColumn( ListBox* _pRight, ListBox* _pLeft, - ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, + ::std::vector< OUString>& _rRightColumns, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase); @@ -75,7 +75,7 @@ namespace dbaui sal_uInt16 adjustColumnPosition(ListBox* _pLeft, - const ::rtl::OUString& _sColumnName, + const OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::TStringMixEqualFunctor& _aCase); diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 9a95655decdd..659f13c66a3b 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -43,11 +43,11 @@ namespace dbaui { - typedef ::std::unary_function< ::rtl::OUString,bool> TColumnFindFunctorType; + typedef ::std::unary_function< OUString,bool> TColumnFindFunctorType; class TColumnFindFunctor : public TColumnFindFunctorType { public: - virtual bool operator()(const ::rtl::OUString& _sColumnName) const = 0; + virtual bool operator()(const OUString& _sColumnName) const = 0; protected: ~TColumnFindFunctor() {} @@ -64,7 +64,7 @@ namespace dbaui virtual ~TExportColumnFindFunctor() {} - inline bool operator()(const ::rtl::OUString& _sColumnName) const + inline bool operator()(const OUString& _sColumnName) const { return m_pColumns->find(_sColumnName) != m_pColumns->end(); } @@ -73,9 +73,9 @@ namespace dbaui class TMultiListBoxEntryFindFunctor : public TColumnFindFunctor { ::comphelper::TStringMixEqualFunctor m_aCase; - ::std::vector< ::rtl::OUString>* m_pVector; + ::std::vector< OUString>* m_pVector; public: - TMultiListBoxEntryFindFunctor(::std::vector< ::rtl::OUString>* _pVector, + TMultiListBoxEntryFindFunctor(::std::vector< OUString>* _pVector, const ::comphelper::TStringMixEqualFunctor& _aCase) :m_aCase(_aCase) ,m_pVector(_pVector) @@ -84,7 +84,7 @@ namespace dbaui virtual ~TMultiListBoxEntryFindFunctor() {} - inline bool operator()(const ::rtl::OUString& _sColumnName) const + inline bool operator()(const OUString& _sColumnName) const { return ::std::find_if(m_pVector->begin(),m_pVector->end(), ::std::bind2nd(m_aCase, _sColumnName)) != m_pVector->end(); @@ -107,7 +107,7 @@ namespace dbaui { public: /// retrieves the fully qualified name of the object to copy - virtual ::rtl::OUString getQualifiedObjectName() const = 0; + virtual OUString getQualifiedObjectName() const = 0; /// determines whether the object is a view virtual bool isView() const = 0; /** copies the UI settings of the object to the given target object. Might be @@ -115,15 +115,15 @@ namespace dbaui */ virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const = 0; /// retrieves the column names of the to-be-copied object - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getColumnNames() const = 0; /// retrieves the names of the primary keys of the to-be-copied object - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getPrimaryKeyColumnNames() const = 0; /// creates a OFieldDescription for the given column of the to-be-copied object - virtual OFieldDescription* createFieldDescription( const ::rtl::OUString& _rColumnName ) const = 0; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const = 0; /// returns the SELECT statement which can be used to retrieve the data of the to-be-copied object - virtual ::rtl::OUString getSelectStatement() const = 0; + virtual OUString getSelectStatement() const = 0; /** copies the filter and sorting * @@ -161,16 +161,16 @@ namespace dbaui ); // ICopyTableSourceObject overridables - virtual ::rtl::OUString getQualifiedObjectName() const; + virtual OUString getQualifiedObjectName() const; virtual bool isView() const; virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getColumnNames() const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getPrimaryKeyColumnNames() const; - virtual OFieldDescription* createFieldDescription( const ::rtl::OUString& _rColumnName ) const; - virtual ::rtl::OUString getSelectStatement() const; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const; + virtual OUString getSelectStatement() const; virtual ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > getPreparedSelectStatement() const; }; @@ -183,30 +183,30 @@ namespace dbaui private: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - ::rtl::OUString m_sTableName; - ::rtl::OUString m_sTableCatalog; - ::rtl::OUString m_sTableSchema; - ::rtl::OUString m_sTableBareName; + OUString m_sTableName; + OUString m_sTableCatalog; + OUString m_sTableSchema; + OUString m_sTableBareName; ::std::vector< OFieldDescription > m_aColumnInfo; ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement; public: NamedTableCopySource( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString& _rTableName + const OUString& _rTableName ); // ICopyTableSourceObject overridables - virtual ::rtl::OUString getQualifiedObjectName() const; + virtual OUString getQualifiedObjectName() const; virtual bool isView() const; virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getColumnNames() const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getPrimaryKeyColumnNames() const; - virtual OFieldDescription* createFieldDescription( const ::rtl::OUString& _rColumnName ) const; - virtual ::rtl::OUString getSelectStatement() const; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const; + virtual OUString getSelectStatement() const; virtual ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XPreparedStatement > getPreparedSelectStatement() const; @@ -228,7 +228,7 @@ namespace dbaui friend class OWizNameMatching; public: - DECLARE_STL_MAP(::rtl::OUString,::rtl::OUString,::comphelper::UStringMixLess,TNameMapping); + DECLARE_STL_MAP(OUString,OUString,::comphelper::UStringMixLess,TNameMapping); enum Wizard_Button_Style { @@ -274,9 +274,9 @@ namespace dbaui bool m_bInterConnectionCopy; // are we copying between different connections? ::com::sun::star::lang::Locale m_aLocale; - ::rtl::OUString m_sName; // for a table the name is composed - ::rtl::OUString m_sSourceName; - ::rtl::OUString m_aKeyName; + OUString m_sName; // for a table the name is composed + OUString m_sSourceName; + OUString m_aKeyName; TOTypeInfoSP m_pTypeInfo; // default type sal_Bool m_bAddPKFirstTime; sal_Int16 m_nOperation; @@ -306,7 +306,7 @@ namespace dbaui // used for copy tables or queries OCopyTableWizard( Window * pParent, - const ::rtl::OUString& _rDefaultName, + const OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xSourceConnection, @@ -318,7 +318,7 @@ namespace dbaui // used for importing rtf/html sources OCopyTableWizard( Window* pParent, - const ::rtl::OUString& _rDefaultName, + const OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rDestColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, @@ -356,12 +356,12 @@ namespace dbaui @param _sOldName The name of column to be replaced. */ - void replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const ::rtl::OUString& _sOldName); + void replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const OUString& _sOldName); /** returns whether a primary key should be created in the target database */ sal_Bool shouldCreatePrimaryKey() const; - void setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ); + void setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ); static bool supportsPrimaryKey( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); bool supportsPrimaryKey() const { return supportsPrimaryKey( m_xDestConnection ); } @@ -373,7 +373,7 @@ namespace dbaui @return The name of the primary key. */ - ::rtl::OUString getPrimaryKeyName() const { return m_aKeyName; } + OUString getPrimaryKeyName() const { return m_aKeyName; } TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } @@ -389,7 +389,7 @@ namespace dbaui const ODatabaseExport::TColumnVector* getSrcVector() const { return &m_vSourceVec; } ODatabaseExport::TColumns* getDestColumns() { return &m_vDestColumns; } const ODatabaseExport::TColumnVector* getDestVector() const { return &m_aDestVec; } - ::rtl::OUString getName() const { return m_sName; } + OUString getName() const { return m_sName; } /** clears the dest vectors */ @@ -402,19 +402,19 @@ namespace dbaui void setOperation( const sal_Int16 _nOperation ); sal_Int16 getOperation() const; - ::rtl::OUString convertColumnName( const TColumnFindFunctor& _rCmpFunctor, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, + OUString convertColumnName( const TColumnFindFunctor& _rCmpFunctor, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen); TOTypeInfoSP convertType(const TOTypeInfoSP&_pType,sal_Bool& _bNotConvert); - ::rtl::OUString createUniqueName(const ::rtl::OUString& _sName); + OUString createUniqueName(const OUString& _sName); // displays a error message that a column type is not supported - void showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName); + void showColumnTypeNotSupported(const OUString& _rColumnName); - void removeColumnNameFromNameMap(const ::rtl::OUString& _sName); - void showError(const ::rtl::OUString& _sErrorMesage); + void removeColumnNameFromNameMap(const OUString& _sName); + void showError(const OUString& _sErrorMesage); void showError(const ::com::sun::star::uno::Any& _aError); }; } diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index ba9acfa2635e..8289bdef28f2 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -49,7 +49,7 @@ namespace dbaui virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); virtual const OTypeInfoMap* getTypeInfo() const; virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; + virtual OUString getAutoIncrementValue() const; public: OWizTypeSelectControl(Window* pParent, const ResId& rResId,OTableDesignHelpBar* pHelpBar=NULL); @@ -102,7 +102,7 @@ namespace dbaui Image m_imgPKey; SvStream* m_pParserStream; // stream to read the tokens from or NULL - ::rtl::OUString m_sAutoIncrementValue; + OUString m_sAutoIncrementValue; sal_Int32 m_nDisplayRow; sal_Bool m_bAutoIncrementEnabled; sal_Bool m_bDuplicateName; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 608d18a55674..84b715da92df 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -57,7 +57,7 @@ namespace dbaui virtual ~AdvancedSettingsDialog(); /// determines whether or not the given data source type has any advanced setting - static bool doesHaveAnyAdvancedSettings( const ::rtl::OUString& _sURL ); + static bool doesHaveAnyAdvancedSettings( const OUString& _sURL ); virtual const SfxItemSet* getOutputSet() const; virtual SfxItemSet* getWriteOutputSet(); @@ -68,10 +68,10 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); - virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); }; diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index 9300c7b332ca..0828feac0f82 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -38,7 +38,7 @@ namespace dbaui ,protected SvxTextEncodingTable { protected: - ::rtl::OUString m_aSystemDisplayName; + OUString m_aSystemDisplayName; public: class ExtendedCharsetIterator; @@ -51,8 +51,8 @@ namespace dbaui // various find operations const_iterator findEncoding(const rtl_TextEncoding _eEncoding) const; - const_iterator findIanaName(const ::rtl::OUString& _rIanaName) const; - const_iterator findDisplayName(const ::rtl::OUString& _rDisplayName) const; + const_iterator findIanaName(const OUString& _rIanaName) const; + const_iterator findDisplayName(const OUString& _rDisplayName) const; /// get access to the first element of the charset collection const_iterator begin() const; @@ -76,17 +76,17 @@ namespace dbaui { friend class OCharsetDisplay::ExtendedCharsetIterator; - ::rtl::OUString m_sDisplayName; + OUString m_sDisplayName; public: CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper& _rSource); rtl_TextEncoding getEncoding() const { return CharsetDisplayDerefHelper_Base::getEncoding(); } - ::rtl::OUString getIanaName() const { return CharsetDisplayDerefHelper_Base::getIanaName(); } - ::rtl::OUString getDisplayName() const { return m_sDisplayName; } + OUString getIanaName() const { return CharsetDisplayDerefHelper_Base::getIanaName(); } + OUString getDisplayName() const { return m_sDisplayName; } protected: - CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const ::rtl::OUString& _rDisplayName); + CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const OUString& _rDisplayName); }; //------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx index b9e557f893af..6a907217662a 100644 --- a/dbaccess/source/ui/inc/commontypes.hxx +++ b/dbaccess/source/ui/inc/commontypes.hxx @@ -34,9 +34,9 @@ namespace dbaui { //......................................................................... - DECLARE_STL_STDKEY_SET( ::rtl::OUString, StringBag ); + DECLARE_STL_STDKEY_SET( OUString, StringBag ); DECLARE_STL_VECTOR( sal_Int8, ByteVector ); - DECLARE_STL_VECTOR( ::rtl::OUString, StringArray ); + DECLARE_STL_VECTOR( OUString, StringArray ); typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection; diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index fcbf4b8fe59f..95211ca67375 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -58,7 +58,7 @@ namespace dbaui m_xFrameLoader; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > m_xApplication; - ::rtl::OUString m_sComponentURL; + OUString m_sComponentURL; private: @@ -83,14 +83,14 @@ namespace dbaui */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > doCreateView( const ::com::sun::star::uno::Any& _rDataSource, - const ::rtl::OUString& _rObjectName, + const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs ); virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const ::com::sun::star::uno::Any& _rDataSource, - const ::rtl::OUString& _rObjectName + const OUString& _rObjectName ); const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& @@ -103,7 +103,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxParentFrame, - const ::rtl::OUString& _rComponentURL + const OUString& _rComponentURL ); virtual ~DatabaseObjectView(){} @@ -144,7 +144,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > openExisting( const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rName, + const OUString& _rName, const ::comphelper::NamedValueCollection& i_rDispatchArgs ); }; @@ -161,7 +161,7 @@ namespace dbaui virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rObjectName + const OUString& _rObjectName ); public: @@ -182,12 +182,12 @@ namespace dbaui virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rObjectName + const OUString& _rObjectName ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > doCreateView( const ::com::sun::star::uno::Any& _rDataSource, - const ::rtl::OUString& _rObjectName, + const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs ); @@ -208,7 +208,7 @@ namespace dbaui @see com::sun::star::sdb::application::XTableUIProvider */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - impl_getConnectionProvidedDesigner_nothrow( const ::rtl::OUString& _rTableName ); + impl_getConnectionProvidedDesigner_nothrow( const OUString& _rTableName ); }; //====================================================================== @@ -223,7 +223,7 @@ namespace dbaui virtual void fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const ::com::sun::star::uno::Any& _aDataSource, - const ::rtl::OUString& _rQualifiedName + const OUString& _rQualifiedName ); public: diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index 3a468cd42b0f..76b3f27f6d60 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -45,7 +45,7 @@ namespace dbaui Window* m_pErrorMessageParent; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sContextInformation; + OUString m_sContextInformation; public: ODatasourceConnector( @@ -55,7 +55,7 @@ namespace dbaui ODatasourceConnector( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, Window* _pMessageParent, - const ::rtl::OUString& _rContextInformation + const OUString& _rContextInformation ); /// returns if the object is able to create data source connections @@ -65,7 +65,7 @@ namespace dbaui */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > connect( - const ::rtl::OUString& _rDataSourceName, + const OUString& _rDataSourceName, ::dbtools::SQLExceptionInfo* _pErrorInfo ) const; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index c15bb8319d73..fb5758db17a0 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -93,10 +93,10 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); - virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); protected: diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 0e0d687332cb..92a2beb957c2 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -45,18 +45,18 @@ namespace dbaui public: ODataClipboard( - const ::rtl::OUString& _rDatasource, + const OUString& _rDatasource, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); ODataClipboard( - const ::rtl::OUString& _rDatasource, + const OUString& _rDatasource, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 27a7dadd4fb0..d15c7b404969 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -119,7 +119,7 @@ namespace dbaui // enable editing for tables/views and queries virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual sal_Bool DoubleClickHdl(); diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 487f47018e43..63748ff23fac 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -64,7 +64,7 @@ private: SfxItemSet* m_pOutSet; ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance - ::rtl::OUString m_eType; + OUString m_eType; sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing @@ -88,10 +88,10 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); - virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); protected: @@ -108,7 +108,7 @@ protected: inline void disabledUI() { m_bUIEnabled = sal_False; } /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. - void implSelectDatasource(const ::rtl::OUString& _rRegisteredName); + void implSelectDatasource(const OUString& _rRegisteredName); void resetPages(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDatasource); enum ApplyResult diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 4437c923600c..f9360c817664 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -67,8 +67,8 @@ private: OModuleClient m_aModuleClient; ::std::auto_ptr m_pImpl; SfxItemSet* m_pOutSet; - ::rtl::OUString m_sURL; - ::rtl::OUString m_sOldURL; + OUString m_sURL; + OUString m_sOldURL; sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing sal_Bool m_bUIEnabled : 1; /// if the UI is enabled, false otherwise. Cannot be switched back to , once it is @@ -116,9 +116,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; + virtual OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); - virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void setTitle(const OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); virtual sal_Bool saveDatasource(); virtual String getStateDisplayName( WizardState _nState ) const; @@ -144,7 +144,7 @@ protected: inline void disabledUI() { m_bUIEnabled = sal_False; } /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. - void implSelectDatasource(const ::rtl::OUString& _rRegisteredName); + void implSelectDatasource(const OUString& _rRegisteredName); void resetPages(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDatasource); enum ApplyResult @@ -167,9 +167,9 @@ private: the first state in this path, following by an arbitrary number of others, as in RoadmapWizard::declarePath. */ - void declareAuthDepPath( const ::rtl::OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths); + void declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths); - void RegisterDataSourceByLocation(const ::rtl::OUString& sPath); + void RegisterDataSourceByLocation(const OUString& sPath); sal_Bool SaveDatabaseDocument(); void activateDatabasePath(); String createUniqueFileName(const INetURLObject& rURL); @@ -177,7 +177,7 @@ private: void createUniqueFolderName(INetURLObject* pURL); ::dbaccess::DATASOURCE_TYPE VerifyDataSourceType(const ::dbaccess::DATASOURCE_TYPE _DatabaseType) const; - ::rtl::OUString getDefaultDatabaseType() const; + OUString getDefaultDatabaseType() const; void updateTypeDependentStates(); sal_Bool callSaveAsDialog(); diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index bc10aba889c9..8e09bb6ad9f8 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -59,14 +59,14 @@ namespace dbaui */ HierarchicalNameCheck( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& _rxNames, - const ::rtl::OUString& _rRelativeRoot + const OUString& _rRelativeRoot ); ~HierarchicalNameCheck(); // IObjectNameCheck overridables virtual bool isNameValid( - const ::rtl::OUString& _rObjectName, + const OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay ) const; @@ -118,7 +118,7 @@ namespace dbaui // IObjectNameCheck overridables virtual bool isNameValid( - const ::rtl::OUString& _rObjectName, + const OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay ) const; diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index 5bf05f602eb7..e6c40abf7d80 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -57,14 +57,14 @@ namespace dbaui class DataSourceMetaData { public: - DataSourceMetaData( const ::rtl::OUString& _sURL ); + DataSourceMetaData( const OUString& _sURL ); ~DataSourceMetaData(); /// returns a struct describing this data source type's support for our known advanced settings const FeatureSet& getFeatureSet() const; /// determines whether or not the data source requires authentication - static AuthenticationMode getAuthentication( const ::rtl::OUString& _sURL ); + static AuthenticationMode getAuthentication( const OUString& _sURL ); private: ::boost::shared_ptr< DataSourceMetaData_Impl > m_pImpl; diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index fd2d7f6222d2..0c98ce481316 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -46,8 +46,8 @@ namespace dbaui public: SbaExternalSourceBrowser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -62,7 +62,7 @@ namespace dbaui virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::util::XModifyListener virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException ); @@ -81,7 +81,7 @@ namespace dbaui virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); protected: diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index 5d2d117436a1..3101068a1e4c 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -144,10 +144,10 @@ namespace dbaui // hierarchy administration ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > > m_aChildren; - ::std::vector< ::rtl::OUString > m_aChildNames; + ::std::vector< OUString > m_aChildNames; // properties - ::rtl::OUString m_sName; + OUString m_sName; sal_Int32 m_nNamePropHandle; public: @@ -177,14 +177,14 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XColumnLocate - virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn(const OUString& columnName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort(sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -221,7 +221,7 @@ namespace dbaui virtual void SAL_CALL updateLong(sal_Int32 columnIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat(sal_Int32 columnIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble(sal_Int32 columnIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString(sal_Int32 columnIndex, const ::rtl::OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString(sal_Int32 columnIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes(sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate(sal_Int32 columnIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime(sal_Int32 columnIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -292,7 +292,7 @@ namespace dbaui // ::com::sun::star::sdbc::XParameters virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -300,7 +300,7 @@ namespace dbaui virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -333,10 +333,10 @@ namespace dbaui virtual void SAL_CALL setGroupControl(sal_Bool GroupControl) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setControlModels(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const ::rtl::OUString& GroupName) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const OUString& GroupName) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getGroupCount() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, ::rtl::OUString& Name) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, OUString& Name) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL getGroupByName(const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); @@ -348,38 +348,38 @@ namespace dbaui virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& aName) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XCancellable virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::form::XReset virtual void SAL_CALL reset() throw(::com::sun::star::uno::RuntimeException); @@ -387,16 +387,16 @@ namespace dbaui virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName(const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName(const ::rtl::OUString& Name) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName(const OUString& Name) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName(const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException) ; @@ -428,8 +428,8 @@ namespace dbaui protected: // container handling - void implInsert(const ::com::sun::star::uno::Any& aElement, sal_Int32 nIndex, const ::rtl::OUString* pNewElName = NULL) throw(::com::sun::star::lang::IllegalArgumentException); - sal_Int32 implGetPos(const ::rtl::OUString& rName); + void implInsert(const ::com::sun::star::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = NULL) throw(::com::sun::star::lang::IllegalArgumentException); + sal_Int32 implGetPos(const OUString& rName); void StopListening(); void StartListening(); diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 7b0247f9a336..7d69c6221df8 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -72,7 +72,7 @@ namespace dbaui } protected: - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); private: using SvTreeListBox::Select; @@ -110,7 +110,7 @@ namespace dbaui public: DbaIndexDialog( Window* _pParent, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rFieldNames, + const ::com::sun::star::uno::Sequence< OUString >& _rFieldNames, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx index ce4da4f11ee5..d215cfaceabd 100644 --- a/dbaccess/source/ui/inc/indexes.hxx +++ b/dbaccess/source/ui/inc/indexes.hxx @@ -54,30 +54,30 @@ namespace dbaui struct OIndex { protected: - ::rtl::OUString sOriginalName; + OUString sOriginalName; sal_Bool bModified; public: - ::rtl::OUString sName; - ::rtl::OUString sDescription; + OUString sName; + OUString sDescription; sal_Bool bPrimaryKey; sal_Bool bUnique; IndexFields aFields; public: - OIndex(const ::rtl::OUString& _rOriginalName) + OIndex(const OUString& _rOriginalName) : sOriginalName(_rOriginalName), bModified(sal_False), sName(_rOriginalName), bPrimaryKey(sal_False), bUnique(sal_False) { } - const ::rtl::OUString& getOriginalName() const { return sOriginalName; } + const OUString& getOriginalName() const { return sOriginalName; } sal_Bool isModified() const { return bModified; } void setModified(sal_Bool _bModified) { bModified = _bModified; } void clearModified() { setModified(sal_False); } sal_Bool isNew() const { return getOriginalName().isEmpty(); } - void flagAsNew(const GrantIndexAccess&) { sOriginalName = ::rtl::OUString(); } + void flagAsNew(const GrantIndexAccess&) { sOriginalName = OUString(); } void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; } diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 512a016f64f1..f71d9f673f81 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -57,7 +57,7 @@ namespace dbaui IndexFieldsControl( Window* _pParent, const ResId& _rId ,sal_Int32 _nMaxColumnsInIndex,sal_Bool _bAddIndexAppendix); ~IndexFieldsControl(); - void Init(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rAvailableFields); + void Init(const ::com::sun::star::uno::Sequence< OUString >& _rAvailableFields); void initializeFrom(const IndexFields& _rFields); void commitTo(IndexFields& _rFields); diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index fc2e6087c0d8..7f1c5dfc72d0 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -56,7 +56,7 @@ namespace dbaui m_xDocumentUI; Window* m_pDialogParent; String m_sCurrentlyEditing; - ::rtl::OUString + OUString m_sDataSourceName; public: @@ -66,7 +66,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::rtl::OUString& _sDataSourceName + const OUString& _sDataSourceName ); ~OLinkedDocumentsAccess(); @@ -74,7 +74,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> open( - const ::rtl::OUString& _rLinkName, + const OUString& _rLinkName, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs @@ -89,11 +89,11 @@ namespace dbaui void newFormWithPilot( const sal_Int32 _nCommandType = -1, - const ::rtl::OUString& _rObjectName = ::rtl::OUString() + const OUString& _rObjectName = OUString() ); void newReportWithPilot( const sal_Int32 _nCommandType = -1, - const ::rtl::OUString& _rObjectName = ::rtl::OUString() + const OUString& _rObjectName = OUString() ); void newQueryWithPilot(); void newTableWithPilot(); @@ -107,7 +107,7 @@ namespace dbaui private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > impl_open( - const ::rtl::OUString& _rLinkName, + const OUString& _rLinkName, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs @@ -117,7 +117,7 @@ namespace dbaui impl_newWithPilot( const char* _pWizardService, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rObjectName + const OUString& _rObjectName ); }; diff --git a/dbaccess/source/ui/inc/objectnamecheck.hxx b/dbaccess/source/ui/inc/objectnamecheck.hxx index 50a7b163d6aa..8f834ebef82b 100644 --- a/dbaccess/source/ui/inc/objectnamecheck.hxx +++ b/dbaccess/source/ui/inc/objectnamecheck.hxx @@ -20,7 +20,8 @@ #ifndef DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX #define DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX -namespace rtl { class OUString; } +#include + namespace dbtools { class SQLExceptionInfo; } //........................................................................ @@ -48,7 +49,7 @@ namespace dbaui if and only if the given name is valid. */ virtual bool isNameValid( - const ::rtl::OUString& _rObjectName, + const OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay ) const = 0; diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 5e2edda403cf..14406c8b7be9 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -41,7 +41,7 @@ namespace dbaui class OpenDocumentButton : public PushButton { private: - ::rtl::OUString m_sModule; + OUString m_sModule; public: OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName ); @@ -59,7 +59,7 @@ namespace dbaui typedef ::std::pair< String, String > StringPair; typedef ::std::map< sal_uInt16, StringPair > MapIndexToStringPair; - ::rtl::OUString m_sModule; + OUString m_sModule; MapIndexToStringPair m_aURLs; public: diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index 7301f094364e..749493ea74c7 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -86,8 +86,8 @@ namespace dbaui void setReadOnly( sal_Bool _bReadOnly ) { m_pViewSwitch->setReadOnly( _bReadOnly ); } sal_Bool checkStatement() { return m_pViewSwitch->checkStatement( ); } - ::rtl::OUString getStatement() { return m_pViewSwitch->getStatement( ); } - void setStatement( const ::rtl::OUString& _rsStatement ) { m_pViewSwitch->setStatement( _rsStatement ); } + OUString getStatement() { return m_pViewSwitch->getStatement( ); } + void setStatement( const OUString& _rsStatement ) { m_pViewSwitch->setStatement( _rsStatement ); } void initialize() { m_pViewSwitch->initialize(); } void SaveUIConfig() { m_pViewSwitch->SaveUIConfig(); } diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index bfd3eb2350a7..df22cc2b84e8 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -70,11 +70,11 @@ namespace dbaui /// if we're editing an existing view, this is non-NULL ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAlterView > m_xAlterView; - ::rtl::OUString m_sStatement; // contains the current sql statement - ::rtl::OUString m_sUpdateCatalogName; // catalog for update data - ::rtl::OUString m_sUpdateSchemaName; // schema for update data - ::rtl::OUString m_sUpdateTableName; // table for update data - mutable ::rtl::OUString + OUString m_sStatement; // contains the current sql statement + OUString m_sUpdateCatalogName; // catalog for update data + OUString m_sUpdateSchemaName; // schema for update data + OUString m_sUpdateTableName; // table for update data + mutable OUString m_sName; // name of the query sal_Int64 m_nLimit; // the limit of the query result (All==-1) @@ -112,9 +112,9 @@ namespace dbaui void saveViewSettings( ::comphelper::NamedValueCollection& o_rViewSettings, const bool i_includingCriteria ) const; void loadViewSettings( const ::comphelper::NamedValueCollection& o_rViewSettings ); - ::rtl::OUString translateStatement( bool _bFireStatementChange = true ); + OUString translateStatement( bool _bFireStatementChange = true ); - ::rtl::OUString getDefaultName() const; + OUString getDefaultName() const; void execute_QueryPropDlg(); @@ -127,7 +127,7 @@ namespace dbaui virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual void reconnect( sal_Bool _bUI ); - virtual ::rtl::OUString getPrivateTitle( ) const; + virtual OUString getPrivateTitle( ) const; OQueryContainerWindow* getContainer() const { return static_cast< OQueryContainerWindow* >( getView() ); } @@ -148,7 +148,7 @@ namespace dbaui sal_Bool isDistinct() const { return m_bDistinct; } sal_Int64 getLimit() const { return m_nLimit; } - ::rtl::OUString getStatement() const { return m_sStatement; } + OUString getStatement() const { return m_sStatement; } sal_Int32 getSplitPos() const { return m_nSplitPos;} sal_Int32 getVisibleRows() const { return m_nVisibleRows; } @@ -179,11 +179,11 @@ namespace dbaui // ::com::sun::star::lang::XComponent virtual void SAL_CALL disposing(); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -227,7 +227,7 @@ namespace dbaui bool impl_setViewMode( ::dbtools::SQLExceptionInfo* _pErrorInfo ); /// sets m_sStatement, and notifies our respective property change listeners - void setStatement_fireEvent( const ::rtl::OUString& _rNewStatement, bool _bFireStatementChange = true ); + void setStatement_fireEvent( const OUString& _rNewStatement, bool _bFireStatementChange = true ); /// sets the m_bEscapeProcessing member, and notifies our respective property change listeners void setEscapeProcessing_fireEvent( const sal_Bool _bEscapeProcessing ); diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 04856f0a7ac3..40978e785450 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -114,8 +114,8 @@ namespace dbaui void fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getMatchingColumn( const Edit& _rValueInput ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getColumn( const ::rtl::OUString& _rFieldName ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const ::rtl::OUString& _rFieldName ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getColumn( const OUString& _rFieldName ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const OUString& _rFieldName ) const; public: DlgFilterCrit( Window * pParent, diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 1ba58b08b97f..8fb6a5416c3b 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -81,7 +81,7 @@ namespace dbaui HelpButton aBT_HELP; FixedLine aFL_ORDER; String aSTR_NOENTRY; - ::rtl::OUString m_sOrgOrder; + OUString m_sOrgOrder; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xQueryComposer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; @@ -103,8 +103,8 @@ namespace dbaui ~DlgOrderCrit(); void BuildOrderPart(); - ::rtl::OUString GetOrderList( ) const; - ::rtl::OUString GetOrignalOrder() const { return m_sOrgOrder; } + OUString GetOrderList( ) const; + OUString GetOrignalOrder() const { return m_sOrgOrder; } private: void impl_initializeOrderList_nothrow(); diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 62a27a937c3e..0cdaf25b04f2 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -41,9 +41,9 @@ namespace dbaui // set the view readonly or not virtual void setReadOnly(sal_Bool _bReadOnly) = 0; // set the statement for representation - virtual void setStatement(const ::rtl::OUString& _rsStatement) = 0; + virtual void setStatement(const OUString& _rsStatement) = 0; // returns the current sql statement - virtual ::rtl::OUString getStatement() = 0; + virtual OUString getStatement() = 0; }; } #endif // DBAUI_QUERYVIEW_HXX diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 55491b12c2f7..57ad9e71fe34 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -78,11 +78,11 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw(); + OUString SAL_CALL getImplementationName() throw(); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -131,7 +131,7 @@ namespace dbaui virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -270,7 +270,7 @@ namespace dbaui @return The description of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; virtual void DeleteSelectedRows(); /** copies the currently selected rows to the clipboard diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 4838944b9d2b..9deadd748ec1 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -202,7 +202,7 @@ namespace dbaui ,public listenerclass \ { \ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< \ - ::rtl::OUString, ::rtl::OUStringHash, ::comphelper::UStringEqual > ListenerContainerMap; \ + OUString, OUStringHash, ::comphelper::UStringEqual > ListenerContainerMap; \ ListenerContainerMap m_aListeners; \ \ public: \ @@ -217,14 +217,14 @@ namespace dbaui virtual void SAL_CALL methodname(const eventtype& e) throw exceptions; \ \ public: \ - void addInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ - void removeInterface(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ + void addInterface(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ + void removeInterface(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rListener); \ \ void disposeAndClear(); \ \ sal_Int32 getOverallLen() const; \ \ - ::cppu::OInterfaceContainerHelper* getContainer(const ::rtl::OUString& rName) \ + ::cppu::OInterfaceContainerHelper* getContainer(const OUString& rName) \ { return m_aListeners.getContainer(rName); } \ \ protected: \ @@ -267,18 +267,18 @@ namespace dbaui Notify(*pListeners, e); \ \ /* do the notification for the unspecialized listeners, too */ \ - pListeners = m_aListeners.getContainer(::rtl::OUString()); \ + pListeners = m_aListeners.getContainer(OUString()); \ if (pListeners) \ Notify(*pListeners, e); \ } \ \ - void classname::addInterface(const ::rtl::OUString& rName, \ + void classname::addInterface(const OUString& rName, \ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ { \ m_aListeners.addInterface(rName, rListener); \ } \ \ - void classname::removeInterface(const ::rtl::OUString& rName, \ + void classname::removeInterface(const OUString& rName, \ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener) \ { \ m_aListeners.removeInterface(rName, rListener); \ @@ -293,8 +293,8 @@ namespace dbaui sal_Int32 classname::getOverallLen() const \ { \ sal_Int32 nLen = 0; \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aContained = m_aListeners.getContainedTypes(); \ - const ::rtl::OUString* pContained = aContained.getConstArray(); \ + ::com::sun::star::uno::Sequence< OUString > aContained = m_aListeners.getContainedTypes(); \ + const OUString* pContained = aContained.getConstArray(); \ for ( sal_Int32 i=0; igetLength(); \ return nLen; \ @@ -313,24 +313,24 @@ namespace dbaui // helper for classes which do property event multiplexing #define IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(classname, listenerdesc, multiplexer, braodcasterclass, broadcaster) \ /*................................................................*/ \ - void SAL_CALL classname::add##listenerdesc(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ + void SAL_CALL classname::add##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ { \ multiplexer.addInterface(rName, l); \ if (multiplexer.getOverallLen() == 1) \ { \ ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ + xBroadcaster->add##listenerdesc(OUString(), &multiplexer); \ } \ } \ /*................................................................*/ \ - void SAL_CALL classname::remove##listenerdesc(const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ + void SAL_CALL classname::remove##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\ { \ if (multiplexer.getOverallLen() == 1) \ { \ ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ + xBroadcaster->remove##listenerdesc(OUString(), &multiplexer); \ } \ multiplexer.removeInterface(rName, l); \ } \ @@ -340,7 +340,7 @@ namespace dbaui { \ ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ - xBroadcaster->remove##listenerdesc(::rtl::OUString(), &multiplexer); \ + xBroadcaster->remove##listenerdesc(OUString(), &multiplexer); \ } \ #define START_PROPERTY_MULTIPLEXER_LISTENING(listenerdesc, multiplexer, braodcasterclass, broadcaster) \ @@ -348,7 +348,7 @@ namespace dbaui { \ ::com::sun::star::uno::Reference< braodcasterclass > xBroadcaster(broadcaster, ::com::sun::star::uno::UNO_QUERY); \ if (xBroadcaster.is()) \ - xBroadcaster->add##listenerdesc(::rtl::OUString(), &multiplexer); \ + xBroadcaster->add##listenerdesc(OUString(), &multiplexer); \ } \ diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 76d896f4e84f..42c96a6f4452 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -52,7 +52,7 @@ class OSQLMessageBox : public ButtonDialog FixedImage m_aInfoImage; FixedText m_aTitle; FixedText m_aMessage; - ::rtl::OUString m_sHelpURL; + OUString m_sHelpURL; ::std::auto_ptr< SQLMessageBox_Impl > m_pImpl; @@ -77,7 +77,7 @@ public: Window* _pParent, const dbtools::SQLExceptionInfo& _rException, WinBits _nStyle = WB_OK | WB_DEF_OK, - const ::rtl::OUString& _rHelpURL = ::rtl::OUString() + const OUString& _rHelpURL = OUString() ); /** display a database related error message diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 1eab0a4e6a6a..e3c235fd317d 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -37,17 +37,17 @@ namespace dbaui */ class OStringListItem : public SfxPoolItem { - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aList; + ::com::sun::star::uno::Sequence< OUString > m_aList; public: TYPEINFO(); - OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rList); + OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< OUString >& _rList); OStringListItem(const OStringListItem& _rSource); virtual int operator==(const SfxPoolItem& _rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > getList() const { return m_aList; } + ::com::sun::star::uno::Sequence< OUString > getList() const { return m_aList; } }; //......................................................................... diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 0eebfca65b32..0632169a6386 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -64,7 +64,7 @@ public: ~OTableTreeListBox(); - typedef ::std::pair< ::rtl::OUString,sal_Bool> TTableViewName; + typedef ::std::pair< OUString,sal_Bool> TTableViewName; typedef ::std::vector< TTableViewName > TNames; void suppressEmptyFolders() { m_bNoEmptyFolders = true; } @@ -103,8 +103,8 @@ public: */ void UpdateTableList( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _rTables, - const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _rViews + const ::com::sun::star::uno::Sequence< OUString>& _rTables, + const ::com::sun::star::uno::Sequence< OUString>& _rViews ); /** returns a NamedDatabaseObject record which describes the given entry @@ -114,11 +114,11 @@ public: /** to be used if a foreign instance added a table */ - SvTreeListEntry* addedTable( const ::rtl::OUString& _rName ); + SvTreeListEntry* addedTable( const OUString& _rName ); /** to be used if a foreign instance removed a table */ - void removedTable( const ::rtl::OUString& _rName ); + void removedTable( const OUString& _rName ); /** returns the fully qualified name of a table entry @param _pEntry @@ -126,7 +126,7 @@ public: */ String getQualifiedTableName( SvTreeListEntry* _pEntry ) const; - SvTreeListEntry* getEntryByQualifiedName( const ::rtl::OUString& _rName ); + SvTreeListEntry* getEntryByQualifiedName( const OUString& _rName ); SvTreeListEntry* getAllObjectsEntry() const; @@ -156,7 +156,7 @@ protected: */ SvTreeListEntry* implAddEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMeta, - const ::rtl::OUString& _rTableName, + const OUString& _rTableName, sal_Bool _bCheckName = sal_True ); diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index dedbf4da9830..4b32fa437a93 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -36,7 +36,7 @@ class OSQLMessageDialog protected: // ::com::sun::star::uno::Any m_aException; - ::rtl::OUString m_sHelpURL; + OUString m_sHelpURL; // protected: @@ -47,12 +47,12 @@ public: virtual com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL Create(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index fb40398f4757..5c8ea9edc3af 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -217,7 +217,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, sal_Int32 nPos = 1; OSL_ENSURE((nPos) < static_cast(aTypes.size()),"aTypes: Illegal index for vector"); aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); - ::rtl::OUString sTypeName = aValue; + OUString sTypeName = aValue; ++nPos; OSL_ENSURE((nPos) < static_cast(aTypes.size()),"aTypes: Illegal index for vector"); aValue.fill(nPos,aTypes[nPos],aNullable[nPos],xRow); @@ -636,20 +636,20 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo } } // ----------------------------------------------------------------------------- -void ODatabaseExport::CreateDefaultColumn(const ::rtl::OUString& _rColumnName) +void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::CreateDefaultColumn" ); DBG_CHKTHIS(ODatabaseExport,NULL); Reference< XDatabaseMetaData> xDestMetaData(m_xConnection->getMetaData()); sal_Int32 nMaxNameLen(xDestMetaData->getMaxColumnNameLength()); - ::rtl::OUString aAlias = _rColumnName; + OUString aAlias = _rColumnName; if ( isSQL92CheckEnabled(m_xConnection) ) aAlias = ::dbtools::convertName2SQLName(_rColumnName,xDestMetaData->getExtraNameCharacters()); if(nMaxNameLen && aAlias.getLength() > nMaxNameLen) aAlias = aAlias.copy(0, ::std::min( nMaxNameLen-1, aAlias.getLength() ) ); - ::rtl::OUString sName(aAlias); + OUString sName(aAlias); if(m_aDestColumns.find(sName) != m_aDestColumns.end()) { sal_Int32 nPos = 0; @@ -657,12 +657,12 @@ void ODatabaseExport::CreateDefaultColumn(const ::rtl::OUString& _rColumnName) while(m_aDestColumns.find(sName) != m_aDestColumns.end()) { sName = aAlias; - sName += ::rtl::OUString::valueOf(++nPos); + sName += OUString::valueOf(++nPos); if(nMaxNameLen && sName.getLength() > nMaxNameLen) { aAlias = aAlias.copy(0,::std::min( nMaxNameLen-nCount, aAlias.getLength() )); sName = aAlias; - sName += ::rtl::OUString::valueOf(nPos); + sName += OUString::valueOf(nPos); ++nCount; } } @@ -698,13 +698,13 @@ sal_Bool ODatabaseExport::createRowSet() return m_pUpdateHelper.get() != NULL; } // ----------------------------------------------------------------------------- -sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _rTableName,const Any& _aTextColor,const FontDescriptor& _rFont) +sal_Bool ODatabaseExport::executeWizard(const OUString& _rTableName,const Any& _aTextColor,const FontDescriptor& _rFont) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::executeWizard" ); DBG_CHKTHIS(ODatabaseExport,NULL); bool bHaveDefaultTable = !m_sDefaultTableName.isEmpty(); - ::rtl::OUString sTableName( bHaveDefaultTable ? m_sDefaultTableName : _rTableName ); + OUString sTableName( bHaveDefaultTable ? m_sDefaultTableName : _rTableName ); OCopyTableWizard aWizard( NULL, sTableName, @@ -823,7 +823,7 @@ void ODatabaseExport::ensureFormatter() SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId())); m_pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL; Reference xNumberFormatSettings = xSupplier->getNumberFormatSettings(); - xNumberFormatSettings->getPropertyValue(::rtl::OUString("NullDate")) >>= m_aNullDate; + xNumberFormatSettings->getPropertyValue(OUString("NullDate")) >>= m_aNullDate; } } // ----------------------------------------------------------------------------- @@ -832,30 +832,30 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R ,const TPositions& _rvColumns) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::createPreparedStatment" ); - ::rtl::OUString aSql(::rtl::OUString("INSERT INTO ")); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); + OUString aSql(OUString("INSERT INTO ")); + OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); aSql += sComposedTableName; - aSql += ::rtl::OUString(" ( "); + aSql += OUString(" ( "); // set values and column names - ::rtl::OUString aValues(" VALUES ( "); - static ::rtl::OUString aPara("?,"); - static ::rtl::OUString aComma(","); + OUString aValues(" VALUES ( "); + static OUString aPara("?,"); + static OUString aComma(","); - ::rtl::OUString aQuote; + OUString aQuote; if ( _xMetaData.is() ) aQuote = _xMetaData->getIdentifierQuoteString(); Reference xDestColsSup(_xDestTable,UNO_QUERY_THROW); // create sql string and set column types - Sequence< ::rtl::OUString> aDestColumnNames = xDestColsSup->getColumns()->getElementNames(); + Sequence< OUString> aDestColumnNames = xDestColsSup->getColumns()->getElementNames(); if ( aDestColumnNames.getLength() == 0 ) { return Reference< XPreparedStatement > (); } - const ::rtl::OUString* pIter = aDestColumnNames.getConstArray(); - ::std::vector< ::rtl::OUString> aInsertList; + const OUString* pIter = aDestColumnNames.getConstArray(); + ::std::vector< OUString> aInsertList; aInsertList.resize(aDestColumnNames.getLength()+1); sal_Int32 i = 0; for(sal_uInt32 j=0; j < aInsertList.size() ;++i,++j) @@ -871,8 +871,8 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R i = 1; // create the sql string - ::std::vector< ::rtl::OUString>::iterator aInsertEnd = aInsertList.end(); - for (::std::vector< ::rtl::OUString>::iterator aInsertIter = aInsertList.begin(); aInsertIter != aInsertEnd; ++aInsertIter) + ::std::vector< OUString>::iterator aInsertEnd = aInsertList.end(); + for (::std::vector< OUString>::iterator aInsertIter = aInsertList.begin(); aInsertIter != aInsertEnd; ++aInsertIter) { if ( !aInsertIter->isEmpty() ) { @@ -882,8 +882,8 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R } } - aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); - aValues = aValues.replaceAt(aValues.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aValues = aValues.replaceAt(aValues.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); aSql += aValues; // now create,fill and execute the prepared statement diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index c2854e884ea1..cc8676d9652e 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -384,7 +384,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor) aFontName += aFName; } if ( aFontName.Len() ) - _rFont.Name = ::rtl::OUString(aFontName); + _rFont.Name = OUString(aFontName); } break; case HTML_O_SIZE : @@ -430,7 +430,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken) DBG_CHKTHIS(OHTMLReader,NULL); String aTempName(ModuleRes(STR_TBL_TITLE)); aTempName = aTempName.GetToken(0,' '); - aTempName = String(::dbtools::createUniqueName(m_xTables,::rtl::OUString(aTempName ))); + aTempName = String(::dbtools::createUniqueName(m_xTables,OUString(aTempName ))); int nTmpToken2 = nToken; sal_Bool bCaption = sal_False; @@ -490,7 +490,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken) case HTML_CAPTION_OFF: aTableName = comphelper::string::strip(aTableName, ' '); if(!aTableName.Len()) - aTableName = String(::dbtools::createUniqueName(m_xTables,::rtl::OUString(aTableName))); + aTableName = String(::dbtools::createUniqueName(m_xTables,OUString(aTableName))); else aTableName = aTempName; bCaption = sal_False; diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 5bdd129a6f3a..e5ba2b86d499 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -66,7 +66,7 @@ void ORowSetImportExport::initialize() m_xTargetResultSetMetaData = Reference(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData(); if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() ) - throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,::rtl::OUString("S1000") ,0,Any()); + throw SQLException(String(ModuleRes(STR_UNEXPECTED_ERROR)),*this,OUString("S1000") ,0,Any()); sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount(); m_aColumnMapping.reserve(nCount); @@ -78,7 +78,7 @@ void ORowSetImportExport::initialize() { try { - ::rtl::OUString sColumnName = m_xTargetResultSetMetaData->getColumnName(i); + OUString sColumnName = m_xTargetResultSetMetaData->getColumnName(i); nPos = xColumnLocate->findColumn(sColumnName); } catch(const SQLException&) diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 39ef50f2811a..ba19f265220d 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -265,7 +265,7 @@ sal_Bool ORTFReader::CreateTable(int nToken) DBG_CHKTHIS(ORTFReader,NULL); String aTableName(ModuleRes(STR_TBL_TITLE)); aTableName = aTableName.GetToken(0,' '); - aTableName = String(::dbtools::createUniqueName(m_xTables,::rtl::OUString(aTableName))); + aTableName = String(::dbtools::createUniqueName(m_xTables,OUString(aTableName))); int nTmpToken2 = nToken; String aColumnName; diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index d77b76251e92..983e6631bdfa 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -81,10 +81,10 @@ OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pControler) } // ----------------------------------------------------------------------------- -void OTableCopyHelper::insertTable( const ::rtl::OUString& i_rSourceDataSource, const Reference& i_rSourceConnection, - const ::rtl::OUString& i_rCommand, const sal_Int32 i_nCommandType, +void OTableCopyHelper::insertTable( const OUString& i_rSourceDataSource, const Reference& i_rSourceConnection, + const OUString& i_rCommand, const sal_Int32 i_nCommandType, const Reference< XResultSet >& i_rSourceRows, const Sequence< Any >& i_rSelection, const sal_Bool i_bBookmarkSelection, - const ::rtl::OUString& i_rDestDataSource, const Reference& i_rDestConnection) + const OUString& i_rDestDataSource, const Reference& i_rDestConnection) { if ( CommandType::QUERY != i_nCommandType && CommandType::TABLE != i_nCommandType ) { @@ -121,7 +121,7 @@ void OTableCopyHelper::insertTable( const ::rtl::OUString& i_rSourceDataSource, Reference< XCopyTableWizard > xWizard( CopyTableWizard::create( aContext, xSource, xDest ), UNO_SET_THROW ); - ::rtl::OUString sTableNameForAppend( GetTableNameForAppend() ); + OUString sTableNameForAppend( GetTableNameForAppend() ); xWizard->setDestinationTableName( GetTableNameForAppend() ); bool bAppendToExisting = !sTableNameForAppend.isEmpty(); @@ -140,12 +140,12 @@ void OTableCopyHelper::insertTable( const ::rtl::OUString& i_rSourceDataSource, } // ----------------------------------------------------------------------------- -void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteData, const ::rtl::OUString& i_rDestDataSourceName, +void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteData, const OUString& i_rDestDataSourceName, const SharedConnection& i_rDestConnection ) { - ::rtl::OUString sSrcDataSourceName = _rPasteData.getDataSource(); + OUString sSrcDataSourceName = _rPasteData.getDataSource(); - ::rtl::OUString sCommand; + OUString sCommand; _rPasteData[ daCommand ] >>= sCommand; Reference xSrcConnection; @@ -187,7 +187,7 @@ void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteDa // ----------------------------------------------------------------------------- void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId ,const TransferableDataHelper& _rTransData - ,const ::rtl::OUString& i_rDestDataSource + ,const OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { if ( _nFormatId == SOT_FORMATSTR_ID_DBACCESS_TABLE || _nFormatId == SOT_FORMATSTR_ID_DBACCESS_QUERY ) @@ -212,7 +212,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId; aTrans.sDefaultTableName = GetTableNameForAppend(); if ( !copyTagTable(aTrans,sal_False,_xConnection) ) - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,OUString("S1000"),0,Any())); } catch(const SQLException&) { @@ -224,12 +224,12 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId } } else - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,OUString("S1000"),0,Any())); } // ----------------------------------------------------------------------------- void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData - ,const ::rtl::OUString& i_rDestDataSource + ,const OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { if ( _rTransData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_TABLE) || _rTransData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) ) @@ -308,7 +308,7 @@ sal_Bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedD } // ----------------------------------------------------------------------------- void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc - ,const ::rtl::OUString& i_rDestDataSource + ,const OUString& i_rDestDataSource ,const SharedConnection& _xConnection) { if ( _rDesc.aHtmlRtfStorage.Is() ) @@ -323,7 +323,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc else if ( !_rDesc.bError ) pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection); else - m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString("S1000"),0,Any())); + m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,OUString("S1000"),0,Any())); } // ----------------------------------------------------------------------------- //........................................................................ diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 92aa6bd5fe15..9fedc707b703 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -405,11 +405,11 @@ sal_Bool ORTFImportExport::Write() m_xObject->getPropertyValue(PROPERTY_TEXTCOLOR) >>= nColor; ::Color aColor(nColor); - rtl::OString aFonts(rtl::OUStringToOString(m_aFont.Name, eDestEnc)); + OString aFonts(OUStringToOString(m_aFont.Name, eDestEnc)); if (aFonts.isEmpty()) { - rtl::OUString aName = Application::GetSettings().GetStyleSettings().GetAppFont().GetName(); - aFonts = rtl::OUStringToOString(aName, eDestEnc); + OUString aName = Application::GetSettings().GetStyleSettings().GetAppFont().GetName(); + aFonts = OUStringToOString(aName, eDestEnc); } (*m_pStream) << "{\\fonttbl"; @@ -447,8 +447,8 @@ sal_Bool ORTFImportExport::Write() { Reference xColSup(m_xObject,UNO_QUERY); Reference xColumns = xColSup->getColumns(); - Sequence< ::rtl::OUString> aNames(xColumns->getElementNames()); - const ::rtl::OUString* pIter = aNames.getConstArray(); + Sequence< OUString> aNames(xColumns->getElementNames()); + const OUString* pIter = aNames.getConstArray(); sal_Int32 nCount = aNames.getLength(); sal_Bool bUseResultMetaData = sal_False; @@ -470,12 +470,12 @@ sal_Bool ORTFImportExport::Write() (*m_pStream) << aTRRH; - ::rtl::OString* pHorzChar = new ::rtl::OString[nCount]; + OString* pHorzChar = new OString[nCount]; for ( sal_Int32 i=1; i <= nCount; ++i ) { sal_Int32 nAlign = 0; - ::rtl::OUString sColumnName; + OUString sColumnName; if ( bUseResultMetaData ) sColumnName = m_xResultSetMetaData->getColumnName(i); else @@ -563,7 +563,7 @@ sal_Bool ORTFImportExport::Write() return ((*m_pStream).GetError() == SVSTREAM_OK); } // ----------------------------------------------------------------------------- -void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk) +void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk) { if(!m_pRowMarker || m_pRowMarker[kk] == k) { @@ -607,7 +607,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou { Reference xColumn(m_xRowSetColumns->getByIndex(i-1),UNO_QUERY_THROW); dbtools::FormattedColumnValue aFormatedValue(m_xContext,xRowSet,xColumn); - ::rtl::OUString sValue = aFormatedValue.getFormattedValue(); + OUString sValue = aFormatedValue.getFormattedValue(); if ( !sValue.isEmpty() ) RTFOutFuncs::Out_String(*m_pStream,sValue,m_eDestEnc); } @@ -749,7 +749,7 @@ void OHTMLImportExport::WriteBody() IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_style ); (*m_pStream) << sMyBegComment; OUT_LF(); - (*m_pStream) << OOO_STRING_SVTOOLS_HTML_body " { " << sFontFamily << '"' << ::rtl::OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()).getStr() << '\"'; + (*m_pStream) << OOO_STRING_SVTOOLS_HTML_body " { " << sFontFamily << '"' << OUStringToOString(m_aFont.Name, osl_getThreadTextEncoding()).getStr() << '\"'; // TODO : think about the encoding of the font name (*m_pStream) << "; " << sFontSize; m_pStream->WriteNumber(static_cast(m_aFont.Height)); @@ -781,13 +781,13 @@ void OHTMLImportExport::WriteBody() void OHTMLImportExport::WriteTables() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteTables" ); - ::rtl::OString aStrOut = OOO_STRING_SVTOOLS_HTML_table; + OString aStrOut = OOO_STRING_SVTOOLS_HTML_table; aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_frame; aStrOut = aStrOut + "="; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_TF_void; - Sequence< ::rtl::OUString> aNames; + Sequence< OUString> aNames; Reference xColumns; sal_Bool bUseResultMetaData = sal_False; if(m_xObject.is()) @@ -812,11 +812,11 @@ void OHTMLImportExport::WriteTables() aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cellspacing; aStrOut = aStrOut + "="; - aStrOut = aStrOut + ::rtl::OString::valueOf((sal_Int32)nCellSpacing); + aStrOut = aStrOut + OString::valueOf((sal_Int32)nCellSpacing); aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cols; aStrOut = aStrOut + "="; - aStrOut = aStrOut + ::rtl::OString::valueOf(aNames.getLength()); + aStrOut = aStrOut + OString::valueOf(aNames.getLength()); aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_border; aStrOut = aStrOut + "=1"; @@ -829,7 +829,7 @@ void OHTMLImportExport::WriteTables() TAG_ON( OOO_STRING_SVTOOLS_HTML_caption ); TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); - (*m_pStream) << ::rtl::OUStringToOString(m_sName, osl_getThreadTextEncoding()).getStr(); + (*m_pStream) << OUStringToOString(m_sName, osl_getThreadTextEncoding()).getStr(); // TODO : think about the encoding of the name TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption ); @@ -856,8 +856,8 @@ void OHTMLImportExport::WriteTables() m_xObject->getPropertyValue(PROPERTY_ROW_HEIGHT) >>= nHeight; // 1. writing the column description - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for( sal_Int32 i=0;pIter != pEnd; ++pIter,++i ) { @@ -916,7 +916,7 @@ void OHTMLImportExport::WriteTables() { Reference xColumn(m_xRowSetColumns->getByIndex(i-1),UNO_QUERY_THROW); dbtools::FormattedColumnValue aFormatedValue(m_xContext,xRowSet,xColumn); - ::rtl::OUString sValue = aFormatedValue.getFormattedValue(); + OUString sValue = aFormatedValue.getFormattedValue(); if (!sValue.isEmpty()) { aValue = sValue; @@ -955,7 +955,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I const String& rValue,const char* pHtmlTag) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteCell" ); - ::rtl::OString aStrTD = pHtmlTag; + OString aStrTD = pHtmlTag; nWidthPixel = nWidthPixel ? nWidthPixel : 86; nHeightPixel = nHeightPixel ? nHeightPixel : 17; @@ -966,12 +966,12 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I aStrTD = aStrTD + " "; aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_width; aStrTD = aStrTD + "="; - aStrTD = aStrTD + ::rtl::OString::valueOf((sal_Int32)nWidthPixel); + aStrTD = aStrTD + OString::valueOf((sal_Int32)nWidthPixel); // line height aStrTD = aStrTD + " "; aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_height; aStrTD = aStrTD + "="; - aStrTD = aStrTD + ::rtl::OString::valueOf((sal_Int32)nHeightPixel); + aStrTD = aStrTD + OString::valueOf((sal_Int32)nHeightPixel); aStrTD = aStrTD + " "; aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_align; @@ -1034,13 +1034,13 @@ void OHTMLImportExport::FontOn() #endif // - ::rtl::OString aStrOut = "<"; + OString aStrOut = "<"; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_font; aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_face; aStrOut = aStrOut + "="; aStrOut = aStrOut + "\""; - aStrOut = aStrOut + ::rtl::OUStringToOString(m_aFont.Name,osl_getThreadTextEncoding()); + aStrOut = aStrOut + OUStringToOString(m_aFont.Name,osl_getThreadTextEncoding()); // TODO : think about the encoding of the font name aStrOut = aStrOut + "\""; aStrOut = aStrOut + " "; diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index fac61dc3c026..c6564d5cb12b 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -135,7 +135,7 @@ using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING; using ::com::sun::star::frame::XModel; // ----------------------------------------------------------------------------- -SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName, +SQLExceptionInfo createConnection( const OUString& _rsDataSourceName, const Reference< ::com::sun::star::container::XNameAccess >& _xDatabaseContext, const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, Reference< ::com::sun::star::lang::XEventListener>& _rEvtLst, @@ -166,7 +166,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP return aInfo; } - ::rtl::OUString sPwd, sUser; + OUString sPwd, sUser; sal_Bool bPwdReq = sal_False; try { @@ -213,7 +213,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP return aInfo; } // ----------------------------------------------------------------------------- -Reference< XDataSource > getDataSourceByName( const ::rtl::OUString& _rDataSourceName, +Reference< XDataSource > getDataSourceByName( const OUString& _rDataSourceName, Window* _pErrorMessageParent, Reference< XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo ) { Reference< XDatabaseContext > xDatabaseContext = DatabaseContext::create(_rxContext); @@ -296,8 +296,8 @@ void showError(const SQLExceptionInfo& _rInfo,Window* _pParent,const Reference< TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, sal_Int32 _nType, - const ::rtl::OUString& _sTypeName, - const ::rtl::OUString& _sCreateParams, + const OUString& _sTypeName, + const OUString& _sCreateParams, sal_Int32 _nPrecision, sal_Int32 _nScale, sal_Bool _bAutoIncrement, @@ -314,7 +314,7 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, { // search the best matching type #ifdef DBG_UTIL - ::rtl::OUString sDBTypeName = aIter->second->aTypeName; (void)sDBTypeName; + OUString sDBTypeName = aIter->second->aTypeName; (void)sDBTypeName; sal_Int32 nDBTypePrecision = aIter->second->nPrecision; (void)nDBTypePrecision; sal_Int32 nDBTypeScale = aIter->second->nMaximumScale; (void)nDBTypeScale; sal_Bool bDBAutoIncrement = aIter->second->bAutoIncrement; (void)bDBAutoIncrement; @@ -445,8 +445,8 @@ void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo // Information for a single SQL type if(xRs.is()) { - static const ::rtl::OUString aB1(" [ "); - static const ::rtl::OUString aB2(" ]"); + static const OUString aB1(" [ "); + static const OUString aB2(" ]"); Reference xResultSetMetaData = Reference(xRs,UNO_QUERY)->getMetaData(); ::connectivity::ORowSetValue aValue; ::std::vector aTypes; @@ -664,13 +664,13 @@ void setColumnProperties(const Reference& _rxColumn,const OFieldDe _rxColumn->setPropertyValue(PROPERTY_AUTOINCREMENTCREATION,makeAny(_pFieldDesc->GetAutoIncrementValue())); } // ----------------------------------------------------------------------------- -::rtl::OUString createDefaultName(const Reference< XDatabaseMetaData>& _xMetaData,const Reference& _xTables,const ::rtl::OUString& _sName) +OUString createDefaultName(const Reference< XDatabaseMetaData>& _xMetaData,const Reference& _xTables,const OUString& _sName) { OSL_ENSURE(_xMetaData.is(),"No MetaData!"); - ::rtl::OUString sDefaultName = _sName; + OUString sDefaultName = _sName; try { - ::rtl::OUString sCatalog,sSchema,sCompsedName; + OUString sCatalog,sSchema,sCompsedName; if(_xMetaData->supportsCatalogsInTableDefinitions()) { try @@ -707,7 +707,7 @@ void setColumnProperties(const Reference& _rxColumn,const OFieldDe return sDefaultName; } // ----------------------------------------------------------------------------- -sal_Bool checkDataSourceAvailable(const ::rtl::OUString& _sDataSourceName,const Reference< ::com::sun::star::uno::XComponentContext >& _xContext) +sal_Bool checkDataSourceAvailable(const OUString& _sDataSourceName,const Reference< ::com::sun::star::uno::XComponentContext >& _xContext) { Reference< XDatabaseContext > xDataBaseContext = DatabaseContext::create(_xContext); sal_Bool bRet = xDataBaseContext->hasByName(_sDataSourceName); @@ -910,7 +910,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, new SvxNumberInfoItem(SID_ATTR_NUMBERFORMAT_INFO) }; - SfxItemPool* pPool = new SfxItemPool(rtl::OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); + SfxItemPool* pPool = new SfxItemPool(OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same @@ -991,7 +991,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, //------------------------------------------------------------------------------ const SfxFilter* getStandardDatabaseFilter() { - const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); return pFilter; } @@ -999,7 +999,7 @@ const SfxFilter* getStandardDatabaseFilter() // ----------------------------------------------------------------------------- sal_Bool appendToFilter(const Reference& _xConnection, - const ::rtl::OUString& _sName, + const OUString& _sName, const Reference< XComponentContext >& _rxContext, Window* _pParent) { @@ -1010,12 +1010,12 @@ sal_Bool appendToFilter(const Reference& _xConnection, Reference< XPropertySet> xProp(xChild->getParent(),UNO_QUERY); if(xProp.is()) { - Sequence< ::rtl::OUString > aFilter; + Sequence< OUString > aFilter; xProp->getPropertyValue(PROPERTY_TABLEFILTER) >>= aFilter; // first check if we have something like SCHEMA.% sal_Bool bHasToInsert = sal_True; - const ::rtl::OUString* pBegin = aFilter.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aFilter.getLength(); + const OUString* pBegin = aFilter.getConstArray(); + const OUString* pEnd = pBegin + aFilter.getLength(); for (;pBegin != pEnd; ++pBegin) { if(pBegin->indexOf('%') != -1) @@ -1127,7 +1127,7 @@ sal_Bool generateAsBeforeTableAlias(const Reference& _xConnection) // ----------------------------------------------------------------------------- void fillAutoIncrementValue(const Reference& _xDatasource, sal_Bool& _rAutoIncrementValueEnabled, - ::rtl::OUString& _rsAutoIncrementValue) + OUString& _rsAutoIncrementValue) { if ( _xDatasource.is() ) { @@ -1143,7 +1143,7 @@ void fillAutoIncrementValue(const Reference& _xDatasource, pValue->Value >>= _rsAutoIncrementValue; pValue =::std::find_if(aInfo.getConstArray(), aInfo.getConstArray() + aInfo.getLength(), - ::std::bind2nd(TPropertyValueEqualFunctor(),::rtl::OUString("IsAutoRetrievingEnabled") )); + ::std::bind2nd(TPropertyValueEqualFunctor(),OUString("IsAutoRetrievingEnabled") )); if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) ) pValue->Value >>= _rAutoIncrementValueEnabled; } @@ -1151,7 +1151,7 @@ void fillAutoIncrementValue(const Reference& _xDatasource, // ----------------------------------------------------------------------------- void fillAutoIncrementValue(const Reference& _xConnection, sal_Bool& _rAutoIncrementValueEnabled, - ::rtl::OUString& _rsAutoIncrementValue) + OUString& _rsAutoIncrementValue) { Reference< XChild> xChild(_xConnection,UNO_QUERY); if(xChild.is()) @@ -1161,7 +1161,7 @@ void fillAutoIncrementValue(const Reference& _xConnection, } } // ----------------------------------------------------------------------------- -::rtl::OUString getStrippedDatabaseName(const Reference& _xDataSource,::rtl::OUString& _rsDatabaseName) +OUString getStrippedDatabaseName(const Reference& _xDataSource,OUString& _rsDatabaseName) { if ( _rsDatabaseName.isEmpty() && _xDataSource.is() ) { @@ -1174,27 +1174,27 @@ void fillAutoIncrementValue(const Reference& _xConnection, DBG_UNHANDLED_EXCEPTION(); } } - ::rtl::OUString sName = _rsDatabaseName; + OUString sName = _rsDatabaseName; INetURLObject aURL(sName); if ( aURL.GetProtocol() != INET_PROT_NOT_VALID ) sName = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_UNAMBIGUOUS); return sName; } // ----------------------------------------------------------------------------- -void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark ) +void AppendConfigToken( OUString& _rURL, sal_Bool _bQuestionMark ) { // query part exists? if ( _bQuestionMark ) // no, so start with '?' - _rURL += ::rtl::OUString("?"); + _rURL += OUString("?"); else // yes, so only append with '&' - _rURL += ::rtl::OUString("&"); + _rURL += OUString("&"); // set parameters - _rURL += ::rtl::OUString("Language="); + _rURL += OUString("Language="); _rURL += utl::ConfigManager::getLocale(); - _rURL += ::rtl::OUString("&System="); + _rURL += OUString("&System="); _rURL += SvtHelpOptions().GetSystem(); } @@ -1202,17 +1202,17 @@ namespace { // ----------------------------------------------------------------------- - sal_Bool GetHelpAnchor_Impl( const ::rtl::OUString& _rURL, ::rtl::OUString& _rAnchor ) + sal_Bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) { sal_Bool bRet = sal_False; - ::rtl::OUString sAnchor; + OUString sAnchor; try { ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ), Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - if ( ( aCnt.getPropertyValue( ::rtl::OUString("AnchorName") ) >>= sAnchor ) ) + if ( ( aCnt.getPropertyValue( OUString("AnchorName") ) >>= sAnchor ) ) { if ( !sAnchor.isEmpty() ) @@ -1236,22 +1236,22 @@ namespace } // annonymous // ......................................................................... // ----------------------------------------------------------------------------- -::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName, const rtl::OString& sHelpId) +::com::sun::star::util::URL createHelpAgentURL(const OUString& _sModuleName, const OString& sHelpId) { ::com::sun::star::util::URL aURL; - aURL.Complete = ::rtl::OUString( "vnd.sun.star.help://" ); + aURL.Complete = OUString( "vnd.sun.star.help://" ); aURL.Complete += _sModuleName; - aURL.Complete += ::rtl::OUString( "/" ); - aURL.Complete += ::rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8); + aURL.Complete += OUString( "/" ); + aURL.Complete += OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8); - ::rtl::OUString sAnchor; - ::rtl::OUString sTempURL = aURL.Complete; + OUString sAnchor; + OUString sTempURL = aURL.Complete; AppendConfigToken( sTempURL, sal_True ); sal_Bool bHasAnchor = GetHelpAnchor_Impl( sTempURL, sAnchor ); AppendConfigToken(aURL.Complete,sal_True); if ( bHasAnchor ) { - aURL.Complete += ::rtl::OUString("#"); + aURL.Complete += OUString("#"); aURL.Complete += sAnchor; } return aURL; @@ -1373,7 +1373,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType } if ( !pTypeInfo ) { - ::rtl::OUString sCreate("x"),sTypeName; + OUString sCreate("x"),sTypeName; sal_Bool bForce = sal_True; pTypeInfo = ::dbaui::getTypeInfoFromType(_rTypeInfo,DataType::VARCHAR,sTypeName,sCreate,50,0,sal_False,bForce); } @@ -1381,11 +1381,11 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType return pTypeInfo; } // ----------------------------------------------------------------------------- -sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const ::rtl::OUString& _sName) +sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const OUString& _sName) { SolarMutexGuard aGuard; String aMsg = String(ModuleRes(_nText)); - aMsg.SearchAndReplace(rtl::OUString("%1"),String(_sName)); + aMsg.SearchAndReplace(OUString("%1"),String(_sName)); OSQLMessageBox aAsk(_pParent,String(ModuleRes(_nTitle )),aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query); if ( _bAll ) { @@ -1398,9 +1398,9 @@ sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText // ----------------------------------------------------------------------------- namespace { - static ::rtl::OUString lcl_createSDBCLevelStatement( const ::rtl::OUString& _rStatement, const Reference< XConnection >& _rxConnection ) + static OUString lcl_createSDBCLevelStatement( const OUString& _rStatement, const Reference< XConnection >& _rxConnection ) { - ::rtl::OUString sSDBCLevelStatement( _rStatement ); + OUString sSDBCLevelStatement( _rStatement ); try { Reference< XMultiServiceFactory > xAnalyzerFactory( _rxConnection, UNO_QUERY_THROW ); @@ -1417,8 +1417,8 @@ namespace } // ----------------------------------------------------------------------------- -Reference< XPropertySet > createView( const ::rtl::OUString& _rName, const Reference< XConnection >& _rxConnection, - const ::rtl::OUString& _rCommand ) +Reference< XPropertySet > createView( const OUString& _rName, const Reference< XConnection >& _rxConnection, + const OUString& _rCommand ) { Reference xSup(_rxConnection,UNO_QUERY); Reference< XNameAccess > xViews; @@ -1433,7 +1433,7 @@ Reference< XPropertySet > createView( const ::rtl::OUString& _rName, const Refer if ( !xView.is() ) return NULL; - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(_rxConnection->getMetaData(), _rName, sCatalog, @@ -1467,10 +1467,10 @@ Reference< XPropertySet > createView( const ::rtl::OUString& _rName, const Refer } // ----------------------------------------------------------------------------- -Reference createView( const ::rtl::OUString& _rName, const Reference< XConnection >& _rxConnection +Reference createView( const OUString& _rName, const Reference< XConnection >& _rxConnection ,const Reference& _rxSourceObject) { - ::rtl::OUString sCommand; + OUString sCommand; Reference< XPropertySetInfo > xPSI( _rxSourceObject->getPropertySetInfo(), UNO_SET_THROW ); if ( xPSI->hasPropertyByName( PROPERTY_COMMAND ) ) { @@ -1483,7 +1483,7 @@ Reference createView( const ::rtl::OUString& _rName, const Referen } else { - sCommand = ::rtl::OUString( "SELECT * FROM " ); + sCommand = OUString( "SELECT * FROM " ); sCommand += composeTableNameForSelect( _rxConnection, _rxSourceObject ); } return createView( _rName, _rxConnection, sCommand ); @@ -1503,7 +1503,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon return sal_False; Reference xNameAccess( _xNames, UNO_QUERY ); - ::rtl::OUString sName = _sParentFolder; + OUString sName = _sParentFolder; if ( _xNames->hasByHierarchicalName(sName) ) { Reference xChild(_xNames->getByHierarchicalName(sName),UNO_QUERY); @@ -1516,7 +1516,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon if ( !xNameAccess.is() ) return sal_False; - ::rtl::OUString sNewName; + OUString sNewName; Reference xProp(_xContent,UNO_QUERY); if ( xProp.is() ) xProp->getPropertyValue(PROPERTY_NAME) >>= sNewName; @@ -1554,7 +1554,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon { String sError(ModuleRes(STR_NAME_ALREADY_EXISTS)); sError.SearchAndReplaceAscii("#",sNewName); - throw SQLException(sError,NULL,::rtl::OUString("S1000") ,0,Any()); + throw SQLException(sError,NULL,OUString("S1000") ,0,Any()); } try @@ -1563,11 +1563,11 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon Sequence< Any > aArguments(3); PropertyValue aValue; // set as folder - aValue.Name = ::rtl::OUString("Name"); + aValue.Name = OUString("Name"); aValue.Value <<= sNewName; aArguments[0] <<= aValue; //parent - aValue.Name = ::rtl::OUString("Parent"); + aValue.Name = OUString("Parent"); aValue.Value <<= xNameAccess; aArguments[1] <<= aValue; @@ -1575,7 +1575,7 @@ sal_Bool insertHierachyElement( Window* _pParent, const Reference< XComponentCon aValue.Value <<= _xContent; aArguments[2] <<= aValue; - ::rtl::OUString sServiceName(_bCollection ? ((_bForm) ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION); + OUString sServiceName(_bCollection ? ((_bForm) ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION); Reference xNew( xORB->createInstanceWithArguments( sServiceName, aArguments ), UNO_QUERY_THROW ); Reference< XNameContainer > xNameContainer( xNameAccess, UNO_QUERY_THROW ); diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx index a810c03f04d5..0d81d253e06f 100644 --- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx +++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx @@ -41,7 +41,7 @@ namespace dbaui { } virtual ~ORowUpdateHelper() {} - virtual void updateString(sal_Int32 _nPos, const ::rtl::OUString& _sValue) + virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) { m_xRowUpdate->updateString(_nPos, _sValue); } @@ -91,7 +91,7 @@ namespace dbaui { } virtual ~OParameterUpdateHelper() {} - virtual void updateString(sal_Int32 _nPos, const ::rtl::OUString& _sValue) + virtual void updateString(sal_Int32 _nPos, const OUString& _sValue) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OParameterUpdateHelper::updateString" ); m_xParameters->setString(_nPos, _sValue); diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index db68666cb5a0..c0a5dc69228f 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -97,7 +97,7 @@ OCopyTable::OCopyTable( Window * pParent ) m_aFT_KeyName.Enable(sal_False); m_edKeyName.Enable(sal_False); - ::rtl::OUString sKeyName("ID"); + OUString sKeyName("ID"); sKeyName = m_pParent->createUniqueName(sKeyName); m_edKeyName.SetText(sKeyName); @@ -186,9 +186,9 @@ sal_Bool OCopyTable::LeavePage() // have to check the length of the table name Reference< XDatabaseMetaData > xMeta = m_pParent->m_xDestConnection->getMetaData(); - ::rtl::OUString sCatalog; - ::rtl::OUString sSchema; - ::rtl::OUString sTable; + OUString sCatalog; + OUString sSchema; + OUString sTable; ::dbtools::qualifiedNameComponents( xMeta, m_edTableName.GetText(), sCatalog, @@ -208,7 +208,7 @@ sal_Bool OCopyTable::LeavePage() && m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) ) { String aInfoString( ModuleRes(STR_WIZ_PKEY_ALREADY_DEFINED) ); - aInfoString += rtl::OUString(' '); + aInfoString += OUString(' '); aInfoString += m_pParent->m_aKeyName; m_pParent->showError(aInfoString); return sal_False; @@ -327,7 +327,7 @@ sal_Bool OCopyTable::checkAppendData() return sal_True; } // ----------------------------------------------------------------------------- -void OCopyTable::setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ) +void OCopyTable::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ) { bool bCreatePK = m_bPKeyAllowed && _bDoCreate; m_aCB_PrimaryColumn.Check( bCreatePK ); diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index b703d4a00c4a..196761826fca 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -200,11 +200,11 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton ) // else ???? Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() ); - ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); + OUString sExtraChars = xMetaData->getExtraNameCharacters(); sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); ::comphelper::TStringMixEqualFunctor aCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); - ::std::vector< ::rtl::OUString> aRightColumns; + ::std::vector< OUString> aRightColumns; fillColumns(pRight,aRightColumns); if(!bAll) @@ -249,11 +249,11 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, MultiListBox *, pListBox ) ////////////////////////////////////////////////////////////////////// // If database is able to process PrimaryKeys, set PrimaryKey Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() ); - ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); + OUString sExtraChars = xMetaData->getExtraNameCharacters(); sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); ::comphelper::TStringMixEqualFunctor aCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); - ::std::vector< ::rtl::OUString> aRightColumns; + ::std::vector< OUString> aRightColumns; fillColumns(pRight,aRightColumns); for(sal_uInt16 i=0; i < pLeft->GetSelectEntryCount(); ++i) @@ -272,7 +272,7 @@ void OWizColumnSelect::clearListBox(MultiListBox& _rListBox) _rListBox.Clear(); } // ----------------------------------------------------------------------------- -void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< ::rtl::OUString> &_rRightColumns) +void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< OUString> &_rRightColumns) { sal_uInt16 nCount = pRight->GetEntryCount(); _rRightColumns.reserve(nCount); @@ -282,13 +282,13 @@ void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< ::rtl::OUStrin // ----------------------------------------------------------------------------- void OWizColumnSelect::createNewColumn( ListBox* _pListbox, OFieldDescription* _pSrcField, - ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, + ::std::vector< OUString>& _rRightColumns, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase) { - ::rtl::OUString sConvertedName = m_pParent->convertColumnName(TMultiListBoxEntryFindFunctor(&_rRightColumns,_aCase), + OUString sConvertedName = m_pParent->convertColumnName(TMultiListBoxEntryFindFunctor(&_rRightColumns,_aCase), _sColumnName, _sExtraChars, _nMaxNameLen); @@ -308,9 +308,9 @@ void OWizColumnSelect::createNewColumn( ListBox* _pListbox, // ----------------------------------------------------------------------------- void OWizColumnSelect::moveColumn( ListBox* _pRight, ListBox* _pLeft, - ::std::vector< ::rtl::OUString>& _rRightColumns, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, + ::std::vector< OUString>& _rRightColumns, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, const ::comphelper::TStringMixEqualFunctor& _aCase) { @@ -354,7 +354,7 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight, // been removed earlier and adjust accordingly. Based on the // algorithm employed in moveColumn(). sal_uInt16 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, - const ::rtl::OUString& _sColumnName, + const OUString& _sColumnName, ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::TStringMixEqualFunctor& _aCase) { @@ -366,7 +366,7 @@ sal_uInt16 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, return nAdjustedPos; sal_uInt16 nCount = _pLeft->GetEntryCount(); - ::rtl::OUString sColumnString; + OUString sColumnString; for(sal_uInt16 i=0; i < nCount; ++i) { sColumnString = _pLeft->GetEntry(i); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index fa220bf19b43..01d8ba6b0bb1 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -121,9 +121,9 @@ ObjectCopySource::ObjectCopySource( const Reference< XConnection >& _rxConnectio } //------------------------------------------------------------------------ -::rtl::OUString ObjectCopySource::getQualifiedObjectName() const +OUString ObjectCopySource::getQualifiedObjectName() const { - ::rtl::OUString sName; + OUString sName; if ( !m_xObjectPSI->hasPropertyByName( PROPERTY_COMMAND ) ) sName = ::dbtools::composeTableName( m_xMetaData, m_xObject, ::dbtools::eInDataManipulation, false, false, false ); @@ -140,7 +140,7 @@ bool ObjectCopySource::isView() const { if ( m_xObjectPSI->hasPropertyByName( PROPERTY_TYPE ) ) { - ::rtl::OUString sObjectType; + OUString sObjectType; OSL_VERIFY( m_xObject->getPropertyValue( PROPERTY_TYPE ) >>= sObjectType ); bIsView = sObjectType == "VIEW"; } @@ -155,7 +155,7 @@ bool ObjectCopySource::isView() const //------------------------------------------------------------------------ void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObject ) const { - const ::rtl::OUString aCopyProperties[] = { + const OUString aCopyProperties[] = { PROPERTY_FONT, PROPERTY_ROW_HEIGHT, PROPERTY_TEXTCOLOR,PROPERTY_TEXTLINECOLOR,PROPERTY_TEXTEMPHASIS,PROPERTY_TEXTRELIEF }; for ( size_t i=0; i < sizeof( aCopyProperties ) / sizeof( aCopyProperties[0] ); ++i ) @@ -167,29 +167,29 @@ void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObj //------------------------------------------------------------------------ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _xConnection,const Reference< XPropertySet >& _rxObject ) const { - ::std::pair< ::rtl::OUString, ::rtl::OUString > aProperties[] = { - ::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_FILTER,::rtl::OUString(" AND ")) - ,::std::pair< ::rtl::OUString, ::rtl::OUString >(PROPERTY_ORDER,::rtl::OUString(" ORDER BY ")) + ::std::pair< OUString, OUString > aProperties[] = { + ::std::pair< OUString, OUString >(PROPERTY_FILTER,OUString(" AND ")) + ,::std::pair< OUString, OUString >(PROPERTY_ORDER,OUString(" ORDER BY ")) }; size_t i = 0; try { - const String sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + ::rtl::OUString(".")); - const ::rtl::OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject); - const String sTargetNameTemp = (sTargetName + ::rtl::OUString(".")); + const String sSourceName = (::dbtools::composeTableNameForSelect(m_xConnection,m_xObject) + OUString(".")); + const OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject); + const String sTargetNameTemp = (sTargetName + OUString(".")); - ::rtl::OUString sStatement("SELECT * FROM "); + OUString sStatement("SELECT * FROM "); sStatement += sTargetName; - sStatement += ::rtl::OUString(" WHERE 0=1"); + sStatement += OUString(" WHERE 0=1"); for ( i=0; i < sizeof( aProperties ) / sizeof( aProperties[0] ); ++i ) { if ( m_xObjectPSI->hasPropertyByName( aProperties[i].first ) ) { - ::rtl::OUString sFilter; + OUString sFilter; m_xObject->getPropertyValue( aProperties[i].first ) >>= sFilter; if ( !sFilter.isEmpty() ) { @@ -213,47 +213,47 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _ } } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > ObjectCopySource::getColumnNames() const +Sequence< OUString > ObjectCopySource::getColumnNames() const { return m_xObjectColumns->getElementNames(); } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > ObjectCopySource::getPrimaryKeyColumnNames() const +Sequence< OUString > ObjectCopySource::getPrimaryKeyColumnNames() const { const Reference xPrimaryKeyColumns = getPrimaryKeyColumns_throw(m_xObject); - Sequence< ::rtl::OUString > aKeyColNames; + Sequence< OUString > aKeyColNames; if ( xPrimaryKeyColumns.is() ) aKeyColNames = xPrimaryKeyColumns->getElementNames(); return aKeyColNames; } //------------------------------------------------------------------------ -OFieldDescription* ObjectCopySource::createFieldDescription( const ::rtl::OUString& _rColumnName ) const +OFieldDescription* ObjectCopySource::createFieldDescription( const OUString& _rColumnName ) const { Reference< XPropertySet > xColumn( m_xObjectColumns->getByName( _rColumnName ), UNO_QUERY_THROW ); return new OFieldDescription( xColumn ); } //------------------------------------------------------------------------ -::rtl::OUString ObjectCopySource::getSelectStatement() const +OUString ObjectCopySource::getSelectStatement() const { - ::rtl::OUString sSelectStatement; + OUString sSelectStatement; if ( m_xObjectPSI->hasPropertyByName( PROPERTY_COMMAND ) ) { // query OSL_VERIFY( m_xObject->getPropertyValue( PROPERTY_COMMAND ) >>= sSelectStatement ); } else { // table - ::rtl::OUStringBuffer aSQL; + OUStringBuffer aSQL; aSQL.appendAscii( "SELECT " ); // we need to create the sql stmt with column names // otherwise it is possible that names don't match - const ::rtl::OUString sQuote = m_xMetaData->getIdentifierQuoteString(); + const OUString sQuote = m_xMetaData->getIdentifierQuoteString(); - Sequence< ::rtl::OUString > aColumnNames = getColumnNames(); - const ::rtl::OUString* pColumnName = aColumnNames.getConstArray(); - const ::rtl::OUString* pEnd = pColumnName + aColumnNames.getLength(); + Sequence< OUString > aColumnNames = getColumnNames(); + const OUString* pColumnName = aColumnNames.getConstArray(); + const OUString* pEnd = pColumnName + aColumnNames.getLength(); for ( ; pColumnName != pEnd; ) { aSQL.append( ::dbtools::quoteName( sQuote, *pColumnName++ ) ); @@ -287,7 +287,7 @@ OFieldDescription* ObjectCopySource::createFieldDescription( const ::rtl::OUStri //= NamedTableCopySource //======================================================================== //------------------------------------------------------------------------ -NamedTableCopySource::NamedTableCopySource( const Reference< XConnection >& _rxConnection, const ::rtl::OUString& _rTableName ) +NamedTableCopySource::NamedTableCopySource( const Reference< XConnection >& _rxConnection, const OUString& _rTableName ) :m_xConnection( _rxConnection, UNO_SET_THROW ) ,m_xMetaData( _rxConnection->getMetaData(), UNO_SET_THROW ) ,m_sTableName( _rTableName ) @@ -298,7 +298,7 @@ NamedTableCopySource::NamedTableCopySource( const Reference< XConnection >& _rxC } //------------------------------------------------------------------------ -::rtl::OUString NamedTableCopySource::getQualifiedObjectName() const +OUString NamedTableCopySource::getQualifiedObjectName() const { return m_sTableName; } @@ -306,11 +306,11 @@ NamedTableCopySource::NamedTableCopySource( const Reference< XConnection >& _rxC //------------------------------------------------------------------------ bool NamedTableCopySource::isView() const { - ::rtl::OUString sTableType; + OUString sTableType; try { Reference< XResultSet > xTableDesc( m_xMetaData->getTables( makeAny( m_sTableCatalog ), m_sTableSchema, m_sTableBareName, - Sequence< ::rtl::OUString >() ) ); + Sequence< OUString >() ) ); Reference< XRow > xTableDescRow( xTableDesc, UNO_QUERY_THROW ); OSL_VERIFY( xTableDesc->next() ); sTableType = xTableDescRow->getString( 4 ); @@ -369,9 +369,9 @@ void NamedTableCopySource::impl_ensureColumnInfo_throw() } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > NamedTableCopySource::getColumnNames() const +Sequence< OUString > NamedTableCopySource::getColumnNames() const { - Sequence< ::rtl::OUString > aNames( m_aColumnInfo.size() ); + Sequence< OUString > aNames( m_aColumnInfo.size() ); for ( ::std::vector< OFieldDescription >::const_iterator col = m_aColumnInfo.begin(); col != m_aColumnInfo.end(); ++col @@ -382,9 +382,9 @@ Sequence< ::rtl::OUString > NamedTableCopySource::getColumnNames() const } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > NamedTableCopySource::getPrimaryKeyColumnNames() const +Sequence< OUString > NamedTableCopySource::getPrimaryKeyColumnNames() const { - Sequence< ::rtl::OUString > aPKColNames; + Sequence< OUString > aPKColNames; try { @@ -406,7 +406,7 @@ Sequence< ::rtl::OUString > NamedTableCopySource::getPrimaryKeyColumnNames() con } //------------------------------------------------------------------------ -OFieldDescription* NamedTableCopySource::createFieldDescription( const ::rtl::OUString& _rColumnName ) const +OFieldDescription* NamedTableCopySource::createFieldDescription( const OUString& _rColumnName ) const { for ( ::std::vector< OFieldDescription >::const_iterator col = m_aColumnInfo.begin(); col != m_aColumnInfo.end(); @@ -418,9 +418,9 @@ OFieldDescription* NamedTableCopySource::createFieldDescription( const ::rtl::OU return NULL; } //------------------------------------------------------------------------ -::rtl::OUString NamedTableCopySource::getSelectStatement() const +OUString NamedTableCopySource::getSelectStatement() const { - ::rtl::OUStringBuffer aSQL; + OUStringBuffer aSQL; aSQL.appendAscii( "SELECT * FROM " ); aSQL.append( ::dbtools::composeTableNameForSelect( m_xConnection, m_sTableCatalog, m_sTableSchema, m_sTableBareName ) ); @@ -445,16 +445,16 @@ public: static const DummyCopySource& Instance(); // ICopyTableSourceObject overridables - virtual ::rtl::OUString getQualifiedObjectName() const; + virtual OUString getQualifiedObjectName() const; virtual bool isView() const; virtual void copyUISettingsTo( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; virtual void copyFilterAndSortingTo(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getColumnNames() const; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > getPrimaryKeyColumnNames() const; - virtual OFieldDescription* createFieldDescription( const ::rtl::OUString& _rColumnName ) const; - virtual ::rtl::OUString getSelectStatement() const; + virtual OFieldDescription* createFieldDescription( const OUString& _rColumnName ) const; + virtual OUString getSelectStatement() const; virtual ::utl::SharedUNOComponent< XPreparedStatement > getPreparedSelectStatement() const; }; @@ -467,10 +467,10 @@ const DummyCopySource& DummyCopySource::Instance() } //------------------------------------------------------------------------ -::rtl::OUString DummyCopySource::getQualifiedObjectName() const +OUString DummyCopySource::getQualifiedObjectName() const { OSL_FAIL( "DummyCopySource::getQualifiedObjectName: not to be called!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------ @@ -490,29 +490,29 @@ void DummyCopySource::copyFilterAndSortingTo( const Reference< XConnection >& ,c { } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > DummyCopySource::getColumnNames() const +Sequence< OUString > DummyCopySource::getColumnNames() const { - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > DummyCopySource::getPrimaryKeyColumnNames() const +Sequence< OUString > DummyCopySource::getPrimaryKeyColumnNames() const { OSL_FAIL( "DummyCopySource::getPrimaryKeyColumnNames: not to be called!" ); - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } //------------------------------------------------------------------------ -OFieldDescription* DummyCopySource::createFieldDescription( const ::rtl::OUString& /*_rColumnName*/ ) const +OFieldDescription* DummyCopySource::createFieldDescription( const OUString& /*_rColumnName*/ ) const { OSL_FAIL( "DummyCopySource::createFieldDescription: not to be called!" ); return NULL; } //------------------------------------------------------------------------ -::rtl::OUString DummyCopySource::getSelectStatement() const +OUString DummyCopySource::getSelectStatement() const { OSL_FAIL( "DummyCopySource::getSelectStatement: not to be called!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------ @@ -546,7 +546,7 @@ namespace //= OCopyTableWizard //======================================================================== //------------------------------------------------------------------------ -OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rDefaultName, sal_Int16 _nOperation, +OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, const Reference< XConnection >& _xSourceConnection, const Reference< XConnection >& _xConnection, const Reference< XComponentContext >& _rxContext, const Reference< XInteractionHandler>& _xInteractionHandler) @@ -576,7 +576,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD construct(); // extract table name - ::rtl::OUString sInitialTableName( _rDefaultName ); + OUString sInitialTableName( _rDefaultName ); try { m_sSourceName = m_rSourceObject.getQualifiedObjectName(); @@ -619,9 +619,9 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD if ( m_bInterConnectionCopy ) { Reference< XDatabaseMetaData > xSrcMeta = _xSourceConnection->getMetaData(); - ::rtl::OUString sCatalog; - ::rtl::OUString sSchema; - ::rtl::OUString sTable; + OUString sCatalog; + OUString sSchema; + OUString sTable; ::dbtools::qualifiedNameComponents( xSrcMeta, m_sName, sCatalog, @@ -646,7 +646,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD } // ----------------------------------------------------------------------------- -OCopyTableWizard::OCopyTableWizard( Window* pParent, const ::rtl::OUString& _rDefaultName, sal_Int16 _nOperation, +OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rSourceColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, const Reference< XConnection >& _xConnection, const Reference< XNumberFormatter >& _xFormatter, TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, const Reference< XComponentContext >& _rxContext ) @@ -856,7 +856,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) else { Reference< XDatabaseMetaData > xMetaData( m_xDestConnection->getMetaData() ); - ::rtl::OUString sExtraChars = xMetaData->getExtraNameCharacters(); + OUString sExtraChars = xMetaData->getExtraNameCharacters(); sal_Int32 nMaxNameLen = getMaxColumnNameLength(); ODatabaseExport::TColumnVector::const_iterator aSrcIter = m_vSourceVec.begin(); @@ -942,7 +942,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) m_bCreatePrimaryKeyColumn = sal_True; m_aKeyName = pPage->GetKeyName(); if ( m_aKeyName.isEmpty() ) - m_aKeyName = ::rtl::OUString( "ID" ); + m_aKeyName = OUString( "ID" ); m_aKeyName = createUniqueName( m_aKeyName ); sal_Int32 nBreakPos2 = 0; CheckColumns(nBreakPos2); @@ -978,7 +978,7 @@ sal_Bool OCopyTableWizard::shouldCreatePrimaryKey() const } // ----------------------------------------------------------------------- -void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ) +void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::setCreatePrimaryKey" ); m_bCreatePrimaryKeyColumn = _bDoCreate; @@ -1081,7 +1081,7 @@ void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField) } } // ----------------------------------------------------------------------------- -void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const ::rtl::OUString& _sOldName) +void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const OUString& _sOldName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::replaceColumn" ); OSL_ENSURE(_pField,"FieldDescrioption is null!"); @@ -1113,15 +1113,15 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, _rColumns.clear(); OFieldDescription* pActFieldDescr = NULL; - ::rtl::OUString sCreateParam("x"); + OUString sCreateParam("x"); ////////////////////////////////////////////////////////////////////// // ReadOnly-Flag // On drop no line must be editable. // On add only empty lines must be editable. // On Add and Drop all lines can be edited. - Sequence< ::rtl::OUString > aColumns( _rSourceObject.getColumnNames() ); - const ::rtl::OUString* pColumn = aColumns.getConstArray(); - const ::rtl::OUString* pColumnEnd = pColumn + aColumns.getLength(); + Sequence< OUString > aColumns( _rSourceObject.getColumnNames() ); + const OUString* pColumn = aColumns.getConstArray(); + const OUString* pColumnEnd = pColumn + aColumns.getLength(); for ( ; pColumn != pColumnEnd; ++pColumn ) { @@ -1135,7 +1135,7 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, sal_Int32 nScale = pActFieldDescr->GetScale(); sal_Int32 nPrecision = pActFieldDescr->GetPrecision(); sal_Bool bAutoIncrement = pActFieldDescr->IsAutoIncrement(); - ::rtl::OUString sTypeName = pActFieldDescr->GetTypeName(); + OUString sTypeName = pActFieldDescr->GetTypeName(); // search for type sal_Bool bForce; @@ -1148,9 +1148,9 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, } // determine which coumns belong to the primary key - Sequence< ::rtl::OUString > aPrimaryKeyColumns( _rSourceObject.getPrimaryKeyColumnNames() ); - const ::rtl::OUString* pKeyColName = aPrimaryKeyColumns.getConstArray(); - const ::rtl::OUString* pKeyColEnd = pKeyColName + aPrimaryKeyColumns.getLength(); + Sequence< OUString > aPrimaryKeyColumns( _rSourceObject.getPrimaryKeyColumnNames() ); + const OUString* pKeyColName = aPrimaryKeyColumns.getConstArray(); + const OUString* pKeyColEnd = pKeyColName + aPrimaryKeyColumns.getLength(); for( ; pKeyColName != pKeyColEnd; ++pKeyColName ) { @@ -1254,7 +1254,7 @@ void OCopyTableWizard::appendKey( Reference& _rxSup, const ODatab Reference< XPropertySet > OCopyTableWizard::createView() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::createView" ); - ::rtl::OUString sCommand( m_rSourceObject.getSelectStatement() ); + OUString sCommand( m_rSourceObject.getSelectStatement() ); OSL_ENSURE( !sCommand.isEmpty(), "OCopyTableWizard::createView: no statement in the source object!" ); // there are legitimate cases in which getSelectStatement does not provide a statement, // but in all those cases, this method here should never be called. @@ -1282,7 +1282,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() if(!xTable.is()) return NULL; - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; Reference< XDatabaseMetaData> xMetaData = m_xDestConnection->getMetaData(); ::dbtools::qualifiedNameComponents(xMetaData, m_sName, @@ -1323,7 +1323,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() xTables->getByName(m_sName) >>= xTable; else { - ::rtl::OUString sComposedName( + OUString sComposedName( ::dbtools::composeTableName( m_xDestConnection->getMetaData(), xTable, ::dbtools::eInDataManipulation, false, false, false ) ); if(xTables->hasByName(sComposedName)) { @@ -1345,9 +1345,9 @@ Reference< XPropertySet > OCopyTableWizard::createTable() m_rSourceObject.copyFilterAndSortingTo(m_xDestConnection,xTable); // set column mappings Reference xNameAccess = xSuppDestinationColumns->getColumns(); - Sequence< ::rtl::OUString> aSeq = xNameAccess->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + Sequence< OUString> aSeq = xNameAccess->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(sal_Int32 nNewPos=1;pIter != pEnd;++pIter,++nNewPos) { @@ -1416,7 +1416,7 @@ bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnect Reference< XRow > xRow( xRs, UNO_QUERY_THROW ); while ( xRs->next() ) { - ::rtl::OUString sValue = xRow->getString( 1 ); + OUString sValue = xRow->getString( 1 ); if ( !xRow->wasNull() && sValue.equalsIgnoreAsciiCase("View") ) { bSupportsViews = true; @@ -1469,13 +1469,13 @@ sal_Int16 OCopyTableWizard::getOperation() const return m_nOperation; } // ----------------------------------------------------------------------------- -::rtl::OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFunctor, - const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sExtraChars, +OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFunctor, + const OUString& _sColumnName, + const OUString& _sExtraChars, sal_Int32 _nMaxNameLen) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::convertColumnName" ); - ::rtl::OUString sAlias = _sColumnName; + OUString sAlias = _sColumnName; if ( isSQL92CheckEnabled( m_xDestConnection ) ) sAlias = ::dbtools::convertName2SQLName(_sColumnName,_sExtraChars); if((_nMaxNameLen && sAlias.getLength() > _nMaxNameLen) || _rCmpFunctor(sAlias)) @@ -1487,14 +1487,14 @@ sal_Int16 OCopyTableWizard::getOperation() const if(_nMaxNameLen && sAlias.getLength() >= _nMaxNameLen) sAlias = sAlias.copy(0,sAlias.getLength() - (sAlias.getLength()-_nMaxNameLen+nDiff)); - ::rtl::OUString sName(sAlias); + OUString sName(sAlias); sal_Int32 nPos = 1; - sName += ::rtl::OUString::valueOf(nPos); + sName += OUString::valueOf(nPos); while(_rCmpFunctor(sName)) { sName = sAlias; - sName += ::rtl::OUString::valueOf(++nPos); + sName += OUString::valueOf(++nPos); } sAlias = sName; // we have to check again, it could happen that the name is already to long @@ -1507,7 +1507,7 @@ sal_Int16 OCopyTableWizard::getOperation() const } // ----------------------------------------------------------------------------- -void OCopyTableWizard::removeColumnNameFromNameMap(const ::rtl::OUString& _sName) +void OCopyTableWizard::removeColumnNameFromNameMap(const OUString& _sName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::removeColumnNameFromNameMap" ); m_mNameMapping.erase(_sName); @@ -1612,7 +1612,7 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& if ( !pType.get() ) { _bNotConvert = sal_False; - ::rtl::OUString sCreate("x"); + OUString sCreate("x"); pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,sCreate,50,0,sal_False,bForce); if ( !pType.get() ) pType = m_pTypeInfo; @@ -1623,11 +1623,11 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& return pType; } // ----------------------------------------------------------------------------- -::rtl::OUString OCopyTableWizard::createUniqueName(const ::rtl::OUString& _sName) +OUString OCopyTableWizard::createUniqueName(const OUString& _sName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::createUniqueName" ); - ::rtl::OUString sName = _sName; - Sequence< ::rtl::OUString > aColumnNames( m_rSourceObject.getColumnNames() ); + OUString sName = _sName; + Sequence< OUString > aColumnNames( m_rSourceObject.getColumnNames() ); if ( aColumnNames.getLength() ) sName = ::dbtools::createUniqueName( aColumnNames, sName, sal_False ); else @@ -1638,14 +1638,14 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& while(m_vSourceColumns.find(sName) != m_vSourceColumns.end()) { sName = _sName; - sName += ::rtl::OUString::valueOf(++nPos); + sName += OUString::valueOf(++nPos); } } } return sName; } // ----------------------------------------------------------------------------- -void OCopyTableWizard::showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName) +void OCopyTableWizard::showColumnTypeNotSupported(const OUString& _rColumnName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::showColumnTypeNotSupported" ); String sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) ); @@ -1653,7 +1653,7 @@ void OCopyTableWizard::showColumnTypeNotSupported(const ::rtl::OUString& _rColum showError(sMessage); } //------------------------------------------------------------------------------- -void OCopyTableWizard::showError(const ::rtl::OUString& _sErrorMesage) +void OCopyTableWizard::showError(const OUString& _sErrorMesage) { SQLExceptionInfo aInfo(_sErrorMesage); showError(aInfo.get()); diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 8f5f5508d650..6d4dc5d036aa 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -102,8 +102,8 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) return; setCurrentFieldDescData( pCurFieldDescr ); - ::rtl::OUString sName = pCurFieldDescr->GetName(); - ::rtl::OUString sNewName; + OUString sName = pCurFieldDescr->GetName(); + OUString sNewName; const OPropColumnEditCtrl* pColumnName = getColumnCtrl(); if ( pColumnName ) sNewName = pColumnName->GetText(); @@ -122,7 +122,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) sal_uInt16 nCount = aListBox.GetEntryCount(); for (sal_uInt16 i=0 ; !bDoubleName && i < nCount ; ++i) { - ::rtl::OUString sEntry(aListBox.GetEntry(i)); + OUString sEntry(aListBox.GetEntry(i)); bDoubleName = sNewName.equalsIgnoreAsciiCase(sEntry); } if ( !bDoubleName && pWiz->shouldCreatePrimaryKey() ) @@ -145,7 +145,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) return; } - ::rtl::OUString sOldName = pCurFieldDescr->GetName(); + OUString sOldName = pCurFieldDescr->GetName(); pCurFieldDescr->SetName(sNewName); static_cast(GetParent())->setDuplicateName(sal_False); @@ -209,7 +209,7 @@ sal_Bool OWizTypeSelectControl::isAutoIncrementValueEnabled() const return ((OWizTypeSelect*)GetParent())->m_bAutoIncrementEnabled; } // ----------------------------------------------------------------------------- -::rtl::OUString OWizTypeSelectControl::getAutoIncrementValue() const +OUString OWizTypeSelectControl::getAutoIncrementValue() const { return ((OWizTypeSelect*)GetParent())->m_sAutoIncrementValue; } @@ -242,7 +242,7 @@ OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream ) m_aTypeControl.Show(); m_aTypeControl.Init(); - m_etAuto.SetText(rtl::OUString("10")); + m_etAuto.SetText(OUString("10")); m_etAuto.SetDecimalDigits(0); m_pbAuto.SetClickHdl(LINK(this,OWizTypeSelect,ButtonClickHdl)); m_lbColumnNames.EnableMultiSelection(sal_True); diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index 1105aba95fc2..b20859fa6759 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -77,14 +77,14 @@ namespace dbaui } //------------------------------------------------------------------------- - OCharsetDisplay::const_iterator OCharsetDisplay::findIanaName(const ::rtl::OUString& _rIanaName) const + OCharsetDisplay::const_iterator OCharsetDisplay::findIanaName(const OUString& _rIanaName) const { OCharsetMap::const_iterator aBaseIter = OCharsetMap::find(_rIanaName, OCharsetMap::IANA()); return const_iterator( this, aBaseIter ); } //------------------------------------------------------------------------- - OCharsetDisplay::const_iterator OCharsetDisplay::findDisplayName(const ::rtl::OUString& _rDisplayName) const + OCharsetDisplay::const_iterator OCharsetDisplay::findDisplayName(const OUString& _rDisplayName) const { rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW; if ( _rDisplayName != m_aSystemDisplayName ) @@ -107,7 +107,7 @@ namespace dbaui } //------------------------------------------------------------------------- - CharsetDisplayDerefHelper::CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper_Base& _rBase, const ::rtl::OUString& _rDisplayName) + CharsetDisplayDerefHelper::CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper_Base& _rBase, const OUString& _rDisplayName) :CharsetDisplayDerefHelper_Base(_rBase) ,m_sDisplayName(_rDisplayName) { @@ -140,7 +140,7 @@ namespace dbaui rtl_TextEncoding eEncoding = (*m_aPosition).getEncoding(); return CharsetDisplayDerefHelper( *m_aPosition, - RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : (::rtl::OUString)m_pContainer->GetTextString( eEncoding ) + RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : (OUString)m_pContainer->GetTextString( eEncoding ) ); } diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 09eab6b4a648..ed788166d924 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -223,7 +223,7 @@ namespace dbaui { if ( _rData.m_xDocEventBroadcaster.is() ) { - ::rtl::OUString sEventName = _bActive ? rtl::OUString("OnFocus") : rtl::OUString("OnUnfocus"); + OUString sEventName = _bActive ? OUString("OnFocus") : OUString("OnUnfocus"); Reference< XController2 > xController( _rData.m_rController.getXController(), UNO_QUERY_THROW ); _rData.m_xDocEventBroadcaster->notifyDocumentEvent( sEventName, xController, Any() ); } @@ -299,7 +299,7 @@ namespace dbaui void FrameWindowActivationListener::impl_checkDisposed_throw() const { if ( !m_pData ) - throw DisposedException( ::rtl::OUString(), *const_cast< FrameWindowActivationListener* >( this ) ); + throw DisposedException( OUString(), *const_cast< FrameWindowActivationListener* >( this ) ); } //-------------------------------------------------------------------- diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 33013cb3887f..6f2419d5466a 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -62,7 +62,7 @@ namespace dbaui DatabaseObjectView::DatabaseObjectView( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame, - const ::rtl::OUString& _rComponentURL ) + const OUString& _rComponentURL ) :m_xORB ( _rxORB ) ,m_xParentFrame ( _rxParentFrame ) ,m_xFrameLoader ( ) @@ -85,18 +85,18 @@ namespace dbaui //---------------------------------------------------------------------- Reference< XComponent > DatabaseObjectView::createNew( const Reference< XDataSource >& _xDataSource, const ::comphelper::NamedValueCollection& i_rDispatchArgs ) { - return doCreateView( makeAny( _xDataSource ), ::rtl::OUString(), i_rDispatchArgs ); + return doCreateView( makeAny( _xDataSource ), OUString(), i_rDispatchArgs ); } //---------------------------------------------------------------------- - Reference< XComponent > DatabaseObjectView::openExisting( const Any& _rDataSource, const ::rtl::OUString& _rName, + Reference< XComponent > DatabaseObjectView::openExisting( const Any& _rDataSource, const OUString& _rName, const ::comphelper::NamedValueCollection& i_rDispatchArgs ) { return doCreateView( _rDataSource, _rName, i_rDispatchArgs ); } //---------------------------------------------------------------------- - Reference< XComponent > DatabaseObjectView::doCreateView( const Any& _rDataSource, const ::rtl::OUString& _rObjectName, + Reference< XComponent > DatabaseObjectView::doCreateView( const Any& _rDataSource, const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs ) { ::comphelper::NamedValueCollection aDispatchArgs; @@ -124,11 +124,11 @@ namespace dbaui NamedValue aProp; sal_Int32 nArg = 0; - aProp.Name = ::rtl::OUString("ParentFrame"); + aProp.Name = OUString("ParentFrame"); aProp.Value <<= m_xParentFrame; lArgs[nArg++] <<= aProp; - aProp.Name = ::rtl::OUString("TopWindow"); + aProp.Name = OUString("TopWindow"); aProp.Value <<= sal_True; lArgs[nArg++] <<= aProp; @@ -147,7 +147,7 @@ namespace dbaui Reference< XComponentLoader > xFrameLoader( m_xFrameLoader, UNO_QUERY_THROW ); xReturn = xFrameLoader->loadComponentFromURL( m_sComponentURL, - ::rtl::OUString("_self"), + OUString("_self"), 0, i_rDispatchArgs.getPropertyValues() ); @@ -164,21 +164,21 @@ namespace dbaui void DatabaseObjectView::fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const Any& _aDataSource, - const ::rtl::OUString& /* _rName */ + const OUString& /* _rName */ ) { - ::rtl::OUString sDataSource; + OUString sDataSource; Reference xDataSource; if ( _aDataSource >>= sDataSource ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_DATASOURCENAME, sDataSource ); + i_rDispatchArgs.put( (OUString)PROPERTY_DATASOURCENAME, sDataSource ); } else if ( _aDataSource >>= xDataSource ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_DATASOURCE, xDataSource ); + i_rDispatchArgs.put( (OUString)PROPERTY_DATASOURCE, xDataSource ); } - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, getConnection() ); + i_rDispatchArgs.put( (OUString)PROPERTY_ACTIVE_CONNECTION, getConnection() ); } //====================================================================== @@ -194,24 +194,24 @@ namespace dbaui //---------------------------------------------------------------------- void QueryDesigner::fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const Any& _aDataSource, - const ::rtl::OUString& _rObjectName ) + const OUString& _rObjectName ) { DatabaseObjectView::fillDispatchArgs( i_rDispatchArgs, _aDataSource, _rObjectName ); const bool bIncludeQueryName = !_rObjectName.isEmpty(); - const bool bGraphicalDesign = i_rDispatchArgs.getOrDefault( (::rtl::OUString)PROPERTY_GRAPHICAL_DESIGN, sal_True ); + const bool bGraphicalDesign = i_rDispatchArgs.getOrDefault( (OUString)PROPERTY_GRAPHICAL_DESIGN, sal_True ); const bool bEditViewAsSQLCommand = ( m_nCommandType == CommandType::TABLE ) && !bGraphicalDesign; - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_COMMAND_TYPE, m_nCommandType ); + i_rDispatchArgs.put( (OUString)PROPERTY_COMMAND_TYPE, m_nCommandType ); if ( bIncludeQueryName ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_COMMAND, _rObjectName ); + i_rDispatchArgs.put( (OUString)PROPERTY_COMMAND, _rObjectName ); } if ( bEditViewAsSQLCommand ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_ESCAPE_PROCESSING, sal_False ); + i_rDispatchArgs.put( (OUString)PROPERTY_ESCAPE_PROCESSING, sal_False ); } } @@ -220,24 +220,24 @@ namespace dbaui //====================================================================== //---------------------------------------------------------------------- TableDesigner::TableDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame ) - :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< ::rtl::OUString >( URL_COMPONENT_TABLEDESIGN ) ) + :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< OUString >( URL_COMPONENT_TABLEDESIGN ) ) { } //---------------------------------------------------------------------- void TableDesigner::fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const Any& _aDataSource, - const ::rtl::OUString& _rObjectName ) + const OUString& _rObjectName ) { DatabaseObjectView::fillDispatchArgs( i_rDispatchArgs, _aDataSource, _rObjectName ); if ( !_rObjectName.isEmpty() ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_CURRENTTABLE, _rObjectName ); + i_rDispatchArgs.put( (OUString)PROPERTY_CURRENTTABLE, _rObjectName ); } } //---------------------------------------------------------------------- - Reference< XComponent > TableDesigner::doCreateView( const Any& _rDataSource, const ::rtl::OUString& _rObjectName, + Reference< XComponent > TableDesigner::doCreateView( const Any& _rDataSource, const OUString& _rObjectName, const ::comphelper::NamedValueCollection& i_rCreationArgs ) { bool bIsNewDesign = _rObjectName.isEmpty(); @@ -265,7 +265,7 @@ namespace dbaui } //---------------------------------------------------------------------- - Reference< XInterface > TableDesigner::impl_getConnectionProvidedDesigner_nothrow( const ::rtl::OUString& _rTableName ) + Reference< XInterface > TableDesigner::impl_getConnectionProvidedDesigner_nothrow( const OUString& _rTableName ) { Reference< XInterface > xDesigner; try @@ -287,32 +287,32 @@ namespace dbaui //---------------------------------------------------------------------- ResultSetBrowser::ResultSetBrowser( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame, sal_Bool _bTable ) - :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast < ::rtl::OUString >( URL_COMPONENT_DATASOURCEBROWSER ) ) + :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast < OUString >( URL_COMPONENT_DATASOURCEBROWSER ) ) ,m_bTable(_bTable) { } //---------------------------------------------------------------------- void ResultSetBrowser::fillDispatchArgs( ::comphelper::NamedValueCollection& i_rDispatchArgs, const Any& _aDataSource, - const ::rtl::OUString& _rQualifiedName) + const OUString& _rQualifiedName) { DatabaseObjectView::fillDispatchArgs( i_rDispatchArgs, _aDataSource, _rQualifiedName ); OSL_ENSURE( !_rQualifiedName.isEmpty(),"A Table name must be set"); - ::rtl::OUString sCatalog; - ::rtl::OUString sSchema; - ::rtl::OUString sTable; + OUString sCatalog; + OUString sSchema; + OUString sTable; if ( m_bTable ) ::dbtools::qualifiedNameComponents( getConnection()->getMetaData(), _rQualifiedName, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation ); - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_COMMAND_TYPE, (m_bTable ? CommandType::TABLE : CommandType::QUERY) ); - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_COMMAND, _rQualifiedName ); - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_ENABLE_BROWSER, sal_False ); + i_rDispatchArgs.put( (OUString)PROPERTY_COMMAND_TYPE, (m_bTable ? CommandType::TABLE : CommandType::QUERY) ); + i_rDispatchArgs.put( (OUString)PROPERTY_COMMAND, _rQualifiedName ); + i_rDispatchArgs.put( (OUString)PROPERTY_ENABLE_BROWSER, sal_False ); if ( m_bTable ) { - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_UPDATE_CATALOGNAME, sCatalog ); - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_UPDATE_SCHEMANAME, sSchema ); - i_rDispatchArgs.put( (::rtl::OUString)PROPERTY_UPDATE_TABLENAME, sTable ); + i_rDispatchArgs.put( (OUString)PROPERTY_UPDATE_CATALOGNAME, sCatalog ); + i_rDispatchArgs.put( (OUString)PROPERTY_UPDATE_SCHEMANAME, sSchema ); + i_rDispatchArgs.put( (OUString)PROPERTY_UPDATE_TABLENAME, sTable ); } } @@ -321,7 +321,7 @@ namespace dbaui //====================================================================== //---------------------------------------------------------------------- RelationDesigner::RelationDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame ) - :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< ::rtl::OUString >( URL_COMPONENT_RELATIONDESIGN ) ) + :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< OUString >( URL_COMPONENT_RELATIONDESIGN ) ) { } // ......................................................................... diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index ee1905f727c4..1f4ec63bcbdc 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -71,7 +71,7 @@ namespace dbaui //--------------------------------------------------------------------- ODatasourceConnector::ODatasourceConnector( const Reference< XComponentContext >& _rxContext, Window* _pMessageParent, - const ::rtl::OUString& _rContextInformation ) + const OUString& _rContextInformation ) :m_pErrorMessageParent(_pMessageParent) ,m_xContext(_rxContext) ,m_sContextInformation( _rContextInformation ) @@ -79,7 +79,7 @@ namespace dbaui } //--------------------------------------------------------------------- - Reference< XConnection > ODatasourceConnector::connect( const ::rtl::OUString& _rDataSourceName, + Reference< XConnection > ODatasourceConnector::connect( const OUString& _rDataSourceName, ::dbtools::SQLExceptionInfo* _pErrorInfo ) const { Reference< XConnection > xConnection; @@ -110,7 +110,7 @@ namespace dbaui return xConnection; // get user/password - ::rtl::OUString sPassword, sUser; + OUString sPassword, sUser; sal_Bool bPwdRequired = sal_False; Reference xProp(_xDataSource,UNO_QUERY); try diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx index 83d2c30a7252..5bf932b55e98 100644 --- a/dbaccess/source/ui/misc/dbaundomanager.cxx +++ b/dbaccess/source/ui/misc/dbaundomanager.cxx @@ -143,7 +143,7 @@ namespace dbaui { // throw if the instance is already disposed if ( i_impl.bDisposed ) - throw DisposedException( ::rtl::OUString(), i_impl.getThis() ); + throw DisposedException( OUString(), i_impl.getThis() ); } virtual ~UndoManagerMethodGuard() { @@ -222,7 +222,7 @@ namespace dbaui } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL UndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException) + void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->aUndoHelper.enterUndoContext( i_title, aGuard ); @@ -282,28 +282,28 @@ namespace dbaui } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getCurrentUndoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getCurrentRedoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getAllUndoActionTitles(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->aUndoHelper.getAllRedoActionTitles(); @@ -376,7 +376,7 @@ namespace dbaui void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) { (void)i_parent; - throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() ); + throw NoSupportException( OUString(), m_pImpl->getThis() ); } //...................................................................................................................... diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 7fc12d00b3be..79266604fbb8 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -136,7 +136,7 @@ namespace dbaui SharedConnection m_xConnection; ::dbtools::DatabaseMetaData m_aSdbMetaData; // - ::rtl::OUString m_sDataSourceName; // the data source we're working for + OUString m_sDataSourceName; // the data source we're working for DataSourceHolder m_aDataSource; Reference< XModel > m_xDocument; Reference< XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier @@ -195,7 +195,7 @@ namespace dbaui const ::comphelper::NamedValueCollection& rArguments( getInitParams() ); Reference< XConnection > xConnection; - xConnection = rArguments.getOrDefault( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, xConnection ); + xConnection = rArguments.getOrDefault( (OUString)PROPERTY_ACTIVE_CONNECTION, xConnection ); if ( !xConnection.is() ) ::dbtools::isEmbeddedInDatabase( getModel(), xConnection ); @@ -390,7 +390,7 @@ namespace dbaui } //-------------------------------------------------------------------- - void DBSubComponentController::appendError( const ::rtl::OUString& _rErrorMessage, const ::dbtools::StandardSQLState _eSQLState, + void DBSubComponentController::appendError( const OUString& _rErrorMessage, const ::dbtools::StandardSQLState _eSQLState, const sal_Int32 _nErrorCode ) { m_pImpl->m_aCurrentError.append( ::dbtools::SQLExceptionInfo::SQL_EXCEPTION, _rErrorMessage, getStandardSQLStateAscii( _eSQLState ), @@ -465,9 +465,9 @@ namespace dbaui } // ----------------------------------------------------------------------------- - ::rtl::OUString DBSubComponentController::getDataSourceName() const + OUString DBSubComponentController::getDataSourceName() const { - ::rtl::OUString sName; + OUString sName; Reference< XPropertySet > xDataSourceProps( m_pImpl->m_aDataSource.getDataSourceProps() ); if ( xDataSourceProps.is() ) xDataSourceProps->getPropertyValue(PROPERTY_NAME) >>= sName; @@ -569,14 +569,14 @@ namespace dbaui } // ----------------------------------------------------------------------------- // XTitle - ::rtl::OUString SAL_CALL DBSubComponentController::getTitle() + OUString SAL_CALL DBSubComponentController::getTitle() throw (RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); if ( m_bExternalTitle ) return impl_getTitleHelper_throw()->getTitle (); - ::rtl::OUStringBuffer sTitle; + OUStringBuffer sTitle; Reference< XTitle > xTitle(getPrivateModel(),UNO_QUERY); if ( xTitle.is() ) { diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index 019f112d2d12..f0d03d973776 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -72,7 +72,7 @@ namespace dbaui //==================================================================== namespace { - void lcl_fillNameExistsError( const ::rtl::OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay ) + void lcl_fillNameExistsError( const OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay ) { String sErrorMessage = String( ModuleRes( STR_NAMED_OBJECT_ALREADY_EXISTS ) ); sErrorMessage.SearchAndReplaceAllAscii( "$#$", _rObjectName ); @@ -89,14 +89,14 @@ namespace dbaui struct HierarchicalNameCheck_Impl { Reference< XHierarchicalNameAccess > xHierarchicalNames; - ::rtl::OUString sRelativeRoot; + OUString sRelativeRoot; }; //==================================================================== //= HierarchicalNameCheck //==================================================================== //-------------------------------------------------------------------- - HierarchicalNameCheck::HierarchicalNameCheck( const Reference< XHierarchicalNameAccess >& _rxNames, const ::rtl::OUString& _rRelativeRoot ) + HierarchicalNameCheck::HierarchicalNameCheck( const Reference< XHierarchicalNameAccess >& _rxNames, const OUString& _rRelativeRoot ) :m_pImpl( new HierarchicalNameCheck_Impl ) { m_pImpl->xHierarchicalNames = _rxNames; @@ -112,11 +112,11 @@ namespace dbaui } //-------------------------------------------------------------------- - bool HierarchicalNameCheck::isNameValid( const ::rtl::OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay ) const + bool HierarchicalNameCheck::isNameValid( const OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay ) const { try { - ::rtl::OUStringBuffer aCompleteName; + OUStringBuffer aCompleteName; if ( !m_pImpl->sRelativeRoot.isEmpty() ) { aCompleteName.append( m_pImpl->sRelativeRoot ); @@ -124,7 +124,7 @@ namespace dbaui } aCompleteName.append( _rObjectName ); - ::rtl::OUString sCompleteName( aCompleteName.makeStringAndClear() ); + OUString sCompleteName( aCompleteName.makeStringAndClear() ); if ( !m_pImpl->xHierarchicalNames->hasByHierarchicalName( sCompleteName ) ) return true; } @@ -170,7 +170,7 @@ namespace dbaui } //-------------------------------------------------------------------- - bool DynamicTableOrQueryNameCheck::isNameValid( const ::rtl::OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay ) const + bool DynamicTableOrQueryNameCheck::isNameValid( const OUString& _rObjectName, ::dbtools::SQLExceptionInfo& _out_rErrorToDisplay ) const { try { diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index d03a803c0f04..aae855ab0d41 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -90,15 +90,15 @@ namespace dbaui } //-------------------------------------------------------------------- - static const FeatureSet& lcl_getFeatureSet( const ::rtl::OUString _rURL ) + static const FeatureSet& lcl_getFeatureSet( const OUString _rURL ) { - typedef ::std::map< ::rtl::OUString, FeatureSet, ::comphelper::UStringLess > FeatureSets; + typedef ::std::map< OUString, FeatureSet, ::comphelper::UStringLess > FeatureSets; static FeatureSets s_aFeatureSets; if ( s_aFeatureSets.empty() ) { ::connectivity::DriversConfig aDriverConfig( ::comphelper::getProcessComponentContext() ); - const uno::Sequence< ::rtl::OUString > aPatterns = aDriverConfig.getURLs(); - for ( const ::rtl::OUString* pattern = aPatterns.getConstArray(); + const uno::Sequence< OUString > aPatterns = aDriverConfig.getURLs(); + for ( const OUString* pattern = aPatterns.getConstArray(); pattern != aPatterns.getConstArray() + aPatterns.getLength(); ++pattern ) @@ -123,22 +123,22 @@ namespace dbaui } //-------------------------------------------------------------------- - static AuthenticationMode getAuthenticationMode( const ::rtl::OUString& _sURL ) + static AuthenticationMode getAuthenticationMode( const OUString& _sURL ) { static std::map< OUString, FeatureSupport > s_aSupport; if ( s_aSupport.empty() ) { ::connectivity::DriversConfig aDriverConfig(::comphelper::getProcessComponentContext()); - const uno::Sequence< ::rtl::OUString > aURLs = aDriverConfig.getURLs(); - const ::rtl::OUString* pIter = aURLs.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aURLs.getLength(); + const uno::Sequence< OUString > aURLs = aDriverConfig.getURLs(); + const OUString* pIter = aURLs.getConstArray(); + const OUString* pEnd = pIter + aURLs.getLength(); for(;pIter != pEnd;++pIter) { FeatureSupport aInit( AuthNone ); const ::comphelper::NamedValueCollection& aMetaData = aDriverConfig.getMetaData(*pIter); if ( aMetaData.has("Authentication") ) { - ::rtl::OUString sAuth; + OUString sAuth; aMetaData.get("Authentication") >>= sAuth; if ( sAuth == "UserPassword" ) aInit = AuthUserPwd; @@ -158,16 +158,16 @@ namespace dbaui class DataSourceMetaData_Impl { public: - DataSourceMetaData_Impl( const ::rtl::OUString& _sURL ); + DataSourceMetaData_Impl( const OUString& _sURL ); - inline ::rtl::OUString getType() const { return m_sURL; } + inline OUString getType() const { return m_sURL; } private: - const ::rtl::OUString m_sURL; + const OUString m_sURL; }; //-------------------------------------------------------------------- - DataSourceMetaData_Impl::DataSourceMetaData_Impl( const ::rtl::OUString& _sURL ) + DataSourceMetaData_Impl::DataSourceMetaData_Impl( const OUString& _sURL ) :m_sURL( _sURL ) { } @@ -176,7 +176,7 @@ namespace dbaui //= DataSourceMetaData //==================================================================== //-------------------------------------------------------------------- - DataSourceMetaData::DataSourceMetaData( const ::rtl::OUString& _sURL ) + DataSourceMetaData::DataSourceMetaData( const OUString& _sURL ) :m_pImpl( new DataSourceMetaData_Impl( _sURL ) ) { } @@ -193,7 +193,7 @@ namespace dbaui } //-------------------------------------------------------------------- - AuthenticationMode DataSourceMetaData::getAuthentication( const ::rtl::OUString& _sURL ) + AuthenticationMode DataSourceMetaData::getAuthentication( const OUString& _sURL ) { return getAuthenticationMode( _sURL ); } diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 293775ca7cd8..f23f9c32680b 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -68,7 +68,7 @@ namespace dbaui { //................................................................ static void lcl_getConnectionProvidedTableIcon_nothrow( const ImageProvider_Data& _rData, - const ::rtl::OUString& _rName, Reference< XGraphic >& _out_rxGraphic ) + const OUString& _rName, Reference< XGraphic >& _out_rxGraphic ) { try { @@ -82,7 +82,7 @@ namespace dbaui } //................................................................ - static void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const ::rtl::OUString& _rName, + static void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const OUString& _rName, sal_uInt16& _out_rResourceID) { _out_rResourceID = 0; diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index 82deb2502ae2..b8e3db0c1fc2 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -78,7 +78,7 @@ namespace dbaui //------------------------------------------------------------------ Indexes::const_iterator OIndexCollection::find(const String& _rName) const { - ::rtl::OUString sNameCompare(_rName); + OUString sNameCompare(_rName); // loop'n'compare Indexes::const_iterator aSearch = m_aIndexes.begin(); @@ -93,7 +93,7 @@ namespace dbaui //------------------------------------------------------------------ Indexes::iterator OIndexCollection::find(const String& _rName) { - ::rtl::OUString sNameCompare(_rName); + OUString sNameCompare(_rName); // loop'n'compare Indexes::iterator aSearch = m_aIndexes.begin(); @@ -108,7 +108,7 @@ namespace dbaui //------------------------------------------------------------------ Indexes::const_iterator OIndexCollection::findOriginal(const String& _rName) const { - ::rtl::OUString sNameCompare(_rName); + OUString sNameCompare(_rName); // loop'n'compare Indexes::const_iterator aSearch = m_aIndexes.begin(); @@ -123,7 +123,7 @@ namespace dbaui //------------------------------------------------------------------ Indexes::iterator OIndexCollection::findOriginal(const String& _rName) { - ::rtl::OUString sNameCompare(_rName); + OUString sNameCompare(_rName); // loop'n'compare Indexes::iterator aSearch = m_aIndexes.begin(); @@ -165,9 +165,9 @@ namespace dbaui } // set the properties - static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString("IsUnique"); - static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString("IsAscending"); - static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString("Name"); + static const OUString s_sUniquePropertyName = OUString("IsUnique"); + static const OUString s_sSortPropertyName = OUString("IsAscending"); + static const OUString s_sNamePropertyName = OUString("Name"); // the index' own props xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, ::cppu::bool2any(_rPos->bUnique)); xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName)); @@ -185,7 +185,7 @@ namespace dbaui if (xColDescriptor.is()) { xColDescriptor->setPropertyValue(s_sSortPropertyName, ::cppu::bool2any(aFieldLoop->bSortAscending)); - xColDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(::rtl::OUString(aFieldLoop->sFieldName))); + xColDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(OUString(aFieldLoop->sFieldName))); xAppendCols->appendByDescriptor(xColDescriptor); } } @@ -271,10 +271,10 @@ namespace dbaui //------------------------------------------------------------------ void OIndexCollection::implFillIndexInfo(OIndex& _rIndex, Reference< XPropertySet > _rxDescriptor) SAL_THROW((Exception)) { - static const ::rtl::OUString s_sPrimaryIndexPropertyName = ::rtl::OUString("IsPrimaryKeyIndex"); - static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString("IsUnique"); - static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString("IsAscending"); - static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString("Catalog"); + static const OUString s_sPrimaryIndexPropertyName = OUString("IsPrimaryKeyIndex"); + static const OUString s_sUniquePropertyName = OUString("IsUnique"); + static const OUString s_sSortPropertyName = OUString("IsAscending"); + static const OUString s_sCatalogPropertyName = OUString("Catalog"); _rIndex.bPrimaryKey = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sPrimaryIndexPropertyName)); _rIndex.bUnique = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sUniquePropertyName)); @@ -288,11 +288,11 @@ namespace dbaui OSL_ENSURE(xCols.is(), "OIndexCollection::implFillIndexInfo: the index does not have columns!"); if (xCols.is()) { - Sequence< ::rtl::OUString > aFieldNames = xCols->getElementNames(); + Sequence< OUString > aFieldNames = xCols->getElementNames(); _rIndex.aFields.resize(aFieldNames.getLength()); - const ::rtl::OUString* pFieldNames = aFieldNames.getConstArray(); - const ::rtl::OUString* pFieldNamesEnd = pFieldNames + aFieldNames.getLength(); + const OUString* pFieldNames = aFieldNames.getConstArray(); + const OUString* pFieldNamesEnd = pFieldNames + aFieldNames.getLength(); IndexFields::iterator aCopyTo = _rIndex.aFields.begin(); Reference< XPropertySet > xIndexColumn; @@ -362,9 +362,9 @@ namespace dbaui if (m_xIndexes.is()) { // loop through all the indexes - Sequence< ::rtl::OUString > aNames = m_xIndexes->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames = m_xIndexes->getElementNames(); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for (; pNames < pEnd; ++pNames) { // extract the index object diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 0f6a854ac524..476633299004 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -114,7 +114,7 @@ namespace dbaui //------------------------------------------------------------------ OLinkedDocumentsAccess::OLinkedDocumentsAccess( Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, const Reference< XComponentContext >& _rxContext, const Reference< XNameAccess >& _rxContainer, - const Reference< XConnection>& _xConnection, const ::rtl::OUString& _sDataSourceName ) + const Reference< XConnection>& _xConnection, const OUString& _sDataSourceName ) :m_xContext(_rxContext) ,m_xDocumentContainer(_rxContainer) ,m_xConnection(_xConnection) @@ -132,7 +132,7 @@ namespace dbaui DBG_DTOR(OLinkedDocumentsAccess,NULL); } //------------------------------------------------------------------ - Reference< XComponent> OLinkedDocumentsAccess::impl_open( const ::rtl::OUString& _rLinkName, Reference< XComponent >& _xDefinition, + Reference< XComponent> OLinkedDocumentsAccess::impl_open( const OUString& _rLinkName, Reference< XComponent >& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs ) { Reference< XComponent> xRet; @@ -144,11 +144,11 @@ namespace dbaui WaitObject aWaitCursor( m_pDialogParent ); ::comphelper::NamedValueCollection aArguments; - ::rtl::OUString sOpenMode; + OUString sOpenMode; switch ( _eOpenMode ) { case E_OPEN_NORMAL: - sOpenMode = ::rtl::OUString( "open" ); + sOpenMode = OUString( "open" ); break; case E_OPEN_FOR_MAIL: @@ -156,7 +156,7 @@ namespace dbaui // fall through case E_OPEN_DESIGN: - sOpenMode = ::rtl::OUString( "openDesign" ); + sOpenMode = OUString( "openDesign" ); break; default: @@ -165,7 +165,7 @@ namespace dbaui } aArguments.put( "OpenMode", sOpenMode ); - aArguments.put( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); + aArguments.put( (OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); try { Reference xHier(m_xDocumentContainer,UNO_QUERY); @@ -176,7 +176,7 @@ namespace dbaui aArguments.merge( _rAdditionalArgs, true ); - xRet = xComponentLoader->loadComponentFromURL( _rLinkName, ::rtl::OUString(), 0, aArguments.getPropertyValues() ); + xRet = xComponentLoader->loadComponentFromURL( _rLinkName, OUString(), 0, aArguments.getPropertyValues() ); } catch(const Exception&) { @@ -187,7 +187,7 @@ namespace dbaui } //------------------------------------------------------------------ void OLinkedDocumentsAccess::impl_newWithPilot( const char* _pWizardService, - const sal_Int32 _nCommandType, const ::rtl::OUString& _rObjectName ) + const sal_Int32 _nCommandType, const OUString& _rObjectName ) { try { @@ -209,13 +209,13 @@ namespace dbaui { WaitObject aWaitCursor( m_pDialogParent ); xWizard.set( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - ::rtl::OUString::createFromAscii( _pWizardService ), + OUString::createFromAscii( _pWizardService ), aArgs.getWrappedPropertyValues(), m_xContext ), UNO_QUERY_THROW ); } - xWizard->trigger( ::rtl::OUString( "start" ) ); + xWizard->trigger( OUString( "start" ) ); ::comphelper::disposeComponent( xWizard ); } catch(const Exception&) @@ -224,25 +224,25 @@ namespace dbaui } } //------------------------------------------------------------------ - void OLinkedDocumentsAccess::newFormWithPilot( const sal_Int32 _nCommandType,const ::rtl::OUString& _rObjectName ) + void OLinkedDocumentsAccess::newFormWithPilot( const sal_Int32 _nCommandType,const OUString& _rObjectName ) { impl_newWithPilot( "com.sun.star.wizards.form.CallFormWizard", _nCommandType, _rObjectName ); } //------------------------------------------------------------------ - void OLinkedDocumentsAccess::newReportWithPilot( const sal_Int32 _nCommandType, const ::rtl::OUString& _rObjectName ) + void OLinkedDocumentsAccess::newReportWithPilot( const sal_Int32 _nCommandType, const OUString& _rObjectName ) { impl_newWithPilot( "com.sun.star.wizards.report.CallReportWizard", _nCommandType, _rObjectName ); } //------------------------------------------------------------------ void OLinkedDocumentsAccess::newTableWithPilot() { - impl_newWithPilot( "com.sun.star.wizards.table.CallTableWizard", -1, ::rtl::OUString() ); + impl_newWithPilot( "com.sun.star.wizards.table.CallTableWizard", -1, OUString() ); } //------------------------------------------------------------------ void OLinkedDocumentsAccess::newQueryWithPilot() { - impl_newWithPilot( "com.sun.star.wizards.query.CallQueryWizard", -1, ::rtl::OUString() ); + impl_newWithPilot( "com.sun.star.wizards.query.CallQueryWizard", -1, OUString() ); } //------------------------------------------------------------------ Reference< XComponent > OLinkedDocumentsAccess::newDocument( sal_Int32 i_nActionID, @@ -293,7 +293,7 @@ namespace dbaui ::comphelper::NamedValueCollection aCreationArgs( i_rCreationArgs ); if ( aClassId.getLength() ) aCreationArgs.put( "ClassID", aClassId ); - aCreationArgs.put( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); + aCreationArgs.put( (OUString)PROPERTY_ACTIVE_CONNECTION, m_xConnection ); // separate values which are real creation args from args relevant for opening the doc ::comphelper::NamedValueCollection aCommandArgs; @@ -317,7 +317,7 @@ namespace dbaui aCommandArgs.put( "OpenMode", aOpenModeArg ); Command aCommand; - aCommand.Name = ::rtl::OUString( "openDesign" ); + aCommand.Name = OUString( "openDesign" ); aCommand.Argument <<= aCommandArgs.getPropertyValues(); WaitObject aWaitCursor( m_pDialogParent ); xNewDocument.set( xContent->execute( aCommand, xContent->createCommandIdentifier(), NULL ), UNO_QUERY ); @@ -332,7 +332,7 @@ namespace dbaui } //------------------------------------------------------------------ - Reference< XComponent > OLinkedDocumentsAccess::open( const ::rtl::OUString& _rLinkName, Reference< XComponent >& _xDefinition, + Reference< XComponent > OLinkedDocumentsAccess::open( const OUString& _rLinkName, Reference< XComponent >& _xDefinition, ElementOpenMode _eOpenMode, const ::comphelper::NamedValueCollection& _rAdditionalArgs ) { dbtools::SQLExceptionInfo aInfo; @@ -379,7 +379,7 @@ namespace dbaui aInfo = dbtools::SQLExceptionInfo(aSQLException); // more like a hack, insert an empty message - aInfo.prepend(::rtl::OUString(" \n")); + aInfo.prepend(OUString(" \n")); String sMessage = String(ModuleRes(STR_COULDNOTOPEN_LINKEDDOC)); sMessage.SearchAndReplaceAscii("$file$",_rLinkName); diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index c48e3893eadb..de79c6cc95d6 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -97,7 +97,7 @@ namespace dbaui // try some known item types if ( ItemAdapter< SfxBoolItem, sal_Bool >::tryGet( rItem, _out_rValue ) - || ItemAdapter< SfxStringItem, ::rtl::OUString >::tryGet( rItem, _out_rValue ) + || ItemAdapter< SfxStringItem, OUString >::tryGet( rItem, _out_rValue ) ) return; @@ -109,7 +109,7 @@ namespace dbaui { // try some known item types if ( ItemAdapter< SfxBoolItem, sal_Bool >::trySet( m_rItemSet, m_nItemID, _rValue ) - || ItemAdapter< SfxStringItem, ::rtl::OUString >::trySet( m_rItemSet, m_nItemID, _rValue ) + || ItemAdapter< SfxStringItem, OUString >::trySet( m_rItemSet, m_nItemID, _rValue ) ) return; diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index 8dc0672c0288..ce334f466ca1 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::uno; //========================================================================= TYPEINIT1(OStringListItem, SfxPoolItem); //------------------------------------------------------------------------- -OStringListItem::OStringListItem(sal_Int16 _nWhich, const Sequence< ::rtl::OUString >& _rList) +OStringListItem::OStringListItem(sal_Int16 _nWhich, const Sequence< OUString >& _rList) :SfxPoolItem(_nWhich) ,m_aList(_rList) { @@ -53,8 +53,8 @@ int OStringListItem::operator==(const SfxPoolItem& _rItem) const return 0; // compare all strings individually - const ::rtl::OUString* pMyStrings = m_aList.getConstArray(); - const ::rtl::OUString* pCompareStrings = pCompare->m_aList.getConstArray(); + const OUString* pMyStrings = m_aList.getConstArray(); + const OUString* pCompareStrings = pCompare->m_aList.getConstArray(); for (sal_Int32 i=0; iequals(*pCompareStrings)) diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 81fe7ba766b4..e647c18c2a06 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -108,7 +108,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbu_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dbaui::OModuleRegistration::getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), + OUString::createFromAscii(pImplementationName), static_cast< XMultiServiceFactory* >(pServiceManager)); } diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 765a240dcb7c..9394263a19c2 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -60,16 +60,16 @@ namespace dbaui return ::comphelper::concatSequences(VCLXAccessibleComponent::getTypes(),OConnectionLineAccess_BASE::getTypes()); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OConnectionLineAccess::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OConnectionLineAccess::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- // XServiceInfo - static methods // ----------------------------------------------------------------------------- - ::rtl::OUString OConnectionLineAccess::getImplementationName_Static(void) throw( RuntimeException ) + OUString OConnectionLineAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.dbu.ConnectionLineAccessibility"); + return OUString("org.openoffice.comp.dbu.ConnectionLineAccessibility"); } // ----------------------------------------------------------------------------- // XAccessibleContext @@ -106,9 +106,9 @@ namespace dbaui return AccessibleRole::UNKNOWN; // ? or may be an AccessibleRole::WINDOW } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription( ) throw (RuntimeException) { - static ::rtl::OUString sDescription("Relation"); + static OUString sDescription("Relation"); return sDescription; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx index dc19797e207b..cf093e6c5f8d 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx @@ -33,7 +33,7 @@ OConnectionLineData::OConnectionLineData() } //------------------------------------------------------------------------ -OConnectionLineData::OConnectionLineData( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName ) +OConnectionLineData::OConnectionLineData( const OUString& rSourceFieldName, const OUString& rDestFieldName ) :m_aSourceFieldName( rSourceFieldName ) ,m_aDestFieldName( rDestFieldName ) { @@ -76,7 +76,7 @@ OConnectionLineData& OConnectionLineData::operator=( const OConnectionLineData& //------------------------------------------------------------------------ bool OConnectionLineData::Reset() { - m_aDestFieldName = m_aSourceFieldName = ::rtl::OUString(); + m_aDestFieldName = m_aSourceFieldName = OUString(); return true; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 37e1e260a384..24352c73db97 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -38,14 +38,14 @@ namespace dbaui { } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OJoinDesignViewAccess::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OJoinDesignViewAccess::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- - ::rtl::OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw( RuntimeException ) + OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.dbu.JoinViewAccessibility"); + return OUString("org.openoffice.comp.dbu.JoinViewAccessibility"); } // ----------------------------------------------------------------------------- void OJoinDesignViewAccess::clearTableView() diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 4bc0556f2be3..89b192ac158b 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -394,7 +394,7 @@ void OJoinController::loadTableWindow( const ::comphelper::NamedValueCollection& { sal_Int32 nX = -1, nY = -1, nHeight = -1, nWidth = -1; - ::rtl::OUString sComposedName,sTableName,sWindowName; + OUString sComposedName,sTableName,sWindowName; sal_Bool bShowAll = false; sComposedName = i_rTableWindowSettings.getOrDefault( "ComposedName", sComposedName ); @@ -440,7 +440,7 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV aWindowData.put( "WindowHeight", static_cast((*aIter)->GetSize().Height()) ); aWindowData.put( "ShowAll", (*aIter)->IsShowAll() ); - const ::rtl::OUString sTableName( ::rtl::OUString( "Table" ) + ::rtl::OUString::valueOf( i ) ); + const OUString sTableName( OUString( "Table" ) + OUString::valueOf( i ) ); aAllTablesData.put( sTableName, aWindowData.getPropertyValues() ); } @@ -448,7 +448,7 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV } } // ----------------------------------------------------------------------------- -TTableWindowData::value_type OJoinController::createTableWindowData(const ::rtl::OUString& _sComposedName,const ::rtl::OUString& _sTableName,const ::rtl::OUString& _sWindowName) +TTableWindowData::value_type OJoinController::createTableWindowData(const OUString& _sComposedName,const OUString& _sTableName,const OUString& _sWindowName) { OJoinDesignView* pView = getJoinView(); if( pView ) diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 4802ed8055c5..ebe877782c34 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -284,9 +284,9 @@ OTableWindow* OJoinTableView::GetTabWindow( const String& rName ) return aIter == m_aTableMap.end() ? NULL : aIter->second; } // ----------------------------------------------------------------------------- -TTableWindowData::value_type OJoinTableView::createTableWindowData(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName) +TTableWindowData::value_type OJoinTableView::createTableWindowData(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName) { TTableWindowData::value_type pData( CreateImpl(_rComposedName, _sTableName,_rWinName) ); OJoinDesignView* pParent = getDesignView(); @@ -318,14 +318,14 @@ TTableWindowData::value_type OJoinTableView::createTableWindowData(const ::rtl:: return pData; } // ----------------------------------------------------------------------------- -OTableWindowData* OJoinTableView::CreateImpl(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName) +OTableWindowData* OJoinTableView::CreateImpl(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName) { return new OTableWindowData( NULL,_rComposedName,_sTableName, _rWinName ); } //------------------------------------------------------------------------------ -void OJoinTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool /*bNewTable*/) +void OJoinTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool /*bNewTable*/) { DBG_CHKTHIS(OJoinTableView,NULL); OSL_ENSURE(!_rComposedName.isEmpty(),"There must be a table name supplied!"); diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx index 4167d1afaa67..728bd4dc0a79 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx @@ -38,7 +38,7 @@ namespace dbaui OQueryTableConnection& operator=(const OQueryTableConnection& rConn); sal_Bool operator==(const OQueryTableConnection& rCompare); - inline ::rtl::OUString GetAliasName(EConnectionSide nWhich) const { return static_cast(GetData().get())->GetAliasName(nWhich); } + inline OUString GetAliasName(EConnectionSide nWhich) const { return static_cast(GetData().get())->GetAliasName(nWhich); } inline sal_Bool IsVisited() const { return m_bVisited; } inline void SetVisited(sal_Bool bVisited) { m_bVisited = bVisited; } diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx index f482d406d81c..314fda96ba0a 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx @@ -53,7 +53,7 @@ OQueryTableConnectionData::OQueryTableConnectionData( const OQueryTableConnectio //------------------------------------------------------------------------ OQueryTableConnectionData::OQueryTableConnectionData(const TTableWindowData::value_type& _pReferencingTable ,const TTableWindowData::value_type& _pReferencedTable - ,const ::rtl::OUString& rConnName) + ,const OUString& rConnName) :OTableConnectionData( _pReferencingTable,_pReferencedTable, rConnName ) ,m_nFromEntryIndex(0) ,m_nDestEntryIndex(0) @@ -115,7 +115,7 @@ OQueryTableConnectionData& OQueryTableConnectionData::operator=(const OQueryTabl } //------------------------------------------------------------------------------ -::rtl::OUString OQueryTableConnectionData::GetAliasName(EConnectionSide nWhich) const +OUString OQueryTableConnectionData::GetAliasName(EConnectionSide nWhich) const { DBG_CHKTHIS(OQueryTableConnectionData,NULL); return nWhich == JTCS_FROM ? m_pReferencingTable->GetWinName() : m_pReferencedTable->GetWinName(); @@ -140,7 +140,7 @@ void OQueryTableConnectionData::InitFromDrag(const OTableFieldDescRef& rDragLeft SetFieldType(JTCS_FROM, rDragLeft->GetFieldType()); SetFieldType(JTCS_TO, rDragRight->GetFieldType()); - AppendConnLine((::rtl::OUString)rDragLeft->GetField(),(::rtl::OUString)rDragRight->GetField()); + AppendConnLine((OUString)rDragLeft->GetField(),(OUString)rDragRight->GetField()); } // ----------------------------------------------------------------------------- OTableConnectionData* OQueryTableConnectionData::NewInstance() const diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx index 8f8721587ac1..94be02c2c50c 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx @@ -46,7 +46,7 @@ namespace dbaui OQueryTableConnectionData(); OQueryTableConnectionData( const OQueryTableConnectionData& rConnData ); OQueryTableConnectionData( const TTableWindowData::value_type& _pReferencingTable,const TTableWindowData::value_type& _pReferencedTable, - const ::rtl::OUString& rConnName=::rtl::OUString()); + const OUString& rConnName=OUString()); virtual ~OQueryTableConnectionData(); virtual void CopyFrom(const OTableConnectionData& rSource); @@ -59,7 +59,7 @@ namespace dbaui */ virtual sal_Bool Update(); - ::rtl::OUString GetAliasName(EConnectionSide nWhich) const; + OUString GetAliasName(EConnectionSide nWhich) const; sal_Int32 GetFieldIndex(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_nDestEntryIndex : m_nFromEntryIndex; } void SetFieldIndex(EConnectionSide nWhich, sal_Int32 nVal) { if (nWhich==JTCS_TO) m_nDestEntryIndex=nVal; else m_nFromEntryIndex=nVal; } diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 953cdfaa0da4..3e890c8550cf 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -59,14 +59,14 @@ OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::v { DBG_CTOR(OQueryTableWindow,NULL); if (pszInitialAlias != NULL) - m_strInitialAlias = ::rtl::OUString(pszInitialAlias); + m_strInitialAlias = OUString(pszInitialAlias); else m_strInitialAlias = GetAliasName(); // if table name matches alias, do not pass to InitialAlias, // as the appending of a possible token could not succeed... if (m_strInitialAlias == pTabWinData->GetTableName()) - m_strInitialAlias = ::rtl::OUString(); + m_strInitialAlias = OUString(); SetHelpId(HID_CTL_QRYDGNTAB); } @@ -87,7 +87,7 @@ sal_Bool OQueryTableWindow::Init() OQueryTableView* pContainer = static_cast(getTableView()); // first determine Alias - ::rtl::OUString sAliasName; + OUString sAliasName; TTableWindowData::value_type pWinData = GetData(); @@ -102,8 +102,8 @@ sal_Bool OQueryTableWindow::Init() // Alias with successive number if (pContainer->CountTableAlias(sAliasName, m_nAliasNum)) { - sAliasName += ::rtl::OUString('_'); - sAliasName += ::rtl::OUString::valueOf(m_nAliasNum); + sAliasName += OUString('_'); + sAliasName += OUString::valueOf(m_nAliasNum); } @@ -174,7 +174,7 @@ void OQueryTableWindow::OnEntryDoubleClicked(SvTreeListEntry* pEntry) } //------------------------------------------------------------------------------ -sal_Bool OQueryTableWindow::ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo) +sal_Bool OQueryTableWindow::ExistsField(const OUString& strFieldName, OTableFieldDescRef& rInfo) { OSL_ENSURE(m_pListBox != NULL, "OQueryTableWindow::ExistsField : doesn't have ::com::sun::star::form::ListBox !"); OSL_ENSURE(rInfo.is(),"OQueryTableWindow::ExistsField: invalid argument for OTableFieldDescRef!"); @@ -190,7 +190,7 @@ sal_Bool OQueryTableWindow::ExistsField(const ::rtl::OUString& strFieldName, OTa while (pEntry) { - if (bCase(strFieldName,::rtl::OUString(m_pListBox->GetEntryText(pEntry)))) + if (bCase(strFieldName,OUString(m_pListBox->GetEntryText(pEntry)))) { OTableFieldInfo* pInf = static_cast(pEntry->GetUserData()); OSL_ENSURE(pInf != NULL, "OQueryTableWindow::ExistsField : field doesn't have FieldInfo !"); diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index da65912a1cb7..7718355195eb 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -30,16 +30,16 @@ namespace dbaui class OQueryTableWindow : public OTableWindow { sal_Int32 m_nAliasNum; - ::rtl::OUString m_strInitialAlias; + OUString m_strInitialAlias; public: OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL ); virtual ~OQueryTableWindow(); - ::rtl::OUString GetAliasName() const + OUString GetAliasName() const { return static_cast(GetData().get())->GetAliasName(); } - void SetAliasName(const ::rtl::OUString& strNewAlias) + void SetAliasName(const OUString& strNewAlias) { static_cast(GetData().get())->SetAliasName(strNewAlias); } @@ -49,10 +49,10 @@ namespace dbaui inline sal_Int32 GetAliasNum() const { return m_nAliasNum; } - sal_Bool ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo); + sal_Bool ExistsField(const OUString& strFieldName, OTableFieldDescRef& rInfo); sal_Bool ExistsAVisitedConn() const; - virtual ::rtl::OUString GetName() const { return GetWinName(); } + virtual OUString GetName() const { return GetWinName(); } protected: virtual void KeyInput( const KeyEvent& rEvt ); diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx index 30f15e801526..582e8ae916f4 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx @@ -30,7 +30,7 @@ DBG_NAME(OQueryTableWindowData) // class OQueryTableWindowData //================================================================== //------------------------------------------------------------------------------ -OQueryTableWindowData::OQueryTableWindowData(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rTableName, const ::rtl::OUString& rTableAlias ) +OQueryTableWindowData::OQueryTableWindowData(const OUString& _rComposedName, const OUString& rTableName, const OUString& rTableAlias ) :OTableWindowData(NULL,_rComposedName, rTableName, rTableAlias) { DBG_CTOR(OQueryTableWindowData,NULL); diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx index 9f25d257c598..2386be48b500 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx @@ -30,11 +30,11 @@ namespace dbaui class OQueryTableWindowData : public OTableWindowData { public: - explicit OQueryTableWindowData(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rTableName, const ::rtl::OUString& rTableAlias); + explicit OQueryTableWindowData(const OUString& _rComposedName, const OUString& rTableName, const OUString& rTableAlias); virtual ~OQueryTableWindowData(); - ::rtl::OUString GetAliasName() { return GetWinName(); } - void SetAliasName(const ::rtl::OUString& rNewAlias) { SetWinName(rNewAlias); } + OUString GetAliasName() { return GetWinName(); } + void SetAliasName(const OUString& rNewAlias) { SetWinName(rNewAlias); } }; } #endif // DBAUI_QUERY_TABLEWINDOWDATA_HXX diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 7b5660ad777b..636d005a080e 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -978,9 +978,9 @@ namespace aWorkStr += quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote); aWorkStr += ::dbtools::quoteName(aQuote, aColumnName); } - aWorkStr += rtl::OUString(' '); - aWorkStr += rtl::OUString( ";ASC;DESC" ).getToken( (sal_uInt16)eOrder, ';' ); - aWorkStr += rtl::OUString(','); + aWorkStr += OUString(' '); + aWorkStr += OUString( ";ASC;DESC" ).getToken( (sal_uInt16)eOrder, ';' ); + aWorkStr += OUString(','); } } @@ -1170,7 +1170,7 @@ namespace if(!xConnection.is()) return OUString(); - ::std::map< rtl::OUString,bool> aGroupByNames; + ::std::map< OUString,bool> aGroupByNames; OUString aGroupByStr; try @@ -1216,7 +1216,7 @@ namespace } if ( aGroupByNames.find(sGroupByPart) == aGroupByNames.end() ) { - aGroupByNames.insert(::std::map< rtl::OUString,bool>::value_type(sGroupByPart,true)); + aGroupByNames.insert(::std::map< OUString,bool>::value_type(sGroupByPart,true)); aGroupByStr += sGroupByPart; aGroupByStr += OUString(','); } @@ -3502,7 +3502,7 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p OUString sFunctionName = pFunctionName->getTokenValue(); if ( sFunctionName.isEmpty() ) - sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8); + sFunctionName = OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8); nDataType = OSQLParser::getFunctionReturnType( sFunctionName diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 94a1b0e21425..cc793029c744 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::accessibility; namespace { // ----------------------------------------------------------------------------- - sal_Bool isColumnInKeyType(const Reference& _rxKeys,const ::rtl::OUString& _rColumnName,sal_Int32 _nKeyType) + sal_Bool isColumnInKeyType(const Reference& _rxKeys,const OUString& _rColumnName,sal_Int32 _nKeyType) { sal_Bool bReturn = sal_False; if(_rxKeys.is()) @@ -176,12 +176,12 @@ namespace TTableConnectionData::value_type aNewConnData(pNewConnData); Reference xReferencedKeys( _rDest.GetData()->getKeys()); - ::rtl::OUString sRelatedColumn; + OUString sRelatedColumn; // iterate through all foreignkey columns to create the connections - Sequence< ::rtl::OUString> aElements(_rxSourceForeignKeyColumns->getElementNames()); - const ::rtl::OUString* pIter = aElements.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aElements.getLength(); + Sequence< OUString> aElements(_rxSourceForeignKeyColumns->getElementNames()); + const OUString* pIter = aElements.getConstArray(); + const OUString* pEnd = pIter + aElements.getLength(); for(sal_Int32 i=0;pIter != pEnd;++pIter,++i) { Reference xColumn; @@ -389,14 +389,14 @@ void OQueryTableView::NotifyTabConnection(const OQueryTableConnection& rNewConn, } } // ----------------------------------------------------------------------------- -OTableWindowData* OQueryTableView::CreateImpl(const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& _sTableName - ,const ::rtl::OUString& _rWinName) +OTableWindowData* OQueryTableView::CreateImpl(const OUString& _rComposedName + ,const OUString& _sTableName + ,const OUString& _rWinName) { return new OQueryTableWindowData( _rComposedName, _sTableName,_rWinName ); } //------------------------------------------------------------------------------ -void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl::OUString& _rAliasName, sal_Bool bNewTable) +void OQueryTableView::AddTabWin(const OUString& _rTableName, const OUString& _rAliasName, sal_Bool bNewTable) { DBG_CHKTHIS(OQueryTableView,NULL); // this method has been inherited from the base class, linking back to the parent and which constructs @@ -410,16 +410,16 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl: try { Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; ::dbtools::qualifiedNameComponents(xMetaData, _rTableName, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation); - ::rtl::OUString sRealName(sSchema); + OUString sRealName(sSchema); if (!sRealName.isEmpty()) - sRealName+= ::rtl::OUString('.'); + sRealName+= OUString('.'); sRealName += sTable; AddTabWin(_rTableName, sRealName, _rAliasName, bNewTable); @@ -431,7 +431,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl: } // ----------------------------------------------------------------------------- // find the table which has a foreign key with this referencedTable name -Reference getKeyReferencedTo(const Reference& _rxKeys,const ::rtl::OUString& _rReferencedTable) +Reference getKeyReferencedTo(const Reference& _rxKeys,const OUString& _rReferencedTable) { if(!_rxKeys.is()) return Reference(); @@ -449,7 +449,7 @@ Reference getKeyReferencedTo(const Reference& _rxKey xKey->getPropertyValue(PROPERTY_TYPE) >>= nKeyType; if(KeyType::FOREIGN == nKeyType) { - ::rtl::OUString sReferencedTable; + OUString sReferencedTable; xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable; // TODO check case if(sReferencedTable == _rReferencedTable) @@ -460,7 +460,7 @@ Reference getKeyReferencedTo(const Reference& _rxKey return Reference(); } //------------------------------------------------------------------------------ -void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& _rTableName, const ::rtl::OUString& strAlias, sal_Bool bNewTable) +void OQueryTableView::AddTabWin(const OUString& _rComposedName, const OUString& _rTableName, const OUString& strAlias, sal_Bool bNewTable) { DBG_CHKTHIS(OQueryTableView,NULL); OSL_ENSURE(!_rTableName.isEmpty() || !strAlias.isEmpty(), "OQueryTableView::AddTabWin : no tables or aliases !"); @@ -528,7 +528,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r break; Reference xFKeyColumns; - ::rtl::OUString aReferencedTable; + OUString aReferencedTable; Reference xColumnsSupplier; const sal_Int32 nKeyCount = xKeyIndex->getCount(); @@ -926,7 +926,7 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn SetDefaultTabWinPosSize(pTabWin); // Show the window and add to the list - ::rtl::OUString sName = static_cast< OQueryTableWindowData*>(pData.get())->GetAliasName(); + OUString sName = static_cast< OQueryTableWindowData*>(pData.get())->GetAliasName(); OSL_ENSURE(GetTabWinMap()->find(sName) == GetTabWinMap()->end(),"Alias name already in list!"); GetTabWinMap()->insert(OTableWindowMap::value_type(sName,pTabWin)); diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index be9833dd16b3..5adef14b0df0 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -78,7 +78,7 @@ sal_Bool OQueryTextView::checkStatement() return sal_True; } // ----------------------------------------------------------------------------- -::rtl::OUString OQueryTextView::getStatement() +OUString OQueryTextView::getStatement() { return m_pEdit->GetText(); } @@ -98,7 +98,7 @@ void OQueryTextView::clear() m_pEdit->SetText(String()); } // ----------------------------------------------------------------------------- -void OQueryTextView::setStatement(const ::rtl::OUString& _rsStatement) +void OQueryTextView::setStatement(const OUString& _rsStatement) { m_pEdit->SetText(_rsStatement); } diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index b6a9dbe00ee8..2f940cf326f6 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -87,7 +87,7 @@ sal_Bool OQueryViewSwitch::checkStatement() return m_pDesignView->checkStatement(); } // ----------------------------------------------------------------------------- -::rtl::OUString OQueryViewSwitch::getStatement() +OUString OQueryViewSwitch::getStatement() { if(m_pTextView->IsVisible()) return m_pTextView->getStatement(); @@ -118,7 +118,7 @@ void OQueryViewSwitch::GrabFocus() m_pDesignView->GrabFocus(); } // ----------------------------------------------------------------------------- -void OQueryViewSwitch::setStatement(const ::rtl::OUString& _rsStatement) +void OQueryViewSwitch::setStatement(const OUString& _rsStatement) { if(m_pTextView->IsVisible()) m_pTextView->setStatement(_rsStatement); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index beb4012c6a1c..ad29c142780b 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -51,8 +51,8 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; using namespace ::com::sun::star::accessibility; -#define g_strOne rtl::OUString("1") -#define g_strZero rtl::OUString("0") +#define g_strOne OUString("1") +#define g_strZero OUString("0") #define DEFAULT_QUERY_COLS 20 #define DEFAULT_SIZE GetTextWidth(g_strZero) * 30 @@ -64,7 +64,7 @@ using namespace ::com::sun::star::accessibility; // ----------------------------------------------------------------------------- namespace { - sal_Bool isFieldNameAsterix(const ::rtl::OUString& _sFieldName ) + sal_Bool isFieldNameAsterix(const OUString& _sFieldName ) { sal_Bool bAsterix = !(!_sFieldName.isEmpty() && _sFieldName.toChar() != '*'); if ( !bAsterix ) @@ -197,7 +197,7 @@ void OSelectionBrowseBox::initialize() for (size_t i = 0; i < sizeof (eFunctions) / sizeof (eFunctions[0]); ++i) { m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); - m_aFunctionStrings += rtl::OStringToOUString(rContext.getIntlKeywordAscii(eFunctions[i]), + m_aFunctionStrings += OStringToOUString(rContext.getIntlKeywordAscii(eFunctions[i]), RTL_TEXTENCODING_UTF8); } m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); @@ -588,7 +588,7 @@ void OSelectionBrowseBox::clearEntryFunctionField(const String& _sFieldName,OTab { // append undo action for the function field _pEntry->SetFunctionType(FKT_NONE); - _pEntry->SetFunction(::rtl::OUString()); + _pEntry->SetFunction(OUString()); _pEntry->SetGroupBy(sal_False); notifyFunctionFieldChanged(sOldLocalizedFunctionName,_pEntry->GetFunction(),_bListAction,_nColumnId); } @@ -598,12 +598,12 @@ void OSelectionBrowseBox::clearEntryFunctionField(const String& _sFieldName,OTab sal_Bool OSelectionBrowseBox::fillColumnRef(const OSQLParseNode* _pColumnRef, const Reference< XConnection >& _rxConnection, OTableFieldDescRef& _pEntry, sal_Bool& _bListAction ) { OSL_ENSURE(_pColumnRef,"No valid parsenode!"); - ::rtl::OUString sColumnName,sTableRange; + OUString sColumnName,sTableRange; OSQLParseTreeIterator::getColumnRange(_pColumnRef,_rxConnection,sColumnName,sTableRange); return fillColumnRef(sColumnName,sTableRange,_rxConnection->getMetaData(),_pEntry,_bListAction); } // ----------------------------------------------------------------------------- -sal_Bool OSelectionBrowseBox::fillColumnRef(const ::rtl::OUString& _sColumnName,const ::rtl::OUString& _sTableRange,const Reference& _xMetaData,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction) +sal_Bool OSelectionBrowseBox::fillColumnRef(const OUString& _sColumnName,const OUString& _sTableRange,const Reference& _xMetaData,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction) { sal_Bool bError = sal_False; ::comphelper::UStringMixEqual bCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); @@ -613,7 +613,7 @@ sal_Bool OSelectionBrowseBox::fillColumnRef(const ::rtl::OUString& _sColumnName, if ( !_pEntry->GetTabWindow() ) { // fill tab window - ::rtl::OUString sOldAlias = _pEntry->GetAlias(); + OUString sOldAlias = _pEntry->GetAlias(); if ( !fillEntryTable(_pEntry,_pEntry->GetTable()) ) fillEntryTable(_pEntry,_pEntry->GetAlias()); // only when the first failed if ( !bCase(sOldAlias,_pEntry->GetAlias()) ) @@ -674,11 +674,11 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& if ( !xMetaData.is() ) return sal_True; - ::rtl::OUString sErrorMsg; + OUString sErrorMsg; // second test if the name can be set as select columns in a pseudo statement // we have to look which entries we should quote - const ::rtl::OUString sFieldAlias = _pEntry->GetFieldAlias(); + const OUString sFieldAlias = _pEntry->GetFieldAlias(); ::connectivity::OSQLParser& rParser( rController.getParser() ); { // automatically add parentheses around subqueries @@ -688,7 +688,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& if (pParseNode == NULL) pParseNode = rParser.parseTree( devnull, _sFieldName, false ); if (pParseNode != NULL && SQL_ISRULE(pParseNode, select_statement)) - _sFieldName = ::rtl::OUString("(") + _sFieldName + ")"; + _sFieldName = OUString("(") + _sFieldName + ")"; } OSQLParseNode* pParseNode = NULL; @@ -699,8 +699,8 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& // - quote the field name, parse internationally // - quote the field name, parse en-US size_t nPass = 4; - ::rtl::OUString sQuotedFullFieldName(::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), _sFieldName )); - ::rtl::OUString sFullFieldName(_sFieldName); + OUString sQuotedFullFieldName(::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), _sFieldName )); + OUString sFullFieldName(_sFieldName); if ( _pEntry->isAggreateFunction() ) { @@ -714,19 +714,19 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& bool bQuote = ( nPass <= 2 ); bool bInternational = ( nPass % 2 ) == 0; - ::rtl::OUString sSql; + OUString sSql; if ( bQuote ) sSql += sQuotedFullFieldName; else sSql += sFullFieldName; - sSql = ::rtl::OUString("SELECT ") + sSql; + sSql = OUString("SELECT ") + sSql; if ( !sFieldAlias.isEmpty() ) { // always quote the alias name: there cannot be a function in it - sSql += ::rtl::OUString(" "); + sSql += OUString(" "); sSql += ::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), sFieldAlias ); } - sSql += ::rtl::OUString(" FROM x"); + sSql += OUString(" FROM x"); pParseNode = rParser.parseTree( sErrorMsg, sSql, bInternational ); } @@ -777,7 +777,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& ::connectivity::OSQLParseNode* pChild = pSelection->getChild( i ); OSL_ENSURE(SQL_ISRULE(pChild,derived_column), "No derived column found!"); // get the column alias - ::rtl::OUString sColumnAlias = OSQLParseTreeIterator::getColumnAlias(pChild); + OUString sColumnAlias = OSQLParseTreeIterator::getColumnAlias(pChild); if ( !sColumnAlias.isEmpty() ) // we found an as clause { String aSelectionAlias = aSelEntry->GetFieldAlias(); @@ -821,7 +821,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& if ( nFunCount == 4 && SQL_ISRULE(pColumnRef->getChild(3),column_ref) ) bError = fillColumnRef( pColumnRef->getChild(3), xConnection, aSelEntry, _bListAction ); else if ( nFunCount == 3 ) // we have a COUNT(*) here, so take the first table - bError = fillColumnRef( ::rtl::OUString("*"), ::rtl::OUString(), xMetaData, aSelEntry, _bListAction ); + bError = fillColumnRef( OUString("*"), OUString(), xMetaData, aSelEntry, _bListAction ); else { nFunctionType |= FKT_NUMERIC; @@ -831,7 +831,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& } // now parse the parameters - ::rtl::OUString sParameters; + OUString sParameters; for(sal_uInt32 function = 2; function < nFunCount; ++function) // we only want to parse the parameters of the function pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), sal_True, bQuote ); @@ -854,7 +854,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& { // so we first clear the function field clearEntryFunctionField(_sFieldName,aSelEntry,_bListAction,nColumnId); - ::rtl::OUString sFunction; + OUString sFunction; pColumnRef->parseNodeToStr( sFunction, xConnection, &rController.getParser().getContext(), @@ -869,7 +869,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& { // now parse the whole statement sal_uInt32 nFunCount = pColumnRef->count(); - ::rtl::OUString sParameters; + OUString sParameters; for(sal_uInt32 function = 0; function < nFunCount; ++function) pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), sal_True, sal_True ); @@ -887,7 +887,7 @@ sal_Bool OSelectionBrowseBox::saveField(String& _sFieldName ,OTableFieldDescRef& aSelEntry->SetFunctionType(FKT_NUMERIC | FKT_OTHER); } - aSelEntry->SetAlias(::rtl::OUString()); + aSelEntry->SetAlias(OUString()); notifyTableFieldChanged(sOldAlias,aSelEntry->GetAlias(),_bListAction, nColumnId); } @@ -1026,8 +1026,8 @@ sal_Bool OSelectionBrowseBox::SaveModified() } else { - pEntry->SetAlias(::rtl::OUString()); - pEntry->SetTable(::rtl::OUString()); + pEntry->SetAlias(OUString()); + pEntry->SetTable(OUString()); pEntry->SetTabWindow(NULL); } sNewValue = pEntry->GetAlias(); @@ -1105,10 +1105,10 @@ sal_Bool OSelectionBrowseBox::SaveModified() sal_uInt16 nIdx = sal_uInt16(nRow - BROW_CRIT1_ROW); String aText = comphelper::string::stripStart(m_pTextCell->GetText(), ' '); - ::rtl::OUString aCrit; + OUString aCrit; if(aText.Len()) { - ::rtl::OUString aErrorMsg; + OUString aErrorMsg; Reference xColumn; OSQLParseNode* pParseNode = getDesignView()->getPredicateTreeFromEntry(pEntry,aText,aErrorMsg,xColumn); @@ -1137,9 +1137,9 @@ sal_Bool OSelectionBrowseBox::SaveModified() case DataType::CLOB: if(aText.GetChar(0) != '\'' || aText.GetChar(aText.Len() -1) != '\'') { - aText.SearchAndReplaceAll(rtl::OUString("'"), rtl::OUString("''")); - String aTmp(rtl::OUString("'")); - (aTmp += aText) += rtl::OUString("'"); + aText.SearchAndReplaceAll(OUString("'"), OUString("''")); + String aTmp(OUString("'")); + (aTmp += aText) += OUString("'"); aText = aTmp; } break; @@ -1724,8 +1724,8 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt pEntry = *aIter; OSL_ENSURE(pEntry.is(),"OTableFieldDescRef was null!"); - const ::rtl::OUString aField = pEntry->GetField(); - const ::rtl::OUString aAlias = pEntry->GetAlias(); + const OUString aField = pEntry->GetField(); + const OUString aAlias = pEntry->GetAlias(); if (bCase(aField,rInfo->GetField()) && bCase(aAlias,rInfo->GetAlias()) && @@ -1771,7 +1771,7 @@ void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel) { OTableFieldDescRef pEntry = *aIter; - ::rtl::OUString sValue = pEntry->GetCriteria(nLevel); + OUString sValue = pEntry->GetCriteria(nLevel); if ( !sValue.isEmpty() ) { pEntry->SetCriteria( nNewLevel, sValue); @@ -1804,8 +1804,8 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S for(;aIter != aEnd;++aIter) { OTableFieldDescRef pEntry = *aIter; - const ::rtl::OUString aField = pEntry->GetField(); - const ::rtl::OUString aAlias = pEntry->GetAlias(); + const OUString aField = pEntry->GetField(); + const OUString aAlias = pEntry->GetAlias(); if (bCase(aField,rInfo->GetField()) && bCase(aAlias,rInfo->GetAlias()) && @@ -1900,8 +1900,8 @@ void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef& rInfo, const EOrde for(;aIter != aEnd;++aIter) { pEntry = *aIter; - ::rtl::OUString aField = pEntry->GetField(); - ::rtl::OUString aAlias = pEntry->GetAlias(); + OUString aField = pEntry->GetField(); + OUString aAlias = pEntry->GetAlias(); if (bCase(aField,rInfo->GetField()) && bCase(aAlias,rInfo->GetAlias())) @@ -2342,7 +2342,7 @@ String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 nCo sal_uInt16 nIdx = m_pOrderCell->GetSelectEntryPos(); if (nIdx == sal_uInt16(-1)) nIdx = 0; - return rtl::OUString(nIdx); + return OUString(nIdx); } default: return GetCellText(nCellIndex, nColId); @@ -2639,7 +2639,7 @@ void OSelectionBrowseBox::enableControl(const OTableFieldDescRef& _rEntry,Window _pControl->EnableInput(bEnable); } // ----------------------------------------------------------------------------- -void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId) +void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const OString& _sHelpId) { m_pTextCell->SetText(_sText); m_pTextCell->ClearModifyFlag(); @@ -2694,7 +2694,7 @@ void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) m_bWasEditing = sal_False; } // ----------------------------------------------------------------------------- -::rtl::OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const +OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const { String aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); @@ -2702,12 +2702,12 @@ void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) xub_StrLen nToken = (xub_StrLen) (_nRow >= GetBrowseRow(BROW_CRIT2_ROW)) ? xub_StrLen(BROW_CRIT2_ROW) : xub_StrLen(GetRealRow(_nRow)); - return ::rtl::OUString(aLabel.GetToken(nToken)); + return OUString(aLabel.GetToken(nToken)); } // ----------------------------------------------------------------------------- -::rtl::OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const +OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const { - ::rtl::OUString sRetText; + OUString sRetText; switch( _eObjType ) { case ::svt::BBTYPE_ROWHEADERCELL: @@ -2719,7 +2719,7 @@ void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) return sRetText; } // ----------------------------------------------------------------------------- -sal_Bool OSelectionBrowseBox::fillEntryTable(OTableFieldDescRef& _pEntry,const ::rtl::OUString& _sTableName) +sal_Bool OSelectionBrowseBox::fillEntryTable(OTableFieldDescRef& _pEntry,const OUString& _sTableName) { sal_Bool bRet = sal_False; OJoinTableView::OTableWindowMap* pTabWinList = getDesignView()->getTableView()->GetTabWinMap(); @@ -2804,7 +2804,7 @@ Reference< XAccessible > OSelectionBrowseBox::CreateAccessibleCell( sal_Int32 _n return EditBrowseBox::CreateAccessibleCell( _nRow, _nColumnPos ); } // ----------------------------------------------------------------------------- -bool OSelectionBrowseBox::HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const +bool OSelectionBrowseBox::HasFieldByAliasName(const OUString& rFieldName, OTableFieldDescRef& rInfo) const { OTableFields& aFields = getFields(); OTableFields::iterator aIter = aFields.begin(); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 098be93c48ec..40cbfc737ef4 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -90,7 +90,7 @@ namespace dbaui void RemoveColumn( sal_uInt16 _nColumnId ); void DeleteFields( const String& rAliasName ); - bool HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const; + bool HasFieldByAliasName(const OUString& rFieldName, OTableFieldDescRef& rInfo) const; // AddGroupBy:: inserts a field with function == grouping. If the fields already exists and uses an aggregate function, // the flag is not set @@ -162,7 +162,7 @@ namespace dbaui @return The header text of the specified row. */ - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const; /** return the name of the specified object. @param eObjType @@ -172,7 +172,7 @@ namespace dbaui @return The name of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; // IAccessibleTableProvider /** Creates the accessible object of a data table cell. @@ -233,7 +233,7 @@ namespace dbaui void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow); OTableFields& getFields() const; void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); - void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId); + void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const OString& _sHelpId); void invalidateUndoRedo(); OTableFieldDescRef getEntry(OTableFields::size_type _nPos); @@ -259,7 +259,7 @@ namespace dbaui @return if the table name was set otherwise */ - sal_Bool fillEntryTable(OTableFieldDescRef& _pEntry,const ::rtl::OUString& _sTableName); + sal_Bool fillEntryTable(OTableFieldDescRef& _pEntry,const OUString& _sTableName); /** uses the parse node to fill all information into the field @param _pColumnRef @@ -277,8 +277,8 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, OTableFieldDescRef& _pEntry, sal_Bool& _bListAction); - sal_Bool fillColumnRef( const ::rtl::OUString& _sColumnName, - const ::rtl::OUString& _sTableRange, + sal_Bool fillColumnRef( const OUString& _sColumnName, + const OUString& _sTableRange, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData, OTableFieldDescRef& _pEntry, sal_Bool& _bListAction); diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx index acfd6ce56cd8..2f68e74d1dc3 100644 --- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx @@ -120,7 +120,7 @@ sal_Bool OTableConnectionData::SetConnLine( sal_uInt16 nIndex, const String& rSo } //------------------------------------------------------------------------ -sal_Bool OTableConnectionData::AppendConnLine( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName ) +sal_Bool OTableConnectionData::AppendConnLine( const OUString& rSourceFieldName, const OUString& rDestFieldName ) { OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin(); OConnectionLineDataVec::iterator aEnd = m_vConnLineData.end(); diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index 9a4e5005f52f..020e5d07eb0f 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -57,7 +57,7 @@ OTableFieldDesc::OTableFieldDesc(const OTableFieldDesc& rRS) } //------------------------------------------------------------------------------ -OTableFieldDesc::OTableFieldDesc(const ::rtl::OUString& rT, const ::rtl::OUString& rF ) +OTableFieldDesc::OTableFieldDesc(const OUString& rT, const OUString& rF ) :m_pTabWindow(0) ,m_eFunctionType( FKT_NONE ) ,m_eOrderDir( ORDER_NONE ) @@ -117,7 +117,7 @@ sal_Bool OTableFieldDesc::operator==( const OTableFieldDesc& rDesc ) } //------------------------------------------------------------------------------ -void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit) +void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const OUString& rCrit) { DBG_CHKTHIS(OTableFieldDesc,NULL); if (nIdx < m_aCriteria.size()) @@ -125,16 +125,16 @@ void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit else { for(sal_Int32 i=m_aCriteria.size();i + struct SelectPropertyValueAsString : public ::std::unary_function< PropertyValue, OUString > { - ::rtl::OUString operator()( const PropertyValue& i_rPropValue ) const + OUString operator()( const PropertyValue& i_rPropValue ) const { - ::rtl::OUString sValue; + OUString sValue; OSL_VERIFY( i_rPropValue.Value >>= sValue ); return sValue; } @@ -211,12 +211,12 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con { sal_Int32 c = 0; Sequence< PropertyValue > aCriteria( m_aCriteria.size() ); - for ( ::std::vector< ::rtl::OUString >::const_iterator crit = m_aCriteria.begin(); + for ( ::std::vector< OUString >::const_iterator crit = m_aCriteria.begin(); crit != m_aCriteria.end(); ++crit, ++c ) { - aCriteria[c].Name = ::rtl::OUString( "Criterion_" ) + ::rtl::OUString::valueOf( c ); + aCriteria[c].Name = OUString( "Criterion_" ) + OUString::valueOf( c ); aCriteria[c].Value <<= *crit; } diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index dee5ef4dc6b0..88e1cfcb69b9 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -180,7 +180,7 @@ sal_Bool OTableWindow::FillListBox() if (GetData()->IsShowAll()) { - SvTreeListEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString("*") ); + SvTreeListEntry* pEntry = m_pListBox->InsertEntry( OUString("*") ); pEntry->SetUserData( createUserData(NULL,false) ); } @@ -198,9 +198,9 @@ sal_Bool OTableWindow::FillListBox() Reference< XNameAccess > xColumns = m_pData->getColumns(); if( xColumns.is() ) { - Sequence< ::rtl::OUString> aColumns = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aColumns.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aColumns.getLength(); + Sequence< OUString> aColumns = xColumns->getElementNames(); + const OUString* pIter = aColumns.getConstArray(); + const OUString* pEnd = pIter + aColumns.getLength(); SvTreeListEntry* pEntry = NULL; for (; pIter != pEnd; ++pIter) @@ -553,7 +553,7 @@ sal_Bool OTableWindow::ExistsAConn() const return getTableView()->ExistsAConn(this); } //------------------------------------------------------------------------------ -void OTableWindow::EnumValidFields(::std::vector< ::rtl::OUString>& arrstrFields) +void OTableWindow::EnumValidFields(::std::vector< OUString>& arrstrFields) { arrstrFields.clear(); // This default implementation counts every item in the ListBox ... for any other behaviour it must be over-written diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index b7350b15bfd9..92fa870682c7 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -74,28 +74,28 @@ namespace dbaui return ::comphelper::concatSequences(VCLXAccessibleComponent::getTypes(),OTableWindowAccess_BASE::getTypes()); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OTableWindowAccess::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OTableWindowAccess::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OTableWindowAccess::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL OTableWindowAccess::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } // ----------------------------------------------------------------------------- // XServiceInfo - static methods - Sequence< ::rtl::OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException ) + Sequence< OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString("com.sun.star.accessibility.Accessible"); - aSupported[1] = ::rtl::OUString("com.sun.star.accessibility.AccessibleContext"); + Sequence< OUString > aSupported(2); + aSupported[0] = OUString("com.sun.star.accessibility.Accessible"); + aSupported[1] = OUString("com.sun.star.accessibility.AccessibleContext"); return aSupported; } // ----------------------------------------------------------------------------- - ::rtl::OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException ) + OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.dbu.TableWindowAccessibility"); + return OUString("org.openoffice.comp.dbu.TableWindowAccessibility"); } // ----------------------------------------------------------------------------- // XAccessibleContext @@ -261,15 +261,15 @@ namespace dbaui return m_pTable && !m_pTable->getTableView()->getDesignView()->getController().isReadOnly(); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OTableWindowAccess::getTitledBorderText( ) throw (RuntimeException) + OUString SAL_CALL OTableWindowAccess::getTitledBorderText( ) throw (RuntimeException) { return getAccessibleName( ); } // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OTableWindowAccess::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL OTableWindowAccess::getAccessibleName( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString sAccessibleName; + OUString sAccessibleName; if ( m_pTable ) sAccessibleName = m_pTable->getTitle(); return sAccessibleName; diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx index 49ff4919f289..90155ca00110 100644 --- a/dbaccess/source/ui/querydesign/TableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx @@ -41,9 +41,9 @@ using namespace ::com::sun::star::container; DBG_NAME(OTableWindowData) //------------------------------------------------------------------------------ OTableWindowData::OTableWindowData( const Reference< XPropertySet>& _xTable - ,const ::rtl::OUString& _rComposedName - ,const ::rtl::OUString& rTableName - ,const ::rtl::OUString& rWinName ) + ,const OUString& _rComposedName + ,const OUString& rTableName + ,const OUString& rWinName ) :m_xTable(_xTable) ,m_aTableName( rTableName ) ,m_aWinName( rWinName ) diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 2a0a08e3cff8..07ef8b711f5c 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -195,7 +195,7 @@ namespace dbaui ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::AddWindow)); - Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.frame.Frame"), m_pViewSwitch->getORB()),UNO_QUERY ); + Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.frame.Frame"), m_pViewSwitch->getORB()),UNO_QUERY ); m_xBeamer.set( xBeamerFrame ); OSL_ENSURE(m_xBeamer.is(),"No frame created!"); m_xBeamer->initialize( VCLUnoHelper::GetInterface ( m_pBeamer ) ); @@ -204,12 +204,12 @@ namespace dbaui Reference < XPropertySet > xPropSet( xBeamerFrame, UNO_QUERY ); try { - const ::rtl::OUString aLayoutManager( "LayoutManager" ); + const OUString aLayoutManager( "LayoutManager" ); Reference < XPropertySet > xLMPropSet(xPropSet->getPropertyValue( aLayoutManager ),UNO_QUERY); if ( xLMPropSet.is() ) { - const ::rtl::OUString aAutomaticToolbars( "AutomaticToolbars" ); + const OUString aAutomaticToolbars( "AutomaticToolbars" ); xLMPropSet->setPropertyValue( aAutomaticToolbars, Any( sal_False )); } } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index a5b23ecb5f65..ca36ffec8a56 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -233,7 +233,7 @@ namespace dbaui LocalResourceAccess aLocalRes( RSC_QUERY_OBJECT_TYPE, RSC_RESOURCE ); sObjectType = String( ModuleRes( (sal_uInt16)( _nCommandType + 1 ) ) ); } - sMessageText.SearchAndReplace( rtl::OUString("$object$"), sObjectType ); + sMessageText.SearchAndReplace( OUString("$object$"), sObjectType ); return sMessageText; } } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 16d96ffde1b7..90adc949949c 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -220,7 +220,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) m_pTableControl->lateInit(); m_pJoinControl->m_aCBNatural.Check(sal_False); m_pTableControl->enableRelation(false); - ::rtl::OUString sEmpty; + OUString sEmpty; m_pConnData->AppendConnLine(sEmpty,sEmpty); aPB_OK.Enable(sal_True); } @@ -282,9 +282,9 @@ IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ ) try { Reference xReferencedTableColumns(m_pConnData->getReferencedTable()->getColumns()); - Sequence< ::rtl::OUString> aSeq = m_pConnData->getReferencingTable()->getColumns()->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + Sequence< OUString> aSeq = m_pConnData->getReferencingTable()->getColumns()->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( xReferencedTableColumns->hasByName(*pIter) ) diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 9ed18154c587..57b8fdf0f3db 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -58,7 +58,7 @@ ORelationTableConnectionData::ORelationTableConnectionData() //------------------------------------------------------------------------ ORelationTableConnectionData::ORelationTableConnectionData( const TTableWindowData::value_type& _pReferencingTable, const TTableWindowData::value_type& _pReferencedTable, - const ::rtl::OUString& rConnName ) + const OUString& rConnName ) :OTableConnectionData( _pReferencingTable, _pReferencedTable ) ,m_nUpdateRules(KeyRule::NO_ACTION) ,m_nDeleteRules(KeyRule::NO_ACTION) @@ -102,7 +102,7 @@ sal_Bool ORelationTableConnectionData::DropRelation() OSL_ENSURE(xKey.is(),"Key is not valid!"); if(xKey.is()) { - ::rtl::OUString sName; + OUString sName; xKey->getPropertyValue(PROPERTY_NAME) >>= sName; if(String(sName) == m_aConnName) { @@ -124,7 +124,7 @@ void ORelationTableConnectionData::ChangeOrientation() DBG_CHKTHIS(ORelationTableConnectionData,NULL); ////////////////////////////////////////////////////////////////////// // Source- und DestFieldName der Linien austauschen - ::rtl::OUString sTempString; + OUString sTempString; OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin(); OConnectionLineDataVec::iterator aEnd = m_vConnLineData.end(); for(;aIter != aEnd;++aIter) @@ -172,9 +172,9 @@ sal_Bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropert const Reference< XNameAccess> xKeyColumns = dbtools::getPrimaryKeyColumns_throw(i_xTable); if ( xKeyColumns.is() ) { - Sequence< ::rtl::OUString> aKeyColumns = xKeyColumns->getElementNames(); - const ::rtl::OUString* pKeyIter = aKeyColumns.getConstArray(); - const ::rtl::OUString* pKeyEnd = pKeyIter + aKeyColumns.getLength(); + Sequence< OUString> aKeyColumns = xKeyColumns->getElementNames(); + const OUString* pKeyIter = aKeyColumns.getConstArray(); + const OUString* pKeyEnd = pKeyIter + aKeyColumns.getLength(); for(;pKeyIter != pKeyEnd;++pKeyIter) { @@ -301,14 +301,14 @@ sal_Bool ORelationTableConnectionData::Update() if ( xKey.is() && xTableProp.is() ) { // build a foreign key name - ::rtl::OUString sSourceName; + OUString sSourceName; xTableProp->getPropertyValue(PROPERTY_NAME) >>= sSourceName; - ::rtl::OUString sKeyName = sSourceName; + OUString sKeyName = sSourceName; sKeyName += getReferencedTable()->GetTableName(); xKey->setPropertyValue(PROPERTY_NAME,makeAny(sKeyName)); xKey->setPropertyValue(PROPERTY_TYPE,makeAny(KeyType::FOREIGN)); - xKey->setPropertyValue(PROPERTY_REFERENCEDTABLE,makeAny(::rtl::OUString(getReferencedTable()->GetTableName()))); + xKey->setPropertyValue(PROPERTY_REFERENCEDTABLE,makeAny(OUString(getReferencedTable()->GetTableName()))); xKey->setPropertyValue(PROPERTY_UPDATERULE, makeAny(GetUpdateRules())); xKey->setPropertyValue(PROPERTY_DELETERULE, makeAny(GetDeleteRules())); } @@ -345,7 +345,7 @@ sal_Bool ORelationTableConnectionData::Update() } // get the name of foreign key // search for columns - m_aConnName = ::rtl::OUString(); + m_aConnName = OUString(); xKey.clear(); bool bDropRelation = false; for(sal_Int32 i=0;igetCount();++i) @@ -356,20 +356,20 @@ xKey.clear(); { sal_Int32 nType = 0; xKey->getPropertyValue(PROPERTY_TYPE) >>= nType; - ::rtl::OUString sReferencedTable; + OUString sReferencedTable; xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable; - if ( sReferencedTable == ::rtl::OUString(getReferencedTable()->GetTableName()) ) + if ( sReferencedTable == OUString(getReferencedTable()->GetTableName()) ) { xColSup.set(xKey,UNO_QUERY_THROW); try { Reference xColumns = xColSup->getColumns(); - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); Reference xColumn; - ::rtl::OUString sName,sRelatedColumn; + OUString sName,sRelatedColumn; for ( ; pIter != pEnd ; ++pIter ) { xColumn.set(xColumns->getByName(*pIter),UNO_QUERY_THROW); @@ -418,13 +418,13 @@ xKey.clear(); { OConnectionLineDataVec().swap(m_vConnLineData); Reference xColumns = xColSup->getColumns(); - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); m_vConnLineData.reserve( aNames.getLength() ); Reference xColumn; - ::rtl::OUString sName,sRelatedColumn; + OUString sName,sRelatedColumn; for(;pIter != pEnd;++pIter) { diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index 4d9e1ac6f150..067945473b10 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -33,7 +33,7 @@ namespace dbaui @return The composed name or the window name. */ - virtual ::rtl::OUString GetName() const { return GetComposedName(); } + virtual OUString GetName() const { return GetComposedName(); } }; } #endif //DBAUI_RELTABLEWINDOW_HXX diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 083a76ff7b54..f93138b1b518 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -90,25 +90,25 @@ using namespace ::comphelper; using namespace ::osl; //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ORelationController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL ORelationController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -::rtl::OUString ORelationController::getImplementationName_Static() throw( RuntimeException ) +OUString ORelationController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.dbu.ORelationDesign"); + return OUString("org.openoffice.comp.dbu.ORelationDesign"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.RelationDesign"); + Sequence< OUString> aSupported(1); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.RelationDesign"); return aSupported; } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString> SAL_CALL ORelationController::getSupportedServiceNames() throw(RuntimeException) +Sequence< OUString> SAL_CALL ORelationController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -240,9 +240,9 @@ void ORelationController::impl_initialize() } // ----------------------------------------------------------------------------- -::rtl::OUString ORelationController::getPrivateTitle( ) const +OUString ORelationController::getPrivateTitle( ) const { - ::rtl::OUString sName = getDataSourceName(); + OUString sName = getDataSourceName(); return ::dbaui::getStrippedDatabaseName(getDataSource(),sName); } // ----------------------------------------------------------------------------- @@ -275,10 +275,10 @@ namespace { class RelationLoader : public ::osl::Thread { - DECLARE_STL_MAP(::rtl::OUString,::boost::shared_ptr,::comphelper::UStringMixLess,TTableDataHelper); + DECLARE_STL_MAP(OUString,::boost::shared_ptr,::comphelper::UStringMixLess,TTableDataHelper); TTableDataHelper m_aTableData; TTableConnectionData m_vTableConnectionData; - const Sequence< ::rtl::OUString> m_aTableList; + const Sequence< OUString> m_aTableList; ORelationController* m_pParent; const Reference< XDatabaseMetaData> m_xMetaData; const Reference< XNameAccess > m_xTables; @@ -289,7 +289,7 @@ namespace RelationLoader(ORelationController* _pParent ,const Reference< XDatabaseMetaData>& _xMetaData ,const Reference< XNameAccess >& _xTables - ,const Sequence< ::rtl::OUString>& _aTableList + ,const Sequence< OUString>& _aTableList ,const sal_Int32 _nStartIndex ,const sal_Int32 _nEndIndex) :m_aTableData(_xMetaData.is() && _xMetaData->supportsMixedCaseQuotedIdentifiers()) @@ -313,10 +313,10 @@ namespace void SAL_CALL RelationLoader::run() { - const ::rtl::OUString* pIter = m_aTableList.getConstArray() + m_nStartIndex; + const OUString* pIter = m_aTableList.getConstArray() + m_nStartIndex; for(sal_Int32 i = m_nStartIndex; i < m_nEndIndex;++i,++pIter) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, *pIter, sCatalog, @@ -351,7 +351,7 @@ namespace void RelationLoader::loadTableData(const Any& _aTable) { Reference xTableProp(_aTable,UNO_QUERY); - const ::rtl::OUString sSourceName = ::dbtools::composeTableName( m_xMetaData, xTableProp, ::dbtools::eInTableDefinitions, false, false, false ); + const OUString sSourceName = ::dbtools::composeTableName( m_xMetaData, xTableProp, ::dbtools::eInTableDefinitions, false, false, false ); TTableDataHelper::iterator aFind = m_aTableData.find(sSourceName); if ( aFind == m_aTableData.end() ) { @@ -378,7 +378,7 @@ namespace xKey->getPropertyValue(PROPERTY_TYPE) >>= nKeyType; if ( KeyType::FOREIGN == nKeyType ) { - ::rtl::OUString sReferencedTable; + OUString sReferencedTable; xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable; ////////////////////////////////////////////////////////////////////// // insert windows @@ -396,7 +396,7 @@ namespace } TTableWindowData::value_type pReferencedTable = aRefFind->second; - ::rtl::OUString sKeyName; + OUString sKeyName; xKey->getPropertyValue(PROPERTY_NAME) >>= sKeyName; ////////////////////////////////////////////////////////////////////// // insert connection @@ -407,10 +407,10 @@ namespace const Reference xColsSup(xKey,UNO_QUERY); OSL_ENSURE(xColsSup.is(),"Key is no XColumnsSupplier!"); const Reference xColumns = xColsSup->getColumns(); - const Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); - ::rtl::OUString sColumnName,sRelatedName; + const Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); + OUString sColumnName,sRelatedName; for(sal_uInt16 j=0;pIter != pEnd;++pIter,++j) { const Reference xPropSet(xColumns->getByName(*pIter),UNO_QUERY); @@ -502,7 +502,7 @@ void ORelationController::loadData() DatabaseMetaData aMeta(getConnection()); // this may take some time const Reference< XDatabaseMetaData> xMetaData = getConnection()->getMetaData(); - const Sequence< ::rtl::OUString> aNames = m_xTables->getElementNames(); + const Sequence< OUString> aNames = m_xTables->getElementNames(); const sal_Int32 nCount = aNames.getLength(); if ( aMeta.supportsThreads() ) { @@ -537,7 +537,7 @@ void ORelationController::loadData() } } // ----------------------------------------------------------------------------- -TTableWindowData::value_type ORelationController::existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase) const +TTableWindowData::value_type ORelationController::existsTable(const OUString& _rComposedTableName,sal_Bool _bCase) const { ::comphelper::UStringMixEqual bCase(_bCase); TTableWindowData::const_iterator aIter = m_vTableData.begin(); diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index e4a5405d506a..5a3d72485066 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -100,7 +100,7 @@ void ORelationTableView::ReSync() // Es kann sein, dass in der DB Tabellen ausgeblendet wurden, die eigentlich Bestandteil einer Relation sind. Oder eine Tabelle // befand sich im Layout (durchaus ohne Relation), existiert aber nicht mehr. In beiden Faellen wird das Anlegen des TabWins schief // gehen, und alle solchen TabWinDatas oder darauf bezogenen ConnDatas muss ich dann loeschen. - ::std::vector< ::rtl::OUString> arrInvalidTables; + ::std::vector< OUString> arrInvalidTables; ////////////////////////////////////////////////////////////////////// // create and insert windows @@ -141,7 +141,7 @@ void ORelationTableView::ReSync() if ( !arrInvalidTables.empty() ) { // gibt es die beiden Tabellen zur Connection ? - ::rtl::OUString strTabExistenceTest = pTabConnData->getReferencingTable()->GetTableName(); + OUString strTabExistenceTest = pTabConnData->getReferencingTable()->GetTableName(); sal_Bool bInvalid = ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); strTabExistenceTest = pTabConnData->getReferencedTable()->GetTableName(); bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); @@ -193,8 +193,8 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const pDestWin->GetData())); // die Namen der betroffenen Felder - ::rtl::OUString sSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry); - ::rtl::OUString sDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry); + OUString sSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry); + OUString sDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry); // die Anzahl der PKey-Felder in der Quelle const Reference< XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(pSourceWin->GetData()->getTable()); @@ -296,7 +296,7 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_ } //------------------------------------------------------------------------------ -void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool /*bNewTable*/) +void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool /*bNewTable*/) { DBG_CHKTHIS(ORelationTableView,NULL); OSL_ENSURE(!_rComposedName.isEmpty(),"There must be a table name supplied!"); @@ -411,7 +411,7 @@ void ORelationTableView::_elementInserted( const container::ContainerEvent& /*_r void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { m_bInRemove = true; - ::rtl::OUString sName; + OUString sName; if ( _rEvent.Accessor >>= sName ) { OTableWindow* pTableWindow = GetTabWindow(sName); diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 2a42c8b10f8f..f1c6606cca48 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -126,7 +126,7 @@ OFieldDescription::OFieldDescription(const Reference< XPropertySet >& xAffectedC SetDescription(::comphelper::getString(xAffectedCol->getPropertyValue(PROPERTY_DESCRIPTION))); if(xPropSetInfo->hasPropertyByName(PROPERTY_HELPTEXT)) { - ::rtl::OUString sHelpText; + OUString sHelpText; xAffectedCol->getPropertyValue(PROPERTY_HELPTEXT) >>= sHelpText; SetHelpText(sHelpText); } @@ -246,7 +246,7 @@ void OFieldDescription::FillFromTypeInfo(const TOTypeInfoSP& _pType,sal_Bool _bF } } // ----------------------------------------------------------------------------- -void OFieldDescription::SetName(const ::rtl::OUString& _rName) +void OFieldDescription::SetName(const OUString& _rName) { try { @@ -261,7 +261,7 @@ void OFieldDescription::SetName(const ::rtl::OUString& _rName) } } // ----------------------------------------------------------------------------- -void OFieldDescription::SetHelpText(const ::rtl::OUString& _sHelpText) +void OFieldDescription::SetHelpText(const OUString& _sHelpText) { try { @@ -276,7 +276,7 @@ void OFieldDescription::SetHelpText(const ::rtl::OUString& _sHelpText) } } // ----------------------------------------------------------------------------- -void OFieldDescription::SetDescription(const ::rtl::OUString& _rDescription) +void OFieldDescription::SetDescription(const OUString& _rDescription) { try { @@ -321,7 +321,7 @@ void OFieldDescription::SetControlDefault(const Any& _rControlDefault) } } // ----------------------------------------------------------------------------- -void OFieldDescription::SetAutoIncrementValue(const ::rtl::OUString& _sAutoIncValue) +void OFieldDescription::SetAutoIncrementValue(const OUString& _sAutoIncValue) { try { @@ -476,7 +476,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetName() const +OUString OFieldDescription::GetName() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_NAME) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_NAME)); @@ -484,7 +484,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sName; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetDescription() const +OUString OFieldDescription::GetDescription() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_DESCRIPTION) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_DESCRIPTION)); @@ -492,7 +492,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_sDescription; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetHelpText() const +OUString OFieldDescription::GetHelpText() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_HELPTEXT) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_HELPTEXT)); @@ -508,7 +508,7 @@ void OFieldDescription::SetCurrency(sal_Bool _bIsCurrency) return m_aControlDefault; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetAutoIncrementValue() const +OUString OFieldDescription::GetAutoIncrementValue() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_AUTOINCREMENTCREATION) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_AUTOINCREMENTCREATION)); @@ -524,7 +524,7 @@ sal_Int32 OFieldDescription::GetType() const return m_pType.get() ? m_pType->nType : m_nType; } // ----------------------------------------------------------------------------- -::rtl::OUString OFieldDescription::GetTypeName() const +OUString OFieldDescription::GetTypeName() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_TYPENAME) ) return ::comphelper::getString(m_xDest->getPropertyValue(PROPERTY_TYPENAME)); @@ -629,7 +629,7 @@ sal_Bool OFieldDescription::IsNullable() const return m_nIsNullable == ::com::sun::star::sdbc::ColumnValue::NULLABLE; } // ----------------------------------------------------------------------------- -void OFieldDescription::SetTypeName(const ::rtl::OUString& _sTypeName) +void OFieldDescription::SetTypeName(const OUString& _sTypeName) { try { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index fe569292ccb7..70654ce4f535 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -239,7 +239,7 @@ void OTableEditorCtrl::InitCellController() ////////////////////////////////////////////////////////////////////// // Cell Field name xub_StrLen nMaxTextLen = EDIT_NOLIMIT; - ::rtl::OUString sExtraNameChars; + OUString sExtraNameChars; Reference xCon; try { @@ -250,7 +250,7 @@ void OTableEditorCtrl::InitCellController() if( nMaxTextLen == 0 ) nMaxTextLen = EDIT_NOLIMIT; - sExtraNameChars = xMetaData.is() ? xMetaData->getExtraNameCharacters() : ::rtl::OUString(); + sExtraNameChars = xMetaData.is() ? xMetaData->getExtraNameCharacters() : OUString(); } catch(SQLException&) @@ -380,7 +380,7 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) Reference xTable = GetView()->getController().getTable(); if (IsReadOnly() || ( xTable.is() && xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && - ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString("VIEW"))) + ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == OUString("VIEW"))) return NULL; ////////////////////////////////////////////////////////////////////// @@ -1083,7 +1083,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const TOTypeIn default: OSL_FAIL("OTableEditorCtrl::SetCellData: invalid column!"); } - SetControlText(nRow,nColId,_pTypeInfo.get() ? _pTypeInfo->aUIName : ::rtl::OUString()); + SetControlText(nRow,nColId,_pTypeInfo.get() ? _pTypeInfo->aUIName : OUString()); } //------------------------------------------------------------------------------ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) @@ -1155,7 +1155,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::s case FIELD_PROPERTY_BOOL_DEFAULT: sValue = GetView()->GetDescWin()->BoolStringPersistent(::comphelper::getString(_rNewData)); - pFieldDescr->SetControlDefault(makeAny(::rtl::OUString(sValue))); + pFieldDescr->SetControlDefault(makeAny(OUString(sValue))); break; case FIELD_PROPERTY_FORMAT: @@ -1185,7 +1185,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) static const String strYes(ModuleRes(STR_VALUE_YES)); static const String strNo(ModuleRes(STR_VALUE_NO)); - ::rtl::OUString sValue; + OUString sValue; ////////////////////////////////////////////////////////////////////// // Read out the fields switch( nColId ) @@ -1246,7 +1246,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) String OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const { DBG_CHKTHIS(OTableEditorCtrl,NULL); - ::rtl::OUString sCellText; + OUString sCellText; const_cast< OTableEditorCtrl* >( this )->GetCellData( nRow, nColId ) >>= sCellText; return sCellText; } @@ -1255,7 +1255,7 @@ String OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const sal_uInt32 OTableEditorCtrl::GetTotalCellWidth(long nRow, sal_uInt16 nColId) { DBG_CHKTHIS(OTableEditorCtrl,NULL); - return GetTextWidth(GetCellText(nRow, nColId)) + 2 * GetTextWidth(rtl::OUString('0')); + return GetTextWidth(GetCellText(nRow, nColId)) + 2 * GetTextWidth(OUString('0')); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index ce966a7c4a88..0f94c246db3e 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -101,7 +101,7 @@ using namespace ::comphelper; namespace { - void dropTable(const Reference& _rxTable,const ::rtl::OUString& _sTableName) + void dropTable(const Reference& _rxTable,const OUString& _sTableName) { if ( _rxTable->hasByName(_sTableName) ) { @@ -112,9 +112,9 @@ namespace } } //------------------------------------------------------------------------------ - struct OTableRowCompare : public ::std::binary_function< ::boost::shared_ptr , ::rtl::OUString, bool> + struct OTableRowCompare : public ::std::binary_function< ::boost::shared_ptr , OUString, bool> { - bool operator() (const ::boost::shared_ptr lhs, const ::rtl::OUString& rhs) const + bool operator() (const ::boost::shared_ptr lhs, const OUString& rhs) const { OFieldDescription* pField = lhs->GetActFieldDescr(); return pField && pField->GetName() == rhs; @@ -124,25 +124,25 @@ namespace } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OTableController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL OTableController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -::rtl::OUString OTableController::getImplementationName_Static() throw( RuntimeException ) +OUString OTableController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.dbu.OTableDesign"); + return OUString("org.openoffice.comp.dbu.OTableDesign"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableDesign"); + Sequence< OUString> aSupported(1); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.TableDesign"); return aSupported; } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString> SAL_CALL OTableController::getSupportedServiceNames() throw(RuntimeException) +Sequence< OUString> SAL_CALL OTableController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -315,7 +315,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) // TODO Reference xTables; - ::rtl::OUString sCatalog, sSchema; + OUString sCatalog, sSchema; sal_Bool bNew = m_sName.isEmpty(); bNew = bNew || m_bNew || _bSaveAs; @@ -456,7 +456,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs) { if(!bAlter || bNew) { - m_sName = ::rtl::OUString(); + m_sName = OUString(); stopTableListening(); m_xTable = NULL; } @@ -481,7 +481,7 @@ void OTableController::doEditIndexes() } Reference< XNameAccess > xIndexes; // will be the keys of the table - Sequence< ::rtl::OUString > aFieldNames; // will be the column names of the table + Sequence< OUString > aFieldNames; // will be the column names of the table try { // get the keys @@ -528,7 +528,7 @@ void OTableController::impl_initialize() const NamedValueCollection& rArguments( getInitParams() ); - rArguments.get_ensureType( (::rtl::OUString)PROPERTY_CURRENTTABLE, m_sName ); + rArguments.get_ensureType( (OUString)PROPERTY_CURRENTTABLE, m_sName ); // read autoincrement value set in the datasource ::dbaui::fillAutoIncrementValue(getDataSource(),m_bAllowAutoIncrementValue,m_sAutoIncrementValue); @@ -829,9 +829,9 @@ void OTableController::loadData() // Bei Add und Drop koennen alle Zeilen editiert werden. // sal_Bool bReadOldRow = xMetaData->supportsAlterTableWithAddColumn() && xMetaData->supportsAlterTableWithDropColumn(); sal_Bool bIsAlterAllowed = isAlterAllowed(); - Sequence< ::rtl::OUString> aColumns = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aColumns.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aColumns.getLength(); + Sequence< OUString> aColumns = xColumns->getElementNames(); + const OUString* pIter = aColumns.getConstArray(); + const OUString* pEnd = pIter + aColumns.getLength(); for(;pIter != pEnd;++pIter) { @@ -845,7 +845,7 @@ void OTableController::loadData() sal_Int32 nAlign = 0; sal_Bool bIsAutoIncrement = false, bIsCurrency = false; - ::rtl::OUString sName,sDescription,sTypeName,sHelpText; + OUString sName,sDescription,sTypeName,sHelpText; Any aControlDefault; // get the properties from the column @@ -873,7 +873,7 @@ void OTableController::loadData() pTabEdRow->SetReadOnly(!bIsAlterAllowed); // search for type sal_Bool bForce; - ::rtl::OUString sCreate("x"); + OUString sCreate("x"); TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,sCreate,nPrecision,nScale,bIsAutoIncrement,bForce); if ( !pTypeInfo.get() ) pTypeInfo = m_pTypeInfo; @@ -904,9 +904,9 @@ void OTableController::loadData() Reference xKeyColumns = getKeyColumns(); if(xKeyColumns.is()) { - Sequence< ::rtl::OUString> aKeyColumns = xKeyColumns->getElementNames(); - const ::rtl::OUString* pKeyBegin = aKeyColumns.getConstArray(); - const ::rtl::OUString* pKeyEnd = pKeyBegin + aKeyColumns.getLength(); + Sequence< OUString> aKeyColumns = xKeyColumns->getElementNames(); + const OUString* pKeyBegin = aKeyColumns.getConstArray(); + const OUString* pKeyEnd = pKeyBegin + aKeyColumns.getLength(); for(;pKeyBegin != pKeyEnd;++pKeyBegin) { @@ -999,7 +999,7 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew) throw(::com::sun::star:: pActFieldDescr->SetAutoIncrement(sal_False); pActFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); - pActFieldDescr->SetName( createUniqueName(::rtl::OUString("ID") )); + pActFieldDescr->SetName( createUniqueName(OUString("ID") )); pActFieldDescr->SetPrimaryKey( sal_True ); m_vRowList.insert(m_vRowList.begin(),pNewRow); @@ -1037,7 +1037,7 @@ void OTableController::alterColumns() // contains all columns names which are already handled those which are not in the list will be deleted Reference< XDatabaseMetaData> xMetaData = getMetaData( ); - ::std::map< ::rtl::OUString,sal_Bool,::comphelper::UStringMixLess> aColumns(xMetaData.is() ? (xMetaData->supportsMixedCaseQuotedIdentifiers() ? true : false): sal_True); + ::std::map< OUString,sal_Bool,::comphelper::UStringMixLess> aColumns(xMetaData.is() ? (xMetaData->supportsMixedCaseQuotedIdentifiers() ? true : false): sal_True); ::std::vector< ::boost::shared_ptr >::iterator aIter = m_vRowList.begin(); ::std::vector< ::boost::shared_ptr >::iterator aEnd = m_vRowList.end(); // first look for columns where something other than the name changed @@ -1063,7 +1063,7 @@ void OTableController::alterColumns() sal_Int32 nType=0,nPrecision=0,nScale=0,nNullable=0; sal_Bool bAutoIncrement = false; - ::rtl::OUString sTypeName,sDescription; + OUString sTypeName,sDescription; xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType; xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision; @@ -1172,7 +1172,7 @@ void OTableController::alterColumns() if ( aMsg.Execute() != RET_YES ) { Reference xNewColumn(xIdxColumns->getByIndex(nPos),UNO_QUERY_THROW); - ::rtl::OUString sName; + OUString sName; xNewColumn->getPropertyValue(PROPERTY_NAME) >>= sName; aColumns[sName] = sal_True; aColumns[pField->GetName()] = sal_True; @@ -1223,9 +1223,9 @@ void OTableController::alterColumns() // now we have to look for the columns who could be deleted if ( xDrop.is() ) { - Sequence< ::rtl::OUString> aColumnNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aColumnNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aColumnNames.getLength(); + Sequence< OUString> aColumnNames = xColumns->getElementNames(); + const OUString* pIter = aColumnNames.getConstArray(); + const OUString* pEnd = pIter + aColumnNames.getLength(); for(;pIter != pEnd;++pIter) { if(aColumns.find(*pIter) == aColumns.end()) // found a column to delete @@ -1258,7 +1258,7 @@ void OTableController::alterColumns() SQLException aNewException; aNewException.Message = sError; - aNewException.SQLState = ::rtl::OUString("S1000"); + aNewException.SQLState = OUString("S1000"); aNewException.NextException = ::cppu::getCaughtException(); throw aNewException; @@ -1495,9 +1495,9 @@ void OTableController::reSyncRows() setModified(sal_False); // and we are not modified yet } // ----------------------------------------------------------------------------- -::rtl::OUString OTableController::createUniqueName(const ::rtl::OUString& _rName) +OUString OTableController::createUniqueName(const OUString& _rName) { - ::rtl::OUString sName = _rName; + OUString sName = _rName; Reference< XDatabaseMetaData> xMetaData = getMetaData( ); ::comphelper::UStringMixEqual bCase(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : sal_True); @@ -1509,16 +1509,16 @@ void OTableController::reSyncRows() OFieldDescription* pFieldDesc = (*aIter)->GetActFieldDescr(); if (pFieldDesc && !pFieldDesc->GetName().isEmpty() && bCase(sName,pFieldDesc->GetName())) { // found a second name of _rName so we need another - sName = _rName + ::rtl::OUString::valueOf(++i); + sName = _rName + OUString::valueOf(++i); aIter = m_vRowList.begin(); // and retry } } return sName; } // ----------------------------------------------------------------------------- -::rtl::OUString OTableController::getPrivateTitle() const +OUString OTableController::getPrivateTitle() const { - ::rtl::OUString sTitle; + OUString sTitle; try { // get the table @@ -1533,7 +1533,7 @@ void OTableController::reSyncRows() { String aName = String(ModuleRes(STR_TBL_TITLE)); sTitle = aName.GetToken(0,' '); - sTitle += ::rtl::OUString::valueOf(getCurrentStartNumber()); + sTitle += OUString::valueOf(getCurrentStartNumber()); } } catch( const Exception& ) diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 5a01b0491d8e..ca2bea139c21 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -74,7 +74,7 @@ void OTableRowView::Init() SetFont(aFont); // HandleColumn, fuer maximal fuenf Ziffern einrichten - InsertHandleColumn(static_cast(GetTextWidth(rtl::OUString('0')) * 4)/*, sal_True */); + InsertHandleColumn(static_cast(GetTextWidth(OUString('0')) * 4)/*, sal_True */); BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL; @@ -99,7 +99,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt ) if( rEvt.GetKeyCode().GetCode() == KEY_F2 ) { ::com::sun::star::util::URL aUrl; - aUrl.Complete =::rtl::OUString(".uno:DSBEditDoc"); + aUrl.Complete =OUString(".uno:DSBEditDoc"); GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() ); } } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index 9b56fe1c5cdb..457035c43cdb 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -57,7 +57,7 @@ sal_Bool OTableFieldControl::IsReadOnly() { // Die Spalten einer ::com::sun::star::sdbcx::View können nicht verändert werden Reference xTable = GetCtrl()->GetView()->getController().getTable(); - if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString("VIEW")) + if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == OUString("VIEW")) bRead = sal_True; else { @@ -136,7 +136,7 @@ sal_Bool OTableFieldControl::isAutoIncrementValueEnabled() const return const_cast(this)->GetCtrl()->GetView()->getController().isAutoIncrementValueEnabled(); } // ----------------------------------------------------------------------------- -::rtl::OUString OTableFieldControl::getAutoIncrementValue() const +OUString OTableFieldControl::getAutoIncrementValue() const { return const_cast(this)->GetCtrl()->GetView()->getController().getAutoIncrementValue(); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index c62a50a9950f..e95b5f36c74c 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -45,7 +45,7 @@ namespace dbaui virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos); virtual const OTypeInfoMap* getTypeInfo() const; virtual sal_Bool isAutoIncrementValueEnabled() const; - virtual ::rtl::OUString getAutoIncrementValue() const; + virtual OUString getAutoIncrementValue() const; public: OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar); diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 37cec07b7109..da1e61b3c0c3 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -181,7 +181,7 @@ namespace dbaui } case 2: sValue = _rStr.ReadUniOrByteString(_rStr.GetStreamCharSet()); - aControlDefault <<= ::rtl::OUString(sValue); + aControlDefault <<= OUString(sValue); break; } diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 45e69977fe9e..2cf9086778fb 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -48,12 +48,12 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); @@ -88,15 +88,15 @@ namespace dbaui } //------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- - ::rtl::OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException) + OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog"); + return OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog"); } //------------------------------------------------------------------------- @@ -109,7 +109,7 @@ namespace dbaui ::comphelper::StringSequence OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.AdvancedDatabaseSettingsDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.AdvancedDatabaseSettingsDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 47ad0d93d140..62d342567efa 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -53,9 +53,9 @@ Reference< XInterface > SAL_CALL OColumnControl::Create(const Reference< XMultiS return static_cast< XServiceInfo* >(new OColumnControl(comphelper::getComponentContext(_rxORB))); } // ----------------------------------------------------------------------------- -::rtl::OUString OColumnControl::GetComponentServiceName() +OUString OColumnControl::GetComponentServiceName() { - return ::rtl::OUString("com.sun.star.sdb.ColumnDescriptorControl"); + return OUString("com.sun.star.sdb.ColumnDescriptorControl"); } // ----------------------------------------------------------------------------- void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer) throw( RuntimeException ) diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 02db6c2c2614..2a2e6dafef54 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -32,7 +32,7 @@ namespace dbaui OColumnControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext); // UnoControl - virtual ::rtl::OUString GetComponentServiceName(); + virtual OUString GetComponentServiceName(); // XServiceInfo DECLARE_SERVICE_INFO_STATIC(); diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index cdb7d4748674..4d8caec6901c 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -134,9 +134,9 @@ Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType ) throw(Ru return aRet; } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OColumnControlModel::getServiceName() throw ( RuntimeException) +OUString SAL_CALL OColumnControlModel::getServiceName() throw ( RuntimeException) { - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------ void OColumnControlModel::write(const Reference& /*_rxOutStream*/) throw ( ::com::sun::star::io::IOException, RuntimeException) diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index 01234460d42c..385284094e33 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -57,7 +57,7 @@ class OColumnControlModel : public ::comphelper::OMutexAndBroadcastHelper // [properties] ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xColumn; - ::rtl::OUString m_sDefaultControl; + OUString m_sDefaultControl; ::com::sun::star::uno::Any m_aTabStop; sal_Bool m_bEnable; sal_Int16 m_nBorder; @@ -87,7 +87,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index b4e20a95599e..8fa2b380c91f 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -74,7 +74,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) sal_Int32 nScale = 0; sal_Int32 nPrecision = 0; sal_Bool bAutoIncrement = sal_False; - ::rtl::OUString sTypeName; + OUString sTypeName; try { @@ -91,7 +91,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) m_pActFieldDescr = new OFieldDescription(_xColumn,sal_True); // search for type - ::rtl::OUString sCreateParam("x"); + OUString sCreateParam("x"); sal_Bool bForce; TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(*pFieldControl->getTypeInfo(),nType,sTypeName,sCreateParam,nPrecision,nScale,bAutoIncrement,bForce); if ( !pTypeInfo.get() ) @@ -112,7 +112,7 @@ void OColumnPeer::setConnection(const Reference< XConnection>& _xCon) pFieldControl->setConnection(_xCon); } //------------------------------------------------------------------------------ -void OColumnPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& Value) throw( RuntimeException ) +void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -130,7 +130,7 @@ void OColumnPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& VCLXWindow::setProperty(_rPropertyName,Value); } // ----------------------------------------------------------------------------- -Any OColumnPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( RuntimeException ) +Any OColumnPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException ) { Any aProp; OFieldDescControl* pFieldControl = static_cast( GetWindow() ); diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index 3b97a6d6acf0..45e78ec5ad91 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -42,8 +42,8 @@ namespace dbaui void setConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xCon); void setEditWidth(sal_Int32 _nWidth); // VCLXWindow - virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); }; //......................................................................... } // namespace dbaui diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index 77fb2f87724b..540f335ab4d6 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -59,15 +59,15 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODBTypeWizDialog::getImplementationName() throw(RuntimeException) +OUString SAL_CALL ODBTypeWizDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException) +OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.ODBTypeWizDialog"); + return OUString("org.openoffice.comp.dbu.ODBTypeWizDialog"); } //------------------------------------------------------------------------- @@ -80,7 +80,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult ::comphelper::StringSequence ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DataSourceTypeChangeDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.DataSourceTypeChangeDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 77f93d7891dd..1fe6bb65f393 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -44,12 +44,12 @@ public: virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index a6d83ea78a71..d3bec7582215 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -53,10 +53,10 @@ ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XComponentContext ,m_bOpenDatabase(sal_True) ,m_bStartTableWizard(sal_False) { - registerProperty(::rtl::OUString("OpenDatabase"), 3, PropertyAttribute::TRANSIENT, + registerProperty(OUString("OpenDatabase"), 3, PropertyAttribute::TRANSIENT, &m_bOpenDatabase, getBooleanCppuType()); - registerProperty(::rtl::OUString("StartTableWizard"), 4, PropertyAttribute::TRANSIENT, + registerProperty(OUString("StartTableWizard"), 4, PropertyAttribute::TRANSIENT, &m_bStartTableWizard, getBooleanCppuType()); } //------------------------------------------------------------------------- @@ -74,15 +74,15 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName() throw(RuntimeException) +OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeException) +OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"); + return OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"); } //------------------------------------------------------------------------- @@ -95,7 +95,7 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< ::comphelper::StringSequence ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DatabaseWizardDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.DatabaseWizardDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index fc9eb22bdf3d..afce6e0a2b7c 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -35,7 +35,7 @@ class ODBTypeWizDialogSetup :public ODatabaseAdministrationDialog ,public ::comphelper::OPropertyArrayUsageHelper< ODBTypeWizDialogSetup > { - ::rtl::OUString m_sExistingDocToOpen; + OUString m_sExistingDocToOpen; sal_Bool m_bOpenDatabase; sal_Bool m_bStartTableWizard; @@ -47,12 +47,12 @@ public: virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index a4411a77a4dc..c24a1b31f1f9 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -60,15 +60,15 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OTableFilterDialog::getImplementationName() throw(RuntimeException) +OUString SAL_CALL OTableFilterDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeException) +OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.OTableFilterDialog"); + return OUString("org.openoffice.comp.dbu.OTableFilterDialog"); } //------------------------------------------------------------------------- @@ -81,7 +81,7 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu ::comphelper::StringSequence OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableFilterDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.TableFilterDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 4982c5d1f229..0e9dd004148b 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -44,12 +44,12 @@ public: virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 7fa2a8ee8035..3bef400319a5 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -60,15 +60,15 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OUserSettingsDialog::getImplementationName() throw(RuntimeException) +OUString SAL_CALL OUserSettingsDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeException) +OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.OUserSettingsDialog"); + return OUString("org.openoffice.comp.dbu.OUserSettingsDialog"); } //------------------------------------------------------------------------- @@ -81,7 +81,7 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM ::comphelper::StringSequence OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.UserAdministrationDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.UserAdministrationDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index 7e3e05ed82f3..da3e82882931 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -44,12 +44,12 @@ public: virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index 6d6acb79eccf..b370e3352994 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -60,15 +60,15 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODataSourcePropertyDialog::getImplementationName() throw(RuntimeException) +OUString SAL_CALL ODataSourcePropertyDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- -::rtl::OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(RuntimeException) +OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"); + return OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"); } //------------------------------------------------------------------------- @@ -81,7 +81,7 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen ::comphelper::StringSequence ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.DatasourceAdministrationDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.DatasourceAdministrationDialog"); return aSupported; } diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 0c63cf34efcc..6d7a6d0375a5 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -44,12 +44,12 @@ public: virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index fb9741792985..bf062f4b2927 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -87,19 +87,19 @@ namespace dbaui virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const; // Overrides to resolve inheritance ambiguity - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) throw (css::uno::RuntimeException) + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw (css::uno::RuntimeException) + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::uno::RuntimeException) { return ODatabaseAdministrationDialog::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw (css::uno::RuntimeException) + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference& p2) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw (css::uno::RuntimeException) + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference& p2) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw (css::uno::RuntimeException) + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference& p2) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw (css::uno::RuntimeException) + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference& p2) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::removeVetoableChangeListener(p1, p2); } - virtual void SAL_CALL setTitle(const rtl::OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setTitle(const OUString& p1) throw (css::uno::RuntimeException) { ODatabaseAdministrationDialog::setTitle(p1); } virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException) { return ODatabaseAdministrationDialog::execute(); } @@ -166,44 +166,44 @@ namespace dbaui aProps.realloc( nProp + 6 ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "HeaderLine" ), + OUString( "HeaderLine" ), PROPERTY_ID_HEADER_LINE, ::cppu::UnoType< sal_Bool >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "FieldDelimiter" ), + OUString( "FieldDelimiter" ), PROPERTY_ID_FIELD_DELIMITER, - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "StringDelimiter" ), + OUString( "StringDelimiter" ), PROPERTY_ID_STRING_DELIMITER, - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "DecimalDelimiter" ), + OUString( "DecimalDelimiter" ), PROPERTY_ID_DECIMAL_DELIMITER, - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "ThousandDelimiter" ), + OUString( "ThousandDelimiter" ), PROPERTY_ID_THOUSAND_DELIMITER, - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); aProps[ nProp++ ] = Property( - ::rtl::OUString( "CharSet" ), + OUString( "CharSet" ), PROPERTY_ID_ENCODING, - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), PropertyAttribute::TRANSIENT ); diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 54c614489293..b57a498e35c1 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -45,7 +45,7 @@ namespace dbaui ,public ODirectSQLDialog_PBASE { OModuleClient m_aModuleClient; - ::rtl::OUString m_sInitialSelection; + OUString m_sInitialSelection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; protected: ODirectSQLDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 2f44f7307d13..f53f08cf3422 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -49,7 +49,7 @@ namespace desktop --------------------------------------------------------------------*/ class CommandLineArgs; class Lockfile; -class AcceptorMap : public std::map< rtl::OUString, Reference > {}; +class AcceptorMap : public std::map< OUString, Reference > {}; struct ConvertData; class Desktop : public Application { @@ -128,7 +128,7 @@ class Desktop : public Application static void SetRestartState(); void SynchronizeExtensionRepositories(); - void SetSplashScreenText( const ::rtl::OUString& rText ); + void SetSplashScreenText( const OUString& rText ); void SetSplashScreenProgress( sal_Int32 ); // Bootstrap methods @@ -144,18 +144,18 @@ class Desktop : public Application void CreateTemporaryDirectory(); void RemoveTemporaryDirectory(); - sal_Bool InitializeInstallation( const rtl::OUString& rAppFilename ); + sal_Bool InitializeInstallation( const OUString& rAppFilename ); bool InitializeConfiguration(); void FlushConfiguration(); static sal_Bool shouldLaunchQuickstart(); sal_Bool InitializeQuickstartMode( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const ::rtl::OUString& aMsg ); - void StartSetup( const ::rtl::OUString& aParameters ); + void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg ); + void StartSetup( const OUString& aParameters ); // Create a error message depending on bootstrap failure code and an optional file url - ::rtl::OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, - const ::rtl::OUString& aFileURL ); + OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, + const OUString& aFileURL ); static void PreloadModuleData( const CommandLineArgs& ); static void PreloadConfigurationData(); @@ -184,9 +184,9 @@ class Desktop : public Application static sal_Bool isUIOnSessionShutdownAllowed(); // on-demand acceptors - static void createAcceptor(const rtl::OUString& aDescription); + static void createAcceptor(const OUString& aDescription); static void enableAcceptors(); - static void destroyAcceptor(const rtl::OUString& aDescription); + static void destroyAcceptor(const OUString& aDescription); bool m_bCleanedExtensionCache; bool m_bServicesRegistered; diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx index a0c093953e76..124e831f8348 100644 --- a/desktop/qa/deployment_misc/test_dp_version.cxx +++ b/desktop/qa/deployment_misc/test_dp_version.cxx @@ -42,23 +42,23 @@ public: void Test::test() { struct Data { - rtl::OUString version1; - rtl::OUString version2; + OUString version1; + OUString version2; ::dp_misc::Order order; }; static Data const data[] = { - { rtl::OUString(), - rtl::OUString("0.0000.00.0"), + { OUString(), + OUString("0.0000.00.0"), ::dp_misc::EQUAL }, - { rtl::OUString(".01"), - rtl::OUString("0.1"), + { OUString(".01"), + OUString("0.1"), ::dp_misc::EQUAL }, - { rtl::OUString("10"), - rtl::OUString("2"), + { OUString("10"), + OUString("2"), ::dp_misc::GREATER }, - { rtl::OUString("9223372036854775808"), + { OUString("9223372036854775808"), // 2^63 - rtl::OUString("9223372036854775807"), + OUString("9223372036854775807"), ::dp_misc::GREATER } }; for (::std::size_t i = 0; i < sizeof data / sizeof (Data); ++i) { diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 32ec153709ad..8ca7705444f2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -426,9 +426,9 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) // are allowed. Otherwise we will force a "crash inside a crash". // Thats why we have to use a special native message box here which does not use yield :-) //============================================================================= -void FatalError(const ::rtl::OUString& sMessage) +void FatalError(const OUString& sMessage) { - ::rtl::OUString sProductKey = ::utl::Bootstrap::getProductKey(); + OUString sProductKey = ::utl::Bootstrap::getProductKey(); if ( sProductKey.isEmpty()) { osl_getExecutableFile( &sProductKey.pData ); @@ -438,7 +438,7 @@ void FatalError(const ::rtl::OUString& sMessage) sProductKey = sProductKey.copy( nLastIndex+1 ); } - ::rtl::OUStringBuffer sTitle (128); + OUStringBuffer sTitle (128); sTitle.append (sProductKey ); sTitle.appendAscii (" - Fatal Error"); @@ -484,20 +484,20 @@ namespace : public rtl::Static< String, WriterCompatibilityVersionOOo11 > {}; } -rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) +OUString ReplaceStringHookProc( const OUString& rStr ) { - rtl::OUString sRet(rStr); + OUString sRet(rStr); if (sRet.indexOf("%PRODUCT") != -1 || sRet.indexOf("%ABOUTBOX") != -1) { - rtl::OUString sBrandName = BrandName::get(); - rtl::OUString sVersion = Version::get(); - rtl::OUString sBuildId = utl::Bootstrap::getBuildIdData("development"); - rtl::OUString sAboutBoxVersion = AboutBoxVersion::get(); - rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); - rtl::OUString sExtension = Extension::get(); - rtl::OUString sXMLFileFormatName = XMLFileFormatName::get(); - rtl::OUString sXMLFileFormatVersion = XMLFileFormatVersion::get(); + OUString sBrandName = BrandName::get(); + OUString sVersion = Version::get(); + OUString sBuildId = utl::Bootstrap::getBuildIdData("development"); + OUString sAboutBoxVersion = AboutBoxVersion::get(); + OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); + OUString sExtension = Extension::get(); + OUString sXMLFileFormatName = XMLFileFormatName::get(); + OUString sXMLFileFormatVersion = XMLFileFormatVersion::get(); if ( sBrandName.isEmpty() ) { @@ -526,7 +526,7 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) if ( sRet.indexOf( "%OOOVENDOR" ) != -1 ) { - rtl::OUString sOOOVendor = OOOVendor::get(); + OUString sOOOVendor = OOOVendor::get(); if ( sOOOVendor.isEmpty() ) { @@ -538,7 +538,7 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) if ( sRet.indexOf( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != -1 ) { - rtl::OUString sWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get(); + OUString sWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get(); if ( sWriterCompatibilityVersionOOo11.isEmpty() ) { sWriterCompatibilityVersionOOo11 = @@ -736,8 +736,8 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat { if ( aBootstrapStatus != ::utl::Bootstrap::DATA_OK ) { - ::rtl::OUString aProductKey; - ::rtl::OUString aTemp; + OUString aProductKey; + OUString aTemp; osl_getExecutableFile( &aProductKey.pData ); sal_uInt32 lastIndex = aProductKey.lastIndexOf('/'); @@ -761,9 +761,9 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat } // Create a error message depending on bootstrap failure code and an optional file url -::rtl::OUString Desktop::CreateErrorMsgString( +OUString Desktop::CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, - const ::rtl::OUString& aFileURL ) + const OUString& aFileURL ) { OUString aMsg; OUString aFilePath; @@ -1121,10 +1121,10 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave , sal_Bool bCrashed , sal_Bool bExistsRecoveryData) { - static ::rtl::OUString SERVICENAME_RECOVERYUI("com.sun.star.comp.svx.RecoveryUI"); - static ::rtl::OUString COMMAND_EMERGENCYSAVE("vnd.sun.star.autorecovery:/doEmergencySave"); - static ::rtl::OUString COMMAND_RECOVERY("vnd.sun.star.autorecovery:/doAutoRecovery"); - static ::rtl::OUString COMMAND_CRASHREPORT("vnd.sun.star.autorecovery:/doCrashReport"); + static OUString SERVICENAME_RECOVERYUI("com.sun.star.comp.svx.RecoveryUI"); + static OUString COMMAND_EMERGENCYSAVE("vnd.sun.star.autorecovery:/doEmergencySave"); + static OUString COMMAND_RECOVERY("vnd.sun.star.autorecovery:/doAutoRecovery"); + static OUString COMMAND_CRASHREPORT("vnd.sun.star.autorecovery:/doCrashReport"); css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -1182,10 +1182,10 @@ void restartOnMac(bool passArguments) { ErrorBox aRestartBox( NULL, WB_OK, aMessage ); aRestartBox.Execute(); #else - rtl::OUString execUrl; + OUString execUrl; OSL_VERIFY(osl_getExecutableFile(&execUrl.pData) == osl_Process_E_None); - rtl::OUString execPath; - rtl::OString execPath8; + OUString execPath; + OString execPath8; if ((osl::FileBase::getSystemPathFromFileURL(execUrl, execPath) != osl::FileBase::E_None) || !execPath.convertToString( @@ -1195,18 +1195,18 @@ void restartOnMac(bool passArguments) { { std::abort(); } - std::vector< rtl::OString > args; + std::vector< OString > args; args.push_back(execPath8); bool wait = false; if (passArguments) { sal_uInt32 n = osl_getCommandArgCount(); for (sal_uInt32 i = 0; i < n; ++i) { - rtl::OUString arg; + OUString arg; OSL_VERIFY(osl_getCommandArg(i, &arg.pData) == osl_Process_E_None); if (arg.match("--accept=")) { wait = true; } - rtl::OString arg8; + OString arg8; if (!arg.convertToString( &arg8, osl_getThreadTextEncoding(), (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | @@ -1218,7 +1218,7 @@ void restartOnMac(bool passArguments) { } } std::vector< char const * > argPtrs; - for (std::vector< rtl::OString >::iterator i(args.begin()); i != args.end(); + for (std::vector< OString >::iterator i(args.begin()); i != args.end(); ++i) { argPtrs.push_back(i->getStr()); @@ -1507,8 +1507,8 @@ int Desktop::Main() #ifdef DBG_UTIL //include buildid in non product builds - ::rtl::OUString aDefault("development"); - aTitle += rtl::OUString(" ["); + OUString aDefault("development"); + aTitle += OUString(" ["); String aVerId( utl::Bootstrap::getBuildIdData(aDefault)); aTitle += aVerId; aTitle += ']'; @@ -1565,7 +1565,7 @@ int Desktop::Main() pExecGlobals->pLanguageOptions.reset( new SvtLanguageOptions(sal_True)); css::document::EventObject aEvent; - aEvent.EventName = ::rtl::OUString("OnStartApp"); + aEvent.EventName = OUString("OnStartApp"); pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent); SetSplashScreenProgress(50); @@ -1771,7 +1771,7 @@ int Desktop::doShutdown() if (pExecGlobals->xGlobalBroadcaster.is()) { css::document::EventObject aEvent; - aEvent.EventName = ::rtl::OUString("OnCloseApp"); + aEvent.EventName = OUString("OnCloseApp"); pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent); } @@ -2062,15 +2062,15 @@ void Desktop::EnableOleAutomation() RTL_LOGFILE_CONTEXT( aLog, "desktop (jl97489) ::Desktop::EnableOleAutomation" ); #ifdef WNT Reference< XMultiServiceFactory > xSMgr= comphelper::getProcessServiceFactory(); - xSMgr->createInstance(rtl::OUString("com.sun.star.bridge.OleApplicationRegistration")); - xSMgr->createInstance(rtl::OUString("com.sun.star.comp.ole.EmbedServer")); + xSMgr->createInstance(OUString("com.sun.star.bridge.OleApplicationRegistration")); + xSMgr->createInstance(OUString("com.sun.star.comp.ole.EmbedServer")); #endif } void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { Sequence < com::sun::star::beans::PropertyValue > args(1); - args[0].Name = ::rtl::OUString("Hidden"); + args[0].Name = OUString("Hidden"); args[0].Value <<= sal_True; Reference < XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() ); @@ -2078,8 +2078,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( rtl::OUString("private:factory/swriter"), - ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/swriter"), + OUString("_blank"), 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const com::sun::star::uno::Exception& ) @@ -2090,8 +2090,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( rtl::OUString("private:factory/scalc"), - ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/scalc"), + OUString("_blank"), 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const com::sun::star::uno::Exception& ) @@ -2102,8 +2102,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( rtl::OUString("private:factory/sdraw"), - ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/sdraw"), + OUString("_blank"), 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const com::sun::star::uno::Exception& ) @@ -2114,8 +2114,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( rtl::OUString("private:factory/simpress"), - ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/simpress"), + OUString("_blank"), 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const com::sun::star::uno::Exception& ) @@ -2129,10 +2129,10 @@ void Desktop::PreloadConfigurationData() Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XNameAccess > xNameAccess = css::frame::UICommandDescription::create(xContext); - rtl::OUString aWriterDoc( "com.sun.star.text.TextDocument" ); - rtl::OUString aCalcDoc( "com.sun.star.sheet.SpreadsheetDocument" ); - rtl::OUString aDrawDoc( "com.sun.star.drawing.DrawingDocument" ); - rtl::OUString aImpressDoc( "com.sun.star.presentation.PresentationDocument" ); + OUString aWriterDoc( "com.sun.star.text.TextDocument" ); + OUString aCalcDoc( "com.sun.star.sheet.SpreadsheetDocument" ); + OUString aDrawDoc( "com.sun.star.drawing.DrawingDocument" ); + OUString aImpressDoc( "com.sun.star.presentation.PresentationDocument" ); // preload commands configuration Any a; @@ -2144,8 +2144,8 @@ void Desktop::PreloadConfigurationData() a >>= xCmdAccess; if ( xCmdAccess.is() ) { - xCmdAccess->getByName( rtl::OUString( ".uno:BasicShapes" )); - xCmdAccess->getByName( rtl::OUString( ".uno:EditGlossary" )); + xCmdAccess->getByName( OUString( ".uno:BasicShapes" )); + xCmdAccess->getByName( OUString( ".uno:EditGlossary" )); } } catch ( const ::com::sun::star::uno::Exception& ) @@ -2157,7 +2157,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aCalcDoc ); a >>= xCmdAccess; if ( xCmdAccess.is() ) - xCmdAccess->getByName( rtl::OUString( ".uno:InsertObjectStarMath" )); + xCmdAccess->getByName( OUString( ".uno:InsertObjectStarMath" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2169,7 +2169,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aDrawDoc ); a >>= xCmdAccess; if ( xCmdAccess.is() ) - xCmdAccess->getByName( rtl::OUString( ".uno:Polygon" )); + xCmdAccess->getByName( OUString( ".uno:Polygon" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2183,7 +2183,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aWriterDoc ); a >>= xWindowAccess; if ( xWindowAccess.is() ) - xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" )); + xWindowAccess->getByName( OUString( "private:resource/toolbar/standardbar" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2193,7 +2193,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aCalcDoc ); a >>= xWindowAccess; if ( xWindowAccess.is() ) - xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" )); + xWindowAccess->getByName( OUString( "private:resource/toolbar/standardbar" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2203,7 +2203,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aDrawDoc ); a >>= xWindowAccess; if ( xWindowAccess.is() ) - xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" )); + xWindowAccess->getByName( OUString( "private:resource/toolbar/standardbar" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2213,7 +2213,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aImpressDoc ); a >>= xWindowAccess; if ( xWindowAccess.is() ) - xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" )); + xWindowAccess->getByName( OUString( "private:resource/toolbar/standardbar" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2237,7 +2237,7 @@ void Desktop::PreloadConfigurationData() try { xPopupMenuControllerFactory->hasController( - rtl::OUString( ".uno:CharFontName" ), + OUString( ".uno:CharFontName" ), OUString() ); } catch ( const ::com::sun::star::uno::Exception& ) @@ -2289,7 +2289,7 @@ void Desktop::OpenClients() if (!rArgs.IsQuickstart()) { sal_Bool bShowHelp = sal_False; - ::rtl::OUStringBuffer aHelpURLBuffer; + OUStringBuffer aHelpURLBuffer; if (rArgs.IsHelpWriter()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://swriter/start"); @@ -2382,7 +2382,7 @@ void Desktop::OpenClients() Reference< css::util::XURLTransformer > xParser = css::util::URLTransformer::create( ::comphelper::getProcessComponentContext() ); css::util::URL aCmd; - aCmd.Complete = ::rtl::OUString("vnd.sun.star.autorecovery:/disableRecovery"); + aCmd.Complete = OUString("vnd.sun.star.autorecovery:/disableRecovery"); xParser->parseStrict(aCmd); xRecovery->dispatch(aCmd, css::uno::Sequence< css::beans::PropertyValue >()); @@ -2432,7 +2432,7 @@ void Desktop::OpenClients() xSessionListener = SessionListener::createWithOnQuitFlag(::comphelper::getProcessComponentContext(), bAllowUI); -// css::beans::NamedValue aProperty( ::rtl::OUString( "AllowUserInteractionOnQuit" ), +// css::beans::NamedValue aProperty( OUString( "AllowUserInteractionOnQuit" ), // css::uno::makeAny( bAllowUI ) ); // css::uno::Sequence< css::uno::Any > aArgs( 1 ); // aArgs[0] <<= aProperty; @@ -2552,7 +2552,7 @@ void Desktop::OpenDefault() RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::OpenDefault" ); - ::rtl::OUString aName; + OUString aName; SvtModuleOptions aOpt; const CommandLineArgs& rArgs = GetCommandLineArgs(); @@ -2603,7 +2603,7 @@ void Desktop::OpenDefault() String GetURL_Impl( - const String& rName, boost::optional< rtl::OUString > const & cwdUrl ) + const String& rName, boost::optional< OUString > const & cwdUrl ) { // if rName is a vnd.sun.star.script URL do not attempt to parse it // as INetURLObj does not handle handle there URLs @@ -2784,15 +2784,15 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) Reference< css::util::XURLTransformer > xParser = css::util::URLTransformer::create(xContext); css::util::URL aCommand; - if( rAppEvent.GetData() == ::rtl::OUString("PREFERENCES") ) - aCommand.Complete = rtl::OUString( ".uno:OptionsTreeDialog" ); - else if( rAppEvent.GetData() == ::rtl::OUString("ABOUT") ) - aCommand.Complete = rtl::OUString( ".uno:About" ); + if( rAppEvent.GetData() == OUString("PREFERENCES") ) + aCommand.Complete = OUString( ".uno:OptionsTreeDialog" ); + else if( rAppEvent.GetData() == OUString("ABOUT") ) + aCommand.Complete = OUString( ".uno:About" ); if( !aCommand.Complete.isEmpty() ) { xParser->parseStrict(aCommand); - css::uno::Reference< css::frame::XDispatch > xDispatch = xDesktop->queryDispatch(aCommand, rtl::OUString(), 0); + css::uno::Reference< css::frame::XDispatch > xDispatch = xDesktop->queryDispatch(aCommand, OUString(), 0); if (xDispatch.is()) xDispatch->dispatch(aCommand, css::uno::Sequence< css::beans::PropertyValue >()); } @@ -2828,21 +2828,21 @@ void Desktop::OpenSplashScreen() // Determine application name from command line parameters OUString aAppName; if ( rCmdLine.IsWriter() ) - aAppName = rtl::OUString( "writer" ); + aAppName = OUString( "writer" ); else if ( rCmdLine.IsCalc() ) - aAppName = rtl::OUString( "calc" ); + aAppName = OUString( "calc" ); else if ( rCmdLine.IsDraw() ) - aAppName = rtl::OUString( "draw" ); + aAppName = OUString( "draw" ); else if ( rCmdLine.IsImpress() ) - aAppName = rtl::OUString( "impress" ); + aAppName = OUString( "impress" ); else if ( rCmdLine.IsBase() ) - aAppName = rtl::OUString( "base" ); + aAppName = OUString( "base" ); else if ( rCmdLine.IsGlobal() ) - aAppName = rtl::OUString( "global" ); + aAppName = OUString( "global" ); else if ( rCmdLine.IsMath() ) - aAppName = rtl::OUString( "math" ); + aAppName = OUString( "math" ); else if ( rCmdLine.IsWeb() ) - aAppName = rtl::OUString( "web" ); + aAppName = OUString( "web" ); // Which splash to use OUString aSplashService( "com.sun.star.office.SplashScreen" ); @@ -2872,7 +2872,7 @@ void Desktop::SetSplashScreenProgress(sal_Int32 iProgress) } } -void Desktop::SetSplashScreenText( const ::rtl::OUString& rText ) +void Desktop::SetSplashScreenText( const OUString& rText ) { if( m_rSplashScreen.is() ) { @@ -2895,7 +2895,7 @@ void Desktop::DoFirstRunInitializations() try { Reference< XJobExecutor > xExecutor = JobExecutor::create( ::comphelper::getProcessComponentContext() ); - xExecutor->trigger( ::rtl::OUString("onFirstRunInitialization") ); + xExecutor->trigger( OUString("onFirstRunInitialization") ); } catch(const ::com::sun::star::uno::Exception&) { diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx index 471f77bca391..af9eb0516bdc 100644 --- a/desktop/source/app/appfirststart.cxx +++ b/desktop/source/app/appfirststart.cxx @@ -30,7 +30,6 @@ #include "app.hxx" -using ::rtl::OUString; using namespace ::desktop; using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -47,7 +46,7 @@ static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rP NamedValue aValue( OUString( "nodepath" ), makeAny( rPath ) ); aArgs[0] <<= aValue; return Reference< XPropertySet >( - xConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), aArgs ), UNO_QUERY_THROW ); + xConfigProvider->createInstanceWithArguments( OUString(aAccessSrvc), aArgs ), UNO_QUERY_THROW ); } void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart ) diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index c8d78cbf66ab..42f2b6b72205 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -63,7 +63,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace desktop { @@ -104,7 +103,7 @@ void Desktop::InitApplicationServiceManager() RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::createApplicationServiceManager" ); Reference sm; #ifdef ANDROID - rtl::OUString aUnoRc( OUString( "file:///assets/program/unorc" ) ); + OUString aUnoRc( OUString( "file:///assets/program/unorc" ) ); sm.set( cppu::defaultBootstrap_InitialComponentContext( aUnoRc )->getServiceManager(), UNO_QUERY_THROW); @@ -137,8 +136,8 @@ void Desktop::RegisterServices(Reference< XComponentContext > const & context) createAcceptor(conDcpCfg); } - std::vector< ::rtl::OUString > const & conDcp = rCmdLine.GetAccept(); - for (std::vector< ::rtl::OUString >::const_iterator i(conDcp.begin()); + std::vector< OUString > const & conDcp = rCmdLine.GetAccept(); + for (std::vector< OUString >::const_iterator i(conDcp.begin()); i != conDcp.end(); ++i) { createAcceptor(*i); @@ -255,7 +254,7 @@ void Desktop::CreateTemporaryDirectory() { RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::createTemporaryDirectory" ); - ::rtl::OUString aTempBaseURL; + OUString aTempBaseURL; try { SvtPathOptions aOpt; @@ -281,8 +280,8 @@ void Desktop::CreateTemporaryDirectory() if ( aTempBaseURL.matchAsciiL( "/", 1, nLength-1 ) ) aTempBaseURL = aTempBaseURL.copy( 0, nLength - 1 ); - ::rtl::OUString aRet; - ::rtl::OUString aTempPath( aTempBaseURL ); + OUString aRet; + OUString aTempPath( aTempBaseURL ); // create new current temporary directory ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTempBaseURL, aRet ); diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index f01e3e835583..2ea7f84dc85a 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -55,7 +55,6 @@ #include "../deployment/inc/dp_misc.h" -using rtl::OUString; using namespace desktop; using namespace com::sun::star; @@ -217,7 +216,7 @@ static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdat static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContext > &xContext ) { - rtl::OUString sServiceName = "com.sun.star.deployment.ui.UpdateRequiredDialog"; + OUString sServiceName = "com.sun.star.deployment.ui.UpdateRequiredDialog"; uno::Reference< uno::XInterface > xService; sal_Int16 nRet = 0; @@ -291,7 +290,7 @@ static bool impl_checkDependencies( const uno::Reference< uno::XComponentContext catch ( const uno::RuntimeException & ) { throw; } catch (const uno::Exception & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } if ( bRegistered ) @@ -327,7 +326,7 @@ static void impl_setNeedsCompatCheck() makeAny( OUString("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >( - theConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); + theConfigProvider->createInstanceWithArguments( OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); Any value = makeAny( OUString("never") ); @@ -358,7 +357,7 @@ static bool impl_needsCompatCheck() makeAny( OUString("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >( - theConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); + theConfigProvider->createInstanceWithArguments( OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); Any result = pset->getPropertyValue( OUString("LastCompatibilityCheckID") ); diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 061bd0ea79b5..ca92a8dd1d5d 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -36,7 +36,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uri; using namespace com::sun::star::uno; -using ::rtl::OUString; namespace desktop { @@ -69,7 +68,7 @@ public: m_count(rtl_getAppCommandArgCount()), m_index(0) { - rtl::OUString url; + OUString url; if (tools::getProcessWorkingDir(url)) { m_cwdUrl.reset(url); } @@ -77,9 +76,9 @@ public: virtual ~ExtCommandLineSupplier() {} - virtual boost::optional< rtl::OUString > getCwdUrl() { return m_cwdUrl; } + virtual boost::optional< OUString > getCwdUrl() { return m_cwdUrl; } - virtual bool next(rtl::OUString * argument) { + virtual bool next(OUString * argument) { OSL_ASSERT(argument != NULL); if (m_index < m_count) { rtl_getAppCommandArg(m_index++, &argument->pData); @@ -90,7 +89,7 @@ public: } private: - boost::optional< rtl::OUString > m_cwdUrl; + boost::optional< OUString > m_cwdUrl; sal_uInt32 m_count; sal_uInt32 m_index; }; @@ -148,7 +147,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) for (;;) { - ::rtl::OUString aArg; + OUString aArg; if ( !supplier.next( &aArg ) ) { break; @@ -157,7 +156,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) if ( !aArg.isEmpty() ) { m_bEmpty = false; - ::rtl::OUString oArg; + OUString oArg; if ( !InterpretCommandLineParameter( aArg, oArg )) { if ( aArg.toChar() == '-' ) @@ -380,18 +379,18 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) m_bDocumentArgs = true; } -bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& aArg, ::rtl::OUString& oArg ) +bool CommandLineArgs::InterpretCommandLineParameter( const OUString& aArg, OUString& oArg ) { bool bDeprecated = false; if (aArg.matchIgnoreAsciiCase("--")) { - oArg = ::rtl::OUString(aArg.getStr()+2, aArg.getLength()-2); + oArg = OUString(aArg.getStr()+2, aArg.getLength()-2); } else if (aArg.toChar() == '-') { if ( aArg.getLength() > 2 ) // -h, -o, -n, -? are still valid bDeprecated = true; - oArg = ::rtl::OUString(aArg.getStr()+1, aArg.getLength()-1); + oArg = OUString(aArg.getStr()+1, aArg.getLength()-1); } else { @@ -578,7 +577,7 @@ bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& aArg if (bDeprecated) { - rtl::OString sArg(rtl::OUStringToOString(aArg, osl_getThreadTextEncoding())); + OString sArg(OUStringToOString(aArg, osl_getThreadTextEncoding())); fprintf(stderr, "Warning: %s is deprecated. Use -%s instead.\n", sArg.getStr(), sArg.getStr()); } return true; @@ -773,76 +772,76 @@ bool CommandLineArgs::HasSplashPipe() const return m_splashpipe; } -std::vector< rtl::OUString > const & CommandLineArgs::GetAccept() const +std::vector< OUString > const & CommandLineArgs::GetAccept() const { return m_accept; } -std::vector< rtl::OUString > const & CommandLineArgs::GetUnaccept() const +std::vector< OUString > const & CommandLineArgs::GetUnaccept() const { return m_unaccept; } -std::vector< rtl::OUString > CommandLineArgs::GetOpenList() const +std::vector< OUString > CommandLineArgs::GetOpenList() const { return translateExternalUris(m_openlist); } -std::vector< rtl::OUString > CommandLineArgs::GetViewList() const +std::vector< OUString > CommandLineArgs::GetViewList() const { return translateExternalUris(m_viewlist); } -std::vector< rtl::OUString > CommandLineArgs::GetStartList() const +std::vector< OUString > CommandLineArgs::GetStartList() const { return translateExternalUris(m_startlist); } -std::vector< rtl::OUString > CommandLineArgs::GetForceOpenList() const +std::vector< OUString > CommandLineArgs::GetForceOpenList() const { return translateExternalUris(m_forceopenlist); } -std::vector< rtl::OUString > CommandLineArgs::GetForceNewList() const +std::vector< OUString > CommandLineArgs::GetForceNewList() const { return translateExternalUris(m_forcenewlist); } -std::vector< rtl::OUString > CommandLineArgs::GetPrintList() const +std::vector< OUString > CommandLineArgs::GetPrintList() const { return translateExternalUris(m_printlist); } -std::vector< rtl::OUString > CommandLineArgs::GetPrintToList() const +std::vector< OUString > CommandLineArgs::GetPrintToList() const { return translateExternalUris(m_printtolist); } -rtl::OUString CommandLineArgs::GetPrinterName() const +OUString CommandLineArgs::GetPrinterName() const { return m_printername; } -rtl::OUString CommandLineArgs::GetLanguage() const +OUString CommandLineArgs::GetLanguage() const { return m_language; } -std::vector< rtl::OUString > const & CommandLineArgs::GetInFilter() const +std::vector< OUString > const & CommandLineArgs::GetInFilter() const { return m_infilter; } -std::vector< rtl::OUString > CommandLineArgs::GetConversionList() const +std::vector< OUString > CommandLineArgs::GetConversionList() const { return translateExternalUris(m_conversionlist); } -rtl::OUString CommandLineArgs::GetConversionParams() const +OUString CommandLineArgs::GetConversionParams() const { return m_conversionparams; } -rtl::OUString CommandLineArgs::GetConversionOut() const +OUString CommandLineArgs::GetConversionOut() const { return translateExternalUris(m_conversionout); } diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index 4ea5e0dbd4c7..6a5bdf1878f0 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -46,14 +46,14 @@ class CommandLineArgs: private boost::noncopyable }; virtual ~Supplier(); - virtual boost::optional< rtl::OUString > getCwdUrl() = 0; - virtual bool next(rtl::OUString * argument) = 0; + virtual boost::optional< OUString > getCwdUrl() = 0; + virtual bool next(OUString * argument) = 0; }; CommandLineArgs(); CommandLineArgs( Supplier& supplier ); - boost::optional< rtl::OUString > getCwdUrl() const { return m_cwdUrl; } + boost::optional< OUString > getCwdUrl() const { return m_cwdUrl; } // Access to bool parameters bool IsMinimized() const; @@ -90,32 +90,32 @@ class CommandLineArgs: private boost::noncopyable // Access to string parameters bool HasSplashPipe() const; - std::vector< rtl::OUString > const & GetAccept() const; - std::vector< rtl::OUString > const & GetUnaccept() const; - std::vector< rtl::OUString > GetOpenList() const; - std::vector< rtl::OUString > GetViewList() const; - std::vector< rtl::OUString > GetStartList() const; - std::vector< rtl::OUString > GetForceOpenList() const; - std::vector< rtl::OUString > GetForceNewList() const; - std::vector< rtl::OUString > GetPrintList() const; - std::vector< rtl::OUString > GetPrintToList() const; - rtl::OUString GetPrinterName() const; - rtl::OUString GetLanguage() const; - std::vector< rtl::OUString > const & GetInFilter() const; - std::vector< rtl::OUString > GetConversionList() const; - rtl::OUString GetConversionParams() const; - rtl::OUString GetConversionOut() const; + std::vector< OUString > const & GetAccept() const; + std::vector< OUString > const & GetUnaccept() const; + std::vector< OUString > GetOpenList() const; + std::vector< OUString > GetViewList() const; + std::vector< OUString > GetStartList() const; + std::vector< OUString > GetForceOpenList() const; + std::vector< OUString > GetForceNewList() const; + std::vector< OUString > GetPrintList() const; + std::vector< OUString > GetPrintToList() const; + OUString GetPrinterName() const; + OUString GetLanguage() const; + std::vector< OUString > const & GetInFilter() const; + std::vector< OUString > GetConversionList() const; + OUString GetConversionParams() const; + OUString GetConversionOut() const; OUString GetPidfileName() const; // Special analyzed states (does not match directly to a command line parameter!) bool IsEmpty() const; private: - bool InterpretCommandLineParameter( const ::rtl::OUString&, ::rtl::OUString& ); + bool InterpretCommandLineParameter( const OUString&, OUString& ); void ParseCommandLine_Impl( Supplier& supplier ); void InitParamValues(); - boost::optional< rtl::OUString > m_cwdUrl; + boost::optional< OUString > m_cwdUrl; bool m_minimized; bool m_invisible; @@ -152,21 +152,21 @@ class CommandLineArgs: private boost::noncopyable bool m_bEmpty; // No Args at all bool m_bDocumentArgs; // A document creation/open/load arg is used - std::vector< rtl::OUString > m_accept; - std::vector< rtl::OUString > m_unaccept; - std::vector< rtl::OUString > m_openlist; // contains external URIs - std::vector< rtl::OUString > m_viewlist; // contains external URIs - std::vector< rtl::OUString > m_startlist; // contains external URIs - std::vector< rtl::OUString > m_forceopenlist; // contains external URIs - std::vector< rtl::OUString > m_forcenewlist; // contains external URIs - std::vector< rtl::OUString > m_printlist; // contains external URIs - std::vector< rtl::OUString > m_printtolist; // contains external URIs - rtl::OUString m_printername; - std::vector< rtl::OUString > m_conversionlist; // contains external URIs - rtl::OUString m_conversionparams; - rtl::OUString m_conversionout; // contains external URIs - std::vector< rtl::OUString > m_infilter; - rtl::OUString m_language; + std::vector< OUString > m_accept; + std::vector< OUString > m_unaccept; + std::vector< OUString > m_openlist; // contains external URIs + std::vector< OUString > m_viewlist; // contains external URIs + std::vector< OUString > m_startlist; // contains external URIs + std::vector< OUString > m_forceopenlist; // contains external URIs + std::vector< OUString > m_forcenewlist; // contains external URIs + std::vector< OUString > m_printlist; // contains external URIs + std::vector< OUString > m_printtolist; // contains external URIs + OUString m_printername; + std::vector< OUString > m_conversionlist; // contains external URIs + OUString m_conversionparams; + OUString m_conversionout; // contains external URIs + std::vector< OUString > m_infilter; + OUString m_language; OUString m_pidfile; }; diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index e40dcd099238..41a9f300e9ba 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -127,7 +127,7 @@ namespace desktop " Store soffice.bin pid to file.\n"\ "\nRemaining arguments will be treated as filenames or URLs of documents to open.\n\n"; - rtl::OUString ReplaceStringHookProc(const rtl::OUString& rStr); + OUString ReplaceStringHookProc(const OUString& rStr); void displayCmdlineHelp(OUString const & unknown) { @@ -148,13 +148,13 @@ namespace desktop #ifdef UNX // on unix use console for output fprintf(stdout, "%s%s", - rtl::OUStringToOString(aHelpMessage_version, RTL_TEXTENCODING_ASCII_US).getStr(), - rtl::OUStringToOString(aHelpMessage_head, RTL_TEXTENCODING_ASCII_US).getStr()); + OUStringToOString(aHelpMessage_version, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(aHelpMessage_head, RTL_TEXTENCODING_ASCII_US).getStr()); // merge left and right column sal_Int32 n = comphelper::string::getTokenCount(aHelpMessage_left, '\n'); - rtl::OString bsLeft(rtl::OUStringToOString(aHelpMessage_left, + OString bsLeft(OUStringToOString(aHelpMessage_left, RTL_TEXTENCODING_ASCII_US)); - rtl::OString bsRight(rtl::OUStringToOString(aHelpMessage_right, + OString bsRight(OUStringToOString(aHelpMessage_right, RTL_TEXTENCODING_ASCII_US)); for ( sal_Int32 i = 0; i < n; ++i ) { @@ -162,7 +162,7 @@ namespace desktop fprintf(stdout, "%s", getToken(bsLeft, i, '\n').getStr()); fprintf(stdout, "%s\n", getToken(bsRight, i, '\n').getStr()); } - fprintf(stdout, "%s", rtl::OUStringToOString(aHelpMessage_bottom, + fprintf(stdout, "%s", OUStringToOString(aHelpMessage_bottom, RTL_TEXTENCODING_ASCII_US).getStr()); #else // rest gets a dialog box @@ -179,10 +179,10 @@ namespace desktop void displayVersion() { - rtl::OUString aVersionMsg(aCmdLineHelp_version); + OUString aVersionMsg(aCmdLineHelp_version); aVersionMsg = ReplaceStringHookProc(aVersionMsg); #ifdef UNX - fprintf(stdout, "%s", rtl::OUStringToOString(aVersionMsg, RTL_TEXTENCODING_ASCII_US).getStr()); + fprintf(stdout, "%s", OUStringToOString(aVersionMsg, RTL_TEXTENCODING_ASCII_US).getStr()); #else // Just re-use the help dialog for now. CmdlineHelpDialog aDlg; diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx index 8e29b49b81cf..11ee1f858f1b 100644 --- a/desktop/source/app/configinit.cxx +++ b/desktop/source/app/configinit.cxx @@ -33,7 +33,6 @@ namespace uno = ::com::sun::star::uno; namespace lang = ::com::sun::star::lang; -using rtl::OUString; using uno::UNO_QUERY; // ---------------------------------------------------------------------------- diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx index 26cd03bcd5e8..63ff6e1acd85 100644 --- a/desktop/source/app/desktopcontext.cxx +++ b/desktop/source/app/desktopcontext.cxx @@ -25,7 +25,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::task; -using ::rtl::OUString; namespace desktop { diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx index 8195e9487ad2..252a2c7b57b5 100644 --- a/desktop/source/app/desktopcontext.hxx +++ b/desktop/source/app/desktopcontext.hxx @@ -31,7 +31,7 @@ namespace desktop DesktopContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx); // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name ) + virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) throw (com::sun::star::uno::RuntimeException); private: diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index cdec83b7e97f..4afa35992f95 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -55,7 +55,6 @@ #include #include -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -70,7 +69,7 @@ namespace desktop { String GetURL_Impl( - const String& rName, boost::optional< rtl::OUString > const & cwdUrl ); + const String& rName, boost::optional< OUString > const & cwdUrl ); struct DispatchHolder { @@ -78,7 +77,7 @@ struct DispatchHolder aURL( rURL ), xDispatch( rDispatch ) {} URL aURL; - rtl::OUString cwdUrl; + OUString cwdUrl; Reference< XDispatch > xDispatch; }; @@ -169,9 +168,9 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch DispatchList::const_iterator p; std::vector< DispatchHolder > aDispatches; - ::rtl::OUString aAsTemplateArg( "AsTemplate" ); + OUString aAsTemplateArg( "AsTemplate" ); sal_Bool bSetInputFilter = sal_False; - ::rtl::OUString aForcedInputFilter; + OUString aForcedInputFilter; for ( p = aDispatchRequestsList.begin(); p != aDispatchRequestsList.end(); ++p ) { @@ -238,7 +237,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch } String aName( GetURL_Impl( aDispatchRequest.aURL, aDispatchRequest.aCwdUrl ) ); - ::rtl::OUString aTarget("_default"); + OUString aTarget("_default"); if ( aDispatchRequest.aRequestType == REQUEST_PRINT || aDispatchRequest.aRequestType == REQUEST_PRINTTO || @@ -282,7 +281,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch if( xParser.is() == sal_True ) xParser->parseStrict( aURL ); - xDispatcher = xDesktop->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDispatcher = xDesktop->queryDispatch( aURL, OUString(), 0 ); if( xDispatcher.is() == sal_True ) { @@ -310,7 +309,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch if( xParser.is() == sal_True ) xParser->parseStrict( aURL ); - xDispatcher = xDesktop->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDispatcher = xDesktop->queryDispatch( aURL, OUString(), 0 ); if( xDispatcher.is() == sal_True ) { @@ -415,14 +414,14 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch if ( aDispatchRequest.aRequestType == REQUEST_CONVERSION ) { Reference< XStorable > xStorable( xDoc, UNO_QUERY ); if ( xStorable.is() ) { - rtl::OUString aParam = aDispatchRequest.aPrinterName; + OUString aParam = aDispatchRequest.aPrinterName; sal_Int32 nPathIndex = aParam.lastIndexOf( ';' ); sal_Int32 nFilterIndex = aParam.indexOf( ':' ); if( nPathIndex < nFilterIndex ) nFilterIndex = -1; - rtl::OUString aFilterOut=aParam.copy( nPathIndex+1 ); - rtl::OUString aFilter; - rtl::OUString aFilterExt; + OUString aFilterOut=aParam.copy( nPathIndex+1 ); + OUString aFilter; + OUString aFilterExt; sal_Bool bGuess = sal_False; if( nFilterIndex >= 0 ) @@ -439,7 +438,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch INetURLObject aOutFilename( aObj ); aOutFilename.SetExtension( aFilterExt ); FileBase::getFileURLFromSystemPath( aFilterOut, aFilterOut ); - rtl::OUString aOutFile = aFilterOut+ + OUString aOutFile = aFilterOut+ "/" + aOutFilename.getName(); @@ -455,15 +454,15 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch conversionProperties[1].Name = "FilterName"; conversionProperties[1].Value <<= aFilter; - rtl::OUString aTempName; + OUString aTempName; FileBase::getSystemPathFromFileURL( aName, aTempName ); - rtl::OString aSource8 = ::rtl::OUStringToOString ( aTempName, RTL_TEXTENCODING_UTF8 ); + OString aSource8 = OUStringToOString ( aTempName, RTL_TEXTENCODING_UTF8 ); FileBase::getSystemPathFromFileURL( aOutFile, aTempName ); - rtl::OString aTargetURL8 = ::rtl::OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 ); + OString aTargetURL8 = OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 ); printf("convert %s -> %s using %s\n", aSource8.getStr(), aTargetURL8.getStr(), - ::rtl::OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr()); + OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr()); if( FStatHelper::IsDocument(aOutFile) ) - printf("Overwriting: %s\n",::rtl::OUStringToOString( aTempName, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf("Overwriting: %s\n",OUStringToOString( aTempName, RTL_TEXTENCODING_UTF8 ).getStr() ); try { xStorable->storeToURL( aOutFile, conversionProperties ); @@ -474,11 +473,11 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch } } } else if ( aDispatchRequest.aRequestType == REQUEST_BATCHPRINT ) { - rtl::OUString aParam = aDispatchRequest.aPrinterName; + OUString aParam = aDispatchRequest.aPrinterName; sal_Int32 nPathIndex = aParam.lastIndexOf( ';' ); - rtl::OUString aFilterOut; - rtl::OUString aPrinterName; + OUString aFilterOut; + OUString aPrinterName; if( nPathIndex != -1 ) aFilterOut=aParam.copy( nPathIndex+1 ); if( nPathIndex != 0 ) @@ -487,18 +486,18 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch INetURLObject aOutFilename( aObj ); aOutFilename.SetExtension( "ps" ); FileBase::getFileURLFromSystemPath( aFilterOut, aFilterOut ); - rtl::OUString aOutFile = aFilterOut+ + OUString aOutFile = aFilterOut+ "/" + aOutFilename.getName(); - rtl::OUString aTempName; + OUString aTempName; FileBase::getSystemPathFromFileURL( aName, aTempName ); - rtl::OString aSource8 = ::rtl::OUStringToOString ( aTempName, RTL_TEXTENCODING_UTF8 ); + OString aSource8 = OUStringToOString ( aTempName, RTL_TEXTENCODING_UTF8 ); FileBase::getSystemPathFromFileURL( aOutFile, aTempName ); - rtl::OString aTargetURL8 = ::rtl::OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 ); + OString aTargetURL8 = OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 ); printf("print %s -> %s using %s\n", aSource8.getStr(), aTargetURL8.getStr(), aPrinterName.isEmpty() ? - "" : ::rtl::OUStringToOString( aPrinterName, RTL_TEXTENCODING_UTF8 ).getStr() ); + "" : OUStringToOString( aPrinterName, RTL_TEXTENCODING_UTF8 ).getStr() ); // create the custom printer, if given Sequence < PropertyValue > aPrinterArgs( 1 ); @@ -522,7 +521,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch // create the printer Sequence < PropertyValue > aPrinterArgs( 1 ); aPrinterArgs[0].Name = "Name"; - aPrinterArgs[0].Value <<= ::rtl::OUString( aDispatchRequest.aPrinterName ); + aPrinterArgs[0].Value <<= OUString( aDispatchRequest.aPrinterName ); xDoc->setPrinter( aPrinterArgs ); } @@ -566,7 +565,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch // Execute all asynchronous dispatches now after we placed them into our request container! Sequence < PropertyValue > aArgs( 2 ); aArgs[0].Name = "Referer"; - aArgs[0].Value <<= ::rtl::OUString("private:OpenEvent"); + aArgs[0].Value <<= OUString("private:OpenEvent"); aArgs[1].Name = "SynchronMode"; aArgs[1].Value <<= sal_True; diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index ac7a9c04fab1..2a0c86983f17 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -41,13 +41,13 @@ namespace desktop struct OUStringHashCode { - size_t operator()( const ::rtl::OUString& sString ) const + size_t operator()( const OUString& sString ) const { return sString.hashCode(); } }; -class DispatchWatcherHashMap : public ::boost::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > +class DispatchWatcherHashMap : public ::boost::unordered_map< OUString, sal_Int32, OUStringHashCode, ::std::equal_to< OUString > > { public: inline void free() @@ -75,14 +75,14 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame: struct DispatchRequest { - DispatchRequest( RequestType aType, const ::rtl::OUString& aFile, boost::optional< rtl::OUString > const & cwdUrl, const ::rtl::OUString& aPrinter, const ::rtl::OUString& aFact ) : + DispatchRequest( RequestType aType, const OUString& aFile, boost::optional< OUString > const & cwdUrl, const OUString& aPrinter, const OUString& aFact ) : aRequestType( aType ), aURL( aFile ), aCwdUrl( cwdUrl ), aPrinterName( aPrinter ), aPreselectedFactory( aFact ) {} RequestType aRequestType; - rtl::OUString aURL; - boost::optional< rtl::OUString > aCwdUrl; - rtl::OUString aPrinterName; // also conversion params - rtl::OUString aPreselectedFactory; + OUString aURL; + boost::optional< OUString > aCwdUrl; + OUString aPrinterName; // also conversion params + OUString aPreselectedFactory; }; typedef std::vector< DispatchRequest > DispatchList; diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 09f0ef901497..d89174e36ae5 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -50,9 +50,6 @@ using namespace com::sun::star::container; using namespace com::sun::star::beans; using namespace com::sun::star::util; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; namespace desktop { @@ -113,7 +110,7 @@ bool LanguageSelection::prepareLanguage() { Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.System/L10N/", sal_False), UNO_QUERY_THROW); Any aWin16SysLocale = xProp->getPropertyValue("SystemLocale"); - ::rtl::OUString sWin16SysLocale; + OUString sWin16SysLocale; aWin16SysLocale >>= sWin16SysLocale; if( !sWin16SysLocale.isEmpty()) setDefaultLanguage(sWin16SysLocale); diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx index b6ded29741ac..f84566c6c96b 100644 --- a/desktop/source/app/langselect.hxx +++ b/desktop/source/app/langselect.hxx @@ -39,25 +39,25 @@ public: LS_STATUS_CONFIGURATIONACCESS_BROKEN }; - static rtl::OUString getLanguageString(); + static OUString getLanguageString(); static bool prepareLanguage(); static LanguageSelectionStatus getStatus(); private: - static rtl::OUString aFoundLanguage; + static OUString aFoundLanguage; static sal_Bool bFoundLanguage; static LanguageSelectionStatus m_eStatus; static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess(const sal_Char* pPath, sal_Bool bUpdate=sal_False); - static com::sun::star::uno::Sequence< rtl::OUString > getInstalledLanguages(); - static sal_Bool isInstalledLanguage(rtl::OUString& usLocale, sal_Bool bExact=sal_False); - static rtl::OUString getFirstInstalledLanguage(); - static rtl::OUString getUserUILanguage(); - static rtl::OUString getUserLanguage(); - static rtl::OUString getSystemLanguage(); + static com::sun::star::uno::Sequence< OUString > getInstalledLanguages(); + static sal_Bool isInstalledLanguage(OUString& usLocale, sal_Bool bExact=sal_False); + static OUString getFirstInstalledLanguage(); + static OUString getUserUILanguage(); + static OUString getUserLanguage(); + static OUString getSystemLanguage(); static void resetUserLanguage(); - static void setDefaultLanguage(const rtl::OUString&); + static void setDefaultLanguage(const OUString&); }; } //namespace desktop diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx index f56bda17988b..d338281d9d13 100644 --- a/desktop/source/app/lockfile2.cxx +++ b/desktop/source/app/lockfile2.cxx @@ -33,9 +33,9 @@ bool Lockfile_execWarning( Lockfile * that ) String aLockname = that->m_aLockname; Config aConfig(aLockname); aConfig.SetGroup( LOCKFILE_GROUP ); - rtl::OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY ); - rtl::OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ); - rtl::OString aTime = aConfig.ReadKey( LOCKFILE_TIMEKEY ); + OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY ); + OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ); + OString aTime = aConfig.ReadKey( LOCKFILE_TIMEKEY ); // display warning and return response QueryBox aBox( NULL, DesktopResId( QBX_USERDATALOCKED ) ); @@ -45,11 +45,11 @@ bool Lockfile_execWarning( Lockfile * that ) // insert values... String aMsgText = aBox.GetMessText( ); aMsgText.SearchAndReplaceAscii( - "$u", rtl::OStringToOUString( aUser, RTL_TEXTENCODING_ASCII_US) ); + "$u", OStringToOUString( aUser, RTL_TEXTENCODING_ASCII_US) ); aMsgText.SearchAndReplaceAscii( - "$h", rtl::OStringToOUString( aHost, RTL_TEXTENCODING_ASCII_US) ); + "$h", OStringToOUString( aHost, RTL_TEXTENCODING_ASCII_US) ); aMsgText.SearchAndReplaceAscii( - "$t", rtl::OStringToOUString( aTime, RTL_TEXTENCODING_ASCII_US) ); + "$t", OStringToOUString( aTime, RTL_TEXTENCODING_ASCII_US) ); aBox.SetMessText(aMsgText); // do it return aBox.Execute( ) == RET_YES; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index bcade3172b1f..db8a4079583d 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -49,9 +49,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; const char *OfficeIPCThread::sc_aShowSequence = "-tofront"; const int OfficeIPCThread::sc_nShSeqLength = 5; @@ -110,7 +107,7 @@ namespace { class Parser: public CommandLineArgs::Supplier { public: - explicit Parser(rtl::OString const & input): m_input(input) { + explicit Parser(OString const & input): m_input(input) { if (!m_input.match(ARGUMENT_PREFIX) || m_input.getLength() == RTL_CONSTASCII_LENGTH(ARGUMENT_PREFIX)) { @@ -122,7 +119,7 @@ public: break; case '1': { - rtl::OUString url; + OUString url; if (!next(&url, false)) { throw CommandLineArgs::Supplier::Exception(); } @@ -131,11 +128,11 @@ public: } case '2': { - rtl::OUString path; + OUString path; if (!next(&path, false)) { throw CommandLineArgs::Supplier::Exception(); } - rtl::OUString url; + OUString url; if (osl::FileBase::getFileURLFromSystemPath(path, url) == osl::FileBase::E_None) { @@ -150,12 +147,12 @@ public: virtual ~Parser() {} - virtual boost::optional< rtl::OUString > getCwdUrl() { return m_cwdUrl; } + virtual boost::optional< OUString > getCwdUrl() { return m_cwdUrl; } - virtual bool next(rtl::OUString * argument) { return next(argument, true); } + virtual bool next(OUString * argument) { return next(argument, true); } private: - virtual bool next(rtl::OUString * argument, bool prefix) { + virtual bool next(OUString * argument, bool prefix) { OSL_ASSERT(argument != NULL); if (m_index < m_input.getLength()) { if (prefix) { @@ -164,7 +161,7 @@ private: } ++m_index; } - rtl::OStringBuffer b; + OStringBuffer b; while (m_index < m_input.getLength()) { char c = m_input[m_index]; if (c == ',') { @@ -190,7 +187,7 @@ private: } b.append(c); } - rtl::OString b2(b.makeStringAndClear()); + OString b2(b.makeStringAndClear()); if (!rtl_convertStringToUString( &argument->pData, b2.getStr(), b2.getLength(), RTL_TEXTENCODING_UTF8, @@ -206,15 +203,15 @@ private: } } - boost::optional< rtl::OUString > m_cwdUrl; - rtl::OString m_input; + boost::optional< OUString > m_cwdUrl; + OString m_input; sal_Int32 m_index; }; -bool addArgument(rtl::OStringBuffer &rArguments, char prefix, - const rtl::OUString &rArgument) +bool addArgument(OStringBuffer &rArguments, char prefix, + const OUString &rArgument) { - rtl::OString utf8; + OString utf8; if (!rArgument.convertToString( &utf8, RTL_TEXTENCODING_UTF8, (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | @@ -256,7 +253,7 @@ String CreateMD5FromString( const OUString& aMsg ) { #if (OSL_DEBUG_LEVEL > 2) fprintf( stderr, "create md5 from '%s'\n", - rtl::OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8).getStr() ); #endif rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); @@ -421,7 +418,7 @@ void OfficeIPCThread::EnableRequests( bool i_bEnable ) if( i_bEnable ) { // hit the compiler over the head - ProcessDocumentsRequest aEmptyReq = ProcessDocumentsRequest( boost::optional< rtl::OUString >() ); + ProcessDocumentsRequest aEmptyReq = ProcessDocumentsRequest( boost::optional< OUString >() ); // trigger already queued requests OfficeIPCThread::ExecuteCmdLineRequests( aEmptyReq ); } @@ -458,8 +455,8 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() if( pGlobalOfficeIPCThread.is() ) return IPC_STATUS_OK; - ::rtl::OUString aUserInstallPath; - ::rtl::OUString aDummy; + OUString aUserInstallPath; + OUString aDummy; rtl::Reference< OfficeIPCThread > pThread(new OfficeIPCThread); @@ -574,8 +571,8 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() // Seems another office is running. Pipe arguments to it and self terminate osl::StreamPipe aStreamPipe(pThread->maPipe.getHandle()); - rtl::OStringBuffer aArguments(ARGUMENT_PREFIX); - rtl::OUString cwdUrl; + OStringBuffer aArguments(ARGUMENT_PREFIX); + OUString cwdUrl; if (!(tools::getProcessWorkingDir(cwdUrl) && addArgument(aArguments, '1', cwdUrl))) { @@ -710,7 +707,7 @@ void OfficeIPCThread::execute() continue; } - rtl::OString aArguments = readStringFromPipe(aStreamPipe); + OString aArguments = readStringFromPipe(aStreamPipe); // Is this a lookup message from another application? if so, ignore if (aArguments.isEmpty()) @@ -758,9 +755,9 @@ void OfficeIPCThread::execute() } // handle request for acceptor - std::vector< rtl::OUString > const & accept = aCmdLineArgs-> + std::vector< OUString > const & accept = aCmdLineArgs-> GetAccept(); - for (std::vector< rtl::OUString >::const_iterator i(accept.begin()); + for (std::vector< OUString >::const_iterator i(accept.begin()); i != accept.end(); ++i) { ApplicationEvent* pAppEvent = new ApplicationEvent( @@ -768,9 +765,9 @@ void OfficeIPCThread::execute() ImplPostForeignAppEvent( pAppEvent ); } // handle acceptor removal - std::vector< rtl::OUString > const & unaccept = aCmdLineArgs-> + std::vector< OUString > const & unaccept = aCmdLineArgs-> GetUnaccept(); - for (std::vector< rtl::OUString >::const_iterator i( + for (std::vector< OUString >::const_iterator i( unaccept.begin()); i != unaccept.end(); ++i) { @@ -844,7 +841,7 @@ void OfficeIPCThread::execute() if ( !aCmdLineArgs->IsQuickstart() ) { sal_Bool bShowHelp = sal_False; - rtl::OUStringBuffer aHelpURLBuffer; + OUStringBuffer aHelpURLBuffer; if (aCmdLineArgs->IsHelpWriter()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://swriter/start"); @@ -957,13 +954,13 @@ void OfficeIPCThread::execute() static void AddToDispatchList( DispatchWatcher::DispatchList& rDispatchList, - boost::optional< rtl::OUString > const & cwdUrl, - std::vector< rtl::OUString > const & aRequestList, + boost::optional< OUString > const & cwdUrl, + std::vector< OUString > const & aRequestList, DispatchWatcher::RequestType nType, const OUString& aParam, const OUString& aFactory ) { - for (std::vector< rtl::OUString >::const_iterator i(aRequestList.begin()); + for (std::vector< OUString >::const_iterator i(aRequestList.begin()); i != aRequestList.end(); ++i) { rDispatchList.push_back( @@ -973,8 +970,8 @@ static void AddToDispatchList( static void AddConversionsToDispatchList( DispatchWatcher::DispatchList& rDispatchList, - boost::optional< rtl::OUString > const & cwdUrl, - std::vector< rtl::OUString > const & rRequestList, + boost::optional< OUString > const & cwdUrl, + std::vector< OUString > const & rRequestList, const OUString& rParam, const OUString& rPrinterName, const OUString& rFactory, @@ -995,7 +992,7 @@ static void AddConversionsToDispatchList( } OUString aOutDir( rParamOut.trim() ); - ::rtl::OUString aPWD; + OUString aPWD; ::tools::getProcessWorkingDir( aPWD ); if( !::osl::FileBase::getAbsoluteFileURL( aPWD, rParamOut, aOutDir ) ) @@ -1003,16 +1000,16 @@ static void AddConversionsToDispatchList( if( !rParamOut.trim().isEmpty() ) { - aParam += ::rtl::OUString(";"); + aParam += OUString(";"); aParam += aOutDir; } else { ::osl::FileBase::getSystemPathFromFileURL( aPWD, aPWD ); - aParam += ::rtl::OUString(";" ) + aPWD; + aParam += OUString(";" ) + aPWD; } - for (std::vector< rtl::OUString >::const_iterator i(rRequestList.begin()); + for (std::vector< OUString >::const_iterator i(rRequestList.begin()); i != rRequestList.end(); ++i) { rDispatchList.push_back( @@ -1028,7 +1025,7 @@ sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequ static DispatchWatcher::DispatchList aDispatchList; - rtl::OUString aEmpty; + OUString aEmpty; // Create dispatch list for dispatch watcher AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aInFilter, DispatchWatcher::REQUEST_INFILTER, aEmpty, aRequest.aModule ); AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aOpenList, DispatchWatcher::REQUEST_OPEN, aEmpty, aRequest.aModule ); diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index f60084d4dd00..a17e11681722 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -45,23 +45,23 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign // that was given by command line or by IPC pipe communication. struct ProcessDocumentsRequest { - ProcessDocumentsRequest(boost::optional< rtl::OUString > const & cwdUrl): + ProcessDocumentsRequest(boost::optional< OUString > const & cwdUrl): aCwdUrl(cwdUrl), pcProcessed( NULL ) {} - boost::optional< ::rtl::OUString > aCwdUrl; - ::rtl::OUString aModule; - std::vector< rtl::OUString > aOpenList; // Documents that should be opened in the default way - std::vector< rtl::OUString > aViewList; // Documents that should be opened in viewmode - std::vector< rtl::OUString > aStartList; // Documents/Presentations that should be started - std::vector< rtl::OUString > aPrintList; // Documents that should be printed on default printer - std::vector< rtl::OUString > aForceOpenList; // Documents that should be forced to open for editing (even templates) - std::vector< rtl::OUString > aForceNewList; // Documents that should be forced to create a new document - ::rtl::OUString aPrinterName; // The printer name that should be used for printing - std::vector< rtl::OUString > aPrintToList; // Documents that should be printed on the given printer - std::vector< rtl::OUString > aConversionList; - ::rtl::OUString aConversionParams; - ::rtl::OUString aConversionOut; - std::vector< rtl::OUString > aInFilter; + boost::optional< OUString > aCwdUrl; + OUString aModule; + std::vector< OUString > aOpenList; // Documents that should be opened in the default way + std::vector< OUString > aViewList; // Documents that should be opened in viewmode + std::vector< OUString > aStartList; // Documents/Presentations that should be started + std::vector< OUString > aPrintList; // Documents that should be printed on default printer + std::vector< OUString > aForceOpenList; // Documents that should be forced to open for editing (even templates) + std::vector< OUString > aForceNewList; // Documents that should be forced to create a new document + OUString aPrinterName; // The printer name that should be used for printing + std::vector< OUString > aPrintToList; // Documents that should be printed on the given printer + std::vector< OUString > aConversionList; + OUString aConversionParams; + OUString aConversionOut; + std::vector< OUString > aInFilter; ::osl::Condition *pcProcessed; // pointer condition to be set when the request has been processed }; @@ -139,11 +139,11 @@ class OfficeIPCThreadController : public ::cppu::WeakImplHelper2< virtual ~OfficeIPCThreadController() {} // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException ); // XEventListener diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index f1ca8027233a..6f92ba221175 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -83,7 +83,7 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main() #if defined ANDROID } catch (const ::com::sun::star::uno::Exception &e) { LOGI("Unhandled UNO exception: '%s'", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); throw; // to get exception type printed } #endif diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 4a5bb4ed9490..a901a761b04e 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -47,8 +47,6 @@ #include "app.hxx" -using rtl::OString; -using rtl::OUString; using namespace osl; using namespace utl; using namespace com::sun::star::container; @@ -119,7 +117,7 @@ namespace desktop { } #if HAVE_FEATURE_DESKTOP - static osl::FileBase::RC copy_recursive( const rtl::OUString& srcUnqPath, const rtl::OUString& dstUnqPath) + static osl::FileBase::RC copy_recursive( const OUString& srcUnqPath, const OUString& dstUnqPath) { FileBase::RC err; DirectoryItem aDirItem; @@ -145,12 +143,12 @@ namespace desktop { { aDirItem.getFileStatus(aFileStatus); // generate new src/dst pair and make recursive call - rtl::OUString newSrcUnqPath = aFileStatus.getFileURL(); - rtl::OUString newDstUnqPath = dstUnqPath; - rtl::OUString itemname = aFileStatus.getFileName(); + OUString newSrcUnqPath = aFileStatus.getFileURL(); + OUString newDstUnqPath = dstUnqPath; + OUString itemname = aFileStatus.getFileName(); // append trailing '/' if needed if (newDstUnqPath.lastIndexOf(sal_Unicode('/')) != newDstUnqPath.getLength()-1) - newDstUnqPath += rtl::OUString("/"); + newDstUnqPath += OUString("/"); newDstUnqPath += itemname; // recursion err = copy_recursive(newSrcUnqPath, newDstUnqPath); @@ -193,8 +191,8 @@ namespace desktop { // Copy data from shared data directory of base installation: rc = copy_recursive( - aBasePath + rtl::OUString("/presets"), - aUserPath + rtl::OUString("/user")); + aBasePath + OUString("/presets"), + aUserPath + OUString("/user")); if ((rc != FileBase::E_None) && (rc != FileBase::E_EXIST)) { if ( rc == FileBase::E_NOSPC ) diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index aab763165982..637d0b996f86 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.cxx @@ -329,7 +329,7 @@ bool PersistentMap::importFromBDB() return false; // get the name of its BDB counterpart - rtl::OUString aDBName = m_MapFileName; + OUString aDBName = m_MapFileName; if( !aDBName.endsWith( ".pmap" )) return false; aDBName = aDBName.replaceAt( aDBName.getLength()-5, 5, ".db"); diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx index f566d9458473..9fd60fc67d0b 100644 --- a/desktop/source/deployment/dp_xml.cxx +++ b/desktop/source/deployment/dp_xml.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_misc { diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 571bd2806bfb..33a71c6b2275 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -37,7 +37,7 @@ class Window; using dp_gui::DependencyDialog; DependencyDialog::DependencyDialog( - Window * parent, std::vector< rtl::OUString > const & dependencies): + Window * parent, std::vector< OUString > const & dependencies): ModalDialog(parent, DpGuiResId(RID_DLG_DEPENDENCIES) ), m_text(this, DpGuiResId(RID_DLG_DEPENDENCIES_TEXT)), m_list(this, DpGuiResId(RID_DLG_DEPENDENCIES_LIST)), @@ -49,7 +49,7 @@ DependencyDialog::DependencyDialog( FreeResource(); SetMinOutputSizePixel(GetOutputSizePixel()); m_list.SetReadOnly(); - for (std::vector< rtl::OUString >::const_iterator i(dependencies.begin()); + for (std::vector< OUString >::const_iterator i(dependencies.begin()); i != dependencies.end(); ++i) { m_list.InsertEntry(*i); diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index fe38515272d3..c0d8172a8aa3 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -37,7 +37,7 @@ namespace dp_gui { class DependencyDialog: public ModalDialog { public: DependencyDialog( - Window * parent, std::vector< rtl::OUString > const & dependencies); + Window * parent, std::vector< OUString > const & dependencies); ~DependencyDialog(); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 63154e7931f1..2a439da9900d 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -76,7 +76,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::system; -using ::rtl::OUString; namespace dp_gui { @@ -494,7 +493,7 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn) if ( pFact ) { OUString sExtensionId = GetEntryData( nActive )->m_xPackage->getIdentifier().Value; - VclAbstractDialog* pDlg = pFact->CreateOptionsDialog( this, sExtensionId, rtl::OUString() ); + VclAbstractDialog* pDlg = pFact->CreateOptionsDialog( this, sExtensionId, OUString() ); pDlg->Execute(); @@ -749,7 +748,7 @@ ExtMgrDialog::~ExtMgrDialog() } //------------------------------------------------------------------------------ -void ExtMgrDialog::setGetExtensionsURL( const ::rtl::OUString &rURL ) +void ExtMgrDialog::setGetExtensionsURL( const OUString &rURL ) { m_pGetExtensions->SetURL( rURL ); } @@ -914,7 +913,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() title2filter.insert( t_string2string::value_type( title, filter ) ) ); if ( ! insertion.second ) { // already existing, append extensions: - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( insertion.first->second ); buf.append( static_cast(';') ); buf.append( filter ); @@ -935,7 +934,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() xFilePicker->appendFilter( iPos->first, iPos->second ); } catch (const lang::IllegalArgumentException & exc) { - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); (void) exc; } @@ -1550,7 +1549,7 @@ void UpdateRequiredDialog::Resize() Rectangle aControlRegion( Point( 0, 0 ), m_aProgressBar.GetSizePixel() ); Rectangle aNativeControlRegion, aNativeContentRegion; if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) != sal_False ) { nProgressHeight = aNativeControlRegion.GetHeight(); @@ -1636,7 +1635,7 @@ bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage catch ( const uno::RuntimeException & ) { throw; } catch (const uno::Exception & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); bRegistered = false; } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 490ac061153f..b5a5aa430483 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -63,13 +63,13 @@ public: Dialog *pWindow ); virtual ~DialogHelper(); - void openWebBrowser( const ::rtl::OUString & sURL, const ::rtl::OUString & sTitle ) const; + void openWebBrowser( const OUString & sURL, const OUString & sTitle ) const; Dialog* getWindow() const { return m_pVCLWindow; }; void PostUserEvent( const Link& rLink, void* pCaller ); void clearEventID() { m_nEventID = 0; } virtual void showProgress( bool bStart ) = 0; - virtual void updateProgress( const ::rtl::OUString &rText, + virtual void updateProgress( const OUString &rText, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel) = 0; virtual void updateProgress( const long nProgress ) = 0; @@ -90,7 +90,7 @@ public: void setBusy( const bool bBusy ) { m_bIsBusy = bBusy; } bool isBusy() const { return m_bIsBusy; } - bool installExtensionWarn( const ::rtl::OUString &rExtensionURL ) const; + bool installExtensionWarn( const OUString &rExtensionURL ) const; bool installForAllUsers( bool &bInstallForAll ) const; }; @@ -126,7 +126,7 @@ class ExtMgrDialog : public ModelessDialog, ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > m_xAbortChannel; - bool removeExtensionWarn( const ::rtl::OUString &rExtensionTitle ) const; + bool removeExtensionWarn( const OUString &rExtensionTitle ) const; DECL_DLLPRIVATE_LINK( HandleAddBtn, void * ); DECL_DLLPRIVATE_LINK( HandleUpdateBtn, void * ); @@ -145,13 +145,13 @@ public: virtual sal_Bool Close(); virtual void showProgress( bool bStart ); - virtual void updateProgress( const ::rtl::OUString &rText, + virtual void updateProgress( const OUString &rText, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel); virtual void updateProgress( const long nProgress ); virtual void updatePackageInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ); - void setGetExtensionsURL( const ::rtl::OUString &rURL ); + void setGetExtensionsURL( const OUString &rURL ); virtual long addPackageToList( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &, bool bLicenseMissing = false ); bool enablePackage(const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage, @@ -165,7 +165,7 @@ public: virtual void prepareChecking(); virtual void checkEntries(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > raiseAddPicker(); + ::com::sun::star::uno::Sequence< OUString > raiseAddPicker(); }; //============================================================================== @@ -219,7 +219,7 @@ public: virtual sal_Bool Close(); virtual void showProgress( bool bStart ); - virtual void updateProgress( const ::rtl::OUString &rText, + virtual void updateProgress( const OUString &rText, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel); virtual void updateProgress( const long nProgress ); @@ -233,10 +233,10 @@ public: virtual void prepareChecking(); virtual void checkEntries(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > raiseAddPicker(); + ::com::sun::star::uno::Sequence< OUString > raiseAddPicker(); bool installForAllUsers( bool &bInstallForAll ) const; - bool installExtensionWarn( const ::rtl::OUString &rExtensionURL ) const; + bool installExtensionWarn( const OUString &rExtensionURL ) const; }; //============================================================================== @@ -258,14 +258,14 @@ class UpdateRequiredDialogService : public ::cppu::WeakImplHelper1< ::com::sun:: { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const m_xComponentContext; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParent; - ::rtl::OUString m_sInitialTitle; + OUString m_sInitialTitle; public: UpdateRequiredDialogService( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > const & args, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xComponentContext ); // XExecutableDialog - virtual void SAL_CALL setTitle( rtl::OUString const & title ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( OUString const & title ) throw ( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute() throw ( ::com::sun::star::uno::RuntimeException ); }; diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 9b4ba5b39095..df0e4175813e 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -100,7 +100,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; namespace { @@ -405,7 +404,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & } else if (request >>= depExc) { - std::vector< rtl::OUString > deps; + std::vector< OUString > deps; for (sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i) { @@ -620,8 +619,8 @@ ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper, } //------------------------------------------------------------------------------ -void ExtensionCmdQueue::Thread::addExtension( const ::rtl::OUString &rExtensionURL, - const ::rtl::OUString &rRepository, +void ExtensionCmdQueue::Thread::addExtension( const OUString &rExtensionURL, + const OUString &rRepository, const bool bWarnUser ) { if ( !rExtensionURL.isEmpty() ) @@ -921,7 +920,7 @@ void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdE {} // Check, if there are still updates to be notified via menu bar icon - uno::Sequence< uno::Sequence< rtl::OUString > > aItemList; + uno::Sequence< uno::Sequence< OUString > > aItemList; UpdateDialog::createNotifyJob( false, aItemList ); } @@ -1077,8 +1076,8 @@ ExtensionCmdQueue::~ExtensionCmdQueue() { stop(); } -void ExtensionCmdQueue::addExtension( const ::rtl::OUString & extensionURL, - const ::rtl::OUString & repository, +void ExtensionCmdQueue::addExtension( const OUString & extensionURL, + const OUString & repository, const bool bWarnUser ) { m_thread->addExtension( extensionURL, repository, bWarnUser ); diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index 955c66888136..69a109caa237 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx @@ -69,8 +69,8 @@ public: /** */ - void addExtension( const ::rtl::OUString &rExtensionURL, - const ::rtl::OUString &rRepository, + void addExtension( const OUString &rExtensionURL, + const OUString &rRepository, const bool bWarnUser ); void removeExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &rPackage ); void enableExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &rPackage, diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 7b61ac925f36..19d274956ca8 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -141,7 +141,7 @@ void Entry_Impl::checkDependencies() deployment::DependencyException depExc; if ( e.Cause >>= depExc ) { - rtl::OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) ); + OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) ); for ( sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i ) { aMissingDep += "\n"; @@ -316,7 +316,7 @@ void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -324,7 +324,7 @@ rtl::OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -332,7 +332,7 @@ rtl::OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -340,7 +340,7 @@ rtl::OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -348,7 +348,7 @@ rtl::OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -364,7 +364,7 @@ void ExtensionBox_Impl::select( sal_Int32 nIndex ) } //------------------------------------------------------------------------------ -void ExtensionBox_Impl::select( const rtl::OUString & sName ) +void ExtensionBox_Impl::select( const OUString & sName ) { const ::osl::MutexGuard aGuard( m_entriesMutex ); typedef ::std::vector< TEntry_Impl >::const_iterator It; @@ -403,7 +403,7 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos ) aSize.Width() -= ICON_OFFSET; aSize.Height() = 10000; - rtl::OUString aText( m_vEntries[ nPos ]->m_sErrorText ); + OUString aText( m_vEntries[ nPos ]->m_sErrorText ); if ( !aText.isEmpty() ) aText += "\n"; aText += m_vEntries[ nPos ]->m_sDescription; @@ -621,7 +621,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr aTextHeight = nIconHeight; // draw description - ::rtl::OUString sDescription; + OUString sDescription; if ( pEntry->m_sErrorText.Len() ) { if ( pEntry->m_bActive ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index b0fda41add21..12cae91a0f0b 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -228,27 +228,27 @@ public: /** @return The item name of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemName( sal_Int32 index ) const; + virtual OUString getItemName( sal_Int32 index ) const; /** @return The version string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemVersion( sal_Int32 index ) const; + virtual OUString getItemVersion( sal_Int32 index ) const; /** @return The description string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemDescription( sal_Int32 index ) const; + virtual OUString getItemDescription( sal_Int32 index ) const; /** @return The publisher string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemPublisher( sal_Int32 index ) const; + virtual OUString getItemPublisher( sal_Int32 index ) const; /** @return The link behind the publisher text of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemPublisherLink( sal_Int32 index ) const; + virtual OUString getItemPublisherLink( sal_Int32 index ) const; /** The entry at the given position will be selected Index starts with 0. @@ -262,7 +262,7 @@ public: 1. the name is not unique 2. one extension can be installed as user and shared extension. */ - virtual void select( const ::rtl::OUString & sName ); + virtual void select( const OUString & sName ); }; } diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 38abdb675e65..39cc7ae24e66 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -44,7 +44,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_gui { @@ -102,17 +101,17 @@ namespace : public rtl::Static< String, Extension > {}; } -rtl::OUString ReplaceProductNameHookProc( const rtl::OUString& rStr ) +OUString ReplaceProductNameHookProc( const OUString& rStr ) { if (rStr.indexOf( "%PRODUCT" ) == -1) return rStr; - rtl::OUString sProductName = ProductName::get(); - rtl::OUString sVersion = Version::get(); - rtl::OUString sAboutBoxVersion = AboutBoxVersion::get(); - rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); - rtl::OUString sExtension = Extension::get(); - rtl::OUString sOOOVendor = OOOVendor::get(); + OUString sProductName = ProductName::get(); + OUString sVersion = Version::get(); + OUString sAboutBoxVersion = AboutBoxVersion::get(); + OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); + OUString sExtension = Extension::get(); + OUString sOOOVendor = OOOVendor::get(); if ( sProductName.isEmpty() ) { @@ -127,7 +126,7 @@ rtl::OUString ReplaceProductNameHookProc( const rtl::OUString& rStr ) } } - rtl::OUString sRet = rStr.replaceAll( "%PRODUCTNAME", sProductName ); + OUString sRet = rStr.replaceAll( "%PRODUCTNAME", sProductName ); sRet = sRet.replaceAll( "%PRODUCTVERSION", sVersion ); sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix ); sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion ); @@ -242,7 +241,7 @@ void ServiceImpl::startExecuteModal( app->SetSettings( as ); app->SetDisplayName( utl::ConfigManager::getProductName() + - rtl::OUString(" ") + + OUString(" ") + utl::ConfigManager::getProductVersion()); ExtensionCmdQueue::syncRepositories( m_xComponentContext ); } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index b0d1350955eb..af1576460532 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -38,7 +38,6 @@ #define SHARED_PACKAGE_MANAGER OUString("shared") using namespace ::com::sun::star; -using ::rtl::OUString; namespace dp_gui { @@ -138,7 +137,7 @@ void TheExtensionManager::Show() } //------------------------------------------------------------------------------ -void TheExtensionManager::SetText( const ::rtl::OUString &rTitle ) +void TheExtensionManager::SetText( const OUString &rTitle ) { const SolarMutexGuard guard; @@ -341,7 +340,7 @@ PackageState TheExtensionManager::getPackageState( const uno::Reference< deploym } catch (const uno::Exception & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); return NOT_AVAILABLE; } } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index ec2734e80cee..df90ac4553d5 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -58,7 +58,7 @@ private: UpdateRequiredDialog *m_pUpdReqDialog; ExtensionCmdQueue *m_pExecuteCmdQueue; - ::rtl::OUString m_sGetExtensionsURL; + OUString m_sGetExtensionsURL; public: static ::rtl::Reference s_ExtMgr; @@ -74,7 +74,7 @@ public: DialogHelper* getDialogHelper() { return m_pExtMgrDialog ? (DialogHelper*) m_pExtMgrDialog : (DialogHelper*) m_pUpdReqDialog; } ExtensionCmdQueue* getCmdQueue() const { return m_pExecuteCmdQueue; } - void SetText( const ::rtl::OUString &rTitle ); + void SetText( const OUString &rTitle ); void Show(); void ToTop( sal_uInt16 nFlags ); bool Close(); @@ -82,7 +82,7 @@ public: //----------------- bool checkUpdates( bool showUpdateOnly, bool parentVisible ); - bool installPackage( const ::rtl::OUString &rPackageURL, bool bWarnUser = false ); + bool installPackage( const OUString &rPackageURL, bool bWarnUser = false ); void createPackageList(); bool queryTermination(); @@ -99,7 +99,7 @@ public: static ::rtl::Reference get( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xContext, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> const & xParent = 0, - ::rtl::OUString const & view = ::rtl::OUString() ); + OUString const & view = OUString() ); // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index d61194751f9f..fa688960573b 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx @@ -52,7 +52,7 @@ struct UpdateData ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > aInstalledPackage; //The version of the update - ::rtl::OUString updateVersion; + OUString updateVersion; //For online update // ====================== @@ -62,9 +62,9 @@ struct UpdateData ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > aUpdateInfo; //The URL of the locally downloaded extension. It will only be set if there were no errors //during the download - ::rtl::OUString sLocalURL; + OUString sLocalURL; //The URL of the website wher the download can be obtained. - ::rtl::OUString sWebsiteURL; + OUString sWebsiteURL; //For local update //===================== diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index cc9da4d783a4..84fccdf0bffe 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -138,7 +138,7 @@ static const sal_uInt16 CMD_IGNORE_ALL_UPDATES = 3; enum Kind { ENABLED_UPDATE, DISABLED_UPDATE, SPECIFIC_ERROR }; -rtl::OUString confineToParagraph(rtl::OUString const & text) { +OUString confineToParagraph(OUString const & text) { // Confine arbitrary text to a single paragraph in a dp_gui::AutoScrollEdit. // This assumes that U+000A and U+000D are the only paragraph separators in // a dp_gui::AutoScrollEdit, and that replacing them with a single space @@ -148,30 +148,30 @@ rtl::OUString confineToParagraph(rtl::OUString const & text) { } struct UpdateDialog::DisabledUpdate { - rtl::OUString name; - uno::Sequence< rtl::OUString > unsatisfiedDependencies; + OUString name; + uno::Sequence< OUString > unsatisfiedDependencies; // We also want to show release notes and publisher for disabled updates ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > aUpdateInfo; sal_uInt16 m_nID; }; struct UpdateDialog::SpecificError { - rtl::OUString name; - rtl::OUString message; + OUString name; + OUString message; sal_uInt16 m_nID; }; //------------------------------------------------------------------------------ struct UpdateDialog::IgnoredUpdate { - rtl::OUString sExtensionID; - rtl::OUString sVersion; + OUString sExtensionID; + OUString sVersion; bool bRemoved; - IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion ); + IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ); }; //------------------------------------------------------------------------------ -UpdateDialog::IgnoredUpdate::IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion ): +UpdateDialog::IgnoredUpdate::IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ): sExtensionID( rExtensionID ), sVersion( rVersion ), bRemoved( false ) @@ -184,13 +184,13 @@ struct UpdateDialog::Index bool m_bIgnored; sal_uInt16 m_nID; sal_uInt16 m_nIndex; - rtl::OUString m_aName; + OUString m_aName; - Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName ); + Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ); }; //------------------------------------------------------------------------------ -UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName ): +UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ): m_eKind( theKind ), m_bIgnored( false ), m_nID( nID ), @@ -222,11 +222,11 @@ private: uno::Sequence< uno::Reference< xml::dom::XElement > > getUpdateInformation( uno::Reference< deployment::XPackage > const & package, - uno::Sequence< rtl::OUString > const & urls, - rtl::OUString const & identifier) const; + uno::Sequence< OUString > const & urls, + OUString const & identifier) const; - ::rtl::OUString getUpdateDisplayString( - dp_gui::UpdateData const & data, ::rtl::OUString const & version = ::rtl::OUString()) const; + OUString getUpdateDisplayString( + dp_gui::UpdateData const & data, OUString const & version = OUString()) const; void prepareUpdateData( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & updateInfo, @@ -318,12 +318,12 @@ void UpdateDialog::Thread::execute() prepareUpdateData(info.info, disableUpdate, updateData); //determine if the update is installed in the user or shared repository - rtl::OUString sOnlineVersion; + OUString sOnlineVersion; if (info.info.is()) sOnlineVersion = info.version; - rtl::OUString sVersionUser; - rtl::OUString sVersionShared; - rtl::OUString sVersionBundled; + OUString sVersionUser; + OUString sVersionShared; + OUString sVersionBundled; uno::Sequence< uno::Reference< deployment::XPackage> > extensions; try { extensions = extMgr->getExtensionsWithSameIdentifier( @@ -406,11 +406,11 @@ void UpdateDialog::Thread::handleSpecificError( } } -::rtl::OUString UpdateDialog::Thread::getUpdateDisplayString( - dp_gui::UpdateData const & data, ::rtl::OUString const & version) const +OUString UpdateDialog::Thread::getUpdateDisplayString( + dp_gui::UpdateData const & data, OUString const & version) const { OSL_ASSERT(data.aInstalledPackage.is()); - rtl::OUStringBuffer b(data.aInstalledPackage->getDisplayName()); + OUStringBuffer b(data.aInstalledPackage->getDisplayName()); b.append(static_cast< sal_Unicode >(' ')); { SolarMutexGuard g; @@ -455,7 +455,7 @@ void UpdateDialog::Thread::prepareUpdateData( out_du.unsatisfiedDependencies[i] = dp_misc::Dependencies::getErrorText(ds[i]); } - const ::boost::optional< ::rtl::OUString> updateWebsiteURL(infoset.getLocalizedUpdateWebsiteURL()); + const ::boost::optional< OUString> updateWebsiteURL(infoset.getLocalizedUpdateWebsiteURL()); out_du.name = getUpdateDisplayString(out_data, infoset.getVersion()); @@ -724,7 +724,7 @@ void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind } //------------------------------------------------------------------------------ -void UpdateDialog::addEnabledUpdate( rtl::OUString const & name, +void UpdateDialog::addEnabledUpdate( OUString const & name, dp_gui::UpdateData & data ) { sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_enabledUpdates.size() ); @@ -808,7 +808,7 @@ void UpdateDialog::enableOk() { // ********************************************************************************* void UpdateDialog::createNotifyJob( bool bPrepareOnly, - uno::Sequence< uno::Sequence< rtl::OUString > > &rItemList ) + uno::Sequence< uno::Sequence< OUString > > &rItemList ) { if ( !dp_misc::office_is_running() ) return; @@ -843,7 +843,7 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly, uno::Reference < frame::XDesktop2 > xDesktop = frame::Desktop::create( xContext ); uno::Reference< frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(), uno::UNO_QUERY_THROW ); - uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0); + uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0); if( xDispatch.is() ) { @@ -871,14 +871,14 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly ) if ( !dp_misc::office_is_running() ) return; - uno::Sequence< uno::Sequence< rtl::OUString > > aItemList; + uno::Sequence< uno::Sequence< OUString > > aItemList; if ( ! bRecheckOnly ) { sal_Int32 nCount = 0; for ( sal_Int16 i = 0; i < m_updates.getItemCount(); ++i ) { - uno::Sequence< rtl::OUString > aItem(2); + uno::Sequence< OUString > aItem(2); UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >(m_updates.GetEntryData(i)); @@ -988,11 +988,11 @@ bool UpdateDialog::showDescription(uno::Reference< deployment::XPackage > const ""); } -bool UpdateDialog::showDescription(std::pair< rtl::OUString, rtl::OUString > const & pairPublisher, - rtl::OUString const & sReleaseNotes) +bool UpdateDialog::showDescription(std::pair< OUString, OUString > const & pairPublisher, + OUString const & sReleaseNotes) { - rtl::OUString sPub = pairPublisher.first; - rtl::OUString sURL = pairPublisher.second; + OUString sPub = pairPublisher.first; + OUString sURL = pairPublisher.second; if ( sPub.isEmpty() && sURL.isEmpty() && sReleaseNotes.isEmpty() ) // nothing to show @@ -1056,12 +1056,12 @@ void UpdateDialog::getIgnoredUpdates() args[0] <<= aValue; uno::Reference< container::XNameAccess > xNameAccess( xConfig->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", args), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames(); + uno::Sequence< OUString > aElementNames = xNameAccess->getElementNames(); for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ ) { - ::rtl::OUString aIdentifier = aElementNames[i]; - ::rtl::OUString aVersion; + OUString aIdentifier = aElementNames[i]; + OUString aVersion; uno::Any aPropValue( uno::Reference< beans::XPropertySet >( xNameAccess->getByName( aIdentifier ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) ); aPropValue >>= aVersion; @@ -1116,8 +1116,8 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) if (! m_ignoredUpdates.empty() ) { - rtl::OUString aExtensionID; - rtl::OUString aVersion; + OUString aExtensionID; + OUString aVersion; if ( index->m_eKind == ENABLED_UPDATE ) { @@ -1129,7 +1129,7 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) { DisabledUpdate &rData = m_disabledUpdates[ index->m_nIndex ]; dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo ); - ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() ); + ::boost::optional< OUString > aID( aInfoset.getIdentifier() ); if ( aID ) aExtensionID = *aID; aVersion = aInfoset.getVersion(); @@ -1157,8 +1157,8 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) //------------------------------------------------------------------------------ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll ) { - rtl::OUString aExtensionID; - rtl::OUString aVersion; + OUString aExtensionID; + OUString aVersion; m_bModified = true; @@ -1173,7 +1173,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, { DisabledUpdate &rData = m_disabledUpdates[ pIndex->m_nIndex ]; dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo ); - ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() ); + ::boost::optional< OUString > aID( aInfoset.getIdentifier() ); if ( aID ) aExtensionID = *aID; if ( !bIgnoreAll ) @@ -1205,7 +1205,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, IMPL_LINK_NOARG(UpdateDialog, selectionHandler) { - rtl::OUStringBuffer b; + OUStringBuffer b; bool bInserted = false; UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData(m_updates.GetSelectEntryPos())); @@ -1244,8 +1244,8 @@ IMPL_LINK_NOARG(UpdateDialog, selectionHandler) if (data.unsatisfiedDependencies.getLength() != 0) { // create error string for version mismatch - ::rtl::OUString sVersion( "%VERSION" ); - ::rtl::OUString sProductName( "%PRODUCTNAME" ); + OUString sVersion( "%VERSION" ); + OUString sProductName( "%PRODUCTNAME" ); sal_Int32 nPos = m_noDependencyCurVer.indexOf( sVersion ); if ( nPos >= 0 ) { @@ -1380,9 +1380,9 @@ IMPL_LINK_NOARG(UpdateDialog, closeHandler) { IMPL_LINK( UpdateDialog, hyperlink_clicked, FixedHyperlink*, pHyperlink ) { - ::rtl::OUString sURL; + OUString sURL; if ( pHyperlink ) - sURL = ::rtl::OUString( pHyperlink->GetURL() ); + sURL = OUString( pHyperlink->GetURL() ); if ( sURL.isEmpty() ) return 0; @@ -1391,7 +1391,7 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, FixedHyperlink*, pHyperlink ) uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(m_context) ); //throws lang::IllegalArgumentException, system::SystemShellExecuteException - xSystemShellExecute->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); } catch ( const uno::Exception& ) { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index ca6ffa53fddb..e83df3cba7b1 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -94,7 +94,7 @@ public: void notifyMenubar( bool bPrepareOnly, bool bRecheckOnly ); static void createNotifyJob( bool bPrepareOnly, - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > > &rItemList ); + com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > > &rItemList ); private: UpdateDialog(UpdateDialog &); // not defined @@ -128,9 +128,9 @@ private: void handlePopupMenu( const Point &rPos ); - rtl::OUString m_ignoreUpdate; - rtl::OUString m_ignoreAllUpdates; - rtl::OUString m_enableUpdate; + OUString m_ignoreUpdate; + OUString m_ignoreAllUpdates; + OUString m_enableUpdate; UpdateDialog & m_dialog; }; @@ -142,7 +142,7 @@ private: bool isIgnoredUpdate( UpdateDialog::Index *pIndex ); void setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll ); - void addEnabledUpdate( rtl::OUString const & name, dp_gui::UpdateData & data ); + void addEnabledUpdate( OUString const & name, dp_gui::UpdateData & data ); void addDisabledUpdate( UpdateDialog::DisabledUpdate & data ); void addSpecificError( UpdateDialog::SpecificError & data ); @@ -157,8 +157,8 @@ private: void clearDescription(); bool showDescription(::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > const & aExtension); - bool showDescription(std::pair< rtl::OUString, rtl::OUString > const & pairPublisher, - rtl::OUString const & sReleaseNotes); + bool showDescription(std::pair< OUString, OUString > const & pairPublisher, + OUString const & sReleaseNotes); bool showDescription( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & aUpdateInfo); bool showDescription( const String& rDescription, bool bWithPublisher ); @@ -187,18 +187,18 @@ private: HelpButton m_help; PushButton m_ok; PushButton m_close; - rtl::OUString m_error; - rtl::OUString m_none; - rtl::OUString m_noInstallable; - rtl::OUString m_failure; - rtl::OUString m_unknownError; - rtl::OUString m_noDescription; - rtl::OUString m_noInstall; - rtl::OUString m_noDependency; - rtl::OUString m_noDependencyCurVer; - rtl::OUString m_browserbased; - rtl::OUString m_version; - rtl::OUString m_ignoredUpdate; + OUString m_error; + OUString m_none; + OUString m_noInstallable; + OUString m_failure; + OUString m_unknownError; + OUString m_noDescription; + OUString m_noInstall; + OUString m_noDependency; + OUString m_noDependencyCurVer; + OUString m_browserbased; + OUString m_version; + OUString m_ignoredUpdate; std::vector< dp_gui::UpdateData > m_enabledUpdates; std::vector< UpdateDialog::DisabledUpdate > m_disabledUpdates; std::vector< UpdateDialog::SpecificError > m_specificErrors; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index b464af532774..774f302972ab 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -77,7 +77,6 @@ class Window; namespace cssu = ::com::sun::star::uno; using dp_misc::StrTitle; -using ::rtl::OUString; namespace dp_gui { @@ -96,7 +95,7 @@ private: virtual void execute(); void downloadExtensions(); - void download(::rtl::OUString const & aUrls, UpdateData & aUpdatData); + void download(OUString const & aUrls, UpdateData & aUpdatData); void installExtensions(); void removeTempDownloads(); @@ -111,7 +110,7 @@ private: ::rtl::Reference m_updateCmdEnv; //A folder which is created in the temp directory in which then the updates are downloaded - ::rtl::OUString m_sDownloadFolder; + OUString m_sDownloadFolder; bool m_stop; @@ -272,7 +271,7 @@ void UpdateInstallDialog::updateDone() } // make sure the solar mutex is locked before calling //sets an error message in the text area -void UpdateInstallDialog::setError(INSTALL_ERROR err, ::rtl::OUString const & sExtension, +void UpdateInstallDialog::setError(INSTALL_ERROR err, OUString const & sExtension, OUString const & exceptionMessage) { String sError; @@ -409,7 +408,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() if (curData.sLocalURL.isEmpty()) { //Construct a string of all messages contained in the exceptions plus the respective download URLs - ::rtl::OUStringBuffer buf(256); + OUStringBuffer buf(256); typedef ::std::vector< ::std::pair >::const_iterator CIT; for (CIT j = vecExceptions.begin(); j != vecExceptions.end(); ++j) { diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index c0d24b22b791..4ff60064b5af 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -84,8 +84,8 @@ private: ERROR_INSTALLATION, ERROR_LICENSE_DECLINED }; - void setError(INSTALL_ERROR err, ::rtl::OUString const & sExtension, ::rtl::OUString const & exceptionMessage); - void setError(::rtl::OUString const & exceptionMessage); + void setError(INSTALL_ERROR err, OUString const & sExtension, OUString const & exceptionMessage); + void setError(OUString const & exceptionMessage); ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > getExtensionManager() const { return m_xExtensionManager; } @@ -97,14 +97,14 @@ private: bool m_bNoEntry; bool m_bActivated; - ::rtl::OUString m_sInstalling; - ::rtl::OUString m_sFinished; - ::rtl::OUString m_sNoErrors; - ::rtl::OUString m_sErrorDownload; - ::rtl::OUString m_sErrorInstallation; - ::rtl::OUString m_sErrorLicenseDeclined; - ::rtl::OUString m_sNoInstall; - ::rtl::OUString m_sThisErrorOccurred; + OUString m_sInstalling; + OUString m_sFinished; + OUString m_sNoErrors; + OUString m_sErrorDownload; + OUString m_sErrorInstallation; + OUString m_sErrorLicenseDeclined; + OUString m_sNoInstall; + OUString m_sThisErrorOccurred; FixedText m_ft_action; ProgressBar m_statusbar; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index ccd57d20e1d5..46c653bc2bb7 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -46,7 +46,6 @@ using namespace ::dp_misc; namespace cssu = ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_gui { @@ -106,8 +105,8 @@ struct LicenseDialogImpl : public ModalDialog LicenseDialogImpl( Window * pParent, css::uno::Reference< css::uno::XComponentContext > const & xContext, - const ::rtl::OUString & sExtensionName, - const ::rtl::OUString & sLicenseText); + const OUString & sExtensionName, + const OUString & sLicenseText); virtual void Activate(); @@ -184,8 +183,8 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) LicenseDialogImpl::LicenseDialogImpl( Window * pParent, cssu::Reference< cssu::XComponentContext > const & xContext, - const ::rtl::OUString & sExtensionName, - const ::rtl::OUString & sLicenseText): + const OUString & sExtensionName, + const OUString & sLicenseText): ModalDialog(pParent, DpGuiResId(RID_DLG_LICENSE)) ,m_xComponentContext(xContext) ,m_ftHead(this, DpGuiResId(FT_LICENSE_HEADER)) diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index 7fb26c46b66e..8dc0f2c908bc 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.hxx @@ -30,7 +30,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_gui { diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx index de5f604c139d..63f77cb79303 100644 --- a/desktop/source/deployment/inc/dp_dependencies.hxx +++ b/desktop/source/deployment/inc/dp_dependencies.hxx @@ -64,7 +64,7 @@ namespace Dependencies { the name of the dependency; will never be empty, as a localized “unknown” is substituted for an empty/missing name */ - DESKTOP_DEPLOYMENTMISC_DLLPUBLIC rtl::OUString getErrorText( + DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getErrorText( com::sun::star::uno::Reference< com::sun::star::xml::dom::XElement > const & dependency); } diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx index 1e4817fff17d..8cb7321c44d3 100644 --- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx +++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx @@ -46,7 +46,7 @@ namespace dp_misc { struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC SimpleLicenseAttributes { - ::rtl::OUString acceptBy; + OUString acceptBy; //Attribute suppress-on-update. Default is false. bool suppressOnUpdate; //Attribute suppress-if-required. Default is false. @@ -86,7 +86,7 @@ public: @return the identifier, or an empty optional if none is specified */ - ::boost::optional< ::rtl::OUString > getIdentifier() const; + ::boost::optional< OUString > getIdentifier() const; /** Return the textual version representation. @@ -94,7 +94,7 @@ public: @return textual version representation */ - ::rtl::OUString getVersion() const; + OUString getVersion() const; /** Returns a list of supported platforms. @@ -111,27 +111,27 @@ public: The value attribute can contain various platform tokens. They must be separated by commas.Each token will be stripped from leading and trailing white space (trim()). */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedPlaforms() const; + ::com::sun::star::uno::Sequence< OUString > getSupportedPlaforms() const; /** Returns the localized publisher name and the corresponding URL. In case there is no publisher element then a pair of two empty strings is returned. */ - ::std::pair< ::rtl::OUString, ::rtl::OUString > getLocalizedPublisherNameAndURL() const; + ::std::pair< OUString, OUString > getLocalizedPublisherNameAndURL() const; /** Returns the URL for the release notes corresponding to the office's locale. In case there is no release-notes element then an empty string is returned. */ - ::rtl::OUString getLocalizedReleaseNotesURL() const; + OUString getLocalizedReleaseNotesURL() const; /** returns the relative path to the license file. In case there is no simple-license element then an empty string is returned. */ - ::rtl::OUString getLocalizedLicenseURL() const; + OUString getLocalizedLicenseURL() const; /** returns the attributes of the simple-license element @@ -144,7 +144,7 @@ public: In case there is no localized display-name then an empty string is returned. */ - ::rtl::OUString getLocalizedDisplayName() const; + OUString getLocalizedDisplayName() const; /** returns the download website URL from the update information. @@ -165,13 +165,13 @@ public: the download website URL, or an empty optional if none is specified */ - ::boost::optional< ::rtl::OUString > getLocalizedUpdateWebsiteURL() const; + ::boost::optional< OUString > getLocalizedUpdateWebsiteURL() const; /** returns the relative URL to the description. The URL is relative to the root directory of the extensions. */ - ::rtl::OUString getLocalizedDescriptionURL() const; + OUString getLocalizedDescriptionURL() const; /** Return the dependencies. @@ -187,7 +187,7 @@ public: @return update information URLs */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getUpdateInformationUrls() const; /** @@ -200,22 +200,22 @@ public: @return download URLs */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getUpdateDownloadUrls() const; /** Returns the URL for the icon image. */ - ::rtl::OUString getIconURL( sal_Bool bHighContrast ) const; + OUString getIconURL( sal_Bool bHighContrast ) const; bool hasDescription() const; private: - SAL_DLLPRIVATE ::boost::optional< ::rtl::OUString > getOptionalValue( - ::rtl::OUString const & expression) const; + SAL_DLLPRIVATE ::boost::optional< OUString > getOptionalValue( + OUString const & expression) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > getUrls( - ::rtl::OUString const & expression) const; + SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< OUString > getUrls( + OUString const & expression) const; /** Retrieves a child element which as lang attribute which matches the office locale. @@ -227,7 +227,7 @@ private: Then a null reference is returned. */ SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > - getLocalizedChild( ::rtl::OUString const & sParent) const; + getLocalizedChild( OUString const & sParent) const; SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> matchLanguageTag( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & xParent, @@ -247,15 +247,15 @@ private: @param out_bParentExists indicates if the element node specified in sXPathParent exists. */ - SAL_DLLPRIVATE ::rtl::OUString getLocalizedHREFAttrFromChild( - ::rtl::OUString const & sXPathParent, bool * out_bParentExists) const; + SAL_DLLPRIVATE OUString getLocalizedHREFAttrFromChild( + OUString const & sXPathParent, bool * out_bParentExists) const; /** Gets the node value for a given expression. The expression is used in m_xpath-selectSingleNode. The value of the returned node is return value of this function. */ - SAL_DLLPRIVATE ::rtl::OUString - getNodeValueFromExpression(::rtl::OUString const & expression) const; + SAL_DLLPRIVATE OUString + getNodeValueFromExpression(OUString const & expression) const; /** Check the extensions blacklist if additional extension meta data (e.g. dependencies) are defined for this extension and have to be taken into account. @@ -266,8 +266,8 @@ private: /** Helper method to compare the versions with the current version */ SAL_DLLPRIVATE bool - checkBlacklistVersion(::rtl::OUString currentversion, - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & versions) const; + checkBlacklistVersion(OUString currentversion, + ::com::sun::star::uno::Sequence< OUString > const & versions) const; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_context; @@ -288,7 +288,7 @@ inline bool DescriptionInfoset::hasDescription() const the description.xml. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -DescriptionInfoset getDescriptionInfoset(::rtl::OUString const & sExtensionFolderURL); +DescriptionInfoset getDescriptionInfoset(OUString const & sExtensionFolderURL); } #endif diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx index 14aa41286001..0d897aa6f824 100644 --- a/desktop/source/deployment/inc/dp_identifier.hxx +++ b/desktop/source/deployment/inc/dp_identifier.hxx @@ -47,9 +47,9 @@ namespace dp_misc { the given optional identifier if present, otherwise a legacy identifier based on the given file name */ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString generateIdentifier( - ::boost::optional< ::rtl::OUString > const & optional, - ::rtl::OUString const & fileName); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateIdentifier( + ::boost::optional< OUString > const & optional, + OUString const & fileName); /** Gets the identifier of a package. @@ -63,7 +63,7 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString generateIdentifier( @throws com::sun::star::uno::RuntimeException */ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString getIdentifier( +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getIdentifier( ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > const & package); @@ -76,8 +76,8 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString getIdentifier( @return a legacy identifier based on the given file name */ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString generateLegacyIdentifier( - ::rtl::OUString const & fileName); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateLegacyIdentifier( + OUString const & fileName); } diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h index 9d3a105fd786..67bf480176fb 100644 --- a/desktop/source/deployment/inc/dp_interact.h +++ b/desktop/source/deployment/inc/dp_interact.h @@ -31,7 +31,7 @@ namespace dp_misc { inline void progressUpdate( - ::rtl::OUString const & status, + OUString const & status, css::uno::Reference const & xCmdEnv ) { if (xCmdEnv.is()) { @@ -52,16 +52,16 @@ public: inline ~ProgressLevel(); inline ProgressLevel( css::uno::Reference const & xCmdEnv, - ::rtl::OUString const & status ); + OUString const & status ); - inline void update( ::rtl::OUString const & status ) const; + inline void update( OUString const & status ) const; inline void update( css::uno::Any const & status ) const; }; //______________________________________________________________________________ inline ProgressLevel::ProgressLevel( css::uno::Reference< css::ucb::XCommandEnvironment > const & xCmdEnv, - ::rtl::OUString const & status ) + OUString const & status ) { if (xCmdEnv.is()) m_xProgressHandler = xCmdEnv->getProgressHandler(); @@ -77,7 +77,7 @@ inline ProgressLevel::~ProgressLevel() } //______________________________________________________________________________ -inline void ProgressLevel::update( ::rtl::OUString const & status ) const +inline void ProgressLevel::update( OUString const & status ) const { if (m_xProgressHandler.is()) m_xProgressHandler->update( css::uno::makeAny(status) ); diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h index 70f5cbb471ad..4ec4c6e34989 100644 --- a/desktop/source/deployment/inc/dp_misc.h +++ b/desktop/source/deployment/inc/dp_misc.h @@ -59,14 +59,14 @@ inline void try_dispose( ::com::sun::star::uno::Reference< ::com::sun::star::uno //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString expandUnoRcTerm( ::rtl::OUString const & term ); +OUString expandUnoRcTerm( OUString const & term ); DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString makeRcTerm( ::rtl::OUString const & url ); +OUString makeRcTerm( OUString const & url ); //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString expandUnoRcUrl( ::rtl::OUString const & url ); +OUString expandUnoRcUrl( OUString const & url ); //============================================================================== @@ -76,8 +76,8 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC If the URL starts with vnd.sun.star.expand then the relative path will be again encoded for use in an "expand" URL. */ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString makeURL( - ::rtl::OUString const & baseURL, ::rtl::OUString const & relPath ); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString makeURL( + OUString const & baseURL, OUString const & relPath ); /** appends a relative path to a url. @@ -85,17 +85,17 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString makeURL( This is the same as makeURL, but the relative Path must me a segment of an system path. */ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString makeURLAppendSysPathSegment( - ::rtl::OUString const & baseURL, ::rtl::OUString const & relPath ); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString makeURLAppendSysPathSegment( + OUString const & baseURL, OUString const & relPath ); //============================================================================== -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString generateRandomPipeId(); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateRandomPipeId(); class AbortChannel; //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> resolveUnoURL( - ::rtl::OUString const & connectString, + OUString const & connectString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xLocalContext, AbortChannel * abortChannel = 0 ); @@ -104,8 +104,8 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool office_is_running(); //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -oslProcess raiseProcess( ::rtl::OUString const & appURL, - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & args ); +oslProcess raiseProcess( OUString const & appURL, + ::com::sun::star::uno::Sequence< OUString > const & args ); //============================================================================== @@ -116,13 +116,13 @@ oslProcess raiseProcess( ::rtl::OUString const & appURL, WriteConsoleW. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -void writeConsole(::rtl::OUString const & sText); +void writeConsole(OUString const & sText); /** writes the argument to the console using the error stream. Otherwise the same as writeConsole. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -void writeConsoleError(::rtl::OUString const & sText); +void writeConsoleError(OUString const & sText); /** reads from the console. @@ -131,14 +131,14 @@ void writeConsoleError(::rtl::OUString const & sText); size of 1024 and does NOT include leading and trailing white space(applied OUString::trim()) */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString readConsole(); +OUString readConsole(); /** print the text to the console in a debug build. The argument is forwarded to writeConsole. The function does not add new line. The code is only executed if OSL_DEBUG_LEVEL > 1 */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -void TRACE(::rtl::OUString const & sText); +void TRACE(OUString const & sText); /** registers or revokes shared or bundled extensions which have been recently added or removed. diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index a0fb96e3619d..efc5c24145dd 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -28,7 +28,7 @@ namespace dp_misc { typedef ::boost::unordered_map< - ::rtl::OString, ::rtl::OString, ::rtl::OStringHash > t_string2string_map; + OString, OString, OStringHash > t_string2string_map; // Class to read obsolete registered extensions // should be removed for LibreOffice 4.0 @@ -43,25 +43,25 @@ class PersistentMap public: ~PersistentMap(); - PersistentMap( ::rtl::OUString const & url, bool readOnly ); + PersistentMap( OUString const & url, bool readOnly ); /** in mem db */ PersistentMap(); - bool has( ::rtl::OString const & key ) const; - bool get( ::rtl::OString * value, ::rtl::OString const & key ) const; + bool has( OString const & key ) const; + bool get( OString * value, OString const & key ) const; t_string2string_map getEntries() const; - void put( ::rtl::OString const & key, ::rtl::OString const & value ); - bool erase( ::rtl::OString const & key, bool flush_immediately = true ); + void put( OString const & key, OString const & value ); + bool erase( OString const & key, bool flush_immediately = true ); protected: bool open(); bool readAll(); - void add( ::rtl::OString const & key, ::rtl::OString const & value ); + void add( OString const & key, OString const & value ); void flush(); #ifndef DISABLE_BDB2PMAP bool importFromBDB( void); - ::rtl::OUString m_MapFileName; + OUString m_MapFileName; #endif }; diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx index 044762e761f8..18ca77efda50 100644 --- a/desktop/source/deployment/inc/dp_platform.hxx +++ b/desktop/source/deployment/inc/dp_platform.hxx @@ -30,16 +30,16 @@ namespace dp_misc { -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString const & getPlatformString(); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString const & getPlatformString(); DESKTOP_DEPLOYMENTMISC_DLLPUBLIC - bool platform_fits( ::rtl::OUString const & platform_string ); + bool platform_fits( OUString const & platform_string ); /** determines if the current platform corresponds to one of the platform strings. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -bool hasValidPlatform( ::com::sun::star::uno::Sequence< ::rtl::OUString > const & platformStrings); +bool hasValidPlatform( ::com::sun::star::uno::Sequence< OUString > const & platformStrings); } diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index 78bf42624b8e..04dc52c82889 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -37,8 +37,8 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC String getResourceString( sal_uInt16 id ); template struct StaticResourceString : - public ::rtl::StaticWithInit< ::rtl::OUString, Unique > { - const ::rtl::OUString operator () () { return getResourceString(id); } + public ::rtl::StaticWithInit< OUString, Unique > { + const OUString operator () () { return getResourceString(id); } }; //============================================================================== diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h index 7da43b7f64c8..824d32d367dd 100644 --- a/desktop/source/deployment/inc/dp_ucb.h +++ b/desktop/source/deployment/inc/dp_ucb.h @@ -37,16 +37,16 @@ namespace dp_misc { struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle { - static css::uno::Sequence< rtl::OUString > getTitleSequence() + static css::uno::Sequence< OUString > getTitleSequence() { - css::uno::Sequence< rtl::OUString > aSeq( 1 ); + css::uno::Sequence< OUString > aSeq( 1 ); aSeq[ 0 ] = "Title"; return aSeq; } - static rtl::OUString getTitle( ::ucbhelper::Content &rContent ) + static OUString getTitle( ::ucbhelper::Content &rContent ) { - return rtl::OUString( rContent.getPropertyValue( - rtl::OUString::createFromAscii( "Title" ) ).get() ); + return OUString( rContent.getPropertyValue( + OUString::createFromAscii( "Title" ) ).get() ); } // just return titles - the ucbhelper should have a simpler API for this [!] static css::uno::Reference< css::sdbc::XResultSet > @@ -61,7 +61,7 @@ struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool create_ucb_content( ::ucbhelper::Content * ucb_content, - ::rtl::OUString const & url, + OUString const & url, css::uno::Reference const & xCmdEnv, bool throw_exc = true ); @@ -70,13 +70,13 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool create_ucb_content( */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool create_folder( ::ucbhelper::Content * ucb_content, - ::rtl::OUString const & url, + OUString const & url, css::uno::Reference const & xCmdEnv, bool throw_exc = true ); //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool erase_path( - ::rtl::OUString const & url, + OUString const & url, css::uno::Reference const & xCmdEnv, bool throw_exc = true ); @@ -86,11 +86,11 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -bool readLine( ::rtl::OUString * res, ::rtl::OUString const & startingWith, +bool readLine( OUString * res, OUString const & startingWith, ::ucbhelper::Content & ucb_content, rtl_TextEncoding textenc ); DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -bool readProperties( ::std::list< ::std::pair< ::rtl::OUString, ::rtl::OUString> > & out_result, +bool readProperties( ::std::list< ::std::pair< OUString, OUString> > & out_result, ::ucbhelper::Content & ucb_content); diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx index cbad0bab7fe4..4f50d5c34812 100644 --- a/desktop/source/deployment/inc/dp_update.hxx +++ b/desktop/source/deployment/inc/dp_update.hxx @@ -39,7 +39,7 @@ namespace dp_misc { is used when an extension does not provide its own URL. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString getExtensionDefaultUpdateURL(); +OUString getExtensionDefaultUpdateURL(); enum UPDATE_SOURCE { @@ -59,10 +59,10 @@ enum UPDATE_SOURCE DESKTOP_DEPLOYMENTMISC_DLLPUBLIC UPDATE_SOURCE isUpdateUserExtension( bool bReadOnlyShared, - ::rtl::OUString const & userVersion, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion); + OUString const & userVersion, + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion); /* determine if an update is available which is installed in the shared repository. @@ -74,9 +74,9 @@ UPDATE_SOURCE isUpdateUserExtension( DESKTOP_DEPLOYMENTMISC_DLLPUBLIC UPDATE_SOURCE isUpdateSharedExtension( bool bReadOnlyShared, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion); + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion); /* determines the extension with the highest identifier and returns it @@ -95,11 +95,11 @@ struct UpdateInfo ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> extension; //version of the update - ::rtl::OUString version; + OUString version; ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > info; }; -typedef std::map< ::rtl::OUString, UpdateInfo > UpdateInfoMap; +typedef std::map< OUString, UpdateInfo > UpdateInfoMap; /* @param extensionList @@ -128,11 +128,11 @@ UpdateInfoMap getOnlineUpdateInfos( /* retunrs the highest version from the provided arguments. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString getHighestVersion( - ::rtl::OUString const & userVersion, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion); +OUString getHighestVersion( + OUString const & userVersion, + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion); } diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx index be88cb084d03..0e110e7132b3 100644 --- a/desktop/source/deployment/inc/dp_version.hxx +++ b/desktop/source/deployment/inc/dp_version.hxx @@ -31,7 +31,7 @@ namespace dp_misc { enum Order { LESS, EQUAL, GREATER }; DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Order compareVersions( - ::rtl::OUString const & version1, ::rtl::OUString const & version2); + OUString const & version1, OUString const & version2); } #endif diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx index 647ba2f8610d..1e041244a281 100644 --- a/desktop/source/deployment/inc/lockfile.hxx +++ b/desktop/source/deployment/inc/lockfile.hxx @@ -38,13 +38,13 @@ #include "dp_misc_api.hxx" -#define LOCKFILE_SUFFIX rtl::OUString( "/.lock" ) -#define LOCKFILE_GROUP rtl::OString( "Lockdata" ) -#define LOCKFILE_USERKEY rtl::OString( "User" ) -#define LOCKFILE_HOSTKEY rtl::OString( "Host" ) -#define LOCKFILE_STAMPKEY rtl::OString( "Stamp" ) -#define LOCKFILE_TIMEKEY rtl::OString( "Time" ) -#define LOCKFILE_IPCKEY rtl::OString( "IPCServer" ) +#define LOCKFILE_SUFFIX OUString( "/.lock" ) +#define LOCKFILE_GROUP OString( "Lockdata" ) +#define LOCKFILE_USERKEY OString( "User" ) +#define LOCKFILE_HOSTKEY OString( "Host" ) +#define LOCKFILE_STAMPKEY OString( "Stamp" ) +#define LOCKFILE_TIMEKEY OString( "Time" ) +#define LOCKFILE_IPCKEY OString( "IPCServer" ) namespace desktop { @@ -71,13 +71,13 @@ namespace desktop { private: bool m_bIPCserver; // full qualified name (file://-url) of the lockfile - rtl::OUString m_aLockname; + OUString m_aLockname; // flag whether the d'tor should delete the lock sal_Bool m_bRemove; sal_Bool m_bIsLocked; // ID - rtl::OUString m_aId; - rtl::OUString m_aDate; + OUString m_aId; + OUString m_aDate; // access to data in file void syncToFile(void) const; sal_Bool isStale(void) const; diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index 1eaeb09d70f5..99e376945799 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -51,59 +51,59 @@ namespace { static char const separator = static_cast< char >( static_cast< unsigned char >(0xFF)); -::rtl::OString oldKey(::rtl::OUString const & fileName) { - return ::rtl::OUStringToOString(fileName, RTL_TEXTENCODING_UTF8); +OString oldKey(OUString const & fileName) { + return OUStringToOString(fileName, RTL_TEXTENCODING_UTF8); } -::rtl::OString newKey(::rtl::OUString const & id) { - ::rtl::OStringBuffer b; +OString newKey(OUString const & id) { + OStringBuffer b; b.append(separator); - b.append(::rtl::OUStringToOString(id, RTL_TEXTENCODING_UTF8)); + b.append(OUStringToOString(id, RTL_TEXTENCODING_UTF8)); return b.makeStringAndClear(); } ::dp_manager::ActivePackages::Data decodeOldData( - ::rtl::OUString const & fileName, ::rtl::OString const & value) + OUString const & fileName, OString const & value) { ::dp_manager::ActivePackages::Data d; sal_Int32 i = value.indexOf(';'); OSL_ASSERT(i >= 0); - d.temporaryName = ::rtl::OUString(value.getStr(), i, RTL_TEXTENCODING_UTF8); + d.temporaryName = OUString(value.getStr(), i, RTL_TEXTENCODING_UTF8); d.fileName = fileName; - d.mediaType = ::rtl::OUString( + d.mediaType = OUString( value.getStr() + i + 1, value.getLength() - i - 1, RTL_TEXTENCODING_UTF8); return d; } -::dp_manager::ActivePackages::Data decodeNewData(::rtl::OString const & value) { +::dp_manager::ActivePackages::Data decodeNewData(OString const & value) { ::dp_manager::ActivePackages::Data d; sal_Int32 i1 = value.indexOf(separator); OSL_ASSERT(i1 >= 0); - d.temporaryName = ::rtl::OUString( + d.temporaryName = OUString( value.getStr(), i1, RTL_TEXTENCODING_UTF8); sal_Int32 i2 = value.indexOf(separator, i1 + 1); OSL_ASSERT(i2 >= 0); - d.fileName = ::rtl::OUString( + d.fileName = OUString( value.getStr() + i1 + 1, i2 - i1 - 1, RTL_TEXTENCODING_UTF8); sal_Int32 i3 = value.indexOf(separator, i2 + 1); if (i3 < 0) { //Before ActivePackages::Data::version was added - d.mediaType = ::rtl::OUString( + d.mediaType = OUString( value.getStr() + i2 + 1, value.getLength() - i2 - 1, RTL_TEXTENCODING_UTF8); } else { sal_Int32 i4 = value.indexOf(separator, i3 + 1); - d.mediaType = ::rtl::OUString( + d.mediaType = OUString( value.getStr() + i2 + 1, i3 - i2 -1, RTL_TEXTENCODING_UTF8); - d.version = ::rtl::OUString( + d.version = OUString( value.getStr() + i3 + 1, i4 - i3 - 1, RTL_TEXTENCODING_UTF8); - d.failedPrerequisites = ::rtl::OUString( + d.failedPrerequisites = OUString( value.getStr() + i4 + 1, value.getLength() - i4 - 1, RTL_TEXTENCODING_UTF8); } @@ -117,7 +117,7 @@ namespace dp_manager { ActivePackages::ActivePackages() {} -ActivePackages::ActivePackages(::rtl::OUString const & url, bool readOnly) +ActivePackages::ActivePackages(OUString const & url, bool readOnly) #if HAVE_FEATURE_EXTENSIONS : m_map(url, readOnly) #endif @@ -129,17 +129,17 @@ ActivePackages::ActivePackages(::rtl::OUString const & url, bool readOnly) ActivePackages::~ActivePackages() {} bool ActivePackages::has( - ::rtl::OUString const & id, ::rtl::OUString const & fileName) const + OUString const & id, OUString const & fileName) const { return get(NULL, id, fileName); } bool ActivePackages::get( - Data * data, ::rtl::OUString const & id, ::rtl::OUString const & fileName) + Data * data, OUString const & id, OUString const & fileName) const { #if HAVE_FEATURE_EXTENSIONS - ::rtl::OString v; + OString v; if (m_map.get(&v, newKey(id))) { if (data != NULL) { *data = decodeNewData(v); @@ -171,13 +171,13 @@ ActivePackages::Entries ActivePackages::getEntries() const { if (!i->first.isEmpty() && i->first[0] == separator) { es.push_back( ::std::make_pair( - ::rtl::OUString( + OUString( i->first.getStr() + 1, i->first.getLength() - 1, RTL_TEXTENCODING_UTF8), decodeNewData(i->second))); } else { - ::rtl::OUString fn( - ::rtl::OStringToOUString(i->first, RTL_TEXTENCODING_UTF8)); + OUString fn( + OStringToOUString(i->first, RTL_TEXTENCODING_UTF8)); es.push_back( ::std::make_pair( ::dp_misc::generateLegacyIdentifier(fn), @@ -188,19 +188,19 @@ ActivePackages::Entries ActivePackages::getEntries() const { return es; } -void ActivePackages::put(::rtl::OUString const & id, Data const & data) { +void ActivePackages::put(OUString const & id, Data const & data) { #if HAVE_FEATURE_EXTENSIONS - ::rtl::OStringBuffer b; + OStringBuffer b; b.append( - ::rtl::OUStringToOString(data.temporaryName, RTL_TEXTENCODING_UTF8)); + OUStringToOString(data.temporaryName, RTL_TEXTENCODING_UTF8)); b.append(separator); - b.append(::rtl::OUStringToOString(data.fileName, RTL_TEXTENCODING_UTF8)); + b.append(OUStringToOString(data.fileName, RTL_TEXTENCODING_UTF8)); b.append(separator); - b.append(::rtl::OUStringToOString(data.mediaType, RTL_TEXTENCODING_UTF8)); + b.append(OUStringToOString(data.mediaType, RTL_TEXTENCODING_UTF8)); b.append(separator); - b.append(::rtl::OUStringToOString(data.version, RTL_TEXTENCODING_UTF8)); + b.append(OUStringToOString(data.version, RTL_TEXTENCODING_UTF8)); b.append(separator); - b.append(::rtl::OUStringToOString(data.failedPrerequisites, RTL_TEXTENCODING_UTF8)); + b.append(OUStringToOString(data.failedPrerequisites, RTL_TEXTENCODING_UTF8)); m_map.put(newKey(id), b.makeStringAndClear()); #else (void) id; @@ -209,7 +209,7 @@ void ActivePackages::put(::rtl::OUString const & id, Data const & data) { } void ActivePackages::erase( - ::rtl::OUString const & id, ::rtl::OUString const & fileName) + OUString const & id, OUString const & fileName) { #if HAVE_FEATURE_EXTENSIONS m_map.erase(newKey(id), true) || m_map.erase(oldKey(fileName), true); diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 940b6aa2a01e..10fe365b1cfa 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -38,50 +38,50 @@ namespace dp_manager { class ActivePackages { public: struct Data { - Data(): failedPrerequisites(::rtl::OUString::valueOf((sal_Int32)0)) + Data(): failedPrerequisites(OUString::valueOf((sal_Int32)0)) {} /* name of the temporary file (shared, user extension) or the name of the folder of the bundled extension. It does not contain the trailing '_' of the folder. UTF-8 encoded */ - ::rtl::OUString temporaryName; + OUString temporaryName; /* The file name (shared, user) or the folder name (bundled) If the key is the file name, then file name is not encoded. If the key is the idendifier then the file name is UTF-8 encoded. */ - ::rtl::OUString fileName; - ::rtl::OUString mediaType; - ::rtl::OUString version; + OUString fileName; + OUString mediaType; + OUString version; /* If this string contains the value according to com::sun::star::deployment::Prerequisites or "0". That is, if the value is > 0 then the call to XPackage::checkPrerequisites failed. In this case the extension must not be registered. */ - ::rtl::OUString failedPrerequisites; + OUString failedPrerequisites; }; - typedef ::std::vector< ::std::pair< ::rtl::OUString, Data > > Entries; + typedef ::std::vector< ::std::pair< OUString, Data > > Entries; ActivePackages(); - ActivePackages(::rtl::OUString const & url, bool readOnly); + ActivePackages(OUString const & url, bool readOnly); ~ActivePackages(); - bool has(::rtl::OUString const & id, ::rtl::OUString const & fileName) + bool has(OUString const & id, OUString const & fileName) const; bool get( - Data * data, ::rtl::OUString const & id, - ::rtl::OUString const & fileName) const; + Data * data, OUString const & id, + OUString const & fileName) const; Entries getEntries() const; - void put(::rtl::OUString const & id, Data const & value); + void put(OUString const & id, Data const & value); - void erase(::rtl::OUString const & id, ::rtl::OUString const & fileName); + void erase(OUString const & id, OUString const & fileName); private: ActivePackages(ActivePackages &); // not defined diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index 56fc23e8c748..a57c531d82c6 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -36,7 +36,6 @@ namespace ucb = com::sun::star::ucb; namespace uno = com::sun::star::uno; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace dp_manager { diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index 93d1626e26a3..0780dfab3382 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -86,14 +86,14 @@ public: class LicenseCommandEnv : public BaseCommandEnv { private: - ::rtl::OUString m_repository; + OUString m_repository; bool m_bSuppressLicense; public: LicenseCommandEnv() : m_bSuppressLicense(false) {}; LicenseCommandEnv( css::uno::Reference< css::task::XInteractionHandler> const & handler, bool bSuppressLicense, - ::rtl::OUString const & repository); + OUString const & repository); // XInteractionHandler virtual void SAL_CALL handle( diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 9add42544d8a..ef539bcdeba8 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -68,7 +68,6 @@ namespace beans = com::sun::star::beans; namespace util = com::sun::star::util; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace { @@ -110,7 +109,7 @@ void writeLastModified(OUString & url, Reference const ::rtl::Bootstrap::expandMacros(url); ::ucbhelper::Content ucbStamp(url, xCmdEnv, xContext); dp_misc::erase_path( url, xCmdEnv ); - ::rtl::OString stamp("1" ); + OString stamp("1" ); Reference xData( ::xmlscript::createInputStream( ::rtl::ByteSequence( @@ -151,7 +150,7 @@ ExtensionRemoveGuard::~ExtensionRemoveGuard() OSL_ASSERT(!(m_extension.is() && !m_xPackageManager.is())); if (m_xPackageManager.is() && m_extension.is()) m_xPackageManager->removePackage( - dp_misc::getIdentifier(m_extension), ::rtl::OUString(), + dp_misc::getIdentifier(m_extension), OUString(), css::uno::Reference(), css::uno::Reference()); } catch (...) { @@ -212,7 +211,7 @@ Reference ExtensionManager::createAbortChannel() } css::uno::Reference -ExtensionManager::getPackageManager(::rtl::OUString const & repository) +ExtensionManager::getPackageManager(OUString const & repository) throw (css::lang::IllegalArgumentException) { Reference xPackageManager; @@ -1445,7 +1444,7 @@ ExtensionManager::getExtensionsWithUnacceptedLicenses( return xPackageManager->getExtensionsWithUnacceptedLicenses(xCmdEnv); } -sal_Bool ExtensionManager::isReadOnlyRepository(::rtl::OUString const & repository) +sal_Bool ExtensionManager::isReadOnlyRepository(OUString const & repository) throw (uno::RuntimeException) { return getPackageManager(repository)->isReadOnly(); diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index b57a155f15e4..db11f129765f 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -36,9 +36,9 @@ namespace dp_manager { typedef ::boost::unordered_map< - ::rtl::OUString, + OUString, ::std::vector >, - ::rtl::OUStringHash > id2extensions; + OUStringHash > id2extensions; class ExtensionManager : private ::dp_misc::MutexHolder, public ::cppu::WeakComponentImplHelper1< css::deployment::XExtensionManager > @@ -47,8 +47,8 @@ public: ExtensionManager( css::uno::Reference< css::uno::XComponentContext >const& xContext); virtual ~ExtensionManager(); - static css::uno::Sequence< ::rtl::OUString > getServiceNames(); - static ::rtl::OUString getImplName(); + static css::uno::Sequence< OUString > getServiceNames(); + static OUString getImplName(); void check(); void fireModified(); @@ -73,9 +73,9 @@ public: createAbortChannel() throw (css::uno::RuntimeException); virtual css::uno::Reference SAL_CALL addExtension( - ::rtl::OUString const & url, + OUString const & url, css::uno::Sequence const & properties, - ::rtl::OUString const & repository, + OUString const & repository, css::uno::Reference const & xAbortChannel, css::uno::Reference const & xCmdEnv ) throw (css::deployment::DeploymentException, @@ -85,9 +85,9 @@ public: css::uno::RuntimeException); virtual void SAL_CALL removeExtension( - ::rtl::OUString const & identifier, - ::rtl::OUString const & filename, - ::rtl::OUString const & repository, + OUString const & identifier, + OUString const & filename, + OUString const & repository, css::uno::Reference const & xAbortChannel, css::uno::Reference const & xCmdEnv ) throw (css::deployment::DeploymentException, @@ -128,7 +128,7 @@ public: virtual css::uno::Sequence< css::uno::Reference > SAL_CALL getDeployedExtensions( - ::rtl::OUString const & repository, + OUString const & repository, css::uno::Reference const &, css::uno::Reference const & xCmdEnv ) throw (css::deployment::DeploymentException, @@ -139,9 +139,9 @@ public: virtual css::uno::Reference< css::deployment::XPackage> SAL_CALL getDeployedExtension( - ::rtl::OUString const & repository, - ::rtl::OUString const & identifier, - ::rtl::OUString const & filename, + OUString const & repository, + OUString const & identifier, + OUString const & filename, css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) throw ( css::deployment::DeploymentException, @@ -151,8 +151,8 @@ public: virtual css::uno::Sequence > SAL_CALL getExtensionsWithSameIdentifier( - ::rtl::OUString const & identifier, - ::rtl::OUString const & filename, + OUString const & identifier, + OUString const & filename, css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) throw ( css::deployment::DeploymentException, @@ -171,7 +171,7 @@ public: css::uno::RuntimeException); virtual void SAL_CALL reinstallDeployedExtensions( - sal_Bool force, ::rtl::OUString const & repository, + sal_Bool force, OUString const & repository, css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel, css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) throw ( @@ -192,12 +192,12 @@ public: virtual css::uno::Sequence > SAL_CALL getExtensionsWithUnacceptedLicenses( - ::rtl::OUString const & repository, + OUString const & repository, css::uno::Reference const & xCmdEnv) throw (css::deployment::DeploymentException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnlyRepository(::rtl::OUString const & repository) + virtual sal_Bool SAL_CALL isReadOnlyRepository(OUString const & repository) throw (css::uno::RuntimeException); private: @@ -207,10 +207,10 @@ private: struct ExtensionInfos { - ::rtl::OUString identifier; - ::rtl::OUString fileName; - ::rtl::OUString displayName; - ::rtl::OUString version; + OUString identifier; + OUString fileName; + OUString displayName; + OUString version; }; css::uno::Reference< css::uno::XComponentContext> m_xContext; @@ -222,7 +222,7 @@ private: priority. That is, the first element is "user" follod by "shared" and then "bundled" */ - ::std::list< ::rtl::OUString > m_repositoryNames; + ::std::list< OUString > m_repositoryNames; css::uno::Reference getUserRepository(); css::uno::Reference getSharedRepository(); @@ -230,15 +230,15 @@ private: css::uno::Reference getTmpRepository(); css::uno::Reference getBakRepository(); - bool isUserDisabled(::rtl::OUString const & identifier, - ::rtl::OUString const & filename); + bool isUserDisabled(OUString const & identifier, + OUString const & filename); bool isUserDisabled( css::uno::Sequence > const & seqExtSameId); void activateExtension( - ::rtl::OUString const & identifier, - ::rtl::OUString const & fileName, + OUString const & identifier, + OUString const & fileName, bool bUserDisabled, bool bStartup, css::uno::Reference const & xAbortChannel, css::uno::Reference const & xCmdEnv); @@ -250,33 +250,33 @@ private: css::uno::Reference const & xCmdEnv ); ::std::list > - getExtensionsWithSameId(::rtl::OUString const & identifier, - ::rtl::OUString const & fileName, + getExtensionsWithSameId(OUString const & identifier, + OUString const & fileName, css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv = css::uno::Reference< css::ucb::XCommandEnvironment>()); css::uno::Reference backupExtension( - ::rtl::OUString const & identifier, ::rtl::OUString const & fileName, + OUString const & identifier, OUString const & fileName, css::uno::Reference const & xPackageManager, css::uno::Reference const & xCmdEnv); void checkInstall( - ::rtl::OUString const & displayName, + OUString const & displayName, css::uno::Reference const & cmdEnv); void checkUpdate( - ::rtl::OUString const & newVersion, - ::rtl::OUString const & newDisplayName, + OUString const & newVersion, + OUString const & newDisplayName, css::uno::Reference const & oldExtension, css::uno::Reference const & xCmdEnv); void addExtensionsToMap( id2extensions & mapExt, css::uno::Sequence > const & seqExt, - ::rtl::OUString const & repository); + OUString const & repository); css::uno::Reference - getPackageManager(::rtl::OUString const & repository) + getPackageManager(OUString const & repository) throw (css::lang::IllegalArgumentException); bool doChecksForAddExtension( diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 33fa0748f37c..d6846de4d5ea 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -64,23 +64,23 @@ class PackageInformationProvider : PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext); virtual ~PackageInformationProvider(); - static uno::Sequence< rtl::OUString > getServiceNames(); - static rtl::OUString getImplName(); + static uno::Sequence< OUString > getServiceNames(); + static OUString getImplName(); // XPackageInformationProvider - virtual rtl::OUString SAL_CALL getPackageLocation( const rtl::OUString& extensionId ) + virtual OUString SAL_CALL getPackageLocation( const OUString& extensionId ) throw ( uno::RuntimeException ); - virtual uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL isUpdateAvailable( const rtl::OUString& extensionId ) + virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL isUpdateAvailable( const OUString& extensionId ) throw ( uno::RuntimeException ); - virtual uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL getExtensionList() + virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList() throw ( uno::RuntimeException ); //--------- private: uno::Reference< uno::XComponentContext> mxContext; - rtl::OUString getPackageLocation( const rtl::OUString& repository, - const rtl::OUString& _sExtensionId ); + OUString getPackageLocation( const OUString& repository, + const OUString& _sExtensionId ); uno::Reference< deployment::XUpdateInformationProvider > mxUpdateInformation; }; @@ -100,11 +100,11 @@ PackageInformationProvider::~PackageInformationProvider() } //------------------------------------------------------------------------------ -rtl::OUString PackageInformationProvider::getPackageLocation( - const rtl::OUString & repository, - const rtl::OUString& _rExtensionId ) +OUString PackageInformationProvider::getPackageLocation( + const OUString & repository, + const OUString& _rExtensionId ) { - rtl::OUString aLocationURL; + OUString aLocationURL; uno::Reference xManager = deployment::ExtensionManager::get(mxContext); @@ -120,7 +120,7 @@ rtl::OUString PackageInformationProvider::getPackageLocation( { try { - const beans::Optional< rtl::OUString > aID = packages[ pos ]->getIdentifier(); + const beans::Optional< OUString > aID = packages[ pos ]->getIdentifier(); if ( aID.IsPresent && (aID.Value == _rExtensionId ) ) { aLocationURL = packages[ pos ]->getURL(); @@ -136,19 +136,19 @@ rtl::OUString PackageInformationProvider::getPackageLocation( //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL -PackageInformationProvider::getPackageLocation( const rtl::OUString& _sExtensionId ) +OUString SAL_CALL +PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId ) throw ( uno::RuntimeException ) { - rtl::OUString aLocationURL = getPackageLocation( rtl::OUString("user"), _sExtensionId ); + OUString aLocationURL = getPackageLocation( OUString("user"), _sExtensionId ); if ( aLocationURL.isEmpty() ) { - aLocationURL = getPackageLocation( rtl::OUString("shared"), _sExtensionId ); + aLocationURL = getPackageLocation( OUString("shared"), _sExtensionId ); } if ( aLocationURL.isEmpty() ) { - aLocationURL = getPackageLocation( rtl::OUString("bundled"), _sExtensionId ); + aLocationURL = getPackageLocation( OUString("bundled"), _sExtensionId ); } if ( !aLocationURL.isEmpty() ) { @@ -160,11 +160,11 @@ PackageInformationProvider::getPackageLocation( const rtl::OUString& _sExtension //------------------------------------------------------------------------------ -uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL -PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionId ) +uno::Sequence< uno::Sequence< OUString > > SAL_CALL +PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) throw ( uno::RuntimeException ) { - uno::Sequence< uno::Sequence< rtl::OUString > > aList; + uno::Sequence< uno::Sequence< OUString > > aList; uno::Reference extMgr = deployment::ExtensionManager::get(mxContext); @@ -205,7 +205,7 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI { dp_misc::UpdateInfo const & info = i->second; - rtl::OUString sOnlineVersion; + OUString sOnlineVersion; if (info.info.is()) { // check, if there are unsatisfied dependencies and ignore this online update @@ -216,9 +216,9 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI sOnlineVersion = info.version; } - rtl::OUString sVersionUser; - rtl::OUString sVersionShared; - rtl::OUString sVersionBundled; + OUString sVersionUser; + OUString sVersionShared; + OUString sVersionBundled; uno::Sequence< uno::Reference< deployment::XPackage> > extensions; try { extensions = extMgr->getExtensionsWithSameIdentifier( @@ -242,15 +242,15 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI dp_misc::UPDATE_SOURCE sourceShared = dp_misc::isUpdateSharedExtension( bSharedReadOnly, sVersionShared, sVersionBundled, sOnlineVersion); - rtl::OUString updateVersionUser; - rtl::OUString updateVersionShared; + OUString updateVersionUser; + OUString updateVersionShared; if (sourceUser != dp_misc::UPDATE_SOURCE_NONE) updateVersionUser = dp_misc::getHighestVersion( - rtl::OUString(), sVersionShared, sVersionBundled, sOnlineVersion); + OUString(), sVersionShared, sVersionBundled, sOnlineVersion); if (sourceShared != dp_misc::UPDATE_SOURCE_NONE) updateVersionShared = dp_misc::getHighestVersion( - rtl::OUString(), rtl::OUString(), sVersionBundled, sOnlineVersion); - rtl::OUString updateVersion; + OUString(), OUString(), sVersionBundled, sOnlineVersion); + OUString updateVersion; if (dp_misc::compareVersions(updateVersionUser, updateVersionShared) == dp_misc::GREATER) updateVersion = updateVersionUser; else @@ -258,32 +258,32 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI if (!updateVersion.isEmpty()) { - rtl::OUString aNewEntry[2]; + OUString aNewEntry[2]; aNewEntry[0] = i->first; aNewEntry[1] = updateVersion; aList.realloc( ++nCount ); - aList[ nCount-1 ] = ::uno::Sequence< rtl::OUString >( aNewEntry, 2 ); + aList[ nCount-1 ] = ::uno::Sequence< OUString >( aNewEntry, 2 ); } } return aList; } //------------------------------------------------------------------------------ -uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL PackageInformationProvider::getExtensionList() +uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::getExtensionList() throw ( uno::RuntimeException ) { const uno::Reference mgr = deployment::ExtensionManager::get(mxContext); if (!mgr.is()) - return uno::Sequence< uno::Sequence< rtl::OUString > >(); + return uno::Sequence< uno::Sequence< OUString > >(); const uno::Sequence< uno::Sequence< uno::Reference > > allExt = mgr->getAllExtensions( uno::Reference< task::XAbortChannel >(), uno::Reference< css_ucb::XCommandEnvironment > () ); - uno::Sequence< uno::Sequence< rtl::OUString > > retList; + uno::Sequence< uno::Sequence< OUString > > retList; sal_Int32 cAllIds = allExt.getLength(); retList.realloc(cAllIds); @@ -303,10 +303,10 @@ uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL PackageInformationProvi uno::Reference< deployment::XPackage > const & xExtension( seqExtension[j] ); if (xExtension.is()) { - rtl::OUString aNewEntry[2]; + OUString aNewEntry[2]; aNewEntry[0] = dp_misc::getIdentifier(xExtension); aNewEntry[1] = xExtension->getVersion(); - retList[i] = ::uno::Sequence< rtl::OUString >( aNewEntry, 2 ); + retList[i] = ::uno::Sequence< OUString >( aNewEntry, 2 ); break; } } diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 87c107c08855..5bf0c91279f1 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -64,7 +64,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_log { extern comphelper::service_decl::ServiceDecl const serviceDecl; @@ -257,9 +256,9 @@ void PackageManagerImpl::initActivationLayer( ucbhelper::Content remFileContent( url + "removed", Reference(), m_xComponentContext); ::rtl::ByteSequence data = dp_misc::readFile(remFileContent); - ::rtl::OString osData(reinterpret_cast(data.getConstArray()), + OString osData(reinterpret_cast(data.getConstArray()), data.getLength()); - OUString sData = ::rtl::OStringToOUString( + OUString sData = OStringToOUString( osData, RTL_TEXTENCODING_UTF8); if (!sData.equals(aUserName)) continue; @@ -295,7 +294,7 @@ void PackageManagerImpl::initRegistryBackends() // as to whether a directory is truly read-only or not static bool isMacroURLReadOnly( const OUString &rMacro ) { - rtl::OUString aDirURL( rMacro ); + OUString aDirURL( rMacro ); ::rtl::Bootstrap::expandMacros( aDirURL ); ::osl::FileBase::RC aErr = ::osl::Directory::create( aDirURL ); @@ -306,7 +305,7 @@ static bool isMacroURLReadOnly( const OUString &rMacro ) bool bError; sal_uInt64 nWritten = 0; - rtl::OUString aFileURL( aDirURL + "/stamp.sys" ); + OUString aFileURL( aDirURL + "/stamp.sys" ); ::osl::File aFile( aFileURL ); bError = aFile.open( osl_File_OpenFlag_Read | @@ -572,7 +571,7 @@ OUString PackageManagerImpl::detectMediaType( if (throw_exc) throw; (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -606,7 +605,7 @@ OUString PackageManagerImpl::insertToActivationLayer( mediaType.matchIgnoreAsciiCase("application/vnd.sun.star.legacy-package-bundle")) { // inflate content: - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (!sourceContent.isFolder()) { buf.appendAscii( "vnd.sun.star.zip://" ); @@ -848,7 +847,7 @@ void PackageManagerImpl::deletePackageFromCache( } //______________________________________________________________________________ void PackageManagerImpl::removePackage( - OUString const & id, ::rtl::OUString const & fileName, + OUString const & id, OUString const & fileName, Reference const & /*xAbortChannel*/, Reference const & xCmdEnv_ ) throw (deployment::DeploymentException, CommandFailedException, @@ -894,7 +893,7 @@ void PackageManagerImpl::removePackage( ::osl::Security aSecurity; aSecurity.getUserName( aUserName ); - ::rtl::OString stamp = ::rtl::OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8); + OString stamp = OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8); Reference xData( ::xmlscript::createInputStream( ::rtl::ByteSequence( @@ -937,7 +936,7 @@ void PackageManagerImpl::removePackage( //______________________________________________________________________________ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( data.temporaryName ); //The bundled extensions are not contained in an additional folder //with a unique name. data.temporaryName contains already the @@ -979,7 +978,7 @@ Reference PackageManagerImpl::getDeployedPackage_( if (INetContentTypes::parse( data.mediaType, type, subType, ¶ms )) { INetContentTypeParameter const * param = params.find( - rtl::OString("platform") ); + OString("platform") ); if (param != 0 && !platform_fits( param->m_sValue )) throw lang::IllegalArgumentException( getResourceString(RID_STR_NO_SUCH_PACKAGE) + id, @@ -1028,13 +1027,13 @@ PackageManagerImpl::getDeployedPackages_( catch (const lang::IllegalArgumentException & exc) { // ignore (void) exc; // avoid warnings - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } catch (const deployment::DeploymentException& exc) { // ignore (void) exc; // avoid warnings - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -1043,7 +1042,7 @@ PackageManagerImpl::getDeployedPackages_( //______________________________________________________________________________ Reference PackageManagerImpl::getDeployedPackage( - OUString const & id, ::rtl::OUString const & fileName, + OUString const & id, OUString const & fileName, Reference const & xCmdEnv_ ) throw (deployment::DeploymentException, CommandFailedException, lang::IllegalArgumentException, RuntimeException) diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index facc82b07dbc..91802135c83a 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -42,14 +42,14 @@ typedef ::cppu::WeakComponentImplHelper1< class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper { css::uno::Reference m_xComponentContext; - ::rtl::OUString m_context; - ::rtl::OUString m_registrationData; - ::rtl::OUString m_registrationData_expanded; - ::rtl::OUString m_registryCache; + OUString m_context; + OUString m_registrationData; + OUString m_registrationData_expanded; + OUString m_registryCache; bool m_readOnly; - ::rtl::OUString m_activePackages; - ::rtl::OUString m_activePackages_expanded; + OUString m_activePackages; + OUString m_activePackages_expanded; ::std::auto_ptr< ActivePackages > m_activePackagesDB; //This mutex is only used for synchronization in addPackage ::osl::Mutex m_addMutex; @@ -62,19 +62,19 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper void initRegistryBackends(); void initActivationLayer( css::uno::Reference const & xCmdEnv ); - ::rtl::OUString detectMediaType( + OUString detectMediaType( ::ucbhelper::Content const & ucbContent, bool throw_exc = true ); - ::rtl::OUString insertToActivationLayer( + OUString insertToActivationLayer( css::uno::Sequence const & properties, - ::rtl::OUString const & mediaType, + OUString const & mediaType, ::ucbhelper::Content const & sourceContent, - ::rtl::OUString const & title, ActivePackages::Data * dbData ); + OUString const & title, ActivePackages::Data * dbData ); void insertToActivationLayerDB( - ::rtl::OUString const & id, ActivePackages::Data const & dbData ); + OUString const & id, ActivePackages::Data const & dbData ); void deletePackageFromCache( css::uno::Reference const & xPackage, - ::rtl::OUString const & destFolder ); + OUString const & destFolder ); bool isInstalled( css::uno::Reference const & package); @@ -124,7 +124,7 @@ protected: virtual ~PackageManagerImpl(); inline PackageManagerImpl( css::uno::Reference - const & xComponentContext, ::rtl::OUString const & context ) + const & xComponentContext, OUString const & context ) : t_pm_helper( getMutex() ), m_xComponentContext( xComponentContext ), m_context( context ), @@ -134,7 +134,7 @@ protected: public: static css::uno::Reference create( css::uno::Reference - const & xComponentContext, ::rtl::OUString const & context ); + const & xComponentContext, OUString const & context ); // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); @@ -154,7 +154,7 @@ public: throw (css::uno::RuntimeException); // XPackageManager - virtual ::rtl::OUString SAL_CALL getContext() + virtual OUString SAL_CALL getContext() throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::uno::Reference > SAL_CALL @@ -164,9 +164,9 @@ public: createAbortChannel() throw (css::uno::RuntimeException); virtual css::uno::Reference SAL_CALL addPackage( - ::rtl::OUString const & url, + OUString const & url, css::uno::Sequence const & properties, - ::rtl::OUString const & mediaType, + OUString const & mediaType, css::uno::Reference const & xAbortChannel, css::uno::Reference const & xCmdEnv ) throw (css::deployment::DeploymentException, @@ -186,7 +186,7 @@ public: css::uno::RuntimeException); virtual void SAL_CALL removePackage( - ::rtl::OUString const & id, ::rtl::OUString const & fileName, + OUString const & id, OUString const & fileName, css::uno::Reference const & xAbortChannel, css::uno::Reference const & xCmdEnv ) throw (css::deployment::DeploymentException, @@ -195,17 +195,17 @@ public: css::lang::IllegalArgumentException, css::uno::RuntimeException); - ::rtl::OUString getDeployPath( ActivePackages::Data const & data ); + OUString getDeployPath( ActivePackages::Data const & data ); css::uno::Reference SAL_CALL getDeployedPackage_( - ::rtl::OUString const & id, ::rtl::OUString const & fileName, + OUString const & id, OUString const & fileName, css::uno::Reference const & xCmdEnv ); css::uno::Reference getDeployedPackage_( - ::rtl::OUString const & id, ActivePackages::Data const & data, + OUString const & id, ActivePackages::Data const & data, css::uno::Reference const & xCmdEnv, bool ignoreAlienPlatforms = false ); virtual css::uno::Reference SAL_CALL getDeployedPackage( - ::rtl::OUString const & id, ::rtl::OUString const & fileName, + OUString const & id, OUString const & fileName, css::uno::Reference const & xCmdEnv ) throw (css::deployment::DeploymentException, css::ucb::CommandFailedException, diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 33b4968e8e40..e2d1259fd3cc 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -29,7 +29,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_manager { namespace factory { @@ -49,7 +48,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper Reference m_xBakMgr; typedef ::boost::unordered_map< OUString, WeakReference, - ::rtl::OUStringHash > t_string2weakref; + OUStringHash > t_string2weakref; t_string2weakref m_managers; protected: diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx index 0259df6441f7..f45f42f7011f 100644 --- a/desktop/source/deployment/manager/dp_properties.cxx +++ b/desktop/source/deployment/manager/dp_properties.cxx @@ -34,7 +34,6 @@ namespace uno = com::sun::star::uno; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; #define PROP_SUPPRESS_LICENSE "SUPPRESS_LICENSE" #define PROP_EXTENSION_UPDATE "EXTENSION_UPDATE" @@ -107,7 +106,7 @@ OUString ExtensionProperties::getPropertyValue(css::beans::NamedValue const & v) void ExtensionProperties::write() { ::ucbhelper::Content contentProps(m_propFileUrl, m_xCmdEnv, m_xContext); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (m_prop_suppress_license) { @@ -116,7 +115,7 @@ void ExtensionProperties::write() buf.append(*m_prop_suppress_license); } - ::rtl::OString stamp = ::rtl::OUStringToOString( + OString stamp = OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_UTF8); Reference xData( ::xmlscript::createInputStream( diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx index 34d8ebe56194..983ddfc6075c 100644 --- a/desktop/source/deployment/manager/dp_properties.hxx +++ b/desktop/source/deployment/manager/dp_properties.hxx @@ -37,21 +37,21 @@ namespace dp_manager { class ExtensionProperties { protected: - ::rtl::OUString m_propFileUrl; + OUString m_propFileUrl; const css::uno::Reference m_xCmdEnv; const css::uno::Reference m_xContext; - ::boost::optional< ::rtl::OUString> m_prop_suppress_license; - ::boost::optional< ::rtl::OUString> m_prop_extension_update; + ::boost::optional< OUString> m_prop_suppress_license; + ::boost::optional< OUString> m_prop_extension_update; - ::rtl::OUString getPropertyValue(css::beans::NamedValue const & v); + OUString getPropertyValue(css::beans::NamedValue const & v); public: virtual ~ExtensionProperties() {}; - ExtensionProperties(::rtl::OUString const & urlExtension, + ExtensionProperties(OUString const & urlExtension, css::uno::Reference const & xCmdEnv, css::uno::Reference const & xContext); - ExtensionProperties(::rtl::OUString const & urlExtension, + ExtensionProperties(OUString const & urlExtension, css::uno::Sequence const & properties, css::uno::Reference const & xCmdEnv, css::uno::Reference const & xContext); diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 23df4a271b7c..4b50f844f7c2 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -54,12 +54,12 @@ static char const minimalVersionOpenOfficeOrg[] = static char const maximalVersionOpenOfficeOrg[] = "OpenOffice.org-maximal-version"; -rtl::OUString getLibreOfficeMajorMinorMicro() { +OUString getLibreOfficeMajorMinorMicro() { return utl::ConfigManager::getAboutBoxProductVersion(); } -rtl::OUString getReferenceOpenOfficeOrgMajorMinor() { - rtl::OUString v( +OUString getReferenceOpenOfficeOrgMajorMinor() { + OUString v( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:ReferenceOOoMajorMinor}"); rtl::Bootstrap::expandMacros(v); //TODO: check for failure @@ -67,19 +67,19 @@ rtl::OUString getReferenceOpenOfficeOrgMajorMinor() { } bool satisfiesMinimalVersion( - rtl::OUString const & actual, rtl::OUString const & specified) + OUString const & actual, OUString const & specified) { return dp_misc::compareVersions(actual, specified) != dp_misc::LESS; } bool satisfiesMaximalVersion( - rtl::OUString const & actual, rtl::OUString const & specified) + OUString const & actual, OUString const & specified) { return dp_misc::compareVersions(actual, specified) != dp_misc::GREATER; } -rtl::OUString produceErrorText( - rtl::OUString const & reason, rtl::OUString const & version) +OUString produceErrorText( + OUString const & reason, OUString const & version) { return reason.replaceFirst("%VERSION", (version.isEmpty() @@ -136,7 +136,7 @@ check(dp_misc::DescriptionInfoset const & infoset) { return unsatisfied; } -rtl::OUString getErrorText( +OUString getErrorText( css::uno::Reference< css::xml::dom::XElement > const & dependency) { OSL_ASSERT(dependency.is()); diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 8daef83d3918..08e78fbc988a 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -56,7 +56,6 @@ namespace { using css::uno::Reference; -using ::rtl::OUString; class EmptyNodeList: public ::cppu::WeakImplHelper1< css::xml::dom::XNodeList > { @@ -90,7 +89,7 @@ css::uno::Reference< css::xml::dom::XNode > EmptyNodeList::item(::sal_Int32) static_cast< ::cppu::OWeakObject * >(this)); } -::rtl::OUString getNodeValue( +OUString getNodeValue( css::uno::Reference< css::xml::dom::XNode > const & node) { OSL_ASSERT(node.is()); @@ -122,7 +121,7 @@ public: */ ExtensionDescription( const css::uno::Reference& xContext, - const ::rtl::OUString& installDir, + const OUString& installDir, const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv); ~ExtensionDescription(); @@ -132,7 +131,7 @@ public: return m_xRoot; } - ::rtl::OUString getExtensionRootUrl() const + OUString getExtensionRootUrl() const { return m_sExtensionRootUrl; } @@ -140,7 +139,7 @@ public: private: css::uno::Reference m_xRoot; - ::rtl::OUString m_sExtensionRootUrl; + OUString m_sExtensionRootUrl; }; class NoDescriptionException @@ -357,11 +356,11 @@ DescriptionInfoset::DescriptionInfoset( DescriptionInfoset::~DescriptionInfoset() {} -::boost::optional< ::rtl::OUString > DescriptionInfoset::getIdentifier() const { +::boost::optional< OUString > DescriptionInfoset::getIdentifier() const { return getOptionalValue("desc:identifier/@value"); } -::rtl::OUString DescriptionInfoset::getNodeValueFromExpression(::rtl::OUString const & expression) const +OUString DescriptionInfoset::getNodeValueFromExpression(OUString const & expression) const { css::uno::Reference< css::xml::dom::XNode > n; if (m_element.is()) { @@ -371,7 +370,7 @@ DescriptionInfoset::~DescriptionInfoset() {} // ignore } } - return n.is() ? getNodeValue(n) : ::rtl::OUString(); + return n.is() ? getNodeValue(n) : OUString(); } void DescriptionInfoset::checkBlacklist() const @@ -392,8 +391,8 @@ void DescriptionInfoset::checkBlacklist() const css::uno::Sequence< css::uno::Any > args = css::uno::Sequence< css::uno::Any >(1); css::beans::PropertyValue prop; - prop.Name = ::rtl::OUString("nodepath"); - prop.Value <<= ::rtl::OUString("/org.openoffice.Office.ExtensionDependencies/Extensions"); + prop.Name = OUString("nodepath"); + prop.Value <<= OUString("/org.openoffice.Office.ExtensionDependencies/Extensions"); args[0] <<= prop; css::uno::Reference< css::container::XNameAccess > blacklist( @@ -407,19 +406,19 @@ void DescriptionInfoset::checkBlacklist() const css::uno::Any anyValue = extProps->getPropertyValue("Versions"); - css::uno::Sequence< ::rtl::OUString > blversions; + css::uno::Sequence< OUString > blversions; anyValue >>= blversions; // check if the current version requires further dependency checks from the blacklist if (checkBlacklistVersion(currentversion, blversions)) { anyValue = extProps->getPropertyValue("Dependencies"); - ::rtl::OUString udeps; + OUString udeps; anyValue >>= udeps; if (udeps.getLength() == 0) return; // nothing todo - ::rtl::OString xmlDependencies = ::rtl::OUStringToOString(udeps, RTL_TEXTENCODING_UNICODE); + OString xmlDependencies = OUStringToOString(udeps, RTL_TEXTENCODING_UNICODE); css::uno::Reference< css::xml::dom::XDocumentBuilder> docbuilder( manager->createInstanceWithContext("com.sun.star.xml.dom.DocumentBuilder", m_context), @@ -467,8 +466,8 @@ void DescriptionInfoset::checkBlacklist() const } bool DescriptionInfoset::checkBlacklistVersion( - ::rtl::OUString currentversion, - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & versions) const + OUString currentversion, + ::com::sun::star::uno::Sequence< OUString > const & versions) const { sal_Int32 nLen = versions.getLength(); for (sal_Int32 i=0; i DescriptionInfoset::getSupportedPlaforms() const +css::uno::Sequence< OUString > DescriptionInfoset::getSupportedPlaforms() const { //When there is no description.xml then we assume that we support all platforms if (! m_element.is()) @@ -501,13 +500,13 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getSupportedPlaforms() } //There is a platform element. - const ::rtl::OUString value = getNodeValueFromExpression("desc:platform/@value"); + const OUString value = getNodeValueFromExpression("desc:platform/@value"); //parse the string, it can contained multiple strings separated by commas - ::std::vector< ::rtl::OUString> vec; + ::std::vector< OUString> vec; sal_Int32 nIndex = 0; do { - ::rtl::OUString aToken = value.getToken( 0, ',', nIndex ); + OUString aToken = value.getToken( 0, ',', nIndex ); aToken = aToken.trim(); if (!aToken.isEmpty()) vec.push_back(aToken); @@ -533,21 +532,21 @@ DescriptionInfoset::getDependencies() const { return new EmptyNodeList; } -css::uno::Sequence< ::rtl::OUString > +css::uno::Sequence< OUString > DescriptionInfoset::getUpdateInformationUrls() const { return getUrls("desc:update-information/desc:src/@xlink:href"); } -css::uno::Sequence< ::rtl::OUString > +css::uno::Sequence< OUString > DescriptionInfoset::getUpdateDownloadUrls() const { return getUrls("desc:update-download/desc:src/@xlink:href"); } -::rtl::OUString DescriptionInfoset::getIconURL( sal_Bool bHighContrast ) const +OUString DescriptionInfoset::getIconURL( sal_Bool bHighContrast ) const { - css::uno::Sequence< ::rtl::OUString > aStrList = getUrls( "desc:icon/desc:default/@xlink:href" ); - css::uno::Sequence< ::rtl::OUString > aStrListHC = getUrls( "desc:icon/desc:high-contrast/@xlink:href" ); + css::uno::Sequence< OUString > aStrList = getUrls( "desc:icon/desc:default/@xlink:href" ); + css::uno::Sequence< OUString > aStrListHC = getUrls( "desc:icon/desc:high-contrast/@xlink:href" ); if ( bHighContrast && aStrListHC.hasElements() && !aStrListHC[0].isEmpty() ) return aStrListHC[0]; @@ -555,24 +554,24 @@ DescriptionInfoset::getUpdateDownloadUrls() const if ( aStrList.hasElements() && !aStrList[0].isEmpty() ) return aStrList[0]; - return ::rtl::OUString(); + return OUString(); } -::boost::optional< ::rtl::OUString > DescriptionInfoset::getLocalizedUpdateWebsiteURL() +::boost::optional< OUString > DescriptionInfoset::getLocalizedUpdateWebsiteURL() const { bool bParentExists = false; - const ::rtl::OUString sURL (getLocalizedHREFAttrFromChild("/desc:description/desc:update-website", &bParentExists )); + const OUString sURL (getLocalizedHREFAttrFromChild("/desc:description/desc:update-website", &bParentExists )); if (!sURL.isEmpty()) - return ::boost::optional< ::rtl::OUString >(sURL); + return ::boost::optional< OUString >(sURL); else - return bParentExists ? ::boost::optional< ::rtl::OUString >(::rtl::OUString()) : - ::boost::optional< ::rtl::OUString >(); + return bParentExists ? ::boost::optional< OUString >(OUString()) : + ::boost::optional< OUString >(); } -::boost::optional< ::rtl::OUString > DescriptionInfoset::getOptionalValue( - ::rtl::OUString const & expression) const +::boost::optional< OUString > DescriptionInfoset::getOptionalValue( + OUString const & expression) const { css::uno::Reference< css::xml::dom::XNode > n; if (m_element.is()) { @@ -583,12 +582,12 @@ DescriptionInfoset::getUpdateDownloadUrls() const } } return n.is() - ? ::boost::optional< ::rtl::OUString >(getNodeValue(n)) - : ::boost::optional< ::rtl::OUString >(); + ? ::boost::optional< OUString >(getNodeValue(n)) + : ::boost::optional< OUString >(); } -css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( - ::rtl::OUString const & expression) const +css::uno::Sequence< OUString > DescriptionInfoset::getUrls( + OUString const & expression) const { css::uno::Reference< css::xml::dom::XNodeList > ns; if (m_element.is()) { @@ -598,23 +597,23 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( // ignore } } - css::uno::Sequence< ::rtl::OUString > urls(ns.is() ? ns->getLength() : 0); + css::uno::Sequence< OUString > urls(ns.is() ? ns->getLength() : 0); for (::sal_Int32 i = 0; i < urls.getLength(); ++i) { urls[i] = getNodeValue(ns->item(i)); } return urls; } -::std::pair< ::rtl::OUString, ::rtl::OUString > DescriptionInfoset::getLocalizedPublisherNameAndURL() const +::std::pair< OUString, OUString > DescriptionInfoset::getLocalizedPublisherNameAndURL() const { css::uno::Reference< css::xml::dom::XNode > node = getLocalizedChild("desc:publisher"); - ::rtl::OUString sPublisherName; - ::rtl::OUString sURL; + OUString sPublisherName; + OUString sURL; if (node.is()) { - const ::rtl::OUString exp1("text()"); + const OUString exp1("text()"); css::uno::Reference< css::xml::dom::XNode > xPathName; try { xPathName = m_xpath->selectSingleNode(node, exp1); @@ -625,7 +624,7 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( if (xPathName.is()) sPublisherName = xPathName->getNodeValue(); - const ::rtl::OUString exp2("@xlink:href"); + const OUString exp2("@xlink:href"); css::uno::Reference< css::xml::dom::XNode > xURL; try { xURL = m_xpath->selectSingleNode(node, exp2); @@ -639,18 +638,18 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( return ::std::make_pair(sPublisherName, sURL); } -::rtl::OUString DescriptionInfoset::getLocalizedReleaseNotesURL() const +OUString DescriptionInfoset::getLocalizedReleaseNotesURL() const { return getLocalizedHREFAttrFromChild("/desc:description/desc:release-notes", NULL); } -::rtl::OUString DescriptionInfoset::getLocalizedDisplayName() const +OUString DescriptionInfoset::getLocalizedDisplayName() const { css::uno::Reference< css::xml::dom::XNode > node = getLocalizedChild("desc:display-name"); if (node.is()) { - const ::rtl::OUString exp("text()"); + const OUString exp("text()"); css::uno::Reference< css::xml::dom::XNode > xtext; try { xtext = m_xpath->selectSingleNode(node, exp); @@ -660,10 +659,10 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( if (xtext.is()) return xtext->getNodeValue(); } - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString DescriptionInfoset::getLocalizedLicenseURL() const +OUString DescriptionInfoset::getLocalizedLicenseURL() const { return getLocalizedHREFAttrFromChild("/desc:description/desc:registration/desc:simple-license", NULL); @@ -686,13 +685,13 @@ DescriptionInfoset::getSimpleLicenseAttributes() const attributes.acceptBy = getNodeValueFromExpression("/desc:description/desc:registration/desc:simple-license/@accept-by"); - ::boost::optional< ::rtl::OUString > suppressOnUpdate = getOptionalValue("/desc:description/desc:registration/desc:simple-license/@suppress-on-update"); + ::boost::optional< OUString > suppressOnUpdate = getOptionalValue("/desc:description/desc:registration/desc:simple-license/@suppress-on-update"); if (suppressOnUpdate) attributes.suppressOnUpdate = (*suppressOnUpdate).trim().equalsIgnoreAsciiCase("true"); else attributes.suppressOnUpdate = false; - ::boost::optional< ::rtl::OUString > suppressIfRequired = getOptionalValue("/desc:description/desc:registration/desc:simple-license/@suppress-if-required"); + ::boost::optional< OUString > suppressIfRequired = getOptionalValue("/desc:description/desc:registration/desc:simple-license/@suppress-if-required"); if (suppressIfRequired) attributes.suppressIfRequired = (*suppressIfRequired).trim().equalsIgnoreAsciiCase("true"); else @@ -704,13 +703,13 @@ DescriptionInfoset::getSimpleLicenseAttributes() const return ::boost::optional(); } -::rtl::OUString DescriptionInfoset::getLocalizedDescriptionURL() const +OUString DescriptionInfoset::getLocalizedDescriptionURL() const { return getLocalizedHREFAttrFromChild("/desc:description/desc:extension-description", NULL); } css::uno::Reference< css::xml::dom::XNode > -DescriptionInfoset::getLocalizedChild( const ::rtl::OUString & sParent) const +DescriptionInfoset::getLocalizedChild( const OUString & sParent) const { if ( ! m_element.is() || sParent.isEmpty()) return css::uno::Reference< css::xml::dom::XNode > (); @@ -756,7 +755,7 @@ DescriptionInfoset::matchLanguageTag( css::uno::Reference nodeMatch; //first try exact match for lang - const ::rtl::OUString exp1("*[@lang=\"" + rTag + "\"]"); + const OUString exp1("*[@lang=\"" + rTag + "\"]"); try { nodeMatch = m_xpath->selectSingleNode(xParent, exp1); } catch (const css::xml::xpath::XPathException &) { @@ -767,7 +766,7 @@ DescriptionInfoset::matchLanguageTag( //example en matches in en-US-montana, en-US, en-montana if (!nodeMatch.is()) { - const ::rtl::OUString exp2( + const OUString exp2( "*[starts-with(@lang,\"" + rTag + "-\")]"); try { nodeMatch = m_xpath->selectSingleNode(xParent, exp2); @@ -794,7 +793,7 @@ DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom if (nodeDefault.is()) { //The old way - const ::rtl::OUString exp1("desc:license-text[@license-id = \"" + const OUString exp1("desc:license-text[@license-id = \"" + nodeDefault->getNodeValue() + "\"]"); try { @@ -805,7 +804,7 @@ DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom } } - const ::rtl::OUString exp2("*[1]"); + const OUString exp2("*[1]"); try { return m_xpath->selectSingleNode(xParent, exp2); } catch (const css::xml::xpath::XPathException &) { @@ -814,19 +813,19 @@ DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom } } -::rtl::OUString DescriptionInfoset::getLocalizedHREFAttrFromChild( - ::rtl::OUString const & sXPathParent, bool * out_bParentExists) +OUString DescriptionInfoset::getLocalizedHREFAttrFromChild( + OUString const & sXPathParent, bool * out_bParentExists) const { css::uno::Reference< css::xml::dom::XNode > node = getLocalizedChild(sXPathParent); - ::rtl::OUString sURL; + OUString sURL; if (node.is()) { if (out_bParentExists) *out_bParentExists = true; - const ::rtl::OUString exp("@xlink:href"); + const OUString exp("@xlink:href"); css::uno::Reference< css::xml::dom::XNode > xURL; try { xURL = m_xpath->selectSingleNode(node, exp); diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx index 165a0975a5b0..a8fb964e03fc 100644 --- a/desktop/source/deployment/misc/dp_identifier.cxx +++ b/desktop/source/deployment/misc/dp_identifier.cxx @@ -33,24 +33,24 @@ namespace dp_misc { -::rtl::OUString generateIdentifier( - ::boost::optional< ::rtl::OUString > const & optional, - ::rtl::OUString const & fileName) +OUString generateIdentifier( + ::boost::optional< OUString > const & optional, + OUString const & fileName) { return optional ? *optional : generateLegacyIdentifier(fileName); } -::rtl::OUString getIdentifier( +OUString getIdentifier( css::uno::Reference< css::deployment::XPackage > const & package) { OSL_ASSERT(package.is()); - css::beans::Optional< ::rtl::OUString > id(package->getIdentifier()); + css::beans::Optional< OUString > id(package->getIdentifier()); return id.IsPresent ? id.Value : generateLegacyIdentifier(package->getName()); } -::rtl::OUString generateLegacyIdentifier(::rtl::OUString const & fileName) { - rtl::OUStringBuffer b; +OUString generateLegacyIdentifier(OUString const & fileName) { + OUStringBuffer b; b.appendAscii("org.openoffice.legacy."); b.append(fileName); return b.makeStringAndClear(); diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index 8462363d0ae1..4d9f40df91b0 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_misc { namespace { diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 27ef710a112b..5a1bd22eb275 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -51,8 +51,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OString; #if defined WNT #define SOFFICE1 "soffice.exe" @@ -113,7 +111,7 @@ const OUString OfficePipeId::operator () () // create hex-value string from the MD5 value to keep // the string size minimal - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "SingleOfficeIPC_" ); for ( sal_uInt32 i = 0; i < md5_key_len; ++i ) { buf.append( static_cast(md5_buf[ i ]), 0x10 ); @@ -239,7 +237,7 @@ namespace { inline OUString encodeForRcFile( OUString const & str ) { // escape $\{} (=> rtl bootstrap files) - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; sal_Int32 pos = 0; const sal_Int32 len = str.getLength(); for ( ; pos < len; ++pos ) { @@ -261,7 +259,7 @@ inline OUString encodeForRcFile( OUString const & str ) //============================================================================== OUString makeURL( OUString const & baseURL, OUString const & relPath_ ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (baseURL.getLength() > 1 && baseURL[ baseURL.getLength() - 1 ] == '/') buf.append( baseURL.copy( 0, baseURL.getLength() - 1 ) ); else @@ -429,7 +427,7 @@ OUString generateRandomPipeId() s_hPool, bytes, ARLEN(bytes) ) != rtl_Random_E_None) { throw RuntimeException( "random pool error!?", 0 ); } - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; for ( sal_uInt32 i = 0; i < ARLEN(bytes); ++i ) { buf.append( static_cast(bytes[ i ]), 0x10 ); } @@ -462,14 +460,14 @@ Reference resolveUnoURL( } #ifdef WNT -void writeConsoleWithStream(::rtl::OUString const & sText, HANDLE stream) +void writeConsoleWithStream(OUString const & sText, HANDLE stream) { DWORD nWrittenChars = 0; WriteFile(stream, sText.getStr(), sText.getLength() * 2, &nWrittenChars, NULL); } #else -void writeConsoleWithStream(::rtl::OUString const & sText, FILE * stream) +void writeConsoleWithStream(OUString const & sText, FILE * stream) { OString s = OUStringToOString(sText, osl_getThreadTextEncoding()); fprintf(stream, "%s", s.getStr()); @@ -477,7 +475,7 @@ void writeConsoleWithStream(::rtl::OUString const & sText, FILE * stream) } #endif -void writeConsole(::rtl::OUString const & sText) +void writeConsole(OUString const & sText) { #ifdef WNT writeConsoleWithStream(sText, GetStdHandle(STD_OUTPUT_HANDLE)); @@ -486,7 +484,7 @@ void writeConsole(::rtl::OUString const & sText) #endif } -void writeConsoleError(::rtl::OUString const & sText) +void writeConsoleError(OUString const & sText) { #ifdef WNT writeConsoleWithStream(sText, GetStdHandle(STD_ERROR_HANDLE)); @@ -513,14 +511,14 @@ OUString readConsole() // read one char less so that the last char in buf is always zero if (fgets(buf, 1024, stdin) != NULL) { - OUString value = ::rtl::OStringToOUString(::rtl::OString(buf), osl_getThreadTextEncoding()); + OUString value = OStringToOUString(OString(buf), osl_getThreadTextEncoding()); return value.trim(); } #endif return OUString(); } -void TRACE(::rtl::OUString const & sText) +void TRACE(OUString const & sText) { (void) sText; #if OSL_DEBUG_LEVEL > 1 diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index d75733dbbfcc..de8ea6630eaa 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -64,7 +64,6 @@ #define PLATFORM_AIX_POWERPC "aix_powerpc" -using ::rtl::OUString; namespace dp_misc { @@ -92,7 +91,7 @@ namespace struct StrPlatform : public rtl::StaticWithInit< OUString, StrPlatform> { const OUString operator () () { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( StrOperatingSystem::get() ); buf.append( static_cast('_') ); buf.append( StrCPU::get() ); diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index 0100632c36a5..802e37f3d0c4 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_misc { namespace { diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 96db856ce036..2fff496c5a1a 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_misc { @@ -210,7 +209,7 @@ bool readLine( OUString * res, OUString const & startingWith, { if (file.match( startingWith, pos )) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; sal_Int32 start = pos; pos += startingWith.getLength(); for (;;) @@ -254,7 +253,7 @@ bool readLine( OUString * res, OUString const & startingWith, return false; } -bool readProperties( ::std::list< ::std::pair< ::rtl::OUString, ::rtl::OUString> > & out_result, +bool readProperties( ::std::list< ::std::pair< OUString, OUString> > & out_result, ::ucbhelper::Content & ucb_content ) { // read whole file: @@ -266,7 +265,7 @@ bool readProperties( ::std::list< ::std::pair< ::rtl::OUString, ::rtl::OUString> for (;;) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; sal_Int32 start = pos; bool bEOF = false; diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index f92b3c033adf..0a078fd3e499 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -26,18 +26,16 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OString; namespace dp_misc { namespace { int determineHighestVersion( - ::rtl::OUString const & userVersion, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion) + OUString const & userVersion, + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion) { int index = 0; OUString greatest = userVersion; @@ -134,7 +132,7 @@ void getDefaultUpdateInfos( UpdateInfoMap& inout_map, std::vector, uno::Any> > & out_errors) { - const rtl::OUString sDefaultURL(dp_misc::getExtensionDefaultUpdateURL()); + const OUString sDefaultURL(dp_misc::getExtensionDefaultUpdateURL()); OSL_ASSERT(!sDefaultURL.isEmpty()); Any anyError; @@ -216,7 +214,7 @@ bool onlyBundledExtensions( OUString getExtensionDefaultUpdateURL() { - ::rtl::OUString sUrl( + OUString sUrl( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:ExtensionUpdateURL}"); ::rtl::Bootstrap::expandMacros(sUrl); @@ -228,10 +226,10 @@ OUString getExtensionDefaultUpdateURL() */ UPDATE_SOURCE isUpdateUserExtension( bool bReadOnlyShared, - ::rtl::OUString const & userVersion, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion) + OUString const & userVersion, + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion) { UPDATE_SOURCE retVal = UPDATE_SOURCE_NONE; if (bReadOnlyShared) @@ -278,9 +276,9 @@ UPDATE_SOURCE isUpdateUserExtension( UPDATE_SOURCE isUpdateSharedExtension( bool bReadOnlyShared, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion) + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion) { if (bReadOnlyShared) return UPDATE_SOURCE_NONE; @@ -389,10 +387,10 @@ UpdateInfoMap getOnlineUpdateInfos( return infoMap; } OUString getHighestVersion( - ::rtl::OUString const & userVersion, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion) + OUString const & userVersion, + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion) { int index = determineHighestVersion(userVersion, sharedVersion, bundledVersion, onlineVersion); switch (index) diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx index 04b835515e3d..b6595a4466d2 100644 --- a/desktop/source/deployment/misc/dp_version.cxx +++ b/desktop/source/deployment/misc/dp_version.cxx @@ -27,7 +27,7 @@ namespace { -::rtl::OUString getElement(::rtl::OUString const & version, ::sal_Int32 * index) +OUString getElement(OUString const & version, ::sal_Int32 * index) { while (*index < version.getLength() && version[*index] == '0') { ++*index; @@ -40,11 +40,11 @@ namespace { namespace dp_misc { ::dp_misc::Order compareVersions( - ::rtl::OUString const & version1, ::rtl::OUString const & version2) + OUString const & version1, OUString const & version2) { for (::sal_Int32 i1 = 0, i2 = 0; i1 >= 0 || i2 >= 0;) { - ::rtl::OUString e1(getElement(version1, &i1)); - ::rtl::OUString e2(getElement(version2, &i2)); + OUString e1(getElement(version1, &i1)); + OUString e2(getElement(version2, &i2)); if (e1.getLength() < e2.getLength()) { return ::dp_misc::LESS; } else if (e1.getLength() > e2.getLength()) { diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx index 6bb7bb73c3cb..97202ecda67c 100644 --- a/desktop/source/deployment/misc/lockfile.cxx +++ b/desktop/source/deployment/misc/lockfile.cxx @@ -40,9 +40,9 @@ using namespace ::rtl; using namespace ::utl; -static rtl::OString impl_getHostname() +static OString impl_getHostname() { - rtl::OString aHost; + OString aHost; #ifdef WNT /* prevent windows from connecting to the net to get it's own @@ -152,21 +152,21 @@ namespace desktop { String aLockname = m_aLockname; Config aConfig(aLockname); aConfig.SetGroup(LOCKFILE_GROUP); - rtl::OString aIPCserver = aConfig.ReadKey( LOCKFILE_IPCKEY ); - if (!aIPCserver.equalsIgnoreAsciiCase(rtl::OString("true"))) + OString aIPCserver = aConfig.ReadKey( LOCKFILE_IPCKEY ); + if (!aIPCserver.equalsIgnoreAsciiCase(OString("true"))) return false; - rtl::OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY ); - rtl::OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ); + OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY ); + OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ); // lockfile from same host? - rtl::OString myHost( impl_getHostname() ); + OString myHost( impl_getHostname() ); if (aHost == myHost) { // lockfile by same UID OUString myUserName; Security aSecurity; aSecurity.getUserName( myUserName ); - rtl::OString myUser(rtl::OUStringToOString(myUserName, RTL_TEXTENCODING_ASCII_US)); + OString myUser(OUStringToOString(myUserName, RTL_TEXTENCODING_ASCII_US)); if (aUser == myUser) return sal_True; } @@ -180,13 +180,13 @@ namespace desktop { aConfig.SetGroup(LOCKFILE_GROUP); // get information - rtl::OString aHost( impl_getHostname() ); + OString aHost( impl_getHostname() ); OUString aUserName; Security aSecurity; aSecurity.getUserName( aUserName ); - rtl::OString aUser = OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ); - rtl::OString aTime = OUStringToOString( m_aDate, RTL_TEXTENCODING_ASCII_US ); - rtl::OString aStamp = OUStringToOString( m_aId, RTL_TEXTENCODING_ASCII_US ); + OString aUser = OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ); + OString aTime = OUStringToOString( m_aDate, RTL_TEXTENCODING_ASCII_US ); + OString aStamp = OUStringToOString( m_aId, RTL_TEXTENCODING_ASCII_US ); // write information aConfig.WriteKey( LOCKFILE_USERKEY, aUser ); @@ -195,7 +195,7 @@ namespace desktop { aConfig.WriteKey( LOCKFILE_TIMEKEY, aTime ); aConfig.WriteKey( LOCKFILE_IPCKEY, - m_bIPCserver ? rtl::OString("true") : rtl::OString("false") ); + m_bIPCserver ? OString("true") : OString("false") ); aConfig.Flush( ); } diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx index fb871f629139..d6fdfc4a4251 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/component-registry/2010" #define NS_PREFIX "comp" @@ -43,7 +42,7 @@ namespace component { ComponentBackendDb::ComponentBackendDb( Reference const & xContext, - ::rtl::OUString const & url):BackendDb(xContext, url) + OUString const & url):BackendDb(xContext, url) { } @@ -68,7 +67,7 @@ OUString ComponentBackendDb::getKeyElementName() return OUString(KEY_ELEMENT_NAME); } -void ComponentBackendDb::addEntry(::rtl::OUString const & url, Data const & data) +void ComponentBackendDb::addEntry(OUString const & url, Data const & data) { try{ if (!activateEntry(url)) @@ -104,7 +103,7 @@ void ComponentBackendDb::addEntry(::rtl::OUString const & url, Data const & data } } -ComponentBackendDb::Data ComponentBackendDb::getEntry(::rtl::OUString const & url) +ComponentBackendDb::Data ComponentBackendDb::getEntry(OUString const & url) { try { diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index c7b9522da73b..39aeeacae3be 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -65,18 +65,18 @@ namespace component { class ComponentBackendDb: public dp_registry::backend::BackendDb { protected: - virtual ::rtl::OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getDbNSName(); + virtual OUString getNSPrefix(); + virtual OUString getRootElementName(); + virtual OUString getKeyElementName(); public: struct Data { Data(): javaTypeLibrary(false) {}; - ::std::list< ::rtl::OUString> implementationNames; - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString> >singletons; + ::std::list< OUString> implementationNames; + ::std::vector< ::std::pair< OUString, OUString> >singletons; // map from singleton names to implementation names bool javaTypeLibrary; }; @@ -84,11 +84,11 @@ public: public: ComponentBackendDb( css::uno::Reference const & xContext, - ::rtl::OUString const & url); + OUString const & url); - void addEntry(::rtl::OUString const & url, Data const & data); + void addEntry(OUString const & url, Data const & data); - Data getEntry(::rtl::OUString const & url); + Data getEntry(OUString const & url); }; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 15878e187574..e72aa32883a0 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -54,7 +54,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { @@ -87,7 +86,7 @@ bool jarManifestHeaderPresent( OUString const & url, OUString const & name, Reference const & xCmdEnv ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "vnd.sun.star.zip://" ); buf.append( ::rtl::Uri::encode( @@ -269,7 +268,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool bSwitchedRdbFiles; typedef ::boost::unordered_map< OUString, Reference, - ::rtl::OUStringHash > t_string2object; + OUStringHash > t_string2object; t_string2object m_backendObjects; // PackageRegistryBackend @@ -673,7 +672,7 @@ Reference BackendImpl::bindPackage_( { // xxx todo: probe and evaluate component xml description - INetContentTypeParameter const * param = params.find(rtl::OString("platform")); + INetContentTypeParameter const * param = params.find(OString("platform")); bool bPlatformFits(param == 0); String aPlatform; if (!bPlatformFits) // platform is specified, we have to check @@ -684,7 +683,7 @@ Reference BackendImpl::bindPackage_( // If the package is being removed, do not care whether // platform fits. We won't be using it anyway. if (bPlatformFits || bRemoved) { - param = params.find(rtl::OString("type")); + param = params.find(OString("type")); if (param != 0) { String const & value = param->m_sValue; @@ -716,7 +715,7 @@ Reference BackendImpl::bindPackage_( } else if (subType.equalsIgnoreAsciiCase("vnd.sun.star.uno-components")) { - INetContentTypeParameter const * param = params.find(rtl::OString("platform")); + INetContentTypeParameter const * param = params.find(OString("platform")); if (param == 0 || platform_fits( param->m_sValue )) { return new BackendImpl::ComponentsPackageImpl( this, url, name, m_xComponentsTypeInfo, bRemoved, @@ -725,7 +724,7 @@ Reference BackendImpl::bindPackage_( } else if (subType.equalsIgnoreAsciiCase( "vnd.sun.star.uno-typelibrary")) { - INetContentTypeParameter const * param = params.find(rtl::OString("type")); + INetContentTypeParameter const * param = params.find(OString("type")); if (param != 0) { String const & value = param->m_sValue; if (value.EqualsIgnoreCaseAscii("RDB")) @@ -827,7 +826,7 @@ void BackendImpl::unorc_verify_init( for (sal_Int32 i = RTL_CONSTASCII_LENGTH("UNO_SERVICES="); i >= 0;) { - rtl::OUString token(line.getToken(0, ' ', i)); + OUString token(line.getToken(0, ' ', i)); if (!token.isEmpty()) { if (state == 1 && token.match("?$ORIGIN/")) @@ -878,11 +877,11 @@ void BackendImpl::unorc_flush( Reference const & xCmdEnv ) if (!m_unorc_inited || !m_unorc_modified) return; - ::rtl::OStringBuffer buf; + OStringBuffer buf; buf.append("ORIGIN="); OUString sOrigin = dp_misc::makeRcTerm(m_cachePath); - ::rtl::OString osOrigin = ::rtl::OUStringToOString(sOrigin, RTL_TEXTENCODING_UTF8); + OString osOrigin = OUStringToOString(sOrigin, RTL_TEXTENCODING_UTF8); buf.append(osOrigin); buf.append(LF); @@ -893,8 +892,8 @@ void BackendImpl::unorc_flush( Reference const & xCmdEnv ) buf.append( "UNO_JAVA_CLASSPATH=" ); while (iPos != iEnd) { // encoded ASCII file-urls: - const ::rtl::OString item( - ::rtl::OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); + const OString item( + OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); buf.append( item ); ++iPos; if (iPos != iEnd) @@ -910,8 +909,8 @@ void BackendImpl::unorc_flush( Reference const & xCmdEnv ) while (iPos != iEnd) { buf.append( '?' ); // encoded ASCII file-urls: - const ::rtl::OString item( - ::rtl::OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); + const OString item( + OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); buf.append( item ); ++iPos; if (iPos != iEnd) @@ -934,7 +933,7 @@ void BackendImpl::unorc_flush( Reference const & xCmdEnv ) if (!sCommonRDB.isEmpty()) { buf.append( "?$ORIGIN/" ); - buf.append( ::rtl::OUStringToOString( + buf.append( OUStringToOString( sCommonRDB, RTL_TEXTENCODING_ASCII_US ) ); space = true; } @@ -948,12 +947,12 @@ void BackendImpl::unorc_flush( Reference const & xCmdEnv ) space = true; // write native rc: - ::rtl::OStringBuffer buf2; + OStringBuffer buf2; buf2.append("ORIGIN="); buf2.append(osOrigin); buf2.append(LF); buf2.append( "UNO_SERVICES=?$ORIGIN/" ); - buf2.append( ::rtl::OUStringToOString( + buf2.append( OUStringToOString( sNativeRDB, RTL_TEXTENCODING_ASCII_US ) ); buf2.append(LF); @@ -975,7 +974,7 @@ void BackendImpl::unorc_flush( Reference const & xCmdEnv ) buf.append(' '); } buf.append('?'); - buf.append(rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8)); + buf.append(OUStringToOString(*i, RTL_TEXTENCODING_UTF8)); space = true; } buf.append(LF); @@ -1083,9 +1082,9 @@ Reference raise_uno_process( { OSL_ASSERT( xContext.is() ); - ::rtl::OUString url( util::theMacroExpander::get(xContext)->expandMacros( "$URE_BIN_DIR/uno" ) ); + OUString url( util::theMacroExpander::get(xContext)->expandMacros( "$URE_BIN_DIR/uno" ) ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "uno:pipe,name=" ); OUString pipeId( generateRandomPipeId() ); buf.append( pipeId ); @@ -1137,11 +1136,11 @@ void extractComponentData( std::vector< css::uno::Reference< css::uno::XInterface > > * factories, css::uno::Reference< css::loader::XImplementationLoader > const & componentLoader, - rtl::OUString const & componentUrl) + OUString const & componentUrl) { OSL_ASSERT( context.is() && registry.is() && data != 0 && componentLoader.is()); - rtl::OUString registryName(registry->getKeyName()); + OUString registryName(registry->getKeyName()); sal_Int32 prefix = registryName.getLength(); if (!registryName.endsWith("/")) { prefix += RTL_CONSTASCII_LENGTH("/"); @@ -1151,7 +1150,7 @@ void extractComponentData( css::uno::Reference< css::lang::XMultiComponentFactory > smgr( context->getServiceManager(), css::uno::UNO_QUERY_THROW); for (sal_Int32 i = 0; i < keys.getLength(); ++i) { - rtl::OUString name(keys[i]->getKeyName().copy(prefix)); + OUString name(keys[i]->getKeyName().copy(prefix)); data->implementationNames.push_back(name); css::uno::Reference< css::registry::XRegistryKey > singletons( keys[i]->openKey("UNO/SINGLETONS")); @@ -1163,14 +1162,14 @@ void extractComponentData( singletonKeys(singletons->openKeys()); for (sal_Int32 j = 0; j < singletonKeys.getLength(); ++j) { data->singletons.push_back( - std::pair< rtl::OUString, rtl::OUString >( + std::pair< OUString, OUString >( singletonKeys[j]->getKeyName().copy(prefix2), name)); } } if (factories != 0) { factories->push_back( componentLoader->activate( - name, rtl::OUString(), componentUrl, keys[i])); + name, OUString(), componentUrl, keys[i])); } } } @@ -1198,7 +1197,7 @@ void BackendImpl::ComponentPackageImpl::getComponentInfo( // .../UNO/LOCATION and .../UNO/ACTIVATOR appear not to be written by // writeRegistryInfo, however, but are known, fixed values here, so // can be passed into extractComponentData - rtl::OUString url(getURL()); + OUString url(getURL()); const Reference xMemReg( xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.registry.SimpleRegistry", xContext ), @@ -1228,7 +1227,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveInsertion( } catch (const container::ElementExistException &) { OSL_TRACE( "implementation %s already registered", - rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(*i, RTL_TEXTENCODING_UTF8).getStr()); } } if (!data.singletons.empty()) { @@ -1237,7 +1236,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveInsertion( for (t_stringpairvec::const_iterator i(data.singletons.begin()); i != data.singletons.end(); ++i) { - rtl::OUString name("/singletons/" + i->first); + OUString name("/singletons/" + i->first); //TODO: Update should be atomic: try { cont->removeByName( name + "/arguments"); @@ -1252,7 +1251,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveInsertion( } catch (const container::ElementExistException &) { OSL_TRACE( "singleton %s already registered", - rtl::OUStringToOString( + OUStringToOString( i->first, RTL_TEXTENCODING_UTF8).getStr()); cont->replaceByName(name, css::uno::Any()); } @@ -1282,7 +1281,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveRemoval( for (t_stringpairvec::const_iterator i(data.singletons.begin()); i != data.singletons.end(); ++i) { - rtl::OUString name("/singletons/" + i->first); + OUString name("/singletons/" + i->first); //TODO: Removal should be atomic: try { cont->removeByName(name); @@ -1388,7 +1387,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_( Reference const & xCmdEnv ) { BackendImpl * that = getMyBackend(); - rtl::OUString url(getURL()); + OUString url(getURL()); if (doRegisterPackage) { ComponentBackendDb::Data data; css::uno::Reference< css::uno::XComponentContext > context; @@ -1726,7 +1725,7 @@ void BackendImpl::ComponentsPackageImpl::processPackage_( Reference const & xCmdEnv ) { BackendImpl * that = getMyBackend(); - rtl::OUString url(getURL()); + OUString url(getURL()); if (doRegisterPackage) { if (!startup) { css::uno::Reference< css::uno::XComponentContext > context( @@ -1742,9 +1741,9 @@ void BackendImpl::ComponentsPackageImpl::processPackage_( // This relies on the root component context's service manager // supporting the extended XSet semantics: css::uno::Sequence< css::beans::NamedValue > args(2); - args[0].Name = rtl::OUString("uri"); + args[0].Name = OUString("uri"); args[0].Value <<= expandUnoRcUrl(url); - args[1].Name = rtl::OUString("component-context"); + args[1].Name = OUString("component-context"); args[1].Value <<= context; css::uno::Reference< css::container::XSet > smgr( that->getRootContext()->getServiceManager(), @@ -1758,7 +1757,7 @@ void BackendImpl::ComponentsPackageImpl::processPackage_( // This relies on the root component context's service manager // supporting the extended XSet semantics: css::uno::Sequence< css::beans::NamedValue > args(1); - args[0].Name = rtl::OUString("uri"); + args[0].Name = OUString("uri"); args[0].Value <<= expandUnoRcUrl(url); css::uno::Reference< css::container::XSet > smgr( that->getRootContext()->getServiceManager(), diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index b17f057d1f89..9254a7c9ef6f 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -53,7 +53,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { @@ -222,7 +221,7 @@ BackendImpl::BackendImpl( SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr pMap; SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OUString aCompatURL( makeURL( getCachePath(), "registered_packages.pmap" ) ); + OUString aCompatURL( makeURL( getCachePath(), "registered_packages.pmap" ) ); // Don't create it if it doesn't exist already if ( ::utl::UCBContentHelper::Exists( expandUnoRcUrl( aCompatURL ) ) ) @@ -235,7 +234,7 @@ BackendImpl::BackendImpl( } catch (const Exception &e) { - rtl::OUStringBuffer aStr( "Exception loading legacy package database: '" ); + OUStringBuffer aStr( "Exception loading legacy package database: '" ); aStr.append( e.Message ); aStr.append( "' - ignoring file, please remove it.\n" ); dp_misc::writeConsole( aStr.getStr() ); @@ -427,7 +426,7 @@ void BackendImpl::configmgrini_flush( if (!m_configmgrini_inited || !m_configmgrini_modified) return; - ::rtl::OStringBuffer buf; + OStringBuffer buf; if (! m_xcs_files.empty()) { t_stringlist::const_iterator iPos( m_xcs_files.begin() ); @@ -435,8 +434,8 @@ void BackendImpl::configmgrini_flush( buf.append( "SCHEMA=" ); while (iPos != iEnd) { // encoded ASCII file-urls: - const ::rtl::OString item( - ::rtl::OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); + const OString item( + OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); buf.append( item ); ++iPos; if (iPos != iEnd) @@ -451,8 +450,8 @@ void BackendImpl::configmgrini_flush( buf.append( "DATA=" ); while (iPos != iEnd) { // encoded ASCII file-urls: - const ::rtl::OString item( - ::rtl::OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); + const OString item( + OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); buf.append( item ); ++iPos; if (iPos != iEnd) @@ -549,7 +548,7 @@ BackendImpl::PackageImpl::isRegistered_( Reference const & ) { BackendImpl * that = getMyBackend(); - const rtl::OUString url(getURL()); + const OUString url(getURL()); bool bReg = false; if (that->hasActiveEntry(getURL())) @@ -560,7 +559,7 @@ BackendImpl::PackageImpl::isRegistered_( { // fallback for user extension registered in berkeley DB bReg = that->m_registeredPackages->has( - rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8 )); + OUStringToOString( url, RTL_TEXTENCODING_UTF8 )); } #endif return beans::Optional< beans::Ambiguous >( @@ -572,7 +571,7 @@ OUString encodeForXml( OUString const & text ) { // encode conforming xml: sal_Int32 len = text.getLength(); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; for ( sal_Int32 pos = 0; pos < len; ++pos ) { sal_Unicode c = text[ pos ]; @@ -610,7 +609,7 @@ OUString replaceOrigin( ::rtl::ByteSequence filtered( bytes.getLength() * 2, ::rtl::BYTESEQ_NODEFAULT ); bool use_filtered = false; - ::rtl::OString origin; + OString origin; sal_Char const * pBytes = reinterpret_cast( bytes.getConstArray()); sal_Size nBytes = bytes.getLength(); @@ -653,7 +652,7 @@ OUString replaceOrigin( { if (origin.isEmpty()) { // encode only once - origin = ::rtl::OUStringToOString( + origin = OUStringToOString( encodeForXml( url.copy( 0, url.lastIndexOf( '/' ) ) ), // xxx todo: encode always for UTF-8? => lookup doc-header? RTL_TEXTENCODING_UTF8 ); @@ -673,7 +672,7 @@ OUString replaceOrigin( return url; if (write_pos < filtered.getLength()) filtered.realloc( write_pos ); - rtl::OUString newUrl(url); + OUString newUrl(url); if (!destFolder.isEmpty()) { //get the file name of the xcu and add it to the url of the temporary folder @@ -758,8 +757,8 @@ void BackendImpl::PackageImpl::processPackage_( //structur containing the xcu, xcs files from all extensions. Now, //we just add all other xcu/xcs files to the configmgr.ini instead of //rebuilding the directory structure. - rtl::OUString url2( - rtl::OStringToOUString(i->first, RTL_TEXTENCODING_UTF8)); + OUString url2( + OStringToOUString(i->first, RTL_TEXTENCODING_UTF8)); if (url2 != url) { bool schema = i->second.equalsIgnoreAsciiCase( "vnd.sun.star.configuration-schema"); diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx index 01a7bb8f36d2..47e364e2b754 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/configuration-registry/2010" #define NS_PREFIX "conf" @@ -43,7 +42,7 @@ namespace configuration { ConfigurationBackendDb::ConfigurationBackendDb( Reference const & xContext, - ::rtl::OUString const & url):BackendDb(xContext, url) + OUString const & url):BackendDb(xContext, url) { } @@ -69,7 +68,7 @@ OUString ConfigurationBackendDb::getKeyElementName() } -void ConfigurationBackendDb::addEntry(::rtl::OUString const & url, Data const & data) +void ConfigurationBackendDb::addEntry(OUString const & url, Data const & data) { try{ if (!activateEntry(url)) @@ -97,7 +96,7 @@ void ConfigurationBackendDb::addEntry(::rtl::OUString const & url, Data const & ::boost::optional -ConfigurationBackendDb::getEntry(::rtl::OUString const & url) +ConfigurationBackendDb::getEntry(OUString const & url) { try { diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index 31435015811c..31a444bea994 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -42,13 +42,13 @@ namespace configuration { class ConfigurationBackendDb: public dp_registry::backend::BackendDb { protected: - virtual ::rtl::OUString getDbNSName(); + virtual OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); + virtual OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); + virtual OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getKeyElementName(); public: struct Data @@ -56,21 +56,21 @@ public: /* the URL to the folder containing the xcu or xcs files which contained %origin% */ - ::rtl::OUString dataUrl; + OUString dataUrl; /* the URL of the xcu or xcs file which is written in to the configmgr.ini */ - ::rtl::OUString iniEntry; + OUString iniEntry; }; public: ConfigurationBackendDb( css::uno::Reference const & xContext, - ::rtl::OUString const & url); + OUString const & url); - void addEntry(::rtl::OUString const & url, Data const & data); + void addEntry(OUString const & url, Data const & data); - ::boost::optional getEntry(::rtl::OUString const & url); - ::std::list< ::rtl::OUString> getAllDataUrls(); + ::boost::optional getEntry(OUString const & url); + ::std::list< OUString> getAllDataUrls(); }; diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 07cadb6a4f42..8c6cdfaf867e 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -46,7 +46,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index 152a8f025279..927c47dc8070 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_registry { @@ -44,7 +43,7 @@ namespace backend { BackendDb::BackendDb( Reference const & xContext, - ::rtl::OUString const & url): + OUString const & url): m_xContext(xContext) { m_urlDb = dp_misc::expandUnoRcUrl(url); @@ -119,7 +118,7 @@ Reference BackendDb::getXPathAPI() return m_xpathApi; } -void BackendDb::removeElement(::rtl::OUString const & sXPathExpression) +void BackendDb::removeElement(OUString const & sXPathExpression) { try { @@ -152,11 +151,11 @@ void BackendDb::removeElement(::rtl::OUString const & sXPathExpression) } } -void BackendDb::removeEntry(::rtl::OUString const & url) +void BackendDb::removeEntry(OUString const & url) { const OUString sKeyElement = getKeyElementName(); const OUString sPrefix = getNSPrefix(); - ::rtl::OUStringBuffer sExpression(500); + OUStringBuffer sExpression(500); sExpression.append(sPrefix); sExpression.appendAscii(":"); sExpression.append(sKeyElement); @@ -167,7 +166,7 @@ void BackendDb::removeEntry(::rtl::OUString const & url) removeElement(sExpression.makeStringAndClear()); } -void BackendDb::revokeEntry(::rtl::OUString const & url) +void BackendDb::revokeEntry(OUString const & url) { try { @@ -187,7 +186,7 @@ void BackendDb::revokeEntry(::rtl::OUString const & url) } } -bool BackendDb::activateEntry(::rtl::OUString const & url) +bool BackendDb::activateEntry(OUString const & url) { try { @@ -211,7 +210,7 @@ bool BackendDb::activateEntry(::rtl::OUString const & url) } } -bool BackendDb::hasActiveEntry(::rtl::OUString const & url) +bool BackendDb::hasActiveEntry(OUString const & url) { try { @@ -236,13 +235,13 @@ bool BackendDb::hasActiveEntry(::rtl::OUString const & url) } Reference BackendDb::getKeyElement( - ::rtl::OUString const & url) + OUString const & url) { try { const OUString sPrefix = getNSPrefix(); const OUString sKeyElement = getKeyElementName(); - ::rtl::OUStringBuffer sExpression(500); + OUStringBuffer sExpression(500); sExpression.append(sPrefix); sExpression.appendAscii(":"); sExpression.append(sKeyElement); @@ -266,7 +265,7 @@ Reference BackendDb::getKeyElement( //Only writes the data if there is at least one entry void BackendDb::writeVectorOfPair( - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > const & vecPairs, + ::std::vector< ::std::pair< OUString, OUString > > const & vecPairs, OUString const & sVectorTagName, OUString const & sPairTagName, OUString const & sFirstTagName, @@ -384,7 +383,7 @@ BackendDb::readVectorOfPair( //Only writes the data if there is at least one entry void BackendDb::writeSimpleList( - ::std::list< ::rtl::OUString> const & list, + ::std::list< OUString> const & list, OUString const & sListTagName, OUString const & sMemberTagName, Reference const & xParent) @@ -463,7 +462,7 @@ void BackendDb::writeSimpleElement( element. */ Reference BackendDb::writeKeyElement( - ::rtl::OUString const & url) + OUString const & url) { try { @@ -579,7 +578,7 @@ OUString BackendDb::readSimpleElement( Reference xpathApi = getXPathAPI(); const OUString sPrefix = getNSPrefix(); const OUString sKeyElement = getKeyElementName(); - ::rtl::OUStringBuffer buf(512); + OUStringBuffer buf(512); buf.append(sPrefix); buf.appendAscii(":"); buf.append(sKeyElement); @@ -615,11 +614,11 @@ OUString BackendDb::readSimpleElement( RegisteredDb::RegisteredDb( Reference const & xContext, - ::rtl::OUString const & url):BackendDb(xContext, url) + OUString const & url):BackendDb(xContext, url) { } -void RegisteredDb::addEntry(::rtl::OUString const & url) +void RegisteredDb::addEntry(OUString const & url) { try{ if (!activateEntry(url)) @@ -660,7 +659,7 @@ void RegisteredDb::addEntry(::rtl::OUString const & url) } } -bool RegisteredDb::getEntry(::rtl::OUString const & url) +bool RegisteredDb::getEntry(OUString const & url) { try { diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 742b59439a32..fdb3fba23a2a 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -48,7 +48,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { @@ -166,7 +165,7 @@ PackageRegistryImpl::~PackageRegistryImpl() //______________________________________________________________________________ OUString normalizeMediaType( OUString const & mediaType ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; sal_Int32 index = 0; for (;;) { buf.append( mediaType.getToken( 0, '/', index ).trim() ); @@ -180,7 +179,7 @@ OUString normalizeMediaType( OUString const & mediaType ) //______________________________________________________________________________ void PackageRegistryImpl::packageRemoved( - ::rtl::OUString const & url, ::rtl::OUString const & mediaType) + OUString const & url, OUString const & mediaType) throw (css::deployment::DeploymentException, css::uno::RuntimeException) { @@ -197,7 +196,7 @@ void PackageRegistryImpl::insertBackend( Reference const & xBackend ) { m_allBackends.insert( xBackend ); - typedef ::boost::unordered_set t_stringset; + typedef ::boost::unordered_set t_stringset; t_stringset ambiguousFilters; const Sequence< Reference > packageTypes( @@ -273,7 +272,7 @@ void PackageRegistryImpl::insertBackend( #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "more than one PackageRegistryBackend for media-type=\"" ); buf.append( mediaType ); buf.appendAscii( "\" => " ); @@ -281,7 +280,7 @@ void PackageRegistryImpl::insertBackend( xBackend, UNO_QUERY_THROW )-> getImplementationName() ); buf.appendAscii( "\"!" ); - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr() ); } @@ -394,7 +393,7 @@ Reference PackageRegistryImpl::create( that->m_filter2mediaType.begin() ); iPos != that->m_filter2mediaType.end(); ++iPos ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "extension \"" ); buf.append( iPos->first ); buf.appendAscii( "\" maps to media-type \"" ); @@ -413,7 +412,7 @@ Reference PackageRegistryImpl::create( that->m_ambiguousBackends.begin() ); iPos != that->m_ambiguousBackends.end(); ++iPos ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( Reference( *iPos, UNO_QUERY_THROW )->getImplementationName() ); diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 131d6ae18c90..b84c95ae5f2a 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace dp_misc; -using ::rtl::OUString; namespace dp_registry { namespace backend { @@ -75,7 +74,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend friend class ExecutablePackageImpl; typedef ::boost::unordered_map< OUString, Reference, - ::rtl::OUStringHash > t_string2object; + OUStringHash > t_string2object; // PackageRegistryBackend virtual Reference bindPackage_( diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx index 25988f011f90..fcafcfc390ab 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/executable-registry/2010" #define NS_PREFIX "exe" @@ -38,7 +37,7 @@ namespace executable { ExecutableBackendDb::ExecutableBackendDb( Reference const & xContext, - ::rtl::OUString const & url):RegisteredDb(xContext, url) + OUString const & url):RegisteredDb(xContext, url) { } diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx index 496d2765fd74..10d094fbeec3 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx @@ -42,18 +42,18 @@ namespace executable { class ExecutableBackendDb: public dp_registry::backend::RegisteredDb { protected: - virtual ::rtl::OUString getDbNSName(); + virtual OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); + virtual OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); + virtual OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getKeyElementName(); public: ExecutableBackendDb( css::uno::Reference const & xContext, - ::rtl::OUString const & url); + OUString const & url); }; diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 7510714316f8..00e3ebaced42 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -47,7 +47,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { @@ -84,7 +83,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool extensionContainsCompiledHelp(); //XPackage - virtual css::beans::Optional< ::rtl::OUString > SAL_CALL getRegistrationDataURL() + virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() throw (deployment::ExtensionRemovedException, css::uno::RuntimeException); }; friend class PackageImpl; @@ -97,8 +96,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend void implProcessHelp( PackageImpl * package, bool doRegisterPackage, Reference const & xCmdEnv); - void implCollectXhpFiles( const rtl::OUString& aDir, - std::vector< rtl::OUString >& o_rXhpFileVector ); + void implCollectXhpFiles( const OUString& aDir, + std::vector< OUString >& o_rXhpFileVector ); void addDataToDb(OUString const & url, HelpBackendDb::Data const & data); ::boost::optional readDataFromDb(OUString const & url); @@ -132,7 +131,7 @@ BackendImpl::BackendImpl( Reference const & xComponentContext ) : PackageRegistryBackend( args, xComponentContext ), m_xHelpTypeInfo( new Package::TypeInfo("application/vnd.sun.star.help", - rtl::OUString(), + OUString(), getResourceString(RID_STR_HELP), RID_IMG_HELP ) ), m_typeInfos( 1 ) @@ -276,7 +275,7 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() { bool bCompiled = true; - rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl(getURL()); + OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl(getURL()); ::osl::Directory helpFolder(aExpandedHelpURL); if ( helpFolder.open() == ::osl::File::E_None) @@ -392,27 +391,27 @@ void BackendImpl::implProcessHelp( data.dataUrl = sHelpFolder; Reference< ucb::XSimpleFileAccess3 > xSFA = getFileAccess(); - rtl::OUString aHelpURL = xPackage->getURL(); - rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL ); + OUString aHelpURL = xPackage->getURL(); + OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL ); if( !xSFA->isFolder( aExpandedHelpURL ) ) { - rtl::OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR ); - aErrStr += rtl::OUString("No help folder" ); + OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR ); + aErrStr += OUString("No help folder" ); OWeakObject* oWeakThis = static_cast(this); - throw deployment::DeploymentException( rtl::OUString(), oWeakThis, + throw deployment::DeploymentException( OUString(), oWeakThis, makeAny( uno::Exception( aErrStr, oWeakThis ) ) ); } // Scan languages - Sequence< rtl::OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true ); + Sequence< OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true ); sal_Int32 nLangCount = aLanguageFolderSeq.getLength(); - const rtl::OUString* pSeq = aLanguageFolderSeq.getConstArray(); + const OUString* pSeq = aLanguageFolderSeq.getConstArray(); for( sal_Int32 iLang = 0 ; iLang < nLangCount ; ++iLang ) { - rtl::OUString aLangURL = pSeq[iLang]; + OUString aLangURL = pSeq[iLang]; if( xSFA->isFolder( aLangURL ) ) { - std::vector< rtl::OUString > aXhpFileVector; + std::vector< OUString > aXhpFileVector; // calculate jar file URL sal_Int32 indexStartSegment = aLangURL.lastIndexOf('/'); @@ -432,50 +431,50 @@ void BackendImpl::implProcessHelp( const OUString aHelpStr("help"); const OUString aSlash("/"); - rtl::OUString aJarFile( + OUString aJarFile( makeURL(sHelpFolder, langFolderURLSegment + aSlash + aHelpStr + ".jar")); aJarFile = ::dp_misc::expandUnoRcUrl(aJarFile); - rtl::OUString aEncodedJarFilePath = rtl::Uri::encode( + OUString aEncodedJarFilePath = rtl::Uri::encode( aJarFile, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); - rtl::OUString aDestBasePath = rtl::OUString("vnd.sun.star.zip://" ); + OUString aDestBasePath = OUString("vnd.sun.star.zip://" ); aDestBasePath += aEncodedJarFilePath; - aDestBasePath += rtl::OUString("/" ); + aDestBasePath += OUString("/" ); sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1; - Sequence< rtl::OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true ); + Sequence< OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true ); sal_Int32 nSubLangCount = aSubLangSeq.getLength(); - const rtl::OUString* pSubLangSeq = aSubLangSeq.getConstArray(); + const OUString* pSubLangSeq = aSubLangSeq.getConstArray(); for( sal_Int32 iSubLang = 0 ; iSubLang < nSubLangCount ; ++iSubLang ) { - rtl::OUString aSubFolderURL = pSubLangSeq[iSubLang]; + OUString aSubFolderURL = pSubLangSeq[iSubLang]; if( !xSFA->isFolder( aSubFolderURL ) ) continue; implCollectXhpFiles( aSubFolderURL, aXhpFileVector ); // Copy to package (later: move?) - rtl::OUString aDestPath = aDestBasePath; - rtl::OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL ); + OUString aDestPath = aDestBasePath; + OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL ); aDestPath += aPureFolderName; xSFA->copy( aSubFolderURL, aDestPath ); } // Call compiler sal_Int32 nXhpFileCount = aXhpFileVector.size(); - rtl::OUString* pXhpFiles = new rtl::OUString[nXhpFileCount]; + OUString* pXhpFiles = new OUString[nXhpFileCount]; for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp ) { - rtl::OUString aXhpFile = aXhpFileVector[iXhp]; - rtl::OUString aXhpRelFile = aXhpFile.copy( nLenLangFolderURL ); + OUString aXhpFile = aXhpFileVector[iXhp]; + OUString aXhpRelFile = aXhpFile.copy( nLenLangFolderURL ); pXhpFiles[iXhp] = aXhpRelFile; } - rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() ); - rtl::OUString aOfficeHelpPathFileURL; + OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() ); + OUString aOfficeHelpPathFileURL; ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL ); HelpProcessingErrorInfo aErrorInfo; @@ -486,14 +485,14 @@ void BackendImpl::implProcessHelp( if( bSuccess ) { - rtl::OUString aLang; + OUString aLang; sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' ); if( nLastSlash != -1 ) aLang = aLangURL.copy( nLastSlash + 1 ); else - aLang = rtl::OUString("en" ); + aLang = OUString("en" ); - rtl::OUString aMod("help"); + OUString aMod("help"); HelpIndexer aIndexer(aLang, aMod, langFolderDestExpanded, langFolderDestExpanded); aIndexer.indexDocuments(); @@ -510,13 +509,13 @@ void BackendImpl::implProcessHelp( default: ; }; - rtl::OUString aErrStr; + OUString aErrStr; if( nErrStrId != 0 ) { aErrStr = getResourceString( nErrStrId ); // Remoce CR/LF - rtl::OUString aErrMsg( aErrorInfo.m_aErrorMsg ); + OUString aErrMsg( aErrorInfo.m_aErrorMsg ); sal_Unicode nCR = 13, nLF = 10; sal_Int32 nSearchCR = aErrMsg.indexOf( nCR ); sal_Int32 nSearchLF = aErrMsg.indexOf( nLF ); @@ -535,21 +534,21 @@ void BackendImpl::implProcessHelp( aErrStr += aErrMsg; if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && !aErrorInfo.m_aXMLParsingFile.isEmpty() ) { - aErrStr += rtl::OUString(" in " ); + aErrStr += OUString(" in " ); - rtl::OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile, + OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); aErrStr += aDecodedFile; if( aErrorInfo.m_nXMLParsingLine != -1 ) { - aErrStr += rtl::OUString(", line " ); - aErrStr += ::rtl::OUString::valueOf( aErrorInfo.m_nXMLParsingLine ); + aErrStr += OUString(", line " ); + aErrStr += OUString::valueOf( aErrorInfo.m_nXMLParsingLine ); } } } OWeakObject* oWeakThis = static_cast(this); - throw deployment::DeploymentException( rtl::OUString(), oWeakThis, + throw deployment::DeploymentException( OUString(), oWeakThis, makeAny( uno::Exception( aErrStr, oWeakThis ) ) ); } } @@ -569,18 +568,18 @@ void BackendImpl::implProcessHelp( } } -void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir, - std::vector< rtl::OUString >& o_rXhpFileVector ) +void BackendImpl::implCollectXhpFiles( const OUString& aDir, + std::vector< OUString >& o_rXhpFileVector ) { Reference< ucb::XSimpleFileAccess3 > xSFA = getFileAccess(); // Scan xhp files recursively - Sequence< rtl::OUString > aSeq = xSFA->getFolderContents( aDir, true ); + Sequence< OUString > aSeq = xSFA->getFolderContents( aDir, true ); sal_Int32 nCount = aSeq.getLength(); - const rtl::OUString* pSeq = aSeq.getConstArray(); + const OUString* pSeq = aSeq.getConstArray(); for( sal_Int32 i = 0 ; i < nCount ; ++i ) { - rtl::OUString aURL = pSeq[i]; + OUString aURL = pSeq[i]; if( xSFA->isFolder( aURL ) ) { implCollectXhpFiles( aURL, o_rXhpFileVector ); @@ -590,8 +589,8 @@ void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir, sal_Int32 nLastDot = aURL.lastIndexOf( '.' ); if( nLastDot != -1 ) { - rtl::OUString aExt = aURL.copy( nLastDot + 1 ); - if( aExt.equalsIgnoreAsciiCase( rtl::OUString("xhp" ) ) ) + OUString aExt = aURL.copy( nLastDot + 1 ); + if( aExt.equalsIgnoreAsciiCase( OUString("xhp" ) ) ) o_rXhpFileVector.push_back( aURL ); } } @@ -610,7 +609,7 @@ Reference< ucb::XSimpleFileAccess3 > BackendImpl::getFileAccess( void ) if( !m_xSFA.is() ) { throw RuntimeException( - ::rtl::OUString( + OUString( "dp_registry::backend::help::BackendImpl::getFileAccess(), " "could not instatiate SimpleFileAccess." ), Reference< XInterface >() ); diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx index af82956c4697..4d66fe4dd398 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/help-registry/2010" #define NS_PREFIX "help" @@ -43,7 +42,7 @@ namespace help { HelpBackendDb::HelpBackendDb( Reference const & xContext, - ::rtl::OUString const & url):BackendDb(xContext, url) + OUString const & url):BackendDb(xContext, url) { } @@ -69,7 +68,7 @@ OUString HelpBackendDb::getKeyElementName() } -void HelpBackendDb::addEntry(::rtl::OUString const & url, Data const & data) +void HelpBackendDb::addEntry(OUString const & url, Data const & data) { try{ if (!activateEntry(url)) @@ -95,7 +94,7 @@ void HelpBackendDb::addEntry(::rtl::OUString const & url, Data const & data) ::boost::optional -HelpBackendDb::getEntry(::rtl::OUString const & url) +HelpBackendDb::getEntry(OUString const & url) { try { diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index eeda03533db6..e6f6af82914e 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -41,34 +41,34 @@ namespace help { class HelpBackendDb: public dp_registry::backend::BackendDb { protected: - virtual ::rtl::OUString getDbNSName(); + virtual OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); + virtual OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); + virtual OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getKeyElementName(); public: struct Data { /* the URL to the folder containing the compiled help files, etc. */ - ::rtl::OUString dataUrl; + OUString dataUrl; }; public: HelpBackendDb( css::uno::Reference const & xContext, - ::rtl::OUString const & url); + OUString const & url); - void addEntry(::rtl::OUString const & url, Data const & data); + void addEntry(OUString const & url, Data const & data); - ::boost::optional getEntry(::rtl::OUString const & url); + ::boost::optional getEntry(OUString const & url); //must also return the data urls for entries with @activ="false". That is, //those are currently revoked. - ::std::list< ::rtl::OUString> getAllDataUrls(); + ::std::list< OUString> getAllDataUrls(); }; diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 8522fd9907c2..621320852770 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -62,13 +62,13 @@ class Package : protected ::dp_misc::MutexHolder, public t_PackageBase protected: ::rtl::Reference m_myBackend; - const ::rtl::OUString m_url; - ::rtl::OUString m_name; - ::rtl::OUString m_displayName; + const OUString m_url; + OUString m_name; + OUString m_displayName; const css::uno::Reference m_xPackageType; const bool m_bRemoved; //Only set if m_bRemoved = true; - const ::rtl::OUString m_identifier; + const OUString m_identifier; void check() const; void fireModified(); @@ -94,43 +94,43 @@ protected: virtual ~Package(); Package( ::rtl::Reference const & myBackend, - ::rtl::OUString const & url, - ::rtl::OUString const & name, - ::rtl::OUString const & displayName, + OUString const & url, + OUString const & name, + OUString const & displayName, css::uno::Reference const & xPackageType, bool bRemoved, - ::rtl::OUString const & identifier); + OUString const & identifier); public: class TypeInfo : public ::cppu::WeakImplHelper1 { - const ::rtl::OUString m_mediaType; - const ::rtl::OUString m_fileFilter; - const ::rtl::OUString m_shortDescr; + const OUString m_mediaType; + const OUString m_fileFilter; + const OUString m_shortDescr; const sal_uInt16 m_smallIcon; public: virtual ~TypeInfo(); - TypeInfo( ::rtl::OUString const & mediaType, - ::rtl::OUString const & fileFilter, - ::rtl::OUString const & shortDescr, + TypeInfo( OUString const & mediaType, + OUString const & fileFilter, + OUString const & shortDescr, sal_uInt16 smallIcon) : m_mediaType(mediaType), m_fileFilter(fileFilter), m_shortDescr(shortDescr), m_smallIcon(smallIcon) {} // XPackageTypeInfo - virtual ::rtl::OUString SAL_CALL getMediaType() + virtual OUString SAL_CALL getMediaType() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDescription() + virtual OUString SAL_CALL getDescription() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getShortDescription() + virtual OUString SAL_CALL getShortDescription() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFileFilter() + virtual OUString SAL_CALL getFileFilter() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getIcon( sal_Bool highContrast, sal_Bool smallIcon ) @@ -212,25 +212,25 @@ public: css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual css::beans::Optional< ::rtl::OUString > SAL_CALL getIdentifier() + virtual css::beans::Optional< OUString > SAL_CALL getIdentifier() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getVersion() + virtual OUString SAL_CALL getVersion() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL() + virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDisplayName() + virtual OUString SAL_CALL getDisplayName() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDescription() + virtual OUString SAL_CALL getDescription() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLicenseText() + virtual OUString SAL_CALL getLicenseText() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getUpdateInformationURLs() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); @@ -244,16 +244,16 @@ public: virtual css::uno::Reference SAL_CALL getPackageType() throw (css::uno::RuntimeException); virtual void SAL_CALL exportTo( - ::rtl::OUString const & destFolderURL, - ::rtl::OUString const & newTitle, + OUString const & destFolderURL, + OUString const & newTitle, sal_Int32 nameClashAction, css::uno::Reference const & xCmdEnv ) throw (css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRepositoryName() + virtual OUString SAL_CALL getRepositoryName() throw (css::uno::RuntimeException); - virtual css::beans::Optional< ::rtl::OUString > SAL_CALL getRegistrationDataURL() + virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); virtual sal_Bool SAL_CALL isRemoved() @@ -277,15 +277,15 @@ class PackageRegistryBackend //of bindPackage calls which are costly. Therefore we keep hard references in //the map now. typedef ::boost::unordered_map< - ::rtl::OUString, css::uno::Reference, - ::rtl::OUStringHash > t_string2ref; + OUString, css::uno::Reference, + OUStringHash > t_string2ref; t_string2ref m_bound; protected: - ::rtl::OUString m_cachePath; + OUString m_cachePath; css::uno::Reference m_xComponentContext; - ::rtl::OUString m_context; + OUString m_context; // currently only for library containers: enum { CONTEXT_UNKNOWN, @@ -301,8 +301,8 @@ protected: // @@@ to be implemented by specific backend: virtual css::uno::Reference bindPackage_( - ::rtl::OUString const & url, ::rtl::OUString const & mediaType, - sal_Bool bRemoved, ::rtl::OUString const & identifier, + OUString const & url, OUString const & mediaType, + sal_Bool bRemoved, OUString const & identifier, css::uno::Reference const & xCmdEnv ) = 0; @@ -318,8 +318,8 @@ protected: If url is empty then it is created in the backend folder, otherwise at a location relative to that folder specified by url. */ - ::rtl::OUString createFolder( - ::rtl::OUString const & relUrl, + OUString createFolder( + OUString const & relUrl, css::uno::Reference const & xCmdEnv); /* deletes folders and files. @@ -327,15 +327,15 @@ protected: not used are deleted. */ void deleteUnusedFolders( - ::rtl::OUString const & relUrl, - ::std::list< ::rtl::OUString> const & usedFolders); + OUString const & relUrl, + ::std::list< OUString> const & usedFolders); /* deletes one folder with a "temporary" name and the corresponding tmp file, which was used to derive the folder name. */ static void deleteTempFolder( - ::rtl::OUString const & folderUrl); + OUString const & folderUrl); - ::rtl::OUString getSharedRegistrationDataURL( + OUString getSharedRegistrationDataURL( css::uno::Reference const & extension, css::uno::Reference const & item); @@ -344,7 +344,7 @@ protected: This ensure that the backends clean up their registration data when an extension was removed. */ -// virtual void deleteDbEntry( ::rtl::OUString const & url) = 0; +// virtual void deleteDbEntry( OUString const & url) = 0; @@ -357,10 +357,10 @@ public: inline css::uno::Reference const & getComponentContext() const { return m_xComponentContext; } - inline ::rtl::OUString const & getCachePath() const { return m_cachePath; } + inline OUString const & getCachePath() const { return m_cachePath; } inline bool transientMode() const { return m_cachePath.isEmpty(); } - inline ::rtl::OUString getContext() const {return m_context; } + inline OUString getContext() const {return m_context; } // XEventListener virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) @@ -368,8 +368,8 @@ public: // XPackageRegistry virtual css::uno::Reference SAL_CALL bindPackage( - ::rtl::OUString const & url, ::rtl::OUString const & mediaType, - sal_Bool bRemoved, ::rtl::OUString const & identifier, + OUString const & url, OUString const & mediaType, + sal_Bool bRemoved, OUString const & identifier, css::uno::Reference const & xCmdEnv ) throw (css::deployment::DeploymentException, css::deployment::InvalidRemovedParameterException, @@ -377,7 +377,7 @@ public: css::lang::IllegalArgumentException, css::uno::RuntimeException); // virtual void SAL_CALL packageRemoved( -// ::rtl::OUString const & url, ::rtl::OUString const & mediaType) +// OUString const & url, OUString const & mediaType) // throw (css::deployment::DeploymentException, // css::uno::RuntimeException); diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 53e555c3bf71..09ae83f95fb1 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -52,7 +52,7 @@ private: protected: const css::uno::Reference m_xContext; - ::rtl::OUString m_urlDb; + OUString m_urlDb; protected: @@ -64,88 +64,88 @@ protected: */ css::uno::Reference getXPathAPI(); void save(); - void removeElement(::rtl::OUString const & sXPathExpression); + void removeElement(OUString const & sXPathExpression); css::uno::Reference getKeyElement( - ::rtl::OUString const & url); + OUString const & url); void writeSimpleList( - ::std::list< ::rtl::OUString> const & list, - ::rtl::OUString const & sListTagName, - ::rtl::OUString const & sMemberTagName, + ::std::list< OUString> const & list, + OUString const & sListTagName, + OUString const & sMemberTagName, css::uno::Reference const & xParent); void writeVectorOfPair( - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > const & vecPairs, - ::rtl::OUString const & sVectorTagName, - ::rtl::OUString const & sPairTagName, - ::rtl::OUString const & sFirstTagName, - ::rtl::OUString const & sSecondTagName, + ::std::vector< ::std::pair< OUString, OUString > > const & vecPairs, + OUString const & sVectorTagName, + OUString const & sPairTagName, + OUString const & sFirstTagName, + OUString const & sSecondTagName, css::uno::Reference const & xParent); void writeSimpleElement( - ::rtl::OUString const & sElementName, ::rtl::OUString const & value, + OUString const & sElementName, OUString const & value, css::uno::Reference const & xParent); css::uno::Reference writeKeyElement( - ::rtl::OUString const & url); + OUString const & url); - ::rtl::OUString readSimpleElement( - ::rtl::OUString const & sElementName, + OUString readSimpleElement( + OUString const & sElementName, css::uno::Reference const & xParent); - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > + ::std::vector< ::std::pair< OUString, OUString > > readVectorOfPair( css::uno::Reference const & parent, - ::rtl::OUString const & sListTagName, - ::rtl::OUString const & sPairTagName, - ::rtl::OUString const & sFirstTagName, - ::rtl::OUString const & sSecondTagName); + OUString const & sListTagName, + OUString const & sPairTagName, + OUString const & sFirstTagName, + OUString const & sSecondTagName); - ::std::list< ::rtl::OUString> readList( + ::std::list< OUString> readList( css::uno::Reference const & parent, - ::rtl::OUString const & sListTagName, - ::rtl::OUString const & sMemberTagName); + OUString const & sListTagName, + OUString const & sMemberTagName); /* returns the values of one particulary child element of all key elements. */ - ::std::list< ::rtl::OUString> getOneChildFromAllEntries( - ::rtl::OUString const & sElementName); + ::std::list< OUString> getOneChildFromAllEntries( + OUString const & sElementName); /* returns the namespace which is to be written as xmlns attribute into the root element. */ - virtual ::rtl::OUString getDbNSName()=0; + virtual OUString getDbNSName()=0; /* return the namespace prefix which is to be registered with the XPath API. The prefix can then be used in XPath expressions. */ - virtual ::rtl::OUString getNSPrefix()=0; + virtual OUString getNSPrefix()=0; /* returns the name of the root element without any namespace prefix. */ - virtual ::rtl::OUString getRootElementName()=0; + virtual OUString getRootElementName()=0; /* returns the name of xml element for each entry */ - virtual ::rtl::OUString getKeyElementName()=0; + virtual OUString getKeyElementName()=0; public: BackendDb(css::uno::Reference const & xContext, - ::rtl::OUString const & url); + OUString const & url); virtual ~BackendDb() {}; - void removeEntry(::rtl::OUString const & url); + void removeEntry(OUString const & url); /* This is called to write the "revoked" attribute to the entry. This is done when XPackage::revokePackage is called. */ - void revokeEntry(::rtl::OUString const & url); + void revokeEntry(OUString const & url); /* returns false if the entry does not exist yet. */ - bool activateEntry(::rtl::OUString const & url); + bool activateEntry(OUString const & url); - bool hasActiveEntry(::rtl::OUString const & url); + bool hasActiveEntry(OUString const & url); }; @@ -154,12 +154,12 @@ class RegisteredDb: public BackendDb public: RegisteredDb( css::uno::Reference const & xContext, - ::rtl::OUString const & url); + OUString const & url); virtual ~RegisteredDb() {}; - virtual void addEntry(::rtl::OUString const & url); - virtual bool getEntry(::rtl::OUString const & url); + virtual void addEntry(OUString const & url); + virtual bool getEntry(OUString const & url); }; diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx index 72e08aca0b03..af7353287229 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/extension-registry/2010" #define NS_PREFIX "ext" @@ -42,7 +41,7 @@ namespace bundle { ExtensionBackendDb::ExtensionBackendDb( Reference const & xContext, - ::rtl::OUString const & url):BackendDb(xContext, url) + OUString const & url):BackendDb(xContext, url) { } @@ -67,7 +66,7 @@ OUString ExtensionBackendDb::getKeyElementName() return OUString(KEY_ELEMENT_NAME); } -void ExtensionBackendDb::addEntry(::rtl::OUString const & url, Data const & data) +void ExtensionBackendDb::addEntry(OUString const & url, Data const & data) { try{ //reactive revoked entry if possible. @@ -88,7 +87,7 @@ void ExtensionBackendDb::addEntry(::rtl::OUString const & url, Data const & data } } -ExtensionBackendDb::Data ExtensionBackendDb::getEntry(::rtl::OUString const & url) +ExtensionBackendDb::Data ExtensionBackendDb::getEntry(OUString const & url) { try { diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx index 9cb5b3619da2..da8324219f52 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx @@ -43,10 +43,10 @@ namespace bundle { class ExtensionBackendDb: public dp_registry::backend::BackendDb { protected: - virtual ::rtl::OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getDbNSName(); + virtual OUString getNSPrefix(); + virtual OUString getRootElementName(); + virtual OUString getKeyElementName(); public: struct Data @@ -54,18 +54,18 @@ public: /* every element consists of a pair of the url to the item (jar,rdb, etc) and the media type */ - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString> > items; + ::std::vector< ::std::pair< OUString, OUString> > items; typedef ::std::vector< - ::std::pair< ::rtl::OUString, ::rtl::OUString> >::const_iterator ITC_ITEMS; + ::std::pair< OUString, OUString> >::const_iterator ITC_ITEMS; }; public: ExtensionBackendDb( css::uno::Reference const & xContext, - ::rtl::OUString const & url); + OUString const & url); - void addEntry(::rtl::OUString const & url, Data const & data); + void addEntry(OUString const & url, Data const & data); - Data getEntry(::rtl::OUString const & url); + Data getEntry(OUString const & url); }; diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 201147b79965..1aac891b7462 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -71,7 +71,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_registry { namespace backend { @@ -609,7 +608,7 @@ bool BackendImpl::PackageImpl::checkPlatform( else { ret = false; - rtl::OUString msg( + OUString msg( "unsupported platform"); Any e( css::deployment::PlatformException( @@ -636,7 +635,7 @@ bool BackendImpl::PackageImpl::checkDependencies( if (unsatisfied.getLength() == 0) { return true; } else { - rtl::OUString msg( + OUString msg( "unsatisfied dependencies"); Any e( css::deployment::DependencyException( @@ -897,7 +896,7 @@ void BackendImpl::PackageImpl::processPackage_( } catch (const Exception &) { - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -989,7 +988,7 @@ OUString BackendImpl::PackageImpl::getDescription() } catch ( const css::deployment::DeploymentException& ) { - OSL_FAIL( ::rtl::OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_FAIL( OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -1067,7 +1066,7 @@ void BackendImpl::PackageImpl::exportTo( } erase_path( destURL, xCmdEnv ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "vnd.sun.star.zip://" ); buf.append( ::rtl::Uri::encode( destURL, rtl_UriCharClassRegName, @@ -1119,14 +1118,14 @@ void BackendImpl::PackageImpl::exportTo( } // xxx todo: think about exception specs: catch (const deployment::DeploymentException &) { - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } catch (const lang::IllegalArgumentException & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1528,7 +1527,7 @@ void BackendImpl::PackageImpl::scanBundle( { // patch description: ::rtl::ByteSequence bytes( readFile( descrFileContent ) ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if ( bytes.getLength() ) { buf.append( OUString( reinterpret_cast( diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx index b296f29c774f..42d917a3eb78 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.cxx +++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx @@ -35,7 +35,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h index 53696cf5b11a..57b15f66885c 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.h +++ b/desktop/source/deployment/registry/script/dp_lib_container.h @@ -43,8 +43,8 @@ namespace script { class LibraryContainer { public: - static ::rtl::OUString get_libname( - ::rtl::OUString const & url, + static OUString get_libname( + OUString const & url, css::uno::Reference const & xCmdEnv, css::uno::Reference const & xContext ); }; diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 9007449774a8..6f2db680a8bb 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -39,7 +39,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx index ccf65f104669..df57bb7bc423 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/script-registry/2010" #define NS_PREFIX "script" @@ -41,7 +40,7 @@ namespace script { ScriptBackendDb::ScriptBackendDb( Reference const & xContext, - ::rtl::OUString const & url):RegisteredDb(xContext, url) + OUString const & url):RegisteredDb(xContext, url) { } diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index 37266ef54e71..ab196dbdbe0c 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx @@ -40,19 +40,19 @@ namespace script { class ScriptBackendDb: public dp_registry::backend::RegisteredDb { protected: - virtual ::rtl::OUString getDbNSName(); + virtual OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); + virtual OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); + virtual OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getKeyElementName(); public: ScriptBackendDb( css::uno::Reference const & xContext, - ::rtl::OUString const & url); + OUString const & url); }; diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx index dc09f6e52c1f..6e907f3df4a3 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_registry { diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index 34f9a4d52ffe..f1339b888420 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -40,11 +40,11 @@ class ParcelDescDocHandler : public t_DocHandlerImpl { private: bool m_bIsParsed; - ::rtl::OUString m_sLang; + OUString m_sLang; sal_Int32 skipIndex; public: ParcelDescDocHandler():m_bIsParsed( false ), skipIndex( 0 ){} - ::rtl::OUString getParcelLanguage() { return m_sLang; } + OUString getParcelLanguage() { return m_sLang; } bool isParsed() { return m_bIsParsed; } // XDocumentHandler virtual void SAL_CALL startDocument() @@ -53,22 +53,22 @@ public: virtual void SAL_CALL endDocument() throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, + virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL endElement( const ::rtl::OUString & aName ) + virtual void SAL_CALL endElement( const OUString & aName ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL characters( const ::rtl::OUString & aChars ) + virtual void SAL_CALL characters( const OUString & aChars ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString & aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); virtual void SAL_CALL processingInstruction( - const ::rtl::OUString & aTarget, const ::rtl::OUString & aData ) + const OUString & aTarget, const OUString & aData ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator( diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 534face1a1d8..5c8b97d79021 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::script; -using ::rtl::OUString; namespace dp_registry { diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 919d81f81682..d564c8c8e2ae 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -87,7 +87,7 @@ aBasicErrorFunc( const OUString &rErr, const OUString &rAction ) } static void -initialize_uno( const rtl::OUString &aAppURL ) +initialize_uno( const OUString &aAppURL ) { rtl::Bootstrap::setIniFilename( aAppURL + "/fundamentalrc" ); @@ -108,7 +108,7 @@ initialize_uno( const rtl::OUString &aAppURL ) // set UserInstallation to user profile dir in test/user-template // rtl::Bootstrap aDefaultVars; -// aDefaultVars.set(rtl::OUString("UserInstallation"), aAppURL + "../registry" ); +// aDefaultVars.set(OUString("UserInstallation"), aAppURL + "../registry" ); // configmgr setup ? } diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index cc4eb29f9463..9e9ba16d04a6 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -70,8 +70,6 @@ using namespace com::sun::star::container; using com::sun::star::uno::Exception; using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OString; namespace desktop { @@ -79,9 +77,9 @@ static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer"; static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; -::rtl::OUString retrieveLabelFromCommand(const ::rtl::OUString& sCommand, const ::rtl::OUString& sModuleIdentifier) +OUString retrieveLabelFromCommand(const OUString& sCommand, const OUString& sModuleIdentifier) { - ::rtl::OUString sLabel; + OUString sLabel; uno::Reference< container::XNameAccess > xUICommands; uno::Reference< container::XNameAccess > const xNameAccess( @@ -92,7 +90,7 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; { if ( !sCommand.isEmpty() ) { - rtl::OUString aStr; + OUString aStr; ::uno::Sequence< beans::PropertyValue > aPropSeq; try { @@ -125,9 +123,9 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; return sLabel; } -::rtl::OUString mapModuleShortNameToIdentifier(const ::rtl::OUString& sShortName) +OUString mapModuleShortNameToIdentifier(const OUString& sShortName) { - ::rtl::OUString sIdentifier; + OUString sIdentifier; if ( sShortName == "StartModule" ) sIdentifier = "com.sun.star.frame.StartModule"; @@ -173,13 +171,13 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; bool MigrationImpl::alreadyMigrated() { - rtl::OUString MIGRATION_STAMP_NAME("/MIGRATED4"); - rtl::OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME; + OUString MIGRATION_STAMP_NAME("/MIGRATED4"); + OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME; File aFile(aStr); // create migration stamp, and/or check its existence bool bRet = aFile.open (osl_File_OpenFlag_Write | osl_File_OpenFlag_Create | osl_File_OpenFlag_NoLock) == FileBase::E_EXIST; OSL_TRACE( "File '%s' exists? %d\n", - rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US).getStr(), bRet ); return bRet; } @@ -252,16 +250,16 @@ sal_Bool MigrationImpl::doMigration() copyFiles(); - const ::rtl::OUString sMenubarResourceURL("private:resource/menubar/menubar"); - const ::rtl::OUString sToolbarResourcePre("private:resource/toolbar/"); + const OUString sMenubarResourceURL("private:resource/menubar/menubar"); + const OUString sToolbarResourcePre("private:resource/toolbar/"); for (sal_uInt32 i=0; i lArgs(2); - ::rtl::OUString aOldCfgDataPath = m_aInfo.userdata + ::rtl::OUString("/user/config/soffice.cfg/modules/"); + OUString aOldCfgDataPath = m_aInfo.userdata + OUString("/user/config/soffice.cfg/modules/"); lArgs[0] <<= aOldCfgDataPath + vModulesInfo[i].sModuleShortName; lArgs[1] <<= embed::ElementModes::READ; @@ -282,7 +280,7 @@ sal_Bool MigrationImpl::doMigration() { uno::Reference< container::XIndexContainer > xOldVersionMenuSettings = uno::Reference< container::XIndexContainer >(xOldCfgManager->getSettings(sMenubarResourceURL, sal_True), uno::UNO_QUERY); uno::Reference< container::XIndexContainer > xNewVersionMenuSettings = aNewVersionUIInfo.getNewMenubarSettings(vModulesInfo[i].sModuleShortName); - ::rtl::OUString sParent; + OUString sParent; compareOldAndNewConfig(sParent, xOldVersionMenuSettings, xNewVersionMenuSettings, sMenubarResourceURL); mergeOldToNewVersion(xCfgManager, xNewVersionMenuSettings, sModuleIdentifier, sMenubarResourceURL); } @@ -292,12 +290,12 @@ sal_Bool MigrationImpl::doMigration() { for (sal_Int32 j=0; j xOldVersionToolbarSettings = uno::Reference< container::XIndexContainer >(xOldCfgManager->getSettings(sToolbarResourceURL, sal_True), uno::UNO_QUERY); uno::Reference< container::XIndexContainer > xNewVersionToolbarSettings = aNewVersionUIInfo.getNewToolbarSettings(vModulesInfo[i].sModuleShortName, sToolbarName); - ::rtl::OUString sParent; + OUString sParent; compareOldAndNewConfig(sParent, xOldVersionToolbarSettings, xNewVersionToolbarSettings, sToolbarResourceURL); mergeOldToNewVersion(xCfgManager, xNewVersionToolbarSettings, sModuleIdentifier, sToolbarResourceURL); } @@ -418,13 +416,13 @@ bool MigrationImpl::readAvailableMigrations(migrations_available& rAvailableMigr aSupportedMigration.supported_versions.push_back(seqVersions[j].trim()); insertSorted( rAvailableMigrations, aSupportedMigration ); OSL_TRACE( " available migration '%s'\n", - rtl::OUStringToOString( aSupportedMigration.name, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OUStringToOString( aSupportedMigration.name, RTL_TEXTENCODING_ASCII_US ).getStr() ); } return true; } -migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigrationName) +migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName) { // get migration access uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW); @@ -447,7 +445,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio tmpStep.name = seqMigrations[i]; // read included files from current step description - ::rtl::OUString aSeqEntry; + OUString aSeqEntry; if (tmpAccess->getByName("IncludedFiles") >>= tmpSeq) { for (sal_Int32 j=0; j includedPaths; - std::set< rtl::OUString > excludedPaths; + std::set< OUString > includedPaths; + std::set< OUString > excludedPaths; }; -typedef std::map< rtl::OUString, componentParts > Components; +typedef std::map< OUString, componentParts > Components; -bool getComponent(rtl::OUString const & path, rtl::OUString * component) { +bool getComponent(OUString const & path, OUString * component) { OSL_ASSERT(component != 0); if (path.isEmpty() || path[0] != '/') { OSL_TRACE( ("configuration migration in/exclude path %s ignored (does not" " start with slash)"), - rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr()); return false; } sal_Int32 i = path.indexOf('/', 1); @@ -764,14 +762,14 @@ bool getComponent(rtl::OUString const & path, rtl::OUString * component) { return true; } -uno::Sequence< rtl::OUString > setToSeq(std::set< rtl::OUString > const & set) { - std::set< rtl::OUString >::size_type n = set.size(); +uno::Sequence< OUString > setToSeq(std::set< OUString > const & set) { + std::set< OUString >::size_type n = set.size(); if (n > SAL_MAX_INT32) { throw std::bad_alloc(); } - uno::Sequence< rtl::OUString > seq(static_cast< sal_Int32 >(n)); + uno::Sequence< OUString > seq(static_cast< sal_Int32 >(n)); sal_Int32 i = 0; - for (std::set< rtl::OUString >::const_iterator j(set.begin()); + for (std::set< OUString >::const_iterator j(set.begin()); j != set.end(); ++j) { seq[i++] = *j; @@ -789,7 +787,7 @@ void MigrationImpl::copyConfig() { for (strings_v::const_iterator j(i->includeConfig.begin()); j != i->includeConfig.end(); ++j) { - rtl::OUString comp; + OUString comp; if (getComponent(*j, &comp)) { comps[comp].includedPaths.insert(*j); } @@ -797,7 +795,7 @@ void MigrationImpl::copyConfig() { for (strings_v::const_iterator j(i->excludeConfig.begin()); j != i->excludeConfig.end(); ++j) { - rtl::OUString comp; + OUString comp; if (getComponent(*j, &comp)) { comps[comp].excludedPaths.insert(*j); } @@ -806,7 +804,7 @@ void MigrationImpl::copyConfig() { // check if the shared registrymodifications.xcu file exists bool bRegistryModificationsXcuExists = false; - rtl::OUString regFilePath(m_aInfo.userdata); + OUString regFilePath(m_aInfo.userdata); regFilePath += "/user/registrymodifications.xcu"; File regFile(regFilePath); ::osl::FileBase::RC nError = regFile.open(osl_File_OpenFlag_Read); @@ -821,12 +819,12 @@ void MigrationImpl::copyConfig() { // shared registrymodifications.xcu does not exists // the configuration is split in many registry files // determine the file names from the first element in included paths - rtl::OUStringBuffer buf(m_aInfo.userdata); + OUStringBuffer buf(m_aInfo.userdata); buf.appendAscii("/user/registry/data"); sal_Int32 n = 0; do { - rtl::OUString seg(i->first.getToken(0, '.', n)); - rtl::OUString enc( + OUString seg(i->first.getToken(0, '.', n)); + OUString enc( rtl::Uri::encode( seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict, RTL_TEXTENCODING_UTF8)); @@ -834,7 +832,7 @@ void MigrationImpl::copyConfig() { OSL_TRACE( ("configuration migration component %s ignored (cannot" " be encoded as file path)"), - rtl::OUStringToOString( + OUStringToOString( i->first, RTL_TEXTENCODING_UTF8).getStr()); goto next; } @@ -853,7 +851,7 @@ void MigrationImpl::copyConfig() { OSL_TRACE( ("configuration migration component %s ignored (only excludes," " no includes)"), - rtl::OUStringToOString( + OUStringToOString( i->first, RTL_TEXTENCODING_UTF8).getStr()); } next:; @@ -959,10 +957,10 @@ void MigrationImpl::runServices() try { // set black list for extension migration - uno::Sequence< rtl::OUString > seqExtBlackList; + uno::Sequence< OUString > seqExtBlackList; sal_uInt32 nSize = i_mig->excludeExtensions.size(); if ( nSize > 0 ) - seqExtBlackList = comphelper::arrayToSequence< ::rtl::OUString >( + seqExtBlackList = comphelper::arrayToSequence< OUString >( &i_mig->excludeExtensions[0], nSize ); seqArguments[2] = uno::makeAny(NamedValue("ExtensionBlackList", uno::makeAny( seqExtBlackList ))); @@ -998,8 +996,8 @@ void MigrationImpl::runServices() ::std::vector< MigrationModuleInfo > MigrationImpl::dectectUIChangesForAllModules() const { ::std::vector< MigrationModuleInfo > vModulesInfo; - const ::rtl::OUString MENUBAR("menubar"); - const ::rtl::OUString TOOLBAR("toolbar"); + const OUString MENUBAR("menubar"); + const OUString TOOLBAR("toolbar"); uno::Sequence< uno::Any > lArgs(2); lArgs[0] <<= m_aInfo.userdata + "/user/config/soffice.cfg/modules"; @@ -1014,11 +1012,11 @@ void MigrationImpl::runServices() return vModulesInfo; uno::Reference< container::XNameAccess > xAccess = uno::Reference< container::XNameAccess >(xModules, uno::UNO_QUERY); - uno::Sequence< ::rtl::OUString > lNames = xAccess->getElementNames(); + uno::Sequence< OUString > lNames = xAccess->getElementNames(); sal_Int32 nLength = lNames.getLength(); for (sal_Int32 i=0; i xModule = xModules->openStorageElement(sModuleShortName, embed::ElementModes::READ); if (xModule.is()) { @@ -1038,14 +1036,14 @@ void MigrationImpl::runServices() uno::Reference< embed::XStorage > xToolbar = xModule->openStorageElement(TOOLBAR, embed::ElementModes::READ); if (xToolbar.is()) { - const ::rtl::OUString RESOURCEURL_CUSTOM_ELEMENT("custom_"); + const OUString RESOURCEURL_CUSTOM_ELEMENT("custom_"); sal_Int32 nCustomLen = 7; uno::Reference< container::XNameAccess > xNameAccess = uno::Reference< container::XNameAccess >(xToolbar, uno::UNO_QUERY); - ::uno::Sequence< ::rtl::OUString > lToolbars = xNameAccess->getElementNames(); + ::uno::Sequence< OUString > lToolbars = xNameAccess->getElementNames(); for (sal_Int32 j=0; j=nCustomLen && sToolbarName.copy(0, nCustomLen).equals(RESOURCEURL_CUSTOM_ELEMENT)) continue; @@ -1054,8 +1052,8 @@ void MigrationImpl::runServices() sal_Int32 nIndex = sToolbarName.lastIndexOf('.'); if (nIndex > 0) { - ::rtl::OUString sExtension(sToolbarName.copy(nIndex)); - ::rtl::OUString sToolbarResourceName(sToolbarName.copy(0, nIndex)); + OUString sExtension(sToolbarName.copy(nIndex)); + OUString sToolbarResourceName(sToolbarName.copy(0, nIndex)); if (!sToolbarResourceName.isEmpty() && sExtension.equalsAsciiL(".xml", 4)) aModuleInfo.m_vToolbars.push_back(sToolbarResourceName); } @@ -1070,12 +1068,12 @@ void MigrationImpl::runServices() return vModulesInfo; } -void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, +void MigrationImpl::compareOldAndNewConfig(const OUString& sParent, const uno::Reference< container::XIndexContainer >& xIndexOld, const uno::Reference< container::XIndexContainer >& xIndexNew, - const ::rtl::OUString& sResourceURL) + const OUString& sResourceURL) { - const ::rtl::OUString MENU_SEPERATOR(" | "); + const OUString MENU_SEPERATOR(" | "); ::std::vector< MigrationItem > vOldItems; ::std::vector< MigrationItem > vNewItems; @@ -1121,13 +1119,13 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, ::std::vector< MigrationItem >::iterator it; - ::rtl::OUString sSibling; + OUString sSibling; for (it = vOldItems.begin(); it!=vOldItems.end(); ++it) { ::std::vector< MigrationItem >::iterator pFound = ::std::find(vNewItems.begin(), vNewItems.end(), *it); if (pFound != vNewItems.end() && it->m_xPopupMenu.is()) { - ::rtl::OUString sName; + OUString sName; if (!sParent.isEmpty()) sName = sParent + MENU_SEPERATOR + it->m_sCommandURL; else @@ -1159,7 +1157,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, ::std::vector< MigrationItem >::iterator pFound = ::std::find(vOldItems.begin(), vOldItems.end(), *it); if (pFound != vOldItems.end() && it->m_xPopupMenu.is()) { - ::rtl::OUString sName; + OUString sName; if (!sParent.isEmpty()) sName = sParent + MENU_SEPERATOR + it->m_sCommandURL; else @@ -1186,8 +1184,8 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurationManager >& xCfgManager, const uno::Reference< container::XIndexContainer>& xIndexContainer, - const ::rtl::OUString& sModuleIdentifier, - const ::rtl::OUString& sResourceURL) + const OUString& sModuleIdentifier, + const OUString& sResourceURL) { MigrationHashMap::iterator pFound = m_aOldVersionItemsHashMap.find(sResourceURL); if (pFound==m_aOldVersionItemsHashMap.end()) @@ -1198,26 +1196,26 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat { uno::Reference< container::XIndexContainer > xTemp = xIndexContainer; - ::rtl::OUString sParentNodeName = it->m_sParentNodeName; + OUString sParentNodeName = it->m_sParentNodeName; sal_Int32 nIndex = 0; do { - ::rtl::OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim(); + OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim(); if (sToken.isEmpty()) break; sal_Int32 nCount = xTemp->getCount(); for (sal_Int32 i=0; i xChild; uno::Sequence< beans::PropertyValue > aPropSeq; xTemp->getByIndex(i) >>= aPropSeq; for (sal_Int32 j=0; j>= sCommandURL; else if ( sPropName == ITEM_DESCRIPTOR_LABEL ) @@ -1239,11 +1237,11 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat { uno::Sequence< beans::PropertyValue > aPropSeq(3); - aPropSeq[0].Name = rtl::OUString(ITEM_DESCRIPTOR_COMMANDURL); + aPropSeq[0].Name = OUString(ITEM_DESCRIPTOR_COMMANDURL); aPropSeq[0].Value <<= it->m_sCommandURL; - aPropSeq[1].Name = rtl::OUString(ITEM_DESCRIPTOR_LABEL); + aPropSeq[1].Name = OUString(ITEM_DESCRIPTOR_LABEL); aPropSeq[1].Value <<= retrieveLabelFromCommand(it->m_sCommandURL, sModuleIdentifier); - aPropSeq[2].Name = rtl::OUString(ITEM_DESCRIPTOR_CONTAINER); + aPropSeq[2].Name = OUString(ITEM_DESCRIPTOR_CONTAINER); aPropSeq[2].Value <<= it->m_xPopupMenu; if (it->m_sPrevSibling.isEmpty()) @@ -1254,7 +1252,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat sal_Int32 i = 0; for (; i aTempPropSeq; xTemp->getByIndex(i) >>= aTempPropSeq; for (sal_Int32 j=0; jstore(); } -uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager(const ::rtl::OUString& sModuleShortName) const +uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager(const OUString& sModuleShortName) const { uno::Reference< ui::XUIConfigurationManager > xCfgManager; @@ -1300,7 +1298,7 @@ uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager return xCfgManager; } -uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSettings(const ::rtl::OUString& sModuleShortName) const +uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSettings(const OUString& sModuleShortName) const { uno::Reference< container::XIndexContainer > xNewMenuSettings; @@ -1316,7 +1314,7 @@ uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSett return xNewMenuSettings; } -uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewToolbarSettings(const ::rtl::OUString& sModuleShortName, const ::rtl::OUString& sToolbarName) const +uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewToolbarSettings(const OUString& sModuleShortName, const OUString& sToolbarName) const { uno::Reference< container::XIndexContainer > xNewToolbarSettings; @@ -1348,14 +1346,14 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules m_lNewVersionMenubarSettingsSeq.realloc(vModulesInfo.size()); m_lNewVersionToolbarSettingsSeq.realloc(vModulesInfo.size()); - const ::rtl::OUString sMenubarResourceURL("private:resource/menubar/menubar"); - const ::rtl::OUString sToolbarResourcePre("private:resource/toolbar/"); + const OUString sMenubarResourceURL("private:resource/menubar/menubar"); + const OUString sToolbarResourcePre("private:resource/toolbar/"); uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier = ui::ModuleUIConfigurationManagerSupplier::create( ::comphelper::getProcessComponentContext() ); for (sal_uInt32 i=0; i xCfgManager = xModuleCfgSupplier->getUIConfigurationManager(sModuleIdentifier); @@ -1374,8 +1372,8 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules uno::Sequence< beans::PropertyValue > lPropSeq(nToolbars); for (sal_Int32 j=0; jgetSettings(sToolbarResourceURL, sal_True); diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index 714a7e485ce5..a92de8546f02 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -46,28 +46,28 @@ namespace desktop struct install_info { - rtl::OUString productname; // human readeable product name - rtl::OUString userdata; // file: url for user installation + OUString productname; // human readeable product name + OUString userdata; // file: url for user installation }; -typedef std::vector< rtl::OUString > strings_v; +typedef std::vector< OUString > strings_v; typedef std::auto_ptr< strings_v > strings_vr; struct migration_step { - rtl::OUString name; + OUString name; strings_v includeFiles; strings_v excludeFiles; strings_v includeConfig; strings_v excludeConfig; strings_v includeExtensions; strings_v excludeExtensions; - rtl::OUString service; + OUString service; }; struct supported_migration { - rtl::OUString name; + OUString name; sal_Int32 nPriority; strings_v supported_versions; }; @@ -83,9 +83,9 @@ typedef std::vector< supported_migration > migrations_available; */ struct MigrationItem { - ::rtl::OUString m_sParentNodeName; - ::rtl::OUString m_sPrevSibling; - ::rtl::OUString m_sCommandURL; + OUString m_sParentNodeName; + OUString m_sPrevSibling; + OUString m_sCommandURL; css::uno::Reference< css::container::XIndexContainer > m_xPopupMenu; MigrationItem() @@ -93,9 +93,9 @@ struct MigrationItem { } - MigrationItem(const ::rtl::OUString& sParentNodeName, - const ::rtl::OUString& sPrevSibling, - const ::rtl::OUString& sCommandURL, + MigrationItem(const OUString& sParentNodeName, + const OUString& sPrevSibling, + const OUString& sCommandURL, const css::uno::Reference< css::container::XIndexContainer > xPopupMenu) { m_sParentNodeName = sParentNodeName; @@ -122,22 +122,22 @@ struct MigrationItem aMigrationItem.m_xPopupMenu.is() == m_xPopupMenu.is() ); } - ::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; } + OUString GetPrevSibling() const { return m_sPrevSibling; } }; -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, ::std::vector< MigrationItem >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > MigrationHashMap; + OUStringHash, + ::std::equal_to< OUString > > MigrationHashMap; struct MigrationItemInfo { - ::rtl::OUString m_sResourceURL; + OUString m_sResourceURL; MigrationItem m_aMigrationItem; MigrationItemInfo(){} - MigrationItemInfo(const ::rtl::OUString& sResourceURL, const MigrationItem& aMigrationItem) + MigrationItemInfo(const OUString& sResourceURL, const MigrationItem& aMigrationItem) : m_sResourceURL(sResourceURL), m_aMigrationItem(aMigrationItem) { } @@ -149,9 +149,9 @@ struct MigrationItemInfo */ struct MigrationModuleInfo { - ::rtl::OUString sModuleShortName; + OUString sModuleShortName; sal_Bool bHasMenubar; - ::std::vector< ::rtl::OUString > m_vToolbars; + ::std::vector< OUString > m_vToolbars; MigrationModuleInfo():bHasMenubar(sal_False){}; }; @@ -164,9 +164,9 @@ class NewVersionUIInfo { public: - css::uno::Reference< css::ui::XUIConfigurationManager > getConfigManager(const ::rtl::OUString& sModuleShortName) const; - css::uno::Reference< css::container::XIndexContainer > getNewMenubarSettings(const ::rtl::OUString& sModuleShortName) const; - css::uno::Reference< css::container::XIndexContainer > getNewToolbarSettings(const ::rtl::OUString& sModuleShortName, const ::rtl::OUString& sToolbarName) const; + css::uno::Reference< css::ui::XUIConfigurationManager > getConfigManager(const OUString& sModuleShortName) const; + css::uno::Reference< css::container::XIndexContainer > getNewMenubarSettings(const OUString& sModuleShortName) const; + css::uno::Reference< css::container::XIndexContainer > getNewToolbarSettings(const OUString& sModuleShortName, const OUString& sToolbarName) const; void init(const ::std::vector< MigrationModuleInfo >& vModulesInfo); private: @@ -188,12 +188,12 @@ private: strings_vr m_vrFileList; // final list of files to be copied MigrationHashMap m_aOldVersionItemsHashMap; MigrationHashMap m_aNewVersionItemsHashMap; - ::rtl::OUString m_sModuleIdentifier; + OUString m_sModuleIdentifier; // functions to control the migration process bool readAvailableMigrations(migrations_available&); bool alreadyMigrated(); - migrations_vr readMigrationSteps(const ::rtl::OUString& rMigrationName); + migrations_vr readMigrationSteps(const OUString& rMigrationName); sal_Int32 findPreferedMigrationProcess(const migrations_available&); #if defined UNX && ! defined MACOSX OUString preXDGConfigDir(const OUString& rConfigDir); @@ -203,19 +203,19 @@ private: strings_vr compileFileList(); // helpers - strings_vr getAllFiles(const rtl::OUString& baseURL) const; + strings_vr getAllFiles(const OUString& baseURL) const; strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const; css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, sal_Bool rw=sal_False); ::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const; - void compareOldAndNewConfig(const ::rtl::OUString& sParentNodeName, + void compareOldAndNewConfig(const OUString& sParentNodeName, const css::uno::Reference< css::container::XIndexContainer >& xOldIndexContainer, const css::uno::Reference< css::container::XIndexContainer >& xNewIndexContainer, - const ::rtl::OUString& sToolbarName); + const OUString& sToolbarName); void mergeOldToNewVersion(const css::uno::Reference< css::ui::XUIConfigurationManager >& xCfgManager, const css::uno::Reference< css::container::XIndexContainer>& xIndexContainer, - const ::rtl::OUString& sModuleIdentifier, - const ::rtl::OUString& sResourceURL); + const OUString& sModuleIdentifier, + const OUString& sResourceURL); // actual processing function that perform the migration steps void copyFiles(); @@ -231,7 +231,7 @@ public: ~MigrationImpl(); bool initializeMigration(); sal_Bool doMigration(); - rtl::OUString getOldVersionName(); + OUString getOldVersionName(); }; } diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index 99bbe7687da0..c35a167e8a94 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -33,23 +33,23 @@ namespace migration //......................................................................... - #define sSourceUserBasic ::rtl::OUString( "/user/basic" ) - #define sTargetUserBasic ::rtl::OUString( "/user/__basic_80" ) + #define sSourceUserBasic OUString( "/user/basic" ) + #define sTargetUserBasic OUString( "/user/__basic_80" ) // ============================================================================= // component operations // ============================================================================= - ::rtl::OUString BasicMigration_getImplementationName() + OUString BasicMigration_getImplementationName() { - return ::rtl::OUString("com.sun.star.comp.desktop.migration.Basic"); + return OUString("com.sun.star.comp.desktop.migration.Basic"); } // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > BasicMigration_getSupportedServiceNames() + Sequence< OUString > BasicMigration_getSupportedServiceNames() { - Sequence< ::rtl::OUString > aNames(1); + Sequence< OUString > aNames(1); aNames.getArray()[0] = "com.sun.star.migration.Basic"; return aNames; } @@ -70,7 +70,7 @@ namespace migration // ----------------------------------------------------------------------------- - TStringVectorPtr BasicMigration::getFiles( const ::rtl::OUString& rBaseURL ) const + TStringVectorPtr BasicMigration::getFiles( const OUString& rBaseURL ) const { TStringVectorPtr aResult( new TStringVector ); ::osl::Directory aDir( rBaseURL); @@ -127,7 +127,7 @@ namespace migration void BasicMigration::copyFiles() { - ::rtl::OUString sTargetDir; + OUString sTargetDir; ::utl::Bootstrap::PathStatus aStatus = ::utl::Bootstrap::locateUserInstallation( sTargetDir ); if ( aStatus == ::utl::Bootstrap::PATH_EXISTS ) { @@ -136,17 +136,17 @@ namespace migration TStringVector::const_iterator aI = aFileList->begin(); while ( aI != aFileList->end() ) { - ::rtl::OUString sLocalName = aI->copy( m_sSourceDir.getLength() ); - ::rtl::OUString sTargetName = sTargetDir + sLocalName; + OUString sLocalName = aI->copy( m_sSourceDir.getLength() ); + OUString sTargetName = sTargetDir + sLocalName; INetURLObject aURL( sTargetName ); aURL.removeSegment(); checkAndCreateDirectory( aURL ); ::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName ); if ( aResult != ::osl::FileBase::E_None ) { - ::rtl::OString aMsg( "BasicMigration::copyFiles: cannot copy " ); - aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " - + ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); + OString aMsg( "BasicMigration::copyFiles: cannot copy " ); + aMsg += OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " + + OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); OSL_FAIL( aMsg.getStr() ); } ++aI; @@ -162,7 +162,7 @@ namespace migration // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString BasicMigration::getImplementationName() throw (RuntimeException) + OUString BasicMigration::getImplementationName() throw (RuntimeException) { return BasicMigration_getImplementationName(); } @@ -177,7 +177,7 @@ namespace migration // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException) { return BasicMigration_getSupportedServiceNames(); } diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index cf7e4ddf1985..56f3c7130008 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -38,8 +38,8 @@ namespace migration { //......................................................................... - ::rtl::OUString SAL_CALL BasicMigration_getImplementationName(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL BasicMigration_getSupportedServiceNames(); + OUString SAL_CALL BasicMigration_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL BasicMigration_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL BasicMigration_create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext ) SAL_THROW( (::com::sun::star::uno::Exception) ); @@ -58,9 +58,9 @@ namespace migration { private: ::osl::Mutex m_aMutex; - ::rtl::OUString m_sSourceDir; + OUString m_sSourceDir; - TStringVectorPtr getFiles( const ::rtl::OUString& rBaseURL ) const; + TStringVectorPtr getFiles( const OUString& rBaseURL ) const; ::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL ); void copyFiles(); @@ -69,11 +69,11 @@ namespace migration virtual ~BasicMigration(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XInitialization diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 0cab008bf575..d45012a76742 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -42,7 +42,6 @@ #include #include "osl/thread.hxx" -using ::rtl::OUString; #define SERVICE_NAME "com.sun.star.migration.Java" #define IMPL_NAME "com.sun.star.comp.desktop.migration.Java" @@ -119,7 +118,7 @@ public: ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL overrideNode( - const rtl::OUString& aName, + const OUString& aName, sal_Int16 aAttributes, sal_Bool bClear) throw( @@ -127,14 +126,14 @@ public: ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addOrReplaceNode( - const rtl::OUString& aName, + const OUString& aName, sal_Int16 aAttributes) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addOrReplaceNodeFromTemplate( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::configuration::backend::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) throw( @@ -147,13 +146,13 @@ public: ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL dropNode( - const rtl::OUString& aName ) + const OUString& aName ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL overrideProperty( - const rtl::OUString& aName, + const OUString& aName, sal_Int16 aAttributes, const css::uno::Type& aType, sal_Bool bClear ) @@ -169,7 +168,7 @@ public: virtual void SAL_CALL setPropertyValueForLocale( const css::uno::Any& aValue, - const rtl::OUString& aLocale ) + const OUString& aLocale ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); @@ -180,7 +179,7 @@ public: ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addProperty( - const rtl::OUString& aName, + const OUString& aName, sal_Int16 aAttributes, const css::uno::Type& aType ) throw( @@ -188,7 +187,7 @@ public: ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addPropertyWithValue( - const rtl::OUString& aName, + const OUString& aName, sal_Int16 aAttributes, const css::uno::Any& aValue ) throw( @@ -205,7 +204,7 @@ private: css::uno::Reference< css::configuration::backend::XLayer> m_xLayer; void migrateJavarc(); - typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; + typedef ::std::pair< OUString, sal_Int16> TElementType; typedef ::std::stack< TElementType > TElementStack; TElementStack m_aStack; @@ -352,7 +351,7 @@ void SAL_CALL JavaMigration::endLayer() // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::overrideNode( - const ::rtl::OUString&, + const OUString&, sal_Int16, sal_Bool) throw( @@ -365,7 +364,7 @@ void SAL_CALL JavaMigration::overrideNode( // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::addOrReplaceNode( - const ::rtl::OUString&, + const OUString&, sal_Int16) throw( MalformedDataException, @@ -382,7 +381,7 @@ void SAL_CALL JavaMigration::endNode() // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::dropNode( - const ::rtl::OUString& ) + const OUString& ) throw( MalformedDataException, WrappedTargetException ) @@ -391,7 +390,7 @@ void SAL_CALL JavaMigration::dropNode( // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::overrideProperty( - const ::rtl::OUString& aName, + const OUString& aName, sal_Int16, const Type&, sal_Bool ) @@ -453,7 +452,7 @@ void SAL_CALL JavaMigration::setPropertyValue( void SAL_CALL JavaMigration::setPropertyValueForLocale( const Any&, - const ::rtl::OUString& ) + const OUString& ) throw( MalformedDataException, WrappedTargetException ) @@ -472,7 +471,7 @@ void SAL_CALL JavaMigration::endProperty() // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::addProperty( - const rtl::OUString&, + const OUString&, sal_Int16, const Type& ) throw( @@ -483,7 +482,7 @@ void SAL_CALL JavaMigration::addProperty( // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::addPropertyWithValue( - const rtl::OUString&, + const OUString&, sal_Int16, const Any& ) throw( @@ -493,7 +492,7 @@ void SAL_CALL JavaMigration::addPropertyWithValue( } void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate( - const rtl::OUString&, + const OUString&, const TemplateIdentifier&, sal_Int16 ) throw( diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx index 0cd512e539e5..752d9b3f7264 100644 --- a/desktop/source/migration/services/jvmfwk.hxx +++ b/desktop/source/migration/services/jvmfwk.hxx @@ -32,9 +32,9 @@ namespace migration { -rtl::OUString jvmfwk_getImplementationName(); +OUString jvmfwk_getImplementationName(); -css::uno::Sequence< rtl::OUString > jvmfwk_getSupportedServiceNames(); +css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames(); } //end blind namespace diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx index e538fc3000e4..af69cb969981 100644 --- a/desktop/source/migration/services/misc.hxx +++ b/desktop/source/migration/services/misc.hxx @@ -30,7 +30,7 @@ namespace migration { //......................................................................... - typedef ::std::vector< ::rtl::OUString > TStringVector; + typedef ::std::vector< OUString > TStringVector; typedef ::std::auto_ptr< TStringVector > TStringVectorPtr; //......................................................................... diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 4448ac389da0..75590a806f81 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -49,24 +49,24 @@ using namespace ::com::sun::star::uno; namespace migration { -static ::rtl::OUString sExtensionSubDir( "/user/uno_packages/" ); -static ::rtl::OUString sSubDirName( "cache" ); -static ::rtl::OUString sDescriptionXmlFile( "/description.xml" ); -static ::rtl::OUString sExtensionRootSubDirName( "/uno_packages" ); +static OUString sExtensionSubDir( "/user/uno_packages/" ); +static OUString sSubDirName( "cache" ); +static OUString sDescriptionXmlFile( "/description.xml" ); +static OUString sExtensionRootSubDirName( "/uno_packages" ); // ============================================================================= // component operations // ============================================================================= -::rtl::OUString OO3ExtensionMigration_getImplementationName() +OUString OO3ExtensionMigration_getImplementationName() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "com.sun.star.comp.desktop.migration.OOo3Extensions" ); + static OUString aImplName( "com.sun.star.comp.desktop.migration.OOo3Extensions" ); pImplName = &aImplName; } } @@ -75,15 +75,15 @@ static ::rtl::OUString sExtensionRootSubDirName( "/uno_packages" ); // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > OO3ExtensionMigration_getSupportedServiceNames() +Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames() { - static Sequence< ::rtl::OUString >* pNames = 0; + static Sequence< OUString >* pNames = 0; if ( !pNames ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pNames ) { - static Sequence< ::rtl::OUString > aNames(1); + static Sequence< OUString > aNames(1); aNames.getArray()[0] = "com.sun.star.migration.Extensions"; pNames = &aNames; } @@ -122,7 +122,7 @@ OO3ExtensionMigration::~OO3ExtensionMigration() } } -void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions ) +void OO3ExtensionMigration::scanUserExtensions( const OUString& sSourceDir, TStringVector& aMigrateExtensions ) { osl::Directory aScanRootDir( sSourceDir ); osl::FileStatus fs(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL); @@ -137,7 +137,7 @@ void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDi ( fs.getFileType() == osl::FileStatus::Directory )) { //Check next folder as the "real" extension folder is below a temp folder! - ::rtl::OUString sExtensionFolderURL = fs.getFileURL(); + OUString sExtensionFolderURL = fs.getFileURL(); osl::Directory aExtensionRootDir( sExtensionFolderURL ); @@ -165,7 +165,7 @@ void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDi } } -OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( const ::rtl::OUString& sExtFolder ) +OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( const OUString& sExtFolder ) { ScanResult aResult = SCANRESULT_NOTFOUND; osl::Directory aDir(sExtFolder); @@ -182,7 +182,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co { if (item.getFileStatus(fs) == osl::FileBase::E_None) { - ::rtl::OUString aDirEntryURL; + OUString aDirEntryURL; if (fs.getFileType() == osl::FileStatus::Directory) aDirectories.push_back( fs.getFileURL() ); else @@ -204,7 +204,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co return aResult; } -bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescriptionXmlURL ) +bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlURL ) { if ( !m_xDocBuilder.is() ) { @@ -216,7 +216,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript m_xSimpleFileAccess = ucb::SimpleFileAccess::create(m_ctx); } - ::rtl::OUString aExtIdentifier; + OUString aExtIdentifier; try { uno::Reference< io::XInputStream > xIn = @@ -297,7 +297,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript return true; } -void OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir ) +void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir ) { css::uno::Reference< css::deployment::XExtensionManager > extMgr( deployment::ExtensionManager::get( m_ctx ) ); @@ -326,7 +326,7 @@ void OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir // XServiceInfo // ----------------------------------------------------------------------------- -::rtl::OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException) +OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException) { return OO3ExtensionMigration_getImplementationName(); } @@ -341,7 +341,7 @@ sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName) // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException) { return OO3ExtensionMigration_getSupportedServiceNames(); } @@ -369,11 +369,11 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) thro } else if ( aValue.Name == "ExtensionBlackList" ) { - Sequence< ::rtl::OUString > aBlackList; + Sequence< OUString > aBlackList; if ( (aValue.Value >>= aBlackList ) && ( aBlackList.getLength() > 0 )) { m_aBlackList.resize( aBlackList.getLength() ); - ::comphelper::sequenceToArray< ::rtl::OUString >( &m_aBlackList[0], aBlackList ); + ::comphelper::sequenceToArray< OUString >( &m_aBlackList[0], aBlackList ); } } } @@ -388,7 +388,7 @@ Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& ) if ( aStatus == ::utl::Bootstrap::PATH_EXISTS ) { // copy all extensions - ::rtl::OUString sSourceDir( m_sSourceDir ); + OUString sSourceDir( m_sSourceDir ); sSourceDir += sExtensionSubDir; sSourceDir += sSubDirName; sSourceDir += sExtensionRootSubDirName; diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index 96a8b2290443..bcbc90638cf4 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -47,8 +47,8 @@ class INetURLObject; namespace migration { - ::rtl::OUString SAL_CALL OO3ExtensionMigration_getImplementationName(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames(); + OUString SAL_CALL OO3ExtensionMigration_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OO3ExtensionMigration_create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext ) SAL_THROW( (::com::sun::star::uno::Exception) ); @@ -70,8 +70,8 @@ namespace migration ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XDocumentBuilder > m_xDocBuilder; ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > m_xSimpleFileAccess; ::osl::Mutex m_aMutex; - ::rtl::OUString m_sSourceDir; - ::rtl::OUString m_sTargetDir; + OUString m_sSourceDir; + OUString m_sTargetDir; TStringVector m_aBlackList; enum ScanResult @@ -82,10 +82,10 @@ namespace migration }; ::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL ); - ScanResult scanExtensionFolder( const ::rtl::OUString& sExtFolder ); - void scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions ); - bool scanDescriptionXml( const ::rtl::OUString& sDescriptionXmlFilePath ); - void migrateExtension( const ::rtl::OUString& sSourceDir ); + ScanResult scanExtensionFolder( const OUString& sExtFolder ); + void scanUserExtensions( const OUString& sSourceDir, TStringVector& aMigrateExtensions ); + bool scanDescriptionXml( const OUString& sDescriptionXmlFilePath ); + void migrateExtension( const OUString& sSourceDir ); public: OO3ExtensionMigration(::com::sun::star::uno::Reference< @@ -93,11 +93,11 @@ namespace migration virtual ~OO3ExtensionMigration(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XInitialization diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 717d6ac257e6..fd3a33511a68 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -33,23 +33,23 @@ namespace migration //......................................................................... - static ::rtl::OUString sSourceSubDir( "/user/wordbook" ); - static ::rtl::OUString sTargetSubDir( "/user/wordbook" ); + static OUString sSourceSubDir( "/user/wordbook" ); + static OUString sTargetSubDir( "/user/wordbook" ); // ============================================================================= // component operations // ============================================================================= - ::rtl::OUString WordbookMigration_getImplementationName() + OUString WordbookMigration_getImplementationName() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "com.sun.star.comp.desktop.migration.Wordbooks" ); + static OUString aImplName( "com.sun.star.comp.desktop.migration.Wordbooks" ); pImplName = &aImplName; } } @@ -58,16 +58,16 @@ namespace migration // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > WordbookMigration_getSupportedServiceNames() + Sequence< OUString > WordbookMigration_getSupportedServiceNames() { - static Sequence< ::rtl::OUString >* pNames = 0; + static Sequence< OUString >* pNames = 0; if ( !pNames ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pNames ) { - static Sequence< ::rtl::OUString > aNames(1); - aNames.getArray()[0] = ::rtl::OUString( "com.sun.star.migration.Wordbooks" ); + static Sequence< OUString > aNames(1); + aNames.getArray()[0] = OUString( "com.sun.star.migration.Wordbooks" ); pNames = &aNames; } } @@ -90,7 +90,7 @@ namespace migration // ----------------------------------------------------------------------------- - TStringVectorPtr WordbookMigration::getFiles( const ::rtl::OUString& rBaseURL ) const + TStringVectorPtr WordbookMigration::getFiles( const OUString& rBaseURL ) const { TStringVectorPtr aResult( new TStringVector ); ::osl::Directory aDir( rBaseURL); @@ -144,7 +144,7 @@ namespace migration } #define MAX_HEADER_LENGTH 16 -bool IsUserWordbook( const ::rtl::OUString& rFile ) +bool IsUserWordbook( const OUString& rFile ) { static const sal_Char* pVerStr2 = "WBSWG2"; static const sal_Char* pVerStr5 = "WBSWG5"; @@ -190,7 +190,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) void WordbookMigration::copyFiles() { - ::rtl::OUString sTargetDir; + OUString sTargetDir; ::utl::Bootstrap::PathStatus aStatus = ::utl::Bootstrap::locateUserInstallation( sTargetDir ); if ( aStatus == ::utl::Bootstrap::PATH_EXISTS ) { @@ -201,17 +201,17 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) { if (IsUserWordbook(*aI) ) { - ::rtl::OUString sSourceLocalName = aI->copy( m_sSourceDir.getLength() ); - ::rtl::OUString sTargetName = sTargetDir + sSourceLocalName; + OUString sSourceLocalName = aI->copy( m_sSourceDir.getLength() ); + OUString sTargetName = sTargetDir + sSourceLocalName; INetURLObject aURL( sTargetName ); aURL.removeSegment(); checkAndCreateDirectory( aURL ); ::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName ); if ( aResult != ::osl::FileBase::E_None ) { - ::rtl::OString aMsg( "WordbookMigration::copyFiles: cannot copy " ); - aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " - + ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); + OString aMsg( "WordbookMigration::copyFiles: cannot copy " ); + aMsg += OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " + + OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); OSL_FAIL( aMsg.getStr() ); } } @@ -228,7 +228,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString WordbookMigration::getImplementationName() throw (RuntimeException) + OUString WordbookMigration::getImplementationName() throw (RuntimeException) { return WordbookMigration_getImplementationName(); } @@ -243,7 +243,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException) { return WordbookMigration_getSupportedServiceNames(); } diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index 9a150c980183..140800931ed8 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -38,8 +38,8 @@ namespace migration { //......................................................................... - ::rtl::OUString SAL_CALL WordbookMigration_getImplementationName(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WordbookMigration_getSupportedServiceNames(); + OUString SAL_CALL WordbookMigration_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL WordbookMigration_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL WordbookMigration_create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext ) SAL_THROW( (::com::sun::star::uno::Exception) ); @@ -58,9 +58,9 @@ namespace migration { private: ::osl::Mutex m_aMutex; - ::rtl::OUString m_sSourceDir; + OUString m_sSourceDir; - TStringVectorPtr getFiles( const ::rtl::OUString& rBaseURL ) const; + TStringVectorPtr getFiles( const OUString& rBaseURL ) const; ::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL ); void copyFiles(); @@ -69,11 +69,11 @@ namespace migration virtual ~WordbookMigration(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XInitialization diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 2402a889746a..56471ca3aa8c 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -47,7 +47,7 @@ Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory ) // get component context m_rContext = comphelper::getComponentContext(m_rSMgr); m_rAcceptor = Reference< XAcceptor > (m_rSMgr->createInstance( - rtl::OUString("com.sun.star.connection.Acceptor" )), + OUString("com.sun.star.connection.Acceptor" )), UNO_QUERY ); m_rBridgeFactory = BridgeFactory::create(m_rContext); } @@ -114,7 +114,7 @@ void SAL_CALL Acceptor::run() // thus preventing the bridge from being disposed. When the remote end releases // the bridge, it will be destructed. Reference< XBridge > rBridge = m_rBridgeFactory->createBridge( - rtl::OUString() ,m_aProtocol ,rConnection ,rInstanceProvider ); + OUString() ,m_aProtocol ,rConnection ,rInstanceProvider ); osl::MutexGuard g(m_aMutex); m_bridges.add(rBridge); } catch (const Exception& e) { diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 6747419d5368..2cc191bf88d2 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::unopkg; -using ::rtl::OUString; namespace { struct ExtensionName diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 3368f75300bf..430401fc3bc6 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::uno; using namespace ::unopkg; -using ::rtl::OUString; namespace { @@ -130,7 +129,7 @@ CommandEnvironmentImpl::~CommandEnvironmentImpl() } catch (const RuntimeException & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, osl_getThreadTextEncoding() ).getStr() ); } } @@ -348,7 +347,7 @@ void CommandEnvironmentImpl::update_( Any const & Status ) return; } else { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "WARNING: " ); deployment::DeploymentException dp_exc; if (Status >>= dp_exc) { diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 81388092cc59..0133d7d54621 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -40,8 +40,6 @@ #include "comphelper/sequence.hxx" #include -using ::rtl::OUString; -using ::rtl::OString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; @@ -50,10 +48,10 @@ namespace unopkg { bool getLockFilePath(OUString & out); -::rtl::OUString toString( OptionInfo const * info ) +OUString toString( OptionInfo const * info ) { OSL_ASSERT( info != 0 ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii("--"); buf.appendAscii(info->m_name); if (info->m_short_option != '\0') @@ -93,7 +91,7 @@ OptionInfo const * getOptionInfo( } } } - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( opt, osl_getThreadTextEncoding() ).getStr() ); return 0; } @@ -224,7 +222,7 @@ OUString makeAbsoluteFileUrl( base_url.pData, file_url.pData, &abs.pData ) != osl_File_E_None) { if (throw_exc) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "making absolute file url failed: \"" ); buf.append( base_url ); buf.appendAscii( "\" (base-url) and \"" ); @@ -381,7 +379,7 @@ Reference connectToOffice( args[ 1 ] = "--nodefault"; OUString pipeId( ::dp_misc::generateRandomPipeId() ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "--accept=pipe,name=" ); buf.append( pipeId ); buf.appendAscii( ";urp;" ); @@ -446,8 +444,8 @@ Reference getUNO( // do not create any user data (for the root user) in --shared mode: if (shared) { rtl::Bootstrap::set( - rtl::OUString("CFG_CacheUrl"), - rtl::OUString()); + OUString("CFG_CacheUrl"), + OUString()); } // hold lock during process runtime: diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index f063cf6c1e92..e12a9655b5ae 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -49,24 +49,24 @@ struct OptionInfo struct LockFileException : public css::uno::Exception { - LockFileException(::rtl::OUString const & sMessage) : + LockFileException(OUString const & sMessage) : css::uno::Exception(sMessage, css::uno::Reference< css::uno::XInterface > ()) {} }; //============================================================================== -::rtl::OUString toString( OptionInfo const * info ); +OUString toString( OptionInfo const * info ); //============================================================================== OptionInfo const * getOptionInfo( OptionInfo const * list, - ::rtl::OUString const & opt, sal_Unicode copt = '\0' ); + OUString const & opt, sal_Unicode copt = '\0' ); //============================================================================== bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ); //============================================================================== bool readArgument( - ::rtl::OUString * pValue, OptionInfo const * option_info, + OUString * pValue, OptionInfo const * option_info, sal_uInt32 * pIndex ); //============================================================================== @@ -87,14 +87,14 @@ inline bool readOption( */ bool isBootstrapVariable(sal_uInt32 * pIndex); //============================================================================== -::rtl::OUString const & getExecutableDir(); +OUString const & getExecutableDir(); //============================================================================== -::rtl::OUString const & getProcessWorkingDir(); +OUString const & getProcessWorkingDir(); //============================================================================== -::rtl::OUString makeAbsoluteFileUrl( - ::rtl::OUString const & sys_path, ::rtl::OUString const & base_url, +OUString makeAbsoluteFileUrl( + OUString const & sys_path, OUString const & base_url, bool throw_exc = true ); //############################################################################## @@ -102,7 +102,7 @@ bool isBootstrapVariable(sal_uInt32 * pIndex); //============================================================================== css::uno::Reference createCmdEnv( css::uno::Reference const & xContext, - ::rtl::OUString const & logFile, + OUString const & logFile, bool option_force_overwrite, bool option_verbose, bool option_suppressLicense); diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index f14ee311d489..ac92ea813ef1 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -580,7 +580,7 @@ void SplashScreen::Paint( const Rectangle&) Rectangle aNativeControlRegion, aNativeContentRegion; if( GetNativeControlRegion( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aDrawRect, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) ) { long nProgressHeight = aNativeControlRegion.GetHeight(); @@ -633,13 +633,13 @@ css::uno::Reference< css::uno::XInterface > desktop::splash::create( return static_cast< cppu::OWeakObject * >(new SplashScreen); } -rtl::OUString desktop::splash::getImplementationName() { - return rtl::OUString("com.sun.star.office.comp.SplashScreen"); +OUString desktop::splash::getImplementationName() { + return OUString("com.sun.star.office.comp.SplashScreen"); } -css::uno::Sequence< rtl::OUString > desktop::splash::getSupportedServiceNames() { - rtl::OUString name("com.sun.star.office.SplashScreen"); - return css::uno::Sequence< rtl::OUString >(&name, 1); +css::uno::Sequence< OUString > desktop::splash::getSupportedServiceNames() { + OUString name("com.sun.star.office.SplashScreen"); + return css::uno::Sequence< OUString >(&name, 1); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index 191f8d955c67..0d64f080805e 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -41,9 +41,9 @@ create( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &); -rtl::OUString SAL_CALL getImplementationName(); +OUString SAL_CALL getImplementationName(); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL +com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } } diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index ce88274c63c7..3afc099dd156 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -106,7 +106,7 @@ private: }; OUString Provider::static_getImplementationName() { - return rtl::OUString("com.sun.star.comp.test.deployment.active_native"); + return OUString("com.sun.star.comp.test.deployment.active_native"); } css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames() @@ -207,7 +207,7 @@ private: }; OUString Dispatch::static_getImplementationName() { - return rtl::OUString( + return OUString( "com.sun.star.comp.test.deployment.active_native_singleton"); } diff --git a/desktop/unx/source/officeloader/officeloader.cxx b/desktop/unx/source/officeloader/officeloader.cxx index 2c24a120e40d..4a62385359bc 100644 --- a/desktop/unx/source/officeloader/officeloader.cxx +++ b/desktop/unx/source/officeloader/officeloader.cxx @@ -24,7 +24,6 @@ #include "../../../source/inc/exithelper.h" -using ::rtl::OUString; SAL_IMPLEMENT_MAIN() { diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx index 62a53e4b8059..812cc00fc2b6 100644 --- a/desktop/unx/splash/unxsplash.cxx +++ b/desktop/unx/splash/unxsplash.cxx @@ -107,7 +107,7 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun:: { for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ ) { - rtl::OUString aArg; + OUString aArg; if ( osl_getCommandArg( i, &aArg.pData ) ) break; if ( aArg.matchIgnoreAsciiCaseAsciiL( PIPE_ARG, sizeof( PIPE_ARG ) - 1, 0 ) ) @@ -117,7 +117,7 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun:: m_pOutFd = fdopen( fd, "w" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "Got argument '--splash-pipe=%d ('%s') (%p)\n", - fd, rtl::OUStringToOString( aNum, RTL_TEXTENCODING_UTF8 ).getStr(), + fd, OUStringToOString( aNum, RTL_TEXTENCODING_UTF8 ).getStr(), m_pOutFd ); #endif } diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx index a7d1d8d61b16..a1cd59948362 100644 --- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx +++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx @@ -65,7 +65,7 @@ class DRAWINGLAYER_DLLPUBLIC XShapeDumper public: XShapeDumper(); - rtl::OUString dump(com::sun::star::uno::Reference xPageShapes); + OUString dump(com::sun::star::uno::Reference xPageShapes); }; #endif diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx index 32cbe2e59a02..df75569ecb64 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -49,7 +49,7 @@ namespace drawinglayer basegfx::B2DHomMatrix maTransform; /// the content definition - rtl::OUString maURL; + OUString maURL; /// style: background color basegfx::BColor maBackgroundColor; @@ -67,14 +67,14 @@ namespace drawinglayer /// constructor MediaPrimitive2D( const basegfx::B2DHomMatrix& rTransform, - const rtl::OUString& rURL, + const OUString& rURL, const basegfx::BColor& rBackgroundColor, sal_uInt32 nDiscreteBorder, const Graphic &rSnapshot); /// data read access const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } - const rtl::OUString& getURL() const { return maURL; } + const OUString& getURL() const { return maURL; } const basegfx::BColor& getBackgroundColor() const { return maBackgroundColor; } sal_uInt32 getDiscreteBorder() const { return mnDiscreteBorder; } diff --git a/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx index 230a7399ff1d..ec5452773751 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx @@ -39,22 +39,22 @@ namespace drawinglayer class DRAWINGLAYER_DLLPUBLIC ObjectInfoPrimitive2D : public GroupPrimitive2D { private: - rtl::OUString maName; - rtl::OUString maTitle; - rtl::OUString maDesc; + OUString maName; + OUString maTitle; + OUString maDesc; public: /// constructor 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); /// data read access - const rtl::OUString& getName() const { return maName; } - const rtl::OUString& getTitle() const { return maTitle; } - const rtl::OUString& getDesc() const { return maDesc; } + const OUString& getName() const { return maName; } + const OUString& getTitle() const { return maTitle; } + const OUString& getDesc() const { return maDesc; } /// compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index b1b450c13bce..e9fb01f094ff 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -154,18 +154,18 @@ namespace drawinglayer { private: FieldType meType; - rtl::OUString maString; + OUString maString; public: /// constructor TextHierarchyFieldPrimitive2D( const Primitive2DSequence& rChildren, const FieldType& rFieldType, - const rtl::OUString& rString); + const OUString& rString); /// data read access FieldType getType() const { return meType; } - const rtl::OUString& getString() const { return maString; } + const OUString& getString() const { return maString; } /// compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const; 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 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(pContext); + OStringBuffer* pBuffer = static_cast(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 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 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 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 xPageShapes) +OUString XShapeDumper::dump(uno::Reference 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 diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx index 94721d9e21cb..f849b133db16 100644 --- a/dtrans/source/cnttype/mcnttfactory.hxx +++ b/dtrans/source/cnttype/mcnttfactory.hxx @@ -39,20 +39,20 @@ public: // XMimeContentTypeFactory //------------------------------------------------ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const ::rtl::OUString& aContentType ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); //------------------------------------------------ // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); private: diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx index 771422fd0263..129370196fd3 100644 --- a/dtrans/source/cnttype/mcnttype.cxx +++ b/dtrans/source/cnttype/mcnttype.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::container; using namespace std; using namespace osl; -using ::rtl::OUString; //------------------------------------------------------------------------ // constants @@ -183,7 +182,7 @@ void SAL_CALL CMimeContentType::type( void ) { skipSpaces( ); - rtl::OUString sToken(TOKEN); + OUString sToken(TOKEN); // check FIRST( type ) if ( !isInRange( m_nxtSym, sToken ) ) @@ -216,7 +215,7 @@ void SAL_CALL CMimeContentType::subtype( void ) { skipSpaces( ); - rtl::OUString sToken(TOKEN); + OUString sToken(TOKEN); // check FIRST( subtype ) if ( !isInRange( m_nxtSym, sToken ) ) @@ -244,7 +243,7 @@ void SAL_CALL CMimeContentType::subtype( void ) void SAL_CALL CMimeContentType::trailer( void ) { - rtl::OUString sToken(TOKEN); + OUString sToken(TOKEN); while( !m_nxtSym.isEmpty( ) ) { if ( m_nxtSym == OUString("(") ) @@ -291,7 +290,7 @@ OUString SAL_CALL CMimeContentType::pName( ) { OUString pname; - rtl::OUString sToken(TOKEN); + OUString sToken(TOKEN); while( !m_nxtSym.isEmpty( ) ) { if ( isInRange( m_nxtSym, sToken ) ) @@ -314,7 +313,7 @@ OUString SAL_CALL CMimeContentType::pValue( ) { OUString pvalue; - rtl::OUString sToken(TOKEN); + OUString sToken(TOKEN); // quoted pvalue if ( m_nxtSym == OUString( "\"" ) ) { @@ -360,7 +359,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( ) { break; } - else if ( isInRange( m_nxtSym, rtl::OUString(TOKEN) + rtl::OUString(TSPECIALS) + rtl::OUString(SPACE) ) ) + else if ( isInRange( m_nxtSym, OUString(TOKEN) + OUString(TSPECIALS) + OUString(SPACE) ) ) { pvalue += m_nxtSym; if ( m_nxtSym == OUString( "\"" ) ) @@ -384,7 +383,7 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( ) { OUString pvalue; - rtl::OUString sToken(TOKEN); + OUString sToken(TOKEN); while ( !m_nxtSym.isEmpty( ) ) { if ( isInRange( m_nxtSym, sToken ) ) @@ -407,7 +406,7 @@ void SAL_CALL CMimeContentType::comment( void ) { while ( !m_nxtSym.isEmpty( ) ) { - if ( isInRange( m_nxtSym, rtl::OUString(TOKEN) + rtl::OUString(SPACE) ) ) + if ( isInRange( m_nxtSym, OUString(TOKEN) + OUString(SPACE) ) ) getSym( ); else if ( m_nxtSym == OUString(")") ) break; @@ -420,7 +419,7 @@ void SAL_CALL CMimeContentType::comment( void ) // //------------------------------------------------------------------------ -sal_Bool SAL_CALL CMimeContentType::isInRange( const rtl::OUString& aChr, const rtl::OUString& aRange ) +sal_Bool SAL_CALL CMimeContentType::isInRange( const OUString& aChr, const OUString& aRange ) { return ( aRange.indexOf( aChr ) > -1 ); } diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx index b3f65e16df50..28cfa2efec0a 100644 --- a/dtrans/source/cnttype/mcnttype.hxx +++ b/dtrans/source/cnttype/mcnttype.hxx @@ -33,48 +33,48 @@ class CMimeContentType : public cppu::WeakImplHelper1< com::sun::star::datatransfer::XMimeContentType > { public: - CMimeContentType( const rtl::OUString& aCntType ); + CMimeContentType( const OUString& aCntType ); //------------------------------------------- // XMimeContentType //------------------------------------------- - virtual ::rtl::OUString SAL_CALL getMediaType( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getMediaSubtype( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFullMediaType( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getMediaType( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getMediaSubtype( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFullMediaType( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getParameters( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getParameters( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasParameter( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasParameter( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getParameterValue( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getParameterValue( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: - void SAL_CALL init( const rtl::OUString& aCntType ) throw( com::sun::star::lang::IllegalArgumentException ); + void SAL_CALL init( const OUString& aCntType ) throw( com::sun::star::lang::IllegalArgumentException ); void SAL_CALL getSym( void ); - void SAL_CALL acceptSym( const rtl::OUString& pSymTlb ); + void SAL_CALL acceptSym( const OUString& pSymTlb ); void SAL_CALL skipSpaces( void ); void SAL_CALL type( void ); void SAL_CALL subtype( void ); void SAL_CALL trailer( void ); - rtl::OUString SAL_CALL pName( ); - rtl::OUString SAL_CALL pValue( ); - rtl::OUString SAL_CALL quotedPValue( ); - rtl::OUString SAL_CALL nonquotedPValue( ); + OUString SAL_CALL pName( ); + OUString SAL_CALL pValue( ); + OUString SAL_CALL quotedPValue( ); + OUString SAL_CALL nonquotedPValue( ); void SAL_CALL comment( void ); - sal_Bool SAL_CALL isInRange( const rtl::OUString& aChr, const rtl::OUString& aRange ); + sal_Bool SAL_CALL isInRange( const OUString& aChr, const OUString& aRange ); private: ::osl::Mutex m_aMutex; - rtl::OUString m_MediaType; - rtl::OUString m_MediaSubtype; - rtl::OUString m_ContentType; - std::map< rtl::OUString, rtl::OUString > m_ParameterMap; + OUString m_MediaType; + OUString m_MediaSubtype; + OUString m_ContentType; + std::map< OUString, OUString > m_ParameterMap; sal_Int32 m_nPos; - rtl::OUString m_nxtSym; + OUString m_nxtSym; }; #endif diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx index 7793826bb0bc..696ca9ca030a 100644 --- a/dtrans/source/generic/clipboardmanager.cxx +++ b/dtrans/source/generic/clipboardmanager.cxx @@ -30,7 +30,6 @@ using namespace osl; using namespace std; using ::dtrans::ClipboardManager; -using ::rtl::OUString; // ------------------------------------------------------------------------ diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx index 7da462dbd4bc..8429996c0364 100644 --- a/dtrans/source/generic/clipboardmanager.hxx +++ b/dtrans/source/generic/clipboardmanager.hxx @@ -33,7 +33,7 @@ // ------------------------------------------------------------------------ -typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > > ClipboardMap; +typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > > ClipboardMap; // ------------------------------------------------------------------------ @@ -48,7 +48,7 @@ namespace dtrans ClipboardMap m_aClipboardMap; ::osl::Mutex m_aMutex; - const ::rtl::OUString m_aDefaultName; + const OUString m_aDefaultName; virtual ~ClipboardManager(); protected: @@ -61,13 +61,13 @@ namespace dtrans * XServiceInfo */ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); /* @@ -88,7 +88,7 @@ namespace dtrans * XClipboardManager */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -97,10 +97,10 @@ namespace dtrans ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeClipboard( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeClipboard( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL listClipboardNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL listClipboardNames( ) throw(::com::sun::star::uno::RuntimeException); @@ -110,7 +110,7 @@ namespace dtrans // ------------------------------------------------------------------------ -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ClipboardManager_getSupportedServiceNames(); +::com::sun::star::uno::Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClipboardManager_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx index e89b6fa3d7a5..61ec37a3b996 100644 --- a/dtrans/source/generic/dtrans.cxx +++ b/dtrans/source/generic/dtrans.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::registry; using namespace com::sun::star::uno; using namespace cppu; -using ::rtl::OUString; extern "C" { diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx index 88621630ccc2..04e813542087 100644 --- a/dtrans/source/generic/generic_clipboard.cxx +++ b/dtrans/source/generic/generic_clipboard.cxx @@ -29,7 +29,6 @@ using namespace cppu; using namespace osl; using ::dtrans::GenericClipboard; -using ::rtl::OUString; GenericClipboard::GenericClipboard() : WeakComponentImplHelper4< XClipboardEx, XClipboardNotifier, XServiceInfo, XInitialization > (m_aMutex), diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx index 1f6a86be4d0f..c307e279cac7 100644 --- a/dtrans/source/generic/generic_clipboard.hxx +++ b/dtrans/source/generic/generic_clipboard.hxx @@ -44,7 +44,7 @@ namespace dtrans ::com::sun::star::lang::XInitialization > { ::osl::Mutex m_aMutex; - ::rtl::OUString m_aName; + OUString m_aName; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner; @@ -67,13 +67,13 @@ namespace dtrans * XServiceInfo */ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); /* @@ -88,7 +88,7 @@ namespace dtrans const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); /* @@ -116,7 +116,7 @@ namespace dtrans // ------------------------------------------------------------------------ -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GenericClipboard_getSupportedServiceNames(); +::com::sun::star::uno::Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GenericClipboard_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx index 84d5a2664678..f10b3e5e66af 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.cxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx @@ -50,7 +50,6 @@ using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::datatransfer::clipboard::RenderingCapabilities; -using ::rtl::OUString; // definition of static members CWinClipbImpl* CWinClipbImpl::s_pCWinClipbImpl = NULL; diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx index 51100caa8a9b..15eea430dd67 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.hxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx @@ -50,7 +50,7 @@ public: ~CWinClipbImpl( ); protected: - CWinClipbImpl( const ::rtl::OUString& aClipboardName, CWinClipboard* theWinClipboard ); + CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents( ) throw( ::com::sun::star::uno::RuntimeException ); @@ -60,7 +60,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw( ::com::sun::star::uno::RuntimeException ); - ::rtl::OUString SAL_CALL getName( ) throw( ::com::sun::star::uno::RuntimeException ); + OUString SAL_CALL getName( ) throw( ::com::sun::star::uno::RuntimeException ); //------------------------------------------------ // XClipboardEx @@ -93,7 +93,7 @@ private: void SAL_CALL onReleaseDataObject( CXNotifyingDataObject* theCaller ); private: - ::rtl::OUString m_itsName; + OUString m_itsName; CMtaOleClipboard m_MtaOleClipboard; CWinClipboard* m_pWinClipboard; CXNotifyingDataObject* m_pCurrentClipContent; diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx index 80ef257f489c..5a2c1e9daac6 100644 --- a/dtrans/source/win32/clipb/WinClipboard.cxx +++ b/dtrans/source/win32/clipb/WinClipboard.cxx @@ -37,7 +37,6 @@ using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::lang; -using ::rtl::OUString; #define WINCLIPBOARD_IMPL_NAME "com.sun.star.datatransfer.clipboard.ClipboardW32" diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx index 65688d526513..608f9e9ceece 100644 --- a/dtrans/source/win32/clipb/WinClipboard.hxx +++ b/dtrans/source/win32/clipb/WinClipboard.hxx @@ -70,7 +70,7 @@ class CWinClipboard : { public: CWinClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& aClipboardName ); + const OUString& aClipboardName ); //------------------------------------------------ // XClipboard @@ -84,7 +84,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getName( ) + virtual OUString SAL_CALL getName( ) throw( ::com::sun::star::uno::RuntimeException ); //------------------------------------------------ @@ -122,13 +122,13 @@ public: // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); private: diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx index ad589d7b4958..6135f84e1dfe 100644 --- a/dtrans/source/win32/clipb/wcbentry.cxx +++ b/dtrans/source/win32/clipb/wcbentry.cxx @@ -59,7 +59,7 @@ namespace Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { - return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), rtl::OUString( "" ) ) ) ); + return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), OUString( "" ) ) ) ); } } diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx index 6b2351b32b83..1c3e6fd88538 100644 --- a/dtrans/source/win32/dnd/source.cxx +++ b/dtrans/source/win32/dnd/source.cxx @@ -51,7 +51,6 @@ using namespace com::sun::star::awt::MouseButton; using namespace com::sun::star::awt; using namespace com::sun::star::lang; -using ::rtl::OUString; extern rtl_StandardModuleCount g_moduleCount; diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx index 736e2bc9f4c0..aed4af9b9126 100644 --- a/dtrans/source/win32/dnd/source.hxx +++ b/dtrans/source/win32/dnd/source.hxx @@ -39,9 +39,6 @@ using namespace osl; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::dnd; -using ::rtl::OUString; - - class SourceContext; // RIGHT MOUSE BUTTON drag and drop not supportet currently. // ALT modifier is considered to effect a user selection of effects diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index 21d46718235a..21c20a8a2e3b 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; -using ::rtl::OUString; #define WM_REGISTERDRAGDROP WM_USER + 1 #define WM_REVOKEDRAGDROP WM_USER + 2 diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx index 16e5b8921ec4..98ccb2d14de4 100644 --- a/dtrans/source/win32/dnd/target.hxx +++ b/dtrans/source/win32/dnd/target.hxx @@ -46,9 +46,6 @@ using namespace osl; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::dnd; -using ::rtl::OUString; - - // The client // has to call XComponent::dispose. The thread that calls initialize // must also execute the destruction of the instance. This is because diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 4295bd47fb5e..b3910af33f37 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -48,7 +48,6 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::container; -using ::rtl::OUString; //------------------------------------------------------------------------ // diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx index 4634216aebe1..d8fcf77d3327 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.hxx +++ b/dtrans/source/win32/dtobj/DOTransferable.hxx @@ -76,12 +76,12 @@ private: com::sun::star::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc ); ByteSequence_t SAL_CALL getClipboardData( CFormatEtc& aFormatEtc ); - rtl::OUString SAL_CALL synthesizeUnicodeText( ); + OUString SAL_CALL synthesizeUnicodeText( ); void SAL_CALL clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, ByteSequence_t& aByteSequence ); ::com::sun::star::uno::Any SAL_CALL byteStreamToAny( ByteSequence_t& aByteStream, const com::sun::star::uno::Type& aRequestedDataType ); - rtl::OUString SAL_CALL byteStreamToOUString( ByteSequence_t& aByteStream ); + OUString SAL_CALL byteStreamToOUString( ByteSequence_t& aByteStream ); LCID SAL_CALL getLocaleFromClipboard( ); diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index 4a9ca7ae0362..058ab5dc0f1b 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -50,7 +50,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer; using namespace com::sun::star::lang; -using ::rtl::OUString; const Type CPPUTYPE_SALINT32 = getCppuType((sal_Int32*)0); const Type CPPUTYPE_SALINT8 = getCppuType((sal_Int8*)0); diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx index 7cb0684a526d..5f8b9e1cca47 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx @@ -51,8 +51,8 @@ public: const FORMATETC& aFormatEtc, LCID lcid = GetThreadLocale( ) ) const; CFormatEtc SAL_CALL getFormatEtcForClipformat( CLIPFORMAT cf ) const; - CFormatEtc SAL_CALL getFormatEtcForClipformatName( const rtl::OUString& aClipFmtName ) const; - rtl::OUString SAL_CALL getClipboardFormatName( CLIPFORMAT aClipformat ) const; + CFormatEtc SAL_CALL getFormatEtcForClipformatName( const OUString& aClipFmtName ) const; + OUString SAL_CALL getClipboardFormatName( CLIPFORMAT aClipformat ) const; sal_Bool SAL_CALL isHTMLFormat( CLIPFORMAT cf ) const; sal_Bool SAL_CALL isTextHtmlFormat( CLIPFORMAT cf ) const; @@ -61,7 +61,7 @@ public: sal_Bool SAL_CALL isTextFormat( CLIPFORMAT cf ) const; private: - rtl::OUString SAL_CALL getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const; + OUString SAL_CALL getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const; private: com::sun::star::uno::Reference< com::sun::star::datatransfer::XDataFormatTranslator > m_XDataFormatTranslator; diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx index 00bc9d32a235..b728850fc72b 100644 --- a/dtrans/source/win32/dtobj/FetcList.cxx +++ b/dtrans/source/win32/dtobj/FetcList.cxx @@ -41,7 +41,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace std; -using ::rtl::OUString; //------------------------------------------------------------------------ // diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx index 7e3058b08bbc..2352578cdea1 100644 --- a/dtrans/source/win32/dtobj/FetcList.hxx +++ b/dtrans/source/win32/dtobj/FetcList.hxx @@ -113,7 +113,7 @@ public: private: sal_Bool SAL_CALL isEqualCurrentSystemCodePage( sal_uInt32 aCodePage ) const; - rtl::OUString SAL_CALL getCharsetFromDataFlavor( const com::sun::star::datatransfer::DataFlavor& aFlavor ); + OUString SAL_CALL getCharsetFromDataFlavor( const com::sun::star::datatransfer::DataFlavor& aFlavor ); sal_Bool SAL_CALL hasUnicodeFlavor( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& aXTransferable ) const; diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index 7456ce598bf5..f9327d8e82df 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -43,7 +43,6 @@ #include using namespace com::sun::star::uno; -using rtl::OString; #pragma pack(2) struct METAFILEHEADER diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx index 1d5422e21d7f..7eba4d058372 100644 --- a/dtrans/source/win32/dtobj/MimeAttrib.hxx +++ b/dtrans/source/win32/dtobj/MimeAttrib.hxx @@ -23,12 +23,12 @@ #include -const rtl::OUString TEXTPLAIN_PARAM_CHARSET("charset"); +const OUString TEXTPLAIN_PARAM_CHARSET("charset"); -const rtl::OUString PRE_WINDOWS_CODEPAGE ("windows"); -const rtl::OUString PRE_OEM_CODEPAGE ("cp"); -const rtl::OUString CHARSET_UTF16 ("utf-16"); -const rtl::OUString CHARSET_UNICODE ("unicode"); +const OUString PRE_WINDOWS_CODEPAGE ("windows"); +const OUString PRE_OEM_CODEPAGE ("cp"); +const OUString CHARSET_UTF16 ("utf-16"); +const OUString CHARSET_UNICODE ("unicode"); #endif diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index 5b8bb978ed6b..c213517cdd19 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -54,7 +54,6 @@ using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; //------------------------------------------------------------------------ // a helper class that will be thrown by the function validateFormatEtc diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 1f141f2faf56..70724c1600a8 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -39,19 +39,18 @@ #define MODULE_PRIVATE #define CPPUTYPE_SEQSALINT8 getCppuType( (const Sequence< sal_Int8 >*) 0 ) #define CPPUTYPE_DEFAULT CPPUTYPE_SEQSALINT8 -#define CPPUTYPE_OUSTR getCppuType( (const ::rtl::OUString*) 0 ) +#define CPPUTYPE_OUSTR getCppuType( (const OUString*) 0 ) #define CPPUTYPE_SALINT32 getCppuType( ( sal_Int32 * ) 0 ) #define EMPTY_OUSTR OUString() -const rtl::OUString Windows_FormatName ("windows_formatname"); +const OUString Windows_FormatName ("windows_formatname"); const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence*)0); -const com::sun::star::uno::Type CppuType_String = ::getCppuType((const ::rtl::OUString*)0); +const com::sun::star::uno::Type CppuType_String = ::getCppuType((const OUString*)0); //------------------------------------------------------------------------ // namespace directives //------------------------------------------------------------------------ -using ::rtl::OUString; using namespace osl; using namespace cppu; using namespace std; @@ -93,14 +92,14 @@ FormatEntry::FormatEntry( CLIPFORMAT std_clipboard_format_id, ::com::sun::star::uno::Type const & cppu_type) { - aDataFlavor.MimeType = rtl::OUString::createFromAscii(mime_content_type); - aDataFlavor.HumanPresentableName = rtl::OUString::createFromAscii(human_presentable_name); + aDataFlavor.MimeType = OUString::createFromAscii(mime_content_type); + aDataFlavor.HumanPresentableName = OUString::createFromAscii(human_presentable_name); aDataFlavor.DataType = cppu_type; if (native_format_name) - aNativeFormatName = rtl::OUString::createFromAscii(native_format_name); + aNativeFormatName = OUString::createFromAscii(native_format_name); else - aNativeFormatName = rtl::OUString::createFromAscii(human_presentable_name); + aNativeFormatName = OUString::createFromAscii(human_presentable_name); aStandardFormatId = std_clipboard_format_id; } diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx index 4650fc06cd1c..8340050dafff 100644 --- a/dtrans/source/win32/ftransl/ftransl.hxx +++ b/dtrans/source/win32/ftransl/ftransl.hxx @@ -53,7 +53,7 @@ struct FormatEntry ); com::sun::star::datatransfer::DataFlavor aDataFlavor; - rtl::OUString aNativeFormatName; + OUString aNativeFormatName; sal_Int32 aStandardFormatId; }; @@ -83,29 +83,29 @@ public: // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); private: void SAL_CALL initTranslationTable( ); void SAL_CALL findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const; - void SAL_CALL findDataFlavorForNativeFormatName( const rtl::OUString& aNativeFormatName, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const; - void SAL_CALL findStandardFormatIdForCharset( const rtl::OUString& aCharset, com::sun::star::uno::Any& aAny ) const; - void SAL_CALL setStandardFormatIdForNativeFormatName( const rtl::OUString& aNativeFormatName, com::sun::star::uno::Any& aAny ) const; + void SAL_CALL findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const; + void SAL_CALL findStandardFormatIdForCharset( const OUString& aCharset, com::sun::star::uno::Any& aAny ) const; + void SAL_CALL setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, com::sun::star::uno::Any& aAny ) const; void SAL_CALL findStdFormatIdOrNativeFormatNameForFullMediaType( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentTypeFactory >& aRefXMimeFactory, - const rtl::OUString& aFullMediaType, com::sun::star::uno::Any& aAny ) const; + const OUString& aFullMediaType, com::sun::star::uno::Any& aAny ) const; - sal_Bool isTextPlainMediaType( const rtl::OUString& fullMediaType ) const; + sal_Bool isTextPlainMediaType( const OUString& fullMediaType ) const; - com::sun::star::datatransfer::DataFlavor SAL_CALL mkDataFlv( const rtl::OUString& cnttype, const rtl::OUString& hpname, ::com::sun::star::uno::Type dtype ); + com::sun::star::datatransfer::DataFlavor SAL_CALL mkDataFlv( const OUString& cnttype, const OUString& hpname, ::com::sun::star::uno::Type dtype ); private: std::vector< FormatEntry > m_TranslTable; diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx index d85674dc6375..7e8d5f79d8c1 100644 --- a/dtrans/source/win32/misc/ImplHelper.cxx +++ b/dtrans/source/win32/misc/ImplHelper.cxx @@ -44,8 +44,6 @@ // namespace directives //------------------------------------------------------------------------ -using ::rtl::OUString; -using ::rtl::OString; //------------------------------------------------------------------------ // returns a windows codepage appropriate to the diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx index 811849e332bf..10fb2593cc54 100644 --- a/dtrans/source/win32/misc/ImplHelper.hxx +++ b/dtrans/source/win32/misc/ImplHelper.hxx @@ -47,14 +47,14 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice(DVTARGETDEVICE* ptdSrc); //-------------------------------------------------- sal_uInt32 SAL_CALL getWinCPFromMimeCharset( - const rtl::OUString& charset ); + const OUString& charset ); //-------------------------------------------------- // returns a windows codepage appropriate to the // given locale and locale type //-------------------------------------------------- -rtl::OUString SAL_CALL getWinCPFromLocaleId( +OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype ); //-------------------------------------------------- @@ -63,8 +63,8 @@ rtl::OUString SAL_CALL getWinCPFromLocaleId( // given, e.g. "windows-" or "cp" //-------------------------------------------------- -rtl::OUString SAL_CALL getMimeCharsetFromWinCP( - sal_uInt32 cp, const rtl::OUString& aPrefix ); +OUString SAL_CALL getMimeCharsetFromWinCP( + sal_uInt32 cp, const OUString& aPrefix ); //-------------------------------------------------- // returns a mime charset parameter value appropriate @@ -72,8 +72,8 @@ rtl::OUString SAL_CALL getMimeCharsetFromWinCP( // prefix can be given, e.g. "windows-" or "cp" //-------------------------------------------------- -rtl::OUString SAL_CALL getMimeCharsetFromLocaleId( - LCID lcid, LCTYPE lctype, const rtl::OUString& aPrefix ); +OUString SAL_CALL getMimeCharsetFromLocaleId( + LCID lcid, LCTYPE lctype, const OUString& aPrefix ); //----------------------------------------------------- // returns true, if a given codepage is an oem codepage @@ -85,7 +85,7 @@ sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage ); // converts a codepage into a string representation //-------------------------------------------------- -rtl::OUString SAL_CALL cptostr( sal_uInt32 codepage ); +OUString SAL_CALL cptostr( sal_uInt32 codepage ); #endif diff --git a/dtrans/test/win32/dnd/atlwindow.cxx b/dtrans/test/win32/dnd/atlwindow.cxx index 3be105ba9be1..f142332863c3 100644 --- a/dtrans/test/win32/dnd/atlwindow.cxx +++ b/dtrans/test/win32/dnd/atlwindow.cxx @@ -38,7 +38,6 @@ using namespace com::sun::star::datatransfer::dnd::DNDConstants; using namespace cppu; using namespace std; -using ::rtl::OUString; LRESULT APIENTRY EditSubclassProc( HWND hwnd, UINT uMsg,WPARAM wParam, LPARAM lParam) ; diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx index 0b5ef3ad50cd..f78d6ef77f78 100644 --- a/dtrans/test/win32/dnd/dndTest.cxx +++ b/dtrans/test/win32/dnd/dndTest.cxx @@ -49,7 +49,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; -using ::rtl::OUString; #define WM_CREATE_MTA_WND diff --git a/dtrans/test/win32/dnd/targetlistener.cxx b/dtrans/test/win32/dnd/targetlistener.cxx index 44954b74b1a6..990b5a7ed70d 100644 --- a/dtrans/test/win32/dnd/targetlistener.cxx +++ b/dtrans/test/win32/dnd/targetlistener.cxx @@ -24,7 +24,6 @@ using namespace com::sun::star::datatransfer::dnd::DNDConstants; using namespace com::sun::star::datatransfer; -using ::rtl::OUString; DropTargetListener::DropTargetListener(HWND hEdit):m_hEdit( hEdit) { diff --git a/editeng/inc/editeng/AccessibleComponentBase.hxx b/editeng/inc/editeng/AccessibleComponentBase.hxx index e3f23bb2e9e5..ea292e0e439c 100644 --- a/editeng/inc/editeng/AccessibleComponentBase.hxx +++ b/editeng/inc/editeng/AccessibleComponentBase.hxx @@ -120,9 +120,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText (void) + virtual OUString SAL_CALL getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTipText (void) + virtual OUString SAL_CALL getToolTipText (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/editeng/inc/editeng/AccessibleContextBase.hxx b/editeng/inc/editeng/AccessibleContextBase.hxx index 41bf44376677..574582a68ae1 100644 --- a/editeng/inc/editeng/AccessibleContextBase.hxx +++ b/editeng/inc/editeng/AccessibleContextBase.hxx @@ -105,7 +105,7 @@ public: value. */ void SetAccessibleDescription ( - const ::rtl::OUString& rsDescription, + const OUString& rsDescription, StringOrigin eDescriptionOrigin) throw (::com::sun::star::uno::RuntimeException); @@ -119,7 +119,7 @@ public: numerical value overrides one with a higher value. */ void SetAccessibleName ( - const ::rtl::OUString& rsName, + const OUString& rsName, StringOrigin eNameOrigin) throw (::com::sun::star::uno::RuntimeException); @@ -205,12 +205,12 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); @@ -253,20 +253,20 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -306,7 +306,7 @@ protected: The returned string is a unique (among the accessible object's siblings) name. */ - virtual ::rtl::OUString CreateAccessibleName (void) + virtual OUString CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); /** Create the accessible object's descriptive string. May be called @@ -314,7 +314,7 @@ protected: @return Descriptive string. Not necessarily unique. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); @@ -353,7 +353,7 @@ private: be set from the outside. Furthermore, it changes according the the draw page's display mode. */ - ::rtl::OUString msDescription; + OUString msDescription; /** The origin of the description is used to determine whether new descriptions given to the SetAccessibleDescription is ignored or @@ -364,7 +364,7 @@ private: /** Name of this object. It changes according the draw page's display mode. */ - ::rtl::OUString msName; + OUString msName; /** The origin of the name is used to determine whether new name given to the SetAccessibleName is ignored or diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx index 5304a3bda598..5f245d0786f5 100644 --- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx +++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx @@ -63,7 +63,7 @@ namespace accessibility protected: // override OCommonAccessibleText methods - virtual ::rtl::OUString implGetText(); + virtual OUString implGetText(); virtual ::com::sun::star::lang::Locale implGetLocale(); virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ); virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); @@ -94,8 +94,8 @@ namespace accessibility virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException); /// Maximal length of text returned by getAccessibleDescription() enum { MaxDescriptionLen = 40 }; - virtual ::rtl::OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -119,16 +119,16 @@ namespace accessibility virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) @@ -141,14 +141,14 @@ namespace accessibility virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL insertText( const ::rtl::OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::rtl::OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setText( const ::rtl::OUString& sText ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleTextAttributes - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( ::sal_Int32 Index, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( ::sal_Int32 Index, const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XAccessibleHypertext virtual ::sal_Int32 SAL_CALL getHyperLinkCount( ) throw (::com::sun::star::uno::RuntimeException); @@ -162,12 +162,12 @@ namespace accessibility virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); /** Set the current index in the accessibility parent @@ -357,7 +357,7 @@ namespace accessibility WeakBullet maImageBullet; // the last string used for an Accessibility::TEXT_CHANGED event (guarded by solar mutex) - ::rtl::OUString maLastTextString; + OUString maLastTextString; // the offset of the underlying EditEngine from the shape/cell (guarded by solar mutex) Point maEEOffset; diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx index 2e5e589fbf1a..9d852962e9e6 100644 --- a/editeng/inc/editeng/AccessibleImageBullet.hxx +++ b/editeng/inc/editeng/AccessibleImageBullet.hxx @@ -67,8 +67,8 @@ namespace accessibility virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException); /// Maximal length of text returned by getAccessibleDescription() enum { MaxDescriptionLen = 40 }; - virtual ::rtl::OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -89,12 +89,12 @@ namespace accessibility virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); /** Set the current index in the accessibility parent diff --git a/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx index bbc2e6d5f2e6..8ca75d7a5766 100644 --- a/editeng/inc/editeng/AccessibleStaticTextBase.hxx +++ b/editeng/inc/editeng/AccessibleStaticTextBase.hxx @@ -227,17 +227,17 @@ namespace accessibility virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) @@ -248,8 +248,8 @@ namespace accessibility virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XAccessibleTextAttributes - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 Index, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 Index, const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // child-related methods from XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException); diff --git a/editeng/inc/editeng/SpellPortions.hxx b/editeng/inc/editeng/SpellPortions.hxx index d8ca7f924b7f..f96a14b0f557 100644 --- a/editeng/inc/editeng/SpellPortions.hxx +++ b/editeng/inc/editeng/SpellPortions.hxx @@ -39,7 +39,7 @@ struct SpellPortion { /** contains the text of the portion. */ - rtl::OUString sText; + OUString sText; /** Marks the portion as field, footnote symbol or any other special content that should be protected against unintentional deletion. */ @@ -69,7 +69,7 @@ struct SpellPortion */ /** contains the proposed dialog title if the proof reading component provides one. */ - rtl::OUString sDialogTitle; + OUString sDialogTitle; bool bIgnoreThisError; SpellPortion() : diff --git a/editeng/inc/editeng/acorrcfg.hxx b/editeng/inc/editeng/acorrcfg.hxx index 8500cd874da1..3c3321ccfc2d 100644 --- a/editeng/inc/editeng/acorrcfg.hxx +++ b/editeng/inc/editeng/acorrcfg.hxx @@ -27,7 +27,7 @@ class SvxAutoCorrCfg; class EDITENG_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem { SvxAutoCorrCfg& rParent; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rParent); @@ -35,14 +35,14 @@ public: void Load(sal_Bool bInit); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); void SetModified() {ConfigItem::SetModified();} }; class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem { SvxAutoCorrCfg& rParent; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SvxSwAutoCorrCfg(SvxAutoCorrCfg& rParent); @@ -50,7 +50,7 @@ public: void Load(sal_Bool bInit); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); void SetModified() {ConfigItem::SetModified();} }; /*-------------------------------------------------------------------- diff --git a/editeng/inc/editeng/adjustitem.hxx b/editeng/inc/editeng/adjustitem.hxx index 64eceafec178..37dadbe41932 100644 --- a/editeng/inc/editeng/adjustitem.hxx +++ b/editeng/inc/editeng/adjustitem.hxx @@ -68,7 +68,7 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const; virtual sal_uInt16 GetValueCount() const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetEnumValue() const; virtual void SetEnumValue( sal_uInt16 nNewVal ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx index 445f7afc4461..5bc6c589d02d 100644 --- a/editeng/inc/editeng/charreliefitem.hxx +++ b/editeng/inc/editeng/charreliefitem.hxx @@ -44,7 +44,7 @@ public: virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/editeng/inc/editeng/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx index 8e2f0f0c326a..4c8f2bf388ab 100644 --- a/editeng/inc/editeng/cmapitem.hxx +++ b/editeng/inc/editeng/cmapitem.hxx @@ -53,7 +53,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const; // MS VC4.0 kommt durcheinander diff --git a/editeng/inc/editeng/crossedoutitem.hxx b/editeng/inc/editeng/crossedoutitem.hxx index 6906d185639e..f4d53c6ef34b 100644 --- a/editeng/inc/editeng/crossedoutitem.hxx +++ b/editeng/inc/editeng/crossedoutitem.hxx @@ -52,7 +52,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); diff --git a/editeng/inc/editeng/editund2.hxx b/editeng/inc/editeng/editund2.hxx index b52d19930270..2312aee93c79 100644 --- a/editeng/inc/editeng/editund2.hxx +++ b/editeng/inc/editeng/editund2.hxx @@ -57,7 +57,7 @@ public: virtual void Redo() = 0; virtual sal_Bool CanRepeat(SfxRepeatTarget&) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; virtual sal_uInt16 GetId() const; }; diff --git a/editeng/inc/editeng/edtdlg.hxx b/editeng/inc/editeng/edtdlg.hxx index 40cdd5d9b35a..a663d409985d 100644 --- a/editeng/inc/editeng/edtdlg.hxx +++ b/editeng/inc/editeng/edtdlg.hxx @@ -73,7 +73,7 @@ class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0; virtual void SetCurrentString( const String& _rNewString, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, + const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument = true )=0; virtual String GetCurrentString( ) const =0; virtual editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const =0; diff --git a/editeng/inc/editeng/escapementitem.hxx b/editeng/inc/editeng/escapementitem.hxx index d16adbc1aa22..213390248c7e 100644 --- a/editeng/inc/editeng/escapementitem.hxx +++ b/editeng/inc/editeng/escapementitem.hxx @@ -95,7 +95,7 @@ public: } virtual sal_uInt16 GetValueCount() const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetEnumValue() const; virtual void SetEnumValue( sal_uInt16 nNewVal ); }; diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx index 8f75e0c2e6b2..37f42a37c217 100644 --- a/editeng/inc/editeng/flditem.hxx +++ b/editeng/inc/editeng/flditem.hxx @@ -132,8 +132,8 @@ public: // If eLanguage==LANGUAGE_DONTKNOW the language/country // used in number formatter initialization is taken. - rtl::OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; - static rtl::OUString GetFormatted( Date& rDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); + OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; + static OUString GetFormatted( Date& rDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); virtual SvxFieldData* Clone() const; virtual int operator==( const SvxFieldData& ) const; @@ -151,24 +151,24 @@ class EDITENG_DLLPUBLIC SvxURLField : public SvxFieldData { private: SvxURLFormat eFormat; - rtl::OUString aURL; // URL-Address - rtl::OUString aRepresentation; // What is shown - rtl::OUString aTargetFrame; // In what Frame + OUString aURL; // URL-Address + OUString aRepresentation; // What is shown + OUString aTargetFrame; // In what Frame public: SV_DECL_PERSIST1( SvxURLField, SvxFieldData, com::sun::star::text::textfield::Type::URL ) SvxURLField(); - SvxURLField( const rtl::OUString& rURL, const rtl::OUString& rRepres, SvxURLFormat eFmt = SVXURLFORMAT_URL ); + SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLFormat eFmt = SVXURLFORMAT_URL ); - const rtl::OUString& GetURL() const { return aURL; } - void SetURL( const rtl::OUString& rURL ) { aURL = rURL; } + const OUString& GetURL() const { return aURL; } + void SetURL( const OUString& rURL ) { aURL = rURL; } - const rtl::OUString& GetRepresentation() const { return aRepresentation; } - void SetRepresentation( const rtl::OUString& rRep ) { aRepresentation= rRep; } + const OUString& GetRepresentation() const { return aRepresentation; } + void SetRepresentation( const OUString& rRep ) { aRepresentation= rRep; } - const rtl::OUString& GetTargetFrame() const { return aTargetFrame; } - void SetTargetFrame( const rtl::OUString& rFrm ) { aTargetFrame = rFrm; } + const OUString& GetTargetFrame() const { return aTargetFrame; } + void SetTargetFrame( const OUString& rFrm ) { aTargetFrame = rFrm; } SvxURLFormat GetFormat() const { return eFormat; } void SetFormat( SvxURLFormat eFmt ) { eFormat = eFmt; } @@ -279,8 +279,8 @@ public: // If eLanguage==LANGUAGE_DONTKNOW the language/country // used in number formatter initialization is taken. - rtl::OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; - static rtl::OUString GetFormatted( Time& rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); + OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; + static OUString GetFormatted( Time& rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); virtual SvxFieldData* Clone() const; virtual int operator==( const SvxFieldData& ) const; @@ -301,19 +301,19 @@ enum SvxFileFormat { SVXFILEFORMAT_NAME_EXT = 0, // File name with Extension class EDITENG_DLLPUBLIC SvxExtFileField : public SvxFieldData { private: - rtl::OUString aFile; + OUString aFile; SvxFileType eType; SvxFileFormat eFormat; public: SV_DECL_PERSIST1( SvxExtFileField, SvxFieldData, com::sun::star::text::textfield::Type::EXTENDED_FILE ) SvxExtFileField(); - explicit SvxExtFileField( const rtl::OUString& rString, + explicit SvxExtFileField( const OUString& rString, SvxFileType eType = SVXFILETYPE_VAR, SvxFileFormat eFormat = SVXFILEFORMAT_FULLPATH ); - rtl::OUString GetFile() const { return aFile; } - void SetFile( const rtl::OUString& rString ) { aFile = rString; } + OUString GetFile() const { return aFile; } + void SetFile( const OUString& rString ) { aFile = rString; } SvxFileType GetType() const { return eType; } void SetType( SvxFileType eTp ) { eType = eTp; } @@ -321,7 +321,7 @@ public: SvxFileFormat GetFormat() const { return eFormat; } void SetFormat( SvxFileFormat eFmt ) { eFormat = eFmt; } - rtl::OUString GetFormatted() const; + OUString GetFormatted() const; virtual SvxFieldData* Clone() const; virtual int operator==( const SvxFieldData& ) const; @@ -338,9 +338,9 @@ enum SvxAuthorFormat { SVXAUTHORFORMAT_FULLNAME = 0, // full name class EDITENG_DLLPUBLIC SvxAuthorField : public SvxFieldData { private: - rtl::OUString aName; - rtl::OUString aFirstName; - rtl::OUString aShortName; + OUString aName; + OUString aFirstName; + OUString aShortName; SvxAuthorType eType; SvxAuthorFormat eFormat; @@ -348,20 +348,20 @@ public: SV_DECL_PERSIST1( SvxAuthorField, SvxFieldData, com::sun::star::text::textfield::Type::AUTHOR ) SvxAuthorField(); SvxAuthorField( - const rtl::OUString& rFirstName, - const rtl::OUString& rLastName, - const rtl::OUString& rShortName, + const OUString& rFirstName, + const OUString& rLastName, + const OUString& rShortName, SvxAuthorType eType = SVXAUTHORTYPE_VAR, SvxAuthorFormat eFormat = SVXAUTHORFORMAT_FULLNAME ); - rtl::OUString GetName() const { return aName; } - void SetName( const rtl::OUString& rString ) { aName = rString; } + OUString GetName() const { return aName; } + void SetName( const OUString& rString ) { aName = rString; } - rtl::OUString GetFirstName() const { return aFirstName; } - void SetFirstName( const rtl::OUString& rString ) { aFirstName = rString; } + OUString GetFirstName() const { return aFirstName; } + void SetFirstName( const OUString& rString ) { aFirstName = rString; } - rtl::OUString GetShortName() const { return aShortName; } - void SetShortName( const rtl::OUString& rString ) { aShortName = rString; } + OUString GetShortName() const { return aShortName; } + void SetShortName( const OUString& rString ) { aShortName = rString; } SvxAuthorType GetType() const { return eType; } void SetType( SvxAuthorType eTp ) { eType = eTp; } @@ -369,7 +369,7 @@ public: SvxAuthorFormat GetFormat() const { return eFormat; } void SetFormat( SvxAuthorFormat eFmt ) { eFormat = eFmt; } - rtl::OUString GetFormatted() const; + OUString GetFormatted() const; virtual SvxFieldData* Clone() const; virtual int operator==( const SvxFieldData& ) const; @@ -406,7 +406,7 @@ public: SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_DATE_TIME ) SvxDateTimeField(); - static rtl::OUString GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); + static OUString GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); virtual SvxFieldData* Clone() const; virtual int operator==( const SvxFieldData& ) const; diff --git a/editeng/inc/editeng/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx index 69b64cb8001f..f298732e25e4 100644 --- a/editeng/inc/editeng/flstitem.hxx +++ b/editeng/inc/editeng/flstitem.hxx @@ -39,7 +39,7 @@ class EDITENG_DLLPUBLIC SvxFontListItem : public SfxPoolItem { private: const FontList* pFontList; - com::sun::star::uno::Sequence< rtl::OUString > aFontNameSeq; + com::sun::star::uno::Sequence< OUString > aFontNameSeq; public: TYPEINFO(); diff --git a/editeng/inc/editeng/formatbreakitem.hxx b/editeng/inc/editeng/formatbreakitem.hxx index 9aab77c02c86..343f6fc414dd 100644 --- a/editeng/inc/editeng/formatbreakitem.hxx +++ b/editeng/inc/editeng/formatbreakitem.hxx @@ -56,7 +56,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; diff --git a/editeng/inc/editeng/hangulhanja.hxx b/editeng/inc/editeng/hangulhanja.hxx index 4381d756eabe..e48b31bcf972 100644 --- a/editeng/inc/editeng/hangulhanja.hxx +++ b/editeng/inc/editeng/hangulhanja.hxx @@ -156,7 +156,7 @@ namespace editeng or 'traditional'.) */ virtual void GetNextPortion( - ::rtl::OUString& /* [out] */ _rNextPortion, + OUString& /* [out] */ _rNextPortion, LanguageType& /* [out] */ _rLangOfPortion, sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ) = 0; @@ -249,8 +249,8 @@ namespace editeng */ virtual void ReplaceUnit( const sal_Int32 _nUnitStart, const sal_Int32 _nUnitEnd, - const ::rtl::OUString& _rOrigText, - const ::rtl::OUString& _rReplaceWith, + const OUString& _rOrigText, + const OUString& _rReplaceWith, const ::com::sun::star::uno::Sequence< sal_Int32 > &_rOffsets, ReplacementAction _eAction, LanguageType *pNewUnitLanguage diff --git a/editeng/inc/editeng/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx index ebbd3cd6efbe..258d79383f79 100644 --- a/editeng/inc/editeng/lspcitem.hxx +++ b/editeng/inc/editeng/lspcitem.hxx @@ -101,7 +101,7 @@ public: inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; } virtual sal_uInt16 GetValueCount() const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetEnumValue() const; virtual void SetEnumValue( sal_uInt16 nNewVal ); }; diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx index f0aef1e65975..86f4aef59503 100644 --- a/editeng/inc/editeng/numitem.hxx +++ b/editeng/inc/editeng/numitem.hxx @@ -105,8 +105,8 @@ public: }; private: - rtl::OUString sPrefix; - rtl::OUString sSuffix; + OUString sPrefix; + OUString sSuffix; SvxAdjust eNumAdjust; @@ -168,10 +168,10 @@ public: void SetNumAdjust(SvxAdjust eSet) {eNumAdjust = eSet;} SvxAdjust GetNumAdjust() const {return eNumAdjust;} - void SetPrefix(const rtl::OUString& rSet) { sPrefix = rSet;} - const rtl::OUString& GetPrefix() const { return sPrefix;} - void SetSuffix(const rtl::OUString& rSet) { sSuffix = rSet;} - const rtl::OUString& GetSuffix() const { return sSuffix;} + void SetPrefix(const OUString& rSet) { sPrefix = rSet;} + const OUString& GetPrefix() const { return sPrefix;} + void SetSuffix(const OUString& rSet) { sSuffix = rSet;} + const OUString& GetSuffix() const { return sSuffix;} void SetCharFmtName(const String& rSet){ sCharStyleName = rSet; } virtual const String& GetCharFmtName()const; diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index 9f9c4190d264..e2f208e9b824 100644 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -127,15 +127,15 @@ private: Paragraph& operator=(const Paragraph& rPara ); sal_uInt16 nFlags; - rtl::OUString aBulText; + OUString aBulText; Size aBulSize; sal_Bool bVisible; sal_Bool IsVisible() const { return bVisible; } - void SetText( const rtl::OUString& rText ) { aBulText = rText; aBulSize.Width() = -1; } + void SetText( const OUString& rText ) { aBulText = rText; aBulSize.Width() = -1; } void Invalidate() { aBulSize.Width() = -1; } void SetDepth( sal_Int16 nNewDepth ) { nDepth = nNewDepth; aBulSize.Width() = -1; } - const rtl::OUString& GetText() const { return aBulText; } + const OUString& GetText() const { return aBulText; } Paragraph( sal_Int16 nDepth ); Paragraph( const Paragraph& ); diff --git a/editeng/inc/editeng/postitem.hxx b/editeng/inc/editeng/postitem.hxx index 2d9428f2612a..0f37ea38dd07 100644 --- a/editeng/inc/editeng/postitem.hxx +++ b/editeng/inc/editeng/postitem.hxx @@ -53,7 +53,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx index acf9f9c7a824..0f24a3c91e7f 100644 --- a/editeng/inc/editeng/shaditem.hxx +++ b/editeng/inc/editeng/shaditem.hxx @@ -84,7 +84,7 @@ public: sal_uInt16 CalcShadowSpace( sal_uInt16 nShadow ) const; virtual sal_uInt16 GetValueCount() const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetEnumValue() const; virtual void SetEnumValue( sal_uInt16 nNewVal ); }; diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx index f74c2f7a2338..4f54d8f2f11b 100644 --- a/editeng/inc/editeng/svxacorr.hxx +++ b/editeng/inc/editeng/svxacorr.hxx @@ -142,8 +142,8 @@ struct CompareSvxAutocorrWordList }; typedef std::set SvxAutocorrWordList_Set; -typedef ::boost::unordered_map< ::rtl::OUString, SvxAutocorrWord *, - ::rtl::OUStringHash > SvxAutocorrWordList_Hash; +typedef ::boost::unordered_map< OUString, SvxAutocorrWord *, + OUStringHash > SvxAutocorrWordList_Hash; class EDITENG_DLLPUBLIC SvxAutocorrWordList { diff --git a/editeng/inc/editeng/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx index 4422647bedef..34a078b436b1 100644 --- a/editeng/inc/editeng/udlnitem.hxx +++ b/editeng/inc/editeng/udlnitem.hxx @@ -52,7 +52,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; @@ -98,7 +98,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; }; // class SvxOverlineItem ------------------------------------------------ @@ -115,7 +115,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; }; #endif // #ifndef _SVX_UDLNITEM_HXX diff --git a/editeng/inc/editeng/unofield.hxx b/editeng/inc/editeng/unofield.hxx index f4d4517bde31..d496e7217efc 100644 --- a/editeng/inc/editeng/unofield.hxx +++ b/editeng/inc/editeng/unofield.hxx @@ -38,7 +38,7 @@ class SfxItemPropertySet; class SvxFieldData; com::sun::star::uno::Reference< com::sun::star::uno::XInterface > EDITENG_DLLPUBLIC SAL_CALL SvxUnoTextCreateTextField( - const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + const OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); class EDITENG_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper, public ::cppu::OComponentHelper, @@ -58,7 +58,7 @@ protected: public: SvxUnoTextField( sal_Int32 nServiceId ) throw(); - SvxUnoTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xAnchor, const ::rtl::OUString& rPresentation, const SvxFieldData* pFieldData ) throw(); + SvxUnoTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xAnchor, const OUString& rPresentation, const SvxFieldData* pFieldData ) throw(); virtual ~SvxUnoTextField() throw(); // Internal @@ -79,7 +79,7 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XTextField - virtual ::rtl::OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException); // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -92,20 +92,20 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; #endif diff --git a/editeng/inc/editeng/unoipset.hxx b/editeng/inc/editeng/unoipset.hxx index f36027f00d4b..584eb367f5a1 100644 --- a/editeng/inc/editeng/unoipset.hxx +++ b/editeng/inc/editeng/unoipset.hxx @@ -62,7 +62,7 @@ public: com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const; const SfxItemPropertyMapEntry* getPropertyMapEntries() const {return _pMap;} const SfxItemPropertyMap* getPropertyMap()const { return &m_aPropertyMap;} - const SfxItemPropertySimpleEntry* getPropertyMapEntry(const ::rtl::OUString &rName) const; + const SfxItemPropertySimpleEntry* getPropertyMapEntry(const OUString &rName) const; static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > getPropertySetInfo( const SfxItemPropertyMapEntry* pMap ); }; diff --git a/editeng/inc/editeng/unonrule.hxx b/editeng/inc/editeng/unonrule.hxx index bed8874bc550..985e3e9193bb 100644 --- a/editeng/inc/editeng/unonrule.hxx +++ b/editeng/inc/editeng/unonrule.hxx @@ -67,9 +67,9 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (com::sun::star::uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName( ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(com::sun::star::uno::RuntimeException); // internal com::sun::star::uno::Sequence getNumberingRuleByIndex( sal_Int32 nIndex) const throw(); diff --git a/editeng/inc/editeng/unopracc.hxx b/editeng/inc/editeng/unopracc.hxx index fc7d1d233752..c2d3fdc746f3 100644 --- a/editeng/inc/editeng/unopracc.hxx +++ b/editeng/inc/editeng/unopracc.hxx @@ -49,16 +49,16 @@ public: virtual void SAL_CALL release() throw(); // lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // lang::XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // XServiceName - ::rtl::OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); }; #endif diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx index 3682fc6cf5b0..b5a5e02a8c1b 100644 --- a/editeng/inc/editeng/unotext.hxx +++ b/editeng/inc/editeng/unotext.hxx @@ -89,8 +89,8 @@ class SvxItemPropertySet; #define SVX_UNOEDIT_CHAR_PROPERTIES \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT), EE_CHAR_FONTHEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ { MAP_CHAR_LEN("CharScaleWidth"), EE_CHAR_FONTWIDTH, &::getCppuType((const sal_Int16*)0), 0, 0 }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME), EE_CHAR_FONTINFO, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },\ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),EE_CHAR_FONTINFO, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME), EE_CHAR_FONTINFO, &::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),EE_CHAR_FONTINFO, &::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ @@ -115,8 +115,8 @@ class SvxItemPropertySet; { MAP_CHAR_LEN("CharWordMode"), EE_CHAR_WLM, &::getBooleanCppuType(), 0, 0 }, \ { MAP_CHAR_LEN("CharEmphasis"), EE_CHAR_EMPHASISMARK,&::getCppuType((const sal_Int16*)0), 0, MID_EMPHASIS},\ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN), EE_CHAR_FONTHEIGHT_CJK, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },\ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ @@ -124,8 +124,8 @@ class SvxItemPropertySet; { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN), EE_CHAR_WEIGHT_CJK, &::getCppuType((const float*)0), 0, MID_WEIGHT }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE_ASIAN), EE_CHAR_LANGUAGE_CJK, &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX), EE_CHAR_FONTHEIGHT_CTL, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },\ - {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX),EE_CHAR_FONTINFO_CTL, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const OUString*)0), 0, MID_FONT_FAMILY_NAME },\ + {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX),EE_CHAR_FONTINFO_CTL, &::getCppuType((const OUString*)0), 0, MID_FONT_STYLE_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ @@ -259,19 +259,19 @@ protected: ESelection maSelection; const SvxItemPropertySet* mpPropSet; - virtual void SAL_CALL _setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const ::rtl::OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL _setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Int32 nPara = -1 ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL _getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, sal_Int32 nPara = -1 ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL _setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Int32 nPara = -1 ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL _getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const ::rtl::OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL _getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL _getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // returns true if property found or false if unknown property virtual sal_Bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState); - virtual void SAL_CALL _setPropertyToDefault( const ::rtl::OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); void SetEditSource( SvxEditSource* _pEditSource ) throw(); @@ -310,45 +310,45 @@ public: // ::com::sun::star::text::XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertyStates - //virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + //virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XTextRangeCompare virtual ::sal_Int16 SAL_CALL compareRegionStarts( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2 ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL compareRegionEnds( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2 ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) SAL_THROW(()); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) SAL_THROW(()); }; // ==================================================================== @@ -377,7 +377,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -414,14 +414,14 @@ public: // ::com::sun::star::text::XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::text::XText virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::text::XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); @@ -443,17 +443,17 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL finishParagraphInsert( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xInsertPosition ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // com::sun::star::text::XTextPortionAppend (new import API) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendTextPortion( const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendTextPortion( const OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL insertTextPortion( const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties, const com::sun::star::uno::Reference< com::sun::star::text::XTextRange>& rTextRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL insertTextPortion( const OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties, const com::sun::star::uno::Reference< com::sun::star::text::XTextRange>& rTextRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // com::sun::star::text::XTextCopy virtual void SAL_CALL copyText( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCopy >& xSource ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) SAL_THROW(()); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) SAL_THROW(()); // ::com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -560,21 +560,21 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -625,8 +625,8 @@ public: // ::com::sun::star::text::XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); @@ -641,9 +641,9 @@ public: virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/editeng/inc/editeng/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx index db74f2b37e0f..07dbdb7d2c29 100644 --- a/editeng/inc/editeng/wghtitem.hxx +++ b/editeng/inc/editeng/wghtitem.hxx @@ -53,7 +53,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; diff --git a/editeng/inc/editeng/xmlcnitm.hxx b/editeng/inc/editeng/xmlcnitm.hxx index f82439572452..07e177471807 100644 --- a/editeng/inc/editeng/xmlcnitm.hxx +++ b/editeng/inc/editeng/xmlcnitm.hxx @@ -60,23 +60,23 @@ public: virtual SfxPoolItem *Clone( SfxItemPool * = 0) const { return new SvXMLAttrContainerItem( *this ); } - sal_Bool AddAttr( const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ); - sal_Bool AddAttr( const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rNamespace, - const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ); + sal_Bool AddAttr( const OUString& rLName, + const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ); sal_uInt16 GetAttrCount() const; - ::rtl::OUString GetAttrNamespace( sal_uInt16 i ) const; - ::rtl::OUString GetAttrPrefix( sal_uInt16 i ) const; - const ::rtl::OUString& GetAttrLName( sal_uInt16 i ) const; - const ::rtl::OUString& GetAttrValue( sal_uInt16 i ) const; + OUString GetAttrNamespace( sal_uInt16 i ) const; + OUString GetAttrPrefix( sal_uInt16 i ) const; + const OUString& GetAttrLName( sal_uInt16 i ) const; + const OUString& GetAttrValue( sal_uInt16 i ) const; sal_uInt16 GetFirstNamespaceIndex() const; sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const; - const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const; - const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const; + const OUString& GetNamespace( sal_uInt16 i ) const; + const OUString& GetPrefix( sal_uInt16 i ) const; }; #endif // _SVX_XMLCNITM_HXX diff --git a/editeng/qa/lookuptree/lookuptree_test.cxx b/editeng/qa/lookuptree/lookuptree_test.cxx index 5cfd57804851..c8ee1ab0e558 100644 --- a/editeng/qa/lookuptree/lookuptree_test.cxx +++ b/editeng/qa/lookuptree/lookuptree_test.cxx @@ -194,25 +194,25 @@ void LookupTreeTest::test() CPPUNIT_ASSERT_EQUAL( OUString("uer"), a->suggestAutoCompletion() ); // Test unicode - OUString aQueryString = rtl::OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ); + OUString aQueryString = OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ); a->insert( aQueryString ); a->returnToRoot(); a->advance( sal_Unicode('H') ); OUString aAutocompletedString = a->suggestAutoCompletion(); - OUString aExpectedString = rtl::OStringToOUString( "\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ); + OUString aExpectedString = OStringToOUString( "\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ); CPPUNIT_ASSERT_EQUAL( aExpectedString, aAutocompletedString ); OString aUtf8String( "\xe3\x81\x82\xe3\x81\x97\xe3\x81\x9f" ); - aQueryString = rtl::OStringToOUString( aUtf8String, RTL_TEXTENCODING_UTF8 ); + aQueryString = OStringToOUString( aUtf8String, RTL_TEXTENCODING_UTF8 ); a->insert( aQueryString ); - OUString aGotoString = rtl::OStringToOUString( "\xe3\x81\x82", RTL_TEXTENCODING_UTF8 ); + OUString aGotoString = OStringToOUString( "\xe3\x81\x82", RTL_TEXTENCODING_UTF8 ); a->gotoNode( aGotoString ); aAutocompletedString = a->suggestAutoCompletion(); - aExpectedString = rtl::OStringToOUString( "\xe3\x81\x97\xe3\x81\x9f", RTL_TEXTENCODING_UTF8 ); + aExpectedString = OStringToOUString( "\xe3\x81\x97\xe3\x81\x9f", RTL_TEXTENCODING_UTF8 ); CPPUNIT_ASSERT_EQUAL( aExpectedString, aAutocompletedString ); delete a; diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index dd4711cac8fb..4881593ecc31 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -96,13 +96,13 @@ void Test::testConstruction() { EditEngine aEngine(mpItemPool); - rtl::OUString aParaText = "I am Edit Engine."; + OUString aParaText = "I am Edit Engine."; aEngine.SetText(aParaText); } namespace { -bool includes(const uno::Sequence& rSeq, const rtl::OUString& rVal) +bool includes(const uno::Sequence& rSeq, const OUString& rVal) { for (sal_Int32 i = 0, n = rSeq.getLength(); i < n; ++i) if (rSeq[i] == rVal) @@ -118,7 +118,7 @@ void Test::testUnoTextFields() { // DATE SvxUnoTextField aField(text::textfield::Type::DATE); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.DateTime"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -126,7 +126,7 @@ void Test::testUnoTextFields() { // URL SvxUnoTextField aField(text::textfield::Type::URL); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.URL"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -134,7 +134,7 @@ void Test::testUnoTextFields() { // PAGE SvxUnoTextField aField(text::textfield::Type::PAGE); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.PageNumber"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -142,7 +142,7 @@ void Test::testUnoTextFields() { // PAGES SvxUnoTextField aField(text::textfield::Type::PAGES); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.PageCount"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -150,7 +150,7 @@ void Test::testUnoTextFields() { // TIME SvxUnoTextField aField(text::textfield::Type::TIME); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.DateTime"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -158,7 +158,7 @@ void Test::testUnoTextFields() { // FILE SvxUnoTextField aField(text::textfield::Type::DOCINFO_TITLE); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.docinfo.Title"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -166,7 +166,7 @@ void Test::testUnoTextFields() { // TABLE SvxUnoTextField aField(text::textfield::Type::TABLE); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.SheetName"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -174,7 +174,7 @@ void Test::testUnoTextFields() { // EXTENDED TIME SvxUnoTextField aField(text::textfield::Type::EXTENDED_TIME); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.DateTime"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -182,7 +182,7 @@ void Test::testUnoTextFields() { // EXTENDED FILE SvxUnoTextField aField(text::textfield::Type::EXTENDED_FILE); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.FileName"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -190,7 +190,7 @@ void Test::testUnoTextFields() { // AUTHOR SvxUnoTextField aField(text::textfield::Type::AUTHOR); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.Author"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -198,7 +198,7 @@ void Test::testUnoTextFields() { // MEASURE SvxUnoTextField aField(text::textfield::Type::MEASURE); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.Measure"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -206,7 +206,7 @@ void Test::testUnoTextFields() { // PRESENTATION HEADER SvxUnoTextField aField(text::textfield::Type::PRESENTATION_HEADER); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.presentation.textfield.Header"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -214,7 +214,7 @@ void Test::testUnoTextFields() { // PRESENTATION FOOTER SvxUnoTextField aField(text::textfield::Type::PRESENTATION_FOOTER); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.presentation.textfield.Footer"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -222,7 +222,7 @@ void Test::testUnoTextFields() { // PRESENTATION DATE TIME SvxUnoTextField aField(text::textfield::Type::PRESENTATION_DATE_TIME); - uno::Sequence aSvcs = aField.getSupportedServiceNames(); + uno::Sequence aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.presentation.textfield.DateTime"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index 59dc36a3e4c7..de847d6adc74 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -319,19 +319,19 @@ void EditCharAttribField::SetFont( SvxFont& rFont, OutputDevice* ) rFont.SetColor( *pTxtColor ); } -const rtl::OUString& EditCharAttribField::GetFieldValue() const +const OUString& EditCharAttribField::GetFieldValue() const { return aFieldValue; } -void EditCharAttribField::SetFieldValue(const rtl::OUString& rVal) +void EditCharAttribField::SetFieldValue(const OUString& rVal) { aFieldValue = rVal; } void EditCharAttribField::Reset() { - aFieldValue = rtl::OUString(); + aFieldValue = OUString(); delete pTxtColor; pTxtColor = NULL; delete pFldColor; pFldColor = NULL; } diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index 4ac316d223ad..5d8eb3bd05f6 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -333,7 +333,7 @@ public: // ------------------------------------------------------------------------- class EditCharAttribField: public EditCharAttrib { - rtl::OUString aFieldValue; + OUString aFieldValue; Color* pTxtColor; Color* pFldColor; @@ -352,8 +352,8 @@ public: Color*& GetTxtColor() { return pTxtColor; } Color*& GetFldColor() { return pFldColor; } - const rtl::OUString& GetFieldValue() const; - void SetFieldValue(const rtl::OUString& rVal); + const OUString& GetFieldValue() const; + void SetFieldValue(const OUString& rVal); void Reset(); }; diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 7d3d31b53aa2..3f36098b143f 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -58,9 +58,9 @@ #if defined( DBG_UTIL ) || ( OSL_DEBUG_LEVEL > 1 ) -rtl::OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) +OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) { - rtl::OStringBuffer aDebStr; + OStringBuffer aDebStr; switch ( rItem.Which() ) { case EE_PARA_WRITINGDIR: @@ -182,7 +182,7 @@ rtl::OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) case EE_CHAR_FONTINFO_CTL: { aDebStr.append(RTL_CONSTASCII_STRINGPARAM("Font=")); - aDebStr.append(rtl::OUStringToOString(((SvxFontItem&)rItem).GetFamilyName(), RTL_TEXTENCODING_ASCII_US)); + aDebStr.append(OUStringToOString(((SvxFontItem&)rItem).GetFamilyName(), RTL_TEXTENCODING_ASCII_US)); aDebStr.append(RTL_CONSTASCII_STRINGPARAM(" (CharSet: ")); aDebStr.append(static_cast(((SvxFontItem&)rItem).GetCharSet())); aDebStr.append(')'); @@ -300,7 +300,7 @@ void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, sal_Bool bSearchInParent, continue; const SfxPoolItem& rItem = rSet.Get( nWhich, bSearchInParent ); - rtl::OString aDebStr = DbgOutItem( *rSet.GetPool(), rItem ); + OString aDebStr = DbgOutItem( *rSet.GetPool(), rItem ); fprintf( fp, "%s", aDebStr.getStr() ); } } @@ -328,11 +328,11 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) ParaPortion* pPPortion = pEE->pImpEditEngine->GetParaPortions()[nPortion]; fprintf( fp, "\nParagraph %i: Length = %i, Invalid = %i\nText = '%s'", nPortion, pPPortion->GetNode()->Len(), pPPortion->IsInvalid(), - rtl::OUStringToOString(pPPortion->GetNode()->GetString(), RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(pPPortion->GetNode()->GetString(), RTL_TEXTENCODING_UTF8).getStr() ); fprintf( fp, "\nVorlage:" ); SfxStyleSheet* pStyle = pPPortion->GetNode()->GetStyleSheet(); if ( pStyle ) - fprintf( fp, " %s", rtl::OUStringToOString( pStyle->GetName(), RTL_TEXTENCODING_UTF8).getStr() ); + fprintf( fp, " %s", OUStringToOString( pStyle->GetName(), RTL_TEXTENCODING_UTF8).getStr() ); fprintf( fp, "\nParagraph attribute:" ); DbgOutItemSet( fp, pPPortion->GetNode()->GetContentAttribs().GetItems(), sal_False, sal_False ); @@ -342,7 +342,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) for ( z = 0; z < pPPortion->GetNode()->GetCharAttribs().Count(); z++ ) { const EditCharAttrib& rAttr = pPPortion->GetNode()->GetCharAttribs().GetAttribs()[z]; - rtl::OStringBuffer aCharAttribs; + OStringBuffer aCharAttribs; aCharAttribs.append(RTL_CONSTASCII_STRINGPARAM("\nA")); aCharAttribs.append(static_cast(nPortion)); aCharAttribs.append(RTL_CONSTASCII_STRINGPARAM(": ")); @@ -355,14 +355,14 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) bZeroAttr = sal_True; fprintf(fp, "%s => ", aCharAttribs.getStr()); - rtl::OString aDebStr = DbgOutItem( rPool, *rAttr.GetItem() ); + OString aDebStr = DbgOutItem( rPool, *rAttr.GetItem() ); fprintf( fp, "%s", aDebStr.getStr() ); } if ( bZeroAttr ) fprintf( fp, "\nNULL-Attribute!" ); sal_uInt16 nTextPortions = pPPortion->GetTextPortions().Count(); - rtl::OStringBuffer aPortionStr( + OStringBuffer aPortionStr( RTL_CONSTASCII_STRINGPARAM("\nText portions: #")); aPortionStr.append(static_cast(nTextPortions)); aPortionStr.append(RTL_CONSTASCII_STRINGPARAM(" \nA")); @@ -403,7 +403,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) { EditLine* pLine = pPPortion->GetLines()[nLine]; - rtl::OString aLine(rtl::OUStringToOString(pPPortion->GetNode()->Copy(pLine->GetStart(), pLine->GetEnd() - pLine->GetStart()), RTL_TEXTENCODING_ASCII_US)); + OString aLine(OUStringToOString(pPPortion->GetNode()->Copy(pLine->GetStart(), pLine->GetEnd() - pLine->GetStart()), RTL_TEXTENCODING_ASCII_US)); fprintf( fp, "\nLine %i\t>%s<", nLine, aLine.getStr() ); } // then the internal data ... @@ -428,9 +428,9 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) SfxStyleSheetBase* pStyle = aIter.First(); while ( pStyle ) { - fprintf( fp, "\nTemplate: %s", rtl::OUStringToOString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).getStr() ); - fprintf( fp, "\nParent: %s", rtl::OUStringToOString( pStyle->GetParent(), RTL_TEXTENCODING_ASCII_US ).getStr() ); - fprintf( fp, "\nFollow: %s", rtl::OUStringToOString( pStyle->GetFollow(), RTL_TEXTENCODING_ASCII_US ).getStr() ); + fprintf( fp, "\nTemplate: %s", OUStringToOString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).getStr() ); + fprintf( fp, "\nParent: %s", OUStringToOString( pStyle->GetParent(), RTL_TEXTENCODING_ASCII_US ).getStr() ); + fprintf( fp, "\nFollow: %s", OUStringToOString( pStyle->GetFollow(), RTL_TEXTENCODING_ASCII_US ).getStr() ); DbgOutItemSet( fp, pStyle->GetItemSet(), sal_False, sal_False ); fprintf( fp, "\n----------------------------------" ); diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx index 8b87a432bced..6425f04e5812 100644 --- a/editeng/source/editeng/editdbg.hxx +++ b/editeng/source/editeng/editdbg.hxx @@ -28,7 +28,7 @@ class SfxItemSet; class SfxItemPool; class SfxPoolItem; -rtl::OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem); +OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem); void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, sal_Bool bSearchInParent, sal_Bool bShowALL ); class EditDbg diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 568299bd207c..c1899492bb7d 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2027,9 +2027,9 @@ size_t EditDoc::Count() const return maContents.size(); } -rtl::OUString EditDoc::GetSepStr( LineEnd eEnd ) +OUString EditDoc::GetSepStr( LineEnd eEnd ) { - rtl::OUString aSep; + OUString aSep; if ( eEnd == LINEEND_CR ) aSep = aCR; else if ( eEnd == LINEEND_LF ) @@ -2044,9 +2044,9 @@ XubString EditDoc::GetText( LineEnd eEnd ) const sal_uLong nLen = GetTextLen(); size_t nNodes = Count(); if (nNodes == 0) - return rtl::OUString(); + return OUString(); - rtl::OUString aSep = EditDoc::GetSepStr( eEnd ); + OUString aSep = EditDoc::GetSepStr( eEnd ); sal_Int32 nSepSize = aSep.getLength(); if ( nSepSize ) @@ -2067,7 +2067,7 @@ XubString EditDoc::GetText( LineEnd eEnd ) const } } assert(pCur - newStr->buffer == newStr->length); - return rtl::OUString(newStr, SAL_NO_ACQUIRE); + return OUString(newStr, SAL_NO_ACQUIRE); } XubString EditDoc::GetParaAsString( sal_uInt16 nNode ) const @@ -2267,7 +2267,7 @@ EditPaM EditDoc::InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem ) { DBG_ASSERT( aPaM.GetNode(), "Blinder PaM in EditDoc::InsertFeature" ); - aPaM.GetNode()->Insert( rtl::OUString(CH_FEATURE), aPaM.GetIndex() ); + aPaM.GetNode()->Insert( OUString(CH_FEATURE), aPaM.GetIndex() ); aPaM.GetNode()->ExpandAttribs( aPaM.GetIndex(), 1, GetItemPool() ); // Create a feature-attribute for the feature... diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 59e7ea11229d..e4f370ae42f9 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -808,7 +808,7 @@ public: /// does not delete void Release(size_t nPos); - static rtl::OUString GetSepStr( LineEnd eEnd ); + static OUString GetSepStr( LineEnd eEnd ); }; inline EditCharAttrib* GetAttrib(CharAttribList::AttribsType& rAttribs, size_t nAttr) diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 57d1434f8e67..10630264e57c 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1105,10 +1105,10 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie if ( rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() ) { bDebugPaint = !bDebugPaint; - rtl::OStringBuffer aInfo(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aInfo(RTL_CONSTASCII_STRINGPARAM( "DebugPaint: ")); aInfo.append(bDebugPaint ? "On" : "Off"); - InfoBox(NULL, rtl::OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)).Execute(); + InfoBox(NULL, OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)).Execute(); } bDone = sal_False; } @@ -1380,7 +1380,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie const i18n::CalendarItem2* pArr = xItem.getArray(); for( sal_Int32 n = 0; n <= nCount; ++n ) { - const ::rtl::OUString& rDay = pArr[n].FullName; + const OUString& rDay = pArr[n].FullName; if( pTransliteration->isMatch( aWord, rDay) ) { aComplete = rDay; @@ -1395,7 +1395,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie const i18n::CalendarItem2* pMonthArr = xItem.getArray(); for( sal_Int32 n = 0; n <= nMonthCount; ++n ) { - const ::rtl::OUString& rMon = pMonthArr[n].FullName; + const OUString& rMon = pMonthArr[n].FullName; if( pTransliteration->isMatch( aWord, rMon) ) { aComplete = rMon; @@ -2715,7 +2715,7 @@ Rectangle EditEngine::GetBulletArea( sal_uInt16 ) XubString EditEngine::CalcFieldValue( const SvxFieldItem&, sal_uInt16, sal_uInt16, Color*&, Color*& ) { DBG_CHKTHIS( EditEngine, 0 ); - return rtl::OUString(' '); + return OUString(' '); } void EditEngine::FieldClicked( const SvxFieldItem&, sal_uInt16, sal_uInt16 ) diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 64d8e5dc256a..0433ea5aa195 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -871,7 +871,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const rOStream << static_cast(nParagraphs); sal_Unicode nUniChar = CH_FEATURE; - char cFeatureConverted = rtl::OString(&nUniChar, 1, eEncoding).toChar(); + char cFeatureConverted = OString(&nUniChar, 1, eEncoding).toChar(); // The individual paragraphs ... for (size_t nPara = 0; nPara < nParagraphs; ++nPara) @@ -879,7 +879,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const const ContentInfo& rC = aContents[nPara]; // Text... - rtl::OStringBuffer aBuffer(rtl::OUStringToOString(rC.GetText(), eEncoding)); + OStringBuffer aBuffer(OUStringToOString(rC.GetText(), eEncoding)); // Symbols? bool bSymbolPara = false; @@ -888,7 +888,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const const SvxFontItem& rFontItem = (const SvxFontItem&)rC.GetParaAttribs().Get(EE_CHAR_FONTINFO); if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL ) { - aBuffer = rtl::OStringBuffer(rtl::OUStringToOString(rC.GetText(), RTL_TEXTENCODING_SYMBOL)); + aBuffer = OStringBuffer(OUStringToOString(rC.GetText(), RTL_TEXTENCODING_SYMBOL)); bSymbolPara = true; } } @@ -904,7 +904,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const { // Not correctly converted String aPart( rC.GetText(), rAttr.GetStart(), rAttr.GetEnd() - rAttr.GetStart() ); - rtl::OString aNew(rtl::OUStringToOString(aPart, rFontItem.GetCharSet())); + OString aNew(OUStringToOString(aPart, rFontItem.GetCharSet())); aBuffer.remove(rAttr.GetStart(), rAttr.GetEnd() - rAttr.GetStart()); aBuffer.insert(rAttr.GetStart(), aNew); } @@ -918,7 +918,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const for (sal_uInt16 nChar = rAttr.GetStart(); nChar < rAttr.GetEnd(); ++nChar) { sal_Unicode cOld = rC.GetText().GetChar( nChar ); - char cConv = rtl::OUStringToOString(rtl::OUString(ConvertFontToSubsFontChar(hConv, cOld)), RTL_TEXTENCODING_SYMBOL).toChar(); + char cConv = OUStringToOString(OUString(ConvertFontToSubsFontChar(hConv, cOld)), RTL_TEXTENCODING_SYMBOL).toChar(); if ( cConv ) aBuffer[nChar] = cConv; } @@ -948,7 +948,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const if (it == rAttribs.end()) { sal_Unicode cOld = rC.GetText().GetChar( nChar ); - char cConv = rtl::OUStringToOString(rtl::OUString(ConvertFontToSubsFontChar(hConv, cOld)), RTL_TEXTENCODING_SYMBOL).toChar(); + char cConv = OUStringToOString(OUString(ConvertFontToSubsFontChar(hConv, cOld)), RTL_TEXTENCODING_SYMBOL).toChar(); if ( cConv ) aBuffer[nChar] = cConv; } @@ -960,7 +960,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const // Convert CH_FEATURE to CH_FEATURE_OLD - rtl::OString aText = aBuffer.makeStringAndClear().replace(cFeatureConverted, CH_FEATURE_OLD); + OString aText = aBuffer.makeStringAndClear().replace(cFeatureConverted, CH_FEATURE_OLD); write_lenPrefixed_uInt8s_FromOString(rOStream, aText); // StyleName and Family... @@ -1058,8 +1058,8 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - rtl::OString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream); - pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); + OString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream); + pC->GetText() = OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... pC->GetStyle() = rIStream.ReadUniOrByteString(eSrcEncoding); @@ -1094,7 +1094,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) if ( pItem->Which() == EE_FEATURE_NOTCONV ) { sal_Char cEncodedChar = aByteString[nStart]; - sal_Unicode cChar = rtl::OUString(&cEncodedChar, 1, + sal_Unicode cChar = OUString(&cEncodedChar, 1, ((SvxCharSetColorItem*)pItem)->GetCharSet()).toChar(); pC->GetText().SetChar(nStart, cChar); } @@ -1123,7 +1123,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) const SvxFontItem& rFontItem = (const SvxFontItem&)pC->GetParaAttribs().Get( EE_CHAR_FONTINFO ); if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL ) { - pC->GetText() = rtl::OStringToOUString(aByteString, RTL_TEXTENCODING_SYMBOL); + pC->GetText() = OStringToOUString(aByteString, RTL_TEXTENCODING_SYMBOL); bSymbolPara = true; } } @@ -1138,8 +1138,8 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) || ( bSymbolPara && ( rFontItem.GetCharSet() != RTL_TEXTENCODING_SYMBOL ) ) ) { // Not correctly converted - rtl::OString aPart(aByteString.copy(rAttr.GetStart(), rAttr.GetEnd()-rAttr.GetStart())); - rtl::OUString aNew(rtl::OStringToOUString(aPart, rFontItem.GetCharSet())); + OString aPart(aByteString.copy(rAttr.GetStart(), rAttr.GetEnd()-rAttr.GetStart())); + OUString aNew(OStringToOUString(aPart, rFontItem.GetCharSet())); pC->GetText().Erase( rAttr.GetStart(), rAttr.GetEnd()-rAttr.GetStart() ); pC->GetText().Insert( aNew, rAttr.GetStart() ); } @@ -1254,7 +1254,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) { rtl_uString *pStr = rtl_uString_alloc(nL); rIStream.Read(pStr->buffer, nL*sizeof(sal_Unicode)); - rC.GetText() = rtl::OUString(pStr, SAL_NO_ACQUIRE); + rC.GetText() = OUString(pStr, SAL_NO_ACQUIRE); } // StyleSheetName @@ -1263,7 +1263,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) { rtl_uString *pStr = rtl_uString_alloc(nL); rIStream.Read(pStr->buffer, nL*sizeof(sal_Unicode) ); - rC.GetStyle() = rtl::OUString(pStr, SAL_NO_ACQUIRE); + rC.GetStyle() = OUString(pStr, SAL_NO_ACQUIRE); } } } diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 4e7b5fb02e26..9365fe2c5aa3 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -134,9 +134,9 @@ sal_Bool EditUndo::CanRepeat(SfxRepeatTarget&) const return sal_False; } -rtl::OUString EditUndo::GetComment() const +OUString EditUndo::GetComment() const { - rtl::OUString aComment; + OUString aComment; if (mpEditEngine) aComment = mpEditEngine->GetUndoComment( GetId() ); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 7a2f349960ad..8e10abb4dd60 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -65,7 +65,6 @@ #define PIMPEE pImpEditView->pEditEngine->pImpEditEngine -using ::rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -870,7 +869,7 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) Image aRes; OUString aTmp; osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); -// ::rtl::OString aPath = OString( aTmp.getStr(), aTmp.getLength(), osl_getThreadTextEncoding() ); +// OString aPath = OString( aTmp.getStr(), aTmp.getLength(), osl_getThreadTextEncoding() ); #if defined(WNT) // aTmp = lcl_Win_GetShortPathName( aTmp ); #endif diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 8856564a1a06..d1d91f1d9795 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -35,7 +35,6 @@ #include #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star::linguistic2; diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx index d90ee4b21be3..6ae468663d0e 100644 --- a/editeng/source/editeng/eehtml.hxx +++ b/editeng/source/editeng/eehtml.hxx @@ -35,7 +35,7 @@ class EditHTMLParser : public HTMLParser { using HTMLParser::CallParser; private: - ::rtl::OUStringBuffer maStyleSource; + OUStringBuffer maStyleSource; EditSelection aCurSel; String aBaseURL; EditEngine* mpEditEngine; diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx index 863be4bd29f1..d6cc23e486a8 100644 --- a/editeng/source/editeng/eeobj.cxx +++ b/editeng/source/editeng/eeobj.cxx @@ -54,7 +54,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo sal_uLong nT = SotExchange::GetFormat( rFlavor ); if ( nT == SOT_FORMAT_STRING ) { - aAny <<= (::rtl::OUString)GetString(); + aAny <<= (OUString)GetString(); } else if ( ( nT == SOT_FORMATSTR_ID_EDITENGINE ) || ( nT == SOT_FORMAT_RTF ) ) { diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index d4ffcba7f41f..1cfc48c8b494 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -1316,7 +1316,7 @@ void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::dat try { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aTmpText; + OUString aTmpText; aData >>= aTmpText; String aText(convertLineEnd(aTmpText, LINEEND_LF)); aText.SearchAndReplaceAll( LINE_SEP, ' ' ); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 87a3d4b77493..f6ab122cbbb3 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -899,7 +899,7 @@ public: // text conversion functions void Convert( EditView* pEditView, LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc ); - void ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange, + void ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange, sal_Bool bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const Font *pTargetFont ); ConvInfo * GetConvInfo() const { return pConvInfo; } sal_Bool HasConvertibleTextPortion( LanguageType nLang ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 9edd00ffbcd4..75169ca3e593 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -1557,7 +1557,7 @@ sal_Bool ImpEditEngine::IsInputSequenceCheckingRequired( sal_Unicode nChar, cons pCTLOptions->IsCTLFontEnabled() && pCTLOptions->IsCTLSequenceChecking() && nFirstPos != 0 && /* first char needs not to be checked */ - _xBI.is() && i18n::ScriptType::COMPLEX == _xBI->getScriptType( rtl::OUString( nChar ), 0 ); + _xBI.is() && i18n::ScriptType::COMPLEX == _xBI->getScriptType( OUString( nChar ), 0 ); return bIsSequenceChecking; } @@ -1595,7 +1595,7 @@ void ImpEditEngine::InitScriptTypes( sal_uInt16 nPara ) const EditCharAttrib* pField = pNode->GetCharAttribs().FindNextAttrib( EE_FEATURE_FIELD, 0 ); while ( pField ) { - rtl::OUString aFldText = static_cast(pField)->GetFieldValue(); + OUString aFldText = static_cast(pField)->GetFieldValue(); if ( !aFldText.isEmpty() ) { aText.SetChar( pField->GetStart(), aFldText.getStr()[0] ); @@ -1625,7 +1625,7 @@ void ImpEditEngine::InitScriptTypes( sal_uInt16 nPara ) pField = pField->GetEnd() ? pNode->GetCharAttribs().FindNextAttrib( EE_FEATURE_FIELD, pField->GetEnd() ) : NULL; } - ::rtl::OUString aOUText( aText ); + OUString aOUText( aText ); sal_uInt16 nTextLen = (sal_uInt16)aOUText.getLength(); sal_Int32 nPos = 0; @@ -2521,8 +2521,8 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel, // the text that needs to be checked is only the one // before the current cursor position - rtl::OUString aOldText( aPaM.GetNode()->Copy(0, nTmpPos) ); - rtl::OUString aNewText( aOldText ); + OUString aOldText( aPaM.GetNode()->Copy(0, nTmpPos) ); + OUString aNewText( aOldText ); if (pCTLOptions->IsCTLSequenceCheckingTypeAndReplace()) { /*const xub_StrLen nPrevPos = static_cast< xub_StrLen >*/( _xISC->correctInputSequence( aNewText, nTmpPos - 1, c, nCheckMode ) ); @@ -2560,12 +2560,12 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel, if ( IsUndoEnabled() && !IsInUndo() ) { - EditUndoInsertChars* pNewUndo = new EditUndoInsertChars(pEditEngine, CreateEPaM(aPaM), rtl::OUString(c)); + EditUndoInsertChars* pNewUndo = new EditUndoInsertChars(pEditEngine, CreateEPaM(aPaM), OUString(c)); sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False; InsertUndo( pNewUndo, bTryMerge ); } - aEditDoc.InsertText( (const EditPaM&)aPaM, rtl::OUString(c) ); + aEditDoc.InsertText( (const EditPaM&)aPaM, OUString(c) ); ParaPortion* pPortion = FindParaPortion( aPaM.GetNode() ); OSL_ENSURE( pPortion, "Blind Portion in InsertText" ); pPortion->MarkInvalid( aPaM.GetIndex(), 1 ); @@ -2842,7 +2842,7 @@ EditPaM ImpEditEngine::InsertParaBreak( EditSelection aCurSel ) if ( aPrevParaText.GetChar(n) == '\t' ) aPaM = ImpInsertFeature( aPaM, SfxVoidItem( EE_FEATURE_TAB ) ); else - aPaM = ImpInsertText( aPaM, rtl::OUString(aPrevParaText.GetChar(n)) ); + aPaM = ImpInsertText( aPaM, OUString(aPrevParaText.GetChar(n)) ); n++; } @@ -2883,7 +2883,7 @@ sal_Bool ImpEditEngine::UpdateFields() if ( aStatus.MarkFields() ) rField.GetFldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor ); - rtl::OUString aFldValue = + OUString aFldValue = GetEditEnginePtr()->CalcFieldValue( static_cast(*rField.GetItem()), nPara, rField.GetStart(), rField.GetTxtColor(), rField.GetFldColor()); @@ -3476,7 +3476,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer try { uno::Any aData = rxDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; aNewSelection = ImpInsertText( rPaM, aText ); bDone = sal_True; diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 896179146d58..1299920e8e2f 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -72,7 +72,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -997,7 +996,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY ) aTmpFont.SetPhysFont( GetRefDevice() ); ImplInitDigitMode(GetRefDevice(), aTmpFont.GetLanguage()); - rtl::OUString aFieldValue = cChar ? rtl::OUString(cChar) : ((EditCharAttribField*)pNextFeature)->GetFieldValue(); + OUString aFieldValue = cChar ? OUString(cChar) : ((EditCharAttribField*)pNextFeature)->GetFieldValue(); if ( bCalcCharPositions || !pPortion->HasValidSize() ) { pPortion->GetSize() = aTmpFont.QuickGetTextSize( GetRefDevice(), aFieldValue, 0, aFieldValue.getLength(), 0 ); @@ -1946,7 +1945,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te // A portion for inserting the separator ... TextPortion* pHyphPortion = new TextPortion( 0 ); pHyphPortion->GetKind() = PORTIONKIND_HYPHENATOR; - String aHyphText(rtl::OUString(CH_HYPH)); + String aHyphText(OUString(CH_HYPH)); if ( cAlternateReplChar ) { TextPortion* pPrev = pParaPortion->GetTextPortions()[nEndPortion]; @@ -1961,7 +1960,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te else if ( cAlternateExtraChar ) { pHyphPortion->SetExtraValue( cAlternateExtraChar ); - aHyphText.Insert( rtl::OUString(cAlternateExtraChar), 0 ); + aHyphText.Insert( OUString(cAlternateExtraChar), 0 ); } // Determine the width of the Hyph-Portion: @@ -3048,7 +3047,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt if ( 0x200B == cChar || 0x2060 == cChar ) { - const rtl::OUString aBlank( ' ' ); + const OUString aBlank( ' ' ); long nHalfBlankWidth = aTmpFont.QuickGetTextSize( pOutDev, aBlank, 0, 1, 0 ).Width() / 2; const long nAdvanceX = ( nTmpIdx == nTmpEnd ? @@ -3093,7 +3092,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt if ( 0x200B == cChar ) { - const rtl::OUString aSlash( '/' ); + const OUString aSlash( '/' ); const short nOldEscapement = aTmpFont.GetEscapement(); const sal_uInt8 nOldPropr = aTmpFont.GetPropr(); @@ -3377,7 +3376,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aTmpFont.SetEscapement( 0 ); aTmpFont.SetPropr( 100 ); aTmpFont.SetPhysFont( pOutDev ); - rtl::OUStringBuffer aBlanks; + OUStringBuffer aBlanks; comphelper::string::padToLength( aBlanks, (sal_Int32) nTextLen, ' ' ); Point aUnderlinePos( aOutPos ); if ( nOrientation ) @@ -3504,7 +3503,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aTmpFont.SetEscapement( 0 ); aTmpFont.SetPhysFont( pOutDev ); long nCharWidth = aTmpFont.QuickGetTextSize( pOutDev, - rtl::OUString(pTextPortion->GetExtraValue()), 0, 1, NULL ).Width(); + OUString(pTextPortion->GetExtraValue()), 0, 1, NULL ).Width(); sal_Int32 nChars = 2; if( nCharWidth ) nChars = pTextPortion->GetSize().Width() / nCharWidth; @@ -3513,7 +3512,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt else if ( nChars == 2 ) nChars = 3; // looks better - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; comphelper::string::padToLength(aBuf, nChars, pTextPortion->GetExtraValue()); OUString aText(aBuf.makeStringAndClear()); aTmpFont.QuickDrawText( pOutDev, aTmpPos, aText, 0, aText.getLength(), NULL ); @@ -3531,7 +3530,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt // StripPortions() data callback GetEditEnginePtr()->DrawingTab( aTmpPos, pTextPortion->GetSize().Width(), - rtl::OUString(pTextPortion->GetExtraValue()), + OUString(pTextPortion->GetExtraValue()), aTmpFont, n, nIndex, pTextPortion->GetRightToLeft(), bEndOfLine, bEndOfParagraph, aOverlineColor, aTextLineColor); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f96d83eef2ed..34ef278174f2 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -512,7 +512,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) rOutput.WriteNumber( nNumber ); // Name of the template ... - rOutput << " " << rtl::OUStringToOString(pStyle->GetName(), eDestEnc).getStr(); + rOutput << " " << OUStringToOString(pStyle->GetName(), eDestEnc).getStr(); rOutput << ";}"; } rOutput << '}'; @@ -985,11 +985,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, // SWG: if ( nEsc ) { - rOutput << "{\\*\\updnprop" << rtl::OString::valueOf( + rOutput << "{\\*\\updnprop" << OString::valueOf( static_cast(nProp100)).getStr() << '}'; } long nUpDown = nFontHeight * Abs( nEsc ) / 100; - rtl::OString aUpDown = rtl::OString::valueOf( + OString aUpDown = OString::valueOf( static_cast(nUpDown)); if ( nEsc < 0 ) rOutput << OOO_STRING_SVTOOLS_RTF_DN << aUpDown.getStr(); @@ -1636,7 +1636,7 @@ void ImpEditEngine::SetLanguageAndFont( } -void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtLang, +void ImpEditEngine::ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange, sal_Bool bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const Font *pTargetFont ) @@ -3029,7 +3029,7 @@ short ImpEditEngine::ReplaceTextOnly( else { DBG_ASSERT( nDiff == 1, "TransliterateText - Diff other than expected! But should work..." ); - GetEditDoc().InsertText( EditPaM( pNode, nCurrentPos ), rtl::OUString(rNewText.GetChar(n)) ); + GetEditDoc().InsertText( EditPaM( pNode, nCurrentPos ), OUString(rNewText.GetChar(n)) ); } nDiffs = sal::static_int_cast< short >(nDiffs + nDiff); diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 9be883c2d853..0fc00a418055 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -34,7 +34,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -238,7 +237,7 @@ sal_Bool TextConvWrapper::ConvContinue_impl() // modified version of EditSpellWrapper::SpellContinue // get next convertible text portion and its language - aConvText = rtl::OUString(); + aConvText = OUString(); nConvTextLang = LANGUAGE_NONE; pEditView->GetImpEditEngine()->ImpConvert( aConvText, nConvTextLang, pEditView, GetSourceLanguage(), aConvSel, @@ -298,7 +297,7 @@ void TextConvWrapper::SelectNewUnit_impl( void TextConvWrapper::GetNextPortion( - ::rtl::OUString& /* [out] */ rNextPortion, + OUString& /* [out] */ rNextPortion, LanguageType& /* [out] */ rLangOfPortion, sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ) { @@ -339,8 +338,8 @@ namespace void TextConvWrapper::ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, - const ::rtl::OUString& rOrigText, - const ::rtl::OUString& rReplaceWith, + const OUString& rOrigText, + const OUString& rReplaceWith, const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, LanguageType *pNewUnitLanguage ) diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx index 68975ac502ef..2a0bf0b2ecd2 100644 --- a/editeng/source/editeng/textconv.hxx +++ b/editeng/source/editeng/textconv.hxx @@ -29,7 +29,7 @@ class EditView; class TextConvWrapper : public editeng::HangulHanjaConversion { - rtl::OUString aConvText; // convertible text part found last time + OUString aConvText; // convertible text part found last time LanguageType nConvTextLang; // language of aConvText sal_uInt16 nLastPos; // starting position of the last found text portion (word) sal_uInt16 nUnitOffset; // offset of current unit in the current text portion (word) @@ -63,7 +63,7 @@ class TextConvWrapper : public editeng::HangulHanjaConversion const sal_Int32 nUnitEnd ); void ChangeText( const String &rNewText, - const ::rtl::OUString& rOrigText, + const OUString& rOrigText, const ::com::sun::star::uno::Sequence< sal_Int32 > *pOffsets, ESelection *pESelection ); void ChangeText_impl( const String &rNewText, sal_Bool bKeepAttributes ); @@ -73,15 +73,15 @@ class TextConvWrapper : public editeng::HangulHanjaConversion TextConvWrapper & operator= (const TextConvWrapper &); protected: - virtual void GetNextPortion( ::rtl::OUString& /* [out] */ rNextPortion, + virtual void GetNextPortion( OUString& /* [out] */ rNextPortion, LanguageType& /* [out] */ rLangOfPortion, sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ); virtual void HandleNewUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ); virtual void ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, - const ::rtl::OUString& rOrigText, - const ::rtl::OUString& rReplaceWith, + const OUString& rOrigText, + const OUString& rReplaceWith, const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, LanguageType *pNewUnitLanguage ); diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 42ed83f56b15..0841f53307be 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -152,7 +152,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) : char cTmpSymbol; rStrm >> cTmpSymbol; //convert single byte to unicode - cSymbol = rtl::OUString(&cTmpSymbol, 1, aFont.GetCharSet()).toChar(); + cSymbol = OUString(&cTmpSymbol, 1, aFont.GetCharSet()).toChar(); rStrm >> nScale; @@ -352,7 +352,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c rStrm << static_cast(nWidth); rStrm << nStart; rStrm << nJustify; - rStrm << rtl::OUStringToOString(rtl::OUString(cSymbol), aFont.GetCharSet()).toChar(); + rStrm << OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar(); rStrm << nScale; // UNICODE: rStrm << aPrevText; diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 83dee76661e2..2b3d090b796e 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -93,7 +93,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference& xTe } case text::textfield::Type::URL: { - rtl::OUString aRep, aTarget, aURL; + OUString aRep, aTarget, aURL; sal_Int16 nFmt = -1; xPropSet->getPropertyValue(UNO_TC_PROP_URL_REPRESENTATION) >>= aRep; xPropSet->getPropertyValue(UNO_TC_PROP_URL_TARGET) >>= aTarget; @@ -120,7 +120,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference& xTe } case text::textfield::Type::EXTENDED_FILE: { - rtl::OUString aPresentation; + OUString aPresentation; sal_Bool bIsFixed = false; sal_Int16 nFmt = text::FilenameDisplayFormat::FULL; xPropSet->getPropertyValue(UNO_TC_PROP_IS_FIXED) >>= bIsFixed; @@ -145,7 +145,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference& xTe sal_Bool bIsFixed = false; sal_Bool bFullName = false; sal_Int16 nFmt = -1; - rtl::OUString aPresentation, aContent, aFirstName, aLastName; + OUString aPresentation, aContent, aFirstName, aLastName; xPropSet->getPropertyValue(UNO_TC_PROP_IS_FIXED) >>= bIsFixed; xPropSet->getPropertyValue(UNO_TC_PROP_AUTHOR_FULLNAME) >>= bFullName; xPropSet->getPropertyValue(UNO_TC_PROP_CURRENT_PRESENTATION) >>= aPresentation; @@ -171,7 +171,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference& xTe // #92009# pass fixed attribute to constructor SvxAuthorField* pData = new SvxAuthorField( - aFirstName, aLastName, rtl::OUString(), bIsFixed ? SVXAUTHORTYPE_FIX : SVXAUTHORTYPE_VAR); + aFirstName, aLastName, OUString(), bIsFixed ? SVXAUTHORTYPE_FIX : SVXAUTHORTYPE_VAR); if (!bFullName) { @@ -425,7 +425,7 @@ void SvxDateField::Save( SvPersistStream & rStm ) // ----------------------------------------------------------------------- -rtl::OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const +OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { Date aDate( Date::EMPTY ); if ( eType == SVXDATETYPE_FIX ) @@ -436,7 +436,7 @@ rtl::OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, Languag return GetFormatted( aDate, eFormat, rFormatter, eLang ); } -rtl::OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang ) +OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang ) { if ( eFormat == SVXDATEFORMAT_SYSTEM ) { @@ -490,7 +490,7 @@ rtl::OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, Sv } double fDiffDate = aDate - *(rFormatter.GetNullDate()); - rtl::OUString aStr; + OUString aStr; Color* pColor = NULL; rFormatter.GetOutputString( fDiffDate, nFormatKey, aStr, &pColor ); return aStr; @@ -512,7 +512,7 @@ SvxURLField::SvxURLField() // ----------------------------------------------------------------------- -SvxURLField::SvxURLField( const rtl::OUString& rURL, const rtl::OUString& rRepres, SvxURLFormat eFmt ) +SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLFormat eFmt ) : aURL( rURL ), aRepresentation( rRepres ) { eFormat = eFmt; @@ -541,7 +541,7 @@ int SvxURLField::operator==( const SvxFieldData& rOther ) const // ----------------------------------------------------------------------- -static void write_unicode( SvPersistStream & rStm, const rtl::OUString& rString ) +static void write_unicode( SvPersistStream & rStm, const OUString& rString ) { sal_uInt16 nL = sal::static_int_cast(rString.getLength()); rStm << nL; @@ -549,7 +549,7 @@ static void write_unicode( SvPersistStream & rStm, const rtl::OUString& rString rStm.Write( rString.getStr(), nL*sizeof(sal_Unicode) ); } -static rtl::OUString read_unicode( SvPersistStream & rStm ) +static OUString read_unicode( SvPersistStream & rStm ) { rtl_uString *pStr = NULL; sal_uInt16 nL = 0; @@ -561,7 +561,7 @@ static rtl::OUString read_unicode( SvPersistStream & rStm ) rStm.Read(pStr->buffer, nL*sizeof(sal_Unicode)); } //take ownership of buffer and return, otherwise return empty string - return pStr ? rtl::OUString(pStr, SAL_NO_ACQUIRE) : rtl::OUString(); + return pStr ? OUString(pStr, SAL_NO_ACQUIRE) : OUString(); } void SvxURLField::Load( SvPersistStream & rStm ) @@ -805,7 +805,7 @@ void SvxExtTimeField::Save( SvPersistStream & rStm ) //---------------------------------------------------------------------------- -rtl::OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const +OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { Time aTime( Time::EMPTY ); if ( eType == SVXTIMETYPE_FIX ) @@ -815,7 +815,7 @@ rtl::OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, Lang return GetFormatted( aTime, eFormat, rFormatter, eLang ); } -rtl::OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang ) +OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang ) { switch( eFormat ) { @@ -897,7 +897,7 @@ SvxExtFileField::SvxExtFileField() //---------------------------------------------------------------------------- -SvxExtFileField::SvxExtFileField( const rtl::OUString& rStr, SvxFileType eT, SvxFileFormat eF ) +SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileFormat eF ) { aFile = rStr; eType = eT; @@ -953,16 +953,16 @@ void SvxExtFileField::Save( SvPersistStream & rStm ) //---------------------------------------------------------------------------- -rtl::OUString SvxExtFileField::GetFormatted() const +OUString SvxExtFileField::GetFormatted() const { - rtl::OUString aString; + OUString aString; INetURLObject aURLObj( aFile ); if( INET_PROT_NOT_VALID == aURLObj.GetProtocol() ) { // invalid? try to interpret string as system file name - rtl::OUString aURLStr; + OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFile, aURLStr ); @@ -1044,9 +1044,9 @@ SvxAuthorField::SvxAuthorField() //---------------------------------------------------------------------------- -SvxAuthorField::SvxAuthorField( const rtl::OUString& rFirstName, - const rtl::OUString& rLastName, - const rtl::OUString& rShortName, +SvxAuthorField::SvxAuthorField( const OUString& rFirstName, + const OUString& rLastName, + const OUString& rShortName, SvxAuthorType eT, SvxAuthorFormat eF ) { aName = rLastName; @@ -1109,15 +1109,15 @@ void SvxAuthorField::Save( SvPersistStream & rStm ) //---------------------------------------------------------------------------- -rtl::OUString SvxAuthorField::GetFormatted() const +OUString SvxAuthorField::GetFormatted() const { - rtl::OUString aString; + OUString aString; switch( eFormat ) { case SVXAUTHORFORMAT_FULLNAME: { - rtl::OUStringBuffer aBuf(aFirstName); + OUStringBuffer aBuf(aFirstName); aBuf.append(sal_Unicode(' ')); aBuf.append(aName); aString = aBuf.makeStringAndClear(); @@ -1230,10 +1230,10 @@ void SvxDateTimeField::Save( SvPersistStream & /*rStm*/ ) SvxDateTimeField::SvxDateTimeField() {} -rtl::OUString SvxDateTimeField::GetFormatted( +OUString SvxDateTimeField::GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ) { - rtl::OUString aRet; + OUString aRet; SvxDateFormat eDateFormat = (SvxDateFormat)(eFormat & 0x0f); @@ -1246,7 +1246,7 @@ rtl::OUString SvxDateTimeField::GetFormatted( if(eTimeFormat) { - rtl::OUStringBuffer aBuf(aRet); + OUStringBuffer aBuf(aRet); if (!aRet.isEmpty()) aBuf.append(sal_Unicode(' ')); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 65b5fa0ed34b..8741e69778de 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1540,7 +1540,7 @@ sal_uInt16 SvxShadowItem::GetValueCount() const // ----------------------------------------------------------------------- -rtl::OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + nPos ); @@ -2928,7 +2928,7 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos); @@ -3598,7 +3598,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { OUString sPrefix( UNO_NAME_GRAPHOBJ_URLPREFIX); - OUString sId(rtl::OStringToOUString( + OUString sId(OStringToOUString( pImpl->pGraphicObject->GetUniqueID(), RTL_TEXTENCODING_ASCII_US)); sLink = sPrefix + sId; @@ -3689,7 +3689,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { DELETEZ( pStrLink ); String sTmp( sLink ); - rtl::OString sId(rtl::OUStringToOString(sTmp.Copy( + OString sId(OUStringToOString(sTmp.Copy( sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX)-1), RTL_TEXTENCODING_ASCII_US)); GraphicObject *pOldGrfObj = pImpl->pGraphicObject; diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 719d93950032..7c3ec9c89f09 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -125,9 +125,9 @@ String SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const { Sequence< PropertyValue > aProperties(2); PropertyValue* pValues = aProperties.getArray(); - pValues[0].Name = rtl::OUString("NumberingType"); + pValues[0].Name = OUString("NumberingType"); pValues[0].Value <<= nNumType; - pValues[1].Name = rtl::OUString("Value"); + pValues[1].Name = OUString("Value"); pValues[1].Value <<= (sal_Int32)nNo; try diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index ec97047de345..8210fbbe72b5 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -295,10 +295,10 @@ sal_uInt16 SvxLineSpacingItem::GetValueCount() const // ----------------------------------------------------------------------- -rtl::OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const { //! load strings from resource - rtl::OUString aText; + OUString aText; switch ( nPos ) { case SVX_LINESPACE_USER: @@ -459,7 +459,7 @@ sal_uInt16 SvxAdjustItem::GetValueCount() const // ----------------------------------------------------------------------- -rtl::OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)SVX_ADJUST_BLOCKLINE, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos); @@ -1021,7 +1021,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } if (!(rAnySeq[2] >>= aSeq[n].DecimalChar)) { - ::rtl::OUString aVal; + OUString aVal; if ( (rAnySeq[2] >>= aVal) && aVal.getLength() == 1 ) aSeq[n].DecimalChar = aVal.toChar(); else @@ -1029,7 +1029,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } if (!(rAnySeq[3] >>= aSeq[n].FillChar)) { - ::rtl::OUString aVal; + OUString aVal; if ( (rAnySeq[3] >>= aVal) && aVal.getLength() == 1 ) aSeq[n].FillChar = aVal.toChar(); else @@ -1319,7 +1319,7 @@ bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMe switch ( nMemberId ) { case MID_AUTO: rVal <<= (sal_Bool) bAuto; break; - case MID_NAME: rVal <<= ::rtl::OUString( GetValue() ); break; + case MID_NAME: rVal <<= OUString( GetValue() ); break; default: OSL_FAIL("Wrong MemberId!"); return sal_False; } @@ -1330,7 +1330,7 @@ bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 { nMemberId &= ~CONVERT_TWIPS; sal_Bool bRet; - ::rtl::OUString aStr; + OUString aStr; switch ( nMemberId ) { case MID_AUTO: bRet = ( rVal >>= bAuto ); break; diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 87134db022bc..31d316bd82bf 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -536,7 +536,7 @@ SfxItemPresentation SvxPostureItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" ); @@ -551,7 +551,7 @@ rtl::OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const default: ;//prevent warning } - return nId ? EE_RESSTR(nId) : rtl::OUString(); + return nId ? EE_RESSTR(nId) : OUString(); } bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -701,7 +701,7 @@ SfxItemPresentation SvxWeightItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_WEIGHT_BEGIN + nPos); @@ -1360,10 +1360,10 @@ SfxItemPresentation SvxTextLineItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const +OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const { OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method"); - return rtl::OUString(); + return OUString(); } bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -1462,7 +1462,7 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const // ----------------------------------------------------------------------- -rtl::OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_UL_BEGIN + nPos); @@ -1495,7 +1495,7 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const // ----------------------------------------------------------------------- -rtl::OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_OL_BEGIN + nPos); @@ -1586,7 +1586,7 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_STRIKEOUT_BEGIN + nPos); @@ -2283,7 +2283,7 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_CASEMAP_BEGIN + nPos); @@ -2441,7 +2441,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation // ----------------------------------------------------------------------- -rtl::OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos); @@ -3389,7 +3389,7 @@ sal_uInt16 SvxCharReliefItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; } -rtl::OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE, "enum overflow" ); diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 8f04dc78238e..d63487b33aae 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -116,8 +116,8 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal if( !xContainer.is() ) return sal_False; - const Sequence< ::rtl::OUString > aNameSequence( xContainer->getElementNames() ); - const ::rtl::OUString* pNames = aNameSequence.getConstArray(); + const Sequence< OUString > aNameSequence( xContainer->getElementNames() ); + const OUString* pNames = aNameSequence.getConstArray(); const sal_Int32 nCount = aNameSequence.getLength(); Any aAny; AttributeData* pData; @@ -125,7 +125,7 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal for( nAttr = 0; nAttr < nCount; nAttr++ ) { - const ::rtl::OUString aName( *pNames++ ); + const OUString aName( *pNames++ ); aAny = xContainer->getByName( aName ); if( aAny.getValue() == NULL || aAny.getValueType() != ::getCppuType((AttributeData*)0) ) @@ -135,8 +135,8 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal sal_Int32 pos = aName.indexOf( sal_Unicode(':') ); if( pos != -1 ) { - const ::rtl::OUString aPrefix( aName.copy( 0, pos )); - const ::rtl::OUString aLName( aName.copy( pos+1 )); + const OUString aPrefix( aName.copy( 0, pos )); + const OUString aLName( aName.copy( pos+1 )); if( pData->Namespace.isEmpty() ) { @@ -170,15 +170,15 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal } -sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerItem::AddAttr( const OUString& rLName, + const OUString& rValue ) { return pImpl->AddAttr( rLName, rValue ); } -sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rNamespace, const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerItem::AddAttr( const OUString& rPrefix, + const OUString& rNamespace, const OUString& rLName, + const OUString& rValue ) { return pImpl->AddAttr( rPrefix, rNamespace, rLName, rValue ); } @@ -188,22 +188,22 @@ sal_uInt16 SvXMLAttrContainerItem::GetAttrCount() const return (sal_uInt16)pImpl->GetAttrCount(); } -::rtl::OUString SvXMLAttrContainerItem::GetAttrNamespace( sal_uInt16 i ) const +OUString SvXMLAttrContainerItem::GetAttrNamespace( sal_uInt16 i ) const { return pImpl->GetAttrNamespace( i ); } -::rtl::OUString SvXMLAttrContainerItem::GetAttrPrefix( sal_uInt16 i ) const +OUString SvXMLAttrContainerItem::GetAttrPrefix( sal_uInt16 i ) const { return pImpl->GetAttrPrefix( i ); } -const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrLName( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerItem::GetAttrLName( sal_uInt16 i ) const { return pImpl->GetAttrLName( i ); } -const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrValue( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerItem::GetAttrValue( sal_uInt16 i ) const { return pImpl->GetAttrValue( i ); } @@ -219,12 +219,12 @@ sal_uInt16 SvXMLAttrContainerItem::GetNextNamespaceIndex( sal_uInt16 nIdx ) cons return pImpl->GetNextNamespaceIndex( nIdx ); } -const ::rtl::OUString& SvXMLAttrContainerItem::GetNamespace( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerItem::GetNamespace( sal_uInt16 i ) const { return pImpl->GetNamespace( i ); } -const ::rtl::OUString& SvXMLAttrContainerItem::GetPrefix( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerItem::GetPrefix( sal_uInt16 i ) const { return pImpl->GetPrefix( i ); } diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx index 2b08c0ff7085..3fb077043733 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx @@ -30,7 +30,7 @@ using namespace ::rtl; SvXMLAutoCorrectExport::SvXMLAutoCorrectExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const SvxAutocorrWordList * pNewAutocorr_List, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler) : SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ), pAutocorr_List( pNewAutocorr_List ) @@ -74,7 +74,7 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/) SvXMLExceptionListExport::SvXMLExceptionListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const SvStringsISortDtor &rNewList, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler) : SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ), rList( rNewList ) diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx index 430aca271c4e..3658779fa24e 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx @@ -33,7 +33,7 @@ public: SvXMLAutoCorrectExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const SvxAutocorrWordList * pNewAutocorr_List, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SvXMLAutoCorrectExport ( void ) {} @@ -53,7 +53,7 @@ public: SvXMLExceptionListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const SvStringsISortDtor &rNewList, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SvXMLExceptionListExport ( void ) {} diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index 5d8fc09fea3d..9b4de022c622 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -38,7 +38,7 @@ SvXMLAutoCorrectImport::SvXMLAutoCorrectImport( xStorage ( rNewStorage ) { GetNamespaceMap().Add( - rtl::OUString(aBlockList), + OUString(aBlockList), GetXMLToken ( XML_N_BLOCK_LIST), XML_NAMESPACE_BLOCKLIST ); } @@ -149,7 +149,7 @@ SvXMLExceptionListImport::SvXMLExceptionListImport( rList (rNewList) { GetNamespaceMap().Add( - rtl::OUString(aBlockList), + OUString(aBlockList), GetXMLToken ( XML_N_BLOCK_LIST), XML_NAMESPACE_BLOCKLIST ); } diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index 106ea4023c29..78b2e5571662 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -33,7 +33,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -57,11 +57,11 @@ private: public: SvXMLWordListContext ( SvXMLAutoCorrectImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SvXMLWordListContext ( void ); @@ -74,7 +74,7 @@ private: public: SvXMLWordContext ( SvXMLAutoCorrectImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SvXMLWordContext ( void ); @@ -88,7 +88,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -108,11 +108,11 @@ private: public: SvXMLExceptionListContext ( SvXMLExceptionListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SvXMLExceptionListContext ( void ); @@ -125,7 +125,7 @@ private: public: SvXMLExceptionContext ( SvXMLExceptionListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SvXMLExceptionContext ( void ); diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index 7156590a3f7d..04a9bdf5ffa2 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -33,7 +33,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; SvxAutoCorrCfg::SvxAutoCorrCfg() : aBaseConfig(*this), @@ -53,7 +52,7 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() : { *pS = sAutoPath.GetToken( n, ';' ); INetURLObject aPath( *pS ); - aPath.insertName(rtl::OUString("acor")); + aPath.insertName(OUString("acor")); *pS = aPath.GetMainURL(INetURLObject::DECODE_TO_IURI); } pAutoCorrect = new SvxAutoCorrect( sSharePath, sUserPath ); @@ -217,7 +216,7 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit) } SvxBaseAutoCorrCfg::SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rPar) : - utl::ConfigItem(rtl::OUString("Office.Common/AutoCorrect")), + utl::ConfigItem(OUString("Office.Common/AutoCorrect")), rParent(rPar) { } @@ -526,7 +525,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit) } SvxSwAutoCorrCfg::SvxSwAutoCorrCfg(SvxAutoCorrCfg& rPar) : - utl::ConfigItem(rtl::OUString("Office.Writer/AutoFunction")), + utl::ConfigItem(OUString("Office.Writer/AutoFunction")), rParent(rPar) { } diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 2d1e5f2963f1..860a673e1635 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -58,8 +58,8 @@ namespace editeng class HangulHanjaConversion_Impl { private: - typedef ::std::set< ::rtl::OUString, ::std::less< ::rtl::OUString > > StringBag; - typedef ::std::map< ::rtl::OUString, ::rtl::OUString, ::std::less< ::rtl::OUString > > StringMap; + typedef ::std::set< OUString, ::std::less< OUString > > StringBag; + typedef ::std::map< OUString, OUString, ::std::less< OUString > > StringMap; private: StringBag m_sIgnoreList; @@ -104,14 +104,14 @@ namespace editeng bool m_bAutoReplaceUnique; // state - ::rtl::OUString m_sCurrentPortion; // the text which we are currently working on + OUString m_sCurrentPortion; // the text which we are currently working on LanguageType m_nCurrentPortionLang; // language of m_sCurrentPortion found sal_Int32 m_nCurrentStartIndex; // the start index within m_sCurrentPortion of the current convertible portion sal_Int32 m_nCurrentEndIndex; // the end index (excluding) within m_sCurrentPortion of the current convertible portion sal_Int32 m_nReplacementBaseIndex;// index which ReplaceUnit-calls need to be relative to sal_Int32 m_nCurrentConversionOption; sal_Int16 m_nCurrentConversionType; - Sequence< ::rtl::OUString > + Sequence< OUString > m_aCurrentSuggestions; // the suggestions for the current unit // (means for the text [m_nCurrentStartIndex, m_nCurrentEndIndex) in m_sCurrentPortion) sal_Bool m_bTryBothDirections; // specifies if other conversion directions should be tried when looking for convertible characters @@ -175,7 +175,7 @@ namespace editeng void implProceed( bool _bRepeatCurrentUnit ); // change the current convertible, and do _not_ proceed - void implChange( const ::rtl::OUString& _rChangeInto ); + void implChange( const OUString& _rChangeInto ); /** find the next convertible piece of text, with possibly advancing to the next portion @@ -218,7 +218,7 @@ namespace editeng /** get the string currently considered to be replaced or ignored */ - ::rtl::OUString GetCurrentUnit() const; + OUString GetCurrentUnit() const; /** read options from configuration, update suggestion list and dialog content */ @@ -412,13 +412,13 @@ namespace editeng //put recently used string to front: if( m_bShowRecentlyUsedFirst && m_aCurrentSuggestions.getLength()>1 ) { - ::rtl::OUString sCurrentUnit( GetCurrentUnit() ); + OUString sCurrentUnit( GetCurrentUnit() ); StringMap::const_iterator aRecentlyUsed = m_aRecentlyUsedList.find( sCurrentUnit ); bool bUsedBefore = aRecentlyUsed != m_aRecentlyUsedList.end(); if( bUsedBefore && m_aCurrentSuggestions[0] != aRecentlyUsed->second ) { sal_Int32 nCount = m_aCurrentSuggestions.getLength(); - Sequence< ::rtl::OUString > aTmp(nCount); + Sequence< OUString > aTmp(nCount); aTmp[0]=aRecentlyUsed->second; sal_Int32 nDiff = 1; for( sal_Int32 n=1; nGetNextPortion( m_sCurrentPortion, m_nCurrentPortionLang, bAllowImplicitChanges ); m_nReplacementBaseIndex = 0; @@ -519,7 +519,7 @@ namespace editeng return sal_False; } - ::rtl::OUString HangulHanjaConversion_Impl::GetCurrentUnit() const + OUString HangulHanjaConversion_Impl::GetCurrentUnit() const { DBG_ASSERT( m_nCurrentStartIndex < m_sCurrentPortion.getLength(), "HangulHanjaConversion_Impl::GetCurrentUnit: invalid index into current portion!" ); @@ -528,7 +528,7 @@ namespace editeng DBG_ASSERT( m_nCurrentStartIndex <= m_nCurrentEndIndex, "HangulHanjaConversion_Impl::GetCurrentUnit: invalid interval!" ); - ::rtl::OUString sCurrentUnit = m_sCurrentPortion.copy( m_nCurrentStartIndex, m_nCurrentEndIndex - m_nCurrentStartIndex ); + OUString sCurrentUnit = m_sCurrentPortion.copy( m_nCurrentStartIndex, m_nCurrentEndIndex - m_nCurrentStartIndex ); return sCurrentUnit; } @@ -539,7 +539,7 @@ namespace editeng while ( !bDocumentDone && !bNeedUserInteraction && implNextConvertible( _bRepeatCurrentUnit ) ) { - ::rtl::OUString sCurrentUnit( GetCurrentUnit() ); + OUString sCurrentUnit( GetCurrentUnit() ); // do we need to ignore it? sal_Bool bAlwaysIgnoreThis = m_sIgnoreList.end() != m_sIgnoreList.find( sCurrentUnit ); @@ -704,7 +704,7 @@ namespace editeng } } - void HangulHanjaConversion_Impl::implChange( const ::rtl::OUString& _rChangeInto ) + void HangulHanjaConversion_Impl::implChange( const OUString& _rChangeInto ) { if( _rChangeInto.isEmpty() ) return; @@ -811,7 +811,7 @@ namespace editeng if(m_pConversionDialog) { - ::rtl::OUString sCurrentUnit( GetCurrentUnit() ); + OUString sCurrentUnit( GetCurrentUnit() ); m_pConversionDialog->SetCurrentString( sCurrentUnit, m_aCurrentSuggestions ); m_pConversionDialog->FocusSuggestion(); @@ -873,8 +873,8 @@ namespace editeng DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnChangeAll: no dialog! How this?" ); if ( m_pConversionDialog ) { - ::rtl::OUString sCurrentUnit( m_pConversionDialog->GetCurrentString() ); - ::rtl::OUString sChangeInto( m_pConversionDialog->GetCurrentSuggestion( ) ); + OUString sCurrentUnit( m_pConversionDialog->GetCurrentString() ); + OUString sChangeInto( m_pConversionDialog->GetCurrentSuggestion( ) ); if( !sChangeInto.isEmpty() ) { @@ -916,8 +916,8 @@ namespace editeng { try { - ::rtl::OUString sNewOriginal( m_pConversionDialog->GetCurrentSuggestion( ) ); - Sequence< ::rtl::OUString > aSuggestions; + OUString sNewOriginal( m_pConversionDialog->GetCurrentSuggestion( ) ); + Sequence< OUString > aSuggestions; DBG_ASSERT( m_xConverter.is(), "HangulHanjaConversion_Impl::OnFind: no converter!" ); TextConversionResult aToHanja = m_xConverter->getConversions( diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index aefd764892cc..6b810985e264 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -163,7 +163,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn, Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() ); sal_Bool bWrapReverse = xProp.is() ? *(sal_Bool*)xProp->getPropertyValue( - ::rtl::OUString(UPN_IS_WRAP_REVERSE) ).getValue() + OUString(UPN_IS_WRAP_REVERSE) ).getValue() : sal_False; bReverse = bRevAllow && bWrapReverse; bStartDone = bOther || ( !bReverse && bStart ); @@ -402,7 +402,7 @@ sal_Bool SvxSpellWrapper::SpellNext( ) Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() ); sal_Bool bWrapReverse = xProp.is() ? *(sal_Bool*)xProp->getPropertyValue( - ::rtl::OUString(UPN_IS_WRAP_REVERSE) ).getValue() + OUString(UPN_IS_WRAP_REVERSE) ).getValue() : sal_False; sal_Bool bActRev = bRevAllowed && bWrapReverse; @@ -449,7 +449,7 @@ sal_Bool SvxSpellWrapper::SpellNext( ) { sal_Bool bIsSpellSpecial = xProp.is() ? *(sal_Bool*)xProp->getPropertyValue( - ::rtl::OUString(UPN_IS_SPELL_SPECIAL) ).getValue() + OUString(UPN_IS_SPELL_SPECIAL) ).getValue() : sal_False; // Body area done, ask for special area if( !IsHyphen() && bIsSpellSpecial && HasOtherCnt() ) @@ -561,7 +561,7 @@ sal_Bool SvxSpellWrapper::FindSpellError() { if (IsAllRight() && xAllRightDic.is()) { - xAllRightDic->add( xAlt->getWord(), sal_False, ::rtl::OUString() ); + xAllRightDic->add( xAlt->getWord(), sal_False, OUString() ); } else { diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index fe5981eb5153..96f5b8602470 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -421,7 +421,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt, } } sal_Unicode cSave = rTxt.GetChar( nSttPos ); - rtl::OUString sChar( cSave ); + OUString sChar( cSave ); sChar = rCC.lowercase( sChar ); if( sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar )) { @@ -482,7 +482,7 @@ sal_Bool SvxAutoCorrect::FnChgOrdinalNumber( uno::Reference< i18n::XOrdinalSuffix > xOrdSuffix = i18n::OrdinalSuffix::create( comphelper::getProcessComponentContext() ); - uno::Sequence< rtl::OUString > aSuffixes = xOrdSuffix->getOrdinalSuffix( nNum, rCC.getLanguageTag().getLocale( ) ); + uno::Sequence< OUString > aSuffixes = xOrdSuffix->getOrdinalSuffix( nNum, rCC.getLanguageTag().getLocale( ) ); for ( sal_Int32 nSuff = 0; nSuff < aSuffixes.getLength(); nSuff++ ) { String sSuffix( aSuffixes[ nSuff ] ); @@ -534,17 +534,17 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash( ; // found: " --[][A-z0-9] - if( rCC.isLetterNumeric( rtl::OUString(cCh) ) ) + if( rCC.isLetterNumeric( OUString(cCh) ) ) { for( n = nSttPos-1; n && lcl_IsInAsciiArr( sImplEndSkipChars,(cCh = rTxt.GetChar( --n ))); ) ; // found: "[A-z0-9][] --[][A-z0-9] - if( rCC.isLetterNumeric( rtl::OUString(cCh) )) + if( rCC.isLetterNumeric( OUString(cCh) )) { rDoc.Delete( nSttPos, nSttPos + 2 ); - rDoc.Insert( nSttPos, bAlwaysUseEmDash ? rtl::OUString(cEmDash) : rtl::OUString(cEnDash) ); + rDoc.Insert( nSttPos, bAlwaysUseEmDash ? OUString(cEmDash) : OUString(cEnDash) ); bRet = sal_True; } } @@ -569,17 +569,17 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash( ; // found: " - [][A-z0-9] - if( rCC.isLetterNumeric( rtl::OUString(cCh) ) ) + if( rCC.isLetterNumeric( OUString(cCh) ) ) { cCh = ' '; for( n = nTmpPos-1; n && lcl_IsInAsciiArr( sImplEndSkipChars,(cCh = rTxt.GetChar( --n ))); ) ; // found: "[A-z0-9][] - [][A-z0-9] - if( rCC.isLetterNumeric( rtl::OUString(cCh) )) + if( rCC.isLetterNumeric( OUString(cCh) )) { rDoc.Delete( nTmpPos, nTmpPos + nLen ); - rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? rtl::OUString(cEmDash) : rtl::OUString(cEnDash) ); + rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? OUString(cEmDash) : OUString(cEnDash) ); bRet = sal_True; } } @@ -603,7 +603,7 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash( { nSttPos = nSttPos + nFndPos; rDoc.Delete( nSttPos, nSttPos + 2 ); - rDoc.Insert( nSttPos, (bEnDash ? rtl::OUString(cEnDash) : rtl::OUString(cEmDash)) ); + rDoc.Insert( nSttPos, (bEnDash ? OUString(cEnDash) : OUString(cEmDash)) ); bRet = sal_True; } } @@ -650,7 +650,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace( // Check the presence of "://" in the word - xub_StrLen nStrPos = rTxt.Search( rtl::OUString( "://" ), nSttWdPos + 1 ); + xub_StrLen nStrPos = rTxt.Search( OUString( "://" ), nSttWdPos + 1 ); if ( STRING_NOTFOUND == nStrPos && nEndPos > 0 ) { // Check the previous char @@ -672,7 +672,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace( // Add the non-breaking space at the end pos if ( bHasSpace ) - rDoc.Insert( nPos, rtl::OUString(CHAR_HARDBLANK) ); + rDoc.Insert( nPos, OUString(CHAR_HARDBLANK) ); bRunNext = true; bRet = true; } @@ -868,7 +868,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, if( !pPrevPara ) { // valid separator -> replace - rtl::OUString sChar( *pWordStt ); + OUString sChar( *pWordStt ); sChar = rCC.titlecase(sChar); //see fdo#56740 return !comphelper::string::equals(sChar, *pWordStt) && rDoc.ReplaceRange( xub_StrLen( pWordStt - pStart ), 1, sChar ); @@ -1013,7 +1013,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, // check on the basis of the exception list if( pExceptStt ) { - sWord = rtl::OUString(pStr, pExceptStt - pStr + 1); + sWord = OUString(pStr, pExceptStt - pStr + 1); if( FindInCplSttExceptList(eLang, sWord) ) return sal_False; @@ -1043,7 +1043,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, // Ok, then replace sal_Unicode cSave = *pWordStt; nSttPos = sal::static_int_cast< xub_StrLen >( pWordStt - rTxt.GetBuffer() ); - rtl::OUString sChar( cSave ); + OUString sChar( cSave ); sChar = rCC.titlecase(sChar); //see fdo#56740 sal_Bool bRet = sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar ); @@ -1072,8 +1072,8 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt return false; String aConverted; - aConverted.Append( rCC.uppercase(rtl::OUString(rTxt.GetChar(nSttPos))) ); - aConverted.Append( rCC.lowercase(rtl::OUString(rTxt.GetChar(nSttPos+1))) ); + aConverted.Append( rCC.uppercase(OUString(rTxt.GetChar(nSttPos))) ); + aConverted.Append( rCC.lowercase(OUString(rTxt.GetChar(nSttPos+1))) ); for (xub_StrLen i = nSttPos+2; i < nEndPos; ++i) { @@ -1083,7 +1083,7 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt if ( IsUpperLetter(rCC.getCharacterType(rTxt, i)) ) // Another uppercase letter. Convert it. - aConverted.Append(rCC.lowercase(rtl::OUString(rTxt.GetChar(i)))); + aConverted.Append(rCC.lowercase(OUString(rTxt.GetChar(i)))); else // This is not an alphabetic letter. Leave it as-is. aConverted.Append(rTxt.GetChar(i)); @@ -1134,13 +1134,13 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False ); sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang ); - rtl::OUString sChg( cInsChar ); + OUString sChg( cInsChar ); if( bIns ) rDoc.Insert( nInsPos, sChg ); else rDoc.Replace( nInsPos, sChg ); - sChg = rtl::OUString(cRet); + sChg = OUString(cRet); if( '\"' == cInsChar ) { @@ -1154,7 +1154,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, case LANGUAGE_FRENCH_SWISS: case LANGUAGE_FRENCH_LUXEMBOURG: { - rtl::OUString s( static_cast< sal_Unicode >(0xA0) ); + OUString s( static_cast< sal_Unicode >(0xA0) ); // UNICODE code for no break space if( rDoc.Insert( bSttQuote ? nInsPos+1 : nInsPos, s )) { @@ -1175,7 +1175,7 @@ String SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False ); sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang ); - String sRet = rtl::OUString(cRet); + String sRet = OUString(cRet); if( '\"' == cInsChar ) { @@ -1237,9 +1237,9 @@ sal_uLong SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, } if( bInsert ) - rDoc.Insert( nInsPos, rtl::OUString(cChar) ); + rDoc.Insert( nInsPos, OUString(cChar) ); else - rDoc.Replace( nInsPos, rtl::OUString(cChar) ); + rDoc.Replace( nInsPos, OUString(cChar) ); // Hardspaces autocorrection if ( IsAutoCorrFlag( AddNonBrkSpace ) ) @@ -1695,8 +1695,8 @@ static void GeneratePackageName ( const String& rShort, String& rPackageName ) rPackageName = rShort; xub_StrLen nPos = 0; sal_Unicode pDelims[] = { '!', '/', ':', '.', '\\', 0 }; - rtl::OString sByte(rtl::OUStringToOString(rPackageName, RTL_TEXTENCODING_UTF7)); - rPackageName = rtl::OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US); + OString sByte(OUStringToOString(rPackageName, RTL_TEXTENCODING_UTF7)); + rPackageName = OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US); while( STRING_NOTFOUND != ( nPos = rPackageName.SearchChar( pDelims, nPos ))) { rPackageName.SetChar( nPos, '_' ); @@ -1825,7 +1825,7 @@ sal_Bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang, static sal_Bool lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord) { - String sAbk(rtl::OUString('~')); + String sAbk(OUString('~')); SvStringsISortDtor::const_iterator it = pList->find( &sAbk ); sal_uInt16 nPos = it - pList->begin(); if( nPos < pList->size() ) @@ -2071,7 +2071,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp( OUString aMime( "text/xml" ); uno::Any aAny; aAny <<= aMime; - xStrm->SetProperty( rtl::OUString("MediaType"), aAny ); + xStrm->SetProperty( OUString("MediaType"), aAny ); uno::Reference< uno::XComponentContext > xContext = @@ -2330,7 +2330,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() aDest = INetURLObject ( sUserAutoCorrFile ); if ( SotStorage::IsOLEStorage ( sShareAutoCorrFile ) ) { - aDest.SetExtension ( rtl::OUString("bak") ); + aDest.SetExtension ( OUString("bak") ); bConvert = sal_True; } bCopy = sal_True; @@ -2339,7 +2339,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() { aSource = INetURLObject ( sUserAutoCorrFile ); aDest = INetURLObject ( sUserAutoCorrFile ); - aDest.SetExtension ( rtl::OUString("bak") ); + aDest.SetExtension ( OUString("bak") ); bCopy = bConvert = sal_True; } if (bCopy) @@ -2426,7 +2426,7 @@ sal_Bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg ) { refList->SetSize( 0 ); refList->SetBufferSize( 8192 ); - String aPropName( rtl::OUString( "MediaType" ) ); + String aPropName( OUString( "MediaType" ) ); OUString aMime( "text/xml" ); uno::Any aAny; aAny <<= aMime; @@ -2693,8 +2693,8 @@ bool SvxAutocorrWordList::Insert(SvxAutocorrWord *pWord) { if ( maSet.empty() ) // use the hash { - rtl::OUString aShort( pWord->GetShort() ); - return maHash.insert( std::pair( aShort, pWord ) ).second; + OUString aShort( pWord->GetShort() ); + return maHash.insert( std::pair( aShort, pWord ) ).second; } else return maSet.insert( pWord ).second; @@ -2771,7 +2771,7 @@ bool SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *pFnd, { TransliterationWrapper& rCmp = GetIgnoreTranslWrapper(); - rtl::OUString sWord(rTxt.GetBuffer() + nCalcStt, rChk.Len()); + OUString sWord(rTxt.GetBuffer() + nCalcStt, rChk.Len()); if( rCmp.isEqual( rChk, sWord )) { rStt = nCalcStt; diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx index d532f57f9026..d291179f5cac 100644 --- a/editeng/source/misc/swafopt.cxx +++ b/editeng/source/misc/swafopt.cxx @@ -24,7 +24,7 @@ #include SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() - : aBulletFont( rtl::OUString("StarSymbol"), + : aBulletFont( OUString("StarSymbol"), Size( 0, 14 ) ) { bAutoCorrect = diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 64f65dbe1e59..4a0c2490c2bd 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -103,7 +103,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XMeaning > > SAL_CALL - queryMeanings( const ::rtl::OUString& rTerm, + queryMeanings( const OUString& rTerm, const ::com::sun::star::lang::Locale& rLocale, const ::com::sun::star::beans::PropertyValues& rProperties ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -190,7 +190,7 @@ sal_Bool SAL_CALL uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL ThesDummy_Impl::queryMeanings( - const rtl::OUString& rTerm, + const OUString& rTerm, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, @@ -227,13 +227,13 @@ public: // XSpellChecker1 (same as XSpellChecker but sal_Int16 for language) virtual sal_Bool SAL_CALL - isValid( const ::rtl::OUString& rWord, sal_Int16 nLanguage, + isValid( const OUString& rWord, sal_Int16 nLanguage, const ::com::sun::star::beans::PropertyValues& rProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL - spell( const ::rtl::OUString& rWord, sal_Int16 nLanguage, + spell( const OUString& rWord, sal_Int16 nLanguage, const ::com::sun::star::beans::PropertyValues& rProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -275,7 +275,7 @@ sal_Bool SAL_CALL sal_Bool SAL_CALL - SpellDummy_Impl::isValid( const rtl::OUString& rWord, sal_Int16 nLanguage, + SpellDummy_Impl::isValid( const OUString& rWord, sal_Int16 nLanguage, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException) @@ -289,7 +289,7 @@ sal_Bool SAL_CALL uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL - SpellDummy_Impl::spell( const rtl::OUString& rWord, sal_Int16 nLanguage, + SpellDummy_Impl::spell( const OUString& rWord, sal_Int16 nLanguage, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, uno::RuntimeException) @@ -326,7 +326,7 @@ public: // XHyphenator virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL - hyphenate( const ::rtl::OUString& rWord, + hyphenate( const OUString& rWord, const ::com::sun::star::lang::Locale& rLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& rProperties ) @@ -334,7 +334,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL - queryAlternativeSpelling( const ::rtl::OUString& rWord, + queryAlternativeSpelling( const OUString& rWord, const ::com::sun::star::lang::Locale& rLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& rProperties ) @@ -343,7 +343,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( - const ::rtl::OUString& rWord, + const OUString& rWord, const ::com::sun::star::lang::Locale& rLocale, const ::com::sun::star::beans::PropertyValues& rProperties ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -387,7 +387,7 @@ sal_Bool SAL_CALL uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL HyphDummy_Impl::hyphenate( - const rtl::OUString& rWord, + const OUString& rWord, const lang::Locale& rLocale, sal_Int16 nMaxLeading, const beans::PropertyValues& rProperties ) @@ -404,7 +404,7 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL HyphDummy_Impl::queryAlternativeSpelling( - const rtl::OUString& rWord, + const OUString& rWord, const lang::Locale& rLocale, sal_Int16 nIndex, const PropertyValues& rProperties ) @@ -421,7 +421,7 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL uno::Reference< linguistic2::XPossibleHyphens > SAL_CALL HyphDummy_Impl::createPossibleHyphens( - const rtl::OUString& rWord, + const OUString& rWord, const lang::Locale& rLocale, const beans::PropertyValues& rProperties ) throw(lang::IllegalArgumentException, diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index f76a5f88b67e..d9adae804867 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -653,7 +653,7 @@ XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara { DBG_CHKTHIS(Outliner,0); if ( !aCalcFieldValueHdl.IsSet() ) - return rtl::OUString( ' ' ); + return OUString( ' ' ); EditFieldInfo aFldInfo( this, rField, nPara, nPos ); // The FldColor is preset with COL_LIGHTGRAY. diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index e5af0b08ca29..c39dc7b469cd 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star; static CharSet lcl_GetDefaultTextEncodingForRTF() { - ::rtl::OUString aLangString( Application::GetSettings().GetLanguageTag().getLanguage()); + OUString aLangString( Application::GetSettings().GetLanguageTag().getLanguage()); if ( aLangString == "ru" || aLangString == "uk" ) return RTL_TEXTENCODING_MS_1251; @@ -204,7 +204,7 @@ void SvxRTFParser::NextToken( int nToken ) case RTF_LDBLQUOTE: cCh = 0x201C; goto INSINGLECHAR; case RTF_RDBLQUOTE: cCh = 0x201D; goto INSINGLECHAR; INSINGLECHAR: - aToken = rtl::OUString(cCh); + aToken = OUString(cCh); // no Break, aToken is set as Text case RTF_TEXTTOKEN: { @@ -707,7 +707,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) break; case RTF_KEYWORDS: { - ::rtl::OUString sTemp = GetTextToEndGroup( sStr ); + OUString sTemp = GetTextToEndGroup( sStr ); m_xDocProps->setKeywords( ::comphelper::string::convertCommaSeparated(sTemp) ); break; diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index b7b0a001867e..9aa5b0b2b334 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -452,7 +452,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() case text::textfield::Type::AUTHOR: { - ::rtl::OUString aContent; + OUString aContent; String aFirstName; String aLastName; String aEmpty; @@ -876,7 +876,7 @@ sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { uno::Reference< uno::XInterface > xRet; diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 7440ca6af899..a69fdc7be1fd 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -35,7 +35,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::util::XCloneable; using ::com::sun::star::ucb::XAnyCompare; diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index 30b35357314d..37600abdfce4 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -129,16 +129,16 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxAccessibleTextPropertySet::getImplementati } // XServiceInfo -::rtl::OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName (void) throw (uno::RuntimeException) +OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName (void) throw (uno::RuntimeException) { - return ::rtl::OUString("SvxAccessibleTextPropertySet"); + return OUString("SvxAccessibleTextPropertySet"); } -sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const ::rtl::OUString& sServiceName) throw (uno::RuntimeException) +sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const OUString& sServiceName) throw (uno::RuntimeException) { // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); for (int i=0; i SAL_CALL SvxAccessibleTextPropertySet::getSupportedServiceNames (void) throw (uno::RuntimeException) +uno::Sequence< OUString> SAL_CALL SvxAccessibleTextPropertySet::getSupportedServiceNames (void) throw (uno::RuntimeException) { // TODO return SvxUnoTextRangeBase::getSupportedServiceNames(); diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 20f73674105b..c29240d0dbe3 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -88,7 +88,7 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap() SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} @@ -762,12 +762,12 @@ void SAL_CALL SvxUnoTextRangeBase::addVetoableChangeListener( const OUString& , void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} // XMultiPropertySet -void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { _setPropertyValues( aPropertyNames, aValues, -1 ); } -void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -886,12 +886,12 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< ::rt } } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { return _getPropertyValues( aPropertyNames, -1 ); } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, sal_Int32 nPara ) throw (uno::RuntimeException) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -930,7 +930,7 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( cons return aValues; } -void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< ::rtl::OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) +void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) { } @@ -938,7 +938,7 @@ void SAL_CALL SvxUnoTextRangeBase::removePropertiesChangeListener( const uno::Re { } -void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< ::rtl::OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) +void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) { } @@ -1877,7 +1877,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text { case text::ControlCharacter::PARAGRAPH_BREAK: { - const rtl::OUString aText( (sal_Unicode)13 ); // '\r' does not work on Mac + const OUString aText( (sal_Unicode)13 ); // '\r' does not work on Mac insertString( xRange, aText, bAbsorb ); return; @@ -1928,7 +1928,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text aRange.nEndPos = aRange.nStartPos; pRange->SetSelection( aRange ); - const rtl::OUString aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht + const OUString aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht pRange->setString( aText ); aRange.nStartPos = 0; @@ -2182,7 +2182,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph( } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion( - const ::rtl::OUString& /*rText*/, + const OUString& /*rText*/, const uno::Sequence< beans::PropertyValue >& /*rCharAndParaProps*/, const uno::Reference< text::XTextRange>& /*rTextRange*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) @@ -2193,7 +2193,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion( // com::sun::star::text::XTextPortionAppend (new import API) uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion( - const ::rtl::OUString& rText, + const OUString& rText, const uno::Sequence< beans::PropertyValue >& rCharAndParaProps ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index bf18992295e4..c358abd060b4 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -314,28 +314,28 @@ uno::Any SAL_CALL SvxUnoTextContent::getPropertyValue( const OUString& PropertyN } // XMultiPropertySet -void SAL_CALL SvxUnoTextContent::setPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SvxUnoTextContent::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { _setPropertyValues( aPropertyNames, aValues, mnParagraph ); } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { return _getPropertyValues( aPropertyNames, mnParagraph ); } /*// XTolerantMultiPropertySet -uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SvxUnoTextContent::setPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (lang::IllegalArgumentException, uno::RuntimeException) +uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SvxUnoTextContent::setPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (lang::IllegalArgumentException, uno::RuntimeException) { return _setPropertyValuesTolerant(aPropertyNames, aValues, mnParagraph); } -uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SvxUnoTextContent::getPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (uno::RuntimeException) +uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SvxUnoTextContent::getPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { return _getPropertyValuesTolerant(aPropertyNames, mnParagraph); } -uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SvxUnoTextContent::getDirectPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) +uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SvxUnoTextContent::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { return _getDirectPropertyValuesTolerant(aPropertyNames, mnParagraph); diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index da42d5ce12e5..de686b38ea9d 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -184,19 +184,19 @@ public: // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XStyleFamiliesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException); // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // XModel - virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::uno::RuntimeException); @@ -244,12 +244,12 @@ uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( co } -uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { return createInstance( ServiceSpecifier ); } -Sequence< ::rtl::OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +Sequence< OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { Sequence< OUString > aSeq; return aSeq; @@ -272,14 +272,14 @@ uno::Reference< container::XNameAccess > SAL_CALL SvxSimpleUnoModel::getStyleFam } // XModel -sal_Bool SAL_CALL SvxSimpleUnoModel::attachResource( const ::rtl::OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL SvxSimpleUnoModel::attachResource( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException) { (void)aURL; (void)aArgs; return sal_False; } -::rtl::OUString SAL_CALL SvxSimpleUnoModel::getURL( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL SvxSimpleUnoModel::getURL( ) throw (::com::sun::star::uno::RuntimeException) { OUString aStr; return aStr; @@ -351,7 +351,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, EditEngine* pEditEngine, const ESelection& rSel, - const ::rtl::OUString& rFileName, + const OUString& rFileName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler ); ~SvxXMLTextExportComponent(); @@ -372,7 +372,7 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, EditEngine* pEditEngine, const ESelection& rSel, - const ::rtl::OUString& rFileName, + const OUString& rFileName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler) : SvXMLExport( xContext, rFileName, xHandler, ((frame::XModel*)new SvxSimpleUnoModel()), MAP_CM ), maSelection( rSel ) diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 81963096b3e1..5220dbfdb624 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -114,7 +114,7 @@ public: virtual ~SvxXMLXTextImportComponent() throw (); - static sal_Bool load( const rtl::OUString& rUrl, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xTable ) throw(); + static sal_Bool load( const OUString& rUrl, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xTable ) throw(); protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ); diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 974051b63a31..24a7850427ca 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -102,7 +102,7 @@ void OCommonEmbeddedObject::Deactivate() catch( const uno::Exception& e ) { throw embed::StorageWrappedTargetException( - ::rtl::OUString( "The client could not store the object!" ), + OUString( "The client could not store the object!" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ), uno::makeAny( e ) ); } @@ -227,7 +227,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) { if ( !m_xClientSite.is() ) throw embed::WrongStateException( - ::rtl::OUString( "client site not set, yet" ), + OUString( "client site not set, yet" ), *this ); @@ -310,7 +310,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) uno::Reference< frame::XDispatchProvider > xContainerDP = xInplaceClient->getInplaceDispatchProvider(); // get the container module name - ::rtl::OUString aModuleName; + OUString aModuleName; try { uno::Reference< embed::XComponentSupplier > xCompSupl( m_xClientSite, uno::UNO_QUERY_THROW ); @@ -387,7 +387,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) } } else - throw embed::WrongStateException( ::rtl::OUString( "The object is in unacceptable state!\n" ), + throw embed::WrongStateException( OUString( "The object is in unacceptable state!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -400,7 +400,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_ break; if ( nCurInd == m_aAcceptedStates.getLength() ) - throw embed::WrongStateException( ::rtl::OUString( "The object is in unacceptable state!\n" ), + throw embed::WrongStateException( OUString( "The object is in unacceptable state!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Int32 nDestInd = 0; @@ -410,7 +410,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_ if ( nDestInd == m_aAcceptedStates.getLength() ) throw embed::UnreachableStateException( - ::rtl::OUString( "The state either not reachable, or the object allows the state only as an intermediate one!\n" ), + OUString( "The state either not reachable, or the object allows the state only as an intermediate one!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), m_nObjectState, nNewState ); @@ -434,7 +434,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Int32 nOldState = m_nObjectState; @@ -442,7 +442,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState ) if ( m_nTargetState != -1 ) { // means that the object is currently trying to reach the target state - throw embed::StateChangeInProgressException( ::rtl::OUString(), + throw embed::StateChangeInProgressException( OUString(), uno::Reference< uno::XInterface >(), m_nTargetState ); } @@ -487,7 +487,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState ) // let the object window be shown if ( nNewState == embed::EmbedStates::UI_ACTIVE || nNewState == embed::EmbedStates::INPLACE_ACTIVE ) - PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); + PostEvent_Impl( OUString( "OnVisAreaChanged" ) ); } } @@ -500,7 +500,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OCommonEmbeddedObject::getReachableStates() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aAcceptedStates; @@ -515,7 +515,7 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getCurrentState() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_nObjectState; @@ -546,7 +546,7 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // for internal documents this call is just a duplicate of changeState @@ -579,7 +579,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OCommonEmbeddedObject::getSuppor throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aObjectVerbs; @@ -599,7 +599,7 @@ void SAL_CALL OCommonEmbeddedObject::setClientSite( { if ( m_nObjectState != embed::EmbedStates::LOADED && m_nObjectState != embed::EmbedStates::RUNNING ) throw embed::WrongStateException( - ::rtl::OUString( "The client site can not be set currently!\n" ), + OUString( "The client site can not be set currently!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_xClientSite = xClient; @@ -615,7 +615,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OCommonEmbeddedObject::getClie throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_xClientSite; @@ -632,10 +632,10 @@ void SAL_CALL OCommonEmbeddedObject::update() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); + PostEvent_Impl( OUString( "OnVisAreaChanged" ) ); } //---------------------------------------------- @@ -648,7 +648,7 @@ void SAL_CALL OCommonEmbeddedObject::setUpdateMode( sal_Int32 nMode ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE @@ -669,7 +669,7 @@ sal_Int64 SAL_CALL OCommonEmbeddedObject::getStatus( sal_Int64 ) } //---------------------------------------------- -void SAL_CALL OCommonEmbeddedObject::setContainerName( const ::rtl::OUString& sName ) +void SAL_CALL OCommonEmbeddedObject::setContainerName( const OUString& sName ) throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx index d5aa627400b8..2acc4f1b5829 100644 --- a/embeddedobj/source/commonembedding/inplaceobj.cxx +++ b/embeddedobj/source/commonembedding/inplaceobj.cxx @@ -46,7 +46,7 @@ void SAL_CALL OCommonEmbeddedObject::setObjectRectangles( const awt::Rectangle& if ( m_nObjectState != embed::EmbedStates::INPLACE_ACTIVE && m_nObjectState != embed::EmbedStates::UI_ACTIVE ) - throw embed::WrongStateException( ::rtl::OUString( "The object is not activated inplace!\n" ), + throw embed::WrongStateException( OUString( "The object is not activated inplace!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); awt::Rectangle aNewRectToShow = GetRectangleInterception( aPosRect, aClipRect ); diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 6b09b0742b9b..70b86960a9ad 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -235,7 +235,7 @@ void OCommonEmbeddedObject::LinkInit_Impl( if ( m_aLinkFilterName.getLength() ) { ::comphelper::MimeConfigurationHelper aHelper( m_xContext ); - ::rtl::OUString aExportFilterName = aHelper.GetExportFilterFromImportFilter( m_aLinkFilterName ); + OUString aExportFilterName = aHelper.GetExportFilterFromImportFilter( m_aLinkFilterName ); m_bReadOnly = !( aExportFilterName.equals( m_aLinkFilterName ) ); } @@ -318,7 +318,7 @@ void OCommonEmbeddedObject::requestPositioning( const awt::Rectangle& aRect ) } //------------------------------------------------------ -void OCommonEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName ) +void OCommonEmbeddedObject::PostEvent_Impl( const OUString& aEventName ) { if ( m_pInterfaceContainer ) { @@ -472,7 +472,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OCommonEmbeddedObject::getClassName() +OUString SAL_CALL OCommonEmbeddedObject::getClassName() throw ( uno::RuntimeException ) { if ( m_bDisposed ) @@ -483,7 +483,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID() //------------------------------------------------------ void SAL_CALL OCommonEmbeddedObject::setClassInfo( - const uno::Sequence< sal_Int8 >& /*aClassID*/, const ::rtl::OUString& /*aClassName*/ ) + const uno::Sequence< sal_Int8 >& /*aClassID*/, const OUString& /*aClassName*/ ) throw ( lang::NoSupportException, uno::RuntimeException ) { @@ -503,7 +503,7 @@ uno::Reference< util::XCloseable > SAL_CALL OCommonEmbeddedObject::getComponent( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw uno::RuntimeException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw uno::RuntimeException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 064c74feffd5..ca43e9287027 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -110,7 +110,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans: if ( !bAsTemplateSet ) { aResult.realloc( nLength + 1 ); - aResult[nLength].Name = ::rtl::OUString( "AsTemplate" ); + aResult[nLength].Name = OUString( "AsTemplate" ); aResult[nLength].Value <<= sal_True; } @@ -144,7 +144,7 @@ uno::Reference< io::XInputStream > createTempInpStreamFromStor( } catch( const uno::Exception& e ) { throw embed::StorageWrappedTargetException( - ::rtl::OUString( "Can't copy storage!" ), + OUString( "Can't copy storage!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); } @@ -181,7 +181,7 @@ static void TransferMediaType( const uno::Reference< embed::XStorage >& i_rSourc { const uno::Reference< beans::XPropertySet > xSourceProps( i_rSource, uno::UNO_QUERY_THROW ); const uno::Reference< beans::XPropertySet > xTargetProps( i_rTarget, uno::UNO_QUERY_THROW ); - const ::rtl::OUString sMediaTypePropName( "MediaType" ); + const OUString sMediaTypePropName( "MediaType" ); xTargetProps->setPropertyValue( sMediaTypePropName, xSourceProps->getPropertyValue( sMediaTypePropName ) ); } catch( const uno::Exception& ) @@ -192,7 +192,7 @@ static void TransferMediaType( const uno::Reference< embed::XStorage >& i_rSourc //------------------------------------------------------ static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference< uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rDocumentServiceName, bool _bEmbeddedScriptSupport, const bool i_bDocumentRecoverySupport ) + const OUString& _rDocumentServiceName, bool _bEmbeddedScriptSupport, const bool i_bDocumentRecoverySupport ) { ::comphelper::NamedValueCollection aArguments; aArguments.put( "EmbeddedObject", (sal_Bool)sal_True ); @@ -219,14 +219,14 @@ static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference< } //------------------------------------------------------ -static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, const ::rtl::OUString& aModuleName ) +static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, const OUString& aModuleName ) { if ( xDocument.is() ) { uno::Sequence< beans::PropertyValue > aSeq( 1 ); - aSeq[0].Name = ::rtl::OUString( "SetEmbedded" ); + aSeq[0].Name = OUString( "SetEmbedded" ); aSeq[0].Value <<= sal_True; - xDocument->attachResource( ::rtl::OUString(), aSeq ); + xDocument->attachResource( OUString(), aSeq ); if ( !aModuleName.isEmpty() ) { @@ -244,7 +244,7 @@ static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, c //------------------------------------------------------ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage, const uno::Reference< embed::XStorage >& xNewObjectStorage, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) { if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) ) { @@ -280,7 +280,7 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X //------------------------------------------------------ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) { if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) ) return; @@ -382,14 +382,14 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl() sal_Int32 nLen = 2; uno::Sequence< beans::PropertyValue > aArgs( nLen ); - aArgs[0].Name = ::rtl::OUString( "URL" ); + aArgs[0].Name = OUString( "URL" ); aArgs[0].Value <<= m_aLinkURL; - aArgs[1].Name = ::rtl::OUString( "FilterName" ); + aArgs[1].Name = OUString( "FilterName" ); aArgs[1].Value <<= m_aLinkFilterName; if ( m_bLinkHasPassword ) { aArgs.realloc( ++nLen ); - aArgs[nLen-1].Name = ::rtl::OUString( "Password" ); + aArgs[nLen-1].Name = OUString( "Password" ); aArgs[nLen-1].Value <<= m_aLinkPassword; } @@ -443,9 +443,9 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl() } //------------------------------------------------------ -::rtl::OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 nVersion ) const +OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 nVersion ) const { - ::rtl::OUString aFilterName = GetPresetFilterName(); + OUString aFilterName = GetPresetFilterName(); if ( aFilterName.isEmpty() ) { try { @@ -466,7 +466,7 @@ void OCommonEmbeddedObject::FillDefaultLoadArgs_Impl( const uno::Reference< embe o_rLoadArgs.put( "HierarchicalDocumentName", m_aEntryName ); o_rLoadArgs.put( "ReadOnly", m_bReadOnly ); - ::rtl::OUString aFilterName = GetFilterName( ::comphelper::OStorageHelper::GetXStorageFormat( i_rxStorage ) ); + OUString aFilterName = GetFilterName( ::comphelper::OStorageHelper::GetXStorageFormat( i_rxStorage ) ); OSL_ENSURE( !aFilterName.isEmpty(), "OCommonEmbeddedObject::FillDefaultLoadArgs_Impl: Wrong document service name!" ); if ( aFilterName.isEmpty() ) throw io::IOException(); // TODO: error message/code @@ -512,13 +512,13 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag if ( !xTempInpStream.is() ) throw uno::RuntimeException(); - ::rtl::OUString aTempFileURL; + OUString aTempFileURL; try { // no need to let the file stay after the stream is removed since the embedded document // can not be stored directly uno::Reference< beans::XPropertySet > xTempStreamProps( xTempInpStream, uno::UNO_QUERY_THROW ); - xTempStreamProps->getPropertyValue( ::rtl::OUString( "Uri" ) ) >>= aTempFileURL; + xTempStreamProps->getPropertyValue( OUString( "Uri" ) ) >>= aTempFileURL; } catch( const uno::Exception& ) { @@ -571,8 +571,8 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag //------------------------------------------------------ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStream_Impl( sal_Int32 nStorageFormat, - const ::rtl::OUString& aBaseURL, - const ::rtl::OUString& aHierarchName ) + const OUString& aBaseURL, + const OUString& aHierarchName ) { uno::Reference < io::XOutputStream > xTempOut( io::TempFile::create(m_xContext), @@ -592,23 +592,23 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr if( !xStorable.is() ) throw uno::RuntimeException(); // TODO: - ::rtl::OUString aFilterName = GetFilterName( nStorageFormat ); + OUString aFilterName = GetFilterName( nStorageFormat ); OSL_ENSURE( !aFilterName.isEmpty(), "Wrong document service name!" ); if ( aFilterName.isEmpty() ) throw io::IOException(); // TODO: uno::Sequence< beans::PropertyValue > aArgs( 4 ); - aArgs[0].Name = ::rtl::OUString( "FilterName" ); + aArgs[0].Name = OUString( "FilterName" ); aArgs[0].Value <<= aFilterName; - aArgs[1].Name = ::rtl::OUString( "OutputStream" ); + aArgs[1].Name = OUString( "OutputStream" ); aArgs[1].Value <<= xTempOut; - aArgs[2].Name = ::rtl::OUString( "DocumentBaseURL" ); + aArgs[2].Name = OUString( "DocumentBaseURL" ); aArgs[2].Value <<= aBaseURL; - aArgs[3].Name = ::rtl::OUString( "HierarchicalDocumentName" ); + aArgs[3].Name = OUString( "HierarchicalDocumentName" ); aArgs[3].Value <<= aHierarchName; - xStorable->storeToURL( ::rtl::OUString( "private:stream" ), aArgs ); + xStorable->storeToURL( OUString( "private:stream" ), aArgs ); try { xTempOut->closeOutput(); @@ -648,9 +648,9 @@ void OCommonEmbeddedObject::SaveObject_Impl() } //------------------------------------------------------ -::rtl::OUString OCommonEmbeddedObject::GetBaseURL_Impl() const +OUString OCommonEmbeddedObject::GetBaseURL_Impl() const { - ::rtl::OUString aBaseURL; + OUString aBaseURL; sal_Int32 nInd = 0; if ( m_xClientSite.is() ) @@ -661,7 +661,7 @@ void OCommonEmbeddedObject::SaveObject_Impl() uno::Sequence< beans::PropertyValue > aModelProps = xParentModel->getArgs(); for ( nInd = 0; nInd < aModelProps.getLength(); nInd++ ) if ( aModelProps[nInd].Name.equals( - ::rtl::OUString( "DocumentBaseURL" ) ) ) + OUString( "DocumentBaseURL" ) ) ) { aModelProps[nInd].Value >>= aBaseURL; break; @@ -677,7 +677,7 @@ void OCommonEmbeddedObject::SaveObject_Impl() { for ( nInd = 0; nInd < m_aDocMediaDescriptor.getLength(); nInd++ ) if ( m_aDocMediaDescriptor[nInd].Name.equals( - ::rtl::OUString( "DocumentBaseURL" ) ) ) + OUString( "DocumentBaseURL" ) ) ) { m_aDocMediaDescriptor[nInd].Value >>= aBaseURL; break; @@ -691,11 +691,11 @@ void OCommonEmbeddedObject::SaveObject_Impl() } //------------------------------------------------------ -::rtl::OUString OCommonEmbeddedObject::GetBaseURLFrom_Impl( +OUString OCommonEmbeddedObject::GetBaseURLFrom_Impl( const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) { - ::rtl::OUString aBaseURL; + OUString aBaseURL; sal_Int32 nInd = 0; for ( nInd = 0; nInd < lArguments.getLength(); nInd++ ) @@ -735,8 +735,8 @@ void OCommonEmbeddedObject::SwitchDocToStorage_Impl( const uno::Reference< docum //------------------------------------------------------ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed::XStorage >& xStorage, sal_Int32 nStorageFormat, - const ::rtl::OUString& aBaseURL, - const ::rtl::OUString& aHierarchName, + const OUString& aBaseURL, + const OUString& aHierarchName, sal_Bool bAttachToTheStorage ) { OSL_ENSURE( xStorage.is(), "No storage is provided for storing!" ); @@ -754,18 +754,18 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed: if ( xDoc.is() ) { - ::rtl::OUString aFilterName = GetFilterName( nStorageFormat ); + OUString aFilterName = GetFilterName( nStorageFormat ); OSL_ENSURE( !aFilterName.isEmpty(), "Wrong document service name!" ); if ( aFilterName.isEmpty() ) throw io::IOException(); // TODO: uno::Sequence< beans::PropertyValue > aArgs( 3 ); - aArgs[0].Name = ::rtl::OUString( "FilterName" ); + aArgs[0].Name = OUString( "FilterName" ); aArgs[0].Value <<= aFilterName; - aArgs[2].Name = ::rtl::OUString( "DocumentBaseURL" ); + aArgs[2].Name = OUString( "DocumentBaseURL" ); aArgs[2].Value <<= aBaseURL; - aArgs[1].Name = ::rtl::OUString( "HierarchicalDocumentName" ); + aArgs[1].Name = OUString( "HierarchicalDocumentName" ); aArgs[1].Value <<= aHierarchName; xDoc->storeToStorage( xStorage, aArgs ); @@ -860,16 +860,16 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_ aTempMediaDescr.realloc( 4 ); // TODO/LATER: may be private:stream should be used as target URL - ::rtl::OUString aTempFileURL; + OUString aTempFileURL; uno::Reference< io::XInputStream > xTempStream = StoreDocumentToTempStream_Impl( SOFFICE_FILEFORMAT_CURRENT, - ::rtl::OUString(), - ::rtl::OUString() ); + OUString(), + OUString() ); try { // no need to let the file stay after the stream is removed since the embedded document // can not be stored directly uno::Reference< beans::XPropertySet > xTempStreamProps( xTempStream, uno::UNO_QUERY_THROW ); - xTempStreamProps->getPropertyValue( ::rtl::OUString( "Uri" ) ) >>= aTempFileURL; + xTempStreamProps->getPropertyValue( OUString( "Uri" ) ) >>= aTempFileURL; } catch( const uno::Exception& ) { @@ -877,21 +877,21 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_ OSL_ENSURE( !aTempFileURL.isEmpty(), "Couldn't retrieve temporary file URL!\n" ); - aTempMediaDescr[0].Name = ::rtl::OUString( "URL" ); + aTempMediaDescr[0].Name = OUString( "URL" ); aTempMediaDescr[0].Value <<= aTempFileURL; - aTempMediaDescr[1].Name = ::rtl::OUString( "InputStream" ); + aTempMediaDescr[1].Name = OUString( "InputStream" ); aTempMediaDescr[1].Value <<= xTempStream; - aTempMediaDescr[2].Name = ::rtl::OUString( "FilterName" ); + aTempMediaDescr[2].Name = OUString( "FilterName" ); aTempMediaDescr[2].Value <<= GetFilterName( nStorageFormat ); - aTempMediaDescr[3].Name = ::rtl::OUString( "AsTemplate" ); + aTempMediaDescr[3].Name = OUString( "AsTemplate" ); aTempMediaDescr[3].Value <<= sal_True; } else { aTempMediaDescr.realloc( 2 ); - aTempMediaDescr[0].Name = ::rtl::OUString( "URL" ); + aTempMediaDescr[0].Name = OUString( "URL" ); aTempMediaDescr[0].Value <<= m_aLinkURL; - aTempMediaDescr[1].Name = ::rtl::OUString( "FilterName" ); + aTempMediaDescr[1].Name = OUString( "FilterName" ); aTempMediaDescr[1].Value <<= m_aLinkFilterName; } @@ -903,7 +903,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_ //------------------------------------------------------ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) @@ -923,12 +923,12 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -943,7 +943,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( // it can switch persistent representation only without initialization throw embed::WrongStateException( - ::rtl::OUString( "Can't change persistent representation of activated object!\n" ), + OUString( "Can't change persistent representation of activated object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -967,7 +967,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( } else throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1124,7 +1124,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( //TODO: //} else - throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); } @@ -1132,7 +1132,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( //------------------------------------------------------ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -1150,13 +1150,13 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed:: if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // for now support of this interface is required to allow breaking of links and converting them to normal embedded @@ -1258,7 +1258,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed:: //------------------------------------------------------ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -1278,13 +1278,13 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed:: if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // for now support of this interface is required to allow breaking of links and converting them to normal embedded @@ -1325,7 +1325,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed:: OSL_FAIL( "Can not retrieve own storage media type!\n" ); } - PostEvent_Impl( ::rtl::OUString( "OnSaveAs" ) ); + PostEvent_Impl( OUString( "OnSaveAs" ) ); sal_Bool bTryOptimization = sal_False; for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ ) @@ -1413,7 +1413,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1424,7 +1424,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) { if ( bUseNew ) m_aEntryName = m_aNewEntryName; - m_aNewEntryName = ::rtl::OUString(); + m_aNewEntryName = OUString(); return; } @@ -1449,7 +1449,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( xModif.is() ) xModif->setModified( sal_False ); - PostEvent_Impl( ::rtl::OUString( "OnSaveAsDone" )); + PostEvent_Impl( OUString( "OnSaveAsDone" )); } else { @@ -1466,7 +1466,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) m_xNewObjectStorage = uno::Reference< embed::XStorage >(); m_xNewParentStorage = uno::Reference< embed::XStorage >(); - m_aNewEntryName = ::rtl::OUString(); + m_aNewEntryName = OUString(); m_aNewDocMediaDescriptor.realloc( 0 ); m_bWaitSaveCompleted = sal_False; @@ -1492,7 +1492,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_xObjectStorage.is() ) @@ -1502,7 +1502,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OCommonEmbeddedObject::getEntryName() +OUString SAL_CALL OCommonEmbeddedObject::getEntryName() throw ( embed::WrongStateException, uno::RuntimeException ) { @@ -1513,13 +1513,13 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aEntryName; @@ -1545,13 +1545,13 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bReadOnly ) @@ -1561,7 +1561,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() if ( m_nObjectState == embed::EmbedStates::LOADED ) return; - PostEvent_Impl( ::rtl::OUString( "OnSave" ) ); + PostEvent_Impl( OUString( "OnSave" ) ); OSL_ENSURE( m_pDocHolder->GetComponent().is(), "If an object is activated or in running state it must have a document!\n" ); if ( !m_pDocHolder->GetComponent().is() ) @@ -1610,7 +1610,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() if ( xModif.is() ) xModif->setModified( sal_False ); - PostEvent_Impl( ::rtl::OUString( "OnSaveDone" ) ); + PostEvent_Impl( OUString( "OnSaveDone" ) ); } //------------------------------------------------------ @@ -1625,13 +1625,13 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_bReadOnly; @@ -1657,7 +1657,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1665,33 +1665,33 @@ void SAL_CALL OCommonEmbeddedObject::reload( { // the object is still not loaded throw embed::WrongStateException( - ::rtl::OUString( "The object must be in loaded state to be reloaded!\n" ), + OUString( "The object must be in loaded state to be reloaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bIsLink ) { // reload of the link - ::rtl::OUString aOldLinkFilter = m_aLinkFilterName; + OUString aOldLinkFilter = m_aLinkFilterName; - ::rtl::OUString aNewLinkFilter; + OUString aNewLinkFilter; for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ ) { if ( lArguments[nInd].Name == "URL" ) { // the new URL lArguments[nInd].Value >>= m_aLinkURL; - m_aLinkFilterName = ::rtl::OUString(); + m_aLinkFilterName = OUString(); } else if ( lArguments[nInd].Name == "FilterName" ) { lArguments[nInd].Value >>= aNewLinkFilter; - m_aLinkFilterName = ::rtl::OUString(); + m_aLinkFilterName = OUString(); } } @@ -1703,7 +1703,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( else { uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "URL" ); + aArgs[0].Name = OUString( "URL" ); aArgs[0].Value <<= m_aLinkURL; m_aLinkFilterName = aHelper.UpdateMediaDescriptorWithFilterName( aArgs, sal_False ); } @@ -1764,7 +1764,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( //------------------------------------------------------ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName ) + const OUString& sEntName ) throw ( lang::IllegalArgumentException, embed::WrongStateException, io::IOException, @@ -1779,7 +1779,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt { // it must be a linked initialized object throw embed::WrongStateException( - ::rtl::OUString( "The object is not a valid linked object!\n" ), + OUString( "The object is not a valid linked object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } else @@ -1789,12 +1789,12 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt } if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -1802,13 +1802,13 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt { // it must be a linked initialized object throw embed::WrongStateException( - ::rtl::OUString( "The object is not a valid linked object!\n" ), + OUString( "The object is not a valid linked object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); uno::Reference< container::XNameAccess > xNameAccess( xStorage, uno::UNO_QUERY ); @@ -1852,8 +1852,8 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt m_pDocHolder->Show(); m_bIsLink = sal_False; - m_aLinkFilterName = ::rtl::OUString(); - m_aLinkURL = ::rtl::OUString(); + m_aLinkFilterName = OUString(); + m_aLinkURL = OUString(); } //------------------------------------------------------ @@ -1869,7 +1869,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isLink() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OCommonEmbeddedObject::getLinkURL() +OUString SAL_CALL OCommonEmbeddedObject::getLinkURL() throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException ) @@ -1880,7 +1880,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isLink() if ( !m_bIsLink ) throw embed::WrongStateException( - ::rtl::OUString( "The object is not a link object!\n" ), + OUString( "The object is not a link object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aLinkURL; diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index d8fcaf7631f6..d21480694389 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -35,7 +35,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory( { void * pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); + OUString aImplName( OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if ( pServiceManager ) diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index c4e4e373109f..7aca13b50b65 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -107,13 +107,13 @@ embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualR // TODO: if object is in loaded state it should switch itself to the running state if ( m_nObjectState == -1 || m_nObjectState == embed::EmbedStates::LOADED ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no model!\n" ), + throw embed::WrongStateException( OUString( "The own object has no model!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: return for the aspect of the document @@ -134,7 +134,7 @@ void SAL_CALL OSpecialEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, cons OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); maSize = aSize; @@ -153,11 +153,11 @@ awt::Size SAL_CALL OSpecialEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no model!\n" ), + throw embed::WrongStateException( OUString( "The own object has no model!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); awt::Size aResult; @@ -175,7 +175,7 @@ sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return embed::EmbedMapUnits::ONE_100TH_MM; @@ -204,7 +204,7 @@ void SAL_CALL OSpecialEmbeddedObject::doVerb( sal_Int32 nVerbID ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( nVerbID == -7 ) diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx index 499507e07b7f..a3826de0963c 100644 --- a/embeddedobj/source/commonembedding/visobj.cxx +++ b/embeddedobj/source/commonembedding/visobj.cxx @@ -46,11 +46,11 @@ void SAL_CALL OCommonEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_bHasClonedSize = sal_False; @@ -86,7 +86,7 @@ awt::Size SAL_CALL OCommonEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); @@ -126,11 +126,11 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bHasClonedSize ) @@ -169,14 +169,14 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The own object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The own object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Bool bBackToLoaded = sal_False; @@ -205,8 +205,8 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe throw uno::RuntimeException(); datatransfer::DataFlavor aDataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), - ::rtl::OUString( "GDIMetaFile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), + OUString( "GDIMetaFile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); if( xTransferable->isDataFlavorSupported( aDataFlavor )) diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index 404635e73a79..74e4d4f0563a 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -37,18 +37,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.OOoEmbeddedObjectFactory"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.OOoEmbeddedObjectFactory"); + aRet[1] = OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); + return OUString("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"); } //------------------------------------------------------------------------- @@ -61,7 +61,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::impl_static //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceInitFromEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -73,12 +73,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OOoEmbeddedObjectFactory::createInstanceInitFromEntry" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -101,9 +101,9 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta if ( !xPropSet.is() ) throw uno::RuntimeException(); - ::rtl::OUString aMediaType; + OUString aMediaType; try { - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" ) ); + uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" ) ); aAny >>= aMediaType; } catch ( const uno::Exception& ) @@ -153,7 +153,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -164,19 +164,19 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OOoEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); uno::Sequence< beans::PropertyValue > aTempMedDescr( aMediaDescr ); // check if there is FilterName - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); uno::Reference< uno::XInterface > xResult; @@ -217,9 +217,9 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceInitNew( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& /*aClassName*/, + const OUString& /*aClassName*/, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, io::IOException, @@ -231,12 +231,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta uno::Reference< uno::XInterface > xResult; if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -268,9 +268,9 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& /*aClassName*/, + const OUString& /*aClassName*/, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) @@ -283,12 +283,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta // the initialization is completelly controlled by user if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -299,7 +299,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta uno::Sequence< beans::PropertyValue > aTempMedDescr( lArguments ); if ( nEntryConnectionMode == embed::EntryInitModes::MEDIA_DESCRIPTOR_INIT ) { - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, aObject ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, aObject ); if ( aFilterName.isEmpty() ) // the object must be OOo embedded object, if it is not an exception must be thrown throw io::IOException(); // TODO: @@ -331,7 +331,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceLink( const uno::Reference< embed::XStorage >& /*xStorage*/, - const ::rtl::OUString& /*sEntName*/, + const OUString& /*sEntName*/, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -346,17 +346,17 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta uno::Sequence< beans::PropertyValue > aTempMedDescr( aMediaDescr ); // check if there is URL, URL must exist - ::rtl::OUString aURL; + OUString aURL; for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ ) if ( aTempMedDescr[nInd].Name == "URL" ) aTempMedDescr[nInd].Value >>= aURL; if ( aURL.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No URL for the link is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); if ( !aFilterName.isEmpty() ) { @@ -385,9 +385,9 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInstanceLinkUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& /*aClassName*/, + const OUString& /*aClassName*/, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -401,24 +401,24 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta // the initialization is completelly controlled by user if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); uno::Sequence< beans::PropertyValue > aTempMedDescr( lArguments ); - ::rtl::OUString aURL; + OUString aURL; for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ ) if ( aTempMedDescr[nInd].Name == "URL" ) aTempMedDescr[nInd].Value >>= aURL; if ( aURL.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No URL for the link is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); @@ -426,7 +426,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta if ( !aObject.getLength() ) throw io::IOException(); // unexpected mimetype of the storage - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, aObject ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, aObject ); if ( !aFilterName.isEmpty() ) { @@ -449,17 +449,17 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OOoEmbeddedObjectFactory::getImplementationName() +OUString SAL_CALL OOoEmbeddedObjectFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OOoEmbeddedObjectFactory::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OOoEmbeddedObjectFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -469,25 +469,25 @@ sal_Bool SAL_CALL OOoEmbeddedObjectFactory::supportsService( const ::rtl::OUStri } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"); + aRet[1] = OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); + return OUString("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"); } //------------------------------------------------------------------------- @@ -500,9 +500,9 @@ uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::createInstanceUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& /*aClassName*/, + const OUString& /*aClassName*/, const uno::Reference< embed::XStorage >& /*xStorage*/, - const ::rtl::OUString& /*sEntName*/, + const OUString& /*sEntName*/, sal_Int32 /*nEntryConnectionMode*/, const uno::Sequence< beans::PropertyValue >& /*lArguments*/, const uno::Sequence< beans::PropertyValue >& /*lObjArgs*/ ) @@ -524,17 +524,17 @@ uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::crea } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::getImplementationName() +OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OOoSpecialEmbeddedObjectFactory::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OOoSpecialEmbeddedObjectFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -544,7 +544,7 @@ sal_Bool SAL_CALL OOoSpecialEmbeddedObjectFactory::supportsService( const ::rtl: } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx index 0125d1fa4f38..a13b2aa3c318 100644 --- a/embeddedobj/source/commonembedding/xfactory.hxx +++ b/embeddedobj/source/commonembedding/xfactory.hxx @@ -42,9 +42,9 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -52,23 +52,23 @@ public: // XEmbedObjectCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XEmbedObjectFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLinkCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLinkFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; @@ -89,21 +89,21 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); // XEmbedObjectFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; #endif diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index f34d55c68a04..b9deda50e7a7 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -102,12 +102,12 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >& sal_Int32 nTargetIndex, const uno::Reference< container::XIndexAccess >& xSourceMenu, sal_Int32 nSourceIndex, - const ::rtl::OUString aContModuleName, + const OUString aContModuleName, const uno::Reference< frame::XDispatchProvider >& xSourceDisp ) { sal_Int32 nInd = 0; - ::rtl::OUString aModuleIdentPropName( "ModuleIdentifier" ); - ::rtl::OUString aDispProvPropName( "DispatchProvider" ); + OUString aModuleIdentPropName( "ModuleIdentifier" ); + OUString aDispProvPropName( "DispatchProvider" ); sal_Bool bModuleNameSet = sal_False; sal_Bool bDispProvSet = sal_False; @@ -164,11 +164,11 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >& m_aOutplaceFrameProps.realloc( 3 ); beans::NamedValue aArg; - aArg.Name = ::rtl::OUString("TopWindow"); + aArg.Name = OUString("TopWindow"); aArg.Value <<= sal_True; m_aOutplaceFrameProps[0] <<= aArg; - aArg.Name = ::rtl::OUString("MakeVisible"); + aArg.Name = OUString("MakeVisible"); aArg.Value <<= sal_False; m_aOutplaceFrameProps[1] <<= aArg; @@ -183,7 +183,7 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >& } m_refCount--; - aArg.Name = ::rtl::OUString("ParentFrame"); + aArg.Name = OUString("ParentFrame"); aArg.Value <<= xDesktop; //TODO/LATER: should use parent document frame m_aOutplaceFrameProps[2] <<= aArg; } @@ -366,7 +366,7 @@ sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFra { uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xLayoutManager; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager; if ( xLayoutManager.is() ) { xLayoutManager->setVisible( bVisible ); @@ -434,7 +434,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& } awt::WindowDescriptor aOwnWinDescriptor( awt::WindowClass_TOP, - ::rtl::OUString("dockingwindow"), + OUString("dockingwindow"), xMyParent, 0, awt::Rectangle(),//aOwnRectangle, @@ -453,14 +453,14 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& uno::Sequence< uno::Any > aArgs( 2 ); beans::NamedValue aArg; - aArg.Name = ::rtl::OUString("ContainerWindow"); + aArg.Name = OUString("ContainerWindow"); aArg.Value <<= xOwnWindow; aArgs[0] <<= aArg; uno::Reference< frame::XFrame > xContFrame( xContDisp, uno::UNO_QUERY ); if ( xContFrame.is() ) { - aArg.Name = ::rtl::OUString("ParentFrame"); + aArg.Name = OUString("ParentFrame"); aArg.Value <<= xContFrame; aArgs[1] <<= aArg; } @@ -535,7 +535,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() if( xUIConfigManager.is()) { xResult = xUIConfigManager->getSettings( - ::rtl::OUString( "private:resource/menubar/menubar" ), + OUString( "private:resource/menubar/menubar" ), sal_False ); } } @@ -546,7 +546,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() { // no internal document configuration, use the one from the module uno::Reference< frame::XModuleManager2 > xModuleMan = frame::ModuleManager::create(m_xContext); - ::rtl::OUString aModuleIdent = + OUString aModuleIdent = xModuleMan->identify( uno::Reference< uno::XInterface >( m_xComponent, uno::UNO_QUERY ) ); if ( !aModuleIdent.isEmpty() ) @@ -557,7 +557,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() xModConfSupplier->getUIConfigurationManager( aModuleIdent ), uno::UNO_QUERY_THROW ); xResult = xModUIConfMan->getSettings( - ::rtl::OUString( "private:resource/menubar/menubar" ), + OUString( "private:resource/menubar/menubar" ), sal_False ); } } @@ -580,7 +580,7 @@ void DocumentHolder::FindConnectPoints( { uno::Sequence< beans::PropertyValue > aProps; xMenu->getByIndex( nInd ) >>= aProps; - rtl::OUString aCommand; + OUString aCommand; for ( sal_Int32 nSeqInd = 0; nSeqInd < aProps.getLength(); nSeqInd++ ) if ( aProps[nSeqInd].Name == "CommandURL" ) { @@ -602,7 +602,7 @@ void DocumentHolder::FindConnectPoints( uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace( const uno::Reference< container::XIndexAccess >& xContMenu, const uno::Reference< frame::XDispatchProvider >& xContDisp, - const ::rtl::OUString& aContModuleName, + const OUString& aContModuleName, const uno::Reference< container::XIndexAccess >& xOwnMenu, const uno::Reference< frame::XDispatchProvider >& xOwnDisp ) throw ( uno::Exception ) @@ -639,7 +639,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace( } } else - InsertMenu_Impl( xMergedMenu, nInd, xOwnMenu, nInd, ::rtl::OUString(), xOwnDisp ); + InsertMenu_Impl( xMergedMenu, nInd, xOwnMenu, nInd, OUString(), xOwnDisp ); } return uno::Reference< container::XIndexAccess >( xMergedMenu, uno::UNO_QUERY_THROW ); @@ -649,14 +649,14 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace( sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM, const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM, const uno::Reference< frame::XDispatchProvider >& xContDisp, - const ::rtl::OUString& aContModuleName ) + const OUString& aContModuleName ) { sal_Bool bMenuMerged = sal_False; try { uno::Reference< ::com::sun::star::ui::XUIElementSettings > xUISettings( xContLM->getElement( - ::rtl::OUString( "private:resource/menubar/menubar" ) ), + OUString( "private:resource/menubar/menubar" ) ), uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xContMenu = xUISettings->getSettings( sal_True ); if ( !xContMenu.is() ) @@ -678,7 +678,7 @@ sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM, const uno::Reference< frame::XDispatchProvider >& xContainerDP, - const ::rtl::OUString& aContModuleName ) + const OUString& aContModuleName ) { sal_Bool bResult = sal_False; if ( xContainerLM.is() ) @@ -690,7 +690,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame:: try { uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM; xDocAreaAcc = xContainerLM->getDockingAreaAcceptor(); } catch( const uno::Exception& ){} @@ -783,7 +783,7 @@ sal_Bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame:: try { uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM; } catch( const uno::Exception& ) {} @@ -860,7 +860,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame() uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM; try { uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM; } catch( const uno::Exception& ) {} @@ -969,21 +969,21 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace ) aArgs.put( "ReadOnly", m_bReadOnly ); if ( bInPlace ) aArgs.put( "PluginMode", sal_Int16(1) ); - ::rtl::OUString sUrl; + OUString sUrl; uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY); if ( xServiceInfo.is() - && xServiceInfo->supportsService(::rtl::OUString("com.sun.star.report.ReportDefinition")) ) + && xServiceInfo->supportsService(OUString("com.sun.star.report.ReportDefinition")) ) { - sUrl = ::rtl::OUString(".component:DB/ReportDesign"); + sUrl = OUString(".component:DB/ReportDesign"); } else if( xServiceInfo.is() - && xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.chart2.ChartDocument") )) - sUrl = ::rtl::OUString("private:factory/schart"); + && xServiceInfo->supportsService( OUString("com.sun.star.chart2.ChartDocument") )) + sUrl = OUString("private:factory/schart"); else - sUrl = ::rtl::OUString("private:object"); + sUrl = OUString("private:object"); xComponentLoader->loadComponentFromURL( sUrl, - rtl::OUString( "_self" ), + OUString( "_self" ), 0, aArgs.getPropertyValues() ); @@ -1173,7 +1173,7 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent ) // if the component does not support document::XEventBroadcaster // the modify notifications are used as workaround, but only for running state if( aEvent.Source == m_xComponent && m_pEmbedObj && m_pEmbedObj->getCurrentState() == embed::EmbedStates::RUNNING ) - m_pEmbedObj->PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); + m_pEmbedObj->PostEvent_Impl( OUString( "OnVisAreaChanged" ) ); } //--------------------------------------------------------------------------- diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index 9d62ae63ce91..12fb3189300c 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -44,12 +44,12 @@ void ODummyEmbeddedObject::CheckInit() throw lang::DisposedException(); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } //---------------------------------------------- -void ODummyEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName ) +void ODummyEmbeddedObject::PostEvent_Impl( const OUString& aEventName ) { if ( m_pInterfaceContainer ) { @@ -208,7 +208,7 @@ sal_Int64 SAL_CALL ODummyEmbeddedObject::getStatus( sal_Int64 ) } //---------------------------------------------- -void SAL_CALL ODummyEmbeddedObject::setContainerName( const ::rtl::OUString& ) +void SAL_CALL ODummyEmbeddedObject::setContainerName( const OUString& ) throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -228,7 +228,7 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_nCachedAspect = nAspect; @@ -249,12 +249,12 @@ awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( !m_bHasCachedSize || m_nCachedAspect != nAspect ) throw embed::NoVisualAreaSizeException( - ::rtl::OUString( "No size available!\n" ), + OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aCachedSize; @@ -271,7 +271,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return embed::EmbedMapUnits::ONE_100TH_MM; @@ -288,14 +288,14 @@ embed::VisualRepresentation SAL_CALL ODummyEmbeddedObject::getPreferredVisualRep CheckInit(); // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } //---------------------------------------------- void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const uno::Sequence< beans::PropertyValue >& /* lArguments */, const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ ) @@ -310,12 +310,12 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -323,7 +323,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( && ( m_nObjectState == -1 || nEntryConnectionMode != embed::EntryInitModes::NO_INIT ) ) { throw embed::WrongStateException( - ::rtl::OUString( "Can't change persistent representation of activated object!\n" ), + OUString( "Can't change persistent representation of activated object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -333,7 +333,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) ); else throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -348,20 +348,20 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry( m_nObjectState = embed::EmbedStates::LOADED; } else - throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong entry is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Wrong entry is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); } else - throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); } //------------------------------------------------------ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& /* lArguments */, const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ ) throw ( lang::IllegalArgumentException, @@ -375,7 +375,7 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName ); @@ -383,7 +383,7 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X //------------------------------------------------------ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& /* lArguments */, const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ ) throw ( lang::IllegalArgumentException, @@ -397,10 +397,10 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); - PostEvent_Impl( ::rtl::OUString( "OnSaveAs" ) ); + PostEvent_Impl( OUString( "OnSaveAs" ) ); m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName ); @@ -435,11 +435,11 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew ) m_xParentStorage = m_xNewParentStorage; m_aEntryName = m_aNewEntryName; - PostEvent_Impl( ::rtl::OUString( "OnSaveAsDone" ) ); + PostEvent_Impl( OUString( "OnSaveAsDone" ) ); } m_xNewParentStorage = uno::Reference< embed::XStorage >(); - m_aNewEntryName = ::rtl::OUString(); + m_aNewEntryName = OUString(); m_bWaitSaveCompleted = sal_False; } @@ -453,7 +453,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( !m_aEntryName.isEmpty() ) @@ -463,7 +463,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry() } //------------------------------------------------------ -::rtl::OUString SAL_CALL ODummyEmbeddedObject::getEntryName() +OUString SAL_CALL ODummyEmbeddedObject::getEntryName() throw ( embed::WrongStateException, uno::RuntimeException ) { @@ -472,7 +472,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aEntryName; @@ -490,7 +490,7 @@ void SAL_CALL ODummyEmbeddedObject::storeOwn() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // the object can not be activated or changed @@ -507,7 +507,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::isReadonly() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // this object can not be changed @@ -529,7 +529,7 @@ void SAL_CALL ODummyEmbeddedObject::reload( if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // nothing to reload @@ -548,19 +548,19 @@ uno::Sequence< sal_Int8 > SAL_CALL ODummyEmbeddedObject::getClassID() } //------------------------------------------------------ -::rtl::OUString SAL_CALL ODummyEmbeddedObject::getClassName() +OUString SAL_CALL ODummyEmbeddedObject::getClassName() throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bDisposed ) throw lang::DisposedException(); // TODO - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------ void SAL_CALL ODummyEmbeddedObject::setClassInfo( - const uno::Sequence< sal_Int8 >& /*aClassID*/, const ::rtl::OUString& /*aClassName*/ ) + const uno::Sequence< sal_Int8 >& /*aClassID*/, const OUString& /*aClassName*/ ) throw ( lang::NoSupportException, uno::RuntimeException ) { diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index a47ef9bed158..7848b8e549c8 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -29,13 +29,13 @@ using namespace ::com::sun::star; #define IUL 6 -uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL); +uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL); struct equalOUString { bool operator()( - const rtl::OUString& rKey1, - const rtl::OUString& rKey2 ) const + const OUString& rKey1, + const OUString& rKey2 ) const { return !!( rKey1 == rKey2 ); } @@ -44,7 +44,7 @@ struct equalOUString struct hashOUString { - size_t operator()( const rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } @@ -54,12 +54,12 @@ struct hashOUString class StatusChangeListenerContainer : public ::cppu::OMultiTypeInterfaceContainerHelperVar< -rtl::OUString,hashOUString,equalOUString> +OUString,hashOUString,equalOUString> { public: StatusChangeListenerContainer( ::osl::Mutex& aMutex ) : cppu::OMultiTypeInterfaceContainerHelperVar< - rtl::OUString,hashOUString,equalOUString>(aMutex) + OUString,hashOUString,equalOUString>(aMutex) { } }; @@ -103,12 +103,12 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder ) m_pDisposeEventListeners(0), m_pStatCL(0) { - m_aInterceptedURL[0] = rtl::OUString(".uno:Save"); - m_aInterceptedURL[1] = rtl::OUString(".uno:SaveAll"); - m_aInterceptedURL[2] = rtl::OUString(".uno:CloseDoc"); - m_aInterceptedURL[3] = rtl::OUString(".uno:CloseWin"); - m_aInterceptedURL[4] = rtl::OUString(".uno:CloseFrame"); - m_aInterceptedURL[5] = rtl::OUString(".uno:SaveAs"); + m_aInterceptedURL[0] = OUString(".uno:Save"); + m_aInterceptedURL[1] = OUString(".uno:SaveAll"); + m_aInterceptedURL[2] = OUString(".uno:CloseDoc"); + m_aInterceptedURL[3] = OUString(".uno:CloseWin"); + m_aInterceptedURL[4] = OUString(".uno:CloseFrame"); + m_aInterceptedURL[5] = OUString(".uno:SaveAs"); } @@ -166,12 +166,12 @@ Interceptor::dispatch( if ( nInd == aNewArgs.getLength() ) { aNewArgs.realloc( nInd + 1 ); - aNewArgs[nInd].Name = ::rtl::OUString( "SaveTo" ); + aNewArgs[nInd].Name = OUString( "SaveTo" ); aNewArgs[nInd].Value <<= sal_True; } uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( - URL, ::rtl::OUString( "_self" ), 0 ); + URL, OUString( "_self" ), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( URL, aNewArgs ); } @@ -194,10 +194,10 @@ Interceptor::addStatusListener( { // Save frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0]; - aStateEvent.FeatureDescriptor = rtl::OUString("Update"); + aStateEvent.FeatureDescriptor = OUString("Update"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() ); + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() ); Control->statusChanged(aStateEvent); { @@ -218,10 +218,10 @@ Interceptor::addStatusListener( { // Close and return frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i]; - aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return"); + aStateEvent.FeatureDescriptor = OUString("Close and Return"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() ); + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() ); Control->statusChanged(aStateEvent); @@ -240,10 +240,10 @@ Interceptor::addStatusListener( { // SaveAs frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5]; - aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo"); + aStateEvent.FeatureDescriptor = OUString("SaveCopyTo"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); Control->statusChanged(aStateEvent); { @@ -279,7 +279,7 @@ Interceptor::removeStatusListener( //XInterceptorInfo -uno::Sequence< ::rtl::OUString > +uno::Sequence< OUString > SAL_CALL Interceptor::getInterceptedURLs( ) throw ( @@ -297,7 +297,7 @@ Interceptor::getInterceptedURLs( ) uno::Reference< frame::XDispatch > SAL_CALL Interceptor::queryDispatch( const util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( uno::RuntimeException diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index c3ac0250c74c..b3e025777260 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -41,18 +41,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.EmbeddedObjectCreator"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.EmbeddedObjectCreator"); + aRet[1] = OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName() +OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); + return OUString("com.sun.star.comp.embed.EmbeddedObjectCreator"); } //------------------------------------------------------------------------- @@ -65,9 +65,9 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::impl_static //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitNew( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName, + const OUString& aClassName, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, io::IOException, @@ -79,21 +79,21 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Reference< uno::XInterface > xResult; if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); - ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); + OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); if ( aEmbedFactory.isEmpty() ) { // use system fallback // TODO: in future users factories can be tested - aEmbedFactory = ::rtl::OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" ); + aEmbedFactory = OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" ); } uno::Reference < uno::XInterface > xFact( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext) ); @@ -110,7 +110,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMedDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -122,12 +122,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) UNOEmbeddedObjectCreator::createInstanceInitFromEntry" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -139,8 +139,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta if ( !xNameAccess->hasByName( sEntName ) ) throw container::NoSuchElementException(); - ::rtl::OUString aMediaType; - ::rtl::OUString aEmbedFactory; + OUString aMediaType; + OUString aEmbedFactory; if ( xStorage->isStorageElement( sEntName ) ) { // the object must be based on storage @@ -152,7 +152,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta throw uno::RuntimeException(); try { - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" )); + uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" )); aAny >>= aMediaType; } catch ( const uno::Exception& ) @@ -184,10 +184,10 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta throw uno::RuntimeException(); try { - uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" )); + uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" )); aAny >>= aMediaType; if ( aMediaType == "application/vnd.sun.star.oleobject" ) - aEmbedFactory = ::rtl::OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" ); + aEmbedFactory = OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" ); } catch ( const uno::Exception& ) { @@ -217,7 +217,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Reference < embed::XEmbedObjectFactory > xEmbFact( xFact, uno::UNO_QUERY ); if ( xEmbFact.is() ) - return xEmbFact->createInstanceUserInit( uno::Sequence< sal_Int8 >(), ::rtl::OUString(), xStorage, sEntName, embed::EntryInitModes::DEFAULT_INIT, aMedDescr, lObjArgs); + return xEmbFact->createInstanceUserInit( uno::Sequence< sal_Int8 >(), OUString(), xStorage, sEntName, embed::EntryInitModes::DEFAULT_INIT, aMedDescr, lObjArgs); } // the default object should be created, it will allow to store the contents on the next saving @@ -230,7 +230,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromMediaDescriptor( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -243,12 +243,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta // TODO: use lObjArgs if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -256,7 +256,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Sequence< beans::PropertyValue > aTempMedDescr( aMediaDescr ); // check if there is FilterName - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); if ( !aFilterName.isEmpty() ) { @@ -292,9 +292,9 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& sClassName, + const OUString& sClassName, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Sequence< beans::PropertyValue >& aObjectArgs ) @@ -308,16 +308,16 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Reference< uno::XInterface > xResult; if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); - ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); + OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); uno::Reference< embed::XEmbedObjectFactory > xEmbFactory( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext), uno::UNO_QUERY ); @@ -336,7 +336,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLink( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -351,17 +351,17 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Sequence< beans::PropertyValue > aTempMedDescr( aMediaDescr ); // check if there is URL, URL must exist - ::rtl::OUString aURL; + OUString aURL; for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ ) if ( aTempMedDescr[nInd].Name == "URL" ) aTempMedDescr[nInd].Value >>= aURL; if ( aURL.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No URL for the link is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); - ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); + OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False ); if ( !aFilterName.isEmpty() ) { @@ -386,13 +386,13 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta // was also extended. if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -409,9 +409,9 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLinkUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName, + const OUString& aClassName, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -423,7 +423,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta uno::Reference< uno::XInterface > xResult; - ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); + OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); uno::Reference< embed::XLinkFactory > xLinkFactory( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext), uno::UNO_QUERY ); @@ -440,17 +440,17 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName() +OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -460,7 +460,7 @@ sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const ::rtl::OUStri } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index 2100ff2cc522..fba8d218d928 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -100,10 +100,10 @@ protected: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDocMediaDescriptor; ::com::sun::star::uno::Sequence< sal_Int8 > m_aClassID; - ::rtl::OUString m_aClassName; + OUString m_aClassName; - ::rtl::OUString m_aDocServiceName; - ::rtl::OUString m_aPresetFilterName; + OUString m_aDocServiceName; + OUString m_aPresetFilterName; sal_Int64 m_nMiscStatus; @@ -115,9 +115,9 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > m_xClientSite; - ::rtl::OUString m_aContainerName; - ::rtl::OUString m_aDefaultParentBaseURL; - ::rtl::OUString m_aModuleName; + OUString m_aContainerName; + OUString m_aDefaultParentBaseURL; + OUString m_aModuleName; sal_Bool m_bEmbeddedScriptSupport; sal_Bool m_bDocumentRecoverySupport; @@ -125,7 +125,7 @@ protected: // following information will be used between SaveAs and SaveCompleted sal_Bool m_bWaitSaveCompleted; - ::rtl::OUString m_aNewEntryName; + OUString m_aNewEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewObjectStorage; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aNewDocMediaDescriptor; @@ -137,16 +137,16 @@ protected: sal_Bool m_bIsLink; // embedded object related stuff - ::rtl::OUString m_aEntryName; + OUString m_aEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xObjectStorage; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xRecoveryStorage; // link related stuff - ::rtl::OUString m_aLinkURL; - ::rtl::OUString m_aLinkFilterName; + OUString m_aLinkURL; + OUString m_aLinkFilterName; sal_Bool m_bLinkHasPassword; - ::rtl::OUString m_aLinkPassword; + OUString m_aLinkPassword; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; @@ -166,19 +166,19 @@ private: void SwitchOwnPersistence( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewObjectStorage, - const ::rtl::OUString& aNewName ); + const OUString& aNewName ); void SwitchOwnPersistence( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, - const ::rtl::OUString& aNewName ); + const OUString& aNewName ); - ::rtl::OUString GetDocumentServiceName() const { return m_aDocServiceName; } - ::rtl::OUString GetPresetFilterName() const { return m_aPresetFilterName; } + OUString GetDocumentServiceName() const { return m_aDocServiceName; } + OUString GetPresetFilterName() const { return m_aPresetFilterName; } ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > StoreDocumentToTempStream_Impl( sal_Int32 nStorageFormat, - const ::rtl::OUString& aBaseURL, - const ::rtl::OUString& aHierarchName ); + const OUString& aBaseURL, + const OUString& aHierarchName ); sal_Int32 ConvertVerbToState_Impl( sal_Int32 nVerb ); @@ -190,7 +190,7 @@ private: ::com::sun::star::uno::Sequence< sal_Int32 > GetIntermediateStatesSequence_Impl( sal_Int32 nNewState ); - ::rtl::OUString GetFilterName( sal_Int32 nVersion ) const; + OUString GetFilterName( sal_Int32 nVersion ) const; ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > LoadDocumentFromStorage_Impl(); ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > LoadLink_Impl(); @@ -199,8 +199,8 @@ private: void StoreDocToStorage_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, sal_Int32 nStorageVersion, - const ::rtl::OUString& aBaseURL, - const ::rtl::OUString& aHierarchName, + const OUString& aBaseURL, + const OUString& aHierarchName, sal_Bool bAttachToStorage ); void SwitchDocToStorage_Impl( @@ -221,8 +221,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > CreateTempDocFromLink_Impl(); - ::rtl::OUString GetBaseURL_Impl() const; - ::rtl::OUString GetBaseURLFrom_Impl( + OUString GetBaseURL_Impl() const; + OUString GetBaseURLFrom_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ); @@ -245,7 +245,7 @@ public: void requestPositioning( const ::com::sun::star::awt::Rectangle& aRect ); // not a real listener and should not be - void PostEvent_Impl( const ::rtl::OUString& aEventName ); + void PostEvent_Impl( const OUString& aEventName ); // XInterface @@ -315,7 +315,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setContainerName( const ::rtl::OUString& sName ) + virtual void SAL_CALL setContainerName( const OUString& sName ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -347,7 +347,7 @@ public: virtual void SAL_CALL setPersistentEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) @@ -357,7 +357,7 @@ public: ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) + virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::io::IOException, @@ -366,7 +366,7 @@ public: virtual void SAL_CALL storeAsEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, @@ -384,14 +384,14 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getEntryName() + virtual OUString SAL_CALL getEntryName() throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); // XLinkageSupport virtual void SAL_CALL breakLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName ) + const OUString& sEntName ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::io::IOException, @@ -402,7 +402,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkURL() + virtual OUString SAL_CALL getLinkURL() throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -453,11 +453,11 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getClassName() + virtual OUString SAL_CALL getClassName() throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setClassInfo( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName ) + const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index f6c801aa8a4b..111f9e962cf2 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -67,8 +67,8 @@ private: ::com::sun::star::awt::Rectangle m_aObjRect; ::com::sun::star::frame::BorderWidths m_aBorderWidths; - ::rtl::OUString m_aContainerName; - ::rtl::OUString m_aDocumentNamePart; + OUString m_aContainerName; + OUString m_aDocumentNamePart; sal_Bool m_bReadOnly; @@ -97,7 +97,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp, - const ::rtl::OUString& aContModuleName ); + const OUString& aContModuleName ); public: @@ -109,7 +109,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > MergeMenusForInplace( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xContMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp, - const ::rtl::OUString& aContModuleName, + const OUString& aContModuleName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xOwnMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xOwnDisp ) throw ( ::com::sun::star::uno::Exception ); @@ -129,12 +129,12 @@ public: void CloseDocument( sal_Bool bDeliverOwnership, sal_Bool bWaitForClose ); void CloseFrame(); - rtl::OUString GetTitle() const + OUString GetTitle() const { - return m_aContainerName + ::rtl::OUString( " - " ) + m_aDocumentNamePart; + return m_aContainerName + OUString( " - " ) + m_aDocumentNamePart; } - rtl::OUString GetContainerName() const { return m_aContainerName; } + OUString GetContainerName() const { return m_aContainerName; } void SetOutplaceFrameProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aProps ) { m_aOutplaceFrameProps = aProps; } @@ -151,7 +151,7 @@ public: sal_Bool ShowUI( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContainerDP, - const ::rtl::OUString& aContModuleName ); + const OUString& aContModuleName ); sal_Bool HideUI( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM ); diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx index 8f1f1e9594dc..7574a80890c5 100644 --- a/embeddedobj/source/inc/dummyobject.hxx +++ b/embeddedobj/source/inc/dummyobject.hxx @@ -52,7 +52,7 @@ class ODummyEmbeddedObject : public ::cppu::WeakImplHelper2 ::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer; sal_Bool m_bDisposed; - ::rtl::OUString m_aEntryName; + OUString m_aEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage; sal_Int32 m_nObjectState; @@ -64,12 +64,12 @@ class ODummyEmbeddedObject : public ::cppu::WeakImplHelper2 // following information will be used between SaveAs and SaveCompleted sal_Bool m_bWaitSaveCompleted; - ::rtl::OUString m_aNewEntryName; + OUString m_aNewEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage; protected: void CheckInit(); - void PostEvent_Impl( const ::rtl::OUString& aEventName ); + void PostEvent_Impl( const OUString& aEventName ); public: @@ -133,7 +133,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setContainerName( const ::rtl::OUString& sName ) + virtual void SAL_CALL setContainerName( const OUString& sName ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -165,7 +165,7 @@ public: virtual void SAL_CALL setPersistentEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) @@ -175,7 +175,7 @@ public: ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) + virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::io::IOException, @@ -184,7 +184,7 @@ public: virtual void SAL_CALL storeAsEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, @@ -202,7 +202,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getEntryName() + virtual OUString SAL_CALL getEntryName() throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); @@ -234,11 +234,11 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getClassName() + virtual OUString SAL_CALL getClassName() throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setClassInfo( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName ) + const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx index 21429fdf223d..d4e878f09fcf 100644 --- a/embeddedobj/source/inc/intercept.hxx +++ b/embeddedobj/source/inc/intercept.hxx @@ -80,7 +80,7 @@ public: ); //XInterceptorInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getInterceptedURLs( ) throw ( ::com::sun::star::uno::RuntimeException @@ -91,7 +91,7 @@ public: ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( ::com::sun::star::uno::RuntimeException @@ -149,7 +149,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatchProvider; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider; - static ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aInterceptedURL; + static ::com::sun::star::uno::Sequence< OUString > m_aInterceptedURL; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; StatusChangeListenerContainer* m_pStatCL; diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx index 245b4e64556f..58726ba46f2d 100644 --- a/embeddedobj/source/inc/oleembobj.hxx +++ b/embeddedobj/source/inc/oleembobj.hxx @@ -127,18 +127,18 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; ::com::sun::star::uno::Sequence< sal_Int8 > m_aClassID; - ::rtl::OUString m_aClassName; + OUString m_aClassName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedClient > m_xClientSite; - ::rtl::OUString m_aContainerName; + OUString m_aContainerName; ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > m_xClosePreventer; sal_Bool m_bWaitSaveCompleted; sal_Bool m_bNewVisReplInStream; ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xNewCachedVisRepl; - ::rtl::OUString m_aNewEntryName; + OUString m_aNewEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage; ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xNewObjectStream; sal_Bool m_bStoreLoaded; @@ -167,12 +167,12 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5 sal_Int64 m_nStatusAspect; // embedded object related stuff - ::rtl::OUString m_aEntryName; + OUString m_aEntryName; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage; ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xObjectStream; // link related stuff - ::rtl::OUString m_aLinkURL; // ??? + OUString m_aLinkURL; // ??? // points to own view provider if the object has no server OwnView_Impl* m_pOwnView; @@ -180,9 +180,9 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5 // whether the object should be initialized from clipboard in case of default initialization sal_Bool m_bFromClipboard; - ::rtl::OUString m_aTempURL; + OUString m_aTempURL; - ::rtl::OUString m_aTempDumpURL; + OUString m_aTempDumpURL; // STAMPIT solution // the following member is used during verb execution to detect whether the verb execution modifies the object @@ -206,7 +206,7 @@ protected: #ifdef WNT void SwitchComponentToRunningState_Impl(); #endif - void MakeEventListenerNotification_Impl( const ::rtl::OUString& aEventName ); + void MakeEventListenerNotification_Impl( const OUString& aEventName ); #ifdef WNT void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState ); ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > GetStreamForSaving(); @@ -224,17 +224,17 @@ protected: void SwitchOwnPersistence( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xNewObjectStream, - const ::rtl::OUString& aNewName ); + const OUString& aNewName ); void SwitchOwnPersistence( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewParentStorage, - const ::rtl::OUString& aNewName ); + const OUString& aNewName ); void GetRidOfComponent(); void StoreToLocation_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs, sal_Bool bSaveAs ) throw ( ::com::sun::star::uno::Exception ); @@ -271,22 +271,22 @@ protected: void SetObjectIsLink_Impl( sal_Bool bIsLink ) { m_bIsLink = bIsLink; } #ifdef WNT - ::rtl::OUString CreateTempURLEmpty_Impl(); - ::rtl::OUString GetTempURL_Impl(); + OUString CreateTempURLEmpty_Impl(); + OUString GetTempURL_Impl(); #endif - ::rtl::OUString GetContainerName_Impl() { return m_aContainerName; } + OUString GetContainerName_Impl() { return m_aContainerName; } // the following 4 methods are related to switch to wrapping mode void MoveListeners(); - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > CreateTemporarySubstorage( ::rtl::OUString& o_aStorageName ); - ::rtl::OUString MoveToTemporarySubstream(); + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > CreateTemporarySubstorage( OUString& o_aStorageName ); + OUString MoveToTemporarySubstream(); sal_Bool TryToConvertToOOo(); public: // in case a new object must be created the class ID must be specified OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName ); + const OUString& aClassName ); // in case object will be loaded from a persistent entry or from a file the class ID will be detected on loading // factory can do it for OOo objects, but for OLE objects OS dependent code is required @@ -354,7 +354,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setContainerName( const ::rtl::OUString& sName ) + virtual void SAL_CALL setContainerName( const OUString& sName ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -387,7 +387,7 @@ public: virtual void SAL_CALL setPersistentEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) @@ -397,7 +397,7 @@ public: ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) + virtual void SAL_CALL storeToEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::io::IOException, @@ -406,7 +406,7 @@ public: virtual void SAL_CALL storeAsEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw ( ::com::sun::star::lang::IllegalArgumentException, @@ -424,14 +424,14 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getEntryName() + virtual OUString SAL_CALL getEntryName() throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException ); // XLinkageSupport virtual void SAL_CALL breakLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName ) + const OUString& sEntName ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::io::IOException, @@ -442,7 +442,7 @@ public: throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkURL() + virtual OUString SAL_CALL getLinkURL() throw ( ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -472,11 +472,11 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getClassID() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getClassName() + virtual OUString SAL_CALL getClassName() throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setClassInfo( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName ) + const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 5e8b908fafe8..7a90121b87e4 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -43,9 +43,9 @@ public: OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -53,23 +53,23 @@ public: // XEmbedObjectCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XEmbedObjectFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLinkCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLinkFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, const ::rtl::OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx index 7d3855884836..e054f7a95005 100644 --- a/embeddedobj/source/msole/graphconvert.cxx +++ b/embeddedobj/source/msole/graphconvert.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; sal_Bool ConvertBufferToFormat( void* pBuf, sal_uInt32 nBufSize, - const ::rtl::OUString& aMimeType, + const OUString& aMimeType, uno::Any& aResult ) { // produces sequence with data in requested format and returns it in aResult @@ -54,7 +54,7 @@ sal_Bool ConvertBufferToFormat( void* pBuf, { uno::Reference < graphic::XGraphicProvider > xGraphicProvider( graphic::GraphicProvider::create(comphelper::getProcessComponentContext())); uno::Sequence< beans::PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString( "InputStream" ); + aMediaProperties[0].Name = OUString( "InputStream" ); aMediaProperties[0].Value <<= xIn; uno::Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) ); if( xGraphic.is() ) @@ -62,9 +62,9 @@ sal_Bool ConvertBufferToFormat( void* pBuf, SvMemoryStream aNewStream( 65535, 65535 ); uno::Reference < io::XStream > xOut = new utl::OStreamWrapper( aNewStream ); uno::Sequence< beans::PropertyValue > aOutMediaProperties( 2 ); - aOutMediaProperties[0].Name = ::rtl::OUString( "OutputStream" ); + aOutMediaProperties[0].Name = OUString( "OutputStream" ); aOutMediaProperties[0].Value <<= xOut; - aOutMediaProperties[1].Name = ::rtl::OUString( "MimeType" ); + aOutMediaProperties[1].Name = OUString( "MimeType" ); aOutMediaProperties[1].Value <<= aMimeType; xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties ); diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 4222d489ea19..f8a51984b743 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -162,10 +162,10 @@ public: sal_Bool ConvertBufferToFormat( void* pBuf, sal_uInt32 nBufSize, - const ::rtl::OUString& aFormatShortName, + const OUString& aFormatShortName, uno::Any& aResult ); -::rtl::OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); +OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); typedef ::std::vector< FORMATETC* > FormatEtcList; @@ -189,28 +189,28 @@ struct OleComponentNative_Impl { m_aSupportedGraphFormats.realloc( 5 ); m_aSupportedGraphFormats[0] = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )), - ::rtl::OUString( "Windows Enhanced Metafile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )), + OUString( "Windows Enhanced Metafile" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[1] = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString( "Windows Metafile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), + OUString( "Windows Metafile" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[2] = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), - ::rtl::OUString( "Bitmap" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), + OUString( "Bitmap" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[3] = datatransfer::DataFlavor( - ::rtl::OUString( "image/png" ), - ::rtl::OUString( "PNG" ), + OUString( "image/png" ), + OUString( "PNG" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); m_aSupportedGraphFormats[0] = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), - ::rtl::OUString( "GDIMetafile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )), + OUString( "GDIMetafile" ), getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); } @@ -241,16 +241,16 @@ DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor ) } //---------------------------------------------- -::rtl::OUString GetFlavorSuffixFromAspect( DWORD nAsp ) +OUString GetFlavorSuffixFromAspect( DWORD nAsp ) { - ::rtl::OUString aResult; + OUString aResult; if ( nAsp == DVASPECT_THUMBNAIL ) - aResult = ::rtl::OUString( ";Aspect=THUMBNAIL" ); + aResult = OUString( ";Aspect=THUMBNAIL" ); else if ( nAsp == DVASPECT_ICON ) - aResult = ::rtl::OUString( ";Aspect=ICON" ); + aResult = OUString( ";Aspect=ICON" ); else if ( nAsp == DVASPECT_DOCPRINT ) - aResult = ::rtl::OUString( ";Aspect=DOCPRINT" ); + aResult = OUString( ";Aspect=DOCPRINT" ); // no suffix for DVASPECT_CONTENT @@ -258,11 +258,11 @@ DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor ) } //---------------------------------------------- -HRESULT OpenIStorageFromURL_Impl( const ::rtl::OUString& aURL, IStorage** ppIStorage ) +HRESULT OpenIStorageFromURL_Impl( const OUString& aURL, IStorage** ppIStorage ) { OSL_ENSURE( ppIStorage, "The pointer must not be empty!" ); - ::rtl::OUString aFilePath; + OUString aFilePath; if ( !ppIStorage || ::osl::FileBase::getSystemPathFromFileURL( aURL, aFilePath ) != ::osl::FileBase::E_None ) throw uno::RuntimeException(); // TODO: something dangerous happened @@ -288,11 +288,11 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium unsigned char* pBuf = NULL; sal_uInt32 nBufSize = 0; - ::rtl::OUString aFormat; + OUString aFormat; if ( aMedium.tymed == TYMED_MFPICT ) // Win Metafile { - aFormat = ::rtl::OUString("image/x-wmf"); + aFormat = OUString("image/x-wmf"); METAFILEPICT* pMF = ( METAFILEPICT* )GlobalLock( aMedium.hMetaFilePict ); if ( pMF ) { @@ -323,7 +323,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium } else if ( aMedium.tymed == TYMED_ENHMF ) // Enh Metafile { - aFormat = ::rtl::OUString("image/x-emf"); + aFormat = OUString("image/x-emf"); nBufSize = GetEnhMetaFileBits( aMedium.hEnhMetaFile, 0, NULL ); pBuf = new unsigned char[nBufSize]; if ( nBufSize && nBufSize == GetEnhMetaFileBits( aMedium.hEnhMetaFile, nBufSize, pBuf ) ) @@ -337,7 +337,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium } else if ( aMedium.tymed == TYMED_GDI ) // Bitmap { - aFormat = ::rtl::OUString("image/x-MS-bmp"); + aFormat = OUString("image/x-MS-bmp"); nBufSize = GetBitmapBits( aMedium.hBitmap, 0, NULL ); pBuf = new unsigned char[nBufSize]; if ( nBufSize && nBufSize == sal::static_int_cast< ULONG >( GetBitmapBits( aMedium.hBitmap, nBufSize, pBuf ) ) ) @@ -398,9 +398,9 @@ sal_Bool GetClassIDFromSequence_Impl( uno::Sequence< sal_Int8 > aSeq, CLSID& aRe } //---------------------------------------------- -::rtl::OUString WinAccToVcl_Impl( const sal_Unicode* pStr ) +OUString WinAccToVcl_Impl( const sal_Unicode* pStr ) { - ::rtl::OUString aResult; + OUString aResult; if( pStr ) { @@ -408,12 +408,12 @@ sal_Bool GetClassIDFromSequence_Impl( uno::Sequence< sal_Int8 > aSeq, CLSID& aRe { if ( *pStr == '&' ) { - aResult += ::rtl::OUString( "~" ); + aResult += OUString( "~" ); while( *( ++pStr ) == '&' ); } else { - aResult += ::rtl::OUString( pStr, 1 ); + aResult += OUString( pStr, 1 ); pStr++; } } @@ -556,7 +556,7 @@ void OleComponent::CreateNewIStorage_Impl() // TODO: in future a global memory could be used instead of file. // write the stream to the temporary file - ::rtl::OUString aTempURL; + OUString aTempURL; OSL_ENSURE( m_pUnoOleObject, "Unexpected object absence!" ); if ( m_pUnoOleObject ) @@ -568,7 +568,7 @@ void OleComponent::CreateNewIStorage_Impl() throw uno::RuntimeException(); // TODO // open an IStorage based on the temporary file - ::rtl::OUString aTempFilePath; + OUString aTempFilePath; if ( ::osl::FileBase::getSystemPathFromFileURL( aTempURL, aTempFilePath ) != ::osl::FileBase::E_None ) throw uno::RuntimeException(); // TODO: something dangerous happened @@ -584,7 +584,7 @@ uno::Sequence< datatransfer::DataFlavor > OleComponentNative_Impl::GetFlavorsFor for ( sal_uInt32 nAsp = 1; nAsp <= 8; nAsp *= 2 ) if ( ( nSupportedAspects & nAsp ) == nAsp ) { - ::rtl::OUString aAspectSuffix = GetFlavorSuffixFromAspect( nAsp ); + OUString aAspectSuffix = GetFlavorSuffixFromAspect( nAsp ); sal_Int32 nLength = aResult.getLength(); aResult.realloc( nLength + m_aSupportedGraphFormats.getLength() ); @@ -718,7 +718,7 @@ sal_Bool OleComponent::InitializeObject_Impl() } //---------------------------------------------- -void OleComponent::LoadEmbeddedObject( const ::rtl::OUString& aTempURL ) +void OleComponent::LoadEmbeddedObject( const OUString& aTempURL ) { if ( !aTempURL.getLength() ) throw lang::IllegalArgumentException(); // TODO @@ -827,7 +827,7 @@ void OleComponent::CreateObjectFromData( const uno::Reference< datatransfer::XTr } //---------------------------------------------- -void OleComponent::CreateObjectFromFile( const ::rtl::OUString& aFileURL ) +void OleComponent::CreateObjectFromFile( const OUString& aFileURL ) { if ( m_pNativeImpl->m_pIStorage ) throw io::IOException(); // TODO:the object is already initialized @@ -836,7 +836,7 @@ void OleComponent::CreateObjectFromFile( const ::rtl::OUString& aFileURL ) if ( !m_pNativeImpl->m_pIStorage ) throw uno::RuntimeException(); // TODO: - ::rtl::OUString aFilePath; + OUString aFilePath; if ( ::osl::FileBase::getSystemPathFromFileURL( aFileURL, aFilePath ) != ::osl::FileBase::E_None ) throw uno::RuntimeException(); // TODO: something dangerous happened @@ -857,7 +857,7 @@ void OleComponent::CreateObjectFromFile( const ::rtl::OUString& aFileURL ) } //---------------------------------------------- -void OleComponent::CreateLinkFromFile( const ::rtl::OUString& aFileURL ) +void OleComponent::CreateLinkFromFile( const OUString& aFileURL ) { if ( m_pNativeImpl->m_pIStorage ) throw io::IOException(); // TODO:the object is already initialized @@ -866,7 +866,7 @@ void OleComponent::CreateLinkFromFile( const ::rtl::OUString& aFileURL ) if ( !m_pNativeImpl->m_pIStorage ) throw uno::RuntimeException(); // TODO: - ::rtl::OUString aFilePath; + OUString aFilePath; if ( ::osl::FileBase::getSystemPathFromFileURL( aFileURL, aFilePath ) != ::osl::FileBase::E_None ) throw uno::RuntimeException(); // TODO: something dangerous happened @@ -937,7 +937,7 @@ void OleComponent::InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent ) hr = pOleLink->GetSourceDisplayName( &pOleStr ); if ( SUCCEEDED( hr ) && pOleStr ) { - ::rtl::OUString aFilePath( ( sal_Unicode* )pOleStr ); + OUString aFilePath( ( sal_Unicode* )pOleStr ); if ( pMalloc ) pMalloc->Free( ( void* )pOleStr ); @@ -1096,8 +1096,8 @@ void OleComponent::ExecuteVerb( sal_Int32 nVerbID ) } //---------------------------------------------- -void OleComponent::SetHostName( const ::rtl::OUString&, - const ::rtl::OUString& ) +void OleComponent::SetHostName( const OUString&, + const OUString& ) { if ( !m_pNativeImpl->m_pOleObject ) throw embed::WrongStateException(); // TODO: the object is in wrong state @@ -1405,7 +1405,7 @@ void OleComponent::OnViewChange_Impl( sal_uInt32 dwAspect ) { uno::Reference < awt::XRequestCallback > xRequestCallback( m_xFactory->createInstance( - ::rtl::OUString("com.sun.star.awt.AsyncCallback")), + OUString("com.sun.star.awt.AsyncCallback")), uno::UNO_QUERY ); xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONVIEWCHANGE, dwAspect ), uno::Any() ); } @@ -1426,7 +1426,7 @@ void OleComponent::OnClose_Impl() { uno::Reference < awt::XRequestCallback > xRequestCallback( m_xFactory->createInstance( - ::rtl::OUString("com.sun.star.awt.AsyncCallback")), + OUString("com.sun.star.awt.AsyncCallback")), uno::UNO_QUERY ); xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONCLOSE ), uno::Any() ); } diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx index 9db4e76f0b07..2ec7f8922db3 100644 --- a/embeddedobj/source/msole/olecomponent.hxx +++ b/embeddedobj/source/msole/olecomponent.hxx @@ -105,13 +105,13 @@ public: ::com::sun::star::awt::Size CalculateTheRealSize( const ::com::sun::star::awt::Size& aContSize, sal_Bool bUpdate ); // ==== Initialization ================================================== - void LoadEmbeddedObject( const ::rtl::OUString& aTempURL ); + void LoadEmbeddedObject( const OUString& aTempURL ); void CreateObjectFromClipboard(); void CreateNewEmbeddedObject( const ::com::sun::star::uno::Sequence< sal_Int8 >& aSeqCLSID ); void CreateObjectFromData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransfer ); - void CreateObjectFromFile( const ::rtl::OUString& aFileName ); - void CreateLinkFromFile( const ::rtl::OUString& aFileName ); + void CreateObjectFromFile( const OUString& aFileName ); + void CreateLinkFromFile( const OUString& aFileName ); void InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent ); // ====================================================================== @@ -121,7 +121,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > GetVerbList(); void ExecuteVerb( sal_Int32 nVerbID ); - void SetHostName( const ::rtl::OUString& aContName, const ::rtl::OUString& aEmbDocName ); + void SetHostName( const OUString& aContName, const OUString& aEmbDocName ); void SetExtent( const ::com::sun::star::awt::Size& aVisAreaSize, sal_Int64 nAspect ); ::com::sun::star::awt::Size GetExtent( sal_Int64 nAspect ); diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index f4abfbf6a57c..859a9b9fdebb 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -202,14 +202,14 @@ void OleEmbeddedObject::MoveListeners() } //---------------------------------------------- -uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( ::rtl::OUString& o_aStorageName ) +uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( OUString& o_aStorageName ) { uno::Reference< embed::XStorage > xResult; for ( sal_Int32 nInd = 0; nInd < 32000 && !xResult.is(); nInd++ ) { - ::rtl::OUString aName = ::rtl::OUString::valueOf( nInd ); - aName += ::rtl::OUString( "TMPSTOR" ); + OUString aName = OUString::valueOf( nInd ); + aName += OUString( "TMPSTOR" ); aName += m_aEntryName; if ( !m_xParentStorage->hasByName( aName ) ) { @@ -220,7 +220,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( if ( !xResult.is() ) { - o_aStorageName = ::rtl::OUString(); + o_aStorageName = OUString(); throw uno::RuntimeException(); } @@ -228,13 +228,13 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( } //---------------------------------------------- -::rtl::OUString OleEmbeddedObject::MoveToTemporarySubstream() +OUString OleEmbeddedObject::MoveToTemporarySubstream() { - ::rtl::OUString aResult; + OUString aResult; for ( sal_Int32 nInd = 0; nInd < 32000 && aResult.isEmpty(); nInd++ ) { - ::rtl::OUString aName = ::rtl::OUString::valueOf( nInd ); - aName += ::rtl::OUString( "TMPSTREAM" ); + OUString aName = OUString::valueOf( nInd ); + aName += OUString( "TMPSTREAM" ); aName += m_aEntryName; if ( !m_xParentStorage->hasByName( aName ) ) { @@ -254,8 +254,8 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() { sal_Bool bResult = sal_False; - ::rtl::OUString aStorageName; - ::rtl::OUString aTmpStreamName; + OUString aStorageName; + OUString aTmpStreamName; sal_Int32 nStep = 0; if ( m_pOleComponent || m_bReadOnly ) @@ -268,17 +268,17 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() // the stream must be seekable uno::Reference< io::XSeekable > xSeekable( m_xObjectStream, uno::UNO_QUERY_THROW ); xSeekable->seek( 0 ); - ::rtl::OUString aFilterName = OwnView_Impl::GetFilterNameFromExtentionAndInStream( m_xFactory, ::rtl::OUString(), m_xObjectStream->getInputStream() ); + OUString aFilterName = OwnView_Impl::GetFilterNameFromExtentionAndInStream( m_xFactory, OUString(), m_xObjectStream->getInputStream() ); // use the solution only for OOXML format currently if ( !aFilterName.isEmpty() && ( aFilterName == "Calc MS Excel 2007 XML" || aFilterName == "Impress MS PowerPoint 2007 XML" || aFilterName == "MS Word 2007 XML" ) ) { uno::Reference< container::XNameAccess > xFilterFactory( - m_xFactory->createInstance( ::rtl::OUString( "com.sun.star.document.FilterFactory" )), + m_xFactory->createInstance( OUString( "com.sun.star.document.FilterFactory" )), uno::UNO_QUERY_THROW ); - ::rtl::OUString aDocServiceName; + OUString aDocServiceName; uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName ); uno::Sequence< beans::PropertyValue > aFilterData; if ( aFilterAnyData >>= aFilterData ) @@ -292,7 +292,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() { // create the model uno::Sequence< uno::Any > aArguments(1); - aArguments[0] <<= beans::NamedValue( ::rtl::OUString( "EmbeddedObject" ), uno::makeAny( (sal_Bool)sal_True )); + aArguments[0] <<= beans::NamedValue( OUString( "EmbeddedObject" ), uno::makeAny( (sal_Bool)sal_True )); uno::Reference< util::XCloseable > xDocument( m_xFactory->createInstanceWithArguments( aDocServiceName, aArguments ), uno::UNO_QUERY_THROW ); uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY_THROW ); @@ -301,21 +301,21 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() // let the model behave as embedded one uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aSeq( 1 ); - aSeq[0].Name = ::rtl::OUString( "SetEmbedded" ); + aSeq[0].Name = OUString( "SetEmbedded" ); aSeq[0].Value <<= sal_True; - xModel->attachResource( ::rtl::OUString(), aSeq ); + xModel->attachResource( OUString(), aSeq ); // load the model from the stream uno::Sequence< beans::PropertyValue > aArgs( 5 ); - aArgs[0].Name = ::rtl::OUString( "HierarchicalDocumentName" ); + aArgs[0].Name = OUString( "HierarchicalDocumentName" ); aArgs[0].Value <<= m_aEntryName; - aArgs[1].Name = ::rtl::OUString( "ReadOnly" ); + aArgs[1].Name = OUString( "ReadOnly" ); aArgs[1].Value <<= sal_True; - aArgs[2].Name = ::rtl::OUString( "FilterName" ); + aArgs[2].Name = OUString( "FilterName" ); aArgs[2].Value <<= aFilterName; - aArgs[3].Name = ::rtl::OUString( "URL" ); - aArgs[3].Value <<= ::rtl::OUString( "private:stream" ); - aArgs[4].Name = ::rtl::OUString( "InputStream" ); + aArgs[3].Name = OUString( "URL" ); + aArgs[3].Value <<= OUString( "private:stream" ); + aArgs[4].Name = OUString( "InputStream" ); aArgs[4].Value <<= m_xObjectStream->getInputStream(); xSeekable->seek( 0 ); @@ -326,13 +326,13 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() xStorDoc->storeToStorage( xTmpStorage, uno::Sequence< beans::PropertyValue >() ); xDocument->close( sal_True ); uno::Reference< beans::XPropertySet > xStorProps( xTmpStorage, uno::UNO_QUERY_THROW ); - ::rtl::OUString aMediaType; - xStorProps->getPropertyValue( ::rtl::OUString( "MediaType" ) ) >>= aMediaType; + OUString aMediaType; + xStorProps->getPropertyValue( OUString( "MediaType" ) ) >>= aMediaType; xTmpStorage->dispose(); // look for the related embedded object factory ::comphelper::MimeConfigurationHelper aConfigHelper( comphelper::getComponentContext(m_xFactory) ); - ::rtl::OUString aEmbedFactory; + OUString aEmbedFactory; if ( !aMediaType.isEmpty() ) aEmbedFactory = aConfigHelper.GetFactoryNameByMediaType( aMediaType ); @@ -463,7 +463,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // in case the object is already in requested state @@ -476,7 +476,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState ) if ( m_nTargetState != -1 ) { // means that the object is currently trying to reach the target state - throw embed::StateChangeInProgressException( ::rtl::OUString(), + throw embed::StateChangeInProgressException( OUString(), uno::Reference< uno::XInterface >(), m_nTargetState ); } @@ -619,7 +619,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT @@ -661,7 +661,7 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: Shouldn't we ask object? ( I guess no ) @@ -688,10 +688,10 @@ namespace //Dump the objects content to a tempfile, just the "CONTENTS" stream if //there is one for non-compound documents, otherwise the whole content. //On success a file is returned which must be removed by the caller - rtl::OUString lcl_ExtractObject(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory, + OUString lcl_ExtractObject(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory, ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xObjectStream) { - rtl::OUString sUrl; + OUString sUrl; // the solution is only active for Unix systems #ifndef WNT @@ -705,7 +705,7 @@ namespace aArgs[1] <<= (sal_Bool)sal_True; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( xFactory->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"), + OUString("com.sun.star.embed.OLESimpleStorage"), aArgs ), uno::UNO_QUERY_THROW ); uno::Reference< io::XStream > xCONTENTS; @@ -729,9 +729,9 @@ namespace if (bCopied) { - xNativeTempFile->setPropertyValue(::rtl::OUString("RemoveFile"), + xNativeTempFile->setPropertyValue(OUString("RemoveFile"), uno::makeAny(sal_False)); - uno::Any aUrl = xNativeTempFile->getPropertyValue(::rtl::OUString("Uri")); + uno::Any aUrl = xNativeTempFile->getPropertyValue(OUString("Uri")); aUrl >>= sUrl; xNativeTempFile = uno::Reference(); @@ -743,7 +743,7 @@ namespace } else { - xNativeTempFile->setPropertyValue(::rtl::OUString("RemoveFile"), + xNativeTempFile->setPropertyValue(OUString("RemoveFile"), uno::makeAny(sal_True)); } #else @@ -779,7 +779,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT @@ -879,7 +879,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) { uno::Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute( ::com::sun::star::system::SystemShellExecute::create(comphelper::getComponentContext(m_xFactory)) ); - xSystemShellExecute->execute(m_aTempDumpURL, ::rtl::OUString(), ::com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); + xSystemShellExecute->execute(m_aTempDumpURL, OUString(), ::com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); } else throw embed::UnreachableStateException(); @@ -914,7 +914,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT if ( m_pOleComponent ) @@ -959,7 +959,7 @@ void SAL_CALL OleEmbeddedObject::setClientSite( { if ( m_nObjectState != embed::EmbedStates::LOADED && m_nObjectState != embed::EmbedStates::RUNNING ) throw embed::WrongStateException( - ::rtl::OUString( "The client site can not be set currently!\n" ), + OUString( "The client site can not be set currently!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); m_xClientSite = xClient; @@ -985,7 +985,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSi throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_xClientSite; @@ -1012,7 +1012,7 @@ void SAL_CALL OleEmbeddedObject::update() throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nUpdateMode == embed::EmbedUpdateModes::EXPLICIT_UPDATE ) @@ -1046,7 +1046,7 @@ void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode ) throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ), + throw embed::WrongStateException( OUString( "The object has no persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE @@ -1076,7 +1076,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64 throw lang::DisposedException(); // TODO if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object must be in running state!\n" ), + throw embed::WrongStateException( OUString( "The object must be in running state!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); sal_Int64 nResult = 0; @@ -1099,7 +1099,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64 } //---------------------------------------------- -void SAL_CALL OleEmbeddedObject::setContainerName( const ::rtl::OUString& sName ) +void SAL_CALL OleEmbeddedObject::setContainerName( const OUString& sName ) throw ( uno::RuntimeException ) { // begin wrapping related part ==================== diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index a71944bd4cea..d14733a85530 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -31,13 +31,13 @@ using namespace ::com::sun::star; -sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ); +sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ); //------------------------------------------------------ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName ) + const OUString& aClassName ) : m_pOleComponent( NULL ) , m_pInterfaceContainer( NULL ) , m_bReadOnly( sal_False ) @@ -154,7 +154,7 @@ OleEmbeddedObject::~OleEmbeddedObject() } //------------------------------------------------------ -void OleEmbeddedObject::MakeEventListenerNotification_Impl( const ::rtl::OUString& aEventName ) +void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEventName ) { if ( m_pInterfaceContainer ) { @@ -317,7 +317,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OleEmbeddedObject::getClassID() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OleEmbeddedObject::getClassName() +OUString SAL_CALL OleEmbeddedObject::getClassName() throw ( uno::RuntimeException ) { // begin wrapping related part ==================== @@ -338,7 +338,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OleEmbeddedObject::getClassID() //------------------------------------------------------ void SAL_CALL OleEmbeddedObject::setClassInfo( - const uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName ) + const uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) throw ( lang::NoSupportException, uno::RuntimeException ) { @@ -376,7 +376,7 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent() if ( m_nObjectState == -1 ) // || m_nObjectState == embed::EmbedStates::LOADED ) { // the object is still not running - throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), + throw embed::WrongStateException( OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 351aa34bbb56..cd8324972960 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; using namespace ::comphelper; //------------------------------------------------------------------------- -sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) +sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) { if ( !xFactory.is() ) return sal_False; @@ -75,19 +75,19 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: } //---------------------------------------------- -::rtl::OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) +OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) { OSL_ENSURE( xFactory.is(), "No factory is provided!\n" ); - ::rtl::OUString aResult; + OUString aResult; uno::Reference < beans::XPropertySet > xTempFile( io::TempFile::create(comphelper::getComponentContext(xFactory)), uno::UNO_QUERY_THROW ); try { - xTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); - uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString( "Uri" )); + xTempFile->setPropertyValue( OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); + uno::Any aUrl = xTempFile->getPropertyValue( OUString( "Uri" )); aUrl >>= aResult; } catch ( const uno::Exception& ) @@ -101,14 +101,14 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: } //----------------------------------------------- -::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream, +OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw ( io::IOException, uno::RuntimeException ) { OSL_ENSURE( xInStream.is() && xFactory.is(), "Wrong parameters are provided!\n" ); - ::rtl::OUString aResult = GetNewTempFileURL_Impl( xFactory ); + OUString aResult = GetNewTempFileURL_Impl( xFactory ); if ( !aResult.isEmpty() ) { @@ -145,17 +145,17 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: catch( const uno::Exception& ) { KillFile_Impl( aResult, xFactory ); - aResult = ::rtl::OUString(); + aResult = OUString(); } } return aResult; } #ifdef WNT -::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const ::rtl::OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) +OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException, uno::RuntimeException ) { - ::rtl::OUString aResult; + OUString aResult; try { @@ -166,8 +166,8 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: xParentStorage->copyStreamElementData( aEntryName, xTempStream ); - xTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); - uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString( "Uri" )); + xTempFile->setPropertyValue( OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); + uno::Any aUrl = xTempFile->getPropertyValue( OUString( "Uri" )); aUrl >>= aResult; } catch( const uno::RuntimeException& ) @@ -185,13 +185,13 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang: } //------------------------------------------------------ -void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, const ::rtl::OUString& aMediaType ) +void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, const OUString& aMediaType ) { uno::Reference< beans::XPropertySet > xPropSet( xStream, uno::UNO_QUERY ); if ( !xPropSet.is() ) throw uno::RuntimeException(); // TODO: all the storage streams must support XPropertySet - xPropSet->setPropertyValue( ::rtl::OUString( "MediaType" ), uno::makeAny( aMediaType ) ); + xPropSet->setPropertyValue( OUString( "MediaType" ), uno::makeAny( aMediaType ) ); } #endif //------------------------------------------------------ @@ -201,7 +201,7 @@ void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStre if ( !xPropSet.is() ) throw uno::RuntimeException(); // Only StorageStreams must be provided here, they must implement the interface - xPropSet->setPropertyValue( ::rtl::OUString( "UseCommonStoragePasswordEncryption" ), + xPropSet->setPropertyValue( OUString( "UseCommonStoragePasswordEncryption" ), uno::makeAny( (sal_Bool)sal_True ) ); } #ifdef WNT @@ -379,7 +379,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), + OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); @@ -502,7 +502,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea throw io::IOException(); // TODO: // insert the result file as replacement image - ::rtl::OUString aCacheName = ::rtl::OUString( "\002OlePres000" ); + OUString aCacheName = OUString( "\002OlePres000" ); if ( xNameContainer->hasByName( aCacheName ) ) xNameContainer->replaceByName( aCacheName, uno::makeAny( xTempFile ) ); else @@ -528,7 +528,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea aArgs[1] <<= (sal_Bool)sal_True; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), + OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); @@ -537,8 +537,8 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ ) { - ::rtl::OUString aStreamName( "\002OlePres00" ); - aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd ); + OUString aStreamName( "\002OlePres00" ); + aStreamName += OUString::valueOf( (sal_Int32)nInd ); if ( xNameContainer->hasByName( aStreamName ) ) xNameContainer->removeByName( aStreamName ); } @@ -597,7 +597,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream() aArgs[1] <<= (sal_Bool)sal_True; // do not create copy uno::Reference< container::XNameContainer > xNameContainer( m_xFactory->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), + OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); @@ -605,8 +605,8 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream() { for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ ) { - ::rtl::OUString aStreamName( "\002OlePres00" ); - aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd ); + OUString aStreamName( "\002OlePres00" ); + aStreamName += OUString::valueOf( (sal_Int32)nInd ); try { bExists = xNameContainer->hasByName( aStreamName ); @@ -644,7 +644,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { xNameContainer = uno::Reference< container::XNameContainer >( m_xFactory->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), + OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); } @@ -655,8 +655,8 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ ) { - ::rtl::OUString aStreamName( "\002OlePres00" ); - aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd ); + OUString aStreamName( "\002OlePres00" ); + aStreamName += OUString::valueOf( (sal_Int32)nInd ); uno::Reference< io::XStream > xCachedCopyStream; try { @@ -673,7 +673,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres if ( nInd == 0 ) { // to be compatible with the old versions Ole10Native is checked after OlePress000 - aStreamName = ::rtl::OUString( "\001Ole10Native" ); + aStreamName = OUString( "\001Ole10Native" ); try { if ( ( xNameContainer->getByName( aStreamName ) >>= xCachedCopyStream ) && xCachedCopyStream.is() ) @@ -692,7 +692,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { if ( bAllowToRepair50 && !xResult.is() ) { - ::rtl::OUString aOrigContName( "Ole-Object" ); + OUString aOrigContName( "Ole-Object" ); if ( xNameContainer->hasByName( aOrigContName ) ) { uno::Reference< embed::XClassifiedObject > xClassified( xNameContainer, uno::UNO_QUERY_THROW ); @@ -728,7 +728,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { // this is the own stream, so the temporary URL must be cleaned if it exists KillFile_Impl( m_aTempURL, m_xFactory ); - m_aTempURL = ::rtl::OUString(); + m_aTempURL = OUString(); } #ifdef WNT @@ -764,7 +764,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres //------------------------------------------------------ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage, const uno::Reference< io::XStream >& xNewObjectStream, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) { if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) ) { @@ -789,7 +789,7 @@ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStor //------------------------------------------------------ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) { if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) ) return; @@ -871,7 +871,7 @@ sal_Bool OleEmbeddedObject::OnShowWindow_Impl( sal_Bool bShow ) void OleEmbeddedObject::OnIconChanged_Impl() { // TODO/LATER: currently this notification seems to be impossible - // MakeEventListenerNotification_Impl( ::rtl::OUString( "OnIconChanged" ) ); + // MakeEventListenerNotification_Impl( OUString( "OnIconChanged" ) ); } //------------------------------------------------------ @@ -901,7 +901,7 @@ void OleEmbeddedObject::OnViewChanged_Impl() // The view is changed while the object is in running state, save the new object m_xCachedVisualRepresentation = uno::Reference< io::XStream >(); SaveObject_Impl(); - MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" ) ); + MakeEventListenerNotification_Impl( OUString( "OnVisAreaChanged" ) ); } // =============================================================== } @@ -921,7 +921,7 @@ void OleEmbeddedObject::OnClosed_Impl() } //------------------------------------------------------ -::rtl::OUString OleEmbeddedObject::CreateTempURLEmpty_Impl() +OUString OleEmbeddedObject::CreateTempURLEmpty_Impl() { OSL_ENSURE( m_aTempURL.isEmpty(), "The object has already the temporary file!" ); m_aTempURL = GetNewTempFileURL_Impl( m_xFactory ); @@ -930,7 +930,7 @@ void OleEmbeddedObject::OnClosed_Impl() } //------------------------------------------------------ -::rtl::OUString OleEmbeddedObject::GetTempURL_Impl() +OUString OleEmbeddedObject::GetTempURL_Impl() { if ( m_aTempURL.isEmpty() ) { @@ -1071,7 +1071,7 @@ void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream > //------------------------------------------------------ void OleEmbeddedObject::StoreToLocation_Impl( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lObjArgs, sal_Bool bSaveAs ) throw ( uno::Exception ) @@ -1082,13 +1082,13 @@ void OleEmbeddedObject::StoreToLocation_Impl( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!\n" ); @@ -1170,7 +1170,7 @@ void OleEmbeddedObject::StoreToLocation_Impl( if ( !xTargetStream.is() ) throw io::IOException(); //TODO: access denied - SetStreamMediaType_Impl( xTargetStream, ::rtl::OUString( "application/vnd.sun.star.oleobject" )); + SetStreamMediaType_Impl( xTargetStream, OUString( "application/vnd.sun.star.oleobject" )); uno::Reference< io::XOutputStream > xOutStream = xTargetStream->getOutputStream(); if ( !xOutStream.is() ) throw io::IOException(); //TODO: access denied @@ -1283,7 +1283,7 @@ void OleEmbeddedObject::StoreToLocation_Impl( //------------------------------------------------------ void SAL_CALL OleEmbeddedObject::setPersistentEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 nEntryConnectionMode, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) @@ -1317,12 +1317,12 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -1337,7 +1337,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( // it can switch persistent representation only without initialization throw embed::WrongStateException( - ::rtl::OUString( "Can't change persistent representation of activated object!\n" ), + OUString( "Can't change persistent representation of activated object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1347,7 +1347,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) ); else throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1436,14 +1436,14 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( else if ( nEntryConnectionMode == embed::EntryInitModes::MEDIA_DESCRIPTOR_INIT ) { // use URL ( may be content or stream later ) from MediaDescriptor to initialize object - ::rtl::OUString aURL; + OUString aURL; for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ ) if ( lArguments[nInd].Name == "URL" ) lArguments[nInd].Value >>= aURL; if ( aURL.isEmpty() ) throw lang::IllegalArgumentException( - ::rtl::OUString( "Empty URL is provided in the media descriptor!\n" ), + OUString( "Empty URL is provided in the media descriptor!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -1465,7 +1465,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( //TODO: //} else - throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); } @@ -1483,7 +1483,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( // do nothing, the object has already switched it's persistence } else - throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Wrong connection mode is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); @@ -1492,7 +1492,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry( //------------------------------------------------------ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -1526,7 +1526,7 @@ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XSto //------------------------------------------------------ void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lArguments, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -1583,7 +1583,7 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1624,7 +1624,7 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew ) m_xNewObjectStream = uno::Reference< io::XStream >(); m_xNewParentStorage = uno::Reference< embed::XStorage >(); - m_aNewEntryName = ::rtl::OUString(); + m_aNewEntryName = OUString(); m_bWaitSaveCompleted = sal_False; m_bNewVisReplInStream = sal_False; m_xNewCachedVisRepl = uno::Reference< io::XStream >(); @@ -1648,13 +1648,13 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew ) aGuard.clear(); if ( bUseNew ) { - MakeEventListenerNotification_Impl( ::rtl::OUString( "OnSaveAsDone" )); + MakeEventListenerNotification_Impl( OUString( "OnSaveAsDone" )); // the object can be changed only on windows // the notification should be done only if the object is not in loaded state if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded ) { - MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" )); + MakeEventListenerNotification_Impl( OUString( "OnVisAreaChanged" )); } } } @@ -1679,7 +1679,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_xObjectStream.is() ) @@ -1689,7 +1689,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OleEmbeddedObject::getEntryName() +OUString SAL_CALL OleEmbeddedObject::getEntryName() throw ( embed::WrongStateException, uno::RuntimeException ) { @@ -1709,13 +1709,13 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_aEntryName; @@ -1754,13 +1754,13 @@ void SAL_CALL OleEmbeddedObject::storeOwn() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "Can't store object without persistence!\n" ), + throw embed::WrongStateException( OUString( "Can't store object without persistence!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_bReadOnly ) @@ -1780,7 +1780,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn() if ( !m_xObjectStream.is() ) throw io::IOException(); //TODO: access denied - SetStreamMediaType_Impl( m_xObjectStream, ::rtl::OUString( "application/vnd.sun.star.oleobject" )); + SetStreamMediaType_Impl( m_xObjectStream, OUString( "application/vnd.sun.star.oleobject" )); uno::Reference< io::XOutputStream > xOutStream = m_xObjectStream->getOutputStream(); if ( !xOutStream.is() ) throw io::IOException(); //TODO: access denied @@ -1834,12 +1834,12 @@ void SAL_CALL OleEmbeddedObject::storeOwn() aGuard.clear(); - MakeEventListenerNotification_Impl( ::rtl::OUString( "OnSaveDone" )); + MakeEventListenerNotification_Impl( OUString( "OnSaveDone" )); // the object can be changed only on Windows // the notification should be done only if the object is not in loaded state if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded ) - MakeEventListenerNotification_Impl( ::rtl::OUString( "OnVisAreaChanged" )); + MakeEventListenerNotification_Impl( OUString( "OnVisAreaChanged" )); } //------------------------------------------------------ @@ -1863,13 +1863,13 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly() if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return m_bReadOnly; @@ -1904,13 +1904,13 @@ void SAL_CALL OleEmbeddedObject::reload( if ( m_nObjectState == -1 ) { // the object is still not loaded - throw embed::WrongStateException( ::rtl::OUString( "The object persistence is not initialized!\n" ), + throw embed::WrongStateException( OUString( "The object persistence is not initialized!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: @@ -1921,7 +1921,7 @@ void SAL_CALL OleEmbeddedObject::reload( //------------------------------------------------------ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName ) + const OUString& sEntName ) throw ( lang::IllegalArgumentException, embed::WrongStateException, io::IOException, @@ -1943,12 +1943,12 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag throw lang::DisposedException(); // TODO if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -1957,7 +1957,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag { // it must be a linked initialized object throw embed::WrongStateException( - ::rtl::OUString( "The object is not a valid linked object!\n" ), + OUString( "The object is not a valid linked object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -1966,7 +1966,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); @@ -1976,8 +1976,8 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag // TODO: create an object based on the link // disconnect the old temporary URL - ::rtl::OUString aOldTempURL = m_aTempURL; - m_aTempURL = ::rtl::OUString(); + OUString aOldTempURL = m_aTempURL; + m_aTempURL = OUString(); OleComponent* pNewOleComponent = new OleComponent( m_xFactory, this ); try { @@ -2030,7 +2030,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag } m_bIsLink = sal_False; - m_aLinkURL = ::rtl::OUString(); + m_aLinkURL = OUString(); } else #endif @@ -2061,7 +2061,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::isLink() } //------------------------------------------------------ -::rtl::OUString SAL_CALL OleEmbeddedObject::getLinkURL() +OUString SAL_CALL OleEmbeddedObject::getLinkURL() throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException ) @@ -2081,12 +2081,12 @@ sal_Bool SAL_CALL OleEmbeddedObject::isLink() if ( m_bWaitSaveCompleted ) throw embed::WrongStateException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( !m_bIsLink ) throw embed::WrongStateException( - ::rtl::OUString( "The object is not a link object!\n" ), + OUString( "The object is not a link object!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: probably the link URL can be retrieved from OLE diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index f16a29a63aa2..c9bca296a1cb 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -35,7 +35,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory( { void * pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); + OUString aImplName( OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if ( pServiceManager ) diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 1628a36c853d..c09634f666fb 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -54,16 +54,16 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo { // it's a bitmap aVisualRepr.Flavor = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), - ::rtl::OUString( "Bitmap" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )), + OUString( "Bitmap" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); } else { // it's a metafile aVisualRepr.Flavor = datatransfer::DataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString( "Windows Metafile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), + OUString( "Windows Metafile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); } @@ -100,11 +100,11 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), + throw embed::WrongStateException( OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); #ifdef WNT @@ -180,11 +180,11 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), + throw embed::WrongStateException( OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); awt::Size aResult; @@ -218,7 +218,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) catch( const uno::Exception& ) { throw embed::NoVisualAreaSizeException( - ::rtl::OUString( "No size available!\n" ), + OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } } @@ -261,7 +261,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) if ( !bSuccess ) throw embed::NoVisualAreaSizeException( - ::rtl::OUString( "No size available!\n" ), + OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); aGuard.reset(); @@ -280,7 +280,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) catch ( const uno::Exception& ) { throw embed::NoVisualAreaSizeException( - ::rtl::OUString( "No size available!\n" ), + OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } } @@ -296,7 +296,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) else { throw embed::NoVisualAreaSizeException( - ::rtl::OUString( "No size available!\n" ), + OUString( "No size available!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } } @@ -328,13 +328,13 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); // TODO: if the object has cached representation then it should be returned // TODO: if the object has no cached representation and is in loaded state it should switch itself to the running state if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), + throw embed::WrongStateException( OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); embed::VisualRepresentation aVisualRepr; @@ -361,8 +361,8 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres changeState( embed::EmbedStates::RUNNING ); datatransfer::DataFlavor aDataFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString( "Windows Metafile" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), + OUString( "Windows Metafile" ), ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); aVisualRepr.Data = m_pOleComponent->getTransferData( aDataFlavor ); @@ -394,7 +394,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres if ( !m_xCachedVisualRepresentation.is() ) { // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); } @@ -421,11 +421,11 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getMapUnit( sal_Int64 nAspect ) OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved - throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ), + throw embed::WrongStateException( OUString( "Illegal call!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); if ( m_nObjectState == -1 ) - throw embed::WrongStateException( ::rtl::OUString( "The object is not loaded!\n" ), + throw embed::WrongStateException( OUString( "The object is not loaded!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) ); return embed::EmbedMapUnits::ONE_100TH_MM; diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 1f5fb367b2fb..cd60186efab2 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -48,9 +48,9 @@ using namespace ::com::sun::star; using namespace ::comphelper; -::rtl::OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); -::rtl::OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); -sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ); +OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); +OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw( io::IOException ); +sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory ); uno::Reference< io::XStream > TryToGetAcceptableFormat_Impl( const uno::Reference< io::XStream >& xStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) throw ( uno::Exception ); //======================================================== @@ -109,7 +109,7 @@ OwnView_Impl::~OwnView_Impl() } //-------------------------------------------------------- -sal_Bool OwnView_Impl::CreateModelFromURL( const ::rtl::OUString& aFileURL ) +sal_Bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL ) { sal_Bool bResult = sal_False; @@ -120,28 +120,28 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const ::rtl::OUString& aFileURL ) uno::Sequence< beans::PropertyValue > aArgs( m_aFilterName.isEmpty() ? 4 : 5 ); - aArgs[0].Name = ::rtl::OUString( "URL" ); + aArgs[0].Name = OUString( "URL" ); aArgs[0].Value <<= aFileURL; - aArgs[1].Name = ::rtl::OUString( "ReadOnly" ); + aArgs[1].Name = OUString( "ReadOnly" ); aArgs[1].Value <<= sal_True; - aArgs[2].Name = ::rtl::OUString( "InteractionHandler" ); + aArgs[2].Name = OUString( "InteractionHandler" ); aArgs[2].Value <<= uno::Reference< task::XInteractionHandler >( static_cast< ::cppu::OWeakObject* >( new DummyHandler_Impl() ), uno::UNO_QUERY ); - aArgs[3].Name = ::rtl::OUString( "DontEdit" ); + aArgs[3].Name = OUString( "DontEdit" ); aArgs[3].Value <<= sal_True; if ( !m_aFilterName.isEmpty() ) { - aArgs[4].Name = ::rtl::OUString( "FilterName" ); + aArgs[4].Name = OUString( "FilterName" ); aArgs[4].Value <<= m_aFilterName; } uno::Reference< frame::XModel > xModel( xDocumentLoader->loadComponentFromURL( aFileURL, - ::rtl::OUString( "_blank" ), + OUString( "_blank" ), 0, aArgs ), uno::UNO_QUERY ); @@ -193,41 +193,41 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative ) } //-------------------------------------------------------- -::rtl::OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream( +OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, - const ::rtl::OUString& aNameWithExtention, + const OUString& aNameWithExtention, const uno::Reference< io::XInputStream >& xInputStream ) { if ( !xInputStream.is() ) throw uno::RuntimeException(); uno::Reference< document::XTypeDetection > xTypeDetection( - xFactory->createInstance( ::rtl::OUString( "com.sun.star.document.TypeDetection" )), + xFactory->createInstance( OUString( "com.sun.star.document.TypeDetection" )), uno::UNO_QUERY_THROW ); - ::rtl::OUString aTypeName; + OUString aTypeName; if ( !aNameWithExtention.isEmpty() ) { - ::rtl::OUString aURLToAnalyze = - ( ::rtl::OUString( "file:///" ) + aNameWithExtention ); + OUString aURLToAnalyze = + ( OUString( "file:///" ) + aNameWithExtention ); aTypeName = xTypeDetection->queryTypeByURL( aURLToAnalyze ); } uno::Sequence< beans::PropertyValue > aArgs( aTypeName.isEmpty() ? 2 : 3 ); - aArgs[0].Name = ::rtl::OUString( "URL" ); - aArgs[0].Value <<= ::rtl::OUString( "private:stream" ); - aArgs[1].Name = ::rtl::OUString( "InputStream" ); + aArgs[0].Name = OUString( "URL" ); + aArgs[0].Value <<= OUString( "private:stream" ); + aArgs[1].Name = OUString( "InputStream" ); aArgs[1].Value <<= xInputStream; if ( !aTypeName.isEmpty() ) { - aArgs[2].Name = ::rtl::OUString( "TypeName" ); + aArgs[2].Name = OUString( "TypeName" ); aArgs[2].Value <<= aTypeName; } aTypeName = xTypeDetection->queryTypeByDescriptor( aArgs, sal_True ); - ::rtl::OUString aFilterName; + OUString aFilterName; for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ ) if ( aArgs[nInd].Name == "FilterName" ) aArgs[nInd].Value >>= aFilterName; @@ -262,7 +262,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io xSeekable->seek( 0 ); // create m_aNativeTempURL - ::rtl::OUString aNativeTempURL; + OUString aNativeTempURL; uno::Reference < beans::XPropertySet > xNativeTempFile( io::TempFile::create(comphelper::getComponentContext(m_xFactory)), uno::UNO_QUERY_THROW ); @@ -273,8 +273,8 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io throw uno::RuntimeException(); try { - xNativeTempFile->setPropertyValue( ::rtl::OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); - uno::Any aUrl = xNativeTempFile->getPropertyValue( ::rtl::OUString( "Uri" )); + xNativeTempFile->setPropertyValue( OUString( "RemoveFile" ), uno::makeAny( sal_False ) ); + uno::Any aUrl = xNativeTempFile->getPropertyValue( OUString( "Uri" )); aUrl >>= aNativeTempURL; } catch ( uno::Exception& ) @@ -282,7 +282,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io } sal_Bool bFailed = sal_False; - ::rtl::OUString aFileSuffix; + OUString aFileSuffix; if ( bParseHeader ) { @@ -308,7 +308,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io aReadSeq[0] == '.' ) { - aFileSuffix += ::rtl::OUString::valueOf( (sal_Unicode) aReadSeq[0] ); + aFileSuffix += OUString::valueOf( (sal_Unicode) aReadSeq[0] ); } } while( aReadSeq[0] ); @@ -421,11 +421,11 @@ void OwnView_Impl::CreateNative() aArgs[0] <<= xInStream; uno::Reference< container::XNameAccess > xNameAccess( m_xFactory->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.OLESimpleStorage" ), + OUString( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY_THROW ); - ::rtl::OUString aSubStreamName = ::rtl::OUString( "\1Ole10Native" ); + OUString aSubStreamName = OUString( "\1Ole10Native" ); uno::Reference< embed::XClassifiedObject > xStor( xNameAccess, uno::UNO_QUERY_THROW ); uno::Sequence< sal_Int8 > aStorClassID = xStor->getClassID(); @@ -450,7 +450,7 @@ void OwnView_Impl::CreateNative() if ( !bOk && !m_aNativeTempURL.isEmpty() ) { KillFile_Impl( m_aNativeTempURL, m_xFactory ); - m_aNativeTempURL = ::rtl::OUString(); + m_aNativeTempURL = OUString(); } } @@ -461,7 +461,7 @@ void OwnView_Impl::CreateNative() if ( !bOk && !m_aNativeTempURL.isEmpty() ) { KillFile_Impl( m_aNativeTempURL, m_xFactory ); - m_aNativeTempURL = ::rtl::OUString(); + m_aNativeTempURL = OUString(); } } } diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx index d776922e93ee..4a17623f7bfd 100644 --- a/embeddedobj/source/msole/ownview.hxx +++ b/embeddedobj/source/msole/ownview.hxx @@ -38,17 +38,17 @@ class OwnView_Impl : public ::cppu::WeakImplHelper2 < ::com::sun::star::util::XC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::rtl::OUString m_aTempFileURL; - ::rtl::OUString m_aNativeTempURL; + OUString m_aTempFileURL; + OUString m_aNativeTempURL; - ::rtl::OUString m_aFilterName; + OUString m_aFilterName; sal_Bool m_bBusy; sal_Bool m_bUseNative; private: - sal_Bool CreateModelFromURL( const ::rtl::OUString& aFileURL ); + sal_Bool CreateModelFromURL( const OUString& aFileURL ); sal_Bool CreateModel( sal_Bool bUseNative ); @@ -57,9 +57,9 @@ private: void CreateNative(); public: - static ::rtl::OUString GetFilterNameFromExtentionAndInStream( + static OUString GetFilterNameFromExtentionAndInStream( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, - const ::rtl::OUString& aNameWithExtention, + const OUString& aNameWithExtention, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream ); OwnView_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index b4e5d509afb6..72d950836a6e 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -105,18 +105,18 @@ uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const uno::Sequence< sal_In } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.MSOLEObjectSystemCreator"); + aRet[1] = OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MSOLEDialogObjectCreator::impl_staticGetImplementationName() +OUString SAL_CALL MSOLEDialogObjectCreator::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); + return OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator"); } //------------------------------------------------------------------------- @@ -129,7 +129,7 @@ uno::Reference< uno::XInterface > SAL_CALL MSOLEDialogObjectCreator::impl_static //------------------------------------------------------------------------- embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDialog( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aInObjArgs ) throw ( lang::IllegalArgumentException, io::IOException, @@ -142,12 +142,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia #ifdef WNT if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( !sEntName.getLength() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -170,11 +170,11 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia ::osl::Module aOleDlgLib; - if( !aOleDlgLib.load( ::rtl::OUString( "oledlg" ) )) + if( !aOleDlgLib.load( OUString( "oledlg" ) )) throw uno::RuntimeException(); OleUIInsertObjectA_Type * pInsertFct = (OleUIInsertObjectA_Type *) - aOleDlgLib.getSymbol( ::rtl::OUString( "OleUIInsertObjectA" )); + aOleDlgLib.getSymbol( OUString( "OleUIInsertObjectA" )); if( !pInsertFct ) throw uno::RuntimeException(); @@ -201,20 +201,20 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia aClassID = GetRelatedInternalID_Impl( aClassID ); //TODO: retrieve ClassName - ::rtl::OUString aClassName; + OUString aClassName; aObjectInfo.Object = uno::Reference< embed::XEmbeddedObject >( xEmbCreator->createInstanceInitNew( aClassID, aClassName, xStorage, sEntName, aObjArgs ), uno::UNO_QUERY ); } else { - ::rtl::OUString aFileName = ::rtl::OStringToOUString( ::rtl::OString( szFile ), osl_getThreadTextEncoding() ); - rtl::OUString aFileURL; + OUString aFileName = OStringToOUString( OString( szFile ), osl_getThreadTextEncoding() ); + OUString aFileURL; if ( osl::FileBase::getFileURLFromSystemPath( aFileName, aFileURL ) != osl::FileBase::E_None ) throw uno::RuntimeException(); uno::Sequence< beans::PropertyValue > aMediaDescr( 1 ); - aMediaDescr[0].Name = ::rtl::OUString( "URL" ); + aMediaDescr[0].Name = OUString( "URL" ); aMediaDescr[0].Value <<= aFileURL; // TODO: use config helper for type detection @@ -252,14 +252,14 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia if ( nBufSize && nBufSize == GetMetaFileBitsEx( pMF->hMF, nBufSize, pBuf+22 ) ) { datatransfer::DataFlavor aFlavor( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), - ::rtl::OUString( "Image WMF" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )), + OUString( "Image WMF" ), getCppuType( ( const uno::Sequence< sal_Int8 >* ) 0 ) ); aObjectInfo.Options.realloc( 2 ); - aObjectInfo.Options[0].Name = ::rtl::OUString( "Icon" ); + aObjectInfo.Options[0].Name = OUString( "Icon" ); aObjectInfo.Options[0].Value <<= aMetafile; - aObjectInfo.Options[1].Name = ::rtl::OUString( "IconFormat" ); + aObjectInfo.Options[1].Name = OUString( "IconFormat" ); aObjectInfo.Options[1].Value <<= aFlavor; } @@ -283,7 +283,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia //------------------------------------------------------------------------- embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitFromClipboard( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntryName, + const OUString& sEntryName, const uno::Sequence< beans::PropertyValue >& aObjectArgs ) throw ( lang::IllegalArgumentException, io::IOException, @@ -294,12 +294,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF #ifdef WNT if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( !sEntryName.getLength() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -333,17 +333,17 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MSOLEDialogObjectCreator::getImplementationName() +OUString SAL_CALL MSOLEDialogObjectCreator::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL MSOLEDialogObjectCreator::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL MSOLEDialogObjectCreator::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -353,7 +353,7 @@ sal_Bool SAL_CALL MSOLEDialogObjectCreator::supportsService( const ::rtl::OUStri } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL MSOLEDialogObjectCreator::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx index 8f448b21a121..9201328bda21 100644 --- a/embeddedobj/source/msole/xdialogcreator.hxx +++ b/embeddedobj/source/msole/xdialogcreator.hxx @@ -43,9 +43,9 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -53,15 +53,15 @@ public: // XInsertObjectDialog - virtual ::com::sun::star::embed::InsertedObjectInfo SAL_CALL createInstanceByDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::embed::InsertedObjectInfo SAL_CALL createInstanceByDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XEmbedObjectClipboardCreator - virtual ::com::sun::star::embed::InsertedObjectInfo SAL_CALL createInstanceInitFromClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::embed::InsertedObjectInfo SAL_CALL createInstanceInitFromClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx index f5fdff4eedd1..fb3baeb05e66 100644 --- a/embeddedobj/source/msole/xolefactory.cxx +++ b/embeddedobj/source/msole/xolefactory.cxx @@ -36,18 +36,18 @@ using namespace ::com::sun::star; // TODO: do not create OLE objects that represent OOo documents //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.OLEEmbeddedObjectFactory"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.OLEEmbeddedObjectFactory"); + aRet[1] = OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName() +OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); + return OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"); } //------------------------------------------------------------------------- @@ -60,7 +60,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::impl_static //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitFromEntry( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMedDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -72,12 +72,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitFromEntry" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -133,7 +133,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -144,12 +144,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -174,9 +174,9 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitNew( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName, + const OUString& aClassName, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, io::IOException, @@ -186,12 +186,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitNew" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 3 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 4 ); @@ -216,7 +216,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceLink( const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& lObjArgs ) throw ( lang::IllegalArgumentException, @@ -227,13 +227,13 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceLink" ); if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -259,9 +259,9 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta //------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceUserInit( const uno::Sequence< sal_Int8 >& aClassID, - const ::rtl::OUString& aClassName, + const OUString& aClassName, const uno::Reference< embed::XStorage >& xStorage, - const ::rtl::OUString& sEntName, + const OUString& sEntName, sal_Int32 /*nEntryConnectionMode*/, const uno::Sequence< beans::PropertyValue >& /*lArguments*/, const uno::Sequence< beans::PropertyValue >& lObjArgs ) @@ -274,12 +274,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta // the initialization is completelly controlled by user if ( !xStorage.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 1 ); if ( sEntName.isEmpty() ) - throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ), + throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ), 2 ); @@ -304,17 +304,17 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OleEmbeddedObjectFactory::getImplementationName() +OUString SAL_CALL OleEmbeddedObjectFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OleEmbeddedObjectFactory::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OleEmbeddedObjectFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -324,7 +324,7 @@ sal_Bool SAL_CALL OleEmbeddedObjectFactory::supportsService( const ::rtl::OUStri } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OleEmbeddedObjectFactory::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx index b1d780b5363c..37747e8fe7ac 100644 --- a/embeddedobj/source/msole/xolefactory.hxx +++ b/embeddedobj/source/msole/xolefactory.hxx @@ -41,9 +41,9 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -51,20 +51,20 @@ public: // XEmbedObjectCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitNew( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMedDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XEmbedObjectFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const ::rtl::OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceUserInit( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLinkCreator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx index d1d55a9ed520..4c5dcb6281ab 100644 --- a/embeddedobj/test/MainThreadExecutor/register.cxx +++ b/embeddedobj/test/MainThreadExecutor/register.cxx @@ -32,7 +32,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImp { void * pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); + OUString aImplName( OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if ( pServiceManager && aImplName.equals( UNOMainThreadExecutor::impl_staticGetImplementationName() ) ) @@ -62,11 +62,11 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK uno::Reference< registry::XRegistryKey > xNewKey; - xNewKey = xKey->createKey( ::rtl::OUString("/") + + xNewKey = xKey->createKey( OUString("/") + UNOMainThreadExecutor::impl_staticGetImplementationName() + - ::rtl::OUString( "/UNO/SERVICES") ); + OUString( "/UNO/SERVICES") ); - uno::Sequence< ::rtl::OUString > &rServices = UNOMainThreadExecutor::impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > &rServices = UNOMainThreadExecutor::impl_staticGetSupportedServiceNames(); for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) xNewKey->createKey( rServices.getConstArray()[ind] ); diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx index e35feb8cd3ac..2634e7a336ff 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx @@ -82,17 +82,17 @@ uno::Any SAL_CALL UNOMainThreadExecutor::execute( const uno::Sequence< beans::Na } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL UNOMainThreadExecutor::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL UNOMainThreadExecutor::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(1); + uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.comp.thread.MainThreadExecutor"; return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UNOMainThreadExecutor::impl_staticGetImplementationName() +OUString SAL_CALL UNOMainThreadExecutor::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.thread.MainThreadExecutor"); + return OUString("com.sun.star.comp.thread.MainThreadExecutor"); } //------------------------------------------------------------------------- @@ -103,17 +103,17 @@ uno::Reference< uno::XInterface > SAL_CALL UNOMainThreadExecutor::impl_staticCre } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL UNOMainThreadExecutor::getImplementationName() +OUString SAL_CALL UNOMainThreadExecutor::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL UNOMainThreadExecutor::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL UNOMainThreadExecutor::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -123,7 +123,7 @@ sal_Bool SAL_CALL UNOMainThreadExecutor::supportsService( const ::rtl::OUString& } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL UNOMainThreadExecutor::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL UNOMainThreadExecutor::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx index 97213d543aec..7e2b29abec5b 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx @@ -40,9 +40,9 @@ public: { } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -52,9 +52,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx index 593741078374..7f0907835681 100644 --- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx +++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx @@ -26,18 +26,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL VCLBitmapCreator::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL VCLBitmapCreator::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); + uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.BitmapCreator"; aRet[1] = "com.sun.star.comp.embed.BitmapCreator"; return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL VCLBitmapCreator::impl_staticGetImplementationName() +OUString SAL_CALL VCLBitmapCreator::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.BitmapCreator"); + return OUString("com.sun.star.comp.embed.BitmapCreator"); } //------------------------------------------------------------------------- @@ -84,17 +84,17 @@ uno::Reference< uno::XInterface > SAL_CALL VCLBitmapCreator::createInstanceWithA } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL VCLBitmapCreator::getImplementationName() +OUString SAL_CALL VCLBitmapCreator::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL VCLBitmapCreator::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL VCLBitmapCreator::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -104,7 +104,7 @@ sal_Bool SAL_CALL VCLBitmapCreator::supportsService( const ::rtl::OUString& Serv } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL VCLBitmapCreator::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL VCLBitmapCreator::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.hxx b/embeddedobj/test/mtexecutor/bitmapcreator.hxx index aeb0a6d68111..6770347c54f5 100644 --- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx +++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx @@ -37,9 +37,9 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) {} - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); @@ -49,9 +49,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx index 084efe6c5f21..788c0e819fd1 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx @@ -24,18 +24,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL MainThreadExecutor::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL MainThreadExecutor::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); + uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.thread.MainThreadExecutor"; aRet[1] = "com.sun.star.comp.thread.MainThreadExecutor"; return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MainThreadExecutor::impl_staticGetImplementationName() +OUString SAL_CALL MainThreadExecutor::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.thread.MainThreadExecutor"); + return OUString("com.sun.star.comp.thread.MainThreadExecutor"); } //------------------------------------------------------------------------- @@ -85,17 +85,17 @@ IMPL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThrea } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL MainThreadExecutor::getImplementationName() +OUString SAL_CALL MainThreadExecutor::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL MainThreadExecutor::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL MainThreadExecutor::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -105,7 +105,7 @@ sal_Bool SAL_CALL MainThreadExecutor::supportsService( const ::rtl::OUString& Se } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL MainThreadExecutor::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL MainThreadExecutor::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx index fb2da650fcd0..a1a12b6b6222 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx @@ -52,9 +52,9 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) {} - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); @@ -65,9 +65,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx index 7ef94d2cf6df..d3fffbb03699 100644 --- a/embeddedobj/test/mtexecutor/mteregister.cxx +++ b/embeddedobj/test/mtexecutor/mteregister.cxx @@ -33,7 +33,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImp { void * pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); + OUString aImplName( OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if ( pServiceManager ) @@ -73,20 +73,20 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) ); uno::Reference< registry::XRegistryKey > xNewKey; - uno::Sequence< ::rtl::OUString > rServices; + uno::Sequence< OUString > rServices; sal_Int32 ind = 0; - xNewKey = xKey->createKey( ::rtl::OUString("/") + + xNewKey = xKey->createKey( OUString("/") + MainThreadExecutor::impl_staticGetImplementationName() + - ::rtl::OUString( "/UNO/SERVICES") ); + OUString( "/UNO/SERVICES") ); rServices = MainThreadExecutor::impl_staticGetSupportedServiceNames(); for( ind = 0; ind < rServices.getLength(); ind++ ) xNewKey->createKey( rServices.getConstArray()[ind] ); - xNewKey = xKey->createKey( ::rtl::OUString("/") + + xNewKey = xKey->createKey( OUString("/") + VCLBitmapCreator::impl_staticGetImplementationName() + - ::rtl::OUString( "/UNO/SERVICES") ); + OUString( "/UNO/SERVICES") ); rServices = VCLBitmapCreator::impl_staticGetSupportedServiceNames(); for( ind = 0; ind < rServices.getLength(); ind++ ) diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index f3c0692af630..e5a7511d11e7 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star; -extern ::rtl::OUString getFilterNameFromGUID_Impl( GUID* ); +extern OUString getFilterNameFromGUID_Impl( GUID* ); // add mutex locking ??? @@ -120,21 +120,21 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode ) aAny <<= uno::Reference( m_xDocument, uno::UNO_QUERY); aSeq[0] = beans::PropertyValue( - rtl::OUString("Model"), + OUString("Model"), -1, aAny, beans::PropertyState_DIRECT_VALUE); aAny <<= sal_False; aSeq[1] = beans::PropertyValue( - rtl::OUString("ReadOnly"), + OUString("ReadOnly"), -1, aAny, beans::PropertyState_DIRECT_VALUE); aAny <<= (sal_Bool) sal_True; aSeq[2] = beans::PropertyValue( - rtl::OUString("NoAutoSave"), + OUString("NoAutoSave"), -1, aAny, beans::PropertyState_DIRECT_VALUE); @@ -144,7 +144,7 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode ) aSeq.realloc( ++nLen ); aAny <<= (sal_Int16) 3; aSeq[nLen-1] = beans::PropertyValue( - rtl::OUString("PluginMode"), + OUString("PluginMode"), -1, aAny, beans::PropertyState_DIRECT_VALUE); @@ -153,21 +153,21 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode ) aSeq.realloc( nLen+=2 ); aAny <<= xHandler; aSeq[nLen-2] = beans::PropertyValue( - rtl::OUString("InteractionHandler"), + OUString("InteractionHandler"), -1, aAny, beans::PropertyState_DIRECT_VALUE); aAny <<= m_nMacroExecMode; aSeq[nLen-1] = beans::PropertyValue( - rtl::OUString("MacroExecutionMode"), + OUString("MacroExecutionMode"), -1, aAny, beans::PropertyState_DIRECT_VALUE); xComponentLoader->loadComponentFromURL( - rtl::OUString("private:object"), - rtl::OUString("_self"), + OUString("private:object"), + OUString("_self"), 0, aSeq); @@ -348,7 +348,7 @@ HRESULT DocumentHolder::InPlaceActivate( m_xFrame->activate(); else { // create frame and initialize it with with the created window - static const ::rtl::OUString aFrameServiceName( "com.sun.star.frame.Frame" ); + static const OUString aFrameServiceName( "com.sun.star.frame.Frame" ); m_xFrame = uno::Reference( m_xFactory->createInstance(aFrameServiceName), uno::UNO_QUERY); @@ -367,7 +367,7 @@ HRESULT DocumentHolder::InPlaceActivate( if( xPS.is() ) { aAny = xPS->getPropertyValue( - rtl::OUString("LayoutManager")); + OUString("LayoutManager")); aAny >>= m_xLayoutManager; } @@ -384,7 +384,7 @@ HRESULT DocumentHolder::InPlaceActivate( if(m_xLayoutManager.is()) { uno::Reference< ::com::sun::star::ui::XUIElement > xUIEl( m_xLayoutManager->getElement( - rtl::OUString( + OUString( "private:resource/menubar/menubar"))); OSL_ENSURE(xUIEl.is(),"no menubar"); uno::Reference xSDMP( @@ -396,7 +396,7 @@ HRESULT DocumentHolder::InPlaceActivate( if( aAny >>= tmp ) m_nMenuHandle = HMENU(tmp); m_xLayoutManager->hideElement( - rtl::OUString( + OUString( "private:resource/menubar/menubar" )); } } @@ -735,9 +735,9 @@ void DocumentHolder::SetDocument( const uno::Reference< frame::XModel >& xDoc, s { // set the document mode to embedded uno::Sequence< beans::PropertyValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString( "SetEmbedded" ); + aSeq[0].Name = OUString( "SetEmbedded" ); aSeq[0].Value <<= sal_True; - m_xDocument->attachResource(::rtl::OUString(),aSeq); + m_xDocument->attachResource(OUString(),aSeq); } } @@ -796,7 +796,7 @@ uno::Reference< frame::XFrame > DocumentHolder::DocumentFrame() // this is so only for outplace activation if( xFrame.is() ) m_xFrame = xFrame->findFrame( - rtl::OUString("_blank"),0); + OUString("_blank"),0); uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xFrame, uno::UNO_QUERY ); @@ -872,11 +872,11 @@ void DocumentHolder::show() if ( xProps.is() ) { uno::Reference< frame::XLayoutManager > xLayoutManager; - xProps->getPropertyValue( rtl::OUString( "LayoutManager" ) ) >>= xLayoutManager; + xProps->getPropertyValue( OUString( "LayoutManager" ) ) >>= xLayoutManager; uno::Reference< beans::XPropertySet > xLMProps( xLayoutManager, uno::UNO_QUERY ); if ( xLMProps.is() ) { - xLMProps->setPropertyValue( ::rtl::OUString( "MenuBarCloser" ), + xLMProps->setPropertyValue( OUString( "MenuBarCloser" ), uno::makeAny( uno::Reference< frame::XStatusListener >() ) ); } } @@ -957,13 +957,13 @@ void DocumentHolder::resizeWin( const SIZEL& rNewSize ) } } -void DocumentHolder::setTitle(const rtl::OUString& aDocumentName) +void DocumentHolder::setTitle(const OUString& aDocumentName) { if(m_xFrame.is()) { if(m_aFilterName.getLength() == 0) { - rtl::OUString aFilterName; + OUString aFilterName; uno::Sequence aSeq; if(m_xDocument.is()) { @@ -972,7 +972,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName) for(sal_Int32 j = 0; j < aSeq.getLength(); ++j) { if(aSeq[j].Name == - rtl::OUString("FilterName")) + OUString("FilterName")) { aSeq[j].Value >>= aFilterName; break; @@ -984,7 +984,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName) { uno::Reference xNameAccess( m_xFactory->createInstance( - rtl::OUString( + OUString( "com.sun.star.document.FilterFactory")), uno::UNO_QUERY); try { @@ -993,7 +993,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName) { for(sal_Int32 j = 0; j < aSeq.getLength(); ++j) if(aSeq[j].Name == - rtl::OUString("UIName")) + OUString("UIName")) { aSeq[j].Value >>= m_aFilterName; break; @@ -1013,14 +1013,14 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName) uno::Any aAny; static const sal_Unicode u[] = { ' ','(',0 }; static const sal_Unicode c[] = { ')',0 }; - rtl::OUString aTotalName(m_aFilterName); - aTotalName += rtl::OUString(u); + OUString aTotalName(m_aFilterName); + aTotalName += OUString(u); aTotalName += aDocumentName; - aTotalName += rtl::OUString(c); + aTotalName += OUString(c); aAny <<= aTotalName; try { xPropSet->setPropertyValue( - rtl::OUString("Title"), + OUString("Title"), aAny); } catch( const uno::Exception& ) { @@ -1047,7 +1047,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName) } -void DocumentHolder::setContainerName(const rtl::OUString& aContainerName) +void DocumentHolder::setContainerName(const OUString& aContainerName) { m_aContainerName = aContainerName; } @@ -1066,7 +1066,7 @@ IDispatch* DocumentHolder::GetIDispatch() { if ( !m_pIDispatch && m_xDocument.is() ) { - const ::rtl::OUString aServiceName ( + const OUString aServiceName ( "com.sun.star.bridge.OleBridgeSupplier2" ); uno::Reference< bridge::XBridgeSupplier2 > xSupplier( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY ); diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx index d76d3aa3bc65..464dd5b519c7 100644 --- a/embedserv/source/embed/ed_idataobj.cxx +++ b/embedserv/source/embed/ed_idataobj.cxx @@ -47,15 +47,15 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( sal_Bool isEnhMeta ) if ( isEnhMeta ) { - aFlavor.MimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + aFlavor.MimeType = OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) ); - aFlavor.HumanPresentableName = ::rtl::OUString( "Enhanced Windows MetaFile" ); + aFlavor.HumanPresentableName = OUString( "Enhanced Windows MetaFile" ); } else { - aFlavor.MimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + aFlavor.MimeType = OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) ); - aFlavor.HumanPresentableName = ::rtl::OUString( "Windows GDIMetaFile" ); + aFlavor.HumanPresentableName = OUString( "Windows GDIMetaFile" ); } aFlavor.DataType = getCppuType( (const sal_uInt64*) 0 ); diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx index 989a22113b24..a0d2cf515209 100644 --- a/embedserv/source/embed/ed_ioleobject.cxx +++ b/embedserv/source/embed/ed_ioleobject.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star; -extern ::rtl::OUString getFilterNameFromGUID_Impl( GUID* ); +extern OUString getFilterNameFromGUID_Impl( GUID* ); //------------------------------------------------------------------------------- // IOleObject @@ -50,10 +50,10 @@ STDMETHODIMP EmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, LPCOLES if ( !m_aFileName.getLength() ) { m_pDocHolder->setTitle( - rtl::OUString( + OUString( (sal_Unicode*)szContainerObj)); m_pDocHolder->setContainerName( - rtl::OUString( + OUString( (sal_Unicode*)szContainerApp)); } @@ -425,7 +425,7 @@ HRESULT EmbedDocument_Impl::SaveObject() } else if ( m_aFileName.getLength() && IsDirty() == S_OK ) { - ::rtl::OUString aPreservFileName = m_aFileName; + OUString aPreservFileName = m_aFileName; // in case of links the containers does not provide client site sometimes hr = Save( (LPCOLESTR)NULL, FALSE ); // triggers saving to the link location diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index becbe85f4d5b..c7ad57ffb527 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -54,14 +54,14 @@ const sal_Int32 nConstBufferSize = 32000; using namespace ::com::sun::star; -extern ::rtl::OUString getStorageTypeFromGUID_Impl( GUID* guid ); -extern ::rtl::OUString getServiceNameFromGUID_Impl( GUID* ); -extern ::rtl::OUString getFilterNameFromGUID_Impl( GUID* ); +extern OUString getStorageTypeFromGUID_Impl( GUID* guid ); +extern OUString getServiceNameFromGUID_Impl( GUID* ); +extern OUString getFilterNameFromGUID_Impl( GUID* ); // extern CLIPFORMAT getClipFormatFromGUID_Impl( GUID* ); -::rtl::OUString getTestFileURLFromGUID_Impl( GUID* guid ); +OUString getTestFileURLFromGUID_Impl( GUID* guid ); -const ::rtl::OUString aOfficeEmbedStreamName( "package_stream" ); -const ::rtl::OUString aExtentStreamName( "properties_stream" ); +const OUString aOfficeEmbedStreamName( "package_stream" ); +const OUString aExtentStreamName( "properties_stream" ); uno::Reference< io::XInputStream > createTempXInStreamFromIStream( uno::Reference< lang::XMultiServiceFactory > xFactory, @@ -206,29 +206,29 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp uno::Sequence< beans::PropertyValue > aArgs( 3 ); sal_Int32 nInd = 0; // must not be bigger than the preset size - aArgs[nInd].Name = ::rtl::OUString( "FilterName" ); + aArgs[nInd].Name = OUString( "FilterName" ); aArgs[nInd++].Value <<= getFilterNameFromGUID_Impl( &m_guid ); if ( xStream.is() ) { - aArgs[nInd].Name = ::rtl::OUString( "InputStream" ); + aArgs[nInd].Name = OUString( "InputStream" ); aArgs[nInd++].Value <<= xStream; - aArgs[nInd].Name = ::rtl::OUString( "URL" ); - aArgs[nInd++].Value <<= ::rtl::OUString( "private:stream" ); + aArgs[nInd].Name = OUString( "URL" ); + aArgs[nInd++].Value <<= OUString( "private:stream" ); } else { - aArgs[nInd].Name = ::rtl::OUString( "URL" ); + aArgs[nInd].Name = OUString( "URL" ); - rtl::OUString sDocUrl; + OUString sDocUrl; if ( pFilePath ) { uno::Reference< util::XURLTransformer > aTransformer( util::URLTransformer::create(comphelper::getComponentContext(m_xFactory)) ); util::URL aURL; - aURL.Complete = ::rtl::OUString( reinterpret_cast(pFilePath) ); + aURL.Complete = OUString( reinterpret_cast(pFilePath) ); - if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) ) + if ( aTransformer->parseSmart( aURL, OUString() ) ) sDocUrl = aURL.Complete; } @@ -237,7 +237,7 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp aArgs.realloc( nInd ); - // aArgs[].Name = ::rtl::OUString( "ReadOnly" ); + // aArgs[].Name = OUString( "ReadOnly" ); // aArgs[].Value <<= sal_False; //( ( nStreamMode & ( STGM_READWRITE | STGM_WRITE ) ) ? sal_True : sal_False ); return aArgs; @@ -247,12 +247,12 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForStoring_Imp { uno::Sequence< beans::PropertyValue > aArgs( xStream.is() ? 2 : 1 ); - aArgs[0].Name = ::rtl::OUString( "FilterName" ); + aArgs[0].Name = OUString( "FilterName" ); aArgs[0].Value <<= getFilterNameFromGUID_Impl( &m_guid ); if ( xStream.is() ) { - aArgs[1].Name = ::rtl::OUString( "OutputStream" ); + aArgs[1].Name = OUString( "OutputStream" ); aArgs[1].Value <<= xStream; } @@ -427,7 +427,7 @@ STDMETHODIMP EmbedDocument_Impl::InitNew( IStorage *pStg ) if ( hr == S_OK ) { - ::rtl::OUString aCurType = getStorageTypeFromGUID_Impl( &m_guid ); // ??? + OUString aCurType = getStorageTypeFromGUID_Impl( &m_guid ); // ??? CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( pStg, cf, // ??? @@ -631,7 +631,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad ) { try { - xStorable->storeToURL( ::rtl::OUString( "private:stream" ), + xStorable->storeToURL( OUString( "private:stream" ), fillArgsForStoring_Impl( xTempOut ) ); hr = copyXTempOutToIStream( xTempOut, pTargetStream ); if ( SUCCEEDED( hr ) ) @@ -759,7 +759,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ ) if ( FAILED( hr ) || !m_pMasterStorage ) return E_FAIL; - ::rtl::OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ??? + OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ??? CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( m_pMasterStorage, cf, // ??? @@ -801,7 +801,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ ) pszFileName ) ); hr = S_OK; - m_aFileName = ::rtl::OUString( reinterpret_cast(pszFileName) ); + m_aFileName = OUString( reinterpret_cast(pszFileName) ); } catch( const uno::Exception& ) { @@ -810,7 +810,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ ) if ( hr == S_OK ) { - ::rtl::OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ??? + OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ??? CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( m_pMasterStorage, cf, // ??? @@ -877,11 +877,11 @@ STDMETHODIMP EmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember ) else { util::URL aURL; - aURL.Complete = ::rtl::OUString( reinterpret_cast( pszFileName ) ); + aURL.Complete = OUString( reinterpret_cast( pszFileName ) ); uno::Reference< util::XURLTransformer > aTransformer( util::URLTransformer::create(comphelper::getComponentContext(m_xFactory)) ); - if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) && aURL.Complete.getLength() ) + if ( aTransformer->parseSmart( aURL, OUString() ) && aURL.Complete.getLength() ) { if ( fRemember ) { @@ -905,7 +905,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember ) STDMETHODIMP EmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName ) { // the different file name would mean error here - m_aFileName = ::rtl::OUString( reinterpret_cast(pszFileName) ); + m_aFileName = OUString( reinterpret_cast(pszFileName) ); return S_OK; } diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx index 6827d650db4e..1e445df1694c 100644 --- a/embedserv/source/embed/guid.cxx +++ b/embedserv/source/embed/guid.cxx @@ -24,144 +24,144 @@ #include #include -::rtl::OUString getStorageTypeFromGUID_Impl( GUID* guid ) +OUString getStorageTypeFromGUID_Impl( GUID* guid ) { if ( *guid == OID_WriterTextServer ) - return ::rtl::OUString( "soffice.StarWriterDocument.6" ); + return OUString( "soffice.StarWriterDocument.6" ); if ( *guid == OID_WriterOASISTextServer ) - return ::rtl::OUString( "LibreOffice.WriterDocument.1" ); + return OUString( "LibreOffice.WriterDocument.1" ); if ( *guid == OID_CalcServer ) - return ::rtl::OUString( "soffice.StarCalcDocument.6" ); + return OUString( "soffice.StarCalcDocument.6" ); if ( *guid == OID_CalcOASISServer ) - return ::rtl::OUString( "LibreOffice.CalcDocument.1" ); + return OUString( "LibreOffice.CalcDocument.1" ); if ( *guid == OID_DrawingServer ) - return ::rtl::OUString( "soffice.StarDrawDocument.6" ); + return OUString( "soffice.StarDrawDocument.6" ); if ( *guid == OID_DrawingOASISServer ) - return ::rtl::OUString( "LibreOffice.DrawDocument.1" ); + return OUString( "LibreOffice.DrawDocument.1" ); if ( *guid == OID_PresentationServer ) - return ::rtl::OUString( "soffice.StarImpressDocument.6" ); + return OUString( "soffice.StarImpressDocument.6" ); if ( *guid == OID_PresentationOASISServer ) - return ::rtl::OUString( "LibreOffice.ImpressDocument.1" ); + return OUString( "LibreOffice.ImpressDocument.1" ); if ( *guid == OID_MathServer ) - return ::rtl::OUString( "soffice.StarMathDocument.6" ); + return OUString( "soffice.StarMathDocument.6" ); if ( *guid == OID_MathOASISServer ) - return ::rtl::OUString( "LibreOffice.MathDocument.1" ); + return OUString( "LibreOffice.MathDocument.1" ); - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString getServiceNameFromGUID_Impl( GUID* guid ) +OUString getServiceNameFromGUID_Impl( GUID* guid ) { if ( *guid == OID_WriterTextServer ) - return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" ); + return OUString( "com.sun.star.comp.Writer.TextDocument" ); if ( *guid == OID_WriterOASISTextServer ) - return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" ); + return OUString( "com.sun.star.comp.Writer.TextDocument" ); if ( *guid == OID_CalcServer ) - return ::rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); + return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); if ( *guid == OID_CalcOASISServer ) - return ::rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); + return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); if ( *guid == OID_DrawingServer ) - return ::rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" ); + return OUString( "com.sun.star.comp.Draw.DrawingDocument" ); if ( *guid == OID_DrawingOASISServer ) - return ::rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" ); + return OUString( "com.sun.star.comp.Draw.DrawingDocument" ); if ( *guid == OID_PresentationServer ) - return ::rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" ); + return OUString( "com.sun.star.comp.Draw.PresentationDocument" ); if ( *guid == OID_PresentationOASISServer ) - return ::rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" ); + return OUString( "com.sun.star.comp.Draw.PresentationDocument" ); if ( *guid == OID_MathServer ) - return ::rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" ); + return OUString( "com.sun.star.comp.Math.FormulaDocument" ); if ( *guid == OID_MathOASISServer ) - return ::rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" ); + return OUString( "com.sun.star.comp.Math.FormulaDocument" ); - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString getFilterNameFromGUID_Impl( GUID* guid ) +OUString getFilterNameFromGUID_Impl( GUID* guid ) { if ( *guid == OID_WriterTextServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Writer)" ) ); + return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Writer)" ) ); if ( *guid == OID_WriterOASISTextServer ) - return ::rtl::OUString( "writer8" ); + return OUString( "writer8" ); if ( *guid == OID_CalcServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Calc)" ) ); + return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Calc)" ) ); if ( *guid == OID_CalcOASISServer ) - return ::rtl::OUString( "calc8" ); + return OUString( "calc8" ); if ( *guid == OID_DrawingServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Draw)" ) ); + return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Draw)" ) ); if ( *guid == OID_DrawingOASISServer ) - return ::rtl::OUString( "draw8" ); + return OUString( "draw8" ); if ( *guid == OID_PresentationServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Impress)" ) ); + return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Impress)" ) ); if ( *guid == OID_PresentationOASISServer ) - return ::rtl::OUString( "impress8" ); + return OUString( "impress8" ); if ( *guid == OID_MathServer ) - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Math)" ) ); + return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Math)" ) ); if ( *guid == OID_MathOASISServer ) - return ::rtl::OUString( "math8" ); + return OUString( "math8" ); - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString getTestFileURLFromGUID_Impl( GUID* guid ) +OUString getTestFileURLFromGUID_Impl( GUID* guid ) { if ( *guid == OID_WriterTextServer ) - return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxw" ); + return OUString( "file:///d:/OLE_TEST/test.sxw" ); if ( *guid == OID_WriterOASISTextServer ) - return ::rtl::OUString( "file:///d:/OLE_TEST/test.odt" ); + return OUString( "file:///d:/OLE_TEST/test.odt" ); if ( *guid == OID_CalcServer ) - return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxc" ); + return OUString( "file:///d:/OLE_TEST/test.sxc" ); if ( *guid == OID_CalcOASISServer ) - return ::rtl::OUString( "file:///d:/OLE_TEST/test.ods" ); + return OUString( "file:///d:/OLE_TEST/test.ods" ); if ( *guid == OID_DrawingServer ) - return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxd" ); + return OUString( "file:///d:/OLE_TEST/test.sxd" ); if ( *guid == OID_DrawingOASISServer ) - return ::rtl::OUString( "file:///d:/OLE_TEST/test.odg" ); + return OUString( "file:///d:/OLE_TEST/test.odg" ); if ( *guid == OID_PresentationServer ) - return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxi" ); + return OUString( "file:///d:/OLE_TEST/test.sxi" ); if ( *guid == OID_PresentationOASISServer ) - return ::rtl::OUString( "file:///d:/OLE_TEST/test.odp" ); + return OUString( "file:///d:/OLE_TEST/test.odp" ); if ( *guid == OID_MathServer ) - return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxm" ); + return OUString( "file:///d:/OLE_TEST/test.sxm" ); if ( *guid == OID_MathOASISServer ) - return ::rtl::OUString( "file:///d:/OLE_TEST/test.odf" ); + return OUString( "file:///d:/OLE_TEST/test.odf" ); - return ::rtl::OUString(); + return OUString(); } // Fix strange warnings about some diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx index e617ca1f3eb9..df1bc83fb959 100644 --- a/embedserv/source/embed/intercept.cxx +++ b/embedserv/source/embed/intercept.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; -uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL); +uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL); @@ -38,8 +38,8 @@ uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL); struct equalOUString { bool operator()( - const rtl::OUString& rKey1, - const rtl::OUString& rKey2 ) const + const OUString& rKey1, + const OUString& rKey2 ) const { return !!( rKey1 == rKey2 ); } @@ -48,7 +48,7 @@ struct equalOUString struct hashOUString { - size_t operator()( const rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } @@ -58,12 +58,12 @@ struct hashOUString class StatusChangeListenerContainer : public ::cppu::OMultiTypeInterfaceContainerHelperVar< -rtl::OUString,hashOUString,equalOUString> +OUString,hashOUString,equalOUString> { public: StatusChangeListenerContainer( ::osl::Mutex& aMutex ) : cppu::OMultiTypeInterfaceContainerHelperVar< - rtl::OUString,hashOUString,equalOUString>(aMutex) + OUString,hashOUString,equalOUString>(aMutex) { } }; @@ -127,12 +127,12 @@ Interceptor::Interceptor( m_pDisposeEventListeners(0), m_bLink( bLink ) { - m_aInterceptedURL[0] = rtl::OUString(".uno:Save"); - m_aInterceptedURL[1] = rtl::OUString(".uno:SaveAll"); - m_aInterceptedURL[2] = rtl::OUString(".uno:CloseDoc"); - m_aInterceptedURL[3] = rtl::OUString(".uno:CloseWin"); - m_aInterceptedURL[4] = rtl::OUString(".uno:CloseFrame"); - m_aInterceptedURL[5] = rtl::OUString(".uno:SaveAs"); + m_aInterceptedURL[0] = OUString(".uno:Save"); + m_aInterceptedURL[1] = OUString(".uno:SaveAll"); + m_aInterceptedURL[2] = OUString(".uno:CloseDoc"); + m_aInterceptedURL[3] = OUString(".uno:CloseWin"); + m_aInterceptedURL[4] = OUString(".uno:CloseFrame"); + m_aInterceptedURL[5] = OUString(".uno:SaveAs"); } @@ -209,12 +209,12 @@ Interceptor::dispatch( if ( nInd == aNewArgs.getLength() ) { aNewArgs.realloc( nInd + 1 ); - aNewArgs[nInd].Name = ::rtl::OUString( "SaveTo" ); + aNewArgs[nInd].Name = OUString( "SaveTo" ); aNewArgs[nInd].Value <<= sal_True; } uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( - URL, ::rtl::OUString( "_self" ), 0 ); + URL, OUString( "_self" ), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( URL, aNewArgs ); } @@ -236,7 +236,7 @@ void Interceptor::generateFeatureStateEvent() pTmpDocH = m_pDocH; } - ::rtl::OUString aTitle; + OUString aTitle; if ( pTmpDocH ) aTitle = pTmpDocH->getTitle(); @@ -260,8 +260,8 @@ void Interceptor::generateFeatureStateEvent() { aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0]; - aStateEvent.FeatureDescriptor = rtl::OUString("Update"); - aStateEvent.State <<= (rtl::OUString( + aStateEvent.FeatureDescriptor = OUString("Update"); + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + aTitle); @@ -269,15 +269,15 @@ void Interceptor::generateFeatureStateEvent() else if ( i == 5 ) { aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5]; - aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo"); - aStateEvent.State <<= (rtl::OUString( + aStateEvent.FeatureDescriptor = OUString("SaveCopyTo"); + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); } else { aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i]; - aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return"); - aStateEvent.State <<= (rtl::OUString( + aStateEvent.FeatureDescriptor = OUString("Close and Return"); + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + aTitle); @@ -319,16 +319,16 @@ Interceptor::addStatusListener( pTmpDocH = m_pDocH; } - ::rtl::OUString aTitle; + OUString aTitle; if ( pTmpDocH ) aTitle = pTmpDocH->getTitle(); frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0]; - aStateEvent.FeatureDescriptor = rtl::OUString("Update"); + aStateEvent.FeatureDescriptor = OUString("Update"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (rtl::OUString( + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + aTitle ); Control->statusChanged(aStateEvent); @@ -359,16 +359,16 @@ Interceptor::addStatusListener( pTmpDocH = m_pDocH; } - ::rtl::OUString aTitle; + OUString aTitle; if ( pTmpDocH ) aTitle = pTmpDocH->getTitle(); frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i]; - aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return"); + aStateEvent.FeatureDescriptor = OUString("Close and Return"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (rtl::OUString( + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + aTitle ); Control->statusChanged(aStateEvent); @@ -389,10 +389,10 @@ Interceptor::addStatusListener( { // SaveAs frame::FeatureStateEvent aStateEvent; aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5]; - aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo"); + aStateEvent.FeatureDescriptor = OUString("SaveCopyTo"); aStateEvent.IsEnabled = sal_True; aStateEvent.Requery = sal_False; - aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); + aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); Control->statusChanged(aStateEvent); { @@ -428,7 +428,7 @@ Interceptor::removeStatusListener( //XInterceptorInfo -uno::Sequence< ::rtl::OUString > +uno::Sequence< OUString > SAL_CALL Interceptor::getInterceptedURLs( ) throw ( @@ -438,7 +438,7 @@ Interceptor::getInterceptedURLs( ) // now implemented as update if ( m_bLink ) { - uno::Sequence< ::rtl::OUString > aResult( 2 ); + uno::Sequence< OUString > aResult( 2 ); aResult[0] = m_aInterceptedURL[1]; aResult[1] = m_aInterceptedURL[5]; @@ -454,7 +454,7 @@ Interceptor::getInterceptedURLs( ) uno::Reference< frame::XDispatch > SAL_CALL Interceptor::queryDispatch( const util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( uno::RuntimeException diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx index 1a58ad5f8b94..4f9b53f9f9e6 100644 --- a/embedserv/source/embed/register.cxx +++ b/embedserv/source/embed/register.cxx @@ -43,16 +43,16 @@ throw (uno::Exception) return xService; } -::rtl::OUString SAL_CALL EmbedServer_getImplementationName() throw() +OUString SAL_CALL EmbedServer_getImplementationName() throw() { - return ::rtl::OUString("com.sun.star.comp.ole.EmbedServer"); + return OUString("com.sun.star.comp.ole.EmbedServer"); } -uno::Sequence< ::rtl::OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw() { - uno::Sequence< ::rtl::OUString > aServiceNames( 1 ); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.document.OleEmbeddedServerRegistration" ); + uno::Sequence< OUString > aServiceNames( 1 ); + aServiceNames[0] = OUString( "com.sun.star.document.OleEmbeddedServerRegistration" ); return aServiceNames; } @@ -62,7 +62,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emser_component_getFactory( const sal_Char { void * pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); + OUString aImplName( OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if(pServiceManager && aImplName.equals( EmbedServer_getImplementationName() ) ) diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx index 3e60df87f15d..61c6ef80e236 100644 --- a/embedserv/source/inc/docholder.hxx +++ b/embedserv/source/inc/docholder.hxx @@ -92,7 +92,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::rtl::OUString m_aContainerName,m_aDocumentNamePart,m_aFilterName; + OUString m_aContainerName,m_aDocumentNamePart,m_aFilterName; CComPtr< IDispatch > m_pIDispatch; @@ -165,11 +165,11 @@ public: void resizeWin( const SIZEL& rNewSize ); - void setTitle(const rtl::OUString& aDocumentName); - rtl::OUString getTitle() const { return m_aDocumentNamePart; } + void setTitle(const OUString& aDocumentName); + OUString getTitle() const { return m_aDocumentNamePart; } - void setContainerName(const rtl::OUString& aContainerName); - rtl::OUString getContainerName() const { return m_aContainerName; } + void setContainerName(const OUString& aContainerName); + OUString getContainerName() const { return m_aContainerName; } void OnPosRectChanged(LPRECT lpRect) const; void show(); diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx index 1962c5451748..34c867c11b40 100644 --- a/embedserv/source/inc/embeddoc.hxx +++ b/embedserv/source/inc/embeddoc.hxx @@ -157,7 +157,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; DocumentHolder* m_pDocHolder; - ::rtl::OUString m_aFileName; + OUString m_aFileName; CComPtr< IStorage > m_pMasterStorage; CComPtr< IStream > m_pOwnStream; diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx index f7c71e71fb31..4ba43d1f28b4 100644 --- a/embedserv/source/inc/intercept.hxx +++ b/embedserv/source/inc/intercept.hxx @@ -99,7 +99,7 @@ public: ); //XInterceptorInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getInterceptedURLs( ) throw ( ::com::sun::star::uno::RuntimeException @@ -111,7 +111,7 @@ public: ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( ::com::sun::star::uno::RuntimeException @@ -175,7 +175,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider; - static ::com::sun::star::uno::Sequence< ::rtl::OUString > + static ::com::sun::star::uno::Sequence< OUString > m_aInterceptedURL; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index e6c97bd21aeb..24697881fc1b 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -48,7 +48,6 @@ using namespace com::sun::star::reflection; using namespace cppu; using namespace osl; -using ::rtl::OUString; #define SERVICENAME "com.sun.star.script.EventAttacher" @@ -419,7 +418,7 @@ Reference< XInvocationAdapterFactory > EventAttacherImpl::getInvocationAdapterSe Guard< Mutex > aGuard( m_aMutex ); if( !m_xInvocationAdapterFactory.is() ) { - Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString("com.sun.star.script.InvocationAdapterFactory") ) ); + Reference< XInterface > xIFace( m_xSMgr->createInstance( OUString("com.sun.star.script.InvocationAdapterFactory") ) ); m_xInvocationAdapterFactory = Reference< XInvocationAdapterFactory >( xIFace, UNO_QUERY ); } return m_xInvocationAdapterFactory; diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx index c5dc23568336..acc6b020a61c 100644 --- a/extensions/qa/update/test_update.cxx +++ b/extensions/qa/update/test_update.cxx @@ -70,7 +70,7 @@ protected: // test the getUpdateInformationEnumeration() method void testGetUpdateInformationEnumeration() { - ::rtl::OUString aInstallSetID( "TODO" ); // unused when we do not have a 'feed' + OUString aInstallSetID( "TODO" ); // unused when we do not have a 'feed' uno::Reference< container::XEnumeration > aUpdateInfoEnumeration = m_xProvider->getUpdateInformationEnumeration( m_aRepositoryList, aInstallSetID ); @@ -84,7 +84,7 @@ protected: deployment::UpdateInformationEntry aEntry; if ( aUpdateInfoEnumeration->nextElement() >>= aEntry ) { - CPPUNIT_ASSERT( aEntry.UpdateDocument->getNodeName() == rtl::OUString( "description" ) ); + CPPUNIT_ASSERT( aEntry.UpdateDocument->getNodeName() == OUString( "description" ) ); uno::Reference< dom::XNodeList> xChildNodes = aEntry.UpdateDocument->getChildNodes(); CPPUNIT_ASSERT( xChildNodes.is() ); @@ -95,8 +95,8 @@ protected: uno::Reference< dom::XElement > xChildId( xChildNodes->item( i ), uno::UNO_QUERY ); if ( xChildId.is() ) { - fprintf( stderr, "Name == %s\n", rtl::OUStringToOString( xChildId->getNodeName(), RTL_TEXTENCODING_UTF8 ).getStr() ); - fprintf( stderr, "Value == %s\n", rtl::OUStringToOString( xChildId->getNodeValue(), RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( stderr, "Name == %s\n", OUStringToOString( xChildId->getNodeName(), RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( stderr, "Value == %s\n", OUStringToOString( xChildId->getNodeValue(), RTL_TEXTENCODING_UTF8 ).getStr() ); } } #endif @@ -104,9 +104,9 @@ protected: //uno::Reference< dom::XElement > xChildId( xChildNodes->item( 0 ), uno::UNO_QUERY ); //CPPUNIT_ASSERT( xChildId.is() ); - //CPPUNIT_ASSERT( xChildId->getNodeValue() == rtl::OUString( "LibreOffice_3.4" ) ); - //fprintf( stderr, "Attribute == %s\n", rtl::OUStringToOString( aEntry.UpdateDocument->getAttribute( rtl::OUString( "test" ) ), RTL_TEXTENCODING_UTF8 ).getStr() ); - //fprintf( stderr, "Value == %s\n", rtl::OUStringToOString( xChildId->getNodeValue(), RTL_TEXTENCODING_UTF8 ).getStr() ); + //CPPUNIT_ASSERT( xChildId->getNodeValue() == OUString( "LibreOffice_3.4" ) ); + //fprintf( stderr, "Attribute == %s\n", OUStringToOString( aEntry.UpdateDocument->getAttribute( OUString( "test" ) ), RTL_TEXTENCODING_UTF8 ).getStr() ); + //fprintf( stderr, "Value == %s\n", OUStringToOString( xChildId->getNodeValue(), RTL_TEXTENCODING_UTF8 ).getStr() ); // TODO check more deeply } else @@ -120,14 +120,14 @@ protected: rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); if ( checkForUpdates( aInfo, m_xContext, aController->getInteractionHandler(), m_xProvider, - rtl::OUString( "Linux" ), - rtl::OUString( "x86" ), + OUString( "Linux" ), + OUString( "x86" ), m_aRepositoryList, - rtl::OUString( "111111-222222-333333-444444" ), - rtl::OUString( "InstallSetID" ) ) ) + OUString( "111111-222222-333333-444444" ), + OUString( "InstallSetID" ) ) ) { CPPUNIT_ASSERT( aInfo.Sources.size() == 1 ); - CPPUNIT_ASSERT( aInfo.Sources[0].URL == rtl::OUString( "http://www.libreoffice.org/download/" ) ); + CPPUNIT_ASSERT( aInfo.Sources[0].URL == OUString( "http://www.libreoffice.org/download/" ) ); } else CPPUNIT_FAIL( "Calling checkForUpdates() failed." ); @@ -140,11 +140,11 @@ protected: rtl::Reference< UpdateCheck > aController( UpdateCheck::get() ); if ( checkForUpdates( aInfo, m_xContext, aController->getInteractionHandler(), m_xProvider, - rtl::OUString( "Linux" ), - rtl::OUString( "x86" ), + OUString( "Linux" ), + OUString( "x86" ), m_aRepositoryList, - rtl::OUString( "123456-abcdef-1a2b3c-4d5e6f" ), - rtl::OUString( "InstallSetID" ) ) ) + OUString( "123456-abcdef-1a2b3c-4d5e6f" ), + OUString( "InstallSetID" ) ) ) { CPPUNIT_ASSERT( aInfo.Sources.empty() ); } @@ -160,7 +160,7 @@ protected: private: uno::Reference< deployment::XUpdateInformationProvider > m_xProvider; - uno::Sequence< rtl::OUString > m_aRepositoryList; + uno::Sequence< OUString > m_aRepositoryList; }; CPPUNIT_TEST_SUITE_REGISTRATION(testupdate::Test); diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index aa5d46d146c0..a27798dab01b 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -38,7 +38,7 @@ namespace abp const SfxFilter* lcl_getBaseFilter() { - const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); return pFilter; } @@ -69,7 +69,7 @@ namespace abp //--------------------------------------------------------------------- sal_Bool FinalPage::isValidName() const { - ::rtl::OUString sCurrentName(m_aName.GetText()); + OUString sCurrentName(m_aName.GetText()); if (sCurrentName.isEmpty()) // the name must not be empty diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx index 4459712b4741..14070045a298 100644 --- a/extensions/source/abpilot/abpservices.cxx +++ b/extensions/source/abpilot/abpservices.cxx @@ -55,7 +55,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL abp_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::abp::OModule::getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), + OUString::createFromAscii(pImplementationName), static_cast< XMultiServiceFactory* >(pServiceManager)); } diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx index 7bb6a826ee73..0af46d175dff 100644 --- a/extensions/source/abpilot/abptypes.hxx +++ b/extensions/source/abpilot/abptypes.hxx @@ -28,9 +28,9 @@ namespace abp { //......................................................................... - DECLARE_STL_STDKEY_SET( ::rtl::OUString, StringBag ); + DECLARE_STL_STDKEY_SET( OUString, StringBag ); - DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, MapString2String ); + DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String ); //......................................................................... } // namespace abp diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index e0ba2de14dbf..96f1b59f484e 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -317,7 +317,7 @@ namespace abp OSL_FAIL( "OAddessBookSourcePilot::implDefaultTableName: unhandled case!" ); return; } - const ::rtl::OUString sGuess = ::rtl::OUString::createFromAscii( pGuess ); + const OUString sGuess = OUString::createFromAscii( pGuess ); if ( rTableNames.end() != rTableNames.find( sGuess ) ) getSettings().sSelectedTable = sGuess; } diff --git a/extensions/source/abpilot/addresssettings.hxx b/extensions/source/abpilot/addresssettings.hxx index 674868785e7e..53cb58efad91 100644 --- a/extensions/source/abpilot/addresssettings.hxx +++ b/extensions/source/abpilot/addresssettings.hxx @@ -55,9 +55,9 @@ namespace abp struct AddressSettings { AddressSourceType eType; - ::rtl::OUString sDataSourceName; - ::rtl::OUString sRegisteredDataSourceName; - ::rtl::OUString sSelectedTable; + OUString sDataSourceName; + OUString sRegisteredDataSourceName; + OUString sSelectedTable; bool bIgnoreNoTable; MapString2String aFieldMapping; bool bRegisterDataSource; diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 87bf790b5a80..aac47f1197b8 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -67,8 +67,8 @@ namespace abp try { // the service name of the administration dialog - const static ::rtl::OUString s_sAdministrationServiceName = ::rtl::OUString("com.sun.star.sdb.DatasourceAdministrationDialog"); - const static ::rtl::OUString s_sDataSourceTypeChangeDialog = ::rtl::OUString("com.sun.star.sdb.DataSourceTypeChangeDialog"); + const static OUString s_sAdministrationServiceName = OUString("com.sun.star.sdb.DatasourceAdministrationDialog"); + const static OUString s_sDataSourceTypeChangeDialog = OUString("com.sun.star.sdb.DataSourceTypeChangeDialog"); // the parameters for the call Sequence< Any > aArguments(3); @@ -76,14 +76,14 @@ namespace abp // the parent window Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface(m_pMessageParent); - *pArguments++ <<= PropertyValue(::rtl::OUString("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(OUString("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); // the title of the dialog String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE)); - *pArguments++ <<= PropertyValue(::rtl::OUString("Title"), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(OUString("Title"), -1, makeAny(OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); // the name of the new data source - *pArguments++ <<= PropertyValue(::rtl::OUString("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(OUString("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); // create the dialog Reference< XExecutableDialog > xDialog; diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index d5cf04e34ebe..9c94c01858a3 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -77,7 +77,7 @@ namespace abp //--------------------------------------------------------------------- /// creates a new data source and inserts it into the context static void lcl_implCreateAndInsert( - const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rName, + const Reference< XComponentContext >& _rxContext, const OUString& _rName, Reference< XPropertySet >& /* [out] */ _rxNewDataSource ) SAL_THROW (( ::com::sun::star::uno::Exception )) { //............................................................. @@ -109,7 +109,7 @@ namespace abp //--------------------------------------------------------------------- /// creates and inserts a data source, and sets it's URL property to the string given static ODataSource lcl_implCreateAndSetURL( - const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rName, + const Reference< XComponentContext >& _rxORB, const OUString& _rName, const sal_Char* _pInitialAsciiURL ) SAL_THROW (( )) { ODataSource aReturn( _rxORB ); @@ -124,8 +124,8 @@ namespace abp if (xNewDataSource.is()) { xNewDataSource->setPropertyValue( - ::rtl::OUString( "URL" ), - makeAny( ::rtl::OUString::createFromAscii( _pInitialAsciiURL ) ) + OUString( "URL" ), + makeAny( OUString::createFromAscii( _pInitialAsciiURL ) ) ); } @@ -140,8 +140,8 @@ namespace abp } //--------------------------------------------------------------------- void lcl_registerDataSource( - const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _sName, - const ::rtl::OUString& _sURL ) SAL_THROW (( ::com::sun::star::uno::Exception )) + const Reference< XComponentContext >& _rxORB, const OUString& _sName, + const OUString& _sURL ) SAL_THROW (( ::com::sun::star::uno::Exception )) { OSL_ENSURE( !_sName.isEmpty(), "lcl_registerDataSource: invalid name!" ); OSL_ENSURE( !_sURL.isEmpty(), "lcl_registerDataSource: invalid URL!" ); @@ -193,9 +193,9 @@ namespace abp if (m_pImpl->xContext.is()) { // collect the data source names - Sequence< ::rtl::OUString > aDSNames = m_pImpl->xContext->getElementNames(); - const ::rtl::OUString* pDSNames = aDSNames.getConstArray(); - const ::rtl::OUString* pDSNamesEnd = pDSNames + aDSNames.getLength(); + Sequence< OUString > aDSNames = m_pImpl->xContext->getElementNames(); + const OUString* pDSNames = aDSNames.getConstArray(); + const OUString* pDSNamesEnd = pDSNames + aDSNames.getLength(); for ( ;pDSNames != pDSNamesEnd; ++pDSNames ) m_pImpl->aDataSourceNames.insert( *pDSNames ); @@ -212,16 +212,16 @@ namespace abp } //--------------------------------------------------------------------- - ::rtl::OUString& ODataSourceContext::disambiguate(::rtl::OUString& _rDataSourceName) + OUString& ODataSourceContext::disambiguate(OUString& _rDataSourceName) { - ::rtl::OUString sCheck( _rDataSourceName ); + OUString sCheck( _rDataSourceName ); ConstStringBagIterator aPos = m_pImpl->aDataSourceNames.find( sCheck ); sal_Int32 nPostFix = 1; while ( ( m_pImpl->aDataSourceNames.end() != aPos ) && ( nPostFix < 65535 ) ) { // there already is a data source with this name sCheck = _rDataSourceName; - sCheck += ::rtl::OUString::valueOf( nPostFix++ ); + sCheck += OUString::valueOf( nPostFix++ ); aPos = m_pImpl->aDataSourceNames.find( sCheck ); } @@ -237,65 +237,65 @@ namespace abp } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewLDAP( const ::rtl::OUString& _rName) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewLDAP( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:ldap:" ); } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewMORK( const ::rtl::OUString& _rName) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewMORK( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:mozilla" ); } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewThunderbird( const ::rtl::OUString& _rName ) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewThunderbird( const OUString& _rName ) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:thunderbird" ); } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewEvolutionLdap( const ::rtl::OUString& _rName) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewEvolutionLdap( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" ); } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewEvolutionGroupwise( const ::rtl::OUString& _rName) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewEvolutionGroupwise( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:groupwise" ); } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewEvolution( const ::rtl::OUString& _rName) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewEvolution( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" ); } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewKab( const ::rtl::OUString& _rName) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewKab( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:kab" ); } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewMacab( const ::rtl::OUString& _rName) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewMacab( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:macab" ); } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewOutlook( const ::rtl::OUString& _rName) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewOutlook( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlook" ); } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewOE( const ::rtl::OUString& _rName) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewOE( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlookexp" ); } //--------------------------------------------------------------------- - ODataSource ODataSourceContext::createNewDBase( const ::rtl::OUString& _rName) SAL_THROW (( )) + ODataSource ODataSourceContext::createNewDBase( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:dbase:" ); } @@ -311,7 +311,7 @@ namespace abp ::utl::SharedUNOComponent< XConnection > xConnection; StringBag aTables; // the cached table names - ::rtl::OUString sName; + OUString sName; sal_Bool bTablesUpToDate; // table name cache up-to-date? ODataSourceImpl( const Reference< XComponentContext >& _rxORB ) @@ -389,7 +389,7 @@ namespace abp } } //--------------------------------------------------------------------- - void ODataSource::registerDataSource( const ::rtl::OUString& _sRegisteredDataSourceName) SAL_THROW (( )) + void ODataSource::registerDataSource( const OUString& _sRegisteredDataSourceName) SAL_THROW (( )) { if (!isValid()) // nothing to do @@ -407,7 +407,7 @@ namespace abp } //--------------------------------------------------------------------- - void ODataSource::setDataSource( const Reference< XPropertySet >& _rxDS,const ::rtl::OUString& _sName, PackageAccessControl ) + void ODataSource::setDataSource( const Reference< XPropertySet >& _rxDS,const OUString& _sName, PackageAccessControl ) { if (m_pImpl->xDataSource.get() == _rxDS.get()) // nothing to do @@ -439,7 +439,7 @@ namespace abp } //--------------------------------------------------------------------- - sal_Bool ODataSource::rename( const ::rtl::OUString& _rName ) SAL_THROW (( )) + sal_Bool ODataSource::rename( const OUString& _rName ) SAL_THROW (( )) { if (!isValid()) // nothing to do @@ -450,15 +450,15 @@ namespace abp } //--------------------------------------------------------------------- - ::rtl::OUString ODataSource::getName() const SAL_THROW (( )) + OUString ODataSource::getName() const SAL_THROW (( )) { if ( !isValid() ) - return ::rtl::OUString(); + return OUString(); return m_pImpl->sName; } //--------------------------------------------------------------------- - bool ODataSource::hasTable( const ::rtl::OUString& _rTableName ) const + bool ODataSource::hasTable( const OUString& _rTableName ) const { if ( !isConnected() ) return false; @@ -487,13 +487,13 @@ namespace abp DBG_ASSERT( xTables.is(), "ODataSource::getTableNames: could not retrieve the tables container!" ); // get the names - Sequence< ::rtl::OUString > aTableNames; + Sequence< OUString > aTableNames; if ( xTables.is( ) ) aTableNames = xTables->getElementNames( ); // copy the names - const ::rtl::OUString* pTableNames = aTableNames.getConstArray(); - const ::rtl::OUString* pTableNamesEnd = pTableNames + aTableNames.getLength(); + const OUString* pTableNames = aTableNames.getConstArray(); + const OUString* pTableNamesEnd = pTableNames + aTableNames.getLength(); for (;pTableNames < pTableNamesEnd; ++pTableNames) m_pImpl->aTables.insert( *pTableNames ); } @@ -531,7 +531,7 @@ namespace abp // failure to create the interaction handler is a serious issue ... if (!xInteractions.is()) { - ::rtl::OUString s_sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); + OUString s_sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); if ( _pMessageParent ) ShowServiceNotAvailableError( _pMessageParent, s_sInteractionHandlerServiceName, sal_True ); return sal_False; diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 218baaa53697..c8efed9260a9 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -59,40 +59,40 @@ namespace abp void getDataSourceNames( StringBag& _rNames ) const SAL_THROW (( )); /// disambiguates the given name by appending auccessive numbers - ::rtl::OUString& disambiguate(::rtl::OUString& _rDataSourceName); + OUString& disambiguate(OUString& _rDataSourceName); /// creates a new MORK data source - ODataSource createNewMORK( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewMORK( const OUString& _rName ) SAL_THROW (( )); /// creates a new Thunderbird data source - ODataSource createNewThunderbird( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewThunderbird( const OUString& _rName ) SAL_THROW (( )); /// creates a new Evolution local data source - ODataSource createNewEvolution( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewEvolution( const OUString& _rName ) SAL_THROW (( )); /// creates a new Evolution LDAP data source - ODataSource createNewEvolutionLdap( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewEvolutionLdap( const OUString& _rName ) SAL_THROW (( )); /// creates a new Evolution GROUPWISE data source - ODataSource createNewEvolutionGroupwise( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewEvolutionGroupwise( const OUString& _rName ) SAL_THROW (( )); /// creates a new KDE address book data source - ODataSource createNewKab( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewKab( const OUString& _rName ) SAL_THROW (( )); /// creates a new Mac OS X address book data source - ODataSource createNewMacab( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewMacab( const OUString& _rName ) SAL_THROW (( )); /// creates a new LDAP data source - ODataSource createNewLDAP( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewLDAP( const OUString& _rName ) SAL_THROW (( )); /// creates a new Outlook data source - ODataSource createNewOutlook( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewOutlook( const OUString& _rName ) SAL_THROW (( )); /// creates a new Outlook express data source - ODataSource createNewOE( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewOE( const OUString& _rName ) SAL_THROW (( )); /// creates a new dBase data source - ODataSource createNewDBase( const ::rtl::OUString& _rName ) SAL_THROW (( )); + ODataSource createNewDBase( const OUString& _rName ) SAL_THROW (( )); }; //===================================================================== @@ -139,11 +139,11 @@ namespace abp // TODO: put this into the context class /// returns the name of the data source - ::rtl::OUString + OUString getName() const SAL_THROW (( )); /// renames the data source - sal_Bool rename( const ::rtl::OUString& _rName ) SAL_THROW (( )); + sal_Bool rename( const OUString& _rName ) SAL_THROW (( )); // TODO: put this into the context class // ---------------------------------------------------------------- @@ -167,7 +167,7 @@ namespace abp void store() SAL_THROW (( )); /// register the data source under the given name in the configuration - void registerDataSource( const ::rtl::OUString& _sRegisteredDataSourceName ) SAL_THROW (( )); + void registerDataSource( const OUString& _sRegisteredDataSourceName ) SAL_THROW (( )); // ---------------------------------------------------------------- /** retrieves the tables names from the connection @@ -177,7 +177,7 @@ namespace abp /** determines whether a given table exists */ - bool hasTable( const ::rtl::OUString& _rTableName ) const; + bool hasTable( const OUString& _rTableName ) const; /// return the intern data source object ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataSource() const SAL_THROW (( )); @@ -189,7 +189,7 @@ namespace abp */ void setDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDS - ,const ::rtl::OUString& _sName + ,const OUString& _sName ,PackageAccessControl ); diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 1bf4ac6d0b2e..455f8905536a 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -50,16 +50,16 @@ namespace abp using namespace ::com::sun::star::ui::dialogs; //--------------------------------------------------------------------- - static const ::rtl::OUString& lcl_getDriverSettingsNodeName() + static const OUString& lcl_getDriverSettingsNodeName() { - static const ::rtl::OUString s_sDriverSettingsNodeName( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" ); + static const OUString s_sDriverSettingsNodeName( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" ); return s_sDriverSettingsNodeName; } //--------------------------------------------------------------------- - static const ::rtl::OUString& lcl_getAddressBookNodeName() + static const OUString& lcl_getAddressBookNodeName() { - static const ::rtl::OUString s_sAddressBookNodeName( "/org.openoffice.Office.DataAccess/AddressBook" ); + static const OUString s_sAddressBookNodeName( "/org.openoffice.Office.DataAccess/AddressBook" ); return s_sAddressBookNodeName; } @@ -84,7 +84,7 @@ namespace abp // ........................................................ // create an instance of the dialog service Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent ); - ::rtl::OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) ); + OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) ); Reference< XExecutableDialog > xDialog = AddressBookSourceDialog::createWithDataSource(_rxORB, // the parent window xDialogParent, @@ -104,7 +104,7 @@ namespace abp #ifdef DBG_UTIL sal_Bool bSuccess = #endif - xDialogProps->getPropertyValue( ::rtl::OUString( "FieldMapping" ) ) >>= aMapping; + xDialogProps->getPropertyValue( OUString( "FieldMapping" ) ) >>= aMapping; DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" ); // and copy it into the map @@ -169,8 +169,8 @@ namespace abp // access the configuration information which the driver uses for determining it's column names - ::rtl::OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName(); - sDriverAliasesNodeName += ::rtl::OUString( "/ColumnAliases" ); + OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName(); + sDriverAliasesNodeName += OUString( "/ColumnAliases" ); // create a config node for this OConfigurationTreeRoot aDriverFieldAliasing = OConfigurationTreeRoot::createWithComponentContext( @@ -183,16 +183,16 @@ namespace abp sal_Int32 nIntersectedProgrammatics = SAL_N_ELEMENTS( pMappingProgrammatics ) / 2; const sal_Char** pProgrammatic = pMappingProgrammatics; - ::rtl::OUString sAddressProgrammatic; - ::rtl::OUString sDriverProgrammatic; - ::rtl::OUString sDriverUI; + OUString sAddressProgrammatic; + OUString sDriverProgrammatic; + OUString sDriverUI; for ( sal_Int32 i=0; i < nIntersectedProgrammatics; ++i ) { - sAddressProgrammatic = ::rtl::OUString::createFromAscii( *pProgrammatic++ ); - sDriverProgrammatic = ::rtl::OUString::createFromAscii( *pProgrammatic++ ); + sAddressProgrammatic = OUString::createFromAscii( *pProgrammatic++ ); + sDriverProgrammatic = OUString::createFromAscii( *pProgrammatic++ ); if ( aDriverFieldAliasing.hasByName( sDriverProgrammatic ) ) { @@ -224,26 +224,26 @@ namespace abp MapString2String aFieldAssignment( _rFieldAssignment ); // access the configuration information which the driver uses for determining it's column names - const ::rtl::OUString& sAddressBookNodeName = lcl_getAddressBookNodeName(); + const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName(); // create a config node for this OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext( _rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); - OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString( "Fields" ) ); + OConfigurationNode aFields = aAddressBookSettings.openNode( OUString( "Fields" ) ); // loop through all existent fields - Sequence< ::rtl::OUString > aExistentFields = aFields.getNodeNames(); - const ::rtl::OUString* pExistentFields = aExistentFields.getConstArray(); - const ::rtl::OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength(); + Sequence< OUString > aExistentFields = aFields.getNodeNames(); + const OUString* pExistentFields = aExistentFields.getConstArray(); + const OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength(); - const ::rtl::OUString sProgrammaticNodeName( "ProgrammaticFieldName" ); - const ::rtl::OUString sAssignedNodeName( "AssignedFieldName" ); + const OUString sProgrammaticNodeName( "ProgrammaticFieldName" ); + const OUString sAssignedNodeName( "AssignedFieldName" ); for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields ) { #ifdef DBG_UTIL - ::rtl::OUString sRedundantProgrammaticName; + OUString sRedundantProgrammaticName; aFields.openNode( *pExistentFields ).getNodeValue( sProgrammaticNodeName ) >>= sRedundantProgrammaticName; #endif DBG_ASSERT( sRedundantProgrammaticName == *pExistentFields, @@ -298,18 +298,18 @@ namespace abp //----------------------------------------------------------------- void writeTemplateAddressSource( const Reference< XComponentContext >& _rxContext, - const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rTableName ) SAL_THROW ( ( ) ) + const OUString& _rDataSourceName, const OUString& _rTableName ) SAL_THROW ( ( ) ) { // access the configuration information which the driver uses for determining it's column names - const ::rtl::OUString& sAddressBookNodeName = lcl_getAddressBookNodeName(); + const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName(); // create a config node for this OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext( _rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); - aAddressBookSettings.setNodeValue( ::rtl::OUString( "DataSourceName" ), makeAny( _rDataSourceName ) ); - aAddressBookSettings.setNodeValue( ::rtl::OUString( "Command" ), makeAny( _rTableName ) ); - aAddressBookSettings.setNodeValue( ::rtl::OUString( "CommandType" ), makeAny( (sal_Int32)CommandType::TABLE ) ); + aAddressBookSettings.setNodeValue( OUString( "DataSourceName" ), makeAny( _rDataSourceName ) ); + aAddressBookSettings.setNodeValue( OUString( "Command" ), makeAny( _rTableName ) ); + aAddressBookSettings.setNodeValue( OUString( "CommandType" ), makeAny( (sal_Int32)CommandType::TABLE ) ); // commit the changes done aAddressBookSettings.commit(); @@ -319,14 +319,14 @@ namespace abp void markPilotSuccess( const Reference< XComponentContext >& _rxContext ) SAL_THROW ( ( ) ) { // access the configuration information which the driver uses for determining it's column names - const ::rtl::OUString& sAddressBookNodeName = lcl_getAddressBookNodeName(); + const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName(); // create a config node for this OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext( _rxContext, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); // set the flag - aAddressBookSettings.setNodeValue( ::rtl::OUString( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) ); + aAddressBookSettings.setNodeValue( OUString( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) ); // commit the changes done aAddressBookSettings.commit(); diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx index c0b3673123b4..1793a99a17b8 100644 --- a/extensions/source/abpilot/fieldmappingimpl.hxx +++ b/extensions/source/abpilot/fieldmappingimpl.hxx @@ -99,8 +99,8 @@ namespace abp */ void writeTemplateAddressSource( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rTableName + const OUString& _rDataSourceName, + const OUString& _rTableName ) SAL_THROW ( ( ) ); /** writes the configuration entry which states the pilot has been completed successfully diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index caa2638f3500..00fba8317f41 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -100,7 +100,7 @@ namespace abp try { // check whether Evolution is available - Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:evolution:local")) ); + Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:evolution:local")) ); if ( xDriver.is() ) bHaveEvolution = true; } @@ -111,7 +111,7 @@ namespace abp // check whether KDE address book is available try { - Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:kab")) ); + Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:kab")) ); if ( xDriver.is() ) bHaveKab = true; } @@ -122,7 +122,7 @@ namespace abp try { // check whether Mac OS X address book is available - Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString("sdbc:address:macab")) ); + Reference< XDriver > xDriver( xManager->getDriverByURL(OUString("sdbc:address:macab")) ); if ( xDriver.is() ) bHaveMacab = true; } diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index e3b24715c7e9..faa79d095305 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -48,7 +48,7 @@ namespace abp OABSPilotUno::OABSPilotUno(const Reference< XComponentContext >& _rxORB) :OGenericUnoDialog(_rxORB) { - registerProperty( ::rtl::OUString("DataSourceName"), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY , + registerProperty( OUString("DataSourceName"), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY , &m_sDataSourceName, ::getCppuType( &m_sDataSourceName ) ); } @@ -103,15 +103,15 @@ namespace abp } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OABSPilotUno::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OABSPilotUno::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //--------------------------------------------------------------------- - ::rtl::OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException) + OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.abp.OAddressBookSourcePilot"); + return OUString("org.openoffice.comp.abp.OAddressBookSourcePilot"); } //--------------------------------------------------------------------- @@ -124,7 +124,7 @@ namespace abp ::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"); + aSupported.getArray()[0] = OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"); return aSupported; } @@ -154,7 +154,7 @@ namespace abp Reference xParentWindow; if (aArguments.getLength() == 1 && (aArguments[0] >>= xParentWindow) ) { Sequence< Any > aNewArgs(1); - aNewArgs[0] <<= PropertyValue( ::rtl::OUString("ParentWindow"), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE ); + aNewArgs[0] <<= PropertyValue( OUString("ParentWindow"), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE ); OGenericUnoDialog::initialize(aNewArgs); } else { OGenericUnoDialog::initialize(aArguments); @@ -180,7 +180,7 @@ namespace abp // (or he can start it again by using wizard-menu!) // So we should deregister it on our general job execution service by using right protocol parameters. ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1); - lProtocol[0].Name = ::rtl::OUString("Deactivate"); + lProtocol[0].Name = OUString("Deactivate"); lProtocol[0].Value <<= sal_True; return makeAny( lProtocol ); } diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx index eeccb16ef1e3..0261060b8fa0 100644 --- a/extensions/source/abpilot/unodialogabp.hxx +++ b/extensions/source/abpilot/unodialogabp.hxx @@ -45,7 +45,7 @@ namespace abp ,public OABSPilotUno_JBase ,public OABSPilotUno_PBase { - ::rtl::OUString m_sDataSourceName; + OUString m_sDataSourceName; OABSPilotUno(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); public: @@ -59,12 +59,12 @@ namespace abp virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index b129ea16c764..05c78c394ed2 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define ID_TOOLBAR 1 #define ID_GRIDWIN 2 @@ -145,7 +144,7 @@ namespace bib if ( xPropSet.is() && m_xGridModel.is() ) { uno::Any aAny = xPropSet->getPropertyValue( "DefaultControl" ); - rtl::OUString aControlName; + OUString aControlName; aAny >>= aControlName; m_xControl = Reference< awt::XControl > ( xContext->getServiceManager()->createInstanceWithContext(aControlName, xContext), UNO_QUERY_THROW ); diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index e8ff2f2f7a2d..ada5cc721c89 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdb; -using ::rtl::OUString; const char cDataSourceHistory[] = "DataSourceHistory"; @@ -214,7 +213,7 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc) SetModified(); }; //--------------------------------------------------------------------------- -void BibConfig::Notify( const com::sun::star::uno::Sequence& ) +void BibConfig::Notify( const com::sun::star::uno::Sequence& ) { } diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index fea6b7ed72de..fb17abdcf3a0 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -63,14 +63,14 @@ typedef boost::ptr_vector MappingArray; //----------------------------------------------------------------------------- struct StringPair { - rtl::OUString sRealColumnName; - rtl::OUString sLogicalColumnName; + OUString sRealColumnName; + OUString sLogicalColumnName; }; //----------------------------------------------------------------------------- struct Mapping { - rtl::OUString sTableName; - rtl::OUString sURL; + OUString sTableName; + OUString sURL; sal_Int16 nCommandType; StringPair aColumnPairs[COLUMN_COUNT]; @@ -80,34 +80,34 @@ struct Mapping //----------------------------------------------------------------------------- struct BibDBDescriptor { - rtl::OUString sDataSource; - rtl::OUString sTableOrQuery; + OUString sDataSource; + OUString sTableOrQuery; sal_Int32 nCommandType; }; //----------------------------------------------------------------------------- class BibConfig : public utl::ConfigItem { - rtl::OUString sDataSource; - rtl::OUString sTableOrQuery; + OUString sDataSource; + OUString sTableOrQuery; sal_Int32 nTblOrQuery; - rtl::OUString sQueryField; - rtl::OUString sQueryText; + OUString sQueryField; + OUString sQueryText; MappingArray* pMappingsArr; long nBeamerSize; long nViewSize; sal_Bool bShowColumnAssignmentWarning; - rtl::OUString aColumnDefaults[COLUMN_COUNT]; + OUString aColumnDefaults[COLUMN_COUNT]; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: BibConfig(); ~BibConfig(); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); BibDBDescriptor GetBibliographyURL(); void SetBibliographyURL(const BibDBDescriptor& rDesc); @@ -115,7 +115,7 @@ public: const Mapping* GetMapping(const BibDBDescriptor& rDesc) const; void SetMapping(const BibDBDescriptor& rDesc, const Mapping* pMapping); - const rtl::OUString& GetDefColumnName(sal_uInt16 nIndex) const + const OUString& GetDefColumnName(sal_uInt16 nIndex) const {return aColumnDefaults[nIndex];} @@ -124,11 +124,11 @@ public: void setViewSize(long nSize) {SetModified(); nViewSize = nSize;} long getViewSize() {return nViewSize;} - const rtl::OUString& getQueryField() const {return sQueryField;} - void setQueryField(const rtl::OUString& rSet) {SetModified(); sQueryField = rSet;} + const OUString& getQueryField() const {return sQueryField;} + void setQueryField(const OUString& rSet) {SetModified(); sQueryField = rSet;} - const rtl::OUString& getQueryText() const {return sQueryText;} - void setQueryText(const rtl::OUString& rSet) {SetModified(); sQueryText = rSet;} + const OUString& getQueryText() const {return sQueryText;} + void setQueryText(const OUString& rSet) {SetModified(); sQueryText = rSet;} sal_Bool IsShowColumnAssignmentWarning() const { return bShowColumnAssignmentWarning;} @@ -138,12 +138,12 @@ public: class DBChangeDialogConfig_Impl { - com::sun::star::uno::Sequence aSourceNames; + com::sun::star::uno::Sequence aSourceNames; public: DBChangeDialogConfig_Impl(); ~DBChangeDialogConfig_Impl(); - const com::sun::star::uno::Sequence& GetDataSourceNames(); + const com::sun::star::uno::Sequence& GetDataSourceNames(); }; #endif diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 4330a1877923..ed7627e2bdf7 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -83,7 +83,7 @@ class BibliographyLoader : public cppu::WeakImplHelper4 private: - void loadView(const Reference< XFrame > & aFrame, const rtl::OUString& aURL, + void loadView(const Reference< XFrame > & aFrame, const OUString& aURL, const Sequence< PropertyValue >& aArgs, const Reference< XLoadEventListener > & aListener); @@ -97,10 +97,10 @@ public: ~BibliographyLoader(); // XServiceInfo - rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ); - Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); - static rtl::OUString getImplementationName_Static() throw( ) + OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ); + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + static OUString getImplementationName_Static() throw( ) { //! @@ -109,9 +109,9 @@ public: } //XNameAccess - virtual Any SAL_CALL getByName(const rtl::OUString& aName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException ); - virtual Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw ( RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& aName) throw ( RuntimeException ); + virtual Any SAL_CALL getByName(const OUString& aName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException ); + virtual Sequence< OUString > SAL_CALL getElementNames(void) throw ( RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw ( RuntimeException ); //XElementAccess virtual Type SAL_CALL getElementType(void) throw ( RuntimeException ); @@ -119,19 +119,19 @@ public: //XPropertySet virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw ( RuntimeException ); - virtual void SAL_CALL setPropertyValue(const rtl::OUString& PropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ); - virtual Any SAL_CALL getPropertyValue(const rtl::OUString& PropertyName) throw ( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ); + virtual Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw ( UnknownPropertyException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - static Sequence SAL_CALL getSupportedServiceNames_Static(void) throw( ); + static Sequence SAL_CALL getSupportedServiceNames_Static(void) throw( ); friend Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ); // XLoader - virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const rtl::OUString& aURL, + virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL, const Sequence< PropertyValue >& aArgs, const Reference< XLoadEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancel(void) throw (::com::sun::star::uno::RuntimeException); @@ -160,17 +160,17 @@ Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Refer // XServiceInfo -rtl::OUString BibliographyLoader::getImplementationName() throw( ) +OUString BibliographyLoader::getImplementationName() throw( ) { return getImplementationName_Static(); } // XServiceInfo -sal_Bool BibliographyLoader::supportsService(const rtl::OUString& ServiceName) throw( ) +sal_Bool BibliographyLoader::supportsService(const OUString& ServiceName) throw( ) { - Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString * pArray = aSNL.getConstArray(); + Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -178,15 +178,15 @@ sal_Bool BibliographyLoader::supportsService(const rtl::OUString& ServiceName) t } // XServiceInfo -Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames(void) throw( ) +Sequence< OUString > BibliographyLoader::getSupportedServiceNames(void) throw( ) { return getSupportedServiceNames_Static(); } // ORegistryServiceManager_Static -Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw( ) +Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw( ) { - Sequence< rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = "com.sun.star.frame.FrameLoader"; //! aSNS.getArray()[1] = "com.sun.star.frame.Bibliography"; @@ -224,7 +224,7 @@ void BibliographyLoader::cancel(void) throw (::com::sun::star::uno::RuntimeExcep //! } -void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUString& rURL, +void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString& rURL, const Sequence< PropertyValue >& rArgs, const Reference< XLoadEventListener > & rListener) throw (::com::sun::star::uno::RuntimeException) { @@ -249,7 +249,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUS } // ----------------------------------------------------------------------- -void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl::OUString& /*rURL*/, +void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUString& /*rURL*/, const Sequence< PropertyValue >& /*rArgs*/, const Reference< XLoadEventListener > & rListener) { @@ -400,7 +400,7 @@ Reference< sdb::XColumn > BibliographyLoader::GetIdentifierColumn() const { BibDataManager* pDatMan = GetDataManager(); Reference< XNameAccess > xColumns = GetDataColumns(); - rtl::OUString sIdentifierColumnName = pDatMan->GetIdentifierMapping(); + OUString sIdentifierColumnName = pDatMan->GetIdentifierMapping(); Reference< sdb::XColumn > xReturn; if (xColumns.is() && xColumns->hasByName(sIdentifierColumnName)) @@ -420,7 +420,7 @@ Reference< XResultSet > BibliographyLoader::GetDataCursor() const return m_xCursor; } -static rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns, +static OUString lcl_AddProperty(Reference< XNameAccess > xColumns, const Mapping* pMapping, const String& rColumnName) { String sColumnName(rColumnName); @@ -435,8 +435,8 @@ static rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns, } } } - rtl::OUString uColumnName(sColumnName); - rtl::OUString uRet; + OUString uColumnName(sColumnName); + OUString uRet; Reference< sdb::XColumn > xCol; if (xColumns->hasByName(uColumnName)) xCol = Reference< sdb::XColumn > (*(Reference< XInterface > *)xColumns->getByName(uColumnName).getValue(), UNO_QUERY); @@ -445,7 +445,7 @@ static rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns, return uRet; } //----------------------------------------------------------------------------- -Any BibliographyLoader::getByName(const rtl::OUString& rName) throw +Any BibliographyLoader::getByName(const OUString& rName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException ) { Any aRet; @@ -463,7 +463,7 @@ Any BibliographyLoader::getByName(const rtl::OUString& rName) throw return aRet; String sIdentifierMapping = pDatMan->GetIdentifierMapping(); - rtl::OUString sId = sIdentifierMapping; + OUString sId = sIdentifierMapping; Reference< sdb::XColumn > xColumn; if (xColumns->hasByName(sId)) xColumn = Reference< sdb::XColumn > (*(Reference< XInterface > *)xColumns->getByName(sId).getValue(), UNO_QUERY); @@ -500,9 +500,9 @@ Any BibliographyLoader::getByName(const rtl::OUString& rName) throw return aRet; } -Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException ) +Sequence< OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException ) { - Sequence< rtl::OUString > aRet(10); + Sequence< OUString > aRet(10); int nRealNameCount = 0; try { @@ -512,13 +512,13 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt { do { - rtl::OUString sTemp = xIdColumn->getString(); + OUString sTemp = xIdColumn->getString(); if (!sTemp.isEmpty() && !xIdColumn->wasNull()) { int nLen = aRet.getLength(); if(nLen == nRealNameCount) aRet.realloc(nLen + 10); - rtl::OUString* pArray = aRet.getArray(); + OUString* pArray = aRet.getArray(); pArray[nRealNameCount] = sTemp; nRealNameCount++; } @@ -535,7 +535,7 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt return aRet; } -sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( RuntimeException ) +sal_Bool BibliographyLoader::hasByName(const OUString& rName) throw ( RuntimeException ) { sal_Bool bRet = sal_False; try @@ -547,7 +547,7 @@ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( Runti { do { - rtl::OUString sCurrentId = xIdColumn->getString(); + OUString sCurrentId = xIdColumn->getString(); if (!xIdColumn->wasNull() && rName.startsWith(sCurrentId)) { bRet = sal_True; @@ -589,7 +589,7 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) thro return xRet; } -void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/, +void BibliographyLoader::setPropertyValue(const OUString& /*PropertyName*/, const Any& /*aValue*/) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) @@ -598,7 +598,7 @@ void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/, //no changeable properties } -Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) +Any BibliographyLoader::getPropertyValue(const OUString& rPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { Any aRet; @@ -654,28 +654,28 @@ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) } void BibliographyLoader::addPropertyChangeListener( - const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) + const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no bound properties } void BibliographyLoader::removePropertyChangeListener( - const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) + const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no bound properties } void BibliographyLoader::addVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) + const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no vetoable properties } void BibliographyLoader::removeVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) + const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no vetoable properties diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 74ad9b42bf18..d642e2620f42 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -89,7 +89,7 @@ BibConfig* BibModul::GetConfig() // PropertyNames -#define STATIC_USTRING(a,b) rtl::OUString a(b) +#define STATIC_USTRING(a,b) OUString a(b) STATIC_USTRING(FM_PROP_LABEL,"Label"); STATIC_USTRING(FM_PROP_CONTROLSOURCE,"DataField"); STATIC_USTRING(FM_PROP_NAME,"Name"); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 9891fe077fff..b22a7d12ab33 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -81,7 +81,7 @@ using namespace ::com::sun::star::form; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; -Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) +Reference< XConnection > getConnection(const OUString& _rURL) { // first get the sdb::DataSource corresponding to the url Reference< XDataSource > xDataSource; @@ -166,7 +166,7 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) { DBG_ASSERT((*(sal_Int32*)xFormProps->getPropertyValue("CommandType").getValue()) == CommandType::TABLE, "::getColumns : invalid form (has no table as data source) !"); - ::rtl::OUString sTable; + OUString sTable; xFormProps->getPropertyValue("Command") >>= sTable; Reference< XNameAccess > xTables = xSupplyTables->getTables(); if (xTables.is() && xTables->hasByName(sTable)) @@ -178,10 +178,10 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) catch (const Exception& e) { #ifdef DBG_UTIL - String sMsg(rtl::OUString("::getColumns : catched an exception (")); + String sMsg(OUString("::getColumns : catched an exception (")); sMsg += String(e.Message); sMsg.AppendAscii(") ..."); - OSL_FAIL(rtl::OUStringToOString(sMsg, RTL_TEXTENCODING_ASCII_US ).getStr()); + OSL_FAIL(OUStringToOString(sMsg, RTL_TEXTENCODING_ASCII_US ).getStr()); #else (void)e; #endif @@ -280,7 +280,7 @@ public: }; static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , - const ::rtl::OUString& rLogicalColumnName) + const OUString& rLogicalColumnName) { for(sal_uInt16 i = 0; i < COLUMN_COUNT; i++) { @@ -400,7 +400,7 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : aOKBT.SetClickHdl(LINK(this, MappingDialog_Impl, OkHdl)); String sTitle = GetText(); - sTitle.SearchAndReplace(rtl::OUString("%1"), pDatMan->getActiveDataTable(), 0); + sTitle.SearchAndReplace(OUString("%1"), pDatMan->getActiveDataTable(), 0); SetText(sTitle); aListBoxes[0] = &aIdentifierLB; @@ -440,9 +440,9 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : DBG_ASSERT(xFields.is(), "MappingDialog_Impl::MappingDialog_Impl : gave me an invalid form !"); if(xFields.is()) { - Sequence< ::rtl::OUString > aNames = xFields->getElementNames(); + Sequence< OUString > aNames = xFields->getElementNames(); sal_Int32 nFieldsCount = aNames.getLength(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + const OUString* pNames = aNames.getConstArray(); for(sal_Int32 nField = 0; nField < nFieldsCount; nField++) aListBoxes[0]->InsertEntry(pNames[nField]); @@ -579,9 +579,9 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_CLIPCHILDREN|WB_SORT); aSelectionLB.GetModel()->SetSortMode(SortAscending); - ::rtl::OUString sActiveSource = pDatMan->getActiveDataSource(); - const Sequence< ::rtl::OUString >& rSources = aConfig.GetDataSourceNames(); - const ::rtl::OUString* pSourceNames = rSources.getConstArray(); + OUString sActiveSource = pDatMan->getActiveDataSource(); + const Sequence< OUString >& rSources = aConfig.GetDataSourceNames(); + const OUString* pSourceNames = rSources.getConstArray(); for(int i = 0; i < rSources.getLength(); i++) { SvTreeListEntry* pEntry = aSelectionLB.InsertEntry(pSourceNames[i]); @@ -644,7 +644,7 @@ void BibInterceptorHelper::ReleaseInterceptor() } ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL - BibInterceptorHelper::queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException) + BibInterceptorHelper::queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException) { Reference< XDispatch > xReturn; @@ -696,11 +696,11 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun: //----------------------------------------------------------------------------- #define STR_UID "uid" -::rtl::OUString gGridName("theGrid"); -::rtl::OUString gViewName("theView"); -::rtl::OUString gGlobalName("theGlobals"); -::rtl::OUString gBeamerSize("theBeamerSize"); -::rtl::OUString gViewSize("theViewSize"); +OUString gGridName("theGrid"); +OUString gViewName("theView"); +OUString gGlobalName("theGlobals"); +OUString gBeamerSize("theBeamerSize"); +OUString gViewSize("theViewSize"); BibDataManager::BibDataManager() :BibDataManager_Base( GetMutex() ) @@ -749,9 +749,9 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) // remove the old fields if ( xColContainer->hasElements() ) { - Sequence< ::rtl::OUString > aNames = xColContainer->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pNamesEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames = xColContainer->getElementNames(); + const OUString* pNames = aNames.getConstArray(); + const OUString* pNamesEnd = pNames + aNames.getLength(); for ( ; pNames != pNamesEnd; ++pNames ) xColContainer->removeByName( *pNames ); } @@ -764,16 +764,16 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) Reference< XPropertySet > xField; - Sequence< ::rtl::OUString > aFields( xFields->getElementNames() ); - const ::rtl::OUString* pFields = aFields.getConstArray(); - const ::rtl::OUString* pFieldsEnd = pFields + aFields.getLength(); + Sequence< OUString > aFields( xFields->getElementNames() ); + const OUString* pFields = aFields.getConstArray(); + const OUString* pFieldsEnd = pFields + aFields.getLength(); for ( ; pFields != pFieldsEnd; ++pFields ) { xFields->getByName( *pFields ) >>= xField; - ::rtl::OUString sCurrentModelType; - const ::rtl::OUString sType("Type"); + OUString sCurrentModelType; + const OUString sType("Type"); sal_Int32 nType = 0; sal_Bool bIsFormatted = sal_False; sal_Bool bFormattedIsNumeric = sal_True; @@ -807,7 +807,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) Reference< XPropertySet > xCurrentCol = xColFactory->createColumn(sCurrentModelType); if (bIsFormatted) { - ::rtl::OUString sFormatKey("FormatKey"); + OUString sFormatKey("FormatKey"); xCurrentCol->setPropertyValue(sFormatKey, xField->getPropertyValue(sFormatKey)); Any aFormatted(&bFormattedIsNumeric, ::getBooleanCppuType()); xCurrentCol->setPropertyValue("TreatAsNumber", aFormatted); @@ -835,7 +835,7 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< try { Reference< XPropertySet > aFormPropSet( xDbForm, UNO_QUERY ); - ::rtl::OUString sName; + OUString sName; aFormPropSet->getPropertyValue("Command") >>= sName; if ( !m_xGridModel.is() ) @@ -889,13 +889,13 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) Reference< XNameAccess > xTables = xSupplyTables.is() ? xSupplyTables->getTables() : Reference< XNameAccess > (); - Sequence< ::rtl::OUString > aTableNameSeq; + Sequence< OUString > aTableNameSeq; if (xTables.is()) aTableNameSeq = xTables->getElementNames(); if(aTableNameSeq.getLength() > 0) { - const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray(); + const OUString* pTableNames = aTableNameSeq.getConstArray(); if(!rDesc.sTableOrQuery.isEmpty()) aActiveDataTable = rDesc.sTableOrQuery; else @@ -915,11 +915,11 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); if ( xFactory.is() ) - m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); - ::rtl::OUString aString("SELECT * FROM "); + OUString aString("SELECT * FROM "); - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; ::dbtools::qualifiedNameComponents( xMetaData, aActiveDataTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); aString += ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sName ); @@ -940,9 +940,9 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) return xResult; } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > BibDataManager::getDataSources() +Sequence< OUString > BibDataManager::getDataSources() { - Sequence< ::rtl::OUString > aTableNameSeq; + Sequence< OUString > aTableNameSeq; try { @@ -961,19 +961,19 @@ Sequence< ::rtl::OUString > BibDataManager::getDataSources() return aTableNameSeq; } //------------------------------------------------------------------------ -::rtl::OUString BibDataManager::getActiveDataTable() +OUString BibDataManager::getActiveDataTable() { return aActiveDataTable; } //------------------------------------------------------------------------ -void BibDataManager::setFilter(const ::rtl::OUString& rQuery) +void BibDataManager::setFilter(const OUString& rQuery) { if(!m_xParser.is()) return; try { m_xParser->setFilter( rQuery ); - ::rtl::OUString aQuery = m_xParser->getFilter(); + OUString aQuery = m_xParser->getFilter(); Reference< XPropertySet > xFormProps( m_xForm, UNO_QUERY_THROW ); xFormProps->setPropertyValue( "Filter", makeAny( aQuery ) ); xFormProps->setPropertyValue( "ApplyFilter", makeAny( sal_True ) ); @@ -987,10 +987,10 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery) } //------------------------------------------------------------------------ -::rtl::OUString BibDataManager::getFilter() +OUString BibDataManager::getFilter() { - ::rtl::OUString aQueryString; + OUString aQueryString; try { Reference< XPropertySet > xFormProps( m_xForm, UNO_QUERY_THROW ); @@ -1006,23 +1006,23 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery) } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > BibDataManager::getQueryFields() +Sequence< OUString > BibDataManager::getQueryFields() { - Sequence< ::rtl::OUString > aFieldSeq; + Sequence< OUString > aFieldSeq; Reference< XNameAccess > xFields = getColumns( m_xForm ); if (xFields.is()) aFieldSeq = xFields->getElementNames(); return aFieldSeq; } //------------------------------------------------------------------------ -::rtl::OUString BibDataManager::getQueryField() +OUString BibDataManager::getQueryField() { BibConfig* pConfig = BibModul::GetConfig(); - ::rtl::OUString aFieldString = pConfig->getQueryField(); + OUString aFieldString = pConfig->getQueryField(); if(aFieldString.isEmpty()) { - Sequence< ::rtl::OUString > aSeq = getQueryFields(); - const ::rtl::OUString* pFields = aSeq.getConstArray(); + Sequence< OUString > aSeq = getQueryFields(); + const OUString* pFields = aSeq.getConstArray(); if(aSeq.getLength()>0) { aFieldString=pFields[0]; @@ -1031,12 +1031,12 @@ Sequence< ::rtl::OUString > BibDataManager::getQueryFields() return aFieldString; } //------------------------------------------------------------------------ -void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery) +void BibDataManager::startQueryWith(const OUString& rQuery) { BibConfig* pConfig = BibModul::GetConfig(); pConfig->setQueryText( rQuery ); - ::rtl::OUString aQueryString; + OUString aQueryString; if(!rQuery.isEmpty()) { aQueryString=aQuoteChar; @@ -1052,9 +1052,9 @@ void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery) setFilter(aQueryString); } -void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) +void BibDataManager::setActiveDataSource(const OUString& rURL) { - ::rtl::OUString sTmp(aDataSourceURL); + OUString sTmp(aDataSourceURL); aDataSourceURL = rURL; Reference< XPropertySet > aPropertySet( m_xForm, UNO_QUERY ); @@ -1075,12 +1075,12 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) aPropertySet->setPropertyValue("ActiveConnection", aVal); Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); if ( xFactory.is() ) - m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); if(xOldConnection.is()) xOldConnection->dispose(); - Sequence< ::rtl::OUString > aTableNameSeq; + Sequence< OUString > aTableNameSeq; Reference< XTablesSupplier > xSupplyTables(xConnection, UNO_QUERY); if(xSupplyTables.is()) { @@ -1089,7 +1089,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) } if(aTableNameSeq.getLength() > 0) { - const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray(); + const OUString* pTableNames = aTableNameSeq.getConstArray(); aActiveDataTable = pTableNames[0]; aVal <<= aActiveDataTable; aPropertySet->setPropertyValue("Command", aVal); @@ -1097,12 +1097,12 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) //Caching for Performance aVal <<= (sal_Int32)50; aPropertySet->setPropertyValue("FetchSize", aVal); - ::rtl::OUString aString("SELECT * FROM "); + OUString aString("SELECT * FROM "); // quote the table name which may contain catalog.schema.table Reference xMetaData(xConnection->getMetaData(),UNO_QUERY); aQuoteChar = xMetaData->getIdentifierQuoteString(); - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; ::dbtools::qualifiedNameComponents( xMetaData, aActiveDataTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); aString += ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sName ); @@ -1133,7 +1133,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) } -void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) +void BibDataManager::setActiveDataTable(const OUString& rTable) { ResetIdentifierMapping(); try @@ -1145,11 +1145,11 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) Reference< XConnection > xConnection = getConnection( m_xForm ); Reference< XTablesSupplier > xSupplyTables(xConnection, UNO_QUERY); Reference< XNameAccess > xAccess = xSupplyTables->getTables(); - Sequence< ::rtl::OUString > aTableNameSeq = xAccess->getElementNames(); + Sequence< OUString > aTableNameSeq = xAccess->getElementNames(); sal_uInt32 nCount = aTableNameSeq.getLength(); - const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray(); - const ::rtl::OUString* pTableNamesEnd = pTableNames + nCount; + const OUString* pTableNames = aTableNameSeq.getConstArray(); + const OUString* pTableNamesEnd = pTableNames + nCount; for ( ; pTableNames != pTableNamesEnd; ++pTableNames ) { @@ -1168,11 +1168,11 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); if ( xFactory.is() ) - m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); - ::rtl::OUString aString("SELECT * FROM "); + OUString aString("SELECT * FROM "); - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; ::dbtools::qualifiedNameComponents( xMetaData, aActiveDataTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); aString += ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sName ); @@ -1291,7 +1291,7 @@ void SAL_CALL BibDataManager::removeLoadListener( const Reference< XLoadListener } //------------------------------------------------------------------------ -Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUString& rName) +Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString& rName) { Reference< awt::XControlModel > xModel; @@ -1307,17 +1307,17 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS xPropSet->setPropertyValue( "Name", makeAny( rName ) ); // set the name of the to-be-created control - ::rtl::OUString aControlName("com.sun.star.form.control.InteractionGridControl"); + OUString aControlName("com.sun.star.form.control.InteractionGridControl"); Any aAny; aAny <<= aControlName; xPropSet->setPropertyValue( "DefaultControl",aAny ); // the helpURL - ::rtl::OUString uProp("HelpURL"); + OUString uProp("HelpURL"); Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); if (xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME )); - sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); + OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME )); + sId += OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } } @@ -1329,9 +1329,9 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS return xModel; } //------------------------------------------------------------------------ -::rtl::OUString BibDataManager::getControlName(sal_Int32 nFormatKey ) +OUString BibDataManager::getControlName(sal_Int32 nFormatKey ) { - ::rtl::OUString aResStr; + OUString aResStr; switch (nFormatKey) { case DataType::BIT: @@ -1369,10 +1369,10 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS } //------------------------------------------------------------------------ Reference< awt::XControlModel > BibDataManager::loadControlModel( - const ::rtl::OUString& rName, sal_Bool bForceListBox) + const OUString& rName, sal_Bool bForceListBox) { Reference< awt::XControlModel > xModel; - ::rtl::OUString aName("View_"); + OUString aName("View_"); aName += rName; try @@ -1390,11 +1390,11 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( aElement >>= xField; Reference< XPropertySetInfo > xInfo = xField.is() ? xField->getPropertySetInfo() : Reference< XPropertySetInfo > (); - const ::rtl::OUString sType("Type"); + const OUString sType("Type"); sal_Int32 nFormatKey = 0; xField->getPropertyValue(sType) >>= nFormatKey; - ::rtl::OUString aInstanceName("com.sun.star.form.component."); + OUString aInstanceName("com.sun.star.form.component."); if (bForceListBox) aInstanceName += "ListBox"; @@ -1409,7 +1409,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( xPropSet->setPropertyValue( FM_PROP_NAME,aFieldName); xPropSet->setPropertyValue( FM_PROP_CONTROLSOURCE, makeAny( rName ) ); - xPropSet->setPropertyValue( ::rtl::OUString( "NativeWidgetLook" ), makeAny( (sal_Bool)sal_True ) ); + xPropSet->setPropertyValue( OUString( "NativeWidgetLook" ), makeAny( (sal_Bool)sal_True ) ); Reference< XFormComponent > aFormComp(xModel,UNO_QUERY ); @@ -1494,11 +1494,11 @@ void BibDataManager::SetMeAsUidListener() if (!xFields.is()) return; - Sequence< ::rtl::OUString > aFields(xFields->getElementNames()); - const ::rtl::OUString* pFields = aFields.getConstArray(); + Sequence< OUString > aFields(xFields->getElementNames()); + const OUString* pFields = aFields.getConstArray(); sal_Int32 nCount=aFields.getLength(); - rtl::OUString StrUID(STR_UID); - ::rtl::OUString theFieldName; + OUString StrUID(STR_UID); + OUString theFieldName; for( sal_Int32 i=0; i aFields(xFields->getElementNames()); - const ::rtl::OUString* pFields = aFields.getConstArray(); + Sequence< OUString > aFields(xFields->getElementNames()); + const OUString* pFields = aFields.getConstArray(); sal_Int32 nCount=aFields.getLength(); - rtl::OUString StrUID(STR_UID); - ::rtl::OUString theFieldName; + OUString StrUID(STR_UID); + OUString theFieldName; for( sal_Int32 i=0; iExecute()) { @@ -1604,7 +1604,7 @@ void BibDataManager::DispatchDBChangeDialog() pToolbar->SendDispatch(TBC_BT_CHANGESOURCE, Sequence< PropertyValue >()); } -const ::rtl::OUString& BibDataManager::GetIdentifierMapping() +const OUString& BibDataManager::GetIdentifierMapping() { if(sIdentifierMapping.isEmpty()) { diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index b450bada2b23..ea3acb6eb9f0 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -66,7 +66,7 @@ public: void ReleaseInterceptor(); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw (::com::sun::star::uno::RuntimeException); // XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException); @@ -92,9 +92,9 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xFormDispatch; BibInterceptorHelper* m_pInterceptorHelper; - ::rtl::OUString aActiveDataTable; - ::rtl::OUString aDataSourceURL; - ::rtl::OUString aQuoteChar; + OUString aActiveDataTable; + OUString aDataSourceURL; + OUString aQuoteChar; ::com::sun::star::uno::Any aUID; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xBibCursor; @@ -103,19 +103,19 @@ private: ::bib::BibView* pBibView; BibToolBar* pToolbar; - rtl::OUString sIdentifierMapping; + OUString sIdentifierMapping; protected: void InsertFields(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid); void SetMeAsUidListener(); void RemoveMeAsUidListener(); - void UpdateAddressbookCursor(::rtl::OUString aSourceName); + void UpdateAddressbookCursor(OUString aSourceName); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > updateGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xDbForm); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > - createGridModel( const ::rtl::OUString& rName ); + createGridModel( const OUString& rName ); // XLoadable virtual void SAL_CALL load( ) throw (::com::sun::star::uno::RuntimeException); @@ -143,32 +143,32 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > updateGridModel(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> getDataSources(); + ::com::sun::star::uno::Sequence< OUString> getDataSources(); - ::rtl::OUString getActiveDataSource() {return aDataSourceURL;} - void setActiveDataSource(const ::rtl::OUString& rURL); + OUString getActiveDataSource() {return aDataSourceURL;} + void setActiveDataSource(const OUString& rURL); - ::rtl::OUString getActiveDataTable(); - void setActiveDataTable(const ::rtl::OUString& rTable); + OUString getActiveDataTable(); + void setActiveDataTable(const OUString& rTable); - void setFilter(const ::rtl::OUString& rQuery); - ::rtl::OUString getFilter(); + void setFilter(const OUString& rQuery); + OUString getFilter(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> getQueryFields(); - ::rtl::OUString getQueryField(); - void startQueryWith(const ::rtl::OUString& rQuery); + ::com::sun::star::uno::Sequence< OUString> getQueryFields(); + OUString getQueryField(); + void startQueryWith(const OUString& rQuery); const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& getParser() { return m_xParser; } const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& getForm() { return m_xForm; } - ::rtl::OUString getControlName(sal_Int32 nFormatKey ); + OUString getControlName(sal_Int32 nFormatKey ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const ::rtl::OUString& rName, + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const OUString& rName, sal_Bool bForceListBox = sal_False); void CreateMappingDialog(Window* pParent); - ::rtl::OUString CreateDBChangeDialog(Window* pParent); + OUString CreateDBChangeDialog(Window* pParent); void DispatchDBChangeDialog(); sal_Bool HasActiveConnection() const; @@ -177,8 +177,8 @@ public: void SetToolbar(BibToolBar* pSet); - const rtl::OUString& GetIdentifierMapping(); - void ResetIdentifierMapping() {sIdentifierMapping = rtl::OUString();} + const OUString& GetIdentifierMapping(); + void ResetIdentifierMapping() {sIdentifierMapping = OUString();} ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(); // #100312# ---------- diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 9dfd994a031b..5a6cd4f95e6d 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -60,7 +60,6 @@ using namespace com::sun::star::frame; using namespace com::sun::star::uno; using namespace com::sun::star; -using ::rtl::OUString; struct DispatchInfo { @@ -99,7 +98,7 @@ static DispatchInfo SupportedCommandsArray[] = { 0 , 0 , sal_False } }; -typedef ::boost::unordered_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache; +typedef ::boost::unordered_map< OUString, CacheDispatchInfo, OUStringHash, ::std::equal_to< OUString > > CmdToInfoCache; const CmdToInfoCache& GetCommandToInfoCache() { @@ -114,7 +113,7 @@ const CmdToInfoCache& GetCommandToInfoCache() sal_Int32 i( 0 ); while ( SupportedCommandsArray[i].pCommand != 0 ) { - rtl::OUString aCommand( rtl::OUString::createFromAscii( SupportedCommandsArray[i].pCommand )); + OUString aCommand( OUString::createFromAscii( SupportedCommandsArray[i].pCommand )); CacheDispatchInfo aDispatchInfo; aDispatchInfo.nGroupId = SupportedCommandsArray[i].nGroupId; @@ -202,22 +201,22 @@ BibFrameController_Impl::~BibFrameController_Impl() CloseBibModul(pBibMod); } -::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.extensions.Bibliography"); + return OUString("com.sun.star.comp.extensions.Bibliography"); } -sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException) { return ( sServiceName == "com.sun.star.frame.Bibliography" || sServiceName == "com.sun.star.frame.Controller" ); } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException) { // return only top level services ... // base services are included there and should be asked by uno-rtti. - ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString("com.sun.star.frame.Bibliography"); + ::com::sun::star::uno::Sequence< OUString > lNames(1); + lNames[0] = OUString("com.sun.star.frame.Bibliography"); return lNames; } @@ -281,7 +280,7 @@ void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::X pImp->aLC.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); } -uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( const util::URL& aURL, const rtl::OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException) +uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( const util::URL& aURL, const OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException) { if ( !bDisposing ) { @@ -434,14 +433,14 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } else if(aCommand.EqualsAscii("Bib/sdbsource")) { - rtl::OUString aURL = pDatMan->CreateDBChangeDialog(pParent); + OUString aURL = pDatMan->CreateDBChangeDialog(pParent); if(!aURL.isEmpty()) { try { uno::Sequence< beans::PropertyValue > aNewDataSource(2); beans::PropertyValue* pProps = aNewDataSource.getArray(); - pProps[0].Value <<= rtl::OUString(); + pProps[0].Value <<= OUString(); pProps[1].Value <<= aURL; ChangeDataSource(aNewDataSource); } @@ -471,11 +470,11 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen const beans::PropertyValue* pPropertyValue = aArgs.getConstArray(); uno::Any aValue=pPropertyValue[0].Value; - rtl::OUString aQuery; + OUString aQuery; aValue >>= aQuery; aValue=pPropertyValue[1].Value; - rtl::OUString aQueryField; + OUString aQueryField; aValue >>= aQueryField; BibConfig* pConfig = BibModul::GetConfig(); pConfig->setQueryField(aQueryField); @@ -495,7 +494,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen { // the dialog has been executed successfully, and the filter on the query composer // has been changed - ::rtl::OUString sNewFilter = pDatMan->getParser()->getFilter(); + OUString sNewFilter = pDatMan->getParser()->getFilter(); pDatMan->setFilter( sNewFilter ); } } @@ -669,15 +668,15 @@ void BibFrameController_Impl::addStatusListener( { aEvent.IsEnabled = sal_True; const char* pHier = bHierarchical? "" : "*" ; - aEvent.State <<= rtl::OUString::createFromAscii(pHier); + aEvent.State <<= OUString::createFromAscii(pHier); } else if(aURL.Path == "Bib/MenuFilter") { aEvent.IsEnabled = sal_True; aEvent.FeatureDescriptor=pDatMan->getQueryField(); - uno::Sequence aStringSeq=pDatMan->getQueryFields(); - aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence*)0)); + uno::Sequence aStringSeq=pDatMan->getQueryFields(); + aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence*)0)); } else if ( aURL.Path == "Bib/source") @@ -685,8 +684,8 @@ void BibFrameController_Impl::addStatusListener( aEvent.IsEnabled = sal_True; aEvent.FeatureDescriptor=pDatMan->getActiveDataTable(); - uno::Sequence aStringSeq=pDatMan->getDataSources(); - aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence*)0)); + uno::Sequence aStringSeq=pDatMan->getDataSources(); + aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence*)0)); } else if( aURL.Path == "Bib/sdbsource" || aURL.Path == "Bib/Mapping" || @@ -702,7 +701,7 @@ void BibFrameController_Impl::addStatusListener( } else if (aURL.Path == "Bib/removeFilter" ) { - rtl::OUString aFilterStr=pDatMan->getFilter(); + OUString aFilterStr=pDatMan->getFilter(); aEvent.IsEnabled = !aFilterStr.isEmpty(); } else if(aURL.Path == "Cut") @@ -746,7 +745,7 @@ void BibFrameController_Impl::addStatusListener( try { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; aEvent.IsEnabled = !aText.isEmpty(); } @@ -804,7 +803,7 @@ void BibFrameController_Impl::removeStatusListener( //----------------------------------------------------------------------------- void BibFrameController_Impl::RemoveFilter() { - rtl::OUString aQuery; + OUString aQuery; pDatMan->startQueryWith(aQuery); sal_uInt16 nCount = aStatusListeners.size(); @@ -847,14 +846,14 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope { const beans::PropertyValue* pPropertyValue = aArgs.getConstArray(); uno::Any aValue=pPropertyValue[0].Value; - rtl::OUString aDBTableName; + OUString aDBTableName; aValue >>= aDBTableName; if(aArgs.getLength() > 1) { uno::Any aDB = pPropertyValue[1].Value; - rtl::OUString aURL; + OUString aURL; aDB >>= aURL; pDatMan->setActiveDataSource(aURL); aDBTableName = pDatMan->getActiveDataTable(); @@ -884,7 +883,7 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope aEvent.Source = (XDispatch *) this; aEvent.FeatureDescriptor=pDatMan->getQueryField(); - uno::Sequence aStringSeq=pDatMan->getQueryFields(); + uno::Sequence aStringSeq=pDatMan->getQueryFields(); aEvent.State = makeAny( aStringSeq ); pObj->xListener->statusChanged( aEvent ); diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index 18203cd8703c..775ad18ebbbf 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -85,9 +85,9 @@ public: void RemoveFilter(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XController virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) throw (::com::sun::star::uno::RuntimeException); @@ -104,7 +104,7 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw (::com::sun::star::uno::RuntimeException); //class ::com::sun::star::frame::XDispatch diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 7b9a4a4e50c7..6023fcbf742f 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -128,7 +128,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno } } } - rtl::OUString uTypeMapping = sTypeMapping; + OUString uTypeMapping = sTypeMapping; uno::Reference< form::XForm > xForm = pDatMan->getForm(); uno::Reference< sdbcx::XColumnsSupplier > xSupplyCols(xForm, UNO_QUERY); @@ -149,8 +149,8 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno // getShort returns zero if the value is not a number if (!nTempVal || xCol->wasNull()) { - rtl::OUString sTempVal = xCol->getString(); - if(sTempVal != rtl::OUString('0')) + OUString sTempVal = xCol->getString(); + if(sTempVal != OUString('0')) nTempVal = -1; } } @@ -432,7 +432,7 @@ void BibGeneralPage::CommitActiveControl() } //----------------------------------------------------------------------------- void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::Point& rPos, const ::Size& rSize, - String& rErrorString, String aColumnUIName, const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray ) + String& rErrorString, String aColumnUIName, const OString& sHelpId, sal_uInt16 nIndexInFTArray ) { // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT @@ -456,7 +456,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P //----------------------------------------------------------------------------- uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( const String& rName, - ::Point rPos, ::Size rSize, const rtl::OString& sHelpId, sal_Int16& rIndex ) + ::Point rPos, ::Size rSize, const OString& sHelpId, sal_Int16& rIndex ) { uno::Reference< awt::XControlModel > xCtrModel; try @@ -472,15 +472,15 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( uno::Reference< beans::XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); uno::Any aAny = xPropSet->getPropertyValue( "DefaultControl" ); - rtl::OUString aControlName; + OUString aControlName; aAny >>= aControlName; - rtl::OUString uProp("HelpURL"); + OUString uProp("HelpURL"); if(xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME ); - DBG_ASSERT( INetURLObject( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); - sId += ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ); + OUString sId = OUString::createFromAscii( INET_HID_SCHEME ); + DBG_ASSERT( INetURLObject( OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); + sId += OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ); xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } @@ -493,23 +493,23 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( aAny.setValue( &eSet, ::getCppuType((const ListSourceType*)0) ); xPropSet->setPropertyValue("ListSourceType", aAny); - uno::Sequence aListSource(TYPE_COUNT); - rtl::OUString* pListSourceArr = aListSource.getArray(); + uno::Sequence aListSource(TYPE_COUNT); + OUString* pListSourceArr = aListSource.getArray(); //pListSourceArr[0] = "select TypeName, TypeIndex from TypeNms"; for(sal_Int32 i = 0; i < TYPE_COUNT; ++i) - pListSourceArr[i] = rtl::OUString::valueOf(i); - aAny.setValue(&aListSource, ::getCppuType((uno::Sequence*)0)); + pListSourceArr[i] = OUString::valueOf(i); + aAny.setValue(&aListSource, ::getCppuType((uno::Sequence*)0)); xPropSet->setPropertyValue("ListSource", aAny); - uno::Sequence aValues(TYPE_COUNT + 1); - rtl::OUString* pValuesArr = aValues.getArray(); + uno::Sequence aValues(TYPE_COUNT + 1); + OUString* pValuesArr = aValues.getArray(); for(sal_uInt16 j = 0; j < TYPE_COUNT; j++) pValuesArr[j] = aBibTypeArr[j]; // empty string if an invalid value no values is set - pValuesArr[TYPE_COUNT] = rtl::OUString(); + pValuesArr[TYPE_COUNT] = OUString(); - aAny.setValue(&aValues, ::getCppuType((uno::Sequence*)0)); + aAny.setValue(&aValues, ::getCppuType((uno::Sequence*)0)); xPropSet->setPropertyValue("StringItemList", aAny); diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 2b4a7ddb8c87..f9b97db7f5ef 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -124,12 +124,12 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage BibDataManager* pDatMan; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > - AddXControl( const String& rName, Point aPos, Size aSize, const rtl::OString& sHelpId, + AddXControl( const String& rName, Point aPos, Size aSize, const OString& sHelpId, sal_Int16& rIndex ); - void AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos, + void AddControlWithError( const OUString& rColumnName, const Point& rPos, const Size& rSize, String& rErrorString, String aColumnUIName, - const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray ); + const OString& sHelpId, sal_uInt16 nIndexInFTArray ); void AdjustScrollbars(); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 3b40e721a32f..ea3999fe03f1 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans; // Konstanten ------------------------------------------------------------- -BibToolBarListener::BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId): +BibToolBarListener::BibToolBarListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId): nIndex(nId), aCommand(aStr), pToolBar(pTB) @@ -73,12 +73,12 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta } }; -rtl::OUString BibToolBarListener::GetCommand() const +OUString BibToolBarListener::GetCommand() const { return aCommand; } -BibTBListBoxListener::BibTBListBoxListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId): +BibTBListBoxListener::BibTBListBoxListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId): BibToolBarListener(pTB,aStr,nId) { } @@ -95,13 +95,13 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS pToolBar->EnableSourceList(rEvt.IsEnabled); Any aState = rEvt.State; - if(aState.getValueType() == ::getCppuType((Sequence*)0)) + if(aState.getValueType() == ::getCppuType((Sequence*)0)) { pToolBar->UpdateSourceList(sal_False); pToolBar->ClearSourceList(); - Sequence* pStringSeq = (Sequence*)aState.getValue(); - const rtl::OUString* pStringArray = (const rtl::OUString*)pStringSeq->getConstArray(); + Sequence* pStringSeq = (Sequence*)aState.getValue(); + const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray(); sal_uInt32 nCount = pStringSeq->getLength(); XubString aEntry; @@ -118,7 +118,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS } }; -BibTBQueryMenuListener::BibTBQueryMenuListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId): +BibTBQueryMenuListener::BibTBQueryMenuListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId): BibToolBarListener(pTB,aStr,nId) { } @@ -135,12 +135,12 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) pToolBar->EnableSourceList(rEvt.IsEnabled); uno::Any aState=rEvt.State; - if(aState.getValueType()==::getCppuType((Sequence*)0)) + if(aState.getValueType()==::getCppuType((Sequence*)0)) { pToolBar->ClearFilterMenu(); - Sequence* pStringSeq = (Sequence*) aState.getValue(); - const rtl::OUString* pStringArray = (const rtl::OUString*)pStringSeq->getConstArray(); + Sequence* pStringSeq = (Sequence*) aState.getValue(); + const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray(); sal_uInt32 nCount = pStringSeq->getLength(); for( sal_uInt32 i=0; i aPropVal(2); PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray(); pPropertyVal[0].Name="QueryText"; - rtl::OUString aSelection = aEdQuery.GetText(); + OUString aSelection = aEdQuery.GetText(); pPropertyVal[0].Value <<= aSelection; pPropertyVal[1].Name="QueryField"; @@ -326,7 +326,7 @@ void BibToolBar::Select() void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& rArgs) { - rtl::OUString aCommand = GetItemCommand(nId); + OUString aCommand = GetItemCommand(nId); uno::Reference< frame::XDispatchProvider > xDSP( xController, UNO_QUERY ); @@ -341,7 +341,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r xTrans->parseStrict( aURL ); - uno::Reference< frame::XDispatch > xDisp = xDSP->queryDispatch( aURL, rtl::OUString(), frame::FrameSearchFlag::SELF ); + uno::Reference< frame::XDispatch > xDisp = xDSP->queryDispatch( aURL, OUString(), frame::FrameSearchFlag::SELF ); if ( xDisp.is() ) xDisp->dispatch( aURL, rArgs); @@ -443,7 +443,7 @@ long BibToolBar::PreNotify( NotifyEvent& rNEvt ) Sequence aPropVal(2); PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray(); pPropertyVal[0].Name = "QueryText"; - rtl::OUString aSelection = aEdQuery.GetText(); + OUString aSelection = aEdQuery.GetText(); pPropertyVal[0].Value <<= aSelection; pPropertyVal[1].Name="QueryField"; pPropertyVal[1].Value <<= aQueryField; @@ -470,7 +470,7 @@ IMPL_LINK( BibToolBar, SendSelHdl, Timer*,/*pT*/) PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray(); pPropertyVal[0].Name = "DataSourceName"; String aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource.GetSelectEntry() ) ); - rtl::OUString aSelection = aEntry; + OUString aSelection = aEntry; pPropertyVal[0].Value <<= aSelection; SendDispatch(TBC_LB_SOURCE,aPropVal); @@ -497,7 +497,7 @@ IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/) Sequence aPropVal(2); PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray(); pPropertyVal[0].Name = "QueryText"; - rtl::OUString aSelection = aEdQuery.GetText(); + OUString aSelection = aEdQuery.GetText(); pPropertyVal[0].Value <<= aSelection; pPropertyVal[1].Name="QueryField"; pPropertyVal[1].Value <<= aQueryField; diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 956ec905fa8e..877931c8a1a5 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -40,7 +40,7 @@ class BibToolBarListener: public cppu::WeakImplHelper1 < ::com::sun::star::frame private: sal_uInt16 nIndex; - rtl::OUString aCommand; + OUString aCommand; protected: @@ -48,10 +48,10 @@ protected: public: - BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); + BibToolBarListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId); ~BibToolBarListener(); - rtl::OUString GetCommand() const; + OUString GetCommand() const; // ::com::sun::star::lang::XEventListener // we do not hold References to dispatches, so there is nothing to do on disposal @@ -68,7 +68,7 @@ class BibTBListBoxListener: public BibToolBarListener { public: - BibTBListBoxListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); + BibTBListBoxListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId); ~BibTBListBoxListener(); virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) @@ -80,7 +80,7 @@ class BibTBEditListener: public BibToolBarListener { public: - BibTBEditListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); + BibTBEditListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId); ~BibTBEditListener(); virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) @@ -92,7 +92,7 @@ class BibTBQueryMenuListener: public BibToolBarListener { public: - BibTBQueryMenuListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); + BibTBQueryMenuListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId); ~BibTBQueryMenuListener(); virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) @@ -122,7 +122,7 @@ class BibToolBar: public ToolBox PopupMenu aPopupMenu; sal_uInt16 nMenuId; sal_uInt16 nSelMenuItem; - rtl::OUString aQueryField; + OUString aQueryField; Link aLayoutManager; sal_Int16 nSymbolsSize; sal_Int16 nOutStyle; diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index cc1992b2229e..4b634acb41d1 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -68,7 +68,7 @@ static void checkLdapReturnCode(const sal_Char *aOperation, if (aRetCode == LDAP_SUCCESS) { return ; } static const sal_Char *kNoSpecificMessage = "No additional information" ; - rtl::OUStringBuffer message ; + OUStringBuffer message ; if (aOperation != NULL) { @@ -140,8 +140,8 @@ void LdapConnection::connectSimple() (PWCHAR) mLdapDefinition.mAnonCredentials.getStr() ); #else LdapErrCode retCode = ldap_simple_bind_s(mConnection, - rtl::OUStringToOString( mLdapDefinition.mAnonUser, RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( mLdapDefinition.mAnonCredentials, RTL_TEXTENCODING_UTF8 ).getStr()) ; + OUStringToOString( mLdapDefinition.mAnonUser, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( mLdapDefinition.mAnonCredentials, RTL_TEXTENCODING_UTF8 ).getStr()) ; #endif checkLdapReturnCode("SimpleBind", retCode, mConnection) ; @@ -153,7 +153,7 @@ void LdapConnection::initConnection() { if (mLdapDefinition.mServer.isEmpty()) { - rtl::OUStringBuffer message ; + OUStringBuffer message ; message.appendAscii("Cannot initialise connection to LDAP: No server specified.") ; throw ldap::LdapConnectionException(message.makeStringAndClear(), NULL) ; @@ -165,12 +165,12 @@ void LdapConnection::initConnection() mConnection = ldap_initW((PWCHAR) mLdapDefinition.mServer.getStr(), mLdapDefinition.mPort) ; #else - mConnection = ldap_init(rtl::OUStringToOString( mLdapDefinition.mServer, RTL_TEXTENCODING_UTF8 ).getStr(), + mConnection = ldap_init(OUStringToOString( mLdapDefinition.mServer, RTL_TEXTENCODING_UTF8 ).getStr(), mLdapDefinition.mPort) ; #endif if (mConnection == NULL) { - rtl::OUStringBuffer message ; + OUStringBuffer message ; message.appendAscii("Cannot initialise connection to LDAP server ") ; message.append(mLdapDefinition.mServer) ; @@ -182,14 +182,14 @@ void LdapConnection::initConnection() } //------------------------------------------------------------------------------ void LdapConnection::getUserProfile( - const rtl::OUString& aUser, LdapData * data) + const OUString& aUser, LdapData * data) throw (lang::IllegalArgumentException, ldap::LdapConnectionException, ldap::LdapGenericException) { OSL_ASSERT(data != 0); if (!isValid()) { connectSimple(); } - rtl::OUString aUserDn =findUserDn( aUser ); + OUString aUserDn =findUserDn( aUser ); LdapMessageHolder result; #ifdef WNT @@ -202,7 +202,7 @@ void LdapConnection::initConnection() &result.msg) ; #else LdapErrCode retCode = ldap_search_s(mConnection, - rtl::OUStringToOString( aUserDn, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( aUserDn, RTL_TEXTENCODING_UTF8 ).getStr(), LDAP_SCOPE_BASE, "(objectclass=*)", 0, @@ -217,8 +217,8 @@ void LdapConnection::initConnection() while (attr) { PWCHAR * values = ldap_get_valuesW(mConnection, result.msg, attr); if (values) { - const rtl::OUString aAttr( reinterpret_cast( attr ) ); - const rtl::OUString aValues( reinterpret_cast( *values ) ); + const OUString aAttr( reinterpret_cast( attr ) ); + const OUString aValues( reinterpret_cast( *values ) ); data->insert( LdapData::value_type( aAttr, aValues )); ldap_value_freeW(values); @@ -231,8 +231,8 @@ void LdapConnection::initConnection() if (values) { data->insert( LdapData::value_type( - rtl::OStringToOUString(attr, RTL_TEXTENCODING_ASCII_US), - rtl::OStringToOUString(*values, RTL_TEXTENCODING_UTF8))); + OStringToOUString(attr, RTL_TEXTENCODING_ASCII_US), + OStringToOUString(*values, RTL_TEXTENCODING_UTF8))); ldap_value_free(values); } attr = ldap_next_attribute(mConnection, result.msg, ptr); @@ -240,7 +240,7 @@ void LdapConnection::initConnection() } } //------------------------------------------------------------------------------ - rtl::OUString LdapConnection::findUserDn(const rtl::OUString& aUser) + OUString LdapConnection::findUserDn(const OUString& aUser) throw (lang::IllegalArgumentException, ldap::LdapConnectionException, ldap::LdapGenericException) { @@ -249,13 +249,13 @@ void LdapConnection::initConnection() if (aUser.isEmpty()) { throw lang::IllegalArgumentException( - rtl::OUString("LdapConnection::findUserDn -User id is empty"), + OUString("LdapConnection::findUserDn -User id is empty"), NULL, 0) ; } - rtl::OUStringBuffer filter( "(&(objectclass=" ); + OUStringBuffer filter( "(&(objectclass=" ); filter.append( mLdapDefinition.mUserObjectClass ).append(")(") ; filter.append( mLdapDefinition.mUserUniqueAttr ).append("=").append(aUser).append("))") ; @@ -270,12 +270,12 @@ void LdapConnection::initConnection() #else sal_Char * attributes [2] = { const_cast(LDAP_NO_ATTRS), NULL }; LdapErrCode retCode = ldap_search_s(mConnection, - rtl::OUStringToOString( mLdapDefinition.mBaseDN, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( mLdapDefinition.mBaseDN, RTL_TEXTENCODING_UTF8 ).getStr(), LDAP_SCOPE_SUBTREE, - rtl::OUStringToOString( filter.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), attributes, 0, &result.msg) ; + OUStringToOString( filter.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), attributes, 0, &result.msg) ; #endif checkLdapReturnCode("FindUserDn", retCode,mConnection) ; - rtl::OUString userDn ; + OUString userDn ; LDAPMessage *entry = ldap_first_entry(mConnection, result.msg) ; if (entry != NULL) @@ -283,12 +283,12 @@ void LdapConnection::initConnection() #ifdef WNT PWCHAR charsDn = ldap_get_dnW(mConnection, entry) ; - userDn = rtl::OUString( reinterpret_cast( charsDn ) ); + userDn = OUString( reinterpret_cast( charsDn ) ); ldap_memfreeW(charsDn) ; #else sal_Char *charsDn = ldap_get_dn(mConnection, entry) ; - userDn = rtl::OStringToOUString( charsDn, RTL_TEXTENCODING_UTF8 ); + userDn = OStringToOUString( charsDn, RTL_TEXTENCODING_UTF8 ); ldap_memfree(charsDn) ; #endif } diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx index 8f681702b255..f2378d080b57 100644 --- a/extensions/source/config/ldap/ldapaccess.hxx +++ b/extensions/source/config/ldap/ldapaccess.hxx @@ -50,22 +50,22 @@ struct LdapUserProfile; struct LdapDefinition { /** LDAP server name */ - rtl::OUString mServer ; + OUString mServer ; /** LDAP server port number */ sal_Int32 mPort ; /** Repository base DN */ - rtl::OUString mBaseDN ; + OUString mBaseDN ; /** DN to use for "anonymous" connection */ - rtl::OUString mAnonUser ; + OUString mAnonUser ; /** Credentials to use for "anonymous" connection */ - rtl::OUString mAnonCredentials ; + OUString mAnonCredentials ; /** User Entity Object Class */ - rtl::OUString mUserObjectClass; + OUString mUserObjectClass; /** User Entity Unique Attribute */ - rtl::OUString mUserUniqueAttr; + OUString mUserUniqueAttr; } ; -typedef std::map< rtl::OUString, rtl::OUString > LdapData; // key/value pairs +typedef std::map< OUString, OUString > LdapData; // key/value pairs /** Class encapulating all LDAP functionality */ class LdapConnection @@ -91,7 +91,7 @@ public: @throws com::sun::star::ldap::LdapGenericException if an LDAP error occurs. */ - void getUserProfile(const rtl::OUString& aUser, LdapData * data) + void getUserProfile(const OUString& aUser, LdapData * data) throw (lang::IllegalArgumentException, ldap::LdapConnectionException, ldap::LdapGenericException); @@ -99,7 +99,7 @@ public: /** finds DN of user @return DN of User */ - rtl::OUString findUserDn(const rtl::OUString& aUser) + OUString findUserDn(const OUString& aUser) throw (lang::IllegalArgumentException, ldap::LdapConnectionException, ldap::LdapGenericException); diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 58be55f2e894..6985b07e65a2 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -40,7 +40,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference const & context, - LdapDefinition * definition, rtl::OUString * loggedOnUser) + LdapDefinition * definition, OUString * loggedOnUser) { OSL_ASSERT(context.is() && definition != 0 && loggedOnUser != 0); - const rtl::OUString kReadOnlyViewService("com.sun.star.configuration.ConfigurationAccess") ; - const rtl::OUString kComponent("org.openoffice.LDAP/UserDirectory"); - const rtl::OUString kServerDefiniton("ServerDefinition"); - const rtl::OUString kServer("Server"); - const rtl::OUString kPort("Port"); - const rtl::OUString kBaseDN("BaseDN"); - const rtl::OUString kUser("SearchUser"); - const rtl::OUString kPassword("SearchPassword"); - const rtl::OUString kUserObjectClass("UserObjectClass"); - const rtl::OUString kUserUniqueAttr("UserUniqueAttribute"); + const OUString kReadOnlyViewService("com.sun.star.configuration.ConfigurationAccess") ; + const OUString kComponent("org.openoffice.LDAP/UserDirectory"); + const OUString kServerDefiniton("ServerDefinition"); + const OUString kServer("Server"); + const OUString kPort("Port"); + const OUString kBaseDN("BaseDN"); + const OUString kUser("SearchUser"); + const OUString kPassword("SearchPassword"); + const OUString kUserObjectClass("UserObjectClass"); + const OUString kUserUniqueAttr("UserUniqueAttribute"); uno::Reference< XInterface > xIface; try @@ -107,7 +107,7 @@ bool LdapUserProfileBe::readLdapConfiguration( uno::Reference< lang::XMultiServiceFactory > xCfgProvider( css::configuration::theDefaultProvider::get(context)); - css::beans::NamedValue aPath(rtl::OUString("nodepath"), uno::makeAny(kComponent) ); + css::beans::NamedValue aPath(OUString("nodepath"), uno::makeAny(kComponent) ); uno::Sequence< uno::Any > aArgs(1); aArgs[0] <<= aPath; @@ -140,7 +140,7 @@ bool LdapUserProfileBe::readLdapConfiguration( catch (const uno::Exception & e) { OSL_TRACE("LdapUserProfileBackend: access to configuration data failed: %s", - rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); return false; } @@ -153,7 +153,7 @@ bool LdapUserProfileBe::readLdapConfiguration( *loggedOnUser = loggedOnUser->copy(nIndex+1); //Remember to remove - OSL_TRACE("Logged on user is %s", rtl::OUStringToOString(*loggedOnUser,RTL_TEXTENCODING_ASCII_US).getStr()); + OSL_TRACE("Logged on user is %s", OUStringToOString(*loggedOnUser,RTL_TEXTENCODING_ASCII_US).getStr()); return true; } @@ -161,8 +161,8 @@ bool LdapUserProfileBe::readLdapConfiguration( //------------------------------------------------------------------------------ bool LdapUserProfileBe::getLdapStringParam( uno::Reference& xAccess, - const rtl::OUString& aLdapSetting, - rtl::OUString& aServerParameter) + const OUString& aLdapSetting, + OUString& aServerParameter) { xAccess->getByName(aLdapSetting) >>= aServerParameter; @@ -170,19 +170,19 @@ bool LdapUserProfileBe::getLdapStringParam( } //------------------------------------------------------------------------------ void LdapUserProfileBe::setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString("setPropertyValue not supported"), + OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } css::uno::Any LdapUserProfileBe::getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) @@ -211,30 +211,30 @@ css::uno::Any LdapUserProfileBe::getPropertyValue( } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) { - return rtl::OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe"); +OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) { + return OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe"); } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL LdapUserProfileBe::getImplementationName(void) +OUString SAL_CALL LdapUserProfileBe::getImplementationName(void) throw (uno::RuntimeException) { return getLdapUserProfileBeName() ; } //------------------------------------------------------------------------------ -uno::Sequence SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void) +uno::Sequence SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void) { - uno::Sequence aServices(1) ; - aServices[0] = rtl::OUString("com.sun.star.configuration.backend.LdapUserProfileBe") ; + uno::Sequence aServices(1) ; + aServices[0] = OUString("com.sun.star.configuration.backend.LdapUserProfileBe") ; return aServices ; } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const rtl::OUString& aServiceName) +sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const OUString& aServiceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > const svc = getLdapUserProfileBeServiceNames(); + uno::Sequence< OUString > const svc = getLdapUserProfileBeServiceNames(); for(sal_Int32 i = 0; i < svc.getLength(); ++i ) if(svc[i] == aServiceName) @@ -244,7 +244,7 @@ sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const rtl::OUString& aServi //------------------------------------------------------------------------------ -uno::Sequence +uno::Sequence SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void) throw (uno::RuntimeException) { diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx index c91cc55bdf59..83c614f11436 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.hxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx @@ -58,15 +58,15 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase ~LdapUserProfileBe(void) ; // XServiceInfo - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException) ; virtual sal_Bool SAL_CALL - supportsService( const rtl::OUString& aServiceName ) + supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) ; - virtual uno::Sequence SAL_CALL + virtual uno::Sequence SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException) ; @@ -76,7 +76,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -84,13 +84,13 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -98,7 +98,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -106,7 +106,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -114,7 +114,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -125,23 +125,23 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase Provides the implementation name. @return implementation name */ - static rtl::OUString SAL_CALL getLdapUserProfileBeName(void) ; + static OUString SAL_CALL getLdapUserProfileBeName(void) ; /** Provides the supported services names @return service names */ - static uno::Sequence SAL_CALL + static uno::Sequence SAL_CALL getLdapUserProfileBeServiceNames(void) ; private: /** Check if LDAP is configured */ bool readLdapConfiguration( uno::Reference const & context, - LdapDefinition * definition, rtl::OUString * loggedOnUser); + LdapDefinition * definition, OUString * loggedOnUser); bool getLdapStringParam(uno::Reference& xAccess, - const rtl::OUString& aLdapSetting, - rtl::OUString& aServerParameter); + const OUString& aLdapSetting, + OUString& aServerParameter); LdapData data_; } ; diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 344f314770ec..77dbb9a91e51 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -110,8 +110,8 @@ namespace dbp const OControlWizardContext& rContext = getContext(); try { - ::rtl::OUString sDataSourceName; - rContext.xForm->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName; + OUString sDataSourceName; + rContext.xForm->getPropertyValue(OUString("DataSourceName")) >>= sDataSourceName; Reference< XConnection > xConnection; bool bEmbedded = ::dbtools::isEmbeddedInDatabase( rContext.xForm, xConnection ); @@ -128,10 +128,10 @@ namespace dbp implFillTables(xConnection); - ::rtl::OUString sCommand; - OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString("Command") ) >>= sCommand ); + OUString sCommand; + OSL_VERIFY( rContext.xForm->getPropertyValue( OUString("Command") ) >>= sCommand ); sal_Int32 nCommandType = CommandType::TABLE; - OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString("CommandType") ) >>= nCommandType ); + OSL_VERIFY( rContext.xForm->getPropertyValue( OUString("CommandType") ) >>= nCommandType ); // search the entry of the given type with the given name for ( sal_uInt16 nLookup = 0; nLookup < m_aTable.GetEntryCount(); ++nLookup ) @@ -166,14 +166,14 @@ namespace dbp { xOldConn = getFormConnection(); - ::rtl::OUString sDataSource = m_aDatasource.GetSelectEntry(); - rContext.xForm->setPropertyValue( ::rtl::OUString("DataSourceName"), makeAny( sDataSource ) ); + OUString sDataSource = m_aDatasource.GetSelectEntry(); + rContext.xForm->setPropertyValue( OUString("DataSourceName"), makeAny( sDataSource ) ); } - ::rtl::OUString sCommand = m_aTable.GetSelectEntry(); + OUString sCommand = m_aTable.GetSelectEntry(); sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_aTable.GetEntryData( m_aTable.GetSelectEntryPos() ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString("Command"), makeAny( sCommand ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString("CommandType"), makeAny( nCommandType ) ); + rContext.xForm->setPropertyValue( OUString("Command"), makeAny( sCommand ) ); + rContext.xForm->setPropertyValue( OUString("CommandType"), makeAny( nCommandType ) ); if ( !rContext.bEmbedded ) setFormConnection( xOldConn, sal_False ); @@ -196,7 +196,7 @@ namespace dbp ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() ); - const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); if ( pFilter ) { @@ -241,10 +241,10 @@ namespace dbp //--------------------------------------------------------------------- namespace { - void lcl_fillEntries( ListBox& _rListBox, const Sequence< ::rtl::OUString >& _rNames, const Image& _rImage, sal_Int32 _nCommandType ) + void lcl_fillEntries( ListBox& _rListBox, const Sequence< OUString >& _rNames, const Image& _rImage, sal_Int32 _nCommandType ) { - const ::rtl::OUString* pNames = _rNames.getConstArray(); - const ::rtl::OUString* pNamesEnd = _rNames.getConstArray() + _rNames.getLength(); + const OUString* pNames = _rNames.getConstArray(); + const OUString* pNamesEnd = _rNames.getConstArray() + _rNames.getLength(); sal_uInt16 nPos = 0; while ( pNames != pNamesEnd ) { @@ -262,8 +262,8 @@ namespace dbp WaitObject aWaitCursor(this); // will be the table tables of the selected data source - Sequence< ::rtl::OUString > aTableNames; - Sequence< ::rtl::OUString > aQueryNames; + Sequence< OUString > aTableNames; + Sequence< OUString > aQueryNames; // connect to the data source Any aSQLException; @@ -275,7 +275,7 @@ namespace dbp // connect to the data source try { - ::rtl::OUString sCurrentDatasource = m_aDatasource.GetSelectEntry(); + OUString sCurrentDatasource = m_aDatasource.GetSelectEntry(); if (!sCurrentDatasource.isEmpty()) { // obtain the DS object diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 3c486324795b..32a152be18df 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -143,12 +143,12 @@ namespace dbp } //--------------------------------------------------------------------- - void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< ::rtl::OUString >& _rItems, sal_Bool _bClear) + void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear) { if (_bClear) _rList.Clear(); - const ::rtl::OUString* pItems = _rItems.getConstArray(); - const ::rtl::OUString* pEnd = pItems + _rItems.getLength(); + const OUString* pItems = _rItems.getConstArray(); + const OUString* pEnd = pItems + _rItems.getLength(); ::svt::WizardTypes::WizardState nPos; sal_Int32 nIndex = 0; for (;pItems < pEnd; ++pItems, ++nIndex) @@ -159,12 +159,12 @@ namespace dbp } //--------------------------------------------------------------------- - void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< ::rtl::OUString >& _rItems, sal_Bool _bClear) + void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear) { if (_bClear) _rList.Clear(); - const ::rtl::OUString* pItems = _rItems.getConstArray(); - const ::rtl::OUString* pEnd = pItems + _rItems.getLength(); + const OUString* pItems = _rItems.getConstArray(); + const OUString* pEnd = pItems + _rItems.getLength(); ::svt::WizardTypes::WizardState nPos; sal_Int32 nIndex = 0; for (;pItems < pEnd; ++pItems) @@ -227,14 +227,14 @@ namespace dbp if (m_pFormDatasource && m_pFormContentTypeLabel && m_pFormTable) { const OControlWizardContext& rContext = getContext(); - ::rtl::OUString sDataSource; - ::rtl::OUString sCommand; + OUString sDataSource; + OUString sCommand; sal_Int32 nCommandType = CommandType::COMMAND; try { - rContext.xForm->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSource; - rContext.xForm->getPropertyValue(::rtl::OUString("Command")) >>= sCommand; - rContext.xForm->getPropertyValue(::rtl::OUString("CommandType")) >>= nCommandType; + rContext.xForm->getPropertyValue(OUString("DataSourceName")) >>= sDataSource; + rContext.xForm->getPropertyValue(OUString("Command")) >>= sCommand; + rContext.xForm->getPropertyValue(OUString("CommandType")) >>= nCommandType; } catch(const Exception&) { @@ -298,7 +298,7 @@ namespace dbp sal_Int16 nClassId = FormComponentType::CONTROL; try { - getContext().xObjectModel->getPropertyValue(::rtl::OUString("ClassId")) >>= nClassId; + getContext().xObjectModel->getPropertyValue(OUString("ClassId")) >>= nClassId; } catch(const Exception&) { @@ -457,7 +457,7 @@ namespace dbp try { if ( !::dbtools::isEmbeddedInDatabase(m_aContext.xForm,xConn) ) - m_aContext.xForm->getPropertyValue(::rtl::OUString("ActiveConnection")) >>= xConn; + m_aContext.xForm->getPropertyValue(OUString("ActiveConnection")) >>= xConn; } catch(const Exception&) { @@ -487,7 +487,7 @@ namespace dbp } else { - m_aContext.xForm->setPropertyValue( ::rtl::OUString("ActiveConnection"), makeAny( _rxConn ) ); + m_aContext.xForm->setPropertyValue( OUString("ActiveConnection"), makeAny( _rxConn ) ); } } catch(const Exception&) @@ -512,7 +512,7 @@ namespace dbp catch(const Exception&) { } if (!xHandler.is()) { - const ::rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); + const OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); ShowServiceNotAvailableError(_pWindow, sInteractionHandlerServiceName, sal_True); } return xHandler; @@ -558,8 +558,8 @@ namespace dbp if (m_aContext.xForm.is()) { // collect some properties of the form - ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString("Command"))); - sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString("CommandType"))); + OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(OUString("Command"))); + sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(OUString("CommandType"))); // calculate the connection the rowset is working with Reference< XConnection > xConnection; @@ -604,7 +604,7 @@ namespace dbp // not interested in any results, only in the fields Reference< XPropertySet > xStatementProps(xStatement, UNO_QUERY); - xStatementProps->setPropertyValue(::rtl::OUString("MaxRows"), makeAny(sal_Int32(0))); + xStatementProps->setPropertyValue(OUString("MaxRows"), makeAny(sal_Int32(0))); // TODO: think about handling local SQLExceptions here ... Reference< XColumnsSupplier > xSupplyCols(xStatement->executeQuery(), UNO_QUERY); @@ -618,9 +618,9 @@ namespace dbp if (xColumns.is()) { m_aContext.aFieldNames = xColumns->getElementNames(); - static const ::rtl::OUString s_sFieldTypeProperty("Type"); - const ::rtl::OUString* pBegin = m_aContext.aFieldNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength(); + static const OUString s_sFieldTypeProperty("Type"); + const OUString* pBegin = m_aContext.aFieldNames.getConstArray(); + const OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength(); for(;pBegin != pEnd;++pBegin) { sal_Int32 nFieldType = DataType::OTHER; @@ -683,13 +683,13 @@ namespace dbp // the only thing we have at the moment is the label try { - ::rtl::OUString sLabelPropertyName("Label"); + OUString sLabelPropertyName("Label"); Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo(); if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName)) { - ::rtl::OUString sControlLabel(_pSettings->sControlLabel); + OUString sControlLabel(_pSettings->sControlLabel); m_aContext.xObjectModel->setPropertyValue( - ::rtl::OUString("Label"), + OUString("Label"), makeAny(sControlLabel) ); } @@ -710,11 +710,11 @@ namespace dbp // initialize some settings from the control model give try { - ::rtl::OUString sLabelPropertyName("Label"); + OUString sLabelPropertyName("Label"); Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo(); if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName)) { - ::rtl::OUString sControlLabel; + OUString sControlLabel; m_aContext.xObjectModel->getPropertyValue(sLabelPropertyName) >>= sControlLabel; _pSettings->sControlLabel = sControlLabel; } diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index c6b97bd1d7a8..ccd06a9157e4 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -81,11 +81,11 @@ namespace dbp protected: void fillListBox( ListBox& _rList, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rItems, + const ::com::sun::star::uno::Sequence< OUString >& _rItems, sal_Bool _bClear = sal_True); void fillListBox( ComboBox& _rList, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rItems, + const ::com::sun::star::uno::Sequence< OUString >& _rItems, sal_Bool _bClear = sal_True); protected: diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 7dbc4faa4d94..7446afc84901 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -59,7 +59,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dbp::OModule::getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), + OUString::createFromAscii(pImplementationName), static_cast< XMultiServiceFactory* >(pServiceManager)); } diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx index c71815b081c0..947b50865846 100644 --- a/extensions/source/dbpilots/dbptools.cxx +++ b/extensions/source/dbpilots/dbptools.cxx @@ -29,7 +29,7 @@ namespace dbp using namespace ::com::sun::star::container; //--------------------------------------------------------------------- - void disambiguateName(const Reference< XNameAccess >& _rxContainer, ::rtl::OUString& _rElementsName) + void disambiguateName(const Reference< XNameAccess >& _rxContainer, OUString& _rElementsName) { DBG_ASSERT(_rxContainer.is(), "::dbp::disambiguateName: invalid container!"); if (!_rxContainer.is()) @@ -37,11 +37,11 @@ namespace dbp try { - ::rtl::OUString sBase(_rElementsName); + OUString sBase(_rElementsName); for (sal_Int32 i=1; i<0x7FFFFFFF; ++i) { _rElementsName = sBase; - _rElementsName += ::rtl::OUString::valueOf((sal_Int32)i); + _rElementsName += OUString::valueOf((sal_Int32)i); if (!_rxContainer->hasByName(_rElementsName)) return; } diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx index 9a43596adc4a..b79bf5709499 100644 --- a/extensions/source/dbpilots/dbptools.hxx +++ b/extensions/source/dbpilots/dbptools.hxx @@ -29,7 +29,7 @@ namespace dbp void disambiguateName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, - ::rtl::OUString& _rElementsName); + OUString& _rElementsName); //......................................................................... } // namespace dbp diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 6feabb6d253f..d0885644cedd 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -103,11 +103,11 @@ namespace dbp if (!xColumnFactory.is() || !xColumnContainer.is()) return; - static const ::rtl::OUString s_sDataFieldProperty ("DataField"); - static const ::rtl::OUString s_sLabelProperty ("Label"); - static const ::rtl::OUString s_sWidthProperty ("Width"); - static const ::rtl::OUString s_sMouseWheelBehavior ("MouseWheelBehavior"); - static const ::rtl::OUString s_sEmptyString; + static const OUString s_sDataFieldProperty ("DataField"); + static const OUString s_sLabelProperty ("Label"); + static const OUString s_sWidthProperty ("Width"); + static const OUString s_sMouseWheelBehavior ("MouseWheelBehavior"); + static const OUString s_sEmptyString; // collect "descriptors" for the to-be-created (grid)columns std::vector< OUString > aColumnServiceNames; // service names to be used with the XGridColumnFactory @@ -119,8 +119,8 @@ namespace dbp aFormFieldNames.reserve(getSettings().aSelectedFields.getLength()); // loop through the selected field names - const ::rtl::OUString* pSelectedFields = getSettings().aSelectedFields.getConstArray(); - const ::rtl::OUString* pEnd = pSelectedFields + getSettings().aSelectedFields.getLength(); + const OUString* pSelectedFields = getSettings().aSelectedFields.getConstArray(); + const OUString* pEnd = pSelectedFields + getSettings().aSelectedFields.getLength(); for (;pSelectedFields < pEnd; ++pSelectedFields) { // get the information for the selected column @@ -134,14 +134,14 @@ namespace dbp { case DataType::BIT: case DataType::BOOLEAN: - aColumnServiceNames.push_back(::rtl::OUString("CheckBox")); + aColumnServiceNames.push_back(OUString("CheckBox")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TINYINT: case DataType::SMALLINT: case DataType::INTEGER: - aColumnServiceNames.push_back(::rtl::OUString("NumericField")); + aColumnServiceNames.push_back(OUString("NumericField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; @@ -150,31 +150,31 @@ namespace dbp case DataType::DOUBLE: case DataType::NUMERIC: case DataType::DECIMAL: - aColumnServiceNames.push_back(::rtl::OUString("FormattedField")); + aColumnServiceNames.push_back(OUString("FormattedField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::DATE: - aColumnServiceNames.push_back(::rtl::OUString("DateField")); + aColumnServiceNames.push_back(OUString("DateField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TIME: - aColumnServiceNames.push_back(::rtl::OUString("TimeField")); + aColumnServiceNames.push_back(OUString("TimeField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TIMESTAMP: - aColumnServiceNames.push_back(::rtl::OUString("DateField")); + aColumnServiceNames.push_back(OUString("DateField")); aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX))); aFormFieldNames.push_back(*pSelectedFields); - aColumnServiceNames.push_back(::rtl::OUString("TimeField")); + aColumnServiceNames.push_back(OUString("TimeField")); aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX))); break; default: - aColumnServiceNames.push_back(::rtl::OUString("TextField")); + aColumnServiceNames.push_back(OUString("TextField")); aColumnLabelPostfixes.push_back(s_sEmptyString); } } @@ -200,13 +200,13 @@ namespace dbp Reference< XPropertySet > xColumn( xColumnFactory->createColumn(*pColumnServiceName), UNO_SET_THROW ); Reference< XPropertySetInfo > xColumnPSI( xColumn->getPropertySetInfo(), UNO_SET_THROW ); - ::rtl::OUString sColumnName(*pColumnServiceName); + OUString sColumnName(*pColumnServiceName); disambiguateName(xExistenceChecker, sColumnName); // the data field the column should be bound to xColumn->setPropertyValue(s_sDataFieldProperty, makeAny(*pFormFieldName)); // the label - xColumn->setPropertyValue(s_sLabelProperty, makeAny(::rtl::OUString(*pFormFieldName) += *pColumnLabelPostfix)); + xColumn->setPropertyValue(s_sLabelProperty, makeAny(OUString(*pFormFieldName) += *pColumnLabelPostfix)); // the width ( => column will be auto-sized) xColumn->setPropertyValue(s_sWidthProperty, Any()); @@ -346,8 +346,8 @@ namespace dbp m_aSelFields.Clear(); const OGridSettings& rSettings = getSettings(); - const ::rtl::OUString* pSelected = rSettings.aSelectedFields.getConstArray(); - const ::rtl::OUString* pEnd = pSelected + rSettings.aSelectedFields.getLength(); + const OUString* pSelected = rSettings.aSelectedFields.getConstArray(); + const OUString* pEnd = pSelected + rSettings.aSelectedFields.getLength(); for (; pSelected < pEnd; ++pSelected) { m_aSelFields.InsertEntry(*pSelected); @@ -367,7 +367,7 @@ namespace dbp sal_uInt16 nSelected = m_aSelFields.GetEntryCount(); rSettings.aSelectedFields.realloc(nSelected); - ::rtl::OUString* pSelected = rSettings.aSelectedFields.getArray(); + OUString* pSelected = rSettings.aSelectedFields.getArray(); for (sal_uInt16 i=0; i aSelectedFields; + ::com::sun::star::uno::Sequence< OUString > aSelectedFields; }; //===================================================================== diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 36ddee11b6f3..597e73943c6f 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -263,7 +263,7 @@ namespace dbp for (::svt::WizardTypes::WizardState i=0; igetIdentifierQuoteString(); + OUString sQuoteString = xMetaData->getIdentifierQuoteString(); if (isListBox()) // only when we have a listbox this should be not empty getSettings().sLinkedListField = quoteName(sQuoteString, getSettings().sLinkedListField); - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; ::dbtools::qualifiedNameComponents( xMetaData, getSettings().sListContentTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); getSettings().sListContentTable = ::dbtools::composeTableNameForSelect( xConn, sCatalog, sSchema, sName ); @@ -176,12 +176,12 @@ namespace dbp } // ListSourceType: SQL - getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL)); + getContext().xObjectModel->setPropertyValue(OUString("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL)); if (isListBox()) { // BoundColumn: 1 - getContext().xObjectModel->setPropertyValue(::rtl::OUString("BoundColumn"), makeAny((sal_Int16)1)); + getContext().xObjectModel->setPropertyValue(OUString("BoundColumn"), makeAny((sal_Int16)1)); // build the statement to set as list source String sStatement; @@ -191,9 +191,9 @@ namespace dbp sStatement += getSettings().sLinkedListField; sStatement.AppendAscii(" FROM "); sStatement += getSettings().sListContentTable; - Sequence< ::rtl::OUString > aListSource(1); + Sequence< OUString > aListSource(1); aListSource[0] = sStatement; - getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSource"), makeAny(aListSource)); + getContext().xObjectModel->setPropertyValue(OUString("ListSource"), makeAny(aListSource)); } else { @@ -203,11 +203,11 @@ namespace dbp sStatement += getSettings().sListContentField; sStatement.AppendAscii(" FROM "); sStatement += getSettings().sListContentTable; - getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSource"), makeAny(::rtl::OUString(sStatement))); + getContext().xObjectModel->setPropertyValue(OUString("ListSource"), makeAny(OUString(sStatement))); } // the bound field - getContext().xObjectModel->setPropertyValue(::rtl::OUString("DataField"), makeAny(::rtl::OUString(getSettings().sLinkedFormField))); + getContext().xObjectModel->setPropertyValue(OUString("DataField"), makeAny(OUString(getSettings().sLinkedFormField))); } catch(const Exception&) { @@ -246,10 +246,10 @@ namespace dbp } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > OLCPage::getTableFields(sal_Bool _bNeedIt) + Sequence< OUString > OLCPage::getTableFields(sal_Bool _bNeedIt) { Reference< XNameAccess > xTables = getTables(_bNeedIt); - Sequence< ::rtl::OUString > aColumnNames; + Sequence< OUString > aColumnNames; if (xTables.is()) { try @@ -335,7 +335,7 @@ namespace dbp try { Reference< XNameAccess > xTables = getTables(sal_True); - Sequence< ::rtl::OUString > aTableNames; + Sequence< OUString > aTableNames; if (xTables.is()) aTableNames = xTables->getElementNames(); fillListBox(m_aSelectTable, aTableNames); diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index 8c9fc3ac0268..d2c6eb844dc7 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -97,7 +97,7 @@ namespace dbp protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getTables(sal_Bool _bNeedIt); - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getTableFields(sal_Bool _bNeedIt); }; diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index 10f7fac5e267..9e315a8d5811 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -109,7 +109,7 @@ namespace dbp ::com::sun::star::awt::Point aButtonPosition; aButtonPosition.X = aShapePosition.X + OFFSET; - ::rtl::OUString sElementsName("RadioGroup"); + OUString sElementsName("RadioGroup"); disambiguateName(Reference< XNameAccess >(_rContext.xForm, UNO_QUERY), sElementsName); StringArray::const_iterator aLabelIter = _rSettings.aLabels.begin(); @@ -119,28 +119,28 @@ namespace dbp aButtonPosition.Y = aShapePosition.Y + (i+1) * nTempHeight + nTopSpace; Reference< XPropertySet > xRadioModel( - xDocFactory->createInstance(::rtl::OUString("com.sun.star.form.component.RadioButton")), + xDocFactory->createInstance(OUString("com.sun.star.form.component.RadioButton")), UNO_QUERY); // the label - xRadioModel->setPropertyValue(::rtl::OUString("Label"), makeAny(rtl::OUString(*aLabelIter))); + xRadioModel->setPropertyValue(OUString("Label"), makeAny(OUString(*aLabelIter))); // the value - xRadioModel->setPropertyValue(::rtl::OUString("RefValue"), makeAny(rtl::OUString(*aValueIter))); + xRadioModel->setPropertyValue(OUString("RefValue"), makeAny(OUString(*aValueIter))); // default selection if (_rSettings.sDefaultField == *aLabelIter) - xRadioModel->setPropertyValue(::rtl::OUString("DefaultState"), makeAny(sal_Int16(1))); + xRadioModel->setPropertyValue(OUString("DefaultState"), makeAny(sal_Int16(1))); // the connection to the database field if (0 != _rSettings.sDBField.Len()) - xRadioModel->setPropertyValue(::rtl::OUString("DataField"), makeAny(::rtl::OUString(_rSettings.sDBField))); + xRadioModel->setPropertyValue(OUString("DataField"), makeAny(OUString(_rSettings.sDBField))); // the name for the model - xRadioModel->setPropertyValue(::rtl::OUString("Name"), makeAny(sElementsName)); + xRadioModel->setPropertyValue(OUString("Name"), makeAny(sElementsName)); // create a shape for the radio button Reference< XControlShape > xRadioShape( - xDocFactory->createInstance(::rtl::OUString("com.sun.star.drawing.ControlShape")), + xDocFactory->createInstance(OUString("com.sun.star.drawing.ControlShape")), UNO_QUERY); Reference< XPropertySet > xShapeProperties(xRadioShape, UNO_QUERY); @@ -155,7 +155,7 @@ namespace dbp // the name of the shape if (xShapeProperties.is()) - xShapeProperties->setPropertyValue(::rtl::OUString("Name"), makeAny(sElementsName)); + xShapeProperties->setPropertyValue(OUString("Name"), makeAny(sElementsName)); // add to the page xPageShapes->add(xRadioShape.get()); @@ -164,7 +164,7 @@ namespace dbp // set the GroupBox as "LabelControl" for the RadioButton // (_after_ having inserted the model into the page!) - xRadioModel->setPropertyValue(::rtl::OUString("LabelControl"), makeAny(_rContext.xObjectModel)); + xRadioModel->setPropertyValue(OUString("LabelControl"), makeAny(_rContext.xObjectModel)); } // group the shapes @@ -188,7 +188,7 @@ namespace dbp //--------------------------------------------------------------------- void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps) { - static const ::rtl::OUString s_sAnchorPropertyName("AnchorType"); + static const OUString s_sAnchorPropertyName("AnchorType"); Reference< XPropertySetInfo > xPropertyInfo; if (_rxShapeProps.is()) xPropertyInfo = _rxShapeProps->getPropertySetInfo(); diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index fc75e21b509a..477f7ab34aae 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -41,8 +41,8 @@ namespace dbp struct IServiceInfo { public: - ::rtl::OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OUString getImplementationName() const; + ::com::sun::star::uno::Sequence< OUString > getServiceNames() const; }; @@ -67,12 +67,12 @@ namespace dbp virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx index 6b77c7877571..19f76fdd087c 100644 --- a/extensions/source/dbpilots/wizardcontext.hxx +++ b/extensions/source/dbpilots/wizardcontext.hxx @@ -71,7 +71,7 @@ namespace dbp DECLARE_STL_USTRINGACCESS_MAP(sal_Int32,TNameTypeMap); TNameTypeMap aTypes; // the column names of the object the form is bound to (table, query or SQL statement) - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > aFieldNames; sal_Bool bEmbedded; diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index fae42c1fe260..c9cd98be6672 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -57,16 +57,16 @@ namespace dbp //= OGroupBoxSI //===================================================================== //--------------------------------------------------------------------- - ::rtl::OUString OGroupBoxSI::getImplementationName() const + OUString OGroupBoxSI::getImplementationName() const { - return ::rtl::OUString("org.openoffice.comp.dbp.OGroupBoxWizard"); + return OUString("org.openoffice.comp.dbp.OGroupBoxWizard"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > OGroupBoxSI::getServiceNames() const + Sequence< OUString > OGroupBoxSI::getServiceNames() const { - Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString("com.sun.star.sdb.GroupBoxAutoPilot"); + Sequence< OUString > aReturn(1); + aReturn[0] = OUString("com.sun.star.sdb.GroupBoxAutoPilot"); return aReturn; } @@ -74,16 +74,16 @@ namespace dbp //= OListComboSI //===================================================================== //--------------------------------------------------------------------- - ::rtl::OUString OListComboSI::getImplementationName() const + OUString OListComboSI::getImplementationName() const { - return ::rtl::OUString("org.openoffice.comp.dbp.OListComboWizard"); + return OUString("org.openoffice.comp.dbp.OListComboWizard"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > OListComboSI::getServiceNames() const + Sequence< OUString > OListComboSI::getServiceNames() const { - Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString("com.sun.star.sdb.ListComboBoxAutoPilot"); + Sequence< OUString > aReturn(1); + aReturn[0] = OUString("com.sun.star.sdb.ListComboBoxAutoPilot"); return aReturn; } @@ -91,16 +91,16 @@ namespace dbp //= OGridSI //===================================================================== //--------------------------------------------------------------------- - ::rtl::OUString OGridSI::getImplementationName() const + OUString OGridSI::getImplementationName() const { - return ::rtl::OUString("org.openoffice.comp.dbp.OGridWizard"); + return OUString("org.openoffice.comp.dbp.OGridWizard"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > OGridSI::getServiceNames() const + Sequence< OUString > OGridSI::getServiceNames() const { - Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString("com.sun.star.sdb.GridControlAutoPilot"); + Sequence< OUString > aReturn(1); + aReturn[0] = OUString("com.sun.star.sdb.GridControlAutoPilot"); return aReturn; } diff --git a/extensions/source/dbpilots/wizardservices.hxx b/extensions/source/dbpilots/wizardservices.hxx index 6d46207469ea..e952fbae61a6 100644 --- a/extensions/source/dbpilots/wizardservices.hxx +++ b/extensions/source/dbpilots/wizardservices.hxx @@ -35,8 +35,8 @@ namespace dbp struct OGroupBoxSI { public: - ::rtl::OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OUString getImplementationName() const; + ::com::sun::star::uno::Sequence< OUString > getServiceNames() const; }; @@ -47,8 +47,8 @@ namespace dbp struct OListComboSI { public: - ::rtl::OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OUString getImplementationName() const; + ::com::sun::star::uno::Sequence< OUString > getServiceNames() const; }; @@ -59,8 +59,8 @@ namespace dbp struct OGridSI { public: - ::rtl::OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OUString getImplementationName() const; + ::com::sun::star::uno::Sequence< OUString > getServiceNames() const; }; diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index a8ef1f858d6f..44ac1c8a6ae3 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -48,7 +48,7 @@ namespace COMPMOD_NAMESPACE { ResMgr* m_pResources; sal_Bool m_bInitialized; - rtl::OString m_sFilePrefix; + OString m_sFilePrefix; public: /// ctor @@ -57,7 +57,7 @@ namespace COMPMOD_NAMESPACE /// get the manager for the resources of the module ResMgr* getResManager(); - void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; } + void setResourceFilePrefix(const OString& _rPrefix) { m_sFilePrefix = _rPrefix; } }; //------------------------------------------------------------------------- @@ -84,7 +84,7 @@ namespace COMPMOD_NAMESPACE // create a manager with a fixed prefix m_pResources = ResMgr::CreateResMgr(m_sFilePrefix.getStr()); DBG_ASSERT(m_pResources, - rtl::OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ") + OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ") .append(m_sFilePrefix) .append(")!").getStr()); @@ -99,7 +99,7 @@ namespace COMPMOD_NAMESPACE ::osl::Mutex OModule::s_aMutex; sal_Int32 OModule::s_nClients = 0; OModuleImpl* OModule::s_pImpl = NULL; - ::rtl::OString OModule::s_sResPrefix; + OString OModule::s_sResPrefix; //------------------------------------------------------------------------- ResMgr* OModule::getResManager() { @@ -108,7 +108,7 @@ namespace COMPMOD_NAMESPACE } //------------------------------------------------------------------------- - void OModule::setResourceFilePrefix(const ::rtl::OString& _rPrefix) + void OModule::setResourceFilePrefix(const OString& _rPrefix) { ::osl::MutexGuard aGuard(s_aMutex); s_sResPrefix = _rPrefix; @@ -147,15 +147,15 @@ namespace COMPMOD_NAMESPACE //- registration helper //-------------------------------------------------------------------------- - Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL; - Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL; + Sequence< OUString >* OModule::s_pImplementationNames = NULL; + Sequence< Sequence< OUString > >* OModule::s_pSupportedServices = NULL; Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL; Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL; //-------------------------------------------------------------------------- void OModule::registerComponent( - const ::rtl::OUString& _rImplementationName, - const Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const Sequence< OUString >& _rServiceNames, ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction) { @@ -163,8 +163,8 @@ namespace COMPMOD_NAMESPACE { OSL_ENSURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers, "OModule::registerComponent : inconsistent state (the pointers (1)) !"); - s_pImplementationNames = new Sequence< ::rtl::OUString >; - s_pSupportedServices = new Sequence< Sequence< ::rtl::OUString > >; + s_pImplementationNames = new Sequence< OUString >; + s_pSupportedServices = new Sequence< Sequence< OUString > >; s_pCreationFunctionPointers = new Sequence< sal_Int64 >; s_pFactoryFunctionPointers = new Sequence< sal_Int64 >; } @@ -189,7 +189,7 @@ namespace COMPMOD_NAMESPACE } //-------------------------------------------------------------------------- - void OModule::revokeComponent(const ::rtl::OUString& _rImplementationName) + void OModule::revokeComponent(const OUString& _rImplementationName) { if (!s_pImplementationNames) { @@ -204,7 +204,7 @@ namespace COMPMOD_NAMESPACE "OModule::revokeComponent : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplNames = s_pImplementationNames->getConstArray(); + const OUString* pImplNames = s_pImplementationNames->getConstArray(); for (sal_Int32 i=0; iequals(_rImplementationName)) @@ -228,7 +228,7 @@ namespace COMPMOD_NAMESPACE //-------------------------------------------------------------------------- Reference< XInterface > OModule::getComponentFactory( - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const Reference< XMultiServiceFactory >& _rxServiceManager) { OSL_ENSURE(_rxServiceManager.is(), "OModule::getComponentFactory : invalid argument (service manager) !"); @@ -251,8 +251,8 @@ namespace COMPMOD_NAMESPACE sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray(); - const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray(); + const OUString* pImplName = s_pImplementationNames->getConstArray(); + const Sequence< OUString >* pServices = s_pSupportedServices->getConstArray(); const sal_Int64* pComponentFunction = s_pCreationFunctionPointers->getConstArray(); const sal_Int64* pFactoryFunction = s_pFactoryFunctionPointers->getConstArray(); diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index da972aca8db0..810b5ec07f88 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -47,9 +47,9 @@ namespace COMPMOD_NAMESPACE typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager, - const ::rtl::OUString & _rComponentName, + const OUString & _rComponentName, ::cppu::ComponentInstantiation _pCreateFunction, - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, + const ::com::sun::star::uno::Sequence< OUString > & _rServiceNames, rtl_ModuleCount* _pModuleCounter ); @@ -70,12 +70,12 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService static ::osl::Mutex s_aMutex; /// access safety static sal_Int32 s_nClients; /// number of registered clients static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered - static ::rtl::OString s_sResPrefix; + static OString s_sResPrefix; // auto registration administration - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >* s_pSupportedServices; static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; @@ -84,7 +84,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService public: // can be set as long as no resource has been accessed ... - static void setResourceFilePrefix(const ::rtl::OString& _rPrefix); + static void setResourceFilePrefix(const OString& _rPrefix); /// get the vcl res manager of the module static ResMgr* getResManager(); @@ -101,8 +101,8 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService @see revokeComponent */ static void registerComponent( - const ::rtl::OUString& _rImplementationName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction); @@ -111,7 +111,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService the implementation name of the component */ static void revokeComponent( - const ::rtl::OUString& _rImplementationName); + const OUString& _rImplementationName); /** creates a Factory for the component with the given implementation name.

      Usually used from within component_getFactory.

      @@ -123,7 +123,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService the XInterface access to a factory for the component */ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager ); @@ -173,8 +173,8 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService /** automatically registeres a multi instance component

      Assumed that the template argument has the three methods

        -
      • static ::rtl::OUString getImplementationName_Static()
      • -
      • static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()
      • +
      • static OUString getImplementationName_Static()
      • +
      • static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()
      • static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)
        • @@ -215,8 +215,8 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService /** automatically registeres a single instance component

        Assumed that the template argument has the three methods

          -
        • static ::rtl::OUString getImplementationName_Static()
        • -
        • static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()
        • +
        • static OUString getImplementationName_Static()
        • +
        • static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()
        • static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)
          • diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index fa28571f3723..58abbf8d6d42 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -86,8 +86,8 @@ namespace logging virtual void SAL_CALL setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException); // XLogHandler - virtual ::rtl::OUString SAL_CALL getEncoding() throw (RuntimeException); - virtual void SAL_CALL setEncoding( const ::rtl::OUString& _encoding ) throw (RuntimeException); + virtual OUString SAL_CALL getEncoding() throw (RuntimeException); + virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException); virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException); virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException); virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException); @@ -99,17 +99,17 @@ namespace logging virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); public: // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); public: @@ -173,16 +173,16 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ConsoleHandler::getEncoding() throw (RuntimeException) + OUString SAL_CALL ConsoleHandler::getEncoding() throw (RuntimeException) { MethodGuard aGuard( *this ); - ::rtl::OUString sEncoding; + OUString sEncoding; OSL_VERIFY( m_aHandlerHelper.getEncoding( sEncoding ) ); return sEncoding; } //-------------------------------------------------------------------- - void SAL_CALL ConsoleHandler::setEncoding( const ::rtl::OUString& _rEncoding ) throw (RuntimeException) + void SAL_CALL ConsoleHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException) { MethodGuard aGuard( *this ); OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) ); @@ -229,7 +229,7 @@ namespace logging { MethodGuard aGuard( *this ); - ::rtl::OString sEntry; + OString sEntry; if ( !m_aHandlerHelper.formatForPublishing( _rRecord, sEntry ) ) return sal_False; @@ -256,11 +256,11 @@ namespace logging } if ( _rArguments.getLength() != 1 ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); Sequence< NamedValue > aSettings; if ( !( _rArguments[0] >>= aSettings ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); // createWithSettings( [in] sequence< ::com::sun::star::beans::NamedValue > Settings ) ::comphelper::NamedValueCollection aTypedSettings( aSettings ); @@ -272,16 +272,16 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ConsoleHandler::getImplementationName() throw(RuntimeException) + OUString SAL_CALL ConsoleHandler::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL ConsoleHandler::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + ::sal_Bool SAL_CALL ConsoleHandler::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pServiceNames = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); + for ( const OUString* pServiceNames = aServiceNames.getConstArray(); pServiceNames != aServiceNames.getConstArray() + aServiceNames.getLength(); ++pServiceNames ) @@ -291,22 +291,22 @@ namespace logging } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ConsoleHandler::getImplementationName_static() + OUString SAL_CALL ConsoleHandler::getImplementationName_static() { - return ::rtl::OUString( "com.sun.star.comp.extensions.ConsoleHandler" ); + return OUString( "com.sun.star.comp.extensions.ConsoleHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static() + Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static() { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.ConsoleHandler" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "com.sun.star.logging.ConsoleHandler" ); return aServiceNames; } diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index eeae12a9adc2..19b2a2b2b692 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -57,11 +57,11 @@ namespace logging class CsvFormatter : public CsvFormatter_Base { public: - virtual ::rtl::OUString SAL_CALL formatMultiColumn(const Sequence< ::rtl::OUString>& column_data) throw (RuntimeException); + virtual OUString SAL_CALL formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException); // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > Create( const Reference< XComponentContext >& context ); protected: @@ -73,23 +73,23 @@ namespace logging virtual ::sal_Bool SAL_CALL getLogThread() throw (RuntimeException); virtual ::sal_Bool SAL_CALL getLogTimestamp() throw (RuntimeException); virtual ::sal_Bool SAL_CALL getLogSource() throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getColumnnames() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getColumnnames() throw (RuntimeException); virtual void SAL_CALL setLogEventNo( ::sal_Bool log_event_no ) throw (RuntimeException); virtual void SAL_CALL setLogThread( ::sal_Bool log_thread ) throw (RuntimeException); virtual void SAL_CALL setLogTimestamp( ::sal_Bool log_timestamp ) throw (RuntimeException); virtual void SAL_CALL setLogSource( ::sal_Bool log_source ) throw (RuntimeException); - virtual void SAL_CALL setColumnnames( const Sequence< ::rtl::OUString>& column_names) throw (RuntimeException); + virtual void SAL_CALL setColumnnames( const Sequence< OUString>& column_names) throw (RuntimeException); // XLogFormatter - virtual ::rtl::OUString SAL_CALL getHead( ) throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL getTail( ) throw (RuntimeException); + virtual OUString SAL_CALL getHead( ) throw (RuntimeException); + virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException); + virtual OUString SAL_CALL getTail( ) throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& service_name ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& service_name ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); private: ::comphelper::ComponentContext m_aContext; @@ -98,20 +98,20 @@ namespace logging ::sal_Bool m_LogTimestamp; ::sal_Bool m_LogSource; ::sal_Bool m_MultiColumn; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_Columnnames; + ::com::sun::star::uno::Sequence< OUString > m_Columnnames; }; } // namespace logging //= private helpers namespace { - const sal_Unicode quote_char = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")).toChar(); - const sal_Unicode comma_char = ::rtl::OUString(",").toChar(); - const ::rtl::OUString dos_newline = ::rtl::OUString("\r\n"); + const sal_Unicode quote_char = OUString(RTL_CONSTASCII_USTRINGPARAM("\"")).toChar(); + const sal_Unicode comma_char = OUString(",").toChar(); + const OUString dos_newline = OUString("\r\n"); - inline bool needsQuoting(const ::rtl::OUString& str) + inline bool needsQuoting(const OUString& str) { - static const ::rtl::OUString quote_trigger_chars = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("\",\n\r")); + static const OUString quote_trigger_chars = OUString( RTL_CONSTASCII_USTRINGPARAM("\",\n\r")); sal_Int32 len = str.getLength(); for(sal_Int32 i=0; i initialColumns() + ::com::sun::star::uno::Sequence< OUString> initialColumns() { - com::sun::star::uno::Sequence< ::rtl::OUString> result = ::com::sun::star::uno::Sequence< ::rtl::OUString>(1); - result[0] = ::rtl::OUString("message"); + com::sun::star::uno::Sequence< OUString> result = ::com::sun::star::uno::Sequence< OUString>(1); + result[0] = OUString("message"); return result; }; } @@ -189,7 +189,7 @@ namespace logging return m_LogSource; } - Sequence< ::rtl::OUString > CsvFormatter::getColumnnames() throw (RuntimeException) + Sequence< OUString > CsvFormatter::getColumnnames() throw (RuntimeException) { return m_Columnnames; } @@ -214,15 +214,15 @@ namespace logging m_LogSource = log_source; } - void CsvFormatter::setColumnnames(const Sequence< ::rtl::OUString >& columnnames) throw (RuntimeException) + void CsvFormatter::setColumnnames(const Sequence< OUString >& columnnames) throw (RuntimeException) { - m_Columnnames = Sequence< ::rtl::OUString>(columnnames); + m_Columnnames = Sequence< OUString>(columnnames); m_MultiColumn = (m_Columnnames.getLength()>1); } - ::rtl::OUString SAL_CALL CsvFormatter::getHead( ) throw (RuntimeException) + OUString SAL_CALL CsvFormatter::getHead( ) throw (RuntimeException) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if(m_LogEventNo) buf.appendAscii("event no,"); if(m_LogThread) @@ -242,9 +242,9 @@ namespace logging return buf.makeStringAndClear(); } - ::rtl::OUString SAL_CALL CsvFormatter::format( const LogRecord& record ) throw (RuntimeException) + OUString SAL_CALL CsvFormatter::format( const LogRecord& record ) throw (RuntimeException) { - ::rtl::OUStringBuffer aLogEntry; + OUStringBuffer aLogEntry; if(m_LogEventNo) { @@ -297,15 +297,15 @@ namespace logging return aLogEntry.makeStringAndClear(); } - ::rtl::OUString SAL_CALL CsvFormatter::getTail( ) throw (RuntimeException) + OUString SAL_CALL CsvFormatter::getTail( ) throw (RuntimeException) { - return ::rtl::OUString(); + return OUString(); } - ::rtl::OUString SAL_CALL CsvFormatter::formatMultiColumn(const Sequence< ::rtl::OUString>& column_data) throw (RuntimeException) + OUString SAL_CALL CsvFormatter::formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException) { sal_Int32 columns = column_data.getLength(); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; for(int i=0; i aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pServiceNames = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); + for ( const OUString* pServiceNames = aServiceNames.getConstArray(); pServiceNames != aServiceNames.getConstArray() + aServiceNames.getLength(); ++pServiceNames ) @@ -327,25 +327,25 @@ namespace logging return sal_False; } - ::rtl::OUString SAL_CALL CsvFormatter::getImplementationName() throw(RuntimeException) + OUString SAL_CALL CsvFormatter::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } - Sequence< ::rtl::OUString > SAL_CALL CsvFormatter::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL CsvFormatter::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } - ::rtl::OUString SAL_CALL CsvFormatter::getImplementationName_static() + OUString SAL_CALL CsvFormatter::getImplementationName_static() { - return ::rtl::OUString( "com.sun.star.comp.extensions.CsvFormatter" ); + return OUString( "com.sun.star.comp.extensions.CsvFormatter" ); } - Sequence< ::rtl::OUString > SAL_CALL CsvFormatter::getSupportedServiceNames_static() + Sequence< OUString > SAL_CALL CsvFormatter::getSupportedServiceNames_static() { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.CsvFormatter" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "com.sun.star.logging.CsvFormatter" ); return aServiceNames; } diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index d0f176915635..f4df55a03a80 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -92,7 +92,7 @@ namespace logging private: ::comphelper::ComponentContext m_aContext; LogHandlerHelper m_aHandlerHelper; - ::rtl::OUString m_sFileURL; + OUString m_sFileURL; ::std::auto_ptr< ::osl::File > m_pFile; FileValidity m_eFileValidity; @@ -101,8 +101,8 @@ namespace logging virtual ~FileHandler(); // XLogHandler - virtual ::rtl::OUString SAL_CALL getEncoding() throw (RuntimeException); - virtual void SAL_CALL setEncoding( const ::rtl::OUString& _encoding ) throw (RuntimeException); + virtual OUString SAL_CALL getEncoding() throw (RuntimeException); + virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException); virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException); virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException); virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException); @@ -114,17 +114,17 @@ namespace logging virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); public: // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); public: @@ -138,11 +138,11 @@ namespace logging bool impl_prepareFile_nothrow(); /// writes the given string to our file - void impl_writeString_nothrow( const ::rtl::OString& _rEntry ); + void impl_writeString_nothrow( const OString& _rEntry ); /** does string substitution on a (usually externally provided) file url */ - void impl_doStringsubstitution_nothrow( ::rtl::OUString& _inout_rURL ); + void impl_doStringsubstitution_nothrow( OUString& _inout_rURL ); }; //==================================================================== @@ -189,10 +189,10 @@ namespace logging #if OSL_DEBUG_LEVEL > 0 if ( m_eFileValidity == eInvalid ) { - ::rtl::OStringBuffer sMessage; + OStringBuffer sMessage; sMessage.append( "FileHandler::impl_prepareFile_nothrow: could not open the designated log file:" ); sMessage.append( "\nURL: " ); - sMessage.append( ::rtl::OString( m_sFileURL.getStr(), m_sFileURL.getLength(), osl_getThreadTextEncoding() ) ); + sMessage.append( OString( m_sFileURL.getStr(), m_sFileURL.getLength(), osl_getThreadTextEncoding() ) ); sMessage.append( "\nerror code: " ); sMessage.append( (sal_Int32)res ); OSL_FAIL( sMessage.makeStringAndClear().getStr() ); @@ -200,7 +200,7 @@ namespace logging #endif if ( m_eFileValidity == eValid ) { - ::rtl::OString sHead; + OString sHead; if ( m_aHandlerHelper.getEncodedHead( sHead ) ) impl_writeString_nothrow( sHead ); } @@ -210,7 +210,7 @@ namespace logging } //-------------------------------------------------------------------- - void FileHandler::impl_writeString_nothrow( const ::rtl::OString& _rEntry ) + void FileHandler::impl_writeString_nothrow( const OString& _rEntry ) { OSL_PRECOND( m_pFile.get(), "FileHandler::impl_writeString_nothrow: no file!" ); @@ -225,7 +225,7 @@ namespace logging } //-------------------------------------------------------------------- - void FileHandler::impl_doStringsubstitution_nothrow( ::rtl::OUString& _inout_rURL ) + void FileHandler::impl_doStringsubstitution_nothrow( OUString& _inout_rURL ) { try { @@ -243,7 +243,7 @@ namespace logging { if ( m_eFileValidity == eValid ) { - ::rtl::OString sTail; + OString sTail; if ( m_aHandlerHelper.getEncodedTail( sTail ) ) impl_writeString_nothrow( sTail ); } @@ -265,16 +265,16 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL FileHandler::getEncoding() throw (RuntimeException) + OUString SAL_CALL FileHandler::getEncoding() throw (RuntimeException) { MethodGuard aGuard( *this ); - ::rtl::OUString sEncoding; + OUString sEncoding; OSL_VERIFY( m_aHandlerHelper.getEncoding( sEncoding ) ); return sEncoding; } //-------------------------------------------------------------------- - void SAL_CALL FileHandler::setEncoding( const ::rtl::OUString& _rEncoding ) throw (RuntimeException) + void SAL_CALL FileHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException) { MethodGuard aGuard( *this ); OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) ); @@ -332,7 +332,7 @@ namespace logging if ( !impl_prepareFile_nothrow() ) return sal_False; - ::rtl::OString sEntry; + OString sEntry; if ( !m_aHandlerHelper.formatForPublishing( _rRecord, sEntry ) ) return sal_False; @@ -349,7 +349,7 @@ namespace logging throw AlreadyInitializedException(); if ( _rArguments.getLength() != 1 ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); Sequence< NamedValue > aSettings; if ( _rArguments[0] >>= m_sFileURL ) @@ -367,22 +367,22 @@ namespace logging impl_doStringsubstitution_nothrow( m_sFileURL ); } else - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); m_aHandlerHelper.setIsInitialized(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL FileHandler::getImplementationName() throw(RuntimeException) + OUString SAL_CALL FileHandler::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL FileHandler::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + ::sal_Bool SAL_CALL FileHandler::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pServiceNames = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); + for ( const OUString* pServiceNames = aServiceNames.getConstArray(); pServiceNames != aServiceNames.getConstArray() + aServiceNames.getLength(); ++pServiceNames ) @@ -392,22 +392,22 @@ namespace logging } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FileHandler::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL FileHandler::getImplementationName_static() + OUString SAL_CALL FileHandler::getImplementationName_static() { - return ::rtl::OUString( "com.sun.star.comp.extensions.FileHandler" ); + return OUString( "com.sun.star.comp.extensions.FileHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FileHandler::getSupportedServiceNames_static() + Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames_static() { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.FileHandler" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "com.sun.star.logging.FileHandler" ); return aServiceNames; } diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index 69b4a756cba2..dc82f16ba00d 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -66,10 +66,10 @@ namespace logging //==================================================================== namespace { - sal_Bool lcl_supportsService_nothrow( XServiceInfo& _rSI, const ::rtl::OUString& _rServiceName ) + sal_Bool lcl_supportsService_nothrow( XServiceInfo& _rSI, const OUString& _rServiceName ) { - const Sequence< ::rtl::OUString > aServiceNames( _rSI.getSupportedServiceNames() ); - for ( const ::rtl::OUString* pServiceNames = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( _rSI.getSupportedServiceNames() ); + for ( const OUString* pServiceNames = aServiceNames.getConstArray(); pServiceNames != aServiceNames.getConstArray() + aServiceNames.getLength(); ++pServiceNames ) @@ -95,26 +95,26 @@ namespace logging // sal_Int32 m_nLogLevel; - ::rtl::OUString m_sName; + OUString m_sName; // public: - EventLogger( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rName ); + EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); // XLogger - virtual ::rtl::OUString SAL_CALL getName() throw (RuntimeException); + virtual OUString SAL_CALL getName() throw (RuntimeException); virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException); virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException); virtual void SAL_CALL addLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException); virtual void SAL_CALL removeLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException); virtual ::sal_Bool SAL_CALL isLoggable( ::sal_Int32 _nLevel ) throw (RuntimeException); - virtual void SAL_CALL log( ::sal_Int32 Level, const ::rtl::OUString& Message ) throw (RuntimeException); - virtual void SAL_CALL logp( ::sal_Int32 Level, const ::rtl::OUString& SourceClass, const ::rtl::OUString& SourceMethod, const ::rtl::OUString& Message ) throw (RuntimeException); + virtual void SAL_CALL log( ::sal_Int32 Level, const OUString& Message ) throw (RuntimeException); + virtual void SAL_CALL logp( ::sal_Int32 Level, const OUString& SourceClass, const OUString& SourceMethod, const OUString& Message ) throw (RuntimeException); protected: ~EventLogger(); @@ -141,7 +141,7 @@ namespace logging class LoggerPool : public LoggerPool_Base { private: - typedef ::std::map< ::rtl::OUString, WeakReference< XLogger > > ImplPool; + typedef ::std::map< OUString, WeakReference< XLogger > > ImplPool; private: ::osl::Mutex m_aMutex; @@ -152,18 +152,18 @@ namespace logging LoggerPool( const Reference< XComponentContext >& _rxContext ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); // helper for factories - static Sequence< ::rtl::OUString > getSupportedServiceNames_static(); - static ::rtl::OUString getImplementationName_static(); - static ::rtl::OUString getSingletonName_static(); + static Sequence< OUString > getSupportedServiceNames_static(); + static OUString getImplementationName_static(); + static OUString getSingletonName_static(); static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); // XLoggerPool - virtual Reference< XLogger > SAL_CALL getNamedLogger( const ::rtl::OUString& Name ) throw (RuntimeException); + virtual Reference< XLogger > SAL_CALL getNamedLogger( const OUString& Name ) throw (RuntimeException); virtual Reference< XLogger > SAL_CALL getDefaultLogger( ) throw (RuntimeException); }; @@ -171,7 +171,7 @@ namespace logging //= EventLogger - implementation //==================================================================== //-------------------------------------------------------------------- - EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rName ) + EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName ) :m_aContext( _rxContext ) ,m_aHandlers( m_aMutex ) ,m_nEventNumber( 0 ) @@ -217,7 +217,7 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EventLogger::getName() throw (RuntimeException) + OUString SAL_CALL EventLogger::getName() throw (RuntimeException) { return m_sName; } @@ -258,7 +258,7 @@ namespace logging } //-------------------------------------------------------------------- - void SAL_CALL EventLogger::log( ::sal_Int32 _nLevel, const ::rtl::OUString& _rMessage ) throw (RuntimeException) + void SAL_CALL EventLogger::log( ::sal_Int32 _nLevel, const OUString& _rMessage ) throw (RuntimeException) { impl_ts_logEvent_nothrow( createLogRecord( m_sName, @@ -269,7 +269,7 @@ namespace logging } //-------------------------------------------------------------------- - void SAL_CALL EventLogger::logp( ::sal_Int32 _nLevel, const ::rtl::OUString& _rSourceClass, const ::rtl::OUString& _rSourceMethod, const ::rtl::OUString& _rMessage ) throw (RuntimeException) + void SAL_CALL EventLogger::logp( ::sal_Int32 _nLevel, const OUString& _rSourceClass, const OUString& _rSourceMethod, const OUString& _rMessage ) throw (RuntimeException) { impl_ts_logEvent_nothrow( createLogRecord( m_sName, @@ -282,22 +282,22 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EventLogger::getImplementationName() throw(RuntimeException) + OUString SAL_CALL EventLogger::getImplementationName() throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EventLogger" ); + return OUString( "com.sun.star.comp.extensions.EventLogger" ); } //-------------------------------------------------------------------- - ::sal_Bool EventLogger::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + ::sal_Bool EventLogger::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { return lcl_supportsService_nothrow( *this, _rServiceName ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventLogger::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL EventLogger::getSupportedServiceNames() throw(RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.Logger" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "com.sun.star.logging.Logger" ); return aServiceNames; } @@ -311,41 +311,41 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL LoggerPool::getImplementationName() throw(RuntimeException) + OUString SAL_CALL LoggerPool::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL LoggerPool::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + ::sal_Bool SAL_CALL LoggerPool::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { return lcl_supportsService_nothrow( *this, _rServiceName ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL LoggerPool::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL LoggerPool::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL LoggerPool::getImplementationName_static() + OUString SAL_CALL LoggerPool::getImplementationName_static() { - return ::rtl::OUString( "com.sun.star.comp.extensions.LoggerPool" ); + return OUString( "com.sun.star.comp.extensions.LoggerPool" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL LoggerPool::getSupportedServiceNames_static() + Sequence< OUString > SAL_CALL LoggerPool::getSupportedServiceNames_static() { - Sequence< ::rtl::OUString > aServiceNames(1); + Sequence< OUString > aServiceNames(1); aServiceNames[0] = getSingletonName_static(); return aServiceNames; } //-------------------------------------------------------------------- - ::rtl::OUString LoggerPool::getSingletonName_static() + OUString LoggerPool::getSingletonName_static() { - return ::rtl::OUString( "com.sun.star.logging.LoggerPool" ); + return OUString( "com.sun.star.logging.LoggerPool" ); } //-------------------------------------------------------------------- @@ -355,7 +355,7 @@ namespace logging } //-------------------------------------------------------------------- - Reference< XLogger > SAL_CALL LoggerPool::getNamedLogger( const ::rtl::OUString& _rName ) throw (RuntimeException) + Reference< XLogger > SAL_CALL LoggerPool::getNamedLogger( const OUString& _rName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -374,7 +374,7 @@ namespace logging //-------------------------------------------------------------------- Reference< XLogger > SAL_CALL LoggerPool::getDefaultLogger( ) throw (RuntimeException) { - return getNamedLogger( ::rtl::OUString( "org.openoffice.logging.DefaultLogger" ) ); + return getNamedLogger( OUString( "org.openoffice.logging.DefaultLogger" ) ); } //-------------------------------------------------------------------- diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 7f80ebaac172..af0fac9efa03 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -71,20 +71,20 @@ namespace logging namespace { //---------------------------------------------------------------- - typedef void (*SettingTranslation)( const Reference< XLogger >&, const ::rtl::OUString&, Any& ); + typedef void (*SettingTranslation)( const Reference< XLogger >&, const OUString&, Any& ); //---------------------------------------------------------------- - void lcl_substituteFileHandlerURLVariables_nothrow( const Reference< XLogger >& _rxLogger, ::rtl::OUString& _inout_rFileURL ) + void lcl_substituteFileHandlerURLVariables_nothrow( const Reference< XLogger >& _rxLogger, OUString& _inout_rFileURL ) { struct Variable { const sal_Char* pVariablePattern; const sal_Int32 nPatternLength; rtl_TextEncoding eEncoding; - const ::rtl::OUString sVariableValue; + const OUString sVariableValue; Variable( const sal_Char* _pVariablePattern, const sal_Int32 _nPatternLength, rtl_TextEncoding _eEncoding, - const ::rtl::OUString& _rVariableValue ) + const OUString& _rVariableValue ) :pVariablePattern( _pVariablePattern ) ,nPatternLength( _nPatternLength ) ,eEncoding( _eEncoding ) @@ -93,7 +93,7 @@ namespace logging } }; - ::rtl::OUString sLoggerName; + OUString sLoggerName; try { sLoggerName = _rxLogger->getName(); } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } @@ -104,7 +104,7 @@ namespace logging for ( size_t i = 0; i < SAL_N_ELEMENTS( aVariables ); ++i ) { - ::rtl::OUString sPattern( aVariables[i].pVariablePattern, aVariables[i].nPatternLength, aVariables[i].eEncoding ); + OUString sPattern( aVariables[i].pVariablePattern, aVariables[i].nPatternLength, aVariables[i].eEncoding ); sal_Int32 nVariableIndex = _inout_rFileURL.indexOf( sPattern ); if ( ( nVariableIndex == 0 ) || ( ( nVariableIndex > 0 ) @@ -119,13 +119,13 @@ namespace logging } //---------------------------------------------------------------- - void lcl_transformFileHandlerSettings_nothrow( const Reference< XLogger >& _rxLogger, const ::rtl::OUString& _rSettingName, Any& _inout_rSettingValue ) + void lcl_transformFileHandlerSettings_nothrow( const Reference< XLogger >& _rxLogger, const OUString& _rSettingName, Any& _inout_rSettingValue ) { if ( _rSettingName != "FileURL" ) // not interested in this setting return; - ::rtl::OUString sURL; + OUString sURL; OSL_VERIFY( _inout_rSettingValue >>= sURL ); lcl_substituteFileHandlerURLVariables_nothrow( _rxLogger, sURL ); _inout_rSettingValue <<= sURL; @@ -145,15 +145,15 @@ namespace logging // read the settings for the to-be-created service Reference< XNameAccess > xServiceSettingsNode( _rxLoggerSettings->getByName( - ::rtl::OUString::createFromAscii( _pServiceSettingsAsciiNodeName ) ), UNO_QUERY_THROW ); + OUString::createFromAscii( _pServiceSettingsAsciiNodeName ) ), UNO_QUERY_THROW ); - Sequence< ::rtl::OUString > aSettingNames( xServiceSettingsNode->getElementNames() ); + Sequence< OUString > aSettingNames( xServiceSettingsNode->getElementNames() ); size_t nServiceSettingCount( aSettingNames.getLength() ); Sequence< NamedValue > aSettings( nServiceSettingCount ); if ( nServiceSettingCount ) { - const ::rtl::OUString* pSettingNames = aSettingNames.getConstArray(); - const ::rtl::OUString* pSettingNamesEnd = aSettingNames.getConstArray() + aSettingNames.getLength(); + const OUString* pSettingNames = aSettingNames.getConstArray(); + const OUString* pSettingNamesEnd = aSettingNames.getConstArray() + aSettingNames.getLength(); NamedValue* pSetting = aSettings.getArray(); for ( ; @@ -169,8 +169,8 @@ namespace logging } } - ::rtl::OUString sServiceName; - _rxLoggerSettings->getByName( ::rtl::OUString::createFromAscii( _pServiceNameAsciiNodeName ) ) >>= sServiceName; + OUString sServiceName; + _rxLoggerSettings->getByName( OUString::createFromAscii( _pServiceNameAsciiNodeName ) ) >>= sServiceName; if ( !sServiceName.isEmpty() ) { bool bSuccess = false; @@ -208,15 +208,15 @@ namespace logging // write access to the "Settings" node (which includes settings for all loggers) Sequence< Any > aArguments(1); aArguments[0] <<= NamedValue( - ::rtl::OUString( "nodepath" ), - makeAny( ::rtl::OUString( "/org.openoffice.Office.Logging/Settings" ) ) + OUString( "nodepath" ), + makeAny( OUString( "/org.openoffice.Office.Logging/Settings" ) ) ); Reference< XNameContainer > xAllSettings( xConfigProvider->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ), + OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ), aArguments ), UNO_QUERY_THROW ); - ::rtl::OUString sLoggerName( _rxLogger->getName() ); + OUString sLoggerName( _rxLogger->getName() ); if ( !xAllSettings->hasByName( sLoggerName ) ) { // no node yet for this logger. Create default settings. @@ -232,7 +232,7 @@ namespace logging // the log level sal_Int32 nLogLevel( LogLevel::OFF ); - OSL_VERIFY( xLoggerSettings->getByName( ::rtl::OUString( "LogLevel" ) ) >>= nLogLevel ); + OSL_VERIFY( xLoggerSettings->getByName( OUString( "LogLevel" ) ) >>= nLogLevel ); _rxLogger->setLevel( nLogLevel ); // the default handler, if any diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index 6aab561caec5..7acb576c8b5e 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -65,7 +65,7 @@ namespace logging //-------------------------------------------------------------------- void LogHandlerHelper::initFromSettings( const ::comphelper::NamedValueCollection& _rSettings ) { - ::rtl::OUString sEncoding; + OUString sEncoding; if ( _rSettings.get_ensureType( "Encoding", sEncoding ) ) { if ( !setEncoding( sEncoding ) ) @@ -82,10 +82,10 @@ namespace logging m_rMutex.acquire(); if ( !getIsInitialized() ) - throw DisposedException( ::rtl::OUString( "component not initialized" ), NULL ); + throw DisposedException( OUString( "component not initialized" ), NULL ); if ( m_rBHelper.bDisposed ) - throw DisposedException( ::rtl::OUString( "component already disposed" ), NULL ); + throw DisposedException( OUString( "component already disposed" ), NULL ); // fallback settings, in case they weren't passed at construction time if ( !getFormatter().is() ) @@ -103,22 +103,22 @@ namespace logging } //-------------------------------------------------------------------- - bool LogHandlerHelper::getEncoding( ::rtl::OUString& _out_rEncoding ) const + bool LogHandlerHelper::getEncoding( OUString& _out_rEncoding ) const { const char* pMimeCharset = rtl_getMimeCharsetFromTextEncoding( m_eEncoding ); if ( pMimeCharset ) { - _out_rEncoding = ::rtl::OUString::createFromAscii( pMimeCharset ); + _out_rEncoding = OUString::createFromAscii( pMimeCharset ); return true; } - _out_rEncoding = ::rtl::OUString(); + _out_rEncoding = OUString(); return false; } //-------------------------------------------------------------------- - bool LogHandlerHelper::setEncoding( const ::rtl::OUString& _rEncoding ) + bool LogHandlerHelper::setEncoding( const OUString& _rEncoding ) { - ::rtl::OString sAsciiEncoding( ::rtl::OUStringToOString( _rEncoding, RTL_TEXTENCODING_ASCII_US ) ); + OString sAsciiEncoding( OUStringToOString( _rEncoding, RTL_TEXTENCODING_ASCII_US ) ); rtl_TextEncoding eEncoding = rtl_getTextEncodingFromMimeCharset( sAsciiEncoding.getStr() ); if ( eEncoding != RTL_TEXTENCODING_DONTKNOW ) { @@ -129,7 +129,7 @@ namespace logging } //-------------------------------------------------------------------- - bool LogHandlerHelper::formatForPublishing( const LogRecord& _rRecord, ::rtl::OString& _out_rEntry ) const + bool LogHandlerHelper::formatForPublishing( const LogRecord& _rRecord, OString& _out_rEntry ) const { if ( _rRecord.Level < getLevel() ) // not to be published due to low level @@ -138,8 +138,8 @@ namespace logging try { Reference< XLogFormatter > xFormatter( getFormatter(), UNO_QUERY_THROW ); - ::rtl::OUString sEntry( xFormatter->format( _rRecord ) ); - _out_rEntry = ::rtl::OUStringToOString( sEntry, getTextEncoding() ); + OUString sEntry( xFormatter->format( _rRecord ) ); + _out_rEntry = OUStringToOString( sEntry, getTextEncoding() ); return true; } catch( const Exception& ) @@ -150,13 +150,13 @@ namespace logging } //-------------------------------------------------------------------- - bool LogHandlerHelper::getEncodedHead( ::rtl::OString& _out_rHead ) const + bool LogHandlerHelper::getEncodedHead( OString& _out_rHead ) const { try { Reference< XLogFormatter > xFormatter( getFormatter(), UNO_QUERY_THROW ); - ::rtl::OUString sHead( xFormatter->getHead() ); - _out_rHead = ::rtl::OUStringToOString( sHead, getTextEncoding() ); + OUString sHead( xFormatter->getHead() ); + _out_rHead = OUStringToOString( sHead, getTextEncoding() ); return true; } catch( const Exception& ) @@ -167,13 +167,13 @@ namespace logging } //-------------------------------------------------------------------- - bool LogHandlerHelper::getEncodedTail( ::rtl::OString& _out_rTail ) const + bool LogHandlerHelper::getEncodedTail( OString& _out_rTail ) const { try { Reference< XLogFormatter > xFormatter( getFormatter(), UNO_QUERY_THROW ); - ::rtl::OUString sTail( xFormatter->getTail() ); - _out_rTail = ::rtl::OUStringToOString( sTail, getTextEncoding() ); + OUString sTail( xFormatter->getTail() ); + _out_rTail = OUStringToOString( sTail, getTextEncoding() ); return true; } catch( const Exception& ) diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx index fa3d0edeedcf..d2d2a4936b7e 100644 --- a/extensions/source/logging/loghandler.hxx +++ b/extensions/source/logging/loghandler.hxx @@ -63,8 +63,8 @@ namespace logging bool getIsInitialized() const { return m_bInitialized; } void setIsInitialized() { m_bInitialized = true; } - bool getEncoding( ::rtl::OUString& _out_rEncoding ) const; - bool setEncoding( const ::rtl::OUString& _rEncoding ); + bool getEncoding( OUString& _out_rEncoding ) const; + bool setEncoding( const OUString& _rEncoding ); inline rtl_TextEncoding getTextEncoding() const { return m_eEncoding; } @@ -108,19 +108,19 @@ namespace logging Finally, the unicode string is encoded into a byte string, using our encoding setting. Then, is returned. */ - bool formatForPublishing( const ::com::sun::star::logging::LogRecord& _rRecord, ::rtl::OString& _out_rEntry ) const; + bool formatForPublishing( const ::com::sun::star::logging::LogRecord& _rRecord, OString& _out_rEntry ) const; /** retrieves our formatter's heading, encoded with our encoding @return in case of success, if any error occurred */ - bool getEncodedHead( ::rtl::OString& _out_rHead ) const; + bool getEncodedHead( OString& _out_rHead ) const; /** retrieves our formatter's tail, encoded with our encoding @return in case of success, if any error occurred */ - bool getEncodedTail( ::rtl::OString& _out_rTail ) const; + bool getEncodedTail( OString& _out_rTail ) const; /** initializes the instance from a collection of named settings diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx index d01770a3d503..ce9c8ba8d036 100644 --- a/extensions/source/logging/logrecord.cxx +++ b/extensions/source/logging/logrecord.cxx @@ -43,16 +43,16 @@ namespace logging We need a way to retrieve the current UNO thread ID as string, which is issue #i77342# */ - ::rtl::OUString getCurrentThreadID() + OUString getCurrentThreadID() { oslThreadIdentifier nThreadID( osl_getThreadIdentifier( NULL ) ); - return ::rtl::OUString::valueOf( (sal_Int64)nThreadID ); + return OUString::valueOf( (sal_Int64)nThreadID ); } } //-------------------------------------------------------------------- - LogRecord createLogRecord( const ::rtl::OUString& _rLoggerName, const ::rtl::OUString& _rClassName, - const ::rtl::OUString& _rMethodName, const ::rtl::OUString& _rMessage, + LogRecord createLogRecord( const OUString& _rLoggerName, const OUString& _rClassName, + const OUString& _rMethodName, const OUString& _rMessage, sal_Int32 _nLogLevel, oslInterlockedCount _nEventNumber ) { TimeValue aTimeValue; diff --git a/extensions/source/logging/logrecord.hxx b/extensions/source/logging/logrecord.hxx index 85962d19a594..772969371077 100644 --- a/extensions/source/logging/logrecord.hxx +++ b/extensions/source/logging/logrecord.hxx @@ -33,22 +33,22 @@ namespace logging //= helper //==================================================================== ::com::sun::star::logging::LogRecord createLogRecord( - const ::rtl::OUString& _rLoggerName, - const ::rtl::OUString& _rClassName, - const ::rtl::OUString& _rMethodName, - const ::rtl::OUString& _rMessage, + const OUString& _rLoggerName, + const OUString& _rClassName, + const OUString& _rMethodName, + const OUString& _rMessage, sal_Int32 _nLogLevel, oslInterlockedCount _nEventNumber ); inline ::com::sun::star::logging::LogRecord createLogRecord( - const ::rtl::OUString& _rLoggerName, - const ::rtl::OUString& _rMessage, + const OUString& _rLoggerName, + const OUString& _rMessage, sal_Int32 _nLogLevel, oslInterlockedCount _nEventNumber ) { - return createLogRecord( _rLoggerName, ::rtl::OUString(), ::rtl::OUString(), _rMessage, _nLogLevel, _nEventNumber ); + return createLogRecord( _rLoggerName, OUString(), OUString(), _rMessage, _nLogLevel, _nEventNumber ); } //........................................................................ diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx index b03dfd715b9c..7396263b8a24 100644 --- a/extensions/source/logging/plaintextformatter.cxx +++ b/extensions/source/logging/plaintextformatter.cxx @@ -64,19 +64,19 @@ namespace logging virtual ~PlainTextFormatter(); // XLogFormatter - virtual ::rtl::OUString SAL_CALL getHead( ) throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL getTail( ) throw (RuntimeException); + virtual OUString SAL_CALL getHead( ) throw (RuntimeException); + virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException); + virtual OUString SAL_CALL getTail( ) throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); public: // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); }; @@ -95,9 +95,9 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL PlainTextFormatter::getHead( ) throw (RuntimeException) + OUString SAL_CALL PlainTextFormatter::getHead( ) throw (RuntimeException) { - ::rtl::OUStringBuffer aHeader; + OUStringBuffer aHeader; aHeader.appendAscii( " event no" ); // column 1: the event number aHeader.appendAscii( " " ); aHeader.appendAscii( "thread " ); // column 2: the thread ID @@ -112,7 +112,7 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord ) throw (RuntimeException) + OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord ) throw (RuntimeException) { char buffer[ 30 ]; const int buffer_size = sizeof( buffer ); @@ -120,11 +120,11 @@ namespace logging if ( used >= buffer_size || used < 0 ) buffer[ buffer_size - 1 ] = 0; - ::rtl::OUStringBuffer aLogEntry; + OUStringBuffer aLogEntry; aLogEntry.appendAscii( buffer ); aLogEntry.appendAscii( " " ); - ::rtl::OString sThreadID( ::rtl::OUStringToOString( _rRecord.ThreadID, osl_getThreadTextEncoding() ) ); + OString sThreadID( OUStringToOString( _rRecord.ThreadID, osl_getThreadTextEncoding() ) ); snprintf( buffer, buffer_size, "%8s", sThreadID.getStr() ); aLogEntry.appendAscii( buffer ); aLogEntry.appendAscii( " " ); @@ -150,17 +150,17 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL PlainTextFormatter::getTail( ) throw (RuntimeException) + OUString SAL_CALL PlainTextFormatter::getTail( ) throw (RuntimeException) { // no tail - return ::rtl::OUString(); + return OUString(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PlainTextFormatter::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + ::sal_Bool SAL_CALL PlainTextFormatter::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pServiceNames = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); + for ( const OUString* pServiceNames = aServiceNames.getConstArray(); pServiceNames != aServiceNames.getConstArray() + aServiceNames.getLength(); ++pServiceNames ) @@ -170,28 +170,28 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL PlainTextFormatter::getImplementationName() throw(RuntimeException) + OUString SAL_CALL PlainTextFormatter::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL PlainTextFormatter::getImplementationName_static() + OUString SAL_CALL PlainTextFormatter::getImplementationName_static() { - return ::rtl::OUString( "com.sun.star.comp.extensions.PlainTextFormatter" ); + return OUString( "com.sun.star.comp.extensions.PlainTextFormatter" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static() + Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static() { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.PlainTextFormatter" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "com.sun.star.logging.PlainTextFormatter" ); return aServiceNames; } diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index c244a07c12a3..23cd49ec4f63 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -64,8 +64,6 @@ using namespace com::sun::star::connection; using namespace cppu; using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OString; char SoPluginInstance::sSO_Dir[] = {0}; Reference< XMultiServiceFactory > SoPluginInstance::mxRemoteMSF = Reference< XMultiServiceFactory >(NULL); @@ -103,8 +101,8 @@ sal_Bool SoPluginInstance::SetURL(char* aURL) osl_getProcessLocale(&pLocale); sal_uInt16 encoding = osl_getTextEncodingFromLocale(pLocale); - m_sURL = ::rtl::OUString(aURL, strlen(aURL), encoding); - debug_fprintf(NSP_LOG_APPEND, "SetURL %s\nencoding is: %d\n", ::rtl::OUStringToOString(m_sURL, + m_sURL = OUString(aURL, strlen(aURL), encoding); + debug_fprintf(NSP_LOG_APPEND, "SetURL %s\nencoding is: %d\n", OUStringToOString(m_sURL, RTL_TEXTENCODING_GB_18030).getStr(), m_sURL.getLength(), encoding); return sal_True; } @@ -175,7 +173,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // create frame m_xFrame = Reference< frame::XFrame >( - mxRemoteMSF->createInstance( ::rtl::OUString("com.sun.star.frame.Frame")), + mxRemoteMSF->createInstance( OUString("com.sun.star.frame.Frame")), uno::UNO_QUERY ); if (!m_xFrame.is()) { @@ -191,9 +189,9 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // currently ignore errors in this code uno::Reference< beans::XPropertySet > xFrameProps( m_xFrame, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xLMProps; - xFrameProps->getPropertyValue( ::rtl::OUString("LayoutManager") ) >>= xLMProps; + xFrameProps->getPropertyValue( OUString("LayoutManager") ) >>= xLMProps; if ( xLMProps.is() ) - xLMProps->setPropertyValue( ::rtl::OUString("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) ); + xLMProps->setPropertyValue( OUString("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) ); } catch( const uno::Exception& ) {} @@ -244,7 +242,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) setPropValues[ 3 ].Value = "Flat XML File";*/ debug_fprintf(NSP_LOG_APPEND, "try to load copy of URL from local file %s:%d\n", - ::rtl::OUStringToOString( m_sURL, RTL_TEXTENCODING_ASCII_US ).getStr( ), + OUStringToOString( m_sURL, RTL_TEXTENCODING_ASCII_US ).getStr( ), m_sURL.getLength() ); // load document @@ -293,7 +291,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) propertyValue[0].Name = OUString("FunctionBarVisible"); propertyValue[0].Value <<= sal_True; m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString(".uno:FunctionBarVisible"), + OUString(".uno:FunctionBarVisible"), m_xFrame->getName(), 0, propertyValue ); @@ -309,7 +307,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) uno::Reference< presentation::XPresentationSupplier > xPresSuppl( m_xComponent, uno::UNO_QUERY_THROW ); uno::Reference< presentation::XPresentation > xPres( xPresSuppl->getPresentation(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xPresSuppl->getPresentation(), uno::UNO_QUERY_THROW ); - xProps->setPropertyValue( ::rtl::OUString( "IsFullScreen" ), uno::makeAny( sal_False ) ); + xProps->setPropertyValue( OUString( "IsFullScreen" ), uno::makeAny( sal_False ) ); xPres->start(); } catch( const uno::Exception& ) @@ -341,7 +339,7 @@ sal_Bool SoPluginInstance::SetWindow(NSP_HWND hParent, int x, int y, int w, int m_hParent = hParent; debug_fprintf(NSP_LOG_APPEND, "SoPluginInstance::SetWindow %s : %d\n", - ::rtl::OUStringToOString(m_sURL, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(m_sURL, RTL_TEXTENCODING_ASCII_US).getStr(), m_sURL.getLength() ); m_nWidth = w; m_nHeight =h; @@ -400,7 +398,7 @@ sal_Bool SoPluginInstance::Destroy(void) aArgs[0] <<= m_xFrame; uno::Reference< lang::XComponent > xDocumentCloser( mxRemoteMSF->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.DocumentCloser" ), + OUString( "com.sun.star.embed.DocumentCloser" ), aArgs ), uno::UNO_QUERY_THROW ); @@ -441,7 +439,7 @@ sal_Bool SoPluginInstance::Print(void) Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1); m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString(".uno:PrintDefault"), + OUString(".uno:PrintDefault"), m_xFrame->getName(), 0, propertyValue ); return sal_True; diff --git a/extensions/source/nsplugin/source/so_instance.hxx b/extensions/source/nsplugin/source/so_instance.hxx index 54974799f9a4..1af9146a1605 100644 --- a/extensions/source/nsplugin/source/so_instance.hxx +++ b/extensions/source/nsplugin/source/so_instance.hxx @@ -68,7 +68,7 @@ private: int m_nX; int m_nY; sal_Int16 m_nFlag; // Set to 12 during initialization - ::rtl::OUString m_sURL; // URL of the document to be loaded + OUString m_sURL; // URL of the document to be loaded sal_Bool m_bInit; // If the Plugin instance is initilaized. NSP_HWND m_hParent; // Windows handle of parent window long m_pParent; // ID of this instance - get from NPP diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx index f62383f843f6..6413f21dde05 100644 --- a/extensions/source/nsplugin/source/so_main.cxx +++ b/extensions/source/nsplugin/source/so_main.cxx @@ -301,7 +301,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f } // env string - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; OUString aPath, aPluginPipeName; if(!Bootstrap::get("BRAND_BASE_DIR", aPath)) @@ -310,7 +310,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f return Reference< lang::XMultiServiceFactory >(NULL); } - aPluginPipeName = ::rtl::OUString::valueOf( aPath.hashCode() ); + aPluginPipeName = OUString::valueOf( aPath.hashCode() ); // accept string OSL_ASSERT( buf.isEmpty() ); @@ -361,11 +361,11 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f NSP_Close_Pipe(read_fd); execl( "/bin/sh", "/bin/sh", - ::rtl::OUStringToOString( aOfficePath, osl_getThreadTextEncoding() ).getStr(), - ::rtl::OUStringToOString( args[0], osl_getThreadTextEncoding() ).getStr(), - ::rtl::OUStringToOString( args[1], osl_getThreadTextEncoding() ).getStr(), - ::rtl::OUStringToOString( args[2], osl_getThreadTextEncoding() ).getStr(), - ::rtl::OUStringToOString( args[3], osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( aOfficePath, osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( args[0], osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( args[1], osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( args[2], osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( args[3], osl_getThreadTextEncoding() ).getStr(), NULL); _exit(255); } diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index c7fc0a0b88e3..d70908485cc6 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.hxx @@ -58,8 +58,6 @@ using namespace com::sun::star::beans; using namespace osl; using namespace std; -using ::rtl::OUString; - namespace ole_adapter { diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 2814850ff221..709e121f6846 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -67,9 +67,6 @@ using namespace com::sun::star::bridge::oleautomation; using namespace com::sun::star::bridge::ModelDependent; using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringBuffer; #define JSCRIPT_ID_PROPERTY L"_environment" #define JSCRIPT_ID L"jscript" @@ -408,15 +405,15 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, throw RuntimeException(); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast( + throw CannotConvertException(OUString("call to OLE object failed"), static_cast( static_cast(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; case DISP_E_PARAMNOTFOUND: - throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast( + throw IllegalArgumentException(OUString("call to OLE object failed"), static_cast( static_cast(this)), ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )) ; break; case DISP_E_TYPEMISMATCH: - throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast( + throw CannotConvertException(OUString("call to OLE object failed"), static_cast( static_cast(this)), TypeClass_UNKNOWN, FailReason::UNKNOWN, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_UNKNOWNINTERFACE: @@ -426,7 +423,7 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, throw RuntimeException(); break; case DISP_E_PARAMNOTOPTIONAL: - throw CannotConvertException(rtl::OUString("call to OLE object failed"),static_cast( + throw CannotConvertException(OUString("call to OLE object failed"),static_cast( static_cast(this)) , TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr); break; default: @@ -489,12 +486,12 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) { if ( pInfo && m_sTypeName.getLength() == 0 ) { - m_sTypeName = rtl::OUString("IDispatch"); + m_sTypeName = OUString("IDispatch"); CComBSTR sName; if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) ) { - rtl::OUString sTmp( reinterpret_cast(LPCOLESTR(sName))); + OUString sTmp( reinterpret_cast(LPCOLESTR(sName))); if ( sTmp.indexOf('_') == 0 ) sTmp = sTmp.copy(1); // do we own the memory for pTypeLib, msdn doco is vague @@ -505,8 +502,8 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) { if ( SUCCEEDED( pTypeLib->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) ) { - rtl::OUString sLibName( reinterpret_cast(LPCOLESTR(sName))); - m_sTypeName = sLibName.concat( rtl::OUString(".") ).concat( sTmp ); + OUString sLibName( reinterpret_cast(LPCOLESTR(sName))); + m_sTypeName = sLibName.concat( OUString(".") ).concat( sTmp ); } } @@ -1177,7 +1174,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, } if( !bConvRet) // conversion of return or out parameter failed - throw CannotConvertException( rtl::OUString("Call to COM object failed. Conversion of return or out value failed"), + throw CannotConvertException( OUString("Call to COM object failed. Conversion of return or out value failed"), Reference( static_cast(this), UNO_QUERY ), TypeClass_UNKNOWN, FailReason::UNKNOWN, 0);// lookup error code // conversion of return or out parameter failed @@ -1201,15 +1198,15 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, throw IllegalArgumentException(); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast( + throw CannotConvertException(OUString("call to OLE object failed"), static_cast( static_cast(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; case DISP_E_PARAMNOTFOUND: - throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast( + throw IllegalArgumentException(OUString("call to OLE object failed"), static_cast( static_cast(this)), ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_TYPEMISMATCH: - throw CannotConvertException(rtl::OUString("call to OLE object failed"),static_cast( + throw CannotConvertException(OUString("call to OLE object failed"),static_cast( static_cast(this)) , TypeClass_UNKNOWN, FailReason::UNKNOWN, uArgErr); break; case DISP_E_UNKNOWNINTERFACE: @@ -1219,7 +1216,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, throw RuntimeException() ; break; case DISP_E_PARAMNOTOPTIONAL: - throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast( + throw CannotConvertException(OUString("call to OLE object failed"), static_cast( static_cast(this)), TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr); break; default: @@ -1317,7 +1314,7 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument // -------------------------- // XDirectInvocation -uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aName, const uno::Sequence< uno::Any >& aParams ) +uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, const uno::Sequence< uno::Any >& aParams ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { Any aResult; @@ -1528,7 +1525,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa "returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString("[automation bridge] Call failed."), + throw CannotConvertException(OUString("[automation bridge] Call failed."), static_cast( static_cast(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; @@ -1566,7 +1563,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa return aResult; } -::sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMember( const ::rtl::OUString& aName ) +::sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMember( const OUString& aName ) throw (uno::RuntimeException) { if ( ! m_spDispatch ) @@ -2160,7 +2157,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, "returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString("[automation bridge] Call failed."), + throw CannotConvertException(OUString("[automation bridge] Call failed."), static_cast( static_cast(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 00b0753bbf4f..46168becb692 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -48,7 +48,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::oleautomation; -using ::rtl::OUString; namespace ole_adapter { @@ -112,17 +111,17 @@ public: throw(Exception, RuntimeException); // XDefaultProperty - virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } // XDefaultMethod - virtual ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } + virtual OUString SAL_CALL getDefaultMethodName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } - virtual ::com::sun::star::uno::Any SAL_CALL invokeGetProperty( const ::rtl::OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL invokePutProperty( const ::rtl::OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL invokeGetProperty( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL invokePutProperty( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); // XDirectInvocation - virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const ::rtl::OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasMember( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasMember( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); Any invokeWithDispIdComTlb(FuncDesc& aFuncDesc, @@ -237,7 +236,7 @@ protected: Sequence m_seqTypes; CComPtr m_spUnknown; CComPtr m_spDispatch; - rtl::OUString m_sTypeName; // is "" ( not initialised ), "IDispatch" ( we have no idea ) or "SomeLibrary.SomeTypeName" if we managed to get a type + OUString m_sTypeName; // is "" ( not initialised ), "IDispatch" ( we have no idea ) or "SomeLibrary.SomeTypeName" if we managed to get a type /** This value is set dureing XInitialization::initialize. It indicates that the COM interface was transported as VT_DISPATCH in a VARIANT rather then a VT_UNKNOWN */ @@ -256,7 +255,7 @@ protected: bool m_bComTlbIndexInit; // Keeps the ITypeInfo obtained from IDispatch::GetTypeInfo CComPtr< ITypeInfo > m_spTypeInfo; - rtl::OUString m_sDefaultMember; + OUString m_sDefaultMember; bool m_bHasDfltMethod; bool m_bHasDfltProperty; }; diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index 4882459508bf..f540ef94a9a1 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -43,7 +43,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::ModelDependent; -using ::rtl::OUString; namespace ole_adapter { diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index 66333dd0f820..a9bc8c3b4313 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -30,7 +30,6 @@ using namespace ole_adapter; using namespace cppu; -using ::rtl::OUString; namespace ole_adapter { diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index c6551f42fa3c..2899abae1715 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -65,7 +65,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::bridge::ModelDependent; using namespace com::sun::star::reflection; -using ::rtl::OUString; #ifndef _MSC_VER extern "C" const GUID IID_IDispatchEx; diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx index 0cfdd2f8970b..3191c4f413db 100644 --- a/extensions/source/ole/unotypewrapper.cxx +++ b/extensions/source/ole/unotypewrapper.cxx @@ -52,7 +52,7 @@ bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVar) } -bool createUnoTypeWrapper(const rtl::OUString& sTypeName, VARIANT * pVar) +bool createUnoTypeWrapper(const OUString& sTypeName, VARIANT * pVar) { CComBSTR bstr(reinterpret_cast(sTypeName.getStr())); return createUnoTypeWrapper(bstr, pVar); diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx index 5965bdb9a33e..a55b4912e75f 100644 --- a/extensions/source/ole/unotypewrapper.hxx +++ b/extensions/source/ole/unotypewrapper.hxx @@ -31,7 +31,7 @@ Returns true if the object could be created and initialized. */ bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVariant); -bool createUnoTypeWrapper(const rtl::OUString& sTypeName, VARIANT * pVar); +bool createUnoTypeWrapper(const OUString& sTypeName, VARIANT * pVar); class UnoTypeWrapper: public CComObjectRootEx, diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 1a3b532548f5..2dbc83b722c1 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -64,15 +64,15 @@ private: Reference< ::com::sun::star::uno::XComponentContext > m_xContext; FILE* fp; Reference< ::com::sun::star::plugin::XPlugin > m_xPlugin; - ::rtl::OUString m_aMIMEType; - ::rtl::OUString m_aTarget; - ::rtl::OUString m_aFileName; + OUString m_aMIMEType; + OUString m_aTarget; + OUString m_aFileName; public: FileSink( const Reference< ::com::sun::star::uno::XComponentContext > &, const Reference< ::com::sun::star::plugin::XPlugin > & plugin, - const ::rtl::OUString& mimetype, - const ::rtl::OUString& target, + const OUString& mimetype, + const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ); virtual ~FileSink(); @@ -95,14 +95,14 @@ public: virtual ~XPluginContext_Impl(); - virtual ::rtl::OUString SAL_CALL getValue(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, ::com::sun::star::plugin::PluginVariable variable) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& mimetype, const ::rtl::OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual ::rtl::OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual OUString SAL_CALL getValue(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, ::com::sun::star::plugin::PluginVariable variable) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); }; Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw() @@ -120,14 +120,14 @@ XPluginContext_Impl::~XPluginContext_Impl() { } -::rtl::OUString XPluginContext_Impl::getValue( const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, ::com::sun::star::plugin::PluginVariable /*variable*/ ) +OUString XPluginContext_Impl::getValue( const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, ::com::sun::star::plugin::PluginVariable /*variable*/ ) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - return ::rtl::OUString(); + return OUString(); } -void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) +void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); @@ -135,11 +135,11 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu { INetURLObject aURL; aURL.SetSmartProtocol( INET_PROT_FILE ); - aURL.SetSmartURL( ::rtl::OUStringToOString( url, m_aEncoding ) ); + aURL.SetSmartURL( OUStringToOString( url, m_aEncoding ) ); - rtl::OUString aUrl = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); + OUString aUrl = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); // the mimetype cannot be specified - plugin->provideNewStream( ::rtl::OUString(), + plugin->provideNewStream( OUString(), Reference< XActiveDataSource >(), aUrl, 0, 0, aUrl.startsWith("file:") ); @@ -153,7 +153,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString("Referer"); + aValue.Name = OUString("Referer"); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); @@ -177,7 +177,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu } } -void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener ) +void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener ) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { getURL( plugin, url, target ); @@ -185,18 +185,18 @@ void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin listener->disposing( ::com::sun::star::lang::EventObject() ); } -::rtl::OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) +OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - return ::rtl::OUString("Mozilla 3.0"); + return OUString("Mozilla 3.0"); } -void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const ::rtl::OUString& /*message*/) +void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const OUString& /*message*/) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { } -void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) +void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { Sequence< sal_Int8 > aBuf; @@ -228,11 +228,11 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl try { ::com::sun::star::beans::PropertyValue aValues[2]; - aValues[0].Name = ::rtl::OUString("Referer"); + aValues[0].Name = OUString("Referer"); aValues[0].Value <<= pPlugin->getRefererURL(); - aValues[1].Name = ::rtl::OUString("PostString"); - aValues[1].Value <<= ::rtl::OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding ); + aValues[1].Name = OUString("PostString"); + aValues[1].Value <<= OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding ); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 ); Reference< ::com::sun::star::lang::XComponent > xComp = xDesktop->loadComponentFromURL( @@ -254,7 +254,7 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl } } -void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener ) +void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener ) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { postURL( plugin, url, target, buf, file ); @@ -262,7 +262,7 @@ void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugi listener->disposing( ::com::sun::star::lang::EventObject() ); } -void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& mimetype, const ::rtl::OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) +void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { FileSink* pNewSink = new FileSink( m_xContext, plugin, mimetype, target, source ); @@ -272,8 +272,8 @@ void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin:: FileSink::FileSink( const Reference< ::com::sun::star::uno::XComponentContext > & rxContext, const Reference< ::com::sun::star::plugin::XPlugin > & plugin, - const ::rtl::OUString& mimetype, - const ::rtl::OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) : + const OUString& mimetype, + const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) : m_xContext( rxContext ), m_xPlugin( plugin ), m_aMIMEType( mimetype ), @@ -308,7 +308,7 @@ void FileSink::closeOutput() throw() try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString("Referer"); + aValue.Name = OUString("Referer"); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index d3f87150104f..536547cd1e25 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -77,9 +77,9 @@ PluginManager::PluginManager() { } -const Sequence< ::rtl::OUString >& PluginManager::getAdditionalSearchPaths() +const Sequence< OUString >& PluginManager::getAdditionalSearchPaths() { - static Sequence< ::rtl::OUString > aPaths; + static Sequence< OUString > aPaths; if( ! aPaths.getLength() ) { @@ -105,7 +105,7 @@ Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< } // ::com::sun::star::lang::XServiceInfo -::rtl::OUString XPluginManager_Impl::getImplementationName() throw( ) +OUString XPluginManager_Impl::getImplementationName() throw( ) { return getImplementationName_Static(); @@ -113,10 +113,10 @@ Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< } // ::com::sun::star::lang::XServiceInfo -sal_Bool XPluginManager_Impl::supportsService(const ::rtl::OUString& ServiceName) throw( ) +sal_Bool XPluginManager_Impl::supportsService(const OUString& ServiceName) throw( ) { - Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -124,16 +124,16 @@ sal_Bool XPluginManager_Impl::supportsService(const ::rtl::OUString& ServiceName } // ::com::sun::star::lang::XServiceInfo -Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames(void) throw( ) +Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames(void) throw( ) { return getSupportedServiceNames_Static(); } // XPluginManager_Impl -Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) +Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.plugin.PluginManager"); + Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.plugin.PluginManager"); return aSNS; } @@ -178,8 +178,8 @@ Sequence XPluginManager_Impl::getPlug Sequence aRet; vcl::SettingsConfigItem* pCfg = vcl::SettingsConfigItem::get(); - rtl::OUString aVal( pCfg->getValue( rtl::OUString( "BrowserPlugins" ), - rtl::OUString( "Disabled" ) ) ); + OUString aVal( pCfg->getValue( OUString( "BrowserPlugins" ), + OUString( "Disabled" ) ) ); if( ! aVal.toBoolean() ) { aRet = impl_getPluginDescriptions(); @@ -187,7 +187,7 @@ Sequence XPluginManager_Impl::getPlug return aRet; } -Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype) +Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException ) { XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); @@ -203,7 +203,7 @@ Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin return pImpl; } -Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const ::rtl::OUString& url ) throw() +Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw() { XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); Reference< ::com::sun::star::plugin::XPlugin > xRef = pImpl; diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index 7e48f9b45761..cdb20e2a8765 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -90,9 +90,6 @@ void TRACES( char const* s, char const* s2 ) using namespace com::sun::star::lang; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; // Move deprecated functions which no longer appear in npapi.h before // their use to avoid errors that they're undeclared at point of use @@ -139,12 +136,12 @@ NPNetscapeFuncs aNPNFuncs = NPN_ForceRedraw }; -static ::rtl::OString normalizeURL( XPlugin_Impl* plugin, const ::rtl::OString& url ) +static OString normalizeURL( XPlugin_Impl* plugin, const OString& url ) { - ::rtl::OString aLoadURL; + OString aLoadURL; if( url.indexOf( ':' ) == -1 ) { - aLoadURL = ::rtl::OUStringToOString( plugin->getCreationURL(), plugin->getTextEncoding() ); + aLoadURL = OUStringToOString( plugin->getCreationURL(), plugin->getTextEncoding() ); int nPos; if( ( nPos = aLoadURL.indexOf( "://" ) ) != -1 ) { @@ -316,8 +313,8 @@ extern "C" { pImpl->getPluginContext()-> newStream( pImpl, - ::rtl::OStringToOUString( type, pImpl->getTextEncoding () ), - ::rtl::OStringToOUString( target, pImpl->getTextEncoding() ), + OStringToOUString( type, pImpl->getTextEncoding () ), + OStringToOUString( target, pImpl->getTextEncoding() ), ::com::sun::star::uno::Reference< ::com::sun::star::io::XActiveDataSource > ( pStream->getOutputStream(), UNO_QUERY ) ); pImpl->leavePluginCallback(); @@ -340,7 +337,7 @@ extern "C" { ::com::sun::star::uno::Sequence Bytes( (sal_Int8*)buf, len ); - ::rtl::OString aPostURL = normalizeURL( pImpl, url ); + OString aPostURL = normalizeURL( pImpl, url ); PluginEventListener* pListener = new PluginEventListener( pImpl, url, aPostURL.getStr(), notifyData ); @@ -357,8 +354,8 @@ extern "C" { pImpl->enterPluginCallback(); pImpl->getPluginContext()-> postURLNotify( pImpl, - ::rtl::OStringToOUString( aPostURL, pImpl->getTextEncoding() ), - ::rtl::OStringToOUString( target, pImpl->getTextEncoding() ), + OStringToOUString( aPostURL, pImpl->getTextEncoding() ), + OStringToOUString( target, pImpl->getTextEncoding() ), Bytes, file, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > ( pListener ) ); @@ -381,14 +378,14 @@ extern "C" { return NPERR_INVALID_INSTANCE_ERROR; ::com::sun::star::uno::Sequence Bytes( (sal_Int8*)buf, len ); - ::rtl::OString aPostURL = normalizeURL( pImpl, url ); + OString aPostURL = normalizeURL( pImpl, url ); try { pImpl->enterPluginCallback(); pImpl->getPluginContext()-> postURL( pImpl, - ::rtl::OStringToOUString( aPostURL, pImpl->getTextEncoding() ), - ::rtl::OStringToOUString( window, pImpl->getTextEncoding () ), + OStringToOUString( aPostURL, pImpl->getTextEncoding() ), + OStringToOUString( window, pImpl->getTextEncoding () ), Bytes, file ); pImpl->leavePluginCallback(); @@ -475,7 +472,7 @@ extern "C" { { pImpl->enterPluginCallback(); pImpl->getPluginContext()-> - displayStatusText( pImpl, ::rtl::OStringToOUString( message, pImpl->getTextEncoding() ) ); + displayStatusText( pImpl, OStringToOUString( message, pImpl->getTextEncoding() ) ); pImpl->leavePluginCallback(); } catch( const ::com::sun::star::plugin::PluginException& ) @@ -492,7 +489,7 @@ extern "C" { XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance ); if( pImpl ) { - rtl::OUString UserAgent; + OUString UserAgent; try { pImpl->enterPluginCallback(); @@ -501,7 +498,7 @@ extern "C" { pImpl->leavePluginCallback(); if( pAgent ) free( pAgent ); - pAgent = strdup( ::rtl::OUStringToOString( UserAgent, pImpl->getTextEncoding() ).getStr() ); + pAgent = strdup( OUStringToOString( UserAgent, pImpl->getTextEncoding() ).getStr() ); } catch( const ::com::sun::star::plugin::PluginException& ) { diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx index 11fc4e30b765..034c2db35350 100644 --- a/extensions/source/plugin/base/plcom.cxx +++ b/extensions/source/plugin/base/plcom.cxx @@ -48,7 +48,7 @@ #include #include -PluginComm::PluginComm( const ::rtl::OString& rLibName, bool bReusable ) : +PluginComm::PluginComm( const OString& rLibName, bool bReusable ) : m_nRefCount( 0 ), m_aLibName( rLibName ) { diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 296685c9a37f..6942c39c956a 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -53,10 +53,10 @@ Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException ) // XPluginManager_Impl -Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames_Static(void) throw() +Sequence< OUString > PluginModel::getSupportedServiceNames_Static(void) throw() { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.plugin.PluginModel"); + Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.plugin.PluginModel"); return aSNS; } @@ -69,14 +69,14 @@ static ::osl::Mutex aPropertyMutex; static ::com::sun::star::beans::Property aProps[] = { ::com::sun::star::beans::Property( - ::rtl::OUString::createFromAscii( aMime ), + OUString::createFromAscii( aMime ), 1, - ::getCppuType((const ::rtl::OUString*)0), + ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::BOUND ), ::com::sun::star::beans::Property( - ::rtl::OUString::createFromAscii( aCreationURL ), + OUString::createFromAscii( aCreationURL ), 2, - ::getCppuType((const ::rtl::OUString*)0), + ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::BOUND ) }; @@ -87,7 +87,7 @@ PluginModel::PluginModel() : { } -PluginModel::PluginModel(const ::rtl::OUString& rURL, const rtl::OUString& rMimeType ) : +PluginModel::PluginModel(const OUString& rURL, const OUString& rMimeType ) : BroadcasterHelperHolder( aPropertyMutex ), OPropertySetHelper( m_aHelper ), OPropertyArrayHelper( aProps, 2 ), @@ -186,9 +186,9 @@ void PluginModel::dispose(void) throw() // ::com::sun::star::io::XPersistObject -::rtl::OUString PluginModel::getServiceName() throw() +OUString PluginModel::getServiceName() throw() { - return ::rtl::OUString("com.sun.star.plugin.PluginModel"); + return OUString("com.sun.star.plugin.PluginModel"); } void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw() diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index cb0ba02dcf13..0521775c9539 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -63,7 +63,7 @@ extern "C" { { void* pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplementationName ) ); + OUString aImplName( OUString::createFromAscii( pImplementationName ) ); if( pXUnoSMgr ) { diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 5e96bee3a39e..701974da9b7e 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -779,15 +779,15 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, #endif if( isfile && stype == NP_ASFILEONLY ) { - rtl::OString aFileName; + OString aFileName; if( url.startsWith("file:") ) { OUString aSysName; osl_getSystemPathFromFileURL( url.pData, &aSysName.pData ); - aFileName = rtl::OUStringToOString( aSysName, m_aEncoding ); + aFileName = OUStringToOString( aSysName, m_aEncoding ); } else - aFileName = rtl::OUStringToOString( url, m_aEncoding ); + aFileName = OUStringToOString( url, m_aEncoding ); m_pPluginComm-> NPP_StreamAsFile( &m_aInstance, pStream->getStream(), diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx index df8e96681b45..f93300f34e34 100644 --- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx @@ -60,13 +60,13 @@ class XPlugin_Impl; namespace plugstringhelper { -rtl::OUString getString( CFStringRef i_xString ); -rtl::OUString getString( CFURLRef i_xURL ); -CFMutableStringRef createString( const rtl::OUString& i_rString ); -CFURLRef createURL( const rtl::OUString& i_rString ); -rtl::OUString getURLFromPath( const rtl::OUString& i_rPath ); -CFURLRef createURLFromPath( const rtl::OUString& i_rPath ); -rtl::OUString CFURLtoOSLURL( CFURLRef i_xURL ); +OUString getString( CFStringRef i_xString ); +OUString getString( CFURLRef i_xURL ); +CFMutableStringRef createString( const OUString& i_rString ); +CFURLRef createURL( const OUString& i_rString ); +OUString getURLFromPath( const OUString& i_rPath ); +CFURLRef createURLFromPath( const OUString& i_rPath ); +OUString CFURLtoOSLURL( CFURLRef i_xURL ); } //================================================================================================== @@ -100,7 +100,7 @@ class MacPluginComm : virtual long doIt(); public: - MacPluginComm( const rtl::OUString& rMIME, const rtl::OUString& rName, NSView* pView ); + MacPluginComm( const OUString& rMIME, const OUString& rName, NSView* pView ); virtual ~MacPluginComm(); // FIXME: diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 6e10027b8053..54c414c1037a 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -134,7 +134,7 @@ private: const char** m_pArgv; const char** m_pArgn; int m_nArgs; - rtl::OString m_aLastGetUrl; + OString m_aLastGetUrl; Reference< com::sun::star::awt::XControlModel > m_xModel; @@ -148,7 +148,7 @@ private: ::std::list m_aInputStreams; ::std::list m_aOutputStreams; ::std::list m_aPEventListeners; - ::rtl::OUString m_aURL; + OUString m_aURL; sal_Bool m_bIsDisposed; @@ -157,8 +157,8 @@ private: #endif void prependArg( const char* pName, const char* pValue ); // arguments will be strdup'ed - void initArgs( const Sequence< rtl::OUString >& argn, - const Sequence< rtl::OUString >& argv, + void initArgs( const Sequence< OUString >& argn, + const Sequence< OUString >& argv, sal_Int16 mode ); void freeArgs(); void handleSpecialArgs(); @@ -175,9 +175,9 @@ public: void destroyStreams(); - void setLastGetUrl( const rtl::OString& rUrl ) { m_aLastGetUrl = rUrl; } + void setLastGetUrl( const OString& rUrl ) { m_aLastGetUrl = rUrl; } - com::sun::star::plugin::PluginDescription fitDescription( const rtl::OUString& rURL ); + com::sun::star::plugin::PluginDescription fitDescription( const OUString& rURL ); ::std::list& getInputStreams() { return m_aInputStreams; } ::std::list& getOutputStreams() { return m_aOutputStreams; } @@ -208,17 +208,17 @@ public: void initInstance( const com::sun::star::plugin::PluginDescription& rDescription, - const Sequence< rtl::OUString >& argn, - const Sequence< rtl::OUString >& argv, + const Sequence< OUString >& argn, + const Sequence< OUString >& argv, sal_Int16 mode ); void initInstance( - const rtl::OUString& rURL, - const Sequence< rtl::OUString >& argn, - const Sequence< rtl::OUString >& argv, + const OUString& rURL, + const Sequence< OUString >& argn, + const Sequence< OUString >& argv, sal_Int16 mode ); - const rtl::OUString& getRefererURL() { return m_aURL; } - ::rtl::OUString getCreationURL(); + const OUString& getRefererURL() { return m_aURL; } + OUString getCreationURL(); PluginStream* getStreamFromNPStream( NPStream* ); @@ -255,7 +255,7 @@ public: virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( RuntimeException ); // com::sun::star::plugin::XPlugin - virtual sal_Bool SAL_CALL provideNewStream(const rtl::OUString& mimetype, const Reference< com::sun::star::io::XActiveDataSource > & stream, const rtl::OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(); + virtual sal_Bool SAL_CALL provideNewStream(const OUString& mimetype, const Reference< com::sun::star::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(); // com::sun::star::beans::XPropertyChangeListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rSource ) throw(); @@ -277,7 +277,7 @@ public: static PluginManager& get(); static void setServiceFactory( const Reference< com::sun::star::lang::XMultiServiceFactory >& xFactory ); - static const Sequence< rtl::OUString >& getAdditionalSearchPaths(); + static const Sequence< OUString >& getAdditionalSearchPaths(); ::std::list& getPluginComms() { return m_aPluginComms; } ::std::list& getPlugins() { return m_aAllPlugins; } @@ -303,19 +303,19 @@ public: // checks whether plugins are disabled virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions(void) throw(); - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< rtl::OUString >& argn, const Sequence< rtl::OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException ); + virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException ); - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< rtl::OUString >& argn, const Sequence< rtl::OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit, const Reference< com::sun::star::awt::XWindowPeer > & parent, const rtl::OUString& url ) throw(); + virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit, const Reference< com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw(); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(); - virtual rtl::OUString SAL_CALL getImplementationName() throw(); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(); + virtual OUString SAL_CALL getImplementationName() throw(); - Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); - static Sequence< rtl::OUString > getSupportedServiceNames_Static(void) throw( ); - static rtl::OUString getImplementationName_Static() throw( ) + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + static Sequence< OUString > getSupportedServiceNames_Static(void) throw( ); + static OUString getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ - return rtl::OUString( "com.sun.star.extensions.PluginManager" ); + return OUString( "com.sun.star.extensions.PluginManager" ); } }; Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index c315b298118b..b45eae8dfed0 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.hxx @@ -68,8 +68,8 @@ class PluginModel : public BroadcasterHelperHolder, public com::sun::star::awt::XControlModel { private: - rtl::OUString m_aCreationURL; - rtl::OUString m_aMimeType; + OUString m_aCreationURL; + OUString m_aMimeType; std::list< Reference< com::sun::star::lang::XEventListener > > m_aDisposeListeners; @@ -81,12 +81,12 @@ class PluginModel : public BroadcasterHelperHolder, { rtl_freeMemory( pMem ); } PluginModel(); - PluginModel( const rtl::OUString& rURL, const rtl::OUString& rMimeType ); + PluginModel( const OUString& rURL, const OUString& rMimeType ); virtual ~PluginModel(); - const rtl::OUString& getCreationURL() { return m_aCreationURL; } - void setMimeType( const rtl::OUString& rMime ) { m_aMimeType = rMime; } + const OUString& getCreationURL() { return m_aCreationURL; } + void setMimeType( const OUString& rMime ) { m_aMimeType = rMime; } // XInterface virtual Any SAL_CALL queryInterface( const Type& rType ) throw( com::sun::star::uno::RuntimeException ) @@ -101,11 +101,11 @@ class PluginModel : public BroadcasterHelperHolder, // com::sun::star::lang::XTypeProvider - static Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames_Static(void) throw( ); - static rtl::OUString SAL_CALL getImplementationName_Static() throw( ) + static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(void) throw( ); + static OUString SAL_CALL getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ - return rtl::OUString( "com.sun.star.extensions.PluginModel" ); + return OUString( "com.sun.star.extensions.PluginModel" ); } // OPropertySetHelper @@ -121,7 +121,7 @@ class PluginModel : public BroadcasterHelperHolder, virtual Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(); // com::sun::star::io::XPersistObject - virtual rtl::OUString SAL_CALL getServiceName() throw(); + virtual OUString SAL_CALL getServiceName() throw(); virtual void SAL_CALL write(const Reference< com::sun::star::io::XObjectOutputStream > & OutStream) throw(); virtual void SAL_CALL read(const Reference< com::sun::star::io::XObjectInputStream > & InStream) throw(); diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx index 35bd9ad9d4bb..0b8a6cad7dec 100644 --- a/extensions/source/plugin/inc/plugin/plcom.hxx +++ b/extensions/source/plugin/inc/plugin/plcom.hxx @@ -37,18 +37,18 @@ class PluginComm { protected: int m_nRefCount; - ::rtl::OString m_aLibName; + OString m_aLibName; std::list< String > m_aFilesToDelete; public: - PluginComm( const ::rtl::OString& rLibName, bool bReusable = true ); + PluginComm( const OString& rLibName, bool bReusable = true ); virtual ~PluginComm(); int getRefCount() { return m_nRefCount; } void addRef() { m_nRefCount++; } void decRef() { m_nRefCount--; if( ! m_nRefCount ) delete this; } - const ::rtl::OString& getLibName() { return m_aLibName; } - void setLibName( const ::rtl::OString& rName ) { m_aLibName = rName; } + const OString& getLibName() { return m_aLibName; } + void setLibName( const OString& rName ) { m_aLibName = rName; } void addFileToDelete( const String& filename ) { m_aFilesToDelete.push_back( filename ); } diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx index 234964f5181d..27a188dcc327 100644 --- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx +++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx @@ -109,7 +109,7 @@ public: void invalidate() { m_bValid = false; } sal_uLong SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong nMessageID = 0 ); - sal_uLong SendMessage( const rtl::OString& rMessage, sal_uLong nMessageID = 0 ) + sal_uLong SendMessage( const OString& rMessage, sal_uLong nMessageID = 0 ) { return SendMessage( rMessage.getLength(), rMessage.getStr(), nMessageID ); } diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx index 9f985645ccd2..f95e8470111c 100644 --- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx @@ -76,7 +76,7 @@ public: virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void *value); - static bool getPluginappPath(rtl::OString * path); + static bool getPluginappPath(OString * path); }; #endif diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx index b512d199d499..0bc91bcb6174 100644 --- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx @@ -78,7 +78,7 @@ class PluginComm_Impl : virtual long doIt(); public: - PluginComm_Impl( const rtl::OUString& rMIME, const rtl::OUString& rName, HWND hWnd ); + PluginComm_Impl( const OUString& rMIME, const OUString& rName, HWND hWnd ); virtual ~PluginComm_Impl(); public: diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx index a5c800f412c2..3f449ac90296 100644 --- a/extensions/source/plugin/unx/npwrap.cxx +++ b/extensions/source/plugin/unx/npwrap.cxx @@ -178,8 +178,8 @@ void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow ) static oslModule LoadModule( const char* pPath ) { - ::rtl::OUString sSystemPath( ::rtl::OUString::createFromAscii( pPath ) ); - ::rtl::OUString sFileURL; + OUString sSystemPath( OUString::createFromAscii( pPath ) ); + OUString sFileURL; osl_getFileURLFromSystemPath( sSystemPath.pData, &sFileURL.pData ); oslModule pLib = osl_loadModule( sFileURL.pData, SAL_LOADMODULE_LAZY ); diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx index d711543d58f9..d7140f1d3fb4 100644 --- a/extensions/source/plugin/unx/sysplug.cxx +++ b/extensions/source/plugin/unx/sysplug.cxx @@ -55,11 +55,11 @@ UnxPluginComm::UnxPluginComm( int nDescriptor1, int nDescriptor2 ) : - PluginComm( ::rtl::OUStringToOString( library, osl_getThreadTextEncoding() ), false ), + PluginComm( OUStringToOString( library, osl_getThreadTextEncoding() ), false ), PluginConnector( nDescriptor2 ), m_nCommPID( 0 ) { - rtl::OString path; + OString path; if (!getPluginappPath(&path)) { SAL_WARN("extensions.plugin", "cannot construct path to pluginapp.bin"); @@ -70,7 +70,7 @@ UnxPluginComm::UnxPluginComm( char pWindow[32]; sprintf( pWindow, "%d", (int)aParent ); sprintf( pDesc, "%d", nDescriptor1 ); - rtl::OString aLib(rtl::OUStringToOString(library, osl_getThreadTextEncoding())); + OString aLib(OUStringToOString(library, osl_getThreadTextEncoding())); char const* pArgs[5]; pArgs[0] = path.getStr(); @@ -134,9 +134,9 @@ UnxPluginComm::~UnxPluginComm() } } -bool UnxPluginComm::getPluginappPath(rtl::OString * path) { +bool UnxPluginComm::getPluginappPath(OString * path) { OSL_ASSERT(path != NULL); - rtl::OUString p("$BRAND_BASE_DIR/program/pluginapp.bin"); + OUString p("$BRAND_BASE_DIR/program/pluginapp.bin"); rtl::Bootstrap::expandMacros(p); return (osl::FileBase::getSystemPathFromFileURL(p, p) == diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index 85b56cda6a3e..26a4d10d989e 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.cxx @@ -48,13 +48,9 @@ using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::plugin; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; // Unix specific implementation -static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& rDescriptions ) +static bool CheckPlugin( const OString& rPath, list< PluginDescription* >& rDescriptions ) { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "Trying plugin %s ... ", rPath.getStr() ); @@ -69,7 +65,7 @@ static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& return false; } - rtl::OString aBaseName = rPath.copy(nPos+1); + OString aBaseName = rPath.copy(nPos+1); if (aBaseName.equalsL(RTL_CONSTASCII_STRINGPARAM("libnullplugin.so"))) { #if OSL_DEBUG_LEVEL > 1 @@ -89,7 +85,7 @@ static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - rtl::OString path; + OString path; if (!UnxPluginComm::getPluginappPath(&path)) { #if OSL_DEBUG_LEVEL > 1 @@ -97,11 +93,11 @@ static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& #endif return false; } - rtl::OStringBuffer cmd; + OStringBuffer cmd; tools::appendUnixShellWord(&cmd, path); cmd.append(' '); tools::appendUnixShellWord(&cmd, rPath); - rtl::OString aCommand(cmd.makeStringAndClear()); + OString aCommand(cmd.makeStringAndClear()); FILE* pResult = popen( aCommand.getStr(), "r" ); int nDescriptions = 0; @@ -188,9 +184,9 @@ union maxDirent struct dirent asDirent; }; -static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDescription* >& rDescriptions ) +static void CheckPluginRegistryFiles( const OString& rPath, list< PluginDescription* >& rDescriptions ) { - rtl::OStringBuffer aPath( 1024 ); + OStringBuffer aPath( 1024 ); aPath.append( rPath ); aPath.append( "/pluginreg.dat" ); FILE* fp = fopen( aPath.getStr(), "r" ); @@ -207,7 +203,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes for( nDotPos = nLineLen-1; nDotPos > 0 && aLine[nDotPos] != ':'; nDotPos-- ) ; if( aLine[0] == '/' && aLine[nDotPos] == ':' && aLine[nDotPos+1] == '$' ) - CheckPlugin( rtl::OString(aLine, nDotPos), rDescriptions ); + CheckPlugin( OString(aLine, nDotPos), rDescriptions ); } fclose( fp ); } @@ -222,7 +218,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes char* pBaseName = u.asDirent.d_name; if( rtl_str_compare( ".", pBaseName ) && rtl_str_compare( "..", pBaseName ) ) { - rtl::OStringBuffer aBuf( 1024 ); + OStringBuffer aBuf( 1024 ); aBuf.append( rPath ); aBuf.append( '/' ); aBuf.append( pBaseName ); @@ -255,26 +251,26 @@ Sequence XPluginManager_Impl::impl_getPluginDescriptions() th static const char* pNPXPluginPath = getenv( "NPX_PLUGIN_PATH" ); // netscape!, quick, beam me back to the 90's when Motif roamed the earth - rtl::OStringBuffer aSearchBuffer(RTL_CONSTASCII_STRINGPARAM("/usr/lib/netscape/plugins")); + OStringBuffer aSearchBuffer(RTL_CONSTASCII_STRINGPARAM("/usr/lib/netscape/plugins")); if( pHome ) aSearchBuffer.append(':').append(pHome).append("/.netscape/plugins"); if( pNPXPluginPath ) aSearchBuffer.append(':').append(pNPXPluginPath); - const Sequence< ::rtl::OUString >& rPaths( PluginManager::getAdditionalSearchPaths() ); + const Sequence< OUString >& rPaths( PluginManager::getAdditionalSearchPaths() ); for( i = 0; i < rPaths.getLength(); i++ ) { - aSearchBuffer.append(':').append(rtl::OUStringToOString( + aSearchBuffer.append(':').append(OUStringToOString( rPaths.getConstArray()[i], aEncoding)); } - rtl::OString aSearchPath = aSearchBuffer.makeStringAndClear(); + OString aSearchPath = aSearchBuffer.makeStringAndClear(); sal_Int32 nIndex = 0; maxDirent u; do { - rtl::OString aPath(aSearchPath.getToken(0, ':', nIndex)); + OString aPath(aSearchPath.getToken(0, ':', nIndex)); if (!aPath.isEmpty()) { DIR* pDIR = opendir(aPath.getStr()); @@ -286,7 +282,7 @@ Sequence XPluginManager_Impl::impl_getPluginDescriptions() th pBaseName[1] != '.' || pBaseName[2] != 0 ) { - rtl::OStringBuffer aFileName(aPath); + OStringBuffer aFileName(aPath); aFileName.append('/').append(pBaseName); CheckPlugin( aFileName.makeStringAndClear(), aPlugins ); } @@ -298,7 +294,7 @@ Sequence XPluginManager_Impl::impl_getPluginDescriptions() th while ( nIndex >= 0 ); // try ~/.mozilla/pluginreg.dat - rtl::OStringBuffer aBuf(256); + OStringBuffer aBuf(256); aBuf.append( pHome ); aBuf.append( "/.mozilla" ); CheckPluginRegistryFiles( aBuf.makeStringAndClear(), aPlugins ); diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index 1e60f6c32274..41c1539a986d 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -51,9 +51,6 @@ extern NPNetscapeFuncs aNPNFuncs; #include -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; #if OSL_DEBUG_LEVEL > 1 void TRACE( char const * s ); diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx index 706f71d33f18..237ce4309880 100644 --- a/extensions/source/plugin/win/winmgr.cxx +++ b/extensions/source/plugin/win/winmgr.cxx @@ -60,10 +60,6 @@ using namespace osl; using namespace com::sun::star::uno; using namespace com::sun::star::plugin; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; typedef map< OString, OUString, less< OString > > PluginLocationMap; diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index e8c3a34d0098..db14cb4b76dd 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -56,15 +56,15 @@ namespace pcr } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //--------------------------------------------------------------------- - ::rtl::OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) + OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); + return OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); } //--------------------------------------------------------------------- @@ -77,7 +77,7 @@ namespace pcr ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.form.MasterDetailLinkDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.form.MasterDetailLinkDialog"); return aSupported; } diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index e9882e7000b6..0121c364cb29 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -40,8 +40,8 @@ namespace pcr MasterDetailLinkDialog(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); private: @@ -49,7 +49,7 @@ namespace pcr virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPropertySet @@ -65,9 +65,9 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDetail; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xMaster; - ::rtl::OUString m_sExplanation; - ::rtl::OUString m_sDetailLabel; - ::rtl::OUString m_sMasterLabel; + OUString m_sExplanation; + OUString m_sDetailLabel; + OUString m_sMasterLabel; }; //........................................................................ diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index a6d3da201d7c..a8ec00ca0b77 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -57,7 +57,7 @@ namespace pcr DBG_NAME(OBrowserLine) //------------------------------------------------------------------ - OBrowserLine::OBrowserLine( const ::rtl::OUString& _rEntryName, Window* pParent ) + OBrowserLine::OBrowserLine( const OUString& _rEntryName, Window* pParent ) :m_sEntryName( _rEntryName ) ,m_aFtTitle(pParent) ,m_pControlWindow( NULL ) @@ -94,7 +94,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId ) + void OBrowserLine::SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId ) { if ( m_pControlWindow ) m_pControlWindow->SetHelpId( _rHelpId ); @@ -294,7 +294,7 @@ namespace pcr //------------------------------------------------------------------ XubString OBrowserLine::GetTitle() const { - rtl::OUString sDisplayName = m_aFtTitle.GetText(); + OUString sDisplayName = m_aFtTitle.GetText(); // for Issue 69452 if (Application::GetSettings().GetLayoutRTL()) @@ -390,7 +390,7 @@ namespace pcr rpButton = new PushButton( m_pTheParent, WB_NOPOINTERFOCUS ); rpButton->SetGetFocusHdl( LINK( this, OBrowserLine, OnButtonFocus ) ); rpButton->SetClickHdl( LINK( this, OBrowserLine, OnButtonClicked ) ); - rpButton->SetText(rtl::OUString("...")); + rpButton->SetText(OUString("...")); } rpButton->Show(); @@ -401,7 +401,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ) + void OBrowserLine::impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage ) { try { @@ -409,7 +409,7 @@ namespace pcr Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create(xContext) ); Sequence< PropertyValue > aMediaProperties(1); - aMediaProperties[0].Name = ::rtl::OUString( "URL" ); + aMediaProperties[0].Name = OUString( "URL" ); aMediaProperties[0].Value <<= _rImageURL; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); @@ -422,7 +422,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::ShowBrowseButton( const ::rtl::OUString& _rImageURL, sal_Bool _bPrimary ) + void OBrowserLine::ShowBrowseButton( const OUString& _rImageURL, sal_Bool _bPrimary ) { PushButton& rButton( impl_ensureButton( _bPrimary ) ); diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index ddfdcd3c9d2c..c137198e753b 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -50,7 +50,7 @@ namespace pcr class OBrowserLine { private: - ::rtl::OUString m_sEntryName; + OUString m_sEntryName; FixedText m_aFtTitle; Size m_aOutputSize; Point m_aLinePos; @@ -67,7 +67,7 @@ namespace pcr bool m_bReadOnly; public: - OBrowserLine( const ::rtl::OUString& _rEntryName, Window* pParent); + OBrowserLine( const OUString& _rEntryName, Window* pParent); ~OBrowserLine(); void setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); @@ -80,10 +80,10 @@ namespace pcr return m_pControlWindow; } - const ::rtl::OUString& + const OUString& GetEntryName() const { return m_sEntryName; } - void SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId ); + void SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId ); void SetTitle(const String& rString ); void FullFillTitleString(); @@ -99,7 +99,7 @@ namespace pcr void SetTabOrder(Window* pRefWindow, sal_uInt16 nFlags ); sal_Bool GrabFocus(); - void ShowBrowseButton( const ::rtl::OUString& _rImageURL, sal_Bool _bPrimary ); + void ShowBrowseButton( const OUString& _rImageURL, sal_Bool _bPrimary ); void ShowBrowseButton( const Image& _rImage, sal_Bool _bPrimary ); void ShowBrowseButton( sal_Bool _bPrimary ); void HideBrowseButton( sal_Bool _bPrimary ); @@ -123,7 +123,7 @@ namespace pcr void impl_layoutComponents(); PushButton& impl_ensureButton( bool _bPrimary ); - void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ); + void impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage ); }; //............................................................................ diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 342a9a454525..fa6bfcc36aca 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -229,7 +229,7 @@ namespace pcr void PropertyControlContext_Impl::impl_checkAlive_throw() const { if ( impl_isDisposed_nothrow() ) - throw DisposedException( ::rtl::OUString(), *const_cast< PropertyControlContext_Impl* >( this ) ); + throw DisposedException( OUString(), *const_cast< PropertyControlContext_Impl* >( this ) ); } //-------------------------------------------------------------------- @@ -533,7 +533,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserListBox::SetHelpText( const ::rtl::OUString& _rHelpText ) + void OBrowserListBox::SetHelpText( const OUString& _rHelpText ) { OSL_ENSURE( HasHelpSection(), "OBrowserListBox::SetHelpText: help section not visible!" ); m_pHelpWindow->SetText( _rHelpText ); @@ -654,7 +654,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserListBox::SetPropertyValue(const ::rtl::OUString& _rEntryName, const Any& _rValue, bool _bUnknownValue ) + void OBrowserListBox::SetPropertyValue(const OUString& _rEntryName, const Any& _rValue, bool _bUnknownValue ) { ListBoxLines::iterator line = m_aLines.begin(); for ( ; line != m_aLines.end() && ( line->aName != _rEntryName ); ++line ) @@ -675,7 +675,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_uInt16 OBrowserListBox::GetPropertyPos( const ::rtl::OUString& _rEntryName ) const + sal_uInt16 OBrowserListBox::GetPropertyPos( const OUString& _rEntryName ) const { sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND; for ( ListBoxLines::const_iterator linePos = m_aLines.begin(); @@ -694,7 +694,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool OBrowserListBox::impl_getBrowserLineForName( const ::rtl::OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const + bool OBrowserListBox::impl_getBrowserLineForName( const OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const { ListBoxLines::const_iterator line = m_aLines.begin(); for ( ; line != m_aLines.end() && ( line->aName != _rEntryName ); ++line ) @@ -708,7 +708,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OBrowserListBox::EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) + void OBrowserListBox::EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) { BrowserLinePointer pLine; if ( impl_getBrowserLineForName( _rEntryName, pLine ) ) @@ -716,7 +716,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OBrowserListBox::EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ) + void OBrowserListBox::EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ) { BrowserLinePointer pLine; if ( impl_getBrowserLineForName( _rEntryName, pLine ) ) @@ -724,7 +724,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XPropertyControl > OBrowserListBox::GetPropertyControl( const ::rtl::OUString& _rEntryName ) + Reference< XPropertyControl > OBrowserListBox::GetPropertyControl( const OUString& _rEntryName ) { BrowserLinePointer pLine; if ( impl_getBrowserLineForName( _rEntryName, pLine ) ) @@ -913,10 +913,10 @@ namespace pcr #ifdef DBG_UTIL if ( !_rLine.xHandler.is() ) { - ::rtl::OString sMessage( "OBrowserListBox::impl_setControlAsPropertyValue: no handler -> no conversion (property: '" ); - ::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() ); - sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "')!" ); + OString sMessage( "OBrowserListBox::impl_setControlAsPropertyValue: no handler -> no conversion (property: '" ); + OUString sPropertyName( _rLine.pLine->GetEntryName() ); + sMessage += OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "')!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -944,10 +944,10 @@ namespace pcr #ifdef DBG_UTIL if ( !_rLine.xHandler.is() ) { - ::rtl::OString sMessage( "OBrowserListBox::impl_getControlAsPropertyValue: no handler -> no conversion (property: '" ); - ::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() ); - sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "')!" ); + OString sMessage( "OBrowserListBox::impl_getControlAsPropertyValue: no handler -> no conversion (property: '" ); + OUString sPropertyName( _rLine.pLine->GetEntryName() ); + sMessage += OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "')!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -1070,7 +1070,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_Bool OBrowserListBox::RemoveEntry( const ::rtl::OUString& _rName ) + sal_Bool OBrowserListBox::RemoveEntry( const OUString& _rName ) { sal_uInt16 nPos = 0; ListBoxLines::iterator it = m_aLines.begin(); @@ -1181,8 +1181,8 @@ namespace pcr m_aOutOfDateLines.insert( nPos ); rLine.pLine->SetComponentHelpIds( HelpIdUrl::getHelpId( _rPropertyData.HelpURL ), - rtl::OUStringToOString( _rPropertyData.PrimaryButtonId, RTL_TEXTENCODING_UTF8 ), - rtl::OUStringToOString( _rPropertyData.SecondaryButtonId, RTL_TEXTENCODING_UTF8 ) + OUStringToOString( _rPropertyData.PrimaryButtonId, RTL_TEXTENCODING_UTF8 ), + OUStringToOString( _rPropertyData.SecondaryButtonId, RTL_TEXTENCODING_UTF8 ) ); if ( _rPropertyData.bReadOnly ) diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 4766cc4f6b6c..347604136007 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -54,12 +54,12 @@ namespace pcr typedef ::boost::shared_ptr< OBrowserLine > BrowserLinePointer; struct ListBoxLine { - ::rtl::OUString aName; + OUString aName; BrowserLinePointer pLine; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > xHandler; - ListBoxLine( const ::rtl::OUString& rName, BrowserLinePointer _pLine, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ) + ListBoxLine( const OUString& rName, BrowserLinePointer _pLine, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ) : aName( rName ), pLine( _pLine ), xHandler( _rxHandler ) @@ -141,21 +141,21 @@ namespace pcr void EnableHelpSection( bool _bEnable ); bool HasHelpSection() const; - void SetHelpText( const ::rtl::OUString& _rHelpText ); + void SetHelpText( const OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); void Clear(); sal_uInt16 InsertEntry( const OLineDescriptor&, sal_uInt16 nPos = EDITOR_LIST_APPEND ); - sal_Bool RemoveEntry( const ::rtl::OUString& _rName ); + sal_Bool RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor&, sal_uInt16 nPos ); - void SetPropertyValue( const ::rtl::OUString& rEntryName, const ::com::sun::star::uno::Any& rValue, bool _bUnknownValue ); - sal_uInt16 GetPropertyPos( const ::rtl::OUString& rEntryName ) const; + void SetPropertyValue( const OUString& rEntryName, const ::com::sun::star::uno::Any& rValue, bool _bUnknownValue ); + sal_uInt16 GetPropertyPos( const OUString& rEntryName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > - GetPropertyControl( const ::rtl::OUString& rEntryName ); - void EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); - void EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ); + GetPropertyControl( const OUString& rEntryName ); + void EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); + void EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ); sal_Int32 GetMinimumWidth(); sal_Int32 GetMinimumHeight(); @@ -208,7 +208,7 @@ namespace pcr if and only if a non- line for the given entry name could be found. */ - bool impl_getBrowserLineForName( const ::rtl::OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const; + bool impl_getBrowserLineForName( const OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const; /** returns the preferred height (in pixels) of the help section, or 0 if we currently don't have a help section diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index bef8d73f25bb..d4b25c2f84ec 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -53,7 +53,7 @@ namespace pcr DBG_CTOR( ButtonNavigationHandler, NULL ); m_aContext.createComponent( - ::rtl::OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" ), + OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" ), m_xSlaveHandler ); if ( !m_xSlaveHandler.is() ) throw RuntimeException(); @@ -66,16 +66,16 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" ); + return OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.ButtonNavigationHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.ButtonNavigationHandler" ); return aSupported; } @@ -87,7 +87,7 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL ButtonNavigationHandler::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL ButtonNavigationHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -116,7 +116,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -147,7 +147,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL ButtonNavigationHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL ButtonNavigationHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -201,16 +201,16 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aActuating( 2 ); + Sequence< OUString > aActuating( 2 ); aActuating[0] = PROPERTY_BUTTONTYPE; aActuating[1] = PROPERTY_TARGET_URL; return aActuating; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -231,7 +231,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rActuatingPropertyName ) ); @@ -257,7 +257,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx index 5cd55f7bfd59..b2b704db5ab5 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.hxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx @@ -44,8 +44,8 @@ namespace pcr ButtonNavigationHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~ButtonNavigationHandler(); @@ -55,16 +55,16 @@ namespace pcr protected: // XPropertyHandler overriables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 4162df9970b1..3106efcd4e18 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -61,16 +61,16 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.CellBindingPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.CellBindingPropertyHandler" ); return aSupported; } @@ -92,9 +92,9 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aInterestingProperties( 3 ); + Sequence< OUString > aInterestingProperties( 3 ); aInterestingProperties[0] = PROPERTY_LIST_CELL_RANGE; aInterestingProperties[1] = PROPERTY_BOUND_CELL; aInterestingProperties[2] = PROPERTY_CONTROLSOURCE; @@ -102,7 +102,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) + void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nActuatingPropId( impl_getPropertyId_throw( _rActuatingPropertyName ) ); @@ -168,7 +168,7 @@ namespace pcr try { if ( !xSource.is() ) - setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( Sequence< ::rtl::OUString >() ) ); + setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( Sequence< OUString >() ) ); } catch( const Exception& ) { @@ -181,7 +181,7 @@ namespace pcr // ----- DataField ----- case PROPERTY_ID_CONTROLSOURCE: { - ::rtl::OUString sControlSource; + OUString sControlSource; _rNewValue >>= sControlSource; if ( impl_isSupportedProperty_nothrow( PROPERTY_ID_BOUND_CELL ) ) _rxInspectorUI->enablePropertyUI( PROPERTY_BOUND_CELL, sControlSource.isEmpty() ); @@ -230,7 +230,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -276,7 +276,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -348,7 +348,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aPropertyValue; @@ -359,7 +359,7 @@ namespace pcr PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); switch( nPropId ) { @@ -396,7 +396,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL CellBindingPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, + Any SAL_CALL CellBindingPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& /*_rControlValueType*/ ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -468,7 +468,7 @@ namespace pcr if ( bAllowCellLinking ) { aProperties[ --nPos ] = Property( PROPERTY_BOUND_CELL, PROPERTY_ID_BOUND_CELL, - ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), 0 ); + ::getCppuType( static_cast< OUString* >( NULL ) ), 0 ); } if ( bAllowCellIntLinking ) { @@ -478,7 +478,7 @@ namespace pcr if ( bAllowListCellRange ) { aProperties[ --nPos ] = Property( PROPERTY_LIST_CELL_RANGE, PROPERTY_ID_LIST_CELL_RANGE, - ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), 0 ); + ::getCppuType( static_cast< OUString* >( NULL ) ), 0 ); } } diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index bb771ddf90d1..1dedcf78a1ac 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.hxx @@ -50,21 +50,21 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~CellBindingPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index ebaa842a2b11..718223996ac7 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -60,15 +60,15 @@ namespace pcr namespace { //.................................................................... - struct StringCompare : public ::std::unary_function< ::rtl::OUString, bool > + struct StringCompare : public ::std::unary_function< OUString, bool > { private: - ::rtl::OUString m_sReference; + OUString m_sReference; public: - StringCompare( const ::rtl::OUString& _rReference ) : m_sReference( _rReference ) { } + StringCompare( const OUString& _rReference ) : m_sReference( _rReference ) { } - inline bool operator()( const ::rtl::OUString& _rCompare ) + inline bool operator()( const OUString& _rCompare ) { return ( _rCompare == m_sReference ) ? true : false; } @@ -147,7 +147,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress ) const + bool CellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress ) const { Any aAddress; return doConvertAddressRepresentations( @@ -161,15 +161,15 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::doConvertAddressRepresentations( const ::rtl::OUString& _rInputProperty, const Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) + bool CellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue, + const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) { bool bSuccess = false; Reference< XPropertySet > xConverter( createDocumentDependentInstance( _bIsRange ? OUString(SERVICE_RANGEADDRESS_CONVERSION) : OUString(SERVICE_ADDRESS_CONVERSION), - ::rtl::OUString(), + OUString(), Any() ), UNO_QUERY @@ -195,7 +195,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, + bool CellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellRangeAddress& /* [out] */ _rAddress ) const { Any aAddress; @@ -222,7 +222,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XValueBinding > CellBindingHelper::createCellBindingFromStringAddress( const ::rtl::OUString& _rAddress, bool _bSupportIntegerExchange ) const + Reference< XValueBinding > CellBindingHelper::createCellBindingFromStringAddress( const OUString& _rAddress, bool _bSupportIntegerExchange ) const { Reference< XValueBinding > xBinding; if ( !m_xDocument.is() ) @@ -238,7 +238,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XListEntrySource > CellBindingHelper::createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const + Reference< XListEntrySource > CellBindingHelper::createCellListSourceFromStringAddress( const OUString& _rAddress ) const { Reference< XListEntrySource > xSource; @@ -257,7 +257,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XInterface > CellBindingHelper::createDocumentDependentInstance( const ::rtl::OUString& _rService, const ::rtl::OUString& _rArgumentName, + Reference< XInterface > CellBindingHelper::createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, const Any& _rArgumentValue ) const { Reference< XInterface > xReturn; @@ -322,10 +322,10 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString CellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const + OUString CellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const { CellAddress aAddress; - ::rtl::OUString sAddress; + OUString sAddress; if ( getAddressFromCellBinding( _rxBinding, aAddress ) ) { Any aStringAddress; @@ -339,11 +339,11 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString CellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const + OUString CellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const { OSL_PRECOND( !_rxSource.is() || isCellRangeListSource( _rxSource ), "CellBindingHelper::getStringAddressFromCellListSource: this is no cell list source!" ); - ::rtl::OUString sAddress; + OUString sAddress; if ( !m_xDocument.is() ) // very bad ... return sAddress; @@ -372,7 +372,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const + bool CellBindingHelper::isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const { bool bYesItIs = false; @@ -382,11 +382,11 @@ namespace pcr Reference< XMultiServiceFactory > xDocumentFactory( m_xDocument, UNO_QUERY ); OSL_ENSURE( xDocumentFactory.is(), "CellBindingHelper::isSpreadsheetDocumentWhichSupplies: spreadsheet document, but no factory?" ); - Sequence< ::rtl::OUString > aAvailableServices; + Sequence< OUString > aAvailableServices; if ( xDocumentFactory.is() ) aAvailableServices = xDocumentFactory->getAvailableServiceNames( ); - const ::rtl::OUString* pFound = ::std::find_if( + const OUString* pFound = ::std::find_if( aAvailableServices.getConstArray(), aAvailableServices.getConstArray() + aAvailableServices.getLength(), StringCompare( _rService ) @@ -504,7 +504,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const ::rtl::OUString& _rService ) const + bool CellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const { bool bDoes = false; Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY ); diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx index 12b9c65b42ee..b791bb0b8b1e 100644 --- a/extensions/source/propctrlr/cellbindinghelper.hxx +++ b/extensions/source/propctrlr/cellbindinghelper.hxx @@ -74,7 +74,7 @@ namespace pcr */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > createCellBindingFromStringAddress( - const ::rtl::OUString& _rAddress, + const OUString& _rAddress, bool _bSupportIntegerExchange = false ) const; @@ -90,7 +90,7 @@ namespace pcr /** gets a cell range list source binding for the given address */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > - createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const; + createCellListSourceFromStringAddress( const OUString& _rAddress ) const; /** creates a string representation for the given value binding's address @@ -101,7 +101,7 @@ namespace pcr The binding is a valid cell binding, or @see isCellBinding */ - ::rtl::OUString getStringAddressFromCellBinding( + OUString getStringAddressFromCellBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding ) const; @@ -128,7 +128,7 @@ namespace pcr The object is a valid cell range list source, or @see isCellRangeListSource */ - ::rtl::OUString getStringAddressFromCellListSource( + OUString getStringAddressFromCellListSource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ) const; @@ -204,27 +204,27 @@ namespace pcr /** creates an address object from a string representation of a cell address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellAddress& /* [out] */ _rAddress ) const; /** creates an address range object from a string representation of a cell range address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellRangeAddress& /* [out] */ _rAddress ) const; /** determines if our document is a spreadsheet document, *and* can supply the given service */ - bool isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const; + bool isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const; /** checkes whether a given component supports a given servive */ bool doesComponentSupport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, - const ::rtl::OUString& _rService + const OUString& _rService ) const; /** uses the document (it's factory interface, respectively) to create a component instance @@ -239,8 +239,8 @@ namespace pcr */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createDocumentDependentInstance( - const ::rtl::OUString& _rService, - const ::rtl::OUString& _rArgumentName, + const OUString& _rService, + const OUString& _rArgumentName, const ::com::sun::star::uno::Any& _rArgumentValue ) const; @@ -265,9 +265,9 @@ namespace pcr @see com::sun::star::table::CellRangeAddressConversion */ bool doConvertAddressRepresentations( - const ::rtl::OUString& _rInputProperty, + const OUString& _rInputProperty, const ::com::sun::star::uno::Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, + const OUString& _rOutputProperty, ::com::sun::star::uno::Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()); diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index f7708a20c6ea..f8aaa357c0cf 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -319,7 +319,7 @@ namespace pcr inline void CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::impl_checkDisposed_throw() { if ( ComponentBaseClass::rBHelper.bDisposed ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), *this ); + throw ::com::sun::star::lang::DisposedException( OUString(), *this ); } //............................................................................ diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 855cc0d985bc..87a174b958c6 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -62,7 +62,7 @@ namespace pcr }; //================================================================ - typedef ::std::set< ::rtl::OUString > StringBag; + typedef ::std::set< OUString > StringBag; typedef ::std::map< sal_Int16, StringBag > MapIntToStringBag; } @@ -138,16 +138,16 @@ namespace pcr void dispose(); // XObjectInspectorUI overridables - virtual void SAL_CALL enablePropertyUI( const ::rtl::OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (RuntimeException); - virtual void SAL_CALL enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (RuntimeException); - virtual void SAL_CALL rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); - virtual void SAL_CALL showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); - virtual void SAL_CALL hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); - virtual void SAL_CALL showCategory( const ::rtl::OUString& _rCategory, ::sal_Bool _bShow ) throw (RuntimeException); - virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (RuntimeException); + virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (RuntimeException); + virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL showCategory( const OUString& _rCategory, ::sal_Bool _bShow ) throw (RuntimeException); + virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException); virtual void SAL_CALL registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException); virtual void SAL_CALL revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException); - virtual void SAL_CALL setHelpSectionText( const ::rtl::OUString& _HelpText ) throw (NoSupportException, RuntimeException); + virtual void SAL_CALL setHelpSectionText( const OUString& _HelpText ) throw (NoSupportException, RuntimeException); // UNOCompatibleNonUNOReference overridables virtual void SAL_CALL acquire() throw(); @@ -163,7 +163,7 @@ namespace pcr void checkDisposed() const; private: - void impl_markElementEnabledOrDisabled( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ); + void impl_markElementEnabledOrDisabled( const OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ); /** calls m_pUIChangeNotification at m_rMaster */ @@ -242,7 +242,7 @@ namespace pcr //---------------------------------------------------------------- namespace { - void lcl_markStringKeyPositiveOrNegative( const ::rtl::OUString& _rKeyName, StringBag& _rPositives, StringBag& _rNegatives, sal_Bool _bMarkPositive ) + void lcl_markStringKeyPositiveOrNegative( const OUString& _rKeyName, StringBag& _rPositives, StringBag& _rNegatives, sal_Bool _bMarkPositive ) { if ( _bMarkPositive ) { @@ -256,7 +256,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::enablePropertyUI( const ::rtl::OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) + void CachedInspectorUI::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -267,7 +267,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::impl_markElementEnabledOrDisabled( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ) + void CachedInspectorUI::impl_markElementEnabledOrDisabled( const OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ) { if ( _nElementIdOrZero == 0 ) return; @@ -287,7 +287,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) + void CachedInspectorUI::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -301,7 +301,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void CachedInspectorUI::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -313,7 +313,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void CachedInspectorUI::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -327,7 +327,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void CachedInspectorUI::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -338,7 +338,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::showCategory( const ::rtl::OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) + void CachedInspectorUI::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -347,7 +347,7 @@ namespace pcr } //---------------------------------------------------------------- - Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -375,7 +375,7 @@ namespace pcr } //---------------------------------------------------------------- - void SAL_CALL CachedInspectorUI::setHelpSectionText( const ::rtl::OUString& _HelpText ) throw (NoSupportException, RuntimeException) + void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& _HelpText ) throw (NoSupportException, RuntimeException) { m_rMaster.getDelegatorUI()->setHelpSectionText( _HelpText ); } @@ -481,7 +481,7 @@ namespace pcr //============================================================ /** a typedef for a ->XObjectInspectorUI member function taking a string */ - typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUISetter )( const ::rtl::OUString& ); + typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUISetter )( const OUString& ); //============================================================ //= PropertyUIOperator @@ -489,7 +489,7 @@ namespace pcr /** an STL-compatible struct which calls a certain member method (taking a string) at a given ->XObjectInspectorUI instance */ - struct PropertyUIOperator : public ::std::unary_function< ::rtl::OUString, void > + struct PropertyUIOperator : public ::std::unary_function< OUString, void > { private: Reference< XObjectInspectorUI > m_xUpdater; @@ -502,7 +502,7 @@ namespace pcr { } - void operator()( const ::rtl::OUString& _rPropertyName ) + void operator()( const OUString& _rPropertyName ) { ((m_xUpdater.get())->*m_pSetter)( _rPropertyName ); } @@ -522,7 +522,7 @@ namespace pcr class IStringKeyBooleanUIUpdate { public: - virtual void updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const = 0; + virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const = 0; virtual ~IStringKeyBooleanUIUpdate() { } }; @@ -548,11 +548,11 @@ namespace pcr { } // IStringKeyBooleanUIUpdate - virtual void updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const; + virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const; }; //............................................................ - void EnablePropertyUIElement::updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const + void EnablePropertyUIElement::updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const { m_xUIUpdate->enablePropertyUIElements( _rKey, m_nElement, _bFlag ); } @@ -562,7 +562,7 @@ namespace pcr //============================================================ /** a ->XObjectInspectorUI method taking a string and a boolean */ - typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUIFlagSetter )( const ::rtl::OUString&, sal_Bool ); + typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUIFlagSetter )( const OUString&, sal_Bool ); //============================================================ //= DefaultStringKeyBooleanUIUpdate @@ -579,7 +579,7 @@ namespace pcr public: DefaultStringKeyBooleanUIUpdate( const Reference< XObjectInspectorUI >& _rxUIUpdate, FPropertyUIFlagSetter _pSetter ); // IStringKeyBooleanUIUpdate - virtual void updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const; + virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const; }; //............................................................ @@ -590,7 +590,7 @@ namespace pcr } //............................................................ - void DefaultStringKeyBooleanUIUpdate::updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const + void DefaultStringKeyBooleanUIUpdate::updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const { ((m_xUIUpdate.get())->*m_pSetter)( _rKey, _bFlag ); } @@ -601,7 +601,7 @@ namespace pcr /** an STL-compatible structure which applies a ->IStringKeyBooleanUIUpdate::updateUIForKey operation with a fixed boolean value, for a given string value */ - struct BooleanUIAspectUpdate : public ::std::unary_function< ::rtl::OUString, void > + struct BooleanUIAspectUpdate : public ::std::unary_function< OUString, void > { private: const IStringKeyBooleanUIUpdate& m_rUpdater; @@ -614,7 +614,7 @@ namespace pcr { } - void operator()( const ::rtl::OUString& _rPropertyName ) + void operator()( const OUString& _rPropertyName ) { m_rUpdater.updateUIForKey( _rPropertyName, m_bFlag ); } @@ -630,7 +630,7 @@ namespace pcr //============================================================ /** an STL-compatible structure subtracting a given string from a fixed ->StringBag */ - struct StringBagComplement : public ::std::unary_function< ::rtl::OUString, void > + struct StringBagComplement : public ::std::unary_function< OUString, void > { private: StringBag& m_rMinuend; @@ -638,7 +638,7 @@ namespace pcr public: StringBagComplement( StringBag& _rMinuend ) :m_rMinuend( _rMinuend ) { } - void operator()( const ::rtl::OUString& _rPropertyToSubtract ) + void operator()( const OUString& _rPropertyToSubtract ) { m_rMinuend.erase( _rPropertyToSubtract ); } @@ -830,7 +830,7 @@ namespace pcr } //---------------------------------------------------------------- - bool ComposedPropertyUIUpdate::shouldContinuePropertyHandling( const ::rtl::OUString& _rName ) const + bool ComposedPropertyUIUpdate::shouldContinuePropertyHandling( const OUString& _rName ) const { if ( !m_pPropertyCheck ) return true; diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index 4ae7769a10c5..04899f15598b 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -44,7 +44,7 @@ namespace pcr class SAL_NO_VTABLE IPropertyExistenceCheck { public: - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) = 0; protected: ~IPropertyExistenceCheck() {} @@ -143,7 +143,7 @@ namespace pcr /** invokes m_pPropertyCheck to check whether a given property should be handled */ - bool shouldContinuePropertyHandling( const ::rtl::OUString& _rName ) const; + bool shouldContinuePropertyHandling( const OUString& _rName ) const; private: /// determines whether the instance is already disposed diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index d7b17559a744..861583f686be 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -78,15 +78,15 @@ namespace pcr } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OControlFontDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OControlFontDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //--------------------------------------------------------------------- - ::rtl::OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) + OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.form.ui.OControlFontDialog"); + return OUString("org.openoffice.comp.form.ui.OControlFontDialog"); } //--------------------------------------------------------------------- @@ -99,7 +99,7 @@ namespace pcr ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.form.ControlFontDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.form.ControlFontDialog"); return aSupported; } diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index b0108c8c513d..c0db06a47b63 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -61,12 +61,12 @@ namespace pcr virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 0f2c2a1eab90..7fb4906752b4 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -73,28 +73,28 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ - ::rtl::OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) + OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); + return OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"); return aSupported; } @@ -152,7 +152,7 @@ namespace pcr { if ( aFactories[i].isFormOnly && !m_bUseFormComponentHandlers ) continue; - *pReturn++ <<= ::rtl::OUString::createFromAscii( aFactories[i].serviceName ); + *pReturn++ <<= OUString::createFromAscii( aFactories[i].serviceName ); } aReturn.realloc( pReturn - aReturn.getArray() ); @@ -180,7 +180,7 @@ namespace pcr PropertyCategoryDescriptor* pReturn = aReturn.getArray(); for ( sal_Int32 i=0; iProgrammaticName = ::rtl::OUString::createFromAscii( aCategories[i].programmaticName ); + pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName ); pReturn->UIName = String( PcrRes( aCategories[i].uiNameResId ) ); pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId ); } @@ -189,7 +189,7 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException) { sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) ); if ( nPropertyId == -1 ) @@ -221,12 +221,12 @@ namespace pcr if ( arguments.size() == 2 ) { // constructor: "createWithHelpSection( long, long )" if ( !( arguments[0] >>= nMinHelpTextLines ) || !( arguments[1] >>= nMaxHelpTextLines ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); createWithHelpSection( nMinHelpTextLines, nMaxHelpTextLines ); return; } - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); } //-------------------------------------------------------------------- @@ -239,7 +239,7 @@ namespace pcr void DefaultFormComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); enableHelpSectionProperties( _nMinHelpTextLines, _nMaxHelpTextLines ); m_bConstructed = true; diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index a4075dc2aea6..543de989a440 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -47,21 +47,21 @@ namespace pcr ~DefaultFormComponentInspectorModel(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XObjectInspectorModel virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getHandlerFactories() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 6eadb114baa5..695159f15667 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -73,16 +73,16 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) + OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.DefaultHelpProvider"); + return OUString("org.openoffice.comp.extensions.DefaultHelpProvider"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.inspection.DefaultHelpProvider"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.inspection.DefaultHelpProvider"); return aSupported; } @@ -96,7 +96,7 @@ namespace pcr void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& _Control ) throw (RuntimeException) { if ( !m_xInspectorUI.is() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); try { @@ -128,14 +128,14 @@ namespace pcr return; } - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); } //-------------------------------------------------------------------- void DefaultHelpProvider::create( const Reference< XObjectInspectorUI >& _rxUI ) { if ( !_rxUI.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); try { @@ -172,9 +172,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString DefaultHelpProvider::impl_getHelpText_nothrow( const Reference< XPropertyControl >& _rxControl ) + OUString DefaultHelpProvider::impl_getHelpText_nothrow( const Reference< XPropertyControl >& _rxControl ) { - ::rtl::OUString sHelpText; + OUString sHelpText; OSL_PRECOND( _rxControl.is(), "DefaultHelpProvider::impl_getHelpText_nothrow: illegal control!" ); if ( !_rxControl.is() ) return sHelpText; diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index cf0444c58740..3d8ee8060d63 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -52,8 +52,8 @@ namespace pcr DefaultHelpProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -73,7 +73,7 @@ namespace pcr private: Window* impl_getVclControlWindow_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); - ::rtl::OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); + OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); }; //........................................................................ diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index f31ca74a7c0a..bca96ac2dc3a 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -64,21 +64,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EditPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.EditPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.EditPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.EditPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL EditPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EditPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -134,7 +134,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EditPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL EditPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -229,38 +229,38 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aSuperseded; + ::std::vector< OUString > aSuperseded; if ( implHaveBothScrollBarProperties() ) { - aSuperseded.push_back( static_cast(PROPERTY_HSCROLL) ); - aSuperseded.push_back( static_cast(PROPERTY_VSCROLL) ); + aSuperseded.push_back( static_cast(PROPERTY_HSCROLL) ); + aSuperseded.push_back( static_cast(PROPERTY_VSCROLL) ); } if ( implHaveTextTypeProperty() ) { - aSuperseded.push_back( static_cast(PROPERTY_RICHTEXT) ); - aSuperseded.push_back( static_cast(PROPERTY_MULTILINE) ); + aSuperseded.push_back( static_cast(PROPERTY_RICHTEXT) ); + aSuperseded.push_back( static_cast(PROPERTY_MULTILINE) ); } if ( aSuperseded.empty() ) - return Sequence< ::rtl::OUString >(); - return Sequence< ::rtl::OUString >( &(*aSuperseded.begin()), aSuperseded.size() ); + return Sequence< OUString >(); + return Sequence< OUString >( &(*aSuperseded.begin()), aSuperseded.size() ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aInterestingActuatingProps; + ::std::vector< OUString > aInterestingActuatingProps; if ( implHaveTextTypeProperty() ) - aInterestingActuatingProps.push_back( static_cast(PROPERTY_TEXTTYPE) ); - aInterestingActuatingProps.push_back( static_cast(PROPERTY_MULTILINE) ); - return Sequence< ::rtl::OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() ); + aInterestingActuatingProps.push_back( static_cast(PROPERTY_TEXTTYPE) ); + aInterestingActuatingProps.push_back( static_cast(PROPERTY_MULTILINE) ); + return Sequence< OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() ); } //-------------------------------------------------------------------- - void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) + void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -285,7 +285,7 @@ namespace pcr _rxInspectorUI->enablePropertyUI( PROPERTY_LINEEND_FORMAT, nTextType != TEXTTYPE_SINGLELINE ); _rxInspectorUI->enablePropertyUI( PROPERTY_VERTICAL_ALIGN, nTextType == TEXTTYPE_SINGLELINE ); - _rxInspectorUI->showCategory( ::rtl::OUString( "Data" ), nTextType != TEXTTYPE_RICHTEXT ); + _rxInspectorUI->showCategory( OUString( "Data" ), nTextType != TEXTTYPE_RICHTEXT ); } break; diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index 803f1ca6d668..62d13b4ad231 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -41,19 +41,19 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~EditPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 0306c7fdb87c..daae33437f13 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -56,9 +56,9 @@ namespace pcr namespace { //-------------------------------------------------------------------- - ::rtl::OUString composeModelElementUIName( const ::rtl::OUString& _rModelName, const ::rtl::OUString& _rElementName ) + OUString composeModelElementUIName( const OUString& _rModelName, const OUString& _rElementName ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "[" ); aBuffer.append( _rModelName ); aBuffer.appendAscii( "] " ); @@ -222,11 +222,11 @@ namespace pcr if ( _bDoListening ) { - xBindingProps->addPropertyChangeListener( ::rtl::OUString(), _rxListener ); + xBindingProps->addPropertyChangeListener( OUString(), _rxListener ); } else { - xBindingProps->removePropertyChangeListener( ::rtl::OUString(), _rxListener ); + xBindingProps->removePropertyChangeListener( OUString(), _rxListener ); } } @@ -298,7 +298,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::getFormModelNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()) + void EFormsHelper::getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()) { if ( m_xDocument.is() ) { @@ -310,7 +310,7 @@ namespace pcr OSL_ENSURE( xForms.is(), "EFormsHelper::getFormModelNames: invalid forms container!" ); if ( xForms.is() ) { - Sequence< ::rtl::OUString > aModelNames = xForms->getElementNames(); + Sequence< OUString > aModelNames = xForms->getElementNames(); _rModelNames.resize( aModelNames.getLength() ); ::std::copy( aModelNames.getConstArray(), aModelNames.getConstArray() + aModelNames.getLength(), _rModelNames.begin() @@ -325,7 +325,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::getBindingNames( const ::rtl::OUString& _rModelName, ::std::vector< ::rtl::OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()) + void EFormsHelper::getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()) { _rBindingNames.resize( 0 ); try @@ -337,7 +337,7 @@ namespace pcr OSL_ENSURE( xBindings.is(), "EFormsHelper::getBindingNames: invalid bindings container obtained from the model!" ); if ( xBindings.is() ) { - Sequence< ::rtl::OUString > aNames = xBindings->getElementNames(); + Sequence< OUString > aNames = xBindings->getElementNames(); _rBindingNames.resize( aNames.getLength() ); ::std::copy( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), _rBindingNames.begin() ); } @@ -350,7 +350,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< xforms::XModel > EFormsHelper::getFormModelByName( const ::rtl::OUString& _rModelName ) const SAL_THROW(()) + Reference< xforms::XModel > EFormsHelper::getFormModelByName( const OUString& _rModelName ) const SAL_THROW(()) { Reference< xforms::XModel > xReturn; try @@ -387,9 +387,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EFormsHelper::getCurrentFormModelName() const SAL_THROW(()) + OUString EFormsHelper::getCurrentFormModelName() const SAL_THROW(()) { - ::rtl::OUString sModelName; + OUString sModelName; try { Reference< xforms::XModel > xFormsModel( getCurrentFormModel() ); @@ -422,9 +422,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EFormsHelper::getCurrentBindingName() const SAL_THROW(()) + OUString EFormsHelper::getCurrentBindingName() const SAL_THROW(()) { - ::rtl::OUString sBindingName; + OUString sBindingName; try { Reference< XPropertySet > xBinding( getCurrentBinding() ); @@ -489,7 +489,7 @@ namespace pcr m_xBindableControl->setValueBinding( xBinding ); impl_toggleBindingPropertyListening_throw( true, NULL ); - ::std::set< ::rtl::OUString > aSet; + ::std::set< OUString > aSet; firePropertyChanges( xOldBinding, _rxBinding, aSet ); } catch( const Exception& ) @@ -499,25 +499,25 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()) + Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()) { OSL_ENSURE( !_rBindingName.isEmpty(), "EFormsHelper::getOrCreateBindingForModel: invalid binding name!" ); return implGetOrCreateBinding( _rTargetModel, _rBindingName ); } //-------------------------------------------------------------------- - Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()) + Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()) { OSL_ENSURE( !( _rTargetModel.isEmpty() && !_rBindingName.isEmpty() ), "EFormsHelper::implGetOrCreateBinding: no model, but a binding name?" ); Reference< XPropertySet > xBinding; try { - ::rtl::OUString sTargetModel( _rTargetModel ); + OUString sTargetModel( _rTargetModel ); // determine the model which the binding should belong to if ( sTargetModel.isEmpty() ) { - ::std::vector< ::rtl::OUString > aModelNames; + ::std::vector< OUString > aModelNames; getFormModelNames( aModelNames ); if ( !aModelNames.empty() ) sTargetModel = *aModelNames.begin(); @@ -549,12 +549,12 @@ namespace pcr { // find a nice name for it String sBaseName( PcrRes( RID_STR_BINDING_UI_NAME ) ); - sBaseName += rtl::OUString(" "); + sBaseName += OUString(" "); String sNewName; sal_Int32 nNumber = 1; do { - sNewName = sBaseName + ::rtl::OUString::valueOf( nNumber++ ); + sNewName = sBaseName + OUString::valueOf( nNumber++ ); } while ( xBindingNames->hasByName( sNewName ) ); Reference< XNamed > xName( xBinding, UNO_QUERY_THROW ); @@ -609,9 +609,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const SAL_THROW(()) + OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const SAL_THROW(()) { - ::rtl::OUString sUIName; + OUString sUIName; try { // determine the model which the element belongs to @@ -621,7 +621,7 @@ namespace pcr OSL_ENSURE( xHelper.is(), "EFormsHelper::getModelElementUIName: invalid element or model!" ); if ( xHelper.is() ) { - ::rtl::OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( _rxElement, sal_True ) : xHelper->getBindingName( _rxElement, sal_True ); + OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( _rxElement, sal_True ) : xHelper->getBindingName( _rxElement, sal_True ); Reference< xforms::XModel > xModel( xHelper, UNO_QUERY_THROW ); sUIName = composeModelElementUIName( xModel->getID(), sElementName ); } @@ -635,7 +635,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XPropertySet > EFormsHelper::getModelElementFromUIName( const EFormsHelper::ModelElementType _eType, const ::rtl::OUString& _rUIName ) const SAL_THROW(()) + Reference< XPropertySet > EFormsHelper::getModelElementFromUIName( const EFormsHelper::ModelElementType _eType, const OUString& _rUIName ) const SAL_THROW(()) { const MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames ); MapStringToPropertySet::const_iterator pos = rMapUINameToElement.find( _rUIName ); @@ -645,24 +645,24 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::getAllElementUINames( const ModelElementType _eType, ::std::vector< ::rtl::OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ) + void EFormsHelper::getAllElementUINames( const ModelElementType _eType, ::std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ) { MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames ); rMapUINameToElement.clear(); _rElementNames.resize( 0 ); if ( _bPrepentEmptyEntry ) - rMapUINameToElement[ ::rtl::OUString() ] = Reference< XPropertySet >(); + rMapUINameToElement[ OUString() ] = Reference< XPropertySet >(); try { // obtain the model names - ::std::vector< ::rtl::OUString > aModels; + ::std::vector< OUString > aModels; getFormModelNames( aModels ); _rElementNames.reserve( aModels.size() * 2 ); // heuristics // for every model, obtain the element - for ( ::std::vector< ::rtl::OUString >::const_iterator pModelName = aModels.begin(); + for ( ::std::vector< OUString >::const_iterator pModelName = aModels.begin(); pModelName != aModels.end(); ++pModelName ) @@ -693,8 +693,8 @@ namespace pcr xElement->setPropertyValue( PROPERTY_MODEL, makeAny( xModel ) ); } #endif - ::rtl::OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( xElement, sal_True ) : xHelper->getBindingName( xElement, sal_True ); - ::rtl::OUString sUIName = composeModelElementUIName( *pModelName, sElementName ); + OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( xElement, sal_True ) : xHelper->getBindingName( xElement, sal_True ); + OUString sUIName = composeModelElementUIName( *pModelName, sElementName ); OSL_ENSURE( rMapUINameToElement.find( sUIName ) == rMapUINameToElement.end(), "EFormsHelper::getAllElementUINames: duplicate name!" ); rMapUINameToElement.insert( MapStringToPropertySet::value_type( sUIName, xElement ) ); @@ -711,7 +711,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::firePropertyChange( const ::rtl::OUString& _rName, const Any& _rOldValue, const Any& _rNewValue ) const + void EFormsHelper::firePropertyChange( const OUString& _rName, const Any& _rOldValue, const Any& _rNewValue ) const { if ( m_aPropertyListeners.empty() ) return; @@ -737,7 +737,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::firePropertyChanges( const Reference< XPropertySet >& _rxOldProps, const Reference< XPropertySet >& _rxNewProps, ::std::set< ::rtl::OUString >& _rFilter ) const + void EFormsHelper::firePropertyChanges( const Reference< XPropertySet >& _rxOldProps, const Reference< XPropertySet >& _rxNewProps, ::std::set< OUString >& _rFilter ) const { if ( m_aPropertyListeners.empty() ) return; diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx index d4ba742fc817..4c7cab782d77 100644 --- a/extensions/source/propctrlr/eformshelper.hxx +++ b/extensions/source/propctrlr/eformshelper.hxx @@ -41,7 +41,7 @@ namespace pcr { //........................................................................ - typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::std::less< ::rtl::OUString > > + typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::std::less< OUString > > MapStringToPropertySet; //==================================================================== @@ -117,16 +117,16 @@ namespace pcr /** retrieves the names of all XForms models in the document the control lives in */ - void getFormModelNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()); + void getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()); /** retrieves the names of all bindings for a given model @see getFormModelNames */ - void getBindingNames( const ::rtl::OUString& _rModelName, ::std::vector< ::rtl::OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()); + void getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()); /// retrieves the XForms model (within the control model's document) with the given name ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel > - getFormModelByName( const ::rtl::OUString& _rModelName ) const SAL_THROW(()); + getFormModelByName( const OUString& _rModelName ) const SAL_THROW(()); /** retrieves the model which the active binding of the control model belongs to */ @@ -135,7 +135,7 @@ namespace pcr /** retrieves the name of the model which the active binding of the control model belongs to */ - ::rtl::OUString + OUString getCurrentFormModelName() const SAL_THROW(()); /** retrieves the binding instance which is currently attached to the control model @@ -145,7 +145,7 @@ namespace pcr /** retrieves the name of the binding instance which is currently attached to the control model */ - ::rtl::OUString + OUString getCurrentBindingName() const SAL_THROW(()); /** sets a new binding at the control model @@ -172,7 +172,7 @@ namespace pcr have a binding with this name, a new binding is created and returned. */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - getOrCreateBindingForModel( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()); + getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()); /** types of sub-elements of a model */ @@ -186,7 +186,7 @@ namespace pcr @see getModelElementFromUIName @see getAllElementUINames */ - ::rtl::OUString + OUString getModelElementUIName( const ModelElementType _eType, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement @@ -202,7 +202,7 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getModelElementFromUIName( const ModelElementType _eType, - const ::rtl::OUString& _rUIName + const OUString& _rUIName ) const SAL_THROW(()); /** retrieves the UI names of all elements of all models in our document @@ -215,7 +215,7 @@ namespace pcr */ void getAllElementUINames( const ModelElementType _eType, - ::std::vector< ::rtl::OUString >& /* [out] */ _rElementNames, + ::std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ); @@ -223,14 +223,14 @@ namespace pcr void firePropertyChanges( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxOldProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxNewProps, - ::std::set< ::rtl::OUString >& _rFilter + ::std::set< OUString >& _rFilter ) const; /** fires a change in a single property, if the property value changed, and if we have a listener interested in property changes */ void firePropertyChange( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue ) const; @@ -240,7 +240,7 @@ namespace pcr /// implementation for both getOrCreateBindingForModel ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - implGetOrCreateBinding( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()); + implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()); void impl_toggleBindingPropertyListening_throw( bool _bDoListen, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxConcreteListenerOrNull ); diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 848f6f52c47e..063735450d2b 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -72,30 +72,30 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.XMLFormsPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.XMLFormsPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - ::rtl::OUString EFormsPropertyHandler::getModelNamePropertyValue() const + OUString EFormsPropertyHandler::getModelNamePropertyValue() const { - ::rtl::OUString sModelName = m_pHelper->getCurrentFormModelName(); + OUString sModelName = m_pHelper->getCurrentFormModelName(); if ( sModelName.isEmpty() ) sModelName = m_sBindingLessModelName; return sModelName; } //-------------------------------------------------------------------- - Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -131,11 +131,11 @@ namespace pcr if ( xBindingProps.is() ) { aReturn = xBindingProps->getPropertyValue( _rPropertyName ); - DBG_ASSERT( aReturn.getValueType().equals( ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ) ), + DBG_ASSERT( aReturn.getValueType().equals( ::getCppuType( static_cast< OUString* >( NULL ) ) ), "EFormsPropertyHandler::getPropertyValue: invalid BindingExpression value type!" ); } else - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); } break; @@ -147,9 +147,9 @@ namespace pcr catch( const Exception& ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "EFormsPropertyHandler::getPropertyValue: caught an exception!" ); + OString sMessage( "EFormsPropertyHandler::getPropertyValue: caught an exception!" ); sMessage += "\n(have been asked for the \""; - sMessage += ::rtl::OString( _rPropertyName.getStr(), _rPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( _rPropertyName.getStr(), _rPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += "\" property.)"; OSL_FAIL( sMessage.getStr() ); #endif @@ -158,7 +158,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EFormsPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL EFormsPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -187,17 +187,17 @@ namespace pcr // if the model changed, reset the binding to NULL if ( m_pHelper->getCurrentFormModelName() != m_sBindingLessModelName ) { - ::rtl::OUString sOldBindingName = m_pHelper->getCurrentBindingName(); + OUString sOldBindingName = m_pHelper->getCurrentBindingName(); m_pHelper->setBinding( NULL ); firePropertyChange( PROPERTY_BINDING_NAME, PROPERTY_ID_BINDING_NAME, - makeAny( sOldBindingName ), makeAny( ::rtl::OUString() ) ); + makeAny( sOldBindingName ), makeAny( OUString() ) ); } } break; case PROPERTY_ID_BINDING_NAME: { - ::rtl::OUString sNewBindingName; + OUString sNewBindingName; OSL_VERIFY( _rValue >>= sNewBindingName ); bool bPreviouslyEmptyModel = !m_pHelper->getCurrentFormModel().is(); @@ -223,7 +223,7 @@ namespace pcr // However, there's no such mechanism in place currently. m_bSimulatingModelChange = true; firePropertyChange( PROPERTY_XML_DATA_MODEL, PROPERTY_ID_XML_DATA_MODEL, - makeAny( ::rtl::OUString() ), makeAny( getModelNamePropertyValue() ) ); + makeAny( OUString() ), makeAny( getModelNamePropertyValue() ) ); m_bSimulatingModelChange = false; } } @@ -248,7 +248,7 @@ namespace pcr DBG_ASSERT( xBindingProps.is(), "EFormsPropertyHandler::setPropertyValue: how can I set a property if there's no binding?" ); if ( xBindingProps.is() ) { - DBG_ASSERT( _rValue.getValueType().equals( ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ) ), + DBG_ASSERT( _rValue.getValueType().equals( ::getCppuType( static_cast< OUString* >( NULL ) ) ), "EFormsPropertyHandler::setPropertyValue: invalid value type!" ); xBindingProps->setPropertyValue( _rPropertyName, _rValue ); } @@ -316,7 +316,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aReturn; @@ -327,7 +327,7 @@ namespace pcr PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); - ::rtl::OUString sControlValue; + OUString sControlValue; switch ( nPropId ) { case PROPERTY_ID_LIST_BINDING: @@ -349,7 +349,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aReturn; @@ -382,32 +382,32 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - ::std::vector< ::rtl::OUString > aInterestedInActuations( 2 ); + ::std::vector< OUString > aInterestedInActuations( 2 ); aInterestedInActuations[ 0 ] = PROPERTY_XML_DATA_MODEL; aInterestedInActuations[ 1 ] = PROPERTY_BINDING_NAME; - return Sequence< ::rtl::OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); + return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - Sequence< ::rtl::OUString > aReturn( 1 ); + Sequence< OUString > aReturn( 1 ); aReturn[ 0 ] = PROPERTY_INPUT_REQUIRED; return aReturn; } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -419,7 +419,7 @@ namespace pcr LineDescriptor aDescriptor; sal_Int16 nControlType = PropertyControlType::TextField; - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); switch ( nPropId ) { @@ -436,18 +436,18 @@ namespace pcr case PROPERTY_ID_BINDING_NAME: { nControlType = PropertyControlType::ComboBox; - ::rtl::OUString sCurrentModel( getModelNamePropertyValue() ); + OUString sCurrentModel( getModelNamePropertyValue() ); if ( !sCurrentModel.isEmpty() ) m_pHelper->getBindingNames( sCurrentModel, aListEntries ); } break; - case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BIND_EXPRESSION); break; - case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_REQUIRED); break; - case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_RELEVANT); break; - case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_READONLY); break; - case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CONSTRAINT); break; - case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CALCULATION); break; + case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BIND_EXPRESSION); break; + case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_REQUIRED); break; + case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_RELEVANT); break; + case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_READONLY); break; + case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_CONSTRAINT); break; + case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_CALCULATION); break; default: OSL_FAIL( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" ); @@ -468,13 +468,13 @@ namespace pcr } aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); - aDescriptor.Category = ::rtl::OUString( "Data" ); + aDescriptor.Category = OUString( "Data" ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); return aDescriptor; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -505,22 +505,22 @@ namespace pcr // the binding for the dialog to work with Reference< XPropertySet > xBinding( m_pHelper->getCurrentBinding() ); // the aspect of the binding which the dialog should modify - ::rtl::OUString sFacetName( _rPropertyName ); + OUString sFacetName( _rPropertyName ); OSL_ENSURE( xModel.is() && xBinding.is() && !sFacetName.isEmpty(), "EFormsPropertyHandler::onInteractivePropertySelection: something is missing for the dialog initialization!" ); if ( !( xModel.is() && xBinding.is() && !sFacetName.isEmpty() ) ) return InteractiveSelectionResult_Cancelled; - xDialogProps->setPropertyValue( ::rtl::OUString( "FormModel" ), makeAny( xModel ) ); - xDialogProps->setPropertyValue( ::rtl::OUString( "Binding" ), makeAny( xBinding ) ); - xDialogProps->setPropertyValue( ::rtl::OUString( "FacetName" ), makeAny( sFacetName ) ); + xDialogProps->setPropertyValue( OUString( "FormModel" ), makeAny( xModel ) ); + xDialogProps->setPropertyValue( OUString( "Binding" ), makeAny( xBinding ) ); + xDialogProps->setPropertyValue( OUString( "FacetName" ), makeAny( sFacetName ) ); if ( !xDialog->execute() ) // cancelled return InteractiveSelectionResult_Cancelled; - _rData = xDialogProps->getPropertyValue( ::rtl::OUString( "ConditionValue" ) ); + _rData = xDialogProps->getPropertyValue( OUString( "ConditionValue" ) ); return InteractiveSelectionResult_ObtainedValue; } catch( const Exception& ) @@ -551,7 +551,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) + void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -571,7 +571,7 @@ namespace pcr { if ( m_bSimulatingModelChange ) break; - ::rtl::OUString sDataModelName; + OUString sDataModelName; OSL_VERIFY( _rNewValue >>= sDataModelName ); sal_Bool bBoundToSomeModel = !sDataModelName.isEmpty(); _rxInspectorUI->rebuildPropertyUI( PROPERTY_BINDING_NAME ); diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index cbad1720c6d9..cbeb8cc3feb5 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.hxx @@ -41,7 +41,7 @@ namespace pcr ::std::auto_ptr< EFormsHelper > m_pHelper; /** current value of the Model property, if there is no binding, yet */ - ::rtl::OUString m_sBindingLessModelName; + OUString m_sBindingLessModelName; /** are we currently simulating a propertyChange event of the Model property? */ bool m_bSimulatingModelChange; @@ -51,27 +51,27 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~EFormsPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); @@ -86,7 +86,7 @@ namespace pcr An extra method is necessary here, which respects both the value set at our helper, and m_sBindingLessModelName */ - ::rtl::OUString getModelNamePropertyValue() const; + OUString getModelNamePropertyValue() const; }; //........................................................................ diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx index 0834b7888c49..2d8d373af540 100644 --- a/extensions/source/propctrlr/enumrepresentation.hxx +++ b/extensions/source/propctrlr/enumrepresentation.hxx @@ -39,19 +39,19 @@ namespace pcr public: /** retrieves all descriptions of all possible values of the enumeration property */ - virtual ::std::vector< ::rtl::OUString > SAL_CALL getDescriptions( + virtual ::std::vector< OUString > SAL_CALL getDescriptions( ) const = 0; /** converts a given description into a property value */ virtual void SAL_CALL getValueFromDescription( - const ::rtl::OUString& _rDescription, + const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const = 0; /** converts a given property value into a description */ - virtual ::rtl::OUString SAL_CALL getDescriptionForValue( + virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const = 0; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 5422e02aa025..fb058aa74279 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -142,14 +142,14 @@ namespace pcr //= EventDescription //==================================================================== EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, - const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const rtl::OString& _sHelpId, const rtl::OString& _sUniqueBrowseId ) + const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ) :sDisplayName( String( PcrRes( _nDisplayNameResId ) ) ) - ,sListenerMethodName( ::rtl::OUString::createFromAscii( _pListenerMethodAsciiName ) ) + ,sListenerMethodName( OUString::createFromAscii( _pListenerMethodAsciiName ) ) ,sHelpId( _sHelpId ) ,sUniqueBrowseId( _sUniqueBrowseId ) ,nId( _nId ) { - ::rtl::OUStringBuffer aQualifiedListenerClass; + OUStringBuffer aQualifiedListenerClass; aQualifiedListenerClass.appendAscii( "com.sun.star." ); aQualifiedListenerClass.appendAscii( _pListenerNamespaceAscii ); aQualifiedListenerClass.appendAscii( "." ); @@ -165,11 +165,11 @@ namespace pcr //.................................................................... #define DESCRIBE_EVENT( asciinamespace, asciilistener, asciimethod, id_postfix ) \ s_aKnownEvents.insert( EventMap::value_type( \ - ::rtl::OUString::createFromAscii( asciimethod ), \ + OUString::createFromAscii( asciimethod ), \ EventDescription( ++nEventId, asciinamespace, asciilistener, asciimethod, RID_STR_EVT_##id_postfix, HID_EVT_##id_postfix, UID_BRWEVT_##id_postfix ) ) ) //.................................................................... - bool lcl_getEventDescriptionForMethod( const ::rtl::OUString& _rMethodName, EventDescription& _out_rDescription ) + bool lcl_getEventDescriptionForMethod( const OUString& _rMethodName, EventDescription& _out_rDescription ) { static EventMap s_aKnownEvents; if ( s_aKnownEvents.empty() ) @@ -224,9 +224,9 @@ namespace pcr } //.................................................................... - ::rtl::OUString lcl_getEventPropertyName( const ::rtl::OUString& _rListenerClassName, const ::rtl::OUString& _rMethodName ) + OUString lcl_getEventPropertyName( const OUString& _rListenerClassName, const OUString& _rMethodName ) { - ::rtl::OUStringBuffer aPropertyName; + OUStringBuffer aPropertyName; aPropertyName.append( _rListenerClassName ); aPropertyName.append( (sal_Unicode)';' ); aPropertyName.append( _rMethodName.getStr() ); @@ -271,10 +271,10 @@ namespace pcr sal_Int32 nPrefixLen = aScriptEvent.ScriptCode.indexOf( ':' ); OSL_ENSURE( nPrefixLen > 0, "lcl_getAssignedScriptEvent: illegal location!" ); - ::rtl::OUString sLocation = aScriptEvent.ScriptCode.copy( 0, nPrefixLen ); - ::rtl::OUString sMacroPath = aScriptEvent.ScriptCode.copy( nPrefixLen + 1 ); + OUString sLocation = aScriptEvent.ScriptCode.copy( 0, nPrefixLen ); + OUString sMacroPath = aScriptEvent.ScriptCode.copy( nPrefixLen + 1 ); - ::rtl::OUStringBuffer aNewStyleSpec; + OUStringBuffer aNewStyleSpec; aNewStyleSpec.appendAscii( "vnd.sun.star.script:" ); aNewStyleSpec.append ( sMacroPath ); aNewStyleSpec.appendAscii( "?language=Basic&location=" ); @@ -283,13 +283,13 @@ namespace pcr aScriptEvent.ScriptCode = aNewStyleSpec.makeStringAndClear(); // also, this new-style spec requires the script code to be "Script" instead of "StarBasic" - aScriptEvent.ScriptType = ::rtl::OUString( "Script" ); + aScriptEvent.ScriptType = OUString( "Script" ); } return aScriptEvent; } //................................................................ - ::rtl::OUString lcl_getQualifiedKnownListenerName( const ScriptEventDescriptor& _rFormComponentEventDescriptor ) + OUString lcl_getQualifiedKnownListenerName( const ScriptEventDescriptor& _rFormComponentEventDescriptor ) { EventDescription aKnownEvent; if ( lcl_getEventDescriptionForMethod( _rFormComponentEventDescriptor.EventMethod, aKnownEvent ) ) @@ -344,7 +344,7 @@ namespace pcr class EventHolder : public EventHolder_Base { private: - typedef ::boost::unordered_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< OUString, ScriptEventDescriptor, OUStringHash > EventMap; typedef ::std::map< EventId, EventMap::iterator > EventMapIndexAccess; EventMap m_aEventNameAccess; @@ -353,18 +353,18 @@ namespace pcr public: EventHolder( ); - void addEvent( EventId _nId, const ::rtl::OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ); + void addEvent( EventId _nId, const OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ); /** effectively the same as getByName, but instead of converting the ScriptEventDescriptor to the weird format used by the macro assignment dialog, it is returned directly */ - ScriptEventDescriptor getNormalizedDescriptorByName( const ::rtl::OUString& _rEventName ) const; + ScriptEventDescriptor getNormalizedDescriptorByName( const OUString& _rEventName ) const; // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException); - virtual Any SAL_CALL getByName( const ::rtl::OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& _rName ) throw (RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& _rName, const Any& aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException); + virtual Any SAL_CALL getByName( const OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& _rName ) throw (RuntimeException); virtual Type SAL_CALL getElementType( ) throw (RuntimeException); virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException); @@ -372,7 +372,7 @@ namespace pcr ~EventHolder( ); private: - ScriptEventDescriptor impl_getDescriptor_throw( const ::rtl::OUString& _rEventName ) const; + ScriptEventDescriptor impl_getDescriptor_throw( const OUString& _rEventName ) const; }; DBG_NAME( EventHolder ) @@ -391,7 +391,7 @@ namespace pcr } //------------------------------------------------------------------------ - void EventHolder::addEvent( EventId _nId, const ::rtl::OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ) + void EventHolder::addEvent( EventId _nId, const OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ) { ::std::pair< EventMap::iterator, bool > insertionResult = m_aEventNameAccess.insert( EventMap::value_type( _rEventName, _rScriptEvent ) ); @@ -400,56 +400,56 @@ namespace pcr } //------------------------------------------------------------------------ - ScriptEventDescriptor EventHolder::getNormalizedDescriptorByName( const ::rtl::OUString& _rEventName ) const + ScriptEventDescriptor EventHolder::getNormalizedDescriptorByName( const OUString& _rEventName ) const { return impl_getDescriptor_throw( _rEventName ); } //------------------------------------------------------------------------ - ScriptEventDescriptor EventHolder::impl_getDescriptor_throw( const ::rtl::OUString& _rEventName ) const + ScriptEventDescriptor EventHolder::impl_getDescriptor_throw( const OUString& _rEventName ) const { EventMap::const_iterator pos = m_aEventNameAccess.find( _rEventName ); if ( pos == m_aEventNameAccess.end() ) - throw NoSuchElementException( ::rtl::OUString(), *const_cast< EventHolder* >( this ) ); + throw NoSuchElementException( OUString(), *const_cast< EventHolder* >( this ) ); return pos->second; } //------------------------------------------------------------------------ - void SAL_CALL EventHolder::replaceByName( const ::rtl::OUString& _rName, const Any& _rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + void SAL_CALL EventHolder::replaceByName( const OUString& _rName, const Any& _rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { EventMap::iterator pos = m_aEventNameAccess.find( _rName ); if ( pos == m_aEventNameAccess.end() ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); Sequence< PropertyValue > aScriptDescriptor; OSL_VERIFY( _rElement >>= aScriptDescriptor ); ::comphelper::NamedValueCollection aExtractor( aScriptDescriptor ); - pos->second.ScriptType = aExtractor.getOrDefault( "EventType", ::rtl::OUString() ); - pos->second.ScriptCode = aExtractor.getOrDefault( "Script", ::rtl::OUString() ); + pos->second.ScriptType = aExtractor.getOrDefault( "EventType", OUString() ); + pos->second.ScriptCode = aExtractor.getOrDefault( "Script", OUString() ); } //------------------------------------------------------------------------ - Any SAL_CALL EventHolder::getByName( const ::rtl::OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL EventHolder::getByName( const OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { ScriptEventDescriptor aDescriptor( impl_getDescriptor_throw( _rName ) ); Any aRet; Sequence< PropertyValue > aScriptDescriptor( 2 ); - aScriptDescriptor[0].Name = ::rtl::OUString("EventType"); + aScriptDescriptor[0].Name = OUString("EventType"); aScriptDescriptor[0].Value <<= aDescriptor.ScriptType; - aScriptDescriptor[1].Name = ::rtl::OUString("Script"); + aScriptDescriptor[1].Name = OUString("Script"); aScriptDescriptor[1].Value <<= aDescriptor.ScriptCode; return makeAny( aScriptDescriptor ); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL EventHolder::getElementNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHolder::getElementNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aReturn( m_aEventIndexAccess.size() ); - ::rtl::OUString* pReturn = aReturn.getArray(); + Sequence< OUString > aReturn( m_aEventIndexAccess.size() ); + OUString* pReturn = aReturn.getArray(); // SvxMacroAssignDlg has a weird API: It expects a XNameReplace, means a container whose // main access method is by name. In it's UI, it shows the possible events in exactly the @@ -469,7 +469,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool SAL_CALL EventHolder::hasByName( const ::rtl::OUString& _rName ) throw (RuntimeException) + sal_Bool SAL_CALL EventHolder::hasByName( const OUString& _rName ) throw (RuntimeException) { EventMap::const_iterator pos = m_aEventNameAccess.find( _rName ); return pos != m_aEventNameAccess.end(); @@ -511,35 +511,35 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EventHandler::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL EventHandler::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL EventHandler::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL EventHandler::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() ); + StlSyntaxSequence< OUString > aAllServices( getSupportedServiceNames() ); return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EventHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EventHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EventHandler" ); + return OUString( "com.sun.star.comp.extensions.EventHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.EventHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.EventHandler" ); return aSupported; } @@ -590,7 +590,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EventHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EventHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -618,7 +618,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EventHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL EventHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -651,11 +651,11 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EventHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EventHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString sNewScriptCode; + OUString sNewScriptCode; OSL_VERIFY( _rControlValue >>= sNewScriptCode ); Sequence< ScriptEventDescriptor > aAllAssignedEvents; @@ -679,7 +679,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EventHandler::convertToControlValue( const ::rtl::OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EventHandler::convertToControlValue( const OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -690,7 +690,7 @@ namespace pcr "EventHandler::convertToControlValue: unexpected ControlValue type class!" ); (void)_rControlValueType; - ::rtl::OUString sScript( aScriptEvent.ScriptCode ); + OUString sScript( aScriptEvent.ScriptCode ); if ( !sScript.isEmpty() ) { // format is: "name (location, language)" @@ -700,16 +700,16 @@ namespace pcr Reference< XUriReferenceFactory > xUriRefFac = UriReferenceFactory::create( m_aContext.getUNOContext() ); Reference< XVndSunStarScriptUrlReference > xScriptUri( xUriRefFac->parse( sScript ), UNO_QUERY_THROW ); - ::rtl::OUStringBuffer aComposeBuffer; + OUStringBuffer aComposeBuffer; // name aComposeBuffer.append( xScriptUri->getName() ); // location - const ::rtl::OUString sLocationParamName( "location" ); - const ::rtl::OUString sLocation = xScriptUri->getParameter( sLocationParamName ); - const ::rtl::OUString sLangParamName( "language" ); - const ::rtl::OUString sLanguage = xScriptUri->getParameter( sLangParamName ); + const OUString sLocationParamName( "location" ); + const OUString sLocation = xScriptUri->getParameter( sLocationParamName ); + const OUString sLangParamName( "language" ); + const OUString sLanguage = xScriptUri->getParameter( sLangParamName ); if ( !(sLocation.isEmpty() && sLanguage.isEmpty()) ) { @@ -744,7 +744,7 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL EventHandler::getPropertyState( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL EventHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return PropertyState_DIRECT_VALUE; } @@ -779,7 +779,7 @@ namespace pcr sal_Int32 listenerCount = aListeners.getLength(); Property aCurrentProperty; - ::rtl::OUString sListenerClassName; + OUString sListenerClassName; // loop through all listeners and all methods, and see which we can present at the UI const Type* pListeners = aListeners.getConstArray(); @@ -794,9 +794,9 @@ namespace pcr continue; // loop through all methods - Sequence< ::rtl::OUString > aMethods( comphelper::getEventMethodsForType( *pListeners ) ); + Sequence< OUString > aMethods( comphelper::getEventMethodsForType( *pListeners ) ); - const ::rtl::OUString* pMethods = aMethods.getConstArray(); + const OUString* pMethods = aMethods.getConstArray(); sal_uInt32 methodCount = aMethods.getLength(); for (sal_uInt32 method = 0 ; method < methodCount ; ++method, ++pMethods ) @@ -829,7 +829,7 @@ namespace pcr { aOrderedProperties[ loop->second.nId ] = Property( loop->first, loop->second.nId, - ::getCppuType( static_cast< const ::rtl::OUString* >( NULL ) ), + ::getCppuType( static_cast< const OUString* >( NULL ) ), PropertyAttribute::BOUND ); } @@ -840,21 +840,21 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getSupersededProperties( ) throw (RuntimeException) { // none - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getActuatingProperties( ) throw (RuntimeException) { // none - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL EventHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL EventHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -871,20 +871,20 @@ namespace pcr const EventDescription& rEvent = impl_getEventForName_throw( _rPropertyName ); aDescriptor.DisplayName = rEvent.sDisplayName; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.sHelpId ); - aDescriptor.PrimaryButtonId = rtl::OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); + aDescriptor.PrimaryButtonId = OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); aDescriptor.HasPrimaryButton = sal_True; - aDescriptor.Category = ::rtl::OUString( "Events" ); + aDescriptor.Category = OUString( "Events" ); return aDescriptor; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL EventHandler::isComposable( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL EventHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return sal_False; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -909,8 +909,8 @@ namespace pcr } // the initial selection in the dialog - Sequence< ::rtl::OUString > aNames( pEventHolder->getElementNames() ); - const ::rtl::OUString* pChosenEvent = ::std::find( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), rForEvent.sListenerMethodName ); + Sequence< OUString > aNames( pEventHolder->getElementNames() ); + const OUString* pChosenEvent = ::std::find( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), rForEvent.sListenerMethodName ); sal_uInt16 nInitialSelection = (sal_uInt16)( pChosenEvent - aNames.getConstArray() ); // the dialog @@ -959,7 +959,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EventHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL EventHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { OSL_FAIL( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" ); } @@ -1083,12 +1083,12 @@ namespace pcr { Reference< XScriptEventsSupplier > xEventsSupplier( m_xComponent, UNO_QUERY_THROW ); Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW ); - Sequence< ::rtl::OUString > aEventNames( xEvents->getElementNames() ); + Sequence< OUString > aEventNames( xEvents->getElementNames() ); sal_Int32 nEventCount = aEventNames.getLength(); _out_rEvents.realloc( nEventCount ); - const ::rtl::OUString* pNames = aEventNames.getConstArray(); + const OUString* pNames = aEventNames.getConstArray(); ScriptEventDescriptor* pDescs = _out_rEvents.getArray(); for( sal_Int32 i = 0 ; i < nEventCount ; ++i, ++pNames, ++pDescs ) @@ -1117,7 +1117,7 @@ namespace pcr } else { - ::rtl::OUString sControlService; + OUString sControlService; OSL_VERIFY( m_xComponent->getPropertyValue( PROPERTY_DEFAULTCONTROL ) >>= sControlService ); xReturn = m_aContext.createComponent( sControlService ); @@ -1126,7 +1126,7 @@ namespace pcr } //-------------------------------------------------------------------- - const EventDescription& EventHandler::impl_getEventForName_throw( const ::rtl::OUString& _rPropertyName ) const + const EventDescription& EventHandler::impl_getEventForName_throw( const OUString& _rPropertyName ) const { EventMap::const_iterator pos = m_aEvents.find( _rPropertyName ); if ( pos == m_aEvents.end() ) @@ -1137,7 +1137,7 @@ namespace pcr //-------------------------------------------------------------------- namespace { - static bool lcl_endsWith( const ::rtl::OUString& _rText, const ::rtl::OUString& _rCheck ) + static bool lcl_endsWith( const OUString& _rText, const OUString& _rCheck ) { sal_Int32 nTextLen = _rText.getLength(); sal_Int32 nCheckLen = _rCheck.getLength(); @@ -1152,8 +1152,8 @@ namespace pcr { try { - ::rtl::OUString sScriptCode( _rScriptEvent.ScriptCode ); - ::rtl::OUString sScriptType( _rScriptEvent.ScriptType ); + OUString sScriptCode( _rScriptEvent.ScriptCode ); + OUString sScriptType( _rScriptEvent.ScriptType ); bool bResetScript = sScriptCode.isEmpty(); sal_Int32 nObjectIndex = impl_getComponentIndexInParent_throw(); @@ -1211,17 +1211,17 @@ namespace pcr { try { - ::rtl::OUString sScriptCode( _rScriptEvent.ScriptCode ); + OUString sScriptCode( _rScriptEvent.ScriptCode ); bool bResetScript = sScriptCode.isEmpty(); Reference< XScriptEventsSupplier > xEventsSupplier( m_xComponent, UNO_QUERY_THROW ); Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW ); - ::rtl::OUStringBuffer aCompleteName; + OUStringBuffer aCompleteName; aCompleteName.append( _rScriptEvent.ListenerType ); aCompleteName.appendAscii( "::" ); aCompleteName.append( _rScriptEvent.EventMethod ); - ::rtl::OUString sCompleteName( aCompleteName.makeStringAndClear() ); + OUString sCompleteName( aCompleteName.makeStringAndClear() ); bool bExists = xEvents->hasByName( sCompleteName ); diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index c87d4e4c4c33..4ed4ace860df 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -44,11 +44,11 @@ namespace pcr struct EventDescription { public: - ::rtl::OUString sDisplayName; - ::rtl::OUString sListenerClassName; - ::rtl::OUString sListenerMethodName; - ::rtl::OString sHelpId; - ::rtl::OString sUniqueBrowseId; + OUString sDisplayName; + OUString sListenerClassName; + OUString sListenerMethodName; + OString sHelpId; + OString sUniqueBrowseId; EventId nId; EventDescription() @@ -62,11 +62,11 @@ namespace pcr const sal_Char* _pListenerClassAsciiName, const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, - const rtl::OString& _sHelpId, - const rtl::OString& _sUniqueBrowseId ); + const OString& _sHelpId, + const OString& _sUniqueBrowseId ); }; - typedef ::boost::unordered_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< OUString, EventDescription, OUStringHash > EventMap; //==================================================================== //= EventHandler @@ -97,8 +97,8 @@ namespace pcr public: // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); protected: @@ -111,22 +111,22 @@ namespace pcr protected: // XPropertyHandler overridables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -134,9 +134,9 @@ namespace pcr virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); private: /** returns the script events associated with our introspectee @@ -209,7 +209,7 @@ namespace pcr if our introspectee does not have an event with the given logical name (see ->getSupportedProperties) */ const EventDescription& - impl_getEventForName_throw( const ::rtl::OUString& _rPropertyName ) const; + impl_getEventForName_throw( const OUString& _rPropertyName ) const; /** returns the index of our component within its parent, if this parent can be obtained (XChild::getParent) and supports an ->XIndexAccess interface diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 71423732aff4..0402d6cbca2f 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -79,14 +79,14 @@ namespace pcr _rxProps ); public: - sal_Bool getCheckFontProperty(const ::rtl::OUString& _rPropName, ::com::sun::star::uno::Any& _rValue); - ::rtl::OUString getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault); - sal_Int16 getInt16FontProperty(const ::rtl::OUString& _rPropName, const sal_Int16 _nDefault); - sal_Int32 getInt32FontProperty(const ::rtl::OUString& _rPropName, const sal_Int32 _nDefault); - float getFloatFontProperty(const ::rtl::OUString& _rPropName, const float _nDefault); + sal_Bool getCheckFontProperty(const OUString& _rPropName, ::com::sun::star::uno::Any& _rValue); + OUString getStringFontProperty(const OUString& _rPropName, const OUString& _rDefault); + sal_Int16 getInt16FontProperty(const OUString& _rPropName, const sal_Int16 _nDefault); + sal_Int32 getInt32FontProperty(const OUString& _rPropName, const sal_Int32 _nDefault); + float getFloatFontProperty(const OUString& _rPropName, const float _nDefault); void invalidateItem( - const ::rtl::OUString& _rPropName, + const OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation = sal_False); @@ -101,7 +101,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool OFontPropertyExtractor::getCheckFontProperty(const ::rtl::OUString& _rPropName, Any& _rValue) + sal_Bool OFontPropertyExtractor::getCheckFontProperty(const OUString& _rPropName, Any& _rValue) { _rValue = m_xPropValueAccess->getPropertyValue(_rPropName); if (m_xPropStateAccess.is()) @@ -111,7 +111,7 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString OFontPropertyExtractor::getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault) + OUString OFontPropertyExtractor::getStringFontProperty(const OUString& _rPropName, const OUString& _rDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -121,7 +121,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Int16 OFontPropertyExtractor::getInt16FontProperty(const ::rtl::OUString& _rPropName, const sal_Int16 _nDefault) + sal_Int16 OFontPropertyExtractor::getInt16FontProperty(const OUString& _rPropName, const sal_Int16 _nDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -133,7 +133,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Int32 OFontPropertyExtractor::getInt32FontProperty(const ::rtl::OUString& _rPropName, const sal_Int32 _nDefault) + sal_Int32 OFontPropertyExtractor::getInt32FontProperty(const OUString& _rPropName, const sal_Int32 _nDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -145,7 +145,7 @@ namespace pcr } //------------------------------------------------------------------------ - float OFontPropertyExtractor::getFloatFontProperty(const ::rtl::OUString& _rPropName, const float _nDefault) + float OFontPropertyExtractor::getFloatFontProperty(const OUString& _rPropName, const float _nDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -155,7 +155,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OFontPropertyExtractor::invalidateItem(const ::rtl::OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation) + void OFontPropertyExtractor::invalidateItem(const OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation) { if ( _bForceInvalidation || ( m_xPropStateAccess.is() @@ -200,8 +200,8 @@ namespace pcr ::com::sun::star::awt::FontDescriptor aDefaultFont = VCLUnoHelper::CreateFontDescriptor(aDefaultVCLFont); // get the current properties - ::rtl::OUString aFontName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_NAME, aDefaultFont.Name); - ::rtl::OUString aFontStyleName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_STYLENAME, aDefaultFont.StyleName); + OUString aFontName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_NAME, aDefaultFont.Name); + OUString aFontStyleName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_STYLENAME, aDefaultFont.StyleName); sal_Int16 nFontFamily = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_FAMILY, aDefaultFont.Family); sal_Int16 nFontCharset = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_CHARSET, aDefaultFont.CharSet); float nFontHeight = aPropExtractor.getFloatFontProperty(PROPERTY_FONT_HEIGHT, (float)aDefaultFont.Height); @@ -288,7 +288,7 @@ namespace pcr //------------------------------------------------------------------------ namespace { - void lcl_pushBackPropertyValue( Sequence< NamedValue >& _out_properties, const ::rtl::OUString& _name, const Any& _value ) + void lcl_pushBackPropertyValue( Sequence< NamedValue >& _out_properties, const OUString& _name, const Any& _value ) { _out_properties.realloc( _out_properties.getLength() + 1 ); _out_properties[ _out_properties.getLength() - 1 ] = NamedValue( _name, _value ); @@ -311,8 +311,8 @@ namespace pcr const SvxFontItem& rFontItem = static_cast(_rSet.Get(CFID_FONT)); - lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_NAME , makeAny(::rtl::OUString(rFontItem.GetFamilyName()))); - lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STYLENAME, makeAny(::rtl::OUString(rFontItem.GetStyleName()))); + lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_NAME , makeAny(OUString(rFontItem.GetFamilyName()))); + lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STYLENAME, makeAny(OUString(rFontItem.GetStyleName()))); lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_FAMILY , makeAny((sal_Int16)rFontItem.GetFamily())); lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_CHARSET , makeAny((sal_Int16)rFontItem.GetCharSet())); } @@ -539,7 +539,7 @@ namespace pcr { SID_ATTR_CHAR_FONTLIST, 0 } }; - _rpPool = new SfxItemPool(rtl::OUString("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID, + _rpPool = new SfxItemPool(OUString("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID, aItemInfos, _rppDefaults); _rpPool->FreezeIdRanges(); diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index c6cdb04d80aa..b2e56658b628 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -37,12 +37,12 @@ namespace pcr using namespace ::com::sun::star::beans; //------------------------------------------------------------------------ - ::rtl::OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) + OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { PcrClient aResourceAccess; // this ensures that we have our resource file loaded - ::rtl::OUString sClassName; + OUString sClassName; switch (nClassId) { case FormComponentType::TEXTFIELD: diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx index a385f578d6d5..2df90d5ab6bd 100644 --- a/extensions/source/propctrlr/formbrowsertools.hxx +++ b/extensions/source/propctrlr/formbrowsertools.hxx @@ -32,7 +32,7 @@ namespace pcr { //............................................................................ - ::rtl::OUString GetUIHeadlineName(sal_Int16 _nClassId, const ::com::sun::star::uno::Any& _rUnoObject); + OUString GetUIHeadlineName(sal_Int16 _nClassId, const ::com::sun::star::uno::Any& _rUnoObject); sal_Int16 classifyComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); //======================================================================== @@ -53,10 +53,10 @@ namespace pcr struct FindPropertyByName : public ::std::unary_function< ::com::sun::star::beans::Property, bool > { private: - ::rtl::OUString m_sName; + OUString m_sName; public: - FindPropertyByName( const ::rtl::OUString& _rName ) : m_sName( _rName ) { } + FindPropertyByName( const OUString& _rName ) : m_sName( _rName ) { } bool operator()( const ::com::sun::star::beans::Property& _rProp ) const { return m_sName == _rProp.Name; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 008b4b5909c6..2b68425ae3af 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -329,7 +329,7 @@ namespace pcr if ( PROPERTY_ID_IMAGE_URL == nPropId && ( _rValue >>= xGrfObj ) ) { DBG_ASSERT( xGrfObj.is(), "FormComponentPropertyHandler::setPropertyValue() xGrfObj is invalid"); - rtl::OUString sObjectID( GRAPHOBJ_URLPREFIX ); + OUString sObjectID( GRAPHOBJ_URLPREFIX ); sObjectID = sObjectID + xGrfObj->getUniqueID(); m_xComponent->setPropertyValue( _rPropertyName, uno::makeAny( sObjectID ) ); } @@ -936,28 +936,28 @@ namespace pcr { ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString > aInterestingProperties; - aInterestingProperties.push_back( static_cast(PROPERTY_DATASOURCE) ); - aInterestingProperties.push_back( static_cast(PROPERTY_COMMAND) ); - aInterestingProperties.push_back( static_cast(PROPERTY_COMMANDTYPE) ); - aInterestingProperties.push_back( static_cast(PROPERTY_LISTSOURCE) ); - aInterestingProperties.push_back( static_cast(PROPERTY_LISTSOURCETYPE) ); - aInterestingProperties.push_back( static_cast(PROPERTY_SUBMIT_ENCODING) ); - aInterestingProperties.push_back( static_cast(PROPERTY_REPEAT) ); - aInterestingProperties.push_back( static_cast(PROPERTY_TABSTOP) ); - aInterestingProperties.push_back( static_cast(PROPERTY_BORDER) ); - aInterestingProperties.push_back( static_cast(PROPERTY_CONTROLSOURCE) ); - aInterestingProperties.push_back( static_cast(PROPERTY_DROPDOWN) ); - aInterestingProperties.push_back( static_cast(PROPERTY_IMAGE_URL) ); - aInterestingProperties.push_back( static_cast(PROPERTY_TARGET_URL) ); - aInterestingProperties.push_back( static_cast(PROPERTY_STRINGITEMLIST) ); - aInterestingProperties.push_back( static_cast(PROPERTY_BUTTONTYPE) ); - aInterestingProperties.push_back( static_cast(PROPERTY_ESCAPE_PROCESSING) ); - aInterestingProperties.push_back( static_cast(PROPERTY_TRISTATE) ); - aInterestingProperties.push_back( static_cast(PROPERTY_DECIMAL_ACCURACY) ); - aInterestingProperties.push_back( static_cast(PROPERTY_SHOWTHOUSANDSEP) ); - aInterestingProperties.push_back( static_cast(PROPERTY_FORMATKEY) ); - aInterestingProperties.push_back( static_cast(PROPERTY_EMPTY_IS_NULL) ); - aInterestingProperties.push_back( static_cast(PROPERTY_TOGGLE) ); + aInterestingProperties.push_back( static_cast(PROPERTY_DATASOURCE) ); + aInterestingProperties.push_back( static_cast(PROPERTY_COMMAND) ); + aInterestingProperties.push_back( static_cast(PROPERTY_COMMANDTYPE) ); + aInterestingProperties.push_back( static_cast(PROPERTY_LISTSOURCE) ); + aInterestingProperties.push_back( static_cast(PROPERTY_LISTSOURCETYPE) ); + aInterestingProperties.push_back( static_cast(PROPERTY_SUBMIT_ENCODING) ); + aInterestingProperties.push_back( static_cast(PROPERTY_REPEAT) ); + aInterestingProperties.push_back( static_cast(PROPERTY_TABSTOP) ); + aInterestingProperties.push_back( static_cast(PROPERTY_BORDER) ); + aInterestingProperties.push_back( static_cast(PROPERTY_CONTROLSOURCE) ); + aInterestingProperties.push_back( static_cast(PROPERTY_DROPDOWN) ); + aInterestingProperties.push_back( static_cast(PROPERTY_IMAGE_URL) ); + aInterestingProperties.push_back( static_cast(PROPERTY_TARGET_URL) ); + aInterestingProperties.push_back( static_cast(PROPERTY_STRINGITEMLIST) ); + aInterestingProperties.push_back( static_cast(PROPERTY_BUTTONTYPE) ); + aInterestingProperties.push_back( static_cast(PROPERTY_ESCAPE_PROCESSING) ); + aInterestingProperties.push_back( static_cast(PROPERTY_TRISTATE) ); + aInterestingProperties.push_back( static_cast(PROPERTY_DECIMAL_ACCURACY) ); + aInterestingProperties.push_back( static_cast(PROPERTY_SHOWTHOUSANDSEP) ); + aInterestingProperties.push_back( static_cast(PROPERTY_FORMATKEY) ); + aInterestingProperties.push_back( static_cast(PROPERTY_EMPTY_IS_NULL) ); + aInterestingProperties.push_back( static_cast(PROPERTY_TOGGLE) ); return Sequence< OUString >( &(*aInterestingProperties.begin()), aInterestingProperties.size() ); } @@ -1014,39 +1014,39 @@ namespace pcr { case PROPERTY_ID_DEFAULT_SELECT_SEQ: case PROPERTY_ID_SELECTEDITEMS: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SELECTION); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SELECTION); break; case PROPERTY_ID_FILTER: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILTER); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FILTER); break; case PROPERTY_ID_SORT: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ORDER); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_ORDER); break; case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: nControlType = PropertyControlType::StringListField; - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS); break; case PROPERTY_ID_COMMAND: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); break; case PROPERTY_ID_TABINDEX: { Reference< XControlContainer > xControlContext( impl_getContextControlContainer_nothrow() ); if ( xControlContext.is() ) - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_TABINDEX); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_TABINDEX); nControlType = PropertyControlType::NumericField; }; break; case PROPERTY_ID_FONT: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE); break; case PROPERTY_ID_TARGET_URL: @@ -1054,7 +1054,7 @@ namespace pcr { aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow(), WB_TABSTOP | WB_BORDER ); - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId ) + aDescriptor.PrimaryButtonId = OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId ) ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL); } break; @@ -1072,13 +1072,13 @@ namespace pcr switch( nPropId ) { case PROPERTY_ID_BACKGROUNDCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break; case PROPERTY_ID_FILLCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break; case PROPERTY_ID_SYMBOLCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break; case PROPERTY_ID_BORDERCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break; } break; @@ -1102,7 +1102,7 @@ namespace pcr case PROPERTY_ID_CONTROLLABEL: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL); break; case PROPERTY_ID_FORMATKEY: @@ -1132,7 +1132,7 @@ namespace pcr aDescriptor.Control = pControl; pControl->SetFormatSupplier( pSupplier ); - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT); } else { @@ -1357,7 +1357,7 @@ namespace pcr // DataSource case PROPERTY_ID_DATASOURCE: { - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE); ::std::vector< OUString > aListEntries; @@ -2458,7 +2458,7 @@ namespace pcr _out_rProperty.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_COMMAND ); _out_rProperty.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_COMMAND ) ); - _out_rProperty.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); + _out_rProperty.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); //////////////////////////////////////////////////////////// sal_Int32 nCommandType = CommandType::COMMAND; @@ -2883,7 +2883,7 @@ namespace pcr { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0, - rtl::OUString("sdatabase")); + OUString("sdatabase")); OUString sDataSource; OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_DATASOURCE ) >>= sDataSource ); @@ -2893,7 +2893,7 @@ namespace pcr // is considered to be potentially expensive aFileDlg.SetDisplayDirectory( sDataSource ); - const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); if ( pFilter ) { diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 61036725692c..7c0fc5150055 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -80,9 +80,9 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > m_xBrowserUI; /// the string indicating a "default" (VOID) value in list-like controls - ::rtl::OUString m_sDefaultValueString; + OUString m_sDefaultValueString; /// all properties to whose control's we added ->m_sDefaultValueString - ::std::set< ::rtl::OUString > m_aPropertiesWithDefListEntry; + ::std::set< OUString > m_aPropertiesWithDefListEntry; /// type of our component ComponentClassification m_eComponentClass; /// is our component a (database) sub form? @@ -104,8 +104,8 @@ namespace pcr // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~FormComponentPropertyHandler(); @@ -114,19 +114,19 @@ namespace pcr virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // XPropertyHandler overridables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -152,7 +152,7 @@ namespace pcr /** const-version of ->getPropertyValue */ - ::com::sun::star::uno::Any impl_getPropertyValue_throw( const ::rtl::OUString& _rPropertyName ) const; + ::com::sun::star::uno::Any impl_getPropertyValue_throw( const OUString& _rPropertyName ) const; // some property values are faked, and not used in the way they're provided by our component void impl_normalizePropertyValue_nothrow( ::com::sun::star::uno::Any& _rValue, PropertyId _nPropId ) const; @@ -164,7 +164,7 @@ namespace pcr /** initializes the list of field names, if we're handling a control which supports the DataField property */ - void impl_initFieldList_nothrow( ::std::vector< ::rtl::OUString >& rFieldNames ) const; + void impl_initFieldList_nothrow( ::std::vector< OUString >& rFieldNames ) const; /** obtaines the RowSet to which our component belongs @@ -216,14 +216,14 @@ namespace pcr @precond m_xRowSetConnection is not */ - void impl_fillTableNames_throw( ::std::vector< ::rtl::OUString >& _out_rNames ) const; + void impl_fillTableNames_throw( ::std::vector< OUString >& _out_rNames ) const; /** describes the UI for selecting a query name @precond m_xRowSetConnection is not */ - void impl_fillQueryNames_throw( ::std::vector< ::rtl::OUString >& _out_rNames ) const; + void impl_fillQueryNames_throw( ::std::vector< OUString >& _out_rNames ) const; /** describes the UI for selecting a query name @@ -231,8 +231,8 @@ namespace pcr m_xRowSetConnection is not */ void impl_fillQueryNames_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xQueryNames - ,::std::vector< ::rtl::OUString >& _out_rNames - ,const ::rtl::OUString& _sName = ::rtl::OUString() ) const; + ,::std::vector< OUString >& _out_rNames + ,const OUString& _sName = OUString() ) const; /** describes the UI for selecting a ListSource (for list-like form controls) @precond @@ -254,7 +254,7 @@ namespace pcr @return if and only if the user successfully changed the property */ - bool impl_dialogListSelection_nothrow( const ::rtl::OUString& _rProperty, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogListSelection_nothrow( const OUString& _rProperty, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** executes a dialog for chosing a filter or sort criterion for a database form @param _bFilter @@ -267,7 +267,7 @@ namespace pcr @return if and only if the user successfully chose a clause */ - bool impl_dialogFilterOrSort_nothrow( bool _bFilter, ::rtl::OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogFilterOrSort_nothrow( bool _bFilter, OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** executes a dialog which allows the user to chose the columns linking a sub to a master form, and sets the respective MasterFields / SlaveFields @@ -428,7 +428,7 @@ namespace pcr /** returns the URL of our context document @return */ - ::rtl::OUString impl_getDocumentURL_nothrow() const; + OUString impl_getDocumentURL_nothrow() const; private: DECL_LINK( OnDesignerClosed, void* ); diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 26084a394eb2..732c639aab5f 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -113,31 +113,31 @@ namespace pcr IMPLEMENT_GET_IMPLEMENTATION_ID( FormController ) //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL FormController::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL FormController::getImplementationName( ) throw(RuntimeException) { return m_aServiceDescriptor.GetImplementationName(); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL FormController::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL FormController::getSupportedServiceNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() ); + Sequence< OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() ); aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.inspection.ObjectInspector" ); + aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.inspection.ObjectInspector" ); return aSupported; } //------------------------------------------------------------------------ - ::rtl::OUString FormController::getImplementationName_static( ) throw(RuntimeException) + OUString FormController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.FormController"); + return OUString("org.openoffice.comp.extensions.FormController"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.form.PropertyBrowserController"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.form.PropertyBrowserController"); return aSupported; } @@ -169,7 +169,7 @@ namespace pcr aProps[0] = Property( PROPERTY_CURRENTPAGE, OWN_PROPERTY_ID_CURRENTPAGE, - ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), + ::getCppuType( static_cast< OUString* >( NULL ) ), PropertyAttribute::TRANSIENT ); aProps[1] = Property( @@ -256,16 +256,16 @@ namespace pcr //= DialogController //==================================================================== //------------------------------------------------------------------------ - ::rtl::OUString DialogController::getImplementationName_static( ) throw(RuntimeException) + OUString DialogController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.DialogController"); + return OUString("org.openoffice.comp.extensions.DialogController"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.awt.PropertyBrowserController"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.awt.PropertyBrowserController"); return aSupported; } diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 3cb2f5cdc177..ef21dda890a8 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -35,9 +35,9 @@ namespace pcr //==================================================================== struct ServiceDescriptor { - ::rtl::OUString + OUString ( *GetImplementationName )( void ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > ( *GetSupportedServiceNames )( void ); }; @@ -69,8 +69,8 @@ namespace pcr ); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -81,8 +81,8 @@ namespace pcr DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet and friends virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -111,8 +111,8 @@ namespace pcr { public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 807164e19589..6738b66ae02c 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -214,21 +214,21 @@ namespace pcr const Reference< XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (RuntimeException); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (RuntimeException); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (RuntimeException); protected: ~FormGeometryHandler(); protected: // XPropertyHandler overriables - virtual Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException); - virtual LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException); + virtual LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException); // OComponentHandler overridables virtual void SAL_CALL disposing(); @@ -312,21 +312,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.FormGeometryHandler" ); + return OUString( "com.sun.star.comp.extensions.FormGeometryHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.FormGeometryHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.FormGeometryHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL FormGeometryHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL FormGeometryHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -375,7 +375,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL FormGeometryHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL FormGeometryHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -441,7 +441,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL FormGeometryHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL FormGeometryHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -508,15 +508,15 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aInterestedIn(1); + Sequence< OUString > aInterestedIn(1); aInterestedIn[0] = PROPERTY_TEXT_ANCHOR_TYPE; return aInterestedIn; } //-------------------------------------------------------------------- - void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -600,7 +600,7 @@ namespace pcr if ( !xPSI->hasPropertyByName( PROPERTY_ANCHOR ) ) return false; Reference< XServiceInfo > xSI( m_xAssociatedShape, UNO_QUERY_THROW ); - if ( xSI->supportsService( ::rtl::OUString( "com.sun.star.sheet.Shape" ) ) ) + if ( xSI->supportsService( OUString( "com.sun.star.sheet.Shape" ) ) ) return true; } catch( const Exception& ) @@ -710,10 +710,10 @@ namespace pcr { struct EventTranslation { - ::rtl::OUString sPropertyName; + OUString sPropertyName; Any aNewPropertyValue; - EventTranslation( const ::rtl::OUString& _propertyName, const Any& _newPropertyValue ) + EventTranslation( const OUString& _propertyName, const Any& _newPropertyValue ) :sPropertyName( _propertyName ) ,aNewPropertyValue( _newPropertyValue ) { @@ -779,7 +779,7 @@ namespace pcr try { Reference< XPropertySet > xShapeProperties( m_xShape, UNO_QUERY_THROW ); - xShapeProperties->addPropertyChangeListener( ::rtl::OUString(), this ); + xShapeProperties->addPropertyChangeListener( OUString(), this ); } catch( const Exception& ) { @@ -794,7 +794,7 @@ namespace pcr try { Reference< XPropertySet > xShapeProperties( m_xShape, UNO_QUERY_THROW ); - xShapeProperties->removePropertyChangeListener( ::rtl::OUString(), this ); + xShapeProperties->removePropertyChangeListener( OUString(), this ); } catch( const Exception& ) { diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index cefae712007f..2fdf007266d1 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -86,7 +86,7 @@ namespace pcr bool GetFieldName( LinkParticipant _eWhich, String& /* [out] */ _rName ) const; void SetFieldName( LinkParticipant _eWhich, const String& _rName ); - void fillList( LinkParticipant _eWhich, const Sequence< ::rtl::OUString >& _rFieldNames ); + void fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames ); private: DECL_LINK( OnFieldNameChanged, ComboBox* ); @@ -109,12 +109,12 @@ namespace pcr } //------------------------------------------------------------------------ - void FieldLinkRow::fillList( LinkParticipant _eWhich, const Sequence< ::rtl::OUString >& _rFieldNames ) + void FieldLinkRow::fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames ) { ComboBox* pBox = ( _eWhich == eDetailField ) ? &m_aDetailColumn : &m_aMasterColumn; - const ::rtl::OUString* pFieldName = _rFieldNames.getConstArray(); - const ::rtl::OUString* pFieldNameEnd = pFieldName + _rFieldNames.getLength(); + const OUString* pFieldName = _rFieldNames.getConstArray(); + const OUString* pFieldNameEnd = pFieldName + _rFieldNames.getLength(); for ( ; pFieldName != pFieldNameEnd; ++pFieldName ) pBox->InsertEntry( *pFieldName ); } @@ -149,9 +149,9 @@ namespace pcr //------------------------------------------------------------------------ FormLinkDialog::FormLinkDialog( Window* _pParent, const Reference< XPropertySet >& _rxDetailForm, const Reference< XPropertySet >& _rxMasterForm, const Reference< XComponentContext >& _rxContext, - const ::rtl::OUString& _sExplanation, - const ::rtl::OUString& _sDetailLabel, - const ::rtl::OUString& _sMasterLabel) + const OUString& _sExplanation, + const OUString& _sDetailLabel, + const OUString& _sMasterLabel) :ModalDialog( _pParent, PcrRes( RID_DLG_FORMLINKS ) ) ,m_aExplanation( this, PcrRes( FT_EXPLANATION ) ) ,m_aDetailLabel( this, PcrRes( FT_DETAIL_LABEL ) ) @@ -194,8 +194,8 @@ namespace pcr void FormLinkDialog::commitLinkPairs() { // collect the field lists from the rows - ::std::vector< ::rtl::OUString > aDetailFields; aDetailFields.reserve( 4 ); - ::std::vector< ::rtl::OUString > aMasterFields; aMasterFields.reserve( 4 ); + ::std::vector< OUString > aDetailFields; aDetailFields.reserve( 4 ); + ::std::vector< OUString > aMasterFields; aMasterFields.reserve( 4 ); const FieldLinkRow* aRows[] = { m_aRow1.get(), m_aRow2.get(), m_aRow3.get(), m_aRow4.get() @@ -219,10 +219,10 @@ namespace pcr Reference< XPropertySet > xDetailFormProps( m_xDetailForm, UNO_QUERY ); if ( xDetailFormProps.is() ) { - ::rtl::OUString *pFields = aDetailFields.empty() ? 0 : &aDetailFields[0]; - xDetailFormProps->setPropertyValue( PROPERTY_DETAILFIELDS, makeAny( Sequence< ::rtl::OUString >( pFields, aDetailFields.size() ) ) ); + OUString *pFields = aDetailFields.empty() ? 0 : &aDetailFields[0]; + xDetailFormProps->setPropertyValue( PROPERTY_DETAILFIELDS, makeAny( Sequence< OUString >( pFields, aDetailFields.size() ) ) ); pFields = aMasterFields.empty() ? 0 : &aMasterFields[0]; - xDetailFormProps->setPropertyValue( PROPERTY_MASTERFIELDS, makeAny( Sequence< ::rtl::OUString >( pFields, aMasterFields.size() ) ) ); + xDetailFormProps->setPropertyValue( PROPERTY_MASTERFIELDS, makeAny( Sequence< OUString >( pFields, aMasterFields.size() ) ) ); } } catch( const Exception& ) @@ -245,10 +245,10 @@ namespace pcr //------------------------------------------------------------------------ void FormLinkDialog::initializeFieldLists() { - Sequence< ::rtl::OUString > sDetailFields; + Sequence< OUString > sDetailFields; getFormFields( m_xDetailForm, sDetailFields ); - Sequence< ::rtl::OUString > sMasterFields; + Sequence< OUString > sMasterFields; getFormFields( m_xMasterForm, sMasterFields ); FieldLinkRow* aRows[] = { @@ -293,14 +293,14 @@ namespace pcr } //------------------------------------------------------------------------ - void FormLinkDialog::initializeFieldRowsFrom( Sequence< ::rtl::OUString >& _rDetailFields, Sequence< ::rtl::OUString >& _rMasterFields ) + void FormLinkDialog::initializeFieldRowsFrom( Sequence< OUString >& _rDetailFields, Sequence< OUString >& _rMasterFields ) { // our UI does allow 4 fields max _rDetailFields.realloc( 4 ); _rMasterFields.realloc( 4 ); - const ::rtl::OUString* pDetailFields = _rDetailFields.getConstArray(); - const ::rtl::OUString* pMasterFields = _rMasterFields.getConstArray(); + const OUString* pDetailFields = _rDetailFields.getConstArray(); + const OUString* pMasterFields = _rMasterFields.getConstArray(); FieldLinkRow* aRows[] = { m_aRow1.get(), m_aRow2.get(), m_aRow3.get(), m_aRow4.get() @@ -317,8 +317,8 @@ namespace pcr { try { - Sequence< ::rtl::OUString > aDetailFields; - Sequence< ::rtl::OUString > aMasterFields; + Sequence< OUString > aDetailFields; + Sequence< OUString > aMasterFields; Reference< XPropertySet > xDetailFormProps( m_xDetailForm, UNO_QUERY ); if ( xDetailFormProps.is() ) @@ -370,7 +370,7 @@ namespace pcr try { sal_Int32 nCommandType = CommandType::COMMAND; - ::rtl::OUString sCommand; + OUString sCommand; xFormProps->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= nCommandType; xFormProps->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand; @@ -388,12 +388,12 @@ namespace pcr } //------------------------------------------------------------------------ - void FormLinkDialog::getFormFields( const Reference< XPropertySet >& _rxForm, Sequence< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(( )) + void FormLinkDialog::getFormFields( const Reference< XPropertySet >& _rxForm, Sequence< OUString >& /* [out] */ _rNames ) const SAL_THROW(( )) { _rNames.realloc( 0 ); ::dbtools::SQLExceptionInfo aErrorInfo; - ::rtl::OUString sCommand; + OUString sCommand; try { WaitObject aWaitCursor( const_cast< FormLinkDialog* >( this ) ); @@ -430,7 +430,7 @@ namespace pcr { ::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG ); sErrorMessage = PcrRes(STR_ERROR_RETRIEVING_COLUMNS).toString(); - sErrorMessage.SearchAndReplace(rtl::OUString('#'), sCommand); + sErrorMessage.SearchAndReplace(OUString('#'), sCommand); } SQLContext aContext; @@ -476,7 +476,7 @@ namespace pcr Reference< XNameAccess > xTables; if ( xTablesInForm.is() ) xTables = xTablesInForm->getTables(); - Sequence< ::rtl::OUString > aTableNames; + Sequence< OUString > aTableNames; if ( xTables.is() ) aTableNames = xTables->getElementNames(); @@ -496,7 +496,7 @@ namespace pcr //------------------------------------------------------------------------ sal_Bool FormLinkDialog::getExistingRelation( const Reference< XPropertySet >& _rxLHS, const Reference< XPropertySet >& /*_rxRHS*/, // TODO: fix the usage of _rxRHS. This is issue #i81956#. - Sequence< ::rtl::OUString >& _rLeftFields, Sequence< ::rtl::OUString >& _rRightFields ) const + Sequence< OUString >& _rLeftFields, Sequence< OUString >& _rRightFields ) const { try { @@ -511,14 +511,14 @@ namespace pcr Reference< XColumnsSupplier > xKeyColSupp( xKey, UNO_QUERY ); Reference< XIndexAccess > xKeyColumns; Reference< XPropertySet > xKeyColumn; - ::rtl::OUString sColumnName, sRelatedColumnName; + OUString sColumnName, sRelatedColumnName; const sal_Int32 keyCount = xKeys->getCount(); for ( sal_Int32 key = 0; key < keyCount; ++key ) { xKeys->getByIndex( key ) >>= xKey; sal_Int32 nKeyType = 0; - xKey->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nKeyType; + xKey->getPropertyValue( OUString( "Type" ) ) >>= nKeyType; if ( nKeyType != KeyType::FOREIGN ) continue; @@ -542,7 +542,7 @@ namespace pcr if ( xKeyColumn.is() ) { xKeyColumn->getPropertyValue( PROPERTY_NAME ) >>= sColumnName; - xKeyColumn->getPropertyValue( ::rtl::OUString( "RelatedColumn" ) ) >>= sRelatedColumnName; + xKeyColumn->getPropertyValue( OUString( "RelatedColumn" ) ) >>= sRelatedColumnName; _rLeftFields[ column ] = sColumnName; _rRightFields[ column ] = sRelatedColumnName; @@ -574,7 +574,7 @@ namespace pcr // only show the button when both forms are based on the same data source if ( bEnable ) { - ::rtl::OUString sMasterDS, sDetailDS; + OUString sMasterDS, sDetailDS; xMasterFormProps->getPropertyValue( PROPERTY_DATASOURCE ) >>= sMasterDS; xDetailFormProps->getPropertyValue( PROPERTY_DATASOURCE ) >>= sDetailDS; bEnable = ( sMasterDS == sDetailDS ); diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 7c859fc01cdf..48aa39db7213 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -64,13 +64,13 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xMasterForm; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aRelationDetailColumns; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aRelationMasterColumns; - ::rtl::OUString m_sDetailLabel; - ::rtl::OUString m_sMasterLabel; + OUString m_sDetailLabel; + OUString m_sMasterLabel; public: FormLinkDialog( @@ -78,9 +78,9 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDetailForm, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxMasterForm, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _sExplanation = ::rtl::OUString(), - const ::rtl::OUString& _sDetailLabel = ::rtl::OUString(), - const ::rtl::OUString& _sMasterLabel = ::rtl::OUString() + const OUString& _sExplanation = OUString(), + const OUString& _sDetailLabel = OUString(), + const OUString& _sMasterLabel = OUString() ); ~FormLinkDialog( ); @@ -100,8 +100,8 @@ namespace pcr void commitLinkPairs(); void initializeFieldRowsFrom( - ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rDetailFields, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rMasterFields + ::com::sun::star::uno::Sequence< OUString >& _rDetailFields, + ::com::sun::star::uno::Sequence< OUString >& _rMasterFields ); String getFormDataSourceType( @@ -110,7 +110,7 @@ namespace pcr void getFormFields( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rNames + ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rNames ) const SAL_THROW(()); void ensureFormConnection( @@ -128,8 +128,8 @@ namespace pcr sal_Bool getExistingRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxLHS, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxRHS, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rLeftFields, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rRightFields + ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rLeftFields, + ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rRightFields ) const; }; diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index a150e3160fac..f1cb08caff6e 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -42,21 +42,21 @@ namespace pcr { String sName; String sTranslation; - rtl::OString sHelpId; + OString sHelpId; sal_Int32 nId; sal_uInt32 nUIFlags; OPropertyInfoImpl( - const ::rtl::OUString& rName, + const OUString& rName, sal_Int32 _nId, const String& aTranslation, - const rtl::OString&, + const OString&, sal_uInt32 _nUIFlags); }; //------------------------------------------------------------------------ - OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId, - const String& aString, const rtl::OString& sHid, sal_uInt32 _nUIFlags) + OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId, + const String& aString, const OString& sHid, sal_uInt32 _nUIFlags) :sName(_rName) ,sTranslation(aString) ,sHelpId(sHid) @@ -381,10 +381,10 @@ namespace pcr } //------------------------------------------------------------------------ - rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const + OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return (pInfo) ? pInfo->sHelpId : rtl::OString(); + return (pInfo) ? pInfo->sHelpId : OString(); } //------------------------------------------------------------------------ @@ -402,7 +402,7 @@ namespace pcr } //------------------------------------------------------------------------ - ::std::vector< ::rtl::OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const + ::std::vector< OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const { OSL_ENSURE( ( ( getPropertyUIFlags( _nId ) & PROP_FLAG_ENUM ) != 0 ) || ( _nId == PROPERTY_ID_TARGET_FRAME ), "OPropertyInfoService::getPropertyEnumRepresentations: this is no enum property!" ); @@ -506,7 +506,7 @@ namespace pcr break; } - ::std::vector< ::rtl::OUString > aReturn; + ::std::vector< OUString > aReturn; if ( nStringItemsResId ) { @@ -526,7 +526,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool OPropertyInfoService::isComposeable( const ::rtl::OUString& _rPropertyName ) const + sal_Bool OPropertyInfoService::isComposeable( const OUString& _rPropertyName ) const { sal_Int32 nId = getPropertyId( _rPropertyName ); if ( nId == -1 ) @@ -593,17 +593,17 @@ namespace pcr } //-------------------------------------------------------------------- - ::std::vector< ::rtl::OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const + ::std::vector< OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const { return m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); } //-------------------------------------------------------------------- - void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const ::rtl::OUString& _rDescription, Any& _out_rValue ) const + void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const { sal_uInt32 nPropertyUIFlags = m_rMetaData.getPropertyUIFlags( m_nPropertyId ); - ::std::vector< ::rtl::OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); - ::std::vector< ::rtl::OUString >::const_iterator pos = ::std::find( aEnumStrings.begin(), aEnumStrings.end(), _rDescription ); + ::std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); + ::std::vector< OUString >::const_iterator pos = ::std::find( aEnumStrings.begin(), aEnumStrings.end(), _rDescription ); if ( pos != aEnumStrings.end() ) { sal_Int32 nPos = pos - aEnumStrings.begin(); @@ -642,9 +642,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const + OUString SAL_CALL DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const { - ::rtl::OUString sReturn; + OUString sReturn; sal_Int32 nIntValue = -1; OSL_VERIFY( ::cppu::enum2int( nIntValue, _rEnumValue ) ); @@ -653,7 +653,7 @@ namespace pcr // enum value starting with 1 --nIntValue; - ::std::vector< ::rtl::OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); + ::std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); if ( ( nIntValue >= 0 ) && ( nIntValue < (sal_Int32)aEnumStrings.size() ) ) { sReturn = aEnumStrings[ nIntValue ]; diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index fdb5819b4f76..1f2340614c52 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -47,13 +47,13 @@ namespace pcr // IPropertyInfoService virtual sal_Int32 getPropertyId(const String& _rName) const; virtual String getPropertyTranslation(sal_Int32 _nId) const; - virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const; + virtual OString getPropertyHelpId(sal_Int32 _nId) const; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; - virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const; + virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const; virtual String getPropertyName( sal_Int32 _nPropId ); - virtual sal_Bool isComposeable( const ::rtl::OUString& _rPropertyName ) const; + virtual sal_Bool isComposeable( const OUString& _rPropertyName ) const; protected: static const OPropertyInfoImpl* getPropertyInfo(); @@ -91,10 +91,10 @@ namespace pcr protected: // IPropertyEnumRepresentation implementqation - virtual ::std::vector< ::rtl::OUString > + virtual ::std::vector< OUString > SAL_CALL getDescriptions() const; - virtual void SAL_CALL getValueFromDescription( const ::rtl::OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; - virtual ::rtl::OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; + virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; + virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; // IReference implementqation virtual oslInterlockedCount SAL_CALL acquire(); diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 703c0985c9a2..cb9d4704e8c9 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -75,10 +75,10 @@ namespace pcr EnumRepresentation( const Reference< XComponentContext >& _rxContext, const Type& _rEnumType ); // IPropertyEnumRepresentation implementqation - virtual ::std::vector< ::rtl::OUString > + virtual ::std::vector< OUString > SAL_CALL getDescriptions() const; - virtual void SAL_CALL getValueFromDescription( const ::rtl::OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; - virtual ::rtl::OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; + virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; + virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; // IReference implementqation virtual oslInterlockedCount SAL_CALL acquire(); @@ -103,7 +103,7 @@ namespace pcr if ( _rxContext.is() ) { Reference< XHierarchicalNameAccess > xTypeDescProv( - _rxContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), + _rxContext->getValueByName( OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), UNO_QUERY_THROW ); m_xTypeDescription = Reference< XEnumTypeDescription >( xTypeDescProv->getByHierarchicalName( m_aEnumType.getTypeName() ), UNO_QUERY_THROW ); @@ -116,9 +116,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::std::vector< ::rtl::OUString > EnumRepresentation::getDescriptions() const + ::std::vector< OUString > EnumRepresentation::getDescriptions() const { - Sequence< ::rtl::OUString > aNames; + Sequence< OUString > aNames; try { if ( m_xTypeDescription.is() ) @@ -129,7 +129,7 @@ namespace pcr OSL_FAIL( "EnumRepresentation::getDescriptions: caught an exception!" ); } - return ::std::vector< ::rtl::OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); + return ::std::vector< OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); } //-------------------------------------------------------------------- @@ -148,9 +148,9 @@ namespace pcr } //-------------------------------------------------------------------- - void EnumRepresentation::getValueFromDescription( const ::rtl::OUString& _rDescription, Any& _out_rValue ) const + void EnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const { - ::std::vector< ::rtl::OUString > aDescriptions( getDescriptions() ); + ::std::vector< OUString > aDescriptions( getDescriptions() ); sal_Int32 index = ::std::find( aDescriptions.begin(), aDescriptions.end(), _rDescription ) - aDescriptions.begin(); @@ -168,9 +168,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const + OUString EnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const { - ::rtl::OUString sDescription; + OUString sDescription; sal_Int32 nAsInt = 0; OSL_VERIFY( ::cppu::enum2int( nAsInt, _rEnumValue ) ); @@ -181,7 +181,7 @@ namespace pcr sal_Int32 index = ::std::find( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), nAsInt ) - aValues.getConstArray(); - ::std::vector< ::rtl::OUString > aDescriptions( getDescriptions() ); + ::std::vector< OUString > aDescriptions( getDescriptions() ); if ( ( index >= 0 ) && ( index < (sal_Int32)aDescriptions.size() ) ) sDescription = aDescriptions[ index ]; else @@ -229,7 +229,7 @@ namespace pcr virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException); protected: - void impl_dispatch_throw( const ::rtl::OUString& _rURL ); + void impl_dispatch_throw( const OUString& _rURL ); }; //-------------------------------------------------------------------- @@ -263,9 +263,9 @@ namespace pcr Reference< XPropertyControl > xControl( rEvent.Source, UNO_QUERY_THROW ); Any aControlValue( xControl->getValue() ); - ::rtl::OUString sURL; + OUString sURL; if ( aControlValue.hasValue() && !( aControlValue >>= sURL ) ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); if ( sURL.isEmpty() ) return; @@ -280,17 +280,17 @@ namespace pcr } //-------------------------------------------------------------------- - void UrlClickHandler::impl_dispatch_throw( const ::rtl::OUString& _rURL ) + void UrlClickHandler::impl_dispatch_throw( const OUString& _rURL ) { Reference< XURLTransformer > xTransformer( URLTransformer::create(m_aContext.getUNOContext()) ); - URL aURL; aURL.Complete = ::rtl::OUString( ".uno:OpenHyperlink" ); + URL aURL; aURL.Complete = OUString( ".uno:OpenHyperlink" ); xTransformer->parseStrict( aURL ); Reference< XDesktop2 > xDispProv = Desktop::create( m_aContext.getUNOContext() ); - Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, ::rtl::OUString(), 0 ), UNO_QUERY_THROW ); + Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, OUString(), 0 ), UNO_QUERY_THROW ); Sequence< PropertyValue > aDispatchArgs(1); - aDispatchArgs[0].Name = ::rtl::OUString("URL"); + aDispatchArgs[0].Name = OUString("URL"); aDispatchArgs[0].Value <<= _rURL; xDispatch->dispatch( aURL, aDispatchArgs ); @@ -319,35 +319,35 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL GenericPropertyHandler::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL GenericPropertyHandler::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() ); + StlSyntaxSequence< OUString > aAllServices( getSupportedServiceNames() ); return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.inspection.GenericPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.inspection.GenericPropertyHandler" ); return aSupported; } @@ -369,7 +369,7 @@ namespace pcr ::cppu::OInterfaceIteratorHelper iterRemove( m_aPropertyListeners ); ::cppu::OInterfaceIteratorHelper iterReAdd( m_aPropertyListeners ); // this holds a copy of the container ... while ( iterRemove.hasMoreElements() ) - m_xComponent->removePropertyChangeListener( ::rtl::OUString(), static_cast< XPropertyChangeListener* >( iterRemove.next() ) ); + m_xComponent->removePropertyChangeListener( OUString(), static_cast< XPropertyChangeListener* >( iterRemove.next() ) ); m_xComponentIntrospectionAccess.clear(); m_xComponent.clear(); @@ -380,7 +380,7 @@ namespace pcr Reference< XIntrospectionAccess > xIntrospectionAccess( xIntrospection->inspect( makeAny( _rxIntrospectee ) ) ); if ( !xIntrospectionAccess.is() ) - throw RuntimeException( ::rtl::OUString( "The introspection service could not handle the given component." ), *this ); + throw RuntimeException( OUString( "The introspection service could not handle the given component." ), *this ); m_xComponent = Reference< XPropertySet >( xIntrospectionAccess->queryAdapter( XPropertySet::static_type() ), UNO_QUERY_THROW ); // now that we survived so far, remember m_xComponentIntrospectionAccess @@ -392,11 +392,11 @@ namespace pcr // re-add the property change listeners while ( iterReAdd.hasMoreElements() ) - m_xComponent->addPropertyChangeListener( ::rtl::OUString(), static_cast< XPropertyChangeListener* >( iterReAdd.next() ) ); + m_xComponent->addPropertyChangeListener( OUString(), static_cast< XPropertyChangeListener* >( iterReAdd.next() ) ); } //-------------------------------------------------------------------- - Any SAL_CALL GenericPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL GenericPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xComponent.is() ) @@ -406,7 +406,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL GenericPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL GenericPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xComponent.is() ) @@ -425,7 +425,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL GenericPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL GenericPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); const_cast< GenericPropertyHandler* >( this )->impl_ensurePropertyMap(); @@ -441,7 +441,7 @@ namespace pcr if ( pos->second.Type.getTypeClass() == TypeClass_ENUM ) { - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); impl_getEnumConverter( pos->second.Type )->getValueFromDescription( sControlValue, aPropertyValue ); } @@ -452,7 +452,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL GenericPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL GenericPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); const_cast< GenericPropertyHandler* >( this )->impl_ensurePropertyMap(); @@ -476,7 +476,7 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL GenericPropertyHandler::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL GenericPropertyHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyState eState = PropertyState_DIRECT_VALUE; @@ -497,7 +497,7 @@ namespace pcr { try { - m_xComponent->addPropertyChangeListener( ::rtl::OUString(), _rxListener ); + m_xComponent->addPropertyChangeListener( OUString(), _rxListener ); } catch( const UnknownPropertyException& ) { @@ -514,7 +514,7 @@ namespace pcr { try { - m_xComponent->removePropertyChangeListener( ::rtl::OUString(), _rxListener ); + m_xComponent->removePropertyChangeListener( OUString(), _rxListener ); } catch( const UnknownPropertyException& ) { @@ -605,24 +605,24 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { // no superseded properties at all. This handler offers the very basic PropertyHandler // functionality, so it's much more likely that other handlers want to supersede // *our* properties .... - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { // This basic PropertyHandler implementation is too dumb^Wgeneric to know // anything about property dependencies - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL GenericPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL GenericPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -667,25 +667,25 @@ namespace pcr if ( !aDescriptor.Control.is() ) PropertyHandlerHelper::describePropertyLine( pos->second, aDescriptor, _rxControlFactory ); - aDescriptor.Category = ::rtl::OUString( "General" ); + aDescriptor.Category = OUString( "General" ); return aDescriptor; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return sal_False; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { OSL_FAIL( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" ); return InteractiveSelectionResult_Cancelled; } //-------------------------------------------------------------------- - void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { OSL_FAIL( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" ); } diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 3ba0cb1fcace..f054a30c1dac 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -82,8 +82,8 @@ namespace pcr public: // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); protected: @@ -96,23 +96,23 @@ namespace pcr protected: // XPropertyHandler overridables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -120,9 +120,9 @@ namespace pcr virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); private: /** ensures that ->m_aProperties is initialized diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 83568ad2286a..8561f818d6d6 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -74,7 +74,7 @@ namespace pcr // special handling for booleans (this will become a list) if ( _rProperty.Type.getTypeClass() == TypeClass_BOOLEAN ) { - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); _out_rDescriptor.Control = createListBoxControl( _rxControlFactory, aListEntries, bReadOnlyControl, sal_False ); return; @@ -117,7 +117,7 @@ namespace pcr { Reference< XPropertyControl > lcl_implCreateListLikeControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted, sal_Bool _bTrueIfListBoxFalseIfComboBox @@ -130,11 +130,11 @@ namespace pcr UNO_QUERY_THROW ); - ::std::vector< ::rtl::OUString > aInitialEntries( _rInitialListEntries ); + ::std::vector< OUString > aInitialEntries( _rInitialListEntries ); if ( _bSorted ) ::std::sort( aInitialEntries.begin(), aInitialEntries.end() ); - for ( ::std::vector< ::rtl::OUString >::const_iterator loop = aInitialEntries.begin(); + for ( ::std::vector< OUString >::const_iterator loop = aInitialEntries.begin(); loop != aInitialEntries.end(); ++loop ) @@ -145,14 +145,14 @@ namespace pcr //-------------------------------------------------------------------- Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) { return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_True ); } //-------------------------------------------------------------------- Reference< XPropertyControl > PropertyHandlerHelper::createComboBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) { return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_False ); } @@ -188,7 +188,7 @@ namespace pcr if ( _rControlValue.getValueType().getTypeClass() == TypeClass_STRING ) { - ::rtl::OUString sControlValue; + OUString sControlValue; _rControlValue >>= sControlValue; Reference< XStringRepresentation > xConversionHelper = StringRepresentation::create( _rxContext,_rxTypeConverter ); diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 3d212affa8d0..b9a1d1aff5c9 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -95,7 +95,7 @@ namespace pcr static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > createListBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ); @@ -121,7 +121,7 @@ namespace pcr static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > createComboBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ); diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 671fdddd2cbe..d8ebe0780ec0 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -98,25 +98,25 @@ namespace pcr ,m_bIsReadOnly( sal_False ) { registerProperty( - ::rtl::OUString( "HasHelpSection" ), + OUString( "HasHelpSection" ), MODEL_PROPERTY_ID_HAS_HELP_SECTION, PropertyAttribute::READONLY, &m_bHasHelpSection, ::getCppuType( &m_bHasHelpSection ) ); registerProperty( - ::rtl::OUString( "MinHelpTextLines" ), + OUString( "MinHelpTextLines" ), MODEL_PROPERTY_ID_MIN_HELP_TEXT_LINES, PropertyAttribute::READONLY, &m_nMinHelpTextLines, ::getCppuType( &m_nMinHelpTextLines ) ); registerProperty( - ::rtl::OUString( "MaxHelpTextLines" ), + OUString( "MaxHelpTextLines" ), MODEL_PROPERTY_ID_MAX_HELP_TEXT_LINES, PropertyAttribute::READONLY, &m_nMaxHelpTextLines, ::getCppuType( &m_nMaxHelpTextLines ) ); registerProperty( - ::rtl::OUString( "IsReadOnly" ), + OUString( "IsReadOnly" ), MODEL_PROPERTY_ID_IS_READ_ONLY, PropertyAttribute::BOUND, &m_bIsReadOnly, ::getCppuType( &m_bIsReadOnly ) @@ -235,10 +235,10 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL ImplInspectorModel::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL ImplInspectorModel::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator check = aSupported.begin(); + StlSyntaxSequence< OUString > aSupported( getSupportedServiceNames() ); + for ( StlSyntaxSequence< OUString >::const_iterator check = aSupported.begin(); check != aSupported.end(); ++check ) diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx index a82e64601a94..bc12d78a7069 100644 --- a/extensions/source/propctrlr/inspectormodelbase.hxx +++ b/extensions/source/propctrlr/inspectormodelbase.hxx @@ -81,7 +81,7 @@ namespace pcr virtual void SAL_CALL setIsReadOnly( ::sal_Bool _IsReadOnly ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); protected: void enableHelpSectionProperties( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ); diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index 578897182d73..074ce565f444 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.hxx @@ -32,7 +32,7 @@ namespace pcr //======================================================================== struct OLineDescriptor : public ::com::sun::star::inspection::LineDescriptor { - ::rtl::OUString sName; // the name of the property + OUString sName; // the name of the property ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > xPropertyHandler; // the handler for this property ::com::sun::star::uno::Any aValue; // the current value of the property diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index b5b88415cb22..75b040df8d9f 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -38,7 +38,7 @@ namespace pcr //==================================================================== //-------------------------------------------------------------------- ListSelectionDialog::ListSelectionDialog( Window* _pParent, const Reference< XPropertySet >& _rxListBox, - const ::rtl::OUString& _rPropertyName, const String& _rPropertyUIName ) + const OUString& _rPropertyName, const String& _rPropertyUIName ) :ModalDialog( _pParent, PcrRes( RID_DLG_SELECTION ) ) ,m_aLabel ( this, PcrRes( FT_ENTRIES ) ) ,m_aEntries ( this, PcrRes( LB_ENTRIES ) ) @@ -85,7 +85,7 @@ namespace pcr m_aEntries.EnableMultiSelection( bMultiSelection ); // fill the list box with all entries - Sequence< ::rtl::OUString > aListEntries; + Sequence< OUString > aListEntries; OSL_VERIFY( m_xListBox->getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aListEntries ); fillEntryList( aListEntries ); @@ -120,11 +120,11 @@ namespace pcr } //-------------------------------------------------------------------- - void ListSelectionDialog::fillEntryList( const Sequence< ::rtl::OUString >& _rListEntries ) + void ListSelectionDialog::fillEntryList( const Sequence< OUString >& _rListEntries ) { m_aEntries.Clear(); - const ::rtl::OUString* _pListEntries = _rListEntries.getConstArray(); - const ::rtl::OUString* _pListEntriesEnd = _rListEntries.getConstArray() + _rListEntries.getLength(); + const OUString* _pListEntries = _rListEntries.getConstArray(); + const OUString* _pListEntriesEnd = _rListEntries.getConstArray() + _rListEntries.getLength(); for ( ; _pListEntries < _pListEntriesEnd; ++_pListEntries ) m_aEntries.InsertEntry( *_pListEntries ); } diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx index 67083efed777..79c4e9c589c6 100644 --- a/extensions/source/propctrlr/listselectiondlg.hxx +++ b/extensions/source/propctrlr/listselectiondlg.hxx @@ -46,13 +46,13 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xListBox; - ::rtl::OUString m_sPropertyName; + OUString m_sPropertyName; public: ListSelectionDialog( Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxListBox, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const String& _rPropertyUIName ); @@ -63,7 +63,7 @@ namespace pcr void initialize( ); void commitSelection(); - void fillEntryList ( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rListEntries ); + void fillEntryList ( const ::com::sun::star::uno::Sequence< OUString >& _rListEntries ); void selectEntries ( const ::com::sun::star::uno::Sequence< sal_Int16 >& /* [in ] */ _rSelection ); void collectSelection( ::com::sun::star::uno::Sequence< sal_Int16 >& /* [out] */ _rSelection ); diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index c0bc996d5bce..0da7a156f6fc 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -32,7 +32,7 @@ namespace pcr //= NewDataTypeDialog //==================================================================== //-------------------------------------------------------------------- - NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const ::rtl::OUString& _rNameBase, const ::std::vector< ::rtl::OUString >& _rProhibitedNames ) + NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ) :ModalDialog( _pParent, PcrRes( RID_DLG_NEW_DATA_TYPE ) ) ,m_aLabel ( this, PcrRes( FT_LABEL ) ) ,m_aName ( this, PcrRes( ED_NAME ) ) @@ -64,7 +64,7 @@ namespace pcr sal_Int32 nPostfixNumber = 1; do { - ( sInitialName = sNameBase ) += rtl::OUString::valueOf(nPostfixNumber++); + ( sInitialName = sNameBase ) += OUString::valueOf(nPostfixNumber++); } while ( m_aProhibitedNames.find( sInitialName ) != m_aProhibitedNames.end() ); diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index 57395679da52..b78fe3774e8a 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -44,11 +44,11 @@ namespace pcr OKButton m_aOK; CancelButton m_aCancel; - ::std::set< ::rtl::OUString > + ::std::set< OUString > m_aProhibitedNames; public: - NewDataTypeDialog( Window* _pParent, const ::rtl::OUString& _rNameBase, const ::std::vector< ::rtl::OUString >& _rProhibitedNames ); + NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ); inline String GetName() const { return m_aName.GetText(); } diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 68d22900ad86..edd9f883f3cd 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -64,18 +64,18 @@ namespace pcr // XObjectInspectorModel virtual Sequence< Any > SAL_CALL getHandlerFactories() throw (RuntimeException); virtual Sequence< PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (RuntimeException); - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const ::rtl::OUString& PropertyName ) throw (RuntimeException); + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (RuntimeException); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(RuntimeException); + static OUString getImplementationName_static( ) throw(RuntimeException); + static Sequence< OUString > getSupportedServiceNames_static( ) throw(RuntimeException); static Reference< XInterface > SAL_CALL Create(const Reference< XComponentContext >&); @@ -112,7 +112,7 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const ::rtl::OUString& /*PropertyName*/ ) throw (RuntimeException) + ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const OUString& /*PropertyName*/ ) throw (RuntimeException) { // no ordering provided by this default implementation return 0; @@ -154,28 +154,28 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ObjectInspectorModel::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL ObjectInspectorModel::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString ObjectInspectorModel::getImplementationName_static( ) throw(RuntimeException) + OUString ObjectInspectorModel::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" ); + return OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { - ::rtl::OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); - return Sequence< ::rtl::OUString >( &sService, 1 ); + OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); + return Sequence< OUString >( &sService, 1 ); } //-------------------------------------------------------------------- @@ -188,7 +188,7 @@ namespace pcr void ObjectInspectorModel::createDefault() { m_aFactories.realloc( 1 ); - m_aFactories[0] <<= ::rtl::OUString( "com.sun.star.inspection.GenericPropertyHandler" ); + m_aFactories[0] <<= OUString( "com.sun.star.inspection.GenericPropertyHandler" ); } //-------------------------------------------------------------------- @@ -214,7 +214,7 @@ namespace pcr void ObjectInspectorModel::impl_verifyArgument_throw( bool _bCondition, sal_Int16 _nArgumentPosition ) { if ( !_bCondition ) - throw IllegalArgumentException( ::rtl::OUString(), *this, _nArgumentPosition ); + throw IllegalArgumentException( OUString(), *this, _nArgumentPosition ); } //........................................................................ diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index aee7ce160773..1fef1572cc1c 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -36,20 +36,20 @@ namespace pcr //= HelpIdUrl //======================================================================== //------------------------------------------------------------------------ - rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) + OString HelpIdUrl::getHelpId( const OUString& _rHelpURL ) { INetURLObject aHID( _rHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) - return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); else - return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------ - ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) + OUString HelpIdUrl::getHelpURL( const OString& sHelpId ) { - ::rtl::OUStringBuffer aBuffer; - ::rtl::OUString aTmp( rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); + OUStringBuffer aBuffer; + OUString aTmp( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); INetURLObject aHID( aTmp ); if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) aBuffer.appendAscii( INET_HID_SCHEME ); diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 6412839fb0a7..e3216ad295ec 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -66,8 +66,8 @@ namespace pcr class HelpIdUrl { public: - static rtl::OString getHelpId( const ::rtl::OUString& _rHelpURL ); - static ::rtl::OUString getHelpURL( const rtl::OString& ); + static OString getHelpId( const OUString& _rHelpURL ); + static OUString getHelpURL( const OString& ); }; //==================================================================== diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx index 52b476e12f9f..cb2a560de9b8 100644 --- a/extensions/source/propctrlr/pcrcommontypes.hxx +++ b/extensions/source/propctrlr/pcrcommontypes.hxx @@ -30,7 +30,7 @@ namespace pcr { //........................................................................ - typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > + typedef ::boost::unordered_map< OUString, ::com::sun::star::beans::Property, OUStringHash > PropertyMap; //........................................................................ diff --git a/extensions/source/propctrlr/pcrcomponentcontext.cxx b/extensions/source/propctrlr/pcrcomponentcontext.cxx index b05e71b48f5e..95af777606c0 100644 --- a/extensions/source/propctrlr/pcrcomponentcontext.cxx +++ b/extensions/source/propctrlr/pcrcomponentcontext.cxx @@ -55,7 +55,7 @@ namespace pcr } //------------------------------------------------------------------------ - Any ComponentContext::getContextValueByName( const ::rtl::OUString& _rName ) const + Any ComponentContext::getContextValueByName( const OUString& _rName ) const { Any aReturn; try @@ -70,7 +70,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XInterface > ComponentContext::createComponent( const ::rtl::OUString& _rServiceName ) const + Reference< XInterface > ComponentContext::createComponent( const OUString& _rServiceName ) const { Reference< XInterface > xComponent( m_xORB->createInstanceWithContext( _rServiceName, m_xContext ) diff --git a/extensions/source/propctrlr/pcrcomponentcontext.hxx b/extensions/source/propctrlr/pcrcomponentcontext.hxx index 51476febdfa2..e26a675e6d1b 100644 --- a/extensions/source/propctrlr/pcrcomponentcontext.hxx +++ b/extensions/source/propctrlr/pcrcomponentcontext.hxx @@ -66,7 +66,7 @@ namespace pcr if and only if the component could be successfully created */ template < class INTERFACE > - bool createComponent( const ::rtl::OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const + bool createComponent( const OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const { _out_rxComponent.clear(); _out_rxComponent = _out_rxComponent.query( @@ -83,7 +83,7 @@ namespace pcr template < class INTERFACE > bool createComponent( const sal_Char* _pAsciiServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const { - return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent ); + return createComponent( OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent ); } /** creates a component using our component factory/context @@ -95,7 +95,7 @@ namespace pcr @return the newly created component. Is never . */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const ::rtl::OUString& _rServiceName ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const OUString& _rServiceName ) const; /** creates a component using our component factory/context @@ -108,7 +108,7 @@ namespace pcr */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const sal_Char* _pAsciiServiceName ) const { - return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ) ); + return createComponent( OUString::createFromAscii( _pAsciiServiceName ) ); } /** returns the ->XMultiServiceFactory interface of ->m_xORB, for passing to @@ -128,7 +128,7 @@ namespace pcr @seealso getContextValueByAsciiName */ ::com::sun::star::uno::Any - getContextValueByName( const ::rtl::OUString& _rName ) const; + getContextValueByName( const OUString& _rName ) const; /** retrieves a value from our component context, specified by 8-bit ASCII string @param _rName @@ -141,7 +141,7 @@ namespace pcr inline ::com::sun::star::uno::Any getContextValueByAsciiName( const sal_Char* _pAsciiName ) const { - return getContextValueByName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); + return getContextValueByName( OUString::createFromAscii( _pAsciiName ) ); } /** retrieve context to create interfaces by the ctors diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index 1ba39549fc01..49caa26c0e94 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -91,7 +91,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::pcr::PcrModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName)); + OUString::createFromAscii(pImplementationName)); } if (xRet.is()) diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index 8fa73ae40d3c..adf013ef2fc7 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -78,15 +78,15 @@ namespace pcr } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OTabOrderDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OTabOrderDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //--------------------------------------------------------------------- - ::rtl::OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) + OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.form.ui.OTabOrderDialog"); + return OUString("org.openoffice.comp.form.ui.OTabOrderDialog"); } //--------------------------------------------------------------------- @@ -99,7 +99,7 @@ namespace pcr ::comphelper::StringSequence OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString( "com.sun.star.form.ui.TabOrderDialog" ); + aSupported.getArray()[0] = OUString( "com.sun.star.form.ui.TabOrderDialog" ); return aSupported; } diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 5d51743b5755..8c10693aa711 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -57,12 +57,12 @@ namespace pcr virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 61bcb4f020df..6c628a1c8250 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -217,11 +217,11 @@ namespace pcr // dynamically - fine with us return; - void (SAL_CALL XPropertySet::*pListenerOperation)( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) + void (SAL_CALL XPropertySet::*pListenerOperation)( const OUString&, const Reference< XPropertyChangeListener >& ) = _bDoListen ? &XPropertySet::addPropertyChangeListener : &XPropertySet::removePropertyChangeListener; (xModelProperties.get()->*pListenerOperation)( - ::rtl::OUString( "IsReadOnly" ), + OUString( "IsReadOnly" ), const_cast< OPropertyBrowserController* >( this ) ); } @@ -287,7 +287,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const ::rtl::OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) throw (RuntimeException) + Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) throw (RuntimeException) { // we don't have any dispatches at all, right now return Reference< XDispatch >(); @@ -327,12 +327,12 @@ namespace pcr if ( arguments.size() == 1 ) { // constructor: "createWithModel( XObjectInspectorModel )" if ( !( arguments[0] >>= xModel ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); createWithModel( xModel ); return; } - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); } //------------------------------------------------------------------------ @@ -360,7 +360,7 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); if (_rxFrame.is() && haveView()) - throw RuntimeException(::rtl::OUString("Unable to attach to a second frame."),*this); + throw RuntimeException(OUString("Unable to attach to a second frame."),*this); // revoke as focus listener from the old container window stopContainerWindowListening(); @@ -376,7 +376,7 @@ namespace pcr VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow); Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; if (!pParentWin) - throw RuntimeException(::rtl::OUString("The frame is invalid. Unable to extract the container window."),*this); + throw RuntimeException(OUString("The frame is invalid. Unable to extract the container window."),*this); if ( Construct( pParentWin ) ) { @@ -497,7 +497,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::restoreViewData( const Any& Data ) throw(RuntimeException) { - ::rtl::OUString sPageSelection; + OUString sPageSelection; if ( ( Data >>= sPageSelection ) && !sPageSelection.isEmpty() ) { m_sPageSelection = sPageSelection; @@ -557,16 +557,16 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL OPropertyBrowserController::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL OPropertyBrowserController::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------ - sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pArray = aSupported.getConstArray(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pArray = aSupported.getConstArray(); for (sal_Int32 i = 0; i < aSupported.getLength(); ++i, ++pArray) if (pArray->equals(ServiceName)) return sal_True; @@ -574,22 +574,22 @@ namespace pcr } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ - ::rtl::OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) + OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.ObjectInspector"); + return OUString("org.openoffice.comp.extensions.ObjectInspector"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.inspection.ObjectInspector"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.inspection.ObjectInspector"); return aSupported; } @@ -655,8 +655,8 @@ namespace pcr if (!haveView()) return; - ::rtl::OUString sOldSelection = m_sPageSelection; - m_sPageSelection = ::rtl::OUString(); + OUString sOldSelection = m_sPageSelection; + m_sPageSelection = OUString(); const sal_uInt16 nCurrentPage = m_pView->getActivaPage(); if ( (sal_uInt16)-1 != nCurrentPage ) @@ -681,7 +681,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_uInt16 OPropertyBrowserController::impl_getPageIdForCategory_nothrow( const ::rtl::OUString& _rCategoryName ) const + sal_uInt16 OPropertyBrowserController::impl_getPageIdForCategory_nothrow( const OUString& _rCategoryName ) const { sal_uInt16 nPageId = (sal_uInt16)-1; HashString2Int16::const_iterator pagePos = m_aPageIds.find( _rCategoryName ); @@ -832,7 +832,7 @@ namespace pcr break; default: - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); } return xControl; @@ -935,14 +935,14 @@ namespace pcr } //------------------------------------------------------------------------ - bool OPropertyBrowserController::impl_hasPropertyHandlerFor_nothrow( const ::rtl::OUString& _rPropertyName ) const + bool OPropertyBrowserController::impl_hasPropertyHandlerFor_nothrow( const OUString& _rPropertyName ) const { PropertyHandlerRepository::const_iterator handlerPos = m_aPropertyHandlers.find( _rPropertyName ); return ( handlerPos != m_aPropertyHandlers.end() ); } //------------------------------------------------------------------------ - OPropertyBrowserController::PropertyHandlerRef OPropertyBrowserController::impl_getHandlerForProperty_throw( const ::rtl::OUString& _rPropertyName ) const + OPropertyBrowserController::PropertyHandlerRef OPropertyBrowserController::impl_getHandlerForProperty_throw( const OUString& _rPropertyName ) const { PropertyHandlerRepository::const_iterator handlerPos = m_aPropertyHandlers.find( _rPropertyName ); if ( handlerPos == m_aPropertyHandlers.end() ) @@ -951,7 +951,7 @@ namespace pcr } //------------------------------------------------------------------------ - Any OPropertyBrowserController::impl_getPropertyValue_throw( const ::rtl::OUString& _rPropertyName ) + Any OPropertyBrowserController::impl_getPropertyValue_throw( const OUString& _rPropertyName ) { PropertyHandlerRef handler = impl_getHandlerForProperty_throw( _rPropertyName ); return handler->getPropertyValue( _rPropertyName ); @@ -1038,8 +1038,8 @@ namespace pcr } // determine the superseded properties - StlSyntaxSequence< ::rtl::OUString > aSupersededByThisHandler = (*aHandler)->getSupersededProperties(); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator superseded = aSupersededByThisHandler.begin(); + StlSyntaxSequence< OUString > aSupersededByThisHandler = (*aHandler)->getSupersededProperties(); + for ( StlSyntaxSequence< OUString >::const_iterator superseded = aSupersededByThisHandler.begin(); superseded != aSupersededByThisHandler.end(); ++superseded ) @@ -1071,8 +1071,8 @@ namespace pcr } // see if the handler expresses interest in any actuating properties - StlSyntaxSequence< ::rtl::OUString > aInterestingActuations = (*aHandler)->getActuatingProperties(); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator aLoop = aInterestingActuations.begin(); + StlSyntaxSequence< OUString > aInterestingActuations = (*aHandler)->getActuatingProperties(); + for ( StlSyntaxSequence< OUString >::const_iterator aLoop = aInterestingActuations.begin(); aLoop != aInterestingActuations.end(); ++aLoop ) @@ -1156,9 +1156,9 @@ namespace pcr if ( _rDescriptor.DisplayName.isEmpty() ) { #ifdef DBG_UTIL - ::rtl::OString sMessage( "OPropertyBrowserController::describePropertyLine: handler did not provide a display name for '" ); - sMessage += ::rtl::OString( _rProperty.Name.getStr(), _rProperty.Name.getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "'!" ); + OString sMessage( "OPropertyBrowserController::describePropertyLine: handler did not provide a display name for '" ); + sMessage += OString( _rProperty.Name.getStr(), _rProperty.Name.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "'!" ); DBG_ASSERT( !_rDescriptor.DisplayName.isEmpty(), sMessage.getStr() ); #endif _rDescriptor.DisplayName = _rProperty.Name; @@ -1221,7 +1221,7 @@ namespace pcr // when building the UI below, remember which properties are actuating, // to allow for a initial actuatinPropertyChanged call - ::std::vector< ::rtl::OUString > aActuatingProperties; + ::std::vector< OUString > aActuatingProperties; ::std::vector< Any > aActuatingPropertyValues; // ask the handlers to describe the property UI, and insert the resulting @@ -1237,8 +1237,8 @@ namespace pcr #if OSL_DEBUG_LEVEL > 0 if ( aDescriptor.Category.isEmpty() ) { - ::rtl::OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" ); - sMessage += ::rtl::OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() ); + OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" ); + sMessage += OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() ); sMessage += "'!"; OSL_FAIL( sMessage.getStr() ); } @@ -1250,7 +1250,7 @@ namespace pcr // this category does not yet exist. This is allowed, as an inspector model might be lazy, and not provide // any category information of its own. In this case, we have a fallback ... m_aPageIds[ aDescriptor.Category ] = - getPropertyBox().AppendPage( aDescriptor.Category, rtl::OString() ); + getPropertyBox().AppendPage( aDescriptor.Category, OString() ); nTargetPageId = impl_getPageIdForCategory_nothrow( aDescriptor.Category ); } @@ -1267,7 +1267,7 @@ namespace pcr // update any dependencies for the actuating properties which we encountered { - ::std::vector< ::rtl::OUString >::const_iterator aProperty = aActuatingProperties.begin(); + ::std::vector< OUString >::const_iterator aProperty = aActuatingProperties.begin(); ::std::vector< Any >::const_iterator aPropertyValue = aActuatingPropertyValues.begin(); for ( ; aProperty != aActuatingProperties.end(); ++aProperty, ++aPropertyValue ) impl_broadcastPropertyChange_nothrow( *aProperty, *aPropertyValue, *aPropertyValue, true ); @@ -1316,7 +1316,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::Clicked( const ::rtl::OUString& _rName, sal_Bool _bPrimary ) + void OPropertyBrowserController::Clicked( const OUString& _rName, sal_Bool _bPrimary ) { try { @@ -1360,7 +1360,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const ::rtl::OUString& _rName ) throw (RuntimeException) + sal_Bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName ) throw (RuntimeException) { for ( OrderedPropertyMap::const_iterator search = m_aProperties.begin(); search != m_aProperties.end(); @@ -1372,18 +1372,18 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::Commit( const ::rtl::OUString& rName, const Any& _rValue ) + void OPropertyBrowserController::Commit( const OUString& rName, const Any& _rValue ) { try { - rtl::OUString sPlcHolder = String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ); + OUString sPlcHolder = String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ); bool bIsPlaceHolderValue = false; if ( rName.equals( PROPERTY_IMAGE_URL ) ) { // if the prop value is the PlaceHolder // can ignore it - rtl::OUString sVal; + OUString sVal; _rValue >>= sVal; if ( sVal.equals( sPlcHolder ) ) bIsPlaceHolderValue = true; @@ -1427,7 +1427,7 @@ namespace pcr OSL_FAIL("OPropertyBrowserController::Commit : caught an exception !"); } - m_sCommittingProperty = ::rtl::OUString(); + m_sCommittingProperty = OUString(); } //-------------------------------------------------------------------- @@ -1454,7 +1454,7 @@ namespace pcr { Reference< XPropertyHandler > xHandler; - ::rtl::OUString sServiceName; + OUString sServiceName; Reference< XSingleServiceFactory > xServiceFac; Reference< XSingleComponentFactory > xComponentFac; @@ -1486,7 +1486,7 @@ namespace pcr { ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface( m_pView ) ) ) + ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface( m_pView ) ) ) }; xHandlerContext = ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), @@ -1544,7 +1544,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool OPropertyBrowserController::impl_findObjectProperty_nothrow( const ::rtl::OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty ) + bool OPropertyBrowserController::impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty ) { OrderedPropertyMap::const_iterator search = m_aProperties.begin(); for ( ; search != m_aProperties.end(); ++search ) @@ -1556,7 +1556,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void OPropertyBrowserController::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1580,7 +1580,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::enablePropertyUI( const ::rtl::OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) + void OPropertyBrowserController::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1593,7 +1593,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) + void OPropertyBrowserController::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1606,7 +1606,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void OPropertyBrowserController::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1656,7 +1656,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void OPropertyBrowserController::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1669,7 +1669,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::showCategory( const ::rtl::OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) + void OPropertyBrowserController::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1682,7 +1682,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1705,7 +1705,7 @@ namespace pcr } //------------------------------------------------------------------------ - void SAL_CALL OPropertyBrowserController::setHelpSectionText( const ::rtl::OUString& _rHelpText ) throw (NoSupportException, RuntimeException) + void SAL_CALL OPropertyBrowserController::setHelpSectionText( const OUString& _rHelpText ) throw (NoSupportException, RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1720,7 +1720,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::impl_broadcastPropertyChange_nothrow( const ::rtl::OUString& _rPropertyName, const Any& _rNewValue, const Any& _rOldValue, bool _bFirstTimeInit ) const + void OPropertyBrowserController::impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const Any& _rNewValue, const Any& _rOldValue, bool _bFirstTimeInit ) const { // are there one or more handlers which are interested in the actuation? ::std::pair< PropertyHandlerMultiRepository::const_iterator, PropertyHandlerMultiRepository::const_iterator > aInterestedHandlers = diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index 85407096c8b9..0aaf5356b834 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -117,15 +117,15 @@ namespace pcr // meta data about the properties OPropertyBrowserView* m_pView; - ::rtl::OUString m_sPageSelection; - ::rtl::OUString m_sLastValidPageSelection; + OUString m_sPageSelection; + OUString m_sLastValidPageSelection; typedef ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > PropertyHandlerRef; typedef ::std::vector< PropertyHandlerRef > PropertyHandlerArray; - typedef ::boost::unordered_map< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_map< OUString, PropertyHandlerRef, OUStringHash > PropertyHandlerRepository; - typedef ::boost::unordered_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_multimap< OUString, PropertyHandlerRef, OUStringHash > PropertyHandlerMultiRepository; PropertyHandlerRepository m_aPropertyHandlers; PropertyHandlerMultiRepository m_aDependencyHandlers; @@ -141,9 +141,9 @@ namespace pcr /// the properties of the currently inspected object(s) OrderedPropertyMap m_aProperties; /// the property we're just committing - ::rtl::OUString m_sCommittingProperty; + OUString m_sCommittingProperty; - typedef ::boost::unordered_map< ::rtl::OUString, sal_uInt16, ::rtl::OUStringHash > HashString2Int16; + typedef ::boost::unordered_map< OUString, sal_uInt16, OUStringHash > HashString2Int16; HashString2Int16 m_aPageIds; bool m_bContainerFocusListening; @@ -155,9 +155,9 @@ namespace pcr DECLARE_XINTERFACE() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XController virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ) throw(::com::sun::star::uno::RuntimeException); @@ -201,34 +201,34 @@ namespace pcr public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); protected: // IPropertyLineListener - virtual void Clicked( const ::rtl::OUString& _rName, sal_Bool _bPrimary ); - virtual void Commit( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rVal ); + virtual void Clicked( const OUString& _rName, sal_Bool _bPrimary ); + virtual void Commit( const OUString& _rName, const ::com::sun::star::uno::Any& _rVal ); // IPropertyControlObserver virtual void focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ); virtual void valueChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ); // IPropertyExistenceCheck - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); // XObjectInspectorUI - virtual void SAL_CALL enablePropertyUI( const ::rtl::OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL showCategory( const ::rtl::OUString& _rCategory, ::sal_Bool _bShow ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > SAL_CALL getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL showCategory( const OUString& _rCategory, ::sal_Bool _bShow ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL registerControlObserver( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlObserver >& _Observer ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL revokeControlObserver( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlObserver >& _Observer ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpSectionText( const ::rtl::OUString& HelpText ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XObjectInspector virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel > SAL_CALL getInspectorModel() throw (::com::sun::star::uno::RuntimeException); @@ -237,7 +237,7 @@ namespace pcr virtual void SAL_CALL inspect( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects ) throw (::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, const ::rtl::OUString& TargetFrameName, ::sal_Int32 SearchFlags ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, const OUString& TargetFrameName, ::sal_Int32 SearchFlags ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -272,17 +272,17 @@ namespace pcr if set to , this is a real change in the property value, not just a call for purposes of initialization. */ - void impl_broadcastPropertyChange_nothrow( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, bool _bFirstTimeInit ) const; + void impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, bool _bFirstTimeInit ) const; /** determines whether the given property is an actuating property, that is, at least one handler expressed interest in changes to this property's value. */ - inline bool impl_isActuatingProperty_nothrow( const ::rtl::OUString& _rPropertyName ) const + inline bool impl_isActuatingProperty_nothrow( const OUString& _rPropertyName ) const { return ( m_aDependencyHandlers.find( _rPropertyName ) != m_aDependencyHandlers.end() ); } - sal_uInt32 GetPropertyPos(const ::rtl::OUString& _rPropName); + sal_uInt32 GetPropertyPos(const OUString& _rPropName); /** retrieves the value of the given property, by asking the appropriate XPropertyHandler @param _rPropertyName @@ -294,7 +294,7 @@ namespace pcr the value of this property */ ::com::sun::star::uno::Any - impl_getPropertyValue_throw( const ::rtl::OUString& _rPropertyName ); + impl_getPropertyValue_throw( const OUString& _rPropertyName ); /// calls XPropertyHandler::suspend for all our property handlers sal_Bool suspendPropertyHandlers_nothrow( sal_Bool _bSuspend ); @@ -319,7 +319,7 @@ namespace pcr if and only if the property could be found. In this case, _pProperty (if not contains the iterator pointing to this property. */ - bool impl_findObjectProperty_nothrow( const ::rtl::OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty = NULL ); + bool impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty = NULL ); sal_Bool Construct(Window* _pParentWin); @@ -333,14 +333,14 @@ namespace pcr the handler which is responsible for the given property */ PropertyHandlerRef - impl_getHandlerForProperty_throw( const ::rtl::OUString& _rPropertyName ) const; + impl_getHandlerForProperty_throw( const OUString& _rPropertyName ) const; /** determines whether we have a handler for the given property @param _rPropertyName the name of the property for which the existence of a handler should be checked */ bool - impl_hasPropertyHandlerFor_nothrow( const ::rtl::OUString& _rPropertyName ) const; + impl_hasPropertyHandlerFor_nothrow( const OUString& _rPropertyName ) const; /** builds up m_aPageIds from InspectorModel::describeCategories, and insert all the respective tab pages into our view @@ -360,7 +360,7 @@ namespace pcr is no tab page for the given category */ sal_uInt16 - impl_getPageIdForCategory_nothrow( const ::rtl::OUString& _rCategoryName ) const; + impl_getPageIdForCategory_nothrow( const OUString& _rCategoryName ) const; /** adds or removes ourself as XEventListener to/from all our inspectees */ diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index c80bdf7ba104..f3706dc4a3e3 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -46,9 +46,9 @@ namespace pcr //---------------------------------------------------------------- struct SetPropertyValue : public ::std::unary_function< Reference< XPropertyHandler >, void > { - ::rtl::OUString sPropertyName; + OUString sPropertyName; const Any& rValue; - SetPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) : sPropertyName( _rPropertyName ), rValue( _rValue ) { } + SetPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) : sPropertyName( _rPropertyName ), rValue( _rValue ) { } void operator()( const Reference< XPropertyHandler >& _rHandler ) { _rHandler->setPropertyValue( sPropertyName, rValue ); @@ -122,35 +122,35 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL PropertyComposer::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyComposer::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->getPropertyValue( _rPropertyName ); } //-------------------------------------------------------------------- - void SAL_CALL PropertyComposer::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL PropertyComposer::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); ::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( _rPropertyName, _rValue ) ); } //-------------------------------------------------------------------- - Any SAL_CALL PropertyComposer::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyComposer::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->convertToPropertyValue( _rPropertyName, _rControlValue ); } //-------------------------------------------------------------------- - Any SAL_CALL PropertyComposer::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyComposer::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->convertToControlValue( _rPropertyName, _rPropertyValue, _rControlValueType ); } //-------------------------------------------------------------------- - PropertyState SAL_CALL PropertyComposer::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL PropertyComposer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); @@ -259,12 +259,12 @@ namespace pcr } //-------------------------------------------------------------------- - void uniteStringArrays( const PropertyComposer::HandlerArray& _rHandlers, Sequence< ::rtl::OUString > (SAL_CALL XPropertyHandler::*pGetter)( void ), - Sequence< ::rtl::OUString >& /* [out] */ _rUnion ) + void uniteStringArrays( const PropertyComposer::HandlerArray& _rHandlers, Sequence< OUString > (SAL_CALL XPropertyHandler::*pGetter)( void ), + Sequence< OUString >& /* [out] */ _rUnion ) { - ::std::set< ::rtl::OUString > aUnitedBag; + ::std::set< OUString > aUnitedBag; - Sequence< ::rtl::OUString > aThisRound; + Sequence< OUString > aThisRound; for ( PropertyComposer::HandlerArray::const_iterator loop = _rHandlers.begin(); loop != _rHandlers.end(); ++loop @@ -278,29 +278,29 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) throw (RuntimeException) { MethodGuard aGuard( *this ); // we supersede those properties which are superseded by at least one of our slaves - Sequence< ::rtl::OUString > aSuperseded; + Sequence< OUString > aSuperseded; uniteStringArrays( m_aSlaveHandlers, &XPropertyHandler::getSupersededProperties, aSuperseded ); return aSuperseded; } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException) { MethodGuard aGuard( *this ); // we're interested in those properties which at least one handler wants to have - Sequence< ::rtl::OUString > aActuating; + Sequence< OUString > aActuating; uniteStringArrays( m_aSlaveHandlers, &XPropertyHandler::getActuatingProperties, aActuating ); return aActuating; } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -309,14 +309,14 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PropertyComposer::isComposable( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL PropertyComposer::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->isComposable( _rPropertyName ); } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -377,7 +377,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL PropertyComposer::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) + void SAL_CALL PropertyComposer::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -395,8 +395,8 @@ namespace pcr ) { // TODO: make this cheaper (cache it?) - const StlSyntaxSequence< ::rtl::OUString > aThisHandlersActuatingProps = (*loop)->getActuatingProperties(); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator loopProps = aThisHandlersActuatingProps.begin(); + const StlSyntaxSequence< OUString > aThisHandlersActuatingProps = (*loop)->getActuatingProperties(); + for ( StlSyntaxSequence< OUString >::const_iterator loopProps = aThisHandlersActuatingProps.begin(); loopProps != aThisHandlersActuatingProps.end(); ++loopProps ) @@ -493,7 +493,7 @@ namespace pcr } //-------------------------------------------------------------------- - sal_Bool SAL_CALL PropertyComposer::hasPropertyByName( const ::rtl::OUString& _rName ) throw (RuntimeException) + sal_Bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName ) throw (RuntimeException) { return impl_isSupportedProperty_nothrow( _rName ); } diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index 68e4cee46b14..5191239035a8 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -77,26 +77,26 @@ namespace pcr public: // XPropertyHandler overridables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::beans::PropertyState - SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -110,7 +110,7 @@ namespace pcr virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // IPropertyExistenceCheck - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); private: /** ensures that m_pUIRequestComposer exists @@ -119,7 +119,7 @@ namespace pcr /** checks whether a given property exists in m_aSupportedProperties */ - bool impl_isSupportedProperty_nothrow( const ::rtl::OUString& _rPropertyName ) + bool impl_isSupportedProperty_nothrow( const OUString& _rPropertyName ) { ::com::sun::star::beans::Property aDummy; aDummy.Name = _rPropertyName; return m_aSupportedProperties.find( aDummy ) != m_aSupportedProperties.end(); @@ -135,7 +135,7 @@ namespace pcr : ::osl::MutexGuard( _rInstance.m_aMutex ) { if ( _rInstance.m_aSlaveHandlers.empty() ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), *(&_rInstance) ); + throw ::com::sun::star::lang::DisposedException( OUString(), *(&_rInstance) ); } }; }; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index c4d0be1dca4c..0440de348a58 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -163,7 +163,7 @@ namespace pcr } //------------------------------------------------------------------ - OBrowserPage* OPropertyEditor::getPage( const ::rtl::OUString& _rPropertyName ) + OBrowserPage* OPropertyEditor::getPage( const OUString& _rPropertyName ) { OBrowserPage* pPage = NULL; MapStringToPageId::const_iterator aPropertyPageIdPos = m_aPropertyPageIds.find( _rPropertyName ); @@ -173,7 +173,7 @@ namespace pcr } //------------------------------------------------------------------ - const OBrowserPage* OPropertyEditor::getPage( const ::rtl::OUString& _rPropertyName ) const + const OBrowserPage* OPropertyEditor::getPage( const OUString& _rPropertyName ) const { return const_cast< OPropertyEditor* >( this )->getPage( _rPropertyName ); } @@ -206,7 +206,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const rtl::OString& _rHelpId ) + sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const OString& _rHelpId ) { // obtain a new id sal_uInt16 nId = m_nNextId++; @@ -232,7 +232,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::SetHelpId( const rtl::OString& rHelpId ) + void OPropertyEditor::SetHelpId( const OString& rHelpId ) { Control::SetHelpId(""); m_aTabControl.SetHelpId(rHelpId); @@ -343,7 +343,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::SetHelpText( const ::rtl::OUString& _rHelpText ) + void OPropertyEditor::SetHelpText( const OUString& _rHelpText ) { forEachPage( &OPropertyEditor::setHelpSectionText, &_rHelpText ); } @@ -369,7 +369,7 @@ namespace pcr if ( !_pPointerToOUString ) return; - const ::rtl::OUString& rText( *(const ::rtl::OUString*)_pPointerToOUString ); + const OUString& rText( *(const OUString*)_pPointerToOUString ); _rPage.getListBox().SetHelpText( rText ); } @@ -398,7 +398,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::RemoveEntry( const ::rtl::OUString& _rName ) + void OPropertyEditor::RemoveEntry( const OUString& _rName ) { OBrowserPage* pPage = getPage( _rName ); if ( pPage ) @@ -420,7 +420,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::SetPropertyValue( const ::rtl::OUString& rEntryName, const Any& _rValue, bool _bUnknownValue ) + void OPropertyEditor::SetPropertyValue( const OUString& rEntryName, const Any& _rValue, bool _bUnknownValue ) { OBrowserPage* pPage = getPage( rEntryName ); if ( pPage ) @@ -428,7 +428,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_uInt16 OPropertyEditor::GetPropertyPos( const ::rtl::OUString& rEntryName ) const + sal_uInt16 OPropertyEditor::GetPropertyPos( const OUString& rEntryName ) const { sal_uInt16 nVal=LISTBOX_ENTRY_NOTFOUND; const OBrowserPage* pPage = getPage( rEntryName ); @@ -465,7 +465,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) + void OPropertyEditor::EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) { for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i ) { @@ -476,7 +476,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ) + void OPropertyEditor::EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ) { for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i ) { @@ -487,7 +487,7 @@ namespace pcr } //------------------------------------------------------------------ - Reference< XPropertyControl > OPropertyEditor::GetPropertyControl(const ::rtl::OUString& rEntryName) + Reference< XPropertyControl > OPropertyEditor::GetPropertyControl(const OUString& rEntryName) { Reference< XPropertyControl > xControl; // let the current page handle this diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index d31ca7912d2c..d8883231554d 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -45,7 +45,7 @@ namespace pcr class OPropertyEditor : public Control { private: - typedef ::std::map< ::rtl::OUString, sal_uInt16 > MapStringToPageId; + typedef ::std::map< OUString, sal_uInt16 > MapStringToPageId; struct HiddenPage { sal_uInt16 nPos; @@ -84,28 +84,28 @@ namespace pcr void EnableHelpSection( bool _bEnable ); bool HasHelpSection() const; - void SetHelpText( const ::rtl::OUString& _rHelpText ); + void SetHelpText( const OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); - void SetHelpId( const rtl::OString& sHelpId ); - sal_uInt16 AppendPage( const String& r, const rtl::OString& _rHelpId ); + void SetHelpId( const OString& sHelpId ); + sal_uInt16 AppendPage( const String& r, const OString& _rHelpId ); void SetPage( sal_uInt16 ); void RemovePage(sal_uInt16 nID); sal_uInt16 GetCurPage(); void ClearAll(); - void SetPropertyValue(const ::rtl::OUString& _rEntryName, const ::com::sun::star::uno::Any& _rValue, bool _bUnknownValue ); - ::com::sun::star::uno::Any GetPropertyValue(const ::rtl::OUString& rEntryName ) const; - sal_uInt16 GetPropertyPos(const ::rtl::OUString& rEntryName ) const; + void SetPropertyValue(const OUString& _rEntryName, const ::com::sun::star::uno::Any& _rValue, bool _bUnknownValue ); + ::com::sun::star::uno::Any GetPropertyValue(const OUString& rEntryName ) const; + sal_uInt16 GetPropertyPos(const OUString& rEntryName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > - GetPropertyControl( const ::rtl::OUString& rEntryName ); - void EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ); - void EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); + GetPropertyControl( const OUString& rEntryName ); + void EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ); + void EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); void ShowPropertyPage( sal_uInt16 _nPageId, bool _bShow ); sal_uInt16 InsertEntry( const OLineDescriptor&, sal_uInt16 _nPageId, sal_uInt16 nPos = EDITOR_LIST_APPEND ); - void RemoveEntry( const ::rtl::OUString& _rName ); + void RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor& ); void setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; } @@ -125,8 +125,8 @@ namespace pcr OBrowserPage* getPage( sal_uInt16& _rPageId ); const OBrowserPage* getPage( sal_uInt16& _rPageId ) const; - OBrowserPage* getPage( const ::rtl::OUString& _rPropertyName ); - const OBrowserPage* getPage( const ::rtl::OUString& _rPropertyName ) const; + OBrowserPage* getPage( const OUString& _rPropertyName ); + const OBrowserPage* getPage( const OUString& _rPropertyName ) const; void Update(const ::std::mem_fun_t& _aUpdateFunction); diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 4da3b9426245..d6c0649af8d6 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -129,19 +129,19 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyHandler::getSupersededProperties( ) throw (RuntimeException) { - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyHandler::getActuatingProperties( ) throw (RuntimeException) { - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } //-------------------------------------------------------------------- - Any SAL_CALL PropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); @@ -154,7 +154,7 @@ namespace pcr if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_ENUM ) != 0 ) { - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); ::rtl::Reference< IPropertyEnumRepresentation > aEnumConversion( new DefaultEnumRepresentation( *m_pInfoService, aProperty.Type, nPropId ) ); @@ -168,7 +168,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL PropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); @@ -188,13 +188,13 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL PropertyHandler::getPropertyState( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL PropertyHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return PropertyState_DIRECT_VALUE; } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL PropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL PropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -219,28 +219,28 @@ namespace pcr aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_DATA_PROPERTY ) != 0 ) - aDescriptor.Category = ::rtl::OUString( "Data" ); + aDescriptor.Category = OUString( "Data" ); else - aDescriptor.Category = ::rtl::OUString( "General" ); + aDescriptor.Category = OUString( "General" ); return aDescriptor; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PropertyHandler::isComposable( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL PropertyHandler::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pInfoService->isComposeable( _rPropertyName ); } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { OSL_FAIL( "PropertyHandler::onInteractivePropertySelection: not implemented!" ); return InteractiveSelectionResult_Cancelled; } //-------------------------------------------------------------------- - void SAL_CALL PropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL PropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { OSL_FAIL( "PropertyHandler::actuatingPropertyChanged: not implemented!" ); } @@ -279,7 +279,7 @@ namespace pcr } //-------------------------------------------------------------------- - void PropertyHandler::firePropertyChange( const ::rtl::OUString& _rPropName, PropertyId _nPropId, const Any& _rOldValue, const Any& _rNewValue ) SAL_THROW(()) + void PropertyHandler::firePropertyChange( const OUString& _rPropName, PropertyId _nPropId, const Any& _rOldValue, const Any& _rNewValue ) SAL_THROW(()) { PropertyChangeEvent aEvent; aEvent.Source = m_xComponent; @@ -313,7 +313,7 @@ namespace pcr } //-------------------------------------------------------------------- - const Property& PropertyHandler::impl_getPropertyFromName_throw( const ::rtl::OUString& _rPropertyName ) const + const Property& PropertyHandler::impl_getPropertyFromName_throw( const OUString& _rPropertyName ) const { const_cast< PropertyHandler* >( this )->getSupportedProperties(); StlSyntaxSequence< Property >::const_iterator pFound = ::std::find_if( m_aSupportedProperties.begin(), m_aSupportedProperties.end(), @@ -326,7 +326,7 @@ namespace pcr } //-------------------------------------------------------------------- - void PropertyHandler::implAddPropertyDescription( ::std::vector< Property >& _rProperties, const ::rtl::OUString& _rPropertyName, const Type& _rType, sal_Int16 _nAttribs ) const + void PropertyHandler::implAddPropertyDescription( ::std::vector< Property >& _rProperties, const OUString& _rPropertyName, const Type& _rType, sal_Int16 _nAttribs ) const { _rProperties.push_back( Property( _rPropertyName, @@ -343,7 +343,7 @@ namespace pcr } //------------------------------------------------------------------------ - PropertyId PropertyHandler::impl_getPropertyId_throw( const ::rtl::OUString& _rPropertyName ) const + PropertyId PropertyHandler::impl_getPropertyId_throw( const OUString& _rPropertyName ) const { PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); if ( nPropId == -1 ) @@ -360,7 +360,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool PropertyHandler::impl_componentHasProperty_throw( const ::rtl::OUString& _rPropName ) const + bool PropertyHandler::impl_componentHasProperty_throw( const OUString& _rPropName ) const { return m_xComponentPropertyInfo.is() && m_xComponentPropertyInfo->hasPropertyByName( _rPropName ); } @@ -375,32 +375,32 @@ namespace pcr if ( xDocumentSI.is() ) { // determine the application type we live in - ::rtl::OUString sConfigurationLocation; - ::rtl::OUString sConfigurationProperty; + OUString sConfigurationLocation; + OUString sConfigurationProperty; if ( xDocumentSI->supportsService( SERVICE_WEB_DOCUMENT ) ) { // writer - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.WriterWeb/Layout/Other" ); - sConfigurationProperty = ::rtl::OUString( "MeasureUnit" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.WriterWeb/Layout/Other" ); + sConfigurationProperty = OUString( "MeasureUnit" ); } else if ( xDocumentSI->supportsService( SERVICE_TEXT_DOCUMENT ) ) { // writer - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Writer/Layout/Other" ); - sConfigurationProperty = ::rtl::OUString( "MeasureUnit" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Writer/Layout/Other" ); + sConfigurationProperty = OUString( "MeasureUnit" ); } else if ( xDocumentSI->supportsService( SERVICE_SPREADSHEET_DOCUMENT ) ) { // calc - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" ); - sConfigurationProperty = ::rtl::OUString( "Metric" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" ); + sConfigurationProperty = OUString( "Metric" ); } else if ( xDocumentSI->supportsService( SERVICE_DRAWING_DOCUMENT ) ) { - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" ); - sConfigurationProperty = ::rtl::OUString( "Metric" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" ); + sConfigurationProperty = OUString( "Metric" ); } else if ( xDocumentSI->supportsService( SERVICE_PRESENTATION_DOCUMENT ) ) { - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" ); - sConfigurationProperty = ::rtl::OUString( "Metric" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" ); + sConfigurationProperty = OUString( "Metric" ); } // read the measurement unit from the configuration @@ -440,9 +440,9 @@ namespace pcr IMPLEMENT_FORWARD_XTYPEPROVIDER2( PropertyHandlerComponent, PropertyHandler, PropertyHandlerComponent_Base ) //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PropertyHandlerComponent::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL PropertyHandlerComponent::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() ); + StlSyntaxSequence< OUString > aAllServices( getSupportedServiceNames() ); return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end(); } diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 56384e8db613..cfdee15f9b7a 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -106,15 +106,15 @@ namespace pcr // default implementations for XPropertyHandler virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); @@ -134,7 +134,7 @@ namespace pcr /** fires the change in a property value to our listener (if any) @see addPropertyChangeListener */ - void firePropertyChange( const ::rtl::OUString& _rPropName, PropertyId _nPropId, + void firePropertyChange( const OUString& _rPropName, PropertyId _nPropId, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue ) SAL_THROW(()); /** retrieves a window which can be used as parent for dialogs @@ -145,7 +145,7 @@ namespace pcr @throw com::sun::star::beans::UnknownPropertyException if the property name is not known to our ->m_pInfoService */ - PropertyId impl_getPropertyId_throw( const ::rtl::OUString& _rPropertyName ) const; + PropertyId impl_getPropertyId_throw( const OUString& _rPropertyName ) const; //------------------------------------------------------------------------------- // helper for implementing doDescribeSupportedProperties @@ -154,7 +154,7 @@ namespace pcr */ inline void addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -162,7 +162,7 @@ namespace pcr */ inline void addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -170,7 +170,7 @@ namespace pcr */ inline void addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -178,7 +178,7 @@ namespace pcr */ inline void addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -186,7 +186,7 @@ namespace pcr */ inline void addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -194,7 +194,7 @@ namespace pcr */ inline void addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -202,14 +202,14 @@ namespace pcr */ inline void addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; /// adds a Property, given by name only, to a given vector of Properties void implAddPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const ::com::sun::star::uno::Type& _rType, sal_Int16 _nAttribs = 0 ) const; @@ -257,11 +257,11 @@ namespace pcr @seealso doDescribeSupportedProperties */ const ::com::sun::star::beans::Property& - impl_getPropertyFromName_throw( const ::rtl::OUString& _rPropertyName ) const; + impl_getPropertyFromName_throw( const OUString& _rPropertyName ) const; /** get the name of a property given by handle */ - inline ::rtl::OUString + inline OUString impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const; /** returns the value of the ContextDocument property in the ComponentContext which was used to create @@ -281,7 +281,7 @@ namespace pcr void impl_setContextDocumentModified_nothrow() const; /// determines whether our component has a given property - bool impl_componentHasProperty_throw( const ::rtl::OUString& _rPropName ) const; + bool impl_componentHasProperty_throw( const OUString& _rPropName ) const; /** determines the default measure unit for the document in which our component lives */ @@ -294,45 +294,45 @@ namespace pcr }; //-------------------------------------------------------------------- - inline void PropertyHandler::addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< OUString* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< sal_Int32* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< sal_Int16* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< double* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::Date* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::Time* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::DateTime* >( NULL ) ), _nAttribs ); } - inline ::rtl::OUString PropertyHandler::impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const + inline OUString PropertyHandler::impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const { const ::com::sun::star::beans::Property* pProp = impl_getPropertyFromId_nothrow( _nPropId ); - return pProp ? pProp->Name : ::rtl::OUString(); + return pProp ? pProp->Name : OUString(); } //==================================================================== @@ -354,9 +354,9 @@ namespace pcr DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; }; //==================================================================== @@ -379,8 +379,8 @@ namespace pcr { ... public: - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); }; */ @@ -395,8 +395,8 @@ namespace pcr protected: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); public: @@ -407,14 +407,14 @@ namespace pcr //-------------------------------------------------------------------- template < class HANDLER > - ::rtl::OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { return HANDLER::getImplementationName_static(); } //-------------------------------------------------------------------- template < class HANDLER > - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) { return HANDLER::getSupportedServiceNames_static(); } diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index 01ecdf312399..45bcbaed6986 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -39,10 +39,10 @@ namespace pcr public: virtual sal_Int32 getPropertyId(const String& _rName) const = 0; virtual String getPropertyTranslation(sal_Int32 _nId) const = 0; - virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const = 0; + virtual OString getPropertyHelpId(sal_Int32 _nId) const = 0; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const = 0; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const = 0; - virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0; + virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0; // this is only temporary, until the UNOization of the property browser is completed virtual String getPropertyName( sal_Int32 _nPropId ) = 0; diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx index 6f2a58c8c454..1315548da4ab 100644 --- a/extensions/source/propctrlr/proplinelistener.hxx +++ b/extensions/source/propctrlr/proplinelistener.hxx @@ -31,8 +31,8 @@ namespace pcr class IPropertyLineListener { public: - virtual void Clicked( const ::rtl::OUString& _rName, sal_Bool _bPrimary ) = 0; - virtual void Commit( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) = 0; + virtual void Clicked( const OUString& _rName, sal_Bool _bPrimary ) = 0; + virtual void Commit( const OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) = 0; protected: ~IPropertyLineListener() {} diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx index 20a085d9922a..8d65391b9cc9 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.cxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx @@ -54,7 +54,7 @@ namespace pcr NULL }; - static sal_Int32 lcl_getNavigationURLIndex( const ::rtl::OUString& _rNavURL ) + static sal_Int32 lcl_getNavigationURLIndex( const OUString& _rNavURL ) { const sal_Char** pLookup = pNavigationURLs; while ( *pLookup ) @@ -108,7 +108,7 @@ namespace pcr { // there's a chance that this is a "virtual" button type // (which are realized by special URLs) - ::rtl::OUString sTargetURL; + OUString sTargetURL; m_xControlModel->getPropertyValue( PROPERTY_TARGET_URL ) >>= sTargetURL; sal_Int32 nNavigationURLIndex = lcl_getNavigationURLIndex( sTargetURL ); @@ -147,13 +147,13 @@ namespace pcr { sal_Int32 nButtonType = FormButtonType_PUSH; OSL_VERIFY( ::cppu::enum2int( nButtonType, _rValue ) ); - ::rtl::OUString sTargetURL; + OUString sTargetURL; bool bIsVirtualButtonType = nButtonType >= s_nFirstVirtualButtonType; if ( bIsVirtualButtonType ) { const sal_Char* pURL = lcl_getNavigationURL( nButtonType - s_nFirstVirtualButtonType ); - sTargetURL = ::rtl::OUString::createFromAscii( pURL ); + sTargetURL = OUString::createFromAscii( pURL ); nButtonType = FormButtonType_URL; } @@ -220,7 +220,7 @@ namespace pcr // pretend (to the user) that there's no URL set - since // virtual button types imply a special (technical) URL which // the user should not see - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); } } } @@ -286,7 +286,7 @@ namespace pcr //------------------------------------------------------------------------ bool PushButtonNavigation::hasNonEmptyCurrentTargetURL() const { - ::rtl::OUString sTargetURL; + OUString sTargetURL; OSL_VERIFY( getCurrentTargetURL() >>= sTargetURL ); return !sTargetURL.isEmpty(); } diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 365382743c3a..ace03a37d1d0 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -75,15 +75,15 @@ namespace pcr m_aControlTree.SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); // fill the description - rtl::OUString sDescription = m_aMainDesc.GetText(); + OUString sDescription = m_aMainDesc.GetText(); sal_Int16 nClassID = FormComponentType::CONTROL; if (::comphelper::hasProperty(PROPERTY_CLASSID, m_xControlModel)) nClassID = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); - sDescription = sDescription.replaceAll(rtl::OUString("$control_class$"), + sDescription = sDescription.replaceAll(OUString("$control_class$"), GetUIHeadlineName(nClassID, makeAny(m_xControlModel))); - rtl::OUString sName = ::comphelper::getString(m_xControlModel->getPropertyValue(PROPERTY_NAME)); - sDescription = sDescription.replaceAll(rtl::OUString("$control_name$"), sName); + OUString sName = ::comphelper::getString(m_xControlModel->getPropertyValue(PROPERTY_NAME)); + sDescription = sDescription.replaceAll(OUString("$control_name$"), sName); m_aMainDesc.SetText(sDescription); // search for the root of the form hierarchy @@ -174,7 +174,7 @@ namespace pcr return 0; sal_Int32 nChildren = 0; - rtl::OUString sName; + OUString sName; Reference< XPropertySet > xAsSet; for (sal_Int32 i=0; igetCount(); ++i) { @@ -222,7 +222,7 @@ namespace pcr if (!::comphelper::hasProperty(PROPERTY_LABEL, xAsSet)) continue; - rtl::OUString sDisplayName = rtl::OUStringBuffer( + OUString sDisplayName = OUStringBuffer( ::comphelper::getString(xAsSet->getPropertyValue(PROPERTY_LABEL))). appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")).append(sName).append(')'). makeStringAndClear(); diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 9b193d645178..83053a94adb4 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -49,7 +49,7 @@ namespace pcr ImageList m_aModelImages; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; - ::rtl::OUString m_sRequiredService; + OUString m_sRequiredService; Image m_aRequiredControlImage; SvTreeListEntry* m_pInitialSelection; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xInitialLabelControl; diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index df6e1261b84b..d4d6bb7429c8 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -130,7 +130,7 @@ namespace pcr { if ( PROPERTY_ACTIVECOMMAND == Event.PropertyName ) { - ::rtl::OUString sCommand; + OUString sCommand; OSL_VERIFY( Event.NewValue >>= sCommand ); m_xObjectAdapter->setSQLCommand( sCommand ); } @@ -243,12 +243,12 @@ namespace pcr aArgs[3].Name = PROPERTY_ESCAPE_PROCESSING; aArgs[3].Value <<= m_xObjectAdapter->getEscapeProcessing(); - aArgs[4].Name = ::rtl::OUString( "GraphicalDesign" ); + aArgs[4].Name = OUString( "GraphicalDesign" ); aArgs[4].Value <<= m_xObjectAdapter->getEscapeProcessing(); Reference< XComponent > xQueryDesign = xLoader->loadComponentFromURL( - ::rtl::OUString( ".component:DB/QueryDesign" ), - ::rtl::OUString( "_self" ), + OUString( ".component:DB/QueryDesign" ), + OUString( "_self" ), FrameSearchFlag::TASKS | FrameSearchFlag::CREATE, aArgs ); @@ -272,7 +272,7 @@ namespace pcr if ( xTitle.is() ) { ::svt::OLocalResourceAccess aEnumStrings( PcrRes( RID_RSC_ENUM_COMMAND_TYPE ), RSC_RESOURCE ); - ::rtl::OUString sDisplayName = String( PcrRes( CommandType::COMMAND + 1 ) ); + OUString sDisplayName = String( PcrRes( CommandType::COMMAND + 1 ) ); xTitle->setTitle( sDisplayName ); } } @@ -295,7 +295,7 @@ namespace pcr Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); Reference< XFrames > xDesktopFramesCollection( xDesktop->getFrames(), UNO_QUERY_THROW ); - xFrame = xDesktop->findFrame( ::rtl::OUString( "_blank" ), FrameSearchFlag::CREATE ); + xFrame = xDesktop->findFrame( OUString( "_blank" ), FrameSearchFlag::CREATE ); OSL_ENSURE( xFrame.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: could not create an empty frame!" ); xDesktopFramesCollection->remove( xFrame ); } @@ -329,11 +329,11 @@ namespace pcr // instead of calling XCloseable::close directly. The latter method would also close // the frame, but not care for things like shutting down the office when the last // frame is gone ... - const UnoURL aCloseURL( ::rtl::OUString( ".uno:CloseDoc" ), + const UnoURL aCloseURL( OUString( ".uno:CloseDoc" ), Reference< XMultiServiceFactory >( m_xORB, UNO_QUERY ) ); Reference< XDispatchProvider > xProvider( m_xDesigner->getFrame(), UNO_QUERY_THROW ); - Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, ::rtl::OUString( "_top" ), FrameSearchFlag::SELF ) ); + Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, OUString( "_top" ), FrameSearchFlag::SELF ) ); OSL_ENSURE( xDispatch.is(), "SQLCommandDesigner::impl_closeDesigner_nothrow: no dispatcher for the CloseDoc command!" ); if ( xDispatch.is() ) { diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index c3bf797e58c4..be140a3543f5 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -171,12 +171,12 @@ namespace pcr /** gets the current value of the command property */ - ::rtl::OUString + OUString impl_getCommandPropertyValue_nothrow(); /** sets anew value for the command property */ - void impl_setCommandPropertyValue_nothrow( const ::rtl::OUString& _rCommand ) const; + void impl_setCommandPropertyValue_nothrow( const OUString& _rCommand ) const; private: SQLCommandDesigner(); // never implemented @@ -193,12 +193,12 @@ namespace pcr { public: /// retrieves the current SQL command of the component - virtual ::rtl::OUString getSQLCommand() const = 0; + virtual OUString getSQLCommand() const = 0; /// retrieves the current value of the EscapeProcessing property of the component virtual sal_Bool getEscapeProcessing() const = 0; /// sets a new SQL command - virtual void setSQLCommand( const ::rtl::OUString& _rCommand ) const = 0; + virtual void setSQLCommand( const OUString& _rCommand ) const = 0; /// sets a new EscapeProcessing property value virtual void setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const = 0; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index fcaa26b30224..f9caaae10131 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -181,14 +181,14 @@ namespace pcr //------------------------------------------------------------------ void SAL_CALL OEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sText; + OUString sText; if ( m_bIsPassword ) { sal_Int16 nValue = 0; _rValue >>= nValue; if ( nValue ) { - sText = rtl::OUString(static_cast(nValue)); + sText = OUString(static_cast(nValue)); } } else @@ -202,7 +202,7 @@ namespace pcr { Any aPropValue; - ::rtl::OUString sText( getTypedControlWindow()->GetText() ); + OUString sText( getTypedControlWindow()->GetText() ); if ( m_bIsPassword ) { if ( !sText.isEmpty() ) @@ -217,7 +217,7 @@ namespace pcr //------------------------------------------------------------------ Type SAL_CALL OEditControl::getValueType() throw (RuntimeException) { - return m_bIsPassword ? ::getCppuType( static_cast< sal_Int16* >( NULL ) ) : ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return m_bIsPassword ? ::getCppuType( static_cast< sal_Int16* >( NULL ) ) : ::getCppuType( static_cast< OUString* >( NULL ) ); } //------------------------------------------------------------------ @@ -423,14 +423,14 @@ namespace pcr //-------------------------------------------------------------------- Any SAL_CALL OHyperlinkControl::getValue() throw (RuntimeException) { - ::rtl::OUString sText = getTypedControlWindow()->GetText(); + OUString sText = getTypedControlWindow()->GetText(); return makeAny( sText ); } //-------------------------------------------------------------------- void SAL_CALL OHyperlinkControl::setValue( const Any& _value ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sText; + OUString sText; _value >>= sText; getTypedControlWindow()->SetText( sText ); } @@ -438,7 +438,7 @@ namespace pcr //-------------------------------------------------------------------- Type SAL_CALL OHyperlinkControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //-------------------------------------------------------------------- @@ -466,7 +466,7 @@ namespace pcr //------------------------------------------------------------------ IMPL_LINK( OHyperlinkControl, OnHyperlinkClicked, void*, /*_NotInterestedIn*/ ) { - ActionEvent aEvent( *this, ::rtl::OUString( "clicked" ) ); + ActionEvent aEvent( *this, OUString( "clicked" ) ); m_aActionListeners.forEach< XActionListener >( boost::bind( &XActionListener::actionPerformed, @@ -715,7 +715,7 @@ namespace pcr getTypedControlWindow()->SelectEntry( aRgbCol ); if ( !getTypedControlWindow()->IsEntrySelected( aRgbCol ) ) { // the given color is not part of the list -> insert a new entry with the hex code of the color - String aStr = rtl::OUString("0x"); + String aStr = OUString("0x"); aStr += MakeHexStr(nColor,8); getTypedControlWindow()->InsertEntry( aRgbCol, aStr ); getTypedControlWindow()->SelectEntry( aRgbCol ); @@ -723,7 +723,7 @@ namespace pcr } else { - ::rtl::OUString sNonColorValue; + OUString sNonColorValue; if ( !( _rValue >>= sNonColorValue ) ) throw IllegalTypeException(); getTypedControlWindow()->SelectEntry( sNonColorValue ); @@ -741,7 +741,7 @@ namespace pcr Any aPropValue; if ( getTypedControlWindow()->GetSelectEntryCount() > 0 ) { - ::rtl::OUString sSelectedEntry = getTypedControlWindow()->GetSelectEntry(); + OUString sSelectedEntry = getTypedControlWindow()->GetSelectEntry(); if ( m_aNonColorEntries.find( sSelectedEntry ) != m_aNonColorEntries.end() ) aPropValue <<= sSelectedEntry; else @@ -766,24 +766,24 @@ namespace pcr } //------------------------------------------------------------------ - void SAL_CALL OColorControl::prependListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OColorControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); m_aNonColorEntries.insert( NewEntry ); } //------------------------------------------------------------------ - void SAL_CALL OColorControl::appendListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OColorControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); m_aNonColorEntries.insert( NewEntry ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OColorControl::getListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OColorControl::getListEntries( ) throw (RuntimeException) { if ( !m_aNonColorEntries.empty() ) - return Sequence< ::rtl::OUString >(&(*m_aNonColorEntries.begin()),m_aNonColorEntries.size()); - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(&(*m_aNonColorEntries.begin()),m_aNonColorEntries.size()); + return Sequence< OUString >(); } //------------------------------------------------------------------ @@ -814,7 +814,7 @@ namespace pcr //------------------------------------------------------------------ Any SAL_CALL OListboxControl::getValue() throw (RuntimeException) { - ::rtl::OUString sControlValue( getTypedControlWindow()->GetSelectEntry() ); + OUString sControlValue( getTypedControlWindow()->GetSelectEntry() ); Any aPropValue; if ( !sControlValue.isEmpty() ) @@ -825,7 +825,7 @@ namespace pcr //------------------------------------------------------------------ Type SAL_CALL OListboxControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //------------------------------------------------------------------ @@ -835,7 +835,7 @@ namespace pcr getTypedControlWindow()->SetNoSelection(); else { - ::rtl::OUString sSelection; + OUString sSelection; _rValue >>= sSelection; if ( !sSelection.equals( getTypedControlWindow()->GetSelectEntry() ) ) @@ -856,22 +856,22 @@ namespace pcr } //------------------------------------------------------------------ - void SAL_CALL OListboxControl::prependListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OListboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); } //------------------------------------------------------------------ - void SAL_CALL OListboxControl::appendListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OListboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException) { const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); - Sequence< ::rtl::OUString > aRet(nCount); - ::rtl::OUString* pIter = aRet.getArray(); + Sequence< OUString > aRet(nCount); + OUString* pIter = aRet.getArray(); for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter) *pIter = getTypedControlWindow()->GetEntry(i); @@ -902,7 +902,7 @@ namespace pcr //------------------------------------------------------------------ void SAL_CALL OComboboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sText; + OUString sText; _rValue >>= sText; getTypedControlWindow()->SetText( sText ); } @@ -910,13 +910,13 @@ namespace pcr //------------------------------------------------------------------ Any SAL_CALL OComboboxControl::getValue() throw (RuntimeException) { - return makeAny( ::rtl::OUString( getTypedControlWindow()->GetText() ) ); + return makeAny( OUString( getTypedControlWindow()->GetText() ) ); } //------------------------------------------------------------------ Type SAL_CALL OComboboxControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //------------------------------------------------------------------ @@ -926,22 +926,22 @@ namespace pcr } //------------------------------------------------------------------ - void SAL_CALL OComboboxControl::prependListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OComboboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); } //------------------------------------------------------------------ - void SAL_CALL OComboboxControl::appendListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OComboboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException) { const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); - Sequence< ::rtl::OUString > aRet(nCount); - ::rtl::OUString* pIter = aRet.getArray(); + Sequence< OUString > aRet(nCount); + OUString* pIter = aRet.getArray(); for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter) *pIter = getTypedControlWindow()->GetEntry(i); @@ -1158,20 +1158,20 @@ namespace pcr namespace { //.............................................................. - StlSyntaxSequence< ::rtl::OUString > lcl_convertMultiLineToList( const String& _rCompsedTextWithLineBreaks ) + StlSyntaxSequence< OUString > lcl_convertMultiLineToList( const String& _rCompsedTextWithLineBreaks ) { xub_StrLen nLines( comphelper::string::getTokenCount(_rCompsedTextWithLineBreaks, '\n') ); - StlSyntaxSequence< ::rtl::OUString > aStrings( nLines ); - StlSyntaxSequence< ::rtl::OUString >::iterator stringItem = aStrings.begin(); + StlSyntaxSequence< OUString > aStrings( nLines ); + StlSyntaxSequence< OUString >::iterator stringItem = aStrings.begin(); for ( xub_StrLen token = 0; token < nLines; ++token, ++stringItem ) *stringItem = _rCompsedTextWithLineBreaks.GetToken( token, '\n' ); return aStrings; } - String lcl_convertListToMultiLine( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ) + String lcl_convertListToMultiLine( const StlSyntaxSequence< OUString >& _rStrings ) { String sMultiLineText; - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator item = _rStrings.begin(); + for ( StlSyntaxSequence< OUString >::const_iterator item = _rStrings.begin(); item != _rStrings.end(); ) { @@ -1183,10 +1183,10 @@ namespace pcr } //.............................................................. - String lcl_convertListToDisplayText( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ) + String lcl_convertListToDisplayText( const StlSyntaxSequence< OUString >& _rStrings ) { - ::rtl::OUStringBuffer aComposed; - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator strings = _rStrings.begin(); + OUStringBuffer aComposed; + for ( StlSyntaxSequence< OUString >::const_iterator strings = _rStrings.begin(); strings != _rStrings.end(); ++strings ) @@ -1325,20 +1325,20 @@ namespace pcr } //------------------------------------------------------------------ - void DropDownEditControl::SetStringListValue( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ) + void DropDownEditControl::SetStringListValue( const StlSyntaxSequence< OUString >& _rStrings ) { SetText( lcl_convertListToDisplayText( _rStrings ) ); m_pFloatingEdit->getEdit()->SetText( lcl_convertListToMultiLine( _rStrings ) ); } //------------------------------------------------------------------ - StlSyntaxSequence< ::rtl::OUString > DropDownEditControl::GetStringListValue() const + StlSyntaxSequence< OUString > DropDownEditControl::GetStringListValue() const { return lcl_convertMultiLineToList( m_pFloatingEdit->getEdit()->GetText() ); } //------------------------------------------------------------------ - void DropDownEditControl::SetTextValue( const ::rtl::OUString& _rText ) + void DropDownEditControl::SetTextValue( const OUString& _rText ) { OSL_PRECOND( m_nOperationMode == eMultiLineText, "DropDownEditControl::SetTextValue: illegal call!" ); @@ -1347,7 +1347,7 @@ namespace pcr } //------------------------------------------------------------------ - ::rtl::OUString DropDownEditControl::GetTextValue() const + OUString DropDownEditControl::GetTextValue() const { OSL_PRECOND( m_nOperationMode == eMultiLineText, "DropDownEditControl::GetTextValue: illegal call!" ); return GetText(); @@ -1375,7 +1375,7 @@ namespace pcr { case eMultiLineText: { - ::rtl::OUString sText; + OUString sText; if ( !( _rValue >>= sText ) && _rValue.hasValue() ) throw IllegalTypeException(); getTypedControlWindow()->SetTextValue( sText ); @@ -1383,7 +1383,7 @@ namespace pcr break; case eStringList: { - Sequence< ::rtl::OUString > aStringLines; + Sequence< OUString > aStringLines; if ( !( _rValue >>= aStringLines ) && _rValue.hasValue() ) throw IllegalTypeException(); getTypedControlWindow()->SetStringListValue( aStringLines ); @@ -1414,8 +1414,8 @@ namespace pcr Type SAL_CALL OMultilineEditControl::getValueType() throw (RuntimeException) { if ( getTypedControlWindow()->getOperationMode() == eMultiLineText ) - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); - return ::getCppuType( static_cast< Sequence< ::rtl::OUString >* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); + return ::getCppuType( static_cast< Sequence< OUString >* >( NULL ) ); } //............................................................................ diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 91bf8a097897..b7cd14efb3c7 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -286,7 +286,7 @@ namespace pcr class OColorControl : public OColorControl_Base { private: - ::std::set< ::rtl::OUString > m_aNonColorEntries; + ::std::set< OUString > m_aNonColorEntries; public: OColorControl( Window* pParent, WinBits nWinStyle ); @@ -298,9 +298,9 @@ namespace pcr // XStringListControl virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL prependListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL appendListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); protected: virtual void modified(); @@ -324,9 +324,9 @@ namespace pcr // XStringListControl virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL prependListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL appendListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); protected: virtual void modified(); @@ -348,9 +348,9 @@ namespace pcr // XStringListControl virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL prependListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL appendListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); protected: DECL_LINK( OnEntrySelected, void* ); @@ -387,11 +387,11 @@ namespace pcr void setOperationMode( MultiLineOperationMode _eMode ) { m_nOperationMode = _eMode; } MultiLineOperationMode getOperationMode() const { return m_nOperationMode; } - void SetTextValue( const ::rtl::OUString& _rText ); - ::rtl::OUString GetTextValue() const; + void SetTextValue( const OUString& _rText ); + OUString GetTextValue() const; - void SetStringListValue( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ); - StlSyntaxSequence< ::rtl::OUString > + void SetStringListValue( const StlSyntaxSequence< OUString >& _rStrings ); + StlSyntaxSequence< OUString > GetStringListValue() const; // ControlWindow overridables diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 394ad17454c7..a68c8d0489d4 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -49,8 +49,8 @@ namespace comp_StringRepresentation { using namespace ::com::sun::star; // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); uno::Reference< uno::XInterface > SAL_CALL _create( uno::Reference< uno::XComponentContext > const & context ); } // closing component helper namespace @@ -71,13 +71,13 @@ public: explicit StringRepresentation(uno::Reference< uno::XComponentContext > const & context); // lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) 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 & ServiceName) throw (uno::RuntimeException); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // inspection::XStringRepresentation: - virtual ::rtl::OUString SAL_CALL convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception); - virtual uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception); + virtual OUString SAL_CALL convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception); + virtual uno::Any SAL_CALL convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception); // lang::XInitialization: virtual void SAL_CALL initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception); @@ -98,7 +98,7 @@ private: */ bool convertGenericValueToString( const uno::Any& _rValue, - ::rtl::OUString& _rStringRep + OUString& _rStringRep ); /** converts string representation into generic value @@ -110,7 +110,7 @@ private: if and only if the value could be converted */ bool convertStringToGenericValue( - const ::rtl::OUString& _rStringRep, + const OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType ); @@ -120,19 +120,19 @@ private: * \param _rValue the value to be converted * \return the converted string. */ - ::rtl::OUString convertSimpleToString( const uno::Any& _rValue ); + OUString convertSimpleToString( const uno::Any& _rValue ); /** converts a string into his constant value if it exists, otherwise the type converter is used. * \param _rValue the value to be converted * \param _ePropertyType the type of the propery to be converted into * \return the converted value */ - uno::Any convertStringToSimple( const ::rtl::OUString& _rValue,const uno::TypeClass& _ePropertyType ); + uno::Any convertStringToSimple( const OUString& _rValue,const uno::TypeClass& _ePropertyType ); uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< script::XTypeConverter > m_xTypeConverter; uno::Reference< reflection::XConstantsTypeDescription > m_xTypeDescription; - uno::Sequence< ::rtl::OUString > m_aValues; + uno::Sequence< OUString > m_aValues; uno::Sequence< uno::Reference< reflection::XConstantTypeDescription> > m_aConstants; }; @@ -142,34 +142,34 @@ StringRepresentation::StringRepresentation(uno::Reference< uno::XComponentContex {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL StringRepresentation::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL StringRepresentation::getImplementationName() throw (uno::RuntimeException) { return comp_StringRepresentation::_getImplementationName(); } -::sal_Bool SAL_CALL StringRepresentation::supportsService(::rtl::OUString const & serviceName) throw (uno::RuntimeException) +::sal_Bool SAL_CALL StringRepresentation::supportsService(OUString const & serviceName) throw (uno::RuntimeException) { return ::comphelper::existsValue(serviceName,comp_StringRepresentation::_getSupportedServiceNames()); } -uno::Sequence< ::rtl::OUString > SAL_CALL StringRepresentation::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL StringRepresentation::getSupportedServiceNames() throw (uno::RuntimeException) { return comp_StringRepresentation::_getSupportedServiceNames(); } // inspection::XStringRepresentation: -::rtl::OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception) +OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception) { - ::rtl::OUString sReturn; + OUString sReturn; if ( !convertGenericValueToString( PropertyValue, sReturn ) ) { sReturn = convertSimpleToString( PropertyValue ); #ifdef DBG_UTIL if ( sReturn.isEmpty() && PropertyValue.hasValue() ) { - ::rtl::OString sMessage( "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" ); - sMessage += ::rtl::OString( PropertyValue.getValueType().getTypeName().getStr(), PropertyValue.getValueType().getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "'!" ); + OString sMessage( "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" ); + sMessage += OString( PropertyValue.getValueType().getTypeName().getStr(), PropertyValue.getValueType().getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "'!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -178,7 +178,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL StringRepresentation::getSupportedSer return sReturn; } -uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const ::rtl::OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception) +uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception) { uno::Any aReturn; @@ -212,9 +212,9 @@ uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const ::rtl::OUSt // could not convert ... if ( !bCanConvert && !ControlValue.isEmpty() ) { - ::rtl::OString sMessage( "StringRepresentation::convertStringRepresentationToPropertyValue: cannot convert into values of type '" ); - sMessage += ::rtl::OString( ControlValueType.getTypeName().getStr(), ControlValueType.getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "'!" ); + OString sMessage( "StringRepresentation::convertStringRepresentationToPropertyValue: cannot convert into values of type '" ); + sMessage += OString( ControlValueType.getTypeName().getStr(), ControlValueType.getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "'!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -233,14 +233,14 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & m_xTypeConverter.set(*pIter++,uno::UNO_QUERY); if ( nLength == 3 ) { - ::rtl::OUString sConstantName; + OUString sConstantName; *pIter++ >>= sConstantName; *pIter >>= m_aValues; if ( m_xContext.is() ) { uno::Reference< container::XHierarchicalNameAccess > xTypeDescProv( - m_xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), + m_xContext->getValueByName( OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), uno::UNO_QUERY_THROW ); m_xTypeDescription.set( xTypeDescProv->getByHierarchicalName( sConstantName ), uno::UNO_QUERY_THROW ); @@ -250,9 +250,9 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & } } //------------------------------------------------------------------------ -::rtl::OUString StringRepresentation::convertSimpleToString( const uno::Any& _rValue ) +OUString StringRepresentation::convertSimpleToString( const uno::Any& _rValue ) { - ::rtl::OUString sReturn; + OUString sReturn; if ( m_xTypeConverter.is() && _rValue.hasValue() ) { try @@ -290,11 +290,11 @@ namespace { struct ConvertIntegerFromAndToString { - ::rtl::OUString operator()( sal_Int32 _rIntValue ) const + OUString operator()( sal_Int32 _rIntValue ) const { - return ::rtl::OUString::valueOf( (sal_Int32)_rIntValue ); + return OUString::valueOf( (sal_Int32)_rIntValue ); } - sal_Int32 operator()( const ::rtl::OUString& _rStringValue ) const + sal_Int32 operator()( const OUString& _rStringValue ) const { return _rStringValue.toInt32(); } @@ -302,14 +302,14 @@ namespace struct StringIdentity { - ::rtl::OUString operator()( const ::rtl::OUString& _rValue ) const + OUString operator()( const OUString& _rValue ) const { return _rValue; } }; template < class ElementType, class Transformer > - ::rtl::OUString composeSequenceElements( const Sequence< ElementType >& _rElements, const Transformer& _rTransformer ) + OUString composeSequenceElements( const Sequence< ElementType >& _rElements, const Transformer& _rTransformer ) { String sCompose; @@ -328,7 +328,7 @@ namespace } template < class ElementType, class Transformer > - void splitComposedStringToSequence( const ::rtl::OUString& _rComposed, Sequence< ElementType >& _out_SplitUp, const Transformer& _rTransformer ) + void splitComposedStringToSequence( const OUString& _rComposed, Sequence< ElementType >& _out_SplitUp, const Transformer& _rTransformer ) { _out_SplitUp.realloc( 0 ); if ( _rComposed.isEmpty() ) @@ -344,7 +344,7 @@ namespace } //-------------------------------------------------------------------- -bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, ::rtl::OUString& _rStringRep ) +bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, OUString& _rStringRep ) { bool bCanConvert = true; @@ -356,7 +356,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, case uno::TypeClass_BOOLEAN: { - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); sal_Bool bValue = sal_False; _rValue >>= bValue; @@ -367,7 +367,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, // some sequence types case uno::TypeClass_SEQUENCE: { - Sequence< ::rtl::OUString > aStringValues; + Sequence< OUString > aStringValues; Sequence< sal_Int8 > aInt8Values; Sequence< sal_uInt16 > aUInt16Values; Sequence< sal_Int16 > aInt16Values; @@ -452,7 +452,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, return bCanConvert; } //------------------------------------------------------------------------ -uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rValue,const uno::TypeClass& _ePropertyType ) +uno::Any StringRepresentation::convertStringToSimple( const OUString& _rValue,const uno::TypeClass& _ePropertyType ) { uno::Any aReturn; if ( m_xTypeConverter.is() && !_rValue.isEmpty() ) @@ -461,8 +461,8 @@ uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rV { if ( m_aConstants.getLength() && m_aValues.getLength() ) { - const ::rtl::OUString* pIter = m_aValues.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aValues.getLength(); + const OUString* pIter = m_aValues.getConstArray(); + const OUString* pEnd = pIter + m_aValues.getLength(); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) { if ( *pIter == _rValue ) @@ -483,7 +483,7 @@ uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rV return aReturn; } //-------------------------------------------------------------------- -bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType ) +bool StringRepresentation::convertStringToGenericValue( const OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType ) { bool bCanConvert = true; @@ -495,7 +495,7 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ case uno::TypeClass_BOOLEAN: { - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); if ( aListEntries[0] == _rStringRep ) _rValue <<= (sal_Bool)sal_False; @@ -513,7 +513,7 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ { case uno::TypeClass_STRING: { - Sequence< ::rtl::OUString > aElements; + Sequence< OUString > aElements; splitComposedStringToSequence( aStr, aElements, StringIdentity() ); _rValue <<= aElements; } @@ -599,15 +599,15 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ // component helper namespace namespace comp_StringRepresentation { -::rtl::OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString( +OUString SAL_CALL _getImplementationName() { + return OUString( "StringRepresentation"); } -uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > s(1); - s[0] = ::rtl::OUString( + uno::Sequence< OUString > s(1); + s[0] = OUString( "com.sun.star.inspection.StringRepresentation"); return s; } diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index 1dd05f7b962b..495db591461d 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -104,21 +104,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.SubmissionPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.SubmissionPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -167,7 +167,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -210,25 +210,25 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - Sequence< ::rtl::OUString > aReturn( 1 ); + Sequence< OUString > aReturn( 1 ); aReturn[ 0 ] = PROPERTY_XFORMS_BUTTONTYPE; return aReturn; } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - Sequence< ::rtl::OUString > aReturn( 3 ); + Sequence< OUString > aReturn( 3 ); aReturn[ 0 ] = PROPERTY_TARGET_URL; aReturn[ 1 ] = PROPERTY_TARGET_FRAME; aReturn[ 2 ] = PROPERTY_BUTTONTYPE; @@ -277,7 +277,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL SubmissionPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL SubmissionPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -287,7 +287,7 @@ namespace pcr if ( !m_pHelper.get() ) RuntimeException(); - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); switch ( nPropId ) { @@ -312,13 +312,13 @@ namespace pcr LineDescriptor aDescriptor; aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, sal_False, sal_True ); aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); - aDescriptor.Category = ::rtl::OUString( "General" ); + aDescriptor.Category = OUString( "General" ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); return aDescriptor; } //-------------------------------------------------------------------- - void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) + void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -344,7 +344,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aPropertyValue; @@ -353,7 +353,7 @@ namespace pcr if ( !m_pHelper.get() ) return aPropertyValue; - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); @@ -383,7 +383,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aControlValue; diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index f62011ac53e5..e5f35d400996 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -78,24 +78,24 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); ~SubmissionPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 6fe43eb26cf6..bbb0f6fcde8b 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -59,10 +59,10 @@ namespace pcr // XTabControllerModel virtual void SAL_CALL setControlModels(const Sequence< Reference< XControlModel > >& rModels) throw( RuntimeException ) {m_aModels = rModels;} virtual Sequence< Reference< XControlModel > > SAL_CALL getControlModels(void) throw( RuntimeException ) {return m_aModels;} - virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const ::rtl::OUString& /*GroupName*/) throw( RuntimeException ) {} + virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const OUString& /*GroupName*/) throw( RuntimeException ) {} virtual sal_Int32 SAL_CALL getGroupCount(void) throw( RuntimeException ) {return 0;} - virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, ::rtl::OUString& /*Name*/) throw( RuntimeException ) {} - virtual void SAL_CALL getGroupByName(const ::rtl::OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) throw( RuntimeException ) {} + virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, OUString& /*Name*/) throw( RuntimeException ) {} + virtual void SAL_CALL getGroupByName(const OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) throw( RuntimeException ) {} virtual sal_Bool SAL_CALL getGroupControl(void) throw( RuntimeException ){return sal_False;} ; virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException ){}; }; @@ -182,7 +182,7 @@ namespace pcr Sequence< Reference< XControlModel > > aControlModels( m_xTempModel->getControlModels() ); const Reference< XControlModel >* pControlModels = aControlModels.getConstArray(); - ::rtl::OUString aName; + OUString aName; Image aImage; for ( sal_Int32 i=0; i < aControlModels.getLength(); ++i, ++pControlModels ) @@ -323,7 +323,7 @@ namespace pcr //------------------------------------------------------------------------ void TabOrderListBox::MoveSelection( long nRelPos ) { - rtl::OUString aSelEntryPrevText, aSelEntryNextText; + OUString aSelEntryPrevText, aSelEntryNextText; Image aImage; for (long i=0; i& _rxORB ) + UnoURL::UnoURL( const OUString& _rCompleteURL, const Reference< XMultiServiceFactory >& _rxORB ) { m_aURL.Complete = _rCompleteURL; diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx index a7b509735571..474924776963 100644 --- a/extensions/source/propctrlr/unourl.hxx +++ b/extensions/source/propctrlr/unourl.hxx @@ -38,11 +38,11 @@ namespace pcr public: UnoURL( - const ::rtl::OUString& _rCompleteURL, + const OUString& _rCompleteURL, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); - inline operator const ::rtl::OUString& () const { return m_aURL.Complete; } + inline operator const OUString& () const { return m_aURL.Complete; } inline operator const ::com::sun::star::util::URL& () const { return m_aURL; } private: diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 05cee8f40825..16a4e75bca40 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -280,7 +280,7 @@ namespace pcr //------------------------------------------------------------------ void SAL_CALL OFileUrlControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sURL; + OUString sURL; if ( ( _rValue >>= sURL ) ) { if ( sURL.indexOf( "vnd.sun.star.GraphicObject:" ) == 0 ) @@ -297,14 +297,14 @@ namespace pcr { Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) - aPropValue <<= (::rtl::OUString)getTypedControlWindow()->GetURL(); + aPropValue <<= (OUString)getTypedControlWindow()->GetURL(); return aPropValue; } //------------------------------------------------------------------ Type SAL_CALL OFileUrlControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //======================================================================== @@ -315,7 +315,7 @@ namespace pcr :ONumericControl( pParent, nWinStyle ) { getTypedControlWindow()->SetUnit( FUNIT_CUSTOM ); - getTypedControlWindow()->SetCustomUnitText(rtl::OUString(" ms")); + getTypedControlWindow()->SetCustomUnitText(OUString(" ms")); getTypedControlWindow()->SetCustomConvertHdl( LINK( this, OTimeDurationControl, OnCustomConvert ) ); } diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx index 7ee0c46c7c2e..76a1796a038b 100644 --- a/extensions/source/propctrlr/xsddatatypes.cxx +++ b/extensions/source/propctrlr/xsddatatypes.cxx @@ -68,7 +68,7 @@ namespace pcr } template< typename FACETTYPE > - FACETTYPE getFacet( const Reference< XPropertySet >& _rxFacets, const ::rtl::OUString& _rFacetName ) SAL_THROW(()) + FACETTYPE getFacet( const Reference< XPropertySet >& _rxFacets, const OUString& _rFacetName ) SAL_THROW(()) { FACETTYPE aReturn; try @@ -140,13 +140,13 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString XSDDataType::getName() const SAL_THROW(()) + OUString XSDDataType::getName() const SAL_THROW(()) { return getSave( m_xDataType.get(), &XDataType::getName ); } //-------------------------------------------------------------------- - void XSDDataType::setFacet( const ::rtl::OUString& _rFacetName, const Any& _rValue ) SAL_THROW(()) + void XSDDataType::setFacet( const OUString& _rFacetName, const Any& _rValue ) SAL_THROW(()) { try { @@ -159,7 +159,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDDataType::hasFacet( const ::rtl::OUString& _rFacetName ) const SAL_THROW(()) + bool XSDDataType::hasFacet( const OUString& _rFacetName ) const SAL_THROW(()) { bool bReturn = false; try @@ -173,7 +173,7 @@ namespace pcr return bReturn; } //-------------------------------------------------------------------- - Any XSDDataType::getFacet( const ::rtl::OUString& _rFacetName ) SAL_THROW(()) + Any XSDDataType::getFacet( const OUString& _rFacetName ) SAL_THROW(()) { Any aReturn; try diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index 743ea3490842..dfa5cebb52f8 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -71,16 +71,16 @@ namespace pcr sal_Int16 classify() const SAL_THROW(()); // attribute access - ::rtl::OUString getName() const SAL_THROW(()); + OUString getName() const SAL_THROW(()); bool isBasicType() const SAL_THROW(()); /// determines whether a given facet exists at the type - bool hasFacet( const ::rtl::OUString& _rFacetName ) const SAL_THROW(()); + bool hasFacet( const OUString& _rFacetName ) const SAL_THROW(()); /// retrieves a facet value ::com::sun::star::uno::Any - getFacet( const ::rtl::OUString& _rFacetName ) SAL_THROW(()); + getFacet( const OUString& _rFacetName ) SAL_THROW(()); /// sets a facet value - void setFacet( const ::rtl::OUString& _rFacetName, const ::com::sun::star::uno::Any& _rFacetValue ) SAL_THROW(()); + void setFacet( const OUString& _rFacetName, const ::com::sun::star::uno::Any& _rFacetValue ) SAL_THROW(()); /** copies as much facets (values, respectively) from a give data type instance */ diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index bca2aee38bb4..4a6f1eada469 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx @@ -74,14 +74,14 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()) + void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()) { _rNames.resize( 0 ); try { Reference< XDataTypeRepository > xRepository = getDataTypeRepository(); - Sequence< ::rtl::OUString > aElements; + Sequence< OUString > aElements; if ( xRepository.is() ) aElements = xRepository->getElementNames(); @@ -107,7 +107,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository( const ::rtl::OUString& _rModelName ) const SAL_THROW((Exception)) + Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository( const OUString& _rModelName ) const SAL_THROW((Exception)) { Reference< XDataTypeRepository > xRepository; @@ -119,7 +119,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XDataType > XSDValidationHelper::getDataType( const ::rtl::OUString& _rName ) const SAL_THROW((Exception)) + Reference< XDataType > XSDValidationHelper::getDataType( const OUString& _rName ) const SAL_THROW((Exception)) { Reference< XDataType > xDataType; @@ -133,9 +133,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString XSDValidationHelper::getValidatingDataTypeName( ) const SAL_THROW(()) + OUString XSDValidationHelper::getValidatingDataTypeName( ) const SAL_THROW(()) { - ::rtl::OUString sDataTypeName; + OUString sDataTypeName; try { Reference< XPropertySet > xBinding( getCurrentBinding() ); @@ -153,7 +153,7 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::Reference< XSDDataType > XSDValidationHelper::getDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()) + ::rtl::Reference< XSDDataType > XSDValidationHelper::getDataTypeByName( const OUString& _rName ) const SAL_THROW(()) { ::rtl::Reference< XSDDataType > pReturn; @@ -182,7 +182,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationHelper::cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const ::rtl::OUString& _rNewName ) const SAL_THROW(()) + bool XSDValidationHelper::cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const SAL_THROW(()) { OSL_ENSURE( _pDataType.is(), "XSDValidationHelper::removeDataTypeFromRepository: invalid data type!" ); if ( !_pDataType.is() ) @@ -210,7 +210,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationHelper::removeDataTypeFromRepository( const ::rtl::OUString& _rName ) const SAL_THROW(()) + bool XSDValidationHelper::removeDataTypeFromRepository( const OUString& _rName ) const SAL_THROW(()) { try { @@ -236,7 +236,7 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationHelper::setValidatingDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()) + void XSDValidationHelper::setValidatingDataTypeByName( const OUString& _rName ) const SAL_THROW(()) { try { @@ -246,7 +246,7 @@ namespace pcr if ( xBinding.is() ) { // get the old data type - this is necessary for notifying property changes - ::rtl::OUString sOldDataTypeName; + OUString sOldDataTypeName; OSL_VERIFY( xBinding->getPropertyValue( PROPERTY_XSD_DATA_TYPE ) >>= sOldDataTypeName ); Reference< XPropertySet > xOldType; try { xOldType = xOldType.query( getDataType( sOldDataTypeName ) ); } catch( const Exception& ) { } @@ -258,11 +258,11 @@ namespace pcr Reference< XPropertySet > xNewType( getDataType( _rName ), UNO_QUERY ); // fire any changes in the properties which result from this new type - std::set< ::rtl::OUString > aFilter; aFilter.insert( static_cast(PROPERTY_NAME) ); + std::set< OUString > aFilter; aFilter.insert( static_cast(PROPERTY_NAME) ); firePropertyChanges( xOldType, xNewType, aFilter ); // fire the change in the Data Type property - ::rtl::OUString sNewDataTypeName; + OUString sNewDataTypeName; OSL_VERIFY( xBinding->getPropertyValue( PROPERTY_XSD_DATA_TYPE ) >>= sNewDataTypeName ); firePropertyChange( PROPERTY_XSD_DATA_TYPE, makeAny( sOldDataTypeName ), makeAny( sNewDataTypeName ) ); } @@ -274,8 +274,8 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationHelper::copyDataType( const ::rtl::OUString& _rFromModel, const ::rtl::OUString& _rToModel, - const ::rtl::OUString& _rDataTypeName ) const SAL_THROW(()) + void XSDValidationHelper::copyDataType( const OUString& _rFromModel, const OUString& _rToModel, + const OUString& _rDataTypeName ) const SAL_THROW(()) { if ( _rFromModel == _rToModel ) // nothing to do (me thinks) @@ -298,7 +298,7 @@ namespace pcr // determine the built-in type belonging to the source type ::rtl::Reference< XSDDataType > pSourceType = new XSDDataType( xFromRepository->getDataType( _rDataTypeName ) ); - ::rtl::OUString sTargetBaseType = getBasicTypeNameForClass( pSourceType->classify(), xToRepository ); + OUString sTargetBaseType = getBasicTypeNameForClass( pSourceType->classify(), xToRepository ); // create the target type Reference< XDataType > xTargetType = xToRepository->cloneDataType( sTargetBaseType, _rDataTypeName ); @@ -366,15 +366,15 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass ) const SAL_THROW(()) + OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass ) const SAL_THROW(()) { return getBasicTypeNameForClass( _nClass, getDataTypeRepository() ); } //-------------------------------------------------------------------- - ::rtl::OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const SAL_THROW(()) + OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const SAL_THROW(()) { - ::rtl::OUString sReturn; + OUString sReturn; OSL_ENSURE( _rxRepository.is(), "XSDValidationHelper::getBasicTypeNameForClass: invalid repository!" ); if ( !_rxRepository.is() ) return sReturn; diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx index 3311d7f1c93a..c4d96868357b 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.hxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx @@ -52,12 +52,12 @@ namespace pcr /** retrieves the names of all XForms models in the document the control lives in */ - void getAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()); + void getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()); /** retrieves a particular data type given by name */ ::rtl::Reference< XSDDataType > - getDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()); + getDataTypeByName( const OUString& _rName ) const SAL_THROW(()); /** retrieves the DataType instance which the control model is currently validated against @@ -71,26 +71,26 @@ namespace pcr @seealso getValidatingDataType */ - ::rtl::OUString + OUString getValidatingDataTypeName( ) const SAL_THROW(()); /** binds the validator to a new data type To be called with an active binding only. */ - void setValidatingDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()); + void setValidatingDataTypeByName( const OUString& _rName ) const SAL_THROW(()); /** removes the data type given by name from the data type repository */ - bool removeDataTypeFromRepository( const ::rtl::OUString& _rName ) const SAL_THROW(()); + bool removeDataTypeFromRepository( const OUString& _rName ) const SAL_THROW(()); /** creates a new data type, which is a clone of an existing data type */ - bool cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const ::rtl::OUString& _rNewName ) const SAL_THROW(()); + bool cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const SAL_THROW(()); /** retrieves the name of the basic data type which has the given class */ - ::rtl::OUString + OUString getBasicTypeNameForClass( sal_Int16 _eClass ) const SAL_THROW(()); /** copy a data type from one model to another @@ -98,8 +98,8 @@ namespace pcr If a data type with the given name already exists in the target model, then nothing happens. In particular, the facets of the data type are not copied. */ - void copyDataType( const ::rtl::OUString& _rFromModel, const ::rtl::OUString& _rToModel, - const ::rtl::OUString& _rDataTypeName ) const SAL_THROW(()); + void copyDataType( const OUString& _rFromModel, const OUString& _rToModel, + const OUString& _rDataTypeName ) const SAL_THROW(()); /** finds (and sets) a default format for the formatted field we're inspecting, according to the current data type the control value is evaluated against @@ -115,17 +115,17 @@ namespace pcr /** retrieves the data type repository associated with any model */ ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > - getDataTypeRepository( const ::rtl::OUString& _rModelName ) const SAL_THROW((::com::sun::star::uno::Exception)); + getDataTypeRepository( const OUString& _rModelName ) const SAL_THROW((::com::sun::star::uno::Exception)); /** retrieves the data type object for the given name */ ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > - getDataType( const ::rtl::OUString& _rName ) const + getDataType( const OUString& _rName ) const SAL_THROW((::com::sun::star::uno::Exception)); /** retrieves the name of the basic data type which has the given class, in the given repository */ - ::rtl::OUString + OUString getBasicTypeNameForClass( sal_Int16 _nClass, ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > _rxRepository diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index be9ec1e83fff..3f97f953f293 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -86,21 +86,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.XSDValidationPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.XSDValidationPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -113,9 +113,9 @@ namespace pcr switch ( nPropId ) { // common facets - case PROPERTY_ID_XSD_DATA_TYPE: aReturn = pType.is() ? pType->getFacet( PROPERTY_NAME ) : makeAny( ::rtl::OUString() ); break; + case PROPERTY_ID_XSD_DATA_TYPE: aReturn = pType.is() ? pType->getFacet( PROPERTY_NAME ) : makeAny( OUString() ); break; case PROPERTY_ID_XSD_WHITESPACES:aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_WHITESPACES ) : makeAny( WhiteSpaceTreatment::Preserve ); break; - case PROPERTY_ID_XSD_PATTERN: aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_PATTERN ) : makeAny( ::rtl::OUString() ); break; + case PROPERTY_ID_XSD_PATTERN: aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_PATTERN ) : makeAny( OUString() ); break; // all other properties are simply forwarded, if they exist at the given type default: @@ -130,7 +130,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -140,7 +140,7 @@ namespace pcr if ( PROPERTY_ID_XSD_DATA_TYPE == nPropId ) { - ::rtl::OUString sTypeName; + OUString sTypeName; OSL_VERIFY( _rValue >>= sTypeName ); m_pHelper->setValidatingDataTypeByName( sTypeName ); impl_setContextDocumentModified_nothrow(); @@ -227,61 +227,61 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aSuperfluous; + ::std::vector< OUString > aSuperfluous; if ( m_pHelper.get() ) { - aSuperfluous.push_back( static_cast(PROPERTY_CONTROLSOURCE) ); - aSuperfluous.push_back( static_cast(PROPERTY_EMPTY_IS_NULL) ); - aSuperfluous.push_back( static_cast(PROPERTY_FILTERPROPOSAL) ); - aSuperfluous.push_back( static_cast(PROPERTY_LISTSOURCETYPE) ); - aSuperfluous.push_back( static_cast(PROPERTY_LISTSOURCE) ); - aSuperfluous.push_back( static_cast(PROPERTY_BOUNDCOLUMN) ); + aSuperfluous.push_back( static_cast(PROPERTY_CONTROLSOURCE) ); + aSuperfluous.push_back( static_cast(PROPERTY_EMPTY_IS_NULL) ); + aSuperfluous.push_back( static_cast(PROPERTY_FILTERPROPOSAL) ); + aSuperfluous.push_back( static_cast(PROPERTY_LISTSOURCETYPE) ); + aSuperfluous.push_back( static_cast(PROPERTY_LISTSOURCE) ); + aSuperfluous.push_back( static_cast(PROPERTY_BOUNDCOLUMN) ); bool bAllowBinding = m_pHelper->canBindToAnyDataType(); if ( bAllowBinding ) { - aSuperfluous.push_back( static_cast(PROPERTY_MAXTEXTLEN) ); - aSuperfluous.push_back( static_cast(PROPERTY_VALUEMIN) ); - aSuperfluous.push_back( static_cast(PROPERTY_VALUEMAX) ); - aSuperfluous.push_back( static_cast(PROPERTY_DECIMAL_ACCURACY) ); - aSuperfluous.push_back( static_cast(PROPERTY_TIMEMIN) ); - aSuperfluous.push_back( static_cast(PROPERTY_TIMEMAX) ); - aSuperfluous.push_back( static_cast(PROPERTY_DATEMIN) ); - aSuperfluous.push_back( static_cast(PROPERTY_DATEMAX) ); - aSuperfluous.push_back( static_cast(PROPERTY_EFFECTIVE_MIN) ); - aSuperfluous.push_back( static_cast(PROPERTY_EFFECTIVE_MAX) ); + aSuperfluous.push_back( static_cast(PROPERTY_MAXTEXTLEN) ); + aSuperfluous.push_back( static_cast(PROPERTY_VALUEMIN) ); + aSuperfluous.push_back( static_cast(PROPERTY_VALUEMAX) ); + aSuperfluous.push_back( static_cast(PROPERTY_DECIMAL_ACCURACY) ); + aSuperfluous.push_back( static_cast(PROPERTY_TIMEMIN) ); + aSuperfluous.push_back( static_cast(PROPERTY_TIMEMAX) ); + aSuperfluous.push_back( static_cast(PROPERTY_DATEMIN) ); + aSuperfluous.push_back( static_cast(PROPERTY_DATEMAX) ); + aSuperfluous.push_back( static_cast(PROPERTY_EFFECTIVE_MIN) ); + aSuperfluous.push_back( static_cast(PROPERTY_EFFECTIVE_MAX) ); } } if ( aSuperfluous.empty() ) - return Sequence< ::rtl::OUString >(); - return Sequence< ::rtl::OUString >( &(*aSuperfluous.begin()), aSuperfluous.size() ); + return Sequence< OUString >(); + return Sequence< OUString >( &(*aSuperfluous.begin()), aSuperfluous.size() ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aInterestedInActuations( 2 ); + ::std::vector< OUString > aInterestedInActuations( 2 ); if ( m_pHelper.get() ) { - aInterestedInActuations.push_back( static_cast(PROPERTY_XSD_DATA_TYPE) ); - aInterestedInActuations.push_back( static_cast(PROPERTY_XML_DATA_MODEL) ); + aInterestedInActuations.push_back( static_cast(PROPERTY_XSD_DATA_TYPE) ); + aInterestedInActuations.push_back( static_cast(PROPERTY_XML_DATA_MODEL) ); } if ( aInterestedInActuations.empty() ) - return Sequence< ::rtl::OUString >(); - return Sequence< ::rtl::OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); + return Sequence< OUString >(); + return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); } //-------------------------------------------------------------------- namespace { - void showPropertyUI( const Reference< XObjectInspectorUI >& _rxInspectorUI, const ::rtl::OUString& _rPropertyName, bool _bShow ) + void showPropertyUI( const Reference< XObjectInspectorUI >& _rxInspectorUI, const OUString& _rPropertyName, bool _bShow ) { if ( _bShow ) _rxInspectorUI->showPropertyUI( _rPropertyName ); @@ -291,7 +291,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL XSDValidationPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL XSDValidationPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -309,7 +309,7 @@ namespace pcr // collect some information about the to-be-created control sal_Int16 nControlType = PropertyControlType::TextField; - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; Optional< double > aMinValue( sal_False, 0 ); Optional< double > aMaxValue( sal_False, 0 ); @@ -320,11 +320,11 @@ namespace pcr implGetAvailableDataTypeNames( aListEntries ); - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE); - aDescriptor.SecondaryButtonId = rtl::OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE); + aDescriptor.SecondaryButtonId = OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);; aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True; - aDescriptor.PrimaryButtonImageURL = ::rtl::OUString( "private:graphicrepository/extensions/res/buttonplus.png" ); - aDescriptor.SecondaryButtonImageURL = ::rtl::OUString( "private:graphicrepository/extensions/res/buttonminus.png" ); + aDescriptor.PrimaryButtonImageURL = OUString( "private:graphicrepository/extensions/res/buttonplus.png" ); + aDescriptor.SecondaryButtonImageURL = OUString( "private:graphicrepository/extensions/res/buttonminus.png" ); break; case PROPERTY_ID_XSD_WHITESPACES: @@ -419,7 +419,7 @@ namespace pcr break; } - aDescriptor.Category = ::rtl::OUString( "Data" ); + aDescriptor.Category = OUString( "Data" ); aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); @@ -427,7 +427,7 @@ namespace pcr } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -445,7 +445,7 @@ namespace pcr { if ( _bPrimary ) { - ::rtl::OUString sNewDataTypeName; + OUString sNewDataTypeName; if ( implPrepareCloneDataCurrentType( sNewDataTypeName ) ) { implDoCloneCurrentDataType( sNewDataTypeName ); @@ -483,7 +483,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationPropertyHandler::implPrepareCloneDataCurrentType( ::rtl::OUString& _rNewName ) SAL_THROW(()) + bool XSDValidationPropertyHandler::implPrepareCloneDataCurrentType( OUString& _rNewName ) SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: this will crash!" ); @@ -494,7 +494,7 @@ namespace pcr return false; } - ::std::vector< ::rtl::OUString > aExistentNames; + ::std::vector< OUString > aExistentNames; m_pHelper->getAvailableDataTypeNames( aExistentNames ); NewDataTypeDialog aDialog( NULL, pType->getName(), aExistentNames ); // TODO/eForms: proper parent @@ -506,7 +506,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const ::rtl::OUString& _rNewName ) SAL_THROW(()) + bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName ) SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoCloneCurrentDataType: this will crash!" ); @@ -564,7 +564,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) + void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -588,7 +588,7 @@ namespace pcr //------------------------------------------------------------ // show the facets which are available at the data type - ::rtl::OUString aFacets[] = { + OUString aFacets[] = { OUString(PROPERTY_XSD_WHITESPACES), OUString(PROPERTY_XSD_PATTERN), OUString(PROPERTY_XSD_LENGTH), OUString(PROPERTY_XSD_MIN_LENGTH), OUString(PROPERTY_XSD_MAX_LENGTH), OUString(PROPERTY_XSD_TOTAL_DIGITS), OUString(PROPERTY_XSD_FRACTION_DIGITS), @@ -615,7 +615,7 @@ namespace pcr }; size_t i=0; - const ::rtl::OUString* pLoop = NULL; + const OUString* pLoop = NULL; for ( i = 0, pLoop = aFacets; i < SAL_N_ELEMENTS( aFacets ); ++i, ++pLoop @@ -631,9 +631,9 @@ namespace pcr { // The data type which the current binding works with may not be present in the // new model. Thus, transfer it. - ::rtl::OUString sOldModelName; _rOldValue >>= sOldModelName; - ::rtl::OUString sNewModelName; _rNewValue >>= sNewModelName; - ::rtl::OUString sDataType = m_pHelper->getValidatingDataTypeName(); + OUString sOldModelName; _rOldValue >>= sOldModelName; + OUString sNewModelName; _rNewValue >>= sNewModelName; + OUString sDataType = m_pHelper->getValidatingDataTypeName(); m_pHelper->copyDataType( sOldModelName, sNewModelName, sDataType ); // the list of available data types depends on the chosen model, so update this @@ -654,17 +654,17 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()) + void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implGetAvailableDataTypeNames: this will crash!" ); // start with *all* types which are available at the model - ::std::vector< ::rtl::OUString > aAllTypes; + ::std::vector< OUString > aAllTypes; m_pHelper->getAvailableDataTypeNames( aAllTypes ); _rNames.clear(); _rNames.reserve( aAllTypes.size() ); // then allow only those which are "compatible" with our control - for ( ::std::vector< ::rtl::OUString >::const_iterator dataType = aAllTypes.begin(); + for ( ::std::vector< OUString >::const_iterator dataType = aAllTypes.begin(); dataType != aAllTypes.end(); ++dataType ) diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index 0c9c40245f29..0145b8026cb2 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -45,25 +45,25 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~XSDValidationPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); @@ -76,12 +76,12 @@ namespace pcr bool implPrepareRemoveCurrentDataType() SAL_THROW(()); bool implDoRemoveCurrentDataType() SAL_THROW(()); - bool implPrepareCloneDataCurrentType( ::rtl::OUString& _rNewName ) SAL_THROW(()); - bool implDoCloneCurrentDataType( const ::rtl::OUString& _rNewName ) SAL_THROW(()); + bool implPrepareCloneDataCurrentType( OUString& _rNewName ) SAL_THROW(()); + bool implDoCloneCurrentDataType( const OUString& _rNewName ) SAL_THROW(()); /** retrieves the names of the data types which our introspectee can be validated against */ - void implGetAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()); + void implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()); }; //........................................................................ diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index c9b9a581b36e..80608adeb6a1 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -47,9 +47,6 @@ using namespace ::com::sun::star::container; using ::comphelper::stl_begin; using ::comphelper::stl_end; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringToOString; namespace { @@ -94,7 +91,7 @@ namespace virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XElementAccessBase virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) - { return ::getCppuType(static_cast< ::rtl::OUString*>(0)); }; + { return ::getCppuType(static_cast< OUString*>(0)); }; }; class ResourceStringListIndexAccess : public ResourceIndexAccessBase diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx index 036c03f6bc61..074d12e9c727 100644 --- a/extensions/source/resource/ResourceIndexAccess.hxx +++ b/extensions/source/resource/ResourceIndexAccess.hxx @@ -53,9 +53,9 @@ namespace extensions { namespace resource // The XNameAccess provides access to two named elements: // "String" returns a XIndexAccess to String resources // "StringList" returns a XIndexAccess to StringList/StringArray resources - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) { return ::getCppuType(static_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(0)); }; diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index 72930af8bab2..4f0c8f36410f 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -84,7 +84,7 @@ namespace extensions { namespace resource { OSL_PRECOND( _resourceManager.IsAvailable( getResourceType(), _resourceId ), "StringResourceAccess::getResource: precondition not met!" ); Any aResource; - aResource <<= ::rtl::OUString( _resourceManager.ReadString( _resourceId ) ); + aResource <<= OUString( _resourceManager.ReadString( _resourceId ) ); return aResource; } @@ -94,7 +94,7 @@ namespace extensions { namespace resource { private: typedef ::boost::shared_ptr< IResourceType > ResourceTypePtr; - typedef ::std::map< ::rtl::OUString, ResourceTypePtr > ResourceTypes; + typedef ::std::map< OUString, ResourceTypePtr > ResourceTypes; ::osl::Mutex m_aMutex; Reference< XResourceBundle > m_xParent; @@ -105,7 +105,7 @@ namespace extensions { namespace resource public: OpenOfficeResourceBundle( const Reference< XComponentContext >& _rxContext, - const ::rtl::OUString& _rBaseName, + const OUString& _rBaseName, const Locale& _rLocale ); @@ -117,12 +117,12 @@ namespace extensions { namespace resource virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle > SAL_CALL getParent() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle >& _parent ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getDirectElement( const ::rtl::OUString& key ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getDirectElement( const OUString& key ) throw (::com::sun::star::uno::RuntimeException); // XNameAccess (base of XResourceBundle) - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess (base of XNameAccess) virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); @@ -140,7 +140,7 @@ namespace extensions { namespace resource @precond our mutex is locked */ - bool impl_getDirectElement_nothrow( const ::rtl::OUString& _key, Any& _out_Element ) const; + bool impl_getDirectElement_nothrow( const OUString& _key, Any& _out_Element ) const; /** retrieves the resource type and id from a given resource key, which assembles those two @param _key @@ -153,7 +153,7 @@ namespace extensions { namespace resource if and only if the given key specifies a known resource type, and contains a valid resource id */ - bool impl_getResourceTypeAndId_nothrow( const ::rtl::OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const; + bool impl_getResourceTypeAndId_nothrow( const OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const; }; OpenOfficeResourceLoader::OpenOfficeResourceLoader( Reference< XComponentContext > const& _rxContext ) @@ -162,13 +162,13 @@ namespace extensions { namespace resource } //-------------------------------------------------------------------- - Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const ::rtl::OUString& _baseName ) throw (MissingResourceException, RuntimeException) + Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const OUString& _baseName ) throw (MissingResourceException, RuntimeException) { return loadBundle( _baseName, Application::GetSettings().GetUILanguageTag().getLocale() ); } //-------------------------------------------------------------------- - Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const ::rtl::OUString& _baseName, const Locale& _locale ) throw (MissingResourceException, RuntimeException) + Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const OUString& _baseName, const Locale& _locale ) throw (MissingResourceException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -188,12 +188,12 @@ namespace extensions { namespace resource return xBundle; } - OpenOfficeResourceBundle::OpenOfficeResourceBundle( const Reference< XComponentContext >& /*_rxContext*/, const ::rtl::OUString& _rBaseName, const Locale& _rLocale ) + OpenOfficeResourceBundle::OpenOfficeResourceBundle( const Reference< XComponentContext >& /*_rxContext*/, const OUString& _rBaseName, const Locale& _rLocale ) :m_aLocale( _rLocale ) ,m_pResourceManager( NULL ) { - ::rtl::OUString sBaseName( _rBaseName ); - m_pResourceManager = new SimpleResMgr( rtl::OUStringToOString( sBaseName, RTL_TEXTENCODING_UTF8 ).getStr(), + OUString sBaseName( _rBaseName ); + m_pResourceManager = new SimpleResMgr( OUStringToOString( sBaseName, RTL_TEXTENCODING_UTF8 ).getStr(), LanguageTag( m_aLocale) ); if ( !m_pResourceManager->IsValid() ) @@ -203,7 +203,7 @@ namespace extensions { namespace resource } // supported resource types so far: strings - m_aResourceTypes[ ::rtl::OUString( "string" ) ] = + m_aResourceTypes[ OUString( "string" ) ] = ResourceTypePtr( new StringResourceAccess ); } @@ -230,14 +230,14 @@ namespace extensions { namespace resource return m_aLocale; } - bool OpenOfficeResourceBundle::impl_getResourceTypeAndId_nothrow( const ::rtl::OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const + bool OpenOfficeResourceBundle::impl_getResourceTypeAndId_nothrow( const OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const { sal_Int32 typeSeparatorPos = _key.indexOf( ':' ); if ( typeSeparatorPos == -1 ) // invalid key return false; - ::rtl::OUString resourceType = _key.copy( 0, typeSeparatorPos ); + OUString resourceType = _key.copy( 0, typeSeparatorPos ); ResourceTypes::const_iterator typePos = m_aResourceTypes.find( resourceType ); if ( typePos == m_aResourceTypes.end() ) @@ -249,7 +249,7 @@ namespace extensions { namespace resource return true; } - bool OpenOfficeResourceBundle::impl_getDirectElement_nothrow( const ::rtl::OUString& _key, Any& _out_Element ) const + bool OpenOfficeResourceBundle::impl_getDirectElement_nothrow( const OUString& _key, Any& _out_Element ) const { ResourceTypePtr resourceType; sal_Int32 resourceId( 0 ); @@ -264,7 +264,7 @@ namespace extensions { namespace resource return _out_Element.hasValue(); } - Any SAL_CALL OpenOfficeResourceBundle::getDirectElement( const ::rtl::OUString& _key ) throw (RuntimeException) + Any SAL_CALL OpenOfficeResourceBundle::getDirectElement( const OUString& _key ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -273,7 +273,7 @@ namespace extensions { namespace resource return aElement; } - Any SAL_CALL OpenOfficeResourceBundle::getByName( const ::rtl::OUString& _key ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL OpenOfficeResourceBundle::getByName( const OUString& _key ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -285,20 +285,20 @@ namespace extensions { namespace resource } if ( !aElement.hasValue() ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); return aElement; } - Sequence< ::rtl::OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_FAIL( "OpenOfficeResourceBundle::getElementNames: not implemented!" ); // the (Simple)ResManager does not provide an API to enumerate the resources - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } - ::sal_Bool SAL_CALL OpenOfficeResourceBundle::hasByName( const ::rtl::OUString& _key ) throw (RuntimeException) + ::sal_Bool SAL_CALL OpenOfficeResourceBundle::hasByName( const OUString& _key ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx index e431d384a034..09da484da32b 100644 --- a/extensions/source/resource/oooresourceloader.hxx +++ b/extensions/source/resource/oooresourceloader.hxx @@ -31,7 +31,7 @@ namespace extensions { namespace resource { - typedef ::std::pair< ::rtl::OUString, ::com::sun::star::lang::Locale> ResourceBundleDescriptor; + typedef ::std::pair< OUString, ::com::sun::star::lang::Locale> ResourceBundleDescriptor; struct ResourceBundleDescriptorLess : public ::std::binary_function { @@ -59,8 +59,8 @@ namespace extensions { namespace resource OpenOfficeResourceLoader(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&); // XResourceBundleLoader - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle_Default( const ::rtl::OUString& aBaseName ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle( const ::rtl::OUString& abaseName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle_Default( const OUString& aBaseName ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); private: OpenOfficeResourceLoader(); // never implemented diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index d9f64a30b17b..35a4800ce890 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -137,7 +137,7 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction, pAction = "SANE_ACTION_SET_AUTO";break; } dbg_msg( "Option: \"%s\" action: %s\n", - rtl::OUStringToOString(GetOptionName(nOption), osl_getThreadTextEncoding()).getStr(), + OUStringToOString(GetOptionName(nOption), osl_getThreadTextEncoding()).getStr(), pAction ); } #endif @@ -168,17 +168,17 @@ Sane::~Sane() void Sane::Init() { - ::rtl::OUString sSaneLibName( "libsane" SAL_DLLEXTENSION ); + OUString sSaneLibName( "libsane" SAL_DLLEXTENSION ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); if( ! pSaneLib ) { - sSaneLibName = ::rtl::OUString("libsane" SAL_DLLEXTENSION ".1" ); + sSaneLibName = OUString("libsane" SAL_DLLEXTENSION ".1" ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); } // try reasonable places that might not be in the library search path if( ! pSaneLib ) { - ::rtl::OUString sSaneLibSystemPath( "/usr/local/lib/libsane" SAL_DLLEXTENSION ); + OUString sSaneLibSystemPath( "/usr/local/lib/libsane" SAL_DLLEXTENSION ); osl_getFileURLFromSystemPath( sSaneLibSystemPath.pData, &sSaneLibName.pData ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); } @@ -292,7 +292,7 @@ sal_Bool Sane::Open( const char* name ) if( mnDevice == -1 ) { - rtl::OString aDevice( name ); + OString aDevice( name ); for( int i = 0; i < nDevices; i++ ) { if( aDevice.equals( ppDevices[i]->name ) ) @@ -331,7 +331,7 @@ void Sane::Close() int Sane::GetOptionByName( const char* rName ) { int i; - rtl::OString aOption( rName ); + OString aOption( rName ); for( i = 0; i < mnOptions; i++ ) { if( mppOptions[i]->name && aOption.equals( mppOptions[i]->name ) ) @@ -353,7 +353,7 @@ sal_Bool Sane::GetOptionValue( int n, sal_Bool& rRet ) return sal_True; } -sal_Bool Sane::GetOptionValue( int n, rtl::OString& rRet ) +sal_Bool Sane::GetOptionValue( int n, OString& rRet ) { sal_Bool bSuccess = sal_False; if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING ) @@ -430,7 +430,7 @@ sal_Bool Sane::SetOptionValue( int n, const String& rSet ) { if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING ) return sal_False; - rtl::OString aSet(rtl::OUStringToOString(rSet, osl_getThreadTextEncoding())); + OString aSet(OUStringToOString(rSet, osl_getThreadTextEncoding())); SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, (void*)aSet.getStr() ); if( nStatus != SANE_STATUS_GOOD ) return sal_False; @@ -986,7 +986,7 @@ String Sane::GetOptionUnitName( int n ) SANE_Unit nUnit = mppOptions[n]->unit; size_t nUnitAsSize = (size_t)nUnit; if (nUnitAsSize >= SAL_N_ELEMENTS( ppUnits )) - aText = rtl::OUString("[unknown units]"); + aText = OUString("[unknown units]"); else aText = String( ppUnits[ nUnit ], osl_getThreadTextEncoding() ); return aText; diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index 914248433526..06a7dc8f0e4c 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.hxx @@ -147,7 +147,7 @@ public: inline int GetOptionElements( int n ); int GetOptionByName( const char* ); sal_Bool GetOptionValue( int, sal_Bool& ); - sal_Bool GetOptionValue( int, rtl::OString& ); + sal_Bool GetOptionValue( int, OString& ); sal_Bool GetOptionValue( int, double&, int nElement = 0 ); sal_Bool GetOptionValue( int, double* ); diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 36feba647bf9..2ccd4d94d432 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -280,7 +280,7 @@ void SaneDlg::InitFields() else // SANE_UNIT_PIXEL { pField->SetValue( (int)fValue, FUNIT_CUSTOM ); - pField->SetCustomUnitText(rtl::OUString("Pixel")); + pField->SetCustomUnitText(OUString("Pixel")); } switch( i ) { case 0: maTopLeft.X() = (int)fValue;break; @@ -503,7 +503,7 @@ IMPL_LINK( SaneDlg, SelectHdl, ListBox*, pListBox ) { if( pListBox == &maQuantumRangeBox ) { - rtl::OString aValue(rtl::OUStringToOString(maQuantumRangeBox.GetSelectEntry(), + OString aValue(OUStringToOString(maQuantumRangeBox.GetSelectEntry(), osl_getThreadTextEncoding())); double fValue = atof(aValue.getStr()); mrSane.SetOptionValue( mnCurrentOption, fValue, mnCurrentElement ); @@ -522,7 +522,7 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox ) { String aOption = maOptionBox.GetEntryText( maOptionBox.FirstSelected() ); - int nOption = mrSane.GetOptionByName(rtl::OUStringToOString(aOption, + int nOption = mrSane.GetOptionByName(OUStringToOString(aOption, osl_getThreadTextEncoding()).getStr()); if( nOption != -1 && nOption != mnCurrentOption ) { @@ -626,7 +626,7 @@ IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit ) else if( pEdit == &maNumericEdit ) { double fValue; - rtl::OString aContents(rtl::OUStringToOString(maNumericEdit.GetText(), + OString aContents(OUStringToOString(maNumericEdit.GetText(), osl_getThreadTextEncoding())); fValue = atof(aContents.getStr()); if( mfMin != mfMax && ( fValue < mfMin || fValue > mfMax ) ) @@ -817,14 +817,14 @@ void SaneDlg::EstablishBoolOption() void SaneDlg::EstablishStringOption() { sal_Bool bSuccess; - rtl::OString aValue; + OString aValue; bSuccess = mrSane.GetOptionValue( mnCurrentOption, aValue ); if( bSuccess ) { maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) ); maOptionDescTxt.Show( sal_True ); - maStringEdit.SetText(rtl::OStringToOUString(aValue, osl_getThreadTextEncoding())); + maStringEdit.SetText(OStringToOUString(aValue, osl_getThreadTextEncoding())); maStringEdit.Show( sal_True ); } } @@ -835,9 +835,9 @@ void SaneDlg::EstablishStringRange() maStringRangeBox.Clear(); for( int i = 0; ppStrings[i] != 0; i++ ) maStringRangeBox.InsertEntry( String( ppStrings[i], osl_getThreadTextEncoding() ) ); - rtl::OString aValue; + OString aValue; mrSane.GetOptionValue( mnCurrentOption, aValue ); - maStringRangeBox.SelectEntry(rtl::OStringToOUString(aValue, osl_getThreadTextEncoding())); + maStringRangeBox.SelectEntry(OStringToOUString(aValue, osl_getThreadTextEncoding())); maStringRangeBox.Show( sal_True ); maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) ); maOptionDescTxt.Show( sal_True ); @@ -1181,8 +1181,8 @@ sal_Bool SaneDlg::LoadState() return sal_False; aConfig.SetGroup( "SANE" ); - rtl::OString aString = aConfig.ReadKey( "SO_LastSaneDevice" ); - for( i = 0; i < Sane::CountDevices() && !aString.equals(rtl::OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding())); i++ ) ; + OString aString = aConfig.ReadKey( "SO_LastSaneDevice" ); + for( i = 0; i < Sane::CountDevices() && !aString.equals(OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding())); i++ ) ; if( i == Sane::CountDevices() ) return sal_False; @@ -1198,7 +1198,7 @@ sal_Bool SaneDlg::LoadState() for (i = 0; i < iMax; ++i) { aString = aConfig.GetKeyName( i ); - rtl::OString aValue = aConfig.ReadKey( i ); + OString aValue = aConfig.ReadKey( i ); int nOption = mrSane.GetOptionByName( aString.getStr() ); if( nOption == -1 ) continue; @@ -1212,7 +1212,7 @@ sal_Bool SaneDlg::LoadState() else if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("STRING="))) { aValue = aValue.copy(RTL_CONSTASCII_LENGTH("STRING=")); - mrSane.SetOptionValue(nOption,rtl::OStringToOUString(aValue, osl_getThreadTextEncoding()) ); + mrSane.SetOptionValue(nOption,OStringToOUString(aValue, osl_getThreadTextEncoding()) ); } else if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("NUMERIC="))) { @@ -1222,7 +1222,7 @@ sal_Bool SaneDlg::LoadState() int n = 0; do { - rtl::OString aSub = aValue.getToken(0, ':', nIndex); + OString aSub = aValue.getToken(0, ':', nIndex); double fValue=0.0; sscanf(aSub.getStr(), "%lg", &fValue); SetAdjustedNumericalValue(aString.getStr(), fValue, n++); @@ -1251,7 +1251,7 @@ void SaneDlg::SaveState() aConfig.DeleteGroup( "SANE" ); aConfig.SetGroup( "SANE" ); aConfig.WriteKey( "SO_LastSANEDevice", - rtl::OUStringToOString(maDeviceBox.GetSelectEntry(), RTL_TEXTENCODING_UTF8) ); + OUStringToOString(maDeviceBox.GetSelectEntry(), RTL_TEXTENCODING_UTF8) ); static char const* pSaveOptions[] = { "resolution", @@ -1262,7 +1262,7 @@ void SaneDlg::SaveState() }; for( size_t i = 0; i < SAL_N_ELEMENTS(pSaveOptions); ++i ) { - rtl::OString aOption = pSaveOptions[i]; + OString aOption = pSaveOptions[i]; int nOption = mrSane.GetOptionByName( pSaveOptions[i] ); if( nOption > -1 ) { @@ -1274,7 +1274,7 @@ void SaneDlg::SaveState() sal_Bool bValue; if( mrSane.GetOptionValue( nOption, bValue ) ) { - rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM( "BOOL=")); aString.append(static_cast(bValue)); aConfig.WriteKey(aOption, aString.makeStringAndClear()); @@ -1283,10 +1283,10 @@ void SaneDlg::SaveState() break; case SANE_TYPE_STRING: { - rtl::OString aValue; + OString aValue; if( mrSane.GetOptionValue( nOption, aValue ) ) { - rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("STRING=")); + OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("STRING=")); aString.append(aValue); aConfig.WriteKey( aOption, aString.makeStringAndClear() ); } @@ -1295,7 +1295,7 @@ void SaneDlg::SaveState() case SANE_TYPE_FIXED: case SANE_TYPE_INT: { - rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("NUMERIC=")); + OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("NUMERIC=")); double fValue; char buf[256]; int n; diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx index d415116dce17..ec2f088594ec 100644 --- a/extensions/source/scanner/scanner.cxx +++ b/extensions/source/scanner/scanner.cxx @@ -79,7 +79,7 @@ Sequence< sal_Int8 > SAL_CALL ScannerManager::getMaskDIB() throw() OUString ScannerManager::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.scanner.ScannerManager" ); + return OUString( "com.sun.star.scanner.ScannerManager" ); } // ----------------------------------------------------------------------------- @@ -88,7 +88,7 @@ Sequence< OUString > ScannerManager::getSupportedServiceNames_Static() throw () { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.scanner.ScannerManager" ); + aSNS.getArray()[0] = OUString( "com.sun.star.scanner.ScannerManager" ); return aSNS; } diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index bfbbc99e2289..85f116339591 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -37,8 +37,6 @@ using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::scanner; -using ::rtl::OUString; - class ScannerManager : public OWeakObject, XScannerManager2, css::awt::XBitmap { protected: diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index aace9cb1511e..d6d7615d93cc 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -256,7 +256,7 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw() if( Sane::IsSane() ) { Sequence< ScannerContext > aRet(1); - aRet.getArray()[0].ScannerName = ::rtl::OUString("SANE"); + aRet.getArray()[0].ScannerName = OUString("SANE"); aRet.getArray()[0].InternalData = 0; return aRet; } @@ -281,7 +281,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString("Scanner does not exist"), + OUString("Scanner does not exist"), Reference< XScannerManager >( this ), ScanError_InvalidContext ); @@ -289,7 +289,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex boost::shared_ptr pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString("Scanner is busy"), + OUString("Scanner is busy"), Reference< XScannerManager >( this ), ScanError_ScanInProgress ); @@ -320,14 +320,14 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString("Scanner does not exist"), + OUString("Scanner does not exist"), Reference< XScannerManager >( this ), ScanError_InvalidContext ); boost::shared_ptr pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString("Scanner is busy"), + OUString("Scanner is busy"), Reference< XScannerManager >( this ), ScanError_ScanInProgress ); @@ -346,7 +346,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString("Scanner does not exist"), + OUString("Scanner does not exist"), Reference< XScannerManager >( this ), ScanError_InvalidContext ); @@ -365,7 +365,7 @@ Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString("Scanner does not exist"), + OUString("Scanner does not exist"), Reference< XScannerManager >( this ), ScanError_InvalidContext ); diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 60e1d588a862..fbeeff9f3d98 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -253,9 +253,9 @@ void ImpTwain::ImplOpenSourceManager() { if( 1 == nCurState ) { - pMod = new ::osl::Module( ::rtl::OUString() ); + pMod = new ::osl::Module( OUString() ); - if( pMod->load( ::rtl::OUString( TWAIN_LIBNAME ) ) ) + if( pMod->load( OUString( TWAIN_LIBNAME ) ) ) { nCurState = 2; @@ -869,7 +869,7 @@ uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners() osl::MutexGuard aGuard( maProtector ); uno::Sequence< ScannerContext > aRet( 1 ); - aRet.getArray()[0].ScannerName = ::rtl::OUString( "TWAIN" ); + aRet.getArray()[0].ScannerName = OUString( "TWAIN" ); aRet.getArray()[0].InternalData = 0; return aRet; @@ -881,8 +881,8 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rCont osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); - if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( "TWAIN" ) ) - throw ScannerException( ::rtl::OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); + if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) ) + throw ScannerException( OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); ReleaseData(); @@ -895,8 +895,8 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); - if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( "TWAIN" ) ) - throw ScannerException( ::rtl::OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); + if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) ) + throw ScannerException( OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); ReleaseData(); aTwain.PerformTransfer( *this, rxListener ); @@ -908,8 +908,8 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext ) osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); - if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( "TWAIN" ) ) - throw ScannerException( ::rtl::OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); + if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) ) + throw ScannerException( OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); return( ( aTwain.GetState() == TWAIN_STATE_CANCELED ) ? ScanError_ScanCanceled : ScanError_ScanErrorNone ); } diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx index daf2a07fb805..e9a187bd42cd 100644 --- a/extensions/source/scanner/scnserv.cxx +++ b/extensions/source/scanner/scnserv.cxx @@ -32,7 +32,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const s Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory; void* pRet = 0; - if( ::rtl::OUString::createFromAscii( pImplName ) == ScannerManager::getImplementationName_Static() ) + if( OUString::createFromAscii( pImplName ) == ScannerManager::getImplementationName_Static() ) { xFactory = Reference< ::com::sun::star::lang::XSingleServiceFactory >( ::cppu::createSingleFactory( static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ), diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index ad57db85fa1b..3ceb70a4076c 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -45,8 +45,8 @@ namespace uno = com::sun::star::uno ; struct OutData { rtl::Reference< DownloadInteractionHandler >Handler; - rtl::OUString File; - rtl::OUString DestinationDir; + OUString File; + OUString DestinationDir; oslFileHandle FileHandle; sal_uInt64 Offset; osl::Condition& StopCondition; @@ -65,7 +65,7 @@ static void openFile( OutData& out ) double fDownloadSize; curl_easy_getinfo(out.curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &fDownloadSize); - rtl::OString aURL(effective_url); + OString aURL(effective_url); // ensure no trailing '/' sal_Int32 nLen = aURL.getLength(); @@ -76,7 +76,7 @@ static void openFile( OutData& out ) sal_Int32 nIndex = aURL.lastIndexOf('/'); if( nIndex > 0 ) { - out.File = out.DestinationDir + rtl::OStringToOUString(aURL.copy(nIndex), RTL_TEXTENCODING_UTF8); + out.File = out.DestinationDir + OStringToOUString(aURL.copy(nIndex), RTL_TEXTENCODING_UTF8); oslFileError rc; @@ -101,22 +101,22 @@ static void openFile( OutData& out ) //------------------------------------------------------------------------------ -static inline rtl::OString -getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const rtl::OUString& aName) +static inline OString +getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName) { - rtl::OString aRet; + OString aRet; OSL_ASSERT(xNameAccess->hasByName(aName)); uno::Any aValue = xNameAccess->getByName(aName); - return rtl::OUStringToOString(aValue.get(), RTL_TEXTENCODING_UTF8); + return OUStringToOString(aValue.get(), RTL_TEXTENCODING_UTF8); } //------------------------------------------------------------------------------ static inline sal_Int32 getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, - const rtl::OUString& aName, sal_Int32 nDefault=-1) + const OUString& aName, sal_Int32 nDefault=-1) { OSL_ASSERT(xNameAccess->hasByName(aName)); uno::Any aValue = xNameAccess->getByName(aName); @@ -180,7 +180,7 @@ progress_callback( void *clientp, double dltotal, double dlnow, double ultotal, //------------------------------------------------------------------------------ void -Download::getProxyForURL(const rtl::OUString& rURL, rtl::OString& rHost, sal_Int32& rPort) const +Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) const { uno::Reference< lang::XMultiServiceFactory > xConfigProvider( com::sun::star::configuration::theDefaultProvider::get( m_xContext ) ); @@ -223,7 +223,7 @@ Download::getProxyForURL(const rtl::OUString& rURL, rtl::OString& rHost, sal_Int //------------------------------------------------------------------------------ -bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProxyHost, sal_Int32 nProxyPort) +bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal_Int32 nProxyPort) { /* Need to investigate further whether it is necessary to call * curl_global_init or not - leave it for now (as the ftp UCB content @@ -237,7 +237,7 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx { out.curl = pCURL; - rtl::OString aURL(rtl::OUStringToOString(rURL, RTL_TEXTENCODING_UTF8)); + OString aURL(OUStringToOString(rURL, RTL_TEXTENCODING_UTF8)); curl_easy_setopt(pCURL, CURLOPT_URL, aURL.getStr()); // abort on http errors @@ -301,7 +301,7 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx // Only report errors when not stopped else { - rtl::OString aMessage(RTL_CONSTASCII_STRINGPARAM("Unknown error")); + OString aMessage(RTL_CONSTASCII_STRINGPARAM("Unknown error")); const char * error_message = curl_easy_strerror(cc); if( NULL != error_message ) @@ -313,9 +313,9 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx curl_easy_getinfo( pCURL, CURLINFO_RESPONSE_CODE, &nError ); if ( 403 == nError ) - aMessage += rtl::OString( RTL_CONSTASCII_STRINGPARAM( " 403: Access denied!" ) ); + aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " 403: Access denied!" ) ); else if ( 404 == nError ) - aMessage += rtl::OString( RTL_CONSTASCII_STRINGPARAM( " 404: File not found!" ) ); + aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " 404: File not found!" ) ); else if ( 416 == nError ) { // we got this error probably, because we already downloaded the file @@ -324,13 +324,13 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx } else { - aMessage += rtl::OString( RTL_CONSTASCII_STRINGPARAM( ":error code = " ) ); + aMessage += OString( RTL_CONSTASCII_STRINGPARAM( ":error code = " ) ); aMessage += aMessage.valueOf( nError ); - aMessage += rtl::OString( RTL_CONSTASCII_STRINGPARAM( " !" ) ); + aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " !" ) ); } } if ( !ret ) - out.Handler->downloadStalled( rtl::OStringToOUString(aMessage, RTL_TEXTENCODING_UTF8) ); + out.Handler->downloadStalled( OStringToOUString(aMessage, RTL_TEXTENCODING_UTF8) ); } curl_easy_cleanup(pCURL); @@ -342,19 +342,19 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx //------------------------------------------------------------------------------ bool -Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl::OUString& rDestinationDir) +Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDestinationDir) { OSL_ASSERT( m_aHandler.is() ); OutData out(m_aCondition); - rtl::OUString aFile( rFile ); + OUString aFile( rFile ); // when rFile is empty, there is no remembered file name. If there is already a file with the // same name ask the user if she wants to resume a download or restart the download if ( aFile.isEmpty() ) { // GetFileName() - rtl::OUString aURL( rURL ); + OUString aURL( rURL ); // ensure no trailing '/' sal_Int32 nLen = aURL.getLength(); while( (nLen > 0) && ('/' == aURL[ nLen-1 ]) ) @@ -374,7 +374,7 @@ Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl if ( m_aHandler->checkDownloadDestination( aURL.copy( nIndex+1 ) ) ) { osl_removeFile( aFile.pData ); - aFile = rtl::OUString(); + aFile = OUString(); } else m_aHandler->downloadStarted( aFile, 0 ); @@ -382,7 +382,7 @@ Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl else { osl_removeFile( aFile.pData ); - aFile = rtl::OUString(); + aFile = OUString(); } } @@ -403,10 +403,10 @@ Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl } } else if( osl_File_E_NOENT == rc ) // file has been deleted meanwhile .. - out.File = rtl::OUString(); + out.File = OUString(); } - rtl::OString aProxyHost; + OString aProxyHost; sal_Int32 nProxyPort = -1; getProxyForURL(rURL, aProxyHost, nProxyPort); diff --git a/extensions/source/update/check/download.hxx b/extensions/source/update/check/download.hxx index 1f01c8c4c230..b1d22e773562 100644 --- a/extensions/source/update/check/download.hxx +++ b/extensions/source/update/check/download.hxx @@ -27,22 +27,22 @@ struct DownloadInteractionHandler : public rtl::IReference { - virtual bool checkDownloadDestination(const rtl::OUString& rFileName) = 0; + virtual bool checkDownloadDestination(const OUString& rFileName) = 0; // called if the destination file already exists, but resume is false - virtual bool downloadTargetExists(const rtl::OUString& rFileName) = 0; + virtual bool downloadTargetExists(const OUString& rFileName) = 0; // called when curl reports an error - virtual void downloadStalled(const rtl::OUString& rErrorMessage) = 0; + virtual void downloadStalled(const OUString& rErrorMessage) = 0; // progress handler virtual void downloadProgressAt(sal_Int8 nPercent) = 0; // called on first progress notification - virtual void downloadStarted(const rtl::OUString& rFileName, sal_Int64 nFileSize) = 0; + virtual void downloadStarted(const OUString& rFileName, sal_Int64 nFileSize) = 0; // called when download has been finished - virtual void downloadFinished(const rtl::OUString& rFileName) = 0; + virtual void downloadFinished(const OUString& rFileName) = 0; protected: ~DownloadInteractionHandler() {} @@ -56,7 +56,7 @@ public: const rtl::Reference< DownloadInteractionHandler >& rHandler) : m_xContext(xContext), m_aHandler(rHandler) {}; // returns true when the content of rURL was successfully written to rLocalFile - bool start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl::OUString& rDestinationDir); + bool start(const OUString& rURL, const OUString& rFile, const OUString& rDestinationDir); // stops the download after the next write operation void stop(); @@ -68,7 +68,7 @@ public: protected: // Determines the appropriate proxy settings for the given URL. Returns true if a proxy should be used - void getProxyForURL(const rtl::OUString& rURL, rtl::OString& rHost, sal_Int32& rPort) const; + void getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) const; private: osl::Condition m_aCondition; diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index d2ac583ca758..380217ca19ed 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -72,7 +72,7 @@ extern "C" bool SAL_CALL WNT_hasInternetConnection(); //------------------------------------------------------------------------------ // Returns the URL of the release note for the given position -rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled) +OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled) { std::vector< ReleaseNote >::const_iterator iter = rInfo.ReleaseNotes.begin(); while( iter != rInfo.ReleaseNotes.end() ) @@ -88,7 +88,7 @@ rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDo ++iter; } - return rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------ @@ -96,7 +96,7 @@ rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDo namespace { -static inline rtl::OUString getBuildId() +static inline OUString getBuildId() { OUString aPathVal("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"); rtl::Bootstrap::expandMacros(aPathVal); @@ -104,16 +104,16 @@ static inline rtl::OUString getBuildId() } //------------------------------------------------------------------------------ -static inline rtl::OUString getBaseInstallation() +static inline OUString getBaseInstallation() { - rtl::OUString aPathVal("$BRAND_BASE_DIR"); + OUString aPathVal("$BRAND_BASE_DIR"); rtl::Bootstrap::expandMacros(aPathVal); return aPathVal; } //------------------------------------------------------------------------------ -inline bool isObsoleteUpdateInfo(const rtl::OUString& rBuildId) +inline bool isObsoleteUpdateInfo(const OUString& rBuildId) { return sal_True != rBuildId.equals(getBuildId()) && !rBuildId.isEmpty(); } @@ -121,10 +121,10 @@ inline bool isObsoleteUpdateInfo(const rtl::OUString& rBuildId) //------------------------------------------------------------------------------ -rtl::OUString getImageFromFileName(const rtl::OUString& aFile) +OUString getImageFromFileName(const OUString& aFile) { #ifndef WNT - rtl::OUString aUnpackPath; + OUString aUnpackPath; if( osl_getExecutableFile(&aUnpackPath.pData) == osl_Process_E_None ) { sal_uInt32 lastIndex = aUnpackPath.lastIndexOf('/'); @@ -137,7 +137,7 @@ rtl::OUString getImageFromFileName(const rtl::OUString& aFile) oslFileHandle hOut = NULL; oslProcess hProcess = NULL; - rtl::OUString aSystemPath; + OUString aSystemPath; osl::File::getSystemPathFromFileURL(aFile, aSystemPath); oslProcessError rc = osl_executeProcess_WithRedirectedIO( @@ -164,7 +164,7 @@ rtl::OUString getImageFromFileName(const rtl::OUString& aFile) sal_uInt64 nBytesRead = 0; const sal_uInt64 nBytesToRead = sizeof(szBuffer) - 1; - rtl::OUString aImageName; + OUString aImageName; while( osl_File_E_None == osl_readFile(hOut, szBuffer, nBytesToRead, &nBytesRead) ) { sal_Char *pc = szBuffer + nBytesRead; @@ -174,7 +174,7 @@ rtl::OUString getImageFromFileName(const rtl::OUString& aFile) } while( ('\n' == *pc) || ('\r' == *pc) ); - aImageName += rtl::OUString(szBuffer, pc - szBuffer + 1, osl_getThreadTextEncoding()); + aImageName += OUString(szBuffer, pc - szBuffer + 1, osl_getThreadTextEncoding()); if( nBytesRead < nBytesToRead ) break; @@ -316,7 +316,7 @@ public: osl::Condition& rCondition, const uno::Reference& xContext, const rtl::Reference< DownloadInteractionHandler >& rHandler, - const rtl::OUString& rURL ); + const OUString& rURL ); virtual void SAL_CALL run(); virtual void SAL_CALL cancel(); @@ -329,7 +329,7 @@ protected: private: osl::Condition& m_aCondition; const uno::Reference m_xContext; - const rtl::OUString m_aURL; + const OUString m_aURL; Download m_aDownload; }; @@ -553,7 +553,7 @@ UpdateCheckThread::run() catch(const uno::Exception& e) { // Silently catch all errors OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); } } @@ -571,7 +571,7 @@ ManualUpdateCheckThread::run() catch(const uno::Exception& e) { // Silently catch all errors OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); } } @@ -601,7 +601,7 @@ MenuBarButtonJob::execute(const uno::Sequence& ) DownloadThread::DownloadThread(osl::Condition& rCondition, const uno::Reference& xContext, const rtl::Reference< DownloadInteractionHandler >& rHandler, - const rtl::OUString& rURL) : + const OUString& rURL) : m_aCondition(rCondition), m_xContext(xContext), m_aURL(rURL), @@ -630,8 +630,8 @@ DownloadThread::run() { rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext); - rtl::OUString aLocalFile = rModel->getLocalFileName(); - rtl::OUString aDownloadDest = rModel->getDownloadDestination(); + OUString aLocalFile = rModel->getLocalFileName(); + OUString aDownloadDest = rModel->getDownloadDestination(); // release config class for now rModel.clear(); @@ -756,7 +756,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, UpdateCheckROModel aModel( aNameAccess ); m_xContext = xContext; - rtl::OUString aUpdateEntryVersion = aModel.getUpdateEntryVersion(); + OUString aUpdateEntryVersion = aModel.getUpdateEntryVersion(); aModel.getUpdateEntry(m_aUpdateInfo); @@ -767,7 +767,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, m_bHasExtensionUpdate = checkForPendingUpdates( xContext ); m_bShowExtUpdDlg = false; - rtl::OUString aLocalFileName = aModel.getLocalFileName(); + OUString aLocalFileName = aModel.getLocalFileName(); if( !aLocalFileName.isEmpty() ) { @@ -815,7 +815,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, if( obsoleteUpdateInfo ) { // Bring-up release note for position 5 .. - const rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 5)); + const OUString aURL(getReleaseNote(m_aUpdateInfo, 5)); if( !aURL.isEmpty() ) showReleaseNote(aURL); @@ -827,8 +827,8 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, m_aUpdateInfo = UpdateInfo(); // Remove outdated release notes - storeReleaseNote( 1, rtl::OUString() ); - storeReleaseNote( 2, rtl::OUString() ); + storeReleaseNote( 1, OUString() ); + storeReleaseNote( 2, OUString() ); } else { @@ -902,16 +902,16 @@ UpdateCheck::install() // Construct install command ?? // Store release note for position 3 and 4 - rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 3)); + OUString aURL(getReleaseNote(m_aUpdateInfo, 3)); storeReleaseNote(1, aURL); aURL = getReleaseNote(m_aUpdateInfo, 4); storeReleaseNote(2, aURL); - rtl::OUString aInstallImage(m_aImageName); + OUString aInstallImage(m_aImageName); osl::FileBase::getSystemPathFromFileURL(aInstallImage, aInstallImage); - rtl::OUString aParameter; + OUString aParameter; sal_Int32 nFlags = c3s::SystemShellExecuteFlags::DEFAULTS; #if ( defined LINUX || defined SOLARIS ) nFlags = 42; @@ -1047,7 +1047,7 @@ UpdateCheck::enableDownload(bool enable, bool paused) //------------------------------------------------------------------------------ bool -UpdateCheck::downloadTargetExists(const rtl::OUString& rFileName) +UpdateCheck::downloadTargetExists(const OUString& rFileName) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -1089,7 +1089,7 @@ UpdateCheck::downloadTargetExists(const rtl::OUString& rFileName) } //------------------------------------------------------------------------------ -bool UpdateCheck::checkDownloadDestination( const rtl::OUString& rFileName ) +bool UpdateCheck::checkDownloadDestination( const OUString& rFileName ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -1108,7 +1108,7 @@ bool UpdateCheck::checkDownloadDestination( const rtl::OUString& rFileName ) //------------------------------------------------------------------------------ void -UpdateCheck::downloadStalled(const rtl::OUString& rErrorMessage) +UpdateCheck::downloadStalled(const OUString& rErrorMessage) { osl::ClearableMutexGuard aGuard(m_aMutex); rtl::Reference< UpdateHandler > aUpdateHandler(getUpdateHandler()); @@ -1134,7 +1134,7 @@ UpdateCheck::downloadProgressAt(sal_Int8 nPercent) //------------------------------------------------------------------------------ void -UpdateCheck::downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize) +UpdateCheck::downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize) { if ( nFileSize > 0 ) { @@ -1144,7 +1144,7 @@ UpdateCheck::downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFil aModel->storeLocalFileName(rLocalFileName, nFileSize); // Bring-up release note for position 1 .. - const rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 1, aModel->isAutoDownloadEnabled())); + const OUString aURL(getReleaseNote(m_aUpdateInfo, 1, aModel->isAutoDownloadEnabled())); if( !aURL.isEmpty() ) showReleaseNote(aURL); } @@ -1153,7 +1153,7 @@ UpdateCheck::downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFil //------------------------------------------------------------------------------ void -UpdateCheck::downloadFinished(const rtl::OUString& rLocalFileName) +UpdateCheck::downloadFinished(const OUString& rLocalFileName) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -1168,7 +1168,7 @@ UpdateCheck::downloadFinished(const rtl::OUString& rLocalFileName) // Bring-up release note for position 2 .. rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get( m_xContext ); - const rtl::OUString aURL(getReleaseNote(aUpdateInfo, 2, rModel->isAutoDownloadEnabled())); + const OUString aURL(getReleaseNote(aUpdateInfo, 2, rModel->isAutoDownloadEnabled())); if( !aURL.isEmpty() ) showReleaseNote(aURL); } @@ -1185,7 +1185,7 @@ UpdateCheck::cancelDownload() rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext); - rtl::OUString aLocalFile(rModel->getLocalFileName()); + OUString aLocalFile(rModel->getLocalFileName()); rModel->clearLocalFileName(); rModel->storeDownloadPaused(false); @@ -1303,7 +1303,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) if( ((1 == iter2->Pos) || (2 == iter2->Pos)) && autoDownloadEnabled && !iter2->URL2.isEmpty()) { iter2->URL = iter2->URL2; - iter2->URL2 = rtl::OUString(); + iter2->URL2 = OUString(); iter2->Pos = iter2->Pos2; iter2->Pos2 = 0; } @@ -1411,7 +1411,7 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble) OSL_ASSERT( aUpdateHandler.is() ); UpdateInfo aUpdateInfo(m_aUpdateInfo); - rtl::OUString aImageName(m_aImageName); + OUString aImageName(m_aImageName); aGuard.clear(); @@ -1423,7 +1423,7 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble) { uno::Reference< uno::XComponentContext > xContext(m_xContext); - rtl::OUString aDownloadDestination = + OUString aDownloadDestination = UpdateCheckConfig::get(xContext, this)->getDownloadDestination(); osl_getSystemPathFromFileURL(aDownloadDestination.pData, &aDownloadDestination.pData); @@ -1461,13 +1461,13 @@ UpdateCheck::getUIState(const UpdateInfo& rInfo) //------------------------------------------------------------------------------ void -UpdateCheck::showReleaseNote(const rtl::OUString& rURL) const +UpdateCheck::showReleaseNote(const OUString& rURL) const { const uno::Reference< c3s::XSystemShellExecute > xShellExecute( c3s::SystemShellExecute::create( m_xContext ) ); try { - xShellExecute->execute(rURL, rtl::OUString(), c3s::SystemShellExecuteFlags::URIS_ONLY); + xShellExecute->execute(rURL, OUString(), c3s::SystemShellExecuteFlags::URIS_ONLY); } catch(const c3s::SystemShellExecuteException&) { } } @@ -1475,18 +1475,18 @@ UpdateCheck::showReleaseNote(const rtl::OUString& rURL) const //------------------------------------------------------------------------------ bool -UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL) +UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString &rURL) { osl::FileBase::RC rc; - rtl::OUString aTargetDir( UpdateCheckConfig::getAllUsersDirectory() + "/sun" ); + OUString aTargetDir( UpdateCheckConfig::getAllUsersDirectory() + "/sun" ); rc = osl::Directory::createPath( aTargetDir ); - rtl::OUString aFileName = "releasenote" + - rtl::OUString::valueOf( (sal_Int32) nNum ) + + OUString aFileName = "releasenote" + + OUString::valueOf( (sal_Int32) nNum ) + ".url"; - rtl::OUString aFilePath; + OUString aFilePath; rc = osl::FileBase::getAbsoluteFileURL( aTargetDir, aFileName, aFilePath ); if ( rc != osl::FileBase::E_None ) return false; @@ -1501,16 +1501,16 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL) if ( rc != osl::FileBase::E_None ) return false; - rtl::OString aLineBuf("[InternetShortcut]\r\n"); + OString aLineBuf("[InternetShortcut]\r\n"); sal_uInt64 nWritten = 0; - rtl::OUString aURL( rURL ); + OUString aURL( rURL ); #ifdef WNT rc = aFile.write( aLineBuf.getStr(), aLineBuf.getLength(), nWritten ); if ( rc != osl::FileBase::E_None ) return false; aURL = "URL=" + rURL; #endif - aLineBuf = rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ); + aLineBuf = OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ); rc = aFile.write( aLineBuf.getStr(), aLineBuf.getLength(), nWritten ); if ( rc != osl::FileBase::E_None ) return false; @@ -1521,8 +1521,8 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL) //------------------------------------------------------------------------------ void UpdateCheck::showExtensionDialog() { - rtl::OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog"; - rtl::OUString sArguments = "SHOW_UPDATE_DIALOG"; + OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog"; + OUString sArguments = "SHOW_UPDATE_DIALOG"; uno::Reference< uno::XInterface > xService; if( ! m_xContext.is() ) @@ -1571,7 +1571,7 @@ UpdateCheck::getInteractionHandler() const //------------------------------------------------------------------------------ uno::Reference< uno::XInterface > -UpdateCheck::createService(const rtl::OUString& rServiceName, +UpdateCheck::createService(const OUString& rServiceName, const uno::Reference& xContext) { if( !xContext.is() ) diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx index 55d2b24c158b..9ae38d8132d3 100644 --- a/extensions/source/update/check/updatecheck.hxx +++ b/extensions/source/update/check/updatecheck.hxx @@ -71,7 +71,7 @@ public: */ static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > createService( - const rtl::OUString& aServiceName, + const OUString& aServiceName, const com::sun::star::uno::Reference& xContext); // Update internal update info member @@ -99,13 +99,13 @@ public: bool hasOfficeUpdate() const { return (m_aUpdateInfo.BuildId.getLength() > 0); } // DownloadInteractionHandler - virtual bool downloadTargetExists(const rtl::OUString& rFileName); - virtual void downloadStalled(const rtl::OUString& rErrorMessage); + virtual bool downloadTargetExists(const OUString& rFileName); + virtual void downloadStalled(const OUString& rErrorMessage); virtual void downloadProgressAt(sal_Int8 nProcent); - virtual void downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize); - virtual void downloadFinished(const rtl::OUString& rLocalFileName); + virtual void downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize); + virtual void downloadFinished(const OUString& rLocalFileName); // checks if the download target already exists and asks user what to do next - virtual bool checkDownloadDestination( const rtl::OUString& rFile ); + virtual bool checkDownloadDestination( const OUString& rFile ); // Cancels the download action (and resumes checking if enabled) void cancelDownload(); @@ -144,10 +144,10 @@ private: rtl::Reference getUpdateHandler(); // Open the given URL in a browser - void showReleaseNote(const rtl::OUString& rURL) const; + void showReleaseNote(const OUString& rURL) const; // stores the release note url on disk to be used by setup app - static bool storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL); + static bool storeReleaseNote(sal_Int8 nNum, const OUString &rURL); /* This method turns on the menubar icon and triggers the bubble window */ @@ -169,7 +169,7 @@ private: osl::Condition m_aCondition; UpdateInfo m_aUpdateInfo; - rtl::OUString m_aImageName; + OUString m_aImageName; bool m_bHasExtensionUpdate; bool m_bShowExtUpdDlg; diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index 8f0de9adaa5c..19dc4c3426c5 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -118,11 +118,11 @@ UpdateCheckROModel::isDownloadPaused() const //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckROModel::getStringValue(const sal_Char * pStr) const { uno::Any aAny( m_aNameAccess.getValue(pStr) ); - rtl::OUString aRet; + OUString aRet; aAny >>= aRet; @@ -131,7 +131,7 @@ UpdateCheckROModel::getStringValue(const sal_Char * pStr) const //------------------------------------------------------------------------------ -rtl::OUString UpdateCheckROModel::getLocalFileName() const +OUString UpdateCheckROModel::getLocalFileName() const { return getStringValue(LOCAL_FILE); }; @@ -149,7 +149,7 @@ sal_Int64 UpdateCheckROModel::getDownloadSize() const //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckROModel::getUpdateEntryVersion() const { return getStringValue(OLD_VERSION); @@ -169,11 +169,11 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const rInfo.Sources.push_back( DownloadSource( isDirectDownload, getStringValue(DOWNLOAD_URL) ) ); - rtl::OString aStr(RELEASE_NOTE); + OString aStr(RELEASE_NOTE); for(sal_Int32 n=1; n < 6; ++n ) { - rtl::OUString aUStr = getStringValue( - OString(aStr + rtl::OString::valueOf(n)).getStr()); + OUString aUStr = getStringValue( + OString(aStr + OString::valueOf(n)).getStr()); if( !aUStr.isEmpty() ) rInfo.ReleaseNotes.push_back(ReleaseNote((sal_Int8) n, aUStr)); } @@ -182,23 +182,23 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const //------------------------------------------------------------------------------ -rtl::OUString UpdateCheckConfig::getDesktopDirectory() +OUString UpdateCheckConfig::getDesktopDirectory() { - rtl::OUString aRet; + OUString aRet; #ifdef WNT WCHAR szPath[MAX_PATH]; if( ! FAILED( SHGetSpecialFolderPathW( NULL, szPath, CSIDL_DESKTOPDIRECTORY, true ) ) ) { - aRet = rtl::OUString( reinterpret_cast< sal_Unicode * >(szPath) ); + aRet = OUString( reinterpret_cast< sal_Unicode * >(szPath) ); osl::FileBase::getFileURLFromSystemPath( aRet, aRet ); } #else // This should become a desktop specific setting in some system backend .. - rtl::OUString aHomeDir; + OUString aHomeDir; osl::Security().getHomeDir( aHomeDir ); - aRet = aHomeDir + rtl::OUString("/Desktop"); + aRet = aHomeDir + OUString("/Desktop"); // Set path to home directory when there is no /Desktop directory osl::Directory aDocumentsDir( aRet ); @@ -211,16 +211,16 @@ rtl::OUString UpdateCheckConfig::getDesktopDirectory() //------------------------------------------------------------------------------ -rtl::OUString UpdateCheckConfig::getAllUsersDirectory() +OUString UpdateCheckConfig::getAllUsersDirectory() { - rtl::OUString aRet; + OUString aRet; #ifdef WNT WCHAR szPath[MAX_PATH]; if( ! FAILED( SHGetSpecialFolderPathW( NULL, szPath, CSIDL_COMMON_DOCUMENTS, true ) ) ) { - aRet = rtl::OUString( reinterpret_cast< sal_Unicode * >(szPath) ); + aRet = OUString( reinterpret_cast< sal_Unicode * >(szPath) ); osl::FileBase::getFileURLFromSystemPath( aRet, aRet ); } #else @@ -300,10 +300,10 @@ UpdateCheckConfig::isAutoDownloadEnabled() const //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckConfig::getUpdateEntryVersion() const { - rtl::OUString aValue; + OUString aValue; // getByName is defined as non const in XNameAccess const_cast < UpdateCheckConfig *> (this)->getByName( OLD_VERSION ) >>= aValue; @@ -339,11 +339,11 @@ UpdateCheckConfig::getCheckInterval() const //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckConfig::getLocalFileName() const { - rtl::OUString aName = LOCAL_FILE; - rtl::OUString aRet; + OUString aName = LOCAL_FILE; + OUString aRet; if( m_xContainer->hasByName(aName) ) m_xContainer->getByName(aName) >>= aRet; @@ -353,7 +353,7 @@ UpdateCheckConfig::getLocalFileName() const //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckConfig::getDownloadDestination() const { OUString aName = DOWNLOAD_DESTINATION; @@ -367,7 +367,7 @@ UpdateCheckConfig::getDownloadDestination() const //------------------------------------------------------------------------------ void -UpdateCheckConfig::storeLocalFileName(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize) +UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64 nFileSize) { const sal_uInt8 nItems = 2; const OUString aNameList[nItems] = { OUString(LOCAL_FILE), OUString(DOWNLOAD_SIZE) }; @@ -426,7 +426,7 @@ UpdateCheckConfig::updateLastChecked() //------------------------------------------------------------------------------ void -UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const rtl::OUString& aCurrentBuild) +UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aCurrentBuild) { bool autoDownloadEnabled = isAutoDownloadEnabled(); @@ -446,10 +446,10 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const rtl::OUStrin uno::makeAny(aCurrentBuild) }; - rtl::OUString aName; + OUString aName; for( sal_uInt32 n=0; n < nUpdateEntryProperties; ++n ) { - aName = rtl::OUString::createFromAscii(aUpdateEntryProperties[n]); + aName = OUString::createFromAscii(aUpdateEntryProperties[n]); if( m_xContainer->hasByName(aName) ) m_xContainer->replaceByName(aName, aValues[n]); @@ -465,11 +465,11 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const rtl::OUStrin void UpdateCheckConfig::clearUpdateFound() { - rtl::OUString aName; + OUString aName; for( sal_uInt32 n=0; n < nUpdateEntryProperties; ++n ) { - aName = rtl::OUString::createFromAscii(aUpdateEntryProperties[n]); + aName = OUString::createFromAscii(aUpdateEntryProperties[n]); try { if( m_xContainer->hasByName(aName) ) @@ -477,7 +477,7 @@ UpdateCheckConfig::clearUpdateFound() } catch(const lang::WrappedTargetException& ) { // Can not remove value, probably in share layer OSL_ASSERT(false); - m_xContainer->replaceByName(aName, uno::makeAny(rtl::OUString())); + m_xContainer->replaceByName(aName, uno::makeAny(OUString())); } } @@ -491,20 +491,20 @@ UpdateCheckConfig::clearUpdateFound() //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > UpdateCheckConfig::getServiceNames() { - uno::Sequence< rtl::OUString > aServiceList(1); + uno::Sequence< OUString > aServiceList(1); aServiceList[0] = "com.sun.star.setup.UpdateCheckConfig"; return aServiceList; } //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckConfig::getImplName() { - return rtl::OUString("vnd.sun.UpdateCheckConfig"); + return OUString("vnd.sun.UpdateCheckConfig"); } //------------------------------------------------------------------------------ @@ -526,7 +526,7 @@ UpdateCheckConfig::hasElements() throw (uno::RuntimeException) //------------------------------------------------------------------------------ uno::Any SAL_CALL -UpdateCheckConfig::getByName( const ::rtl::OUString& aName ) +UpdateCheckConfig::getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aValue = m_xContainer->getByName( aName ); @@ -534,7 +534,7 @@ UpdateCheckConfig::getByName( const ::rtl::OUString& aName ) // Provide dynamic default value if( aName.equalsAscii(DOWNLOAD_DESTINATION) ) { - rtl::OUString aStr; + OUString aStr; aValue >>= aStr; if( aStr.isEmpty() ) @@ -546,7 +546,7 @@ UpdateCheckConfig::getByName( const ::rtl::OUString& aName ) //------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UpdateCheckConfig::getElementNames( ) throw (uno::RuntimeException) { return m_xContainer->getElementNames(); @@ -555,7 +555,7 @@ UpdateCheckConfig::getElementNames( ) throw (uno::RuntimeException) //------------------------------------------------------------------------------ sal_Bool SAL_CALL -UpdateCheckConfig::hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) +UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeException) { return m_xContainer->hasByName( aName ); } @@ -563,7 +563,7 @@ UpdateCheckConfig::hasByName( const ::rtl::OUString& aName ) throw (uno::Runtime //------------------------------------------------------------------------------ void SAL_CALL -UpdateCheckConfig::replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) +UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -586,7 +586,7 @@ UpdateCheckConfig::commitChanges() if( m_rListener.is() ) { const sal_Int32 nChanges = aChangesSet.getLength(); - rtl::OUString aString; + OUString aString; for( sal_Int32 i=0; ihasByName( rExtensionName ) ) { - ::rtl::OUString aIgnoredVersion; + OUString aIgnoredVersion; uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) ); aValue >>= aIgnoredVersion; if ( aIgnoredVersion.isEmpty() ) // no version means ignore all updates @@ -678,18 +678,18 @@ bool UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionNa } //------------------------------------------------------------------------------ -bool UpdateCheckConfig::checkExtensionVersion( const rtl::OUString& rExtensionName, - const rtl::OUString& rVersion ) +bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName, + const OUString& rVersion ) { if ( m_xAvailableUpdates->hasByName( rExtensionName ) ) { - ::rtl::OUString aStoredVersion; + OUString aStoredVersion; uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xAvailableUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) ); aValue >>= aStoredVersion; if ( m_xIgnoredUpdates->hasByName( rExtensionName ) ) { - ::rtl::OUString aIgnoredVersion; + OUString aIgnoredVersion; uno::Any aValue2( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) ); aValue2 >>= aIgnoredVersion; if ( aIgnoredVersion.isEmpty() ) // no version means ignore all updates @@ -711,7 +711,7 @@ bool UpdateCheckConfig::checkExtensionVersion( const rtl::OUString& rExtensionNa } //------------------------------------------------------------------------------ -rtl::OUString UpdateCheckConfig::getSubVersion( const rtl::OUString& rVersion, +OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion, sal_Int32 *nIndex ) { while ( *nIndex < rVersion.getLength() && rVersion[*nIndex] == '0') @@ -725,13 +725,13 @@ rtl::OUString UpdateCheckConfig::getSubVersion( const rtl::OUString& rVersion, //------------------------------------------------------------------------------ // checks if the second version string is greater than the first one -bool UpdateCheckConfig::isVersionGreater( const rtl::OUString& rVersion1, - const rtl::OUString& rVersion2 ) +bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1, + const OUString& rVersion2 ) { for ( sal_Int32 i1 = 0, i2 = 0; i1 >= 0 || i2 >= 0; ) { - ::rtl::OUString sSub1( getSubVersion( rVersion1, &i1 ) ); - ::rtl::OUString sSub2( getSubVersion( rVersion2, &i2 ) ); + OUString sSub1( getSubVersion( rVersion1, &i1 ) ); + OUString sSub2( getSubVersion( rVersion2, &i2 ) ); if ( sSub1.getLength() < sSub2.getLength() ) { return true; @@ -750,7 +750,7 @@ bool UpdateCheckConfig::isVersionGreater( const rtl::OUString& rVersion1, //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL +OUString SAL_CALL UpdateCheckConfig::getImplementationName() throw (uno::RuntimeException) { return getImplName(); @@ -759,10 +759,10 @@ UpdateCheckConfig::getImplementationName() throw (uno::RuntimeException) //------------------------------------------------------------------------------ sal_Bool SAL_CALL -UpdateCheckConfig::supportsService(rtl::OUString const & serviceName) +UpdateCheckConfig::supportsService(OUString const & serviceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > aServiceNameList = getServiceNames(); + uno::Sequence< OUString > aServiceNameList = getServiceNames(); for( sal_Int32 n=0; n < aServiceNameList.getLength(); n++ ) if( aServiceNameList[n].equals(serviceName) ) @@ -773,7 +773,7 @@ UpdateCheckConfig::supportsService(rtl::OUString const & serviceName) //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UpdateCheckConfig::getSupportedServiceNames() throw (uno::RuntimeException) { return getServiceNames(); diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx index 641c376f299c..2f89ecb8b177 100644 --- a/extensions/source/update/check/updatecheckconfig.hxx +++ b/extensions/source/update/check/updatecheckconfig.hxx @@ -63,15 +63,15 @@ public: bool isAutoCheckEnabled() const; bool isDownloadPaused() const; - rtl::OUString getLocalFileName() const; + OUString getLocalFileName() const; sal_Int64 getDownloadSize() const; - rtl::OUString getUpdateEntryVersion() const; + OUString getUpdateEntryVersion() const; void getUpdateEntry(UpdateInfo& rInfo) const; private: - rtl::OUString getStringValue(const sal_Char *) const; + OUString getStringValue(const sal_Char *) const; IByNameAccess& m_aNameAccess; }; @@ -97,8 +97,8 @@ class UpdateCheckConfig : public ::cppu::WeakImplHelper3< public: - static ::com::sun::star::uno::Sequence< rtl::OUString > getServiceNames(); - static rtl::OUString getImplName(); + static ::com::sun::star::uno::Sequence< OUString > getServiceNames(); + static OUString getImplName(); static ::rtl::Reference< UpdateCheckConfig > get( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, @@ -107,7 +107,7 @@ public: // Should really implement ROModel .. bool isAutoCheckEnabled() const; bool isAutoDownloadEnabled() const; - rtl::OUString getUpdateEntryVersion() const; + OUString getUpdateEntryVersion() const; /* Updates the timestamp of last check, but does not commit the change * as either clearUpdateFound() or setUpdateFound() are expected to get @@ -127,16 +127,16 @@ public: /* Stores the specified data of an available update */ - void storeUpdateFound(const UpdateInfo& rInfo, const rtl::OUString& aCurrentBuild); + void storeUpdateFound(const UpdateInfo& rInfo, const OUString& aCurrentBuild); // Returns the local file name of a started download - rtl::OUString getLocalFileName() const; + OUString getLocalFileName() const; // Returns the local file name of a started download - rtl::OUString getDownloadDestination() const; + OUString getDownloadDestination() const; // stores the local file name of a just started download - void storeLocalFileName(const rtl::OUString& rFileName, sal_Int64 nFileSize); + void storeLocalFileName(const OUString& rFileName, sal_Int64 nFileSize); // Removes the local file name of a download void clearLocalFileName(); @@ -145,16 +145,16 @@ public: void storeDownloadPaused(bool paused); // Returns the directory that acts as the user's desktop - static rtl::OUString getDesktopDirectory(); + static OUString getDesktopDirectory(); // Returns a directory accessible for all users - static rtl::OUString getAllUsersDirectory(); + static OUString getAllUsersDirectory(); // store and retrieve information about extensions - bool storeExtensionVersion( const rtl::OUString& rExtensionName, - const rtl::OUString& rVersion ); - bool checkExtensionVersion( const rtl::OUString& rExtensionName, - const rtl::OUString& rVersion ); + bool storeExtensionVersion( const OUString& rExtensionName, + const OUString& rVersion ); + bool checkExtensionVersion( const OUString& rExtensionName, + const OUString& rVersion ); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) @@ -163,17 +163,17 @@ public: throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, @@ -189,17 +189,17 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); private: - static rtl::OUString getSubVersion( const rtl::OUString& rVersion, sal_Int32 *nIndex ); - static bool isVersionGreater( const rtl::OUString& rVersion1, const rtl::OUString& rVersion2 ); + static OUString getSubVersion( const OUString& rVersion, sal_Int32 *nIndex ); + static bool isVersionGreater( const OUString& rVersion1, const OUString& rVersion2 ); const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xContainer; const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xAvailableUpdates; @@ -222,7 +222,7 @@ T getValue( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Name T value = T(); if( ! (rNamedValues[n].Value >>= value) ) throw ::com::sun::star::uno::RuntimeException( - ::rtl::OUString( + OUString( cppu_Any_extraction_failure_msg( &rNamedValues[n].Value, ::cppu::getTypeFavourUnsigned(&value).getTypeLibType() ), diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index e4ff941c5abb..d61700e5f073 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -69,8 +69,8 @@ public: UpdateCheckJob(const uno::Reference& xContext); - static uno::Sequence< rtl::OUString > getServiceNames(); - static rtl::OUString getImplName(); + static uno::Sequence< OUString > getServiceNames(); + static OUString getImplName(); // Allows runtime exceptions to be thrown by const methods inline SAL_CALL operator uno::Reference< uno::XInterface > () const @@ -81,11 +81,11 @@ public: throw (lang::IllegalArgumentException, uno::Exception); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (uno::RuntimeException); - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // XEventListener @@ -162,20 +162,20 @@ UpdateCheckJob::~UpdateCheckJob() //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > UpdateCheckJob::getServiceNames() { - uno::Sequence< rtl::OUString > aServiceList(1); + uno::Sequence< OUString > aServiceList(1); aServiceList[0] = "com.sun.star.setup.UpdateCheck"; return aServiceList; }; //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckJob::getImplName() { - return rtl::OUString("vnd.sun.UpdateCheck"); + return OUString("vnd.sun.UpdateCheck"); } @@ -214,7 +214,7 @@ UpdateCheckJob::execute(const uno::Sequence& namedValues) uno::Sequence aEnvironment = getValue< uno::Sequence > (namedValues, "Environment"); - rtl::OUString aEventName = getValue< rtl::OUString > (aEnvironment, "EventName"); + OUString aEventName = getValue< OUString > (aEnvironment, "EventName"); m_pInitThread.reset( new InitUpdateCheckJobThread( @@ -228,8 +228,8 @@ UpdateCheckJob::execute(const uno::Sequence& namedValues) void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp ) { try { - uno::Sequence< uno::Sequence< rtl::OUString > > aList = - getValue< uno::Sequence< uno::Sequence< rtl::OUString > > > ( rListProp, "updateList" ); + uno::Sequence< uno::Sequence< OUString > > aList = + getValue< uno::Sequence< uno::Sequence< OUString > > > ( rListProp, "updateList" ); bool bPrepareOnly = getValue< bool > ( rListProp, "prepareOnly" ); // we will first store any new found updates and then check, if there are any @@ -258,13 +258,13 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa catch( const uno::Exception& e ) { OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); } } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL +OUString SAL_CALL UpdateCheckJob::getImplementationName() throw (uno::RuntimeException) { return getImplName(); @@ -272,7 +272,7 @@ UpdateCheckJob::getImplementationName() throw (uno::RuntimeException) //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException) { return getServiceNames(); @@ -281,9 +281,9 @@ UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException) //------------------------------------------------------------------------------ sal_Bool SAL_CALL -UpdateCheckJob::supportsService( rtl::OUString const & serviceName ) throw (uno::RuntimeException) +UpdateCheckJob::supportsService( OUString const & serviceName ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > aServiceNameList = getServiceNames(); + uno::Sequence< OUString > aServiceNameList = getServiceNames(); for( sal_Int32 n=0; n < aServiceNameList.getLength(); n++ ) if( aServiceNameList[n].equals(serviceName) ) diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 4ed0a20f1b35..0bb52c1cb138 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -144,13 +144,13 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots ) if ( mbDownloadBtnHasDots != bAppendDots ) { - rtl::OUString aLabel( msDownload ); + OUString aLabel( msDownload ); if ( bAppendDots ) aLabel += "..."; setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "Label", uno::Any( aLabel ) ); - setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); + setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); mbDownloadBtnHasDots = bAppendDots; } @@ -242,29 +242,29 @@ void UpdateHandler::setProgress( sal_Int32 nPercent ) } //-------------------------------------------------------------------- -void UpdateHandler::setErrorMessage( const rtl::OUString& rErrorMsg ) +void UpdateHandler::setErrorMessage( const OUString& rErrorMsg ) { setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( rErrorMsg ) ); } //-------------------------------------------------------------------- -void UpdateHandler::setDownloadFile( const rtl::OUString& rFilePath ) +void UpdateHandler::setDownloadFile( const OUString& rFilePath ) { sal_Int32 nLast = rFilePath.lastIndexOf( '/' ); if ( nLast != -1 ) { msDownloadFile = rFilePath.copy( nLast+1 ); - const rtl::OUString aDownloadURL = rFilePath.copy( 0, nLast ); + const OUString aDownloadURL = rFilePath.copy( 0, nLast ); osl::FileBase::getSystemPathFromFileURL( aDownloadURL, msDownloadPath ); } } //-------------------------------------------------------------------- -rtl::OUString UpdateHandler::getBubbleText( UpdateState eState ) +OUString UpdateHandler::getBubbleText( UpdateState eState ) { osl::MutexGuard aGuard( maMutex ); - rtl::OUString sText; + OUString sText; sal_Int32 nIndex = (sal_Int32) eState; loadStrings(); @@ -276,11 +276,11 @@ rtl::OUString UpdateHandler::getBubbleText( UpdateState eState ) } //-------------------------------------------------------------------- -rtl::OUString UpdateHandler::getBubbleTitle( UpdateState eState ) +OUString UpdateHandler::getBubbleTitle( UpdateState eState ) { osl::MutexGuard aGuard( maMutex ); - rtl::OUString sText; + OUString sText; sal_Int32 nIndex = (sal_Int32) eState; loadStrings(); @@ -292,7 +292,7 @@ rtl::OUString UpdateHandler::getBubbleTitle( UpdateState eState ) } //-------------------------------------------------------------------- -rtl::OUString UpdateHandler::getDefaultInstErrMsg() +OUString UpdateHandler::getDefaultInstErrMsg() { osl::MutexGuard aGuard( maMutex ); @@ -445,7 +445,7 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest > } uno::Reference< task::XInteractionRequestStringResolver > xStrResolver = task::InteractionRequestStringResolver::create( mxContext ); - beans::Optional< ::rtl::OUString > aErrorText = xStrResolver->getStringFromInformationalRequest( rRequest ); + beans::Optional< OUString > aErrorText = xStrResolver->getStringFromInformationalRequest( rRequest ); if ( aErrorText.IsPresent ) { setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( aErrorText.Value ) ); @@ -518,7 +518,7 @@ void UpdateHandler::updateState( UpdateState eState ) if ( isVisible() ) {} // ToTop(); - rtl::OUString sText; + OUString sText; switch ( eState ) { @@ -526,7 +526,7 @@ void UpdateHandler::updateState( UpdateState eState ) showControls( (1< xBundle, +OUString UpdateHandler::loadString( const uno::Reference< resource::XResourceBundle > xBundle, sal_Int32 nResourceId ) const { - rtl::OUString sString; - rtl::OUString sKey = "string:" + rtl::OUString::valueOf( nResourceId ); + OUString sString; + OUString sKey = "string:" + OUString::valueOf( nResourceId ); try { @@ -643,14 +643,14 @@ rtl::OUString UpdateHandler::loadString( const uno::Reference< resource::XResour return sString; } -rtl::OUString UpdateHandler::substVariables( const rtl::OUString &rSource ) const +OUString UpdateHandler::substVariables( const OUString &rSource ) const { - rtl::OUString sString( rSource ); + OUString sString( rSource ); searchAndReplaceAll( sString, "%NEXTVERSION", msNextVersion ); searchAndReplaceAll( sString, "%DOWNLOAD_PATH", msDownloadPath ); searchAndReplaceAll( sString, "%FILE_NAME", msDownloadFile ); - searchAndReplaceAll( sString, "%PERCENT", rtl::OUString::valueOf( mnPercent ) ); + searchAndReplaceAll( sString, "%PERCENT", OUString::valueOf( mnPercent ) ); return sString; } @@ -737,7 +737,7 @@ void UpdateHandler::loadStrings() for ( int i=0; i < BUTTON_COUNT; i++ ) { - msButtonIDs[ i ] = "BUTTON_" + rtl::OUString::valueOf( (sal_Int32) i ); + msButtonIDs[ i ] = "BUTTON_" + OUString::valueOf( (sal_Int32) i ); } } @@ -762,8 +762,8 @@ void UpdateHandler::startThrobber( bool bStart ) } //-------------------------------------------------------------------- -void UpdateHandler::setControlProperty( const rtl::OUString &rCtrlName, - const rtl::OUString &rPropName, +void UpdateHandler::setControlProperty( const OUString &rCtrlName, + const OUString &rPropName, const uno::Any &rPropValue ) { if ( !mxUpdDlg.is() ) return; @@ -783,7 +783,7 @@ void UpdateHandler::setControlProperty( const rtl::OUString &rCtrlName, } //-------------------------------------------------------------------- -void UpdateHandler::showControl( const rtl::OUString &rCtrlName, bool bShow ) +void UpdateHandler::showControl( const OUString &rCtrlName, bool bShow ) { uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY ); @@ -818,8 +818,8 @@ void UpdateHandler::focusControl( DialogControls eID ) //-------------------------------------------------------------------- void UpdateHandler::insertControlModel( uno::Reference< awt::XControlModel > & rxDialogModel, - rtl::OUString const & rServiceName, - rtl::OUString const & rControlName, + OUString const & rServiceName, + OUString const & rControlName, awt::Rectangle const & rPosSize, uno::Sequence< beans::NamedValue > const & rProps ) { @@ -845,7 +845,7 @@ void UpdateHandler::insertControlModel( uno::Reference< awt::XControlModel > & r } //-------------------------------------------------------------------- -void UpdateHandler::setFullVersion( rtl::OUString& rString ) +void UpdateHandler::setFullVersion( OUString& rString ) { uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider( com::sun::star::configuration::theDefaultProvider::get( mxContext ) ); @@ -863,19 +863,19 @@ void UpdateHandler::setFullVersion( rtl::OUString& rString ) uno::Reference< container::XNameAccess > xNameAccess( xConfigAccess, uno::UNO_QUERY_THROW ); - rtl::OUString aProductVersion; + OUString aProductVersion; xNameAccess->getByName("ooSetupVersion") >>= aProductVersion; sal_Int32 nVerIndex = rString.indexOf( aProductVersion ); if ( nVerIndex != -1 ) { - rtl::OUString aProductFullVersion; + OUString aProductFullVersion; xNameAccess->getByName("ooSetupVersionAboutBox") >>= aProductFullVersion; rString = rString.replaceAt( nVerIndex, aProductVersion.getLength(), aProductFullVersion ); } } //-------------------------------------------------------------------- -bool UpdateHandler::showWarning( const rtl::OUString &rWarningText ) const +bool UpdateHandler::showWarning( const OUString &rWarningText ) const { bool bRet = false; @@ -922,9 +922,9 @@ bool UpdateHandler::showWarning( const rtl::OUString &rWarningText ) const } //-------------------------------------------------------------------- -bool UpdateHandler::showWarning( const rtl::OUString &rWarningText, - const rtl::OUString &rBtnText_1, - const rtl::OUString &rBtnText_2 ) const +bool UpdateHandler::showWarning( const OUString &rWarningText, + const OUString &rBtnText_1, + const OUString &rBtnText_2 ) const { bool bRet = false; @@ -993,9 +993,9 @@ bool UpdateHandler::showWarning( const rtl::OUString &rWarningText, } //-------------------------------------------------------------------- -bool UpdateHandler::showOverwriteWarning( const rtl::OUString& rFileName ) const +bool UpdateHandler::showOverwriteWarning( const OUString& rFileName ) const { - rtl::OUString aMsg( msReloadWarning ); + OUString aMsg( msReloadWarning ); searchAndReplaceAll( aMsg, "%FILENAME", rFileName ); searchAndReplaceAll( aMsg, "%DOWNLOAD_PATH", msDownloadPath ); return showWarning( aMsg, msReloadContinue, msReloadReload ); @@ -1109,7 +1109,7 @@ void UpdateHandler::createDialog() xPropSet->setPropertyValue( "PositionY", uno::Any(sal_Int32( 100 )) ); xPropSet->setPropertyValue( "Width", uno::Any(sal_Int32( DIALOG_WIDTH )) ); xPropSet->setPropertyValue( "Height", uno::Any(sal_Int32( DIALOG_HEIGHT )) ); - xPropSet->setPropertyValue( "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) ); + xPropSet->setPropertyValue( "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) ); } { // Label (fixed text) uno::Sequence< beans::NamedValue > aProps(1); @@ -1136,7 +1136,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 3, "MultiLine", uno::Any( true ) ); setProperty( aProps, 4, "ReadOnly", uno::Any( true ) ); setProperty( aProps, 5, "AutoVScroll", uno::Any( true ) ); - setProperty( aProps, 6, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) ); + setProperty( aProps, 6, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1167,7 +1167,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, "Enabled", uno::Any( true ) ); setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, "Label", uno::Any( msPauseBtn ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[PAUSE_BUTTON], awt::Rectangle( BOX1_BTN_X, BOX1_BTN_Y, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1180,7 +1180,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, "Enabled", uno::Any( true ) ); setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, "Label", uno::Any( msResumeBtn ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1196,7 +1196,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, "Enabled", uno::Any( true ) ); setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, "Label", uno::Any( msCancelBtn ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1224,13 +1224,13 @@ void UpdateHandler::createDialog() { // Text (MultiLineEdit) uno::Sequence< beans::NamedValue > aProps(7); - setProperty( aProps, 0, "Text", uno::Any( rtl::OUString() ) ); + setProperty( aProps, 0, "Text", uno::Any( OUString() ) ); setProperty( aProps, 1, "Border", uno::Any( sal_Int16( 0 ) ) ); setProperty( aProps, 2, "PaintTransparent", uno::Any( true ) ); setProperty( aProps, 3, "MultiLine", uno::Any( true ) ); setProperty( aProps, 4, "ReadOnly", uno::Any( true ) ); setProperty( aProps, 5, "AutoVScroll", uno::Any( true ) ); - setProperty( aProps, 6, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); + setProperty( aProps, 6, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1260,7 +1260,7 @@ void UpdateHandler::createDialog() // setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) ); // [property] string Label // only if PushButtonType_STANDARD setProperty( aProps, 3, "Label", uno::Any( msClose ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[ CLOSE_BUTTON ], awt::Rectangle( CLOSE_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1273,7 +1273,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, "Enabled", uno::Any( true ) ); setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, "Label", uno::Any( msInstall ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[INSTALL_BUTTON], awt::Rectangle( INSTALL_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1286,7 +1286,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, "Enabled", uno::Any( true ) ); setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, "Label", uno::Any( msDownload ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[DOWNLOAD_BUTTON], awt::Rectangle( DOWNLOAD_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index e6ff02e1eaaa..39804a734332 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -92,71 +92,71 @@ private: osl::Mutex maMutex; - rtl::OUString msNextVersion; - rtl::OUString msDownloadPath; - rtl::OUString msDownloadFile; - rtl::OUString msDescriptionMsg; - rtl::OUString msChecking; // RID_UPDATE_STR_CHECKING - rtl::OUString msCheckingError; // RID_UPDATE_STR_CHECKING_ERR - rtl::OUString msNoUpdFound; // RID_UPDATE_STR_NO_UPD_FOUND - rtl::OUString msUpdFound; // RID_UPDATE_STR_UPD_FOUND - rtl::OUString msDlgTitle; // RID_UPDATE_STR_DLG_TITLE - rtl::OUString msDownloadPause; // RID_UPDATE_STR_DOWNLOAD_PAUSE - rtl::OUString msDownloadError; // RID_UPDATE_STR_DOWNLOAD_ERR - rtl::OUString msDownloadWarning; // RID_UPDATE_STR_DOWNLOAD_WARN - rtl::OUString msDownloadDescr; // RID_UPDATE_STR_DOWNLOAD_WARN - rtl::OUString msDownloadNotAvail; // RID_UPDATE_STR_DOWNLOAD_UNAVAIL - rtl::OUString msDownloading; // RID_UPDATE_STR_DOWNLOADING - rtl::OUString msReady2Install; // RID_UPDATE_STR_READY_INSTALL - rtl::OUString msCancelTitle; // RID_UPDATE_STR_CANCEL_TITLE - rtl::OUString msCancelMessage; // RID_UPDATE_STR_CANCEL_DOWNLOAD - rtl::OUString msInstallMessage; // RID_UPDATE_STR_BEGIN_INSTALL - rtl::OUString msInstallNow; // RID_UPDATE_STR_INSTALL_NOW - rtl::OUString msInstallLater; // RID_UPDATE_STR_INSTALL_LATER - rtl::OUString msInstallError; // RID_UPDATE_STR_INSTALL_ERROR - rtl::OUString msOverwriteWarning; // RID_UPDATE_STR_OVERWRITE_WARNING - rtl::OUString msPercent; // RID_UPDATE_STR_PERCENT - rtl::OUString msReloadWarning; // RID_UPDATE_STR_OVERWRITE_WARNING - rtl::OUString msReloadReload; // RID_UPDATE_STR_OVERWRITE_WARNING - rtl::OUString msReloadContinue; // RID_UPDATE_STR_OVERWRITE_WARNING - rtl::OUString msStatusFL; // RID_UPDATE_FT_STATUS - rtl::OUString msDescription; // RID_UPDATE_FT_DESCRIPTION - rtl::OUString msClose; // RID_UPDATE_BTN_CLOSE - rtl::OUString msDownload; // RID_UPDATE_BTN_DOWNLOAD - rtl::OUString msInstall; // RID_UPDATE_BTN_INSTALL - rtl::OUString msPauseBtn; // RID_UPDATE_BTN_PAUSE - rtl::OUString msResumeBtn; // RID_UPDATE_BTN_RESUME - rtl::OUString msCancelBtn; // RID_UPDATE_BTN_CANCEL - rtl::OUString msButtonIDs[ BUTTON_COUNT ]; - rtl::OUString msBubbleTexts[ UPDATESTATES_COUNT ]; - rtl::OUString msBubbleTitles[ UPDATESTATES_COUNT ]; + OUString msNextVersion; + OUString msDownloadPath; + OUString msDownloadFile; + OUString msDescriptionMsg; + OUString msChecking; // RID_UPDATE_STR_CHECKING + OUString msCheckingError; // RID_UPDATE_STR_CHECKING_ERR + OUString msNoUpdFound; // RID_UPDATE_STR_NO_UPD_FOUND + OUString msUpdFound; // RID_UPDATE_STR_UPD_FOUND + OUString msDlgTitle; // RID_UPDATE_STR_DLG_TITLE + OUString msDownloadPause; // RID_UPDATE_STR_DOWNLOAD_PAUSE + OUString msDownloadError; // RID_UPDATE_STR_DOWNLOAD_ERR + OUString msDownloadWarning; // RID_UPDATE_STR_DOWNLOAD_WARN + OUString msDownloadDescr; // RID_UPDATE_STR_DOWNLOAD_WARN + OUString msDownloadNotAvail; // RID_UPDATE_STR_DOWNLOAD_UNAVAIL + OUString msDownloading; // RID_UPDATE_STR_DOWNLOADING + OUString msReady2Install; // RID_UPDATE_STR_READY_INSTALL + OUString msCancelTitle; // RID_UPDATE_STR_CANCEL_TITLE + OUString msCancelMessage; // RID_UPDATE_STR_CANCEL_DOWNLOAD + OUString msInstallMessage; // RID_UPDATE_STR_BEGIN_INSTALL + OUString msInstallNow; // RID_UPDATE_STR_INSTALL_NOW + OUString msInstallLater; // RID_UPDATE_STR_INSTALL_LATER + OUString msInstallError; // RID_UPDATE_STR_INSTALL_ERROR + OUString msOverwriteWarning; // RID_UPDATE_STR_OVERWRITE_WARNING + OUString msPercent; // RID_UPDATE_STR_PERCENT + OUString msReloadWarning; // RID_UPDATE_STR_OVERWRITE_WARNING + OUString msReloadReload; // RID_UPDATE_STR_OVERWRITE_WARNING + OUString msReloadContinue; // RID_UPDATE_STR_OVERWRITE_WARNING + OUString msStatusFL; // RID_UPDATE_FT_STATUS + OUString msDescription; // RID_UPDATE_FT_DESCRIPTION + OUString msClose; // RID_UPDATE_BTN_CLOSE + OUString msDownload; // RID_UPDATE_BTN_DOWNLOAD + OUString msInstall; // RID_UPDATE_BTN_INSTALL + OUString msPauseBtn; // RID_UPDATE_BTN_PAUSE + OUString msResumeBtn; // RID_UPDATE_BTN_RESUME + OUString msCancelBtn; // RID_UPDATE_BTN_CANCEL + OUString msButtonIDs[ BUTTON_COUNT ]; + OUString msBubbleTexts[ UPDATESTATES_COUNT ]; + OUString msBubbleTitles[ UPDATESTATES_COUNT ]; void createDialog(); void updateState( UpdateState eNewState ); void startThrobber( bool bStart = true ); - void setControlProperty( const rtl::OUString &rCtrlName, - const rtl::OUString &rPropName, + void setControlProperty( const OUString &rCtrlName, + const OUString &rPropName, const com::sun::star::uno::Any &rPropValue ); - void showControl( const rtl::OUString &rCtrlName, bool bShow = true ); + void showControl( const OUString &rCtrlName, bool bShow = true ); void showControls( short nControls ); void focusControl( DialogControls eID ); void enableControls( short nCtrlState ); void setDownloadBtnLabel( bool bAppendDots ); void loadStrings(); - rtl::OUString loadString( const com::sun::star::uno::Reference< com::sun::star::resource::XResourceBundle > xBundle, + OUString loadString( const com::sun::star::uno::Reference< com::sun::star::resource::XResourceBundle > xBundle, sal_Int32 nResourceId ) const; - rtl::OUString substVariables( const rtl::OUString &rSource ) const; + OUString substVariables( const OUString &rSource ) const; static void setProperty( com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > &rProps, - const int nIndex, const rtl::OUString &rPropName, const com::sun::star::uno::Any &rPropValue ) + const int nIndex, const OUString &rPropName, const com::sun::star::uno::Any &rPropValue ) { rProps[ nIndex ].Name = rPropName; rProps[ nIndex ].Value = rPropValue; } static void insertControlModel( com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > & rxDialogModel, - rtl::OUString const & rServiceName, - rtl::OUString const & rControlName, + OUString const & rServiceName, + OUString const & rControlName, com::sun::star::awt::Rectangle const & rPosSize, com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > const & rProps ); - void setFullVersion( rtl::OUString& rString ); - void searchAndReplaceAll( rtl::OUString &rText, const rtl::OUString &rWhat, const rtl::OUString &rWith ) const; + void setFullVersion( OUString& rString ); + void searchAndReplaceAll( OUString &rText, const OUString &rWhat, const OUString &rWith ) const; public: UpdateHandler( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext, @@ -167,19 +167,19 @@ public: bool isMinimized() const { return mbMinimized; } void setVisible( bool bVisible = true ); void setProgress( sal_Int32 nPercent ); - void setNextVersion( const rtl::OUString &rNextVersion ) { msNextVersion = rNextVersion; } - void setDownloadPath( const rtl::OUString &rPath ) { msDownloadPath = rPath; } - void setDownloadFile( const rtl::OUString &rPath ); - void setErrorMessage( const rtl::OUString &rErrorMsg ); - void setDescription( const rtl::OUString &rDescription ){ msDescriptionMsg = rDescription; } + void setNextVersion( const OUString &rNextVersion ) { msNextVersion = rNextVersion; } + void setDownloadPath( const OUString &rPath ) { msDownloadPath = rPath; } + void setDownloadFile( const OUString &rPath ); + void setErrorMessage( const OUString &rErrorMsg ); + void setDescription( const OUString &rDescription ){ msDescriptionMsg = rDescription; } void setState( UpdateState eState ); - rtl::OUString getBubbleText( UpdateState eState ); - rtl::OUString getBubbleTitle( UpdateState eState ); - rtl::OUString getDefaultInstErrMsg(); - bool showWarning( const rtl::OUString &rWarning ) const; - bool showWarning( const rtl::OUString &rWarning, const rtl::OUString& rBtnText_1, const rtl::OUString& rBtnText_2 ) const; - bool showOverwriteWarning( const rtl::OUString &rFileName ) const; + OUString getBubbleText( UpdateState eState ); + OUString getBubbleTitle( UpdateState eState ); + OUString getDefaultInstErrMsg(); + bool showWarning( const OUString &rWarning ) const; + bool showWarning( const OUString &rWarning, const OUString& rBtnText_1, const OUString& rBtnText_2 ) const; + bool showOverwriteWarning( const OUString &rFileName ) const; bool showOverwriteWarning() const; // Allows runtime exceptions to be thrown by const methods diff --git a/extensions/source/update/check/updateinfo.hxx b/extensions/source/update/check/updateinfo.hxx index 1e23d9b5be16..67acd557be0c 100644 --- a/extensions/source/update/check/updateinfo.hxx +++ b/extensions/source/update/check/updateinfo.hxx @@ -26,9 +26,9 @@ struct DownloadSource { bool IsDirect; - rtl::OUString URL; + OUString URL; - DownloadSource(bool bIsDirect, const rtl::OUString& aURL) : IsDirect(bIsDirect), URL(aURL) {}; + DownloadSource(bool bIsDirect, const OUString& aURL) : IsDirect(bIsDirect), URL(aURL) {}; DownloadSource(const DownloadSource& ds) : IsDirect(ds.IsDirect), URL(ds.URL) {}; DownloadSource & operator=( const DownloadSource & ds ) { IsDirect = ds.IsDirect; URL = ds.URL; return *this; }; @@ -37,12 +37,12 @@ struct DownloadSource struct ReleaseNote { sal_uInt8 Pos; - rtl::OUString URL; + OUString URL; sal_uInt8 Pos2; - rtl::OUString URL2; + OUString URL2; - ReleaseNote(sal_uInt8 pos, const rtl::OUString aURL) : Pos(pos), URL(aURL), Pos2(0), URL2() {}; - ReleaseNote(sal_uInt8 pos, const rtl::OUString aURL, sal_uInt8 pos2, const rtl::OUString aURL2) : Pos(pos), URL(aURL), Pos2(pos2), URL2(aURL2) {}; + ReleaseNote(sal_uInt8 pos, const OUString aURL) : Pos(pos), URL(aURL), Pos2(0), URL2() {}; + ReleaseNote(sal_uInt8 pos, const OUString aURL, sal_uInt8 pos2, const OUString aURL2) : Pos(pos), URL(aURL), Pos2(pos2), URL2(aURL2) {}; ReleaseNote(const ReleaseNote& rn) :Pos(rn.Pos), URL(rn.URL), Pos2(rn.Pos2), URL2(rn.URL2) {}; ReleaseNote & operator=( const ReleaseNote& rn) { Pos=rn.Pos; URL=rn.URL; Pos2=rn.Pos2; URL2=rn.URL2; return *this; }; @@ -50,9 +50,9 @@ struct ReleaseNote struct UpdateInfo { - rtl::OUString BuildId; - rtl::OUString Version; - rtl::OUString Description; + OUString BuildId; + OUString Version; + OUString Description; std::vector< DownloadSource > Sources; std::vector< ReleaseNote > ReleaseNotes; @@ -73,7 +73,7 @@ UpdateInfo & UpdateInfo::operator=( const UpdateInfo& ui ) // Returns the URL of the release note for the given position -rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled=false); +OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled=false); #endif diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index 48730b6b76e7..59ef0d935364 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -46,9 +46,9 @@ namespace xml = css::xml ; static bool getBootstrapData( - uno::Sequence< ::rtl::OUString > & rRepositoryList, - ::rtl::OUString & rGitID, - ::rtl::OUString & rInstallSetID) + uno::Sequence< OUString > & rRepositoryList, + OUString & rGitID, + OUString & rInstallSetID) { rGitID = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"; rtl::Bootstrap::expandMacros( rGitID ); @@ -84,15 +84,15 @@ checkForUpdates( { OSL_TRACE("checking for updates .."); - ::rtl::OUString myArch; - ::rtl::OUString myOS; + OUString myArch; + OUString myOS; rtl::Bootstrap::get("_OS", myOS); rtl::Bootstrap::get("_ARCH", myArch); - uno::Sequence< ::rtl::OUString > aRepositoryList; - ::rtl::OUString aGitID; - ::rtl::OUString aInstallSetID; + uno::Sequence< OUString > aRepositoryList; + OUString aGitID; + OUString aInstallSetID; if( ! ( getBootstrapData(aRepositoryList, aGitID, aInstallSetID) && (aRepositoryList.getLength() > 0) ) ) return false; @@ -108,11 +108,11 @@ checkForUpdates( const uno::Reference< uno::XComponentContext > & rxContext, const uno::Reference< task::XInteractionHandler > & rxInteractionHandler, const uno::Reference< deployment::XUpdateInformationProvider >& rUpdateInfoProvider, - const rtl::OUString &rOS, - const rtl::OUString &rArch, - const uno::Sequence< rtl::OUString > &rRepositoryList, - const rtl::OUString &rGitID, - const rtl::OUString &rInstallSetID ) + const OUString &rOS, + const OUString &rArch, + const uno::Sequence< OUString > &rRepositoryList, + const OUString &rGitID, + const OUString &rInstallSetID ) { if( !rxContext.is() ) throw uno::RuntimeException( @@ -136,7 +136,7 @@ checkForUpdates( if ( !aUpdateInfoEnumeration.is() ) return false; // something went wrong .. - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii("/child::inst:description[inst:os=\'"); aBuffer.append( rOS ); aBuffer.appendAscii("\' and inst:arch=\'"); @@ -145,7 +145,7 @@ checkForUpdates( aBuffer.append( rGitID ); aBuffer.appendAscii("\']"); - rtl::OUString aXPathExpression = aBuffer.makeStringAndClear(); + OUString aXPathExpression = aBuffer.makeStringAndClear(); while( aUpdateInfoEnumeration->hasMoreElements() ) { @@ -170,7 +170,7 @@ checkForUpdates( if( xNode2.is() ) { uno::Reference< xml::dom::XElement > xParent(xNode2->getParentNode(), uno::UNO_QUERY_THROW); - rtl::OUString aType = xParent->getAttribute("type"); + OUString aType = xParent->getAttribute("type"); bool bIsDirect = ( sal_False == aType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("text/html")) ); o_rUpdateInfo.Sources.push_back( DownloadSource(bIsDirect, xNode2->getNodeValue()) ); @@ -243,7 +243,7 @@ checkForUpdates( //------------------------------------------------------------------------------ bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > & rxContext, - const uno::Sequence< uno::Sequence< rtl::OUString > > &rUpdateInfos ) + const uno::Sequence< uno::Sequence< OUString > > &rUpdateInfos ) { bool bNotify = false; @@ -264,7 +264,7 @@ bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > & bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & rxContext ) { - uno::Sequence< uno::Sequence< rtl::OUString > > aUpdateList; + uno::Sequence< uno::Sequence< OUString > > aUpdateList; uno::Reference< deployment::XPackageInformationProvider > xInfoProvider; try @@ -280,7 +280,7 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & if ( !xInfoProvider.is() ) return false; - aUpdateList = xInfoProvider->isUpdateAvailable( ::rtl::OUString() ); + aUpdateList = xInfoProvider->isUpdateAvailable( OUString() ); bool bNotify = storeExtensionUpdateInfos( rxContext, aUpdateList ); return bNotify; @@ -291,7 +291,7 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & bool checkForPendingUpdates( const uno::Reference< uno::XComponentContext > & rxContext ) { - uno::Sequence< uno::Sequence< rtl::OUString > > aExtensionList; + uno::Sequence< uno::Sequence< OUString > > aExtensionList; uno::Reference< deployment::XPackageInformationProvider > xInfoProvider; try { diff --git a/extensions/source/update/check/updateprotocol.hxx b/extensions/source/update/check/updateprotocol.hxx index 915379d9e4b1..6e6ba3038daf 100644 --- a/extensions/source/update/check/updateprotocol.hxx +++ b/extensions/source/update/check/updateprotocol.hxx @@ -39,11 +39,11 @@ checkForUpdates( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > & rxInteractionHandler, const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XUpdateInformationProvider >& rUpdateInfoProvider, - const rtl::OUString &rOS, - const rtl::OUString &rArch, - const ::com::sun::star::uno::Sequence< rtl::OUString > &rRepositoryList, - const rtl::OUString &rGitID, - const rtl::OUString &rInstallID + const OUString &rOS, + const OUString &rArch, + const ::com::sun::star::uno::Sequence< OUString > &rRepositoryList, + const OUString &rGitID, + const OUString &rInstallID ); // Returns 'true' if there are updates for any extension @@ -57,7 +57,7 @@ bool checkForPendingUpdates( bool storeExtensionUpdateInfos( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< rtl::OUString > > &rUpdateInfos + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > &rUpdateInfos ); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx index fa82e9e742e9..60cbe243157a 100644 --- a/extensions/source/update/check/updateprotocoltest.cxx +++ b/extensions/source/update/check/updateprotocoltest.cxx @@ -52,8 +52,8 @@ SAL_IMPLEMENT_MAIN() com::sun::star::ucb::UniversalContentBroker::create(rComponentContext); - rtl::OUString aURL; - rtl::OUString aVersion; + OUString aURL; + OUString aVersion; try { diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index fdea48d79433..d45b7f2d2c8d 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.cxx @@ -61,11 +61,11 @@ SAL_IMPLEMENT_MAIN() uno::Reference< deployment::XUpdateInformationProvider > rUpdateInformationProvider = deployment::UpdateInformationProvider::create( rComponentContext ); - uno::Sequence< rtl::OUString > theURLs(1); + uno::Sequence< OUString > theURLs(1); osl_getCommandArg( 0, &theURLs[0].pData ); // theURLs[0] = "http://localhost/~olli/atomfeed.xml"; - rtl::OUString aExtension = "MyExtension"; + OUString aExtension = "MyExtension"; try { @@ -76,7 +76,7 @@ SAL_IMPLEMENT_MAIN() } catch( const uno::Exception & e ) { - OSL_TRACE( "exception caught: %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr()); + OSL_TRACE( "exception caught: %s", OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr()); } catch( ... ) { diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index e83ae0cec319..ad971025c211 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -140,18 +140,18 @@ class UpdateInformationProvider : public: static uno::Reference< uno::XInterface > createInstance(const uno::Reference& xContext); - static uno::Sequence< rtl::OUString > getServiceNames(); - static rtl::OUString getImplName(); + static uno::Sequence< OUString > getServiceNames(); + static OUString getImplName(); uno::Reference< xml::dom::XElement > getDocumentRoot(const uno::Reference< xml::dom::XNode >& rxNode); - uno::Reference< xml::dom::XNode > getChildNode(const uno::Reference< xml::dom::XNode >& rxNode, const rtl::OUString& rName); + uno::Reference< xml::dom::XNode > getChildNode(const uno::Reference< xml::dom::XNode >& rxNode, const OUString& rName); // XUpdateInformationService virtual uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL getUpdateInformation( - uno::Sequence< rtl::OUString > const & repositories, - rtl::OUString const & extensionId + uno::Sequence< OUString > const & repositories, + OUString const & extensionId ) throw (uno::Exception, uno::RuntimeException); virtual void SAL_CALL cancel() @@ -163,8 +163,8 @@ public: virtual uno::Reference< container::XEnumeration > SAL_CALL getUpdateInformationEnumeration( - uno::Sequence< rtl::OUString > const & repositories, - rtl::OUString const & extensionId + uno::Sequence< OUString > const & repositories, + OUString const & extensionId ) throw (uno::Exception, uno::RuntimeException); // XCommandEnvironment @@ -176,24 +176,24 @@ public: // XWebDAVCommandEnvironment virtual uno::Sequence< beans::NamedValue > SAL_CALL getUserRequestHeaders( - const rtl::OUString&, const rtl::OUString& ) + const OUString&, const OUString& ) throw ( uno::RuntimeException ) { return m_aRequestHeaderList; }; // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (uno::RuntimeException); - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); protected: virtual ~UpdateInformationProvider(); - static uno::Any getConfigurationItem(uno::Reference const & configurationProvider, rtl::OUString const & node, rtl::OUString const & item); + static uno::Any getConfigurationItem(uno::Reference const & configurationProvider, OUString const & node, OUString const & item); private: - uno::Reference< io::XInputStream > load(const rtl::OUString& rURL); + uno::Reference< io::XInputStream > load(const OUString& rURL); void storeCommandInfo( sal_Int32 nCommandId, uno::Reference< ucb::XCommandProcessor > const & rxCommandProcessor); @@ -245,7 +245,7 @@ public: OSL_ASSERT( m_xUpdateInformationProvider.is() ); if( !(m_nCount < m_nNodes ) ) - throw container::NoSuchElementException(rtl::OUString::valueOf(m_nCount), *this); + throw container::NoSuchElementException(OUString::valueOf(m_nCount), *this); try { @@ -302,7 +302,7 @@ public: uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if( m_nCount > 0 ) - throw container::NoSuchElementException(rtl::OUString::valueOf(m_nCount), *this); + throw container::NoSuchElementException(OUString::valueOf(m_nCount), *this); ++m_nCount; return uno::makeAny(m_aEntry); @@ -328,21 +328,21 @@ UpdateInformationProvider::UpdateInformationProvider( uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider( com::sun::star::configuration::theDefaultProvider::get(xContext)); - rtl::OUStringBuffer buf; - rtl::OUString name; + OUStringBuffer buf; + OUString name; getConfigurationItem( xConfigurationProvider, "org.openoffice.Setup/Product", "ooName") >>= name; buf.append(name); buf.append(sal_Unicode(' ')); - rtl::OUString version; + OUString version; getConfigurationItem( xConfigurationProvider, "org.openoffice.Setup/Product", "ooSetupVersion") >>= version; buf.append(version); - rtl::OUString edition( + OUString edition( "${${BRAND_BASE_DIR}/program/edition/edition.ini:" "EDITIONNAME}"); rtl::Bootstrap::expandMacros(edition); @@ -350,7 +350,7 @@ UpdateInformationProvider::UpdateInformationProvider( buf.append(sal_Unicode(' ')); buf.append(edition); } - rtl::OUString extension; + OUString extension; getConfigurationItem( xConfigurationProvider, "org.openoffice.Setup/Product", @@ -358,9 +358,9 @@ UpdateInformationProvider::UpdateInformationProvider( if (!extension.isEmpty()) { buf.append(extension); } - rtl::OUString product(buf.makeStringAndClear()); + OUString product(buf.makeStringAndClear()); - rtl::OUString aUserAgent( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ); + OUString aUserAgent( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ); rtl::Bootstrap::expandMacros( aUserAgent ); for (sal_Int32 i = 0;;) { @@ -412,7 +412,7 @@ UpdateInformationProvider::~UpdateInformationProvider() //------------------------------------------------------------------------------ uno::Any -UpdateInformationProvider::getConfigurationItem(uno::Reference const & configurationProvider, rtl::OUString const & node, rtl::OUString const & item) +UpdateInformationProvider::getConfigurationItem(uno::Reference const & configurationProvider, OUString const & node, OUString const & item) { beans::NamedValue aProperty; aProperty.Name = "nodepath"; @@ -446,7 +446,7 @@ UpdateInformationProvider::storeCommandInfo( //------------------------------------------------------------------------------ uno::Reference< io::XInputStream > -UpdateInformationProvider::load(const rtl::OUString& rURL) +UpdateInformationProvider::load(const OUString& rURL) { uno::Reference< ucb::XContentIdentifier > xId = m_xUniversalContentBroker->createContentIdentifier(rURL); @@ -551,7 +551,7 @@ UpdateInformationProvider::getDocumentRoot(const uno::Reference< xml::dom::XNode uno::Reference< xml::dom::XNode > UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& rxNode, - const rtl::OUString& rName) + const OUString& rName) { OSL_ASSERT(m_xXPathAPI.is()); try { @@ -566,8 +566,8 @@ UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& uno::Reference< container::XEnumeration > SAL_CALL UpdateInformationProvider::getUpdateInformationEnumeration( - uno::Sequence< rtl::OUString > const & repositories, - rtl::OUString const & extensionId + uno::Sequence< OUString > const & repositories, + OUString const & extensionId ) throw (uno::Exception, uno::RuntimeException) { OSL_ASSERT(m_xDocumentBuilder.is()); @@ -589,7 +589,7 @@ UpdateInformationProvider::getUpdateInformationEnumeration( { if( xElement->getNodeName().equalsAsciiL("feed", 4) ) { - rtl::OUString aXPathExpression; + OUString aXPathExpression; if( !extensionId.isEmpty() ) aXPathExpression = "//atom:entry/atom:category[@term=\'" + extensionId + "\']/.."; @@ -637,8 +637,8 @@ UpdateInformationProvider::getUpdateInformationEnumeration( uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL UpdateInformationProvider::getUpdateInformation( - uno::Sequence< rtl::OUString > const & repositories, - rtl::OUString const & extensionId + uno::Sequence< OUString > const & repositories, + OUString const & extensionId ) throw (uno::Exception, uno::RuntimeException) { uno::Reference< container::XEnumeration > xEnumeration( @@ -735,17 +735,17 @@ UpdateInformationProvider::getInteractionHandler() } //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > UpdateInformationProvider::getServiceNames() { - uno::Sequence< rtl::OUString > aServiceList(1); + uno::Sequence< OUString > aServiceList(1); aServiceList[0] = "com.sun.star.deployment.UpdateInformationProvider"; return aServiceList; }; //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateInformationProvider::getImplName() { return OUString("vnd.sun.UpdateInformationProvider"); @@ -753,7 +753,7 @@ UpdateInformationProvider::getImplName() //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL +OUString SAL_CALL UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException) { return getImplName(); @@ -761,7 +761,7 @@ UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException) //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeException) { return getServiceNames(); @@ -770,9 +770,9 @@ UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeExcepti //------------------------------------------------------------------------------ sal_Bool SAL_CALL -UpdateInformationProvider::supportsService( rtl::OUString const & serviceName ) throw (uno::RuntimeException) +UpdateInformationProvider::supportsService( OUString const & serviceName ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > aServiceNameList = getServiceNames(); + uno::Sequence< OUString > aServiceNameList = getServiceNames(); for( sal_Int32 n=0; n < aServiceNameList.getLength(); n++ ) if( aServiceNameList[n].equals(serviceName) ) diff --git a/extensions/source/update/tools/ztool.cxx b/extensions/source/update/tools/ztool.cxx index b1c4fad1cac9..7009d483c627 100644 --- a/extensions/source/update/tools/ztool.cxx +++ b/extensions/source/update/tools/ztool.cxx @@ -34,8 +34,8 @@ int SAL_CALL main( int argc, char **argv ) show_usage(); return -1; } - rtl::OUString aInName = rtl::OUString::createFromAscii(argv[1]); - rtl::OUString aOutName = rtl::OUString::createFromAscii(argv[2]); + OUString aInName = OUString::createFromAscii(argv[1]); + OUString aOutName = OUString::createFromAscii(argv[2]); SvFileStream aInFile( aInName, STREAM_READ ); SvFileStream aOutFile( aOutName, STREAM_WRITE | STREAM_TRUNC ); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 5c7cf8e1c0f9..57861a76e691 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -64,18 +64,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------------ -static uno::Sequence< rtl::OUString > getServiceNames() +static uno::Sequence< OUString > getServiceNames() { - uno::Sequence< rtl::OUString > aServiceList(1); + uno::Sequence< OUString > aServiceList(1); aServiceList[0] = "com.sun.star.setup.UpdateCheckUI"; return aServiceList; } //------------------------------------------------------------------------------ -static rtl::OUString getImplementationName() +static OUString getImplementationName() { - return rtl::OUString("vnd.sun.UpdateCheckUI"); + return OUString("vnd.sun.UpdateCheckUI"); } //------------------------------------------------------------------------------ @@ -121,9 +121,9 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper3 { uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< task::XJob > mrJob; - rtl::OUString maBubbleTitle; - rtl::OUString maBubbleText; - rtl::OUString maBubbleImageURL; + OUString maBubbleTitle; + OUString maBubbleText; + OUString maBubbleImageURL; Image maBubbleImage; BubbleWindow* mpBubbleWin; SystemWindow* mpIconSysWin; @@ -152,7 +152,7 @@ private: void RemoveBubbleWindow( bool bRemoveIcon ); Image GetMenuBarIcon( MenuBar* pMBar ); void AddMenuBarIcon( SystemWindow* pSysWin, bool bAddEventHdl ); - Image GetBubbleImage( ::rtl::OUString &rURL ); + Image GetBubbleImage( OUString &rURL ); uno::Reference< document::XEventBroadcaster > getGlobalEventBroadcaster() const throw (uno::RuntimeException); @@ -162,11 +162,11 @@ public: virtual ~UpdateCheckUI(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (uno::RuntimeException); - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // XEventListener @@ -178,21 +178,21 @@ public: //XPropertySet virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw ( uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue(const rtl::OUString& PropertyName, const uno::Any& aValue) + virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ); - virtual uno::Any SAL_CALL getPropertyValue(const rtl::OUString& PropertyName) + virtual uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& PropertyName, + virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const uno::Reference< beans::XPropertyChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& PropertyName, + virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const uno::Reference< beans::XPropertyChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); }; @@ -251,14 +251,14 @@ UpdateCheckUI::getGlobalEventBroadcaster() const throw (uno::RuntimeException) } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL +OUString SAL_CALL UpdateCheckUI::getImplementationName() throw (uno::RuntimeException) { return ::getImplementationName(); } //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UpdateCheckUI::getSupportedServiceNames() throw (uno::RuntimeException) { return ::getServiceNames(); @@ -266,9 +266,9 @@ UpdateCheckUI::getSupportedServiceNames() throw (uno::RuntimeException) //------------------------------------------------------------------------------ sal_Bool SAL_CALL -UpdateCheckUI::supportsService( rtl::OUString const & serviceName ) throw (uno::RuntimeException) +UpdateCheckUI::supportsService( OUString const & serviceName ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > aServiceNameList = ::getServiceNames(); + uno::Sequence< OUString > aServiceNameList = ::getServiceNames(); for( sal_Int32 n=0; n < aServiceNameList.getLength(); n++ ) if( aServiceNameList[n].equals(serviceName) ) @@ -296,7 +296,7 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar ) } //------------------------------------------------------------------------------ -Image UpdateCheckUI::GetBubbleImage( ::rtl::OUString &rURL ) +Image UpdateCheckUI::GetBubbleImage( OUString &rURL ) { Image aImage; @@ -313,7 +313,7 @@ Image UpdateCheckUI::GetBubbleImage( ::rtl::OUString &rURL ) { uno::Reference< graphic::XGraphicProvider > xGraphProvider(graphic::GraphicProvider::create(xContext)); uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString("URL"); + aMediaProps[0].Name = OUString("URL"); aMediaProps[0].Value <<= rURL; uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps ); @@ -351,7 +351,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl ) if ( pActiveMBar ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; if( !maBubbleTitle.isEmpty() ) aBuf.append( maBubbleTitle ); if( !maBubbleText.isEmpty() ) @@ -413,14 +413,14 @@ uno::Reference< beans::XPropertySetInfo > UpdateCheckUI::getPropertySetInfo(void } //------------------------------------------------------------------------------ -void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName, +void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aString; + OUString aString; if( rPropertyName == PROPERTY_TITLE ) { rValue >>= aString; @@ -479,7 +479,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName, } //------------------------------------------------------------------------------ -uno::Any UpdateCheckUI::getPropertyValue(const rtl::OUString& rPropertyName) +uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -505,7 +505,7 @@ uno::Any UpdateCheckUI::getPropertyValue(const rtl::OUString& rPropertyName) } //------------------------------------------------------------------------------ -void UpdateCheckUI::addPropertyChangeListener( const rtl::OUString& /*aPropertyName*/, +void UpdateCheckUI::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -513,7 +513,7 @@ void UpdateCheckUI::addPropertyChangeListener( const rtl::OUString& /*aPropertyN } //------------------------------------------------------------------------------ -void UpdateCheckUI::removePropertyChangeListener( const rtl::OUString& /*aPropertyName*/, +void UpdateCheckUI::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -521,7 +521,7 @@ void UpdateCheckUI::removePropertyChangeListener( const rtl::OUString& /*aProper } //------------------------------------------------------------------------------ -void UpdateCheckUI::addVetoableChangeListener( const rtl::OUString& /*aPropertyName*/, +void UpdateCheckUI::addVetoableChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -529,7 +529,7 @@ void UpdateCheckUI::addVetoableChangeListener( const rtl::OUString& /*aPropertyN } //------------------------------------------------------------------------------ -void UpdateCheckUI::removeVetoableChangeListener( const rtl::OUString& /*aPropertyName*/, +void UpdateCheckUI::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index 6aca362f9c65..b37b2fa50480 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -49,7 +49,6 @@ using namespace com::sun::star::script; using namespace com::sun::star::bridge::oleautomation; using namespace cppu; -using ::rtl::OUString; Reference convertComObject( IUnknown* pUnk); Reference getComObject( OUString progId); diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx index 674089637652..11b61de1c54a 100644 --- a/extensions/test/ole/OleClient/funcs.cxx +++ b/extensions/test/ole/OleClient/funcs.cxx @@ -41,7 +41,6 @@ using namespace com::sun::star::script; using namespace com::sun::star::bridge::oleautomation; using namespace cppu; -using ::rtl::OUString; template< class T > bool equalSequences(const Sequence& seqIn, const Sequence & returned); diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index 70a34a32b40b..4e2da554917f 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.cxx @@ -53,7 +53,6 @@ using namespace com::sun::star::uno; using namespace oletest; using namespace cppu; -using ::rtl::OUString; HRESULT doTest(); HRESULT InitializeParameter(); diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index 9d7a0ce5f922..ae4604b42e6c 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -60,7 +60,6 @@ using namespace com::sun::star::registry; using namespace com::sun::star::script; using namespace com::sun::star::reflection; -using ::rtl::OUString; #define IMPL_NAME L"oletest.OleTestImpl" // oletest.OleTestImpl in applicat.rdb @@ -197,8 +196,8 @@ public: // XTestSequence virtual void SAL_CALL setALong( ::sal_Int32 _along ) throw (RuntimeException); virtual ::sal_uInt32 SAL_CALL getAULong() throw (RuntimeException); virtual void SAL_CALL setAULong( ::sal_uInt32 _aulong ) throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL getAString() throw (RuntimeException); - virtual void SAL_CALL setAString( const ::rtl::OUString& _astring ) throw (RuntimeException); + virtual OUString SAL_CALL getAString() throw (RuntimeException); + virtual void SAL_CALL setAString( const OUString& _astring ) throw (RuntimeException); virtual ::sal_Unicode SAL_CALL getAChar() throw (RuntimeException); virtual void SAL_CALL setAChar( ::sal_Unicode _achar ) throw (RuntimeException); virtual Any SAL_CALL getAAny() throw (RuntimeException); @@ -794,12 +793,12 @@ void SAL_CALL OComponent::setAULong( ::sal_uInt32 _aulong ) throw (RuntimeExcept m_attr_uint32 = _aulong; } -::rtl::OUString SAL_CALL OComponent::getAString() throw (RuntimeException) +OUString SAL_CALL OComponent::getAString() throw (RuntimeException) { return m_attr_string; } -void SAL_CALL OComponent::setAString( const ::rtl::OUString& _astring ) throw (RuntimeException) +void SAL_CALL OComponent::setAString( const OUString& _astring ) throw (RuntimeException) { m_attr_string = _astring; } diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index 3e07025597ab..edf738763e1b 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -34,7 +34,6 @@ using namespace usr; using ::rtl::StringToOUString; -using ::rtl::OUStringToString; #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM) #define USTRING_TO_PCHAR(x) OUStringToString(x , CHARSET_DONTKNOW ).GetCharStr() diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index 0d2f96296f6e..c1c6bdb4cf95 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.cxx @@ -34,7 +34,6 @@ using namespace usr; -using ::rtl::OUStringToString; using ::rtl::StringToOUString; diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 61a4723730fe..0dd0645c0e18 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -40,9 +40,7 @@ using namespace usr; -using ::rtl::OString; using ::rtl::OWStringToOString; -using ::rtl::OStringToOWString; // Needed to switch on solaris threads diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index 88dfa361d173..00327b4047a4 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -85,10 +85,10 @@ class OFileAccess : public FileAccessHelper Reference< XCommandEnvironment > mxEnvironment; OCommandEnvironment* mpEnvironment; - void transferImpl( const rtl::OUString& rSource, const rtl::OUString& rDest, sal_Bool bMoveData ) + void transferImpl( const OUString& rSource, const OUString& rDest, sal_Bool bMoveData ) throw(CommandAbortedException, Exception, RuntimeException); - bool createNewFile( const rtl::OUString & rParentURL, - const rtl::OUString & rTitle, + bool createNewFile( const OUString & rParentURL, + const OUString & rTitle, const Reference< XInputStream >& data ) throw ( Exception ); @@ -97,25 +97,25 @@ public: : m_xContext( xContext), mpEnvironment( NULL ) {} // Methods - virtual void SAL_CALL copy( const ::rtl::OUString& SourceURL, const ::rtl::OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL move( const ::rtl::OUString& SourceURL, const ::rtl::OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL kill( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isFolder( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReadOnly( const ::rtl::OUString& FileURL, sal_Bool bReadOnly ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL createFolder( const ::rtl::OUString& NewFolderURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSize( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getContentType( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::DateTime SAL_CALL getDateTimeModified( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFolderContents( const ::rtl::OUString& FolderURL, sal_Bool bIncludeFolders ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL exists( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL openFileRead( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL openFileWrite( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openFileReadWrite( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL kill( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL writeFile( const ::rtl::OUString& FileURL, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& data ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isHidden( const ::rtl::OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHidden( const ::rtl::OUString& FileURL, sal_Bool bHidden ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL writeFile( const OUString& FileURL, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& data ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); }; @@ -219,8 +219,8 @@ Reference< XProgressHandler > OCommandEnvironment::getProgressHandler() //=========================================================================== -void OFileAccess::transferImpl( const rtl::OUString& rSource, - const rtl::OUString& rDest, +void OFileAccess::transferImpl( const OUString& rSource, + const OUString& rDest, sal_Bool bMoveData ) throw(CommandAbortedException, Exception, RuntimeException) { @@ -260,7 +260,7 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource, catch ( Exception const & ) { throw RuntimeException( - rtl::OUString( "OFileAccess::transferrImpl - Unable to obtain " + OUString( "OFileAccess::transferrImpl - Unable to obtain " "destination folder URL!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -270,7 +270,7 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource, } throw RuntimeException( - rtl::OUString( "OFileAccess::transferrImpl - Unable to obtain " + OUString( "OFileAccess::transferrImpl - Unable to obtain " "destination folder URL!" ), static_cast< cppu::OWeakObject * >( this ) ); @@ -294,19 +294,19 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource, } } -void OFileAccess::copy( const rtl::OUString& SourceURL, const rtl::OUString& DestURL ) +void OFileAccess::copy( const OUString& SourceURL, const OUString& DestURL ) throw(CommandAbortedException, Exception, RuntimeException) { transferImpl( SourceURL, DestURL, sal_False ); } -void OFileAccess::move( const rtl::OUString& SourceURL, const rtl::OUString& DestURL ) +void OFileAccess::move( const OUString& SourceURL, const OUString& DestURL ) throw(CommandAbortedException, Exception, RuntimeException) { transferImpl( SourceURL, DestURL, sal_True ); } -void OFileAccess::kill( const rtl::OUString& FileURL ) +void OFileAccess::kill( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { // SfxContentHelper::Kill @@ -314,7 +314,7 @@ void OFileAccess::kill( const rtl::OUString& FileURL ) ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); try { - aCnt.executeCommand( rtl::OUString("delete" ), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString("delete" ), makeAny( sal_Bool( sal_True ) ) ); } catch ( ::com::sun::star::ucb::CommandFailedException const & ) { @@ -322,7 +322,7 @@ void OFileAccess::kill( const rtl::OUString& FileURL ) } } -sal_Bool OFileAccess::isFolder( const rtl::OUString& FileURL ) +sal_Bool OFileAccess::isFolder( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { sal_Bool bRet = sal_False; @@ -336,28 +336,28 @@ sal_Bool OFileAccess::isFolder( const rtl::OUString& FileURL ) return bRet; } -sal_Bool OFileAccess::isReadOnly( const rtl::OUString& FileURL ) +sal_Bool OFileAccess::isReadOnly( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { INetURLObject aURLObj( FileURL, INET_PROT_FILE ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); - Any aRetAny = aCnt.getPropertyValue( rtl::OUString( "IsReadOnly" ) ); + Any aRetAny = aCnt.getPropertyValue( OUString( "IsReadOnly" ) ); sal_Bool bRet = sal_False; aRetAny >>= bRet; return bRet; } -void OFileAccess::setReadOnly( const rtl::OUString& FileURL, sal_Bool bReadOnly ) +void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(CommandAbortedException, Exception, RuntimeException) { INetURLObject aURLObj( FileURL, INET_PROT_FILE ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); Any aAny; aAny <<= bReadOnly; - aCnt.setPropertyValue( rtl::OUString( "IsReadOnly" ), aAny ); + aCnt.setPropertyValue( OUString( "IsReadOnly" ), aAny ); } -void OFileAccess::createFolder( const rtl::OUString& NewFolderURL ) +void OFileAccess::createFolder( const OUString& NewFolderURL ) throw(CommandAbortedException, Exception, RuntimeException) { // Does the folder already exist? @@ -400,12 +400,12 @@ void OFileAccess::createFolder( const rtl::OUString& NewFolderURL ) if ( rProps[ 0 ].Name != "Title" ) continue; - Sequence aNames(1); - rtl::OUString* pNames = aNames.getArray(); - pNames[0] = rtl::OUString( "Title" ); + Sequence aNames(1); + OUString* pNames = aNames.getArray(); + pNames[0] = OUString( "Title" ); Sequence< Any > aValues(1); Any* pValues = aValues.getArray(); - pValues[0] = makeAny( rtl::OUString( aTitle ) ); + pValues[0] = makeAny( OUString( aTitle ) ); ucbhelper::Content aNew; try @@ -425,7 +425,7 @@ void OFileAccess::createFolder( const rtl::OUString& NewFolderURL ) } } -sal_Int32 OFileAccess::getSize( const rtl::OUString& FileURL ) +sal_Int32 OFileAccess::getSize( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { // SfxContentHelper::GetSize @@ -438,18 +438,18 @@ sal_Int32 OFileAccess::getSize( const rtl::OUString& FileURL ) return nSize; } -rtl::OUString OFileAccess::getContentType( const rtl::OUString& FileURL ) +OUString OFileAccess::getContentType( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { INetURLObject aObj( FileURL, INET_PROT_FILE ); ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); Reference< XContent > xContent = aCnt.get(); - rtl::OUString aTypeStr = xContent->getContentType(); + OUString aTypeStr = xContent->getContentType(); return aTypeStr; } -DateTime OFileAccess::getDateTimeModified( const rtl::OUString& FileURL ) +DateTime OFileAccess::getDateTimeModified( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { INetURLObject aFileObj( FileURL, INET_PROT_FILE ); @@ -457,13 +457,13 @@ DateTime OFileAccess::getDateTimeModified( const rtl::OUString& FileURL ) Reference< XCommandEnvironment > aCmdEnv; ucbhelper::Content aYoung( aFileObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv, comphelper::getProcessComponentContext() ); - aYoung.getPropertyValue( rtl::OUString("DateModified" ) ) >>= aDateTime; + aYoung.getPropertyValue( OUString("DateModified" ) ) >>= aDateTime; return aDateTime; } -typedef vector< rtl::OUString* > StringList_Impl; +typedef vector< OUString* > StringList_Impl; -Sequence< rtl::OUString > OFileAccess::getFolderContents( const rtl::OUString& FolderURL, sal_Bool bIncludeFolders ) +Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(CommandAbortedException, Exception, RuntimeException) { // SfxContentHelper::GetFolderContents @@ -473,7 +473,7 @@ Sequence< rtl::OUString > OFileAccess::getFolderContents( const rtl::OUString& F ucbhelper::Content aCnt( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); Reference< XResultSet > xResultSet; - Sequence< rtl::OUString > aProps(0); + Sequence< OUString > aProps(0); ucbhelper::ResultSetInclude eInclude = bIncludeFolders ? ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS : ucbhelper::INCLUDE_DOCUMENTS_ONLY; @@ -493,9 +493,9 @@ Sequence< rtl::OUString > OFileAccess::getFolderContents( const rtl::OUString& F while ( xResultSet->next() ) { - rtl::OUString aId = xContentAccess->queryContentIdentifierString(); + OUString aId = xContentAccess->queryContentIdentifierString(); INetURLObject aURL( aId, INET_PROT_FILE ); - rtl::OUString* pFile = new rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString* pFile = new OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); pFiles->push_back( pFile ); } } @@ -503,11 +503,11 @@ Sequence< rtl::OUString > OFileAccess::getFolderContents( const rtl::OUString& F if ( pFiles ) { size_t nCount = pFiles->size(); - Sequence < rtl::OUString > aRet( nCount ); - rtl::OUString* pRet = aRet.getArray(); + Sequence < OUString > aRet( nCount ); + OUString* pRet = aRet.getArray(); for ( size_t i = 0; i < nCount; ++i ) { - rtl::OUString* pFile = pFiles->at( i ); + OUString* pFile = pFiles->at( i ); pRet[i] = *( pFile ); delete pFile; } @@ -516,10 +516,10 @@ Sequence< rtl::OUString > OFileAccess::getFolderContents( const rtl::OUString& F return aRet; } else - return Sequence < rtl::OUString > (); + return Sequence < OUString > (); } -sal_Bool OFileAccess::exists( const rtl::OUString& FileURL ) +sal_Bool OFileAccess::exists( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { sal_Bool bRet = sal_False; @@ -538,7 +538,7 @@ sal_Bool OFileAccess::exists( const rtl::OUString& FileURL ) return bRet; } -Reference< XInputStream > OFileAccess::openFileRead( const rtl::OUString& FileURL ) +Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { Reference< XInputStream > xRet; @@ -561,7 +561,7 @@ Reference< XInputStream > OFileAccess::openFileRead( const rtl::OUString& FileUR return xRet; } -Reference< XOutputStream > OFileAccess::openFileWrite( const rtl::OUString& FileURL ) +Reference< XOutputStream > OFileAccess::openFileWrite( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { Reference< XOutputStream > xRet; @@ -571,7 +571,7 @@ Reference< XOutputStream > OFileAccess::openFileWrite( const rtl::OUString& File return xRet; } -Reference< XStream > OFileAccess::openFileReadWrite( const rtl::OUString& FileURL ) +Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { Reference< XActiveDataStreamer > xSink = (XActiveDataStreamer*)new OActiveDataStreamer(); @@ -599,7 +599,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const rtl::OUString& FileUR try { - aCnt.executeCommand( rtl::OUString("open" ), aCmdArg ); + aCnt.executeCommand( OUString("open" ), aCmdArg ); } catch ( InteractiveIOException const & e ) { @@ -617,7 +617,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const rtl::OUString& FileUR aInsertArg.ReplaceExisting = sal_False; aCmdArg <<= aInsertArg; - aCnt.executeCommand( rtl::OUString("insert" ), aCmdArg ); + aCnt.executeCommand( OUString("insert" ), aCmdArg ); // Retry... return openFileReadWrite( FileURL ); @@ -644,8 +644,8 @@ void OFileAccess::setInteractionHandler( const Reference< XInteractionHandler >& mpEnvironment->setHandler( Handler ); } -bool OFileAccess::createNewFile( const rtl::OUString & rParentURL, - const rtl::OUString & rTitle, +bool OFileAccess::createNewFile( const OUString & rParentURL, + const OUString & rTitle, const Reference< XInputStream >& data ) throw ( Exception ) { @@ -673,13 +673,13 @@ bool OFileAccess::createNewFile( const rtl::OUString & rParentURL, if ( rProps[ 0 ].Name != "Title" ) continue; - Sequence aNames(1); - rtl::OUString* pNames = aNames.getArray(); - pNames[0] = rtl::OUString( + Sequence aNames(1); + OUString* pNames = aNames.getArray(); + pNames[0] = OUString( "Title" ); Sequence< Any > aValues(1); Any* pValues = aValues.getArray(); - pValues[0] = makeAny( rtl::OUString( rTitle ) ); + pValues[0] = makeAny( OUString( rTitle ) ); try { @@ -702,7 +702,7 @@ bool OFileAccess::createNewFile( const rtl::OUString & rParentURL, return false; } -void SAL_CALL OFileAccess::writeFile( const rtl::OUString& FileURL, +void SAL_CALL OFileAccess::writeFile( const OUString& FileURL, const Reference< XInputStream >& data ) throw ( Exception, RuntimeException ) { @@ -753,25 +753,25 @@ void SAL_CALL OFileAccess::writeFile( const rtl::OUString& FileURL, } } -sal_Bool OFileAccess::isHidden( const ::rtl::OUString& FileURL ) +sal_Bool OFileAccess::isHidden( const OUString& FileURL ) throw(CommandAbortedException, Exception, RuntimeException) { INetURLObject aURLObj( FileURL, INET_PROT_FILE ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); - Any aRetAny = aCnt.getPropertyValue( rtl::OUString( "IsHidden" ) ); + Any aRetAny = aCnt.getPropertyValue( OUString( "IsHidden" ) ); sal_Bool bRet = sal_False; aRetAny >>= bRet; return bRet; } -void OFileAccess::setHidden( const ::rtl::OUString& FileURL, sal_Bool bHidden ) +void OFileAccess::setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(CommandAbortedException, Exception, RuntimeException) { INetURLObject aURLObj( FileURL, INET_PROT_FILE ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); Any aAny; aAny <<= bHidden; - aCnt.setPropertyValue( rtl::OUString( "IsHidden" ), aAny ); + aCnt.setPropertyValue( OUString( "IsHidden" ), aAny ); } //================================================================================================== @@ -784,10 +784,10 @@ Reference< XInterface > SAL_CALL FileAccess_CreateInstance( const Reference< XMu } -Sequence< rtl::OUString > FileAccess_getSupportedServiceNames() +Sequence< OUString > FileAccess_getSupportedServiceNames() { - Sequence< rtl::OUString > seqNames(1); - seqNames.getArray()[0] = rtl::OUString(SERVICE_NAME ); + Sequence< OUString > seqNames(1); + seqNames.getArray()[0] = OUString(SERVICE_NAME ); return seqNames; } @@ -808,7 +808,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL fileacc_component_getFactory( { Reference< XSingleServiceFactory > xFactory( cppu::createSingleFactory( reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - rtl::OUString::createFromAscii( pImplName ), + OUString::createFromAscii( pImplName ), FileAccess_CreateInstance, FileAccess_getSupportedServiceNames() ) ); diff --git a/filter/inc/filter/msfilter/dffpropset.hxx b/filter/inc/filter/msfilter/dffpropset.hxx index ae838c3d7ee5..e4e9e90a5a6e 100644 --- a/filter/inc/filter/msfilter/dffpropset.hxx +++ b/filter/inc/filter/msfilter/dffpropset.hxx @@ -58,7 +58,7 @@ class MSFILTER_DLLPUBLIC DffPropSet /** Returns a boolean property by its real identifier. */ bool GetPropertyBool( sal_uInt32 nId, bool bDefault = false ) const; /** Returns a string property. */ - ::rtl::OUString GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const; + OUString GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const; sal_Bool SeekToContent( sal_uInt32 nRecType, SvStream& rSt ) const; void InitializePropSet( sal_uInt16 nPropSetType ) const; diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx index e09303d490da..b57d269d30b0 100644 --- a/filter/inc/filter/msfilter/escherex.hxx +++ b/filter/inc/filter/msfilter/escherex.hxx @@ -1052,7 +1052,7 @@ public: EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject& rObj, - const rtl::OString& rId, + const OString& rId, const GraphicAttr* pAttr = NULL ); @@ -1077,7 +1077,7 @@ class MSFILTER_DLLPUBLIC EscherGraphicProvider sal_uInt32 mnBlibBufSize; sal_uInt32 mnBlibEntrys; - rtl::OUString maBaseURI; + OUString maBaseURI; protected: @@ -1091,7 +1091,7 @@ public: sal_Bool bWritePictureOffset, sal_uInt32 nResize = 0); sal_uInt32 GetBlibID( SvStream& rPicOutStream, - const rtl::OString& rGraphicId, + const OString& rGraphicId, const Rectangle& rBoundRect, const com::sun::star::awt::Rectangle* pVisArea = NULL, const GraphicAttr* pGrafikAttr = NULL @@ -1102,8 +1102,8 @@ public: sal_Bool GetPrefSize( const sal_uInt32 nBlibId, Size& rSize, MapMode& rMapMode ); - void SetBaseURI( const rtl::OUString& rBaseURI ) { maBaseURI = rBaseURI; }; - const rtl::OUString& GetBaseURI() { return maBaseURI; }; + void SetBaseURI( const OUString& rBaseURI ) { maBaseURI = rBaseURI; }; + const OUString& GetBaseURI() { return maBaseURI; }; EscherGraphicProvider( sal_uInt32 nFlags = _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES ); ~EscherGraphicProvider(); @@ -1186,7 +1186,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer sal_uInt32 nBlibId, sal_Bool bCreateCroppingAttributes ); - sal_Bool ImplCreateEmbeddedBmp( const rtl::OString& rUniqueId ); + sal_Bool ImplCreateEmbeddedBmp( const OString& rUniqueId ); void ImplInit(); public: @@ -1201,7 +1201,7 @@ public: // GraphicObjects are saved to PowerPoint ~EscherPropertyContainer(); - void AddOpt( sal_uInt16 nPropertyID, const rtl::OUString& rString ); + void AddOpt( sal_uInt16 nPropertyID, const OUString& rString ); void AddOpt( sal_uInt16 nPropertyID, @@ -1234,7 +1234,7 @@ public: /** Creates a complex ESCHER_Prop_fillBlip containing the BLIP directly (for Excel charts). */ sal_Bool CreateEmbeddedBitmapProperties( - const ::rtl::OUString& rBitmapUrl, + const OUString& rBitmapUrl, ::com::sun::star::drawing::BitmapMode eBitmapMode ); /** Creates a complex ESCHER_Prop_fillBlip containing a hatch style (for Excel charts). */ @@ -1317,7 +1317,7 @@ public: static MSO_SPT GetCustomShapeType( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, sal_uInt32& nMirrorFlags, - rtl::OUString& rShapeType + OUString& rShapeType ); // helper functions which are also used in ooxml export diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx index db479002fa6f..fc80f3115177 100644 --- a/filter/inc/filter/msfilter/mstoolbar.hxx +++ b/filter/inc/filter/msfilter/mstoolbar.hxx @@ -52,8 +52,8 @@ class MSOCommandConvertor { public: virtual ~MSOCommandConvertor() {} - virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) = 0; - virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ) = 0; + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) = 0; + virtual OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ) = 0; }; class SfxObjectShell; @@ -62,7 +62,7 @@ class MSFILTER_DLLPUBLIC CustomToolBarImportHelper { struct iconcontrolitem { - rtl::OUString sCommand; + OUString sCommand; css::uno::Reference< css::graphic::XGraphic > image; }; std::vector< iconcontrolitem > iconcommands; @@ -79,14 +79,14 @@ public: css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager(); - css::uno::Any createCommandFromMacro( const rtl::OUString& sCmd ); + css::uno::Any createCommandFromMacro( const OUString& sCmd ); - void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const rtl::OUString& sString ); + void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const OUString& sString ); void applyIcons(); - rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); - rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ); + OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); + OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ); SfxObjectShell& GetDocShell() { return mrDocSh; } - bool createMenu( const rtl::OUString& rName, const css::uno::Reference< css::container::XIndexAccess >& xMenuDesc, bool bPersist ); + bool createMenu( const OUString& rName, const css::uno::Reference< css::container::XIndexAccess >& xMenuDesc, bool bPersist ); }; class MSFILTER_DLLPUBLIC TBBase @@ -122,13 +122,13 @@ public: class MSFILTER_DLLPUBLIC WString : public TBBase { - rtl::OUString sString; + OUString sString; public: WString(){}; ~WString(){}; bool Read(SvStream &rS); - rtl::OUString getString(){ return sString; } + OUString getString(){ return sString; } }; class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase @@ -148,7 +148,7 @@ public: ~TBCExtraInfo(){} bool Read(SvStream &rS); void Print( FILE* ); - rtl::OUString getOnAction(); + OUString getOnAction(); }; class MSFILTER_DLLPUBLIC TBCGeneralInfo : public TBBase @@ -165,9 +165,9 @@ public: bool Read(SvStream &rS); void Print( FILE* ); bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& ); - rtl::OUString CustomText() { return customText.getString(); } - rtl::OUString DescriptionText() { return descriptionText.getString(); } - rtl::OUString Tooltip() { return tooltip.getString(); } + OUString CustomText() { return customText.getString(); } + OUString DescriptionText() { return descriptionText.getString(); } + OUString Tooltip() { return tooltip.getString(); } }; class MSFILTER_DLLPUBLIC TBCBitMap : public TBBase @@ -192,7 +192,7 @@ public: ~TBCMenuSpecific(){} bool Read(SvStream &rS); void Print( FILE* ); - rtl::OUString Name(); + OUString Name(); }; class MSFILTER_DLLPUBLIC TBCCDData : public TBBase diff --git a/filter/inc/filter/msfilter/util.hxx b/filter/inc/filter/msfilter/util.hxx index 607566a13b49..110429551bba 100644 --- a/filter/inc/filter/msfilter/util.hxx +++ b/filter/inc/filter/msfilter/util.hxx @@ -57,7 +57,7 @@ MSFILTER_DLLPUBLIC DateTime DTTM2DateTime( long lDTTM ); I guess there must be an implementation of this somewhere in LO, but I failed to find it, unfortunately :-( */ -MSFILTER_DLLPUBLIC rtl::OString DateTimeToOString( const DateTime& rDateTime ); +MSFILTER_DLLPUBLIC OString DateTimeToOString( const DateTime& rDateTime ); /// Given a cBullet in encoding r_ioChrSet and fontname r_ioFontName return a /// suitable new Bullet and change r_ioChrSet and r_ioFontName to form the @@ -68,7 +68,7 @@ MSFILTER_DLLPUBLIC rtl::OString DateTimeToOString( const DateTime& rDateTime ); /// /// Used to map from [Open|Star]Symbol to some Windows font or other. MSFILTER_DLLPUBLIC sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cBullet, - rtl_TextEncoding& r_ioChrSet, rtl::OUString& r_ioFontName, bool bDisableUnicodeSupport = false); + rtl_TextEncoding& r_ioChrSet, OUString& r_ioFontName, bool bDisableUnicodeSupport = false); enum TextCategory @@ -86,7 +86,7 @@ enum TextCategory and indicating its been submitting to the standards working group as a proposed resolution. */ -MSFILTER_DLLPUBLIC TextCategory categorizeCodePoint(sal_uInt32 codePoint, const rtl::OUString &rBcp47LanguageTag); +MSFILTER_DLLPUBLIC TextCategory categorizeCodePoint(sal_uInt32 codePoint, const OUString &rBcp47LanguageTag); } } diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx index 076c4dc08d5a..d69cf3011071 100644 --- a/filter/qa/cppunit/filters-pict-test.cxx +++ b/filter/qa/cppunit/filters-pict-test.cxx @@ -34,8 +34,8 @@ class PictFilterTest public: PictFilterTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); /** @@ -48,8 +48,8 @@ public: CPPUNIT_TEST_SUITE_END(); }; -bool PictFilterTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, +bool PictFilterTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { SvFileStream aFileStream(rURL, STREAM_READ); @@ -59,9 +59,9 @@ bool PictFilterTest::load(const rtl::OUString &, void PictFilterTest::testCVEs() { - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/filter/qa/cppunit/data/pict/"), - rtl::OUString()); + OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(PictFilterTest); diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx index 3551ec6e86c5..cc831b1f003b 100644 --- a/filter/qa/cppunit/filters-tga-test.cxx +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -54,8 +54,8 @@ class TgaFilterTest public: TgaFilterTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); /** @@ -68,8 +68,8 @@ public: CPPUNIT_TEST_SUITE_END(); }; -bool TgaFilterTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, +bool TgaFilterTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { SvFileStream aFileStream(rURL, STREAM_READ); @@ -79,9 +79,9 @@ bool TgaFilterTest::load(const rtl::OUString &, void TgaFilterTest::testCVEs() { - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/filter/qa/cppunit/data/tga/"), - rtl::OUString()); + OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(TgaFilterTest); diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx index aac646f39dff..542522b97a5c 100644 --- a/filter/qa/cppunit/filters-tiff-test.cxx +++ b/filter/qa/cppunit/filters-tiff-test.cxx @@ -54,8 +54,8 @@ class TiffFilterTest public: TiffFilterTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); /** @@ -68,8 +68,8 @@ public: CPPUNIT_TEST_SUITE_END(); }; -bool TiffFilterTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, +bool TiffFilterTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { SvFileStream aFileStream(rURL, STREAM_READ); @@ -79,9 +79,9 @@ bool TiffFilterTest::load(const rtl::OUString &, void TiffFilterTest::testCVEs() { - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/filter/qa/cppunit/data/tiff/"), - rtl::OUString()); + OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(TiffFilterTest); diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 92491f883ef9..ebbb7f2b38d8 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -67,8 +67,8 @@ BaseContainer::~BaseContainer() void BaseContainer::init(const css::uno::Reference< css::uno::XComponentContext >& rxContext , - const ::rtl::OUString& sImplementationName, - const css::uno::Sequence< ::rtl::OUString >& lServiceNames , + const OUString& sImplementationName, + const css::uno::Sequence< OUString >& lServiceNames , FilterCache::EItemType eType ) { // SAFE -> @@ -152,7 +152,7 @@ FilterCache* BaseContainer::impl_getWorkingCache() const -::rtl::OUString SAL_CALL BaseContainer::getImplementationName() +OUString SAL_CALL BaseContainer::getImplementationName() throw (css::uno::RuntimeException) { // SAFE -> @@ -163,14 +163,14 @@ FilterCache* BaseContainer::impl_getWorkingCache() const -sal_Bool SAL_CALL BaseContainer::supportsService(const ::rtl::OUString& sServiceName) +sal_Bool SAL_CALL BaseContainer::supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); sal_Int32 c = m_lServiceNames.getLength(); - const ::rtl::OUString* pNames = m_lServiceNames.getConstArray(); + const OUString* pNames = m_lServiceNames.getConstArray(); for (sal_Int32 i=0; i SAL_CALL BaseContainer::getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames() throw (css::uno::RuntimeException) { // SAFE -> @@ -193,7 +193,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getSupportedServic -void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem , +void SAL_CALL BaseContainer::insertByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::ElementExistException, @@ -225,7 +225,7 @@ void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem , FilterCache* pCache = impl_getWorkingCache(); if (pCache->hasItem(m_eType, sItem)) - throw css::container::ElementExistException(::rtl::OUString(), static_cast< css::container::XNameContainer* >(this)); + throw css::container::ElementExistException(OUString(), static_cast< css::container::XNameContainer* >(this)); pCache->setItem(m_eType, sItem, aItem); aLock.clear(); @@ -234,7 +234,7 @@ void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem , -void SAL_CALL BaseContainer::removeByName(const ::rtl::OUString& sItem) +void SAL_CALL BaseContainer::removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ) @@ -256,7 +256,7 @@ void SAL_CALL BaseContainer::removeByName(const ::rtl::OUString& sItem) -void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem , +void SAL_CALL BaseContainer::replaceByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -288,7 +288,7 @@ void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem , FilterCache* pCache = impl_getWorkingCache(); if (!pCache->hasItem(m_eType, sItem)) - throw css::container::NoSuchElementException(::rtl::OUString(), static_cast< css::container::XNameContainer* >(this)); + throw css::container::NoSuchElementException(OUString(), static_cast< css::container::XNameContainer* >(this)); pCache->setItem(m_eType, sItem, aItem); aLock.clear(); @@ -297,7 +297,7 @@ void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem , -css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem) +css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ) @@ -338,10 +338,10 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem) -css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getElementNames() +css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > lNames; + css::uno::Sequence< OUString > lNames; impl_loadOnDemand(); @@ -367,7 +367,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getElementNames() -sal_Bool SAL_CALL BaseContainer::hasByName(const ::rtl::OUString& sItem) +sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) throw (css::uno::RuntimeException) { sal_Bool bHasOne = sal_False; @@ -433,12 +433,12 @@ sal_Bool SAL_CALL BaseContainer::hasElements() -css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const ::rtl::OUString& /* sQuery */ ) +css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const OUString& /* sQuery */ ) throw (css::uno::RuntimeException) { OSL_FAIL("not pure virtual ... but not realy implemented .-)"); - ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, css::uno::Sequence< ::rtl::OUString >()); + ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, css::uno::Sequence< OUString >()); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); } @@ -485,7 +485,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea Further its easiear to work directly with the return value instaed of checking of NULL returns! */ - css::uno::Sequence< ::rtl::OUString > lSubSet; + css::uno::Sequence< OUString > lSubSet; lKeys >> lSubSet; ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, lSubSet); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 61fb4e90c861..a2259a5df1d7 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -69,11 +69,11 @@ class BaseContainer : public BaseLock /** @short the implementation name of our derived class, which we provide at the interface XServiceInfo of our class ... */ - ::rtl::OUString m_sImplementationName; + OUString m_sImplementationName; /** @short the list of supported uno service names of our derived class, which we provide at the interface XServiceInfo of our class ... */ - css::uno::Sequence< ::rtl::OUString > m_lServiceNames; + css::uno::Sequence< OUString > m_lServiceNames; /** @short reference(!) to a singleton filter cache implementation, which is used to work with the underlying configuration. */ @@ -156,8 +156,8 @@ class BaseContainer : public BaseLock must be wrapped by this container interface. */ virtual void init(const css::uno::Reference< css::uno::XComponentContext >& rxContext , - const ::rtl::OUString& sImplementationName, - const css::uno::Sequence< ::rtl::OUString >& lServiceNames , + const OUString& sImplementationName, + const css::uno::Sequence< OUString >& lServiceNames , FilterCache::EItemType eType ); //------------------------------------------- @@ -214,26 +214,26 @@ class BaseContainer : public BaseLock //--------------------------------------- // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); //--------------------------------------- // XNameContainer - virtual void SAL_CALL insertByName(const ::rtl::OUString& sItem , + virtual void SAL_CALL insertByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::ElementExistException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual void SAL_CALL removeByName(const ::rtl::OUString& sItem) + virtual void SAL_CALL removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ); @@ -241,7 +241,7 @@ class BaseContainer : public BaseLock //--------------------------------------- // XNameReplace - virtual void SAL_CALL replaceByName(const ::rtl::OUString& sItem , + virtual void SAL_CALL replaceByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -251,15 +251,15 @@ class BaseContainer : public BaseLock //--------------------------------------- // XElementAccess - virtual css::uno::Any SAL_CALL getByName(const ::rtl::OUString& sItem) + virtual css::uno::Any SAL_CALL getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& sItem) + virtual sal_Bool SAL_CALL hasByName(const OUString& sItem) throw (css::uno::RuntimeException); virtual css::uno::Type SAL_CALL getElementType() @@ -274,7 +274,7 @@ class BaseContainer : public BaseLock // must be implemented realy by derived class ... // We implement return of an empty result here only! // But we show an assertion :-) - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index d33c3fb9e364..8f91437fce30 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -53,7 +53,7 @@ void CacheItem::update(const CacheItem& rUpdateItem) -void CacheItem::validateUINames(const ::rtl::OUString& sActLocale) +void CacheItem::validateUINames(const OUString& sActLocale) { if (sActLocale.isEmpty()) return; @@ -66,7 +66,7 @@ void CacheItem::validateUINames(const ::rtl::OUString& sActLocale) if (pUINames != end()) lUINames << pUINames->second; - ::rtl::OUString sUIName; + OUString sUIName; if (pUIName != end()) pUIName->second >>= sUIName; @@ -99,7 +99,7 @@ css::uno::Sequence< css::beans::PropertyValue > CacheItem::getAsPackedPropertyVa pProp != end() ; ++pProp ) { - const ::rtl::OUString& rName = pProp->first; + const OUString& rName = pProp->first; const css::uno::Any& rValue = pProp->second; if (!rValue.hasValue()) @@ -151,8 +151,8 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, //--------------------------------------- case css::uno::TypeClass_STRING : { - ::rtl::OUString v1; - ::rtl::OUString v2; + OUString v1; + OUString v2; if ( (aSubSet >>= v1) && @@ -224,8 +224,8 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, //--------------------------------------- case css::uno::TypeClass_SEQUENCE : { - css::uno::Sequence< ::rtl::OUString > uno_s1; - css::uno::Sequence< ::rtl::OUString > uno_s2; + css::uno::Sequence< OUString > uno_s1; + css::uno::Sequence< OUString > uno_s2; if ( (aSubSet >>= uno_s1) && diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index d20981ebe71a..8285644df326 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -49,7 +49,7 @@ struct BaseLock }; -typedef ::comphelper::SequenceAsVector< ::rtl::OUString > OUStringList; +typedef ::comphelper::SequenceAsVector< OUString > OUStringList; //_______________________________________________ @@ -148,7 +148,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap Its needed to address the UIName property inside the list of possible ones. */ - void validateUINames(const ::rtl::OUString& sActLocale); + void validateUINames(const OUString& sActLocale); //--------------------------------------- @@ -172,10 +172,10 @@ class CacheItem : public ::comphelper::SequenceAsHashMap /** @short represent an item list of a FilterCache instance. */ -typedef ::boost::unordered_map< ::rtl::OUString , +typedef ::boost::unordered_map< OUString , CacheItem , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > CacheItemList; + OUStringHash , + ::std::equal_to< OUString > > CacheItemList; //_______________________________________________ @@ -191,10 +191,10 @@ typedef ::boost::unordered_map< ::rtl::OUString , there we need key-value pairs too, which cant be provided by a pure vector! */ -typedef ::boost::unordered_map< ::rtl::OUString , +typedef ::boost::unordered_map< OUString , OUStringList , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > CacheItemRegistration; + OUStringHash , + ::std::equal_to< OUString > > CacheItemRegistration; //_______________________________________________ @@ -209,7 +209,7 @@ typedef ::boost::unordered_map< ::rtl::OUString , struct FlatDetectionInfo { // the internal type name - ::rtl::OUString sType; + OUString sType; // this type was found by a matching the URL extension bool bMatchByExtension; diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index 0455c88259d3..e32704739533 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -104,12 +104,12 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven { const css::util::ElementChange& aChange = aEvent.Changes[i]; - ::rtl::OUString sOrgPath ; - ::rtl::OUString sTempPath; + OUString sOrgPath ; + OUString sTempPath; - ::rtl::OUString sProperty; - ::rtl::OUString sNode ; - ::rtl::OUString sLocale ; + OUString sProperty; + OUString sNode ; + OUString sLocale ; /* at least we must be able to retrieve 2 path elements But sometimes the original path can contain 3 of them ... in case @@ -126,8 +126,8 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven if ( ! ::utl::splitLastFromConfigurationPath(sOrgPath, sTempPath, sProperty)) { sNode = sLocale; - sProperty = ::rtl::OUString(); - sLocale = ::rtl::OUString(); + sProperty = OUString(); + sLocale = OUString(); } else { @@ -136,7 +136,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven { sNode = sProperty; sProperty = sLocale; - sLocale = ::rtl::OUString(); + sLocale = OUString(); } } @@ -154,7 +154,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven pIt != lChangedItems.end() ; ++pIt ) { - const ::rtl::OUString& sItem = *pIt; + const OUString& sItem = *pIt; try { m_rCache.refreshItem(eType, sItem); diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 881d71a99226..4ccdb10c13e6 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -42,7 +42,7 @@ ConfigFlush::~ConfigFlush() } //----------------------------------------------- -::rtl::OUString SAL_CALL ConfigFlush::getImplementationName() +OUString SAL_CALL ConfigFlush::getImplementationName() throw (css::uno::RuntimeException) { return impl_getImplementationName(); @@ -50,12 +50,12 @@ ConfigFlush::~ConfigFlush() } //----------------------------------------------- -sal_Bool SAL_CALL ConfigFlush::supportsService(const ::rtl::OUString& sServiceName) +sal_Bool SAL_CALL ConfigFlush::supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > lServiceNames = impl_getSupportedServiceNames(); + css::uno::Sequence< OUString > lServiceNames = impl_getSupportedServiceNames(); sal_Int32 c = lServiceNames.getLength(); - const ::rtl::OUString* pNames = lServiceNames.getConstArray(); + const OUString* pNames = lServiceNames.getConstArray(); for (sal_Int32 i=0; i SAL_CALL ConfigFlush::getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL ConfigFlush::getSupportedServiceNames() throw (css::uno::RuntimeException) { return impl_getSupportedServiceNames(); @@ -125,15 +125,15 @@ void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css: } //----------------------------------------------- -::rtl::OUString ConfigFlush::impl_getImplementationName() +OUString ConfigFlush::impl_getImplementationName() { - return ::rtl::OUString("com.sun.star.comp.filter.config.ConfigFlush"); + return OUString("com.sun.star.comp.filter.config.ConfigFlush"); } //----------------------------------------------- -css::uno::Sequence< ::rtl::OUString > ConfigFlush::impl_getSupportedServiceNames() +css::uno::Sequence< OUString > ConfigFlush::impl_getSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > lServiceNames(1); + css::uno::Sequence< OUString > lServiceNames(1); lServiceNames[0] = "com.sun.star.document.FilterConfigRefresh"; return lServiceNames; } diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index df1c3b12740a..a7381493ba85 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -79,13 +79,13 @@ class ConfigFlush : public BaseLock //--------------------------------------- // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); //--------------------------------------- @@ -102,8 +102,8 @@ class ConfigFlush : public BaseLock //--------------------------------------- // interface to register/create this instance as an UNO service - static ::rtl::OUString impl_getImplementationName(); - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static OUString impl_getImplementationName(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); }; diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 4c7ccfa5e918..a2b251bed7d8 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -49,7 +49,7 @@ ContentHandlerFactory::~ContentHandlerFactory() -css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const ::rtl::OUString& sHandler) +css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const OUString& sHandler) throw(css::uno::Exception , css::uno::RuntimeException) { @@ -58,7 +58,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea -css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstanceWithArguments(const ::rtl::OUString& sHandler , +css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -68,7 +68,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sRealHandler = sHandler; + OUString sRealHandler = sHandler; #ifdef _FILTER_CONFIG_MIGRATION_Q_ @@ -82,7 +82,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea { _FILTER_CONFIG_LOG_("ContentHandlerFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); - css::uno::Sequence< ::rtl::OUString > lTypes(1); + css::uno::Sequence< OUString > lTypes(1); lTypes[0] = sHandler; css::uno::Sequence< css::beans::NamedValue > lQuery(1); @@ -139,7 +139,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea -css::uno::Sequence< ::rtl::OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames() +css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames() throw(css::uno::RuntimeException) { // must be the same list as ((XNameAccess*)this)->getElementNames() return! diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 936b9dcb9db8..d2c0f9a2a7f4 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -69,16 +69,16 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain //--------------------------------------- // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& sHandler) + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sHandler) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::OUString& sHandler , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException); //------------------------------------------- @@ -96,7 +96,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -108,7 +108,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 9551329ee875..84703a3d92cf 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -339,7 +339,7 @@ OUStringList FilterCache::getItemNames(EItemType eType) const sal_Bool FilterCache::hasItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -373,7 +373,7 @@ sal_Bool FilterCache::hasItem( EItemType eType, CacheItem FilterCache::getItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -403,7 +403,7 @@ CacheItem FilterCache::getItem( EItemType eType, if (eType == E_FILTER) { CacheItem& rFilter = pIt->second; - ::rtl::OUString sDocService; + OUString sDocService; rFilter[PROPNAME_DOCUMENTSERVICE] >>= sDocService; // In Standalone-Impress the module WriterWeb is not installed @@ -425,7 +425,7 @@ CacheItem FilterCache::getItem( EItemType eType, void FilterCache::removeItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -447,7 +447,7 @@ void FilterCache::removeItem( EItemType eType, void FilterCache::setItem( EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , const CacheItem& aValue) throw(css::uno::Exception) { @@ -476,7 +476,7 @@ void FilterCache::setItem( EItemType eType , //----------------------------------------------- void FilterCache::refreshItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -487,7 +487,7 @@ void FilterCache::refreshItem( EItemType eType, void FilterCache::addStatePropsToItem( EItemType eType, - const ::rtl::OUString& sItem, + const OUString& sItem, CacheItem& rItem) throw(css::uno::Exception) { @@ -524,7 +524,7 @@ void FilterCache::addStatePropsToItem( EItemType eType, => set it to readonly/required everytimes :-) */ css::uno::Any aDirectValue = impl_getDirectCFGValue(CFGDIRECTKEY_DEFAULTFRAMELOADER); - ::rtl::OUString sDefaultFrameLoader; + OUString sDefaultFrameLoader; if ( (aDirectValue >>= sDefaultFrameLoader) && (!sDefaultFrameLoader.isEmpty() ) && @@ -649,7 +649,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN pIt != lItems.end() ; ++pIt ) { - const ::rtl::OUString& sItem = *pIt; + const OUString& sItem = *pIt; EItemFlushState eState = impl_specifyFlushOperation(xSet, rCache, sItem); switch(eState) { @@ -705,7 +705,7 @@ void FilterCache::detectFlatForURL(const css::util::URL& aURL , // Note further: It must be converted to lower case, because the optimize hash // (which maps extensions to types) work with lower case key strings! INetURLObject aParser (aURL.Main); - ::rtl::OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , + OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , sal_True , INetURLObject::DECODE_WITH_CHARSET); sExtension = sExtension.toAsciiLowerCase(); @@ -807,10 +807,10 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig { ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sPath ; + OUString sPath ; css::uno::Reference< css::uno::XInterface >* pConfig = 0; css::uno::Reference< css::uno::XInterface > xOld ; - ::rtl::OString sRtlLog ; + OString sRtlLog ; switch(eProvider) { @@ -889,10 +889,10 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig -css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirectKey) +css::uno::Any FilterCache::impl_getDirectCFGValue(const OUString& sDirectKey) { - ::rtl::OUString sRoot; - ::rtl::OUString sKey ; + OUString sRoot; + OUString sKey ; if ( (!::utl::splitLastFromConfigurationPath(sDirectKey, sRoot, sKey)) || @@ -925,7 +925,7 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirect #endif { #if OSL_DEBUG_LEVEL > 0 - OSL_FAIL(::rtl::OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); + OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); #endif aValue.clear(); } @@ -935,7 +935,7 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirect -css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess(const ::rtl::OUString& sRoot , +css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess(const OUString& sRoot , sal_Bool bReadOnly , sal_Bool bLocalesMode) { @@ -1043,12 +1043,12 @@ void FilterCache::impl_validateAndOptimize() for (pIt = m_lTypes.begin(); pIt != m_lTypes.end(); ++pIt) { - ::rtl::OUString sType = pIt->first; + OUString sType = pIt->first; CacheItem aType = pIt->second; // create list of all known detect services / frame loader / content handler on demand // Because these information are available as type properties! - ::rtl::OUString sDetectService; + OUString sDetectService; aType[PROPNAME_DETECTSERVICE ] >>= sDetectService; if (!sDetectService.isEmpty()) impl_resolveItem4TypeRegistration(&m_lDetectServices, sDetectService, sType); @@ -1059,8 +1059,8 @@ void FilterCache::impl_validateAndOptimize() // only in case there is no filled set of Extensions AND // no filled set of URLPattern -> we must try to remove this invalid item // from this cache! - css::uno::Sequence< ::rtl::OUString > lExtensions; - css::uno::Sequence< ::rtl::OUString > lURLPattern; + css::uno::Sequence< OUString > lExtensions; + css::uno::Sequence< OUString > lURLPattern; aType[PROPNAME_EXTENSIONS] >>= lExtensions; aType[PROPNAME_URLPATTERN] >>= lURLPattern; sal_Int32 ce = lExtensions.getLength(); @@ -1068,7 +1068,7 @@ void FilterCache::impl_validateAndOptimize() #if OSL_DEBUG_LEVEL > 0 - ::rtl::OUString sInternalTypeNameCheck; + OUString sInternalTypeNameCheck; aType[PROPNAME_NAME] >>= sInternalTypeNameCheck; if (!sInternalTypeNameCheck.equals(sType)) { @@ -1094,12 +1094,12 @@ void FilterCache::impl_validateAndOptimize() sal_Bool bPreferred = sal_False; aType[PROPNAME_PREFERRED] >>= bPreferred; - const ::rtl::OUString* pExtensions = lExtensions.getConstArray(); + const OUString* pExtensions = lExtensions.getConstArray(); for (sal_Int32 e=0; e>= sPrefFilter; if (sPrefFilter.isEmpty()) { @@ -1180,7 +1180,7 @@ void FilterCache::impl_validateAndOptimize() } CacheItem aPrefFilter = pIt2->second; - ::rtl::OUString sFilterTypeReg; + OUString sFilterTypeReg; aPrefFilter[PROPNAME_TYPE] >>= sFilterTypeReg; if (sFilterTypeReg != sType) { @@ -1198,7 +1198,7 @@ void FilterCache::impl_validateAndOptimize() ++nErrors; } - ::rtl::OUString sInternalFilterNameCheck; + OUString sInternalFilterNameCheck; aPrefFilter[PROPNAME_NAME] >>= sInternalFilterNameCheck; if (!sInternalFilterNameCheck.equals(sPrefFilter)) { @@ -1214,7 +1214,7 @@ void FilterCache::impl_validateAndOptimize() // and all types (and of course if registered filters), which // does not registered for any other loader. css::uno::Any aDirectValue = impl_getDirectCFGValue(CFGDIRECTKEY_DEFAULTFRAMELOADER); - ::rtl::OUString sDefaultFrameLoader; + OUString sDefaultFrameLoader; if ( (!(aDirectValue >>= sDefaultFrameLoader)) || @@ -1238,7 +1238,7 @@ void FilterCache::impl_validateAndOptimize() // Because we replace its registration later completely with all // types, which are not referenced by any other loader. // So we can avaoid our code against the complexity of a diff! - ::rtl::OUString sLoader = pIt->first; + OUString sLoader = pIt->first; if (sLoader.equals(sDefaultFrameLoader)) continue; @@ -1260,14 +1260,14 @@ void FilterCache::impl_validateAndOptimize() rDefaultLoader[PROPNAME_NAME ] <<= sDefaultFrameLoader; rDefaultLoader[PROPNAME_TYPES] <<= lTypes.getAsConstList(); - ::rtl::OUString sLogOut = sLog.makeStringAndClear(); - OSL_ENSURE(!nErrors, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); + OUString sLogOut = sLog.makeStringAndClear(); + OSL_ENSURE(!nErrors, OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); if (nErrors>0) throw css::document::CorruptedFilterConfigurationException( "filter configuration: " + sLogOut, css::uno::Reference< css::uno::XInterface >(), sLogOut); - OSL_ENSURE(!nWarnings, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); + OSL_ENSURE(!nWarnings, OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); // <- SAFE } @@ -1275,7 +1275,7 @@ void FilterCache::impl_validateAndOptimize() void FilterCache::impl_addItem2FlushList( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { OUStringList* pList = 0; @@ -1313,7 +1313,7 @@ void FilterCache::impl_addItem2FlushList( EItemType eType, FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet , const CacheItemList& rList, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { sal_Bool bExistsInConfigLayer = xSet->hasByName(sItem); @@ -1337,8 +1337,8 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css:: void FilterCache::impl_resolveItem4TypeRegistration( CacheItemList* pList, - const ::rtl::OUString& sItem, - const ::rtl::OUString& sType) + const OUString& sItem, + const OUString& sType) throw(css::uno::Exception) { CacheItem& rItem = (*pList)[sItem]; @@ -1470,7 +1470,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA throw(css::uno::Exception) { // get access to the right configuration set - ::rtl::OUString sSetName; + OUString sSetName; switch(eType) { case E_TYPE : @@ -1492,7 +1492,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA } css::uno::Reference< css::container::XNameAccess > xSet; - css::uno::Sequence< ::rtl::OUString > lItems; + css::uno::Sequence< OUString > lItems; try { @@ -1518,7 +1518,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA // But dont update optimized structures like e.g. hash // for mapping extensions to its types! - const ::rtl::OUString* pItems = lItems.getConstArray(); + const OUString* pItems = lItems.getConstArray(); sal_Int32 c = lItems.getLength(); for (sal_Int32 i=0; i ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sFormatName = m_sFormatName ; - ::rtl::OUString sFormatVersion = m_sFormatVersion; - ::rtl::OUString sActLocale = m_sActLocale ; + OUString sFormatName = m_sFormatName ; + OUString sFormatVersion = m_sFormatVersion; + OUString sActLocale = m_sActLocale ; aLock.clear(); // <- SAFE ---------------------------------- @@ -1592,8 +1592,8 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe if (!(aVal >>= xUIName) && !xUIName.is()) return; - const ::comphelper::SequenceAsVector< ::rtl::OUString > lLocales(xUIName->getElementNames()); - ::comphelper::SequenceAsVector< ::rtl::OUString >::const_iterator pLocale ; + const ::comphelper::SequenceAsVector< OUString > lLocales(xUIName->getElementNames()); + ::comphelper::SequenceAsVector< OUString >::const_iterator pLocale ; ::comphelper::SequenceAsHashMap lUINames; const char FORMATNAME_VAR[] = "%productname%"; @@ -1603,9 +1603,9 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe pLocale != lLocales.end() ; ++pLocale ) { - const ::rtl::OUString& sLocale = *pLocale; + const OUString& sLocale = *pLocale; - ::rtl::OUString sValue; + OUString sValue; xUIName->getByName(sLocale) >>= sValue; // replace %productname% @@ -1637,7 +1637,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe #if OSL_DEBUG_LEVEL > 0 if ( sActLocale == "en-US" ) return; - ::rtl::OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, ::rtl::OUString()); + OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, OUString()); OUString sMsg("Fallback scenario for filter or type '" + sName + "' and locale '" + sActLocale + "' failed. Please check your filter configuration."); @@ -1647,7 +1647,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe return; } - const ::rtl::OUString& sLocale = *pLocale; + const OUString& sLocale = *pLocale; ::comphelper::SequenceAsHashMap::const_iterator pUIName = lUINames.find(sLocale); if (pUIName != lUINames.end()) rItem[PROPNAME_UINAME] = pUIName->second; @@ -1684,7 +1684,7 @@ void FilterCache::impl_savePatchUINames(const css::uno::Reference< css::containe -----------------------------------------------*/ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , EReadOption eOption) throw(css::uno::Exception) { @@ -1767,7 +1767,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: // special handling for flags! Convert it from a list of names to its // int representation ... - css::uno::Sequence< ::rtl::OUString > lFlagNames; + css::uno::Sequence< OUString > lFlagNames; if (xItem->getByName(PROPNAME_FLAGS) >>= lFlagNames) aItem[PROPNAME_FLAGS] <<= FilterCache::impl_convertFlagNames2FlagField(lFlagNames); } @@ -1805,12 +1805,12 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { CacheItemList* pList = 0; css::uno::Reference< css::uno::XInterface > xConfig ; - ::rtl::OUString sSet ; + OUString sSet ; switch(eType) { @@ -1986,7 +1986,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName /*----------------------------------------------- static! => no locks neccessary -----------------------------------------------*/ -css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNames(sal_Int32 nFlags) +css::uno::Sequence< OUString > FilterCache::impl_convertFlagField2FlagNames(sal_Int32 nFlags) { OUStringList lFlagNames; @@ -2021,11 +2021,11 @@ css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNam /*----------------------------------------------- static! => no locks neccessary -----------------------------------------------*/ -sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< ::rtl::OUString >& lNames) +sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< OUString >& lNames) { sal_Int32 nField = 0; - const ::rtl::OUString* pNames = lNames.getConstArray(); + const OUString* pNames = lNames.getConstArray(); sal_Int32 c = lNames.getLength(); for (sal_Int32 i=0; ihasByName(TYPES_SET)) { css::uno::Reference< css::container::XNameAccess > xSet; xCfg->getByName(TYPES_SET) >>= xSet; - const css::uno::Sequence< ::rtl::OUString > lItems = xSet->getElementNames(); - const ::rtl::OUString* pItems = lItems.getConstArray(); + const css::uno::Sequence< OUString > lItems = xSet->getElementNames(); + const OUString* pItems = lItems.getConstArray(); for (sal_Int32 i=0; ihasByName(FILTER_SET)) { css::uno::Reference< css::container::XNameAccess > xSet; xCfg->getByName(FILTER_SET) >>= xSet; - const css::uno::Sequence< ::rtl::OUString > lItems = xSet->getElementNames(); - const ::rtl::OUString* pItems = lItems.getConstArray(); + const css::uno::Sequence< OUString > lItems = xSet->getElementNames(); + const OUString* pItems = lItems.getConstArray(); for (sal_Int32 i=0; i& xSet , EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { css::uno::Reference< css::container::XNameAccess > xItem; @@ -2302,7 +2302,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe impl_readPatchUINames(xItem, aItem); // Data - ::rtl::OUString sData; + OUString sData; OUStringList lData; xItem->getByName( "Data" ) >>= sData; lData = impl_tokenizeString(sData, (sal_Unicode)','); @@ -2319,7 +2319,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe pProp != lData.end() ; ++pProp ) { - const ::rtl::OUString& sProp = *pProp; + const OUString& sProp = *pProp; switch(eType) { case E_TYPE : @@ -2339,14 +2339,14 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe -OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , +OUStringList FilterCache::impl_tokenizeString(const OUString& sData , sal_Unicode cSeperator) { OUStringList lData ; sal_Int32 nToken = 0; do { - ::rtl::OUString sToken = sData.getToken(0, cSeperator, nToken); + OUString sToken = sData.getToken(0, cSeperator, nToken); lData.push_back(sToken); } while(nToken >= 0); @@ -2356,14 +2356,14 @@ OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , #if OSL_DEBUG_LEVEL > 0 -::rtl::OUString FilterCache::impl_searchFrameLoaderForType(const ::rtl::OUString& sType) const +OUString FilterCache::impl_searchFrameLoaderForType(const OUString& sType) const { CacheItemList::const_iterator pIt; for ( pIt = m_lFrameLoaders.begin(); pIt != m_lFrameLoaders.end() ; ++pIt ) { - const ::rtl::OUString& sItem = pIt->first; + const OUString& sItem = pIt->first; ::comphelper::SequenceAsHashMap lProps(pIt->second); OUStringList lTypes(lProps[PROPNAME_TYPES]); @@ -2371,19 +2371,19 @@ OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , return sItem; } - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString FilterCache::impl_searchContentHandlerForType(const ::rtl::OUString& sType) const +OUString FilterCache::impl_searchContentHandlerForType(const OUString& sType) const { CacheItemList::const_iterator pIt; for ( pIt = m_lContentHandlers.begin(); pIt != m_lContentHandlers.end() ; ++pIt ) { - const ::rtl::OUString& sItem = pIt->first; + const OUString& sItem = pIt->first; ::comphelper::SequenceAsHashMap lProps(pIt->second); OUStringList lTypes(lProps[PROPNAME_TYPES]); @@ -2391,13 +2391,13 @@ OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , return sItem; } - return ::rtl::OUString(); + return OUString(); } #endif -sal_Bool FilterCache::impl_isModuleInstalled(const ::rtl::OUString& sModule) +sal_Bool FilterCache::impl_isModuleInstalled(const OUString& sModule) { css::uno::Reference< css::container::XNameAccess > xCfg; diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 3ea66610c0dc..8a44eea06cce 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -220,15 +220,15 @@ class FilterCache : public BaseLock //--------------------------------------- /** @short contains the current locale of the office and will be used to work with localized configuration values. */ - ::rtl::OUString m_sActLocale; + OUString m_sActLocale; //--------------------------------------- /** TODO */ - ::rtl::OUString m_sFormatName; + OUString m_sFormatName; //--------------------------------------- /** TODO */ - ::rtl::OUString m_sFormatVersion; + OUString m_sFormatVersion; //--------------------------------------- /** @short contains status, which cache items/properties @@ -484,7 +484,7 @@ class FilterCache : public BaseLock any longer, because any operation before damage it. */ virtual sal_Bool hasItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -514,7 +514,7 @@ class FilterCache : public BaseLock any longer, because any operation before damage it. */ virtual CacheItem getItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -522,7 +522,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ virtual void removeItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -530,7 +530,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ virtual void setItem( EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , const CacheItem& aValue) throw(css::uno::Exception); @@ -539,7 +539,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ virtual void refreshItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -580,7 +580,7 @@ class FilterCache : public BaseLock to such items ... */ virtual void addStatePropsToItem( EItemType eType, - const ::rtl::OUString& sItem, + const OUString& sItem, CacheItem& rItem) throw(css::uno::Exception); @@ -703,7 +703,7 @@ class FilterCache : public BaseLock and initialized within the requested modes successfully; a NULL reference otherwise. */ - css::uno::Reference< css::uno::XInterface > impl_createConfigAccess(const ::rtl::OUString& sRoot , + css::uno::Reference< css::uno::XInterface > impl_createConfigAccess(const OUString& sRoot , sal_Bool bReadOnly , sal_Bool bLocalesMode); @@ -728,7 +728,7 @@ class FilterCache : public BaseLock Can be empty if an internal error occurred or if the requested key does not exists! */ - css::uno::Any impl_getDirectCFGValue(const ::rtl::OUString& sDirectKey); + css::uno::Any impl_getDirectCFGValue(const OUString& sDirectKey); //--------------------------------------- @@ -793,8 +793,8 @@ class FilterCache : public BaseLock That does not include double registrations! */ void impl_resolveItem4TypeRegistration( CacheItemList* pList, - const ::rtl::OUString& sItem, - const ::rtl::OUString& sType) + const OUString& sItem, + const OUString& sType) throw(css::uno::Exception); //------------------------------------------- @@ -861,7 +861,7 @@ class FilterCache : public BaseLock */ CacheItem impl_loadItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , EReadOption eOption) throw(css::uno::Exception); @@ -893,7 +893,7 @@ class FilterCache : public BaseLock if an unrecoverable error occurs inside this operation. */ CacheItemList::iterator impl_loadItemOnDemand( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -908,7 +908,7 @@ class FilterCache : public BaseLock /** TODO */ void impl_addItem2FlushList( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); @@ -952,7 +952,7 @@ class FilterCache : public BaseLock */ EItemFlushState impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet , const CacheItemList& rList, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -980,35 +980,35 @@ class FilterCache : public BaseLock /** TODO */ CacheItem impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- /** TODO */ - void impl_interpretDataVal4Type(const ::rtl::OUString& sValue, + void impl_interpretDataVal4Type(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); //--------------------------------------- /** TODO */ - void impl_interpretDataVal4Filter(const ::rtl::OUString& sValue, + void impl_interpretDataVal4Filter(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); //--------------------------------------- /** TODO */ - OUStringList impl_tokenizeString(const ::rtl::OUString& sData , + OUStringList impl_tokenizeString(const OUString& sData , sal_Unicode cSeperator); //--------------------------------------- #if OSL_DEBUG_LEVEL > 0 /** TODO */ - ::rtl::OUString impl_searchFrameLoaderForType(const ::rtl::OUString& sType) const; - ::rtl::OUString impl_searchContentHandlerForType(const ::rtl::OUString& sType) const; + OUString impl_searchFrameLoaderForType(const OUString& sType) const; + OUString impl_searchContentHandlerForType(const OUString& sType) const; #endif //--------------------------------------- @@ -1019,7 +1019,7 @@ class FilterCache : public BaseLock @return sal_True if the requested module is installed; sal_False otherwise. */ - sal_Bool impl_isModuleInstalled(const ::rtl::OUString& sModule); + sal_Bool impl_isModuleInstalled(const OUString& sModule); //--------------------------------------- @@ -1031,7 +1031,7 @@ class FilterCache : public BaseLock @return [sal_Int32] the converted flag field. */ - static sal_Int32 impl_convertFlagNames2FlagField(const css::uno::Sequence< ::rtl::OUString >& lNames); + static sal_Int32 impl_convertFlagNames2FlagField(const css::uno::Sequence< OUString >& lNames); //--------------------------------------- @@ -1043,7 +1043,7 @@ class FilterCache : public BaseLock @return [seq< string >] the converted flag name list. */ - static css::uno::Sequence< ::rtl::OUString > impl_convertFlagField2FlagNames(sal_Int32 nFlags); + static css::uno::Sequence< OUString > impl_convertFlagField2FlagNames(sal_Int32 nFlags); }; } // namespace config diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 9270a166bc2d..ac0d5ad827cc 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -66,7 +66,7 @@ FilterFactory::~FilterFactory() -css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const ::rtl::OUString& sFilter) +css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const OUString& sFilter) throw(css::uno::Exception , css::uno::RuntimeException) { @@ -75,7 +75,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan -css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstanceWithArguments(const ::rtl::OUString& sFilter , +css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -83,7 +83,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sRealFilter = sFilter; + OUString sRealFilter = sFilter; #ifdef _FILTER_CONFIG_MIGRATION_Q_ @@ -122,7 +122,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan // search filter on cache CacheItem aFilter = m_rCache->getItem(FilterCache::E_FILTER, sRealFilter); - ::rtl::OUString sFilterService; + OUString sFilterService; aFilter[PROPNAME_FILTERSERVICE] >>= sFilterService; // create service instance @@ -156,7 +156,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan -css::uno::Sequence< ::rtl::OUString > SAL_CALL FilterFactory::getAvailableServiceNames() +css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames() throw(css::uno::RuntimeException) { /* Attention: Instead of getElementNames() this method have to return only filter names, @@ -167,7 +167,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FilterFactory::getAvailableServic */ CacheItem lIProps; CacheItem lEProps; - lEProps[PROPNAME_FILTERSERVICE] <<= ::rtl::OUString(); + lEProps[PROPNAME_FILTERSERVICE] <<= OUString(); OUStringList lUNOFilters; try @@ -184,7 +184,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FilterFactory::getAvailableServic -css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) +css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException) { // reject old deprecated queries ... @@ -194,7 +194,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea static_cast< css::container::XContainerQuery* >(this)); // convert "_query_xxx:..." to "getByDocService=xxx:..." - ::rtl::OUString sNewQuery(sQuery); + OUString sNewQuery(sQuery); sal_Int32 pos = sNewQuery.indexOf("_query_"); if (pos != -1) { @@ -233,7 +233,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea // pack list of item names as an enum list // Attention: Do not return empty reference for empty list! // The outside check "hasMoreElements()" should be enough, to detect this state :-) - css::uno::Sequence< ::rtl::OUString > lSet = lEnumSet.getAsConstList(); + css::uno::Sequence< OUString > lSet = lEnumSet.getAsConstList(); ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, lSet); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); } @@ -245,7 +245,7 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize // analyze query QueryTokenizer::const_iterator pIt; - ::rtl::OUString sDocumentService; + OUString sDocumentService; sal_Int32 nIFlags = 0; sal_Int32 nEFlags = 0; @@ -258,47 +258,47 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize if ( sDocumentService == "writer" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.text.TextDocument" ); + sDocumentService = OUString( "com.sun.star.text.TextDocument" ); } else if ( sDocumentService == "web" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.text.WebDocument" ); + sDocumentService = OUString( "com.sun.star.text.WebDocument" ); } else if ( sDocumentService == "global" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.text.GlobalDocument" ); + sDocumentService = OUString( "com.sun.star.text.GlobalDocument" ); } else if ( sDocumentService == "calc" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ); + sDocumentService = OUString( "com.sun.star.sheet.SpreadsheetDocument" ); } else if ( sDocumentService == "draw" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" ); + sDocumentService = OUString( "com.sun.star.drawing.DrawingDocument" ); } else if ( sDocumentService == "impress" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" ); + sDocumentService = OUString( "com.sun.star.presentation.PresentationDocument" ); } else if ( sDocumentService == "math" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.formula.FormulaProperties" ); + sDocumentService = OUString( "com.sun.star.formula.FormulaProperties" ); } #endif pIt = lTokens.find(QUERY_PARAM_IFLAGS); if (pIt != lTokens.end()) - nIFlags = ::rtl::OUString(pIt->second).toInt32(); + nIFlags = OUString(pIt->second).toInt32(); pIt = lTokens.find(QUERY_PARAM_EFLAGS); if (pIt != lTokens.end()) - nEFlags = ::rtl::OUString(pIt->second).toInt32(); + nEFlags = OUString(pIt->second).toInt32(); // SAFE -> ---------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -314,14 +314,14 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize { try { - const ::rtl::OUString& sName = *pName; + const OUString& sName = *pName; const CacheItem aFilter = pCache->getItem(FilterCache::E_FILTER, sName); CacheItem::const_iterator pProp ; // "matchByDocumentService=" => any filter will be addressed here // "matchByDocumentService=all" => any filter will be addressed here // "matchByDocumentService=com.sun.star..." => only filter matching this document service will be addressed - ::rtl::OUString sCheckValue = aFilter.getUnpackedValueOrDefault(PROPNAME_DOCUMENTSERVICE, ::rtl::OUString()); + OUString sCheckValue = aFilter.getUnpackedValueOrDefault(PROPNAME_DOCUMENTSERVICE, OUString()); if ( (!sDocumentService.isEmpty() ) && (!sDocumentService.equals(QUERY_CONSTVALUE_ALL)) && @@ -390,7 +390,7 @@ class stlcomp_removeIfMatchFlags , m_bIFlags(bIFlags) {} - bool operator() (const ::rtl::OUString& sFilter) const + bool operator() (const OUString& sFilter) const { try { @@ -421,7 +421,7 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke // analyze the given query parameter QueryTokenizer::const_iterator pIt1; - ::rtl::OUString sModule; + OUString sModule; sal_Int32 nIFlags = -1; sal_Int32 nEFlags = -1; @@ -430,10 +430,10 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke sModule = pIt1->second; pIt1 = lTokens.find(QUERY_PARAM_IFLAGS); if (pIt1 != lTokens.end()) - nIFlags = ::rtl::OUString(pIt1->second).toInt32(); + nIFlags = OUString(pIt1->second).toInt32(); pIt1 = lTokens.find(QUERY_PARAM_EFLAGS); if (pIt1 != lTokens.end()) - nEFlags = ::rtl::OUString(pIt1->second).toInt32(); + nEFlags = OUString(pIt1->second).toInt32(); // simple search for filters of one specific module. OUStringList lFilterList; @@ -456,7 +456,7 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke pIt3 != lFilters4Module.end() ; ++pIt3 ) { - const ::rtl::OUString& sFilter = *pIt3; + const OUString& sFilter = *pIt3; lFilterList.push_back(sFilter); } } @@ -495,7 +495,7 @@ OUStringList FilterFactory::impl_getListOfInstalledModules() const -OUStringList FilterFactory::impl_getSortedFilterListForModule(const ::rtl::OUString& sModule, +OUStringList FilterFactory::impl_getSortedFilterListForModule(const OUString& sModule, sal_Int32 nIFlags, sal_Int32 nEFlags) const { @@ -524,7 +524,7 @@ OUStringList FilterFactory::impl_getSortedFilterListForModule(const ::rtl::OUStr pIt2 != lOtherFilters.end() ; ++pIt2 ) { - const ::rtl::OUString& rFilter = *pIt2; + const OUString& rFilter = *pIt2; pIt3 = ::std::find(lSortedFilters.begin(), lSortedFilters.end(), rFilter); if (pIt3 == lSortedFilters.end()) lMergedFilters.push_back(rFilter); @@ -550,7 +550,7 @@ OUStringList FilterFactory::impl_getSortedFilterListForModule(const ::rtl::OUStr -OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUString& sModule) const +OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const OUString& sModule) const { // SAFE -> ---------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -589,17 +589,17 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS -::rtl::OUString FilterFactory::impl_getImplementationName() +OUString FilterFactory::impl_getImplementationName() { - return ::rtl::OUString( "com.sun.star.comp.filter.config.FilterFactory" ); + return OUString( "com.sun.star.comp.filter.config.FilterFactory" ); } -css::uno::Sequence< ::rtl::OUString > FilterFactory::impl_getSupportedServiceNames() +css::uno::Sequence< OUString > FilterFactory::impl_getSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > lServiceNames(1); - lServiceNames[0] = ::rtl::OUString( "com.sun.star.document.FilterFactory" ); + css::uno::Sequence< OUString > lServiceNames(1); + lServiceNames[0] = OUString( "com.sun.star.document.FilterFactory" ); return lServiceNames; } diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 02ffc825a3f0..9d4697732ae9 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -70,22 +70,22 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer //--------------------------------------- // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& sFilter) + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sFilter) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::OUString& sFilter , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException); //--------------------------------------- // XContainerQuery - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException); //------------------------------------------- @@ -128,7 +128,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer /** TODO document me */ - OUStringList impl_getSortedFilterListForModule(const ::rtl::OUString& sModule, + OUStringList impl_getSortedFilterListForModule(const OUString& sModule, sal_Int32 nIFlags, sal_Int32 nEFlags) const; @@ -143,7 +143,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return A string list of internal filter names. Can be empty. */ - OUStringList impl_readSortedFilterListFromConfig(const ::rtl::OUString& sModule) const; + OUStringList impl_readSortedFilterListFromConfig(const OUString& sModule) const; //------------------------------------------- // static uno helper! @@ -160,7 +160,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -172,7 +172,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index fa65dcc57b19..7ded4936dc3b 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -48,7 +48,7 @@ FrameLoaderFactory::~FrameLoaderFactory() -css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const ::rtl::OUString& sLoader) +css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const OUString& sLoader) throw(css::uno::Exception , css::uno::RuntimeException) { @@ -57,7 +57,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI -css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstanceWithArguments(const ::rtl::OUString& sLoader , +css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -65,7 +65,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sRealLoader = sLoader; + OUString sRealLoader = sLoader; #ifdef _FILTER_CONFIG_MIGRATION_Q_ @@ -79,7 +79,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI { _FILTER_CONFIG_LOG_("FrameLoaderFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); - css::uno::Sequence< ::rtl::OUString > lTypes(1); + css::uno::Sequence< OUString > lTypes(1); lTypes[0] = sLoader; css::uno::Sequence< css::beans::NamedValue > lQuery(1); @@ -136,7 +136,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI -css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames() +css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames() throw(css::uno::RuntimeException) { // must be the same list as ((XNameAccess*)this)->getElementNames() return! diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index 38acef126b62..fb2e32f21214 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -69,16 +69,16 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer //--------------------------------------- // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& sLoader) + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sLoader) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::OUString& sLoader , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException); //------------------------------------------- @@ -96,7 +96,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -108,7 +108,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx index a75d1290e873..8a28f1e2cf60 100644 --- a/filter/source/config/cache/querytokenizer.cxx +++ b/filter/source/config/cache/querytokenizer.cxx @@ -27,13 +27,13 @@ namespace filter{ -QueryTokenizer::QueryTokenizer(const ::rtl::OUString& sQuery) +QueryTokenizer::QueryTokenizer(const OUString& sQuery) : m_bValid(sal_True) { sal_Int32 token = 0; while(token != -1) { - ::rtl::OUString sToken = sQuery.getToken(0, ':', token); + OUString sToken = sQuery.getToken(0, ':', token); if (!sToken.isEmpty()) { sal_Int32 equal = sToken.indexOf('='); @@ -42,8 +42,8 @@ QueryTokenizer::QueryTokenizer(const ::rtl::OUString& sQuery) m_bValid = sal_False; OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer()\nFound non boolean query parameter ... but its key is empty. Will be ignored!\n"); - ::rtl::OUString sKey; - ::rtl::OUString sVal; + OUString sKey; + OUString sVal; sKey = sToken; if (equal > 0) diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index c7e45eb724b9..3b9ab22c4622 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -45,10 +45,10 @@ namespace filter{ @attention This class is not threadsafe implemented. Because its not neccessary. But you have to make shure, that ist not used as such :-) */ -class QueryTokenizer : public ::boost::unordered_map< ::rtl::OUString , - ::rtl::OUString , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > +class QueryTokenizer : public ::boost::unordered_map< OUString , + OUString , + OUStringHash , + ::std::equal_to< OUString > > { //------------------------------------------- // member @@ -78,7 +78,7 @@ class QueryTokenizer : public ::boost::unordered_map< ::rtl::OUString @param sQuery the query string. */ - QueryTokenizer(const ::rtl::OUString& sQuery); + QueryTokenizer(const OUString& sQuery); //--------------------------------------- diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx index e4a7baea55d2..952f5d746e55 100644 --- a/filter/source/config/cache/registration.cxx +++ b/filter/source/config/cache/registration.cxx @@ -43,7 +43,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xSMGR = reinterpret_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager); com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory; - rtl::OUString sImplName = rtl::OUString::createFromAscii(pImplementationName); + OUString sImplName = OUString::createFromAscii(pImplementationName); if (TypeDetection::impl_getImplementationName() == sImplName) xFactory = cppu::createSingleFactory( xSMGR, diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 3e4c224b2a11..5e3697c0474f 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -64,10 +64,10 @@ TypeDetection::~TypeDetection() -::rtl::OUString SAL_CALL TypeDetection::queryTypeByURL(const ::rtl::OUString& sURL) +OUString SAL_CALL TypeDetection::queryTypeByURL(const OUString& sURL) throw (css::uno::RuntimeException) { - ::rtl::OUString sType; + OUString sType; // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -122,7 +122,7 @@ namespace { * In each category, rank them from strictly-structured to * loosely-structured. */ -int getFlatTypeRank(const rtl::OUString& rType) +int getFlatTypeRank(const OUString& rType) { // List formats from more complex to less complex. // TODO: Add more. @@ -365,7 +365,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) } -::rtl::OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, +OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, sal_Bool bAllowDeep ) throw (css::uno::RuntimeException) { @@ -377,7 +377,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) //******************************************* // parse given URL to split it into e.g. main and jump marks ... - ::rtl::OUString sURL = stlDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString()); + OUString sURL = stlDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), OUString()); #if OSL_DEBUG_LEVEL > 0 if (stlDescriptor.find( "FileName" ) != stlDescriptor.end()) @@ -389,14 +389,14 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(m_xContext)); xParser->parseStrict(aURL); - rtl::OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault( - comphelper::MediaDescriptor::PROP_FILTERNAME(), rtl::OUString()); + OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault( + comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString()); if (!aSelectedFilter.isEmpty()) { // Caller specified the filter type. Honor it. Just get the default // type for that filter, and bail out. if (impl_validateAndSetFilterOnDescriptor(stlDescriptor, aSelectedFilter)) - return stlDescriptor[comphelper::MediaDescriptor::PROP_TYPENAME()].get(); + return stlDescriptor[comphelper::MediaDescriptor::PROP_TYPENAME()].get(); } FlatDetection lFlatTypes; @@ -409,8 +409,8 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) lFlatTypes.sort(SortByPriority()); lFlatTypes.unique(EqualByType()); - ::rtl::OUString sType ; - ::rtl::OUString sLastChance; + OUString sType ; + OUString sLastChance; try { @@ -446,7 +446,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sType = ::rtl::OUString(); } + { sType = OUString(); } //******************************************* // adapt media descriptor, so it contains the right values @@ -461,27 +461,27 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescriptor& rDescriptor, - ::rtl::OUString& sType ) + OUString& sType ) { // a) // Dont overwrite a might preselected filter! - ::rtl::OUString sFilter = rDescriptor.getUnpackedValueOrDefault( + OUString sFilter = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_FILTERNAME(), - ::rtl::OUString()); + OUString()); if (!sFilter.isEmpty()) return; // b) // check a preselected document service too. // Then we have to search a suitable filter witin this module. - ::rtl::OUString sDocumentService = rDescriptor.getUnpackedValueOrDefault( + OUString sDocumentService = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_DOCUMENTSERVICE(), - ::rtl::OUString()); + OUString()); if (!sDocumentService.isEmpty()) { try { - ::rtl::OUString sRealType = sType; + OUString sRealType = sType; // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -539,7 +539,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip // - or to any other filter if no preferred filter was set. // Note: It's an optimization only! // It's not guaranteed, that such preferred filter exists. - sFilter = ::rtl::OUString(); + sFilter = OUString(); try { // SAFE -> @@ -562,7 +562,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip // d) // Search for any import(!) filter, which is registered for this type. - sFilter = ::rtl::OUString(); + sFilter = OUString(); try { // SAFE -> @@ -603,7 +603,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip aLock.clear(); // <- SAFE - sFilter = ::rtl::OUString(); + sFilter = OUString(); } if (!sFilter.isEmpty()) @@ -637,7 +637,7 @@ bool TypeDetection::impl_getPreselectionForType( bool bMatchByExtension = false; // validate type - ::rtl::OUString sType(sPreSelType); + OUString sType(sPreSelType); CacheItem aType; try { @@ -649,7 +649,7 @@ bool TypeDetection::impl_getPreselectionForType( } catch(const css::container::NoSuchElementException&) { - sType = ::rtl::OUString(); + sType = OUString(); bBreakDetection = true; } @@ -665,7 +665,7 @@ bool TypeDetection::impl_getPreselectionForType( { // extract extension from URL .. to check it case-insensitive ! INetURLObject aParser (aParsedURL.Main); - ::rtl::OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , + OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , sal_True , INetURLObject::DECODE_WITH_CHARSET); sExtension = sExtension.toAsciiLowerCase(); @@ -679,7 +679,7 @@ bool TypeDetection::impl_getPreselectionForType( pIt != lExtensions.end() ; ++pIt ) { - ::rtl::OUString sCheckExtension(pIt->toAsciiLowerCase()); + OUString sCheckExtension(pIt->toAsciiLowerCase()); if (sCheckExtension.equals(sExtension)) { bBreakDetection = true; @@ -864,15 +864,15 @@ void TypeDetection::impl_getAllFormatTypes( -::rtl::OUString TypeDetection::impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , +OUString TypeDetection::impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , const FlatDetection& lFlatTypes , sal_Bool bAllowDeep , OUStringList& rUsedDetectors, - ::rtl::OUString& rLastChance ) + OUString& rLastChance ) { // reset it everytimes, so the outside code can distinguish between // a set and a not set value. - rLastChance = ::rtl::OUString(); + rLastChance = OUString(); rUsedDetectors.clear(); // step over all possible types for this URL. @@ -916,7 +916,7 @@ void TypeDetection::impl_getAllFormatTypes( CacheItem aType = m_rCache->getItem(FilterCache::E_TYPE, sFlatType); aLock.clear(); - ::rtl::OUString sDetectService; + OUString sDetectService; aType[PROPNAME_DETECTSERVICE] >>= sDetectService; // c) @@ -936,7 +936,7 @@ void TypeDetection::impl_getAllFormatTypes( // Such detectors will be ignored if may be "impl_detectTypeDeepOnly()" // must be called later! rUsedDetectors.push_back(sDetectService); - ::rtl::OUString sDeepType = impl_askDetectService(sDetectService, rDescriptor); + OUString sDeepType = impl_askDetectService(sDetectService, rDescriptor); // d) if (!sDeepType.isEmpty()) @@ -947,7 +947,7 @@ void TypeDetection::impl_getAllFormatTypes( // e) } - return ::rtl::OUString(); + return OUString(); // <- SAFE ---------------------------------- } @@ -975,7 +975,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript } } -::rtl::OUString TypeDetection::impl_askDetectService(const ::rtl::OUString& sDetectService, +OUString TypeDetection::impl_askDetectService(const OUString& sDetectService, ::comphelper::MediaDescriptor& rDescriptor ) { // Open the stream and add it to the media descriptor if this method is called for the first time. @@ -1015,9 +1015,9 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript } if ( ! xDetector.is()) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString sDeepType; + OUString sDeepType; try { // start deep detection @@ -1039,7 +1039,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // Thrown exceptions mostly will end in crash recovery ... // But might be we find another deep detection service which can detect the same // document without a problem .-) - sDeepType = ::rtl::OUString(); + sDeepType = OUString(); } // seek to 0 is an optional feature to be more robust against @@ -1057,23 +1057,23 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript if (bValidType) return sDeepType; - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor) +OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor) { css::uno::Reference< css::task::XInteractionHandler > xInteraction = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_INTERACTIONHANDLER(), css::uno::Reference< css::task::XInteractionHandler >()); if (!xInteraction.is()) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString sURL = + OUString sURL = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), - ::rtl::OUString()); + OUString()); css::uno::Reference< css::io::XInputStream > xStream = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_INPUTSTREAM(), @@ -1089,7 +1089,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript (!xStream.is() ) || // non existing file ! (sURL.equalsIgnoreAsciiCase("private:stream")) // not a good idea .-) ) - return ::rtl::OUString(); + return OUString(); try { @@ -1099,7 +1099,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // "Cancel" pressed? => return with error if (aRequest.isAbort()) - return ::rtl::OUString(); + return OUString(); // "OK" pressed => verify the selected filter, get it's coressponding // type and return it. (BTW: We must update the media descriptor here ...) @@ -1107,18 +1107,18 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // a type here only. But we must be shure, that the selected filter is used // too and no ambigous filter registration disturb us .-) - ::rtl::OUString sFilter = aRequest.getFilter(); + OUString sFilter = aRequest.getFilter(); if (!impl_validateAndSetFilterOnDescriptor(rDescriptor, sFilter)) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString sType; + OUString sType; rDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] >>= sType; return sType; } catch(const css::uno::Exception&) {} - return ::rtl::OUString(); + return OUString(); } @@ -1127,7 +1127,7 @@ void TypeDetection::impl_openStream(::comphelper::MediaDescriptor& rDescriptor) throw (css::uno::Exception) { sal_Bool bSuccess = sal_False; - ::rtl::OUString sURL = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString() ); + OUString sURL = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), OUString() ); sal_Bool bRequestedReadOnly = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_READONLY(), sal_False ); if ( !sURL.isEmpty() && ::utl::LocalFileHelper::IsLocalFile( INetURLObject( sURL ).GetMainURL( INetURLObject::NO_DECODE ) ) ) { @@ -1165,7 +1165,7 @@ void TypeDetection::impl_removeTypeFilterFromDescriptor(::comphelper::MediaDescr sal_Bool TypeDetection::impl_validateAndSetTypeOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sType ) + const OUString& sType ) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -1185,7 +1185,7 @@ sal_Bool TypeDetection::impl_validateAndSetTypeOnDescriptor( ::comphelper:: sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sFilter ) + const OUString& sFilter ) { try { @@ -1193,7 +1193,7 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( ::comphelper ::osl::ResettableMutexGuard aLock(m_aLock); CacheItem aFilter = m_rCache->getItem(FilterCache::E_FILTER, sFilter); - ::rtl::OUString sType; + OUString sType; aFilter[PROPNAME_TYPE] >>= sType; CacheItem aType = m_rCache->getItem(FilterCache::E_TYPE, sType); diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index f1dc34886fc8..e58042c58d89 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -126,11 +126,11 @@ private: An empty value if detection failed. .... but see rLastChance for additional returns! */ - ::rtl::OUString impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , + OUString impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , const FlatDetection& lFlatTypes , sal_Bool bAllowDeep , OUStringList& rUsedDetectors, - ::rtl::OUString& rLastChance ); + OUString& rLastChance ); //--------------------------------------- @@ -165,7 +165,7 @@ private: @param rDescriptor a stl representation of the MediaDescriptor as in/out parameter. */ - ::rtl::OUString impl_askDetectService(const ::rtl::OUString& sDetectService, + OUString impl_askDetectService(const OUString& sDetectService, ::comphelper::MediaDescriptor& rDescriptor ); //--------------------------------------- @@ -183,7 +183,7 @@ private: @return [string] a valid type name or an empty string if user canceled interaction. */ - ::rtl::OUString impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor); + OUString impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor); //--------------------------------------- @@ -244,7 +244,7 @@ private: could be set on the descriptor. */ sal_Bool impl_validateAndSetTypeOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sType ); + const OUString& sType ); //--------------------------------------- @@ -266,7 +266,7 @@ private: could be set on the descriptor. */ sal_Bool impl_validateAndSetFilterOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sFilter ); + const OUString& sFilter ); //--------------------------------------- @@ -316,7 +316,7 @@ private: (see code) */ void impl_checkResultsAndAddBestFilter(::comphelper::MediaDescriptor& rDescriptor, - ::rtl::OUString& sType ); + OUString& sType ); //------------------------------------------- // uno interface @@ -326,10 +326,10 @@ public: //--------------------------------------- // XTypeDetection - virtual ::rtl::OUString SAL_CALL queryTypeByURL(const ::rtl::OUString& sURL) + virtual OUString SAL_CALL queryTypeByURL(const OUString& sURL) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, + virtual OUString SAL_CALL queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, sal_Bool bAllowDeep ) throw (css::uno::RuntimeException); @@ -348,7 +348,7 @@ public: @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -360,7 +360,7 @@ public: @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx index 18f74ec5c054..5a4ab63470e7 100644 --- a/filter/source/flash/impswfdialog.cxx +++ b/filter/source/flash/impswfdialog.cxx @@ -24,7 +24,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using ::rtl::OUString; // ---------------- // - ImpPDFDialog - diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index 382a1027a4cc..86c08642d229 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -53,8 +53,8 @@ protected: // OGenericUnoDialog virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); virtual Dialog* createDialog( Window* pParent ); virtual void executedDialog( sal_Int16 nExecutionResult ); virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index de8e87b4ed0e..8e95687fb22c 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -39,14 +39,14 @@ typedef ::std::map ChecksumCache; class GDIMetaFile; -inline ::rtl::OUString STR(const sal_Char * in) +inline OUString STR(const sal_Char * in) { - return ::rtl::OUString::createFromAscii(in); + return OUString::createFromAscii(in); } -inline ::rtl::OUString VAL(sal_Int32 in) +inline OUString VAL(sal_Int32 in) { - return ::rtl::OUString::valueOf(in); + return OUString::valueOf(in); } namespace swf { @@ -72,7 +72,7 @@ public: sal_Int32 mnPresOrder; ::com::sun::star::presentation::ClickAction meClickAction; - ::rtl::OUString maBookmark; + OUString maBookmark; sal_Int32 mnDimColor; sal_Bool mbDimHide; @@ -80,7 +80,7 @@ public: sal_Bool mbSoundOn; sal_Bool mbPlayFull; - ::rtl::OUString maSoundURL; + OUString maSoundURL; sal_Int32 mnBlueScreenColor; diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index d3d530677405..e08667e0c84b 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::task; -using ::rtl::OUString; -using ::rtl::OString; using ::com::sun::star::lang::XComponent; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::io::XOutputStream; diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx index 0ddc437d6006..ec9352023691 100644 --- a/filter/source/flash/swfuno.cxx +++ b/filter/source/flash/swfuno.cxx @@ -37,8 +37,8 @@ extern Sequence< OUString > SAL_CALL FlashExportFilter_getSupportedServiceNames( extern Reference< XInterface > SAL_CALL FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw ( Exception ); } -extern rtl::OUString SWFDialog_getImplementationName () throw (com::sun::star::uno::RuntimeException); -extern com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SWFDialog_getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); +extern OUString SWFDialog_getImplementationName () throw (com::sun::star::uno::RuntimeException); +extern com::sun::star::uno::Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SWFDialog_createInstance( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( com::sun::star::uno::Exception ); using namespace ::swf; diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index d6dcd9654984..a4ab343098e4 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -553,7 +553,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I if( nLen > 1 ) { - aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rtl::OUString(rText.GetChar((sal_uInt16) nLen - 1)) ); + aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( OUString(rText.GetChar((sal_uInt16) nLen - 1)) ); if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) ) { diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index b951064dfbcd..766b02a34025 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -27,8 +27,6 @@ using namespace ::swf; using namespace ::std; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -using ::rtl::OUString; -using ::rtl::OString; // ----------------------------------------------------------------------------- @@ -462,7 +460,7 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev ) // let the virtual device convert the character to polygons PolyPolygon aPolyPoly; - pVDev->GetTextOutline( aPolyPoly, rtl::OUString(nChar) ); + pVDev->GetTextOutline( aPolyPoly, OUString(nChar) ); maGlyphOffsets.push_back( _uInt16( maGlyphData.getOffset() ) ); diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index a774534292b7..08628202837f 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -90,7 +90,7 @@ sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterC xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 8cdf07c0d872..1fe92ac9806d 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -477,7 +477,7 @@ void METWriter::WriteChrSets() *pMET << (sal_uInt8)0x03 << (sal_uInt8)0x52; *pMET << (sal_uInt8)0x24 << (sal_uInt8)0x02 << (sal_uInt8)0x08 << (sal_uInt8)0x00; - rtl::OString n(rtl::OUStringToOString(pCS->aName, + OString n(OUStringToOString(pCS->aName, osl_getThreadTextEncoding())); for (i=0; i<32; i++) { @@ -1358,7 +1358,7 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier, void METWriter::METChrStr( Point aPt, String aUniStr ) { - rtl::OString aStr(rtl::OUStringToOString(aUniStr, + OString aStr(OUStringToOString(aUniStr, osl_getThreadTextEncoding())); sal_uInt16 nLen = aStr.getLength(); WillWriteOrder( 11 + nLen ); @@ -1901,7 +1901,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) aPt2 = aPolyDummy.GetPoint( 0 ); } } - METChrStr( aPt2, rtl::OUString( aStr.GetChar( i ) ) ); + METChrStr( aPt2, OUString( aStr.GetChar( i ) ) ); } } else @@ -1955,7 +1955,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) aPt2 = aPolyDummy.GetPoint( 0 ); } } - METChrStr( aPt2, rtl::OUString( aStr.GetChar( i ) ) ); + METChrStr( aPt2, OUString( aStr.GetChar( i ) ) ); } delete[] pDXAry; @@ -2487,7 +2487,7 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index 36de78d077ab..19f6b43319e2 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -79,7 +79,7 @@ sal_Bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilter xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -179,7 +179,7 @@ void PBMWriter::ImplWriteBody() void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) { - const rtl::OString aNum(rtl::OString::valueOf(nNumber)); + const OString aNum(OString::valueOf(nNumber)); m_rOStm << aNum.getStr(); } diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 4dd2e42902b1..5c7738bca8f9 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -79,7 +79,7 @@ sal_Bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilter xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -203,7 +203,7 @@ void PGMWriter::ImplWriteBody() // write a decimal number in ascii format into the stream void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) { - const rtl::OString aNum(rtl::OString::valueOf(nNumber)); + const OString aNum(OString::valueOf(nNumber)); m_rOStm << aNum.getStr(); } diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 765b4f74544d..c68d400ffa2c 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -310,7 +310,7 @@ void PictWriter::WriteRGBColor(const Color & rColor) void PictWriter::WriteString( const String & rString ) { - rtl::OString aString(rtl::OUStringToOString(rString, osl_getThreadTextEncoding())); + OString aString(OUStringToOString(rString, osl_getThreadTextEncoding())); sal_Int32 nLen = aString.getLength(); if ( nLen > 255 ) nLen = 255; @@ -695,7 +695,7 @@ void PictWriter::WriteOpcode_FontName(const Font & rFont) if (bDstFontNameValid==sal_False || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetName()) { - rtl::OString aString(rtl::OUStringToOString(rFont.GetName(), osl_getThreadTextEncoding())); + OString aString(OUStringToOString(rFont.GetName(), osl_getThreadTextEncoding())); sal_uInt16 nFontNameLen = aString.getLength(); if ( nFontNameLen ) { @@ -1337,7 +1337,7 @@ void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const sal if ( i > 0 ) aPt.X() += pDXAry[ i - 1 ]; - WriteOpcode_Text( aPt, rtl::OUString( c ), bDelta ); + WriteOpcode_Text( aPt, OUString( c ), bDelta ); bDelta = sal_True; } } @@ -2205,7 +2205,7 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index 2ad2798c20ce..e23bbbc8f2e0 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -79,7 +79,7 @@ sal_Bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilter xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -212,7 +212,7 @@ void PPMWriter::ImplWriteBody() void PPMWriter::ImplWriteNumber(sal_Int32 nNumber) { - const rtl::OString aNum(rtl::OString::valueOf(nNumber)); + const OString aNum(OString::valueOf(nNumber)); m_rOStm << aNum.getStr(); } diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index cbd9faa540cb..4d9cd3ec2266 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -211,7 +211,7 @@ private: void ImplText( const String& rUniString, const Point& rPos, const sal_Int32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev ); void ImplSetAttrForText( const Point & rPoint ); void ImplWriteCharacter( sal_Char ); - void ImplWriteString( const rtl::OString&, VirtualDevice& rVDev, const sal_Int32* pDXArry = NULL, sal_Bool bStretch = sal_False ); + void ImplWriteString( const OString&, VirtualDevice& rVDev, const sal_Int32* pDXArry = NULL, sal_Bool bStretch = sal_False ); void ImplDefineFont( const char*, const char* ); void ImplClosePathDraw( sal_uLong nMode = PS_RET ); @@ -271,7 +271,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -1246,7 +1246,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ ); sal_Bool bSkipSequence = sal_False; - rtl::OString sSeqEnd; + OString sSeqEnd; if( pA->GetComment().equals( "XPATHSTROKE_SEQ_BEGIN" ) ) { @@ -1396,7 +1396,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) pMA = rMtf.GetAction( nCurAction ); if ( pMA->GetType() == META_COMMENT_ACTION ) { - rtl::OString sComment( ((MetaCommentAction*)pMA)->GetComment() ); + OString sComment( ((MetaCommentAction*)pMA)->GetComment() ); if ( sComment.equals( sSeqEnd ) ) break; } @@ -1996,7 +1996,7 @@ void PSWriter::ImplWriteCharacter( sal_Char nChar ) //--------------------------------------------------------------------------------- -void PSWriter::ImplWriteString( const rtl::OString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, sal_Bool bStretch ) +void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, sal_Bool bStretch ) { sal_Int32 nLen = rString.getLength(); if ( nLen ) @@ -2009,7 +2009,7 @@ void PSWriter::ImplWriteString( const rtl::OString& rString, VirtualDevice& rVDe { if ( i > 0 ) nx = pDXArry[ i - 1 ]; - ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( rtl::OUString(rString[i]) ) ); + ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( OUString(rString[i]) ) ); ImplWriteDouble( nx ); ImplWriteLine( "(", PS_NONE ); ImplWriteCharacter( rString[i] ); @@ -2080,7 +2080,7 @@ void PSWriter::ImplText( const String& rUniString, const Point& rPos, const sal_ if ( mnTextMode == 2 ) // forcing output one complete text packet, by pDXArry = NULL; // ignoring the kerning array ImplSetAttrForText( rPos ); - rtl::OString aStr(rtl::OUStringToOString(rUniString, + OString aStr(OUStringToOString(rUniString, maFont.GetCharSet())); ImplWriteString( aStr, rVDev, pDXArry, nWidth != 0 ); if ( maFont.GetOrientation() ) @@ -2426,7 +2426,7 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) { - const rtl::OString aNumber(rtl::OString::valueOf(nNumber)); + const OString aNumber(OString::valueOf(nNumber)); mnCursorPos += aNumber.getLength(); *mpPS << aNumber.getStr(); ImplExecMode(nMode); @@ -2442,7 +2442,7 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) if ( !nPTemp && nATemp && ( fNumber < 0.0 ) ) *mpPS << (sal_Char)'-'; - const rtl::OString aNumber1(rtl::OString::valueOf(nPTemp)); + const OString aNumber1(OString::valueOf(nPTemp)); *mpPS << aNumber1.getStr(); mnCursorPos += aNumber1.getLength(); @@ -2451,7 +2451,7 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) int zCount = 0; *mpPS << (sal_uInt8)'.'; mnCursorPos++; - const rtl::OString aNumber2(rtl::OString::valueOf(nATemp)); + const OString aNumber2(OString::valueOf(nATemp)); sal_Int16 n, nLen = aNumber2.getLength(); if ( nLen < 8 ) @@ -2488,7 +2488,7 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode nNumber = -nNumber; mnCursorPos++; } - const rtl::OString aScaleFactor(rtl::OString::valueOf(nNumber)); + const OString aScaleFactor(OString::valueOf(nNumber)); sal_uLong nLen = aScaleFactor.getLength(); long nStSize = ( nCount + 1 ) - nLen; if ( nStSize >= 1 ) diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index fca5570b467f..44506c4228e5 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -90,7 +90,7 @@ sal_Bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilter xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index ba665bcaac74..9949974bd27c 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -148,7 +148,7 @@ sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilt xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 14ff2547c1d5..43fe370ea2f3 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -91,7 +91,7 @@ sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilter xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -207,7 +207,7 @@ void XPMWriter::ImplWriteBody() void XPMWriter::ImplWriteNumber(sal_Int32 nNumber) { - const rtl::OString aNum(rtl::OString::valueOf(nNumber)); + const OString aNum(OString::valueOf(nNumber)); m_rOStm << aNum.getStr(); } diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 2e83c45af985..12d8f9867bc5 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -94,7 +94,7 @@ sal_Bool CGMImpressOutAct::ImplInitPage() // --------------------------------------------------------------- -sal_Bool CGMImpressOutAct::ImplCreateShape( const ::rtl::OUString& rType ) +sal_Bool CGMImpressOutAct::ImplCreateShape( const OUString& rType ) { uno::Reference< uno::XInterface > xNewShape( maXMultiServiceFactory->createInstance( rType ) ); maXShape = uno::Reference< drawing::XShape >( xNewShape, uno::UNO_QUERY ); @@ -374,7 +374,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty if ( pFontEntry ) { nFontType = pFontEntry->nFontType; - aFontDescriptor.Name = rtl::OUString::createFromAscii( (const char*)pFontEntry->pFontName ); + aFontDescriptor.Name = OUString::createFromAscii( (const char*)pFontEntry->pFontName ); } aFontDescriptor.Height = ( sal_Int16 )( ( mpCGM->pElement->nCharacterHeight * (double)1.50 ) ); if ( nFontType & 1 ) @@ -860,7 +860,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha uno::Any aFirstQuery( maXShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0) )); if( aFirstQuery >>= xText ) { - String aStr( rtl::OUString::createFromAscii( pString ) ); + String aStr( OUString::createFromAscii( pString ) ); uno::Reference< text::XTextCursor > aXTextCursor( xText->createTextCursor() ); { @@ -925,7 +925,7 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla uno::Any aFirstQuery( aShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0)) ); if( aFirstQuery >>= xText ) { - String aStr( rtl::OUString::createFromAscii( pString ) ); + String aStr( OUString::createFromAscii( pString ) ); uno::Reference< text::XTextCursor > aXTextCursor( xText->createTextCursor() ); if ( aXTextCursor.is() ) diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index 0190934aea14..d6a67da176fb 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -99,7 +99,7 @@ class CGMImpressOutAct : public CGMOutAct ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > maXMultiServiceFactory; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > maXShape; - sal_Bool ImplCreateShape( const ::rtl::OUString& rType ); + sal_Bool ImplCreateShape( const OUString& rType ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > maXPropSet; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > maXShapes; diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index 369736a61b6b..9635ed32a9a2 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -414,7 +414,7 @@ void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity & rE, const DXFTransfor double fA; sal_uInt16 nHeight; short nAng; - rtl::OString aStr( rE.sText ); + OString aStr( rE.sText ); DXFTransform aT( DXFTransform(rE.fXScale,rE.fHeight,1.0,rE.fRotAngle,rE.aP0), rTransform ); aT.TransDir(DXFVector(0,1,0),aV); nHeight=(sal_uInt16)(aV.Abs()+0.5); @@ -423,7 +423,7 @@ void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity & rE, const DXFTransfor aT.TransDir(DXFVector(1,0,0),aV); if ( SetFontAttribute( rE,nAng, nHeight, aV. Abs() ) ) { - rtl::OUString aUString(rtl::OStringToOUString(aStr, pDXF->getTextEncoding())); + OUString aUString(OStringToOUString(aStr, pDXF->getTextEncoding())); aT.Transform( DXFVector( 0, 0, 0 ), aPt ); pVirDev->DrawText( aPt, aUString ); } @@ -473,7 +473,7 @@ void DXF2GDIMetaFile::DrawAttribEntity(const DXFAttribEntity & rE, const DXFTran double fA; sal_uInt16 nHeight; short nAng; - rtl::OString aStr( rE.sText ); + OString aStr( rE.sText ); DXFTransform aT( DXFTransform( rE.fXScale, rE.fHeight, 1.0, rE.fRotAngle, rE.aP0 ), rTransform ); aT.TransDir(DXFVector(0,1,0),aV); nHeight=(sal_uInt16)(aV.Abs()+0.5); @@ -482,7 +482,7 @@ void DXF2GDIMetaFile::DrawAttribEntity(const DXFAttribEntity & rE, const DXFTran aT.TransDir(DXFVector(1,0,0),aV); if (SetFontAttribute(rE,nAng,nHeight,aV.Abs())) { - rtl::OUString aUString(rtl::OStringToOUString(aStr, pDXF->getTextEncoding())); + OUString aUString(OStringToOUString(aStr, pDXF->getTextEncoding())); aT.Transform( DXFVector( 0, 0, 0 ), aPt ); pVirDev->DrawText( aPt, aUString ); } diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx index f6d21bfa0911..e6a741d181cd 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx @@ -30,14 +30,14 @@ // a 0-sign occurs; this functions converts 0-signs to blanks and reads // a complete line until a cr/lf is found -rtl::OString DXFReadLine(SvStream& rIStm) +OString DXFReadLine(SvStream& rIStm) { char buf[256 + 1]; sal_Bool bEnd = sal_False; sal_uLong nOldFilePos = rIStm.Tell(); char c = 0; - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; while( !bEnd && !rIStm.GetError() ) // !!! do not check for EOF // !!! because we read blockwise @@ -46,7 +46,7 @@ rtl::OString DXFReadLine(SvStream& rIStm) if( !nLen ) { if( aBuf.isEmpty() ) - return rtl::OString(); + return OString(); else break; } @@ -263,7 +263,7 @@ void DXFGroupReader::SetS(sal_uInt16 nG, const char * sS) void DXFGroupReader::ReadLine(char * ptgt) { - rtl::OString aStr = DXFReadLine(rIS); + OString aStr = DXFReadLine(rIS); size_t nLen = aStr.getLength(); if ( nLen > DXF_MAX_STRING_LEN ) diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 4aced68f6a85..b5634498716d 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2242,7 +2242,7 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize) str[ 32 ] = 0; String aStr( (const sal_Char*)str, osl_getThreadTextEncoding() ); if ( aStr.CompareIgnoreCaseToAscii( "Helv" ) == COMPARE_EQUAL ) - aStr = rtl::OUString("Helvetica"); + aStr = OUString("Helvetica"); pF->aFont.SetName( aStr ); break; } diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 2dacdb4ea879..a463aa6e9ade 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -177,7 +177,7 @@ void PCDReader::CheckPCDImagePacFile() m_rPCD.Seek( 2048 ); m_rPCD.Read( Buf, 7 ); Buf[ 7 ] = 0; - if (rtl::OString(Buf) != "PCD_IPI") + if (OString(Buf) != "PCD_IPI") bStatus = sal_False; } diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx index a17cf1e44e6d..dbc3316c79c1 100644 --- a/filter/source/msfilter/dffpropset.cxx +++ b/filter/source/msfilter/dffpropset.cxx @@ -1291,10 +1291,10 @@ bool DffPropSet::GetPropertyBool( sal_uInt32 nId, bool bDefault ) const return (nPropValue & nMask) != 0; } -::rtl::OUString DffPropSet::GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const +OUString DffPropSet::GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const { sal_Size nOldPos = rStrm.Tell(); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; sal_uInt32 nBufferSize = GetPropertyValue( nId ); if( (nBufferSize > 0) && SeekToContent( nId, rStrm ) ) { diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index cb5c64a001d8..2a6d7f499d2b 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -45,7 +45,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; @@ -167,7 +166,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, break; // #i51348# get shape name - rtl::OUString aShapeName; + OUString aShapeName; if( const SdrObject* pSdrObj = rObj.GetSdrObject() ) if (!pSdrObj->GetName().isEmpty()) aShapeName = pSdrObj->GetName(); @@ -195,9 +194,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, } break; } - rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( "RotateAngle" ) )); + rObj.SetAngle( rObj.ImplGetInt32PropertyValue( OUString( "RotateAngle" ) )); - if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( "IsFontwork" ) ) && + if( ( rObj.ImplGetPropertyValue( OUString( "IsFontwork" ) ) && ::cppu::any2bool( rObj.GetUsrAny() ) ) || rObj.GetType().EqualsAscii( "drawing.Measure" ) ) { @@ -235,7 +234,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, mpEscherEx->OpenContainer( ESCHER_SpContainer ); sal_uInt32 nMirrorFlags; - rtl::OUString sCustomShapeType; + OUString sCustomShapeType; MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( rObj.GetShapeRef(), nMirrorFlags, sCustomShapeType ); if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" ) { @@ -276,7 +275,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, { mpEscherEx->OpenContainer( ESCHER_SpContainer ); sal_Int32 nRadius = (sal_Int32)rObj.ImplGetInt32PropertyValue( - ::rtl::OUString( "CornerRadius" )); + OUString( "CornerRadius" )); if( nRadius ) { nRadius = ImplMapSize( Size( nRadius, 0 )).Width(); @@ -305,7 +304,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, { CircleKind eCircleKind = CircleKind_FULL; PolyStyle ePolyKind = PolyStyle(); - if ( rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleKind" ) ) ) + if ( rObj.ImplGetPropertyValue( OUString( "CircleKind" ) ) ) { eCircleKind = *( (CircleKind*)rObj.GetUsrAny().getValue() ); switch ( eCircleKind ) @@ -340,10 +339,10 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, else { sal_Int32 nStartAngle, nEndAngle; - if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleStartAngle" ) ) ) + if ( !rObj.ImplGetPropertyValue( OUString( "CircleStartAngle" ) ) ) break; nStartAngle = *( (sal_Int32*)rObj.GetUsrAny().getValue() ); - if( !rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleEndAngle" ) ) ) + if( !rObj.ImplGetPropertyValue( OUString( "CircleEndAngle" ) ) ) break; nEndAngle = *( (sal_Int32*)rObj.GetUsrAny().getValue() ); @@ -594,7 +593,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, 'D' == rObj.GetType().GetChar( 9 ) ) // drawing.3D { // SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject - if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( "Bitmap" ) ) ) + if ( !rObj.ImplGetPropertyValue( OUString( "Bitmap" ) ) ) break; mpEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -626,7 +625,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, aPropOpt.CreateShadowProperties( rObj.mXPropSet ); if( USHRT_MAX != mpEscherEx->GetHellLayerId() && - rObj.ImplGetPropertyValue( ::rtl::OUString( "LayerID" ) ) && + rObj.ImplGetPropertyValue( OUString( "LayerID" ) ) && (*((sal_uInt16*)rObj.GetUsrAny().getValue()) ) == mpEscherEx->GetHellLayerId() ) { aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x200020 ); @@ -687,7 +686,7 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj, if ( !mpPicStrm ) mpPicStrm = mpEscherEx->QueryPictureStream(); EscherPropertyContainer aPropOpt( mpEscherEx->GetGraphicProvider(), mpPicStrm, aRect100thmm ); - rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( "RotateAngle" ))); + rObj.SetAngle( rObj.ImplGetInt32PropertyValue( OUString( "RotateAngle" ))); sal_Int32 nAngle = rObj.GetAngle(); if( rObj.GetType().EqualsAscii( "drawing.Line" )) { diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 7612c1dbb594..78fb28a43a7c 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -53,11 +53,11 @@ public: ~ImplEESdrObject(); sal_Bool ImplGetPropertyValue( const sal_Unicode* pString ); - sal_Bool ImplGetPropertyValue( const rtl::OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); } + sal_Bool ImplGetPropertyValue( const OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); } sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32 nDef = 0 ) { return ImplGetPropertyValue( pStr ) ? *(sal_Int32*)mAny.getValue() : nDef; } - sal_Int32 ImplGetInt32PropertyValue( const rtl::OUString& rStr, sal_uInt32 nDef = 0 ) + sal_Int32 ImplGetInt32PropertyValue( const OUString& rStr, sal_uInt32 nDef = 0 ) { return ImplGetInt32PropertyValue(rStr.getStr(), nDef); } const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& GetShapeRef() const { return mXShape; } diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index 5d15a3ff1ad8..4eb15f7d081b 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -168,15 +168,15 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa sal_Bool bResult = sal_False; ::comphelper::SequenceAsHashMap aHashData( aData ); - uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95EncryptionKey" ), uno::Sequence< sal_Int8 >() ); + uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( OUString( "XOR95EncryptionKey" ), uno::Sequence< sal_Int8 >() ); if ( aKey.getLength() == 16 ) { (void)memcpy( mpnKey, aKey.getConstArray(), 16 ); bResult = sal_True; - mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95BaseKey" ), (sal_Int16)0 ); - mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95PasswordHash" ), (sal_Int16)0 ); + mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault( OUString( "XOR95BaseKey" ), (sal_Int16)0 ); + mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( OUString( "XOR95PasswordHash" ), (sal_Int16)0 ); } else OSL_FAIL( "Unexpected key size!\n" ); @@ -187,9 +187,9 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa uno::Sequence< beans::NamedValue > MSCodec_Xor95::GetEncryptionData() { ::comphelper::SequenceAsHashMap aHashData; - aHashData[ ::rtl::OUString( "XOR95EncryptionKey" ) ] <<= uno::Sequence( (sal_Int8*)mpnKey, 16 ); - aHashData[ ::rtl::OUString( "XOR95BaseKey" ) ] <<= (sal_Int16)mnKey; - aHashData[ ::rtl::OUString( "XOR95PasswordHash" ) ] <<= (sal_Int16)mnHash; + aHashData[ OUString( "XOR95EncryptionKey" ) ] <<= uno::Sequence( (sal_Int8*)mpnKey, 16 ); + aHashData[ OUString( "XOR95BaseKey" ) ] <<= (sal_Int16)mnKey; + aHashData[ OUString( "XOR95PasswordHash" ) ] <<= (sal_Int16)mnHash; return aHashData.getAsConstNamedValueList(); } @@ -293,12 +293,12 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa sal_Bool bResult = sal_False; ::comphelper::SequenceAsHashMap aHashData( aData ); - uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "STD97EncryptionKey" ), uno::Sequence< sal_Int8 >() ); + uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( OUString( "STD97EncryptionKey" ), uno::Sequence< sal_Int8 >() ); if ( aKey.getLength() == RTL_DIGEST_LENGTH_MD5 ) { (void)memcpy( m_pDigestValue, aKey.getConstArray(), RTL_DIGEST_LENGTH_MD5 ); - uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "STD97UniqueID" ), uno::Sequence< sal_Int8 >() ); + uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault( OUString( "STD97UniqueID" ), uno::Sequence< sal_Int8 >() ); if ( aUniqueID.getLength() == 16 ) { (void)memcpy( m_pDocId, aUniqueID.getConstArray(), 16 ); @@ -318,8 +318,8 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa uno::Sequence< beans::NamedValue > MSCodec_Std97::GetEncryptionData() { ::comphelper::SequenceAsHashMap aHashData; - aHashData[ ::rtl::OUString( "STD97EncryptionKey" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDigestValue, RTL_DIGEST_LENGTH_MD5 ); - aHashData[ ::rtl::OUString( "STD97UniqueID" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDocId, 16 ); + aHashData[ OUString( "STD97EncryptionKey" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDigestValue, RTL_DIGEST_LENGTH_MD5 ); + aHashData[ OUString( "STD97UniqueID" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDocId, 16 ); return aHashData.getAsConstNamedValueList(); } diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index bc659c4be509..b7759ab58b63 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -73,12 +73,12 @@ void CustomToolBarImportHelper::applyIcons() { for ( std::vector< iconcontrolitem >::iterator it = iconcommands.begin(); it != iconcommands.end(); ++it ) { - uno::Sequence< rtl::OUString > commands(1); + uno::Sequence< OUString > commands(1); commands[ 0 ] = it->sCommand; uno::Sequence< uno::Reference< graphic::XGraphic > > images(1); images[ 0 ] = it->image; - OSL_TRACE("About to applyIcons for command %s, have image ? %s", rtl::OUStringToOString( commands[ 0 ], RTL_TEXTENCODING_UTF8 ).getStr(), images[ 0 ].is() ? "yes" : "no" ); + OSL_TRACE("About to applyIcons for command %s, have image ? %s", OUStringToOString( commands[ 0 ], RTL_TEXTENCODING_UTF8 ).getStr(), images[ 0 ].is() ? "yes" : "no" ); uno::Reference< ui::XImageManager > xImageManager( getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW ); sal_uInt16 nColor = ui::ImageType::COLOR_NORMAL; @@ -93,7 +93,7 @@ void CustomToolBarImportHelper::applyIcons() } } -void CustomToolBarImportHelper::addIcon( const uno::Reference< graphic::XGraphic >& xImage, const rtl::OUString& sString ) +void CustomToolBarImportHelper::addIcon( const uno::Reference< graphic::XGraphic >& xImage, const OUString& sString ) { iconcontrolitem item; item.sCommand = sString; @@ -120,55 +120,55 @@ CustomToolBarImportHelper::getAppCfgManager() } uno::Any -CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd ) +CustomToolBarImportHelper::createCommandFromMacro( const OUString& sCmd ) { //"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document" - static rtl::OUString scheme( "vnd.sun.star.script:" ); - static rtl::OUString part2( "?language=Basic&location=document" ); + static OUString scheme( "vnd.sun.star.script:" ); + static OUString part2( "?language=Basic&location=document" ); // create script url - rtl::OUString scriptURL = scheme + sCmd + part2; + OUString scriptURL = scheme + sCmd + part2; return uno::makeAny( scriptURL ); } -rtl::OUString CustomToolBarImportHelper::MSOCommandToOOCommand( sal_Int16 msoCmd ) +OUString CustomToolBarImportHelper::MSOCommandToOOCommand( sal_Int16 msoCmd ) { - rtl::OUString result; + OUString result; if ( pMSOCmdConvertor.get() ) result = pMSOCmdConvertor->MSOCommandToOOCommand( msoCmd ); return result; } -rtl::OUString CustomToolBarImportHelper::MSOTCIDToOOCommand( sal_Int16 msoTCID ) +OUString CustomToolBarImportHelper::MSOTCIDToOOCommand( sal_Int16 msoTCID ) { - rtl::OUString result; + OUString result; if ( pMSOCmdConvertor.get() ) result = pMSOCmdConvertor->MSOTCIDToOOCommand( msoTCID ); return result; } bool -CustomToolBarImportHelper::createMenu( const rtl::OUString& rName, const uno::Reference< container::XIndexAccess >& xMenuDesc, bool bPersist ) +CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Reference< container::XIndexAccess >& xMenuDesc, bool bPersist ) { bool bRes = true; try { uno::Reference< ui::XUIConfigurationManager > xCfgManager( getCfgManager() ); - rtl::OUString sMenuBar("private:resource/menubar/"); + OUString sMenuBar("private:resource/menubar/"); sMenuBar += rName; uno::Reference< container::XIndexContainer > xPopup( xCfgManager->createSettings(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xPopup, uno::UNO_QUERY_THROW ); // set name for menubar - xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( rName ) ); + xProps->setPropertyValue( OUString("UIName"), uno::makeAny( rName ) ); if ( xPopup.is() ) { uno::Sequence< beans::PropertyValue > aPopupMenu( 4 ); - aPopupMenu[0].Name = rtl::OUString("CommandURL"); - aPopupMenu[0].Value = uno::makeAny( rtl::OUString("vnd.openoffice.org:") + rName ); - aPopupMenu[1].Name = rtl::OUString("Label"); + aPopupMenu[0].Name = OUString("CommandURL"); + aPopupMenu[0].Value = uno::makeAny( OUString("vnd.openoffice.org:") + rName ); + aPopupMenu[1].Name = OUString("Label"); aPopupMenu[1].Value <<= rName; - aPopupMenu[2].Name = rtl::OUString("ItemDescriptorContainer"); + aPopupMenu[2].Name = OUString("ItemDescriptorContainer"); aPopupMenu[2].Value = uno::makeAny( xMenuDesc ); - aPopupMenu[3].Name = rtl::OUString("Type" ); + aPopupMenu[3].Name = OUString("Type" ); aPopupMenu[3].Value <<= sal_Int32( 0 ); xPopup->insertByIndex( xPopup->getCount(), uno::makeAny( aPopupMenu ) ); @@ -297,7 +297,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect bBeginGroup = rHeader.isBeginGroup(); controlGeneralInfo.ImportToolBarControlData( helper, props ); beans::PropertyValue aProp; - aProp.Name = rtl::OUString("Visible") ; + aProp.Name = OUString("Visible") ; aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored props.push_back( aProp ); if ( rHeader.getTct() == 0x01 @@ -307,7 +307,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect if ( pSpecificInfo ) { // if we have a icon then lets set it for the command - rtl::OUString sCommand; + OUString sCommand; for ( std::vector< css::beans::PropertyValue >::iterator it = props.begin(); it != props.end(); ++it ) { if ( it->Name == "CommandURL" ) @@ -332,10 +332,10 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect else if ( pSpecificInfo->getBtnFace() ) { - rtl::OUString sBuiltInCmd = helper.MSOTCIDToOOCommand( *pSpecificInfo->getBtnFace() ); + OUString sBuiltInCmd = helper.MSOTCIDToOOCommand( *pSpecificInfo->getBtnFace() ); if ( !sBuiltInCmd.isEmpty() ) { - uno::Sequence< rtl::OUString> sCmds(1); + uno::Sequence< OUString> sCmds(1); sCmds[ 0 ] = sBuiltInCmd; uno::Reference< ui::XImageManager > xImageManager( helper.getAppCfgManager()->getImageManager(), uno::UNO_QUERY_THROW ); // 0 = default image size @@ -348,8 +348,8 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect } else if ( rHeader.getTct() == 0x0a ) { - aProp.Name = rtl::OUString("CommandURL") ; - rtl::OUString sMenuBar("private:resource/menubar/"); + aProp.Name = OUString("CommandURL") ; + OUString sMenuBar("private:resource/menubar/"); TBCMenuSpecific* pMenu = getMenuSpecific(); if ( pMenu ) @@ -359,7 +359,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect } short icontext = ( rHeader.getTbct() & 0x03 ); - aProp.Name = rtl::OUString("Style") ; + aProp.Name = OUString("Style") ; if ( bIsMenuBar ) { nStyle |= ui::ItemStyle::TEXT; @@ -431,20 +431,20 @@ TBCExtraInfo::Print( FILE* fp ) Indent a; indent_printf( fp, "[ 0x%x ] TBCExtraInfo -- dump\n", nOffSet ); indent_printf( fp, " wstrHelpFile %s\n", - rtl::OUStringToOString( wstrHelpFile.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( wstrHelpFile.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " idHelpContext 0x%x\n", static_cast< unsigned int >( idHelpContext ) ); indent_printf( fp, " wstrTag %s\n", - rtl::OUStringToOString( wstrTag.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( wstrTag.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " wstrOnAction %s\n", - rtl::OUStringToOString( wstrOnAction.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( wstrOnAction.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " wstrParam %s\n", - rtl::OUStringToOString( wstrParam.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( wstrParam.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " tbcu 0x%x\n", tbcu ); indent_printf( fp, " tbmg 0x%x\n", tbmg ); } -rtl::OUString +OUString TBCExtraInfo::getOnAction() { return wstrOnAction.getString(); @@ -476,11 +476,11 @@ TBCGeneralInfo::Print( FILE* fp ) indent_printf( fp, "[ 0x%x ] TBCGeneralInfo -- dump\n", nOffSet ); indent_printf( fp, " bFlags 0x%x\n", bFlags ); indent_printf( fp, " customText %s\n", - rtl::OUStringToOString( customText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( customText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " description %s\n", - rtl::OUStringToOString( descriptionText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( descriptionText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " tooltip %s\n", - rtl::OUStringToOString( tooltip.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( tooltip.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); if ( bFlags & 0x4 ) extraInfo.Print( fp ); } @@ -495,24 +495,24 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std // if ( rHeader.getTct() == 0x01 && rHeader.getTcID() == 0x01 ) // not defined, probably this is a command if ( !extraInfo.getOnAction().isEmpty() ) { - aProp.Name = rtl::OUString("CommandURL"); + aProp.Name = OUString("CommandURL"); ooo::vba::MacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true ); if ( aMacroInf.mbFound ) aProp.Value = helper.createCommandFromMacro( aMacroInf.msResolvedMacro ); else - aProp.Value <<= rtl::OUString( "UnResolvedMacro[" ).concat( extraInfo.getOnAction() ).concat( rtl::OUString( "]" ) ); + aProp.Value <<= OUString( "UnResolvedMacro[" ).concat( extraInfo.getOnAction() ).concat( OUString( "]" ) ); sControlData.push_back( aProp ); } - aProp.Name = rtl::OUString("Label"); + aProp.Name = OUString("Label"); aProp.Value = uno::makeAny( customText.getString().replace('&','~') ); sControlData.push_back( aProp ); - aProp.Name = rtl::OUString("Type"); + aProp.Name = OUString("Type"); aProp.Value = uno::makeAny( ui::ItemType::DEFAULT ); sControlData.push_back( aProp ); - aProp.Name = rtl::OUString("Tooltip"); + aProp.Name = OUString("Tooltip"); aProp.Value = uno::makeAny( tooltip.getString() ); sControlData.push_back( aProp ); /* @@ -554,13 +554,13 @@ TBCMenuSpecific::Print( FILE* fp ) indent_printf( fp, "[ 0x%x ] TBCMenuSpecific -- dump\n", nOffSet ); indent_printf( fp, " tbid 0x%x\n", static_cast< unsigned int >( tbid ) ); if ( tbid == 1 ) - indent_printf( fp, " name %s\n", rtl::OUStringToOString( name->getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf( fp, " name %s\n", OUStringToOString( name->getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); } -rtl::OUString TBCMenuSpecific::Name() +OUString TBCMenuSpecific::Name() { - rtl::OUString aName; + OUString aName; if ( name.get() ) aName = name->getString(); return aName; @@ -627,7 +627,7 @@ void TBCBSpecific::Print( FILE* fp ) indent_printf( fp, " iBtnFace 0x%x\n", *(iBtnFace.get()) ); } bResult = ( wstrAcc.get() != NULL ); - indent_printf( fp, " option string present? %s ->%s<-\n", bResult ? "true" : "false", bResult ? rtl::OUStringToOString( wstrAcc->getString(), RTL_TEXTENCODING_UTF8 ).getStr() : "N/A" ); + indent_printf( fp, " option string present? %s ->%s<-\n", bResult ? "true" : "false", bResult ? OUStringToOString( wstrAcc->getString(), RTL_TEXTENCODING_UTF8 ).getStr() : "N/A" ); } TBCBitMap* @@ -704,13 +704,13 @@ void TBCCDData::Print( FILE* fp) for ( sal_Int32 index=0; index < cwstrItems; ++index ) { Indent b; - indent_printf(fp, " wstrList[%d] %s", static_cast< int >( index ), rtl::OUStringToOString( wstrList[index].getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf(fp, " wstrList[%d] %s", static_cast< int >( index ), OUStringToOString( wstrList[index].getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); } indent_printf(fp," cwstrMRU num most recently used string 0x%d item\n", cwstrMRU); indent_printf(fp," iSel index of selected item 0x%d item\n", iSel); indent_printf(fp," cLines num of suggested lines to display 0x%d", cLines); indent_printf(fp," dxWidth width in pixels 0x%d", dxWidth); - indent_printf(fp," wstrEdit %s", rtl::OUStringToOString( wstrEdit.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf(fp," wstrEdit %s", OUStringToOString( wstrEdit.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); } TBCBitMap::TBCBitMap() : cbDIB( 0 ) @@ -780,7 +780,7 @@ void TB::Print( FILE* fp ) indent_printf(fp," ltbtr 0x%x\n", ltbtr ); indent_printf(fp," cRowsDefault 0x%x\n", cRowsDefault ); indent_printf(fp," bFlags 0x%x\n", bFlags ); - indent_printf(fp, " name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf(fp, " name %s\n", OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); } TBVisualData::TBVisualData() : tbds(0), tbv(0), tbdsDock(0), iRow(0) diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx index e1723a31db1d..53725874c394 100644 --- a/filter/source/msfilter/services.cxx +++ b/filter/source/msfilter/services.cxx @@ -19,7 +19,6 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star::uno; // Declare static functions providing service information ===================== diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 28892499e14e..cb8cce6d7b30 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7194,7 +7194,7 @@ void CreateTableRows( Reference< XTableRows > xTableRows, const std::set< sal_In else nHeight = nTableBottom - nLastPosition; - static const rtl::OUString sWidth( "Height" ); + static const OUString sWidth( "Height" ); Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW ); xPropSet->setPropertyValue( sWidth, Any( nHeight ) ); } @@ -7219,7 +7219,7 @@ void CreateTableColumns( Reference< XTableColumns > xTableColumns, const std::se else nWidth = nTableRight - nLastPosition; - static const rtl::OUString sWidth( "Width" ); + static const OUString sWidth( "Width" ); Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW ); xPropSet->setPropertyValue( sWidth, Any( nWidth ) ); } @@ -7254,16 +7254,16 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) const sal_Int32 nRightDist(((const SdrTextRightDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST)).GetValue()); const sal_Int32 nUpperDist(((const SdrTextUpperDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST)).GetValue()); const sal_Int32 nLowerDist(((const SdrTextLowerDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST)).GetValue()); - static const rtl::OUString sTopBorder( "TextUpperDistance" ); - static const rtl::OUString sBottomBorder( "TextLowerDistance" ); - static const rtl::OUString sLeftBorder( "TextLeftDistance" ); - static const rtl::OUString sRightBorder( "TextRightDistance" ); + static const OUString sTopBorder( "TextUpperDistance" ); + static const OUString sBottomBorder( "TextLowerDistance" ); + static const OUString sLeftBorder( "TextLeftDistance" ); + static const OUString sRightBorder( "TextRightDistance" ); xPropSet->setPropertyValue( sTopBorder, Any( nUpperDist ) ); xPropSet->setPropertyValue( sRightBorder, Any( nRightDist ) ); xPropSet->setPropertyValue( sLeftBorder, Any( nLeftDist ) ); xPropSet->setPropertyValue( sBottomBorder, Any( nLowerDist ) ); - static const rtl::OUString sTextVerticalAdjust( "TextVerticalAdjust" ); + static const OUString sTextVerticalAdjust( "TextVerticalAdjust" ); const SdrTextVertAdjust eTextVertAdjust(((const SdrTextVertAdjustItem&)pObj->GetMergedItem(SDRATTR_TEXT_VERTADJUST)).GetValue()); drawing::TextVerticalAdjust eVA( drawing::TextVerticalAdjust_TOP ); if ( eTextVertAdjust == SDRTEXTVERTADJUST_CENTER ) @@ -7275,8 +7275,8 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) //set textHorizontalAdjust and TextWritingMode attr const sal_Int32 eHA(((const SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue()); const SvxFrameDirection eDirection = (const SvxFrameDirection)((( const SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue()); - static const rtl::OUString sHorizontalAdjust( "TextHorizontalAdjust" ); - static const rtl::OUString sWritingMode( "TextWritingMode" ); + static const OUString sHorizontalAdjust( "TextHorizontalAdjust" ); + static const OUString sWritingMode( "TextWritingMode" ); xPropSet->setPropertyValue( sHorizontalAdjust , Any( eHA ) ); if ( eDirection == FRMDIR_VERT_TOP_RIGHT ) {//vertical writing @@ -7289,7 +7289,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) { case XFILL_SOLID : { - static const rtl::OUString sFillColor( String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ) ); + static const OUString sFillColor( String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ) ); eFS = com::sun::star::drawing::FillStyle_SOLID; Color aFillColor( ((XFillColorItem&)pObj->GetMergedItem( XATTR_FILLCOLOR )).GetColorValue() ); sal_Int32 nFillColor( aFillColor.GetColor() ); @@ -7313,7 +7313,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) aGradient.EndIntensity = aXGradient.GetEndIntens(); aGradient.StepCount = aXGradient.GetSteps(); - static const rtl::OUString sFillGradient( String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ) ); + static const OUString sFillGradient( String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ) ); xPropSet->setPropertyValue( sFillGradient, Any( aGradient ) ); } break; @@ -7325,7 +7325,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) eFS = com::sun::star::drawing::FillStyle_BITMAP; const XFillBitmapItem aXFillBitmapItem((const XFillBitmapItem&)pObj->GetMergedItem( XATTR_FILLBITMAP )); - rtl::OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); aURL += OStringToOUString( aXFillBitmapItem.GetGraphicObject().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); @@ -7338,12 +7338,12 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) break; } - static const rtl::OUString sFillStyle( String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ); + static const OUString sFillStyle( String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ); xPropSet->setPropertyValue( sFillStyle, Any( eFS ) ); if ( eFillStyle != XFILL_NONE ) { sal_Int16 nFillTransparence( ( (const XFillTransparenceItem&)pObj->GetMergedItem( XATTR_FILLTRANSPARENCE ) ).GetValue() ); - static const rtl::OUString sFillTransparence( String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparence" ) ) ); + static const OUString sFillTransparence( String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparence" ) ) ); xPropSet->setPropertyValue( sFillTransparence, Any( nFillTransparence ) ); } } @@ -7381,12 +7381,12 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl std::vector< sal_Int32 >::const_iterator aIter( vPositions.begin() ); while( aIter != vPositions.end() ) { - static const rtl::OUString sTopBorder( String( RTL_CONSTASCII_USTRINGPARAM( "TopBorder" ) ) ); - static const rtl::OUString sBottomBorder( String( RTL_CONSTASCII_USTRINGPARAM( "BottomBorder" ) ) ); - static const rtl::OUString sLeftBorder( String( RTL_CONSTASCII_USTRINGPARAM( "LeftBorder" ) ) ); - static const rtl::OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) ); - static const rtl::OUString sDiagonalTLBR( "DiagonalTLBR" ); - static const rtl::OUString sDiagonalBLTR( "DiagonalBLTR" ); + static const OUString sTopBorder( String( RTL_CONSTASCII_USTRINGPARAM( "TopBorder" ) ) ); + static const OUString sBottomBorder( String( RTL_CONSTASCII_USTRINGPARAM( "BottomBorder" ) ) ); + static const OUString sLeftBorder( String( RTL_CONSTASCII_USTRINGPARAM( "LeftBorder" ) ) ); + static const OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) ); + static const OUString sDiagonalTLBR( "DiagonalTLBR" ); + static const OUString sDiagonalBLTR( "DiagonalBLTR" ); sal_Int32 nPosition = *aIter & 0xffffff; sal_Int32 nFlags = *aIter &~0xffffff; diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index d3144fc3ca71..ca111203543e 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -40,7 +40,7 @@ rtl_TextEncoding getBestTextEncodingFromLocale(const ::com::sun::star::lang::Loc { //Obviously not comprehensive, feel free to expand these, they're for ultimate fallbacks //in last-ditch broken-file-format cases to guess the right 8bit encodings - const rtl::OUString &rLanguage = rLocale.Language; + const OUString &rLanguage = rLocale.Language; if (rLanguage == "cs" || rLanguage == "hu" || rLanguage == "pl") return RTL_TEXTENCODING_MS_1250; if (rLanguage == "ru" || rLanguage == "uk") @@ -99,7 +99,7 @@ DateTime DTTM2DateTime( long lDTTM ) } /// Append the number as 2-digit when less than 10. -static void lcl_AppendTwoDigits( rtl::OStringBuffer &rBuffer, sal_Int32 nNum ) +static void lcl_AppendTwoDigits( OStringBuffer &rBuffer, sal_Int32 nNum ) { if ( nNum < 0 || nNum > 99 ) { @@ -113,14 +113,14 @@ static void lcl_AppendTwoDigits( rtl::OStringBuffer &rBuffer, sal_Int32 nNum ) rBuffer.append( nNum ); } -rtl::OString DateTimeToOString( const DateTime& rDateTime ) +OString DateTimeToOString( const DateTime& rDateTime ) { DateTime aInUTC( rDateTime ); // HACK: this is correct according to the spec, but MSOffice believes everybody lives // in UTC+0 when reading it back // aInUTC.ConvertToUTC(); - rtl::OStringBuffer aBuffer( 25 ); + OStringBuffer aBuffer( 25 ); aBuffer.append( sal_Int32( aInUTC.GetYear() ) ); aBuffer.append( '-' ); @@ -143,10 +143,10 @@ rtl::OString DateTimeToOString( const DateTime& rDateTime ) } sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar, - rtl_TextEncoding& rChrSet, rtl::OUString& rFontName, bool bDisableUnicodeSupport) + rtl_TextEncoding& rChrSet, OUString& rFontName, bool bDisableUnicodeSupport) { StarSymbolToMSMultiFont *pConvert = CreateStarSymbolToMSMultiFont(); - rtl::OUString sFont = pConvert->ConvertChar(cChar); + OUString sFont = pConvert->ConvertChar(cChar); delete pConvert; if (!sFont.isEmpty()) { @@ -224,7 +224,7 @@ sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar, U+FE50–U+FE6F Use latin font Otherwise Use ea font */ -TextCategory categorizeCodePoint(sal_uInt32 codePoint, const rtl::OUString &rBcp47LanguageTag) +TextCategory categorizeCodePoint(sal_uInt32 codePoint, const OUString &rBcp47LanguageTag) { TextCategory eRet = ea; if (codePoint <= 0x007F) diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 649b83ad94f0..b31b7bd1cee9 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -232,7 +232,7 @@ component_getFactory( const sal_Char* pImplementationName, com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xSMGR = reinterpret_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager); com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory; - rtl::OUString sImplName = rtl::OUString::createFromAscii(pImplementationName); + OUString sImplName = OUString::createFromAscii(pImplementationName); if (OdfFlatXml::impl_getImplementationName() == sImplName) xFactory = cppu::createOneInstanceFactory( xSMGR, diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index a826db3e51c7..9ddf0520bb9b 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1294,8 +1294,8 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl) aPwdDialog.AllowAsciiOnly(); if( aPwdDialog.Execute() == RET_OK ) //OK issued get password and set it { - rtl::OUString aUserPW( aPwdDialog.GetPassword() ); - rtl::OUString aOwnerPW( aPwdDialog.GetPassword2() ); + OUString aUserPW( aPwdDialog.GetPassword() ); + OUString aOwnerPW( aPwdDialog.GetPassword2() ); mbHaveUserPassword = !aUserPW.isEmpty(); mbHaveOwnerPassword = !aOwnerPW.isEmpty(); diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index d289ca021c1e..11a3f3869a21 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -132,7 +132,7 @@ protected: com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > mxPreparedPasswords; sal_Bool mbIsRangeChecked; - rtl::OUString msPageRange; + OUString msPageRange; sal_Bool mbSelectionIsChecked; sal_Bool mbExportRelativeFsysLinks; @@ -141,13 +141,13 @@ protected: sal_Bool mbExportBmkToPDFDestination; sal_Bool mbSignPDF; - ::rtl::OUString msSignPassword; - ::rtl::OUString msSignLocation; - ::rtl::OUString msSignContact; - ::rtl::OUString msSignReason; + OUString msSignPassword; + OUString msSignLocation; + OUString msSignContact; + OUString msSignReason; com::sun::star::uno::Reference< com::sun::star::security::XCertificate > maSignCertificate; - ::rtl::OUString maWatermarkText; + OUString maWatermarkText; public: diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 75e698391a3b..c6e26487dbad 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -378,7 +378,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue if( aURL.GetProtocol() != INET_PROT_FILE ) { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFile, aTmp ) ) aURL = INetURLObject(aTmp); @@ -394,7 +394,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue OUString aPageRange; Any aSelection; PDFWriter::PDFWriterContext aContext; - rtl::OUString aOpenPassword, aPermissionPassword; + OUString aOpenPassword, aPermissionPassword; Reference< beans::XMaterialHolder > xEnc; Sequence< beans::NamedValue > aPreparedPermissionPassword; @@ -715,8 +715,8 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue // after this point we don't need the legacy clear passwords anymore // however they are still inside the passed filter data sequence // which is sadly out out our control - aPermissionPassword = rtl::OUString(); - aOpenPassword = rtl::OUString(); + aPermissionPassword = OUString(); + aOpenPassword = OUString(); /* * FIXME: the entries are only implicitly defined by the resource file. Should there diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index 651c9d94a261..2219a3acae92 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -40,8 +40,6 @@ #include "zip.hxx" #include "tempfile.hxx" -using rtl::OUString; -using rtl::OString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::container; @@ -74,10 +72,10 @@ class PageEntry { private: TempFile maTempFile; - rtl::OUString maName; - rtl::OUString maTitle; - rtl::OUString maNotes; - rtl::OUString maURL; + OUString maName; + OUString maTitle; + OUString maNotes; + OUString maURL; public: PageEntry(); @@ -85,17 +83,17 @@ public: OUString getTempURL() { return maTempFile.getFileURL(); } - void setName( const rtl::OUString& rName ) { maName = rName; } - const rtl::OUString& getName() const { return maName; } + void setName( const OUString& rName ) { maName = rName; } + const OUString& getName() const { return maName; } - void setTitle( const rtl::OUString& rTitle ) { maTitle = rTitle; } - const rtl::OUString& getTitle() const { return maTitle; } + void setTitle( const OUString& rTitle ) { maTitle = rTitle; } + const OUString& getTitle() const { return maTitle; } - void setNotes( const rtl::OUString& rNotes ) { maNotes = rNotes; } - const rtl::OUString& getNotes() const { return maNotes; } + void setNotes( const OUString& rNotes ) { maNotes = rNotes; } + const OUString& getNotes() const { return maNotes; } - void setURL( const rtl::OUString& rURL ) { maURL = rURL; } - const rtl::OUString& getURL() const { return maURL; } + void setURL( const OUString& rURL ) { maURL = rURL; } + const OUString& getURL() const { return maURL; } }; PageEntry::PageEntry() @@ -152,7 +150,7 @@ static void encodeFile( osl::File& rSourceFile, Reference< XOutputStream >& xOut nLen -= nRead; - rtl::OUStringBuffer aStrBuffer; + OUStringBuffer aStrBuffer; ::sax::Converter::encodeBase64(aStrBuffer, aInBuffer); sal_Int32 nCount = aStrBuffer.getLength(); @@ -183,7 +181,7 @@ static OString convertString( OUString aInput ) return aRet; } -static void createSlideFile( Reference< XComponent > xDoc, ZipFile& rZipFile, const rtl::OUString& rURL, vector< PageEntry* >& rPageEntries ) throw( ::com::sun::star::uno::Exception ) +static void createSlideFile( Reference< XComponent > xDoc, ZipFile& rZipFile, const OUString& rURL, vector< PageEntry* >& rPageEntries ) throw( ::com::sun::star::uno::Exception ) { OString aInfo; @@ -287,7 +285,7 @@ static void createSlideFile( Reference< XComponent > xDoc, ZipFile& rZipFile, co //#define PLACEWARE_DEBUG 1 sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < XOutputStream > xOutputStream, - const rtl::OUString& rURL, Reference < XInterface > /* xHandler */, Reference < XStatusIndicator >& xStatusIndicator ) + const OUString& rURL, Reference < XInterface > /* xHandler */, Reference < XStatusIndicator >& xStatusIndicator ) { sal_Bool bRet = sal_False; diff --git a/filter/source/placeware/exporter.hxx b/filter/source/placeware/exporter.hxx index d9405f6d9e6a..20c49303ca21 100644 --- a/filter/source/placeware/exporter.hxx +++ b/filter/source/placeware/exporter.hxx @@ -37,7 +37,7 @@ public: sal_Bool doExport( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc, ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xOutputStream, - const rtl::OUString& rURL, + const OUString& rURL, ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > xHandler, ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator >& rxStatusIndicator ); diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index 7e860b481830..52c48c23e95e 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; using ::com::sun::star::lang::XComponent; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::io::XOutputStream; diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx index b3bd97f51317..e680e451b020 100644 --- a/filter/source/placeware/tempfile.cxx +++ b/filter/source/placeware/tempfile.cxx @@ -118,7 +118,6 @@ oslFileError SAL_CALL my_getTempDirURL( rtl_uString** pustrTempDir ) #include "tempfile.hxx" -using ::rtl::OUString; TempFile::TempFile( const OUString& rTempFileURL ) :osl::File( rTempFileURL ), maURL( rTempFileURL ) { diff --git a/filter/source/placeware/tempfile.hxx b/filter/source/placeware/tempfile.hxx index db57a2672da7..0712017c81d8 100644 --- a/filter/source/placeware/tempfile.hxx +++ b/filter/source/placeware/tempfile.hxx @@ -26,14 +26,14 @@ class TempFile : public osl::File { public: - TempFile( const rtl::OUString& aURL ); + TempFile( const OUString& aURL ); ~TempFile(); - static rtl::OUString createTempFileURL(); - rtl::OUString getFileURL(); + static OUString createTempFileURL(); + OUString getFileURL(); private: - rtl::OUString maURL; + OUString maURL; }; diff --git a/filter/source/placeware/zip.cxx b/filter/source/placeware/zip.cxx index a1cb56127a95..57a86fa0f6d2 100644 --- a/filter/source/placeware/zip.cxx +++ b/filter/source/placeware/zip.cxx @@ -23,7 +23,6 @@ #include "zip.hxx" #include "zipfile.hxx" -using ::rtl::OString; /** this struct describes one entry in a zip file */ struct ZipEntry { diff --git a/filter/source/placeware/zip.hxx b/filter/source/placeware/zip.hxx index 2f8e0d9c9c57..909400f3f95a 100644 --- a/filter/source/placeware/zip.hxx +++ b/filter/source/placeware/zip.hxx @@ -31,7 +31,7 @@ public: ZipFile( osl::File& rFile ); ~ZipFile(); - bool addFile( osl::File& rFile, const rtl::OString& rName ); + bool addFile( osl::File& rFile, const OString& rName ); bool close(); private: diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx index 7cebe1ab3b67..3a025f69a93c 100644 --- a/filter/source/svg/gfxtypes.hxx +++ b/filter/source/svg/gfxtypes.hxx @@ -214,7 +214,7 @@ struct State basegfx::B2DRange maViewBox; bool mbIsText; - rtl::OUString maFontFamily; + OUString maFontFamily; /** Absolute: xx-small=6.94 | x-small=8.33 | small=10 | medium=12 | large=14.4 | x-large=17.28 | xx-large=20.736 Relative(to parent): larger (enlarge by 1.2) @@ -222,8 +222,8 @@ struct State */ double mnFontSize; - rtl::OUString maFontStyle; - rtl::OUString maFontVariant; + OUString maFontStyle; + OUString maFontVariant; double mnFontWeight; TextAlign meTextAnchor; // text-anchor diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 02a61b55f166..b2ba26baffd5 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -53,8 +53,8 @@ protected: // OGenericUnoDialog virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); virtual Dialog* createDialog( Window* pParent ); virtual void executedDialog( sal_Int16 nExecutionResult ); virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); @@ -78,17 +78,17 @@ public: // ----------------------------------------------------------------------------- -::rtl::OUString SVGDialog_getImplementationName () +OUString SVGDialog_getImplementationName () throw ( ::com::sun::star::uno::RuntimeException ); // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL SVGDialog_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SVGDialog_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); // ----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SVGDialog_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); // ----------------------------------------------------------------------------- diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index f26f1f80b3fa..918ef4830e58 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -45,7 +45,6 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star; // ------------------------------- @@ -97,7 +96,7 @@ static const char aOOOAttrTextAdjust[] = NSPREFIX "text-adjust"; * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #define TEXT_FIELD_GET_CLASS_NAME_METHOD( class_name ) \ -virtual ::rtl::OUString getClassName() const \ +virtual OUString getClassName() const \ { \ static const char className[] = #class_name; \ return OUString( className ); \ @@ -123,7 +122,7 @@ public: } virtual ~TextField() {} protected: - void implGrowCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets, ::rtl::OUString sText, ::rtl::OUString sTextFieldId ) const + void implGrowCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets, OUString sText, OUString sTextFieldId ) const { const sal_Unicode * ustr = sText.getStr(); sal_Int32 nLength = sText.getLength(); @@ -142,7 +141,7 @@ protected: class FixedTextField : public TextField { public: - ::rtl::OUString text; + OUString text; TEXT_FIELD_GET_CLASS_NAME_METHOD( FixedTextField ) virtual sal_Bool equalTo( const TextField & aTextField ) const @@ -563,7 +562,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) pValue[ i ].Value >>= xOStm; else if ( pValue[ i ].Name == "FileName" ) { - ::rtl::OUString aFileName; + OUString aFileName; pValue[ i ].Value >>= aFileName; pOStm = ::utl::UcbStreamHelper::CreateStream( aFileName, STREAM_WRITE | STREAM_TRUNC ); @@ -587,7 +586,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) // font embedding const char* pSVGDisableFontEmbedding = getenv( "SVG_DISABLE_FONT_EMBEDDING" ); - rtl::OUString aEmbedFontEnv("${SVG_DISABLE_FONT_EMBEDDING}"); + OUString aEmbedFontEnv("${SVG_DISABLE_FONT_EMBEDDING}"); rtl::Bootstrap::expandMacros(aEmbedFontEnv); const bool bEmbedFonts=pSVGDisableFontEmbedding ? false : ( aEmbedFontEnv.getLength() ? false : true); @@ -605,7 +604,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) maFilterData[ 3 ].Name = SVG_PROP_GLYPHPLACEMENT; if( pSVGGlyphPlacement ) - maFilterData[ 3 ].Value <<= ::rtl::OUString::createFromAscii( pSVGGlyphPlacement ); + maFilterData[ 3 ].Value <<= OUString::createFromAscii( pSVGGlyphPlacement ); else maFilterData[ 3 ].Value <<= OUString("xlist"); @@ -1258,7 +1257,7 @@ void SVGFilter::implEmbedBulletGlyphs() // ----------------------------------------------------------------------------- -void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const ::rtl::OUString & sPathData ) +void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPathData ) { OUString sId = "bullet-char-template(" + OUString::number( (sal_Int32)cBullet ) + ")"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId ); @@ -1534,7 +1533,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx } // ----------------------------------------------------------------------------- -sal_Bool SVGFilter::implExportPage( const ::rtl::OUString & sPageId, +sal_Bool SVGFilter::implExportPage( const OUString & sPageId, const Reference< XDrawPage > & rxPage, const Reference< XShapes > & xShapes, sal_Bool bMaster ) @@ -1663,7 +1662,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) if( xShapePropSet.is() ) { - const ::rtl::OUString aShapeType( rxShape->getShapeType() ); + const OUString aShapeType( rxShape->getShapeType() ); sal_Bool bHideObj = sal_False; if( mbPresentation ) @@ -1688,7 +1687,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) if( !bRet && mpObjects->find( rxShape ) != mpObjects->end() ) { - const ::rtl::OUString* pElementId = NULL; + const OUString* pElementId = NULL; ::com::sun::star::awt::Rectangle aBoundRect; const GDIMetaFile& rMtf = (*mpObjects)[ rxShape ].GetRepresentation(); @@ -2086,7 +2085,7 @@ void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf ) // ----------------------------------------------------------------------------- -const ::rtl::OUString & SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) +const OUString & SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) { return (mpSVGExport->getInterfaceToIdentifierMapper()).getIdentifier( rxIf ); } diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 6b7245192d16..eb22854abca8 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -44,7 +44,6 @@ #include "svgfilter.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; // ------------- @@ -266,7 +265,7 @@ void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc // ----------------------------------------------------------------------------- -rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException) +OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException) { uno::Reference< io::XInputStream > xInput; @@ -279,7 +278,7 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip } if( !xInput.is() ) - return rtl::OUString(); + return OUString(); uno::Reference< io::XSeekable > xSeek( xInput, uno::UNO_QUERY ); if( xSeek.is() ) @@ -295,14 +294,14 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip sal_Int8 aMagic1[] = {'<', 's', 'v', 'g'}; if( std::search(pBuf, pBuf+nBytes, aMagic1, aMagic1+sizeof(aMagic1)/sizeof(*aMagic1)) != pBuf+nBytes ) - return rtl::OUString("svg_Scalable_Vector_Graphics"); + return OUString("svg_Scalable_Vector_Graphics"); sal_Int8 aMagic2[] = {'D', 'O', 'C', 'T', 'Y', 'P', 'E', ' ', 's', 'v', 'g'}; if( std::search(pBuf, pBuf+nBytes, aMagic2, aMagic2+sizeof(aMagic2)/sizeof(*aMagic2)) != pBuf+nBytes ) - return rtl::OUString("svg_Scalable_Vector_Graphics"); + return OUString("svg_Scalable_Vector_Graphics"); - return rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index ce315b55db59..3c8e5a88156a 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -99,7 +99,7 @@ using namespace ::std; // Placeholder tag used into the ImplWriteActions method to filter text placeholder fields -static const ::rtl::OUString sPlaceholderTag = ::rtl::OUString::createFromAscii( "<[:isPlaceholder:]>" ); +static const OUString sPlaceholderTag = OUString::createFromAscii( "<[:isPlaceholder:]>" ); class SVGExport : public SvXMLExport { @@ -169,9 +169,9 @@ struct PagePropertySet sal_Bool bIsDateTimeFieldFixed; sal_Int16 nPageNumber; sal_Int32 nDateTimeFormat; - ::rtl::OUString sDateTimeText; - ::rtl::OUString sFooterText; - ::rtl::OUString sHeaderText; + OUString sDateTimeText; + OUString sFooterText; + OUString sHeaderText; }; struct HashReferenceXInterface @@ -184,7 +184,7 @@ struct HashReferenceXInterface struct HashOUString { - size_t operator()( const ::rtl::OUString& oustr ) const { return static_cast< size_t >( oustr.hashCode() ); } + size_t operator()( const OUString& oustr ) const { return static_cast< size_t >( oustr.hashCode() ); } }; struct HashUChar @@ -219,10 +219,10 @@ public: typedef Sequence< Reference< XDrawPage > > XDrawPageSequence; typedef ::boost::unordered_set< sal_Unicode, HashUChar > UCharSet; - typedef ::boost::unordered_map< ::rtl::OUString, UCharSet, HashOUString > UCharSetMap; + typedef ::boost::unordered_map< OUString, UCharSet, HashOUString > UCharSetMap; typedef ::boost::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface > UCharSetMapMap; - typedef ::boost::unordered_map< Reference< XInterface >, ::rtl::OUString, HashReferenceXInterface > UOStringMap; + typedef ::boost::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface > UOStringMap; typedef ::boost::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet; @@ -240,7 +240,7 @@ private: sal_Bool mbSinglePage; sal_Int32 mnVisiblePage; PagePropertySet mVisiblePagePropSet; - ::rtl::OUString msClipPathId; + OUString msClipPathId; UCharSetMapMap mTextFieldCharSets; Reference< XInterface > mCreateOjectsCurrentMasterPage; UOStringMap mTextShapeIdListMap; @@ -267,7 +267,7 @@ private: sal_Bool implGenerateMetaData(); void implExportTextShapeIndex(); void implEmbedBulletGlyphs(); - void implEmbedBulletGlyph( sal_Unicode cBullet, const ::rtl::OUString & sPathData ); + void implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPathData ); sal_Bool implExportTextEmbeddedBitmaps(); sal_Bool implGenerateScript(); @@ -278,7 +278,7 @@ private: sal_Int32 nFirstPage, sal_Int32 nLastPage ); sal_Bool implExportDrawPages( const XDrawPageSequence& rxPages, sal_Int32 nFirstPage, sal_Int32 nLastPage ); - sal_Bool implExportPage( const ::rtl::OUString & sPageId, + sal_Bool implExportPage( const OUString & sPageId, const Reference< XDrawPage > & rxPage, const Reference< XShapes > & xShapes, sal_Bool bMaster ); @@ -291,12 +291,12 @@ private: sal_Bool implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape ); sal_Bool implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage ); - ::rtl::OUString implGetClassFromShape( const Reference< XShape >& rxShape ); + OUString implGetClassFromShape( const Reference< XShape >& rxShape ); void implRegisterInterface( const Reference< XInterface >& rxIf ); - const ::rtl::OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); - ::rtl::OUString implGetInterfaceName( const Reference< XInterface >& rxIf ); + const OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); + OUString implGetInterfaceName( const Reference< XInterface >& rxIf ); sal_Bool implLookForFirstVisiblePage(); - Any implSafeGetPagePropSet( const ::rtl::OUString & sPropertyName, + Any implSafeGetPagePropSet( const OUString & sPropertyName, const Reference< XPropertySet > & rxPropSet, const Reference< XPropertySetInfo > & rxPropSetInfo ); DECL_LINK( CalcFieldHdl, EditFieldInfo* ); @@ -314,7 +314,7 @@ protected: virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException); // XExtendedFilterDetection - virtual rtl::OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException); + virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException); public: diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 46b038f2d191..d7cb1c2ebc3c 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -52,7 +52,7 @@ SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const Font& rFont ) { FontWeight eWeight( WEIGHT_NORMAL ); FontItalic eItalic( ITALIC_NONE ); - ::rtl::OUString aFontName( rFont.GetName() ); + OUString aFontName( rFont.GetName() ); sal_Int32 nNextTokenPos( 0 ); switch( rFont.GetWeight() ) @@ -92,7 +92,7 @@ void SVGFontExport::implCollectGlyphs() for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; ++i ) { - ::rtl::OUString aText; + OUString aText; MetaAction* pAction = rMtf.GetAction( i ); const sal_uInt16 nType = pAction->GetType(); @@ -159,7 +159,7 @@ void SVGFontExport::implCollectGlyphs() const sal_Unicode* pStr = aText.getStr(); for( sal_uInt32 k = 0, nLen = aText.getLength(); k < nLen; ++k ) - rGlyphSet.insert( rtl::OUString( pStr[ k ] ) ); + rGlyphSet.insert( OUString( pStr[ k ] ) ); } } } @@ -186,8 +186,8 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) { SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); - ::rtl::OUString aCurIdStr( aEmbeddedFontStr ); - ::rtl::OUString aUnitsPerEM( ::rtl::OUString::valueOf( nFontEM ) ); + OUString aCurIdStr( aEmbeddedFontStr ); + OUString aUnitsPerEM( OUString::valueOf( nFontEM ) ); VirtualDevice aVDev; Font aFont( rFont ); @@ -197,13 +197,13 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) aVDev.SetMapMode( MAP_100TH_MM ); aVDev.SetFont( aFont ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", aCurIdStr += ::rtl::OUString::valueOf( ++mnCurFontId ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", aCurIdStr += OUString::valueOf( ++mnCurFontId ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", aUnitsPerEM ); { SvXMLElementExport aExp2( mrExport, XML_NAMESPACE_NONE, "font", sal_True, sal_True ); - ::rtl::OUString aFontWeight; - ::rtl::OUString aFontStyle; + OUString aFontWeight; + OUString aFontStyle; const Size aSize( nFontEM, nFontEM ); // Font Weight @@ -222,14 +222,14 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) mrExport.AddAttribute( XML_NAMESPACE_NONE, "units-per-em", aUnitsPerEM ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-weight", aFontWeight ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-style", aFontStyle ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "ascent", ::rtl::OUString::valueOf( aVDev.GetFontMetric().GetAscent() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", ::rtl::OUString::valueOf( aVDev.GetFontMetric().GetDescent() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "ascent", OUString::valueOf( aVDev.GetFontMetric().GetAscent() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", OUString::valueOf( aVDev.GetFontMetric().GetDescent() ) ); { SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "font-face", sal_True, sal_True ); } - mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", ::rtl::OUString::valueOf( aSize.Width() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", OUString::valueOf( aSize.Width() ) ); { const Point aPos; @@ -255,7 +255,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) // ----------------------------------------------------------------------------- -void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& rCellStr ) +void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr ) { PolyPolygon aPolyPoly; const sal_Unicode nSpace = ' '; @@ -272,11 +272,11 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& r mrExport.AddAttribute( XML_NAMESPACE_NONE, "unicode", rCellStr ); if( rCellStr[ 0 ] == nSpace && rCellStr.getLength() == 1 ) - aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( rtl::OUString(' ') ), 0 ) ); + aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( OUString(' ') ), 0 ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", ::rtl::OUString::valueOf( aBoundRect.GetWidth() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", OUString::valueOf( aBoundRect.GetWidth() ) ); - const ::rtl::OUString aPathString( SVGActionWriter::GetPathString( aPolyPoly, sal_False ) ); + const OUString aPathString( SVGActionWriter::GetPathString( aPolyPoly, sal_False ) ); if( !aPathString.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", aPathString ); @@ -328,10 +328,10 @@ void SVGFontExport::EmbedFonts() // ----------------------------------------------------------------------------- -::rtl::OUString SVGFontExport::GetMappedFontName( const ::rtl::OUString& rFontName ) const +OUString SVGFontExport::GetMappedFontName( const OUString& rFontName ) const { sal_Int32 nNextTokenPos( 0 ); - ::rtl::OUString aRet( rFontName.getToken( 0, ';', nNextTokenPos ) ); + OUString aRet( rFontName.getToken( 0, ';', nNextTokenPos ) ); if( mnCurFontId ) aRet += " embedded"; diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx index 1a6face4a16a..364af363ecb1 100644 --- a/filter/source/svg/svgfontexport.hxx +++ b/filter/source/svg/svgfontexport.hxx @@ -38,10 +38,10 @@ class OutputDevice; class SVGFontExport { typedef ::std::vector< ObjectRepresentation > ObjectVector; - typedef ::std::set< ::rtl::OUString, ::std::greater< ::rtl::OUString > > GlyphSet; + typedef ::std::set< OUString, ::std::greater< OUString > > GlyphSet; typedef ::std::map< FontItalic, GlyphSet > FontItalicMap; typedef ::std::map< FontWeight, FontItalicMap > FontWeightMap; - typedef ::std::map< ::rtl::OUString, FontWeightMap > FontNameMap; + typedef ::std::map< OUString, FontWeightMap > FontNameMap; typedef FontNameMap GlyphTree; private: @@ -54,7 +54,7 @@ private: GlyphSet& implGetGlyphSet( const Font& rFont ); void implCollectGlyphs(); void implEmbedFont( const Font& rFont ); - void implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& rCellStr ); + void implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr ); public: @@ -62,7 +62,7 @@ public: ~SVGFontExport(); void EmbedFonts(); - ::rtl::OUString GetMappedFontName( const ::rtl::OUString& rFontName ) const; + OUString GetMappedFontName( const OUString& rFontName ) const; }; #endif diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx index a44b231f599d..8ec38eef3471 100644 --- a/filter/source/svg/svgimport.cxx +++ b/filter/source/svg/svgimport.cxx @@ -63,7 +63,7 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) if(!xInputStream.is()) return sal_False; - rtl::OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" ); + OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" ); Reference < XDocumentHandler > xInternalHandler( mxContext->getServiceManager()->createInstanceWithContext( sXMLImportService, mxContext ), UNO_QUERY ); // The XImporter sets up an empty target document for XDocumentHandler to write to.. diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index af3d6aec61b6..a1612dc0f945 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -136,7 +136,7 @@ double colorDiffSquared(const ARGBColor& rCol1, const ARGBColor& rCol2) + square(rCol1.b-rCol2.b); } -typedef std::map ElementRefMapType; +typedef std::map ElementRefMapType; struct AnnotatingVisitor { @@ -187,7 +187,7 @@ struct AnnotatingVisitor uno::Reference xNode(xAttributes->getNamedItem("href")); if(xNode.is()) { - const rtl::OUString sValue(xNode->getNodeValue()); + const OUString sValue(xNode->getNodeValue()); ElementRefMapType::iterator aFound=maGradientIdMap.end(); if ( sValue.copy(0,1) == "#" ) aFound = maGradientIdMap.find(sValue.copy(1)); @@ -224,7 +224,7 @@ struct AnnotatingVisitor uno::Reference xNode(xAttributes->getNamedItem("href")); if(xNode.is()) { - const rtl::OUString sValue(xNode->getNodeValue()); + const OUString sValue(xNode->getNodeValue()); ElementRefMapType::iterator aFound=maGradientIdMap.end(); if ( sValue.copy(0,1) == "#" ) aFound = maGradientIdMap.find(sValue.copy(1)); @@ -272,7 +272,7 @@ struct AnnotatingVisitor // scan for style info const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; for( sal_Int32 i=0; iitem(i)->getNodeValue(); @@ -315,9 +315,9 @@ struct AnnotatingVisitor } } - rtl::OUString getStyleName( const char* sPrefix, sal_Int32 nId ) + OUString getStyleName( const char* sPrefix, sal_Int32 nId ) { - return rtl::OUString::createFromAscii(sPrefix)+rtl::OUString::valueOf(nId); + return OUString::createFromAscii(sPrefix)+OUString::valueOf(nId); } bool hasGradientOpacity( const Gradient& rGradient ) @@ -411,10 +411,10 @@ struct AnnotatingVisitor basegfx::fround(val*255.0)); } - rtl::OUString getOdfColor( const ARGBColor& rColor ) + OUString getOdfColor( const ARGBColor& rColor ) { // TODO(Q3): duplicated from pdfimport - rtl::OUStringBuffer aBuf( 7 ); + OUStringBuffer aBuf( 7 ); const sal_uInt8 nRed ( toByteColor(rColor.r) ); const sal_uInt8 nGreen( toByteColor(rColor.g) ); const sal_uInt8 nBlue ( toByteColor(rColor.b) ); @@ -435,12 +435,12 @@ struct AnnotatingVisitor return aBuf.makeStringAndClear(); } - rtl::OUString getOdfAlign( TextAlign eAlign ) + OUString getOdfAlign( TextAlign eAlign ) { - static ::rtl::OUString aStart("start"); - static ::rtl::OUString aEnd("end"); - // static ::rtl::OUString aJustify("justify"); - static ::rtl::OUString aCenter("center"); + static OUString aStart("start"); + static OUString aEnd("end"); + // static OUString aJustify("justify"); + static OUString aCenter("center"); switch(eAlign) { default: @@ -518,7 +518,7 @@ struct AnnotatingVisitor double rRotate, rShearX; if( rState.maFillGradient.maTransform.decompose(rScale, rTranslate, rRotate, rShearX) ) xAttrs->AddAttribute( "draw:angle", - rtl::OUString::valueOf(rRotate*1800.0/M_PI ) ); + OUString::valueOf(rRotate*1800.0/M_PI ) ); xAttrs->AddAttribute( "draw:start-color", getOdfColor( maGradientStopVector[ @@ -549,12 +549,12 @@ struct AnnotatingVisitor // modulate gradient opacity with overall fill opacity xAttrs->AddAttribute( "draw:end", - rtl::OUString::valueOf( + OUString::valueOf( maGradientStopVector[ rState.maFillGradient.maStops[0]].maStopColor.a* maCurrState.mnFillOpacity*maCurrState.mnOpacity*100.0)+"%" ); xAttrs->AddAttribute( "draw:start", - rtl::OUString::valueOf( + OUString::valueOf( maGradientStopVector[ rState.maFillGradient.maStops[1]].maStopColor.a* maCurrState.mnFillOpacity*maCurrState.mnOpacity*100.0)+"%" ); @@ -590,11 +590,11 @@ struct AnnotatingVisitor xAttrs->Clear(); xAttrs->AddAttribute( "fo:font-family", rState.maFontFamily); xAttrs->AddAttribute( "fo:font-size", - rtl::OUString::valueOf(pt2mm(rState.mnFontSize))+"mm"); + OUString::valueOf(pt2mm(rState.mnFontSize))+"mm"); xAttrs->AddAttribute( "fo:font-style", rState.maFontStyle); xAttrs->AddAttribute( "fo:font-variant", rState.maFontVariant); xAttrs->AddAttribute( "fo:font-weight", - rtl::OUString::valueOf(rState.mnFontWeight)); + OUString::valueOf(rState.mnFontWeight)); xAttrs->AddAttribute( "fo:color", getOdfColor(rState.maFillColor)); mxDocumentHandler->startElement( "style:text-properties", xUnoAttrs ); @@ -645,7 +645,7 @@ struct AnnotatingVisitor } else if( maCurrState.mnFillOpacity*maCurrState.mnOpacity != 1.0 ) xAttrs->AddAttribute( "draw:opacity", - rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" ); + OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" ); } else { @@ -653,7 +653,7 @@ struct AnnotatingVisitor xAttrs->AddAttribute( "draw:fill-color", getOdfColor(rState.maFillColor)); if( maCurrState.mnFillOpacity*maCurrState.mnOpacity != 1.0 ) xAttrs->AddAttribute( "draw:opacity", - rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" ); + OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" ); } } else @@ -667,7 +667,7 @@ struct AnnotatingVisitor else if( rState.meStrokeType == DASH ) { xAttrs->AddAttribute( "draw:stroke", "dash"); - xAttrs->AddAttribute( "draw:stroke-dash", "dash"+rtl::OUString::valueOf(mnCurrStateId)); + xAttrs->AddAttribute( "draw:stroke-dash", "dash"+OUString::valueOf(mnCurrStateId)); xAttrs->AddAttribute( "svg:stroke-color", getOdfColor(rState.maStrokeColor)); } else @@ -677,7 +677,7 @@ struct AnnotatingVisitor { ::basegfx::B2DVector aVec(maCurrState.mnStrokeWidth,0); aVec *= maCurrState.maCTM; - xAttrs->AddAttribute( "svg:stroke-width", rtl::OUString::valueOf( pt2mm(aVec.getLength()) )+"mm"); + xAttrs->AddAttribute( "svg:stroke-width", OUString::valueOf( pt2mm(aVec.getLength()) )+"mm"); } if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_MITER ) xAttrs->AddAttribute( "draw:stroke-linejoin", "miter"); @@ -687,7 +687,7 @@ struct AnnotatingVisitor xAttrs->AddAttribute( "draw:stroke-linejoin", "bevel"); if( maCurrState.mnStrokeOpacity*maCurrState.mnOpacity != 1.0 ) xAttrs->AddAttribute( "svg:stroke-opacity", - rtl::OUString::valueOf(100.0*maCurrState.mnStrokeOpacity*maCurrState.mnOpacity)+"%"); + OUString::valueOf(100.0*maCurrState.mnStrokeOpacity*maCurrState.mnOpacity)+"%"); } mxDocumentHandler->startElement( "style:graphic-properties", xUnoAttrs ); @@ -708,7 +708,7 @@ struct AnnotatingVisitor nStyleId = mrStates.find(maCurrState)->mnStyleId; xElem->setAttribute("internal-style-ref", - rtl::OUString::valueOf( + OUString::valueOf( nStyleId) +"$0"); } @@ -726,13 +726,13 @@ struct AnnotatingVisitor void parseLinearGradientData( Gradient& io_rCurrGradient, const sal_Int32 nGradientNumber, const sal_Int32 nTokenId, - const rtl::OUString& sValue ) + const OUString& sValue ) { switch(nTokenId) { case XML_GRADIENTTRANSFORM: { - rtl::OString aValueUtf8( sValue.getStr(), + OString aValueUtf8( sValue.getStr(), sValue.getLength(), RTL_TEXTENCODING_UTF8 ); parseTransform(aValueUtf8.getStr(),io_rCurrGradient.maTransform); @@ -767,13 +767,13 @@ struct AnnotatingVisitor void parseRadialGradientData( Gradient& io_rCurrGradient, const sal_Int32 nGradientNumber, const sal_Int32 nTokenId, - const rtl::OUString& sValue ) + const OUString& sValue ) { switch(nTokenId) { case XML_GRADIENTTRANSFORM: { - rtl::OString aValueUtf8( sValue.getStr(), + OString aValueUtf8( sValue.getStr(), sValue.getLength(), RTL_TEXTENCODING_UTF8 ); parseTransform(aValueUtf8.getStr(),io_rCurrGradient.maTransform); @@ -811,7 +811,7 @@ struct AnnotatingVisitor void parseGradientStop( GradientStop& io_rGradientStop, const sal_Int32 nStopNumber, const sal_Int32 nTokenId, - const rtl::OUString& sValue ) + const OUString& sValue ) { switch(nTokenId) { @@ -842,9 +842,9 @@ struct AnnotatingVisitor } void parseAttribute( const sal_Int32 nTokenId, - const rtl::OUString& sValue ) + const OUString& sValue ) { - rtl::OString aValueUtf8( sValue.getStr(), + OString aValueUtf8( sValue.getStr(), sValue.getLength(), RTL_TEXTENCODING_UTF8 ); switch(nTokenId) @@ -1052,11 +1052,11 @@ struct AnnotatingVisitor } } - void parseStyle( const rtl::OUString& sValue ) + void parseStyle( const OUString& sValue ) { // split individual style attributes sal_Int32 nIndex=0, nDummyIndex=0; - rtl::OUString aCurrToken; + OUString aCurrToken; do { aCurrToken=sValue.getToken(0,';',nIndex); @@ -1065,11 +1065,11 @@ struct AnnotatingVisitor { // split attrib & value nDummyIndex=0; - rtl::OUString aCurrAttrib( + OUString aCurrAttrib( aCurrToken.getToken(0,':',nDummyIndex).trim()); OSL_ASSERT(nDummyIndex!=-1); nDummyIndex=0; - rtl::OUString aCurrValue( + OUString aCurrValue( aCurrToken.getToken(1,':',nDummyIndex).trim()); OSL_ASSERT(nDummyIndex==-1); @@ -1082,7 +1082,7 @@ struct AnnotatingVisitor } void parseFontStyle( State& io_rInitialState, - const rtl::OUString& rValue, + const OUString& rValue, const char* sValue ) { if( strcmp(sValue,"inherit") != 0 ) @@ -1090,7 +1090,7 @@ struct AnnotatingVisitor } void parseFontVariant( State& io_rInitialState, - const rtl::OUString& rValue, + const OUString& rValue, const char* sValue ) { if( strcmp(sValue,"inherit") != 0 ) @@ -1109,7 +1109,7 @@ struct AnnotatingVisitor // keep current val for sValue == "inherit" } - void parsePaint( const rtl::OUString& rValue, + void parsePaint( const OUString& rValue, const char* sValue, PaintType& rType, ARGBColor& rColor, @@ -1212,7 +1212,7 @@ struct ShapeWritingVisitor uno::Reference xUnoAttrs( xAttrs.get() ); sal_Int32 nDummyIndex(0); - rtl::OUString sStyleId( + OUString sStyleId( xElem->getAttribute("internal-style-ref").getToken( 0,'$',nDummyIndex)); StateMap::iterator pOrigState=mrStateMap.find( @@ -1230,7 +1230,7 @@ struct ShapeWritingVisitor { // collect attributes const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; double x1=0.0,y1=0.0,x2=0.0,y2=0.0; for( sal_Int32 i=0; ihasAttribute("points") ? xElem->getAttribute("points") : ""; + OUString sPoints = xElem->hasAttribute("points") ? xElem->getAttribute("points") : ""; basegfx::B2DPolygon aPoly; basegfx::tools::importFromSvgPoints(aPoly, sPoints); if( nTokenId == XML_POLYGON || maCurrState.meFillType != NONE ) @@ -1293,7 +1293,7 @@ struct ShapeWritingVisitor { // collect attributes const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; bool bRxSeen=false, bRySeen=false; double x=0.0,y=0.0,width=0.0,height=0.0,rx=0.0,ry=0.0; for( sal_Int32 i=0; ihasAttribute("d") ? xElem->getAttribute("d") : ""; + OUString sPath = xElem->hasAttribute("d") ? xElem->getAttribute("d") : ""; basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD(aPoly, sPath); @@ -1365,7 +1365,7 @@ struct ShapeWritingVisitor { // collect attributes const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; double cx=0.0,cy=0.0,r=0.0; for( sal_Int32 i=0; igetLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; double cx=0.0,cy=0.0,rx=0.0, ry=0.0; for( sal_Int32 i=0; igetLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; double x=0.0,y=0.0,width=0.0,height=0.0; for( sal_Int32 i=0; ihasAttribute("href") ? xElem->getAttribute("href") : ""; - rtl::OString aValueUtf8( sValue.getStr(), sValue.getLength(), RTL_TEXTENCODING_UTF8 ); + OUString sValue = xElem->hasAttribute("href") ? xElem->getAttribute("href") : ""; + OString aValueUtf8( sValue.getStr(), sValue.getLength(), RTL_TEXTENCODING_UTF8 ); std::string sLinkValue; parseXlinkHref(aValueUtf8.getStr(), sLinkValue); @@ -1477,9 +1477,9 @@ struct ShapeWritingVisitor case XML_TEXT: { // collect text from all TEXT_NODE children into sText - rtl::OUStringBuffer sText; + OUStringBuffer sText; visitChildren(boost::bind( - (rtl::OUStringBuffer& (rtl::OUStringBuffer::*)(const rtl::OUString& str))&rtl::OUStringBuffer::append, + (OUStringBuffer& (OUStringBuffer::*)(const OUString& str))&OUStringBuffer::append, boost::ref(sText), boost::bind(&xml::dom::XNode::getNodeValue, _1)), @@ -1488,7 +1488,7 @@ struct ShapeWritingVisitor // collect attributes const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; double x=0.0,y=0.0; for( sal_Int32 i=0; iAddAttribute( "svg:x", rtl::OUString::valueOf(pt2mm(x))+"mm"); - xAttrs->AddAttribute( "svg:y", rtl::OUString::valueOf(pt2mm(y))+"mm"); + xAttrs->AddAttribute( "svg:x", OUString::valueOf(pt2mm(x))+"mm"); + xAttrs->AddAttribute( "svg:y", OUString::valueOf(pt2mm(y))+"mm"); xAttrs->AddAttribute( "draw:style-name", "svggraphicstyle"+sStyleId ); mxDocumentHandler->startElement("draw:frame", xUnoAttrs); @@ -1572,10 +1572,10 @@ struct ShapeWritingVisitor const std::string& data) { xAttrs->Clear(); - xAttrs->AddAttribute( "svg:x", rtl::OUString::valueOf(pt2mm(rShapeBounds.getMinX()))+"mm"); - xAttrs->AddAttribute( "svg:y", rtl::OUString::valueOf(pt2mm(rShapeBounds.getMinY()))+"mm"); - xAttrs->AddAttribute( "svg:width", rtl::OUString::valueOf(pt2mm(rShapeBounds.getWidth()))+"mm"); - xAttrs->AddAttribute( "svg:height", rtl::OUString::valueOf(pt2mm(rShapeBounds.getHeight()))+"mm"); + xAttrs->AddAttribute( "svg:x", OUString::valueOf(pt2mm(rShapeBounds.getMinX()))+"mm"); + xAttrs->AddAttribute( "svg:y", OUString::valueOf(pt2mm(rShapeBounds.getMinY()))+"mm"); + xAttrs->AddAttribute( "svg:width", OUString::valueOf(pt2mm(rShapeBounds.getWidth()))+"mm"); + xAttrs->AddAttribute( "svg:height", OUString::valueOf(pt2mm(rShapeBounds.getHeight()))+"mm"); mxDocumentHandler->startElement("draw:frame", xUnoAttrs); @@ -1584,7 +1584,7 @@ struct ShapeWritingVisitor mxDocumentHandler->startElement("office:binary-data", xUnoAttrs); - mxDocumentHandler->characters(rtl::OUString::createFromAscii(data.c_str())); + mxDocumentHandler->characters(OUString::createFromAscii(data.c_str())); mxDocumentHandler->endElement("office:binary-data"); @@ -1598,20 +1598,20 @@ struct ShapeWritingVisitor { basegfx::B2DTuple rScale, rTranslate; double rRotate, rShearX; - ::rtl::OUString sTransformValue; + OUString sTransformValue; if (!rMatrix.decompose(rScale, rTranslate, rRotate, rShearX)) return; if (rScale.getX() != 1.0 || rScale.getY() != 1.0) - sTransformValue += "scale("+::rtl::OUString::valueOf(rScale.getX())+" " - +::rtl::OUString::valueOf(rScale.getY())+") "; + sTransformValue += "scale("+OUString::valueOf(rScale.getX())+" " + +OUString::valueOf(rScale.getY())+") "; if (rTranslate.getX() != 0.0f || rTranslate.getY() != 0.0f) - sTransformValue += "translate("+::rtl::OUString::valueOf(rTranslate.getX()/100.0f)+"mm " - +::rtl::OUString::valueOf(rTranslate.getY()/100.0f)+"mm) "; + sTransformValue += "translate("+OUString::valueOf(rTranslate.getX()/100.0f)+"mm " + +OUString::valueOf(rTranslate.getY()/100.0f)+"mm) "; if (rRotate != 0.0f) - sTransformValue += "rotate("+::rtl::OUString::valueOf(rRotate)+") "; + sTransformValue += "rotate("+OUString::valueOf(rRotate)+") "; if (rShearX != 0.0f) - sTransformValue += "skewX("+::rtl::OUString::valueOf(rShearX)+") "; + sTransformValue += "skewX("+OUString::valueOf(rShearX)+") "; if (sTransformValue.isEmpty()) return; xAttrs->AddAttribute( "draw:transform", sTransformValue); @@ -1620,7 +1620,7 @@ struct ShapeWritingVisitor void writeEllipseShape( rtl::Reference& xAttrs, const uno::Reference& xUnoAttrs, const uno::Reference& xElem, - const rtl::OUString& rStyleId, + const OUString& rStyleId, const basegfx::B2DEllipse& rEllipse) { State aState = maCurrState; @@ -1636,14 +1636,14 @@ struct ShapeWritingVisitor void writePathShape( rtl::Reference& xAttrs, const uno::Reference& xUnoAttrs, const uno::Reference& xElem, - const rtl::OUString& rStyleId, + const OUString& rStyleId, const basegfx::B2DPolyPolygon& rPoly ) { // we might need to split up polypolygon into multiple path // shapes (e.g. when emulating line stroking) std::vector aPolys(1,rPoly); State aState = maCurrState; - rtl::OUString aStyleId(rStyleId); + OUString aStyleId(rStyleId); xAttrs->Clear(); @@ -1695,27 +1695,27 @@ struct ShapeWritingVisitor void fillShapeProperties( rtl::Reference& xAttrs, const uno::Reference& /* xElem */, const basegfx::B2DRange& rShapeBounds, - const rtl::OUString& rStyleName ) + const OUString& rStyleName ) { - xAttrs->AddAttribute( "draw:z-index", rtl::OUString::valueOf( mnShapeNum++ )); + xAttrs->AddAttribute( "draw:z-index", OUString::valueOf( mnShapeNum++ )); xAttrs->AddAttribute( "draw:style-name", rStyleName); - xAttrs->AddAttribute( "svg:width", rtl::OUString::valueOf(pt2mm(rShapeBounds.getWidth()))+"mm"); - xAttrs->AddAttribute( "svg:height", rtl::OUString::valueOf(pt2mm(rShapeBounds.getHeight()))+"mm"); + xAttrs->AddAttribute( "svg:width", OUString::valueOf(pt2mm(rShapeBounds.getWidth()))+"mm"); + xAttrs->AddAttribute( "svg:height", OUString::valueOf(pt2mm(rShapeBounds.getHeight()))+"mm"); // OOo expects the viewbox to be in 100th of mm xAttrs->AddAttribute( "svg:viewBox", "0 0 " - + rtl::OUString::valueOf( + + OUString::valueOf( basegfx::fround(pt100thmm(rShapeBounds.getWidth())) ) + " " - + rtl::OUString::valueOf( + + OUString::valueOf( basegfx::fround(pt100thmm(rShapeBounds.getHeight())) )); // TODO(F1): decompose transformation in calling code, and use // transform attribute here // writeTranslate(maCurrState.maCTM, xAttrs); - xAttrs->AddAttribute( "svg:x", rtl::OUString::valueOf(pt2mm(rShapeBounds.getMinX()))+"mm"); - xAttrs->AddAttribute( "svg:y", rtl::OUString::valueOf(pt2mm(rShapeBounds.getMinY()))+"mm"); + xAttrs->AddAttribute( "svg:x", OUString::valueOf(pt2mm(rShapeBounds.getMinX()))+"mm"); + xAttrs->AddAttribute( "svg:y", OUString::valueOf(pt2mm(rShapeBounds.getMinY()))+"mm"); } State maCurrState; @@ -1753,7 +1753,7 @@ struct OfficeStylesWritingVisitor uno::Reference xUnoAttrs( xAttrs.get() ); sal_Int32 nDummyIndex(0); - rtl::OUString sStyleId( + OUString sStyleId( xElem->getAttribute("internal-style-ref").getToken( 0,'$',nDummyIndex)); StateMap::iterator pOrigState=mrStateMap.find( @@ -1775,13 +1775,13 @@ struct OfficeStylesWritingVisitor xAttrs->AddAttribute( "draw:display-name", "dash"+sStyleId ); xAttrs->AddAttribute( "draw:style", "rect" ); if ( dots1>0 ) { - xAttrs->AddAttribute( "draw:dots1", rtl::OUString::valueOf(dots1) ); - xAttrs->AddAttribute( "draw:dots1-length", rtl::OUString::valueOf(pt2mm(convLength( rtl::OUString::valueOf(dots1_length), maCurrState, 'h' )))+"mm" ); + xAttrs->AddAttribute( "draw:dots1", OUString::valueOf(dots1) ); + xAttrs->AddAttribute( "draw:dots1-length", OUString::valueOf(pt2mm(convLength( OUString::valueOf(dots1_length), maCurrState, 'h' )))+"mm" ); } - xAttrs->AddAttribute( "draw:distance", rtl::OUString::valueOf(pt2mm(convLength( rtl::OUString::valueOf(dash_distance), maCurrState, 'h' )))+"mm" ); + xAttrs->AddAttribute( "draw:distance", OUString::valueOf(pt2mm(convLength( OUString::valueOf(dash_distance), maCurrState, 'h' )))+"mm" ); if ( dots2>0 ) { - xAttrs->AddAttribute( "draw:dots2", rtl::OUString::valueOf(dots2) ); - xAttrs->AddAttribute( "draw:dots2-length", rtl::OUString::valueOf(pt2mm(convLength( rtl::OUString::valueOf(dots2_length), maCurrState, 'h' )))+"mm" ); + xAttrs->AddAttribute( "draw:dots2", OUString::valueOf(dots2) ); + xAttrs->AddAttribute( "draw:dots2-length", OUString::valueOf(pt2mm(convLength( OUString::valueOf(dots2_length), maCurrState, 'h' )))+"mm" ); } mxDocumentHandler->startElement( "draw:stroke-dash", xUnoAttrs); @@ -1856,7 +1856,7 @@ struct DumpingVisitor void operator()( const uno::Reference& xElem ) { OSL_TRACE("name: %s", - rtl::OUStringToOString( + OUStringToOString( xElem->getTagName(), RTL_TEXTENCODING_UTF8 ).getStr()); } @@ -1865,17 +1865,17 @@ struct DumpingVisitor const uno::Reference& xAttributes ) { OSL_TRACE("name: %s", - rtl::OUStringToOString( + OUStringToOString( xElem->getTagName(), RTL_TEXTENCODING_UTF8 ).getStr()); const sal_Int32 nNumAttrs( xAttributes->getLength() ); for( sal_Int32 i=0; iitem(i)->getNodeName(), RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( + OUStringToOString( xAttributes->item(i)->getNodeValue(), RTL_TEXTENCODING_UTF8 ).getStr()); } @@ -1995,7 +1995,7 @@ sal_Bool SVGReader::parseAndConvert() m_xDocumentHandler->startElement( "config:config-item" , xUnoAttrs); sal_Int64 iWidth = sal_Int64(fViewPortWidth); - m_xDocumentHandler->characters( ::rtl::OUString::valueOf(iWidth) ); + m_xDocumentHandler->characters( OUString::valueOf(iWidth) ); m_xDocumentHandler->endElement( "config:config-item" ); @@ -2006,7 +2006,7 @@ sal_Bool SVGReader::parseAndConvert() m_xDocumentHandler->startElement( "config:config-item", xUnoAttrs); sal_Int64 iHeight = sal_Int64(fViewPortHeight); - m_xDocumentHandler->characters( ::rtl::OUString::valueOf(iHeight) ); + m_xDocumentHandler->characters( OUString::valueOf(iHeight) ); m_xDocumentHandler->endElement( "config:config-item" ); @@ -2030,8 +2030,8 @@ sal_Bool SVGReader::parseAndConvert() xAttrs->AddAttribute( "fo:margin-bottom", "0mm"); xAttrs->AddAttribute( "fo:margin-left", "0mm"); xAttrs->AddAttribute( "fo:margin-right", "0mm"); - xAttrs->AddAttribute( "fo:page-width", rtl::OUString::valueOf(fViewPortWidth)+"mm"); - xAttrs->AddAttribute( "fo:page-height", rtl::OUString::valueOf(fViewPortHeight)+"mm"); + xAttrs->AddAttribute( "fo:page-width", OUString::valueOf(fViewPortWidth)+"mm"); + xAttrs->AddAttribute( "fo:page-height", OUString::valueOf(fViewPortHeight)+"mm"); xAttrs->AddAttribute( "style:print-orientation", fViewPortWidth > fViewPortHeight ? OUString("landscape") : OUString("portrait") ); m_xDocumentHandler->startElement( "style:page-layout-properties", xUnoAttrs ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index e36e1901375d..c79b6ccd096c 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -29,7 +29,6 @@ #include -using ::rtl::OUString; static const char aXMLElemG[] = "g"; static const char aXMLElemA[] = "a"; @@ -115,7 +114,7 @@ double SVGAttributeWriter::ImplRound( double fValue, sal_Int32 nDecs ) return( floor( fValue * pow( 10.0, (int)nDecs ) + 0.5 ) / pow( 10.0, (int)nDecs ) ); } -void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, ::rtl::OUString& rColorStr ) +void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, OUString& rColorStr ) { if( rColor.GetTransparency() == 255 ) rColorStr = "none"; @@ -130,12 +129,12 @@ void SVGAttributeWriter::AddColorAttr( const char* pColorAttrName, const char* pColorOpacityAttrName, const Color& rColor ) { - ::rtl::OUString aColor, aColorOpacity; + OUString aColor, aColorOpacity; ImplGetColorStr( rColor, aColor ); if( rColor.GetTransparency() > 0 && rColor.GetTransparency() < 255 ) - aColorOpacity = ::rtl::OUString::valueOf( ImplRound( ( 255.0 - rColor.GetTransparency() ) / 255.0 ) ); + aColorOpacity = OUString::valueOf( ImplRound( ( 255.0 - rColor.GetTransparency() ) / 255.0 ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, pColorAttrName, aColor ); @@ -149,7 +148,7 @@ void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFi // Fill if( pObjBoundRect && pFillGradient ) { - ::rtl::OUString aGradientId; + OUString aGradientId; AddGradientDef( *pObjBoundRect, *pFillGradient, aGradientId ); @@ -166,7 +165,7 @@ void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFi AddColorAttr( aXMLAttrStroke, aXMLAttrStrokeOpacity, rLineColor ); } -void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradient& rGradient, ::rtl::OUString& rGradientId ) +void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradient& rGradient, OUString& rGradientId ) { if( rObjRect.GetWidth() && rObjRect.GetHeight() && ( rGradient.GetStyle() == GradientStyle_LINEAR || rGradient.GetStyle() == GradientStyle_AXIAL || @@ -196,7 +195,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie { ::std::auto_ptr< SvXMLElementExport > apGradient; - ::rtl::OUString aColorStr; + OUString aColorStr; if( rGradient.GetStyle() == GradientStyle_LINEAR || rGradient.GetStyle() == GradientStyle_AXIAL ) { @@ -208,10 +207,10 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie aLinePoly.Rotate( aObjRectCenter, nAngle ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, "userSpaceOnUse" ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, ::rtl::OUString::valueOf( aLinePoly[ 0 ].X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, ::rtl::OUString::valueOf( aLinePoly[ 0 ].Y() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, ::rtl::OUString::valueOf( aLinePoly[ 1 ].X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, ::rtl::OUString::valueOf( aLinePoly[ 1 ].Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::valueOf( aLinePoly[ 0 ].X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::valueOf( aLinePoly[ 0 ].Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::valueOf( aLinePoly[ 1 ].X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aLinePoly[ 1 ].Y() ) ); apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemLinearGradient, sal_True, sal_True ) ); @@ -220,7 +219,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie ( ( rGradient.GetStyle() == GradientStyle_AXIAL ) ? 0.005 : 0.01 ); ImplGetColorStr( ( rGradient.GetStyle() == GradientStyle_AXIAL ) ? aEndColor : aStartColor, aColorStr ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( fBorder ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( fBorder ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { @@ -230,7 +229,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie if( rGradient.GetStyle() == GradientStyle_AXIAL ) { ImplGetColorStr( aStartColor, aColorStr ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( 0.5 ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( 0.5 ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { @@ -242,7 +241,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie fBorder = 0.0; ImplGetColorStr( aEndColor, aColorStr ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( ImplRound( 1.0 - fBorder ) ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( ImplRound( 1.0 - fBorder ) ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { @@ -257,15 +256,15 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie rObjRect.GetHeight() * rObjRect.GetHeight() ) * 0.5; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, "userSpaceOnUse" ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, ::rtl::OUString::valueOf( ImplRound( fCenterX ) ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, ::rtl::OUString::valueOf( ImplRound( fCenterY ) ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrR, ::rtl::OUString::valueOf( ImplRound( fRadius ) ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, OUString::valueOf( ImplRound( fCenterX ) ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, OUString::valueOf( ImplRound( fCenterY ) ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrR, OUString::valueOf( ImplRound( fRadius ) ) ); apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemRadialGradient, sal_True, sal_True ) ); // write stop values ImplGetColorStr( aEndColor, aColorStr ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( 0.0 ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( 0.0 ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { @@ -274,7 +273,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie ImplGetColorStr( aStartColor, aColorStr ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, - ::rtl::OUString::valueOf( ImplRound( 1.0 - rGradient.GetBorder() * 0.01 ) ) ); + OUString::valueOf( ImplRound( 1.0 - rGradient.GetBorder() * 0.01 ) ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { @@ -284,14 +283,14 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie } } else - rGradientId = ::rtl::OUString(); + rGradientId = OUString(); } void SVGAttributeWriter::SetFontAttr( const Font& rFont ) { if( rFont != maCurFont ) { - ::rtl::OUString aFontStyle, aTextDecoration; + OUString aFontStyle, aTextDecoration; sal_Int32 nFontWeight; maCurFont = rFont; @@ -332,7 +331,7 @@ void SVGAttributeWriter::SetFontAttr( const Font& rFont ) default: nFontWeight = 400; break; } - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, ::rtl::OUString::valueOf( nFontWeight ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, OUString::valueOf( nFontWeight ) ); if( mrExport.IsUseNativeTextDecoration() ) { @@ -385,8 +384,8 @@ void SVGAttributeWriter::setFontFamily() else { sal_Int32 nNextTokenPos( 0 ); - const ::rtl::OUString& rsFontName = maCurFont.GetName(); - ::rtl::OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) ); + const OUString& rsFontName = maCurFont.GetName(); + OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) ); FontPitch ePitch = maCurFont.GetPitch(); if( ePitch == PITCH_FIXED ) { @@ -448,7 +447,7 @@ void SVGTextWriter::implRegisterInterface( const Reference< XInterface >& rxIf ) (mrExport.getInterfaceToIdentifierMapper()).registerReference( rxIf ); } -const ::rtl::OUString & SVGTextWriter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) +const OUString & SVGTextWriter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) { return (mrExport.getInterfaceToIdentifierMapper()).getIdentifier( rxIf ); } @@ -593,7 +592,7 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC case( META_COMMENT_ACTION ): { const MetaCommentAction* pA = (const MetaCommentAction*) pAction; - const ::rtl::OString& rsComment = pA->GetComment(); + const OString& rsComment = pA->GetComment(); if( rsComment.equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOL" ) ) ) { bEOL = true; @@ -602,7 +601,7 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC { bEOP = true; - ::rtl::OUString sContent; + OUString sContent; while( nextTextPortion() ) { sContent = mrCurrentTextPortion->getString(); @@ -710,7 +709,7 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc case( META_COMMENT_ACTION ): { const MetaCommentAction* pA = (const MetaCommentAction*) pAction; - const ::rtl::OString& rsComment = pA->GetComment(); + const OString& rsComment = pA->GetComment(); if( rsComment.equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOP" ) ) ) { bEOP = true; @@ -755,7 +754,7 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) // Font Style if( eCurFontItalic != eParFontItalic ) { - ::rtl::OUString sFontStyle; + OUString sFontStyle; if( eCurFontItalic != ITALIC_NONE ) { if( eCurFontItalic == ITALIC_OBLIQUE ) @@ -788,7 +787,7 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) case WEIGHT_BLACK: nFontWeight = 900; break; default: nFontWeight = 400; break; } - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, ::rtl::OUString::valueOf( nFontWeight ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, OUString::valueOf( nFontWeight ) ); } if( bIsTextContainer ) @@ -803,7 +802,7 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) FontUnderline eParFontUnderline = maParentFont.GetUnderline(); FontStrikeout eParFontStrikeout = maParentFont.GetStrikeout(); - ::rtl::OUString sTextDecoration; + OUString sTextDecoration; if( eCurFontUnderline != eParFontUnderline ) { @@ -823,8 +822,8 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) void SVGTextWriter::implSetFontFamily() { sal_Int32 nNextTokenPos( 0 ); - const ::rtl::OUString& rsFontName = maCurrentFont.GetName(); - ::rtl::OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) ); + const OUString& rsFontName = maCurrentFont.GetName(); + OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) ); FontPitch ePitch = maCurrentFont.GetPitch(); if( ePitch == PITCH_FIXED ) { @@ -1145,7 +1144,7 @@ sal_Bool SVGTextWriter::nextTextPortion() if( xPortionPropSet.is() && xPortionPropInfo.is() && xPortionPropInfo->hasPropertyByName( "TextPortionType" ) ) { - ::rtl::OUString sPortionType; + OUString sPortionType; if( xPortionPropSet->getPropertyValue( "TextPortionType" ) >>= sPortionType ) { sInfo = "type: " + sPortionType + "; "; @@ -1162,8 +1161,8 @@ sal_Bool SVGTextWriter::nextTextPortion() Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY ); if( xTextField.is() ) { - const ::rtl::OUString sServicePrefix("com.sun.star.text.textfield."); - const ::rtl::OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); + const OUString sServicePrefix("com.sun.star.text.textfield."); + const OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); Reference< XServiceInfo > xService( xTextField, UNO_QUERY ); const Sequence< OUString > aServices = xService->getSupportedServiceNames(); @@ -1261,8 +1260,8 @@ sal_Bool SVGTextWriter::nextTextPortion() Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY ); if( xTextField.is() ) { - const ::rtl::OUString sServicePrefix("com.sun.star.text.textfield."); - const ::rtl::OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); + const OUString sServicePrefix("com.sun.star.text.textfield."); + const OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); Reference< XServiceInfo > xService( xTextField, UNO_QUERY ); const Sequence< OUString > aServices = xService->getSupportedServiceNames(); @@ -1429,9 +1428,9 @@ void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY ) mnTextWidth = 0; mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextPosition" ); if( bExportX ) - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( maTextPos.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( maTextPos.X() ) ); if( bExportY ) - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( maTextPos.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( maTextPos.Y() ) ); // if text is rotated, set transform matrix at new tspan element const Font& rFont = mpVDev->GetFont(); @@ -1899,7 +1898,7 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon return( rDstPolyPoly ); } -::rtl::OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine ) +OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine ) { OUString aPathData; const OUString aBlank( " " ); @@ -1914,9 +1913,9 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon if( nSize > 1 ) { aPathData += "M "; - aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ 0 ] ).X() ); + aPathData += OUString::valueOf( ( aPolyPoint = rPoly[ 0 ] ).X() ); aPathData += aComma; - aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() ); + aPathData += OUString::valueOf( aPolyPoint.Y() ); sal_Char nCurrentMode = 0; const bool bClose(!bLine || rPoly[0] == rPoly[nSize - 1]); @@ -1935,9 +1934,9 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon { if ( j ) aPathData += aBlank; - aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() ); + aPathData += OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() ); aPathData += aComma; - aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() ); + aPathData += OUString::valueOf( aPolyPoint.Y() ); } } else @@ -1947,9 +1946,9 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon nCurrentMode = 'L'; aPathData += "L "; } - aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() ); + aPathData += OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() ); aPathData += aComma; - aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() ); + aPathData += OUString::valueOf( aPolyPoint.Y() ); } } @@ -1989,10 +1988,10 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, aPt2 = rPt2; } - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, ::rtl::OUString::valueOf( aPt1.X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, ::rtl::OUString::valueOf( aPt1.Y() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, ::rtl::OUString::valueOf( aPt2.X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, ::rtl::OUString::valueOf( aPt2.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::valueOf( aPt1.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::valueOf( aPt1.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::valueOf( aPt2.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aPt2.Y() ) ); if( pLineColor ) { @@ -2015,16 +2014,16 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR else aRect = rRect; - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( aRect.Left() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aRect.Top() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, ::rtl::OUString::valueOf( aRect.GetWidth() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, ::rtl::OUString::valueOf( aRect.GetHeight() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aRect.Left() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aRect.Top() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aRect.GetWidth() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aRect.GetHeight() ) ); if( nRadX ) - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) ); if( nRadY ) - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) ); { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, sal_True, sal_True ); @@ -2041,10 +2040,10 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n else aCenter = rCenter; - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, ::rtl::OUString::valueOf( aCenter.X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, ::rtl::OUString::valueOf( aCenter.Y() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, OUString::valueOf( aCenter.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, OUString::valueOf( aCenter.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) ); { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemEllipse, sal_True, sal_True ); @@ -2101,7 +2100,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool if( rShape.mnStrokeWidth ) { sal_Int32 nStrokeWidth = ( bApplyMapping ? ImplMap( rShape.mnStrokeWidth ) : rShape.mnStrokeWidth ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth, ::rtl::OUString::valueOf( nStrokeWidth ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth, OUString::valueOf( nStrokeWidth ) ); } // support for LineJoin @@ -2112,17 +2111,17 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool { // miter is Svg default, so no need to write until the exporter might write styles. // If this happens, activate here - // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, ::rtl::OUString::createFromAscii("miter")); + // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, OUString::createFromAscii("miter")); break; } case basegfx::B2DLINEJOIN_BEVEL: { - mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, ::rtl::OUString::createFromAscii("bevel")); + mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, OUString::createFromAscii("bevel")); break; } case basegfx::B2DLINEJOIN_ROUND: { - mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, ::rtl::OUString::createFromAscii("round")); + mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, OUString::createFromAscii("round")); break; } } @@ -2134,17 +2133,17 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool { // butt is Svg default, so no need to write until the exporter might write styles. // If this happens, activate here - // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, ::rtl::OUString::createFromAscii("butt")); + // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, OUString::createFromAscii("butt")); break; } case com::sun::star::drawing::LineCap_ROUND: { - mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, ::rtl::OUString::createFromAscii("round")); + mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, OUString::createFromAscii("round")); break; } case com::sun::star::drawing::LineCap_SQUARE: { - mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, ::rtl::OUString::createFromAscii("square")); + mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, OUString::createFromAscii("square")); break; } } @@ -2163,7 +2162,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool if( k ) aDashArrayStr += aComma; - aDashArrayStr += ::rtl::OUString::valueOf( nDash ); + aDashArrayStr += OUString::valueOf( nDash ); } mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeDashArray, aDashArrayStr ); @@ -2196,7 +2195,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aRect.GetWidth() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aRect.GetHeight() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, rtl::OUString( "userSpaceOnUse") ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, OUString( "userSpaceOnUse") ); { SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, sal_True, sal_True ); @@ -2287,7 +2286,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aPoly[ 1 ].Y() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, - rtl::OUString( "userSpaceOnUse" ) ); + OUString( "userSpaceOnUse" ) ); } { @@ -2359,9 +2358,9 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, void SVGActionWriter::ImplWriteGradientStop( const Color& rColor, double fOffset ) { - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, rtl::OUString::valueOf( fOffset ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( fOffset ) ); - ::rtl::OUString aStyle, aColor; + OUString aStyle, aColor; aStyle += "stop-color:"; SVGAttributeWriter::ImplGetColorStr ( rColor, aColor ); aStyle += aColor; @@ -2622,8 +2621,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, sCleanTextContent = sTextContent.copy( nFrom ); } mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PlaceholderText" ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( aPos.X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aPos.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aPos.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPos.Y() ) ); { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False ); // At least for the single slide case we need really to export placeholder text @@ -2636,7 +2635,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, { if( nLen > 1 ) { - aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rtl::OUString(rText.GetChar(nLen - 1)) ); + aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( OUString(rText.GetChar(nLen - 1)) ); if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) ) { @@ -2667,10 +2666,10 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, if( nCount ) { - const ::rtl::OUString aGlyph( rText.Copy( nLastPos, nCount ) ); + const OUString aGlyph( rText.Copy( nLastPos, nCount ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( nX ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aPos.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( nX ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPos.Y() ) ); { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False ); @@ -2688,8 +2687,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, } else { - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( aPos.X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aPos.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aPos.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPos.Y() ) ); { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False ); @@ -2786,7 +2785,7 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx, void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, - const ::rtl::OUString* pElementId, + const OUString* pElementId, const Reference< XShape >* pxShape, const GDIMetaFile* pTextEmbeddedBitmapMtf ) { @@ -2831,7 +2830,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, { sType.append(": "); const MetaCommentAction* pA = (const MetaCommentAction*) pAction; - rtl::OString sComment = pA->GetComment(); + OString sComment = pA->GetComment(); if (!sComment.isEmpty()) { sType.append(OStringToOUString( @@ -3692,7 +3691,7 @@ void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm, const Size& rSize100thmm, const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, - const ::rtl::OUString* pElementId, + const OUString* pElementId, const Reference< XShape >* pXShape, const GDIMetaFile* pTextEmbeddedBitmapMtf ) { diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index e1acd35fb3e0..dbce63487b74 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -112,7 +112,7 @@ public: virtual ~SVGAttributeWriter(); void AddColorAttr( const char* pColorAttrName, const char* pColorOpacityAttrName, const Color& rColor ); - void AddGradientDef( const Rectangle& rObjRect,const Gradient& rGradient, ::rtl::OUString& rGradientId ); + void AddGradientDef( const Rectangle& rObjRect,const Gradient& rGradient, OUString& rGradientId ); void AddPaintAttr( const Color& rLineColor, const Color& rFillColor, const Rectangle* pObjBoundRect = NULL, const Gradient* pFillGradient = NULL ); @@ -121,7 +121,7 @@ public: void endFontSettings(); void setFontFamily(); - static void ImplGetColorStr( const Color& rColor, ::rtl::OUString& rColorStr ); + static void ImplGetColorStr( const Color& rColor, OUString& rColorStr ); }; struct SVGShapeDescriptor @@ -132,7 +132,7 @@ struct SVGShapeDescriptor sal_Int32 mnStrokeWidth; SvtGraphicStroke::DashArray maDashArray; ::std::auto_ptr< Gradient > mapShapeGradient; - ::rtl::OUString maId; + OUString maId; basegfx::B2DLineJoin maLineJoin; com::sun::star::drawing::LineCap maLineCap; @@ -172,7 +172,7 @@ struct BulletListItemInfo struct OUStringHasher { - size_t operator()( const ::rtl::OUString& oustr ) const { return static_cast< size_t >( oustr.hashCode() ); } + size_t operator()( const OUString& oustr ) const { return static_cast< size_t >( oustr.hashCode() ); } }; @@ -182,7 +182,7 @@ struct OUStringHasher class SVGTextWriter { public: - typedef ::boost::unordered_map< ::rtl::OUString, BulletListItemInfo, OUStringHasher > BulletListItemInfoMap; + typedef ::boost::unordered_map< OUString, BulletListItemInfo, OUStringHasher > BulletListItemInfoMap; private: SVGExport& mrExport; @@ -190,7 +190,7 @@ class SVGTextWriter VirtualDevice* mpVDev; sal_Bool mbIsTextShapeStarted; Reference mrTextShape; - ::rtl::OUString msShapeId; + OUString msShapeId; Reference mrParagraphEnumeration; Reference mrCurrentTextParagraph; Reference mrTextPortionEnumeration; @@ -211,8 +211,8 @@ class SVGTextWriter sal_Bool mbIsListLevelStyleImage; sal_Bool mbLineBreak; sal_Bool mbIsURLField; - ::rtl::OUString msUrl; - ::rtl::OUString msHyperlinkIdList; + OUString msUrl; + OUString msHyperlinkIdList; sal_Bool mbIsPlacehlolderShape; sal_Bool mbIWS; Font maCurrentFont; @@ -290,7 +290,7 @@ class SVGTextWriter sal_Bool implGetTextPositionFromBitmap( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty ); void implRegisterInterface( const Reference< XInterface >& rxIf ); - const ::rtl::OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); + const OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); }; @@ -375,7 +375,7 @@ private: void ImplWriteActions( const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, - const ::rtl::OUString* pElementId, + const OUString* pElementId, const Reference< XShape >* pXShape = NULL, const GDIMetaFile* pTextEmbeddedBitmapMtf = NULL ); @@ -383,7 +383,7 @@ private: public: - static ::rtl::OUString GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine ); + static OUString GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine ); static sal_uLong GetChecksum( const MetaAction* pAction ); public: @@ -395,7 +395,7 @@ public: const Size& rSize100thmm, const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, - const ::rtl::OUString* pElementId = NULL, + const OUString* pElementId = NULL, const Reference< XShape >* pXShape = NULL, const GDIMetaFile* pTextEmbeddedBitmapMtf = NULL ); }; diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx index fbba0173880a..03068b74144d 100644 --- a/filter/source/svg/test/odfserializer.cxx +++ b/filter/source/svg/test/odfserializer.cxx @@ -48,11 +48,11 @@ public: virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException); private: @@ -65,7 +65,7 @@ void SAL_CALL ODFSerializer::startDocument( ) throw (xml::sax::SAXException, un { OSL_PRECOND(m_xOutStream.is(), "ODFSerializer(): invalid output stream"); - rtl::OUStringBuffer aElement; + OUStringBuffer aElement; aElement.appendAscii(""); characters(aElement.makeStringAndClear()); } @@ -73,7 +73,7 @@ void SAL_CALL ODFSerializer::startDocument( ) throw (xml::sax::SAXException, un void SAL_CALL ODFSerializer::endDocument() throw (xml::sax::SAXException, uno::RuntimeException) {} -void SAL_CALL ODFSerializer::startElement( const ::rtl::OUString& aName, +void SAL_CALL ODFSerializer::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) { OUStringBuffer aElement("<" + aName + " "); @@ -86,14 +86,14 @@ void SAL_CALL ODFSerializer::startElement( const ::rtl::OUString& aName, characters(aElement.makeStringAndClear() + ">"); } -void SAL_CALL ODFSerializer::endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) { characters(""); } -void SAL_CALL ODFSerializer::characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) { - const rtl::OString aStr = rtl::OUStringToOString(aChars, + const OString aStr = OUStringToOString(aChars, RTL_TEXTENCODING_UTF8); const sal_Int32 nLen( aStr.getLength() ); m_aBuf.realloc( nLen ); @@ -105,14 +105,14 @@ void SAL_CALL ODFSerializer::characters( const ::rtl::OUString& aChars ) throw ( m_xOutStream->writeBytes(m_aLineFeed); } -void SAL_CALL ODFSerializer::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException) { // TODO(F1): Make pretty printing configurable characters(aWhitespaces); } -void SAL_CALL ODFSerializer::processingInstruction( const ::rtl::OUString&, - const ::rtl::OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::processingInstruction( const OUString&, + const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) {} void SAL_CALL ODFSerializer::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException) diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx index 5e3946f59d80..73cf3769108a 100644 --- a/filter/source/svg/test/svg2odf.cxx +++ b/filter/source/svg/test/svg2odf.cxx @@ -40,7 +40,7 @@ namespace public: - explicit OutputWrap( const rtl::OUString& rURL ) : maFile(rURL) + explicit OutputWrap( const OUString& rURL ) : maFile(rURL) { maFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write ); } @@ -71,18 +71,18 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 1; } - ::rtl::OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; + OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; osl_getProcessWorkingDir(&aBaseURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[1]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[1]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aSrcURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[2]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[2]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aDstURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[3]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[3]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aIniUrl.pData); diff --git a/filter/source/svg/tokenmap.cxx b/filter/source/svg/tokenmap.cxx index 7bf6fd1c885e..2c9132f70451 100644 --- a/filter/source/svg/tokenmap.cxx +++ b/filter/source/svg/tokenmap.cxx @@ -34,9 +34,9 @@ sal_Int32 getTokenId( const char* sIdent, sal_Int32 nLen ) return XML_TOKEN_INVALID; } -sal_Int32 getTokenId( const rtl::OUString& sIdent ) +sal_Int32 getTokenId( const OUString& sIdent ) { - rtl::OString aUTF8( sIdent.getStr(), + OString aUTF8( sIdent.getStr(), sIdent.getLength(), RTL_TEXTENCODING_UTF8 ); return getTokenId( aUTF8.getStr(), aUTF8.getLength() ); diff --git a/filter/source/svg/tokenmap.hxx b/filter/source/svg/tokenmap.hxx index 20a25d96a4be..7b6246962966 100644 --- a/filter/source/svg/tokenmap.hxx +++ b/filter/source/svg/tokenmap.hxx @@ -35,7 +35,7 @@ namespace svgi { sal_Int32 getTokenId( const char* sIdent, sal_Int32 nLen ); - sal_Int32 getTokenId( const rtl::OUString& sIdent ); + sal_Int32 getTokenId( const OUString& sIdent ); const char* getTokenName( sal_Int32 nTokenId ); } // namespace svgi diff --git a/filter/source/svg/units.cxx b/filter/source/svg/units.cxx index 2e2fc5684320..c3b218949358 100644 --- a/filter/source/svg/units.cxx +++ b/filter/source/svg/units.cxx @@ -81,12 +81,12 @@ double convLength( double value, SvgUnit unit, const State& rState, char dir ) return fRet; } -double convLength( const rtl::OUString& sValue, const State& rState, char dir ) +double convLength( const OUString& sValue, const State& rState, char dir ) { //FIXME: convert deprecated spirit::classic to use spirit::qi using namespace ::boost::spirit::classic; - rtl::OString aUTF8 = rtl::OUStringToOString( sValue, + OString aUTF8 = OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ); double nVal=0.0; diff --git a/filter/source/svg/units.hxx b/filter/source/svg/units.hxx index 9e6cd81014bb..3f1ed5da3aec 100644 --- a/filter/source/svg/units.hxx +++ b/filter/source/svg/units.hxx @@ -29,8 +29,8 @@ #define INCLUDED_UNITS_HXX #include +#include -namespace rtl{ class OUString; } namespace svgi { struct State; @@ -61,7 +61,7 @@ namespace svgi @param rState current state (needed for viewport dimensions etc.) @param dir direction - either 'h' or 'v' for horizonal or vertical, resp. */ - double convLength( const rtl::OUString& sValue, const State& rState, char dir ); + double convLength( const OUString& sValue, const State& rState, char dir ); inline double pt2mm(double fVal) { return fVal*25.4/72.0; } inline double pt100thmm(double fVal) { return fVal*2540.0/72.0; } diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index d72401f73cbb..63218a12dc93 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -1120,8 +1120,8 @@ sal_Bool T602ImportFilterDialog::OptionsDlg() void T602ImportFilterDialog::initLocale() { - rtl::OString aModName( "t602filter" ); - aModName += rtl::OString::valueOf( sal_Int32( SUPD ) ); + OString aModName( "t602filter" ); + aModName += OString::valueOf( sal_Int32( SUPD ) ); mpResMgr = ResMgr::CreateResMgr( aModName.getStr(), LanguageTag( meLocale) ); } diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index c19d949bf315..a583b40cb70d 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -53,10 +53,10 @@ typedef enum { typedef enum {START,READCH,EOL,POCMD,EXPCMD,SETCMD,SETCH,WRITE,EEND,QUIT} tnode; -::rtl::OUString getImplementationName() +OUString getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence < ::rtl::OUString > getSupportedServiceNames() +::com::sun::star::uno::Sequence < OUString > getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException ); @@ -101,13 +101,13 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper4 < ResMgr *mpResMgr; sal_Bool OptionsDlg(); ResMgr* getResMgr(); - rtl::OUString getResStr( sal_Int16 resid ); + OUString getResStr( sal_Int16 resid ); void initLocale(); ~T602ImportFilterDialog(); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException); @@ -119,11 +119,11 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper4 < throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XPropertyAccess @@ -157,7 +157,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > mxInputStream; - ::rtl::OUString msFilterName; + OUString msFilterName; SvXMLAttributeList *mpAttrList; @@ -230,7 +230,7 @@ private: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XExtendedTypeDetection - virtual ::rtl::OUString SAL_CALL detect( + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor ) throw( com::sun::star::uno::RuntimeException ); @@ -239,34 +239,34 @@ private: throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; -::rtl::OUString T602ImportFilter_getImplementationName() +OUString T602ImportFilter_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL T602ImportFilter_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL T602ImportFilter_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL T602ImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw ( ::com::sun::star::uno::Exception ); -::rtl::OUString T602ImportFilterDialog_getImplementationName() +OUString T602ImportFilterDialog_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL T602ImportFilterDialog_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL T602ImportFilterDialog_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index e4bce81087c3..c77751dc3663 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -62,7 +62,7 @@ PlainTextFilterDetect::PlainTextFilterDetect(const uno::Reference& lDescriptor) throw (uno::RuntimeException) +OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence& lDescriptor) throw (uno::RuntimeException) { OUString aType; OUString aDocService; @@ -126,21 +126,21 @@ void SAL_CALL PlainTextFilterDetect::initialize(const uno::Sequence& / { } -rtl::OUString PlainTextFilterDetect_getImplementationName() +OUString PlainTextFilterDetect_getImplementationName() { - return rtl::OUString("com.sun.star.comp.filters.PlainTextFilterDetect"); + return OUString("com.sun.star.comp.filters.PlainTextFilterDetect"); } -sal_Bool PlainTextFilterDetect_supportsService(const rtl::OUString& ServiceName) +sal_Bool PlainTextFilterDetect_supportsService(const OUString& ServiceName) { return ServiceName == "com.sun.star.document.ExtendedTypeDetection" || ServiceName == "com.sun.star.comp.filters.PlainTextFilterDetect"; } -uno::Sequence PlainTextFilterDetect_getSupportedServiceNames() +uno::Sequence PlainTextFilterDetect_getSupportedServiceNames() { - uno::Sequence aRet(2); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence aRet(2); + OUString* pArray = aRet.getArray(); pArray[0] = "com.sun.star.document.ExtendedTypeDetection"; pArray[1] = "com.sun.star.comp.filters.PlainTextFilterDetect"; return aRet; @@ -153,19 +153,19 @@ uno::Reference PlainTextFilterDetect_createInstance( } // XServiceInfo -rtl::OUString SAL_CALL PlainTextFilterDetect::getImplementationName() +OUString SAL_CALL PlainTextFilterDetect::getImplementationName() throw (uno::RuntimeException) { return PlainTextFilterDetect_getImplementationName(); } -sal_Bool SAL_CALL PlainTextFilterDetect::supportsService(const rtl::OUString& rServiceName) +sal_Bool SAL_CALL PlainTextFilterDetect::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) { return PlainTextFilterDetect_supportsService(rServiceName); } -uno::Sequence SAL_CALL PlainTextFilterDetect::getSupportedServiceNames() +uno::Sequence SAL_CALL PlainTextFilterDetect::getSupportedServiceNames() throw (uno::RuntimeException) { return PlainTextFilterDetect_getSupportedServiceNames(); diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index dd4aa639b8e1..c01398409213 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -41,7 +41,7 @@ public: // XExtendedFilterDetection - virtual ::rtl::OUString SAL_CALL detect(com::sun::star::uno::Sequence& lDescriptor) + virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence& lDescriptor) throw( com::sun::star::uno::RuntimeException ); // XInitialization @@ -51,21 +51,21 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); }; -rtl::OUString PlainTextFilterDetect_getImplementationName(); +OUString PlainTextFilterDetect_getImplementationName(); -sal_Bool PlainTextFilterDetect_supportsService(const rtl::OUString& ServiceName); +sal_Bool PlainTextFilterDetect_supportsService(const OUString& ServiceName); -com::sun::star::uno::Sequence PlainTextFilterDetect_getSupportedServiceNames(); +com::sun::star::uno::Sequence PlainTextFilterDetect_getSupportedServiceNames(); com::sun::star::uno::Reference PlainTextFilterDetect_createInstance(const com::sun::star::uno::Reference& rCxt); diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 7065dce019f2..a11fcffadc17 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -63,7 +63,6 @@ using namespace com::sun::star::xml::sax; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::task; -using ::rtl::OUString; #define MAP_LEN(x) x, sizeof(x) - 1 @@ -196,7 +195,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star if (xStatusIndicator.is()) xStatusIndicator->end(); - OSL_FAIL( ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr()); + OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr()); return sal_False; } if (xStatusIndicator.is()) { @@ -315,7 +314,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star catch( const Exception& ) #endif { - OSL_FAIL( ::rtl::OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); + OSL_FAIL( OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); if (xStatusIndicator.is()) xStatusIndicator->end(); return sal_False; diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index f68722f8f120..68df79320d91 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -64,11 +64,11 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; - ::rtl::OUString msFilterName; + OUString msFilterName; - ::com::sun::star::uno::Sequence< ::rtl::OUString > msUserData; + ::com::sun::star::uno::Sequence< OUString > msUserData; - ::rtl::OUString msTemplateName; + OUString msTemplateName; FilterType meType; @@ -130,15 +130,15 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); @@ -146,19 +146,19 @@ public: -::rtl::OUString XmlFilterAdaptor_getImplementationName() +OUString XmlFilterAdaptor_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL XmlFilterAdaptor_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); diff --git a/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx index 66778325ddf0..d3115ca5cd2f 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.cxx +++ b/filter/source/xmlfilteradaptor/streamwrap.cxx @@ -39,7 +39,7 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 rStream.write(aData.getConstArray(),aData.getLength(),nWritten); if (nWritten != (sal_uInt64)aData.getLength()) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); } } diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index 953a3dc7c7f8..e665f9d738b9 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -43,7 +43,6 @@ #include #include -using rtl::OUString; using com::sun::star::uno::Sequence; using com::sun::star::uno::Reference; using com::sun::star::uno::Any; @@ -73,7 +72,7 @@ using namespace com::sun::star::beans; namespace { -bool isXMLStream(const ::rtl::OString& aHeaderStrm) +bool isXMLStream(const OString& aHeaderStrm) { const char* p = aHeaderStrm.getStr(); size_t n = aHeaderStrm.getLength(); @@ -104,12 +103,12 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) return true; } -::rtl::OUString supportedByType( const ::rtl::OUString clipBoardFormat , const ::rtl::OString resultString, const ::rtl::OUString checkType) +OUString supportedByType( const OUString clipBoardFormat , const OString resultString, const OUString checkType) { - ::rtl::OUString sTypeName; + OUString sTypeName; if ( clipBoardFormat.match(OUString("doctype:")) ) { - ::rtl::OString tryStr = ::rtl::OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr(); + OString tryStr = OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr(); if (resultString.indexOf(tryStr) >= 0) { sTypeName = checkType; @@ -120,16 +119,16 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) } -::rtl::OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aArguments ) throw( com::sun::star::uno::RuntimeException ) +OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aArguments ) throw( com::sun::star::uno::RuntimeException ) { - ::rtl::OUString sTypeName; - ::rtl::OUString sUrl; + OUString sTypeName; + OUString sUrl; Sequence lProps ; com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInStream; const PropertyValue * pValue = aArguments.getConstArray(); sal_Int32 nLength; - ::rtl::OString resultString; + OString resultString; nLength = aArguments.getLength(); sal_Int32 location=nLength; @@ -165,16 +164,16 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) /* long nBytesToRead= */ xInStream->available(); xInStream->skipBytes (0); long bytestRead =xInStream->readBytes (aData, 4000); - resultString=::rtl::OString((const sal_Char *)aData.getConstArray(),bytestRead) ; + resultString=OString((const sal_Char *)aData.getConstArray(),bytestRead) ; if (!isXMLStream(resultString)) // This is not an XML stream. It makes no sense to try to detect // a non-XML file type here. - return ::rtl::OUString(); + return OUString(); // test typedetect code Reference xTypeCont(mxCtx->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", mxCtx), UNO_QUERY); - Sequence < ::rtl::OUString > myTypes= xTypeCont->getElementNames(); + Sequence < OUString > myTypes= xTypeCont->getElementNames(); nLength = myTypes.getLength(); sal_Int32 new_nlength=0; @@ -187,7 +186,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) sal_Int32 j =0; while (j < new_nlength && (sTypeName.isEmpty())) { - ::rtl::OUString tmpStr; + OUString tmpStr; lProps[j].Value >>=tmpStr; if ( lProps[j].Name == "ClipboardFormat" && !tmpStr.isEmpty() ) { @@ -208,7 +207,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) if (location == aArguments.getLength()) { aArguments.realloc(nLength+1); - aArguments[location].Name = ::rtl::OUString( "TypeName" ); + aArguments[location].Name = OUString( "TypeName" ); } aArguments[location].Value <<=sTypeName; } diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx index 8c2dba8b82dc..0672ff24c726 100644 --- a/filter/source/xmlfilterdetect/filterdetect.hxx +++ b/filter/source/xmlfilterdetect/filterdetect.hxx @@ -66,11 +66,11 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; - ::rtl::OUString msFilterName; + OUString msFilterName; - ::com::sun::star::uno::Sequence< ::rtl::OUString > msUserData; + ::com::sun::star::uno::Sequence< OUString > msUserData; - ::rtl::OUString msTemplateName; + OUString msTemplateName; @@ -100,7 +100,7 @@ public: //XExtendedFilterDetection - virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& lDescriptor ) + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& lDescriptor ) throw( com::sun::star::uno::RuntimeException ); @@ -114,15 +114,15 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx index 4a66506c96c6..a7593c2ff918 100644 --- a/filter/source/xsltdialog/typedetectionexport.cxx +++ b/filter/source/xsltdialog/typedetectionexport.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::xml::sax; -using ::rtl::OUString; TypeDetectionExporter::TypeDetectionExporter( Reference< XComponentContext >& xContext ) : mxContext( xContext ) diff --git a/filter/source/xsltdialog/typedetectionexport.hxx b/filter/source/xsltdialog/typedetectionexport.hxx index 05d702aee494..fe9435da8123 100644 --- a/filter/source/xsltdialog/typedetectionexport.hxx +++ b/filter/source/xsltdialog/typedetectionexport.hxx @@ -33,8 +33,8 @@ public: void doExport(com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > xOS, const XMLFilterVector& rFilters ); private: - void addProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const rtl::OUString& rName, const rtl::OUString& rValue ); - void addLocaleProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const rtl::OUString& rName, const rtl::OUString& rValue ); + void addProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue ); + void addLocaleProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue ); com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; }; diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index ffce4d9c8702..c9127d54dbc4 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star::xml::sax; using namespace com::sun::star; using namespace std; -using ::rtl::OUString; TypeDetectionImporter::TypeDetectionImporter( Reference< XMultiServiceFactory >& xMSF ) : mxMSF(xMSF), diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index ef27c43f695b..73d1077946e2 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -48,11 +48,11 @@ enum ImportState e_Unknown }; -DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, PropertyMap ); +DECLARE_STL_USTRINGACCESS_MAP( OUString, PropertyMap ); struct Node { - ::rtl::OUString maName; + OUString maName; PropertyMap maPropertyMap; }; @@ -70,15 +70,15 @@ public: throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument( ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) + virtual void SAL_CALL endElement( const OUString& aName ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) + virtual void SAL_CALL characters( const OUString& aChars ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); @@ -86,7 +86,7 @@ public: private: void fillFilterVector( XMLFilterVector& rFilters ); filter_info_impl* createFilterForNode( Node * pNode ); - Node* findTypeNode( const ::rtl::OUString& rType ); + Node* findTypeNode( const OUString& rType ); com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF; @@ -96,24 +96,24 @@ private: NodeVector maFilterNodes; NodeVector maTypeNodes; - ::rtl::OUString maValue; - ::rtl::OUString maNodeName; - ::rtl::OUString maPropertyName; + OUString maValue; + OUString maNodeName; + OUString maPropertyName; - const ::rtl::OUString sRootNode; - const ::rtl::OUString sNode; - const ::rtl::OUString sName; - const ::rtl::OUString sProp; - const ::rtl::OUString sValue; - const ::rtl::OUString sUIName; - const ::rtl::OUString sData; - const ::rtl::OUString sFilters; - const ::rtl::OUString sTypes; - const ::rtl::OUString sFilterAdaptorService; - const ::rtl::OUString sXSLTFilterService; + const OUString sRootNode; + const OUString sNode; + const OUString sName; + const OUString sProp; + const OUString sValue; + const OUString sUIName; + const OUString sData; + const OUString sFilters; + const OUString sTypes; + const OUString sFilterAdaptorService; + const OUString sXSLTFilterService; - const ::rtl::OUString sCdataAttribute; - const ::rtl::OUString sWhiteSpace; + const OUString sCdataAttribute; + const OUString sWhiteSpace; }; #endif diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx index 3ea05b0a4f6e..00a354befbae 100644 --- a/filter/source/xsltdialog/xmlfiltercommon.hxx +++ b/filter/source/xsltdialog/xmlfiltercommon.hxx @@ -30,36 +30,36 @@ // -------------------------------------------------------------------- -extern ::rtl::OUString string_encode( const ::rtl::OUString & rText ); -extern ::rtl::OUString string_decode( const ::rtl::OUString & rText ); +extern OUString string_encode( const OUString & rText ); +extern OUString string_decode( const OUString & rText ); // -------------------------------------------------------------------- -extern bool isFileURL( const ::rtl::OUString & rURL ); +extern bool isFileURL( const OUString & rURL ); // -------------------------------------------------------------------- bool copyStreams( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xIS, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOS ); -bool createDirectory( ::rtl::OUString& rURL ); +bool createDirectory( OUString& rURL ); // -------------------------------------------------------------------- class filter_info_impl { public: - rtl::OUString maFilterName; - rtl::OUString maType; - rtl::OUString maDocumentService; - rtl::OUString maFilterService; - rtl::OUString maInterfaceName; - rtl::OUString maComment; - rtl::OUString maExtension; - rtl::OUString maExportXSLT; - rtl::OUString maImportXSLT; - rtl::OUString maImportTemplate; - rtl::OUString maDocType; - rtl::OUString maImportService; - rtl::OUString maExportService; + OUString maFilterName; + OUString maType; + OUString maDocumentService; + OUString maFilterService; + OUString maInterfaceName; + OUString maComment; + OUString maExtension; + OUString maExportXSLT; + OUString maImportXSLT; + OUString maImportTemplate; + OUString maDocType; + OUString maImportService; + OUString maExportService; sal_Int32 maFlags; sal_Int32 maFileFormatVersion; @@ -73,17 +73,17 @@ public: filter_info_impl( const filter_info_impl& rInfo ); int operator==( const filter_info_impl& ) const; - com::sun::star::uno::Sequence< rtl::OUString > getFilterUserData() const; + com::sun::star::uno::Sequence< OUString > getFilterUserData() const; }; // -------------------------------------------------------------------- struct application_info_impl { - rtl::OUString maDocumentService; - rtl::OUString maDocumentUIName; - rtl::OUString maXMLImporter; - rtl::OUString maXMLExporter; + OUString maDocumentService; + OUString maDocumentUIName; + OUString maXMLImporter; + OUString maXMLExporter; application_info_impl( const sal_Char * pDocumentService, ResId& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter ); }; @@ -91,8 +91,8 @@ struct application_info_impl // -------------------------------------------------------------------- extern std::vector< application_info_impl* >& getApplicationInfos(); -extern rtl::OUString getApplicationUIName( const rtl::OUString& rServiceName ); -extern const application_info_impl* getApplicationInfo( const rtl::OUString& rServiceName ); +extern OUString getApplicationUIName( const OUString& rServiceName ); +extern const application_info_impl* getApplicationInfo( const OUString& rServiceName ); extern ResMgr* getXSLTDialogResMgr(); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 229e4cf26c15..7c692405ce37 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -82,12 +82,12 @@ protected: virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw(RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException); // XInitialization @@ -206,8 +206,8 @@ Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames( sal_Bool SAL_CALL XMLFilterDialogComponent_supportsService( const OUString& ServiceName ) throw ( RuntimeException ) { - Sequence< ::rtl::OUString > aSupported(XMLFilterDialogComponent_getSupportedServiceNames()); - const ::rtl::OUString* pArray = aSupported.getConstArray(); + Sequence< OUString > aSupported(XMLFilterDialogComponent_getSupportedServiceNames()); + const OUString* pArray = aSupported.getConstArray(); for (sal_Int32 i = 0; i < aSupported.getLength(); ++i, ++pArray) if (pArray->equals(ServiceName)) return sal_True; @@ -222,7 +222,7 @@ Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::sun::star::uno::RuntimeException) +OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::sun::star::uno::RuntimeException) { return XMLFilterDialogComponent_getImplementationName(); } @@ -271,13 +271,13 @@ Sequence< Type > XMLFilterDialogComponent::getTypes() throw (RuntimeException) //------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException) +Sequence< OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException) { return XMLFilterDialogComponent_getSupportedServiceNames(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const ::rtl::OUString& ServiceName) throw(RuntimeException) +sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const OUString& ServiceName) throw(RuntimeException) { return XMLFilterDialogComponent_supportsService( ServiceName ); } @@ -338,7 +338,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing( const EventObject& /* Source } //------------------------------------------------------------------------- -void SAL_CALL XMLFilterDialogComponent::setTitle( const ::rtl::OUString& /* _rTitle */ ) throw(RuntimeException) +void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle */ ) throw(RuntimeException) { } diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 66f7198a5fdb..9d2eee03a2c5 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -58,7 +58,6 @@ using namespace com::sun::star::container; using namespace com::sun::star::beans; using namespace com::sun::star::io; -using ::rtl::OUString; using ::rtl::Uri; XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF ) @@ -162,13 +161,13 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = ::rtl::OUString( "StorageFormat" ); + aArg.Name = OUString( "StorageFormat" ); aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; Reference< XHierarchicalNameAccess > xIfc( mxMSF->createInstanceWithArguments( - rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ), + OUString( "com.sun.star.packages.comp.ZipPackage" ), aArguments ), UNO_QUERY ); if( xIfc.is() ) @@ -262,13 +261,13 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = ::rtl::OUString( "StorageFormat" ); + aArg.Name = OUString( "StorageFormat" ); aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; Reference< XHierarchicalNameAccess > xIfc( mxMSF->createInstanceWithArguments( - rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ), + OUString( "com.sun.star.packages.comp.ZipPackage" ), aArguments ), UNO_QUERY ); if( xIfc.is() ) diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx index 5c4005d0b2b0..8aea9d5c7cbd 100644 --- a/filter/source/xsltdialog/xmlfilterjar.hxx +++ b/filter/source/xsltdialog/xmlfilterjar.hxx @@ -34,23 +34,23 @@ class XMLFilterJarHelper public: XMLFilterJarHelper( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF ); - bool savePackage( const rtl::OUString& rPackageURL, const XMLFilterVector& rFilters ); - void openPackage( const rtl::OUString& rPackageURL, XMLFilterVector& rFilters ); + bool savePackage( const OUString& rPackageURL, const XMLFilterVector& rFilters ); + void openPackage( const OUString& rPackageURL, XMLFilterVector& rFilters ); private: - void addFile( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xRootFolder, com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory, const ::rtl::OUString& rSourceFile ) throw( com::sun::star::uno::Exception ); + void addFile( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xRootFolder, com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory, const OUString& rSourceFile ) throw( com::sun::star::uno::Exception ); - bool copyFile( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, ::rtl::OUString& rURL, const ::rtl::OUString& rTargetURL ); + bool copyFile( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, OUString& rURL, const OUString& rTargetURL ); bool copyFiles( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, filter_info_impl* pFilter ); com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF; - ::rtl::OUString sVndSunStarPackage; - ::rtl::OUString sXSLTPath; - ::rtl::OUString sTemplatePath; - ::rtl::OUString sSpecialConfigManager; - ::rtl::OUString sPump; - ::rtl::OUString sProgPath; + OUString sVndSunStarPackage; + OUString sXSLTPath; + OUString sTemplatePath; + OUString sSpecialConfigManager; + OUString sPump; + OUString sProgPath; }; #endif diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 473123a1d073..6356298cf881 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1657,7 +1657,7 @@ OUString string_decode( const OUString & rText ) // ----------------------------------------------------------------------- -bool isFileURL( const ::rtl::OUString & rURL ) +bool isFileURL( const OUString & rURL ) { return rURL.startsWith("file:"); } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 7ebc3fca0513..80176e02128c 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -114,9 +114,9 @@ private: bool insertOrEdit( filter_info_impl* pNewInfo, const filter_info_impl* pOldInfo = NULL ); - rtl::OUString createUniqueFilterName( const rtl::OUString& rUIName ); - rtl::OUString createUniqueTypeName( const rtl::OUString& rTypeName ); - rtl::OUString createUniqueInterfaceName( const rtl::OUString& rInterfaceName ); + OUString createUniqueFilterName( const OUString& rUIName ); + OUString createUniqueTypeName( const OUString& rTypeName ); + OUString createUniqueInterfaceName( const OUString& rInterfaceName ); private: diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index a7db7ac23a37..857bb0a9adef 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -38,8 +38,8 @@ public: bool FillInfo( filter_info_impl* pInfo ); void SetInfo(const filter_info_impl* pInfo); - static rtl::OUString decodeComment( const rtl::OUString& rComment ); - static rtl::OUString encodeComment( const rtl::OUString& rComment ); + static OUString decodeComment( const OUString& rComment ); + static OUString encodeComment( const OUString& rComment ); FixedText maFTFilterName; Edit maEDFilterName; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 980647ed9caa..062637e1f02b 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -60,14 +60,14 @@ public: CheckBox maCBNeedsXSLT2; private: - void SetURL( SvtURLBox& rURLBox, const rtl::OUString& rURL ); - rtl::OUString GetURL( SvtURLBox& rURLBox ); + void SetURL( SvtURLBox& rURLBox, const OUString& rURL ); + OUString GetURL( SvtURLBox& rURLBox ); - ::rtl::OUString sHTTPSchema; - ::rtl::OUString sSHTTPSchema; - ::rtl::OUString sFILESchema; - ::rtl::OUString sFTPSchema; - ::rtl::OUString sInstPath; + OUString sHTTPSchema; + OUString sSHTTPSchema; + OUString sFILESchema; + OUString sFTPSchema; + OUString sInstPath; }; #endif diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 74c08daf0d20..099aec7933d6 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -67,7 +67,6 @@ using namespace com::sun::star::system; using namespace com::sun::star::xml; using namespace com::sun::star::xml::sax; -using ::rtl::OUString; class GlobalEventListenerImpl : public ::cppu::WeakImplHelper1< com::sun::star::document::XEventListener > { @@ -526,7 +525,7 @@ void XMLFilterTestDialog::displayXMLFile( const OUString& rURL ) { Reference< XSystemShellExecute > xSystemShellExecute( SystemShellExecute::create(comphelper::getProcessComponentContext()) ); - xSystemShellExecute->execute( rURL, rtl::OUString(), SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( rURL, OUString(), SystemShellExecuteFlags::URIS_ONLY ); } void XMLFilterTestDialog::onImportBrowse() diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 7fccd4ed406d..51732137cda0 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -51,9 +51,9 @@ private: void onImportRecentDocument(); void initDialog(); - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > getFrontMostDocument( const rtl::OUString& rServiceName ); - void import( const rtl::OUString& rURL ); - void displayXMLFile( const rtl::OUString& rURL ); + com::sun::star::uno::Reference< com::sun::star::lang::XComponent > getFrontMostDocument( const OUString& rServiceName ); + void import( const OUString& rURL ); + void displayXMLFile( const OUString& rURL ); void doExport( com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp ); private: diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 85eaf7b1caea..29b0faf25a67 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -179,7 +179,7 @@ namespace XSLT xmlXPathObjectPtr streamName = valuePop(ctxt); streamName = ensureStringValue(streamName, ctxt); - oh->insertByName(::rtl::OUString::createFromAscii((sal_Char*) streamName->stringval), ::rtl::OString((sal_Char*) value->stringval)); + oh->insertByName(OUString::createFromAscii((sal_Char*) streamName->stringval), OString((sal_Char*) value->stringval)); valuePush(ctxt, xmlXPathNewCString("")); } @@ -220,7 +220,7 @@ namespace XSLT OleHandler * oh = static_cast (data); xmlXPathObjectPtr streamName = valuePop(ctxt); streamName = ensureStringValue(streamName, ctxt); - const OString content = oh->getByName(::rtl::OUString::createFromAscii((sal_Char*) streamName->stringval)); + const OString content = oh->getByName(OUString::createFromAscii((sal_Char*) streamName->stringval)); valuePush(ctxt, xmlXPathNewCString(content.getStr())); xmlXPathFreeObject(streamName); } diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index f109011a38b1..151777ce6345 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -95,7 +95,7 @@ namespace XSLT void SAL_CALL OleHandler::initRootStorageFromBase64(const OString& content) { Sequence oleData; - ::sax::Converter::decodeBase64(oleData, ::rtl::OStringToOUString( + ::sax::Converter::decodeBase64(oleData, OStringToOUString( content, RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS)); m_rootStream = createTempFile(); Reference xOutput = m_rootStream->getOutputStream(); @@ -155,7 +155,7 @@ namespace XSLT //return the base64 string of the uncompressed data OUStringBuffer buf(oleLength); ::sax::Converter::encodeBase64(buf, result); - return ::rtl::OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); + return OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); } void SAL_CALL @@ -188,7 +188,7 @@ namespace XSLT //return the base64 encoded string OUStringBuffer buf(oleLength); ::sax::Converter::encodeBase64(buf, oledata); - return ::rtl::OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); + return OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); } return encodeSubStorage(streamName); } @@ -199,7 +199,7 @@ namespace XSLT //decode the base64 string Sequence oledata; ::sax::Converter::decodeBase64(oledata, - rtl::OStringToOUString(content, RTL_TEXTENCODING_ASCII_US)); + OStringToOUString(content, RTL_TEXTENCODING_ASCII_US)); //create a temp stream to write data to Reference subStream = createTempFile(); Reference xInput = subStream->getInputStream(); diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 6feebdd08460..9eea215f9f2d 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -124,7 +124,7 @@ namespace XSLT OUString expandUrl(const OUString&); - css::uno::Reference impl_createTransformer(const rtl::OUString& rTransformer, const Sequence& rArgs); + css::uno::Reference impl_createTransformer(const OUString& rTransformer, const Sequence& rArgs); public: @@ -179,10 +179,10 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) { } - ::rtl::OUString - XSLTFilter::expandUrl(const ::rtl::OUString& sUrl) + OUString + XSLTFilter::expandUrl(const OUString& sUrl) { - ::rtl::OUString sExpandedUrl; + OUString sExpandedUrl; try { css::uno::Reference xContext( @@ -201,7 +201,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) } css::uno::Reference - XSLTFilter::impl_createTransformer(const rtl::OUString& rTransformer, const Sequence& rArgs) + XSLTFilter::impl_createTransformer(const OUString& rTransformer, const Sequence& rArgs) { css::uno::Reference xTransformer; @@ -379,7 +379,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) if (xInterActionHandler.is()) { Sequence excArgs(0); ::com::sun::star::ucb::InteractiveAugmentedIOException exc( - rtl::OUString("Timeout!"), + OUString("Timeout!"), static_cast< OWeakObject * >( this ), InteractionClassification_ERROR, ::com::sun::star::ucb::IOErrorCode_GENERAL, diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 8526cc35b5de..d3db076b9507 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -112,8 +112,8 @@ void OButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) cons DECL_PROP1( BUTTONTYPE, FormButtonType, BOUND ); DECL_PROP1( DEFAULT_STATE, sal_Int16, BOUND ); DECL_PROP1( DISPATCHURLINTERNAL, sal_Bool, BOUND ); - DECL_PROP1( TARGET_URL, ::rtl::OUString, BOUND ); - DECL_PROP1( TARGET_FRAME, ::rtl::OUString, BOUND ); + DECL_PROP1( TARGET_URL, OUString, BOUND ); + DECL_PROP1( TARGET_FRAME, OUString, BOUND ); DECL_PROP1( TABINDEX, sal_Int16, BOUND ); END_DESCRIBE_PROPERTIES(); } @@ -128,14 +128,14 @@ StringSequence OButtonModel::getSupportedServiceNames() throw() StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_COMMANDBUTTON; return aSupported; } //------------------------------------------------------------------------------ -::rtl::OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_COMMANDBUTTON; // old (non-sun) name for compatibility ! } @@ -153,7 +153,7 @@ void OButtonModel::write(const Reference& _rxOutStream) thr _rxOutStream->writeShort( (sal_uInt16)m_eButtonType ); - ::rtl::OUString sTmp = INetURLObject::decode( m_sTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS); + OUString sTmp = INetURLObject::decode( m_sTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS); _rxOutStream << sTmp; _rxOutStream << m_sTargetFrame; writeHelpTextCompatibly(_rxOutStream); @@ -215,8 +215,8 @@ void OButtonModel::read(const Reference& _rxInStream) throw default: OSL_FAIL("OButtonModel::read : unknown version !"); m_eButtonType = FormButtonType_PUSH; - m_sTargetURL = ::rtl::OUString(); - m_sTargetFrame = ::rtl::OUString(); + m_sTargetURL = OUString(); + m_sTargetFrame = OUString(); break; } } @@ -358,7 +358,7 @@ StringSequence OButtonControl::getSupportedServiceNames() throw() StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_COMMANDBUTTON; return aSupported; } @@ -517,7 +517,7 @@ void OButtonControl::actionPerformed_Impl( sal_Bool _bNotifyListener, const ::co // XButton //------------------------------------------------------------------------------ -void OButtonControl::setLabel(const ::rtl::OUString& Label) throw( RuntimeException ) +void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException ) { Reference xButton; query_aggregation( m_xAggregate, xButton ); @@ -526,7 +526,7 @@ void OButtonControl::setLabel(const ::rtl::OUString& Label) throw( RuntimeExcept } //------------------------------------------------------------------------------ -void SAL_CALL OButtonControl::setActionCommand(const ::rtl::OUString& _rCommand) throw( RuntimeException ) +void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw( RuntimeException ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -566,7 +566,7 @@ public: bool _bStart ); - void handleListening( const ::rtl::OUString& _rPropertyName ); + void handleListening( const OUString& _rPropertyName ); }; //.............................................................................. @@ -582,7 +582,7 @@ DoPropertyListening::DoPropertyListening( } //.............................................................................. -void DoPropertyListening::handleListening( const ::rtl::OUString& _rPropertyName ) +void DoPropertyListening::handleListening( const OUString& _rPropertyName ) { if ( m_xProps.is() ) { @@ -652,7 +652,7 @@ void SAL_CALL OButtonControl::propertyChange( const PropertyChangeEvent& _rEvent //------------------------------------------------------------------------------ namespace { - bool isFormControllerURL( const ::rtl::OUString& _rURL ) + bool isFormControllerURL( const OUString& _rURL ) { return ( _rURL.getLength() > RTL_CONSTASCII_LENGTH( ".uno:FormController/" ) ) && ( _rURL.startsWith( ".uno:FormController/" ) ); @@ -665,7 +665,7 @@ sal_Int16 OButtonControl::getModelUrlFeatureId( ) const sal_Int16 nFeatureId = -1; // some URL related properties of the model - ::rtl::OUString sUrl; + OUString sUrl; FormButtonType eButtonType = FormButtonType_PUSH; Reference< XPropertySet > xModelProps( const_cast< OButtonControl* >( this )->getModel(), UNO_QUERY ); diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index 1a13136bc280..0128cebb5b01 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -62,7 +62,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -147,8 +147,8 @@ public: // XButton virtual void SAL_CALL addActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLabel(const ::rtl::OUString& Label) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActionCommand(const ::rtl::OUString& _rCommand) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLabel(const OUString& Label) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActionCommand(const OUString& _rCommand) throw(::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index cff783f50c2e..dd24d44e7b39 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -62,7 +62,7 @@ StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_CHECKBOX; return aSupported; } @@ -114,7 +114,7 @@ StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com:: sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -139,7 +139,7 @@ void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_CHECKBOX; // old (non-sun) name for compatibility ! } @@ -169,7 +169,7 @@ void SAL_CALL OCheckBoxModel::read(const Reference& // Version sal_uInt16 nVersion = _rxInStream->readShort(); - ::rtl::OUString sReferenceValue; + OUString sReferenceValue; sal_Int16 nDefaultChecked( 0 ); switch ( nVersion ) { diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index 7e186bceebd6..3ad94b8ffc9f 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -42,7 +42,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 01c71872c3ca..aa004a031730 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -69,26 +69,26 @@ const StringSequence& getColumnTypes() static StringSequence aColumnTypes(10); if (aColumnTypes.getConstArray()[0].isEmpty()) { - ::rtl::OUString* pNames = aColumnTypes.getArray(); - pNames[TYPE_CHECKBOX] = ::rtl::OUString( "CheckBox" ); - pNames[TYPE_COMBOBOX] = ::rtl::OUString( "ComboBox" ); - pNames[TYPE_CURRENCYFIELD] = ::rtl::OUString( "CurrencyField" ); - pNames[TYPE_DATEFIELD] = ::rtl::OUString( "DateField" ); - pNames[TYPE_FORMATTEDFIELD] = ::rtl::OUString( "FormattedField" ); - pNames[TYPE_LISTBOX] = ::rtl::OUString( "ListBox" ); - pNames[TYPE_NUMERICFIELD] = ::rtl::OUString( "NumericField" ); - pNames[TYPE_PATTERNFIELD] = ::rtl::OUString( "PatternField" ); - pNames[TYPE_TEXTFIELD] = ::rtl::OUString( "TextField" ); - pNames[TYPE_TIMEFIELD] = ::rtl::OUString( "TimeField" ); + OUString* pNames = aColumnTypes.getArray(); + pNames[TYPE_CHECKBOX] = OUString( "CheckBox" ); + pNames[TYPE_COMBOBOX] = OUString( "ComboBox" ); + pNames[TYPE_CURRENCYFIELD] = OUString( "CurrencyField" ); + pNames[TYPE_DATEFIELD] = OUString( "DateField" ); + pNames[TYPE_FORMATTEDFIELD] = OUString( "FormattedField" ); + pNames[TYPE_LISTBOX] = OUString( "ListBox" ); + pNames[TYPE_NUMERICFIELD] = OUString( "NumericField" ); + pNames[TYPE_PATTERNFIELD] = OUString( "PatternField" ); + pNames[TYPE_TEXTFIELD] = OUString( "TextField" ); + pNames[TYPE_TIMEFIELD] = OUString( "TimeField" ); } return aColumnTypes; } //------------------------------------------------------------------------------ -sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) +sal_Int32 getColumnTypeByModelName(const OUString& aModelName) { - const ::rtl::OUString aModelPrefix ("com.sun.star.form.component."); - const ::rtl::OUString aCompatibleModelPrefix ("stardiv.one.form.component."); + const OUString aModelPrefix ("com.sun.star.form.component."); + const OUString aCompatibleModelPrefix ("stardiv.one.form.component."); sal_Int32 nTypeId = -1; if (aModelName == FRM_COMPONENT_EDIT) @@ -102,7 +102,7 @@ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) DBG_ASSERT( (nPrefixPos != -1) || (nCompatiblePrefixPos != -1), "::getColumnTypeByModelName() : wrong servivce !"); - ::rtl::OUString aColumnType = (nPrefixPos != -1) + OUString aColumnType = (nPrefixPos != -1) ? aModelName.copy(aModelPrefix.getLength()) : aModelName.copy(aCompatibleModelPrefix.getLength()); @@ -200,7 +200,7 @@ Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeE DBG_NAME(OGridColumn); //------------------------------------------------------------------------------ -OGridColumn::OGridColumn( const comphelper::ComponentContext& _rContext, const ::rtl::OUString& _sModelName ) +OGridColumn::OGridColumn( const comphelper::ComponentContext& _rContext, const OUString& _sModelName ) :OGridColumn_BASE(m_aMutex) ,OPropertySetAggregationHelper(OGridColumn_BASE::rBHelper) ,m_aHidden( makeAny( sal_False ) ) @@ -304,7 +304,7 @@ void OGridColumn::disposing() void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_Bool bAllowDropDown ) { // some properties are not to be exposed to the outer world - ::std::set< ::rtl::OUString > aForbiddenProperties; + ::std::set< OUString > aForbiddenProperties; aForbiddenProperties.insert( PROPERTY_ALIGN ); aForbiddenProperties.insert( PROPERTY_AUTOCOMPLETE ); aForbiddenProperties.insert( PROPERTY_BACKGROUNDCOLOR ); @@ -341,7 +341,7 @@ void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_B aForbiddenProperties.insert( PROPERTY_VERTICAL_ALIGN ); aForbiddenProperties.insert( PROPERTY_IMAGE_URL ); aForbiddenProperties.insert( PROPERTY_IMAGE_POSITION ); - aForbiddenProperties.insert( ::rtl::OUString( "EnableVisible" ) ); + aForbiddenProperties.insert( OUString( "EnableVisible" ) ); if ( !bAllowDropDown ) aForbiddenProperties.insert( PROPERTY_DROPDOWN ); @@ -365,11 +365,11 @@ void OGridColumn::setOwnProperties(Sequence& aDescriptor) { aDescriptor.realloc(5); Property* pProperties = aDescriptor.getArray(); - DECL_PROP1(LABEL, ::rtl::OUString, BOUND); + DECL_PROP1(LABEL, OUString, BOUND); DECL_PROP3(WIDTH, sal_Int32, BOUND, MAYBEVOID, MAYBEDEFAULT); DECL_PROP3(ALIGN, sal_Int16, BOUND, MAYBEVOID, MAYBEDEFAULT); DECL_BOOL_PROP2(HIDDEN, BOUND, MAYBEDEFAULT); - DECL_PROP1(COLUMNSERVICENAME, ::rtl::OUString, READONLY); + DECL_PROP1(COLUMNSERVICENAME, OUString, READONLY); } // Reference diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index c5463a999b4a..ed2a1054d82f 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -61,14 +61,14 @@ protected: // [properties] ::comphelper::ComponentContext m_aContext; - ::rtl::OUString m_aModelName; + OUString m_aModelName; // [properties] - ::rtl::OUString m_aLabel; // Column name + OUString m_aLabel; // Column name // [properties] public: - OGridColumn(const ::comphelper::ComponentContext& _rContext, const ::rtl::OUString& _sModelName = ::rtl::OUString()); + OGridColumn(const ::comphelper::ComponentContext& _rContext, const OUString& _sModelName = OUString()); OGridColumn(const OGridColumn* _pOriginal ); virtual ~OGridColumn(); @@ -110,7 +110,7 @@ public: // XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); - const ::rtl::OUString& getModelName() const { return m_aModelName; } + const OUString& getModelName() const { return m_aModelName; } protected: static void clearAggregateProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property>& seqProps, sal_Bool bAllowDropDown); @@ -189,7 +189,7 @@ OGridColumn* ClassName::createCloneColumn() const \ // List of all known columns const StringSequence& getColumnTypes(); -sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName); +sal_Int32 getColumnTypeByModelName(const OUString& aModelName); // Columns DECL_COLUMN(TextFieldColumn) diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 29abbe3a7af8..84613659ac90 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -95,7 +95,7 @@ StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(Runtime sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -305,10 +305,10 @@ void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co BEGIN_DESCRIBE_PROPERTIES( 6, OBoundControlModel ) DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); - DECL_PROP1(LISTSOURCE, ::rtl::OUString, BOUND); + DECL_PROP1(LISTSOURCE, OUString, BOUND); DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); - DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND); - DECL_PROP1(STRINGITEMLIST, Sequence< ::rtl::OUString >,BOUND); + DECL_PROP1(DEFAULT_TEXT, OUString, BOUND); + DECL_PROP1(STRINGITEMLIST, Sequence< OUString >,BOUND); END_DESCRIBE_PROPERTIES(); } @@ -322,7 +322,7 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_COMBOBOX; // old (non-sun) name for compatibility ! } @@ -391,9 +391,9 @@ void SAL_CALL OComboBoxModel::read(const Reference& if (nVersion > 0x0006) { OSL_FAIL("OComboBoxModel::read : invalid (means unknown) version !"); - m_aListSource = ::rtl::OUString(); + m_aListSource = OUString(); m_aBoundColumn <<= (sal_Int16)0; - m_aDefaultText = ::rtl::OUString(); + m_aDefaultText = OUString(); m_eListSourceType = ListSourceType_TABLE; m_bEmptyIsNull = sal_True; defaultCommonProperties(); @@ -411,10 +411,10 @@ void SAL_CALL OComboBoxModel::read(const Reference& } else // nVersion == 4 { - m_aListSource = ::rtl::OUString(); + m_aListSource = OUString(); StringSequence aListSource; _rxInStream >> aListSource; - const ::rtl::OUString* pToken = aListSource.getConstArray(); + const OUString* pToken = aListSource.getConstArray(); sal_Int32 nLen = aListSource.getLength(); for (sal_Int32 i = 0; i < nLen; ++i, ++pToken) m_aListSource += *pToken; @@ -511,7 +511,7 @@ void OComboBoxModel::loadData( bool _bForce ) Reference xFieldsByName = getTableFields(xConnection, m_aListSource); Reference xFieldsByIndex(xFieldsByName, UNO_QUERY); - ::rtl::OUString aFieldName; + OUString aFieldName; if ( xFieldsByName.is() && xFieldsByName->hasByName( getControlSource() ) ) { aFieldName = getControlSource(); @@ -521,7 +521,7 @@ void OComboBoxModel::loadData( bool _bForce ) // otherwise look for the alias Reference xFormProp(xForm,UNO_QUERY); Reference< XColumnsSupplier > xSupplyFields; - xFormProp->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupplyFields; + xFormProp->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSupplyFields; // search the field DBG_ASSERT(xSupplyFields.is(), "OComboBoxModel::loadData : invalid query composer !"); @@ -543,12 +543,12 @@ void OComboBoxModel::loadData( bool _bForce ) OSL_ENSURE(xMeta.is(),"No database meta data!"); if ( xMeta.is() ) { - ::rtl::OUString aQuote = xMeta->getIdentifierQuoteString(); + OUString aQuote = xMeta->getIdentifierQuoteString(); - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; qualifiedNameComponents( xMeta, m_aListSource, sCatalog, sSchema, sTable, eInDataManipulation ); - ::rtl::OUStringBuffer aStatement; + OUStringBuffer aStatement; aStatement.appendAscii( "SELECT DISTINCT " ); aStatement.append ( quoteName( aQuote, aFieldName ) ); aStatement.appendAscii( " FROM " ); @@ -597,7 +597,7 @@ void OComboBoxModel::loadData( bool _bForce ) return; } - ::std::vector< ::rtl::OUString > aStringList; + ::std::vector< OUString > aStringList; aStringList.reserve(16); try { @@ -646,7 +646,7 @@ void OComboBoxModel::loadData( bool _bForce ) { StringSequence seqNames = xFieldNames->getElementNames(); sal_Int32 nFieldsCount = seqNames.getLength(); - const ::rtl::OUString* pustrNames = seqNames.getConstArray(); + const OUString* pustrNames = seqNames.getConstArray(); for (sal_Int32 k=0; kgetFastPropertyValue( getValuePropertyAggHandle() ) ); - ::rtl::OUString sNewValue; + OUString sNewValue; aNewValue >>= sNewValue; bool bModified = ( aNewValue != m_aLastKnownValue ); @@ -771,7 +771,7 @@ sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset ) StringSequence aStringItemList; if ( getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aStringItemList ) { - const ::rtl::OUString* pStringItems = aStringItemList.getConstArray(); + const OUString* pStringItems = aStringItemList.getConstArray(); sal_Int32 i; for (i=0; igetFormattedValue() ); + OUString sValue( m_pValueFormatter->getFormattedValue() ); if ( sValue.isEmpty() && m_pValueFormatter->getColumn().is() && m_pValueFormatter->getColumn()->wasNull() @@ -818,7 +818,7 @@ Any OComboBoxModel::translateDbColumnToControlValue() else m_aLastKnownValue.clear(); - return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : makeAny( ::rtl::OUString() ); + return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : makeAny( OUString() ); // (m_aLastKnownValue is alllowed to be VOID, the control value isn't) } @@ -890,7 +890,7 @@ StringSequence SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(Runti StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_COMBOBOX; return aSupported; } diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index 548163523817..7803af357e1d 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -51,8 +51,8 @@ class OComboBoxModel { CachedRowSet m_aListRowSet; // the row set to fill the list ::com::sun::star::uno::Any m_aBoundColumn; // obsolet - ::rtl::OUString m_aListSource; // - ::rtl::OUString m_aDefaultText; // DefaultText + OUString m_aListSource; // + OUString m_aDefaultText; // DefaultText ::com::sun::star::uno::Any m_aLastKnownValue; StringSequence m_aDesignModeStringItems; @@ -98,7 +98,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 6076fc64b7d2..7df3e8e939d7 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -66,7 +66,7 @@ StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_CURRENCYFIELD; return aSupported; } @@ -97,7 +97,7 @@ void OCurrencyModel::implConstruct() const SvtSysLocale aSysLocale; const LocaleDataWrapper& aLocaleInfo = aSysLocale.GetLocaleData(); - ::rtl::OUString sCurrencySymbol; + OUString sCurrencySymbol; sal_Bool bPrependCurrencySymbol; switch ( aLocaleInfo.getCurrPositiveFormat() ) { @@ -110,11 +110,11 @@ void OCurrencyModel::implConstruct() bPrependCurrencySymbol = sal_False; break; case 2: // $ 1 - sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(" "); + sCurrencySymbol = OUString(String(aLocaleInfo.getCurrSymbol())) + OUString(" "); bPrependCurrencySymbol = sal_True; break; case 3: // 1 $ - sCurrencySymbol = ::rtl::OUString(" ") + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())); + sCurrencySymbol = OUString(" ") + OUString(String(aLocaleInfo.getCurrSymbol())); bPrependCurrencySymbol = sal_False; break; } @@ -172,7 +172,7 @@ StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames() throw() sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 4 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; *pStoreTo++ = VALIDATABLE_CONTROL_MODEL; @@ -196,7 +196,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_CURRENCYFIELD; // old (non-sun) name for compatibility ! } diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index 91e428e78681..ba6571dbbe86 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -46,7 +46,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException); // OControlModel's property handling virtual void describeFixedProperties( diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 91cedf46f933..ac4305b745f2 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -403,7 +403,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource ) catch(const Exception&) { throw WrappedTargetException( - ::rtl::OUString( "Could not clone the given database form." ), + OUString( "Could not clone the given database form." ), *const_cast< ODatabaseForm* >( &_cloneSource ), ::cppu::getCaughtException() ); @@ -478,22 +478,22 @@ ODatabaseForm::~ODatabaseForm() //============================================================================== // html tools //------------------------------------------------------------------------ -::rtl::OUString ODatabaseForm::GetDataURLEncoded(const Reference& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) +OUString ODatabaseForm::GetDataURLEncoded(const Reference& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) { return GetDataEncoded(true,SubmitButton,MouseEvt); } // ----------------------------------------------------------------------------- -::rtl::OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) +OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) { // Fill List of successful Controls HtmlSuccessfulObjList aSuccObjList; FillSuccessfulList( aSuccObjList, SubmitButton, MouseEvt ); - // Aggregate Liste to ::rtl::OUString - ::rtl::OUStringBuffer aResult; - ::rtl::OUString aName; - ::rtl::OUString aValue; + // Aggregate Liste to OUString + OUStringBuffer aResult; + OUString aName; + OUString aValue; for ( HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin(); pSuccObj < aSuccObjList.end(); @@ -536,13 +536,13 @@ ODatabaseForm::~ODatabaseForm() //============================================================================== // html tools //------------------------------------------------------------------------ -::rtl::OUString ODatabaseForm::GetDataTextEncoded(const Reference& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) +OUString ODatabaseForm::GetDataTextEncoded(const Reference& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) { return GetDataEncoded(false,SubmitButton,MouseEvt); } //------------------------------------------------------------------------ -Sequence ODatabaseForm::GetDataMultiPartEncoded(const Reference& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, ::rtl::OUString& rContentType) +Sequence ODatabaseForm::GetDataMultiPartEncoded(const Reference& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, OUString& rContentType) { // Create Parent @@ -555,7 +555,7 @@ Sequence ODatabaseForm::GetDataMultiPartEncoded(const Reference ODatabaseForm::GetDataMultiPartEncoded(const Reference& xComponentSet, const ::rtl::OUString& rNamePrefix, +void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Reference& xComponentSet, const OUString& rNamePrefix, const Reference& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) { if (!xComponentSet.is()) @@ -622,7 +622,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc sal_Int16 nClassId = 0; xComponentSet->getPropertyValue(PROPERTY_CLASSID) >>= nClassId; - ::rtl::OUString aName; + OUString aName; xComponentSet->getPropertyValue( PROPERTY_NAME ) >>= aName; if( aName.isEmpty() && nClassId != FormComponentType::IMAGEBUTTON) return; @@ -642,7 +642,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc if (xSubmitButtonComponent == xComponentSet && hasProperty(PROPERTY_LABEL, xComponentSet)) { // =
      TableTypeRef; - typedef ::boost::unordered_map< ::rtl::OUString, size_t, ::rtl::OUStringHash> + typedef ::boost::unordered_map< OUString, size_t, OUStringHash> TableNameIndexMap; ScExternalRefCache(); ~ScExternalRefCache(); - const ::rtl::OUString* getRealTableName(sal_uInt16 nFileId, const ::rtl::OUString& rTabName) const; - const ::rtl::OUString* getRealRangeName(sal_uInt16 nFileId, const ::rtl::OUString& rRangeName) const; + const OUString* getRealTableName(sal_uInt16 nFileId, const OUString& rTabName) const; + const OUString* getRealRangeName(sal_uInt16 nFileId, const OUString& rRangeName) const; /** * Get a cached cell data at specified cell location. @@ -213,7 +213,7 @@ public: * @return pointer to the token instance in the cache. */ ScExternalRefCache::TokenRef getCellData( - sal_uInt16 nFileId, const ::rtl::OUString& rTabName, SCCOL nCol, SCROW nRow, sal_uInt32* pnFmtIndex); + sal_uInt16 nFileId, const OUString& rTabName, SCCOL nCol, SCROW nRow, sal_uInt32* pnFmtIndex); /** * Get a cached cell range data. @@ -223,28 +223,28 @@ public: * guaranteed if the TokenArrayRef is properly used.. */ ScExternalRefCache::TokenArrayRef getCellRangeData( - sal_uInt16 nFileId, const ::rtl::OUString& rTabName, const ScRange& rRange); + sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange); - ScExternalRefCache::TokenArrayRef getRangeNameTokens(sal_uInt16 nFileId, const ::rtl::OUString& rName); - void setRangeNameTokens(sal_uInt16 nFileId, const ::rtl::OUString& rName, TokenArrayRef pArray); + ScExternalRefCache::TokenArrayRef getRangeNameTokens(sal_uInt16 nFileId, const OUString& rName); + void setRangeNameTokens(sal_uInt16 nFileId, const OUString& rName, TokenArrayRef pArray); - void setCellData(sal_uInt16 nFileId, const ::rtl::OUString& rTabName, + void setCellData(sal_uInt16 nFileId, const OUString& rTabName, SCCOL nCol, SCROW nRow, TokenRef pToken, sal_uLong nFmtIndex); struct SingleRangeData { /** This name must be in upper-case. */ - ::rtl::OUString maTableName; + OUString maTableName; ScMatrixRef mpRangeData; }; void setCellRangeData(sal_uInt16 nFileId, const ScRange& rRange, const ::std::vector& rData, const TokenArrayRef& pArray); bool isDocInitialized(sal_uInt16 nFileId); - void initializeDoc(sal_uInt16 nFileId, const ::std::vector& rTabNames); + void initializeDoc(sal_uInt16 nFileId, const ::std::vector& rTabNames); String getTableName(sal_uInt16 nFileId, size_t nCacheId) const; - void getAllTableNames(sal_uInt16 nFileId, ::std::vector& rTabNames) const; - SCsTAB getTabSpan( sal_uInt16 nFileId, const ::rtl::OUString& rStartTabName, const ::rtl::OUString& rEndTabName ) const; + void getAllTableNames(sal_uInt16 nFileId, ::std::vector& rTabNames) const; + SCsTAB getTabSpan( sal_uInt16 nFileId, const OUString& rStartTabName, const OUString& rEndTabName ) const; void getAllNumberFormats(::std::vector& rNumFmts) const; /** @@ -258,7 +258,7 @@ public: * Set a table as referenced, used only during store-to-file. * @returns if ALL tables of ALL documents are marked. */ - bool setCacheTableReferenced( sal_uInt16 nFileId, const ::rtl::OUString& rTabName, size_t nSheets, bool bPermanent ); + bool setCacheTableReferenced( sal_uInt16 nFileId, const OUString& rTabName, size_t nSheets, bool bPermanent ); void setAllCacheTableReferencedStati( bool bReferenced ); bool areAllCacheTablesReferenced() const; @@ -287,7 +287,7 @@ private: public: ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, size_t nTabIndex) const; - ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const ::rtl::OUString& rTabName, bool bCreateNew, size_t* pnIndex); + ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const OUString& rTabName, bool bCreateNew, size_t* pnIndex); void clearCache(sal_uInt16 nFileId); @@ -302,9 +302,9 @@ private: } }; - typedef ::boost::unordered_map RangeNameMap; + typedef ::boost::unordered_map RangeNameMap; typedef ::boost::unordered_map RangeArrayMap; - typedef ::boost::unordered_map NamePairMap; + typedef ::boost::unordered_map NamePairMap; // SUNWS needs a forward declared friend, otherwise types and members // of the outer class are not accessible. @@ -406,11 +406,11 @@ public: /** Source document meta-data container. */ struct SrcFileData { - ::rtl::OUString maFileName; /// original file name as loaded from the file. - ::rtl::OUString maRealFileName; /// file name created from the relative name. - ::rtl::OUString maRelativeName; - ::rtl::OUString maFilterName; - ::rtl::OUString maFilterOptions; + OUString maFileName; /// original file name as loaded from the file. + OUString maRealFileName; /// file name created from the relative name. + OUString maRelativeName; + OUString maFilterName; + OUString maFilterOptions; bool bUnsaved; void maybeCreateRealFileName(const String& rOwnDocName); @@ -420,7 +420,7 @@ public: explicit ScExternalRefManager(ScDocument* pDoc); virtual ~ScExternalRefManager(); - virtual ::rtl::OUString getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const; + virtual OUString getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const; /** * Get a cache table instance for specified table and table index. Unlike @@ -454,7 +454,7 @@ public: * * @return shared_ptr to the cache table instance */ - ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const ::rtl::OUString& rTabName, bool bCreateNew, size_t* pnIndex = 0); + ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const OUString& rTabName, bool bCreateNew, size_t* pnIndex = 0); /** Returns a vector containing all (real) table names and cache tables of the specified file. @@ -462,7 +462,7 @@ public: The index in the returned vector corresponds to the table index used to access the cache table, e.g. in getCacheTable(). */ - void getAllCachedTableNames(sal_uInt16 nFileId, ::std::vector& rTabNames) const; + void getAllCachedTableNames(sal_uInt16 nFileId, ::std::vector& rTabNames) const; /** * Get the span (distance+sign(distance)) of two sheets of a specified @@ -480,7 +480,7 @@ public: * 0 if rEndTabName not found */ SCsTAB getCachedTabSpan( - sal_uInt16 nFileId, const ::rtl::OUString& rStartTabName, const ::rtl::OUString& rEndTabName) const; + sal_uInt16 nFileId, const OUString& rStartTabName, const OUString& rEndTabName) const; /** * Get all unique number format indices that are used in the cache tables. @@ -505,7 +505,7 @@ public: * Set a table as referenced, used only during store-to-file. * @returns if ALL tables of ALL external documents are marked. */ - bool setCacheTableReferenced( sal_uInt16 nFileId, const ::rtl::OUString& rTabName, size_t nSheets ); + bool setCacheTableReferenced( sal_uInt16 nFileId, const OUString& rTabName, size_t nSheets ); void setAllCacheTableReferencedStati( bool bReferenced ); /** @@ -514,10 +514,10 @@ public: */ bool isInReferenceMarking() const { return mbInReferenceMarking; } - void storeRangeNameTokens(sal_uInt16 nFileId, const ::rtl::OUString& rName, const ScTokenArray& rArray); + void storeRangeNameTokens(sal_uInt16 nFileId, const OUString& rName, const ScTokenArray& rArray); ScExternalRefCache::TokenRef getSingleRefToken( - sal_uInt16 nFileId, const ::rtl::OUString& rTabName, const ScAddress& rCell, + sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rCell, const ScAddress* pCurPos, SCTAB* pTab, ScExternalRefCache::CellFormat* pFmt = NULL); /** @@ -534,7 +534,7 @@ public: * delete the instance returned by this method. */ ScExternalRefCache::TokenArrayRef getDoubleRefTokens( - sal_uInt16 nFileId, const ::rtl::OUString& rTabName, const ScRange& rRange, const ScAddress* pCurPos); + sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange, const ScAddress* pCurPos); /** * Get an array of tokens corresponding with a specified name in a @@ -548,10 +548,10 @@ public: * @return shared_ptr to array of tokens composing the name */ ScExternalRefCache::TokenArrayRef getRangeNameTokens( - sal_uInt16 nFileId, const ::rtl::OUString& rName, const ScAddress* pCurPos = NULL); + sal_uInt16 nFileId, const OUString& rName, const ScAddress* pCurPos = NULL); - ::rtl::OUString getOwnDocumentName() const; - bool isOwnDocument(const ::rtl::OUString& rFile) const; + OUString getOwnDocumentName() const; + bool isOwnDocument(const OUString& rFile) const; /** * Takes a flat file name, and convert it to an absolute URL path. An @@ -559,8 +559,8 @@ public: * * @param rFile file name to convert */ - void convertToAbsName(::rtl::OUString& rFile) const; - sal_uInt16 getExternalFileId(const ::rtl::OUString& rFile); + void convertToAbsName(OUString& rFile) const; + sal_uInt16 getExternalFileId(const OUString& rFile); /** * It returns a pointer to the name of the URI associated with a given @@ -575,17 +575,17 @@ public: * * @return const String* external document URI. */ - const ::rtl::OUString* getExternalFileName(sal_uInt16 nFileId, bool bForceOriginal = false); + const OUString* getExternalFileName(sal_uInt16 nFileId, bool bForceOriginal = false); bool hasExternalFile(sal_uInt16 nFileId) const; - bool hasExternalFile(const ::rtl::OUString& rFile) const; + bool hasExternalFile(const OUString& rFile) const; const SrcFileData* getExternalFileData(sal_uInt16 nFileId) const; - const ::rtl::OUString* getRealTableName(sal_uInt16 nFileId, const ::rtl::OUString& rTabName) const; - const ::rtl::OUString* getRealRangeName(sal_uInt16 nFileId, const ::rtl::OUString& rRangeName) const; + const OUString* getRealTableName(sal_uInt16 nFileId, const OUString& rTabName) const; + const OUString* getRealRangeName(sal_uInt16 nFileId, const OUString& rRangeName) const; void clearCache(sal_uInt16 nFileId); void refreshNames(sal_uInt16 nFileId); void breakLink(sal_uInt16 nFileId); - void switchSrcFile(sal_uInt16 nFileId, const ::rtl::OUString& rNewFile, const ::rtl::OUString& rNewFilter); + void switchSrcFile(sal_uInt16 nFileId, const OUString& rNewFile, const OUString& rNewFilter); /** * Set a relative file path for the specified file ID. Note that the @@ -594,7 +594,7 @@ public: * @param nFileId file ID for an external document * @param rRelUrl relative URL */ - void setRelativeFileName(sal_uInt16 nFileId, const ::rtl::OUString& rRelUrl); + void setRelativeFileName(sal_uInt16 nFileId, const OUString& rRelUrl); /** * Set the filter name and options if any for a given source document. @@ -604,7 +604,7 @@ public: * @param rFilterName * @param rOptions */ - void setFilterData(sal_uInt16 nFileId, const ::rtl::OUString& rFilterName, const ::rtl::OUString& rOptions); + void setFilterData(sal_uInt16 nFileId, const OUString& rFilterName, const OUString& rOptions); void clear(); @@ -618,7 +618,7 @@ public: * @param rBaseFileUrl Absolute URL of the content.xml fragment of the * document being exported. */ - void resetSrcFileData(const ::rtl::OUString& rBaseFileUrl); + void resetSrcFileData(const OUString& rBaseFileUrl); /** * Replace the original URL wirh the real URL that was generated from the relative URL. @@ -660,7 +660,7 @@ public: * Check if the file specified by the path is a legitimate file that * exists & can be loaded. */ - bool isFileLoadable(const ::rtl::OUString& rFile) const; + bool isFileLoadable(const OUString& rFile) const; /** * If in maUnsavedDocShells move it to maDocShells and create a correct @@ -708,7 +708,7 @@ private: * @return range token array */ ScExternalRefCache::TokenArrayRef getDoubleRefTokensFromSrcDoc( - ScDocument* pSrcDoc, const ::rtl::OUString& rTabName, ScRange& rRange, + ScDocument* pSrcDoc, const OUString& rTabName, ScRange& rRange, ::std::vector& rCacheData); /** @@ -724,11 +724,11 @@ private: * @return range name token array */ ScExternalRefCache::TokenArrayRef getRangeNameTokensFromSrcDoc( - sal_uInt16 nFileId, ScDocument* pSrcDoc, ::rtl::OUString& rName); + sal_uInt16 nFileId, ScDocument* pSrcDoc, OUString& rName); ScDocument* getInMemorySrcDocument(sal_uInt16 nFileId); ScDocument* getSrcDocument(sal_uInt16 nFileId); - SfxObjectShellRef loadSrcDocument(sal_uInt16 nFileId, ::rtl::OUString& rFilter); + SfxObjectShellRef loadSrcDocument(sal_uInt16 nFileId, OUString& rFilter); void maybeLinkExternalFile(sal_uInt16 nFileId); diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index d7a3f37cd728..d4d580d0b197 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -115,11 +115,11 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -182,11 +182,11 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -221,16 +221,16 @@ private: SvxFieldData* getData(); - void setPropertyValueURL(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal); - com::sun::star::uno::Any getPropertyValueURL(const rtl::OUString& rName); + void setPropertyValueURL(const OUString& rName, const com::sun::star::uno::Any& rVal); + com::sun::star::uno::Any getPropertyValueURL(const OUString& rName); - void setPropertyValueFile(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal); - com::sun::star::uno::Any getPropertyValueFile(const rtl::OUString& rName); + void setPropertyValueFile(const OUString& rName, const com::sun::star::uno::Any& rVal); + com::sun::star::uno::Any getPropertyValueFile(const OUString& rName); - void setPropertyValueDateTime(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal); - com::sun::star::uno::Any getPropertyValueDateTime(const rtl::OUString& rName); + void setPropertyValueDateTime(const OUString& rName, const com::sun::star::uno::Any& rVal); + com::sun::star::uno::Any getPropertyValueDateTime(const OUString& rName); - void setPropertyValueSheet(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal); + void setPropertyValueSheet(const OUString& rName, const com::sun::star::uno::Any& rVal); public: static const com::sun::star::uno::Sequence& getUnoTunnelId(); @@ -250,7 +250,7 @@ public: ScEditSource* pEditSrc, const ESelection& rSel); // XTextField - virtual ::rtl::OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) + virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException); // XTextContent @@ -274,7 +274,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -282,29 +282,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -317,11 +317,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index 2f1c3f82645d..4956d1e98f6d 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -34,12 +34,12 @@ class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem double fExcelColScale; double fExcelRowScale; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: ScFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); virtual void Commit(); sal_Bool GetWK3Flag() const { return bWK3Flag; } diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx index bd38bd70e3f1..587a23e8d598 100644 --- a/sc/inc/filtuno.hxx +++ b/sc/inc/filtuno.hxx @@ -47,9 +47,9 @@ class ScFilterOptionsObj : public ::cppu::WeakImplHelper5< ::com::sun::star::lang::XServiceInfo > { private: - ::rtl::OUString aFileName; - ::rtl::OUString aFilterName; - ::rtl::OUString aFilterOptions; + OUString aFileName; + OUString aFilterName; + OUString aFilterOptions; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream; sal_Bool bExport; @@ -58,8 +58,8 @@ public: ScFilterOptionsObj(); virtual ~ScFilterOptionsObj(); - static ::rtl::OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_Static(); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > @@ -73,7 +73,7 @@ public: ::com::sun::star::uno::RuntimeException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException); @@ -90,11 +90,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 264846adcf44..fbda9111ea3c 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -107,13 +107,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess @@ -135,11 +135,11 @@ public: com::sun::star::sheet::XSheetConditionalEntries> xObj ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -169,11 +169,11 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) + virtual OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) + virtual OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() throw(::com::sun::star::uno::RuntimeException); @@ -181,16 +181,16 @@ public: throw(::com::sun::star::uno::RuntimeException); // XSheetConditionalEntry - virtual ::rtl::OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStyleName( const ::rtl::OUString& aStyleName ) + virtual OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setStyleName( const OUString& aStyleName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -247,11 +247,11 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) + virtual OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) + virtual OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() throw(::com::sun::star::uno::RuntimeException); @@ -271,7 +271,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -279,29 +279,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -318,11 +318,11 @@ public: com::sun::star::beans::XPropertySet> xObj ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 45a708dd1fc1..469495a91f11 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -122,7 +122,7 @@ public: also includes formula::FormulaGrammar::CONV_UNSPECIFIED, therefor uses the address convention associated with rPos::nTab by default. */ ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, - const rtl::OUString& rFormula, + const OUString& rFormula, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT, sal_uInt8 cMatInd = MM_NONE ); @@ -132,9 +132,9 @@ public: ScFormulaVectorState GetVectorState() const; - void GetFormula( rtl::OUString& rFormula, + void GetFormula( OUString& rFormula, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void GetFormula( rtl::OUStringBuffer& rBuffer, + void GetFormula( OUStringBuffer& rBuffer, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; void SetDirty( bool bDirtyFlag=true ); @@ -148,7 +148,7 @@ public: void ResetDirty() { bDirty = false; } bool NeedsListening() const { return bNeedListening; } void SetNeedsListening( bool bVar ) { bNeedListening = bVar; } - void Compile(const rtl::OUString& rFormula, + void Compile(const OUString& rFormula, bool bNoListening = false, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ); void CompileTokenArray( bool bNoListening = false ); @@ -188,7 +188,7 @@ public: void UpdateInsertTabAbs(SCTAB nTable); bool UpdateDeleteTab(SCTAB nTable, bool bIsMove = false, SCTAB nSheets = 1); void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); - void UpdateRenameTab(SCTAB nTable, const rtl::OUString& rName); + void UpdateRenameTab(SCTAB nTable, const OUString& rName); bool TestTabRefAbs(SCTAB nTable); void UpdateCompile( bool bForceIfNameInUse = false ); void FindRangeNamesInUse(std::set& rIndexes) const; @@ -202,7 +202,7 @@ public: bool IsHybridValueCell(); // for cells after import to deal with inherited number formats double GetValue(); double GetValueAlways(); // ignore errors - rtl::OUString GetString(); + OUString GetString(); const ScMatrix* GetMatrix(); bool GetMatrixOrigin( ScAddress& rPos ) const; void GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ); @@ -253,13 +253,13 @@ public: If for whatever reason you have to use both, SetHybridDouble() and SetHybridString() or SetHybridFormula(), use SetHybridDouble() first for performance reasons.*/ - void SetHybridString( const rtl::OUString& r ) + void SetHybridString( const OUString& r ) { aResult.SetHybridString( r); } /** For import only: set a temporary formula string to be compiled later. If for whatever reason you have to use both, SetHybridDouble() and SetHybridString() or SetHybridFormula(), use SetHybridDouble() first for performance reasons.*/ - void SetHybridFormula( const rtl::OUString& r, + void SetHybridFormula( const OUString& r, const formula::FormulaGrammar::Grammar eGrammar ) { aResult.SetHybridFormula( r); eTempGrammar = eGrammar; } diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index ff560961ef4a..38f89d77eb44 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -44,9 +44,9 @@ private: formula::FormulaGrammar::Grammar eFormulaGrammar; // formula grammar used to switch different formula syntax ScCalcConfig aCalcConfig; - ::rtl::OUString aFormulaSepArg; - ::rtl::OUString aFormulaSepArrayRow; - ::rtl::OUString aFormulaSepArrayCol; + OUString aFormulaSepArg; + OUString aFormulaSepArrayRow; + OUString aFormulaSepArrayCol; ScRecalcOptions meOOXMLRecalc; ScRecalcOptions meODFRecalc; @@ -68,14 +68,14 @@ public: void SetUseEnglishFuncName( bool bVal ) { bUseEnglishFuncName = bVal; } bool GetUseEnglishFuncName() const { return bUseEnglishFuncName; } - void SetFormulaSepArg(const ::rtl::OUString& rSep) { aFormulaSepArg = rSep; } - ::rtl::OUString GetFormulaSepArg() const { return aFormulaSepArg; } + void SetFormulaSepArg(const OUString& rSep) { aFormulaSepArg = rSep; } + OUString GetFormulaSepArg() const { return aFormulaSepArg; } - void SetFormulaSepArrayRow(const ::rtl::OUString& rSep) { aFormulaSepArrayRow = rSep; } - ::rtl::OUString GetFormulaSepArrayRow() const { return aFormulaSepArrayRow; } + void SetFormulaSepArrayRow(const OUString& rSep) { aFormulaSepArrayRow = rSep; } + OUString GetFormulaSepArrayRow() const { return aFormulaSepArrayRow; } - void SetFormulaSepArrayCol(const ::rtl::OUString& rSep) { aFormulaSepArrayCol = rSep; } - ::rtl::OUString GetFormulaSepArrayCol() const { return aFormulaSepArrayCol; } + void SetFormulaSepArrayCol(const OUString& rSep) { aFormulaSepArrayCol = rSep; } + OUString GetFormulaSepArrayCol() const { return aFormulaSepArrayCol; } void SetOOXMLRecalcOptions( ScRecalcOptions eOpt ) { meOOXMLRecalc = eOpt; } ScRecalcOptions GetOOXMLRecalcOptions() const { return meOOXMLRecalc; } @@ -85,7 +85,7 @@ public: void ResetFormulaSeparators(); - static void GetDefaultFormulaSeparators(rtl::OUString& rSepArg, rtl::OUString& rSepArrayCol, rtl::OUString& rSepArrayRow); + static void GetDefaultFormulaSeparators(OUString& rSepArg, OUString& rSepArrayCol, OUString& rSepArrayRow); static const LocaleDataWrapper& GetLocaleDataWrapper(); @@ -123,14 +123,14 @@ private: class ScFormulaCfg : public ScFormulaOptions, public utl::ConfigItem { - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: ScFormulaCfg(); void SetOptions( const ScFormulaOptions& rNew ); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); }; #endif diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx index 861fec495770..337fef59de5b 100644 --- a/sc/inc/formulaparserpool.hxx +++ b/sc/inc/formulaparserpool.hxx @@ -36,18 +36,18 @@ public: ~ScFormulaParserPool(); /** Returns true, if a formula parser is registered for the passed namespace. */ - bool hasFormulaParser( const ::rtl::OUString& rNamespace ); + bool hasFormulaParser( const OUString& rNamespace ); /** Returns the formula parser that is registered for the passed namespace. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser > - getFormulaParser( const ::rtl::OUString& rNamespace ); + getFormulaParser( const OUString& rNamespace ); private: typedef ::boost::unordered_map< - ::rtl::OUString, + OUString, ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ParserMap; + OUStringHash, + ::std::equal_to< OUString > > ParserMap; const ScDocument& mrDoc; ParserMap maParsers; diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index 673bcdbf84bc..4e6fd393168e 100644 --- a/sc/inc/formularesult.hxx +++ b/sc/inc/formularesult.hxx @@ -172,7 +172,7 @@ public: /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only SetHybridFormula() for formula string to be compiled later. */ - SC_DLLPUBLIC void SetHybridString( const rtl::OUString & rStr ); + SC_DLLPUBLIC void SetHybridString( const OUString & rStr ); /** Should only be used by import filters, best in the order SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index 2c2c3f26de71..a507962df6d3 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -78,28 +78,28 @@ public: @return the description of the function, or an empty OUString if there is no description */ - virtual ::rtl::OUString getDescription() const ; + virtual OUString getDescription() const ; /** Returns the function signature with parameters from the passed string array. @return function signature with parameters */ - virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const ; + virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const ; /** Returns the name of the function @return the name of the function, or an empty OUString if there is no name */ - virtual ::rtl::OUString getFunctionName() const ; + virtual OUString getFunctionName() const ; /** Returns the help id of the function @return help id of the function */ - virtual ::rtl::OString getHelpId() const ; + virtual OString getHelpId() const ; /** Returns number of arguments @@ -116,7 +116,7 @@ public: @return OUString description of the parameter */ - virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const ; + virtual OUString getParameterDescription(sal_uInt32 _nPos) const ; /** Returns name of parameter at given position @@ -126,21 +126,21 @@ public: @return OUString name of the parameter */ - virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const ; + virtual OUString getParameterName(sal_uInt32 _nPos) const ; /** Returns list of all parameter names @return OUString containing separated list of all parameter names */ - ::rtl::OUString GetParamList() const; + OUString GetParamList() const; /** Returns the full function signature @return OUString of the form "FUNCTIONNAME( parameter list )" */ - virtual ::rtl::OUString getSignature() const ; + virtual OUString getSignature() const ; /** Returns the number of non-suppressed arguments @@ -198,15 +198,15 @@ public: - ::rtl::OUString *pFuncName; /**< Function name */ - ::rtl::OUString *pFuncDesc; /**< Description of function */ - ::rtl::OUString **ppDefArgNames; /**< Parameter name(s) */ - ::rtl::OUString **ppDefArgDescs; /**< Description(s) of parameter(s) */ + OUString *pFuncName; /**< Function name */ + OUString *pFuncDesc; /**< Description of function */ + OUString **ppDefArgNames; /**< Parameter name(s) */ + OUString **ppDefArgDescs; /**< Description(s) of parameter(s) */ ParameterFlags *pDefArgFlags; /**< Flags for each parameter */ sal_uInt16 nFIndex; /**< Unique function index */ sal_uInt16 nCategory; /**< Function category */ sal_uInt16 nArgCount; /**< All parameter count, suppressed and unsuppressed */ - rtl::OString sHelpId; /**< HelpId of function */ + OString sHelpId; /**< HelpId of function */ bool bIncomplete :1; /**< Incomplete argument info (set for add-in info from configuration) */ bool bHasSuppressedArgs :1; /**< Whether there is any suppressed parameter. */ }; @@ -278,12 +278,12 @@ public: @return index number of this category. */ virtual sal_uInt32 getNumber() const; - virtual ::rtl::OUString getName() const; + virtual OUString getName() const; private: ScFunctionMgr* m_pMgr; /**< function manager for this category */ ::std::vector* m_pCategory; /**< list of functions in this category */ - mutable ::rtl::OUString m_sName; /**< name of this category */ + mutable OUString m_sName; /**< name of this category */ sal_uInt32 m_nCategory; /**< index number of this category */ }; @@ -310,7 +310,7 @@ public: @return name of the category specified by _nCategoryNumber, empty string if _nCategoryNumber out of bounds */ - static ::rtl::OUString GetCategoryName(sal_uInt32 _nCategoryNumber ); + static OUString GetCategoryName(sal_uInt32 _nCategoryNumber ); /** Returns function by name. @@ -322,7 +322,7 @@ public: @return pointer to function with the name rFName, null if no such function was found. */ - const ScFuncDesc* Get( const ::rtl::OUString& rFName ) const; + const ScFuncDesc* Get( const OUString& rFName ) const; /** Returns function by index. @@ -383,9 +383,9 @@ public: virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const; /** - Implemented because of inheritance \see ScFunctionMgr::Get(const ::rtl::OUString&) const + Implemented because of inheritance \see ScFunctionMgr::Get(const OUString&) const */ - virtual const formula::IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const; + virtual const formula::IFunctionDescription* getFunctionByName(const OUString& _sFunctionName) const; /** Maps Etoken to character diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index 578f50c3b339..0a8423fa7f2c 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -71,14 +71,14 @@ public: ScFunctionAccess(); virtual ~ScFunctionAccess(); - static ::rtl::OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XFunctionAccess virtual ::com::sun::star::uno::Any SAL_CALL callFunction( - const ::rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::container::NoSuchElementException, @@ -89,7 +89,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -97,29 +97,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -127,11 +127,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 3bdb51f18b3d..44bd67a3007c 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -443,8 +443,8 @@ struct ScImportParam SCCOL nCol2; SCROW nRow2; bool bImport; - ::rtl::OUString aDBName; // alias of data base - ::rtl::OUString aStatement; + OUString aDBName; // alias of data base + OUString aStatement; bool bNative; bool bSql; // statement or name? sal_uInt8 nType; // enum DBObject @@ -513,7 +513,7 @@ class ScGlobal static OUString** ppRscString; static String* pStrScDoc; static String* pEmptyString; - static ::rtl::OUString* pEmptyOUString; + static OUString* pEmptyOUString; static String* pStrClipDocName; static SvxBrushItem* pEmptyBrushItem; static SvxBrushItem* pButtonBrushItem; @@ -603,7 +603,7 @@ public: static SvxBrushItem* GetEmbeddedBrushItem() { return pEmbeddedBrushItem; } static SvxBrushItem* GetProtectedBrushItem() { return pProtectedBrushItem; } SC_DLLPUBLIC static const String& GetEmptyString(); - SC_DLLPUBLIC static const ::rtl::OUString& GetEmptyOUString(); + SC_DLLPUBLIC static const OUString& GetEmptyOUString(); static const String& GetScDocString(); /** Returns the specified image list with outline symbols. */ diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index c19ca7354aed..be5095a9a2a5 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -78,7 +78,7 @@ public: class ScInputCfg : public ScInputOptions, public utl::ConfigItem { - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: ScInputCfg(); @@ -86,7 +86,7 @@ public: void SetOptions( const ScInputOptions& rNew ); void OptionsChanged(); // after direct access to SetOptions base class - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); virtual void Commit(); }; diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index 07d3386fc4e2..61c0bc355683 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -80,8 +80,8 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XRefreshable @@ -97,7 +97,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -105,29 +105,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -135,21 +135,21 @@ public: ::com::sun::star::uno::RuntimeException); // aus get/setPropertyValue gerufen: - ::rtl::OUString getFileName(void) const; - void setFileName(const ::rtl::OUString& FileName); - ::rtl::OUString getFilter(void) const; - void setFilter(const ::rtl::OUString& Filter); - ::rtl::OUString getFilterOptions(void) const; - void setFilterOptions(const ::rtl::OUString& FilterOptions); + OUString getFileName(void) const; + void setFileName(const OUString& FileName); + OUString getFilter(void) const; + void setFilter(const OUString& Filter); + OUString getFilterOptions(void) const; + void setFilterOptions(const OUString& FilterOptions); sal_Int32 getRefreshDelay(void) const; void setRefreshDelay(sal_Int32 nRefreshDelay); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -165,7 +165,7 @@ private: ScDocShell* pDocShell; ScSheetLinkObj* GetObjectByIndex_Impl(sal_Int32 nIndex); - ScSheetLinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScSheetLinkObj* GetObjectByName_Impl(const OUString& aName); public: ScSheetLinksObj(ScDocShell* pDocSh); @@ -174,13 +174,13 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -200,11 +200,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -222,8 +222,8 @@ private: sal_uInt16 nPos; XRefreshListenerArr_Impl aRefreshListeners; - void Modify_Impl( const ::rtl::OUString* pNewFile, const ::rtl::OUString* pNewFilter, - const ::rtl::OUString* pNewOptions, const ::rtl::OUString* pNewSource, + void Modify_Impl( const OUString* pNewFile, const OUString* pNewFilter, + const OUString* pNewOptions, const OUString* pNewSource, const com::sun::star::table::CellRangeAddress* pNewDest ); void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); void Refreshed_Impl(); @@ -247,7 +247,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -255,29 +255,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -285,18 +285,18 @@ public: ::com::sun::star::uno::RuntimeException); // called from get/setPropertyValue: - ::rtl::OUString getFileName(void) const; - void setFileName(const ::rtl::OUString& FileName); - ::rtl::OUString getFilter(void) const; - void setFilter(const ::rtl::OUString& Filter); - ::rtl::OUString getFilterOptions(void) const; - void setFilterOptions(const ::rtl::OUString& FilterOptions); + OUString getFileName(void) const; + void setFileName(const OUString& FileName); + OUString getFilter(void) const; + void setFilter(const OUString& Filter); + OUString getFilterOptions(void) const; + void setFilterOptions(const OUString& FilterOptions); sal_Int32 getRefreshDelay(void) const; void setRefreshDelay(sal_Int32 nRefreshDelay); // XAreaLink - virtual ::rtl::OUString SAL_CALL getSourceArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSourceArea( const ::rtl::OUString& aSourceArea ) + virtual OUString SAL_CALL getSourceArea() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSourceArea( const OUString& aSourceArea ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDestArea() throw(::com::sun::star::uno::RuntimeException); @@ -304,11 +304,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -332,10 +332,10 @@ public: // XAreaLinks virtual void SAL_CALL insertAtPosition( const ::com::sun::star::table::CellAddress& aDestPos, - const ::rtl::OUString& aFileName, - const ::rtl::OUString& aSourceArea, - const ::rtl::OUString& aFilter, - const ::rtl::OUString& aFilterOptions ) + const OUString& aFileName, + const OUString& aSourceArea, + const OUString& aFilter, + const OUString& aFilterOptions ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); @@ -357,11 +357,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -393,14 +393,14 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDDELink - virtual ::rtl::OUString SAL_CALL getApplication() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTopic() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getItem() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getApplication() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTopic() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getItem() throw(::com::sun::star::uno::RuntimeException); // XRefreshable virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); @@ -420,11 +420,11 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -440,7 +440,7 @@ private: ScDocShell* pDocShell; ScDDELinkObj* GetObjectByIndex_Impl(sal_Int32 nIndex); - ScDDELinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScDDELinkObj* GetObjectByName_Impl(const OUString& aName); public: ScDDELinksObj(ScDocShell* pDocSh); @@ -449,13 +449,13 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -476,16 +476,16 @@ public: // XDDELinks virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDDELink > SAL_CALL addDDELink( - const ::rtl::OUString& aApplication, const ::rtl::OUString& aTopic, - const ::rtl::OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) + const OUString& aApplication, const OUString& aTopic, + const OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -530,17 +530,17 @@ public: // XExternalDocLink virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache > - SAL_CALL addSheetCache( const ::rtl::OUString& aSheetName, sal_Bool bDynamicCache ) + SAL_CALL addSheetCache( const OUString& aSheetName, sal_Bool bDynamicCache ) throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -577,17 +577,17 @@ public: // XExternalDocLinks virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLink > - SAL_CALL addDocLink( const ::rtl::OUString& aDocName ) + SAL_CALL addDocLink( const OUString& aDocName ) throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess diff --git a/sc/inc/macromgr.hxx b/sc/inc/macromgr.hxx index 57cced3aa708..f2229dd89522 100644 --- a/sc/inc/macromgr.hxx +++ b/sc/inc/macromgr.hxx @@ -30,15 +30,15 @@ public: ~ScMacroManager(); SC_DLLPUBLIC void InitUserFuncData(); - SC_DLLPUBLIC void SetUserFuncVolatile( const rtl::OUString& sName, bool isVolatile ); - SC_DLLPUBLIC bool GetUserFuncVolatile( const rtl::OUString& sName ); + SC_DLLPUBLIC void SetUserFuncVolatile( const OUString& sName, bool isVolatile ); + SC_DLLPUBLIC bool GetUserFuncVolatile( const OUString& sName ); - void AddDependentCell(const ::rtl::OUString& aModuleName, ScFormulaCell* pCell); + void AddDependentCell(const OUString& aModuleName, ScFormulaCell* pCell); void RemoveDependentCell(ScFormulaCell* pCell); - void BroadcastModuleUpdate(const ::rtl::OUString& aModuleName); + void BroadcastModuleUpdate(const OUString& aModuleName); private: - typedef boost::unordered_map< ::rtl::OUString, bool, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameBoolMap; + typedef boost::unordered_map< OUString, bool, OUStringHash, ::std::equal_to< OUString > > NameBoolMap; NameBoolMap mhFuncToVolatile; com::sun::star::uno::Reference< com::sun::star::container::XContainerListener > mxContainerListener; diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index 646d2613d294..0023a9ac2678 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -30,43 +30,43 @@ #include "scdllapi.h" #define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii ) \ -::rtl::OUString SAL_CALL ClassName::getImplementationName() \ +OUString SAL_CALL ClassName::getImplementationName() \ throw(::com::sun::star::uno::RuntimeException) \ { \ - return ::rtl::OUString::createFromAscii(ClassNameAscii); \ + return OUString::createFromAscii(ClassNameAscii); \ } \ -sal_Bool SAL_CALL ClassName::supportsService( const ::rtl::OUString& ServiceName ) \ +sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ throw(::com::sun::star::uno::RuntimeException) \ { \ return !ServiceName.compareToAscii(ServiceAscii); \ } \ -::com::sun::star::uno::Sequence< ::rtl::OUString > \ +::com::sun::star::uno::Sequence< OUString > \ SAL_CALL ClassName::getSupportedServiceNames(void) \ throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); \ - ::rtl::OUString* pArray = aRet.getArray(); \ - pArray[0] = ::rtl::OUString::createFromAscii(ServiceAscii); \ + ::com::sun::star::uno::Sequence< OUString > aRet(1); \ + OUString* pArray = aRet.getArray(); \ + pArray[0] = OUString::createFromAscii(ServiceAscii); \ return aRet; \ } #define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName ) \ - void SAL_CALL ClassName::addPropertyChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::addPropertyChangeListener( const OUString&, \ const uno::Reference&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ { OSL_FAIL("not implemented"); } \ - void SAL_CALL ClassName::removePropertyChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::removePropertyChangeListener( const OUString&, \ const uno::Reference&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ { OSL_FAIL("not implemented"); } \ - void SAL_CALL ClassName::addVetoableChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::addVetoableChangeListener( const OUString&, \ const uno::Reference&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ { OSL_FAIL("not implemented"); } \ - void SAL_CALL ClassName::removeVetoableChangeListener( const rtl::OUString&, \ + void SAL_CALL ClassName::removeVetoableChangeListener( const OUString&, \ const uno::Reference&) \ throw(beans::UnknownPropertyException, \ lang::WrappedTargetException, uno::RuntimeException) \ @@ -91,12 +91,12 @@ class ScIndexEnumeration : public cppu::WeakImplHelper2< { private: com::sun::star::uno::Reference xIndex; - rtl::OUString sServiceName; + OUString sServiceName; sal_Int32 nPos; public: ScIndexEnumeration(const com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess>& rInd, const rtl::OUString& rServiceName); + com::sun::star::container::XIndexAccess>& rInd, const OUString& rServiceName); virtual ~ScIndexEnumeration(); // XEnumeration @@ -107,11 +107,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; @@ -122,7 +122,7 @@ class ScNameToIndexAccess : public cppu::WeakImplHelper2< { private: com::sun::star::uno::Reference xNameAccess; - com::sun::star::uno::Sequence aNames; + com::sun::star::uno::Sequence aNames; public: ScNameToIndexAccess( @@ -143,11 +143,11 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; @@ -158,16 +158,16 @@ public: AnyToInterface( const com::sun::star::uno::Any& rAny ); static sal_Bool GetBoolProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, - const ::rtl::OUString& rName, sal_Bool bDefault = false ); + const OUString& rName, sal_Bool bDefault = false ); static sal_Int32 GetLongProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, - const ::rtl::OUString& rName, long nDefault = 0 ); + const OUString& rName, long nDefault = 0 ); static sal_Int32 GetEnumProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, - const ::rtl::OUString& rName, long nDefault ); - static ::rtl::OUString GetStringProperty( + const OUString& rName, long nDefault ); + static OUString GetStringProperty( const com::sun::star::uno::Reference& xProp, - const ::rtl::OUString& rName, const ::rtl::OUString& rDefault ); + const OUString& rName, const OUString& rDefault ); static sal_Bool GetBoolFromAny( const com::sun::star::uno::Any& aAny ); static sal_Int16 GetInt16FromAny( const com::sun::star::uno::Any& aAny ); diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 02cf724be6e5..61be7bb7b0e9 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -79,8 +79,8 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamedRange - virtual ::rtl::OUString SAL_CALL getContent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setContent( const ::rtl::OUString& aContent ) + virtual OUString SAL_CALL getContent() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setContent( const OUString& aContent ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getReferencePosition() throw(::com::sun::star::uno::RuntimeException); @@ -98,8 +98,8 @@ public: throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XCellRangeReferrer @@ -110,7 +110,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -118,29 +118,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -155,11 +155,11 @@ public: static const com::sun::star::uno::Sequence& getUnoTunnelId(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -181,7 +181,7 @@ private: sal_Bool mbModifyAndBroadcast; virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex) = 0; - virtual ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName) = 0; + virtual ScNamedRangeObj* GetObjectByName_Impl(const OUString& aName) = 0; virtual ScRangeName* GetRangeName_Impl() = 0; virtual SCTAB GetTab_Impl() = 0; @@ -204,25 +204,25 @@ public: bool IsModifyAndBroadcast() const; // XNamedRanges - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::rtl::OUString& aContent, + virtual void SAL_CALL addNewByName( const OUString& aName, const OUString& aContent, const ::com::sun::star::table::CellAddress& aPosition, sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addNewFromTitles( const ::com::sun::star::table::CellRangeAddress& aSource, ::com::sun::star::sheet::Border aBorder ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL outputList( const ::com::sun::star::table::CellAddress& aOutputPosition ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -245,7 +245,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -253,29 +253,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -290,11 +290,11 @@ public: virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -303,7 +303,7 @@ class ScGlobalNamedRangesObj: public ScNamedRangesObj private: virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); - virtual ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + virtual ScNamedRangeObj* GetObjectByName_Impl(const OUString& aName); virtual ScRangeName* GetRangeName_Impl(); virtual SCTAB GetTab_Impl(); @@ -318,7 +318,7 @@ class ScLocalNamedRangesObj: public ScNamedRangesObj private: virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); - virtual ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + virtual ScNamedRangeObj* GetObjectByName_Impl(const OUString& aName); virtual ScRangeName* GetRangeName_Impl(); virtual SCTAB GetTab_Impl(); @@ -361,11 +361,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -412,11 +412,11 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx index 1143ccfe89d5..68d3afcfb7fc 100644 --- a/sc/inc/notesuno.hxx +++ b/sc/inc/notesuno.hxx @@ -65,7 +65,7 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, - const ::rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, @@ -80,15 +80,15 @@ public: getStart() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XSheetAnnotation virtual ::com::sun::star::table::CellAddress SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAuthor() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDate() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAuthor() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDate() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getIsVisible() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setIsVisible( sal_Bool bIsVisible ) throw(::com::sun::star::uno::RuntimeException); @@ -99,11 +99,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); private: diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index ea60c77d1ef0..6da94a1df2f0 100644 --- a/sc/inc/optuno.hxx +++ b/sc/inc/optuno.hxx @@ -44,12 +44,12 @@ public: static sal_Bool setPropertyValue( ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ); static ::com::sun::star::uno::Any getPropertyValue( const ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, - const ::rtl::OUString& PropertyName ); + const OUString& PropertyName ); }; @@ -66,7 +66,7 @@ public: // get/setPropertyValue overloaded to used stored options instead of document - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -74,7 +74,7 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index d38995589b9c..151c0c06b2ae 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -42,18 +42,18 @@ class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem Link aCommitLink; public: - ScLinkConfigItem( const rtl::OUString& rSubTree ); - ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode ); + ScLinkConfigItem( const OUString& rSubTree ); + ScLinkConfigItem( const OUString& rSubTree, sal_Int16 nMode ); void SetCommitLink( const Link& rLink ); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames ); virtual void Commit(); void SetModified() { ConfigItem::SetModified(); } com::sun::star::uno::Sequence< com::sun::star::uno::Any> - GetProperties(const com::sun::star::uno::Sequence< rtl::OUString >& rNames) + GetProperties(const com::sun::star::uno::Sequence< OUString >& rNames) { return ConfigItem::GetProperties( rNames ); } - sal_Bool PutProperties( const com::sun::star::uno::Sequence< rtl::OUString >& rNames, + sal_Bool PutProperties( const com::sun::star::uno::Sequence< OUString >& rNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues) { return ConfigItem::PutProperties( rNames, rValues ); } diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx index 22e9cc914ce6..ef88795432f3 100644 --- a/sc/inc/orcusfilters.hxx +++ b/sc/inc/orcusfilters.hxx @@ -26,9 +26,9 @@ class ScOrcusFilters public: virtual ~ScOrcusFilters() {} - virtual bool importCSV(ScDocument& rDoc, const rtl::OUString& rPath) const = 0; + virtual bool importCSV(ScDocument& rDoc, const OUString& rPath) const = 0; - virtual bool importGnumeric(ScDocument& rDoc, const rtl::OUString& rPath) const = 0; + virtual bool importGnumeric(ScDocument& rDoc, const OUString& rPath) const = 0; /** * Create a context for XML file. The context object stores session @@ -39,7 +39,7 @@ public: * The caller is responsible for deleting the instance returned from this * method when it's done. */ - virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const rtl::OUString& rPath) const = 0; + virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const = 0; }; class ScOrcusXMLContext diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx index 36c41dd9eb9f..c8d7fdf2f0b1 100644 --- a/sc/inc/orcusxml.hxx +++ b/sc/inc/orcusxml.hxx @@ -59,15 +59,15 @@ struct ScOrcusImportXMLParam struct CellLink { ScAddress maPos; - rtl::OString maPath; + OString maPath; - CellLink(const ScAddress& rPos, const rtl::OString& rPath); + CellLink(const ScAddress& rPos, const OString& rPath); }; struct RangeLink { ScAddress maPos; - std::vector maFieldPaths; + std::vector maFieldPaths; }; typedef std::vector CellLinksType; diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx index 4a77b7e3e2ce..a0540d37a675 100644 --- a/sc/inc/pageuno.hxx +++ b/sc/inc/pageuno.hxx @@ -36,11 +36,11 @@ public: _CreateShape( SdrObject *pObj ) const throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& rServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index ba877412cdbb..85e19e0fdf18 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -55,19 +55,19 @@ struct ScDPName { - ::rtl::OUString maName; /// Original name of the dimension. - ::rtl::OUString maLayoutName; /// Layout name (display name) + OUString maName; /// Original name of the dimension. + OUString maLayoutName; /// Layout name (display name) - explicit ScDPName(const ::rtl::OUString& rName, const ::rtl::OUString& rLayoutName); + explicit ScDPName(const OUString& rName, const OUString& rLayoutName); }; // ============================================================================ struct ScDPLabelData { - rtl::OUString maName; /// Original name of the dimension. - rtl::OUString maLayoutName; /// Layout name (display name) - rtl::OUString maSubtotalName; + OUString maName; /// Original name of the dimension. + OUString maLayoutName; /// Layout name (display name) + OUString maSubtotalName; SCCOL mnCol; /// 0-based field index (not the source column index) long mnOriginalDim; /// original dimension index (>= 0 for duplicated dimension) sal_uInt16 mnFuncMask; /// Page/Column/Row subtotal function. @@ -79,8 +79,8 @@ struct ScDPLabelData struct Member { - ::rtl::OUString maName; - ::rtl::OUString maLayoutName; + OUString maName; + OUString maLayoutName; bool mbVisible; bool mbShowDetails; @@ -91,10 +91,10 @@ struct ScDPLabelData * when the layout name is present, use it, or else use the original * name. */ - ::rtl::OUString SC_DLLPUBLIC getDisplayName() const; + OUString SC_DLLPUBLIC getDisplayName() const; }; ::std::vector maMembers; - ::com::sun::star::uno::Sequence< ::rtl::OUString > maHiers; /// Hierarchies. + ::com::sun::star::uno::Sequence< OUString > maHiers; /// Hierarchies. ::com::sun::star::sheet::DataPilotFieldSortInfo maSortInfo; /// Sorting info. ::com::sun::star::sheet::DataPilotFieldLayoutInfo maLayoutInfo; /// Layout info. ::com::sun::star::sheet::DataPilotFieldAutoShowInfo maShowInfo; /// AutoShow info. @@ -105,7 +105,7 @@ struct ScDPLabelData * return the name that should be displayed in the dp dialogs i.e. when * the layout name is present, use it, or else use the original name. */ - ::rtl::OUString SC_DLLPUBLIC getDisplayName() const; + OUString SC_DLLPUBLIC getDisplayName() const; }; typedef boost::ptr_vector ScDPLabelDataVector; diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 88ae564d5b20..c6907dca39c4 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -43,8 +43,8 @@ struct SC_DLLPUBLIC ScNoteData { typedef ::boost::shared_ptr< ScCaptionInitData > ScCaptionInitDataRef; - ::rtl::OUString maDate; /// Creation date of the note. - ::rtl::OUString maAuthor; /// Author of the note. + OUString maDate; /// Creation date of the note. + OUString maAuthor; /// Author of the note. ScCaptionInitDataRef mxInitData; /// Initial data for invisible notes without SdrObject. SdrCaptionObj* mpCaption; /// Drawing object representing the cell note. bool mbShown; /// True = note is visible. @@ -102,14 +102,14 @@ public: inline const ScNoteData& GetNoteData() const { return maNoteData; } /** Returns the creation date of this note. */ - inline const ::rtl::OUString& GetDate() const { return maNoteData.maDate; } + inline const OUString& GetDate() const { return maNoteData.maDate; } /** Sets a new creation date for this note. */ - inline void SetDate( const ::rtl::OUString& rDate ) { maNoteData.maDate = rDate; } + inline void SetDate( const OUString& rDate ) { maNoteData.maDate = rDate; } /** Returns the author date of this note. */ - inline const ::rtl::OUString& GetAuthor() const { return maNoteData.maAuthor; } + inline const OUString& GetAuthor() const { return maNoteData.maAuthor; } /** Sets a new author date for this note. */ - inline void SetAuthor( const ::rtl::OUString& rAuthor ) { maNoteData.maAuthor = rAuthor; } + inline void SetAuthor( const OUString& rAuthor ) { maNoteData.maAuthor = rAuthor; } /** Sets date and author from system settings. */ void AutoStamp(); @@ -120,9 +120,9 @@ public: const EditTextObject* GetEditTextObject() const; /** Returns the caption text of this note. */ - ::rtl::OUString GetText() const; + OUString GetText() const; /** Changes the caption text of this note. All text formatting will be lost. */ - void SetText( const ScAddress& rPos, const ::rtl::OUString& rText ); + void SetText( const ScAddress& rPos, const OUString& rText ); /** Returns an existing note caption object. returns null, if the note contains initial caption data needed to construct a caption object. */ @@ -170,7 +170,7 @@ public: /** Creates and returns a caption object for a temporary caption. */ static SdrCaptionObj* CreateTempCaption( ScDocument& rDoc, const ScAddress& rPos, - SdrPage& rDrawPage, const ::rtl::OUString& rUserText, + SdrPage& rDrawPage, const OUString& rUserText, const Rectangle& rVisRect, bool bTailFront ); /** Creates a cell note using the passed caption drawing object. @@ -246,7 +246,7 @@ public: */ static ScPostIt* CreateNoteFromString( ScDocument& rDoc, const ScAddress& rPos, - const ::rtl::OUString& rNoteText, bool bShown, + const OUString& rNoteText, bool bShown, bool bAlwaysCreateCaption ); }; diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index c2e7b4d58320..d84539d4649e 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -76,7 +76,7 @@ private: class ScPrintCfg : public ScPrintOptions, public utl::ConfigItem { - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: ScPrintCfg(); @@ -84,7 +84,7 @@ public: void SetOptions( const ScPrintOptions& rNew ); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); }; #endif diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx index b3c7c3c415f7..08a2f811fd77 100644 --- a/sc/inc/queryentry.hxx +++ b/sc/inc/queryentry.hxx @@ -41,7 +41,7 @@ struct SC_DLLPUBLIC ScQueryEntry { QueryType meType; double mfVal; - rtl::OUString maString; + OUString maString; Item() : meType(ByValue), mfVal(0.0) {} diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index 4bfe5a860590..26d2d1b2a087 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -48,7 +48,7 @@ struct ScQueryParamBase ScQueryEntry* FindEntryByField(SCCOLROW nField, bool bNew); SC_DLLPUBLIC void RemoveEntryByField(SCCOLROW nField); void Resize(size_t nNew); - void FillInExcelSyntax(const rtl::OUString& aCellStr, SCSIZE nIndex); + void FillInExcelSyntax(const OUString& aCellStr, SCSIZE nIndex); protected: typedef boost::ptr_vector EntriesType; diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index b67445be5fa2..2a20f45108e9 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -46,7 +46,7 @@ public: void Format( String&, sal_uInt16 nFlags = 0, ScDocument* = NULL, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ) const; - void Format( rtl::OUString&, sal_uInt16 nFlags = 0, ScDocument* = NULL, + void Format( OUString&, sal_uInt16 nFlags = 0, ScDocument* = NULL, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ) const; diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 27b9262194b7..8d2e6acc5f37 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -62,8 +62,8 @@ class ScTokenArray; class ScRangeData { private: - rtl::OUString aName; - rtl::OUString aUpperName; // #i62977# for faster searching (aName is never modified after ctor) + OUString aName; + OUString aUpperName; // #i62977# for faster searching (aName is never modified after ctor) ScTokenArray* pCode; ScAddress aPos; RangeType eType; @@ -83,18 +83,18 @@ public: typedef ::std::map IndexMap; SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, - const rtl::OUString& rName, + const OUString& rName, const String& rSymbol, const ScAddress& rAdr = ScAddress(), RangeType nType = RT_NAME, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ); SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, - const rtl::OUString& rName, + const OUString& rName, const ScTokenArray& rArr, const ScAddress& rAdr = ScAddress(), RangeType nType = RT_NAME ); SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, - const rtl::OUString& rName, + const OUString& rName, const ScAddress& rTarget ); // rTarget is ABSPOS jump label ScRangeData(const ScRangeData& rScRangeData, ScDocument* pDocument = NULL); @@ -103,9 +103,9 @@ public: bool operator== (const ScRangeData& rData) const; - void GetName( rtl::OUString& rName ) const { rName = aName; } - const rtl::OUString& GetName( void ) const { return aName; } - const rtl::OUString& GetUpperName( void ) const { return aUpperName; } + void GetName( OUString& rName ) const { rName = aName; } + const OUString& GetName( void ) const { return aName; } + const OUString& GetUpperName( void ) const { return aUpperName; } ScAddress GetPos() const { return aPos; } // The index has to be unique. If index=0 a new index value is assigned. void SetIndex( sal_uInt16 nInd ) { nIndex = nInd; } @@ -123,9 +123,9 @@ public: bool HasType( RangeType nType ) const; sal_uInt32 GetUnoType() const; SC_DLLPUBLIC void GetSymbol( String& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - SC_DLLPUBLIC void GetSymbol( rtl::OUString& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - SC_DLLPUBLIC void GetSymbol( rtl::OUString& rSymbol, const ScAddress& rPos, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress&, + SC_DLLPUBLIC void GetSymbol( OUString& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; + SC_DLLPUBLIC void GetSymbol( OUString& rSymbol, const ScAddress& rPos, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; + void UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress&, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, @@ -170,7 +170,7 @@ class ScRangeName { private: typedef std::vector IndexDataType; - typedef ::boost::ptr_map DataType; + typedef ::boost::ptr_map DataType; DataType maData; IndexDataType maIndexToData; @@ -187,8 +187,8 @@ public: SC_DLLPUBLIC ScRangeName(const ScRangeName& r); SC_DLLPUBLIC const ScRangeData* findByRange(const ScRange& rRange) const; - SC_DLLPUBLIC ScRangeData* findByUpperName(const rtl::OUString& rName); - SC_DLLPUBLIC const ScRangeData* findByUpperName(const rtl::OUString& rName) const; + SC_DLLPUBLIC ScRangeData* findByUpperName(const OUString& rName); + SC_DLLPUBLIC const ScRangeData* findByUpperName(const OUString& rName) const; SC_DLLPUBLIC ScRangeData* findByIndex(sal_uInt16 i) const; void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bLocal = false); @@ -216,7 +216,7 @@ public: SC_DLLPUBLIC bool insert(ScRangeData* p); void erase(const ScRangeData& r); - void erase(const rtl::OUString& rName); + void erase(const OUString& rName); /** * Erase by iterator position. Note that this method doesn't check for diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index deaf34cec858..678bdb41c521 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -104,43 +104,43 @@ public: // helper methods static void AssignString( - ::rtl::OUString& rString, - const ::rtl::OUString& rNewStr, + OUString& rString, + const OUString& rNewStr, sal_Bool bAppendStr, sal_Unicode cSeperator = ' '); static sal_Int32 IndexOf( - const ::rtl::OUString& rString, + const OUString& rString, sal_Unicode cSearchChar, sal_Int32 nOffset, sal_Unicode cQuote = '\''); static sal_Int32 IndexOfDifferent( - const ::rtl::OUString& rString, + const OUString& rString, sal_Unicode cSearchChar, sal_Int32 nOffset ); static sal_Int32 GetTokenCount( - const ::rtl::OUString& rString, + const OUString& rString, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); static void GetTokenByOffset( - ::rtl::OUString& rToken, - const ::rtl::OUString& rString, + OUString& rToken, + const OUString& rString, sal_Int32& nOffset, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); static void AppendTableName( - ::rtl::OUStringBuffer& rBuf, - const ::rtl::OUString& rTabName, + OUStringBuffer& rBuf, + const OUString& rTabName, sal_Unicode cQuote = '\''); // String to Range core static sal_Bool GetAddressFromString( ScAddress& rAddress, - const ::rtl::OUString& rAddressStr, + const OUString& rAddressStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, @@ -148,7 +148,7 @@ public: sal_Unicode cQuote = '\''); static sal_Bool GetRangeFromString( ScRange& rRange, - const ::rtl::OUString& rRangeStr, + const OUString& rRangeStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, @@ -156,7 +156,7 @@ public: sal_Unicode cQuote = '\''); static sal_Bool GetRangeListFromString( ScRangeList& rRangeList, - const ::rtl::OUString& rRangeListStr, + const OUString& rRangeListStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeperator = ' ', @@ -164,7 +164,7 @@ public: static sal_Bool GetAreaFromString( ScArea& rArea, - const ::rtl::OUString& rRangeStr, + const OUString& rRangeStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, @@ -174,7 +174,7 @@ public: // String to Range API static sal_Bool GetAddressFromString( ::com::sun::star::table::CellAddress& rAddress, - const ::rtl::OUString& rAddressStr, + const OUString& rAddressStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, @@ -182,7 +182,7 @@ public: sal_Unicode cQuote = '\''); static sal_Bool GetRangeFromString( ::com::sun::star::table::CellRangeAddress& rRange, - const ::rtl::OUString& rRangeStr, + const OUString& rRangeStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Int32& nOffset, @@ -190,7 +190,7 @@ public: sal_Unicode cQuote = '\''); static sal_Bool GetRangeListFromString( ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, - const ::rtl::OUString& rRangeListStr, + const OUString& rRangeListStr, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cSeperator = ' ', @@ -198,7 +198,7 @@ public: // Range to String core static void GetStringFromAddress( - ::rtl::OUString& rString, + OUString& rString, const ScAddress& rAddress, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -206,7 +206,7 @@ public: sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRange( - ::rtl::OUString& rString, + OUString& rString, const ScRange& rRange, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -214,7 +214,7 @@ public: sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRangeList( - ::rtl::OUString& rString, + OUString& rString, const ScRangeList* pRangeList, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -222,7 +222,7 @@ public: sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D)); static void GetStringFromArea( - ::rtl::OUString& rString, + OUString& rString, const ScArea& rArea, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -232,7 +232,7 @@ public: // Range to String API static void GetStringFromAddress( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::table::CellAddress& rAddress, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -240,7 +240,7 @@ public: sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRange( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::table::CellRangeAddress& rRange, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -248,7 +248,7 @@ public: sal_Bool bAppendStr = false, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); static void GetStringFromRangeList( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, const ScDocument* pDocument, formula::FormulaGrammar::AddressConvention eConv, @@ -257,12 +257,12 @@ public: // XML Range to Calc Range static void GetStringFromXMLRangeString( - ::rtl::OUString& rString, - const ::rtl::OUString& rXMLRange, + OUString& rString, + const OUString& rXMLRange, ScDocument* pDoc ); // String to RangeData core - static ScRangeData* GetRangeDataFromString(const rtl::OUString& rString, const SCTAB nTab, const ScDocument* pDoc); + static ScRangeData* GetRangeDataFromString(const OUString& rString, const SCTAB nTab, const ScDocument* pDoc); }; //------------------------------------------------------------------------ @@ -309,7 +309,7 @@ public: ScAreaNameIterator( ScDocument* pDoc ); ~ScAreaNameIterator() {} - bool Next( rtl::OUString& rName, ScRange& rRange ); + bool Next( OUString& rName, ScRange& rRange ); bool Next( String& rName, ScRange& rRange ); bool WasDBName() const { return !bFirstPass; } }; diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx index d4fc698eeb38..6cc24aafbe62 100644 --- a/sc/inc/reftokenhelper.hxx +++ b/sc/inc/reftokenhelper.hxx @@ -45,7 +45,7 @@ public: * The source range may consist of multiple ranges separated by ';'s. */ static void compileRangeRepresentation( - ::std::vector& rRefTokens, const ::rtl::OUString& rRangeStr, ScDocument* pDoc, + ::std::vector& rRefTokens, const OUString& rRangeStr, ScDocument* pDoc, const sal_Unicode cSep, ::formula::FormulaGrammar::Grammar eGrammar, bool bOnly3DRef = false); static bool getRangeFromToken(ScRange& rRange, const ScTokenRef& pToken, bool bExternal = false); diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index b5cf97e53097..50f3aa08f344 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -96,8 +96,8 @@ public: virtual bool IsDatabase() const = 0; virtual bool IsExternal() const = 0; virtual bool IsNamedRange() const = 0; - virtual rtl::OUString GetSelectedNamedRange() const = 0; - virtual void AppendNamedRange(const ::rtl::OUString& rName) = 0; + virtual OUString GetSelectedNamedRange() const = 0; + virtual void AppendNamedRange(const OUString& rName) = 0; }; class AbstractScDataPilotServiceDlg : public VclAbstractDialog //add for ScDataPilotServiceDlg @@ -214,7 +214,7 @@ public: virtual sal_uInt16 GetSelectedTable () const = 0; virtual bool GetCopyTable () const = 0; virtual bool GetRenameTable () const = 0; - virtual void GetTabNameString( rtl::OUString& rString ) const = 0; + virtual void GetTabNameString( OUString& rString ) const = 0; virtual void SetForceCopyTable () = 0; virtual void EnableCopyTable (sal_Bool bFlag=true) = 0; virtual void EnableRenameTable (sal_Bool bFlag=true) = 0; @@ -229,7 +229,7 @@ public: class AbstractScNamePasteDlg : public VclAbstractDialog //add for ScNamePasteDlg { public: - virtual std::vector GetSelectedNames() const = 0; + virtual std::vector GetSelectedNames() const = 0; virtual bool IsAllSelected() const = 0; }; @@ -276,10 +276,10 @@ class AbstractScNewScenarioDlg : public VclAbstractDialog //add for ScNewScenar { public: - virtual void SetScenarioData( const rtl::OUString& rName, const rtl::OUString& rComment, + virtual void SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) = 0; - virtual void GetScenarioData( rtl::OUString& rName, rtl::OUString& rComment, + virtual void GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const = 0; }; @@ -288,7 +288,7 @@ class AbstractScShowTabDlg : public VclAbstractDialog //add for ScShowTabDlg public: virtual void Insert( const String& rString, sal_Bool bSelected ) = 0; virtual sal_uInt16 GetSelectEntryCount() const = 0; - virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ) = 0; + virtual void SetDescription(const String& rTitle, const String& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0; virtual String GetSelectEntry(sal_uInt16 nPos) const = 0; virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const = 0; }; @@ -296,7 +296,7 @@ public: class AbstractScStringInputDlg : public VclAbstractDialog //add for ScStringInputDlg { public: - virtual void GetInputString( rtl::OUString& rString ) const = 0; + virtual void GetInputString( OUString& rString ) const = 0; }; class AbstractScTabBgColorDlg : public VclAbstractDialog //add for ScTabBgColorDlg @@ -355,7 +355,7 @@ public: virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) = 0; //add for ScDataPilotSourceTypeDlg virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg - const com::sun::star::uno::Sequence& rServices, + const com::sun::star::uno::Sequence& rServices, int nId ) = 0; virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, sal_Bool bDisallowCellMove = false ) = 0 ; //add for ScDeleteCellDlg @@ -460,14 +460,14 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, + const OString& sHelpId, const OString& sEditHelpId, int nId ) = 0; virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, //add for ScTabBgColorDlg const String& rTitle, //Dialog Title const String& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color - const rtl::OString& , + const OString& , int nId ) = 0; virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index bf1f15f18b45..c91b0ca8bdb9 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -47,11 +47,11 @@ const ScMatValType SC_MATVAL_NONVALUE = SC_MATVAL_EMPTYPATH; // mask of all struct ScMatrixValue { double fVal; - rtl::OUString aStr; + OUString aStr; ScMatValType nType; /// Only valid if ScMatrix methods indicate so! - const ::rtl::OUString& GetString() const { return aStr; } + const OUString& GetString() const { return aStr; } /// Only valid if ScMatrix methods indicate that this is no string! sal_uInt16 GetError() const { return GetDoubleErrorValue( fVal); } @@ -254,9 +254,9 @@ public: void PutDouble( double fVal, SCSIZE nIndex); void PutDouble(const double* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); - void PutString( const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR); - void PutString( const ::rtl::OUString& rStr, SCSIZE nIndex); - void PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); + void PutString( const OUString& rStr, SCSIZE nC, SCSIZE nR); + void PutString( const OUString& rStr, SCSIZE nIndex); + void PutString(const OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); void PutEmpty( SCSIZE nC, SCSIZE nR); @@ -286,15 +286,15 @@ public: double GetDouble( SCSIZE nIndex) const; /// @return empty string if empty or empty path, else string content. - rtl::OUString GetString( SCSIZE nC, SCSIZE nR) const; + OUString GetString( SCSIZE nC, SCSIZE nR) const; /// @return empty string if empty or empty path, else string content. - rtl::OUString GetString( SCSIZE nIndex) const; + OUString GetString( SCSIZE nIndex) const; /** @returns the matrix element's string if one is present, otherwise the numerical value formatted as string, or in case of an error the error string is returned; an empty string for empty, a "FALSE" string for empty path. */ - ::rtl::OUString GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const; + OUString GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const; /// @ATTENTION: If bString the ScMatrixValue->pS may still be NULL to indicate /// an empty string! diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index acc0e17f0aaf..bb2462fc733a 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -145,9 +145,9 @@ public: void SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); void ResetDragObject(); void SetDragLink( - const rtl::OUString& rDoc, const rtl::OUString& rTab, const rtl::OUString& rArea ); + const OUString& rDoc, const OUString& rTab, const OUString& rArea ); void SetDragJump( - ScDocument* pLocalDoc, const rtl::OUString& rTarget, const rtl::OUString& rText ); + ScDocument* pLocalDoc, const OUString& rTarget, const OUString& rText ); // clipboard: const ScClipData& GetClipData() const; diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx index a95b6abce5c7..f17e50134991 100644 --- a/sc/inc/servuno.hxx +++ b/sc/inc/servuno.hxx @@ -101,7 +101,7 @@ public: // pDocShell is not needed for all Services static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance( sal_uInt16 nType, ScDocShell* pDocShell ); - static ::com::sun::star::uno::Sequence GetAllServiceNames(); + static ::com::sun::star::uno::Sequence GetAllServiceNames(); static sal_uInt16 GetProviderType(const String& rServiceName); }; diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index 5ddae06dd33a..5173c3523144 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -104,7 +104,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -112,29 +112,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -143,19 +143,19 @@ public: // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aPropertyName ) + OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const ::rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -199,7 +199,7 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, - const ::rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, @@ -214,8 +214,8 @@ public: getStart() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XChild @@ -235,11 +235,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx index 07ba888dd0c6..2f5c8cf89ccc 100644 --- a/sc/inc/sheetdata.hxx +++ b/sc/inc/sheetdata.hxx @@ -51,10 +51,10 @@ struct ScStreamEntry struct ScCellStyleEntry { - rtl::OUString maName; + OUString maName; ScAddress maCellPos; - ScCellStyleEntry( const rtl::OUString& rName, const ScAddress& rPos ) : + ScCellStyleEntry( const OUString& rName, const ScAddress& rPos ) : maName(rName), maCellPos(rPos) { @@ -63,11 +63,11 @@ struct ScCellStyleEntry struct ScNoteStyleEntry { - rtl::OUString maStyleName; - rtl::OUString maTextStyle; + OUString maStyleName; + OUString maTextStyle; ScAddress maCellPos; - ScNoteStyleEntry( const rtl::OUString& rStyle, const rtl::OUString& rText, const ScAddress& rPos ) : + ScNoteStyleEntry( const OUString& rStyle, const OUString& rText, const ScAddress& rPos ) : maStyleName(rStyle), maTextStyle(rText), maCellPos(rPos) @@ -77,11 +77,11 @@ struct ScNoteStyleEntry struct ScTextStyleEntry { - rtl::OUString maName; + OUString maName; ScAddress maCellPos; ESelection maSelection; - ScTextStyleEntry( const rtl::OUString& rName, const ScAddress& rPos, const ESelection& rSel ) : + ScTextStyleEntry( const OUString& rName, const ScAddress& rPos, const ESelection& rSel ) : maName(rName), maCellPos(rPos), maSelection(rSel) @@ -91,11 +91,11 @@ struct ScTextStyleEntry struct ScLoadedNamespaceEntry { - rtl::OUString maPrefix; - rtl::OUString maName; + OUString maPrefix; + OUString maName; sal_uInt16 mnKey; - ScLoadedNamespaceEntry( const rtl::OUString& rPrefix, const rtl::OUString& rName, sal_uInt16 nKey ) : + ScLoadedNamespaceEntry( const OUString& rPrefix, const OUString& rName, sal_uInt16 nKey ) : maPrefix(rPrefix), maName(rName), mnKey(nKey) @@ -105,7 +105,7 @@ struct ScLoadedNamespaceEntry class ScSheetSaveData { - boost::unordered_set maInitialPrefixes; + boost::unordered_set maInitialPrefixes; std::vector maLoadedNamespaces; std::vector maCellStyles; @@ -130,15 +130,15 @@ public: ScSheetSaveData(); ~ScSheetSaveData(); - void AddCellStyle( const rtl::OUString& rName, const ScAddress& rCellPos ); - void AddColumnStyle( const rtl::OUString& rName, const ScAddress& rCellPos ); - void AddRowStyle( const rtl::OUString& rName, const ScAddress& rCellPos ); - void AddTableStyle( const rtl::OUString& rName, const ScAddress& rCellPos ); + void AddCellStyle( const OUString& rName, const ScAddress& rCellPos ); + void AddColumnStyle( const OUString& rName, const ScAddress& rCellPos ); + void AddRowStyle( const OUString& rName, const ScAddress& rCellPos ); + void AddTableStyle( const OUString& rName, const ScAddress& rCellPos ); - void HandleNoteStyles( const rtl::OUString& rStyleName, const rtl::OUString& rTextName, const ScAddress& rCellPos ); - void AddNoteContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ); + void HandleNoteStyles( const OUString& rStyleName, const OUString& rTextName, const ScAddress& rCellPos ); + void AddNoteContentStyle( sal_uInt16 nFamily, const OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ); - void AddTextStyle( const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ); + void AddTextStyle( const OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ); void BlockSheet( SCTAB nTab ); bool IsSheetBlocked( SCTAB nTab ) const; diff --git a/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx index 55073fb87fa8..e10fda07a90a 100644 --- a/sc/inc/sheetevents.hxx +++ b/sc/inc/sheetevents.hxx @@ -33,7 +33,7 @@ class ScSheetEvents { - rtl::OUString** mpScriptNames; + OUString** mpScriptNames; void Clear(); @@ -44,10 +44,10 @@ public: const ScSheetEvents& operator= (const ScSheetEvents& rOther); - const rtl::OUString* GetScript(sal_Int32 nEvent) const; - void SetScript(sal_Int32 nEvent, const rtl::OUString* pNew); + const OUString* GetScript(sal_Int32 nEvent) const; + void SetScript(sal_Int32 nEvent, const OUString* pNew); - static rtl::OUString GetEventName(sal_Int32 nEvent); + static OUString GetEventName(sal_Int32 nEvent); static sal_Int32 GetVbaSheetEventId(sal_Int32 nEvent); static sal_Int32 GetVbaDocumentEventId(sal_Int32 nEvent); }; diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx index 8d40f3b206c2..a4c6f65e2493 100644 --- a/sc/inc/sortparam.hxx +++ b/sc/inc/sortparam.hxx @@ -60,7 +60,7 @@ struct SC_DLLPUBLIC ScSortParam SCROW nDestRow; ScSortKeyStateVec maKeyState; ::com::sun::star::lang::Locale aCollatorLocale; - ::rtl::OUString aCollatorAlgorithm; + OUString aCollatorAlgorithm; sal_uInt16 nCompatHeader; diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index f2889ccabce2..e30a893f6c05 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -46,13 +46,13 @@ public: SvxSearchItem* GetSearchItem() const { return pSearchItem; } // XReplaceDescriptor - virtual ::rtl::OUString SAL_CALL getReplaceString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReplaceString( const ::rtl::OUString& aReplaceString ) + virtual OUString SAL_CALL getReplaceString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException); // XSearchDescriptor - virtual ::rtl::OUString SAL_CALL getSearchString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) + virtual OUString SAL_CALL getSearchString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // search/replace should be called from outside (from XSearchable)... @@ -61,7 +61,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -69,29 +69,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -108,11 +108,11 @@ public: com::sun::star::util::XSearchDescriptor> xObj ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx index 58eda3a63f43..68670b9e6867 100644 --- a/sc/inc/stringutil.hxx +++ b/sc/inc/stringutil.hxx @@ -127,7 +127,7 @@ public: * @return true if the string is a valid number, false otherwise. */ static bool parseSimpleNumber( - const ::rtl::OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal); + const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal); static sal_Int32 SC_DLLPUBLIC GetQuotedTokenCount(const OUString &rIn, const OUString& rQuotedPairs, sal_Unicode cTok = ';' ); static OUString SC_DLLPUBLIC GetQuotedToken(const OUString &rIn, sal_Int32 nToken, const OUString& rQuotedPairs, diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index 21f3d380bdc4..bd7d8a42d1e6 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -64,7 +64,7 @@ private: ScStyleFamilyObj* GetObjectByType_Impl(sal_uInt16 Type) const; ScStyleFamilyObj* GetObjectByIndex_Impl(sal_uInt32 nIndex) const; - ScStyleFamilyObj* GetObjectByName_Impl(const rtl::OUString& aName) const; + ScStyleFamilyObj* GetObjectByName_Impl(const OUString& aName) const; public: ScStyleFamiliesObj(ScDocShell* pDocSh); @@ -80,13 +80,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -95,7 +95,7 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XStyleLoader - virtual void SAL_CALL loadStylesFromURL( const ::rtl::OUString& URL, + virtual void SAL_CALL loadStylesFromURL( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions ) throw(::com::sun::star::io::IOException, @@ -104,11 +104,11 @@ public: getStyleLoaderOptions() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -125,7 +125,7 @@ private: SfxStyleFamily eFamily; // Family ScStyleObj* GetObjectByIndex_Impl(sal_uInt32 nIndex); - ScStyleObj* GetObjectByName_Impl(const rtl::OUString& Name); + ScStyleObj* GetObjectByName_Impl(const OUString& Name); public: ScStyleFamilyObj(ScDocShell* pDocSh, SfxStyleFamily eFam); @@ -134,19 +134,19 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -154,13 +154,13 @@ public: ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -178,25 +178,25 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -218,8 +218,8 @@ private: OUString aStyleName; SfxStyleSheetBase* GetStyle_Impl(); - const SfxItemSet* GetStyleItemSet_Impl( const ::rtl::OUString& rPropName, const SfxItemPropertySimpleEntry*& rpEntry ); - void SetOnePropertyValue( const ::rtl::OUString& rPropertyName, + const SfxItemSet* GetStyleItemSet_Impl( const OUString& rPropName, const SfxItemPropertySimpleEntry*& rpEntry ); + void SetOnePropertyValue( const OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -243,21 +243,21 @@ public: // XStyle virtual sal_Bool SAL_CALL isUserDefined() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isInUse() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) + virtual OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -265,29 +265,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -295,39 +295,39 @@ public: ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL - getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aPropertyName ) + OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const ::rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -336,22 +336,22 @@ public: // getPropertyStates already defined for XPropertyState virtual void SAL_CALL setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aPropertyNames ) + OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aPropertyNames ) + OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 316c7f24084d..10785cf7bfdd 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -90,19 +90,19 @@ private: ScColumn aCol[MAXCOLCOUNT]; - rtl::OUString aName; - rtl::OUString aCodeName; - rtl::OUString aComment; + OUString aName; + OUString aCodeName; + OUString aComment; - rtl::OUString aLinkDoc; - rtl::OUString aLinkFlt; - rtl::OUString aLinkOpt; - rtl::OUString aLinkTab; + OUString aLinkDoc; + OUString aLinkFlt; + OUString aLinkOpt; + OUString aLinkTab; sal_uLong nLinkRefreshDelay; sal_uInt8 nLinkMode; // page style template - rtl::OUString aPageStyle; + OUString aPageStyle; Size aPageSizeTwips; // size of the print-page SCCOL nRepeatStartX; // repeating rows/columns SCCOL nRepeatEndX; // REPEAT_NONE, if not used @@ -137,7 +137,7 @@ private: ScDocument* pDocument; utl::TextSearch* pSearchText; - mutable rtl::OUString aUpperName; // #i62977# filled only on demand, reset in SetName + mutable OUString aUpperName; // #i62977# filled only on demand, reset in SetName boost::scoped_ptr mxUninitNotes; @@ -191,7 +191,7 @@ friend class ScAttrRectIterator; friend class ScColumnTextWidthIterator; public: - ScTable( ScDocument* pDoc, SCTAB nNewTab, const rtl::OUString& rNewName, + ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName, bool bColInfo = true, bool bRowInfo = true ); ~ScTable(); @@ -236,8 +236,8 @@ public: bool IsScenario() const { return bScenario; } void SetScenario( bool bFlag ); - void GetScenarioComment( rtl::OUString& rComment) const { rComment = aComment; } - void SetScenarioComment( const rtl::OUString& rComment ) { aComment = rComment; } + void GetScenarioComment( OUString& rComment) const { rComment = aComment; } + void SetScenarioComment( const OUString& rComment ) { aComment = rComment; } const Color& GetScenarioColor() const { return aScenarioColor; } void SetScenarioColor(const Color& rNew) { aScenarioColor = rNew; } const Color& GetTabBgColor() const; @@ -249,28 +249,28 @@ public: sal_uInt8 GetLinkMode() const { return nLinkMode; } bool IsLinked() const { return nLinkMode != SC_LINK_NONE; } - const rtl::OUString& GetLinkDoc() const { return aLinkDoc; } - const rtl::OUString& GetLinkFlt() const { return aLinkFlt; } - const rtl::OUString& GetLinkOpt() const { return aLinkOpt; } - const rtl::OUString& GetLinkTab() const { return aLinkTab; } + const OUString& GetLinkDoc() const { return aLinkDoc; } + const OUString& GetLinkFlt() const { return aLinkFlt; } + const OUString& GetLinkOpt() const { return aLinkOpt; } + const OUString& GetLinkTab() const { return aLinkTab; } sal_uLong GetLinkRefreshDelay() const { return nLinkRefreshDelay; } void SetLink( sal_uInt8 nMode, const String& rDoc, const String& rFlt, const String& rOpt, const String& rTab, sal_uLong nRefreshDelay ); - void GetName( rtl::OUString& rName ) const; - void SetName( const rtl::OUString& rNewName ); + void GetName( OUString& rName ) const; + void SetName( const OUString& rNewName ); void SetAnonymousDBData(ScDBData* pDBData); ScDBData* GetAnonymousDBData(); - void GetCodeName( rtl::OUString& rName ) const { rName = aCodeName; } - void SetCodeName( const rtl::OUString& rNewName ) { aCodeName = rNewName; } + void GetCodeName( OUString& rName ) const { rName = aCodeName; } + void SetCodeName( const OUString& rNewName ) { aCodeName = rNewName; } - const rtl::OUString& GetUpperName() const; + const OUString& GetUpperName() const; - const rtl::OUString& GetPageStyle() const { return aPageStyle; } - void SetPageStyle( const rtl::OUString& rName ); + const OUString& GetPageStyle() const { return aPageStyle; } + void SetPageStyle( const OUString& rName ); void PageStyleModified( const String& rNewName ); bool IsProtected() const; @@ -317,10 +317,10 @@ public: void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); void SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError); - void GetString( SCCOL nCol, SCROW nRow, rtl::OUString& rString ) const; + void GetString( SCCOL nCol, SCROW nRow, OUString& rString ) const; const OUString* GetStringCell( SCCOL nCol, SCROW nRow ) const; double* GetValueCell( SCCOL nCol, SCROW nRow ); - void GetInputString( SCCOL nCol, SCROW nRow, rtl::OUString& rString ) const; + void GetInputString( SCCOL nCol, SCROW nRow, OUString& rString ) const; double GetValue( const ScAddress& rPos ) const { return ValidColRow(rPos.Col(),rPos.Row()) ? @@ -330,7 +330,7 @@ public: double GetValue( SCCOL nCol, SCROW nRow ) const; const EditTextObject* GetEditText( SCCOL nCol, SCROW nRow ) const; void RemoveEditTextCharAttribs( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ); - void GetFormula( SCCOL nCol, SCROW nRow, rtl::OUString& rFormula ) const; + void GetFormula( SCCOL nCol, SCROW nRow, OUString& rFormula ) const; const ScTokenArray* GetFormulaTokens( SCCOL nCol, SCROW nRow ) const; const ScFormulaCell* GetFormulaCell( SCCOL nCol, SCROW nRow ) const; ScFormulaCell* GetFormulaCell( SCCOL nCol, SCROW nRow ); @@ -508,7 +508,7 @@ public: void ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // from sw bool SearchAndReplace( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc); void FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ); @@ -841,16 +841,16 @@ private: void GetAutoFormatAttr(SCCOL nCol, SCROW nRow, sal_uInt16 nIndex, ScAutoFormatData& rData); void GetAutoFormatFrame(SCCOL nCol, SCROW nRow, sal_uInt16 nFlags, sal_uInt16 nIndex, ScAutoFormatData& rData); bool SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc); bool Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc); bool SearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc); bool Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc); bool ReplaceAll( const SvxSearchItem& rSearchItem, const ScMarkData& rMark, ScRangeList& rMatchedRanges, - rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + OUString& rUndoStr, ScDocument* pUndoDoc); bool SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark); @@ -864,13 +864,13 @@ private: bool SearchAndReplaceEmptyCells( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, ScRangeList& rMatchedRanges, - rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + OUString& rUndoStr, ScDocument* pUndoDoc); bool SearchRangeForEmptyCell(const ScRange& rRange, const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - rtl::OUString& rUndoStr); + OUString& rUndoStr); bool SearchRangeForAllEmptyCells( const ScRange& rRange, const SvxSearchItem& rSearchItem, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc); + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc); // use the global sort parameter: bool IsSorted(SCCOLROW nStart, SCCOLROW nEnd) const; @@ -888,7 +888,7 @@ private: bool CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); bool CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); - void GetUpperCellString(SCCOL nCol, SCROW nRow, rtl::OUString& rStr); + void GetUpperCellString(SCCOL nCol, SCROW nRow, OUString& rStr); bool RefVisible(ScFormulaCell* pCell); diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index de4eb9df926c..068d87f550bc 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -33,9 +33,9 @@ class ScTableLink : public ::sfx2::SvBaseLink, public ScRefreshTimer { private: TableLink_Impl* pImpl; - rtl::OUString aFileName; - rtl::OUString aFilterName; - rtl::OUString aOptions; + OUString aFileName; + OUString aFilterName; + OUString aOptions; bool bInCreate:1; bool bInEdit:1; bool bAddUndo:1; @@ -60,9 +60,9 @@ public: void SetAddUndo(bool bSet) { bAddUndo = bSet; } void SetPaint(bool bSet) { bDoPaint = bSet; } - const rtl::OUString& GetFileName() const { return aFileName; } - const rtl::OUString& GetFilterName() const { return aFilterName; } - const rtl::OUString& GetOptions() const { return aOptions; } + const OUString& GetFileName() const { return aFileName; } + const OUString& GetFilterName() const { return aFilterName; } + const OUString& GetOptions() const { return aOptions; } sal_Bool IsUsed() const; @@ -85,18 +85,18 @@ private: bool bWithContent, bool bWithInteraction ); public: - ScDocumentLoader( const rtl::OUString& rFileName, - rtl::OUString& rFilterName, rtl::OUString& rOptions, + ScDocumentLoader( const OUString& rFileName, + OUString& rFilterName, OUString& rOptions, sal_uInt32 nRekCnt = 0, bool bWithInteraction = false ); ~ScDocumentLoader(); ScDocument* GetDocument(); ScDocShell* GetDocShell() { return pDocShell; } bool IsError() const; - rtl::OUString GetTitle() const; + OUString GetTitle() const; void ReleaseDocRef(); // without calling DoClose - static rtl::OUString GetOptions( SfxMedium& rMedium ); + static OUString GetOptions( SfxMedium& rMedium ); /** Returns the filter name and options from a file name. @param bWithContent @@ -104,11 +104,11 @@ public: false = Detects filter by file name extension only (should be used in filter code only). @return sal_True if a filter could be found, sal_False otherwise. */ - static bool GetFilterName( const ::rtl::OUString& rFileName, - ::rtl::OUString& rFilter, ::rtl::OUString& rOptions, + static bool GetFilterName( const OUString& rFileName, + OUString& rFilter, OUString& rOptions, bool bWithContent, bool bWithInteraction ); - static void RemoveAppPrefix( rtl::OUString& rFilterName ); + static void RemoveAppPrefix( OUString& rFilterName ); }; #endif diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx index b8db018336eb..f95f3126853e 100644 --- a/sc/inc/tabprotection.hxx +++ b/sc/inc/tabprotection.hxx @@ -45,9 +45,9 @@ public: returns false. */ static bool needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED); - static ::rtl::OUString getHashURI(ScPasswordHash eHash); + static OUString getHashURI(ScPasswordHash eHash); - static ScPasswordHash getHashTypeFromURI(const ::rtl::OUString& rURI); + static ScPasswordHash getHashTypeFromURI(const OUString& rURI); private: ScPassHashHelper(); diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 4badca478d44..9ef1c9494a1e 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -83,21 +83,21 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -122,33 +122,33 @@ public: // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& PropertyName) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, @@ -158,9 +158,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -176,21 +176,21 @@ public: virtual ~ScLinkTargetsObj(); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index accd92f6dfd0..19f9effa4e0d 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -99,11 +99,11 @@ public: com::sun::star::sheet::XHeaderFooterContent> xObj ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -188,7 +188,7 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, - const ::rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, @@ -203,8 +203,8 @@ public: getStart() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XTextRangeMover @@ -229,11 +229,11 @@ public: getTextFieldMasters() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index aec822c207ab..75b503138c74 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -78,10 +78,10 @@ public: // XFormulaParser virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL parseFormula( - const ::rtl::OUString& aFormula, + const OUString& aFormula, const ::com::sun::star::table::CellAddress& rReferencePos ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence< + virtual OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens, const ::com::sun::star::table::CellAddress& rReferencePos ) throw (::com::sun::star::uno::RuntimeException); @@ -90,7 +90,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -98,29 +98,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -128,11 +128,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx index 15098451e125..d608441c0760 100644 --- a/sc/inc/typedstrdata.hxx +++ b/sc/inc/typedstrdata.hxx @@ -45,13 +45,13 @@ public: Header = 4 }; - ScTypedStrData( const rtl::OUString& rStr, double nVal = 0.0, + ScTypedStrData( const OUString& rStr, double nVal = 0.0, StringType eType = Standard ); ScTypedStrData( const ScTypedStrData& rCpy ); bool IsStrData() const; - SC_DLLPUBLIC const rtl::OUString& GetString() const; + SC_DLLPUBLIC const OUString& GetString() const; StringType GetStringType() const; struct LessCaseSensitive : std::binary_function @@ -78,7 +78,7 @@ public: bool operator< (const ScTypedStrData& r) const; private: - rtl::OUString maStrValue; + OUString maStrValue; double mfValue; StringType meStrType; }; diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx index 4f962dd66594..c04c0f93dd88 100644 --- a/sc/inc/undorangename.hxx +++ b/sc/inc/undorangename.hxx @@ -42,8 +42,8 @@ class ScUndoAllRangeNames : public ScSimpleUndo { public: ScUndoAllRangeNames(ScDocShell* pDocSh, - const std::map& rOldNames, - const boost::ptr_map& rNewNames); + const std::map& rOldNames, + const boost::ptr_map& rNewNames); virtual ~ScUndoAllRangeNames(); @@ -51,14 +51,14 @@ public: virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: - void DoChange(const boost::ptr_map& rNames); + void DoChange(const boost::ptr_map& rNames); private: - boost::ptr_map maOldNames; - boost::ptr_map maNewNames; + boost::ptr_map maOldNames; + boost::ptr_map maNewNames; }; class ScUndoAddRangeData : public ScSimpleUndo @@ -73,7 +73,7 @@ public: virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRangeData* mpRangeData; diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index 6409f32eb292..56394cb82dbc 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -25,28 +25,28 @@ class ScUnitConverterData { - rtl::OUString maIndexString; + OUString maIndexString; double mfValue; // not implemented ScUnitConverterData& operator=( const ScUnitConverterData& ); public: - ScUnitConverterData( const rtl::OUString& rFromUnit, - const rtl::OUString& rToUnit, double fValue = 1.0 ); + ScUnitConverterData( const OUString& rFromUnit, + const OUString& rToUnit, double fValue = 1.0 ); ScUnitConverterData( const ScUnitConverterData& ); ~ScUnitConverterData(); double GetValue() const; - const rtl::OUString& GetIndexString() const; + const OUString& GetIndexString() const; - static rtl::OUString BuildIndexString( - const rtl::OUString& rFromUnit, const rtl::OUString& rToUnit ); + static OUString BuildIndexString( + const OUString& rFromUnit, const OUString& rToUnit ); }; class ScUnitConverter : public boost::noncopyable { - typedef boost::ptr_map MapType; + typedef boost::ptr_map MapType; MapType maData; public: @@ -54,7 +54,7 @@ public: ~ScUnitConverter(); bool GetValue( - double& fValue, const rtl::OUString& rFromUnit, const rtl::OUString& rToUnit ) const; + double& fValue, const OUString& rFromUnit, const OUString& rToUnit ) const; }; diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index 537e3ae99d17..a13759f55a3d 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -94,15 +94,15 @@ public: virtual SdrObjUserData* Clone( SdrObject* pObj ) const; - void SetMacro( const rtl::OUString& rMacro ) { maMacro = rMacro; } - const rtl::OUString& GetMacro() const { return maMacro; } + void SetMacro( const OUString& rMacro ) { maMacro = rMacro; } + const OUString& GetMacro() const { return maMacro; } - void SetHlink( const rtl::OUString& rHlink ) { maHlink = rHlink; } - const rtl::OUString& GetHlink() const { return maHlink; } + void SetHlink( const OUString& rHlink ) { maHlink = rHlink; } + const OUString& GetHlink() const { return maHlink; } private: - rtl::OUString maMacro; - rtl::OUString maHlink; + OUString maMacro; + OUString maHlink; }; //------------------------------------------------------------------------- diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx index bc883e2afcd1..0adb00519047 100644 --- a/sc/inc/userlist.hxx +++ b/sc/inc/userlist.hxx @@ -33,29 +33,29 @@ class SC_DLLPUBLIC ScUserListData public: struct SubStr { - ::rtl::OUString maReal; - ::rtl::OUString maUpper; - SubStr(const ::rtl::OUString& rReal, const ::rtl::OUString& rUpper); + OUString maReal; + OUString maUpper; + SubStr(const OUString& rReal, const OUString& rUpper); }; private: typedef ::boost::ptr_vector SubStringsType; SubStringsType maSubStrings; - ::rtl::OUString aStr; + OUString aStr; SC_DLLPRIVATE void InitTokens(); public: - ScUserListData(const ::rtl::OUString& rStr); + ScUserListData(const OUString& rStr); ScUserListData(const ScUserListData& rData); ~ScUserListData(); - const ::rtl::OUString& GetString() const { return aStr; } - void SetString(const ::rtl::OUString& rStr); + const OUString& GetString() const { return aStr; } + void SetString(const OUString& rStr); size_t GetSubCount() const; - bool GetSubIndex(const ::rtl::OUString& rSubStr, sal_uInt16& rIndex) const; - ::rtl::OUString GetSubStr(sal_uInt16 nIndex) const; - StringCompare Compare(const ::rtl::OUString& rSubStr1, const ::rtl::OUString& rSubStr2) const; - StringCompare ICompare(const ::rtl::OUString& rSubStr1, const ::rtl::OUString& rSubStr2) const; + bool GetSubIndex(const OUString& rSubStr, sal_uInt16& rIndex) const; + OUString GetSubStr(sal_uInt16 nIndex) const; + StringCompare Compare(const OUString& rSubStr1, const OUString& rSubStr2) const; + StringCompare ICompare(const OUString& rSubStr1, const OUString& rSubStr2) const; }; /** @@ -72,9 +72,9 @@ public: ScUserList(); ScUserList(const ScUserList& r); - const ScUserListData* GetData( const ::rtl::OUString& rSubStr ) const; + const ScUserListData* GetData( const OUString& rSubStr ) const; /// If the list in rStr is already inserted - bool HasEntry( const ::rtl::OUString& rStr ) const; + bool HasEntry( const OUString& rStr ) const; const ScUserListData* operator[](size_t nIndex) const; ScUserListData* operator[](size_t nIndex); diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 07e8c04a35fc..10af8e7d7d35 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -143,9 +143,9 @@ class ScViewCfg : public ScViewOptions DECL_LINK( DisplayCommitHdl, void* ); DECL_LINK( GridCommitHdl, void* ); - com::sun::star::uno::Sequence GetLayoutPropertyNames(); - com::sun::star::uno::Sequence GetDisplayPropertyNames(); - com::sun::star::uno::Sequence GetGridPropertyNames(); + com::sun::star::uno::Sequence GetLayoutPropertyNames(); + com::sun::star::uno::Sequence GetDisplayPropertyNames(); + com::sun::star::uno::Sequence GetGridPropertyNames(); public: ScViewCfg(); diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 64119793ee77..1b70ef098738 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -110,11 +110,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider @@ -249,7 +249,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -257,29 +257,29 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -360,11 +360,11 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx index b4b505cb3bbb..5a94c52701ca 100644 --- a/sc/inc/xmlwrap.hxx +++ b/sc/inc/xmlwrap.hxx @@ -54,7 +54,7 @@ class ScXMLImportWrapper com::sun::star::uno::Reference& xModel, com::sun::star::uno::Reference& xParser, com::sun::star::xml::sax::InputSource& aParserInput, - const rtl::OUString& sComponentName, const rtl::OUString& sDocName, const rtl::OUString& sOldDocName, + const OUString& sComponentName, const OUString& sDocName, const OUString& sOldDocName, com::sun::star::uno::Sequence& aArgs, sal_Bool bMustBeSuccessfull); @@ -62,7 +62,7 @@ class ScXMLImportWrapper com::sun::star::uno::Reference& xModel, com::sun::star::uno::Reference& xWriter, com::sun::star::uno::Sequence& aDescriptor, - const rtl::OUString& sName, const rtl::OUString& sMediaType, const rtl::OUString& sComponentName, + const OUString& sName, const OUString& sMediaType, const OUString& sComponentName, com::sun::star::uno::Sequence& aArgs, ScMySharedData*& pSharedData); diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 5190e48ec484..d78809ea4b42 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -77,14 +77,14 @@ private: void ScMacrosTest::testStarBasic() { const OUString aFileNameBase("StarBasic.ods"); - rtl::OUString aFileName; + OUString aFileName; createFileURL(aFileNameBase, aFileName); std::cout << "StarBasic test" << std::endl; uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is()); - rtl::OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"); + OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"); String sUrl = aURL; Any aRet; Sequence< sal_Int16 > aOutParamIndex; @@ -109,97 +109,97 @@ void ScMacrosTest::testVba() { TestMacroInfo testInfo[] = { { - rtl::OUString("TestAddress."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("TestAddress."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("vba."), - rtl::OUString("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document"), + OUString("vba."), + OUString("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document"), }, { - rtl::OUString("MiscRangeTests."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("MiscRangeTests."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("bytearraystring."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document") + OUString("bytearraystring."), + OUString("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document") }, { - rtl::OUString("AutoFilter."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("AutoFilter."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("CalcFont."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("CalcFont."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("TestIntersection."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("TestIntersection."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("TestUnion."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("TestUnion."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("range-4."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("range-4."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("Ranges-3."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("Ranges-3."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("TestCalc_Rangetest."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("TestCalc_Rangetest."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("TestCalc_Rangetest2."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("TestCalc_Rangetest2."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #if defined FIXRANGEADDRESSING //ScVbaRange::getRangeForName()/getScRangeListForAddress() seems to get confused //about the addressing mode of the document vs the addressing mode of a named //range ( need to fix that ) { - rtl::OUString("Ranges-2."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("Ranges-2."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #endif { - rtl::OUString("pagesetup."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("pagesetup."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("Window."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("Window."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("window2."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("window2."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("PageBreaks."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("PageBreaks."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString("Shapes."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("Shapes."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #if defined VBA_TEST_WORKING { - rtl::OUString("Ranges."), - rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") + OUString("Ranges."), + OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #endif }; for ( sal_uInt32 i=0; i xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); - rtl::OUString sMsg( "Failed to load " + aFileName ); - CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() ); + OUString sMsg( "Failed to load " + aFileName ); + CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() ); String sUrl = testInfo[i].sMacroUrl; Any aRet; @@ -210,12 +210,12 @@ void ScMacrosTest::testVba() SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); - std::cout << "about to invoke vba test in " << rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cout << "about to invoke vba test in " << OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam); - rtl::OUString aStringRes; + OUString aStringRes; aRet >>= aStringRes; - std::cout << "value of Ret " << rtl::OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cout << "value of Ret " << OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; CPPUNIT_ASSERT_MESSAGE( "script reported failure",aStringRes == "OK" ); pFoundShell->DoClose(); } diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx index 771f7e33296b..1114840479a9 100644 --- a/sc/qa/extras/regression-test.cxx +++ b/sc/qa/extras/regression-test.cxx @@ -65,14 +65,14 @@ using namespace ::com::sun::star::uno; namespace { -bool checkDumpAgainstFile( const rtl::OUString& rDump, const rtl::OUString aFilePath, const rtl::OUString& rToleranceFile) +bool checkDumpAgainstFile( const OUString& rDump, const OUString aFilePath, const OUString& rToleranceFile) { - rtl::OString aOFile = rtl::OUStringToOString(aFilePath, RTL_TEXTENCODING_UTF8); - rtl::OString aToleranceFile = rtl::OUStringToOString(rToleranceFile, RTL_TEXTENCODING_UTF8); + OString aOFile = OUStringToOString(aFilePath, RTL_TEXTENCODING_UTF8); + OString aToleranceFile = OUStringToOString(rToleranceFile, RTL_TEXTENCODING_UTF8); CPPUNIT_ASSERT_MESSAGE("dump is empty", !rDump.isEmpty()); - rtl::OString aDump = rtl::OUStringToOString(rDump, RTL_TEXTENCODING_UTF8); + OString aDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8); return doXMLDiff(aOFile.getStr(), aDump.getStr(), static_cast(rDump.getLength()), aToleranceFile.getStr()); } @@ -84,7 +84,7 @@ class ScChartRegressionTest : public test::BootstrapFixture, public unotest::Mac public: ScChartRegressionTest(); - void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath); + void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); virtual void setUp(); virtual void tearDown(); @@ -97,14 +97,14 @@ public: private: uno::Reference m_xCalcComponent; - rtl::OUString m_aBaseString; + OUString m_aBaseString; }; -void ScChartRegressionTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) +void ScChartRegressionTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { - rtl::OUString aSep("/"); - rtl::OUStringBuffer aBuffer( getSrcRootURL() ); + OUString aSep("/"); + OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); rFilePath = aBuffer.makeStringAndClear(); @@ -112,7 +112,7 @@ void ScChartRegressionTest::createFileURL(const rtl::OUString& aFileBase, const void ScChartRegressionTest::test() { - rtl::OUString aFileName; + OUString aFileName; createFileURL( "testChart.", "ods", aFileName); uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument"); @@ -146,7 +146,7 @@ void ScChartRegressionTest::test() uno::Reference< qa::XDumper > xDumper( xChartDoc, UNO_QUERY_THROW ); CPPUNIT_ASSERT(xDumper.is()); - rtl::OUString aDump = xDumper->dump(); + OUString aDump = xDumper->dump(); std::cout << aDump; bool bCompare = checkDumpAgainstFile( aDump, getPathFromSrc("/chart2/qa/unit/data/reference/testChart.xml"), getPathFromSrc("/chart2/qa/unit/data/tolerance.xml") ); CPPUNIT_ASSERT(bCompare); @@ -164,7 +164,7 @@ void ScChartRegressionTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); } diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index d5971c0033a2..0f9134ffb6e1 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -97,8 +97,8 @@ uno::Reference< uno::XInterface > ScAnnontationObj::init() { // get the test file - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScAnnotationObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index 62d662672352..9e137ceb6b8e 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -86,8 +86,8 @@ uno::Reference< sheet::XSheetAnnotations> ScAnnontationsObj::getAnnotations() uno::Reference< uno::XInterface > ScAnnontationsObj::init() { // get the test file - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScAnnotationObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index a3e925a17f12..8eb1727d0b4c 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -80,17 +80,17 @@ uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent; ScCellRangeObj::ScCellRangeObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(rtl::OUString("15"), 1), - apitest::XReplaceable(rtl::OUString("15"), rtl::OUString("35")) + apitest::XSearchable(OUString("15"), 1), + apitest::XReplaceable(OUString("15"), OUString("35")) { } uno::Reference< uno::XInterface > ScCellRangeObj::init() { - rtl::OUString aFileURL; - const rtl::OUString aFileBase("xcellrangesquery.ods"); + OUString aFileURL; + const OUString aFileBase("xcellrangesquery.ods"); createFileURL(aFileBase, aFileURL); - std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if( !mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent, UNO_QUERY_THROW); @@ -107,10 +107,10 @@ uno::Reference< uno::XInterface > ScCellRangeObj::init() uno::Reference< uno::XInterface > ScCellRangeObj::getXCellRangeData() { - rtl::OUString aFileURL; - const rtl::OUString aFileBase("xcellrangesquery.ods"); + OUString aFileURL; + const OUString aFileBase("xcellrangesquery.ods"); createFileURL(aFileBase, aFileURL); - std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if( !mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent, UNO_QUERY_THROW); diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index a54716720883..b769f78a2499 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -45,7 +45,7 @@ public: virtual void setUp(); virtual void tearDown(); - virtual uno::Reference< uno::XInterface > init( const rtl::OUString& rDBName ); + virtual uno::Reference< uno::XInterface > init( const OUString& rDBName ); ScDatabaseRangeObj(); @@ -70,9 +70,9 @@ ScDatabaseRangeObj::ScDatabaseRangeObj() { } -uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString& rDBName ) +uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const OUString& rDBName ) { - rtl::OUString aFileURL; + OUString aFileURL; createFileURL("ScDatabaseRangeObj.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); @@ -80,7 +80,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString& uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xPropSet(xDoc, UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(rtl::OUString("DatabaseRanges")), UNO_QUERY_THROW); + uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(OUString("DatabaseRanges")), UNO_QUERY_THROW); uno::Reference< sheet::XDatabaseRange > xDBRange( xNameAccess->getByName(rDBName), UNO_QUERY_THROW); CPPUNIT_ASSERT(xDBRange.is()); return xDBRange; diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index c52952eeff4f..05b2cec35ef9 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -75,8 +75,8 @@ ScDataPilotFieldObj::ScDataPilotFieldObj() uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("scdatapilotfieldobj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("scdatapilotfieldobj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); @@ -90,9 +90,9 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() CPPUNIT_ASSERT(xDPTS.is()); uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Sequence aElementNames = xDPT->getElementNames(); + uno::Sequence aElementNames = xDPT->getElementNames(); - uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString("DataPilot1")),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(OUString("DataPilot1")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPDsc.is()); uno::Reference< container::XIndexAccess > xIA( xDPDsc->getDataPilotFields(), UNO_QUERY_THROW); uno::Reference< uno::XInterface > xReturnValue( xIA->getByIndex(0), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index 05a7572d411c..05150db20b3f 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -84,13 +84,13 @@ uno::Reference< lang::XComponent > ScDataPilotTableObj::mxComponent; ScDataPilotTableObj::ScDataPilotTableObj() : UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNamed(rtl::OUString("DataPilotTable")) + apitest::XNamed(OUString("DataPilotTable")) { } uno::Reference< uno::XInterface > ScDataPilotTableObj::init() { - rtl::OUString aFileURL; + OUString aFileURL; createFileURL("ScDataPilotTableObj.ods", aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); @@ -112,7 +112,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::init() uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable")),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(OUString("DataPilotTable")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPTable.is()); return xDPTable; @@ -127,8 +127,8 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::getSheets() uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScDataPilotTableObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScDataPilotTableObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); @@ -149,7 +149,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2() uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable2")),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(OUString("DataPilotTable2")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPTable.is()); return xDPTable; diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx index 78d0ac1e46da..5f08e06630e6 100644 --- a/sc/qa/extras/sceditfieldobj-cell.cxx +++ b/sc/qa/extras/sceditfieldobj-cell.cxx @@ -115,8 +115,8 @@ uno::Reference getNewField(const uno::Reference xField( xSM->createInstance("com.sun.star.text.TextField.URL"), UNO_QUERY_THROW); uno::Reference xPropSet(xField, UNO_QUERY_THROW); - xPropSet->setPropertyValue("Representation", uno::makeAny(rtl::OUString("LibreOffice"))); - xPropSet->setPropertyValue("URL", uno::makeAny(rtl::OUString("http://www.libreoffice.org/"))); + xPropSet->setPropertyValue("Representation", uno::makeAny(OUString("LibreOffice"))); + xPropSet->setPropertyValue("URL", uno::makeAny(OUString("http://www.libreoffice.org/"))); return xField; } diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index 13384e83bd39..3b8faf493996 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/extras/scmodelobj.cxx @@ -43,8 +43,8 @@ uno::Reference< lang::XComponent > ScModelObj::mxComponent; uno::Reference< uno::XInterface > ScModelObj::init() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScModelObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScModelObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index 892db8e1ec64..466e91368255 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -49,7 +49,7 @@ public: virtual void tearDown(); virtual uno::Reference< uno::XInterface > init(); - virtual uno::Reference< sheet::XNamedRange > getNamedRange(const rtl::OUString& rRangeName); + virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName); CPPUNIT_TEST_SUITE(ScNamedRangeObj); CPPUNIT_TEST(testGetContent); @@ -74,28 +74,28 @@ uno::Reference< lang::XComponent > ScNamedRangeObj::mxComponent; ScNamedRangeObj::ScNamedRangeObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNamed(rtl::OUString("NamedRange")), + apitest::XNamed(OUString("NamedRange")), apitest::XCellRangeReferrer(table::CellRangeAddress(0,1,7,1,7)) { } uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScNamedRangeObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); - rtl::OUString aNamedRangesPropertyString("NamedRanges"); + OUString aNamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW); CPPUNIT_ASSERT(xNamedRanges.is()); return xNamedRanges; } -uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const rtl::OUString& rRangeName) +uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const OUString& rRangeName) { uno::Reference< container::XNameAccess > xNamedAccess(init_impl(), UNO_QUERY_THROW); uno::Reference< sheet::XNamedRange > xNamedRange(xNamedAccess->getByName(rRangeName), UNO_QUERY_THROW); @@ -106,7 +106,7 @@ uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const rtl::OU uno::Reference< uno::XInterface > ScNamedRangeObj::init() { - return getNamedRange(rtl::OUString("NamedRange")); + return getNamedRange(OUString("NamedRange")); } void ScNamedRangeObj::setUp() diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index 05424366c59d..3852a77cfe2a 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -69,14 +69,14 @@ ScNamedRangesObj::ScNamedRangesObj() uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScNamedRangeObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); - rtl::OUString aNamedRangesPropertyString("NamedRanges"); + OUString aNamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW); //set value from xnamedranges.hxx diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx index 4e7f1540c528..b9c80f535ac1 100644 --- a/sc/qa/extras/scoutlineobj.cxx +++ b/sc/qa/extras/scoutlineobj.cxx @@ -72,8 +72,8 @@ ScOutlineObj::ScOutlineObj() uno::Reference< uno::XInterface > ScOutlineObj::init() { // get the test file - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScOutlineObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScOutlineObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index f41d2ac3d83e..3a8164f31f67 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -65,16 +65,16 @@ uno::Reference< lang::XComponent > ScTableSheetObj::mxComponent; ScTableSheetObj::ScTableSheetObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(rtl::OUString("test"), 4), - apitest::XReplaceable(rtl::OUString("searchReplaceString"), rtl::OUString("replaceReplaceString")) + apitest::XSearchable(OUString("test"), 4), + apitest::XReplaceable(OUString("searchReplaceString"), OUString("replaceReplaceString")) { } uno::Reference< uno::XInterface > ScTableSheetObj::init() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("ScTableSheetObj.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("ScTableSheetObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index cfc771c7b0a9..4b88077eb05b 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -62,8 +62,8 @@ public: CPPUNIT_TEST_SUITE_END(); virtual uno::Reference< lang::XComponent > getComponent(); - virtual void createFileURL(const rtl::OUString& rFileBase, rtl::OUString& rFileURL); - virtual uno::Reference< lang::XComponent > loadFromDesktop(const rtl::OUString& rString); + virtual void createFileURL(const OUString& rFileBase, OUString& rFileURL); + virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString& rString); virtual uno::Reference< uno::XInterface > init(); protected: static uno::Reference< lang::XComponent > mxComponent; @@ -75,7 +75,7 @@ sal_Int32 ScTableSheetsObj::nTest = 0; ScTableSheetsObj::ScTableSheetsObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNameContainer(rtl::OUString("Sheet2")) + apitest::XNameContainer(OUString("Sheet2")) { } @@ -85,20 +85,20 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::getComponent() return mxComponent; } -void ScTableSheetsObj::createFileURL(const rtl::OUString& rFileBase, rtl::OUString& rFileURL) +void ScTableSheetsObj::createFileURL(const OUString& rFileBase, OUString& rFileURL) { UnoApiTest::createFileURL(rFileBase, rFileURL); } -uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const rtl::OUString& rString) +uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const OUString& rString) { return UnoApiTest::loadFromDesktop(rString); } uno::Reference< uno::XInterface > ScTableSheetsObj::init() { - rtl::OUString aFileURL; - createFileURL(rtl::OUString("rangenamessrc.ods"), aFileURL); + OUString aFileURL; + createFileURL(OUString("rangenamessrc.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx index 41589f18310d..35d9139b6bfe 100644 --- a/sc/qa/unit/helper/csv_handler.hxx +++ b/sc/qa/unit/helper/csv_handler.hxx @@ -40,9 +40,9 @@ namespace { -rtl::OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab) +OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab) { - rtl::OUString aString; + OUString aString; Color* pColor; ScRefCellValue aCell; aCell.assign(*pDoc, ScAddress(nCol, nRow, nTab)); @@ -57,9 +57,9 @@ rtl::OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRo return aString; } -rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab) +OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab) { - rtl::OStringBuffer aString("Error in Table: "); + OStringBuffer aString("Error in Table: "); aString.append(static_cast(nTab)); aString.append(" Column: "); aString.append(static_cast(nCol)); @@ -68,20 +68,20 @@ rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab) return aString.makeStringAndClear(); } -rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const rtl::OUString& rExpectedString, const rtl::OUString& rString) +OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rExpectedString, const OUString& rString) { - rtl::OStringBuffer aString(createErrorMessage(nCol, nRow, nTab)); + OStringBuffer aString(createErrorMessage(nCol, nRow, nTab)); aString.append("; Expected: '"); - aString.append(rtl::OUStringToOString(rExpectedString, RTL_TEXTENCODING_UTF8)); + aString.append(OUStringToOString(rExpectedString, RTL_TEXTENCODING_UTF8)); aString.append("' Found: '"); - aString.append(rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8)); + aString.append(OUStringToOString(rString, RTL_TEXTENCODING_UTF8)); aString.append("'"); return aString.makeStringAndClear(); } -rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, double aValue) +OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, double aValue) { - rtl::OStringBuffer aString(createErrorMessage(nCol, nRow, nTab)); + OStringBuffer aString(createErrorMessage(nCol, nRow, nTab)); aString.append("; Expected: '"); aString.append(aExpected); aString.append("' Found: '"); @@ -133,12 +133,12 @@ public: } else if (meStringType == PureString) { - rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); - rtl::OUString aString = mpDoc->GetString(mnCol, mnRow, mnTab); + OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); + OUString aString = mpDoc->GetString(mnCol, mnRow, mnTab); #if DEBUG_CSV_HANDLER - std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; std::cout << "result: " << (int)(aCSVString == aString) << std::endl; #endif //DEBUG_CSV_HANDLER @@ -151,7 +151,7 @@ public: double nValue = strtod(&aStr[0], &pRemainingChars); if (*pRemainingChars) { - rtl::OUString aString; + OUString aString; switch (meStringType) { case StringValue: @@ -163,10 +163,10 @@ public: default: break; } - rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); + OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); #if DEBUG_CSV_HANDLER - std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; std::cout << "result: " << (int)(aCSVString == aString) << std::endl; #endif //DEBUG_CSV_HANDLER @@ -222,11 +222,11 @@ public: #if DEBUG_CSV_HANDLER std::cout << "Col: " << mnCol << " Row: " << mnRow << std::endl; #endif //DEBUG_CSV_HANDLER - rtl::OUString aString = getConditionalFormatString(mpDoc, mnCol, mnRow, mnTab); - rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); + OUString aString = getConditionalFormatString(mpDoc, mnCol, mnRow, mnTab); + OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8); #if DEBUG_CSV_HANDLER - std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; + std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl; std::cout << "result: " << (int)(aCSVString == aString) << std::endl; #endif //DEBUG_CSV_HANDLER CPPUNIT_ASSERT_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab, aCSVString, aString).getStr(), aString == aCSVString ); diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx index 4de5c9d72599..e54cc43bc8c1 100644 --- a/sc/qa/unit/helper/debughelper.hxx +++ b/sc/qa/unit/helper/debughelper.hxx @@ -52,8 +52,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::cout; using ::std::cerr; using ::std::endl; diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index b610f5883144..9558691aba86 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -154,7 +154,7 @@ protected: SfxItemSet* pSet = pSrcMed->GetItemSet(); pSet->Put(SfxStringItem(SID_PASSWORD, *pPassword)); } - printf("about to load %s\n", rtl::OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf("about to load %s\n", OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); if (!xDocShRef->DoLoad(pSrcMed)) { xDocShRef->DoClose(); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 6416340fdc15..2acc0f4d055f 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -785,7 +785,7 @@ void testFuncNUMBERVALUE( ScDocument* pDoc ) SCROW nRows = SAL_N_ELEMENTS(aData); for (SCROW i = 0; i < nRows; ++i) - pDoc->SetString(0, i, 0, rtl::OUString::createFromAscii(aData[i])); + pDoc->SetString(0, i, 0, OUString::createFromAscii(aData[i])); printRange(pDoc, ScRange(0, 0, 0, 0, nRows - 1, 0), "data range for NUMBERVALUE"); @@ -807,14 +807,14 @@ void testFuncNUMBERVALUE( ScDocument* pDoc ) for (SCROW i = 0; i < nRows; ++i) { SCROW nRow = 20 + i; - pDoc->SetString(0, nRow, 0, rtl::OUString::createFromAscii(aChecks[i].pFormula)); + pDoc->SetString(0, nRow, 0, OUString::createFromAscii(aChecks[i].pFormula)); } pDoc->CalcAll(); for (SCROW i = 0; i < nRows; ++i) { SCROW nRow = 20 + i; - rtl::OUString aResult = pDoc->GetString(0, nRow, 0); + OUString aResult = pDoc->GetString(0, nRow, 0); CPPUNIT_ASSERT_EQUAL_MESSAGE( aChecks[i].pFormula, OUString::createFromAscii( aChecks[i].pResult), aResult); } diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index d52bcc69a258..fbb74439c89c 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -97,7 +97,7 @@ void ScAttrArray::TestData() const if (nErr) { - rtl::OStringBuffer aMsg; + OStringBuffer aMsg; aMsg.append(static_cast(nErr)); aMsg.append(RTL_CONSTASCII_STRINGPARAM( " errors in attribute array, column ")); diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index ef9b490d946b..363c609fdd83 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -127,7 +127,7 @@ ScMergeAttr::~ScMergeAttr() String ScMergeAttr::GetValueText() const { - rtl::OUStringBuffer aString; + OUStringBuffer aString; aString.append('('); aString.append(static_cast(nColMerge)); aString.append(','); @@ -716,7 +716,7 @@ bool ScPageHFItem::PutValue( const uno::Any& rVal, sal_uInt8 /* nMemberId */ ) String ScPageHFItem::GetValueText() const { - return rtl::OUString("ScPageHFItem"); + return OUString("ScPageHFItem"); } //------------------------------------------------------------------------ @@ -1067,7 +1067,7 @@ ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem ) String ScDoubleItem::GetValueText() const { - return rtl::OUString("ScDoubleItem"); + return OUString("ScDoubleItem"); } //------------------------------------------------------------------------ diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 3862e8864a5e..0bde4bf2080b 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -183,9 +183,9 @@ bool ScBaseCell::HasStringData() const } } -rtl::OUString ScBaseCell::GetStringData() const +OUString ScBaseCell::GetStringData() const { - rtl::OUString aStr; + OUString aStr; switch ( eCellType ) { case CELLTYPE_STRING: @@ -231,7 +231,7 @@ ScValueCell::~ScValueCell() // ============================================================================ -ScStringCell::ScStringCell( const rtl::OUString& rString ) : +ScStringCell::ScStringCell( const OUString& rString ) : ScBaseCell( CELLTYPE_STRING ), maString( rString.intern() ) { diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index 9d8b1b9de07d..8345e488f980 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.cxx @@ -109,10 +109,10 @@ OUString ScEditCell::GetString() const // Also Text from URL fields, Doc-Engine is a ScFieldEditEngine EditEngine& rEngine = mpDoc->GetEditEngine(); rEngine.SetText(*mpData); - rtl::OUString sRet = ScEditUtil::GetMultilineString(rEngine); // string with line separators between paragraphs + OUString sRet = ScEditUtil::GetMultilineString(rEngine); // string with line separators between paragraphs // cache short strings for formulas if ( sRet.getLength() < 256 ) - mpString = new rtl::OUString(sRet); //! non-const + mpString = new OUString(sRet); //! non-const return sRet; } diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index c9aa3cbc86ae..d97e6694d023 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -82,7 +82,7 @@ ScColorScaleEntry::~ScColorScaleEntry() mpCell->EndListeningTo(mpCell->GetDocument()); } -void ScColorScaleEntry::SetFormula( const rtl::OUString& rFormula, ScDocument* pDoc, const ScAddress& rAddr, formula::FormulaGrammar::Grammar eGrammar ) +void ScColorScaleEntry::SetFormula( const OUString& rFormula, ScDocument* pDoc, const ScAddress& rAddr, formula::FormulaGrammar::Grammar eGrammar ) { mpCell.reset(new ScFormulaCell( pDoc, rAddr, rFormula, eGrammar )); mpCell->StartListeningTo( pDoc ); @@ -98,9 +98,9 @@ const ScTokenArray* ScColorScaleEntry::GetFormula() const return NULL; } -rtl::OUString ScColorScaleEntry::GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const +OUString ScColorScaleEntry::GetFormula( formula::FormulaGrammar::Grammar eGrammar ) const { - rtl::OUString aFormula; + OUString aFormula; if(mpCell) { mpCell->GetFormula(aFormula, eGrammar); diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 0aa3b175f47e..90b0927d78ec 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1514,7 +1514,7 @@ void ScColumn::CopyToColumn( // empty cell. if (pNew->GetCellType() == CELLTYPE_STRING) { - rtl::OUString aStr = static_cast(pNew)->GetString(); + OUString aStr = static_cast(pNew)->GetString(); if (aStr.isEmpty()) // A string cell with empty string. Delete the cell itself. rColumn.Delete(maItems[i].nRow); diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 47013b74c086..946676ad5e9a 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -244,7 +244,7 @@ long ScColumn::GetNeededSize( if (!bEditEngine) // direct output { Color* pColor; - rtl::OUString aValStr; + OUString aValStr; ScCellFormat::GetString( aCell, nFormat, aValStr, &pColor, *pFormatter, true, rOptions.bFormula, ftCheck); @@ -561,7 +561,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth( // Try to find the row that has the longest string, and measure the width of that string. SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter ); - rtl::OUString aLongStr; + OUString aLongStr; Color* pColor; if (pParam->mnMaxTextRow >= 0) { diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 06472a4accb9..e66f74deecbe 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -54,8 +54,6 @@ #include using ::com::sun::star::i18n::LocaleDataItem; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // Err527 Workaroand extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx @@ -852,10 +850,10 @@ ScBaseCell* ScColumn::CloneCell( if ( bCloneSpecialBoolean ) { ScFormulaCell& rForm = (ScFormulaCell&)rSource; - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; // FIXME: do we have a localisation issue here? rForm.GetFormula( aBuf ); - rtl::OUString aVal( aBuf.makeStringAndClear() ); + OUString aVal( aBuf.makeStringAndClear() ); if ( aVal == "=TRUE()" || aVal == "=FALSE()" ) bForceFormula = true; } @@ -1526,7 +1524,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, std::vectorGetFormatTable(); - rtl::OUString aString; + OUString aString; SCSIZE nIndex; Search( nStartRow, nIndex ); @@ -1753,7 +1751,7 @@ void ScColumn::SetValue( SCROW nRow, const double& rVal) } -void ScColumn::GetString( SCROW nRow, rtl::OUString& rString ) const +void ScColumn::GetString( SCROW nRow, OUString& rString ) const { SCSIZE nIndex; Color* pColor; @@ -1799,7 +1797,7 @@ double* ScColumn::GetValueCell( SCROW nRow ) return static_cast(pCell)->GetValuePtr(); } -void ScColumn::GetInputString( SCROW nRow, rtl::OUString& rString ) const +void ScColumn::GetInputString( SCROW nRow, OUString& rString ) const { SCSIZE nIndex; if (Search(nRow, nIndex)) @@ -1812,10 +1810,10 @@ void ScColumn::GetInputString( SCROW nRow, rtl::OUString& rString ) const ScCellFormat::GetInputString(aCell, nFormat, rString, *(pDocument->GetFormatTable())); } else - rString = rtl::OUString(); + rString = OUString(); } else - rString = rtl::OUString(); + rString = OUString(); } @@ -1873,7 +1871,7 @@ void ScColumn::RemoveEditTextCharAttribs( SCROW nRow, const ScPatternAttr& rAttr pEditCell->RemoveCharAttribs(rAttr); } -void ScColumn::GetFormula( SCROW nRow, rtl::OUString& rFormula ) const +void ScColumn::GetFormula( SCROW nRow, OUString& rFormula ) const { SCSIZE nIndex; if (Search(nRow, nIndex)) @@ -1882,10 +1880,10 @@ void ScColumn::GetFormula( SCROW nRow, rtl::OUString& rFormula ) const if (pCell->GetCellType() == CELLTYPE_FORMULA) ((ScFormulaCell*)pCell)->GetFormula( rFormula ); else - rFormula = rtl::OUString(); + rFormula = OUString(); } else - rFormula = rtl::OUString(); + rFormula = OUString(); } const ScTokenArray* ScColumn::GetFormulaTokens( SCROW nRow ) const @@ -1976,8 +1974,8 @@ sal_Int32 ScColumn::GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCh sal_Int32 nStringLen = 0; if ( !maItems.empty() ) { - rtl::OUString aString; - rtl::OString aOString; + OUString aString; + OString aOString; bool bIsOctetTextEncoding = rtl_isOctetTextEncoding( eCharSet); SvNumberFormatter* pNumFmt = pDocument->GetFormatTable(); SCSIZE nIndex; @@ -2030,7 +2028,7 @@ xub_StrLen ScColumn::GetMaxNumberStringLen( if ( !maItems.empty() ) { - rtl::OUString aString; + OUString aString; SvNumberFormatter* pNumFmt = pDocument->GetFormatTable(); SCSIZE nIndex; SCROW nRow; @@ -2202,7 +2200,7 @@ void ScColumn::RebuildFormulaGroups() #if OSL_DEBUG_LEVEL > 0 if ( maDoubles.size() + maFnGroups.size() > 0 ) { - rtl::OUString aStr; + OUString aStr; fprintf( stderr, "column %2d has %2d double span(s): ", (int)nCol, (int)maDoubles.size() ); for (std::vector< ColDoubleEntry *>::iterator it = maDoubles.begin(); it != maDoubles.end(); ++it ) diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index be84d583af81..f898cfef0906 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -210,8 +210,8 @@ ScConditionEntry::ScConditionEntry( ScDocument* pDocument, const ScConditionEntr } ScConditionEntry::ScConditionEntry( ScConditionMode eOper, - const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rExprNmsp1, const rtl::OUString& rExprNmsp2, + const OUString& rExpr1, const OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2 ) : ScFormatEntry(pDocument), eOp(eOper), @@ -322,8 +322,8 @@ ScConditionEntry::~ScConditionEntry() delete pFormula2; } -void ScConditionEntry::Compile( const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, - const rtl::OUString& rExprNmsp1, const rtl::OUString& rExprNmsp2, +void ScConditionEntry::Compile( const OUString& rExpr1, const OUString& rExpr2, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2, bool bTextToReal ) { if ( !rExpr1.isEmpty() || !rExpr2.isEmpty() ) @@ -455,7 +455,7 @@ void ScConditionEntry::CompileXML() if ( aNew.Parse( aSrcString, mpDoc ) & SCA_VALID ) aSrcPos = aNew; // if the position is invalid, there isn't much we can do at this time - aSrcString = rtl::OUString(); + aSrcString = OUString(); } // Convert the text tokens that were created during XML import into real tokens. @@ -465,7 +465,7 @@ void ScConditionEntry::CompileXML() aStrNmsp1, aStrNmsp2, eTempGrammar1, eTempGrammar2, true ); } -void ScConditionEntry::SetSrcString( const rtl::OUString& rNew ) +void ScConditionEntry::SetSrcString( const OUString& rNew ) { // aSrcString is only evaluated in CompileXML SAL_WARN_IF( !mpDoc->IsImportingXML(), "sc", "SetSrcString is only valid for XML import" ); @@ -681,7 +681,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) { bIsStr1 = false; nVal1 = pEff1->GetValue(); - aStrVal1 = rtl::OUString(); + aStrVal1 = OUString(); } else { @@ -710,7 +710,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) { bIsStr2 = false; nVal2 = pEff2->GetValue(); - aStrVal2 = rtl::OUString(); + aStrVal2 = OUString(); } else { @@ -831,7 +831,7 @@ void ScConditionEntry::FillCache() const } } -bool ScConditionEntry::IsDuplicate( double nArg, const rtl::OUString& rStr ) const +bool ScConditionEntry::IsDuplicate( double nArg, const OUString& rStr ) const { FillCache(); @@ -1069,7 +1069,7 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_NOTDUPLICATE: if( pCondFormat ) { - bValid = IsDuplicate( nArg, rtl::OUString() ); + bValid = IsDuplicate( nArg, OUString() ); if( eOp == SC_COND_NOTDUPLICATE ) bValid = !bValid; } @@ -1106,26 +1106,26 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_BEGINS_WITH: if(aStrVal1.isEmpty()) { - rtl::OUString aStr = rtl::OUString::valueOf(nVal1); - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr = OUString::valueOf(nVal1); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStr) == 0; } else { - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStrVal1) == 0; } break; case SC_COND_ENDS_WITH: if(aStrVal1.isEmpty()) { - rtl::OUString aStr = rtl::OUString::valueOf(nVal1); - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr = OUString::valueOf(nVal1); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.endsWith(aStr) == 0; } else { - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.endsWith(aStrVal1) == 0; } break; @@ -1133,13 +1133,13 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_NOT_CONTAINS_TEXT: if(aStrVal1.isEmpty()) { - rtl::OUString aStr = rtl::OUString::valueOf(nVal1); - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr = OUString::valueOf(nVal1); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStr) != -1; } else { - rtl::OUString aStr2 = rtl::OUString::valueOf(nArg); + OUString aStr2 = OUString::valueOf(nArg); bValid = aStr2.indexOf(aStrVal1) != -1; } @@ -1153,7 +1153,7 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const return bValid; } -bool ScConditionEntry::IsValidStr( const rtl::OUString& rArg, const ScAddress& rPos ) const +bool ScConditionEntry::IsValidStr( const OUString& rArg, const ScAddress& rPos ) const { bool bValid = false; // Interpret muss schon gerufen sein @@ -1180,15 +1180,15 @@ bool ScConditionEntry::IsValidStr( const rtl::OUString& rArg, const ScAddress& r if ( !bIsStr2 ) return false; - rtl::OUString aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen) - rtl::OUString aUpVal2( aStrVal2 ); + OUString aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen) + OUString aUpVal2( aStrVal2 ); if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN ) if ( ScGlobal::GetCollator()->compareString( aUpVal1, aUpVal2 ) == COMPARE_GREATER ) { // richtige Reihenfolge fuer Wertebereich - rtl::OUString aTemp( aUpVal1 ); aUpVal1 = aUpVal2; aUpVal2 = aTemp; + OUString aTemp( aUpVal1 ); aUpVal1 = aUpVal2; aUpVal2 = aTemp; } switch ( eOp ) @@ -1269,7 +1269,7 @@ bool ScConditionEntry::IsCellValid( ScRefCellValue& rCell, const ScAddress& rPos ((ScConditionEntry*)this)->Interpret(rPos); // Formeln auswerten double nArg = 0.0; - rtl::OUString aArgStr; + OUString aArgStr; bool bVal = lcl_GetCellContent( rCell, bIsStr1, nArg, aArgStr ); if (bVal) return IsValid( nArg, rPos ); @@ -1277,12 +1277,12 @@ bool ScConditionEntry::IsCellValid( ScRefCellValue& rCell, const ScAddress& rPos return IsValidStr( aArgStr, rPos ); } -rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uInt16 nIndex, +OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uInt16 nIndex, sal_uLong nNumFmt, const FormulaGrammar::Grammar eGrammar ) const { assert( nIndex <= 1); - rtl::OUString aRet; + OUString aRet; if ( FormulaGrammar::isEnglish( eGrammar) && nNumFmt == 0 ) nNumFmt = mpDoc->GetFormatTable()->GetStandardIndex( LANGUAGE_ENGLISH_US ); @@ -1293,7 +1293,7 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn { ScCompiler aComp(mpDoc, rCursor, *pFormula1); aComp.SetGrammar(eGrammar); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aComp.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); } @@ -1312,7 +1312,7 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn { ScCompiler aComp(mpDoc, rCursor, *pFormula2); aComp.SetGrammar(eGrammar); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aComp.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); } @@ -1579,10 +1579,10 @@ void ScConditionEntry::endRendering() //------------------------------------------------------------------------ ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, - const rtl::OUString& rExpr1, const rtl::OUString& rExpr2, + const OUString& rExpr1, const OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rStyle, - const rtl::OUString& rExprNmsp1, const rtl::OUString& rExprNmsp2, + const OUString& rStyle, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2 ) : ScConditionEntry( eOper, rExpr1, rExpr2, pDocument, rPos, rExprNmsp1, rExprNmsp2, eGrammar1, eGrammar2 ), @@ -1593,7 +1593,7 @@ ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, const ScTokenArray* pArr1, const ScTokenArray* pArr2, ScDocument* pDocument, const ScAddress& rPos, - const rtl::OUString& rStyle ) : + const OUString& rStyle ) : ScConditionEntry( eOper, pArr1, pArr2, pDocument, rPos ), aStyleName( rStyle ) { @@ -1783,12 +1783,12 @@ condformat::ScCondFormatDateType ScCondDateFormatEntry::GetDateType() const return meType; } -const rtl::OUString& ScCondDateFormatEntry::GetStyleName() const +const OUString& ScCondDateFormatEntry::GetStyleName() const { return maStyleName; } -void ScCondDateFormatEntry::SetStyleName( const rtl::OUString& rStyleName ) +void ScCondDateFormatEntry::SetStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; } @@ -2005,7 +2005,7 @@ void ScConditionalFormat::DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR maRanges.DeleteArea( nCol1, nRow1, nTab, nCol2, nRow2, nTab ); } -void ScConditionalFormat::RenameCellStyle(const rtl::OUString& rOld, const rtl::OUString& rNew) +void ScConditionalFormat::RenameCellStyle(const OUString& rOld, const OUString& rNew) { for(CondFormatContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) if(itr->GetType() == condformat::CONDITION) @@ -2164,7 +2164,7 @@ void ScConditionalFormatList::UpdateReference( UpdateRefMode eUpdateRefMode, } } -void ScConditionalFormatList::RenameCellStyle( const rtl::OUString& rOld, const rtl::OUString& rNew ) +void ScConditionalFormatList::RenameCellStyle( const OUString& rOld, const OUString& rNew ) { for( iterator itr = begin(); itr != end(); ++itr) itr->RenameCellStyle(rOld,rNew); diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 553c38f2aa5d..5228bc1d45f9 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1498,7 +1498,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch() if (pCol->Search( nRow, nLo ) && bFirstStringIgnore && pCol->maItems[nLo].pCell->HasStringData()) { - rtl::OUString aCellStr; + OUString aCellStr; sal_uLong nFormat = pCol->GetNumberFormat( pCol->maItems[nLo].nRow); aCell.assign(*pCol->maItems[nLo].pCell); ScCellFormat::GetInputString(aCell, nFormat, aCellStr, rFormatter); @@ -1631,7 +1631,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch() } else if (bStr && bByString) { - rtl::OUString aCellStr; + OUString aCellStr; sal_uLong nFormat = pCol->GetNumberFormat( pCol->maItems[i].nRow); aCell.assign(*pCol->maItems[i].pCell); ScCellFormat::GetInputString(aCell, nFormat, aCellStr, rFormatter); diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index ea867f97e718..00ce7349d062 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -186,7 +186,7 @@ static SfxItemInfo const aItemInfos[] = ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) - : SfxItemPool ( rtl::OUString("ScDocumentPool"), + : SfxItemPool ( OUString("ScDocumentPool"), ATTR_STARTINDEX, ATTR_ENDINDEX, aItemInfos, NULL, bLoadRefCounts ), pSecondary ( pSecPool ) @@ -282,7 +282,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) ppPoolDefaults[ ATTR_SHADOW - ATTR_STARTINDEX ] = new SvxShadowItem( ATTR_SHADOW ); ppPoolDefaults[ ATTR_VALIDDATA - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALIDDATA, 0 ); ppPoolDefaults[ ATTR_CONDITIONAL - ATTR_STARTINDEX ] = new ScCondFormatItem; - ppPoolDefaults[ ATTR_HYPERLINK - ATTR_STARTINDEX ] = new SfxStringItem( ATTR_HYPERLINK, rtl::OUString() ) ; + ppPoolDefaults[ ATTR_HYPERLINK - ATTR_STARTINDEX ] = new SfxStringItem( ATTR_HYPERLINK, OUString() ) ; // GetRscString funktioniert erst nach ScGlobal::Init, zu erkennen am EmptyBrushItem //! zusaetzliche Methode ScGlobal::IsInit() oder so... @@ -291,7 +291,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts ) ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); else ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, - rtl::OUString(STRING_STANDARD) ); //! without name? + OUString(STRING_STANDARD) ); //! without name? ppPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE ); ppPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE ); diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index ea13837ca181..5ce49e205ab0 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -52,7 +52,7 @@ using namespace formula; // Nach der Regula Falsi Methode bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, SCCOL nVCol, SCROW nVRow, SCTAB nVTab, - const rtl::OUString& sValStr, double& nX) + const OUString& sValStr, double& nX) { bool bRet = false; nX = 0.0; @@ -115,7 +115,7 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, - const rtl::OUString& rFormula, + const OUString& rFormula, const ScTokenArray* pArr, const formula::FormulaGrammar::Grammar eGram, bool bDirtyFlag ) @@ -227,7 +227,7 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera } ScRefAddress aRef; - rtl::OUStringBuffer aForString('='); + OUStringBuffer aForString('='); aForString.append(ScCompiler::GetNativeSymbol(ocTableOp)); aForString.append(ScCompiler::GetNativeSymbol( ocOpen)); @@ -636,7 +636,7 @@ const SfxPoolItem* ScDocument::GetEffItem( ScAddress aPos(nCol, nRow, nTab); ScRefCellValue aCell; aCell.assign(const_cast(*this), aPos); - rtl::OUString aStyle = pForm->GetCellStyle(aCell, aPos); + OUString aStyle = pForm->GetCellStyle(aCell, aPos); if (!aStyle.isEmpty()) { SfxStyleSheetBase* pStyleSheet = xPoolHelper->GetStylePool()->Find( @@ -964,8 +964,8 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) SCTAB nThisTab; // Tabellen mit gleichen Namen vergleichen - rtl::OUString aThisName; - rtl::OUString aOtherName; + OUString aThisName; + OUString aOtherName; for (nThisTab=0; nThisTab& ScDocument::GetBreakIterator() return pScriptTypeData->xBreakIter; } -bool ScDocument::HasStringWeakCharacters( const rtl::OUString& rString ) +bool ScDocument::HasStringWeakCharacters( const OUString& rString ) { if (!rString.isEmpty()) { @@ -78,7 +78,7 @@ bool ScDocument::HasStringWeakCharacters( const rtl::OUString& rString ) return false; // none found } -sal_uInt8 ScDocument::GetStringScriptType( const rtl::OUString& rString ) +sal_uInt8 ScDocument::GetStringScriptType( const OUString& rString ) { sal_uInt8 nRet = 0; diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 5fe23dc5f75a..f8742e0adc0f 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -326,7 +326,7 @@ void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc ) //------------------------------------------------------------------------ -void ScDocument::InvalidateTextWidth( const rtl::OUString& rStyleName ) +void ScDocument::InvalidateTextWidth( const OUString& rStyleName ) { const SCTAB nCount = GetTableCount(); for ( SCTAB i=0; iGetStylePool()->Find( aStyleName, SFX_STYLE_FAMILY_PAGE ); if ( pStyle ) { @@ -1110,13 +1110,13 @@ void ScDocument::UpdateExternalRefLinks(Window* pWin) { // Update failed. Notify the user. - rtl::OUString aFile; + OUString aFile; pLinkManager->GetDisplayNames(pRefLink, NULL, &aFile, NULL, NULL); // Decode encoded URL for display friendliness. INetURLObject aUrl(aFile,INetURLObject::WAS_ENCODED); aFile = aUrl.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(String(ScResId(SCSTR_EXTDOC_NOT_LOADED))); aBuf.appendAscii("\n\n"); aBuf.append(aFile); @@ -1166,11 +1166,11 @@ void ScDocument::UpdateDdeLinks(Window* pWin) else { // Update failed. Notify the user. - rtl::OUString aFile = pDdeLink->GetTopic(); - rtl::OUString aElem = pDdeLink->GetItem(); - rtl::OUString aType = pDdeLink->GetAppl(); + OUString aFile = pDdeLink->GetTopic(); + OUString aElem = pDdeLink->GetItem(); + OUString aType = pDdeLink->GetAppl(); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(String(ScResId(SCSTR_DDEDOC_NOT_LOADED))); aBuf.appendAscii("\n\n"); aBuf.appendAscii("Source : "); @@ -1198,7 +1198,7 @@ void ScDocument::UpdateDdeLinks(Window* pWin) } } -bool ScDocument::UpdateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem ) +bool ScDocument::UpdateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem ) { // fuer refresh() per StarOne Api // ResetValue() fuer einzelnen Link nicht noetig @@ -1215,9 +1215,9 @@ bool ScDocument::UpdateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& if (pBase->ISA(ScDdeLink)) { ScDdeLink* pDdeLink = (ScDdeLink*)pBase; - if ( rtl::OUString(pDdeLink->GetAppl()) == rAppl && - rtl::OUString(pDdeLink->GetTopic()) == rTopic && - rtl::OUString(pDdeLink->GetItem()) == rItem ) + if ( OUString(pDdeLink->GetAppl()) == rAppl && + OUString(pDdeLink->GetTopic()) == rTopic && + OUString(pDdeLink->GetItem()) == rItem ) { pDdeLink->TryUpdate(); bFound = true; // koennen theoretisch mehrere sein (Mode), darum weitersuchen @@ -1296,7 +1296,7 @@ namespace { @return The DDE link, if it exists, otherwise 0. */ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, - const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, + const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, sal_uInt16* pnDdePos = NULL ) { if( pLinkManager ) @@ -1309,9 +1309,9 @@ ScDdeLink* lclGetDdeLink( ::sfx2::SvBaseLink* pLink = *rLinks[ nIndex ]; if( ScDdeLink* pDdeLink = PTR_CAST( ScDdeLink, pLink ) ) { - if( (rtl::OUString(pDdeLink->GetAppl()) == rAppl) && - (rtl::OUString(pDdeLink->GetTopic()) == rTopic) && - (rtl::OUString(pDdeLink->GetItem()) == rItem) && + if( (OUString(pDdeLink->GetAppl()) == rAppl) && + (OUString(pDdeLink->GetTopic()) == rTopic) && + (OUString(pDdeLink->GetItem()) == rItem) && ((nMode == SC_DDE_IGNOREMODE) || (nMode == pDdeLink->GetMode())) ) return pDdeLink; if( pnDdePos ) ++*pnDdePos; @@ -1349,12 +1349,12 @@ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, sal_uInt16 nDde // ---------------------------------------------------------------------------- -bool ScDocument::FindDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos ) +bool ScDocument::FindDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos ) { return lclGetDdeLink( GetLinkManager(), rAppl, rTopic, rItem, nMode, &rnDdePos ) != NULL; } -bool ScDocument::GetDdeLinkData( sal_uInt16 nDdePos, rtl::OUString& rAppl, rtl::OUString& rTopic, rtl::OUString& rItem ) const +bool ScDocument::GetDdeLinkData( sal_uInt16 nDdePos, OUString& rAppl, OUString& rTopic, OUString& rItem ) const { if( const ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos ) ) { @@ -1382,7 +1382,7 @@ const ScMatrix* ScDocument::GetDdeLinkResultMatrix( sal_uInt16 nDdePos ) const return pDdeLink ? pDdeLink->GetResult() : NULL; } -bool ScDocument::CreateDdeLink( const rtl::OUString& rAppl, const rtl::OUString& rTopic, const rtl::OUString& rItem, sal_uInt8 nMode, ScMatrixRef pResults ) +bool ScDocument::CreateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, ScMatrixRef pResults ) { /* Create a DDE link without updating it (i.e. for Excel import), to prevent unwanted connections. First try to find existing link. Set result array @@ -1684,7 +1684,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp } uno::Sequence aOffsets; - rtl::OUString aNewStr = aTranslitarationWrapper.transliterate( aOldStr, nLanguage, 0, nOldLen, &aOffsets ); + OUString aNewStr = aTranslitarationWrapper.transliterate( aOldStr, nLanguage, 0, nOldLen, &aOffsets ); if ( aNewStr != aOldStr ) { diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 54e3a08547cd..0177c783522d 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -124,7 +124,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) if (!pDrawLayer) { - rtl::OUString aName; + OUString aName; if ( pShell && !pShell->IsLoading() ) // don't call GetTitle while loading aName = pShell->GetTitle(); pDrawLayer = new ScDrawLayer( this, aName ); @@ -146,7 +146,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) pDrawLayer->ScAddPage( nTab ); // always add page, with or without the table if (maTabs[nTab]) { - rtl::OUString aTabName; + OUString aTabName; maTabs[nTab]->GetName(aTabName); pDrawLayer->ScRenamePage( nTab, aTabName ); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 81ca67618e2d..fe6d921236df 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -101,7 +101,6 @@ namespace WritingMode2 = ::com::sun::star::text::WritingMode2; using ::com::sun::star::uno::Sequence; using ::com::sun::star::sheet::TablePageBreakData; using ::std::set; -using ::rtl::OUString; // The constant parameters to CopyBlockFromClip struct ScCopyBlockFromClipParams diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 358f826d618f..17ab695c4f28 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -103,18 +103,18 @@ private: ScDocument* mpDoc; }; -rtl::OUString createLabelString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab) +OUString createLabelString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab) { - rtl::OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); + OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); if (aDocStr.isEmpty()) { // Replace an empty label string with column name. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(ScGlobal::GetRscString(STR_COLUMN)); aBuf.append(sal_Unicode(' ')); ScAddress aColAddr(nCol, 0, 0); - rtl::OUString aColStr; + OUString aColStr; aColAddr.Format(aColStr, SCA_VALID_COL, NULL); aBuf.append(aColStr); aDocStr = aBuf.makeStringAndClear(); @@ -126,7 +126,7 @@ void initFromCell( ScDPCache& rCache, ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, ScDPItemData& rData, sal_uLong& rNumFormat) { - rtl::OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); + OUString aDocStr = pDoc->GetString(nCol, nRow, nTab); rNumFormat = 0; ScAddress aPos(nCol, nRow, nTab); @@ -399,7 +399,7 @@ bool ScDPCache::InitFromDataBase(DBConnector& rDB) for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol) { - rtl::OUString aColTitle = rDB.getColumnLabel(nCol); + OUString aColTitle = rDB.getColumnLabel(nCol); AddLabel(aColTitle); } @@ -575,7 +575,7 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam) const } else { - const rtl::OUString& rQueryStr = rEntry.GetQueryItem().maString; + const OUString& rQueryStr = rEntry.GetQueryItem().maString; ::com::sun::star::uno::Sequence< sal_Int32 > xOff; String aCell = pTransliteration->transliterate( aCellStr, ScGlobal::eLnge, 0, aCellStr.Len(), &xOff); @@ -667,7 +667,7 @@ const ScDPCache::GroupItems* ScDPCache::GetGroupItems(long nDim) const return NULL; } -rtl::OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const +OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const { OSL_ENSURE(nDim < maLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName"); OSL_ENSURE(maLabelNames.size() == static_cast (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName"); @@ -677,19 +677,19 @@ rtl::OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const return maLabelNames[nDim+1]; } else - return rtl::OUString(); + return OUString(); } namespace { -typedef boost::unordered_set LabelSet; +typedef boost::unordered_set LabelSet; -class InsertLabel : public std::unary_function +class InsertLabel : public std::unary_function { LabelSet& mrNames; public: InsertLabel(LabelSet& rNames) : mrNames(rNames) {} - void operator() (const rtl::OUString& r) + void operator() (const OUString& r) { mrNames.insert(r); } @@ -727,7 +727,7 @@ void ScDPCache::Clear() maStringPool.clear(); } -void ScDPCache::AddLabel(const rtl::OUString& rLabel) +void ScDPCache::AddLabel(const OUString& rLabel) { if ( maLabelNames.empty() ) @@ -737,7 +737,7 @@ void ScDPCache::AddLabel(const rtl::OUString& rLabel) LabelSet aExistingNames; std::for_each(maLabelNames.begin(), maLabelNames.end(), InsertLabel(aExistingNames)); sal_Int32 nSuffix = 1; - rtl::OUString aNewName = rLabel; + OUString aNewName = rLabel; while (true) { if (!aExistingNames.count(aNewName)) @@ -748,7 +748,7 @@ void ScDPCache::AddLabel(const rtl::OUString& rLabel) } // Name already exists. - rtl::OUStringBuffer aBuf(rLabel); + OUStringBuffer aBuf(rLabel); aBuf.append(++nSuffix); aNewName = aBuf.makeStringAndClear(); } @@ -863,7 +863,7 @@ long ScDPCache::GetDimMemberCount(long nDim) const return maFields[nDim].maItems.size(); } -SCCOL ScDPCache::GetDimensionIndex(const rtl::OUString& sName) const +SCCOL ScDPCache::GetDimensionIndex(const OUString& sName) const { for (size_t i = 1; i < maLabelNames.size(); ++i) { @@ -873,7 +873,7 @@ SCCOL ScDPCache::GetDimensionIndex(const rtl::OUString& sName) const return -1; } -const rtl::OUString* ScDPCache::InternString(const rtl::OUString& rStr) const +const OUString* ScDPCache::InternString(const OUString& rStr) const { StringSetType::iterator it = maStringPool.find(rStr); if (it != maStringPool.end()) @@ -948,7 +948,7 @@ SCROW ScDPCache::GetIdByItemData(long nDim, const ScDPItemData& rItem) const return -1; } -rtl::OUString ScDPCache::GetFormattedString(long nDim, const ScDPItemData& rItem) const +OUString ScDPCache::GetFormattedString(long nDim, const ScDPItemData& rItem) const { if (nDim < 0) return rItem.GetString(); @@ -1156,9 +1156,9 @@ long ScDPCache::GetColumnCount() const namespace { -std::ostream& operator<< (::std::ostream& os, const rtl::OUString& str) +std::ostream& operator<< (::std::ostream& os, const OUString& str) { - return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); + return os << OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); } void dumpItems(const ScDPCache& rCache, long nDim, const ScDPCache::ItemsType& rItems, size_t nOffset) diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index ae36524d2ea1..16f68b841bdb 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -38,12 +38,12 @@ using namespace com::sun::star; // ============================================================================ -ScDPSaveGroupItem::ScDPSaveGroupItem( const rtl::OUString& rName ) : +ScDPSaveGroupItem::ScDPSaveGroupItem( const OUString& rName ) : aGroupName(rName) {} ScDPSaveGroupItem::~ScDPSaveGroupItem() {} -void ScDPSaveGroupItem::AddElement( const rtl::OUString& rName ) +void ScDPSaveGroupItem::AddElement( const OUString& rName ) { aElements.push_back(rName); } @@ -52,14 +52,14 @@ void ScDPSaveGroupItem::AddElementsFromGroup( const ScDPSaveGroupItem& rGroup ) { // add all elements of the other group (used for nested grouping) - for ( std::vector::const_iterator aIter(rGroup.aElements.begin()); + for ( std::vector::const_iterator aIter(rGroup.aElements.begin()); aIter != rGroup.aElements.end(); ++aIter ) aElements.push_back( *aIter ); } -bool ScDPSaveGroupItem::RemoveElement( const rtl::OUString& rName ) +bool ScDPSaveGroupItem::RemoveElement( const OUString& rName ) { - for (std::vector::iterator aIter = aElements.begin(); aIter != aElements.end(); ++aIter) + for (std::vector::iterator aIter = aElements.begin(); aIter != aElements.end(); ++aIter) if (*aIter == rName) //! ignore case { aElements.erase(aIter); // found -> remove @@ -79,12 +79,12 @@ size_t ScDPSaveGroupItem::GetElementCount() const return aElements.size(); } -const rtl::OUString* ScDPSaveGroupItem::GetElementByIndex(size_t nIndex) const +const OUString* ScDPSaveGroupItem::GetElementByIndex(size_t nIndex) const { return (nIndex < aElements.size()) ? &aElements[ nIndex ] : 0; } -void ScDPSaveGroupItem::Rename( const rtl::OUString& rNewName ) +void ScDPSaveGroupItem::Rename( const OUString& rNewName ) { aGroupName = rNewName; } @@ -94,14 +94,14 @@ void ScDPSaveGroupItem::RemoveElementsFromGroups( ScDPSaveGroupDimension& rDimen // remove this group's elements from their groups in rDimension // (rDimension must be a different dimension from the one which contains this) - for ( std::vector::const_iterator aIter(aElements.begin()); aIter != aElements.end(); ++aIter ) + for ( std::vector::const_iterator aIter(aElements.begin()); aIter != aElements.end(); ++aIter ) rDimension.RemoveFromGroups( *aIter ); } void ScDPSaveGroupItem::ConvertElementsToItems(SvNumberFormatter* pFormatter) const { maItems.reserve(aElements.size()); - std::vector::const_iterator it = aElements.begin(), itEnd = aElements.end(); + std::vector::const_iterator it = aElements.begin(), itEnd = aElements.end(); for (; it != itEnd; ++it) { sal_uInt32 nFormat = 0; @@ -133,14 +133,14 @@ void ScDPSaveGroupItem::AddToData(ScDPGroupDimension& rDataDim) const // ============================================================================ -ScDPSaveGroupDimension::ScDPSaveGroupDimension( const rtl::OUString& rSource, const rtl::OUString& rName ) : +ScDPSaveGroupDimension::ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName ) : aSourceDim( rSource ), aGroupDimName( rName ), nDatePart( 0 ) { } -ScDPSaveGroupDimension::ScDPSaveGroupDimension( const rtl::OUString& rSource, const rtl::OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : +ScDPSaveGroupDimension::ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : aSourceDim( rSource ), aGroupDimName( rName ), aDateInfo( rDateInfo ), @@ -163,7 +163,7 @@ void ScDPSaveGroupDimension::AddGroupItem( const ScDPSaveGroupItem& rItem ) aGroups.push_back( rItem ); } -rtl::OUString ScDPSaveGroupDimension::CreateGroupName(const rtl::OUString& rPrefix) +OUString ScDPSaveGroupDimension::CreateGroupName(const OUString& rPrefix) { // create a name for a new group, using "Group1", "Group2" etc. (translated prefix in rPrefix) @@ -191,15 +191,15 @@ rtl::OUString ScDPSaveGroupDimension::CreateGroupName(const rtl::OUString& rPref } OSL_FAIL("CreateGroupName: no valid name found"); - return rtl::OUString(); + return OUString(); } -const ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroup( const rtl::OUString& rGroupName ) const +const ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroup( const OUString& rGroupName ) const { return const_cast< ScDPSaveGroupDimension* >( this )->GetNamedGroupAcc( rGroupName ); } -ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroupAcc( const rtl::OUString& rGroupName ) +ScDPSaveGroupItem* ScDPSaveGroupDimension::GetNamedGroupAcc( const OUString& rGroupName ) { for (ScDPSaveGroupItemVec::iterator aIter = aGroups.begin(); aIter != aGroups.end(); ++aIter) if (aIter->GetGroupName().equals(rGroupName)) //! ignore case @@ -223,7 +223,7 @@ ScDPSaveGroupItem* ScDPSaveGroupDimension::GetGroupAccByIndex( long nIndex ) return &aGroups[nIndex]; } -void ScDPSaveGroupDimension::RemoveFromGroups( const rtl::OUString& rItemName ) +void ScDPSaveGroupDimension::RemoveFromGroups( const OUString& rItemName ) { // if the item is in any group, remove it from the group, // also remove the group if it is empty afterwards @@ -238,7 +238,7 @@ void ScDPSaveGroupDimension::RemoveFromGroups( const rtl::OUString& rItemName ) } } -void ScDPSaveGroupDimension::RemoveGroup(const rtl::OUString& rGroupName) +void ScDPSaveGroupDimension::RemoveGroup(const OUString& rGroupName) { for (ScDPSaveGroupItemVec::iterator aIter = aGroups.begin(); aIter != aGroups.end(); ++aIter) if (aIter->GetGroupName().equals(rGroupName)) //! ignore case @@ -266,7 +266,7 @@ bool ScDPSaveGroupDimension::HasOnlyHidden(const ScDPUniqueStringSet& rVisible) return bAllHidden; } -void ScDPSaveGroupDimension::Rename( const rtl::OUString& rNewName ) +void ScDPSaveGroupDimension::Rename( const OUString& rNewName ) { aGroupDimName = rNewName; } @@ -429,14 +429,14 @@ void ScDPSaveGroupDimension::AddToCache(ScDPCache& rCache) const // ============================================================================ -ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const rtl::OUString& rName, const ScDPNumGroupInfo& rInfo ) : +ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rInfo ) : aDimensionName( rName ), aGroupInfo( rInfo ), nDatePart( 0 ) { } -ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const rtl::OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : +ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ) : aDimensionName( rName ), aDateInfo( rDateInfo ), nDatePart( nPart ) @@ -583,15 +583,15 @@ namespace { struct ScDPSaveGroupDimNameFunc { - rtl::OUString maDimName; - inline explicit ScDPSaveGroupDimNameFunc( const rtl::OUString& rDimName ) : maDimName( rDimName ) {} + OUString maDimName; + inline explicit ScDPSaveGroupDimNameFunc( const OUString& rDimName ) : maDimName( rDimName ) {} inline bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetGroupDimName() == maDimName; } }; struct ScDPSaveGroupSourceNameFunc { - rtl::OUString maSrcDimName; - inline explicit ScDPSaveGroupSourceNameFunc( const rtl::OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {} + OUString maSrcDimName; + inline explicit ScDPSaveGroupSourceNameFunc( const OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {} inline bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetSourceDimName() == maSrcDimName; } }; @@ -630,7 +630,7 @@ void ScDPDimensionSaveData::ReplaceGroupDimension( const ScDPSaveGroupDimension& *aIt = rGroupDim; } -void ScDPDimensionSaveData::RemoveGroupDimension( const rtl::OUString& rGroupDimName ) +void ScDPDimensionSaveData::RemoveGroupDimension( const OUString& rGroupDimName ) { ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( maGroupDims.begin(), maGroupDims.end(), ScDPSaveGroupDimNameFunc( rGroupDimName ) ); @@ -655,7 +655,7 @@ void ScDPDimensionSaveData::ReplaceNumGroupDimension( const ScDPSaveNumGroupDime aIt->second = rGroupDim; } -void ScDPDimensionSaveData::RemoveNumGroupDimension( const rtl::OUString& rGroupDimName ) +void ScDPDimensionSaveData::RemoveNumGroupDimension( const OUString& rGroupDimName ) { maNumGroupDims.erase( rGroupDimName ); } @@ -695,52 +695,52 @@ void ScDPDimensionSaveData::WriteToCache(ScDPCache& rCache) const it->second.AddToCache(rCache); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimForBase( const rtl::OUString& rBaseDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimForBase( const OUString& rBaseDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetGroupDimAccForBase( rBaseDimName ); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDim( const rtl::OUString& rGroupDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDim( const OUString& rGroupDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetNamedGroupDimAcc( rGroupDimName ); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDim( const rtl::OUString& rBaseDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDim( const OUString& rBaseDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetFirstNamedGroupDimAcc( rBaseDimName ); } -const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDim( const rtl::OUString& rGroupDimName ) const +const ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDim( const OUString& rGroupDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetNextNamedGroupDimAcc( rGroupDimName ); } -const ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDim( const rtl::OUString& rGroupDimName ) const +const ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDim( const OUString& rGroupDimName ) const { return const_cast< ScDPDimensionSaveData* >( this )->GetNumGroupDimAcc( rGroupDimName ); } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimAccForBase( const rtl::OUString& rBaseDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetGroupDimAccForBase( const OUString& rBaseDimName ) { ScDPSaveGroupDimension* pGroupDim = GetFirstNamedGroupDimAcc( rBaseDimName ); return pGroupDim ? pGroupDim : GetNextNamedGroupDimAcc( rBaseDimName ); } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDimAcc( const rtl::OUString& rGroupDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNamedGroupDimAcc( const OUString& rGroupDimName ) { ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( maGroupDims.begin(), maGroupDims.end(), ScDPSaveGroupDimNameFunc( rGroupDimName ) ); return (aIt == maGroupDims.end()) ? 0 : &*aIt; } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDimAcc( const rtl::OUString& rBaseDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetFirstNamedGroupDimAcc( const OUString& rBaseDimName ) { ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( maGroupDims.begin(), maGroupDims.end(), ScDPSaveGroupSourceNameFunc( rBaseDimName ) ); return (aIt == maGroupDims.end()) ? 0 : &*aIt; } -ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDimAcc( const rtl::OUString& rGroupDimName ) +ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDimAcc( const OUString& rGroupDimName ) { // find the group dimension with the passed name ScDPSaveGroupDimVec::iterator aIt = ::std::find_if( @@ -751,7 +751,7 @@ ScDPSaveGroupDimension* ScDPDimensionSaveData::GetNextNamedGroupDimAcc( const rt return (aIt == maGroupDims.end()) ? 0 : &*aIt; } -ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDimAcc( const rtl::OUString& rGroupDimName ) +ScDPSaveNumGroupDimension* ScDPDimensionSaveData::GetNumGroupDimAcc( const OUString& rGroupDimName ) { ScDPSaveNumGroupDimMap::iterator aIt = maNumGroupDims.find( rGroupDimName ); return (aIt == maNumGroupDims.end()) ? 0 : &aIt->second; @@ -762,7 +762,7 @@ bool ScDPDimensionSaveData::HasGroupDimensions() const return !maGroupDims.empty() || !maNumGroupDims.empty(); } -sal_Int32 ScDPDimensionSaveData::CollectDateParts( const rtl::OUString& rBaseDimName ) const +sal_Int32 ScDPDimensionSaveData::CollectDateParts( const OUString& rBaseDimName ) const { sal_Int32 nParts = 0; // start with part of numeric group @@ -775,9 +775,9 @@ sal_Int32 ScDPDimensionSaveData::CollectDateParts( const rtl::OUString& rBaseDim return nParts; } -rtl::OUString ScDPDimensionSaveData::CreateGroupDimName( - const rtl::OUString& rSourceName, const ScDPObject& rObject, bool bAllowSource, - const std::vector* pDeletedNames ) +OUString ScDPDimensionSaveData::CreateGroupDimName( + const OUString& rSourceName, const ScDPObject& rObject, bool bAllowSource, + const std::vector* pDeletedNames ) { // create a name for the new dimension by appending a number to the original // dimension's name @@ -788,7 +788,7 @@ rtl::OUString ScDPDimensionSaveData::CreateGroupDimName( const sal_Int32 nMaxAdd = 1000; // limit the loop while ( nAdd <= nMaxAdd ) { - rtl::OUString aDimName( rSourceName ); + OUString aDimName( rSourceName ); if ( !bUseSource ) aDimName += OUString::number(nAdd); bool bExists = false; @@ -819,7 +819,7 @@ rtl::OUString ScDPDimensionSaveData::CreateGroupDimName( ++nAdd; // continue with higher number } OSL_FAIL("CreateGroupDimName: no valid name found"); - return rtl::OUString(); + return OUString(); } namespace @@ -836,12 +836,12 @@ namespace }; } -rtl::OUString ScDPDimensionSaveData::CreateDateGroupDimName( +OUString ScDPDimensionSaveData::CreateDateGroupDimName( sal_Int32 nDatePart, const ScDPObject& rObject, bool bAllowSource, - const std::vector* pDeletedNames ) + const std::vector* pDeletedNames ) { using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy; - rtl::OUString aPartName; + OUString aPartName; switch( nDatePart ) { case SECONDS: aPartName = ScGlobal::GetRscString( nDatePartIds[0] ); break; diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 64381e07ea78..47adbbeb9316 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::std::vector; using ::std::pair; using ::std::auto_ptr; @@ -291,7 +290,7 @@ void ScDPFilteredCache::getValue( ScDPValue& rVal, SCCOL nCol, SCROW nRow, bool rVal.Set(0.0, ScDPValue::Empty); } -rtl::OUString ScDPFilteredCache::getFieldName(SCCOL nIndex) const +OUString ScDPFilteredCache::getFieldName(SCCOL nIndex) const { return mrCache.GetDimensionName(nIndex); } diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index a7a216bd622a..bc2e132acb3c 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -44,8 +44,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::rtl::OUString; -using ::rtl::OUStringHash; using ::std::vector; using ::boost::shared_ptr; @@ -492,7 +490,7 @@ void ScDPGroupTableData::SetNumGroupDimension( long nIndex, const ScDPNumGroupDi } } -long ScDPGroupTableData::GetDimensionIndex( const rtl::OUString& rName ) +long ScDPGroupTableData::GetDimensionIndex( const OUString& rName ) { for (long i = 0; i < nSourceCount; ++i) // nSourceCount excludes data layout if (pSourceData->getDimensionName(i).equals(rName)) //! ignore case? @@ -548,7 +546,7 @@ const ScDPItemData* ScDPGroupTableData::GetMemberById( long nDim, long nId ) return pSourceData->GetMemberById( nDim, nId ); } -rtl::OUString ScDPGroupTableData::getDimensionName(long nColumn) +OUString ScDPGroupTableData::getDimensionName(long nColumn) { if ( nColumn >= nSourceCount ) { diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx index a2d7bb74fb1e..a91476522699 100644 --- a/sc/source/core/data/dpitemdata.cxx +++ b/sc/source/core/data/dpitemdata.cxx @@ -83,7 +83,7 @@ ScDPItemData::ScDPItemData(const ScDPItemData& r) : { case String: case Error: - mpString = mbStringInterned ? r.mpString : new rtl::OUString(*r.mpString); + mpString = mbStringInterned ? r.mpString : new OUString(*r.mpString); break; case Value: case RangeStart: @@ -110,8 +110,8 @@ void ScDPItemData::DisposeString() mbStringInterned = false; } -ScDPItemData::ScDPItemData(const rtl::OUString& rStr) : - mpString(new rtl::OUString(rStr)), meType(String), mbStringInterned(false) {} +ScDPItemData::ScDPItemData(const OUString& rStr) : + mpString(new OUString(rStr)), meType(String), mbStringInterned(false) {} ScDPItemData::ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue) : meType(GroupValue), mbStringInterned(false) @@ -136,14 +136,14 @@ void ScDPItemData::SetEmpty() meType = Empty; } -void ScDPItemData::SetString(const rtl::OUString& rS) +void ScDPItemData::SetString(const OUString& rS) { DisposeString(); - mpString = new rtl::OUString(rS); + mpString = new OUString(rS); meType = String; } -void ScDPItemData::SetString(const rtl::OUString* pS) +void ScDPItemData::SetString(const OUString* pS) { DisposeString(); mpString = pS; @@ -179,7 +179,7 @@ void ScDPItemData::SetRangeLast() meType = RangeStart; } -void ScDPItemData::SetErrorString(const rtl::OUString* pS) +void ScDPItemData::SetErrorString(const OUString* pS) { SetString(pS); meType = Error; @@ -249,7 +249,7 @@ ScDPItemData& ScDPItemData::operator= (const ScDPItemData& r) { case String: case Error: - mpString = r.mbStringInterned ? r.mpString : new rtl::OUString(*r.mpString); + mpString = r.mbStringInterned ? r.mpString : new OUString(*r.mpString); mbStringInterned = r.mbStringInterned; break; case Value: @@ -296,7 +296,7 @@ void ScDPItemData::Dump(const char* msg) const break; case Error: printf("error: %s\n", - rtl::OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); break; case GroupValue: printf("group value: group type = %d value = %d\n", @@ -304,7 +304,7 @@ void ScDPItemData::Dump(const char* msg) const break; case String: printf("string: %s\n", - rtl::OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(*mpString, RTL_TEXTENCODING_UTF8).getStr()); break; case Value: printf("value: %g\n", mfValue); @@ -329,7 +329,7 @@ bool ScDPItemData::IsValue() const return meType == Value; } -rtl::OUString ScDPItemData::GetString() const +OUString ScDPItemData::GetString() const { switch (meType) { @@ -337,16 +337,16 @@ rtl::OUString ScDPItemData::GetString() const case Error: return *mpString; case Value: - return rtl::OUString::valueOf(mfValue); + return OUString::valueOf(mfValue); case GroupValue: case RangeStart: - return rtl::OUString::createFromAscii("fail"); + return OUString::createFromAscii("fail"); case Empty: default: ; } - return rtl::OUString(); + return OUString(); } double ScDPItemData::GetValue() const diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index c31a4149c97f..c8f3fffbe923 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -91,7 +91,6 @@ using ::com::sun::star::sheet::DataPilotTableHeaderData; using ::com::sun::star::sheet::DataPilotTablePositionData; using ::com::sun::star::sheet::XDimensionsSupplier; using ::com::sun::star::beans::XPropertySet; -using ::rtl::OUString; #define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 645e7b52e7bd..3cd83694a7f7 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -66,7 +66,6 @@ using ::com::sun::star::sheet::DataPilotTablePositionData; using ::com::sun::star::sheet::DataPilotTableResultData; using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Any; -using ::rtl::OUString; #define SC_DP_FRAME_INNER_BOLD 20 #define SC_DP_FRAME_OUTER_BOLD 40 @@ -83,8 +82,8 @@ struct ScDPOutLevelData long nDimPos; sal_uInt32 mnSrcNumFmt; /// Prevailing number format used in the source data. uno::Sequence aResult; - rtl::OUString maName; /// Name is the internal field name. - rtl::OUString maCaption; /// Caption is the name visible in the output table. + OUString maName; /// Name is the internal field name. + OUString maCaption; /// Caption is the name visible in the output table. bool mbHasHiddenMember:1; bool mbDataLayout:1; bool mbPageDim:1; @@ -287,7 +286,7 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab, return; } - rtl::OUString aStyleName = ScGlobal::GetRscString( nStrId ); + OUString aStyleName = ScGlobal::GetRscString( nStrId ); ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool(); ScStyleSheet* pStyle = (ScStyleSheet*) pStlPool->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); if (!pStyle) @@ -346,7 +345,7 @@ void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, // get names/formats for all data dimensions //! merge this with the loop to collect ScDPOutLevelData? - rtl::OUString aDataNames[SC_DPOUT_MAXLEVELS]; + OUString aDataNames[SC_DPOUT_MAXLEVELS]; sal_uInt32 nDataFormats[SC_DPOUT_MAXLEVELS]; long nDataCount = 0; long nDimCount = xDims->getCount(); @@ -360,14 +359,14 @@ void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, { sheet::DataPilotFieldOrientation eDimOrient = (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION), + xDimProp, OUString(SC_UNO_DP_ORIENTATION), sheet::DataPilotFieldOrientation_HIDDEN ); if ( eDimOrient == sheet::DataPilotFieldOrientation_DATA ) { aDataNames[nDataCount] = xDimName->getName(); long nFormat = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(SC_UNONAME_NUMFMT) ); + OUString(SC_UNONAME_NUMFMT) ); nDataFormats[nDataCount] = nFormat; ++nDataCount; } @@ -379,7 +378,7 @@ void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, const sheet::MemberResult* pArray = aResult.getConstArray(); - rtl::OUString aName; + OUString aName; sal_uInt32* pNumFmt = new sal_uInt32[nSize]; if (nDataCount == 1) { @@ -424,13 +423,13 @@ sal_uInt32 lcl_GetFirstNumberFormat( const uno::ReferencegetHierarchies() ); long nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(SC_UNO_DP_USEDHIERARCHY) ); + OUString(SC_UNO_DP_USEDHIERARCHY) ); if ( nHierarchy >= xHiers->getCount() ) nHierarchy = 0; @@ -595,7 +594,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::ReferencegetName(); + OUString aName = xLevNam->getName(); Reference xPropSet(xLevel, UNO_QUERY); // Caption equals the field name by default. // #i108948# use ScUnoHelpFunctions::GetStringProperty, because @@ -706,8 +705,8 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::ReferencegetPropertyValue( - rtl::OUString(SC_UNO_DP_DATADESC) ); - rtl::OUString aUStr; + OUString(SC_UNO_DP_DATADESC) ); + OUString aUStr; aAny >>= aUStr; aDataDescription = aUStr; } @@ -1235,7 +1234,7 @@ bool ScDPOutput::GetHeaderLayout() const namespace { void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, sal_Int32& rDataLayoutIndex, - std::vector& rDataNames, std::vector& rGivenNames, + std::vector& rDataNames, std::vector& rGivenNames, sheet::DataPilotFieldOrientation& rDataOrient, const uno::Reference& xSource ) { @@ -1246,12 +1245,12 @@ void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, s uno::Reference xSrcProp( xSource, uno::UNO_QUERY ); bool bColGrand = ScUnoHelpFunctions::GetBoolProperty( - xSrcProp, rtl::OUString(SC_UNO_DP_COLGRAND)); + xSrcProp, OUString(SC_UNO_DP_COLGRAND)); if ( bColGrand ) rGrandTotalCols = 1; // default if data layout not in columns bool bRowGrand = ScUnoHelpFunctions::GetBoolProperty( - xSrcProp, rtl::OUString(SC_UNO_DP_ROWGRAND)); + xSrcProp, OUString(SC_UNO_DP_ROWGRAND)); if ( bRowGrand ) rGrandTotalRows = 1; // default if data layout not in rows @@ -1272,18 +1271,18 @@ void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, s { sheet::DataPilotFieldOrientation eDimOrient = (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_ORIENTATION), + xDimProp, OUString(SC_UNO_DP_ORIENTATION), sheet::DataPilotFieldOrientation_HIDDEN ); if ( ScUnoHelpFunctions::GetBoolProperty( xDimProp, - rtl::OUString(SC_UNO_DP_ISDATALAYOUT) ) ) + OUString(SC_UNO_DP_ISDATALAYOUT) ) ) { rDataLayoutIndex = nDim; rDataOrient = eDimOrient; } if ( eDimOrient == sheet::DataPilotFieldOrientation_DATA ) { - rtl::OUString aSourceName; - rtl::OUString aGivenName; + OUString aSourceName; + OUString aGivenName; ScDPOutput::GetDataDimensionNames( aSourceName, aGivenName, xDim ); try { @@ -1350,7 +1349,7 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa if (xPropSet.is()) { sal_Int32 nDataFieldCount = ScUnoHelpFunctions::GetLongProperty( xPropSet, - rtl::OUString(SC_UNO_DP_DATAFIELDCOUNT) ); + OUString(SC_UNO_DP_DATAFIELDCOUNT) ); if (nDataFieldCount > 0) aResData.DataFieldIndex = (nRow - nDataStartRow) % nDataFieldCount; } @@ -1432,7 +1431,7 @@ bool ScDPOutput::GetDataResultPositionData(vector& return false; sal_Int32 nDataFieldCount = ScUnoHelpFunctions::GetLongProperty( xPropSet, - rtl::OUString(SC_UNO_DP_DATAFIELDCOUNT) ); + OUString(SC_UNO_DP_DATAFIELDCOUNT) ); if (nDataFieldCount == 0) // No data field is present in this datapilot table. return false; @@ -1441,8 +1440,8 @@ bool ScDPOutput::GetDataResultPositionData(vector& sal_Int32 nGrandTotalCols; sal_Int32 nGrandTotalRows; sal_Int32 nDataLayoutIndex; - std::vector aDataNames; - std::vector aGivenNames; + std::vector aDataNames; + std::vector aGivenNames; sheet::DataPilotFieldOrientation eDataOrient; lcl_GetTableVars( nGrandTotalCols, nGrandTotalRows, nDataLayoutIndex, aDataNames, aGivenNames, eDataOrient, xSource ); @@ -1521,7 +1520,7 @@ namespace { // helper functions for ScDPOutput::GetPivotData // -bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const rtl::OUString& rSourceName, const rtl::OUString& rGivenName ) +bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const OUString& rSourceName, const OUString& rGivenName ) { // match one of the names, ignoring case return ScGlobal::GetpTransliteration()->isEqual( rTarget.maFieldName, rSourceName ) || @@ -1614,7 +1613,7 @@ uno::Sequence lcl_GetSubTotals( { try { - uno::Any aValue = xLevelProp->getPropertyValue( rtl::OUString(SC_UNO_DP_SUBTOTAL) ); + uno::Any aValue = xLevelProp->getPropertyValue( OUString(SC_UNO_DP_SUBTOTAL) ); aValue >>= aSubTotals; } catch(const uno::Exception&) @@ -1631,7 +1630,7 @@ void lcl_FilterInclude( std::vector& rResult, std::vector< sal_Int32 >& rS std::vector& rFilterUsed, bool& rBeforeDataLayout, sal_Int32 nGrandTotals, sal_Int32 nDataLayoutIndex, - const std::vector& rDataNames, const std::vector& rGivenNames, + const std::vector& rDataNames, const std::vector& rGivenNames, const ScDPGetPivotDataField& rTarget, const uno::Reference& xSource ) { // returns true if a filter was given for the field @@ -1699,8 +1698,8 @@ void lcl_FilterInclude( std::vector& rResult, std::vector< sal_Int32 >& rS // grand total is always automatic sal_Int32 nDataPos = j - ( nSize - nGrandTotals ); OSL_ENSURE( nDataPos < (sal_Int32)rDataNames.size(), "wrong data count" ); - rtl::OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names - rtl::OUString aGivenName( rGivenNames[nDataPos] ); + OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names + OUString aGivenName( rGivenNames[nDataPos] ); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aGivenName ); } @@ -1735,8 +1734,8 @@ void lcl_FilterInclude( std::vector& rResult, std::vector< sal_Int32 >& rS sal_Int32 nFuncPos = nSubTotalCount / nDataCount; // outer order: subtotal functions sal_Int32 nDataPos = nSubTotalCount % nDataCount; // inner order: data fields - rtl::OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names - rtl::OUString aGivenName( rGivenNames[nDataPos] ); + OUString aSourceName( rDataNames[nDataPos] ); // vector contains source names + OUString aGivenName( rGivenNames[nDataPos] ); OSL_ENSURE( nFuncPos < aSubTotals.getLength(), "wrong subtotal count" ); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aGivenName ) && @@ -1755,8 +1754,8 @@ void lcl_FilterInclude( std::vector& rResult, std::vector< sal_Int32 >& rS if ( rBeforeDataLayout ) { OSL_ENSURE( nSubTotalCount < (sal_Int32)rDataNames.size(), "wrong data count" ); - rtl::OUString aSourceName( rDataNames[nSubTotalCount] ); // vector contains source names - rtl::OUString aGivenName( rGivenNames[nSubTotalCount] ); + OUString aSourceName( rDataNames[nSubTotalCount] ); // vector contains source names + OUString aGivenName( rGivenNames[nSubTotalCount] ); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aGivenName ); } @@ -1780,7 +1779,7 @@ void lcl_FilterInclude( std::vector& rResult, std::vector< sal_Int32 >& rS { // Asterisks are added in ScDPSaveData::WriteToSource to create unique names. //! preserve original name there? - rtl::OUString aSourceName = ScDPUtil::getSourceDimensionName(aResultEntry.Name); + OUString aSourceName = ScDPUtil::getSourceDimensionName(aResultEntry.Name); rResult[j] = lcl_IsNamedDataField( rTarget, aSourceName, aResultEntry.Caption); @@ -1819,7 +1818,7 @@ void lcl_StripSubTotals( std::vector& rResult, const std::vector& xDim ) + OUString& rSourceName, OUString& rGivenName, const uno::Reference& xDim ) { uno::Reference xDimProp( xDim, uno::UNO_QUERY ); uno::Reference xDimName( xDim, uno::UNO_QUERY ); @@ -1868,7 +1867,7 @@ void ScDPOutput::GetDataDimensionNames( //! Should use a stored name when available sheet::GeneralFunction eFunc = (sheet::GeneralFunction)ScUnoHelpFunctions::GetEnumProperty( - xDimProp, rtl::OUString(SC_UNO_DP_FUNCTION), + xDimProp, OUString(SC_UNO_DP_FUNCTION), sheet::GeneralFunction_NONE ); rGivenName = lcl_GetDataFieldName( rSourceName, eFunc ); } @@ -1883,8 +1882,8 @@ bool ScDPOutput::GetPivotData( ScDPGetPivotDataField& rTarget, sal_Int32 nGrandTotalCols; sal_Int32 nGrandTotalRows; sal_Int32 nDataLayoutIndex; - std::vector aDataNames; - std::vector aGivenNames; + std::vector aDataNames; + std::vector aGivenNames; sheet::DataPilotFieldOrientation eDataOrient; lcl_GetTableVars( nGrandTotalCols, nGrandTotalRows, nDataLayoutIndex, aDataNames, aGivenNames, eDataOrient, xSource ); diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index bef099b008c7..28d609b5d16c 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -53,9 +53,6 @@ using namespace com::sun::star; using namespace com::sun::star::sheet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringHash; using ::std::auto_ptr; #define SC_DPSAVEMODE_DONTKNOW 2 diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index bb0e9b541e85..9f50a68e4f29 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -86,7 +86,7 @@ long ScDatabaseDPData::GetColumnCount() } -rtl::OUString ScDatabaseDPData::getDimensionName(long nColumn) +OUString ScDatabaseDPData::getDimensionName(long nColumn) { if (getIsDataLayoutDimension(nColumn)) { diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index f1cf22735dcd..f4a80b2f3941 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::std::vector; // ----------------------------------------------------------------------- @@ -82,7 +81,7 @@ long ScSheetDPData::GetColumnCount() return aCacheTable.getColSize(); } -rtl::OUString ScSheetDPData::getDimensionName(long nColumn) +OUString ScSheetDPData::getDimensionName(long nColumn) { CreateCacheTable(); if (getIsDataLayoutDimension(nColumn)) @@ -94,7 +93,7 @@ rtl::OUString ScSheetDPData::getDimensionName(long nColumn) else if (nColumn >= aCacheTable.getColSize()) { OSL_FAIL("getDimensionName: invalid dimension"); - return rtl::OUString(); + return OUString(); } else { diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index c92c23f964fb..fdd5b5ab7de8 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -59,7 +59,7 @@ ScDPTableData::~ScDPTableData() { } -rtl::OUString ScDPTableData::GetFormattedString(long nDim, const ScDPItemData& rItem) const +OUString ScDPTableData::GetFormattedString(long nDim, const ScDPItemData& rItem) const { const ScDPCache* pCache = GetCacheTable().getCache(); return pCache->GetFormattedString(nDim, rItem); diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 0f693105f85b..322dc5ff450d 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star; using ::std::vector; using ::std::pair; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // ----------------------------------------------------------------------- @@ -810,7 +809,7 @@ sal_uInt16 ScDPResultData::GetMeasureRefOrient(long nMeasure) const return maMeasureRefOrients[nMeasure]; } -rtl::OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const +OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const { // with bForce==true, return function instead of "result" for single measure // with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc @@ -835,7 +834,7 @@ rtl::OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSub if (pLayoutName) return *pLayoutName; } - rtl::OUStringBuffer aRet; + OUStringBuffer aRet; ScSubTotalFunc eFunc = ( eForceFunc == SUBTOTAL_FUNC_NONE ) ? GetMeasureFunction(nMeasure) : eForceFunc; sal_uInt16 nId = nFuncStrIds[eFunc]; @@ -850,12 +849,12 @@ rtl::OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSub } } -rtl::OUString ScDPResultData::GetMeasureDimensionName(long nMeasure) const +OUString ScDPResultData::GetMeasureDimensionName(long nMeasure) const { if ( nMeasure < 0 ) { OSL_FAIL("GetMeasureDimensionName: negative"); - return rtl::OUString::createFromAscii("***"); + return OUString::createFromAscii("***"); } return mrSource.GetDataDimName(nMeasure); @@ -1742,7 +1741,7 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, #if DEBUG_PIVOT_TABLE void ScDPResultMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - lcl_DumpRow( rtl::OUString("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); + lcl_DumpRow( OUString("ScDPResultMember"), GetName(), NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); if (pDataRoot) @@ -2599,7 +2598,7 @@ void ScDPDataMember::UpdateRunningTotals( #if DEBUG_PIVOT_TABLE void ScDPDataMember::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - lcl_DumpRow( rtl::OUString("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); + lcl_DumpRow( OUString("ScDPDataMember"), GetName(), &aAggregate, pDoc, rPos ); SCROW nStartRow = rPos.Row(); const ScDPDataDimension* pDataChild = GetChildDimension(); @@ -2964,9 +2963,9 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const if ( NULL != pMember ) return pMember->IsValidEntry( aMembers ); #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer strTemp(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer strTemp(RTL_CONSTASCII_STRINGPARAM( "IsValidEntry: Member not found, DimName = ")); - strTemp.append(rtl::OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8)); + strTemp.append(OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8)); OSL_TRACE("%s", strTemp.getStr()); #endif return false; @@ -3424,8 +3423,8 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember( #if DEBUG_PIVOT_TABLE void ScDPResultDimension::DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const { - rtl::OUString aDimName = bIsDataLayout ? rtl::OUString("(data layout)") : rtl::OUString(GetName()); - lcl_DumpRow( rtl::OUString("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); + OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString(GetName()); + lcl_DumpRow( OUString("ScDPResultDimension"), aDimName, NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); @@ -3798,8 +3797,8 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim, #if DEBUG_PIVOT_TABLE void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const { - rtl::OUString aDimName = bIsDataLayout ? rtl::OUString("(data layout)") : rtl::OUString("(unknown)"); - lcl_DumpRow( rtl::OUString("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); + OUString aDimName = bIsDataLayout ? OUString("(data layout)") : OUString("(unknown)"); + lcl_DumpRow( OUString("ScDPDataDimension"), aDimName, NULL, pDoc, rPos ); SCROW nStartRow = rPos.Row(); diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 91dcacc363e2..dddbeabf6663 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -66,7 +66,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index dc78e3b687ca..a842d7de20b1 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -48,7 +48,7 @@ namespace { const sal_uInt16 SC_DP_LEAPYEAR = 1648; // arbitrary leap year for date calculations -rtl::OUString getTwoDigitString(sal_Int32 nValue) +OUString getTwoDigitString(sal_Int32 nValue) { OUString aRet = OUString::number( nValue ); if ( aRet.getLength() < 2 ) @@ -56,17 +56,17 @@ rtl::OUString getTwoDigitString(sal_Int32 nValue) return aRet; } -void appendDateStr(rtl::OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter) +void appendDateStr(OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter) { sal_uLong nFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATE, ScGlobal::eLnge ); - rtl::OUString aString; + OUString aString; pFormatter->GetInputLineString(fValue, nFormat, aString); rBuffer.append(aString); } -rtl::OUString getSpecialDateName(double fValue, bool bFirst, SvNumberFormatter* pFormatter) +OUString getSpecialDateName(double fValue, bool bFirst, SvNumberFormatter* pFormatter) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append(sal_Unicode(bFirst ? '<' : '>')); appendDateStr(aBuffer, fValue, pFormatter); return aBuffer.makeStringAndClear(); @@ -74,7 +74,7 @@ rtl::OUString getSpecialDateName(double fValue, bool bFirst, SvNumberFormatter* } -bool ScDPUtil::isDuplicateDimension(const rtl::OUString& rName) +bool ScDPUtil::isDuplicateDimension(const OUString& rName) { if (rName.isEmpty()) return false; @@ -83,24 +83,24 @@ bool ScDPUtil::isDuplicateDimension(const rtl::OUString& rName) return cLast == sal_Unicode('*'); } -rtl::OUString ScDPUtil::getSourceDimensionName(const rtl::OUString& rName) +OUString ScDPUtil::getSourceDimensionName(const OUString& rName) { return comphelper::string::stripEnd(rName, '*'); } -rtl::OUString ScDPUtil::createDuplicateDimensionName(const rtl::OUString& rOriginal, size_t nDupCount) +OUString ScDPUtil::createDuplicateDimensionName(const OUString& rOriginal, size_t nDupCount) { if (!nDupCount) return rOriginal; - rtl::OUStringBuffer aBuf(rOriginal); + OUStringBuffer aBuf(rOriginal); for (size_t i = 0; i < nDupCount; ++i) aBuf.append(sal_Unicode('*')); return aBuf.makeStringAndClear(); } -rtl::OUString ScDPUtil::getDateGroupName( +OUString ScDPUtil::getDateGroupName( sal_Int32 nDatePart, sal_Int32 nValue, SvNumberFormatter* pFormatter, double fStart, double fEnd) { @@ -112,7 +112,7 @@ rtl::OUString ScDPUtil::getDateGroupName( switch ( nDatePart ) { case sheet::DataPilotFieldGroupBy::YEARS: - return rtl::OUString::valueOf(nValue); + return OUString::valueOf(nValue); case sheet::DataPilotFieldGroupBy::QUARTERS: return ScGlobal::pLocaleData->getQuarterAbbreviation(sal_Int16(nValue-1)); // nValue is 1-based case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS: @@ -140,7 +140,7 @@ rtl::OUString ScDPUtil::getDateGroupName( case sheet::DataPilotFieldGroupBy::MINUTES: case sheet::DataPilotFieldGroupBy::SECONDS: { - rtl::OUStringBuffer aBuf(ScGlobal::pLocaleData->getTimeSep()); + OUStringBuffer aBuf(ScGlobal::pLocaleData->getTimeSep()); aBuf.append(getTwoDigitString(nValue)); return aBuf.makeStringAndClear(); } @@ -149,7 +149,7 @@ rtl::OUString ScDPUtil::getDateGroupName( OSL_FAIL("invalid date part"); } - return rtl::OUString::createFromAscii("FIXME: unhandled value"); + return OUString::createFromAscii("FIXME: unhandled value"); } double ScDPUtil::getNumGroupStartValue(double fValue, const ScDPNumGroupInfo& rInfo) @@ -195,20 +195,20 @@ double ScDPUtil::getNumGroupStartValue(double fValue, const ScDPNumGroupInfo& rI namespace { -void lcl_AppendDateStr( rtl::OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter ) +void lcl_AppendDateStr( OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter ) { sal_uLong nFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATE, ScGlobal::eLnge ); - rtl::OUString aString; + OUString aString; pFormatter->GetInputLineString( fValue, nFormat, aString ); rBuffer.append( aString ); } -rtl::OUString lcl_GetSpecialNumGroupName( double fValue, bool bFirst, sal_Unicode cDecSeparator, +OUString lcl_GetSpecialNumGroupName( double fValue, bool bFirst, sal_Unicode cDecSeparator, bool bDateValues, SvNumberFormatter* pFormatter ) { OSL_ENSURE( cDecSeparator != 0, "cDecSeparator not initialized" ); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append((sal_Unicode)( bFirst ? '<' : '>' )); if ( bDateValues ) lcl_AppendDateStr( aBuffer, fValue, pFormatter ); @@ -218,7 +218,7 @@ rtl::OUString lcl_GetSpecialNumGroupName( double fValue, bool bFirst, sal_Unicod return aBuffer.makeStringAndClear(); } -rtl::OUString lcl_GetNumGroupName( +OUString lcl_GetNumGroupName( double fStartValue, const ScDPNumGroupInfo& rInfo, sal_Unicode cDecSep, SvNumberFormatter* pFormatter) { @@ -244,7 +244,7 @@ rtl::OUString lcl_GetNumGroupName( fEndValue = rInfo.mfEnd; } - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if ( rInfo.mbDateValues ) { lcl_AppendDateStr( aBuffer, fStartValue, pFormatter ); @@ -265,7 +265,7 @@ rtl::OUString lcl_GetNumGroupName( } -rtl::OUString ScDPUtil::getNumGroupName( +OUString ScDPUtil::getNumGroupName( double fValue, const ScDPNumGroupInfo& rInfo, sal_Unicode cDecSep, SvNumberFormatter* pFormatter) { if ( fValue < rInfo.mfStart && !rtl::math::approxEqual( fValue, rInfo.mfStart ) ) diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 897e93a601f5..97dea58f6725 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -242,11 +242,11 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : rPool.FreezeIdRanges(); // the pool is also used directly SdrLayerAdmin& rAdmin = GetLayerAdmin(); - rAdmin.NewLayer(rtl::OUString("vorne"), SC_LAYER_FRONT); - rAdmin.NewLayer(rtl::OUString("hinten"), SC_LAYER_BACK); - rAdmin.NewLayer(rtl::OUString("intern"), SC_LAYER_INTERN); - rAdmin.NewLayer(rtl::OUString("Controls"), SC_LAYER_CONTROLS); - rAdmin.NewLayer(rtl::OUString("hidden"), SC_LAYER_HIDDEN); + rAdmin.NewLayer(OUString("vorne"), SC_LAYER_FRONT); + rAdmin.NewLayer(OUString("hinten"), SC_LAYER_BACK); + rAdmin.NewLayer(OUString("intern"), SC_LAYER_INTERN); + rAdmin.NewLayer(OUString("Controls"), SC_LAYER_CONTROLS); + rAdmin.NewLayer(OUString("hidden"), SC_LAYER_HIDDEN); // "Controls" is new - must also be created when loading // Link fuer URL-Fields setzen @@ -1407,13 +1407,13 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const //#i110034# charts need correct sheet names for xml range conversion during load //so the target sheet name is temporarily renamed (if we have any SdrObjects) - rtl::OUString aDestTabName; + OUString aDestTabName; sal_Bool bRestoreDestTabName = false; if( pOldObject && !bSameDoc && !bDestClip ) { if( pDoc && pClipDoc ) { - rtl::OUString aSourceTabName; + OUString aSourceTabName; if( pClipDoc->GetName( nSourceTab, aSourceTabName ) && pDoc->GetName( nDestTab, aDestTabName ) ) { diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index f6bf3a1c69d8..7bd078575775 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -275,7 +275,7 @@ void adjustRangeName(ScToken* pToken, ScDocument& rNewDoc, const ScDocument* pOl { bool bOldGlobal = pToken->IsGlobal(); SCTAB aOldTab = aOldPos.Tab(); - rtl::OUString aRangeName; + OUString aRangeName; int nOldIndex = pToken->GetIndex(); ScRangeData* pOldRangeData = NULL; @@ -354,7 +354,7 @@ void adjustDBRange(ScToken* pToken, ScDocument& rNewDoc, const ScDocument* pOldD ScDBData* pDBData = aOldNamedDBs.findByIndex(pToken->GetIndex()); if (!pDBData) return; //invalid index - rtl::OUString aDBName = pDBData->GetUpperName(); + OUString aDBName = pDBData->GetUpperName(); //search in new document ScDBCollection* pNewDBCollection = rNewDoc.GetDBCollection(); @@ -386,7 +386,7 @@ ScFormulaCellGroup::~ScFormulaCellGroup() // ============================================================================ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, - const rtl::OUString& rFormula, + const OUString& rFormula, const FormulaGrammar::Grammar eGrammar, sal_uInt8 cMatInd ) : ScBaseCell( CELLTYPE_FORMULA ), @@ -615,12 +615,12 @@ ScFormulaVectorState ScFormulaCell::GetVectorState() const return pCode->GetVectorState(); } -void ScFormulaCell::GetFormula( rtl::OUStringBuffer& rBuffer, +void ScFormulaCell::GetFormula( OUStringBuffer& rBuffer, const FormulaGrammar::Grammar eGrammar ) const { if( pCode->GetCodeError() && !pCode->GetLen() ) { - rBuffer = rtl::OUStringBuffer( ScGlobal::GetErrorString( pCode->GetCodeError())); + rBuffer = OUStringBuffer( ScGlobal::GetErrorString( pCode->GetCodeError())); return; } else if( cMatrixFlag == MM_REFERENCE ) @@ -675,9 +675,9 @@ void ScFormulaCell::GetFormula( rtl::OUStringBuffer& rBuffer, } } -void ScFormulaCell::GetFormula( rtl::OUString& rFormula, const FormulaGrammar::Grammar eGrammar ) const +void ScFormulaCell::GetFormula( OUString& rFormula, const FormulaGrammar::Grammar eGrammar ) const { - rtl::OUStringBuffer rBuffer( rFormula ); + OUStringBuffer rBuffer( rFormula ); GetFormula( rBuffer, eGrammar ); rFormula = rBuffer.makeStringAndClear(); } @@ -697,7 +697,7 @@ void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ) } } -void ScFormulaCell::Compile( const rtl::OUString& rFormula, bool bNoListening, +void ScFormulaCell::Compile( const OUString& rFormula, bool bNoListening, const FormulaGrammar::Grammar eGrammar ) { if ( pDocument->IsClipOrUndo() ) @@ -788,7 +788,7 @@ void ScFormulaCell::CompileXML( ScProgress& rProgress ) ScCompiler aComp( pDocument, aPos, *pCode); aComp.SetGrammar(eTempGrammar); - rtl::OUString aFormula, aFormulaNmsp; + OUString aFormula, aFormulaNmsp; aComp.CreateStringFromXMLTokenArray( aFormula, aFormulaNmsp ); pDocument->DecXMLImportedFormulaCount( aFormula.getLength() ); rProgress.SetStateCountDownOnPercent( pDocument->GetXMLImportedFormulaCount() ); @@ -1633,9 +1633,9 @@ void ScFormulaCell::AddRecalcMode( ScRecalcMode nBits ) } // Dynamically create the URLField on a mouse-over action on a hyperlink() cell. -void ScFormulaCell::GetURLResult( rtl::OUString& rURL, rtl::OUString& rCellText ) +void ScFormulaCell::GetURLResult( OUString& rURL, OUString& rCellText ) { - rtl::OUString aCellString; + OUString aCellString; Color* pColor; @@ -1702,8 +1702,8 @@ bool ScFormulaCell::IsHyperLinkCell() const EditTextObject* ScFormulaCell::CreateURLObject() { - rtl::OUString aCellText; - rtl::OUString aURL; + OUString aCellText; + OUString aURL; GetURLResult( aURL, aCellText ); return ScEditUtil::CreateURLObjectFromURL( *pDocument, aURL, aCellText ); @@ -1748,13 +1748,13 @@ double ScFormulaCell::GetValueAlways() return aResult.GetDouble(); } -rtl::OUString ScFormulaCell::GetString() +OUString ScFormulaCell::GetString() { MaybeInterpret(); if ((!pCode->GetCodeError() || pCode->GetCodeError() == errDoubleRef) && !aResult.GetResultError()) return aResult.GetString(); - return rtl::OUString(); + return OUString(); } const ScMatrix* ScFormulaCell::GetMatrix() @@ -1877,14 +1877,14 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) else { #if OSL_DEBUG_LEVEL > 0 - rtl::OUString aTmp; - rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM( + OUString aTmp; + OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM( "broken Matrix, no MatFormula at origin, Pos: ")); aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatOrg: ")); aOrg.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aMsg.getStr()); #endif return 0; // bad luck ... @@ -1910,13 +1910,13 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) #if OSL_DEBUG_LEVEL > 0 else { - rtl::OUString aTmp; - rtl::OStringBuffer aMsg( "broken Matrix, Pos: " ); + OUString aTmp; + OStringBuffer aMsg( "broken Matrix, Pos: " ); aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatOrg: ")); aOrg.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); - aMsg.append(rtl::OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); + aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 )); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatCols: ")); aMsg.append(static_cast( nC )); aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatRows: ")); @@ -2771,7 +2771,7 @@ void ScFormulaCell::CompileDBFormula( bool bCreateFormulaString ) } if ( bRecompile ) { - rtl::OUString aFormula; + OUString aFormula; GetFormula( aFormula, formula::FormulaGrammar::GRAM_NATIVE); if ( GetMatrixFlag() != MM_NONE && !aFormula.isEmpty() ) { @@ -2818,7 +2818,7 @@ void ScFormulaCell::CompileNameFormula( bool bCreateFormulaString ) } if ( bRecompile ) { - rtl::OUString aFormula; + OUString aFormula; GetFormula( aFormula, formula::FormulaGrammar::GRAM_NATIVE); if ( GetMatrixFlag() != MM_NONE && !aFormula.isEmpty() ) { diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 5facf9f16b70..44f9e65bb06e 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -112,7 +112,7 @@ void ScFuncDesc::Clear() nFIndex = 0; nCategory = 0; - sHelpId = rtl::OString(); + sHelpId = OString(); bIncomplete = false; bHasSuppressedArgs = false; } @@ -367,7 +367,7 @@ void ScFuncDesc::initArgumentInfo() const } } -::rtl::OString ScFuncDesc::getHelpId() const +OString ScFuncDesc::getHelpId() const { return sHelpId; } diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index bc665d6d099e..7d31f6f8d9ba 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -80,8 +80,6 @@ // ----------------------------------------------------------------------- -using ::rtl::OUString; -using ::rtl::OUStringBuffer; ScDocShellRef* ScGlobal::pDrawClipDocShellRef = NULL; SvxSearchItem* ScGlobal::pSearchItem = NULL; @@ -104,7 +102,7 @@ CollatorWrapper* ScGlobal::pCaseCollator = NULL; IntlWrapper* ScGlobal::pScIntlWrapper = NULL; sal_Unicode ScGlobal::cListDelimiter = ','; String* ScGlobal::pEmptyString = NULL; -::rtl::OUString* ScGlobal::pEmptyOUString = NULL; +OUString* ScGlobal::pEmptyOUString = NULL; String* ScGlobal::pStrClipDocName = NULL; SvxBrushItem* ScGlobal::pEmptyBrushItem = NULL; @@ -514,7 +512,7 @@ const String& ScGlobal::GetEmptyString() return *pEmptyString; } -const ::rtl::OUString& ScGlobal::GetEmptyOUString() +const OUString& ScGlobal::GetEmptyOUString() { return *pEmptyOUString; } @@ -530,7 +528,7 @@ ImageList* ScGlobal::GetOutlineSymbols() void ScGlobal::Init() { pEmptyString = new String; - pEmptyOUString = new ::rtl::OUString; + pEmptyOUString = new OUString; // Die Default-Sprache fuer Zahlenformate (ScGlobal::eLnge) // muss immer LANGUAGE_SYSTEM sein @@ -735,7 +733,7 @@ String ScGlobal::GetCharsetString( CharSet eVal ) default: return OUString::number( eVal ); } - return rtl::OUString::createFromAscii(pChar); + return OUString::createFromAscii(pChar); } //------------------------------------------------------------------------ @@ -803,7 +801,7 @@ const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, OUString ScGlobal::addToken(const OUString& rTokenList, const OUString& rToken, sal_Unicode cSep, sal_Int32 nSepCount, bool bForceSep) { - rtl::OUStringBuffer aBuf(rTokenList); + OUStringBuffer aBuf(rTokenList); if( bForceSep || (!rToken.isEmpty() && !rTokenList.isEmpty()) ) comphelper::string::padToLength(aBuf, aBuf.getLength() + nSepCount, cSep); aBuf.append(rToken); @@ -822,7 +820,7 @@ void ScGlobal::AddQuotes( OUString& rString, sal_Unicode cQuote, bool bEscapeEmb sal_Unicode pQ[3]; pQ[0] = pQ[1] = cQuote; pQ[2] = 0; - rtl::OUString aQuotes( pQ ); + OUString aQuotes( pQ ); rString = rString.replaceAll( OUString(cQuote), aQuotes); } rString = OUString( cQuote ) + OUString( cQuote ); @@ -838,7 +836,7 @@ void ScGlobal::EraseQuotes( OUString& rString, sal_Unicode cQuote, bool bUnescap sal_Unicode pQ[3]; pQ[0] = pQ[1] = cQuote; pQ[2] = 0; - rtl::OUString aQuotes( pQ ); + OUString aQuotes( pQ ); rString = rString.replaceAll( aQuotes, OUString(cQuote)); } } @@ -943,7 +941,7 @@ void ScGlobal::OpenURL( const String& rURL, const String& rTarget ) SfxStringItem aUrl( SID_FILE_NAME, rURL ); SfxStringItem aTarget( SID_TARGETNAME, rTarget ); - aTarget.SetValue(rtl::OUString("_blank")); + aTarget.SetValue(OUString("_blank")); SfxViewFrame* pFrame = NULL; String aReferName; if ( pScActiveViewShell ) diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index a9c2c07045f8..64c362236b94 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -377,7 +377,7 @@ String ScGlobal::GetAbsDocName( const String& rFileName, String ScGlobal::GetDocTabName( const String& rFileName, const String& rTabName ) { - String aDocTab(rtl::OUString('\'')); + String aDocTab(OUString('\'')); aDocTab += rFileName; xub_StrLen nPos = 1; while( (nPos = aDocTab.Search( '\'', nPos )) diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx index aa8734e69367..47a0c3158cd1 100644 --- a/sc/source/core/data/globalx.cxx +++ b/sc/source/core/data/globalx.cxx @@ -46,20 +46,20 @@ void ScGlobal::InitAddIns() { // multi paths separated by semicolons SvtPathOptions aPathOpt; - rtl::OUString aMultiPath = aPathOpt.GetAddinPath(); + OUString aMultiPath = aPathOpt.GetAddinPath(); if (aMultiPath.isEmpty()) return; sal_Int32 nTokens = comphelper::string::getTokenCount(aMultiPath, ';'); for (sal_Int32 j = 0; j < nTokens; ++j) { - rtl::OUString aPath = comphelper::string::getToken(aMultiPath, j, ';'); + OUString aPath = comphelper::string::getToken(aMultiPath, j, ';'); if (aPath.isEmpty()) continue; // use LocalFileHelper to convert the path to a URL that always points // to the file on the server - rtl::OUString aUrl; + OUString aUrl; if ( utl::LocalFileHelper::ConvertPhysicalNameToURL( aPath, aUrl ) ) aPath = aUrl; @@ -72,7 +72,7 @@ void ScGlobal::InitAddIns() Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() ); Reference< sdbc::XResultSet > xResultSet; - Sequence< rtl::OUString > aProps; + Sequence< OUString > aProps; try { xResultSet = aCnt.createCursor( @@ -95,7 +95,7 @@ void ScGlobal::InitAddIns() { do { - rtl::OUString aId = xContentAccess->queryContentIdentifierString(); + OUString aId = xContentAccess->queryContentIdentifierString(); InitExternalFunc( aId ); } while ( xResultSet->next() ); @@ -127,7 +127,7 @@ String ScGlobal::GetOrdinalSuffix( sal_Int32 nNumber) { xOrdinalSuffix = i18n::OrdinalSuffix::create( ::comphelper::getProcessComponentContext() ); } - uno::Sequence< rtl::OUString > aSuffixes = xOrdinalSuffix->getOrdinalSuffix( nNumber, + uno::Sequence< OUString > aSuffixes = xOrdinalSuffix->getOrdinalSuffix( nNumber, ScGlobal::pLocaleData->getLanguageTag().getLocale()); if ( aSuffixes.getLength() > 0 ) return aSuffixes[0]; diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx index d4156bb8a054..e8aed7776d99 100644 --- a/sc/source/core/data/pivot2.cxx +++ b/sc/source/core/data/pivot2.cxx @@ -44,7 +44,6 @@ using std::endl; #endif using ::com::sun::star::sheet::DataPilotFieldReference; -using ::rtl::OUString; using ::std::vector; namespace { diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index ea885b31dd26..cff5084ddf0a 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -48,8 +48,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -468,7 +466,7 @@ struct ScCaptionInitData SfxItemSetPtr mxItemSet; /// Caption object formatting. OutlinerParaObjPtr mxOutlinerObj; /// Text object with all text portion formatting. - ::rtl::OUString maSimpleText; /// Simple text without formatting. + OUString maSimpleText; /// Simple text without formatting. Point maCaptionOffset; /// Caption position relative to cell corner. Size maCaptionSize; /// Size of the caption object. bool mbDefaultPosSize; /// True = use default position and size for caption. diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index 55b4c63b2838..231f3a2cf9a7 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -21,12 +21,12 @@ #include // ----------------------------------------------------------------------- -rtl::OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) +OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) { OSL_FAIL("invalid event number"); - return rtl::OUString(); + return OUString(); } static const sal_Char* aEventNames[] = @@ -39,7 +39,7 @@ rtl::OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) "OnChange", // SC_SHEETEVENT_CHANGE "OnCalculate" // SC_SHEETEVENT_CALCULATE }; - return rtl::OUString::createFromAscii(aEventNames[nEvent]); + return OUString::createFromAscii(aEventNames[nEvent]); } sal_Int32 ScSheetEvents::GetVbaSheetEventId(sal_Int32 nEvent) @@ -105,17 +105,17 @@ const ScSheetEvents& ScSheetEvents::operator=(const ScSheetEvents& rOther) Clear(); if (rOther.mpScriptNames) { - mpScriptNames = new rtl::OUString*[SC_SHEETEVENT_COUNT]; + mpScriptNames = new OUString*[SC_SHEETEVENT_COUNT]; for (sal_Int32 nEvent=0; nEvent=SC_SHEETEVENT_COUNT) { @@ -128,7 +128,7 @@ const rtl::OUString* ScSheetEvents::GetScript(sal_Int32 nEvent) const return NULL; } -void ScSheetEvents::SetScript(sal_Int32 nEvent, const rtl::OUString* pNew) +void ScSheetEvents::SetScript(sal_Int32 nEvent, const OUString* pNew) { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) { @@ -138,13 +138,13 @@ void ScSheetEvents::SetScript(sal_Int32 nEvent, const rtl::OUString* pNew) if (!mpScriptNames) { - mpScriptNames = new rtl::OUString*[SC_SHEETEVENT_COUNT]; + mpScriptNames = new OUString*[SC_SHEETEVENT_COUNT]; for (sal_Int32 nEventIdx=0; nEventIdxSetText( aStr ); pEdEngine->QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) ); pEdEngine->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection() ); @@ -445,7 +445,7 @@ void ScStyleSheetPool::CreateStandardStyles() pHeaderItem->SetLeftArea( *pTxtObj ); pHeaderItem->SetCenterArea( *pEmptyTxtObj ); DELETEZ( pTxtObj ); - aStr = rtl::OUString(", "); + aStr = OUString(", "); pEdEngine->SetText( aStr ); pEdEngine->QuickInsertField( SvxFieldItem(SvxTimeField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) ); pEdEngine->QuickInsertField( SvxFieldItem(SvxDateField(Date( Date::SYSTEM ),SVXDATETYPE_VAR), EE_FEATURE_FIELD), diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 1415acd05089..3ef1b42b9c76 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -325,7 +325,7 @@ const String& ScStyleSheet::GetFollow() const bool ScStyleSheet::SetName( const String& rNew ) { - String aFileStdName = rtl::OUString(STRING_STANDARD); + String aFileStdName = OUString(STRING_STANDARD); if ( rNew == aFileStdName && aFileStdName != ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) return false; else diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 1004a7c52819..06a3e3969ac2 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -220,7 +220,7 @@ bool SetOptimalHeightsToRows(OptimalHeightsFuncObjBase& rFuncObj, // ----------------------------------------------------------------------- -ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const rtl::OUString& rNewName, +ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName, bool bColInfo, bool bRowInfo ) : aName( rNewName ), aCodeName( rNewName ), @@ -339,20 +339,20 @@ ScTable::~ScTable() DestroySortCollator(); } -void ScTable::GetName( rtl::OUString& rName ) const +void ScTable::GetName( OUString& rName ) const { rName = aName; } -void ScTable::SetName( const rtl::OUString& rNewName ) +void ScTable::SetName( const OUString& rNewName ) { aName = rNewName; - aUpperName = rtl::OUString(); // invalidated if the name is changed + aUpperName = OUString(); // invalidated if the name is changed // SetStreamValid is handled in ScDocument::RenameTab } -const rtl::OUString& ScTable::GetUpperName() const +const OUString& ScTable::GetUpperName() const { if (aUpperName.isEmpty() && !aName.isEmpty()) aUpperName = ScGlobal::pCharClass->uppercase(aName); diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index f7521c2f6077..fd0db12f4d72 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1397,12 +1397,12 @@ void ScTable::SetValue( SCCOL nCol, SCROW nRow, const double& rVal ) } -void ScTable::GetString( SCCOL nCol, SCROW nRow, rtl::OUString& rString ) const +void ScTable::GetString( SCCOL nCol, SCROW nRow, OUString& rString ) const { if (ValidColRow(nCol,nRow)) aCol[nCol].GetString( nRow, rString ); else - rString = rtl::OUString(); + rString = OUString(); } const OUString* ScTable::GetStringCell( SCCOL nCol, SCROW nRow ) const @@ -1421,12 +1421,12 @@ double* ScTable::GetValueCell( SCCOL nCol, SCROW nRow ) return aCol[nCol].GetValueCell(nRow); } -void ScTable::GetInputString( SCCOL nCol, SCROW nRow, rtl::OUString& rString ) const +void ScTable::GetInputString( SCCOL nCol, SCROW nRow, OUString& rString ) const { if (ValidColRow(nCol,nRow)) aCol[nCol].GetInputString( nRow, rString ); else - rString = rtl::OUString(); + rString = OUString(); } @@ -1453,12 +1453,12 @@ void ScTable::RemoveEditTextCharAttribs( SCCOL nCol, SCROW nRow, const ScPattern return aCol[nCol].RemoveEditTextCharAttribs(nRow, rAttr); } -void ScTable::GetFormula( SCCOL nCol, SCROW nRow, rtl::OUString& rFormula ) const +void ScTable::GetFormula( SCCOL nCol, SCROW nRow, OUString& rFormula ) const { if (ValidColRow(nCol,nRow)) aCol[nCol].GetFormula( nRow, rFormula ); else - rFormula = rtl::OUString(); + rFormula = OUString(); } const ScTokenArray* ScTable::GetFormulaTokens( SCCOL nCol, SCROW nRow ) const @@ -3466,7 +3466,7 @@ bool ScTable::RefVisible(ScFormulaCell* pCell) } -void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, rtl::OUString& rStr) +void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, OUString& rStr) { GetInputString(nCol, nRow, rStr); rStr = ScGlobal::pCharClass->uppercase(rStr.trim()); diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index ea82e75f9bd3..e4d89f04e90e 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -83,7 +83,7 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* xub_StrLen nNum = 0; if ( p[nNum] == '-' ) nNum = nNeg = 1; - while ( p[nNum] && CharClass::isAsciiNumeric( rtl::OUString(p[nNum]) ) ) + while ( p[nNum] && CharClass::isAsciiNumeric( OUString(p[nNum]) ) ) nNum++; sal_Unicode cNext = p[nNum]; // 0 if at the end @@ -92,7 +92,7 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* // #i5550# If there are numbers at the beginning and the end, // prefer the one at the beginning only if it's followed by a space. // Otherwise, use the number at the end, to enable things like IP addresses. - if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || !CharClass::isAsciiNumeric(rtl::OUString(cLast)) ) ) + if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || !CharClass::isAsciiNumeric(OUString(cLast)) ) ) { // number at the beginning nVal = aValue.Copy( 0, nNum ).ToInt32(); // any number with a leading zero sets the minimum number of digits @@ -105,7 +105,7 @@ static short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* { nNeg = 0; xub_StrLen nEnd = nNum = aValue.Len() - 1; - while ( nNum && CharClass::isAsciiNumeric( rtl::OUString(p[nNum]) ) ) + while ( nNum && CharClass::isAsciiNumeric( OUString(p[nNum]) ) ) nNum--; if ( p[nNum] == '-' ) { @@ -326,14 +326,14 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } else if (eCellType == CELLTYPE_STRING || eCellType == CELLTYPE_EDIT) { - rtl::OUString aStr; + OUString aStr; GetString(nCol, nRow, aStr); // fdo#39500 don't deduce increment from multiple equal list entries bool bAllSame = true; for (sal_uInt16 i = 0; i < nCount; ++i) { - rtl::OUString aTestStr; + OUString aTestStr; GetString(static_cast(nCol + i* nAddX), static_cast(nRow + i * nAddY), aTestStr); if(aStr != aTestStr) { diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index 7e3fd7f57214..cbffff1560b4 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -1097,11 +1097,11 @@ void ScTable::EndListening( const ScAddress& rAddress, SvtListener* pListener ) aCol[rAddress.Col()].EndListening( *pListener, rAddress.Row() ); } -void ScTable::SetPageStyle( const rtl::OUString& rName ) +void ScTable::SetPageStyle( const OUString& rName ) { if ( aPageStyle != rName ) { - rtl::OUString aStrNew = rName; + OUString aStrNew = rName; SfxStyleSheetBasePool* pStylePool = pDocument->GetStyleSheetPool(); SfxStyleSheetBase* pNewStyle = pStylePool->Find( aStrNew, SFX_STYLE_FAMILY_PAGE ); diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 0354e09d8264..788c1509ac77 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -40,7 +40,7 @@ using ::com::sun::star::util::SearchOptions; namespace { -bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, rtl::OUString& rVal ) +bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, OUString& rVal ) { // true = more than 1 paragraph @@ -54,13 +54,13 @@ bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, rtl::OUSt } bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; bool bDoSearch = true; bool bDoBack = rSearchItem.GetBackward(); - rtl::OUString aString; + OUString aString; ScBaseCell* pCell; if (rSearchItem.GetSelection()) bDoSearch = rMark.IsCellMarked(nCol, nRow); @@ -157,14 +157,14 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo if (rSearchItem.GetRegExp()) { pSearchText->ReplaceBackReferences( sReplStr, aString, aSearchResult ); - rtl::OUStringBuffer aStrBuffer(aString); + OUStringBuffer aStrBuffer(aString); aStrBuffer.remove(nStart, nEnd-nStart+1); aStrBuffer.insert(nStart, sReplStr); aString = aStrBuffer.makeStringAndClear(); } else { - rtl::OUStringBuffer aStrBuffer(aString); + OUStringBuffer aStrBuffer(aString); aStrBuffer.remove(nStart, nEnd-nStart+1); aStrBuffer.insert(nStart, rSearchItem.GetReplaceString()); aString = aStrBuffer.makeStringAndClear(); @@ -273,7 +273,7 @@ void ScTable::SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bFo } bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; bool bAll = (rSearchItem.GetCommand() == SVX_SEARCHCMD_FIND_ALL) @@ -421,7 +421,7 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, } bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = true; SCCOL nCol = 0; @@ -443,7 +443,7 @@ bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& rMar } bool ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, - const ScMarkData& rMark, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + const ScMarkData& rMark, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; SCCOL nCol = rCol; @@ -473,7 +473,7 @@ bool ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow bool ScTable::ReplaceAll( const SvxSearchItem& rSearchItem, const ScMarkData& rMark, ScRangeList& rMatchedRanges, - rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + OUString& rUndoStr, ScDocument* pUndoDoc) { SCCOL nCol = 0; SCROW nRow = -1; @@ -664,7 +664,7 @@ bool ScTable::ReplaceAllStyle( bool ScTable::SearchAndReplace( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { sal_uInt16 nCommand = rSearchItem.GetCommand(); bool bFound = false; @@ -728,7 +728,7 @@ bool ScTable::SearchAndReplace( bool ScTable::SearchAndReplaceEmptyCells( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { SCCOL nColStart, nColEnd; SCROW nRowStart, nRowEnd; @@ -808,7 +808,7 @@ bool ScTable::SearchAndReplaceEmptyCells( namespace { bool lcl_maybeReplaceCellString( - ScColumn& rColObj, SCCOL& rCol, SCROW& rRow, rtl::OUString& rUndoStr, SCCOL nCol, SCROW nRow, const SvxSearchItem& rSearchItem) + ScColumn& rColObj, SCCOL& rCol, SCROW& rRow, OUString& rUndoStr, SCCOL nCol, SCROW nRow, const SvxSearchItem& rSearchItem) { ScBaseCell* pCell = rColObj.GetCell(nRow); if (!pCell || pCell->GetCellType() == CELLTYPE_NOTE) @@ -820,7 +820,7 @@ bool lcl_maybeReplaceCellString( rSearchItem.GetReplaceString().Len()) { rColObj.Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString())); - rUndoStr = rtl::OUString(); + rUndoStr = OUString(); } return true; } @@ -831,7 +831,7 @@ bool lcl_maybeReplaceCellString( bool ScTable::SearchRangeForEmptyCell( const ScRange& rRange, const SvxSearchItem& rSearchItem, - SCCOL& rCol, SCROW& rRow, rtl::OUString& rUndoStr) + SCCOL& rCol, SCROW& rRow, OUString& rUndoStr) { sal_uInt16 nCmd = rSearchItem.GetCommand(); bool bSkipFiltered = rSearchItem.IsSearchFiltered(); @@ -941,7 +941,7 @@ bool ScTable::SearchRangeForEmptyCell( bool ScTable::SearchRangeForAllEmptyCells( const ScRange& rRange, const SvxSearchItem& rSearchItem, - ScRangeList& rMatchedRanges, rtl::OUString& rUndoStr, ScDocument* pUndoDoc) + ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc) { bool bFound = false; bool bReplace = (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL) && diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 750aa10cfa8e..979454027f0c 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -31,8 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::vector; // ============================================================================ diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 588e05b4abf8..258e7e02b074 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -201,12 +201,12 @@ sal_Bool ScValidationData::DoScript( const ScAddress& rPos, const String& rInput if ( bIsValue ) aParams[0] = ::com::sun::star::uno::makeAny( nValue ); else - aParams[0] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aValStr ) ); + aParams[0] = ::com::sun::star::uno::makeAny( OUString( aValStr ) ); // 2) Position der Zelle String aPosStr; rPos.Format( aPosStr, SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention() ); - aParams[1] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aPosStr ) ); + aParams[1] = ::com::sun::star::uno::makeAny( OUString( aPosStr ) ); // use link-update flag to prevent closing the document // while the macro is running diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx index 871578041841..6b484dea6ac8 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.hxx @@ -36,13 +36,13 @@ private: ScUnoAddInHelpIdGenerator(); // disabled public: - ScUnoAddInHelpIdGenerator( const ::rtl::OUString& rServiceName ); + ScUnoAddInHelpIdGenerator( const OUString& rServiceName ); /** Sets service name of the AddIn. Has to be done before requesting help IDs. */ - void SetServiceName( const ::rtl::OUString& rServiceName ); + void SetServiceName( const OUString& rServiceName ); /** @return The help ID of the function with given built-in name or 0 if not found. */ - rtl::OString GetHelpId( const ::rtl::OUString& rFuncName ) const; + OString GetHelpId( const OUString& rFuncName ) const; }; diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx index 3269f85d4169..05eddd11fd39 100644 --- a/sc/source/core/inc/addinlis.hxx +++ b/sc/source/core/inc/addinlis.hxx @@ -75,13 +75,13 @@ public: throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx index d7b6f37dd459..9802196ef5d3 100644 --- a/sc/source/core/inc/cellkeytranslator.hxx +++ b/sc/source/core/inc/cellkeytranslator.hxx @@ -64,7 +64,7 @@ class ScCellKeywordTranslator { public: static void transKeyword(String& rName, const ::com::sun::star::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); - static void transKeyword(rtl::OUString& rName, const ::com::sun::star::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); + static void transKeyword(OUString& rName, const ::com::sun::star::lang::Locale* pLocale = NULL, OpCode eOpCode = ocNone); ~ScCellKeywordTranslator(); private: diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 33e48c371054..1782f443d3cb 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -53,7 +53,7 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const = 0; + virtual OUString getString(SCCOL nCol, SCROW nRow) const = 0; virtual SCCOL getFirstFieldColumn() const = 0; @@ -67,7 +67,7 @@ public: * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const = 0; - virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const = 0; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const = 0; virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const = 0; virtual bool isRangeEqual(const ScRange& rRange) const = 0; @@ -110,7 +110,7 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const; + virtual OUString getString(SCCOL nCol, SCROW nRow) const; virtual SCCOL getFirstFieldColumn() const; /** @@ -123,7 +123,7 @@ public: * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const; - virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const; virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const; virtual bool isRangeEqual(const ScRange& rRange) const; @@ -151,7 +151,7 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const; + virtual OUString getString(SCCOL nCol, SCROW nRow) const; virtual SCCOL getFirstFieldColumn() const; @@ -165,7 +165,7 @@ public: * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const; - virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const; virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const; virtual bool isRangeEqual(const ScRange& rRange) const; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index e3eeb4a2b9c8..fd4c27e40b8d 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -54,9 +54,9 @@ using namespace com::sun::star; #define SC_CALLERPOS_NONE (-1) -ScUnoAddInFuncData::ScUnoAddInFuncData( const ::rtl::OUString& rNam, const ::rtl::OUString& rLoc, - const ::rtl::OUString& rDesc, - sal_uInt16 nCat, const rtl::OString& sHelp, +ScUnoAddInFuncData::ScUnoAddInFuncData( const OUString& rNam, const OUString& rLoc, + const OUString& rDesc, + sal_uInt16 nCat, const OString& sHelp, const uno::Reference& rFunc, const uno::Any& rO, long nAC, const ScAddInArgDesc* pAD, @@ -104,7 +104,7 @@ const uno::Sequence& ScUnoAddInFuncData::GetCompNames() co uno::Reference xComp( xAddIn, uno::UNO_QUERY ); if ( xComp.is() && xFunction.is() ) { - rtl::OUString aMethodName = xFunction->getName(); + OUString aMethodName = xFunction->getName(); aCompNames = xComp->getCompatibilityNames( aMethodName ); // change all locale entries to default case @@ -155,7 +155,7 @@ void ScUnoAddInFuncData::SetCompNames( const uno::Sequence< sheet::LocalizedName bCompInitialized = sal_True; } -sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, ::rtl::OUString& rRetExcelName ) const +sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, OUString& rRetExcelName ) const { const uno::Sequence& rSequence = GetCompNames(); long nSeqLen = rSequence.getLength(); @@ -165,10 +165,10 @@ sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, ::rtl::OUStri long i; /* FIXME-BCP47: we may want to handle language tags here as well. */ - rtl::OUString aLangStr, aCountryStr; + OUString aLangStr, aCountryStr; LanguageTag( eDestLang ).getIsoLanguageCountry( aLangStr, aCountryStr ); - rtl::OUString aUserLang = aLangStr.toAsciiLowerCase(); - rtl::OUString aUserCountry = aCountryStr.toAsciiUpperCase(); + OUString aUserLang = aLangStr.toAsciiLowerCase(); + OUString aUserCountry = aCountryStr.toAsciiUpperCase(); // first check for match of both language and country @@ -326,7 +326,7 @@ void ScUnoAddInCollection::Initialize() } // ----------------------------------------------------------------------------- -static sal_uInt16 lcl_GetCategory( const ::rtl::OUString& rName ) +static sal_uInt16 lcl_GetCategory( const OUString& rName ) { static const sal_Char* aFuncNames[SC_FUNCGROUP_COUNT] = { @@ -375,26 +375,26 @@ void ScUnoAddInCollection::ReadConfiguration() ScAddInCfg& rAddInConfig = SC_MOD()->GetAddInCfg(); // additional, temporary config item for the compatibility names - ScLinkConfigItem aAllLocalesConfig( rtl::OUString(CFGPATH_ADDINS), CONFIG_MODE_ALL_LOCALES ); + ScLinkConfigItem aAllLocalesConfig( OUString(CFGPATH_ADDINS), CONFIG_MODE_ALL_LOCALES ); // CommitLink is not used (only reading values) - const rtl::OUString sSlash('/'); + const OUString sSlash('/'); // get the list of add-ins (services) - rtl::OUString aEmptyString; - uno::Sequence aServiceNames = rAddInConfig.GetNodeNames( aEmptyString ); + OUString aEmptyString; + uno::Sequence aServiceNames = rAddInConfig.GetNodeNames( aEmptyString ); sal_Int32 nServiceCount = aServiceNames.getLength(); for ( sal_Int32 nService = 0; nService < nServiceCount; nService++ ) { - rtl::OUString aServiceName = aServiceNames[nService]; + OUString aServiceName = aServiceNames[nService]; ScUnoAddInHelpIdGenerator aHelpIdGenerator( aServiceName ); - rtl::OUString aFunctionsPath = aServiceName; + OUString aFunctionsPath = aServiceName; aFunctionsPath += sSlash; - aFunctionsPath += rtl::OUString(CFGSTR_ADDINFUNCTIONS); + aFunctionsPath += OUString(CFGSTR_ADDINFUNCTIONS); - uno::Sequence aFunctionNames = rAddInConfig.GetNodeNames( aFunctionsPath ); + uno::Sequence aFunctionNames = rAddInConfig.GetNodeNames( aFunctionsPath ); sal_Int32 nNewCount = aFunctionNames.getLength(); // allocate pointers @@ -422,41 +422,41 @@ void ScUnoAddInCollection::ReadConfiguration() //! get the function information in a single call for all functions? - const rtl::OUString* pFuncNameArray = aFunctionNames.getConstArray(); + const OUString* pFuncNameArray = aFunctionNames.getConstArray(); for ( sal_Int32 nFuncPos = 0; nFuncPos < nNewCount; nFuncPos++ ) { ppFuncData[nFuncPos+nOld] = NULL; // stored function name: (service name).(function) - rtl::OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+pFuncNameArray[nFuncPos].getLength()); + OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+pFuncNameArray[nFuncPos].getLength()); aFuncNameBuffer.append(aServiceName); aFuncNameBuffer.append('.'); aFuncNameBuffer.append(pFuncNameArray[nFuncPos]); - rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); + OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); // skip the function if already known (read from old AddIn service) if ( pExactHashMap->find( aFuncName ) == pExactHashMap->end() ) { - rtl::OUString aLocalName; - rtl::OUString aDescription; + OUString aLocalName; + OUString aDescription; sal_uInt16 nCategory = ID_FUNCTION_GRP_ADDINS; // get direct information on the function - rtl::OUString aFuncPropPath = aFunctionsPath; + OUString aFuncPropPath = aFunctionsPath; aFuncPropPath += sSlash; aFuncPropPath += pFuncNameArray[nFuncPos]; aFuncPropPath += sSlash; - uno::Sequence aFuncPropNames(CFG_FUNCPROP_COUNT); - rtl::OUString* pNameArray = aFuncPropNames.getArray(); + uno::Sequence aFuncPropNames(CFG_FUNCPROP_COUNT); + OUString* pNameArray = aFuncPropNames.getArray(); pNameArray[CFG_FUNCPROP_DISPLAYNAME] = aFuncPropPath; - pNameArray[CFG_FUNCPROP_DISPLAYNAME] += rtl::OUString(CFGSTR_DISPLAYNAME); + pNameArray[CFG_FUNCPROP_DISPLAYNAME] += OUString(CFGSTR_DISPLAYNAME); pNameArray[CFG_FUNCPROP_DESCRIPTION] = aFuncPropPath; - pNameArray[CFG_FUNCPROP_DESCRIPTION] += rtl::OUString(CFGSTR_DESCRIPTION); + pNameArray[CFG_FUNCPROP_DESCRIPTION] += OUString(CFGSTR_DESCRIPTION); pNameArray[CFG_FUNCPROP_CATEGORY] = aFuncPropPath; - pNameArray[CFG_FUNCPROP_CATEGORY] += rtl::OUString(CFGSTR_CATEGORY); + pNameArray[CFG_FUNCPROP_CATEGORY] += OUString(CFGSTR_CATEGORY); uno::Sequence aFuncProperties = rAddInConfig.GetProperties( aFuncPropNames ); if ( aFuncProperties.getLength() == CFG_FUNCPROP_COUNT ) @@ -464,7 +464,7 @@ void ScUnoAddInCollection::ReadConfiguration() aFuncProperties[CFG_FUNCPROP_DISPLAYNAME] >>= aLocalName; aFuncProperties[CFG_FUNCPROP_DESCRIPTION] >>= aDescription; - rtl::OUString aCategoryName; + OUString aCategoryName; aFuncProperties[CFG_FUNCPROP_CATEGORY] >>= aCategoryName; nCategory = lcl_GetCategory( aCategoryName ); } @@ -473,9 +473,9 @@ void ScUnoAddInCollection::ReadConfiguration() uno::Sequence aCompNames; - rtl::OUString aCompPath = aFuncPropPath; - aCompPath += rtl::OUString(CFGSTR_COMPATIBILITYNAME); - uno::Sequence aCompPropNames( &aCompPath, 1 ); + OUString aCompPath = aFuncPropPath; + aCompPath += OUString(CFGSTR_COMPATIBILITYNAME); + uno::Sequence aCompPropNames( &aCompPath, 1 ); uno::Sequence aCompProperties = aAllLocalesConfig.GetProperties( aCompPropNames ); if ( aCompProperties.getLength() == 1 ) @@ -494,7 +494,7 @@ void ScUnoAddInCollection::ReadConfiguration() // PropertyValue name is the locale (convert from string to Locale struct) - const rtl::OUString& rLocaleStr = pConfigArray[nLocale].Name; + const OUString& rLocaleStr = pConfigArray[nLocale].Name; lang::Locale& rLocale = pCompArray[nLocale].Locale; sal_Int32 nSepPos = rLocaleStr.indexOf( cLocaleSep ); if ( nSepPos >= 0 ) @@ -518,39 +518,39 @@ void ScUnoAddInCollection::ReadConfiguration() long nVisibleCount = 0; long nCallerPos = SC_CALLERPOS_NONE; - rtl::OUString aArgumentsPath = aFuncPropPath; - aArgumentsPath += rtl::OUString(CFGSTR_PARAMETERS); + OUString aArgumentsPath = aFuncPropPath; + aArgumentsPath += OUString(CFGSTR_PARAMETERS); - uno::Sequence aArgumentNames = rAddInConfig.GetNodeNames( aArgumentsPath ); + uno::Sequence aArgumentNames = rAddInConfig.GetNodeNames( aArgumentsPath ); sal_Int32 nArgumentCount = aArgumentNames.getLength(); if ( nArgumentCount ) { // get DisplayName and Description for each argument - uno::Sequence aArgPropNames( nArgumentCount * 2 ); - rtl::OUString* pPropNameArray = aArgPropNames.getArray(); + uno::Sequence aArgPropNames( nArgumentCount * 2 ); + OUString* pPropNameArray = aArgPropNames.getArray(); sal_Int32 nArgument; sal_Int32 nIndex = 0; - const rtl::OUString* pArgNameArray = aArgumentNames.getConstArray(); + const OUString* pArgNameArray = aArgumentNames.getConstArray(); for ( nArgument = 0; nArgument < nArgumentCount; nArgument++ ) { - rtl::OUString aOneArgPath = aArgumentsPath; + OUString aOneArgPath = aArgumentsPath; aOneArgPath += sSlash; aOneArgPath += pArgNameArray[nArgument]; aOneArgPath += sSlash; pPropNameArray[nIndex] = aOneArgPath; - pPropNameArray[nIndex++] += rtl::OUString(CFGSTR_DISPLAYNAME); + pPropNameArray[nIndex++] += OUString(CFGSTR_DISPLAYNAME); pPropNameArray[nIndex] = aOneArgPath; - pPropNameArray[nIndex++] += rtl::OUString(CFGSTR_DESCRIPTION); + pPropNameArray[nIndex++] += OUString(CFGSTR_DESCRIPTION); } uno::Sequence aArgProperties = rAddInConfig.GetProperties( aArgPropNames ); if ( aArgProperties.getLength() == aArgPropNames.getLength() ) { const uno::Any* pPropArray = aArgProperties.getConstArray(); - rtl::OUString sDisplayName; - rtl::OUString sDescription; + OUString sDisplayName; + OUString sDescription; ScAddInArgDesc aDesc; aDesc.eType = SC_ADDINARG_NONE; // arg type is not in configuration @@ -574,7 +574,7 @@ void ScUnoAddInCollection::ReadConfiguration() } } - rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); + OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); uno::Reference xFunc; // remains empty uno::Any aObject; // also empty @@ -612,11 +612,11 @@ void ScUnoAddInCollection::ReadConfiguration() void ScUnoAddInCollection::LoadComponent( const ScUnoAddInFuncData& rFuncData ) { - ::rtl::OUString aFullName = rFuncData.GetOriginalName(); + OUString aFullName = rFuncData.GetOriginalName(); sal_Int32 nPos = aFullName.lastIndexOf( (sal_Unicode) '.' ); if ( nPos > 0 ) { - ::rtl::OUString aServiceName = aFullName.copy( 0, nPos ); + OUString aServiceName = aFullName.copy( 0, nPos ); uno::Reference xServiceFactory = comphelper::getProcessServiceFactory(); uno::Reference xInterface( xServiceFactory->createInstance( aServiceName ) ); @@ -626,8 +626,8 @@ void ScUnoAddInCollection::LoadComponent( const ScUnoAddInFuncData& rFuncData ) } } -sal_Bool ScUnoAddInCollection::GetExcelName( const ::rtl::OUString& rCalcName, - LanguageType eDestLang, ::rtl::OUString& rRetExcelName ) +sal_Bool ScUnoAddInCollection::GetExcelName( const OUString& rCalcName, + LanguageType eDestLang, OUString& rRetExcelName ) { const ScUnoAddInFuncData* pFuncData = GetFuncData( rCalcName ); if ( pFuncData ) @@ -635,12 +635,12 @@ sal_Bool ScUnoAddInCollection::GetExcelName( const ::rtl::OUString& rCalcName, return false; } -sal_Bool ScUnoAddInCollection::GetCalcName( const ::rtl::OUString& rExcelName, ::rtl::OUString& rRetCalcName ) +sal_Bool ScUnoAddInCollection::GetCalcName( const OUString& rExcelName, OUString& rRetCalcName ) { if (!bInitialized) Initialize(); - rtl::OUString aUpperCmp = ScGlobal::pCharClass->uppercase(rExcelName); + OUString aUpperCmp = ScGlobal::pCharClass->uppercase(rExcelName); for (long i=0; i // return type XInterface may contain a XVolatileResult //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); return ( IsTypeName( sName, getCppuType((uno::Reference*)0) ) || IsTypeName( sName, getCppuType((uno::Reference*)0) ) ); @@ -710,11 +710,11 @@ static sal_Bool lcl_ValidReturnType( const uno::Reference // nested sequences for arrays //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); return ( IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence >*)0) ) || IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence >*)0) ) || - IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence >*)0) ) || + IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence >*)0) ) || IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence >*)0) ) ); } } @@ -737,7 +737,7 @@ static ScAddInArgumentType lcl_GetArgType( const uno::ReferencegetName(); + OUString sName = xClass->getName(); if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence >*)0) )) return SC_ADDINARG_INTEGER_ARRAY; @@ -745,7 +745,7 @@ static ScAddInArgumentType lcl_GetArgType( const uno::Reference >*)0) )) return SC_ADDINARG_DOUBLE_ARRAY; - if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence >*)0) )) + if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence >*)0) )) return SC_ADDINARG_STRING_ARRAY; if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence >*)0) )) @@ -776,7 +776,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference& lang::Locale aLocale( Application::GetSettings().GetUILanguageTag().getLocale()); xAddIn->setLocale( aLocale ); - ::rtl::OUString aServiceName( xName->getServiceName() ); + OUString aServiceName( xName->getServiceName() ); ScUnoAddInHelpIdGenerator aHelpIdGenerator( xName->getServiceName() ); //! pass XIntrospection to ReadFromAddIn @@ -830,7 +830,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference& if ( xClass.is() ) { //! XIdlClass needs getType() method! - rtl::OUString sName = xClass->getName(); + OUString sName = xClass->getName(); bSkip = ( IsTypeName( sName, getCppuType((uno::Reference*)0) ) || @@ -850,14 +850,14 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference& } if (!bSkip) { - rtl::OUString aFuncU = xFunc->getName(); + OUString aFuncU = xFunc->getName(); // stored function name: (service name).(function) - rtl::OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+aFuncU.getLength()); + OUStringBuffer aFuncNameBuffer( aServiceName.getLength()+1+aFuncU.getLength()); aFuncNameBuffer.append(aServiceName); aFuncNameBuffer.append('.'); aFuncNameBuffer.append(aFuncU); - rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); + OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); sal_Bool bValid = sal_True; long nVisibleCount = 0; @@ -887,9 +887,9 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference& sal_uInt16 nCategory = lcl_GetCategory( xAddIn->getProgrammaticCategoryName( aFuncU ) ); - rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); + OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); - ::rtl::OUString aLocalName; + OUString aLocalName; try { aLocalName = xAddIn-> @@ -900,7 +900,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference& aLocalName = "###"; } - ::rtl::OUString aDescription; + OUString aDescription; try { aDescription = xAddIn-> @@ -924,7 +924,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference& ScAddInArgumentType eArgType = lcl_GetArgType( xParClass ); if ( eArgType != SC_ADDINARG_CALLER ) { - rtl::OUString aArgName; + OUString aArgName; try { aArgName = xAddIn-> @@ -934,7 +934,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference& { aArgName = "###"; } - rtl::OUString aArgDesc; + OUString aArgDesc; try { aArgDesc = xAddIn-> @@ -995,7 +995,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference& static void lcl_UpdateFunctionList( ScFunctionList& rFunctionList, const ScUnoAddInFuncData& rFuncData ) { - ::rtl::OUString aCompare = rFuncData.GetUpperLocal(); // as used in FillFunctionDescFromData + OUString aCompare = rFuncData.GetUpperLocal(); // as used in FillFunctionDescFromData sal_uLong nCount = rFunctionList.GetCount(); for (sal_uLong nPos=0; nPos& xInterface, - const ::rtl::OUString& rServiceName ) + const OUString& rServiceName ) { uno::Reference xLoc( xInterface, uno::UNO_QUERY ); if ( xLoc.is() ) // optional in new add-ins @@ -1056,14 +1056,14 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference xFunc = pArray[nFuncPos]; if (xFunc.is()) { - rtl::OUString aFuncU = xFunc->getName(); + OUString aFuncU = xFunc->getName(); // stored function name: (service name).(function) - rtl::OUStringBuffer aFuncNameBuffer( rServiceName.getLength()+1+aFuncU.getLength()); + OUStringBuffer aFuncNameBuffer( rServiceName.getLength()+1+aFuncU.getLength()); aFuncNameBuffer.append(rServiceName); aFuncNameBuffer.append('.'); aFuncNameBuffer.append(aFuncU); - rtl::OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); + OUString aFuncName = aFuncNameBuffer.makeStringAndClear(); // internal names are skipped because no FuncData exists ScUnoAddInFuncData* pOldData = const_cast( GetFuncData( aFuncName ) ); @@ -1152,7 +1152,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::ReferenceisEmpty() ) { - ::rtl::OUString aDefName("arg"); - aDefName += ::rtl::OUString::valueOf( nArg+1 ); + OUString aDefName("arg"); + aDefName += OUString::valueOf( nArg+1 ); *rDesc.ppDefArgNames[nArg] = aDefName; } @@ -1319,7 +1319,7 @@ sal_Bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncDat //------------------------------------------------------------------------ -ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const ::rtl::OUString& rName, +ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const OUString& rName, long nParamCount ) : bValidCount( false ), nErrCode( errNoCode ), // before function was called @@ -1663,19 +1663,19 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) } } } - else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence > *)0 ) ) ) + else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence > *)0 ) ) ) { - const uno::Sequence< uno::Sequence >* pRowSeq = NULL; + const uno::Sequence< uno::Sequence >* pRowSeq = NULL; //! use pointer from any! - uno::Sequence< uno::Sequence > aSequence; + uno::Sequence< uno::Sequence > aSequence; if ( rNewRes >>= aSequence ) pRowSeq = &aSequence; if ( pRowSeq ) { long nRowCount = pRowSeq->getLength(); - const uno::Sequence* pRowArr = pRowSeq->getConstArray(); + const uno::Sequence* pRowArr = pRowSeq->getConstArray(); long nMaxColCount = 0; long nCol, nRow; for (nRow=0; nRowPutString( pColArr[nCol], static_cast(nCol), diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index ff36337ac7b1..5b41833ba445 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.cxx @@ -158,12 +158,12 @@ const ScUnoAddInHelpId pDateFuncHelpIds[] = // ============================================================================ -ScUnoAddInHelpIdGenerator::ScUnoAddInHelpIdGenerator( const ::rtl::OUString& rServiceName ) +ScUnoAddInHelpIdGenerator::ScUnoAddInHelpIdGenerator( const OUString& rServiceName ) { SetServiceName( rServiceName ); } -void ScUnoAddInHelpIdGenerator::SetServiceName( const ::rtl::OUString& rServiceName ) +void ScUnoAddInHelpIdGenerator::SetServiceName( const OUString& rServiceName ) { pCurrHelpIds = NULL; sal_uInt32 nSize = 0; @@ -182,10 +182,10 @@ void ScUnoAddInHelpIdGenerator::SetServiceName( const ::rtl::OUString& rServiceN nArrayCount = nSize / sizeof( ScUnoAddInHelpId ); } -rtl::OString ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncName ) const +OString ScUnoAddInHelpIdGenerator::GetHelpId( const OUString& rFuncName ) const { if( !pCurrHelpIds || !nArrayCount ) - return rtl::OString(); + return OString(); const ScUnoAddInHelpId* pFirst = pCurrHelpIds; const ScUnoAddInHelpId* pLast = pCurrHelpIds + nArrayCount - 1; @@ -202,7 +202,7 @@ rtl::OString ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncN pFirst = pMiddle + 1; } - return rtl::OString(); + return OString(); } diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 9a8fe8f5e22a..cdc13803a4cf 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -35,7 +35,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; const ScAddress::Details ScAddress::detailsOOOa1( formula::FormulaGrammar::CONV_OOO, 0, 0 ); @@ -363,7 +362,7 @@ static bool lcl_XL_getExternalDoc( const sal_Unicode** ppErrRet, String& rExtern { case sheet::ExternalLinkType::DOCUMENT : { - rtl::OUString aStr; + OUString aStr; if (!(rInfo.Data >>= aStr)) { OSL_TRACE( "ScRange::Parse_XL_Header: Data type mismatch for ExternalLinkInfo %d", i); @@ -1119,7 +1118,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd } else { - rtl::OUString aTmp( p ); + OUString aTmp( p ); long n = aTmp.toInt32() - 1; while (CharClass::isAsciiDigit( *p )) p++; @@ -1698,7 +1697,7 @@ void ScAddress::Format( String& r, sal_uInt16 nFlags, const ScDocument* pDoc, if( nFlags & SCA_TAB_3D ) { String aTabName, aDocName; - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); aTabName = aTmp; // TODO: remove use of String here. // External Reference, same as in ScCompiler::MakeTabStr() @@ -1775,7 +1774,7 @@ lcl_Split_DocTab( const ScDocument* pDoc, SCTAB nTab, sal_uInt16 nFlags, String& rTabName, String& rDocName ) { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); rTabName = aTmp; rDocName.Erase(); @@ -2033,7 +2032,7 @@ String ScRefAddress::GetRefString( ScDocument* pDoc, SCTAB nActTab, //------------------------------------------------------------------------ -void ScColToAlpha( rtl::OUStringBuffer& rBuf, SCCOL nCol ) +void ScColToAlpha( OUStringBuffer& rBuf, SCCOL nCol ) { if (nCol < 26*26) { diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index b333155fb1b4..45a256e6daa2 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -33,7 +33,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //======================================================================== // ScAppOptions - Applikations-Optionen diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx index dc07cda3b5f7..ec010497a1ba 100644 --- a/sc/source/core/tool/cellkeytranslator.cxx +++ b/sc/source/core/tool/cellkeytranslator.cxx @@ -30,7 +30,6 @@ using ::com::sun::star::lang::Locale; using ::com::sun::star::uno::Sequence; using ::std::list; using ::boost::unordered_map; -using ::rtl::OUString; using namespace ::com::sun::star; @@ -84,7 +83,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, { // Since no locale nor opcode matching is needed, simply return // the first item on the list. - rName = rtl::OUString::createFromAscii( itr->second.front().mpName ); + rName = OUString::createFromAscii( itr->second.front().mpName ); return; } @@ -104,7 +103,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( eLevel == LOCALE_MATCH_ALL ) { // Name with matching opcode and locale found. - rName = rtl::OUString::createFromAscii( itrList->mpName ); + rName = OUString::createFromAscii( itrList->mpName ); return; } else if ( eLevel > eLocaleMatchLevel ) @@ -125,7 +124,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( itrList->meOpCode == eOpCode ) { // Name with a matching opcode preferred. - rName = rtl::OUString::createFromAscii( itrList->mpName ); + rName = OUString::createFromAscii( itrList->mpName ); return; } } @@ -135,7 +134,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, if ( eLevel == LOCALE_MATCH_ALL ) { // Name with matching locale preferred. - rName = rtl::OUString::createFromAscii( itrList->mpName ); + rName = OUString::createFromAscii( itrList->mpName ); return; } else if ( eLevel > eLocaleMatchLevel ) @@ -148,7 +147,7 @@ static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, } // No preferred strings found. Return the best matching name. - rName = rtl::OUString::createFromAscii(aBestMatchName); + rName = OUString::createFromAscii(aBestMatchName); } void ScCellKeywordTranslator::transKeyword(String& rName, const Locale* pLocale, OpCode eOpCode) @@ -162,7 +161,7 @@ void ScCellKeywordTranslator::transKeyword(String& rName, const Locale* pLocale, lclMatchKeyword(rName, spInstance->maStringNameMap, eOpCode, pLocale); } -void ScCellKeywordTranslator::transKeyword(rtl::OUString& rName, const Locale* pLocale, OpCode eOpCode) +void ScCellKeywordTranslator::transKeyword(OUString& rName, const Locale* pLocale, OpCode eOpCode) { String aName = rName; transKeyword(aName, pLocale, eOpCode); @@ -225,7 +224,7 @@ void ScCellKeywordTranslator::addToMap(const String& rKey, const sal_Char* pName void ScCellKeywordTranslator::addToMap(const TransItem* pItems, const Locale& rLocale) { for (sal_uInt16 i = 0; pItems[i].from != NULL; ++i) - addToMap(rtl::OUString(pItems[i].from), pItems[i].to, rLocale, pItems[i].func); + addToMap(OUString(pItems[i].from), pItems[i].to, rLocale, pItems[i].func); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 26716c1a8e65..7abb78751816 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -32,8 +32,6 @@ #include using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 67da7473c54d..0b0f7a1197ee 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -107,7 +107,7 @@ boost::unordered_set& ScChartListener::ExternalRefListener::getAllFi // ---------------------------------------------------------------------------- -ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP, +ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, const ScRangeListRef& rRangeList ) : SvtListener(), mpExtRefListener(NULL), @@ -122,7 +122,7 @@ ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP, ScRefTokenHelper::getTokensFromRangeList(*mpTokens, *rRangeList); } -ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP, vector* pTokens ) : +ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, vector* pTokens ) : SvtListener(), mpExtRefListener(NULL), mpTokens(pTokens), @@ -183,7 +183,7 @@ ScChartListener::~ScChartListener() } } -const rtl::OUString& ScChartListener::GetName() const +const OUString& ScChartListener::GetName() const { return maName; } @@ -465,17 +465,17 @@ void ScChartListenerCollection::StartAllListeners() void ScChartListenerCollection::insert(ScChartListener* pListener) { - rtl::OUString aName = pListener->GetName(); + OUString aName = pListener->GetName(); maListeners.insert(aName, pListener); } -ScChartListener* ScChartListenerCollection::findByName(const rtl::OUString& rName) +ScChartListener* ScChartListenerCollection::findByName(const OUString& rName) { ListenersType::iterator it = maListeners.find(rName); return it == maListeners.end() ? NULL : it->second; } -const ScChartListener* ScChartListenerCollection::findByName(const rtl::OUString& rName) const +const ScChartListener* ScChartListenerCollection::findByName(const OUString& rName) const { ListenersType::const_iterator it = maListeners.find(rName); return it == maListeners.end() ? NULL : it->second; @@ -501,17 +501,17 @@ ScChartListenerCollection::StringSetType& ScChartListenerCollection::getNonOleOb return maNonOleObjectNames; } -rtl::OUString ScChartListenerCollection::getUniqueName(const rtl::OUString& rPrefix) const +OUString ScChartListenerCollection::getUniqueName(const OUString& rPrefix) const { for (sal_Int32 nNum = 1; nNum < 10000; ++nNum) // arbitrary limit to prevent infinite loop. { - rtl::OUStringBuffer aBuf(rPrefix); + OUStringBuffer aBuf(rPrefix); aBuf.append(nNum); - rtl::OUString aTestName = aBuf.makeStringAndClear(); + OUString aTestName = aBuf.makeStringAndClear(); if (maListeners.find(aTestName) == maListeners.end()) return aTestName; } - return rtl::OUString(); + return OUString(); } void ScChartListenerCollection::ChangeListening( const String& rName, @@ -544,7 +544,7 @@ public: void operator() (ScChartListener* p) { - rtl::OUString aName = p->GetName(); + OUString aName = p->GetName(); mrListeners.insert(aName, p); } }; diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index cf0212851878..5425056769e0 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -68,7 +68,7 @@ ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScBigRange& rRange, const sal_uLong nTempAction, const sal_uLong nTempRejectAction, const ScChangeActionState eTempState, const DateTime& aTempDateTime, - const rtl::OUString& aTempUser, const rtl::OUString& aTempComment) : + const OUString& aTempUser, const OUString& aTempComment) : aBigRange( rRange ), aDateTime( aTempDateTime ), aUser( aTempUser ), @@ -431,7 +431,7 @@ void ScChangeAction::UpdateReference( const ScChangeTrack* /* pTrack */, void ScChangeAction::GetDescription( - rtl::OUString& rStr, ScDocument* /* pDoc */, bool /* bSplitRange */, bool bWarning ) const + OUString& rStr, ScDocument* /* pDoc */, bool /* bSplitRange */, bool bWarning ) const { if (!IsRejecting() || !bWarning) return; @@ -440,7 +440,7 @@ void ScChangeAction::GetDescription( // not properly restored in formulas. See specification at // http://specs.openoffice.org/calc/ease-of-use/redlining_comment.sxw - rtl::OUStringBuffer aBuf(rStr); // Take the original string. + OUStringBuffer aBuf(rStr); // Take the original string. if (GetType() == SC_CAT_MOVE) { aBuf.append( @@ -515,10 +515,10 @@ void ScChangeAction::GetDescription( } -rtl::OUString ScChangeAction::GetRefString( +OUString ScChangeAction::GetRefString( const ScBigRange& rRange, ScDocument* pDoc, bool bFlag3D ) const { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_uInt16 nFlags = ( rRange.IsValid( pDoc ) ? SCA_VALID : 0 ); if ( !nFlags ) aBuf.append(ScGlobal::GetRscString(STR_NOREF_STR)); @@ -531,7 +531,7 @@ rtl::OUString ScChangeAction::GetRefString( case SC_CAT_DELETE_COLS : if ( bFlag3D ) { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName( aTmpRange.aStart.Tab(), aTmp ); aBuf.append(aTmp); aBuf.append(sal_Unicode('.')); @@ -544,7 +544,7 @@ rtl::OUString ScChangeAction::GetRefString( case SC_CAT_DELETE_ROWS : if ( bFlag3D ) { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName( aTmpRange.aStart.Tab(), aTmp ); aBuf.append(aTmp); aBuf.append(sal_Unicode('.')); @@ -558,7 +558,7 @@ rtl::OUString ScChangeAction::GetRefString( if ( bFlag3D || GetType() == SC_CAT_INSERT_TABS ) nFlags |= SCA_TAB_3D; - rtl::OUString aTmp; + OUString aTmp; aTmpRange.Format(aTmp, nFlags, pDoc, pDoc->GetAddressConvention()); aBuf.append(aTmp); } @@ -572,28 +572,28 @@ rtl::OUString ScChangeAction::GetRefString( return aBuf.makeStringAndClear(); } -const rtl::OUString& ScChangeAction::GetUser() const +const OUString& ScChangeAction::GetUser() const { return aUser; } -void ScChangeAction::SetUser( const rtl::OUString& r ) +void ScChangeAction::SetUser( const OUString& r ) { aUser = r; } -const rtl::OUString& ScChangeAction::GetComment() const +const OUString& ScChangeAction::GetComment() const { return aComment; } -void ScChangeAction::SetComment( const rtl::OUString& rStr ) +void ScChangeAction::SetComment( const OUString& rStr ) { aComment = rStr; } void ScChangeAction::GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const + OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { rStr = GetRefString( GetBigRange(), pDoc, bFlag3D ); } @@ -717,8 +717,8 @@ ScChangeActionIns::ScChangeActionIns( const ScRange& rRange ) ScChangeActionIns::ScChangeActionIns( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aBigRangeP, - const rtl::OUString& aUserP, const DateTime& aDateTimeP, - const rtl::OUString& sComment, const ScChangeActionType eTypeP) : + const OUString& aUserP, const DateTime& aDateTimeP, + const OUString& sComment, const ScChangeActionType eTypeP) : ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment) { } @@ -728,7 +728,7 @@ ScChangeActionIns::~ScChangeActionIns() } void ScChangeActionIns::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); @@ -745,15 +745,15 @@ void ScChangeActionIns::GetDescription( nWhatId = STR_AREA; } - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_INSERT); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_INSERT); sal_Int32 nPos = aRsc.indexOfAsciiL("#1", 2); if (nPos >= 0) { // Construct a range string to replace '#1' first. - rtl::OUStringBuffer aBuf(ScGlobal::GetRscString(nWhatId)); + OUStringBuffer aBuf(ScGlobal::GetRscString(nWhatId)); aBuf.append(sal_Unicode(' ')); aBuf.append(GetRefString(GetBigRange(), pDoc)); - rtl::OUString aRangeStr = aBuf.makeStringAndClear(); + OUString aRangeStr = aBuf.makeStringAndClear(); aRsc = aRsc.replaceAt(nPos, 2, aRangeStr); // replace '#1' with the range string. @@ -837,7 +837,7 @@ ScChangeActionDel::ScChangeActionDel( const ScRange& rRange, ScChangeActionDel::ScChangeActionDel( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aBigRangeP, - const rtl::OUString& aUserP, const DateTime& aDateTimeP, const rtl::OUString &sComment, + const OUString& aUserP, const DateTime& aDateTimeP, const OUString &sComment, const ScChangeActionType eTypeP, const SCsCOLROW nD, ScChangeTrack* pTrackP) : // wich of nDx and nDy is set is depend on the type ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment), pTrack( pTrackP ), @@ -973,7 +973,7 @@ ScBigRange ScChangeActionDel::GetOverAllRange() const void ScChangeActionDel::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); @@ -1002,16 +1002,16 @@ void ScChangeActionDel::GetDescription( aTmpRange.aEnd.SetRow( aTmpRange.aEnd.Row() + GetDy() ); } - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_DELETE); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_DELETE); sal_Int32 nPos = aRsc.indexOfAsciiL("#1", 2); if (nPos >= 0) { // Build a string to replace with. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(ScGlobal::GetRscString(nWhatId)); aBuf.append(sal_Unicode(' ')); aBuf.append(GetRefString(aTmpRange, pDoc)); - rtl::OUString aRangeStr = aBuf.makeStringAndClear(); + OUString aRangeStr = aBuf.makeStringAndClear(); aRsc = aRsc.replaceAt(nPos, 2, aRangeStr); // replace '#1' with the string. aBuf.append(rStr).append(aRsc); @@ -1064,7 +1064,7 @@ bool ScChangeActionDel::Reject( ScDocument* pDoc ) case SC_CAT_DELETE_TABS : { //2do: Tabellennamen merken? - rtl::OUString aName; + OUString aName; pDoc->CreateValidTabName( aName ); if ( ( bOk = pDoc->ValidNewTabName( aName ) ) != false ) bOk = pDoc->InsertTab( aRange.aStart.Tab(), aName ); @@ -1182,8 +1182,8 @@ void ScChangeActionDel::UndoCutOffInsert() ScChangeActionMove::ScChangeActionMove( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aToBigRange, - const rtl::OUString& aUserP, const DateTime& aDateTimeP, - const rtl::OUString &sComment, const ScBigRange& aFromBigRange, + const OUString& aUserP, const DateTime& aDateTimeP, + const OUString &sComment, const ScBigRange& aFromBigRange, ScChangeTrack* pTrackP) : // wich of nDx and nDy is set is depend on the type ScChangeAction(SC_CAT_MOVE, aToBigRange, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment), aFromRange(aFromBigRange), @@ -1234,15 +1234,15 @@ void ScChangeActionMove::GetDelta( sal_Int32& nDx, sal_Int32& nDy, sal_Int32& nD void ScChangeActionMove::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); bool bFlag3D = GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab(); - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_MOVE); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_MOVE); - rtl::OUString aTmpStr = ScChangeAction::GetRefString(GetFromRange(), pDoc, bFlag3D); + OUString aTmpStr = ScChangeAction::GetRefString(GetFromRange(), pDoc, bFlag3D); sal_Int32 nPos = aRsc.indexOfAsciiL("#1", 2); if (nPos >= 0) { @@ -1258,19 +1258,19 @@ void ScChangeActionMove::GetDescription( nPos += aTmpStr.getLength(); } - rtl::OUStringBuffer aBuf(rStr); // append to the original string. + OUStringBuffer aBuf(rStr); // append to the original string. aBuf.append(aRsc); rStr = aBuf.makeStringAndClear(); } void ScChangeActionMove::GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const + OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { if ( !bFlag3D ) bFlag3D = ( GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab() ); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(ScChangeAction::GetRefString(GetFromRange(), pDoc, bFlag3D)); aBuf.append(sal_Unicode(',')); aBuf.append(sal_Unicode(' ')); @@ -1501,13 +1501,13 @@ void ScChangeActionContent::SetOldValue( const OUString& rOld, ScDocument* pDoc } -void ScChangeActionContent::GetOldString( rtl::OUString& rStr ) const +void ScChangeActionContent::GetOldString( OUString& rStr ) const { GetValueString(rStr, maOldValue, maOldCell); } -void ScChangeActionContent::GetNewString( rtl::OUString& rStr ) const +void ScChangeActionContent::GetNewString( OUString& rStr ) const { GetValueString(rStr, maNewValue, maNewCell); } @@ -1523,13 +1523,13 @@ const ScCellValue& ScChangeActionContent::GetNewCell() const } void ScChangeActionContent::GetDescription( - rtl::OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const + OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); - rtl::OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_CELL); + OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_CELL); - rtl::OUString aTmpStr; + OUString aTmpStr; GetRefString(aTmpStr, pDoc); sal_Int32 nPos = 0; @@ -1562,14 +1562,14 @@ void ScChangeActionContent::GetDescription( nPos += aTmpStr.getLength(); } - rtl::OUStringBuffer aBuf(rStr); // append to the original string. + OUStringBuffer aBuf(rStr); // append to the original string. aBuf.append(aRsc); rStr = aBuf.makeStringAndClear(); } void ScChangeActionContent::GetRefString( - rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const + OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { sal_uInt16 nFlags = ( GetBigRange().IsValid( pDoc ) ? SCA_VALID : 0 ); if ( nFlags ) @@ -1595,7 +1595,7 @@ void ScChangeActionContent::GetRefString( if ( IsDeletedIn() ) { // Insert the parentheses. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(sal_Unicode('(')); aBuf.append(rStr); aBuf.append(sal_Unicode(')')); @@ -1882,7 +1882,7 @@ void ScChangeActionContent::GetValueString( void ScChangeActionContent::GetFormulaString( - rtl::OUString& rStr, const ScFormulaCell* pCell ) const + OUString& rStr, const ScFormulaCell* pCell ) const { ScAddress aPos( aBigRange.aStart.MakeAddress() ); if ( aPos == pCell->aPos || IsDeletedIn() ) @@ -2148,8 +2148,8 @@ bool ScChangeActionContent::IsOldMatrixReference() const ScChangeActionReject::ScChangeActionReject( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, - const ScBigRange& aBigRangeP, const rtl::OUString& aUserP, - const DateTime& aDateTimeP, const rtl::OUString& sComment) : + const ScBigRange& aBigRangeP, const OUString& aUserP, + const DateTime& aDateTimeP, const OUString& sComment) : ScChangeAction(SC_CAT_CONTENT, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment) { } @@ -2189,7 +2189,7 @@ ScChangeTrack::ScChangeTrack( ScDocument* pDocP ) : memset( ppContentSlots, 0, nContentSlots * sizeof( ScChangeActionContent* ) ); } -ScChangeTrack::ScChangeTrack( ScDocument* pDocP, const std::set& aTempUserCollection) : +ScChangeTrack::ScChangeTrack( ScDocument* pDocP, const std::set& aTempUserCollection) : maUserCollection(aTempUserCollection), aFixDateTime( DateTime::SYSTEM ), pDoc( pDocP ) @@ -2235,7 +2235,7 @@ void ScChangeTrack::Init() bTime100thSeconds = true; const SvtUserOptions& rUserOpt = SC_MOD()->GetUserOptions(); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rUserOpt.GetFirstName()); aBuf.append(sal_Unicode(' ')); aBuf.append(rUserOpt.GetLastName()); @@ -2301,11 +2301,11 @@ void ScChangeTrack::Clear() aGeneratedMap.clear(); aPasteCutMap.clear(); maUserCollection.clear(); - maUser = rtl::OUString(); + maUser = OUString(); Init(); } -const std::set& ScChangeTrack::GetUserCollection() const +const std::set& ScChangeTrack::GetUserCollection() const { return maUserCollection; } @@ -2317,7 +2317,7 @@ void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI const SvtUserOptions& rUserOptions = SC_MOD()->GetUserOptions(); size_t nOldCount = maUserCollection.size(); - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rUserOptions.GetFirstName()); aBuf.append(sal_Unicode(' ')); aBuf.append(rUserOptions.GetLastName()); @@ -2338,7 +2338,7 @@ void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI } -void ScChangeTrack::SetUser( const rtl::OUString& rUser ) +void ScChangeTrack::SetUser( const OUString& rUser ) { if ( IsLoadSave() ) return ; // nicht die Collection zerschiessen @@ -2347,7 +2347,7 @@ void ScChangeTrack::SetUser( const rtl::OUString& rUser ) maUserCollection.insert(maUser); } -const rtl::OUString& ScChangeTrack::GetUser() const +const OUString& ScChangeTrack::GetUser() const { return maUser; } @@ -4520,7 +4520,7 @@ bool ScChangeTrack::Reject( sal_uLong ScChangeTrack::AddLoadedGenerated( - const ScCellValue& rNewCell, const ScBigRange& aBigRange, const rtl::OUString& sNewValue ) + const ScCellValue& rNewCell, const ScBigRange& aBigRange, const OUString& sNewValue ) { ScChangeActionContent* pAct = new ScChangeActionContent( --nGeneratedMin, rNewCell, aBigRange, pDoc, sNewValue ); if ( pAct ) diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx index 2a63d4c1de00..06f1f292f9c0 100644 --- a/sc/source/core/tool/chgviset.cxx +++ b/sc/source/core/tool/chgviset.cxx @@ -81,7 +81,7 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const ScChangeViewSetting return *this; } -sal_Bool ScChangeViewSettings::IsValidComment(const ::rtl::OUString* pCommentStr) const +sal_Bool ScChangeViewSettings::IsValidComment(const OUString* pCommentStr) const { sal_Bool nTheFlag=sal_True; @@ -94,7 +94,7 @@ sal_Bool ScChangeViewSettings::IsValidComment(const ::rtl::OUString* pCommentStr return nTheFlag; } -void ScChangeViewSettings::SetTheComment(const ::rtl::OUString& rString) +void ScChangeViewSettings::SetTheComment(const OUString& rString) { aComment=rString; if(pCommentSearcher!=NULL) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index e17500d48f8a..1e099602e1a7 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -66,7 +66,6 @@ using namespace formula; using namespace ::com::sun::star; -using ::rtl::OUString; using ::std::vector; diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 29084b508392..82330711840a 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -36,7 +36,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index 24a7b6b4016f..849cf7853acb 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -34,7 +34,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------------ diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index aa07053f52b9..f7d873cb61a8 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -28,7 +28,6 @@ #include #include -using ::rtl::OUString; using ::std::auto_ptr; using ::std::vector; @@ -186,7 +185,7 @@ bool lcl_createExcelQuery( if (nIndex < nNewEntries) { pParam->GetEntry(nIndex).nField = aFields[nCol]; - pParam->FillInExcelSyntax(rtl::OUString(aCellStr), nIndex); + pParam->FillInExcelSyntax(OUString(aCellStr), nIndex); nIndex++; if (nIndex < nNewEntries) pParam->GetEntry(nIndex).eConnect = SC_AND; diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 4e1955ce7494..790fc7de0f68 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -685,7 +685,7 @@ String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, { const SvxFieldData* pFieldData = rField.GetField(); if (!pFieldData) - return rtl::OUString("?"); + return OUString("?"); OUString aRet; sal_Int32 nClsId = pFieldData->GetClassId(); @@ -753,11 +753,11 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 /* nPara */, sal_uInt16 /* nPos */, Color*& rTxtColor, Color*& /* rFldColor */ ) { - rtl::OUString aRet; + OUString aRet; const SvxFieldData* pFieldData = rField.GetField(); if (!pFieldData) - return rtl::OUString(" "); + return OUString(" "); sal_uInt16 nClsId = pFieldData->GetClassId(); switch (nClsId) @@ -765,7 +765,7 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, case text::textfield::Type::URL: { const SvxURLField* pField = static_cast(pFieldData); - rtl::OUString aURL = pField->GetURL(); + OUString aURL = pField->GetURL(); switch (pField->GetFormat()) { @@ -810,7 +810,7 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, { const SvxTableField* pField = static_cast(pFieldData); SCTAB nTab = pField->GetTab(); - rtl::OUString aName; + OUString aName; if (mpDoc->GetName(nTab, aName)) aRet = aName; else diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index a825dda1ffe4..ca4f27cfa0fb 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.cxx @@ -26,7 +26,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------ diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 01ebadaad9a1..4a57c07134c0 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -39,7 +39,6 @@ using namespace utl; using namespace com::sun::star::uno; using ::com::sun::star::lang::Locale; using ::com::sun::star::i18n::LocaleDataItem; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx index 0c0231cdef2d..91c066c0bc96 100644 --- a/sc/source/core/tool/formulaparserpool.cxx +++ b/sc/source/core/tool/formulaparserpool.cxx @@ -29,8 +29,6 @@ #include #include "document.hxx" -using ::rtl::OUString; -using ::rtl::OUStringHash; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx index 791dbadcea86..ed1dc772d660 100644 --- a/sc/source/core/tool/formularesult.cxx +++ b/sc/source/core/tool/formularesult.cxx @@ -420,7 +420,7 @@ void ScFormulaResult::SetHybridDouble( double f ) } } -void ScFormulaResult::SetHybridString( const rtl::OUString & rStr ) +void ScFormulaResult::SetHybridString( const OUString & rStr ) { // Obtain values before changing anything. double f = GetDouble(); diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index eb12f797abda..6f056d6036fe 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -31,7 +31,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //======================================================================== // ScInputOptions - input options diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 0bbeab951802..d35eebd9f1c8 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -79,7 +79,6 @@ bool ScInterpreter::bGlobalStackInUse = false; using namespace formula; using ::std::auto_ptr; -using ::rtl::OUString; struct ScCompare { diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index cdb1535d6518..883a2e91df12 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2919,7 +2919,7 @@ inline void lclSplitBlock( double& rfInt, sal_Int32& rnBlock, double fValue, dou } /** Appends a digit (0 to 9) to the passed string. */ -void lclAppendDigit( rtl::OStringBuffer& rText, sal_Int32 nDigit ) +void lclAppendDigit( OStringBuffer& rText, sal_Int32 nDigit ) { switch( nDigit ) { @@ -2941,7 +2941,7 @@ void lclAppendDigit( rtl::OStringBuffer& rText, sal_Int32 nDigit ) @param nDigit A digit in the range from 1 to 9. @param nPow10 A value in the range from 2 to 5. */ -void lclAppendPow10( rtl::OStringBuffer& rText, sal_Int32 nDigit, sal_Int32 nPow10 ) +void lclAppendPow10( OStringBuffer& rText, sal_Int32 nDigit, sal_Int32 nPow10 ) { OSL_ENSURE( (1 <= nDigit) && (nDigit <= 9), "lclAppendPow10 - illegal digit" ); lclAppendDigit( rText, nDigit ); @@ -2956,7 +2956,7 @@ void lclAppendPow10( rtl::OStringBuffer& rText, sal_Int32 nDigit, sal_Int32 nPow } /** Appends a block of 6 digits (value from 1 to 999,999) to the passed string. */ -void lclAppendBlock( rtl::OStringBuffer& rText, sal_Int32 nValue ) +void lclAppendBlock( OStringBuffer& rText, sal_Int32 nValue ) { OSL_ENSURE( (1 <= nValue) && (nValue <= 999999), "lclAppendBlock - illegal value" ); if( nValue >= 100000 ) @@ -3027,7 +3027,7 @@ void ScInterpreter::ScBahtText() sal_Int32 nSatang = 0; lclSplitBlock( fBaht, nSatang, fValue, 100.0 ); - rtl::OStringBuffer aText; + OStringBuffer aText; // generate text for Baht value if( fBaht == 0.0 ) @@ -3037,7 +3037,7 @@ void ScInterpreter::ScBahtText() } else while( fBaht > 0.0 ) { - rtl::OStringBuffer aBlock; + OStringBuffer aBlock; sal_Int32 nBlock = 0; lclSplitBlock( fBaht, nBlock, fBaht, 1.0e6 ); if( nBlock > 0 ) @@ -3045,7 +3045,7 @@ void ScInterpreter::ScBahtText() // add leading "million", if there will come more blocks if( fBaht > 0.0 ) aBlock.insert( - 0, rtl::OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_1E6))); + 0, OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_1E6))); aText.insert(0, aBlock.makeStringAndClear()); } @@ -3066,9 +3066,9 @@ void ScInterpreter::ScBahtText() // add the minus sign if( bMinus ) aText.insert( - 0, rtl::OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_MINUS))); + 0, OString(RTL_CONSTASCII_STRINGPARAM(UTF8_TH_MINUS))); - PushString( rtl::OStringToOUString(aText.makeStringAndClear(), RTL_TEXTENCODING_UTF8) ); + PushString( OStringToOUString(aText.makeStringAndClear(), RTL_TEXTENCODING_UTF8) ); } } diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index e24fc6644d3c..40d5d83444ae 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -703,7 +703,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } if (bOk) { - rtl::OString aTmp(OUStringToOString(aStr, + OString aTmp(OUStringToOString(aStr, osl_getThreadTextEncoding())); // In case the xub_StrLen will be longer than USHORT // one day, and room for pad byte check. @@ -827,7 +827,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } else { - rtl::OString aTmp(OUStringToOString(aStr, + OString aTmp(OUStringToOString(aStr, osl_getThreadTextEncoding())); // In case the xub_StrLen will be longer than USHORT // one day, and room for pad byte check. @@ -2548,7 +2548,7 @@ void ScInterpreter::ScExternal() break; case PTR_STRING : { - rtl::OString aStr(OUStringToOString(GetString(), + OString aStr(OUStringToOString(GetString(), osl_getThreadTextEncoding())); if ( aStr.getLength() >= ADDIN_MAXSTRLEN ) SetError( errStringOverflow ); diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index 3836940012ee..3a7417e92f55 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.cxx @@ -36,12 +36,12 @@ sal_Bool ScOptionsUtil::IsMetricSystem() //------------------------------------------------------------------ -ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString& rSubTree ) : +ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree ) : ConfigItem( rSubTree ) { } -ScLinkConfigItem::ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode ) : +ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree, sal_Int16 nMode ) : ConfigItem( rSubTree, nMode ) { } @@ -51,7 +51,7 @@ void ScLinkConfigItem::SetCommitLink( const Link& rLink ) aCommitLink = rLink; } -void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence& /* aPropertyNames */ ) +void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence& /* aPropertyNames */ ) { //! not implemented yet... } diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index b4187c593d8f..02a697d133d3 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -336,7 +336,7 @@ ScParameterClassification::GetExternalParameterType( const formula::FormulaToken { Type eRet = Unknown; // similar to ScInterpreter::ScExternal() - rtl::OUString aFuncName = ScGlobal::pCharClass->uppercase( pToken->GetExternal()); + OUString aFuncName = ScGlobal::pCharClass->uppercase( pToken->GetExternal()); { const FuncData* pFuncData = ScGlobal::GetFuncCollection()->findByName(aFuncName); if (pFuncData) @@ -360,7 +360,7 @@ ScParameterClassification::GetExternalParameterType( const formula::FormulaToken } } - rtl::OUString aUnoName = + OUString aUnoName = ScGlobal::GetAddInCollection()->FindFunction(aFuncName, false); if (!aUnoName.isEmpty()) @@ -434,9 +434,9 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource() } if ( nArgs > CommonData::nMaxParams ) { - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; aBuf.append("ScParameterClassification::Init: too many arguments in listed function: "); - aBuf.append(rtl::OUStringToOString(*(pDesc->pFuncName), RTL_TEXTENCODING_UTF8)); + aBuf.append(OUStringToOString(*(pDesc->pFuncName), RTL_TEXTENCODING_UTF8)); aBuf.append(": "); aBuf.append(sal_Int32(nArgs)); OSL_FAIL( aBuf.getStr()); @@ -485,7 +485,7 @@ void ScParameterClassification::GenerateDocumentation() if ( xMap->getSymbol(eOp).Len() ) { fprintf( stdout, "%s: ", aEnvVarName); - rtl::OStringBuffer aStr(rtl::OUStringToOString(xMap->getSymbol(eOp), RTL_TEXTENCODING_UTF8)); + OStringBuffer aStr(OUStringToOString(xMap->getSymbol(eOp), RTL_TEXTENCODING_UTF8)); aStr.append('('); formula::FormulaByteToken aToken( eOp); sal_uInt8 nParams = GetMinimumParameters( eOp); diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 154ac47868a8..1ec3ea36d73d 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -26,7 +26,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // ----------------------------------------------------------------------- diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index c87cf8fe14be..1ac1a899327b 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -95,7 +95,7 @@ void ScQueryEntry::SetQueryByEmpty() maQueryItems.resize(1); Item& rItem = maQueryItems[0]; rItem.meType = ByEmpty; - rItem.maString = rtl::OUString(); + rItem.maString = OUString(); rItem.mfVal = SC_EMPTYFIELDS; } @@ -117,7 +117,7 @@ void ScQueryEntry::SetQueryByNonEmpty() maQueryItems.resize(1); Item& rItem = maQueryItems[0]; rItem.meType = ByEmpty; - rItem.maString = rtl::OUString(); + rItem.maString = OUString(); rItem.mfVal = SC_NONEMPTYFIELDS; } @@ -178,7 +178,7 @@ utl::TextSearch* ScQueryEntry::GetSearchTextPtr( bool bCaseSens ) const { if ( !pSearchParam ) { - const rtl::OUString& rStr = maQueryItems[0].maString; + const OUString& rStr = maQueryItems[0].maString; pSearchParam = new utl::SearchParam( rStr, utl::SearchParam::SRCH_REGEXP, bCaseSens, false, false); pSearchText = new utl::TextSearch( *pSearchParam, *ScGlobal::pCharClass ); diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index d0f637bd5660..826ea3e3981e 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -165,7 +165,7 @@ void ScQueryParamBase::Resize(size_t nNew) } } -void ScQueryParamBase::FillInExcelSyntax(const rtl::OUString& rStr, SCSIZE nIndex) +void ScQueryParamBase::FillInExcelSyntax(const OUString& rStr, SCSIZE nIndex) { const String aCellStr = rStr; if (aCellStr.Len() > 0) diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index af2fb6e1fdee..8f37c136af74 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -240,7 +240,7 @@ void ScRangeList::Format( String& rStr, sal_uInt16 nFlags, ScDocument* pDoc, } -void ScRangeList::Format( rtl::OUString& rStr, sal_uInt16 nFlags, ScDocument* pDoc, +void ScRangeList::Format( OUString& rStr, sal_uInt16 nFlags, ScDocument* pDoc, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cDelimiter ) const { @@ -1356,7 +1356,7 @@ int SAL_CALL ScRangePairList_QsortNameCompare( const void* p1, const void* p2 ) const ScRangePairNameSort* ps2 = (const ScRangePairNameSort*)p2; const ScAddress& rStartPos1 = ps1->pPair->GetRange(0).aStart; const ScAddress& rStartPos2 = ps2->pPair->GetRange(0).aStart; - rtl::OUString aStr1, aStr2; + OUString aStr1, aStr2; sal_Int32 nComp; if ( rStartPos1.Tab() == rStartPos2.Tab() ) nComp = COMPARE_EQUAL; diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index ecd4a8ea6f3a..b833fecb889c 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -37,14 +37,13 @@ using namespace formula; using ::std::pair; using ::std::unary_function; -using ::rtl::OUString; //======================================================================== // ScRangeData //======================================================================== ScRangeData::ScRangeData( ScDocument* pDok, - const rtl::OUString& rName, + const OUString& rName, const String& rSymbol, const ScAddress& rAddress, RangeType nType, @@ -76,7 +75,7 @@ ScRangeData::ScRangeData( ScDocument* pDok, } ScRangeData::ScRangeData( ScDocument* pDok, - const rtl::OUString& rName, + const OUString& rName, const ScTokenArray& rArr, const ScAddress& rAddress, RangeType nType ) : @@ -96,7 +95,7 @@ ScRangeData::ScRangeData( ScDocument* pDok, } ScRangeData::ScRangeData( ScDocument* pDok, - const rtl::OUString& rName, + const OUString& rName, const ScAddress& rTarget ) : aName ( rName ), aUpperName ( ScGlobal::pCharClass->uppercase( rName ) ), @@ -257,7 +256,7 @@ void ScRangeData::GetSymbol( OUString& rSymbol, const ScAddress& rPos, const For rSymbol = aStr; } -void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& rPos, +void ScRangeData::UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress& rPos, const FormulaGrammar::Grammar eGrammar ) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -833,7 +832,7 @@ bool ScRangeName::insert(ScRangeData* p) p->SetIndex(maIndexToData.size() + 1); } - rtl::OUString aName(p->GetUpperName()); + OUString aName(p->GetUpperName()); erase(aName); // ptr_map won't insert it if a duplicate name exists. pair r = maData.insert(aName, p); if (r.second) @@ -852,7 +851,7 @@ void ScRangeName::erase(const ScRangeData& r) erase(r.GetUpperName()); } -void ScRangeName::erase(const rtl::OUString& rName) +void ScRangeName::erase(const OUString& rName) { DataType::iterator itr = maData.find(rName); if (itr != maData.end()) diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index 957548121f43..a892eb408373 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -181,12 +181,12 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, ScDocument* pDoc, c bool bHasErrors = false; - uno::Sequence< uno::Sequence > aRowSeq( nRowCount ); - uno::Sequence* pRowAry = aRowSeq.getArray(); + uno::Sequence< uno::Sequence > aRowSeq( nRowCount ); + uno::Sequence* pRowAry = aRowSeq.getArray(); for (long nRow = 0; nRow < nRowCount; nRow++) { - uno::Sequence aColSeq( nColCount ); - rtl::OUString* pColAry = aColSeq.getArray(); + uno::Sequence aColSeq( nColCount ); + OUString* pColAry = aColSeq.getArray(); for (long nCol = 0; nCol < nColCount; nCol++) { sal_uInt16 nErrCode = pDoc->GetStringForFormula( @@ -213,12 +213,12 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa SCSIZE nRowCount; pMatrix->GetDimensions( nColCount, nRowCount ); - uno::Sequence< uno::Sequence > aRowSeq( static_cast(nRowCount) ); - uno::Sequence* pRowAry = aRowSeq.getArray(); + uno::Sequence< uno::Sequence > aRowSeq( static_cast(nRowCount) ); + uno::Sequence* pRowAry = aRowSeq.getArray(); for (SCSIZE nRow = 0; nRow < nRowCount; nRow++) { - uno::Sequence aColSeq( static_cast(nColCount) ); - rtl::OUString* pColAry = aColSeq.getArray(); + uno::Sequence aColSeq( static_cast(nColCount) ); + OUString* pColAry = aColSeq.getArray(); for (SCSIZE nCol = 0; nCol < nColCount; nCol++) { String aStr; @@ -233,7 +233,7 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMa Color* pColor; pFormatter->GetOutputString( fVal, 0, aStr, &pColor ); } - pColAry[nCol] = rtl::OUString( aStr ); + pColAry[nCol] = OUString( aStr ); } pRowAry[nRow] = aColSeq; @@ -314,7 +314,7 @@ sal_Bool ScRangeToSequence::FillMixedArray( uno::Any& rAny, const ScMatrix* pMat String aStr; if ( !pMatrix->IsEmpty( nCol, nRow ) ) aStr = pMatrix->GetString( nCol, nRow ); - pColAry[nCol] <<= rtl::OUString( aStr ); + pColAry[nCol] <<= OUString( aStr ); } else { @@ -385,7 +385,7 @@ ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const com::sun::star::uno::An } if ( nMaxColCount && nRowCount ) { - rtl::OUString aUStr; + OUString aUStr; xMatrix = new ScMatrix( static_cast(nMaxColCount), static_cast(nRowCount), 0.0); diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 2f3f43972a48..e318466319b4 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -28,8 +28,6 @@ #include "externalrefmgr.hxx" #include "compiler.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::formula::FormulaGrammar; using namespace ::com::sun::star; @@ -267,13 +265,13 @@ sal_Bool ScRangeUtil::MakeRangeFromName ( if( eScope==RUTL_NAMES ) { //first handle ui names like local1 (Sheet1), which point to a local range name - rtl::OUString aName(rName); + OUString aName(rName); sal_Int32 nEndPos = aName.lastIndexOf(')'); sal_Int32 nStartPos = aName.lastIndexOfAsciiL(" (",2); SCTAB nTable = nCurTab; if (nEndPos != -1 && nStartPos != -1) { - rtl::OUString aSheetName = aName.copy(nStartPos+2, nEndPos-nStartPos-2); + OUString aSheetName = aName.copy(nStartPos+2, nEndPos-nStartPos-2); if (pDoc->GetTable(aSheetName, nTable)) { aName = aName.copy(0, nStartPos); @@ -357,7 +355,7 @@ void ScRangeStringConverter::AssignString( if( !rNewStr.isEmpty() ) { if( !rString.isEmpty() ) - rString += rtl::OUString(cSeperator); + rString += OUString(cSeperator); rString += rNewStr; } } @@ -794,7 +792,7 @@ void ScRangeStringConverter::GetStringFromRangeList( } static void lcl_appendCellAddress( - rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell, + OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell, const ScAddress::ExternalInfo& rExtInfo) { if (rExtInfo.mbExternal) @@ -826,7 +824,7 @@ static void lcl_appendCellAddress( } static void lcl_appendCellRangeAddress( - rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell1, const ScAddress& rCell2, + OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell1, const ScAddress& rCell2, const ScAddress::ExternalInfo& rExtInfo1, const ScAddress::ExternalInfo& rExtInfo2) { if (rExtInfo1.mbExternal) @@ -994,11 +992,11 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con rString = aRetStr.makeStringAndClear(); } -ScRangeData* ScRangeStringConverter::GetRangeDataFromString(const rtl::OUString& rString, const SCTAB nTab, const ScDocument* pDoc) +ScRangeData* ScRangeStringConverter::GetRangeDataFromString(const OUString& rString, const SCTAB nTab, const ScDocument* pDoc) { ScRangeName* pLocalRangeName = pDoc->GetRangeName(nTab); ScRangeData* pData = NULL; - rtl::OUString aUpperName = ScGlobal::pCharClass->uppercase(rString); + OUString aUpperName = ScGlobal::pCharClass->uppercase(rString); if(pLocalRangeName) { pData = pLocalRangeName->findByUpperName(aUpperName); @@ -1071,9 +1069,9 @@ ScAreaNameIterator::ScAreaNameIterator( ScDocument* pDoc ) : } } -bool ScAreaNameIterator::Next( rtl::OUString& rName, ScRange& rRange ) +bool ScAreaNameIterator::Next( OUString& rName, ScRange& rRange ) { - // Just a wrapper for rtl::OUString for now. It should replace the method + // Just a wrapper for OUString for now. It should replace the method // below eventually. String aTmp; bool bRet = Next(aTmp, rRange); diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx index 09d0712479bd..dbacb4493487 100644 --- a/sc/source/core/tool/reftokenhelper.cxx +++ b/sc/source/core/tool/reftokenhelper.cxx @@ -31,7 +31,6 @@ using namespace formula; using ::std::vector; using ::std::auto_ptr; -using ::rtl::OUString; void ScRefTokenHelper::compileRangeRepresentation( vector& rRefTokens, const OUString& rRangeStr, ScDocument* pDoc, diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 0a92ffc2721a..37aa03a7472c 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -42,11 +42,11 @@ using ::std::advance; using ::std::unary_function; const mdds::mtv::element_t element_type_custom_string = mdds::mtv::element_type_user_start; -typedef mdds::mtv::default_element_block custom_string_block; +typedef mdds::mtv::default_element_block custom_string_block; namespace rtl { -// Callback functions required for supporting rtl::OUString in +// Callback functions required for supporting OUString in // mdds::multi_type_vector. They must be in the rtl namespace to satisfy // argument dependent lookup that mdds::multi_type_vector requires. MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString, element_type_custom_string, OUString(), custom_string_block) @@ -342,9 +342,9 @@ public: void PutDouble( double fVal, SCSIZE nIndex); void PutDouble(const double* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); - void PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR); - void PutString(const ::rtl::OUString& rStr, SCSIZE nIndex); - void PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); + void PutString(const OUString& rStr, SCSIZE nC, SCSIZE nR); + void PutString(const OUString& rStr, SCSIZE nIndex); + void PutString(const OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR); void PutEmpty(SCSIZE nC, SCSIZE nR); void PutEmptyPath(SCSIZE nC, SCSIZE nR); @@ -353,9 +353,9 @@ public: sal_uInt16 GetError( SCSIZE nC, SCSIZE nR) const; double GetDouble(SCSIZE nC, SCSIZE nR) const; double GetDouble( SCSIZE nIndex) const; - rtl::OUString GetString(SCSIZE nC, SCSIZE nR) const; - rtl::OUString GetString( SCSIZE nIndex) const; - rtl::OUString GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const; + OUString GetString(SCSIZE nC, SCSIZE nR) const; + OUString GetString( SCSIZE nIndex) const; + OUString GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const; ScMatrixValue Get(SCSIZE nC, SCSIZE nR) const; bool IsString( SCSIZE nIndex ) const; bool IsString( SCSIZE nC, SCSIZE nR ) const; @@ -513,7 +513,7 @@ void ScMatrixImpl::PutDouble( double fVal, SCSIZE nIndex) PutDouble(fVal, nC, nR); } -void ScMatrixImpl::PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR) +void ScMatrixImpl::PutString(const OUString& rStr, SCSIZE nC, SCSIZE nR) { if (ValidColRow( nC, nR)) maMat.set(nR, nC, rStr); @@ -523,7 +523,7 @@ void ScMatrixImpl::PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR) } } -void ScMatrixImpl::PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) +void ScMatrixImpl::PutString(const OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) { if (ValidColRow( nC, nR)) maMat.set(nR, nC, pArray, pArray + nLen); @@ -533,7 +533,7 @@ void ScMatrixImpl::PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC } } -void ScMatrixImpl::PutString(const ::rtl::OUString& rStr, SCSIZE nIndex) +void ScMatrixImpl::PutString(const OUString& rStr, SCSIZE nIndex) { SCSIZE nC, nR; CalcPosition(nIndex, nC, nR); @@ -622,7 +622,7 @@ double ScMatrixImpl::GetDouble( SCSIZE nIndex) const return GetDouble(nC, nR); } -rtl::OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const +OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const { if (ValidColRowOrReplicated( nC, nR )) { @@ -630,7 +630,7 @@ rtl::OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const switch (maMat.get_type(nR, nC)) { case mdds::mtm::element_string: - return maMat.get(nR, nC); + return maMat.get(nR, nC); case mdds::mtm::element_empty: return EMPTY_OUSTRING; case mdds::mtm::element_numeric: @@ -653,26 +653,26 @@ rtl::OUString ScMatrixImpl::GetString(SCSIZE nC, SCSIZE nR) const return EMPTY_OUSTRING; } -rtl::OUString ScMatrixImpl::GetString( SCSIZE nIndex) const +OUString ScMatrixImpl::GetString( SCSIZE nIndex) const { SCSIZE nC, nR; CalcPosition(nIndex, nC, nR); return GetString(nC, nR); } -rtl::OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const +OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const { if (!ValidColRowOrReplicated( nC, nR )) { OSL_FAIL("ScMatrixImpl::GetString: dimension error"); - return ::rtl::OUString(); + return OUString(); } double fVal = 0.0; switch (maMat.get_type(nR, nC)) { case mdds::mtm::element_string: - return maMat.get(nR, nC); + return maMat.get(nR, nC); case mdds::mtm::element_empty: { if (!maMatFlag.get(nR, nC)) @@ -682,7 +682,7 @@ rtl::OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, // result of empty FALSE jump path sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_LOGICAL, ScGlobal::eLnge); - ::rtl::OUString aStr; + OUString aStr; Color* pColor = NULL; rFormatter.GetOutputString( 0.0, nKey, aStr, &pColor); return aStr; @@ -706,7 +706,7 @@ rtl::OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_NUMBER, ScGlobal::eLnge); - ::rtl::OUString aStr; + OUString aStr; rFormatter.GetInputLineString( fVal, nKey, aStr); return aStr; } @@ -1228,17 +1228,17 @@ void ScMatrix::PutDouble(const double* pArray, size_t nLen, SCSIZE nC, SCSIZE nR pImpl->PutDouble(pArray, nLen, nC, nR); } -void ScMatrix::PutString(const ::rtl::OUString& rStr, SCSIZE nC, SCSIZE nR) +void ScMatrix::PutString(const OUString& rStr, SCSIZE nC, SCSIZE nR) { pImpl->PutString(rStr, nC, nR); } -void ScMatrix::PutString(const ::rtl::OUString& rStr, SCSIZE nIndex) +void ScMatrix::PutString(const OUString& rStr, SCSIZE nIndex) { pImpl->PutString(rStr, nIndex); } -void ScMatrix::PutString(const rtl::OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) +void ScMatrix::PutString(const OUString* pArray, size_t nLen, SCSIZE nC, SCSIZE nR) { pImpl->PutString(pArray, nLen, nC, nR); } @@ -1278,17 +1278,17 @@ double ScMatrix::GetDouble( SCSIZE nIndex) const return pImpl->GetDouble(nIndex); } -rtl::OUString ScMatrix::GetString(SCSIZE nC, SCSIZE nR) const +OUString ScMatrix::GetString(SCSIZE nC, SCSIZE nR) const { return pImpl->GetString(nC, nR); } -rtl::OUString ScMatrix::GetString( SCSIZE nIndex) const +OUString ScMatrix::GetString( SCSIZE nIndex) const { return pImpl->GetString(nIndex); } -::rtl::OUString ScMatrix::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const +OUString ScMatrix::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSIZE nR) const { return pImpl->GetString(rFormatter, nC, nR); } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 85d6e9a6e0ab..acadb7f1505d 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -366,9 +366,9 @@ FormulaToken* ScRawToken::CreateToken() const return new FormulaDoubleToken( nValue ); case svString : if (eOp == ocPush) - return new FormulaStringToken( rtl::OUString( cStr ) ); + return new FormulaStringToken( OUString( cStr ) ); else - return new FormulaStringOpToken( eOp, rtl::OUString( cStr ) ); + return new FormulaStringOpToken( eOp, OUString( cStr ) ); case svSingleRef : if (eOp == ocPush) return new ScSingleRefToken( aRef.Ref1 ); @@ -386,23 +386,23 @@ FormulaToken* ScRawToken::CreateToken() const return new FormulaIndexToken( eOp, name.nIndex, name.bGlobal); case svExternalSingleRef: { - rtl::OUString aTabName(extref.cTabName); + OUString aTabName(extref.cTabName); return new ScExternalSingleRefToken(extref.nFileId, aTabName, extref.aRef.Ref1); } case svExternalDoubleRef: { - rtl::OUString aTabName(extref.cTabName); + OUString aTabName(extref.cTabName); return new ScExternalDoubleRefToken(extref.nFileId, aTabName, extref.aRef); } case svExternalName: { - rtl::OUString aName(extname.cName); + OUString aName(extname.cName); return new ScExternalNameToken( extname.nFileId, aName ); } case svJump : return new FormulaJumpToken( eOp, (short*) nJump ); case svExternal : - return new FormulaExternalToken( eOp, sbyte.cByte, rtl::OUString( cStr+1 ) ); + return new FormulaExternalToken( eOp, sbyte.cByte, OUString( cStr+1 ) ); case svFAP : return new FormulaFAPToken( eOp, sbyte.cByte, NULL ); case svMissing : @@ -1172,7 +1172,7 @@ bool ScTokenArray::AddFormulaToken(const com::sun::star::sheet::FormulaToken& _a sal_uInt16 nFileId = static_cast< sal_uInt16 >( aApiExtRef.Index ); sheet::SingleReference aApiSRef; sheet::ComplexReference aApiCRef; - ::rtl::OUString aName; + OUString aName; if( aApiExtRef.Reference >>= aApiSRef ) { // try to resolve cache index to sheet name @@ -1995,9 +1995,9 @@ void ScTokenArray::ReadjustRelative3DReferences( const ScAddress& rOldPos, namespace { -void GetExternalTableData(const ScDocument* pOldDoc, const ScDocument* pNewDoc, const SCTAB nTab, rtl::OUString& rTabName, sal_uInt16& rFileId) +void GetExternalTableData(const ScDocument* pOldDoc, const ScDocument* pNewDoc, const SCTAB nTab, OUString& rTabName, sal_uInt16& rFileId) { - rtl::OUString aFileName = pOldDoc->GetFileURL();; + OUString aFileName = pOldDoc->GetFileURL();; rFileId = pNewDoc->GetExternalRefManager()->getExternalFileId(aFileName); rTabName = pOldDoc->GetCopyTabName(nTab); if (rTabName.isEmpty()) @@ -2081,7 +2081,7 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons if ( (rRef2.IsFlag3D() && !rRef2.IsTabRel()) || (rRef1.IsFlag3D() && !rRef1.IsTabRel()) ) { - rtl::OUString aTabName; + OUString aTabName; sal_uInt16 nFileId; GetExternalTableData(pOldDoc, pNewDoc, rRef1.nTab, aTabName, nFileId); pCode[j]->DecRef(); @@ -2100,7 +2100,7 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons if ( rRef.IsFlag3D() && !rRef.IsTabRel() ) { - rtl::OUString aTabName; + OUString aTabName; sal_uInt16 nFileId; GetExternalTableData(pOldDoc, pNewDoc, rRef.nTab, aTabName, nFileId); //replace with ScExternalSingleRefToken and adjust references diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index 71cf0faee1e9..2a8a851e2698 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -94,7 +94,7 @@ bool ScTypedStrData::operator< (const ScTypedStrData& r) const } ScTypedStrData::ScTypedStrData( - const rtl::OUString& rStr, double nVal, StringType nType ) : + const OUString& rStr, double nVal, StringType nType ) : maStrValue(rStr), mfValue(nVal), meStrType(nType) {} @@ -109,7 +109,7 @@ bool ScTypedStrData::IsStrData() const return meStrType != Value; } -const rtl::OUString& ScTypedStrData::GetString() const +const OUString& ScTypedStrData::GetString() const { return maStrValue; } diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index 28f342af6473..17fe72f5fdfe 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -27,7 +27,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // -------------------------------------------------------------------- diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx index 07a3fcfe9215..5d8c7691c9ae 100644 --- a/sc/source/core/tool/userlist.cxx +++ b/sc/source/core/tool/userlist.cxx @@ -27,8 +27,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace { diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 114b7ab18563..488b59782f58 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -34,7 +34,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------ diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index a4c225699f25..704edb1a8770 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -60,8 +60,8 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc rOut.SetStreamCharSet( eCharSet ); sal_Unicode cStrDelim('"'); - rtl::OString aStrDelimEncoded; // only used if not Unicode - rtl::OUString aStrDelimDecoded; // only used if context encoding + OString aStrDelimEncoded; // only used if not Unicode + OUString aStrDelimDecoded; // only used if context encoding bool bContextOrNotAsciiEncoding; if ( eCharSet == RTL_TEXTENCODING_UNICODE ) { @@ -70,7 +70,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc } else { - aStrDelimEncoded = rtl::OString(&cStrDelim, 1, eCharSet); + aStrDelimEncoded = OString(&cStrDelim, 1, eCharSet); rtl_TextEncodingInfo aInfo; aInfo.StructSize = sizeof(aInfo); if ( rtl_getTextEncodingInfo( eCharSet, &aInfo ) ) @@ -79,7 +79,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc (((aInfo.Flags & RTL_TEXTENCODING_INFO_CONTEXT) != 0) || ((aInfo.Flags & RTL_TEXTENCODING_INFO_ASCII) == 0)); if ( bContextOrNotAsciiEncoding ) - aStrDelimDecoded = rtl::OStringToOUString(aStrDelimEncoded, eCharSet); + aStrDelimDecoded = OStringToOUString(aStrDelimEncoded, eCharSet); } else bContextOrNotAsciiEncoding = false; @@ -93,8 +93,8 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc const sal_Char* pNumDataERROR = "0,0\nERROR\n"; FltError eRet = eERR_OK; - rtl::OUStringBuffer aOS; - rtl::OUString aString; + OUStringBuffer aOS; + OUString aString; SCCOL nEndCol = rRange.aEnd.Col(); SCROW nEndRow = rRange.aEnd.Row(); SCCOL nNumCols = nEndCol - rRange.aStart.Col() + 1; @@ -243,14 +243,14 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc else if ( bContextOrNotAsciiEncoding ) { // to byte encoding - rtl::OString aStrEnc = rtl::OUStringToOString(aTmpStr, eCharSet); + OString aStrEnc = OUStringToOString(aTmpStr, eCharSet); // back to Unicode - rtl::OUString aStrDec = rtl::OStringToOUString(aStrEnc, eCharSet); + OUString aStrDec = OStringToOUString(aStrEnc, eCharSet); // search on re-decoded string sal_Int32 nPos = aStrDec.indexOf(aStrDelimDecoded); while (nPos >= 0) { - rtl::OUStringBuffer aBuf(aStrDec); + OUStringBuffer aBuf(aStrDec); aBuf.insert(nPos, aStrDelimDecoded); aStrDec = aBuf.makeStringAndClear(); nPos = aStrDec.indexOf( @@ -263,12 +263,12 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc } else { - rtl::OString aStrEnc = rtl::OUStringToOString(aTmpStr, eCharSet); + OString aStrEnc = OUStringToOString(aTmpStr, eCharSet); // search on encoded string sal_Int32 nPos = aStrEnc.indexOf(aStrDelimEncoded); while (nPos >= 0) { - rtl::OStringBuffer aBuf(aStrEnc); + OStringBuffer aBuf(aStrEnc); aBuf.insert(nPos, aStrDelimEncoded); aStrEnc = aBuf.makeStringAndClear(); nPos = aStrEnc.indexOf( diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 7e2ae9dc1a4d..734253a6de93 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -61,7 +61,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, bool bSyntErrWarn = false; bool bOverflowWarn = false; - rtl::OUString aData = aDifParser.aData; + OUString aData = aDifParser.aData; bool bData = false; rIn.Seek( 0 ); @@ -308,7 +308,7 @@ TOPIC DifParser::GetNextTopic( void ) }; STATE eS = S_START; - rtl::OUString aLine; + OUString aLine; nVector = 0; nVal = 0; @@ -430,7 +430,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* pPossibleNumericData ) else { // ...und zur Strafe mit'm Numberformatter... OSL_ENSURE( pNumFormatter, "-DifParser::GetNextDataset(): No Formatter, more fun!" ); - rtl::OUString aTestVal( pPossibleNumericData ); + OUString aTestVal( pPossibleNumericData ); sal_uInt32 nFormat = 0; double fTmpVal; if( pNumFormatter->IsNumberFormat( aTestVal, nFormat, fTmpVal ) ) @@ -445,7 +445,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* pPossibleNumericData ) return eRet; } -bool DifParser::ReadNextLine( rtl::OUString& rStr ) +bool DifParser::ReadNextLine( OUString& rStr ) { if( aLookAheadLine.isEmpty() ) { @@ -454,7 +454,7 @@ bool DifParser::ReadNextLine( rtl::OUString& rStr ) else { rStr = aLookAheadLine; - aLookAheadLine = rtl::OUString(); + aLookAheadLine = OUString(); return true; } } @@ -502,7 +502,7 @@ bool DifParser::LookAhead() DATASET DifParser::GetNextDataset( void ) { DATASET eRet = D_UNKNOWN; - rtl::OUString aLine; + OUString aLine; const sal_Unicode* pAktBuffer; ReadNextLine( aLine ); @@ -529,7 +529,7 @@ DATASET DifParser::GetNextDataset( void ) { pAktBuffer++; eRet = GetNumberDataset(pAktBuffer); - rtl::OUString aTmpLine; + OUString aTmpLine; ReadNextLine( aTmpLine ); if ( eRet == D_SYNT_ERROR ) { // for broken records write "#ERR: data" to cell diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 5ac3c6063d29..a6571ab729a5 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -76,7 +76,6 @@ #include #include -using ::rtl::OString; using namespace oox; static String lcl_GetVbaTabName( SCTAB n ) @@ -180,7 +179,7 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) Add( new ExcBofW8 ); SCTAB nC; - rtl::OUString aTmpString; + OUString aTmpString; SCTAB nScTabCount = rTabInfo.GetScTabCount(); sal_uInt16 nExcTabCount = rTabInfo.GetXclTabCount(); sal_uInt16 nCodenames = static_cast< sal_uInt16 >( GetExtDocOptions().GetCodeNameCount() ); @@ -425,7 +424,7 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx ) // notes const ScPostIt* pScNote = itr->second; ScAddress aScPos( itr->first.first, itr->first.second, mnScTab ); - mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, pScNote, rtl::OUString() ) ); + mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, pScNote, OUString() ) ); } if( GetOutput() != EXC_OUTPUT_BINARY ) diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 5007456fcd36..e288d8326b43 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -33,8 +33,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::vector; namespace { diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 59f93976b2e7..8ac6a11ab531 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -106,7 +106,6 @@ using namespace com::sun::star; using namespace ::comphelper; -using ::rtl::OUString; //OleNameOverrideContainer @@ -115,8 +114,8 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > OleNameOverrideCont class OleNameOverrideContainer : public OleNameOverrideContainer_BASE { private: - typedef boost::unordered_map< rtl::OUString, uno::Reference< container::XIndexContainer >, ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > NamedIndexToOleName; + typedef boost::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash, + ::std::equal_to< OUString > > NamedIndexToOleName; NamedIndexToOleName IdToOleNameHash; ::osl::Mutex m_aMutex; public: @@ -128,25 +127,25 @@ public: return ( IdToOleNameHash.size() > 0 ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( IdToOleNameHash[ aName ] ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - uno::Sequence< ::rtl::OUString > aResult( IdToOleNameHash.size() ); + uno::Sequence< OUString > aResult( IdToOleNameHash.size() ); NamedIndexToOleName::iterator it = IdToOleNameHash.begin(); NamedIndexToOleName::iterator it_end = IdToOleNameHash.end(); - rtl::OUString* pName = aResult.getArray(); + OUString* pName = aResult.getArray(); for (; it != it_end; ++it, ++pName ) *pName = it->first; return aResult; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return ( IdToOleNameHash.find( aName ) != IdToOleNameHash.end() ); @@ -159,7 +158,7 @@ public: return IdToOleNameHash.size(); } // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -169,14 +168,14 @@ public: throw lang::IllegalArgumentException(); IdToOleNameHash[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw container::NoSuchElementException(); IdToOleNameHash.erase( IdToOleNameHash.find( aName ) ); } - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) @@ -244,7 +243,7 @@ void ImportExcel8::Boundsheet( void ) aIn.EnableDecryption(); aIn >> nGrbit >> nLen; - rtl::OUString aName( aIn.ReadUniString( nLen ) ); + OUString aName( aIn.ReadUniString( nLen ) ); GetTabInfo().AppendXclTabName( aName, nBdshtTab ); SCTAB nScTab = static_cast< SCTAB >( nBdshtTab ); @@ -477,7 +476,7 @@ XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRan } -void XclImpAutoFilterData::CreateFromDouble( rtl::OUString& rStr, double fVal ) +void XclImpAutoFilterData::CreateFromDouble( OUString& rStr, double fVal ) { rStr += ::rtl::math::doubleToUString(fVal, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, @@ -633,7 +632,7 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm ) rStrm.Ignore( 4 ); rStrm >> nStrLen[ nE ]; rStrm.Ignore( 3 ); - rItem.maString = rtl::OUString(); + rItem.maString = OUString(); break; case EXC_AFTYPE_BOOLERR: rStrm >> nBoolErr >> nVal; @@ -765,7 +764,7 @@ void XclImpAutoFilterData::CreateScDBData() if( bActive || bCriteria) { ScDocument* pDoc = pExcRoot->pIR->GetDocPtr(); - String aNewName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + String aNewName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); pCurrDBData = new ScDBData(aNewName , Tab(), StartCol(),StartRow(), EndCol(),EndRow() ); if(bCriteria) diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index d788b2dfe914..91a5bc10cdc4 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -83,7 +83,6 @@ using namespace ::oox; using ::com::sun::star::uno::Sequence; -using ::rtl::OString; //--------------------------------------------------------- class ExcDummy_00 - const sal_uInt8 ExcDummy_00::pMyData[] = { @@ -392,9 +391,9 @@ sal_uInt16 ExcBundlesheetBase::GetNum( void ) const ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) : ExcBundlesheetBase( rRootData, _nTab ) { - rtl::OUString sTabName = rRootData.pER->GetTabInfo().GetScTabName( _nTab ); + OUString sTabName = rRootData.pER->GetTabInfo().GetScTabName( _nTab ); OSL_ENSURE( sTabName.getLength() < 256, "ExcBundlesheet::ExcBundlesheet - table name too long" ); - aName = rtl::OUStringToOString(sTabName, rRootData.pER->GetTextEncoding()); + aName = OUStringToOString(sTabName, rRootData.pER->GetTextEncoding()); } @@ -678,7 +677,7 @@ bool XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry ) bool bConflict = false; String sText; const ScQueryEntry::Item& rItem = rItems[0]; - const rtl::OUString& rQueryStr = rItem.maString; + const OUString& rQueryStr = rItem.maString; if (!rQueryStr.isEmpty()) { sText.Assign(rQueryStr); @@ -841,10 +840,10 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm ) case MultiValue: { rWorksheet->startElement(XML_filters, FSEND); - std::vector::const_iterator itr = maMultiValues.begin(), itrEnd = maMultiValues.end(); + std::vector::const_iterator itr = maMultiValues.begin(), itrEnd = maMultiValues.end(); for (; itr != itrEnd; ++itr) { - const char* pz = rtl::OUStringToOString(*itr, RTL_TEXTENCODING_UTF8).getStr(); + const char* pz = OUStringToOString(*itr, RTL_TEXTENCODING_UTF8).getStr(); rWorksheet->singleElement(XML_filter, XML_val, pz, FSEND); } rWorksheet->endElement(XML_filters); diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index a3b0d6b28119..cab727e8b279 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -80,7 +80,7 @@ FltError ExportBiff5::Write() SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg ); sal_uLong nErr = aBasicImport.SaveOrDelMSVBAStorage( sal_True, EXC_STORAGE_VBA_PROJECT ); if( nErr != ERRCODE_NONE ) - pDocShell->SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + pDocShell->SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } pExcDoc->ReadDoc(); // ScDoc -> ExcDoc diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index b7ac26ce9d07..1c128616f53e 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -713,7 +713,7 @@ void ImportExcel::Boundsheet( void ) aIn >> nGrbit; } - rtl::OUString aName( aIn.ReadByteString( false ) ); + OUString aName( aIn.ReadByteString( false ) ); SCTAB nScTab = static_cast< SCTAB >( nBdshtTab ); if( nScTab > 0 ) diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 8ffa93580ac2..a611374e61b0 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -825,7 +825,7 @@ FltError ImportExcel8::Read( void ) bool bSheetHasCodeName = false; - std::vector aCodeNames; + std::vector aCodeNames; std::vector < SCTAB > nTabsWithNoCodeName; while( eAkt != EXC_STATE_END ) @@ -1104,7 +1104,7 @@ FltError ImportExcel8::Read( void ) case 0x0A: // EOF [ 2345 ] { eAkt = EXC_STATE_SHEET; - rtl::OUString sName; + OUString sName; GetDoc().GetName( GetCurrScTab(), sName ); if ( !bSheetHasCodeName ) { @@ -1113,10 +1113,10 @@ FltError ImportExcel8::Read( void ) } else { - rtl::OUString sCodeName; + OUString sCodeName; GetDoc().GetCodeName( GetCurrScTab(), sCodeName ); OSL_TRACE("Have CodeName %s for SheetName %s", - rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); aCodeNames.push_back( sCodeName ); } @@ -1252,12 +1252,12 @@ FltError ImportExcel8::Read( void ) OSL_TRACE("Trying to find suitable codename for %d", *it ); while ( true ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.appendAscii("Sheet"); aBuf.append(static_cast(nTab++)); - rtl::OUString sTmpName = aBuf.makeStringAndClear(); - std::vector::iterator codeName_It = aCodeNames.begin(); - std::vector::iterator codeName_It_end = aCodeNames.end(); + OUString sTmpName = aBuf.makeStringAndClear(); + std::vector::iterator codeName_It = aCodeNames.begin(); + std::vector::iterator codeName_It_end = aCodeNames.end(); // search for codename for ( ; codeName_It != codeName_It_end; ++codeName_It ) { @@ -1267,7 +1267,7 @@ FltError ImportExcel8::Read( void ) if ( codeName_It == codeName_It_end ) // generated codename not found { - OSL_TRACE("Using generated codename %s", rtl::OUStringToOString( sTmpName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Using generated codename %s", OUStringToOString( sTmpName, RTL_TEXTENCODING_UTF8 ).getStr() ); // Set new codename GetDoc().SetCodeName( *it, sTmpName ); // Record newly used codename diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 56afd712f7b1..2df9da410f56 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -70,7 +70,6 @@ #include "xepage.hxx" #include "xestyle.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -1146,7 +1145,7 @@ void XclExpChFrLabelProps::Convert( const ScfPropertySet& rPropSet, bool bShowSe // label value separator maData.maSeparator = rPropSet.GetStringProperty( EXC_CHPROP_LABELSEPARATOR ); if( maData.maSeparator.isEmpty() ) - maData.maSeparator = rtl::OUString(' '); + maData.maSeparator = OUString(' '); } void XclExpChFrLabelProps::WriteBody( XclExpStream& rStrm ) @@ -1229,7 +1228,7 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, if (pSubTitle) { // append subtitle as the 2nd line of the title. - String aSubTitle = rtl::OUString("\n"); + String aSubTitle = OUString("\n"); aSubTitle.Append(*pSubTitle); mxSrcLink->AppendString(aSubTitle); } diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 7ad587475cce..63a4e907ffb0 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -58,9 +58,6 @@ using ::com::sun::star::frame::XModel; using ::com::sun::star::table::CellRangeAddress; using ::com::sun::star::sheet::XAreaLinks; using ::com::sun::star::sheet::XAreaLink; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // Shared string table ======================================================== @@ -367,7 +364,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU { // #n382718# (and #n261623#) Convert smb notation to '\\' aFileName = aUrlObj.GetMainURL( INetURLObject::NO_DECODE ); - aFileName = rtl::OUString( aFileName.GetBuffer() + 4 ); // skip the 'smb:' part + aFileName = OUString( aFileName.GetBuffer() + 4 ); // skip the 'smb:' part aFileName.SearchAndReplaceAll( '/', '\\' ); } @@ -375,7 +372,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU mnFlags |= EXC_HLINK_ABS; mnFlags |= EXC_HLINK_BODY; - rtl::OString aAsciiLink(rtl::OUStringToOString(aFileName, + OString aAsciiLink(OUStringToOString(aFileName, rRoot.GetTextEncoding())); XclExpString aLink( aFileName, EXC_STR_FORCEUNICODE, 255 ); aXclStrm << XclTools::maGuidFileMoniker @@ -903,14 +900,14 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm ) || eOperation == SC_COND_BOTTOM_PERCENT; sal_Int32 nPercent = eOperation == SC_COND_TOP_PERCENT || eOperation == SC_COND_BOTTOM_PERCENT; - rtl::OString aRank("0"); + OString aRank("0"); if(IsTopBottomRule(eOperation)) { // position and formula grammar are not important // we only store a number there aRank = XclXmlUtils::ToOString(mrFormatEntry.GetExpression(ScAddress(0,0,0), 0)); } - rtl::OString aText; + OString aText; if(IsTextRule(eOperation)) { // we need to write the text without quotes @@ -1049,7 +1046,7 @@ XclExpCfvo::XclExpCfvo(const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, namespace { -rtl::OString getColorScaleType( const ScColorScaleEntry& rEntry, bool bFirst ) +OString getColorScaleType( const ScColorScaleEntry& rEntry, bool bFirst ) { switch(rEntry.GetType()) { @@ -1081,12 +1078,12 @@ void XclExpCfvo::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); - rtl::OString aValue; + OString aValue; if(mrEntry.GetType() == COLORSCALE_FORMULA) { - rtl::OUString aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(), maSrcPos, + OUString aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(), maSrcPos, mrEntry.GetFormula()->Clone(), GetRoot().GetOpCodeMap() ); - aValue = rtl::OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); + aValue = OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); } else { @@ -1238,17 +1235,17 @@ void XclExpColorScale::SaveXml( XclExpXmlStream& rStrm ) namespace { -rtl::OString createHexStringFromDigit(sal_uInt8 nDigit) +OString createHexStringFromDigit(sal_uInt8 nDigit) { - rtl::OString aString = rtl::OString::valueOf( static_cast(nDigit), 16 ); + OString aString = OString::valueOf( static_cast(nDigit), 16 ); if(aString.getLength() == 1) aString = aString + OString::number(0); return aString; } -rtl::OString createGuidStringFromInt(sal_uInt8 nGuid[16]) +OString createGuidStringFromInt(sal_uInt8 nGuid[16]) { - rtl::OStringBuffer aBuffer; + OStringBuffer aBuffer; aBuffer.append('{'); for(size_t i = 0; i < 16; ++i) { @@ -1257,7 +1254,7 @@ rtl::OString createGuidStringFromInt(sal_uInt8 nGuid[16]) aBuffer.append('-'); } aBuffer.append('}'); - rtl::OString aString = aBuffer.makeStringAndClear(); + OString aString = aBuffer.makeStringAndClear(); return aString.toAsciiUpperCase(); } @@ -1570,7 +1567,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : String aToken( aString.GetToken( 0, '\n', nStringIx ) ); if( nToken > 0 ) { - mxString1->Append(rtl::OUString(static_cast('\0'))); + mxString1->Append(OUString(static_cast('\0'))); sFormulaBuf.append( (sal_Unicode) ',' ); } mxString1->Append( aToken ); diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 4221d0c40e90..6a18478e9e30 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -80,9 +80,6 @@ #include #include -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -1225,7 +1222,7 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos, switch( rRoot.GetBiff() ) { case EXC_BIFF5: - maNoteText = rtl::OUStringToOString(aNoteText, rRoot.GetTextEncoding()); + maNoteText = OUStringToOString(aNoteText, rRoot.GetTextEncoding()); break; case EXC_BIFF8: @@ -1410,7 +1407,7 @@ XclMacroHelper::SetMacroLink( const ScriptEventDescriptor& rEvent, const XclTbxE bool XclMacroHelper::SetMacroLink( const String& rMacroName ) { - OSL_TRACE("SetMacroLink( macroname:=%s )", rtl::OUStringToOString( rMacroName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("SetMacroLink( macroname:=%s )", OUStringToOString( rMacroName, RTL_TEXTENCODING_UTF8 ).getStr() ); if( rMacroName.Len() ) { sal_uInt16 nExtSheet = GetLocalLinkManager().FindExtSheet( EXC_EXTSH_OWNDOC ); diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx index c4ba7df17a18..58594fe01a13 100644 --- a/sc/source/filter/excel/xeextlst.cxx +++ b/sc/source/filter/excel/xeextlst.cxx @@ -59,16 +59,16 @@ XclExpExtCfvo::XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& if( rEntry.GetType() == COLORSCALE_FORMULA ) { const ScTokenArray* pArr = rEntry.GetFormula(); - rtl::OUString aFormula; + OUString aFormula; if(pArr) { aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(), rSrcPos, pArr->Clone(), GetRoot().GetOpCodeMap() ); } - maValue = rtl::OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); + maValue = OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); } else - maValue = rtl::OString::valueOf(rEntry.GetValue()); + maValue = OString::valueOf(rEntry.GetValue()); } namespace { @@ -159,7 +159,7 @@ void XclExpExtDataBar::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElementNS( XML_x14, XML_dataBar ); } -XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ): +XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ): XclExpRoot(rRoot), maId(rId) { @@ -180,7 +180,7 @@ void XclExpExtCfRule::SaveXml( XclExpXmlStream& rStrm ) } -XclExpExtConditionalFormatting::XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ): +XclExpExtConditionalFormatting::XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ): XclExpRoot(rRoot) { maCfRule.reset( new XclExpExtCfRule( *this, rFormat, rPos, rId ) ); @@ -206,7 +206,7 @@ void XclExpExtConditionalFormatting::SaveXml( XclExpXmlStream& rStrm ) XclExpExtCondFormat::XclExpExtCondFormat( const XclExpRoot& rRoot ): XclExpExt( rRoot ) { - maURI = rtl::OString("{78C0D931-6437-407d-A8EE-F0AAD7539E65}"); + maURI = OString("{78C0D931-6437-407d-A8EE-F0AAD7539E65}"); } void XclExpExtCondFormat::SaveXml( XclExpXmlStream& rStrm ) diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 893321b5c263..1ef37c34fd9e 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -2136,7 +2136,7 @@ void XclExpFmlaCompImpl::ProcessExternalName( const XclExpScToken& rTokData ) // insert the new external name and create the tNameX token sal_uInt16 nExtSheet = 0, nExtName = 0; - const ::rtl::OUString* pFile = rExtRefMgr.getExternalFileName( nFileId ); + const OUString* pFile = rExtRefMgr.getExternalFileName( nFileId ); if( pFile && mxData->mpLinkMgr->InsertExtName( nExtSheet, nExtName, *pFile, rName, xArray ) ) { AppendNameXToken( nExtSheet, nExtName, rTokData.mnSpaces ); @@ -2346,7 +2346,7 @@ void XclExpFmlaCompImpl::AppendMacroCallToken( const XclExpExtFuncData& rExtFunc void XclExpFmlaCompImpl::AppendAddInCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces ) { - ::rtl::OUString aXclFuncName; + OUString aXclFuncName; if( mxData->mpLinkMgr && ScGlobal::GetAddInCollection()->GetExcelName( rExtFuncData.maFuncName, GetUILanguage(), aXclFuncName ) ) { sal_uInt16 nExtSheet, nExtName; diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 27821544c5c2..a56fdc390a50 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -47,7 +47,6 @@ #include "xelink.hxx" #include "xehelper.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::i18n::XBreakIterator; @@ -274,9 +273,9 @@ void XclExpAddressConverter::ConvertRangeList( XclRangeList& rXclRanges, namespace { -rtl::OUString lclGetUrlRepresentation( const SvxURLField& rUrlField ) +OUString lclGetUrlRepresentation( const SvxURLField& rUrlField ) { - const rtl::OUString& aRepr = rUrlField.GetRepresentation(); + const OUString& aRepr = rUrlField.GetRepresentation(); // no representation -> use URL return aRepr.isEmpty() ? rUrlField.GetURL() : aRepr; } @@ -296,9 +295,9 @@ XclExpHyperlinkHelper::~XclExpHyperlinkHelper() { } -rtl::OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlField ) +OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlField ) { - rtl::OUString aUrlRepr; + OUString aUrlRepr; if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7 { @@ -555,7 +554,7 @@ void XclExpStringHelper::AppendString( XclExpString& rXclString, const XclExpRoo void XclExpStringHelper::AppendChar( XclExpString& rXclString, const XclExpRoot& rRoot, sal_Unicode cChar ) { if( rRoot.GetBiff() == EXC_BIFF8 ) - rXclString.Append( rtl::OUString(cChar) ); + rXclString.Append( OUString(cChar) ); else rXclString.AppendByte( cChar, rRoot.GetTextEncoding() ); } @@ -848,7 +847,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico else { String aPortionText( mrEE.GetText( aSel ) ); - aPortionText.SearchAndReplaceAll( rtl::OUString('&'), rtl::OUString("&&") ); + aPortionText.SearchAndReplaceAll( OUString('&'), OUString("&&") ); // #i17440# space between font height and numbers in text if( bFontHtChanged && aParaText.Len() && aPortionText.Len() ) { @@ -885,14 +884,14 @@ namespace { /** Encodes special parts of the URL, i.e. directory separators and volume names. @param pTableName Pointer to a table name to be encoded in this URL, or 0. */ -rtl::OUString lclEncodeDosUrl( - XclBiff eBiff, const rtl::OUString& rUrl, const rtl::OUString& rBase, const rtl::OUString* pTableName) +OUString lclEncodeDosUrl( + XclBiff eBiff, const OUString& rUrl, const OUString& rBase, const OUString* pTableName) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; if (!rUrl.isEmpty()) { - rtl::OUString aOldUrl = rUrl; + OUString aOldUrl = rUrl; aBuf.append(EXC_URLSTART_ENCODED); if ( aOldUrl.getLength() > 2 && aOldUrl.copy(0,2) == "\\\\" ) @@ -961,16 +960,16 @@ rtl::OUString lclEncodeDosUrl( // ---------------------------------------------------------------------------- -rtl::OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const rtl::OUString& rAbsUrl, const rtl::OUString* pTableName ) +OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName ) { - rtl::OUString aDosUrl = INetURLObject(rAbsUrl).getFSysPath(INetURLObject::FSYS_DOS); - rtl::OUString aDosBase = INetURLObject(rRoot.GetBasePath()).getFSysPath(INetURLObject::FSYS_DOS); + OUString aDosUrl = INetURLObject(rAbsUrl).getFSysPath(INetURLObject::FSYS_DOS); + OUString aDosBase = INetURLObject(rRoot.GetBasePath()).getFSysPath(INetURLObject::FSYS_DOS); return lclEncodeDosUrl(rRoot.GetBiff(), aDosUrl, aDosBase, pTableName); } -rtl::OUString XclExpUrlHelper::EncodeDde( const rtl::OUString& rApplic, const rtl::OUString& rTopic ) +OUString XclExpUrlHelper::EncodeDde( const OUString& rApplic, const OUString& rTopic ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rApplic).append(EXC_DDE_DELIM).append(rTopic); return aBuf.makeStringAndClear(); } diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 8c2b451cb7dc..a9ff73ae6187 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -34,7 +34,6 @@ using ::std::auto_ptr; using ::std::find_if; using ::std::vector; -using ::rtl::OUString; using ::com::sun::star::uno::Any; // ============================================================================ @@ -772,10 +771,10 @@ bool XclExpTabInfo::IsMirroredTab( SCTAB nScTab ) const return GetFlag( nScTab, EXC_TABBUF_MIRRORED ); } -rtl::OUString XclExpTabInfo::GetScTabName( SCTAB nScTab ) const +OUString XclExpTabInfo::GetScTabName( SCTAB nScTab ) const { OSL_ENSURE( nScTab < mnScCnt, "XclExpTabInfo::IsActiveTab - sheet out of range" ); - return (nScTab < mnScCnt) ? maTabInfoVec[ nScTab ].maScName : rtl::OUString(); + return (nScTab < mnScCnt) ? maTabInfoVec[ nScTab ].maScName : OUString(); } sal_uInt16 XclExpTabInfo::GetXclTab( SCTAB nScTab ) const @@ -834,7 +833,7 @@ void XclExpTabInfo::CalcXclIndexes() // result: first occur all exported sheets, followed by all external sheets } -typedef ::std::pair< rtl::OUString, SCTAB > XclExpTabName; +typedef ::std::pair< OUString, SCTAB > XclExpTabName; typedef ::std::vector< XclExpTabName > XclExpTabNameVec; inline bool operator<( const XclExpTabName& rArg1, const XclExpTabName& rArg2 ) @@ -1325,14 +1324,14 @@ void XclExpExternSheetBase::WriteExtNameBuffer( XclExpStream& rStrm ) XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, sal_Unicode cCode ) : XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET ) { - Init( rtl::OUString(cCode) ); + Init( OUString(cCode) ); } XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, const String& rTabName ) : XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET ) { // reference to own sheet: \03 - Init(rtl::OUString(EXC_EXTSH_TABNAME) + rTabName); + Init(OUString(EXC_EXTSH_TABNAME) + rTabName); } void XclExpExternSheet::Save( XclExpStream& rStrm ) diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 7e7a76025bea..276624cd2e64 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -36,7 +36,6 @@ using namespace ::oox; -using ::rtl::OString; // ============================================================================ // *** Helper classes *** diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index c678691c10e2..8e1ffb114352 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -40,7 +40,6 @@ using namespace ::oox; -using ::rtl::OString; using ::std::set; using ::std::numeric_limits; diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 3402fbcaad9c..4653e2de7fe6 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -56,9 +56,6 @@ using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; using ::com::sun::star::sheet::DataPilotFieldLayoutInfo; using ::com::sun::star::sheet::DataPilotFieldReference; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ // Pivot cache @@ -138,7 +135,7 @@ XclExpPCItem::XclExpPCItem( bool bValue ) : // ---------------------------------------------------------------------------- -bool XclExpPCItem::EqualsText( const rtl::OUString& rText ) const +bool XclExpPCItem::EqualsText( const OUString& rText ) const { return rText.isEmpty() ? IsEmpty() : (GetText() && (*GetText() == rText)); } @@ -162,7 +159,7 @@ bool XclExpPCItem::EqualsBool( bool bValue ) const void XclExpPCItem::WriteBody( XclExpStream& rStrm ) { - if( const rtl::OUString* pText = GetText() ) + if( const OUString* pText = GetText() ) { rStrm << XclExpString( *pText ); } @@ -282,7 +279,7 @@ const XclExpPCItem* XclExpPCField::GetItem( sal_uInt16 nItemIdx ) const return GetVisItemList().GetRecord( nItemIdx ).get(); } -sal_uInt16 XclExpPCField::GetItemIndex( const rtl::OUString& rItemName ) const +sal_uInt16 XclExpPCField::GetItemIndex( const OUString& rItemName ) const { const XclExpPCItemList& rItemList = GetVisItemList(); for( size_t nPos = 0, nSize = rItemList.GetSize(); nPos < nSize; ++nPos ) @@ -389,7 +386,7 @@ void XclExpPCField::InitStdGroupField( const XclExpPCField& rBaseField, const Sc // loop over all elements of one group for( size_t nElemIdx = 0, nElemCount = pGroupItem->GetElementCount(); nElemIdx < nElemCount; ++nElemIdx ) { - if (const rtl::OUString* pElemName = pGroupItem->GetElementByIndex(nElemIdx)) + if (const OUString* pElemName = pGroupItem->GetElementByIndex(nElemIdx)) { // try to find the item that is part of the group in the base field sal_uInt16 nBaseItemIdx = rBaseField.GetItemIndex( *pElemName ); @@ -549,7 +546,7 @@ void XclExpPCField::InsertNumDateGroupItems( const ScDPObject& rDPObj, const ScD const ScDPItemData* pData = aDPData.GetMemberById(nDim , aMemberIds[nIdx]); if ( pData ) { - rtl::OUString aStr = pCache->GetFormattedString(nDim, *pData); + OUString aStr = pCache->GetFormattedString(nDim, *pData); InsertGroupItem(new XclExpPCItem(aStr)); } } @@ -974,9 +971,9 @@ XclExpPTItem::XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUs maItemInfo.maVisName.mbUseCache = bUseCache; } -rtl::OUString XclExpPTItem::GetItemName() const +OUString XclExpPTItem::GetItemName() const { - return mpCacheItem ? mpCacheItem->ConvertToText() : rtl::OUString(); + return mpCacheItem ? mpCacheItem->ConvertToText() : OUString(); } void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem ) @@ -1014,9 +1011,9 @@ XclExpPTField::XclExpPTField( const XclExpPivotTable& rPTable, sal_uInt16 nCache // data access ---------------------------------------------------------------- -rtl::OUString XclExpPTField::GetFieldName() const +OUString XclExpPTField::GetFieldName() const { - return mpCacheField ? mpCacheField->GetFieldName() : rtl::OUString(); + return mpCacheField ? mpCacheField->GetFieldName() : OUString(); } sal_uInt16 XclExpPTField::GetFieldIndex() const @@ -1032,7 +1029,7 @@ sal_uInt16 XclExpPTField::GetLastDataInfoIndex() const return static_cast< sal_uInt16 >( maDataInfoVec.size() - 1 ); } -sal_uInt16 XclExpPTField::GetItemIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const +sal_uInt16 XclExpPTField::GetItemIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const { for( size_t nPos = 0, nSize = maItemList.GetSize(); nPos < nSize; ++nPos ) if( maItemList.GetRecord( nPos )->GetItemName() == rName ) @@ -1082,11 +1079,11 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim ) if (pLayoutName && !pLayoutName->equals(GetFieldName())) maFieldInfo.SetVisName(*pLayoutName); - const rtl::OUString* pSubtotalName = rSaveDim.GetSubtotalName(); + const OUString* pSubtotalName = rSaveDim.GetSubtotalName(); if (pSubtotalName) { OUString aSubName = lcl_convertCalcSubtotalName(*pSubtotalName); - maFieldExtInfo.mpFieldTotalName.reset(new rtl::OUString(aSubName)); + maFieldExtInfo.mpFieldTotalName.reset(new OUString(aSubName)); } // subtotals @@ -1149,7 +1146,7 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim rDataInfo.SetApiAggFunc( eFunc ); // visible name - const rtl::OUString* pVisName = rSaveDim.GetLayoutName(); + const OUString* pVisName = rSaveDim.GetLayoutName(); if (pVisName) rDataInfo.SetVisName(*pVisName); else @@ -1215,7 +1212,7 @@ void XclExpPTField::Save( XclExpStream& rStrm ) // private -------------------------------------------------------------------- -XclExpPTItem* XclExpPTField::GetItemAcc( const rtl::OUString& rName ) +XclExpPTItem* XclExpPTField::GetItemAcc( const OUString& rName ) { XclExpPTItem* pItem = 0; for( size_t nPos = 0, nSize = maItemList.GetSize(); !pItem && (nPos < nSize); ++nPos ) @@ -1309,12 +1306,12 @@ const XclExpPTField* XclExpPivotTable::GetField( sal_uInt16 nFieldIdx ) const return (nFieldIdx == EXC_SXIVD_DATA) ? &maDataOrientField : maFieldList.GetRecord( nFieldIdx ).get(); } -const XclExpPTField* XclExpPivotTable::GetField( const rtl::OUString& rName ) const +const XclExpPTField* XclExpPivotTable::GetField( const OUString& rName ) const { return const_cast< XclExpPivotTable* >( this )->GetFieldAcc( rName ); } -sal_uInt16 XclExpPivotTable::GetDataFieldIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const +sal_uInt16 XclExpPivotTable::GetDataFieldIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const { for( XclPTDataFieldPosVec::const_iterator aIt = maDataFields.begin(), aEnd = maDataFields.end(); aIt != aEnd; ++aIt ) if( const XclExpPTField* pField = GetField( aIt->first ) ) @@ -1492,7 +1489,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm ) // private -------------------------------------------------------------------- -XclExpPTField* XclExpPivotTable::GetFieldAcc( const rtl::OUString& rName ) +XclExpPTField* XclExpPivotTable::GetFieldAcc( const OUString& rName ) { XclExpPTField* pField = 0; for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField && (nPos < nSize); ++nPos ) @@ -1508,7 +1505,7 @@ XclExpPTField* XclExpPivotTable::GetFieldAcc( const ScDPSaveDimension& rSaveDim return &maDataOrientField; // a real dimension - rtl::OUString aFieldName = ScDPUtil::getSourceDimensionName(rSaveDim.GetName()); + OUString aFieldName = ScDPUtil::getSourceDimensionName(rSaveDim.GetName()); return aFieldName.isEmpty() ? NULL : GetFieldAcc(aFieldName); } @@ -1524,7 +1521,7 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData ) if (!pDim) return; - const rtl::OUString* pLayoutName = pDim->GetLayoutName(); + const OUString* pLayoutName = pDim->GetLayoutName(); if (pLayoutName) maPTInfo.maDataName = *pLayoutName; else diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index 54724bbd681c..b7f2f8eb20dc 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -179,7 +179,7 @@ void XclExpValueRecord::SaveXml( XclExpXmlStream& rStrm ) if( mnAttribute == -1 ) return; rStrm.WriteAttributes( - mnAttribute, rtl::OString::valueOf( maValue ).getStr(), + mnAttribute, OString::valueOf( maValue ).getStr(), FSEND ); } diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 475a0c251813..b72503f8f3d4 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -302,7 +302,7 @@ bool XclExpRoot::IsDocumentEncrypted() const return false; } -uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const ::rtl::OUString& aPass ) const +uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const OUString& aPass ) const { uno::Sequence< beans::NamedValue > aEncryptionData; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 2356793ffdef..29d5bd766fc6 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -62,9 +62,6 @@ using ::com::sun::star::registry::InvalidRegistryException; using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::XInterface; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::utl::OStreamWrapper; using ::std::vector; @@ -330,7 +327,7 @@ void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nF // Xcl has an obscure sense of whether starting a new record or not, // and crashes if it encounters the string header at the very end of a record. // Thus we add 1 to give some room, seems like they do it that way but with another count (10?) -void XclExpStream::WriteByteString( const rtl::OString& rString, sal_uInt16 nMaxLen, bool b16BitCount ) +void XclExpStream::WriteByteString( const OString& rString, sal_uInt16 nMaxLen, bool b16BitCount ) { SetSliceSize( 0 ); sal_Size nLen = ::std::min< sal_Size >( rString.getLength(), nMaxLen ); diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index fa0f1f14b3c6..b1cc1af1e157 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -27,8 +27,6 @@ using namespace ::oox; -using ::rtl::OString; -using ::rtl::OUString; // ============================================================================ @@ -136,7 +134,7 @@ void XclExpString::AssignByte( const String& rString, rtl_TextEncoding eTextEnc, XclStrFlags nFlags, sal_uInt16 nMaxLen ) { // length may differ from length of rString - rtl::OString aByteStr(rtl::OUStringToOString(rString, eTextEnc)); + OString aByteStr(OUStringToOString(rString, eTextEnc)); Build(aByteStr.getStr(), aByteStr.getLength(), nFlags, nMaxLen); } @@ -152,7 +150,7 @@ void XclExpString::AppendByte( const String& rString, rtl_TextEncoding eTextEnc if( rString.Len() > 0 ) { // length may differ from length of rString - rtl::OString aByteStr(rtl::OUStringToOString(rString, eTextEnc)); + OString aByteStr(OUStringToOString(rString, eTextEnc)); BuildAppend(aByteStr.getStr(), aByteStr.getLength()); } } @@ -166,7 +164,7 @@ void XclExpString::AppendByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc ) } else { - rtl::OString aByteStr( &cChar, 1, eTextEnc ); // length may be >1 + OString aByteStr( &cChar, 1, eTextEnc ); // length may be >1 BuildAppend( aByteStr.getStr(), aByteStr.getLength() ); } } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 34304bfb6b67..b7e054d43afb 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -52,8 +52,6 @@ #include #include -using ::rtl::OString; -using ::rtl::OUString; using namespace ::com::sun::star; using namespace oox; @@ -1214,7 +1212,7 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); rStyleSheet->singleElement( XML_numFmt, XML_numFmtId, OString::number( mnXclNumFmt ).getStr(), - XML_formatCode, rtl::OUStringToOString(maNumFmtString, RTL_TEXTENCODING_UTF8).getStr(), + XML_formatCode, OUStringToOString(maNumFmtString, RTL_TEXTENCODING_UTF8).getStr(), FSEND ); } @@ -2896,7 +2894,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) pFormatEntry->GetType() != condformat::DATE)) continue; - rtl::OUString aStyleName; + OUString aStyleName; if(pFormatEntry->GetType() == condformat::CONDITION) { const ScCondFormatEntry* pEntry = static_cast(pFormatEntry); @@ -2910,7 +2908,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) if (maStyleNameToDxfId.find(aStyleName) == maStyleNameToDxfId.end()) { - maStyleNameToDxfId.insert(std::pair(aStyleName, nIndex)); + maStyleNameToDxfId.insert(std::pair(aStyleName, nIndex)); SfxStyleSheetBase* pStyle = rRoot.GetDoc().GetStyleSheetPool()->Find(aStyleName); if(!pStyle) @@ -2973,9 +2971,9 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) } } -sal_Int32 XclExpDxfs::GetDxfId( const rtl::OUString& rStyleName ) +sal_Int32 XclExpDxfs::GetDxfId( const OUString& rStyleName ) { - std::map::iterator itr = maStyleNameToDxfId.find(rStyleName); + std::map::iterator itr = maStyleNameToDxfId.find(rStyleName); if(itr!= maStyleNameToDxfId.end()) return itr->second; return -1; diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 423798851c24..0c85a4d9ddcd 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -37,9 +37,6 @@ using namespace ::oox; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index ba3a09578e69..763b9e778eb4 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -26,7 +26,6 @@ using namespace ::oox; -using ::rtl::OString; // Workbook view settings records ============================================= diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index aa8d576f1b4c..7f8cc941bfb5 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -81,8 +81,6 @@ #include "xipage.hxx" #include "xiview.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -1111,7 +1109,7 @@ void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeIn // create API struct for label values, set API label separator cssc2::DataPointLabel aPointLabel( bShowValue, bShowPercent, bShowCateg, bShowSymbol ); rPropSet.SetProperty( EXC_CHPROP_LABEL, aPointLabel ); - String aSep = mxLabelProps ? mxLabelProps->maSeparator : rtl::OUString('\n'); + String aSep = mxLabelProps ? mxLabelProps->maSeparator : OUString('\n'); if( aSep.Len() == 0 ) aSep = CREATE_STRING( "; " ); rPropSet.SetStringProperty( EXC_CHPROP_LABELSEPARATOR, aSep ); diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 542a3fe7b7f7..0f423ef5bc13 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -351,7 +351,7 @@ void XclImpHyperlink::ConvertToValidTabName(String& rUrl) // the 1st character must be '#'. return; - String aNewUrl(rtl::OUString('#')), aTabName; + String aNewUrl(OUString('#')), aTabName; bool bInQuote = false; bool bQuoteTabName = false; diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 89d55be8e2f4..ede6c114fb35 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -107,8 +107,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; @@ -390,7 +388,7 @@ void XclImpDrawObjBase::SetAnchor( const XclObjAnchor& rAnchor ) } void XclImpDrawObjBase::SetDffData( - const DffObjData& rDffObjData, const rtl::OUString& rObjName, const rtl::OUString& rHyperlink, + const DffObjData& rDffObjData, const OUString& rObjName, const OUString& rHyperlink, bool bVisible, bool bAutoMargin ) { mnDffShapeId = rDffObjData.nShapeId; @@ -505,7 +503,7 @@ void XclImpDrawObjBase::PostProcessSdrObject( XclImpDffConverter& rDffConv, SdrO void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen ) { - maObjName = rtl::OUString(); + maObjName = OUString(); if( nNameLen > 0 ) { // name length field is repeated before the name @@ -517,7 +515,7 @@ void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen ) void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); rStrm.Ignore( nMacroSize ); // skip padding byte for word boundaries, not contained in nMacroSize if( rStrm.GetRecPos() & 1 ) rStrm.Ignore( 1 ); @@ -525,19 +523,19 @@ void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) void XclImpDrawObjBase::ReadMacro4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); rStrm.Ignore( nMacroSize ); } void XclImpDrawObjBase::ReadMacro5( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); rStrm.Ignore( nMacroSize ); } void XclImpDrawObjBase::ReadMacro8( XclImpStream& rStrm ) { - maMacroName = rtl::OUString(); + maMacroName = OUString(); if( rStrm.GetRecLeft() > 6 ) { // macro is stored in a tNameXR token containing a link to a defined name @@ -1453,7 +1451,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& { double fAngle = 180.0; com::sun::star::beans::PropertyValue aTextRotateAngle; - aTextRotateAngle.Name = rtl::OUString( "TextRotateAngle" ); + aTextRotateAngle.Name = OUString( "TextRotateAngle" ); aTextRotateAngle.Value <<= fAngle; SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)pObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); aGeometryItem.SetPropertyValue( aTextRotateAngle ); @@ -2228,10 +2226,10 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const if ( xCtrlModel.is() ) { ScfPropertySet aProps( xCtrlModel ); - rtl::OUString sGroupName = rtl::OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) ); + OUString sGroupName = OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) ); aProps.SetStringProperty( "GroupName", sGroupName ); - aProps.SetStringProperty( "RefValue", rtl::OUString::valueOf( nRefVal++ ) ); + aProps.SetStringProperty( "RefValue", OUString::valueOf( nRefVal++ ) ); if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() ) { // propagate cell link info @@ -3207,7 +3205,7 @@ XclImpDffConverter::~XclImpDffConverter() String XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId ) { - rtl::OUString sOleName; + OUString sOleName; String sCodeName = GetExtDocOptions().GetCodeName( nTab ); if (mxOleCtrlNameOverride.is() && mxOleCtrlNameOverride->hasByName(sCodeName)) @@ -3217,8 +3215,8 @@ String XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId ) xIdToOleName->getByIndex( nObjId ) >>= sOleName; } OSL_TRACE("XclImpObjectManager::GetOleNameOverride tab %d, ( module %s ) object id ( %d ) is %s", nTab, - rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), nObjId, - rtl::OUStringToOString( sOleName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), nObjId, + OUStringToOString( sOleName, RTL_TEXTENCODING_UTF8 ).getStr() ); return sOleName; } @@ -4191,7 +4189,7 @@ void XclImpObjectManager::ConvertObjects() OUString XclImpObjectManager::GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const { - rtl::OUStringBuffer aDefName; + OUStringBuffer aDefName; DefObjNameMap::const_iterator aIt = maDefObjNames.find( rDrawObj.GetObjType() ); if( aIt != maDefObjNames.end() ) aDefName.append(aIt->second); diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 1656634b0e9f..c002ae9b5197 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -563,7 +563,7 @@ void XclImpHFConverter::InsertField( const SvxFieldItem& rFieldItem ) void XclImpHFConverter::InsertLineBreak() { ESelection& rSel = GetCurrSel(); - mrEE.QuickInsertText( rtl::OUString('\n'), ESelection( rSel.nEndPara, rSel.nEndPos, rSel.nEndPara, rSel.nEndPos ) ); + mrEE.QuickInsertText( OUString('\n'), ESelection( rSel.nEndPara, rSel.nEndPos, rSel.nEndPara, rSel.nEndPos ) ); ++rSel.nEndPara; rSel.nEndPos = 0; GetCurrInfo().mnHeight += GetCurrMaxLineHeight(); @@ -761,7 +761,7 @@ void XclImpUrlHelper::DecodeUrl( } void XclImpUrlHelper::DecodeUrl( - ::rtl::OUString& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, const ::rtl::OUString& rEncodedUrl ) + OUString& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, const OUString& rEncodedUrl ) { String aTabName; String aUrl; diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 6b4d2c3aece2..a89d36625b5a 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -33,8 +33,6 @@ #include using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index d472e4ed47e5..dcc4168938a0 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -215,10 +215,10 @@ void XclImpPageSettings::Finalize() // *** create page style sheet *** - rtl::OUStringBuffer aStyleName; + OUStringBuffer aStyleName; aStyleName.appendAscii("PageStyle_"); - rtl::OUString aTableName; + OUString aTableName; if( GetDoc().GetName( nScTab, aTableName ) ) aStyleName.append(aTableName); else diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 8ba8d0e69d73..a79d05a3b326 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -53,8 +53,6 @@ using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::sheet::DataPilotFieldOrientation; using ::com::sun::star::sheet::DataPilotFieldOrientation_DATA; using ::com::sun::star::sheet::DataPilotFieldSortInfo; @@ -97,7 +95,7 @@ void lclSetValue( const XclImpRoot& rRoot, const ScAddress& rScPos, double fValu void XclImpPCItem::WriteToSource( const XclImpRoot& rRoot, const ScAddress& rScPos ) const { ScDocument& rDoc = rRoot.GetDoc(); - if( const rtl::OUString* pText = GetText() ) + if( const OUString* pText = GetText() ) rDoc.SetString( rScPos.Col(), rScPos.Row(), rScPos.Tab(), *pText ); else if( const double* pfValue = GetDouble() ) rDoc.SetValue( rScPos.Col(), rScPos.Row(), rScPos.Tab(), *pfValue ); @@ -190,11 +188,11 @@ XclImpPCField::~XclImpPCField() // general field/item access -------------------------------------------------- -const rtl::OUString& XclImpPCField::GetFieldName( const ScfStringVec& rVisNames ) const +const OUString& XclImpPCField::GetFieldName( const ScfStringVec& rVisNames ) const { if( IsGroupChildField() && (mnFieldIdx < rVisNames.size()) ) { - const rtl::OUString& rVisName = rVisNames[ mnFieldIdx ]; + const OUString& rVisName = rVisNames[ mnFieldIdx ]; if (!rVisName.isEmpty()) return rVisName; } @@ -705,10 +703,10 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm ) nScTab = rDoc.GetTableCount(); rDoc.MakeTable( nScTab ); - rtl::OUStringBuffer aDummyName(rtl::OUString("DPCache")); + OUStringBuffer aDummyName(OUString("DPCache")); if( maTabName.Len() > 0 ) aDummyName.append( '_' ).append( maTabName ); - rtl::OUString aName = aDummyName.makeStringAndClear(); + OUString aName = aDummyName.makeStringAndClear(); rDoc.CreateValidTabName( aName ); rDoc.RenameTab( nScTab, aName ); // set sheet index to source range @@ -889,7 +887,7 @@ XclImpPTItem::XclImpPTItem( const XclImpPCField* pCacheField ) : { } -const rtl::OUString* XclImpPTItem::GetItemName() const +const OUString* XclImpPTItem::GetItemName() const { if( mpCacheField ) if( const XclImpPCItem* pCacheItem = mpCacheField->GetItem( maItemInfo.mnCacheIdx ) ) @@ -905,7 +903,7 @@ void XclImpPTItem::ReadSxvi( XclImpStream& rStrm ) void XclImpPTItem::ConvertItem( ScDPSaveDimension& rSaveDim ) const { - if (const rtl::OUString* pItemName = GetItemName()) + if (const OUString* pItemName = GetItemName()) { ScDPSaveMember& rMember = *rSaveDim.GetMemberByName( *pItemName ); rMember.SetIsVisible( !::get_flag( maItemInfo.mnFlags, EXC_SXVI_HIDDEN ) ); @@ -931,16 +929,16 @@ const XclImpPCField* XclImpPTField::GetCacheField() const return xPCache ? xPCache->GetField( maFieldInfo.mnCacheIdx ) : 0; } -rtl::OUString XclImpPTField::GetFieldName() const +OUString XclImpPTField::GetFieldName() const { const XclImpPCField* pField = GetCacheField(); - return pField ? pField->GetFieldName( mrPTable.GetVisFieldNames() ) : rtl::OUString(); + return pField ? pField->GetFieldName( mrPTable.GetVisFieldNames() ) : OUString(); } -rtl::OUString XclImpPTField::GetVisFieldName() const +OUString XclImpPTField::GetVisFieldName() const { - const rtl::OUString* pVisName = maFieldInfo.GetVisName(); - return pVisName ? *pVisName : rtl::OUString(); + const OUString* pVisName = maFieldInfo.GetVisName(); + return pVisName ? *pVisName : OUString(); } const XclImpPTItem* XclImpPTField::GetItem( sal_uInt16 nItemIdx ) const @@ -948,7 +946,7 @@ const XclImpPTItem* XclImpPTField::GetItem( sal_uInt16 nItemIdx ) const return (nItemIdx < maItems.size()) ? maItems[ nItemIdx ].get() : 0; } -const rtl::OUString* XclImpPTField::GetItemName( sal_uInt16 nItemIdx ) const +const OUString* XclImpPTField::GetItemName( sal_uInt16 nItemIdx ) const { const XclImpPTItem* pItem = GetItem( nItemIdx ); return pItem ? pItem->GetItemName() : 0; @@ -997,7 +995,7 @@ void XclImpPTField::ConvertPageField( ScDPSaveData& rSaveData ) const OSL_ENSURE( maFieldInfo.mnAxes & EXC_SXVD_AXIS_PAGE, "XclImpPTField::ConvertPageField - no page field" ); if( ScDPSaveDimension* pSaveDim = ConvertRCPField( rSaveData ) ) { - const rtl::OUString* pName = GetItemName( maPageInfo.mnSelItem ); + const OUString* pName = GetItemName( maPageInfo.mnSelItem ); if (pName) pSaveDim->SetCurrentPage(pName); } @@ -1031,7 +1029,7 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& rSaveData ) const if (maDataInfoList.empty()) return; - rtl::OUString aFieldName = GetFieldName(); + OUString aFieldName = GetFieldName(); if (aFieldName.isEmpty()) return; @@ -1095,7 +1093,7 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con ConvertFieldInfo( rSaveDim ); // visible name - if (const rtl::OUString* pVisName = maFieldInfo.GetVisName()) + if (const OUString* pVisName = maFieldInfo.GetVisName()) if (!pVisName->isEmpty()) rSaveDim.SetLayoutName( *pVisName ); @@ -1158,7 +1156,7 @@ void XclImpPTField::ConvertDataField( ScDPSaveDimension& rSaveDim, const XclPTDa void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const XclPTDataFieldInfo& rDataInfo ) const { // visible name - const rtl::OUString* pVisName = rDataInfo.GetVisName(); + const OUString* pVisName = rDataInfo.GetVisName(); if (pVisName && !pVisName->isEmpty()) rSaveDim.SetLayoutName(*pVisName); @@ -1176,7 +1174,7 @@ void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const Xcl aFieldRef.ReferenceItemType = rDataInfo.GetApiRefItemType(); if (aFieldRef.ReferenceItemType == sheet::DataPilotFieldReferenceItemType::NAMED) { - const rtl::OUString* pRefItemName = pRefField->GetItemName(rDataInfo.mnRefItem); + const OUString* pRefItemName = pRefField->GetItemName(rDataInfo.mnRefItem); if (pRefItemName) aFieldRef.ReferenceItemName = *pRefItemName; } @@ -1230,11 +1228,11 @@ const XclImpPTField* XclImpPivotTable::GetDataField( sal_uInt16 nDataFieldIdx ) return 0; } -rtl::OUString XclImpPivotTable::GetDataFieldName( sal_uInt16 nDataFieldIdx ) const +OUString XclImpPivotTable::GetDataFieldName( sal_uInt16 nDataFieldIdx ) const { if( const XclImpPTField* pField = GetDataField( nDataFieldIdx ) ) return pField->GetFieldName(); - return rtl::OUString(); + return OUString(); } // records -------------------------------------------------------------------- @@ -1479,7 +1477,7 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD rDoc.ApplyFlagsTab(itr->Col(), itr->Row(), itr->Col(), itr->Row(), itr->Tab(), SC_MF_BUTTON); sal_uInt16 nMFlag = SC_MF_BUTTON_POPUP; - rtl::OUString aName = rDoc.GetString(itr->Col(), itr->Row(), itr->Tab()); + OUString aName = rDoc.GetString(itr->Col(), itr->Row(), itr->Tab()); if (rSaveData.HasInvisibleMember(aName)) nMFlag |= SC_MF_HIDDEN_MEMBER; diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index f59542ee562d..206a0930dfda 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -268,7 +268,7 @@ XclImpTabViewSettings& XclImpRoot::GetTabViewSettings() const String XclImpRoot::GetScAddInName( const String& rXclName ) const { - ::rtl::OUString aScName; + OUString aScName; if( ScGlobal::GetAddInCollection()->GetCalcName( rXclName, aScName ) ) return aScName; return rXclName; diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 9d68955eb5ac..33dd89c1e231 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -27,9 +27,6 @@ #include -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringToOString; using namespace ::com::sun::star; @@ -64,7 +61,7 @@ XclImpDecrypterRef XclImpDecrypter::Clone() const return xNewDecr; } -::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyPassword( const ::rtl::OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) +::comphelper::DocPasswordVerifierResult XclImpDecrypter::verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) { o_rEncryptionData = OnVerifyPassword( rPassword ); mnError = o_rEncryptionData.getLength() ? ERRCODE_NONE : ERRCODE_ABORT; @@ -132,7 +129,7 @@ XclImpBiff5Decrypter* XclImpBiff5Decrypter::OnClone() const return new XclImpBiff5Decrypter( *this ); } -uno::Sequence< beans::NamedValue > XclImpBiff5Decrypter::OnVerifyPassword( const ::rtl::OUString& rPassword ) +uno::Sequence< beans::NamedValue > XclImpBiff5Decrypter::OnVerifyPassword( const OUString& rPassword ) { maEncryptionData.realloc( 0 ); @@ -226,7 +223,7 @@ XclImpBiff8Decrypter* XclImpBiff8Decrypter::OnClone() const return new XclImpBiff8Decrypter( *this ); } -uno::Sequence< beans::NamedValue > XclImpBiff8Decrypter::OnVerifyPassword( const ::rtl::OUString& rPassword ) +uno::Sequence< beans::NamedValue > XclImpBiff8Decrypter::OnVerifyPassword( const OUString& rPassword ) { maEncryptionData.realloc( 0 ); diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index ed27b335eacf..20965db3ace4 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -51,7 +51,6 @@ #include "xlroot.hxx" #include "xlstyle.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 53713923acb5..974155aac6d4 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -29,7 +29,6 @@ #include "xlroot.hxx" #include "xltools.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::drawing::XShape; diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 8a902e09279c..29d78d8ff5cb 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -51,10 +51,10 @@ XclPCItem::~XclPCItem() void XclPCItem::SetEmpty() { meType = EXC_PCITEM_EMPTY; - maText = rtl::OUString(); + maText = OUString(); } -void XclPCItem::SetText( const rtl::OUString& rText ) +void XclPCItem::SetText( const OUString& rText ) { meType = EXC_PCITEM_TEXT; maText = rText; @@ -64,7 +64,7 @@ void XclPCItem::SetDouble( double fValue ) { meType = EXC_PCITEM_DOUBLE; //! TODO convert double to string - maText = rtl::OUString(); + maText = OUString(); mfValue = fValue; } @@ -72,7 +72,7 @@ void XclPCItem::SetDateTime( const DateTime& rDateTime ) { meType = EXC_PCITEM_DATETIME; //! TODO convert date to string - maText = rtl::OUString(); + maText = OUString(); maDateTime = rDateTime; } @@ -86,7 +86,7 @@ void XclPCItem::SetInteger( sal_Int16 nValue ) void XclPCItem::SetError( sal_uInt16 nError ) { meType = EXC_PCITEM_ERROR; - maText = rtl::OUString(); + maText = OUString(); mnError = nError; switch( nError ) { @@ -105,7 +105,7 @@ void XclPCItem::SetBool( bool bValue ) { meType = EXC_PCITEM_BOOL; //! TODO convert boolean to string - maText = rtl::OUString(); + maText = OUString(); mbValue = bValue; } @@ -133,7 +133,7 @@ bool XclPCItem::IsEmpty() const return meType == EXC_PCITEM_EMPTY; } -const rtl::OUString* XclPCItem::GetText() const +const OUString* XclPCItem::GetText() const { return (meType == EXC_PCITEM_TEXT || meType == EXC_PCITEM_ERROR) ? &maText : NULL; } @@ -188,7 +188,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPCFieldInfo& rInfo ) if( rStrm.GetRecLeft() >= 3 ) rInfo.maName = rStrm.ReadUniString(); else - rInfo.maName = rtl::OUString(); + rInfo.maName = OUString(); return rStrm; } @@ -398,7 +398,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName ) rStrm >> nStrLen; rCachedName.mbUseCache = nStrLen == EXC_PT_NOSTRING; if( rCachedName.mbUseCache ) - rCachedName.maName = rtl::OUString(); + rCachedName.maName = OUString(); else rCachedName.maName = rStrm.ReadUniString( nStrLen ); return rStrm; @@ -415,12 +415,12 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedNam // ---------------------------------------------------------------------------- -const rtl::OUString* XclPTVisNameInfo::GetVisName() const +const OUString* XclPTVisNameInfo::GetVisName() const { return HasVisName() ? &maVisName.maName : 0; } -void XclPTVisNameInfo::SetVisName( const rtl::OUString& rName ) +void XclPTVisNameInfo::SetVisName( const OUString& rName ) { maVisName.maName = rName; maVisName.mbUseCache = rName.isEmpty(); @@ -640,7 +640,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTFieldExtInfo& rInfo ) rStrm.Ignore(10); if (nNameLen != 0xFF) // Custom field total name is used. Pick it up. - rInfo.mpFieldTotalName.reset(new rtl::OUString(rStrm.ReadUniString(nNameLen, 0))); + rInfo.mpFieldTotalName.reset(new OUString(rStrm.ReadUniString(nNameLen, 0))); return rStrm; } @@ -654,7 +654,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldExtInfo& rInfo ) if (rInfo.mpFieldTotalName.get() && !rInfo.mpFieldTotalName->isEmpty()) { - rtl::OUString aFinalName = *rInfo.mpFieldTotalName; + OUString aFinalName = *rInfo.mpFieldTotalName; if (aFinalName.getLength() >= 254) aFinalName = aFinalName.copy(0, 254); sal_uInt8 nNameLen = static_cast(aFinalName.getLength()); @@ -992,7 +992,7 @@ void XclPTViewEx9Info::Init( const ScDPObject& rDPObj ) const ScDPSaveData* pData = rDPObj.GetSaveData(); if (pData) { - const rtl::OUString* pGrandTotal = pData->GetGrandTotalName(); + const OUString* pGrandTotal = pData->GetGrandTotalName(); if (pGrandTotal) maGrandTotalName = *pGrandTotal; } diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 3e4b44b62928..f8c613cf87e5 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -52,7 +52,6 @@ namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; -using ::rtl::OUString; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; @@ -211,7 +210,7 @@ void XclRoot::SetCharWidth( const XclFontData& rFontData ) aFont.SetCharSet( rFontData.GetFontEncoding() ); aFont.SetWeight( rFontData.GetScWeight() ); pPrinter->SetFont( aFont ); - mrData.mnCharWidth = pPrinter->GetTextWidth( rtl::OUString('0') ); + mrData.mnCharWidth = pPrinter->GetTextWidth( OUString('0') ); } if( mrData.mnCharWidth <= 0 ) { diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index fd02260ae039..56542006028c 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -45,7 +45,7 @@ #include using namespace com::sun::star; -typedef std::map< sal_Int16, rtl::OUString > IdToString; +typedef std::map< sal_Int16, OUString > IdToString; class MSOExcelCommandConvertor : public MSOCommandConvertor { @@ -53,8 +53,8 @@ class MSOExcelCommandConvertor : public MSOCommandConvertor IdToString tcidToOOcmd; public: MSOExcelCommandConvertor(); - virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); - virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 key ); + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); + virtual OUString MSOTCIDToOOCommand( sal_Int16 key ); }; MSOExcelCommandConvertor::MSOExcelCommandConvertor() @@ -62,27 +62,27 @@ MSOExcelCommandConvertor::MSOExcelCommandConvertor() /* // mso command id to ooo command string // #FIXME and *HUNDREDS* of id's to added here - msoToOOcmd[ 0x20b ] = rtl::OUString(".uno:CloseDoc"); - msoToOOcmd[ 0x50 ] = rtl::OUString(".uno:Open"); + msoToOOcmd[ 0x20b ] = OUString(".uno:CloseDoc"); + msoToOOcmd[ 0x50 ] = OUString(".uno:Open"); // mso tcid to ooo command string // #FIXME and *HUNDREDS* of id's to added here - tcidToOOcmd[ 0x9d9 ] = rtl::OUString(".uno:Print"); + tcidToOOcmd[ 0x9d9 ] = OUString(".uno:Print"); */ } -rtl::OUString MSOExcelCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) +OUString MSOExcelCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) { - rtl::OUString sResult; + OUString sResult; IdToString::iterator it = msoToOOcmd.find( key ); if ( it != msoToOOcmd.end() ) sResult = it->second; return sResult; } -rtl::OUString MSOExcelCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) +OUString MSOExcelCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) { - rtl::OUString sResult; + OUString sResult; IdToString::iterator it = tcidToOOcmd.find( key ); if ( it != tcidToOOcmd.end() ) sResult = it->second; @@ -167,7 +167,7 @@ bool ScCTB::ImportMenuTB( ScCTBWrapper& rWrapper, const css::uno::Reference< css bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { - static rtl::OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); + static OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); bool bRes = false; try { @@ -180,16 +180,16 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); WString& name = tb.getName(); // set UI name for toolbar - xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( name.getString() ) ); + xProps->setPropertyValue( OUString("UIName"), uno::makeAny( name.getString() ) ); - rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); + OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); for ( std::vector< ScTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) { if ( !it->ImportToolBarControl( rWrapper, xIndexContainer, helper, IsMenuToolbar() ) ) return false; } - OSL_TRACE("Name of toolbar :-/ %s", rtl::OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Name of toolbar :-/ %s", OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() ); helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess ); helper.applyIcons(); @@ -305,7 +305,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere else { beans::PropertyValue aProp; - aProp.Name = rtl::OUString("ItemDescriptorContainer"); + aProp.Name = OUString("ItemDescriptorContainer"); aProp.Value <<= xMenuDesc; props.push_back( aProp ); } @@ -316,7 +316,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere { // insert spacer uno::Sequence< beans::PropertyValue > sProps( 1 ); - sProps[ 0 ].Name = rtl::OUString("Type"); + sProps[ 0 ].Name = OUString("Type"); sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE ); toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) ); } @@ -399,7 +399,7 @@ ScCTBWrapper::Print( FILE* fp ) } } -ScCTB* ScCTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) +ScCTB* ScCTBWrapper::GetCustomizationData( const OUString& sTBName ) { ScCTB* pCTB = NULL; for ( std::vector< ScCTB >::iterator it = rCTB.begin(); it != rCTB.end(); ++it ) @@ -425,7 +425,7 @@ bool ScCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) for ( std::vector::iterator it = rCTB.begin(); it != it_end; ++it ) { // for each customtoolbar - CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString("com.sun.star.sheet.SpreadsheetDocument" ) ) ); + CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( OUString("com.sun.star.sheet.SpreadsheetDocument" ) ) ); helper.setMSOCommandMap( new MSOExcelCommandConvertor() ); // Ignore menu toolbars, excel doesn't ( afaics ) store // menu customizations ( but you can have menus in a customtoolbar diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index 41b10028f016..7344a4d4e158 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -79,7 +79,7 @@ public: bool IsMenuToolbar(); bool ImportCustomToolBar( ScCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenuTB( ScCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); - rtl::OUString GetName() { return tb.getName().getString(); } + OUString GetName() { return tb.getName().getString(); } }; @@ -115,7 +115,7 @@ public: bool Read(SvStream &rS); void Print( FILE* ); bool ImportCustomToolBar( SfxObjectShell& rDocSh ); - ScCTB* GetCustomizationData( const rtl::OUString& name ); + ScCTB* GetCustomizationData( const OUString& name ); }; diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 4834122038f8..1bb40c6f4a24 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -38,7 +38,6 @@ #include "xiroot.hxx" #include "xltools.hxx" -using ::rtl::OUString; // GUID import/export ========================================================= @@ -482,21 +481,21 @@ OUString XclTools::GetXclBuiltInDefName( sal_Unicode cBuiltIn ) "XclTools::GetXclBuiltInDefName - built-in defined name list modified" ); if( cBuiltIn < SAL_N_ELEMENTS( ppcDefNames ) ) - return rtl::OUString::createFromAscii(ppcDefNames[cBuiltIn]); + return OUString::createFromAscii(ppcDefNames[cBuiltIn]); else return OUString::number(cBuiltIn); } OUString XclTools::GetBuiltInDefName( sal_Unicode cBuiltIn ) { - rtl::OUStringBuffer aBuf(maDefNamePrefix); + OUStringBuffer aBuf(maDefNamePrefix); aBuf.append(GetXclBuiltInDefName(cBuiltIn)); return aBuf.makeStringAndClear(); } OUString XclTools::GetBuiltInDefNameXml( sal_Unicode cBuiltIn ) { - rtl::OUStringBuffer aBuf(maDefNamePrefixXml); + OUStringBuffer aBuf(maDefNamePrefixXml); aBuf.append(GetXclBuiltInDefName(cBuiltIn)); return aBuf.makeStringAndClear(); } @@ -552,7 +551,7 @@ OUString XclTools::GetBuiltInStyleName( sal_uInt8 nStyleId, const OUString& rNam } else { - rtl::OUStringBuffer aBuf(maStyleNamePrefix1); + OUStringBuffer aBuf(maStyleNamePrefix1); if( nStyleId < SAL_N_ELEMENTS( ppcStyleNames ) ) aBuf.appendAscii(ppcStyleNames[nStyleId]); else if (!rName.isEmpty()) @@ -594,7 +593,7 @@ bool XclTools::IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyl { if( nId != EXC_STYLE_NORMAL ) { - OUString aShortName = rtl::OUString::createFromAscii(ppcStyleNames[nId]); + OUString aShortName = OUString::createFromAscii(ppcStyleNames[nId]); if( String(rStyleName).EqualsIgnoreCaseAscii( aShortName, nPrefixLen, aShortName.getLength() ) && (nNextChar < nPrefixLen + aShortName.getLength())) { @@ -651,9 +650,9 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons const OUString XclTools::maCFStyleNamePrefix1( RTL_CONSTASCII_USTRINGPARAM( "Excel_CondFormat_" ) ); const OUString XclTools::maCFStyleNamePrefix2( RTL_CONSTASCII_USTRINGPARAM( "ConditionalStyle_" ) ); -rtl::OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ) +OUString XclTools::GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ) { - rtl::OUStringBuffer aBuf(maCFStyleNamePrefix1); + OUStringBuffer aBuf(maCFStyleNamePrefix1); aBuf.append(static_cast(nScTab+1)); aBuf.append(sal_Unicode('_')); aBuf.append(static_cast(nFormat+1)); @@ -711,7 +710,7 @@ OUString XclTools::GetXclMacroName( const OUString& rSbMacroUrl ) sal_Int32 nPrjDot = rSbMacroUrl.indexOf( '.', maSbMacroPrefix.getLength() ) + 1; return rSbMacroUrl.copy( nPrjDot, nSbMacroUrlLen - nPrjDot - maSbMacroSuffix.getLength() ); } - return rtl::OUString(); + return OUString(); } // read/write colors ---------------------------------------------------------- diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx index 58d2737246af..7250053ec69a 100644 --- a/sc/source/filter/excel/xltracer.cxx +++ b/sc/source/filter/excel/xltracer.cxx @@ -21,7 +21,6 @@ #include #include "address.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::PropertyValue; diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index c97612d8b6cc..47f35c0d2cf1 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -37,7 +37,6 @@ #include #include "miscuno.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -110,7 +109,7 @@ uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( S if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; - ::rtl::OUString aPassword; + OUString aPassword; SFX_ITEMSET_ARG( rMedium.GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); if ( pPasswordItem ) aPassword = pPasswordItem->GetValue(); @@ -190,7 +189,7 @@ bool ScfPropertySet::GetAnyProperty( Any& rValue, const OUString& rPropName ) co return bHasValue; } -bool ScfPropertySet::GetBoolProperty( const ::rtl::OUString& rPropName ) const +bool ScfPropertySet::GetBoolProperty( const OUString& rPropName ) const { Any aAny; return GetAnyProperty( aAny, rPropName ) && ScUnoHelpFunctions::GetBoolFromAny( aAny ); @@ -203,7 +202,7 @@ OUString ScfPropertySet::GetStringProperty( const OUString& rPropName ) const return aOUString; } -bool ScfPropertySet::GetColorProperty( Color& rColor, const ::rtl::OUString& rPropName ) const +bool ScfPropertySet::GetColorProperty( Color& rColor, const OUString& rPropName ) const { sal_Int32 nApiColor = 0; bool bRet = GetProperty( nApiColor, rPropName ); @@ -247,9 +246,9 @@ void ScfPropertySet::SetAnyProperty( const OUString& rPropName, const Any& rValu } catch (const Exception&) { - OSL_FAIL(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM( + OSL_FAIL(OStringBuffer(RTL_CONSTASCII_STRINGPARAM( "ScfPropertySet::SetAnyProperty - cannot set property \"")) - .append(rtl::OUStringToOString(rPropName, + .append(OUStringToOString(rPropName, RTL_TEXTENCODING_ASCII_US)) .append('"').getStr()); } diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 5cf7042db873..4a9cdcdb0846 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -261,9 +261,9 @@ ScStyleSheet& ScfTools::MakePageStyleSheet( ScStyleSheetPool& rPool, const OUStr // *** byte string import operations *** -------------------------------------- -rtl::OString ScfTools::read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft) +OString ScfTools::read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft) { - rtl::OString aRet(::read_zeroTerminated_uInt8s_ToOString(rStrm)); + OString aRet(::read_zeroTerminated_uInt8s_ToOString(rStrm)); rnBytesLeft -= aRet.getLength(); //we read this number of bytes anyway if (rStrm.good()) //if the stream is happy we read the null terminator as well --rnBytesLeft; diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 826797db1523..cb4b1645df07 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -144,9 +144,9 @@ FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const String& } -static rtl::OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) +static OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) { - rtl::OStringBuffer aByteStr(OOO_STRING_SVTOOLS_HTML_colgroup); + OStringBuffer aByteStr(OOO_STRING_SVTOOLS_HTML_colgroup); aByteStr.append(' '); if( nSpan > 1 ) { @@ -196,9 +196,9 @@ static void lcl_AddStamp( String& rStr, const String& rName, } -static rtl::OString lcl_makeHTMLColorTriplet(const Color& rColor) +static OString lcl_makeHTMLColorTriplet(const Color& rColor) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("\"#")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("\"#")); // hallo sal_Char buf[64]; sal_Char* p = buf; @@ -415,7 +415,7 @@ void ScHTMLExport::WriteOverview() OUT_STR( ScGlobal::GetRscString( STR_OVERVIEW ) ); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head1 ); - rtl::OUString aStr; + OUString aStr; const SCTAB nCount = pDoc->GetTableCount(); for ( SCTAB nTab = 0; nTab < nCount; nTab++ ) @@ -486,10 +486,10 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) } -rtl::OString ScHTMLExport::BorderToStyle(const char* pBorderName, +OString ScHTMLExport::BorderToStyle(const char* pBorderName, const SvxBorderLine* pLine, bool& bInsertSemicolon) { - rtl::OStringBuffer aOut; + OStringBuffer aOut; if ( pLine ) { @@ -637,7 +637,7 @@ void ScHTMLExport::WriteTables() { const SCTAB nTabCount = pDoc->GetTableCount(); const OUString aStrTable( ScResId( SCSTR_TABLE ) ); - rtl::OUString aStr; + OUString aStr; OUString aStrOut; SCCOL nStartCol; SCROW nStartRow; @@ -708,7 +708,7 @@ void ScHTMLExport::WriteTables() } //
      - rtl::OStringBuffer aByteStrOut(OOO_STRING_SVTOOLS_HTML_table); + OStringBuffer aByteStrOut(OOO_STRING_SVTOOLS_HTML_table); bTabHasGraphics = bTabAlignedLeft = false; if ( bAll && pDrawLayer ) @@ -1086,7 +1086,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) if ( bSetFont ) { - rtl::OStringBuffer aStr(OOO_STRING_SVTOOLS_HTML_font); + OStringBuffer aStr(OOO_STRING_SVTOOLS_HTML_font); if ( bSetFontName ) { aStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_face). @@ -1094,7 +1094,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) xub_StrLen nFonts = comphelper::string::getTokenCount(rFontItem.GetFamilyName(), ';'); if ( nFonts == 1 ) { - rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( + OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( rFontItem.GetFamilyName(), eDestEnc, &aNonConvertibleChars); aStr.append(aTmpStr); } @@ -1103,7 +1103,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) const String& rList = rFontItem.GetFamilyName(); for ( sal_Int32 j = 0, nPos = 0; j < (sal_Int32)nFonts; j++ ) { - rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( + OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( rList.GetToken( 0, ';', nPos ), eDestEnc, &aNonConvertibleChars); aStr.append(aTmpStr); diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 0d31c275b3a4..67f7642a1f81 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -123,7 +123,7 @@ void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab, void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) { SdrObject* pObject = pE->pObject; - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width).append('='). append(static_cast(pE->aSize.Width())); aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_height).append('='). @@ -135,7 +135,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_vspace).append('='). append(static_cast(pE->aSpace.Height())); } - rtl::OString aOpt = aBuf.makeStringAndClear(); + OString aOpt = aBuf.makeStringAndClear(); switch ( pObject->GetObjIdentifier() ) { case OBJ_GRAF: @@ -182,7 +182,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf, - const rtl::OString& rImgOptions, sal_uLong nXOutFlags ) + const OString& rImgOptions, sal_uLong nXOutFlags ) { // Embedded graphic -> create an image file if( !rLinkName.Len() ) diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 5510241440ae..40d4fd173625 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -65,11 +65,11 @@ using namespace ::com::sun::star; ScHTMLStyles::ScHTMLStyles() : maEmpty() {} void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pClassName, size_t nClassName, - const rtl::OUString& aProp, const rtl::OUString& aValue) + const OUString& aProp, const OUString& aValue) { if (pElemName) { - rtl::OUString aElem(pElemName, nElemName, RTL_TEXTENCODING_UTF8); + OUString aElem(pElemName, nElemName, RTL_TEXTENCODING_UTF8); aElem = aElem.toAsciiLowerCase(); if (pClassName) { @@ -90,7 +90,7 @@ void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pCla } NamePropsType* pClsProps = itrElem->second; - rtl::OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); + OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); aClass = aClass.toAsciiLowerCase(); insertProp(*pClsProps, aClass, aProp, aValue); } @@ -105,15 +105,15 @@ void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pCla if (pClassName) { // Class name only. Add it to the global. - rtl::OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); + OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8); aClass = aClass.toAsciiLowerCase(); insertProp(maGlobalProps, aClass, aProp, aValue); } } } -const rtl::OUString& ScHTMLStyles::getPropertyValue( - const rtl::OUString& rElem, const rtl::OUString& rClass, const rtl::OUString& rPropName) const +const OUString& ScHTMLStyles::getPropertyValue( + const OUString& rElem, const OUString& rClass, const OUString& rPropName) const { // First, look into the element-class storage. { @@ -158,8 +158,8 @@ const rtl::OUString& ScHTMLStyles::getPropertyValue( } void ScHTMLStyles::insertProp( - NamePropsType& rStore, const rtl::OUString& aName, - const rtl::OUString& aProp, const rtl::OUString& aValue) + NamePropsType& rStore, const OUString& aName, + const OUString& aProp, const OUString& aValue) { NamePropsType::iterator itr = rStore.find(aName); if (itr == rStore.end()) @@ -294,11 +294,11 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const String& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - String aContentType = rtl::OUString( "text/html; charset=" ); + String aContentType = OUString( "text/html; charset=" ); aContentType.AppendAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( rtl::OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); pAttributes = xValues; } } @@ -1060,12 +1060,12 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) break; case HTML_O_SDVAL: { - pActEntry->pValStr = new rtl::OUString( rOption.GetString() ); + pActEntry->pValStr = new OUString( rOption.GetString() ); } break; case HTML_O_SDNUM: { - pActEntry->pNumStr = new rtl::OUString( rOption.GetString() ); + pActEntry->pNumStr = new OUString( rOption.GetString() ); } break; } @@ -1397,7 +1397,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) if ( !pActEntry->bHasGraphic ) { // ALT text only if not any image loaded if (!pActEntry->aAltText.isEmpty()) - pActEntry->aAltText += rtl::OUString("; "); + pActEntry->aAltText += OUString("; "); pActEntry->aAltText += rOption.GetString(); } @@ -1443,7 +1443,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) if ( !pActEntry->bHasGraphic ) { // discard any ALT text in this cell if we have any image pActEntry->bHasGraphic = true; - pActEntry->aAltText = rtl::OUString(); + pActEntry->aAltText = OUString(); } pImage->aFilterName = rFilter.GetImportFormatName( nFormat ); pImage->pGraphic = pGraphic; @@ -1523,7 +1523,7 @@ void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) { case HTML_O_NAME: { - pActEntry->pName = new rtl::OUString(rOption.GetString()); + pActEntry->pName = new OUString(rOption.GetString()); } break; } @@ -1612,7 +1612,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) case HTML_TITLE_ON: { bInTitle = true; - aString = rtl::OUString(); + aString = OUString(); } break; case HTML_TITLE_OFF: @@ -2158,9 +2158,9 @@ namespace { * Decode a numbert format string stored in Excel-generated HTML's CSS * region. */ -rtl::OUString decodeNumberFormat(const rtl::OUString& rFmt) +OUString decodeNumberFormat(const OUString& rFmt) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; const sal_Unicode* p = rFmt.getStr(); sal_Int32 n = rFmt.getLength(); for (sal_Int32 i = 0; i < n; ++i, ++p) @@ -2186,7 +2186,7 @@ rtl::OUString decodeNumberFormat(const rtl::OUString& rFmt) } if (nDigitCount) { - sal_Int32 nVal = rtl::OUString(p1, nDigitCount).toInt32(16); + sal_Int32 nVal = OUString(p1, nDigitCount).toInt32(16); aBuf.append(static_cast(nVal)); } } @@ -2206,7 +2206,7 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) // read needed options from the
      tag ScHTMLSize aSpanSize( 1, 1 ); SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr pValStr, pNumStr; + ::std::auto_ptr pValStr, pNumStr; SAL_WNODEPRECATED_DECLARATIONS_POP const HTMLOptions& rOptions = static_cast(rInfo.pParser)->GetOptions(); HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end(); @@ -2222,21 +2222,21 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo ) aSpanSize.mnRows = static_cast( getLimitedValue( itr->GetString().ToInt32(), 1, 256 ) ); break; case HTML_O_SDVAL: - pValStr.reset(new rtl::OUString(itr->GetString())); + pValStr.reset(new OUString(itr->GetString())); break; case HTML_O_SDNUM: - pNumStr.reset(new rtl::OUString(itr->GetString())); + pNumStr.reset(new OUString(itr->GetString())); break; case HTML_O_CLASS: { // Pick up the number format associated with this class (if // any). - rtl::OUString aElem("td"); - rtl::OUString aClass = itr->GetString(); - rtl::OUString aProp("mso-number-format"); + OUString aElem("td"); + OUString aClass = itr->GetString(); + OUString aProp("mso-number-format"); const ScHTMLStyles& rStyles = mpParser->GetStyles(); - const rtl::OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp); - rtl::OUString aNumFmt = decodeNumberFormat(rVal); + const OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp); + OUString aNumFmt = decodeNumberFormat(rVal); nNumberFormat = GetFormatTable()->GetEntryKey(aNumFmt); if (nNumberFormat == NUMBERFORMAT_ENTRY_NOT_FOUND) @@ -2940,11 +2940,11 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL ) const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 ); if( pCharSet ) { - String aContentType = rtl::OUString( "text/html; charset=" ); + String aContentType = OUString( "text/html; charset=" ); aContentType.AppendAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( rtl::OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); + xValues->Append( SvKeyValue( OUString( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) ); pAttributes = xValues; } } @@ -3121,7 +3121,7 @@ void ScHTMLQueryParser::TitleOff( const ImportInfo& rInfo ) { if( mbTitleOn ) { - rtl::OUString aTitle = maTitle.makeStringAndClear().trim(); + OUString aTitle = maTitle.makeStringAndClear().trim(); if (!aTitle.isEmpty() && mpDoc->GetDocumentShell()) { uno::Reference xDPS( @@ -3236,8 +3236,8 @@ public: const SelectorName& rSelName = *itr; const MemStr& rElem = rSelName.first; const MemStr& rClass = rSelName.second; - rtl::OUString aName(maPropName.mp, maPropName.mn, RTL_TEXTENCODING_UTF8); - rtl::OUString aValue(maPropValue.mp, maPropValue.mn, RTL_TEXTENCODING_UTF8); + OUString aName(maPropName.mp, maPropName.mn, RTL_TEXTENCODING_UTF8); + OUString aValue(maPropValue.mp, maPropValue.mn, RTL_TEXTENCODING_UTF8); mrStyles.add(rElem.mp, rElem.mn, rClass.mp, rClass.mn, aName, aValue); } maPropName = MemStr(); @@ -3247,9 +3247,9 @@ public: } -void ScHTMLQueryParser::ParseStyle(const rtl::OUString& rStrm) +void ScHTMLQueryParser::ParseStyle(const OUString& rStrm) { - rtl::OString aStr = rtl::OUStringToOString(rStrm, RTL_TEXTENCODING_UTF8); + OString aStr = OUStringToOString(rStrm, RTL_TEXTENCODING_UTF8); CSSHandler aHdl(GetStyles()); orcus::css_parser aParser(aStr.getStr(), aStr.getLength(), aHdl); try diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 90576467d949..dded94eb74aa 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -209,7 +209,7 @@ public: */ static bool parseOoxAddress2d( sal_Int32& ornColumn, sal_Int32& ornRow, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStart = 0, sal_Int32 nLength = SAL_MAX_INT32 ); @@ -234,7 +234,7 @@ public: static bool parseOoxRange2d( sal_Int32& ornStartColumn, sal_Int32& ornStartRow, sal_Int32& ornEndColumn, sal_Int32& ornEndRow, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nStart = 0, sal_Int32 nLength = SAL_MAX_INT32 ); @@ -313,7 +313,7 @@ public: */ bool convertToCellAddressUnchecked( ::com::sun::star::table::CellAddress& orAddress, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet ); /** Tries to convert the passed string to a single cell address. @@ -327,7 +327,7 @@ public: */ bool convertToCellAddress( ::com::sun::star::table::CellAddress& orAddress, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); @@ -340,7 +340,7 @@ public: @return A valid API cell address struct. */ ::com::sun::star::table::CellAddress createValidCellAddress( - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); @@ -445,7 +445,7 @@ public: */ bool convertToCellRangeUnchecked( ::com::sun::star::table::CellRangeAddress& orRange, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet ); /** Tries to convert the passed string to a cell range address. @@ -474,7 +474,7 @@ public: */ bool convertToCellRange( ::com::sun::star::table::CellRangeAddress& orRange, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bAllowOverflow, bool bTrackOverflow ); @@ -549,7 +549,7 @@ public: */ void convertToCellRangeList( ApiCellRangeList& orRanges, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int16 nSheet, bool bTrackOverflow ); diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index 6cfc7c55cad9..05c3e1dade56 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -46,8 +46,8 @@ struct ApiFilterSettings explicit ApiFilterSettings(); void appendField( bool bAnd, sal_Int32 nOperator, double fValue ); - void appendField( bool bAnd, sal_Int32 nOperator, const ::rtl::OUString& rValue ); - void appendField( bool bAnd, const std::vector& rValues ); + void appendField( bool bAnd, sal_Int32 nOperator, const OUString& rValue ); + void appendField( bool bAnd, const std::vector& rValues ); }; // ============================================================================ @@ -89,7 +89,7 @@ public: virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); private: - typedef ::std::vector< ::rtl::OUString > FilterValueVector; + typedef ::std::vector< OUString > FilterValueVector; FilterValueVector maValues; sal_Int32 mnCalendarType; diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 03949a55ac30..de43c47fed97 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -45,7 +45,7 @@ public: inline BiffDecoderBase* clone() { return implClone(); } /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); /** Returns true, if the decoder has been initialized correctly. */ @@ -64,7 +64,7 @@ private: /** Derived classes implement password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword ) = 0; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) = 0; virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of decryption of a memory block. */ @@ -93,7 +93,7 @@ private: virtual BiffDecoder_XOR* implClone(); /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ); virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); @@ -124,7 +124,7 @@ private: virtual BiffDecoder_RCF* implClone(); /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ); virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of decryption of a memory block. */ diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx index 6aac201cfd79..cd5f1e3e7878 100644 --- a/sc/source/filter/inc/biffhelper.hxx +++ b/sc/source/filter/inc/biffhelper.hxx @@ -605,7 +605,7 @@ public: // BIFF12 import ---------------------------------------------------------- /** Reads a BIFF12 string with leading 16-bit or 32-bit length field. */ - static ::rtl::OUString readString( SequenceInputStream& rStrm, bool b32BitLen = true, bool bAllowNulChars = false ); + static OUString readString( SequenceInputStream& rStrm, bool b32BitLen = true, bool bAllowNulChars = false ); // BIFF2-BIFF8 import ----------------------------------------------------- @@ -635,8 +635,8 @@ private: // ---------------------------------------------------------------------------- -/** BIFF12 stream operator for an ::rtl::OUString, reads 32-bit string length and Unicode array. */ -inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, ::rtl::OUString& orString ) +/** BIFF12 stream operator for an OUString, reads 32-bit string length and Unicode array. */ +inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, OUString& orString ) { orString = BiffHelper::readString( rStrm ); return rStrm; diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 942e2aff6a2b..645a7c941f84 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -243,7 +243,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OString readByteString( bool b16BitLen, bool bAllowNulChars = false ); + OString readByteString( bool b16BitLen, bool bAllowNulChars = false ); /** Reads 8/16 bit string length and character array, and returns a Unicode string. @param b16BitLen @@ -254,7 +254,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readByteStringUC( bool b16BitLen, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false ); + OUString readByteStringUC( bool b16BitLen, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false ); // Unicode strings -------------------------------------------------------- @@ -267,7 +267,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readUniStringChars( sal_uInt16 nChars, bool b16BitChars, bool bAllowNulChars = false ); + OUString readUniStringChars( sal_uInt16 nChars, bool b16BitChars, bool bAllowNulChars = false ); /** Reads 8-bit flags, extended header, nChar characters, extended data of a BIFF8 string, and returns the string. @@ -276,7 +276,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readUniStringBody( sal_uInt16 nChars, bool bAllowNulChars = false ); + OUString readUniStringBody( sal_uInt16 nChars, bool bAllowNulChars = false ); /** Reads 16-bit character count, 8-bit flags, extended header, character array, extended data of a BIFF8 string, and returns the string. @@ -284,7 +284,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readUniString( bool bAllowNulChars = false ); + OUString readUniString( bool bAllowNulChars = false ); // ------------------------------------------------------------------------ private: diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx index ac067ff71bd2..fa7a995de489 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -32,11 +32,11 @@ class ChartsheetFragment : public WorksheetFragmentBase public: explicit ChartsheetFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index 626aad0f4e42..5aa3e65485f6 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -34,7 +34,7 @@ struct CommentModel ::com::sun::star::table::CellRangeAddress maRange; /// Position of the comment in the worksheet. RichStringRef mxText; /// Formatted text of the comment (not used in BIFF8). - ::rtl::OUString maAuthor; /// Comment author (BIFF8 only). + OUString maAuthor; /// Comment author (BIFF8 only). sal_Int32 mnAuthorId; /// Identifier of the comment's author (OOXML and BIFF12 only). sal_uInt16 mnObjId; /// Drawing object identifier (BIFF8 only). sal_Bool mbAutoFill; /// Auto Selection of comment object's fill style @@ -85,7 +85,7 @@ public: explicit CommentsBuffer( const WorksheetHelper& rHelper ); /** Appends a new author to the list of comment authors. */ - void appendAuthor( const ::rtl::OUString& rAuthor ); + void appendAuthor( const OUString& rAuthor ); /** Creates and returns a new comment. */ CommentRef createComment(); @@ -93,7 +93,7 @@ public: void finalizeImport(); private: - typedef ::std::vector< ::rtl::OUString > OUStringVector; + typedef ::std::vector< OUString > OUStringVector; typedef RefVector< Comment > CommentVector; OUStringVector maAuthors; diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx index fe0ff51b46df..fe534f129a4a 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -33,10 +33,10 @@ class CommentsFragment : public WorksheetFragmentBase public: explicit CommentsFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 25bae462410a..e81ca732f899 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -49,7 +49,7 @@ struct CondFormatRuleModel typedef ::std::vector< ApiTokenSequence > ApiTokenSequenceVector; ApiTokenSequenceVector maFormulas; /// Formulas for rule conditions. - ::rtl::OUString maText; /// Text for 'contains' rules. + OUString maText; /// Text for 'contains' rules. sal_Int32 mnPriority; /// Priority of this rule. sal_Int32 mnType; /// Type of the rule. sal_Int32 mnOperator; /// In cell-is rules: Comparison operator. @@ -81,7 +81,7 @@ struct ColorScaleRuleModelEntry bool mbMax; bool mbPercent; bool mbPercentile; - rtl::OUString maFormula; + OUString maFormula; ColorScaleRuleModelEntry(): maColor(), @@ -140,7 +140,7 @@ public: private: std::vector< ColorScaleRuleModelEntry > maEntries; ScIconSetFormatData* mpFormatData; - rtl::OUString maIconSetType; + OUString maIconSetType; }; @@ -156,7 +156,7 @@ public: /** Imports rule settings from the cfRule element. */ void importCfRule( const AttributeList& rAttribs ); /** Appends a new condition formula string. */ - void appendFormula( const ::rtl::OUString& rFormula ); + void appendFormula( const OUString& rFormula ); /** Imports rule settings from a CFRULE record. */ void importCfRule( SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx index 89c1e944181a..167a3a3025e2 100644 --- a/sc/source/filter/inc/condformatcontext.hxx +++ b/sc/source/filter/inc/condformatcontext.hxx @@ -73,7 +73,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index bd8c62bb079e..fdcba12e0f3a 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -46,9 +46,9 @@ struct WebPrModel typedef ::std::vector< ::com::sun::star::uno::Any > TablesVector; TablesVector maTables; /// Names or indexes of the web query tables. - ::rtl::OUString maUrl; /// Source URL to refresh the data. - ::rtl::OUString maPostMethod; /// POST method to query data. - ::rtl::OUString maEditPage; /// Web page showing query data (for XML queries). + OUString maUrl; /// Source URL to refresh the data. + OUString maPostMethod; /// POST method to query data. + OUString maEditPage; /// Web page showing query data (for XML queries). sal_Int32 mnHtmlFormat; /// Plain text, rich text, or HTML. bool mbXml; /// True = XML query, false = HTML query. bool mbSourceData; /// True = import XML source data referred by HTML table. @@ -71,11 +71,11 @@ struct ConnectionModel typedef ::std::auto_ptr< WebPrModel > WebPrModelPtr; WebPrModelPtr mxWebPr; /// Special settings for web queries. - ::rtl::OUString maName; /// Unique name of this connection. - ::rtl::OUString maDescription; /// User description of this connection. - ::rtl::OUString maSourceFile; /// URL of a source data file. - ::rtl::OUString maSourceConnFile; /// URL of a source connection file. - ::rtl::OUString maSsoId; /// Single sign-on identifier. + OUString maName; /// Unique name of this connection. + OUString maDescription; /// User description of this connection. + OUString maSourceFile; /// URL of a source data file. + OUString maSourceConnFile; /// URL of a source connection file. + OUString maSsoId; /// Single sign-on identifier. sal_Int32 mnId; /// Unique connection identifier. sal_Int32 mnType; /// Data source type. sal_Int32 mnReconnectMethod; /// Reconnection method. diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx index d110865dedce..91c0bb1d6170 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -52,7 +52,7 @@ class ConnectionsFragment : public WorkbookFragmentBase public: explicit ConnectionsFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 3b81404dd6c8..d45783e746cb 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -55,8 +55,8 @@ const sal_Unicode BIFF_DEFNAME_UNKNOWN = '\x0E'; struct DefinedNameModel { - ::rtl::OUString maName; /// The original name. - ::rtl::OUString maFormula; /// The formula string. + OUString maName; /// The original name. + OUString maFormula; /// The formula string. sal_Int32 mnSheet; /// Sheet index for local names. sal_Int32 mnFuncGroupId; /// Function group identifier. bool mbMacro; /// True = Macro name (VBA or sheet macro). @@ -76,12 +76,12 @@ public: explicit DefinedNameBase( const WorkbookHelper& rHelper ); /** Returns the original name as imported from or exported to the file. */ - inline const ::rtl::OUString& getModelName() const { return maModel.maName; } + inline const OUString& getModelName() const { return maModel.maName; } /** Returns the name as used in the Calc document. */ - inline const ::rtl::OUString& getCalcName() const { return maCalcName; } + inline const OUString& getCalcName() const { return maCalcName; } /** Returns the original name as imported from or exported to the file. */ - const ::rtl::OUString& getUpcaseModelName() const; + const OUString& getUpcaseModelName() const; /** Returns an Any with a SingleReference or ComplexReference, or an empty Any. */ ::com::sun::star::uno::Any getReference( const ::com::sun::star::table::CellAddress& rBaseAddr ) const; @@ -95,8 +95,8 @@ protected: protected: DefinedNameModel maModel; /// Model data for this defined name. - mutable ::rtl::OUString maUpModelName; /// Model name converted to uppercase ASCII. - ::rtl::OUString maCalcName; /// Final name used in the Calc document. + mutable OUString maUpModelName; /// Model name converted to uppercase ASCII. + OUString maCalcName; /// Final name used in the Calc document. ::com::sun::star::uno::Any maRefAny; /// Single cell/range reference. }; @@ -110,7 +110,7 @@ public: /** Sets the attributes for this defined name from the passed attribute set. */ void importDefinedName( const AttributeList& rAttribs ); /** Sets the formula string from the body of the definedName element. */ - void setFormula( const ::rtl::OUString& rFormula ); + void setFormula( const OUString& rFormula ); /** Imports the defined name from a DEFINEDNAME record in the passed stream. */ void importDefinedName( SequenceInputStream& rStrm ); @@ -181,7 +181,7 @@ public: @param nSheet The sheet index for local names or -1 for global names. If no local name is found, tries to find a matching global name. @return Reference to the defined name or empty reference. */ - DefinedNameRef getByModelName( const ::rtl::OUString& rModelName, sal_Int16 nCalcSheet = -1 ) const; + DefinedNameRef getByModelName( const OUString& rModelName, sal_Int16 nCalcSheet = -1 ) const; /** Returns a built-in defined name by its built-in identifier. @param nSheet The sheet index of the built-in name. @return Reference to the defined name or empty reference. */ @@ -191,7 +191,7 @@ private: DefinedNameRef createDefinedName(); private: - typedef ::std::pair< sal_Int16, ::rtl::OUString > SheetNameKey; + typedef ::std::pair< sal_Int16, OUString > SheetNameKey; typedef ::std::pair< sal_Int16, sal_Unicode > BuiltinKey; typedef RefVector< DefinedName > DefNameVector; diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index a8a0a568fd59..b9dabff235ed 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -72,9 +72,9 @@ private: SvNumberFormatter* pNumFormatter; SvStream& rIn; sal_Bool bPlain; - rtl::OUString aLookAheadLine; + OUString aLookAheadLine; - bool ReadNextLine( rtl::OUString& rStr ); + bool ReadNextLine( OUString& rStr ); bool LookAhead(); DATASET GetNumberDataset( const sal_Unicode* pPossibleNumericData ); static inline sal_Bool IsBOT( const sal_Unicode* pRef ); diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index de19882ecfe5..be11622aece9 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -98,9 +98,9 @@ public: /** Imports the shape client data from the xdr:clientData element. */ void importClientData( const AttributeList& rAttribs ); /** Sets an attribute of the cell-dependent anchor position from xdr:from and xdr:to elements. */ - void setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue ); + void setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const OUString& rValue ); /** Imports the client anchor settings from a VML element. */ - void importVmlAnchor( const ::rtl::OUString& rAnchor ); + void importVmlAnchor( const OUString& rAnchor ); /** Calculates the resulting shape anchor in EMUs. */ ::oox::drawingml::EmuRectangle calcAnchorRectEmu( diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 0799d6f8f862..29902b763b58 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -47,11 +47,11 @@ namespace xls { class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: - explicit ShapeMacroAttacher( const ::rtl::OUString& rMacroName, + explicit ShapeMacroAttacher( const OUString& rMacroName, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); private: - virtual void attachMacro( const ::rtl::OUString& rMacroUrl ); + virtual void attachMacro( const OUString& rMacroUrl ); private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; @@ -73,7 +73,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); private: - ::rtl::OUString maMacroName; + OUString maMacroName; }; // ============================================================================ @@ -113,11 +113,11 @@ class DrawingFragment : public WorksheetFragmentBase public: explicit DrawingFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); private: @@ -136,12 +136,12 @@ private: class VmlControlMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: - explicit VmlControlMacroAttacher( const ::rtl::OUString& rMacroName, + explicit VmlControlMacroAttacher( const OUString& rMacroName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rxCtrlFormIC, sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ); private: - virtual void attachMacro( const ::rtl::OUString& rMacroUrl ); + virtual void attachMacro( const OUString& rMacroUrl ); private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxCtrlFormIC; @@ -164,12 +164,12 @@ public: virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const; /** Returns additional base names for automatic shape name creation. */ - virtual ::rtl::OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const; + virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const; /** Calculates the shape rectangle from a cell anchor string. */ virtual bool convertClientAnchor( ::com::sun::star::awt::Rectangle& orShapeRect, - const ::rtl::OUString& rShapeAnchor ) const; + const OUString& rShapeAnchor ) const; /** Creates a UNO control shape for legacy drawing controls. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > @@ -186,7 +186,7 @@ public: private: /** Converts the passed VML textbox text color to an OLE color. */ - sal_uInt32 convertControlTextColor( const ::rtl::OUString& rTextColor ) const; + sal_uInt32 convertControlTextColor( const OUString& rTextColor ) const; /** Converts the passed VML textbox font to an ActiveX form control font. */ void convertControlFontData( ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor, @@ -194,7 +194,7 @@ private: /** Converts the caption, the font settings, and the horizontal alignment from the passed VML textbox to ActiveX form control settings. */ void convertControlText( - ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor, ::rtl::OUString& rCaption, + ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor, OUString& rCaption, const ::oox::vml::TextBox* pTextBox, sal_Int32 nTextHAlign ) const; /** Converts the passed VML shape background formatting to ActiveX control formatting. */ void convertControlBackground( @@ -213,7 +213,7 @@ class VmlDrawingFragment : public ::oox::vml::DrawingFragment, public WorksheetH public: explicit VmlDrawingFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual void finalizeImport(); diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index 9c85a2fbb53d..791d8bb572b2 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -146,9 +146,9 @@ protected: private: ShapeAnchor maAnchor; /// Position of the drawing object. - ::rtl::OUString maObjName; /// Name of the object. - ::rtl::OUString maMacroName; /// Name of an attached macro. - ::rtl::OUString maHyperlink; /// On-click hyperlink URL. + OUString maObjName; /// Name of the object. + OUString maMacroName; /// Name of an attached macro. + OUString maHyperlink; /// On-click hyperlink URL. sal_uInt16 mnObjId; /// The object identifier (unique per drawing). sal_uInt16 mnObjType; /// The object type from OBJ record. bool mbHidden; /// True = object is hidden. diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index 2ca73b985a12..62b0673059a9 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -35,10 +35,10 @@ const sal_Char nHoriVerti = nHorizontal | nVertical; struct ScHTMLImage { - rtl::OUString aURL; + OUString aURL; Size aSize; Point aSpace; - rtl::OUString aFilterName; + OUString aFilterName; Graphic* pGraphic; // wird von WriteToDocument uebernommen sal_Char nDir; // 1==hori, 2==verti, 3==beides @@ -54,10 +54,10 @@ struct ScEEParseEntry { SfxItemSet aItemSet; ESelection aSel; // Selection in EditEngine - rtl::OUString* pValStr; // HTML evtl. SDVAL String - rtl::OUString* pNumStr; // HTML evtl. SDNUM String - rtl::OUString* pName; // HTML evtl. Anchor/RangeName - rtl::OUString aAltText; // HTML IMG ALT Text + OUString* pValStr; // HTML evtl. SDVAL String + OUString* pNumStr; // HTML evtl. SDNUM String + OUString* pName; // HTML evtl. Anchor/RangeName + OUString aAltText; // HTML IMG ALT Text boost::ptr_vector< ScHTMLImage > maImageList; // Grafiken in dieser Zelle SCCOL nCol; // relativ zum Beginn des Parse SCROW nRow; diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 5e826bd3e4a9..fc108c311f09 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -67,7 +67,7 @@ public: private: virtual GraphicHelper* implCreateGraphicHelper() const; virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; }; } // namespace xls diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index 8175e41124e0..ed2805869254 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -66,7 +66,7 @@ class WorkbookFragmentBase : public ::oox::core::FragmentHandler2, public Workbo public: explicit WorkbookFragmentBase( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); }; // ============================================================================ @@ -80,7 +80,7 @@ class WorksheetFragmentBase : public ::oox::core::FragmentHandler2, public Works public: explicit WorksheetFragmentBase( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); }; // ============================================================================ @@ -135,7 +135,7 @@ public: /** Opens the stream with the passed full name. */ explicit BiffFragmentHandler( const ::oox::core::FilterBase& rFilter, - const ::rtl::OUString& rStrmName ); + const OUString& rStrmName ); virtual ~BiffFragmentHandler(); @@ -178,7 +178,7 @@ class BiffWorkbookFragmentBase : public BiffFragmentHandler, public WorkbookHelp protected: explicit BiffWorkbookFragmentBase( const WorkbookHelper& rHelper, - const ::rtl::OUString& rStrmName, + const OUString& rStrmName, bool bCloneDecoder = false ); }; diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 2568ef8b3f65..1b7786fa6aaf 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -105,7 +105,7 @@ public: struct ExternalTabInfo { ScRange maRange; - ::rtl::OUString maTabName; + OUString maTabName; sal_uInt16 mnFileId; bool mbExternal; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 94bc2a6558f4..d4a54cc20013 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -70,7 +70,7 @@ private: private: // represents codename ( and associated modules ) // not speficied directly in the binary format - std::vector maAutoGeneratedCodeNames; + std::vector maAutoGeneratedCodeNames; ExcScenarioList maScenList; }; @@ -89,7 +89,7 @@ private: bool bCriteria:1; bool bAutoOrAdvanced:1; - void CreateFromDouble( rtl::OUString& rStr, double fVal ); + void CreateFromDouble( OUString& rStr, double fVal ); void SetCellAttribs(); void InsertQueryParam(); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 45dba0db12d5..fe70907bd330 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -271,7 +271,7 @@ public: class ExcBundlesheet : public ExcBundlesheetBase { private: - rtl::OString aName; + OString aName; virtual void SaveCont( XclExpStream& rStrm ); @@ -383,7 +383,7 @@ private: sal_uInt16 nCol; sal_uInt16 nFlags; ExcFilterCondition aCond[ 2 ]; - std::vector maMultiValues; + std::vector maMultiValues; bool AddCondition( ScQueryConnect eConn, sal_uInt8 nType, sal_uInt8 nOp, double fVal, String* pText, diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 7160d8aebdf2..17519c17dc20 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -104,9 +104,9 @@ public: /** Returns the complete DDE link data of this DDE item. */ bool getDdeLinkData( - ::rtl::OUString& orDdeServer, - ::rtl::OUString& orDdeTopic, - ::rtl::OUString& orDdeItem ); + OUString& orDdeServer, + OUString& orDdeTopic, + OUString& orDdeItem ); private: /** Sets the size of the result matrix. */ @@ -236,11 +236,11 @@ public: inline bool isInternalLink() const { return (meLinkType == LINKTYPE_SELF) || (meLinkType == LINKTYPE_INTERNAL); } /** Returns the relation identifier for the external link fragment. */ - inline const ::rtl::OUString& getRelId() const { return maRelId; } + inline const OUString& getRelId() const { return maRelId; } /** Returns the class name of this external link. */ - inline const ::rtl::OUString& getClassName() const { return maClassName; } + inline const OUString& getClassName() const { return maClassName; } /** Returns the target URL of this external link. */ - inline const ::rtl::OUString& getTargetUrl() const { return maTargetUrl; } + inline const OUString& getTargetUrl() const { return maTargetUrl; } /** Returns the link info needed by the XML formula parser. */ ::com::sun::star::sheet::ExternalLinkInfo getLinkInfo() const; @@ -262,12 +262,12 @@ public: ExternalNameRef getNameByIndex( sal_Int32 nIndex ) const; private: - void setExternalTargetUrl( const ::rtl::OUString& rTargetUrl, const ::rtl::OUString& rTargetType ); - void setDdeOleTargetUrl( const ::rtl::OUString& rClassName, const ::rtl::OUString& rTargetUrl, ExternalLinkType eLinkType ); - void parseExternalReference( const ::oox::core::Relations& rRelations, const ::rtl::OUString& rRelId ); + void setExternalTargetUrl( const OUString& rTargetUrl, const OUString& rTargetType ); + void setDdeOleTargetUrl( const OUString& rClassName, const OUString& rTargetUrl, ExternalLinkType eLinkType ); + void parseExternalReference( const ::oox::core::Relations& rRelations, const OUString& rRelId ); /** Creates an external locument link and the sheet cache for the passed sheet name. */ - void insertExternalSheet( const ::rtl::OUString& rSheetName ); + void insertExternalSheet( const OUString& rSheetName ); ExternalNameRef createExternalName(); @@ -278,9 +278,9 @@ private: ExternalLinkType meLinkType; /// Type of this link object. FunctionLibraryType meFuncLibType; /// Type of the function library, if link type is LINKTYPE_LIBRARY. - ::rtl::OUString maRelId; /// Relation identifier for the external link fragment. - ::rtl::OUString maClassName; /// DDE service, OLE class name. - ::rtl::OUString maTargetUrl; /// Target link, DDE topic, OLE target. + OUString maRelId; /// Relation identifier for the external link fragment. + OUString maClassName; /// DDE service, OLE class name. + OUString maTargetUrl; /// Target link, DDE topic, OLE target. ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLink > mxDocLink; /// Interface for an external document. Int16Vector maCalcSheets; /// Internal sheet indexes. diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 08f382064e4e..c6e20186740b 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -45,7 +45,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -81,12 +81,12 @@ class ExternalLinkFragment : public WorkbookFragmentBase public: explicit ExternalLinkFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, ExternalLink& rExtLink ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -99,7 +99,7 @@ private: private: ExternalLink& mrExtLink; ExternalNameRef mxExtName; - ::rtl::OUString maResultValue; + OUString maResultValue; sal_Int32 mnResultType; }; diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx index 9663cfae25a8..de1d14dd71f9 100644 --- a/sc/source/filter/inc/extlstcontext.hxx +++ b/sc/source/filter/inc/extlstcontext.hxx @@ -68,7 +68,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); private: void* mpTarget; diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 7c744c36159c..b4b696af1c7f 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -64,7 +64,7 @@ public: VectorToSequence( const ::std::vector< Type >& rVector ); /** Returns the service name provided via the XServiceName interface, or an empty string on error. */ - static ::rtl::OUString GetServiceName( XInterfaceRef xInt ); + static OUString GetServiceName( XInterfaceRef xInt ); /** Returns the multi service factory from a document shell. */ static XServiceFactoryRef GetServiceFactory( SfxObjectShell* pShell ); @@ -72,21 +72,21 @@ public: /** Creates an instance from the passed service name, using the passed service factory. */ static XInterfaceRef CreateInstance( XServiceFactoryRef xFactory, - const ::rtl::OUString& rServiceName ); + const OUString& rServiceName ); /** Creates an instance from the passed service name, using the service factory of the passed object. */ static XInterfaceRef CreateInstance( SfxObjectShell* pShell, - const ::rtl::OUString& rServiceName ); + const OUString& rServiceName ); /** Creates an instance from the passed service name, using the process service factory. */ - static XInterfaceRef CreateInstance( const ::rtl::OUString& rServiceName ); + static XInterfaceRef CreateInstance( const OUString& rServiceName ); /** Opens a password dialog and returns the encryption data. @return The encryption data or an empty sequence on 'Cancel' or any error. */ static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, ::comphelper::IDocPasswordVerifier& rVerifier, - const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0 ); + const ::std::vector< OUString >* pDefaultPasswords = 0 ); }; template< typename Type > @@ -122,7 +122,7 @@ public: ::com::sun::star::beans::XMultiPropertySet > XMultiPropSetRef; typedef ::com::sun::star::uno::Any UnoAny; typedef ::com::sun::star::uno::Sequence< UnoAny > UnoAnySequence; - typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > OUStringSequence; + typedef ::com::sun::star::uno::Sequence< OUString > OUStringSequence; public: inline explicit ScfPropertySet() {} @@ -148,33 +148,33 @@ public: inline XPropertySetRef GetApiPropertySet() const { return mxPropSet; } /** Returns the service name provided via the XServiceName interface, or an empty string on error. */ - ::rtl::OUString GetServiceName() const; + OUString GetServiceName() const; // Get properties --------------------------------------------------------- /** Returns true, if the property set contains the specified property. */ - bool HasProperty( const ::rtl::OUString& rPropName ) const; + bool HasProperty( const OUString& rPropName ) const; /** Gets the specified property from the property set. @return true, if the Any could be filled with the property value. */ - bool GetAnyProperty( UnoAny& rValue, const ::rtl::OUString& rPropName ) const; + bool GetAnyProperty( UnoAny& rValue, const OUString& rPropName ) const; /** Gets the specified property from the property set. @return true, if the passed variable could be filled with the property value. */ template< typename Type > - inline bool GetProperty( Type& rValue, const ::rtl::OUString& rPropName ) const + inline bool GetProperty( Type& rValue, const OUString& rPropName ) const { UnoAny aAny; return GetAnyProperty( aAny, rPropName ) && (aAny >>= rValue); } /** Gets the specified Boolean property from the property set. @return true = property contains true; false = property contains false or error occurred. */ - bool GetBoolProperty( const ::rtl::OUString& rPropName ) const; + bool GetBoolProperty( const OUString& rPropName ) const; /** Gets the specified Boolean property from the property set. */ - rtl::OUString GetStringProperty( const ::rtl::OUString& rPropName ) const; + OUString GetStringProperty( const OUString& rPropName ) const; /** Gets the specified color property from the property set. @return true, if the passed color variable could be filled with the property value. */ - bool GetColorProperty( Color& rColor, const ::rtl::OUString& rPropName ) const; + bool GetColorProperty( Color& rColor, const OUString& rPropName ) const; /** Gets the specified properties from the property set. Tries to use the XMultiPropertySet interface. @param rPropNames The property names. MUST be ordered alphabetically. @@ -184,23 +184,23 @@ public: // Set properties --------------------------------------------------------- /** Puts the passed Any into the property set. */ - void SetAnyProperty( const ::rtl::OUString& rPropName, const UnoAny& rValue ); + void SetAnyProperty( const OUString& rPropName, const UnoAny& rValue ); /** Puts the passed value into the property set. */ template< typename Type > - inline void SetProperty( const ::rtl::OUString& rPropName, const Type& rValue ) + inline void SetProperty( const OUString& rPropName, const Type& rValue ) { SetAnyProperty( rPropName, ::com::sun::star::uno::makeAny( rValue ) ); } /** Puts the passed Boolean value into the property set. */ - inline void SetBoolProperty( const ::rtl::OUString& rPropName, bool bValue ) + inline void SetBoolProperty( const OUString& rPropName, bool bValue ) { SetAnyProperty( rPropName, ::comphelper::makeBoolAny( bValue ) ); } /** Puts the passed string into the property set. */ - inline void SetStringProperty( const ::rtl::OUString& rPropName, const String& rValue ) - { SetProperty( rPropName, ::rtl::OUString( rValue ) ); } + inline void SetStringProperty( const OUString& rPropName, const String& rValue ) + { SetProperty( rPropName, OUString( rValue ) ); } /** Puts the passed color into the property set. */ - inline void SetColorProperty( const ::rtl::OUString& rPropName, const Color& rColor ) + inline void SetColorProperty( const OUString& rPropName, const Color& rColor ) { SetProperty( rPropName, ScfApiHelper::ConvertToApiColor( rColor ) ); } /** Puts the passed properties into the property set. Tries to use the XMultiPropertySet interface. @@ -268,7 +268,7 @@ public: void WriteValue( const UnoAny& rAny ); /** Writes a tools string to the value sequence. */ inline void WriteValue( const String& rString ) - { WriteValue( ::rtl::OUString( rString ) ); } + { WriteValue( OUString( rString ) ); } /** Writes a color value to the value sequence. */ inline void WriteValue( const Color& rColor ) { WriteValue( ScfApiHelper::ConvertToApiColor( rColor ) ); } @@ -284,7 +284,7 @@ private: UnoAny* GetNextAny(); private: - typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > OUStringSequence; + typedef ::com::sun::star::uno::Sequence< OUString > OUStringSequence; typedef ::com::sun::star::uno::Sequence< UnoAny > UnoAnySequence; OUStringSequence maNameSeq; /// Sequence of property names. diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 082f3c604965..cb2785ecdca0 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -484,10 +484,10 @@ enum FunctionLibraryType */ struct FunctionInfo { - ::rtl::OUString maOdfFuncName; /// ODF function name. - ::rtl::OUString maOoxFuncName; /// OOXML function name. - ::rtl::OUString maBiffMacroName; /// Expected macro name in EXTERN.CALL function. - ::rtl::OUString maExtProgName; /// Programmatic function name for external functions. + OUString maOdfFuncName; /// ODF function name. + OUString maOoxFuncName; /// OOXML function name. + OUString maBiffMacroName; /// Expected macro name in EXTERN.CALL function. + OUString maExtProgName; /// Programmatic function name for external functions. FunctionLibraryType meFuncLibType; /// The external library this function is part of. sal_Int32 mnApiOpCode; /// API function opcode. sal_uInt16 mnBiff12FuncId; /// BIFF12 function identifier. @@ -544,7 +544,7 @@ public: virtual ~FunctionProvider(); /** Returns the function info for an OOXML function name, or 0 on error. */ - const FunctionInfo* getFuncInfoFromOoxFuncName( const ::rtl::OUString& rFuncName ) const; + const FunctionInfo* getFuncInfoFromOoxFuncName( const OUString& rFuncName ) const; /** Returns the function info for a BIFF12 function index, or 0 on error. */ const FunctionInfo* getFuncInfoFromBiff12FuncId( sal_uInt16 nFuncId ) const; @@ -554,11 +554,11 @@ public: /** Returns the function info for a macro function referred by the EXTERN.CALL function, or 0 on error. */ - const FunctionInfo* getFuncInfoFromMacroName( const ::rtl::OUString& rFuncName ) const; + const FunctionInfo* getFuncInfoFromMacroName( const OUString& rFuncName ) const; /** Returns the library type associated with the passed URL of a function library (function add-in). */ - FunctionLibraryType getFuncLibTypeFromLibraryName( const ::rtl::OUString& rLibraryName ) const; + FunctionLibraryType getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) const; protected: /** Returns the list of all function infos. */ @@ -616,7 +616,7 @@ public: /** Calls the XFormulaParser::parseFormula() function of the API parser. */ ApiTokenSequence parseFormula( - const ::rtl::OUString& rFormula, + const OUString& rFormula, const ::com::sun::star::table::CellAddress& rRefPos ); private: @@ -641,7 +641,7 @@ public: @param rAddress The cell address containing column and row index. @param bAbsolute True = adds dollar signs before column and row. */ - static ::rtl::OUString generateAddress2dString( + static OUString generateAddress2dString( const ::com::sun::star::table::CellAddress& rAddress, bool bAbsolute ); @@ -651,7 +651,7 @@ public: @param rAddress The cell address containing column and row index. @param bAbsolute True = adds dollar signs before column and row. */ - static ::rtl::OUString generateAddress2dString( + static OUString generateAddress2dString( const BinAddress& rAddress, bool bAbsolute ); @@ -664,14 +664,14 @@ public: @return The string enclosed in double quotes, where all contained quote characters are doubled. */ - static ::rtl::OUString generateApiString( const ::rtl::OUString& rString ); + static OUString generateApiString( const OUString& rString ); /** Generates an array string in Calc formula notation from the passed matrix with Any's containing double values or strings. @param rMatrix The matrix containing double values or strings. */ - static ::rtl::OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); + static OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); // ------------------------------------------------------------------------ @@ -750,7 +750,7 @@ public: contains the string extracted from the token sequence. */ bool extractString( - ::rtl::OUString& orString, + OUString& orString, const ApiTokenSequence& rTokens ) const; /** Tries to extract information about a special token used for array diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index a0b96ce6d558..73009f552891 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -34,18 +34,18 @@ private: struct SharedFormulaEntry { ::com::sun::star::table::CellAddress maAddress; - rtl::OUString maTokenStr; + OUString maTokenStr; sal_Int32 mnSharedId; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaTokens > mxFormulaTokens; - SharedFormulaEntry( const ::com::sun::star::table::CellAddress& rAddress, const rtl::OUString& rTokenStr, sal_Int32 nSharedId ) : maAddress( rAddress ), maTokenStr( rTokenStr ), mnSharedId( nSharedId ) {} + SharedFormulaEntry( const ::com::sun::star::table::CellAddress& rAddress, const OUString& rTokenStr, sal_Int32 nSharedId ) : maAddress( rAddress ), maTokenStr( rTokenStr ), mnSharedId( nSharedId ) {} }; struct TokenAddressItem { - ::rtl::OUString maTokenStr; + OUString maTokenStr; ::com::sun::star::table::CellAddress maCellAddress; - TokenAddressItem( const rtl::OUString& rTokenStr, const ::com::sun::star::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} + TokenAddressItem( const OUString& rTokenStr, const ::com::sun::star::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} }; struct TokenRangeAddressItem @@ -69,7 +69,7 @@ typedef ::std::map< sal_Int32, SharedIdToTokenIndex > SheetToSharedIdToTokenInde typedef ::std::pair< ::com::sun::star::table::CellAddress, double > ValueAddressPair; typedef ::std::map< sal_Int32, std::vector< ValueAddressPair > > FormulaValueMap; - void createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ); + void createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); ::com::sun::star::uno::Reference< com::sun::star::table::XCellRange > getRange( const ::com::sun::star::table::CellRangeAddress& rRange); com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheet > mxCurrSheet; FormulaDataMap cellFormulas; @@ -87,11 +87,11 @@ typedef ::std::map< sal_Int32, std::vector< ValueAddressPair > > FormulaValueMap public: explicit FormulaBuffer( const WorkbookHelper& rHelper ); void finalizeImport(); - void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const rtl::OUString& ); + void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const OUString& ); void setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId ); void setCellFormulaValue( const ::com::sun::star::table::CellAddress& rAddress, double fValue ); - void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& ); - void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ); + void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); + void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); }; } } diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx index 68fffcc03e3d..33135ab0e5d3 100644 --- a/sc/source/filter/inc/formulaparser.hxx +++ b/sc/source/filter/inc/formulaparser.hxx @@ -56,7 +56,7 @@ protected: @param rTokenData The string that has been found in an OPCODE_BAD token preceding the function parentheses. */ - virtual const FunctionInfo* resolveBadFuncName( const ::rtl::OUString& rTokenData ) const; + virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const; /** Derived classed may try to find the name of a defined name with the passed index extracted from an OPCODE_NAME token. @@ -64,7 +64,7 @@ protected: @param nTokenIndex The index of the defined name that has been found in an OPCODE_NAME token preceding the function parentheses. */ - virtual ::rtl::OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; + virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; private: typedef ::std::vector< const ApiToken* > ParameterPosVector; @@ -108,7 +108,7 @@ public: /** Converts an OOXML formula string. */ ApiTokenSequence importFormula( const ::com::sun::star::table::CellAddress& rBaseAddr, - const ::rtl::OUString& rFormulaString ) const; + const OUString& rFormulaString ) const; /** Imports and converts a BIFF12 token array from the passed stream. */ ApiTokenSequence importFormula( @@ -135,13 +135,13 @@ public: ApiTokenSequence convertNameToFormula( sal_Int32 nTokenIndex ) const; /** Converts the passed XML formula to an OLE link target. */ - ::rtl::OUString importOleTargetLink( const ::rtl::OUString& rFormulaString ); + OUString importOleTargetLink( const OUString& rFormulaString ); /** Imports and converts an OLE link target from the passed stream. */ - ::rtl::OUString importOleTargetLink( SequenceInputStream& rStrm ); + OUString importOleTargetLink( SequenceInputStream& rStrm ); /** Converts the passed formula to a macro name for a drawing shape. */ - ::rtl::OUString importMacroName( const ::rtl::OUString& rFormulaString ); + OUString importMacroName( const OUString& rFormulaString ); private: ::std::auto_ptr< FormulaParserImpl > mxImpl; diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index fa5aee6d13fe..cfa80fe86dc4 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -224,11 +224,11 @@ public: // *** byte string import operations *** -------------------------------------- /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - static rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft); + static OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft); /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - inline static rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) + inline static OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) { - return rtl::OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc); + return OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc); } /** Appends a zero terminated byte string. */ @@ -273,7 +273,7 @@ typedef ::std::vector< sal_Int16 > ScfInt16Vec; typedef ::std::vector< sal_uInt16 > ScfUInt16Vec; typedef ::std::vector< sal_Int32 > ScfInt32Vec; typedef ::std::vector< sal_uInt32 > ScfUInt32Vec; -typedef ::std::vector< ::rtl::OUString > ScfStringVec; +typedef ::std::vector< OUString > ScfStringVec; // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index 71fc58bb099a..585f7a21a0b5 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -123,7 +123,7 @@ class ScHTMLExport : public ScExportBase void WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ); void WriteGraphEntry( ScHTMLGraphEntry* ); void WriteImage( String& rLinkName, - const Graphic&, const rtl::OString& rImgOptions, + const Graphic&, const OString& rImgOptions, sal_uLong nXOutFlags = 0 ); // nXOutFlags fuer XOutBitmap::WriteGraphic @@ -143,7 +143,7 @@ class ScHTMLExport : public ScExportBase SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - rtl::OString BorderToStyle(const char* pBorderName, + OString BorderToStyle(const char* pBorderName, const ::editeng::SvxBorderLine* pLine, bool& bInsertSemicolon); sal_uInt16 GetFontSizeNumber( sal_uInt16 nHeight ); diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 88ce724f0124..cbae0643b5e8 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -50,30 +50,30 @@ class ScHTMLTable; */ class ScHTMLStyles { - typedef ::boost::unordered_map PropsType; - typedef ::boost::ptr_map NamePropsType; - typedef ::boost::ptr_map ElemsType; + typedef ::boost::unordered_map PropsType; + typedef ::boost::ptr_map NamePropsType; + typedef ::boost::ptr_map ElemsType; NamePropsType maGlobalProps; /// global properties (for a given class for all elements) NamePropsType maElemGlobalProps; /// element global properties (no class specified) ElemsType maElemProps; /// element to class to properties (both element and class are given) - const rtl::OUString maEmpty; /// just a persistent empty string. + const OUString maEmpty; /// just a persistent empty string. public: ScHTMLStyles(); void add(const char* pElemName, size_t nElemName, const char* pClassName, size_t nClassName, - const rtl::OUString& aProp, const rtl::OUString& aValue); + const OUString& aProp, const OUString& aValue); /** * Find best-matching property value for given element and class names. */ - const rtl::OUString& getPropertyValue( - const rtl::OUString& rElem, const rtl::OUString& rClass, const rtl::OUString& rPropName) const; + const OUString& getPropertyValue( + const OUString& rElem, const OUString& rClass, const OUString& rPropName) const; private: static void insertProp( - NamePropsType& rProps, const rtl::OUString& aName, - const rtl::OUString& aProp, const rtl::OUString& aValue); + NamePropsType& rProps, const OUString& aName, + const OUString& aProp, const OUString& aValue); }; /** Base class for HTML parser classes. */ @@ -165,9 +165,9 @@ class ScHTMLLayoutParser : public ScHTMLParser { private: Size aPageSize; - rtl::OUString aBaseURL; + OUString aBaseURL; ScHTMLTableStack aTableStack; - rtl::OUString aString; + OUString aString; ScRangeListRef xLockedList; // je Table OuterMap* pTables; ScHTMLColOffset* pColOffset; @@ -382,7 +382,7 @@ public: virtual ~ScHTMLTable(); /** Returns the name of the table, specified in the TABLE tag. */ - inline const rtl::OUString& GetTableName() const { return maTableName; } + inline const OUString& GetTableName() const { return maTableName; } /** Returns the unique identifier of the table. */ inline ScHTMLTableId GetTableId() const { return maTableId.mnTableId; } /** Returns the table size. */ @@ -565,7 +565,7 @@ private: private: ScHTMLTable* mpParentTable; /// Pointer to parent table. ScHTMLTableMapPtr mxNestedTables; /// Table of nested HTML tables. - rtl::OUString maTableName; /// Table name from option. + OUString maTableName; /// Table name from
      option. ScHTMLTableAutoId maTableId; /// Unique identifier of this table. SfxItemSet maTableItemSet; /// Items for the entire table. SfxItemSetPtr mxRowItemSet; /// Items for the current table row. @@ -653,14 +653,14 @@ private: /** Closes the current table, regardless on opening tag. */ void CloseTable( const ImportInfo& rInfo ); - void ParseStyle(const rtl::OUString& rStrm); + void ParseStyle(const OUString& rStrm); DECL_LINK( HTMLImportHdl, const ImportInfo* ); private: typedef ::std::auto_ptr< ScHTMLGlobalTable > ScHTMLGlobalTablePtr; - rtl::OUStringBuffer maTitle; /// The title of the document. + OUStringBuffer maTitle; /// The title of the document. ScHTMLGlobalTablePtr mxGlobTable; /// Contains the entire imported document. ScHTMLTable* mpCurrTable; /// Pointer to current table (performance). ScHTMLTableId mnUnusedId; /// First unused table identifier. diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index af1d7df7cfb6..32c36111c69b 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -38,7 +38,7 @@ namespace xls { struct NumFmtModel { ::com::sun::star::lang::Locale maLocale; - ::rtl::OUString maFmtCode; + OUString maFmtCode; sal_Int16 mnPredefId; explicit NumFmtModel(); @@ -63,7 +63,7 @@ public: explicit NumberFormat( const WorkbookHelper& rHelper ); /** Sets the passed format code. */ - void setFormatCode( const ::rtl::OUString& rFmtCode ); + void setFormatCode( const OUString& rFmtCode ); /** Sets the passed format code, encoded in UTF-8. */ void setFormatCode( const ::com::sun::star::lang::Locale& rLocale, @@ -96,7 +96,7 @@ public: explicit NumberFormatsBuffer( const WorkbookHelper& rHelper ); /** Inserts a new number format. */ - NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const ::rtl::OUString& rFmtCode ); + NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const OUString& rFmtCode ); /** Inserts a new number format code. */ NumberFormatRef importNumFmt( const AttributeList& rAttribs ); @@ -119,7 +119,7 @@ private: typedef RefMap< sal_Int32, NumberFormat > NumberFormatMap; NumberFormatMap maNumFmts; /// List of number formats. - ::rtl::OUString maLocaleStr; /// Current office locale. + OUString maLocaleStr; /// Current office locale. sal_Int32 mnHighestId; }; diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index a97a50c5d4b9..de5f988f03dc 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -18,23 +18,23 @@ class ScOrcusFiltersImpl : public ScOrcusFilters { public: - static rtl::OString toSystemPath(const rtl::OUString& rPath); + static OString toSystemPath(const OUString& rPath); - virtual bool importCSV(ScDocument& rDoc, const rtl::OUString& rPath) const; - virtual bool importGnumeric(ScDocument& rDoc, const rtl::OUString& rPath) const; + virtual bool importCSV(ScDocument& rDoc, const OUString& rPath) const; + virtual bool importGnumeric(ScDocument& rDoc, const OUString& rPath) const; - virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const rtl::OUString& rPath) const; + virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const; }; class ScOrcusXMLContextImpl : public ScOrcusXMLContext { ScDocument& mrDoc; - rtl::OUString maPath; + OUString maPath; orcus::xmlns_repository maNsRepo; /// XML namespace repository for this context. public: - ScOrcusXMLContextImpl(ScDocument& rDoc, const rtl::OUString& rPath); + ScOrcusXMLContextImpl(ScDocument& rDoc, const OUString& rPath); virtual ~ScOrcusXMLContextImpl(); virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam); diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx index 9ba982353c1a..47f6239b97fe 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -35,14 +35,14 @@ class HeaderFooterParser; /** Holds page style data for a single sheet. */ struct PageSettingsModel { - ::rtl::OUString maGraphicUrl; /// URL of the graphic object. - ::rtl::OUString maBinSettPath; /// Relation identifier of binary printer settings. - ::rtl::OUString maOddHeader; /// Header string for odd pages. - ::rtl::OUString maOddFooter; /// Footer string for odd pages. - ::rtl::OUString maEvenHeader; /// Header string for even pages. - ::rtl::OUString maEvenFooter; /// Footer string for even pages. - ::rtl::OUString maFirstHeader; /// Header string for first page of the sheet. - ::rtl::OUString maFirstFooter; /// Footer string for first page of the sheet. + OUString maGraphicUrl; /// URL of the graphic object. + OUString maBinSettPath; /// Relation identifier of binary printer settings. + OUString maOddHeader; /// Header string for odd pages. + OUString maOddFooter; /// Footer string for odd pages. + OUString maEvenHeader; /// Header string for even pages. + OUString maEvenFooter; /// Footer string for even pages. + OUString maFirstHeader; /// Header string for first page of the sheet. + OUString maFirstFooter; /// Footer string for first page of the sheet. double mfLeftMargin; /// Margin between left edge of page and begin of sheet area. double mfRightMargin; /// Margin between end of sheet area and right edge of page. double mfTopMargin; /// Margin between top egde of page and begin of sheet area. @@ -99,7 +99,7 @@ public: /** Imports header and footer settings from a headerFooter element. */ void importHeaderFooter( const AttributeList& rAttribs ); /** Imports header/footer characters from a headerFooter element. */ - void importHeaderFooterCharacters( const ::rtl::OUString& rChars, sal_Int32 nElement ); + void importHeaderFooterCharacters( const OUString& rChars, sal_Int32 nElement ); /** Imports the picture element. */ void importPicture( const ::oox::core::Relations& rRelations, const AttributeList& rAttribs ); @@ -124,7 +124,7 @@ public: private: /** Imports the binary picture data from the fragment with the passed identifier. */ - void importPictureData( const ::oox::core::Relations& rRelations, const ::rtl::OUString& rRelId ); + void importPictureData( const ::oox::core::Relations& rRelations, const OUString& rRelId ); private: PageSettingsModel maModel; @@ -162,8 +162,8 @@ private: void convertHeaderFooterData( PropertySet& rPropSet, HFHelperData& orHFData, - const ::rtl::OUString rOddContent, - const ::rtl::OUString rEvenContent, + const OUString rOddContent, + const OUString rEvenContent, bool bUseEvenContent, double fPageMargin, double fContentMargin ); @@ -171,7 +171,7 @@ private: sal_Int32 writeHeaderFooter( PropertySet& rPropSet, sal_Int32 nPropId, - const ::rtl::OUString& rContent ); + const OUString& rContent ); private: typedef ::std::auto_ptr< HeaderFooterParser > HeaderFooterParserPtr; diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 7491a97941ba..484e25fd5b58 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -40,7 +40,7 @@ class WorksheetHelper; // ============================================================================ -typedef ::std::pair< sal_Int32, rtl::OUString > IdCaptionPair; +typedef ::std::pair< sal_Int32, OUString > IdCaptionPair; typedef ::std::vector< IdCaptionPair > IdCaptionPairList; class PivotCacheItem @@ -92,14 +92,14 @@ public: /** Returns the value of the item. */ inline const ::com::sun::star::uno::Any& getValue() const { return maValue; } /** Returns the string representation of the item. */ - ::rtl::OUString getName() const; + OUString getName() const; /** Returns true if the item is unused. */ inline bool isUnused() const { return mbUnused; } private: friend class PivotCacheItemList; // #FIXME hack Sets the value of this item to the given string ( and overwrites type if necessary - void setStringValue( const rtl::OUString& sName ); + void setStringValue( const OUString& sName ); ::com::sun::star::uno::Any maValue; /// Value of the item. sal_Int32 mnType; /// Value type (OOXML token identifier). bool mbUnused; @@ -127,7 +127,7 @@ public: /** Returns the specified item. */ const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const; /** Returns the names of all items. */ - void getCacheItemNames( ::std::vector< ::rtl::OUString >& orItemNames ) const; + void getCacheItemNames( ::std::vector< OUString >& orItemNames ) const; void applyItemCaptions( const IdCaptionPairList& vCaptions ); private: @@ -145,10 +145,10 @@ private: struct PCFieldModel { - ::rtl::OUString maName; /// Fixed name of the cache field. - ::rtl::OUString maCaption; /// Caption of the ccahe field. - ::rtl::OUString maPropertyName; /// OLAP property name. - ::rtl::OUString maFormula; /// Formula of a calculated field. + OUString maName; /// Fixed name of the cache field. + OUString maCaption; /// Caption of the ccahe field. + OUString maPropertyName; /// OLAP property name. + OUString maFormula; /// Formula of a calculated field. sal_Int32 mnNumFmtId; /// Number format for all items. sal_Int32 mnSqlType; /// Data type from ODBC data source. sal_Int32 mnHierarchy; /// Hierarchy this field is part of. @@ -208,10 +208,10 @@ struct PCFieldGroupModel /** Helper struct for mapping original item names from/to group item names. */ struct PivotCacheGroupItem { - ::rtl::OUString maOrigName; - ::rtl::OUString maGroupName; + OUString maOrigName; + OUString maGroupName; - inline explicit PivotCacheGroupItem( const ::rtl::OUString& rItemName ) : + inline explicit PivotCacheGroupItem( const OUString& rItemName ) : maOrigName( rItemName ), maGroupName( rItemName ) {} }; @@ -278,7 +278,7 @@ public: inline bool hasParentGrouping() const { return maFieldGroupModel.mnParentField >= 0; } /** Returns the name of the cache field. */ - inline const ::rtl::OUString& getName() const { return maFieldModel.maName; } + inline const OUString& getName() const { return maFieldModel.maName; } /** Returns the index of the parent group field that groups the items of this field. */ inline sal_Int32 getParentGroupField() const { return maFieldGroupModel.mnParentField; } /** Returns the index of the base field grouping is based on. */ @@ -287,7 +287,7 @@ public: /** Returns the shared or group item with the specified index. */ const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const; /** Returns the names of all shared or group items. */ - void getCacheItemNames( ::std::vector< ::rtl::OUString >& orItemNames ) const; + void getCacheItemNames( ::std::vector< OUString >& orItemNames ) const; /** Returns shared or group items. */ PivotCacheItemList getCacheItems() const; @@ -295,10 +295,10 @@ public: void convertNumericGrouping( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxDPField ) const; /** Creates inplace date grouping settings or a new date group field. */ - ::rtl::OUString createDateGroupField( + OUString createDateGroupField( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField ) const; /** Creates a new grouped DataPilot field and returns its name. */ - ::rtl::OUString createParentGroupField( + OUString createParentGroupField( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField >& rxBaseDPField, const PivotCacheField& rBaseCacheField, PivotCacheGroupItemVector& orItemNames ) const; @@ -341,8 +341,8 @@ private: struct PCDefinitionModel { - ::rtl::OUString maRelId; /// Relation identifier for cache records fragment. - ::rtl::OUString maRefreshedBy; /// Name of user who last refreshed the cache. + OUString maRelId; /// Relation identifier for cache records fragment. + OUString maRefreshedBy; /// Name of user who last refreshed the cache. double mfRefreshedDate; /// Date/time of last refresh. sal_Int32 mnRecords; /// Number of data records in the cache. sal_Int32 mnMissItemsLimit; /// Limit for discarding unused items. @@ -375,9 +375,9 @@ struct PCSourceModel struct PCWorksheetSourceModel { - ::rtl::OUString maRelId; /// Relation identifier for an external document URL. - ::rtl::OUString maSheet; /// Sheet name for cell range or sheet-local defined names. - ::rtl::OUString maDefName; /// Defined name containing a cell range if present. + OUString maRelId; /// Relation identifier for an external document URL. + OUString maSheet; /// Sheet name for cell range or sheet-local defined names. + OUString maDefName; /// Defined name containing a cell range if present. ::com::sun::star::table::CellRangeAddress maRange; /// Source cell range of the data. @@ -422,7 +422,7 @@ public: inline const ::com::sun::star::table::CellRangeAddress& getSourceRange() const { return maSheetSrcModel.maRange; } /** Returns the relation identifier of the pivot cache records fragment. */ - inline const ::rtl::OUString& getRecordsRelId() const { return maDefModel.maRelId; } + inline const OUString& getRecordsRelId() const { return maDefModel.maRelId; } /** Returns the number of pivot cache fields. */ sal_Int32 getCacheFieldCount() const; @@ -467,7 +467,7 @@ private: PCSourceModel maSourceModel; /// Pivot cache source settings. PCWorksheetSourceModel maSheetSrcModel; /// Sheet source data if cache type is sheet. ValueRangeSet maColSpans; /// Column spans used by SheetDataBuffer for optimized cell import. - ::rtl::OUString maTargetUrl; /// URL of an external source document. + OUString maTargetUrl; /// URL of an external source document. mutable sal_Int32 mnCurrRow; /// Current row index in dummy sheet. bool mbValidSource; /// True = pivot cache is based on supported data source. bool mbDummySheet; /// True = pivot cache is based on a dummy sheet. @@ -481,7 +481,7 @@ public: explicit PivotCacheBuffer( const WorkbookHelper& rHelper ); /** Registers a pivot cache definition fragment. The fragment will be loaded on demand (OOXML/BIFF12 only). */ - void registerPivotCacheFragment( sal_Int32 nCacheId, const ::rtl::OUString& rFragmentPath ); + void registerPivotCacheFragment( sal_Int32 nCacheId, const OUString& rFragmentPath ); /** Imports and stores a pivot cache definition fragment on first call, returns the imported cache on subsequent calls with the same identifier. */ @@ -492,7 +492,7 @@ private: PivotCache& createPivotCache( sal_Int32 nCacheId ); private: - typedef ::std::map< sal_Int32, ::rtl::OUString > FragmentPathMap; + typedef ::std::map< sal_Int32, OUString > FragmentPathMap; typedef RefMap< sal_Int32, PivotCache > PivotCacheMap; typedef ::std::vector< sal_Int32 > PivotCacheIdVector; diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index c617d98626f2..de973aefd604 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -54,7 +54,7 @@ class PivotCacheDefinitionFragment : public WorkbookFragmentBase public: explicit PivotCacheDefinitionFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, PivotCache& rPivotCache ); protected: @@ -74,7 +74,7 @@ class PivotCacheRecordsFragment : public WorksheetFragmentBase public: explicit PivotCacheRecordsFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, const PivotCache& rPivotCache ); protected: @@ -102,7 +102,7 @@ class BiffPivotCacheFragment : public BiffWorkbookFragmentBase public: explicit BiffPivotCacheFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rStrmName, + const OUString& rStrmName, PivotCache& rPivotCache ); /** Imports the entire fragment, returns true, if EOF record has been reached. */ diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index 3de6ad11b83d..f1c1e6dd2f42 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -42,7 +42,7 @@ struct PTFieldItemModel { sal_Int32 mnCacheItem; /// Index to shared item in pivot cache. sal_Int32 mnType; /// Type of the item. - rtl::OUString msCaption; /// User caption of the item + OUString msCaption; /// User caption of the item bool mbShowDetails; /// True = show item details (items of child fields). bool mbHidden; /// True = item is hidden. @@ -95,7 +95,7 @@ struct PTFieldModel struct PTPageFieldModel { - ::rtl::OUString maName; /// Unique name of the page field. + OUString maName; /// Unique name of the page field. sal_Int32 mnField; /// Base pivot field. sal_Int32 mnItem; /// Index of field item that is shown by the page field. @@ -106,7 +106,7 @@ struct PTPageFieldModel struct PTDataFieldModel { - ::rtl::OUString maName; /// Name of the data field. + OUString maName; /// Name of the data field. sal_Int32 mnField; /// Base pivot field. sal_Int32 mnSubtotal; /// Subtotal aggregation function. sal_Int32 mnShowDataAs; /// Show data as, based on another field. @@ -161,7 +161,7 @@ public: PivotCacheGroupItemVector& orItemNames ); /** Returns the name of the DataPilot field in the fields collection. */ - inline const ::rtl::OUString& getDPFieldName() const { return maDPFieldName; } + inline const OUString& getDPFieldName() const { return maDPFieldName; } /** Converts dimension and other settings for a row field. */ void convertRowField(); @@ -185,7 +185,7 @@ private: PivotTable& mrPivotTable; /// The parent pivot table object. ItemModelVector maItems; /// All items of this field. PTFieldModel maModel; /// Pivot field settings. - ::rtl::OUString maDPFieldName; /// Name of the field in DataPilot field collection. + OUString maDPFieldName; /// Name of the field in DataPilot field collection. sal_Int32 mnFieldIndex; /// Zero-based index of this field. }; @@ -193,10 +193,10 @@ private: struct PTFilterModel { - ::rtl::OUString maName; /// Name of the field filter. - ::rtl::OUString maDescription; /// Description of the field filter. - ::rtl::OUString maStrValue1; /// First string value for label filter. - ::rtl::OUString maStrValue2; /// Second string value for label filter. + OUString maName; /// Name of the field filter. + OUString maDescription; /// Description of the field filter. + OUString maStrValue1; /// First string value for label filter. + OUString maStrValue2; /// Second string value for label filter. double mfValue; /// Number of items or percent or sum to be shown. sal_Int32 mnField; /// Base pivot field. sal_Int32 mnMemPropField; /// Member property field. @@ -239,17 +239,17 @@ private: struct PTDefinitionModel : public AutoFormatModel { - ::rtl::OUString maName; - ::rtl::OUString maDataCaption; - ::rtl::OUString maGrandTotalCaption; - ::rtl::OUString maRowHeaderCaption; - ::rtl::OUString maColHeaderCaption; - ::rtl::OUString maErrorCaption; - ::rtl::OUString maMissingCaption; - ::rtl::OUString maPageStyle; - ::rtl::OUString maPivotTableStyle; - ::rtl::OUString maVacatedStyle; - ::rtl::OUString maTag; + OUString maName; + OUString maDataCaption; + OUString maGrandTotalCaption; + OUString maRowHeaderCaption; + OUString maColHeaderCaption; + OUString maErrorCaption; + OUString maMissingCaption; + OUString maPageStyle; + OUString maPivotTableStyle; + OUString maVacatedStyle; + OUString maTag; sal_Int32 mnCacheId; sal_Int32 mnDataPosition; sal_Int32 mnPageWrap; @@ -352,7 +352,7 @@ public: /** Returns the associated data pilot field for the specified pivot table field. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > - getDataPilotField( const ::rtl::OUString& rFieldName ) const; + getDataPilotField( const OUString& rFieldName ) const; /** Returns the associated data pilot field for the specified pivot table field. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > getDataPilotField( sal_Int32 nFieldIdx ) const; diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index c86a4d4de02b..b9a7f22ea4e3 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -75,7 +75,7 @@ class PivotTableFragment : public WorksheetFragmentBase public: explicit PivotTableFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/querytablebuffer.hxx b/sc/source/filter/inc/querytablebuffer.hxx index a0fd51754101..4cbae0fd8950 100644 --- a/sc/source/filter/inc/querytablebuffer.hxx +++ b/sc/source/filter/inc/querytablebuffer.hxx @@ -30,7 +30,7 @@ namespace xls { struct QueryTableModel : public AutoFormatModel { - ::rtl::OUString maDefName; /// Defined name containing the target cell range. + OUString maDefName; /// Defined name containing the target cell range. sal_Int32 mnConnId; /// Identifier of the external connection used to query the data. sal_Int32 mnGrowShrinkType; /// Behaviour when source data size changes. bool mbHeaders; /// True = source data contains a header row. diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index b54af742bec4..e442bb6990e3 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -34,7 +34,7 @@ class QueryTableFragment : public WorksheetFragmentBase public: explicit QueryTableFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index a0f8761a1fe1..96065d3fbe23 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -55,7 +55,7 @@ public: explicit RichStringPortion( const WorkbookHelper& rHelper ); /** Sets text data for this portion. */ - void setText( const ::rtl::OUString& rText ); + void setText( const OUString& rText ); /** Creates and returns a new font formatting object. */ FontRef createFont(); /** Links this portion to a font object from the global font list. */ @@ -65,7 +65,7 @@ public: void finalizeImport(); /** Returns the text data of this portion. */ - inline const ::rtl::OUString& getText() const { return maText; } + inline const OUString& getText() const { return maText; } /** Returns true, if the portion fontains font formatting. */ inline bool hasFont() const { return mxFont.get() != 0; } @@ -81,7 +81,7 @@ public: const Font* pFont ) const; private: - ::rtl::OUString maText; /// Portion text. + OUString maText; /// Portion text. FontRef mxFont; /// Embedded portion font, may be empty. sal_Int32 mnFontId; /// Link to global font list. }; @@ -173,14 +173,14 @@ public: explicit RichStringPhonetic( const WorkbookHelper& rHelper ); /** Sets text data for this phonetic portion. */ - void setText( const ::rtl::OUString& rText ); + void setText( const OUString& rText ); /** Imports attributes of a phonetic run (rPh element). */ void importPhoneticRun( const AttributeList& rAttribs ); /** Sets the associated range in base text for this phonetic portion. */ void setBaseRange( sal_Int32 nBasePos, sal_Int32 nBaseEnd ); private: - ::rtl::OUString maText; /// Portion text. + OUString maText; /// Portion text. sal_Int32 mnBasePos; /// Start position in base text. sal_Int32 mnBaseEnd; /// One-past-end position in base text. }; @@ -244,7 +244,7 @@ public: /** Tries to extract a plain string from this object. Returns the string, if there is only one unformatted portion. */ bool extractPlainString( - ::rtl::OUString& orString, + OUString& orString, const Font* pFirstPortionFont = 0 ) const; /** Converts the string and writes it into the passed XText. @@ -265,9 +265,9 @@ private: RichStringPhoneticRef createPhonetic(); /** Create base text portions from the passed string and character formatting. */ - void createTextPortions( const ::rtl::OUString& rText, FontPortionModelList& rPortions ); + void createTextPortions( const OUString& rText, FontPortionModelList& rPortions ); /** Create phonetic text portions from the passed string and portion data. */ - void createPhoneticPortions( const ::rtl::OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ); + void createPhoneticPortions( const OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ); private: typedef RefVector< RichStringPortion > PortionVector; diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index f79ca3caaa8a..feed7f5d3e3c 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -36,7 +36,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); private: RichStringRef mxString; /// Processed string. diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx index 26e2d7386bb3..b0e7dc889d6f 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -33,7 +33,7 @@ namespace xls { struct ScenarioCellModel { ::com::sun::star::table::CellAddress maPos; - ::rtl::OUString maValue; + OUString maValue; sal_Int32 mnNumFmtId; bool mbDeleted; @@ -44,9 +44,9 @@ struct ScenarioCellModel struct ScenarioModel { - ::rtl::OUString maName; /// Name of the scenario. - ::rtl::OUString maComment; /// Comment. - ::rtl::OUString maUser; /// Name of user created the scenario. + OUString maName; /// Name of the scenario. + OUString maComment; /// Comment. + OUString maUser; /// Name of user created the scenario. bool mbLocked; /// True = input cell values locked. bool mbHidden; /// True = scenario is hidden. diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index 325fdca387f7..4986b6f71c0b 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -32,7 +32,7 @@ class SharedStringsFragment : public WorkbookFragmentBase public: explicit SharedStringsFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 62f42daeed19..103418aa7d7a 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -69,8 +69,8 @@ struct CellFormulaModel /** Stores data about table operations. */ struct DataTableModel { - ::rtl::OUString maRef1; /// First reference cell for table operations. - ::rtl::OUString maRef2; /// Second reference cell for table operations. + OUString maRef1; /// First reference cell for table operations. + OUString maRef2; /// Second reference cell for table operations. bool mb2dTable; /// True = 2-dimensional data table. bool mbRowTable; /// True = row oriented data table. bool mbRef1Deleted; /// True = first reference cell deleted. @@ -118,7 +118,7 @@ public: /** Inserts a value cell into the sheet. */ void setValueCell( const CellModel& rModel, double fValue ); /** Inserts a simple string cell into the sheet. */ - void setStringCell( const CellModel& rModel, const ::rtl::OUString& rText ); + void setStringCell( const CellModel& rModel, const OUString& rText ); /** Inserts a rich-string cell into the sheet. */ void setStringCell( const CellModel& rModel, const RichStringRef& rxString ); /** Inserts a shared string cell into the sheet. */ @@ -128,7 +128,7 @@ public: /** Inserts a boolean cell into the sheet and adjusts number format. */ void setBooleanCell( const CellModel& rModel, bool bValue ); /** Inserts an error cell from the passed error code into the sheet. */ - void setErrorCell( const CellModel& rModel, const ::rtl::OUString& rErrorCode ); + void setErrorCell( const CellModel& rModel, const OUString& rErrorCode ); /** Inserts an error cell from the passed BIFF error code into the sheet. */ void setErrorCell( const CellModel& rModel, sal_uInt8 nErrorCode ); /** Inserts a formula cell into the sheet. */ diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 52d20da27985..9054f5b9bd83 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -59,7 +59,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -110,9 +110,9 @@ private: void importSharedFmla( SequenceInputStream& rStrm ); private: - ::rtl::OUString maCellValue; /// Cell value string (OOXML only). + OUString maCellValue; /// Cell value string (OOXML only). RichStringRef mxInlineStr; /// Inline rich string (OOXML only). - ::rtl::OUString maFormulaStr; + OUString maFormulaStr; DataTableModel maTableData; /// Settings for table operations. BinAddress maCurrPos; /// Current cell position (BIFF12 only). bool mbHasFormula; /// True = current cell has formula data (OOXML only). diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index c9223c436395..77654c7b2af4 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -152,7 +152,7 @@ private: /** Contains all XML font attributes, e.g. from a font or rPr element. */ struct FontModel { - ::rtl::OUString maName; /// Font name. + OUString maName; /// Font name. Color maColor; /// Font color. sal_Int32 mnScheme; /// Major/minor scheme font. sal_Int32 mnFamily; /// Font family. @@ -209,7 +209,7 @@ struct ApiFontUsedFlags /** Contains API font name, family, and charset for a script type. */ struct ApiScriptFontName { - ::rtl::OUString maName; /// Font name. + OUString maName; /// Font name. sal_Int16 mnFamily; /// Font family. sal_Int16 mnTextEnc; /// Font text encoding. @@ -786,7 +786,7 @@ typedef ::boost::shared_ptr< Dxf > DxfRef; /** Contains attributes of a cell style, e.g. from the cellStyle element. */ struct CellStyleModel { - ::rtl::OUString maName; /// Cell style name. + OUString maName; /// Cell style name. sal_Int32 mnXfId; /// Formatting for this cell style. sal_Int32 mnBuiltinId; /// Identifier for builtin styles. sal_Int32 mnLevel; /// Level for builtin column/row styles. @@ -818,16 +818,16 @@ public: void createCellStyle(); /** Stores tha passed final style name and creates the cell style, if it is user-defined or modified built-in. */ - void finalizeImport( const ::rtl::OUString& rFinalName ); + void finalizeImport( const OUString& rFinalName ); /** Returns the cell style model structure. */ inline const CellStyleModel& getModel() const { return maModel; } /** Returns the final style name used in the document. */ - inline const ::rtl::OUString& getFinalStyleName() const { return maFinalName; } + inline const OUString& getFinalStyleName() const { return maFinalName; } inline ::ScStyleSheet* getStyleSheet() { return mpStyleSheet; } private: CellStyleModel maModel; - ::rtl::OUString maFinalName; /// Final style name used in API. + OUString maFinalName; /// Final style name used in API. bool mbCreated; /// True = style sheet created. ::ScStyleSheet* mpStyleSheet; /// Calc cell style sheet. @@ -853,16 +853,16 @@ public: /** Returns the XF identifier associated to the default cell style. */ sal_Int32 getDefaultXfId() const; /** Returns the default style sheet for unused cells. */ - ::rtl::OUString getDefaultStyleName() const; + OUString getDefaultStyleName() const; /** Creates the style sheet described by the style XF with the passed identifier. */ - ::rtl::OUString createCellStyle( sal_Int32 nXfId ) const; + OUString createCellStyle( sal_Int32 nXfId ) const; ::ScStyleSheet* getCellStyleSheet( sal_Int32 nXfId ) const; private: /** Inserts the passed cell style object into the internal maps. */ void insertCellStyle( CellStyleRef xCellStyle ); /** Creates the style sheet described by the passed cell style object. */ - ::rtl::OUString createCellStyle( const CellStyleRef& rxCellStyle ) const; + OUString createCellStyle( const CellStyleRef& rxCellStyle ) const; ::ScStyleSheet* getCellStyleSheet( const CellStyleRef& rxCellStyle ) const; private: @@ -901,7 +901,7 @@ public: @param opnFontId (out-param) The identifier of the new font object. */ FontRef createFont( sal_Int32* opnFontId = 0 ); /** Creates a number format. */ - NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const ::rtl::OUString& rFmtCode ); + NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const OUString& rFmtCode ); sal_Int32 nextFreeNumFmtId(); /** Creates a new empty border object. @param opnBorderId (out-param) The identifier of the new border object. */ @@ -960,12 +960,12 @@ public: bool equalFills( sal_Int32 nFillId1, sal_Int32 nFillId2 ) const; /** Returns the default style sheet for unused cells. */ - ::rtl::OUString getDefaultStyleName() const; + OUString getDefaultStyleName() const; /** Creates the style sheet described by the style XF with the passed identifier. */ - ::rtl::OUString createCellStyle( sal_Int32 nXfId ) const; + OUString createCellStyle( sal_Int32 nXfId ) const; ::ScStyleSheet* getCellStyleSheet( sal_Int32 nXfId ) const; /** Creates the style sheet described by the DXF with the passed identifier. */ - ::rtl::OUString createDxfStyle( sal_Int32 nDxfId ) const; + OUString createDxfStyle( sal_Int32 nDxfId ) const; void writeFontToItemSet( SfxItemSet& rItemSet, sal_Int32 nFontId, bool bSkipPoolDefs = false ) const; /** Writes the font attributes of the specified font data to the passed property map. */ @@ -993,7 +993,7 @@ private: typedef RefVector< Fill > FillVector; typedef RefVector< Xf > XfVector; typedef RefVector< Dxf > DxfVector; - typedef ::std::map< sal_Int32, ::rtl::OUString > DxfStyleMap; + typedef ::std::map< sal_Int32, OUString > DxfStyleMap; ColorPalette maPalette; /// Color palette. FontVector maFonts; /// List of font objects. diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index 093a13e63195..5e8f1770c34d 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -129,7 +129,7 @@ class StylesFragment : public WorkbookFragmentBase public: explicit StylesFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx index 5ed673bb9bf3..9d4a2c7cd7ed 100644 --- a/sc/source/filter/inc/tablebuffer.hxx +++ b/sc/source/filter/inc/tablebuffer.hxx @@ -33,8 +33,8 @@ struct TableModel { ::com::sun::star::table::CellRangeAddress maRange; /// Original (unchecked) range of the table. - ::rtl::OUString maProgName; /// Programmatical name. - ::rtl::OUString maDisplayName; /// Display name. + OUString maProgName; /// Programmatical name. + OUString maDisplayName; /// Display name. sal_Int32 mnId; /// Unique table identifier. sal_Int32 mnType; /// Table type (worksheet, query, etc.). sal_Int32 mnHeaderRows; /// Number of header rows. @@ -65,7 +65,7 @@ public: /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */ inline sal_Int32 getTokenIndex() const { return mnTokenIndex; } /** Returns the original display name of the table. */ - inline const ::rtl::OUString& getDisplayName() const { return maModel.maDisplayName; } + inline const OUString& getDisplayName() const { return maModel.maDisplayName; } /** Returns the original (unchecked) total range of the table. */ inline const ::com::sun::star::table::CellRangeAddress& getOriginalRange() const { return maModel.maRange; } @@ -83,7 +83,7 @@ public: private: TableModel maModel; AutoFilterBuffer maAutoFilters; /// Filter settings for this table. - ::rtl::OUString maDBRangeName; /// Name of the databae range in the Calc document. + OUString maDBRangeName; /// Name of the databae range in the Calc document. ::com::sun::star::table::CellRangeAddress maDestRange; /// Validated range of the table in the worksheet. sal_Int32 mnTokenIndex; /// Token index used in API token array. @@ -107,7 +107,7 @@ public: /** Returns a table by its identifier. */ TableRef getTable( sal_Int32 nTableId ) const; /** Returns a table by its display name. */ - TableRef getTable( const ::rtl::OUString& rDispName ) const; + TableRef getTable( const OUString& rDispName ) const; private: /** Inserts the passed table into the maps according to its identifier and name. */ @@ -116,7 +116,7 @@ private: private: typedef RefVector< Table > TableVector; typedef RefMap< sal_Int32, Table > TableIdMap; - typedef RefMap< ::rtl::OUString, Table > TableNameMap; + typedef RefMap< OUString, Table > TableNameMap; TableVector maTables; TableIdMap maIdTables; diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index 77ed04d73f3f..92bc84e55075 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -34,7 +34,7 @@ class TableFragment : public WorksheetFragmentBase public: explicit TableFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx index 4056430b8e72..88921d1ceb5b 100644 --- a/sc/source/filter/inc/unitconverter.hxx +++ b/sc/source/filter/inc/unitconverter.hxx @@ -86,18 +86,18 @@ public: ::com::sun::star::util::DateTime calcDateTimeFromSerial( double fSerial ) const; /** Returns a BIFF error code from the passed error string. */ - sal_uInt8 calcBiffErrorCode( const ::rtl::OUString& rErrorCode ) const; + sal_uInt8 calcBiffErrorCode( const OUString& rErrorCode ) const; private: /** Adds an error code to the internal maps. */ - void addErrorCode( sal_uInt8 nErrorCode, const ::rtl::OUString& rErrorCode ); + void addErrorCode( sal_uInt8 nErrorCode, const OUString& rErrorCode ); /** Returns the conversion coefficient for the passed unit. */ double getCoefficient( Unit eUnit ) const; private: typedef ::std::vector< double > DoubleVector; - typedef ::std::map< ::rtl::OUString, sal_uInt8 > OoxErrorCodeMap; - typedef ::std::map< sal_uInt8, ::rtl::OUString > BiffErrorCodeMap; + typedef ::std::map< OUString, sal_uInt8 > OoxErrorCodeMap; + typedef ::std::map< sal_uInt8, OUString > BiffErrorCodeMap; DoubleVector maCoeffs; /// Coefficients for unit conversion. OoxErrorCodeMap maOoxErrCodes; /// Maps error code strings to BIFF error constants. diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx index ae90b5128036..88042abee875 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -35,11 +35,11 @@ class WorkbookFragment : public WorkbookFragmentBase public: explicit WorkbookFragment( const WorkbookHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -55,7 +55,7 @@ private: void importPivotCache( SequenceInputStream& rStrm ); void importExternalLinkFragment( ExternalLink& rExtLink ); - void importPivotCacheDefFragment( const ::rtl::OUString& rRelId, sal_Int32 nCacheId ); + void importPivotCacheDefFragment( const OUString& rRelId, sal_Int32 nCacheId ); private: DefinedNameRef mxCurrName; diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 0e1b87d70a70..fa1ce19529b6 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -77,7 +77,7 @@ enum FilterType /** Functor for case-insensitive string comparison, usable in maps etc. */ struct IgnoreCaseCompare { - bool operator()( const ::rtl::OUString& rName1, const ::rtl::OUString& rName2 ) const; + bool operator()( const OUString& rName1, const OUString& rName2 ) const; }; // ============================================================================ @@ -157,7 +157,7 @@ public: getSheetFromDoc( sal_Int16 nSheet ) const; /** Returns a reference to the specified spreadsheet in the document model. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > - getSheetFromDoc( const ::rtl::OUString& rSheet ) const; + getSheetFromDoc( const OUString& rSheet ) const; /** Returns the XCellRange interface for the passed cell range address. */ ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > @@ -169,13 +169,13 @@ public: getStyleFamily( bool bPageStyles ) const; /** Returns the specified cell or page style from the Calc document. */ ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > - getStyleObject( const ::rtl::OUString& rStyleName, bool bPageStyle ) const; + getStyleObject( const OUString& rStyleName, bool bPageStyle ) const; /** Creates and returns a defined name on-the-fly in the Calc document. The name will not be buffered in the global defined names buffer. @param orName (in/out-parameter) Returns the resulting used name. */ ScRangeData* createNamedRangeObject( - ::rtl::OUString& orName, + OUString& orName, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags = 0 ) const; @@ -184,7 +184,7 @@ public: The name will not be buffered in the global defined names buffer. @param orName (in/out-parameter) Returns the resulting used name. */ ScRangeData* createLocalNamedRangeObject( - ::rtl::OUString& orName, + OUString& orName, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags = 0, sal_Int32 nTab = -1 ) const; @@ -194,7 +194,7 @@ public: @param orName (in/out-parameter) Returns the resulting used name. */ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange > createDatabaseRangeObject( - ::rtl::OUString& orName, + OUString& orName, const ::com::sun::star::table::CellRangeAddress& rRangeAddr ) const; /** Creates and returns an unnamed database range on-the-fly in the Calc document. @@ -206,7 +206,7 @@ public: /** Creates and returns a com.sun.star.style.Style object for cells or pages. */ ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > createStyleObject( - ::rtl::OUString& orStyleName, + OUString& orStyleName, bool bPageStyle ) const; // buffers ---------------------------------------------------------------- diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index 8fb3ec8a4ffe..6d2423a7cbaf 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -32,7 +32,7 @@ namespace xls { /** Settings for workbook write protection. */ struct FileSharingModel { - ::rtl::OUString maUserName; /// User who added the write protection password. + OUString maUserName; /// User who added the write protection password. sal_uInt16 mnPasswordHash; /// Hash value of the write protection password. bool mbRecommendReadOnly; /// True = recommend read-only mode on opening. @@ -44,7 +44,7 @@ struct FileSharingModel /** Global workbook settings. */ struct WorkbookSettingsModel { - ::rtl::OUString maCodeName; /// VBA codename for the workbook. + OUString maCodeName; /// VBA codename for the workbook. sal_Int32 mnShowObjectMode; /// Specifies how objects are shown. sal_Int32 mnUpdateLinksMode; /// Specifies how external links are updated. sal_Int32 mnDefaultThemeVer; /// Default theme version. diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index d58a49017c46..54b47d15177b 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -37,8 +37,8 @@ namespace xls { /** Contains data from the 'sheet' element describing a sheet in the workbook. */ struct SheetInfoModel { - ::rtl::OUString maRelId; /// Relation identifier for the sheet substream. - ::rtl::OUString maName; /// Original name of the sheet. + OUString maRelId; /// Relation identifier for the sheet substream. + OUString maName; /// Original name of the sheet. sal_Int64 mnBiffHandle; /// BIFF record handle of the sheet substream. sal_Int32 mnSheetId; /// Sheet identifier. sal_Int32 mnState; /// Visibility state. @@ -65,41 +65,41 @@ public: void importSheet( SequenceInputStream& rStrm ); /** Inserts a new empty sheet into the document. Looks for an unused name. @return Index of the new sheet in the Calc document. */ - sal_Int16 insertEmptySheet( const ::rtl::OUString& rPreferredName, bool bVisible ); + sal_Int16 insertEmptySheet( const OUString& rPreferredName, bool bVisible ); /** Returns the number of original sheets contained in the workbook. */ sal_Int32 getWorksheetCount() const; /** Returns the OOXML relation identifier of the specified worksheet. */ - ::rtl::OUString getWorksheetRelId( sal_Int32 nWorksheet ) const; + OUString getWorksheetRelId( sal_Int32 nWorksheet ) const; /** Returns the Calc index of the specified worksheet. */ sal_Int16 getCalcSheetIndex( sal_Int32 nWorksheet ) const; /** Returns the finalized name of the specified worksheet. */ - ::rtl::OUString getCalcSheetName( sal_Int32 nWorksheet ) const; + OUString getCalcSheetName( sal_Int32 nWorksheet ) const; /** Returns the Calc index of the sheet with the passed original worksheet name. */ - sal_Int16 getCalcSheetIndex( const ::rtl::OUString& rWorksheetName ) const; + sal_Int16 getCalcSheetIndex( const OUString& rWorksheetName ) const; /** Returns the finalized name of the sheet with the passed worksheet name. */ - ::rtl::OUString getCalcSheetName( const ::rtl::OUString& rWorksheetName ) const; + OUString getCalcSheetName( const OUString& rWorksheetName ) const; /** Converts sSheetNameRef (e.g. '#SheetName!A1' to '#SheetName.A1' ) if sSheetNameRef doesn't start with '#' it is ignored and not modified */ - void convertSheetNameRef( ::rtl::OUString& sSheetNameRef ) const; + void convertSheetNameRef( OUString& sSheetNameRef ) const; private: struct SheetInfo : public SheetInfoModel { - ::rtl::OUString maCalcName; - ::rtl::OUString maCalcQuotedName; + OUString maCalcName; + OUString maCalcQuotedName; sal_Int16 mnCalcSheet; - explicit SheetInfo( const SheetInfoModel& rModel, sal_Int16 nCalcSheet, const ::rtl::OUString& rCalcName ); + explicit SheetInfo( const SheetInfoModel& rModel, sal_Int16 nCalcSheet, const OUString& rCalcName ); }; - typedef ::std::pair< sal_Int16, ::rtl::OUString > IndexNamePair; + typedef ::std::pair< sal_Int16, OUString > IndexNamePair; /** Creates a new sheet in the Calc document. Does not insert anything in the own lists. */ - IndexNamePair createSheet( const ::rtl::OUString& rPreferredName, sal_Int32 nSheetPos, bool bVisible ); + IndexNamePair createSheet( const OUString& rPreferredName, sal_Int32 nSheetPos, bool bVisible ); /** Creates a new sheet in the Calc document and inserts the related SheetInfo. */ void insertSheet( const SheetInfoModel& rModel ); @@ -107,7 +107,7 @@ private: typedef RefVector< SheetInfo > SheetInfoVector; SheetInfoVector maSheetInfos; - typedef RefMap< ::rtl::OUString, SheetInfo, IgnoreCaseCompare > SheetInfoMap; + typedef RefMap< OUString, SheetInfo, IgnoreCaseCompare > SheetInfoMap; SheetInfoMap maSheetInfosByName; }; diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index 25dbdf7cf9ca..49f23c7b1bfe 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -34,7 +34,7 @@ public: protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -56,11 +56,11 @@ class WorksheetFragment : public WorksheetFragmentBase public: explicit WorksheetFragment( const WorksheetHelper& rHelper, - const ::rtl::OUString& rFragmentPath ); + const OUString& rFragmentPath ); protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); @@ -114,7 +114,7 @@ private: void importControl( SequenceInputStream& rStrm ); /** Imports the binary data of an embedded OLE object from the fragment with the passed ID. */ - void importEmbeddedOleData( StreamDataSequence& orEmbeddedData, const ::rtl::OUString& rRelId ); + void importEmbeddedOleData( StreamDataSequence& orEmbeddedData, const OUString& rRelId ); }; } // namespace xls diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 2efa6e4a19cd..53b7ed1084c1 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -57,7 +57,7 @@ class SheetViewSettings; class VmlDrawing; class WorksheetSettings; -typedef ::std::map< rtl::OUString, void* > ExtLst; +typedef ::std::map< OUString, void* > ExtLst; // ============================================================================ // ============================================================================ @@ -139,7 +139,7 @@ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo { ::com::sun::star::table::CellRangeAddress maRange; /// The cell area containing the hyperlink. - ::rtl::OUString maTooltip; /// Additional tooltip text. + OUString maTooltip; /// Additional tooltip text. explicit HyperlinkModel(); }; @@ -152,10 +152,10 @@ struct ValidationModel ApiCellRangeList maRanges; ApiTokenSequence maTokens1; ApiTokenSequence maTokens2; - ::rtl::OUString maInputTitle; - ::rtl::OUString maInputMessage; - ::rtl::OUString maErrorTitle; - ::rtl::OUString maErrorMessage; + OUString maInputTitle; + OUString maInputMessage; + OUString maErrorTitle; + OUString maErrorMessage; sal_Int32 mnType; sal_Int32 mnOperator; sal_Int32 mnErrorStyle; @@ -247,9 +247,9 @@ public: /** Inserts the data validation settings into the spreadsheet. */ void setValidation( const ValidationModel& rModel ); /** Sets the path to the DrawingML fragment of this sheet. */ - void setDrawingPath( const ::rtl::OUString& rDrawingPath ); + void setDrawingPath( const OUString& rDrawingPath ); /** Sets the path to the legacy VML drawing fragment of this sheet. */ - void setVmlDrawingPath( const ::rtl::OUString& rVmlDrawingPath ); + void setVmlDrawingPath( const OUString& rVmlDrawingPath ); /** Extends the used area of this sheet by the passed cell position. */ void extendUsedArea( const ::com::sun::star::table::CellAddress& rAddress ); @@ -288,7 +288,7 @@ public: /** Inserts a string cell directly into the Calc sheet. */ void putString( const ::com::sun::star::table::CellAddress& rAddress, - const ::rtl::OUString& rText ) const; + const OUString& rText ) const; /** Inserts a rich-string cell directly into the Calc sheet. */ void putRichString( const ::com::sun::star::table::CellAddress& rAddress, @@ -306,10 +306,10 @@ public: /** Final import of drawing objects. Has to be called after all content has been imported */ void finalizeDrawingImport(); - void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& ); + void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); void setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, sal_Int32 ); - void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& ); - void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ); + void setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& ); + void createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); void setCellFormulaValue( const ::com::sun::star::table::CellAddress& rAddress, double fValue ); private: diff --git a/sc/source/filter/inc/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx index a6209aa27cbe..9fc17a3bf253 100644 --- a/sc/source/filter/inc/worksheetsettings.hxx +++ b/sc/source/filter/inc/worksheetsettings.hxx @@ -31,7 +31,7 @@ namespace xls { /** Sheet and outline settings. */ struct SheetSettingsModel { - ::rtl::OUString maCodeName; /// VBA module codename. + OUString maCodeName; /// VBA module codename. Color maTabColor; /// Sheet tab color. bool mbFilterMode; /// True = sheet contains active filter. bool mbApplyStyles; /// True = automatic styles when creating outlines. diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 10f27f4f1402..3ccdf7306b55 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -94,7 +94,7 @@ public: /** Returns chart type info for a unique chart type identifier. */ const XclChTypeInfo& GetChartTypeInfo( XclChTypeId eType ) const; /** Returns the first fitting chart type info for the passed service name. */ - const XclChTypeInfo& GetChartTypeInfo( const ::rtl::OUString& rServiceName ) const; + const XclChTypeInfo& GetChartTypeInfo( const OUString& rServiceName ) const; /** Returns an info struct about auto formatting for the passed object type. */ const XclChFormatInfo& GetFormatInfo( XclChObjectType eObjType ) const; @@ -758,7 +758,7 @@ public: /** Converts the passed data series for stock charts. */ bool ConvertStockSeries( XDataSeriesRef xDataSeries, - const ::rtl::OUString& rValueRole, + const OUString& rValueRole, sal_uInt16 nGroupIdx, sal_uInt16 nFormatIdx, bool bCloseSymbol ); /** Converts the passed error bar settings (called at trend line child series). */ bool ConvertTrendLine( const XclExpChSeries& rParent, XRegressionCurveRef xRegCurve ); @@ -777,11 +777,11 @@ private: void CreateTrendLines( XDataSeriesRef xDataSeries ); /** Tries to create positive and negative error bar series objects (called at parent series). */ void CreateErrorBars( const ScfPropertySet& rPropSet, - const ::rtl::OUString& rBarPropName, + const OUString& rBarPropName, sal_uInt8 nPosBarId, sal_uInt8 nNegBarId ); /** Tries to create an error bar series object (called at parent series). */ void CreateErrorBar( const ScfPropertySet& rPropSet, - const ::rtl::OUString& rShowPropName, sal_uInt8 nBarId ); + const OUString& rShowPropName, sal_uInt8 nBarId ); virtual void WriteBody( XclExpStream& rStrm ); @@ -979,7 +979,7 @@ private: XDataSeriesRef xDataSeries ); /** Creates a single data series of a stock chart. */ bool CreateStockSeries( XDataSeriesRef xDataSeries, - const ::rtl::OUString& rValueRole, bool bCloseSymbol ); + const OUString& rValueRole, bool bCloseSymbol ); virtual void WriteBody( XclExpStream& rStrm ); diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 1328a403de61..b972da45773c 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -129,7 +129,7 @@ private: SvStreamPtr mxVarData; /// Buffer stream with variable data. sal_uInt32 mnFlags; /// Option flags. XclExpStringRef mxTextMark; /// Location within mxRepr - ::rtl::OUString msTarget; /// Target URL + OUString msTarget; /// Target URL }; typedef XclExpRecordList< XclExpHyperlink > XclExpHyperlinkList; @@ -278,7 +278,7 @@ private: const ScDataBarFormat& mrFormat; sal_Int32 mnPriority; - rtl::OString maGuid; + OString maGuid; }; class XclExpIconSet : public XclExpRecord, protected XclExpRoot @@ -349,9 +349,9 @@ private: XclExpString maErrorText; /// The error text. XclExpStringRef mxString1; /// String for first condition formula. XclTokenArrayRef mxTokArr1; /// Formula for first condition. - ::rtl::OUString msFormula1; /// OOXML Formula for first condition. + OUString msFormula1; /// OOXML Formula for first condition. XclTokenArrayRef mxTokArr2; /// Formula for second condition. - ::rtl::OUString msFormula2; /// OOXML Formula for second condition. + OUString msFormula2; /// OOXML Formula for second condition. sal_uInt32 mnFlags; /// Miscellaneous flags. sal_uLong mnScHandle; /// The core handle for quick list search. }; diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 6eb9e7636470..205b4cbf04ab 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -368,7 +368,7 @@ private: private: XclExpString maAuthor; /// Name of the author. String maOrigNoteText; /// Original main text of the note. - rtl::OString maNoteText; /// Main text of the note (<=BIFF7). + OString maNoteText; /// Main text of the note (<=BIFF7). XclExpStringRef mpNoteContents; /// Text and formatting data (OOXML) ScAddress maScPos; /// Calc cell address of the note. sal_uInt16 mnObjId; /// Escher object ID (BIFF8). diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx index fe0ccdef75cd..c32e23e6f978 100644 --- a/sc/source/filter/inc/xeextlst.hxx +++ b/sc/source/filter/inc/xeextlst.hxx @@ -34,7 +34,7 @@ public: virtual XclExpExtType GetType() = 0; protected: - rtl::OString maURI; + OString maURI; }; class XclExpExtCfvo : public XclExpRecordBase, protected XclExpRoot @@ -45,7 +45,7 @@ public: private: ScColorScaleEntryType meType; - rtl::OString maValue; + OString maValue; bool mbFirst; }; @@ -90,12 +90,12 @@ typedef boost::shared_ptr XclExpExtDataBarRef; class XclExpExtCfRule : public XclExpRecordBase, protected XclExpRoot { public: - XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ); + XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ); virtual void SaveXml( XclExpXmlStream& rStrm ); private: XclExpExtDataBarRef maDataBar; - rtl::OString maId; + OString maId; }; typedef boost::shared_ptr XclExpExtRef; @@ -104,7 +104,7 @@ typedef boost::shared_ptr XclExpExtCfRuleRef; class XclExpExtConditionalFormatting : public XclExpRecordBase, protected XclExpRoot { public: - explicit XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const rtl::OString& rId ); + explicit XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ); virtual void SaveXml( XclExpXmlStream& rStrm ); private: diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index b5e5a89eb854..04ecc2b0e001 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -184,7 +184,7 @@ public: /** Processes the passed URL field (tries to create a HLINK record). @return The representation string of the URL field. */ - rtl::OUString ProcessUrlField( const SvxURLField& rUrlField ); + OUString ProcessUrlField( const SvxURLField& rUrlField ); /** Returns true, if a single HLINK record has been created. */ bool HasLinkRecord() const; @@ -402,9 +402,9 @@ class XclExpUrlHelper : boost::noncopyable public: /** Encodes and returns the URL passed in rAbsUrl to an Excel like URL. @param pTableName Optional pointer to a table name to be encoded in this URL. */ - static rtl::OUString EncodeUrl( const XclExpRoot& rRoot, const rtl::OUString& rAbsUrl, const rtl::OUString* pTableName = 0 ); + static OUString EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName = 0 ); /** Encodes and returns the passed DDE link to an Excel like DDE link. */ - static rtl::OUString EncodeDde( const rtl::OUString& rApplic, const rtl::OUString& rTopic ); + static OUString EncodeDde( const OUString& rApplic, const OUString& rTopic ); private: /** We don't want anybody to instantiate this class, since it is just a diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index f19a8e840440..56cb6f6e358f 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -66,7 +66,7 @@ public: /** Returns true, if the specified Calc sheet is displayed in right-to-left mode. */ bool IsMirroredTab( SCTAB nScTab ) const; /** Returns the Calc name of the specified sheet. */ - rtl::OUString GetScTabName( SCTAB nScTab ) const; + OUString GetScTabName( SCTAB nScTab ) const; /** Returns the Excel sheet index for a given Calc sheet. */ sal_uInt16 GetXclTab( SCTAB nScTab ) const; @@ -104,7 +104,7 @@ private: /** Data structure with infoemation about one Calc sheet. */ struct XclExpTabInfoEntry { - rtl::OUString maScName; + OUString maScName; sal_uInt16 mnXclTab; sal_uInt8 mnFlags; inline explicit XclExpTabInfoEntry() : mnXclTab( 0 ), mnFlags( 0 ) {} diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 080eab7aef29..4a7a53fc8ac5 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -49,7 +49,7 @@ public: inline sal_uInt16 GetTypeFlag() const { return mnTypeFlag; } - bool EqualsText( const rtl::OUString& rText ) const; + bool EqualsText( const OUString& rText ) const; bool EqualsDouble( double fValue ) const; bool EqualsDateTime( const DateTime& rDateTime ) const; bool EqualsBool( bool bValue ) const; @@ -85,14 +85,14 @@ public: void ConvertToNumGroup( const ScDPObject& rDPObj, const ScDPSaveNumGroupDimension& rNumGroupDim ); /** Returns the name of this cache field. */ - inline const rtl::OUString& GetFieldName() const { return maFieldInfo.maName; } + inline const OUString& GetFieldName() const { return maFieldInfo.maName; } /** Returns the number of visible items of this field. */ sal_uInt16 GetItemCount() const; /** Returns the specified pivot cache item (returns visible items in groupings). */ const XclExpPCItem* GetItem( sal_uInt16 nItemIdx ) const; /** Returns the index of a pivot cache item, or EXC_PC_NOITEM on error. */ - sal_uInt16 GetItemIndex( const rtl::OUString& rItemName ) const; + sal_uInt16 GetItemIndex( const OUString& rItemName ) const; /** Returns the size an item index needs to write out. */ sal_Size GetIndexSize() const; @@ -230,8 +230,8 @@ private: XclPCInfo maPCInfo; /// Pivot cache settings (SXDB record). XclExpPCFieldList maFieldList; /// List of all pivot cache fields. - rtl::OUString maTabName; /// Name of source data sheet. - rtl::OUString maSrcRangeName; /// Range name for source data. + OUString maTabName; /// Name of source data sheet. + OUString maSrcRangeName; /// Range name for source data. ScRange maOrigSrcRange; /// The original sheet source range. ScRange maExpSrcRange; /// The exported sheet source range. ScRange maDocSrcRange; /// The range used to build the cache fields and items. @@ -257,7 +257,7 @@ public: explicit XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUseCache ); /** Returns the internal name of this item. */ - rtl::OUString GetItemName() const; + OUString GetItemName() const; /** Fills this item with properties from the passed save member. */ void SetPropertiesFromMember( const ScDPSaveMember& rSaveMem ); @@ -281,7 +281,7 @@ public: // data access ------------------------------------------------------------ /** Returns the name of this field. */ - rtl::OUString GetFieldName() const; + OUString GetFieldName() const; /** Returns the pivot table field list index of this field. */ sal_uInt16 GetFieldIndex() const; @@ -290,7 +290,7 @@ public: /** Returns the list index of an item by its name. @param nDefaultIdx This value will be returned, if the item could not be found. */ - sal_uInt16 GetItemIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const; + sal_uInt16 GetItemIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; // fill data -------------------------------------------------------------- @@ -315,7 +315,7 @@ public: // ------------------------------------------------------------------------ private: /** Returns an item by its name. */ - XclExpPTItem* GetItemAcc( const rtl::OUString& rName ); + XclExpPTItem* GetItemAcc( const OUString& rName ); /** Appends a special item describing a field subtotal entry. */ void AppendSubtotalItem( sal_uInt16 nItemType ); @@ -355,11 +355,11 @@ public: /** Returns a pivot table field by its name. */ const XclExpPTField* GetField( sal_uInt16 nFieldIdx ) const; /** Returns a pivot table field by its name. */ - const XclExpPTField* GetField( const rtl::OUString& rName ) const; + const XclExpPTField* GetField( const OUString& rName ) const; /** Returns the data-field-only index of the first data field with the passed name. @param nDefaultIdx This value will be returned, if the field could not be found. */ - sal_uInt16 GetDataFieldIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const; + sal_uInt16 GetDataFieldIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; /** Writes the entire pivot table. */ virtual void Save( XclExpStream& rStrm ); @@ -368,7 +368,7 @@ public: // ------------------------------------------------------------------------ private: /** Returns a pivot table field by its name. */ - XclExpPTField* GetFieldAcc( const rtl::OUString& rName ); + XclExpPTField* GetFieldAcc( const OUString& rName ); /** Returns a pivot table field corresponding to the passed save dimension. */ XclExpPTField* GetFieldAcc( const ScDPSaveDimension& rSaveDim ); diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index ddaad2054465..27f272e478d6 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -222,7 +222,7 @@ void XclExpValueRecord< Type >::SaveXml( XclExpXmlStream& rStrm ) if( mnAttribute == -1 ) return; rStrm.WriteAttributes( - mnAttribute, rtl::OString::valueOf( (sal_Int32) maValue ).getStr(), + mnAttribute, OString::valueOf( (sal_Int32) maValue ).getStr(), FSEND ); } diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 5eb6e5371eb3..a0978a72b4da 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -162,7 +162,7 @@ public: bool IsDocumentEncrypted() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const ::rtl::OUString& aPass ) const; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ) const; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData() const; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateDefaultEncryptionData() const; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 2fb371249ab8..0ac31d4617f1 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -134,9 +134,9 @@ public: // *** write 8-bit-strings *** // (slice length setting has no effect here -> disabled automatically) - /** Writes string length field and rtl::OString buffer. */ + /** Writes string length field and OString buffer. */ void WriteByteString( - const rtl::OString& rString, + const OString& rString, sal_uInt16 nMaxLen = 0x00FF, bool b16BitCount = false ); @@ -269,27 +269,27 @@ class XclXmlUtils XclXmlUtils(const XclXmlUtils&); XclXmlUtils& operator=(const XclXmlUtils&); public: - static void GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& sType, ::rtl::OUString& rValue); - static ::rtl::OUString GetStreamName( const char* sStreamDir, const char* sStream, sal_Int32 nId ); + static void GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& sType, OUString& rValue); + static OUString GetStreamName( const char* sStreamDir, const char* sStream, sal_Int32 nId ); - static ::rtl::OString ToOString( const Color& rColor ); - static ::rtl::OString ToOString( const ::rtl::OUString& s ); - static ::rtl::OString ToOString( const ScfUInt16Vec& rBuffer ); - static ::rtl::OString ToOString( const String& s ); - static ::rtl::OString ToOString( const ScAddress& rRange ); - static ::rtl::OString ToOString( const ScRange& rRange ); - static ::rtl::OString ToOString( const ScRangeList& rRangeList ); - static ::rtl::OString ToOString( const XclAddress& rAddress ); - static ::rtl::OString ToOString( const XclExpString& s ); - static ::rtl::OString ToOString( const XclRange& rRange ); - static ::rtl::OString ToOString( const XclRangeList& rRangeList ); + static OString ToOString( const Color& rColor ); + static OString ToOString( const OUString& s ); + static OString ToOString( const ScfUInt16Vec& rBuffer ); + static OString ToOString( const String& s ); + static OString ToOString( const ScAddress& rRange ); + static OString ToOString( const ScRange& rRange ); + static OString ToOString( const ScRangeList& rRangeList ); + static OString ToOString( const XclAddress& rAddress ); + static OString ToOString( const XclExpString& s ); + static OString ToOString( const XclRange& rRange ); + static OString ToOString( const XclRangeList& rRangeList ); - static ::rtl::OUString ToOUString( const char* s ); - static ::rtl::OUString ToOUString( const ScfUInt16Vec& rBuffer, sal_Int32 nStart = 0, sal_Int32 nLength = -1 ); - static ::rtl::OUString ToOUString( const String& s ); - static ::rtl::OUString ToOUString( ScDocument& rDocument, const ScAddress& rAddress, + static OUString ToOUString( const char* s ); + static OUString ToOUString( const ScfUInt16Vec& rBuffer, sal_Int32 nStart = 0, sal_Int32 nLength = -1 ); + static OUString ToOUString( const String& s ); + static OUString ToOUString( ScDocument& rDocument, const ScAddress& rAddress, ScTokenArray* pTokenArray, const ScCompiler::OpCodeMapPtr & xOpCodeMap ); - static ::rtl::OUString ToOUString( const XclExpString& s ); + static OUString ToOUString( const XclExpString& s ); static const char* ToPsz( bool b ); static sax_fastparser::FSHelperPtr WriteElement( sax_fastparser::FSHelperPtr pStream, sal_Int32 nElement, sal_Int32 nValue ); @@ -311,7 +311,7 @@ public: void PushStream( sax_fastparser::FSHelperPtr aStream ); void PopStream(); - sax_fastparser::FSHelperPtr GetStreamForPath( const ::rtl::OUString& rPath ); + sax_fastparser::FSHelperPtr GetStreamForPath( const OUString& rPath ); sax_fastparser::FSHelperPtr& WriteAttributes( sal_Int32 nAttribute, const char* value, FSEND_t ) { return WriteAttributesInternal( nAttribute, value, FSEND_internal ); } @@ -319,12 +319,12 @@ public: { return WriteAttributesInternal( nAttribute, value.getStr(), FSEND_internal ); } sax_fastparser::FSHelperPtr CreateOutputStream ( - const ::rtl::OUString& sFullStream, - const ::rtl::OUString& sRelativeStream, + const OUString& sFullStream, + const OUString& sRelativeStream, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xParentRelation, const char* sContentType, const char* sRelationshipType, - ::rtl::OUString* pRelationshipId = NULL ); + OUString* pRelationshipId = NULL ); // ignore virtual bool exportDocument() throw(); @@ -368,12 +368,12 @@ public: private: virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; ScDocShell *getDocShell(); sax_fastparser::FSHelperPtr& WriteAttributesInternal( sal_Int32 nAttribute, ... ); - typedef std::map< ::rtl::OUString, - std::pair< ::rtl::OUString, + typedef std::map< OUString, + std::pair< OUString, sax_fastparser::FSHelperPtr > > XclExpXmlPathToStateMap; const XclExpRoot* mpRoot; diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 2731e324f7b9..de23884c7c85 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -65,7 +65,7 @@ public: @param nFlags Modifiers for string export. @param nMaxLen The maximum number of characters to store in this string. */ explicit XclExpString( - const ::rtl::OUString& rString, + const OUString& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); @@ -83,7 +83,7 @@ public: @param nFlags Modifiers for string export. @param nMaxLen The maximum number of characters to store in this string. */ void Assign( - const ::rtl::OUString& rString, + const OUString& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index aa1f6f59d4ff..a0903bcc49b4 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -268,9 +268,9 @@ struct XclExpNumFmt { sal_uLong mnScNumFmt; /// Core index of the number format. sal_uInt16 mnXclNumFmt; /// Resulting Excel format index. - rtl::OUString maNumFmtString; /// format string + OUString maNumFmtString; /// format string - inline explicit XclExpNumFmt( sal_uLong nScNumFmt, sal_uInt16 nXclNumFmt, const rtl::OUString& rFrmt ) : + inline explicit XclExpNumFmt( sal_uLong nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) : mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt ), maNumFmtString( rFrmt ) {} void SaveXml( XclExpXmlStream& rStrm ); @@ -753,12 +753,12 @@ public: XclExpDxfs( const XclExpRoot& rRoot ); virtual ~XclExpDxfs() {} - sal_Int32 GetDxfId(const rtl::OUString& rName); + sal_Int32 GetDxfId(const OUString& rName); virtual void SaveXml( XclExpXmlStream& rStrm); private: typedef boost::ptr_vector DxfContainer; - std::map maStyleNameToDxfId; + std::map maStyleNameToDxfId; DxfContainer maDxf; SvNumberFormatterPtr mxFormatter; /// Special number formatter for conversion. boost::scoped_ptr mpKeywordTable; /// Replacement table. diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 7c444126822b..c1a2cbcc57fe 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -422,7 +422,7 @@ public: void ConvertNumFmt( ScfPropertySet& rPropSet, bool bPercent ) const; /** Creates a data sequence containing the link into the Calc document. */ - XDataSequenceRef CreateDataSequence( const ::rtl::OUString& rRole ) const; + XDataSequenceRef CreateDataSequence( const OUString& rRole ) const; /** Creates a sequence of formatted string objects. */ XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot, sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const; @@ -834,9 +834,9 @@ public: inline bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); } /** Creates a labeled data sequence object from value data link. */ - XLabeledDataSeqRef CreateValueSequence( const ::rtl::OUString& rValueRole ) const; + XLabeledDataSeqRef CreateValueSequence( const OUString& rValueRole ) const; /** Creates a labeled data sequence object from category data link. */ - XLabeledDataSeqRef CreateCategSequence( const ::rtl::OUString& rCategRole ) const; + XLabeledDataSeqRef CreateCategSequence( const OUString& rCategRole ) const; /** Creates a data series object with initialized source links. */ XDataSeriesRef CreateDataSeries() const; @@ -1390,7 +1390,7 @@ public: const ::com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument>& xChartDoc, XclImpDffConverter& rDffConv, - const ::rtl::OUString& rObjName, + const OUString& rObjName, const Rectangle& rChartRect ) const; private: @@ -1488,7 +1488,7 @@ public: /** Creates the chart object in the passed component. */ void Convert( XModelRef xModel, XclImpDffConverter& rDffConv, - const ::rtl::OUString& rObjName, + const OUString& rObjName, const Rectangle& rChartRect ) const; private: diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 07655516b419..088c6d500e34 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -72,7 +72,7 @@ public: void SetAnchor( const XclObjAnchor& rAnchor ); /** Sets shape data from DFF stream. */ void SetDffData( - const DffObjData& rDffObjData, const rtl::OUString& rObjName, const rtl::OUString& rHyperlink, + const DffObjData& rDffObjData, const OUString& rObjName, const OUString& rHyperlink, bool bVisible, bool bAutoMargin ); /** If set to false, the SdrObject will not be created, processed, or inserted into the draw page. */ @@ -87,9 +87,9 @@ public: /** Returns the Excel object type from OBJ record. */ inline sal_uInt16 GetObjType() const { return mnObjType; } /** Returns the name of this object, may generate a default name. */ - virtual rtl::OUString GetObjName() const; + virtual OUString GetObjName() const; /** Returns associated macro name, if set, otherwise zero length string. */ - inline const rtl::OUString& GetMacroName() const { return maMacroName; } + inline const OUString& GetMacroName() const { return maMacroName; } /** Returns the shape identifier used in the DFF stream. */ inline sal_uInt32 GetDffShapeId() const { return mnDffShapeId; } @@ -185,9 +185,9 @@ private: sal_uInt16 mnObjType; /// The Excel object type from OBJ record. sal_uInt32 mnDffShapeId; /// Shape ID from DFF stream. sal_uInt32 mnDffFlags; /// Shape flags from DFF stream. - rtl::OUString maObjName; /// Name of the object. - rtl::OUString maMacroName; /// Name of an attached macro. - rtl::OUString maHyperlink; /// On-click hyperlink URL. + OUString maObjName; /// Name of the object. + OUString maMacroName; /// Name of an attached macro. + OUString maHyperlink; /// On-click hyperlink URL. bool mbHasAnchor; /// true = maAnchor is initialized. bool mbHidden; /// true = Object is hidden. bool mbVisible; /// true = Object is visible. @@ -526,7 +526,7 @@ public: void SetDffProperties( const DffPropSet& rDffPropSet ); /** Returns the service name of the control component to be created. */ - inline ::rtl::OUString GetServiceName() const { return DoGetServiceName(); } + inline OUString GetServiceName() const { return DoGetServiceName(); } /** Fills the passed macro event descriptor. */ bool FillMacroDescriptor( ::com::sun::star::script::ScriptEventDescriptor& rDescriptor ) const; @@ -543,7 +543,7 @@ protected: virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; /** Derived classes return the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const = 0; + virtual OUString DoGetServiceName() const = 0; /** Derived classes return the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const = 0; }; @@ -560,7 +560,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -581,7 +581,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -606,7 +606,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -628,7 +628,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -649,7 +649,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -669,7 +669,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -693,7 +693,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -744,7 +744,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -763,7 +763,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; }; @@ -809,7 +809,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -839,7 +839,7 @@ protected: /** Sets additional properties for the current form control. */ virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; /** Returns the service name of the control component to be created. */ - virtual ::rtl::OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const; /** Returns the type of the macro event to be created. */ virtual XclTbxEventType DoGetEventType() const; @@ -861,7 +861,7 @@ class XclImpPictureObj : public XclImpRectObj, public XclImpControlHelper public: explicit XclImpPictureObj( const XclImpRoot& rRoot ); /** Returns the ObjectName - can use non-obvious lookup for override in the associated vba document module stream**/ - virtual rtl::OUString GetObjName() const; + virtual OUString GetObjName() const; /** Returns the graphic imported from the IMGDATA record. */ inline const Graphic& GetGraphic() const { return maGraphic; } @@ -1085,7 +1085,7 @@ private: typedef boost::shared_ptr< XclImpDffConvData > XclImpDffConvDataRef; typedef ::std::vector< XclImpDffConvDataRef > XclImpDffConvDataStack; - const ::rtl::OUString maStdFormName; /// Standard name of control forms. + const OUString maStdFormName; /// Standard name of control forms. SotStorageStreamRef mxCtlsStrm; /// The 'Ctls' stream for OCX form controls. ScfProgressBarRef mxProgress; /// The progress bar used in ProcessObj(). XclImpDffConvDataStack maDataStack; /// Stack for registered drawing managers. @@ -1216,7 +1216,7 @@ public: void ConvertObjects(); /** Returns the default name for the passed object. */ - rtl::OUString GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const; + OUString GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const; /** Returns the used area in the sheet with the passed index. */ ScRange GetUsedArea( SCTAB nScTab ) const; /** Sets the container to receive overridden shape/ctrl names from diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 8057fff9925f..52f7d255a26e 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -267,10 +267,10 @@ public: const String& rEncodedUrl ); static void DecodeUrl( - ::rtl::OUString& rUrl, + OUString& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, - const ::rtl::OUString& rEncodedUrl ); + const OUString& rEncodedUrl ); /** Decodes the passed URL to OLE or DDE link components. @descr For DDE links: Decodes to application name and topic. diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index 013cd3a31fb9..09b009869600 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -135,8 +135,8 @@ public: * reference, since OLE link doesn't work cross-platform, and is not very * reliable even on Windows. */ - bool CreateOleData(ScDocument& rDoc, const ::rtl::OUString& rUrl, - sal_uInt16& rFileId, ::rtl::OUString& rTabName, ScRange& rRange) const; + bool CreateOleData(ScDocument& rDoc, const OUString& rUrl, + sal_uInt16& rFileId, OUString& rTabName, ScRange& rRange) const; bool HasFormulaTokens() const; diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 504d6485193f..b670e38b82ea 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -77,7 +77,7 @@ public: // general field/item access ---------------------------------------------- /** Returns the name of the field, uses the passed visible name if supported. */ - const rtl::OUString& GetFieldName( const ScfStringVec& rVisNames ) const; + const OUString& GetFieldName( const ScfStringVec& rVisNames ) const; /** Returns the base field if this is a grouping field. */ const XclImpPCField* GetGroupBaseField() const; @@ -158,7 +158,7 @@ public: /** Returns the data source range read from the DCONREF record. */ inline const ScRange& GetSourceRange() const { return maSrcRange; } - const ::rtl::OUString& GetSourceRangeName() const { return maSrcRangeName; } + const OUString& GetSourceRangeName() const { return maSrcRangeName; } /** Returns the number of pivot cache fields. */ sal_uInt16 GetFieldCount() const; @@ -193,7 +193,7 @@ private: ScRange maSrcRange; /// Source range in the spreadsheet. String maUrl; /// URL of the source data. String maTabName; /// Sheet name of the source data. - ::rtl::OUString maSrcRangeName; /// Name of the source data range. + OUString maSrcRangeName; /// Name of the source data range. sal_uInt16 mnStrmId; /// Pivot cache stream identifier. sal_uInt16 mnSrcType; /// Source data type. bool mbSelfRef; /// true = Source data from own document. @@ -215,7 +215,7 @@ public: explicit XclImpPTItem( const XclImpPCField* pCacheField ); /** Returns the internal name of the item or 0, if no name could be found. */ - const rtl::OUString* GetItemName() const; + const OUString* GetItemName() const; /** Reads an SXVI record containing data of this item. */ void ReadSxvi( XclImpStream& rStrm ); @@ -242,14 +242,14 @@ public: /** Returns the corresponding pivot cache field of this field. */ const XclImpPCField* GetCacheField() const; /** Returns the name of this field that is used to create the Calc dimensions. */ - rtl::OUString GetFieldName() const; + OUString GetFieldName() const; /** Returns the internally set visible name of this field. */ - rtl::OUString GetVisFieldName() const; + OUString GetVisFieldName() const; /** Returns the specified item. */ const XclImpPTItem* GetItem( sal_uInt16 nItemIdx ) const; /** Returns the internal name of the specified item. */ - const rtl::OUString* GetItemName( sal_uInt16 nItemIdx ) const; + const OUString* GetItemName( sal_uInt16 nItemIdx ) const; /** Returns the flags of the axes this field is part of. */ inline sal_uInt16 GetAxes() const { return maFieldInfo.mnAxes; } @@ -326,7 +326,7 @@ public: const String& GetFieldName( sal_uInt16 nFieldIdx ) const; const XclImpPTField* GetDataField( sal_uInt16 nDataFieldIdx ) const; - rtl::OUString GetDataFieldName( sal_uInt16 nDataFieldIdx ) const; + OUString GetDataFieldName( sal_uInt16 nDataFieldIdx ) const; // records ---------------------------------------------------------------- diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 0a0585bf7eed..0a2199bd06fa 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -57,7 +57,7 @@ public: XclImpDecrypterRef Clone() const; /** Implementation of the ::comphelper::IDocPasswordVerifier interface */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Updates the decrypter on start of a new record or after seeking stream. */ @@ -76,7 +76,7 @@ private: /** Derived classes implement password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const ::rtl::OUString& rPassword ) = 0; + OnVerifyPassword( const OUString& rPassword ) = 0; virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of updating the decrypter. */ @@ -106,7 +106,7 @@ private: virtual XclImpBiff5Decrypter* OnClone() const; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const ::rtl::OUString& rPassword ); + OnVerifyPassword( const OUString& rPassword ); virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); @@ -137,7 +137,7 @@ private: virtual XclImpBiff8Decrypter* OnClone() const; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const ::rtl::OUString& rPassword ); + OnVerifyPassword( const OUString& rPassword ); virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); /** Implementation of updating the decrypter. */ virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 6afb2ed8df45..0df3408de43f 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -885,7 +885,7 @@ struct XclChObjectLink struct XclChFrLabelProps { - rtl::OUString maSeparator; /// Separator between label values. + OUString maSeparator; /// Separator between label values. sal_uInt16 mnFlags; /// Flags indicating which values to be displayed. explicit XclChFrLabelProps(); @@ -1155,7 +1155,7 @@ public: /** Returns true, if the passed marker type is filled. */ static bool HasMarkerFillColor( sal_uInt16 nMarkerType ); /** Returns the role name for a manual data source for error bars. */ - static ::rtl::OUString GetErrorBarValuesRole( sal_uInt8 nBarType ); + static OUString GetErrorBarValuesRole( sal_uInt8 nBarType ); }; // Chart formatting info provider ============================================= @@ -1311,7 +1311,7 @@ public: /** Returns the first fitting chart type info for an Excel chart type record identifier. */ const XclChTypeInfo& GetTypeInfoFromRecId( sal_uInt16 nRecId ) const; /** Returns the first fitting chart type info for the passed service name. */ - const XclChTypeInfo& GetTypeInfoFromService( const ::rtl::OUString& rServiceName ) const; + const XclChTypeInfo& GetTypeInfoFromService( const OUString& rServiceName ) const; private: typedef ::std::map< XclChTypeId, const XclChTypeInfo* > XclChTypeInfoMap; @@ -1352,18 +1352,18 @@ public: public: explicit XclChObjectTable( XServiceFactoryRef xFactory, - const ::rtl::OUString& rServiceName, const ::rtl::OUString& rObjNameBase ); + const OUString& rServiceName, const OUString& rObjNameBase ); /** Returns a named formatting object from the chart document. */ - ::com::sun::star::uno::Any GetObject( const ::rtl::OUString& rObjName ); + ::com::sun::star::uno::Any GetObject( const OUString& rObjName ); /** Insertes a named formatting object into the chart document. */ - ::rtl::OUString InsertObject( const ::com::sun::star::uno::Any& rObj ); + OUString InsertObject( const ::com::sun::star::uno::Any& rObj ); private: XServiceFactoryRef mxFactory; /// Factory to create the container. XNameContainerRef mxContainer; /// Container for the objects. - ::rtl::OUString maServiceName; /// Service name to create the container. - ::rtl::OUString maObjNameBase; /// Base of names for inserted objects. + OUString maServiceName; /// Service name to create the container. + OUString maObjNameBase; /// Base of names for inserted objects. sal_Int32 mnIndex; /// Index to create unique identifiers. }; diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 1e993942071d..364fed962601 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -377,7 +377,7 @@ public: /** Sets the item to 'empty' type. */ void SetEmpty(); /** Sets the item to 'text' type and adds the passed text. */ - void SetText( const rtl::OUString& rText ); + void SetText( const OUString& rText ); /** Sets the item to 'double' type and adds the passed value. */ void SetDouble( double fValue ); /** Sets the item to 'date/time' type and adds the passed date. */ @@ -392,7 +392,7 @@ public: /** Returns the current item type. */ inline XclPCItemType GetType() const { return meType; } /** Returns the text representation of the item. */ - inline const rtl::OUString& ConvertToText() const { return maText; } + inline const OUString& ConvertToText() const { return maText; } /** Returns true, if the passed iterm equals this item. */ bool IsEqual( const XclPCItem& rItem ) const; @@ -400,7 +400,7 @@ public: /** Returns true, if the item type is 'empty'. */ bool IsEmpty() const; /** Returns pointer to text, if the item type is 'text', otherwise 0. */ - const rtl::OUString* GetText() const; + const OUString* GetText() const; /** Returns pointer to value, if the item type is 'double', otherwise 0. */ const double* GetDouble() const; /** Returns pointer to date, if the item type is 'date/time', otherwise 0. */ @@ -414,7 +414,7 @@ public: private: XclPCItemType meType; /// Type of the item. - rtl::OUString maText; /// Text representation of the item. + OUString maText; /// Text representation of the item. DateTime maDateTime; /// Value of a date/time item. union { @@ -433,7 +433,7 @@ inline bool operator!=( const XclPCItem& rLeft, const XclPCItem& rRight ) { retu /** Contains data for a pivot cache field (SXFIELD record). */ struct XclPCFieldInfo { - rtl::OUString maName; /// Name of the pivot cache field. + OUString maName; /// Name of the pivot cache field. sal_uInt16 mnFlags; /// Various flags. sal_uInt16 mnGroupChild; /// Field containing grouping info for this field. sal_uInt16 mnGroupBase; /// Base field if this field contains grouping info. @@ -530,7 +530,7 @@ struct XclPCInfo sal_uInt16 mnStdFields; /// Number of standard pivot cache fields. sal_uInt16 mnTotalFields; /// Number of all fields (standard, grouped, calculated). sal_uInt16 mnSrcType; /// Database type. - rtl::OUString maUserName; /// Name of user who last modified the cache. + OUString maUserName; /// Name of user who last modified the cache. explicit XclPCInfo(); }; @@ -547,7 +547,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPCInfo& rInfo ); /** A name for various pivot table info structs. Includes 'use cache' state. */ struct XclPTCachedName { - rtl::OUString maName; /// The visible name, if used. + OUString maName; /// The visible name, if used. bool mbUseCache; /// true = Use name in cache instead of maName. inline explicit XclPTCachedName() : mbUseCache( true ) {} @@ -566,9 +566,9 @@ struct XclPTVisNameInfo /** Returns true, if the name is set explicitly (maVisName.mbUseCache is false). */ inline bool HasVisName() const { return !maVisName.mbUseCache; } /** Returns the name, if set explicitly (maVisName.mbUseCache is false). */ - const rtl::OUString* GetVisName() const; + const OUString* GetVisName() const; /** Sets the visible name and enables usage of cache if name is empty. */ - void SetVisName( const rtl::OUString& rName ); + void SetVisName( const OUString& rName ); }; // Field item settings ======================================================== @@ -626,7 +626,7 @@ struct XclPTFieldExtInfo sal_uInt16 mnSortField; /// Index to data field sorting bases on. sal_uInt16 mnShowField; /// Index to data field AutoShow bases on. sal_uInt16 mnNumFmt; - boost::scoped_ptr mpFieldTotalName; + boost::scoped_ptr mpFieldTotalName; explicit XclPTFieldExtInfo(); @@ -707,8 +707,8 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTDataFieldInfo& rInfo ) /** Contains data for a pivot table (SXVIEW record). */ struct XclPTInfo { - rtl::OUString maTableName; /// The name of the pivot table. - rtl::OUString maDataName; /// The visible name of the data field. + OUString maTableName; /// The name of the pivot table. + OUString maDataName; /// The visible name of the data field. XclRange maOutXclRange; /// Output range. XclAddress maDataXclPos; /// First cell containing data. sal_uInt16 mnFirstHeadRow; /// First heading row. @@ -758,7 +758,7 @@ struct XclPTViewEx9Info sal_uInt32 mbReport; /// 2 for report* fmts ? sal_uInt8 mnAutoFormat; /// AutoFormat ID sal_uInt8 mnGridLayout; /// 0 == gridlayout, 0x10 == modern - rtl::OUString maGrandTotalName; + OUString maGrandTotalName; explicit XclPTViewEx9Info(); void Init( const ScDPObject& rDPObj ); diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index daa35e604f23..d0cc23e76bc1 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -164,26 +164,26 @@ public: // font names ------------------------------------------------------------- /** Returns the matching Excel font name for a passed Calc font name. */ - static rtl::OUString GetXclFontName( const rtl::OUString& rFontName ); + static OUString GetXclFontName( const OUString& rFontName ); // built-in defined names ------------------------------------------------- /** Returns the raw English UI representation of a built-in defined name used in NAME records. @param cBuiltIn Excel index of the built-in name. */ - static rtl::OUString GetXclBuiltInDefName( sal_Unicode cBuiltIn ); + static OUString GetXclBuiltInDefName( sal_Unicode cBuiltIn ); /** Returns the Calc UI representation of a built-in defined name used in NAME records. @descr Adds a prefix to the representation returned by GetXclBuiltInDefName(). @param cBuiltIn Excel index of the built-in name. */ - static rtl::OUString GetBuiltInDefName( sal_Unicode cBuiltIn ); + static OUString GetBuiltInDefName( sal_Unicode cBuiltIn ); /** Returns the Excel built-in name with OOXML prefix @descr Adds the "_xlnm." prefix to the representation returned by GetXclBuiltInDefName() @param cBuiltIn Excel index of the built in name.*/ - static rtl::OUString GetBuiltInDefNameXml( sal_Unicode cBuiltIn ); + static OUString GetBuiltInDefNameXml( sal_Unicode cBuiltIn ); /** Returns the Excel built-in name index of the passed defined name from Calc. @descr Ignores any characters following a valid representation of a built-in name. @param pcBuiltIn (out-param) If not 0, the index of the built-in name will be returned here. @return true = passed string is a built-in name; false = user-defined name. */ - static sal_Unicode GetBuiltInDefNameIndex( const rtl::OUString& rDefName ); + static sal_Unicode GetBuiltInDefNameIndex( const OUString& rDefName ); // built-in style names --------------------------------------------------- @@ -192,12 +192,12 @@ public: @param rName Default name for unknown styles. @param nLevel The zero-based outline level for RowLevel and ColLevel styles. @return The style name or an empty string, if the parameters are not valid. */ - static rtl::OUString GetBuiltInStyleName( sal_uInt8 nStyleId, const rtl::OUString& rName, sal_uInt8 nLevel ); + static OUString GetBuiltInStyleName( sal_uInt8 nStyleId, const OUString& rName, sal_uInt8 nLevel ); /** Returns true, if the passed string is a name of an Excel built-in style. @param pnStyleId If not 0, the found style identifier will be returned here. @param pnNextChar If not 0, the index of the char after the evaluated substring will be returned here. */ - static bool IsBuiltInStyleName( const rtl::OUString& rStyleName, sal_uInt8* pnStyleId = 0, sal_Int32* pnNextChar = 0 ); + static bool IsBuiltInStyleName( const OUString& rStyleName, sal_uInt8* pnStyleId = 0, sal_Int32* pnNextChar = 0 ); /** Returns the Excel built-in style identifier of a passed style name. @param rnStyleId The style identifier is returned here. @param rnLevel The zero-based outline level for RowLevel and ColLevel styles is returned here. @@ -205,7 +205,7 @@ public: @return true = passed string is a built-in style name, false = user style. */ static bool GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, - const rtl::OUString& rStyleName ); + const OUString& rStyleName ); // conditional formatting style names ------------------------------------- @@ -214,10 +214,10 @@ public: @param nFormat The zero-based index of the conditional formatting. @param nCondition The zero-based index of the condition. @return A style sheet name in the form "Excel_CondFormat___". */ - static rtl::OUString GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ); + static OUString GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition ); /** Returns true, if the passed string is a name of a conditional format style created by Excel import. @param pnNextChar If not 0, the index of the char after the evaluated substring will be returned here. */ - static bool IsCondFormatStyleName( const rtl::OUString& rStyleName ); + static bool IsCondFormatStyleName( const OUString& rStyleName ); // stream handling -------------------------------------------------------- @@ -227,20 +227,20 @@ public: // Basic macro names ------------------------------------------------------ /** Returns the full StarBasic macro URL from an Excel macro name. */ - static ::rtl::OUString GetSbMacroUrl( const rtl::OUString& rMacroName, SfxObjectShell* pDocShell = 0 ); + static OUString GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell = 0 ); /** Returns the Excel macro name from a full StarBasic macro URL. */ - static ::rtl::OUString GetXclMacroName( const ::rtl::OUString& rSbMacroUrl ); + static OUString GetXclMacroName( const OUString& rSbMacroUrl ); // ------------------------------------------------------------------------ private: - static const ::rtl::OUString maDefNamePrefix; /// Prefix for built-in defined names. - static const ::rtl::OUString maDefNamePrefixXml; /// Prefix for built-in defined names for OOX - static const ::rtl::OUString maStyleNamePrefix1; /// Prefix for built-in cell style names. - static const ::rtl::OUString maStyleNamePrefix2; /// Prefix for built-in cell style names from OOX filter. - static const ::rtl::OUString maCFStyleNamePrefix1; /// Prefix for cond. formatting style names. - static const ::rtl::OUString maCFStyleNamePrefix2; /// Prefix for cond. formatting style names from OOX filter. - static const ::rtl::OUString maSbMacroPrefix; /// Prefix for StarBasic macros. - static const ::rtl::OUString maSbMacroSuffix; /// Suffix for StarBasic macros. + static const OUString maDefNamePrefix; /// Prefix for built-in defined names. + static const OUString maDefNamePrefixXml; /// Prefix for built-in defined names for OOX + static const OUString maStyleNamePrefix1; /// Prefix for built-in cell style names. + static const OUString maStyleNamePrefix2; /// Prefix for built-in cell style names from OOX filter. + static const OUString maCFStyleNamePrefix1; /// Prefix for cond. formatting style names. + static const OUString maCFStyleNamePrefix2; /// Prefix for cond. formatting style names from OOX filter. + static const OUString maSbMacroPrefix; /// Prefix for StarBasic macros. + static const OUString maSbMacroSuffix; /// Suffix for StarBasic macros. /** We don't want anybody to instantiate this class, since it is just a collection of static items. To enforce this, the default constructor diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index c10283c6cbd0..1f5dd65f7c2c 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -33,7 +33,7 @@ extern WKTYP eTyp; static const sal_Char* GetAddInName( const sal_uInt8 nIndex ); -static DefTokenId lcl_KnownAddIn(const rtl::OString& rTest); +static DefTokenId lcl_KnownAddIn(const OString& rTest); //extern double decipher_Number123( sal_uInt32 nValue ); @@ -51,10 +51,10 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri if( eOc == ocNoName ) { - rtl::OString t; + OString t; if( pExtString ) { - const rtl::OString s(RTL_CONSTASCII_STRINGPARAM("@<<@123>>")); + const OString s(RTL_CONSTASCII_STRINGPARAM("@<<@123>>")); t = pExtString; @@ -67,7 +67,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri eOc = lcl_KnownAddIn( t ); if( eOc == ocNoName ) - t = rtl::OString(RTL_CONSTASCII_STRINGPARAM("L123_")) + t; + t = OString(RTL_CONSTASCII_STRINGPARAM("L123_")) + t; } else t = "#UNKNOWN FUNC NAME#"; @@ -75,7 +75,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri if( eOc == ocNoName ) { bAddIn = sal_True; - nMerk0 = aPool.Store(eOc, rtl::OStringToOUString(t, eSrcChar)); + nMerk0 = aPool.Store(eOc, OStringToOUString(t, eSrcChar)); aPool << nMerk0; } @@ -1986,7 +1986,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) } -static DefTokenId lcl_KnownAddIn( const rtl::OString& rTest ) +static DefTokenId lcl_KnownAddIn( const OString& rTest ) { DefTokenId eId = ocNoName; diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 4f07cf772766..a5b5d7b8e563 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -198,9 +198,9 @@ FltError ImportLotus::Read() // duemmliche Namen eliminieren SCTAB nTabs = pD->GetTableCount(); SCTAB nCnt; - rtl::OUString aTabName; - rtl::OUString aBaseName; - rtl::OUString aRef( "temp" ); + OUString aTabName; + OUString aBaseName; + OUString aRef( "temp" ); if( nTabs != 0 ) { if( nTabs > 1 ) diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index cdf78c91cb40..958acb6493db 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -38,10 +38,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; // ============================================================================ diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 9665e5c47141..5064440dfb0c 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -181,7 +179,7 @@ void ApiFilterSettings::appendField( bool bAnd, sal_Int32 nOperator, const OUStr rFilterField.Values[0].StringValue = rValue; } -void ApiFilterSettings::appendField( bool bAnd, const std::vector& rValues ) +void ApiFilterSettings::appendField( bool bAnd, const std::vector& rValues ) { maFilterFields.resize( maFilterFields.size() + 1 ); TableFilterField3& rFilterField = maFilterFields.back(); diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx index 0f4277f39f47..4f351794fed5 100644 --- a/sc/source/filter/oox/autofiltercontext.cxx +++ b/sc/source/filter/oox/autofiltercontext.cxx @@ -26,7 +26,6 @@ namespace oox { namespace xls { using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx index fcd4875b9a14..51e9fce72d76 100644 --- a/sc/source/filter/oox/biffcodec.cxx +++ b/sc/source/filter/oox/biffcodec.cxx @@ -33,9 +33,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OStringToOUString; // ============================================================================ diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 0afd05353bc0..efc622394225 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -30,8 +30,6 @@ namespace xls { // ============================================================================ -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index eb99508559c3..0782d8027ebd 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -27,10 +27,6 @@ namespace xls { // ============================================================================ -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index 87cc63d3615a..f1aa4f4533fb 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -33,7 +33,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 92c090b57f15..d70a5b9bcfe2 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -using ::rtl::OUString; static sal_Int32 lcl_ToHorizAlign( sal_Int32 nAlign ) { diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx index 7cf9600bbd67..09d65f5467dd 100644 --- a/sc/source/filter/oox/commentsfragment.cxx +++ b/sc/source/filter/oox/commentsfragment.cxx @@ -28,7 +28,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 15d193071bfd..01c3edc077ba 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -64,8 +64,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -136,7 +134,7 @@ void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttribs ) { - rtl::OUString aType = rAttribs.getString( XML_type, rtl::OUString() ); + OUString aType = rAttribs.getString( XML_type, OUString() ); double nVal = rAttribs.getDouble( XML_val, 0.0 ); pEntry->mnVal = nVal; @@ -162,7 +160,7 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttrib } else if( aType == "formula" ) { - rtl::OUString aFormula = rAttribs.getString( XML_val, rtl::OUString() ); + OUString aFormula = rAttribs.getString( XML_val, OUString() ); pEntry->maFormula = aFormula; } @@ -333,7 +331,7 @@ void IconSetRule::importCfvo( const AttributeList& rAttribs ) void IconSetRule::importAttribs( const AttributeList& rAttribs ) { - maIconSetType = rAttribs.getString( XML_iconSet, rtl::OUString("3TrafficLights1") ); + maIconSetType = rAttribs.getString( XML_iconSet, OUString("3TrafficLights1") ); mpFormatData->mbShowValue = rAttribs.getBool( XML_showValue, true ); mpFormatData->mbReverse = rAttribs.getBool( XML_reverse, false ); } @@ -350,7 +348,7 @@ void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScA ScIconSetMap* pIconSetMap = ScIconSetFormat::getIconSetMap(); for(size_t i = 0; pIconSetMap[i].pName; ++i) { - if(rtl::OUString::createFromAscii(pIconSetMap[i].pName) == maIconSetType) + if(OUString::createFromAscii(pIconSetMap[i].pName) == maIconSetType) { eIconSetType = pIconSetMap[i].eType; break; diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx index 4337e9aca35d..f4d192c690f3 100644 --- a/sc/source/filter/oox/condformatcontext.cxx +++ b/sc/source/filter/oox/condformatcontext.cxx @@ -26,7 +26,6 @@ namespace xls { // ============================================================================ using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index 76f2fc6a438a..f605a5991198 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -29,8 +29,6 @@ namespace xls { using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 2a9a61fc650b..676bc408ee67 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -30,7 +30,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 488b7e36aba3..0cb38f963ad6 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 8b3bb9b7a3e4..b112a4fd8f36 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::table; using namespace ::oox::drawingml; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 22f4a6bbd2ea..65bff71d0e9e 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -59,9 +59,6 @@ using ::com::sun::star::awt::Size; using ::com::sun::star::awt::Point; using ::com::sun::star::awt::Rectangle; using ::com::sun::star::awt::XControlModel; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringToOString; // no using's for ::oox::vml, that may clash with ::oox::drawingml types // ============================================================================ @@ -103,7 +100,7 @@ Shape::Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, con void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& rxShapes ) { - rtl::OUString sURL; + OUString sURL; getShapeProperties()[ PROP_URL ] >>= sURL; getWorksheets().convertSheetNameRef( sURL ); if( !maMacroName.isEmpty() && mxShape.is() ) diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index fab5365eca24..f56665809a99 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::oox::drawingml; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index b539abb74cb0..59870a44cdce 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using ::oox::drawingml::chart::DataSequenceModel; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index dfddf86f1567..b54d09cedd92 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::oox::core; -using ::rtl::OUString; using ::oox::drawingml::table::TableStyleListPtr; // ============================================================================ diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index efb69f77eee4..66219b5c96ce 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -29,7 +29,6 @@ namespace xls { using ::oox::core::FilterBase; using ::oox::core::FragmentHandler2; -using ::rtl::OUString; // ============================================================================ // ============================================================================ diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index 0d78db71f30b..65d4532cc6d5 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index f2bb7dc3a869..bdfb6afdb296 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -51,10 +51,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::Relation; using ::oox::core::Relations; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index cf72857e5a1c..348b50751407 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ // ============================================================================ diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index 5e20e2f6c9ae..4cd95aae3be7 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -75,7 +75,7 @@ void ExtCfRuleContext::importDataBar( const AttributeList& rAttribs ) ScDataBarFormatData* pDataBar = static_cast(mpTarget); pDataBar->mbGradient = rAttribs.getBool( XML_gradient, true ); - rtl::OUString aAxisPosition = rAttribs.getString( XML_axisPosition, "automatic" ); + OUString aAxisPosition = rAttribs.getString( XML_axisPosition, "automatic" ); if( aAxisPosition == "none" ) pDataBar->meAxisPosition = databar::NONE; else if( aAxisPosition == "middle" ) @@ -125,7 +125,7 @@ void ExtCfRuleContext::importCfvo( const AttributeList& rAttribs ) else pEntry = pDataBar->mpUpperLimit.get(); - rtl::OUString aColorScaleType = rAttribs.getString( XML_type, rtl::OUString() ); + OUString aColorScaleType = rAttribs.getString( XML_type, OUString() ); if(aColorScaleType == "min") pEntry->SetType(COLORSCALE_MIN); else if (aColorScaleType == "max") @@ -178,11 +178,11 @@ void ExtLstLocalContext::onStartElement( const AttributeList& ) } } -void ExtLstLocalContext::onCharacters( const rtl::OUString& rChars ) +void ExtLstLocalContext::onCharacters( const OUString& rChars ) { if (getCurrentElement() == XLS_EXT_TOKEN( id )) { - getExtLst().insert( std::pair< rtl::OUString, void*>(rChars, mpTarget) ); + getExtLst().insert( std::pair< OUString, void*>(rChars, mpTarget) ); } } @@ -199,7 +199,7 @@ ContextHandlerRef ExtGlobalContext::onCreateContext( sal_Int32 nElement, const A { if(nElement == XLS_EXT_TOKEN( cfRule )) { - rtl::OUString aId = rAttribs.getString( XML_id, rtl::OUString() ); + OUString aId = rAttribs.getString( XML_id, OUString() ); // an ext entrie does not need to have an existing corresponding entry ExtLst::const_iterator aExt = getExtLst().find( aId ); diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 1a12a2e659cc..947b785230b6 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -49,12 +49,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; // reference helpers ========================================================== diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index d2f49e6e1802..0fa6dcbd9aa2 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -168,14 +168,14 @@ void FormulaBuffer::applyArrayFormulas( const std::vector< TokenRangeAddressItem } } -void FormulaBuffer::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ) +void FormulaBuffer::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ) { std::vector& rSharedFormulas = sharedFormulas[ rAddress.Sheet ]; SharedFormulaEntry aEntry( rAddress, rTokens, nSharedId ); rSharedFormulas.push_back( aEntry ); } -void FormulaBuffer::setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const rtl::OUString& rTokenStr ) +void FormulaBuffer::setCellFormula( const ::com::sun::star::table::CellAddress& rAddress, const OUString& rTokenStr ) { cellFormulas[ rAddress.Sheet ].push_back( TokenAddressItem( rTokenStr, rAddress ) ); } @@ -185,7 +185,7 @@ void FormulaBuffer::setCellFormula( const ::com::sun::star::table::CellAddress& sharedFormulaIds[ rAddress.Sheet ].push_back( SharedFormulaDesc( rAddress, nSharedId ) ); } -void FormulaBuffer::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& rTokenStr ) +void FormulaBuffer::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { TokenAddressItem tokenPair( rTokenStr, rTokenAddress ); @@ -197,13 +197,13 @@ void FormulaBuffer::setCellFormulaValue( const ::com::sun::star::table::CellAddr cellFormulaValues[ rAddress.Sheet ].push_back( ValueAddressPair( rAddress, fValue ) ); } -void FormulaBuffer::createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokenStr ) +void FormulaBuffer::createSharedFormula( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokenStr ) { ApiTokenSequence aTokens = getFormulaParser().importFormula( rAddress, rTokenStr ); - rtl::OUString aName = rtl::OUStringBuffer().appendAscii( RTL_CONSTASCII_STRINGPARAM( "__shared_" ) ). + OUString aName = OUStringBuffer().appendAscii( RTL_CONSTASCII_STRINGPARAM( "__shared_" ) ). append( static_cast< sal_Int32 >( rAddress.Sheet + 1 ) ). append( sal_Unicode( '_' ) ).append( nSharedId ). - append( rtl::OUString("_0") ).makeStringAndClear(); + append( OUString("_0") ).makeStringAndClear(); ScRangeData* pScRangeData = createNamedRangeObject( aName, aTokens, 0 ); pScRangeData->SetType(RT_SHARED); diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index aa1d9c79051a..cf79c711e8ef 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star::sheet::ReferenceFlags; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ @@ -548,7 +547,7 @@ private: // finalize token sequence ------------------------------------------------ virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const; - virtual ::rtl::OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; + virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; protected: const sal_Int32 mnMaxApiCol; /// Maximum column index in own document. diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 8612e0d96c80..4baa33ee8ff3 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -50,11 +50,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 33573ba100b4..5cf31722b3bd 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -57,10 +57,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using ::oox::core::Relations; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index e74b2faedb2a..08160c5540d0 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using ::oox::core::Relations; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index 12d6ddfa7b6e..4ae3e1adeb3d 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -32,7 +32,6 @@ namespace xls { using namespace ::com::sun::star::uno; using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index babbbccc6048..6303a057f7bd 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace com::sun::star; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index 57c93ac81116..efe077394338 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -29,7 +29,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 7536863879d3..d80d06d2a3fa 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx index 73b542e2d412..8ab45e52d0fb 100644 --- a/sc/source/filter/oox/querytablefragment.cxx +++ b/sc/source/filter/oox/querytablefragment.cxx @@ -29,7 +29,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 1a746d6d2831..98c47f12aa2d 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -35,9 +35,6 @@ namespace xls { using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -476,7 +473,7 @@ void RichString::createTextPortions( const OUString& rText, FontPortionModelList } } -void RichString::createPhoneticPortions( const ::rtl::OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ) +void RichString::createPhoneticPortions( const OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ) { maPhonPortions.clear(); if( !rText.isEmpty()) diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx index 8f3a63b70649..7d83ead8c62b 100644 --- a/sc/source/filter/oox/richstringcontext.cxx +++ b/sc/source/filter/oox/richstringcontext.cxx @@ -27,7 +27,6 @@ namespace xls { // ============================================================================ using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index 01fd51026ac6..ba0766c66da6 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx index 89436e417665..09f7b50610f6 100644 --- a/sc/source/filter/oox/sharedstringsfragment.cxx +++ b/sc/source/filter/oox/sharedstringsfragment.cxx @@ -29,7 +29,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 9877fde12887..11a057d8ae29 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -63,8 +63,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index bd5b1467d88e..5403bc402460 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; // ============================================================================ @@ -364,7 +363,7 @@ void SheetDataContext::importFormula( const AttributeList& rAttribs ) maTableData.mbRef2Deleted = rAttribs.getBool( XML_del2, false ); } - maFormulaStr = rtl::OUString(); + maFormulaStr = OUString(); } void SheetDataContext::importRow( SequenceInputStream& rStrm ) diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 3b81f2cfca23..fc3ee8051f6f 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -91,8 +91,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -1031,7 +1029,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, FontPropertyType ePropType, bool rtl_TextEncoding eTempTextEnc = (bEdit && (eFontEnc == getTextEncoding())) ? ScfTools::GetSystemTextEncoding() : eFontEnc; - SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maLatinFont.mnFamily ), maApiData.maLatinFont.maName, rtl::OUString(), + SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maLatinFont.mnFamily ), maApiData.maLatinFont.maName, OUString(), PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT ); ScfTools::PutItem( rItemSet, aFontItem, bEdit ? EE_CHAR_FONTINFO : ATTR_FONT, bSkipPoolDefs ); } @@ -1041,7 +1039,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, FontPropertyType ePropType, bool // taken from binary importer rtl_TextEncoding eTempTextEnc = (bEdit && (eFontEnc == getTextEncoding())) ? ScfTools::GetSystemTextEncoding() : eFontEnc; - SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maAsianFont.mnFamily ), maApiData.maAsianFont.maName, rtl::OUString(), + SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maAsianFont.mnFamily ), maApiData.maAsianFont.maName, OUString(), PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT ); ScfTools::PutItem( rItemSet, aFontItem, bEdit ? EE_CHAR_FONTINFO_CJK : ATTR_CJK_FONT, bSkipPoolDefs ); } @@ -1051,7 +1049,7 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, FontPropertyType ePropType, bool // taken from binary importer rtl_TextEncoding eTempTextEnc = (bEdit && (eFontEnc == getTextEncoding())) ? ScfTools::GetSystemTextEncoding() : eFontEnc; - SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maCmplxFont.mnFamily ), maApiData.maCmplxFont.maName, rtl::OUString(), + SvxFontItem aFontItem( lcl_getFontFamily( maApiData.maCmplxFont.mnFamily ), maApiData.maCmplxFont.maName, OUString(), PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT ); ScfTools::PutItem( rItemSet, aFontItem, bEdit ? EE_CHAR_FONTINFO_CTL : ATTR_CTL_FONT, bSkipPoolDefs ); } diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index f49c3fa8e319..ee21b2a07877 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -28,7 +28,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index 0748e3ca3bee..672e11cb358b 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx index edef7662cb8a..334f29c13ff8 100644 --- a/sc/source/filter/oox/tablefragment.cxx +++ b/sc/source/filter/oox/tablefragment.cxx @@ -30,7 +30,6 @@ namespace xls { using namespace ::oox::core; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index a40ce3b36e7e..632103b05135 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 40c50db9362d..ba92331a65a4 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 41a6ce71098c..5fad0fd6af25 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -64,7 +64,6 @@ using namespace ::com::sun::star::sheet; using namespace ::oox::core; using ::oox::drawingml::ThemeFragmentHandler; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index ca89dccb2dcf..703e7398919b 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -95,13 +95,12 @@ using ::oox::core::FilterBase; using ::oox::core::FragmentHandler; using ::oox::core::XmlFilterBase; using ::oox::drawingml::Theme; -using ::rtl::OUString; // ============================================================================ bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rName2 ) const { - // there is no wrapper in rtl::OUString, TODO: compare with collator + // there is no wrapper in OUString, TODO: compare with collator return ::rtl_ustr_compareIgnoreAsciiCase_WithLength( rName1.getStr(), rName1.getLength(), rName2.getStr(), rName2.getLength() ) < 0; } @@ -159,7 +158,7 @@ public: } } if ( !mpDoc ) - throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Workbookhelper::getScDocument(): Failed to access ScDocument from model" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("Workbookhelper::getScDocument(): Failed to access ScDocument from model" ) ), Reference< XInterface >() ); return *mpDoc; } @@ -393,12 +392,12 @@ ScRangeData* lcl_addNewByNameAndTokens( ScDocument& rDoc, ScRangeName* pNames, c return pNew; } -rtl::OUString findUnusedName( const ScRangeName* pRangeName, const rtl::OUString& rSuggestedName ) +OUString findUnusedName( const ScRangeName* pRangeName, const OUString& rSuggestedName ) { - rtl::OUString aNewName = rSuggestedName; + OUString aNewName = rSuggestedName; sal_Int32 nIndex = 0; while(pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(aNewName))) - aNewName = rtl::OUStringBuffer(rSuggestedName).append( '_' ).append( nIndex++ ).makeStringAndClear(); + aNewName = OUStringBuffer(rSuggestedName).append( '_' ).append( nIndex++ ).makeStringAndClear(); return aNewName; } diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index f9a61c00d19b..a46a3fa40414 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::util; using ::comphelper::MediaDescriptor; using ::oox::core::CodecHelper; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 7483900c088e..1a0bcb1df172 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -43,8 +43,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -110,7 +108,7 @@ OUString WorksheetBuffer::getCalcSheetName( sal_Int32 nWorksheet ) const return pSheetInfo ? pSheetInfo->maCalcName : OUString(); } -void WorksheetBuffer::convertSheetNameRef( ::rtl::OUString& sSheetNameRef ) const +void WorksheetBuffer::convertSheetNameRef( OUString& sSheetNameRef ) const { // convert '#SheetName!A1' to '#SheetName.A1' if( !sSheetNameRef.isEmpty() && (sSheetNameRef[ 0 ] == '#') ) diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index 874693375219..b8ad65832889 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index dfb1653ab684..f22c27a32fec 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -87,8 +87,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ @@ -1598,7 +1596,7 @@ void WorksheetHelper::finalizeDrawingImport() mrSheetGlob.finalizeDrawingImport(); } -void WorksheetHelper::setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& rTokenStr ) +void WorksheetHelper::setCellFormula( const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { getFormulaBuffer().setCellFormula( rTokenAddress, rTokenStr ); } @@ -1608,12 +1606,12 @@ void WorksheetHelper::setCellFormula( const ::com::sun::star::table::CellAddress getFormulaBuffer().setCellFormula( rTokenAddress, nSharedId ); } -void WorksheetHelper::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const rtl::OUString& rTokenStr ) +void WorksheetHelper::setCellArrayFormula( const ::com::sun::star::table::CellRangeAddress& rRangeAddress, const ::com::sun::star::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) { getFormulaBuffer().setCellArrayFormula( rRangeAddress, rTokenAddress, rTokenStr ); } -void WorksheetHelper::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const rtl::OUString& rTokens ) +void WorksheetHelper::createSharedFormulaMapEntry( const ::com::sun::star::table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ) { getFormulaBuffer().createSharedFormulaMapEntry( rAddress, nSharedId, rTokens ); } diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 933d986bca61..1980283e4820 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using ::oox::core::CodecHelper; -using ::rtl::OUString; // ============================================================================ diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx index ed33cc185971..e74a5e421891 100644 --- a/sc/source/filter/orcus/orcusfiltersimpl.cxx +++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx @@ -28,7 +28,7 @@ OString ScOrcusFiltersImpl::toSystemPath(const OUString& rPath) { INetURLObject aURL(rPath); - return rtl::OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), RTL_TEXTENCODING_UTF8); + return OUStringToOString(aURL.getFSysPath(SYSTEM_PATH), RTL_TEXTENCODING_UTF8); } bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, const OUString& rPath) const @@ -71,7 +71,7 @@ bool ScOrcusFiltersImpl::importGnumeric(ScDocument& rDoc, const OUString& rPath) return true; } -ScOrcusXMLContext* ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const rtl::OUString& rPath) const +ScOrcusXMLContext* ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const OUString& rPath) const { return new ScOrcusXMLContextImpl(rDoc, rPath); } diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index ecbf35bf9691..edfd0b6ee42f 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -237,7 +237,7 @@ bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) mrDoc.GetName(rLink.maPos.Tab(), aTabName); filter.set_cell_link( rLink.maPath.getStr(), - rtl::OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), rLink.maPos.Row(), rLink.maPos.Col()); } } @@ -252,7 +252,7 @@ bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) OUString aTabName; mrDoc.GetName(rLink.maPos.Tab(), aTabName); filter.start_range( - rtl::OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(aTabName, RTL_TEXTENCODING_UTF8).getStr(), rLink.maPos.Row(), rLink.maPos.Col()); std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter)); diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 082cc083d379..89c6c0328ae3 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -92,9 +92,9 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr bAddIn = sal_True; if( pExtString ) { - rtl::OStringBuffer s(RTL_CONSTASCII_STRINGPARAM("QPRO_")); + OStringBuffer s(RTL_CONSTASCII_STRINGPARAM("QPRO_")); s.append(pExtString); - nPush = aPool.Store(eOc, rtl::OStringToOUString(s.makeStringAndClear(), maIn.GetStreamCharSet())); + nPush = aPool.Store(eOc, OStringToOUString(s.makeStringAndClear(), maIn.GetStreamCharSet())); aPool << nPush; } else diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 23a4c3c9501a..cad6188aa7ad 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -202,7 +202,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu } // HTML - rtl::OUString aValStr, aNumStr; + OUString aValStr, aNumStr; double fVal; sal_uInt32 nNumForm = 0; LanguageType eNumLang = LANGUAGE_NONE; diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index 0e19de093056..7dd2475503cf 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -110,7 +110,7 @@ void ScRTFExport::WriteTab( SCTAB nTab ) void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) { rStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30"; - rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << rtl::OString::valueOf(static_cast(pDoc->GetRowHeight(nRow, nTab))).getStr(); + rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::valueOf(static_cast(pDoc->GetRowHeight(nRow, nTab))).getStr(); SCCOL nCol; SCCOL nEndCol = aRange.aEnd.Col(); for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ ) @@ -141,7 +141,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) if ( pChar ) rStrm << pChar; - rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << rtl::OString::valueOf(static_cast(pCellX[nCol+1])).getStr(); + rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::valueOf(static_cast(pCellX[nCol+1])).getStr(); if ( (nCol & 0x0F) == 0x0F ) rStrm << sNewLine; // Zeilen nicht zu lang werden lassen } diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index 8f2c0b62d226..87bac8df1336 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -51,7 +51,7 @@ void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rect if ( !SvtModuleOptions().IsChart() ) return; - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = pDoc->GetDocumentShell()-> GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aName ); if ( xObj.is() ) diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index f23dfe21fea5..9b0767aadfbb 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -33,9 +33,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; using namespace oox; static OString lcl_GuidToOString( sal_uInt8 aGuid[ 16 ] ) @@ -141,9 +138,9 @@ XclExpUserBViewList::XclExpUserBViewList( const ScChangeTrack& rChangeTrack ) { sal_uInt8 aGUID[ 16 ]; sal_Bool bValidGUID = false; - const std::set& rStrColl = rChangeTrack.GetUserCollection(); + const std::set& rStrColl = rChangeTrack.GetUserCollection(); aViews.reserve(rStrColl.size()); - std::set::const_iterator it = rStrColl.begin(), itEnd = rStrColl.end(); + std::set::const_iterator it = rStrColl.begin(), itEnd = rStrColl.end(); for (; it != itEnd; ++it) { lcl_GenerateGUID( aGUID, bValidGUID ); @@ -1537,7 +1534,7 @@ ScChangeTrack* XclExpChangeTrack::CreateTempChangeTrack() // adjust table count SCTAB nOrigCount = GetDoc().GetTableCount(); - rtl::OUString sTabName; + OUString sTabName; for( sal_Int32 nIndex = 0; nIndex < nOrigCount; nIndex++ ) { pTempDoc->CreateValidTabName( sTabName ); diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 9ce4e2ab19c3..976c1f83d451 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -158,7 +158,7 @@ sal_Bool XclImpChangeTrack::Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, // external ref - read doc and tab name and find sc tab num // - URL String aEncUrl( pStrm->ReadUniString() ); - ::rtl::OUString aUrl; + OUString aUrl; bool bSelf; XclImpUrlHelper::DecodeUrl( aUrl, bSelf, GetRoot(), aEncUrl ); pStrm->Ignore( 1 ); diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 6ba28abbb1e1..6d7a15b41a45 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -51,7 +51,6 @@ #include "xechart.hxx" #include "xcl97esc.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; @@ -523,8 +522,8 @@ ShapeInteractionHelper::PopulateShapeInteractionInfo( XclExpObjectManager& rObjM try { SvMemoryStream* pMemStrm = NULL; - rtl::OUString sHyperLink; - rtl::OUString sMacro; + OUString sHyperLink; + OUString sMacro; if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( ::GetSdrObjectFromXShape( xShape ) ) ) { sHyperLink = pInfo->GetHlink(); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 60b169086391..dcd62b5b5ab5 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -76,8 +76,6 @@ #include #include -using ::rtl::OString; -using ::rtl::OUString; using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::oox::drawingml::DrawingML; @@ -1122,7 +1120,7 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->singleElement( XML_sheet, XML_name, XclXmlUtils::ToOString( sUnicodeName ).getStr(), - XML_sheetId, rtl::OString::valueOf( (sal_Int32)( nTab+1 ) ).getStr(), + XML_sheetId, OString::valueOf( (sal_Int32)( nTab+1 ) ).getStr(), XML_state, nGrbit == 0x0000 ? "visible" : "hidden", FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(), FSEND ); @@ -1207,7 +1205,7 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) { String sTmpName; String sTmpComm; - rtl::OUString aTmp; + OUString aTmp; Color aDummyCol; sal_uInt16 nFlags; diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 0a5c34eb57d0..c1922811ffde 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -36,7 +36,7 @@ using namespace xmloff::token; ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -56,11 +56,11 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -104,7 +104,7 @@ ScXMLCalculationSettingsContext::~ScXMLCalculationSettingsContext() } SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -131,15 +131,15 @@ void ScXMLCalculationSettingsContext::EndElement() uno::Reference xPropertySet (GetScImport().GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN)), uno::makeAny(bCalcAsShown) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE)), uno::makeAny(bIgnoreCase) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS)), uno::makeAny(bLookUpLabels) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE)), uno::makeAny(bMatchWholeCell) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED)), uno::makeAny(bUseRegularExpressions) ); - xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED)), uno::makeAny(bIsIterationEnabled) ); - xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT)), uno::makeAny(nIterationCount) ); - xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON)), uno::makeAny(fIterationEpsilon) ); - xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE)), uno::makeAny(aNullDate) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN)), uno::makeAny(bCalcAsShown) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE)), uno::makeAny(bIgnoreCase) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS)), uno::makeAny(bLookUpLabels) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE)), uno::makeAny(bMatchWholeCell) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED)), uno::makeAny(bUseRegularExpressions) ); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED)), uno::makeAny(bIsIterationEnabled) ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT)), uno::makeAny(nIterationCount) ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON)), uno::makeAny(fIterationEpsilon) ); + xPropertySet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE)), uno::makeAny(aNullDate) ); if (GetScImport().GetDocument()) { ScXMLImport::MutexGuard aGuard(GetScImport()); @@ -153,7 +153,7 @@ void ScXMLCalculationSettingsContext::EndElement() ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : @@ -162,11 +162,11 @@ ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE && IsXMLToken(aLocalName, XML_DATE_VALUE)) { @@ -186,7 +186,7 @@ ScXMLNullDateContext::~ScXMLNullDateContext() } SvXMLImportContext *ScXMLNullDateContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -201,7 +201,7 @@ void ScXMLNullDateContext::EndElement() ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : @@ -210,11 +210,11 @@ ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -244,7 +244,7 @@ ScXMLIterationContext::~ScXMLIterationContext() } SvXMLImportContext *ScXMLIterationContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 5916e538c57c..337948a1714e 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -42,14 +42,14 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLCalculationSettingsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -66,14 +66,14 @@ class ScXMLNullDateContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLNullDateContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -86,14 +86,14 @@ class ScXMLIterationContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLIterationContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index cfbc37d713a5..b13efc2d5309 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx @@ -28,7 +28,6 @@ #include #include "xmlimprt.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; @@ -59,7 +58,7 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( nIndex )); + const OUString& sAttrName(xAttrList->getNameByIndex( nIndex )); const OUString& sValue(xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 61c704ebdc46..568a8dc32d2e 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -29,10 +29,10 @@ class ScXMLImport; struct ScMyImpCellRangeSource { - ::rtl::OUString sSourceStr; - ::rtl::OUString sFilterName; - ::rtl::OUString sFilterOptions; - ::rtl::OUString sURL; + OUString sSourceStr; + OUString sFilterName; + OUString sFilterOptions; + OUString sURL; sal_Int32 nColumns; sal_Int32 nRows; sal_Int32 nRefresh; @@ -53,7 +53,7 @@ public: ScXMLCellRangeSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ScMyImpCellRangeSource* pCellRangeSource ); @@ -61,7 +61,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 08e60c4f1aa7..d4bcd4e0f2ff 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -59,9 +59,9 @@ ScChangeTrackingExportHelper::~ScChangeTrackingExportHelper() delete pDependings; } -rtl::OUString ScChangeTrackingExportHelper::GetChangeID(const sal_uInt32 nActionNumber) +OUString ScChangeTrackingExportHelper::GetChangeID(const sal_uInt32 nActionNumber) { - rtl::OUStringBuffer sBuffer(sChangeIDPrefix); + OUStringBuffer sBuffer(sChangeIDPrefix); ::sax::Converter::convertNumber(sBuffer, static_cast(nActionNumber)); return sBuffer.makeStringAndClear(); @@ -87,7 +87,7 @@ void ScChangeTrackingExportHelper::WriteBigRange(const ScBigRange& rBigRange, XM nEndColumn, nEndRow, nEndSheet); if ((nStartColumn == nEndColumn) && (nStartRow == nEndRow) && (nStartSheet == nEndSheet)) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nStartColumn); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COLUMN, sBuffer.makeStringAndClear()); ::sax::Converter::convertNumber(sBuffer, nStartRow); @@ -97,7 +97,7 @@ void ScChangeTrackingExportHelper::WriteBigRange(const ScBigRange& rBigRange, XM } else { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nStartColumn); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_START_COLUMN, sBuffer.makeStringAndClear()); ::sax::Converter::convertNumber(sBuffer, nStartRow); @@ -122,12 +122,12 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC, XML_CREATOR, true, false ); - rtl::OUString sAuthor(pAction->GetUser()); + OUString sAuthor(pAction->GetUser()); rExport.Characters(sAuthor); } { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; ScXMLConverter::ConvertDateTimeToString(pAction->GetDateTimeUTC(), sDate); SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC, XML_DATE, true, @@ -135,7 +135,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction rExport.Characters(sDate.makeStringAndClear()); } - rtl::OUString sComment(pAction->GetComment()); + OUString sComment(pAction->GetComment()); if (!sComment.isEmpty()) { SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); @@ -152,7 +152,7 @@ void ScChangeTrackingExportHelper::WriteGenerated(const ScChangeAction* pGenerat #endif SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, true, true); WriteBigRange(pGeneratedAction->GetBigRange(), XML_CELL_ADDRESS); - rtl::OUString sValue; + OUString sValue; static_cast(pGeneratedAction)->GetNewString(sValue); WriteCell(static_cast(pGeneratedAction)->GetNewCell(), sValue); } @@ -171,7 +171,7 @@ void ScChangeTrackingExportHelper::WriteDeleted(const ScChangeAction* pDeletedAc SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, true, true); if (static_cast(pDeletedAction)->IsTopContent() && pDeletedAction->IsDeletedIn()) { - rtl::OUString sValue; + OUString sValue; pContentAction->GetNewString(sValue); WriteCell(pContentAction->GetNewCell(), sValue); } @@ -248,7 +248,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons if ( rExport.GetMM100UnitConverter().setNullDate(rExport.GetModel()) ) { rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_DATE); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; rExport.GetMM100UnitConverter().convertDateTime(sBuffer, fTempValue); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_DATE_VALUE, sBuffer.makeStringAndClear()); bSetAttributes = true; @@ -258,7 +258,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons case NUMBERFORMAT_TIME: { rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TIME); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDuration(sBuffer, fTempValue); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_TIME_VALUE, sBuffer.makeStringAndClear()); bSetAttributes = true; @@ -270,9 +270,9 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons if (!bSetAttributes) { rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDouble(sBuffer, fValue); - rtl::OUString sNumValue(sBuffer.makeStringAndClear()); + OUString sNumValue(sBuffer.makeStringAndClear()); if (!sNumValue.isEmpty()) rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE, sNumValue); } @@ -423,7 +423,7 @@ void ScChangeTrackingExportHelper::WriteContentChange(ScChangeAction* pAction) if (pPrevAction) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pPrevAction->GetActionNumber())); SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_PREVIOUS, true, true); - rtl::OUString sValue; + OUString sValue; static_cast(pAction)->GetOldString(sValue); WriteCell(static_cast(pAction)->GetOldCell(), sValue); } @@ -475,7 +475,7 @@ void ScChangeTrackingExportHelper::AddInsertionAttributes(const ScChangeAction* } nPosition = nStartPosition; nCount = nEndPosition - nStartPosition + 1; - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nPosition); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_POSITION, sBuffer.makeStringAndClear()); OSL_ENSURE(nCount > 0, "wrong insertion count"); @@ -537,7 +537,7 @@ void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel } break; } - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nPosition); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_POSITION, sBuffer.makeStringAndClear()); if (pDelAction->GetType() != SC_CAT_DELETE_TABS) @@ -580,7 +580,7 @@ void ScChangeTrackingExportHelper::WriteCutOffs(const ScChangeActionDel* pAction if (pCutOffIns || pLinkMove) { SvXMLElementExport aCutOffsElem (rExport, XML_NAMESPACE_TABLE, XML_CUT_OFFS, true, true); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; if (pCutOffIns) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pCutOffIns->GetActionNumber())); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx index 55f3169c57ab..e65e18c9365e 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx @@ -46,10 +46,10 @@ class ScChangeTrackingExportHelper ScChangeTrack* pChangeTrack; ScEditEngineTextObj* pEditTextObj; ScChangeActionMap* pDependings; - rtl::OUString sChangeIDPrefix; + OUString sChangeIDPrefix; com::sun::star::uno::Reference xText; - rtl::OUString GetChangeID(const sal_uInt32 nActionNumber); + OUString GetChangeID(const sal_uInt32 nActionNumber); void GetAcceptanceState(const ScChangeAction* pAction); void WriteBigRange(const ScBigRange& rBigRange, xmloff::token::XMLTokenEnum aName); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index c38b9cf3282c..6caf7b05c81d 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -233,7 +233,7 @@ void ScXMLChangeTrackingImportHelper::StartChangeAction(const ScChangeActionType } } -sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const rtl::OUString& sID) +sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const OUString& sID) { sal_uInt32 nResult(0); sal_uInt32 nLength(sID.getLength()); @@ -241,7 +241,7 @@ sal_uInt32 ScXMLChangeTrackingImportHelper::GetIDFromString(const rtl::OUString& { if (sID.compareTo(sIDPrefix, nPrefixLength) == 0) { - rtl::OUString sValue(sID.copy(nPrefixLength, nLength - nPrefixLength)); + OUString sValue(sID.copy(nPrefixLength, nLength - nPrefixLength)); sal_Int32 nValue; ::sax::Converter::convertNumber(nValue, sValue); OSL_ENSURE(nValue > 0, "wrong change action ID"); @@ -436,8 +436,8 @@ void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, S if ( aInfo.aDateTime.HundredthSeconds ) pTrack->SetTime100thSeconds( true ); - const std::set& rUsers = pTrack->GetUserCollection(); - std::set::const_iterator it = rUsers.find(aInfo.sUser); + const std::set& rUsers = pTrack->GetUserCollection(); + std::set::const_iterator it = rUsers.find(aInfo.sUser); if (it != rUsers.end()) { // It's probably pointless to do this. @@ -745,7 +745,7 @@ void ScXMLChangeTrackingImportHelper::SetNewCell(ScMyContentAction* pAction) else { sal_uInt8 nMatrixFlag = aCell.mpFormula->GetMatrixFlag(); - rtl::OUString sFormula; + OUString sFormula; // With GRAM_ODFF reference detection is faster on compilation. /* FIXME: new cell should be created with a clone * of the token array instead. Any reason why this @@ -755,7 +755,7 @@ void ScXMLChangeTrackingImportHelper::SetNewCell(ScMyContentAction* pAction) // #i87826# [Collaboration] Rejected move destroys formulas // FIXME: adjust ScFormulaCell::GetFormula(), so that the right formula string // is returned and no further string handling is necessary - rtl::OUString sFormula2; + OUString sFormula2; if ( nMatrixFlag != MM_NONE ) { sFormula2 = sFormula.copy( 2, sFormula.getLength() - 3 ); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index fe7b167ed439..ea565c5a96f0 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -29,16 +29,16 @@ class DateTime; struct ScMyActionInfo { - rtl::OUString sUser; - rtl::OUString sComment; + OUString sUser; + OUString sComment; com::sun::star::util::DateTime aDateTime; }; struct ScMyCellInfo { ScCellValue maCell; - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; + OUString sFormulaAddress; + OUString sFormula; String sInputString; double fValue; sal_Int32 nMatrixCols; @@ -172,13 +172,13 @@ typedef std::list ScMyActions; class ScXMLChangeTrackingImportHelper { - std::set aUsers; + std::set aUsers; ScMyActions aActions; com::sun::star::uno::Sequence aProtect; ScDocument* pDoc; ScChangeTrack* pTrack; ScMyBaseAction* pCurrentAction; - rtl::OUString sIDPrefix; + OUString sIDPrefix; sal_uInt32 nPrefixLength; sal_Int16 nMultiSpanned; sal_Int16 nMultiSpannedSlaveCount; @@ -202,7 +202,7 @@ public: void SetProtection(const com::sun::star::uno::Sequence& rProtect) { aProtect = rProtect; } void StartChangeAction(const ScChangeActionType nActionType); - sal_uInt32 GetIDFromString(const rtl::OUString& sID); + sal_uInt32 GetIDFromString(const OUString& sID); void SetActionNumber(const sal_uInt32 nActionNumber) { pCurrentAction->nActionNumber = nActionNumber; } void SetActionState(const ScChangeActionState nActionState) { pCurrentAction->nActionState = nActionState; } diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 790e2f6251e0..6493219cd46e 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -22,7 +22,6 @@ using namespace com::sun::star; -using ::rtl::OUString; sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeName ) { @@ -67,7 +66,7 @@ XMLCodeNameProvider::~XMLCodeNameProvider() return !mpDoc->GetCodeName().isEmpty(); SCTAB nCount = mpDoc->GetTableCount(); - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { if( mpDoc->GetName( i, sSheetName ) && sSheetName.equals(aName) ) @@ -96,7 +95,7 @@ uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName ) } SCTAB nCount = mpDoc->GetTableCount(); - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { if( mpDoc->GetName( i, sSheetName ) && sSheetName.equals(aName) ) @@ -121,7 +120,7 @@ uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames( ) if( !mpDoc->GetCodeName().isEmpty() ) aNames[nRealCount++] = msDocName; - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { mpDoc->GetCodeName( i, sCodeName ); @@ -151,7 +150,7 @@ uno::Type SAL_CALL XMLCodeNameProvider::getElementType( ) return sal_True; SCTAB nCount = mpDoc->GetTableCount(); - rtl::OUString sSheetName, sCodeName; + OUString sSheetName, sCodeName; for( SCTAB i = 0; i < nCount; i++ ) { mpDoc->GetCodeName( i, sCodeName ); @@ -175,7 +174,7 @@ void XMLCodeNameProvider::set( const uno::Reference< container::XNameAccess>& xN } SCTAB nCount = pDoc->GetTableCount(); - rtl::OUString sSheetName; + OUString sSheetName; for( SCTAB i = 0; i < nCount; i++ ) { if( pDoc->GetName( i, sSheetName ) && diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 5d925f2b7fdc..9f8eb2d508af 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -29,8 +29,8 @@ class String; class XMLCodeNameProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XNameAccess > { ScDocument* mpDoc; - ::rtl::OUString msDocName; - ::rtl::OUString msCodeNameProp; + OUString msDocName; + OUString msCodeNameProp; static sal_Bool _getCodeName( const ::com::sun::star::uno::Any& aAny, String& rCodeName ); @@ -39,15 +39,15 @@ public: XMLCodeNameProvider( ScDocument* pDoc ); virtual ~XMLCodeNameProvider(); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx index 28f130147ca6..23c597020f8b 100644 --- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx +++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx @@ -41,7 +41,7 @@ class ScXMLExport; class ScMyOpenCloseColumnRowGroup { ScXMLExport& rExport; - const rtl::OUString rName; + const OUString rName; ScMyColumnRowGroupVec aTableStart; ScMyFieldGroupVec aTableEnd; diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index 55d3cf852c5d..3cf06b1f063c 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -29,7 +29,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace xmloff::token; @@ -54,8 +53,8 @@ ScXMLConsolidationContext::ScXMLConsolidationContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index 7b986880cd7c..be1e376dae8e 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -32,8 +32,8 @@ class ScXMLImport; class ScXMLConsolidationContext : public SvXMLImportContext { private: - ::rtl::OUString sSourceList; - ::rtl::OUString sUseLabel; + OUString sSourceList; + OUString sUseLabel; ScAddress aTargetAddr; ScSubTotalFunc eFunction; bool bLinkToSource; @@ -47,14 +47,14 @@ public: ScXMLConsolidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~ScXMLConsolidationContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 751ab1ba7375..a705c0a55d0f 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -30,8 +30,6 @@ #include "document.hxx" #include "ftools.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace xmloff::token; @@ -336,7 +334,7 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) //_____________________________________________________________________ -void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate) +void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate) { util::DateTime aAPIDateTime; ConvertCoreToAPIDateTime(aDateTime, aAPIDateTime); diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index db7a53487653..d8c9ff5b6c79 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -50,55 +50,55 @@ public: // IMPORT: GeneralFunction / ScSubTotalFunc static ::com::sun::star::sheet::GeneralFunction GetFunctionFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); static ScSubTotalFunc GetSubTotalFuncFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); // EXPORT: GeneralFunction / ScSubTotalFunc static void GetStringFromFunction( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::sheet::GeneralFunction eFunction, bool bAppendStr = false ); static void GetStringFromFunction( - ::rtl::OUString& rString, + OUString& rString, const ScSubTotalFunc eFunction, bool bAppendStr = false ); // IMPORT: DataPilotFieldOrientation static ::com::sun::star::sheet::DataPilotFieldOrientation GetOrientationFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); // EXPORT: DataPilotFieldOrientation static void GetStringFromOrientation( - ::rtl::OUString& rString, + OUString& rString, const ::com::sun::star::sheet::DataPilotFieldOrientation eOrientation, bool bAppendStr = false ); // IMPORT: Detective static ScDetectiveObjType GetDetObjTypeFromString( - const ::rtl::OUString& rString ); + const OUString& rString ); static bool GetDetOpTypeFromString( ScDetOpType& rDetOpType, - const ::rtl::OUString& rString ); + const OUString& rString ); // EXPORT: Detective static void GetStringFromDetObjType( - ::rtl::OUString& rString, + OUString& rString, const ScDetectiveObjType eObjType, bool bAppendStr = false ); static void GetStringFromDetOpType( - ::rtl::OUString& rString, + OUString& rString, const ScDetOpType eOpType, bool bAppendStr = false ); // IMPORT: Formulas static void ParseFormula( - ::rtl::OUString& sFormula, + OUString& sFormula, const bool bIsFormula = sal_True); // EXPORT: Core Date Time - static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate); + static void ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate); static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); static void ConvertAPIToCoreDateTime(const com::sun::star::util::DateTime& aDateTime, DateTime& rDateTime); @@ -136,8 +136,8 @@ struct ScXMLConditionParseResult meValidation; /// A data validation type if existing. ::com::sun::star::sheet::ConditionOperator meOperator; /// A comparison operator if existing. - ::rtl::OUString maOperand1; /// First operand of the token or comparison value. - ::rtl::OUString maOperand2; /// Second operand of 'between' conditions. + OUString maOperand1; /// First operand of the token or comparison value. + OUString maOperand2; /// Second operand of 'between' conditions. sal_Int32 mnEndIndex; /// Index of first character following the condition. }; @@ -151,10 +151,10 @@ public: */ static void parseCondition( ScXMLConditionParseResult& rParseResult, - const ::rtl::OUString& rAttribute, + const OUString& rAttribute, sal_Int32 nStartIndex ); - static rtl::OUString getExpression(const sal_Unicode*& rpcString, const sal_Unicode* pcEnd, sal_Unicode cEndChar ); + static OUString getExpression(const sal_Unicode*& rpcString, const sal_Unicode* pcEnd, sal_Unicode cEndChar ); private: ScXMLConditionHelper(); diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 0ff562a58aa3..184de3b502c1 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -28,15 +28,13 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using rtl::OUString; //------------------------------------------------------------------ ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -51,7 +49,7 @@ ScXMLDDELinksContext::~ScXMLDDELinksContext() } SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -72,7 +70,7 @@ void ScXMLDDELinksContext::EndElement() ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -94,7 +92,7 @@ ScXMLDDELinkContext::~ScXMLDDELinkContext() } SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -195,7 +193,7 @@ void ScXMLDDELinkContext::EndElement() ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -208,8 +206,8 @@ ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -239,7 +237,7 @@ ScXMLDDESourceContext::~ScXMLDDESourceContext() } SvXMLImportContext *ScXMLDDESourceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -255,7 +253,7 @@ void ScXMLDDESourceContext::EndElement() ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDDELinkContext* pTempDDELink) : @@ -270,7 +268,7 @@ ScXMLDDETableContext::~ScXMLDDETableContext() } SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -296,7 +294,7 @@ void ScXMLDDETableContext::EndElement() ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -310,8 +308,8 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -329,7 +327,7 @@ ScXMLDDEColumnContext::~ScXMLDDEColumnContext() } SvXMLImportContext *ScXMLDDEColumnContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -344,7 +342,7 @@ void ScXMLDDEColumnContext::EndElement() ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -358,8 +356,8 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -377,7 +375,7 @@ ScXMLDDERowContext::~ScXMLDDERowContext() } SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -400,7 +398,7 @@ void ScXMLDDERowContext::EndElement() ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -419,8 +417,8 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sTempValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sTempValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -461,7 +459,7 @@ ScXMLDDECellContext::~ScXMLDDECellContext() } SvXMLImportContext *ScXMLDDECellContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index c12f349978ee..87d25aab9a9f 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -32,14 +32,14 @@ class ScXMLDDELinksContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDDELinksContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -48,7 +48,7 @@ public: struct ScDDELinkCell { - rtl::OUString sValue; + OUString sValue; double fValue; bool bString; bool bEmpty; @@ -60,9 +60,9 @@ class ScXMLDDELinkContext : public SvXMLImportContext { ScDDELinkCells aDDELinkTable; ScDDELinkCells aDDELinkRow; - rtl::OUString sApplication; - rtl::OUString sTopic; - rtl::OUString sItem; + OUString sApplication; + OUString sTopic; + OUString sItem; sal_Int32 nPosition; sal_Int32 nColumns; sal_Int32 nRows; @@ -72,20 +72,20 @@ class ScXMLDDELinkContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDDELinkContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - void SetApplication(const rtl::OUString& sValue) { sApplication = sValue; } - void SetTopic(const rtl::OUString& sValue) { sTopic = sValue; } - void SetItem(const rtl::OUString& sValue) { sItem = sValue; } + void SetApplication(const OUString& sValue) { sApplication = sValue; } + void SetTopic(const OUString& sValue) { sTopic = sValue; } + void SetItem(const OUString& sValue) { sItem = sValue; } void SetMode(const sal_uInt8 nValue) { nMode = nValue; } void CreateDDELink(); void AddColumns(const sal_Int32 nValue) { nColumns += nValue; } @@ -104,7 +104,7 @@ class ScXMLDDESourceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -112,7 +112,7 @@ public: virtual ~ScXMLDDESourceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -127,7 +127,7 @@ class ScXMLDDETableContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -135,7 +135,7 @@ public: virtual ~ScXMLDDETableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -150,7 +150,7 @@ class ScXMLDDEColumnContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -158,7 +158,7 @@ public: virtual ~ScXMLDDEColumnContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -174,7 +174,7 @@ class ScXMLDDERowContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -182,7 +182,7 @@ public: virtual ~ScXMLDDERowContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -191,7 +191,7 @@ public: class ScXMLDDECellContext : public SvXMLImportContext { - rtl::OUString sValue; + OUString sValue; double fValue; sal_Int32 nCells; bool bString; @@ -204,7 +204,7 @@ class ScXMLDDECellContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -212,7 +212,7 @@ public: virtual ~ScXMLDDECellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index 41f2c298bbdf..5e88e781fbb1 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.cxx @@ -33,7 +33,6 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace xmloff::token; @@ -134,8 +133,8 @@ ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); @@ -213,8 +212,8 @@ ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index cf941ac161c4..9925a1362429 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -89,14 +89,14 @@ public: ScXMLDetectiveContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); virtual ~ScXMLDetectiveContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -119,7 +119,7 @@ public: ScXMLDetectiveHighlightedContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); @@ -127,7 +127,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -149,14 +149,14 @@ public: ScXMLDetectiveOperationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~ScXMLDetectiveOperationContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index ff58de3e3962..9bbd5ee97ff4 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.cxx @@ -24,7 +24,7 @@ ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName) : + const OUString& rLName) : SvXMLImportContext( rImport, nPrfx, rLName ) { } @@ -34,7 +34,7 @@ ScXMLEmptyContext::~ScXMLEmptyContext() } SvXMLImportContext *ScXMLEmptyContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index e050a4f14d44..71092a2492ba 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -25,7 +25,7 @@ class ScXMLImport; class ScXMLEmptyContext : public SvXMLImportContext { - rtl::OUString sPrintRanges; + OUString sPrintRanges; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -33,12 +33,12 @@ class ScXMLEmptyContext : public SvXMLImportContext public: ScXMLEmptyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName); + const OUString& rLName); virtual ~ScXMLEmptyContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx index 2ac6f554d765..1b1626dc95c8 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.cxx +++ b/sc/source/filter/xml/XMLExportDDELinks.cxx @@ -32,7 +32,6 @@ class ScMatrix; using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUStringBuffer; ScXMLExportDDELinks::ScXMLExportDDELinks(ScXMLExport& rTempExport) : rExport(rTempExport) @@ -123,7 +122,7 @@ void ScXMLExportDDELinks::WriteDDELinks(uno::Reference xPropertySet (xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Reference xIndex(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DDELINKS))), uno::UNO_QUERY); + uno::Reference xIndex(xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DDELINKS))), uno::UNO_QUERY); if (xIndex.is()) { sal_Int32 nCount = xIndex->getCount(); diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index a89a4827314d..7d7030af8c9f 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -54,7 +54,6 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; ScXMLExportDataPilot::ScXMLExportDataPilot(ScXMLExport& rTempExport) : rExport(rTempExport), @@ -66,7 +65,7 @@ ScXMLExportDataPilot::~ScXMLExportDataPilot() { } -rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( +OUString ScXMLExportDataPilot::getDPOperatorXML( const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const { switch (aFilterOperator) @@ -76,27 +75,27 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( if (bUseRegularExpressions) return GetXMLToken(XML_MATCH); else - return rtl::OUString("="); + return OUString("="); } case SC_NOT_EQUAL : { if (bUseRegularExpressions) return GetXMLToken(XML_NOMATCH); else - return rtl::OUString("!="); + return OUString("!="); } case SC_BOTPERC : return GetXMLToken(XML_BOTTOM_PERCENT); case SC_BOTVAL : return GetXMLToken(XML_BOTTOM_VALUES); case SC_GREATER : - return rtl::OUString(">"); + return OUString(">"); case SC_GREATER_EQUAL : - return rtl::OUString(">="); + return OUString(">="); case SC_LESS : - return rtl::OUString("<"); + return OUString("<"); case SC_LESS_EQUAL : - return rtl::OUString("<="); + return OUString("<="); case SC_TOPPERC : return GetXMLToken(XML_TOP_PERCENT); case SC_TOPVAL : @@ -104,16 +103,16 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( default: OSL_FAIL("This FilterOperator is not supported."); } - return rtl::OUString("="); + return OUString("="); } void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions) { - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, rtl::OUString::valueOf(sal_Int32(aQueryEntry.nField))); + rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(sal_Int32(aQueryEntry.nField))); if (bIsCaseSensitive) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); const ScQueryEntry::Item& rItem = aQueryEntry.GetQueryItem(); - const rtl::OUString& rQueryStr = rItem.maString; + const OUString& rQueryStr = rItem.maString; if (rItem.meType == ScQueryEntry::ByString) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, rQueryStr); @@ -177,7 +176,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) { ScRange aConditionRange(aQueryParam.nCol1, aQueryParam.nRow1, aQueryParam.nTab, aQueryParam.nCol2, aQueryParam.nRow2, aQueryParam.nTab); - rtl::OUString sConditionRange; + OUString sConditionRange; ScRangeStringConverter::GetStringFromRange( sConditionRange, aConditionRange, pDoc, ::formula::FormulaGrammar::CONV_OOO ); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, sConditionRange); } @@ -211,7 +210,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) ScQueryEntry aPrevFilterField(aQueryParam.GetEntry(0)); ScQueryConnect aConnection = aQueryParam.GetEntry(1).eConnect; bool bOpenAndElement; - rtl::OUString aName(rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XML_FILTER_AND))); + OUString aName(rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XML_FILTER_AND))); if (aConnection == SC_AND) { rExport.StartElement( aName, true ); @@ -270,7 +269,7 @@ void ScXMLExportDataPilot::WriteFieldReference(ScDPSaveDimension* pDim) const sheet::DataPilotFieldReference* pRef = pDim->GetReferenceValue(); if (pRef) { - rtl::OUString sValueStr; + OUString sValueStr; switch (pRef->ReferenceType) { case sheet::DataPilotFieldReferenceType::NONE : @@ -314,7 +313,7 @@ void ScXMLExportDataPilot::WriteFieldReference(ScDPSaveDimension* pDim) } else { - sValueStr = rtl::OUString(); + sValueStr = OUString(); switch(pRef->ReferenceItemType) { case sheet::DataPilotFieldReferenceItemType::PREVIOUS : @@ -342,7 +341,7 @@ void ScXMLExportDataPilot::WriteSortInfo(ScDPSaveDimension* pDim) else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORDER, XML_DESCENDING); - rtl::OUString sValueStr; + OUString sValueStr; switch (pSortInfo->Mode) { case sheet::DataPilotFieldSortMode::NONE: @@ -376,7 +375,7 @@ void ScXMLExportDataPilot::WriteAutoShowInfo(ScDPSaveDimension* pDim) else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ENABLED, XML_FALSE); - rtl::OUString sValueStr; + OUString sValueStr; switch (pAutoInfo->ShowItemsMode) { case sheet::DataPilotFieldShowItemsMode::FROM_TOP: @@ -389,7 +388,7 @@ void ScXMLExportDataPilot::WriteAutoShowInfo(ScDPSaveDimension* pDim) if (!sValueStr.isEmpty()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_MEMBER_MODE, sValueStr); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, pAutoInfo->ItemCount); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_MEMBER_COUNT, sBuffer.makeStringAndClear()); @@ -409,7 +408,7 @@ void ScXMLExportDataPilot::WriteLayoutInfo(ScDPSaveDimension* pDim) else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ADD_EMPTY_LINES, XML_FALSE); - rtl::OUString sValueStr; + OUString sValueStr; switch (pLayoutInfo->LayoutMode) { case sheet::DataPilotFieldLayoutMode::TABULAR_LAYOUT: @@ -444,7 +443,7 @@ void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim) rExport.CheckAttrList(); for (sal_Int32 nSubTotal = 0; nSubTotal < nSubTotalCount; nSubTotal++) { - rtl::OUString sFunction; + OUString sFunction; GeneralFunction nFunc = static_cast(pDim->GetSubTotalFunc(nSubTotal)); ScXMLConverter::GetStringFromFunction( sFunction, nFunc); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sFunction); @@ -464,7 +463,7 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim) rExport.CheckAttrList(); for (ScDPSaveDimension::MemberList::const_iterator i=rMembers.begin(); i != rMembers.end() ; ++i) { - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, rtl::OUString((*i)->GetName())); + rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, OUString((*i)->GetName())); if (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) { @@ -474,7 +473,7 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim) rExport.AddAttribute(XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME, *pLayoutName); } - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertBool(sBuffer, (*i)->GetIsVisible()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, sBuffer.makeStringAndClear()); ::sax::Converter::convertBool(sBuffer, (*i)->GetShowDetails()); @@ -490,7 +489,7 @@ void ScXMLExportDataPilot::WriteLevels(ScDPSaveDimension* pDim) // #i114202# GetShowEmpty is only valid if HasShowEmpty is true. if (pDim->HasShowEmpty()) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertBool(sBuffer, pDim->GetShowEmpty()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, sBuffer.makeStringAndClear()); } @@ -555,7 +554,7 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_START, XML_AUTO); else { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; rExport.GetMM100UnitConverter().convertDateTime(sDate, rGroupInfo.mfStart); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_START, sDate.makeStringAndClear()); } @@ -563,7 +562,7 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_END, XML_AUTO); else { - rtl::OUStringBuffer sDate; + OUStringBuffer sDate; rExport.GetMM100UnitConverter().convertDateTime(sDate, rGroupInfo.mfEnd); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_END, sDate.makeStringAndClear()); } @@ -574,7 +573,7 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_START, XML_AUTO); else { - rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStart, + OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStart, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_START, sValue); @@ -583,13 +582,13 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_END, XML_AUTO); else { - rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfEnd, + OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfEnd, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_END, sValue); } } - rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStep, + OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.mfStep, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STEP, sValue); @@ -658,7 +657,7 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const sal_Int32 nElemCount = pGroup->GetElementCount(); for(sal_Int32 j = 0; j < nElemCount; ++j) { - const rtl::OUString* pElem = pGroup->GetElementByIndex(j); + const OUString* pElem = pGroup->GetElementByIndex(j); if (pElem) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, *pElem); @@ -686,14 +685,14 @@ void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDim if (pDim->IsDataLayout()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD, XML_TRUE); - rtl::OUString sValueStr; + OUString sValueStr; ScXMLConverter::GetStringFromOrientation( sValueStr, (sheet::DataPilotFieldOrientation) pDim->GetOrientation() ); if( !sValueStr.isEmpty() ) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORIENTATION, sValueStr ); if (pDim->GetUsedHierarchy() != 1) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, pDim->GetUsedHierarchy()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USED_HIERARCHY, sBuffer.makeStringAndClear()); } @@ -749,14 +748,14 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference GetOutRange()); - rtl::OUString sTargetRangeAddress; + OUString sTargetRangeAddress; ScRangeStringConverter::GetStringFromRange( sTargetRangeAddress, aOutRange, pDoc, ::formula::FormulaGrammar::CONV_OOO ); ScDocAttrIterator aAttrItr(pDoc, aOutRange.aStart.Tab(), aOutRange.aStart.Col(), aOutRange.aStart.Row(), aOutRange.aEnd.Col(), aOutRange.aEnd.Row()); SCCOL nCol; SCROW nRow1, nRow2; - rtl::OUString sOUButtonList; + OUString sOUButtonList; const ScPatternAttr* pAttr = aAttrItr.GetNext(nCol, nRow1, nRow2); while (pAttr) { @@ -772,8 +771,8 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference GetName()); - rtl::OUString sApplicationData((*pDPs)[i]->GetTag()); + OUString sName((*pDPs)[i]->GetName()); + OUString sApplicationData((*pDPs)[i]->GetTag()); bool bRowGrand = pDPSave->GetRowGrand(); bool bColumnGrand = pDPSave->GetColumnGrand(); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, sName); @@ -883,7 +882,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference aParName); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USER_NAME, pServSource->aParUser); // #i111754# leave out password attribute as long as DataPilotSource doesn't specify the content - // rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PASSWORD, rtl::OUString(pServSource->aParPass)); + // rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PASSWORD, OUString(pServSource->aParPass)); SvXMLElementExport aElemSD(rExport, XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, true, true); rExport.CheckAttrList(); } diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index fff2587c126b..6e2acf40b53b 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -41,7 +41,7 @@ class ScXMLExportDataPilot ScXMLExport& rExport; ScDocument* pDoc; - rtl::OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const; + OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const; void WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions); void WriteDPFilter(const ScQueryParam& aQueryParam); @@ -60,7 +60,7 @@ class ScXMLExportDataPilot void WriteDimension(ScDPSaveDimension* pDim, const ScDPDimensionSaveData* pDimData); void WriteDimensions(ScDPSaveData* pDPSave); - void WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient, bool bVisible, const ::rtl::OUString* pGrandTotal); + void WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient, bool bVisible, const OUString* pGrandTotal); public: ScXMLExportDataPilot(ScXMLExport& rExport); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index dade8e0d2144..f83488a8a996 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -54,8 +54,6 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; ScXMLExportDatabaseRanges::ScXMLExportDatabaseRanges(ScXMLExport& rTempExport) : rExport(rTempExport), @@ -75,21 +73,21 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang uno::Reference xPropertySet (rExport.GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Reference xDatabaseRanges(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATABASERNG))), uno::UNO_QUERY); + uno::Reference xDatabaseRanges(xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATABASERNG))), uno::UNO_QUERY); rExport.CheckAttrList(); if (xDatabaseRanges.is()) { - uno::Sequence aRanges(xDatabaseRanges->getElementNames()); + uno::Sequence aRanges(xDatabaseRanges->getElementNames()); sal_Int32 nDatabaseRangesCount = aRanges.getLength(); for (sal_Int32 i = 0; i < nDatabaseRangesCount; ++i) { - rtl::OUString sDatabaseRangeName(aRanges[i]); + OUString sDatabaseRangeName(aRanges[i]); uno::Reference xDatabaseRange(xDatabaseRanges->getByName(sDatabaseRangeName), uno::UNO_QUERY); if (xDatabaseRange.is()) { uno::Reference xDatabaseRangePropertySet (xDatabaseRange, uno::UNO_QUERY); if (xDatabaseRangePropertySet.is() && - ::cppu::any2bool(xDatabaseRangePropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT))))) + ::cppu::any2bool(xDatabaseRangePropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT))))) { uno::Sequence aImportProperties(xDatabaseRange->getImportDescriptor()); sal_Int32 nLength = aImportProperties.getLength(); @@ -400,13 +398,13 @@ private: return OUString("="); } case SC_GREATER: - return rtl::OUString(">"); + return OUString(">"); case SC_GREATER_EQUAL: - return rtl::OUString(">="); + return OUString(">="); case SC_LESS: - return rtl::OUString("<"); + return OUString("<"); case SC_LESS_EQUAL: - return rtl::OUString("<="); + return OUString("<="); case SC_NOT_EQUAL: if (bRegExp) return GetXMLToken(XML_NOMATCH); @@ -658,7 +656,7 @@ private: break; sal_Int32 nFieldCol = static_cast(aParam.nField[i]); - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, rtl::OUString::valueOf(nFieldCol)); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, OUString::valueOf(nFieldCol)); SvXMLElementExport aElemSTR(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, true, true); for (SCCOL j = 0, n = aParam.nSubTotals[i]; j < n; ++j) diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 4a593fff5fe5..c5a7451388a2 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -33,7 +33,6 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star; //============================================================================== diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 3d13403b7835..4a18f68be675 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -154,10 +154,10 @@ public: struct ScMyAreaLink { - ::rtl::OUString sFilter; - ::rtl::OUString sFilterOptions; - ::rtl::OUString sURL; - ::rtl::OUString sSourceStr; + OUString sFilter; + OUString sFilterOptions; + OUString sURL; + OUString sSourceStr; ::com::sun::star::table::CellRangeAddress aDestRange; sal_Int32 nRefresh; @@ -297,8 +297,8 @@ struct ScMyCell com::sun::star::table::CellRangeAddress aMergeRange; com::sun::star::table::CellRangeAddress aMatrixRange; - rtl::OUString sStringValue; - rtl::OUString sAnnotationText; + OUString sStringValue; + OUString sAnnotationText; ScMyAreaLink aAreaLink; ScMyShapeList aShapeList; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index c8a1e084a80f..4f7a9375b965 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -113,13 +113,13 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, uno::Reference xPropertySet(aTempAny, uno::UNO_QUERY); if (xPropertySet.is()) { - rtl::OUString sErrorMessage; + OUString sErrorMessage; xPropertySet->getPropertyValue(sERRMESS) >>= sErrorMessage; - rtl::OUString sErrorTitle; + OUString sErrorTitle; xPropertySet->getPropertyValue(sERRTITLE) >>= sErrorTitle; - rtl::OUString sImputMessage; + OUString sImputMessage; xPropertySet->getPropertyValue(sINPMESS) >>= sImputMessage; - rtl::OUString sImputTitle; + OUString sImputTitle; xPropertySet->getPropertyValue(sINPTITLE) >>= sImputTitle; bool bShowErrorMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWERR)); bool bShowImputMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWINP)); @@ -162,8 +162,8 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, else { sal_Int32 nNameIndex(nCount + 1); - rtl::OUString sCount(rtl::OUString::valueOf(nNameIndex)); - rtl::OUString sPrefix("val"); + OUString sCount(OUString::valueOf(nNameIndex)); + OUString sPrefix("val"); aValidation.sName += sPrefix; aValidation.sName += sCount; aValidationVec.push_back(aValidation); @@ -175,39 +175,39 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, return bAdded; } -rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation) +OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation) { /* ATTENTION! Should the condition to not write sheet::ValidationType_ANY * ever be changed, adapt the conditional call of * MarkUsedExternalReferences() in * ScTableValidationObj::ScTableValidationObj() accordingly! */ - rtl::OUString sCondition; + OUString sCondition; if (aValidation.aValidationType != sheet::ValidationType_ANY) { switch (aValidation.aValidationType) { //case sheet::ValidationType_CUSTOM case sheet::ValidationType_DATE : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-date()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-date()")); break; case sheet::ValidationType_DECIMAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()")); break; case sheet::ValidationType_LIST : - sCondition += rtl::OUString("cell-content-is-in-list("); + sCondition += OUString("cell-content-is-in-list("); sCondition += aValidation.sFormula1; - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); break; case sheet::ValidationType_TEXT_LEN : if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN && aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length()")); break; case sheet::ValidationType_TIME : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-time()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-time()")); break; case sheet::ValidationType_WHOLE : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-whole-number()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-whole-number()")); break; default: { @@ -221,31 +221,31 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const !aValidation.sFormula2.isEmpty()))) { if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN) - sCondition += rtl::OUString(" and "); + sCondition += OUString(" and "); if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN && aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) { if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); switch (aValidation.aOperator) { case sheet::ConditionOperator_EQUAL : - sCondition += rtl::OUString("="); + sCondition += OUString("="); break; case sheet::ConditionOperator_GREATER : - sCondition += rtl::OUString(">"); + sCondition += OUString(">"); break; case sheet::ConditionOperator_GREATER_EQUAL : - sCondition += rtl::OUString(">="); + sCondition += OUString(">="); break; case sheet::ConditionOperator_LESS : - sCondition += rtl::OUString("<"); + sCondition += OUString("<"); break; case sheet::ConditionOperator_LESS_EQUAL : - sCondition += rtl::OUString("<="); + sCondition += OUString("<="); break; case sheet::ConditionOperator_NOT_EQUAL : - sCondition += rtl::OUString("!="); + sCondition += OUString("!="); break; default: { @@ -259,26 +259,26 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN) { if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN) - sCondition += rtl::OUString("cell-content-text-length-is-between("); + sCondition += OUString("cell-content-text-length-is-between("); else - sCondition += rtl::OUString("cell-content-text-length-is-not-between("); + sCondition += OUString("cell-content-text-length-is-not-between("); } else { if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN) - sCondition += rtl::OUString("cell-content-is-between("); + sCondition += OUString("cell-content-is-between("); else - sCondition += rtl::OUString("cell-content-is-not-between("); + sCondition += OUString("cell-content-is-not-between("); } sCondition += aValidation.sFormula1; - sCondition += rtl::OUString(","); + sCondition += OUString(","); sCondition += aValidation.sFormula2; - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } } else if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN) - sCondition = rtl::OUString(); + sCondition = OUString(); } if (!sCondition.isEmpty()) { @@ -290,15 +290,15 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const return sCondition; } -rtl::OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell) +OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell) { - rtl::OUString sAddress; + OUString sAddress; ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ::formula::FormulaGrammar::CONV_OOO ); return sAddress; } void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, - const rtl::OUString& sTitle, const rtl::OUString& sOUMessage, + const OUString& sTitle, const OUString& sOUMessage, const bool bShowMessage, const bool bIsHelpMessage) { if (!sTitle.isEmpty()) @@ -315,8 +315,8 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, if (!sOUMessage.isEmpty()) { sal_Int32 i(0); - rtl::OUStringBuffer sTemp; - rtl::OUString sText(convertLineEnd(sOUMessage, LINEEND_LF)); + OUStringBuffer sTemp; + OUString sText(convertLineEnd(sOUMessage, LINEEND_LF)); bool bPrevCharWasSpace(true); while(i < sText.getLength()) { @@ -349,7 +349,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) while (aItr != aEndItr) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, aItr->sName); - rtl::OUString sCondition(GetCondition(rExport, *aItr)); + OUString sCondition(GetCondition(rExport, *aItr)); if (!sCondition.isEmpty()) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION, sCondition); @@ -444,7 +444,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) } } -const rtl::OUString& ScMyValidationsContainer::GetValidationName(const sal_Int32 nIndex) +const OUString& ScMyValidationsContainer::GetValidationName(const sal_Int32 nIndex) { OSL_ENSURE( static_cast(nIndex) < aValidationVec.size(), "out of range" ); return aValidationVec[nIndex].sName; @@ -862,7 +862,7 @@ void ScFormatRangeStyles::AddNewTable(const sal_Int32 nTable) } } -bool ScFormatRangeStyles::AddStyleName(rtl::OUString* rpString, sal_Int32& rIndex, const bool bIsAutoStyle) +bool ScFormatRangeStyles::AddStyleName(OUString* rpString, sal_Int32& rIndex, const bool bIsAutoStyle) { if (bIsAutoStyle) { @@ -896,10 +896,10 @@ bool ScFormatRangeStyles::AddStyleName(rtl::OUString* rpString, sal_Int32& rInde } } -sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix, bool& bIsAutoStyle) +sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix, bool& bIsAutoStyle) { sal_Int32 nPrefixLength(rPrefix.getLength()); - rtl::OUString sTemp(rString.copy(nPrefixLength)); + OUString sTemp(rString.copy(nPrefixLength)); sal_Int32 nIndex(sTemp.toInt32()); if (nIndex > 0 && static_cast(nIndex-1) < aAutoStyleNames.size() && aAutoStyleNames.at(nIndex - 1)->equals(rString)) { @@ -1101,7 +1101,7 @@ void ScFormatRangeStyles::AddRangeStyleName(const table::CellRangeAddress aCellR pFormatRanges->push_back(aFormatRange); } -rtl::OUString* ScFormatRangeStyles::GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle) +OUString* ScFormatRangeStyles::GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle) { if (bIsAutoStyle) return aAutoStyleNames[nIndex]; @@ -1135,16 +1135,16 @@ ScColumnRowStylesBase::~ScColumnRowStylesBase() } } -sal_Int32 ScColumnRowStylesBase::AddStyleName(rtl::OUString* pString) +sal_Int32 ScColumnRowStylesBase::AddStyleName(OUString* pString) { aStyleNames.push_back(pString); return aStyleNames.size() - 1; } -sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix) +sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix) { sal_Int32 nPrefixLength(rPrefix.getLength()); - rtl::OUString sTemp(rString.copy(nPrefixLength)); + OUString sTemp(rString.copy(nPrefixLength)); sal_Int32 nIndex(sTemp.toInt32()); if (nIndex > 0 && static_cast(nIndex-1) < aStyleNames.size() && aStyleNames.at(nIndex - 1)->equals(rString)) return nIndex - 1; @@ -1166,7 +1166,7 @@ sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const rtl::OUString& rStrin } } -rtl::OUString* ScColumnRowStylesBase::GetStyleNameByIndex(const sal_Int32 nIndex) +OUString* ScColumnRowStylesBase::GetStyleNameByIndex(const sal_Int32 nIndex) { if ( nIndex < 0 || nIndex >= sal::static_int_cast( aStyleNames.size() ) ) { @@ -1230,7 +1230,7 @@ void ScColumnStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 n aTables[nTable][nField] = aStyle; } -rtl::OUString* ScColumnStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) +OUString* ScColumnStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) { bool bTemp; return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField, bTemp)); @@ -1310,7 +1310,7 @@ void ScRowStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nSta r.insert_back(nStartField, nEndField+1, nStringIndex); } -rtl::OUString* ScRowStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) +OUString* ScRowStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) { return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField)); } diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 2159c846d966..1a841a461784 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -37,13 +37,13 @@ class ScXMLExport; struct ScMyValidation { - rtl::OUString sName; - rtl::OUString sErrorMessage; - rtl::OUString sErrorTitle; - rtl::OUString sImputMessage; - rtl::OUString sImputTitle; - rtl::OUString sFormula1; - rtl::OUString sFormula2; + OUString sName; + OUString sErrorMessage; + OUString sErrorTitle; + OUString sImputMessage; + OUString sImputTitle; + OUString sFormula1; + OUString sFormula2; com::sun::star::table::CellAddress aBaseCell; com::sun::star::sheet::ValidationAlertStyle aAlertStyle; com::sun::star::sheet::ValidationType aValidationType; @@ -65,36 +65,36 @@ class ScMyValidationsContainer { private: ScMyValidationVec aValidationVec; - const rtl::OUString sEmptyString; - const rtl::OUString sERRALSTY; - const rtl::OUString sIGNOREBL; - const rtl::OUString sSHOWLIST; - const rtl::OUString sTYPE; - const rtl::OUString sSHOWINP; - const rtl::OUString sSHOWERR; - const rtl::OUString sINPTITLE; - const rtl::OUString sINPMESS; - const rtl::OUString sERRTITLE; - const rtl::OUString sERRMESS; - const rtl::OUString sOnError; - const rtl::OUString sEventType; - const rtl::OUString sStarBasic; - const rtl::OUString sScript; - const rtl::OUString sLibrary; - const rtl::OUString sMacroName; + const OUString sEmptyString; + const OUString sERRALSTY; + const OUString sIGNOREBL; + const OUString sSHOWLIST; + const OUString sTYPE; + const OUString sSHOWINP; + const OUString sSHOWERR; + const OUString sINPTITLE; + const OUString sINPMESS; + const OUString sERRTITLE; + const OUString sERRMESS; + const OUString sOnError; + const OUString sEventType; + const OUString sStarBasic; + const OUString sScript; + const OUString sLibrary; + const OUString sMacroName; public: ScMyValidationsContainer(); ~ScMyValidationsContainer(); bool AddValidation(const com::sun::star::uno::Any& aAny, sal_Int32& nValidationIndex); - rtl::OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); - rtl::OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); + OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); + OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); void WriteMessage(ScXMLExport& rExport, - const rtl::OUString& sTitle, const rtl::OUString& sMessage, + const OUString& sTitle, const OUString& sMessage, const bool bShowMessage, const bool bIsHelpMessage); void WriteValidations(ScXMLExport& rExport); - const rtl::OUString& GetValidationName(const sal_Int32 nIndex); + const OUString& GetValidationName(const sal_Int32 nIndex); }; //============================================================================== @@ -174,7 +174,7 @@ public: void Sort(); }; -typedef std::vector ScMyOUStringVec; +typedef std::vector ScMyOUStringVec; struct ScMyFormatRange { @@ -206,8 +206,8 @@ public: void SetRowDefaults(const ScMyDefaultStyleList* pDefaults) { pRowDefaults = pDefaults; } void SetColDefaults(const ScMyDefaultStyleList* pDefaults) { pColDefaults = pDefaults; } void AddNewTable(const sal_Int32 nTable); - bool AddStyleName(rtl::OUString* pString, sal_Int32& rIndex, const bool bIsAutoStyle = true); - sal_Int32 GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix, bool& bIsAutoStyle); + bool AddStyleName(OUString* pString, sal_Int32& rIndex, const bool bIsAutoStyle = true); + sal_Int32 GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix, bool& bIsAutoStyle); // does not delete ranges sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nColumn, const sal_Int32 nRow, bool& bIsAutoStyle) const; @@ -218,7 +218,7 @@ public: const sal_Int32 nTable, ScRowFormatRanges* pFormatRanges); void AddRangeStyleName(const com::sun::star::table::CellRangeAddress aCellRangeAddress, const sal_Int32 nStringIndex, const bool bIsAutoStyle, const sal_Int32 nValidationIndex, const sal_Int32 nNumberFormat); - rtl::OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle); + OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle); void Sort(); }; @@ -231,10 +231,10 @@ public: virtual ~ScColumnRowStylesBase(); virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) = 0; - sal_Int32 AddStyleName(rtl::OUString* pString); - sal_Int32 GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix); - virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) = 0; - rtl::OUString* GetStyleNameByIndex(const sal_Int32 nIndex); + sal_Int32 AddStyleName(OUString* pString); + sal_Int32 GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) = 0; + OUString* GetStyleNameByIndex(const sal_Int32 nIndex); }; struct ScColumnStyle @@ -259,7 +259,7 @@ public: sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField, bool& bIsVisible); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex, const bool bIsVisible); - virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); }; class ScRowStyles : public ScColumnRowStylesBase @@ -286,7 +286,7 @@ public: sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nStartField, const sal_Int32 nStringIndex, const sal_Int32 nEndField); - virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); }; #endif diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index c725de154671..3b5d5cf76556 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -24,12 +24,12 @@ using namespace com::sun::star; using ::std::list; -void ScMyStyleNumberFormats::AddStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nNumberFormat) +void ScMyStyleNumberFormats::AddStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nNumberFormat) { aSet.insert(ScMyStyleNumberFormat(rStyleName, nNumberFormat)); } -sal_Int32 ScMyStyleNumberFormats::GetStyleNumberFormat(const rtl::OUString& rStyleName) +sal_Int32 ScMyStyleNumberFormats::GetStyleNumberFormat(const OUString& rStyleName) { ScMyStyleNumberFormat aStyleNumberFormat(rStyleName); ScMyStyleNumberFormatSet::iterator aItr(aSet.find(aStyleNumberFormat)); @@ -110,7 +110,7 @@ void ScMyStyleRanges::AddRange(const ScRange& rRange, const sal_Int16 nType) } } -void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange, const rtl::OUString* pCurrency) +void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange, const OUString* pCurrency) { if (!pCurrencyList) pCurrencyList = new ScMyCurrencyStylesSet(); @@ -161,15 +161,15 @@ void ScMyStyleRanges::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDo } void ScMyStyleRanges::SetStylesToRanges(const list& rRanges, - const rtl::OUString* pStyleName, const sal_Int16 nCellType, - const rtl::OUString* pCurrency, ScXMLImport& rImport) + const OUString* pStyleName, const sal_Int16 nCellType, + const OUString* pCurrency, ScXMLImport& rImport) { list::const_iterator itr = rRanges.begin(), itrEnd = rRanges.end(); for (; itr != itrEnd; ++itr) rImport.SetStyleToRange(*itr, pStyleName, nCellType, pCurrency); } -void ScMyStyleRanges::SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport) +void ScMyStyleRanges::SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport) { if (mpNumberList) { @@ -268,7 +268,7 @@ void ScMyStylesImportHelper::ResetAttributes() nCellType = 0; } -ScMyStylesSet::iterator ScMyStylesImportHelper::GetIterator(const rtl::OUString* pStyleNameP) +ScMyStylesSet::iterator ScMyStylesImportHelper::GetIterator(const OUString* pStyleNameP) { ScMyStyle aStyle; if (pStyleNameP) @@ -312,7 +312,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) aRange.aStart.SetCol(nStartCol); aRange.aEnd.SetCol(i - 1); delete pPrevStyleName; - pPrevStyleName = new rtl::OUString(aPrevItr->sStyleName); + pPrevStyleName = new OUString(aPrevItr->sStyleName); AddSingleRange(aRange); nStartCol = i; aPrevItr = aColDefaultStyles[i]; @@ -323,7 +323,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) ScRange aRange(rRange); aRange.aStart.SetCol(nStartCol); delete pPrevStyleName; - pPrevStyleName = new rtl::OUString(aPrevItr->sStyleName); + pPrevStyleName = new OUString(aPrevItr->sStyleName); AddSingleRange(aRange); } else @@ -339,7 +339,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) else { delete pPrevStyleName; - pPrevStyleName = new rtl::OUString(aRowDefaultStyle->sStyleName); + pPrevStyleName = new OUString(aRowDefaultStyle->sStyleName); AddSingleRange(rRange); } } @@ -365,7 +365,7 @@ void ScMyStylesImportHelper::AddRange() ResetAttributes(); } -void ScMyStylesImportHelper::AddColumnStyle(const rtl::OUString& sStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat) +void ScMyStylesImportHelper::AddColumnStyle(const OUString& sStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat) { (void)nColumn; // avoid warning in product version OSL_ENSURE(static_cast(nColumn) == aColDefaultStyles.size(), "some columns are absent"); @@ -376,13 +376,13 @@ void ScMyStylesImportHelper::AddColumnStyle(const rtl::OUString& sStyleName, con aColDefaultStyles.push_back(aItr); } -void ScMyStylesImportHelper::SetRowStyle(const rtl::OUString& sStyleName) +void ScMyStylesImportHelper::SetRowStyle(const OUString& sStyleName) { aRowDefaultStyle = GetIterator(&sStyleName); } -void ScMyStylesImportHelper::SetAttributes(rtl::OUString* pStyleNameP, - rtl::OUString* pCurrencyP, const sal_Int16 nCellTypeP) +void ScMyStylesImportHelper::SetAttributes(OUString* pStyleNameP, + OUString* pCurrencyP, const sal_Int16 nCellTypeP) { delete this->pStyleName; delete this->pCurrency; diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index 29edfcb58754..5b99fea15544 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -33,13 +33,13 @@ class ScXMLImport; struct ScMyStyleNumberFormat { - rtl::OUString sStyleName; + OUString sStyleName; sal_Int32 nNumberFormat; ScMyStyleNumberFormat() : nNumberFormat(-1) {} - ScMyStyleNumberFormat(const rtl::OUString& rStyleName) : + ScMyStyleNumberFormat(const OUString& rStyleName) : sStyleName(rStyleName), nNumberFormat(-1) {} - ScMyStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nFormat) : + ScMyStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nFormat) : sStyleName(rStyleName), nNumberFormat(nFormat) {} }; @@ -58,13 +58,13 @@ class ScMyStyleNumberFormats ScMyStyleNumberFormatSet aSet; public: - void AddStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nNumberFormat); - sal_Int32 GetStyleNumberFormat(const rtl::OUString& rStyleName); + void AddStyleNumberFormat(const OUString& rStyleName, const sal_Int32 nNumberFormat); + sal_Int32 GetStyleNumberFormat(const OUString& rStyleName); }; struct ScMyCurrencyStyle { - rtl::OUString sCurrency; + OUString sCurrency; ::boost::shared_ptr mpRanges; ScMyCurrencyStyle() : @@ -95,21 +95,21 @@ class ScMyStyleRanges : public SvRefBase ScMyCurrencyStylesSet* pCurrencyList; void SetStylesToRanges(const ::std::list& rList, - const rtl::OUString* pStyleName, const sal_Int16 nCellType, - const rtl::OUString* pCurrency, ScXMLImport& rImport); + const OUString* pStyleName, const sal_Int16 nCellType, + const OUString* pCurrency, ScXMLImport& rImport); public: ScMyStyleRanges(); ~ScMyStyleRanges(); void AddRange(const ScRange& rRange, const sal_Int16 nType); - void AddCurrencyRange(const ScRange& rRange, const rtl::OUString* pCurrency); + void AddCurrencyRange(const ScRange& rRange, const OUString* pCurrency); void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); - void SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport); + void SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport); }; SV_DECL_IMPL_REF( ScMyStyleRanges ); struct ScMyStyle { - rtl::OUString sStyleName; + OUString sStyleName; ScMyStyleRangesRef xRanges; ScMyStyle() : xRanges(new ScMyStyleRanges()) {} @@ -133,21 +133,21 @@ class ScMyStylesImportHelper ScMyStyles aColDefaultStyles; ScMyStylesSet::iterator aRowDefaultStyle; ScXMLImport& rImport; - rtl::OUString* pStyleName; - rtl::OUString* pPrevStyleName; - rtl::OUString* pCurrency; - rtl::OUString* pPrevCurrency; + OUString* pStyleName; + OUString* pPrevStyleName; + OUString* pCurrency; + OUString* pPrevCurrency; ScRange aPrevRange; sal_Int16 nCellType; sal_Int16 nPrevCellType; bool bPrevRangeAdded; void ResetAttributes(); - ScMyStylesSet::iterator GetIterator(const rtl::OUString* pStyleName); + ScMyStylesSet::iterator GetIterator(const OUString* pStyleName); void AddDefaultRange(const ScRange& rRange); void AddSingleRange(const ScRange& rRange); void AddRange(); - bool IsEqual(const rtl::OUString* pFirst, const rtl::OUString* pSecond) + bool IsEqual(const OUString* pFirst, const OUString* pSecond) { return ((pFirst && pSecond && pFirst->equals(*pSecond)) || (!pFirst && !pSecond) || @@ -157,10 +157,10 @@ class ScMyStylesImportHelper public: ScMyStylesImportHelper(ScXMLImport& rImport); ~ScMyStylesImportHelper(); - void AddColumnStyle(const rtl::OUString& rStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat); - void SetRowStyle(const rtl::OUString& rStyleName); - void SetAttributes(rtl::OUString* pStyleName, - rtl::OUString* pCurrency, const sal_Int16 nCellType); + void AddColumnStyle(const OUString& rStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat); + void SetRowStyle(const OUString& rStyleName); + void SetAttributes(OUString* pStyleName, + OUString* pCurrency, const sal_Int16 nCellType); void AddRange(const ScRange& rRange); void AddCell(const ScAddress& rAddress); void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); // a col is inserted before nCol diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 04b73dc26281..6d48a61585c8 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -26,7 +26,6 @@ #include "unonames.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -34,7 +33,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; using namespace xmloff::token; -using rtl::OUString; TYPEINIT1( XMLTableHeaderFooterContext, SvXMLImportContext ); diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 48ab4cc6e7e9..21637726bb77 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -40,12 +40,12 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext ::com::sun::star::uno::Reference < ::com::sun::star::sheet::XHeaderFooterContent > xHeaderFooterContent; - const ::rtl::OUString sOn; - const ::rtl::OUString sShareContent; - const ::rtl::OUString sContent; - const ::rtl::OUString sContentLeft; - const ::rtl::OUString sEmpty; - rtl::OUString sCont; + const OUString sOn; + const OUString sShareContent; + const OUString sContent; + const OUString sContentLeft; + const OUString sEmpty; + OUString sCont; bool bDisplay; bool bLeft; @@ -57,7 +57,7 @@ public: TYPEINFO(); XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const ::com::sun::star::uno::Reference < @@ -68,7 +68,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); @@ -86,7 +86,7 @@ public: TYPEINFO(); XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, com::sun::star::uno::Reference< com::sun::star::text::XTextCursor >& xCursor ); @@ -95,7 +95,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index b06b00d37228..528139318b7f 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx @@ -27,7 +27,6 @@ #include "unonames.hxx" #include "xmlexprt.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -70,9 +69,9 @@ void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Ref Reference < XText > xRight(xHeaderFooter->getRightText()); if (xCenter.is() && xLeft.is() && xRight.is()) { - rtl::OUString sCenter (xCenter->getString()); - rtl::OUString sLeft (xLeft->getString()); - rtl::OUString sRight (xRight->getString()); + OUString sCenter (xCenter->getString()); + OUString sLeft (xLeft->getString()); + OUString sRight (xRight->getString()); if( !bDisplay ) GetExport().AddAttribute( XML_NAMESPACE_STYLE, @@ -110,13 +109,13 @@ void XMLTableMasterPageExport::exportMasterPageContent( const Reference < XPropertySet > & rPropSet, sal_Bool bAutoStyles ) { - Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTHDRCON ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTHDRCON ) ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xHeaderLeft(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTHDRCONT ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xHeaderLeft(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTHDRCONT ) ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xFooter(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTFTRCON ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xFooter(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTFTRCON ) ) ), uno::UNO_QUERY); - Reference < sheet::XHeaderFooterContent > xFooterLeft(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTFTRCONT ) ) ), uno::UNO_QUERY); + Reference < sheet::XHeaderFooterContent > xFooterLeft(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTFTRCONT ) ) ), uno::UNO_QUERY); if( bAutoStyles ) { @@ -147,19 +146,19 @@ void XMLTableMasterPageExport::exportMasterPageContent( } else { - sal_Bool bHeader(::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRON ) ) ))); + sal_Bool bHeader(::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRON ) ) ))); exportHeaderFooter(xHeader, XML_HEADER, bHeader ); - sal_Bool bLeftHeader(!::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRSHARED ) ) )) && bHeader); + sal_Bool bLeftHeader(!::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_HDRSHARED ) ) )) && bHeader); exportHeaderFooter( xHeaderLeft, XML_HEADER_LEFT, bLeftHeader ); - sal_Bool bFooter(::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRON ) ) ))); + sal_Bool bFooter(::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRON ) ) ))); exportHeaderFooter( xFooter, XML_FOOTER, bFooter ); - sal_Bool bLeftFooter = (!::cppu::any2bool(rPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRSHARED ) ) )) && bFooter); + sal_Bool bLeftFooter = (!::cppu::any2bool(rPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRSHARED ) ) )) && bFooter); exportHeaderFooter( xFooterLeft, XML_FOOTER_LEFT, bLeftFooter ); } diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 4924f47894e6..ea38a3047172 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -39,9 +39,7 @@ using namespace ::com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using rtl::OUString; XMLTableShapeImportHelper::XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper ) : @@ -55,7 +53,7 @@ XMLTableShapeImportHelper::~XMLTableShapeImportHelper() { } -void XMLTableShapeImportHelper::SetLayer(uno::Reference& rShape, sal_Int16 nLayerID, const rtl::OUString& sType) const +void XMLTableShapeImportHelper::SetLayer(uno::Reference& rShape, sal_Int16 nLayerID, const OUString& sType) const { if ( sType == "com.sun.star.drawing.ControlShape" ) nLayerID = SC_LAYER_CONTROLS; @@ -100,14 +98,14 @@ void XMLTableShapeImportHelper::finishShape( sal_Int32 nEndY(-1); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; table::CellAddress aEndCell; - rtl::OUString* pRangeList(NULL); + OUString* pRangeList(NULL); sal_Int16 nLayerID(-1); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& rAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& rValue(xAttrList->getValueByIndex( i )); + const OUString& rAttrName(xAttrList->getNameByIndex( i )); + const OUString& rValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + OUString aLocalName; sal_uInt16 nPrefix( static_cast(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName )); @@ -140,7 +138,7 @@ void XMLTableShapeImportHelper::finishShape( else if(nPrefix == XML_NAMESPACE_DRAW) { if (IsXMLToken(aLocalName, XML_NOTIFY_ON_UPDATE_OF_RANGES)) - pRangeList = new rtl::OUString(rValue); + pRangeList = new OUString(rValue); } } SetLayer(rShape, nLayerID, rShape->getShapeType()); @@ -171,13 +169,13 @@ void XMLTableShapeImportHelper::finishShape( else // shape is annotation { // get the style names for stream copying - rtl::OUString aStyleName; - rtl::OUString aTextStyle; + OUString aStyleName; + OUString aTextStyle; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& rAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& rAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(static_cast(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName )); if(nPrefix == XML_NAMESPACE_DRAW) { @@ -223,10 +221,10 @@ void XMLTableShapeImportHelper::finishShape( sal_Int16 nLayerID(-1); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& rAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& rValue(xAttrList->getValueByIndex( i )); + const OUString& rAttrName(xAttrList->getNameByIndex( i )); + const OUString& rValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + OUString aLocalName; sal_uInt16 nPrefix(static_cast(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName )); if(nPrefix == XML_NAMESPACE_TABLE) { diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index aa38da4b115f..900560026c63 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -37,7 +37,7 @@ public: XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=0 ); ~XMLTableShapeImportHelper(); - void SetLayer(com::sun::star::uno::Reference& rShape, sal_Int16 nLayerID, const rtl::OUString& sType) const; + void SetLayer(com::sun::star::uno::Reference& rShape, sal_Int16 nLayerID, const OUString& sType) const; virtual void finishShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 33e0203dfecd..d6ffc275d59a 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using ::std::auto_ptr; using ::std::vector; -using ::rtl::OUString; ScMyOLEFixer::ScMyOLEFixer(ScXMLImport& rTempImport) : rImport(rTempImport), @@ -56,8 +55,8 @@ sal_Bool ScMyOLEFixer::IsOLE(uno::Reference< drawing::XShape >& rShape) } void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, - const rtl::OUString& rName, - const rtl::OUString& rRangeList) + const OUString& rName, + const OUString& rRangeList) { // This is the minimum required. if (!pDoc) @@ -111,7 +110,7 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, } void ScMyOLEFixer::AddOLE(uno::Reference & rShape, - const rtl::OUString &rRangeList) + const OUString &rRangeList) { ScMyToFixupOLE aShape; aShape.xShape.set(rShape); @@ -123,7 +122,7 @@ void ScMyOLEFixer::FixupOLEs() { if (!aShapes.empty() && rImport.GetModel().is()) { - rtl::OUString sPersistName ("PersistName"); + OUString sPersistName ("PersistName"); ScMyToFixupOLEs::iterator aItr(aShapes.begin()); ScMyToFixupOLEs::iterator aEndItr(aShapes.end()); ScDocument* pDoc(rImport.GetDocument()); @@ -141,7 +140,7 @@ void ScMyOLEFixer::FixupOLEs() uno::Reference < beans::XPropertySet > xShapeProps ( aItr->xShape, uno::UNO_QUERY ); uno::Reference < beans::XPropertySetInfo > xShapeInfo(xShapeProps->getPropertySetInfo()); - rtl::OUString sName; + OUString sName; if (pDoc && xShapeProps.is() && xShapeInfo.is() && xShapeInfo->hasPropertyByName(sPersistName) && (xShapeProps->getPropertyValue(sPersistName) >>= sName)) CreateChartListener(pDoc, sName, aItr->sRangeList); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx index 57b6c795f146..2f3826f09fa7 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.hxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx @@ -32,7 +32,7 @@ class ScDocument; struct ScMyToFixupOLE { com::sun::star::uno::Reference xShape; - rtl::OUString sRangeList; + OUString sRangeList; }; typedef std::list ScMyToFixupOLEs; @@ -44,15 +44,15 @@ class ScMyOLEFixer ScChartListenerCollection* pCollection; void CreateChartListener(ScDocument* pDoc, - const rtl::OUString& rName, - const rtl::OUString& rRangeList); + const OUString& rName, + const OUString& rRangeList); public: ScMyOLEFixer(ScXMLImport& rImport); ~ScMyOLEFixer(); static sal_Bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape); void AddOLE(com::sun::star::uno::Reference & rShape, - const rtl::OUString &rRangeList); + const OUString &rRangeList); void FixupOLEs(); }; diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 13bcfba2f734..7cc5369196f4 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star; ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -42,7 +42,7 @@ ScXMLTableShapesContext::~ScXMLTableShapesContext() } SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index 14ca9a8d4d07..21463a194c8e 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -30,14 +30,14 @@ class ScXMLTableShapesContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTableShapesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index a7bc29766969..ea854786b64c 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -35,7 +35,7 @@ using namespace xmloff::token; ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -49,11 +49,11 @@ ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if(nPrefix == XML_NAMESPACE_XLINK) { if (IsXMLToken(aLocalName, XML_HREF)) @@ -87,7 +87,7 @@ ScXMLTableSourceContext::~ScXMLTableSourceContext() } SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 20553c20de95..4f61e9869b20 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -27,10 +27,10 @@ class ScXMLImport; class ScXMLTableSourceContext : public SvXMLImportContext { - rtl::OUString sLink; - rtl::OUString sTableName; - rtl::OUString sFilterName; - rtl::OUString sFilterOptions; + OUString sLink; + OUString sTableName; + OUString sFilterName; + OUString sFilterOptions; sal_Int32 nRefresh; com::sun::star::sheet::SheetLinkMode nMode; @@ -38,14 +38,14 @@ class ScXMLTableSourceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTableSourceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index b7834d6d84c1..625e66b2e876 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -38,16 +38,15 @@ using namespace com::sun::star; using namespace xmloff::token; -using rtl::OUString; //----------------------------------------------------------------------------- class ScXMLChangeInfoContext : public SvXMLImportContext { ScMyActionInfo aInfo; - ::rtl::OUStringBuffer sAuthorBuffer; - ::rtl::OUStringBuffer sDateTimeBuffer; - ::rtl::OUStringBuffer sCommentBuffer; + OUStringBuffer sAuthorBuffer; + OUStringBuffer sDateTimeBuffer; + OUStringBuffer sCommentBuffer; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; sal_uInt32 nParagraphCount; @@ -55,14 +54,14 @@ class ScXMLChangeInfoContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeInfoContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -79,14 +78,14 @@ class ScXMLBigRangeContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScBigRange& rBigRange); virtual ~ScXMLBigRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -97,10 +96,10 @@ public: class ScXMLCellContentDeletionContext : public SvXMLImportContext { - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; - rtl::OUString sFormulaNmsp; - rtl::OUString sInputString; + OUString sFormulaAddress; + OUString sFormula; + OUString sFormulaNmsp; + OUString sInputString; ScBigRange aBigRange; double fValue; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -118,14 +117,14 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCellContentDeletionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -142,14 +141,14 @@ class ScXMLDependenceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependenceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -166,14 +165,14 @@ class ScXMLDependingsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependingsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -190,14 +189,14 @@ class ScXMLChangeDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeDeletionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -214,14 +213,14 @@ class ScXMLDeletionsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -235,8 +234,8 @@ class ScXMLChangeCellContext; class ScXMLChangeTextPContext : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList; - rtl::OUString sLName; - rtl::OUStringBuffer sText; + OUString sLName; + OUStringBuffer sText; ScXMLChangeCellContext* pChangeCellContext; SvXMLImportContext* pTextPContext; sal_uInt16 nPrefix; @@ -247,7 +246,7 @@ class ScXMLChangeTextPContext : public SvXMLImportContext public: ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeCellContext* pChangeCellContext); @@ -255,11 +254,11 @@ public: virtual ~ScXMLChangeTextPContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; @@ -270,8 +269,8 @@ class ScXMLChangeCellContext : public SvXMLImportContext { ScCellValue& mrOldCell; - rtl::OUString sText; - rtl::OUString& rInputString; + OUString sText; + OUString& rInputString; ScEditEngineTextObj* pEditTextObj; double& rDateTimeValue; double fValue; @@ -285,24 +284,24 @@ class ScXMLChangeCellContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScCellValue& rOldCell, rtl::OUString& sAddress, - rtl::OUString& rFormula, rtl::OUString& rFormulaNmsp, + ScCellValue& rOldCell, OUString& sAddress, + OUString& rFormula, OUString& rFormulaNmsp, formula::FormulaGrammar::Grammar& rGrammar, - rtl::OUString& rInputString, double& fValue, sal_uInt16& nType, + OUString& rInputString, double& fValue, sal_uInt16& nType, sal_uInt8& nMatrixFlag, sal_Int32& nMatrixCols, sal_Int32& nMatrixRows); virtual ~ScXMLChangeCellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); void CreateTextPContext(sal_Bool bIsNewParagraph); sal_Bool IsEditCell() { return pEditTextObj != 0; } - void SetText(const rtl::OUString& sTempText) { sText = sTempText; } + void SetText(const OUString& sTempText) { sText = sTempText; } virtual void EndElement(); }; @@ -311,10 +310,10 @@ public: class ScXMLPreviousContext : public SvXMLImportContext { - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; - rtl::OUString sFormulaNmsp; - rtl::OUString sInputString; + OUString sFormulaAddress; + OUString sFormula; + OUString sFormulaNmsp; + OUString sInputString; double fValue; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; ScCellValue maOldCell; @@ -329,14 +328,14 @@ class ScXMLPreviousContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLPreviousContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -354,14 +353,14 @@ class ScXMLContentChangeContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLContentChangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -377,14 +376,14 @@ class ScXMLInsertionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -400,14 +399,14 @@ class ScXMLInsertionCutOffContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionCutOffContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -423,14 +422,14 @@ class ScXMLMovementCutOffContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementCutOffContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -446,14 +445,14 @@ class ScXMLCutOffsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCutOffsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -469,14 +468,14 @@ class ScXMLDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -494,14 +493,14 @@ class ScXMLMovementContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -517,14 +516,14 @@ class ScXMLRejectionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLRejectionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -534,7 +533,7 @@ public: ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -546,11 +545,11 @@ ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { if (IsXMLToken(aLocalName, XML_PROTECTION_KEY)) @@ -572,7 +571,7 @@ ScXMLTrackedChangesContext::~ScXMLTrackedChangesContext() } SvXMLImportContext *ScXMLTrackedChangesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -614,7 +613,7 @@ void ScXMLTrackedChangesContext::EndElement() ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -625,11 +624,11 @@ ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_OFFICE) { @@ -650,7 +649,7 @@ ScXMLChangeInfoContext::~ScXMLChangeInfoContext() } SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -690,7 +689,7 @@ void ScXMLChangeInfoContext::EndElement() ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScBigRange& rTempBigRange ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -711,11 +710,11 @@ ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -763,7 +762,7 @@ ScXMLBigRangeContext::~ScXMLBigRangeContext() } SvXMLImportContext *ScXMLBigRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -776,7 +775,7 @@ void ScXMLBigRangeContext::EndElement() ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -792,11 +791,11 @@ ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport& sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -811,7 +810,7 @@ ScXMLCellContentDeletionContext::~ScXMLCellContentDeletionContext() } SvXMLImportContext *ScXMLCellContentDeletionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -851,7 +850,7 @@ void ScXMLCellContentDeletionContext::EndElement() ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -861,11 +860,11 @@ ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -881,7 +880,7 @@ ScXMLDependenceContext::~ScXMLDependenceContext() } SvXMLImportContext *ScXMLDependenceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -894,7 +893,7 @@ void ScXMLDependenceContext::EndElement() ScXMLDependingsContext::ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -908,7 +907,7 @@ ScXMLDependingsContext::~ScXMLDependingsContext() } SvXMLImportContext *ScXMLDependingsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -933,7 +932,7 @@ void ScXMLDependingsContext::EndElement() ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -943,11 +942,11 @@ ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -963,7 +962,7 @@ ScXMLChangeDeletionContext::~ScXMLChangeDeletionContext() } SvXMLImportContext *ScXMLChangeDeletionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -976,7 +975,7 @@ void ScXMLChangeDeletionContext::EndElement() ScXMLDeletionsContext::ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -990,7 +989,7 @@ ScXMLDeletionsContext::~ScXMLDeletionsContext() } SvXMLImportContext *ScXMLDeletionsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1016,7 +1015,7 @@ void ScXMLDeletionsContext::EndElement() ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList, ScXMLChangeCellContext* pTempChangeCellContext) : @@ -1038,7 +1037,7 @@ ScXMLChangeTextPContext::~ScXMLChangeTextPContext() } SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTempPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList ) { @@ -1050,9 +1049,9 @@ SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTem sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); + OUString aLocalName; sal_uInt16 nPrfx(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); if ((nPrfx == XML_NAMESPACE_TEXT) && (IsXMLToken(aLocalName, XML_C))) @@ -1089,7 +1088,7 @@ SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTem return pContext; } -void ScXMLChangeTextPContext::Characters( const ::rtl::OUString& rChars ) +void ScXMLChangeTextPContext::Characters( const OUString& rChars ) { if (!pTextPContext) sText.append(rChars); @@ -1105,12 +1104,12 @@ void ScXMLChangeTextPContext::EndElement() ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, - ScCellValue& rOldCell, rtl::OUString& rAddress, - rtl::OUString& rFormula, rtl::OUString& rFormulaNmsp, + ScCellValue& rOldCell, OUString& rAddress, + OUString& rFormula, OUString& rFormulaNmsp, formula::FormulaGrammar::Grammar& rGrammar, - rtl::OUString& rTempInputString, double& fDateTimeValue, sal_uInt16& nType, + OUString& rTempInputString, double& fDateTimeValue, sal_uInt16& nType, sal_uInt8& nMatrixFlag, sal_Int32& nMatrixCols, sal_Int32& nMatrixRows ) : SvXMLImportContext( rImport, nPrfx, rLName ), mrOldCell(rOldCell), @@ -1128,11 +1127,11 @@ ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1209,7 +1208,7 @@ ScXMLChangeCellContext::~ScXMLChangeCellContext() } SvXMLImportContext *ScXMLChangeCellContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1313,7 +1312,7 @@ void ScXMLChangeCellContext::EndElement() ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1328,11 +1327,11 @@ ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1347,7 +1346,7 @@ ScXMLPreviousContext::~ScXMLPreviousContext() } SvXMLImportContext *ScXMLPreviousContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1371,7 +1370,7 @@ void ScXMLPreviousContext::EndElement() ScXMLContentChangeContext::ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1384,11 +1383,11 @@ ScXMLContentChangeContext::ScXMLContentChangeContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1421,7 +1420,7 @@ ScXMLContentChangeContext::~ScXMLContentChangeContext() } SvXMLImportContext *ScXMLContentChangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1463,7 +1462,7 @@ void ScXMLContentChangeContext::EndElement() ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1480,11 +1479,11 @@ ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1537,7 +1536,7 @@ ScXMLInsertionContext::~ScXMLInsertionContext() } SvXMLImportContext *ScXMLInsertionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1568,7 +1567,7 @@ void ScXMLInsertionContext::EndElement() ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1579,11 +1578,11 @@ ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1605,7 +1604,7 @@ ScXMLInsertionCutOffContext::~ScXMLInsertionCutOffContext() } SvXMLImportContext *ScXMLInsertionCutOffContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1618,7 +1617,7 @@ void ScXMLInsertionCutOffContext::EndElement() ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1632,11 +1631,11 @@ ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1669,7 +1668,7 @@ ScXMLMovementCutOffContext::~ScXMLMovementCutOffContext() } SvXMLImportContext *ScXMLMovementCutOffContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1682,7 +1681,7 @@ void ScXMLMovementCutOffContext::EndElement() ScXMLCutOffsContext::ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& /* xAttrList */, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1696,7 +1695,7 @@ ScXMLCutOffsContext::~ScXMLCutOffsContext() } SvXMLImportContext *ScXMLCutOffsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1722,7 +1721,7 @@ void ScXMLCutOffsContext::EndElement() ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1739,11 +1738,11 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1801,7 +1800,7 @@ ScXMLDeletionContext::~ScXMLDeletionContext() } SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1838,7 +1837,7 @@ void ScXMLDeletionContext::EndElement() ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1851,11 +1850,11 @@ ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1888,7 +1887,7 @@ ScXMLMovementContext::~ScXMLMovementContext() } SvXMLImportContext *ScXMLMovementContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1924,7 +1923,7 @@ void ScXMLMovementContext::EndElement() ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1937,11 +1936,11 @@ ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport, sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1974,7 +1973,7 @@ ScXMLRejectionContext::~ScXMLRejectionContext() } SvXMLImportContext *ScXMLRejectionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 41cff44c3aa2..63d3a1b160c1 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -36,14 +36,14 @@ class ScXMLTrackedChangesContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLTrackedChangesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 4c82a1840514..afeab260b730 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -29,7 +29,7 @@ ScSheetSaveData::ScSheetSaveData() : mnStartTab( -1 ), mnStartOffset( -1 ), - maPreviousNote( rtl::OUString(), rtl::OUString(), ScAddress(ScAddress::INITIALIZE_INVALID) ), + maPreviousNote( OUString(), OUString(), ScAddress(ScAddress::INITIALIZE_INVALID) ), mbInSupportedSave( false ) { } @@ -38,27 +38,27 @@ ScSheetSaveData::~ScSheetSaveData() { } -void ScSheetSaveData::AddCellStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddCellStyle( const OUString& rName, const ScAddress& rCellPos ) { maCellStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::AddColumnStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddColumnStyle( const OUString& rName, const ScAddress& rCellPos ) { maColumnStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::AddRowStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddRowStyle( const OUString& rName, const ScAddress& rCellPos ) { maRowStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::AddTableStyle( const rtl::OUString& rName, const ScAddress& rCellPos ) +void ScSheetSaveData::AddTableStyle( const OUString& rName, const ScAddress& rCellPos ) { maTableStyles.push_back( ScCellStyleEntry( rName, rCellPos ) ); } -void ScSheetSaveData::HandleNoteStyles( const rtl::OUString& rStyleName, const rtl::OUString& rTextName, const ScAddress& rCellPos ) +void ScSheetSaveData::HandleNoteStyles( const OUString& rStyleName, const OUString& rTextName, const ScAddress& rCellPos ) { // only consecutive duplicates (most common case) are filtered out here, // the others are found when the styles are created @@ -76,7 +76,7 @@ void ScSheetSaveData::HandleNoteStyles( const rtl::OUString& rStyleName, const r maNoteStyles.push_back( aNewEntry ); } -void ScSheetSaveData::AddNoteContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) +void ScSheetSaveData::AddNoteContentStyle( sal_uInt16 nFamily, const OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) { if ( nFamily == XML_STYLE_FAMILY_TEXT_PARAGRAPH ) maNoteParaStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) ); @@ -84,7 +84,7 @@ void ScSheetSaveData::AddNoteContentStyle( sal_uInt16 nFamily, const rtl::OUStri maNoteTextStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) ); } -void ScSheetSaveData::AddTextStyle( const rtl::OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) +void ScSheetSaveData::AddTextStyle( const OUString& rName, const ScAddress& rCellPos, const ESelection& rSelection ) { maTextStyles.push_back( ScTextStyleEntry( rName, rCellPos, rSelection ) ); } @@ -201,7 +201,7 @@ void ScSheetSaveData::StoreLoadedNamespaces( const SvXMLNamespaceMap& rNamespace } } -static bool lcl_NameInHash( const NameSpaceHash& rNameHash, const rtl::OUString& rName ) +static bool lcl_NameInHash( const NameSpaceHash& rNameHash, const OUString& rName ) { NameSpaceHash::const_iterator aIter = rNameHash.begin(), aEnd = rNameHash.end(); while (aIter != aEnd) diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index f68694e69ec6..de6eb7003fcd 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -46,7 +46,7 @@ ScXMLAnnotationData::~ScXMLAnnotationData() ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLAnnotationData& rAnnotationData, ScXMLTableRowCellContext* pTempCellContext) : @@ -69,11 +69,11 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAnnotationAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -122,7 +122,7 @@ void ScXMLAnnotationContext::StartElement(const com::sun::star::uno::Reference< } SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -153,7 +153,7 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPref return pContext; } -void ScXMLAnnotationContext::Characters( const ::rtl::OUString& rChars ) +void ScXMLAnnotationContext::Characters( const OUString& rChars ) { maTextBuffer.append(rChars); } @@ -178,7 +178,7 @@ void ScXMLAnnotationContext::EndElement() } void ScXMLAnnotationContext::SetShape( const uno::Reference< drawing::XShape >& rxShape, const uno::Reference< drawing::XShapes >& rxShapes, - const rtl::OUString& rStyleName, const rtl::OUString& rTextStyle ) + const OUString& rStyleName, const OUString& rTextStyle ) { mrAnnotationData.mxShape = rxShape; mrAnnotationData.mxShapes = rxShapes; @@ -186,7 +186,7 @@ void ScXMLAnnotationContext::SetShape( const uno::Reference< drawing::XShape >& mrAnnotationData.maTextStyle = rTextStyle; } -void ScXMLAnnotationContext::AddContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ESelection& rSelection ) +void ScXMLAnnotationContext::AddContentStyle( sal_uInt16 nFamily, const OUString& rName, const ESelection& rSelection ) { mrAnnotationData.maContentStyles.push_back( ScXMLAnnotationStyleEntry( nFamily, rName, rSelection ) ); } diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index c52031de3ace..8aad19af1dc1 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -33,10 +33,10 @@ class ScXMLTableRowCellContext; struct ScXMLAnnotationStyleEntry { sal_uInt16 mnFamily; - rtl::OUString maName; + OUString maName; ESelection maSelection; - ScXMLAnnotationStyleEntry( sal_uInt16 nFam, const rtl::OUString& rNam, const ESelection& rSel ) : + ScXMLAnnotationStyleEntry( sal_uInt16 nFam, const OUString& rNam, const ESelection& rSel ) : mnFamily( nFam ), maName( rNam ), maSelection( rSel ) @@ -50,11 +50,11 @@ struct ScXMLAnnotationData mxShape; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxShapes; - ::rtl::OUString maAuthor; - ::rtl::OUString maCreateDate; - ::rtl::OUString maSimpleText; - ::rtl::OUString maStyleName; - ::rtl::OUString maTextStyle; + OUString maAuthor; + OUString maCreateDate; + OUString maSimpleText; + OUString maStyleName; + OUString maTextStyle; bool mbUseShapePos; bool mbShown; std::vector maContentStyles; @@ -68,7 +68,7 @@ class ScXMLAnnotationContext : public SvXMLImportContext public: ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLAnnotationData& rAnnotationData, @@ -77,29 +77,29 @@ public: virtual ~ScXMLAnnotationContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); void SetShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::rtl::OUString& rStyleName, const ::rtl::OUString& rTextStyle ); + const OUString& rStyleName, const OUString& rTextStyle ); - void AddContentStyle( sal_uInt16 nFamily, const rtl::OUString& rName, const ESelection& rSelection ); + void AddContentStyle( sal_uInt16 nFamily, const OUString& rName, const ESelection& rSelection ); private: ScXMLAnnotationData& mrAnnotationData; - rtl::OUStringBuffer maTextBuffer; - rtl::OUStringBuffer maAuthorBuffer; - rtl::OUStringBuffer maCreateDateBuffer; - rtl::OUStringBuffer maCreateDateStringBuffer; + OUStringBuffer maTextBuffer; + OUStringBuffer maAuthorBuffer; + OUStringBuffer maCreateDateBuffer; + OUStringBuffer maCreateDateStringBuffer; ScXMLTableRowCellContext* pCellContext; SvXMLImportContext* pShapeContext; diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 632f847a704d..10a0a946cc38 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -51,7 +51,6 @@ #include -using rtl::OUString; using namespace com::sun::star; using namespace xmloff::token; @@ -60,7 +59,7 @@ using namespace xmloff::token; ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), sPassword(), @@ -99,11 +98,11 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -124,7 +123,7 @@ ScXMLBodyContext::~ScXMLBodyContext() } SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 84e34443db18..8eec88f0390c 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -30,7 +30,7 @@ class ScXMLChangeTrackingImportHelper; class ScXMLBodyContext : public SvXMLImportContext { - rtl::OUString sPassword; + OUString sPassword; ScPasswordHash meHash1; ScPasswordHash meHash2; bool bProtected; @@ -41,16 +41,16 @@ class ScXMLBodyContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference& xAttrList ); virtual ~ScXMLBodyContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 2ceae6bc89e7..d9b5decc1a06 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -127,7 +127,7 @@ ScXMLTableRowCellContext::Field::~Field() ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bTempIsCovered, @@ -162,21 +162,21 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, rXMLImport.SetRemoveLastChar(false); rXMLImport.GetTables().AddColumn(bTempIsCovered); const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; - rtl::OUString aLocalName; - rtl::OUString* pStyleName = NULL; - rtl::OUString* pCurrencySymbol = NULL; + OUString aLocalName; + OUString* pStyleName = NULL; + OUString* pCurrencySymbol = NULL; const SvXMLTokenMap& rTokenMap = rImport.GetTableRowCellAttrTokenMap(); for (sal_Int16 i = 0; i < nAttrCount; ++i) { sal_uInt16 nAttrPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex(i), &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); sal_uInt16 nToken = rTokenMap.Get(nAttrPrefix, aLocalName); switch (nToken) { case XML_TOK_TABLE_ROW_CELL_ATTR_STYLE_NAME: - pStyleName = new rtl::OUString(sValue); + pStyleName = new OUString(sValue); break; case XML_TOK_TABLE_ROW_CELL_ATTR_CONTENT_VALIDATION_NAME: OSL_ENSURE(!maContentValidationName, "here should be only one Validation Name"); @@ -269,14 +269,14 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, if (!sValue.isEmpty()) { OSL_ENSURE(!maFormula, "here should be only one formula"); - rtl::OUString aFormula, aFormulaNmsp; + OUString aFormula, aFormulaNmsp; rXMLImport.ExtractFormulaNamespaceGrammar( aFormula, aFormulaNmsp, eGrammar, sValue ); maFormula.reset( FormulaWithNamespace(aFormula, aFormulaNmsp) ); } } break; case XML_TOK_TABLE_ROW_CELL_ATTR_CURRENCY: - pCurrencySymbol = new rtl::OUString(sValue); + pCurrencySymbol = new OUString(sValue); break; default: ; @@ -609,7 +609,7 @@ void ScXMLTableRowCellContext::PushParagraphEnd() } SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -980,7 +980,7 @@ void ScXMLTableRowCellContext::SetFormulaCell(ScFormulaCell* pFCell) const } void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos, - const SCCOL nCurrentCol, const ::boost::optional< rtl::OUString >& pOUText ) + const SCCOL nCurrentCol, const ::boost::optional< OUString >& pOUText ) { bool bDoIncrement = true; //matrix reference cells that contain text formula results; @@ -1116,7 +1116,7 @@ bool isEmptyOrNote( ScDocument* pDoc, const ScAddress& rCurrentPos ) } void ScXMLTableRowCellContext::AddTextAndValueCell( const ScAddress& rCellPos, - const ::boost::optional< rtl::OUString >& pOUText, ScAddress& rCurrentPos ) + const ::boost::optional< OUString >& pOUText, ScAddress& rCurrentPos ) { ScMyTables& rTables = rXMLImport.GetTables(); bool bWasEmpty = bIsEmpty; @@ -1262,7 +1262,7 @@ OUString getOutputString( ScDocument* pDoc, const ScAddress& aCellPos ) void ScXMLTableRowCellContext::AddNonFormulaCell( const ScAddress& rCellPos ) { - ::boost::optional< rtl::OUString > pOUText; + ::boost::optional< OUString > pOUText; if( nCellType == util::NumberFormat::TEXT ) { diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index e59aa6eab839..ac03836fc731 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -91,7 +91,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext bool mbCheckWithCompilerForError; bool mbEditEngineHasText; - sal_Int16 GetCellType(const rtl::OUString& sOUValue) const; + sal_Int16 GetCellType(const OUString& sOUValue) const; void DoMerge(const ScAddress& rScCellPos, const SCCOL nCols, const SCROW nRows); @@ -106,10 +106,10 @@ class ScXMLTableRowCellContext : public ScXMLImportContext void SetFormulaCell ( ScFormulaCell* pFCell ) const; void PutTextCell ( const ScAddress& rScCurrentPos, const SCCOL nCurrentCol, - const ::boost::optional< rtl::OUString >& pOUText ); + const ::boost::optional< OUString >& pOUText ); void PutValueCell ( const ScAddress& rScCurrentPos ); void AddTextAndValueCell ( const ScAddress& rScCellPos, - const ::boost::optional< rtl::OUString >& pOUText, ScAddress& rScCurrentPos ); + const ::boost::optional< OUString >& pOUText, ScAddress& rScCurrentPos ); void AddNonFormulaCell ( const ScAddress& rScCellPos ); void PutFormulaCell ( const ScAddress& rScCurrentPos ); void AddFormulaCell ( const ScAddress& rScCellPos ); @@ -123,7 +123,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext public: ScXMLTableRowCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bIsCovered, const sal_Int32 nRepeatedRows ); @@ -131,7 +131,7 @@ public: virtual ~ScXMLTableRowCellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index e53ca9a66205..4102a685c7de 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -44,7 +44,7 @@ using namespace xmloff::token; ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -56,11 +56,11 @@ ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -94,7 +94,7 @@ ScXMLTableColContext::~ScXMLTableColContext() } SvXMLImportContext *ScXMLTableColContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -145,7 +145,7 @@ void ScXMLTableColContext::EndElement() } } } - rtl::OUString sVisible(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLVIS)); + OUString sVisible(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLVIS)); bool bValue(true); if (!IsXMLToken(sVisibility, XML_VISIBLE)) bValue = false; @@ -157,14 +157,14 @@ void ScXMLTableColContext::EndElement() // #i57915# ScXMLImport::SetStyleToRange can't handle empty style names. // The default for a column if there is no attribute is the style "Default" (programmatic API name). if ( sCellStyleName.isEmpty() ) - sCellStyleName = rtl::OUString( "Default" ); + sCellStyleName = OUString( "Default" ); GetScImport().GetTables().AddColStyle(nColCount, sCellStyleName); } ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bTempHeader, const bool bTempGroup) : @@ -186,11 +186,11 @@ ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if (nPrefix == XML_NAMESPACE_TABLE && IsXMLToken(aLocalName, XML_DISPLAY)) { @@ -206,7 +206,7 @@ ScXMLTableColsContext::~ScXMLTableColsContext() } SvXMLImportContext *ScXMLTableColsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 8fa6f172f1fa..6c94cbd82b69 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -27,9 +27,9 @@ class ScXMLImport; class ScXMLTableColContext : public SvXMLImportContext { sal_Int32 nColCount; - rtl::OUString sStyleName; - rtl::OUString sVisibility; - rtl::OUString sCellStyleName; + OUString sStyleName; + OUString sVisibility; + OUString sCellStyleName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -37,14 +37,14 @@ class ScXMLTableColContext : public SvXMLImportContext public: ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableColContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -67,7 +67,7 @@ class ScXMLTableColsContext : public SvXMLImportContext public: ScXMLTableColsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bHeader, const bool bGroup); @@ -75,7 +75,7 @@ public: virtual ~ScXMLTableColsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index ef0468ab2474..cc00ba778c9b 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -40,7 +40,7 @@ ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName): + const OUString& rLName): SvXMLImportContext( rImport, nPrfx, rLName ) { GetScImport().SetNewCondFormatData(); @@ -48,7 +48,7 @@ ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rIm } SvXMLImportContext* ScXMLConditionalFormatsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -77,20 +77,20 @@ void ScXMLConditionalFormatsContext::EndElement() } ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList): + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sRange; + OUString sRange; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetCondFormatAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -110,7 +110,7 @@ ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImpo } SvXMLImportContext* ScXMLConditionalFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -153,7 +153,7 @@ void ScXMLConditionalFormatContext::EndElement() } ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, ScConditionalFormat* pFormat): + const OUString& rLName, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), pColorScaleFormat(NULL) { @@ -162,7 +162,7 @@ ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport } SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -182,28 +182,28 @@ SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16 } ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), mpDataBarFormat(NULL), mpFormatData(NULL) { - rtl::OUString sPositiveColor; - rtl::OUString sNegativeColor; - rtl::OUString sGradient; - rtl::OUString sAxisPosition; - rtl::OUString sShowValue; - rtl::OUString sAxisColor; + OUString sPositiveColor; + OUString sNegativeColor; + OUString sGradient; + OUString sAxisPosition; + OUString sShowValue; + OUString sAxisColor; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataBarAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -283,7 +283,7 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_ } SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -315,22 +315,22 @@ SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nP } ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString aIconSetType, sShowValue; + OUString aIconSetType, sShowValue; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetIconSetAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -349,7 +349,7 @@ ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u ScIconSetType eType = IconSet_3Arrows; for(; pMap->pName; ++pMap) { - rtl::OUString aName = rtl::OUString::createFromAscii(pMap->pName); + OUString aName = OUString::createFromAscii(pMap->pName); if(aName ==aIconSetType) { eType = pMap->eType; @@ -375,7 +375,7 @@ ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u } SvXMLImportContext* ScXMLIconSetFormatContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -400,7 +400,7 @@ SvXMLImportContext* ScXMLIconSetFormatContext::CreateChildContext( sal_uInt16 nP namespace { -void GetConditionData(const rtl::OUString& rValue, ScConditionMode& eMode, rtl::OUString& rExpr1, rtl::OUString& rExpr2) +void GetConditionData(const OUString& rValue, ScConditionMode& eMode, OUString& rExpr1, OUString& rExpr2) { if(rValue.indexOf("unique") == 0) { @@ -561,23 +561,23 @@ void GetConditionData(const rtl::OUString& rValue, ScConditionMode& eMode, rtl:: } ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat ): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sExpression; - rtl::OUString sStyle; - rtl::OUString sAddress; + OUString sExpression; + OUString sStyle; + OUString sAddress; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetConditionAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -595,13 +595,13 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, } } - rtl::OUString aExpr1; - rtl::OUString aExpr2; + OUString aExpr1; + OUString aExpr2; ScConditionMode eMode; GetConditionData(sExpression, eMode, aExpr1, aExpr2); ScCondFormatEntry* pFormatEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, GetScImport().GetDocument(), ScAddress(), sStyle, - rtl::OUString(), rtl::OUString(), formula::FormulaGrammar::GRAM_ODFF, formula::FormulaGrammar::GRAM_ODFF); + OUString(), OUString(), formula::FormulaGrammar::GRAM_ODFF, formula::FormulaGrammar::GRAM_ODFF); pFormatEntry->SetSrcString(sAddress); pFormat->AddEntry(pFormatEntry); @@ -609,7 +609,7 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, namespace { -void setColorEntryType(const rtl::OUString& rType, ScColorScaleEntry* pEntry, const rtl::OUString rFormula, +void setColorEntryType(const OUString& rType, ScColorScaleEntry* pEntry, const OUString rFormula, ScXMLImport& rImport) { if(rType == "minimum") @@ -635,7 +635,7 @@ void setColorEntryType(const rtl::OUString& rType, ScColorScaleEntry* pEntry, co } ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), mpFormatEntry( NULL ) @@ -643,19 +643,19 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor double nVal = 0; Color aColor; - rtl::OUString sType; - rtl::OUString sVal; - rtl::OUString sColor; + OUString sType; + OUString sVal; + OUString sColor; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetColorScaleEntryAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -686,22 +686,22 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor } ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleEntry*& pColorScaleEntry): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sVal; - rtl::OUString sType; + OUString sVal; + OUString sType; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataBarEntryAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -726,7 +726,7 @@ ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport, namespace { -condformat::ScCondFormatDateType getDateFromString(const rtl::OUString& rString) +condformat::ScCondFormatDateType getDateFromString(const OUString& rString) { if(rString == "today") return condformat::TODAY; @@ -762,20 +762,20 @@ condformat::ScCondFormatDateType getDateFromString(const rtl::OUString& rString) } ScXMLDateContext::ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat ): SvXMLImportContext( rImport, nPrfx, rLName ) { - rtl::OUString sDateType, sStyle; + OUString sDateType, sStyle; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetCondDateAttrMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 1b64cd5cf896..9df40bbfeb2f 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -43,12 +43,12 @@ class ScXMLConditionalFormatsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~ScXMLConditionalFormatsContext() {} virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -61,14 +61,14 @@ class ScXMLConditionalFormatContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLConditionalFormatContext() {} virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -87,13 +87,13 @@ private: public: ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, ScConditionalFormat* pFormat); + const OUString& rLName, ScConditionalFormat* pFormat); virtual ~ScXMLColorScaleFormatContext() {} virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); private: @@ -107,7 +107,7 @@ class ScXMLDataBarFormatContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -116,7 +116,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); private: @@ -135,7 +135,7 @@ class ScXMLIconSetFormatContext : public SvXMLImportContext public: ScXMLIconSetFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -144,7 +144,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; @@ -155,7 +155,7 @@ class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleFormat* pFormat); @@ -172,7 +172,7 @@ class ScXMLFormattingEntryContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScColorScaleEntry*& pData); @@ -186,7 +186,7 @@ class ScXMLCondContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); @@ -200,7 +200,7 @@ class ScXMLDateContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScConditionalFormat* pFormat); diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index 4decd390cb3c..29b91dca5b2f 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -33,10 +33,10 @@ using namespace xmloff::token; ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - rtl::OUStringBuffer& sTempValue) : + OUStringBuffer& sTempValue) : SvXMLImportContext( rImport, nPrfx, rLName ), sOUText(), sValue(sTempValue) @@ -48,7 +48,7 @@ ScXMLContentContext::~ScXMLContentContext() } SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -60,9 +60,9 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - const rtl::OUString& sAttrValue(xAttrList->getValueByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + const OUString& sAttrValue(xAttrList->getValueByIndex( i )); + OUString aLocalName; sal_uInt16 nPrfx = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if ((nPrfx == XML_NAMESPACE_TEXT) && IsXMLToken(aLocalName, XML_C)) @@ -81,7 +81,7 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, return pContext; } -void ScXMLContentContext::Characters( const ::rtl::OUString& rChars ) +void ScXMLContentContext::Characters( const OUString& rChars ) { sOUText.append(rChars); } diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index 88fa4d1e3bfd..4d9355c42a31 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -26,8 +26,8 @@ class ScXMLImport; class ScXMLContentContext : public SvXMLImportContext { - rtl::OUStringBuffer sOUText; - rtl::OUStringBuffer& sValue; + OUStringBuffer sOUText; + OUStringBuffer& sValue; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -35,19 +35,19 @@ class ScXMLContentContext : public SvXMLImportContext public: ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - rtl::OUStringBuffer& sValue); + OUStringBuffer& sValue); virtual ~ScXMLContentContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 3a0697b61e66..2d634aea8a7f 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -33,18 +33,17 @@ using namespace com::sun::star; using namespace xmloff::token; using namespace ::formula; -using ::rtl::OUString; class ScXMLContentValidationContext : public SvXMLImportContext { - rtl::OUString sName; - rtl::OUString sHelpTitle; - rtl::OUString sHelpMessage; - rtl::OUString sErrorTitle; - rtl::OUString sErrorMessage; - rtl::OUString sErrorMessageType; - rtl::OUString sBaseCellAddress; - rtl::OUString sCondition; + OUString sName; + OUString sHelpTitle; + OUString sHelpMessage; + OUString sErrorTitle; + OUString sErrorMessage; + OUString sErrorMessageType; + OUString sBaseCellAddress; + OUString sCondition; sal_Int16 nShowList; sal_Bool bAllowEmptyCell; sal_Bool bDisplayHelp; @@ -63,28 +62,28 @@ class ScXMLContentValidationContext : public SvXMLImportContext public: ScXMLContentValidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLContentValidationContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void SetHelpMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, const sal_Bool bDisplay); - void SetErrorMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, const rtl::OUString& sMessageType, const sal_Bool bDisplay); + void SetHelpMessage(const OUString& sTitle, const OUString& sMessage, const sal_Bool bDisplay); + void SetErrorMessage(const OUString& sTitle, const OUString& sMessage, const OUString& sMessageType, const sal_Bool bDisplay); void SetErrorMacro(const sal_Bool bExecute); }; class ScXMLHelpMessageContext : public SvXMLImportContext { - rtl::OUString sTitle; - rtl::OUStringBuffer sMessage; + OUString sTitle; + OUStringBuffer sMessage; sal_Int32 nParagraphCount; sal_Bool bDisplay; @@ -96,7 +95,7 @@ class ScXMLHelpMessageContext : public SvXMLImportContext public: ScXMLHelpMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -104,7 +103,7 @@ public: virtual ~ScXMLHelpMessageContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -113,9 +112,9 @@ public: class ScXMLErrorMessageContext : public SvXMLImportContext { - rtl::OUString sTitle; - rtl::OUStringBuffer sMessage; - rtl::OUString sMessageType; + OUString sTitle; + OUStringBuffer sMessage; + OUString sMessageType; sal_Int32 nParagraphCount; sal_Bool bDisplay; @@ -127,7 +126,7 @@ class ScXMLErrorMessageContext : public SvXMLImportContext public: ScXMLErrorMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -135,7 +134,7 @@ public: virtual ~ScXMLErrorMessageContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -144,7 +143,7 @@ public: class ScXMLErrorMacroContext : public SvXMLImportContext { - rtl::OUString sName; + OUString sName; sal_Bool bExecute; ScXMLContentValidationContext* pValidationContext; @@ -155,7 +154,7 @@ class ScXMLErrorMacroContext : public SvXMLImportContext public: ScXMLErrorMacroContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -163,7 +162,7 @@ public: virtual ~ScXMLErrorMacroContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -173,7 +172,7 @@ public: ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -186,7 +185,7 @@ ScXMLContentValidationsContext::~ScXMLContentValidationsContext() } SvXMLImportContext *ScXMLContentValidationsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -212,7 +211,7 @@ void ScXMLContentValidationsContext::EndElement() ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -225,11 +224,11 @@ ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImpo const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -271,7 +270,7 @@ ScXMLContentValidationContext::~ScXMLContentValidationContext() } SvXMLImportContext *ScXMLContentValidationContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -418,7 +417,7 @@ void ScXMLContentValidationContext::EndElement() // #i36650# event-listeners element moved up one level if (xEventContext.Is()) { - rtl::OUString sOnError("OnError"); + OUString sOnError("OnError"); XMLEventsImportContext* pEvents = (XMLEventsImportContext*)&xEventContext; uno::Sequence aValues; @@ -454,15 +453,15 @@ void ScXMLContentValidationContext::EndElement() GetScImport().AddValidation(aValidation); } -void ScXMLContentValidationContext::SetHelpMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, const sal_Bool bDisplay) +void ScXMLContentValidationContext::SetHelpMessage(const OUString& sTitle, const OUString& sMessage, const sal_Bool bDisplay) { sHelpTitle = sTitle; sHelpMessage = sMessage; bDisplayHelp = bDisplay; } -void ScXMLContentValidationContext::SetErrorMessage(const rtl::OUString& sTitle, const rtl::OUString& sMessage, - const rtl::OUString& sMessageType, const sal_Bool bDisplay) +void ScXMLContentValidationContext::SetErrorMessage(const OUString& sTitle, const OUString& sMessage, + const OUString& sMessageType, const sal_Bool bDisplay) { sErrorTitle = sTitle; sErrorMessage = sMessage; @@ -472,13 +471,13 @@ void ScXMLContentValidationContext::SetErrorMessage(const rtl::OUString& sTitle, void ScXMLContentValidationContext::SetErrorMacro(const sal_Bool bExecute) { - sErrorMessageType = rtl::OUString("macro"); + sErrorMessageType = OUString("macro"); bDisplayError = bExecute; } ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -493,11 +492,11 @@ ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationHelpMessageAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -516,7 +515,7 @@ ScXMLHelpMessageContext::~ScXMLHelpMessageContext() } SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -548,7 +547,7 @@ void ScXMLHelpMessageContext::EndElement() ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -564,11 +563,11 @@ ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationErrorMessageAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -590,7 +589,7 @@ ScXMLErrorMessageContext::~ScXMLErrorMessageContext() } SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -622,7 +621,7 @@ void ScXMLErrorMessageContext::EndElement() ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -635,11 +634,11 @@ ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetContentValidationErrorMacroAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -658,7 +657,7 @@ ScXMLErrorMacroContext::~ScXMLErrorMacroContext() } SvXMLImportContext *ScXMLErrorMacroContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index a4a309b7bf2f..efc6cca4fbc8 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -36,14 +36,14 @@ class ScXMLContentValidationsContext : public SvXMLImportContext public: ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLContentValidationsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 208cfb50d1e9..1b9260be627e 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -51,15 +51,13 @@ using namespace com::sun::star; using namespace xmloff::token; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; -using ::rtl::OUString; -using rtl::OUString; //------------------------------------------------------------------ ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -74,7 +72,7 @@ ScXMLDataPilotTablesContext::~ScXMLDataPilotTablesContext() } SvXMLImportContext *ScXMLDataPilotTablesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -106,7 +104,7 @@ ScXMLDataPilotTableContext::GrandTotalItem::GrandTotalItem() : ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -133,11 +131,11 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -224,7 +222,7 @@ ScXMLDataPilotTableContext::~ScXMLDataPilotTableContext() } SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -582,7 +580,7 @@ void ScXMLDataPilotTableContext::SetGrandTotal( ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -593,11 +591,11 @@ ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceSQLAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -625,7 +623,7 @@ ScXMLDPSourceSQLContext::~ScXMLDPSourceSQLContext() } SvXMLImportContext *ScXMLDPSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -643,7 +641,7 @@ void ScXMLDPSourceSQLContext::EndElement() ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -654,11 +652,11 @@ ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -681,7 +679,7 @@ ScXMLDPSourceTableContext::~ScXMLDPSourceTableContext() } SvXMLImportContext *ScXMLDPSourceTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -699,7 +697,7 @@ void ScXMLDPSourceTableContext::EndElement() ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -710,11 +708,11 @@ ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceQueryAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -737,7 +735,7 @@ ScXMLDPSourceQueryContext::~ScXMLDPSourceQueryContext() } SvXMLImportContext *ScXMLDPSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -755,7 +753,7 @@ void ScXMLDPSourceQueryContext::EndElement() ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -766,11 +764,11 @@ ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableSourceServiceAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -808,7 +806,7 @@ ScXMLSourceServiceContext::~ScXMLSourceServiceContext() } SvXMLImportContext *ScXMLSourceServiceContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -874,7 +872,7 @@ ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext() } SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference& /*xAttrList*/ ) + sal_uInt16 nPrefix, const OUString& rLocalName, const Reference& /*xAttrList*/ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -901,7 +899,7 @@ void ScXMLDataPilotGrandTotalContext::EndElement() ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -912,11 +910,11 @@ ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotTableSourceCellRangeAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -940,7 +938,7 @@ ScXMLSourceCellRangeContext::~ScXMLSourceCellRangeContext() } SvXMLImportContext *ScXMLSourceCellRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -966,7 +964,7 @@ void ScXMLSourceCellRangeContext::EndElement() ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -992,11 +990,11 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotFieldAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1053,7 +1051,7 @@ ScXMLDataPilotFieldContext::~ScXMLDataPilotFieldContext() } SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1098,7 +1096,7 @@ void ScXMLDataPilotFieldContext::SetSubTotalName(const OUString& rName) pDim->SetSubtotalName(rName); } -void ScXMLDataPilotFieldContext::AddGroup(const ::std::vector& rMembers, const rtl::OUString& rName) +void ScXMLDataPilotFieldContext::AddGroup(const ::std::vector& rMembers, const OUString& rName) { ScXMLDataPilotGroup aGroup; aGroup.aMembers = rMembers; @@ -1140,8 +1138,8 @@ void ScXMLDataPilotFieldContext::EndElement() while (aItr != aEndItr) { ScDPSaveGroupItem aItem(aItr->aName); - ::std::vector::const_iterator aMembersItr(aItr->aMembers.begin()); - ::std::vector::const_iterator aMembersEndItr(aItr->aMembers.end()); + ::std::vector::const_iterator aMembersItr(aItr->aMembers.begin()); + ::std::vector::const_iterator aMembersEndItr(aItr->aMembers.end()); while (aMembersItr != aMembersEndItr) { aItem.AddElement(*aMembersItr); @@ -1165,7 +1163,7 @@ void ScXMLDataPilotFieldContext::EndElement() } ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -1175,11 +1173,11 @@ ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLI sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1232,7 +1230,7 @@ ScXMLDataPilotFieldReferenceContext::~ScXMLDataPilotFieldReferenceContext() ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1243,11 +1241,11 @@ ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotLevelAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1265,7 +1263,7 @@ ScXMLDataPilotLevelContext::~ScXMLDataPilotLevelContext() } SvXMLImportContext *ScXMLDataPilotLevelContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1302,7 +1300,7 @@ void ScXMLDataPilotLevelContext::EndElement() } ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : @@ -1313,11 +1311,11 @@ ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1353,7 +1351,7 @@ ScXMLDataPilotDisplayInfoContext::~ScXMLDataPilotDisplayInfoContext() } ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : @@ -1364,11 +1362,11 @@ ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImpo sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1402,7 +1400,7 @@ ScXMLDataPilotSortInfoContext::~ScXMLDataPilotSortInfoContext() } ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField) : @@ -1413,11 +1411,11 @@ ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& r sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + OUString sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue(xAttrList->getValueByIndex( i )); + OUString sValue(xAttrList->getValueByIndex( i )); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -1447,7 +1445,7 @@ ScXMLDataPilotLayoutInfoContext::~ScXMLDataPilotLayoutInfoContext() ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1465,7 +1463,7 @@ ScXMLDataPilotSubTotalsContext::~ScXMLDataPilotSubTotalsContext() } SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1519,7 +1517,7 @@ void ScXMLDataPilotSubTotalsContext::SetDisplayName(const OUString& rName) ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) : @@ -1530,11 +1528,11 @@ ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImpo const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotSubTotalAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1557,7 +1555,7 @@ ScXMLDataPilotSubTotalContext::~ScXMLDataPilotSubTotalContext() } SvXMLImportContext *ScXMLDataPilotSubTotalContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1575,7 +1573,7 @@ void ScXMLDataPilotSubTotalContext::EndElement() ScXMLDataPilotMembersContext::ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1590,7 +1588,7 @@ ScXMLDataPilotMembersContext::~ScXMLDataPilotMembersContext() } SvXMLImportContext *ScXMLDataPilotMembersContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1616,7 +1614,7 @@ void ScXMLDataPilotMembersContext::EndElement() ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1630,11 +1628,11 @@ ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataPilotMemberAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1669,7 +1667,7 @@ ScXMLDataPilotMemberContext::~ScXMLDataPilotMemberContext() } SvXMLImportContext *ScXMLDataPilotMemberContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -1696,14 +1694,14 @@ void ScXMLDataPilotMemberContext::EndElement() ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { - rtl::OUString sGroupSource; + OUString sGroupSource; double fStart(0.0); double fEnd(0.0); double fStep(0.0); @@ -1715,11 +1713,11 @@ ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); (void)nPrefix; //! compare below! @@ -1797,7 +1795,7 @@ ScXMLDataPilotGroupsContext::~ScXMLDataPilotGroupsContext() } SvXMLImportContext *ScXMLDataPilotGroupsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1821,7 +1819,7 @@ void ScXMLDataPilotGroupsContext::EndElement() ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1831,11 +1829,11 @@ ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1850,7 +1848,7 @@ ScXMLDataPilotGroupContext::~ScXMLDataPilotGroupContext() } SvXMLImportContext *ScXMLDataPilotGroupContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1875,7 +1873,7 @@ void ScXMLDataPilotGroupContext::EndElement() ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotGroupContext* pTempDataPilotGroup) : @@ -1885,11 +1883,11 @@ ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport& sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_TABLE) { @@ -1904,7 +1902,7 @@ ScXMLDataPilotGroupMemberContext::~ScXMLDataPilotGroupMemberContext() } SvXMLImportContext *ScXMLDataPilotGroupMemberContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 0f722dd89785..1aa851dc1a1e 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -55,14 +55,14 @@ class ScXMLDataPilotTablesContext : public SvXMLImportContext public: ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDataPilotTablesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -73,7 +73,7 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext { struct GrandTotalItem { - ::rtl::OUString maDisplayName; + OUString maDisplayName; bool mbVisible; GrandTotalItem(); }; @@ -83,17 +83,17 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext ScDPDimensionSaveData* pDPDimSaveData; GrandTotalItem maRowGrandTotal; GrandTotalItem maColGrandTotal; - rtl::OUString sDataPilotTableName; - rtl::OUString sApplicationData; - rtl::OUString sDatabaseName; - rtl::OUString sSourceObject; - rtl::OUString sServiceName; - rtl::OUString sServiceSourceName; - rtl::OUString sServiceSourceObject; - rtl::OUString sServiceUsername; - rtl::OUString sServicePassword; - rtl::OUString sButtons; - rtl::OUString sSourceRangeName; + OUString sDataPilotTableName; + OUString sApplicationData; + OUString sDatabaseName; + OUString sSourceObject; + OUString sServiceName; + OUString sServiceSourceName; + OUString sServiceSourceObject; + OUString sServiceUsername; + OUString sServicePassword; + OUString sButtons; + OUString sSourceRangeName; ScRange aSourceCellRangeAddress; ScRange aTargetRangeAddress; ScRange aFilterSourceRange; @@ -120,29 +120,29 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext public: ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDataPilotTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const ::rtl::OUString& rDisplayName); - void SetDatabaseName(const rtl::OUString& sValue) { sDatabaseName = sValue; } - void SetSourceObject(const rtl::OUString& sValue) { sSourceObject = sValue; } + void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const OUString& rDisplayName); + void SetDatabaseName(const OUString& sValue) { sDatabaseName = sValue; } + void SetSourceObject(const OUString& sValue) { sSourceObject = sValue; } void SetNative(bool bValue) { bIsNative = bValue; } - void SetServiceName(const rtl::OUString& sValue) { sServiceName = sValue; } - void SetServiceSourceName(const rtl::OUString& sValue) { sServiceSourceName = sValue; } - void SetServiceSourceObject(const rtl::OUString& sValue) { sServiceSourceObject = sValue; } - void SetServiceUsername(const rtl::OUString& sValue) { sServiceUsername = sValue; } - void SetServicePassword(const rtl::OUString& sValue) { sServicePassword = sValue; } - void SetSourceRangeName(const rtl::OUString& sValue) { sSourceRangeName = sValue; bSourceCellRange = true; } + void SetServiceName(const OUString& sValue) { sServiceName = sValue; } + void SetServiceSourceName(const OUString& sValue) { sServiceSourceName = sValue; } + void SetServiceSourceObject(const OUString& sValue) { sServiceSourceObject = sValue; } + void SetServiceUsername(const OUString& sValue) { sServiceUsername = sValue; } + void SetServicePassword(const OUString& sValue) { sServicePassword = sValue; } + void SetSourceRangeName(const OUString& sValue) { sSourceRangeName = sValue; bSourceCellRange = true; } void SetSourceCellRangeAddress(const ScRange& aValue) { aSourceCellRangeAddress = aValue; bSourceCellRange = true; } void SetSourceQueryParam(const ScQueryParam& aValue) { aSourceQueryParam = aValue; } void SetFilterOutputPosition(const ScAddress& aValue) { aFilterOutputPosition = aValue; } @@ -163,7 +163,7 @@ class ScXMLDPSourceSQLContext : public SvXMLImportContext public: ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -171,7 +171,7 @@ public: virtual ~ScXMLDPSourceSQLContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -188,7 +188,7 @@ class ScXMLDPSourceTableContext : public SvXMLImportContext public: ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -196,7 +196,7 @@ public: virtual ~ScXMLDPSourceTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -213,7 +213,7 @@ class ScXMLDPSourceQueryContext : public SvXMLImportContext public: ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -221,7 +221,7 @@ public: virtual ~ScXMLDPSourceQueryContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -238,7 +238,7 @@ class ScXMLSourceServiceContext : public SvXMLImportContext public: ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -246,7 +246,7 @@ public: virtual ~ScXMLSourceServiceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -260,13 +260,13 @@ class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext ScXMLImport& GetScImport(); ScXMLDataPilotTableContext* mpTableContext; - ::rtl::OUString maDisplayName; + OUString maDisplayName; Orientation meOrientation; bool mbVisible; public: ScXMLDataPilotGrandTotalContext( - ScXMLImport& rImport, sal_uInt16 nPrefix, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTableContext ); @@ -274,7 +274,7 @@ public: virtual ~ScXMLDataPilotGrandTotalContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -291,7 +291,7 @@ class ScXMLSourceCellRangeContext : public SvXMLImportContext public: ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -299,7 +299,7 @@ public: virtual ~ScXMLSourceCellRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -308,8 +308,8 @@ public: struct ScXMLDataPilotGroup { - ::std::vector aMembers; - rtl::OUString aName; + ::std::vector aMembers; + OUString aName; }; class ScXMLDataPilotFieldContext : public SvXMLImportContext @@ -318,9 +318,9 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext ScDPSaveDimension* pDim; ::std::vector aGroups; - rtl::OUString sGroupSource; - rtl::OUString sSelectedPage; - rtl::OUString sName; + OUString sGroupSource; + OUString sSelectedPage; + OUString sName; double fStart; double fEnd; double fStep; @@ -341,7 +341,7 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext public: ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -349,7 +349,7 @@ public: virtual ~ScXMLDataPilotFieldContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -358,12 +358,12 @@ public: void SetShowEmpty(const sal_Bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); } void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); } void AddMember(ScDPSaveMember* pMember); - void SetSubTotalName(const ::rtl::OUString& rName); + void SetSubTotalName(const OUString& rName); void SetFieldReference(const com::sun::star::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); } void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); } void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); } void SetLayoutInfo(const com::sun::star::sheet::DataPilotFieldLayoutInfo& aInfo) { if (pDim) pDim->SetLayoutInfo(&aInfo); } - void SetGrouping(const rtl::OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, + void SetGrouping(const OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, sal_Int32 nPart, sal_Bool bDate, sal_Bool bAutoSt, sal_Bool bAutoE) { bIsGroupField = sal_True; @@ -376,7 +376,7 @@ public: bAutoStart = bAutoSt; bAutoEnd = bAutoE; } - void AddGroup(const ::std::vector& rMembers, const rtl::OUString& rName); + void AddGroup(const ::std::vector& rMembers, const OUString& rName); }; class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext @@ -389,7 +389,7 @@ class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext public: ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -407,7 +407,7 @@ class ScXMLDataPilotLevelContext : public SvXMLImportContext public: ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -415,7 +415,7 @@ public: virtual ~ScXMLDataPilotLevelContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -432,7 +432,7 @@ class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext public: ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -450,7 +450,7 @@ class ScXMLDataPilotSortInfoContext : public SvXMLImportContext public: ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -468,7 +468,7 @@ class ScXMLDataPilotLayoutInfoContext : public SvXMLImportContext public: ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -482,7 +482,7 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext sal_Int16 nFunctionCount; sal_uInt16* pFunctions; - ::rtl::OUString maDisplayName; + OUString maDisplayName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -492,7 +492,7 @@ public: ScXMLDataPilotFieldContext* GetDataPilotField() { return pDataPilotField; } ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -500,13 +500,13 @@ public: virtual ~ScXMLDataPilotSubTotalsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); void AddFunction(sal_Int16 nFunction); - void SetDisplayName(const ::rtl::OUString& rName); + void SetDisplayName(const OUString& rName); }; class ScXMLDataPilotSubTotalContext : public SvXMLImportContext @@ -519,7 +519,7 @@ class ScXMLDataPilotSubTotalContext : public SvXMLImportContext public: ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals); @@ -527,7 +527,7 @@ public: virtual ~ScXMLDataPilotSubTotalContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -544,7 +544,7 @@ class ScXMLDataPilotMembersContext : public SvXMLImportContext public: ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -552,7 +552,7 @@ public: virtual ~ScXMLDataPilotMembersContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -563,8 +563,8 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - rtl::OUString sName; - rtl::OUString maDisplayName; + OUString sName; + OUString maDisplayName; sal_Bool bDisplay; sal_Bool bDisplayDetails; sal_Bool bHasName; @@ -575,7 +575,7 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext public: ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -583,7 +583,7 @@ public: virtual ~ScXMLDataPilotMemberContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -600,7 +600,7 @@ class ScXMLDataPilotGroupsContext : public SvXMLImportContext public: ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -608,7 +608,7 @@ public: virtual ~ScXMLDataPilotGroupsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -619,8 +619,8 @@ class ScXMLDataPilotGroupContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - rtl::OUString sName; - ::std::vector aMembers; + OUString sName; + ::std::vector aMembers; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -628,7 +628,7 @@ class ScXMLDataPilotGroupContext : public SvXMLImportContext public: ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -636,20 +636,20 @@ public: virtual ~ScXMLDataPilotGroupContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void AddMember(const rtl::OUString& sMember) { aMembers.push_back(sMember); } + void AddMember(const OUString& sMember) { aMembers.push_back(sMember); } }; class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext { ScXMLDataPilotGroupContext* pDataPilotGroup; - rtl::OUString sName; + OUString sName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -657,7 +657,7 @@ class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext public: ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotGroupContext* pDataPilotGroup); @@ -665,7 +665,7 @@ public: virtual ~ScXMLDataPilotGroupMemberContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 75dbf9796c30..cd34058438eb 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -57,13 +57,12 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; //------------------------------------------------------------------ ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -78,7 +77,7 @@ ScXMLDatabaseRangesContext::~ScXMLDatabaseRangesContext() } SvXMLImportContext *ScXMLDatabaseRangesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -107,7 +106,7 @@ void ScXMLDatabaseRangesContext::EndElement() ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -141,11 +140,11 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -227,7 +226,7 @@ ScXMLDatabaseRangeContext::~ScXMLDatabaseRangeContext() } SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -499,7 +498,7 @@ void ScXMLDatabaseRangeContext::EndElement() ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -510,11 +509,11 @@ ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceSQLAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -543,7 +542,7 @@ ScXMLSourceSQLContext::~ScXMLSourceSQLContext() } SvXMLImportContext *ScXMLSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -572,7 +571,7 @@ void ScXMLSourceSQLContext::EndElement() ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -583,11 +582,11 @@ ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -611,7 +610,7 @@ ScXMLSourceTableContext::~ScXMLSourceTableContext() } SvXMLImportContext *ScXMLSourceTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -640,7 +639,7 @@ void ScXMLSourceTableContext::EndElement() ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -651,11 +650,11 @@ ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSourceQueryAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -679,7 +678,7 @@ ScXMLSourceQueryContext::~ScXMLSourceQueryContext() } SvXMLImportContext *ScXMLSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -708,22 +707,22 @@ void ScXMLSourceQueryContext::EndElement() ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext( pTempDatabaseRangeContext ) { - rtl::OUString sConRes; + OUString sConRes; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_XLINK) { @@ -740,7 +739,7 @@ ScXMLConResContext::~ScXMLConResContext() } SvXMLImportContext *ScXMLConResContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -758,7 +757,7 @@ void ScXMLConResContext::EndElement() ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -769,11 +768,11 @@ ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDatabaseRangeSubTotalRulesAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -801,7 +800,7 @@ ScXMLSubTotalRulesContext::~ScXMLSubTotalRulesContext() } SvXMLImportContext *ScXMLSubTotalRulesContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -836,7 +835,7 @@ void ScXMLSubTotalRulesContext::EndElement() ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -848,11 +847,11 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetSubTotalRulesSortGroupsAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -860,7 +859,7 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, { if (sValue.getLength() > 8) { - rtl::OUString sTemp = sValue.copy(0, 8); + OUString sTemp = sValue.copy(0, 8); if (sTemp.compareToAscii(SC_USERLIST) == 0) { pDatabaseRangeContext->SetSubTotalsEnabledUserList(true); @@ -902,7 +901,7 @@ ScXMLSortGroupsContext::~ScXMLSortGroupsContext() } SvXMLImportContext *ScXMLSortGroupsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -920,7 +919,7 @@ void ScXMLSortGroupsContext::EndElement() ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -931,11 +930,11 @@ ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetSubTotalRulesSubTotalRuleAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -953,7 +952,7 @@ ScXMLSubTotalRuleContext::~ScXMLSubTotalRuleContext() } SvXMLImportContext *ScXMLSubTotalRuleContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -984,7 +983,7 @@ void ScXMLSubTotalRuleContext::EndElement() ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSubTotalRuleContext* pTempSubTotalRuleContext) : @@ -995,11 +994,11 @@ ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetSubTotalRuleSubTotalFieldAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -1022,7 +1021,7 @@ ScXMLSubTotalFieldContext::~ScXMLSubTotalFieldContext() } SvXMLImportContext *ScXMLSubTotalFieldContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 6633eeefc03b..7e0a6d8b2b75 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -46,14 +46,14 @@ class ScXMLDatabaseRangesContext : public SvXMLImportContext public: ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -70,10 +70,10 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext { boost::scoped_ptr mpQueryParam; ScRange maRange; - rtl::OUString sDatabaseRangeName; - rtl::OUString sConnectionResource; - rtl::OUString sDatabaseName; - rtl::OUString sSourceObject; + OUString sDatabaseRangeName; + OUString sConnectionResource; + OUString sDatabaseName; + OUString sSourceObject; com::sun::star::uno::Sequence aSortSequence; std::vector < ScSubTotalRule > aSubTotalRules; com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress; @@ -103,27 +103,27 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } - ScDBData* ConvertToDBData(const ::rtl::OUString& rName); + ScDBData* ConvertToDBData(const OUString& rName); public: ScXMLDatabaseRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void SetDatabaseName(const rtl::OUString sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } - void SetConnectionResource(const rtl::OUString sTempConRes) { sConnectionResource = sTempConRes; } - void SetSourceObject(const rtl::OUString sTempSourceObject) { sSourceObject = sTempSourceObject; } + void SetDatabaseName(const OUString sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } + void SetConnectionResource(const OUString sTempConRes) { sConnectionResource = sTempConRes; } + void SetSourceObject(const OUString sTempSourceObject) { sSourceObject = sTempSourceObject; } void SetSourceType(const com::sun::star::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; } void SetNative(const bool bTempNative) { bNative = bTempNative; } void SetSubTotalsBindFormatsToContent(const bool bTemp ) { bSubTotalsBindFormatsToContent = bTemp; } @@ -142,7 +142,7 @@ public: class ScXMLSourceSQLContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - rtl::OUString sDBName; + OUString sDBName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -150,7 +150,7 @@ class ScXMLSourceSQLContext : public SvXMLImportContext public: ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -158,7 +158,7 @@ public: virtual ~ScXMLSourceSQLContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -168,7 +168,7 @@ public: class ScXMLSourceTableContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - rtl::OUString sDBName; + OUString sDBName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -176,7 +176,7 @@ class ScXMLSourceTableContext : public SvXMLImportContext public: ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -184,7 +184,7 @@ public: virtual ~ScXMLSourceTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -194,7 +194,7 @@ public: class ScXMLSourceQueryContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - rtl::OUString sDBName; + OUString sDBName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -202,7 +202,7 @@ class ScXMLSourceQueryContext : public SvXMLImportContext public: ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -210,7 +210,7 @@ public: virtual ~ScXMLSourceQueryContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -227,7 +227,7 @@ class ScXMLConResContext : public SvXMLImportContext public: ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -235,7 +235,7 @@ public: virtual ~ScXMLConResContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -252,7 +252,7 @@ class ScXMLSubTotalRulesContext : public SvXMLImportContext public: ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -260,7 +260,7 @@ public: virtual ~ScXMLSubTotalRulesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -277,7 +277,7 @@ class ScXMLSortGroupsContext : public SvXMLImportContext public: ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -285,7 +285,7 @@ public: virtual ~ScXMLSortGroupsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -303,7 +303,7 @@ class ScXMLSubTotalRuleContext : public SvXMLImportContext public: ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -311,7 +311,7 @@ public: virtual ~ScXMLSubTotalRuleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -325,8 +325,8 @@ public: class ScXMLSubTotalFieldContext : public SvXMLImportContext { ScXMLSubTotalRuleContext* pSubTotalRuleContext; - rtl::OUString sFieldNumber; - rtl::OUString sFunction; + OUString sFieldNumber; + OUString sFunction; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -334,7 +334,7 @@ class ScXMLSubTotalFieldContext : public SvXMLImportContext public: ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSubTotalRuleContext* pSubTotalRuleContext); @@ -342,7 +342,7 @@ public: virtual ~ScXMLSubTotalFieldContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 358172ab951b..ec3a741bab32 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -152,8 +152,6 @@ using namespace formula; using namespace com::sun::star; using namespace xmloff::token; using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; @@ -215,13 +213,13 @@ OUString lcl_GetRawString( ScDocument* pDoc, const ScAddress& rPos ) OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_getImplementationName() ); - return uno::Sequence< rtl::OUString >( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_getImplementationName() ); + return uno::Sequence< OUString >( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( @@ -232,13 +230,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLMetaExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLMetaExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Meta_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Meta_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( @@ -249,13 +247,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLStylesExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLStylesExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Styles_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Styles_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( @@ -266,13 +264,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLContentExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLContentExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Content_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Content_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance( @@ -283,13 +281,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLSettingsExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLSettingsExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOOoExport_Settings_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOOoExport_Settings_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance( @@ -302,13 +300,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstanc OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -320,13 +318,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance( OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Meta_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Meta_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -338,13 +336,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance( OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Styles_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Styles_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -356,13 +354,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstanc OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisContentExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Content_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Content_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -374,13 +372,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstan OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLOasisExport_Settings_getImplementationName() ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( ScXMLOasisExport_Settings_getImplementationName() ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -411,7 +409,7 @@ void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShap if( xShapeProp.is() ) { sal_Int16 nLayerID = 0; - if( (xShapeProp->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ))) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) ) + if( (xShapeProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( SC_LAYERID ))) >>= nLayerID) && (nLayerID == SC_LAYER_BACK) ) GetExport().AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_BACKGROUND, XML_TRUE); } } @@ -422,12 +420,12 @@ sal_Int16 ScXMLExport::GetFieldUnit() { com::sun::star::uno::Reference xProperties( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ), + OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ), com::sun::star::uno::UNO_QUERY); if (xProperties.is()) { sal_Int16 nFieldUnit = 0; - if (xProperties->getPropertyValue(rtl::OUString("Metric")) >>= nFieldUnit) + if (xProperties->getPropertyValue(OUString("Metric")) >>= nFieldUnit) return nFieldUnit; } return 0; @@ -494,21 +492,21 @@ ScXMLExport::ScXMLExport( xRowStylesExportPropertySetMapper = new ScXMLRowExportPropertyMapper(xRowStylesPropertySetMapper); xTableStylesExportPropertySetMapper = new ScXMLTableExportPropertyMapper(xTableStylesPropertySetMapper); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), - xCellStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), - xColumnStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), - xRowStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); - GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), - xTableStylesExportPropertySetMapper, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), + xCellStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)), + xColumnStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), + xRowStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX))); + GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)), + xTableStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX))); if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) { // This name is reserved for the external ref cache tables. This // should not conflict with user-defined styles since this name is // used for a table style which is not available in the UI. - sExternalRefTabStyleName = rtl::OUString("ta_extref"); + sExternalRefTabStyleName = OUString("ta_extref"); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sExternalRefTabStyleName); sAttrName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_NAME)); @@ -803,11 +801,11 @@ void ScXMLExport::_ExportMeta() CollectSharedData(nTableCount, nShapesCount); uno::Sequence stats(3); - stats[0] = beans::NamedValue(::rtl::OUString("TableCount"), + stats[0] = beans::NamedValue(OUString("TableCount"), uno::makeAny(nTableCount)); - stats[1] = beans::NamedValue(::rtl::OUString("CellCount"), + stats[1] = beans::NamedValue(OUString("CellCount"), uno::makeAny(nCellCount)); - stats[2] = beans::NamedValue(::rtl::OUString("ObjectCount"), + stats[2] = beans::NamedValue(OUString("ObjectCount"), uno::makeAny(nShapesCount)); // update document statistics at the model @@ -1150,7 +1148,7 @@ void ScXMLExport::WriteRowContent() AddAttribute(XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, pValidationsContainer->GetValidationName(nPrevValidationIndex)); if (nCols > 1) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber(aBuf, nCols); AddAttribute(sAttrColumnsRepeated, aBuf.makeStringAndClear()); } @@ -1174,7 +1172,7 @@ void ScXMLExport::WriteRowContent() AddAttribute(XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, pValidationsContainer->GetValidationName(nPrevValidationIndex)); if (nCols > 1) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber(aBuf, nCols); AddAttribute(sAttrColumnsRepeated, aBuf.makeStringAndClear()); } @@ -1196,7 +1194,7 @@ void ScXMLExport::WriteRowStartTag( } if (nEqualRows > 1) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber(aBuf, nEqualRows); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, aBuf.makeStringAndClear()); } @@ -1448,7 +1446,7 @@ void ScXMLExport::ExportFormatRanges(const sal_Int32 nStartCol, const sal_Int32 void ScXMLExport::GetColumnRowHeader(bool& rHasColumnHeader, table::CellRangeAddress& rColumnHeaderRange, bool& rHasRowHeader, table::CellRangeAddress& rRowHeaderRange, - rtl::OUString& rPrintRanges) const + OUString& rPrintRanges) const { uno::Reference xPrintAreas (xCurrentTable, uno::UNO_QUERY); if (xPrintAreas.is()) @@ -1506,7 +1504,7 @@ void ScXMLExport::SetBodyAttributes() if (pDoc && pDoc->IsDocProtected()) { AddAttribute(XML_NAMESPACE_TABLE, XML_STRUCTURE_PROTECTED, XML_TRUE); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; uno::Sequence aPassHash; ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED; const ScDocProtection* p = pDoc->GetDocProtection(); @@ -1628,7 +1626,7 @@ void ScXMLExport::CopySourceStream( sal_Int32 nStartOffset, sal_Int32 nEndOffset if ( getExportFlags() & EXPORT_PRETTY ) { - const rtl::OString aOutStr("\n "); + const OString aOutStr("\n "); uno::Sequence aOutSeq( (sal_Int8*)aOutStr.getStr(), aOutStr.getLength() ); xDestStream->writeBytes( aOutSeq ); } @@ -1751,15 +1749,15 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) sal_Int32 nShapesCount(0); CollectSharedData(nTableCount, nShapesCount); } - ScXMLStyleExport aStylesExp(*this, rtl::OUString(), GetAutoStylePool().get()); + ScXMLStyleExport aStylesExp(*this, OUString(), GetAutoStylePool().get()); if (GetModel().is()) { uno::Reference xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); + uno::Reference xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) - aStylesExp.exportDefaultStyle(xProperties, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper); + aStylesExp.exportDefaultStyle(xProperties, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper); if (pSharedData->HasShapes()) { GetShapeExport()->ExportGraphicDefaults(); @@ -1771,11 +1769,11 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) uno::Reference xStylesFamilies(xStyleFamiliesSupplier->getStyleFamilies()); if (xStylesFamilies.is()) { - uno::Reference xCellStyles(xStylesFamilies->getByName(rtl::OUString("CellStyles")), uno::UNO_QUERY); + uno::Reference xCellStyles(xStylesFamilies->getByName(OUString("CellStyles")), uno::UNO_QUERY); if (xCellStyles.is()) { sal_Int32 nCount(xCellStyles->getCount()); - rtl::OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); + OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); for (sal_Int32 i = 0; i < nCount; ++i) { uno::Reference xCellProperties(xCellStyles->getByIndex(i), uno::UNO_QUERY); @@ -1792,23 +1790,23 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) } exportDataStyles(); - aStylesExp.exportStyleFamily(rtl::OUString("CellStyles"), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); + aStylesExp.exportStyleFamily(OUString("CellStyles"), + OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); SvXMLExport::_ExportStyles(bUsed); } void ScXMLExport::AddStyleFromCells(const uno::Reference& xProperties, const uno::Reference& xTable, - sal_Int32 nTable, const rtl::OUString* pOldName) + sal_Int32 nTable, const OUString* pOldName) { //! pass xCellRanges instead uno::Reference xCellRanges( xProperties, uno::UNO_QUERY ); - rtl::OUString SC_SCELLPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); - rtl::OUString SC_NUMBERFORMAT(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); + OUString SC_SCELLPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)); + OUString SC_NUMBERFORMAT(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_NUMFMT)); - rtl::OUString sStyleName; + OUString sStyleName; sal_Int32 nNumberFormat(-1); sal_Int32 nValidationIndex(-1); std::vector< XMLPropertyState > xPropStates(xCellStylesExportPropertySetMapper->Filter( xProperties )); @@ -1877,18 +1875,18 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference& x { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_CELL, *pOldName); // add to pCellStyles, so the name is found for normal sheets - rtl::OUString* pTemp(new rtl::OUString(*pOldName)); + OUString* pTemp(new OUString(*pOldName)); if (!pCellStyles->AddStyleName(pTemp, nIndex)) delete pTemp; } } else { - rtl::OUString sName; + OUString sName; bool bIsAutoStyle(true); if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates)) { - rtl::OUString* pTemp(new rtl::OUString(sName)); + OUString* pTemp(new OUString(sName)); if (!pCellStyles->AddStyleName(pTemp, nIndex)) delete pTemp; } @@ -1910,7 +1908,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference& x } else { - rtl::OUString* pTemp(new rtl::OUString(EncodeStyleName(sStyleName))); + OUString* pTemp(new OUString(EncodeStyleName(sStyleName))); sal_Int32 nIndex(0); if (!pCellStyles->AddStyleName(pTemp, nIndex, false)) { @@ -1939,9 +1937,9 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference& x } void ScXMLExport::AddStyleFromColumn(const uno::Reference& xColumnProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible) + const OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible) { - rtl::OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); + OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); std::vector xPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties)); if(!xPropStates.empty()) @@ -1958,23 +1956,23 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference& ++aItr; } - rtl::OUString sParent; + OUString sParent; if (pOldName) { if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates)) { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_COLUMN, *pOldName); // add to pColumnStyles, so the name is found for normal sheets - rtl::OUString* pTemp(new rtl::OUString(*pOldName)); + OUString* pTemp(new OUString(*pOldName)); rIndex = pColumnStyles->AddStyleName(pTemp); } } else { - rtl::OUString sName; + OUString sName; if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates)) { - rtl::OUString* pTemp(new rtl::OUString(sName)); + OUString* pTemp(new OUString(sName)); rIndex = pColumnStyles->AddStyleName(pTemp); } else @@ -1984,30 +1982,30 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference& } void ScXMLExport::AddStyleFromRow(const uno::Reference& xRowProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex) + const OUString* pOldName, sal_Int32& rIndex) { - rtl::OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); + OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)); std::vector xPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties)); if(!xPropStates.empty()) { - rtl::OUString sParent; + OUString sParent; if (pOldName) { if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates)) { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_ROW, *pOldName); // add to pRowStyles, so the name is found for normal sheets - rtl::OUString* pTemp(new rtl::OUString(*pOldName)); + OUString* pTemp(new OUString(*pOldName)); rIndex = pRowStyles->AddStyleName(pTemp); } } else { - rtl::OUString sName; + OUString sName; if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates)) { - rtl::OUString* pTemp(new rtl::OUString(sName)); + OUString* pTemp(new OUString(sName)); rIndex = pRowStyles->AddStyleName(pTemp); } else @@ -2153,8 +2151,8 @@ void ScXMLExport::_ExportAutoStyles() if (xTableProperties.is()) { std::vector xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties)); - rtl::OUString sParent; - rtl::OUString sName( aTableIter->maName ); + OUString sParent; + OUString sName( aTableIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sName); } @@ -2191,8 +2189,8 @@ void ScXMLExport::_ExportAutoStyles() if ( !aNoteIter->maStyleName.isEmpty() ) { std::vector xPropStates(xShapeMapper->Filter(xShapeProperties)); - rtl::OUString sParent; - rtl::OUString sName( aNoteIter->maStyleName ); + OUString sParent; + OUString sName( aNoteIter->maStyleName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_SD_GRAPHICS_ID, sName); } @@ -2200,8 +2198,8 @@ void ScXMLExport::_ExportAutoStyles() { std::vector xPropStates( GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter(xShapeProperties)); - rtl::OUString sParent; - rtl::OUString sName( aNoteIter->maTextStyle ); + OUString sParent; + OUString sName( aNoteIter->maTextStyle ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName); } @@ -2236,8 +2234,8 @@ void ScXMLExport::_ExportAutoStyles() if ( xParaProp.is() ) { std::vector xPropStates(xParaPropMapper->Filter(xParaProp)); - rtl::OUString sParent; - rtl::OUString sName( aNoteParaIter->maName ); + OUString sParent; + OUString sName( aNoteParaIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName); } @@ -2273,8 +2271,8 @@ void ScXMLExport::_ExportAutoStyles() pCursor->SetSelection( aNoteTextIter->maSelection ); std::vector xPropStates(xTextPropMapper->Filter(xCursorProp)); - rtl::OUString sParent; - rtl::OUString sName( aNoteTextIter->maName ); + OUString sParent; + OUString sName( aNoteTextIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName); } @@ -2307,8 +2305,8 @@ void ScXMLExport::_ExportAutoStyles() pCursor->SetSelection( aTextIter->maSelection ); std::vector xPropStates(xTextPropMapper->Filter(xCursorProp)); - rtl::OUString sParent; - rtl::OUString sName( aTextIter->maName ); + OUString sParent; + OUString sName( aTextIter->maName ); GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName); } @@ -2345,8 +2343,8 @@ void ScXMLExport::_ExportAutoStyles() std::vector xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties)); if(!xPropStates.empty()) { - rtl::OUString sParent; - rtl::OUString sName; + OUString sParent; + OUString sName; GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates); aTableStyles.push_back(sName); } @@ -2661,7 +2659,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference( nTable ); - rtl::OUString sOUTableName(xName->getName()); + OUString sOUTableName(xName->getName()); AddAttribute(sAttrName, sOUTableName); AddAttribute(sAttrStyleName, aTableStyles[nTable]); @@ -2675,7 +2673,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const ReferenceGetTabProtection(nTable); if (pProtect) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED; if (pProtect->hasPasswordHash(PASSHASH_SHA1)) { @@ -2710,7 +2708,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const ReferenceisOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS)) AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TRUE); - rtl::OUString aElemName = GetNamespaceMap().GetQNameByKey( + OUString aElemName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE_PROTECTION)); SvXMLElementExport aElemProtected(*this, aElemName, true, true); @@ -2862,8 +2860,8 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { sal_Int32 nColumns(aCell.aMatrixRange.EndColumn - aCell.aMatrixRange.StartColumn + 1); sal_Int32 nRows(aCell.aMatrixRange.EndRow - aCell.aMatrixRange.StartRow + 1); - rtl::OUStringBuffer sColumns; - rtl::OUStringBuffer sRows; + OUStringBuffer sColumns; + OUStringBuffer sRows; ::sax::Converter::convertNumber(sColumns, nColumns); ::sax::Converter::convertNumber(sRows, nRows); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_MATRIX_COLUMNS_SPANNED, sColumns.makeStringAndClear()); @@ -2892,7 +2890,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { if (GetCellText(aCell, aCellPos)) { - rtl::OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); + OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( sFormula, aCell.sStringValue, true, true); } @@ -2904,14 +2902,14 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) aCellVal.assign(*pDoc, aCellPos); if (aCellVal.meType == CELLTYPE_FORMULA) { - rtl::OUStringBuffer sFormula; + OUStringBuffer sFormula; ScFormulaCell* pFormulaCell = aCellVal.mpFormula; if (!bIsMatrix || (bIsMatrix && bIsFirstMatrixCell)) { const formula::FormulaGrammar::Grammar eGrammar = pDoc->GetStorageGrammar(); sal_uInt16 nNamespacePrefix = (eGrammar == formula::FormulaGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC); pFormulaCell->GetFormula(sFormula, eGrammar); - rtl::OUString sOUFormula(sFormula.makeStringAndClear()); + OUString sOUFormula(sFormula.makeStringAndClear()); if (!bIsMatrix) { AddAttribute(sAttrFormula, GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sOUFormula, false )); @@ -2924,7 +2922,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) if (pFormulaCell->IsValue()) { bool bIsStandard; - rtl::OUString sCurrency; + OUString sCurrency; GetNumberFormatAttributesExportHelper()->GetCellType(aCell.nNumberFormat, sCurrency, bIsStandard); if (bIsStandard) { @@ -2957,7 +2955,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) // added to avoid warnings } } - rtl::OUString* pCellString(&sElemCell); + OUString* pCellString(&sElemCell); if (aCell.bIsCovered) { pCellString = &sElemCoveredCell; @@ -2968,8 +2966,8 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { sal_Int32 nColumns(aCell.aMergeRange.EndColumn - aCell.aMergeRange.StartColumn + 1); sal_Int32 nRows(aCell.aMergeRange.EndRow - aCell.aMergeRange.StartRow + 1); - rtl::OUStringBuffer sColumns; - rtl::OUStringBuffer sRows; + OUStringBuffer sColumns; + OUStringBuffer sRows; ::sax::Converter::convertNumber(sColumns, nColumns); ::sax::Converter::convertNumber(sRows, nRows); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED, sColumns.makeStringAndClear()); @@ -3011,31 +3009,31 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, { uno::Reference < beans::XPropertySet > xShapeProps ( xShape, uno::UNO_QUERY ); bool bIsChart( false ); - rtl::OUString sPropCLSID ("CLSID"); - rtl::OUString sPropModel ("Model"); - rtl::OUString sPersistName ("PersistName"); + OUString sPropCLSID ("CLSID"); + OUString sPropModel ("Model"); + OUString sPersistName ("PersistName"); if (xShapeProps.is()) { sal_Int32 nZOrder = 0; - if (xShapeProps->getPropertyValue(rtl::OUString("ZOrder")) >>= nZOrder) + if (xShapeProps->getPropertyValue(OUString("ZOrder")) >>= nZOrder) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nZOrder); AddAttribute(XML_NAMESPACE_DRAW, XML_ZINDEX, sBuffer.makeStringAndClear()); } uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xShapeProps->getPropertySetInfo(); if( xPropSetInfo->hasPropertyByName( sPropCLSID ) ) { - rtl::OUString sCLSID; + OUString sCLSID; if (xShapeProps->getPropertyValue( sPropCLSID ) >>= sCLSID) { if ( sCLSID.equalsIgnoreAsciiCase(GetChartExport()->getChartCLSID()) ) { // we have a chart - ::rtl::OUString sRanges; + OUString sRanges; if ( pDoc ) { - ::rtl::OUString aChartName; + OUString aChartName; xShapeProps->getPropertyValue( sPersistName ) >>= aChartName; ScChartListenerCollection* pCollection = pDoc->GetChartListenerCollection(); if (pCollection) @@ -3076,7 +3074,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, { // we have a chart that gets its data from Calc bIsChart = true; - uno::Sequence< ::rtl::OUString > aRepresentations( + uno::Sequence< OUString > aRepresentations( xReceiver->getUsedRangeRepresentations()); SvXMLAttributeList* pAttrList = 0; if(aRepresentations.getLength()) @@ -3101,12 +3099,12 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, if (!bIsChart) { // #i66550 HLINK_FOR_SHAPES - rtl::OUString sHlink; + OUString sHlink; try { uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); if ( xProps.is() ) - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink; + xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) >>= sHlink; } catch ( const beans::UnknownPropertyException& ) { @@ -3160,10 +3158,10 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell) aPoint.X = 2 * aItr->xShape->getPosition().X + aItr->xShape->getSize().Width - aPoint.X; if ( !aItr->xShape->getShapeType().equals(sCaptionShape) ) { - rtl::OUString sEndAddress; + OUString sEndAddress; ScRangeStringConverter::GetStringFromAddress(sEndAddress, aItr->aEndAddress, pDoc, FormulaGrammar::CONV_OOO); AddAttribute(XML_NAMESPACE_TABLE, XML_END_CELL_ADDRESS, sEndAddress); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; GetMM100UnitConverter().convertMeasureToXML( sBuffer, aItr->nEndX); AddAttribute(XML_NAMESPACE_TABLE, XML_END_X, sBuffer.makeStringAndClear()); @@ -3237,7 +3235,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > { if (pCurrentCell && pCurrentCell->xNoteShape.is() && pCurrentCell->xNoteShape.get() == xShape.get() && pCurrentCell->xAnnotation.is()) { - rtl::OUString sAuthor(pCurrentCell->xAnnotation->getAuthor()); + OUString sAuthor(pCurrentCell->xAnnotation->getAuthor()); if (!sAuthor.isEmpty()) { SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, @@ -3254,7 +3252,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > sal_uInt32 nfIndex = pNumForm->GetFormatIndex(NF_DATE_SYS_DDMMYYYY, LANGUAGE_SYSTEM); if (pNumForm->IsNumberFormat(aDate, nfIndex, fDate)) { - rtl::OUStringBuffer sBuf; + OUStringBuffer sBuf; GetMM100UnitConverter().convertDateTime(sBuf, fDate,true); SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, XML_DATE, true, @@ -3266,7 +3264,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > SvXMLElementExport aDateElem( *this, XML_NAMESPACE_META, XML_DATE_STRING, true, false ); - Characters(rtl::OUString(aDate)); + Characters(OUString(aDate)); } } else @@ -3274,7 +3272,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > SvXMLElementExport aDateElem( *this, XML_NAMESPACE_META, XML_DATE_STRING, true, false ); - Characters(rtl::OUString(aDate)); + Characters(OUString(aDate)); } } } @@ -3507,19 +3505,19 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference xPropertySet(xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN))) )); - bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE))) )); - bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS))) )); - bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE))) )); - bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED))) )); - bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED))) )); + bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN))) )); + bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE))) )); + bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS))) )); + bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE))) )); + bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED))) )); + bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED))) )); sal_uInt16 nYear2000 (pDoc ? pDoc->GetDocOptions().GetYear2000() : 0); sal_Int32 nIterationCount(100); - xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT))) >>= nIterationCount; + xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT))) >>= nIterationCount; double fIterationEpsilon = 0; - xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON))) >>= fIterationEpsilon; + xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON))) >>= fIterationEpsilon; util::Date aNullDate; - xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE))) >>= aNullDate; + xPropertySet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE))) >>= aNullDate; if (bCalcAsShown || bIgnoreCase || !bLookUpLabels || !bMatchWholeCell || !bUseRegularExpressions || bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001) || aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 || nYear2000 != 1930) @@ -3536,7 +3534,7 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference getLinkMode()); if (nMode != sheet::SheetLinkMode_NONE) { - rtl::OUString sLink (xLinkable->getLinkUrl()); + OUString sLink (xLinkable->getLinkUrl()); uno::Reference xProps (GetModel(), uno::UNO_QUERY); if (xProps.is()) { - uno::Reference xIndex(xProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETLINKS))), uno::UNO_QUERY); + uno::Reference xIndex(xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETLINKS))), uno::UNO_QUERY); if (xIndex.is()) { sal_Int32 nCount(xIndex->getCount()); @@ -3598,20 +3596,20 @@ void ScXMLExport::WriteTableSource() xLinkProps.set(xIndex->getByIndex(i), uno::UNO_QUERY); if (xLinkProps.is()) { - rtl::OUString sNewLink; - if (xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_LINKURL))) >>= sNewLink) + OUString sNewLink; + if (xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_LINKURL))) >>= sNewLink) bFound = sLink.equals(sNewLink); } } if (bFound && xLinkProps.is()) { - rtl::OUString sFilter; - rtl::OUString sFilterOptions; - rtl::OUString sTableName (xLinkable->getLinkSheetName()); + OUString sFilter; + OUString sFilterOptions; + OUString sTableName (xLinkable->getLinkSheetName()); sal_Int32 nRefresh(0); - xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTER))) >>= sFilter; - xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTOPT))) >>= sFilterOptions; - xLinkProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_REFDELAY))) >>= nRefresh; + xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTER))) >>= sFilter; + xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FILTOPT))) >>= sFilterOptions; + xLinkProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_REFDELAY))) >>= nRefresh; if (!sLink.isEmpty()) { AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE); @@ -3626,7 +3624,7 @@ void ScXMLExport::WriteTableSource() AddAttribute(XML_NAMESPACE_TABLE, XML_MODE, XML_COPY_RESULTS_ONLY); if( nRefresh ) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDuration( sBuffer, (double)nRefresh / 86400 ); AddAttribute( XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, sBuffer.makeStringAndClear() ); @@ -3646,13 +3644,13 @@ void ScXMLExport::WriteScenario() { if (pDoc && pDoc->IsScenario(static_cast(nCurrentTable))) { - rtl::OUString sComment; + OUString sComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData(static_cast(nCurrentTable), sComment, aColor, nFlags); if (!(nFlags & SC_SCENARIO_SHOWFRAME)) AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_FALSE); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, aColor.GetColor()); AddAttribute(XML_NAMESPACE_TABLE, XML_BORDER_COLOR, aBuffer.makeStringAndClear()); if (!(nFlags & SC_SCENARIO_TWOWAY)) @@ -3667,7 +3665,7 @@ void ScXMLExport::WriteScenario() pDoc->IsActiveScenario(static_cast(nCurrentTable))); AddAttribute(XML_NAMESPACE_TABLE, XML_IS_ACTIVE, aBuffer.makeStringAndClear()); const ScRangeList* pRangeList = pDoc->GetScenarioRanges(static_cast(nCurrentTable)); - rtl::OUString sRangeListStr; + OUString sRangeListStr; ScRangeStringConverter::GetStringFromRangeList( sRangeListStr, pRangeList, pDoc, FormulaGrammar::CONV_OOO ); AddAttribute(XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, sRangeListStr); if (!sComment.isEmpty()) @@ -3737,23 +3735,23 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) { AddAttribute(sAttrName, it->second->GetName()); - rtl::OUString sBaseCellAddress; + OUString sBaseCellAddress; ScRangeStringConverter::GetStringFromAddress( sBaseCellAddress, it->second->GetPos(), pDoc, FormulaGrammar::CONV_OOO, ' ', false, SCA_ABS_3D); AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, sBaseCellAddress); String sSymbol; it->second->GetSymbol(sSymbol, pDoc->GetStorageGrammar()); - rtl::OUString sTempSymbol(sSymbol); + OUString sTempSymbol(sSymbol); ScRange aRange; if (it->second->IsReference(aRange)) { - rtl::OUString sContent(sTempSymbol.copy(1, sTempSymbol.getLength() -2 )); + OUString sContent(sTempSymbol.copy(1, sTempSymbol.getLength() -2 )); AddAttribute(XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, sContent); sal_Int32 nRangeType = it->second->GetUnoType(); - rtl::OUStringBuffer sBufferRangeType; + OUStringBuffer sBufferRangeType; if ((nRangeType & sheet::NamedRangeFlag::COLUMN_HEADER) == sheet::NamedRangeFlag::COLUMN_HEADER) sBufferRangeType.append(GetXMLToken(XML_REPEAT_COLUMN)); if ((nRangeType & sheet::NamedRangeFlag::ROW_HEADER) == sheet::NamedRangeFlag::ROW_HEADER) @@ -3774,7 +3772,7 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) sBufferRangeType.appendAscii(" "); sBufferRangeType.append(GetXMLToken(XML_PRINT_RANGE)); } - rtl::OUString sRangeType = sBufferRangeType.makeStringAndClear(); + OUString sRangeType = sBufferRangeType.makeStringAndClear(); if (!sRangeType.isEmpty()) AddAttribute(XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS, sRangeType); SvXMLElementExport aElemNR(*this, XML_NAMESPACE_TABLE, XML_NAMED_RANGE, true, true); @@ -3790,33 +3788,33 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) namespace { -rtl::OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry, bool bFirst = true) +OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry, bool bFirst = true) { switch(rEntry.GetType()) { case COLORSCALE_MIN: - return rtl::OUString("minimum"); + return OUString("minimum"); case COLORSCALE_MAX: - return rtl::OUString("maximum"); + return OUString("maximum"); case COLORSCALE_PERCENT: - return rtl::OUString("percent"); + return OUString("percent"); case COLORSCALE_PERCENTILE: - return rtl::OUString("percentile"); + return OUString("percentile"); case COLORSCALE_FORMULA: - return rtl::OUString("formula"); + return OUString("formula"); case COLORSCALE_VALUE: - return rtl::OUString("number"); + return OUString("number"); case COLORSCALE_AUTO: // only important for data bars if(bFirst) - return rtl::OUString("auto-minimum"); + return OUString("auto-minimum"); else - return rtl::OUString("auto-maximum"); + return OUString("auto-maximum"); } - return rtl::OUString(); + return OUString(); } -rtl::OUString getIconSetName(ScIconSetType eType) +OUString getIconSetName(ScIconSetType eType) { const char* pName = NULL; ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap(); @@ -3829,42 +3827,42 @@ rtl::OUString getIconSetName(ScIconSetType eType) } } assert(pName); - return rtl::OUString::createFromAscii(pName); + return OUString::createFromAscii(pName); } -rtl::OUString getDateStringForType(condformat::ScCondFormatDateType eType) +OUString getDateStringForType(condformat::ScCondFormatDateType eType) { switch(eType) { case condformat::TODAY: - return rtl::OUString("today"); + return OUString("today"); case condformat::YESTERDAY: - return rtl::OUString("yesterday"); + return OUString("yesterday"); case condformat::TOMORROW: - return rtl::OUString("tomorrow"); + return OUString("tomorrow"); case condformat::LAST7DAYS: - return rtl::OUString("last-7-days"); + return OUString("last-7-days"); case condformat::THISWEEK: - return rtl::OUString("this-week"); + return OUString("this-week"); case condformat::LASTWEEK: - return rtl::OUString("last-week"); + return OUString("last-week"); case condformat::NEXTWEEK: - return rtl::OUString("next-week"); + return OUString("next-week"); case condformat::THISMONTH: - return rtl::OUString("this-month"); + return OUString("this-month"); case condformat::LASTMONTH: - return rtl::OUString("last-month"); + return OUString("last-month"); case condformat::NEXTMONTH: - return rtl::OUString("next-month"); + return OUString("next-month"); case condformat::THISYEAR: - return rtl::OUString("this-year"); + return OUString("this-year"); case condformat::LASTYEAR: - return rtl::OUString("last-year"); + return OUString("last-year"); case condformat::NEXTYEAR: - return rtl::OUString("next-year"); + return OUString("next-year"); } - return rtl::OUString(); + return OUString(); } } @@ -3884,7 +3882,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) for(ScConditionalFormatList::const_iterator itr = pCondFormatList->begin(); itr != pCondFormatList->end(); ++itr) { - rtl::OUString sRanges; + OUString sRanges; const ScRangeList& rRangeList = itr->GetRange(); ScRangeStringConverter::GetStringFromRangeList( sRanges, &rRangeList, pDoc, formula::FormulaGrammar::CONV_ODF ); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TARGET_RANGE_ADDRESS, sRanges); @@ -3896,7 +3894,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) if(pFormatEntry->GetType()==condformat::CONDITION) { const ScCondFormatEntry* pEntry = static_cast(pFormatEntry); - rtl::OUStringBuffer aCond; + OUStringBuffer aCond; ScAddress aPos = pEntry->GetSrcPos(); switch(pEntry->GetOperation()) { @@ -3925,14 +3923,14 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF)); break; case SC_COND_BETWEEN: - aCond.append(rtl::OUString("between(")); + aCond.append(OUString("between(")); aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF)); aCond.append(','); aCond.append(pEntry->GetExpression(aPos, 1, 0, formula::FormulaGrammar::GRAM_ODFF)); aCond.append(')'); break; case SC_COND_NOTBETWEEN: - aCond.append(rtl::OUString("not-between(")); + aCond.append(OUString("not-between(")); aCond.append(pEntry->GetExpression(aPos, 0, 0, formula::FormulaGrammar::GRAM_ODFF)); aCond.append(','); aCond.append(pEntry->GetExpression(aPos, 1, 0, formula::FormulaGrammar::GRAM_ODFF)); @@ -4012,11 +4010,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) default: SAL_WARN("sc", "unimplemented conditional format export"); } - rtl::OUString sStyle = pEntry->GetStyle(); + OUString sStyle = pEntry->GetStyle(); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_APPLY_STYLE_NAME, sStyle); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, aCond.makeStringAndClear()); - rtl::OUString sBaseAddress; + OUString sBaseAddress; ScRangeStringConverter::GetStringFromAddress( sBaseAddress, aPos, pDoc,formula::FormulaGrammar::CONV_ODF ); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_BASE_CELL_ADDRESS, sBaseAddress); SvXMLElementExport aElementCondEntry(*this, XML_NAMESPACE_CALC_EXT, XML_CONDITION, true, true); @@ -4030,14 +4028,14 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(it->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(it->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(it->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*it)); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, it->GetColor().GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_COLOR, aBuffer.makeStringAndClear()); SvXMLElementExport aElementColorScaleEntry(*this, XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE_ENTRY, true, true); @@ -4055,13 +4053,13 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->mpNegativeColor) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, pFormatData->mpNegativeColor->GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_NEGATIVE_COLOR, aBuffer.makeStringAndClear()); } else { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, Color(COL_LIGHTRED).GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_NEGATIVE_COLOR, aBuffer.makeStringAndClear()); } @@ -4071,19 +4069,19 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->meAxisPosition == databar::NONE) { - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, rtl::OUString("none")); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, OUString("none")); } else { - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, rtl::OUString("middle")); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, OUString("middle")); } } - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, pFormatData->maPositiveColor.GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_POSITIVE_COLOR, aBuffer.makeStringAndClear()); - aBuffer = rtl::OUStringBuffer(); + aBuffer = OUStringBuffer(); ::sax::Converter::convertColor(aBuffer, pFormatData->maAxisColor.GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_COLOR, aBuffer.makeStringAndClear()); SvXMLElementExport aElementDataBar(*this, XML_NAMESPACE_CALC_EXT, XML_DATA_BAR, true, true); @@ -4091,11 +4089,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->mpLowerLimit->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = pFormatData->mpLowerLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = pFormatData->mpLowerLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(pFormatData->mpLowerLimit->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(pFormatData->mpLowerLimit->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpLowerLimit, true)); SvXMLElementExport aElementDataBarEntryLower(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); } @@ -4103,11 +4101,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(pFormatData->mpUpperLimit->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = pFormatData->mpUpperLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = pFormatData->mpUpperLimit->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(pFormatData->mpUpperLimit->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(pFormatData->mpUpperLimit->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpUpperLimit, false)); SvXMLElementExport aElementDataBarEntryUpper(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); } @@ -4115,7 +4113,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) else if(pFormatEntry->GetType() == condformat::ICONSET) { const ScIconSetFormat& mrIconSet = static_cast(*pFormatEntry); - rtl::OUString aIconSetName = getIconSetName(mrIconSet.GetIconSetData()->eIconSetType); + OUString aIconSetName = getIconSetName(mrIconSet.GetIconSetData()->eIconSetType); AddAttribute( XML_NAMESPACE_CALC_EXT, XML_ICON_SET_TYPE, aIconSetName ); SvXMLElementExport aElementColorScale(*this, XML_NAMESPACE_CALC_EXT, XML_ICON_SET, true, true); if(!mrIconSet.GetIconSetData()->mbShowValue) @@ -4125,11 +4123,11 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) { if(it->GetType() == COLORSCALE_FORMULA) { - rtl::OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); + OUString sFormula = it->GetFormula(formula::FormulaGrammar::GRAM_ODFF); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, rtl::OUString::valueOf(it->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(it->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*it)); SvXMLElementExport aElementColorScaleEntry(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); @@ -4138,7 +4136,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) else if(pFormatEntry->GetType() == condformat::DATE) { const ScCondDateFormatEntry& mrDateFormat = static_cast(*pFormatEntry); - rtl::OUString aDateType = getDateStringForType(mrDateFormat.GetDateType()); + OUString aDateType = getDateStringForType(mrDateFormat.GetDateType()); AddAttribute( XML_NAMESPACE_CALC_EXT, XML_STYLE, mrDateFormat.GetStyleName()); AddAttribute( XML_NAMESPACE_CALC_EXT, XML_DATE, aDateType); SvXMLElementExport aElementDateFormat(*this, XML_NAMESPACE_CALC_EXT, XML_DATE_IS, true, true); @@ -4420,39 +4418,39 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence beans::PropertyValue* pChangeProps(aChangeProps.getArray()); if (pChangeProps) { - pChangeProps[SC_SHOW_CHANGES].Name = rtl::OUString("ShowChanges"); + pChangeProps[SC_SHOW_CHANGES].Name = OUString("ShowChanges"); pChangeProps[SC_SHOW_CHANGES].Value <<= pViewSettings->ShowChanges(); - pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = rtl::OUString("ShowAcceptedChanges"); + pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = OUString("ShowAcceptedChanges"); pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Value <<= pViewSettings->IsShowAccepted(); - pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = rtl::OUString("ShowRejectedChanges"); + pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = OUString("ShowRejectedChanges"); pChangeProps[SC_SHOW_REJECTED_CHANGES].Value <<= pViewSettings->IsShowRejected(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = rtl::OUString("ShowChangesByDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = OUString("ShowChangesByDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Value <<= pViewSettings->HasDate(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = rtl::OUString("ShowChangesByDatetimeMode"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = OUString("ShowChangesByDatetimeMode"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Value <<= static_cast(pViewSettings->GetTheDateMode()); util::DateTime aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheFirstDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeFirstDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = OUString("ShowChangesByDatetimeFirstDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Value <<= aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheLastDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeSecondDatetime"); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = OUString("ShowChangesByDatetimeSecondDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Value <<= aDateTime; - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = rtl::OUString("ShowChangesByAuthor"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = OUString("ShowChangesByAuthor"); pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Value <<= pViewSettings->HasAuthor(); - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = rtl::OUString("ShowChangesByAuthorName"); - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= rtl::OUString (pViewSettings->GetTheAuthorToShow()); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = rtl::OUString("ShowChangesByComment"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = OUString("ShowChangesByAuthorName"); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= OUString (pViewSettings->GetTheAuthorToShow()); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = OUString("ShowChangesByComment"); pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Value <<= pViewSettings->HasComment(); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = rtl::OUString("ShowChangesByCommentText"); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= rtl::OUString (pViewSettings->GetTheComment()); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = rtl::OUString("ShowChangesByRanges"); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = OUString("ShowChangesByCommentText"); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= OUString (pViewSettings->GetTheComment()); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = OUString("ShowChangesByRanges"); pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Value <<= pViewSettings->HasRange(); - rtl::OUString sRangeList; + OUString sRangeList; ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), GetDocument(), FormulaGrammar::CONV_OOO); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = rtl::OUString("ShowChangesByRangesList"); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = OUString("ShowChangesByRangesList"); pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Value <<= sRangeList; - pProps[nChangePos].Name = rtl::OUString("TrackedChangesViewSettings"); + pProps[nChangePos].Name = OUString("TrackedChangesViewSettings"); pProps[nChangePos].Value <<= aChangeProps; } } @@ -4475,13 +4473,13 @@ void ScXMLExport::GetViewSettings(uno::Sequence& rProps) { Rectangle aRect(pEmbeddedObj->GetVisArea()); sal_uInt16 i(0); - pProps[i].Name = rtl::OUString("VisibleAreaTop"); + pProps[i].Name = OUString("VisibleAreaTop"); pProps[i].Value <<= static_cast(aRect.getY()); - pProps[++i].Name = rtl::OUString("VisibleAreaLeft"); + pProps[++i].Name = OUString("VisibleAreaLeft"); pProps[i].Value <<= static_cast(aRect.getX()); - pProps[++i].Name = rtl::OUString("VisibleAreaWidth"); + pProps[++i].Name = OUString("VisibleAreaWidth"); pProps[i].Value <<= static_cast(aRect.getWidth()); - pProps[++i].Name = rtl::OUString("VisibleAreaHeight"); + pProps[++i].Name = OUString("VisibleAreaHeight"); pProps[i].Value <<= static_cast(aRect.getHeight()); } } @@ -4500,12 +4498,12 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence& uno::Reference xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")), uno::UNO_QUERY); + uno::Reference xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.comp.SpreadsheetSettings")), uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(rProps, xProperties); sal_Int32 nPropsToAdd = 0; - rtl::OUStringBuffer aTrackedChangesKey; + OUStringBuffer aTrackedChangesKey; if (GetDocument() && GetDocument()->GetChangeTrack() && GetDocument()->GetChangeTrack()->IsProtected()) { ::sax::Converter::encodeBase64(aTrackedChangesKey, @@ -4536,19 +4534,19 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence& rProps.realloc(nCount + nPropsToAdd); if (aTrackedChangesKey.getLength()) { - rProps[nCount].Name = rtl::OUString("TrackedChangesProtectionKey"); + rProps[nCount].Name = OUString("TrackedChangesProtectionKey"); rProps[nCount].Value <<= aTrackedChangesKey.makeStringAndClear(); ++nCount; } if( bVBACompat ) { - rProps[nCount].Name = rtl::OUString("VBACompatibilityMode"); + rProps[nCount].Name = OUString("VBACompatibilityMode"); rProps[nCount].Value <<= bVBACompat; ++nCount; } if( xCodeNameAccess.is() ) { - rProps[nCount].Name = rtl::OUString("ScriptConfiguration"); + rProps[nCount].Name = OUString("ScriptConfiguration"); rProps[nCount].Value <<= xCodeNameAccess; ++nCount; } @@ -4734,7 +4732,7 @@ void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< :: } // XServiceInfo -::rtl::OUString SAL_CALL ScXMLExport::getImplementationName( ) +OUString SAL_CALL ScXMLExport::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4781,14 +4779,14 @@ void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< :: } } -sal_Bool SAL_CALL ScXMLExport::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ScXMLExport::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; return SvXMLExport::supportsService( ServiceName ); } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScXMLExport::getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScXMLExport::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 8e66d15cefac..6cd196c40dac 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -87,7 +87,7 @@ class ScXMLExport : public SvXMLExport ScRowStyles* pRowStyles; ScFormatRangeStyles* pCellStyles; ScRowFormatRanges* pRowFormatRanges; - std::vector aTableStyles; + std::vector aTableStyles; com::sun::star::table::CellRangeAddress aRowHeaderRange; ScMyOpenCloseColumnRowGroup* pGroupColumns; ScMyOpenCloseColumnRowGroup* pGroupRows; @@ -99,21 +99,21 @@ class ScXMLExport : public SvXMLExport ScMyValidationsContainer* pValidationsContainer; ScMyNotEmptyCellsIterator* pCellsItr; ScChangeTrackingExportHelper* pChangeTrackingExportHelper; - const rtl::OUString sLayerID; - const rtl::OUString sCaptionShape; - rtl::OUString sExternalRefTabStyleName; - rtl::OUString sAttrName; - rtl::OUString sAttrStyleName; - rtl::OUString sAttrColumnsRepeated; - rtl::OUString sAttrFormula; - rtl::OUString sAttrValueType; - rtl::OUString sAttrStringValue; - rtl::OUString sElemCell; - rtl::OUString sElemCoveredCell; - rtl::OUString sElemCol; - rtl::OUString sElemRow; - rtl::OUString sElemTab; - rtl::OUString sElemP; + const OUString sLayerID; + const OUString sCaptionShape; + OUString sExternalRefTabStyleName; + OUString sAttrName; + OUString sAttrStyleName; + OUString sAttrColumnsRepeated; + OUString sAttrFormula; + OUString sAttrValueType; + OUString sAttrStringValue; + OUString sElemCell; + OUString sElemCoveredCell; + OUString sElemCol; + OUString sElemRow; + OUString sElemTab; + OUString sElemP; sal_Int32 nOpenRow; sal_Int32 nProgressCount; sal_uInt16 nCurrentTable; @@ -163,7 +163,7 @@ class ScXMLExport : public SvXMLExport void CloseRow(const sal_Int32 nRow); void GetColumnRowHeader(bool& bHasColumnHeader, com::sun::star::table::CellRangeAddress& aColumnHeaderRange, bool& bHasRowHeader, com::sun::star::table::CellRangeAddress& aRowHeaderRange, - rtl::OUString& rPrintRanges) const; + OUString& rPrintRanges) const; void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); void FillColumnRowGroups(); @@ -205,13 +205,13 @@ class ScXMLExport : public SvXMLExport void AddStyleFromCells( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xProperties, const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheet >& xTable, - sal_Int32 nTable, const rtl::OUString* pOldName ); + sal_Int32 nTable, const OUString* pOldName ); void AddStyleFromColumn( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xColumnProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible ); + const OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible ); void AddStyleFromRow( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xRowProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex ); + const OUString* pOldName, sal_Int32& rIndex ); void IncrementProgressBar(bool bEditCell, sal_Int32 nInc = 1); @@ -265,9 +265,9 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 4be59e1fa94d..d4ef04ef5c0e 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; @@ -54,10 +53,10 @@ ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext( sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for (sal_Int16 i = 0; i < nAttrCount; ++i) { - const rtl::OUString& sAttrName = xAttrList->getNameByIndex(i); - rtl::OUString aLocalName; + const OUString& sAttrName = xAttrList->getNameByIndex(i); + OUString aLocalName; sal_uInt16 nAttrPrefix = mrScImport.GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); if (nAttrPrefix == XML_NAMESPACE_XLINK) { if (IsXMLToken(aLocalName, XML_HREF)) @@ -182,10 +181,10 @@ ScXMLExternalRefRowContext::ScXMLExternalRefRowContext( const SvXMLTokenMap& rAttrTokenMap = mrScImport.GetTableRowAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName = xAttrList->getNameByIndex(i); - rtl::OUString aLocalName; + const OUString& sAttrName = xAttrList->getNameByIndex(i); + OUString aLocalName; sal_uInt16 nAttrPrefix = mrScImport.GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); switch (rAttrTokenMap.Get(nAttrPrefix, aLocalName)) { @@ -268,7 +267,7 @@ ScXMLExternalRefCellContext::ScXMLExternalRefCellContext( sal_uInt16 nAttrPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex(i), &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); sal_uInt16 nToken = rTokenMap.Get(nAttrPrefix, aLocalName); switch (nToken) diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 3d29610cd500..4edf3f89dbf5 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -30,7 +30,7 @@ class ScXMLExternalRefTabSourceContext : public SvXMLImportContext { public: ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -38,7 +38,7 @@ public: virtual ~ScXMLExternalRefTabSourceContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -47,10 +47,10 @@ private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; - ::rtl::OUString maRelativeUrl; - ::rtl::OUString maTableName; - ::rtl::OUString maFilterName; - ::rtl::OUString maFilterOptions; + OUString maRelativeUrl; + OUString maTableName; + OUString maFilterName; + OUString maFilterOptions; }; // ============================================================================ @@ -59,7 +59,7 @@ class ScXMLExternalRefRowsContext : public SvXMLImportContext { public: ScXMLExternalRefRowsContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -67,7 +67,7 @@ public: virtual ~ScXMLExternalRefRowsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -83,7 +83,7 @@ class ScXMLExternalRefRowContext : public SvXMLImportContext { public: ScXMLExternalRefRowContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -91,7 +91,7 @@ public: virtual ~ScXMLExternalRefRowContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -108,7 +108,7 @@ class ScXMLExternalRefCellContext : public SvXMLImportContext { public: ScXMLExternalRefCellContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ); @@ -116,18 +116,18 @@ public: virtual ~ScXMLExternalRefCellContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void SetCellString(const ::rtl::OUString& rStr); + void SetCellString(const OUString& rStr); private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; - ::rtl::OUString maCellString; + OUString maCellString; double mfCellValue; sal_Int32 mnRepeatCount; sal_Int32 mnNumberFormat; @@ -142,7 +142,7 @@ class ScXMLExternalRefCellTextContext : public SvXMLImportContext { public: ScXMLExternalRefCellTextContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLExternalRefCellContext& rParent ); @@ -150,18 +150,18 @@ public: virtual ~ScXMLExternalRefCellTextContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters(const ::rtl::OUString& rChar); + virtual void Characters(const OUString& rChar); virtual void EndElement(); private: ScXMLExternalRefCellContext& mrParent; - ::rtl::OUStringBuffer maCellStrBuf; + OUStringBuffer maCellStrBuf; }; #endif diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index 760822ea28fc..75c0af36a379 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -39,7 +39,7 @@ ScXMLFilterContext::ConnStackItem::ConnStackItem(bool bOr) : mbOr(bOr), mnCondCo ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const Reference& xAttrList, ScQueryParam& rParam, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -56,11 +56,11 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetFilterAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -101,7 +101,7 @@ ScXMLFilterContext::~ScXMLFilterContext() } SvXMLImportContext *ScXMLFilterContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -189,7 +189,7 @@ bool ScXMLFilterContext::GetConnection() ScXMLAndContext::ScXMLAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const Reference& /* xAttrList */, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext) : @@ -205,7 +205,7 @@ ScXMLAndContext::~ScXMLAndContext() } SvXMLImportContext *ScXMLAndContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -240,7 +240,7 @@ void ScXMLAndContext::EndElement() ScXMLOrContext::ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScQueryParam& rParam, @@ -257,7 +257,7 @@ ScXMLOrContext::~ScXMLOrContext() } SvXMLImportContext *ScXMLOrContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -292,7 +292,7 @@ void ScXMLOrContext::EndElement() } ScXMLConditionContext::ScXMLConditionContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference& xAttrList, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext) : @@ -307,11 +307,11 @@ ScXMLConditionContext::ScXMLConditionContext( const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetFilterConditionAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -349,7 +349,7 @@ ScXMLConditionContext::~ScXMLConditionContext() } SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const Reference& xAttrList ) { SvXMLImportContext *pContext = NULL; @@ -372,7 +372,7 @@ SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefi } void ScXMLConditionContext::GetOperator( - const rtl::OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const + const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const { rParam.bRegExp = false; if (IsXMLToken(aOpStr, XML_MATCH)) @@ -471,7 +471,7 @@ ScXMLImport& ScXMLSetItemContext::GetScImport() } ScXMLSetItemContext::ScXMLSetItemContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference& xAttrList, ScXMLConditionContext& rParent) : SvXMLImportContext(rImport, nPrfx, rLName) { @@ -479,12 +479,12 @@ ScXMLSetItemContext::ScXMLSetItemContext( const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetFilterSetItemAttrTokenMap(); for (sal_Int32 i = 0; i < nAttrCount; ++i) { - const rtl::OUString& sAttrName = xAttrList->getNameByIndex(i); - rtl::OUString aLocalName; + const OUString& sAttrName = xAttrList->getNameByIndex(i); + OUString aLocalName; sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName); - const rtl::OUString& sValue = xAttrList->getValueByIndex(i); + const OUString& sValue = xAttrList->getValueByIndex(i); switch (rAttrTokenMap.Get(nPrefix, aLocalName)) { @@ -502,7 +502,7 @@ ScXMLSetItemContext::ScXMLSetItemContext( } SvXMLImportContext* ScXMLSetItemContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLName, + sal_uInt16 nPrefix, const OUString& rLName, const Reference& /*xAttrList*/ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName );; @@ -520,7 +520,7 @@ void ScXMLSetItemContext::EndElement() ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTableContext) : @@ -541,11 +541,11 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetFilterAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -586,7 +586,7 @@ ScXMLDPFilterContext::~ScXMLDPFilterContext() } SvXMLImportContext *ScXMLDPFilterContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -645,7 +645,7 @@ void ScXMLDPFilterContext::AddFilterField (const ScQueryEntry& aFilterField) ScXMLDPAndContext::ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDPFilterContext* pTempFilterContext) : @@ -660,7 +660,7 @@ ScXMLDPAndContext::~ScXMLDPAndContext() } SvXMLImportContext *ScXMLDPAndContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -695,7 +695,7 @@ void ScXMLDPAndContext::EndElement() ScXMLDPOrContext::ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, ScXMLDPFilterContext* pTempFilterContext) : @@ -710,7 +710,7 @@ ScXMLDPOrContext::~ScXMLDPOrContext() } SvXMLImportContext *ScXMLDPOrContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -746,7 +746,7 @@ void ScXMLDPOrContext::EndElement() ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext) : @@ -760,11 +760,11 @@ ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetFilterConditionAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -802,7 +802,7 @@ ScXMLDPConditionContext::~ScXMLDPConditionContext() } SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -810,7 +810,7 @@ SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPre } void ScXMLDPConditionContext::getOperatorXML( - const rtl::OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const + const OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const { bUseRegularExpressions = false; if (IsXMLToken(sTempOperator, XML_MATCH)) diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 3c7528daca11..11557dbe569c 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -61,7 +61,7 @@ class ScXMLFilterContext : public SvXMLImportContext public: ScXMLFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -70,7 +70,7 @@ public: virtual ~ScXMLFilterContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -92,7 +92,7 @@ class ScXMLAndContext : public SvXMLImportContext public: ScXMLAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -101,7 +101,7 @@ public: virtual ~ScXMLAndContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -119,7 +119,7 @@ class ScXMLOrContext : public SvXMLImportContext public: ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -128,7 +128,7 @@ public: virtual ~ScXMLOrContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -141,9 +141,9 @@ class ScXMLConditionContext : public SvXMLImportContext ScXMLFilterContext* pFilterContext; ScQueryEntry::QueryItemsType maQueryItems; - rtl::OUString sDataType; - rtl::OUString sConditionValue; - rtl::OUString sOperator; + OUString sDataType; + OUString sConditionValue; + OUString sOperator; sal_Int32 nField; bool bIsCaseSensitive; @@ -153,7 +153,7 @@ class ScXMLConditionContext : public SvXMLImportContext public: ScXMLConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScQueryParam& rParam, @@ -162,13 +162,13 @@ public: virtual ~ScXMLConditionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void GetOperator(const rtl::OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const; + void GetOperator(const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const; void AddSetItem(const ScQueryEntry::Item& rItem); }; @@ -178,7 +178,7 @@ class ScXMLSetItemContext : public SvXMLImportContext ScXMLImport& GetScImport(); public: ScXMLSetItemContext(ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLConditionContext& rParent); @@ -187,7 +187,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); @@ -219,7 +219,7 @@ class ScXMLDPFilterContext : public SvXMLImportContext public: ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTableContext); @@ -227,7 +227,7 @@ public: virtual ~ScXMLDPFilterContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -272,7 +272,7 @@ class ScXMLDPAndContext : public SvXMLImportContext public: ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -280,7 +280,7 @@ public: virtual ~ScXMLDPAndContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -297,7 +297,7 @@ class ScXMLDPOrContext : public SvXMLImportContext public: ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -305,7 +305,7 @@ public: virtual ~ScXMLDPOrContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -316,9 +316,9 @@ class ScXMLDPConditionContext : public SvXMLImportContext { ScXMLDPFilterContext* pFilterContext; - rtl::OUString sDataType; - rtl::OUString sConditionValue; - rtl::OUString sOperator; + OUString sDataType; + OUString sConditionValue; + OUString sOperator; sal_Int32 nField; bool bIsCaseSensitive; @@ -328,7 +328,7 @@ class ScXMLDPConditionContext : public SvXMLImportContext public: ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -336,12 +336,12 @@ public: virtual ~ScXMLDPConditionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); void getOperatorXML( - const rtl::OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const; + const OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const; virtual void EndElement(); }; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 14c022daf5b0..df3472f0f88a 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -102,18 +102,16 @@ using namespace ::xmloff::token; using namespace ::formula; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; OUString SAL_CALL ScXMLImport_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( @@ -126,13 +124,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Meta_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Meta_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( @@ -145,13 +143,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Styles_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Styles_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( @@ -164,13 +162,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Content_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Content_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( @@ -183,13 +181,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ); + return OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( ScXMLImport_Settings_getImplementationName() ); - return uno::Sequence< rtl::OUString > ( &aServiceName, 1 ); + const OUString aServiceName( ScXMLImport_Settings_getImplementationName() ); + return uno::Sequence< OUString > ( &aServiceName, 1 ); } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( @@ -266,7 +264,7 @@ public: virtual ~ScXMLDocContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference& xAttrList ); }; @@ -366,7 +364,7 @@ SvXMLImportContext *ScXMLBodyContext_Impl::CreateChildContext( } SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference& xAttrList ) { SvXMLImportContext *pContext(0); @@ -2173,7 +2171,7 @@ ScXMLImport::~ScXMLImport() throw() // --------------------------------------------------------------------- -SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference& xAttrList) { XMLFontStylesContext *pFSContext = new XMLFontStylesContext( @@ -2183,7 +2181,7 @@ SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix return pContext; } -SvXMLImportContext *ScXMLImport::CreateStylesContext(const ::rtl::OUString& rLocalName, +SvXMLImportContext *ScXMLImport::CreateStylesContext(const OUString& rLocalName, const uno::Reference& xAttrList, bool bIsAutoStyle ) { SvXMLImportContext* pContext = new XMLTableStylesContext( @@ -2197,7 +2195,7 @@ SvXMLImportContext *ScXMLImport::CreateStylesContext(const ::rtl::OUString& rLoc return pContext; } -SvXMLImportContext *ScXMLImport::CreateBodyContext(const ::rtl::OUString& rLocalName, +SvXMLImportContext *ScXMLImport::CreateBodyContext(const OUString& rLocalName, const uno::Reference& xAttrList) { return new ScXMLBodyContext(*this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList); @@ -2288,7 +2286,7 @@ XMLShapeImportHelper* ScXMLImport::CreateShapeImport() return new XMLTableShapeImportHelper(*this); } -bool ScXMLImport::GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation) +bool ScXMLImport::GetValidation(const OUString& sName, ScMyImportValidation& aValidation) { if (pValidations) { @@ -2398,7 +2396,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque boost::scoped_ptr pViewSettings(new ScChangeViewSettings()); for (sal_Int32 i = 0; i < nCount; ++i) { - rtl::OUString sName(rChangeProps[i].Name); + OUString sName(rChangeProps[i].Name); if (sName.compareToAscii("ShowChanges") == 0) pViewSettings->SetShowChanges(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowAcceptedChanges") == 0) @@ -2436,7 +2434,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque pViewSettings->SetHasAuthor(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowChangesByAuthorName") == 0) { - rtl::OUString sOUName; + OUString sOUName; if (rChangeProps[i].Value >>= sOUName) { String sAuthorName(sOUName); @@ -2447,7 +2445,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque pViewSettings->SetHasComment(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowChangesByCommentText") == 0) { - rtl::OUString sOUComment; + OUString sOUComment; if (rChangeProps[i].Value >>= sOUComment) { String sComment(sOUComment); @@ -2458,7 +2456,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque pViewSettings->SetHasRange(::cppu::any2bool(rChangeProps[i].Value)); else if (sName.compareToAscii("ShowChangesByRangesList") == 0) { - rtl::OUString sRanges; + OUString sRanges; if ((rChangeProps[i].Value >>= sRanges) && !sRanges.isEmpty()) { ScRangeList aRangeList; @@ -2482,7 +2480,7 @@ void ScXMLImport::SetViewSettings(const uno::Sequence& aVi sal_Int32 nWidth(0); for (sal_Int32 i = 0; i < nCount; ++i) { - rtl::OUString sName(aViewProps[i].Name); + OUString sName(aViewProps[i].Name); if (sName.compareToAscii("VisibleAreaHeight") == 0) aViewProps[i].Value >>= nHeight; else if (sName.compareToAscii("VisibleAreaLeft") == 0) @@ -2528,14 +2526,14 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence= 0; --i) { if (aConfigProps[i].Name == sCTName) { - rtl::OUString sKey; + OUString sKey; if (aConfigProps[i].Value >>= sKey) { uno::Sequence aPass; @@ -2546,7 +2544,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::SequenceGetChangeTrack()->SetProtection(aPass); else { - std::set aUsers; + std::set aUsers; ScChangeTrack* pTrack = new ScChangeTrack(pDoc, aUsers); pTrack->SetProtection(aPass); pDoc->SetChangeTrack(pTrack); @@ -2566,7 +2564,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence xInterface = xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")); + uno::Reference xInterface = xMultiServiceFactory->createInstance(OUString("com.sun.star.comp.SpreadsheetSettings")); uno::Reference xProperties(xInterface, uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(xProperties, aConfigProps); @@ -2574,7 +2572,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence xNumberFormatsSupplier(GetNumberFormatsSupplier()); if (xNumberFormatsSupplier.is()) @@ -2582,7 +2580,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri uno::Reference xLocalNumberFormats(xNumberFormatsSupplier->getNumberFormats()); if (xLocalNumberFormats.is()) { - rtl::OUString sFormatString; + OUString sFormatString; try { uno::Reference xProperties(xLocalNumberFormats->getByKey(nKey)); @@ -2594,7 +2592,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri { ScXMLImport::MutexGuard aGuard(*this); LocaleDataWrapper aLocaleData( comphelper::getComponentContext(GetDocument()->GetServiceManager()), LanguageTag( aLocale) ); - rtl::OUStringBuffer aBuffer(15); + OUStringBuffer aBuffer(15); aBuffer.appendAscii("#"); aBuffer.append( aLocaleData.getNumThousandSep() ); aBuffer.appendAscii("##0"); @@ -2613,11 +2611,11 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri } catch ( const util::MalformedNumberFormatException& rException ) { - rtl::OUString sErrorMessage("Fehler im Formatstring "); + OUString sErrorMessage("Fehler im Formatstring "); sErrorMessage += sFormatString; - sErrorMessage += rtl::OUString(" an Position "); - sErrorMessage += rtl::OUString::valueOf(rException.CheckPos); - uno::Sequence aSeq(1); + sErrorMessage += OUString(" an Position "); + sErrorMessage += OUString::valueOf(rException.CheckPos); + uno::Sequence aSeq(1); aSeq[0] = sErrorMessage; uno::Reference xLocator; SetError(XMLERROR_API | XMLERROR_FLAG_ERROR, aSeq, rException.Message, xLocator); @@ -2627,7 +2625,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri return nKey; } -bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUString& sCurrentCurrency, const rtl::OUString& sBankSymbol) +bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrentCurrency, const OUString& sBankSymbol) { uno::Reference xNumberFormatsSupplier(GetNumberFormatsSupplier()); if (xNumberFormatsSupplier.is()) @@ -2640,8 +2638,8 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUS uno::Reference xNumberPropertySet(xLocalNumberFormats->getByKey(nNumberFormat)); if (xNumberPropertySet.is()) { - rtl::OUString sTemp; - if ( xNumberPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURRENCYSYMBOL))) >>= sTemp) + OUString sTemp; + if ( xNumberPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURRENCYSYMBOL))) >>= sTemp) { if (sCurrentCurrency.equals(sTemp)) return true; @@ -2673,7 +2671,7 @@ bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUS void ScXMLImport::SetType(uno::Reference & rProperties, sal_Int32& rNumberFormat, const sal_Int16 nCellType, - const rtl::OUString& rCurrency) + const OUString& rCurrency) { if ((nCellType != util::NumberFormat::TEXT) && (nCellType != util::NumberFormat::UNDEFINED)) { @@ -2683,7 +2681,7 @@ void ScXMLImport::SetType(uno::Reference & rProperties, bool bIsStandard; // sCurrentCurrency may be the ISO code abbreviation if the currency // symbol matches such, or if no match found the symbol itself! - rtl::OUString sCurrentCurrency; + OUString sCurrentCurrency; sal_Int32 nCurrentCellType( GetNumberFormatAttributesExportHelper()->GetCellType( rNumberFormat, sCurrentCurrency, bIsStandard) & ~util::NumberFormat::DEFINED); @@ -2746,7 +2744,7 @@ void ScXMLImport::AddStyleRange(const table::CellRangeAddress& rCellRange) { uno::Reference xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) - xSheetCellRanges.set(uno::Reference (xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); + xSheetCellRanges.set(uno::Reference (xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); } @@ -2802,14 +2800,14 @@ void ScXMLImport::SetStyleToRanges() if (xMultiServiceFactory.is()) xSheetCellRanges.set(uno::Reference ( xMultiServiceFactory->createInstance( - rtl::OUString("com.sun.star.sheet.SheetCellRanges")), + OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); } OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); } -void ScXMLImport::SetStyleToRange(const ScRange& rRange, const rtl::OUString* pStyleName, - const sal_Int16 nCellType, const rtl::OUString* pCurrency) +void ScXMLImport::SetStyleToRange(const ScRange& rRange, const OUString* pStyleName, + const sal_Int16 nCellType, const OUString* pCurrency) { if (sPrevStyleName.isEmpty()) { @@ -2899,7 +2897,7 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R } // XServiceInfo -::rtl::OUString SAL_CALL ScXMLImport::getImplementationName( ) +OUString SAL_CALL ScXMLImport::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { switch( getImportFlags() ) @@ -2954,7 +2952,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE xImportInfo.is() ? xImportInfo->getPropertySetInfo() : 0); if (xPropertySetInfo.is()) { - ::rtl::OUString const sOrganizerMode( + OUString const sOrganizerMode( RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); if (xPropertySetInfo->hasPropertyByName(sOrganizerMode)) { @@ -2969,16 +2967,16 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE UnlockSolarMutex(); } -sal_Int32 ScXMLImport::GetRangeType(const rtl::OUString sRangeType) const +sal_Int32 ScXMLImport::GetRangeType(const OUString sRangeType) const { sal_Int32 nRangeType(0); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; sal_Int16 i = 0; while (i <= sRangeType.getLength()) { if ((sRangeType[i] == ' ') || (i == sRangeType.getLength())) { - rtl::OUString sTemp = sBuffer.makeStringAndClear(); + OUString sTemp = sBuffer.makeStringAndClear(); if (sTemp.compareToAscii(SC_REPEAT_COLUMN) == 0) nRangeType |= sheet::NamedRangeFlag::COLUMN_HEADER; else if (sTemp.compareToAscii(SC_REPEAT_ROW) == 0) @@ -3003,8 +3001,8 @@ void ScXMLImport::SetLabelRanges() uno::Reference xPropertySet (GetModel(), uno::UNO_QUERY); if (xPropertySet.is()) { - uno::Any aColAny = xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLLABELRNG))); - uno::Any aRowAny = xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ROWLABELRNG))); + uno::Any aColAny = xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLLABELRNG))); + uno::Any aRowAny = xPropertySet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ROWLABELRNG))); uno::Reference< sheet::XLabelRanges > xColRanges; uno::Reference< sheet::XLabelRanges > xRowRanges; @@ -3085,7 +3083,7 @@ public: { using namespace formula; - const ::rtl::OUString& aType = r.sRangeType; + const OUString& aType = r.sRangeType; sal_uInt32 nUnoType = mrXmlImport.GetRangeType(aType); sal_uInt16 nNewType = RT_NAME; @@ -3104,7 +3102,7 @@ public: if (bSuccess) { - ::rtl::OUString aContent = r.sContent; + OUString aContent = r.sContent; if (!r.bIsExpression) ScXMLConverter::ParseFormula(aContent, false); @@ -3170,10 +3168,10 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE sal_Int32 nCount (aSeq.getLength()); for (sal_Int32 i = 0; i < nCount; ++i) { - rtl::OUString sName(aSeq[i].Name); + OUString sName(aSeq[i].Name); if (sName.compareToAscii(SC_ACTIVETABLE) == 0) { - rtl::OUString sValue; + OUString sValue; if(aSeq[i].Value >>= sValue) { String sTabName(sValue); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 3b97f1807c15..52e5b614ca47 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -722,11 +722,11 @@ struct tScMyCellRange struct ScMyNamedExpression { - rtl::OUString sName; - rtl::OUString sContent; - rtl::OUString sContentNmsp; - rtl::OUString sBaseCellAddress; - rtl::OUString sRangeType; + OUString sName; + OUString sContent; + OUString sContentNmsp; + OUString sBaseCellAddress; + OUString sRangeType; formula::FormulaGrammar::Grammar eGrammar; bool bIsExpression; }; @@ -735,8 +735,8 @@ typedef ::boost::ptr_list ScMyNamedExpressions; struct ScMyLabelRange { - rtl::OUString sLabelRangeStr; - rtl::OUString sDataRangeStr; + OUString sLabelRangeStr; + OUString sDataRangeStr; bool bColumnOrientation; }; @@ -744,16 +744,16 @@ typedef std::list ScMyLabelRanges; struct ScMyImportValidation { - rtl::OUString sName; - rtl::OUString sImputTitle; - rtl::OUString sImputMessage; - rtl::OUString sErrorTitle; - rtl::OUString sErrorMessage; - rtl::OUString sFormula1; - rtl::OUString sFormula2; - rtl::OUString sFormulaNmsp1; - rtl::OUString sFormulaNmsp2; - rtl::OUString sBaseCellAddress; // string is used directly + OUString sName; + OUString sImputTitle; + OUString sImputMessage; + OUString sErrorTitle; + OUString sErrorMessage; + OUString sFormula1; + OUString sFormula2; + OUString sFormulaNmsp1; + OUString sFormulaNmsp2; + OUString sBaseCellAddress; // string is used directly com::sun::star::sheet::ValidationAlertStyle aAlertStyle; com::sun::star::sheet::ValidationType aValidationType; com::sun::star::sheet::ConditionOperator aOperator; @@ -772,7 +772,7 @@ class ScXMLEditAttributeMap; class ScXMLImport: public SvXMLImport, boost::noncopyable { - typedef ::boost::unordered_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap; + typedef ::boost::unordered_map< OUString, sal_Int16, OUStringHash > CellTypeMap; typedef ::boost::ptr_map SheetNamedExpMap; CellTypeMap aCellTypeMap; @@ -784,11 +784,11 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; ScMyViewContextList aViewContextList; ScMyStylesImportHelper* pStylesImportHelper; - rtl::OUString sNumberFormat; - rtl::OUString sLocale; - rtl::OUString sCellStyle; - rtl::OUString sStandardFormat; - rtl::OUString sType; + OUString sNumberFormat; + OUString sLocale; + OUString sCellStyle; + OUString sStandardFormat; + OUString sType; UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; @@ -890,7 +890,7 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable ScMyImpDetectiveOpArray* pDetectiveOpArray; SolarMutexGuard* pSolarMutexGuard; - std::vector aTableStyles; + std::vector aTableStyles; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; ScMyStyleNumberFormats* pStyleNumberFormats; com::sun::star::uno::Reference xNumberFormats; @@ -898,9 +898,9 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable com::sun::star::uno::Reference xSheetCellRanges; - rtl::OUString sEmpty; - rtl::OUString sPrevStyleName; - rtl::OUString sPrevCurrency; + OUString sEmpty; + OUString sPrevStyleName; + OUString sPrevCurrency; sal_uInt32 nSolarMutexLocked; sal_Int32 nProgressCount; sal_uInt16 nStyleFamilyMask;// Mask of styles to load @@ -919,7 +919,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual XMLShapeImportHelper* CreateShapeImport(); @@ -936,15 +936,15 @@ public: // NB: in contrast to other CreateFooContexts, this particular one handles // the root element (i.e. office:document-meta) SvXMLImportContext *CreateMetaContext( - const ::rtl::OUString& rLocalName ); - SvXMLImportContext *CreateFontDeclsContext(const sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + const OUString& rLocalName ); + SvXMLImportContext *CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList); SvXMLImportContext *CreateScriptContext( - const ::rtl::OUString& rLocalName ); - SvXMLImportContext *CreateStylesContext(const ::rtl::OUString& rLocalName, + const OUString& rLocalName ); + SvXMLImportContext *CreateStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList, bool bAutoStyles ); SvXMLImportContext *CreateBodyContext( - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference& xAttrList ); virtual void SetStatistics( @@ -960,7 +960,7 @@ public: bool IsLatinDefaultStyle() const { return bLatinDefaultStyle; } - sal_Int16 GetCellType(const ::rtl::OUString& rStrValue) const; + sal_Int16 GetCellType(const OUString& rStrValue) const; UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return xCellStylesPropertySetMapper; } UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return xColumnStylesPropertySetMapper; } @@ -1069,7 +1069,7 @@ public: if (!pValidations) pValidations = new ScMyImportValidations(); pValidations->push_back(rValidation); } - bool GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation); + bool GetValidation(const OUString& sName, ScMyImportValidation& aValidation); inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() { if (!pDetectiveOpArray) @@ -1087,15 +1087,15 @@ public: virtual void SetViewSettings(const com::sun::star::uno::Sequence& aViewProps); virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence& aConfigProps); - void SetTableStyle(const rtl::OUString& rValue) { aTableStyles.push_back(rValue); } - std::vector GetTableStyle() { return aTableStyles; } + void SetTableStyle(const OUString& rValue) { aTableStyles.push_back(rValue); } + std::vector GetTableStyle() { return aTableStyles; } ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper; } - sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUString& rCurrency); - bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUString& sCurrencySymbol, const rtl::OUString& sBankSymbol); + sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency); + bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, const OUString& sBankSymbol); void SetType(com::sun::star::uno::Reference & rProperties, sal_Int32& rNumberFormat, const sal_Int16 nCellType, - const rtl::OUString& rCurrency); + const OUString& rCurrency); void ProgressBarIncrement(bool bEditCell, sal_Int32 nInc = 1); @@ -1108,8 +1108,8 @@ private: void ExamineDefaultStyle(); public: - void SetStyleToRange(const ScRange& rRange, const rtl::OUString* pStyleName, - const sal_Int16 nCellType, const rtl::OUString* pCurrency); + void SetStyleToRange(const ScRange& rRange, const OUString* pStyleName, + const sal_Int16 nCellType, const OUString* pCurrency); bool SetNullDateOnUnitConverter(); XMLNumberFormatAttributesExportHelper* GetNumberFormatAttributesExportHelper(); ScMyStyleNumberFormats* GetStyleNumberFormats(); @@ -1120,7 +1120,7 @@ public: virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL startDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -1148,7 +1148,7 @@ public: void SetRangeOverflowType(sal_uInt32 nType); - sal_Int32 GetRangeType(const rtl::OUString sRangeType) const; + sal_Int32 GetRangeType(const OUString sRangeType) const; void SetNamedRanges(); void SetSheetNamedRanges(); void SetLabelRanges(); @@ -1185,10 +1185,10 @@ public: with range operator. */ void ExtractFormulaNamespaceGrammar( - ::rtl::OUString& rFormula, - ::rtl::OUString& rFormulaNmsp, + OUString& rFormula, + OUString& rFormulaNmsp, ::formula::FormulaGrammar::Grammar& reGrammar, - const ::rtl::OUString& rAttrValue, + const OUString& rAttrValue, bool bRestrictToExternalNmsp = false ) const; bool IsFormulaErrorConstant( const OUString& rStr ) const; diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 48e8e42693a4..412e96106a4b 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.cxx @@ -26,7 +26,6 @@ #include "xmlimprt.hxx" using namespace ::com::sun::star; -using ::rtl::OUString; using namespace xmloff::token; @@ -87,8 +86,8 @@ ScXMLLabelRangeContext::ScXMLLabelRangeContext( for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; sal_uInt16 nPrefix (GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index c70581c0fb8c..70b9d9517a44 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -36,14 +36,14 @@ public: ScXMLLabelRangesContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLLabelRangesContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -55,8 +55,8 @@ public: class ScXMLLabelRangeContext : public SvXMLImportContext { private: - ::rtl::OUString sLabelRangeStr; - ::rtl::OUString sDataRangeStr; + OUString sLabelRangeStr; + OUString sDataRangeStr; bool bColumnOrientation; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -66,14 +66,14 @@ public: ScXMLLabelRangeContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLLabelRangeContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index a32d4c42b833..4ddf05d323c8 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -49,7 +49,7 @@ void ScXMLNamedExpressionsContext::SheetLocalInserter::insert(ScMyNamedExpressio } ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference& /* xAttrList */, Inserter* pInserter ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -64,7 +64,7 @@ ScXMLNamedExpressionsContext::~ScXMLNamedExpressionsContext() } SvXMLImportContext *ScXMLNamedExpressionsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -98,7 +98,7 @@ void ScXMLNamedExpressionsContext::EndElement() ScXMLNamedRangeContext::ScXMLNamedRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -117,11 +117,11 @@ ScXMLNamedRangeContext::ScXMLNamedRangeContext( const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetNamedRangeAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -156,7 +156,7 @@ ScXMLNamedRangeContext::~ScXMLNamedRangeContext() } SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { @@ -168,7 +168,7 @@ void ScXMLNamedRangeContext::EndElement() } ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -182,11 +182,11 @@ ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetNamedExpressionAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -218,7 +218,7 @@ ScXMLNamedExpressionContext::~ScXMLNamedExpressionContext() } SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index d6133cdc6ba9..34543d7626c2 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -72,7 +72,7 @@ public: }; ScXMLNamedExpressionsContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, Inserter* pInserter ); @@ -80,7 +80,7 @@ public: virtual ~ScXMLNamedExpressionsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -98,7 +98,7 @@ class ScXMLNamedRangeContext : public SvXMLImportContext public: ScXMLNamedRangeContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ); @@ -106,7 +106,7 @@ public: virtual ~ScXMLNamedRangeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -124,7 +124,7 @@ class ScXMLNamedExpressionContext : public SvXMLImportContext public: ScXMLNamedExpressionContext( - ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLNamedExpressionsContext::Inserter* pInserter ); @@ -132,7 +132,7 @@ public: virtual ~ScXMLNamedExpressionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index ec4c5a5e10a1..d1c1b4fec3a2 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -49,7 +49,7 @@ using namespace xmloff::token; ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -57,16 +57,16 @@ ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, nRepeatedRows(1), bHasCell(false) { - rtl::OUString sCellStyleName; + OUString sCellStyleName; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetTableRowAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -107,7 +107,7 @@ ScXMLTableRowContext::~ScXMLTableRowContext() } SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -204,9 +204,9 @@ void ScXMLTableRowContext::EndElement() bFiltered = true; } if (!bVisible) - xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); + xRowProperties->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); if (bFiltered) - xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); + xRowProperties->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); } } } @@ -215,7 +215,7 @@ void ScXMLTableRowContext::EndElement() ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bTempHeader, const bool bTempGroup ) : @@ -241,11 +241,11 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); if ((nPrefix == XML_NAMESPACE_TABLE) && IsXMLToken(aLocalName, XML_DISPLAY)) bGroupDisplay = IsXMLToken(sValue, XML_TRUE); @@ -258,7 +258,7 @@ ScXMLTableRowsContext::~ScXMLTableRowsContext() } SvXMLImportContext *ScXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index a900ff781d11..c24a103f9b6e 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -26,8 +26,8 @@ class ScXMLImport; class ScXMLTableRowContext : public SvXMLImportContext { - rtl::OUString sStyleName; - rtl::OUString sVisibility; + OUString sStyleName; + OUString sVisibility; sal_Int32 nRepeatedRows; bool bHasCell; @@ -37,14 +37,14 @@ class ScXMLTableRowContext : public SvXMLImportContext public: ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableRowContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -67,7 +67,7 @@ class ScXMLTableRowsContext : public SvXMLImportContext public: ScXMLTableRowsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const bool bHeader, const bool bGroup); @@ -75,7 +75,7 @@ public: virtual ~ScXMLTableRowsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index caa4a70f4c34..19478d29b4f0 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.cxx @@ -33,9 +33,7 @@ using namespace com::sun::star; using namespace xmloff::token; -using ::rtl::OUString; -using rtl::OUString; //------------------------------------------------------------------ @@ -58,11 +56,11 @@ ScXMLTableScenarioContext::ScXMLTableScenarioContext( const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetTableScenarioAttrTokenMap()); for( sal_Int16 i = 0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); + const OUString& sAttrName(xAttrList->getNameByIndex( i )); OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index c16098ed6f27..0690f08409c3 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -29,7 +29,7 @@ class ScXMLImport; class ScXMLTableScenarioContext : public SvXMLImportContext { private: - rtl::OUString sComment; + OUString sComment; Color aBorderColor; ScRangeList aScenarioRanges; bool bDisplayBorder; @@ -45,14 +45,14 @@ private: public: ScXMLTableScenarioContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableScenarioContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index d880d401c74f..129b87f38ad7 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -39,7 +39,7 @@ using namespace xmloff::token; ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -58,11 +58,11 @@ ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetSortAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -105,7 +105,7 @@ ScXMLSortContext::~ScXMLSortContext() } SvXMLImportContext *ScXMLSortContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -139,37 +139,37 @@ void ScXMLSortContext::EndElement() if (nAlgoLength) ++i; uno::Sequence aSortDescriptor(7 + i); - aSortDescriptor[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)); + aSortDescriptor[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)); aSortDescriptor[0].Value = ::cppu::bool2any(bBindFormatsToContent); - aSortDescriptor[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT)); + aSortDescriptor[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT)); aSortDescriptor[1].Value = ::cppu::bool2any(bCopyOutputData); - aSortDescriptor[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)); + aSortDescriptor[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)); aSortDescriptor[2].Value = ::cppu::bool2any(bIsCaseSensitive); - aSortDescriptor[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISULIST)); + aSortDescriptor[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISULIST)); aSortDescriptor[3].Value = ::cppu::bool2any(bEnabledUserList); - aSortDescriptor[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS)); + aSortDescriptor[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS)); aSortDescriptor[4].Value <<= aOutputPosition; - aSortDescriptor[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_UINDEX)); + aSortDescriptor[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_UINDEX)); aSortDescriptor[5].Value <<= nUserListIndex; - aSortDescriptor[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SORTFLD)); + aSortDescriptor[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SORTFLD)); aSortDescriptor[6].Value <<= aSortFields; if (nLangLength || nCountryLength) { lang::Locale aLocale; aLocale.Language = sLanguage; aLocale.Country = sCountry; - aSortDescriptor[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLLOC)); + aSortDescriptor[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLLOC)); aSortDescriptor[7].Value <<= aLocale; } if (nAlgoLength) { - aSortDescriptor[6 + i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLALG)); + aSortDescriptor[6 + i].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COLLALG)); aSortDescriptor[6 + i].Value <<= sAlgorithm; } pDatabaseRangeContext->SetSortSequence(aSortDescriptor); } -void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl::OUString& sDataType, const rtl::OUString& sOrder) +void ScXMLSortContext::AddSortField(const OUString& sFieldNumber, const OUString& sDataType, const OUString& sOrder) { util::SortField aSortField; aSortField.Field = sFieldNumber.toInt32(); @@ -179,7 +179,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl aSortField.SortAscending = false; if (sDataType.getLength() > 8) { - rtl::OUString sTemp = sDataType.copy(0, 8); + OUString sTemp = sDataType.copy(0, 8); if (sTemp.compareToAscii(SC_USERLIST) == 0) { bEnabledUserList = true; @@ -205,7 +205,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSortContext* pTempSortContext) : @@ -218,11 +218,11 @@ ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetSortSortByAttrTokenMap()); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -250,7 +250,7 @@ ScXMLSortByContext::~ScXMLSortByContext() } SvXMLImportContext *ScXMLSortByContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index d2de3775f655..419796893aed 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -34,9 +34,9 @@ class ScXMLSortContext : public SvXMLImportContext com::sun::star::uno::Sequence aSortFields; com::sun::star::table::CellAddress aOutputPosition; - rtl::OUString sCountry; - rtl::OUString sLanguage; - rtl::OUString sAlgorithm; + OUString sCountry; + OUString sLanguage; + OUString sAlgorithm; sal_Int16 nUserListIndex; bool bCopyOutputData; bool bBindFormatsToContent; @@ -49,7 +49,7 @@ class ScXMLSortContext : public SvXMLImportContext public: ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -57,22 +57,22 @@ public: virtual ~ScXMLSortContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - void AddSortField(const rtl::OUString& sFieldNumber, const rtl::OUString& sDataType, const rtl::OUString& sOrder); + void AddSortField(const OUString& sFieldNumber, const OUString& sDataType, const OUString& sOrder); }; class ScXMLSortByContext : public SvXMLImportContext { ScXMLSortContext* pSortContext; - rtl::OUString sFieldNumber; - rtl::OUString sDataType; - rtl::OUString sOrder; + OUString sFieldNumber; + OUString sDataType; + OUString sOrder; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -80,7 +80,7 @@ class ScXMLSortByContext : public SvXMLImportContext public: ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSortContext* pTempSortContext); @@ -88,7 +88,7 @@ public: virtual ~ScXMLSortByContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index 486f0b2911c0..a331b0a2926a 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -53,7 +53,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; using namespace ::formula; -using ::rtl::OUString; #define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 } #define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT } @@ -629,7 +628,7 @@ void ScXMLAutoStylePoolP::exportStyleAttributes( sal_Int32 nNumberFormat = 0; if (i->maValue >>= nNumberFormat) { - rtl::OUString sAttrValue(rScXMLExport.getDataStyleName(nNumberFormat)); + OUString sAttrValue(rScXMLExport.getDataStyleName(nNumberFormat)); if (!sAttrValue.isEmpty()) { GetExport().AddAttribute( @@ -656,7 +655,7 @@ void ScXMLAutoStylePoolP::exportStyleAttributes( { case CTF_SC_MASTERPAGENAME : { - rtl::OUString sName; + OUString sName; if (i->maValue >>= sName) { GetExport().AddAttribute( @@ -705,7 +704,7 @@ void ScXMLAutoStylePoolP::exportStyleContent( uno::Reference xSheetConditionalEntry(xIndex->getByIndex(nCondition), uno::UNO_QUERY); if (xSheetConditionalEntry.is()) { - rtl::OUString sStyleName(xSheetConditionalEntry->getStyleName()); + OUString sStyleName(xSheetConditionalEntry->getStyleName()); uno::Reference xSheetCondition(xSheetConditionalEntry, uno::UNO_QUERY); if (xSheetCondition.is()) { @@ -714,9 +713,9 @@ void ScXMLAutoStylePoolP::exportStyleContent( { if (aOperator == sheet::ConditionOperator_FORMULA) { - rtl::OUString sCondition("is-true-formula("); + OUString sCondition("is-true-formula("); sCondition += xSheetCondition->getFormula1(); - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_CONDITION, sCondition); rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, rScXMLExport.EncodeStyleName( sStyleName )); OUString sOUBaseAddress; @@ -728,41 +727,41 @@ void ScXMLAutoStylePoolP::exportStyleContent( } else { - rtl::OUString sCondition; + OUString sCondition; if (aOperator == sheet::ConditionOperator_BETWEEN || aOperator == sheet::ConditionOperator_NOT_BETWEEN) { if (aOperator == sheet::ConditionOperator_BETWEEN) - sCondition = rtl::OUString("cell-content-is-between("); + sCondition = OUString("cell-content-is-between("); else - sCondition = rtl::OUString("cell-content-is-not-between("); + sCondition = OUString("cell-content-is-not-between("); sCondition += xSheetCondition->getFormula1(); - sCondition += rtl::OUString(","); + sCondition += OUString(","); sCondition += xSheetCondition->getFormula2(); - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + sCondition += OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } else { - sCondition = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); + sCondition = OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content()")); switch (aOperator) { case sheet::ConditionOperator_LESS: - sCondition += rtl::OUString("<"); + sCondition += OUString("<"); break; case sheet::ConditionOperator_GREATER: - sCondition += rtl::OUString(">"); + sCondition += OUString(">"); break; case sheet::ConditionOperator_LESS_EQUAL: - sCondition += rtl::OUString("<="); + sCondition += OUString("<="); break; case sheet::ConditionOperator_GREATER_EQUAL: - sCondition += rtl::OUString(">="); + sCondition += OUString(">="); break; case sheet::ConditionOperator_EQUAL: - sCondition += rtl::OUString("="); + sCondition += OUString("="); break; case sheet::ConditionOperator_NOT_EQUAL: - sCondition += rtl::OUString("!="); + sCondition += OUString("!="); break; default: { @@ -812,7 +811,7 @@ void ScXMLStyleExport::exportStyleAttributes( if (xPropSet.is()) { uno::Reference< beans::XPropertySetInfo > xPropSetInfo(xPropSet->getPropertySetInfo()); - rtl::OUString sNumberFormat("NumberFormat"); + OUString sNumberFormat("NumberFormat"); if( xPropSetInfo->hasPropertyByName( sNumberFormat ) ) { uno::Reference< beans::XPropertyState > xPropState( xPropSet, uno::UNO_QUERY ); @@ -836,7 +835,7 @@ void ScXMLStyleExport::exportStyleContent( ScXMLStyleExport::ScXMLStyleExport( SvXMLExport& rExp, - const ::rtl::OUString& rPoolStyleName, + const OUString& rPoolStyleName, SvXMLAutoStylePoolP *pAutoStyleP ) : XMLStyleExport(rExp, rPoolStyleName, pAutoStyleP) { @@ -964,7 +963,7 @@ bool XmlScPropHdl_CellProtection::equals( } sal_Bool XmlScPropHdl_CellProtection::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -993,8 +992,8 @@ sal_Bool XmlScPropHdl_CellProtection::importXML( sal_Int16 i(0); while (i < rStrImpValue.getLength() && rStrImpValue[i] != ' ') ++i; - rtl::OUString sFirst(rStrImpValue.copy(0, i)); - rtl::OUString sSecond(rStrImpValue.copy(i + 1)); + OUString sFirst(rStrImpValue.copy(0, i)); + OUString sSecond(rStrImpValue.copy(i + 1)); aCellProtection.IsFormulaHidden = false; aCellProtection.IsHidden = false; aCellProtection.IsLocked = false; @@ -1046,7 +1045,7 @@ sal_Bool XmlScPropHdl_CellProtection::importXML( } sal_Bool XmlScPropHdl_CellProtection::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1080,7 +1079,7 @@ sal_Bool XmlScPropHdl_CellProtection::exportXML( else if (aCellProtection.IsFormulaHidden && aCellProtection.IsLocked) { rStrExpValue = GetXMLToken(XML_PROTECTED); - rStrExpValue += rtl::OUString(" "); + rStrExpValue += OUString(" "); rStrExpValue += GetXMLToken(XML_FORMULA_HIDDEN); bRetval = sal_True; } @@ -1107,7 +1106,7 @@ bool XmlScPropHdl_PrintContent::equals( } sal_Bool XmlScPropHdl_PrintContent::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1137,7 +1136,7 @@ sal_Bool XmlScPropHdl_PrintContent::importXML( } sal_Bool XmlScPropHdl_PrintContent::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1146,7 +1145,7 @@ sal_Bool XmlScPropHdl_PrintContent::exportXML( util::CellProtection aCellProtection; if(rValue >>= aCellProtection) { - rtl::OUStringBuffer sValue; + OUStringBuffer sValue; ::sax::Converter::convertBool(sValue, !aCellProtection.IsPrintHidden); rStrExpValue = sValue.makeStringAndClear(); bRetval = sal_True; @@ -1172,7 +1171,7 @@ bool XmlScPropHdl_JustifyMethod::equals( } sal_Bool XmlScPropHdl_JustifyMethod::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1198,7 +1197,7 @@ sal_Bool XmlScPropHdl_JustifyMethod::importXML( } sal_Bool XmlScPropHdl_JustifyMethod::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1246,7 +1245,7 @@ bool XmlScPropHdl_HoriJustify::equals( } sal_Bool XmlScPropHdl_HoriJustify::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1288,7 +1287,7 @@ sal_Bool XmlScPropHdl_HoriJustify::importXML( } sal_Bool XmlScPropHdl_HoriJustify::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1350,7 +1349,7 @@ bool XmlScPropHdl_HoriJustifySource::equals( } sal_Bool XmlScPropHdl_HoriJustifySource::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1371,7 +1370,7 @@ sal_Bool XmlScPropHdl_HoriJustifySource::importXML( } sal_Bool XmlScPropHdl_HoriJustifySource::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1411,7 +1410,7 @@ bool XmlScPropHdl_HoriJustifyRepeat::equals( } sal_Bool XmlScPropHdl_HoriJustifyRepeat::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1432,7 +1431,7 @@ sal_Bool XmlScPropHdl_HoriJustifyRepeat::importXML( } sal_Bool XmlScPropHdl_HoriJustifyRepeat::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1472,7 +1471,7 @@ bool XmlScPropHdl_Orientation::equals( } sal_Bool XmlScPropHdl_Orientation::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1496,7 +1495,7 @@ sal_Bool XmlScPropHdl_Orientation::importXML( } sal_Bool XmlScPropHdl_Orientation::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1541,7 +1540,7 @@ bool XmlScPropHdl_RotateAngle::equals( } sal_Bool XmlScPropHdl_RotateAngle::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1559,7 +1558,7 @@ sal_Bool XmlScPropHdl_RotateAngle::importXML( } sal_Bool XmlScPropHdl_RotateAngle::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1568,7 +1567,7 @@ sal_Bool XmlScPropHdl_RotateAngle::exportXML( if(rValue >>= nVal) { - rtl::OUStringBuffer sValue; + OUStringBuffer sValue; ::sax::Converter::convertNumber(sValue, sal_Int32(nVal / 100)); rStrExpValue = sValue.makeStringAndClear(); bRetval = sal_True; @@ -1593,7 +1592,7 @@ bool XmlScPropHdl_RotateReference::equals( } sal_Bool XmlScPropHdl_RotateReference::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1629,7 +1628,7 @@ sal_Bool XmlScPropHdl_RotateReference::importXML( } sal_Bool XmlScPropHdl_RotateReference::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1690,7 +1689,7 @@ bool XmlScPropHdl_VertJustify::equals( } sal_Bool XmlScPropHdl_VertJustify::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1732,7 +1731,7 @@ sal_Bool XmlScPropHdl_VertJustify::importXML( } sal_Bool XmlScPropHdl_VertJustify::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1799,7 +1798,7 @@ bool XmlScPropHdl_BreakBefore::equals( } sal_Bool XmlScPropHdl_BreakBefore::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1823,7 +1822,7 @@ sal_Bool XmlScPropHdl_BreakBefore::importXML( } sal_Bool XmlScPropHdl_BreakBefore::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1855,7 +1854,7 @@ bool XmlScPropHdl_IsTextWrapped::equals( } sal_Bool XmlScPropHdl_IsTextWrapped::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1876,7 +1875,7 @@ sal_Bool XmlScPropHdl_IsTextWrapped::importXML( } sal_Bool XmlScPropHdl_IsTextWrapped::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1896,7 +1895,7 @@ sal_Bool XmlScPropHdl_IsTextWrapped::exportXML( return bRetval; } -sal_Bool XmlScPropHdl_IsEqual::importXML( const ::rtl::OUString& /* rStrImpValue */, +sal_Bool XmlScPropHdl_IsEqual::importXML( const OUString& /* rStrImpValue */, ::com::sun::star::uno::Any& /* rValue */, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1904,7 +1903,7 @@ sal_Bool XmlScPropHdl_IsEqual::importXML( const ::rtl::OUString& /* rStrImpValue return false; } -sal_Bool XmlScPropHdl_IsEqual::exportXML( ::rtl::OUString& /* rStrExpValue */, +sal_Bool XmlScPropHdl_IsEqual::exportXML( OUString& /* rStrExpValue */, const ::com::sun::star::uno::Any& /* rValue */, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1924,7 +1923,7 @@ bool XmlScPropHdl_Vertical::equals( } sal_Bool XmlScPropHdl_Vertical::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { @@ -1945,7 +1944,7 @@ sal_Bool XmlScPropHdl_Vertical::importXML( } sal_Bool XmlScPropHdl_Vertical::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index feb62e55fbb8..e879ddf6e069 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -217,7 +217,7 @@ class ScXMLStyleExport : public XMLStyleExport public: ScXMLStyleExport( SvXMLExport& rExp, - const ::rtl::OUString& rPoolStyleName, + const OUString& rPoolStyleName, SvXMLAutoStylePoolP *pAutoStyleP=0 ); virtual ~ScXMLStyleExport(); }; @@ -235,8 +235,8 @@ class XmlScPropHdl_CellProtection : public XMLPropertyHandler public: virtual ~XmlScPropHdl_CellProtection(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_PrintContent : public XMLPropertyHandler @@ -244,8 +244,8 @@ class XmlScPropHdl_PrintContent : public XMLPropertyHandler public: virtual ~XmlScPropHdl_PrintContent(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler @@ -253,8 +253,8 @@ class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler public: virtual ~XmlScPropHdl_JustifyMethod(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_HoriJustify : public XMLPropertyHandler @@ -262,8 +262,8 @@ class XmlScPropHdl_HoriJustify : public XMLPropertyHandler public: virtual ~XmlScPropHdl_HoriJustify(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler @@ -271,8 +271,8 @@ class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler public: virtual ~XmlScPropHdl_HoriJustifySource(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler @@ -280,8 +280,8 @@ class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler public: virtual ~XmlScPropHdl_HoriJustifyRepeat(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_Orientation : public XMLPropertyHandler @@ -289,8 +289,8 @@ class XmlScPropHdl_Orientation : public XMLPropertyHandler public: virtual ~XmlScPropHdl_Orientation(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_RotateAngle : public XMLPropertyHandler @@ -298,8 +298,8 @@ class XmlScPropHdl_RotateAngle : public XMLPropertyHandler public: virtual ~XmlScPropHdl_RotateAngle(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_RotateReference : public XMLPropertyHandler @@ -307,8 +307,8 @@ class XmlScPropHdl_RotateReference : public XMLPropertyHandler public: virtual ~XmlScPropHdl_RotateReference(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_VertJustify : public XMLPropertyHandler @@ -316,8 +316,8 @@ class XmlScPropHdl_VertJustify : public XMLPropertyHandler public: virtual ~XmlScPropHdl_VertJustify(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_BreakBefore : public XMLPropertyHandler @@ -325,8 +325,8 @@ class XmlScPropHdl_BreakBefore : public XMLPropertyHandler public: virtual ~XmlScPropHdl_BreakBefore(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler @@ -334,8 +334,8 @@ class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler public: virtual ~XmlScPropHdl_IsTextWrapped(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_IsEqual : public XMLPropertyHandler @@ -343,8 +343,8 @@ class XmlScPropHdl_IsEqual : public XMLPropertyHandler public: virtual ~XmlScPropHdl_IsEqual() {} virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const { return sal_True; } - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XmlScPropHdl_Vertical : public XMLPropertyHandler @@ -352,8 +352,8 @@ class XmlScPropHdl_Vertical : public XMLPropertyHandler public: virtual ~XmlScPropHdl_Vertical(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 249173dec035..7e024b7901b7 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -347,9 +347,9 @@ SvXMLImportContext* XMLTableCellPropsContext::CreateChildContext( sal_uInt16 nPr class ScXMLMapContext : public SvXMLImportContext { - rtl::OUString msApplyStyle; - rtl::OUString msCondition; - rtl::OUString msBaseCell; + OUString msApplyStyle; + OUString msCondition; + OUString msBaseCell; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -357,7 +357,7 @@ public: ScXMLMapContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~ScXMLMapContext(); @@ -410,7 +410,7 @@ ScCondFormatEntry* ScXMLMapContext::CreateConditionEntry() } ScConditionMode eMode = ScConditionEntry::GetModeFromApi(aParseResult.meOperator); - rtl::OUString aNmsp1, aNmsp2; + OUString aNmsp1, aNmsp2; ScDocument* pDoc = GetScImport().GetDocument(); ScCondFormatEntry* pEntry = new ScCondFormatEntry(eMode, aParseResult.maOperand1, aParseResult.maOperand2, pDoc, ScAddress(), msApplyStyle, @@ -577,7 +577,7 @@ void XMLTableStyleContext::SetDefaults() uno::Reference xMultiServiceFactory(GetImport().GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); + uno::Reference xProperties(xMultiServiceFactory->createInstance(OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) FillPropertySet(xProperties); } @@ -709,10 +709,10 @@ XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport, const uno::Reference< XAttributeList > & xAttrList, const bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), - sCellStyleServiceName( rtl::OUString( "com.sun.star.style.CellStyle" )), - sColumnStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), - sRowStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), - sTableStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), + sCellStyleServiceName( OUString( "com.sun.star.style.CellStyle" )), + sColumnStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), + sRowStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), + sTableStyleServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), nNumberFormatIndex(-1), nConditionalFormatIndex(-1), nCellStyleIndex(-1), @@ -800,7 +800,7 @@ uno::Reference < XNameContainer > xStyles.set(xTableStyles); else sName = - OUString( rtl::OUString( "TableStyles" )); + OUString( OUString( "TableStyles" )); } break; case XML_STYLE_FAMILY_TABLE_CELL: @@ -809,7 +809,7 @@ uno::Reference < XNameContainer > xStyles.set(xCellStyles); else sName = - OUString( rtl::OUString( "CellStyles" )); + OUString( OUString( "CellStyles" )); } break; case XML_STYLE_FAMILY_TABLE_COLUMN: @@ -818,7 +818,7 @@ uno::Reference < XNameContainer > xStyles.set(xColumnStyles); else sName = - OUString( rtl::OUString( "ColumnStyles" )); + OUString( OUString( "ColumnStyles" )); } break; case XML_STYLE_FAMILY_TABLE_ROW: @@ -827,7 +827,7 @@ uno::Reference < XNameContainer > xStyles.set(xRowStyles); else sName = - OUString( rtl::OUString( "RowStyles" )); + OUString( OUString( "RowStyles" )); } break; } @@ -873,7 +873,7 @@ uno::Reference < XNameContainer > OUString XMLTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const { - rtl::OUString sServiceName(SvXMLStylesContext::GetServiceName(nFamily)); + OUString sServiceName(SvXMLStylesContext::GetServiceName(nFamily)); if (sServiceName.isEmpty()) { switch( nFamily ) @@ -1008,7 +1008,7 @@ SvXMLImportContext *ScMasterPageContext::CreateChildContext( SvXMLImportContext *ScMasterPageContext::CreateHeaderFooterContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bFooter, const sal_Bool bLeft, @@ -1030,7 +1030,7 @@ SvXMLImportContext *ScMasterPageContext::CreateHeaderFooterContext( bFooter, bLeft ); } -void ScMasterPageContext::ClearContent(const rtl::OUString& rContent) +void ScMasterPageContext::ClearContent(const OUString& rContent) { if (!xPropSet.is()) xPropSet.set(GetStyle(), UNO_QUERY ); @@ -1052,15 +1052,15 @@ void ScMasterPageContext::Finish( sal_Bool bOverwrite ) { XMLTextMasterPageContext::Finish(bOverwrite); if (!bContainsRightFooter) - ClearContent(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON))); + ClearContent(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON))); if (!bContainsRightHeader) - ClearContent(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON))); + ClearContent(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON))); } // --------------------------------------------------------------------------- ScCellTextStyleContext::ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, const uno::Reference & xAttrList, + const OUString& rLName, const uno::Reference & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) : XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ), nLastSheet(-1) diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 09d61bae311f..865e4d00d974 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -69,8 +69,8 @@ public: class XMLTableStyleContext : public XMLPropStyleContext { - ::rtl::OUString sDataStyleName; - rtl::OUString sPageStyle; + OUString sDataStyleName; + OUString sPageStyle; SvXMLStylesContext* pStyles; sal_Int32 nNumberFormat; SCTAB nLastSheet; @@ -84,22 +84,22 @@ class XMLTableStyleContext : public XMLPropStyleContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLTableStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~XMLTableStyleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void FillPropertySet(const ::com::sun::star::uno::Reference< @@ -131,10 +131,10 @@ class XMLTableStylesContext : public SvXMLStylesContext ::com::sun::star::container::XNameContainer > xRowStyles; ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > xTableStyles; - const ::rtl::OUString sCellStyleServiceName; - const ::rtl::OUString sColumnStyleServiceName; - const ::rtl::OUString sRowStyleServiceName; - const ::rtl::OUString sTableStyleServiceName; + const OUString sCellStyleServiceName; + const OUString sColumnStyleServiceName; + const OUString sRowStyleServiceName; + const OUString sTableStyleServiceName; sal_Int32 nNumberFormatIndex; sal_Int32 nConditionalFormatIndex; sal_Int32 nCellStyleIndex; @@ -155,19 +155,19 @@ protected: virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: XMLTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , - const ::rtl::OUString& rLName , + const OUString& rLName , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const bool bAutoStyles ); virtual ~XMLTableStylesContext(); @@ -179,7 +179,7 @@ public: virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; - virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const; sal_Int32 GetIndex(const sal_Int16 nContextID); }; @@ -188,12 +188,12 @@ class ScXMLMasterStylesContext : public SvXMLStylesContext { protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -203,7 +203,7 @@ public: TYPEINFO(); ScXMLMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); @@ -218,17 +218,17 @@ namespace com { namespace sun { namespace star { class ScMasterPageContext : public XMLTextMasterPageContext { com::sun::star::uno::Reference xPropSet; - const rtl::OUString sEmpty; + const OUString sEmpty; sal_Bool bContainsRightHeader; sal_Bool bContainsRightFooter; - void ClearContent(const rtl::OUString& rContent); + void ClearContent(const OUString& rContent); public: TYPEINFO(); ScMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, bool bOverwrite ); @@ -236,12 +236,12 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bFooter, const sal_Bool bLeft, @@ -259,7 +259,7 @@ class ScCellTextStyleContext : public XMLTextStyleContext public: ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index c9f46b11e7ab..122882777cf6 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -99,7 +99,7 @@ uno::Reference getCurrentSheet(const uno::ReferenceSetRowStyle(rCellStyleName); } @@ -216,7 +216,7 @@ void ScMyTables::DeleteTable() } } -void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName) +void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const OUString& rCellStyleName) { rImport.GetStylesImportHelper()->AddColumnStyle(rCellStyleName, nCurrentColCount, nRepeat); nCurrentColCount += nRepeat; @@ -261,14 +261,14 @@ bool ScMyTables::HasXShapes() } void ScMyTables::AddOLE(uno::Reference & rShape, - const rtl::OUString &rRangeList) + const OUString &rRangeList) { aFixupOLEs.AddOLE(rShape, rRangeList); } void ScMyTables::AddMatrixRange( const SCCOL nStartColumn, const SCROW nStartRow, const SCCOL nEndColumn, const SCROW nEndRow, - const rtl::OUString& rFormula, const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar) + const OUString& rFormula, const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar) { OSL_ENSURE(nEndRow >= nStartRow, "wrong row order"); OSL_ENSURE(nEndColumn >= nStartColumn, "wrong column order"); diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index b7707715a64d..58dd0ed5225d 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -37,7 +37,7 @@ class ScXMLImport; struct ScXMLTabProtectionData { - ::rtl::OUString maPassword; + OUString maPassword; ScPasswordHash meHash1; ScPasswordHash meHash2; bool mbProtected; @@ -58,7 +58,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > xCurrentCellRange; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage; ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes; - rtl::OUString sCurrentSheetName; + OUString sCurrentSheetName; ScAddress maCurrentCellPos; ScRangeList maMatrixRangeList; ScXMLTabProtectionData maProtectionData; @@ -69,23 +69,23 @@ private: void NewRow(); void NewColumn(bool bIsCovered); - void SetTableStyle(const rtl::OUString& sStyleName); + void SetTableStyle(const OUString& sStyleName); public: ScMyTables(ScXMLImport& rImport); ~ScMyTables(); - void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, + void NewSheet(const OUString& sTableName, const OUString& sStyleName, const ScXMLTabProtectionData& rProtectData); void AddRow(); - void SetRowStyle(const rtl::OUString& rCellStyleName); + void SetRowStyle(const OUString& rCellStyleName); void AddColumn(bool bIsCovered); void FixupOLEs() { aFixupOLEs.FixupOLEs(); } bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const { return ScMyOLEFixer::IsOLE(rShape); } void DeleteTable(); ScAddress GetCurrentCellPos() const { return maCurrentCellPos; }; - void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName); + void AddColStyle(const sal_Int32 nRepeat, const OUString& rCellStyleName); ScXMLTabProtectionData& GetCurrentProtectionData() { return maProtectionData; } - rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; } + OUString GetCurrentSheetName() const { return sCurrentSheetName; } SCTAB GetCurrentSheet() const { return (maCurrentCellPos.Tab() >= 0) ? maCurrentCellPos.Tab() : 0; } SCCOL GetCurrentColCount() const { return std::min(nCurrentColCount, MAXCOL); } SCROW GetCurrentRow() const { return (maCurrentCellPos.Row() >= 0) ? maCurrentCellPos.Row() : 0; } @@ -100,14 +100,14 @@ public: bool HasDrawPage(); bool HasXShapes(); void AddOLE(com::sun::star::uno::Reference & rShape, - const rtl::OUString &rRangeList); + const OUString &rRangeList); void AddMatrixRange( const SCCOL nStartColumn, const SCROW nStartRow, const SCCOL nEndColumn, const SCROW nEndRow, - const rtl::OUString& rFormula, - const rtl::OUString& rFormulaNmsp, + const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar ); bool IsPartOfMatrix( const ScAddress& rScAddress) const; }; diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index f8dd920d60fd..a7f014cef506 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -55,7 +55,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::xml::sax::XAttributeList; -using ::rtl::OUString; /** * Determine whether this table is an external reference cache from its @@ -69,7 +68,7 @@ using ::rtl::OUString; * * @return */ -static bool lcl_isExternalRefCache(const rtl::OUString& rName, rtl::OUString& rUrl, rtl::OUString& rExtTabName) +static bool lcl_isExternalRefCache(const OUString& rName, OUString& rUrl, OUString& rExtTabName) { // 'file:///path/to/file.ods'#MySheet // 'file:///path/to/file.ods'#MySheet with space @@ -85,10 +84,10 @@ static bool lcl_isExternalRefCache(const rtl::OUString& rName, rtl::OUString& rU if ( eProt == INET_PROT_NOT_VALID ) return false; - rtl::OUString aPrefix = INetURLObject::GetScheme( eProt ); + OUString aPrefix = INetURLObject::GetScheme( eProt ); sal_Int32 nPrefLen = aPrefix.getLength(); - rtl::OUStringBuffer aUrlBuf, aTabNameBuf; + OUStringBuffer aUrlBuf, aTabNameBuf; aUrlBuf.append( aPrefix ); sal_Int32 n = rName.getLength(); const sal_Unicode* p = rName.getStr(); @@ -140,7 +139,7 @@ ScXMLExternalTabData::ScXMLExternalTabData() : ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -153,17 +152,17 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, nStartOffset = GetScImport().GetByteOffset(); ScXMLTabProtectionData aProtectData; - rtl::OUString sName; - rtl::OUString sStyleName; + OUString sName; + OUString sStyleName; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) { - const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); - rtl::OUString aLocalName; + const OUString& sAttrName(xAttrList->getNameByIndex( i )); + OUString aLocalName; sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); - const rtl::OUString& sValue(xAttrList->getValueByIndex( i )); + const OUString& sValue(xAttrList->getValueByIndex( i )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -197,7 +196,7 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, } } - rtl::OUString aExtUrl, aExtTabName; + OUString aExtUrl, aExtTabName; if (lcl_isExternalRefCache(sName, aExtUrl, aExtTabName)) { // This is an external ref cache table. @@ -224,7 +223,7 @@ ScXMLTableContext::~ScXMLTableContext() } SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 7476a0805d24..1caab63fcb3a 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -39,7 +39,7 @@ struct ScXMLExternalTabData class ScXMLTableContext : public SvXMLImportContext { - rtl::OUString sPrintRanges; + OUString sPrintRanges; ::std::auto_ptr pExternalRefInfo; sal_Int32 nStartOffset; bool bStartFormPage; @@ -51,14 +51,14 @@ class ScXMLTableContext : public SvXMLImportContext public: ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -73,14 +73,14 @@ class ScXMLTableProtectionContext : public SvXMLImportContext public: ScXMLTableProtectionContext( ScXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableProtectionContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 02d88a38f128..7ba722d77061 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -76,9 +76,7 @@ #define MAP_LEN(x) x, sizeof(x) - 1 using namespace com::sun::star; -using ::rtl::OUString; -using rtl::OUString; // ----------------------------------------------------------------------- @@ -109,8 +107,8 @@ uno::Reference ScXMLImportWrapper::GetStatusIndicator() sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference& xServiceFactory, uno::Reference& xModel, uno::Reference& xParser, xml::sax::InputSource& aParserInput, - const rtl::OUString& sComponentName, const rtl::OUString& sDocName, - const rtl::OUString& sOldDocName, uno::Sequence& aArgs, + const OUString& sComponentName, const OUString& sDocName, + const OUString& sOldDocName, uno::Sequence& aArgs, sal_Bool bMustBeSuccessfull) { uno::Reference < io::XStream > xDocStream; @@ -118,7 +116,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::ReferenceGetStorage(); sal_Bool bEncrypted = false; - rtl::OUString sStream(sDocName); + OUString sStream(sDocName); if( xStorage.is() ) { try @@ -163,7 +161,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::ReferencesetPropertyValue( sPropName, uno::makeAny( sStream ) ); } @@ -212,9 +210,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX parse exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -249,9 +247,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -263,9 +261,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "Zip exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL( aError.getStr() ); #endif @@ -276,9 +274,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "IO exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -289,9 +287,9 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "uno exception catched while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -340,7 +338,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) SfxObjectShell* pObjSh = rDoc.GetDocumentShell(); if ( pObjSh ) { - rtl::OUString sEmpty; + OUString sEmpty; uno::Reference xModel(pObjSh->GetModel()); /** property map for export info set */ @@ -351,9 +349,9 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "NumberStyles" ), 0, &::getCppuType((uno::Reference *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "PrivateData" ), 0, &::getCppuType( (uno::Reference *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamName" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamName" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "BuildId" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "VBACompatibilityMode" ), 0, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "ScriptConfiguration" ), 0, &::getCppuType((uno::Reference *)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, @@ -389,13 +387,13 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) { sal_Int32 nProgressRange(1000000); xStatusIndicator->start(ScGlobal::GetRscString(STR_LOAD_DOC), nProgressRange); - xInfoSet->setPropertyValue(rtl::OUString("ProgressRange"), uno::makeAny(nProgressRange)); + xInfoSet->setPropertyValue(OUString("ProgressRange"), uno::makeAny(nProgressRange)); } // Set base URI OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); - ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : ::rtl::OUString(); - rtl::OUString sPropName("BaseURI"); + OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : OUString(); + OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); // TODO/LATER: do not do it for embedded links @@ -410,18 +408,18 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) aName = pDocHierarchItem->GetValue(); } else - aName = ::rtl::OUString( "dummyObjectName" ); + aName = OUString( "dummyObjectName" ); if( !aName.isEmpty() ) { - sPropName = rtl::OUString("StreamRelPath"); + sPropName = OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } if (bStylesOnly) { - ::rtl::OUString const sOrganizerMode( + OUString const sOrganizerMode( RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); xInfoSet->setPropertyValue(sOrganizerMode, uno::makeAny(sal_True)); } @@ -472,8 +470,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) nMetaRetval = ImportFromComponent( xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisMetaImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLMetaImporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisMetaImporter") + : OUString("com.sun.star.comp.Calc.XMLMetaImporter"), "meta.xml", "Meta.xml", aMetaArgs, false); RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta import end" ); @@ -516,8 +514,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) nSettingsRetval = ImportFromComponent( xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisSettingsImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLSettingsImporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisSettingsImporter") + : OUString("com.sun.star.comp.Calc.XMLSettingsImporter"), "settings.xml", sEmpty, aSettingsArgs, false); RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings import end" ); @@ -528,9 +526,9 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import start" ); nStylesRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLStylesImporter"), - rtl::OUString("styles.xml"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter") + : OUString("com.sun.star.comp.Calc.XMLStylesImporter"), + OUString("styles.xml"), sEmpty, aStylesArgs, sal_True); RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import end" ); @@ -549,10 +547,10 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import start" ); nDocRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentImporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLContentImporter"), - rtl::OUString("content.xml"), - rtl::OUString("Content.xml"), aDocArgs, + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisContentImporter") + : OUString("com.sun.star.comp.Calc.XMLContentImporter"), + OUString("content.xml"), + OUString("Content.xml"), aDocArgs, sal_True); RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import end" ); @@ -661,8 +659,8 @@ static bool lcl_HasValidStream(ScDocument& rDoc) sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference& xServiceFactory, uno::Reference& xModel, uno::Reference& xWriter, - uno::Sequence& aDescriptor, const rtl::OUString& sName, - const rtl::OUString& sMediaType, const rtl::OUString& sComponentName, + uno::Sequence& aDescriptor, const OUString& sName, + const OUString& sMediaType, const OUString& sComponentName, uno::Sequence& aArgs, ScMySharedData*& pSharedData) { sal_Bool bRet(false); @@ -682,7 +680,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference xSet( xStream, uno::UNO_QUERY ); if (xSet.is()) { - xSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(sMediaType)); + xSet->setPropertyValue(OUString("MediaType"), uno::makeAny(sMediaType)); OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption"); // advise storage impl to use common encryption @@ -699,7 +697,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::ReferencesetPropertyValue( sPropName, uno::makeAny( sName ) ); } @@ -805,10 +803,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "WrittenNumberStyles" ), 0, &::getCppuType((uno::Sequence*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StreamName" ), 0, &::getCppuType( (rtl::OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN( "StyleNames" ), 0, &::getCppuType( (uno::Sequence*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "BaseURI" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamRelPath" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StreamName" ), 0, &::getCppuType( (OUString *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN( "StyleNames" ), 0, &::getCppuType( (uno::Sequence*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "StyleFamilies" ), 0, &::getCppuType( (uno::Sequence*)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "TargetStorage" ), 0, &embed::XStorage::static_type(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { NULL, 0, 0, NULL, 0, 0 } @@ -834,8 +832,8 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) xInfoSet->setPropertyValue( sTargetStorage, uno::Any( xStorage ) ); OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); - ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : ::rtl::OUString(); - rtl::OUString sPropName("BaseURI"); + OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : OUString(); + OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); // TODO/LATER: do not do it for embedded links @@ -852,7 +850,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) if( !aName.isEmpty() ) { - sPropName = rtl::OUString("StreamRelPath"); + sPropName = OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } @@ -871,9 +869,9 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) const uno::Reference< beans::XPropertySet > xPropSet( xStorage, uno::UNO_QUERY_THROW ); try { - ::rtl::OUString aVersion; + OUString aVersion; if (( xPropSet->getPropertyValue( - rtl::OUString("Version")) >>= aVersion ) + OUString("Version")) >>= aVersion ) && !aVersion.equals(ODFVER_010_TEXT) && !aVersion.equals(ODFVER_011_TEXT) ) { @@ -902,10 +900,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export start" ); bMetaRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("meta.xml"), + OUString("meta.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisMetaExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLMetaExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisMetaExporter") + : OUString("com.sun.star.comp.Calc.XMLMetaExporter"), aMetaArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export end" ); @@ -943,10 +941,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export start" ); bStylesRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("styles.xml"), + OUString("styles.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLStylesExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisStylesExporter") + : OUString("com.sun.star.comp.Calc.XMLStylesExporter"), aStylesArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export end" ); @@ -967,10 +965,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export start" ); bDocRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("content.xml"), + OUString("content.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLContentExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisContentExporter") + : OUString("com.sun.star.comp.Calc.XMLContentExporter"), aDocArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export end" ); @@ -995,10 +993,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export start" ); bSettingsRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString("settings.xml"), + OUString("settings.xml"), sTextMediaType, - bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisSettingsExporter") - : rtl::OUString("com.sun.star.comp.Calc.XMLSettingsExporter"), + bOasis ? OUString("com.sun.star.comp.Calc.XMLOasisSettingsExporter") + : OUString("com.sun.star.comp.Calc.XMLSettingsExporter"), aSettingsArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export end" ); diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 7eb84d5bb8e8..e167eb2b4faf 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -266,22 +266,22 @@ uno::Reference SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleCell::getImplementationName(void) +OUString SAL_CALL ScAccessibleCell::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleCell"); + return OUString("ScAccessibleCell"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleCell::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessibleCell"); + pNames[nOldSize] = OUString("com.sun.star.sheet.AccessibleCell"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 7481e654030e..831386a88e04 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -113,7 +113,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground() uno::Reference xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CCOLOR))); + uno::Any aAny = xCellProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CCOLOR))); aAny >>= nColor; } } @@ -154,7 +154,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground() uno::Reference xCellProps(xCell, uno::UNO_QUERY); if (xCellProps.is()) { - uno::Any aAny = xCellProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLBACK))); + uno::Any aAny = xCellProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLBACK))); aAny >>= nColor; } } @@ -199,16 +199,16 @@ sal_Int32 return mnIndex; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleCellBase::createAccessibleDescription(void) throw (uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_CELL_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_CELL_DESCR)); return sDescription; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleCellBase::createAccessibleName(void) throw (uno::RuntimeException) { @@ -222,7 +222,7 @@ sal_Int32 contained in cell A1, ZT reads "cell A twelve" instead of "cell A1 - 2". Simple solution: Append a space character to the cell address. */ sName.Append( ' ' ); - return rtl::OUString(sName); + return OUString(sName); } //===== XAccessibleValue ================================================ @@ -287,10 +287,10 @@ uno::Any SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleCellBase"); + return OUString("ScAccessibleCellBase"); } //===== XTypeProvider =================================================== diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index f19eb7c4692a..3b58ba1fb40b 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -313,7 +313,7 @@ sal_Int16 SAL_CALL return maRole; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::getAccessibleDescription(void) throw (uno::RuntimeException) { @@ -463,7 +463,7 @@ void SAL_CALL ScAccessibleContextBase::notifyEvent( //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::getImplementationName(void) throw (uno::RuntimeException) { @@ -476,7 +476,7 @@ sal_Bool SAL_CALL { // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); sal_Int32 nLength(aSupportedServices.getLength()); const OUString* pServiceNames = aSupportedServices.getConstArray(); @@ -486,7 +486,7 @@ sal_Bool SAL_CALL return false; } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleContextBase::getSupportedServiceNames(void) throw (uno::RuntimeException) { @@ -523,20 +523,20 @@ uno::Sequence SAL_CALL //===== internal ============================================================ -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::createAccessibleDescription(void) throw (uno::RuntimeException) { OSL_FAIL("should be implemented in the abrevated class"); - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleContextBase::createAccessibleName(void) throw (uno::RuntimeException) { OSL_FAIL("should be implemented in the abrevated class"); - return rtl::OUString(); + return OUString(); } void ScAccessibleContextBase::CommitChange(const AccessibleEventObject& rEvent) const @@ -552,7 +552,7 @@ void ScAccessibleContextBase::ChangeName() aEvent.Source = uno::Reference< XAccessibleContext >(const_cast(this)); aEvent.OldValue <<= msName; - msName = rtl::OUString(); // reset the name so it will be hold again + msName = OUString(); // reset the name so it will be hold again getAccessibleName(); // create the new name aEvent.NewValue <<= msName; diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index deb600879345..65f8778d50a2 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -48,8 +48,6 @@ // ause #include "editutil.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::utl::AccessibleRelationSetHelper; using ::utl::AccessibleStateSetHelper; using ::accessibility::AccessibleStaticTextBase; @@ -455,7 +453,7 @@ sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex ) } Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes( sal_Int32 nIndex, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* aRequestedAttributes */ ) + const ::com::sun::star::uno::Sequence< OUString >& /* aRequestedAttributes */ ) throw( IndexOutOfBoundsException, RuntimeException ) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index 0b3141f7f3a8..6c7134459770 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -102,7 +102,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); @@ -116,12 +116,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -447,10 +447,10 @@ uno::Reference SAL_CALL ScAccessibleDataPilotControl::getAc ///===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void) +OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleDataPilotControl"); + return OUString("ScAccessibleDataPilotControl"); } ///===== XTypeProvider =================================================== @@ -468,7 +468,7 @@ uno::Sequence SAL_CALL ScAccessibleDataPilotControl::getImplementation //===== internal ======================================================== -::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleDescription(void) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -476,10 +476,10 @@ uno::Sequence SAL_CALL ScAccessibleDataPilotControl::getImplementation if (mpFieldWindow) return mpFieldWindow->GetDescription(); - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleName(void) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -487,7 +487,7 @@ uno::Sequence SAL_CALL ScAccessibleDataPilotControl::getImplementation if (mpFieldWindow) return mpFieldWindow->GetName(); - return rtl::OUString(); + return OUString(); } Rectangle ScAccessibleDataPilotControl::GetBoundingBoxOnScreen(void) const @@ -658,10 +658,10 @@ uno::Reference SAL_CALL ScAccessibleDataPilotButton::getAcc ///===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void) +OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void) throw (::com::sun::star::uno::RuntimeException) { - return rtl::OUString("ScAccessibleDataPilotButton"); + return OUString("ScAccessibleDataPilotButton"); } ///===== XTypeProvider =================================================== @@ -677,13 +677,13 @@ uno::Sequence SAL_CALL ScAccessibleDataPilotButton::getImplementationI return theScAccessibleDataPilotButtonImplementationId::get().getSeq(); } -::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException) { - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -691,7 +691,7 @@ uno::Sequence SAL_CALL ScAccessibleDataPilotButton::getImplementationI if (mpFieldWindow) return mpFieldWindow->GetFieldText(getAccessibleIndexInParent()); - return rtl::OUString(); + return OUString(); } Rectangle ScAccessibleDataPilotButton::GetBoundingBoxOnScreen(void) const diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 76f84f0441ed..d22416ee542d 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -88,8 +88,8 @@ ScAccessibleShapeData::~ScAccessibleShapeData() struct ScShapeDataLess { - rtl::OUString msLayerId; - rtl::OUString msZOrder; + OUString msLayerId; + OUString msZOrder; ScShapeDataLess() : msLayerId(RTL_CONSTASCII_USTRINGPARAM( "LayerID" )), msZOrder(RTL_CONSTASCII_USTRINGPARAM( "ZOrder" )) @@ -1040,7 +1040,7 @@ void ScChildrenShapes::AddShape(const uno::Reference& xShape, s uno::Reference< beans::XPropertySet > xShapeProp(xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - uno::Any aPropAny = xShapeProp->getPropertyValue(rtl::OUString( "LayerID" )); + uno::Any aPropAny = xShapeProp->getPropertyValue(OUString( "LayerID" )); sal_Int16 nLayerID = 0; if( aPropAny >>= nLayerID ) { @@ -1361,7 +1361,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { mpTempAccEdit = new ScAccessibleEditObject(this, mpViewShell->GetViewData()->GetEditView(meSplitPos), mpViewShell->GetWindowByPos(meSplitPos), GetCurrentCellName(), - rtl::OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::CellInEditMode); + OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::CellInEditMode); uno::Reference xAcc = mpTempAccEdit; AddChild(xAcc, sal_True); @@ -1783,23 +1783,23 @@ void SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleDocument::getImplementationName(void) throw (uno::RuntimeException) { - return ::rtl::OUString("ScAccessibleDocument"); + return OUString("ScAccessibleDocument"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleDocument::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetDocumentView"); + pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheetDocumentView"); return aSequence; } @@ -1916,23 +1916,23 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA return pRelationSet; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleDocument::createAccessibleDescription(void) throw (uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_DOC_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_DOC_DESCR)); return sDescription; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleDocument::createAccessibleName(void) throw (uno::RuntimeException) { SolarMutexGuard aGuard; IsObjectValid(); - rtl::OUString sName = String(ScResId(STR_ACC_DOC_NAME)); + OUString sName = String(ScResId(STR_ACC_DOC_NAME)); sal_Int32 nNumber(sal_Int32(meSplitPos) + 1); - sName += rtl::OUString::valueOf(nNumber); + sName += OUString::valueOf(nNumber); return sName; } @@ -2057,7 +2057,7 @@ void ScAccessibleDocument::RemoveChild(const uno::Reference& xAcc, } } -rtl::OUString ScAccessibleDocument::GetCurrentCellName() const +OUString ScAccessibleDocument::GetCurrentCellName() const { String sName( ScResId(STR_ACC_CELL_NAME) ); if (mpViewShell) @@ -2067,12 +2067,12 @@ rtl::OUString ScAccessibleDocument::GetCurrentCellName() const mpViewShell->GetViewData()->GetCurPos().Format( sAddress, SCA_VALID, NULL ); sName.SearchAndReplaceAscii("%1", sAddress); } - return rtl::OUString(sName); + return OUString(sName); } -rtl::OUString ScAccessibleDocument::GetCurrentCellDescription() const +OUString ScAccessibleDocument::GetCurrentCellDescription() const { - return rtl::OUString(); + return OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 99927af07599..afcd4ff01bc3 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1591,21 +1591,21 @@ uno::Reference SAL_CALL ScAccessibleDocumentPagePreview::ge //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) throw (uno::RuntimeException) { - return ::rtl::OUString("ScAccessibleDocumentPagePreview"); + return OUString("ScAccessibleDocumentPagePreview"); } -uno::Sequence< ::rtl::OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) +uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetPageView"); + pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheetPageView"); return aSequence; } @@ -1626,17 +1626,17 @@ uno::Sequence SAL_CALL //===== internal ======================================================== -::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription(void) throw (uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_PREVIEWDOC_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_PREVIEWDOC_DESCR)); return sDescription; } -::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName(void) throw (uno::RuntimeException) { - rtl::OUString sName = String(ScResId(STR_ACC_PREVIEWDOC_NAME)); + OUString sName = String(ScResId(STR_ACC_PREVIEWDOC_NAME)); return sName; } diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 8c8583ecf9cb..93d175d446c4 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -42,8 +42,8 @@ using namespace ::com::sun::star::accessibility; ScAccessibleEditObject::ScAccessibleEditObject( const uno::Reference& rxParent, - EditView* pEditView, Window* pWin, const rtl::OUString& rName, - const rtl::OUString& rDescription, EditObjectType eObjectType) + EditView* pEditView, Window* pWin, const OUString& rName, + const OUString& rDescription, EditObjectType eObjectType) : ScAccessibleContextBase(rxParent, AccessibleRole::TEXT_FRAME), mpTextHelper(NULL), @@ -228,20 +228,20 @@ uno::Reference SAL_CALL return pStateSet; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleEditObject::createAccessibleDescription(void) throw (uno::RuntimeException) { // OSL_FAIL("Should never be called, because is set in the constructor.") - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleEditObject::createAccessibleName(void) throw (uno::RuntimeException) { OSL_FAIL("Should never be called, because is set in the constructor."); - return rtl::OUString(); + return OUString(); } ///===== XAccessibleEventBroadcaster ===================================== @@ -272,10 +272,10 @@ void SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) +OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleEditObject"); + return OUString("ScAccessibleEditObject"); } //===== XTypeProvider ======================================================= diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index d2618789456a..637b5d589ee7 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -48,7 +48,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; using ::std::for_each; using ::std::vector; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index dfaae342ba46..2104515fccb3 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx @@ -40,7 +40,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; ScAccessibleFilterMenuItem::ScAccessibleFilterMenuItem( const Reference& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) : diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index c5511140c64b..fda7ef5b5208 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::accessibility; using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; ScAccessibleFilterTopWindow::ScAccessibleFilterTopWindow( const Reference& rxParent, ScCheckListMenuWindow* pWin, const OUString& rName) : diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 7291e3ffc7ef..0cf9957f1675 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -316,40 +316,40 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccess //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePageHeader"); + return OUString("ScAccessiblePageHeader"); } -uno::Sequence SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() +uno::Sequence SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.text.AccessibleHeaderFooterView"); + pNames[nOldSize] = OUString("com.sun.star.text.AccessibleHeaderFooterView"); return aSequence; } //==== internal ========================================================= -::rtl::OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription(void) throw (uno::RuntimeException) { String sDesc(ScResId(mbHeader ? STR_ACC_HEADER_DESCR : STR_ACC_FOOTER_DESCR)); sDesc.SearchAndReplaceAscii("%1", String(ScResId(SCSTR_UNKNOWN))); - return rtl::OUString( sDesc ); + return OUString( sDesc ); } -::rtl::OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName(void) throw (uno::RuntimeException) { String sName(ScResId(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME)); sName.SearchAndReplaceAscii("%1", String(ScResId(SCSTR_UNKNOWN))); - return rtl::OUString( sName ); + return OUString( sName ); } Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::RuntimeException) diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 61efa0e810e1..79b9e37c8e68 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -181,23 +181,23 @@ uno::Reference SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessiblePageHeaderArea::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessiblePageHeaderArea"); + return OUString("ScAccessiblePageHeaderArea"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessiblePageHeaderArea::getSupportedServiceNames(void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"); + pNames[nOldSize] = OUString("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"); return aSequence; } @@ -217,10 +217,10 @@ uno::Sequence SAL_CALL } //===== internal ============================================================== -rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) throw(uno::RuntimeException) { - rtl::OUString sDesc; + OUString sDesc; switch (meAdjust) { case SVX_ADJUST_LEFT : @@ -239,10 +239,10 @@ rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(v return sDesc; } -rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) throw (uno::RuntimeException) { - rtl::OUString sName; + OUString sName; switch (meAdjust) { case SVX_ADJUST_LEFT : diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index ce6a79a52da1..2b8df1b29faa 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -180,20 +180,20 @@ uno::Reference SAL_CALL ScAccessiblePreviewCell::getAccessi //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePreviewCell"); + return OUString("ScAccessiblePreviewCell"); } -uno::Sequence SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() +uno::Sequence SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView"); + pNames[nOldSize] = OUString("com.sun.star.table.AccessibleCellView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 3f747ee53947..12315f148b96 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -266,20 +266,20 @@ uno::Reference SAL_CALL ScAccessiblePreviewHeaderCell::getA //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePreviewHeaderCell"); + return OUString("ScAccessiblePreviewHeaderCell"); } -uno::Sequence SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() +uno::Sequence SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView"); + pNames[nOldSize] = OUString("com.sun.star.table.AccessibleCellView"); return aSequence; } @@ -360,15 +360,15 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::Runt return Rectangle(); } -rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() throw(uno::RuntimeException) { - rtl::OUString sDescription = String(ScResId(STR_ACC_HEADERCELL_DESCR)); + OUString sDescription = String(ScResId(STR_ACC_HEADERCELL_DESCR)); return sDescription; } -rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException) { - rtl::OUString sName = String(ScResId(STR_ACC_HEADERCELL_NAME)); + OUString sName = String(ScResId(STR_ACC_HEADERCELL_NAME)); if ( mbColumnHeader ) { @@ -376,7 +376,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr { //! name for corner cell? -// sName = rtl::OUString("Column/Row Header"); +// sName = OUString("Column/Row Header"); } else { @@ -387,7 +387,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr else { // name of row header - sName += rtl::OUString::valueOf( (sal_Int32) ( maCellPos.Row() + 1 ) ); + sName += OUString::valueOf( (sal_Int32) ( maCellPos.Row() + 1 ) ); } return sName; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 557db8336f5f..2ed5c55fcb5f 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -159,7 +159,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnCount() throw (u return nRet; } -rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sal_Int32 nRow ) +OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sal_Int32 nRow ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -167,10 +167,10 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sa if ( nRow < 0 || (mpTableInfo && nRow >= mpTableInfo->GetRows()) ) throw lang::IndexOutOfBoundsException(); - return rtl::OUString(); + return OUString(); } -rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( sal_Int32 nColumn ) +OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -178,7 +178,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( if ( nColumn < 0 || (mpTableInfo && nColumn >= mpTableInfo->GetCols()) ) throw lang::IndexOutOfBoundsException(); - return rtl::OUString(); + return OUString(); } sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) @@ -566,20 +566,20 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAcce //===== XServiceInfo ==================================================== -rtl::OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAccessiblePreviewTable"); + return OUString("ScAccessiblePreviewTable"); } -uno::Sequence SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() +uno::Sequence SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleTableView"); + pNames[nOldSize] = OUString("com.sun.star.table.AccessibleTableView"); return aSequence; } @@ -605,14 +605,14 @@ uno::Sequence SAL_CALL ScAccessiblePreviewTable::getImplementationId() //==== internal ========================================================= -::rtl::OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription(void) throw (uno::RuntimeException) { String sDesc(ScResId(STR_ACC_TABLE_DESCR)); - return rtl::OUString(sDesc); + return OUString(sDesc); } -::rtl::OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName(void) throw (uno::RuntimeException) { String sName(ScResId(STR_ACC_TABLE_NAME)); @@ -623,13 +623,13 @@ uno::Sequence SAL_CALL ScAccessiblePreviewTable::getImplementationId() if ( mpTableInfo ) { - rtl::OUString sCoreName; + OUString sCoreName; if (mpViewShell->GetDocument()->GetName( mpTableInfo->GetTab(), sCoreName )) sName.SearchAndReplaceAscii("%1", sCoreName); } } - return rtl::OUString(sName); + return OUString(sName); } Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::RuntimeException) diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 88037b59b4c5..2dddb0627fdd 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -795,22 +795,22 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) +OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleSpreadsheet"); + return OUString("ScAccessibleSpreadsheet"); } -uno::Sequence< ::rtl::OUString> SAL_CALL +uno::Sequence< OUString> SAL_CALL ScAccessibleSpreadsheet::getSupportedServiceNames (void) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); + uno::Sequence< OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); aSequence.realloc(nOldSize + 1); - ::rtl::OUString* pNames = aSequence.getArray(); + OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheet"); + pNames[nOldSize] = OUString("com.sun.star.AccessibleSpreadsheet"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index b5de4ab84886..95d8e1b293bf 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -98,7 +98,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) return maRange.aEnd.Col() - maRange.aStart.Col() + 1; } -::rtl::OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32 nRow ) +OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32 nRow ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { OSL_FAIL("Here should be a implementation to fill the description"); @@ -107,10 +107,10 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) throw lang::IndexOutOfBoundsException(); //setAccessibleRowDescription(nRow, xAccessible); // to remember the created Description - return rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int32 nColumn ) +OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { OSL_FAIL("Here should be a implementation to fill the description"); @@ -119,7 +119,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) throw lang::IndexOutOfBoundsException(); //setAccessibleColumnDescription(nColumn, xAccessible); // to remember the created Description - return rtl::OUString(); + return OUString(); } sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) @@ -346,23 +346,23 @@ uno::Reference< XAccessible > SAL_CALL return getAccessibleCellAt(nRow, nColumn); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleTableBase::createAccessibleDescription(void) throw (uno::RuntimeException) { String sDesc(ScResId(STR_ACC_TABLE_DESCR)); - return rtl::OUString(sDesc); + return OUString(sDesc); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScAccessibleTableBase::createAccessibleName(void) throw (uno::RuntimeException) { String sName(ScResId(STR_ACC_TABLE_NAME)); - rtl::OUString sCoreName; + OUString sCoreName; if (mpDoc && mpDoc->GetName( maRange.aStart.Tab(), sCoreName )) sName.SearchAndReplaceAscii("%1", sCoreName); - return rtl::OUString(sName); + return OUString(sName); } uno::Reference SAL_CALL @@ -436,10 +436,10 @@ void SAL_CALL //===== XServiceInfo ==================================================== -::rtl::OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString("ScAccessibleTableBase"); + return OUString("ScAccessibleTableBase"); } //===== XTypeProvider =================================================== diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx index a87fce64a219..58c219857c18 100644 --- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx +++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx @@ -74,9 +74,9 @@ void ScDrawModelBroadcaster::Notify( SfxBroadcaster&, { (void) r; #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "Runtime exception caught while notifying shape.:\n")); - aError.append(rtl::OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL( aError.getStr() ); #endif } diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 6ac43354cb71..fab510e3e8b0 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -152,9 +152,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType( "ButtonType" ); - rtl::OUString sPropTargetURL( "TargetURL" ); - rtl::OUString sPropLabel( "Label" ); + OUString sPropButtonType( "ButtonType" ); + OUString sPropTargetURL( "TargetURL" ); + OUString sPropLabel( "Label" ); if(xInfo->hasPropertyByName( sPropButtonType )) { @@ -166,7 +166,7 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain if(xInfo->hasPropertyByName( sPropTargetURL )) { aAny = xPropSet->getPropertyValue( sPropTargetURL ); - rtl::OUString sTmp; + OUString sTmp; if ( (aAny >>= sTmp) && !sTmp.isEmpty() ) { String aUrl = sTmp; @@ -537,7 +537,7 @@ sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUse try { uno::Sequence < beans::PropertyValue > aSeq; - ::rtl::OUString aDummyName("Dummy"); + OUString aDummyName("Dummy"); xPers->storeToEntry( xWorkStore, aDummyName, aSeq, aSeq ); if ( xWorkStore->isStreamElement( aDummyName ) ) { diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 349b1e29b6d7..7f6ac08c6f95 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -105,7 +105,7 @@ sal_Unicode lcl_getSheetSeparator(ScDocument* pDoc) ScTypedCaseStrSet::const_iterator findText( const ScTypedCaseStrSet& rDataSet, ScTypedCaseStrSet::const_iterator itPos, - const rtl::OUString& rStart, rtl::OUString& rResult, bool bBack) + const OUString& rStart, OUString& rResult, bool bBack) { if (bBack) // rueckwaerts { @@ -161,7 +161,7 @@ ScTypedCaseStrSet::const_iterator findText( return rDataSet.end(); // no matching text found. } -rtl::OUString getExactMatch(const ScTypedCaseStrSet& rDataSet, const rtl::OUString& rString) +OUString getExactMatch(const ScTypedCaseStrSet& rDataSet, const OUString& rString) { ScTypedCaseStrSet::const_iterator it = rDataSet.begin(), itEnd = rDataSet.end(); for (; it != itEnd; ++it) @@ -178,9 +178,9 @@ rtl::OUString getExactMatch(const ScTypedCaseStrSet& rDataSet, const rtl::OUStri return rString; } -void removeChars(rtl::OUString& rStr, sal_Unicode c) +void removeChars(OUString& rStr, sal_Unicode c) { - rtl::OUStringBuffer aBuf(rStr); + OUStringBuffer aBuf(rStr); for (sal_Int32 i = 0, n = aBuf.getLength(); i < n; ++i) { if (aBuf[i] == c) @@ -202,7 +202,7 @@ void ScInputHandler::InitRangeFinder( const String& rFormula ) return; String aDelimiters = ScEditUtil::ModifyDelimiters( - rtl::OUString::createFromAscii( pMinDelimiters ) ); + OUString::createFromAscii( pMinDelimiters ) ); xub_StrLen nColon = aDelimiters.Search(':'); if ( nColon != STRING_NOTFOUND ) @@ -384,12 +384,12 @@ inline String GetEditText(EditEngine* pEng) return ScEditUtil::GetSpaceDelimitedString(*pEng); } -static void lcl_RemoveTabs(rtl::OUString& rStr) +static void lcl_RemoveTabs(OUString& rStr) { removeChars(rStr, sal_Unicode('\t')); } -static void lcl_RemoveLineEnd(rtl::OUString& rStr) +static void lcl_RemoveLineEnd(OUString& rStr) { rStr = convertLineEnd(rStr, LINEEND_LF); removeChars(rStr, sal_Unicode('\n')); @@ -787,7 +787,7 @@ void ScInputHandler::HideTip() nTipVisible = 0; pTipVisibleParent = NULL; } - aManualTip = rtl::OUString(); + aManualTip = OUString(); } void ScInputHandler::HideTipBelow() { @@ -799,7 +799,7 @@ void ScInputHandler::HideTipBelow() nTipVisibleSec = 0; pTipVisibleSecParent = NULL; } - aManualTip = rtl::OUString(); + aManualTip = OUString(); } void ScInputHandler::ShowTipCursor() @@ -826,7 +826,7 @@ void ScInputHandler::ShowTipCursor() xub_StrLen nNextFEnd = 0; xub_StrLen nArgPos = 0; const IFunctionDescription* ppFDesc; - ::std::vector< ::rtl::OUString> aArgs; + ::std::vector< OUString> aArgs; sal_uInt16 nArgs; bool bFound = false; FormulaHelper aHelper(ScGlobal::GetStarCalcFunctionMgr()); @@ -848,7 +848,7 @@ void ScInputHandler::ShowTipCursor() nArgPos = aHelper.GetArgStart( aSelText, nNextFStart, 0 ); nArgs = static_cast(ppFDesc->getParameterCount()); - rtl::OUString aNew; + OUString aNew; ScTypedCaseStrSet::const_iterator it = findText(*pFormulaDataPara, pFormulaDataPara->end(), ppFDesc->getFunctionName(), aNew, false); if (it != pFormulaDataPara->end()) @@ -934,7 +934,7 @@ void ScInputHandler::ShowTipCursor() if (nStartPosition > 0) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aNew.copy(0, nStartPosition)); aBuf.append(static_cast(0x25BA)); aBuf.append(aNew.copy(nStartPosition)); @@ -960,7 +960,7 @@ void ScInputHandler::ShowTipCursor() { break; } - rtl::OUString aNew; + OUString aNew; nPosition = aText.Len()+1; ScTypedCaseStrSet::const_iterator it = findText(*pFormulaDataPara, pFormulaDataPara->end(), aText, aNew, false); @@ -1062,14 +1062,14 @@ void ScInputHandler::UseFormulaData() xub_StrLen nNextFEnd = 0; xub_StrLen nArgPos = 0; const IFunctionDescription* ppFDesc; - ::std::vector< ::rtl::OUString> aArgs; + ::std::vector< OUString> aArgs; sal_uInt16 nArgs; bool bFound = false; - rtl::OUString aText = pEngine->GetWord( 0, aSel.nEndPos-1 ); + OUString aText = pEngine->GetWord( 0, aSel.nEndPos-1 ); if (!aText.isEmpty()) { - rtl::OUString aNew; + OUString aNew; miAutoPosFormula = pFormulaData->end(); miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula, aText, aNew, false); if (miAutoPosFormula != pFormulaData->end()) @@ -1099,7 +1099,7 @@ void ScInputHandler::UseFormulaData() nArgPos = aHelper.GetArgStart( aFormula, nNextFStart, 0 ); nArgs = static_cast(ppFDesc->getParameterCount()); - rtl::OUString aNew; + OUString aNew; ScTypedCaseStrSet::const_iterator it = findText(*pFormulaDataPara, pFormulaDataPara->end(), ppFDesc->getFunctionName(), aNew, false); if (it != pFormulaDataPara->end()) @@ -1185,7 +1185,7 @@ void ScInputHandler::UseFormulaData() if (nStartPosition > 0) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aNew.copy(0, nStartPosition)); aBuf.append(static_cast(0x25BA)); aBuf.append(aNew.copy(nStartPosition)); @@ -1212,7 +1212,7 @@ void ScInputHandler::NextFormulaEntry( bool bBack ) EditView* pActiveView = pTopView ? pTopView : pTableView; if ( pActiveView && pFormulaData ) { - rtl::OUString aNew; + OUString aNew; ScTypedCaseStrSet::const_iterator itNew = findText(*pFormulaData, miAutoPosFormula, aAutoSearch, aNew, bBack); if (itNew != pFormulaData->end()) { @@ -1275,7 +1275,7 @@ void ScInputHandler::PasteFunctionData() if (pFormulaData && miAutoPosFormula != pFormulaData->end()) { const ScTypedStrData& rData = *miAutoPosFormula; - const rtl::OUString& aInsert = rData.GetString(); + const OUString& aInsert = rData.GetString(); bool bParInserted = false; DataChanging(); // kann nicht neu sein @@ -1321,7 +1321,7 @@ static String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScA if ( pCell->GetCode()->GetCodeLen() <= 1 ) { // ==1: einzelner ist als Parameter immer Bereich // ==0: es waere vielleicht einer, wenn.. - rtl::OUStringBuffer aBraced; + OUStringBuffer aBraced; aBraced.append('('); aBraced.append(rFormula); aBraced.append(')'); @@ -1378,7 +1378,7 @@ static String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScA void ScInputHandler::FormulaPreview() { - rtl::OUString aValue; + OUString aValue; EditView* pActiveView = pTopView ? pTopView : pTableView; if ( pActiveView && pActiveViewSh ) { @@ -1555,10 +1555,10 @@ void ScInputHandler::UseColData() // beim Tippen xub_StrLen nParLen = pEngine->GetTextLen( aSel.nEndPara ); if ( aSel.nEndPos == nParLen ) { - rtl::OUString aText = GetEditText(pEngine); + OUString aText = GetEditText(pEngine); if (!aText.isEmpty()) { - rtl::OUString aNew; + OUString aNew; miAutoPosColumn = pColumnData->end(); miAutoPosColumn = findText(*pColumnData, miAutoPosColumn, aText, aNew, false); if (miAutoPosColumn != pColumnData->end()) @@ -1573,7 +1573,7 @@ void ScInputHandler::UseColData() // beim Tippen // ein Space zwischen Absaetzen: sal_Int32 nEdLen = pEngine->GetTextLen() + nParCnt - 1; - rtl::OUString aIns = aNew.copy(nEdLen); + OUString aIns = aNew.copy(nEdLen); // selection must be "backwards", so the cursor stays behind the last // typed character @@ -1599,7 +1599,7 @@ void ScInputHandler::UseColData() // beim Tippen // Wenn der eingegebene Text gefunden wurde, TAB nur dann // verschlucken, wenn noch etwas kommt - rtl::OUString aDummy; + OUString aDummy; ScTypedCaseStrSet::const_iterator itNextPos = findText(*pColumnData, miAutoPosColumn, aText, aDummy, false); bUseTab = itNextPos != pColumnData->end(); @@ -1627,12 +1627,12 @@ void ScInputHandler::NextAutoEntry( bool bBack ) sal_uInt16 nParCnt = pEngine->GetParagraphCount(); if ( aSel.nEndPara+1 == nParCnt && aSel.nStartPara == aSel.nEndPara ) { - rtl::OUString aText = GetEditText(pEngine); + OUString aText = GetEditText(pEngine); xub_StrLen nSelLen = aSel.nEndPos - aSel.nStartPos; xub_StrLen nParLen = pEngine->GetTextLen( aSel.nEndPara ); if ( aSel.nEndPos == nParLen && aText.getLength() == aAutoSearch.getLength() + nSelLen ) { - rtl::OUString aNew; + OUString aNew; ScTypedCaseStrSet::const_iterator itNew = findText(*pColumnData, miAutoPosColumn, aAutoSearch, aNew, bBack); @@ -1643,7 +1643,7 @@ void ScInputHandler::NextAutoEntry( bool bBack ) bInOwnChange = true; // disable ModifyHdl (reset below) lcl_RemoveLineEnd( aNew ); - rtl::OUString aIns = aNew.copy(aAutoSearch.getLength()); + OUString aIns = aNew.copy(aAutoSearch.getLength()); // when editing in input line, apply to both edit views if ( pTableView ) @@ -2060,7 +2060,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn pEngine->SetText(aCurrentText); aStr = aCurrentText; bTextValid = false; - aCurrentText = rtl::OUString(); + aCurrentText = OUString(); } else aStr = GetEditText(pEngine); @@ -2154,7 +2154,7 @@ IMPL_LINK_NOARG(ScInputHandler, ModifyHdl) // update input line from ModifyHdl for changes that are not // wrapped by DataChanging/DataChanged calls (like Drag&Drop) - rtl::OUString aText; + OUString aText; if ( pInputWin->IsMultiLineInput() ) aText = ScEditUtil::GetMultilineString(*pEngine); else @@ -2207,7 +2207,7 @@ void ScInputHandler::DataChanged( bool bFromTopNotify, bool bSetModified ) if (eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE) { - rtl::OUString aText; + OUString aText; if ( pInputWin && pInputWin->IsMultiLineInput() ) aText = ScEditUtil::GetMultilineString(*pEngine); else @@ -2496,7 +2496,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) ScPatternAttr* pCellAttrs = NULL; bool bForget = false; // wegen Gueltigkeit streichen ? - rtl::OUString aString = GetEditText(pEngine); + OUString aString = GetEditText(pEngine); EditView* pActiveView = pTopView ? pTopView : pTableView; if (bModified && pActiveView && !aString.isEmpty() && !lcl_IsNumber(aString)) { @@ -2753,37 +2753,37 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) SvxAutoCorrect* pAuto = SvxAutoCorrCfg::Get().GetAutoCorrect(); if ( pAuto ) { - rtl::OUString aReplace(pAuto->GetStartDoubleQuote()); + OUString aReplace(pAuto->GetStartDoubleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getDoubleQuotationMarkStart(); if (!aReplace.equalsAsciiL("\"", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); + OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); - aReplace = rtl::OUString(pAuto->GetEndDoubleQuote()); + aReplace = OUString(pAuto->GetEndDoubleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getDoubleQuotationMarkEnd(); if (!aReplace.equalsAsciiL("\"", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); + OUString(RTL_CONSTASCII_USTRINGPARAM("\""))); - aReplace = rtl::OUString(pAuto->GetStartSingleQuote()); + aReplace = OUString(pAuto->GetStartSingleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getQuotationMarkStart(); if (!aReplace.equalsAsciiL("'", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString("'")); + OUString("'")); - aReplace = rtl::OUString(pAuto->GetEndSingleQuote()); + aReplace = OUString(pAuto->GetEndSingleQuote()); if (aReplace.isEmpty()) aReplace = ScGlobal::pLocaleData->getQuotationMarkEnd(); if (!aReplace.equalsAsciiL("'", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString("'")); + OUString("'")); } } @@ -2828,7 +2828,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) HideTipBelow(); nFormSelStart = nFormSelEnd = 0; - aFormText = rtl::OUString(); + aFormText = OUString(); bInOwnChange = false; bInEnterHandler = false; @@ -2880,7 +2880,7 @@ void ScInputHandler::CancelHandler() NotifyChange( pLastState, true ); nFormSelStart = nFormSelEnd = 0; - aFormText = rtl::OUString(); + aFormText = OUString(); bInOwnChange = false; } @@ -2905,9 +2905,9 @@ void ScInputHandler::AddRefEntry() RemoveSelection(); if (pTableView) - pTableView->InsertText( rtl::OUString(cSep), false ); + pTableView->InsertText( OUString(cSep), false ); if (pTopView) - pTopView->InsertText( rtl::OUString(cSep), false ); + pTopView->InsertText( OUString(cSep), false ); DataChanged(); } @@ -3502,7 +3502,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, const ScAddress& rSPos = pState->GetStartPos(); const ScAddress& rEPos = pState->GetEndPos(); const EditTextObject* pData = pState->GetEditData(); - rtl::OUString aString = pState->GetString(); + OUString aString = pState->GetString(); bool bTxtMod = false; ScDocShell* pDocSh = pActiveViewSh->GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); @@ -3529,7 +3529,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, aString = GetEditText(pEngine); lcl_RemoveTabs(aString); bTextValid = false; - aCurrentText = rtl::OUString(); + aCurrentText = OUString(); } else { @@ -3543,7 +3543,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, if ( pInputWin ) // Bereichsanzeige { - rtl::OUString aPosStr; + OUString aPosStr; const ScAddress::Details aAddrDetails( pDoc, aCursorPos ); // Ist der Bereich ein Name? @@ -3730,7 +3730,7 @@ void ScInputHandler::InputChanged( EditView* pView, bool bFromNotify ) SyncViews( pView ); } -const rtl::OUString& ScInputHandler::GetEditString() +const OUString& ScInputHandler::GetEditString() { if (pEngine) { @@ -3779,7 +3779,7 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine ) { xub_StrLen nLen = rDestEngine.GetTextLen( (sal_uInt16)0 ); ESelection aSel( 0,nLen, 1,0 ); - rDestEngine.QuickInsertText( rtl::OUString(' '), aSel ); // Umbruch durch Space ersetzen + rDestEngine.QuickInsertText( OUString(' '), aSel ); // Umbruch durch Space ersetzen --nParCnt; } @@ -3852,7 +3852,7 @@ void ScInputHandler::InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd ) //------------------------------------------------------------------------ -void ScInputHandler::InputReplaceSelection( const rtl::OUString& rStr ) +void ScInputHandler::InputReplaceSelection( const OUString& rStr ) { if (!pRefViewSh) pRefViewSh = pActiveViewSh; @@ -3862,7 +3862,7 @@ void ScInputHandler::InputReplaceSelection( const rtl::OUString& rStr ) sal_Int32 nOldLen = nFormSelEnd - nFormSelStart; sal_Int32 nNewLen = rStr.getLength(); - rtl::OUStringBuffer aBuf(aFormText); + OUStringBuffer aBuf(aFormText); if (nOldLen) aBuf.remove(nFormSelStart, nOldLen); if (nNewLen) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 27ff958d4176..aa069dbf7659 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -510,7 +510,7 @@ void ScInputWindow::Select() if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt { aTextWindow.StartEditEngine(); - aTextWindow.SetTextString(rtl::OUString('=')); + aTextWindow.SetTextString(OUString('=')); EditView* pView = aTextWindow.GetEditView(); if (pView) @@ -1088,7 +1088,7 @@ void ScInputBarGroup::TriggerToolboxLayout() if ( xPropSet.is() ) { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } @@ -1998,8 +1998,8 @@ void ScTextWnd::ImplInitSettings() ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScTextWnd::CreateAccessible() { return new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), NULL, this, - rtl::OUString(String(ScResId(STR_ACC_EDITLINE_NAME))), - rtl::OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::EditLine); + OUString(String(ScResId(STR_ACC_EDITLINE_NAME))), + OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::EditLine); } void ScTextWnd::InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) @@ -2047,7 +2047,7 @@ ScPosWnd::ScPosWnd( Window* pParent ) : nTipVisible ( 0 ), bFormulaMode( false ) { - Size aSize( GetTextWidth( rtl::OUString("GW99999:GW99999") ), + Size aSize( GetTextWidth( OUString("GW99999:GW99999") ), GetTextHeight() ); aSize.Width() += 25; // ?? aSize.Height() = CalcWindowSizePixel(11); // Funktionen: 10 MRU + "andere..." @@ -2093,12 +2093,12 @@ void ScPosWnd::SetPos( const String& rPosStr ) namespace { -rtl::OUString createLocalRangeName(const rtl::OUString& rName, const rtl::OUString& rTableName) +OUString createLocalRangeName(const OUString& rName, const OUString& rTableName) { - rtl::OUStringBuffer aString (rName); - aString.append(rtl::OUString(" (")); + OUStringBuffer aString (rName); + aString.append(OUString(" (")); aString.append(rTableName); - aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); + aString.append(OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); return aString.makeStringAndClear(); } @@ -2117,7 +2117,7 @@ void ScPosWnd::FillRangeNames() SetSeparatorPos(0); ScRange aDummy; - std::set aSet; + std::set aSet; ScRangeName* pRangeNames = pDoc->GetRangeName(); if (!pRangeNames->empty()) { @@ -2133,7 +2133,7 @@ void ScPosWnd::FillRangeNames() ScRangeName* pLocalRangeName = pDoc->GetRangeName(i); if (pLocalRangeName && !pLocalRangeName->empty()) { - rtl::OUString aTableName; + OUString aTableName; pDoc->GetName(i, aTableName); for (ScRangeName::const_iterator itr = pLocalRangeName->begin(); itr != pLocalRangeName->end(); ++itr) { @@ -2145,7 +2145,7 @@ void ScPosWnd::FillRangeNames() if (!aSet.empty()) { - for (std::set::iterator itr = aSet.begin(); + for (std::set::iterator itr = aSet.begin(); itr != aSet.end(); ++itr) { InsertEntry(*itr); diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index f72718831606..8d20ac100798 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -43,7 +43,7 @@ static SfxItemInfo const aMsgItemInfos[] = //------------------------------------------------------------------------ ScMessagePool::ScMessagePool() - : SfxItemPool ( rtl::OUString("ScMessagePool"), + : SfxItemPool ( OUString("ScMessagePool"), MSGPOOL_START, MSGPOOL_END, aMsgItemInfos, NULL ), // diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 01602ecf8460..7b79ae85adf6 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -136,7 +136,7 @@ void ScDLL::Init() ScModule* pMod = new ScModule( &ScDocShell::Factory() ); (*ppShlPtr) = pMod; - ScDocShell::Factory().SetDocumentServiceName( rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); + ScDocShell::Factory().SetDocumentServiceName( OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); ScGlobal::Init(); // erst wenn der ResManager initialisiert ist // erst nach ScGlobal::Init duerfen die App-Optionen diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index a177050668d6..63ab473ea7a9 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -150,7 +150,7 @@ ScModule::ScModule( SfxObjectFactory* pFact ) : { // im ctor ist der ResManager (DLL-Daten) noch nicht initialisiert! - SetName(rtl::OUString("StarCalc")); // fuer Basic + SetName(OUString("StarCalc")); // fuer Basic ResetDragObject(); SetClipObject( NULL, NULL ); @@ -378,13 +378,13 @@ void ScModule::Execute( SfxRequest& rReq ) { case SID_CHOOSE_DESIGN: { - rtl::OUString aMacroName("Template.Samples.ShowStyles"); + OUString aMacroName("Template.Samples.ShowStyles"); SfxApplication::CallAppBasic( aMacroName ); } break; case SID_EURO_CONVERTER: { - rtl::OUString aMacroName("Euro.ConvertRun.Main"); + OUString aMacroName("Euro.ConvertRun.Main"); SfxApplication::CallAppBasic( aMacroName ); } break; @@ -641,11 +641,11 @@ void ScModule::ResetDragObject() mpDragData->pCellTransfer = NULL; mpDragData->pDrawTransfer = NULL; mpDragData->pJumpLocalDoc = NULL; - mpDragData->aLinkDoc = rtl::OUString(); - mpDragData->aLinkTable = rtl::OUString(); - mpDragData->aLinkArea = rtl::OUString(); - mpDragData->aJumpTarget = rtl::OUString(); - mpDragData->aJumpText = rtl::OUString(); + mpDragData->aLinkDoc = OUString(); + mpDragData->aLinkTable = OUString(); + mpDragData->aLinkArea = OUString(); + mpDragData->aJumpTarget = OUString(); + mpDragData->aJumpText = OUString(); } const ScDragData& ScModule::GetDragData() const @@ -661,7 +661,7 @@ void ScModule::SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawO } void ScModule::SetDragLink( - const rtl::OUString& rDoc, const rtl::OUString& rTab, const rtl::OUString& rArea ) + const OUString& rDoc, const OUString& rTab, const OUString& rArea ) { ResetDragObject(); mpDragData->aLinkDoc = rDoc; @@ -670,7 +670,7 @@ void ScModule::SetDragLink( } void ScModule::SetDragJump( - ScDocument* pLocalDoc, const rtl::OUString& rTarget, const rtl::OUString& rText ) + ScDocument* pLocalDoc, const OUString& rTarget, const OUString& rText ) { ResetDragObject(); @@ -2245,7 +2245,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo ) else { OSL_FAIL("unbekannter Feldbefehl"); - pInfo->SetRepresentation(rtl::OUString('?')); + pInfo->SetRepresentation(OUString('?')); } } diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index 417f3c28fa99..425a868b7e11 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.cxx @@ -59,7 +59,7 @@ void ScModule::SetAutoSpellProperty( sal_Bool bSet ) uno::Any aAny; aAny <<= bSet; - aConfig.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LINGUPROP_AUTOSPELL )), aAny ); + aConfig.SetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( LINGUPROP_AUTOSPELL )), aAny ); } diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 5c84e26cbb6e..4b504dc36943 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -55,7 +55,7 @@ static sal_Bool lcl_IsURLButton( SdrObject* pObject ) uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType( "ButtonType" ); + OUString sPropButtonType( "ButtonType" ); if(xInfo->hasPropertyByName( sPropButtonType )) { uno::Any aAny = xPropSet->getPropertyValue( sPropButtonType ); diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 721b4b2f95e6..6bf6d931d80d 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -322,9 +322,9 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) // DataType depends on format type: - if ( rFlavor.DataType.equals( ::getCppuType( (const ::rtl::OUString*) 0 ) ) ) + if ( rFlavor.DataType.equals( ::getCppuType( (const OUString*) 0 ) ) ) { - rtl::OUString aString; + OUString aString; if ( aObj.ExportString( aString, nFormat ) ) bOK = SetString( aString, rFlavor ); } @@ -598,7 +598,7 @@ void ScTransferObj::InitDocShell() pDestDoc->SetDocOptions( pDoc->GetDocOptions() ); // #i42666# - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( aBlock.aStart.Tab(), aTabName ); pDestDoc->RenameTab( 0, aTabName, false ); // no UpdateRef (empty) diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 158079109f60..724ceec86d8a 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -77,7 +77,7 @@ ScInputStatusItem::~ScInputStatusItem() String ScInputStatusItem::GetValueText() const { - return rtl::OUString("InputStatus"); + return OUString("InputStatus"); } int ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const @@ -185,7 +185,7 @@ ScSortItem::~ScSortItem() String ScSortItem::GetValueText() const { - return rtl::OUString("SortItem"); + return OUString("SortItem"); } //------------------------------------------------------------------------ @@ -292,7 +292,7 @@ bool ScQueryItem::GetAdvancedQuerySource(ScRange& rSource) const String ScQueryItem::GetValueText() const { - return rtl::OUString("QueryItem"); + return OUString("QueryItem"); } //------------------------------------------------------------------------ @@ -356,7 +356,7 @@ ScSubTotalItem::~ScSubTotalItem() String ScSubTotalItem::GetValueText() const { - return rtl::OUString("SubTotalItem"); + return OUString("SubTotalItem"); } //------------------------------------------------------------------------ @@ -417,7 +417,7 @@ ScUserListItem::~ScUserListItem() String ScUserListItem::GetValueText() const { - return rtl::OUString("ScUserListItem"); + return OUString("ScUserListItem"); } //------------------------------------------------------------------------ @@ -483,7 +483,7 @@ ScConsolidateItem::~ScConsolidateItem() String ScConsolidateItem::GetValueText() const { - return rtl::OUString("ScConsolidateItem"); + return OUString("ScConsolidateItem"); } //------------------------------------------------------------------------ @@ -544,7 +544,7 @@ ScPivotItem::~ScPivotItem() String ScPivotItem::GetValueText() const { - return rtl::OUString("ScPivotItem"); + return OUString("ScPivotItem"); } //------------------------------------------------------------------------ @@ -597,7 +597,7 @@ ScSolveItem::~ScSolveItem() String ScSolveItem::GetValueText() const { - return rtl::OUString("ScSolveItem"); + return OUString("ScSolveItem"); } //------------------------------------------------------------------------ @@ -647,7 +647,7 @@ ScTabOpItem::~ScTabOpItem() String ScTabOpItem::GetValueText() const { - return rtl::OUString("ScTabOpItem"); + return OUString("ScTabOpItem"); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index 910b6c50d9c4..10be2588d8cd 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -23,7 +23,6 @@ #include #include -using ::rtl::OUStringBuffer; typedef ScAbstractDialogFactory* (SAL_CALL *ScFuncPtrCreateDialogFactory)(); @@ -49,7 +48,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create() if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( ScAbstractDialogFactory* (SAL_CALL*)() ) - aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory") ); + aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") ); if ( fp ) return fp(); return 0; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index e511c7bb7e0f..0c4304075392 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -218,12 +218,12 @@ bool AbstractScDataPilotSourceTypeDlg_Impl::IsNamedRange() const return pDlg->IsNamedRange(); } -rtl::OUString AbstractScDataPilotSourceTypeDlg_Impl::GetSelectedNamedRange() const +OUString AbstractScDataPilotSourceTypeDlg_Impl::GetSelectedNamedRange() const { return pDlg->GetSelectedNamedRange(); } -void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const ::rtl::OUString& rName) +void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const OUString& rName) { pDlg->AppendNamedRange(rName); } @@ -483,7 +483,7 @@ bool AbstractScMoveTableDlg_Impl::GetRenameTable() const { return pDlg->GetRenameTable(); } -void AbstractScMoveTableDlg_Impl::GetTabNameString( rtl::OUString& rString ) const +void AbstractScMoveTableDlg_Impl::GetTabNameString( OUString& rString ) const { pDlg->GetTabNameString( rString ); } @@ -510,7 +510,7 @@ sal_uInt16 AbstractScNameCreateDlg_Impl::GetFlags() const -std::vector AbstractScNamePasteDlg_Impl::GetSelectedNames() const +std::vector AbstractScNamePasteDlg_Impl::GetSelectedNames() const { return pDlg->GetSelectedNames(); } @@ -572,13 +572,13 @@ String AbstractScDPShowDetailDlg_Impl::GetDimensionName() const } void AbstractScNewScenarioDlg_Impl::SetScenarioData( - const rtl::OUString& rName, const rtl::OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) + const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) { pDlg->SetScenarioData(rName, rComment, rColor, nFlags); } void AbstractScNewScenarioDlg_Impl::GetScenarioData( - rtl::OUString& rName, rtl::OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const + OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const { pDlg->GetScenarioData(rName, rComment, rColor, rFlags); } @@ -594,7 +594,7 @@ sal_uInt16 AbstractScShowTabDlg_Impl::GetSelectEntryCount() const } void AbstractScShowTabDlg_Impl::SetDescription( const String& rTitle, const String& rFixedText, - const rtl::OString& sDlgHelpId, const rtl::OString& sLbHelpId ) + const OString& sDlgHelpId, const OString& sLbHelpId ) { pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId ); } @@ -609,7 +609,7 @@ String AbstractScShowTabDlg_Impl::GetSelectEntry(sal_uInt16 nPos) const -void AbstractScStringInputDlg_Impl::GetInputString( rtl::OUString& rString ) const +void AbstractScStringInputDlg_Impl::GetInputString( OUString& rString ) const { pDlg->GetInputString( rString ); } @@ -811,7 +811,7 @@ AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilo AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( Window* pParent, - const com::sun::star::uno::Sequence& rServices, + const com::sun::star::uno::Sequence& rServices, int nId ) { ScDataPilotServiceDlg * pDlg=NULL; @@ -1268,7 +1268,7 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window const String& rTitle, const String& rEditTitle, const String& rDefault, - const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, + const OString& sHelpId, const OString& sEditHelpId, int nId ) { ScStringInputDlg * pDlg=NULL; @@ -1293,7 +1293,7 @@ AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg ( const String& rTitle, const String& rTabBgColorNoColorText, const Color& rDefaultColor, - const rtl::OString& sHelpId , + const OString& sHelpId , int nId ) { ScTabBgColorDlg * pDlg=NULL; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 5720c691ca72..55d11513b44e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -146,8 +146,8 @@ class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTy virtual bool IsDatabase() const; virtual bool IsExternal() const; virtual bool IsNamedRange() const; - virtual rtl::OUString GetSelectedNamedRange() const; - virtual void AppendNamedRange(const ::rtl::OUString& rName); + virtual OUString GetSelectedNamedRange() const; + virtual void AppendNamedRange(const OUString& rName); }; class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg //add for ScDataPilotServiceDlg @@ -265,7 +265,7 @@ class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScM virtual sal_uInt16 GetSelectedTable () const; virtual bool GetCopyTable () const; virtual bool GetRenameTable () const; - virtual void GetTabNameString( rtl::OUString& rString ) const; + virtual void GetTabNameString( OUString& rString ) const; virtual void SetForceCopyTable (); virtual void EnableCopyTable (sal_Bool bFlag=true); virtual void EnableRenameTable (sal_Bool bFlag=true); @@ -280,7 +280,7 @@ class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg //add for S class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg //add for ScNamePasteDlg { DECL_ABSTDLG_BASE( AbstractScNamePasteDlg_Impl, ScNamePasteDlg ) - virtual std::vector GetSelectedNames() const; + virtual std::vector GetSelectedNames() const; virtual bool IsAllSelected() const; }; @@ -326,10 +326,10 @@ class AbstractScDPShowDetailDlg_Impl : public AbstractScDPShowDetailDlg class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg //add for ScNewScenarioDlg { DECL_ABSTDLG_BASE( AbstractScNewScenarioDlg_Impl, ScNewScenarioDlg ) - virtual void SetScenarioData( const rtl::OUString& rName, const rtl::OUString& rComment, + virtual void SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ); - virtual void GetScenarioData( rtl::OUString& rName, rtl::OUString& rComment, + virtual void GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const; }; @@ -338,7 +338,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg //add for ScShowT DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg) virtual void Insert( const String& rString, sal_Bool bSelected ); virtual sal_uInt16 GetSelectEntryCount() const; - virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& sDlgHelpId, const rtl::OString& sLbHelpId ); + virtual void SetDescription(const String& rTitle, const String& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ); virtual String GetSelectEntry(sal_uInt16 nPos) const; virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const; }; @@ -346,7 +346,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg //add for ScShowT class AbstractScStringInputDlg_Impl : public AbstractScStringInputDlg //add for ScStringInputDlg { DECL_ABSTDLG_BASE( AbstractScStringInputDlg_Impl, ScStringInputDlg ) - virtual void GetInputString( rtl::OUString& rString ) const; + virtual void GetInputString( OUString& rString ) const; }; class AbstractScTabBgColorDlg_Impl : public AbstractScTabBgColorDlg //add for ScTabBgColorDlg @@ -422,7 +422,7 @@ public: virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) ; //add for ScDataPilotSourceTypeDlg virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg - const com::sun::star::uno::Sequence& rServices, + const com::sun::star::uno::Sequence& rServices, int nId ); virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, sal_Bool bDisallowCellMove = false ); //add for ScDeleteCellDlg @@ -529,14 +529,14 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, + const OString& sHelpId, const OString& sEditHelpId, int nId ); virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, //add for ScStringInputDlg const String& rTitle, //Dialog Title const String& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color - const rtl::OString& sHelpId , + const OString& sHelpId , int nId ); virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index e13894aef1f1..3d33e800e2a9 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -33,8 +33,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::accessibility::XAccessible; using ::com::sun::star::accessibility::XAccessibleContext; -using ::rtl::OUString; -using ::rtl::OUStringHash; using ::std::vector; using ::boost::unordered_map; using ::std::auto_ptr; diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index ab583cb3d5d0..5c1d41563b7e 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -27,7 +27,6 @@ #include "docpool.hxx" #include "patattr.hxx" -using rtl::OUString; ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX, const Fraction* pZoomY, ScDocument* pDoc) : mpDoc(pDoc), diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index d7b8013f8b12..71abbf914955 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -52,7 +52,7 @@ ScDoubleField::ScDoubleField( Window* pParent, const ResId& rResId ) : bool ScDoubleField::GetValue( double& rfValue ) const { - rtl::OUString aStr(comphelper::string::strip(GetText(), ' ')); + OUString aStr(comphelper::string::strip(GetText(), ' ')); bool bOk = !aStr.isEmpty(); if( bOk ) { diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index af9a1345dd58..5d6e2181817f 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -68,8 +68,8 @@ void ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, { nLastSlotId = pItem->GetValue(); sal_uInt16 nImageId = nLastSlotId ? nLastSlotId : GetSlotId(); - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nImageId )); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() @@ -84,17 +84,17 @@ SfxPopupWindow* ScTbxInsertCtrl::CreatePopupWindow() sal_uInt16 nSlotId = GetSlotId(); if (nSlotId == SID_TBXCTL_INSERT) { - rtl::OUString aInsertBarResStr( "private:resource/toolbar/insertbar" ); + OUString aInsertBarResStr( "private:resource/toolbar/insertbar" ); createAndPositionSubToolBar( aInsertBarResStr ); } else if (nSlotId == SID_TBXCTL_INSCELLS) { - rtl::OUString aInsertCellsBarResStr( "private:resource/toolbar/insertcellsbar" ); + OUString aInsertCellsBarResStr( "private:resource/toolbar/insertcellsbar" ); createAndPositionSubToolBar( aInsertCellsBarResStr ); } else { - rtl::OUString aInsertObjectBarResStr( "private:resource/toolbar/insertobjectbar" ); + OUString aInsertObjectBarResStr( "private:resource/toolbar/insertobjectbar" ); createAndPositionSubToolBar( aInsertObjectBarResStr ); } return NULL; diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 120a633b4812..9dbab51bbff3 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -311,10 +311,10 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ScalingFactor" ); + aArgs[0].Name = OUString( "ScalingFactor" ); aArgs[0].Value = a; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; } @@ -351,10 +351,10 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ScalingFactor" ); + aArgs[0].Name = OUString( "ScalingFactor" ); aArgs[0].Value = a; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:ScalingFactor"), aArgs ); mpImpl->mbOmitPaint = false; } diff --git a/sc/source/ui/collab/sccollaboration.cxx b/sc/source/ui/collab/sccollaboration.cxx index 26d688f3534c..422f50064f56 100644 --- a/sc/source/ui/collab/sccollaboration.cxx +++ b/sc/source/ui/collab/sccollaboration.cxx @@ -47,12 +47,12 @@ void ScCollaboration::SaveAndSendFile( TpContact* pContact ) const OUString aTmpPath = utl::TempFile::CreateTempName(); aTmpPath += ".ods"; - rtl::OUString aFileURL; + OUString aFileURL; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTmpPath, aFileURL ); ::comphelper::MediaDescriptor aDescriptor; // some issue with hyperlinks: - aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= ::rtl::OUString(); + aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString(); try { css::uno::Reference< css::document::XDocumentRecovery > xDocRecovery( mpScDocShell->GetBaseModel(), css::uno::UNO_QUERY_THROW); diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index a02cf54d09b5..44f7795873aa 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -69,10 +69,10 @@ struct ProtocolError { }; class ScChangeOpReader { - std::vector< rtl::OUString > maArgs; + std::vector< OUString > maArgs; public: - ScChangeOpReader( const rtl::OUString &rString) + ScChangeOpReader( const OUString &rString) { // will need to handle escaping etc. // Surely someone else wrote this before ! [!?] @@ -127,28 +127,28 @@ public: } ~ScChangeOpReader() {} - rtl::OUString getMethod() + OUString getMethod() { return maArgs[0]; } size_t getArgCount() { return maArgs.size(); } - rtl::OUString getString( sal_Int32 n ) + OUString getString( sal_Int32 n ) { if (n > 0 && (size_t)n < getArgCount() ) { - rtl::OUString aUStr( maArgs[ n ] ); + OUString aUStr( maArgs[ n ] ); ScGlobal::EraseQuotes( aUStr ); return aUStr; } else - return rtl::OUString(); + return OUString(); } ScAddress getAddress( sal_Int32 n ) { ScAddress aAddr; - rtl::OUString aToken( getString( n ) ); + OUString aToken( getString( n ) ); aAddr.Parse( aToken ); return aAddr; } @@ -186,7 +186,7 @@ public: // method name ';' then arguments ; separated class ScChangeOpWriter { - rtl::OUStringBuffer aMessage; + OUStringBuffer aMessage; void appendSeparator() { aMessage.append( sal_Unicode( ';' ) ); @@ -199,12 +199,12 @@ public: appendSeparator(); } - void appendString( const rtl::OUString &rStr ) + void appendString( const OUString &rStr ) { if ( rStr.indexOf( sal_Unicode( '"' ) ) >= 0 || rStr.indexOf( sal_Unicode( ';' ) ) >= 0 ) { - rtl::OUString aQuoted( rStr ); + OUString aQuoted( rStr ); ScGlobal::AddQuotes( aQuoted, sal_Unicode( '"' ) ); aMessage.append( aQuoted ); } @@ -215,7 +215,7 @@ public: void appendAddress( const ScAddress &rPos ) { - rtl::OUString aStr; + OUString aStr; rPos.Format( aStr, SCA_VALID ); aMessage.append( aStr ); appendSeparator(); @@ -249,16 +249,16 @@ public: appendSeparator(); } - rtl::OString toString() + OString toString() { - return rtl::OUStringToOString( aMessage.toString(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( aMessage.toString(), RTL_TEXTENCODING_UTF8 ); } }; -void ScDocFuncSend::RecvMessage( const rtl::OString &rString ) +void ScDocFuncSend::RecvMessage( const OString &rString ) { try { - ScChangeOpReader aReader( rtl::OUString( rString.getStr(), + ScChangeOpReader aReader( OUString( rString.getStr(), rString.getLength(), RTL_TEXTENCODING_UTF8 ) ); // FIXME: have some hash to enumeration mapping here @@ -352,10 +352,10 @@ sal_Bool ScDocFuncSend::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& r o_rbNumFmtSet = false; - if ( rtl::OUString( rText ) == "saveme" ) + if ( OUString( rText ) == "saveme" ) mpCollaboration->SaveAndSendFile( NULL ); - if ( rtl::OUString( rText ) == "contacts" ) + if ( OUString( rText ) == "contacts" ) mpCollaboration->DisplayContacts(); return true; // needs some code auditing action diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx index fa2d1fcee4a1..6efeb2562e33 100644 --- a/sc/source/ui/collab/sendfunc.hxx +++ b/sc/source/ui/collab/sendfunc.hxx @@ -22,7 +22,7 @@ class ScDocFuncSend : public ScDocFunc ScCollaboration* mpCollaboration; friend class ScCollaboration; - void RecvMessage( const rtl::OString &rString ); + void RecvMessage( const OString &rString ); void SendMessage( ScChangeOpWriter &rOp ); public: // FIXME: really ScDocFunc should be an abstract base, so diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 45303e61c341..8a3fa214f52f 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -72,7 +72,7 @@ void SetValue( ScColorScaleEntry* pEntry, Edit& aEdit) if(pEntry->GetType() == COLORSCALE_FORMULA) aEdit.SetText(pEntry->GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); else if(pEntry->GetType() != COLORSCALE_MIN && pEntry->GetType() != COLORSCALE_MAX) - aEdit.SetText(rtl::OUString::valueOf(pEntry->GetValue())); + aEdit.SetText(OUString::valueOf(pEntry->GetValue())); else aEdit.Disable(); } @@ -234,8 +234,8 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl ) if(nSelectMax != COLORSCALE_FORMULA && nSelectMax != COLORSCALE_AUTO) { - rtl::OUString aMinString = maEdMin.GetText(); - rtl::OUString aMaxString = maEdMax.GetText(); + OUString aMinString = maEdMin.GetText(); + OUString aMaxString = maEdMax.GetText(); double nMinValue = 0; sal_uInt32 nIndex = 0; mpNumberFormatter->IsNumberFormat(aMinString, nIndex, nMinValue); diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 4896f55b4234..c22d8f61556c 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -383,9 +383,9 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScCond mpDoc(pDoc), mpLastEdit(NULL) { - rtl::OUStringBuffer aTitle( GetText() ); - aTitle.append(rtl::OUString(" ")); - rtl::OUString aRangeString; + OUStringBuffer aTitle( GetText() ); + aTitle.append(OUString(" ")); + OUString aRangeString; rRange.Format(aRangeString, SCA_VALID, pDoc, pDoc->GetAddressConvention()); aTitle.append(aRangeString); SetText(aTitle.makeStringAndClear()); @@ -451,7 +451,7 @@ void ScCondFormatDlg::SetReference(const ScRange& rRef, ScDocument*) if(rRef.aStart != rRef.aEnd) RefInputStart(pEdit); - rtl::OUString aRefStr; + OUString aRefStr; sal_uInt16 n = 0; if(mpLastEdit && mpLastEdit != &maEdRange) n = ABS_DREF3D; @@ -465,7 +465,7 @@ void ScCondFormatDlg::SetReference(const ScRange& rRef, ScDocument*) ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const { - rtl::OUString aRangeStr = maEdRange.GetText(); + OUString aRangeStr = maEdRange.GetText(); if(aRangeStr.isEmpty()) return NULL; @@ -491,7 +491,7 @@ void ScCondFormatDlg::InvalidateRefData() IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit*, pEdit ) { - rtl::OUString aRangeStr = pEdit->GetText(); + OUString aRangeStr = pEdit->GetText(); ScRangeList aRange; sal_uInt16 nFlags = aRange.Parse(aRangeStr, mpDoc, SCA_VALID, mpDoc->GetAddressConvention()); if(nFlags & SCA_VALID) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 0d17859f42a1..249431058b9c 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -65,8 +65,8 @@ long ScCondFrmtEntry::Notify( NotifyEvent& rNEvt ) void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex) { mnIndex = nIndex; - rtl::OUStringBuffer aBuffer(maStrCondition); - aBuffer.append(rtl::OUString::valueOf(nIndex)); + OUStringBuffer aBuffer(maStrCondition); + aBuffer.append(OUString::valueOf(nIndex)); maFtCondNr.SetText(aBuffer.makeStringAndClear()); } @@ -97,7 +97,7 @@ void ScCondFrmtEntry::SetHeight() void ScCondFrmtEntry::Select() { - maFtCondition.SetText(rtl::OUString()); + maFtCondition.SetText(OUString()); maFtCondition.Hide(); maLbType.Show(); mbActive = true; @@ -106,7 +106,7 @@ void ScCondFrmtEntry::Select() void ScCondFrmtEntry::Deselect() { - rtl::OUString maCondText = GetExpressionString(); + OUString maCondText = GetExpressionString(); maFtCondition.SetText(maCondText); maFtCondition.Show(); maLbType.Hide(); @@ -121,7 +121,7 @@ bool ScCondFrmtEntry::IsSelected() const IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) { - rtl::OUString aFormula = pEdit->GetText(); + OUString aFormula = pEdit->GetText(); ScCompiler aComp( mpDoc, maPos ); aComp.SetGrammar( mpDoc->GetGrammar() ); boost::scoped_ptr mpCode(aComp.CompileString(aFormula)); @@ -144,14 +144,14 @@ namespace { void FillStyleListBox( ScDocument* pDoc, ListBox& rLbStyle ) { rLbStyle.SetSeparatorPos(0); - std::set aStyleNames; + std::set aStyleNames; SfxStyleSheetIterator aStyleIter( pDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA ); for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next() ) { - rtl::OUString aName = pStyle->GetName(); + OUString aName = pStyle->GetName(); aStyleNames.insert(aName); } - for(std::set::const_iterator itr = aStyleNames.begin(), itrEnd = aStyleNames.end(); + for(std::set::const_iterator itr = aStyleNames.begin(), itrEnd = aStyleNames.end(); itr != itrEnd; ++itr) { rLbStyle.InsertEntry( *itr ); @@ -177,7 +177,7 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, c if(pFormatEntry) { - rtl::OUString aStyleName = pFormatEntry->GetStyle(); + OUString aStyleName = pFormatEntry->GetStyle(); maLbStyle.SelectEntry(aStyleName); StyleSelectHdl(NULL); ScConditionMode eMode = pFormatEntry->GetOperation(); @@ -306,7 +306,7 @@ void ScConditionFrmtEntry::Init() ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const { ScConditionMode eMode; - rtl::OUString aExpr2; + OUString aExpr2; switch(maLbCondType.GetSelectEntryPos()) { case 0: @@ -392,14 +392,14 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const return NULL; } - rtl::OUString aExpr1 = maEdVal1.GetText(); + OUString aExpr1 = maEdVal1.GetText(); ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mpDoc, maPos, maLbStyle.GetSelectEntry()); return pEntry; } -rtl::OUString ScConditionFrmtEntry::GetExpressionString() +OUString ScConditionFrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression(CONDITION, maLbCondType.GetSelectEntryPos(), maEdVal1.GetText(), maEdVal2.GetText()); } @@ -467,12 +467,12 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre bool bFound = false; for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle && !bFound; pStyle = aStyleIter.Next() ) { - rtl::OUString aName = pStyle->GetName(); + OUString aName = pStyle->GetName(); if ( rLbStyle.GetEntryPos(aName) == LISTBOX_ENTRY_NOTFOUND ) // all lists contain the same entries { for( sal_uInt16 i = 1, n = rLbStyle.GetEntryCount(); i <= n && !bFound; ++i) { - rtl::OUString aStyleName = ScGlobal::pCharClass->uppercase(rtl::OUString(rLbStyle.GetEntry(i))); + OUString aStyleName = ScGlobal::pCharClass->uppercase(OUString(rLbStyle.GetEntry(i))); if( i == n ) { rLbStyle.InsertEntry(aName); @@ -490,7 +490,7 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre } } - rtl::OUString aStyleName = rLbStyle.GetSelectEntry(); + OUString aStyleName = rLbStyle.GetSelectEntry(); SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); if(pStyleSheet) { @@ -553,11 +553,11 @@ IMPL_LINK_NOARG(ScFormulaFrmtEntry, StyleSelectHdl) ScFormatEntry* ScFormulaFrmtEntry::createFormulaEntry() const { ScConditionMode eMode = SC_COND_DIRECT; - rtl::OUString aFormula = maEdFormula.GetText(); + OUString aFormula = maEdFormula.GetText(); if(aFormula.isEmpty()) return NULL; - rtl::OUString aExpr2; + OUString aExpr2; ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aFormula, aExpr2, mpDoc, maPos, maLbStyle.GetSelectEntry()); return pEntry; } @@ -567,7 +567,7 @@ ScFormatEntry* ScFormulaFrmtEntry::GetEntry() const return createFormulaEntry(); } -rtl::OUString ScFormulaFrmtEntry::GetExpressionString() +OUString ScFormulaFrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression(FORMULA, 0, maEdFormula.GetText()); } @@ -613,7 +613,7 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, { double nVal = rEntry.GetValue(); SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); - rtl::OUString aText; + OUString aText; pNumberFormatter->GetInputLineString(nVal, 0, aText); rEdit.SetText(aText); } @@ -755,7 +755,7 @@ ScFormatEntry* ScColorScale2FrmtEntry::createColorscaleEntry() const return pColorScale; } -rtl::OUString ScColorScale2FrmtEntry::GetExpressionString() +OUString ScColorScale2FrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression( COLORSCALE, 0 ); } @@ -921,7 +921,7 @@ ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const return pColorScale; } -rtl::OUString ScColorScale3FrmtEntry::GetExpressionString() +OUString ScColorScale3FrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression( COLORSCALE, 0 ); } @@ -1040,7 +1040,7 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Ed { double nVal = rEntry.GetValue(); SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); - rtl::OUString aText; + OUString aText; pNumberFormatter->GetInputLineString(nVal, 0, aText); rEdit.SetText(aText); } @@ -1116,7 +1116,7 @@ ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const return pDataBar; } -rtl::OUString ScDataBarFrmtEntry::GetExpressionString() +OUString ScDataBarFrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression( DATABAR, 0 ); } @@ -1194,7 +1194,7 @@ ScDateFrmtEntry::ScDateFrmtEntry( Window* pParent, ScDocument* pDoc, const ScCon sal_Int32 nPos = static_cast(pFormat->GetDateType()); maLbDateEntry.SelectEntryPos(nPos); - rtl::OUString aStyleName = pFormat->GetStyleName(); + OUString aStyleName = pFormat->GetStyleName(); maLbStyle.SelectEntry(aStyleName); } @@ -1238,7 +1238,7 @@ ScFormatEntry* ScDateFrmtEntry::GetEntry() const return pNewEntry; } -rtl::OUString ScDateFrmtEntry::GetExpressionString() +OUString ScDateFrmtEntry::GetExpressionString() { return ScCondFormatHelper::GetExpression(DATE, 0); } @@ -1308,7 +1308,7 @@ ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType e ScColorScaleEntry* ScIconSetFrmtDataEntry::CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const { sal_Int32 nPos = maLbEntryType.GetSelectEntryPos(); - rtl::OUString aText = maEdEntry.GetText(); + OUString aText = maEdEntry.GetText(); ScColorScaleEntry* pEntry = new ScColorScaleEntry(); sal_uInt32 nIndex = 0; diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx index 6cbc8a2ec5d5..ad1c1cb50cb3 100644 --- a/sc/source/ui/condformat/condformathelper.cxx +++ b/sc/source/ui/condformat/condformathelper.cxx @@ -13,7 +13,7 @@ namespace { -rtl::OUString getTextForType(ScCondFormatEntryType eType) +OUString getTextForType(ScCondFormatEntryType eType) { switch(eType) { @@ -33,25 +33,25 @@ rtl::OUString getTextForType(ScCondFormatEntryType eType) break; } - return rtl::OUString(""); + return OUString(""); } -rtl::OUString getExpression(sal_Int32 nIndex) +OUString getExpression(sal_Int32 nIndex) { switch(nIndex) { case 0: - return rtl::OUString("="); + return OUString("="); case 1: - return rtl::OUString("<"); + return OUString("<"); case 2: - return rtl::OUString(">"); + return OUString(">"); case 3: - return rtl::OUString("<="); + return OUString("<="); case 4: - return rtl::OUString(">="); + return OUString(">="); case 5: - return rtl::OUString("!="); + return OUString("!="); case 6: return ScGlobal::GetRscString(STR_COND_BETWEEN); case 7: @@ -91,24 +91,24 @@ rtl::OUString getExpression(sal_Int32 nIndex) case 24: return ScGlobal::GetRscString(STR_COND_NOT_CONTAINS); } - return rtl::OUString(); + return OUString(); } -rtl::OUString getDateString(sal_Int32 nIndex) +OUString getDateString(sal_Int32 nIndex) { sal_Int32 nStringIndex = STR_COND_TODAY + nIndex; if(nStringIndex <= STR_COND_NEXTYEAR) return ScGlobal::GetRscString(nStringIndex); assert(false); - return rtl::OUString(); + return OUString(); } } -rtl::OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos) +OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if(!rFormat.IsEmpty()) { switch(rFormat.GetEntry(0)->GetType()) @@ -126,13 +126,13 @@ rtl::OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rForm else { aBuffer.append(getTextForType(CONDITION)); - aBuffer.append(rtl::OUString(" ")); + aBuffer.append(OUString(" ")); aBuffer.append(getExpression(static_cast(eMode))); - aBuffer.append(rtl::OUString(" ")); + aBuffer.append(OUString(" ")); if(eMode == SC_COND_BETWEEN || eMode == SC_COND_NOTBETWEEN) { aBuffer.append(pEntry->GetExpression(rPos, 0)); - aBuffer.append(rtl::OUString(" and ")); + aBuffer.append(OUString(" and ")); aBuffer.append(pEntry->GetExpression(rPos, 1)); } else if(eMode <= SC_COND_NOTEQUAL || eMode >= SC_COND_BEGINS_WITH) @@ -165,11 +165,11 @@ rtl::OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rForm return aBuffer.makeStringAndClear(); } -rtl::OUString ScCondFormatHelper::GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, - rtl::OUString aStr1, rtl::OUString aStr2 ) +OUString ScCondFormatHelper::GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, + OUString aStr1, OUString aStr2 ) { - rtl::OUStringBuffer aBuffer(getTextForType(eType)); - aBuffer.append(rtl::OUString(" ")); + OUStringBuffer aBuffer(getTextForType(eType)); + aBuffer.append(OUString(" ")); if(eType == CONDITION) { // workaround missing FORMULA option in the conditions case diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index a7f9db8d2d90..2a195ade828c 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -38,7 +38,7 @@ static const sal_Char pStrMrg[] = "MRG"; ScAsciiOptions::ScAsciiOptions() : bFixedLen ( false ), - aFieldSeps ( rtl::OUString(';') ), + aFieldSeps ( OUString(';') ), bMergeFieldSeps ( false ), bQuotedFieldAsText(false), bDetectSpecialNumber(false), diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 428aa75f5a4d..4b0dd47a9035 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -109,7 +109,7 @@ void ScCsvGrid::UpdateLayoutData() { DisableRepaint(); SetFont( maMonoFont ); - Execute( CSVCMD_SETCHARWIDTH, GetTextWidth( rtl::OUString( 'X' ) ) ); + Execute( CSVCMD_SETCHARWIDTH, GetTextWidth( OUString( 'X' ) ) ); Execute( CSVCMD_SETLINEHEIGHT, GetTextHeight() + 1 ); SetFont( maHeaderFont ); Execute( CSVCMD_SETHDRHEIGHT, GetTextHeight() + 1 ); @@ -123,7 +123,7 @@ void ScCsvGrid::UpdateOffsetX() sal_Int32 nDigits = 2; while( nLastLine /= 10 ) ++nDigits; nDigits = Max( nDigits, sal_Int32( 3 ) ); - Execute( CSVCMD_SETHDRWIDTH, GetTextWidth( rtl::OUString( '0' ) ) * nDigits ); + Execute( CSVCMD_SETHDRWIDTH, GetTextWidth( OUString( '0' ) ) * nDigits ); } void ScCsvGrid::ApplyLayout( const ScCsvLayoutData& rOldData ) @@ -717,7 +717,7 @@ void ScCsvGrid::DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier ) // cell contents -------------------------------------------------------------- void ScCsvGrid::ImplSetTextLineSep( - sal_Int32 nLine, const rtl::OUString& rTextLine, + sal_Int32 nLine, const OUString& rTextLine, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ) { if( nLine < GetFirstVisLine() ) return; @@ -777,7 +777,7 @@ void ScCsvGrid::ImplSetTextLineSep( InvalidateGfx(); } -void ScCsvGrid::ImplSetTextLineFix( sal_Int32 nLine, const rtl::OUString& rTextLine ) +void ScCsvGrid::ImplSetTextLineFix( sal_Int32 nLine, const OUString& rTextLine ) { if( nLine < GetFirstVisLine() ) return; diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index a077eb7efde5..d790c6c54c2d 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 94c822281b00..b0c2e3bb1ea8 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -190,14 +190,14 @@ void ScCsvTableBox::MakePosVisible( sal_Int32 nPos ) // cell contents -------------------------------------------------------------- void ScCsvTableBox::SetUniStrings( - const rtl::OUString* pTextLines, const String& rSepChars, + const OUString* pTextLines, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ) { // assuming that pTextLines is a string array with size CSV_PREVIEW_LINES // -> will be dynamic sometime DisableRepaint(); sal_Int32 nEndLine = GetFirstVisLine() + CSV_PREVIEW_LINES; - const rtl::OUString* pString = pTextLines; + const OUString* pString = pTextLines; for( sal_Int32 nLine = GetFirstVisLine(); nLine < nEndLine; ++nLine, ++pString ) { if( mbFixedMode ) diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 89617f743608..3e15e44ce149 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -78,9 +78,9 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : uno::Reference xContext = sdb::DatabaseContext::create( comphelper::getProcessComponentContext() ); - uno::Sequence aNames = xContext->getElementNames(); + uno::Sequence aNames = xContext->getElementNames(); long nCount = aNames.getLength(); - const rtl::OUString* pArray = aNames.getConstArray(); + const OUString* pArray = aNames.getConstArray(); for (long nPos = 0; nPos < nCount; nPos++) { String aName = pArray[nPos]; @@ -160,7 +160,7 @@ void ScDataPilotDatabaseDlg::FillObjects() uno::Reference xConnection = xSource->connectWithCompletion( xHandler ); - uno::Sequence aNames; + uno::Sequence aNames; if ( nSelect == DP_TYPELIST_TABLE ) { // get all tables @@ -189,7 +189,7 @@ void ScDataPilotDatabaseDlg::FillObjects() // fill list long nCount = aNames.getLength(); - const rtl::OUString* pArray = aNames.getConstArray(); + const OUString* pArray = aNames.getConstArray(); for( long nPos=0; nPos& rServices ) : + const uno::Sequence& rServices ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DAPISERVICE ) ), // aFlFrame ( this, ScResId( FL_FRAME ) ), @@ -128,7 +127,7 @@ ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, aBtnHelp ( this, ScResId( BTN_HELP ) ) { long nCount = rServices.getLength(); - const rtl::OUString* pArray = rServices.getConstArray(); + const OUString* pArray = rServices.getConstArray(); for (long i=0; iGetName(); + OUString aDBName = pDBData->GetName(); if ( aDBName != STR_DB_LOCAL_NONAME ) aEdName.SetText(aDBName); @@ -267,7 +267,7 @@ void ScDbNameDlg::Init() void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData ) { - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrSource); if (pDBData) { @@ -382,7 +382,7 @@ void ScDbNameDlg::UpdateDBData( const String& rStrName ) pData->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd ); theCurArea = ScRange( ScAddress( nColStart, nRowStart, nTab ), ScAddress( nColEnd, nRowEnd, nTab ) ); - ::rtl::OUString theArea; + OUString theArea; theCurArea.Format( theArea, ABS_DREF3D, pDoc, aAddrDetails ); aEdAssign.SetText( theArea ); aBtnAdd.SetText( aStrModify ); @@ -527,9 +527,9 @@ namespace { class FindByName : public ::std::unary_function { - const ::rtl::OUString& mrName; + const OUString& mrName; public: - FindByName(const ::rtl::OUString& rName) : mrName(rName) {} + FindByName(const OUString& rName) : mrName(rName) {} bool operator() (const ScDBData& r) const { return r.GetName().equals(mrName); @@ -540,7 +540,7 @@ public: IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) { - ::rtl::OUString aStrEntry = aEdName.GetText(); + OUString aStrEntry = aEdName.GetText(); ScDBCollection::NamedDBs& rDBs = aLocalDbCol.getNamedDBs(); ScDBCollection::NamedDBs::iterator itr = ::std::find_if(rDBs.begin(), rDBs.end(), FindByName(aStrEntry)); @@ -549,7 +549,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) { String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY ); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrDelMsg.GetToken(0, '#')); aBuf.append(aStrEntry); aBuf.append(aStrDelMsg.GetToken(1, '#')); diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 46579d2c54b6..2abc85c3a26d 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -52,7 +52,6 @@ #include "pivot.hrc" using namespace com::sun::star; -using ::rtl::OUString; using ::std::vector; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::WeakReference; @@ -80,15 +79,15 @@ void DumpAllFuncData(const ScDPFieldControlBase::FuncDataType& rData) } -ScDPFieldControlBase::FieldName::FieldName(const rtl::OUString& rText, bool bFits, sal_uInt8 nDupCount) : +ScDPFieldControlBase::FieldName::FieldName(const OUString& rText, bool bFits, sal_uInt8 nDupCount) : maText(rText), mbFits(bFits), mnDupCount(nDupCount) {} ScDPFieldControlBase::FieldName::FieldName(const FieldName& r) : maText(r.maText), mbFits(r.mbFits), mnDupCount(r.mnDupCount) {} -rtl::OUString ScDPFieldControlBase::FieldName::getDisplayedText() const +OUString ScDPFieldControlBase::FieldName::getDisplayedText() const { - rtl::OUStringBuffer aBuf(maText); + OUStringBuffer aBuf(maText); if (mnDupCount > 0) aBuf.append(static_cast(mnDupCount+1)); return aBuf.makeStringAndClear(); @@ -150,7 +149,7 @@ bool ScDPFieldControlBase::IsExistingIndex( size_t nIndex ) const return nIndex < maFieldNames.size(); } -void ScDPFieldControlBase::AppendField( const rtl::OUString& rText, const ScPivotFuncData& rFunc ) +void ScDPFieldControlBase::AppendField( const OUString& rText, const ScPivotFuncData& rFunc ) { size_t nNewIndex = maFieldNames.size(); @@ -164,7 +163,7 @@ void ScDPFieldControlBase::AppendField( const rtl::OUString& rText, const ScPivo } size_t ScDPFieldControlBase::AddField( - const rtl::OUString& rText, const Point& rPos, const ScPivotFuncData& rFunc) + const OUString& rText, const Point& rPos, const ScPivotFuncData& rFunc) { size_t nNewIndex = GetFieldIndex(rPos); if (nNewIndex == PIVOTFIELD_INVALID) @@ -280,7 +279,7 @@ void ScDPFieldControlBase::ClearFields() maFuncData.clear(); } -void ScDPFieldControlBase::SetFieldText(const rtl::OUString& rText, size_t nIndex, sal_uInt8 nDupCount) +void ScDPFieldControlBase::SetFieldText(const OUString& rText, size_t nIndex, sal_uInt8 nDupCount) { if( IsExistingIndex( nIndex ) ) { @@ -293,11 +292,11 @@ void ScDPFieldControlBase::SetFieldText(const rtl::OUString& rText, size_t nInde } } -rtl::OUString ScDPFieldControlBase::GetFieldText( size_t nIndex ) const +OUString ScDPFieldControlBase::GetFieldText( size_t nIndex ) const { if( IsExistingIndex( nIndex ) ) return maFieldNames[nIndex].maText; - return rtl::OUString(); + return OUString(); } void ScDPFieldControlBase::GetExistingIndex( const Point& rPos, size_t& rnIndex ) @@ -600,7 +599,7 @@ void ScDPFieldControlBase::DrawField( // #i97623# VirtualDevice is always LTR while other windows derive direction from parent aVirDev.EnableRTL( IsRTLEnabled() ); - rtl::OUString aText = rText.getDisplayedText(); + OUString aText = rText.getDisplayedText(); Size aDevSize( rRect.GetSize() ); long nWidth = aDevSize.Width(); @@ -618,7 +617,7 @@ void ScDPFieldControlBase::DrawField( do { sal_Int32 nCurrLen = (nMinLen + nMaxLen) / 2; - rtl::OUStringBuffer aBuf(rText.maText.copy(0, nCurrLen)); + OUStringBuffer aBuf(rText.maText.copy(0, nCurrLen)); aBuf.appendAscii("..."); aText = aBuf.makeStringAndClear(); nLabelWidth = rDev.GetTextWidth( aText ); @@ -731,7 +730,7 @@ void ScDPFieldControlBase::MoveSelection(SCsCOL nDX, SCsROW nDY) MoveSelection( nNewIndex ); } -sal_uInt8 ScDPFieldControlBase::GetNextDupCount(const rtl::OUString& rFieldText) const +sal_uInt8 ScDPFieldControlBase::GetNextDupCount(const OUString& rFieldText) const { sal_uInt8 nMax = 0; FieldNames::const_iterator it = maFieldNames.begin(), itEnd = maFieldNames.end(); diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index a5a45262ec43..f1d73c6fbe48 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -42,8 +42,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString(rid) ).Execute() @@ -280,7 +278,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) for (size_t i = 0; i < QUERY_ENTRY_COUNT; ++i) { - rtl::OUString aValStr; + OUString aValStr; size_t nCondPos = 0; size_t nFieldSelPos = 0; @@ -439,7 +437,7 @@ void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if ( rRef.aStart != rRef.aEnd ) RefInputStart( &aEdCopyArea ); - rtl::OUString aRefStr; + OUString aRefStr; rRef.aStart.Format( aRefStr, SCA_ABS_3D, pDocP, pDocP->GetAddressConvention() ); aEdCopyArea.SetRefString( aRefStr ); } @@ -477,7 +475,7 @@ void ScFilterDlg::FillFieldLists() if ( pDoc ) { - rtl::OUString aFieldName; + OUString aFieldName; SCTAB nTab = nSrcTab; SCCOL nFirstCol = theQueryData.nCol1; SCROW nFirstRow = theQueryData.nRow1; @@ -490,7 +488,7 @@ void ScFilterDlg::FillFieldLists() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if (!aBtnHeader.IsChecked() || aFieldName.isEmpty()) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrColumn); aBuf.append(sal_Unicode(' ')); aBuf.append(ScColToAlpha(col)); @@ -514,7 +512,7 @@ void ScFilterDlg::UpdateValueList( size_t nList ) ComboBox* pValList = maValueEdArr[nList-1]; sal_uInt16 nFieldSelPos = maFieldLbArr[nList-1]->GetSelectEntryPos(); sal_uInt16 nListPos = 0; - rtl::OUString aCurValue = pValList->GetText(); + OUString aCurValue = pValList->GetText(); pValList->Clear(); pValList->InsertEntry( aStrNotEmpty, 0 ); @@ -629,7 +627,7 @@ void ScFilterDlg::UpdateHdrInValueList( size_t nList ) const ScTypedStrData& rHdrEntry = maEntryLists[nColumn].maList[nPos]; - const rtl::OUString& aHdrStr = rHdrEntry.GetString(); + const OUString& aHdrStr = rHdrEntry.GetString(); bool bWasThere = aHdrStr.equals(pValList->GetEntry(nListPos)); bool bInclude = !aBtnHeader.IsChecked(); @@ -1106,7 +1104,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) size_t nQE = i + nOffset; if ( pEd ) { - rtl::OUString aStrVal = pEd->GetText(); + OUString aStrVal = pEd->GetText(); ListBox* pLbCond = &aLbCond1; ListBox* pLbField = &aLbField1; if ( pEd == &aEdVal2 ) @@ -1133,7 +1131,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) ) { - pLbCond->SelectEntry(rtl::OUString('=')); + pLbCond->SelectEntry(OUString('=')); pLbCond->Disable(); } else @@ -1210,7 +1208,7 @@ void ScFilterDlg::RefreshEditRow( size_t nOffset ) for (size_t i = 0; i < QUERY_ENTRY_COUNT; ++i) { - rtl::OUString aValStr; + OUString aValStr; size_t nCondPos = 0; size_t nFieldSelPos = 0; size_t nQE = i + nOffset; @@ -1226,7 +1224,7 @@ void ScFilterDlg::RefreshEditRow( size_t nOffset ) nFieldSelPos = GetFieldSelPos( static_cast(rEntry.nField) ); const ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); - const rtl::OUString& rQueryStr = rItem.maString; + const OUString& rQueryStr = rItem.maString; if (rEntry.IsQueryByEmpty()) { aValStr = aStrEmpty; diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index df40f72c34be..55b71790559c 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -117,7 +117,7 @@ void ScFilterOptionsMgr::Init() if ( pViewData && pDoc ) { - rtl::OUString theAreaStr; + OUString theAreaStr; ScRange theCurArea ( ScAddress( rQueryData.nCol1, rQueryData.nRow1, pViewData->GetTabNo() ), @@ -125,8 +125,8 @@ void ScFilterOptionsMgr::Init() rQueryData.nRow2, pViewData->GetTabNo() ) ); ScDBCollection* pDBColl = pDoc->GetDBCollection(); - rtl::OUStringBuffer theDbArea; - rtl::OUString theDbName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUStringBuffer theDbArea; + OUString theDbName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv ); @@ -186,8 +186,8 @@ void ScFilterOptionsMgr::Init() } else { - rFtDbAreaLabel.SetText( rtl::OUString() ); - rFtDbArea.SetText( rtl::OUString() ); + rFtDbAreaLabel.SetText( OUString() ); + rFtDbArea.SetText( OUString() ); } //------------------------------------------------------ diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 6d6b50fa50b6..58ba39f4890e 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -153,7 +153,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) if ( pViewData && pDoc ) { - rtl::OUString theAreaStr; + OUString theAreaStr; ScRange theCurArea ( ScAddress( theQueryData.nCol1, theQueryData.nRow1, nSrcTab ), @@ -161,7 +161,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) theQueryData.nRow2, nSrcTab ) ); ScDBCollection* pDBColl = pDoc->GetDBCollection(); - ::rtl::OUString theDbName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString theDbName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); /* * Ueberpruefen, ob es sich bei dem uebergebenen @@ -181,7 +181,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) theDbName = pDBData->GetName(); } - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.appendAscii(" ("); aBuf.append(theDbName); aBuf.append(sal_Unicode(')')); @@ -202,7 +202,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryEntry& rEntry = theQueryData.GetEntry(i); const ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); - rtl::OUString aValStr = rItem.maString; + OUString aValStr = rItem.maString; if (rEntry.IsQueryByEmpty()) aValStr = aStrEmpty; else if (rEntry.IsQueryByNonEmpty()) @@ -281,7 +281,7 @@ void ScPivotFilterDlg::FillFieldLists() if ( pDoc ) { - rtl::OUString aFieldName; + OUString aFieldName; SCTAB nTab = nSrcTab; SCCOL nFirstCol = theQueryData.nCol1; SCROW nFirstRow = theQueryData.nRow1; @@ -294,7 +294,7 @@ void ScPivotFilterDlg::FillFieldLists() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if ( aFieldName.isEmpty() ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrColumn); aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col )); } @@ -316,7 +316,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList ) ComboBox* pValList = aValueEdArr[nList-1]; sal_uInt16 nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); sal_uInt16 nListPos = 0; - rtl::OUString aCurValue = pValList->GetText(); + OUString aCurValue = pValList->GetText(); pValList->Clear(); pValList->InsertEntry( aStrNotEmpty, 0 ); @@ -398,7 +398,7 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() ScQueryEntry& rEntry = theParam.GetEntry(i); ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); - rtl::OUString aStrVal = aValueEdArr[i]->GetText(); + OUString aStrVal = aValueEdArr[i]->GetText(); /* * Dialog liefert die ausgezeichneten Feldwerte "leer"/"nicht leer" @@ -556,9 +556,9 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) for (sal_uInt16 i=0; i<=MAXCOL; i++) DELETEZ( pEntryLists[i] ); - rtl::OUString aCurVal1 = aEdVal1.GetText(); - rtl::OUString aCurVal2 = aEdVal2.GetText(); - rtl::OUString aCurVal3 = aEdVal3.GetText(); + OUString aCurVal1 = aEdVal1.GetText(); + OUString aCurVal2 = aEdVal2.GetText(); + OUString aCurVal3 = aEdVal3.GetText(); UpdateValueList( 1 ); UpdateValueList( 2 ); UpdateValueList( 3 ); @@ -576,7 +576,7 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) { if ( pEd ) { - rtl::OUString aStrVal = pEd->GetText(); + OUString aStrVal = pEd->GetText(); ListBox* pLb = &aLbCond1; if ( pEd == &aEdVal2 ) pLb = &aLbCond2; @@ -587,7 +587,7 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) if ( aStrEmpty.equals(aStrVal) || aStrNotEmpty.equals(aStrVal) ) { - pLb->SelectEntry(rtl::OUString('=')); + pLb->SelectEntry(OUString('=')); pLb->Disable(); } else diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 7b64ec8babeb..42d048f01725 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::sheet; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::std::vector; diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index e232de90d5a5..3e01453dac8c 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -65,7 +65,6 @@ #include using namespace com::sun::star; -using ::rtl::OUString; using ::std::vector; using ::std::for_each; @@ -178,7 +177,7 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window maEdInPos.SetText(aRangeName); else { - rtl::OUString aStr; + OUString aStr; maOldRange = p->GetSourceRange(); maOldRange.Format(aStr, SCR_ABS_3D, mpDoc, mpDoc->GetAddressConvention()); maEdInPos.SetText(aStr); @@ -218,9 +217,9 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window maLbOutPos.InsertEntry( maStrNewTable, 1 ); ScAreaNameIterator aIter( mpDoc ); - rtl::OUString aName; + OUString aName; ScRange aRange; - rtl::OUString aRefStr; + OUString aRefStr; while ( aIter.Next( aName, aRange ) ) { if ( !aIter.WasDBName() ) // hier keine DB-Bereiche ! @@ -247,7 +246,7 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window if ( maPivotData.nTab != MAXTAB+1 ) { - rtl::OUString aStr; + OUString aStr; ScAddress( maPivotData.nCol, maPivotData.nRow, maPivotData.nTab ).Format( aStr, STD_FORMAT, mpDoc, mpDoc->GetAddressConvention() ); @@ -1007,13 +1006,13 @@ ScDPLabelData* ScPivotLayoutDlg::GetLabelData( SCCOL nCol ) return it == maLabelData.end() ? NULL : &(*it); } -rtl::OUString ScPivotLayoutDlg::GetLabelString( SCsCOL nCol ) +OUString ScPivotLayoutDlg::GetLabelString( SCsCOL nCol ) { ScDPLabelData* pData = GetLabelData( nCol ); OSL_ENSURE( pData, "LabelData not found" ); if (pData) return pData->getDisplayName(); - return rtl::OUString(); + return OUString(); } bool ScPivotLayoutDlg::IsOrientationAllowed( SCsCOL nCol, ScPivotFieldType eType ) @@ -1039,9 +1038,9 @@ bool ScPivotLayoutDlg::IsOrientationAllowed( SCsCOL nCol, ScPivotFieldType eType return bAllowed; } -rtl::OUString ScPivotLayoutDlg::GetFuncString( sal_uInt16& rFuncMask, bool bIsValue ) +OUString ScPivotLayoutDlg::GetFuncString( sal_uInt16& rFuncMask, bool bIsValue ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; if ( rFuncMask == PIVOT_FUNC_NONE || rFuncMask == PIVOT_FUNC_AUTO ) @@ -1234,7 +1233,7 @@ bool ScPivotLayoutDlg::GetPivotArrays( void ScPivotLayoutDlg::UpdateSrcRange() { - rtl::OUString aSrcStr = maEdInPos.GetText(); + OUString aSrcStr = maEdInPos.GetText(); sal_uInt16 nResult = ScRange().Parse(aSrcStr, mpDoc, mpDoc->GetAddressConvention()); DataSrcType eSrcType = SRC_INVALID; ScRange aNewRange; @@ -1469,13 +1468,13 @@ void ScPivotLayoutDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) if (mpRefInputEdit == &maEdInPos) { - rtl::OUString aRefStr; + OUString aRefStr; rRef.Format( aRefStr, SCR_ABS_3D, pDoc, pDoc->GetAddressConvention() ); mpRefInputEdit->SetRefString(aRefStr); } else if (mpRefInputEdit == &maEdOutPos) { - rtl::OUString aRefStr; + OUString aRefStr; rRef.aStart.Format( aRefStr, STD_FORMAT, pDoc, pDoc->GetAddressConvention() ); mpRefInputEdit->SetRefString(aRefStr); maOutputRefStr = aRefStr; @@ -1529,7 +1528,7 @@ IMPL_LINK( ScPivotLayoutDlg, ClickHdl, PushButton *, pBtn ) IMPL_LINK_NOARG(ScPivotLayoutDlg, OkHdl) { - rtl::OUString aOutPosStr = maEdOutPos.GetText(); + OUString aOutPosStr = maEdOutPos.GetText(); ScAddress aAdrDest; bool bToNewTable = (maLbOutPos.GetSelectEntryPos() == 1); sal_uInt16 nResult = !bToNewTable ? aAdrDest.Parse( aOutPosStr, mpDoc, mpDoc->GetAddressConvention() ) : 0; diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 5bb9dd745c6a..31c11d482fac 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -148,7 +148,7 @@ ScNewScenarioDlg::~ScNewScenarioDlg() //------------------------------------------------------------------------ -void ScNewScenarioDlg::GetScenarioData( rtl::OUString& rName, rtl::OUString& rComment, +void ScNewScenarioDlg::GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const { rComment = aEdComment.GetText(); @@ -180,7 +180,7 @@ void ScNewScenarioDlg::GetScenarioData( rtl::OUString& rName, rtl::OUString& rCo rFlags = nBits; } -void ScNewScenarioDlg::SetScenarioData( const rtl::OUString& rName, const rtl::OUString& rComment, +void ScNewScenarioDlg::SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) { aEdComment.SetText(rComment); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 0d7264121f35..e6ff9c0ff5bb 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -42,7 +42,6 @@ const SCSIZE ASCIIDLG_MAXROWS = MAXROWCOUNT; using namespace com::sun::star::uno; -using ::rtl::OUString; // Defines - CSV Import Preserve Options #define FIXED_WIDTH "FixedWidth" @@ -460,7 +459,7 @@ ScImportAsciiDlg::~ScImportAsciiDlg() // ---------------------------------------------------------------------------- -bool ScImportAsciiDlg::GetLine( sal_uLong nLine, rtl::OUString &rText ) +bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) { if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream) return false; @@ -560,7 +559,7 @@ void ScImportAsciiDlg::SaveParameters() void ScImportAsciiDlg::SetSeparators() { - rtl::OString sString(rtl::OUStringToOString(maFieldSeparators, + OString sString(OUStringToOString(maFieldSeparators, RTL_TEXTENCODING_MS_1252)); const sal_Char *aSep = sString.getStr(); int len = maFieldSeparators.Len(); @@ -722,7 +721,7 @@ IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl) break; } for (; i < CSV_PREVIEW_LINES; i++) - maPreviewLine[i] = rtl::OUString(); + maPreviewLine[i] = OUString(); mpTableBox->Execute( CSVCMD_SETLINECOUNT, mnRowPosCount); bool bMergeSep = (pCkbAsOnce->IsChecked() == sal_True); diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 1c231bf1e340..a28b7264d150 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -185,7 +185,7 @@ ScImportOptionsDlg::ScImportOptionsDlg( aStr = pFieldSepTab->GetDelimiter( nCode ); if ( !aStr.Len() ) - aEdFieldSep.SetText( rtl::OUString((sal_Unicode)nCode) ); + aEdFieldSep.SetText( OUString((sal_Unicode)nCode) ); else aEdFieldSep.SetText( aStr ); @@ -193,7 +193,7 @@ ScImportOptionsDlg::ScImportOptionsDlg( aStr = pTextSepTab->GetDelimiter( nCode ); if ( !aStr.Len() ) - aEdTextSep.SetText( rtl::OUString((sal_Unicode)nCode) ); + aEdTextSep.SetText( OUString((sal_Unicode)nCode) ); else aEdTextSep.SetText( aStr ); } diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 19f72ec80611..5d277626d813 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -162,7 +162,7 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) continue; nInsert = aLbFilterArea.InsertEntry(itr->second->GetName()); - rtl::OUString aSymbol; + OUString aSymbol; itr->second->GetSymbol(aSymbol); aLbFilterArea.SetEntryData(nInsert, new String(aSymbol)); } diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index c4a51aa184a6..4c56058da302 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -363,7 +363,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) if ( bSortByRows ) { - rtl::OUString aFieldName; + OUString aFieldName; SCCOL nMaxCol = aSortData.nCol2; SCCOL col; @@ -372,7 +372,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) aFieldName = pDoc->GetString(col, nFirstSortRow, nTab); if ( !bHasHeader || aFieldName.isEmpty() ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrColumn); aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col )); } @@ -386,7 +386,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) } else { - rtl::OUString aFieldName; + OUString aFieldName; SCROW nMaxRow = aSortData.nRow2; SCROW row; @@ -395,8 +395,8 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) aFieldName = pDoc->GetString(nFirstSortCol, row, nTab); if ( !bHasHeader || aFieldName.isEmpty() ) { - rtl::OUStringBuffer aBuf; - rtl::OUStringBuffer tempBuf; + OUStringBuffer aBuf; + OUStringBuffer tempBuf; aBuf.append(aStrRow); tempBuf.append(row+1 ); @@ -440,7 +440,7 @@ sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField ) IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) { - rtl::OUString aSelEntry = pLb->GetSelectEntry(); + OUString aSelEntry = pLb->GetSelectEntry(); ScSortKeyItems::iterator pIter; sal_uInt16 nSortKeyIndex = nSortKeyCount; @@ -542,7 +542,7 @@ ScTabPageSortOptions::~ScTabPageSortOptions() sal_uInt16 nEntries = m_pLbOutPos->GetEntryCount(); for ( sal_uInt16 i=1; iGetEntryData( i ); + delete (OUString*)m_pLbOutPos->GetEntryData( i ); delete pColRes; delete pColWrap; //! not if from document @@ -579,7 +579,7 @@ void ScTabPageSortOptions::Init() String theArea; ScDBCollection* pDBColl = pDoc->GetDBCollection(); const SCTAB nCurTab = pViewData->GetTabNo(); - rtl::OUString theDbName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + OUString theDbName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); m_pLbOutPos->Clear(); @@ -587,15 +587,15 @@ void ScTabPageSortOptions::Init() m_pLbOutPos->Disable(); ScAreaNameIterator aIter( pDoc ); - rtl::OUString aName; + OUString aName; ScRange aRange; - rtl::OUString aRefStr; + OUString aRefStr; while ( aIter.Next( aName, aRange ) ) { sal_uInt16 nInsert = m_pLbOutPos->InsertEntry( aName ); aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv ); - m_pLbOutPos->SetEntryData( nInsert, new rtl::OUString( aRefStr ) ); + m_pLbOutPos->SetEntryData( nInsert, new OUString( aRefStr ) ); } m_pLbOutPos->SelectEntryPos( 0 ); @@ -688,7 +688,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) if ( pDoc && !aSortData.bInplace ) { - rtl::OUString aStr; + OUString aStr; sal_uInt16 nFormat = (aSortData.nDestTab != pViewData->GetTabNo()) ? SCR_ABS_3D : SCR_ABS; @@ -748,10 +748,10 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) aNewSortData.aCollatorLocale = LanguageTag( eLang ).getLocale( false ); // get algorithm - rtl::OUString sAlg; + OUString sAlg; if ( eLang != LANGUAGE_SYSTEM ) { - uno::Sequence aAlgos = pColWrap->listCollatorAlgorithms( + uno::Sequence aAlgos = pColWrap->listCollatorAlgorithms( aNewSortData.aCollatorLocale ); sal_uInt16 nSel = m_pLbAlgorithm->GetSelectEntryPos(); if ( nSel < aAlgos.getLength() ) @@ -898,7 +898,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) { if (pLb == m_pLbOutPos) { - rtl::OUString aString; + OUString aString; sal_uInt16 nSelPos = m_pLbOutPos->GetSelectEntryPos(); if ( nSelPos > 0 ) @@ -973,10 +973,10 @@ IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) else { lang::Locale aLocale( LanguageTag( eLang ).getLocale()); - uno::Sequence aAlgos = pColWrap->listCollatorAlgorithms( aLocale ); + uno::Sequence aAlgos = pColWrap->listCollatorAlgorithms( aLocale ); long nCount = aAlgos.getLength(); - const rtl::OUString* pArray = aAlgos.getConstArray(); + const OUString* pArray = aAlgos.getConstArray(); for (long i=0; iGetTabNo(); SCCOL nMaxCol = rSubTotalData.nCol2; SCCOL col; - rtl::OUString aFieldName; + OUString aFieldName; aLbGroup.Clear(); aLbColumns.Clear(); @@ -278,7 +278,7 @@ void ScTpSubTotalGroup::FillListBoxes() aFieldName = pDoc->GetString(col, nFirstRow, nTab); if ( aFieldName.isEmpty() ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(aStrColumn); aFieldName = aBuf.makeStringAndClear().replaceAll("%1", ScColToAlpha( col )); } diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 33f3ff737ff3..005df94c4e39 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -882,7 +882,7 @@ IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) // Use static SfxApplication method to bring up selector dialog for // choosing a script - ::rtl::OUString aScriptURL = SfxApplication::ChooseScript(); + OUString aScriptURL = SfxApplication::ChooseScript(); Application::SetDefDialogParent( pOld ); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 260801e160ca..bd48b87c3e2c 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -114,7 +114,7 @@ void ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ ) sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager(); if (pLinkManager!=NULL) { - rtl::OUString aFile, aArea, aFilter; + OUString aFile, aArea, aFilter; pLinkManager->GetDisplayNames(this, NULL, &aFile, &aArea, &aFilter); // the file dialog returns the filter name with the application prefix diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 6e4ca2bdfb69..5a4b6fd62c89 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------- -bool ScDBDocFunc::AddDBRange( const ::rtl::OUString& rName, const ScRange& rRange, sal_Bool /* bApi */ ) +bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange, sal_Bool /* bApi */ ) { ScDocShellModificator aModificator( rDocShell ); @@ -110,7 +110,7 @@ bool ScDBDocFunc::AddDBRange( const ::rtl::OUString& rName, const ScRange& rRang return true; } -bool ScDBDocFunc::DeleteDBRange(const ::rtl::OUString& rName) +bool ScDBDocFunc::DeleteDBRange(const OUString& rName) { bool bDone = false; ScDocument* pDoc = rDocShell.GetDocument(); @@ -241,7 +241,7 @@ bool ScDBDocFunc::ModifyDBData( const ScDBData& rNewData ) // ----------------------------------------------------------------- -bool ScDBDocFunc::RepeatDB( const ::rtl::OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed, SCTAB aTab ) +bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed, SCTAB aTab ) { //! auch fuer ScDBFunc::RepeatDB benutzen! @@ -1695,8 +1695,8 @@ void ScDBDocFunc::UpdateImport( const String& rTarget, const svx::ODataAccessDes ScImportParam aImportParam; pData->GetImportParam( aImportParam ); - rtl::OUString sDBName; - rtl::OUString sDBTable; + OUString sDBName; + OUString sDBTable; sal_Int32 nCommandType = 0; rDescriptor[svx::daDataSource] >>= sDBName; rDescriptor[svx::daCommand] >>= sDBTable; diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 23fdc2329f0f..0730d04ba080 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -75,7 +75,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram uno::Reference xDP(xFrame, uno::UNO_QUERY); uno::Reference xBeamerFrame = xFrame->findFrame( - rtl::OUString("_beamer"), + OUString("_beamer"), frame::FrameSearchFlag::CHILDREN); if (xBeamerFrame.is()) { @@ -211,7 +211,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, bDispose = sal_True; xRowSet = uno::Reference( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), uno::UNO_QUERY); uno::Reference xRowProp( xRowSet, uno::UNO_QUERY ); OSL_ENSURE( xRowProp.is(), "can't get RowSet" ); @@ -228,15 +228,15 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, aAny <<= rParam.aDBName; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny ); aAny <<= rParam.aStatement; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); aAny <<= nType; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); uno::Reference xExecute( xRowSet, uno::UNO_QUERY ); if ( xExecute.is() ) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index fbdfdc07e8a8..104b0d0dd039 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2851,7 +2851,7 @@ uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, St uno::Reference< uno::XInterface > xDocModuleApiObject; if ( xSF.is() ) { - xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY ); + xVBACodeNamedObjectAccess.set( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY ); xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY ); } return xDocModuleApiObject; @@ -2866,7 +2866,7 @@ static script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sM return sModuleInfo; } -void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModuleName, const rtl::OUString& sSource ) +void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName, const OUString& sSource ) { SfxObjectShell& rDocSh = *rDoc.GetDocumentShell(); uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer(); @@ -2892,16 +2892,16 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModul genModuleName = sModuleName; else { - genModuleName = rtl::OUString( "Sheet1" ); + genModuleName = OUString( "Sheet1" ); nNum = 1; } while( xLib->hasByName( genModuleName ) ) - genModuleName = rtl::OUString( "Sheet") + rtl::OUString::valueOf( ++nNum ); + genModuleName = OUString( "Sheet") + OUString::valueOf( ++nNum ); uno::Any aSourceAny; - rtl::OUString sTmpSource = sSource; + OUString sTmpSource = sSource; if ( sTmpSource.isEmpty() ) - sTmpSource = ::rtl::OUString( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" ); + sTmpSource = OUString( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" ); aSourceAny <<= sTmpSource; uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY ); if ( xVBAModuleInfo.is() ) @@ -2915,7 +2915,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModul } } -void VBA_DeleteModule( ScDocShell& rDocSh, const rtl::OUString& sModuleName ) +void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ) { uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer(); OSL_ENSURE( xLibContainer.is(), "No BasicContainer!" ); @@ -2981,7 +2981,7 @@ sal_Bool ScDocFunc::InsertTable( SCTAB nTab, const String& rName, sal_Bool bReco // Only insert vba modules if vba mode ( and not currently importing XML ) if( bInsertDocModule ) { - rtl::OUString sSource, sCodeName; + OUString sSource, sCodeName; VBA_InsertModule( *pDoc, nTab, sCodeName, sSource ); } rDocShell.Broadcast( ScTablesHint( SC_TAB_INSERTED, nTab ) ); @@ -3022,7 +3022,7 @@ sal_Bool ScDocFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool /* bApi pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,false, pUndoDoc ); - rtl::OUString aOldName; + OUString aOldName; pDoc->GetName( nTab, aOldName ); pUndoDoc->RenameTab( nTab, aOldName, false ); if (bWasLinked) @@ -3034,7 +3034,7 @@ sal_Bool ScDocFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool /* bApi if ( pDoc->IsScenario(nTab) ) { pUndoDoc->SetScenario( nTab, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nScenFlags ); @@ -3064,7 +3064,7 @@ sal_Bool ScDocFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool /* bApi // Views updaten: if( bVbaEnabled ) { - rtl::OUString sCodeName; + OUString sCodeName; if( pDoc->GetCodeName( nTab, sCodeName ) ) { VBA_DeleteModule( rDocShell, sCodeName ); @@ -3197,7 +3197,7 @@ sal_Bool ScDocFunc::RenameTable( SCTAB nTab, const String& rName, sal_Bool bReco ScDocShellModificator aModificator( rDocShell ); sal_Bool bSuccess = false; - rtl::OUString sOldName; + OUString sOldName; pDoc->GetName(nTab, sOldName); if (pDoc->RenameTab( nTab, rName )) { @@ -4864,14 +4864,14 @@ bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc, SCTA return true; } -void ScDocFunc::ModifyAllRangeNames( const boost::ptr_map& rRangeMap ) +void ScDocFunc::ModifyAllRangeNames( const boost::ptr_map& rRangeMap ) { ScDocShellModificator aModificator(rDocShell); ScDocument* pDoc = rDocShell.GetDocument(); if (pDoc->IsUndoEnabled()) { - std::map aOldRangeMap; + std::map aOldRangeMap; pDoc->GetRangeNameMap(aOldRangeMap); rDocShell.GetUndoManager()->AddUndoAction( new ScUndoAllRangeNames(&rDocShell, aOldRangeMap, rRangeMap)); @@ -5117,8 +5117,8 @@ sal_Bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, sal_Bool bApi ) qsort( (void*)ppSortArray, nValidCount, sizeof(ScRangeData*), ICCQsortNameCompare ); #endif - rtl::OUString aName; - rtl::OUStringBuffer aContent; + OUString aName; + OUStringBuffer aContent; String aFormula; SCROW nOutRow = nStartRow; for (j=0; jSetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + pLoadMedium->SetError( nError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); //if the document was not generated by LibreOffice, do hard recalc in case some other document //generator saved cached formula results that differ from LibreOffice's calculated results or @@ -561,10 +561,10 @@ sal_Bool ScDocShell::Load( SfxMedium& rMedium ) } if (!bRet && !rMedium.GetError()) - rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); if (rMedium.GetError()) - SetError( rMedium.GetError(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( rMedium.GetError(), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); InitItems(); CalcOutputFactor(); @@ -690,7 +690,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::UNO_QUERY_THROW ); uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( - ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ); + OUString( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() ) @@ -708,7 +708,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL ); uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 ); uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW ); - aArgsForJob[0] = beans::NamedValue( ::rtl::OUString( "SpreadsheetView" ), + aArgsForJob[0] = beans::NamedValue( OUString( "SpreadsheetView" ), uno::makeAny( xSpreadsheetView ) ); xJob->execute( aArgsForJob ); } @@ -772,7 +772,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) try { ::svt::DocumentLockFile aLockFile( GetSharedFileURL() ); - uno::Sequence< ::rtl::OUString > aData = aLockFile.GetLockData(); + uno::Sequence< OUString > aData = aLockFile.GetLockData(); if ( aData.getLength() > LOCKFILE_SYSUSERNAME_ID ) { if ( !aData[LOCKFILE_OOOUSERNAME_ID].isEmpty() ) @@ -837,8 +837,8 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference< frame::XStorable > xStor( GetModel(), uno::UNO_QUERY_THROW ); // TODO/LATER: More entries from the MediaDescriptor might be interesting for the merge uno::Sequence< beans::PropertyValue > aValues(1); - aValues[0].Name = ::rtl::OUString( "FilterName"); - aValues[0].Value <<= ::rtl::OUString( GetMedium()->GetFilter()->GetFilterName() ); + aValues[0].Name = OUString( "FilterName"); + aValues[0].Value <<= OUString( GetMedium()->GetFilter()->GetFilterName() ); SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) @@ -904,7 +904,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } if ( !bSuccess ) - SetError( ERRCODE_IO_ABORT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process + SetError( ERRCODE_IO_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process } #endif @@ -921,7 +921,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( RET_NO == aBox.Execute()) { - SetError( ERRCODE_IO_ABORT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process + SetError( ERRCODE_IO_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will produce no error message, but will break the further saving process } } } // fall through @@ -1062,7 +1062,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else bRet = sal_True; @@ -1091,7 +1091,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1128,13 +1128,13 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError == SCWARN_IMPORT_RANGE_OVERFLOW) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); bRet = sal_True; } else if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else bRet = true; @@ -1159,7 +1159,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) // ISO8859-1/MS_1252 encoding, comma, double quotes aOptions.SetCharSet( RTL_TEXTENCODING_MS_1252 ); - aOptions.SetFieldSeps( rtl::OUString(',') ); + aOptions.SetFieldSeps( OUString(',') ); aOptions.SetTextSep( '"' ); } @@ -1194,7 +1194,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else if (!GetError() && (bOverflowRow || bOverflowCol || bOverflowCell)) { @@ -1202,7 +1202,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) FltError nWarn = (bOverflowRow ? SCWARN_IMPORT_ROW_OVERFLOW : (bOverflowCol ? SCWARN_IMPORT_COLUMN_OVERFLOW : SCWARN_IMPORT_CELL_OVERFLOW)); - SetError( nWarn, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError( nWarn, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } bSetColWidths = sal_True; bSetSimpleTextColWidths = sal_True; @@ -1234,7 +1234,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); bRet = ( eError == SCWARN_IMPORT_RANGE_OVERFLOW ); } else @@ -1272,7 +1272,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1307,7 +1307,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); bSetColWidths = sal_True; bSetSimpleTextColWidths = sal_True; bSetRowHeights = sal_True; @@ -1318,7 +1318,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; } @@ -1344,7 +1344,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1363,7 +1363,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else if (aFltName.EqualsAscii(pFilterHtml) || aFltName.EqualsAscii(pFilterHtmlWebQ)) { @@ -1395,7 +1395,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (eError != eERR_OK) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK ) bRet = sal_True; @@ -1412,12 +1412,12 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } if ( eError != eERR_OK && !GetError() ) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } else { if (!GetError()) - SetError(SCERR_IMPORT_NI, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } if (!bCalc3) @@ -1664,16 +1664,16 @@ sal_Int32 lcl_ScDocShell_GetColWidthInChars( sal_uInt16 nWidth ) } -void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& rDoc, +void lcl_ScDocShell_GetFixedWidthString( OUString& rStr, const ScDocument& rDoc, SCTAB nTab, SCCOL nCol, sal_Bool bValue, SvxCellHorJustify eHorJust ) { - rtl::OUString aString = rStr; + OUString aString = rStr; sal_Int32 nLen = lcl_ScDocShell_GetColWidthInChars( rDoc.GetColWidth( nCol, nTab ) ); //If the text won't fit in the column if ( nLen < aString.getLength() ) { - rtl::OUStringBuffer aReplacement; + OUStringBuffer aReplacement; if (bValue) aReplacement.appendAscii(RTL_CONSTASCII_STRINGPARAM("###")); else @@ -1691,7 +1691,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& { case SVX_HOR_JUSTIFY_RIGHT: { - rtl::OUStringBuffer aTmp; + OUStringBuffer aTmp; aTmp = comphelper::string::padToLength( aTmp, nBlanks, ' ' ); aString = aTmp.append(aString).makeStringAndClear(); } @@ -1699,7 +1699,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& case SVX_HOR_JUSTIFY_CENTER: { sal_Int32 nLeftPad = nBlanks / 2; - rtl::OUStringBuffer aTmp; + OUStringBuffer aTmp; comphelper::string::padToLength( aTmp, nLeftPad, ' ' ); aTmp.append(aString); comphelper::string::padToLength( aTmp, nLen, ' ' ); @@ -1708,7 +1708,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& break; default: { - rtl::OUStringBuffer aTmp(aString); + OUStringBuffer aTmp(aString); comphelper::string::padToLength( aTmp, nLen, ' ' ); aString = aTmp.makeStringAndClear(); } @@ -1721,7 +1721,7 @@ void lcl_ScDocShell_GetFixedWidthString( rtl::OUString& rStr, const ScDocument& void lcl_ScDocShell_WriteEmptyFixedWidthString( SvStream& rStream, const ScDocument& rDoc, SCTAB nTab, SCCOL nCol ) { - rtl::OUString aString; + OUString aString; lcl_ScDocShell_GetFixedWidthString( aString, rDoc, nTab, nCol, false, SVX_HOR_JUSTIFY_STANDARD ); rStream.WriteUnicodeOrByteText( aString ); @@ -1766,10 +1766,10 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt CharSet eOldCharSet = rStream.GetStreamCharSet(); rStream.SetStreamCharSet( eCharSet ); sal_uInt16 nOldNumberFormatInt = rStream.GetNumberFormatInt(); - rtl::OString aStrDelimEncoded; // only used if not Unicode - rtl::OUString aStrDelimDecoded; // only used if context encoding - rtl::OString aDelimEncoded; - rtl::OUString aDelimDecoded; + OString aStrDelimEncoded; // only used if not Unicode + OUString aStrDelimDecoded; // only used if context encoding + OString aDelimEncoded; + OUString aDelimDecoded; bool bContextOrNotAsciiEncoding; if ( eCharSet == RTL_TEXTENCODING_UNICODE ) { @@ -1778,8 +1778,8 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt } else { - aStrDelimEncoded = rtl::OString(&cStrDelim, 1, eCharSet); - aDelimEncoded = rtl::OString(&cDelim, 1, eCharSet); + aStrDelimEncoded = OString(&cStrDelim, 1, eCharSet); + aDelimEncoded = OString(&cDelim, 1, eCharSet); rtl_TextEncodingInfo aInfo; aInfo.StructSize = sizeof(aInfo); if ( rtl_getTextEncodingInfo( eCharSet, &aInfo ) ) @@ -1789,8 +1789,8 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt ((aInfo.Flags & RTL_TEXTENCODING_INFO_ASCII) == 0)); if ( bContextOrNotAsciiEncoding ) { - aStrDelimDecoded = rtl::OStringToOUString(aStrDelimEncoded, eCharSet); - aDelimDecoded = rtl::OStringToOUString(aDelimEncoded, eCharSet); + aStrDelimDecoded = OStringToOUString(aStrDelimEncoded, eCharSet); + aDelimDecoded = OStringToOUString(aDelimEncoded, eCharSet); } } else @@ -1806,7 +1806,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt ScProgress aProgress( this, ScGlobal::GetRscString( STR_SAVE_DOC ), nEndRow ); - rtl::OUString aString; + OUString aString; bool bTabProtect = aDocument.IsTabProtected( nTab ); @@ -1896,7 +1896,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt { case CELLTYPE_NOTE: case CELLTYPE_NONE: - aString = rtl::OUString(); + aString = OUString(); bString = false; break; case CELLTYPE_FORMULA : @@ -1980,7 +1980,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt break; default: OSL_FAIL( "ScDocShell::AsciiSave: unknown CellType" ); - aString = rtl::OUString(); + aString = OUString(); bString = false; } @@ -1995,7 +1995,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt } else { - rtl::OUString aUniString = aString;//remove that later + OUString aUniString = aString;//remove that later if (!bString && cStrDelim != 0 && !aUniString.isEmpty()) { sal_Unicode c = aUniString[0]; @@ -2015,8 +2015,8 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt sal_Int32 nPos = getTextSepPos( aUniString, rAsciiOpt, cStrDelim, cDelim, bNeedQuotes); - escapeTextSep( - nPos, rtl::OUString(cStrDelim), aUniString); + escapeTextSep( + nPos, OUString(cStrDelim), aUniString); if ( bNeedQuotes ) rStream.WriteUniOrByteChar( cStrDelim, eCharSet ); @@ -2043,16 +2043,16 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt if ( bContextOrNotAsciiEncoding ) { // to byte encoding - rtl::OString aStrEnc = rtl::OUStringToOString(aUniString, eCharSet); + OString aStrEnc = OUStringToOString(aUniString, eCharSet); // back to Unicode - rtl::OUString aStrDec = rtl::OStringToOUString(aStrEnc, eCharSet); + OUString aStrDec = OStringToOUString(aStrEnc, eCharSet); // search on re-decoded string bool bNeedQuotes = false; sal_Int32 nPos = getTextSepPos( aStrDec, rAsciiOpt, aStrDelimDecoded, aDelimDecoded, bNeedQuotes); - escapeTextSep( + escapeTextSep( nPos, aStrDelimDecoded, aStrDec); // write byte re-encoded @@ -2064,14 +2064,14 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt } else { - rtl::OString aStrEnc = rtl::OUStringToOString(aUniString, eCharSet); + OString aStrEnc = OUStringToOString(aUniString, eCharSet); // search on encoded string bool bNeedQuotes = false; sal_Int32 nPos = getTextSepPos( aStrEnc, rAsciiOpt, aStrDelimEncoded, aDelimEncoded, bNeedQuotes); - escapeTextSep( + escapeTextSep( nPos, aStrDelimEncoded, aStrEnc); // write byte encoded @@ -2205,7 +2205,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) FltError eError = ScFormatFilter::Get().ScExportExcel5( rMed, &aDocument, eFormat, RTL_TEXTENCODING_MS_1252 ); if( eError && !GetError() ) - SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // don't return false for warnings bRet = ((eError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK) || (eError == eERR_OK); @@ -2213,7 +2213,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) else { // export aborted, i.e. "Save without password" warning - SetError( ERRCODE_ABORT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( ERRCODE_ABORT, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } else if (aFltName.EqualsAscii(pFilterAscii)) @@ -2246,7 +2246,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (aDocument.GetTableCount() > 1) if (!rMed.GetError()) - rMed.SetError(SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } } else if (aFltName.EqualsAscii(pFilterDBase)) @@ -2283,11 +2283,11 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) INetURLObject aTmpFile( rMed.GetPhysicalName(), INET_PROT_FILE ); if ( bHasMemo ) - aTmpFile.setExtension(rtl::OUString("dbt")); + aTmpFile.setExtension(OUString("dbt")); if ( eError != eERR_OK ) { if (!GetError()) - SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError(eError, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if ( bHasMemo && IsDocument( aTmpFile ) ) KillFile( aTmpFile ); } @@ -2299,7 +2299,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SfxStringItem* pNameItem = (SfxStringItem*) rMed.GetItemSet()->GetItem( SID_FILE_NAME ); INetURLObject aDbtFile( pNameItem->GetValue(), INET_PROT_FILE ); - aDbtFile.setExtension(rtl::OUString("dbt")); + aDbtFile.setExtension(OUString("dbt")); if ( IsDocument( aDbtFile ) && !KillFile( aDbtFile ) ) bRet = false; if ( bRet && !MoveFile( aTmpFile, aDbtFile ) ) @@ -2308,7 +2308,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) { KillFile( aTmpFile ); if ( !GetError() ) - SetError( SCERR_EXPORT_DATA, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( SCERR_EXPORT_DATA, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } } @@ -2342,7 +2342,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (aDocument.GetTableCount() > 1) if (!rMed.GetError()) - rMed.SetError(SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + rMed.SetError(SCWARN_EXPORT_ASCII, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); } } else if (aFltName.EqualsAscii(pFilterSylk)) @@ -2375,13 +2375,13 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SetError( *new StringErrorInfo( SCWARN_EXPORT_NONCONVERTIBLE_CHARS, aImExport.GetNonConvertibleChars(), - ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + ERRCODE_BUTTON_OK | ERRCODE_MSG_INFO ), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } } else { if (GetError()) - SetError(SCERR_IMPORT_NI, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError(SCERR_IMPORT_NI, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } return bRet; } @@ -2511,37 +2511,37 @@ void ScDocShell::PrepareReload() String ScDocShell::GetOwnFilterName() { - return rtl::OUString(pFilterSc50); + return OUString(pFilterSc50); } String ScDocShell::GetHtmlFilterName() { - return rtl::OUString(pFilterHtml); + return OUString(pFilterHtml); } String ScDocShell::GetWebQueryFilterName() { - return rtl::OUString(pFilterHtmlWebQ); + return OUString(pFilterHtmlWebQ); } String ScDocShell::GetAsciiFilterName() { - return rtl::OUString(pFilterAscii); + return OUString(pFilterAscii); } String ScDocShell::GetLotusFilterName() { - return rtl::OUString(pFilterLotus); + return OUString(pFilterLotus); } String ScDocShell::GetDBaseFilterName() { - return rtl::OUString(pFilterDBase); + return OUString(pFilterDBase); } String ScDocShell::GetDifFilterName() { - return rtl::OUString(pFilterDif); + return OUString(pFilterDif); } sal_Bool ScDocShell::HasAutomaticTableName( const String& rFilter ) @@ -2578,7 +2578,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : SfxObjectShell( rShell.GetCreateMode() ), SfxListener(), aDocument ( SCDOCMODE_DOCUMENT, this ), - aDdeTextFmt(rtl::OUString("TEXT")), + aDdeTextFmt(OUString("TEXT")), nPrtToScreenFactor( 1.0 ), pImpl ( new DocShell_Impl ), bHeaderOn ( true ), @@ -2627,7 +2627,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : SfxObjectShell( i_nSfxCreationFlags ), aDocument ( SCDOCMODE_DOCUMENT, this ), - aDdeTextFmt(rtl::OUString("TEXT")), + aDdeTextFmt(OUString("TEXT")), nPrtToScreenFactor( 1.0 ), pImpl ( new DocShell_Impl ), bHeaderOn ( true ), diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 361de67402fa..d64966bc9299 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -362,7 +362,7 @@ void ScDocShell::CalcOutputFactor() return; } - rtl::OUString aTestString( + OUString aTestString( "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890123456789"); long nPrinterWidth = 0; long nWindowWidth = 0; @@ -766,9 +766,9 @@ static bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScD pAction->GetDateTimeUTC() == pA->GetDateTimeUTC() ) && pAction->GetBigRange() == pA->GetBigRange() ) { - rtl::OUString aActionDesc; + OUString aActionDesc; pAction->GetDescription(aActionDesc, pDoc, true); - rtl::OUString aADesc; + OUString aADesc; pA->GetDescription(aADesc, pSearchDoc, true); if (aActionDesc.equals(aADesc)) { @@ -847,7 +847,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck return; //! nichts zu tun - Fehlermeldung? // ab hier kein return mehr - ScProgress aProgress( this, rtl::OUString("..."), + ScProgress aProgress( this, OUString("..."), nNewActionCount ); sal_uLong nLastMergeAction = pSourceTrack->GetLast()->GetActionNumber(); @@ -938,10 +938,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck //! ??? Loesch-Aktion rueckgaengig machen ??? //! ??? Aktion irgendwo anders speichern ??? #if OSL_DEBUG_LEVEL > 0 - rtl::OUString aValue; + OUString aValue; if ( eSourceType == SC_CAT_CONTENT ) ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue ); - rtl::OStringBuffer aError(rtl::OUStringToOString(aValue, + OStringBuffer aError(OUStringToOString(aValue, osl_getThreadTextEncoding())); aError.append(RTL_CONSTASCII_STRINGPARAM(" weggelassen")); OSL_FAIL( aError.getStr() ); @@ -1004,7 +1004,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck OSL_ENSURE( aSourceRange.aStart == aSourceRange.aEnd, "huch?" ); ScAddress aPos = aSourceRange.aStart; - rtl::OUString aValue; + OUString aValue; ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue ); sal_uInt8 eMatrix = MM_NONE; const ScCellValue& rCell = ((const ScChangeActionContent*)pSourceAction)->GetNewCell(); @@ -1041,7 +1041,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck break; case SC_CAT_INSERT_TABS : { - rtl::OUString aName; + OUString aName; aDocument.CreateValidTabName( aName ); GetDocFunc().InsertTable( aSourceRange.aStart.Tab(), aName, sal_True, false ); } @@ -1208,7 +1208,7 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell ) ScDocument* pTmpDoc = new ScDocument; for ( sal_Int32 nIndex = 0; nIndex < aDocument.GetTableCount(); ++nIndex ) { - rtl::OUString sTabName; + OUString sTabName; pTmpDoc->CreateValidTabName( sTabName ); pTmpDoc->InsertTab( SC_TAB_APPEND, sTabName ); } @@ -1253,7 +1253,7 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell ) pTmpDoc = new ScDocument; for ( sal_Int32 nIndex = 0; nIndex < aDocument.GetTableCount(); ++nIndex ) { - rtl::OUString sTabName; + OUString sTabName; pTmpDoc->CreateValidTabName( sTabName ); pTmpDoc->InsertTab( SC_TAB_APPEND, sTabName ); } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 70c911d10352..663a6b7a5d9e 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -663,16 +663,16 @@ void ScDocShell::Execute( SfxRequest& rReq ) pReqArgs->GetItemState( SID_FILE_NAME, sal_True, &pItem ) == SFX_ITEM_SET && pItem->ISA(SfxStringItem) ) { - rtl::OUString aFileName = + OUString aFileName = static_cast(pItem)->GetValue(); - rtl::OUString aFilterName; + OUString aFilterName; if ( pReqArgs->GetItemState( SID_FILTER_NAME, sal_True, &pItem ) == SFX_ITEM_SET && pItem->ISA(SfxStringItem) ) { aFilterName = static_cast(pItem)->GetValue(); } - rtl::OUString aOptions; + OUString aOptions; if ( pReqArgs->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) == SFX_ITEM_SET && pItem->ISA(SfxStringItem) ) { @@ -709,7 +709,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) pImpl->pRequest = new SfxRequest( rReq ); delete pImpl->pDocInserter; pImpl->pDocInserter = new ::sfx2::DocumentInserter( - rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ), 0 ); + OUString::createFromAscii( ScDocShell::Factory().GetShortName() ), 0 ); pImpl->pDocInserter->StartExecuteModal( LINK( this, ScDocShell, DialogClosedHdl ) ); return ; } @@ -831,13 +831,13 @@ void ScDocShell::Execute( SfxRequest& rReq ) { if ( pItem->ISA(SfxStringItem) ) { - rtl::OUString aName = ((const SfxStringItem*)pItem)->GetValue(); + OUString aName = ((const SfxStringItem*)pItem)->GetValue(); SCTAB nTab; if (aDocument.GetTable( aName, nTab )) { if (aDocument.IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; aDocument.GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -994,7 +994,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) try { ::svt::DocumentLockFile aLockFile( GetSharedFileURL() ); - uno::Sequence< ::rtl::OUString > aData = aLockFile.GetLockData(); + uno::Sequence< OUString > aData = aLockFile.GetLockData(); if ( aData.getLength() > LOCKFILE_SYSUSERNAME_ID ) { if ( !aData[LOCKFILE_OOOUSERNAME_ID].isEmpty() ) @@ -1080,8 +1080,8 @@ void ScDocShell::Execute( SfxRequest& rReq ) #endif case SID_OPEN_CALC: { - SfxStringItem aApp(SID_DOC_SERVICE, rtl::OUString("com.sun.star.sheet.SpreadsheetDocument")); - SfxStringItem aTarget(SID_TARGETNAME, rtl::OUString("_blank")); + SfxStringItem aApp(SID_DOC_SERVICE, OUString("com.sun.star.sheet.SpreadsheetDocument")); + SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank")); GetViewData()->GetDispatcher().Execute( SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aApp, &aTarget, 0L); } @@ -1299,8 +1299,8 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) { ScDocShellModificator aModificator( *this ); - rtl::OUString aNewName = pStyle->GetName(); - rtl::OUString aOldName = aNewName; + OUString aNewName = pStyle->GetName(); + OUString aOldName = aNewName; sal_Bool bExtended = rHint.ISA(SfxStyleSheetHintExtended); // Name geaendert? if (bExtended) aOldName = ((SfxStyleSheetHintExtended&)rHint).GetOldName(); @@ -1337,8 +1337,8 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) { if ( nId == SFX_STYLESHEET_MODIFIED) { - rtl::OUString aNewName = pStyle->GetName(); - rtl::OUString aOldName = aNewName; + OUString aNewName = pStyle->GetName(); + OUString aOldName = aNewName; sal_Bool bExtended = rHint.ISA(SfxStyleSheetHintExtended); if (bExtended) aOldName = ((SfxStyleSheetHintExtended&)rHint).GetOldName(); @@ -1472,7 +1472,7 @@ bool ScDocShell::AdjustPrintZoom( const ScRange& rRange ) return bChange; } -void ScDocShell::PageStyleModified( const rtl::OUString& rStyleName, sal_Bool bApi ) +void ScDocShell::PageStyleModified( const OUString& rStyleName, sal_Bool bApi ) { ScDocShellModificator aModificator( *this ); @@ -2072,7 +2072,7 @@ long ScDocShell::DdeGetData( const String& rItem, { if( rItem.EqualsIgnoreCaseAscii( "Format" ) ) { - rtl::OString aFmtByte(rtl::OUStringToOString(aDdeTextFmt, + OString aFmtByte(OUStringToOString(aDdeTextFmt, osl_getThreadTextEncoding())); rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >( (const sal_Int8*)aFmtByte.getStr(), @@ -2088,7 +2088,7 @@ long ScDocShell::DdeGetData( const String& rItem, if( aDdeTextFmt.EqualsAscii( "SYLK" ) || aDdeTextFmt.EqualsAscii( "FSYLK" ) ) { - rtl::OString aData; + OString aData; if( aObj.ExportByteString( aData, osl_getThreadTextEncoding(), SOT_FORMATSTR_ID_SYLK ) ) { @@ -2345,7 +2345,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() SC_MOD()->SetInSharedDocLoading( true ); uno::Reference< frame::XDesktop2 > xLoader = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Sequence < beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "Hidden" ); + aArgs[0].Name = OUString( "Hidden" ); aArgs[0].Value <<= sal_True; if ( GetMedium() ) @@ -2360,7 +2360,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() } xModel.set( - xLoader->loadComponentFromURL( GetSharedFileURL(), ::rtl::OUString( "_blank" ), 0, aArgs ), + xLoader->loadComponentFromURL( GetSharedFileURL(), OUString( "_blank" ), 0, aArgs ), uno::UNO_QUERY_THROW ); SC_MOD()->SetInSharedDocLoading( false ); } diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index ea2de10698be..e40ae12de3c1 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -49,7 +49,7 @@ #include "clipparam.hxx" // defined in docfunc.cxx -void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModuleName, const rtl::OUString& sModuleSource ); +void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName, const OUString& sModuleSource ); using com::sun::star::script::XLibraryContainer; using com::sun::star::script::vba::XVBACompatibility; @@ -277,7 +277,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe } else { - aNewName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); + aNewName = OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)); pNoNameData = new ScDBData(aNewName , nTab, nStartCol,nStartRow, nEndCol,nEndRow, sal_True, bHasHeader ); @@ -448,9 +448,9 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource ) } } -static rtl::OUString lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea ) +static OUString lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea ) { - rtl::OUString aName; + OUString aName; sal_Bool bOk = false; ScDBData* pData = pDoc->GetDBAtArea( pArea->nTab, pArea->nColStart, pArea->nRowStart, pArea->nColEnd, pArea->nRowEnd ); @@ -630,7 +630,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord SCTAB nTabCount = aDocument.GetTableCount(); SCTAB nSrcTab = SCTAB_MAX; SCTAB nEndTab = nTab; - rtl::OUString aCompare; + OUString aCompare; while ( nEndTab+1 < nTabCount && aDocument.IsScenario(nEndTab+1) ) { ++nEndTab; @@ -666,7 +666,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord for (SCTAB i=nTab+1; i<=nEndTab; i++) { pUndoDoc->SetScenario( i, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; aDocument.GetScenarioData( i, aComment, aColor, nScenFlags ); @@ -718,9 +718,9 @@ void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String& const Color& rColor, sal_uInt16 nFlags ) { // Undo - rtl::OUString aOldName; + OUString aOldName; aDocument.GetName( nTab, aOldName ); - rtl::OUString aOldComment; + OUString aOldComment; Color aOldColor; sal_uInt16 nOldFlags; aDocument.GetScenarioData( nTab, aOldComment, aOldColor, nOldFlags ); @@ -832,7 +832,7 @@ sal_uLong ScDocShell::TransferTab( ScDocShell& rSrcDocShell, SCTAB nSrcPos, if(nErrVal>0 && pSrcDoc->IsScenario( nSrcPos )) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; @@ -872,7 +872,7 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s if (bRecord) aDocument.BeginDrawUndo(); // drawing layer must do its own undo actions - rtl::OUString sSrcCodeName; + OUString sSrcCodeName; aDocument.GetCodeName( nSrcTab, sSrcCodeName ); if (!aDocument.CopyTab( nSrcTab, nDestTab )) { @@ -913,8 +913,8 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s SCTAB nTabToUse = nDestTab; if ( nDestTab == SC_TAB_APPEND ) nTabToUse = aDocument.GetMaxTableNumber() - 1; - rtl::OUString sCodeName; - rtl::OUString sSource; + OUString sCodeName; + OUString sSource; try { Reference< XNameContainer > xLib; diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 6cd076c56b83..6c158ca0bcb3 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -52,7 +52,6 @@ using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::rtl::OUString; namespace { @@ -364,7 +363,7 @@ void ScDocShell::ReconnectDdeLink(SfxObjectShell& rServer) void ScDocShell::UpdateLinks() { - typedef boost::unordered_set StrSetType; + typedef boost::unordered_set StrSetType; sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager(); StrSetType aNames; @@ -397,9 +396,9 @@ void ScDocShell::UpdateLinks() if (!aDocument.IsLinked(i)) continue; - rtl::OUString aDocName = aDocument.GetLinkDoc(i); - rtl::OUString aFltName = aDocument.GetLinkFlt(i); - rtl::OUString aOptions = aDocument.GetLinkOpt(i); + OUString aDocName = aDocument.GetLinkDoc(i); + OUString aFltName = aDocument.GetLinkFlt(i); + OUString aOptions = aDocument.GetLinkOpt(i); sal_uLong nRefresh = aDocument.GetLinkRefreshDelay(i); bool bThere = false; for (SCTAB j = 0; j < i && !bThere; ++j) // im Dokument mehrfach? diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index cd9871d0b328..58ac3640122b 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -119,7 +119,7 @@ namespace // get connection - String aConnUrl = rtl::OUString("sdbc:dbase:"); + String aConnUrl = OUString("sdbc:dbase:"); aConnUrl += aPath; svxform::ODataAccessCharsetHelper aHelper; @@ -131,19 +131,19 @@ namespace OSL_FAIL( "DBaseImport: dbtools::OCharsetMap doesn't know text encoding" ); return SCERR_IMPORT_CONNECT; } // if ( aIter == aMap.end() ) - rtl::OUString aCharSetStr; + OUString aCharSetStr; if ( RTL_TEXTENCODING_DONTKNOW != *aIter ) { // it's not the virtual "system charset" const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( *aIter ); OSL_ENSURE( pIanaName, "invalid mime name!" ); if ( pIanaName ) - aCharSetStr = ::rtl::OUString::createFromAscii( pIanaName ); + aCharSetStr = OUString::createFromAscii( pIanaName ); } uno::Sequence aProps(2); - aProps[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_EXTENSION)); - aProps[0].Value <<= rtl::OUString( aExtension ); - aProps[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_CHARSET)); + aProps[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_EXTENSION)); + aProps[0].Value <<= OUString( aExtension ); + aProps[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_CHARSET)); aProps[1].Value <<= aCharSetStr; _rConnection = _rDrvMgr->getConnectionWithInfo( aConnUrl, aProps ); @@ -176,7 +176,7 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); - rtl::OUString aTransferName = rtl::OUString( "transfer" ); + OUString aTransferName = OUString( "transfer" ); if ( xInfo->hasCommandByName( aTransferName ) ) { aDestPath.executeCommand( aTransferName, uno::makeAny( @@ -209,7 +209,7 @@ bool ScDocShell::KillFile( const INetURLObject& rURL ) ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( rtl::OUString( "delete" ), + aCnt.executeCommand( OUString( "delete" ), comphelper::makeBoolAny( sal_True ) ); } catch( uno::Exception& ) @@ -325,7 +325,7 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet ScProgress aProgress( this, ScGlobal::GetRscString( STR_LOAD_DOC ), 0 ); uno::Reference xFactory = comphelper::getProcessServiceFactory(); uno::Reference xRowSet( xFactory->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), uno::UNO_QUERY); ::utl::DisposableComponent aRowSetHelper(xRowSet); uno::Reference xRowProp( xRowSet, uno::UNO_QUERY ); @@ -337,19 +337,19 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet aAny <<= xConnection; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); aAny <<= nType; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); - aAny <<= rtl::OUString( aTabName ); + aAny <<= OUString( aTabName ); xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); aAny <<= false; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PROPCHANGE_NOTIFY)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PROPCHANGE_NOTIFY)), aAny ); xRowSet->execute(); @@ -493,7 +493,7 @@ inline bool IsAsciiAlpha( sal_Unicode c ) void lcl_GetColumnTypes( ScDocShell& rDocShell, const ScRange& rDataRange, bool bHasFieldNames, - rtl::OUString* pColNames, sal_Int32* pColTypes, sal_Int32* pColLengths, + OUString* pColNames, sal_Int32* pColTypes, sal_Int32* pColLengths, sal_Int32* pColScales, bool& bHasMemo, CharSet eCharSet ) { // updating of column titles didn't work in 5.2 and isn't always wanted @@ -510,7 +510,7 @@ void lcl_GetColumnTypes( SCCOL nLastCol = rDataRange.aEnd.Col(); SCROW nLastRow = rDataRange.aEnd.Row(); - typedef boost::unordered_set StrSetType; + typedef boost::unordered_set StrSetType; StrSetType aFieldNames; long nField = 0; @@ -784,7 +784,7 @@ inline void lcl_getLongVarCharString( #endif // !DISABLE_DBCONNECTIVITY -sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo ) +sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo ) { #ifdef DISABLE_DBCONNECTIVITY (void) rFullFileName; @@ -821,7 +821,7 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e } long nColCount = nLastCol - nFirstCol + 1; - uno::Sequence aColNames( nColCount ); + uno::Sequence aColNames( nColCount ); uno::Sequence aColTypes( nColCount ); uno::Sequence aColLengths( nColCount ); uno::Sequence aColScales( nColCount ); @@ -834,7 +834,7 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e // also needed for exception catch SCROW nDocRow = 0; ScFieldEditEngine aEditEngine(&aDocument, aDocument.GetEditPool()); - rtl::OUString aString; + OUString aString; String aTabName; try @@ -873,8 +873,8 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e OSL_ENSURE( xTableDesc.is(), "can't get table descriptor" ); if (!xTableDesc.is()) return SCERR_EXPORT_CONNECT; - aAny <<= rtl::OUString( aTabName ); - xTableDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); + aAny <<= OUString( aTabName ); + xTableDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); // create columns @@ -894,7 +894,7 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e OSL_ENSURE( xColumnsAppend.is(), "can't get columns XAppend" ); if (!xColumnsAppend.is()) return SCERR_EXPORT_CONNECT; - const rtl::OUString* pColNames = aColNames.getConstArray(); + const OUString* pColNames = aColNames.getConstArray(); const sal_Int32* pColTypes = aColTypes.getConstArray(); const sal_Int32* pColLengths = aColLengths.getConstArray(); const sal_Int32* pColScales = aColScales.getConstArray(); @@ -907,16 +907,16 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e if (!xColumnDesc.is()) return SCERR_EXPORT_CONNECT; aAny <<= pColNames[nCol]; - xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); + xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny ); aAny <<= pColTypes[nCol]; - xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_TYPE)), aAny ); + xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_TYPE)), aAny ); aAny <<= pColLengths[nCol]; - xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PRECISION)), aAny ); + xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PRECISION)), aAny ); aAny <<= pColScales[nCol]; - xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_SCALE)), aAny ); + xColumnDesc->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_SCALE)), aAny ); xColumnsAppend->appendByDescriptor( xColumnDesc ); } @@ -926,7 +926,7 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e // get row set for writing uno::Reference xFactory = comphelper::getProcessServiceFactory(); uno::Reference xRowSet( xFactory->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ), uno::UNO_QUERY); ::utl::DisposableComponent aRowSetHelper(xRowSet); uno::Reference xRowProp( xRowSet, uno::UNO_QUERY ); @@ -935,15 +935,15 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e aAny <<= xConnection; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny ); aAny <<= (sal_Int32) sdb::CommandType::TABLE; xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny ); - aAny <<= rtl::OUString( aTabName ); + aAny <<= OUString( aTabName ); xRowProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); + OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny ); xRowSet->execute(); @@ -1116,8 +1116,8 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e sal_Int32 nLen; if (bIsOctetTextEncoding) { - rtl::OUString aOUString( aString); - rtl::OString aOString; + OUString aOUString( aString); + OString aOString; if (!aOUString.convertToString( &aOString, eCharSet, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 2134e119793d..b6f847b15237 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -59,7 +59,6 @@ using ::std::auto_ptr; using ::com::sun::star::uno::Any; -using ::rtl::OUString; using ::std::vector; using ::std::find; using ::std::find_if; @@ -1216,7 +1215,7 @@ void ScExternalRefLink::Closed() if (!mbDoRefresh) return SUCCESS; - rtl::OUString aFile, aFilter; + OUString aFile, aFilter; mpDoc->GetLinkManager()->GetDisplayNames(this, NULL, &aFile, NULL, &aFilter); ScExternalRefManager* pMgr = mpDoc->GetExternalRefManager(); @@ -2200,7 +2199,7 @@ bool ScExternalRefManager::isFileLoadable(const OUString& rFile) const if (isOwnDocument(rFile)) return false; - rtl::OUString aPhysical; + OUString aPhysical; if (utl::LocalFileHelper::ConvertURLToPhysicalName(rFile, aPhysical) && !aPhysical.isEmpty()) { // #i114504# try IsFolder/Exists only for file URLs @@ -2301,7 +2300,7 @@ void ScExternalRefManager::convertToAbsName(OUString& rFile) const ScDocShell* pShell = static_cast(SfxObjectShell::GetFirst(&aType, false)); while (pShell) { - if (rFile == rtl::OUString(pShell->GetName())) + if (rFile == OUString(pShell->GetName())) return; pShell = static_cast(SfxObjectShell::GetNext(*pShell, &aType, false)); @@ -2634,8 +2633,8 @@ void ScExternalRefManager::transformUnsavedRefToSavedRef( SfxObjectShell* pShell if (&(itr->second.maShell) == pShell) { // found that the shell is marked as unsaved - rtl::OUString aFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI); - switchSrcFile(itr->first, aFileURL, rtl::OUString()); + OUString aFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI); + switchSrcFile(itr->first, aFileURL, OUString()); EndListening(*pShell); maUnsavedDocShells.erase(itr++); } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 20e981f5b1f9..7e734d3e3bf6 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -289,7 +289,7 @@ bool ScImportExport::ExportData( const String& rMimeType, } -bool ScImportExport::ImportString( const ::rtl::OUString& rText, sal_uLong nFmt ) +bool ScImportExport::ImportString( const OUString& rText, sal_uLong nFmt ) { switch ( nFmt ) { @@ -304,7 +304,7 @@ bool ScImportExport::ImportString( const ::rtl::OUString& rText, sal_uLong nFmt default: { rtl_TextEncoding eEnc = osl_getThreadTextEncoding(); - ::rtl::OString aTmp( rText.getStr(), rText.getLength(), eEnc ); + OString aTmp( rText.getStr(), rText.getLength(), eEnc ); SvMemoryStream aStrm( (void*)aTmp.getStr(), aTmp.getLength() * sizeof(sal_Char), STREAM_READ ); aStrm.SetStreamCharSet( eEnc ); SetNoEndianSwap( aStrm ); //! no swapping in memory @@ -314,15 +314,15 @@ bool ScImportExport::ImportString( const ::rtl::OUString& rText, sal_uLong nFmt } -bool ScImportExport::ExportString( ::rtl::OUString& rText, sal_uLong nFmt ) +bool ScImportExport::ExportString( OUString& rText, sal_uLong nFmt ) { OSL_ENSURE( nFmt == FORMAT_STRING, "ScImportExport::ExportString: Unicode not supported for other formats than FORMAT_STRING" ); if ( nFmt != FORMAT_STRING ) { rtl_TextEncoding eEnc = osl_getThreadTextEncoding(); - rtl::OString aTmp; + OString aTmp; bool bOk = ExportByteString( aTmp, eEnc, nFmt ); - rText = rtl::OStringToOUString( aTmp, eEnc ); + rText = OStringToOUString( aTmp, eEnc ); return bOk; } // nSizeLimit not needed for OUString @@ -336,17 +336,17 @@ bool ScImportExport::ExportString( ::rtl::OUString& rText, sal_uLong nFmt ) aStrm << (sal_Unicode) 0; aStrm.Seek( STREAM_SEEK_TO_END ); - rText = rtl::OUString( (const sal_Unicode*) aStrm.GetData() ); + rText = OUString( (const sal_Unicode*) aStrm.GetData() ); return true; } - rText = rtl::OUString(); + rText = OUString(); return false; // ExportStream must handle RTL_TEXTENCODING_UNICODE } -bool ScImportExport::ExportByteString( rtl::OString& rText, rtl_TextEncoding eEnc, sal_uLong nFmt ) +bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sal_uLong nFmt ) { OSL_ENSURE( eEnc != RTL_TEXTENCODING_UNICODE, "ScImportExport::ExportByteString: Unicode not supported" ); if ( eEnc == RTL_TEXTENCODING_UNICODE ) @@ -370,7 +370,7 @@ bool ScImportExport::ExportByteString( rtl::OString& rText, rtl_TextEncoding eEn return true; } } - rText = rtl::OString(); + rText = OString(); return false; } @@ -463,7 +463,7 @@ bool ScImportExport::ExportStream( SvStream& rStrm, const String& rBaseURL, sal_ // extra bits are used to tell the client to prefer external // reference link. - ::rtl::OUString aExtraBits("calc:extref"); + OUString aExtraBits("calc:extref"); WriteUnicodeOrByteString( rStrm, aAppName, true ); WriteUnicodeOrByteString( rStrm, aDocName, true ); @@ -512,7 +512,7 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rS } else { - rtl::OString aByteStr(rtl::OUStringToOString(rString, eEnc)); + OString aByteStr(OUStringToOString(rString, eEnc)); rStrm << aByteStr.getStr(); if ( bZero ) rStrm << sal_Char(0); @@ -723,11 +723,11 @@ static void lcl_UnescapeSylk( String & rString, SylkVersion eVersion ) // Older versions quoted the string and doubled embedded quotes, but not // the semicolons, which was plain wrong. if (eVersion >= SYLK_OOO32) - rString.SearchAndReplaceAll( rtl::OUString(DOUBLE_SEMICOLON), rtl::OUString(';') ); + rString.SearchAndReplaceAll( OUString(DOUBLE_SEMICOLON), OUString(';') ); else - rString.SearchAndReplaceAll( rtl::OUString(DOUBLE_DOUBLEQUOTE), rtl::OUString('"') ); + rString.SearchAndReplaceAll( OUString(DOUBLE_DOUBLEQUOTE), OUString('"') ); - rString.SearchAndReplaceAll( rtl::OUString(SYLK_LF), rtl::OUString(_LF) ); + rString.SearchAndReplaceAll( OUString(SYLK_LF), OUString(_LF) ); } static const sal_Unicode* lcl_ScanSylkString( const sal_Unicode* p, @@ -888,7 +888,7 @@ bool ScImportExport::Text2Doc( SvStream& rStrm ) while( bOk ) { - rtl::OUString aLine; + OUString aLine; String aCell; SCROW nRow = nStartRow; rStrm.Seek( nOldPos ); @@ -1155,7 +1155,7 @@ static bool lcl_PutString( if (nFound > 6) { sal_Unicode cDec = '.'; - rtl::OUString aT( &cDec, 1); + OUString aT( &cDec, 1); aT += rStr.Copy( nStart[6], nEnd[6]+1-nStart[6]); rtl_math_ConversionStatus eStatus; double fV = rtl::math::stringToDouble( aT, cDec, 0, &eStatus, 0); @@ -1216,7 +1216,7 @@ static bool lcl_PutString( } -static String lcl_GetFixed( const rtl::OUString& rLine, sal_Int32 nStart, sal_Int32 nNext, +static String lcl_GetFixed( const OUString& rLine, sal_Int32 nStart, sal_Int32 nNext, bool& rbIsQuoted, bool& rbOverflowCell ) { sal_Int32 nLen = rLine.getLength(); @@ -1307,7 +1307,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) LanguageTag( LANGUAGE_ENGLISH_US ).getLocale() ); } - rtl::OUString aLine; + OUString aLine; String aCell; sal_uInt16 i; SCROW nRow = nStartRow; @@ -1677,7 +1677,7 @@ bool ScImportExport::Doc2Text( SvStream& rStrm ) } } if( nCol < nEndCol ) - lcl_WriteSimpleString( rStrm, rtl::OUString(cSep) ); + lcl_WriteSimpleString( rStrm, OUString(cSep) ); } WriteUnicodeOrByteEndl( rStrm ); if( rStrm.GetError() != SVSTREAM_OK ) @@ -1716,7 +1716,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { String aLine; String aText; - rtl::OString aByteLine; + OString aByteLine; SCCOL nCol = nStartCol; SCROW nRow = nStartRow; SCCOL nRefCol = 1; @@ -1726,7 +1726,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { //! allow unicode rStrm.ReadLine( aByteLine ); - aLine = rtl::OStringToOUString(aByteLine, rStrm.GetStreamCharSet()); + aLine = OStringToOUString(aByteLine, rStrm.GetStreamCharSet()); if( rStrm.IsEof() ) break; const sal_Unicode* p = aLine.GetBuffer(); @@ -1742,16 +1742,16 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) switch( ch ) { case 'X': - nCol = static_cast(rtl::OUString(p).toInt32()) + nStartCol - 1; + nCol = static_cast(OUString(p).toInt32()) + nStartCol - 1; break; case 'Y': - nRow = rtl::OUString(p).toInt32() + nStartRow - 1; + nRow = OUString(p).toInt32() + nStartRow - 1; break; case 'C': - nRefCol = static_cast(rtl::OUString(p).toInt32()) + nStartCol - 1; + nRefCol = static_cast(OUString(p).toInt32()) + nStartCol - 1; break; case 'R': - nRefRow = rtl::OUString(p).toInt32() + nStartRow - 1; + nRefRow = OUString(p).toInt32() + nStartRow - 1; break; case 'K': { @@ -1862,10 +1862,10 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) switch( ch ) { case 'X': - nCol = static_cast(rtl::OUString(p).toInt32()) + nStartCol - 1; + nCol = static_cast(OUString(p).toInt32()) + nStartCol - 1; break; case 'Y': - nRow = rtl::OUString(p).toInt32() + nStartRow - 1; + nRow = OUString(p).toInt32() + nStartRow - 1; break; case 'P' : if ( bData ) @@ -1876,7 +1876,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) const sal_Unicode* p0 = p; while( *p && *p != ';' ) p++; - rtl::OUString aNumber(p0, p - p0); + OUString aNumber(p0, p - p0); nFormat = aNumber.toInt32(); } break; @@ -1904,11 +1904,11 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { if ( bData && *p == ';' && *(p+1) == 'P' ) { - rtl::OUString aCode( p+2 ); + OUString aCode( p+2 ); // unescape doubled semicolons aCode = aCode.replaceAll(";;", ";"); // get rid of Xcl escape characters - aCode = aCode.replaceAll(rtl::OUString(static_cast(0x1b)), rtl::OUString()); + aCode = aCode.replaceAll(OUString(static_cast(0x1b)), OUString()); sal_Int32 nCheckPos; short nType; sal_uInt32 nKey; @@ -2003,7 +2003,7 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) case CELLTYPE_EDIT: hasstring: aCellStr = pDoc->GetString(nCol, nRow, aRange.aStart.Tab()); - aCellStr.SearchAndReplaceAll( rtl::OUString(_LF), rtl::OUString(SYLK_LF) ); + aCellStr.SearchAndReplaceAll( OUString(_LF), OUString(SYLK_LF) ); aBufStr.AssignAscii(RTL_CONSTASCII_STRINGPARAM( "C;X" )); aBufStr += OUString::number( c ); @@ -2023,7 +2023,7 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) aCellStr.Erase(); break; default: - rtl::OUString aOUCellStr; + OUString aOUCellStr; pFCell->GetFormula( aOUCellStr,formula::FormulaGrammar::GRAM_PODF_A1); aCellStr = aOUCellStr; /* FIXME: do we want GRAM_ODFF_A1 instead? At @@ -2086,7 +2086,7 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) } } } - lcl_WriteSimpleString( rStrm, rtl::OUString( 'E' ) ); + lcl_WriteSimpleString( rStrm, OUString( 'E' ) ); WriteUnicodeOrByteEndl( rStrm ); return rStrm.GetError() == SVSTREAM_OK; } @@ -2271,7 +2271,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get() bLoaded = aModule.load(sFilterLib); if (bLoaded) { - oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString( "ScFilterCreate" ) ); + oslGenericFunction fn = aModule.getFunctionSymbol( OUString( "ScFilterCreate" ) ); if (fn != NULL) plugin = reinterpret_cast(fn)(); } @@ -2298,10 +2298,10 @@ static inline const sal_Unicode* lcl_UnicodeStrChr( const sal_Unicode* pStr, return 0; } -rtl::OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, +OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, const String& rFieldSeparators, sal_Unicode cFieldQuote ) { - rtl::OUString aStr; + OUString aStr; rStream.ReadUniOrByteStringLine(aStr, rStream.GetStreamCharSet(), nArbitraryLineLengthLimit); if (bEmbeddedLineBreak) @@ -2399,9 +2399,9 @@ rtl::OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, else { nLastOffset = aStr.getLength(); - rtl::OUString aNext; + OUString aNext; rStream.ReadUniOrByteStringLine(aNext, rStream.GetStreamCharSet(), nArbitraryLineLengthLimit); - aStr += rtl::OUString( sal_Unicode(_LF)); + aStr += OUString( sal_Unicode(_LF)); aStr += aNext; } } diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 6eaa7d871fde..8c64ee7308a5 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -31,8 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; -using ::rtl::OUStringHash; using ::boost::unordered_map; using ::std::list; using ::std::for_each; @@ -120,9 +118,9 @@ public: virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException){} virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) throw(RuntimeException) { - rtl::OUString sModuleName; + OUString sModuleName; Event.Accessor >>= sModuleName; - OSL_TRACE("VBAProjectListener::elementReplaced(%s)", rtl::OUStringToOString( sModuleName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("VBAProjectListener::elementReplaced(%s)", OUStringToOString( sModuleName, RTL_TEXTENCODING_UTF8 ).getStr() ); mpMacroMgr->InitUserFuncData(); mpMacroMgr->BroadcastModuleUpdate(sModuleName); } diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 39ade2a78f14..e0eb9db0897b 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -173,7 +173,7 @@ sal_Bool ScServerObject::GetData( if( aDdeTextFmt.EqualsAscii( "SYLK" ) || aDdeTextFmt.EqualsAscii( "FSYLK" ) ) { - rtl::OString aByteData; + OString aByteData; if( aObj.ExportByteString( aByteData, osl_getThreadTextEncoding(), SOT_FORMATSTR_ID_SYLK ) ) { rData <<= ::com::sun::star::uno::Sequence< sal_Int8 >( diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 8077cd34795a..14ab87801c8c 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -128,7 +128,7 @@ void ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl ) sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager(); if (pLinkManager!=NULL) { - rtl::OUString aFile, aFilter; + OUString aFile, aFilter; pLinkManager->GetDisplayNames(this, 0, &aFile, NULL, &aFilter); // the file dialog returns the filter name with the application prefix @@ -173,7 +173,7 @@ sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, if (!rNewFile.Len() || !rNewFilter.Len()) return false; - rtl::OUString aNewUrl = ScGlobal::GetAbsDocName(rNewFile, pImpl->m_pDocSh); + OUString aNewUrl = ScGlobal::GetAbsDocName(rNewFile, pImpl->m_pDocSh); bool bNewUrlName = !aFileName.equals(aNewUrl); const SfxFilter* pFilter = pImpl->m_pDocSh->GetFactory().GetFilterContainer()->GetFilter4FilterName(rNewFilter); @@ -187,7 +187,7 @@ sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen if (!aFilterName.equals(rNewFilter)) - aOptions = rtl::OUString(); + aOptions = OUString(); if ( pNewOptions ) // Optionen hart angegeben? aOptions = *pNewOptions; @@ -259,7 +259,7 @@ sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, if ( bNewUrlName && nMode == SC_LINK_VALUE ) { - rtl::OUString aName; + OUString aName; pDoc->GetName( nTab, aName ); if ( ScGlobal::GetpTransliteration()->isEqual( ScGlobal::GetDocTabName( aFileName, aTabName ), aName ) ) @@ -433,7 +433,7 @@ IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink ) // === ScDocumentLoader ================================================== -rtl::OUString ScDocumentLoader::GetOptions( SfxMedium& rMedium ) +OUString ScDocumentLoader::GetOptions( SfxMedium& rMedium ) { SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; @@ -510,9 +510,9 @@ bool ScDocumentLoader::GetFilterName( return bRet; } -void ScDocumentLoader::RemoveAppPrefix( rtl::OUString& rFilterName ) +void ScDocumentLoader::RemoveAppPrefix( OUString& rFilterName ) { - rtl::OUStringBuffer aAppPrefix; + OUStringBuffer aAppPrefix; aAppPrefix.appendAscii(STRING_SCAPP); aAppPrefix.appendAscii(": "); sal_Int32 nPreLen = aAppPrefix.getLength(); @@ -520,8 +520,8 @@ void ScDocumentLoader::RemoveAppPrefix( rtl::OUString& rFilterName ) rFilterName = rFilterName.copy(nPreLen); } -ScDocumentLoader::ScDocumentLoader( const rtl::OUString& rFileName, - rtl::OUString& rFilterName, rtl::OUString& rOptions, +ScDocumentLoader::ScDocumentLoader( const OUString& rFileName, + OUString& rFilterName, OUString& rOptions, sal_uInt32 nRekCnt, bool bWithInteraction ) : pDocShell(0), pMedium(0) @@ -560,7 +560,7 @@ ScDocumentLoader::ScDocumentLoader( const rtl::OUString& rFileName, pDocShell->DoLoad( pMedium ); - rtl::OUString aNew = GetOptions(*pMedium); // Optionen werden beim Laden per Dialog gesetzt + OUString aNew = GetOptions(*pMedium); // Optionen werden beim Laden per Dialog gesetzt if (!aNew.isEmpty() && aNew != rOptions) rOptions = aNew; } @@ -599,7 +599,7 @@ bool ScDocumentLoader::IsError() const return true; } -rtl::OUString ScDocumentLoader::GetTitle() const +OUString ScDocumentLoader::GetTitle() const { if ( pDocShell ) return pDocShell->GetTitle(); diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index b748f81898ac..3e8605c70827 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -197,7 +197,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) case SID_DRAW_HLINK_DELETE: if ( pSingleSelectedObj ) - SetHlinkForObject( pSingleSelectedObj, rtl::OUString() ); + SetHlinkForObject( pSingleSelectedObj, OUString() ); break; case SID_OPEN_HYPERLINK: @@ -296,8 +296,8 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) if ( !pInfo->GetMacro().isEmpty() ) { SvxMacroTableDtor aTab; - rtl::OUString sMacro = pInfo->GetMacro(); - aTab.Insert(SFX_EVENT_MOUSECLICK_OBJECT, SvxMacro(sMacro, rtl::OUString())); + OUString sMacro = pInfo->GetMacro(); + aTab.Insert(SFX_EVENT_MOUSECLICK_OBJECT, SvxMacro(sMacro, OUString())); aItem.SetMacroTable( aTab ); } @@ -321,7 +321,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) const SfxPoolItem* pItem; if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, false, &pItem )) { - rtl::OUString sMacro; + OUString sMacro; const SvxMacro* pMacro = ((SvxMacroItem*)pItem)->GetMacroTable().Get( SFX_EVENT_MOUSECLICK_OBJECT ); if ( pMacro ) sMacro = pMacro->GetMacName(); @@ -444,7 +444,7 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 /* nTabPage * delete( pDlg ); } -void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk ) +void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ) { if ( pObj ) { diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 10edc8317745..b161aeafa9d4 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -63,7 +63,7 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) : pMgr->SetMaxUndoActionCount( 0 ); } SetHelpId( HID_SCSHELL_DRAWSH ); - SetName(rtl::OUString("Drawing")); + SetName(OUString("Drawing")); } ScDrawShell::~ScDrawShell() diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 5d4029de27c6..1bbc09f25f64 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -92,10 +92,10 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropButtonType( "ButtonType" ); - rtl::OUString sPropTargetURL( "TargetURL" ); - rtl::OUString sPropTargetFrame( "TargetFrame" ); - rtl::OUString sPropLabel( "Label" ); + OUString sPropButtonType( "ButtonType" ); + OUString sPropTargetURL( "TargetURL" ); + OUString sPropTargetFrame( "TargetFrame" ); + OUString sPropLabel( "Label" ); if(xInfo->hasPropertyByName( sPropButtonType )) { @@ -103,7 +103,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink form::FormButtonType eTmp; if ( (aAny >>= eTmp) && eTmp == form::FormButtonType_URL ) { - rtl::OUString sTmp; + OUString sTmp; // Label if(xInfo->hasPropertyByName( sPropLabel )) { @@ -179,31 +179,31 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - rtl::OUString sPropTargetURL( "TargetURL" ); + OUString sPropTargetURL( "TargetURL" ); // Darf man eine URL an dem Objekt setzen? if (xInfo->hasPropertyByName( sPropTargetURL )) { // Ja! - rtl::OUString sPropButtonType( "ButtonType"); - rtl::OUString sPropTargetFrame( "TargetFrame" ); - rtl::OUString sPropLabel( "Label" ); + OUString sPropButtonType( "ButtonType"); + OUString sPropTargetFrame( "TargetFrame" ); + OUString sPropLabel( "Label" ); uno::Any aAny; if ( xInfo->hasPropertyByName( sPropLabel ) ) { - aAny <<= rtl::OUString(rName); + aAny <<= OUString(rName); xPropSet->setPropertyValue( sPropLabel, aAny ); } - ::rtl::OUString aTmp = INetURLObject::GetAbsURL( pViewData->GetDocShell()->GetMedium()->GetBaseURL(), rURL ); + OUString aTmp = INetURLObject::GetAbsURL( pViewData->GetDocShell()->GetMedium()->GetBaseURL(), rURL ); aAny <<= aTmp; xPropSet->setPropertyValue( sPropTargetURL, aAny ); if( rTarget.Len() && xInfo->hasPropertyByName( sPropTargetFrame ) ) { - aAny <<= rtl::OUString(rTarget); + aAny <<= OUString(rTarget); xPropSet->setPropertyValue( sPropTargetFrame, aAny ); } @@ -486,7 +486,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) if(SC_LAYER_INTERN != pSelected->GetLayer()) { - rtl::OUString aName = pSelected->GetName(); + OUString aName = pSelected->GetName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index 08542bead9d4..6355ef5e8d9d 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -53,7 +53,7 @@ ScDrawFormShell::ScDrawFormShell(ScViewData* pData) : ScDrawShell(pData) { SetHelpId(HID_SCSHELL_DRAWFORMSH); - SetName(rtl::OUString("DrawForm")); + SetName(OUString("DrawForm")); } ScDrawFormShell::~ScDrawFormShell() diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 944f853862c8..ed3b2c1295e7 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -120,7 +120,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) : } SetHelpId( HID_SCSHELL_DRTXTOB ); - SetName(rtl::OUString("DrawText")); + SetName(OUString("DrawText")); } ScDrawTextObjectBar::~ScDrawTextObjectBar() diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index fa4988c452ee..ef7df53356fc 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -214,7 +214,7 @@ void FuConstCustomShape::SetAttributes( SdrObject* pObj ) if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - std::vector< rtl::OUString > aObjList; + std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { sal_uInt16 i; diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index a0cb995bbc8c..b30af3caf23e 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -151,7 +151,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic, //------------------------------------------------------------------------ -static void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi, +static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView, const Size& rPrefSize, bool const bLink ) { @@ -176,7 +176,7 @@ static void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi, if( pData->GetDocument()->IsNegativePage( pData->GetTabNo() ) ) aInsertPos.X() -= aSize.Width(); - ::rtl::OUString realURL; + OUString realURL; if (bLink) { realURL = rMediaURL; @@ -314,7 +314,7 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh, SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { - ::rtl::OUString aURL; + OUString aURL; const SfxItemSet* pReqArgs = rReq.GetArgs(); bool bAPI = false; diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index c9cd38ea34b0..5b47107a1f94 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -86,12 +86,12 @@ extern SdrObject* pSkipPaintObj; // output.cxx - dieses Objekt nicht namespace { void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScViewData* pViewData, - const rtl::OUString& rRangeParam ) + const OUString& rRangeParam ) { ScDocShell* pDocShell = pViewData->GetDocShell(); ScDocument* pScDoc = pDocShell->GetDocument(); - rtl::OUString aRangeString( rRangeParam ); + OUString aRangeString( rRangeParam ); if ( aRangeString.isEmpty() ) { SCCOL nCol1 = 0; @@ -176,16 +176,16 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString("CellRangeRepresentation"), -1, + OUString("CellRangeRepresentation"), -1, uno::makeAny( aRangeString ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString("HasCategories"), -1, + OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString("FirstCellAsLabel"), -1, + OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString("DataRowSource"), -1, + OUString("DataRowSource"), -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); @@ -208,10 +208,10 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie uno::Reference < embed::XEmbeddedObject > xObj; uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); sal_Bool bIsFromFile = false; - ::rtl::OUString aName; + OUString aName; sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - ::rtl::OUString aIconMediaType; + OUString aIconMediaType; uno::Reference< io::XInputStream > xIconMetaFile; @@ -280,7 +280,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie if ( aURL.SetURL( aPluginFileDialog.GetPath() ) ) { // create a plugin object - ::rtl::OUString aObjName; + OUString aObjName; SvGlobalName aClassId( SO3_PLUGIN_CLASSID ); comphelper::EmbeddedObjectContainer aCnt( xStorage ); xObj = aCnt.CreateEmbeddedObject( aClassId.GetByteSequence(), aObjName ); @@ -290,8 +290,8 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString("PluginURL"), - uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); + xSet->setPropertyValue( OUString("PluginURL"), + uno::makeAny( OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); } } } @@ -359,7 +359,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie // Chart initialisieren ? if ( SvtModuleOptions().IsChart() && SotExchange::IsChart( SvGlobalName( xObj->getClassID() ) ) ) - lcl_ChartInit( xObj, pViewSh->GetViewData(), rtl::OUString() ); + lcl_ChartInit( xObj, pViewSh->GetViewData(), OUString() ); ScViewData* pData = pViewSh->GetViewData(); @@ -451,13 +451,13 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* // BM/IHA -- // get range - ::rtl::OUString aRangeString; + OUString aRangeString; ScRange aPositionRange; // cell range for chart positioning if( pReqArgs ) { const SfxPoolItem* pItem; if( pReqArgs->HasItem( FN_PARAM_5, &pItem ) ) - aRangeString = ::rtl::OUString( ((const SfxStringItem*)pItem)->GetValue()); + aRangeString = OUString( ((const SfxStringItem*)pItem)->GetValue()); aPositionRange = pViewSh->GetViewData()->GetCurPos(); } @@ -499,7 +499,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* // adapted old code pView->UnmarkAll(); - ::rtl::OUString aName; + OUString aName; const sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; uno::Reference < embed::XEmbeddedObject > xObj = @@ -582,7 +582,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* if ( nToTable == pScDoc->GetTableCount() ) { // dann los... - rtl::OUString aTabName; + OUString aTabName; SCTAB nNewTab = pScDoc->GetTableCount(); pScDoc->CreateValidTabName( aTabName ); @@ -667,7 +667,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { uno::Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString("com.sun.star.comp.chart2.WizardDialog") + OUString("com.sun.star.comp.chart2.WizardDialog") , xContext), uno::UNO_QUERY); uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY ); if( xChartModel.is() && xInit.is() ) @@ -677,10 +677,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* uno::Sequence aSeq(2); uno::Any* pArray = aSeq.getArray(); beans::PropertyValue aParam1; - aParam1.Name = rtl::OUString("ParentWindow"); + aParam1.Name = OUString("ParentWindow"); aParam1.Value <<= uno::makeAny(xDialogParentWindow); beans::PropertyValue aParam2; - aParam2.Name = rtl::OUString("ChartModel"); + aParam2.Name = OUString("ChartModel"); aParam2.Value <<= uno::makeAny(xChartModel); pArray[0] <<= uno::makeAny(aParam1); pArray[1] <<= uno::makeAny(aParam2); @@ -694,7 +694,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { //get dialog size: awt::Size aDialogAWTSize; - if( xDialogProps->getPropertyValue( ::rtl::OUString("Size") ) + if( xDialogProps->getPropertyValue( OUString("Size") ) >>= aDialogAWTSize ) { Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height ); @@ -702,12 +702,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { //calculate and set new position Point aDialogPos = pViewShell->GetChartDialogPos( aDialogSize, aRect ); - xDialogProps->setPropertyValue( ::rtl::OUString("Position"), + xDialogProps->setPropertyValue( OUString("Position"), uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) ); } } //tell the dialog to unlock controller - xDialogProps->setPropertyValue( ::rtl::OUString("UnlockControllersOnExecute"), + xDialogProps->setPropertyValue( OUString("UnlockControllersOnExecute"), uno::makeAny( sal_True ) ); } diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index d07cefa60b47..ece660700fa3 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -211,7 +211,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { try { - aCaller = xProps->getPropertyValue( rtl::OUString("Name") ); + aCaller = xProps->getPropertyValue( OUString("Name") ); } catch( uno::Exception& ) {} } @@ -398,7 +398,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) ScDocument* pDocument = ( pViewData ? pViewData->GetDocument() : NULL ); SdrPageView* pPageView = ( pView ? pView->GetSdrPageView() : NULL ); SdrPage* pPage = ( pPageView ? pPageView->GetPage() : NULL ); - ::std::vector< ::rtl::OUString > aExcludedChartNames; + ::std::vector< OUString > aExcludedChartNames; ScRangeListVector aProtectedChartRangesVector; if ( rMEvt.IsLeft() ) diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index 5364d5cd1cfe..45666e6f6999 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -78,7 +78,7 @@ ScGraphicShell::ScGraphicShell(ScViewData* pData) : ScDrawShell(pData) { SetHelpId(HID_SCSHELL_GRAPHIC); - SetName(rtl::OUString("GraphicObject")); + SetName(OUString("GraphicObject")); } ScGraphicShell::~ScGraphicShell() diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index fdf06d9ea9bb..6cb1db567ce5 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -53,7 +53,7 @@ ScOleObjectShell::ScOleObjectShell(ScViewData* pData) : ScDrawShell(pData) { SetHelpId(HID_SCSHELL_OLEOBEJCTSH); - SetName(rtl::OUString("OleObject")); + SetName(OUString("OleObject")); } ScOleObjectShell::~ScOleObjectShell() diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 423b78d45397..58ac2464246d 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -138,7 +138,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, StartListening( *pBindingsP, sal_True ); Point aTopLeft=aCatBox.GetPosPixel(); - rtl::OUString aString("ww"); + OUString aString("ww"); Size aTxtSize( aFiFuncDesc.GetTextWidth(aString), aFiFuncDesc.GetTextHeight() ); nMinWidth=aTxtSize.Width()+aTopLeft.X() +2*aFuncList.GetPosPixel().X(); @@ -325,7 +325,7 @@ void ScFunctionDockWin::SetLeftRightSize() aDiffSize.Width()-=aNewSize.Width(); aDiffSize.Height()-=aNewSize.Height(); - rtl::OUString aString("ww"); + OUString aString("ww"); Size aTxtSize( aFuncList.GetTextWidth(aString), aFuncList.GetTextHeight() ); Range aYRange(3*aTxtSize.Height()+aFuncList.GetPosPixel().Y(), @@ -560,7 +560,7 @@ void ScFunctionDockWin::SetDescription() { pDesc->initArgumentInfo(); // full argument info is needed - ::rtl::OUStringBuffer aBuf(pAllFuncList->GetSelectEntry()); + OUStringBuffer aBuf(pAllFuncList->GetSelectEntry()); if(nDockMode==0) { aBuf.appendAscii(":\n\n"); @@ -658,7 +658,7 @@ sal_Bool ScFunctionDockWin::Close() SfxChildAlignment ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */, SfxChildAlignment aChildAlign) { - String aString = rtl::OUString("ww"); + String aString = OUString("ww"); Size aTxtSize( aFiFuncDesc.GetTextWidth(aString), aFiFuncDesc.GetTextHeight() ); if(!bInit) { @@ -868,7 +868,7 @@ void ScFunctionDockWin::DoEnter(sal_Bool /* bOk */) //@@ ??? aArgStr = aFirstArgStr; if ( nArgs != VAR_ARGS && nArgs != PAIRED_VAR_ARGS ) { // no VarArgs or Fix plus VarArgs, but not VarArgs only - rtl::OUString aArgSep("; "); + OUString aArgSep("; "); sal_uInt16 nFix; if (nArgs >= PAIRED_VAR_ARGS) nFix = nArgs - PAIRED_VAR_ARGS + 2; @@ -1057,7 +1057,7 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo) if ( pInfo->aExtraString.Len() ) { xub_StrLen nPos = pInfo->aExtraString.Search( - rtl::OUString("ScFuncList:")); + OUString("ScFuncList:")); // Versuche, den Alignment-String "ALIGN:(...)" einzulesen; wenn // er nicht vorhanden ist, liegt eine "altere Version vor diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 4f359f625dd0..55897bfbfd77 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -100,7 +100,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, pDoc = pViewData->GetDocument(); m_xParser.set(ScServiceProvider::MakeInstance(SC_SERVICE_FORMULAPARS,(ScDocShell*)pDoc->GetDocumentShell()),uno::UNO_QUERY); uno::Reference< beans::XPropertySet> xSet(m_xParser,uno::UNO_QUERY); - xSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COMPILEFAP)),uno::makeAny(sal_True)); + xSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COMPILEFAP)),uno::makeAny(sal_True)); m_xOpCodeMapper.set(ScServiceProvider::MakeInstance(SC_SERVICE_OPCODEMAPPER,(ScDocShell*)pDoc->GetDocumentShell()),uno::UNO_QUERY); @@ -168,7 +168,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, if ( !bEdit ) { - rtl::OUString aNewFormula('='); + OUString aNewFormula('='); if ( aFormula.Len() > 0 && aFormula.GetChar(0) == '=' ) aNewFormula = aFormula; @@ -329,7 +329,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult ) if ( pCell->GetCode()->GetCodeLen() <= 1 ) { // ==1: einzelner ist als Parameter immer Bereich // ==0: es waere vielleicht einer, wenn.. - rtl::OUStringBuffer aBraced; + OUStringBuffer aBraced; aBraced.append('('); aBraced.append(rStrExp); aBraced.append(')'); @@ -447,7 +447,7 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc ) aArray.AddDoubleReference(aRefData); ScCompiler aComp(pDoc, aCursorPos, aArray); aComp.SetGrammar(pDoc->GetGrammar()); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aComp.CreateStringFromTokenArray(aBuf); aRefStr = aBuf.makeStringAndClear(); } diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index d5d5eb07de09..5fd9025ea321 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -120,13 +120,13 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index c55a4fa4bc75..a303c9c64cc5 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -76,12 +76,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -108,7 +108,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 824c05700d26..b90d1c47819d 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -166,12 +166,12 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -228,20 +228,20 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService(const ::rtl::OUString& sServiceName) + supportsService(const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); @@ -260,12 +260,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -299,9 +299,9 @@ protected: throw (::com::sun::star::lang::DisposedException); /// Use this method to set initial Name without notification - void SetName(const rtl::OUString& rName) { msName = rName; } + void SetName(const OUString& rName) { msName = rName; } /// Use this method to set initial Description without notification - void SetDescription(const rtl::OUString& rDesc) { msDescription = rDesc; } + void SetDescription(const OUString& rDesc) { msDescription = rDesc; } /// Reference to the parent object. ::com::sun::star::uno::Reference< @@ -312,12 +312,12 @@ private: be set from the outside. Furthermore, it changes according the the draw page's display mode. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. It changes according the draw page's display mode. */ - ::rtl::OUString msName; + OUString msName; /// client id in the AccessibleEventNotifier queue sal_uInt32 mnClientId; diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 3d603223eabd..bf2926eb4946 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -143,7 +143,7 @@ protected: ::com::sun::star::beans::PropertyValue > PropertyValueSeq; private: - ::rtl::OUStringBuffer maBuffer; /// Contains the text representation of the ruler. + OUStringBuffer maBuffer; /// Contains the text representation of the ruler. public: explicit ScAccessibleCsvRuler( ScCsvRuler& rRuler ); @@ -189,7 +189,7 @@ public: throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the attributes of the specified character. */ - virtual PropertyValueSeq SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) + virtual PropertyValueSeq SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the screen coordinates of the specified character. */ @@ -204,7 +204,7 @@ public: throw( ::com::sun::star::uno::RuntimeException ); /** Returns the selected text (ruler returns empty string). */ - virtual ::rtl::OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); /** Returns the start index of the selection (ruler returns -1). */ virtual sal_Int32 SAL_CALL getSelectionStart() throw( ::com::sun::star::uno::RuntimeException ); @@ -217,10 +217,10 @@ public: throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the entire text. */ - virtual ::rtl::OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); /** Returns the specified range [Start,End) of the text. */ - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the specified text portion. */ @@ -244,7 +244,7 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider ---------------------------------------------------------- @@ -265,10 +265,10 @@ public: // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ - virtual ::rtl::OUString SAL_CALL createAccessibleName() + virtual OUString SAL_CALL createAccessibleName() throw( ::com::sun::star::uno::RuntimeException ); /** Returns this object's description. */ - virtual ::rtl::OUString SAL_CALL createAccessibleDescription() + virtual OUString SAL_CALL createAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException ); /** Throws an exception, if the specified character position is invalid (outside 0..len-1). */ @@ -361,11 +361,11 @@ public: throw( ::com::sun::star::uno::RuntimeException ); /** Returns the description of the specified row in the table. */ - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the description text of the specified column in the table. */ - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); /** Returns the number of rows occupied at a specified row and column. @@ -472,7 +472,7 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider ---------------------------------------------------------- @@ -499,10 +499,10 @@ public: // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ - virtual ::rtl::OUString SAL_CALL createAccessibleName() + virtual OUString SAL_CALL createAccessibleName() throw( ::com::sun::star::uno::RuntimeException ); /** Returns this object's description. */ - virtual ::rtl::OUString SAL_CALL createAccessibleDescription() + virtual OUString SAL_CALL createAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException ); /** Throws an exception, if nIndex is not a valid child index. */ @@ -615,7 +615,7 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // helpers ---------------------------------------------------------------- @@ -627,10 +627,10 @@ protected: private: /** Returns this object's name. */ - virtual ::rtl::OUString SAL_CALL createAccessibleName() + virtual OUString SAL_CALL createAccessibleName() throw( ::com::sun::star::uno::RuntimeException ); /** Returns this object's description. */ - virtual ::rtl::OUString SAL_CALL createAccessibleDescription() + virtual OUString SAL_CALL createAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException ); /** Returns the VCL grid control. Assumes a living object. */ diff --git a/sc/source/ui/inc/AccessibleDataPilotControl.hxx b/sc/source/ui/inc/AccessibleDataPilotControl.hxx index 9302fc4ad41b..9e4db70b2cc1 100644 --- a/sc/source/ui/inc/AccessibleDataPilotControl.hxx +++ b/sc/source/ui/inc/AccessibleDataPilotControl.hxx @@ -92,7 +92,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); @@ -106,12 +106,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index da9833e20663..b0fba0aafaf4 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -163,13 +163,13 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); @@ -261,12 +261,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -306,8 +306,8 @@ private: void AddChild(const com::sun::star::uno::Reference& xAcc, sal_Bool bFireEvent); void RemoveChild(const com::sun::star::uno::Reference& xAcc, sal_Bool bFireEvent); - rtl::OUString GetCurrentCellName() const; - rtl::OUString GetCurrentCellDescription() const; + OUString GetCurrentCellName() const; + OUString GetCurrentCellDescription() const; Rectangle GetVisibleArea_Impl() const; }; diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index e68e340d24e1..1de55098655e 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -85,13 +85,13 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); @@ -107,12 +107,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 4071d09fc5a0..4053bb8a8a66 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -48,8 +48,8 @@ public: ScAccessibleEditObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const rtl::OUString& rName, - const rtl::OUString& rDescription, EditObjectType eObjectType); + EditView* pEditView, Window* pWin, const OUString& rName, + const OUString& rDescription, EditObjectType eObjectType); protected: virtual ~ScAccessibleEditObject(); @@ -105,12 +105,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -137,7 +137,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index b74770e6b0bd..1bf13a547dec 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -69,17 +69,17 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); //===== internal ======================================================== void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; } protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index dc8a639784bc..6031c7d973c2 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -87,14 +87,14 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); @@ -107,8 +107,8 @@ public: throw (::com::sun::star::uno::RuntimeException); protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index cdb7507bab57..b5f0394fa76a 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -73,9 +73,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); ///===== XTypeProvider =================================================== diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 098e08c37839..5ba5d7cd6a50 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -99,9 +99,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); ///===== XTypeProvider =================================================== @@ -117,8 +117,8 @@ public: throw (::com::sun::star::uno::RuntimeException); protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 2a0fff825242..795badc2a9bb 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -67,10 +67,10 @@ public: virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) @@ -134,9 +134,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); //===== XTypeProvider =================================================== @@ -152,8 +152,8 @@ public: void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; } protected: - virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException); virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 38b0addb1fa3..132f7e0eb090 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -204,13 +204,13 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 87e88c39a133..cb4fc71860ad 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -78,13 +78,13 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Returns the description of the specified row in the table. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); /// Returns the description text of the specified column in the table. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); @@ -196,12 +196,12 @@ public: protected: /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -258,7 +258,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index c2242c7f397e..80eb17fe94c0 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -55,12 +55,12 @@ protected: virtual void SAL_CALL disposing(); // ____ XServiceInfo ____ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 03d26b34c3b6..fd84d86969f0 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -109,23 +109,23 @@ private: SvxRedlinTable* pTheView; // #i48648 now SvHeaderTabListBox ScRangeList aRangeList; ScChangeViewSettings aChangeViewSet; - rtl::OUString aStrInsertCols; - rtl::OUString aStrInsertRows; - rtl::OUString aStrInsertTabs; - rtl::OUString aStrDeleteCols; - rtl::OUString aStrDeleteRows; - rtl::OUString aStrDeleteTabs; - rtl::OUString aStrMove; - rtl::OUString aStrContent; - rtl::OUString aStrReject; - rtl::OUString aStrAllAccepted; - rtl::OUString aStrAllRejected; - rtl::OUString aStrNoEntry; - rtl::OUString aStrContentWithChild; - rtl::OUString aStrChildContent; - rtl::OUString aStrChildOrgContent; - rtl::OUString aStrEmpty; - rtl::OUString aUnknown; + OUString aStrInsertCols; + OUString aStrInsertRows; + OUString aStrInsertTabs; + OUString aStrDeleteCols; + OUString aStrDeleteRows; + OUString aStrDeleteTabs; + OUString aStrMove; + OUString aStrContent; + OUString aStrReject; + OUString aStrAllAccepted; + OUString aStrAllRejected; + OUString aStrNoEntry; + OUString aStrContentWithChild; + OUString aStrChildContent; + OUString aStrChildOrgContent; + OUString aStrEmpty; + OUString aUnknown; sal_uLong nAcceptCount; sal_uLong nRejectCount; bool bAcceptEnableFlag:1; @@ -165,7 +165,7 @@ protected: bool IsValidAction(const ScChangeAction* pScChangeAction); - rtl::OUString* MakeTypeString(ScChangeActionType eType); + OUString* MakeTypeString(ScChangeActionType eType); SvTreeListEntry* InsertChangeAction( const ScChangeAction* pScChangeAction,ScChangeActionState eState, diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index 588093def54f..8d7ff13ca818 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -31,10 +31,10 @@ class ScAreaLink; class ScAreaLinkSaver { private: - ::rtl::OUString aFileName; - ::rtl::OUString aFilterName; - ::rtl::OUString aOptions; - ::rtl::OUString aSourceArea; + OUString aFileName; + OUString aFilterName; + OUString aOptions; + OUString aSourceArea; ScRange aDestArea; sal_uLong nRefresh; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 52066c3c0262..b13ef5ccd5c7 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -75,10 +75,10 @@ public: virtual void Paint(const Rectangle& rRect); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - void addMenuItem(const ::rtl::OUString& rText, bool bEnabled, Action* pAction); + void addMenuItem(const OUString& rText, bool bEnabled, Action* pAction); void addSeparator(); - ScMenuFloatingWindow* addSubMenuItem(const ::rtl::OUString& rText, bool bEnabled); + ScMenuFloatingWindow* addSubMenuItem(const OUString& rText, bool bEnabled); void setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, bool bEnsureSubMenu); void selectMenuItem(size_t nPos, bool bSelected, bool bSubMenuTimer); void clearSelectedMenuItem(); @@ -86,8 +86,8 @@ public: bool isMenuItemSelected(size_t nPos) const; size_t getSelectedMenuItem() const; - void setName(const ::rtl::OUString& rName); - const ::rtl::OUString& getName() const; + void setName(const OUString& rName); + const OUString& getName() const; void executeMenuItem(size_t nPos); void getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const; @@ -161,7 +161,7 @@ private: struct MenuItemData { - ::rtl::OUString maText; + OUString maText; bool mbEnabled:1; bool mbSeparator:1; @@ -195,7 +195,7 @@ private: // Name of this menu window, taken from the menu item of the parent window // that launches it (if this is a sub menu). If this is a top-level menu // window, then this name can be anything. - ::rtl::OUString maName; + OUString maName; size_t mnSelectedMenu; size_t mnClickedMenu; @@ -212,7 +212,7 @@ private: class ScCheckListMenuWindow : public ScMenuFloatingWindow { public: - typedef boost::unordered_map ResultType; + typedef boost::unordered_map ResultType; /** * Extended data that the client code may need to store. Create a @@ -244,7 +244,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); void setMemberSize(size_t n); - void addMember(const ::rtl::OUString& rName, bool bVisible); + void addMember(const OUString& rName, bool bVisible); void initMembers(); void setConfig(const Config& rConfig); @@ -274,7 +274,7 @@ protected: private: struct Member { - ::rtl::OUString maName; + OUString maName; bool mbVisible; Member(); diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index 13bb74bcf978..8b067f5e25bf 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -63,7 +63,7 @@ private: Edit maEdMin; Edit maEdMax; - rtl::OUString maStrWarnSameValue; + OUString maStrWarnSameValue; SvNumberFormatter* mpNumberFormatter; ScDocument* mpDoc; diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index bd8b0e6d64db..7727d28be926 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -44,7 +44,7 @@ private: FixedText maFtCondition; sal_Int32 mnIndex; - rtl::OUString maStrCondition; + OUString maStrCondition; protected: ListBox maLbType; @@ -56,7 +56,7 @@ protected: void Select(); void Deselect(); - virtual rtl::OUString GetExpressionString() = 0; + virtual OUString GetExpressionString() = 0; public: ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); @@ -88,7 +88,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createConditionEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( StyleSelectHdl, void* ); DECL_LINK( ConditionTypeSelectHdl, void* ); @@ -111,7 +111,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry formula::RefEdit maEdFormula; ScFormatEntry* createFormulaEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( StyleSelectHdl, void* ); @@ -143,7 +143,7 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( EntryTypeHdl, ListBox* ); @@ -176,7 +176,7 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( EntryTypeHdl, ListBox* ); @@ -205,7 +205,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createDatabarEntry() const; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); DECL_LINK( OptionBtnHdl, void* ); @@ -229,7 +229,7 @@ public: virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::DATE; } protected: - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); private: void Init(); @@ -253,7 +253,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry typedef boost::ptr_vector ScIconSetFrmtDataEntriesType; ScIconSetFrmtDataEntriesType maEntries; - virtual rtl::OUString GetExpressionString(); + virtual OUString GetExpressionString(); void Init(); diff --git a/sc/source/ui/inc/condformathelper.hxx b/sc/source/ui/inc/condformathelper.hxx index 02d24e653dd8..b64e45825386 100644 --- a/sc/source/ui/inc/condformathelper.hxx +++ b/sc/source/ui/inc/condformathelper.hxx @@ -26,10 +26,10 @@ enum ScCondFormatEntryType class ScCondFormatHelper { public: - static SC_DLLPUBLIC rtl::OUString GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos); + static SC_DLLPUBLIC OUString GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos); - static SC_DLLPUBLIC rtl::OUString GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, - rtl::OUString aStr1 = rtl::OUString(), rtl::OUString aStr2 = rtl::OUString() ); + static SC_DLLPUBLIC OUString GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, + OUString aStr1 = OUString(), OUString aStr2 = OUString() ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 52bad85fb1d9..717fd429bb48 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -268,10 +268,10 @@ private: public: /** Fills all cells of a line with the passed text (separators mode). */ void ImplSetTextLineSep( - sal_Int32 nLine, const rtl::OUString& rTextLine, + sal_Int32 nLine, const OUString& rTextLine, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ); /** Fills all cells of a line with the passed text (fixed width mode). */ - void ImplSetTextLineFix( sal_Int32 nLine, const rtl::OUString& rTextLine ); + void ImplSetTextLineFix( sal_Int32 nLine, const OUString& rTextLine ); /** Returns the text of the specified cell. */ const String& GetCellText( sal_uInt32 nColIndex, sal_Int32 nLine ) const; diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 4faff8809d79..3caa4bf73b94 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -99,7 +99,7 @@ private: public: /** Fills all cells of all lines with the passed texts (Unicode strings). */ void SetUniStrings( - const rtl::OUString* pTextLines, const String& rSepChars, + const OUString* pTextLines, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ); // column settings -------------------------------------------------------- diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 835a0cd31077..c74ae8a6ef2d 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -49,8 +49,8 @@ public: bool IsDatabase() const; bool IsExternal() const; bool IsNamedRange() const; - rtl::OUString GetSelectedNamedRange() const; - void AppendNamedRange(const rtl::OUString& rNames); + OUString GetSelectedNamedRange() const; + void AppendNamedRange(const OUString& rNames); private: DECL_LINK( RadioClickHdl, RadioButton * ); @@ -77,7 +77,7 @@ private: public: ScDataPilotServiceDlg( Window* pParent, - const com::sun::star::uno::Sequence& rServices ); + const com::sun::star::uno::Sequence& rServices ); ~ScDataPilotServiceDlg(); String GetServiceName() const; diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index ebd97473c75f..10a38dfb0e15 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -82,12 +82,12 @@ public: const ScSortParam* pForceNewSort, sal_Bool bRecord, sal_Bool bApi ); - bool AddDBRange( const ::rtl::OUString& rName, const ScRange& rRange, sal_Bool bApi ); - bool DeleteDBRange( const ::rtl::OUString& rName ); + bool AddDBRange( const OUString& rName, const ScRange& rRange, sal_Bool bApi ); + bool DeleteDBRange( const OUString& rName ); bool RenameDBRange( const String& rOld, const String& rNew ); bool ModifyDBData( const ScDBData& rNewData ); // Name unveraendert - bool RepeatDB( const ::rtl::OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed=false, SCTAB aTab = 0); + bool RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed=false, SCTAB aTab = 0); bool DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj, bool bRecord, bool bApi, bool bAllowMove = false ); diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 2e673e3085f8..0720ce5bd835 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -66,7 +66,7 @@ public: sal_Bool ImportData( const ScImportParam& rParam, sal_Bool bRecord = sal_True ); - void GotoDBArea( const ::rtl::OUString& rDBName ); + void GotoDBArea( const OUString& rDBName ); // DB range from Cursor ScDBData* GetDBData( bool bMarkArea = true, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP); @@ -88,13 +88,13 @@ public: void DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nParts ); void NumGroupDataPilot( const ScDPNumGroupInfo& rInfo ); void UngroupDataPilot(); - void DataPilotInput( const ScAddress& rPos, const rtl::OUString& rString ); + void DataPilotInput( const ScAddress& rPos, const OUString& rString ); bool DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId = NULL ); sal_Bool DataPilotMove( const ScRange& rSource, const ScAddress& rDest ); bool HasSelectionForDrillDown( sal_uInt16& rOrientation ); - void SetDataPilotDetails(bool bShow, const rtl::OUString* pNewDimensionName = NULL); + void SetDataPilotDetails(bool bShow, const OUString* pNewDimensionName = NULL); void ShowDataPilotSourceData( ScDPObject& rDPObj, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters ); diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index e0dd46f74021..1a03612440c2 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -192,7 +192,7 @@ public: * passed as arguments (it creates copies); the caller is responsible for * destroying them. */ - virtual void ModifyAllRangeNames( const boost::ptr_map& rRangeMap ); + virtual void ModifyAllRangeNames( const boost::ptr_map& rRangeMap ); virtual sal_Bool CreateNames( const ScRange& rRange, sal_uInt16 nFlags, sal_Bool bApi, SCTAB nTab = -1 ); // -1 for global range names virtual sal_Bool InsertNameList( const ScAddress& rStartPos, sal_Bool bApi ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index a18f127ef0dd..a26a234f3a83 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -144,7 +144,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener SC_DLLPRIVATE sal_uLong DBaseImport( const String& rFullFileName, CharSet eCharSet, ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc ); SC_DLLPRIVATE sal_uLong DBaseExport( - const rtl::OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo ); + const OUString& rFullFileName, CharSet eCharSet, bool& bHasMemo ); SC_DLLPRIVATE static bool MoveFile( const INetURLObject& rSource, const INetURLObject& rDest ); SC_DLLPRIVATE static bool KillFile( const INetURLObject& rURL ); @@ -201,7 +201,7 @@ public: virtual sal_Bool Load( SfxMedium& rMedium ); virtual sal_Bool LoadFrom( SfxMedium& rMedium ); virtual sal_Bool ConvertFrom( SfxMedium &rMedium ); - virtual bool LoadExternal(SfxMedium& rMedium, const rtl::OUString& rProvider); + virtual bool LoadExternal(SfxMedium& rMedium, const OUString& rProvider); virtual sal_Bool Save(); virtual sal_Bool SaveAs( SfxMedium& rMedium ); virtual sal_Bool ConvertTo( SfxMedium &rMedium ); @@ -278,7 +278,7 @@ public: void LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellStyles, bool bPageStyles ); - void PageStyleModified( const rtl::OUString& rStyleName, sal_Bool bApi ); + void PageStyleModified( const OUString& rStyleName, sal_Bool bApi ); void NotifyStyle( const SfxStyleSheetHint& rHint ); void DoAutoStyle( const ScRange& rRange, const String& rStyle ); diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx index e571adb31e06..970626a93fcd 100644 --- a/sc/source/ui/inc/dpcontrol.hxx +++ b/sc/source/ui/inc/dpcontrol.hxx @@ -44,7 +44,7 @@ public: ScDocument* pDoc = NULL); ~ScDPFieldButton(); - void setText(const ::rtl::OUString& rText); + void setText(const OUString& rText); void setBoundingBox(const Point& rPos, const Size& rSize, bool bLayoutRTL); void setDrawBaseButton(bool b); void setDrawPopupButton(bool b); @@ -61,7 +61,7 @@ private: private: Point maPos; Size maSize; - ::rtl::OUString maText; + OUString maText; Fraction maZoomX; Fraction maZoomY; ScDocument* mpDoc; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 5ca2fdeb6912..307bcac4abbb 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -36,7 +36,7 @@ class ScDrawShell : public SfxShell DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* ); - void SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk ); + void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ); protected: ScViewData* GetViewData() { return pViewData; } diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index d613c849cc36..f52af12dc471 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -55,13 +55,13 @@ class ScDPFieldControlBase : public Control protected: struct FieldName { - rtl::OUString maText; + OUString maText; bool mbFits; sal_uInt8 mnDupCount; - FieldName(const rtl::OUString& rText, bool bFits, sal_uInt8 nDupCount = 0); + FieldName(const OUString& rText, bool bFits, sal_uInt8 nDupCount = 0); FieldName(const FieldName& r); - rtl::OUString getDisplayedText() const; + OUString getDisplayedText() const; }; typedef ::std::vector FieldNames; @@ -113,20 +113,20 @@ public: virtual void HandleWheelScroll(long nNotch) = 0; /** @return The name of the control without shortcut. */ - ::rtl::OUString GetName() const; - void SetName(const ::rtl::OUString& rName); + OUString GetName() const; + void SetName(const OUString& rName); /** @return TRUE, if the field with the given index exists. */ bool IsExistingIndex( size_t nIndex ) const; - void AppendField( const rtl::OUString& rText, const ScPivotFuncData& rFunc ); + void AppendField( const OUString& rText, const ScPivotFuncData& rFunc ); /** * Inserts a field using the specified pixel position. * * @param rPos The coordinates to insert the field. */ - size_t AddField(const rtl::OUString& rText, const Point& rPos, const ScPivotFuncData& rFunc); + size_t AddField(const OUString& rText, const Point& rPos, const ScPivotFuncData& rFunc); bool MoveField(size_t nCurPos, const Point& rPos, size_t& rnIndex); @@ -141,9 +141,9 @@ public: /** Removes all fields. */ void ClearFields(); /** Changes the text on an existing field. */ - void SetFieldText(const rtl::OUString& rText, size_t nIndex, sal_uInt8 nDupCount); + void SetFieldText(const OUString& rText, size_t nIndex, sal_uInt8 nDupCount); /** Returns the text of an existing field. */ - rtl::OUString GetFieldText( size_t nIndex ) const; + OUString GetFieldText( size_t nIndex ) const; /** Calculates a field index at a specific pixel position. Returns in every case the index of an existing field. @@ -233,7 +233,7 @@ private: /** Selects a field at a new position relative to the current. */ void MoveSelection( SCsCOL nDX, SCsROW nDY ); - sal_uInt8 GetNextDupCount(const rtl::OUString& rFieldText) const; + sal_uInt8 GetNextDupCount(const OUString& rFieldText) const; private: typedef ::std::vector Paintables; @@ -243,7 +243,7 @@ private: FieldNames maFieldNames; /// String array of the field names and flags, if text fits into button. ScPivotLayoutDlg* mpDlg; FixedText* mpCaption; /// FixedText containing the name of the control. - ::rtl::OUString maName; + OUString maName; size_t mnFieldSelected; /// Currently selected field. diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 53f1939c1561..9329c7e35780 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -41,7 +41,7 @@ public: FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, - const rtl::OUString& aStartStr, + const OUString& aStartStr, double fStep, double fMax, sal_uInt16 nPossDir ); @@ -54,14 +54,14 @@ public: double GetStep() const { return fIncrement; } double GetMax() const { return fEndVal; } - rtl::OUString GetStartStr() const { return aEdStartVal.GetText(); } + OUString GetStartStr() const { return aEdStartVal.GetText(); } void SetEdStartValEnabled(bool bFlag = false); private: FixedText aFtStartVal; Edit aEdStartVal; - const rtl::OUString aStartStrVal; + const OUString aStartStrVal; FixedText aFtEndVal; Edit aEdEndVal; @@ -92,7 +92,7 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - const rtl::OUString aErrMsgInvalidVal; + const OUString aErrMsgInvalidVal; //---------------------------------------------------------- diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index e02db7066da7..698d5176a5ca 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -116,13 +116,13 @@ private: CheckBox aBtnDestPers; FixedText aFtDbAreaLabel; FixedInfo aFtDbArea; - const rtl::OUString aStrUndefined; - const rtl::OUString aStrNone; + const OUString aStrUndefined; + const OUString aStrNone; - const rtl::OUString aStrEmpty; - const rtl::OUString aStrNotEmpty; - const rtl::OUString aStrRow; - const rtl::OUString aStrColumn; + const OUString aStrEmpty; + const OUString aStrNotEmpty; + const OUString aStrRow; + const OUString aStrColumn; ScFilterOptionsMgr* pOptionsMgr; @@ -204,8 +204,8 @@ private: CheckBox aBtnDestPers; FixedText aFtDbAreaLabel; FixedInfo aFtDbArea; - const rtl::OUString aStrUndefined; - const rtl::OUString aStrNoName; + const OUString aStrUndefined; + const OUString aStrNoName; OKButton aBtnOk; CancelButton aBtnCancel; diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 57c22a7ba4ef..1a06c4f64801 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -24,7 +24,7 @@ class FuConstCustomShape : public FuConstruct { - rtl::OUString aCustomShape; + OUString aCustomShape; void SetAttributes( SdrObject* pObj ); diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 8c7e36b26dbe..2691b118bbf7 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -129,9 +129,9 @@ public: void SetStreamPath( const String& rPath ) { aStreamPath = rPath; } const String& GetStreamPath() const { return aStreamPath; } - bool ImportString( const ::rtl::OUString&, sal_uLong=FORMAT_STRING ); - bool ExportString( ::rtl::OUString&, sal_uLong=FORMAT_STRING ); - bool ExportByteString( ::rtl::OString&, rtl_TextEncoding, sal_uLong=FORMAT_STRING ); + bool ImportString( const OUString&, sal_uLong=FORMAT_STRING ); + bool ExportString( OUString&, sal_uLong=FORMAT_STRING ); + bool ExportByteString( OString&, rtl_TextEncoding, sal_uLong=FORMAT_STRING ); bool ImportStream( SvStream&, const String& rBaseURL, sal_uLong=FORMAT_STRING ); bool ExportStream( SvStream&, const String& rBaseURL, sal_uLong=FORMAT_STRING ); @@ -179,7 +179,7 @@ inline void ScImportExport::SetNoEndianSwap( SvStream& rStrm ) class ScImportStringStream : public SvMemoryStream { public: - ScImportStringStream( const ::rtl::OUString rStr ) + ScImportStringStream( const OUString rStr ) : SvMemoryStream( (void*)rStr.getStr(), rStr.getLength() * sizeof(sal_Unicode), STREAM_READ) { @@ -233,7 +233,7 @@ public: may start under false preconditions. */ -SC_DLLPUBLIC rtl::OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, +SC_DLLPUBLIC OUString ReadCsvLine( SvStream &rStream, bool bEmbeddedLineBreak, const String& rFieldSeparators, sal_Unicode cFieldQuote ); #endif diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index e0db50c19f57..0f0ac6e101da 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -72,12 +72,12 @@ private: sal_uLong nTipVisible; Window* pTipVisibleSecParent; sal_uLong nTipVisibleSec; - rtl::OUString aManualTip; - rtl::OUString aAutoSearch; + OUString aManualTip; + OUString aAutoSearch; - rtl::OUString aCurrentText; + OUString aCurrentText; - rtl::OUString aFormText; // for autopilot function + OUString aFormText; // for autopilot function xub_StrLen nFormSelStart; // Selection for autopilot function xub_StrLen nFormSelEnd; @@ -169,8 +169,8 @@ public: eMode != SC_INPUT_TYPE); } bool IsTopMode() const { return (eMode == SC_INPUT_TOP); } - const rtl::OUString& GetEditString(); - const rtl::OUString& GetFormString() const { return aFormText; } + const OUString& GetEditString(); + const OUString& GetFormString() const { return aFormText; } const ScAddress& GetCursorPos() const { return aCursorPos; } @@ -232,7 +232,7 @@ public: // Communication with the autopilot function void InputGetSelection ( xub_StrLen& rStart, xub_StrLen& rEnd ); void InputSetSelection ( xub_StrLen nStart, xub_StrLen nEnd ); - void InputReplaceSelection ( const rtl::OUString& rStr ); + void InputReplaceSelection ( const OUString& rStr ); bool IsFormulaMode() const { return bFormulaMode; } ScInputWindow* GetInputWindow() { return pInputWin; } diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index e3169ba96764..2f035fbb387b 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -67,7 +67,7 @@ private: void UpdateSourceRanges(); void UpdateEnable(); - void LoadDocument( const rtl::OUString& rFile, const String& rFilter, + void LoadDocument( const OUString& rFile, const String& rFilter, const String& rOptions ); public: @@ -80,10 +80,10 @@ public: virtual short Execute(); // overwritten to set dialog parent - rtl::OUString GetURL(); - rtl::OUString GetFilter(); // may be empty - rtl::OUString GetOptions(); // filter options - rtl::OUString GetSource(); // separated by ";" + OUString GetURL(); + OUString GetFilter(); // may be empty + OUString GetOptions(); // filter options + OUString GetSource(); // separated by ";" sal_uLong GetRefresh(); // 0 if disabled }; diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 8ca5db418187..42db6273b04d 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -33,14 +33,14 @@ class ScMoveTableDlg : public ModalDialog { public: - ScMoveTableDlg(Window* pParent, const rtl::OUString& rDefault); + ScMoveTableDlg(Window* pParent, const OUString& rDefault); ~ScMoveTableDlg(); sal_uInt16 GetSelectedDocument () const; SCTAB GetSelectedTable () const; bool GetCopyTable () const; bool GetRenameTable () const; - void GetTabNameString( rtl::OUString& rString ) const; + void GetTabNameString( OUString& rString ) const; void SetForceCopyTable (); void EnableCopyTable (sal_Bool bFlag=true); void EnableRenameTable (sal_Bool bFlag=true); @@ -68,11 +68,11 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - rtl::OUString maStrTabNameUsed; - rtl::OUString maStrTabNameEmpty; - rtl::OUString maStrTabNameInvalid; + OUString maStrTabNameUsed; + OUString maStrTabNameEmpty; + OUString maStrTabNameInvalid; - const rtl::OUString maDefaultName; + const OUString maDefaultName; sal_uInt16 mnCurrentDocPos; sal_uInt16 nDocument; diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 52d34945f50a..13c32b75d412 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -72,7 +72,7 @@ private: OUString maName; OUString maScope; - std::map maRangeMap; + std::map maRangeMap; void CancelPushed(); void AddPushed(); @@ -90,7 +90,7 @@ protected: public: ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* pViewData, std::map aRangeMap, + ScViewData* pViewData, std::map aRangeMap, const ScAddress& aCursorPos, const bool bUndo); virtual ~ScNameDefDlg() {}; @@ -101,7 +101,7 @@ public: virtual void SetActive(); virtual sal_Bool Close(); - void GetNewData( rtl::OUString& rName, rtl::OUString& rScope ); + void GetNewData( OUString& rName, OUString& rScope ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 933af353dacb..79a254a4f914 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -72,11 +72,11 @@ private: SvxSimpleTableContainer maNameMgrCtrl; ScRangeManagerTable* mpRangeManagerTable; - const rtl::OUString maGlobalNameStr; - const rtl::OUString maErrInvalidNameStr; - const rtl::OUString maErrNameInUse; - const rtl::OUString maStrInfoDefault; - const rtl::OUString maStrMultiSelect; + const OUString maGlobalNameStr; + const OUString maErrInvalidNameStr; + const OUString maErrNameInUse; + const OUString maStrInfoDefault; + const OUString maStrMultiSelect; ScViewData* mpViewData; ScDocument* mpDoc; @@ -88,7 +88,7 @@ private: //ugly hack to call DefineNames from ManageNames bool mbCloseWithoutUndo; - typedef boost::ptr_map RangeNameContainer; + typedef boost::ptr_map RangeNameContainer; RangeNameContainer maRangeMap; @@ -102,7 +102,7 @@ private: bool IsFormulaValid(); void CheckForEmptyTable(); - ScRangeName* GetRangeName(const rtl::OUString& rScope); + ScRangeName* GetRangeName(const OUString& rScope); bool AddPushed(); void RemovePushed(); @@ -133,7 +133,7 @@ protected: public: ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData, - const ScAddress& aCursorPos, boost::ptr_map* pRangeMap = NULL ); + const ScAddress& aCursorPos, boost::ptr_map* pRangeMap = NULL ); virtual ~ScNameDlg(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); @@ -142,8 +142,8 @@ public: virtual void SetActive(); virtual sal_Bool Close(); - void GetRangeNames(boost::ptr_map& rRangeMap); - void SetEntry(const rtl::OUString& rName, const rtl::OUString& rScope); + void GetRangeNames(boost::ptr_map& rRangeMap); + void SetEntry(const OUString& rName, const OUString& rScope); }; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index d82ce5cd0f1e..687cc0f17a0e 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -40,9 +40,9 @@ class ScRangeData; struct ScRangeNameLine { - rtl::OUString aName; - rtl::OUString aExpression; - rtl::OUString aScope; + OUString aName; + OUString aExpression; + OUString aScope; }; //Implements the table for the manage names dialog @@ -52,10 +52,10 @@ struct ScRangeNameLine class SC_DLLPUBLIC ScRangeManagerTable : public SvxSimpleTable { private: - rtl::OUString maGlobalString; + OUString maGlobalString; // should be const because we should not modify it here - const boost::ptr_map& mrRangeMap; + const boost::ptr_map& mrRangeMap; // for performance, save which entries already have the formula entry // otherwise opening the dialog with a lot of range names is extremelly slow because // we would calculate all formula strings during opening @@ -70,7 +70,7 @@ private: void setColWidths(); public: - ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map& aTabRangeNames, const ScAddress& rPos ); + ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map& aTabRangeNames, const ScAddress& rPos ); virtual ~ScRangeManagerTable(); virtual void Resize(); diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index ba4098c05824..da880cb563cd 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -43,14 +43,14 @@ private: ScRangeManagerTable* mpTable; - std::vector maSelectedNames; - boost::ptr_map maRangeMap; + std::vector maSelectedNames; + boost::ptr_map maRangeMap; public: ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool bInsList=true ); virtual ~ScNamePasteDlg(); - std::vector GetSelectedNames() const; + std::vector GetSelectedNames() const; bool IsAllSelected() const; }; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 41eba6064a0b..9eb57004c38c 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -280,7 +280,7 @@ private: void SetCurrentCell( SCCOL nCol, SCROW Row ); void SetCurrentCellStr( const String rName ); void SetCurrentTable( SCTAB nTab ); - void SetCurrentTableStr( const rtl::OUString& rName ); + void SetCurrentTableStr( const OUString& rName ); void SetCurrentObject( const String rName ); void SetCurrentDoc( const String& rDocName ); diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 16b7d6bc93bf..14d5ed5eda87 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -183,8 +183,8 @@ private: std::vector maConditions; long nScrollPos; - com::sun::star::uno::Sequence maImplNames; - com::sun::star::uno::Sequence maDescriptions; + com::sun::star::uno::Sequence maImplNames; + com::sun::star::uno::Sequence maDescriptions; String maEngine; com::sun::star::uno::Sequence maProperties; diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index aec2dcba9d45..ecc406e1438b 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -80,12 +80,12 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; MoreButton aBtnMore; - const rtl::OUString aStrUndefined; - const rtl::OUString aStrNone; - const rtl::OUString aStrEmpty; - const rtl::OUString aStrNotEmpty; - const rtl::OUString aStrRow; - const rtl::OUString aStrColumn; + const OUString aStrUndefined; + const OUString aStrNone; + const OUString aStrEmpty; + const OUString aStrNotEmpty; + const OUString aStrRow; + const OUString aStrColumn; const sal_uInt16 nWhichQuery; const ScQueryParam theQueryData; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 6aa56a57f54f..c02cb5c6a142 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -60,7 +60,7 @@ private: class ScDPFunctionDlg : public ModalDialog { - typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > NameMapType; + typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; public: explicit ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); @@ -71,8 +71,8 @@ public: private: void Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); - const ::rtl::OUString& GetBaseFieldName(const ::rtl::OUString& rLayoutName) const; - const ::rtl::OUString& GetBaseItemName(const ::rtl::OUString& rLayoutName) const; + const OUString& GetBaseFieldName(const OUString& rLayoutName) const; + const OUString& GetBaseItemName(const OUString& rLayoutName) const; /** Searches for a listbox entry, starts search at specified position. */ sal_uInt16 FindBaseItemPos( const String& rEntry, sal_uInt16 nStartPos ) const; @@ -162,7 +162,7 @@ private: void Init( const ScDPNameVec& rDataFields, bool bEnableLayout ); void InitHideListBox(); - const ::rtl::OUString& GetFieldName(const ::rtl::OUString& rLayoutName) const; + const OUString& GetFieldName(const OUString& rLayoutName) const; /** Searches for a listbox entry, starts search at specified position. */ sal_uInt16 FindListBoxEntry( const ListBox& rLBox, const String& rEntry, sal_uInt16 nStartPos ) const; @@ -203,7 +203,7 @@ private: ScDPObject& mrDPObj; /// The DataPilot object (for member names). ScDPLabelData maLabelData; /// Cache for members data. - typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > NameMapType; + typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; NameMapType maDataFieldNameMap; /// Cache for displayed name to field name mapping. }; @@ -221,7 +221,7 @@ public: * be different from the name displayed in the dialog if the field * has a layout name. */ - ::rtl::OUString GetDimensionName() const; + OUString GetDimensionName() const; private: DECL_LINK( DblClickHdl, ListBox* ); diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index 31bed6b4bfaf..89c36b0b0231 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -133,7 +133,7 @@ protected: private: /** Returns the localized function name for the specified (1-based) resource index. */ - inline const rtl::OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx-1]; } + inline const OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx-1]; } /** Fills the field windows from the current pivot table settings. */ void InitFieldWindows(); @@ -145,9 +145,9 @@ private: void InitFieldWindow ( const ::std::vector& rFields, ScPivotFieldType eType ); void AdjustDlgSize(); ScDPLabelData* GetLabelData( SCCOL nCol ); - rtl::OUString GetLabelString(SCsCOL nCol); + OUString GetLabelString(SCsCOL nCol); bool IsOrientationAllowed( SCsCOL nCol, ScPivotFieldType eType ); - rtl::OUString GetFuncString( sal_uInt16& rFuncMask, bool bIsValue = true ); + OUString GetFuncString( sal_uInt16& rFuncMask, bool bIsValue = true ); void AddField ( size_t nFromIndex, ScPivotFieldType eToType, const Point& rAtPos ); @@ -231,8 +231,8 @@ private: PushButton maBtnRemove; PushButton maBtnOptions; MoreButton maBtnMore; - std::vector maFuncNames; /// Localized function names from resource. - boost::ptr_vector maRefStrs; /// Reference strings stored with the output list box. + std::vector maFuncNames; /// Localized function names from resource. + boost::ptr_vector maRefStrs; /// Reference strings stored with the output list box. ScDPObjectPtr mxDlgDPObject; /// Clone of the pivot table object this dialog is based on. ScPivotParam maPivotData; /// The pivot table field configuration. ScDPLabelDataVector maLabelData; /// Information about all dimensions. @@ -241,9 +241,9 @@ private: ScDocument* mpDoc; formula::RefEdit* mpRefInputEdit; - const rtl::OUString maStrUndefined; - const rtl::OUString maStrNewTable; - rtl::OUString maOutputRefStr; /// Used only for caching in UI. + const OUString maStrUndefined; + const OUString maStrNewTable; + OUString maOutputRefStr; /// Used only for caching in UI. ScPivotFieldType meDnDFromType; size_t mnDnDFromIndex; diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 76f016be60cf..dbf6f9729265 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -110,7 +110,7 @@ private: struct TableItem { - rtl::OUString maName; + OUString maName; TabProtectionPtr mpProtect; }; ::std::vector maTableItems; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 61f07f01e730..c1b1e2573d00 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -36,10 +36,10 @@ public: ScNewScenarioDlg( Window* pParent, const String& rName, sal_Bool bEdit = false, sal_Bool bSheetProtected = false ); ~ScNewScenarioDlg(); - void SetScenarioData( const rtl::OUString& rName, const rtl::OUString& rComment, + void SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ); - void GetScenarioData( rtl::OUString& rName, rtl::OUString& rComment, + void GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const; private: diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index b017a56fb151..57e537a02436 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -35,7 +35,7 @@ class ScImportAsciiDlg : public ModalDialog sal_uLong* mpRowPosArray; sal_uLong mnRowPosCount; - rtl::OUString maPreviewLine[ CSV_PREVIEW_LINES ]; + OUString maPreviewLine[ CSV_PREVIEW_LINES ]; FixedText* pFtCharSet; @@ -101,7 +101,7 @@ private: void SetupSeparatorCtrls(); - bool GetLine( sal_uLong nLine, rtl::OUString &rText ); + bool GetLine( sal_uLong nLine, OUString &rText ); void UpdateVertical(); inline bool Seek( sal_uLong nPos ); // synced to and from mnStreamPos diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 5af3416b04e7..9e9772968474 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -30,7 +30,7 @@ public: ~ScAutoFormatDlg(); sal_uInt16 GetIndex() const { return nIndex; } - rtl::OUString GetCurrFormatName(); + OUString GetCurrFormatName(); private: FixedLine aFlFormat; diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 6b54c98be0e2..205ed0151a42 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -45,7 +45,7 @@ public: /** Sets dialog title, fixed text for listbox and help IDs. */ void SetDescription( const String& rTitle, const String& rFixedText, - const ::rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ); + const OString& nDlgHelpId, const OString& nLbHelpId ); /** Inserts a string into the ListBox. */ void Insert( const String& rString, sal_Bool bSelected ); diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 9e098fdcd339..d79cb2b21ad0 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -48,8 +48,8 @@ class ScSolverOptionsDialog : public ModalDialog CancelButton maBtnCancel; SvLBoxButtonData* mpCheckButtonData; - com::sun::star::uno::Sequence maImplNames; - com::sun::star::uno::Sequence maDescriptions; + com::sun::star::uno::Sequence maImplNames; + com::sun::star::uno::Sequence maDescriptions; String maEngine; com::sun::star::uno::Sequence maProperties; @@ -64,8 +64,8 @@ class ScSolverOptionsDialog : public ModalDialog public: ScSolverOptionsDialog( Window* pParent, - const com::sun::star::uno::Sequence& rImplNames, - const com::sun::star::uno::Sequence& rDescriptions, + const com::sun::star::uno::Sequence& rImplNames, + const com::sun::star::uno::Sequence& rDescriptions, const String& rEngine, const com::sun::star::uno::Sequence& rProperties ); ~ScSolverOptionsDialog(); diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx index ee1659a15d81..11252978c387 100644 --- a/sc/source/ui/inc/solverutil.hxx +++ b/sc/source/ui/inc/solverutil.hxx @@ -32,10 +32,10 @@ namespace com { namespace sun { namespace star { class ScSolverUtil { public: - static void GetImplementations( com::sun::star::uno::Sequence& rImplNames, - com::sun::star::uno::Sequence& rDescriptions ); - static com::sun::star::uno::Reference GetSolver( const rtl::OUString& rImplName ); - static com::sun::star::uno::Sequence GetDefaults( const rtl::OUString& rImplName ); + static void GetImplementations( com::sun::star::uno::Sequence& rImplNames, + com::sun::star::uno::Sequence& rDescriptions ); + static com::sun::star::uno::Reference GetSolver( const OUString& rImplName ); + static com::sun::star::uno::Sequence GetDefaults( const OUString& rImplName ); }; #endif diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index 05f25d010f53..1c302c95eae0 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -35,10 +35,10 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - const rtl::OString& sHelpId, const rtl::OString& sEditHelpId ); + const OString& sHelpId, const OString& sEditHelpId ); ~ScStringInputDlg(); - void GetInputString( rtl::OUString& rString ) const; + void GetInputString( OUString& rString ) const; private: FixedText aFtEditTitle; diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index fdfcac5daf72..73f6127610ac 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -34,7 +34,7 @@ public: const String& rTitle, const String& rTabBgColorNoColorText, const Color& rDefaultColor, - const rtl::OString& nHelpId ); + const OString& nHelpId ); ~ScTabBgColorDlg(); void GetSelectedColor( Color& rColor ) const; @@ -57,7 +57,7 @@ private: HelpButton aBtnHelp; Color aTabBgColor; const String aTabBgColorNoColorText; - rtl::OString msHelpId; + OString msHelpId; void FillColorValueSets_Impl(); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index eb3550ad9805..06cd9c8b967c 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -176,10 +176,10 @@ private: String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; // ugly hack for Add button in ScNameDlg - boost::ptr_map maRangeMap; + boost::ptr_map maRangeMap; bool mbInSwitch; - rtl::OUString maName; - rtl::OUString maScope; + OUString maName; + OUString maScope; private: void Construct( sal_uInt8 nForceDesignMode = SC_FORCEMODE_NONE ); diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 8249cdf61dd8..962f62b28e34 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -64,7 +64,7 @@ private: Edit aEdSheetPrefix; // Stores old Sheet Prefix - ::rtl::OUString maOldPrefixValue; + OUString maOldPrefixValue; }; #endif diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index b895235c1c7b..0b613169a242 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -48,7 +48,7 @@ private: void UpdateCustomCalcRadioButtons(bool bDefault); void LaunchCustomCalcSettings(); - bool IsValidSeparator(const ::rtl::OUString& rSep) const; + bool IsValidSeparator(const OUString& rSep) const; bool IsValidSeparatorSet() const; DECL_LINK( ButtonHdl, Button* ); @@ -83,7 +83,7 @@ private: /** Stores old separator value of currently focused separator edit box. This value is used to revert undesired value change. */ - ::rtl::OUString maOldSepValue; + OUString maOldSepValue; ScCalcConfig maSavedConfig; ScCalcConfig maCurrentConfig; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 468f6fd5f7e2..08c5854b476a 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -56,8 +56,8 @@ protected: SvxCheckListBox aLbColumns; FixedText aFtFunctions; ListBox aLbFunctions; - const rtl::OUString aStrNone; - const rtl::OUString aStrColumn; + const OUString aStrNone; + const OUString aStrColumn; ScViewData* pViewData; ScDocument* pDoc; diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index f5c17cdf3044..470e7d3bdf4a 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -56,7 +56,7 @@ public: virtual void Repeat( SfxRepeatTarget& rTarget ); virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; virtual sal_Bool Merge( SfxUndoAction *pNextAction ); @@ -89,7 +89,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aEffRange; @@ -120,7 +120,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: sal_Bool bRows; @@ -152,7 +152,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -201,7 +201,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -235,7 +235,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aSrcRange; @@ -268,7 +268,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aRange; @@ -302,7 +302,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aRange; @@ -341,7 +341,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; ScEditDataArray* GetDataArray(); private: @@ -379,7 +379,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -415,7 +415,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aSource; @@ -447,7 +447,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScCellMergeOption maOption; @@ -474,7 +474,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; // deleted data @@ -500,7 +500,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aCursorPos; @@ -535,7 +535,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRange aRange; @@ -565,7 +565,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -595,7 +595,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -625,7 +625,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -650,7 +650,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -676,7 +676,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; virtual sal_uInt16 GetId() const; private: @@ -702,7 +702,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -725,7 +725,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; @@ -753,7 +753,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aDocName; @@ -781,7 +781,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aDocName; @@ -815,7 +815,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aOldDoc; @@ -851,7 +851,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -873,7 +873,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -895,7 +895,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScMarkData aMarkData; @@ -917,7 +917,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -939,7 +939,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: void SetCurTab(); @@ -965,7 +965,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pUndoDoc; diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index c6e0ae0037c5..38651c863f1d 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -51,7 +51,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; /** once the objects are passed to this class, their life-cycle is managed by this class; the calling function must pass new'ed @@ -101,7 +101,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ValuesType maOldValues; @@ -131,7 +131,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aPos; @@ -182,7 +182,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOL nCol; @@ -207,7 +207,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -234,7 +234,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOL nCol; @@ -282,7 +282,7 @@ public: virtual void Repeat( SfxRepeatTarget& rTarget ); virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: void DoInsertNote( const ScNoteData& rNoteData ); @@ -310,7 +310,7 @@ public: virtual void Repeat( SfxRepeatTarget& rTarget ); virtual sal_Bool CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress maPos; @@ -333,7 +333,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: sal_Bool bIsDelete; @@ -358,7 +358,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScRangeName* pOldRanges; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 48622e3de325..e4d28396717b 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -57,7 +57,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOLROW nStart; @@ -87,7 +87,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -113,7 +113,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCCOLROW nStart; @@ -142,7 +142,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -168,7 +168,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -193,7 +193,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -219,7 +219,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -248,7 +248,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -275,7 +275,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SdrUndoAction* pDrawUndo; @@ -294,7 +294,7 @@ private: class ScUndoAutoFilter: public ScDBFuncUndo { private: - ::rtl::OUString aDBName; + OUString aDBName; bool bFilterSet; void DoChange( bool bUndo ); @@ -302,7 +302,7 @@ private: public: TYPEINFO(); ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange, - const ::rtl::OUString& rName, bool bSet ); + const OUString& rName, bool bSet ); virtual ~ScUndoAutoFilter(); virtual void Undo(); @@ -310,7 +310,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; @@ -327,7 +327,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDBCollection* pUndoColl; @@ -351,7 +351,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -384,7 +384,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScAddress aBlockStart; @@ -416,7 +416,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScDocument* pOldUndoDoc; @@ -443,7 +443,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScArea aDestArea; @@ -473,7 +473,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aChartName; @@ -509,7 +509,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: boost::scoped_ptr mpMarkData; diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 7ae1c747c6a7..59bc7c8197d7 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -72,7 +72,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; class ScUndoApplyPageStyle: public ScSimpleUndo @@ -89,7 +89,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: struct ApplyStyleEntry diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 25e688821354..a1fa0f59d263 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -60,7 +60,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String sNewName; @@ -79,7 +79,7 @@ public: ScUndoInsertTables( ScDocShell* pNewDocShell, SCTAB nTabNum, - std::vector& newNameList); + std::vector& newNameList); virtual ~ScUndoInsertTables(); virtual void Undo(); @@ -87,12 +87,12 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SdrUndoAction* pDrawUndo; - std::vector aNameList; + std::vector aNameList; sal_uLong nStartChangeAction; sal_uLong nEndChangeAction; SCTAB nTab; @@ -117,7 +117,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: std::vector theTabs; @@ -144,7 +144,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -163,8 +163,8 @@ public: ScDocShell* pNewDocShell, ::std::vector* pOldTabs, ::std::vector* pNewTabs, - ::std::vector< ::rtl::OUString>* pOldNames = NULL, - ::std::vector< ::rtl::OUString>* pNewNames = NULL ); + ::std::vector< OUString>* pOldNames = NULL, + ::std::vector< OUString>* pNewNames = NULL ); virtual ~ScUndoMoveTab(); @@ -173,13 +173,13 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ::boost::shared_ptr< ::std::vector > mpOldTabs; ::boost::shared_ptr< ::std::vector > mpNewTabs; - ::boost::shared_ptr< ::std::vector< ::rtl::OUString> > mpOldNames; - ::boost::shared_ptr< ::std::vector< ::rtl::OUString> > mpNewNames; + ::boost::shared_ptr< ::std::vector< OUString> > mpOldNames; + ::boost::shared_ptr< ::std::vector< OUString> > mpNewNames; void DoChange( sal_Bool bUndo ) const; }; @@ -193,7 +193,7 @@ public: ScDocShell* pNewDocShell, ::std::vector* pOldTabs, ::std::vector* pNewTabs, - ::std::vector< ::rtl::OUString>* pNewNames = NULL ); + ::std::vector< OUString>* pNewNames = NULL ); virtual ~ScUndoCopyTab(); @@ -202,12 +202,12 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ::boost::shared_ptr< ::std::vector > mpOldTabs; ::boost::shared_ptr< ::std::vector > mpNewTabs; - ::boost::shared_ptr< ::std::vector< ::rtl::OUString> > mpNewNames; + ::boost::shared_ptr< ::std::vector< OUString> > mpNewNames; SdrUndoAction* pDrawUndo; void DoChange() const; @@ -232,7 +232,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: ScUndoTabColorInfo::List aTabColorList; @@ -257,7 +257,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: boost::scoped_ptr mpMarkData; @@ -285,7 +285,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -311,7 +311,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aDocName; @@ -342,7 +342,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: std::vector undoTabs; @@ -368,7 +368,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -396,7 +396,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB mnTab; @@ -421,7 +421,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -450,7 +450,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; @@ -480,7 +480,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String aPersistName; // to find object (works only for OLE objects) @@ -503,7 +503,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: SCTAB nTab; diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 5229b992467c..c0e8f07e623d 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -129,7 +129,7 @@ public: sal_Bool bLink = false, sal_Bool bAllowDialogs = false ); sal_Bool PasteFile( const Point&, const String&, sal_Bool bLink=false ); - sal_Bool PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const ::rtl::OUString& = ::rtl::OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); + sal_Bool PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const OUString& = OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); sal_Bool PasteBitmap( const Point&, const Bitmap& ); sal_Bool PasteMetaFile( const Point&, const GDIMetaFile& ); sal_Bool PasteGraphic( const Point& rPos, const Graphic& rGraphic, @@ -248,7 +248,7 @@ public: void TabOp( const ScTabOpParam& rParam, sal_Bool bRecord = sal_True ); sal_Bool InsertTable( const String& rName, SCTAB nTabNr, sal_Bool bRecord = sal_True ); - sal_Bool InsertTables(std::vector& aNames, SCTAB nTab, SCTAB nCount, sal_Bool bRecord = sal_True); + sal_Bool InsertTables(std::vector& aNames, SCTAB nTab, SCTAB nCount, sal_Bool bRecord = sal_True); sal_Bool AppendTable( const String& rName, sal_Bool bRecord = sal_True ); @@ -258,7 +258,7 @@ public: bool DeleteTables(SCTAB nTab, SCTAB nSheets); sal_Bool RenameTable( const String& rName, SCTAB nTabNr ); - void MoveTable( sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const rtl::OUString* pNewTabName = NULL ); + void MoveTable( sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const OUString* pNewTabName = NULL ); void ImportTables( ScDocShell* pSrcShell, SCTAB nCount, const SCTAB* pSrcTabs, sal_Bool bLink,SCTAB nTab); @@ -317,7 +317,7 @@ public: void DetectiveMarkPred(); void DetectiveMarkSucc(); - void InsertCurrentTime(short nCellFmt, const ::rtl::OUString& rUndoStr); + void InsertCurrentTime(short nCellFmt, const OUString& rUndoStr); void ShowNote( bool bShow = true ); inline void HideNote() { ShowNote( false ); } diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 95f379e3c9ba..7c227d67260a 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -51,7 +51,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg Image maImgFileOpen; - rtl::OUString maSrcPath; + OUString maSrcPath; ScOrcusXMLTreeParam maXMLParam; std::set maCellLinks; diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 9345776aabe3..0912abb57298 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -211,8 +211,8 @@ void ScAcceptChgDlg::Init() pChanges->SetModifiedLink( LINK( this, ScAcceptChgDlg,ChgTrackModHdl)); aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser()); pTPFilter->ClearAuthors(); - const std::set& rUserColl = pChanges->GetUserCollection(); - std::set::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end(); + const std::set& rUserColl = pChanges->GetUserCollection(); + std::set::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end(); for (; it != itEnd; ++it) pTPFilter->InsertAuthor(*it); } @@ -271,9 +271,9 @@ void ScAcceptChgDlg::ClearView() pTheView->SetUpdateMode(true); } -rtl::OUString* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType) +OUString* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType) { - rtl::OUString* pStr; + OUString* pStr; switch(eType) { @@ -304,7 +304,7 @@ bool ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) DateTime aDateTime=pScChangeAction->GetDateTime(); ScChangeActionType eType=pScChangeAction->GetType(); - rtl::OUString aDesc; + OUString aDesc; String aComment = comphelper::string::remove(pScChangeAction->GetComment(), '\n'); @@ -359,10 +359,10 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeAction( String aUser=pScChangeAction->GetUser(); DateTime aDateTime=pScChangeAction->GetDateTime(); - rtl::OUString aRefStr; + OUString aRefStr; ScChangeActionType eType=pScChangeAction->GetType(); - rtl::OUStringBuffer aBuf; - rtl::OUString aDesc; + OUStringBuffer aBuf; + OUString aDesc; ScRedlinData* pNewData=new ScRedlinData; pNewData->pData=(void *)pScChangeAction; @@ -536,10 +536,10 @@ SvTreeListEntry* ScAcceptChgDlg::InsertFilteredAction( if(bFlag) { - rtl::OUString aRefStr; + OUString aRefStr; ScChangeActionType eType=pScChangeAction->GetType(); String aString; - rtl::OUString aDesc; + OUString aDesc; ScRedlinData* pNewData=new ScRedlinData; pNewData->pData=(void *)pScChangeAction; @@ -655,14 +655,14 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionC bFlag=true; } - rtl::OUString aRefStr; + OUString aRefStr; String aString; String a2String; String aDesc; if(nSpecial==RD_SPECIAL_CONTENT) { - rtl::OUString aTmp; + OUString aTmp; pScChangeAction->GetOldString(aTmp); a2String = aTmp; if(a2String.Len()==0) a2String=aStrEmpty; @@ -676,7 +676,7 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionC } else { - rtl::OUString aTmp; + OUString aTmp; pScChangeAction->GetNewString(aTmp); a2String = aTmp; if(a2String.Len()==0) @@ -1225,8 +1225,8 @@ bool ScAcceptChgDlg::InsertAcceptedORejected(SvTreeListEntry* pParent) bool bTheTestFlag = true; ScChangeActionState eState = SC_CAS_VIRGIN; - rtl::OUString aString = pTheView->GetEntryText(pParent); - rtl::OUString a2String = aString.copy(0, aStrAllAccepted.getLength()); + OUString aString = pTheView->GetEntryText(pParent); + OUString a2String = aString.copy(0, aStrAllAccepted.getLength()); if (a2String.equals(aStrAllAccepted)) eState=SC_CAS_ACCEPTED; else @@ -1793,7 +1793,7 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo) if ( pInfo->aExtraString.Len() ) { xub_StrLen nPos = pInfo->aExtraString.Search( - rtl::OUString("AcceptChgDat:")); + OUString("AcceptChgDat:")); // Versuche, den Alignment-String "ALIGN:(...)" einzulesen; wenn // er nicht vorhanden ist, liegt eine "altere Version vor diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 6acaa05a4b47..57e996b843f7 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -426,7 +426,7 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume long nTabs[] = { 3, 10, 216, 266 }; maLbConflicts.SetTabs( nTabs ); - rtl::OUString aTab('\t'); + OUString aTab('\t'); String aHeader( maStrTitleConflict ); aHeader += aTab; aHeader += maStrTitleAuthor; @@ -464,7 +464,7 @@ ScConflictsDlg::~ScConflictsDlg() String ScConflictsDlg::GetConflictString( const ScConflictsListEntry& rConflictEntry ) { - rtl::OUString aString; + OUString aString; if ( mpOwnTrack ) { const ScChangeAction* pAction = mpOwnTrack->GetAction( rConflictEntry.maOwnActions[ 0 ] ); @@ -485,7 +485,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen OSL_ENSURE( pDoc, "ScConflictsDlg::GetActionString(): pDoc is null!" ); if ( pAction && pDoc ) { - rtl::OUString aDesc; + OUString aDesc; pAction->GetDescription(aDesc, pDoc, true, false); aString += String(aDesc); aString += '\t'; diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index cb54ef3dc29f..3e32d91db7ab 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -501,7 +501,7 @@ void ScColRowNameRangesDlg::UpdateNames() const ScAddress::Details aDetails(pDoc->GetAddressConvention()); String aString; - rtl::OUString strDelim(" --- "); + OUString strDelim(" --- "); aString = strDelim; aString += ScGlobal::GetRscString( STR_COLUMN ); aString += strDelim; diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index f9850c668c10..69e03e84014b 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -43,7 +43,6 @@ #define HDL(hdl) LINK( this, ScDataFormDlg, hdl ) -using ::rtl::OUStringBuffer; //zhangyun ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShellOri) : diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 1a33388122ca..339cb03cf024 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -48,7 +48,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, - const rtl::OUString& aStartStr, + const OUString& aStartStr, double fStep, double fMax, sal_uInt16 nPossDir ) @@ -219,7 +219,7 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) bool ScFillSeriesDlg::CheckStartVal() { bool bValOk = false; - rtl::OUString aStr = aEdStartVal.GetText(); + OUString aStr = aEdStartVal.GetText(); if ( aStr.isEmpty() || aBtnAutoFill.IsChecked()) { @@ -240,7 +240,7 @@ bool ScFillSeriesDlg::CheckStartVal() bool ScFillSeriesDlg::CheckIncrementVal() { sal_uInt32 nKey = 0; - rtl::OUString aStr = aEdIncrement.GetText(); + OUString aStr = aEdIncrement.GetText(); return rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fIncrement ); } @@ -251,7 +251,7 @@ bool ScFillSeriesDlg::CheckIncrementVal() bool ScFillSeriesDlg::CheckEndVal() { bool bValOk = false; - rtl::OUString aStr = aEdEndVal.GetText(); + OUString aStr = aEdEndVal.GetText(); if (aStr.isEmpty()) { diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 58012cfc7862..dc40bef8a095 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -96,8 +96,8 @@ void ScHighlightChgDlg::Init() { aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser()); aFilterCtr.ClearAuthors(); - const std::set& rUserColl = pChanges->GetUserCollection(); - std::set::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end(); + const std::set& rUserColl = pChanges->GetUserCollection(); + std::set::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end(); for (; it != itEnd; ++it) aFilterCtr.InsertAuthor(*it); } diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index c229a2644a82..71eaca271b2e 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -98,7 +98,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) if(nTableCount==1) { - rtl::OUString aName; + OUString aName; rDoc.CreateValidTabName( aName ); m_pEdName->SetText( aName ); } @@ -194,7 +194,7 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) if ( pSrcDoc ) { SCTAB nCount = pSrcDoc->GetTableCount(); - rtl::OUString aName; + OUString aName; for ( SCTAB i=0; i(m_pNfCount->GetValue()); if ( nTableCount==1) { - rtl::OUString aName; + OUString aName; rDoc.CreateValidTabName( aName ); m_pEdName->SetText( aName ); m_pFtName->Enable(); @@ -296,7 +296,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) if ( pDocInserter ) delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( - rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); + OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScInsertTableDlg, DialogClosedHdl ) ); return 0; } diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 949691b3ab3d..6e448ca072be 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -102,14 +102,14 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl) { if ( !pDocInserter ) pDocInserter = new sfx2::DocumentInserter( - rtl::OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); + OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg, DialogClosedHdl ) ); return 0; } IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) { - rtl::OUString aEntered = aCbUrl.GetURL(); + OUString aEntered = aCbUrl.GetURL(); if (pSourceShell) { SfxMedium* pMed = pSourceShell->GetMedium(); @@ -120,8 +120,8 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) } } - rtl::OUString aFilter; - rtl::OUString aOptions; + OUString aFilter; + OUString aOptions; // get filter name by looking at the file content (bWithContent = true) // Break operation if any error occurred inside. if (!ScDocumentLoader::GetFilterName( aEntered, aFilter, aOptions, true, true )) @@ -129,7 +129,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) // #i53241# replace HTML filter with DataQuery filter if (aFilter.equalsAscii(FILTERNAME_HTML)) - aFilter = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FILTERNAME_QUERY)); + aFilter = OUString(RTL_CONSTASCII_USTRINGPARAM(FILTERNAME_QUERY)); LoadDocument( aEntered, aFilter, aOptions ); @@ -138,7 +138,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) return 0; } -void ScLinkedAreaDlg::LoadDocument( const rtl::OUString& rFile, const String& rFilter, const String& rOptions ) +void ScLinkedAreaDlg::LoadDocument( const OUString& rFile, const String& rFilter, const String& rOptions ) { if ( pSourceShell ) { @@ -152,8 +152,8 @@ void ScLinkedAreaDlg::LoadDocument( const rtl::OUString& rFile, const String& rF { WaitObject aWait( this ); - rtl::OUString aNewFilter = rFilter; - rtl::OUString aNewOptions = rOptions; + OUString aNewFilter = rFilter; + OUString aNewOptions = rOptions; SfxErrorContext aEc( ERRCTX_SFX_OPENDOC, rFile ); @@ -224,8 +224,8 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg WaitObject aWait( this ); // replace HTML filter with DataQuery filter - const rtl::OUString aHTMLFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_HTML ) ); - const rtl::OUString aWebQFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_QUERY ) ); + const OUString aHTMLFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_HTML ) ); + const OUString aWebQFilterName( RTL_CONSTASCII_USTRINGPARAM( FILTERNAME_QUERY ) ); const SfxFilter* pFilter = pMed->GetFilter(); if (pFilter && aHTMLFilterName.equals(pFilter->GetFilterName())) @@ -283,7 +283,7 @@ void ScLinkedAreaDlg::UpdateSourceRanges() { ScAreaNameIterator aIter( pSourceShell->GetDocument() ); ScRange aDummy; - rtl::OUString aName; + OUString aName; while ( aIter.Next( aName, aDummy ) ) aLbRanges.InsertEntry( aName ); } @@ -304,7 +304,7 @@ void ScLinkedAreaDlg::UpdateEnable() aFtSeconds.Enable( bReload ); } -rtl::OUString ScLinkedAreaDlg::GetURL() +OUString ScLinkedAreaDlg::GetURL() { if (pSourceShell) { @@ -314,29 +314,29 @@ rtl::OUString ScLinkedAreaDlg::GetURL() return EMPTY_STRING; } -rtl::OUString ScLinkedAreaDlg::GetFilter() +OUString ScLinkedAreaDlg::GetFilter() { if (pSourceShell) { SfxMedium* pMed = pSourceShell->GetMedium(); return pMed->GetFilter()->GetFilterName(); } - return rtl::OUString(); + return OUString(); } -rtl::OUString ScLinkedAreaDlg::GetOptions() +OUString ScLinkedAreaDlg::GetOptions() { if (pSourceShell) { SfxMedium* pMed = pSourceShell->GetMedium(); return ScDocumentLoader::GetOptions( *pMed ); } - return rtl::OUString(); + return OUString(); } -rtl::OUString ScLinkedAreaDlg::GetSource() +OUString ScLinkedAreaDlg::GetSource() { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_uInt16 nCount = aLbRanges.GetSelectEntryCount(); for (sal_uInt16 i=0; iCreateValidTabName(aStr); aEdTabName.SetText(aStr); } @@ -156,7 +156,7 @@ void ScMoveTableDlg::ResetRenameInput() void ScMoveTableDlg::CheckNewTabName() { - const rtl::OUString aNewName = aEdTabName.GetText(); + const OUString aNewName = aEdTabName.GetText(); if (aNewName.isEmpty()) { // New sheet name is empty. This is not good. @@ -296,19 +296,19 @@ IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl) { // Return an empty string when the new name is the same as the // automatic name assigned by the document. - rtl::OUString aCopyName = maDefaultName; + OUString aCopyName = maDefaultName; ScDocument* pDoc = GetSelectedDoc(); if (pDoc) pDoc->CreateValidTabName(aCopyName); - if (aCopyName == rtl::OUString(aEdTabName.GetText())) - aEdTabName.SetText( rtl::OUString() ); + if (aCopyName == OUString(aEdTabName.GetText())) + aEdTabName.SetText( OUString() ); } else { // Return an empty string, when the new name is the same as the // original name. if (maDefaultName.equals(aEdTabName.GetText())) - aEdTabName.SetText(rtl::OUString()); + aEdTabName.SetText(OUString()); } EndDialog( RET_OK ); @@ -321,7 +321,7 @@ IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox *, pLb ) if ( pLb == &aLbDoc ) { ScDocument* pDoc = GetSelectedDoc(); - rtl::OUString aName; + OUString aName; aLbTable.Clear(); aLbTable.SetUpdateMode( false ); diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 386f6a5cf09a..84788a52e656 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -284,8 +284,8 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) // Get the "Delete Rows" commandimagelist images from sfx instead of // adding a second copy to sc (see ScTbxInsertCtrl::StateChanged) - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_DEL_ROWS ) ); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( SID_DEL_ROWS ) ); uno::Reference xFrame = GetBindings().GetActiveFrame(); Image aDelNm = ::GetImage( xFrame, aSlotURL, false ); @@ -373,7 +373,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) else { maRbMax.Check(); - rtl::OUString aCursorStr; + OUString aCursorStr; if ( !mpDoc->GetRangeAtBlock( ScRange(rCursorPos), &aCursorStr ) ) rCursorPos.Format( aCursorStr, SCA_ABS, NULL, mpDoc->GetAddressConvention() ); maEdObjectiveCell.SetRefString( aCursorStr ); @@ -487,7 +487,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( bSingle ) aNewRef.aEnd = aAdr; - rtl::OUString aName; + OUString aName; if ( pDocP->GetRangeAtBlock( aNewRef, &aName ) ) // named range: show name aStr = aName; else // format cell/range reference @@ -1038,7 +1038,7 @@ bool ScOptSolverDlg::CallSolver() // return true -> close dialog after cal } else { - rtl::OUString aError; + OUString aError; uno::Reference xDesc( xSolver, uno::UNO_QUERY ); if ( xDesc.is() ) aError = xDesc->getStatusDescription(); // error description from component diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 8cb6c7bd0754..9864bb3dbb51 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -98,7 +98,7 @@ void ScRedComDialog::ReInit(ScChangeAction *pAction) pChangeAction=pAction; if(pChangeAction!=NULL && pDocShell !=NULL) { - rtl::OUString aTitle; + OUString aTitle; pChangeAction->GetDescription( aTitle, pDocShell->GetDocument()); pDlg->SetText(aTitle); aComment=pChangeAction->GetComment(); diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index e15b9b887c3c..4ddc2f6d3818 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -235,7 +235,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) if ( !bFmtInserted && pSelFmtData ) { String aStrStandard( SfxResId(STR_STANDARD) ); - rtl::OUString aFormatName; + OUString aFormatName; ScStringInputDlg* pDlg; bool bOk = false; @@ -348,7 +348,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) while( !bOk ) { - rtl::OUString aFormatName = aLbFormat.GetSelectEntry(); + OUString aFormatName = aLbFormat.GetSelectEntry(); String aEntry; ScStringInputDlg* pDlg = new ScStringInputDlg( this, @@ -453,10 +453,10 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) //------------------------------------------------------------------------ -rtl::OUString ScAutoFormatDlg::GetCurrFormatName() +OUString ScAutoFormatDlg::GetCurrFormatName() { const ScAutoFormatData* p = pFormat->findByIndex(nIndex); - return p ? p->GetName() : rtl::OUString(); + return p ? p->GetName() : OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index efb2abbcaa11..12a72e0ee82d 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -112,8 +112,8 @@ void ScShareDocumentDlg::UpdateView() try { ::svt::ShareControlFile aControlFile( mpDocShell->GetSharedFileURL() ); - uno::Sequence< uno::Sequence< ::rtl::OUString > > aUsersData = aControlFile.GetUsersData(); - const uno::Sequence< ::rtl::OUString >* pUsersData = aUsersData.getConstArray(); + uno::Sequence< uno::Sequence< OUString > > aUsersData = aControlFile.GetUsersData(); + const uno::Sequence< OUString >* pUsersData = aUsersData.getConstArray(); sal_Int32 nLength = aUsersData.getLength(); if ( nLength > 0 ) @@ -139,10 +139,10 @@ void ScShareDocumentDlg::UpdateView() } // parse the edit time string of the format "DD.MM.YYYY hh:mm" - ::rtl::OUString aDateTimeStr = pUsersData[i][SHARED_EDITTIME_ID]; + OUString aDateTimeStr = pUsersData[i][SHARED_EDITTIME_ID]; sal_Int32 nIndex = 0; - ::rtl::OUString aDateStr = aDateTimeStr.getToken( 0, ' ', nIndex ); - ::rtl::OUString aTimeStr = aDateTimeStr.getToken( 0, ' ', nIndex ); + OUString aDateStr = aDateTimeStr.getToken( 0, ' ', nIndex ); + OUString aTimeStr = aDateTimeStr.getToken( 0, ' ', nIndex ); nIndex = 0; sal_uInt16 nDay = sal::static_int_cast< sal_uInt16 >( aDateStr.getToken( 0, '.', nIndex ).toInt32() ); sal_uInt16 nMonth = sal::static_int_cast< sal_uInt16 >( aDateStr.getToken( 0, '.', nIndex ).toInt32() ); @@ -189,7 +189,7 @@ void ScShareDocumentDlg::UpdateView() if ( aUser.Len() == 0 ) { // get sys user name - ::rtl::OUString aUserName; + OUString aUserName; ::osl::Security aSecurity; aSecurity.getUserName( aUserName ); aUser = aUserName; diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 51d3cc36e710..ae3f4877697f 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -52,7 +52,7 @@ ScShowTabDlg::ScShowTabDlg( Window* pParent ) : void ScShowTabDlg::SetDescription( const String& rTitle, const String& rFixedText, - const rtl::OString& rDlgHelpId, const rtl::OString& sLbHelpId ) + const OString& rDlgHelpId, const OString& sLbHelpId ) { SetText( rTitle ); aFtLbTitle.SetText( rFixedText ); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 2d660778915a..c7c45cbeaa24 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star; struct ScSolverOptionsEntry { sal_Int32 nPosition; - rtl::OUString aDescription; + OUString aDescription; ScSolverOptionsEntry() : nPosition(0) {} @@ -93,13 +93,13 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); - rtl::OUString sTxt( ' ' ); + OUString sTxt( ' ' ); if ( mbIsDouble ) sTxt += rtl::math::doubleToUString( mfDoubleValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, ScGlobal::GetpLocaleData()->getNumDecimalSep()[0], true ); else - sTxt += rtl::OUString::valueOf(mnIntValue); + sTxt += OUString::valueOf(mnIntValue); rDev.SetFont( aFont ); rDev.DrawText( aNewPos, sTxt ); @@ -109,8 +109,8 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const //------------------------------------------------------------------ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, - const uno::Sequence& rImplNames, - const uno::Sequence& rDescriptions, + const uno::Sequence& rImplNames, + const uno::Sequence& rDescriptions, const String& rEngine, const uno::Sequence& rProperties ) : ModalDialog( pParent, ScResId( RID_SCDLG_SOLVEROPTIONS ) ), @@ -231,8 +231,8 @@ void ScSolverOptionsDialog::FillListBox() std::vector aDescriptions( nCount ); for (sal_Int32 nPos=0; nPosgetPropertyDescription( aPropName ); if ( aVisName.isEmpty() ) @@ -264,7 +264,7 @@ void ScSolverOptionsDialog::FillListBox() for (sal_Int32 nPos=0; nPos lcl_CreateSolver( const uno::Reference& rImplNames, - uno::Sequence& rDescriptions ) +void ScSolverUtil::GetImplementations( uno::Sequence& rImplNames, + uno::Sequence& rDescriptions ) { rImplNames.realloc(0); // clear rDescriptions.realloc(0); @@ -85,7 +85,7 @@ void ScSolverUtil::GetImplementations( uno::Sequence& rImplNames, if ( xEnAc.is() ) { uno::Reference xEnum = - xEnAc->createContentEnumeration( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); + xEnAc->createContentEnumeration( OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); if ( xEnum.is() ) { sal_Int32 nCount = 0; @@ -99,8 +99,8 @@ void ScSolverUtil::GetImplementations( uno::Sequence& rImplNames, uno::Reference xInfo( xIntFac, uno::UNO_QUERY ); if ( xInfo.is() ) { - rtl::OUString sName = xInfo->getImplementationName(); - rtl::OUString sDescription; + OUString sName = xInfo->getImplementationName(); + OUString sDescription; uno::Reference xSolver = lcl_CreateSolver( xIntFac, xCtx ); uno::Reference xDesc( xSolver, uno::UNO_QUERY ); @@ -122,7 +122,7 @@ void ScSolverUtil::GetImplementations( uno::Sequence& rImplNames, } } -uno::Reference ScSolverUtil::GetSolver( const rtl::OUString& rImplName ) +uno::Reference ScSolverUtil::GetSolver( const OUString& rImplName ) { uno::Reference xSolver; @@ -135,7 +135,7 @@ uno::Reference ScSolverUtil::GetSolver( const rtl::OUString& rIm if ( xEnAc.is() ) { uno::Reference xEnum = - xEnAc->createContentEnumeration( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); + xEnAc->createContentEnumeration( OUString(RTL_CONSTASCII_USTRINGPARAM(SCSOLVER_SERVICE)) ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() && !xSolver.is() ) @@ -148,7 +148,7 @@ uno::Reference ScSolverUtil::GetSolver( const rtl::OUString& rIm uno::Reference xInfo( xIntFac, uno::UNO_QUERY ); if ( xInfo.is() ) { - rtl::OUString sName = xInfo->getImplementationName(); + OUString sName = xInfo->getImplementationName(); if ( sName == rImplName ) xSolver = lcl_CreateSolver( xIntFac, xCtx ); } @@ -161,7 +161,7 @@ uno::Reference ScSolverUtil::GetSolver( const rtl::OUString& rIm return xSolver; } -uno::Sequence ScSolverUtil::GetDefaults( const rtl::OUString& rImplName ) +uno::Sequence ScSolverUtil::GetDefaults( const OUString& rImplName ) { uno::Sequence aDefaults; diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index 8fcf399b27e2..82d613f5b704 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -34,7 +34,7 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, const String& rTitle, const String& rEditTitle, const String& rDefault, - const rtl::OString& sHelpId, const rtl::OString& sEditHelpId ) : + const OString& sHelpId, const OString& sEditHelpId ) : ModalDialog ( pParent, ScResId( RID_SCDLG_STRINPUT ) ), // aFtEditTitle ( this, ScResId( FT_LABEL ) ), @@ -55,7 +55,7 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, //------------------------------------------------------------------------ -void ScStringInputDlg::GetInputString( rtl::OUString& rString ) const +void ScStringInputDlg::GetInputString( OUString& rString ) const { rString = aEdInput.GetText(); } diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index b79ecf8f799d..c2c8fa8db42f 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -45,7 +45,7 @@ ScTabBgColorDlg::ScTabBgColorDlg( Window* pParent, const String& rTitle, const String& rTabBgColorNoColorText, const Color& rDefaultColor, - const rtl::OString& sHelpId ) : + const OString& sHelpId ) : ModalDialog ( pParent, ScResId( RID_SCDLG_TAB_BG_COLOR ) ), aBorderWin ( this, ScResId( TAB_BG_COLOR_CT_BORDER ) ), aTabBgColorSet ( &aBorderWin, ScResId( TAB_BG_COLOR_SET_BGDCOLOR ), this ), diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 3270ad9e23e1..7ece754c88cf 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -50,7 +50,7 @@ #define ABS_DREF3D ABS_DREF | SCA_TAB_3D ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* pViewData, std::map aRangeMap, + ScViewData* pViewData, std::map aRangeMap, const ScAddress& aCursorPos, const bool bUndo ) : ScAnyRefDlg( pB, pCW, pParent, "DefineNameDialog", "modules/scalc/ui/definename.ui" ) , @@ -84,7 +84,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen SCTAB n = mpDoc->GetTableCount(); for (SCTAB i = 0; i < n; ++i) { - rtl::OUString aTabName; + OUString aTabName; mpDoc->GetName(i, aTabName); m_pLbScope->InsertEntry(aTabName); } @@ -141,13 +141,13 @@ bool ScNameDefDlg::IsFormulaValid() bool ScNameDefDlg::IsNameValid() { - rtl::OUString aScope = m_pLbScope->GetSelectEntry(); - rtl::OUString aName = m_pEdName->GetText(); + OUString aScope = m_pLbScope->GetSelectEntry(); + OUString aName = m_pEdName->GetText(); ScRangeName* pRangeName = NULL; if(aScope == maGlobalNameStr) { - pRangeName = maRangeMap.find(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; } else { @@ -190,9 +190,9 @@ bool ScNameDefDlg::IsNameValid() void ScNameDefDlg::AddPushed() { - rtl::OUString aScope = m_pLbScope->GetSelectEntry(); - rtl::OUString aName = m_pEdName->GetText(); - rtl::OUString aExpression = m_pEdRange->GetText(); + OUString aScope = m_pLbScope->GetSelectEntry(); + OUString aName = m_pEdName->GetText(); + OUString aExpression = m_pEdRange->GetText(); if (aName.isEmpty()) { @@ -206,7 +206,7 @@ void ScNameDefDlg::AddPushed() ScRangeName* pRangeName = NULL; if(aScope == maGlobalNameStr) { - pRangeName = maRangeMap.find(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; } else { @@ -283,7 +283,7 @@ void ScNameDefDlg::AddPushed() } } -void ScNameDefDlg::GetNewData(rtl::OUString& rName, rtl::OUString& rScope) +void ScNameDefDlg::GetNewData(OUString& rName, OUString& rScope) { rName = maName; rScope = maScope; diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 5ce90f0eda2a..cfe82ae0bf8c 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -50,7 +50,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData, - const ScAddress& aCursorPos, boost::ptr_map* pRangeMap ) + const ScAddress& aCursorPos, boost::ptr_map* pRangeMap ) : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_NAMES ), // @@ -94,12 +94,12 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, { if (!pRangeMap) { - std::map aRangeMap; + std::map aRangeMap; mpDoc->GetRangeNameMap(aRangeMap); - std::map::iterator itr = aRangeMap.begin(), itrEnd = aRangeMap.end(); + std::map::iterator itr = aRangeMap.begin(), itrEnd = aRangeMap.end(); for (; itr != itrEnd; ++itr) { - rtl::OUString aTemp(itr->first); + OUString aTemp(itr->first); maRangeMap.insert(aTemp, new ScRangeName(*itr->second)); } } @@ -154,7 +154,7 @@ void ScNameDlg::Init() SCTAB n = mpDoc->GetTableCount(); for (SCTAB i = 0; i < n; ++i) { - rtl::OUString aTabName; + OUString aTabName; mpDoc->GetName(i, aTabName); maLbScope.InsertEntry(aTabName); } @@ -271,8 +271,8 @@ void ScNameDlg::UpdateChecks(ScRangeData* pData) bool ScNameDlg::IsNameValid() { - rtl::OUString aScope = maLbScope.GetSelectEntry(); - rtl::OUString aName = maEdName.GetText(); + OUString aScope = maLbScope.GetSelectEntry(); + OUString aName = maEdName.GetText(); aName = aName.trim(); if (aName.isEmpty()) @@ -314,10 +314,10 @@ bool ScNameDlg::IsFormulaValid() } } -ScRangeName* ScNameDlg::GetRangeName(const rtl::OUString& rScope) +ScRangeName* ScNameDlg::GetRangeName(const OUString& rScope) { if (rScope == maGlobalNameStr) - return maRangeMap.find(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + return maRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; else return maRangeMap.find(rScope)->second; } @@ -341,7 +341,7 @@ bool ScNameDlg::AddPushed() return false; } -void ScNameDlg::SetEntry(const rtl::OUString& rName, const rtl::OUString& rScope) +void ScNameDlg::SetEntry(const OUString& rName, const OUString& rScope) { if (!rName.isEmpty()) { @@ -375,8 +375,8 @@ void ScNameDlg::NameModified() { ScRangeNameLine aLine; mpRangeManagerTable->GetCurrentLine(aLine); - rtl::OUString aOldName = aLine.aName; - rtl::OUString aNewName = maEdName.GetText(); + OUString aOldName = aLine.aName; + OUString aNewName = maEdName.GetText(); aNewName = aNewName.trim(); maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor()); if (aNewName != aOldName) @@ -395,12 +395,12 @@ void ScNameDlg::NameModified() return; } - rtl::OUString aOldScope = aLine.aScope; + OUString aOldScope = aLine.aScope; //empty table if (aOldScope.isEmpty()) return; - rtl::OUString aExpr = maEdAssign.GetText(); - rtl::OUString aNewScope = maLbScope.GetSelectEntry(); + OUString aExpr = maEdAssign.GetText(); + OUString aNewScope = maLbScope.GetSelectEntry(); ScRangeName* pOldRangeName = GetRangeName( aOldScope ); ScRangeData* pData = pOldRangeName->findByUpperName( ScGlobal::pCharClass->uppercase(aOldName) ); @@ -521,7 +521,7 @@ void ScNameDlg::MorePushed() MoveWindow(maFlDiv, nPixel); } -void ScNameDlg::GetRangeNames(boost::ptr_map& rRangeMap) +void ScNameDlg::GetRangeNames(boost::ptr_map& rRangeMap) { maRangeMap.swap(rRangeMap); } diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 163cd8417997..13c486230a08 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -57,7 +57,7 @@ String createEntryString(const ScRangeNameLine& rLine) return aRet; } -ScRangeManagerTable::ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map& rRangeMap, const ScAddress& rPos ): +ScRangeManagerTable::ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map& rRangeMap, const ScAddress& rPos ): SvxSimpleTable( rParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), maGlobalString( ScGlobal::GetRscString(STR_GLOBAL_SCOPE)), mrRangeMap( rRangeMap ), @@ -142,7 +142,7 @@ void ScRangeManagerTable::Init() { SetUpdateMode(false); Clear(); - for (boost::ptr_map::const_iterator itr = mrRangeMap.begin(); + for (boost::ptr_map::const_iterator itr = mrRangeMap.begin(); itr != mrRangeMap.end(); ++itr) { const ScRangeName* pLocalRangeName = itr->second; @@ -168,7 +168,7 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLi { const ScRangeName* pRangeName; if (rLine.aScope == maGlobalString) - pRangeName = mrRangeMap.find(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; + pRangeName = mrRangeMap.find(OUString(RTL_CONSTASCII_USTRINGPARAM(STR_GLOBAL_RANGE_NAME)))->second; else pRangeName = mrRangeMap.find(rLine.aScope)->second; @@ -187,7 +187,7 @@ void ScRangeManagerTable::CheckForFormulaString() ScRangeNameLine aLine; GetLine( aLine, pEntry); const ScRangeData* pData = findRangeData( aLine ); - rtl::OUString aFormulaString; + OUString aFormulaString; pData->GetSymbol(aFormulaString, maPos); SetEntryText(aFormulaString, pEntry, 1); maCalculatedFormulaEntries.insert( std::pair(pEntry, true) ); @@ -230,8 +230,8 @@ void ScRangeManagerTable::SetEntry(const ScRangeNameLine& rLine) { for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry)) { - if (rLine.aName == rtl::OUString(GetEntryText(pEntry, 0)) - && rLine.aScope == rtl::OUString(GetEntryText(pEntry, 2))) + if (rLine.aName == OUString(GetEntryText(pEntry, 0)) + && rLine.aScope == OUString(GetEntryText(pEntry, 2))) { SetCurEntry(pEntry); } diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index b2f0544a9085..64a296c90e0d 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -42,12 +42,12 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) get(m_pBtnClose, "close"); ScDocument* pDoc = pShell->GetDocument(); - std::map aCopyMap; + std::map aCopyMap; pDoc->GetRangeNameMap(aCopyMap); - std::map::iterator itr = aCopyMap.begin(), itrEnd = aCopyMap.end(); + std::map::iterator itr = aCopyMap.begin(), itrEnd = aCopyMap.end(); for (; itr != itrEnd; ++itr) { - rtl::OUString aTemp(itr->first); + OUString aTemp(itr->first); maRangeMap.insert(aTemp, new ScRangeName(*itr->second)); } @@ -103,7 +103,7 @@ IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) //------------------------------------------------------------------ -std::vector ScNamePasteDlg::GetSelectedNames() const +std::vector ScNamePasteDlg::GetSelectedNames() const { return maSelectedNames; } diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index e8c28fb88dda..2f3f2d44f73f 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -629,7 +629,7 @@ void ScContentTree::GetTableNames() if (!pDoc) return; - rtl::OUString aName; + OUString aName; SCTAB nCount = pDoc->GetTableCount(); for ( SCTAB i=0; i aSet; + std::set aSet; ScRangeName* pRangeNames = pDoc->GetRangeName(); if (!pRangeNames->empty()) { @@ -676,7 +676,7 @@ void ScContentTree::GetAreaNames() ScRangeName* pLocalRangeName = pDoc->GetRangeName(i); if (pLocalRangeName && !pLocalRangeName->empty()) { - rtl::OUString aTableName; + OUString aTableName; pDoc->GetName(i, aTableName); for (ScRangeName::const_iterator itr = pLocalRangeName->begin(); itr != pLocalRangeName->end(); ++itr) { @@ -688,7 +688,7 @@ void ScContentTree::GetAreaNames() if (!aSet.empty()) { - for (std::set::iterator itr = aSet.begin(); + for (std::set::iterator itr = aSet.begin(); itr != aSet.end(); ++itr) { InsertContent(SC_CONTENT_RANGENAME, *itr); @@ -710,7 +710,7 @@ void ScContentTree::GetDbNames() ScDBCollection::NamedDBs::const_iterator itr = rDBs.begin(), itrEnd = rDBs.end(); for (; itr != itrEnd; ++itr) { - const::rtl::OUString& aStrName = itr->GetName(); + const OUString& aStrName = itr->GetName(); InsertContent(SC_CONTENT_DBAREA, aStrName); } } @@ -1190,8 +1190,8 @@ void ScContentTree::DoDrag() ScDocShell* pSrcShell = NULL; if ( bHiddenDoc ) { - rtl::OUString aFilter, aOptions; - rtl::OUString aURL = aHiddenName; + OUString aFilter, aOptions; + OUString aURL = aHiddenName; pDocLoader = new ScDocumentLoader( aURL, aFilter, aOptions ); if (!pDocLoader->IsError()) pSrcShell = pDocLoader->GetDocShell(); @@ -1269,8 +1269,8 @@ sal_Bool ScContentTree::LoadFile( const String& rUrl ) aDocName.Erase(nPos); // nur der Name, ohne #... sal_Bool bReturn = false; - rtl::OUString aURL = aDocName; - rtl::OUString aFilter, aOptions; + OUString aURL = aDocName; + OUString aFilter, aOptions; ScDocumentLoader aLoader( aURL, aFilter, aOptions ); if ( !aLoader.IsError() ) { diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 43ab289aee08..d92222ceba6d 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -159,7 +159,7 @@ void ColumnEdit::Down() void ColumnEdit::First() { nCol = 1; - SetText(rtl::OUString('A')); + SetText(OUString('A')); } //------------------------------------------------------------------------ @@ -647,7 +647,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win // eListMode wird von aussen gesetzt, Root weiter unten aLbDocuments.SetDropDownLineCount(9); - rtl::OUString aOpen(" ("); + OUString aOpen(" ("); aStrActive = aOpen; aStrActive += String( ScResId( STR_ACTIVE ) ); aStrActive += ')'; // " (aktiv)" @@ -1007,13 +1007,13 @@ void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo ) } } -void ScNavigatorDlg::SetCurrentTableStr( const rtl::OUString& rName ) +void ScNavigatorDlg::SetCurrentTableStr( const OUString& rName ) { if (!GetViewData()) return; ScDocument* pDoc = pViewData->GetDocument(); SCTAB nCount = pDoc->GetTableCount(); - rtl::OUString aTabName; + OUString aTabName; for ( SCTAB i=0; iAddItem(new SvLBoxString(pEntry, 0, rtl::OUString())); + pEntry->AddItem(new SvLBoxString(pEntry, 0, OUString())); pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0)); OptionString* pItem = new OptionString( maCaptionStringRefSyntax, toString(maConfig.meStringRefAddressSyntax)); @@ -152,7 +152,7 @@ void ScCalcOptionsDialog::FillOptionsList() { // Treat empty string as zero. SvTreeListEntry* pEntry = new SvTreeListEntry; - pEntry->AddItem(new SvLBoxString(pEntry, 0, rtl::OUString())); + pEntry->AddItem(new SvLBoxString(pEntry, 0, OUString())); pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0)); OptionString* pItem = new OptionString( maCaptionEmptyStringAsZero, toString(maConfig.mbEmptyStringAsZero)); @@ -281,7 +281,7 @@ void ScCalcOptionsDialog::RadioValueChanged() } } -rtl::OUString ScCalcOptionsDialog::toString(formula::FormulaGrammar::AddressConvention eConv) const +OUString ScCalcOptionsDialog::toString(formula::FormulaGrammar::AddressConvention eConv) const { switch (eConv) { @@ -298,7 +298,7 @@ rtl::OUString ScCalcOptionsDialog::toString(formula::FormulaGrammar::AddressConv return maUseFormulaSyntax; } -rtl::OUString ScCalcOptionsDialog::toString(bool bVal) const +OUString ScCalcOptionsDialog::toString(bool bVal) const { return bVal ? maTrue : maFalse; } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index a1a722200df2..39ddd600b1f5 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -53,8 +53,8 @@ private: void ListOptionValueChanged(); void RadioValueChanged(); - rtl::OUString toString(formula::FormulaGrammar::AddressConvention eConv) const; - rtl::OUString toString(bool bVal) const; + OUString toString(formula::FormulaGrammar::AddressConvention eConv) const; + OUString toString(bool bVal) const; private: SvxCheckListBox maLbSettings; @@ -70,19 +70,19 @@ private: OKButton maBtnOK; CancelButton maBtnCancel; - rtl::OUString maTrue; - rtl::OUString maFalse; + OUString maTrue; + OUString maFalse; - rtl::OUString maCalcA1; - rtl::OUString maExcelA1; - rtl::OUString maExcelR1C1; + OUString maCalcA1; + OUString maExcelA1; + OUString maExcelR1C1; - rtl::OUString maCaptionStringRefSyntax; - rtl::OUString maDescStringRefSyntax; - rtl::OUString maUseFormulaSyntax; + OUString maCaptionStringRefSyntax; + OUString maDescStringRefSyntax; + OUString maUseFormulaSyntax; - rtl::OUString maCaptionEmptyStringAsZero; - rtl::OUString maDescEmptyStringAsZero; + OUString maCaptionEmptyStringAsZero; + OUString maDescEmptyStringAsZero; ScCalcConfig maConfig; }; diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 55963e2ffaff..7939ac2d71db 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -36,7 +36,6 @@ #include "defaultsoptions.hxx" #include "document.hxx" -using ::rtl::OUString; ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet &rCoreSet) : SfxTabPage(pParent, ScResId(RID_SCPAGE_DEFAULTS), rCoreSet), diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 37cd3d62d57b..4e30ebd7295d 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -37,7 +37,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::lang::Locale; using ::com::sun::star::i18n::LocaleDataItem; @@ -92,7 +91,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreA maEdSepArrayRow.SetGetFocusHdl(aLink); // Get the decimal separator for current locale. - rtl::OUString aSep = ScGlobal::GetpLocaleData()->getNumDecimalSep(); + OUString aSep = ScGlobal::GetpLocaleData()->getNumDecimalSep(); mnDecSep = aSep.isEmpty() ? sal_Unicode('.') : aSep[0]; } @@ -102,7 +101,7 @@ ScTpFormulaOptions::~ScTpFormulaOptions() void ScTpFormulaOptions::ResetSeparators() { - rtl::OUString aFuncArg, aArrayCol, aArrayRow; + OUString aFuncArg, aArrayCol, aArrayRow; ScFormulaOptions::GetDefaultFormulaSeparators(aFuncArg, aArrayCol, aArrayRow); maEdSepFuncArg.SetText(aFuncArg); maEdSepArrayCol.SetText(aArrayCol); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 5b4f7630ea5c..35675b5ad0e9 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -317,7 +317,7 @@ void ScTpUserLists::MakeListStr( String& rListStr ) for(xub_StrLen i=0;iQuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); ++aSel.nEndPos; - String aPageOfEntry = rtl::OUStringBuffer().append(' '). + String aPageOfEntry = OUStringBuffer().append(' '). append(ScGlobal::GetRscString( STR_HF_OF )).append(' '). makeStringAndClear(); aWndCenter.GetEditEngine()->QuickInsertText(aPageOfEntry,ESelection(aSel.nEndPara,aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index be48bf0464e2..5fd9d40cc86f 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -333,7 +333,7 @@ void ScEditWindow::LoseFocus() break; } pAcc = new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), pEdView, this, - rtl::OUString(sName), rtl::OUString(sDescription), ScAccessibleEditObject::EditControl); + OUString(sName), OUString(sDescription), ScAccessibleEditObject::EditControl); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible = pAcc; xAcc = xAccessible; return pAcc; diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 2960ecfb558b..299d1a7c9ddc 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -539,11 +539,11 @@ void ScUndoWrapper::ForgetWrappedUndo() pWrappedUndo = NULL; // don't delete in dtor - pointer must be stored outside } -rtl::OUString ScUndoWrapper::GetComment() const +OUString ScUndoWrapper::GetComment() const { if (pWrappedUndo) return pWrappedUndo->GetComment(); - return rtl::OUString(); + return OUString(); } OUString ScUndoWrapper::GetRepeatComment(SfxRepeatTarget& rTarget) const diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index ebc0e0e98cdf..afe6f72286fe 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -110,7 +110,7 @@ ScUndoInsertCells::~ScUndoInsertCells() delete []pScenarios; } -rtl::OUString ScUndoInsertCells::GetComment() const +OUString ScUndoInsertCells::GetComment() const { return ScGlobal::GetRscString( pPasteUndo ? STR_UNDO_PASTE : STR_UNDO_INSERTCELLS ); } @@ -349,7 +349,7 @@ ScUndoDeleteCells::~ScUndoDeleteCells() delete []pScenarios; } -rtl::OUString ScUndoDeleteCells::GetComment() const +OUString ScUndoDeleteCells::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // "Delete" } @@ -573,7 +573,7 @@ ScUndoDeleteMulti::~ScUndoDeleteMulti() delete [] pRanges; } -rtl::OUString ScUndoDeleteMulti::GetComment() const +OUString ScUndoDeleteMulti::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // like DeleteCells } @@ -752,7 +752,7 @@ ScUndoCut::~ScUndoCut() delete pUndoDoc; } -rtl::OUString ScUndoCut::GetComment() const +OUString ScUndoCut::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_CUT ); // "cut" } @@ -867,7 +867,7 @@ ScUndoPaste::~ScUndoPaste() delete pRefRedoData; } -rtl::OUString ScUndoPaste::GetComment() const +OUString ScUndoPaste::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_PASTE ); // "paste" } @@ -1138,7 +1138,7 @@ ScUndoDragDrop::~ScUndoDragDrop() { } -rtl::OUString ScUndoDragDrop::GetComment() const +OUString ScUndoDragDrop::GetComment() const { // "Move" : "Copy" return bCut ? ScGlobal::GetRscString( STR_UNDO_MOVE ) : @@ -1361,7 +1361,7 @@ ScUndoListNames::~ScUndoListNames() delete pRedoDoc; } -rtl::OUString ScUndoListNames::GetComment() const +OUString ScUndoListNames::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_LISTNAMES ); } @@ -1427,7 +1427,7 @@ ScUndoUseScenario::~ScUndoUseScenario() delete pUndoDoc; } -rtl::OUString ScUndoUseScenario::GetComment() const +OUString ScUndoUseScenario::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_USESCENARIO ); } @@ -1456,7 +1456,7 @@ void ScUndoUseScenario::Undo() for (SCTAB i = nTab+1; i<=nEndTab; i++) { // Flags always - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pUndoDoc->GetScenarioData( i, aComment, aColor, nScenFlags ); @@ -1543,7 +1543,7 @@ ScUndoSelectionStyle::~ScUndoSelectionStyle() delete pUndoDoc; } -rtl::OUString ScUndoSelectionStyle::GetComment() const +OUString ScUndoSelectionStyle::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_APPLYCELLSTYLE ); } @@ -1648,7 +1648,7 @@ ScUndoEnterMatrix::~ScUndoEnterMatrix() delete pUndoDoc; } -rtl::OUString ScUndoEnterMatrix::GetComment() const +OUString ScUndoEnterMatrix::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERMATRIX ); } @@ -1742,7 +1742,7 @@ ScUndoIndent::~ScUndoIndent() delete pUndoDoc; } -rtl::OUString ScUndoIndent::GetComment() const +OUString ScUndoIndent::GetComment() const { sal_uInt16 nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT; return ScGlobal::GetRscString( nId ); @@ -1799,7 +1799,7 @@ ScUndoTransliterate::~ScUndoTransliterate() delete pUndoDoc; } -rtl::OUString ScUndoTransliterate::GetComment() const +OUString ScUndoTransliterate::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_TRANSLITERATE ); } @@ -1864,7 +1864,7 @@ ScUndoClearItems::~ScUndoClearItems() delete pWhich; } -rtl::OUString ScUndoClearItems::GetComment() const +OUString ScUndoClearItems::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); } @@ -1919,7 +1919,7 @@ ScUndoRemoveBreaks::~ScUndoRemoveBreaks() delete pUndoDoc; } -rtl::OUString ScUndoRemoveBreaks::GetComment() const +OUString ScUndoRemoveBreaks::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMOVEBREAKS ); } @@ -1982,7 +1982,7 @@ ScUndoRemoveMerge::~ScUndoRemoveMerge() delete pUndoDoc; } -rtl::OUString ScUndoRemoveMerge::GetComment() const +OUString ScUndoRemoveMerge::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "remove merge" } @@ -2124,7 +2124,7 @@ ScUndoBorder::~ScUndoBorder() delete pInner; } -rtl::OUString ScUndoBorder::GetComment() const +OUString ScUndoBorder::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String? } diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx index 9eb40e7c79c3..384c8bce7a53 100644 --- a/sc/source/ui/undo/undoblk2.cxx +++ b/sc/source/ui/undo/undoblk2.cxx @@ -65,7 +65,7 @@ ScUndoWidthOrHeight::~ScUndoWidthOrHeight() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoWidthOrHeight::GetComment() const +OUString ScUndoWidthOrHeight::GetComment() const { // [ "optimal " ] "Column width" | "row height" return ( bWidth ? diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 317cab43df32..3c9b86a0eebb 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -99,7 +99,7 @@ ScUndoDeleteContents::~ScUndoDeleteContents() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoDeleteContents::GetComment() const +OUString ScUndoDeleteContents::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Delete" } @@ -187,7 +187,7 @@ void ScUndoDeleteContents::Undo() { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } @@ -203,7 +203,7 @@ void ScUndoDeleteContents::Redo() { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } @@ -243,7 +243,7 @@ ScUndoFillTable::~ScUndoFillTable() delete pUndoDoc; } -rtl::OUString ScUndoFillTable::GetComment() const +OUString ScUndoFillTable::GetComment() const { return ScGlobal::GetRscString( STR_FILL_TAB ); } @@ -383,7 +383,7 @@ ScUndoSelectionAttr::~ScUndoSelectionAttr() delete pUndoDoc; } -rtl::OUString ScUndoSelectionAttr::GetComment() const +OUString ScUndoSelectionAttr::GetComment() const { //"Attribute" "/Lines" return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR ); @@ -515,7 +515,7 @@ ScUndoAutoFill::~ScUndoAutoFill() delete pUndoDoc; } -rtl::OUString ScUndoAutoFill::GetComment() const +OUString ScUndoAutoFill::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_AUTOFILL ); //"Fill" } @@ -655,7 +655,7 @@ ScUndoMerge::~ScUndoMerge() DeleteSdrUndoAction( mpDrawUndo ); } -rtl::OUString ScUndoMerge::GetComment() const +OUString ScUndoMerge::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_MERGE ); } @@ -780,7 +780,7 @@ ScUndoAutoFormat::~ScUndoAutoFormat() delete pUndoDoc; } -rtl::OUString ScUndoAutoFormat::GetComment() const +OUString ScUndoAutoFormat::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format" } @@ -961,7 +961,7 @@ void ScUndoReplace::SetChangeTrack() nStartChangeAction = nEndChangeAction = 0; } -rtl::OUString ScUndoReplace::GetComment() const +OUString ScUndoReplace::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Replace" } @@ -1116,7 +1116,7 @@ ScUndoTabOp::~ScUndoTabOp() delete pUndoDoc; } -rtl::OUString ScUndoTabOp::GetComment() const +OUString ScUndoTabOp::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Multiple operation" } @@ -1209,9 +1209,9 @@ void ScUndoConversion::SetChangeTrack() nStartChangeAction = nEndChangeAction = 0; } -rtl::OUString ScUndoConversion::GetComment() const +OUString ScUndoConversion::GetComment() const { - rtl::OUString aText; + OUString aText; switch( maConvParam.GetType() ) { case SC_CONVERSION_SPELLCHECK: aText = ScGlobal::GetRscString( STR_UNDO_SPELLING ); break; @@ -1295,7 +1295,7 @@ ScUndoRefConversion::~ScUndoRefConversion() delete pRedoDoc; } -rtl::OUString ScUndoRefConversion::GetComment() const +OUString ScUndoRefConversion::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input" } @@ -1375,7 +1375,7 @@ ScUndoRefreshLink::~ScUndoRefreshLink() delete pRedoDoc; } -rtl::OUString ScUndoRefreshLink::GetComment() const +OUString ScUndoRefreshLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); } @@ -1506,7 +1506,7 @@ ScUndoInsertAreaLink::~ScUndoInsertAreaLink() { } -rtl::OUString ScUndoInsertAreaLink::GetComment() const +OUString ScUndoInsertAreaLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_INSERTAREALINK ); } @@ -1568,7 +1568,7 @@ ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink() { } -rtl::OUString ScUndoRemoveAreaLink::GetComment() const +OUString ScUndoRemoveAreaLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ?? } @@ -1644,7 +1644,7 @@ ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink() delete pRedoDoc; } -rtl::OUString ScUndoUpdateAreaLink::GetComment() const +OUString ScUndoUpdateAreaLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! own text ?? } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 40ca1da9c02b..01873318e58a 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -83,7 +83,7 @@ ScUndoCursorAttr::~ScUndoCursorAttr() pPool->Remove(*pApplyPattern); } -rtl::OUString ScUndoCursorAttr::GetComment() const +OUString ScUndoCursorAttr::GetComment() const { //! own text for automatic attribution @@ -181,7 +181,7 @@ ScUndoEnterData::ScUndoEnterData( ScUndoEnterData::~ScUndoEnterData() {} -rtl::OUString ScUndoEnterData::GetComment() const +OUString ScUndoEnterData::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input" } @@ -267,7 +267,7 @@ void ScUndoEnterData::Undo() { aChangeRanges.Append( ScRange(maPos.Col(), maPos.Row(), maOldValues[i].mnTab)); } - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } @@ -306,7 +306,7 @@ void ScUndoEnterData::Redo() { aChangeRanges.Append(ScRange(maPos.Col(), maPos.Row(), maOldValues[i].mnTab)); } - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } @@ -340,7 +340,7 @@ ScUndoEnterValue::~ScUndoEnterValue() { } -rtl::OUString ScUndoEnterValue::GetComment() const +OUString ScUndoEnterValue::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_ENTERDATA ); // "Input" } @@ -517,7 +517,7 @@ ScUndoPageBreak::~ScUndoPageBreak() { } -rtl::OUString ScUndoPageBreak::GetComment() const +OUString ScUndoPageBreak::GetComment() const { //"Column break" | "Row break" "insert" | "delete" return String ( bColumn ? @@ -596,7 +596,7 @@ ScUndoPrintZoom::~ScUndoPrintZoom() { } -rtl::OUString ScUndoPrintZoom::GetComment() const +OUString ScUndoPrintZoom::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_PRINTSCALE ); } @@ -685,7 +685,7 @@ ScUndoThesaurus::~ScUndoThesaurus() delete pRedoTObject; } -rtl::OUString ScUndoThesaurus::GetComment() const +OUString ScUndoThesaurus::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus" } @@ -844,7 +844,7 @@ sal_Bool ScUndoReplaceNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const return false; } -rtl::OUString ScUndoReplaceNote::GetComment() const +OUString ScUndoReplaceNote::GetComment() const { return ScGlobal::GetRscString( maNewData.mpCaption ? (maOldData.mpCaption ? STR_UNDO_EDITNOTE : STR_UNDO_INSERTNOTE) : STR_UNDO_DELETENOTE ); @@ -914,7 +914,7 @@ sal_Bool ScUndoShowHideNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const return false; } -rtl::OUString ScUndoShowHideNote::GetComment() const +OUString ScUndoShowHideNote::GetComment() const { return ScGlobal::GetRscString( mbShown ? STR_UNDO_SHOWNOTE : STR_UNDO_HIDENOTE ); } @@ -941,7 +941,7 @@ ScUndoDetective::~ScUndoDetective() delete pOldList; } -rtl::OUString ScUndoDetective::GetComment() const +OUString ScUndoDetective::GetComment() const { sal_uInt16 nId = STR_UNDO_DETDELALL; if ( !bIsDelete ) @@ -1039,7 +1039,7 @@ ScUndoRangeNames::~ScUndoRangeNames() delete pNewRanges; } -rtl::OUString ScUndoRangeNames::GetComment() const +OUString ScUndoRangeNames::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_RANGENAMES ); } diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 81106e5c0550..2a631d5a8c44 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -87,7 +87,7 @@ ScUndoDoOutline::~ScUndoDoOutline() delete pUndoDoc; } -rtl::OUString ScUndoDoOutline::GetComment() const +OUString ScUndoDoOutline::GetComment() const { // Show outline" "Hide outline" return bShow ? ScGlobal::GetRscString( STR_UNDO_DOOUTLINE ) : @@ -176,7 +176,7 @@ ScUndoMakeOutline::~ScUndoMakeOutline() delete pUndoTable; } -rtl::OUString ScUndoMakeOutline::GetComment() const +OUString ScUndoMakeOutline::GetComment() const { // "Grouping" "Undo grouping" return bMake ? ScGlobal::GetRscString( STR_UNDO_MAKEOUTLINE ) : @@ -261,7 +261,7 @@ ScUndoOutlineLevel::~ScUndoOutlineLevel() delete pUndoTable; } -rtl::OUString ScUndoOutlineLevel::GetComment() const +OUString ScUndoOutlineLevel::GetComment() const { // "Select outline level" return ScGlobal::GetRscString( STR_UNDO_OUTLINELEVEL ); } @@ -346,7 +346,7 @@ ScUndoOutlineBlock::~ScUndoOutlineBlock() delete pUndoTable; } -rtl::OUString ScUndoOutlineBlock::GetComment() const +OUString ScUndoOutlineBlock::GetComment() const { // "Show outline" "Hide outline" return bShow ? ScGlobal::GetRscString( STR_UNDO_DOOUTLINEBLK ) : @@ -447,7 +447,7 @@ ScUndoRemoveAllOutlines::~ScUndoRemoveAllOutlines() delete pUndoTable; } -rtl::OUString ScUndoRemoveAllOutlines::GetComment() const +OUString ScUndoRemoveAllOutlines::GetComment() const { // "Remove outlines" return ScGlobal::GetRscString( STR_UNDO_REMOVEALLOTLNS ); } @@ -532,7 +532,7 @@ ScUndoAutoOutline::~ScUndoAutoOutline() delete pUndoTable; } -rtl::OUString ScUndoAutoOutline::GetComment() const +OUString ScUndoAutoOutline::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_AUTOOUTLINE ); } @@ -641,7 +641,7 @@ ScUndoSubTotals::~ScUndoSubTotals() delete pUndoDB; } -rtl::OUString ScUndoSubTotals::GetComment() const +OUString ScUndoSubTotals::GetComment() const { // "Subtotals" return ScGlobal::GetRscString( STR_UNDO_SUBTOTALS ); } @@ -765,7 +765,7 @@ ScUndoSort::~ScUndoSort() delete pUndoDB; } -rtl::OUString ScUndoSort::GetComment() const +OUString ScUndoSort::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_SORT ); } @@ -891,7 +891,7 @@ ScUndoQuery::~ScUndoQuery() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoQuery::GetComment() const +OUString ScUndoQuery::GetComment() const { // "Filter"; return ScGlobal::GetRscString( STR_UNDO_QUERY ); } @@ -1029,7 +1029,7 @@ sal_Bool ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const // Show or hide AutoFilter buttons (doesn't include filter settings) ScUndoAutoFilter::ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange, - const ::rtl::OUString& rName, bool bSet ) : + const OUString& rName, bool bSet ) : ScDBFuncUndo( pNewDocShell, rRange ), aDBName( rName ), bFilterSet( bSet ) @@ -1040,7 +1040,7 @@ ScUndoAutoFilter::~ScUndoAutoFilter() { } -rtl::OUString ScUndoAutoFilter::GetComment() const +OUString ScUndoAutoFilter::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_QUERY ); // same as ScUndoQuery } @@ -1120,7 +1120,7 @@ ScUndoDBData::~ScUndoDBData() delete pRedoColl; } -rtl::OUString ScUndoDBData::GetComment() const +OUString ScUndoDBData::GetComment() const { // "Change database range"; return ScGlobal::GetRscString( STR_UNDO_DBDATA ); } @@ -1198,7 +1198,7 @@ ScUndoImportData::~ScUndoImportData() delete pRedoDBData; } -rtl::OUString ScUndoImportData::GetComment() const +OUString ScUndoImportData::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_IMPORTDATA ); } @@ -1417,7 +1417,7 @@ ScUndoRepeatDB::~ScUndoRepeatDB() delete pUndoDB; } -rtl::OUString ScUndoRepeatDB::GetComment() const +OUString ScUndoRepeatDB::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REPEATDB ); } @@ -1571,7 +1571,7 @@ ScUndoDataPilot::~ScUndoDataPilot() delete pNewUndoDoc; } -rtl::OUString ScUndoDataPilot::GetComment() const +OUString ScUndoDataPilot::GetComment() const { sal_uInt16 nIndex; if ( pOldUndoDoc && pNewUndoDoc ) @@ -1728,7 +1728,7 @@ ScUndoConsolidate::~ScUndoConsolidate() delete pUndoData; } -rtl::OUString ScUndoConsolidate::GetComment() const +OUString ScUndoConsolidate::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_CONSOLIDATE ); } @@ -1885,7 +1885,7 @@ ScUndoChartData::~ScUndoChartData() { } -rtl::OUString ScUndoChartData::GetComment() const +OUString ScUndoChartData::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_CHARTDATA ); } @@ -1958,7 +1958,7 @@ ScUndoDataForm::~ScUndoDataForm() delete pRefRedoData; } -rtl::OUString ScUndoDataForm::GetComment() const +OUString ScUndoDataForm::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_PASTE ); } diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx index c91f4f7dd000..fc047c117afe 100644 --- a/sc/source/ui/undo/undodraw.cxx +++ b/sc/source/ui/undo/undodraw.cxx @@ -41,11 +41,11 @@ void ScUndoDraw::ForgetDrawUndo() pDrawUndo = NULL; // do not delete (DrawUndo has to be remembered from outside) } -rtl::OUString ScUndoDraw::GetComment() const +OUString ScUndoDraw::GetComment() const { if (pDrawUndo) return pDrawUndo->GetComment(); - return rtl::OUString(); + return OUString(); } OUString ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx index 9330c3680fcb..fbc447246815 100644 --- a/sc/source/ui/undo/undorangename.cxx +++ b/sc/source/ui/undo/undorangename.cxx @@ -41,11 +41,11 @@ using ::std::auto_ptr; ScUndoAllRangeNames::ScUndoAllRangeNames( ScDocShell* pDocSh, - const std::map& rOldNames, - const boost::ptr_map& rNewNames) : + const std::map& rOldNames, + const boost::ptr_map& rNewNames) : ScSimpleUndo(pDocSh) { - std::map::const_iterator itr, itrEnd; + std::map::const_iterator itr, itrEnd; for (itr = rOldNames.begin(), itrEnd = rOldNames.end(); itr != itrEnd; ++itr) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -54,7 +54,7 @@ ScUndoAllRangeNames::ScUndoAllRangeNames( maOldNames.insert(itr->first, p); } - boost::ptr_map::const_iterator it, itEnd; + boost::ptr_map::const_iterator it, itEnd; for (it = rNewNames.begin(), itEnd = rNewNames.end(); it != itEnd; ++it) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -87,12 +87,12 @@ sal_Bool ScUndoAllRangeNames::CanRepeat(SfxRepeatTarget& /*rTarget*/) const return sal_False; } -rtl::OUString ScUndoAllRangeNames::GetComment() const +OUString ScUndoAllRangeNames::GetComment() const { return ScGlobal::GetRscString(STR_UNDO_RANGENAMES); } -void ScUndoAllRangeNames::DoChange(const boost::ptr_map& rNames) +void ScUndoAllRangeNames::DoChange(const boost::ptr_map& rNames) { ScDocument& rDoc = *pDocShell->GetDocument(); @@ -160,7 +160,7 @@ sal_Bool ScUndoAddRangeData::CanRepeat(SfxRepeatTarget& /*rTarget*/) const return sal_False; } -rtl::OUString ScUndoAddRangeData::GetComment() const +OUString ScUndoAddRangeData::GetComment() const { return ScGlobal::GetRscString(STR_UNDO_RANGENAMES); } diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 0f8aa68f5cdd..5125bbaf4a83 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -101,7 +101,7 @@ ScUndoModifyStyle::~ScUndoModifyStyle() { } -rtl::OUString ScUndoModifyStyle::GetComment() const +OUString ScUndoModifyStyle::GetComment() const { sal_uInt16 nId = (eFamily == SFX_STYLE_FAMILY_PARA) ? STR_UNDO_EDITCELLSTYLE : @@ -255,7 +255,7 @@ void ScUndoApplyPageStyle::AddSheetAction( SCTAB nTab, const String& rOldStyle ) maEntries.push_back( ApplyStyleEntry( nTab, rOldStyle ) ); } -rtl::OUString ScUndoApplyPageStyle::GetComment() const +OUString ScUndoApplyPageStyle::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_APPLYPAGESTYLE ); } diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index a45b6488007b..3c1ef777c401 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -53,7 +53,6 @@ extern sal_Bool bDrawIsInUndo; // somewhere as member! using namespace com::sun::star; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::std::auto_ptr; using ::std::vector; using ::boost::shared_ptr; @@ -93,7 +92,7 @@ ScUndoInsertTab::~ScUndoInsertTab() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoInsertTab::GetComment() const +OUString ScUndoInsertTab::GetComment() const { if (bAppend) return ScGlobal::GetRscString( STR_UNDO_APPEND_TAB ); @@ -170,7 +169,7 @@ sal_Bool ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell, SCTAB nTabNum, - std::vector& newNameList) : + std::vector& newNameList) : ScSimpleUndo( pNewDocShell ), pDrawUndo( NULL ), aNameList( newNameList ), @@ -186,7 +185,7 @@ ScUndoInsertTables::~ScUndoInsertTables() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoInsertTables::GetComment() const +OUString ScUndoInsertTables::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB ); } @@ -276,7 +275,7 @@ ScUndoDeleteTab::~ScUndoDeleteTab() theTabs.clear(); } -rtl::OUString ScUndoDeleteTab::GetComment() const +OUString ScUndoDeleteTab::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_DELETE_TAB ); } @@ -317,7 +316,7 @@ void ScUndoDeleteTab::Undo() ScDocument* pDoc = pDocShell->GetDocument(); sal_Bool bLink = false; - rtl::OUString aName; + OUString aName; for(i=0; iCopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,false, pDoc ); - rtl::OUString aOldName; + OUString aOldName; pRefUndoDoc->GetName( nTab, aOldName ); pDoc->RenameTab( nTab, aOldName, false ); if (pRefUndoDoc->IsLinked(nTab)) @@ -345,7 +344,7 @@ void ScUndoDeleteTab::Undo() if ( pRefUndoDoc->IsScenario(nTab) ) { pDoc->SetScenario( nTab, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pRefUndoDoc->GetScenarioData( nTab, aComment, aColor, nScenFlags ); @@ -437,7 +436,7 @@ ScUndoRenameTab::~ScUndoRenameTab() { } -rtl::OUString ScUndoRenameTab::GetComment() const +OUString ScUndoRenameTab::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_RENAME_TAB ); } @@ -499,7 +498,7 @@ ScUndoMoveTab::~ScUndoMoveTab() { } -rtl::OUString ScUndoMoveTab::GetComment() const +OUString ScUndoMoveTab::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_MOVE_TAB ); } @@ -606,7 +605,7 @@ ScUndoCopyTab::~ScUndoCopyTab() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoCopyTab::GetComment() const +OUString ScUndoCopyTab::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_COPY_TAB ); } @@ -685,7 +684,7 @@ void ScUndoCopyTab::Redo() if ( pDoc->IsScenario(nAdjSource) ) { pDoc->SetScenario(nNewTab, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pDoc->GetScenarioData(nAdjSource, aComment, aColor, nScenFlags ); @@ -747,7 +746,7 @@ ScUndoTabColor::~ScUndoTabColor() { } -rtl::OUString ScUndoTabColor::GetComment() const +OUString ScUndoTabColor::GetComment() const { if (aTabColorList.size() > 1) return ScGlobal::GetRscString(STR_UNDO_SET_MULTI_TAB_BG_COLOR); @@ -816,7 +815,7 @@ ScUndoMakeScenario::~ScUndoMakeScenario() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoMakeScenario::GetComment() const +OUString ScUndoMakeScenario::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_MAKESCENARIO ); } @@ -897,7 +896,7 @@ ScUndoImportTab::~ScUndoImportTab() DeleteSdrUndoAction( pDrawUndo ); } -rtl::OUString ScUndoImportTab::GetComment() const +OUString ScUndoImportTab::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_INSERT_TAB ); } @@ -936,7 +935,7 @@ void ScUndoImportTab::Undo() pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); pRedoDoc->InitUndo( pDoc, nTab,nTab+nCount-1, sal_True,sal_True ); - rtl::OUString aOldName; + OUString aOldName; for (i=0; iIsScenario(nTabPos) ) { pRedoDoc->SetScenario(nTabPos, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pDoc->GetScenarioData(nTabPos, aComment, aColor, nScenFlags ); @@ -985,7 +984,7 @@ void ScUndoImportTab::Redo() } ScDocument* pDoc = pDocShell->GetDocument(); - rtl::OUString aName; + OUString aName; SCTAB i; for (i=0; iIsScenario(nTabPos) ) { pDoc->SetScenario(nTabPos, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pRedoDoc->GetScenarioData(nTabPos, aComment, aColor, nScenFlags ); @@ -1051,7 +1050,7 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) : { sal_uInt8 nMode = pDoc->GetLinkMode(i); if (nMode) - if (pDoc->GetLinkDoc(i) == rtl::OUString(aDocName)) + if (pDoc->GetLinkDoc(i) == OUString(aDocName)) { if (!nCount) { @@ -1061,8 +1060,8 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) : } else { - OSL_ENSURE(rtl::OUString(aFltName) == pDoc->GetLinkFlt(i) && - rtl::OUString(aOptions) == pDoc->GetLinkOpt(i), + OSL_ENSURE(OUString(aFltName) == pDoc->GetLinkFlt(i) && + OUString(aOptions) == pDoc->GetLinkOpt(i), "different Filter for a Document?"); } pTabs[nCount] = i; @@ -1080,7 +1079,7 @@ ScUndoRemoveLink::~ScUndoRemoveLink() delete[] pTabNames; } -rtl::OUString ScUndoRemoveLink::GetComment() const +OUString ScUndoRemoveLink::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); } @@ -1170,7 +1169,7 @@ sal_Bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const return (rTarget.ISA(ScTabViewTarget)); } -rtl::OUString ScUndoShowHideTab::GetComment() const +OUString ScUndoShowHideTab::GetComment() const { sal_uInt16 nId; if (undoTabs.size() > 1) @@ -1250,7 +1249,7 @@ sal_Bool ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; // makes no sense } -rtl::OUString ScUndoDocProtect::GetComment() const +OUString ScUndoDocProtect::GetComment() const { sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC; return ScGlobal::GetRscString( nId ); @@ -1322,7 +1321,7 @@ sal_Bool ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; // makes no sense } -rtl::OUString ScUndoTabProtect::GetComment() const +OUString ScUndoTabProtect::GetComment() const { sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB; return ScGlobal::GetRscString( nId ); @@ -1384,7 +1383,7 @@ sal_Bool ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; // makes no sense } -rtl::OUString ScUndoPrintRange::GetComment() const +OUString ScUndoPrintRange::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_PRINTRANGES ); } @@ -1409,7 +1408,7 @@ ScUndoScenarioFlags::~ScUndoScenarioFlags() { } -rtl::OUString ScUndoScenarioFlags::GetComment() const +OUString ScUndoScenarioFlags::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_EDITSCENARIO ); } @@ -1472,7 +1471,7 @@ ScUndoRenameObject::~ScUndoRenameObject() { } -rtl::OUString ScUndoRenameObject::GetComment() const +OUString ScUndoRenameObject::GetComment() const { // string resource shared with title for dialog return String( ScResId(SCSTR_RENAMEOBJECT) ); @@ -1584,7 +1583,7 @@ sal_Bool ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const return (rTarget.ISA(ScTabViewTarget)); } -rtl::OUString ScUndoLayoutRTL::GetComment() const +OUString ScUndoLayoutRTL::GetComment() const { return ScGlobal::GetRscString( STR_UNDO_TAB_RTL ); } diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index 06a1f1937775..e36813751ada 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -80,7 +80,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB bool bWasTemp = false; if ( pUndoData ) { - const ::rtl::OUString& aName = pUndoData->GetName(); + const OUString& aName = pUndoData->GetName(); if ( aName == STR_DB_LOCAL_NONAME ) bWasTemp = true; } @@ -89,7 +89,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB pRet = pDoc->GetAnonymousDBData(nTab); if (!pRet) { - pRet = new ScDBData( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)), nTab, + pRet = new ScDBData( OUString(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)), nTab, nCol1,nRow1, nCol2,nRow2, sal_True, pDoc->HasColHeader( nCol1,nRow1,nCol2,nRow2,nTab ) ); pDoc->SetAnonymousDBData(nTab,pRet); diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx index 94724946dd18..d3a4939a03a6 100644 --- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx +++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; SC_SIMPLE_SERVICE_INFO( ScChartRangeSelectionListener, "ScChartRangeSelectionListener", SC_SERVICENAME_CHRANGEHILIGHT ) diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index c8b241118531..3b1890d9e0b1 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -102,11 +102,11 @@ uno::Reference SAL_CALL ScAddressConversionObj::getProp static SfxItemPropertyMapEntry aPropertyMap[] = { {MAP_CHAR_LEN(SC_UNONAME_ADDRESS), 0, &getCppuType((table::CellRangeAddress*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static uno::Reference aRef(new SfxItemPropertySetInfo( aPropertyMap )); @@ -117,11 +117,11 @@ uno::Reference SAL_CALL ScAddressConversionObj::getProp static SfxItemPropertyMapEntry aPropertyMap[] = { {MAP_CHAR_LEN(SC_UNONAME_ADDRESS), 0, &getCppuType((table::CellAddress*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static uno::Reference aRef(new SfxItemPropertySetInfo( aPropertyMap )); @@ -129,7 +129,7 @@ uno::Reference SAL_CALL ScAddressConversionObj::getProp } } -void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue ) +void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -174,7 +174,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr else if ( aNameStr.EqualsAscii( SC_UNONAME_UIREPR ) ) { // parse the UI representation string - rtl::OUString sRepresentation; + OUString sRepresentation; if (aValue >>= sRepresentation) { String aUIString = sRepresentation; @@ -187,7 +187,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr ::formula::FormulaGrammar::CONV_XL_A1 : ::formula::FormulaGrammar::CONV_OOO; // parse the file format string - rtl::OUString sRepresentation; + OUString sRepresentation; if (aValue >>= sRepresentation) { String aUIString(sRepresentation); @@ -199,7 +199,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr if ( bIsRange ) { // range: also strip a "." after the last colon - sal_Int32 nColon = rtl::OUString(aUIString).lastIndexOf( (sal_Unicode) ':' ); + sal_Int32 nColon = OUString(aUIString).lastIndexOf( (sal_Unicode) ':' ); if ( nColon >= 0 && nColon < aUIString.Len() - 1 && aUIString.GetChar((xub_StrLen)nColon+1) == (sal_Unicode) '.' ) aUIString.Erase( (xub_StrLen)nColon+1, 1 ); @@ -216,7 +216,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr throw lang::IllegalArgumentException(); } -uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -257,7 +257,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString& aRange.Format( aFormatStr, nFlags, pDoc ); else aRange.aStart.Format( aFormatStr, nFlags, pDoc ); - aRet <<= rtl::OUString( aFormatStr ); + aRet <<= OUString( aFormatStr ); } else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XLA1REPR ) ) { @@ -278,7 +278,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString& aRange.aEnd.Format( aSecond, nFlags, pDoc, eConv ); aFormatStr.Append( aSecond ); } - aRet <<= rtl::OUString( aFormatStr ); + aRet <<= OUString( aFormatStr ); } else throw beans::UnknownPropertyException(); @@ -290,12 +290,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAddressConversionObj ) // lang::XServiceInfo -rtl::OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScAddressConversionObj" ); + return OUString("ScAddressConversionObj" ); } -sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -303,13 +303,13 @@ sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const rtl::OUString& : SC_SERVICENAME_CELLADDRESS ); } -uno::Sequence SAL_CALL ScAddressConversionObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScAddressConversionObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = bIsRange ? rtl::OUString(SC_SERVICENAME_RANGEADDRESS) - : rtl::OUString(SC_SERVICENAME_CELLADDRESS); + uno::Sequence aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = bIsRange ? OUString(SC_SERVICENAME_RANGEADDRESS) + : OUString(SC_SERVICENAME_CELLADDRESS); return aRet; } diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 33a788dfcbb2..4240c223fbec 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -102,15 +102,15 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &::getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &::getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &::getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -153,13 +153,13 @@ SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "ScAutoFormatsObj", SCAUTOFORMATSOBJ_S //------------------------------------------------------------------------ -static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const rtl::OUString& rName, sal_uInt16& rOutIndex ) +static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUString& rName, sal_uInt16& rOutIndex ) { ScAutoFormat::const_iterator itBeg = rFormats.begin(), itEnd = rFormats.end(); for (ScAutoFormat::const_iterator it = itBeg; it != itEnd; ++it) { const ScAutoFormatData* pEntry = it->second; - const rtl::OUString& aEntryName = pEntry->GetName(); + const OUString& aEntryName = pEntry->GetName(); if ( aEntryName.equals(rName) ) { size_t nPos = std::distance(itBeg, it); @@ -193,16 +193,16 @@ uno::Reference SAL_CALL ScAutoFormatsObj_CreateInstance( return xInst; } -rtl::OUString ScAutoFormatsObj::getImplementationName_Static() +OUString ScAutoFormatsObj::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScAutoFormatsObj" ); + return OUString( "stardiv.StarCalc.ScAutoFormatsObj" ); } -uno::Sequence ScAutoFormatsObj::getSupportedServiceNames_Static() +uno::Sequence ScAutoFormatsObj::getSupportedServiceNames_Static() { - uno::Sequence aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE )); + uno::Sequence aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE )); return aRet; } @@ -216,7 +216,7 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) return NULL; // falscher Index } -ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const OUString& aName) { String aString(aName); sal_uInt16 nIndex; @@ -228,7 +228,7 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const rtl::OUString& aNa // container::XNameContainer -void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -282,7 +282,7 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const } } -void SAL_CALL ScAutoFormatsObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScAutoFormatsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -292,7 +292,7 @@ void SAL_CALL ScAutoFormatsObj::replaceByName( const rtl::OUString& aName, const insertByName( aName, aElement ); } -void SAL_CALL ScAutoFormatsObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -319,7 +319,7 @@ uno::Reference SAL_CALL ScAutoFormatsObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); } // container::XIndexAccess @@ -355,7 +355,7 @@ sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException) // container::XNameAccess -uno::Any SAL_CALL ScAutoFormatsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScAutoFormatsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -366,13 +366,13 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByName( const rtl::OUString& aName ) return uno::makeAny(xFormat); } -uno::Sequence SAL_CALL ScAutoFormatsObj::getElementNames() +uno::Sequence SAL_CALL ScAutoFormatsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); - uno::Sequence aSeq(pFormats->size()); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq(pFormats->size()); + OUString* pAry = aSeq.getArray(); ScAutoFormat::const_iterator it = pFormats->begin(), itEnd = pFormats->end(); for (size_t i = 0; it != itEnd; ++it, ++i) { @@ -381,7 +381,7 @@ uno::Sequence SAL_CALL ScAutoFormatsObj::getElementNames() return aSeq; } -sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -477,7 +477,7 @@ uno::Reference SAL_CALL ScAutoFormatObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); } // container::XIndexAccess @@ -519,17 +519,17 @@ sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException) // container::XNamed -rtl::OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); if (IsInserted() && nFormatIndex < pFormats->size()) return pFormats->findByIndex(nFormatIndex)->GetName(); - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScAutoFormatObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -582,7 +582,7 @@ uno::Reference SAL_CALL ScAutoFormatObj::getPropertySet } void SAL_CALL ScAutoFormatObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -616,7 +616,7 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue( } } -uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -687,7 +687,7 @@ uno::Reference SAL_CALL ScAutoFormatFieldObj::getProper } void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -791,7 +791,7 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( } } -uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 906a227a548d..41fc7ae9663b 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -44,74 +44,74 @@ using namespace com::sun::star; //------------------------------------------------------------------------ // Calc document -extern uno::Sequence< rtl::OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScDocument_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScDocument_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr, const sal_uInt64 _nCreationFlags ) throw( uno::Exception ); // Calc XML import -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); // Calc XML export -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); // Calc XML Oasis export -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -extern uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw(); +extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw(); +extern OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); @@ -152,7 +152,7 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() {MAP_CHAR_LEN(SC_UNONAME_RANGEFIN), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_SCALE), 0, &getCppuType((sal_Int16*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_STBFUNC), 0, &getCppuType((sal_Int16*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_ULISTS), 0, &getCppuType((uno::Sequence*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_ULISTS), 0, &getCppuType((uno::Sequence*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_PRMETRICS),0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_USETABCOL),0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_REPLWARN), 0, &getBooleanCppuType(), 0, 0}, @@ -182,7 +182,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( return NULL; uno::Reference xFactory; - rtl::OUString aImpl(rtl::OUString::createFromAscii(pImplName)); + OUString aImpl(OUString::createFromAscii(pImplName)); if ( aImpl == ScSpreadsheetSettings::getImplementationName_Static() ) xFactory.set(cppu::createOneInstanceFactory( @@ -365,16 +365,16 @@ uno::Reference SAL_CALL ScSpreadsheetSettings_CreateInstance( return xInst; } -rtl::OUString ScSpreadsheetSettings::getImplementationName_Static() +OUString ScSpreadsheetSettings::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScSpreadsheetSettings" ); + return OUString( "stardiv.StarCalc.ScSpreadsheetSettings" ); } -uno::Sequence ScSpreadsheetSettings::getSupportedServiceNames_Static() +uno::Sequence ScSpreadsheetSettings::getSupportedServiceNames_Static() { - uno::Sequence aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE )); + uno::Sequence aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE )); return aRet; } @@ -390,7 +390,7 @@ uno::Reference SAL_CALL ScSpreadsheetSettings::getPrope } void SAL_CALL ScSpreadsheetSettings::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -499,7 +499,7 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( else if (aString.EqualsAscii( SC_UNONAME_ULISTS )) { ScUserList* pUserList = ScGlobal::GetUserList(); - uno::Sequence aSeq; + uno::Sequence aSeq; if ( pUserList && ( aValue >>= aSeq ) ) { // es wird direkt die "lebende" Liste veraendert, @@ -507,7 +507,7 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( pUserList->clear(); // alle Eintraege raus sal_uInt16 nCount = (sal_uInt16)aSeq.getLength(); - const rtl::OUString* pAry = aSeq.getConstArray(); + const OUString* pAry = aSeq.getConstArray(); for (sal_uInt16 i=0; iSetInputOptions( aInpOpt ); } -uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -586,8 +586,8 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString& if (pUserList) { size_t nCount = pUserList->size(); - uno::Sequence aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (size_t i=0; iGetString()); @@ -627,16 +627,16 @@ uno::Reference SAL_CALL ScRecentFunctionsObj_CreateInstance( return xInst; } -rtl::OUString ScRecentFunctionsObj::getImplementationName_Static() +OUString ScRecentFunctionsObj::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScRecentFunctionsObj" ); + return OUString( "stardiv.StarCalc.ScRecentFunctionsObj" ); } -uno::Sequence ScRecentFunctionsObj::getSupportedServiceNames_Static() +uno::Sequence ScRecentFunctionsObj::getSupportedServiceNames_Static() { - uno::Sequence aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE )); + uno::Sequence aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE )); return aRet; } @@ -708,16 +708,16 @@ uno::Reference SAL_CALL ScFunctionListObj_CreateInstance( return xInst; } -rtl::OUString ScFunctionListObj::getImplementationName_Static() +OUString ScFunctionListObj::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScFunctionListObj" ); + return OUString( "stardiv.StarCalc.ScFunctionListObj" ); } -uno::Sequence ScFunctionListObj::getSupportedServiceNames_Static() +uno::Sequence ScFunctionListObj::getSupportedServiceNames_Static() { - uno::Sequence aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE )); + uno::Sequence aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE )); return aRet; } @@ -730,21 +730,21 @@ static void lcl_FillSequence( uno::Sequence& rSequence, co beans::PropertyValue* pArray = rSequence.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID )); pArray[0].Value <<= (sal_Int32) rDesc.nFIndex; - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY )); pArray[1].Value <<= (sal_Int32) rDesc.nCategory; - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME )); if (rDesc.pFuncName) - pArray[2].Value <<= rtl::OUString( *rDesc.pFuncName ); + pArray[2].Value <<= OUString( *rDesc.pFuncName ); - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION )); if (rDesc.pFuncDesc) - pArray[3].Value <<= rtl::OUString( *rDesc.pFuncDesc ); + pArray[3].Value <<= OUString( *rDesc.pFuncDesc ); - pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS )); + pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS )); if (rDesc.ppDefArgNames && rDesc.ppDefArgDescs && rDesc.pDefArgFlags ) { sal_uInt16 nCount = rDesc.nArgCount; @@ -811,12 +811,12 @@ uno::Sequence SAL_CALL ScFunctionListObj::getById( sal_Int // XNameAccess -uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScFunctionListObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aNameStr(aName); + OUString aNameStr(aName); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { @@ -882,7 +882,7 @@ uno::Reference SAL_CALL ScFunctionListObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); } // XElementAccess @@ -899,15 +899,15 @@ sal_Bool SAL_CALL ScFunctionListObj::hasElements() throw(uno::RuntimeException) return ( getCount() > 0 ); } -uno::Sequence SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { sal_uInt32 nCount = pFuncList->GetCount(); - uno::Sequence aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (sal_uInt32 nIndex=0; nIndexGetFunction(nIndex); @@ -916,10 +916,10 @@ uno::Sequence SAL_CALL ScFunctionListObj::getElementNames() throw } return aSeq; } - return uno::Sequence(0); + return uno::Sequence(0); } -sal_Bool SAL_CALL ScFunctionListObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 0109379986c8..6578da838f05 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -79,7 +79,7 @@ namespace calc // register our property at the base class CellRangeAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString( "CellRange" ), + OUString( "CellRange" ), PROP_HANDLE_RANGE_ADDRESS, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -174,17 +174,17 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.sheet.OCellListSource" ); + return OUString( "com.sun.star.comp.sheet.OCellListSource" ); } //-------------------------------------------------------------------- - sal_Bool SAL_CALL OCellListSource::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL OCellListSource::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupportedServices( getSupportedServiceNames() ); - const ::rtl::OUString* pLookup = aSupportedServices.getConstArray(); - const ::rtl::OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); + Sequence< OUString > aSupportedServices( getSupportedServiceNames() ); + const OUString* pLookup = aSupportedServices.getConstArray(); + const OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); while ( pLookup != pLookupEnd ) if ( *pLookup++ == _rServiceName ) return sal_True; @@ -193,11 +193,11 @@ namespace calc } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellRangeListSource" ); - aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ListEntrySource" ); + Sequence< OUString > aServices( 2 ); + aServices[ 0 ] = OUString( "com.sun.star.table.CellRangeListSource" ); + aServices[ 1 ] = OUString( "com.sun.star.form.binding.ListEntrySource" ); return aServices; } @@ -214,14 +214,14 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow ) + OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow ) { OSL_PRECOND( m_xRange.is(), "OCellListSource::getRangeAddress: invalid range!" ); Reference< XTextRange > xCellText; if ( m_xRange.is() ) xCellText.set(xCellText.query( m_xRange->getCellByPosition( _nRangeRelativeColumn, _nRangeRelativeRow ) )); - ::rtl::OUString sText; + OUString sText; if ( xCellText.is() ) sText = xCellText->getString(); return sText; @@ -240,7 +240,7 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException) + OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); DBG_CHKTHIS( OCellListSource, checkConsistency_static ); @@ -254,15 +254,15 @@ namespace calc } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); DBG_CHKTHIS( OCellListSource, checkConsistency_static ); checkDisposed(); checkInitialized(); - Sequence< ::rtl::OUString > aAllEntries( getListEntryCount() ); - ::rtl::OUString* pAllEntries = aAllEntries.getArray(); + Sequence< OUString > aAllEntries( getListEntryCount() ); + OUString* pAllEntries = aAllEntries.getArray(); for ( sal_Int32 i = 0; i < aAllEntries.getLength(); ++i ) { *pAllEntries++ = getCellTextContent_noCheck( 0, i ); diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 07a46e2b37d2..469eb10f25e2 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -89,8 +89,8 @@ namespace calc // XListEntrySource virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); @@ -98,9 +98,9 @@ namespace calc virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -140,7 +140,7 @@ namespace calc @precond our m_xRange is not */ - ::rtl::OUString + OUString getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 1cb7552f6116..2d4a3bfa4ca1 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -155,13 +155,13 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() { static SfxItemPropertyMapEntry aCellsPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -173,15 +173,15 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -250,7 +250,7 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellsPropertySet( aCellsPropertyMap_Impl ); @@ -264,13 +264,13 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() { static SfxItemPropertyMapEntry aRangePropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -282,15 +282,15 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -374,13 +374,13 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() { static SfxItemPropertyMapEntry aCellPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -392,15 +392,15 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -432,7 +432,7 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_FORMRT), SC_WID_UNO_FORMRT, &getCppuType((table::CellContentType*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -474,7 +474,7 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellPropertySet( aCellPropertyMap_Impl ); @@ -488,13 +488,13 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() { static SfxItemPropertyMapEntry aColumnPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -506,15 +506,15 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -600,13 +600,13 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() { static SfxItemPropertyMapEntry aRowPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -618,15 +618,15 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -713,7 +713,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() { static SfxItemPropertyMapEntry aSheetPropertyMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_AUTOPRINT),SC_WID_UNO_AUTOPRINT,&getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_BORDCOL), SC_WID_UNO_BORDCOL, &getCppuType((sal_Int32*)0), 0, 0 }, @@ -721,7 +721,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT }, @@ -733,15 +733,15 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -785,11 +785,11 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER2),ATTR_BORDER, &::getCppuType((const table::BorderLine2*)0), 0, LEFT_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), SC_WID_UNO_LINKDISPBIT,&getCppuType((uno::Reference*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST }, {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS @@ -825,7 +825,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_TABCOLOR), SC_WID_UNO_TABCOLOR, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, &getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, &getCppuType(static_cast< const OUString * >(0)), 0, 0}, {MAP_CHAR_LEN(SC_UNO_NAMEDRANGES), SC_WID_UNO_NAMES, &getCppuType((uno::Reference*)0), 0, 0 }, {0,0,0,0,0,0} }; @@ -905,7 +905,7 @@ static void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& sal_uLong nCount = aSeq.getLength(); for (sal_uLong i=0; i>= aUStr; if ( !aUStr.isEmpty() ) { @@ -1289,7 +1289,7 @@ static sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, } static sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange, - const uno::Sequence< uno::Sequence >& aData, + const uno::Sequence< uno::Sequence >& aData, const formula::FormulaGrammar::Grammar eGrammar ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -1308,7 +1308,7 @@ static sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRang long nCols = 0; long nRows = aData.getLength(); - const uno::Sequence* pArray = aData.getConstArray(); + const uno::Sequence* pArray = aData.getConstArray(); if ( nRows ) nCols = pArray[0].getLength(); @@ -1332,11 +1332,11 @@ static sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRang SCROW nDocRow = nStartRow; for (long nRow=0; nRow& rColSeq = pArray[nRow]; + const uno::Sequence& rColSeq = pArray[nRow]; if ( rColSeq.getLength() == nCols ) { SCCOL nDocCol = nStartCol; - const rtl::OUString* pColArr = rColSeq.getConstArray(); + const OUString* pColArr = rColSeq.getConstArray(); for (long nCol=0; nCol SAL_CALL ScCellRangesBase::getPropertyStates( - const uno::Sequence& aPropertyNames ) + const uno::Sequence& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2022,7 +2022,7 @@ uno::Sequence SAL_CALL ScCellRangesBase::getPropertyStates return aRet; } -void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2067,7 +2067,7 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp } } -uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2113,7 +2113,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr ScUnoHelpFunctions::SetBoolInAny( aAny, false ); break; case SC_WID_UNO_CELLSTYL: - aAny <<= rtl::OUString( ScStyleNameConversion::DisplayToProgrammaticName( + aAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PARA ) ); break; case SC_WID_UNO_TBLBORD: @@ -2295,7 +2295,7 @@ static void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const } void SAL_CALL ScCellRangesBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -2397,7 +2397,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE break; case SC_WID_UNO_CELLSTYL: { - rtl::OUString aStrVal; + OUString aStrVal; aValue >>= aStrVal; String aString(ScStyleNameConversion::ProgrammaticToDisplayName( aStrVal, SFX_STYLE_FAMILY_PARA )); @@ -2492,7 +2492,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE } } -uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2568,7 +2568,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE const ScStyleSheet* pStyle = pDocShell->GetDocument()->GetSelectionStyle(*GetMarkData()); if (pStyle) aStyleName = pStyle->GetName(); - rAny <<= rtl::OUString( ScStyleNameConversion::DisplayToProgrammaticName( + rAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( aStyleName, SFX_STYLE_FAMILY_PARA ) ); } break; @@ -2648,13 +2648,13 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE { String sRet; aRanges.Format(sRet, SCR_ABS_3D, pDocShell->GetDocument()); - rAny <<= rtl::OUString(sRet); + rAny <<= OUString(sRet); } } } } -void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const rtl::OUString& /* aPropertyName */, +void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference& /* aListener */) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2666,7 +2666,7 @@ void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const rtl::OUString& OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const rtl::OUString& /* aPropertyName */, +void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference& /* aListener */) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2678,7 +2678,7 @@ void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const rtl::OUStrin OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const rtl::OUString&, +void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const OUString&, const uno::Reference&) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2686,7 +2686,7 @@ void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const rtl::OUString&, OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const rtl::OUString&, +void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const OUString&, const uno::Reference&) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2696,7 +2696,7 @@ void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const rtl::OUStrin // XMultiPropertySet -void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames, +void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, @@ -2713,7 +2713,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS if ( pDocShell && nCount ) { const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap(); // from derived class - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); const SfxItemPropertySimpleEntry** pEntryArray = new const SfxItemPropertySimpleEntry*[nCount]; @@ -2791,7 +2791,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS } uno::Sequence SAL_CALL ScCellRangesBase::getPropertyValues( - const uno::Sequence< rtl::OUString >& aPropertyNames ) + const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2808,7 +2808,7 @@ uno::Sequence SAL_CALL ScCellRangesBase::getPropertyValues( return aRet; } -void SAL_CALL ScCellRangesBase::addPropertiesChangeListener( const uno::Sequence< rtl::OUString >& /* aPropertyNames */, +void SAL_CALL ScCellRangesBase::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { @@ -2821,7 +2821,7 @@ void SAL_CALL ScCellRangesBase::removePropertiesChangeListener( const uno::Refer OSL_FAIL("not implemented"); } -void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< rtl::OUString >& /* aPropertyNames */, +void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { @@ -2843,7 +2843,7 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, SfxHint*, pHint ) } // XTolerantMultiPropertySet -uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::setPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames, +uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::setPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -2860,7 +2860,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set beans::SetPropertyTolerantFailed* pReturns = aReturns.getArray(); const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap(); // from derived class - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); const SfxItemPropertySimpleEntry** pMapArray = new const SfxItemPropertySimpleEntry*[nCount]; @@ -2967,7 +2967,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set return uno::Sequence < beans::SetPropertyTolerantFailed >(); } -uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::getPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) +uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::getPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2997,7 +2997,7 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get return aReturns; } -uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBase::getDirectPropertyValuesTolerant( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) +uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBase::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3227,7 +3227,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence SAL_CALL ScCellRangesBase::getRowDescriptions() +uno::Sequence SAL_CALL ScCellRangesBase::getRowDescriptions() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3235,19 +3235,19 @@ uno::Sequence SAL_CALL ScCellRangesBase::getRowDescriptions() if ( pMemChart ) { sal_Int32 nRowCount = static_cast(pMemChart->GetRowCount()); - uno::Sequence aSeq( nRowCount ); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq( nRowCount ); + OUString* pAry = aSeq.getArray(); for (sal_Int32 nRow = 0; nRow < nRowCount; nRow++) pAry[nRow] = pMemChart->GetRowText(static_cast(nRow)); delete pMemChart; return aSeq; } - return uno::Sequence(0); + return uno::Sequence(0); } void SAL_CALL ScCellRangesBase::setRowDescriptions( - const uno::Sequence& aRowDescriptions ) + const uno::Sequence& aRowDescriptions ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3266,7 +3266,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( { if ( pPosMap->GetRowCount() == static_cast(nRowCount) ) { - const rtl::OUString* pArray = aRowDescriptions.getConstArray(); + const OUString* pArray = aRowDescriptions.getConstArray(); for (long nRow=0; nRowGetRowHeaderPosition( @@ -3299,7 +3299,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( throw uno::RuntimeException(); } -uno::Sequence SAL_CALL ScCellRangesBase::getColumnDescriptions() +uno::Sequence SAL_CALL ScCellRangesBase::getColumnDescriptions() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3307,19 +3307,19 @@ uno::Sequence SAL_CALL ScCellRangesBase::getColumnDescriptions() if ( pMemChart ) { sal_Int32 nColCount = pMemChart->GetColCount(); - uno::Sequence aSeq( nColCount ); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq( nColCount ); + OUString* pAry = aSeq.getArray(); for (sal_Int32 nCol = 0; nCol < nColCount; nCol++) pAry[nCol] = pMemChart->GetColText(static_cast(nCol)); delete pMemChart; return aSeq; } - return uno::Sequence(0); + return uno::Sequence(0); } void SAL_CALL ScCellRangesBase::setColumnDescriptions( - const uno::Sequence& aColumnDescriptions ) + const uno::Sequence& aColumnDescriptions ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3338,7 +3338,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions( { if ( pPosMap->GetColCount() == static_cast(nColCount) ) { - const rtl::OUString* pArray = aColumnDescriptions.getConstArray(); + const OUString* pArray = aColumnDescriptions.getConstArray(); for (long nCol=0; nColGetColHeaderPosition( @@ -3406,7 +3406,7 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe ScDocument* pDoc = pDocShell->GetDocument(); ScRangeListRef aRangesRef( new ScRangeList(aRanges) ); ScChartListenerCollection* pColl = pDoc->GetChartListenerCollection(); - rtl::OUString aName = pColl->getUniqueName(rtl::OUString("__Uno")); + OUString aName = pColl->getUniqueName(OUString("__Uno")); if (aName.isEmpty()) // failed to create unique name. return; @@ -3979,7 +3979,7 @@ uno::Reference SAL_CALL ScCellRangesBase::findAll( ScMarkData aMark(*GetMarkData()); - rtl::OUString aDummyUndo; + OUString aDummyUndo; ScRangeList aMatchedRanges; SCCOL nCol = 0; SCROW nRow = 0; @@ -4028,7 +4028,7 @@ uno::Reference ScCellRangesBase::Find_Impl( ScDocument::GetSearchAndReplaceStart( *pSearchItem, nCol, nRow ); } - rtl::OUString aDummyUndo; + OUString aDummyUndo; ScRangeList aMatchedRanges; bool bFound = pDoc->SearchAndReplace( *pSearchItem, nCol, nRow, nTab, aMark, aMatchedRanges, aDummyUndo, NULL); @@ -4119,7 +4119,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference SAL_CALL ScCellRangesObj::getCells return NULL; } -rtl::OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() +OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4470,7 +4470,7 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const Str rNamedEntries.erase( rNamedEntries.begin() + n ); } -void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScCellRangesObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4599,7 +4599,7 @@ static sal_Bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, return false; // not found } -void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4664,7 +4664,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName ) // XNameReplace -void SAL_CALL ScCellRangesObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScCellRangesObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4676,7 +4676,7 @@ void SAL_CALL ScCellRangesObj::replaceByName( const rtl::OUString& aName, const // XNameAccess -uno::Any SAL_CALL ScCellRangesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScCellRangesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -4715,7 +4715,7 @@ static sal_Bool lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries, return false; } -uno::Sequence SAL_CALL ScCellRangesObj::getElementNames() +uno::Sequence SAL_CALL ScCellRangesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4728,8 +4728,8 @@ uno::Sequence SAL_CALL ScCellRangesObj::getElementNames() ScDocument* pDoc = pDocSh->GetDocument(); size_t nCount = rRanges.size(); - uno::Sequence aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (size_t i=0; i < nCount; i++) { // use given name if for exactly this range, otherwise just format @@ -4743,10 +4743,10 @@ uno::Sequence SAL_CALL ScCellRangesObj::getElementNames() } return aSeq; } - return uno::Sequence(0); + return uno::Sequence(0); } -sal_Bool SAL_CALL ScCellRangesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4764,7 +4764,7 @@ uno::Reference SAL_CALL ScCellRangesObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); } // XIndexAccess @@ -4803,12 +4803,12 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException) // XServiceInfo -rtl::OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellRangesObj" ); + return OUString( "ScCellRangesObj" ); } -sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellRangesObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -4818,15 +4818,15 @@ sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServic aServiceStr.EqualsAscii( SCPARAPROPERTIES_SERVICE ); } -uno::Sequence SAL_CALL ScCellRangesObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScCellRangesObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(4); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + uno::Sequence aRet(4); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); return aRet; } @@ -5017,13 +5017,13 @@ uno::Reference SAL_CALL ScCellRangeObj::getCellRangeByPositio } uno::Reference SAL_CALL ScCellRangeObj::getCellRangeByName( - const rtl::OUString& aName ) throw(uno::RuntimeException) + const OUString& aName ) throw(uno::RuntimeException) { return getCellRangeByName( aName, ScAddress::detailsOOOa1 ); } uno::Reference ScCellRangeObj::getCellRangeByName( - const rtl::OUString& aName, const ScAddress::Details& rDetails ) throw(uno::RuntimeException) + const OUString& aName, const ScAddress::Details& rDetails ) throw(uno::RuntimeException) { // name refers to the whole document (with the range's table as default), // valid only if the range is within this range @@ -5126,7 +5126,7 @@ uno::Reference SAL_CALL ScCellRangeObj::getSpreadsheet() // XArrayFormulaRange -rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException) +OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5160,8 +5160,8 @@ rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeExcep return aFormula; } -void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula, - const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) +void ScCellRangeObj::SetArrayFormula_Impl( const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) { ScDocShell* pDocSh = GetDocShell(); if (pDocSh) @@ -5187,16 +5187,16 @@ void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula, } } -void SAL_CALL ScCellRangeObj::setArrayFormula( const rtl::OUString& aFormula ) +void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; // GRAM_PODF_A1 for API compatibility. - SetArrayFormula_Impl( aFormula, ::rtl::OUString(), formula::FormulaGrammar::GRAM_PODF_A1); + SetArrayFormula_Impl( aFormula, OUString(), formula::FormulaGrammar::GRAM_PODF_A1); } -void ScCellRangeObj::SetArrayFormulaWithGrammar( const rtl::OUString& rFormula, - const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) +void ScCellRangeObj::SetArrayFormulaWithGrammar( const OUString& rFormula, + const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; SetArrayFormula_Impl( rFormula, rFormulaNmsp, eGrammar); @@ -5322,7 +5322,7 @@ void SAL_CALL ScCellRangeObj::setDataArray( // XCellRangeFormula -uno::Sequence< uno::Sequence > SAL_CALL ScCellRangeObj::getFormulaArray() +uno::Sequence< uno::Sequence > SAL_CALL ScCellRangeObj::getFormulaArray() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5344,12 +5344,12 @@ uno::Sequence< uno::Sequence > SAL_CALL ScCellRangeObj::getFormul SCROW nRowCount = nEndRow + 1 - nStartRow; SCTAB nTab = aRange.aStart.Tab(); - uno::Sequence< uno::Sequence > aRowSeq( nRowCount ); - uno::Sequence* pRowAry = aRowSeq.getArray(); + uno::Sequence< uno::Sequence > aRowSeq( nRowCount ); + uno::Sequence* pRowAry = aRowSeq.getArray(); for (SCROW nRowIndex = 0; nRowIndex < nRowCount; nRowIndex++) { - uno::Sequence aColSeq( nColCount ); - rtl::OUString* pColAry = aColSeq.getArray(); + uno::Sequence aColSeq( nColCount ); + OUString* pColAry = aColSeq.getArray(); for (SCCOL nColIndex = 0; nColIndex < nColCount; nColIndex++) pColAry[nColIndex] = lcl_GetInputString( pDocSh->GetDocument(), ScAddress( nStartCol+nColIndex, nStartRow+nRowIndex, nTab ), sal_True ); @@ -5364,7 +5364,7 @@ uno::Sequence< uno::Sequence > SAL_CALL ScCellRangeObj::getFormul } void SAL_CALL ScCellRangeObj::setFormulaArray( - const uno::Sequence< uno::Sequence >& aArray ) + const uno::Sequence< uno::Sequence >& aArray ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5581,7 +5581,7 @@ void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection, // XAutoFormattable -void SAL_CALL ScCellRangeObj::autoFormat( const rtl::OUString& aName ) +void SAL_CALL ScCellRangeObj::autoFormat( const OUString& aName ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -6094,12 +6094,12 @@ const SfxItemPropertyMap& ScCellRangeObj::GetItemPropertyMap() // XServiceInfo -rtl::OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellRangeObj" ); + return OUString( "ScCellRangeObj" ); } -sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellRangeObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -6110,16 +6110,16 @@ sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rService aServiceStr.EqualsAscii( SCPARAPROPERTIES_SERVICE ); } -uno::Sequence SAL_CALL ScCellRangeObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScCellRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(5); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + uno::Sequence aRet(5); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); return aRet; } @@ -6327,7 +6327,7 @@ void ScCellObj::SetValue_Impl(double fValue) // only for XML import -void ScCellObj::InputEnglishString( const ::rtl::OUString& rText ) +void ScCellObj::InputEnglishString( const OUString& rText ) { // This is like a mixture of setFormula and property FormulaLocal: // The cell's number format is checked for "text", a new cell format may be set, @@ -6418,13 +6418,13 @@ uno::Reference SAL_CALL ScCellObj::createTextCursorByRange( return xCursor; } -rtl::OUString SAL_CALL ScCellObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScCellObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return GetOutputString_Impl(); } -void SAL_CALL ScCellObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScCellObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aString(aText); @@ -6436,7 +6436,7 @@ void SAL_CALL ScCellObj::setString( const rtl::OUString& aText ) throw(uno::Runt } void SAL_CALL ScCellObj::insertString( const uno::Reference& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { // special handling for ScCellTextCursor is no longer needed, @@ -6564,13 +6564,13 @@ sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException) // XCell -rtl::OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException) +OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return GetInputString_Impl( true /* English */ ); } -void SAL_CALL ScCellObj::setFormula( const rtl::OUString& aFormula ) throw(uno::RuntimeException) +void SAL_CALL ScCellObj::setFormula( const OUString& aFormula ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aString(aFormula); @@ -6589,7 +6589,7 @@ void SAL_CALL ScCellObj::setValue( double nValue ) throw(uno::RuntimeException) SetValue_Impl(nValue); } -void SAL_CALL ScCellObj::setFormulaString( const rtl::OUString& aFormula) throw(uno::RuntimeException) +void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScDocShell *pDocSh = GetDocShell(); @@ -6784,7 +6784,7 @@ void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, c { if ( pEntry->nWID == SC_WID_UNO_FORMLOC ) { - rtl::OUString aStrVal; + OUString aStrVal; aValue >>= aStrVal; String aString(aStrVal); SetString_Impl(aString, sal_True, false); // lokal interpretieren @@ -6808,7 +6808,7 @@ void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, if ( pEntry->nWID == SC_WID_UNO_FORMLOC ) { // sal_False = lokal - rAny <<= rtl::OUString( GetInputString_Impl(false) ); + rAny <<= OUString( GetInputString_Impl(false) ); } else if ( pEntry->nWID == SC_WID_UNO_FORMRT ) { @@ -6827,12 +6827,12 @@ const SfxItemPropertyMap& ScCellObj::GetItemPropertyMap() // XServiceInfo -rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellObj" ); + return OUString( "ScCellObj" ); } -sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { // CellRange/SheetCellRange are not in SheetCell service description, @@ -6849,18 +6849,18 @@ sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName aServiceStr.EqualsAscii( SCCELLRANGE_SERVICE ); } -uno::Sequence SAL_CALL ScCellObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScCellObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(7); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); - pArray[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + uno::Sequence aRet(7); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); + pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); return aRet; } @@ -7120,7 +7120,7 @@ uno::Reference SAL_CALL ScTableSheetObj::getAnnotation } uno::Reference SAL_CALL ScTableSheetObj::getCellRangeByName( - const rtl::OUString& rRange ) throw(uno::RuntimeException) + const OUString& rRange ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName( rRange ); @@ -7288,17 +7288,17 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc // XNamed -rtl::OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aName; + OUString aName; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) pDocSh->GetDocument()->GetName( GetTab_Impl(), aName ); return aName; } -void SAL_CALL ScTableSheetObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScTableSheetObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7709,14 +7709,14 @@ void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode ) //! Filter und Options aus altem Link suchen - rtl::OUString aUrl(getLinkUrl()); - rtl::OUString aSheet(getLinkSheetName()); + OUString aUrl(getLinkUrl()); + OUString aSheet(getLinkSheetName()); - rtl::OUString aEmpty; + OUString aEmpty; link( aUrl, aSheet, aEmpty, aEmpty, nLinkMode ); } -rtl::OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aFile; @@ -7726,7 +7726,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException return aFile; } -void SAL_CALL ScTableSheetObj::setLinkUrl( const rtl::OUString& aLinkUrl ) +void SAL_CALL ScTableSheetObj::setLinkUrl( const OUString& aLinkUrl ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7734,13 +7734,13 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const rtl::OUString& aLinkUrl ) //! Filter und Options aus altem Link suchen sheet::SheetLinkMode eMode = getLinkMode(); - rtl::OUString aSheet(getLinkSheetName()); + OUString aSheet(getLinkSheetName()); - rtl::OUString aEmpty; + OUString aEmpty; link( aLinkUrl, aSheet, aEmpty, aEmpty, eMode ); } -rtl::OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aSheet; @@ -7750,7 +7750,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeExc return aSheet; } -void SAL_CALL ScTableSheetObj::setLinkSheetName( const rtl::OUString& aLinkSheetName ) +void SAL_CALL ScTableSheetObj::setLinkSheetName( const OUString& aLinkSheetName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7758,14 +7758,14 @@ void SAL_CALL ScTableSheetObj::setLinkSheetName( const rtl::OUString& aLinkSheet //! Filter und Options aus altem Link suchen sheet::SheetLinkMode eMode = getLinkMode(); - rtl::OUString aUrl(getLinkUrl()); + OUString aUrl(getLinkUrl()); - rtl::OUString aEmpty; + OUString aEmpty; link( aUrl, aLinkSheetName, aEmpty, aEmpty, eMode ); } -void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUString& aSheetName, - const rtl::OUString& aFilterName, const rtl::OUString& aFilterOptions, +void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aSheetName, + const OUString& aFilterName, const OUString& aFilterOptions, sheet::SheetLinkMode nMode ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -7775,10 +7775,10 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); - rtl::OUString aFileString = aUrl; - rtl::OUString aFilterString = aFilterName; - rtl::OUString aOptString = aFilterOptions; - rtl::OUString aSheetString = aSheetName; + OUString aFileString = aUrl; + OUString aFilterString = aFilterName; + OUString aOptString = aFilterOptions; + OUString aSheetString = aSheetName; aFileString = ScGlobal::GetAbsDocName( aFileString, pDocSh ); if (aFilterString.isEmpty()) @@ -8027,7 +8027,7 @@ void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientat // XProtectable -void SAL_CALL ScTableSheetObj::protect( const rtl::OUString& aPassword ) +void SAL_CALL ScTableSheetObj::protect( const OUString& aPassword ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8040,7 +8040,7 @@ void SAL_CALL ScTableSheetObj::protect( const rtl::OUString& aPassword ) } } -void SAL_CALL ScTableSheetObj::unprotect( const rtl::OUString& aPassword ) +void SAL_CALL ScTableSheetObj::unprotect( const OUString& aPassword ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8077,22 +8077,22 @@ sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException) return false; } -rtl::OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDocSh->GetDocument()->GetScenarioData( GetTab_Impl(), aComment, aColor, nFlags ); return aComment; } - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScTableSheetObj::setScenarioComment( const rtl::OUString& aScenarioComment ) +void SAL_CALL ScTableSheetObj::setScenarioComment( const OUString& aScenarioComment ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8102,8 +8102,8 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const rtl::OUString& aScenari ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8161,7 +8161,7 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException) { ScDocument* pDoc = pDocSh->GetDocument(); SCTAB nTab = GetTab_Impl(); - rtl::OUString aName; + OUString aName; pDoc->GetName( nTab, aName ); // Name dieses Szenarios SCTAB nDestTab = nTab; @@ -8210,7 +8210,7 @@ uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges( ) // XExternalSheetName -void ScTableSheetObj::setExternalName( const ::rtl::OUString& aUrl, const ::rtl::OUString& aSheetName ) +void ScTableSheetObj::setExternalName( const OUString& aUrl, const OUString& aSheetName ) throw (container::ElementExistException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8225,7 +8225,7 @@ void ScTableSheetObj::setExternalName( const ::rtl::OUString& aUrl, const ::rtl: const String aDocTabName( ScGlobal::GetDocTabName( aAbsDocName, aSheetName ) ); if ( !pDoc->RenameTab( nTab, aDocTabName, false /*bUpdateRef*/, sal_True /*bExternalDocument*/ ) ) { - throw container::ElementExistException( ::rtl::OUString(), *this ); + throw container::ElementExistException( OUString(), *this ); } } } @@ -8277,9 +8277,9 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn if ( pEntry->nWID == SC_WID_UNO_PAGESTL ) { - rtl::OUString aStrVal; + OUString aStrVal; aValue >>= aStrVal; - rtl::OUString aNewStr(ScStyleNameConversion::ProgrammaticToDisplayName( + OUString aNewStr(ScStyleNameConversion::ProgrammaticToDisplayName( aStrVal, SFX_STYLE_FAMILY_PAGE )); //! Undo? (auch bei SID_STYLE_APPLY an der View) @@ -8321,8 +8321,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn sal_Int32 nNewColor = 0; if (aValue >>= nNewColor) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8338,8 +8338,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8371,8 +8371,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8404,8 +8404,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8437,8 +8437,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8470,8 +8470,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8503,8 +8503,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetName( nTab, aName ); @@ -8566,7 +8566,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn } else if ( pEntry->nWID == SC_WID_UNO_CODENAME ) { - rtl::OUString aCodeName; + OUString aCodeName; if ( pDocSh && ( aValue >>= aCodeName ) ) { pDocSh->GetDocument()->SetCodeName( GetTab_Impl(), aCodeName ); @@ -8595,7 +8595,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn } else if ( pEntry->nWID == SC_WID_UNO_PAGESTL ) { - rAny <<= rtl::OUString( ScStyleNameConversion::DisplayToProgrammaticName( + rAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName( pDoc->GetPageStyle( nTab ), SFX_STYLE_FAMILY_PAGE ) ); } else if ( pEntry->nWID == SC_WID_UNO_CELLVIS ) @@ -8622,7 +8622,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8634,7 +8634,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8646,7 +8646,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8658,7 +8658,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8670,7 +8670,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8682,7 +8682,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8694,7 +8694,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn { if (pDoc->IsScenario(nTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -8720,10 +8720,10 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn } else if ( pEntry->nWID == SC_WID_UNO_CODENAME ) { - rtl::OUString aCodeName; + OUString aCodeName; if ( pDocSh ) pDocSh->GetDocument()->GetCodeName( GetTab_Impl(), aCodeName ); - rAny <<= rtl::OUString( aCodeName ); + rAny <<= OUString( aCodeName ); } else ScCellRangeObj::GetOnePropertyValue(pEntry, rAny); @@ -8737,12 +8737,12 @@ const SfxItemPropertyMap& ScTableSheetObj::GetItemPropertyMap() // XServiceInfo -rtl::OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScTableSheetObj" ); + return OUString( "ScTableSheetObj" ); } -sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScTableSheetObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -8755,18 +8755,18 @@ sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServic aServiceStr.EqualsAscii( SCLINKTARGET_SERVICE ); } -uno::Sequence SAL_CALL ScTableSheetObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScTableSheetObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(7); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); - pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); - pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); - pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); - pArray[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); - pArray[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); + uno::Sequence aRet(7); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE )); + pArray[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE )); + pArray[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE )); + pArray[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE )); + pArray[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE )); + pArray[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); return aRet; } @@ -8864,7 +8864,7 @@ uno::Sequence SAL_CALL ScTableColumnObj::getImplementationId() throw(u // XNamed -rtl::OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -8875,7 +8875,7 @@ rtl::OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException) return ScColToAlpha( nCol ); // from global.hxx } -void SAL_CALL ScTableColumnObj::setName( const rtl::OUString& /* aNewName */ ) +void SAL_CALL ScTableColumnObj::setName( const OUString& /* aNewName */ ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 09ef26331a80..bfa5bd806598 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -85,7 +85,7 @@ namespace calc // register our property at the base class CellAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString( "BoundCell" ), + OUString( "BoundCell" ), PROP_HANDLE_BOUND_CELL, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -185,7 +185,7 @@ namespace calc if ( m_xCellText.is() ) { // an XTextRange can be used to set/get "string" values - aTypes[1] = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + aTypes[1] = ::getCppuType( static_cast< OUString* >( NULL ) ); // and additionally, we use it to handle booleans aTypes[2] = ::getCppuType( static_cast< sal_Bool* >( NULL ) ); } @@ -232,7 +232,7 @@ namespace calc if ( m_xCellText.is() ) aReturn <<= m_xCellText->getString(); else - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); break; case TypeClass_BOOLEAN: @@ -254,7 +254,7 @@ namespace calc if ( xProp.is() ) { CellContentType eResultType; - if ( (xProp->getPropertyValue(::rtl::OUString( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE ) + if ( (xProp->getPropertyValue(OUString( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE ) bHasValue = sal_True; } } @@ -318,7 +318,7 @@ namespace calc { OSL_ENSURE( m_xCellText.is(), "OCellValueBinding::setValue: don't have a text!" ); - ::rtl::OUString sText; + OUString sText; aValue >>= sText; if ( m_xCellText.is() ) m_xCellText->setString( sText ); @@ -392,7 +392,7 @@ namespace calc { // set boolean number format if not already set - ::rtl::OUString sPropName( "NumberFormat" ); + OUString sPropName( "NumberFormat" ); Reference xCellProp( m_xCell, UNO_QUERY ); Reference xSupplier( m_xDocument, UNO_QUERY ); if ( xSupplier.is() && xCellProp.is() ) @@ -417,10 +417,10 @@ namespace calc if ( xOldFormat.is() ) { // use the locale of the existing format - xOldFormat->getPropertyValue( ::rtl::OUString( "Locale" ) ) >>= aLocale; + xOldFormat->getPropertyValue( OUString( "Locale" ) ) >>= aLocale; sal_Int16 nOldType = ::comphelper::getINT16( - xOldFormat->getPropertyValue( ::rtl::OUString( "Type" ) ) ); + xOldFormat->getPropertyValue( OUString( "Type" ) ) ); if ( nOldType & NumberFormat::LOGICAL ) bWasBoolean = sal_True; } @@ -456,9 +456,9 @@ namespace calc OCellValueBinding* pNonConstThis = const_cast< OCellValueBinding* >( this ); if ( !pNonConstThis->supportsType( _rType ) ) { - ::rtl::OUString sMessage( "The given type (" ); + OUString sMessage( "The given type (" ); sMessage += _rType.getTypeName(); - sMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) ); + sMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( ") is not supported by this binding." ) ); // TODO: localize this error message throw IncompatibleTypesException( sMessage, *pNonConstThis ); @@ -467,21 +467,21 @@ namespace calc } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OCellValueBinding::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL OCellValueBinding::getImplementationName( ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - return ::rtl::OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); + return OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); } //-------------------------------------------------------------------- - sal_Bool SAL_CALL OCellValueBinding::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL OCellValueBinding::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - Sequence< ::rtl::OUString > aSupportedServices( getSupportedServiceNames() ); - const ::rtl::OUString* pLookup = aSupportedServices.getConstArray(); - const ::rtl::OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); + Sequence< OUString > aSupportedServices( getSupportedServiceNames() ); + const OUString* pLookup = aSupportedServices.getConstArray(); + const OUString* pLookupEnd = aSupportedServices.getConstArray() + aSupportedServices.getLength(); while ( pLookup != pLookupEnd ) if ( *pLookup++ == _rServiceName ) return sal_True; @@ -490,15 +490,15 @@ namespace calc } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - Sequence< ::rtl::OUString > aServices( m_bListPos ? 3 : 2 ); - aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellValueBinding" ); - aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ValueBinding" ); + Sequence< OUString > aServices( m_bListPos ? 3 : 2 ); + aServices[ 0 ] = OUString( "com.sun.star.table.CellValueBinding" ); + aServices[ 1 ] = OUString( "com.sun.star.form.binding.ValueBinding" ); if ( m_bListPos ) - aServices[ 2 ] = ::rtl::OUString( "com.sun.star.table.ListPositionCellBinding" ); + aServices[ 2 ] = OUString( "com.sun.star.table.ListPositionCellBinding" ); return aServices; } diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 3ad5744918e5..10d12ca96f15 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -103,9 +103,9 @@ namespace calc virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index a3e6797452c2..38036b7982b1 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -63,8 +63,6 @@ SC_SIMPLE_SERVICE_INFO( ScChart2DataSequence, "ScChart2DataSequence", using namespace ::com::sun::star; using namespace ::formula; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::std::auto_ptr; @@ -110,7 +108,7 @@ template< typename T > struct lcl_appendTableNumber : public ::std::unary_function< SCTAB, void > { - lcl_appendTableNumber( ::rtl::OUStringBuffer & rBuffer ) : + lcl_appendTableNumber( OUStringBuffer & rBuffer ) : m_rBuffer( rBuffer ) {} void operator() ( SCTAB nTab ) @@ -120,12 +118,12 @@ struct lcl_appendTableNumber : public ::std::unary_function< SCTAB, void > m_rBuffer.append( sal_Unicode( ' ' )); } private: - ::rtl::OUStringBuffer & m_rBuffer; + OUStringBuffer & m_rBuffer; }; -::rtl::OUString lcl_createTableNumberList( const ::std::list< SCTAB > & rTableList ) +OUString lcl_createTableNumberList( const ::std::list< SCTAB > & rTableList ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::std::for_each( rTableList.begin(), rTableList.end(), lcl_appendTableNumber( aBuffer )); // remove last trailing ' ' if( aBuffer.getLength() > 0 ) @@ -1043,7 +1041,7 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint if( ! m_pDocument ) return false; - rtl::OUString aRangeRepresentation; + OUString aRangeRepresentation; for(sal_Int32 i = 0; i < aArguments.getLength(); ++i) { if ( aArguments[i].Name == "CellRangeRepresentation" ) @@ -1448,7 +1446,7 @@ ScChart2DataProvider::createDataSource( bool bLabel = true; bool bCategories = false; bool bOrientCol = true; - ::rtl::OUString aRangeRepresentation; + OUString aRangeRepresentation; uno::Sequence< sal_Int32 > aSequenceMapping; for(sal_Int32 i = 0; i < aArguments.getLength(); ++i) { @@ -1770,7 +1768,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum bool bRowSourceDetected = false; bool bFirstCellAsLabel = false; bool bHasCategories = false; - ::rtl::OUString sRangeRep; + OUString sRangeRep; bool bHasCategoriesLabels = false; vector aAllCategoriesValuesTokens; @@ -1803,8 +1801,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if(!bHasCategories) { Reference< beans::XPropertySet > xSeqProp( xLS->getValues(), uno::UNO_QUERY ); - ::rtl::OUString aRole; - if( xSeqProp.is() && (xSeqProp->getPropertyValue(::rtl::OUString("Role")) >>= aRole) && + OUString aRole; + if( xSeqProp.is() && (xSeqProp->getPropertyValue(OUString("Role")) >>= aRole) && aRole.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories")) ) bThisIsCategories = bHasCategories = true; } @@ -1906,7 +1904,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func); func.getList(aTableNumList); aResult.push_back( - beans::PropertyValue( ::rtl::OUString("TableNumberList"), -1, + beans::PropertyValue( OUString("TableNumberList"), -1, uno::makeAny( lcl_createTableNumberList( aTableNumList ) ), beans::PropertyState_DIRECT_VALUE )); } @@ -1915,7 +1913,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("DataRowSource"), -1, + beans::PropertyValue( OUString("DataRowSource"), -1, uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE )); } @@ -1923,7 +1921,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("HasCategories"), -1, + beans::PropertyValue( OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE )); } @@ -1931,7 +1929,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("FirstCellAsLabel"), -1, + beans::PropertyValue( OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE )); } @@ -1957,7 +1955,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum // add cell range property aResult.push_back( - beans::PropertyValue( ::rtl::OUString("CellRangeRepresentation"), -1, + beans::PropertyValue( OUString("CellRangeRepresentation"), -1, uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE )); //Sequence Mapping @@ -1986,11 +1984,11 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aNewSequences( xDataSource->getDataSequences()); - rtl::OUString aOldLabel; - rtl::OUString aNewLabel; - rtl::OUString aOldValues; - rtl::OUString aNewValues; - rtl::OUString aEmpty; + OUString aOldLabel; + OUString aNewLabel; + OUString aOldValues; + OUString aNewValues; + OUString aEmpty; for( sal_Int32 nNewIndex = 0; nNewIndex < aNewSequences.getLength(); nNewIndex++ ) { @@ -2027,7 +2025,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bDifferentIndexes && !aSequenceMappingVector.empty() ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString("SequenceMapping"), -1, + beans::PropertyValue( OUString("SequenceMapping"), -1, uno::makeAny( lcl_VectorToSequence(aSequenceMappingVector) ) , beans::PropertyState_DIRECT_VALUE )); } @@ -2036,7 +2034,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum return lcl_VectorToSequence( aResult ); } -::sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const ::rtl::OUString& aRangeRepresentation ) +::sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2052,7 +2050,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum uno::Reference< chart2::data::XDataSequence > SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentation( - const ::rtl::OUString& aRangeRepresentation ) + const OUString& aRangeRepresentation ) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -2223,7 +2221,7 @@ ScChart2DataProvider::createDataSequenceByFormulaTokens( // XRangeXMLConversion --------------------------------------------------- -rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUString& sRangeRepresentation ) +OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const OUString& sRangeRepresentation ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { OUString aRet; @@ -2248,7 +2246,7 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUStr return aRet; } -rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUString& sXMLRange ) +OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXMLRange ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { const sal_Unicode cSep = ' '; @@ -2259,11 +2257,11 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUS // #i74062# When loading flat XML, this is called before the referenced sheets are in the document, // so the conversion has to take place directly with the strings, without looking up the sheets. - rtl::OUStringBuffer sRet; + OUStringBuffer sRet; sal_Int32 nOffset = 0; while( nOffset >= 0 ) { - rtl::OUString sToken; + OUString sToken; ScRangeStringConverter::GetTokenByOffset( sToken, sXMLRange, nOffset, cSep, cQuote ); if( nOffset >= 0 ) { @@ -2306,7 +2304,7 @@ ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException) void SAL_CALL ScChart2DataProvider::setPropertyValue( - const ::rtl::OUString& rPropertyName, const uno::Any& rValue) + const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, @@ -2323,7 +2321,7 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue( uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2342,7 +2340,7 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2352,7 +2350,7 @@ void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2362,7 +2360,7 @@ void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2372,7 +2370,7 @@ void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( void SAL_CALL ScChart2DataProvider::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2486,11 +2484,11 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, // BM: don't use names of named ranges but the UI range strings // String aStr; // rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); -// m_aIdentifier = ::rtl::OUString( aStr ); +// m_aIdentifier = OUString( aStr ); -// m_aIdentifier = ::rtl::OUString( "ID_"); +// m_aIdentifier = OUString( "ID_"); // static sal_Int32 nID = 0; -// m_aIdentifier += ::rtl::OUString::valueOf( ++nID); +// m_aIdentifier += OUString::valueOf( ++nID); } ScChart2DataSequence::~ScChart2DataSequence() @@ -3059,10 +3057,10 @@ uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData() // XTextualDataSequence -------------------------------------------------- -uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence aSeq; + uno::Sequence aSeq; if ( !m_pDocument ) throw uno::RuntimeException(); @@ -3071,8 +3069,8 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) sal_Int32 nCount = m_aDataArray.size(); if ( nCount > 0 ) { - aSeq = uno::Sequence(nCount); - rtl::OUString* pArr = aSeq.getArray(); + aSeq = uno::Sequence(nCount); + OUString* pArr = aSeq.getArray(); ::std::list::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end(); for(; itr != itrEnd; ++itr, ++pArr) *pArr = itr->maString; @@ -3081,7 +3079,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) { if( m_pTokens->front()->GetType() == svString ) { - aSeq = uno::Sequence(1); + aSeq = uno::Sequence(1); aSeq[0] = m_pTokens->front()->GetString(); } } @@ -3089,7 +3087,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( ) return aSeq; } -::rtl::OUString SAL_CALL ScChart2DataSequence::getSourceRangeRepresentation() +OUString SAL_CALL ScChart2DataSequence::getSourceRangeRepresentation() throw ( uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3207,7 +3205,7 @@ private: } -uno::Sequence< ::rtl::OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::data::LabelOrigin eOrigin) +uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::data::LabelOrigin eOrigin) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3478,7 +3476,7 @@ ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException) void SAL_CALL ScChart2DataSequence::setPropertyValue( - const ::rtl::OUString& rPropertyName, const uno::Any& rValue) + const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, @@ -3504,7 +3502,7 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue( uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3528,7 +3526,7 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue( void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -3539,7 +3537,7 @@ void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -3550,7 +3548,7 @@ void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -3561,7 +3559,7 @@ void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index d0f688f424c7..6529ffd50b13 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -155,7 +155,7 @@ ScChartObj* ScChartsObj::GetObjectByIndex_Impl(long nIndex) const return NULL; } -ScChartObj* ScChartsObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScChartObj* ScChartsObj::GetObjectByName_Impl(const OUString& aName) const { String aNameString(aName); if ( lcl_FindChartObj( pDocShell, nTab, aNameString ) ) @@ -165,7 +165,7 @@ ScChartObj* ScChartsObj::GetObjectByName_Impl(const rtl::OUString& aName) const // XTableCharts -void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, +void SAL_CALL ScChartsObj::addNewByName( const OUString& aName, const awt::Rectangle& aRect, const uno::Sequence& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) @@ -208,7 +208,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, ScRangeListRef xNewRanges( pList ); uno::Reference < embed::XEmbeddedObject > xObj; - ::rtl::OUString aTmp( aNameString ); + OUString aTmp( aNameString ); if ( SvtModuleOptions().IsChart() ) xObj = pDocShell->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aTmp ); if ( xObj.is() ) @@ -251,7 +251,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, if( sRangeStr.Len() ) xReceiver->attachDataProvider( xDataProvider ); else - sRangeStr = rtl::OUString("all"); + sRangeStr = OUString("all"); uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( pDocShell->GetModel(), uno::UNO_QUERY ); xReceiver->attachNumberFormatsSupplier( xNumberFormatsSupplier ); @@ -259,16 +259,16 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, // set arguments uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString("CellRangeRepresentation"), -1, - uno::makeAny( ::rtl::OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); + OUString("CellRangeRepresentation"), -1, + uno::makeAny( OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString("HasCategories"), -1, + OUString("HasCategories"), -1, uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString("FirstCellAsLabel"), -1, + OUString("FirstCellAsLabel"), -1, uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString("DataRowSource"), -1, + OUString("DataRowSource"), -1, uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); } @@ -289,7 +289,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, } } -void SAL_CALL ScChartsObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScChartsObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -314,7 +314,7 @@ uno::Reference SAL_CALL ScChartsObj::createEnumeration( throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableChartsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableChartsEnumeration")); } // XIndexAccess @@ -371,7 +371,7 @@ sal_Bool SAL_CALL ScChartsObj::hasElements() throw(uno::RuntimeException) return getCount() != 0; } -uno::Any SAL_CALL ScChartsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScChartsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -383,7 +383,7 @@ uno::Any SAL_CALL ScChartsObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence SAL_CALL ScChartsObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence SAL_CALL ScChartsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) @@ -391,8 +391,8 @@ uno::Sequence SAL_CALL ScChartsObj::getElementNames() throw(uno:: ScDocument* pDoc = pDocShell->GetDocument(); long nCount = getCount(); - uno::Sequence aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq(nCount); + OUString* pAry = aSeq.getArray(); long nPos = 0; ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); @@ -424,10 +424,10 @@ uno::Sequence SAL_CALL ScChartsObj::getElementNames() throw(uno:: return aSeq; } - return uno::Sequence(0); + return uno::Sequence(0); } -sal_Bool SAL_CALL ScChartsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -447,7 +447,7 @@ ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const String& rN) pDocShell->GetDocument()->AddUnoObject(*this); uno::Sequence< table::CellRangeAddress > aInitialPropValue; - registerPropertyNoMember( ::rtl::OUString( "RelatedCellRanges" ), + registerPropertyNoMember( OUString( "RelatedCellRanges" ), PROP_HANDLE_RELATED_CELLRANGES, beans::PropertyAttribute::MAYBEVOID, ::getCppuType( &aInitialPropValue ), &aInitialPropValue ); } @@ -485,7 +485,7 @@ void ScChartObj::GetData_Impl( ScRangeListRef& rRanges, bool& rColHeaders, bool& { uno::Sequence< beans::PropertyValue > aArgs( xProvider->detectArguments( xReceiver->getUsedData() ) ); - rtl::OUString aRanges; + OUString aRanges; chart::ChartDataRowSource eDataRowSource = chart::ChartDataRowSource_COLUMNS; bool bHasCategories=false; bool bFirstCellAsLabel=false; @@ -766,13 +766,13 @@ uno::Reference SAL_CALL ScChartObj::getEmbeddedObject() throw( // XNamed -rtl::OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aChartName; } -void SAL_CALL ScChartObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException) +void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; throw uno::RuntimeException(); // name cannot be changed diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 4c42538adf7c..d72a9c313165 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -63,7 +63,7 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() {MAP_CHAR_LEN(SC_UNO_RASTERSUBY), 0, &getCppuType((sal_Int32*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_RASTERSYNC), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_AUTOCALC), 0, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_PRINTERNAME), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_PRINTERNAME), 0, &getCppuType((OUString*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_PRINTERSETUP), 0, &getCppuType((uno::Sequence*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_APPLYDOCINF), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_FORBIDDEN), 0, &getCppuType((uno::Reference*)0), beans::PropertyAttribute::READONLY, 0}, @@ -120,7 +120,7 @@ uno::Reference SAL_CALL ScDocumentConfiguration::getPro } void SAL_CALL ScDocumentConfiguration::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -171,7 +171,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( pDoc->SetAutoCalc( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERNAME ) == 0 ) { - rtl::OUString sPrinterName; + OUString sPrinterName; if ( aValue >>= sPrinterName ) { // #i75610# if the name is empty, do nothing (don't create any printer) @@ -272,13 +272,13 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( uno::Sequence< beans::PropertyValue > aInfo; if ( !( aValue >>= aInfo ) ) throw lang::IllegalArgumentException( - ::rtl::OUString( "Value of type Sequence expected!" ), + OUString( "Value of type Sequence expected!" ), uno::Reference< uno::XInterface >(), 2 ); if ( !pDocShell->SetModifyPasswordInfo( aInfo ) ) throw beans::PropertyVetoException( - ::rtl::OUString( "The hash is not allowed to be changed now!" ), + OUString( "The hash is not allowed to be changed now!" ), uno::Reference< uno::XInterface >() ); } else if ( aPropertyName.compareToAscii( SC_UNO_EMBED_FONTS ) == 0 ) @@ -330,7 +330,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( throw uno::RuntimeException(); } -uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -379,9 +379,9 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString // (as in SwXDocumentSettings) SfxPrinter* pPrinter = pDoc->GetPrinter( false ); if (pPrinter) - aRet <<= rtl::OUString ( pPrinter->GetName()); + aRet <<= OUString ( pPrinter->GetName()); else - aRet <<= rtl::OUString(); + aRet <<= OUString(); } else if ( aPropertyName.compareToAscii( SC_UNO_PRINTERSETUP ) == 0 ) { @@ -465,12 +465,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration ) // XServiceInfo -rtl::OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScDocumentConfiguration" ); + return OUString( "ScDocumentConfiguration" ); } -sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -478,13 +478,13 @@ sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& aServiceStr.EqualsAscii( SCDOCUMENTSETTINGS_SERVICE ); } -uno::Sequence SAL_CALL ScDocumentConfiguration::getSupportedServiceNames() +uno::Sequence SAL_CALL ScDocumentConfiguration::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE )); + uno::Sequence aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index a71a324bf5c8..d2c2f35e38ca 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -448,7 +448,7 @@ uno::Reference SAL_CALL ScCellCursorObj::getCellRangeByPositi } uno::Reference SAL_CALL ScCellCursorObj::getCellRangeByName( - const rtl::OUString& rRange ) throw(uno::RuntimeException) + const OUString& rRange ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName(rRange); @@ -456,12 +456,12 @@ uno::Reference SAL_CALL ScCellCursorObj::getCellRangeByName( // XServiceInfo -rtl::OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellCursorObj" ); + return OUString( "ScCellCursorObj" ); } -sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellCursorObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -470,19 +470,19 @@ sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServic ScCellRangeObj::supportsService(rServiceName); } -uno::Sequence SAL_CALL ScCellCursorObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScCellCursorObj::getSupportedServiceNames() throw(uno::RuntimeException) { // get all service names from cell range - uno::Sequence aParentSeq(ScCellRangeObj::getSupportedServiceNames()); + uno::Sequence aParentSeq(ScCellRangeObj::getSupportedServiceNames()); sal_Int32 nParentLen = aParentSeq.getLength(); - const rtl::OUString* pParentArr = aParentSeq.getConstArray(); + const OUString* pParentArr = aParentSeq.getConstArray(); // SheetCellCursor should be first (?) - uno::Sequence aTotalSeq( nParentLen + 2 ); - rtl::OUString* pTotalArr = aTotalSeq.getArray(); - pTotalArr[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE )); - pTotalArr[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE )); + uno::Sequence aTotalSeq( nParentLen + 2 ); + OUString* pTotalArr = aTotalSeq.getArray(); + pTotalArr[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE )); + pTotalArr[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE )); // append cell range services for (long i=0; i*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_REPEATEMPTY), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_ROWGRAND), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_SERVICEARG), 0, &getCppuType((uno::Sequence*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_DP_SHOWFILTER), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_DP_SOURCESERVICE), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_DP_SOURCESERVICE), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; return aDataPilotDescriptorBaseMap_Impl; @@ -809,7 +808,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp } else if ( aNameString.EqualsAscii( SC_UNO_DP_GRANDTOTAL_NAME ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aNewData.SetGrandTotalName(aStrVal); } @@ -847,7 +846,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp } else if ( aNameString.EqualsAscii( SC_UNO_DP_SOURCESERVICE ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) { String aEmpty; @@ -874,7 +873,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp if (pOldDesc) aServiceDesc = *pOldDesc; - rtl::OUString aStrVal; + OUString aStrVal; sal_Int32 nArgs = aArgSeq.getLength(); for (sal_Int32 nArgPos=0; nArgPosGetDPServiceDesc(); if (pServiceDesc) aServiceName = pServiceDesc->aServiceName; @@ -1002,13 +1001,13 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope { uno::Sequence aSeq( 4 ); beans::PropertyValue* pArray = aSeq.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SOURCENAME )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_SOURCENAME )); pArray[0].Value <<= pServiceDesc->aParSource; - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_OBJECTNAME )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_OBJECTNAME )); pArray[1].Value <<= pServiceDesc->aParName; - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USERNAME )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_USERNAME )); pArray[2].Value <<= pServiceDesc->aParUser; - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_PASSWORD )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_PASSWORD )); pArray[3].Value <<= pServiceDesc->aParPass; aRet <<= aSeq; } @@ -1857,7 +1856,7 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException) aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) ); else { - const rtl::OUString* pLayoutName = pDim->GetLayoutName(); + const OUString* pLayoutName = pDim->GetLayoutName(); if (pLayoutName) aName = *pLayoutName; else @@ -2263,7 +2262,7 @@ void ScDataPilotFieldObj::setUseCurrentPage( sal_Bool bUse ) { /* It is somehow useless to set the property "HasSelectedPage" to true, because it is still needed to set an explicit page name. */ - const ::rtl::OUString aPage; + const OUString aPage; pDim->SetCurrentPage( &aPage ); } else @@ -2408,7 +2407,7 @@ DataPilotFieldGroupInfo ScDataPilotFieldObj::getGroupInfo() ScFieldGroup aGroup; aGroup.maName = pGroup->GetGroupName(); for( sal_Int32 nMemIdx = 0, nMemCount = pGroup->GetElementCount(); nMemIdx < nMemCount; ++nMemIdx ) - if (const rtl::OUString* pMem = pGroup->GetElementByIndex(nMemIdx)) + if (const OUString* pMem = pGroup->GetElementByIndex(nMemIdx)) aGroup.maMembers.push_back( *pMem ); aGroups.push_back( aGroup ); } @@ -2555,13 +2554,13 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons ScDPObject* pDPObj = 0; if( ScDPSaveDimension* pDim = GetDPDimension( &pDPObj ) ) { - rtl::OUString aDimName = pDim->GetName(); + OUString aDimName = pDim->GetName(); ScDPSaveData aSaveData = *pDPObj->GetSaveData(); ScDPDimensionSaveData* pDimData = aSaveData.GetDimensionData(); // created if not there // find original base - rtl::OUString aBaseDimName( aDimName ); + OUString aBaseDimName( aDimName ); const ScDPSaveGroupDimension* pBaseGroupDim = pDimData->GetNamedGroupDim( aDimName ); if ( pBaseGroupDim ) { @@ -2581,7 +2580,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons { for (nEntry=0; nEntry SAL_CALL ScDataPilotFieldObj::createNameGroup( cons } } } - rtl::OUString aGroupDimName = pGroupDimension->GetGroupDimName(); + OUString aGroupDimName = pGroupDimension->GetGroupDimName(); //! localized prefix string - rtl::OUString aGroupName = pGroupDimension->CreateGroupName( String( RTL_CONSTASCII_USTRINGPARAM( "Group" ) ) ); + OUString aGroupName = pGroupDimension->CreateGroupName( String( RTL_CONSTASCII_USTRINGPARAM( "Group" ) ) ); ScDPSaveGroupItem aGroup( aGroupName ); Reference< XNameAccess > xMembers = GetMembers(); if (!xMembers.is()) @@ -2746,9 +2745,9 @@ Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( con ScDPDimensionSaveData& rDimData = *aSaveData.GetDimensionData(); // find source dimension name - const rtl::OUString& rDimName = pDim->GetName(); + const OUString& rDimName = pDim->GetName(); const ScDPSaveGroupDimension* pGroupDim = rDimData.GetNamedGroupDim( rDimName ); - rtl::OUString aSrcDimName = pGroupDim ? pGroupDim->GetSourceDimName() : rDimName; + OUString aSrcDimName = pGroupDim ? pGroupDim->GetSourceDimName() : rDimName; // find a group dimension for the base field, or get numeric grouping pGroupDim = rDimData.GetFirstNamedGroupDim( aSrcDimName ); diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index b45539503323..d41ffc85e052 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -112,7 +112,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() {MAP_CHAR_LEN(SC_UNONAME_ISUSER), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_KEEPFORM), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((uno::Reference*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_MOVCELLS), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_STRIPDAT), 0, &getBooleanCppuType(), 0, 0}, @@ -217,28 +217,28 @@ void ScImportDescriptor::FillProperties( uno::Sequence& rS aDescriptor.setDataSource(rParam.aDBName); if (aDescriptor.has( svx::daDataSource )) { - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME )); pArray[0].Value <<= rParam.aDBName; } else if (aDescriptor.has( svx::daConnectionResource )) { - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES )); pArray[0].Value <<= rParam.aDBName; } - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE )); pArray[1].Value <<= eMode; - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ )); pArray[2].Value <<= rParam.aStatement; - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE )); ScUnoHelpFunctions::SetBoolInAny( pArray[3].Value, rParam.bNative ); } void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequence& rSeq ) { - rtl::OUString aStrVal; + OUString aStrVal; const beans::PropertyValue* pPropArray = rSeq.getConstArray(); long nPropCount = rSeq.getLength(); for (long i = 0; i < nPropCount; i++) @@ -340,31 +340,31 @@ void ScSortDescriptor::FillProperties( uno::Sequence& rSeq // Sequence fuellen - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS )); pArray[0].Value = ::cppu::bool2any(!rParam.bByRow); - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR )); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader ); - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD )); pArray[2].Value <<= static_cast( rParam.GetSortKeyCount() ); - pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD )); + pArray[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD )); pArray[3].Value <<= aFields; - pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT )); + pArray[4].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT )); ScUnoHelpFunctions::SetBoolInAny( pArray[4].Value, rParam.bIncludePattern ); - pArray[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT )); + pArray[5].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT )); ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, !rParam.bInplace ); - pArray[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS )); + pArray[6].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS )); pArray[6].Value <<= aOutPos; - pArray[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST )); + pArray[7].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST )); ScUnoHelpFunctions::SetBoolInAny( pArray[7].Value, rParam.bUserDef ); - pArray[8].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX )); + pArray[8].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX )); pArray[8].Value <<= static_cast( rParam.nUserIndex ); } @@ -485,7 +485,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence>= sStr ) rParam.aCollatorAlgorithm = sStr; } @@ -675,7 +675,7 @@ uno::Reference SAL_CALL ScSubTotalDescriptorBase::creat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); } // XIndexAccess @@ -728,7 +728,7 @@ uno::Reference SAL_CALL ScSubTotalDescriptorBase::getPr } void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -771,7 +771,7 @@ void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( PutData(aParam); } -uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1476,7 +1476,7 @@ uno::Reference SAL_CALL ScFilterDescriptorBase::getProp } void SAL_CALL ScFilterDescriptorBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1523,7 +1523,7 @@ void SAL_CALL ScFilterDescriptorBase::setPropertyValue( PutData(aParam); } -uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1736,13 +1736,13 @@ ScDBData* ScDatabaseRangeObj::GetDBData_Impl() const // XNamed -rtl::OUString SAL_CALL ScDatabaseRangeObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScDatabaseRangeObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aName; } -void SAL_CALL ScDatabaseRangeObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScDatabaseRangeObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2048,7 +2048,7 @@ uno::Reference SAL_CALL ScDatabaseRangeObj::getProperty } void SAL_CALL ScDatabaseRangeObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -2140,7 +2140,7 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue( } } -uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2168,7 +2168,7 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const rtl::OUString& aPr // ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_DBAREA ); } else if ( aString.EqualsAscii( SC_UNO_LINKDISPNAME ) ) - aRet <<= rtl::OUString( aName ); + aRet <<= OUString( aName ); else if (aString.EqualsAscii( SC_UNONAME_AUTOFLT )) { sal_Bool bAutoFilter(GetDBData_Impl()->HasAutoFilter()); @@ -2216,12 +2216,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj ) // XServiceInfo -rtl::OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScDatabaseRangeObj" ); + return OUString( "ScDatabaseRangeObj" ); } -sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -2229,13 +2229,13 @@ sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rSer aServiceStr.EqualsAscii( SCLINKTARGET_SERVICE ); } -uno::Sequence SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); + uno::Sequence aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE )); return aRet; } @@ -2284,7 +2284,7 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByIndex_Impl(size_t nIndex) return new ScDatabaseRangeObj(pDocShell, itr->GetName()); } -ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell && hasByName(aName) ) { @@ -2295,7 +2295,7 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const rtl::OUStrin } -void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName, +void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, const table::CellRangeAddress& aRange ) throw(uno::RuntimeException) { @@ -2314,7 +2314,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName, throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScDatabaseRangesObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2335,7 +2335,7 @@ uno::Reference SAL_CALL ScDatabaseRangesObj::createEnum throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); } // XIndexAccess @@ -2384,7 +2384,7 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException // XNameAccess -uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2397,7 +2397,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -uno::Sequence SAL_CALL ScDatabaseRangesObj::getElementNames() +uno::Sequence SAL_CALL ScDatabaseRangesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2410,7 +2410,7 @@ uno::Sequence SAL_CALL ScDatabaseRangesObj::getElementNames() if (pNames) { const ScDBCollection::NamedDBs& rDBs = pNames->getNamedDBs(); - uno::Sequence aSeq(rDBs.size()); + uno::Sequence aSeq(rDBs.size()); ScDBCollection::NamedDBs::const_iterator itr = rDBs.begin(), itrEnd = rDBs.end(); for (size_t i = 0; itr != itrEnd; ++itr, ++i) aSeq[i] = itr->GetName(); @@ -2418,10 +2418,10 @@ uno::Sequence SAL_CALL ScDatabaseRangesObj::getElementNames() return aSeq; } } - return uno::Sequence(0); + return uno::Sequence(0); } -sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 8e100da64d57..5afa88f7e900 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -50,15 +50,15 @@ static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, @@ -123,7 +123,7 @@ uno::Reference SAL_CALL ScDocDefaultsObj::getPropertySe } void SAL_CALL ScDocDefaultsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -216,7 +216,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue( } } -uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -276,7 +276,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocDefaultsObj ) // XPropertyState -beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -311,13 +311,13 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const rtl::OUS } uno::Sequence SAL_CALL ScDocDefaultsObj::getPropertyStates( - const uno::Sequence& aPropertyNames ) + const uno::Sequence& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { // the simple way: call getPropertyState SolarMutexGuard aGuard; - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++) @@ -325,7 +325,7 @@ uno::Sequence SAL_CALL ScDocDefaultsObj::getPropertyStates return aRet; } -void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -346,7 +346,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const rtl::OUString& aProp } } -uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index ee5013fe9fbd..4f125516222c 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -98,7 +98,7 @@ void ScDispatchProviderInterceptor::Notify( SfxBroadcaster&, const SfxHint& rHin // XDispatchProvider uno::Reference SAL_CALL ScDispatchProviderInterceptor::queryDispatch( - const util::URL& aURL, const rtl::OUString& aTargetFrameName, + const util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(uno::RuntimeException) { @@ -266,7 +266,7 @@ static void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImport { // descriptor has to be complete anyway - rtl::OUString aEmpty; + OUString aEmpty; aDescriptor[svx::daDataSource] <<= aEmpty; aDescriptor[svx::daCommand] <<= aEmpty; aDescriptor[svx::daCommandType] <<= (sal_Int32)sdb::CommandType::TABLE; @@ -367,7 +367,7 @@ void SAL_CALL ScDispatch::selectionChanged( const ::com::sun::star::lang::EventO { frame::FeatureStateEvent aEvent; aEvent.Source.set(static_cast(this)); - aEvent.FeatureURL.Complete = rtl::OUString::createFromAscii( cURLDocDataSource ); + aEvent.FeatureURL.Complete = OUString::createFromAscii( cURLDocDataSource ); lcl_FillDataSource( aEvent, aNewImport ); // modifies State, IsEnabled diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 34a0de491604..4f66ccab159e 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -112,7 +112,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(SC_UNO_VBAGLOBNAME), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(SC_UNO_VBAGLOBNAME), 0, &getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0}, @@ -137,7 +137,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {MAP_CHAR_LEN(SC_UNO_SPELLONLINE), PROP_UNO_SPELLONLINE, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), PROP_UNO_STANDARDDEC, &getCppuType((sal_Int16*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_REGEXENABLED), PROP_UNO_REGEXENABLED, &getBooleanCppuType(), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_RUNTIMEUID), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(SC_UNO_RUNTIMEUID), 0, &getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_HASVALIDSIGNATURES),0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_ISLOADED), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_ISUNDOENABLED), 0, &getBooleanCppuType(), 0, 0}, @@ -145,8 +145,8 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {MAP_CHAR_LEN(SC_UNO_ISEXECUTELINKENABLED), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_ISCHANGEREADONLYENABLED), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_REFERENCEDEVICE), 0, &getCppuType((uno::Reference*)0), beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN("BuildId"), 0, &::getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, - {MAP_CHAR_LEN(SC_UNO_CODENAME), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, + {MAP_CHAR_LEN("BuildId"), 0, &::getCppuType(static_cast< const OUString * >(0)), 0, 0}, + {MAP_CHAR_LEN(SC_UNO_CODENAME), 0, &getCppuType(static_cast< const OUString * >(0)), 0, 0}, {0,0,0,0,0,0} }; @@ -229,64 +229,64 @@ ScPrintUIOptions::ScPrintUIOptions() m_aUIProperties.realloc(nNumProps); // load the writer PrinterOptions into the custom tab - m_aUIProperties[nIdx].Name = rtl::OUString("OptionsUIFile"); - m_aUIProperties[nIdx++].Value <<= rtl::OUString("modules/scalc/ui/printeroptions.ui"); + m_aUIProperties[nIdx].Name = OUString("OptionsUIFile"); + m_aUIProperties[nIdx++].Value <<= OUString("modules/scalc/ui/printeroptions.ui"); // create Section for spreadsheet (results in an extra tab page in dialog) SvtModuleOptions aOpt; String aAppGroupname( aStrings.GetString( 9 ) ); aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), aOpt.GetModuleName( SvtModuleOptions::E_SCALC ) ); - m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, rtl::OUString()); + m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, OUString()); // show subgroup for pages - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pages", rtl::OUString(aStrings.GetString(0)), rtl::OUString()); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pages", OUString(aStrings.GetString(0)), OUString()); // create a bool option for empty pages - m_aUIProperties[nIdx++].Value = setBoolControlOpt("includeemptypages", rtl::OUString( aStrings.GetString( 1 ) ), + m_aUIProperties[nIdx++].Value = setBoolControlOpt("includeemptypages", OUString( aStrings.GetString( 1 ) ), ".HelpID:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox", "IsIncludeEmptyPages", ! bSuppress); // show Subgroup for print content vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" ); - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aStrings.GetString(2)), - rtl::OUString(), + aPrintRangeOpt.maGroupHint = OUString( "PrintRange" ); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aStrings.GetString(2)), + OUString(), aPrintRangeOpt); // create a choice for the content to create - uno::Sequence< rtl::OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 ); + uno::Sequence< OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 ); aChoices[0] = aStrings.GetString( 3 ); - aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); + aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); aWidgetIds[0] = "printallsheets"; aChoices[1] = aStrings.GetString( 4 ); - aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); + aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); aWidgetIds[1] = "printselectedsheets"; aChoices[2] = aStrings.GetString( 5 ); - aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); + aHelpIds[2] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); aWidgetIds[2] = "printselectedcells"; - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, "PrintContent", aChoices, nContent ); // show Subgroup for print range aPrintRangeOpt.mbInternalOnly = sal_True; - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("fromwhich", rtl::OUString(aStrings.GetString(6)), - rtl::OUString(), + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("fromwhich", OUString(aStrings.GetString(6)), + OUString(), aPrintRangeOpt); // create a choice for the range to print - rtl::OUString aPrintRangeName( "PrintRange" ); + OUString aPrintRangeName( "PrintRange" ); aChoices.realloc( 2 ); aHelpIds.realloc( 2 ); aWidgetIds.realloc( 2 ); aChoices[0] = aStrings.GetString( 7 ); - aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ); + aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ); aWidgetIds[0] = "printallpages"; aChoices[1] = aStrings.GetString( 8 ); - aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ); + aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ); aWidgetIds[1] = "printpages"; - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintRangeName, aChoices, @@ -294,9 +294,9 @@ ScPrintUIOptions::ScPrintUIOptions() // create a an Edit dependent on "Pages" selected vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True ); - m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", rtl::OUString(), + m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", OUString(), ".HelpID:vcl:PrintDialog:PageRange:Edit", - "PageRange", rtl::OUString(), aPageRangeOpt); + "PageRange", OUString(), aPageRangeOpt); assert(nIdx == nNumProps); } @@ -316,7 +316,7 @@ void ScPrintUIOptions::SetDefaults() { for (sal_Int32 nPropPos=0; nPropPos(this) ); } @@ -987,7 +987,7 @@ uno::Sequence SAL_CALL ScModelObj::getRenderer( sal_Int32 SolarMutexGuard aGuard; if (!pDocShell) { - throw lang::DisposedException( ::rtl::OUString(), + throw lang::DisposedException( OUString(), static_cast< sheet::XSpreadsheetDocument* >(this) ); } @@ -1019,7 +1019,7 @@ uno::Sequence SAL_CALL ScModelObj::getRenderer( sal_Int32 uno::Sequence aSequence(1); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); pArray[0].Value <<= aPageSize; if( ! pPrinterOptions ) @@ -1066,17 +1066,17 @@ uno::Sequence SAL_CALL ScModelObj::getRenderer( sal_Int32 long nPropCount = bWasCellRange ? 3 : 2; uno::Sequence aSequence(nPropCount); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE )); pArray[0].Value <<= aPageSize; // #i111158# all positions are relative to the whole page, including non-printable area - pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA )); + pArray[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA )); pArray[1].Value = uno::makeAny( sal_True ); if ( bWasCellRange ) { table::CellRangeAddress aRangeAddress( nTab, aCellRange.aStart.Col(), aCellRange.aStart.Row(), aCellRange.aEnd.Col(), aCellRange.aEnd.Row() ); - pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE )); + pArray[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE )); pArray[2].Value <<= aRangeAddress; } @@ -1095,7 +1095,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec SolarMutexGuard aGuard; if (!pDocShell) { - throw lang::DisposedException( ::rtl::OUString(), + throw lang::DisposedException( OUString(), static_cast< sheet::XSpreadsheetDocument* >(this) ); } @@ -1169,7 +1169,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec // the sheet starts at the top of the page Rectangle aArea( pDev->PixelToLogic( Rectangle( 0,0,0,0 ) ) ); sal_Int32 nDestID = pPDFData->CreateDest( aArea ); - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( nTab, aTabName ); sal_Int32 nParent = -1; // top-level pPDFData->CreateOutlineItem( nParent, aTabName, nDestID ); @@ -1178,7 +1178,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec if( pPDFData && pPDFData->GetIsExportNamedDestinations() ) { Rectangle aArea( pDev->PixelToLogic( Rectangle( 0,0,0,0 ) ) ); - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( nTab, aTabName ); //need the PDF page number here pPDFData->CreateNamedDest( aTabName, aArea ); @@ -1198,7 +1198,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec std::vector< vcl::PDFExtOutDevBookmarkEntry >::iterator aIEnd = rBookmarks.end(); while ( aIter != aIEnd ) { - rtl::OUString aBookmark = aIter->aBookmark; + OUString aBookmark = aIter->aBookmark; if ( aBookmark.toChar() == (sal_Unicode) '#' ) { // try to resolve internal link @@ -1414,7 +1414,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabledIn ) // XProtectable -void SAL_CALL ScModelObj::protect( const rtl::OUString& aPassword ) throw(uno::RuntimeException) +void SAL_CALL ScModelObj::protect( const OUString& aPassword ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; // #i108245# if already protected, don't change anything @@ -1425,7 +1425,7 @@ void SAL_CALL ScModelObj::protect( const rtl::OUString& aPassword ) throw(uno::R } } -void SAL_CALL ScModelObj::unprotect( const rtl::OUString& aPassword ) +void SAL_CALL ScModelObj::unprotect( const OUString& aPassword ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1465,7 +1465,7 @@ uno::Reference SAL_CALL ScModelObj::getDrawPages() throw(un sheet::GoalResult SAL_CALL ScModelObj::seekGoal( const table::CellAddress& aFormulaPosition, const table::CellAddress& aVariablePosition, - const ::rtl::OUString& aGoalValue ) + const OUString& aGoalValue ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1556,10 +1556,10 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) uno::Sequence< beans::PropertyValue > aSeq; aSeq.realloc(1); - rtl::OUString sName; + OUString sName; pDocShell->GetDocument()->GetName( pDocShell->GetDocument()->GetVisibleTab(), sName ); - rtl::OUString sOUName(sName); - aSeq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); + OUString sOUName(sName); + aSeq[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); aSeq[0].Value <<= sOUName; xCont->insertByIndex( 0, uno::makeAny( aSeq ) ); } @@ -1581,7 +1581,7 @@ uno::Reference SAL_CALL ScModelObj::getPropertySetInfo( } void SAL_CALL ScModelObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1620,7 +1620,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } else if ( aString.EqualsAscii( SC_UNO_CODENAME ) ) { - rtl::OUString sCodeName; + OUString sCodeName; if ( aValue >>= sCodeName ) pDoc->SetCodeName( sCodeName ); } @@ -1699,7 +1699,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } else if ( aString.EqualsAscii( "SavedObject" ) ) // set from chart after saving { - rtl::OUString aObjName; + OUString aObjName; aValue >>= aObjName; if ( !aObjName.isEmpty() ) pDoc->RestoreChartListener( aObjName ); @@ -1716,7 +1716,7 @@ void SAL_CALL ScModelObj::setPropertyValue( } } -uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1744,7 +1744,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa } else if ( aString.EqualsAscii( SC_UNO_CODENAME ) ) { - rtl::OUString sCodeName = pDoc->GetCodeName(); + OUString sCodeName = pDoc->GetCodeName(); aRet <<= sCodeName; } @@ -1839,7 +1839,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa That constant will be equivelant to 'ThisComponent' but for each application, so e.g. a 'ThisExcelDoc' and a 'ThisWordDoc' constant can co-exist, as required by VBA. */ - aRet <<= rtl::OUString( "ThisExcelDoc" ); + aRet <<= OUString( "ThisExcelDoc" ); } else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) ) { @@ -1893,7 +1893,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScModelObj ) // XMultiServiceFactory uno::Reference SAL_CALL ScModelObj::createInstance( - const rtl::OUString& aServiceSpecifier ) + const OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1972,7 +1972,7 @@ uno::Reference SAL_CALL ScModelObj::createInstance( } uno::Reference SAL_CALL ScModelObj::createInstanceWithArguments( - const rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const uno::Sequence& aArgs ) throw(uno::Exception, uno::RuntimeException) { @@ -1993,7 +1993,7 @@ uno::Reference SAL_CALL ScModelObj::createInstanceWithArguments return xInt; } -uno::Sequence SAL_CALL ScModelObj::getAvailableServiceNames() +uno::Sequence SAL_CALL ScModelObj::getAvailableServiceNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2002,20 +2002,20 @@ uno::Sequence SAL_CALL ScModelObj::getAvailableServiceNames() //! return concatServiceNames( ScServiceProvider::GetAllServiceNames(), //! SvxFmMSFactory::getAvailableServiceNames() ); - uno::Sequence aMyServices(ScServiceProvider::GetAllServiceNames()); - uno::Sequence aDrawServices(SvxFmMSFactory::getAvailableServiceNames()); + uno::Sequence aMyServices(ScServiceProvider::GetAllServiceNames()); + uno::Sequence aDrawServices(SvxFmMSFactory::getAvailableServiceNames()); return concatServiceNames( aMyServices, aDrawServices ); } // XServiceInfo -rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScModelObj" ); + return OUString( "ScModelObj" ); } -sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -2024,13 +2024,13 @@ sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName aServiceStr.EqualsAscii( SCDOC_SERVICE ); } -uno::Sequence SAL_CALL ScModelObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScModelObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); + uno::Sequence aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); return aRet; } @@ -2119,7 +2119,7 @@ bool ScModelObj::HasChangesListeners() const return pDocShell && pDocShell->GetDocument()->HasAnySheetEventScript(SC_SHEETEVENT_CHANGE); } -void ScModelObj::NotifyChanges( const ::rtl::OUString& rOperation, const ScRangeList& rRanges, +void ScModelObj::NotifyChanges( const OUString& rOperation, const ScRangeList& rRanges, const uno::Sequence< beans::PropertyValue >& rProperties ) { if ( pDocShell && HasChangesListeners() ) @@ -2178,7 +2178,7 @@ void ScModelObj::NotifyChanges( const ::rtl::OUString& rOperation, const ScRange const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CHANGE); + const OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CHANGE); if (pScript) { ScRangeList aTabRanges; // collect ranges on this sheet @@ -2235,7 +2235,7 @@ void ScModelObj::HandleCalculateEvents() { if (const ScSheetEvents* pEvents = pDoc->GetSheetEvents( nTab )) { - if (const rtl::OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CALCULATE)) + if (const OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_CALCULATE)) { uno::Any aRet; uno::Sequence aParams; @@ -2315,7 +2315,7 @@ uno::Reference SAL_CALL ScDrawPagesObj::insertNewByIndex( sa uno::Reference xRet; if (pDocShell) { - rtl::OUString aNewName; + OUString aNewName; pDocShell->GetDocument()->CreateValidTabName(aNewName); if ( pDocShell->GetDocFunc().InsertTable( static_cast(nPos), aNewName, true, true ) ) @@ -2409,7 +2409,7 @@ ScTableSheetObj* ScTableSheetsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const return NULL; } -ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const OUString& aName) const { if (pDocShell) { @@ -2420,7 +2420,7 @@ ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const rtl::OUString& aNa return NULL; } -void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal_Int16 nPosition ) +void SAL_CALL ScTableSheetsObj::insertNewByName( const OUString& aName, sal_Int16 nPosition ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2434,7 +2434,7 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int16 nDestination ) +void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDestination ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2449,8 +2449,8 @@ void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int1 throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName, - const rtl::OUString& aCopy, sal_Int16 nDestination ) +void SAL_CALL ScTableSheetsObj::copyByName( const OUString& aName, + const OUString& aCopy, sal_Int16 nDestination ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2479,7 +2479,7 @@ void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName, throw uno::RuntimeException(); // no other exceptions specified } -void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScTableSheetsObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2531,7 +2531,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const } } -void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScTableSheetsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2583,7 +2583,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const } } -void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScTableSheetsObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2604,7 +2604,7 @@ void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName ) sal_Int32 ScTableSheetsObj::importSheet( const uno::Reference < sheet::XSpreadsheetDocument > & xDocSrc, - const rtl::OUString& srcName, const sal_Int32 nDestPosition ) + const OUString& srcName, const sal_Int32 nDestPosition ) throw( lang::IllegalArgumentException, lang::IndexOutOfBoundsException, uno::RuntimeException ) { //pDocShell is the destination @@ -2660,7 +2660,7 @@ uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPos return xSheet->getCellRangeByPosition(nLeft, nTop, nRight, nBottom); } -uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj::getCellRangesByName( const rtl::OUString& aRange ) +uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj::getCellRangesByName( const OUString& aRange ) throw (lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2695,7 +2695,7 @@ uno::Reference SAL_CALL ScTableSheetsObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); } // XIndexAccess @@ -2735,7 +2735,7 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException) // XNameAccess -uno::Any SAL_CALL ScTableSheetsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScTableSheetsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2747,7 +2747,7 @@ uno::Any SAL_CALL ScTableSheetsObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence SAL_CALL ScTableSheetsObj::getElementNames() +uno::Sequence SAL_CALL ScTableSheetsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2755,9 +2755,9 @@ uno::Sequence SAL_CALL ScTableSheetsObj::getElementNames() { ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nCount = pDoc->GetTableCount(); - rtl::OUString aName; - uno::Sequence aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + OUString aName; + uno::Sequence aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (SCTAB i=0; iGetName( i, aName ); @@ -2765,10 +2765,10 @@ uno::Sequence SAL_CALL ScTableSheetsObj::getElementNames() } return aSeq; } - return uno::Sequence(); + return uno::Sequence(); } -sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2822,7 +2822,7 @@ ScTableColumnObj* ScTableColumnsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) con return NULL; // falscher Index } -ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const OUString& aName) const { SCCOL nCol = 0; String aString(aName); @@ -2871,7 +2871,7 @@ uno::Reference SAL_CALL ScTableColumnsObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableColumnsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableColumnsEnumeration")); } // XIndexAccess @@ -2906,7 +2906,7 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScTableColumnsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScTableColumnsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -2918,20 +2918,20 @@ uno::Any SAL_CALL ScTableColumnsObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence SAL_CALL ScTableColumnsObj::getElementNames() +uno::Sequence SAL_CALL ScTableColumnsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SCCOL nCount = nEndCol - nStartCol + 1; - uno::Sequence aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (SCCOL i=0; i SAL_CALL ScTableColumnsObj::getPropertyS } void SAL_CALL ScTableColumnsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3005,7 +3005,7 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue( } } -uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3130,7 +3130,7 @@ uno::Reference SAL_CALL ScTableRowsObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableRowsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableRowsEnumeration")); } // XIndexAccess @@ -3177,7 +3177,7 @@ uno::Reference SAL_CALL ScTableRowsObj::getPropertySetI } void SAL_CALL ScTableRowsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3278,7 +3278,7 @@ void SAL_CALL ScTableRowsObj::setPropertyValue( } } -uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3368,7 +3368,7 @@ uno::Reference SAL_CALL ScSpreadsheetSettingsObj::getPr } void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue( - const rtl::OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) + const OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3376,7 +3376,7 @@ void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue( //! muss noch } -uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const rtl::OUString& /* aPropertyName */ ) +uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const OUString& /* aPropertyName */ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3446,7 +3446,7 @@ ScAnnotationObj* ScAnnotationsObj::GetObjectByIndex_Impl( sal_Int32 nIndex ) con // XSheetAnnotations void SAL_CALL ScAnnotationsObj::insertNew( - const table::CellAddress& aPosition, const ::rtl::OUString& rText ) + const table::CellAddress& aPosition, const OUString& rText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3483,7 +3483,7 @@ uno::Reference SAL_CALL ScAnnotationsObj::createEnumera //! iterate directly (more efficiently)? SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAnnotationsEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAnnotationsEnumeration")); } // XIndexAccess @@ -3554,13 +3554,13 @@ void ScScenariosObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XScenarios -sal_Bool ScScenariosObj::GetScenarioIndex_Impl( const rtl::OUString& rName, SCTAB& rIndex ) +sal_Bool ScScenariosObj::GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex ) { //! Case-insensitiv ???? if ( pDocShell ) { - rtl::OUString aTabName; + OUString aTabName; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nCount = (SCTAB)getCount(); for (SCTAB i=0; i& aRanges, - const rtl::OUString& aComment ) + const OUString& aComment ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3628,7 +3628,7 @@ void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName, } } -void SAL_CALL ScScenariosObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScScenariosObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3643,7 +3643,7 @@ uno::Reference SAL_CALL ScScenariosObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.ScenariosEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.ScenariosEnumeration")); } // XIndexAccess @@ -3693,7 +3693,7 @@ sal_Bool SAL_CALL ScScenariosObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScScenariosObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScScenariosObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -3705,18 +3705,18 @@ uno::Any SAL_CALL ScScenariosObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence SAL_CALL ScScenariosObj::getElementNames() +uno::Sequence SAL_CALL ScScenariosObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SCTAB nCount = (SCTAB)getCount(); - uno::Sequence aSeq(nCount); + uno::Sequence aSeq(nCount); if ( pDocShell ) // sonst ist auch Count = 0 { - rtl::OUString aTabName; + OUString aTabName; ScDocument* pDoc = pDocShell->GetDocument(); - rtl::OUString* pAry = aSeq.getArray(); + OUString* pAry = aSeq.getArray(); for (SCTAB i=0; iGetName( nTab+i+1, aTabName )) pAry[i] = aTabName; @@ -3725,7 +3725,7 @@ uno::Sequence SAL_CALL ScScenariosObj::getElementNames() return aSeq; } -sal_Bool SAL_CALL ScScenariosObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScScenariosObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 8c2822ea6f77..5539a3f47fe9 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -56,7 +56,7 @@ void ScSheetEventsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -static sal_Int32 lcl_GetEventFromName( const rtl::OUString& aName ) +static sal_Int32 lcl_GetEventFromName( const OUString& aName ) { for (sal_Int32 nEvent=0; nEvent reset event { uno::Sequence aPropSeq; @@ -96,7 +96,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const const beans::PropertyValue& rProp = aPropSeq[nPos]; if ( rProp.Name.compareToAscii( SC_UNO_EVENTTYPE ) == 0 ) { - rtl::OUString aEventType; + OUString aEventType; if ( rProp.Value >>= aEventType ) { // only "Script" is supported @@ -120,7 +120,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const // XNameAccess -uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -128,7 +128,7 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) if (nEvent < 0) throw container::NoSuchElementException(); - const rtl::OUString* pScript = NULL; + const OUString* pScript = NULL; if (mpDocShell) { const ScSheetEvents* pEvents = mpDocShell->GetDocument()->GetSheetEvents(mnTab); @@ -141,10 +141,10 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) { uno::Sequence aPropSeq( 2 ); aPropSeq[0] = beans::PropertyValue( - rtl::OUString("EventType"), -1, - uno::makeAny( rtl::OUString("Script") ), beans::PropertyState_DIRECT_VALUE ); + OUString("EventType"), -1, + uno::makeAny( OUString("Script") ), beans::PropertyState_DIRECT_VALUE ); aPropSeq[1] = beans::PropertyValue( - rtl::OUString("Script"), -1, + OUString("Script"), -1, uno::makeAny( *pScript ), beans::PropertyState_DIRECT_VALUE ); aRet <<= aPropSeq; } @@ -152,16 +152,16 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) return aRet; } -uno::Sequence SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence aNames(SC_SHEETEVENT_COUNT); + uno::Sequence aNames(SC_SHEETEVENT_COUNT); for (sal_Int32 nEvent=0; nEvent SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); // XExtendedFilterDetection - virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence& lDescriptor ) + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence& lDescriptor ) throw (com::sun::star::uno::RuntimeException); static com::sun::star::uno::Sequence impl_getStaticSupportedServiceNames(); diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index b478f1bd146c..c42c119990ca 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -81,10 +81,10 @@ const SfxItemPropertySet* lcl_GetURLPropertySet() { {MAP_CHAR_LEN(SC_UNONAME_ANCTYPE), 0, &getCppuType((text::TextContentAnchorType*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ANCTYPES), 0, &getCppuType((uno::Sequence*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_REPR), 0, &getCppuType((rtl::OUString*)0), 0, 0}, - {MAP_CHAR_LEN(SC_UNONAME_TARGET), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_REPR), 0, &getCppuType((OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_TARGET), 0, &getCppuType((OUString*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_TEXTWRAP), 0, &getCppuType((text::WrapTextMode*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((rtl::OUString*)0), 0, 0}, + {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((OUString*)0), 0, 0}, {0,0,0,0,0,0} }; static SfxItemPropertySet aURLPropertySet_Impl( aURLPropertyMap_Impl ); @@ -392,7 +392,7 @@ uno::Reference SAL_CALL ScCellFieldsObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); } void SAL_CALL ScCellFieldsObj::addContainerListener( @@ -572,7 +572,7 @@ uno::Reference SAL_CALL ScHeaderFieldsObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); } void SAL_CALL ScHeaderFieldsObj::addContainerListener( @@ -662,7 +662,7 @@ SvxFieldData* ScEditFieldObj::getData() break; case text::textfield::Type::EXTENDED_FILE: mpData.reset( - new SvxExtFileField(rtl::OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT)); + new SvxExtFileField(OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT)); break; case text::textfield::Type::PAGE: mpData.reset(new SvxPageField); @@ -689,7 +689,7 @@ SvxFieldData* ScEditFieldObj::getData() break; case text::textfield::Type::URL: mpData.reset( - new SvxURLField(rtl::OUString(), rtl::OUString(), SVXURLFORMAT_APPDEFAULT)); + new SvxURLField(OUString(), OUString(), SVXURLFORMAT_APPDEFAULT)); break; default: mpData.reset(new SvxFieldData); @@ -698,9 +698,9 @@ SvxFieldData* ScEditFieldObj::getData() return mpData.get(); } -void ScEditFieldObj::setPropertyValueURL(const rtl::OUString& rName, const com::sun::star::uno::Any& rVal) +void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const com::sun::star::uno::Any& rVal) { - rtl::OUString aStrVal; + OUString aStrVal; if (mpEditSource) { // Edit engine instance already exists for this field item. Use it. @@ -768,7 +768,7 @@ void ScEditFieldObj::setPropertyValueURL(const rtl::OUString& rName, const com:: throw beans::UnknownPropertyException(); } -uno::Any ScEditFieldObj::getPropertyValueURL(const rtl::OUString& rName) +uno::Any ScEditFieldObj::getPropertyValueURL(const OUString& rName) { uno::Any aRet; @@ -820,7 +820,7 @@ uno::Any ScEditFieldObj::getPropertyValueURL(const rtl::OUString& rName) return aRet; } -void ScEditFieldObj::setPropertyValueFile(const rtl::OUString& rName, const uno::Any& rVal) +void ScEditFieldObj::setPropertyValueFile(const OUString& rName, const uno::Any& rVal) { if (rName == SC_UNONAME_FILEFORM) { @@ -855,7 +855,7 @@ void ScEditFieldObj::setPropertyValueFile(const rtl::OUString& rName, const uno: throw beans::UnknownPropertyException(); } -uno::Any ScEditFieldObj::getPropertyValueFile(const rtl::OUString& rName) +uno::Any ScEditFieldObj::getPropertyValueFile(const OUString& rName) { uno::Any aRet; if (rName == SC_UNONAME_FILEFORM) @@ -887,7 +887,7 @@ uno::Any ScEditFieldObj::getPropertyValueFile(const rtl::OUString& rName) return aRet; } -void ScEditFieldObj::setPropertyValueDateTime(const rtl::OUString& rName, const uno::Any& rVal) +void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno::Any& rVal) { if (mpEditSource) { @@ -981,7 +981,7 @@ void ScEditFieldObj::setPropertyValueDateTime(const rtl::OUString& rName, const } } -uno::Any ScEditFieldObj::getPropertyValueDateTime(const rtl::OUString& rName) +uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName) { if (mpEditSource) { @@ -1086,7 +1086,7 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const rtl::OUString& rName) throw beans::UnknownPropertyException(); } -void ScEditFieldObj::setPropertyValueSheet(const rtl::OUString& rName, const uno::Any& rVal) +void ScEditFieldObj::setPropertyValueSheet(const OUString& rName, const uno::Any& rVal) { if (mpEditSource) { @@ -1221,13 +1221,13 @@ bool ScEditFieldObj::IsInserted() const // XTextField -rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) +OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (!mpEditSource) - return rtl::OUString(); + return OUString(); //! Feld-Funktionen muessen an den Forwarder !!! ScEditEngineDefaulter* pEditEngine = mpEditSource->GetEditEngine(); @@ -1238,7 +1238,7 @@ rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) aSelection.nStartPara, aSelection.nStartPos, text::textfield::Type::UNSPECIFIED); OSL_ENSURE(pField,"getPresentation: Feld nicht gefunden"); if (!pField) - return rtl::OUString(); + return OUString(); switch (meType) { @@ -1255,7 +1255,7 @@ rtl::OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) default: ; } - return rtl::OUString(); + return OUString(); } // XTextContent @@ -1312,7 +1312,7 @@ uno::Reference SAL_CALL ScEditFieldObj::getPropertySetI } void SAL_CALL ScEditFieldObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1346,7 +1346,7 @@ void SAL_CALL ScEditFieldObj::setPropertyValue( } } -uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1431,22 +1431,22 @@ ScEditFieldObj* ScEditFieldObj::getImplementation(const uno::Reference SAL_CALL ScEditFieldObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScEditFieldObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(2); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence aRet(2); + OUString* pArray = aRet.getArray(); pArray[0] = SCTEXTFIELD_SERVICE; pArray[1] = SCTEXTCONTENT_SERVICE; return aRet; diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 0357c88e213b..3e4e0883642d 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star; -using ::rtl::OUStringBuffer; using namespace rtl; using namespace com::sun::star::uno; @@ -133,16 +132,16 @@ uno::Reference SAL_CALL ScFilterOptionsObj_CreateInstance( return (::cppu::OWeakObject*) new ScFilterOptionsObj; } -rtl::OUString ScFilterOptionsObj::getImplementationName_Static() +OUString ScFilterOptionsObj::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME )); + return OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME )); } -uno::Sequence ScFilterOptionsObj::getSupportedServiceNames_Static() +uno::Sequence ScFilterOptionsObj::getSupportedServiceNames_Static() { - uno::Sequence aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE )); + uno::Sequence aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE )); return aRet; } @@ -153,7 +152,7 @@ uno::Sequence SAL_CALL ScFilterOptionsObj::getPropertyValu uno::Sequence aRet(1); beans::PropertyValue* pArray = aRet.getArray(); - pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS )); + pArray[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS )); pArray[0].Value <<= aFilterOptions; return aRet; @@ -183,7 +182,7 @@ void SAL_CALL ScFilterOptionsObj::setPropertyValues( const uno::Sequence aTokens; if ( rProp.Value >>= aStrVal ) aEntry.maExpr1 = aStrVal; @@ -291,7 +291,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( } else if ( rProp.Name == SC_UNONAME_FORMULA2 ) { - rtl::OUString aStrVal; + OUString aStrVal; uno::Sequence aTokens; if ( rProp.Value >>= aStrVal ) aEntry.maExpr2 = aStrVal; @@ -309,26 +309,26 @@ void SAL_CALL ScTableConditionalFormat::addNew( } else if ( rProp.Name == SC_UNONAME_SOURCESTR ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maPosStr = String( aStrVal ); } else if ( rProp.Name == SC_UNONAME_STYLENAME ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStrVal, SFX_STYLE_FAMILY_PARA ); } else if ( rProp.Name == SC_UNONAME_FORMULANMSP1 ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maExprNmsp1 = aStrVal; } else if ( rProp.Name == SC_UNONAME_FORMULANMSP2 ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( rProp.Value >>= aStrVal ) aEntry.maExprNmsp2 = aStrVal; } @@ -383,7 +383,7 @@ uno::Reference SAL_CALL ScTableConditionalFormat::creat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); } // XIndexAccess @@ -421,14 +421,14 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeExce // conditional format entries have no real names // -> generate name from index -static rtl::OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) +static OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) { - rtl::OUString aRet( "Entry" ); - aRet += rtl::OUString::valueOf( nIndex ); + OUString aRet( "Entry" ); + aRet += OUString::valueOf( nIndex ); return aRet; } -uno::Any SAL_CALL ScTableConditionalFormat::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScTableConditionalFormat::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -449,21 +449,21 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName( const rtl::OUString& aNam throw container::NoSuchElementException(); } -uno::Sequence SAL_CALL ScTableConditionalFormat::getElementNames() +uno::Sequence SAL_CALL ScTableConditionalFormat::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; long nCount = aEntries.size(); - uno::Sequence aNames(nCount); - rtl::OUString* pArray = aNames.getArray(); + uno::Sequence aNames(nCount); + OUString* pArray = aNames.getArray(); for (long i=0; i( ScConditionEntry::GetModeFromApi( nOperator ) ); } -rtl::OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException) +OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aExpr1; } -void SAL_CALL ScTableValidationObj::setFormula1( const rtl::OUString& aFormula1 ) +void SAL_CALL ScTableValidationObj::setFormula1( const OUString& aFormula1 ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; aExpr1 = String( aFormula1 ); } -rtl::OUString SAL_CALL ScTableValidationObj::getFormula2() throw(uno::RuntimeException) +OUString SAL_CALL ScTableValidationObj::getFormula2() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aExpr2; } -void SAL_CALL ScTableValidationObj::setFormula2( const rtl::OUString& aFormula2 ) +void SAL_CALL ScTableValidationObj::setFormula2( const OUString& aFormula2 ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -842,7 +842,7 @@ uno::Reference SAL_CALL ScTableValidationObj::getProper } void SAL_CALL ScTableValidationObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -856,25 +856,25 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aValue >>= nShowList; else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aInputTitle = String( aStrVal ); } else if ( aString.EqualsAscii( SC_UNONAME_INPMESS ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aInputMessage = String( aStrVal ); } else if ( aString.EqualsAscii( SC_UNONAME_ERRTITLE ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aErrorTitle = String( aStrVal ); } else if ( aString.EqualsAscii( SC_UNONAME_ERRMESS ) ) { - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aErrorMessage = String( aStrVal ); } @@ -918,7 +918,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( { // internal - only for XML filter, not in PropertySetInfo, only set - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) aPosString = String( aStrVal ); } @@ -926,7 +926,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( { // internal - only for XML filter, not in PropertySetInfo, only set - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) maExprNmsp1 = aStrVal; } @@ -934,7 +934,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( { // internal - only for XML filter, not in PropertySetInfo, only set - rtl::OUString aStrVal; + OUString aStrVal; if ( aValue >>= aStrVal ) maExprNmsp2 = aStrVal; } @@ -956,7 +956,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( } } -uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -968,10 +968,10 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& a else if ( aString.EqualsAscii( SC_UNONAME_SHOWERR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowError ); else if ( aString.EqualsAscii( SC_UNONAME_IGNOREBL ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bIgnoreBlank ); else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aRet <<= nShowList; - else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) ) aRet <<= rtl::OUString( aInputTitle ); - else if ( aString.EqualsAscii( SC_UNONAME_INPMESS ) ) aRet <<= rtl::OUString( aInputMessage ); - else if ( aString.EqualsAscii( SC_UNONAME_ERRTITLE ) ) aRet <<= rtl::OUString( aErrorTitle ); - else if ( aString.EqualsAscii( SC_UNONAME_ERRMESS ) ) aRet <<= rtl::OUString( aErrorMessage ); + else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) ) aRet <<= OUString( aInputTitle ); + else if ( aString.EqualsAscii( SC_UNONAME_INPMESS ) ) aRet <<= OUString( aInputMessage ); + else if ( aString.EqualsAscii( SC_UNONAME_ERRTITLE ) ) aRet <<= OUString( aErrorTitle ); + else if ( aString.EqualsAscii( SC_UNONAME_ERRMESS ) ) aRet <<= OUString( aErrorMessage ); else if ( aString.EqualsAscii( SC_UNONAME_TYPE ) ) { sheet::ValidationType eType = sheet::ValidationType_ANY; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 558d17012067..61f2074e529c 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -244,27 +244,27 @@ uno::Reference SAL_CALL ScFunctionAccess_CreateInstance( return xInst; } -rtl::OUString ScFunctionAccess::getImplementationName_Static() +OUString ScFunctionAccess::getImplementationName_Static() { - return rtl::OUString( "stardiv.StarCalc.ScFunctionAccess" ); + return OUString( "stardiv.StarCalc.ScFunctionAccess" ); } -uno::Sequence ScFunctionAccess::getSupportedServiceNames_Static() +uno::Sequence ScFunctionAccess::getSupportedServiceNames_Static() { - uno::Sequence aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); + uno::Sequence aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); return aRet; } // XServiceInfo -rtl::OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScFunctionAccess"); + return OUString( "ScFunctionAccess"); } -sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScFunctionAccess::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -272,13 +272,13 @@ sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServi aServiceStr.EqualsAscii( SCDOCSETTINGS_SERVICE ); } -uno::Sequence SAL_CALL ScFunctionAccess::getSupportedServiceNames() +uno::Sequence SAL_CALL ScFunctionAccess::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); + uno::Sequence aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE )); return aRet; } @@ -294,7 +294,7 @@ uno::Reference SAL_CALL ScFunctionAccess::getPropertySe } void SAL_CALL ScFunctionAccess::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -319,7 +319,7 @@ void SAL_CALL ScFunctionAccess::setPropertyValue( } } -uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -340,10 +340,10 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFunctionAccess ) // XFunctionAccess -static sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,const ScCompiler& rCompiler ) +static sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const OUString& rName,const ScCompiler& rCompiler ) { // function names are always case-insensitive - rtl::OUString aUpper = ScGlobal::pCharClass->uppercase(rName); + OUString aUpper = ScGlobal::pCharClass->uppercase(rName); // same options as in ScCompiler::IsOpCode: // 1. built-in function name @@ -365,7 +365,7 @@ static sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& // 3. new (uno) add in functions - rtl::OUString aIntName = + OUString aIntName = ScGlobal::GetAddInCollection()->FindFunction(aUpper, false); if (!aIntName.isEmpty()) { @@ -398,7 +398,7 @@ public: SimpleVisitor( ScDocument* pDoc ) : mbArgError( false ), mpDoc( pDoc ) {} // could possibly just get away with JUST the following overload // 1) virtual void visitElem( long& nCol, long& nRow, const double& elem ) - // 2) virtual void visitElem( long& nCol, long& nRow, const rtl::OUString& elem ) + // 2) virtual void visitElem( long& nCol, long& nRow, const OUString& elem ) // 3) virtual void visitElem( long& nCol, long& nRow, const uno::Any& elem ) // the other types methods are here just to reflect the orig code and for // completeness. @@ -415,7 +415,7 @@ public: { mpDoc->SetValue( (SCCOL) nCol, (SCROW) nRow, 0, elem ); } - void visitElem( long nCol, long nRow, const rtl::OUString& elem ) + void visitElem( long nCol, long nRow, const OUString& elem ) { if (!elem.isEmpty()) { @@ -447,7 +447,7 @@ public: } else if ( eElemClass == uno::TypeClass_STRING ) { - rtl::OUString aUStr; + OUString aUStr; rElement >>= aUStr; visitElem( nCol, nRow, aUStr ); } @@ -517,7 +517,7 @@ static void processSequences( ScDocument* pDoc, const uno::Any& rArg, ScTokenArr } }; -uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, +uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, const uno::Sequence& aArguments ) throw(container::NoSuchElementException, lang::IllegalArgumentException, uno::RuntimeException) @@ -597,7 +597,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, } else if ( eClass == uno::TypeClass_STRING ) { - rtl::OUString aUStr; + OUString aUStr; rArg >>= aUStr; String aStr( aUStr ); aTokenArr.AddString( aStr.GetBuffer() ); @@ -614,9 +614,9 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, { ArrayOfArrayProc::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } - else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence > *)0 ) ) ) + else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence > *)0 ) ) ) { - ArrayOfArrayProc::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); + ArrayOfArrayProc::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow ); } else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence > *)0 ) ) ) { @@ -699,7 +699,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, else { // string result - rtl::OUString aStrVal = pFormula->GetString(); + OUString aStrVal = pFormula->GetString(); aRet <<= aStrVal; } } diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 38f1ce4bd610..3cff46ba8287 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -45,7 +45,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::uno::RuntimeException; -using ::rtl::OUString; using ::std::vector; //------------------------------------------------------------------------ @@ -55,9 +54,9 @@ static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() { static SfxItemPropertyMapEntry aSheetLinkMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFDELAY), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {0,0,0,0,0,0} @@ -130,13 +129,13 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const // XNamed -rtl::OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return getFileName(); // Name ist der Dateiname (URL) } -void SAL_CALL ScSheetLinkObj::setName( const rtl::OUString& aName ) throw(uno::RuntimeException) +void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; setFileName(aName); // Name ist der Dateiname (URL) @@ -212,14 +211,14 @@ uno::Reference SAL_CALL ScSheetLinkObj::getPropertySetI } void SAL_CALL ScSheetLinkObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; String aNameString(aPropertyName); - rtl::OUString aValStr; + OUString aValStr; if ( aNameString.EqualsAscii( SC_UNONAME_LINKURL ) ) { if ( aValue >>= aValStr ) @@ -249,7 +248,7 @@ void SAL_CALL ScSheetLinkObj::setPropertyValue( } } -uno::Any SAL_CALL ScSheetLinkObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScSheetLinkObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -273,13 +272,13 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSheetLinkObj ) // internal: -rtl::OUString ScSheetLinkObj::getFileName(void) const +OUString ScSheetLinkObj::getFileName(void) const { SolarMutexGuard aGuard; return aFileName; } -void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) +void ScSheetLinkObj::setFileName(const OUString& rNewName) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -295,7 +294,7 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTabIsLinked(nTab) && pDoc->GetLinkDoc(nTab) == rtl::OUString(aFileName) ) // alte Datei + if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == OUString(aFileName) ) // alte Datei pDoc->SetLink( nTab, pDoc->GetLinkMode(nTab), aNewStr, pDoc->GetLinkFlt(nTab), pDoc->GetLinkOpt(nTab), pDoc->GetLinkTab(nTab), @@ -316,17 +315,17 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) } } -rtl::OUString ScSheetLinkObj::getFilter(void) const +OUString ScSheetLinkObj::getFilter(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScTableLink* pLink = GetLink_Impl(); if (pLink) aRet = pLink->GetFilterName(); return aRet; } -void ScSheetLinkObj::setFilter(const rtl::OUString& Filter) +void ScSheetLinkObj::setFilter(const OUString& Filter) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -337,17 +336,17 @@ void ScSheetLinkObj::setFilter(const rtl::OUString& Filter) } } -rtl::OUString ScSheetLinkObj::getFilterOptions(void) const +OUString ScSheetLinkObj::getFilterOptions(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScTableLink* pLink = GetLink_Impl(); if (pLink) aRet = pLink->GetOptions(); return aRet; } -void ScSheetLinkObj::setFilterOptions(const rtl::OUString& FilterOptions) +void ScSheetLinkObj::setFilterOptions(const OUString& FilterOptions) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -406,7 +405,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) if (!pDocShell) return NULL; - typedef boost::unordered_set StrSetType; + typedef boost::unordered_set StrSetType; StrSetType aNames; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); @@ -416,7 +415,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) if (!pDoc->IsLinked(nTab)) continue; - rtl::OUString aLinkDoc = pDoc->GetLinkDoc(nTab); + OUString aLinkDoc = pDoc->GetLinkDoc(nTab); if (aNames.insert(aLinkDoc).second) { // unique document name. @@ -429,7 +428,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) return NULL; // kein Dokument oder Index zu gross } -ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const OUString& aName) { // Name ist der Dateiname @@ -458,14 +457,14 @@ uno::Reference SAL_CALL ScSheetLinksObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetLinksEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetLinksEnumeration")); } // XIndexAccess sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException) { - typedef boost::unordered_set StrSetType; + typedef boost::unordered_set StrSetType; SolarMutexGuard aGuard; if (!pDocShell) @@ -481,7 +480,7 @@ sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException) if (!pDoc->IsLinked(nTab)) continue; - rtl::OUString aLinkDoc = pDoc->GetLinkDoc(nTab); + OUString aLinkDoc = pDoc->GetLinkDoc(nTab); if (aNames.insert(aLinkDoc).second) ++nCount; } @@ -512,7 +511,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScSheetLinksObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScSheetLinksObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -525,7 +524,7 @@ uno::Any SAL_CALL ScSheetLinksObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -549,30 +548,30 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName ) return false; } -uno::Sequence SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException) { - typedef boost::unordered_set StrSetType; + typedef boost::unordered_set StrSetType; SolarMutexGuard aGuard; // Name ist der Dateiname if (!pDocShell) - return uno::Sequence(); + return uno::Sequence(); StrSetType aNames; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTabCount = pDoc->GetTableCount(); sal_Int32 nLinkCount = getCount(); - uno::Sequence aSeq(nLinkCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq(nLinkCount); + OUString* pAry = aSeq.getArray(); sal_uInt16 nPos = 0; for (SCTAB nTab = 0; nTab < nTabCount; ++nTab) { if (!pDoc->IsLinked(nTab)) continue; - rtl::OUString aLinkDoc = pDoc->GetLinkDoc(nTab); + OUString aLinkDoc = pDoc->GetLinkDoc(nTab); if (aNames.insert(aLinkDoc).second) pAry[nPos++] = aLinkDoc; } @@ -642,8 +641,8 @@ void ScAreaLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XFileLink -void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUString* pNewFilter, - const rtl::OUString* pNewOptions, const rtl::OUString* pNewSource, +void ScAreaLinkObj::Modify_Impl( const OUString* pNewFile, const OUString* pNewFilter, + const OUString* pNewOptions, const OUString* pNewSource, const table::CellRangeAddress* pNewDest ) { ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); @@ -755,14 +754,14 @@ uno::Reference SAL_CALL ScAreaLinkObj::getPropertySetIn } void SAL_CALL ScAreaLinkObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; String aNameString(aPropertyName); - rtl::OUString aValStr; + OUString aValStr; if ( aNameString.EqualsAscii( SC_UNONAME_LINKURL ) ) { if ( aValue >>= aValStr ) @@ -792,7 +791,7 @@ void SAL_CALL ScAreaLinkObj::setPropertyValue( } } -uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -816,49 +815,49 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAreaLinkObj ) // internal: -rtl::OUString ScAreaLinkObj::getFileName(void) const +OUString ScAreaLinkObj::getFileName(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetFile(); return aRet; } -void ScAreaLinkObj::setFileName(const rtl::OUString& rNewName) +void ScAreaLinkObj::setFileName(const OUString& rNewName) { SolarMutexGuard aGuard; Modify_Impl( &rNewName, NULL, NULL, NULL, NULL ); } -rtl::OUString ScAreaLinkObj::getFilter(void) const +OUString ScAreaLinkObj::getFilter(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetFilter(); return aRet; } -void ScAreaLinkObj::setFilter(const rtl::OUString& Filter) +void ScAreaLinkObj::setFilter(const OUString& Filter) { SolarMutexGuard aGuard; Modify_Impl( NULL, &Filter, NULL, NULL, NULL ); } -rtl::OUString ScAreaLinkObj::getFilterOptions(void) const +OUString ScAreaLinkObj::getFilterOptions(void) const { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetOptions(); return aRet; } -void ScAreaLinkObj::setFilterOptions(const rtl::OUString& FilterOptions) +void ScAreaLinkObj::setFilterOptions(const OUString& FilterOptions) { SolarMutexGuard aGuard; Modify_Impl( NULL, NULL, &FilterOptions, NULL, NULL ); @@ -882,17 +881,17 @@ void ScAreaLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) // XAreaLink -rtl::OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException) +OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); if (pLink) aRet = pLink->GetSource(); return aRet; } -void SAL_CALL ScAreaLinkObj::setSourceArea( const rtl::OUString& aSourceArea ) +void SAL_CALL ScAreaLinkObj::setSourceArea( const OUString& aSourceArea ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -952,10 +951,10 @@ ScAreaLinkObj* ScAreaLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) } void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestPos, - const rtl::OUString& aFileName, - const rtl::OUString& aSourceArea, - const rtl::OUString& aFilter, - const rtl::OUString& aFilterOptions ) + const OUString& aFileName, + const OUString& aSourceArea, + const OUString& aFilter, + const OUString& aFilterOptions ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -993,7 +992,7 @@ uno::Reference SAL_CALL ScAreaLinksObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); } // XIndexAccess @@ -1092,13 +1091,13 @@ static String lcl_BuildDDEName( const String& rAppl, const String& rTopic, const return aRet; } -rtl::OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return lcl_BuildDDEName( aAppl, aTopic, aItem ); } -void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException) +void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException) { // name can't be changed (formulas wouldn't find the link) throw uno::RuntimeException(); @@ -1106,7 +1105,7 @@ void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(un // XDDELink -rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException) { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1114,7 +1113,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeExceptio return aAppl; } -rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1122,7 +1121,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException) return aTopic; } -rtl::OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException) +OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException) { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1209,7 +1208,7 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) if ( !bSuccess ) { - throw uno::RuntimeException( ::rtl::OUString( + throw uno::RuntimeException( OUString( "ScDDELinkObj::getResults: failed to get results!" ), uno::Reference< uno::XInterface >() ); } @@ -1241,7 +1240,7 @@ void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >& if ( !bSuccess ) { - throw uno::RuntimeException( ::rtl::OUString( + throw uno::RuntimeException( OUString( "ScDDELinkObj::setResults: failed to set results!" ), uno::Reference< uno::XInterface >() ); } @@ -1286,7 +1285,7 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) { if (pDocShell) { - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; if ( nIndex <= USHRT_MAX && pDocShell->GetDocument()->GetDdeLinkData( (sal_uInt16)nIndex, aAppl, aTopic, aItem ) ) return new ScDDELinkObj( pDocShell, aAppl, aTopic, aItem ); @@ -1294,12 +1293,12 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) return NULL; } -ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const OUString& aName) { if (pDocShell) { String aNamStr(aName); - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; ScDocument* pDoc = pDocShell->GetDocument(); sal_uInt16 nCount = pDoc->GetDdeLinkCount(); @@ -1319,7 +1318,7 @@ uno::Reference SAL_CALL ScDDELinksObj::createEnumeratio throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DDELinksEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DDELinksEnumeration")); } // XIndexAccess @@ -1357,7 +1356,7 @@ sal_Bool SAL_CALL ScDDELinksObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -uno::Any SAL_CALL ScDDELinksObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScDDELinksObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1369,17 +1368,17 @@ uno::Any SAL_CALL ScDDELinksObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence SAL_CALL ScDDELinksObj::getElementNames() throw(uno::RuntimeException) +uno::Sequence SAL_CALL ScDDELinksObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) { - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; ScDocument* pDoc = pDocShell->GetDocument(); sal_uInt16 nCount = pDoc->GetDdeLinkCount(); - uno::Sequence aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq(nCount); + OUString* pAry = aSeq.getArray(); for (sal_uInt16 i=0; i SAL_CALL ScDDELinksObj::getElementNames() throw(uno } return aSeq; } - return uno::Sequence(); + return uno::Sequence(); } -sal_Bool SAL_CALL ScDDELinksObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; if (pDocShell) { String aNamStr(aName); - rtl::OUString aAppl, aTopic, aItem; + OUString aAppl, aTopic, aItem; ScDocument* pDoc = pDocShell->GetDocument(); sal_uInt16 nCount = pDoc->GetDdeLinkCount(); @@ -1415,8 +1414,8 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const rtl::OUString& aName ) // XDDELinks uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( - const ::rtl::OUString& aApplication, const ::rtl::OUString& aTopic, - const ::rtl::OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) + const OUString& aApplication, const OUString& aTopic, + const OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1453,7 +1452,7 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( if ( pDoc->CreateDdeLink( aApplication, aTopic, aItem, nMod, ScMatrixRef() ) ) { - const ::rtl::OUString aName( lcl_BuildDDEName( aApplication, aTopic, aItem ) ); + const OUString aName( lcl_BuildDDEName( aApplication, aTopic, aItem ) ); xLink.set( GetObjectByName_Impl( aName ) ); } } @@ -1461,7 +1460,7 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( if ( !xLink.is() ) { - throw uno::RuntimeException( ::rtl::OUString( + throw uno::RuntimeException( OUString( "ScDDELinksObj::addDDELink: cannot add DDE link!" ), uno::Reference< uno::XInterface >() ); } @@ -1597,7 +1596,7 @@ Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetC return aSheetCache; } -Any SAL_CALL ScExternalDocLinkObj::getByName(const::rtl::OUString &aName) +Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { SolarMutexGuard aGuard; @@ -1729,7 +1728,7 @@ Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink( return aDocLink; } -Any SAL_CALL ScExternalDocLinksObj::getByName(const::rtl::OUString &aName) +Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index f7b05a8f4bf0..f5f6719b1123 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -24,7 +24,6 @@ using namespace com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -using ::rtl::OUString; //------------------------------------------------------------------------ @@ -42,7 +41,7 @@ uno::Reference ScUnoHelpFunctions::AnyToInterface( const uno::A } sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference& xProp, - const rtl::OUString& rName, sal_Bool bDefault ) + const OUString& rName, sal_Bool bDefault ) { sal_Bool bRet = bDefault; if ( xProp.is() ) @@ -67,7 +66,7 @@ sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference& xProp, - const rtl::OUString& rName, long nDefault ) + const OUString& rName, long nDefault ) { sal_Int32 nRet = nDefault; if ( xProp.is() ) @@ -86,7 +85,7 @@ sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference& xProp, - const rtl::OUString& rName, long nDefault ) + const OUString& rName, long nDefault ) { sal_Int32 nRet = nDefault; if ( xProp.is() ) @@ -187,7 +186,7 @@ void ScUnoHelpFunctions::SetOptionalPropertyValue( //------------------------------------------------------------------------ ScIndexEnumeration::ScIndexEnumeration(const uno::Reference& rInd, - const rtl::OUString& rServiceName) : + const OUString& rServiceName) : xIndex( rInd ), sServiceName(rServiceName), nPos( 0 ) @@ -222,24 +221,24 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme return aReturn; } -::rtl::OUString SAL_CALL ScIndexEnumeration::getImplementationName() +OUString SAL_CALL ScIndexEnumeration::getImplementationName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("ScIndexEnumeration"); + return OUString("ScIndexEnumeration"); } -sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { return sServiceName == ServiceName; } -::com::sun::star::uno::Sequence< ::rtl::OUString > +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScIndexEnumeration::getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); - ::rtl::OUString* pArray = aRet.getArray(); + ::com::sun::star::uno::Sequence< OUString > aRet(1); + OUString* pArray = aRet.getArray(); pArray[0] = sServiceName; return aRet; } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 3539c7e30314..511c4677b515 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -52,7 +52,7 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() static SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((uno::Reference*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_TOKENINDEX), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_ISSHAREDFMLA), 0, &getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} @@ -139,7 +139,7 @@ SCTAB ScNamedRangeObj::GetTab_Impl() return -2; ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab; - rtl::OUString sName = mxSheet->getName(); + OUString sName = mxSheet->getName(); pDoc->GetTable(sName, nTab); return nTab; } @@ -212,13 +212,13 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p } -rtl::OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return aName; } -void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -232,7 +232,7 @@ void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName ) throw uno::RuntimeException(); // no other exceptions specified } -rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException) +OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aContent; @@ -243,7 +243,7 @@ rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException return aContent; } -void SAL_CALL ScNamedRangeObj::setContent( const rtl::OUString& aContent ) +void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -378,7 +378,7 @@ uno::Reference SAL_CALL ScNamedRangeObj::getPropertySet } void SAL_CALL ScNamedRangeObj::setPropertyValue( - const rtl::OUString& rPropertyName, const uno::Any& aValue ) + const OUString& rPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -395,7 +395,7 @@ void SAL_CALL ScNamedRangeObj::setPropertyValue( } } -uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPropertyName ) +uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -407,7 +407,7 @@ uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPrope // ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_RANGENAME ); } else if ( rPropertyName == SC_UNO_LINKDISPNAME ) - aRet <<= rtl::OUString( aName ); + aRet <<= OUString( aName ); else if ( rPropertyName == SC_UNONAME_TOKENINDEX ) { // get index for use in formula tokens (read-only) @@ -427,24 +427,24 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangeObj ) // lang::XServiceInfo -rtl::OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScNamedRangeObj" ); + return OUString( "ScNamedRangeObj" ); } -sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ) || rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SCLINKTARGET_SERVICE ) ); } -uno::Sequence SAL_CALL ScNamedRangeObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScNamedRangeObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(2); - aRet[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ); - aRet[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ) ); + uno::Sequence aRet(2); + aRet[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ); + aRet[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ) ); return aRet; } @@ -506,8 +506,8 @@ bool ScNamedRangesObj::IsModifyAndBroadcast() const // sheet::XNamedRanges -void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName, - const rtl::OUString& aContent, const table::CellAddress& aPosition, +void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, + const OUString& aContent, const table::CellAddress& aPosition, sal_Int32 nUnoType ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -571,7 +571,7 @@ void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& pDocShell->GetDocFunc().CreateNames( aRange, nFlags, sal_True, GetTab_Impl() ); } -void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -611,7 +611,7 @@ uno::Reference SAL_CALL ScNamedRangesObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.NamedRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.NamedRangesEnumeration")); } // container::XIndexAccess @@ -667,7 +667,7 @@ Reference SAL_CALL ScNamedRangesObj::getPropertySetInfo } void SAL_CALL ScNamedRangesObj::setPropertyValue( - const rtl::OUString& rPropertyName, const uno::Any& aValue ) + const OUString& rPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -678,7 +678,7 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue( } } -Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyName ) +Any SAL_CALL ScNamedRangesObj::getPropertyValue( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -693,7 +693,7 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyN SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangesObj ) -uno::Any SAL_CALL ScNamedRangesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScNamedRangesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -705,7 +705,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByName( const rtl::OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence SAL_CALL ScNamedRangesObj::getElementNames() +uno::Sequence SAL_CALL ScNamedRangesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -715,8 +715,8 @@ uno::Sequence SAL_CALL ScNamedRangesObj::getElementNames() if (pNames) { long nVisCount = getCount(); // Namen mit lcl_UserVisibleName - uno::Sequence aSeq(nVisCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq(nVisCount); + OUString* pAry = aSeq.getArray(); sal_uInt16 nVisPos = 0; ScRangeName::const_iterator itr = pNames->begin(), itrEnd = pNames->end(); for (; itr != itrEnd; ++itr) @@ -727,10 +727,10 @@ uno::Sequence SAL_CALL ScNamedRangesObj::getElementNames() return aSeq; } } - return uno::Sequence(0); + return uno::Sequence(0); } -sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -864,7 +864,7 @@ ScNamedRangeObj* ScGlobalNamedRangesObj::GetObjectByIndex_Impl(sal_uInt16 nIndex return NULL; } -ScNamedRangeObj* ScGlobalNamedRangesObj::GetObjectByName_Impl(const ::rtl::OUString& aName) +ScNamedRangeObj* ScGlobalNamedRangesObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell && hasByName(aName) ) return new ScNamedRangeObj(this, pDocShell, String(aName)); @@ -895,7 +895,7 @@ ScLocalNamedRangesObj::~ScLocalNamedRangesObj() } -ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByName_Impl(const ::rtl::OUString& aName) +ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell && hasByName( aName ) ) return new ScNamedRangeObj( this, pDocShell, String(aName), mxSheet); @@ -908,7 +908,7 @@ ScNamedRangeObj* ScLocalNamedRangesObj::GetObjectByIndex_Impl( sal_uInt16 nIndex if (!pDocShell) return NULL; - rtl::OUString aName = mxSheet->getName(); + OUString aName = mxSheet->getName(); ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab; pDoc->GetTable( aName, nTab ); @@ -1186,7 +1186,7 @@ uno::Reference SAL_CALL ScLabelRangesObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.LabelRangesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.LabelRangesEnumeration")); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index b9415092ee9e..ad1787b055b5 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -138,20 +138,20 @@ uno::Reference SAL_CALL ScAnnotationObj::createTextCursorByRa return GetUnoText().createTextCursorByRange(aTextPosition); } -rtl::OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return GetUnoText().getString(); } -void SAL_CALL ScAnnotationObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; GetUnoText().setString(aText); } void SAL_CALL ScAnnotationObj::insertString( const uno::Reference& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -196,18 +196,18 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc return aAdr; } -rtl::OUString SAL_CALL ScAnnotationObj::getAuthor() throw(uno::RuntimeException) +OUString SAL_CALL ScAnnotationObj::getAuthor() throw(uno::RuntimeException) { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); - return pNote ? pNote->GetAuthor() : rtl::OUString(); + return pNote ? pNote->GetAuthor() : OUString(); } -rtl::OUString SAL_CALL ScAnnotationObj::getDate() throw(uno::RuntimeException) +OUString SAL_CALL ScAnnotationObj::getDate() throw(uno::RuntimeException) { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); - return pNote ? pNote->GetDate() : rtl::OUString(); + return pNote ? pNote->GetDate() : OUString(); } sal_Bool SAL_CALL ScAnnotationObj::getIsVisible() throw(uno::RuntimeException) diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index 2a5fefe1b956..8efb9e3c395a 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -52,7 +52,7 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) { //! use map (with new identifiers) @@ -125,7 +125,7 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, uno::Any ScDocOptionsHelper::getPropertyValue( const ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, - const rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) { uno::Any aRet; const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName( aPropertyName ); @@ -192,7 +192,7 @@ ScDocOptionsObj::~ScDocOptionsObj() } void SAL_CALL ScDocOptionsObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -205,7 +205,7 @@ void SAL_CALL ScDocOptionsObj::setPropertyValue( ScModelObj::setPropertyValue( aPropertyName, aValue ); } -uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index dc4364a08bc2..390d4fb749dd 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -42,25 +42,25 @@ uno::Reference ScPageObj::_CreateShape( SdrObject *pObj ) cons return xShape; } -::rtl::OUString SAL_CALL ScPageObj::getImplementationName() +OUString SAL_CALL ScPageObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScPageObj"); + return OUString("ScPageObj"); } -sal_Bool SAL_CALL ScPageObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScPageObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); return aServiceStr.EqualsAscii( "com.sun.star.sheet.SpreadsheetDrawPage" ); } -uno::Sequence SAL_CALL ScPageObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScPageObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString("com.sun.star.sheet.SpreadsheetDrawPage"); + uno::Sequence aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString("com.sun.star.sheet.SpreadsheetDrawPage"); return aRet; } diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 20cd22ce8b4a..e40be82dda5e 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -71,7 +71,6 @@ using namespace ::com::sun::star::task; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; ScFilterDetect::ScFilterDetect( const uno::Reference& /*xContext*/ ) { @@ -155,11 +154,11 @@ static const SfxFilter* lcl_DetectExcelXML( SvStream& rStream, SfxFilterMatcher& { // Be consistent with XMLFilterDetect service: Check for presence of "Workbook" in XML file. - rtl::OString aTryStr( "Workbook" ); - rtl::OString aFileString(reinterpret_cast(aBuffer), nBytesRead); + OString aTryStr( "Workbook" ); + OString aFileString(reinterpret_cast(aBuffer), nBytesRead); if (aFileString.indexOf(aTryStr) >= 0) - pFound = rMatcher.GetFilter4FilterName( rtl::OUString(pFilterExcelXML) ); + pFound = rMatcher.GetFilter4FilterName( OUString(pFilterExcelXML) ); } return pFound; @@ -216,18 +215,18 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) return ( 0x0d == nEndFlag ); } -::rtl::OUString SAL_CALL ScFilterDetect::detect( uno::Sequence& lDescriptor ) +OUString SAL_CALL ScFilterDetect::detect( uno::Sequence& lDescriptor ) throw( uno::RuntimeException ) { uno::Reference< XInputStream > xStream; uno::Reference< XContent > xContent; uno::Reference< XInteractionHandler > xInteraction; String aURL; - ::rtl::OUString sTemp; + OUString sTemp; String aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection) String aPreselectedFilterName; // a name describing the filter to use (from MediaDescriptor, usually from UI action) - ::rtl::OUString aDocumentTitle; // interesting only if set in this method + OUString aDocumentTitle; // interesting only if set in this method // opening as template is done when a parameter tells to do so and a template filter can be detected // (otherwise no valid filter would be found) or if the detected filter is a template filter and @@ -309,11 +308,11 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) bWasReadOnly = pItem && pItem->GetValue(); const SfxFilter* pFilter = 0; - String aPrefix = rtl::OUString( "private:factory/" ); + String aPrefix = OUString( "private:factory/" ); if( aURL.Match( aPrefix ) == aPrefix.Len() ) { String aPattern( aPrefix ); - aPattern += rtl::OUString("scalc"); + aPattern += OUString("scalc"); if ( aURL.Match( aPattern ) >= aPattern.Len() ) pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL ); } @@ -653,14 +652,14 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // get file header rStr.Seek( 0 ); const sal_Size nTrySize = 80; - rtl::OString aHeader = read_uInt8s_ToOString(rStr, nTrySize); + OString aHeader = read_uInt8s_ToOString(rStr, nTrySize); bool bMaybeHtml = HTMLParser::IsHTMLFormat( aHeader.getStr()); if ( aHeader.copy(0, 5).equalsL("{\\rtf", 5) ) { // test for RTF - pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterRtf) ); + pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterRtf) ); } else if ( bIsXLS && (bMaybeText && !bMaybeHtml) ) { @@ -669,7 +668,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // The configured detection for Excel 2003 XML is still in XMLFilterDetect. pFilter = lcl_DetectExcelXML( rStr, aMatcher ); if (!pFilter) - pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterAscii) ); + pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterAscii) ); bFakeXLS = true; } else if ( pPreselectedFilter->GetName().EqualsAscii(pFilterDBase) && lcl_MayBeDBase( rStr ) ) @@ -693,7 +692,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) } else { - pFilter = aMatcher.GetFilter4FilterName( rtl::OUString(pFilterHtmlWeb) ); + pFilter = aMatcher.GetFilter4FilterName( OUString(pFilterHtmlWeb) ); if ( bIsXLS ) bFakeXLS = true; } @@ -788,11 +787,11 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) { lDescriptor.realloc( nPropertyCount + 1 ); lDescriptor[nPropertyCount].Name = "FilterName"; - lDescriptor[nPropertyCount].Value <<= rtl::OUString(pFilter->GetName()); + lDescriptor[nPropertyCount].Value <<= OUString(pFilter->GetName()); nPropertyCount++; } else - lDescriptor[nIndexOfFilterName].Value <<= rtl::OUString(pFilter->GetName()); + lDescriptor[nIndexOfFilterName].Value <<= OUString(pFilter->GetName()); } if ( pFilter ) diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index 63702f88eb8f..d36cdf6493ae 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -45,8 +45,8 @@ public: /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); /* Helper for XServiceInfo */ static com::sun::star::uno::Sequence impl_getStaticSupportedServiceNames(); @@ -60,7 +60,7 @@ public: //---------------------------------------------------------------------------------- // XExtendedFilterDetect //---------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence& lDescriptor ) + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence& lDescriptor ) throw (com::sun::star::uno::RuntimeException); }; diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index a6662f8bac22..e36f967fd447 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -86,7 +86,7 @@ public: { ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString(""), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString(""), uno::Reference< uno::XInterface >() ); uno::Sequence< uno::Any > aArgs(2); // access the application object ( parent for workbook ) @@ -95,7 +95,7 @@ public: maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs ); } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) { SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object @@ -110,7 +110,7 @@ public: maCachedObject = maWorkbook; else { - rtl::OUString sCodeName; + OUString sCodeName; SCTAB nCount = pDoc->GetTableCount(); for( SCTAB i = 0; i < nCount; i++ ) { @@ -119,7 +119,7 @@ public: // from the code name if( String(sCodeName).EqualsIgnoreCaseAscii( sName ) ) { - rtl::OUString sSheetName; + OUString sSheetName; if( pDoc->GetName( i, sSheetName ) ) { uno::Reference< frame::XModel > xModel( mpDocShell->GetModel() ); @@ -130,7 +130,7 @@ public: uno::Sequence< uno::Any > aArgs(3); aArgs[0] = maWorkbook; aArgs[1] = uno::Any( xModel ); - aArgs[2] = uno::Any( rtl::OUString( sSheetName ) ); + aArgs[2] = uno::Any( OUString( sSheetName ) ); // use the convience function maCachedObject <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Worksheet", aArgs ); break; @@ -141,25 +141,25 @@ public: return maCachedObject.hasValue(); } - ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )", - rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() ); if ( !hasByName( aName ) ) throw ::com::sun::star::container::NoSuchElementException(); return maCachedObject; } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) throw uno::RuntimeException(); SCTAB nCount = pDoc->GetTableCount(); - uno::Sequence< rtl::OUString > aNames( nCount + 1 ); + uno::Sequence< OUString > aNames( nCount + 1 ); SCTAB index = 0; - rtl::OUString sCodeName; + OUString sCodeName; for( ; index < nCount; ++index ) { pDoc->GetCodeName( index, sCodeName ); @@ -180,10 +180,10 @@ class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNam public: ScVbaCodeNameProvider( ScDocShell& rDocShell ) : mrDocShell(rDocShell) {} // XCodeNameQuery - rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) + OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; - rtl::OUString sCodeName; + OUString sCodeName; // need to find the page ( and index ) for this control uno::Reference< drawing::XDrawPagesSupplier > xSupplier( mrDocShell.GetModel(), uno::UNO_QUERY_THROW ); @@ -206,7 +206,7 @@ public: bMatched = ( xControl == xIf ); if ( bMatched ) { - rtl::OUString sName; + OUString sName; mrDocShell.GetDocument()->GetCodeName( static_cast( index ), sName ); sCodeName = sName; } @@ -220,7 +220,7 @@ public: return sCodeName; } - rtl::OUString SAL_CALL getCodeNameForContainer( const uno::Reference& xContainer ) + OUString SAL_CALL getCodeNameForContainer( const uno::Reference& xContainer ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -237,14 +237,14 @@ public: uno::Reference xFormControls(xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW); if (xFormControls == xContainer) { - rtl::OUString aName; + OUString aName; if (mrDocShell.GetDocument()->GetCodeName(static_cast(i), aName)) return aName; } } catch( uno::Exception& ) {} } - return rtl::OUString(); + return OUString(); } }; @@ -632,7 +632,7 @@ uno::Reference ScServiceProvider::MakeInstance( { uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= pDocShell->GetModel(); - xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( "ooo.vba.excel.Globals" ), aArgs ); + xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( OUString( "ooo.vba.excel.Globals" ), aArgs ); pDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", uno::Any( xRet ) ); BasicManager* pAppMgr = SFX_APP()->GetBasicManager(); if ( pAppMgr ) @@ -651,14 +651,14 @@ uno::Reference ScServiceProvider::MakeInstance( return xRet; } -uno::Sequence ScServiceProvider::GetAllServiceNames() +uno::Sequence ScServiceProvider::GetAllServiceNames() { const sal_uInt16 nEntries = sizeof(aProvNamesId) / sizeof(aProvNamesId[0]); - uno::Sequence aRet(nEntries); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence aRet(nEntries); + OUString* pArray = aRet.getArray(); for (sal_uInt16 i = 0; i < nEntries; i++) { - pArray[i] = rtl::OUString::createFromAscii( aProvNamesId[i].pName ); + pArray[i] = OUString::createFromAscii( aProvNamesId[i].pName ); } return aRet; } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 55fcc99bdb8e..c5ec413e1b57 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -61,8 +61,8 @@ static const SfxItemPropertyMapEntry* lcl_GetShapeMap() {MAP_CHAR_LEN(SC_UNONAME_VERTPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_MOVEPROTECT), 0, &getCppuType((sal_Bool*)0), 0, 0 }, // #i66550 HLINK_FOR_SHAPES - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; @@ -271,14 +271,14 @@ static sal_Bool lcl_GetPageNum( SdrPage* pPage, SdrModel& rModel, SCTAB& rNum ) static sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Point& rCaptionPoint ) { sal_Bool bReturn = false; - rtl::OUString sType(xShape->getShapeType()); + OUString sType(xShape->getShapeType()); sal_Bool bCaptionShape( sType == "com.sun.star.drawing.CaptionShape" ); if (bCaptionShape) { uno::Reference < beans::XPropertySet > xShapeProp (xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - xShapeProp->getPropertyValue( rtl::OUString( "CaptionPoint" ) ) >>= rCaptionPoint; + xShapeProp->getPropertyValue( OUString( "CaptionPoint" ) ) >>= rCaptionPoint; bReturn = sal_True; } } @@ -332,7 +332,7 @@ static awt::Point lcl_GetRelativePos( uno::Reference< drawing::XShape >& xShape, } void SAL_CALL ScShapeObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -446,7 +446,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } } else - throw lang::IllegalArgumentException(rtl::OUString("only XCell or XSpreadsheet objects allowed"), static_cast(this), 0); + throw lang::IllegalArgumentException(OUString("only XCell or XSpreadsheet objects allowed"), static_cast(this), 0); } else if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) { @@ -642,7 +642,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) || aNameString.EqualsAscii( SC_UNONAME_URL) ) { - rtl::OUString sHlink; + OUString sHlink; ScMacroInfo* pInfo = ScShapeObj_getShapeHyperMacroInfo(this, true); if ( ( aValue >>= sHlink ) && pInfo ) pInfo->SetHlink( sHlink ); @@ -664,7 +664,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } } -uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -827,7 +827,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) || aNameString.EqualsAscii( SC_UNONAME_URL ) ) { - rtl::OUString sHlink; + OUString sHlink; if ( ScMacroInfo* pInfo = ScShapeObj_getShapeHyperMacroInfo(this) ) sHlink = pInfo->GetHlink(); aAny <<= sHlink; @@ -849,7 +849,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa return aAny; } -void SAL_CALL ScShapeObj::addPropertyChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -873,7 +873,7 @@ void SAL_CALL ScShapeObj::addPropertyChangeListener( const rtl::OUString& aPrope } } -void SAL_CALL ScShapeObj::removePropertyChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -885,7 +885,7 @@ void SAL_CALL ScShapeObj::removePropertyChangeListener( const rtl::OUString& aPr pShapePropertySet->removePropertyChangeListener( aPropertyName, aListener ); } -void SAL_CALL ScShapeObj::addVetoableChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyName, const uno::Reference& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -897,7 +897,7 @@ void SAL_CALL ScShapeObj::addVetoableChangeListener( const rtl::OUString& aPrope pShapePropertySet->addVetoableChangeListener( aPropertyName, aListener ); } -void SAL_CALL ScShapeObj::removeVetoableChangeListener( const rtl::OUString& aPropertyName, +void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropertyName, const uno::Reference& aListener) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -911,7 +911,7 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const rtl::OUString& aPr // XPropertyState -beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -945,14 +945,14 @@ beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const rtl::OUString& } uno::Sequence SAL_CALL ScShapeObj::getPropertyStates( - const uno::Sequence& aPropertyNames ) + const uno::Sequence& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; // simple loop to get own and aggregated states - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++) @@ -960,7 +960,7 @@ uno::Sequence SAL_CALL ScShapeObj::getPropertyStates( return aRet; } -void SAL_CALL ScShapeObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -991,7 +991,7 @@ void SAL_CALL ScShapeObj::setPropertyToDefault( const rtl::OUString& aPropertyNa } } -uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1102,7 +1102,7 @@ void SAL_CALL ScShapeObj::removeEventListener( static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet& rSource, const sal_Char* pName ) { - rtl::OUString aNameStr(rtl::OUString::createFromAscii(pName)); + OUString aNameStr(OUString::createFromAscii(pName)); try { rDest.setPropertyValue( aNameStr, rSource.getPropertyValue( aNameStr ) ); @@ -1200,7 +1200,7 @@ uno::Reference SAL_CALL ScShapeObj::createTextCursorByRange( } void SAL_CALL ScShapeObj::insertString( const uno::Reference& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1260,7 +1260,7 @@ uno::Reference SAL_CALL ScShapeObj::getEnd() throw(uno::Runtim // return uno::Reference(); } -rtl::OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1270,10 +1270,10 @@ rtl::OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException) else throw uno::RuntimeException(); -// return rtl::OUString(); +// return OUString(); } -void SAL_CALL ScShapeObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1360,7 +1360,7 @@ uno::Sequence SAL_CALL ScShapeObj::getImplementationId() if( xAggShape.is() ) { - const rtl::OUString aShapeType( xAggShape->getShapeType() ); + const OUString aShapeType( xAggShape->getShapeType() ); // did we already compute an implementation id for the agregated shape type? ScShapeImplementationIdMap::iterator aIter( aImplementationIdMap.find(aShapeType ) ); if( aIter == aImplementationIdMap.end() ) @@ -1403,9 +1403,9 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() return NULL; } -#define SC_EVENTACC_ONCLICK ::rtl::OUString( "OnClick" ) -#define SC_EVENTACC_SCRIPT ::rtl::OUString( "Script" ) -#define SC_EVENTACC_EVENTTYPE ::rtl::OUString( "EventType" ) +#define SC_EVENTACC_ONCLICK OUString( "OnClick" ) +#define SC_EVENTACC_SCRIPT OUString( "Script" ) +#define SC_EVENTACC_EVENTTYPE OUString( "EventType" ) typedef ::cppu::WeakImplHelper1< container::XNameReplace > ShapeUnoEventAcess_BASE; class ShapeUnoEventAccessImpl : public ShapeUnoEventAcess_BASE @@ -1424,7 +1424,7 @@ public: } // XNameReplace - virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -1443,7 +1443,7 @@ public: } if ( isEventType && (pProperties->Name == SC_EVENTACC_SCRIPT) ) { - rtl::OUString sValue; + OUString sValue; if ( pProperties->Value >>= sValue ) { ScMacroInfo* pInfo = getInfo( sal_True ); @@ -1460,7 +1460,7 @@ public: } // XNameAccess - virtual uno::Any SAL_CALL getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { uno::Sequence< beans::PropertyValue > aProperties; ScMacroInfo* pInfo = getInfo(); @@ -1484,14 +1484,14 @@ public: return uno::Any( aProperties ); } - virtual uno::Sequence< rtl::OUString > SAL_CALL getElementNames() throw(uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException) { - uno::Sequence< rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); aSeq[ 0 ] = SC_EVENTACC_ONCLICK; return aSeq; } - virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException) { return aName == SC_EVENTACC_ONCLICK; } @@ -1515,15 +1515,15 @@ ScShapeObj::getEvents( ) throw(uno::RuntimeException) return new ShapeUnoEventAccessImpl( this ); } -::rtl::OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException) +OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.sc.ScShapeObj" ); + return OUString( "com.sun.star.comp.sc.ScShapeObj" ); } -::sal_Bool SAL_CALL ScShapeObj::supportsService( const ::rtl::OUString& _ServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& _ServiceName ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pSupported = aSupported.getConstArray(); + uno::Sequence< OUString > aSupported( getSupportedServiceNames() ); + for ( const OUString* pSupported = aSupported.getConstArray(); pSupported != aSupported.getConstArray() + aSupported.getLength(); ++pSupported ) @@ -1532,23 +1532,23 @@ ScShapeObj::getEvents( ) throw(uno::RuntimeException) return false; } -uno::Sequence< ::rtl::OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) throw (uno::RuntimeException) { uno::Reference xSI; if ( mxShapeAgg.is() ) mxShapeAgg->queryAggregation( lang::XServiceInfo::static_type() ) >>= xSI; - uno::Sequence< ::rtl::OUString > aSupported; + uno::Sequence< OUString > aSupported; if ( xSI.is() ) aSupported = xSI->getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.Shape" ); + aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.sheet.Shape" ); if( bIsNoteCaption ) { aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.CellAnnotationShape" ); + aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.sheet.CellAnnotationShape" ); } return aSupported; diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 1ead24df1f09..0d0228b5e96d 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -99,13 +99,13 @@ ScCellSearchObj::~ScCellSearchObj() // XSearchDescriptor -rtl::OUString SAL_CALL ScCellSearchObj::getSearchString() throw(uno::RuntimeException) +OUString SAL_CALL ScCellSearchObj::getSearchString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return pSearchItem->GetSearchString(); } -void SAL_CALL ScCellSearchObj::setSearchString( const rtl::OUString& aString ) +void SAL_CALL ScCellSearchObj::setSearchString( const OUString& aString ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -114,13 +114,13 @@ void SAL_CALL ScCellSearchObj::setSearchString( const rtl::OUString& aString ) // XReplaceDescriptor -rtl::OUString SAL_CALL ScCellSearchObj::getReplaceString() throw(uno::RuntimeException) +OUString SAL_CALL ScCellSearchObj::getReplaceString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; return pSearchItem->GetReplaceString(); } -void SAL_CALL ScCellSearchObj::setReplaceString( const rtl::OUString& aReplaceString ) +void SAL_CALL ScCellSearchObj::setReplaceString( const OUString& aReplaceString ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -139,7 +139,7 @@ uno::Reference SAL_CALL ScCellSearchObj::getPropertySet } void SAL_CALL ScCellSearchObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -162,7 +162,7 @@ void SAL_CALL ScCellSearchObj::setPropertyValue( else if (aString.EqualsAscii( SC_UNO_SRCHFILTERED )) pSearchItem->SetSearchFiltered( ScUnoHelpFunctions::GetBoolFromAny(aValue) ); } -uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -191,12 +191,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj ) // XServiceInfo -rtl::OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScCellSearchObj" ); + return OUString( "ScCellSearchObj" ); } -sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScCellSearchObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr(rServiceName); @@ -204,13 +204,13 @@ sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServic aServiceStr.EqualsAscii( SCREPLACEDESCRIPTOR_SERVICE ); } -uno::Sequence SAL_CALL ScCellSearchObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScCellSearchObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE )); + uno::Sequence aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE )); return aRet; } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index a5d5cb5c7c7e..9c7cc587d386 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -88,15 +88,15 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY }, - {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_FAMILY_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH }, - {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, - {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, + {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((OUString*)0), 0, MID_FONT_STYLE_NAME }, {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, @@ -123,7 +123,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR2), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR2), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine2*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &::getCppuType((const table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST }, {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, @@ -159,7 +159,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_HIDDEN), ATTR_HIDDEN, &getCppuType((sal_Bool*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, &getCppuType((OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aCellStyleSet_Impl( aCellStyleMap_Impl ); @@ -173,9 +173,9 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() static SfxItemPropertyMapEntry aPageStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_URL }, {MAP_CHAR_LEN(SC_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS }, @@ -184,13 +184,13 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERHOR), ATTR_PAGE_HORCENTER,&::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERVER), ATTR_PAGE_VERCENTER,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ATTR_PAGE_FIRSTPAGENO,&::getCppuType((const sal_Int16*)0), 0, 0 }, // {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), SC_WID_UNO_FOOTERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -215,9 +215,9 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, // {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), SC_WID_UNO_HEADERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,&::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -261,7 +261,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTHEADER), ATTR_PAGE_HEADERS, &::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTOBJS), ATTR_PAGE_OBJECTS, &::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTZERO), ATTR_PAGE_NULLVALS, &::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ATTR_PAGE_PAPERBIN, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ATTR_PAGE_PAPERBIN, &::getCppuType((const OUString*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS }, @@ -294,9 +294,9 @@ static const SfxItemPropertyMap* lcl_GetHeaderStyleMap() static SfxItemPropertyMapEntry aHeaderStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_URL }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS }, @@ -333,9 +333,9 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() static SfxItemPropertyMapEntry aFooterStyleMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_FILTER }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION }, - {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL }, + {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, &::getCppuType((const OUString*)0), 0, MID_GRAPHIC_URL }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR }, {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS }, @@ -424,19 +424,19 @@ static const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) if ( !bCellMapFilled ) { aCellMap[0].aDispName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); - aCellMap[0].aProgName = rtl::OUString( SC_STYLE_PROG_STANDARD ); + aCellMap[0].aProgName = OUString( SC_STYLE_PROG_STANDARD ); aCellMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_RESULT ); - aCellMap[1].aProgName = rtl::OUString( SC_STYLE_PROG_RESULT ); + aCellMap[1].aProgName = OUString( SC_STYLE_PROG_RESULT ); aCellMap[2].aDispName = ScGlobal::GetRscString( STR_STYLENAME_RESULT1 ); - aCellMap[2].aProgName = rtl::OUString( SC_STYLE_PROG_RESULT1 ); + aCellMap[2].aProgName = OUString( SC_STYLE_PROG_RESULT1 ); aCellMap[3].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE ); - aCellMap[3].aProgName = rtl::OUString( SC_STYLE_PROG_HEADLINE ); + aCellMap[3].aProgName = OUString( SC_STYLE_PROG_HEADLINE ); aCellMap[4].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE1 ); - aCellMap[4].aProgName = rtl::OUString( SC_STYLE_PROG_HEADLINE1 ); + aCellMap[4].aProgName = OUString( SC_STYLE_PROG_HEADLINE1 ); // last entry remains empty @@ -451,10 +451,10 @@ static const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType ) if ( !bPageMapFilled ) { aPageMap[0].aDispName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); - aPageMap[0].aProgName = rtl::OUString( SC_STYLE_PROG_STANDARD ); + aPageMap[0].aProgName = OUString( SC_STYLE_PROG_STANDARD ); aPageMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_REPORT ); - aPageMap[1].aProgName = rtl::OUString( SC_STYLE_PROG_REPORT ); + aPageMap[1].aProgName = OUString( SC_STYLE_PROG_REPORT ); // last entry remains empty @@ -596,7 +596,7 @@ ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByIndex_Impl(sal_uInt32 nIndex) c return NULL; // ungueltiger Index } -ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const rtl::OUString& aName) const +ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const OUString& aName) const { if ( pDocShell ) { @@ -644,7 +644,7 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException) // container::XNameAccess -uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -657,18 +657,18 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -uno::Sequence SAL_CALL ScStyleFamiliesObj::getElementNames() +uno::Sequence SAL_CALL ScStyleFamiliesObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence aNames(SC_STYLE_FAMILY_COUNT); - rtl::OUString* pNames = aNames.getArray(); - pNames[0] = rtl::OUString(SC_FAMILYNAME_CELL ); - pNames[1] = rtl::OUString(SC_FAMILYNAME_PAGE ); + uno::Sequence aNames(SC_STYLE_FAMILY_COUNT); + OUString* pNames = aNames.getArray(); + pNames[0] = OUString(SC_FAMILYNAME_CELL ); + pNames[1] = OUString(SC_FAMILYNAME_PAGE ); return aNames; } -sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -678,15 +678,15 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const rtl::OUString& aName ) // style::XStyleLoader -void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const rtl::OUString& aURL, +void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const OUString& aURL, const uno::Sequence& aOptions ) throw(io::IOException, uno::RuntimeException) { //! use aOptions (like Writer) //! set flag to disable filter option dialogs when importing - rtl::OUString aFilter; // empty - detect - rtl::OUString aFiltOpt; + OUString aFilter; // empty - detect + OUString aFiltOpt; ScDocumentLoader aLoader( aURL, aFilter, aFiltOpt ); ScDocShell* pSource = aLoader.GetDocShell(); @@ -726,13 +726,13 @@ uno::Sequence SAL_CALL ScStyleFamiliesObj::getStyleLoaderO uno::Sequence aSequence(3); beans::PropertyValue* pArray = aSequence.getArray(); - pArray[0].Name = rtl::OUString(SC_UNONAME_OVERWSTL ); + pArray[0].Name = OUString(SC_UNONAME_OVERWSTL ); ScUnoHelpFunctions::SetBoolInAny( pArray[0].Value, true ); - pArray[1].Name = rtl::OUString(SC_UNONAME_LOADCELL ); + pArray[1].Name = OUString(SC_UNONAME_LOADCELL ); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, true ); - pArray[2].Name = rtl::OUString(SC_UNONAME_LOADPAGE ); + pArray[2].Name = OUString(SC_UNONAME_LOADPAGE ); ScUnoHelpFunctions::SetBoolInAny( pArray[2].Value, true ); return aSequence; @@ -786,7 +786,7 @@ ScStyleObj* ScStyleFamilyObj::GetObjectByIndex_Impl(sal_uInt32 nIndex) return NULL; } -ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const rtl::OUString& aName) +ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const OUString& aName) { if ( pDocShell ) { @@ -800,7 +800,7 @@ ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const rtl::OUString& aName) return NULL; } -void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { @@ -846,7 +846,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const } } -void SAL_CALL ScStyleFamilyObj::replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL ScStyleFamilyObj::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -856,7 +856,7 @@ void SAL_CALL ScStyleFamilyObj::replaceByName( const rtl::OUString& aName, const insertByName( aName, aElement ); } -void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName ) +void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -954,7 +954,7 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException) // container::XNameAccess -uno::Any SAL_CALL ScStyleFamilyObj::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL ScStyleFamilyObj::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -968,7 +968,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByName( const rtl::OUString& aName ) // return uno::Any(); } -uno::Sequence SAL_CALL ScStyleFamilyObj::getElementNames() +uno::Sequence SAL_CALL ScStyleFamilyObj::getElementNames() throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -980,8 +980,8 @@ uno::Sequence SAL_CALL ScStyleFamilyObj::getElementNames() SfxStyleSheetIterator aIter( pStylePool, eFamily ); sal_uInt16 nCount = aIter.Count(); - uno::Sequence aSeq(nCount); - rtl::OUString* pAry = aSeq.getArray(); + uno::Sequence aSeq(nCount); + OUString* pAry = aSeq.getArray(); SfxStyleSheetBase* pStyle = aIter.First(); sal_uInt16 nPos = 0; while (pStyle) @@ -994,10 +994,10 @@ uno::Sequence SAL_CALL ScStyleFamilyObj::getElementNames() } return aSeq; } - return uno::Sequence(); + return uno::Sequence(); } -sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const rtl::OUString& aName ) +sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const OUString& aName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1021,12 +1021,12 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getProperty return uno::Reference< beans::XPropertySetInfo >(); } -void SAL_CALL ScStyleFamilyObj::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; @@ -1045,34 +1045,34 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr } if ( nResId > 0 ) { - ::rtl::OUString sDisplayName( ScGlobal::GetRscString( static_cast< sal_uInt16 >( nResId ) ) ); + OUString sDisplayName( ScGlobal::GetRscString( static_cast< sal_uInt16 >( nResId ) ) ); aRet = uno::makeAny( sDisplayName ); } } else { - throw beans::UnknownPropertyException( ::rtl::OUString( "unknown property: " ) + sPropertyName, static_cast(this) ); + throw beans::UnknownPropertyException( OUString( "unknown property: " ) + sPropertyName, static_cast(this) ); } return aRet; } -void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } @@ -1185,16 +1185,16 @@ sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException) return false; } -rtl::OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException) +OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetParent(), sal::static_int_cast(eFamily) ); - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle ) +void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle ) throw(container::NoSuchElementException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1241,16 +1241,16 @@ void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle ) // container::XNamed -rtl::OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException) +OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException) { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetName(), sal::static_int_cast(eFamily) ); - return rtl::OUString(); + return OUString(); } -void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName ) +void SAL_CALL ScStyleObj::setName( const OUString& aNewName ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1295,7 +1295,7 @@ uno::Reference ScStyleObj::CreateEmptyNumberingRules() // beans::XPropertyState -const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const ::rtl::OUString& rPropName, +const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const OUString& rPropName, const SfxItemPropertySimpleEntry*& rpResultEntry ) { //! OUString as argument? @@ -1331,7 +1331,7 @@ const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const ::rtl::OUString& rProp return NULL; } -beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString& aPropertyName ) +beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1372,14 +1372,14 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString& } uno::Sequence SAL_CALL ScStyleObj::getPropertyStates( - const uno::Sequence& aPropertyNames ) + const uno::Sequence& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { // duemmliche Default-Implementierung: alles einzeln per getPropertyState holen //! sollte optimiert werden! SolarMutexGuard aGuard; - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); uno::Sequence aRet(aPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++) @@ -1387,7 +1387,7 @@ uno::Sequence SAL_CALL ScStyleObj::getPropertyStates( return aRet; } -void SAL_CALL ScStyleObj::setPropertyToDefault( const rtl::OUString& aPropertyName ) +void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1400,7 +1400,7 @@ void SAL_CALL ScStyleObj::setPropertyToDefault( const rtl::OUString& aPropertyNa SetOnePropertyValue( aPropertyName, pEntry, NULL ); } -uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1492,7 +1492,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty // XMultiPropertySet -void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames, +void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1505,7 +1505,7 @@ void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString if ( nCount ) { - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); const SfxItemPropertyMap& rPropertyMap = pPropSet->getPropertyMap(); @@ -1518,7 +1518,7 @@ void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString } uno::Sequence SAL_CALL ScStyleObj::getPropertyValues( - const uno::Sequence< rtl::OUString >& aPropertyNames ) + const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1536,7 +1536,7 @@ uno::Sequence SAL_CALL ScStyleObj::getPropertyValues( return aSequence; } -void SAL_CALL ScStyleObj::addPropertiesChangeListener( const uno::Sequence& /* aPropertyNames */, +void SAL_CALL ScStyleObj::addPropertiesChangeListener( const uno::Sequence& /* aPropertyNames */, const uno::Reference& /* xListener */ ) throw (uno::RuntimeException) { @@ -1550,7 +1550,7 @@ void SAL_CALL ScStyleObj::removePropertiesChangeListener( // no bound properties } -void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence& /* aPropertyNames */, +void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence& /* aPropertyNames */, const uno::Reference& /* xListener */ ) throw (uno::RuntimeException) { @@ -1606,7 +1606,7 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault() throw (uno::RuntimeExcepti } } -void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence& aPropertyNames ) +void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1614,7 +1614,7 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::SequencegetPropertyMap(); for (sal_Int32 i = 0; i < nCount; i++) @@ -1626,7 +1626,7 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence SAL_CALL ScStyleObj::getPropertyDefaults( - const uno::Sequence& aPropertyNames ) + const uno::Sequence& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1655,7 +1655,7 @@ uno::Reference SAL_CALL ScStyleObj::getPropertySetInfo( } void SAL_CALL ScStyleObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1669,7 +1669,7 @@ void SAL_CALL ScStyleObj::setPropertyValue( SetOnePropertyValue( aPropertyName, pEntry, &aValue ); } -void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const uno::Any* pValue ) +void ScStyleObj::SetOnePropertyValue( const OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const uno::Any* pValue ) throw(lang::IllegalArgumentException, uno::RuntimeException) { SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1830,7 +1830,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS; sal_Bool bFound = false; - rtl::OUString aName; + OUString aName; if ( *pValue >>= aName ) { if ( aName == SC_PAPERBIN_DEFAULTNAME ) @@ -1976,7 +1976,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons } } -uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScStyleObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1988,7 +1988,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa // core always has the display name SfxStyleSheetBase* pStyle = GetStyle_Impl(); if (pStyle) - aAny <<= rtl::OUString( pStyle->GetName() ); + aAny <<= OUString( pStyle->GetName() ); } else { @@ -2043,9 +2043,9 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa // property PrinterPaperTray is the name of the tray sal_uInt8 nValue = ((const SvxPaperBinItem&)pItemSet->Get(nWhich)).GetValue(); - rtl::OUString aName; + OUString aName; if ( nValue == PAPERBIN_PRINTER_SETTINGS ) - aName = rtl::OUString(SC_PAPERBIN_DEFAULTNAME ); + aName = OUString(SC_PAPERBIN_DEFAULTNAME ); else { Printer* pPrinter = pDocShell->GetPrinter(); @@ -2119,12 +2119,12 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScStyleObj ) // lang::XServiceInfo -rtl::OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString("ScStyleObj" ); + return OUString("ScStyleObj" ); } -sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScStyleObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE ); @@ -2133,15 +2133,15 @@ sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName RTL_CONSTASCII_STRINGPARAM ( bPage ? SCPAGESTYLE_SERVICE : SCCELLSTYLE_SERVICE )); } -uno::Sequence SAL_CALL ScStyleObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScStyleObj::getSupportedServiceNames() throw(uno::RuntimeException) { sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE ); - uno::Sequence aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(SCSTYLE_SERVICE ); - pArray[1] = bPage ? rtl::OUString(SCPAGESTYLE_SERVICE) - : rtl::OUString(SCCELLSTYLE_SERVICE); + uno::Sequence aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(SCSTYLE_SERVICE ); + pArray[1] = bPage ? OUString(SCPAGESTYLE_SERVICE) + : OUString(SCCELLSTYLE_SERVICE); return aRet; } diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 8a64525cc0a0..e7196b037359 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -53,7 +53,7 @@ static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() static SfxItemPropertyMapEntry aLinkTargetMap_Impl[] = { {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((const uno::Reference*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {0,0,0,0,0,0} }; return aLinkTargetMap_Impl; @@ -93,7 +93,7 @@ void ScLinkTargetTypesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // container::XNameAccess -uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const rtl::OUString& aName) +uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { if (pDocShell) @@ -107,16 +107,16 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const rtl::OUString& aName) throw container::NoSuchElementException(); } -uno::Sequence SAL_CALL ScLinkTargetTypesObj::getElementNames(void) throw( uno::RuntimeException ) +uno::Sequence SAL_CALL ScLinkTargetTypesObj::getElementNames(void) throw( uno::RuntimeException ) { - uno::Sequence aRet(SC_LINKTARGETTYPE_COUNT); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence aRet(SC_LINKTARGETTYPE_COUNT); + OUString* pArray = aRet.getArray(); for (sal_uInt16 i=0; i SAL_CALL ScLinkTargetTypeObj::getProp return aRef; } -void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const rtl::OUString& /* aPropertyName */, +void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aPropertyName */, const uno::Any& /* aValue */) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -234,7 +234,7 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType } } -uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const rtl::OUString& PropertyName) +uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const OUString& PropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { uno::Any aRet; @@ -242,7 +242,7 @@ uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const rtl::OUString& Pro if ( aNameStr.EqualsAscii( SC_UNO_LINKDISPBIT ) ) SetLinkTargetBitmap( aRet, nType ); else if ( aNameStr.EqualsAscii( SC_UNO_LINKDISPNAME ) ) - aRet <<= rtl::OUString( aName ); + aRet <<= OUString( aName ); return aRet; } @@ -263,7 +263,7 @@ ScLinkTargetsObj::~ScLinkTargetsObj() // container::XNameAccess -uno::Any SAL_CALL ScLinkTargetsObj::getByName(const rtl::OUString& aName) +uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xProp( ScUnoHelpFunctions::AnyToInterface( xCollection->getByName(aName) ), uno::UNO_QUERY ); @@ -274,12 +274,12 @@ uno::Any SAL_CALL ScLinkTargetsObj::getByName(const rtl::OUString& aName) // return uno::Any(); } -uno::Sequence SAL_CALL ScLinkTargetsObj::getElementNames(void) throw( uno::RuntimeException ) +uno::Sequence SAL_CALL ScLinkTargetsObj::getElementNames(void) throw( uno::RuntimeException ) { return xCollection->getElementNames(); } -sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const rtl::OUString& aName) throw( uno::RuntimeException ) +sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) throw( uno::RuntimeException ) { return xCollection->hasByName(aName); } diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 29e61fdd8f8b..77ba10fa924b 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -321,7 +321,7 @@ uno::Reference SAL_CALL ScHeaderFooterTextObj::createTextCurs void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) { - rtl::OUString aDummy("???"); + OUString aDummy("???"); rData.aTitle = aDummy; rData.aLongDocName = aDummy; rData.aShortDocName = aDummy; @@ -330,10 +330,10 @@ void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) rData.nTotalPages = 99; } -rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException) +OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; const EditTextObject* pData; sal_uInt16 nPart = aTextData.GetPart(); @@ -360,7 +360,7 @@ rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeExce return aRet; } -void SAL_CALL ScHeaderFooterTextObj::setString( const rtl::OUString& aText ) throw(uno::RuntimeException) +void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; String aString(aText); @@ -372,7 +372,7 @@ void SAL_CALL ScHeaderFooterTextObj::setString( const rtl::OUString& aText ) thr } void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference& xRange, - const rtl::OUString& aString, sal_Bool bAbsorb ) + const OUString& aString, sal_Bool bAbsorb ) throw(uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 6be263f1e816..bb49faf9d49d 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -125,7 +125,7 @@ void ScFormulaParserObj::SetCompilerFlags( ScCompiler& rCompiler ) const } uno::Sequence SAL_CALL ScFormulaParserObj::parseFormula( - const rtl::OUString& aFormula, const table::CellAddress& rReferencePos ) + const OUString& aFormula, const table::CellAddress& rReferencePos ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -150,12 +150,12 @@ uno::Sequence SAL_CALL ScFormulaParserObj::parseFormula( return aRet; } -rtl::OUString SAL_CALL ScFormulaParserObj::printFormula( +OUString SAL_CALL ScFormulaParserObj::printFormula( const uno::Sequence& aTokens, const table::CellAddress& rReferencePos ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aRet; + OUString aRet; if (mpDocShell) { @@ -168,7 +168,7 @@ rtl::OUString SAL_CALL ScFormulaParserObj::printFormula( aCompiler.SetGrammar(pDoc->GetGrammar()); SetCompilerFlags( aCompiler ); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aCompiler.CreateStringFromTokenArray( aBuffer ); aRet = aBuffer.makeStringAndClear(); } @@ -187,7 +187,7 @@ uno::Reference SAL_CALL ScFormulaParserObj::getProperty } void SAL_CALL ScFormulaParserObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -246,7 +246,7 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue( throw beans::UnknownPropertyException(); } -uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -362,12 +362,12 @@ bool ScTokenConversion::ConvertToTokenSequence( ScDocument& rDoc, rAPI.Data <<= rToken.GetDouble(); break; case formula::svString: - rAPI.Data <<= rtl::OUString( rToken.GetString() ); + rAPI.Data <<= OUString( rToken.GetString() ); break; case svExternal: // Function name is stored as string. // Byte (parameter count) is ignored. - rAPI.Data <<= rtl::OUString( rToken.GetExternal() ); + rAPI.Data <<= OUString( rToken.GetExternal() ); break; case svSingleRef: { @@ -431,7 +431,7 @@ bool ScTokenConversion::ConvertToTokenSequence( ScDocument& rDoc, { sheet::ExternalReference aExtRef; aExtRef.Index = rToken.GetIndex(); - aExtRef.Reference <<= ::rtl::OUString( rToken.GetString() ); + aExtRef.Reference <<= OUString( rToken.GetString() ); rAPI.Data <<= aExtRef; eOpCode = ocPush; } diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index dacd7ec34313..378177ae2e8d 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -30,15 +30,15 @@ using namespace ::com::sun::star; -::rtl::OUString SAL_CALL ScDocument_getImplementationName() throw() +OUString SAL_CALL ScDocument_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); + return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); } -uno::Sequence< rtl::OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() { - uno::Sequence< rtl::OUString > aSeq( 1 ); - aSeq[0] = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ); + uno::Sequence< OUString > aSeq( 1 ); + aSeq[0] = OUString( "com.sun.star.sheet.SpreadsheetDocument" ); return aSeq; } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 7e9e1be6a09a..2c791eb2e455 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -531,7 +531,7 @@ static void lcl_CallActivate( ScDocShell* pDocSh, SCTAB nTab, sal_Int32 nEvent ) const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(nEvent); + const OUString* pScript = pEvents->GetScript(nEvent); if (pScript) { uno::Any aRet; @@ -986,7 +986,7 @@ uno::Reference SAL_CALL ScTabViewObj::createEnumeration throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); } // XIndexAccess @@ -1240,7 +1240,7 @@ sal_Bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(nEvent); + const OUString* pScript = pEvents->GetScript(nEvent); if (pScript) { // the macro parameter is the clicked object, as in the mousePressed call above @@ -1760,7 +1760,7 @@ void ScTabViewObj::SelectionChanged() const ScSheetEvents* pEvents = pDoc->GetSheetEvents(nTab); if (pEvents) { - const rtl::OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_SELECT); + const OUString* pScript = pEvents->GetScript(SC_SHEETEVENT_SELECT); if (pScript) { // the macro parameter is the selection as returned by getSelection @@ -1806,7 +1806,7 @@ uno::Reference SAL_CALL ScTabViewObj::getPropertySetInf } void SAL_CALL ScTabViewObj::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1930,7 +1930,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue( } } -uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aPropertyName ) +uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1990,7 +1990,7 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aProperty return aRet; } -void SAL_CALL ScTabViewObj::addPropertyChangeListener( const ::rtl::OUString& /* aPropertyName */, +void SAL_CALL ScTabViewObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2002,7 +2002,7 @@ void SAL_CALL ScTabViewObj::addPropertyChangeListener( const ::rtl::OUString& /* aPropertyChgListeners.push_back( pObj ); } -void SAL_CALL ScTabViewObj::removePropertyChangeListener( const ::rtl::OUString& /* aPropertyName */, +void SAL_CALL ScTabViewObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2020,7 +2020,7 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const ::rtl::OUString& } } -void SAL_CALL ScTabViewObj::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, +void SAL_CALL ScTabViewObj::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference& /* aListener */ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2028,7 +2028,7 @@ void SAL_CALL ScTabViewObj::addVetoableChangeListener( const ::rtl::OUString& /* { } -void SAL_CALL ScTabViewObj::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, +void SAL_CALL ScTabViewObj::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference& /* aListener */ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -2059,7 +2059,7 @@ void SAL_CALL ScTabViewObj::startRangeSelection( sal_Bool bSingleCell = false; sal_Bool bMultiSelection = false; - rtl::OUString aStrVal; + OUString aStrVal; const beans::PropertyValue* pPropArray = aArguments.getConstArray(); long nPropCount = aArguments.getLength(); for (long i = 0; i < nPropCount; i++) @@ -2153,7 +2153,7 @@ void ScTabViewObj::RangeSelDone( const String& rText ) { sheet::RangeSelectionEvent aEvent; aEvent.Source.set(static_cast(this)); - aEvent.RangeDescriptor = rtl::OUString( rText ); + aEvent.RangeDescriptor = OUString( rText ); // copy on the stack because listener could remove itself XRangeSelectionListenerVector const listeners(aRangeSelListeners); @@ -2166,7 +2166,7 @@ void ScTabViewObj::RangeSelAborted( const String& rText ) { sheet::RangeSelectionEvent aEvent; aEvent.Source.set(static_cast(this)); - aEvent.RangeDescriptor = rtl::OUString( rText ); + aEvent.RangeDescriptor = OUString( rText ); // copy on the stack because listener could remove itself XRangeSelectionListenerVector const listeners(aRangeSelListeners); @@ -2179,7 +2179,7 @@ void ScTabViewObj::RangeSelChanged( const String& rText ) { sheet::RangeSelectionEvent aEvent; aEvent.Source.set(static_cast(this)); - aEvent.RangeDescriptor = rtl::OUString( rText ); + aEvent.RangeDescriptor = OUString( rText ); // copy on the stack because listener could remove itself XRangeSelectionChangeListenerVector const listener(aRangeChgListeners); @@ -2190,12 +2190,12 @@ void ScTabViewObj::RangeSelChanged( const String& rText ) // XServiceInfo -rtl::OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( "ScTabViewObj" ); + return OUString( "ScTabViewObj" ); } -sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ScTabViewObj::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { String aServiceStr( rServiceName ); @@ -2203,13 +2203,13 @@ sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceNa aServiceStr.EqualsAscii( SCVIEWSETTINGS_SERVICE ); } -uno::Sequence SAL_CALL ScTabViewObj::getSupportedServiceNames() +uno::Sequence SAL_CALL ScTabViewObj::getSupportedServiceNames() throw(uno::RuntimeException) { - uno::Sequence aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE )); - pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE )); + uno::Sequence aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE )); return aRet; } @@ -2277,7 +2277,7 @@ void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Ref SolarMutexGuard aGuard; ScEditShell* pShell = PTR_CAST( ScEditShell, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); if (pShell) - pShell->GetEditView()->InsertText( xTrans, ::rtl::OUString(), false ); + pShell->GetEditView()->InsertText( xTrans, OUString(), false ); else { ScDrawTextObjectBar* pTextShell = PTR_CAST( ScDrawTextObjectBar, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); @@ -2288,7 +2288,7 @@ void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Ref OutlinerView* pOutView = pView->GetTextEditOutlinerView(); if ( pOutView ) { - pOutView->GetEditView().InsertText( xTrans, ::rtl::OUString(), false ); + pOutView->GetEditView().InsertText( xTrans, OUString(), false ); return; } } diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx index 086948ae05d6..df022b2b4330 100644 --- a/sc/source/ui/unoobj/warnpassword.cxx +++ b/sc/source/ui/unoobj/warnpassword.cxx @@ -30,7 +30,6 @@ #include -using ::rtl::OUString; using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index f61239c37bf3..86943a21d4ac 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -50,7 +50,7 @@ GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) if ( pShell ) xModel.set( pShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xModelProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( rtl::OUString("UnnamedDatabaseRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( OUString("UnnamedDatabaseRanges") ), uno::UNO_QUERY_THROW ); return xUnnamedDBRanges; } @@ -66,7 +66,7 @@ GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeExc uno::Reference< sheet::XDatabaseRange > xDBRange( xUnnamedDBRanges->getByTable( nSheet ) , uno::UNO_QUERY_THROW ); sal_Bool bHasAuto = false; uno::Reference< beans::XPropertySet > xProps( xDBRange, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( rtl::OUString("AutoFilter") ) >>= bHasAuto; + xProps->getPropertyValue( OUString("AutoFilter") ) >>= bHasAuto; if ( bHasAuto ) { xDataBaseRange=xDBRange; @@ -80,7 +80,7 @@ ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRang ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange ); if ( !pScCellRangesBase ) { - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying doc shell uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying doc shell uno range object" ), uno::Reference< uno::XInterface >() ); } return pScCellRangesBase->GetDocShell(); } @@ -101,7 +101,7 @@ void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom pViewSh->RefreshZoom(); } -const ::rtl::OUString REPLACE_CELLS_WARNING( "ReplaceCellsWarning"); +const OUString REPLACE_CELLS_WARNING( "ReplaceCellsWarning"); class PasteCellsWarningReseter { @@ -113,7 +113,7 @@ private: comphelper::getProcessComponentContext() ); static uno::Reference xServiceManager( xContext->getServiceManager() ); - static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW ); + static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW ); return xProps; } @@ -264,8 +264,8 @@ uno::Reference< XHelperInterface > getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) throw ( uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW ); - rtl::OUString sCodeName; - xProps->getPropertyValue( rtl::OUString("CodeName") ) >>= sCodeName; + OUString sCodeName; + xProps->getPropertyValue( OUString("CodeName") ) >>= sCodeName; // #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible // to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario there // are *NO* special document module objects ( of course being able to switch between vba/non vba mode at @@ -327,7 +327,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -338,19 +338,19 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& pDoc->SetCodeName( sCodeName ); } - std::vector< rtl::OUString > sDocModuleNames; + std::vector< OUString > sDocModuleNames; sDocModuleNames.push_back( sCodeName ); for ( SCTAB index = 0; index < pDoc->GetTableCount(); index++) { - rtl::OUString aName; + OUString aName; pDoc->GetCodeName( index, aName ); sDocModuleNames.push_back( aName ); } - std::vector::iterator it_end = sDocModuleNames.end(); + std::vector::iterator it_end = sDocModuleNames.end(); - for ( std::vector::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) + for ( std::vector::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) { script::ModuleInfo sModuleInfo; @@ -359,9 +359,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) ); + xLib->replaceByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n") ) ); else - xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) ); + xLib->insertByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n" ) ) ); } } } diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 186c7ffd4afb..12208dde8812 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -79,7 +79,7 @@ template < typename ImplObject > if ( xTunnel.is() ) pObj = reinterpret_cast( xTunnel->getSomething(ImplObject::getUnoTunnelId())); if ( bThrow && !pObj ) - throw css::uno::RuntimeException( rtl::OUString( "Internal error, can't exctract implementation object" ), rxWrapperIf ); + throw css::uno::RuntimeException( OUString( "Internal error, can't exctract implementation object" ), rxWrapperIf ); return pObj; } // ============================================================================ diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx index 8e8729a31ae9..05060b6f6f8a 100644 --- a/sc/source/ui/vba/testvba/testvba.cxx +++ b/sc/source/ui/vba/testvba/testvba.cxx @@ -60,7 +60,6 @@ using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::uno::XInterface; using ::com::sun::star::ucb::XSimpleFileAccess3; using ::com::sun::star::document::XTypeDetection; -using ::rtl::OUString; using ::std::auto_ptr; @@ -68,7 +67,7 @@ const OUString EXTN(".xls"); OUString convertToURL( const OUString& rPath ) { - rtl::OUString aURL; + OUString aURL; INetURLObject aObj; aObj.SetURL( rPath ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; @@ -78,7 +77,7 @@ OUString convertToURL( const OUString& rPath ) { osl::FileBase::getFileURLFromSystemPath( rPath, aURL ); if ( aURL.equals( rPath ) ) - throw uno::RuntimeException( rtl::OUString( "could'nt convert " ).concat( rPath ).concat( rtl::OUString( " to a URL, is it a fully qualified path name? " ) ), Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "could'nt convert " ).concat( rPath ).concat( OUString( " to a URL, is it a fully qualified path name? " ) ), Reference< uno::XInterface >() ); } return aURL; } @@ -108,55 +107,55 @@ private: Reference< XMultiComponentFactory > mxMCF; Reference< XComponentLoader > mxCompLoader; Reference< XSimpleFileAccess3 > mxSFA; - rtl::OUString msOutDirPath; + OUString msOutDirPath; protected: public: TestVBA( const Reference< XComponentContext >& _xContext, const Reference< XMultiComponentFactory >& _xMCF, const Reference< XComponentLoader >& _xCompLoader, - const rtl::OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ), + const OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ), mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) { mxSFA.set( ucb::SimpleFileAccess::create(_xContext) ); } - rtl::OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) + OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) { - rtl::OUString sLogLocation; - Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); - pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation; - sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( rtl::OUString( "HelperAPI-test.log" ) ); + OUString sLogLocation; + Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); + pathSettings->getPropertyValue( OUString( "Work" ) ) >>= sLogLocation; + sLogLocation = sLogLocation.concat( OUString( "/" ) ).concat( OUString( "HelperAPI-test.log" ) ); return sLogLocation; } - rtl::OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) + OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) { printf("%s\n", getenv("HOME") ); - printf("file name %s\n", rtl::OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() ); - rtl::OUString sLogLocation; - Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); - pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation; - sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ) ); + printf("file name %s\n", OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUString sLogLocation; + Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); + pathSettings->getPropertyValue( OUString( "Work" ) ) >>= sLogLocation; + sLogLocation = sLogLocation.concat( OUString( "/" ) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + OUString( ".log" ) ); return sLogLocation; } - void proccessDocument( const rtl::OUString& sUrl ) + void proccessDocument( const OUString& sUrl ) { if ( !mxSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".xls", 4 ) ) { try { - OSL_TRACE( "processing %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); - printf( "processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE( "processing %s", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf( "processing %s\n", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); // Loading the wanted document Sequence< PropertyValue > propertyValues(1); - propertyValues[0].Name = rtl::OUString( "Hidden" ); + propertyValues[0].Name = OUString( "Hidden" ); propertyValues[0].Value <<= false; - rtl::OUString sfileUrl = convertToURL( sUrl ); - printf( "try to get xDoc %s\n", rtl::OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUString sfileUrl = convertToURL( sUrl ); + printf( "try to get xDoc %s\n", OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); Reference< uno::XInterface > xDoc = - mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString( "_blank" ), 0, propertyValues); + mxCompLoader->loadComponentFromURL( sfileUrl, OUString( "_blank" ), 0, propertyValues); printf( "got xDoc\n" ); OUString logFileURL = convertToURL( getLogLocation() ); @@ -173,18 +172,18 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) Reference< script::provider::XScript > xScript; try { - xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document")); + xScript = xProv->getScript( OUString( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document")); } catch ( uno::Exception& e ) { try { - xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" )); + xScript = xProv->getScript( OUString( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" )); } catch ( uno::Exception& e2 ) { - xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" )); + xScript = xProv->getScript( OUString( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" )); } } - OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Got script for doc %s", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); printf("get the Script\n"); Sequence< uno::Any > aArgs; Sequence< sal_Int16 > aOutArgsIndex; @@ -193,27 +192,27 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) xScript->invoke(aArgs, aOutArgsIndex, aOutArgs); OUString fileName = sUrl.copy ( sUrl.lastIndexOf( '/' ) ); - OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ); + OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + OUString( ".log" ); try { printf("move log file\n"); mxSFA->move( logFileURL, newLocation ); - OSL_TRACE("new logfile location is %s ", rtl::OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("new logfile location is %s ", OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); printf("moved to new location\n"); } catch ( uno::Exception& e ) { logFileURL = convertToURL( getLogLocationWithName( fileName ) ); - printf("move log file from %s\n", rtl::OUStringToOString( logFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf("move log file from %s\n", OUStringToOString( logFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); mxSFA->move( logFileURL, newLocation ); - OSL_TRACE("new logfile location is %s ", rtl::OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("new logfile location is %s ", OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); printf("moved to new location\n"); } } catch ( uno::Exception& e ) { - std::cerr << "Caught exception " << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cerr << "Caught exception " << OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; } // interface is supported, otherwise use XComponent.dispose @@ -241,19 +240,19 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) } catch( uno::Exception& e ) { - std::cerr << "Caught exception " << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cerr << "Caught exception " << OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; } } - printf("complete processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf("complete processing %s\n", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); } - void traverse( const rtl::OUString& sFileDirectory ) + void traverse( const OUString& sFileDirectory ) { - rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory ); + OUString sFileDirectoryURL = convertToURL( sFileDirectory ); if ( !mxSFA->isFolder( sFileDirectoryURL) ) { - throw lang::IllegalArgumentException( rtl::OUString( "not a directory: ").concat( sFileDirectoryURL ), Reference(), 1 ); + throw lang::IllegalArgumentException( OUString( "not a directory: ").concat( sFileDirectoryURL ), Reference(), 1 ); } // Getting all files and directories in the current directory Sequence entries = mxSFA->getFolderContents( sFileDirectoryURL, false ); @@ -278,7 +277,7 @@ void tryDispose( Reference< uno::XInterface > xIF, const char* sComp ) } catch( uno::Exception& e ) { - std::cerr << "tryDispose caught exception " <( excel::getDocShell( xModel ) ); } -::rtl::OUString SAL_CALL -ScVbaApplication::getExactName( const ::rtl::OUString& aApproximateName ) throw (uno::RuntimeException) +OUString SAL_CALL +ScVbaApplication::getExactName( const OUString& aApproximateName ) throw (uno::RuntimeException) { uno::Reference< beans::XExactName > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getExactName( aApproximateName ); @@ -168,7 +167,7 @@ ScVbaApplication::getIntrospection() throw(css::uno::RuntimeException) } uno::Any SAL_CALL -ScVbaApplication::invoke( const ::rtl::OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { /* When calling the functions directly at the Application object, no runtime errors are thrown, but the error is inserted into the return value. */ @@ -180,34 +179,34 @@ ScVbaApplication::invoke( const ::rtl::OUString& FunctionName, const uno::Sequen } catch (const uno::Exception&) { - aAny <<= script::BasicErrorException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), 1000, ::rtl::OUString() ); + aAny <<= script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), 1000, OUString() ); } return aAny; } void SAL_CALL -ScVbaApplication::setValue( const ::rtl::OUString& PropertyName, const uno::Any& Value ) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaApplication::setValue( const OUString& PropertyName, const uno::Any& Value ) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); xWSF->setValue( PropertyName, Value ); } uno::Any SAL_CALL -ScVbaApplication::getValue( const ::rtl::OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) +ScVbaApplication::getValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getValue( PropertyName ); } sal_Bool SAL_CALL -ScVbaApplication::hasMethod( const ::rtl::OUString& Name ) throw(uno::RuntimeException) +ScVbaApplication::hasMethod( const OUString& Name ) throw(uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->hasMethod( Name ); } sal_Bool SAL_CALL -ScVbaApplication::hasProperty( const ::rtl::OUString& Name ) throw(uno::RuntimeException) +ScVbaApplication::hasProperty( const OUString& Name ) throw(uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->hasProperty( Name ); @@ -259,12 +258,12 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if (!aSelection.is()) { throw uno::RuntimeException( - rtl::OUString("failed to obtain current selection"), + OUString("failed to obtain current selection"), uno::Reference< uno::XInterface >() ); } uno::Reference< lang::XServiceInfo > xServiceInfo( aSelection, uno::UNO_QUERY_THROW ); - rtl::OUString sImplementationName = xServiceInfo->getImplementationName(); + OUString sImplementationName = xServiceInfo->getImplementationName(); if( sImplementationName.equalsIgnoreAsciiCase("com.sun.star.drawing.SvxShapeCollection") ) { @@ -277,15 +276,15 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if ( ScVbaShape::getType( xShape ) == office::MsoShapeType::msoAutoShape ) { uno::Reference< lang::XServiceInfo > xShapeServiceInfo( xShape, uno::UNO_QUERY_THROW ); - if ( xShapeServiceInfo->supportsService( rtl::OUString( "com.sun.star.drawing.Text" ) ) ) + if ( xShapeServiceInfo->supportsService( OUString( "com.sun.star.drawing.Text" ) ) ) { return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, xModel ) ) ); } } return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape ) ) ) ); } - else if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRange") ) || - xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRanges") ) ) + else if( xServiceInfo->supportsService( OUString("com.sun.star.sheet.SheetCellRange") ) || + xServiceInfo->supportsService( OUString("com.sun.star.sheet.SheetCellRanges") ) ) { uno::Reference< table::XCellRange > xRange( aSelection, ::uno::UNO_QUERY); if ( !xRange.is() ) @@ -299,7 +298,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) } else { - throw uno::RuntimeException( sImplementationName + rtl::OUString( + throw uno::RuntimeException( sImplementationName + OUString( " not supported"), uno::Reference< uno::XInterface >() ); } } @@ -311,10 +310,10 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException ) uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW); ScTabViewShell* pViewShell = excel::getCurrentBestViewShell(mxContext); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString("No ViewShell available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No ViewShell available"), uno::Reference< uno::XInterface >() ); ScViewData* pTabView = pViewShell->GetViewData(); if ( !pTabView ) - throw uno::RuntimeException( rtl::OUString("No ViewData available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No ViewData available"), uno::Reference< uno::XInterface >() ); sal_Int32 nCursorX = pTabView->GetCurX(); sal_Int32 nCursorY = pTabView->GetCurY(); @@ -350,7 +349,7 @@ ScVbaApplication::WorksheetFunction( ) throw (::com::sun::star::uno::RuntimeExce } uno::Any SAL_CALL -ScVbaApplication::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +ScVbaApplication::Evaluate( const OUString& Name ) throw (uno::RuntimeException) { // #TODO Evaluate allows other things to be evaluated, e.g. functions // I think ( like SIN(3) etc. ) need to investigate that @@ -402,7 +401,7 @@ ScVbaApplication::getStatusBar() throw (uno::RuntimeException) void SAL_CALL ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::RuntimeException) { - rtl::OUString sText; + OUString sText; sal_Bool bDefault = false; uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< task::XStatusIndicatorSupplier > xStatusIndicatorSupplier( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -424,7 +423,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime } } else - throw uno::RuntimeException( rtl::OUString( "Invalid prarameter. It should be a string or False" ), + throw uno::RuntimeException( OUString( "Invalid prarameter. It should be a string or False" ), uno::Reference< uno::XInterface >() ); } @@ -472,7 +471,7 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException) SbxVariableRef aRef = new SbxVariable; aRef->PutDouble( time ); aArgs->Put( aRef, 1 ); - SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("WaitUntil"), SbxCLASS_METHOD ); + SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( OUString("WaitUntil"), SbxCLASS_METHOD ); if ( pMeth ) { @@ -496,7 +495,7 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( - rtl::OUString( "NamedRanges" ) ), uno::UNO_QUERY_THROW ); + OUString( "NamedRanges" ) ), uno::UNO_QUERY_THROW ); css::uno::Reference< excel::XNames > xNames ( new ScVbaNames( this , mxContext , xNamedRanges , xModel ) ); if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) @@ -525,7 +524,7 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException) if ( !result.is() ) { // Fixme - check if this is reasonable/desired behavior - throw uno::RuntimeException( rtl::OUString( "No activeSheet available" ), + throw uno::RuntimeException( OUString( "No activeSheet available" ), uno::Reference< uno::XInterface >() ); } return result; @@ -557,11 +556,11 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro bScroll = aScroll; } else - throw uno::RuntimeException( rtl::OUString( "second parameter should be boolean" ), + throw uno::RuntimeException( OUString( "second parameter should be boolean" ), uno::Reference< uno::XInterface >() ); } - rtl::OUString sRangeName; + OUString sRangeName; if( Reference >>= sRangeName ) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); @@ -603,7 +602,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro //and the createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) to get a root browse::XBrowseNode. //for query XInvocation interface. //but how to directly get the XInvocation? - throw uno::RuntimeException( rtl::OUString( "invalid reference for range name, it should be procedure name" ), + throw uno::RuntimeException( OUString( "invalid reference for range name, it should be procedure name" ), uno::Reference< uno::XInterface >() ); } return; @@ -638,7 +637,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro } return; } - throw uno::RuntimeException( rtl::OUString( "invalid reference or name" ), + throw uno::RuntimeException( OUString( "invalid reference or name" ), uno::Reference< uno::XInterface >() ); } @@ -691,7 +690,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) break; } default: - throw uno::RuntimeException( rtl::OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); // TODO: isn't this a flaw in the API? It should be allowed to throw an // IllegalArgumentException, or so } @@ -704,10 +703,10 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) // #TODO perhaps we should switch the return type depending of the filter // type, e.g. return Calc for Calc and Excel if its an imported doc -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getName() throw (uno::RuntimeException) { - static rtl::OUString appName("Microsoft Excel" ); + static OUString appName("Microsoft Excel" ); return appName; } @@ -756,7 +755,7 @@ ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) throw (uno::RuntimeExce // #FIXME calling ScViewUtil::SetFullScreen( *pShell, bSet ); // directly results in a strange crash, using dispatch instead if ( bSet != getDisplayFullScreen() ) - dispatchRequests( getCurrentDocument(), rtl::OUString(".uno:FullScreen") ); + dispatchRequests( getCurrentDocument(), OUString(".uno:FullScreen") ); } sal_Bool SAL_CALL @@ -776,8 +775,8 @@ ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeExce // use uno here as it does all he repainting etc. magic uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xView, uno::UNO_QUERY ); - xProps->setPropertyValue( rtl::OUString("HasVerticalScrollBar"), uno::makeAny( bSet ) ); - xProps->setPropertyValue( rtl::OUString("HasHorizontalScrollBar"), uno::makeAny( bSet ) ); + xProps->setPropertyValue( OUString("HasVerticalScrollBar"), uno::makeAny( bSet ) ); + xProps->setPropertyValue( OUString("HasHorizontalScrollBar"), uno::makeAny( bSet ) ); } sal_Bool SAL_CALL @@ -830,17 +829,17 @@ static uno::Reference< beans::XPropertySet > lcl_getPathSettingsService( const u if ( !xPathSettings.is() ) { uno::Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager(), uno::UNO_QUERY_THROW ); - xPathSettings.set( xSMgr->createInstanceWithContext( rtl::OUString("com.sun.star.util.PathSettings"), xContext ), uno::UNO_QUERY_THROW ); + xPathSettings.set( xSMgr->createInstanceWithContext( OUString("com.sun.star.util.PathSettings"), xContext ), uno::UNO_QUERY_THROW ); } return xPathSettings; } -rtl::OUString ScVbaApplication::getOfficePath( const rtl::OUString& _sPathType ) throw ( uno::RuntimeException ) +OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw ( uno::RuntimeException ) { - rtl::OUString sRetPath; + OUString sRetPath; uno::Reference< beans::XPropertySet > xProps = lcl_getPathSettingsService( mxContext ); try { - rtl::OUString sUrl; + OUString sUrl; xProps->getPropertyValue( _sPathType ) >>= sUrl; // if its a list of paths then use the last one @@ -851,42 +850,42 @@ rtl::OUString ScVbaApplication::getOfficePath( const rtl::OUString& _sPathType ) } catch (const uno::Exception&) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return sRetPath; } void SAL_CALL -ScVbaApplication::setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) throw (uno::RuntimeException) +ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getPathSettingsService( mxContext ); - rtl::OUString aURL; + OUString aURL; osl::FileBase::getFileURLFromSystemPath( DefaultFilePath, aURL ); - xProps->setPropertyValue( rtl::OUString("Work"), uno::Any( aURL ) ); + xProps->setPropertyValue( OUString("Work"), uno::Any( aURL ) ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getDefaultFilePath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString("Work")); + return getOfficePath( OUString("Work")); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getLibraryPath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString("Basic")); + return getOfficePath( OUString("Basic")); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString("Template")); + return getOfficePath( OUString("Template")); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getPathSeparator() throw (uno::RuntimeException) { - static rtl::OUString sPathSep( RTL_CONSTASCII_USTRINGPARAM( FILE_PATH_SEPERATOR ) ); + static OUString sPathSep( RTL_CONSTASCII_USTRINGPARAM( FILE_PATH_SEPERATOR ) ); return sPathSep; } @@ -1080,7 +1079,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect( throw (script::BasicErrorException, uno::RuntimeException) { if( !rArg1.is() || !rArg2.is() ) - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); // initialize the result list with 1st parameter, join its ranges together ListOfScRange aList; @@ -1134,7 +1133,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union( throw (script::BasicErrorException, uno::RuntimeException) { if( !rArg1.is() || !rArg2.is() ) - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); ListOfScRange aList; lclAddToListOfScRange( aList, uno::Any( rArg1 ) ); @@ -1183,7 +1182,7 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile ) throw ( uno::RuntimeExc SbMethod* pMeth = StarBASIC::GetActiveMethod(); if ( pMeth ) { - OSL_TRACE("ScVbaApplication::Volatile() In method ->%s<-", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("ScVbaApplication::Volatile() In method ->%s<-", OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() ); uno::Reference< frame::XModel > xModel( getCurrentDocument() ); ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument(); pDoc->GetMacroManager()->SetUserFuncVolatile( pMeth->GetName(), bVolatile); @@ -1229,14 +1228,14 @@ uno::Any SAL_CALL ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException ) { StarBASIC* pBasic = SFX_APP()->GetBasic(); - SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("FuncCaller"), SbxCLASS_METHOD ); + SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( OUString("FuncCaller"), SbxCLASS_METHOD ); uno::Any aRet; if ( pMeth ) { SbxVariableRef refTemp = pMeth; // forces a broadcast SbxVariableRef pNew = new SbxMethod( *((SbxMethod*)pMeth)); - OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), rtl::OUStringToOString( pNew->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), OUStringToOString( pNew->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); aRet = sbxToUnoValue( pNew ); } return aRet; @@ -1255,7 +1254,7 @@ uno::Any SAL_CALL ScVbaApplication::GetOpenFilename( aArgs[ 5 ] = rMultiSelect; uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); + OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); return xFilePicker->execute(); } @@ -1272,7 +1271,7 @@ uno::Any SAL_CALL ScVbaApplication::GetSaveAsFilename( aArgs[ 5 ] = rButtonText; uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); + OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); return xFilePicker->execute(); } @@ -1295,7 +1294,7 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return uno::Any( xMenuBars ); } -void SAL_CALL ScVbaApplication::OnKey( const ::rtl::OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException) +void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException) { try { @@ -1310,20 +1309,20 @@ void SAL_CALL ScVbaApplication::OnKey( const ::rtl::OUString& Key, const uno::An } } -rtl::OUString +OUString ScVbaApplication::getServiceImplName() { - return rtl::OUString("ScVbaApplication"); + return OUString("ScVbaApplication"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaApplication::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Application" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Application" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 754117845722..1991714fb77a 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -38,7 +38,7 @@ private: // note: member variables moved to struct "ScVbaAppSettings", see cxx file, to be shared by all application instances ScVbaAppSettings& mrAppSettings; - rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException ); + OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException ); protected: virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException); @@ -53,24 +53,24 @@ public: virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XExactName - virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException); // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke(const rtl::OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue(const rtl::OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue(const rtl::OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasMethod(const rtl::OUString& Name) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasProperty(const rtl::OUString& Name) throw(css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException); // XApplication - virtual void SAL_CALL setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException); + virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getDisplayAlerts() throw (css::uno::RuntimeException); virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCalculation() throw (css::uno::RuntimeException); @@ -88,7 +88,7 @@ public: virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException); virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException); @@ -96,7 +96,7 @@ public: virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException); virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) throw (css::uno::RuntimeException); - virtual void SAL_CALL OnKey( const ::rtl::OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException); + virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException); virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException); @@ -125,8 +125,8 @@ public: virtual css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText, const css::uno::Any& rMultiSelect ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL GetSaveAsFilename( const css::uno::Any& rInitialFileName, const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SC_VBA_APPLICATION_HXX */ diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 0d3ed7eb84bf..18ccafd8d979 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -98,26 +98,26 @@ ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeE m_nAnimation = _animation; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return m_sName; } -rtl::OUString +OUString ScVbaAssistant::getServiceImplName() { - return rtl::OUString("ScVbaAssistant"); + return OUString("ScVbaAssistant"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAssistant::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.Assistant" ); + aServiceNames[ 0 ] = OUString("ooo.vba.Assistant" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index bc0a9aca63a5..20c75c7cd343 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.hxx @@ -36,7 +36,7 @@ private: sal_Bool m_bIsVisible; sal_Int32 m_nPointsLeft; sal_Int32 m_nPointsTop; - rtl::OUString m_sName; + OUString m_sName; sal_Int32 m_nAnimation; public: ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext ); @@ -53,10 +53,10 @@ public: virtual ::sal_Int32 SAL_CALL getAnimation() throw (css::uno::RuntimeException); virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif//SC_VBA_ASSISTANT_HXX diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 3174bd2ed093..4e59d1b3dce7 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -64,17 +64,17 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno: { ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) - throw uno::RuntimeException( rtl::OUString( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() ); uno::Reference< beans::XPropertySet > xAxisPropertySet; if (((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue))) { if ((nAxisGroup != xlPrimary) && (nAxisGroup != xlSecondary)) - throw script::BasicErrorException( rtl::OUString(), NULL, SbERR_METHOD_FAILED, rtl::OUString()); + throw script::BasicErrorException( OUString(), NULL, SbERR_METHOD_FAILED, OUString()); xAxisPropertySet.set( pChart->getAxisPropertySet(nType, nAxisGroup), uno::UNO_QUERY_THROW ); } else - throw script::BasicErrorException( rtl::OUString(), NULL, SbERR_METHOD_FAILED, rtl::OUString()); + throw script::BasicErrorException( OUString(), NULL, SbERR_METHOD_FAILED, OUString()); uno::Reference< XHelperInterface > xParent( xChart, uno::UNO_QUERY_THROW ); return new ScVbaAxis( xParent, xContext, xAxisPropertySet, nType, nAxisGroup); } @@ -96,18 +96,18 @@ public: // primary sal_Bool bBool = false; uno::Reference< beans::XPropertySet > xDiagramPropertySet( pChart->xDiagramPropertySet() ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasXAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasXAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasYAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasYAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlSeriesAxis ) ); if ( pChart->is3D() ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlValue ) ); // secondary - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryXAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasSecondaryXAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryYAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasSecondaryYAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlSeriesAxis ) ); } @@ -160,7 +160,7 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) sal_Int32 nAxisGroup = xlPrimary; sal_Int32 nType = -1; if ( !_nType.hasValue() || ( ( _nType >>= nType ) == false ) ) - throw uno::RuntimeException( rtl::OUString( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >() ); if ( _oAxisGroup.hasValue() ) _oAxisGroup >>= nAxisGroup ; @@ -174,20 +174,20 @@ ScVbaAxes::createCollectionObject(const css::uno::Any& aSource) return aSource; // pass through ( it's already an XAxis object } -rtl::OUString +OUString ScVbaAxes::getServiceImplName() { - return rtl::OUString("ScVbaAxes"); + return OUString("ScVbaAxes"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAxes::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axes" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Axes" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx index 9420815efc92..b8a0bc1f68bc 100644 --- a/sc/source/ui/vba/vbaaxes.hxx +++ b/sc/source/ui/vba/vbaaxes.hxx @@ -35,8 +35,8 @@ public: css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException ); }; diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 52f152ffd008..f52eec90a38b 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -29,16 +29,16 @@ using namespace ::ooo::vba::excel::XlAxisCrosses; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlScaleType; -const rtl::OUString ORIGIN("Origin"); -const rtl::OUString AUTOORIGIN("AutoOrigin"); -const rtl::OUString VBA_MIN("Max"); -const rtl::OUString VBA_MAX("Min"); +const OUString ORIGIN("Origin"); +const OUString AUTOORIGIN("AutoOrigin"); +const OUString VBA_MIN("Max"); +const OUString VBA_MAX("Min"); ScVbaChart* ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() ); if ( !pChart ) - throw uno::RuntimeException( rtl::OUString("Can't access parent chart impl"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Can't access parent chart impl"), uno::Reference< uno::XInterface >() ); return pChart; } @@ -47,7 +47,7 @@ ScVbaAxis::isValueAxis() throw( script::BasicErrorException ) { if ( getType() == xlCategory ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return sal_True; } @@ -103,13 +103,13 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce void SAL_CALL ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } ::sal_Int32 SAL_CALL ScVbaAxis::getDisplayUnit( ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); return -1; } @@ -143,7 +143,7 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } ::sal_Int32 SAL_CALL @@ -175,7 +175,7 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return nCrosses; } @@ -205,7 +205,7 @@ ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeExce } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return fCrosses; } @@ -232,13 +232,13 @@ ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorExcepti switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasXAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasXAxisTitle"), uno::makeAny(_bHasTitle)); break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasZAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasZAxisTitle"), uno::makeAny(_bHasTitle)); break; default: // xlValue: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasYAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasYAxisTitle"), uno::makeAny(_bHasTitle)); } } @@ -259,13 +259,13 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasXAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasXAxisTitle") ) >>= bHasTitle; break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasZAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasZAxisTitle") ) >>= bHasTitle; break; default: // xlValue: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasYAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasYAxisTitle") ) >>= bHasTitle; } } catch (const uno::Exception& e) @@ -281,11 +281,11 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString("StepHelp"), uno::makeAny(_fMinorUnit)); + mxPropertySet->setPropertyValue( OUString("StepHelp"), uno::makeAny(_fMinorUnit)); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -296,11 +296,11 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString("StepHelp")) >>= fMinor; + mxPropertySet->getPropertyValue( OUString("StepHelp")) >>= fMinor; } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return fMinor; } @@ -311,11 +311,11 @@ ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::Bas try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepHelp" ), uno::makeAny(_bMinorUnitIsAuto)); + mxPropertySet->setPropertyValue( OUString( "AutoStepHelp" ), uno::makeAny(_bMinorUnitIsAuto)); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -327,12 +327,12 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepHelp") ) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString( "AutoStepHelp") ) >>= bIsAuto; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bIsAuto; } @@ -340,13 +340,13 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti void SAL_CALL ScVbaAxis::setReversePlotOrder( ::sal_Bool /*ReversePlotOrder*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } ::sal_Bool SAL_CALL ScVbaAxis::getReversePlotOrder( ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); return false; } @@ -357,12 +357,12 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString("StepMain"), uno::makeAny(_fMajorUnit)); + mxPropertySet->setPropertyValue( OUString("StepMain"), uno::makeAny(_fMajorUnit)); } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -373,11 +373,11 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString("StepMain")) >>= fMax; + mxPropertySet->getPropertyValue( OUString("StepMain")) >>= fMax; } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return fMax; } @@ -389,12 +389,12 @@ ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::Bas { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepMain" ), uno::makeAny( _bMajorUnitIsAuto )); + mxPropertySet->setPropertyValue( OUString( "AutoStepMain" ), uno::makeAny( _bMajorUnitIsAuto )); } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -406,12 +406,12 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepMain")) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString( "AutoStepMain")) >>= bIsAuto; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bIsAuto; } @@ -423,12 +423,12 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc { if ( isValueAxis() ) { - mxPropertySet->setPropertyValue( rtl::OUString( "Max" ), uno::makeAny(_fMaximumScale)); + mxPropertySet->setPropertyValue( OUString( "Max" ), uno::makeAny(_fMaximumScale)); } } catch ( uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -440,12 +440,12 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( "Max" )) >>= fMax; + mxPropertySet->getPropertyValue( OUString( "Max" )) >>= fMax; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return fMax; @@ -457,12 +457,12 @@ ScVbaAxis::setMaximumScaleIsAuto( ::sal_Bool _bMaximumScaleIsAuto ) throw (scrip try { if ( isValueAxis() ) - mxPropertySet->setPropertyValue( rtl::OUString( "AutoMax" ), uno::makeAny( _bMaximumScaleIsAuto )); + mxPropertySet->setPropertyValue( OUString( "AutoMax" ), uno::makeAny( _bMaximumScaleIsAuto )); } catch ( uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -474,11 +474,11 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( "AutoMax" ) ) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString( "AutoMax" ) ) >>= bIsAuto; } catch ( uno::Exception& ) { - DebugHelper::exception( SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception( SbERR_METHOD_FAILED, OUString() ); } return bIsAuto; } @@ -489,11 +489,11 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString("Min"), uno::makeAny( _fMinimumScale ) ); + mxPropertySet->setPropertyValue( OUString("Min"), uno::makeAny( _fMinimumScale ) ); } catch ( uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -504,7 +504,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( "Min")) >>= fMin; + mxPropertySet->getPropertyValue( OUString( "Min")) >>= fMin; } catch (const uno::Exception& e) { @@ -520,12 +520,12 @@ ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (scrip { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString("AutoMin"), uno::makeAny(_bMinimumScaleIsAuto)); + mxPropertySet->setPropertyValue( OUString("AutoMin"), uno::makeAny(_bMinimumScaleIsAuto)); } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -537,12 +537,12 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString("AutoMin") ) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString("AutoMin") ) >>= bIsAuto; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bIsAuto; } @@ -563,10 +563,10 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce switch (_nScaleType) { case xlScaleLinear: - mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_False ) ); + mxPropertySet->setPropertyValue( OUString( "Logarithmic" ), uno::makeAny( sal_False ) ); break; case xlScaleLogarithmic: - mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_True ) ); + mxPropertySet->setPropertyValue( OUString( "Logarithmic" ), uno::makeAny( sal_True ) ); break; default: // According to MS the paramenter is ignored and no Error is thrown @@ -576,7 +576,7 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -589,7 +589,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce if (isValueAxis()) { sal_Bool bisLogarithmic = false; - mxPropertySet->getPropertyValue( rtl::OUString( rtl::OUString("Logarithmic")) ) >>= bisLogarithmic; + mxPropertySet->getPropertyValue( OUString( OUString("Logarithmic")) ) >>= bisLogarithmic; if (bisLogarithmic) nScaleType = xlScaleLogarithmic; else @@ -598,7 +598,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return nScaleType; } @@ -638,20 +638,20 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx oShapeHelper->setLeft( left ); } -rtl::OUString +OUString ScVbaAxis::getServiceImplName() { - return rtl::OUString("ScVbaAxis"); + return OUString("ScVbaAxis"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAxis::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axis" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Axis" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index fde704028d5f..028d82cd6270 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -84,8 +84,8 @@ public: virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SC_VBA_AXIS_HXX diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx index 986d1a3766e7..9c1993c62131 100644 --- a/sc/source/ui/vba/vbaaxistitle.cxx +++ b/sc/source/ui/vba/vbaaxistitle.cxx @@ -25,21 +25,21 @@ ScVbaAxisTitle::ScVbaAxisTitle( const uno::Reference< XHelperInterface >& xParen { } -rtl::OUString +OUString ScVbaAxisTitle::getServiceImplName() { - return rtl::OUString("ScVbaAxisTitle"); + return OUString("ScVbaAxisTitle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAxisTitle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { - uno::Sequence< rtl::OUString > BaseServiceNames = AxisTitleBase::getServiceNames(); + uno::Sequence< OUString > BaseServiceNames = AxisTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.AxisTitle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.AxisTitle" ); for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx index 0a9b09ff754d..b0cbd9e92e95 100644 --- a/sc/source/ui/vba/vbaaxistitle.hxx +++ b/sc/source/ui/vba/vbaaxistitle.hxx @@ -30,8 +30,8 @@ class ScVbaAxisTitle : public AxisTitleBase public: ScVbaAxisTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index a184897d9ef0..38ee47e8c919 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -42,7 +42,7 @@ typedef InheritedHelperInterfaceImpl1 ScVbaBorder_Base; // borders, the enumeration will match the order in this list static const sal_Int16 supportedIndexTable[] = { XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal }; -const static rtl::OUString sTableBorder("TableBorder"); +const static OUString sTableBorder("TableBorder"); // Equiv widths in in 1/100 mm const static sal_Int32 OOLineThin = 35; @@ -144,17 +144,17 @@ private: } ScVbaBorder(); // no impl protected: - virtual rtl::OUString getServiceImplName() + virtual OUString getServiceImplName() { - return rtl::OUString("ScVbaBorder"); + return OUString("ScVbaBorder"); } - virtual css::uno::Sequence getServiceNames() + virtual css::uno::Sequence getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Border" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Border" ); } return aServiceNames; } @@ -167,7 +167,7 @@ public: table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); - throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException) { @@ -180,7 +180,7 @@ public: setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException) @@ -231,7 +231,7 @@ public: break; } } - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException) { @@ -255,12 +255,12 @@ public: aBorderLine.OuterLineWidth = OOLineHairline; break; default: - throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException) @@ -289,12 +289,12 @@ public: case XlLineStyle::xlSlantDashDot: break; default: - throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } }; @@ -546,20 +546,20 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run } -rtl::OUString +OUString ScVbaBorders::getServiceImplName() { - return rtl::OUString("ScVbaBorders"); + return OUString("ScVbaBorders"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaBorders::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Borders" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Borders" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index cda900232898..a7a5eba2ca2d 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -60,8 +60,8 @@ public: virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException); virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException); // xxxxBASE - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SC_VBA_BORDERS_HXX diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index ae4f367c3a31..496c8d6d2cec 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -49,13 +49,13 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaCharacters::getCaption() throw (css::uno::RuntimeException) { return m_xTextRange->getString(); } void SAL_CALL -ScVbaCharacters::setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException) +ScVbaCharacters::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException) { m_xTextRange->setString( _caption ); @@ -67,13 +67,13 @@ ScVbaCharacters::getCount() throw (css::uno::RuntimeException) return getCaption().getLength(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaCharacters::getText() throw (css::uno::RuntimeException) { return getCaption(); } void SAL_CALL -ScVbaCharacters::setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException) +ScVbaCharacters::setText( const OUString& _text ) throw (css::uno::RuntimeException) { setCaption( _text ); } @@ -87,13 +87,13 @@ void SAL_CALL ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException) { // #TODO #FIXME needs implementation, or can't be done? - throw uno::RuntimeException( ::rtl::OUString( "Not Implemented"), uno::Reference< XInterface >() ); + throw uno::RuntimeException( OUString( "Not Implemented"), uno::Reference< XInterface >() ); } // Methods void SAL_CALL -ScVbaCharacters::Insert( const ::rtl::OUString& String ) throw (css::uno::RuntimeException) +ScVbaCharacters::Insert( const OUString& String ) throw (css::uno::RuntimeException) { m_xSimpleText->insertString( m_xTextRange, String, bReplace ); } @@ -103,24 +103,24 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException) { // #FIXME #TODO is this a bit suspect?, I wonder should the contents // of the cell be deleted from the parent ( range ) - m_xSimpleText->setString(rtl::OUString()); + m_xSimpleText->setString(OUString()); } -rtl::OUString +OUString ScVbaCharacters::getServiceImplName() { - return rtl::OUString("ScVbaCharacters"); + return OUString("ScVbaCharacters"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaCharacters::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Characters" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Characters" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 57ed5fd4f658..4e3121d3878c 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -44,22 +44,22 @@ public: virtual ~ScVbaCharacters() {} // Attributes - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) throw (css::uno::RuntimeException); // Methods - virtual void SAL_CALL Insert( const ::rtl::OUString& String ) throw (css::uno::RuntimeException); + virtual void SAL_CALL Insert( const OUString& String ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 760095a49bae..449b9d744ad1 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -47,23 +47,23 @@ using namespace ::ooo::vba::excel::XlRowCol; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlAxisGroup; -const rtl::OUString CHART_NAME("Name"); +const OUString CHART_NAME("Name"); // #TODO move this constant to vbaseries.[ch]xx ( when it exists ) -const rtl::OUString DEFAULTSERIESPREFIX("Series"); -const rtl::OUString DATAROWSOURCE("DataRowSource"); -const rtl::OUString UPDOWN("UpDown"); -const rtl::OUString VOLUME("Volume"); -const rtl::OUString LINES("Lines"); -const rtl::OUString SPLINETYPE("SplineType"); -const rtl::OUString SYMBOLTYPE("SymbolType"); -const rtl::OUString DEEP("Deep"); -const rtl::OUString SOLIDTYPE("SolidType"); -const rtl::OUString VERTICAL("Vertical"); -const rtl::OUString PERCENT("Percent"); -const rtl::OUString STACKED("Stacked"); -const rtl::OUString DIM3D("Dim3D"); -const rtl::OUString HASMAINTITLE("HasMainTitle"); -const rtl::OUString HASLEGEND("HasLegend"); +const OUString DEFAULTSERIESPREFIX("Series"); +const OUString DATAROWSOURCE("DataRowSource"); +const OUString UPDOWN("UpDown"); +const OUString VOLUME("Volume"); +const OUString LINES("Lines"); +const OUString SPLINETYPE("SplineType"); +const OUString SYMBOLTYPE("SymbolType"); +const OUString DEEP("Deep"); +const OUString SOLIDTYPE("SolidType"); +const OUString VERTICAL("Vertical"); +const OUString PERCENT("Percent"); +const OUString STACKED("Stacked"); +const OUString DIM3D("Dim3D"); +const OUString HASMAINTITLE("HasMainTitle"); +const OUString HASLEGEND("HasLegend"); ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const css::uno::Reference< css::table::XTableChart >& _xTableChart ) : ChartImpl_BASE( _xParent, _xContext ), mxTableChart( _xTableChart ) { @@ -77,10 +77,10 @@ ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xPar mxChartPropertySet.set( _xChartComponent, uno::UNO_QUERY_THROW ) ; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaChart::getName() throw (css::uno::RuntimeException) { - rtl::OUString sName; + OUString sName; uno::Reference< beans::XPropertySet > xProps( mxChartDocument, uno::UNO_QUERY_THROW ); try { @@ -104,7 +104,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce sal_Int32 nChartType = -1; try { - rtl::OUString sDiagramType = mxChartDocument->getDiagram()->getDiagramType(); + OUString sDiagramType = mxChartDocument->getDiagram()->getDiagramType(); if ( sDiagramType == "com.sun.star.chart.AreaDiagram" ) { if (is3D()) @@ -212,7 +212,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce } catch ( const uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return nChartType; } @@ -262,7 +262,7 @@ try case xlSurfaceWireframe: case xlSurfaceTopView: case xlSurfaceTopViewWireframe: - setDiagram( rtl::OUString("com.sun.star.chart.BarDiagram")); + setDiagram( OUString("com.sun.star.chart.BarDiagram")); break; case xlLine: case xl3DLine: @@ -271,7 +271,7 @@ try case xlLineMarkers: case xlLineMarkersStacked: case xlLineMarkersStacked100: - setDiagram( rtl::OUString("com.sun.star.chart.LineDiagram")); + setDiagram( OUString("com.sun.star.chart.LineDiagram")); break; case xl3DArea: case xlArea: @@ -279,17 +279,17 @@ try case xlAreaStacked100: case xl3DAreaStacked: case xl3DAreaStacked100: - setDiagram( rtl::OUString("com.sun.star.chart.AreaDiagram") ); + setDiagram( OUString("com.sun.star.chart.AreaDiagram") ); break; case xlDoughnut: case xlDoughnutExploded: - setDiagram( rtl::OUString("com.sun.star.chart.DonutDiagram") ); + setDiagram( OUString("com.sun.star.chart.DonutDiagram") ); break; case xlStockHLC: case xlStockOHLC: case xlStockVHLC: case xlStockVOHLC: - setDiagram( rtl::OUString("com.sun.star.chart.StockDiagram")); + setDiagram( OUString("com.sun.star.chart.StockDiagram")); mxDiagramPropertySet->setPropertyValue( UPDOWN, uno::makeAny(sal_Bool((_nChartType == xlStockOHLC) || (_nChartType == xlStockVOHLC)))); mxDiagramPropertySet->setPropertyValue(VOLUME, uno::makeAny(sal_Bool((_nChartType == xlStockVHLC) || (_nChartType == xlStockVOHLC)))); break; @@ -300,13 +300,13 @@ try case xl3DPie: case xlPie: case xlBarOfPie: // not possible (Zoom pie) - setDiagram( rtl::OUString("com.sun.star.chart.PieDiagram")); + setDiagram( OUString("com.sun.star.chart.PieDiagram")); break; case xlRadar: case xlRadarMarkers: case xlRadarFilled: - setDiagram( rtl::OUString("com.sun.star.chart.NetDiagram")); + setDiagram( OUString("com.sun.star.chart.NetDiagram")); break; case xlXYScatter: case xlBubble: // not possible @@ -315,7 +315,7 @@ try case xlXYScatterLinesNoMarkers: case xlXYScatterSmooth: case xlXYScatterSmoothNoMarkers: - setDiagram( rtl::OUString("com.sun.star.chart.XYDiagram")); + setDiagram( OUString("com.sun.star.chart.XYDiagram")); switch(_nChartType) { case xlXYScatter: @@ -336,7 +336,7 @@ try } break; default: - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_CONVERSION, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_CONVERSION, OUString() ); } switch (_nChartType) @@ -539,7 +539,7 @@ try } catch ( const uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -555,7 +555,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException if ( pChartObj ) pChartObj->Activate(); else - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "no ChartObject as parent" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString( "no ChartObject as parent" ) ); } void SAL_CALL @@ -622,18 +622,18 @@ ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChart::getDefaultSeriesDescriptions( sal_Int32 _nCount ) { - uno::Sequence< rtl::OUString > sDescriptions ( _nCount ); + uno::Sequence< OUString > sDescriptions ( _nCount ); sal_Int32 nLen = sDescriptions.getLength(); for (sal_Int32 i = 0; i < nLen; i++) { - sDescriptions[i] = DEFAULTSERIESPREFIX + rtl::OUString::valueOf(i+1); + sDescriptions[i] = DEFAULTSERIESPREFIX + OUString::valueOf(i+1); } return sDescriptions; } @@ -660,12 +660,12 @@ ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorExce mxDiagramPropertySet->setPropertyValue( DATAROWSOURCE, uno::makeAny( chart::ChartDataRowSource_COLUMNS) ); break; default: - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -687,12 +687,12 @@ ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeExcept } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } void -ScVbaChart::setDiagram( const rtl::OUString& _sDiagramType ) throw( script::BasicErrorException ) +ScVbaChart::setDiagram( const OUString& _sDiagramType ) throw( script::BasicErrorException ) { try { @@ -703,7 +703,7 @@ ScVbaChart::setDiagram( const rtl::OUString& _sDiagramType ) throw( script::Basi } catch ( const uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -819,7 +819,7 @@ ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExce } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return bHasTitle; } @@ -833,7 +833,7 @@ ScVbaChart::setHasTitle( ::sal_Bool bTitle ) throw (script::BasicErrorException, } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -848,7 +848,7 @@ ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeExc } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return bHasLegend; } @@ -862,7 +862,7 @@ ScVbaChart::setHasLegend( ::sal_Bool bLegend ) throw (script::BasicErrorExceptio } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -953,7 +953,7 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _ } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -976,8 +976,8 @@ ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw } catch (const uno::Exception&) { - rtl::OUString aTemp; // temporary needed for g++ 3.3.5 - script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + OUString aTemp; // temporary needed for g++ 3.3.5 + script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return _nNotUpDown; } @@ -994,8 +994,8 @@ ScVbaChart::hasMarkers() throw ( script::BasicErrorException ) } catch (const uno::Exception&) { - rtl::OUString aTemp; // temporary needed for g++ 3.3.5 - script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + OUString aTemp; // temporary needed for g++ 3.3.5 + script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return bHasMarkers; } @@ -1052,20 +1052,20 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro } -rtl::OUString +OUString ScVbaChart::getServiceImplName() { - return rtl::OUString("ScVbaChart"); + return OUString("ScVbaChart"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChart::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Chart" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index bef1cb23cd3d..e2282e84a626 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -48,10 +48,10 @@ friend class ScVbaAxis; css::uno::Reference< css::chart::XTwoAxisXSupplier > xTwoAxisXSupplier; css::uno::Reference< css::chart::XTwoAxisYSupplier > xTwoAxisYSupplier; - css::uno::Sequence< rtl::OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); + css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); css::uno::Sequence< css::uno::Sequence< double > > dblValues; void setDefaultChartType()throw ( css::script::BasicErrorException ) ; - void setDiagram( const rtl::OUString& _sDiagramType) throw( css::script::BasicErrorException ); + void setDiagram( const OUString& _sDiagramType) throw( css::script::BasicErrorException ); bool isStacked() throw ( css::uno::RuntimeException ); bool is100PercentStacked() throw ( css::uno::RuntimeException ); sal_Int32 getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( css::uno::RuntimeException ); @@ -68,7 +68,7 @@ public: bool is3D() throw ( css::uno::RuntimeException ); css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException ); // Methods - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException); virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException); @@ -86,8 +86,8 @@ public: virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 42cf8f1758f2..f08764f439f3 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -const rtl::OUString PERSIST_NAME("PersistName"); +const OUString PERSIST_NAME("PersistName"); ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjectImpl_BASE( _xParent, _xContext ), xTableChart( _xTableChart ), xDrawPageSupplier( _xDrawPageSupplier ) { @@ -41,7 +41,7 @@ ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterf oShapeHelper.reset(new ShapeHelper(xShape)); } -rtl::OUString ScVbaChartObject::getPersistName() +OUString ScVbaChartObject::getPersistName() { if ( sPersistName.isEmpty() ) sPersistName = xNamed->getName(); @@ -60,7 +60,7 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException ) if (xShape->getShapeType().compareToAscii("com.sun.star.drawing.OLE2Shape") == 0 ) { uno::Reference< beans::XPropertySet > xShapePropertySet(xShape, uno::UNO_QUERY_THROW ); - rtl::OUString sName; + OUString sName; xShapePropertySet->getPropertyValue(PERSIST_NAME ) >>=sName; if ( sName.equals(sPersistName)) { @@ -72,19 +72,19 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException ) } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return NULL; } void SAL_CALL -ScVbaChartObject::setName( const rtl::OUString& sName ) throw (css::uno::RuntimeException) +ScVbaChartObject::setName( const OUString& sName ) throw (css::uno::RuntimeException) { xNamedShape->setName(sName); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaChartObject::getName() throw (css::uno::RuntimeException) { return xNamedShape->getName(); @@ -100,7 +100,7 @@ ScVbaChartObject::Delete() throw ( css::script::BasicErrorException ) if (pChartObjectsImpl) pChartObjectsImpl->removeByName( getPersistName() ); else - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "Parent is not ChartObjects" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString( "Parent is not ChartObjects" ) ); } void @@ -117,7 +117,7 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException ) } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "ChartObject Activate internal error" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString( "ChartObject Activate internal error" ) ); } } @@ -127,20 +127,20 @@ ScVbaChartObject::getChart() throw (css::uno::RuntimeException) return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart ); } -rtl::OUString +OUString ScVbaChartObject::getServiceImplName() { - return rtl::OUString("ScVbaChartObject"); + return OUString("ScVbaChartObject"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChartObject::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ChartObject" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.ChartObject" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index 99f94ebb7e8b..f0a557e6f080 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -40,23 +40,23 @@ class ScVbaChartObject : public ChartObjectImpl_BASE css::uno::Reference< css::drawing::XDrawPage > xDrawPage; css::uno::Reference< css::drawing::XShape > xShape; css::uno::Reference< css::container::XNamed > xNamed; - rtl::OUString sPersistName; + OUString sPersistName; SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr oShapeHelper; SAL_WNODEPRECATED_DECLARATIONS_POP css::uno::Reference< css::container::XNamed > xNamedShape; - rtl::OUString getPersistName(); + OUString getPersistName(); css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException ); public: ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& sName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& sName ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException); virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException ); virtual void Activate() throw ( css::script::BasicErrorException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index cdfd42545885..81904861106a 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -58,15 +58,15 @@ ScVbaChartObjects::ScVbaChartObjects( const css::uno::Reference< ov::XHelperInte } void -ScVbaChartObjects::removeByName(const rtl::OUString& _sChartName) +ScVbaChartObjects::removeByName(const OUString& _sChartName) { xTableCharts->removeByName( _sChartName ); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ) { - uno::Sequence< rtl::OUString > sChartNames; + uno::Sequence< OUString > sChartNames; try { // c++ hackery @@ -74,34 +74,34 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ScCellRangesBase* pUno= dynamic_cast< ScCellRangesBase* >( xIf.get() ); ScDocShell* pDocShell = NULL; if ( !pUno ) - throw uno::RuntimeException( rtl::OUString("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() ); pDocShell = pUno->GetDocShell(); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() ); uno::Reference< sheet::XSpreadsheetDocument > xSpreadsheetDocument( pDocShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets(); - std::vector< rtl::OUString > aChartNamesVector; + std::vector< OUString > aChartNamesVector; - uno::Sequence< rtl::OUString > sSheetNames = xSpreadsheets->getElementNames(); + uno::Sequence< OUString > sSheetNames = xSpreadsheets->getElementNames(); sal_Int32 nItems = sSheetNames.getLength(); for (sal_Int32 i = 0; i < nItems; i++) { uno::Reference< table::XTableChartsSupplier > xLocTableChartsSupplier( xSpreadsheets->getByName(sSheetNames[i]), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > scurchartnames = xLocTableChartsSupplier->getCharts()->getElementNames(); + uno::Sequence< OUString > scurchartnames = xLocTableChartsSupplier->getCharts()->getElementNames(); sal_Int32 nChartNames = scurchartnames.getLength(); for (sal_Int32 n = 0; n < nChartNames; n++ ) aChartNamesVector.push_back(scurchartnames[n]); } sChartNames.realloc( aChartNamesVector.size() ); - std::vector< rtl::OUString > ::const_iterator it = aChartNamesVector.begin(); - std::vector< rtl::OUString > ::const_iterator it_end = aChartNamesVector.end(); + std::vector< OUString > ::const_iterator it = aChartNamesVector.begin(); + std::vector< OUString > ::const_iterator it_end = aChartNamesVector.end(); for ( sal_Int32 index = 0 ; it != it_end; ++it, ++index ) sChartNames[index] = *it; } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return sChartNames; } @@ -119,7 +119,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight aRectangle.Width = Millimeter::getInHundredthsOfOneMillimeter(_nWidth); aRectangle.Height = Millimeter::getInHundredthsOfOneMillimeter(_nHeight); // Note the space at the end of the stem ("Chart "). In ChartSheets only "Chart" is the stem - rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( "Chart " ) , rtl::OUString(), 1); + OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), OUString( "Chart " ) , OUString(), 1); xTableCharts->addNewByName(sPersistChartName, aRectangle, aCellRangeAddress, true, false ); uno::Reference< excel::XChartObject > xChartObject( getItemByStringIndex( sPersistChartName ), uno::UNO_QUERY_THROW ); xChartObject->getChart()->setChartType(excel::XlChartType::xlColumnClustered); @@ -127,13 +127,13 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight } catch (const uno::Exception& ex) { - OSL_TRACE("AddItem caught exception ->%s", rtl::OUStringToOString( ex.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("AddItem caught exception ->%s", OUStringToOString( ex.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } return aNULL(); } void SAL_CALL ScVbaChartObjects::Delete( ) throw (script::BasicErrorException) { - uno::Sequence< rtl::OUString > sChartNames = xTableCharts->getElementNames(); + uno::Sequence< OUString > sChartNames = xTableCharts->getElementNames(); sal_Int32 ncount = sChartNames.getLength(); for (sal_Int32 i = 0; i < ncount ; i++) removeByName(sChartNames[i]); @@ -165,20 +165,20 @@ ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( getParent(), mxContext, xTableChart, xDrawPageSupplier ) ) ); } -rtl::OUString +OUString ScVbaChartObjects::getServiceImplName() { - return rtl::OUString("ScVbaChartObjects"); + return OUString("ScVbaChartObjects"); } -css::uno::Sequence +css::uno::Sequence ScVbaChartObjects::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.ChartObjects"); + sNames[0] = OUString("ooo.vba.excel.ChartObjects"); } return sNames; } diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index 7c52f5c1962d..6ced7893db7f 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -31,10 +31,10 @@ typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE; /* #TODO see if this hash table is 'really' necessary -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, css::uno::Reference< ov::excel::XChartObject >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > aHashTable; + OUStringHash, + ::std::equal_to< OUString > > aHashTable; */ class ScVbaChartObjects : public ChartObjects_BASE @@ -47,8 +47,8 @@ class ScVbaChartObjects : public ChartObjects_BASE public: ScVbaChartObjects( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableCharts >& _xTableCharts, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); - css::uno::Sequence< rtl::OUString > getChartObjectNames() throw( css::script::BasicErrorException ); - void removeByName(const rtl::OUString& _sChartName); + css::uno::Sequence< OUString > getChartObjectNames() throw( css::script::BasicErrorException ); + void removeByName(const OUString& _sChartName); // XChartObjects virtual ::com::sun::star::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (::com::sun::star::script::BasicErrorException); @@ -60,8 +60,8 @@ public: // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // ChartObjects_BASE - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx index 3fbe661f98fa..a07722c86f1b 100644 --- a/sc/source/ui/vba/vbacharttitle.cxx +++ b/sc/source/ui/vba/vbacharttitle.cxx @@ -25,21 +25,21 @@ ScVbaChartTitle::ScVbaChartTitle( const uno::Reference< XHelperInterface >& xPar { } -rtl::OUString +OUString ScVbaChartTitle::getServiceImplName() { - return rtl::OUString("ScVbaChartTitle"); + return OUString("ScVbaChartTitle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChartTitle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { - uno::Sequence< rtl::OUString > BaseServiceNames = ChartTitleBase::getServiceNames(); + uno::Sequence< OUString > BaseServiceNames = ChartTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Chart" ); for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx index 22989e8a3106..dec1b7717572 100644 --- a/sc/source/ui/vba/vbacharttitle.hxx +++ b/sc/source/ui/vba/vbacharttitle.hxx @@ -30,8 +30,8 @@ class ScVbaChartTitle : public ChartTitleBase public: ScVbaChartTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index 1393237312bf..d6f18cc40bbc 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -47,7 +47,7 @@ ScVbaComment::ScVbaComment( mxRange( xRange ) { if ( !xRange.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY ); } @@ -108,14 +108,14 @@ ScVbaComment::getCommentByIndex( sal_Int32 Index ) throw (uno::RuntimeException) // public vba functions -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaComment::getAuthor() throw (uno::RuntimeException) { return getAnnotation()->getAuthor(); } void SAL_CALL -ScVbaComment::setAuthor( const rtl::OUString& /*_author*/ ) throw (uno::RuntimeException) +ScVbaComment::setAuthor( const OUString& /*_author*/ ) throw (uno::RuntimeException) { // #TODO #FIXME implementation needed } @@ -163,14 +163,14 @@ ScVbaComment::Previous() throw (uno::RuntimeException) return getCommentByIndex( getAnnotationIndex() ); } -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::Any& Overwrite ) throw (uno::RuntimeException) { - rtl::OUString sText; + OUString sText; aText >>= sText; uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY_THROW ); - rtl::OUString sAnnoText = xAnnoText->getString(); + OUString sAnnoText = xAnnoText->getString(); if ( aStart.hasValue() ) { @@ -200,7 +200,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An xAnnoText->insertString( xRange, sText, bOverwrite ); return xAnnoText->getString(); } - throw uno::RuntimeException( rtl::OUString( "ScVbaComment::Text - bad Start value " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "ScVbaComment::Text - bad Start value " ), uno::Reference< uno::XInterface >() ); } else if ( aText.hasValue() ) { @@ -212,20 +212,20 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An return sAnnoText; } -rtl::OUString +OUString ScVbaComment::getServiceImplName() { - return rtl::OUString("ScVbaComment"); + return OUString("ScVbaComment"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaComment::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ScVbaComment" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.ScVbaComment" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index e8c2381639a2..17a2c319cc08 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -53,8 +53,8 @@ public: virtual ~ScVbaComment() {} // Attributes - virtual rtl::OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAuthor( const rtl::OUString& _author ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException); + virtual void SAL_CALL setAuthor( const OUString& _author ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException); @@ -63,10 +63,10 @@ public: virtual void SAL_CALL Delete() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SC_VBA_COMMENT_HXX */ diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index 9e09ee631cda..1a678afb68e7 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -88,20 +88,20 @@ ScVbaComments::getElementType() throw (uno::RuntimeException) return excel::XComment::static_type(0); } -rtl::OUString +OUString ScVbaComments::getServiceImplName() { - return rtl::OUString("ScVbaComments"); + return OUString("ScVbaComments"); } -css::uno::Sequence +css::uno::Sequence ScVbaComments::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Comments"); + sNames[0] = OUString("ooo.vba.excel.Comments"); } return sNames; } diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx index 93d248dccb20..431409d4c54e 100644 --- a/sc/source/ui/vba/vbacomments.hxx +++ b/sc/source/ui/vba/vbacomments.hxx @@ -46,8 +46,8 @@ public: // ScVbaComments_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); private: css::uno::Reference< css::frame::XModel > mxModel; diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index 3ebd89adf753..54d320c07743 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.cxx @@ -77,14 +77,14 @@ ScVbaCondition< Ifc1 >::retrieveAPIOperator( const uno::Any& _aOperator) throw ( } template< typename Ifc1 > -rtl::OUString +OUString ScVbaCondition< Ifc1 >::Formula1( ) throw ( script::BasicErrorException, uno::RuntimeException ) { return mxSheetCondition->getFormula1(); } template< typename Ifc1 > -rtl::OUString +OUString ScVbaCondition< Ifc1 >::Formula2( ) throw ( script::BasicErrorException, uno::RuntimeException ) { return mxSheetCondition->getFormula2(); @@ -94,7 +94,7 @@ template< typename Ifc1 > void ScVbaCondition< Ifc1 >::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException ) { - rtl::OUString sFormula; + OUString sFormula; if ( (_aFormula1 >>= sFormula )) { mxSheetCondition->setFormula1( sFormula ); @@ -108,7 +108,7 @@ template< typename Ifc1 > void ScVbaCondition< Ifc1 >::setFormula2( const uno::Any& _aFormula2) throw ( script::BasicErrorException ) { - rtl::OUString sFormula2; + OUString sFormula2; // #TODO surely this can't be right? // ( from helperapi/impl/.../calc/ConditionImpl.java if ( (_aFormula2 >>= sFormula2 )) @@ -157,7 +157,7 @@ ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script: } case sheet::ConditionOperator_NONE: default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString("Operator not supported")); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString("Operator not supported")); break; } return retvalue; diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx index db0eb8f1c94d..b5bed15ae80f 100644 --- a/sc/source/ui/vba/vbacondition.hxx +++ b/sc/source/ui/vba/vbacondition.hxx @@ -35,8 +35,8 @@ public: static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator) throw ( css::script::BasicErrorException ); - virtual rtl::OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + virtual OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + virtual OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ); virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException ); virtual sal_Int32 Operator(sal_Bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException ); diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx index 1f1c3736bce9..a5c59fd27d8b 100644 --- a/sc/source/ui/vba/vbadialog.cxx +++ b/sc/source/ui/vba/vbadialog.cxx @@ -23,59 +23,59 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static const rtl::OUString aStringList[]= +static const OUString aStringList[]= { - rtl::OUString( ".uno:Open" ), - rtl::OUString( ".uno:FormatCellDialog" ), - rtl::OUString( ".uno:InsertCell" ), - rtl::OUString( ".uno:Print" ), - rtl::OUString( ".uno:PasteSpecial" ), - rtl::OUString( ".uno:ToolProtectionDocument" ), - rtl::OUString( ".uno:ColumnWidth" ), - rtl::OUString( ".uno:DefineName" ), - rtl::OUString( ".uno:ConfigureDialog" ), - rtl::OUString( ".uno:HyperlinkDialog" ), - rtl::OUString( ".uno:InsertGraphic" ), - rtl::OUString( ".uno:InsertObject" ), - rtl::OUString( ".uno:PageFormatDialog" ), - rtl::OUString( ".uno:DataSort" ), - rtl::OUString( ".uno:RowHeight" ), - rtl::OUString( ".uno:AutoCorrectDlg" ), - rtl::OUString( ".uno:ConditionalFormatDialog" ), - rtl::OUString( ".uno:DataConsolidate" ), - rtl::OUString( ".uno:CreateNames" ), - rtl::OUString( ".uno:FillSeries" ), - rtl::OUString( ".uno:Validation"), - rtl::OUString( ".uno:DefineLabelRange" ), - rtl::OUString( ".uno:DataFilterAutoFilter" ), - rtl::OUString( ".uno:DataFilterSpecialFilter" ), - rtl::OUString( ".uno:AutoFormat" ) + OUString( ".uno:Open" ), + OUString( ".uno:FormatCellDialog" ), + OUString( ".uno:InsertCell" ), + OUString( ".uno:Print" ), + OUString( ".uno:PasteSpecial" ), + OUString( ".uno:ToolProtectionDocument" ), + OUString( ".uno:ColumnWidth" ), + OUString( ".uno:DefineName" ), + OUString( ".uno:ConfigureDialog" ), + OUString( ".uno:HyperlinkDialog" ), + OUString( ".uno:InsertGraphic" ), + OUString( ".uno:InsertObject" ), + OUString( ".uno:PageFormatDialog" ), + OUString( ".uno:DataSort" ), + OUString( ".uno:RowHeight" ), + OUString( ".uno:AutoCorrectDlg" ), + OUString( ".uno:ConditionalFormatDialog" ), + OUString( ".uno:DataConsolidate" ), + OUString( ".uno:CreateNames" ), + OUString( ".uno:FillSeries" ), + OUString( ".uno:Validation"), + OUString( ".uno:DefineLabelRange" ), + OUString( ".uno:DataFilterAutoFilter" ), + OUString( ".uno:DataFilterSpecialFilter" ), + OUString( ".uno:AutoFormat" ) }; const sal_Int32 nDialogSize = sizeof (aStringList) / sizeof (aStringList[0]); -rtl::OUString +OUString ScVbaDialog::mapIndexToName( sal_Int32 nIndex ) { if( nIndex < nDialogSize ) return aStringList[ nIndex ]; - return rtl::OUString(); + return OUString(); } -rtl::OUString +OUString ScVbaDialog::getServiceImplName() { - return rtl::OUString("ScVbaDialog"); + return OUString("ScVbaDialog"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaDialog::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialog" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Dialog" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx index 4adeea7798aa..bdf1e75aacbb 100644 --- a/sc/source/ui/vba/vbadialog.hxx +++ b/sc/source/ui/vba/vbadialog.hxx @@ -33,10 +33,10 @@ public: virtual ~ScVbaDialog() {} // Methods - virtual rtl::OUString mapIndexToName( sal_Int32 nIndex ); + virtual OUString mapIndexToName( sal_Int32 nIndex ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index 367dbcf6cea1..6c3982b4ff2e 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -37,20 +37,20 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) return uno::Any( aDialog ); } -rtl::OUString +OUString ScVbaDialogs::getServiceImplName() { - return rtl::OUString("ScVbaDialogs"); + return OUString("ScVbaDialogs"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaDialogs::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialogs" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Dialogs" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 0542f5cf4698..420f955cb2e1 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -40,8 +40,8 @@ public: // XDialogs virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SC_VBA_DIALOGS_HXX */ diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index b444c2f836a8..9135324f8dfb 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; -using ::rtl::OUString; // ============================================================================ @@ -798,7 +797,7 @@ OUString ScVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& r if( bSheetEvent && (nTab < 0) ) throw lang::IllegalArgumentException(); - rtl::OUString aCodeName; + OUString aCodeName; if( bSheetEvent ) mpDoc->GetCodeName( nTab, aCodeName ); else diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 7129c3f66af4..5779f624a89e 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -43,7 +43,7 @@ protected: virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException); virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); private: /** Checks if selection has been changed compared to selection of last call. diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 91dfba73542a..8eceec21ba28 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -105,8 +105,8 @@ ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio nValue = SUPERSCRIPT; nValue2 = SUPERSCRIPTHEIGHT; } - xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue ); - xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); + xProps->setPropertyValue( OUString( "CharEscapement" ), ( uno::Any )nValue ); + xProps->setPropertyValue( OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); } uno::Any SAL_CALL @@ -138,7 +138,7 @@ ScVbaFont::getSuperscript() throw ( uno::RuntimeException ) xCell.set( xCellRange->getCellByPosition( 0,0 ) ); uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = 0; - xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue; + xProps->getPropertyValue( OUString( "CharEscapement" ) ) >>= nValue; return uno::makeAny( ( nValue == SUPERSCRIPT ) ); } @@ -178,8 +178,8 @@ ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException nValue2 = SUBSCRIPTHEIGHT; } - xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); - xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue ); + xProps->setPropertyValue( OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); + xProps->setPropertyValue( OUString( "CharEscapement" ), ( uno::Any )nValue ); } @@ -213,7 +213,7 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException ) uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = NORMAL; - xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue; + xProps->getPropertyValue( OUString( "CharEscapement" ) ) >>= nValue; return uno::makeAny( ( nValue == SUBSCRIPT ) ); } @@ -258,9 +258,9 @@ void SAL_CALL ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException ) { //XXX #TODO# #FIXME# - //mxFont->setPropertyValue( rtl::OUString( "CharSize" ), ( uno::Any )fValue ); + //mxFont->setPropertyValue( OUString( "CharSize" ), ( uno::Any )fValue ); throw uno::RuntimeException( - rtl::OUString("setStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); + OUString("setStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); } @@ -269,7 +269,7 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException ) { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString("getStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); + OUString("getStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); // return uno::Any(); } @@ -279,7 +279,7 @@ ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeExce { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString("setStandardFont not supported"), uno::Reference< uno::XInterface >() ); + OUString("setStandardFont not supported"), uno::Reference< uno::XInterface >() ); } @@ -288,7 +288,7 @@ ScVbaFont::getStandardFont() throw ( uno::RuntimeException ) { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString("getStandardFont not supported"), uno::Reference< uno::XInterface >() ); + OUString("getStandardFont not supported"), uno::Reference< uno::XInterface >() ); // return uno::Any(); } @@ -298,18 +298,18 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException ) sal_Bool bBold = false; sal_Bool bItalic = false; - rtl::OUString aStyles; + OUString aStyles; aValue >>= aStyles; - std::vector< rtl::OUString > aTokens; + std::vector< OUString > aTokens; sal_Int32 nIndex = 0; do { - rtl::OUString aToken = aStyles.getToken( 0, ' ', nIndex ); + OUString aToken = aStyles.getToken( 0, ' ', nIndex ); aTokens.push_back( aToken ); }while( nIndex >= 0 ); - std::vector< rtl::OUString >::iterator it; + std::vector< OUString >::iterator it; for( it = aTokens.begin(); it != aTokens.end(); ++it ) { if( (*it).equalsIgnoreAsciiCase("Bold") ) @@ -327,7 +327,7 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException ) uno::Any SAL_CALL ScVbaFont::getFontStyle() throw ( uno::RuntimeException ) { - rtl::OUStringBuffer aStyles; + OUStringBuffer aStyles; sal_Bool bValue = false; getBold() >>= bValue; if( bValue ) @@ -379,10 +379,10 @@ ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException nValue = awt::FontUnderline::DOUBLE; break; default: - throw uno::RuntimeException( rtl::OUString("Unknown value for Underline"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value for Underline"), uno::Reference< uno::XInterface >() ); } - mxFont->setPropertyValue( rtl::OUString( "CharUnderline" ), ( uno::Any )nValue ); + mxFont->setPropertyValue( OUString( "CharUnderline" ), ( uno::Any )nValue ); } @@ -394,7 +394,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) return aNULL(); sal_Int32 nValue = awt::FontUnderline::NONE; - mxFont->getPropertyValue( rtl::OUString( "CharUnderline" ) ) >>= nValue; + mxFont->getPropertyValue( OUString( "CharUnderline" ) ) >>= nValue; switch ( nValue ) { case awt::FontUnderline::DOUBLE: @@ -407,7 +407,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone; break; default: - throw uno::RuntimeException( rtl::OUString("Unknown value retrieved for Underline"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value retrieved for Underline"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( nValue ); @@ -454,14 +454,14 @@ ScVbaFont::getColor() throw (uno::RuntimeException) { // #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet ) uno::Any aAny; - aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( "CharColor" ) ) ); + aAny = OORGBToXLRGB( mxFont->getPropertyValue( OUString( "CharColor" ) ) ); return aAny; } void SAL_CALL ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException ) { - mxFont->setPropertyValue( rtl::OUString( "CharContoured" ), aValue ); + mxFont->setPropertyValue( OUString( "CharContoured" ), aValue ); } uno::Any SAL_CALL @@ -470,23 +470,23 @@ ScVbaFont::getOutlineFont() throw (uno::RuntimeException) if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, sal_True, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); - return mxFont->getPropertyValue( rtl::OUString( "CharContoured" ) ); + return mxFont->getPropertyValue( OUString( "CharContoured" ) ); } -rtl::OUString +OUString ScVbaFont::getServiceImplName() { - return rtl::OUString("ScVbaFont"); + return OUString("ScVbaFont"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFont::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Font" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Font" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index abb76a46390f..1a93fffb5da1 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -70,8 +70,8 @@ public: virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException) ; virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException) ; // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index e05e3ce53bd4..24f230b30369 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -50,18 +50,18 @@ using namespace ::com::sun::star; #define LOCALE "Locale" template< typename Ifc1 > -ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( rtl::OUString("en"), rtl::OUString( "US"), rtl::OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False ) +ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False ) { try { if ( !mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") ); // mxServiceInfo is unused, // mxNumberFormatsSupplier is initialized when needed in initializeNumberFormats. } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -95,11 +95,11 @@ ScVbaFormat::setVerticalAlignment( const uno::Any& _oAlignment) throw (s aVal = uno::makeAny( table::CellVertJustify2::STANDARD ); break; } - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -110,10 +110,10 @@ ScVbaFormat::getVerticalAlignment( ) throw (script::BasicErrorException, uno::Any aResult = aNULL(); try { - if (!isAmbiguous( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) ) + if (!isAmbiguous( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) ) { sal_Int32 aAPIAlignment = table::CellVertJustify2::STANDARD; - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) >>= aAPIAlignment; + mxPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) >>= aAPIAlignment; switch( aAPIAlignment ) { case table::CellVertJustify2::BOTTOM: @@ -135,7 +135,7 @@ ScVbaFormat::getVerticalAlignment( ) throw (script::BasicErrorException, } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aResult; } @@ -171,11 +171,11 @@ ScVbaFormat::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -187,7 +187,7 @@ ScVbaFormat::getHorizontalAlignment( ) throw (script::BasicErrorException uno::Any NRetAlignment = aNULL(); try { - rtl::OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); + OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); if (!isAmbiguous(sHoriJust)) { table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_BLOCK; @@ -216,7 +216,7 @@ ScVbaFormat::getHorizontalAlignment( ) throw (script::BasicErrorException } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return NRetAlignment; } @@ -238,7 +238,7 @@ ScVbaFormat::setOrientation( const uno::Any& _aOrientation ) throw (script break; case excel::XlOrientation::xlHorizontal: aVal = uno::makeAny( table::CellOrientation_STANDARD ); - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ROTANG ) ), uno::makeAny( sal_Int32(0) ) ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ROTANG ) ), uno::makeAny( sal_Int32(0) ) ); break; case excel::XlOrientation::xlUpward: aVal = uno::makeAny( table::CellOrientation_BOTTOMTOP); @@ -250,12 +250,12 @@ ScVbaFormat::setOrientation( const uno::Any& _aOrientation ) throw (script // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } template< typename Ifc1 > @@ -265,10 +265,10 @@ ScVbaFormat::getOrientation( ) throw (script::BasicErrorException, uno::R uno::Any NRetOrientation = aNULL(); try { - if (!isAmbiguous(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ))) + if (!isAmbiguous(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ))) { table::CellOrientation aOrientation = table::CellOrientation_STANDARD; - if ( !( mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ) ) >>= aOrientation ) ) + if ( !( mxPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ) ) >>= aOrientation ) ) throw uno::RuntimeException(); switch(aOrientation) @@ -292,7 +292,7 @@ ScVbaFormat::getOrientation( ) throw (script::BasicErrorException, uno::R } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return NRetOrientation; } @@ -303,11 +303,11 @@ ScVbaFormat::setWrapText( const uno::Any& _aWrapText ) throw (script::Basi { try { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ), _aWrapText); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ), _aWrapText); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -318,7 +318,7 @@ ScVbaFormat::getWrapText( ) throw (script::BasicErrorException, uno::Runt uno::Any aWrap = aNULL(); try { - rtl::OUString aPropName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ) ); + OUString aPropName( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ) ); if (!isAmbiguous( aPropName )) { aWrap = mxPropertySet->getPropertyValue(aPropName); @@ -326,7 +326,7 @@ ScVbaFormat::getWrapText( ) throw (script::BasicErrorException, uno::Runt } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return aWrap; } @@ -364,10 +364,10 @@ template< typename Ifc1 > uno::Any SAL_CALL ScVbaFormat::getNumberFormatLocal( ) throw (script::BasicErrorException, uno::RuntimeException) { - uno::Any aRet = uno::makeAny( rtl::OUString() ); + uno::Any aRet = uno::makeAny( OUString() ); try { - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); if (!isAmbiguous( sPropName )) { @@ -377,15 +377,15 @@ ScVbaFormat::getNumberFormatLocal( ) throw (script::BasicErrorException, if ( ! (mxPropertySet->getPropertyValue( sPropName ) >>= nFormat ) ) throw uno::RuntimeException(); - rtl::OUString sFormat; - xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; + OUString sFormat; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; aRet = uno::makeAny( sFormat.toAsciiLowerCase() ); } } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aRet; @@ -397,9 +397,9 @@ ScVbaFormat::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t { try { - rtl::OUString sLocalFormatString; + OUString sLocalFormatString; sal_Int32 nFormat = -1; - rtl::OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); if ( !(_oLocalFormatString >>= sLocalFormatString ) || !( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat ) ) throw uno::RuntimeException(); @@ -407,7 +407,7 @@ ScVbaFormat::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t sLocalFormatString = sLocalFormatString.toAsciiUpperCase(); initializeNumberFormats(); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormats->queryKey(sLocalFormatString, aRangeLocale, sal_True); if (nNewFormat == -1) @@ -416,7 +416,7 @@ ScVbaFormat::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -426,7 +426,7 @@ ScVbaFormat::setNumberFormat( const uno::Any& _oFormatString ) throw (scri { try { - rtl::OUString sFormatString; + OUString sFormatString; if ( !( _oFormatString >>= sFormatString ) ) throw uno::RuntimeException(); @@ -440,13 +440,13 @@ ScVbaFormat::setNumberFormat( const uno::Any& _oFormatString ) throw (scri nFormat = xNumberFormats->addNew(sFormatString, aDefaultLocale); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, aRangeLocale); - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ), uno::makeAny( nNewFormat)); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ), uno::makeAny( nNewFormat)); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -462,16 +462,16 @@ ScVbaFormat::setIndentLevel( const uno::Any& _aLevel ) throw (script::Basi throw uno::RuntimeException(); table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_STANDARD; - rtl::OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); + OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); if ( !( mxPropertySet->getPropertyValue(sHoriJust) >>= aAPIAlignment ) ) throw uno::RuntimeException(); if (aAPIAlignment == table::CellHoriJustify_STANDARD) mxPropertySet->setPropertyValue( sHoriJust, uno::makeAny( table::CellHoriJustify_LEFT) ) ; - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -482,7 +482,7 @@ ScVbaFormat::getIndentLevel( ) throw (script::BasicErrorException, uno::R uno::Any NRetIndentLevel = aNULL(); try { - rtl::OUString sParaIndent( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ); + OUString sParaIndent( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ); if (!isAmbiguous(sParaIndent)) { sal_Int16 IndentLevel = 0; @@ -494,7 +494,7 @@ ScVbaFormat::getIndentLevel( ) throw (script::BasicErrorException, uno::R } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return NRetIndentLevel; } @@ -509,14 +509,14 @@ ScVbaFormat::setLocked( const uno::Any& _aLocked ) throw (script::BasicErr if ( !( _aLocked >>= bIsLocked ) ) throw uno::RuntimeException(); util::CellProtection aCellProtection; - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsLocked = bIsLocked; mxPropertySet->setPropertyValue(sCellProt, uno::makeAny( aCellProtection ) ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -529,14 +529,14 @@ ScVbaFormat::setFormulaHidden( const uno::Any& FormulaHidden ) throw (scri sal_Bool bIsFormulaHidden = false; FormulaHidden >>= bIsFormulaHidden; util::CellProtection aCellProtection; - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsFormulaHidden = bIsFormulaHidden; mxPropertySet->setPropertyValue(sCellProt,uno::makeAny(aCellProtection)); } catch (const uno::Exception& ) { - DebugHelper::exception( SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception( SbERR_METHOD_FAILED, OUString() ); } } @@ -547,7 +547,7 @@ ScVbaFormat::getLocked( ) throw (script::BasicErrorException, uno::Runtim uno::Any aCellProtection = aNULL(); try { - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); if (!isAmbiguous(sCellProt)) { @@ -569,7 +569,7 @@ ScVbaFormat::getLocked( ) throw (script::BasicErrorException, uno::Runtim } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aCellProtection; } @@ -581,7 +581,7 @@ ScVbaFormat::getFormulaHidden( ) throw (script::BasicErrorException, uno: uno::Any aBoolRet = aNULL(); try { - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); if (!isAmbiguous(sCellProt)) { SfxItemSet* pDataSet = getCurrentDataSet(); @@ -602,7 +602,7 @@ ScVbaFormat::getFormulaHidden( ) throw (script::BasicErrorException, uno: } catch (const uno::Exception&) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aBoolRet; } @@ -613,11 +613,11 @@ ScVbaFormat::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script:: { try { - mxPropertySet->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ), ShrinkToFit); + mxPropertySet->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ), ShrinkToFit); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString() ); } } @@ -629,13 +629,13 @@ ScVbaFormat::getShrinkToFit( ) throw (script::BasicErrorException, uno::R uno::Any aRet = aNULL(); try { - rtl::OUString sShrinkToFit( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ); + OUString sShrinkToFit( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ); if (!isAmbiguous(sShrinkToFit)) aRet = mxPropertySet->getPropertyValue(sShrinkToFit); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } return aRet; } @@ -659,16 +659,16 @@ ScVbaFormat::setReadingOrder( const uno::Any& ReadingOrder ) throw (script aVal = uno::makeAny( text::WritingMode_RL_TB ); break; case excel::Constants::xlContext: - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); break; default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -680,7 +680,7 @@ ScVbaFormat::getReadingOrder( ) throw (script::BasicErrorException, uno:: uno::Any NRetReadingOrder = aNULL(); try { - rtl::OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ); + OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ); if (!isAmbiguous(sWritingMode)) { text::WritingMode aWritingMode = text::WritingMode_LR_TB; @@ -699,7 +699,7 @@ ScVbaFormat::getReadingOrder( ) throw (script::BasicErrorException, uno:: } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } return NRetReadingOrder; @@ -713,28 +713,28 @@ ScVbaFormat< Ifc1 >::getNumberFormat( ) throw (script::BasicErrorException, uno try { sal_Int32 nFormat = -1; - rtl::OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); if (!isAmbiguous(sNumFormat) && ( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat) ) { initializeNumberFormats(); sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, getDefaultLocale() ); - rtl::OUString sFormat; - xNumberFormats->getByKey(nNewFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; + OUString sFormat; + xNumberFormats->getByKey(nNewFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; aFormat = uno::makeAny( sFormat ); } } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aFormat; } template< typename Ifc1 > bool -ScVbaFormat::isAmbiguous(const rtl::OUString& _sPropertyName) throw ( script::BasicErrorException ) +ScVbaFormat::isAmbiguous(const OUString& _sPropertyName) throw ( script::BasicErrorException ) { bool bResult = false; try @@ -744,7 +744,7 @@ ScVbaFormat::isAmbiguous(const rtl::OUString& _sPropertyName) throw ( scri } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bResult; } @@ -771,21 +771,21 @@ ScVbaFormat::getXPropertyState() throw ( uno::RuntimeException ) } template< typename Ifc1 > -rtl::OUString +OUString ScVbaFormat::getServiceImplName() { - return rtl::OUString("ScVbaFormat"); + return OUString("ScVbaFormat"); } template< typename Ifc1 > -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFormat::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Format" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Format" ); } return aServiceNames; } @@ -803,7 +803,7 @@ ScVbaFormat::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) - throw uno::RuntimeException( rtl::OUString( "Can't access Itemset for XPropertySet" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't access Itemset for XPropertySet" ), uno::Reference< uno::XInterface >() ); return pDataSet; } diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index edd9fc5f663c..b227381a2ba0 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -49,7 +49,7 @@ protected: sal_Bool mbAddIndent; //NumberFormatter oNumberFormatter = null; css::uno::Reference< css::lang::XMultiServiceFactory > xMultiServiceFactory; - bool isAmbiguous(const rtl::OUString& _sPropertyName) throw ( css::script::BasicErrorException ); + bool isAmbiguous(const OUString& _sPropertyName) throw ( css::script::BasicErrorException ); css::uno::Reference< css::beans::XPropertyState > getXPropertyState() throw ( css::uno::RuntimeException ); void initializeNumberFormats() throw ( css::script::BasicErrorException ); SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException ); @@ -90,8 +90,8 @@ public: virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 09a1455a3d73..ce4f8969538d 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -28,7 +28,7 @@ lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions { ScVbaFormatConditions* pFormatConditions = static_cast< ScVbaFormatConditions* >( xFormatConditions.get() ); if ( !pFormatConditions ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); return pFormatConditions; } ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, const uno::Reference< excel::XStyle >& _xStyle, const uno::Reference< excel::XFormatConditions >& _xFormatConditions, const uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException ) : ScVbaFormatCondition_BASE( xParent, xContext, uno::Reference< sheet::XSheetCondition >( _xSheetConditionalEntry, css::uno::UNO_QUERY_THROW ) ), moFormatConditions( _xFormatConditions ), mxStyle( _xStyle ), mxParentRangePropertySet( _xPropertySet ) @@ -59,7 +59,7 @@ ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, co } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -93,7 +93,7 @@ ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< aAPIType = sheet::ConditionOperator_NONE; break; default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return aAPIType; } @@ -140,28 +140,28 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries) ); + mxParentRangePropertySet->setPropertyValue( OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries) ); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } -rtl::OUString +OUString ScVbaFormatCondition::getServiceImplName() { - return rtl::OUString("ScVbaFormatCondition"); + return OUString("ScVbaFormatCondition"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFormatCondition::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatCondition" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.FormatCondition" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index 63fb310bc40e..ca373fd61c8d 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -32,7 +32,7 @@ typedef ScVbaCondition< ov::excel::XFormatCondition > ScVbaFormatCondition_BASE class ScVbaFormatCondition : public ScVbaFormatCondition_BASE { protected: - rtl::OUString msStyleName; + OUString msStyleName; css::uno::Reference< css::sheet::XSheetConditionalEntry > mxSheetConditionalEntry; css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries; css::uno::Reference< ov::excel::XFormatConditions> moFormatConditions; @@ -56,8 +56,8 @@ public: virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 8e1989f6b2de..e0bf2411bada 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -31,11 +31,11 @@ using namespace ::com::sun::star; typedef std::vector< beans::PropertyValue > VecPropValues; -static rtl::OUString OPERATOR("Operator"); -static rtl::OUString FORMULA1("Formula1"); -static rtl::OUString FORMULA2("Formula2"); -static rtl::OUString STYLENAME("StyleName"); -static rtl::OUString sStyleNamePrefix("Excel_CondFormat"); +static OUString OPERATOR("Operator"); +static OUString FORMULA1("Formula1"); +static OUString FORMULA2("Formula2"); +static OUString STYLENAME("StyleName"); +static OUString sStyleNamePrefix("Excel_CondFormat"); void SAL_CALL ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) @@ -44,7 +44,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti { ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() ); if ( !pStyles ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); sal_Int32 nCount = mxSheetConditionalEntries->getCount(); for (sal_Int32 i = nCount - 1; i >= 0; i--) { @@ -56,7 +56,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -128,7 +128,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons uno::Reference< excel::XFormatCondition > xFormatCondition; try { - rtl::OUString sStyleName; + OUString sStyleName; if ( !xStyle.is() ) { sStyleName = getStyleName(); @@ -186,7 +186,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons catch (uno::Exception& ) { } - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); return xFormatCondition; } @@ -203,36 +203,36 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries )); + mxParentRangePropertySet->setPropertyValue( OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries )); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( script::BasicErrorException ) { // #TODO, #FIXME hook-in proper formula conversion detection & logic - rtl::OUString sFormula; + OUString sFormula; if ( !( _aFormula >>= sFormula ) ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); return sFormula; } -rtl::OUString +OUString ScVbaFormatConditions::getStyleName() { ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() ); if ( !pStyles ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); - uno::Sequence< rtl::OUString > sCellStyleNames = pStyles->getStyleNames(); - return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString("_")); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); + uno::Sequence< OUString > sCellStyleNames = pStyles->getStyleNames(); + return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, OUString("_")); } void -ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( script::BasicErrorException ) +ScVbaFormatConditions::removeFormatCondition( const OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( script::BasicErrorException ) { try { @@ -247,7 +247,7 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, { ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() ); if ( !pStyles ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); pStyles->Delete( _sStyleName ); } return; @@ -256,24 +256,24 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaFormatConditions::getServiceImplName() { - return rtl::OUString("ScVbaFormatConditions"); + return OUString("ScVbaFormatConditions"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFormatConditions::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatConditions" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.FormatConditions" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index 303852ac98c8..100916426dce 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -50,9 +50,9 @@ class ScVbaFormatConditions: public ScVbaFormatConditions_BASE public: void notifyRange() throw ( css::script::BasicErrorException ); virtual css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - rtl::OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); - rtl::OUString getStyleName(); - void removeFormatCondition( const rtl::OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( css::script::BasicErrorException ); + OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); + OUString getStyleName(); + void removeFormatCondition( const OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( css::script::BasicErrorException ); css::uno::Reference< css::sheet::XSheetConditionalEntries > getSheetConditionalEntries() const { return mxSheetConditionalEntries; } // XFormatConditions virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); @@ -62,8 +62,8 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #ifdef _MSC_VER diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 707a5578b605..94d42fcc777f 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -42,14 +42,14 @@ using namespace ::ooo::vba; // ============================================================================= //ScVbaGlobals::ScVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext, ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext ) -rtl::OUString sDocCtxName( "ExcelDocumentContext" ); +OUString sDocCtxName( "ExcelDocumentContext" ); ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, sDocCtxName ) { OSL_TRACE("ScVbaGlobals::ScVbaGlobals()"); uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); - aInitArgs[ 0 ].Name = rtl::OUString("Application"); + aInitArgs[ 0 ].Name = OUString("Application"); aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); aInitArgs[ 1 ].Name = sDocCtxName; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); @@ -93,7 +93,7 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException) return xWorkbook; } // FIXME check if this is correct/desired behavior - throw uno::RuntimeException( rtl::OUString( + throw uno::RuntimeException( OUString( "No activeWorkbook available" ), Reference< uno::XInterface >() ); } @@ -198,7 +198,7 @@ ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, c } uno::Any SAL_CALL -ScVbaGlobals::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +ScVbaGlobals::Evaluate( const OUString& Name ) throw (uno::RuntimeException) { return getApplication()->Evaluate( Name ); } @@ -230,7 +230,7 @@ ScVbaGlobals::getDebug() throw (uno::RuntimeException) { uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< uno::XInterface > xVBADebug = xServiceManager->createInstanceWithContext( - ::rtl::OUString( "ooo.vba.Debug" ), mxContext ); + OUString( "ooo.vba.Debug" ), mxContext ); return uno::Any( xVBADebug ); } catch( uno::Exception& ) @@ -245,21 +245,21 @@ ScVbaGlobals::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException) return uno::Any( getApplication()->MenuBars(aIndex) ); } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) { static bool bInit = false; - static uno::Sequence< rtl::OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() ); + static uno::Sequence< OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() ); if ( !bInit ) { - rtl::OUString names[] = { - ::rtl::OUString( "ooo.vba.excel.Range" ), - ::rtl::OUString( "ooo.vba.excel.Workbook" ), - ::rtl::OUString( "ooo.vba.excel.Window" ), - ::rtl::OUString( "ooo.vba.excel.Worksheet" ), - ::rtl::OUString( "ooo.vba.excel.Application" ), - ::rtl::OUString( "ooo.vba.excel.Hyperlink" ), - ::rtl::OUString( "com.sun.star.script.vba.VBASpreadsheetEventProcessor" ) + OUString names[] = { + OUString( "ooo.vba.excel.Range" ), + OUString( "ooo.vba.excel.Workbook" ), + OUString( "ooo.vba.excel.Window" ), + OUString( "ooo.vba.excel.Worksheet" ), + OUString( "ooo.vba.excel.Application" ), + OUString( "ooo.vba.excel.Hyperlink" ), + OUString( "com.sun.star.script.vba.VBASpreadsheetEventProcessor" ) }; sal_Int32 nExcelServices = ( sizeof( names )/ sizeof( names[0] ) ); sal_Int32 startIndex = serviceNames.getLength(); @@ -271,20 +271,20 @@ ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) return serviceNames; } -rtl::OUString +OUString ScVbaGlobals::getServiceImplName() { - return rtl::OUString("ScVbaGlobals"); + return OUString("ScVbaGlobals"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaGlobals::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.Globals" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.Globals" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 1868dc6f5d81..9980d2aed938 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -62,7 +62,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); @@ -80,10 +80,10 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc // XMultiServiceFactory - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif // diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index 0c1ce0e618da..cd261d3a0704 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -29,8 +29,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx index 85e29678d234..f69e3147f5b1 100644 --- a/sc/source/ui/vba/vbahyperlink.hxx +++ b/sc/source/ui/vba/vbahyperlink.hxx @@ -45,16 +45,16 @@ public: virtual ~ScVbaHyperlink(); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& rName ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAddress() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAddress( const ::rtl::OUString& rAddress ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException); - virtual void SAL_CALL setSubAddress( const ::rtl::OUString& rSubAddress ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException); - virtual void SAL_CALL setScreenTip( const ::rtl::OUString& rScreenTip ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException); - virtual void SAL_CALL setTextToDisplay( const ::rtl::OUString& rTextToDisplay ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getAddress() throw (css::uno::RuntimeException); + virtual void SAL_CALL setAddress( const OUString& rAddress ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException); + virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException); + virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException); + virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException); @@ -63,7 +63,7 @@ public: VBAHELPER_DECL_XHELPERINTERFACE private: - typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > UrlComponents; + typedef ::std::pair< OUString, OUString > UrlComponents; void ensureTextField() throw (css::uno::RuntimeException); UrlComponents getUrlComponents() throw (css::uno::RuntimeException); @@ -72,7 +72,7 @@ private: private: css::uno::Reference< css::table::XCell > mxCell; css::uno::Reference< css::beans::XPropertySet > mxTextField; - ::rtl::OUString maScreenTip; + OUString maScreenTip; long mnType; }; diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 8711ba0a1168..8004e3c9eb6a 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -27,7 +27,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -using ::rtl::OUString; // ============================================================================ @@ -38,7 +37,7 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan { const ScRangeList& rScInner = ScVbaRange::getScRangeList( rxInner ); if( rScInner.empty() || rScOuter.empty() ) - throw uno::RuntimeException( ::rtl::OUString( "Empty range objects" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Empty range objects" ), uno::Reference< uno::XInterface >() ); for( size_t nIndex = 0, nCount = rScInner.size(); nIndex < nCount; ++nIndex ) if( !rScOuter.In( *rScInner[ nIndex ] ) ) diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 69b80b13d840..3782a100b7ee 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -48,9 +48,9 @@ typedef std::pair< sal_Int32, sal_Int32 > PatternPair; using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlPattern; -static const rtl::OUString BACKCOLOR( "CellBackColor" ); -static const rtl::OUString PATTERN( "Pattern" ); -static const rtl::OUString PATTERNCOLOR( "PatternColor" ); +static const OUString BACKCOLOR( "CellBackColor" ); +static const OUString PATTERN( "Pattern" ); +static const OUString PATTERNCOLOR( "PatternColor" ); static PatternMap lcl_getPatternMap() { @@ -86,7 +86,7 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, m_aPattColor.SetColor( (sal_uInt32)0x0 ); m_nPattern = 0L; if ( !m_xProps.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "properties"), uno::Reference< uno::XInterface >(), 2 ); + throw lang::IllegalArgumentException( OUString( "properties"), uno::Reference< uno::XInterface >(), 2 ); } uno::Any @@ -250,7 +250,7 @@ ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 n uno::Reference< container::XNameContainer > ScVbaInterior::GetAttributeContainer() { - return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW ); + return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( OUString( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW ); } sal_Int32 ScVbaInterior::GetAttributeData( uno::Any aValue ) @@ -266,12 +266,12 @@ uno::Any ScVbaInterior::SetAttributeData( sal_Int32 nValue ) { xml::AttributeData aAttributeData; - aAttributeData.Type = rtl::OUString( "sal_Int32" ); - aAttributeData.Value = rtl::OUString::valueOf( nValue ); + aAttributeData.Type = OUString( "sal_Int32" ); + aAttributeData.Value = OUString::valueOf( nValue ); return uno::makeAny( aAttributeData ); } uno::Any -ScVbaInterior::GetUserDefinedAttributes( const rtl::OUString& sName ) +ScVbaInterior::GetUserDefinedAttributes( const OUString& sName ) { uno::Reference< container::XNameContainer > xNameContainer( GetAttributeContainer(), uno::UNO_QUERY_THROW ); if( xNameContainer->hasByName( sName ) ) @@ -281,7 +281,7 @@ ScVbaInterior::GetUserDefinedAttributes( const rtl::OUString& sName ) return uno::Any(); } void -ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno::Any& aValue ) +ScVbaInterior::SetUserDefinedAttributes( const OUString& sName, const uno::Any& aValue ) { if( aValue.hasValue() ) { @@ -289,7 +289,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno:: if( xNameContainer->hasByName( sName ) ) xNameContainer->removeByName( sName ); xNameContainer->insertByName( sName, aValue ); - m_xProps->setPropertyValue( rtl::OUString( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) ); + m_xProps->setPropertyValue( OUString( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) ); } } // OOo do not support below API @@ -311,7 +311,7 @@ ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeExcepti SetMixedColor(); } else - throw uno::RuntimeException( rtl::OUString( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() ); } Color ScVbaInterior::GetBackColor() @@ -359,7 +359,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt SetMixedColor(); } else - throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException) @@ -382,23 +382,23 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) ); } else - throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } -rtl::OUString +OUString ScVbaInterior::getServiceImplName() { - return rtl::OUString("ScVbaInterior"); + return OUString("ScVbaInterior"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaInterior::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Interior" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Interior" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index f5cc5b9fb439..93cbd4fc20d2 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -52,8 +52,8 @@ protected: sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ) const; css::uno::Any GetIndexColor( const sal_Int32& nColorIndex ); sal_Int32 GetColorIndex( const sal_Int32 nColor ); - css::uno::Any GetUserDefinedAttributes( const rtl::OUString& sName ); - void SetUserDefinedAttributes( const rtl::OUString& sName, const css::uno::Any& aValue ); + css::uno::Any GetUserDefinedAttributes( const OUString& sName ); + void SetUserDefinedAttributes( const OUString& sName, const css::uno::Any& aValue ); void SetMixedColor(); public: ScVbaInterior( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, @@ -73,8 +73,8 @@ public: virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException); virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx index dedb0398d6bb..45dd42c69336 100644 --- a/sc/source/ui/vba/vbamenu.cxx +++ b/sc/source/ui/vba/vbamenu.cxx @@ -36,14 +36,14 @@ ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface > xParent, cons { } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaMenu::getCaption() throw ( uno::RuntimeException ) { return m_xCommandBarControl->getCaption(); } void SAL_CALL -ScVbaMenu::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException) +ScVbaMenu::setCaption( const OUString& _caption ) throw (uno::RuntimeException) { m_xCommandBarControl->setCaption( _caption ); } @@ -66,20 +66,20 @@ ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorExceptio return uno::makeAny( xMenuItems ); } -rtl::OUString +OUString ScVbaMenu::getServiceImplName() { - return rtl::OUString("ScVbaMenu"); + return OUString("ScVbaMenu"); } -uno::Sequence +uno::Sequence ScVbaMenu::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menu" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Menu" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenu.hxx b/sc/source/ui/vba/vbamenu.hxx index 392053929a29..a6946318457b 100644 --- a/sc/source/ui/vba/vbamenu.hxx +++ b/sc/source/ui/vba/vbamenu.hxx @@ -42,15 +42,15 @@ private: public: ScVbaMenu( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif//SC_VBA_MENU_HXX diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx index 91997c0b1b20..c46c753cbb0e 100644 --- a/sc/source/ui/vba/vbamenubar.cxx +++ b/sc/source/ui/vba/vbamenubar.cxx @@ -48,20 +48,20 @@ ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException return uno::makeAny( xMenus ); } -rtl::OUString +OUString ScVbaMenuBar::getServiceImplName() { - return rtl::OUString("ScVbaMenuBar"); + return OUString("ScVbaMenuBar"); } -uno::Sequence +uno::Sequence ScVbaMenuBar::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBar" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuBar" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubar.hxx b/sc/source/ui/vba/vbamenubar.hxx index f48956ca1941..c3a81063f6e7 100644 --- a/sc/source/ui/vba/vbamenubar.hxx +++ b/sc/source/ui/vba/vbamenubar.hxx @@ -45,8 +45,8 @@ public: virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif//SC_VBA_MENUBAR_HXX diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index eb7aead78349..3574b24e112f 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -106,30 +106,30 @@ ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw if( nIndex == excel::XlSheetType::xlWorksheet ) { uno::Any aSource; - aSource <<= rtl::OUString( "Worksheet Menu Bar" ); + aSource <<= OUString( "Worksheet Menu Bar" ); uno::Reference< XCommandBar > xCommandBar( m_xCommandBars->Item( aSource, uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( this, mxContext, xCommandBar ) ); return uno::makeAny( xMenuBar ); } - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } // XHelperInterface -rtl::OUString +OUString ScVbaMenuBars::getServiceImplName() { - return rtl::OUString("ScVbaMenuBars"); + return OUString("ScVbaMenuBars"); } -uno::Sequence +uno::Sequence ScVbaMenuBars::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBars" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuBars" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx index cc52aa699b44..d6ed15c120d7 100644 --- a/sc/source/ui/vba/vbamenubars.hxx +++ b/sc/source/ui/vba/vbamenubars.hxx @@ -55,8 +55,8 @@ public: virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif//SC_VBA_MENUBARS_HXX diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx index 881ef72fa9cc..12acfbb8a6df 100644 --- a/sc/source/ui/vba/vbamenuitem.cxx +++ b/sc/source/ui/vba/vbamenuitem.cxx @@ -34,26 +34,26 @@ ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface > xPare { } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaMenuItem::getCaption() throw ( uno::RuntimeException ) { return m_xCommandBarControl->getCaption(); } void SAL_CALL -ScVbaMenuItem::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException) +ScVbaMenuItem::setCaption( const OUString& _caption ) throw (uno::RuntimeException) { m_xCommandBarControl->setCaption( _caption ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaMenuItem::getOnAction() throw ( uno::RuntimeException ) { return m_xCommandBarControl->getOnAction(); } void SAL_CALL -ScVbaMenuItem::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException) +ScVbaMenuItem::setOnAction( const OUString& _onaction ) throw (uno::RuntimeException) { m_xCommandBarControl->setOnAction( _onaction ); } @@ -64,20 +64,20 @@ ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeExcepti m_xCommandBarControl->Delete(); } -rtl::OUString +OUString ScVbaMenuItem::getServiceImplName() { - return rtl::OUString("ScVbaMenuItem"); + return OUString("ScVbaMenuItem"); } -uno::Sequence +uno::Sequence ScVbaMenuItem::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItem" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuItem" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitem.hxx b/sc/source/ui/vba/vbamenuitem.hxx index 4ab24307118f..c74b1f21b714 100644 --- a/sc/source/ui/vba/vbamenuitem.hxx +++ b/sc/source/ui/vba/vbamenuitem.hxx @@ -42,16 +42,16 @@ private: public: ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); - virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); + virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif//SC_VBA_MENUITEM_HXX diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index 90e70b127c18..300e5e012db8 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -117,14 +117,14 @@ ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) thro throw uno::RuntimeException(); } -uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException) +uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { sal_Int32 nType = office::MsoControlType::msoControlButton; uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore ); xCommandBarControl->setCaption( Caption ); if( OnAction.hasValue() ) { - rtl::OUString sAction; + OUString sAction; OnAction >>= sAction; xCommandBarControl->setOnAction( sAction ); } @@ -132,20 +132,20 @@ uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUSt } // XHelperInterface -rtl::OUString +OUString ScVbaMenuItems::getServiceImplName() { - return rtl::OUString("ScVbaMenuItems"); + return OUString("ScVbaMenuItems"); } -uno::Sequence +uno::Sequence ScVbaMenuItems::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItems" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuItems" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx index 49410804b388..0c6604818fd3 100644 --- a/sc/source/ui/vba/vbamenuitems.hxx +++ b/sc/source/ui/vba/vbamenuitems.hxx @@ -52,10 +52,10 @@ public: // Methods virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif//SC_VBA_MENUITEMS_HXX diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index f1ab8e120485..27d06e99f5a5 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -109,7 +109,7 @@ ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( u return uno::makeAny( uno::Reference< excel::XMenu > ( new ScVbaMenu( this, mxContext, xCommandBarControl ) ) ); } -uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException) +uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { sal_Int32 nType = office::MsoControlType::msoControlPopup; uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore ); @@ -118,20 +118,20 @@ uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Ca } // XHelperInterface -rtl::OUString +OUString ScVbaMenus::getServiceImplName() { - return rtl::OUString("ScVbaMenus"); + return OUString("ScVbaMenus"); } -uno::Sequence +uno::Sequence ScVbaMenus::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menus" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Menus" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx index 49180037b375..1d8b3c6685c3 100644 --- a/sc/source/ui/vba/vbamenus.hxx +++ b/sc/source/ui/vba/vbamenus.hxx @@ -52,10 +52,10 @@ public: // Methods virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif//SC_VBA_MENUS_HXX diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index 801d14f42e9e..971c91fb7d7d 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -44,22 +44,22 @@ public: virtual ~ScVbaName(); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); - virtual void SAL_CALL setNameLocal( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); + virtual void SAL_CALL setNameLocal( const OUString &rName ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const ::rtl::OUString &rValue ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersTo( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersToLocal( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersToR1C1( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersToR1C1Local( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException); + virtual void SAL_CALL setValue( const OUString &rValue ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException); virtual void SAL_CALL setRefersToRange( const css::uno::Reference< ov::excel::XRange > xRange ) throw (css::uno::RuntimeException); @@ -67,8 +67,8 @@ public: virtual void SAL_CALL Delete() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SC_VBA_NAME_HXX */ diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index a274a0fa1e06..8ee94165a6cb 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.hxx @@ -66,8 +66,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // ScVbaNames_BASE - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SC_VBA_NAMES_HXX */ diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index 456629f6b8c1..0210fe1b0c70 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.cxx @@ -43,7 +43,7 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW ); uno::Reference xModel( xChild->getParent(), uno::UNO_QUERY_THROW ); uno::Reference xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); m_xControl.set( xControlProvider->createControl( xControlShape, xModel ) ); } @@ -68,14 +68,14 @@ ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException) sal_Bool SAL_CALL ScVbaOLEObject::getVisible() throw (uno::RuntimeException) { - OSL_TRACE("OleObject %s returning visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" ); + OSL_TRACE("OleObject %s returning visible %s", OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" ); return m_xControl->getVisible(); } void SAL_CALL ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) { - OSL_TRACE("OleObject %s set visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" ); + OSL_TRACE("OleObject %s set visible %s", OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" ); m_xControl->setVisible( _visible ); } @@ -128,30 +128,30 @@ ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException) m_xControl->setWidth( _width ); } -rtl::OUString SAL_CALL ScVbaOLEObject::getLinkedCell() throw (uno::RuntimeException) +OUString SAL_CALL ScVbaOLEObject::getLinkedCell() throw (uno::RuntimeException) { return m_xControl->getControlSource(); } -void SAL_CALL ScVbaOLEObject::setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (uno::RuntimeException) +void SAL_CALL ScVbaOLEObject::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException) { m_xControl->setControlSource( _linkedcell ); } -rtl::OUString +OUString ScVbaOLEObject::getServiceImplName() { - return rtl::OUString("ScVbaOLEObject"); + return OUString("ScVbaOLEObject"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaOLEObject::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObject" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.OLEObject" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index 40596383caf2..0f99da573587 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -32,8 +32,8 @@ class ScVbaOLEObject : public OLEObjectImpl_BASE { protected: css::uno::Reference< css::drawing::XControlShape > m_xControlShape; - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); css::uno::Reference< ov::msforms::XControl> m_xControl; public: ScVbaOLEObject( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, @@ -54,8 +54,8 @@ public: virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException); virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException); virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException); }; #endif //SC_VBA_OLEOBJECT_HXX diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 7b1c44fd94ad..968db0b1cc61 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -126,7 +126,7 @@ ScVbaOLEObjects::createCollectionObject( const css::uno::Any& aSource ) } uno::Any -ScVbaOLEObjects::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException) +ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) throw (uno::RuntimeException) { try { @@ -158,20 +158,20 @@ ScVbaOLEObjects::getElementType() throw (uno::RuntimeException) return ooo::vba::excel::XOLEObject::static_type(0); } -rtl::OUString +OUString ScVbaOLEObjects::getServiceImplName() { - return rtl::OUString("ScVbaOLEObjects"); + return OUString("ScVbaOLEObjects"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaOLEObjects::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObjects" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.OLEObjects" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx index 2583aa01202e..074c572c4155 100644 --- a/sc/source/ui/vba/vbaoleobjects.hxx +++ b/sc/source/ui/vba/vbaoleobjects.hxx @@ -30,9 +30,9 @@ typedef CollTestImplHelper< ov::excel::XOLEObjects > OLEObjectsImpl_BASE; class ScVbaOLEObjects : public OLEObjectsImpl_BASE { protected: - virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); public: ScVbaOLEObjects( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx index 29cbd0e09434..67ea4a6b9a94 100644 --- a/sc/source/ui/vba/vbaoutline.cxx +++ b/sc/source/ui/vba/vbaoutline.cxx @@ -37,20 +37,20 @@ ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevel } } -rtl::OUString +OUString ScVbaOutline::getServiceImplName() { - return rtl::OUString("ScVbaOutline"); + return OUString("ScVbaOutline"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaOutline::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Outline" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Outline" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx index 48c9a609fbd7..a81aeb937297 100644 --- a/sc/source/ui/vba/vbaoutline.hxx +++ b/sc/source/ui/vba/vbaoutline.hxx @@ -38,8 +38,8 @@ public: virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException) ; // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index 611c568243e6..780ed0e5467a 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -36,7 +36,7 @@ ScVbaPageBreak::ScVbaPageBreak( const uno::Reference< XHelperInterface >& template< typename Ifc1 > sal_Int32 ScVbaPageBreak::getType() throw (uno::RuntimeException) { - uno::Any aValue = mxRowColPropertySet->getPropertyValue( rtl::OUString( "IsStartOfNewPage" )); + uno::Any aValue = mxRowColPropertySet->getPropertyValue( OUString( "IsStartOfNewPage" )); sal_Bool hasPageBreak = false; aValue >>= hasPageBreak; @@ -56,16 +56,16 @@ void ScVbaPageBreak::setType(sal_Int32 type) throw (uno::RuntimeException) (type != excel::XlPageBreak::xlPageBreakManual) && (type != excel::XlPageBreak::xlPageBreakAutomatic) ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } if( type == excel::XlPageBreak::xlPageBreakNone ) { - mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); return; } - mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); + mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); if( type == excel::XlPageBreak::xlPageBreakManual ) maTablePageBreakData.ManualBreak = sal_True; else @@ -75,7 +75,7 @@ void ScVbaPageBreak::setType(sal_Int32 type) throw (uno::RuntimeException) template< typename Ifc1 > void ScVbaPageBreak::Delete() throw ( script::BasicErrorException, uno::RuntimeException) { - mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); } template< typename Ifc1 > @@ -86,21 +86,21 @@ uno::Reference< excel::XRange> ScVbaPageBreak::Location() throw ( script:: } template< typename Ifc1 > -rtl::OUString +OUString ScVbaPageBreak::getServiceImplName() { - return rtl::OUString("ScVbaPageBreak"); + return OUString("ScVbaPageBreak"); } template< typename Ifc1 > -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPageBreak::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PageBreak" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.PageBreak" ); } return aServiceNames; } @@ -108,20 +108,20 @@ ScVbaPageBreak::getServiceNames() template class ScVbaPageBreak< excel::XHPageBreak >; /* class ScVbaHPageBreak */ -rtl::OUString +OUString ScVbaHPageBreak::getServiceImplName() { - return rtl::OUString("ScVbaHPageBreak"); + return OUString("ScVbaHPageBreak"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaHPageBreak::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.HPageBreak" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.HPageBreak" ); } return aServiceNames; } @@ -141,20 +141,20 @@ ScVbaVPageBreak::~ScVbaVPageBreak() { } -rtl::OUString +OUString ScVbaVPageBreak::getServiceImplName() { - return rtl::OUString("ScVbaVPageBreak"); + return OUString("ScVbaVPageBreak"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaVPageBreak::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.VPageBreak" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.VPageBreak" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index 4256c61cf317..aa33b2191469 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -51,8 +51,8 @@ public: virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; @@ -70,8 +70,8 @@ public: virtual ~ScVbaHPageBreak(){} // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; //VPageBreak @@ -88,8 +88,8 @@ public: virtual ~ScVbaVPageBreak(); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 8c6806e1992a..d7ac4a05c336 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -152,7 +152,7 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI if( nPos >= nUsedStart ) index++; if( nPos > nUsedEnd ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); if( index == nAPIItemIndex ) return aTablePageBreakData; } @@ -166,13 +166,13 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script Before >>= xRange; if( !xRange.is() ) { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); } sal_Int32 nAPIRowColIndex = getAPIStartofRange( xRange ); uno::Reference< container::XIndexAccess > xIndexAccess = getRowColContainer(); uno::Reference< beans::XPropertySet > xRowColPropertySet( xIndexAccess->getByIndex(nAPIRowColIndex), uno::UNO_QUERY_THROW ); - xRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); + xRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); sheet::TablePageBreakData aTablePageBreakData; aTablePageBreakData.ManualBreak = sal_True; aTablePageBreakData.Position = nAPIRowColIndex; @@ -237,20 +237,20 @@ ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException) return excel::XHPageBreak::static_type(0); } -rtl::OUString +OUString ScVbaHPageBreaks::getServiceImplName() { - return rtl::OUString("ScVbaHPageBreaks"); + return OUString("ScVbaHPageBreaks"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaHPageBreaks::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.HPageBreaks" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.HPageBreaks" ); } return aServiceNames; } @@ -297,20 +297,20 @@ ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException ) return excel::XVPageBreak::static_type( 0 ); } -rtl::OUString +OUString ScVbaVPageBreaks::getServiceImplName() { - return rtl::OUString("ScVbaVPageBreaks"); + return OUString("ScVbaVPageBreaks"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaVPageBreaks::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.VPageBreaks" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.VPageBreaks" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index 3e28da557fa3..9fec6397056c 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.hxx @@ -55,8 +55,8 @@ public: virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; //VPageBreaks @@ -82,8 +82,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index 4df0b92eb4bc..91a23d0fbc2c 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -38,7 +38,7 @@ using namespace ::ooo::vba; #define ZOOM_IN 10 #define ZOOM_MAX 400 -bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ); +bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ); ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, @@ -49,19 +49,19 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent // query for current page style mxModel.set( xModel, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xSheetProps( mxSheet, uno::UNO_QUERY_THROW ); - uno::Any aValue = xSheetProps->getPropertyValue( rtl::OUString( "PageStyle" )); - rtl::OUString aStyleName; + uno::Any aValue = xSheetProps->getPropertyValue( OUString( "PageStyle" )); + OUString aStyleName; aValue >>= aStyleName; uno::Reference< style::XStyleFamiliesSupplier > xStyleFamiliesSup( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xStyleFamilies = xStyleFamiliesSup->getStyleFamilies(); - uno::Reference< container::XNameAccess > xPageStyle( xStyleFamilies->getByName(rtl::OUString( "PageStyles")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xPageStyle( xStyleFamilies->getByName(OUString( "PageStyles")), uno::UNO_QUERY_THROW ); mxPageProps.set( xPageStyle->getByName(aStyleName), uno::UNO_QUERY_THROW ); mnOrientLandscape = excel::XlPageOrientation::xlLandscape; mnOrientPortrait = excel::XlPageOrientation::xlPortrait; } -rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException) { String aPrintArea; uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW ); @@ -86,11 +86,11 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeEx return aPrintArea; } -void SAL_CALL ScVbaPageSetup::setPrintArea( const rtl::OUString& rAreas ) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException) { uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW ); if( rAreas.isEmpty() || - rAreas.equalsIgnoreAsciiCase ( rtl::OUString("FALSE") ) ) + rAreas.equalsIgnoreAsciiCase ( OUString("FALSE") ) ) { // print the whole sheet uno::Sequence< table::CellRangeAddress > aSeq; @@ -137,7 +137,7 @@ void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) throw (css::uno:: uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( rtl::OUString( "ScaleToPagesY")); + return mxPageProps->getPropertyValue( OUString( "ScaleToPagesY")); } void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) throw (css::uno::RuntimeException) @@ -151,7 +151,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) fitToPagesTall >>= scaleToPageY; } - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesY"), uno::makeAny( scaleToPageY )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesY"), uno::makeAny( scaleToPageY )); } catch( uno::Exception& ) { @@ -160,7 +160,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( rtl::OUString( "ScaleToPagesX")); + return mxPageProps->getPropertyValue( OUString( "ScaleToPagesX")); } void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) throw (css::uno::RuntimeException) @@ -174,7 +174,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) fitToPagesWide >>= scaleToPageX; } - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesX"), uno::makeAny( scaleToPageX )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesX"), uno::makeAny( scaleToPageX )); } catch( uno::Exception& ) { @@ -183,7 +183,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) uno::Any SAL_CALL ScVbaPageSetup::getZoom() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( rtl::OUString( "PageScale")); + return mxPageProps->getPropertyValue( OUString( "PageScale")); } void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::RuntimeException) @@ -197,7 +197,7 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru zoom >>= aValue; if( aValue ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } } else @@ -205,36 +205,36 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru zoom >>= pageScale; if(( pageScale < ZOOM_IN )||( pageScale > ZOOM_MAX )) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } } // these only exist in S08 sal_uInt16 nScale = 0; - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPages"), uno::makeAny( nScale )); - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesX"), uno::makeAny( nScale )); - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesY"), uno::makeAny( nScale )); + mxPageProps->setPropertyValue( OUString( "ScaleToPages"), uno::makeAny( nScale )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesX"), uno::makeAny( nScale )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesY"), uno::makeAny( nScale )); } catch( beans::UnknownPropertyException& ) { if( pageScale == 0 ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } } catch( uno::Exception& ) { } - mxPageProps->setPropertyValue( rtl::OUString( "PageScale"), uno::makeAny( pageScale )); + mxPageProps->setPropertyValue( OUString( "PageScale"), uno::makeAny( pageScale )); } -rtl::OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeException) { - rtl::OUString leftHeader; + OUString leftHeader; try { - uno::Reference xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getLeftText(); @@ -248,16 +248,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeE return leftHeader; } -void SAL_CALL ScVbaPageSetup::setLeftHeader( const rtl::OUString& leftHeader) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) throw (css::uno::RuntimeException) { try { - uno::Reference xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getLeftText(); xText->setString( leftHeader ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -265,12 +265,12 @@ void SAL_CALL ScVbaPageSetup::setLeftHeader( const rtl::OUString& leftHeader) th } } -rtl::OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeException) { - rtl::OUString centerHeader; + OUString centerHeader; try { - uno::Reference xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getCenterText(); @@ -284,16 +284,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::Runtim return centerHeader; } -void SAL_CALL ScVbaPageSetup::setCenterHeader( const rtl::OUString& centerHeader) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) throw (css::uno::RuntimeException) { try { - uno::Reference xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getCenterText(); xText->setString( centerHeader ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -301,12 +301,12 @@ void SAL_CALL ScVbaPageSetup::setCenterHeader( const rtl::OUString& centerHeader } } -rtl::OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeException) { - rtl::OUString rightHeader; + OUString rightHeader; try { - uno::Reference xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getRightText(); @@ -320,16 +320,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::Runtime return rightHeader; } -void SAL_CALL ScVbaPageSetup::setRightHeader( const rtl::OUString& rightHeader) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) throw (css::uno::RuntimeException) { try { - uno::Reference xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getRightText(); xText->setString( rightHeader ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -337,12 +337,12 @@ void SAL_CALL ScVbaPageSetup::setRightHeader( const rtl::OUString& rightHeader) } } -rtl::OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeException) { - rtl::OUString leftFooter; + OUString leftFooter; try { - uno::Reference xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getLeftText(); @@ -356,16 +356,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeE return leftFooter; } -void SAL_CALL ScVbaPageSetup::setLeftFooter( const rtl::OUString& leftFooter) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) throw (css::uno::RuntimeException) { try { - uno::Reference xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getLeftText(); xText->setString( leftFooter ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -373,12 +373,12 @@ void SAL_CALL ScVbaPageSetup::setLeftFooter( const rtl::OUString& leftFooter) th } } -rtl::OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeException) { - rtl::OUString centerFooter; + OUString centerFooter; try { - uno::Reference xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getCenterText(); @@ -392,16 +392,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::Runtim return centerFooter; } -void SAL_CALL ScVbaPageSetup::setCenterFooter( const rtl::OUString& centerFooter) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) throw (css::uno::RuntimeException) { try { - uno::Reference xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getCenterText(); xText->setString( centerFooter ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -410,12 +410,12 @@ void SAL_CALL ScVbaPageSetup::setCenterFooter( const rtl::OUString& centerFooter } -rtl::OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeException) { - rtl::OUString rightFooter; + OUString rightFooter; try { - uno::Reference xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getRightText(); @@ -429,16 +429,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::Runtime return rightFooter; } -void SAL_CALL ScVbaPageSetup::setRightFooter( const rtl::OUString& rightFooter) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) throw (css::uno::RuntimeException) { try { - uno::Reference xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getRightText(); xText->setString( rightFooter ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -451,7 +451,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException) sal_Int32 order = excel::XlOrder::xlDownThenOver; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "PrintDownFirst")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "PrintDownFirst")); sal_Bool bPrintDownFirst = false; aValue >>= bPrintDownFirst; if( !bPrintDownFirst ) @@ -475,12 +475,12 @@ void SAL_CALL ScVbaPageSetup::setOrder( sal_Int32 order) throw (css::uno::Runtim bOrder = false; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } try { - mxPageProps->setPropertyValue( rtl::OUString( "PrintDownFirst"), uno::makeAny( bOrder )); + mxPageProps->setPropertyValue( OUString( "PrintDownFirst"), uno::makeAny( bOrder )); } catch( uno::Exception& ) { @@ -492,7 +492,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime sal_Int16 number = 0; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "FirstPageNumber")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "FirstPageNumber")); aValue >>= number; } catch( uno::Exception& ) @@ -510,7 +510,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) throw (css::uno::RuntimeException) { if( firstPageNumber < 0 ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); if( firstPageNumber == excel::Constants::xlAutomatic ) firstPageNumber = 0; @@ -518,7 +518,7 @@ void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) thr { uno::Any aValue; aValue <<= (sal_Int16)firstPageNumber; - mxPageProps->setPropertyValue( rtl::OUString( "FirstPageNumber"), aValue ); + mxPageProps->setPropertyValue( OUString( "FirstPageNumber"), aValue ); } catch( uno::Exception& ) { @@ -530,7 +530,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::Runtime sal_Bool centerVertically = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "CenterVertically")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "CenterVertically")); aValue >>= centerVertically; } catch( uno::Exception& ) @@ -543,7 +543,7 @@ void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) th { try { - mxPageProps->setPropertyValue( rtl::OUString( "CenterVertically"), uno::makeAny( centerVertically )); + mxPageProps->setPropertyValue( OUString( "CenterVertically"), uno::makeAny( centerVertically )); } catch( uno::Exception& ) { @@ -555,7 +555,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::Runti sal_Bool centerHorizontally = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "CenterHorizontally")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "CenterHorizontally")); aValue >>= centerHorizontally; } catch( uno::Exception& ) @@ -568,7 +568,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally { try { - mxPageProps->setPropertyValue( rtl::OUString( "CenterHorizontally"), uno::makeAny( centerHorizontally )); + mxPageProps->setPropertyValue( OUString( "CenterHorizontally"), uno::makeAny( centerHorizontally )); } catch( uno::Exception& ) { @@ -580,7 +580,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeExc sal_Bool printHeadings = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "PrintHeaders")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "PrintHeaders")); aValue >>= printHeadings; } catch( uno::Exception& ) @@ -593,27 +593,27 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c { try { - mxPageProps->setPropertyValue( rtl::OUString( "PrintHeaders"), uno::makeAny( printHeadings )); + mxPageProps->setPropertyValue( OUString( "PrintHeaders"), uno::makeAny( printHeadings )); } catch( uno::Exception& ) { } } -rtl::OUString +OUString ScVbaPageSetup::getServiceImplName() { - return rtl::OUString("ScVbaPageSetup"); + return OUString("ScVbaPageSetup"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPageSetup::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.PageSetup" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.PageSetup" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index 38ca4613a6a0..ffa33b5addd1 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.hxx @@ -40,8 +40,8 @@ public: virtual ~ScVbaPageSetup(){} // Attribute - virtual rtl::OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException); - virtual void SAL_CALL setPrintArea( const rtl::OUString& rAreas ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException); + virtual void SAL_CALL setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException); virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException); void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException); double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException); @@ -52,18 +52,18 @@ public: virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException); virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLeftHeader( const rtl::OUString& leftHeader ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCenterHeader( const rtl::OUString& centerHeader ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRightHeader( const rtl::OUString& rightHeader ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLeftFooter( const rtl::OUString& leftFooter ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCenterFooter( const rtl::OUString& centerFooter ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRightFooter( const rtl::OUString& rightFooter ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException); + virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException); + virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getOrder() throw (css::uno::RuntimeException); virtual void SAL_CALL setOrder( sal_Int32 order ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getFirstPageNumber() throw (css::uno::RuntimeException); @@ -76,8 +76,8 @@ public: virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index fc43d9e9300c..b9fa93374473 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -97,8 +97,8 @@ ScVbaPalette::getPalette() const if ( m_pShell ) xProps.set( m_pShell->GetModel(), uno::UNO_QUERY_THROW ); else - throw uno::RuntimeException( rtl::OUString( "Can't extract palette, no doc shell" ), uno::Reference< uno::XInterface >() ); - xIndex.set( xProps->getPropertyValue( rtl::OUString("ColorPalette") ), uno::UNO_QUERY ); + throw uno::RuntimeException( OUString( "Can't extract palette, no doc shell" ), uno::Reference< uno::XInterface >() ); + xIndex.set( xProps->getPropertyValue( OUString("ColorPalette") ), uno::UNO_QUERY ); if ( !xIndex.is() ) return new DefaultPalette(); return xIndex; diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx index 3a8bcd856d5a..01734f6649ec 100644 --- a/sc/source/ui/vba/vbapane.cxx +++ b/sc/source/ui/vba/vbapane.cxx @@ -48,7 +48,7 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti { if( _scrollcolumn < 1 ) { - throw uno::RuntimeException( rtl::OUString( "Column number should not less than 1" ), + throw uno::RuntimeException( OUString( "Column number should not less than 1" ), uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleColumn( _scrollcolumn - 1 ); @@ -65,7 +65,7 @@ ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException) { if( _scrollrow < 1 ) { - throw uno::RuntimeException( rtl::OUString( "Row number should not less than 1" ), + throw uno::RuntimeException( OUString( "Row number should not less than 1" ), uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleRow( _scrollrow - 1 ); @@ -88,7 +88,7 @@ ScVbaPane::getVisibleRange() throw (uno::RuntimeException) void SAL_CALL ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException) { - rtl::OUString messageBuffer; + OUString messageBuffer; sal_Int32 downRows = 0; sal_Int32 rightCols = 0; table::CellRangeAddress visibleRange = m_xViewPane->getVisibleRange(); @@ -99,7 +99,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Down >>= down ) downRows += down; else - messageBuffer += rtl::OUString( "Error getting parameter: Down\n" ); + messageBuffer += OUString( "Error getting parameter: Down\n" ); } if( Up.hasValue() ) { @@ -107,7 +107,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Up >>= up ) downRows -= up; else - messageBuffer += rtl::OUString( "Error getting parameter: Up\n" ); + messageBuffer += OUString( "Error getting parameter: Up\n" ); } if( ToRight.hasValue() ) { @@ -115,7 +115,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToRight >>= right ) rightCols += right; else - messageBuffer += rtl::OUString( "Error getting parameter: ToRight\n" ); + messageBuffer += OUString( "Error getting parameter: ToRight\n" ); } if( ToLeft.hasValue() ) { @@ -123,7 +123,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToLeft >>= left ) rightCols -= left; else - messageBuffer += rtl::OUString( "Error getting parameter: ToLeft\n" ); + messageBuffer += OUString( "Error getting parameter: ToLeft\n" ); } if( !messageBuffer.isEmpty() ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); @@ -141,7 +141,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any void SAL_CALL ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException) { - rtl::OUString messageBuffer; + OUString messageBuffer; table::CellRangeAddress visibleRange = m_xViewPane->getVisibleRange(); sal_Int32 vertPageSize = 1 + visibleRange.EndRow - visibleRange.StartRow; @@ -154,7 +154,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Down >>= down ) downPages += down; else - messageBuffer += rtl::OUString( "Error getting parameter: Down\n" ); + messageBuffer += OUString( "Error getting parameter: Down\n" ); } if( Up.hasValue() ) { @@ -162,7 +162,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Up >>= up ) downPages -= up; else - messageBuffer += rtl::OUString( "Error getting parameter: Up\n" ); + messageBuffer += OUString( "Error getting parameter: Up\n" ); } if( ToRight.hasValue() ) { @@ -170,7 +170,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToRight >>= right ) acrossPages += right; else - messageBuffer += rtl::OUString( "Error getting parameter: ToRight\n" ); + messageBuffer += OUString( "Error getting parameter: ToRight\n" ); } if( ToLeft.hasValue() ) { @@ -178,7 +178,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToLeft >>= left ) acrossPages -= left; else - messageBuffer += rtl::OUString( "Error getting parameter: ToLeft\n" ); + messageBuffer += OUString( "Error getting parameter: ToLeft\n" ); } if( !messageBuffer.isEmpty() ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index a37473e10349..d03f2ebdef02 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -32,20 +32,20 @@ ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException) m_xTable->refresh(); } -rtl::OUString +OUString ScVbaPivotCache::getServiceImplName() { - return rtl::OUString("ScVbaPivotCache"); + return OUString("ScVbaPivotCache"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPivotCache::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PivotCache" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.PivotCache" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx index 6c0653891fd8..66b29c36cb3e 100644 --- a/sc/source/ui/vba/vbapivotcache.hxx +++ b/sc/source/ui/vba/vbapivotcache.hxx @@ -35,8 +35,8 @@ public: virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SC_VBA_PIVOTCACHE_HXX diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index 97ce5e200ad5..14343b34b795 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -35,20 +35,20 @@ ScVbaPivotTable::PivotCache() throw (uno::RuntimeException) return new ScVbaPivotCache( uno::Reference< XHelperInterface >(), mxContext, m_xTable ); } -rtl::OUString +OUString ScVbaPivotTable::getServiceImplName() { - return rtl::OUString("ScVbaPivotTable"); + return OUString("ScVbaPivotTable"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPivotTable::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PivotTable" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.PivotTable" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx index 26bbcdc8b18c..d58ba7a7eb07 100644 --- a/sc/source/ui/vba/vbapivottable.hxx +++ b/sc/source/ui/vba/vbapivottable.hxx @@ -34,8 +34,8 @@ public: ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SC_VBA_PIVOTTABLE_HXX diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index ffa5e173c385..e013c1a8ad3b 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -66,20 +66,20 @@ ScVbaPivotTables::getElementType() throw (uno::RuntimeException) return excel::XPivotTable::static_type(0); } -rtl::OUString +OUString ScVbaPivotTables::getServiceImplName() { - return rtl::OUString("ScVbaPivotTables"); + return OUString("ScVbaPivotTables"); } -css::uno::Sequence +css::uno::Sequence ScVbaPivotTables::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.PivotTables"); + sNames[0] = OUString("ooo.vba.excel.PivotTables"); } return sNames; } diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index 43de737d508d..1baa3ef01a76 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -34,7 +34,7 @@ typedef CollTestImplHelper< ov::excel::XPivotTables > ScVbaPivotTables_BASE; class ScVbaPivotTables : public ScVbaPivotTables_BASE { - virtual css::uno::Sequence getServiceNames(); + virtual css::uno::Sequence getServiceNames(); public: ScVbaPivotTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); @@ -50,7 +50,7 @@ public: // ScVbaPivotTables_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); + virtual OUString getServiceImplName(); }; diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx index c4c8136a436e..0cdd5fb836a9 100644 --- a/sc/source/ui/vba/vbapropvalue.hxx +++ b/sc/source/ui/vba/vbapropvalue.hxx @@ -43,7 +43,7 @@ public: virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return OUString("Value"); } }; #endif //SC_VBA_PROPVALULE_HXX diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index f3383326329a..85305e52904f 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -248,7 +248,7 @@ ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException return ScCellRangesBase::getImplementation( mxRanges ); if( mxRange.is() ) return ScCellRangesBase::getImplementation( mxRange ); - throw uno::RuntimeException( rtl::OUString("General Error creating range - Unknown" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("General Error creating range - Unknown" ), uno::Reference< uno::XInterface >() ); } ScCellRangeObj* ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException ) @@ -260,7 +260,7 @@ SfxItemSet* ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) - throw uno::RuntimeException( rtl::OUString( "Can't access Itemset for range" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't access Itemset for range" ), uno::Reference< uno::XInterface >() ); return pDataSet; } @@ -364,9 +364,9 @@ public: virtual uno::Any createCollectionObject( const uno::Any& aSource ); - virtual rtl::OUString getServiceImplName() { return rtl::OUString(); } + virtual OUString getServiceImplName() { return OUString(); } - virtual uno::Sequence< rtl::OUString > getServiceNames() { return uno::Sequence< rtl::OUString >(); } + virtual uno::Sequence< OUString > getServiceNames() { return uno::Sequence< OUString >(); } }; @@ -389,7 +389,7 @@ getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::R { ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf ); if ( !pUno ) - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); return pUno->GetDocShell(); } @@ -427,7 +427,7 @@ getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange ) { ScDocShell* pDocShell = getDocShellFromRange( xRange ); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying docshell from uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying docshell from uno range object" ), uno::Reference< uno::XInterface >() ); ScDocument* pDoc = pDocShell->GetDocument(); return pDoc; } @@ -480,14 +480,14 @@ const ScRangeList& ScVbaRange::getScRangeList() throw (uno::RuntimeException) { if( ScCellRangesBase* pScRangesBase = getCellRangesBase() ) return pScRangesBase->GetRangeList(); - throw uno::RuntimeException( ::rtl::OUString( "Cannot obtain UNO range implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain UNO range implementation object" ), uno::Reference< uno::XInterface >() ); } const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) { if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) ) return pScVbaRange->getScRangeList(); - throw uno::RuntimeException( ::rtl::OUString( "Cannot obtain VBA range implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain VBA range implementation object" ), uno::Reference< uno::XInterface >() ); } @@ -532,7 +532,7 @@ public: return false; } - rtl::OUString getNumberFormatString() + OUString getNumberFormatString() { uno::Reference< uno::XInterface > xIf( mxRangeProps, uno::UNO_QUERY_THROW ); ScCellRangesBase* pUnoCellRange = ScCellRangesBase::getImplementation( xIf ); @@ -544,12 +544,12 @@ public: // one of the cells in the range is not like the other ;-) // so return a zero length format to indicate that if ( eState == SFX_ITEM_DONTCARE ) - return rtl::OUString(); + return OUString(); } uno::Reference< beans::XPropertySet > xNumberProps( getNumberProps(), uno::UNO_QUERY_THROW ); - ::rtl::OUString aFormatString; + OUString aFormatString; uno::Any aString = xNumberProps->getPropertyValue( "FormatString" ); aString >>= aFormatString; return aFormatString; @@ -563,7 +563,7 @@ public: return nType; } - bool setNumberFormat( const rtl::OUString& rFormat ) + bool setNumberFormat( const OUString& rFormat ) { // #163288# treat "General" as "Standard" format sal_Int32 nNewIndex = 0; @@ -692,19 +692,19 @@ public: }; -const static ::rtl::OUString ISVISIBLE( "IsVisible"); -const static ::rtl::OUString POSITION( "Position"); -const static rtl::OUString EQUALS( "=" ); -const static rtl::OUString NOTEQUALS( "<>" ); -const static rtl::OUString GREATERTHAN( ">" ); -const static rtl::OUString GREATERTHANEQUALS( ">=" ); -const static rtl::OUString LESSTHAN( "<" ); -const static rtl::OUString LESSTHANEQUALS( "<=" ); -const static rtl::OUString CONTS_HEADER( "ContainsHeader" ); -const static rtl::OUString INSERTPAGEBREAKS( "InsertPageBreaks" ); -const static rtl::OUString STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY( "The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again" ); -const static rtl::OUString STR_ERRORMESSAGE_NOCELLSWEREFOUND( "No cells were found" ); -const static rtl::OUString CELLSTYLE( "CellStyle" ); +const static OUString ISVISIBLE( "IsVisible"); +const static OUString POSITION( "Position"); +const static OUString EQUALS( "=" ); +const static OUString NOTEQUALS( "<>" ); +const static OUString GREATERTHAN( ">" ); +const static OUString GREATERTHANEQUALS( ">=" ); +const static OUString LESSTHAN( "<" ); +const static OUString LESSTHANEQUALS( "<=" ); +const static OUString CONTS_HEADER( "ContainsHeader" ); +const static OUString INSERTPAGEBREAKS( "InsertPageBreaks" ); +const static OUString STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY( "The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again" ); +const static OUString STR_ERRORMESSAGE_NOCELLSWEREFOUND( "No cells were found" ); +const static OUString CELLSTYLE( "CellStyle" ); class CellValueSetter : public ValueSetter { @@ -750,7 +750,7 @@ CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< tab } case uno::TypeClass_STRING: { - rtl::OUString aString; + OUString aString; if ( aValue >>= aString ) { // The required behavior for a string value is: @@ -762,7 +762,7 @@ CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< tab if ( aString.toChar() == '\'' ) // case 1 - handle with XTextRange { - rtl::OUString aRemainder( aString.copy(1) ); // strip the quote + OUString aRemainder( aString.copy(1) ); // strip the quote uno::Reference< text::XTextRange > xTextRange( xCell, uno::UNO_QUERY_THROW ); xTextRange->setString( aRemainder ); } @@ -820,7 +820,7 @@ void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< if ( eType == table::CellContentType_FORMULA ) { - rtl::OUString sFormula = xCell->getFormula(); + OUString sFormula = xCell->getFormula(); if ( sFormula == "=TRUE()" ) aValue <<= sal_True; else if ( sFormula == "=FALSE()" ) @@ -872,7 +872,7 @@ public: protected: bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) { - rtl::OUString sFormula; + OUString sFormula; double aDblValue = 0.0; if ( aValue >>= sFormula ) { @@ -923,7 +923,7 @@ public: { uno::Any aValue; aValue <<= xCell->getFormula(); - rtl::OUString sVal; + OUString sVal; aValue >>= sVal; uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW ); ScCellRangesBase* pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() ); @@ -978,7 +978,7 @@ public: }; -const static rtl::OUString sNA("#N/A"); +const static OUString sNA("#N/A"); class Dim1ArrayValueSetter : public ArrayVisitor { @@ -1146,7 +1146,7 @@ public: }; bool -ScVbaRange::getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter ) +ScVbaRange::getCellRangesForAddress( sal_uInt16& rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter ) { ScDocument* pDoc = NULL; @@ -1163,32 +1163,32 @@ ScVbaRange::getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& return false; } -bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) +bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) { // see if there is a match with a named range uno::Reference< beans::XPropertySet > xProps( pDocSh->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xNameAccess( xProps->getPropertyValue( "NamedRanges" ), uno::UNO_QUERY_THROW ); // Strangly enough you can have Range( "namedRange1, namedRange2, etc," ) // loop around each ',' separated name - std::vector< rtl::OUString > vNames; + std::vector< OUString > vNames; sal_Int32 nIndex = 0; do { - rtl::OUString aToken = sName.getToken( 0, ',', nIndex ); + OUString aToken = sName.getToken( 0, ',', nIndex ); vNames.push_back( aToken ); } while ( nIndex >= 0 ); if ( vNames.empty() ) vNames.push_back( sName ); - std::vector< rtl::OUString >::iterator it = vNames.begin(); - std::vector< rtl::OUString >::iterator it_end = vNames.end(); + std::vector< OUString >::iterator it = vNames.begin(); + std::vector< OUString >::iterator it_end = vNames.end(); for ( ; it != it_end; ++it ) { formula::FormulaGrammar::AddressConvention eConv = aConv; // spaces are illegal ( but the user of course can enter them ) - rtl::OUString sAddress = (*it).trim(); + OUString sAddress = (*it).trim(); // if a local name ( on the active sheet ) exists this will // take precedence over a global with the same name bool bLocalName = false; @@ -1241,7 +1241,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S ScVbaRange* -getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) +getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) { ScRangeList aCellRanges; ScRange refRange; @@ -1301,10 +1301,10 @@ uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive ) throw (uno::RuntimeException) { if( !rxCellRanges.is() ) - throw uno::RuntimeException( rtl::OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); sal_Int32 nCount = rxCellRanges->getCount(); if( nCount < 1 ) - throw uno::RuntimeException( rtl::OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); ScRangeList aScRanges; for( sal_Int32 nIndex = 0; nIndex < nCount; ++nIndex ) @@ -1371,7 +1371,7 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC css::uno::Reference< excel::XRange > ScVbaRange::getRangeObjectForName( - const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sRangeName, + const uno::Reference< uno::XComponentContext >& xContext, const OUString& sRangeName, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) throw ( uno::RuntimeException ) { table::CellRangeAddress refAddr; @@ -1385,7 +1385,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, { case uno::TypeClass_STRING: { - rtl::OUString rString; + OUString rString; aParam >>= rString; ScRangeList aCellRanges; ScRange refRange; @@ -1408,7 +1408,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, break; } default: - throw uno::RuntimeException( rtl::OUString( "Can't extact CellRangeAddress from type" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't extact CellRangeAddress from type" ), uno::Reference< uno::XInterface >() ); } return lclGetRangeAddress( xRangeParam ); } @@ -1419,7 +1419,7 @@ lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW ); ScDocument* pDoc = getDocumentFromRange(xRange); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); uno::Reference< XCollection > borders( new ScVbaBorders( xParent, xContext, xRange, aPalette ) ); return borders; @@ -1448,9 +1448,9 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const mbIsColumns( bIsColumns ) { if ( !xContext.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "context is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( OUString( "context is not set " ), uno::Reference< uno::XInterface >() , 1 ); if ( !xRange.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxParent, mxContext, xRange ) ); m_Areas = new ScVbaRangeAreas( mxParent, mxContext, xIndex, mbIsRows, mbIsColumns ); @@ -1562,7 +1562,7 @@ ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter, bool bFi catch ( const uno::Exception& e ) { OSL_TRACE("Bahhh, caught exception %s", - rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -1851,7 +1851,7 @@ ScVbaRange::FillDown() throw (uno::RuntimeException) sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } -::rtl::OUString +OUString ScVbaRange::getText() throw (uno::RuntimeException) { // #TODO code within the test below "if ( m_Areas.... " can be removed @@ -1983,7 +1983,7 @@ ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeExcepti setFormula( rFormula ); } -::rtl::OUString +OUString ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno::RuntimeException) { // #TODO code within the test below "if ( m_Areas.... " can be removed @@ -1997,7 +1997,7 @@ ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno } long nIndex = 0, nCount = 0; - ::rtl::OUString rString; + OUString rString; uno::Reference< text::XTextRange > xTextRange(mxRange, ::uno::UNO_QUERY_THROW ); rString = xTextRange->getString(); if( !( Start >>= nIndex ) && !( Length >>= nCount ) ) @@ -2009,13 +2009,13 @@ ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno return rString.copy( --nIndex, nCount ); // Zero value indexing } -::rtl::OUString +OUString ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo ) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) { // Multi-Area Range - rtl::OUString sAddress; + OUString sAddress; uno::Reference< XCollection > xCollection( m_Areas, uno::UNO_QUERY_THROW ); uno::Any aExternalCopy = External; for ( sal_Int32 index = 1; index <= xCollection->getCount(); ++index ) @@ -2023,7 +2023,7 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut uno::Reference< excel::XRange > xRange( xCollection->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW ); if ( index > 1 ) { - sAddress += rtl::OUString( ',' ); + sAddress += OUString( ',' ); // force external to be false // only first address should have the // document and sheet specifications @@ -2096,7 +2096,7 @@ ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException) else if ( mxRanges.is() ) xProps.set(mxRanges, ::uno::UNO_QUERY ); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); ScCellRangeObj* pRangeObj = NULL; @@ -2162,7 +2162,7 @@ ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent, if ( bIsColumnIndex ) { // Column index can be a col address e.g Cells( 1, "B" ) etc. - rtl::OUString sCol; + OUString sCol; if ( nColumnIndex >>= sCol ) { ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 ); @@ -2218,7 +2218,7 @@ ScVbaRange::Select() throw (uno::RuntimeException) { ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); if ( !pUnoRangesBase ) - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); ScDocShell* pShell = pUnoRangesBase->GetDocShell(); if ( pShell ) { @@ -2326,7 +2326,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException) uno::Reference< excel::XRange > ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) { - rtl::OUString sAddress; + OUString sAddress; if ( aIndex.hasValue() ) { @@ -2352,10 +2352,10 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) aRange.aEnd.SetRow( aRange.aStart.Row() + ( nEndRow - nStartRow )); } else - throw uno::RuntimeException( rtl::OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); if ( aRange.aStart.Row() < 0 || aRange.aEnd.Row() < 0 ) - throw uno::RuntimeException( rtl::OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); // return a normal range ( even for multi-selection uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) ); return new ScVbaRange( mxParent, mxContext, xRange, true ); @@ -2369,7 +2369,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Reference< excel::XRange > ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException) { - rtl::OUString sAddress; + OUString sAddress; ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); ScRangeList aCellRanges = pUnoRangesBase->GetRangeList(); @@ -2396,10 +2396,10 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException) aRange.aEnd.SetCol( aRange.aStart.Col() + ( nEndCol - nStartCol )); } else - throw uno::RuntimeException( rtl::OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); if ( aRange.aStart.Col() < 0 || aRange.aEnd.Col() < 0 ) - throw uno::RuntimeException( rtl::OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); } // Columns() - no params uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) ); @@ -2473,7 +2473,7 @@ void ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString("That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); if ( Destination.hasValue() ) { uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW ); @@ -2501,7 +2501,7 @@ void ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); if (Destination.hasValue()) { uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW ); @@ -2525,7 +2525,7 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException) void ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErrorException, uno::RuntimeException) { - rtl::OUString sFormat; + OUString sFormat; aFormat >>= sFormat; if ( m_Areas->getCount() > 1 ) { @@ -2564,7 +2564,7 @@ ScVbaRange::getNumberFormat() throw ( script::BasicErrorException, uno::RuntimeE return aResult; } NumFormatHelper numFormat( mxRange ); - rtl::OUString sFormat = numFormat.getNumberFormatString(); + OUString sFormat = numFormat.getNumberFormatString(); if ( !sFormat.isEmpty() ) return uno::makeAny( sFormat ); return aNULL(); @@ -2680,7 +2680,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI if( !Cell1.hasValue() ) throw uno::RuntimeException( - rtl::OUString( " Invalid Argument " ), + OUString( " Invalid Argument " ), uno::Reference< XInterface >() ); table::CellRangeAddress resultAddress; @@ -2690,7 +2690,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI // Cell1 defined only if ( !Cell2.hasValue() ) { - rtl::OUString sName; + OUString sName; Cell1 >>= sName; RangeHelper referRange( xReferrer ); table::CellRangeAddress referAddress = referRange.getCellRangeAddressable()->getRangeAddress(); @@ -2827,7 +2827,7 @@ void SAL_CALL ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (::com::sun::star::uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); ScDocShell* pShell = getScDocShell(); uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW ); @@ -2905,11 +2905,11 @@ ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException) throw uno::RuntimeException(); // workaround: Excel allows to create empty comment, Calc does not - ::rtl::OUString aNoteText; + OUString aNoteText; if( Text.hasValue() && !(Text >>= aNoteText) ) throw uno::RuntimeException(); if( aNoteText.isEmpty() ) - aNoteText = ::rtl::OUString( sal_Unicode( ' ' ) ); + aNoteText = OUString( sal_Unicode( ' ' ) ); // try to create a new annotation table::CellRangeAddress aRangePos = lclGetRangeAddress( mxRange ); @@ -2960,7 +2960,7 @@ ScVbaRange::getHidden() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = getRowOrColumnProps( mxRange, mbIsRows ); if ( !( xProps->getPropertyValue( ISVISIBLE ) >>= bIsVisible ) ) - throw uno::RuntimeException( rtl::OUString( "Failed to get IsVisible property"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to get IsVisible property"), uno::Reference< uno::XInterface >() ); } catch( const uno::Exception& e ) { @@ -2996,7 +2996,7 @@ ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException) } ::sal_Bool SAL_CALL -ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) throw (uno::RuntimeException) +ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) { @@ -3010,8 +3010,8 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace // sanity check required params if ( What.isEmpty() ) - throw uno::RuntimeException( rtl::OUString( "Range::Replace, missing params" ) , uno::Reference< uno::XInterface >() ); - rtl::OUString sWhat = VBAToRegexp( What); + throw uno::RuntimeException( OUString( "Range::Replace, missing params" ) , uno::Reference< uno::XInterface >() ); + OUString sWhat = VBAToRegexp( What); // #TODO #FIXME SearchFormat & ReplacesFormat are not processed // What do we do about MatchByte.. we don't seem to support that const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem(); @@ -3040,7 +3040,7 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace else if ( nLook == excel::XlLookAt::xlWhole ) bSearchWords = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); // set global search props ( affects the find dialog // and of course the defaults for this method newOptions.SetWordOnly( bSearchWords ); @@ -3056,7 +3056,7 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace else if ( nSearchOrder == excel::XlSearchOrder::xlByRows ) bSearchByRow = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); newOptions.SetRowDirection( bSearchByRow ); xDescriptor->setPropertyValue( SC_UNO_SRCHBYROW, uno::makeAny( bSearchByRow ) ); @@ -3082,7 +3082,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) throw (uno::RuntimeException) { // return a Range object that represents the first cell where that information is found. - rtl::OUString sWhat; + OUString sWhat; sal_Int32 nWhat = 0; double fWhat = 0.0; @@ -3090,20 +3090,20 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L if( What >>= sWhat ) { if( sWhat.isEmpty() ) - throw uno::RuntimeException( rtl::OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); } else if( What >>= nWhat ) { - sWhat = rtl::OUString::valueOf( nWhat ); + sWhat = OUString::valueOf( nWhat ); } else if( What >>= fWhat ) { - sWhat = rtl::OUString::valueOf( fWhat ); + sWhat = OUString::valueOf( fWhat ); } else - throw uno::RuntimeException( rtl::OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); - rtl::OUString sSearch = VBAToRegexp( sWhat ); + OUString sSearch = VBAToRegexp( sWhat ); const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem(); SvxSearchItem newOptions( globalSearchOptions ); @@ -3124,10 +3124,10 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L { // After must be a single cell in the range if( xAfterRange->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "After must be a single cell." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "After must be a single cell." ) , uno::Reference< uno::XInterface >() ); uno::Reference< excel::XRange > xCell( Cells( uno::makeAny( xAfterRange->getRow() ), uno::makeAny( xAfterRange->getColumn() ) ), uno::UNO_QUERY ); if( !xCell.is() ) - throw uno::RuntimeException( rtl::OUString( "After must be in range." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "After must be in range." ) , uno::Reference< uno::XInterface >() ); xStartCell.set( xAfterRange->getCellRange(), uno::UNO_QUERY_THROW ); } @@ -3150,7 +3150,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L nSearchType = SVX_SEARCHIN_VALUE; break; default: - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for LookIn." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookIn." ) , uno::Reference< uno::XInterface >() ); } newOptions.SetCellType( nSearchType ); xDescriptor->setPropertyValue( "SearchType", uno::makeAny( nSearchType ) ); @@ -3167,7 +3167,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if ( nLookAt == excel::XlLookAt::xlWhole ) bSearchWords = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); newOptions.SetWordOnly( bSearchWords ); xDescriptor->setPropertyValue( SC_UNO_SRCHWORDS, uno::makeAny( bSearchWords ) ); } @@ -3182,7 +3182,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if ( nSearchOrder == excel::XlSearchOrder::xlByRows ) bSearchByRow = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); newOptions.SetRowDirection( bSearchByRow ); xDescriptor->setPropertyValue( SC_UNO_SRCHBYROW, uno::makeAny( bSearchByRow ) ); @@ -3200,7 +3200,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if( nSearchDirection == excel::XlSearchDirection::xlPrevious ) bSearchBackwards = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for SearchDirection" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchDirection" ) , uno::Reference< uno::XInterface >() ); newOptions.SetBackward( bSearchBackwards ); xDescriptor->setPropertyValue( "SearchBackwards", uno::makeAny( bSearchBackwards ) ); } @@ -3212,7 +3212,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L { // SearchCaseSensitive if( !( MatchCase >>= bMatchCase ) ) - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for MatchCase" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for MatchCase" ) , uno::Reference< uno::XInterface >() ); } xDescriptor->setPropertyValue( SC_UNO_SRCHCASE, uno::makeAny( bMatchCase ) ); @@ -3253,17 +3253,17 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere { xKeyRange.set( Key, uno::UNO_QUERY_THROW ); } - else if ( Key.getValueType() == ::getCppuType( static_cast< const rtl::OUString* >(0) ) ) + else if ( Key.getValueType() == ::getCppuType( static_cast< const OUString* >(0) ) ) { - rtl::OUString sRangeName = ::comphelper::getString( Key ); + OUString sRangeName = ::comphelper::getString( Key ); table::CellRangeAddress aRefAddr; if ( !pDocSh ) - throw uno::RuntimeException( rtl::OUString("Range::Sort no docshell to calculate key param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort no docshell to calculate key param"), uno::Reference< uno::XInterface >() ); xKeyRange = getRangeForName( xContext, sRangeName, pDocSh, aRefAddr ); } else - throw uno::RuntimeException( rtl::OUString("Range::Sort illegal type value for key param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort illegal type value for key param"), uno::Reference< uno::XInterface >() ); uno::Reference< table::XCellRange > xKey; xKey.set( xKeyRange->getCellRange(), uno::UNO_QUERY_THROW ); return xKey; @@ -3271,7 +3271,7 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere // helper method for Sort sal_Int32 findSortPropertyIndex( const uno::Sequence< beans::PropertyValue >& props, -const rtl::OUString& sPropName ) throw( uno::RuntimeException ) +const OUString& sPropName ) throw( uno::RuntimeException ) { const beans::PropertyValue* pProp = props.getConstArray(); sal_Int32 nItems = props.getLength(); @@ -3281,7 +3281,7 @@ const rtl::OUString& sPropName ) throw( uno::RuntimeException ) if ( pProp->Name.equals( sPropName ) ) return count; if ( count == nItems ) - throw uno::RuntimeException( rtl::OUString("Range::Sort unknown sort property"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort unknown sort property"), uno::Reference< uno::XInterface >() ); return -1; //should never reach here ( satisfy compiler ) } @@ -3317,7 +3317,7 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan aTableField.IsAscending = false; } else - throw uno::RuntimeException( rtl::OUString( "Illegal Key param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal Key param" ), uno::Reference< uno::XInterface >() ); } @@ -3327,7 +3327,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& { // #TODO# #FIXME# can we do something with Type if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); sal_Int16 nDataOption1 = excel::XlSortDataOption::xlSortNormal; sal_Int16 nDataOption2 = excel::XlSortDataOption::xlSortNormal; @@ -3335,7 +3335,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& ScDocument* pDoc = getScDocument(); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); RangeHelper thisRange( mxRange ); table::CellRangeAddress thisRangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress(); @@ -3459,7 +3459,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& ScDocShell* pDocShell = getScDocShell(); xKey1 = processKey( Key1, mxContext, pDocShell ); if ( !xKey1.is() ) - throw uno::RuntimeException( rtl::OUString("Range::Sort needs a key1 param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort needs a key1 param"), uno::Reference< uno::XInterface >() ); if ( Key2.hasValue() ) xKey2 = processKey( Key2, mxContext, pDocShell ); @@ -3468,7 +3468,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& uno::Reference< util::XSortable > xSort( mxRange, uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > sortDescriptor = xSort->createSortDescriptor(); - sal_Int32 nTableSortFieldIndex = findSortPropertyIndex( sortDescriptor, rtl::OUString( "SortFields" ) ); + sal_Int32 nTableSortFieldIndex = findSortPropertyIndex( sortDescriptor, OUString( "SortFields" ) ); uno::Sequence< table::TableSortField > sTableFields(1); sal_Int32 nTableIndex = 0; @@ -3486,7 +3486,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& } sortDescriptor[ nTableSortFieldIndex ].Value <<= sTableFields; - sal_Int32 nIndex = findSortPropertyIndex( sortDescriptor, rtl::OUString("IsSortColumns") ); + sal_Int32 nIndex = findSortPropertyIndex( sortDescriptor, OUString("IsSortColumns") ); sortDescriptor[ nIndex ].Value <<= bIsSortColumns; nIndex = findSortPropertyIndex( sortDescriptor, CONTS_HEADER ); @@ -3520,7 +3520,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) // Save ActiveCell pos ( to restore later ) uno::Any aDft; uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); - rtl::OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); + OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); // position current cell upper left of this range Cells( uno::makeAny( (sal_Int32) 1 ), uno::makeAny( (sal_Int32) 1 ) )->Select(); @@ -3554,7 +3554,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) nSID = SID_CURSORBLKRIGHT; break; default: - throw uno::RuntimeException( ::rtl::OUString( ": Invalid ColumnIndex" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( ": Invalid ColumnIndex" ), uno::Reference< uno::XInterface >() ); } if ( pDispatcher ) { @@ -3563,7 +3563,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) } // result is the ActiveCell - rtl::OUString sMoved = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); + OUString sMoved = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); // restore old ActiveCell uno::Any aVoid; @@ -3594,11 +3594,11 @@ uno::Reference< excel::XCharacters > SAL_CALL ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException) { if ( !isSingleCellRange() ) - throw uno::RuntimeException( rtl::OUString( "Can't create Characters property for multicell range " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't create Characters property for multicell range " ), uno::Reference< uno::XInterface >() ); uno::Reference< text::XSimpleText > xSimple(mxRange->getCellByPosition(0,0) , uno::UNO_QUERY_THROW ); ScDocument* pDoc = getDocumentFromRange(mxRange); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); return new ScVbaCharacters( this, mxContext, aPalette, xSimple, Start, Length ); @@ -3633,7 +3633,7 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException) mode = sheet::CellDeleteMode_LEFT; break; default: - throw uno::RuntimeException( rtl::OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); } } else @@ -3682,10 +3682,10 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException) return new CellsEnumeration( mxParent, mxContext, m_Areas ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaRange::getDefaultMethodName( ) throw (uno::RuntimeException) { - const static rtl::OUString sName( "Item" ); + const static OUString sName( "Item" ); return sName; } @@ -3828,7 +3828,7 @@ uno::Reference< excel::XRange > ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ) { if ( !m_Areas.is() ) - throw uno::RuntimeException( rtl::OUString("No areas available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No areas available"), uno::Reference< uno::XInterface >() ); uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( ++nIndex ), uno::Any() ), uno::UNO_QUERY_THROW ); return xRange; } @@ -4119,11 +4119,11 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC // msgbox Application.Range("test").Address ' works // Single param Range - rtl::OUString sRangeName; + OUString sRangeName; Cell1 >>= sRangeName; if ( Cell1.hasValue() && !Cell2.hasValue() && !sRangeName.isEmpty() ) { - const static rtl::OUString sNamedRanges( "NamedRanges"); + const static OUString sNamedRanges( "NamedRanges"); uno::Reference< beans::XPropertySet > xPropSet( getCurrentExcelDoc(xContext), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW ); @@ -4197,7 +4197,7 @@ static void lcl_SetAllQueryForField( ScDocShell* pDocShell, SCCOLROW nField, sal } // Modifies sCriteria, and nOp depending on the value of sCriteria -static void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField ) +static void lcl_setTableFieldsFromCriteria( OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField ) { // #TODO make this more efficient and cycle through // sCriteria1 character by character to pick up <,<>,=, * etc. @@ -4314,7 +4314,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const if ( pRange ) { if ( pRange->isSingleCellRange() ) - throw uno::RuntimeException( rtl::OUString( "Can't create AutoFilter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't create AutoFilter" ), uno::Reference< uno::XInterface >() ); RangeHelper currentRegion( pRange->mxRange ); autoFiltAddress = currentRegion.getCellRangeAddressable()->getRangeAddress(); } @@ -4349,7 +4349,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const xDataBaseRange.set( xDBRanges->getByTable(nSheet ), uno::UNO_QUERY_THROW ); } if ( !xDataBaseRange.is() ) - throw uno::RuntimeException( rtl::OUString( "Failed to find the autofilter placeholder range" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to find the autofilter placeholder range" ), uno::Reference< uno::XInterface >() ); uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW ); // set autofilt @@ -4365,7 +4365,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const sal_Int32 nField = 0; // *IS* 1 based - rtl::OUString sCriteria1; + OUString sCriteria1; sal_Int32 nOperator = excel::XlAutoFilterOperator::xlAnd; sal_Bool bVisible = sal_True; @@ -4449,7 +4449,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const nConn = sheet::FilterConnection_AND; break; default: - throw uno::RuntimeException( rtl::OUString( "UnknownOption" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "UnknownOption" ), uno::Reference< uno::XInterface >() ); } @@ -4459,7 +4459,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const sTabFilts[0].Connection = sheet::FilterConnection_AND; sTabFilts[0].Field = (nField - 1); - rtl::OUString sCriteria2; + OUString sCriteria2; if ( Criteria2.hasValue() ) // there is a Criteria2 { sTabFilts.realloc(2); @@ -4544,7 +4544,7 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) thro mode = sheet::CellInsertMode_DOWN; break; default: - throw uno::RuntimeException( rtl::OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); } } else @@ -4589,7 +4589,7 @@ ScVbaRange::Autofit() throw (uno::RuntimeException) // throw an error if ( !( mbIsColumns || mbIsRows ) ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); ScDocShell* pDocShell = getDocShellFromRange( mxRange ); if ( pDocShell ) { @@ -4623,7 +4623,7 @@ ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Reference< excel::XHyperlinks > xSheetHlinks( xWorksheet->Hyperlinks( uno::Any() ), uno::UNO_QUERY_THROW ); ScVbaHyperlinksRef xScSheetHlinks( dynamic_cast< ScVbaHyperlinks* >( xSheetHlinks.get() ) ); if( !xScSheetHlinks.is() ) - throw uno::RuntimeException( ::rtl::OUString( "Cannot obtain hyperlinks implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain hyperlinks implementation object" ), uno::Reference< uno::XInterface >() ); // create a new local hyperlinks object based on the sheet hyperlinks ScVbaHyperlinksRef xHlinks( new ScVbaHyperlinks( getParent(), mxContext, xScSheetHlinks, getScRangeList() ) ); @@ -4701,7 +4701,7 @@ sal_Unicode lclGetPrefixChar( const uno::Reference< sheet::XSheetCellRangeContai inline uno::Any lclGetPrefixVariant( sal_Unicode cPrefixChar ) { - return uno::Any( (cPrefixChar == 0) ? ::rtl::OUString() : ::rtl::OUString( cPrefixChar ) ); + return uno::Any( (cPrefixChar == 0) ? OUString() : OUString( cPrefixChar ) ); } } // namespace @@ -4728,7 +4728,7 @@ uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException) return lclGetPrefixVariant( lclGetPrefixChar( mxRange ) ); if( mxRanges.is() ) return lclGetPrefixVariant( lclGetPrefixChar( mxRanges ) ); - throw uno::RuntimeException( ::rtl::OUString( "Unexpected empty Range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Unexpected empty Range object" ), uno::Reference< uno::XInterface >() ); } uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) @@ -4737,7 +4737,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) // In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception if( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "Can not get Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not get Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); sal_Bool bShowDetail = false; @@ -4769,7 +4769,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) } else { - throw uno::RuntimeException( rtl::OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); } return aNULL(); } @@ -4780,7 +4780,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru // In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception if( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); bool bShowDetail = extractBoolFromAny( aShowDetail ); @@ -4805,7 +4805,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru } else { - throw uno::RuntimeException( rtl::OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); } } @@ -4970,7 +4970,7 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const eCmd = FILL_GROWTH; break; case excel::XlAutoFillType::xlFillFormats: - throw uno::RuntimeException( rtl::OUString( "xlFillFormat not supported for AutoFill" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "xlFillFormat not supported for AutoFill" ), uno::Reference< uno::XInterface >() ); case excel::XlAutoFillType::xlFillValues: case excel::XlAutoFillType::xlFillSeries: case excel::XlAutoFillType::xlLinearTrend: @@ -5000,7 +5000,7 @@ ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress(); RangeHelper changingCellRange( pRange->mxRange ); table::CellRangeAddress changingCellAddr = changingCellRange.getCellRangeAddressable()->getRangeAddress(); - rtl::OUString sGoal = getAnyAsString( Goal ); + OUString sGoal = getAnyAsString( Goal ); table::CellAddress thisCell( thisAddress.Sheet, thisAddress.StartColumn, thisAddress.StartRow ); table::CellAddress changingCell( changingCellAddr.Sheet, changingCellAddr.StartColumn, changingCellAddr.StartRow ); sheet::GoalResult res = xGoalSeek->seekGoal( thisCell, changingCell, sGoal ); @@ -5029,7 +5029,7 @@ ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::B if ( mbIsRows || mbIsColumns ) { if ( column.hasValue() ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); uno::Reference< excel::XRange > xRange; if ( mbIsColumns ) xRange = Columns( row ); @@ -5061,7 +5061,7 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce xSheetOutline->autoOutline( thisAddress ); } else - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } void SAL_CALL @@ -5169,7 +5169,7 @@ ScVbaRange::getStyle() throw (uno::RuntimeException) return xRange->getStyle(); } uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW ); - rtl::OUString sStyleName; + OUString sStyleName; xProps->getPropertyValue( CELLSTYLE ) >>= sStyleName; ScDocShell* pShell = getScDocShell(); uno::Reference< frame::XModel > xModel( pShell->GetModel() ); @@ -5251,13 +5251,13 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw uno::Reference< excel::XRange > xUsedRange( getWorksheet()->getUsedRange() ); sal_Int32 nType = 0; if ( !( _oType >>= nType ) ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); switch(nType) { case excel::XlCellType::xlCellTypeSameFormatConditions: case excel::XlCellType::xlCellTypeAllValidation: case excel::XlCellType::xlCellTypeSameValidation: - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); break; case excel::XlCellType::xlCellTypeBlanks: case excel::XlCellType::xlCellTypeComments: @@ -5315,11 +5315,11 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw break; } default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); break; } if ( !pRangeToUse ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); return pRangeToUse->SpecialCellsImpl( nType, _oValue ); } @@ -5345,7 +5345,7 @@ static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script nRes = sheet::FormulaResult::STRING; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } return nRes; } @@ -5367,7 +5367,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( case excel::XlCellType::xlCellTypeSameValidation: // Shouldn't get here ( should be filtered out by // ScVbaRange::SpecialCells() - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); break; case excel::XlCellType::xlCellTypeBlanks: xLocSheetCellRanges = xQuery->queryEmptyCells(); @@ -5390,7 +5390,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( xLocSheetCellRanges = xQuery->queryVisibleCells(); break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); break; } if (xLocSheetCellRanges.is()) @@ -5470,7 +5470,7 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno:: aColumns[i].Function = sheet::GeneralFunction_VARP; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString()) ; + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString()) ; return; } } @@ -5479,24 +5479,24 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno:: } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaRange::getServiceImplName() { - return rtl::OUString("ScVbaRange"); + return OUString("ScVbaRange"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaRange::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.Range" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.Range" ); } return aServiceNames; } @@ -5508,7 +5508,7 @@ ScVbaRange::hasError() throw (uno::RuntimeException) uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); uno::Reference< script::XInvocation > xInvoc( xApplication->WorksheetFunction(), uno::UNO_QUERY_THROW ); - static rtl::OUString FunctionName( "IsError" ); + static OUString FunctionName( "IsError" ); uno::Sequence< uno::Any > Params(1); uno::Reference< excel::XRange > aRange( this ); Params[0] = uno::makeAny( aRange ); diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 26c583eb7de4..3459f52f6647 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -140,7 +140,7 @@ public: static css::uno::Reference< ov::excel::XRange > getRangeObjectForName( const css::uno::Reference< css::uno::XComponentContext >& xContext, - const rtl::OUString& sRangeName, ScDocShell* pDocSh, + const OUString& sRangeName, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( css::uno::RuntimeException ); static css::uno::Reference< ov::excel::XRange > CellsHelper( @@ -161,7 +161,7 @@ public: virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getRow() throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getColumn() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); using ScVbaRange_BASE::setNumberFormat; virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) throw ( css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getNumberFormat() throw (css::script::BasicErrorException, css::uno::RuntimeException); @@ -207,10 +207,10 @@ public: throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) + virtual OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) throw (css::uno::RuntimeException); @@ -229,7 +229,7 @@ public: virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException); static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) throw (css::uno::RuntimeException); virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod, const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) throw (css::uno::RuntimeException); @@ -272,9 +272,9 @@ public: } virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException); // XDefaultMethod - ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException); + OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException); // XDefaultProperty - ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } // #TODO completely rewrite ScVbaRange, its become a hackfest @@ -285,14 +285,14 @@ public: // * object should be a lightweight as possible // * we shouldn't need hacks like this below static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException); - static bool getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ); + static bool getCellRangesForAddress( sal_uInt16& rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ); virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException ); // XErrorQuery virtual ::sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SC_VBA_RANGE_HXX */ diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 256d3659eb42..cf6adaf1b02b 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -33,7 +33,6 @@ #include "vbafont.hxx" #include "drwlayer.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::ooo::vba; @@ -283,7 +282,7 @@ void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ ) void ScVbaSheetObjectBase::setDefaultProperties( sal_Int32 nIndex ) throw (uno::RuntimeException) { - OUString aName = ::rtl::OUStringBuffer( implGetBaseName() ).append( sal_Unicode( ' ' ) ).append( nIndex + 1 ).makeStringAndClear(); + OUString aName = OUStringBuffer( implGetBaseName() ).append( sal_Unicode( ' ' ) ).append( nIndex + 1 ).makeStringAndClear(); setName( aName ); implSetDefaultProperties(); } diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index c565c9660a14..87ba3776d85c 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -50,24 +50,24 @@ public: virtual ~ScVbaButtonCharacters(); // XCharacters attributes - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& rCaption ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const ::rtl::OUString& rText ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException); // XCharacters methods - virtual void SAL_CALL Insert( const ::rtl::OUString& rString ) throw (css::uno::RuntimeException); + virtual void SAL_CALL Insert( const OUString& rString ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete() throw (css::uno::RuntimeException); // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE private: - ::rtl::OUString getFullString() const throw (css::uno::RuntimeException); - void setFullString( const ::rtl::OUString& rString ) throw (css::uno::RuntimeException); + OUString getFullString() const throw (css::uno::RuntimeException); + void setFullString( const OUString& rString ) throw (css::uno::RuntimeException); private: ScVbaPalette maPalette; @@ -99,8 +99,8 @@ public: virtual void SAL_CALL setWidth( double fWidth ) throw (css::uno::RuntimeException); virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException); virtual void SAL_CALL setHeight( double fHeight ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPlacement() throw (css::uno::RuntimeException); virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException); @@ -111,7 +111,7 @@ public: protected: /** Derived classes return the base name used for new objects. */ - virtual ::rtl::OUString implGetBaseName() const = 0; + virtual OUString implGetBaseName() const = 0; /** Derived classes set default properties for new drawing objects. */ virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); @@ -148,10 +148,10 @@ public: ListenerType eListenerType ) throw (css::uno::RuntimeException); // XSheetObject attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& rName ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); - virtual void SAL_CALL setOnAction( const ::rtl::OUString& rMacroName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); + virtual void SAL_CALL setOnAction( const OUString& rMacroName ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException); virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException); @@ -165,8 +165,8 @@ protected: protected: css::uno::Reference< css::container::XIndexContainer > mxFormIC; css::uno::Reference< css::beans::XPropertySet > mxControlProps; - ::rtl::OUString maListenerType; - ::rtl::OUString maEventMethod; + OUString maListenerType; + OUString maEventMethod; }; // ============================================================================ @@ -184,8 +184,8 @@ public: const css::uno::Reference< css::drawing::XControlShape >& rxControlShape ) throw (css::uno::RuntimeException); // XButton attributes - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& rCaption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getHorizontalAlignment() throw (css::uno::RuntimeException); @@ -203,7 +203,7 @@ public: VBAHELPER_DECL_XHELPERINTERFACE protected: - virtual ::rtl::OUString implGetBaseName() const; + virtual OUString implGetBaseName() const; virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); }; diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 74f656f2001d..b542a666b1c9 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -32,7 +32,6 @@ #include #include "vbasheetobject.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index 466c7ff377ec..0f96a1d41990 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -59,7 +59,7 @@ public: // ScVbaCollectionBase virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ); - virtual css::uno::Any getItemByStringIndex( const ::rtl::OUString& rIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) throw (css::uno::RuntimeException); protected: ScVbaObjectContainerRef mxContainer; diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 427a70410722..03196a46ba5f 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static rtl::OUString DISPLAYNAME("DisplayName"); +static OUString DISPLAYNAME("DisplayName"); @@ -31,12 +31,12 @@ uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( rtl::OUString( "CellStyles" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( OUString( "CellStyles" ) ), uno::UNO_QUERY_THROW ); return xStylesAccess; } static uno::Reference< beans::XPropertySet > -lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) +lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xStyleProps( ScVbaStyle::getStylesNameContainer( xModel )->getByName( sStyleName ), uno::UNO_QUERY_THROW ); @@ -47,11 +47,11 @@ lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame: void ScVbaStyle::initialise() throw ( uno::RuntimeException ) { if (!mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") ); uno::Reference< lang::XServiceInfo > xServiceInfo( mxPropertySet, uno::UNO_QUERY_THROW ); - if ( !xServiceInfo->supportsService( rtl::OUString( "com.sun.star.style.CellStyle" ) ) ) + if ( !xServiceInfo->supportsService( OUString( "com.sun.star.style.CellStyle" ) ) ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } mxStyle.set( mxPropertySet, uno::UNO_QUERY_THROW ); @@ -60,7 +60,7 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException ) } -ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel ) +ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel ) { try { @@ -68,7 +68,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, c } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -80,7 +80,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -92,19 +92,19 @@ ScVbaStyle::BuiltIn() throw (script::BasicErrorException, uno::RuntimeException) } void SAL_CALL -ScVbaStyle::setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyle::setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException) { mxStyle->setName(Name); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaStyle::getName() throw (script::BasicErrorException, uno::RuntimeException) { return mxStyle->getName(); } void SAL_CALL -ScVbaStyle::setNameLocal( const ::rtl::OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyle::setNameLocal( const OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException) { try { @@ -116,17 +116,17 @@ ScVbaStyle::setNameLocal( const ::rtl::OUString& NameLocal ) throw (script::Basi } } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeException) { - rtl::OUString sName; + OUString sName; try { mxPropertySet->getPropertyValue(DISPLAYNAME) >>= sName; } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return sName; } @@ -140,37 +140,37 @@ ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException) } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } void SAL_CALL ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } uno::Any SAL_CALL ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); return uno::Any(); } -rtl::OUString +OUString ScVbaStyle::getServiceImplName() { - return rtl::OUString("ScVbaStyle"); + return OUString("ScVbaStyle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaStyle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XStyle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.XStyle" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index cd0e0a72628d..70d4e2824739 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -35,24 +35,24 @@ protected: css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer; void initialise() throw ( css::uno::RuntimeException ); public: - ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); virtual ~ScVbaStyle(){} static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException ); virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() { return this; }; // XStyle Methods virtual ::sal_Bool SAL_CALL BuiltIn() throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual void SAL_CALL setNameLocal( const ::rtl::OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException); // XFormat virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SC_VBA_AXIS_HXX diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index 2706440c972c..df854d17d593 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static rtl::OUString SDEFAULTCELLSTYLENAME("Default"); +static OUString SDEFAULTCELLSTYLENAME("Default"); static css::uno::Any lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) { @@ -42,11 +42,11 @@ ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, con } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaStyles::getStyleNames() throw ( uno::RuntimeException ) { return mxNameContainerCellStyles->getElementNames(); @@ -94,12 +94,12 @@ ScVbaStyles::createEnumeration() throw (uno::RuntimeException) } uno::Reference< excel::XStyle > SAL_CALL -ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< excel::XStyle > aRet; try { - rtl::OUString sParentCellStyleName("Default"); + OUString sParentCellStyleName("Default"); if ( _aBasedOn.hasValue() ) { uno::Reference< excel::XRange > oRange; @@ -112,16 +112,16 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr } else { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString() ); } } else { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); } } - uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( rtl::OUString("com.sun.star.style.CellStyle")), uno::UNO_QUERY_THROW ); + uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( OUString("com.sun.star.style.CellStyle")), uno::UNO_QUERY_THROW ); if (!mxNameContainerCellStyles->hasByName(_sName)) { @@ -135,13 +135,13 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aRet; } void -ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorException ) +ScVbaStyles::Delete(const OUString _sStyleName) throw ( script::BasicErrorException ) { try { @@ -150,24 +150,24 @@ ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorE } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaStyles::getServiceImplName() { - return rtl::OUString("ScVbaStyles"); + return OUString("ScVbaStyles"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaStyles::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XStyles" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.XStyles" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx index 4161f073cf6b..aff8d859cedc 100644 --- a/sc/source/ui/vba/vbastyles.hxx +++ b/sc/source/ui/vba/vbastyles.hxx @@ -33,17 +33,17 @@ class ScVbaStyles: public ScVbaStyles_BASE css::uno::Reference< css::container::XNameContainer > mxNameContainerCellStyles; public: ScVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::script::BasicErrorException ); - css::uno::Sequence< rtl::OUString > getStyleNames() throw ( css::uno::RuntimeException ); - void Delete(const rtl::OUString _sStyleName) throw ( css::script::BasicErrorException ); + css::uno::Sequence< OUString > getStyleNames() throw ( css::uno::RuntimeException ); + void Delete(const OUString _sStyleName) throw ( css::script::BasicErrorException ); // XStyles - virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const ::rtl::OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx index ca7cc7270613..994ca2971f73 100644 --- a/sc/source/ui/vba/vbatextboxshape.cxx +++ b/sc/source/ui/vba/vbatextboxshape.cxx @@ -31,14 +31,14 @@ ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentConte m_xModel.set( xModel ); } -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaTextBoxShape::getText() throw (css::uno::RuntimeException) { return m_xTextRange->getString(); } void SAL_CALL -ScVbaTextBoxShape::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException) +ScVbaTextBoxShape::setText( const OUString& _text ) throw (css::uno::RuntimeException) { m_xTextRange->setString( _text ); } @@ -50,7 +50,7 @@ ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) t ScDocument* pDoc = pDocShell ? pDocShell->GetDocument() : NULL; if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); uno::Reference< text::XSimpleText > xSimple( m_xTextRange, uno::UNO_QUERY_THROW ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx index 53c1df383172..533df3a3b50b 100644 --- a/sc/source/ui/vba/vbatextboxshape.hxx +++ b/sc/source/ui/vba/vbatextboxshape.hxx @@ -35,8 +35,8 @@ public: ScVbaTextBoxShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); // Attributes - virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException); }; #endif //SC_VBA_TEXTBOX_HXX diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index 306f71318ee7..854594faafb9 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -40,20 +40,20 @@ ScVbaTextFrame::Characters() throw (uno::RuntimeException) return uno::makeAny( uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, sal_True ) ) ); } -rtl::OUString +OUString ScVbaTextFrame::getServiceImplName() { - return rtl::OUString("ScVbaTextFrame"); + return OUString("ScVbaTextFrame"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaTextFrame::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.TextFrame" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.TextFrame" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx index 32fc8642ca1e..3bad6ba0c5a7 100644 --- a/sc/source/ui/vba/vbatextframe.hxx +++ b/sc/source/ui/vba/vbatextframe.hxx @@ -33,8 +33,8 @@ public: // Methods virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index d3c84ac95198..3f4d105c3808 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -64,27 +64,27 @@ public: return new ScVbaFont( BaseClass::mxParent, BaseClass::mxContext, m_Palette, xShapePropertySet ); } - void SAL_CALL setText( const ::rtl::OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException) + void SAL_CALL setText( const OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { try { - xShapePropertySet->setPropertyValue( rtl::OUString("String"), css::uno::makeAny( Text )); + xShapePropertySet->setPropertyValue( OUString("String"), css::uno::makeAny( Text )); } catch ( css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } - ::rtl::OUString SAL_CALL getText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) + OUString SAL_CALL getText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { - ::rtl::OUString sText; + OUString sText; try { - xShapePropertySet->getPropertyValue( rtl::OUString("String") ) >>= sText; + xShapePropertySet->getPropertyValue( OUString("String") ) >>= sText; } catch ( css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return sText; } @@ -117,11 +117,11 @@ public: { try { - xShapePropertySet->setPropertyValue(rtl::OUString("TextRotation"), css::uno::makeAny(_nOrientation*100)); + xShapePropertySet->setPropertyValue(OUString("TextRotation"), css::uno::makeAny(_nOrientation*100)); } catch (css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } ::sal_Int32 SAL_CALL getOrientation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) @@ -129,26 +129,26 @@ public: sal_Int32 nSOOrientation = 0; try { - xShapePropertySet->getPropertyValue( rtl::OUString("TextRotation")) >>= nSOOrientation; + xShapePropertySet->getPropertyValue( OUString("TextRotation")) >>= nSOOrientation; } catch (css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return static_cast< sal_Int32 >(nSOOrientation / 100) ; } // XHelperInterface - rtl::OUString getServiceImplName() + OUString getServiceImplName() { - return rtl::OUString("TitleImpl"); + return OUString("TitleImpl"); } - css::uno::Sequence< rtl::OUString > getServiceNames() + css::uno::Sequence< OUString > getServiceNames() { - static css::uno::Sequence< rtl::OUString > aServiceNames; + static css::uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XTitle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.XTitle" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index cdd02499bca0..da9f0bb6b633 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -35,17 +35,17 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -const static rtl::OUString VALIDATION( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_VALIDAT ) ); -const static rtl::OUString IGNOREBLANK( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_IGNOREBL ) ); -const static rtl::OUString SHOWINPUT( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWINP ) ); -const static rtl::OUString SHOWERROR( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWERR ) ); -const static rtl::OUString ERRORTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRTITLE ) ); -const static rtl::OUString INPUTTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPTITLE ) ); -const static rtl::OUString INPUTMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPMESS ) ); -const static rtl::OUString ERRORMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRMESS ) ); -const static rtl::OUString STYPE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TYPE ) ); -const static rtl::OUString SHOWLIST( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWLIST ) ); -const static rtl::OUString ALERTSTYLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRALSTY ) ); +const static OUString VALIDATION( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_VALIDAT ) ); +const static OUString IGNOREBLANK( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_IGNOREBL ) ); +const static OUString SHOWINPUT( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWINP ) ); +const static OUString SHOWERROR( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWERR ) ); +const static OUString ERRORTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRTITLE ) ); +const static OUString INPUTTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPTITLE ) ); +const static OUString INPUTMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPMESS ) ); +const static OUString ERRORMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRMESS ) ); +const static OUString STYPE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TYPE ) ); +const static OUString SHOWLIST( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWLIST ) ); +const static OUString ALERTSTYLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRALSTY ) ); static void lcl_setValidationProps( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< beans::XPropertySet >& xProps ) @@ -134,68 +134,68 @@ ScVbaValidation::setShowError( ::sal_Bool _showerror ) throw (uno::RuntimeExcept lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getErrorTitle() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sErrorTitle; + OUString sErrorTitle; xProps->getPropertyValue( ERRORTITLE ) >>= sErrorTitle; return sErrorTitle; } void -ScVbaValidation::setErrorTitle( const rtl::OUString& _errormessage ) throw (uno::RuntimeException) +ScVbaValidation::setErrorTitle( const OUString& _errormessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( ERRORTITLE, uno::makeAny( _errormessage ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getInputMessage() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sMsg; + OUString sMsg; xProps->getPropertyValue( INPUTMESS ) >>= sMsg; return sMsg; } void SAL_CALL -ScVbaValidation::setInputMessage( const ::rtl::OUString& _inputmessage ) throw (uno::RuntimeException) +ScVbaValidation::setInputMessage( const OUString& _inputmessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( INPUTMESS, uno::makeAny( _inputmessage ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getInputTitle() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sString; + OUString sString; xProps->getPropertyValue( INPUTTITLE ) >>= sString; return sString; } void SAL_CALL -ScVbaValidation::setInputTitle( const ::rtl::OUString& _inputtitle ) throw (uno::RuntimeException) +ScVbaValidation::setInputTitle( const OUString& _inputtitle ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( INPUTTITLE, uno::makeAny( _inputtitle ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getErrorMessage() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sString; + OUString sString; xProps->getPropertyValue( ERRORMESS ) >>= sString; return sString; } void SAL_CALL -ScVbaValidation::setErrorMessage( const ::rtl::OUString& _errormessage ) throw (uno::RuntimeException) +ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( ERRORMESS, uno::makeAny( _errormessage ) ); @@ -206,7 +206,7 @@ ScVbaValidation::setErrorMessage( const ::rtl::OUString& _errormessage ) throw ( void SAL_CALL ScVbaValidation::Delete( ) throw (uno::RuntimeException) { - rtl::OUString sBlank; + OUString sBlank; uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); uno::Reference< sheet::XSheetCondition > xCond( xProps, uno::UNO_QUERY_THROW ); xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( sal_True ) ); @@ -233,15 +233,15 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un sheet::ValidationType nValType = sheet::ValidationType_ANY; xProps->getPropertyValue( STYPE ) >>= nValType; if ( nValType != sheet::ValidationType_ANY ) - throw uno::RuntimeException( rtl::OUString( "validation object already exists" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "validation object already exists" ), uno::Reference< uno::XInterface >() ); sal_Int32 nType = -1; if ( !Type.hasValue() || !( Type >>= nType ) ) - throw uno::RuntimeException( rtl::OUString( "missing required param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "missing required param" ), uno::Reference< uno::XInterface >() ); Delete(); // set up defaults - rtl::OUString sFormula1; + OUString sFormula1; Formula1 >>= sFormula1; - rtl::OUString sFormula2; + OUString sFormula2; Formula2 >>= sFormula2; switch ( nType ) { @@ -250,7 +250,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un // for validate list // at least formula1 is required if ( !Formula1.hasValue() ) - throw uno::RuntimeException( rtl::OUString( "missing param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "missing param" ), uno::Reference< uno::XInterface >() ); nValType = sheet::ValidationType_LIST; xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); // #TODO validate required params @@ -262,7 +262,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); break; default: - throw uno::RuntimeException( rtl::OUString( "unsupported operation..." ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "unsupported operation..." ), uno::Reference< uno::XInterface >() ); } sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP; @@ -283,7 +283,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un eStyle = sheet::ValidationAlertStyle_INFO; break; default: - throw uno::RuntimeException( rtl::OUString( "bad param..." ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "bad param..." ), uno::Reference< uno::XInterface >() ); } } @@ -306,11 +306,11 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getFormula1() throw (uno::RuntimeException) { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); - rtl::OUString sString = xCond->getFormula1(); + OUString sString = xCond->getFormula1(); sal_uInt16 nFlags = 0; ScRangeList aCellRanges; @@ -327,7 +327,7 @@ ScVbaValidation::getFormula1() throw (uno::RuntimeException) return sString; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getFormula2() throw (uno::RuntimeException) { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); @@ -377,20 +377,20 @@ ScVbaValidation::getType() throw (uno::RuntimeException) return nExcelType; } -rtl::OUString +OUString ScVbaValidation::getServiceImplName() { - return rtl::OUString("ScVbaValidation"); + return OUString("ScVbaValidation"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaValidation::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Validation" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Validation" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx index ea236a31c085..baa96d730555 100644 --- a/sc/source/ui/vba/vbavalidation.hxx +++ b/sc/source/ui/vba/vbavalidation.hxx @@ -41,23 +41,23 @@ public: virtual void SAL_CALL setShowInput( ::sal_Bool _showinput ) throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getShowError() throw (css::uno::RuntimeException); virtual void SAL_CALL setShowError( ::sal_Bool _showerror ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setInputTitle( const ::rtl::OUString& _inputtitle ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setErrorTitle( const ::rtl::OUString& _errortitle ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException); - virtual void SAL_CALL setInputMessage( const ::rtl::OUString& _inputmessage ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException); - virtual void SAL_CALL setErrorMessage( const ::rtl::OUString& _errormessage ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException); + virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException); + virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException); + virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException); + virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException) ; + virtual OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException); // Methods virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException); virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 2ac13621ae32..dab52fa8b631 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -48,9 +48,9 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlWindowState; -typedef boost::unordered_map< rtl::OUString, -SCTAB, ::rtl::OUStringHash, -::std::equal_to< ::rtl::OUString > > NameIndexHash; +typedef boost::unordered_map< OUString, +SCTAB, OUStringHash, +::std::equal_to< OUString > > NameIndexHash; typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets; @@ -103,13 +103,13 @@ public: { ScModelObj* pModel = static_cast< ScModelObj* >( m_xModel.get() ); if ( !pModel ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain current document" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain current document" ), uno::Reference< uno::XInterface >() ); ScDocShell* pDocShell = (ScDocShell*)pModel->GetEmbeddedObject(); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain docshell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain docshell" ), uno::Reference< uno::XInterface >() ); ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount(); uno::Sequence aSheets( nTabCount ); @@ -160,7 +160,7 @@ public: } //XNameAccess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -169,10 +169,10 @@ public: } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > names( namesToIndices.size() ); - ::rtl::OUString* pString = names.getArray(); + uno::Sequence< OUString > names( namesToIndices.size() ); + OUString* pString = names.getArray(); NameIndexHash::const_iterator it = namesToIndices.begin(); NameIndexHash::const_iterator it_end = namesToIndices.end(); for ( ; it != it_end; ++it, ++pString ) @@ -180,7 +180,7 @@ public: return names; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); @@ -290,7 +290,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P /* sal_Int32 nSheets = 0; sal_Int32 nPosition = 0; - throw uno::RuntimeException( rtl::OUString("No Implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No Implemented"), uno::Reference< uno::XInterface >() ); sal_Bool bSheets = ( Sheets >>= nSheets ); sal_Bool bPosition = ( Position >>= nPosition ); if ( bSheets || bPosition ) // at least one param specified @@ -305,11 +305,11 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P uno::Any SAL_CALL ScVbaWindow::getCaption() throw (uno::RuntimeException) { - static rtl::OUString sCrud(" - OpenOffice.org Calc" ); + static OUString sCrud(" - OpenOffice.org Calc" ); static sal_Int32 nCrudLen = sCrud.getLength(); - rtl::OUString sTitle; - getFrameProps()->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle; + OUString sTitle; + getFrameProps()->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle; sal_Int32 nCrudIndex = sTitle.indexOf( sCrud ); // adjust title ( by removing crud ) // sCrud string present @@ -320,7 +320,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) { sTitle = sTitle.copy( 0, nCrudIndex ); ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel ); - rtl::OUString sName = workbook.getName(); + OUString sName = workbook.getName(); // rather bizare hack to make sure the name behavior // is like XL // if the adjusted title == workbook name, use name @@ -330,7 +330,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) if ( !sTitle.equals( sName ) ) { - static rtl::OUString sDot("."); + static OUString sDot("."); // starts with title if ( sName.indexOf( sTitle ) == 0 ) // extention starts immediately after @@ -345,7 +345,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException) { - getFrameProps()->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TITLE ) ), _caption ); + getFrameProps()->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TITLE ) ), _caption ); } uno::Any SAL_CALL @@ -444,7 +444,7 @@ ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE else if (nwindowState == xlNormal) pWork -> Restore(); else - throw uno::RuntimeException( rtl::OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); } } @@ -495,7 +495,7 @@ ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeEx ::sal_Bool SAL_CALL ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); sal_Bool bGrid = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bGrid; return bGrid; @@ -505,14 +505,14 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _displaygridlines )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); sal_Bool bHeading = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bHeading; return bHeading; @@ -521,14 +521,14 @@ ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); sal_Bool bHorizontalScrollBar = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bHorizontalScrollBar; return bHorizontalScrollBar; @@ -537,14 +537,14 @@ ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); sal_Bool bOutline = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bOutline; return bOutline; @@ -553,14 +553,14 @@ ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayOutline )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); sal_Bool bVerticalScrollBar = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bVerticalScrollBar; return bVerticalScrollBar; @@ -569,14 +569,14 @@ ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); sal_Bool bWorkbookTabs = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bWorkbookTabs; return bWorkbookTabs; @@ -585,7 +585,7 @@ ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs )); } @@ -731,7 +731,7 @@ uno::Any SAL_CALL ScVbaWindow::getZoom() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = getControllerProps(); - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) ); sal_Int16 nZoomType = view::DocumentZoomType::PAGE_WIDTH; xProps->getPropertyValue( sName ) >>= nZoomType; if( nZoomType == view::DocumentZoomType::PAGE_WIDTH ) @@ -740,7 +740,7 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException) } else if( nZoomType == view::DocumentZoomType::BY_VALUE ) { - sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ZOOMVALUE)); + sName = OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ZOOMVALUE)); sal_Int16 nZoom = 100; xProps->getPropertyValue( sName ) >>= nZoom; return uno::makeAny( nZoom ); @@ -793,7 +793,7 @@ ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException) nSlot = FID_PAGEBREAKMODE; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } // !! TODO !! get view shell from controller ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); @@ -864,20 +864,20 @@ void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) throw (css::uno::Runtime } } -rtl::OUString +OUString ScVbaWindow::getServiceImplName() { - return rtl::OUString("ScVbaWindow"); + return OUString("ScVbaWindow"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWindow::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Window" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Window" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index fe5725340ca3..c637fdf736a9 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.hxx @@ -120,8 +120,8 @@ public: virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 0c090516961d..5f4bf1098ffe 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -30,9 +30,9 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -typedef boost::unordered_map< rtl::OUString, -sal_Int32, ::rtl::OUStringHash, -::std::equal_to< ::rtl::OUString > > NameIndexHash; +typedef boost::unordered_map< OUString, +sal_Int32, OUStringHash, +::std::equal_to< OUString > > NameIndexHash; static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) @@ -130,7 +130,7 @@ public: uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW ); uno::Reference< XHelperInterface > xTemp; // temporary needed for g++ 3.3.5 ScVbaWindow window( xTemp, m_xContext, xModel, xController ); - rtl::OUString sCaption; + OUString sCaption; window.getCaption() >>= sCaption; namesToIndices[ sCaption ] = nIndex++; } @@ -168,7 +168,7 @@ public: } //XNameAccess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -177,10 +177,10 @@ public: } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > names( namesToIndices.size() ); - ::rtl::OUString* pString = names.getArray(); + uno::Sequence< OUString > names( namesToIndices.size() ); + OUString* pString = names.getArray(); NameIndexHash::const_iterator it = namesToIndices.begin(); NameIndexHash::const_iterator it_end = namesToIndices.end(); for ( ; it != it_end; ++it, ++pString ) @@ -188,7 +188,7 @@ public: return names; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); @@ -225,20 +225,20 @@ ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWor } -rtl::OUString +OUString ScVbaWindows::getServiceImplName() { - return rtl::OUString("ScVbaWindows"); + return OUString("ScVbaWindows"); } -css::uno::Sequence +css::uno::Sequence ScVbaWindows::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Windows"); + sNames[0] = OUString("ooo.vba.excel.Windows"); } return sNames; } diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 0cd2186fc4e7..59a32790f28d 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -47,8 +47,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SC_VBA_WINDOWS_HXX diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 6062b9e3bde5..96aa20574b0b 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -97,7 +97,7 @@ ScVbaWorkbook::Colors( const ::uno::Any& Index ) throw (::script::BasicErrorExce ScVbaWorkbook::getFileFormat( ) throw (::uno::RuntimeException) { sal_Int32 aFileFormat = 0; - rtl::OUString aFilterName; + OUString aFilterName; uno::Sequence< beans::PropertyValue > aArgs = getModel()->getArgs(); // #FIXME - seems suspect should we not walk through the properties @@ -251,14 +251,14 @@ void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDispl } void -ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::RuntimeException) +ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeException) { - rtl::OUString aURL; + OUString aURL; osl::FileBase::getFileURLFromSystemPath( sFileName, aURL ); uno::Reference< frame::XStorable > xStor( getModel(), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > storeProps(1); - storeProps[0].Name = rtl::OUString( "FilterName" ); - storeProps[0].Value <<= rtl::OUString( "MS Excel 97" ); + storeProps[0].Name = OUString( "FilterName" ); + storeProps[0].Value <<= OUString( "MS Excel 97" ); xStor->storeToURL( aURL, storeProps ); } @@ -279,36 +279,36 @@ ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, xModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); return uno::Any( xNames ); } -rtl::OUString +OUString ScVbaWorkbook::getServiceImplName() { - return rtl::OUString("ScVbaWorkbook"); + return OUString("ScVbaWorkbook"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWorkbook::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Workbook" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Workbook" ); } return aServiceNames; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaWorkbook::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY_THROW ); - return xModelProp->getPropertyValue( ::rtl::OUString( "CodeName" ) ).get< ::rtl::OUString >(); + return xModelProp->getPropertyValue( OUString( "CodeName" ) ).get< OUString >(); } sal_Int64 diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 6a8f02c596ce..7288d2aa1d1b 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -56,14 +56,14 @@ public: virtual void SAL_CALL ResetColors( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getFileFormat( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL SaveCopyAs( const rtl::OUString& Filename ) throw ( css::uno::RuntimeException); + virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) throw ( css::uno::RuntimeException); // code name - virtual ::rtl::OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException); + virtual OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); // XUnoTunnel virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence& rId ) throw(css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index a9357fae6194..5f191ac70425 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -88,7 +88,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -99,20 +99,20 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& pDoc->SetCodeName( sCodeName ); } - std::vector< rtl::OUString > sDocModuleNames; + std::vector< OUString > sDocModuleNames; sDocModuleNames.push_back( sCodeName ); uno::Reference xSheets( xDoc->getSheets(), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > sSheets( xSheets->getElementNames() ); + uno::Sequence< OUString > sSheets( xSheets->getElementNames() ); for ( sal_Int32 index=0; index < sSheets.getLength() ; ++index ) { sDocModuleNames.push_back( sSheets[ index ] ); } - std::vector::iterator it_end = sDocModuleNames.end(); + std::vector::iterator it_end = sDocModuleNames.end(); - for ( std::vector::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) + for ( std::vector::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) { script::ModuleInfo sModuleInfo; @@ -120,9 +120,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) ); + xLib->replaceByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n") ) ); else - xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) ); + xLib->insertByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n" ) ) ); } } } @@ -195,7 +195,7 @@ ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException) { uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc; sal_Int32 nWorkbookType = 0; - ::rtl::OUString aTemplateFileName; + OUString aTemplateFileName; if( Template >>= nWorkbookType ) { // nWorkbookType is a constant from XlWBATemplate (added in Excel 2007) @@ -241,19 +241,19 @@ ScVbaWorkbooks::Close() throw (uno::RuntimeException) } bool -ScVbaWorkbooks::isTextFile( const rtl::OUString& sType ) +ScVbaWorkbooks::isTextFile( const OUString& sType ) { // will return true if the file is // a) a variant of a text file // b) a csv file // c) unknown // returning true basically means treat this like a csv file - const static rtl::OUString txtType("generic_Text"); + const static OUString txtType("generic_Text"); return sType.equals( txtType ) || sType.isEmpty(); } bool -ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType ) +ScVbaWorkbooks::isSpreadSheetFile( const OUString& sType ) { // include calc_QPro etc. ? ( not for the moment anyway ) if ( sType.indexOf( "calc_MS" ) == 0 @@ -263,23 +263,23 @@ ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType ) return false; } -rtl::OUString -ScVbaWorkbooks::getFileFilterType( const rtl::OUString& rFileName ) +OUString +ScVbaWorkbooks::getFileFilterType( const OUString& rFileName ) { - uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW ); + uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aMediaDesc(1); - aMediaDesc[ 0 ].Name = rtl::OUString("URL" ); + aMediaDesc[ 0 ].Name = OUString("URL" ); aMediaDesc[ 0 ].Value <<= rFileName; - rtl::OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, sal_True ); + OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, sal_True ); return sType; } // #TODO# #FIXME# can any of the unused params below be used? uno::Any SAL_CALL -ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException) +ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException) { // we need to detect if this is a URL, if not then assume its a file path - rtl::OUString aURL; + OUString aURL; INetURLObject aObj; aObj.SetURL( rFileName ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; @@ -290,7 +290,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi uno::Sequence< beans::PropertyValue > sProps(0); - rtl::OUString sType = getFileFilterType( aURL ); + OUString sType = getFileFilterType( aURL ); // A text file means it needs to be processed as a csv file if ( isTextFile( sType ) ) { @@ -304,11 +304,11 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi // 6 Custom character (see the Delimiter argument // no format means use the current delimiter sProps.realloc( 3 ); - sProps[ nIndex ].Name = rtl::OUString("FilterOptions" ); + sProps[ nIndex ].Name = OUString("FilterOptions" ); sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ }; - static rtl::OUString sRestOfFormat(",34,0,1" ); + static OUString sRestOfFormat(",34,0,1" ); - rtl::OUString sFormat; + OUString sFormat; sal_Int16 nFormat = 0; // default indicator @@ -317,7 +317,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi Format >>= nFormat; // val of nFormat overwritten if extracted // validate param if ( nFormat < 1 || nFormat > 6 ) - throw uno::RuntimeException( rtl::OUString( "Illegal value for Format" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal value for Format" ), uno::Reference< uno::XInterface >() ); } sal_Int16 nDelim = getCurrentDelim(); @@ -330,29 +330,29 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi { // Need to check Delimiter param if ( !Delimiter.hasValue() ) - throw uno::RuntimeException( rtl::OUString( "Expected value for Delimiter" ), uno::Reference< uno::XInterface >() ); - rtl::OUString sStr; + throw uno::RuntimeException( OUString( "Expected value for Delimiter" ), uno::Reference< uno::XInterface >() ); + OUString sStr; Delimiter >>= sStr; String aUniStr( sStr ); if ( aUniStr.Len() ) nDelim = aUniStr.GetChar(0); else - throw uno::RuntimeException( rtl::OUString( "Incorrect value for Delimiter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Incorrect value for Delimiter" ), uno::Reference< uno::XInterface >() ); } getCurrentDelim() = nDelim; //set new current - sFormat = rtl::OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; + sFormat = OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; sProps[ nIndex++ ].Value <<= sFormat; - sProps[ nIndex ].Name = rtl::OUString("FilterName"); - sProps[ nIndex++ ].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ); + sProps[ nIndex ].Name = OUString("FilterName"); + sProps[ nIndex++ ].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ); // Ensure WORKAROUND_CSV_TXT_BUG_i60158 gets called in typedetection.cxx so // csv is forced for deep detected 'writerxxx' types - sProps[ nIndex ].Name = rtl::OUString("DocumentService"); - sProps[ nIndex ].Value <<= rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"); + sProps[ nIndex ].Name = OUString("DocumentService"); + sProps[ nIndex ].Value <<= OUString("com.sun.star.sheet.SpreadsheetDocument"); } else if ( !isSpreadSheetFile( sType ) ) - throw uno::RuntimeException( rtl::OUString("Bad Format"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Bad Format"), uno::Reference< uno::XInterface >() ); uno::Reference xSpreadDoc( openDocument( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW ); uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, mxParent ); @@ -362,20 +362,20 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi return aRet; } -rtl::OUString +OUString ScVbaWorkbooks::getServiceImplName() { - return rtl::OUString("ScVbaWorkbooks"); + return OUString("ScVbaWorkbooks"); } -css::uno::Sequence +css::uno::Sequence ScVbaWorkbooks::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Workbooks"); + sNames[0] = OUString("ooo.vba.excel.Workbooks"); } return sNames; } diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index 8191006d52a4..b7e7068529db 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -32,9 +32,9 @@ typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks > class ScVbaWorkbooks : public ScVbaWorkbooks_BASE { private: - rtl::OUString getFileFilterType( const rtl::OUString& rString ); - bool isTextFile( const rtl::OUString& rString ); - bool isSpreadSheetFile( const rtl::OUString& rString ); + OUString getFileFilterType( const OUString& rString ); + bool isTextFile( const OUString& rString ); + bool isSpreadSheetFile( const OUString& rString ); static sal_Int16& getCurrentDelim(){ static sal_Int16 nDelim = 44; return nDelim; } public: ScVbaWorkbooks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); @@ -46,13 +46,13 @@ public: // ScVbaWorkbooks_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); // XWorkbooks virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) throw (css::uno::RuntimeException); virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException); }; #endif /* SC_VBA_WORKBOOKS_HXX */ diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 7377ef8726ba..d481cee78a90 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -108,10 +108,10 @@ using namespace com::sun::star; using namespace ooo::vba; -static void getNewSpreadsheetName (rtl::OUString &aNewName, rtl::OUString aOldName, uno::Reference & xSpreadDoc ) +static void getNewSpreadsheetName (OUString &aNewName, OUString aOldName, uno::Reference & xSpreadDoc ) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); static OUString aUnderScore( "_" ); int currentNum =2; aNewName = aOldName + aUnderScore + OUString::number(currentNum) ; @@ -122,10 +122,10 @@ static void getNewSpreadsheetName (rtl::OUString &aNewName, rtl::OUString aOldNa } } -static void removeAllSheets( uno::Reference & xSpreadDoc, rtl::OUString aSheetName) +static void removeAllSheets( uno::Reference & xSpreadDoc, OUString aSheetName) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "removeAllSheets() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "removeAllSheets() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); uno::Reference xSheets = xSpreadDoc->getSheets(); uno::Reference xIndex( xSheets, uno::UNO_QUERY ); @@ -152,7 +152,7 @@ static void removeAllSheets( uno::Reference & xSpre } static uno::Reference -openNewDoc(rtl::OUString aSheetName ) +openNewDoc(OUString aSheetName ) { uno::Reference xModel; try @@ -163,8 +163,8 @@ openNewDoc(rtl::OUString aSheetName ) uno::Reference xComponentLoader = frame::Desktop::create(xContext); uno::Reference xComponent( xComponentLoader->loadComponentFromURL( - rtl::OUString( "private:factory/scalc" ), - rtl::OUString( "_blank" ), 0, + OUString( "private:factory/scalc" ), + OUString( "_blank" ), 0, uno::Sequence < ::com::sun::star::beans::PropertyValue >() ) ); uno::Reference xSpreadDoc( xComponent, uno::UNO_QUERY_THROW ); if ( xSpreadDoc.is() ) @@ -191,7 +191,7 @@ ScVbaWorksheet::ScVbaWorksheet( uno::Sequence< uno::Any> const & args, if ( args.getLength() < 3 ) throw lang::IllegalArgumentException(); - rtl::OUString sSheetName; + OUString sSheetName; args[2] >>= sSheetName; uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc( mxModel, uno::UNO_QUERY_THROW ); @@ -214,7 +214,7 @@ const uno::Sequence& ScVbaWorksheet::getUnoTunnelId() } uno::Reference< ov::excel::XWorksheet > -ScVbaWorksheet::createSheetCopyInNewDoc(rtl::OUString aCurrSheetName) +ScVbaWorksheet::createSheetCopyInNewDoc(OUString aCurrSheetName) { uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = getSheet()->createCursor( ); uno::Reference xUsedCursor(xSheetCellCursor,uno::UNO_QUERY_THROW); @@ -235,7 +235,7 @@ ScVbaWorksheet::createSheetCopyInNewDoc(rtl::OUString aCurrSheetName) uno::Reference< sheet::XSpreadsheet > xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); ScDocShell* pShell = excel::getDocShell( xModel ); - rtl::OUString aCodeName; + OUString aCodeName; pShell->GetDocument()->GetCodeName( 0, aCodeName ); return uno::Reference< excel::XWorksheet >( getUnoDocModule( aCodeName, pShell ), uno::UNO_QUERY_THROW ); } @@ -243,7 +243,7 @@ ScVbaWorksheet::createSheetCopyInNewDoc(rtl::OUString aCurrSheetName) css::uno::Reference< ov::excel::XWorksheet > ScVbaWorksheet::createSheetCopy(uno::Reference xSheet, bool bAfter) { - rtl::OUString aCurrSheetName = getName(); + OUString aCurrSheetName = getName(); ScVbaWorksheet* pDestSheet = excel::getImplFromDocModuleWrapper( xSheet ); uno::Reference xDestDoc( pDestSheet->getModel(), uno::UNO_QUERY ); @@ -251,7 +251,7 @@ ScVbaWorksheet::createSheetCopy(uno::Reference xSheet, bool b SCTAB nDest = 0; SCTAB nSrc = 0; - rtl::OUString aSheetName = xSheet->getName(); + OUString aSheetName = xSheet->getName(); bool bSameDoc = ( pDestSheet->getModel() == getModel() ); bool bDestSheetExists = ScVbaWorksheets::nameExists (xDestDoc, aSheetName, nDest ); bool bSheetExists = ScVbaWorksheets::nameExists (xSrcDoc, aCurrSheetName, nSrc ); @@ -282,7 +282,7 @@ ScVbaWorksheet::createSheetCopy(uno::Reference xSheet, bool b return xNewSheet; } -::rtl::OUString +OUString ScVbaWorksheet::getName() throw (uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW ); @@ -290,7 +290,7 @@ ScVbaWorksheet::getName() throw (uno::RuntimeException) } void -ScVbaWorksheet::setName(const ::rtl::OUString &rName ) throw (uno::RuntimeException) +ScVbaWorksheet::setName(const OUString &rName ) throw (uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW ); xNamed->setName( rName ); @@ -362,7 +362,7 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException) return excel::XlEnableSelection::xlNoSelection; } else - throw uno::RuntimeException(::rtl::OUString( "Sheet Name does not exist. "), + throw uno::RuntimeException(OUString( "Sheet Name does not exist. "), uno::Reference< XInterface >() ); } @@ -374,7 +374,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx (nSelection != excel::XlEnableSelection::xlUnlockedCells) && (nSelection != excel::XlEnableSelection::xlNoSelection) ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } uno::Reference xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); @@ -403,7 +403,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx } } else - throw uno::RuntimeException(::rtl::OUString( "Sheet Name does not exist. "), + throw uno::RuntimeException(OUString( "Sheet Name does not exist. "), uno::Reference< XInterface >() ); } @@ -517,7 +517,7 @@ sal_Bool ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException) { SCTAB nTab = 0; - rtl::OUString aSheetName = getName(); + OUString aSheetName = getName(); uno::Reference xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); bool bSheetExists = ScVbaWorksheets::nameExists (xSpreadDoc, aSheetName, nTab); if ( bSheetExists ) @@ -555,7 +555,7 @@ void ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException) { uno::Reference xSheet; - rtl::OUString aCurrSheetName = getName(); + OUString aCurrSheetName = getName(); if (!(Before >>= xSheet) && !(After >>=xSheet)&& !(Before.hasValue()) && !(After.hasValue())) { @@ -617,7 +617,7 @@ void ScVbaWorksheet::Delete() throw (uno::RuntimeException) { uno::Reference xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); - rtl::OUString aSheetName = getName(); + OUString aSheetName = getName(); if ( xSpreadDoc.is() ) { SCTAB nTab = 0; @@ -667,7 +667,7 @@ ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObje // #TODO# #FIXME# is there anything we can do witht the unused param // can the implementation use anything else here uno::Reference xProtectable(getSheet(), uno::UNO_QUERY_THROW); - ::rtl::OUString aPasswd; + OUString aPasswd; Password >>= aPasswd; xProtectable->protect( aPasswd ); } @@ -676,7 +676,7 @@ void ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeException) { uno::Reference xProtectable(getSheet(), uno::UNO_QUERY_THROW); - ::rtl::OUString aPasswd; + OUString aPasswd; Password >>= aPasswd; xProtectable->unprotect( aPasswd ); } @@ -700,7 +700,7 @@ void ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) throw (uno::RuntimeException) { // #TODO# #FIXME# unused params above, can we do anything with those - rtl::OUString url = rtl::OUString( ".uno:SpellDialog"); + OUString url = OUString( ".uno:SpellDialog"); uno::Reference< frame::XModel > xModel( getModel() ); dispatchRequests(xModel,url); } @@ -802,7 +802,7 @@ ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio // #163498# initialize Names object with correct parent (this worksheet) // TODO: real sheet-local names... uno::Reference< beans::XPropertySet > xProps( mxModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, mxModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); @@ -913,7 +913,7 @@ ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException) } uno::Any SAL_CALL -ScVbaWorksheet::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException) { // #TODO Evaluate allows other things to be evaluated, e.g. functions // I think ( like SIN(3) etc. ) need to investigate that @@ -930,32 +930,32 @@ ScVbaWorksheet::getIntrospection( ) throw (uno::RuntimeException) } uno::Any SAL_CALL -ScVbaWorksheet::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWorksheet::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { OSL_TRACE("** ScVbaWorksheet::invoke( %s ), will barf", - rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); throw uno::RuntimeException(); // unsupported operation } void SAL_CALL -ScVbaWorksheet::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWorksheet::setValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { setDefaultPropByIntrospection( uno::makeAny( getValue( aPropertyName ) ), aValue ); } uno::Any SAL_CALL -ScVbaWorksheet::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) +ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); uno::Reference xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); return uno::makeAny( xControl ); } ::sal_Bool SAL_CALL -ScVbaWorksheet::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException) +ScVbaWorksheet::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException) { return false; } @@ -984,7 +984,7 @@ ScVbaWorksheet::getFormControls() } ::sal_Bool SAL_CALL -ScVbaWorksheet::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException) +ScVbaWorksheet::hasProperty( const OUString& aName ) throw (uno::RuntimeException) { uno::Reference< container::XNameAccess > xFormControls( getFormControls() ); if ( xFormControls.is() ) @@ -993,7 +993,7 @@ ScVbaWorksheet::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeE } uno::Any -ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName ) +ScVbaWorksheet::getControlShape( const OUString& sName ) { // ideally we would get an XControl object but it appears an XControl // implementation only exists for a Control implementation optained from the @@ -1026,10 +1026,10 @@ ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName ) } -rtl::OUString +OUString ScVbaWorksheet::getServiceImplName() { - return rtl::OUString("ScVbaWorksheet"); + return OUString("ScVbaWorksheet"); } void SAL_CALL @@ -1045,23 +1045,23 @@ ScVbaWorksheet::getEnableCalculation( ) throw (css::script::BasicErrorException return xCalculatable->isAutomaticCalculationEnabled(); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWorksheet::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Worksheet" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Worksheet" ); } return aServiceNames; } -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xSheetProp( mxSheet, uno::UNO_QUERY_THROW ); - return xSheetProp->getPropertyValue( ::rtl::OUString( "CodeName" ) ).get< ::rtl::OUString >(); + return xSheetProp->getPropertyValue( OUString( "CodeName" ) ).get< OUString >(); } sal_Int16 diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 53efc595db1f..c3e40110dfdb 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -61,7 +61,7 @@ class ScVbaWorksheet : public WorksheetImpl_BASE css::uno::Reference< ov::excel::XRange > getSheetRange() throw (css::uno::RuntimeException); css::uno::Reference< css::container::XNameAccess > getFormControls(); - css::uno::Any getControlShape( const rtl::OUString& sName ); + css::uno::Any getControlShape( const OUString& sName ); public: ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent, @@ -77,12 +77,12 @@ public: virtual css::uno::Reference< css::sheet::XSpreadsheet > getSheet() { return mxSheet; } static const com::sun::star::uno::Sequence& getUnoTunnelId(); - css::uno::Reference< ov::excel::XWorksheet > createSheetCopyInNewDoc( rtl::OUString); + css::uno::Reference< ov::excel::XWorksheet > createSheetCopyInNewDoc( OUString); css::uno::Reference< ov::excel::XWorksheet > createSheetCopy(css::uno::Reference< ov::excel::XWorksheet> xSheet, bool bAfter); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Int32 nVisible ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException); @@ -123,7 +123,7 @@ public: virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); @@ -147,19 +147,19 @@ public: virtual void SAL_CALL ShowDataForm( ) throw (css::uno::RuntimeException); // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException); // CodeName - virtual rtl::OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException); sal_Int16 getSheetID() throw (css::uno::RuntimeException); virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); // XUnoTunnel virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence& rId ) throw(css::uno::RuntimeException); }; diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 3986dcab2700..581f14f030e3 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -93,16 +93,16 @@ public: virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return sheet::XSpreadsheet::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( !mSheetMap.empty() ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( *cachePos ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > sNames( mSheetMap.size() ); - rtl::OUString* pString = sNames.getArray(); + uno::Sequence< OUString > sNames( mSheetMap.size() ); + OUString* pString = sNames.getArray(); SheetMap::iterator it = mSheetMap.begin(); SheetMap::iterator it_end = mSheetMap.end(); @@ -113,7 +113,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { cachePos = mSheetMap.begin(); SheetMap::iterator it_end = mSheetMap.end(); @@ -221,7 +221,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, if ( isSelectedSheets() ) return uno::Any(); // or should we throw? - rtl::OUString aStringSheet; + OUString aStringSheet; sal_Bool bBefore(sal_True); SCTAB nSheetIndex = 0; SCTAB nNewSheets = 1, nType = 0; @@ -361,7 +361,7 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep } } else - throw uno::RuntimeException( rtl::OUString( "Visible property doesn't support non boolean #FIXME" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Visible property doesn't support non boolean #FIXME" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL @@ -369,7 +369,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException) { ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel ); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); ScMarkData& rMarkData = pViewShell->GetViewData()->GetMarkData(); sal_Bool bReplace = sal_True; @@ -465,33 +465,33 @@ ScVbaWorksheets::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (u } uno::Any -ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException) +ScVbaWorksheets::getItemByStringIndex( const OUString& sIndex ) throw (uno::RuntimeException) { return ScVbaWorksheets_BASE::getItemByStringIndex( sIndex ); } -rtl::OUString +OUString ScVbaWorksheets::getServiceImplName() { - return rtl::OUString("ScVbaWorksheets"); + return OUString("ScVbaWorksheets"); } -css::uno::Sequence +css::uno::Sequence ScVbaWorksheets::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Worksheets"); + sNames[0] = OUString("ooo.vba.excel.Worksheets"); } return sNames; } -bool ScVbaWorksheets::nameExists( uno::Reference & xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException ) +bool ScVbaWorksheets::nameExists( uno::Reference & xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException ) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); uno::Reference xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY ); if ( xIndex.is() ) { diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index e011c43ff67e..61e6a52bfa6e 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -40,7 +40,7 @@ class ScVbaWorksheets : public ScVbaWorksheets_BASE css::uno::Reference< css::sheet::XSpreadsheets > m_xSheets; protected: // ScVbaWorksheets_BASE - virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException); public: ScVbaWorksheets( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xSheets, const css::uno::Reference< css::frame::XModel >& xModel ); ScVbaWorksheets( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XEnumerationAccess >& xEnum, const css::uno::Reference< css::frame::XModel >& xModel ); @@ -66,10 +66,10 @@ public: // ScVbaWorksheets_BASE virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); - static bool nameExists( css::uno::Reference & xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException ); + static bool nameExists( css::uno::Reference & xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException ); }; #endif /* SC_VBA_WORKSHEETS_HXX */ diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 4f507edfd91e..e629922fe88f 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -78,7 +78,7 @@ ScVbaWSFunction::getIntrospection(void) throw(uno::RuntimeException) } uno::Any SAL_CALL -ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { // create copy of parameters, replace Excel range objects with UNO range objects uno::Sequence< uno::Any > aParamTemp( Params ); @@ -122,9 +122,9 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< (*pArray) >>= aTmp[ 0 ]; (*pArray) <<= aTmp; } - else if ( aType.equals( getCppuType( (uno::Sequence*)0 ) ) ) + else if ( aType.equals( getCppuType( (uno::Sequence*)0 ) ) ) { - uno::Sequence< uno::Sequence< rtl::OUString > > aTmp(1); + uno::Sequence< uno::Sequence< OUString > > aTmp(1); (*pArray) >>= aTmp[ 0 ]; (*pArray) <<= aTmp; } @@ -139,7 +139,7 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< default: break; } - OSL_TRACE("Param[%d] is %s", (int)(pArray - aParamTemp.getConstArray()), rtl::OUStringToOString( comphelper::anyToString( *pArray ), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Param[%d] is %s", (int)(pArray - aParamTemp.getConstArray()), OUStringToOString( comphelper::anyToString( *pArray ), RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -179,10 +179,10 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< { uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XFunctionAccess > xFunctionAccess( xSMgr->createInstanceWithContext( - ::rtl::OUString( "com.sun.star.sheet.FunctionAccess" ), mxContext ), + OUString( "com.sun.star.sheet.FunctionAccess" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( xFunctionAccess, uno::UNO_QUERY_THROW ); - xPropSet->setPropertyValue( ::rtl::OUString( "IsArrayFunction" ), uno::Any( bAsArray ) ); + xPropSet->setPropertyValue( OUString( "IsArrayFunction" ), uno::Any( bAsArray ) ); aRet = xFunctionAccess->callFunction( FunctionName, aParamTemp ); } @@ -245,19 +245,19 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< } void SAL_CALL -ScVbaWSFunction::setValue(const rtl::OUString& /*PropertyName*/, const uno::Any& /*Value*/) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWSFunction::setValue(const OUString& /*PropertyName*/, const uno::Any& /*Value*/) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } uno::Any SAL_CALL -ScVbaWSFunction::getValue(const rtl::OUString& /*PropertyName*/) throw(beans::UnknownPropertyException, uno::RuntimeException) +ScVbaWSFunction::getValue(const OUString& /*PropertyName*/) throw(beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } sal_Bool SAL_CALL -ScVbaWSFunction::hasMethod(const rtl::OUString& Name) throw(uno::RuntimeException) +ScVbaWSFunction::hasMethod(const OUString& Name) throw(uno::RuntimeException) { sal_Bool bIsFound = false; try @@ -277,34 +277,34 @@ ScVbaWSFunction::hasMethod(const rtl::OUString& Name) throw(uno::RuntimeExcepti } sal_Bool SAL_CALL -ScVbaWSFunction::hasProperty(const rtl::OUString& /*Name*/) throw(uno::RuntimeException) +ScVbaWSFunction::hasProperty(const OUString& /*Name*/) throw(uno::RuntimeException) { return false; } -::rtl::OUString SAL_CALL -ScVbaWSFunction::getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException) +OUString SAL_CALL +ScVbaWSFunction::getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException) { - rtl::OUString sName = aApproximateName.toAsciiUpperCase(); + OUString sName = aApproximateName.toAsciiUpperCase(); if ( !hasMethod( sName ) ) - return rtl::OUString(); + return OUString(); return sName; } -rtl::OUString +OUString ScVbaWSFunction::getServiceImplName() { - return rtl::OUString("ScVbaWSFunction"); + return OUString("ScVbaWSFunction"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWSFunction::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.WorksheetFunction" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.WorksheetFunction" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index cf6b439bd844..ce0f3cd87a91 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.hxx @@ -35,15 +35,15 @@ public: virtual ~ScVbaWSFunction(){} virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke(const rtl::OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue(const rtl::OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue(const rtl::OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasMethod(const rtl::OUString& Name) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasProperty(const rtl::OUString& Name) throw(css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index bdabddc92b9b..ea6d75cda660 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -60,7 +60,7 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) : pMgr->SetMaxUndoActionCount( 0 ); } SetHelpId( HID_SCSHELL_AUDIT ); - SetName(rtl::OUString("Auditing")); + SetName(OUString("Auditing")); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index e1258f460e45..47dc5ed61128 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -78,7 +78,7 @@ ScCellShell::ScCellShell(ScViewData* pData) : bPastePossible(false) { SetHelpId(HID_SCSHELL_CELLSH); - SetName(rtl::OUString("Cell")); + SetName(OUString("Cell")); } ScCellShell::~ScCellShell() @@ -674,7 +674,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) // In interpreter may happen via rescheduled Basic if ( pDoc->IsInInterpreter() ) - rSet.Put( SfxStringItem( nWhich, rtl::OUString("...") ) ); + rSet.Put( SfxStringItem( nWhich, OUString("...") ) ); else { sal_uInt16 nErrCode = 0; @@ -764,7 +764,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) if ( !pDoc->IsScenario(nTab) ) { - rtl::OUString aStr; + OUString aStr; sal_uInt16 nFlags; SCTAB nScTab = nTab + 1; String aProtect; @@ -784,7 +784,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) } else { - rtl::OUString aComment; + OUString aComment; sal_uInt16 nDummyFlags; pDoc->GetScenarioData( nTab, aComment, aDummyCol, nDummyFlags ); OSL_ENSURE( aList.empty(), "List not empty!" ); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 93353d610729..4377c8012e88 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -93,7 +93,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; -using ::rtl::OUString; //------------------------------------------------------------------ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) @@ -326,7 +325,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { const SfxPoolItem* pItem; - String aFlags = rtl::OUString('A'); + String aFlags = OUString('A'); if( pReqArgs->HasItem( SID_DELETE, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); @@ -440,7 +439,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { const SfxPoolItem* pItem; - String aFlags = rtl::OUString('A'); + String aFlags = OUString('A'); if( pReqArgs->HasItem( FID_FILL_TAB, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); @@ -937,7 +936,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) OSL_ENSURE(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) { - rtl::OUString aNewDimName( pDlg->GetDimensionName() ); + OUString aNewDimName( pDlg->GetDimensionName() ); pTabViewShell->SetDataPilotDetails( true, &aNewDimName ); } } @@ -1041,7 +1040,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - rtl::OUString aCol = bColumns ? rtl::OUString('C') : rtl::OUString('R'); + OUString aCol = bColumns ? OUString('C') : OUString('R'); rReq.AppendItem( SfxStringItem( SID_OUTLINE_MAKE, aCol ) ); rReq.Done(); } @@ -1107,7 +1106,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - rtl::OUString aCol = bColumns ? rtl::OUString('C') : rtl::OUString('R'); + OUString aCol = bColumns ? OUString('C') : OUString('R'); rReq.AppendItem( SfxStringItem( SID_OUTLINE_REMOVE, aCol ) ); rReq.Done(); } @@ -1204,7 +1203,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { const SfxPoolItem* pItem; - String aFlags = rtl::OUString('A'); + String aFlags = OUString('A'); if( pReqArgs->HasItem( FID_INS_CELL_CONTENTS, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); @@ -1387,7 +1386,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( ScTransferObj::GetOwnClipboard( pWin ) ) // own cell data { rReq.SetSlot( FID_INS_CELL_CONTENTS ); - rtl::OUString aFlags; + OUString aFlags; if ( nSlot == SID_PASTE_ONLY_VALUE ) aFlags = "V"; else if ( nSlot == SID_PASTE_ONLY_TEXT ) @@ -1606,7 +1605,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog") + OUString("com.sun.star.linguistic2.ChineseTranslationDialog") , xContext), UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) @@ -1616,7 +1615,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) Sequence aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = rtl::OUString("ParentWindow"); + aParam.Name = OUString("ParentWindow"); aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); @@ -1634,9 +1633,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { try { - xProp->getPropertyValue( rtl::OUString("IsDirectionToSimplified") ) >>= bToSimplified; - xProp->getPropertyValue( rtl::OUString("IsUseCharacterVariants") ) >>= bUseVariants; - xProp->getPropertyValue( rtl::OUString("IsTranslateCommonTerms") ) >>= bCommonTerms; + xProp->getPropertyValue( OUString("IsDirectionToSimplified") ) >>= bToSimplified; + xProp->getPropertyValue( OUString("IsUseCharacterVariants") ) >>= bUseVariants; + xProp->getPropertyValue( OUString("IsTranslateCommonTerms") ) >>= bCommonTerms; } catch( Exception& ) { @@ -2010,11 +2009,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // "=" in KeyEvent, switches to input-mode pScMod->InputKeyEvent( KeyEvent('=',KeyCode()) ); - std::vector aNames = pDlg->GetSelectedNames(); + std::vector aNames = pDlg->GetSelectedNames(); if (!aNames.empty()) { - rtl::OUStringBuffer aBuffer; - for (std::vector::const_iterator itr = aNames.begin(); + OUStringBuffer aBuffer; + for (std::vector::const_iterator itr = aNames.begin(); itr != aNames.end(); ++itr) { aBuffer.append(*itr).append(' '); @@ -2497,7 +2496,7 @@ void ScCellShell::ExecuteDataPilotDialog() { if ( pTypeDlg->IsExternal() ) { - uno::Sequence aSources = ScDPObject::GetRegisteredSources(); + uno::Sequence aSources = ScDPObject::GetRegisteredSources(); ::boost::scoped_ptr pServDlg( pFact->CreateScDataPilotServiceDlg( pTabViewShell->GetDialogParent(), aSources, RID_SCDLG_DAPISERVICE)); diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 75c9ddbd896e..45c94903bfb7 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -209,7 +209,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { uno::Reference xFrame = pViewFrame->GetFrame().GetFrameInterface(); uno::Reference xBeamerFrame = xFrame->findFrame( - rtl::OUString("_beamer"), + OUString("_beamer"), frame::FrameSearchFlag::CHILDREN); if ( xBeamerFrame.is() ) bWasOpen = sal_True; diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 6a17bdd2626b..cd829dca0680 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -422,12 +422,12 @@ void ScCellShell::Execute( SfxRequest& rReq ) { SCTAB i=1; String aBaseName; - rtl::OUString aName; - rtl::OUString aComment; + OUString aName; + OUString aComment; Color aColor; sal_uInt16 nFlags; - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); aBaseName = aTmp; aBaseName += '_'; diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 3a4bd17ca0b5..0bfc31209c83 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -52,7 +52,7 @@ ScDBFunc::~ScDBFunc() // auxiliary functions // -void ScDBFunc::GotoDBArea( const ::rtl::OUString& rDBName ) +void ScDBFunc::GotoDBArea( const OUString& rDBName ) { ScDocument* pDoc = GetViewData()->GetDocument(); ScDBCollection* pDBCol = pDoc->GetDBCollection(); diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index a0d9baa098c3..6338805a6617 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -81,9 +81,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::container::XNameAccess; using ::com::sun::star::sheet::XDimensionsSupplier; -using ::rtl::OUString; -using ::rtl::OUStringHash; -using ::rtl::OUStringBuffer; using ::std::auto_ptr; using ::std::list; using ::std::vector; @@ -587,7 +584,7 @@ bool ScDBFunc::MakePivotTable( SCTAB nSrcTab = GetViewData()->GetTabNo(); String aName( ScGlobal::GetRscString(STR_PIVOT_TABLE) ); - rtl::OUString aStr; + OUString aStr; pDoc->GetName( nSrcTab, aStr ); aName += '_'; @@ -946,7 +943,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar if (aEntries.empty()) return; - std::vector aDeletedNames; + std::vector aDeletedNames; bool bIsDataLayout; OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout ); @@ -954,7 +951,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar ScDPDimensionSaveData* pDimData = aData.GetDimensionData(); // created if not there // find the source dimension name. - rtl::OUString aBaseDimName = aDimName; + OUString aBaseDimName = aDimName; if( const ScDPSaveGroupDimension* pBaseGroupDim = pDimData->GetNamedGroupDim( aDimName ) ) aBaseDimName = pBaseGroupDim->GetSourceDimName(); @@ -1002,7 +999,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar else { // additional parts: create GroupDimension (shown as additional dimensions) - rtl::OUString aGroupDimName = + OUString aGroupDimName = pDimData->CreateDateGroupDimName(nMask, *pDPObj, true, &aDeletedNames); ScDPSaveGroupDimension aGroupDim( aBaseDimName, aGroupDimName ); aGroupDim.SetDateInfo( rInfo, nMask ); @@ -1095,7 +1092,7 @@ void ScDBFunc::GroupDataPilot() ScDPDimensionSaveData* pDimData = aData.GetDimensionData(); // created if not there // find original base - rtl::OUString aBaseDimName = aDimName; + OUString aBaseDimName = aDimName; const ScDPSaveGroupDimension* pBaseGroupDim = pDimData->GetNamedGroupDim( aDimName ); if ( pBaseGroupDim ) { @@ -1114,7 +1111,7 @@ void ScDBFunc::GroupDataPilot() ScDPUniqueStringSet::const_iterator it = aEntries.begin(), itEnd = aEntries.end(); for (; it != itEnd; ++it) { - const rtl::OUString& aEntryName = *it; + const OUString& aEntryName = *it; if ( pBaseGroupDim ) { // for each selected (intermediate) group, remove all its items @@ -1134,7 +1131,7 @@ void ScDBFunc::GroupDataPilot() if ( !pGroupDimension ) { // create a new group dimension - rtl::OUString aGroupDimName = + OUString aGroupDimName = pDimData->CreateGroupDimName(aBaseDimName, *pDPObj, false, NULL); pNewGroupDim = new ScDPSaveGroupDimension( aBaseDimName, aGroupDimName ); @@ -1164,14 +1161,14 @@ void ScDBFunc::GroupDataPilot() } } } - rtl::OUString aGroupDimName = pGroupDimension->GetGroupDimName(); + OUString aGroupDimName = pGroupDimension->GetGroupDimName(); - rtl::OUString aGroupName = pGroupDimension->CreateGroupName(ScGlobal::GetRscString(STR_PIVOT_GROUP)); + OUString aGroupName = pGroupDimension->CreateGroupName(ScGlobal::GetRscString(STR_PIVOT_GROUP)); ScDPSaveGroupItem aGroup( aGroupName ); ScDPUniqueStringSet::const_iterator it = aEntries.begin(), itEnd = aEntries.end(); for (; it != itEnd; ++it) { - const rtl::OUString& aEntryName = *it; + const OUString& aEntryName = *it; if ( pBaseGroupDim ) { // for each selected (intermediate) group, add all its items @@ -1335,7 +1332,7 @@ static OUString lcl_replaceMemberNameInSubtotal(const OUString& rSubtotal, const return aBuf.makeStringAndClear(); } -void ScDBFunc::DataPilotInput( const ScAddress& rPos, const rtl::OUString& rString ) +void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) { using namespace ::com::sun::star::sheet; @@ -1624,7 +1621,7 @@ struct ScOUStringCollate ScOUStringCollate(CollatorWrapper* pColl) : mpCollator(pColl) {} - bool operator()(const rtl::OUString& rStr1, const rtl::OUString& rStr2) const + bool operator()(const OUString& rStr1, const OUString& rStr2) const { return ( mpCollator->compareString(rStr1, rStr2) < 0 ); } @@ -1664,7 +1661,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 typedef ScDPSaveDimension::MemberList MemList; const MemList& rDimMembers = pSaveDim->GetMembers(); list aMembers; - boost::unordered_set aMemberSet; + boost::unordered_set aMemberSet; size_t nMemberCount = 0; for (MemList::const_iterator itr = rDimMembers.begin(), itrEnd = rDimMembers.end(); itr != itrEnd; ++itr) @@ -1785,8 +1782,8 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest bool bValid = ( aDestData.Dimension >= 0 ); // dropping onto a field // look through the source range - boost::unordered_set< rtl::OUString, rtl::OUStringHash, std::equal_to > aMembersSet; // for lookup - std::vector< rtl::OUString > aMembersVector; // members in original order, for inserting + boost::unordered_set< OUString, OUStringHash, std::equal_to > aMembersSet; // for lookup + std::vector< OUString > aMembersVector; // members in original order, for inserting aMembersVector.reserve( std::max( static_cast( rSource.aEnd.Col() - rSource.aStart.Col() + 1 ), static_cast( rSource.aEnd.Row() - rSource.aStart.Row() + 1 ) ) ); for (SCROW nRow = rSource.aStart.Row(); bValid && nRow <= rSource.aEnd.Row(); ++nRow ) @@ -1817,7 +1814,7 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest ScDPSaveDimension* pDim = aData.GetDimensionByName( aDimName ); // get all member names in source order - uno::Sequence aMemberNames; + uno::Sequence aMemberNames; pDPObj->GetMemberNames( aDestData.Dimension, aMemberNames ); bool bInserted = false; @@ -1830,7 +1827,7 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest if ( !bInserted && aMemberNames[nMemberPos] == aDestData.MemberName ) { // insert dragged items before this item - for ( std::vector::const_iterator aIter = aMembersVector.begin(); + for ( std::vector::const_iterator aIter = aMembersVector.begin(); aIter != aMembersVector.end(); ++aIter ) lcl_MoveToEnd( *pDim, *aIter ); bInserted = true; @@ -1841,7 +1838,7 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest } // insert dragged item at end if dest wasn't found (for example, empty) if ( !bInserted ) - for ( std::vector::const_iterator aIter = aMembersVector.begin(); + for ( std::vector::const_iterator aIter = aMembersVector.begin(); aIter != aMembersVector.end(); ++aIter ) lcl_MoveToEnd( *pDim, *aIter ); @@ -1906,7 +1903,7 @@ bool ScDBFunc::HasSelectionForDrillDown( sal_uInt16& rOrientation ) return bRet; } -void ScDBFunc::SetDataPilotDetails(bool bShow, const rtl::OUString* pNewDimensionName) +void ScDBFunc::SetDataPilotDetails(bool bShow, const OUString* pNewDimensionName) { ScDPObject* pDPObj = GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); @@ -1968,7 +1965,7 @@ void ScDBFunc::SetDataPilotDetails(bool bShow, const rtl::OUString* pNewDimensio ScDPUniqueStringSet::const_iterator it = aVisibleEntries.begin(), itEnd = aVisibleEntries.end(); for (; it != itEnd; ++it) { - const rtl::OUString& aVisName = *it; + const OUString& aVisName = *it; ScDPSaveMember* pMember = pDim->GetMemberByName( aVisName ); pMember->SetShowDetails( false ); } @@ -2027,7 +2024,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence>= aStr) { @@ -2043,7 +2040,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence>= aStr)) continue; @@ -2051,7 +2048,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const SequencegetPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_NUMBERFO)) ); + Any any = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_NUMBERFO)) ); sal_Int32 nNumFmt = 0; if (!(any >>= nNumFmt)) continue; @@ -2070,7 +2067,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const SequenceEnterListAction( aUndo, aUndo ); - rtl::OUString aNewTabName; + OUString aNewTabName; pDoc->CreateValidTabName(aNewTabName); if ( InsertTable(aNewTabName, nNewTab) ) PasteFromClip( IDF_ALL, pInsDoc.get() ); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 20c33cef5111..787f55f6cbe5 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -95,7 +95,7 @@ ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) : { SetPool( pEditView->GetEditEngine()->GetEmptyItemSet().GetPool() ); SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() ); - SetName(rtl::OUString("EditCell")); + SetName(OUString("EditCell")); } ScEditShell::~ScEditShell() @@ -145,7 +145,7 @@ static void lcl_RemoveAttribs( EditView& rEditView ) void lclInsertCharacter( EditView* pTableView, EditView* pTopView, sal_Unicode cChar ) { - rtl::OUString aString( cChar ); + OUString aString( cChar ); if( pTableView ) pTableView->InsertText( aString ); if( pTopView ) @@ -413,11 +413,11 @@ void ScEditShell::Execute( SfxRequest& rReq ) if ( nRet == BTN_PASTE_NAME ) { - std::vector aNames = pDlg->GetSelectedNames(); + std::vector aNames = pDlg->GetSelectedNames(); if (!aNames.empty()) { - rtl::OUStringBuffer aBuffer; - for (std::vector::const_iterator itr = aNames.begin(); + OUStringBuffer aBuffer; + for (std::vector::const_iterator itr = aNames.begin(); itr != aNames.end(); ++itr) { aBuffer.append(*itr).append(' '); @@ -1087,7 +1087,7 @@ String ScEditShell::GetSelectionText( sal_Bool bWholeWord ) ESelection aSel = pEditView->GetSelection(); String aStrCurrentDelimiters = pEngine->GetWordDelimiters(); - pEngine->SetWordDelimiters(rtl::OUString(" .,;\"'")); + pEngine->SetWordDelimiters(OUString(" .,;\"'")); aStrSelection = pEngine->GetWord( aSel.nEndPara, aSel.nEndPos ); pEngine->SetWordDelimiters( aStrCurrentDelimiters ); } diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 8a0908155cc7..20b0c99e4998 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -140,7 +140,7 @@ ScFormatShell::ScFormatShell(ScViewData* pData) : pMgr->SetMaxUndoActionCount( 0 ); } SetHelpId(HID_SCSHELL_FORMATSH); - SetName(rtl::OUString("Format")); + SetName(OUString("Format")); } ScFormatShell::~ScFormatShell() @@ -342,8 +342,8 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) xCont->getByName(pFamilyItem->GetValue()) >>= xStyles; com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xInfo; xStyles->getByName( pNameItem->GetValue() ) >>= xInfo; - ::rtl::OUString aUIName; - xInfo->getPropertyValue( ::rtl::OUString("DisplayName") ) >>= aUIName; + OUString aUIName; + xInfo->getPropertyValue( OUString("DisplayName") ) >>= aUIName; if ( !aUIName.isEmpty() ) rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY, aUIName ) ); } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 4f5774c2b9ce..145b887eb2ed 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -132,7 +132,6 @@ using namespace com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -using ::rtl::OUString; const sal_uInt8 SC_NESTEDBUTTON_NONE = 0; const sal_uInt8 SC_NESTEDBUTTON_DOWN = 1; @@ -576,7 +575,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSel if ( bHasSelection ) { - const ::rtl::OUString aName = rStr; + const OUString aName = rStr; pDim->SetCurrentPage( &aName ); } else @@ -626,12 +625,12 @@ public: } }; -class AddItemToEntry : public std::unary_function +class AddItemToEntry : public std::unary_function { ScQueryEntry::QueryItemsType& mrItems; public: AddItemToEntry(ScQueryEntry::QueryItemsType& rItems) : mrItems(rItems) {} - void operator() (const rtl::OUString& rSelected) + void operator() (const OUString& rSelected) { ScQueryEntry::Item aNew; aNew.maString = rSelected; @@ -643,9 +642,9 @@ public: class AddSelectedItemString : public std::unary_function { - boost::unordered_set& mrSet; + boost::unordered_set& mrSet; public: - AddSelectedItemString(boost::unordered_set& r) : + AddSelectedItemString(boost::unordered_set& r) : mrSet(r) {} void operator() (const ScQueryEntry::Item& rItem) @@ -684,7 +683,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) ScQueryParam aParam; pDBData->GetQueryParam(aParam); ScQueryEntry* pEntry = aParam.FindEntryByField(nCol, false); - boost::unordered_set aSelected; + boost::unordered_set aSelected; if (pEntry && pEntry->bDoQuery) { if (pEntry->eOp == SC_EQUAL) @@ -703,7 +702,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) std::vector::const_iterator it = aStrings.begin(), itEnd = aStrings.end(); for (; it != itEnd; ++it) { - const rtl::OUString& aVal = it->GetString(); + const OUString& aVal = it->GetString(); bool bSelected = true; if (!aSelected.empty()) bSelected = aSelected.count(aVal) > 0; @@ -836,7 +835,7 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode) ScCheckListMenuWindow::ResultType aResult; mpAutoFilterPopup->getResult(aResult); - std::vector aSelected; + std::vector aSelected; ScCheckListMenuWindow::ResultType::const_iterator itr = aResult.begin(), itrEnd = aResult.end(); for (; itr != itrEnd; ++itr) { @@ -852,7 +851,7 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode) case Top10: pEntry->eOp = SC_TOPVAL; pEntry->GetQueryItem().meType = ScQueryEntry::ByString; - pEntry->GetQueryItem().maString = rtl::OUString("10"); + pEntry->GetQueryItem().maString = OUString("10"); break; case Empty: pEntry->SetQueryByEmpty(); @@ -980,8 +979,8 @@ void ScGridWindow::DoScenarioMenu( const ScRange& rScenRange ) // Listbox fuellen long nMaxText = 0; - rtl::OUString aCurrent; - rtl::OUString aTabName; + OUString aCurrent; + OUString aTabName; SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nEntryCount = 0; for (SCTAB i=nTab+1; iIsScenario(i); i++) @@ -1210,7 +1209,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec bValid = false; if (rEntry.nField == nCol) { - const rtl::OUString& rQueryStr = rEntry.GetQueryItem().maString; + const OUString& rQueryStr = rEntry.GetQueryItem().maString; if (rEntry.eOp == SC_EQUAL) { if (!rQueryStr.isEmpty()) @@ -1434,7 +1433,7 @@ void ScGridWindow::ExecFilter( sal_uLong nSel, if ( nSel == SC_AUTOFILTER_TOP10 ) { rNewEntry.eOp = SC_TOPVAL; - rItem.maString = rtl::OUString("10"); + rItem.maString = OUString("10"); } else if (nSel == SC_AUTOFILTER_EMPTY) { @@ -3437,7 +3436,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) ScDocument* pThisDoc = pViewData->GetDocument(); if (pSourceDoc == pThisDoc) { - rtl::OUString aName; + OUString aName; if ( pThisDoc->HasChartAtPoint(pViewData->GetTabNo(), PixelToLogic(aPos), aName )) { if (bDragRect) // Rechteck loeschen @@ -3654,7 +3653,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { if ( !rData.aLinkDoc.isEmpty() ) { - rtl::OUString aThisName; + OUString aThisName; ScDocShell* pDocSh = pViewData->GetDocShell(); if (pDocSh && pDocSh->HasName()) aThisName = pDocSh->GetMedium()->GetName(); @@ -3988,7 +3987,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos } else // move/copy block { - rtl::OUString aChartName; + OUString aChartName; if (pThisDoc->HasChartAtPoint( nThisTab, rLogicPos, aChartName )) { String aRangeName; @@ -4178,9 +4177,9 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos aSource.Format( aItem, SCA_VALID | SCA_TAB_3D, pSourceDoc ); // TODO: we could define ocQuote for " - const rtl::OUString aQuote('"'); + const OUString aQuote('"'); const String& sSep = ScCompiler::GetNativeSymbol( ocSep); - rtl::OUStringBuffer aFormula; + OUStringBuffer aFormula; aFormula.append('='); aFormula.append(ScCompiler::GetNativeSymbol(ocDde)); aFormula.append(ScCompiler::GetNativeSymbol(ocOpen)); @@ -4270,7 +4269,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) // try to insert a link bool bOk = true; - rtl::OUString aThisName; + OUString aThisName; ScDocShell* pDocSh = pViewData->GetDocShell(); if (pDocSh && pDocSh->HasName()) aThisName = pDocSh->GetMedium()->GetName(); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 150d3858392b..7edc66a4240a 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -52,8 +52,6 @@ using ::com::sun::star::sheet::DataPilotFieldOrientation; using ::std::vector; using ::std::auto_ptr; using ::boost::unordered_map; -using ::rtl::OUString; -using ::rtl::OUStringHash; // STATIC DATA ----------------------------------------------------------- @@ -476,7 +474,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu( for (size_t i = 0; i < n; ++i) { const ScDPLabelData::Member& rMem = rLabelData.maMembers[i]; - rtl::OUString aName = rMem.getDisplayName(); + OUString aName = rMem.getDisplayName(); if (aName.isEmpty()) // Use special string for an empty name. mpDPFieldPopup->addMember(ScGlobal::GetRscString(STR_EMPTYDATA), rMem.mbVisible); @@ -573,10 +571,10 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu() if (itrNameMap == aMemNameMap.end()) { // This is an original member name. Use it as-is. - rtl::OUString aName = itr->first; + OUString aName = itr->first; if (aName.equals(ScGlobal::GetRscString(STR_EMPTYDATA))) // Translate the special empty name into an empty string. - aName = rtl::OUString(); + aName = OUString(); aResult.insert( ScCheckListMenuWindow::ResultType::value_type( diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 767dfd2ef8dd..bf6124787b84 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -226,12 +226,12 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S sal_Bool bTextBelow = ( aRange.aStart.Row() == 0 ); - rtl::OUString aCurrent; + OUString aCurrent; Color aColor( COL_LIGHTGRAY ); for (SCTAB nAct=nTab+1; nActIsScenario(nAct); nAct++) if ( pDoc->IsActiveScenario(nAct) && pDoc->HasScenarioRange(nAct,aRange) ) { - rtl::OUString aDummyComment; + OUString aDummyComment; sal_uInt16 nDummyFlags; pDoc->GetName( nAct, aCurrent ); pDoc->GetScenarioData( nAct, aDummyComment, aColor, nDummyFlags ); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 9789a24ba8d1..7055c223d9e3 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -150,7 +150,7 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) aTrackText += aComStr; aTrackText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "\n( " )); } - rtl::OUString aTmp; + OUString aTmp; pFound->GetDescription(aTmp, pDoc); aTrackText += String(aTmp); if(aComStr.Len()>0) diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 3a826749a48c..aceb806b888e 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -75,14 +75,14 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn bBoldSet = sal_True; Size aSize = LogicToPixel( Size( - GetTextWidth(rtl::OUString("8888")), + GetTextWidth(OUString("8888")), GetTextHeight() ) ); aSize.Width() += 4; // Platz fuer hervorgehobene Umrandung aSize.Height() += 3; SetSizePixel( aSize ); nWidth = nSmallWidth = aSize.Width(); - nBigWidth = LogicToPixel( Size( GetTextWidth(rtl::OUString("8888888")), 0 ) ).Width() + 5; + nBigWidth = LogicToPixel( Size( GetTextWidth(OUString("8888888")), 0 ) ).Width() + 5; SetBackground(); // sonst Probleme auf OS/2 !?!?! } diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index fa5fd662f9f5..1eef35b0f5a7 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -91,8 +91,8 @@ class ScActionColorChanger { private: const ScAppOptions& rOpt; - const std::set& rUsers; - rtl::OUString aLastUserName; + const std::set& rUsers; + OUString aLastUserName; size_t nLastUserIndex; ColorData nColor; @@ -143,7 +143,7 @@ void ScActionColorChanger::Update( const ScChangeAction& rAction ) if (!aLastUserName.equals(rAction.GetUser())) { aLastUserName = rAction.GetUser(); - std::set::const_iterator it = rUsers.find(aLastUserName); + std::set::const_iterator it = rUsers.find(aLastUserName); if (it == rUsers.end()) { // empty string is possible if a name wasn't found while saving a 5.0 file diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index c1bf7ebc5c3b..b04a0d01c0e4 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -542,7 +542,7 @@ bool ScDrawStringsVars::SetText( ScRefCellValue& rCell ) void ScDrawStringsVars::SetHashText() { - SetAutoText(rtl::OUString("###")); + SetAutoText(OUString("###")); } void ScDrawStringsVars::RepeatToFill( long colWidth ) @@ -550,7 +550,7 @@ void ScDrawStringsVars::RepeatToFill( long colWidth ) if ( nPos == STRING_NOTFOUND || nPos > aString.Len() ) return; - long charWidth = pOutput->pFmtDevice->GetTextWidth(rtl::OUString(nChar)); + long charWidth = pOutput->pFmtDevice->GetTextWidth(OUString(nChar)); if ( charWidth < 1) return; if (bPixelToLogic) colWidth = pOutput->mpRefDevice->PixelToLogic(Size(colWidth,0)).Width(); @@ -717,7 +717,7 @@ long ScDrawStringsVars::GetMaxDigitWidth() for (sal_Char i = 0; i < 10; ++i) { sal_Char cDigit = cZero + i; - long n = pOutput->pFmtDevice->GetTextWidth(rtl::OUString(cDigit)); + long n = pOutput->pFmtDevice->GetTextWidth(OUString(cDigit)); nMaxDigitWidth = ::std::max(nMaxDigitWidth, n); } return nMaxDigitWidth; @@ -728,7 +728,7 @@ long ScDrawStringsVars::GetSignWidth() if (nSignWidth > 0) return nSignWidth; - nSignWidth = pOutput->pFmtDevice->GetTextWidth(rtl::OUString('-')); + nSignWidth = pOutput->pFmtDevice->GetTextWidth(OUString('-')); return nSignWidth; } @@ -737,7 +737,7 @@ long ScDrawStringsVars::GetDotWidth() if (nDotWidth > 0) return nDotWidth; - const ::rtl::OUString& sep = ScGlobal::GetpLocaleData()->getLocaleItem().decimalSeparator; + const OUString& sep = ScGlobal::GetpLocaleData()->getLocaleItem().decimalSeparator; nDotWidth = pOutput->pFmtDevice->GetTextWidth(sep); return nDotWidth; } @@ -747,7 +747,7 @@ long ScDrawStringsVars::GetExpWidth() if (nExpWidth > 0) return nExpWidth; - nExpWidth = pOutput->pFmtDevice->GetTextWidth(rtl::OUString('E')); + nExpWidth = pOutput->pFmtDevice->GetTextWidth(OUString('E')); return nExpWidth; } @@ -1371,7 +1371,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY namespace { -bool beginsWithRTLCharacter(const rtl::OUString& rStr) +bool beginsWithRTLCharacter(const OUString& rStr) { if (rStr.isEmpty()) return false; @@ -2796,7 +2796,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) ) { - rParam.mpEngine->SetText(rtl::OUString("###")); + rParam.mpEngine->SetText(OUString("###")); nEngineWidth = (long) rParam.mpEngine->CalcTextWidth(); if (rParam.mbPixelToLogic) nNeededPixel = mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(); @@ -3178,7 +3178,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) ) { - rParam.mpEngine->SetText(rtl::OUString("###")); + rParam.mpEngine->SetText(OUString("###")); nEngineWidth = (long) rParam.mpEngine->CalcTextWidth(); if (rParam.mbPixelToLogic) nNeededPixel = mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(); @@ -3548,7 +3548,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) ) { - rParam.mpEngine->SetText(rtl::OUString("###")); + rParam.mpEngine->SetText(OUString("###")); nEngineWidth = (long) rParam.mpEngine->CalcTextWidth(); if (rParam.mbPixelToLogic) nNeededPixel = mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(); @@ -3930,7 +3930,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) ) { - rParam.mpEngine->SetText(rtl::OUString("###")); + rParam.mpEngine->SetText(OUString("###")); nEngineWidth = (long) rParam.mpEngine->CalcTextWidth(); if (rParam.mbPixelToLogic) nNeededPixel = mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(); @@ -4339,7 +4339,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip ) ) { - rParam.mpEngine->SetText(rtl::OUString("###")); + rParam.mpEngine->SetText(OUString("###")); nEngineWidth = (long) rParam.mpEngine->CalcTextWidth(); if (rParam.mbPixelToLogic) nNeededPixel = mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(); @@ -4641,7 +4641,7 @@ void ScOutputData::DrawEdit(sal_Bool bPixelToLogic) lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(sal_False) // fdo#32530: Check if the first character is RTL. - rtl::OUString aStr = mpDoc->GetString(nCellX, nCellY, nTab); + OUString aStr = mpDoc->GetString(nCellX, nCellY, nTab); DrawEditParam aParam(pPattern, pCondSet, lcl_SafeIsValue(aCell)); aParam.mbPixelToLogic = bPixelToLogic; @@ -4966,7 +4966,7 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic) { sal_uLong nFormat = pPattern->GetNumberFormat( mpDoc->GetFormatTable(), pCondSet ); - rtl::OUString aString; + OUString aString; Color* pColor; ScCellFormat::GetString( aCell, nFormat,aString, &pColor, diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index 3186eac69d64..e5b2c33f6e25 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -59,7 +59,7 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) : pMgr->SetMaxUndoActionCount( 0 ); } SetHelpId( HID_SCSHELL_PAGEBREAK ); - SetName(rtl::OUString("PageBreak")); + SetName(OUString("PageBreak")); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index f4607a18adb3..57a7b56ad33d 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -67,7 +67,7 @@ ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) : pMgr->SetMaxUndoActionCount( 0 ); } SetHelpId( HID_SCSHELL_PIVOTSH ); - SetName(rtl::OUString("Pivot")); + SetName(OUString("Pivot")); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 5358705cd3d8..1ad8f0f06259 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -139,7 +139,7 @@ void ScPreviewShell::Construct( Window* pParent ) pVerScroll->Show( false ); pCorner->Show(); SetHelpId( HID_SCSHELL_PREVWSH ); - SetName(rtl::OUString("Preview")); + SetName(OUString("Preview")); } ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, @@ -208,7 +208,7 @@ void ScPreviewShell::InitStartTable(SCTAB nTab) String ScPreviewShell::GetDescription() const { - return rtl::OUString(" ** Test ** "); + return OUString(" ** Test ** "); } void ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) @@ -896,7 +896,7 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData ) { ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab = pPreview->GetTab(); - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); rData.aTabName = aTmp; @@ -951,14 +951,14 @@ void ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue if(pSeq) { sal_uInt16 nViewID(GetViewFrame()->GetCurViewId()); - pSeq[0].Name = rtl::OUString(SC_VIEWID); - rtl::OUStringBuffer sBuffer(rtl::OUString(SC_VIEW)); + pSeq[0].Name = OUString(SC_VIEWID); + OUStringBuffer sBuffer(OUString(SC_VIEW)); ::sax::Converter::convertNumber(sBuffer, static_cast(nViewID)); pSeq[0].Value <<= sBuffer.makeStringAndClear(); - pSeq[1].Name = rtl::OUString(SC_ZOOMVALUE); + pSeq[1].Name = OUString(SC_ZOOMVALUE); pSeq[1].Value <<= sal_Int32 (pPreview->GetZoom()); - pSeq[2].Name = rtl::OUString("PageNumber"); + pSeq[2].Name = OUString("PageNumber"); pSeq[2].Value <<= pPreview->GetPageNo(); } } @@ -973,7 +973,7 @@ void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyV { for(sal_Int32 i = 0; i < nCount; i++, pSeq++) { - rtl::OUString sName(pSeq->Name); + OUString sName(pSeq->Name); if(sName.compareToAscii(SC_ZOOMVALUE) == 0) { sal_Int32 nTemp = 0; diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 6214fa22f0b4..15fea31959dc 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1646,7 +1646,7 @@ sal_Bool ScPrintFunc::IsLeft( long nPageNo ) // left foot notes? void ScPrintFunc::MakeTableString() { - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nPrintTab, aTmp); aFieldData.aTabName = aTmp; } @@ -1841,7 +1841,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, sal_Bool bDoPrint, ScPreviewLocation ScAutoFontColorMode eColorMode = bUseStyleColor ? SC_AUTOCOL_DISPLAY : SC_AUTOCOL_PRINT; ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).GetFont( aMarkFont, eColorMode ); pDev->SetFont( aMarkFont ); - long nMarkLen = pDev->GetTextWidth(rtl::OUString("GW99999:")); + long nMarkLen = pDev->GetTextWidth(OUString("GW99999:")); // without Space-Char, because it rarle arrives there Size aDataSize = aPageRect.GetSize(); @@ -2377,7 +2377,7 @@ sal_Bool ScPrintFunc::UpdatePages() nZoom = ZOOM_MIN; } - rtl::OUString aName = pDoc->GetPageStyle( nPrintTab ); + OUString aName = pDoc->GetPageStyle( nPrintTab ); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTabGetPageStyle(nTab)==aName ) diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index d1fe9d40058f..a0394a4169b0 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -51,7 +51,7 @@ ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) : { ScDocument* pDoc = pViewData->GetDocument(); - rtl::OUString aString; + OUString aString; Color aTabBgColor; SCTAB nCount = pDoc->GetTableCount(); for (SCTAB i=0; iIsDocEditable() || pScMod->IsTableLocked()) return; - rtl::OUString aName; + OUString aName; pDoc->CreateValidTabName(aName); SCTAB nTabCount = pDoc->GetTableCount(); pViewData->GetViewShell()->InsertTable(aName, nTabCount); @@ -299,7 +299,7 @@ void ScTabControl::UpdateStatus() SCTAB nCount = pDoc->GetTableCount(); SCTAB i; - rtl::OUString aString; + OUString aString; SCTAB nMaxCnt = Max( nCount, static_cast(GetMaxId()) ); Color aTabBgColor; @@ -313,7 +313,7 @@ void ScTabControl::UpdateStatus() } else { - aString = rtl::OUString(); + aString = OUString(); } if ( !aString.equals(GetPageText(static_cast(i)+1)) || (GetTabBgColor(static_cast(i)+1) != aTabBgColor) ) diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index da817a124d7d..e1041b1964d5 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -803,7 +803,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) GetStaticInterface()->GetSlot(SID_SELECT_TABLES)->GetCommand(), HID_SELECTTABLES ); // fill all table names with selection state - rtl::OUString aTabName; + OUString aTabName; for( nTab = 0; nTab < nTabCount; ++nTab ) { rDoc.GetName( nTab, aTabName ); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 04af91d985d6..ecc73952b53a 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1474,7 +1474,7 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) bReadOnly = pDocSh->IsReadOnly(); - SetName(rtl::OUString("View")); // fuer SBX + SetName(OUString("View")); // fuer SBX Color aColBlack( COL_BLACK ); SetPool( &SC_MOD()->GetPool() ); SetWindow( GetActiveWin() ); @@ -1777,7 +1777,7 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) ScDocShell* pDocShell = GetViewData()->GetDocShell(); ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab = GetViewData()->GetTabNo(); - rtl::OUString aTmp; + OUString aTmp; pDoc->GetName(nTab, aTmp); rData.aTabName = aTmp; diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 7436c3c8e526..24b61924041a 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -143,7 +143,7 @@ ScInputHandler* ScTabViewShell::GetInputHandler() const String ScTabViewShell::GetDescription() const { - return rtl::OUString(" ** Test ** "); + return OUString(" ** Test ** "); } void ScTabViewShell::ExecImageMap( SfxRequest& rReq ) diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index b1fc8d378b0d..2b31d63f95d4 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -565,7 +565,7 @@ void ScTabViewShell::GetUndoState(SfxItemSet &rSet) size_t nCount = bIsUndo ? pUndoManager->GetUndoActionCount() : pUndoManager->GetRedoActionCount(); for (size_t i=0; iGetUndoActionComment(i) : + aList.push_back( OUString( bIsUndo ? pUndoManager->GetUndoActionComment(i) : pUndoManager->GetRedoActionComment(i) ) ); } } diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 3652415e2290..6c70b2a10cf8 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -150,7 +150,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( { if (!mbInSwitch) { - std::map aRangeMap; + std::map aRangeMap; pDoc->GetRangeNameMap(aRangeMap); pResult = new ScNameDefDlg( pB, pCW, pParent, GetViewData(), aRangeMap, ScAddress( GetViewData()->GetCurX(), @@ -159,11 +159,11 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( } else { - std::map aRangeMap; - for (boost::ptr_map::iterator itr = maRangeMap.begin(); + std::map aRangeMap; + for (boost::ptr_map::iterator itr = maRangeMap.begin(); itr != maRangeMap.end(); ++itr) { - aRangeMap.insert(std::pair(itr->first, itr->second)); + aRangeMap.insert(std::pair(itr->first, itr->second)); } pResult = new ScNameDefDlg( pB, pCW, pParent, GetViewData(), aRangeMap, ScAddress( GetViewData()->GetCurX(), diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index ee01c6bde6e7..8a64214c1176 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -96,7 +96,7 @@ String ScTabViewShell::GetSelectionText( sal_Bool bWholeWord ) ScImportExport aObj( pDoc, aRange ); aObj.SetFormulas( GetViewData()->GetOptions().GetOption( VOPT_FORMULAS ) ); - rtl::OUString aExportOUString; + OUString aExportOUString; aObj.ExportString( aExportOUString ); aStrSelection = convertLineEnd(aExportOUString, LINEEND_CR); diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index d26c22aae5b1..f3db8bc07b28 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -71,7 +71,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { case FID_TABLE_VISIBLE: { - rtl::OUString aName; + OUString aName; pDoc->GetName( nCurrentTab, aName ); sal_Bool bVisible=sal_True; @@ -134,7 +134,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) AbstractScShowTabDlg* pDlg = pFact->CreateScShowTabDlg( GetDialogParent(), RID_SCDLG_SHOW_TAB); OSL_ENSURE(pDlg, "Dialog create fail!"); - rtl::OUString aTabName; + OUString aTabName; sal_Bool bFirst = sal_True; for ( SCTAB i=0; i != nTabCount; i++ ) { @@ -256,7 +256,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - std::vector aNames(0); + std::vector aNames(0); InsertTables( aNames, nTabNr,nCount ); } } @@ -286,7 +286,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - std::vector aNames(0); + std::vector aNames(0); InsertTables( aNames, nTabAfter,nCount); } } @@ -352,7 +352,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) sal_uInt16 nRet = RET_OK; sal_Bool bDone = false; String aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); - rtl::OUString aName; + OUString aName; String aDlgTitle; const sal_Char* pHelpId = 0; @@ -437,8 +437,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) sal_uInt16 nDoc = 0; SCTAB nTab = pViewData->GetTabNo(); sal_Bool bCpy = false; - rtl::OUString aDocName; - rtl::OUString aTabName; + OUString aDocName; + OUString aTabName; if( pReqArgs != NULL ) { @@ -496,7 +496,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - rtl::OUString aDefaultName; + OUString aDefaultName; pDoc->GetName( pViewData->GetTabNo(), aDefaultName ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -878,7 +878,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_TAB_RENAME: { - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( nTab, aTabName ); rSet.Put( SfxStringItem( nWhich, aTabName )); diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index 4fafbe90f011..b477f0d1dba3 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -71,27 +71,27 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL, uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Any aAny; - aAny <<= rtl::OUString(rName); - xPropSet->setPropertyValue( rtl::OUString( "Label" ), aAny ); + aAny <<= OUString(rName); + xPropSet->setPropertyValue( OUString( "Label" ), aAny ); - ::rtl::OUString aTmp = INetURLObject::GetAbsURL( pDoc->GetDocumentShell()->GetMedium()->GetBaseURL(), rURL ); + OUString aTmp = INetURLObject::GetAbsURL( pDoc->GetDocumentShell()->GetMedium()->GetBaseURL(), rURL ); aAny <<= aTmp; - xPropSet->setPropertyValue( rtl::OUString( "TargetURL" ), aAny ); + xPropSet->setPropertyValue( OUString( "TargetURL" ), aAny ); if( rTarget.Len() ) { - aAny <<= rtl::OUString(rTarget); - xPropSet->setPropertyValue( rtl::OUString( "TargetFrame" ), aAny ); + aAny <<= OUString(rTarget); + xPropSet->setPropertyValue( OUString( "TargetFrame" ), aAny ); } form::FormButtonType eButtonType = form::FormButtonType_URL; aAny <<= eButtonType; - xPropSet->setPropertyValue( rtl::OUString( "ButtonType" ), aAny ); + xPropSet->setPropertyValue( OUString( "ButtonType" ), aAny ); if ( ::avmedia::MediaWindow::isMediaURL( rURL ) ) { aAny <<= sal_True; - xPropSet->setPropertyValue( rtl::OUString( "DispatchURLInternal" ), aAny ); + xPropSet->setPropertyValue( OUString( "DispatchURLInternal" ), aAny ); } Point aPos; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 2f50245d4760..0068209e7a46 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -112,45 +112,45 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence beans::PropertyValue* pSettings = rSettings.getArray(); if (pSettings) { - pSettings[SC_CURSOR_X].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONX)); + pSettings[SC_CURSOR_X].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONX)); pSettings[SC_CURSOR_X].Value <<= sal_Int32(nCurX); - pSettings[SC_CURSOR_Y].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONY)); + pSettings[SC_CURSOR_Y].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURSORPOSITIONY)); pSettings[SC_CURSOR_Y].Value <<= sal_Int32(nCurY); - pSettings[SC_HORIZONTAL_SPLIT_MODE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITMODE)); + pSettings[SC_HORIZONTAL_SPLIT_MODE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITMODE)); pSettings[SC_HORIZONTAL_SPLIT_MODE].Value <<= sal_Int16(eHSplitMode); - pSettings[SC_VERTICAL_SPLIT_MODE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITMODE)); + pSettings[SC_VERTICAL_SPLIT_MODE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITMODE)); pSettings[SC_VERTICAL_SPLIT_MODE].Value <<= sal_Int16(eVSplitMode); - pSettings[SC_HORIZONTAL_SPLIT_POSITION].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITPOSITION)); + pSettings[SC_HORIZONTAL_SPLIT_POSITION].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSPLITPOSITION)); if (eHSplitMode == SC_SPLIT_FIX) pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosX); else pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nHSplitPos); - pSettings[SC_VERTICAL_SPLIT_POSITION].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITPOSITION)); + pSettings[SC_VERTICAL_SPLIT_POSITION].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITPOSITION)); if (eVSplitMode == SC_SPLIT_FIX) pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosY); else pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nVSplitPos); - pSettings[SC_ACTIVE_SPLIT_RANGE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVESPLITRANGE)); + pSettings[SC_ACTIVE_SPLIT_RANGE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVESPLITRANGE)); pSettings[SC_ACTIVE_SPLIT_RANGE].Value <<= sal_Int16(eWhichActive); - pSettings[SC_POSITION_LEFT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONLEFT)); + pSettings[SC_POSITION_LEFT].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONLEFT)); pSettings[SC_POSITION_LEFT].Value <<= sal_Int32(nPosX[SC_SPLIT_LEFT]); - pSettings[SC_POSITION_RIGHT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONRIGHT)); + pSettings[SC_POSITION_RIGHT].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONRIGHT)); pSettings[SC_POSITION_RIGHT].Value <<= sal_Int32(nPosX[SC_SPLIT_RIGHT]); - pSettings[SC_POSITION_TOP].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONTOP)); + pSettings[SC_POSITION_TOP].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONTOP)); pSettings[SC_POSITION_TOP].Value <<= sal_Int32(nPosY[SC_SPLIT_TOP]); - pSettings[SC_POSITION_BOTTOM].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONBOTTOM)); + pSettings[SC_POSITION_BOTTOM].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONBOTTOM)); pSettings[SC_POSITION_BOTTOM].Value <<= sal_Int32(nPosY[SC_SPLIT_BOTTOM]); sal_Int32 nZoomValue ((aZoomY.GetNumerator() * 100) / aZoomY.GetDenominator()); sal_Int32 nPageZoomValue ((aPageZoomY.GetNumerator() * 100) / aPageZoomY.GetDenominator()); - pSettings[SC_TABLE_ZOOM_TYPE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); + pSettings[SC_TABLE_ZOOM_TYPE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); pSettings[SC_TABLE_ZOOM_TYPE].Value <<= sal_Int16(eZoomType); - pSettings[SC_TABLE_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); + pSettings[SC_TABLE_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); pSettings[SC_TABLE_ZOOM_VALUE].Value <<= nZoomValue; - pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); + pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue; - pSettings[SC_TABLE_SHOWGRID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); + pSettings[SC_TABLE_SHOWGRID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); pSettings[SC_TABLE_SHOWGRID].Value <<= static_cast(bShowGrid); } } @@ -170,7 +170,7 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence >= nTemp32; @@ -2613,8 +2613,8 @@ void ScViewData::WriteUserDataSequence(uno::Sequence & rSe if (pSettings) { sal_uInt16 nViewID(pViewShell->GetViewFrame()->GetCurViewId()); - pSettings[SC_VIEW_ID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEWID)); - rtl::OUStringBuffer sBuffer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEW))); + pSettings[SC_VIEW_ID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEWID)); + OUStringBuffer sBuffer(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VIEW))); ::sax::Converter::convertNumber(sBuffer, static_cast(nViewID)); pSettings[SC_VIEW_ID].Value <<= sBuffer.makeStringAndClear(); @@ -2627,7 +2627,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence & rSe { uno::Sequence aTableViewSettings; maTabData[nTab]->WriteUserDataSequence(aTableViewSettings, *this, nTab); - rtl::OUString sTabName; + OUString sTabName; GetDocument()->GetName( nTab, sTabName ); uno::Any aAny; aAny <<= aTableViewSettings; @@ -2646,61 +2646,61 @@ void ScViewData::WriteUserDataSequence(uno::Sequence & rSe } } } - pSettings[SC_TABLE_VIEWSETTINGS].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_TABLES)); + pSettings[SC_TABLE_VIEWSETTINGS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_TABLES)); pSettings[SC_TABLE_VIEWSETTINGS].Value <<= xNameContainer; - rtl::OUString sName; + OUString sName; GetDocument()->GetName( nTabNo, sName ); - pSettings[SC_ACTIVE_TABLE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); + pSettings[SC_ACTIVE_TABLE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVETABLE)); pSettings[SC_ACTIVE_TABLE].Value <<= sName; - pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSCROLLBARWIDTH)); + pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_HORIZONTALSCROLLBARWIDTH)); pSettings[SC_HORIZONTAL_SCROLL_BAR_WIDTH].Value <<= sal_Int32(pView->GetTabBarWidth()); sal_Int32 nZoomValue ((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator()); sal_Int32 nPageZoomValue ((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator()); - pSettings[SC_ZOOM_TYPE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); + pSettings[SC_ZOOM_TYPE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMTYPE)); pSettings[SC_ZOOM_TYPE].Value <<= sal_Int16(pThisTab->eZoomType); - pSettings[SC_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); + pSettings[SC_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ZOOMVALUE)); pSettings[SC_ZOOM_VALUE].Value <<= nZoomValue; - pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); + pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE)); pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue; - pSettings[SC_PAGE_BREAK_PREVIEW].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SHOWPAGEBREAKPREVIEW)); + pSettings[SC_PAGE_BREAK_PREVIEW].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SHOWPAGEBREAKPREVIEW)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_PAGE_BREAK_PREVIEW].Value, bPagebreak); if (pOptions) { - pSettings[SC_SHOWZERO].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWZERO)); + pSettings[SC_SHOWZERO].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWZERO)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWZERO].Value, pOptions->GetOption( VOPT_NULLVALS ) ); - pSettings[SC_SHOWNOTES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWNOTES)); + pSettings[SC_SHOWNOTES].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWNOTES)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWNOTES].Value, pOptions->GetOption( VOPT_NOTES ) ); - pSettings[SC_SHOWGRID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); + pSettings[SC_SHOWGRID].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWGRID].Value, pOptions->GetOption( VOPT_GRID ) ); - pSettings[SC_GRIDCOLOR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_GRIDCOLOR)); + pSettings[SC_GRIDCOLOR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_GRIDCOLOR)); String aColorName; Color aColor = pOptions->GetGridColor(&aColorName); pSettings[SC_GRIDCOLOR].Value <<= static_cast(aColor.GetColor()); - pSettings[SC_SHOWPAGEBR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWPAGEBR)); + pSettings[SC_SHOWPAGEBR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWPAGEBR)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWPAGEBR].Value, pOptions->GetOption( VOPT_PAGEBREAKS ) ); - pSettings[SC_COLROWHDR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLROWHDR)); + pSettings[SC_COLROWHDR].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_COLROWHDR)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_COLROWHDR].Value, pOptions->GetOption( VOPT_HEADER ) ); - pSettings[SC_SHEETTABS].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETTABS)); + pSettings[SC_SHEETTABS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHEETTABS)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHEETTABS].Value, pOptions->GetOption( VOPT_TABCONTROLS ) ); - pSettings[SC_OUTLSYMB].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_OUTLSYMB)); + pSettings[SC_OUTLSYMB].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_OUTLSYMB)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_OUTLSYMB].Value, pOptions->GetOption( VOPT_OUTLINER ) ); const ScGridOptions& aGridOpt = pOptions->GetGridOptions(); - pSettings[SC_SNAPTORASTER].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SNAPTORASTER)); + pSettings[SC_SNAPTORASTER].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SNAPTORASTER)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SNAPTORASTER].Value, aGridOpt.GetUseGridSnap() ); - pSettings[SC_RASTERVIS].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERVIS)); + pSettings[SC_RASTERVIS].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERVIS)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERVIS].Value, aGridOpt.GetGridVisible() ); - pSettings[SC_RASTERRESX].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESX)); + pSettings[SC_RASTERRESX].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESX)); pSettings[SC_RASTERRESX].Value <<= static_cast ( aGridOpt.GetFldDrawX() ); - pSettings[SC_RASTERRESY].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESY)); + pSettings[SC_RASTERRESY].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERRESY)); pSettings[SC_RASTERRESY].Value <<= static_cast ( aGridOpt.GetFldDrawY() ); - pSettings[SC_RASTERSUBX].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBX)); + pSettings[SC_RASTERSUBX].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBX)); pSettings[SC_RASTERSUBX].Value <<= static_cast ( aGridOpt.GetFldDivisionX() ); - pSettings[SC_RASTERSUBY].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBY)); + pSettings[SC_RASTERSUBY].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSUBY)); pSettings[SC_RASTERSUBY].Value <<= static_cast ( aGridOpt.GetFldDivisionY() ); - pSettings[SC_RASTERSYNC].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSYNC)); + pSettings[SC_RASTERSYNC].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_RASTERSYNC)); ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERSYNC].Value, aGridOpt.GetSynchronize() ); } } @@ -2720,13 +2720,13 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence for (sal_Int32 i = 0; i < nCount; i++) { // SC_VIEWID has to parse and use by mba - rtl::OUString sName(rSettings[i].Name); + OUString sName(rSettings[i].Name); if (sName.compareToAscii(SC_TABLES) == 0) { uno::Reference xNameContainer; if ((rSettings[i].Value >>= xNameContainer) && xNameContainer->hasElements()) { - uno::Sequence< rtl::OUString > aNames(xNameContainer->getElementNames()); + uno::Sequence< OUString > aNames(xNameContainer->getElementNames()); for (sal_Int32 nTabPos = 0; nTabPos < aNames.getLength(); nTabPos++) { String sTabName(aNames[nTabPos]); @@ -2751,7 +2751,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence } else if (sName.compareToAscii(SC_ACTIVETABLE) == 0) { - rtl::OUString sValue; + OUString sValue; if(rSettings[i].Value >>= sValue) { String sTabName(sValue); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 22a25ec3adb7..cb881d2882b1 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -85,15 +85,13 @@ #include using namespace com::sun::star; -using ::rtl::OUStringBuffer; -using ::rtl::OUString; using ::editeng::SvxBorderLine; using ::std::vector; using ::std::auto_ptr; // helper func defined in docfunc.cxx -void VBA_DeleteModule( ScDocShell& rDocSh, const rtl::OUString& sModuleName ); +void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ); // STATIC DATA --------------------------------------------------------------- @@ -1290,7 +1288,7 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } } @@ -1351,7 +1349,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, break; } aChangeRanges.Append( aChangeRange ); - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } } } @@ -1609,7 +1607,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, std::auto_ptr pUndoDoc; std::auto_ptr pUndoMark; SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OUString aUndoStr; + OUString aUndoStr; if (bAddUndo) { pUndoMark.reset(new ScMarkData(rMark)); // Mark is being modified @@ -1950,7 +1948,7 @@ sal_Bool ScViewFunc::InsertTable( const String& rName, SCTAB nTab, sal_Bool bRec //---------------------------------------------------------------------------- // Insert tables -sal_Bool ScViewFunc::InsertTables(std::vector& aNames, SCTAB nTab, +sal_Bool ScViewFunc::InsertTables(std::vector& aNames, SCTAB nTab, SCTAB nCount, sal_Bool bRecord ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2069,7 +2067,7 @@ bool ScViewFunc::DeleteTables( const SCTAB nTab, SCTAB nSheets ) { for (SCTAB aTab = 0; aTab < nSheets; ++aTab) { - rtl::OUString sCodeName; + OUString sCodeName; bool bHasCodeName = pDoc->GetCodeName( nTab + aTab, sCodeName ); if ( bHasCodeName ) VBA_DeleteModule( *pDocSh, sCodeName ); @@ -2116,7 +2114,7 @@ sal_Bool ScViewFunc::DeleteTables(const vector &TheTabs, sal_Bool bRecord pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); SCTAB nCount = pDoc->GetTableCount(); - rtl::OUString aOldName; + OUString aOldName; for(unsigned int i=0; i &TheTabs, sal_Bool bRecord if ( pDoc->IsScenario(nTab) ) { pUndoDoc->SetScenario( nTab, sal_True ); - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nScenFlags; pDoc->GetScenarioData( nTab, aComment, aColor, nScenFlags ); @@ -2169,7 +2167,7 @@ sal_Bool ScViewFunc::DeleteTables(const vector &TheTabs, sal_Bool bRecord for(int i=TheTabs.size()-1; i>=0; --i) { - rtl::OUString sCodeName; + OUString sCodeName; sal_Bool bHasCodeName = pDoc->GetCodeName( TheTabs[i], sCodeName ); if (pDoc->DeleteTab( TheTabs[i], pUndoDoc )) { @@ -2283,9 +2281,9 @@ void ScViewFunc::InsertTableLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rTabName ) { - rtl::OUString aFilterName = rFilter; - rtl::OUString aOpt = rOptions; - rtl::OUString aURL = rFile; + OUString aFilterName = rFilter; + OUString aOpt = rOptions; + OUString aURL = rFile; ScDocumentLoader aLoader( aURL, aFilterName, aOpt ); if (!aLoader.IsError()) { @@ -2296,7 +2294,7 @@ void ScViewFunc::InsertTableLink( const String& rFile, nTab = 0; else { - rtl::OUString aTemp; + OUString aTemp; SCTAB nCount = pSrcDoc->GetTableCount(); for (SCTAB i=0; iGetName( pSrcTabs[i], aName ); pDoc->CreateValidTabName( aName ); if ( !pDoc->InsertTab( nTab+i, aName ) ) @@ -2388,7 +2386,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, sal_Bool bWasThere = pDoc->HasLink( aFileName, aFilterName, aOptions ); sal_uLong nRefresh = 0; - rtl::OUString aTabStr; + OUString aTabStr; for (i=0; iGetName( pSrcTabs[i], aTabStr ); @@ -2441,7 +2439,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, // Move/Copy table to another document void ScViewFunc::MoveTable( - sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const rtl::OUString* pNewTabName ) + sal_uInt16 nDestDocNo, SCTAB nDestTab, bool bCopy, const OUString* pNewTabName ) { ScDocument* pDoc = GetViewData()->GetDocument(); ScDocShell* pDocShell = GetViewData()->GetDocShell(); @@ -2458,10 +2456,10 @@ void ScViewFunc::MoveTable( // execute without SFX_CALLMODE_RECORD, because already contained in move command - String aUrl = rtl::OUString("private:factory/"); + String aUrl = OUString("private:factory/"); aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); // "scalc" SfxStringItem aItem( SID_FILE_NAME, aUrl ); - SfxStringItem aTarget( SID_TARGETNAME, rtl::OUString("_blank") ); + SfxStringItem aTarget( SID_TARGETNAME, OUString("_blank") ); const SfxPoolItem* pRetItem = GetViewData()->GetDispatcher().Execute( SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aItem, &aTarget, 0L ); @@ -2506,7 +2504,7 @@ void ScViewFunc::MoveTable( { while (pDestDoc->GetTableCount() > 1) pDestDoc->DeleteTab(0); - pDestDoc->RenameTab( 0, rtl::OUString("______42_____"), + pDestDoc->RenameTab( 0, OUString("______42_____"), false ); } @@ -2519,7 +2517,7 @@ void ScViewFunc::MoveTable( { if(rMark.GetTableSelect(i)) { - rtl::OUString aTabName; + OUString aTabName; pDoc->GetName( i, aTabName); TheTabs.push_back(i); for(SCTAB j=i+1;jGetName(nDestTab, sName); @@ -2671,13 +2669,13 @@ void ScViewFunc::MoveTable( pSrcTabs->reserve(nTabCount); pDestTabs->reserve(nTabCount); pTabNames->reserve(nTabCount); - rtl::OUString aDestName; + OUString aDestName; for(SCTAB i=0;iGetName( i, aTabName); pTabNames->push_back(aTabName); @@ -2716,7 +2714,7 @@ void ScViewFunc::MoveTable( if(bCopy && pDoc->IsScenario(nMovTab)) { - rtl::OUString aComment; + OUString aComment; Color aColor; sal_uInt16 nFlags; @@ -2751,7 +2749,7 @@ void ScViewFunc::MoveTable( for (size_t j = 0; j < n; ++j) { SCTAB nRenameTab = (*pDestTabs)[j]; - rtl::OUString aTabName = *pNewTabName; + OUString aTabName = *pNewTabName; pDoc->CreateValidTabName( aTabName ); pDestNames->push_back(aTabName); pDoc->RenameTab(nRenameTab, aTabName); @@ -2803,7 +2801,7 @@ void ScViewFunc::ShowTable( const std::vector& rNames ) sal_Bool bUndo(pDoc->IsUndoEnabled()); std::vector undoTabs; - rtl::OUString aName; + OUString aName; SCTAB nPos = 0; bool bFound(false); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index ac26088950e1..cd37a7b38f11 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -478,8 +478,8 @@ void ScViewFunc::PasteFromSystem() TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) ); { - sal_uLong nBiff8 = SotExchange::RegisterFormatName(rtl::OUString("Biff8")); - sal_uLong nBiff5 = SotExchange::RegisterFormatName(rtl::OUString("Biff5")); + sal_uLong nBiff8 = SotExchange::RegisterFormatName(OUString("Biff8")); + sal_uLong nBiff5 = SotExchange::RegisterFormatName(OUString("Biff5")); // als erstes SvDraw-Model, dann Grafik // (Grafik darf nur bei einzelner Grafik drinstehen) @@ -594,8 +594,8 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference aExcludedChartNames; + ::std::vector< OUString > aExcludedChartNames; SdrPage* pPage = NULL; if ( nFlags & IDF_OBJECTS ) @@ -1720,7 +1720,7 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark aChangeRanges.Append(aChangeRange); } } - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index b73110582998..9606212ba573 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -162,7 +162,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, ScImportExport aImpEx( pDocSh->GetDocument(), ScAddress( nStartCol, nStartRow, GetViewData()->GetTabNo() ) ); - ::rtl::OUString aStr; + OUString aStr; SotStorageStreamRef xStream; if ( aDataHelper.GetSotStorageStream( SOT_FORMAT_RTF, xStream ) && xStream.Is() ) // mba: clipboard always must contain absolute URLs (could be from alien source) @@ -613,7 +613,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const String& rFile, sal_Bool SfxStringItem aFileNameItem( SID_FILE_NAME, aStrURL ); SfxStringItem aFilterItem( SID_FILTER_NAME, pFlt->GetName() ); // #i69524# add target, as in SfxApplication when the Open dialog is used - SfxStringItem aTargetItem( SID_TARGETNAME, rtl::OUString("_default") ); + SfxStringItem aTargetItem( SID_TARGETNAME, OUString("_default") ); // Asynchron oeffnen, kann naemlich auch aus D&D heraus passieren // und das bekommt dem MAC nicht so gut ... @@ -665,11 +665,11 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const String& rFile, sal_Bool //TODO/LATER: what about "bLink"? uno::Sequence < beans::PropertyValue > aMedium(1); - aMedium[0].Name = ::rtl::OUString( "URL" ); - aMedium[0].Value <<= ::rtl::OUString( aStrURL ); + aMedium[0].Name = OUString( "URL" ); + aMedium[0].Value <<= OUString( aStrURL ); comphelper::EmbeddedObjectContainer aCnt( xStorage ); - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = aCnt.InsertEmbeddedObject( aMedium, aName ); if( xObj.is() ) return PasteObject( rPos, xObj ); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 9fd5be01d827..ecd015242c4e 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -171,7 +171,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, } else { - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = GetViewData()->GetViewShell()->GetObjectShell()-> GetEmbeddedObjectContainer().InsertEmbeddedObject( xStm, aName ); if ( xObj.is() ) @@ -202,7 +202,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, { if ( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE, aObjDesc ) ) { - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj; if ( aDataHelper.GetInputStream( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, xStm ) @@ -216,12 +216,12 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, { uno::Reference< embed::XStorage > xTmpStor = ::comphelper::OStorageHelper::GetTemporaryStorage(); uno::Reference < embed::XEmbedObjectClipboardCreator > xClipboardCreator( - ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ), + ::comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ), uno::UNO_QUERY_THROW ); embed::InsertedObjectInfo aInfo = xClipboardCreator->createInstanceInitFromClipboard( xTmpStor, - ::rtl::OUString( "DummyName" ), + OUString( "DummyName" ), uno::Sequence< beans::PropertyValue >() ); // TODO/LATER: in future InsertedObjectInfo will be used to get container related information @@ -289,7 +289,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, ScAddress aCellPos( nPosX, nPosY, GetViewData()->GetTabNo() ); ScImportExport aObj( GetViewData()->GetDocument(), aCellPos ); - ::rtl::OUString aStr; + OUString aStr; SotStorageStreamRef xStream; if ( aDataHelper.GetSotStorageStream( nFormatId, xStream ) && xStream.Is() ) { @@ -667,7 +667,7 @@ bool ScViewFunc::PasteLink( const uno::Reference& r // char array delimited by \0. // app \0 topic \0 item \0 (extra \0) where the extra is optional. - ::std::vector aStrs; + ::std::vector aStrs; const char* pStart = p; sal_Int32 nStart = 0; for (sal_Int32 i = 0; i < nSeqLen; ++i, ++p) @@ -675,7 +675,7 @@ bool ScViewFunc::PasteLink( const uno::Reference& r if (*p == '\0') { sal_Int32 nLen = i - nStart; - aStrs.push_back(rtl::OUString(pStart, nLen, eSysEnc)); + aStrs.push_back(OUString(pStart, nLen, eSysEnc)); nStart = ++i; pStart = ++p; } @@ -684,10 +684,10 @@ bool ScViewFunc::PasteLink( const uno::Reference& r if (aStrs.size() < 3) return false; - const rtl::OUString* pApp = &aStrs[0]; - const rtl::OUString* pTopic = &aStrs[1]; - const rtl::OUString* pItem = &aStrs[2]; - const rtl::OUString* pExtra = NULL; + const OUString* pApp = &aStrs[0]; + const OUString* pTopic = &aStrs[1]; + const OUString* pItem = &aStrs[2]; + const OUString* pExtra = NULL; if (aStrs.size() > 3) pExtra = &aStrs[3]; @@ -696,9 +696,9 @@ bool ScViewFunc::PasteLink( const uno::Reference& r // Paste this as an external reference. Note that paste link always // uses Calc A1 syntax even when another formula syntax is specified // in the UI. - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.appendAscii("='"); - rtl::OUString aPath = ScGlobal::GetAbsDocName( + OUString aPath = ScGlobal::GetAbsDocName( *pTopic, GetViewData()->GetDocument()->GetDocumentShell()); aBuf.append(aPath); aBuf.appendAscii("'#"); @@ -711,7 +711,7 @@ bool ScViewFunc::PasteLink( const uno::Reference& r // DDE in all other cases. // TODO: we could define ocQuote for " - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(sal_Unicode('=')); aBuf.append(ScCompiler::GetNativeSymbol(ocDde)); aBuf.append(ScCompiler::GetNativeSymbol(ocOpen)); diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index ad04cb7b77ef..37376e4aed23 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -46,8 +46,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::vector; #define D_TIMEFACTOR 86400.0 diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index a93edc6707cb..922c781a7603 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -139,7 +139,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, SdrPage* pDestPage = pDrawModel->GetPage( static_cast< sal_uInt16 >( nTab ) ); OSL_ENSURE(pDestPage,"who is this, Page?"); - ::std::vector< ::rtl::OUString > aExcludedChartNames; + ::std::vector< OUString > aExcludedChartNames; if ( pDestPage ) { ScChartHelper::GetChartNames( aExcludedChartNames, pDestPage ); @@ -205,7 +205,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, if ( pClient && pClient->IsObjectInPlaceActive() ) nOptions |= SDRINSERT_DONTMARK; - ::std::vector< ::rtl::OUString > aExcludedChartNames; + ::std::vector< OUString > aExcludedChartNames; SCTAB nTab = GetViewData()->GetTabNo(); SdrPage* pPage = pScDrawView->GetModel()->GetPage( static_cast< sal_uInt16 >( nTab ) ); OSL_ENSURE( pPage, "Page?" ); @@ -277,12 +277,12 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, } sal_Bool ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::XEmbeddedObject >& xObj, - const Size* pDescSize, const Graphic* pReplGraph, const ::rtl::OUString& aMediaType, sal_Int64 nAspect ) + const Size* pDescSize, const Graphic* pReplGraph, const OUString& aMediaType, sal_Int64 nAspect ) { MakeDrawLayer(); if ( xObj.is() ) { - ::rtl::OUString aName; + OUString aName; //TODO/MBA: is that OK? comphelper::EmbeddedObjectContainer& aCnt = GetViewData()->GetViewShell()->GetObjectShell()->GetEmbeddedObjectContainer(); if ( !aCnt.HasEmbeddedObject( xObj ) ) diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 4bb63bcbd4f8..8a67e463dece 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -560,7 +560,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, for (; itr != itrEnd; ++itr) aChangeRanges.Append( ScRange( nCol, nRow, *itr ) ); - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } if ( bRecord ) @@ -738,7 +738,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, { aChangeRanges.Append( ScRange( nCol, nRow, *itr ) ); } - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } aModificator.SetDocumentModified(); @@ -1285,7 +1285,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, } } } - pModelObj->NotifyChanges( ::rtl::OUString( "attribute" ), aChangeRanges, aProperties ); + pModelObj->NotifyChanges( OUString( "attribute" ), aChangeRanges, aProperties ); } StartFormatArea(); @@ -1507,9 +1507,9 @@ sal_Bool ScViewFunc::InsertCells( InsCellCmd eCmd, sal_Bool bRecord, sal_Bool bP { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - ::rtl::OUString aOperation = ( eCmd == INS_INSROWS ? - ::rtl::OUString( "insert-rows" ) : - ::rtl::OUString( "insert-columns" ) ); + OUString aOperation = ( eCmd == INS_INSROWS ? + OUString( "insert-rows" ) : + OUString( "insert-columns" ) ); pModelObj->NotifyChanges( aOperation, aChangeRanges ); } } @@ -1570,9 +1570,9 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, sal_Bool bRecord ) { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - ::rtl::OUString aOperation = ( eCmd == DEL_DELROWS ? - ::rtl::OUString( "delete-rows" ) : - ::rtl::OUString( "delete-columns" ) ); + OUString aOperation = ( eCmd == DEL_DELROWS ? + OUString( "delete-rows" ) : + OUString( "delete-columns" ) ); pModelObj->NotifyChanges( aOperation, aChangeRanges ); } } @@ -1943,7 +1943,7 @@ void ScViewFunc::DeleteContents( sal_uInt16 nFlags, sal_Bool bRecord ) { aFuncMark.FillRangeListWithMarks( &aChangeRanges, false ); } - pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "cell-change" ), aChangeRanges ); } aModificator.SetDocumentModified(); @@ -2247,7 +2247,7 @@ void ScViewFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW } } } - pModelObj->NotifyChanges( ::rtl::OUString( "column-resize" ), aChangeRanges ); + pModelObj->NotifyChanges( OUString( "column-resize" ), aChangeRanges ); } } } diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index d055ced4b64b..4fb088c1fb13 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -161,13 +161,13 @@ sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction, if ( rSettings.HasComment() ) { - rtl::OUStringBuffer aBuf(rAction.GetComment()); + OUStringBuffer aBuf(rAction.GetComment()); aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")); - rtl::OUString aTmp; + OUString aTmp; rAction.GetDescription(aTmp, &rDocument); aBuf.append(aTmp); aBuf.append(sal_Unicode(')')); - rtl::OUString aComStr = aBuf.makeStringAndClear(); + OUString aComStr = aBuf.makeStringAndClear(); if(!rSettings.IsValidComment(&aComStr)) return false; diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 64d617362847..4263a34ed3ad 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -541,7 +541,7 @@ void getFieldLinks( { if (!aPath.isEmpty()) // XPath should never be empty anyway, but it won't hurt to check... - rRangeLink.maFieldPaths.push_back(rtl::OUStringToOString(aPath, RTL_TEXTENCODING_UTF8)); + rRangeLink.maFieldPaths.push_back(OUStringToOString(aPath, RTL_TEXTENCODING_UTF8)); } // Walk recursively. @@ -578,7 +578,7 @@ void ScXMLSourceDlg::OkPressed() aParam.maCellLinks.push_back( ScOrcusImportXMLParam::CellLink( - pUserData->maLinkedPos, rtl::OUStringToOString(aPath, RTL_TEXTENCODING_UTF8))); + pUserData->maLinkedPos, OUStringToOString(aPath, RTL_TEXTENCODING_UTF8))); } } diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index d15b95f51a74..dbc538b6165f 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -68,8 +68,8 @@ sal_Bool SAL_CALL component_writeInfo( uno::Reference xNewKey( reinterpret_cast(pRegistryKey)->createKey(aImpl) ); - uno::Sequence aSequ = ScTestAddIn::getSupportedServiceNames_Static(); - const rtl::OUString * pArray = aSequ.getConstArray(); + uno::Sequence aSequ = ScTestAddIn::getSupportedServiceNames_Static(); + const OUString * pArray = aSequ.getConstArray(); for( INT32 i = 0; i < aSequ.getLength(); i++ ) xNewKey->createKey( pArray[i] ); @@ -123,10 +123,10 @@ UString ScTestAddIn::getImplementationName_Static() return L"stardiv.StarCalc.ScTestAddIn"; } -::com::sun::star::uno::Sequence< ::rtl::OUString > ScTestAddIn::getSupportedServiceNames_Static() +::com::sun::star::uno::Sequence< OUString > ScTestAddIn::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aRet(2); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence< OUString > aRet(2); + OUString* pArray = aRet.getArray(); pArray[0] = SCADDIN_SERVICE; pArray[1] = SCTESTADDIN_SERVICE; return aRet; @@ -344,7 +344,7 @@ double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(::com::sun::star::uno return fValue + 1.0; } -::rtl::OUString SAL_CALL ScTestAddIn::repeatStr( const ::rtl::OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException) { String aRet; String aStrStr = OUStringToString( aStr, CHARSET_SYSTEM ); @@ -354,7 +354,7 @@ double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(::com::sun::star::uno return StringToOUString( aRet, CHARSET_SYSTEM ); } -::rtl::OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException) { uno::Any aDateAny = xCaller->getPropertyValue( L"NullDate" ); { @@ -459,14 +459,14 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence >& aMatrix, return aRet; } -::rtl::OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException) { String aSeparator; if ( !aFirst.hasValue() ) // not specified aSeparator = ';'; else { - rtl::OUString aUStr; + OUString aUStr; aFirst >>= aUStr; aSeparator = OUStringToString( aUStr, CHARSET_SYSTEM ); } @@ -478,7 +478,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence >& aMatrix, { if ( nPos > 0 ) aContent += ' '; - rtl::OUString aUStr; + OUString aUStr; pArr[nPos] >>= aUStr; aContent += OUStringToString( aUStr, CHARSET_SYSTEM ); } @@ -502,11 +502,11 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence >& aMatrix, //! Test if ( nFlag == 42 ) { - uno::Sequence aInner(3); + uno::Sequence aInner(3); aInner.getArray()[0] = L"Bla"; aInner.getArray()[1] = L"Fasel"; aInner.getArray()[2] = L"Suelz"; - uno::Sequence< uno::Sequence > aOuter( &aInner, 1 ); + uno::Sequence< uno::Sequence > aOuter( &aInner, 1 ); aRet <<= aOuter; return aRet; @@ -521,7 +521,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence >& aMatrix, return aRet; } -::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL ScTestAddIn::callAsync( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL ScTestAddIn::callAsync( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException) { String aStr = OUStringToString( aString, CHARSET_SYSTEM ); char c = (char) aStr; @@ -542,25 +542,25 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence >& aMatrix, // XServiceName -::rtl::OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) { return SCTESTADDIN_SERVICE; // name of specific AddIn service } // XServiceInfo -::rtl::OUString SAL_CALL ScTestAddIn::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return getImplementationName_Static(); } -sal_Bool SAL_CALL ScTestAddIn::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ScTestAddIn::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { return ServiceName == SCADDIN_SERVICE || ServiceName == SCTESTADDIN_SERVICE; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScTestAddIn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScTestAddIn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { return getSupportedServiceNames_Static(); } diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx index c0e946cc5d70..4d54de38921b 100644 --- a/sc/workben/addin.hxx +++ b/sc/workben/addin.hxx @@ -53,16 +53,16 @@ public: // virtual XIdlClassRef getIdlClass(void); static UString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XAddIn - virtual ::rtl::OUString SAL_CALL getProgrammaticFuntionName( const ::rtl::OUString& aDisplayName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDisplayFunctionName( const ::rtl::OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFunctionDescription( const ::rtl::OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDisplayArgumentName( const ::rtl::OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getArgumentDescription( const ::rtl::OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProgrammaticCategoryName( const ::rtl::OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDisplayCategoryName( const ::rtl::OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); // XLocalizable virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& eLocale ) throw(::com::sun::star::uno::RuntimeException); @@ -71,22 +71,22 @@ public: // XTestAddIn virtual sal_Int32 SAL_CALL countParams( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs ) throw(::com::sun::star::uno::RuntimeException); virtual double SAL_CALL addOne( double fValue ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL repeatStr( const ::rtl::OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColorValue( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& xRange ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL transpose( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > > SAL_CALL transposeInt( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL callAsync( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL callAsync( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getStrOrVal( sal_Int32 nFlag ) throw(::com::sun::star::uno::RuntimeException); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index 727b9e7b0b48..c11d74b6d106 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -49,7 +49,7 @@ void ScAddInResult::NewValue() uno::Any aAny; String aRet = aArg; aRet += nTickCount; - rtl::OUString aUStr = StringToOUString( aRet, CHARSET_SYSTEM ); + OUString aUStr = StringToOUString( aRet, CHARSET_SYSTEM ); aAny <<= aUStr; sheet::ResultEvent aEvent( (cppu::OWeakObject*)this, aAny ); diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 27fea9383c5c..278b26fcb434 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -1779,7 +1779,7 @@ OUString Complex::GetString() const throw( uno::RuntimeException, lang::IllegalA { CHK_FINITE(r); CHK_FINITE(i); - rtl::OUStringBuffer aRet; + OUStringBuffer aRet; bool bHasImag = i != 0.0; bool bHasReal = !bHasImag || (r != 0.0); diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 871ad917684a..1ee12a6c9fd8 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -232,7 +232,7 @@ struct FuncDataBase class FuncData { private: - ::rtl::OUString aIntName; + OUString aIntName; sal_uInt16 nUINameID; sal_uInt16 nDescrID; // leads also to parameter descriptions! sal_Bool bDouble; // flag for names, wich already exist in Calc @@ -252,7 +252,7 @@ public: inline sal_Bool HasIntParam( void ) const; sal_uInt16 GetStrIndex( sal_uInt16 nParamNum ) const; - inline sal_Bool Is( const ::rtl::OUString& rCompareTo ) const; + inline sal_Bool Is( const OUString& rCompareTo ) const; inline const StringList& GetCompNameList( void ) const; @@ -276,7 +276,7 @@ public: class FuncDataList : private MyList { - ::rtl::OUString aLastName; + OUString aLastName; sal_uInt32 nLast; public: FuncDataList( ResMgr& ); @@ -286,7 +286,7 @@ public: inline const FuncData* Get( sal_uInt32 nIndex ) const; using MyList::Count; - const FuncData* Get( const ::rtl::OUString& aProgrammaticName ) const; + const FuncData* Get( const OUString& aProgrammaticName ) const; }; @@ -761,7 +761,7 @@ inline sal_Bool FuncData::HasIntParam( void ) const } -inline sal_Bool FuncData::Is( const ::rtl::OUString& r ) const +inline sal_Bool FuncData::Is( const OUString& r ) const { return aIntName == r; } @@ -1041,7 +1041,7 @@ private: on strings not representing any double value. @return the converted double value. */ double convertToDouble( - const ::rtl::OUString& rString ) const + const OUString& rString ) const throw( css::lang::IllegalArgumentException ); public: diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx index 2999918070e0..03373e2c7fe2 100644 --- a/scaddins/source/datefunc/datefunc.hxx +++ b/scaddins/source/datefunc/datefunc.hxx @@ -93,40 +93,40 @@ public: using ScaList::Count; - inline const ::rtl::OUString* Get( sal_uInt32 nIndex ) const; + inline const OUString* Get( sal_uInt32 nIndex ) const; - inline ::rtl::OUString* First(); - inline ::rtl::OUString* Next(); + inline OUString* First(); + inline OUString* Next(); using ScaList::Append; - inline void Append( ::rtl::OUString* pNew ); - inline void Append( const ::rtl::OUString& rNew ); + inline void Append( OUString* pNew ); + inline void Append( const OUString& rNew ); }; -inline const ::rtl::OUString* ScaStringList::Get( sal_uInt32 nIndex ) const +inline const OUString* ScaStringList::Get( sal_uInt32 nIndex ) const { - return static_cast< const ::rtl::OUString* >( ScaList::GetObject( nIndex ) ); + return static_cast< const OUString* >( ScaList::GetObject( nIndex ) ); } -inline ::rtl::OUString* ScaStringList::First() +inline OUString* ScaStringList::First() { - return static_cast< ::rtl::OUString* >( ScaList::First() ); + return static_cast< OUString* >( ScaList::First() ); } -inline ::rtl::OUString* ScaStringList::Next() +inline OUString* ScaStringList::Next() { - return static_cast< ::rtl::OUString* >( ScaList::Next() ); + return static_cast< OUString* >( ScaList::Next() ); } -inline void ScaStringList::Append( ::rtl::OUString* pNew ) +inline void ScaStringList::Append( OUString* pNew ) { ScaList::Append( pNew ); } -inline void ScaStringList::Append( const ::rtl::OUString& rNew ) +inline void ScaStringList::Append( const OUString& rNew ) { - ScaList::Append( new ::rtl::OUString( rNew ) ); + ScaList::Append( new OUString( rNew ) ); } @@ -204,7 +204,7 @@ public: class ScaFuncRes : public Resource { public: - ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, ::rtl::OUString& rRet ); + ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet ); }; @@ -236,7 +236,7 @@ struct ScaFuncDataBase class ScaFuncData { private: - ::rtl::OUString aIntName; // internal name (get***) + OUString aIntName; // internal name (get***) sal_uInt16 nUINameID; // resource ID to UI name sal_uInt16 nDescrID; // leads also to parameter descriptions! sal_uInt16 nCompListID; // resource ID to list of valid names @@ -257,7 +257,7 @@ public: inline sal_Bool HasIntParam() const { return bWithOpt; } sal_uInt16 GetStrIndex( sal_uInt16 nParam ) const; - inline sal_Bool Is( const ::rtl::OUString& rCompare ) const + inline sal_Bool Is( const OUString& rCompare ) const { return aIntName == rCompare; } inline const ScaStringList& GetCompNameList() const { return aCompList; } @@ -268,7 +268,7 @@ public: class ScaFuncDataList : private ScaList { - ::rtl::OUString aLastName; + OUString aLastName; sal_uInt32 nLast; public: @@ -278,7 +278,7 @@ public: using ScaList::Count; inline const ScaFuncData* Get( sal_uInt32 nIndex ) const; - const ScaFuncData* Get( const ::rtl::OUString& rProgrammaticName ) const; + const ScaFuncData* Get( const OUString& rProgrammaticName ) const; inline ScaFuncData* First(); inline ScaFuncData* Next(); @@ -332,39 +332,39 @@ private: ResMgr& GetResMgr() throw( ::com::sun::star::uno::RuntimeException ); void InitData(); - ::rtl::OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( ::com::sun::star::uno::RuntimeException ); - ::rtl::OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( ::com::sun::star::uno::RuntimeException ); + OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( ::com::sun::star::uno::RuntimeException ); + OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( ::com::sun::star::uno::RuntimeException ); public: ScaDateAddIn(); virtual ~ScaDateAddIn(); - static ::rtl::OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XAddIn - virtual ::rtl::OUString SAL_CALL getProgrammaticFuntionName( const ::rtl::OUString& aDisplayName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayFunctionName( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getFunctionDescription( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayArgumentName( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getArgumentDescription( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getProgrammaticCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); // XCompatibilityNames - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const ::rtl::OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) throw( ::com::sun::star::uno::RuntimeException ); // XLocalizable virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& eLocale ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw( ::com::sun::star::uno::RuntimeException ); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getServiceName() throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // methods from own interfaces start here @@ -408,8 +408,8 @@ public: throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); // XMiscFunctions - virtual ::rtl::OUString SAL_CALL getRot13( - const ::rtl::OUString& aSrcText ) + virtual OUString SAL_CALL getRot13( + const OUString& aSrcText ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); }; diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index 5cb509cec08f..29d0ff9f3270 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -105,40 +105,40 @@ public: using ScaList::Count; - inline const ::rtl::OUString* Get( sal_uInt32 nIndex ) const; + inline const OUString* Get( sal_uInt32 nIndex ) const; - inline ::rtl::OUString* First(); - inline ::rtl::OUString* Next(); + inline OUString* First(); + inline OUString* Next(); using ScaList::Append; - inline void Append( ::rtl::OUString* pNew ); - inline void Append( const ::rtl::OUString& rNew ); + inline void Append( OUString* pNew ); + inline void Append( const OUString& rNew ); }; -inline const ::rtl::OUString* ScaStringList::Get( sal_uInt32 nIndex ) const +inline const OUString* ScaStringList::Get( sal_uInt32 nIndex ) const { - return static_cast< const ::rtl::OUString* >( ScaList::GetObject( nIndex ) ); + return static_cast< const OUString* >( ScaList::GetObject( nIndex ) ); } -inline ::rtl::OUString* ScaStringList::First() +inline OUString* ScaStringList::First() { - return static_cast< ::rtl::OUString* >( ScaList::First() ); + return static_cast< OUString* >( ScaList::First() ); } -inline ::rtl::OUString* ScaStringList::Next() +inline OUString* ScaStringList::Next() { - return static_cast< ::rtl::OUString* >( ScaList::Next() ); + return static_cast< OUString* >( ScaList::Next() ); } -inline void ScaStringList::Append( ::rtl::OUString* pNew ) +inline void ScaStringList::Append( OUString* pNew ) { ScaList::Append( pNew ); } -inline void ScaStringList::Append( const ::rtl::OUString& rNew ) +inline void ScaStringList::Append( const OUString& rNew ) { - ScaList::Append( new ::rtl::OUString( rNew ) ); + ScaList::Append( new OUString( rNew ) ); } @@ -216,7 +216,7 @@ public: class ScaFuncRes : public Resource { public: - ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, ::rtl::OUString& rRet ); + ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet ); }; @@ -248,7 +248,7 @@ struct ScaFuncDataBase class ScaFuncData { private: - ::rtl::OUString aIntName; // internal name (get***) + OUString aIntName; // internal name (get***) sal_uInt16 nUINameID; // resource ID to UI name sal_uInt16 nDescrID; // leads also to parameter descriptions! sal_uInt16 nCompListID; // resource ID to list of valid names @@ -269,7 +269,7 @@ public: inline sal_Bool HasIntParam() const { return bWithOpt; } sal_uInt16 GetStrIndex( sal_uInt16 nParam ) const; - inline sal_Bool Is( const ::rtl::OUString& rCompare ) const + inline sal_Bool Is( const OUString& rCompare ) const { return aIntName == rCompare; } inline const ScaStringList& GetCompNameList() const { return aCompList; } @@ -280,7 +280,7 @@ public: class ScaFuncDataList : private ScaList { - ::rtl::OUString aLastName; + OUString aLastName; sal_uInt32 nLast; public: @@ -290,7 +290,7 @@ public: using ScaList::Count; inline const ScaFuncData* Get( sal_uInt32 nIndex ) const; - const ScaFuncData* Get( const ::rtl::OUString& rProgrammaticName ) const; + const ScaFuncData* Get( const OUString& rProgrammaticName ) const; inline ScaFuncData* First(); inline ScaFuncData* Next(); @@ -347,39 +347,39 @@ private: ResMgr& GetResMgr() throw( css::uno::RuntimeException ); void InitData(); - ::rtl::OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( css::uno::RuntimeException ); - ::rtl::OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException ); + OUString GetDisplFuncStr( sal_uInt16 nResId ) throw( css::uno::RuntimeException ); + OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException ); public: ScaPricingAddIn(); virtual ~ScaPricingAddIn(); - static ::rtl::OUString getImplementationName_Static(); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XAddIn - virtual ::rtl::OUString SAL_CALL getProgrammaticFuntionName( const ::rtl::OUString& aDisplayName ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayFunctionName( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getFunctionDescription( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayArgumentName( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getArgumentDescription( const ::rtl::OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getProgrammaticCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayCategoryName( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); // XCompatibilityNames - virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const ::rtl::OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException ); // XLocalizable virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) throw( css::uno::RuntimeException ); virtual css::lang::Locale SAL_CALL getLocale() throw( css::uno::RuntimeException ); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getServiceName() throw( css::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); // ---------------------------------------- // methods from own interfaces start here diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index 7ff43b1d0b07..c5b1c272cfae 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -64,7 +64,6 @@ using namespace com::sun::star; -using ::rtl::OUString; #define STR_NONNEGATIVE "NonNegative" #define STR_INTEGER "Integer" diff --git a/sccomp/source/solver/solver.hxx b/sccomp/source/solver/solver.hxx index 8ce55bdc2e64..60b2952ffd88 100644 --- a/sccomp/source/solver/solver.hxx +++ b/sccomp/source/solver/solver.hxx @@ -56,7 +56,7 @@ class SolverComponent : public comphelper::OMutexAndBroadcastHelper, sal_Bool mbSuccess; double mfResultValue; com::sun::star::uno::Sequence< double > maSolution; - rtl::OUString maStatus; + OUString maStatus; public: SolverComponent( const com::sun::star::uno::Reference< @@ -101,17 +101,17 @@ public: virtual void SAL_CALL solve() throw(::com::sun::star::uno::RuntimeException); // XSolverDescription - virtual ::rtl::OUString SAL_CALL getComponentDescription() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStatusDescription() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getPropertyDescription( const ::rtl::OUString& aPropertyName ) + virtual OUString SAL_CALL getComponentDescription() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStatusDescription() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getPropertyDescription( const OUString& aPropertyName ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx index 4d970483d56b..783c53ecc0d0 100644 --- a/scripting/source/basprov/baslibnode.cxx +++ b/scripting/source/basprov/baslibnode.cxx @@ -42,8 +42,8 @@ namespace basprov // ============================================================================= BasicLibraryNodeImpl::BasicLibraryNodeImpl( const Reference< XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, BasicManager* pBasicManager, - const Reference< script::XLibraryContainer >& xLibContainer, const ::rtl::OUString& sLibName, bool isAppScript ) + const OUString& sScriptingContext, BasicManager* pBasicManager, + const Reference< script::XLibraryContainer >& xLibContainer, const OUString& sLibName, bool isAppScript ) :m_xContext( rxContext ) ,m_sScriptingContext( sScriptingContext ) ,m_pBasicManager( pBasicManager ) @@ -68,7 +68,7 @@ namespace basprov // XBrowseNode // ----------------------------------------------------------------------------- - ::rtl::OUString BasicLibraryNodeImpl::getName( ) throw (RuntimeException) + OUString BasicLibraryNodeImpl::getName( ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -91,9 +91,9 @@ namespace basprov StarBASIC* pBasic = m_pBasicManager->GetLib( m_sLibName ); if ( pBasic && m_xLibrary.is() ) { - Sequence< ::rtl::OUString > aNames = m_xLibrary->getElementNames(); + Sequence< OUString > aNames = m_xLibrary->getElementNames(); sal_Int32 nCount = aNames.getLength(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + const OUString* pNames = aNames.getConstArray(); aChildNodes.realloc( nCount ); Reference< browse::XBrowseNode >* pChildNodes = aChildNodes.getArray(); diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx index 842c4fa94b84..561d4b88ede8 100644 --- a/scripting/source/basprov/baslibnode.hxx +++ b/scripting/source/basprov/baslibnode.hxx @@ -46,23 +46,23 @@ namespace basprov { private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sScriptingContext; + OUString m_sScriptingContext; BasicManager* m_pBasicManager; ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > m_xLibContainer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLibrary; - ::rtl::OUString m_sLibName; + OUString m_sLibName; bool m_bIsAppScript; public: BasicLibraryNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, + const OUString& sScriptingContext, BasicManager* pBasicManager, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, - const ::rtl::OUString& sLibName, bool isAppScript=true ); + const OUString& sLibName, bool isAppScript=true ); virtual ~BasicLibraryNodeImpl(); // XBrowseNode - virtual ::rtl::OUString SAL_CALL getName( ) + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index 5b826cd8510f..c8bdba5691e3 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -43,8 +43,8 @@ using namespace ::sf_misc; #define BASPROV_PROPERTY_ID_URI 1 #define BASPROV_PROPERTY_ID_EDITABLE 2 -#define BASPROV_PROPERTY_URI ::rtl::OUString( "URI" ) -#define BASPROV_PROPERTY_EDITABLE ::rtl::OUString( "Editable" ) +#define BASPROV_PROPERTY_URI OUString( "URI" ) +#define BASPROV_PROPERTY_EDITABLE OUString( "Editable" ) #define BASPROV_DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY @@ -59,7 +59,7 @@ namespace basprov // ============================================================================= BasicMethodNodeImpl::BasicMethodNodeImpl( const Reference< XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, SbMethod* pMethod, bool isAppScript ) + const OUString& sScriptingContext, SbMethod* pMethod, bool isAppScript ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex ) ,OPropertyContainer( GetBroadcastHelper() ) ,m_xContext( rxContext ) @@ -76,17 +76,17 @@ namespace basprov StarBASIC* pBasic = static_cast< StarBASIC* >( pModule->GetParent() ); if ( pBasic ) { - m_sURI = ::rtl::OUString("vnd.sun.star.script:"); + m_sURI = OUString("vnd.sun.star.script:"); m_sURI += pBasic->GetName(); - m_sURI += ::rtl::OUString("."); + m_sURI += OUString("."); m_sURI += pModule->GetName(); - m_sURI += ::rtl::OUString("."); + m_sURI += OUString("."); m_sURI += m_pMethod->GetName(); - m_sURI += ::rtl::OUString("?language=Basic&location="); + m_sURI += OUString("?language=Basic&location="); if ( m_bIsAppScript ) - m_sURI += ::rtl::OUString("application"); + m_sURI += OUString("application"); else - m_sURI += ::rtl::OUString("document"); + m_sURI += OUString("document"); } } } @@ -117,11 +117,11 @@ namespace basprov // XBrowseNode // ----------------------------------------------------------------------------- - ::rtl::OUString BasicMethodNodeImpl::getName( ) throw (RuntimeException) + OUString BasicMethodNodeImpl::getName( ) throw (RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString sMethodName; + OUString sMethodName; if ( m_pMethod ) sMethodName = m_pMethod->GetName(); @@ -196,7 +196,7 @@ namespace basprov // ----------------------------------------------------------------------------- - Any BasicMethodNodeImpl::invoke( const ::rtl::OUString& aFunctionName, const Sequence< Any >& aParams, + Any BasicMethodNodeImpl::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, RuntimeException) @@ -207,7 +207,7 @@ namespace basprov if ( aFunctionName == BASPROV_PROPERTY_EDITABLE ) { - ::rtl::OUString sDocURL, sLibName, sModName; + OUString sDocURL, sLibName, sModName; sal_uInt16 nLine1 = 0, nLine2; if ( !m_bIsAppScript ) @@ -259,24 +259,24 @@ namespace basprov Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create( m_xContext ) ); Sequence < PropertyValue > aArgs(7); - aArgs[0].Name = ::rtl::OUString("Document"); + aArgs[0].Name = OUString("Document"); aArgs[0].Value <<= sDocURL; - aArgs[1].Name = ::rtl::OUString("LibName"); + aArgs[1].Name = OUString("LibName"); aArgs[1].Value <<= sLibName; - aArgs[2].Name = ::rtl::OUString("Name"); + aArgs[2].Name = OUString("Name"); aArgs[2].Value <<= sModName; - aArgs[3].Name = ::rtl::OUString("Type"); - aArgs[3].Value <<= ::rtl::OUString("Module"); - aArgs[4].Name = ::rtl::OUString("Line"); + aArgs[3].Name = OUString("Type"); + aArgs[3].Value <<= OUString("Module"); + aArgs[4].Name = OUString("Line"); aArgs[4].Value <<= static_cast< sal_uInt32 >( nLine1 ); - xHelper->executeDispatch( xProv, ::rtl::OUString(".uno:BasicIDEAppear"), ::rtl::OUString(), 0, aArgs ); + xHelper->executeDispatch( xProv, OUString(".uno:BasicIDEAppear"), OUString(), 0, aArgs ); } } } else { throw IllegalArgumentException( - ::rtl::OUString( "BasicMethodNodeImpl::invoke: function name not supported!" ), + OUString( "BasicMethodNodeImpl::invoke: function name not supported!" ), Reference< XInterface >(), 1 ); } @@ -285,7 +285,7 @@ namespace basprov // ----------------------------------------------------------------------------- - void BasicMethodNodeImpl::setValue( const ::rtl::OUString& aPropertyName, const Any& aValue ) + void BasicMethodNodeImpl::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, RuntimeException) { @@ -293,24 +293,24 @@ namespace basprov (void)aValue; throw UnknownPropertyException( - ::rtl::OUString( "BasicMethodNodeImpl::setValue: property name is unknown!" ), + OUString( "BasicMethodNodeImpl::setValue: property name is unknown!" ), Reference< XInterface >() ); } // ----------------------------------------------------------------------------- - Any BasicMethodNodeImpl::getValue( const ::rtl::OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any BasicMethodNodeImpl::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException) { (void)aPropertyName; throw UnknownPropertyException( - ::rtl::OUString( "BasicMethodNodeImpl::getValue: property name is unknown!" ), + OUString( "BasicMethodNodeImpl::getValue: property name is unknown!" ), Reference< XInterface >() ); } // ----------------------------------------------------------------------------- - sal_Bool BasicMethodNodeImpl::hasMethod( const ::rtl::OUString& aName ) throw (RuntimeException) + sal_Bool BasicMethodNodeImpl::hasMethod( const OUString& aName ) throw (RuntimeException) { sal_Bool bReturn = sal_False; if ( aName == BASPROV_PROPERTY_EDITABLE ) @@ -321,7 +321,7 @@ namespace basprov // ----------------------------------------------------------------------------- - sal_Bool BasicMethodNodeImpl::hasProperty( const ::rtl::OUString& aName ) throw (RuntimeException) + sal_Bool BasicMethodNodeImpl::hasProperty( const OUString& aName ) throw (RuntimeException) { (void)aName; diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx index 65e4d4120a1b..b2cd2461b469 100644 --- a/scripting/source/basprov/basmethnode.hxx +++ b/scripting/source/basprov/basmethnode.hxx @@ -55,12 +55,12 @@ namespace basprov { private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sScriptingContext; + OUString m_sScriptingContext; SbMethod* m_pMethod; bool m_bIsAppScript; // properties - ::rtl::OUString m_sURI; + OUString m_sURI; bool m_bEditable; protected: @@ -72,7 +72,7 @@ namespace basprov public: BasicMethodNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, + const OUString& sScriptingContext, SbMethod* pMethod, bool isAppScript = true ); virtual ~BasicMethodNodeImpl(); @@ -83,7 +83,7 @@ namespace basprov DECLARE_XTYPEPROVIDER() // XBrowseNode - virtual ::rtl::OUString SAL_CALL getName( ) + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) throw (::com::sun::star::uno::RuntimeException); @@ -100,20 +100,20 @@ namespace basprov virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL invoke( - const ::rtl::OUString& aFunctionName, + const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx index e63d4d8188a8..13981b5c6e20 100644 --- a/scripting/source/basprov/basmodnode.cxx +++ b/scripting/source/basprov/basmodnode.cxx @@ -44,7 +44,7 @@ namespace basprov // ============================================================================= BasicModuleNodeImpl::BasicModuleNodeImpl( const Reference< XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, SbModule* pModule, bool isAppScript ) + const OUString& sScriptingContext, SbModule* pModule, bool isAppScript ) :m_xContext( rxContext ) ,m_sScriptingContext( sScriptingContext ) ,m_pModule( pModule ) @@ -62,11 +62,11 @@ namespace basprov // XBrowseNode // ----------------------------------------------------------------------------- - ::rtl::OUString BasicModuleNodeImpl::getName( ) throw (RuntimeException) + OUString BasicModuleNodeImpl::getName( ) throw (RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString sModuleName; + OUString sModuleName; if ( m_pModule ) sModuleName = m_pModule->GetName(); diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx index 6f4cd2f333fd..75b330fec634 100644 --- a/scripting/source/basprov/basmodnode.hxx +++ b/scripting/source/basprov/basmodnode.hxx @@ -45,18 +45,18 @@ namespace basprov { private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::rtl::OUString m_sScriptingContext; + OUString m_sScriptingContext; SbModule* m_pModule; bool m_bIsAppScript; public: BasicModuleNodeImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sScriptingContext, + const OUString& sScriptingContext, SbModule* pModule, bool isAppScript = true ); virtual ~BasicModuleNodeImpl(); // XBrowseNode - virtual ::rtl::OUString SAL_CALL getName( ) + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 1804e3e61b6e..ed0c1f996ad7 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -67,15 +67,15 @@ namespace basprov // component operations // ============================================================================= - static ::rtl::OUString getImplementationName_BasicProviderImpl() + static OUString getImplementationName_BasicProviderImpl() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "com.sun.star.comp.scripting.ScriptProviderForBasic" ); + static OUString aImplName( "com.sun.star.comp.scripting.ScriptProviderForBasic" ); pImplName = &aImplName; } } @@ -84,19 +84,19 @@ namespace basprov // ----------------------------------------------------------------------------- - static Sequence< ::rtl::OUString > getSupportedServiceNames_BasicProviderImpl() + static Sequence< OUString > getSupportedServiceNames_BasicProviderImpl() { - static Sequence< ::rtl::OUString >* pNames = 0; + static Sequence< OUString >* pNames = 0; if ( !pNames ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pNames ) { - static Sequence< ::rtl::OUString > aNames(4); - aNames.getArray()[0] = ::rtl::OUString( "com.sun.star.script.provider.ScriptProviderForBasic" ); - aNames.getArray()[1] = ::rtl::OUString( "com.sun.star.script.provider.LanguageScriptProvider" ); - aNames.getArray()[2] = ::rtl::OUString( "com.sun.star.script.provider.ScriptProvider" ); - aNames.getArray()[3] = ::rtl::OUString( "com.sun.star.script.browse.BrowseNode" ); + static Sequence< OUString > aNames(4); + aNames.getArray()[0] = OUString( "com.sun.star.script.provider.ScriptProviderForBasic" ); + aNames.getArray()[1] = OUString( "com.sun.star.script.provider.LanguageScriptProvider" ); + aNames.getArray()[2] = OUString( "com.sun.star.script.provider.ScriptProvider" ); + aNames.getArray()[3] = OUString( "com.sun.star.script.browse.BrowseNode" ); pNames = &aNames; } } @@ -126,34 +126,34 @@ namespace basprov // ----------------------------------------------------------------------------- - bool BasicProviderImpl::isLibraryShared( const Reference< script::XLibraryContainer >& rxLibContainer, const ::rtl::OUString& rLibName ) + bool BasicProviderImpl::isLibraryShared( const Reference< script::XLibraryContainer >& rxLibContainer, const OUString& rLibName ) { bool bIsShared = false; Reference< script::XLibraryContainer2 > xLibContainer( rxLibContainer, UNO_QUERY ); if ( xLibContainer.is() && xLibContainer->hasByName( rLibName ) && xLibContainer->isLibraryLink( rLibName ) ) { - ::rtl::OUString aFileURL; + OUString aFileURL; if ( m_xContext.is() ) { Reference< uri::XUriReferenceFactory > xUriFac( uri::UriReferenceFactory::create( m_xContext ) ); - ::rtl::OUString aLinkURL( xLibContainer->getLibraryLinkURL( rLibName ) ); + OUString aLinkURL( xLibContainer->getLibraryLinkURL( rLibName ) ); Reference< uri::XUriReference > xUriRef( xUriFac->parse( aLinkURL ), UNO_QUERY ); if ( xUriRef.is() ) { - ::rtl::OUString aScheme = xUriRef->getScheme(); + OUString aScheme = xUriRef->getScheme(); if ( aScheme.equalsIgnoreAsciiCase("file") ) { aFileURL = aLinkURL; } else if ( aScheme.equalsIgnoreAsciiCase("vnd.sun.star.pkg") ) { - ::rtl::OUString aAuthority = xUriRef->getAuthority(); + OUString aAuthority = xUriRef->getAuthority(); if ( aAuthority.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.expand:" ) ) ) { - ::rtl::OUString aDecodedURL( aAuthority.copy( sizeof ( "vnd.sun.star.expand:" ) - 1 ) ); + OUString aDecodedURL( aAuthority.copy( sizeof ( "vnd.sun.star.expand:" ) - 1 ) ); aDecodedURL = ::rtl::Uri::decode( aDecodedURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); Reference xMacroExpander = util::theMacroExpander::get(m_xContext); @@ -169,10 +169,10 @@ namespace basprov osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL ); OSL_VERIFY( osl::DirectoryItem::get( aFileURL, aFileItem ) == osl::FileBase::E_None ); OSL_VERIFY( aFileItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None ); - ::rtl::OUString aCanonicalFileURL( aFileStatus.getFileURL() ); + OUString aCanonicalFileURL( aFileStatus.getFileURL() ); - ::rtl::OUString aSearchURL1( "share/basic" ); - ::rtl::OUString aSearchURL2( "share/uno_packages" ); + OUString aSearchURL1( "share/basic" ); + OUString aSearchURL2( "share/uno_packages" ); if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 || aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 ) bIsShared = true; } @@ -185,18 +185,18 @@ namespace basprov // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString BasicProviderImpl::getImplementationName( ) throw (RuntimeException) + OUString BasicProviderImpl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_BasicProviderImpl(); } // ----------------------------------------------------------------------------- - sal_Bool BasicProviderImpl::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + sal_Bool BasicProviderImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -205,7 +205,7 @@ namespace basprov // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > BasicProviderImpl::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > BasicProviderImpl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_BasicProviderImpl(); } @@ -223,7 +223,7 @@ namespace basprov if ( aArguments.getLength() != 1 ) { throw IllegalArgumentException( - ::rtl::OUString( "BasicProviderImpl::initialize: incorrect argument count." ), + OUString( "BasicProviderImpl::initialize: incorrect argument count." ), *this, 1 ); @@ -238,7 +238,7 @@ namespace basprov if ( !xModel.is() ) { throw IllegalArgumentException( - ::rtl::OUString( "BasicProviderImpl::initialize: unable to determine the document model from the script invocation context." ), + OUString( "BasicProviderImpl::initialize: unable to determine the document model from the script invocation context." ), *this, 1 ); @@ -249,13 +249,13 @@ namespace basprov if ( !( aArguments[0] >>= m_sScriptingContext ) ) { throw IllegalArgumentException( - ::rtl::OUString( "BasicProviderImpl::initialize: incorrect argument type " ).concat( aArguments[0].getValueTypeName() ), + OUString( "BasicProviderImpl::initialize: incorrect argument type " ).concat( aArguments[0].getValueTypeName() ), *this, 1 ); } - ::rtl::OUString sDoc = "vnd.sun.star.tdoc"; + OUString sDoc = "vnd.sun.star.tdoc"; if ( m_sScriptingContext.indexOf( sDoc ) == 0 ) { xModel = MiscUtils::tDocUrlToModel( m_sScriptingContext ); @@ -287,7 +287,7 @@ namespace basprov { /* throw RuntimeException( - ::rtl::OUString( "BasicProviderImpl::initialize: no scripting context!" ), + OUString( "BasicProviderImpl::initialize: no scripting context!" ), Reference< XInterface >() ); */ } @@ -306,7 +306,7 @@ namespace basprov // XScriptProvider // ----------------------------------------------------------------------------- - Reference < provider::XScript > BasicProviderImpl::getScript( const ::rtl::OUString& scriptURI ) + Reference < provider::XScript > BasicProviderImpl::getScript( const OUString& scriptURI ) throw ( provider::ScriptFrameworkErrorException, RuntimeException) { // TODO @@ -323,7 +323,7 @@ namespace basprov if ( !uriRef.is() || !sfUri.is() ) { - ::rtl::OUString errorMsg("BasicProviderImpl::getScript: failed to parse URI: "); + OUString errorMsg("BasicProviderImpl::getScript: failed to parse URI: "); errorMsg = errorMsg.concat( scriptURI ); throw provider::ScriptFrameworkErrorException( errorMsg, Reference< XInterface >(), @@ -332,9 +332,9 @@ namespace basprov } - ::rtl::OUString aDescription = sfUri->getName(); - ::rtl::OUString aLocation = sfUri->getParameter( - ::rtl::OUString("location") ); + OUString aDescription = sfUri->getName(); + OUString aLocation = sfUri->getParameter( + OUString("location") ); sal_Int32 nIndex = 0; // In some strange circumstances the Library name can have an @@ -349,25 +349,25 @@ namespace basprov { pBasicMgr = m_pAppBasicManager; } - rtl::OUString sProjectName; + OUString sProjectName; if ( pBasicMgr ) sProjectName = pBasicMgr->GetName(); - ::rtl::OUString aLibrary; + OUString aLibrary; if ( !sProjectName.isEmpty() && aDescription.match( sProjectName ) ) { OSL_TRACE("LibraryName %s is part of the url %s", - rtl::OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( aDescription, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( aDescription, RTL_TEXTENCODING_UTF8 ).getStr() ); aLibrary = sProjectName; nIndex = sProjectName.getLength() + 1; } else aLibrary = aDescription.getToken( 0, (sal_Unicode)'.', nIndex ); - ::rtl::OUString aModule; + OUString aModule; if ( nIndex != -1 ) aModule = aDescription.getToken( 0, (sal_Unicode)'.', nIndex ); - ::rtl::OUString aMethod; + OUString aMethod; if ( nIndex != -1 ) aMethod = aDescription.getToken( 0, (sal_Unicode)'.', nIndex ); @@ -410,7 +410,7 @@ namespace basprov if ( !xScript.is() ) { - ::rtl::OUStringBuffer aMessage; + OUStringBuffer aMessage; aMessage.appendAscii( "The following Basic script could not be found:\n" ); aMessage.appendAscii( "library: '" ).append( aLibrary ).appendAscii( "'\n" ); aMessage.appendAscii( "module: '" ).append( aModule ).appendAscii( "'\n" ); @@ -430,13 +430,13 @@ namespace basprov // XBrowseNode // ----------------------------------------------------------------------------- - ::rtl::OUString BasicProviderImpl::getName( ) throw (RuntimeException) + OUString BasicProviderImpl::getName( ) throw (RuntimeException) { // TODO SolarMutexGuard aGuard; - return ::rtl::OUString("Basic"); + return OUString("Basic"); } // ----------------------------------------------------------------------------- @@ -463,9 +463,9 @@ namespace basprov if ( pBasicManager && xLibContainer.is() ) { - Sequence< ::rtl::OUString > aLibNames = xLibContainer->getElementNames(); + Sequence< OUString > aLibNames = xLibContainer->getElementNames(); sal_Int32 nLibCount = aLibNames.getLength(); - const ::rtl::OUString* pLibNames = aLibNames.getConstArray(); + const OUString* pLibNames = aLibNames.getConstArray(); aChildNodes.realloc( nLibCount ); Reference< browse::XBrowseNode >* pChildNodes = aChildNodes.getArray(); sal_Int32 childrenFound = 0; diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx index 2bafb1eb4289..fcb72bcf9afc 100644 --- a/scripting/source/basprov/basprov.hxx +++ b/scripting/source/basprov/basprov.hxx @@ -58,14 +58,14 @@ namespace basprov ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > m_xLibContainerDoc; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext > m_xInvocationContext; - ::rtl::OUString m_sScriptingContext; + OUString m_sScriptingContext; bool m_bIsAppScriptCtx; bool m_bIsUserCtx; - ::rtl::OUString m_sCtxLocation; + OUString m_sCtxLocation; bool isLibraryShared( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& rxLibContainer, - const ::rtl::OUString& rLibName ); + const OUString& rLibName ); public: BasicProviderImpl( @@ -73,11 +73,11 @@ namespace basprov virtual ~BasicProviderImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -86,11 +86,11 @@ namespace basprov // XScriptProvider virtual ::com::sun::star::uno::Reference < ::com::sun::star::script::provider::XScript > SAL_CALL getScript( - const ::rtl::OUString& scriptURI ) + const OUString& scriptURI ) throw ( ::com::sun::star::script::provider::ScriptFrameworkErrorException, ::com::sun::star::uno::RuntimeException); // XBrowseNode - virtual ::rtl::OUString SAL_CALL getName( ) + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index b4e5de641a92..5a85b303fba7 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -47,7 +47,7 @@ namespace basprov { //......................................................................... #define BASSCRIPT_PROPERTY_ID_CALLER 1 -#define BASSCRIPT_PROPERTY_CALLER ::rtl::OUString( "Caller" ) +#define BASSCRIPT_PROPERTY_CALLER OUString( "Caller" ) #define BASSCRIPT_DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT @@ -59,7 +59,7 @@ namespace basprov // ----------------------------------------------------------------------------- - BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod ) + BasicScriptImpl::BasicScriptImpl( const OUString& funcName, SbMethodRef xMethod ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex ) ,OPropertyContainer( GetBroadcastHelper() ) ,m_xMethod( xMethod ) @@ -72,7 +72,7 @@ namespace basprov // ----------------------------------------------------------------------------- - BasicScriptImpl::BasicScriptImpl( const ::rtl::OUString& funcName, SbMethodRef xMethod, + BasicScriptImpl::BasicScriptImpl( const OUString& funcName, SbMethodRef xMethod, BasicManager& documentBasicManager, const Reference< XScriptInvocationContext >& documentScriptContext ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex ) ,OPropertyContainer( GetBroadcastHelper() ) ,m_xMethod( xMethod ) @@ -191,11 +191,11 @@ namespace basprov if ( nParamsCount < nSbxCount - nSbxOptional ) { throw provider::ScriptFrameworkErrorException( - ::rtl::OUString( + OUString( "wrong number of parameters!" ), Reference< XInterface >(), m_funcName, - ::rtl::OUString( "Basic" ), + OUString( "Basic" ), provider::ScriptFrameworkErrorType::NO_SUCH_SCRIPT ); } } diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx index 72ade2ceaea2..50cbc28e0980 100644 --- a/scripting/source/basprov/basscript.hxx +++ b/scripting/source/basprov/basscript.hxx @@ -52,7 +52,7 @@ namespace basprov { private: SbMethodRef m_xMethod; - ::rtl::OUString m_funcName; + OUString m_funcName; BasicManager* m_documentBasicManager; ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext > m_xDocumentScriptContext; @@ -69,11 +69,11 @@ namespace basprov public: BasicScriptImpl( - const ::rtl::OUString& funcName, + const OUString& funcName, SbMethodRef xMethod ); BasicScriptImpl( - const ::rtl::OUString& funcName, + const OUString& funcName, SbMethodRef xMethod, BasicManager& documentBasicManager, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XScriptInvocationContext >& documentScriptContext diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx index 8567d88fe51a..aee0a9a16ec5 100644 --- a/scripting/source/dlgprov/DialogModelProvider.cxx +++ b/scripting/source/dlgprov/DialogModelProvider.cxx @@ -35,8 +35,8 @@ using namespace beans; // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace @@ -63,7 +63,7 @@ void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any { if ( aArguments.getLength() == 1 ) { - ::rtl::OUString sURL; + OUString sURL; if ( !( aArguments[ 0 ] >>= sURL )) throw css::lang::IllegalArgumentException(); // Try any other URL with SimpleFileAccess @@ -102,34 +102,34 @@ uno::Type SAL_CALL DialogModelProvider::getElementType() throw (css::uno::Runtim } // container::XNameAccess: -uno::Any SAL_CALL DialogModelProvider::getByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException) +uno::Any SAL_CALL DialogModelProvider::getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException) { return m_xDialogModel->getByName(aName); } -css::uno::Sequence< ::rtl::OUString > SAL_CALL DialogModelProvider::getElementNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getElementNames() throw (css::uno::RuntimeException) { return m_xDialogModel->getElementNames(); } -::sal_Bool SAL_CALL DialogModelProvider::hasByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL DialogModelProvider::hasByName(const OUString & aName) throw (css::uno::RuntimeException) { return m_xDialogModel->hasByName(aName); } // container::XNameReplace: -void SAL_CALL DialogModelProvider::replaceByName(const ::rtl::OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException) +void SAL_CALL DialogModelProvider::replaceByName(const OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException) { m_xDialogModel->replaceByName(aName,aElement); } // container::XNameContainer: -void SAL_CALL DialogModelProvider::insertByName(const ::rtl::OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException) +void SAL_CALL DialogModelProvider::insertByName(const OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException) { m_xDialogModel->insertByName(aName,aElement); } -void SAL_CALL DialogModelProvider::removeByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException) +void SAL_CALL DialogModelProvider::removeByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException) { m_xDialogModel->removeByName(aName); } @@ -137,35 +137,35 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL DialogModelProvider::getPrope { return m_xDialogModelProp->getPropertySetInfo(); } -void SAL_CALL DialogModelProvider::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL DialogModelProvider::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { } -uno::Any SAL_CALL DialogModelProvider::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL DialogModelProvider::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return m_xDialogModelProp->getPropertyValue(PropertyName); } -void SAL_CALL DialogModelProvider::addPropertyChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL DialogModelProvider::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } -void SAL_CALL DialogModelProvider::removePropertyChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL DialogModelProvider::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } -void SAL_CALL DialogModelProvider::addVetoableChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL DialogModelProvider::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } -void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const ::rtl::OUString& ,const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const OUString& ,const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL DialogModelProvider::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL DialogModelProvider::getImplementationName() throw (css::uno::RuntimeException) { return comp_DialogModelProvider::_getImplementationName(); } -::sal_Bool SAL_CALL DialogModelProvider::supportsService(::rtl::OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > serviceNames = comp_DialogModelProvider::_getSupportedServiceNames(); + css::uno::Sequence< OUString > serviceNames = comp_DialogModelProvider::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) return sal_True; @@ -173,7 +173,7 @@ void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const ::rtl::OU return sal_False; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames() throw (css::uno::RuntimeException) { return comp_DialogModelProvider::_getSupportedServiceNames(); } diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx index 9ce8518a1784..4d9256a35f14 100644 --- a/scripting/source/dlgprov/DialogModelProvider.hxx +++ b/scripting/source/dlgprov/DialogModelProvider.hxx @@ -45,29 +45,29 @@ private: virtual ::sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException); // ::com::sun::star::container::XNameAccess: - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName(const OUString & aName) throw (css::uno::RuntimeException); // ::com::sun::star::container::XNameReplace: - virtual void SAL_CALL replaceByName(const ::rtl::OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException); + virtual void SAL_CALL replaceByName(const OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException); // ::com::sun::star::container::XNameContainer: - virtual void SAL_CALL insertByName(const ::rtl::OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException); - virtual void SAL_CALL removeByName(const ::rtl::OUString & Name) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException); + virtual void SAL_CALL insertByName(const OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException); + virtual void SAL_CALL removeByName(const OUString & Name) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); private: DialogModelProvider(const DialogModelProvider &); // not defined diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 1d87b50a7569..c6b19691cf0f 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -96,31 +96,31 @@ namespace dlgprov class DialogVBAScriptListenerImpl : public DialogScriptListenerImpl { protected: - rtl::OUString msDialogCodeName; - rtl::OUString msDialogLibName; + OUString msDialogCodeName; + OUString msDialogLibName; Reference< script::XScriptListener > mxListener; virtual void firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* pRet ); public: - DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const rtl::OUString& sDialogLibName ); + DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const OUString& sDialogLibName ); }; - DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const rtl::OUString& sDialogLibName ) : DialogScriptListenerImpl( rxContext ), msDialogLibName( sDialogLibName ) + DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const OUString& sDialogLibName ) : DialogScriptListenerImpl( rxContext ), msDialogLibName( sDialogLibName ) { Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() ); Sequence< Any > args(1); if ( xSMgr.is() ) { args[0] <<= xModel; - mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( ::rtl::OUString( "ooo.vba.EventListener" ), args, m_xContext ), UNO_QUERY ); + mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( OUString( "ooo.vba.EventListener" ), args, m_xContext ), UNO_QUERY ); } if ( rxControl.is() ) { try { Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY_THROW ); - xProps->getPropertyValue( rtl::OUString("Name" ) ) >>= msDialogCodeName; + xProps->getPropertyValue( OUString("Name" ) ) >>= msDialogCodeName; xProps.set( mxListener, UNO_QUERY_THROW ); - xProps->setPropertyValue( rtl::OUString("Model" ), args[ 0 ] ); + xProps->setPropertyValue( OUString("Model" ), args[ 0 ] ); } catch( const Exception& ) { @@ -135,7 +135,7 @@ namespace dlgprov if ( aScriptEvent.ScriptType == "VBAInterop" && mxListener.is() ) { ScriptEvent aScriptEventCopy( aScriptEvent ); - aScriptEventCopy.ScriptCode = msDialogLibName.concat( rtl::OUString( "." ) ).concat( msDialogCodeName ); + aScriptEventCopy.ScriptCode = msDialogLibName.concat( OUString( "." ) ).concat( msDialogCodeName ); try { mxListener->firing( aScriptEventCopy ); @@ -153,32 +153,32 @@ namespace dlgprov // DialogEventsAttacherImpl // ============================================================================= - DialogEventsAttacherImpl::DialogEventsAttacherImpl( const Reference< XComponentContext >& rxContext, const Reference< frame::XModel >& rxModel, const Reference< awt::XControl >& rxControl, const Reference< XInterface >& rxHandler, const Reference< beans::XIntrospectionAccess >& rxIntrospect, bool bProviderMode, const Reference< script::XScriptListener >& rxRTLListener, const rtl::OUString& sDialogLibName ) + DialogEventsAttacherImpl::DialogEventsAttacherImpl( const Reference< XComponentContext >& rxContext, const Reference< frame::XModel >& rxModel, const Reference< awt::XControl >& rxControl, const Reference< XInterface >& rxHandler, const Reference< beans::XIntrospectionAccess >& rxIntrospect, bool bProviderMode, const Reference< script::XScriptListener >& rxRTLListener, const OUString& sDialogLibName ) :mbUseFakeVBAEvents( false ), m_xContext( rxContext ) { // key listeners by protocol when ScriptType = 'Script' // otherwise key is the ScriptType e.g. StarBasic if ( rxRTLListener.is() ) // set up handler for RTL_BASIC - listernersForTypes[ rtl::OUString("StarBasic") ] = rxRTLListener; + listernersForTypes[ OUString("StarBasic") ] = rxRTLListener; else - listernersForTypes[ rtl::OUString("StarBasic") ] = new DialogLegacyScriptListenerImpl( rxContext, rxModel ); - // handler for Script & ::rtl::OUString("vnd.sun.star.UNO:") - listernersForTypes[ rtl::OUString("vnd.sun.star.UNO") ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode ); - listernersForTypes[ rtl::OUString("vnd.sun.star.script") ] = new DialogSFScriptListenerImpl( rxContext, rxModel ); + listernersForTypes[ OUString("StarBasic") ] = new DialogLegacyScriptListenerImpl( rxContext, rxModel ); + // handler for Script & OUString("vnd.sun.star.UNO:") + listernersForTypes[ OUString("vnd.sun.star.UNO") ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode ); + listernersForTypes[ OUString("vnd.sun.star.script") ] = new DialogSFScriptListenerImpl( rxContext, rxModel ); // determine the VBA compatibility mode from the Basic library container try { uno::Reference< beans::XPropertySet > xModelProps( rxModel, uno::UNO_QUERY_THROW ); uno::Reference< script::vba::XVBACompatibility > xVBACompat( - xModelProps->getPropertyValue( ::rtl::OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); + xModelProps->getPropertyValue( OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); mbUseFakeVBAEvents = xVBACompat->getVBACompatibilityMode(); } catch( uno::Exception& ) { } if ( mbUseFakeVBAEvents ) - listernersForTypes[ rtl::OUString("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName ); + listernersForTypes[ OUString("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName ); } // ----------------------------------------------------------------------------- @@ -189,20 +189,20 @@ namespace dlgprov // ----------------------------------------------------------------------------- Reference< script::XScriptListener > - DialogEventsAttacherImpl::getScriptListenerForKey( const rtl::OUString& sKey ) throw ( RuntimeException ) + DialogEventsAttacherImpl::getScriptListenerForKey( const OUString& sKey ) throw ( RuntimeException ) { ListenerHash::iterator it = listernersForTypes.find( sKey ); if ( it == listernersForTypes.end() ) throw RuntimeException(); // more text info here please return it->second; } - Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl, rtl::OUString& sControlName ) + Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl, OUString& sControlName ) { Reference< XScriptEventsSupplier > xEventsSupplier; Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() ); if ( xSMgr.is() ) { - Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( ::rtl::OUString( "ooo.vba.VBAToOOEventDesc" ), m_xContext ), UNO_QUERY ); + Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( OUString( "ooo.vba.VBAToOOEventDesc" ), m_xContext ), UNO_QUERY ); if ( xVBAToOOEvtDesc.is() ) xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl, sControlName ), UNO_QUERY ); @@ -219,12 +219,12 @@ namespace dlgprov Reference< XControlModel > xControlModel = xControl->getModel(); Reference< XPropertySet > xProps( xControlModel, uno::UNO_QUERY ); - rtl::OUString sName; - xProps->getPropertyValue( rtl::OUString("Name") ) >>= sName; + OUString sName; + xProps->getPropertyValue( OUString("Name") ) >>= sName; if ( xEventCont.is() ) { - Sequence< ::rtl::OUString > aNames = xEventCont->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + Sequence< OUString > aNames = xEventCont->getElementNames(); + const OUString* pNames = aNames.getConstArray(); sal_Int32 nNameCount = aNames.getLength(); for ( sal_Int32 j = 0; j < nNameCount; ++j ) @@ -233,7 +233,7 @@ namespace dlgprov Any aElement = xEventCont->getByName( pNames[ j ] ); aElement >>= aDesc; - rtl::OUString sKey = aDesc.ScriptType; + OUString sKey = aDesc.ScriptType; if ( aDesc.ScriptType == "Script" || aDesc.ScriptType == "UNO" ) { sal_Int32 nIndex = aDesc.ScriptCode.indexOf( ':' ); @@ -278,7 +278,7 @@ namespace dlgprov } - void DialogEventsAttacherImpl::nestedAttachEvents( const Sequence< Reference< XInterface > >& Objects, const Any& Helper, rtl::OUString& sDialogCodeName ) + void DialogEventsAttacherImpl::nestedAttachEvents( const Sequence< Reference< XInterface > >& Objects, const Any& Helper, OUString& sDialogCodeName ) { const Reference< XInterface >* pObjects = Objects.getConstArray(); sal_Int32 nObjCount = Objects.getLength(); @@ -342,7 +342,7 @@ namespace dlgprov if ( xSMgr.is() ) { m_xEventAttacher = Reference< XEventAttacher >( xSMgr->createInstanceWithContext( - ::rtl::OUString( "com.sun.star.script.EventAttacher" ), m_xContext ), UNO_QUERY ); + OUString( "com.sun.star.script.EventAttacher" ), m_xContext ), UNO_QUERY ); if ( !m_xEventAttacher.is() ) throw ServiceNotRegisteredException(); @@ -354,7 +354,7 @@ namespace dlgprov } } - rtl::OUString sDialogCodeName; + OUString sDialogCodeName; sal_Int32 nObjCount = Objects.getLength(); Reference< awt::XControl > xDlgControl( Objects[ nObjCount - 1 ], uno::UNO_QUERY ); // last object is the dialog if ( xDlgControl.is() ) @@ -362,7 +362,7 @@ namespace dlgprov Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY ); try { - xProps->getPropertyValue( rtl::OUString("Name" ) ) >>= sDialogCodeName; + xProps->getPropertyValue( OUString("Name" ) ) >>= sDialogCodeName; } catch( Exception& ){} } @@ -376,7 +376,7 @@ namespace dlgprov // ============================================================================= DialogAllListenerImpl::DialogAllListenerImpl( const Reference< XScriptListener >& rxListener, - const ::rtl::OUString& rScriptType, const ::rtl::OUString& rScriptCode ) + const OUString& rScriptType, const OUString& rScriptCode ) :m_xScriptListener( rxListener ) ,m_sScriptType( rScriptType ) ,m_sScriptCode( rScriptCode ) @@ -489,7 +489,7 @@ namespace dlgprov provider::theMasterScriptProviderFactory::get( m_xContext ); Any aCtx; - aCtx <<= ::rtl::OUString("user"); + aCtx <<= OUString("user"); xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY ); } } @@ -524,8 +524,8 @@ namespace dlgprov void DialogLegacyScriptListenerImpl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet ) { - ::rtl::OUString sScriptURL; - ::rtl::OUString sScriptCode( aScriptEvent.ScriptCode ); + OUString sScriptURL; + OUString sScriptCode( aScriptEvent.ScriptCode ); if ( aScriptEvent.ScriptType.compareToAscii( "StarBasic" ) == 0 ) { @@ -533,9 +533,9 @@ namespace dlgprov sal_Int32 nIndex = sScriptCode.indexOf( ':' ); if ( nIndex >= 0 && nIndex < sScriptCode.getLength() ) { - sScriptURL = ::rtl::OUString("vnd.sun.star.script:"); + sScriptURL = OUString("vnd.sun.star.script:"); sScriptURL += sScriptCode.copy( nIndex + 1 ); - sScriptURL += ::rtl::OUString("?language=Basic&location="); + sScriptURL += OUString("?language=Basic&location="); sScriptURL += sScriptCode.copy( 0, nIndex ); } ScriptEvent aSFScriptEvent( aScriptEvent ); @@ -546,9 +546,9 @@ namespace dlgprov void DialogUnoScriptListenerImpl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet ) { - static ::rtl::OUString sUnoURLScheme("vnd.sun.star.UNO:"); + static OUString sUnoURLScheme("vnd.sun.star.UNO:"); - ::rtl::OUString aMethodName = aScriptEvent.ScriptCode.copy( sUnoURLScheme.getLength() ); + OUString aMethodName = aScriptEvent.ScriptCode.copy( sUnoURLScheme.getLength() ); const Any* pArguments = aScriptEvent.Arguments.getConstArray(); Any aEventObject = pArguments[0]; @@ -634,12 +634,12 @@ namespace dlgprov if( pResMgr ) { String aRes( ResId(STR_ERRUNOEVENTBINDUNG, *pResMgr) ); - ::rtl::OUString aQuoteChar( "\"" ); + OUString aQuoteChar( "\"" ); - ::rtl::OUString aOURes = aRes; + OUString aOURes = aRes; sal_Int32 nIndex = aOURes.indexOf( '%' ); - ::rtl::OUString aOUFinal; + OUString aOUFinal; aOUFinal += aOURes.copy( 0, nIndex ); aOUFinal += aQuoteChar; aOUFinal += aMethodName; diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx index 8d0aa4f150e0..c1d4cb801792 100644 --- a/scripting/source/dlgprov/dlgevtatt.hxx +++ b/scripting/source/dlgprov/dlgevtatt.hxx @@ -42,10 +42,10 @@ namespace dlgprov // ============================================================================= // class DialogEventsAttacherImpl // ============================================================================= - typedef boost::unordered_map< rtl::OUString, + typedef boost::unordered_map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ListenerHash; + OUStringHash, + ::std::equal_to< OUString > > ListenerHash; typedef ::cppu::WeakImplHelper1< ::com::sun::star::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE; @@ -58,9 +58,9 @@ namespace dlgprov ListenerHash listernersForTypes; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacher > m_xEventAttacher; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > getScriptListenerForKey( const rtl::OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, rtl::OUString& sCodeName ); - void nestedAttachEvents( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects, const ::com::sun::star::uno::Any& Helper, rtl::OUString& sDialogCodeName ); + ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > getScriptListenerForKey( const OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, OUString& sCodeName ); + void nestedAttachEvents( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects, const ::com::sun::star::uno::Any& Helper, OUString& sDialogCodeName ); void SAL_CALL attachEventsToControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier >& events, const ::com::sun::star::uno::Any& Helper ); public: DialogEventsAttacherImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, @@ -69,7 +69,7 @@ namespace dlgprov const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& xIntrospect, bool bProviderMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xRTLListener ,const rtl::OUString& sDialogLibName ); + const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xRTLListener ,const OUString& sDialogLibName ); virtual ~DialogEventsAttacherImpl(); // XScriptEventsAttacher @@ -97,14 +97,14 @@ namespace dlgprov { private: ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > m_xScriptListener; - ::rtl::OUString m_sScriptType; - ::rtl::OUString m_sScriptCode; + OUString m_sScriptType; + OUString m_sScriptCode; virtual void firing_impl( const ::com::sun::star::script::AllEventObject& Event, ::com::sun::star::uno::Any* pRet ); public: DialogAllListenerImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& rxListener, - const ::rtl::OUString& rScriptType, const ::rtl::OUString& rScriptCode ); + const OUString& rScriptType, const OUString& rScriptCode ); virtual ~DialogAllListenerImpl(); // XEventListener diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 9ea9735c9d44..2be567db31c8 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -64,15 +64,15 @@ using namespace ::sf_misc; namespace comp_DialogModelProvider { - ::rtl::OUString SAL_CALL _getImplementationName() + OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString("com.sun.star.comp.scripting.DialogModelProvider"); + return OUString("com.sun.star.comp.scripting.DialogModelProvider"); } - uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames() + uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > s(1); - s[0] = ::rtl::OUString("com.sun.star.awt.UnoControlDialogModelProvider"); + uno::Sequence< OUString > s(1); + s[0] = OUString("com.sun.star.awt.UnoControlDialogModelProvider"); return s; } @@ -86,17 +86,17 @@ namespace dlgprov { //......................................................................... -static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); +static OUString aResourceResolverPropName("ResourceResolver"); - Reference< resource::XStringResourceManager > lcl_getStringResourceManager(const Reference< XComponentContext >& i_xContext,const ::rtl::OUString& i_sURL) + Reference< resource::XStringResourceManager > lcl_getStringResourceManager(const Reference< XComponentContext >& i_xContext,const OUString& i_sURL) { INetURLObject aInetObj( i_sURL ); - ::rtl::OUString aDlgName = aInetObj.GetBase(); + OUString aDlgName = aInetObj.GetBase(); aInetObj.removeSegment(); - ::rtl::OUString aDlgLocation = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); + OUString aDlgLocation = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); bool bReadOnly = true; ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale(); - ::rtl::OUString aComment; + OUString aComment; Sequence aArgs( 6 ); aArgs[0] <<= aDlgLocation; @@ -110,7 +110,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_QUERY_THROW ); // TODO: Ctor Reference< resource::XStringResourceManager > xStringResourceManager( xSMgr_->createInstanceWithContext - ( ::rtl::OUString("com.sun.star.resource.StringResourceWithLocation"), + ( OUString("com.sun.star.resource.StringResourceWithLocation"), i_xContext ), UNO_QUERY ); if( xStringResourceManager.is() ) { @@ -123,7 +123,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); Reference< container::XNameContainer > lcl_createControlModel(const Reference< XComponentContext >& i_xContext) { Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_QUERY_THROW ); - Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext( ::rtl::OUString( "com.sun.star.awt.UnoControlDialogModel" ), i_xContext ), UNO_QUERY_THROW ); + Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext( OUString( "com.sun.star.awt.UnoControlDialogModel" ), i_xContext ), UNO_QUERY_THROW ); return xControlModel; } Reference< container::XNameContainer > lcl_createDialogModel( const Reference< XComponentContext >& i_xContext, @@ -134,7 +134,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); { Reference< container::XNameContainer > xDialogModel( lcl_createControlModel(i_xContext) ); - ::rtl::OUString aDlgSrcUrlPropName( "DialogSourceURL" ); + OUString aDlgSrcUrlPropName( "DialogSourceURL" ); Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY ); xDlgPropSet->setPropertyValue( aDlgSrcUrlPropName, aDialogSourceURL ); @@ -162,15 +162,15 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); // component operations // ============================================================================= - static ::rtl::OUString getImplementationName_DialogProviderImpl() + static OUString getImplementationName_DialogProviderImpl() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "com.sun.star.comp.scripting.DialogProvider" ); + static OUString aImplName( "com.sun.star.comp.scripting.DialogProvider" ); pImplName = &aImplName; } } @@ -179,18 +179,18 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); // ----------------------------------------------------------------------------- - static Sequence< ::rtl::OUString > getSupportedServiceNames_DialogProviderImpl() + static Sequence< OUString > getSupportedServiceNames_DialogProviderImpl() { - static Sequence< ::rtl::OUString >* pNames = 0; + static Sequence< OUString >* pNames = 0; if ( !pNames ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pNames ) { - static Sequence< ::rtl::OUString > aNames(3); - aNames.getArray()[0] = ::rtl::OUString( "com.sun.star.awt.DialogProvider" ); - aNames.getArray()[1] = ::rtl::OUString( "com.sun.star.awt.DialogProvider2" ); - aNames.getArray()[2] = ::rtl::OUString( "com.sun.star.awt.ContainerWindowProvider" ); + static Sequence< OUString > aNames(3); + aNames.getArray()[0] = OUString( "com.sun.star.awt.DialogProvider" ); + aNames.getArray()[1] = OUString( "com.sun.star.awt.DialogProvider2" ); + aNames.getArray()[2] = OUString( "com.sun.star.awt.ContainerWindowProvider" ); pNames = &aNames; } } @@ -267,20 +267,20 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); { if ( !m_BasicInfo.get() ) // shouln't get here - throw RuntimeException( ::rtl::OUString( "No information to create dialog" ), Reference< XInterface >() ); + throw RuntimeException( OUString( "No information to create dialog" ), Reference< XInterface >() ); Reference< resource::XStringResourceManager > xStringResourceManager = getStringResourceFromDialogLibrary( m_BasicInfo->mxDlgLib ); - rtl::OUString aURL("" ); + OUString aURL("" ); Any aDialogSourceURL; aDialogSourceURL <<= aURL; Reference< XControlModel > xCtrlModel( createDialogModel( m_BasicInfo->mxInput, xStringResourceManager, aDialogSourceURL ), UNO_QUERY_THROW ); return xCtrlModel; } - Reference< XControlModel > DialogProviderImpl::createDialogModel( const ::rtl::OUString& sURL ) + Reference< XControlModel > DialogProviderImpl::createDialogModel( const OUString& sURL ) { - ::rtl::OUString aURL( sURL ); + OUString aURL( sURL ); // parse URL // TODO: use URL parsing class @@ -304,7 +304,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); uriRef = Reference< uri::XUriReference >( xFac->parse( aURL ), UNO_QUERY ); if ( !uriRef.is() ) { - ::rtl::OUString errorMsg("DialogProviderImpl::getDialogModel: failed to parse URI: "); + OUString errorMsg("DialogProviderImpl::getDialogModel: failed to parse URI: "); errorMsg += aURL; throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 1 ); @@ -333,17 +333,17 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); } else { - ::rtl::OUString sDescription = sfUri->getName(); + OUString sDescription = sfUri->getName(); sal_Int32 nIndex = 0; - ::rtl::OUString sLibName = sDescription.getToken( 0, (sal_Unicode)'.', nIndex ); - ::rtl::OUString sDlgName; + OUString sLibName = sDescription.getToken( 0, (sal_Unicode)'.', nIndex ); + OUString sDlgName; if ( nIndex != -1 ) sDlgName = sDescription.getToken( 0, (sal_Unicode)'.', nIndex ); - ::rtl::OUString sLocation = sfUri->getParameter( - ::rtl::OUString("location") ); + OUString sLocation = sfUri->getParameter( + OUString("location") ); // get dialog library container @@ -366,9 +366,9 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); } else { - Sequence< ::rtl::OUString > aOpenDocsTdocURLs( MiscUtils::allOpenTDocUrls( m_xContext ) ); - const ::rtl::OUString* pTdocURL = aOpenDocsTdocURLs.getConstArray(); - const ::rtl::OUString* pTdocURLEnd = aOpenDocsTdocURLs.getConstArray() + aOpenDocsTdocURLs.getLength(); + Sequence< OUString > aOpenDocsTdocURLs( MiscUtils::allOpenTDocUrls( m_xContext ) ); + const OUString* pTdocURL = aOpenDocsTdocURLs.getConstArray(); + const OUString* pTdocURLEnd = aOpenDocsTdocURLs.getConstArray() + aOpenDocsTdocURLs.getLength(); for ( ; pTdocURL != pTdocURLEnd; ++pTdocURL ) { Reference< frame::XModel > xModel( MiscUtils::tDocUrlToModel( *pTdocURL ) ); @@ -376,7 +376,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if ( !xModel.is() ) continue; - ::rtl::OUString sDocURL = xModel->getURL(); + OUString sDocURL = xModel->getURL(); if ( sDocURL.isEmpty() ) { ::comphelper::NamedValueCollection aModelArgs( xModel->getArgs() ); @@ -423,21 +423,21 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if ( !xISP.is() ) { throw IllegalArgumentException( - ::rtl::OUString( "DialogProviderImpl::getDialogModel: dialog not found!" ), + OUString( "DialogProviderImpl::getDialogModel: dialog not found!" ), Reference< XInterface >(), 1 ); } } else { throw IllegalArgumentException( - ::rtl::OUString( "DialogProviderImpl::getDialogModel: library not found!" ), + OUString( "DialogProviderImpl::getDialogModel: library not found!" ), Reference< XInterface >(), 1 ); } } else { throw IllegalArgumentException( - ::rtl::OUString( "DialogProviderImpl::getDialog: library container not found!" ), + OUString( "DialogProviderImpl::getDialog: library container not found!" ), Reference< XInterface >(), 1 ); } @@ -486,7 +486,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if ( xSMgr.is() ) { xDialogControl = Reference< XControl >( xSMgr->createInstanceWithContext( - ::rtl::OUString( "com.sun.star.awt.UnoControlDialog" ), m_xContext ), UNO_QUERY ); + OUString( "com.sun.star.awt.UnoControlDialog" ), m_xContext ), UNO_QUERY ); if ( xDialogControl.is() ) { @@ -597,18 +597,18 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString DialogProviderImpl::getImplementationName( ) throw (RuntimeException) + OUString DialogProviderImpl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_DialogProviderImpl(); } // ----------------------------------------------------------------------------- - sal_Bool DialogProviderImpl::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + sal_Bool DialogProviderImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -617,7 +617,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > DialogProviderImpl::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > DialogProviderImpl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_DialogProviderImpl(); } @@ -637,7 +637,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if ( !m_xModel.is() ) { throw RuntimeException( - ::rtl::OUString( "DialogProviderImpl::initialize: invalid argument format!" ), + OUString( "DialogProviderImpl::initialize: invalid argument format!" ), Reference< XInterface >() ); } } @@ -659,7 +659,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); else if ( aArguments.getLength() > 4 ) { throw RuntimeException( - ::rtl::OUString( "DialogProviderImpl::initialize: invalid number of arguments!" ), + OUString( "DialogProviderImpl::initialize: invalid number of arguments!" ), Reference< XInterface >() ); } } @@ -668,11 +668,11 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); // XDialogProvider // ----------------------------------------------------------------------------- - static ::rtl::OUString aDecorationPropName("Decoration"); - static ::rtl::OUString aTitlePropName("Title"); + static OUString aDecorationPropName("Decoration"); + static OUString aTitlePropName("Title"); Reference < XControl > DialogProviderImpl::createDialogImpl( - const ::rtl::OUString& URL, const Reference< XInterface >& xHandler, + const OUString& URL, const Reference< XInterface >& xHandler, const Reference< XWindowPeer >& xParent, bool bDialogProviderMode ) throw (IllegalArgumentException, RuntimeException) { @@ -701,7 +701,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); catch ( const Exception& ) { const Any aError( ::cppu::getCaughtException() ); - throw WrappedTargetRuntimeException( ::rtl::OUString(), *this, aError ); + throw WrappedTargetRuntimeException( OUString(), *this, aError ); } if ( xCtrlMod.is() ) { @@ -719,7 +719,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if( !bDecoration ) { xDlgModPropSet->setPropertyValue( aDecorationPropName, makeAny( true ) ); - xDlgModPropSet->setPropertyValue( aTitlePropName, makeAny( ::rtl::OUString() ) ); + xDlgModPropSet->setPropertyValue( aTitlePropName, makeAny( OUString() ) ); } } catch( UnknownPropertyException& ) @@ -739,7 +739,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); return xCtrl; } - Reference < XDialog > DialogProviderImpl::createDialog( const ::rtl::OUString& URL ) + Reference < XDialog > DialogProviderImpl::createDialog( const OUString& URL ) throw (IllegalArgumentException, RuntimeException) { Reference< XInterface > xDummyHandler; @@ -750,13 +750,13 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); } Reference < XDialog > DialogProviderImpl::createDialogWithHandler( - const ::rtl::OUString& URL, const Reference< XInterface >& xHandler ) + const OUString& URL, const Reference< XInterface >& xHandler ) throw (IllegalArgumentException, RuntimeException) { if( !xHandler.is() ) { throw IllegalArgumentException( - ::rtl::OUString( "DialogProviderImpl::createDialogWithHandler: Invalid xHandler!" ), + OUString( "DialogProviderImpl::createDialogWithHandler: Invalid xHandler!" ), Reference< XInterface >(), 1 ); } Reference< XWindowPeer > xDummyPeer; @@ -766,7 +766,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); } Reference < XDialog > DialogProviderImpl::createDialogWithArguments( - const ::rtl::OUString& URL, const Sequence< NamedValue >& Arguments ) + const OUString& URL, const Sequence< NamedValue >& Arguments ) throw (IllegalArgumentException, RuntimeException) { ::comphelper::NamedValueCollection aArguments( Arguments ); @@ -791,7 +791,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); } Reference< XWindow > DialogProviderImpl::createContainerWindow( - const ::rtl::OUString& URL, const ::rtl::OUString& WindowType, + const OUString& URL, const OUString& WindowType, const Reference< XWindowPeer >& xParent, const Reference< XInterface >& xHandler ) throw (lang::IllegalArgumentException, RuntimeException) { @@ -799,7 +799,7 @@ static ::rtl::OUString aResourceResolverPropName("ResourceResolver"); if( !xParent.is() ) { throw IllegalArgumentException( - ::rtl::OUString( "DialogProviderImpl::createContainerWindow: Invalid xParent!" ), + OUString( "DialogProviderImpl::createContainerWindow: Invalid xParent!" ), Reference< XInterface >(), 1 ); } Reference < XControl > xControl = DialogProviderImpl::createDialogImpl( URL, xHandler, xParent, false ); diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index 4788fdecd5d8..651edfa32cb0 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -54,7 +54,7 @@ namespace dlgprov // class DialogProviderImpl // ============================================================================= ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createControlModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext); - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > lcl_getStringResourceManager(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,const ::rtl::OUString& i_sURL); + ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > lcl_getStringResourceManager(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,const OUString& i_sURL); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createDialogModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput, @@ -81,8 +81,8 @@ namespace dlgprov ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - rtl::OUString msDialogLibName; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModel( const ::rtl::OUString& sURL ); + OUString msDialogLibName; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > createDialogModel( const OUString& sURL ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > createDialogControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxDialogModel, @@ -103,7 +103,7 @@ namespace dlgprov // XDialogProvider / XDialogProvider2 impl method virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XControl > SAL_CALL createDialogImpl( - const ::rtl::OUString& URL, + const OUString& URL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent, bool bDialogProviderMode ) @@ -115,11 +115,11 @@ namespace dlgprov virtual ~DialogProviderImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -128,22 +128,22 @@ namespace dlgprov // XDialogProvider virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialog( - const ::rtl::OUString& URL ) + const OUString& URL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XDialogProvider2 virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithHandler( - const ::rtl::OUString& URL, + const OUString& URL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithArguments( - const ::rtl::OUString& URL, + const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createContainerWindow( - const ::rtl::OUString& URL, const ::rtl::OUString& WindowType, + const OUString& URL, const OUString& WindowType, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index 5c7218e8f100..ccb44f895678 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -45,9 +45,9 @@ namespace sf_misc class MiscUtils { public: - static css::uno::Sequence< ::rtl::OUString > allOpenTDocUrls( const css::uno::Reference< css::uno::XComponentContext >& xCtx) + static css::uno::Sequence< OUString > allOpenTDocUrls( const css::uno::Reference< css::uno::XComponentContext >& xCtx) { - css::uno::Sequence< ::rtl::OUString > result; + css::uno::Sequence< OUString > result; try { if ( !xCtx.is() ) @@ -63,7 +63,7 @@ public: return result; } - static ::rtl::OUString xModelToTdocUrl( const css::uno::Reference< css::frame::XModel >& xModel, + static OUString xModelToTdocUrl( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::uno::XComponentContext >& xContext ) { css::uno::Reference< css::lang::XMultiComponentFactory > xMCF( @@ -76,7 +76,7 @@ public: css::uno::Reference< css::frame::XTransientDocumentsDocumentContentFactory >( xMCF->createInstanceWithContext( - rtl::OUString( + OUString( "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ), xContext ), css::uno::UNO_QUERY ); @@ -101,16 +101,16 @@ public: } OSL_FAIL( "Unable to obtain URL for document model!" ); - return rtl::OUString(); + return OUString(); } - static css::uno::Reference< css::frame::XModel > tDocUrlToModel( const ::rtl::OUString& url ) + static css::uno::Reference< css::frame::XModel > tDocUrlToModel( const OUString& url ) { css::uno::Any result; try { ::ucbhelper::Content root( url, NULL, comphelper::getProcessComponentContext() ); - ::rtl::OUString propName = "DocumentModel"; + OUString propName = "DocumentModel"; result = getUCBProperty( root, propName ); } catch ( css::ucb::ContentCreationException& ) @@ -129,7 +129,7 @@ public: } - static css::uno::Any getUCBProperty( ::ucbhelper::Content& content, ::rtl::OUString& prop ) + static css::uno::Any getUCBProperty( ::ucbhelper::Content& content, OUString& prop ) { css::uno::Any result; try @@ -143,11 +143,11 @@ public: } private: -static ::rtl::OUString parseLocationName( const ::rtl::OUString& location ) +static OUString parseLocationName( const OUString& location ) { // strip out the last leaf of location name // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw - ::rtl::OUString temp = location; + OUString temp = location; INetURLObject aURLObj( temp ); if ( !aURLObj.HasError() ) temp = aURLObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); diff --git a/scripting/source/inc/util/scriptingconstants.hxx b/scripting/source/inc/util/scriptingconstants.hxx index 47889dc095b8..8fcf16577473 100644 --- a/scripting/source/inc/util/scriptingconstants.hxx +++ b/scripting/source/inc/util/scriptingconstants.hxx @@ -25,12 +25,12 @@ namespace scripting_constants class ScriptingConstantsPool { public: - const ::rtl::OUString DOC_REF; - const ::rtl::OUString DOC_STORAGE_ID; - const ::rtl::OUString DOC_URI; - const ::rtl::OUString RESOLVED_STORAGE_ID; - const ::rtl::OUString SCRIPT_INFO; - const ::rtl::OUString SCRIPTSTORAGEMANAGER_SERVICE; + const OUString DOC_REF; + const OUString DOC_STORAGE_ID; + const OUString DOC_URI; + const OUString RESOLVED_STORAGE_ID; + const OUString SCRIPT_INFO; + const OUString SCRIPTSTORAGEMANAGER_SERVICE; const sal_Int32 SHARED_STORAGE_ID; const sal_Int32 USER_STORAGE_ID; const sal_Int32 DOC_STORAGE_ID_NOT_SET; diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 4e19fe7a7cac..43128f2a82ad 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -84,7 +84,7 @@ void SAL_CALL ScriptProtocolHandler::initialize( if ( aArguments.getLength() && sal_False == ( aArguments[ 0 ] >>= m_xFrame ) ) { - ::rtl::OUString temp = "ScriptProtocolHandler::initialize: could not extract reference to the frame"; + OUString temp = "ScriptProtocolHandler::initialize: could not extract reference to the frame"; throw RuntimeException( temp, Reference< XInterface >() ); } @@ -93,7 +93,7 @@ void SAL_CALL ScriptProtocolHandler::initialize( } Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch( - const URL& aURL, const ::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags ) + const URL& aURL, const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) throw( ::com::sun::star::uno::RuntimeException ) { (void)sTargetFrameName; @@ -107,7 +107,7 @@ Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch( xFac->parse( aURL.Complete ), UNO_QUERY ); if ( uriRef.is() ) { - if ( uriRef->getScheme().equals( ::rtl::OUString::createFromAscii( ::scripting_protocolhandler::MYSCHEME ) ) ) + if ( uriRef->getScheme().equals( OUString::createFromAscii( ::scripting_protocolhandler::MYSCHEME ) ) ) { xDispatcher = this; } @@ -232,7 +232,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( { aException = ::cppu::getCaughtException(); - ::rtl::OUString reason = ::rtl::OUString( "ScriptProtocolHandler::dispatch: caught " ); + OUString reason = OUString( "ScriptProtocolHandler::dispatch: caught " ); invokeResult <<= reason.concat( aException.getValueTypeName() ).concat( e.Message ); @@ -241,7 +241,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( } else { - ::rtl::OUString reason( + OUString reason( "ScriptProtocolHandler::dispatchWithNotification failed, ScriptProtocolHandler not initialised" ); invokeResult <<= reason; @@ -290,7 +290,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( OSL_TRACE( "ScriptProtocolHandler::dispatchWithNotification: caught RuntimeException" "while dispatchFinished %s", - ::rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); } } @@ -390,12 +390,12 @@ void ScriptProtocolHandler::createScriptProvider() } catch ( const RuntimeException & e ) { - ::rtl::OUString temp = "ScriptProtocolHandler::createScriptProvider(), "; + OUString temp = "ScriptProtocolHandler::createScriptProvider(), "; throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); } catch ( const Exception & e ) { - ::rtl::OUString temp = "ScriptProtocolHandler::createScriptProvider: "; + OUString temp = "ScriptProtocolHandler::createScriptProvider: "; throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); } } @@ -410,7 +410,7 @@ ScriptProtocolHandler::~ScriptProtocolHandler() } /* XServiceInfo */ -::rtl::OUString SAL_CALL ScriptProtocolHandler::getImplementationName( ) +OUString SAL_CALL ScriptProtocolHandler::getImplementationName( ) throw( RuntimeException ) { return impl_getStaticImplementationName(); @@ -418,11 +418,11 @@ throw( RuntimeException ) /* XServiceInfo */ sal_Bool SAL_CALL ScriptProtocolHandler::supportsService( -const ::rtl::OUString& sServiceName ) +const OUString& sServiceName ) throw( RuntimeException ) { - Sequence< ::rtl::OUString > seqServiceNames = getSupportedServiceNames(); - const ::rtl::OUString* pArray = seqServiceNames.getConstArray(); + Sequence< OUString > seqServiceNames = getSupportedServiceNames(); + const OUString* pArray = seqServiceNames.getConstArray(); for ( sal_Int32 nCounter = 0; nCounter < seqServiceNames.getLength(); nCounter++ ) { if ( pArray[ nCounter ] == sServiceName ) @@ -435,26 +435,26 @@ throw( RuntimeException ) } /* XServiceInfo */ -Sequence< ::rtl::OUString > SAL_CALL ScriptProtocolHandler::getSupportedServiceNames() +Sequence< OUString > SAL_CALL ScriptProtocolHandler::getSupportedServiceNames() throw( RuntimeException ) { return impl_getStaticSupportedServiceNames(); } /* Helper for XServiceInfo */ -Sequence< ::rtl::OUString > ScriptProtocolHandler::impl_getStaticSupportedServiceNames() +Sequence< OUString > ScriptProtocolHandler::impl_getStaticSupportedServiceNames() { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - Sequence< ::rtl::OUString > seqServiceNames( 1 ); + Sequence< OUString > seqServiceNames( 1 ); seqServiceNames.getArray() [ 0 ] = - ::rtl::OUString::createFromAscii( ::scripting_protocolhandler::MYSERVICENAME ); + OUString::createFromAscii( ::scripting_protocolhandler::MYSERVICENAME ); return seqServiceNames ; } /* Helper for XServiceInfo */ -::rtl::OUString ScriptProtocolHandler::impl_getStaticImplementationName() +OUString ScriptProtocolHandler::impl_getStaticImplementationName() { - return ::rtl::OUString::createFromAscii( ::scripting_protocolhandler::MYIMPLNAME ); + return OUString::createFromAscii( ::scripting_protocolhandler::MYIMPLNAME ); } /* Helper for registry */ @@ -504,7 +504,7 @@ extern "C" ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ) ) ; if ( ::scripting_protocolhandler::ScriptProtocolHandler::impl_getStaticImplementationName().equals( - ::rtl::OUString::createFromAscii( pImplementationName ) ) ) + OUString::createFromAscii( pImplementationName ) ) ) { xFactory = ::scripting_protocolhandler::ScriptProtocolHandler::impl_createFactory( xServiceManager ); } diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx index 1cf2811beb0a..23868483180d 100644 --- a/scripting/source/protocolhandler/scripthandler.hxx +++ b/scripting/source/protocolhandler/scripthandler.hxx @@ -83,16 +83,16 @@ public: virtual ~ScriptProtocolHandler(); /* XServiceInfo */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence < ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); /* Helper for XServiceInfo */ - static css::uno::Sequence < ::rtl::OUString > impl_getStaticSupportedServiceNames(); - static ::rtl::OUString impl_getStaticImplementationName(); + static css::uno::Sequence < OUString > impl_getStaticSupportedServiceNames(); + static OUString impl_getStaticImplementationName(); /* Helper for registry */ static css::uno::Reference < css::uno::XInterface > SAL_CALL @@ -104,7 +104,7 @@ public: /* Implementation for XDispatchProvider */ virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL - queryDispatch( const css::util::URL& aURL, const ::rtl::OUString& sTargetFrameName, + queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName, sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException ) ; virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches( diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index 1edc4e97e0a2..448294cda2bd 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -46,9 +46,9 @@ namespace func_provider ActiveMSPList::ActiveMSPList( const Reference< XComponentContext > & xContext ) : m_xContext( xContext ) { - userDirString = ::rtl::OUString("user"); - shareDirString = ::rtl::OUString("share"); - bundledDirString = ::rtl::OUString("bundled"); + userDirString = OUString("user"); + shareDirString = OUString("share"); + bundledDirString = OUString("bundled"); } ActiveMSPList::~ActiveMSPList() @@ -58,7 +58,7 @@ ActiveMSPList::~ActiveMSPList() Reference< provider::XScriptProvider > ActiveMSPList::createNewMSP( const uno::Any& context ) { - ::rtl::OUString serviceName("com.sun.star.script.provider.MasterScriptProvider"); + OUString serviceName("com.sun.star.script.provider.MasterScriptProvider"); Sequence< Any > args( &context, 1 ); Reference< provider::XScriptProvider > msp( @@ -72,7 +72,7 @@ ActiveMSPList::getMSPFromAnyContext( const Any& aContext ) SAL_THROW(( lang::IllegalArgumentException, RuntimeException )) { Reference< provider::XScriptProvider > msp; - ::rtl::OUString sContext; + OUString sContext; if ( aContext >>= sContext ) { msp = getMSPFromStringContext( sContext ); @@ -122,7 +122,7 @@ Reference< provider::XScriptProvider > xScripts.set( xContext->getScriptContainer() ); if ( !xScripts.is() ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "Failed to create MasterScriptProvider for ScriptInvocationContext: " ); buf.appendAscii( "Component supporting XEmbeddScripts interface not found." ); throw lang::IllegalArgumentException( buf.makeStringAndClear(), NULL, 1 ); @@ -147,7 +147,7 @@ Reference< provider::XScriptProvider > } Reference< provider::XScriptProvider > - ActiveMSPList::getMSPFromStringContext( const ::rtl::OUString& context ) + ActiveMSPList::getMSPFromStringContext( const OUString& context ) SAL_THROW(( lang::IllegalArgumentException, RuntimeException )) { Reference< provider::XScriptProvider > msp; @@ -161,7 +161,7 @@ Reference< provider::XScriptProvider > Reference< document::XScriptInvocationContext > xScriptsContext( xModel, UNO_QUERY ); if ( !xScripts.is() && !xScriptsContext.is() ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "Failed to create MasterScriptProvider for '" ); buf.append ( context ); buf.appendAscii( "': Either XEmbeddScripts or XScriptInvocationContext need to be supported by the document." ); @@ -207,7 +207,7 @@ Reference< provider::XScriptProvider > } catch( const Exception& ) { - ::rtl::OUStringBuffer aMessage; + OUStringBuffer aMessage; aMessage.appendAscii( "Failed to create MasterScriptProvider for context '" ); aMessage.append ( context ); aMessage.appendAscii( "'." ); @@ -285,7 +285,7 @@ ActiveMSPList::createNonDocMSPs() return; } // do creation of user and share MSPs here - ::rtl::OUString serviceName("com.sun.star.script.provider.MasterScriptProvider"); + OUString serviceName("com.sun.star.script.provider.MasterScriptProvider"); Sequence< Any > args(1); args[ 0 ] <<= userDirString; diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index 37fd8d6ab349..3705660ef64d 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -48,10 +48,10 @@ typedef ::std::map < css::uno::Reference< css::uno::XInterface > , ::comphelper::OInterfaceCompare< css::uno::XInterface > > ScriptComponent_map; -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, css::uno::Reference< css::script::provider::XScriptProvider >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > Msp_hash; + OUStringHash, + ::std::equal_to< OUString > > Msp_hash; class ActiveMSPList : public ::cppu::WeakImplHelper1< css::lang::XEventListener > { @@ -63,7 +63,7 @@ public: ~ActiveMSPList(); css::uno::Reference< css::script::provider::XScriptProvider > - getMSPFromStringContext( const ::rtl::OUString& context ) + getMSPFromStringContext( const OUString& context ) SAL_THROW(( css::lang::IllegalArgumentException, css::uno::RuntimeException )); css::uno::Reference< css::script::provider::XScriptProvider > @@ -86,7 +86,7 @@ private: css::uno::Reference< css::script::provider::XScriptProvider > createNewMSP( const css::uno::Any& context ); css::uno::Reference< css::script::provider::XScriptProvider > - createNewMSP( const ::rtl::OUString& context ) + createNewMSP( const OUString& context ) { return createNewMSP( css::uno::makeAny( context ) ); } @@ -95,9 +95,9 @@ private: Msp_hash m_hMsps; ScriptComponent_map m_mScriptComponents; osl::Mutex m_mutex; - ::rtl::OUString userDirString; - ::rtl::OUString shareDirString; - ::rtl::OUString bundledDirString; + OUString userDirString; + OUString shareDirString; + OUString bundledDirString; css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } // func_provider diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index efcea19cfc52..5b50526d29f6 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -53,7 +53,7 @@ class BrowseNodeAggregator : public ::cppu::WeakImplHelper1< browse::XBrowseNode > { private: - ::rtl::OUString m_Name; + OUString m_Name; Sequence< Reference< browse::XBrowseNode > > m_Nodes; public: @@ -77,7 +77,7 @@ public: m_Nodes[ index ] = node; } - virtual ::rtl::OUString + virtual OUString SAL_CALL getName() throw ( RuntimeException ) { @@ -158,16 +158,16 @@ public: }; -//typedef ::std::map< ::rtl::OUString, Reference< browse::XBrowseNode > > -typedef ::boost::unordered_map< ::rtl::OUString, Reference< browse::XBrowseNode >, - ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > +//typedef ::std::map< OUString, Reference< browse::XBrowseNode > > +typedef ::boost::unordered_map< OUString, Reference< browse::XBrowseNode >, + OUStringHash, ::std::equal_to< OUString > > BrowseNodeAggregatorHash; -typedef ::std::vector< ::rtl::OUString > vString; +typedef ::std::vector< OUString > vString; struct alphaSort { - bool operator()( const ::rtl::OUString& a, const ::rtl::OUString& b ) + bool operator()( const OUString& a, const OUString& b ) { return a.compareTo( b ) < 0; } @@ -178,7 +178,7 @@ class LocationBrowseNode : private: BrowseNodeAggregatorHash* m_hBNA; vString m_vStr; - ::rtl::OUString m_sNodeName; + OUString m_sNodeName; Reference< browse::XBrowseNode > m_origNode; public: @@ -202,7 +202,7 @@ public: // XBrowseNode // ------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw ( RuntimeException ) { return m_sNodeName; @@ -297,7 +297,7 @@ namespace Sequence< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference< XComponentContext >& xCtx ) { - Sequence< ::rtl::OUString > openDocs = + Sequence< OUString > openDocs = MiscUtils::allOpenTDocUrls( xCtx ); Reference< provider::XScriptProviderFactory > xFac; @@ -309,15 +309,15 @@ Sequence< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference< { xFac = provider::theMasterScriptProviderFactory::get( xCtx ); - locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString("user") ) ), UNO_QUERY_THROW ); - locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString("share") ) ), UNO_QUERY_THROW ); + locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( OUString("user") ) ), UNO_QUERY_THROW ); + locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( OUString("share") ) ), UNO_QUERY_THROW ); } // TODO proper exception handling, should throw catch( const Exception& e ) { (void)e; OSL_TRACE("Caught Exception %s", - ::rtl::OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer ); + OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer ); locnBNs.realloc( mspIndex ); return locnBNs; } @@ -469,7 +469,7 @@ public: return m_xWrappedBrowseNode->getType(); } - virtual ::rtl::OUString + virtual OUString SAL_CALL getName() throw ( RuntimeException ) { @@ -537,7 +537,7 @@ class DefaultRootBrowseNode : private: vXBrowseNodes m_vNodes; - ::rtl::OUString m_Name; + OUString m_Name; DefaultRootBrowseNode(); public: @@ -550,7 +550,7 @@ public: { m_vNodes.push_back( new DefaultBrowseNode( xCtx, nodes[ i ] ) ); } - m_Name = ::rtl::OUString("Root"); + m_Name = OUString("Root"); } ~DefaultRootBrowseNode() @@ -578,7 +578,7 @@ public: return browse::BrowseNodeTypes::ROOT; } - virtual ::rtl::OUString + virtual OUString SAL_CALL getName() throw ( RuntimeException ) { @@ -615,10 +615,10 @@ public: { } - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw ( RuntimeException ) { - return ::rtl::OUString("Root"); + return OUString("Root"); } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL @@ -712,21 +712,21 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy() // Namespace global methods for setting up BrowseNodeFactory service //############################################################################ -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames( ) SAL_THROW(()) { - ::rtl::OUString str_name( + OUString str_name( "com.sun.star.script.browse.BrowseNodeFactory"); - return Sequence< ::rtl::OUString >( &str_name, 1 ); + return Sequence< OUString >( &str_name, 1 ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL bnf_getImplementationName( ) SAL_THROW(()) { - return ::rtl::OUString( + return OUString( "com.sun.star.script.browse.BrowseNodeFactory" ); } @@ -742,14 +742,14 @@ bnf_create( Reference< XComponentContext > const & xComponentContext ) // Implementation of XServiceInfo //############################################################################ -::rtl::OUString SAL_CALL +OUString SAL_CALL BrowseNodeFactoryImpl::getImplementationName() throw (RuntimeException) { return bnf_getImplementationName(); } -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL BrowseNodeFactoryImpl::getSupportedServiceNames() throw (RuntimeException) { @@ -757,15 +757,15 @@ BrowseNodeFactoryImpl::getSupportedServiceNames() } sal_Bool BrowseNodeFactoryImpl::supportsService( - ::rtl::OUString const & serviceName ) + OUString const & serviceName ) throw (RuntimeException) { // check(); - Sequence< ::rtl::OUString > supported_services( + Sequence< OUString > supported_services( getSupportedServiceNames() ); - ::rtl::OUString const * ar = supported_services.getConstArray(); + OUString const * ar = supported_services.getConstArray(); for ( sal_Int32 pos = supported_services.getLength(); pos--; ) { diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx index 0953a9f26f18..cf224d46477c 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx @@ -49,14 +49,14 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( ::rtl::OUString const & serviceName ) + supportsService( OUString const & serviceName ) throw ( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException ); diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index b6fff3354357..3e41477361cf 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -59,13 +59,13 @@ namespace func_provider // Definitions for MasterScriptProviderFactory global methods. //************************************************************************* -::rtl::OUString SAL_CALL mspf_getImplementationName() ; +OUString SAL_CALL mspf_getImplementationName() ; Reference< XInterface > SAL_CALL mspf_create( Reference< XComponentContext > const & xComponentContext ); -Sequence< ::rtl::OUString > SAL_CALL mspf_getSupportedServiceNames(); +Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames(); -bool endsWith( const ::rtl::OUString& target, - const ::rtl::OUString& item ) +bool endsWith( const OUString& target, + const OUString& item ) { sal_Int32 index = 0; if ( ( index = target.indexOf( item ) ) != -1 && @@ -154,7 +154,7 @@ throw ( Exception, RuntimeException ) if ( !xScripts.is() ) { throw lang::IllegalArgumentException( - ::rtl::OUString( "The given document does not support embedding scripts into it, and cannot be associated with such a document." + OUString( "The given document does not support embedding scripts into it, and cannot be associated with such a document." ), *this, 1 @@ -169,7 +169,7 @@ throw ( Exception, RuntimeException ) { Any aError( ::cppu::getCaughtException() ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "MasterScriptProvider::initialize: caught " ); buf.append ( aError.getValueTypeName() ); buf.appendAscii( ":" ); @@ -185,7 +185,7 @@ throw ( Exception, RuntimeException ) invokeArgs[ 0 ] <<= m_sCtxString; } - ::rtl::OUString pkgSpec = "uno_packages"; + OUString pkgSpec = "uno_packages"; sal_Int32 indexOfPkgSpec = m_sCtxString.lastIndexOf( pkgSpec ); // if contex string ends with "uno_packages" @@ -221,7 +221,7 @@ void MasterScriptProvider::createPkgProvider() try { Any location; - ::rtl::OUString sPkgCtx = m_sCtxString.concat( ":uno_packages" ); + OUString sPkgCtx = m_sCtxString.concat( ":uno_packages" ); location <<= sPkgCtx; Reference< provider::XScriptProviderFactory > xFac = @@ -235,16 +235,16 @@ void MasterScriptProvider::createPkgProvider() { (void)e; OSL_TRACE("Exception creating MasterScriptProvider for uno_packages in context %s: %s", - ::rtl::OUStringToOString( m_sCtxString, + OUStringToOString( m_sCtxString, RTL_TEXTENCODING_ASCII_US ).pData->buffer, - ::rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).pData->buffer ); } } //************************************************************************* Reference< provider::XScript > -MasterScriptProvider::getScript( const ::rtl::OUString& scriptURI ) +MasterScriptProvider::getScript( const OUString& scriptURI ) throw ( provider::ScriptFrameworkErrorException, RuntimeException ) { @@ -267,7 +267,7 @@ throw ( provider::ScriptFrameworkErrorException, if ( !uriRef.is() || !sfUri.is() ) { - ::rtl::OUString errorMsg = "Incorrect format for Script URI: "; + OUString errorMsg = "Incorrect format for Script URI: "; errorMsg = errorMsg.concat( scriptURI ); throw provider::ScriptFrameworkErrorException( errorMsg, Reference< XInterface >(), @@ -275,14 +275,14 @@ throw ( provider::ScriptFrameworkErrorException, provider::ScriptFrameworkErrorType::UNKNOWN ); } - ::rtl::OUString langKey("language"); - ::rtl::OUString locKey("location"); + OUString langKey("language"); + OUString locKey("location"); if ( sfUri->hasParameter( langKey ) == sal_False || sfUri->hasParameter( locKey ) == sal_False || ( sfUri->getName().isEmpty() ) ) { - ::rtl::OUString errorMsg = "Incorrect format for Script URI: "; + OUString errorMsg = "Incorrect format for Script URI: "; errorMsg = errorMsg.concat( scriptURI ); throw provider::ScriptFrameworkErrorException( errorMsg, Reference< XInterface >(), @@ -290,12 +290,12 @@ throw ( provider::ScriptFrameworkErrorException, provider::ScriptFrameworkErrorType::UNKNOWN ); } - ::rtl::OUString language = sfUri->getParameter( langKey ); - ::rtl::OUString location = sfUri->getParameter( locKey ); + OUString language = sfUri->getParameter( langKey ); + OUString location = sfUri->getParameter( locKey ); // if script us located in uno pkg sal_Int32 index = -1; - ::rtl::OUString pkgTag(":uno_packages"); + OUString pkgTag(":uno_packages"); // for languages other than basic, scripts located in uno packages // are merged into the user/share location context. // For other languages the location attribute in script url has the form @@ -329,10 +329,10 @@ throw ( provider::ScriptFrameworkErrorException, ) { Reference< provider::XScriptProvider > xScriptProvider; - ::rtl::OUStringBuffer buf( 80 ); + OUStringBuffer buf( 80 ); buf.appendAscii( "com.sun.star.script.provider.ScriptProviderFor"); buf.append( language ); - ::rtl::OUString serviceName = buf.makeStringAndClear(); + OUString serviceName = buf.makeStringAndClear(); if ( providerCache() ) { try @@ -387,8 +387,8 @@ MasterScriptProvider::providerCache() ::osl::MutexGuard aGuard( m_mutex ); if ( !m_pPCache ) { - ::rtl::OUString serviceName1 = "com.sun.star.script.provider.ScriptProviderForBasic"; - Sequence< ::rtl::OUString > blacklist(1); + OUString serviceName1 = "com.sun.star.script.provider.ScriptProviderForBasic"; + Sequence< OUString > blacklist(1); blacklist[ 0 ] = serviceName1; if ( !m_bIsPkgMSP ) @@ -406,13 +406,13 @@ MasterScriptProvider::providerCache() //************************************************************************* -::rtl::OUString SAL_CALL +OUString SAL_CALL MasterScriptProvider::getName() throw ( css::uno::RuntimeException ) { if ( !isPkgProvider() ) { - ::rtl::OUString sCtx = getContextString(); + OUString sCtx = getContextString(); if ( sCtx.indexOf( "vnd.sun.star.tdoc" ) == 0 ) { Reference< frame::XModel > xModel = m_xModel; @@ -483,12 +483,12 @@ MasterScriptProvider::getType() //************************************************************************* -::rtl::OUString -MasterScriptProvider::parseLocationName( const ::rtl::OUString& location ) +OUString +MasterScriptProvider::parseLocationName( const OUString& location ) { // strip out the last leaf of location name // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw - ::rtl::OUString temp = location; + OUString temp = location; INetURLObject aURLObj( temp ); if ( !aURLObj.HasError() ) temp = aURLObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); @@ -498,7 +498,7 @@ MasterScriptProvider::parseLocationName( const ::rtl::OUString& location ) //************************************************************************* // Register Package void SAL_CALL -MasterScriptProvider::insertByName( const ::rtl::OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, css::uno::RuntimeException) +MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, css::uno::RuntimeException) { if ( !m_bIsPkgMSP ) { @@ -567,7 +567,7 @@ MasterScriptProvider::insertByName( const ::rtl::OUString& aName, const Any& aEl if ( index == xSProviders.getLength() ) { // No script providers could process the package - ::rtl::OUString message = "Failed to register package for "; + OUString message = "Failed to register package for "; message = message.concat( aName ); throw lang::IllegalArgumentException( message, Reference < XInterface > (), 2 ); @@ -578,7 +578,7 @@ MasterScriptProvider::insertByName( const ::rtl::OUString& aName, const Any& aEl //************************************************************************* // Revoke Package void SAL_CALL -MasterScriptProvider::removeByName( const ::rtl::OUString& Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) +MasterScriptProvider::removeByName( const OUString& Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { if ( !m_bIsPkgMSP ) { @@ -641,7 +641,7 @@ MasterScriptProvider::removeByName( const ::rtl::OUString& Name ) throw ( contai if ( index == xSProviders.getLength() ) { // No script providers could process the package - ::rtl::OUString message = "Failed to revoke package for "; + OUString message = "Failed to revoke package for "; message = message.concat( Name ); throw lang::IllegalArgumentException( message, Reference < XInterface > (), 1 ); @@ -652,7 +652,7 @@ MasterScriptProvider::removeByName( const ::rtl::OUString& Name ) throw ( contai //************************************************************************* void SAL_CALL -MasterScriptProvider::replaceByName( const ::rtl::OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) +MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { (void)aName; (void)aElement; @@ -666,7 +666,7 @@ MasterScriptProvider::replaceByName( const ::rtl::OUString& aName, const Any& aE } //************************************************************************* Any SAL_CALL -MasterScriptProvider::getByName( const ::rtl::OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) +MasterScriptProvider::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { (void)aName; @@ -681,7 +681,7 @@ MasterScriptProvider::getByName( const ::rtl::OUString& aName ) throw ( containe } //************************************************************************* sal_Bool SAL_CALL -MasterScriptProvider::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException) +MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException) { sal_Bool result = sal_False; if ( !m_bIsPkgMSP ) @@ -751,11 +751,11 @@ MasterScriptProvider::hasByName( const ::rtl::OUString& aName ) throw (RuntimeEx } //************************************************************************* -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL MasterScriptProvider::getElementNames( ) throw ( RuntimeException) { // TODO needs implementing - Sequence< ::rtl::OUString > names; + Sequence< OUString > names; if ( true ) { throw RuntimeException( "getElementNames not implemented!!!!" , @@ -793,7 +793,7 @@ MasterScriptProvider::getAllProviders() throw ( css::uno::RuntimeException ) } else { - ::rtl::OUString errorMsg( + OUString errorMsg( "MasterScriptProvider::getAllProviders, cache not initialised"); throw RuntimeException( errorMsg.concat( errorMsg ), Reference< XInterface >() ); @@ -802,18 +802,18 @@ MasterScriptProvider::getAllProviders() throw ( css::uno::RuntimeException ) //************************************************************************* -::rtl::OUString SAL_CALL MasterScriptProvider::getImplementationName( ) +OUString SAL_CALL MasterScriptProvider::getImplementationName( ) throw( RuntimeException ) { - return ::rtl::OUString( "com.sun.star.script.provider.MasterScriptProvider" ); + return OUString( "com.sun.star.script.provider.MasterScriptProvider" ); } //************************************************************************* -sal_Bool SAL_CALL MasterScriptProvider::supportsService( const ::rtl::OUString& serviceName ) +sal_Bool SAL_CALL MasterScriptProvider::supportsService( const OUString& serviceName ) throw( RuntimeException ) { - Sequence< ::rtl::OUString > serviceNames( getSupportedServiceNames() ); - ::rtl::OUString const * pNames = serviceNames.getConstArray(); + Sequence< OUString > serviceNames( getSupportedServiceNames() ); + OUString const * pNames = serviceNames.getConstArray(); for ( sal_Int32 nPos = serviceNames.getLength(); nPos--; ) { if ( serviceName.equals( pNames[ nPos ] ) ) @@ -825,16 +825,16 @@ throw( RuntimeException ) } //************************************************************************* -Sequence< ::rtl::OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( ) +Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( ) throw( RuntimeException ) { - ::rtl::OUString names[3]; + OUString names[3]; - names[0] = ::rtl::OUString( "com.sun.star.script.provider.MasterScriptProvider" ); - names[1] = ::rtl::OUString( "com.sun.star.script.browse.BrowseNode" ); - names[2] = ::rtl::OUString( "com.sun.star.script.provider.ScriptProvider" ); + names[0] = OUString( "com.sun.star.script.provider.MasterScriptProvider" ); + names[1] = OUString( "com.sun.star.script.browse.BrowseNode" ); + names[2] = OUString( "com.sun.star.script.provider.ScriptProvider" ); - return Sequence< ::rtl::OUString >( names, 3 ); + return Sequence< OUString >( names, 3 ); } } // namespace func_provider @@ -842,9 +842,9 @@ throw( RuntimeException ) namespace browsenodefactory { -::rtl::OUString SAL_CALL bnf_getImplementationName() ; +OUString SAL_CALL bnf_getImplementationName() ; Reference< XInterface > SAL_CALL bnf_create( Reference< XComponentContext > const & xComponentContext ); -Sequence< ::rtl::OUString > SAL_CALL bnf_getSupportedServiceNames(); +Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames(); } namespace scripting_runtimemgr @@ -857,23 +857,23 @@ Reference< XInterface > SAL_CALL sp_create( } //************************************************************************* -Sequence< ::rtl::OUString > sp_getSupportedServiceNames( ) +Sequence< OUString > sp_getSupportedServiceNames( ) SAL_THROW(()) { - ::rtl::OUString names[3]; + OUString names[3]; - names[0] = ::rtl::OUString( "com.sun.star.script.provider.MasterScriptProvider" ); - names[1] = ::rtl::OUString( "com.sun.star.script.browse.BrowseNode" ); - names[2] = ::rtl::OUString( "com.sun.star.script.provider.ScriptProvider" ); + names[0] = OUString( "com.sun.star.script.provider.MasterScriptProvider" ); + names[1] = OUString( "com.sun.star.script.browse.BrowseNode" ); + names[2] = OUString( "com.sun.star.script.provider.ScriptProvider" ); - return Sequence< ::rtl::OUString >( names, 3 ); + return Sequence< OUString >( names, 3 ); } //************************************************************************* -::rtl::OUString sp_getImplementationName( ) +OUString sp_getImplementationName( ) SAL_THROW(()) { - return ::rtl::OUString( "com.sun.star.script.provider.MasterScriptProvider" ); + return OUString( "com.sun.star.script.provider.MasterScriptProvider" ); } // ***** registration or ScriptingFrameworkURIHelper @@ -884,23 +884,23 @@ Reference< XInterface > SAL_CALL urihelper_create( new ::func_provider::ScriptingFrameworkURIHelper( xCompC ); } -Sequence< ::rtl::OUString > urihelper_getSupportedServiceNames( ) +Sequence< OUString > urihelper_getSupportedServiceNames( ) SAL_THROW(()) { - ::rtl::OUString serviceNameList[] = { - ::rtl::OUString( + OUString serviceNameList[] = { + OUString( "com.sun.star.script.provider.ScriptURIHelper" ) }; - Sequence< ::rtl::OUString > serviceNames = Sequence < - ::rtl::OUString > ( serviceNameList, 1 ); + Sequence< OUString > serviceNames = Sequence < + OUString > ( serviceNameList, 1 ); return serviceNames; } -::rtl::OUString urihelper_getImplementationName( ) +OUString urihelper_getImplementationName( ) SAL_THROW(()) { - return ::rtl::OUString( + return OUString( "com.sun.star.script.provider.ScriptURIHelper"); } diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 3299fcfe35e3..7c5ab87d4040 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -55,11 +55,11 @@ public: ~MasterScriptProvider(); // XServiceInfo implementation - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw( css::uno::RuntimeException ); // XBrowseNode implementation - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes() throw ( css::uno::RuntimeException ); @@ -68,34 +68,34 @@ public: virtual sal_Int16 SAL_CALL getType() throw ( css::uno::RuntimeException ); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw ( css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw ( css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess virtual css::uno::Type SAL_CALL getElementType( ) throw ( css::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw ( css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( css::uno::RuntimeException ); // XScriptProvider implementation virtual css::uno::Reference < css::script::provider::XScript > SAL_CALL - getScript( const ::rtl::OUString& scriptURI ) + getScript( const OUString& scriptURI ) throw( css::script::provider::ScriptFrameworkErrorException, css::uno::RuntimeException ); /** * XInitialise implementation * - * @param args expected to contain a single ::rtl::OUString + * @param args expected to contain a single OUString * containing the URI */ virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args ) @@ -109,14 +109,14 @@ public: bool isPkgProvider() { return m_bIsPkgMSP; } css::uno::Reference< css::script::provider::XScriptProvider > getPkgProvider() { return m_xMSPPkg; } // returns context string for this provider, eg - ::rtl::OUString getContextString() { return m_sCtxString; } + OUString getContextString() { return m_sCtxString; } private: - ::rtl::OUString parseLocationName( const ::rtl::OUString& location ); + OUString parseLocationName( const OUString& location ); void createPkgProvider(); bool isValid(); - ::rtl::OUString getURLForModel(); - const css::uno::Sequence< ::rtl::OUString >& getProviderNames(); + OUString getURLForModel(); + const css::uno::Sequence< OUString >& getProviderNames(); ProviderCache* providerCache(); /* to obtain other services if needed */ @@ -125,7 +125,7 @@ private: css::uno::Reference< css::frame::XModel > m_xModel; css::uno::Reference< css::document::XScriptInvocationContext > m_xInvocationContext; css::uno::Sequence< css::uno::Any > m_sAargs; - ::rtl::OUString m_sNodeName; + OUString m_sNodeName; // This component supports XInitialization, it can be created // using createInstanceXXX() or createInstanceWithArgumentsXXX using @@ -141,7 +141,7 @@ private: css::uno::Reference< css::script::provider::XScriptProvider > m_xMSPPkg; ProviderCache* m_pPCache; osl::Mutex m_mutex; - ::rtl::OUString m_sCtxString; + OUString m_sCtxString; }; } // namespace func_provider #endif //_FRAMEWORK_SCRIPT_PROVIDER_XFUNCTIONPROVIDER_HXX_ diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx index 3da69d48d13d..aac8b34bceb7 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.cxx +++ b/scripting/source/provider/MasterScriptProviderFactory.cxx @@ -77,21 +77,21 @@ MasterScriptProviderFactory::getActiveMSPList() const // Namespace global methods for setting up MasterScriptProviderFactory service //############################################################################ -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames( ) SAL_THROW(()) { - ::rtl::OUString str_name( + OUString str_name( "com.sun.star.script.provider.MasterScriptProviderFactory"); - return Sequence< ::rtl::OUString >( &str_name, 1 ); + return Sequence< OUString >( &str_name, 1 ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL mspf_getImplementationName( ) SAL_THROW(()) { - return ::rtl::OUString( + return OUString( "com.sun.star.script.provider.MasterScriptProviderFactory"); } @@ -107,14 +107,14 @@ mspf_create( Reference< XComponentContext > const & xComponentContext ) // Implementation of XServiceInfo //############################################################################ -::rtl::OUString SAL_CALL +OUString SAL_CALL MasterScriptProviderFactory::getImplementationName() throw (RuntimeException) { return mspf_getImplementationName(); } -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL MasterScriptProviderFactory::getSupportedServiceNames() throw (RuntimeException) { @@ -122,15 +122,15 @@ MasterScriptProviderFactory::getSupportedServiceNames() } sal_Bool MasterScriptProviderFactory::supportsService( - ::rtl::OUString const & serviceName ) + OUString const & serviceName ) throw (RuntimeException) { // check(); - Sequence< ::rtl::OUString > supported_services( + Sequence< OUString > supported_services( getSupportedServiceNames() ); - ::rtl::OUString const * ar = supported_services.getConstArray(); + OUString const * ar = supported_services.getConstArray(); for ( sal_Int32 pos = supported_services.getLength(); pos--; ) { diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx index f07a03b3df32..b7a04940dd94 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.hxx +++ b/scripting/source/provider/MasterScriptProviderFactory.hxx @@ -54,14 +54,14 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( ::rtl::OUString const & serviceName ) + supportsService( OUString const & serviceName ) throw ( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException ); diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx index 510597adeaf5..30060a38b5bf 100644 --- a/scripting/source/provider/ProviderCache.cxx +++ b/scripting/source/provider/ProviderCache.cxx @@ -46,7 +46,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co } -ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< ::rtl::OUString >& blackList ) +ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& blackList ) throw ( RuntimeException ) : m_sBlackList( blackList ), m_Sctx( scriptContext ), m_xContext( xContext ) { @@ -63,7 +63,7 @@ ProviderCache::~ProviderCache() } Reference< provider::XScriptProvider > -ProviderCache::getProvider( const ::rtl::OUString& providerName ) +ProviderCache::getProvider( const OUString& providerName ) { ::osl::Guard< osl::Mutex > aGuard( m_mutex ); Reference< provider::XScriptProvider > provider; @@ -137,11 +137,11 @@ void ProviderCache::populateCache() throw ( RuntimeException ) { // wrong name in services.rdb - ::rtl::OUString serviceName; + OUString serviceName; ::osl::Guard< osl::Mutex > aGuard( m_mutex ); try { - ::rtl::OUString languageProviderName( "com.sun.star.script.provider.LanguageScriptProvider" ); + OUString languageProviderName( "com.sun.star.script.provider.LanguageScriptProvider" ); Reference< container::XContentEnumerationAccess > xEnumAccess = Reference< container::XContentEnumerationAccess >( m_xMgr, UNO_QUERY_THROW ); Reference< container::XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName ); @@ -152,11 +152,11 @@ ProviderCache::populateCache() throw ( RuntimeException ) Reference< lang::XSingleComponentFactory > factory( xEnum->nextElement(), UNO_QUERY_THROW ); Reference< lang::XServiceInfo > xServiceInfo( factory, UNO_QUERY_THROW ); - Sequence< ::rtl::OUString > serviceNames = xServiceInfo->getSupportedServiceNames(); + Sequence< OUString > serviceNames = xServiceInfo->getSupportedServiceNames(); if ( serviceNames.getLength() > 0 ) { - ::rtl::OUString searchString( "com.sun.star.script.provider.ScriptProviderFor" ); + OUString searchString( "com.sun.star.script.provider.ScriptProviderFor" ); for ( sal_Int32 index = 0; index < serviceNames.getLength(); index++ ) { @@ -191,7 +191,7 @@ ProviderCache::createProvider( ProviderDetails& details ) throw ( RuntimeExcepti } catch ( const Exception& e ) { - ::rtl::OUString temp("ProviderCache::createProvider() Error creating provider from factory!!!\n"); + OUString temp("ProviderCache::createProvider() Error creating provider from factory!!!\n"); throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() ); } diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index 2021baa08e2b..398214d8eff6 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -47,8 +47,8 @@ struct ProviderDetails css::uno::Reference< css::lang::XSingleComponentFactory > factory; css::uno::Reference< css::script::provider::XScriptProvider > provider; }; -typedef ::boost::unordered_map < ::rtl::OUString, ProviderDetails , ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ProviderDetails_hash; +typedef ::boost::unordered_map < OUString, ProviderDetails , OUStringHash, + ::std::equal_to< OUString > > ProviderDetails_hash; class ProviderCache @@ -58,11 +58,11 @@ public: ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext ) throw ( css::uno::RuntimeException ); ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext, - const css::uno::Sequence< ::rtl::OUString >& blackList ) + const css::uno::Sequence< OUString >& blackList ) throw ( css::uno::RuntimeException ); ~ProviderCache(); css::uno::Reference< css::script::provider::XScriptProvider > - getProvider( const ::rtl::OUString& providerName ); + getProvider( const OUString& providerName ); css::uno::Sequence < css::uno::Reference< css::script::provider::XScriptProvider > > getAllProviders() throw ( css::uno::RuntimeException ); private: @@ -71,7 +71,7 @@ private: css::uno::Reference< css::script::provider::XScriptProvider > createProvider( ProviderDetails& details ) throw ( css::uno::RuntimeException ); - bool isInBlackList( const ::rtl::OUString& serviceName ) + bool isInBlackList( const OUString& serviceName ) { if ( m_sBlackList.getLength() > 0 ) { @@ -85,7 +85,7 @@ private: } return false; } - css::uno::Sequence< ::rtl::OUString > m_sBlackList; + css::uno::Sequence< OUString > m_sBlackList; ProviderDetails_hash m_hProviderDetailsCache; osl::Mutex m_mutex; css::uno::Sequence< css::uno::Any > m_Sctx; diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx index 2059a86cb9ea..5ca950916fe6 100644 --- a/scripting/source/provider/ScriptImpl.cxx +++ b/scripting/source/provider/ScriptImpl.cxx @@ -35,7 +35,7 @@ namespace func_provider ScriptImpl::ScriptImpl( const Reference< beans::XPropertySet > & scriptingContext, const Reference< runtime::XScriptInvocation > & runtimeMgr, - const ::rtl::OUString& scriptURI ) + const OUString& scriptURI ) throw ( RuntimeException ) : m_XScriptingContext( scriptingContext, UNO_SET_THROW ), m_RunTimeManager( runtimeMgr, UNO_SET_THROW ), @@ -69,14 +69,14 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, } catch ( const lang::IllegalArgumentException & iae ) { - ::rtl::OUString temp = "ScriptImpl::invoke IllegalArgumentException : "; + OUString temp = "ScriptImpl::invoke IllegalArgumentException : "; throw lang::IllegalArgumentException( temp.concat( iae.Message ), Reference< XInterface > (), iae.ArgumentPosition ); } catch ( const script::CannotConvertException & cce ) { - ::rtl::OUString temp = "ScriptImpl::invoke CannotConvertException : "; + OUString temp = "ScriptImpl::invoke CannotConvertException : "; throw script::CannotConvertException( temp.concat( cce.Message ), Reference< XInterface > (), cce.DestinationTypeClass, @@ -85,14 +85,14 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, } catch ( const reflection::InvocationTargetException & ite ) { - ::rtl::OUString temp = "ScriptImpl::invoke InvocationTargetException : "; + OUString temp = "ScriptImpl::invoke InvocationTargetException : "; throw reflection::InvocationTargetException( temp.concat( ite.Message ), Reference< XInterface > (), ite.TargetException ); } catch ( const RuntimeException & re ) { - ::rtl::OUString temp = "ScriptImpl::invoke RuntimeException : "; + OUString temp = "ScriptImpl::invoke RuntimeException : "; throw RuntimeException( temp.concat( re.Message ), Reference< XInterface > () ); } diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx index f6f1f6bfce4e..04c1e677f013 100644 --- a/scripting/source/provider/ScriptImpl.hxx +++ b/scripting/source/provider/ScriptImpl.hxx @@ -48,7 +48,7 @@ public: ScriptImpl( const css::uno::Reference< css::beans::XPropertySet > & scriptingContext, const css::uno::Reference< ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation > & runtimeMgr, - const ::rtl::OUString& scriptURI ) + const OUString& scriptURI ) throw ( css::uno::RuntimeException ); /************************************************************* @@ -90,7 +90,7 @@ public: private: css::uno::Reference< css::beans::XPropertySet > m_XScriptingContext; css::uno::Reference < ::drafts::com::sun::star::script::framework::runtime::XScriptInvocation > m_RunTimeManager; - ::rtl::OUString m_ScriptURI; + OUString m_ScriptURI; /* copy ctor disabled, i.e. not defined */ ScriptImpl( const ScriptImpl& ); diff --git a/scripting/source/provider/ScriptingContext.cxx b/scripting/source/provider/ScriptingContext.cxx index e5595f6314e0..2527becce868 100644 --- a/scripting/source/provider/ScriptingContext.cxx +++ b/scripting/source/provider/ScriptingContext.cxx @@ -55,7 +55,7 @@ ScriptingContext::ScriptingContext( const Reference< XComponentContext > & xCont scripting_constants::ScriptingConstantsPool::instance(); registerPropertyNoMember( scriptingConstantsPool.DOC_REF, DOC_REF_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(),::getCppuType( (const Reference< css::frame::XModel >* ) NULL ), NULL ) ; registerPropertyNoMember( scriptingConstantsPool.DOC_STORAGE_ID, DOC_STORAGE_ID_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const sal_Int32* ) NULL ), NULL ) ; - registerPropertyNoMember( scriptingConstantsPool.DOC_URI, DOC_URI_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const ::rtl::OUString* ) NULL ), NULL ) ; + registerPropertyNoMember( scriptingConstantsPool.DOC_URI, DOC_URI_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const OUString* ) NULL ), NULL ) ; registerPropertyNoMember( scriptingConstantsPool.RESOLVED_STORAGE_ID, RESOLVED_STORAGE_ID_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const sal_Int32* ) NULL ), NULL ); registerPropertyNoMember( scriptingConstantsPool.SCRIPT_INFO, SCRIPT_INFO_PROPID, SCRIPTINGCONTEXT_DEFAULT_ATTRIBS(), ::getCppuType( (const sal_Int32* ) NULL ), NULL ); } diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index 6aebc6d9269d..e0f42336b335 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -26,7 +26,6 @@ namespace func_provider { -using ::rtl::OUString; namespace uno = ::com::sun::star::uno; namespace ucb = ::com::sun::star::ucb; namespace lang = ::com::sun::star::lang; @@ -215,7 +214,7 @@ OUString SAL_CALL ScriptingFrameworkURIHelper::getScriptURI(const OUString& rStorageURI) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - ::rtl::OUStringBuffer buf(120); + OUStringBuffer buf(120); buf.appendAscii("vnd.sun.star.script:"); buf.append(getLanguagePart(rStorageURI)); @@ -245,7 +244,7 @@ ScriptingFrameworkURIHelper::getStorageURI(const OUString& rScriptURI) uno::Reference< uno::XInterface >(), 1 ); } - ::rtl::OUStringBuffer buf(120); + OUStringBuffer buf(120); buf.append(m_sBaseURI); buf.append(OUString("/")); buf.append(getLanguagePath(sLanguagePart)); @@ -284,16 +283,16 @@ ScriptingFrameworkURIHelper::supportsService( const OUString& serviceName ) return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL ScriptingFrameworkURIHelper::getSupportedServiceNames() throw( uno::RuntimeException ) { - ::rtl::OUString serviceNameList[] = { - ::rtl::OUString( + OUString serviceNameList[] = { + OUString( "com.sun.star.script.provider.ScriptURIHelper" ) }; - uno::Sequence< ::rtl::OUString > serviceNames = uno::Sequence < - ::rtl::OUString > ( serviceNameList, 1 ); + uno::Sequence< OUString > serviceNames = uno::Sequence < + OUString > ( serviceNameList, 1 ); return serviceNames; } diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx index 2ceb3d875fb7..17096d8ae9ae 100644 --- a/scripting/source/provider/URIHelper.hxx +++ b/scripting/source/provider/URIHelper.hxx @@ -45,15 +45,15 @@ private: css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSimpleFileAccess; css::uno::Reference m_xUriReferenceFactory; - ::rtl::OUString m_sLanguage; - ::rtl::OUString m_sLocation; - ::rtl::OUString m_sBaseURI; + OUString m_sLanguage; + OUString m_sLocation; + OUString m_sBaseURI; - ::rtl::OUString SCRIPTS_PART; + OUString SCRIPTS_PART; bool initBaseURI(); - ::rtl::OUString getLanguagePart(const ::rtl::OUString& rStorageURI); - ::rtl::OUString getLanguagePath(const ::rtl::OUString& rLanguagePart); + OUString getLanguagePart(const OUString& rStorageURI); + OUString getLanguagePath(const OUString& rLanguagePart); public: @@ -67,29 +67,29 @@ public: initialize( const css::uno::Sequence < css::uno::Any > & args ) throw ( css::uno::Exception, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getRootStorageURI() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL - getScriptURI( const ::rtl::OUString& rStorageURI ) + virtual OUString SAL_CALL + getScriptURI( const OUString& rStorageURI ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL - getStorageURI( const ::rtl::OUString& rScriptURI ) + virtual OUString SAL_CALL + getStorageURI( const OUString& rScriptURI ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); }; diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index abd83a0526b8..5bc28424252a 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -76,16 +76,16 @@ namespace stringresource // ============================================================================= // component operations -static Sequence< ::rtl::OUString > getSupportedServiceNames_StringResourceImpl() +static Sequence< OUString > getSupportedServiceNames_StringResourceImpl() { - Sequence< ::rtl::OUString > names(1); - names[0] = ::rtl::OUString( "com.sun.star.resource.StringResource" ); + Sequence< OUString > names(1); + names[0] = OUString( "com.sun.star.resource.StringResource" ); return names; } -static ::rtl::OUString getImplementationName_StringResourceImpl() +static OUString getImplementationName_StringResourceImpl() { - return ::rtl::OUString( "com.sun.star.comp.scripting.StringResource" ); + return OUString( "com.sun.star.comp.scripting.StringResource" ); } static Reference< XInterface > SAL_CALL create_StringResourceImpl( @@ -131,23 +131,23 @@ StringResourceImpl::~StringResourceImpl() // ============================================================================= // XServiceInfo -::rtl::OUString StringResourceImpl::getImplementationName( ) throw (RuntimeException) +OUString StringResourceImpl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_StringResourceImpl(); } -sal_Bool StringResourceImpl::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) +sal_Bool StringResourceImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; return pNames != pEnd; } -Sequence< ::rtl::OUString > StringResourceImpl::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > StringResourceImpl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_StringResourceImpl(); } @@ -182,11 +182,11 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener // ============================================================================= // XStringResourceResolver -::rtl::OUString StringResourceImpl::implResolveString - ( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ) +OUString StringResourceImpl::implResolveString + ( const OUString& ResourceID, LocaleItem* pLocaleItem ) throw (::com::sun::star::resource::MissingResourceException) { - ::rtl::OUString aRetStr; + OUString aRetStr; bool bSuccess = false; if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) { @@ -199,21 +199,21 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener } if( !bSuccess ) { - ::rtl::OUString errorMsg("StringResourceImpl: No entry for ResourceID: "); + OUString errorMsg("StringResourceImpl: No entry for ResourceID: "); errorMsg = errorMsg.concat( ResourceID ); throw ::com::sun::star::resource::MissingResourceException( errorMsg, Reference< XInterface >() ); } return aRetStr; } -::rtl::OUString StringResourceImpl::resolveString( const ::rtl::OUString& ResourceID ) +OUString StringResourceImpl::resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); return implResolveString( ResourceID, m_pCurrentLocaleItem ); } -::rtl::OUString StringResourceImpl::resolveStringForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +OUString StringResourceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -221,7 +221,7 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener return implResolveString( ResourceID, pLocaleItem ); } -sal_Bool StringResourceImpl::implHasEntryForId( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ) +sal_Bool StringResourceImpl::implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ) { bool bSuccess = false; if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) @@ -233,14 +233,14 @@ sal_Bool StringResourceImpl::implHasEntryForId( const ::rtl::OUString& ResourceI return bSuccess; } -sal_Bool StringResourceImpl::hasEntryForId( const ::rtl::OUString& ResourceID ) +sal_Bool StringResourceImpl::hasEntryForId( const OUString& ResourceID ) throw (RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); return implHasEntryForId( ResourceID, m_pCurrentLocaleItem ); } -sal_Bool StringResourceImpl::hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, +sal_Bool StringResourceImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) throw (RuntimeException) { @@ -249,21 +249,21 @@ sal_Bool StringResourceImpl::hasEntryForIdAndLocale( const ::rtl::OUString& Reso return implHasEntryForId( ResourceID, pLocaleItem ); } -Sequence< ::rtl::OUString > StringResourceImpl::implGetResourceIDs( LocaleItem* pLocaleItem ) +Sequence< OUString > StringResourceImpl::implGetResourceIDs( LocaleItem* pLocaleItem ) { - Sequence< ::rtl::OUString > aIDSeq( 0 ); + Sequence< OUString > aIDSeq( 0 ); if( pLocaleItem && loadLocale( pLocaleItem ) ) { const IdToStringMap& rHashMap = pLocaleItem->m_aIdToStringMap; sal_Int32 nResourceIDCount = rHashMap.size(); aIDSeq.realloc( nResourceIDCount ); - ::rtl::OUString* pStrings = aIDSeq.getArray(); + OUString* pStrings = aIDSeq.getArray(); IdToStringMap::const_iterator it; int iTarget = 0; for( it = rHashMap.begin(); it != rHashMap.end(); ++it ) { - ::rtl::OUString aStr = (*it).first; + OUString aStr = (*it).first; pStrings[iTarget] = aStr; iTarget++; } @@ -271,7 +271,7 @@ Sequence< ::rtl::OUString > StringResourceImpl::implGetResourceIDs( LocaleItem* return aIDSeq; } -Sequence< ::rtl::OUString > StringResourceImpl::getResourceIDsForLocale +Sequence< OUString > StringResourceImpl::getResourceIDsForLocale ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -279,7 +279,7 @@ Sequence< ::rtl::OUString > StringResourceImpl::getResourceIDsForLocale return implGetResourceIDs( pLocaleItem ); } -Sequence< ::rtl::OUString > StringResourceImpl::getResourceIDs( ) +Sequence< OUString > StringResourceImpl::getResourceIDs( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -335,7 +335,7 @@ void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg ) { if( m_bReadOnly ) { - ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( pExceptionMsg ); + OUString errorMsg = OUString::createFromAscii( pExceptionMsg ); throw NoSupportException( errorMsg, Reference< XInterface >() ); } } @@ -399,8 +399,8 @@ void StringResourceImpl::setDefaultLocale( const Locale& locale ) } } -void StringResourceImpl::implSetString( const ::rtl::OUString& ResourceID, - const ::rtl::OUString& Str, LocaleItem* pLocaleItem ) +void StringResourceImpl::implSetString( const OUString& ResourceID, + const OUString& Str, LocaleItem* pLocaleItem ) { if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) { @@ -420,7 +420,7 @@ void StringResourceImpl::implSetString( const ::rtl::OUString& ResourceID, } } -void StringResourceImpl::setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) +void StringResourceImpl::setString( const OUString& ResourceID, const OUString& Str ) throw (NoSupportException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -429,7 +429,7 @@ void StringResourceImpl::setString( const ::rtl::OUString& ResourceID, const ::r } void StringResourceImpl::setStringForLocale - ( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, const Locale& locale ) + ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) throw (NoSupportException, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -438,7 +438,7 @@ void StringResourceImpl::setStringForLocale implSetString( ResourceID, Str, pLocaleItem ); } -void StringResourceImpl::implRemoveId( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ) +void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem ) throw (::com::sun::star::resource::MissingResourceException) { if( pLocaleItem != NULL && loadLocale( pLocaleItem ) ) @@ -447,7 +447,7 @@ void StringResourceImpl::implRemoveId( const ::rtl::OUString& ResourceID, Locale IdToStringMap::iterator it = rHashMap.find( ResourceID ); if( it == rHashMap.end() ) { - ::rtl::OUString errorMsg("StringResourceImpl: No entries for ResourceID: "); + OUString errorMsg("StringResourceImpl: No entries for ResourceID: "); errorMsg = errorMsg.concat( ResourceID ); throw ::com::sun::star::resource::MissingResourceException( errorMsg, Reference< XInterface >() ); } @@ -457,7 +457,7 @@ void StringResourceImpl::implRemoveId( const ::rtl::OUString& ResourceID, Locale } } -void StringResourceImpl::removeId( const ::rtl::OUString& ResourceID ) +void StringResourceImpl::removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -465,7 +465,7 @@ void StringResourceImpl::removeId( const ::rtl::OUString& ResourceID ) implRemoveId( ResourceID, m_pCurrentLocaleItem ); } -void StringResourceImpl::removeIdForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +void StringResourceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -482,7 +482,7 @@ void StringResourceImpl::newLocale( const Locale& locale ) if( getItemForLocale( locale, false ) != NULL ) { - ::rtl::OUString errorMsg("StringResourceImpl: locale already exists"); + OUString errorMsg("StringResourceImpl: locale already exists"); throw ElementExistException( errorMsg, Reference< XInterface >() ); } @@ -505,8 +505,8 @@ void StringResourceImpl::newLocale( const Locale& locale ) IdToStringMap::const_iterator it; for( it = rSourceMap.begin(); it != rSourceMap.end(); ++it ) { - ::rtl::OUString aId = (*it).first; - ::rtl::OUString aStr = (*it).second; + OUString aId = (*it).first; + OUString aStr = (*it).second; rTargetMap[ aId ] = aStr; } @@ -515,7 +515,7 @@ void StringResourceImpl::newLocale( const Locale& locale ) IdToIndexMap::const_iterator it_index; for( it_index = rSourceIndexMap.begin(); it_index != rSourceIndexMap.end(); ++it_index ) { - ::rtl::OUString aId = (*it_index).first; + OUString aId = (*it_index).first; sal_Int32 nIndex = (*it_index).second; rTargetIndexMap[ aId ] = nIndex; } @@ -535,7 +535,7 @@ void StringResourceImpl::newLocale( const Locale& locale ) } else { - ::rtl::OUString errorMsg("StringResourceImpl: Invalid locale"); + OUString errorMsg("StringResourceImpl: Invalid locale"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } } @@ -607,7 +607,7 @@ void StringResourceImpl::removeLocale( const Locale& locale ) } } -void StringResourceImpl::implScanIdForNumber( const ::rtl::OUString& ResourceID ) +void StringResourceImpl::implScanIdForNumber( const OUString& ResourceID ) { const sal_Unicode* pSrc = ResourceID.getStr(); sal_Int32 nLen = ResourceID.getLength(); @@ -640,7 +640,7 @@ sal_Int32 StringResourceImpl::getUniqueNumericId( ) if( m_nNextUniqueNumericId < UNIQUE_NUMBER_NEEDS_INITIALISATION ) { - ::rtl::OUString errorMsg("getUniqueNumericId: Extended sal_Int32 range"); + OUString errorMsg("getUniqueNumericId: Extended sal_Int32 range"); throw NoSupportException( errorMsg, Reference< XInterface >() ); } return m_nNextUniqueNumericId; @@ -675,7 +675,7 @@ LocaleItem* StringResourceImpl::getItemForLocale if( pRetItem == NULL && bException ) { - ::rtl::OUString errorMsg("StringResourceImpl: Invalid locale"); + OUString errorMsg("StringResourceImpl: Invalid locale"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } return pRetItem; @@ -766,7 +766,7 @@ Reference< XMultiComponentFactory > StringResourceImpl::getMultiComponentFactory if( !xSMgr.is() ) { throw RuntimeException( - ::rtl::OUString( "StringResourceImpl::getMultiComponentFactory: Couldn't instantiate MultiComponentFactory" ), + OUString( "StringResourceImpl::getMultiComponentFactory: Couldn't instantiate MultiComponentFactory" ), Reference< XInterface >() ); } m_xMCF = xSMgr; @@ -794,15 +794,15 @@ StringResourcePersistenceImpl::~StringResourcePersistenceImpl() // XServiceInfo // ----------------------------------------------------------------------------- -::rtl::OUString StringResourcePersistenceImpl::getImplementationName( ) +OUString StringResourcePersistenceImpl::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.scripting.StringResourceWithLocation"); + return OUString( "com.sun.star.comp.scripting.StringResourceWithLocation"); } // ----------------------------------------------------------------------------- -sal_Bool StringResourcePersistenceImpl::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool StringResourcePersistenceImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { return StringResourceImpl::supportsService( rServiceName ); @@ -810,7 +810,7 @@ sal_Bool StringResourcePersistenceImpl::supportsService( const ::rtl::OUString& // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > StringResourcePersistenceImpl::getSupportedServiceNames( ) +Sequence< OUString > StringResourcePersistenceImpl::getSupportedServiceNames( ) throw (RuntimeException) { return StringResourceImpl::getSupportedServiceNames(); @@ -820,7 +820,7 @@ Sequence< ::rtl::OUString > StringResourcePersistenceImpl::getSupportedServiceNa // XInitialization base functionality for derived classes // ----------------------------------------------------------------------------- -static ::rtl::OUString aNameBaseDefaultStr("strings"); +static OUString aNameBaseDefaultStr("strings"); void StringResourcePersistenceImpl::implInitializeCommonParameters ( const Sequence< Any >& aArguments ) @@ -829,7 +829,7 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters bool bReadOnlyOk = (aArguments[1] >>= m_bReadOnly); if( !bReadOnlyOk ) { - ::rtl::OUString errorMsg("XInitialization::initialize: Expected ReadOnly flag"); + OUString errorMsg("XInitialization::initialize: Expected ReadOnly flag"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 1 ); } @@ -837,14 +837,14 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters bool bLocaleOk = (aArguments[2] >>= aCurrentLocale); if( !bLocaleOk ) { - ::rtl::OUString errorMsg("XInitialization::initialize: Expected Locale"); + OUString errorMsg("XInitialization::initialize: Expected Locale"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 2 ); } bool bNameBaseOk = (aArguments[3] >>= m_aNameBase); if( !bNameBaseOk ) { - ::rtl::OUString errorMsg("XInitialization::initialize: Expected NameBase string"); + OUString errorMsg("XInitialization::initialize: Expected NameBase string"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 3 ); } if( m_aNameBase.isEmpty() ) @@ -853,7 +853,7 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters bool bCommentOk = (aArguments[4] >>= m_aComment); if( !bCommentOk ) { - ::rtl::OUString errorMsg("XInitialization::initialize: Expected Comment string"); + OUString errorMsg("XInitialization::initialize: Expected Comment string"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 4 ); } @@ -880,22 +880,22 @@ void StringResourcePersistenceImpl::removeModifyListener( const Reference< XModi } // XStringResourceResolver -::rtl::OUString StringResourcePersistenceImpl::resolveString( const ::rtl::OUString& ResourceID ) +OUString StringResourcePersistenceImpl::resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveString( ResourceID ) ; } -::rtl::OUString StringResourcePersistenceImpl::resolveStringForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +OUString StringResourcePersistenceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } -sal_Bool StringResourcePersistenceImpl::hasEntryForId( const ::rtl::OUString& ResourceID ) +sal_Bool StringResourcePersistenceImpl::hasEntryForId( const OUString& ResourceID ) throw (RuntimeException) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } -sal_Bool StringResourcePersistenceImpl::hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, +sal_Bool StringResourcePersistenceImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) throw (RuntimeException) { @@ -933,33 +933,33 @@ void StringResourcePersistenceImpl::setDefaultLocale( const Locale& locale ) { StringResourceImpl::setDefaultLocale( locale ); } -Sequence< ::rtl::OUString > StringResourcePersistenceImpl::getResourceIDs( ) +Sequence< OUString > StringResourcePersistenceImpl::getResourceIDs( ) throw (RuntimeException) { return StringResourceImpl::getResourceIDs(); } -void StringResourcePersistenceImpl::setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) +void StringResourcePersistenceImpl::setString( const OUString& ResourceID, const OUString& Str ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourcePersistenceImpl::setStringForLocale - ( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, const Locale& locale ) + ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } -Sequence< ::rtl::OUString > StringResourcePersistenceImpl::getResourceIDsForLocale +Sequence< OUString > StringResourcePersistenceImpl::getResourceIDsForLocale ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException) { return StringResourceImpl::getResourceIDsForLocale( locale ); } -void StringResourcePersistenceImpl::removeId( const ::rtl::OUString& ResourceID ) +void StringResourcePersistenceImpl::removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeId( ResourceID ); } -void StringResourcePersistenceImpl::removeIdForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +void StringResourcePersistenceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); @@ -996,14 +996,14 @@ sal_Bool StringResourcePersistenceImpl::isModified( ) return m_bModified; } -void StringResourcePersistenceImpl::setComment( const ::rtl::OUString& Comment ) +void StringResourcePersistenceImpl::setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException) { m_aComment = Comment; } void StringResourcePersistenceImpl::storeToStorage( const Reference< XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (Exception, RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -1015,8 +1015,8 @@ void StringResourcePersistenceImpl::storeToStorage( const Reference< XStorage >& void StringResourcePersistenceImpl::implStoreAtStorage ( - const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aComment, + const OUString& aNameBase, + const OUString& aComment, const Reference< ::com::sun::star::embed::XStorage >& Storage, bool bUsedForStore, bool bStoreAll @@ -1032,8 +1032,8 @@ void StringResourcePersistenceImpl::implStoreAtStorage LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) { - ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); - aStreamName += ::rtl::OUString(".properties"); + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); + aStreamName += OUString(".properties"); try { @@ -1054,14 +1054,14 @@ void StringResourcePersistenceImpl::implStoreAtStorage if( pLocaleItem != NULL && (bStoreAll || pLocaleItem->m_bModified) && loadLocale( pLocaleItem ) ) { - ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase ); - aStreamName += ::rtl::OUString(".properties"); + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase ); + aStreamName += OUString(".properties"); Reference< io::XStream > xElementStream = Storage->openStreamElement( aStreamName, ElementModes::READWRITE ); - ::rtl::OUString aPropName("MediaType"); - ::rtl::OUString aMime("text/plain"); + OUString aPropName("MediaType"); + OUString aMime("text/plain"); uno::Reference< beans::XPropertySet > xProps( xElementStream, uno::UNO_QUERY ); OSL_ENSURE( xProps.is(), "The StorageStream must implement XPropertySet interface!\n" ); @@ -1069,7 +1069,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage { xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) ); - aPropName = ::rtl::OUString("UseCommonStoragePasswordEncryption"); + aPropName = OUString("UseCommonStoragePasswordEncryption"); xProps->setPropertyValue( aPropName, uno::makeAny( sal_True ) ); } @@ -1092,8 +1092,8 @@ void StringResourcePersistenceImpl::implStoreAtStorage LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) { - ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); - aStreamName += ::rtl::OUString(".default"); + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); + aStreamName += OUString(".default"); try { @@ -1111,8 +1111,8 @@ void StringResourcePersistenceImpl::implStoreAtStorage // Default locale if( m_pDefaultLocaleItem != NULL && (bStoreAll || m_bDefaultModified) ) { - ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( m_pDefaultLocaleItem, aNameBase ); - aStreamName += ::rtl::OUString(".default"); + OUString aStreamName = implGetFileNameForLocaleItem( m_pDefaultLocaleItem, aNameBase ); + aStreamName += OUString(".default"); Reference< io::XStream > xElementStream = Storage->openStreamElement( aStreamName, ElementModes::READWRITE ); @@ -1126,8 +1126,8 @@ void StringResourcePersistenceImpl::implStoreAtStorage } } -void StringResourcePersistenceImpl::storeToURL( const ::rtl::OUString& URL, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment, +void StringResourcePersistenceImpl::storeToURL( const OUString& URL, + const OUString& NameBase, const OUString& Comment, const Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw (Exception, RuntimeException) { @@ -1145,8 +1145,8 @@ void StringResourcePersistenceImpl::storeToURL( const ::rtl::OUString& URL, void StringResourcePersistenceImpl::implKillRemovedLocaleFiles ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, + const OUString& Location, + const OUString& aNameBase, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess ) throw (Exception, RuntimeException) @@ -1158,7 +1158,7 @@ void StringResourcePersistenceImpl::implKillRemovedLocaleFiles LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) { - ::rtl::OUString aCompleteFileName = + OUString aCompleteFileName = implGetPathForLocaleItem( pLocaleItem, aNameBase, Location ); if( xFileAccess->exists( aCompleteFileName ) ) xFileAccess->kill( aCompleteFileName ); @@ -1171,8 +1171,8 @@ void StringResourcePersistenceImpl::implKillRemovedLocaleFiles void StringResourcePersistenceImpl::implKillChangedDefaultFiles ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, + const OUString& Location, + const OUString& aNameBase, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess ) throw (Exception, RuntimeException) @@ -1184,7 +1184,7 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles LocaleItem* pLocaleItem = *it; if( pLocaleItem != NULL ) { - ::rtl::OUString aCompleteFileName = + OUString aCompleteFileName = implGetPathForLocaleItem( pLocaleItem, aNameBase, Location, true ); if( xFileAccess->exists( aCompleteFileName ) ) xFileAccess->kill( aCompleteFileName ); @@ -1197,9 +1197,9 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles void StringResourcePersistenceImpl::implStoreAtLocation ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aComment, + const OUString& Location, + const OUString& aNameBase, + const OUString& aComment, const Reference< ucb::XSimpleFileAccess3 >& xFileAccess, bool bUsedForStore, bool bStoreAll, @@ -1217,7 +1217,7 @@ void StringResourcePersistenceImpl::implStoreAtLocation if( pLocaleItem != NULL && (bStoreAll || bKillAll || pLocaleItem->m_bModified) && loadLocale( pLocaleItem ) ) { - ::rtl::OUString aCompleteFileName = + OUString aCompleteFileName = implGetPathForLocaleItem( pLocaleItem, aNameBase, Location ); if( xFileAccess->exists( aCompleteFileName ) ) xFileAccess->kill( aCompleteFileName ); @@ -1244,7 +1244,7 @@ void StringResourcePersistenceImpl::implStoreAtLocation // Default locale if( m_pDefaultLocaleItem != NULL && (bStoreAll || bKillAll || m_bDefaultModified) ) { - ::rtl::OUString aCompleteFileName = + OUString aCompleteFileName = implGetPathForLocaleItem( m_pDefaultLocaleItem, aNameBase, Location, true ); if( xFileAccess->exists( aCompleteFileName ) ) xFileAccess->kill( aCompleteFileName ); @@ -1290,7 +1290,7 @@ public: void writeUnicodeChar( sal_Unicode n ) { write16BitInt( n ); } void writeInt32( sal_Int32 n ); - void writeString( const ::rtl::OUString& aStr ); + void writeString( const OUString& aStr ); }; BinaryOutput::BinaryOutput( Reference< XMultiComponentFactory > xMCF, @@ -1335,7 +1335,7 @@ void BinaryOutput::writeInt32( sal_Int32 n ) m_xOutputStream->writeBytes( aSeq ); } -void BinaryOutput::writeString( const ::rtl::OUString& aStr ) +void BinaryOutput::writeString( const OUString& aStr ) { sal_Int32 nLen = aStr.getLength(); const sal_Unicode* pStr = aStr.getStr(); @@ -1505,7 +1505,7 @@ public: sal_Int16 readInt16( void ); sal_Int32 readInt32( void ); sal_Unicode readUnicodeChar( void ); - ::rtl::OUString readString( void ); + OUString readString( void ); }; BinaryInput::BinaryInput( Sequence< ::sal_Int8 > aData, Reference< XMultiComponentFactory > xMCF, @@ -1596,9 +1596,9 @@ sal_Unicode BinaryInput::readUnicodeChar( void ) return cRet; } -::rtl::OUString BinaryInput::readString( void ) +OUString BinaryInput::readString( void ) { - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_Unicode c; do { @@ -1608,7 +1608,7 @@ sal_Unicode BinaryInput::readUnicodeChar( void ) } while( c != 0 ); - ::rtl::OUString aRetStr = aBuf.makeStringAndClear(); + OUString aRetStr = aBuf.makeStringAndClear(); return aRetStr; } @@ -1678,7 +1678,7 @@ void StringResourcePersistenceImpl::importBinary( const Sequence< ::sal_Int8 >& // ============================================================================= // Private helper methods -bool checkNamingSceme( const ::rtl::OUString& aName, const ::rtl::OUString& aNameBase, +bool checkNamingSceme( const OUString& aName, const OUString& aNameBase, Locale& aLocale ) { bool bSuccess = false; @@ -1726,18 +1726,18 @@ void StringResourcePersistenceImpl::implLoadAllLocales( void ) } // Scan locale properties files helper -void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< ::rtl::OUString >& aContentSeq ) +void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< OUString >& aContentSeq ) { Locale aDefaultLocale; bool bDefaultFound = false; sal_Int32 nCount = aContentSeq.getLength(); - const ::rtl::OUString* pFiles = aContentSeq.getConstArray(); + const OUString* pFiles = aContentSeq.getConstArray(); for( int i = 0 ; i < nCount ; i++ ) { - ::rtl::OUString aCompleteName = pFiles[i]; - rtl::OUString aPureName; - rtl::OUString aExtension; + OUString aCompleteName = pFiles[i]; + OUString aPureName; + OUString aExtension; sal_Int32 iDot = aCompleteName.lastIndexOf( '.' ); sal_Int32 iSlash = aCompleteName.lastIndexOf( '/' ); if( iDot != -1 ) @@ -1749,7 +1749,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< ::rtl:: if ( aExtension == "properties" ) { - //rtl::OUString aName = aInetObj.getBase(); + //OUString aName = aInetObj.getBase(); Locale aLocale; if( checkNamingSceme( aPureName, m_aNameBase, aLocale ) ) @@ -1769,7 +1769,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< ::rtl:: } else if( !bDefaultFound && aExtension == "default" ) { - //rtl::OUString aName = aInetObj.getBase(); + //OUString aName = aInetObj.getBase(); Locale aLocale; if( checkNamingSceme( aPureName, m_aNameBase, aDefaultLocale ) ) @@ -1821,25 +1821,25 @@ bool StringResourcePersistenceImpl::implLoadLocale( LocaleItem* ) return false; } -::rtl::OUString implGetNameScemeForLocaleItem( const LocaleItem* pLocaleItem ) +OUString implGetNameScemeForLocaleItem( const LocaleItem* pLocaleItem ) { - static ::rtl::OUString aUnder("_"); + static OUString aUnder("_"); OSL_ENSURE( pLocaleItem, "StringResourcePersistenceImpl::implGetNameScemeForLocaleItem(): pLocaleItem == NULL" ); Locale aLocale = pLocaleItem->m_locale; - ::rtl::OUString aRetStr = aUnder; + OUString aRetStr = aUnder; aRetStr += aLocale.Language; - ::rtl::OUString aCountry = aLocale.Country; + OUString aCountry = aLocale.Country; if( !aCountry.isEmpty() ) { aRetStr += aUnder; aRetStr += aCountry; } - ::rtl::OUString aVariant = aLocale.Variant; + OUString aVariant = aLocale.Variant; if( !aVariant.isEmpty() ) { aRetStr += aUnder; @@ -1848,10 +1848,10 @@ bool StringResourcePersistenceImpl::implLoadLocale( LocaleItem* ) return aRetStr; } -::rtl::OUString StringResourcePersistenceImpl::implGetFileNameForLocaleItem - ( LocaleItem* pLocaleItem, const ::rtl::OUString& aNameBase ) +OUString StringResourcePersistenceImpl::implGetFileNameForLocaleItem + ( LocaleItem* pLocaleItem, const OUString& aNameBase ) { - ::rtl::OUString aFileName = aNameBase; + OUString aFileName = aNameBase; if( aFileName.isEmpty() ) aFileName = aNameBaseDefaultStr; @@ -1859,18 +1859,18 @@ bool StringResourcePersistenceImpl::implLoadLocale( LocaleItem* ) return aFileName; } -::rtl::OUString StringResourcePersistenceImpl::implGetPathForLocaleItem - ( LocaleItem* pLocaleItem, const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aLocation, bool bDefaultFile ) +OUString StringResourcePersistenceImpl::implGetPathForLocaleItem + ( LocaleItem* pLocaleItem, const OUString& aNameBase, + const OUString& aLocation, bool bDefaultFile ) { - ::rtl::OUString aFileName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase ); + OUString aFileName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase ); INetURLObject aInetObj( aLocation ); aInetObj.insertName( aFileName, sal_True, INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::ENCODE_ALL ); if( bDefaultFile ) - aInetObj.setExtension( ::rtl::OUString( "default" ) ); + aInetObj.setExtension( OUString( "default" ) ); else - aInetObj.setExtension( ::rtl::OUString( "properties" ) ); - ::rtl::OUString aCompleteFileName = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); + aInetObj.setExtension( OUString( "properties" ) ); + OUString aCompleteFileName = aInetObj.GetMainURL( INetURLObject::NO_DECODE ); return aCompleteFileName; } @@ -1966,7 +1966,7 @@ sal_Unicode getEscapeChar( const sal_Unicode* pBuf, sal_Int32 nLen, sal_Int32& r } void CheckContinueInNextLine( Reference< io::XTextInputStream2 > xTextInputStream, - ::rtl::OUString& aLine, bool& bEscapePending, const sal_Unicode*& pBuf, + OUString& aLine, bool& bEscapePending, const sal_Unicode*& pBuf, sal_Int32& nLen, sal_Int32& i ) { if( i == nLen && bEscapePending ) @@ -1998,11 +1998,11 @@ bool StringResourcePersistenceImpl::implReadPropertiesFile xTextInputStream->setInputStream( xInputStream ); - ::rtl::OUString aEncodingStr = ::rtl::OUString::createFromAscii + OUString aEncodingStr = OUString::createFromAscii ( rtl_getMimeCharsetFromTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) ); xTextInputStream->setEncoding( aEncodingStr ); - ::rtl::OUString aLine; + OUString aLine; while( !xTextInputStream->isEOF() ) { aLine = xTextInputStream->readLine(); @@ -2011,7 +2011,7 @@ bool StringResourcePersistenceImpl::implReadPropertiesFile if( 0 == nLen ) continue; const sal_Unicode* pBuf = aLine.getStr(); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_Unicode c = 0; sal_Int32 i = 0; @@ -2025,7 +2025,7 @@ bool StringResourcePersistenceImpl::implReadPropertiesFile continue; // Scan key - ::rtl::OUString aResourceID; + OUString aResourceID; bool bEscapePending = false; bool bStrComplete = false; while( i < nLen && !bStrComplete ) @@ -2067,7 +2067,7 @@ bool StringResourcePersistenceImpl::implReadPropertiesFile // Scan value skipWhites( pBuf, nLen, i ); - ::rtl::OUString aValueStr; + OUString aValueStr; bEscapePending = false; bStrComplete = false; while( i < nLen && !bStrComplete ) @@ -2116,7 +2116,7 @@ inline sal_Unicode getHexCharForDigit( sal_uInt16 nDigitVal ) return cRet; } -void implWriteCharToBuffer( ::rtl::OUStringBuffer& aBuf, sal_Unicode cu, bool bKey ) +void implWriteCharToBuffer( OUStringBuffer& aBuf, sal_Unicode cu, bool bKey ) { if( cu == '\\' ) { @@ -2170,7 +2170,7 @@ void implWriteCharToBuffer( ::rtl::OUStringBuffer& aBuf, sal_Unicode cu, bool bK } } -void implWriteStringWithEncoding( const ::rtl::OUString& aStr, +void implWriteStringWithEncoding( const OUString& aStr, Reference< io::XTextOutputStream2 > xTextOutputStream, bool bKey ) { static sal_Unicode cLineFeed = 0xa; @@ -2178,7 +2178,7 @@ void implWriteStringWithEncoding( const ::rtl::OUString& aStr, (void)aStr; (void)xTextOutputStream; - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_Int32 nLen = aStr.getLength(); const sal_Unicode* pSrc = aStr.getStr(); for( sal_Int32 i = 0 ; i < nLen ; i++ ) @@ -2190,15 +2190,15 @@ void implWriteStringWithEncoding( const ::rtl::OUString& aStr, if( !bKey ) aBuf.append( cLineFeed ); - ::rtl::OUString aWriteStr = aBuf.makeStringAndClear(); + OUString aWriteStr = aBuf.makeStringAndClear(); xTextOutputStream->writeString( aWriteStr ); } bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocaleItem, - const Reference< io::XOutputStream >& xOutputStream, const ::rtl::OUString& aComment ) + const Reference< io::XOutputStream >& xOutputStream, const OUString& aComment ) { - static ::rtl::OUString aAssignmentStr("="); - static ::rtl::OUString aLineFeedStr("\n"); + static OUString aAssignmentStr("="); + static OUString aLineFeedStr("\n"); if( !xOutputStream.is() || pLocaleItem == NULL ) return false; @@ -2208,7 +2208,7 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale xTextOutputStream->setOutputStream( xOutputStream ); - ::rtl::OUString aEncodingStr = ::rtl::OUString::createFromAscii + OUString aEncodingStr = OUString::createFromAscii ( rtl_getMimeCharsetFromTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) ); xTextOutputStream->setEncoding( aEncodingStr ); @@ -2236,7 +2236,7 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale sal_Int32 nTabSize = nMaxIndex - nMinIndex + 1; // Create sorted array of pointers to the id strings - const ::rtl::OUString** pIdPtrs = new const ::rtl::OUString*[nTabSize]; + const OUString** pIdPtrs = new const OUString*[nTabSize]; for(sal_Int32 i = 0 ; i < nTabSize ; i++ ) pIdPtrs[i] = NULL; for( it_index = rIndexMap.begin(); it_index != rIndexMap.end(); ++it_index ) @@ -2248,16 +2248,16 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale // Write lines in correct order for(sal_Int32 i = 0 ; i < nTabSize ; i++ ) { - const ::rtl::OUString* pStr = pIdPtrs[i]; + const OUString* pStr = pIdPtrs[i]; if( pStr != NULL ) { - ::rtl::OUString aResourceID = *pStr; + OUString aResourceID = *pStr; IdToStringMap::const_iterator it = rHashMap.find( aResourceID ); if( !( it == rHashMap.end() ) ) { implWriteStringWithEncoding( aResourceID, xTextOutputStream, true ); xTextOutputStream->writeString( aAssignmentStr ); - ::rtl::OUString aValStr = (*it).second; + OUString aValStr = (*it).second; implWriteStringWithEncoding( aValStr, xTextOutputStream, false ); } } @@ -2277,16 +2277,16 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale // ============================================================================= // component operations -static Sequence< ::rtl::OUString > getSupportedServiceNames_StringResourceWithStorageImpl() +static Sequence< OUString > getSupportedServiceNames_StringResourceWithStorageImpl() { - Sequence< ::rtl::OUString > names(1); - names[0] = ::rtl::OUString( "com.sun.star.resource.StringResourceWithStorage" ); + Sequence< OUString > names(1); + names[0] = OUString( "com.sun.star.resource.StringResourceWithStorage" ); return names; } -static ::rtl::OUString getImplementationName_StringResourceWithStorageImpl() +static OUString getImplementationName_StringResourceWithStorageImpl() { - return ::rtl::OUString( "com.sun.star.comp.scripting.StringResourceWithStorage" ); + return OUString( "com.sun.star.comp.scripting.StringResourceWithStorage" ); } static Reference< XInterface > SAL_CALL create_StringResourceWithStorageImpl( @@ -2314,18 +2314,18 @@ StringResourceWithStorageImpl::~StringResourceWithStorageImpl() // XServiceInfo // ----------------------------------------------------------------------------- -::rtl::OUString StringResourceWithStorageImpl::getImplementationName( ) throw (RuntimeException) +OUString StringResourceWithStorageImpl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_StringResourceWithStorageImpl(); } // ----------------------------------------------------------------------------- -sal_Bool StringResourceWithStorageImpl::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) +sal_Bool StringResourceWithStorageImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -2334,7 +2334,7 @@ sal_Bool StringResourceWithStorageImpl::supportsService( const ::rtl::OUString& // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > StringResourceWithStorageImpl::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_StringResourceWithStorageImpl(); } @@ -2351,7 +2351,7 @@ void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArgument if ( aArguments.getLength() != 5 ) { throw RuntimeException( - ::rtl::OUString( "StringResourceWithStorageImpl::initialize: invalid number of arguments!" ), + OUString( "StringResourceWithStorageImpl::initialize: invalid number of arguments!" ), Reference< XInterface >() ); } @@ -2361,7 +2361,7 @@ void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArgument if( !bOk ) { - ::rtl::OUString errorMsg("StringResourceWithStorageImpl::initialize: invalid storage"); + OUString errorMsg("StringResourceWithStorageImpl::initialize: invalid storage"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } @@ -2384,33 +2384,33 @@ void StringResourceWithStorageImpl::removeModifyListener( const Reference< XModi } // XStringResourceResolver -::rtl::OUString StringResourceWithStorageImpl::resolveString( const ::rtl::OUString& ResourceID ) +OUString StringResourceWithStorageImpl::resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveString( ResourceID ) ; } -::rtl::OUString StringResourceWithStorageImpl::resolveStringForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +OUString StringResourceWithStorageImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } -sal_Bool StringResourceWithStorageImpl::hasEntryForId( const ::rtl::OUString& ResourceID ) +sal_Bool StringResourceWithStorageImpl::hasEntryForId( const OUString& ResourceID ) throw (RuntimeException) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } -sal_Bool StringResourceWithStorageImpl::hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, +sal_Bool StringResourceWithStorageImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) throw (RuntimeException) { return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale ); } -Sequence< ::rtl::OUString > StringResourceWithStorageImpl::getResourceIDs( ) +Sequence< OUString > StringResourceWithStorageImpl::getResourceIDs( ) throw (RuntimeException) { return StringResourceImpl::getResourceIDs(); } -Sequence< ::rtl::OUString > StringResourceWithStorageImpl::getResourceIDsForLocale +Sequence< OUString > StringResourceWithStorageImpl::getResourceIDsForLocale ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException) { return StringResourceImpl::getResourceIDsForLocale( locale ); @@ -2447,23 +2447,23 @@ void StringResourceWithStorageImpl::setDefaultLocale( const Locale& locale ) { StringResourceImpl::setDefaultLocale( locale ); } -void StringResourceWithStorageImpl::setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) +void StringResourceWithStorageImpl::setString( const OUString& ResourceID, const OUString& Str ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourceWithStorageImpl::setStringForLocale - ( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, const Locale& locale ) + ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } -void StringResourceWithStorageImpl::removeId( const ::rtl::OUString& ResourceID ) +void StringResourceWithStorageImpl::removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeId( ResourceID ); } -void StringResourceWithStorageImpl::removeIdForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +void StringResourceWithStorageImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); @@ -2506,19 +2506,19 @@ sal_Bool StringResourceWithStorageImpl::isModified( ) { return StringResourcePersistenceImpl::isModified(); } -void StringResourceWithStorageImpl::setComment( const ::rtl::OUString& Comment ) +void StringResourceWithStorageImpl::setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException) { StringResourcePersistenceImpl::setComment( Comment ); } void StringResourceWithStorageImpl::storeToStorage( const Reference< XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (Exception, RuntimeException) { StringResourcePersistenceImpl::storeToStorage( Storage, NameBase, Comment ); } -void StringResourceWithStorageImpl::storeToURL( const ::rtl::OUString& URL, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment, +void StringResourceWithStorageImpl::storeToURL( const OUString& URL, + const OUString& NameBase, const OUString& Comment, const Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw (Exception, RuntimeException) { @@ -2552,7 +2552,7 @@ void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Sto if( !Storage.is() ) { - ::rtl::OUString errorMsg( "StringResourceWithStorageImpl::setStorage: invalid storage" ); + OUString errorMsg( "StringResourceWithStorageImpl::setStorage: invalid storage" ); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } @@ -2573,7 +2573,7 @@ void StringResourceWithStorageImpl::implScanLocales( void ) Reference< container::XNameAccess > xNameAccess( m_xStorage, UNO_QUERY ); if( xNameAccess.is() ) { - Sequence< ::rtl::OUString > aContentSeq = xNameAccess->getElementNames(); + Sequence< OUString > aContentSeq = xNameAccess->getElementNames(); implScanLocaleNames( aContentSeq ); } @@ -2586,8 +2586,8 @@ bool StringResourceWithStorageImpl::implLoadLocale( LocaleItem* pLocaleItem ) bool bSuccess = false; try { - ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); - aStreamName += ::rtl::OUString( ".properties" ); + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); + aStreamName += OUString( ".properties" ); Reference< io::XStream > xElementStream = m_xStorage->openStreamElement( aStreamName, ElementModes::READ ); @@ -2614,16 +2614,16 @@ bool StringResourceWithStorageImpl::implLoadLocale( LocaleItem* pLocaleItem ) // ============================================================================= // component operations -static Sequence< ::rtl::OUString > getSupportedServiceNames_StringResourceWithLocationImpl() +static Sequence< OUString > getSupportedServiceNames_StringResourceWithLocationImpl() { - Sequence< ::rtl::OUString > names(1); - names[0] = ::rtl::OUString( "com.sun.star.resource.StringResourceWithLocation" ); + Sequence< OUString > names(1); + names[0] = OUString( "com.sun.star.resource.StringResourceWithLocation" ); return names; } -static ::rtl::OUString getImplementationName_StringResourceWithLocationImpl() +static OUString getImplementationName_StringResourceWithLocationImpl() { - return ::rtl::OUString( "com.sun.star.comp.scripting.StringResourceWithLocation" ); + return OUString( "com.sun.star.comp.scripting.StringResourceWithLocation" ); } static Reference< XInterface > SAL_CALL create_StringResourceWithLocationImpl( @@ -2651,18 +2651,18 @@ StringResourceWithLocationImpl::~StringResourceWithLocationImpl() // XServiceInfo // ----------------------------------------------------------------------------- -::rtl::OUString StringResourceWithLocationImpl::getImplementationName( ) throw (RuntimeException) +OUString StringResourceWithLocationImpl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_StringResourceWithLocationImpl(); } // ----------------------------------------------------------------------------- -sal_Bool StringResourceWithLocationImpl::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) +sal_Bool StringResourceWithLocationImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; @@ -2671,7 +2671,7 @@ sal_Bool StringResourceWithLocationImpl::supportsService( const ::rtl::OUString& // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > StringResourceWithLocationImpl::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_StringResourceWithLocationImpl(); } @@ -2688,7 +2688,7 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen if ( aArguments.getLength() != 6 ) { throw RuntimeException( - ::rtl::OUString( "XInitialization::initialize: invalid number of arguments!" ), + OUString( "XInitialization::initialize: invalid number of arguments!" ), Reference< XInterface >() ); } @@ -2701,12 +2701,12 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen else { if( m_aLocation.getStr()[nLen - 1] != '/' ) - m_aLocation += ::rtl::OUString("/"); + m_aLocation += OUString("/"); } if( !bOk ) { - ::rtl::OUString errorMsg("XInitialization::initialize: invalid URL"); + OUString errorMsg("XInitialization::initialize: invalid URL"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } @@ -2714,7 +2714,7 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen bOk = (aArguments[5] >>= m_xInteractionHandler); if( !bOk ) { - ::rtl::OUString errorMsg("StringResourceWithStorageImpl::initialize: invalid type"); + OUString errorMsg("StringResourceWithStorageImpl::initialize: invalid type"); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 5 ); } @@ -2737,33 +2737,33 @@ void StringResourceWithLocationImpl::removeModifyListener( const Reference< XMod } // XStringResourceResolver -::rtl::OUString StringResourceWithLocationImpl::resolveString( const ::rtl::OUString& ResourceID ) +OUString StringResourceWithLocationImpl::resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveString( ResourceID ) ; } -::rtl::OUString StringResourceWithLocationImpl::resolveStringForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +OUString StringResourceWithLocationImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, RuntimeException) { return StringResourceImpl::resolveStringForLocale( ResourceID, locale ); } -sal_Bool StringResourceWithLocationImpl::hasEntryForId( const ::rtl::OUString& ResourceID ) +sal_Bool StringResourceWithLocationImpl::hasEntryForId( const OUString& ResourceID ) throw (RuntimeException) { return StringResourceImpl::hasEntryForId( ResourceID ) ; } -sal_Bool StringResourceWithLocationImpl::hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, +sal_Bool StringResourceWithLocationImpl::hasEntryForIdAndLocale( const OUString& ResourceID, const Locale& locale ) throw (RuntimeException) { return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale ); } -Sequence< ::rtl::OUString > StringResourceWithLocationImpl::getResourceIDs( ) +Sequence< OUString > StringResourceWithLocationImpl::getResourceIDs( ) throw (RuntimeException) { return StringResourceImpl::getResourceIDs(); } -Sequence< ::rtl::OUString > StringResourceWithLocationImpl::getResourceIDsForLocale +Sequence< OUString > StringResourceWithLocationImpl::getResourceIDsForLocale ( const Locale& locale ) throw (::com::sun::star::uno::RuntimeException) { return StringResourceImpl::getResourceIDsForLocale( locale ); @@ -2800,23 +2800,23 @@ void StringResourceWithLocationImpl::setDefaultLocale( const Locale& locale ) { StringResourceImpl::setDefaultLocale( locale ); } -void StringResourceWithLocationImpl::setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) +void StringResourceWithLocationImpl::setString( const OUString& ResourceID, const OUString& Str ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setString( ResourceID, Str ); } void StringResourceWithLocationImpl::setStringForLocale - ( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, const Locale& locale ) + ( const OUString& ResourceID, const OUString& Str, const Locale& locale ) throw (NoSupportException, RuntimeException) { StringResourceImpl::setStringForLocale( ResourceID, Str, locale ); } -void StringResourceWithLocationImpl::removeId( const ::rtl::OUString& ResourceID ) +void StringResourceWithLocationImpl::removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeId( ResourceID ); } -void StringResourceWithLocationImpl::removeIdForLocale( const ::rtl::OUString& ResourceID, const Locale& locale ) +void StringResourceWithLocationImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, RuntimeException, NoSupportException) { StringResourceImpl::removeIdForLocale( ResourceID, locale ); @@ -2861,19 +2861,19 @@ sal_Bool StringResourceWithLocationImpl::isModified( ) { return StringResourcePersistenceImpl::isModified(); } -void StringResourceWithLocationImpl::setComment( const ::rtl::OUString& Comment ) +void StringResourceWithLocationImpl::setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException) { StringResourcePersistenceImpl::setComment( Comment ); } void StringResourceWithLocationImpl::storeToStorage( const Reference< XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (Exception, RuntimeException) { StringResourcePersistenceImpl::storeToStorage( Storage, NameBase, Comment ); } -void StringResourceWithLocationImpl::storeToURL( const ::rtl::OUString& URL, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment, +void StringResourceWithLocationImpl::storeToURL( const OUString& URL, + const OUString& NameBase, const OUString& Comment, const Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw (Exception, RuntimeException) { @@ -2894,14 +2894,14 @@ void StringResourceWithLocationImpl::importBinary( const Sequence< ::sal_Int8 >& // XStringResourceWithLocation // XStringResourceWithLocation -void StringResourceWithLocationImpl::storeAsURL( const ::rtl::OUString& URL ) +void StringResourceWithLocationImpl::storeAsURL( const OUString& URL ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { setURL( URL ); store(); } -void StringResourceWithLocationImpl::setURL( const ::rtl::OUString& URL ) +void StringResourceWithLocationImpl::setURL( const OUString& URL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); @@ -2910,7 +2910,7 @@ void StringResourceWithLocationImpl::setURL( const ::rtl::OUString& URL ) sal_Int32 nLen = URL.getLength(); if( nLen == 0 ) { - ::rtl::OUString errorMsg( "StringResourceWithLocationImpl::setURL: invalid URL" ); + OUString errorMsg( "StringResourceWithLocationImpl::setURL: invalid URL" ); throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 ); } @@ -2938,7 +2938,7 @@ void StringResourceWithLocationImpl::implScanLocales( void ) const Reference< ucb::XSimpleFileAccess3 > xFileAccess = getFileAccess(); if( xFileAccess.is() && xFileAccess->isFolder( m_aLocation ) ) { - Sequence< ::rtl::OUString > aContentSeq = xFileAccess->getFolderContents( m_aLocation, false ); + Sequence< OUString > aContentSeq = xFileAccess->getFolderContents( m_aLocation, false ); implScanLocaleNames( aContentSeq ); } } @@ -2951,7 +2951,7 @@ bool StringResourceWithLocationImpl::implLoadLocale( LocaleItem* pLocaleItem ) const Reference< ucb::XSimpleFileAccess3 > xFileAccess = getFileAccess(); if( xFileAccess.is() ) { - ::rtl::OUString aCompleteFileName = + OUString aCompleteFileName = implGetPathForLocaleItem( pLocaleItem, m_aNameBase, m_aLocation ); Reference< io::XInputStream > xInputStream; diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 90f9a8dc8a9b..d8e2968f44d2 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -55,7 +55,7 @@ namespace stringresource // Hashtable to map string ids to string struct hashName_Impl { - size_t operator()(const ::rtl::OUString Str) const + size_t operator()(const OUString Str) const { return (size_t)Str.hashCode(); } @@ -63,7 +63,7 @@ struct hashName_Impl struct eqName_Impl { - sal_Bool operator()(const ::rtl::OUString Str1, const ::rtl::OUString Str2) const + sal_Bool operator()(const OUString Str1, const OUString Str2) const { return ( Str1 == Str2 ); } @@ -71,8 +71,8 @@ struct eqName_Impl typedef boost::unordered_map < - ::rtl::OUString, - ::rtl::OUString, + OUString, + OUString, hashName_Impl, eqName_Impl > @@ -80,7 +80,7 @@ IdToStringMap; typedef boost::unordered_map < - ::rtl::OUString, + OUString, sal_Int32, hashName_Impl, eqName_Impl @@ -135,7 +135,7 @@ protected: sal_Int32 m_nNextUniqueNumericId; // Scans ResourceID to start with number and adapt m_nNextUniqueNumericId - void implScanIdForNumber( const ::rtl::OUString& ResourceID ); + void implScanIdForNumber( const OUString& ResourceID ); const static sal_Int32 UNIQUE_NUMBER_NEEDS_INITIALISATION = -1; // Checks read only status and throws exception if it's true @@ -162,13 +162,13 @@ protected: void implNotifyListeners( void ); //=== Impl methods for ...ForLocale methods === - ::rtl::OUString SAL_CALL implResolveString( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ) + OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ) throw (::com::sun::star::resource::MissingResourceException); - ::sal_Bool implHasEntryForId( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > implGetResourceIDs( LocaleItem* pLocaleItem ); - void implSetString( const ::rtl::OUString& ResourceID, - const ::rtl::OUString& Str, LocaleItem* pLocaleItem ); - void implRemoveId( const ::rtl::OUString& ResourceID, LocaleItem* pLocaleItem ) + ::sal_Bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ); + ::com::sun::star::uno::Sequence< OUString > implGetResourceIDs( LocaleItem* pLocaleItem ); + void implSetString( const OUString& ResourceID, + const OUString& Str, LocaleItem* pLocaleItem ); + void implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem ) throw (::com::sun::star::resource::MissingResourceException); // Method to load a locale if necessary, returns true if loading was @@ -183,11 +183,11 @@ public: virtual ~StringResourceImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XModifyBroadcaster @@ -197,20 +197,20 @@ public: throw (::com::sun::star::uno::RuntimeException); // XStringResourceResolver - virtual ::rtl::OUString SAL_CALL resolveString( const ::rtl::OUString& ResourceID ) + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveStringForLocale( const ::rtl::OUString& ResourceID, + virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForId( const ::rtl::OUString& ResourceID ) + virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, + virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDs( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDsForLocale + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale ( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale( ) @@ -228,15 +228,15 @@ public: virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStringForLocale( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, + virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeId( const ::rtl::OUString& ResourceID ) + virtual void SAL_CALL removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL removeIdForLocale( const ::rtl::OUString& ResourceID, + virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); @@ -260,8 +260,8 @@ class BinaryOutput; class StringResourcePersistenceImpl : public StringResourcePersistenceImpl_BASE { protected: - ::rtl::OUString m_aNameBase; - ::rtl::OUString m_aComment; + OUString m_aNameBase; + OUString m_aComment; void SAL_CALL implInitializeCommonParameters ( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) @@ -278,23 +278,23 @@ protected: virtual void implLoadAllLocales( void ); - void implScanLocaleNames( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContentSeq ); - ::rtl::OUString implGetFileNameForLocaleItem( LocaleItem* pLocaleItem, const ::rtl::OUString& aNameBase ); - ::rtl::OUString implGetPathForLocaleItem( LocaleItem* pLocaleItem, const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aLocation, bool bDefaultFile=false ); + void implScanLocaleNames( const ::com::sun::star::uno::Sequence< OUString >& aContentSeq ); + OUString implGetFileNameForLocaleItem( LocaleItem* pLocaleItem, const OUString& aNameBase ); + OUString implGetPathForLocaleItem( LocaleItem* pLocaleItem, const OUString& aNameBase, + const OUString& aLocation, bool bDefaultFile=false ); bool implReadPropertiesFile( LocaleItem* pLocaleItem, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput ); bool implWritePropertiesFile( LocaleItem* pLocaleItem, const ::com::sun::star::uno::Reference - < ::com::sun::star::io::XOutputStream >& xOutputStream, const ::rtl::OUString& aComment ); + < ::com::sun::star::io::XOutputStream >& xOutputStream, const OUString& aComment ); void implWriteLocaleBinary( LocaleItem* pLocaleItem, BinaryOutput& rOut ); void implStoreAtStorage ( - const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aComment, + const OUString& aNameBase, + const OUString& aComment, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, bool bUsedForStore, bool bStoreAll @@ -303,25 +303,25 @@ protected: void implKillRemovedLocaleFiles ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, + const OUString& Location, + const OUString& aNameBase, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); void implKillChangedDefaultFiles ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, + const OUString& Location, + const OUString& aNameBase, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); void implStoreAtLocation ( - const ::rtl::OUString& Location, - const ::rtl::OUString& aNameBase, - const ::rtl::OUString& aComment, + const OUString& Location, + const OUString& aNameBase, + const OUString& aComment, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xFileAccess, bool bUsedForStore, bool bStoreAll, @@ -335,11 +335,11 @@ public: virtual ~StringResourcePersistenceImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XModifyBroadcaster @@ -349,20 +349,20 @@ public: throw (::com::sun::star::uno::RuntimeException); // XStringResourceResolver - virtual ::rtl::OUString SAL_CALL resolveString( const ::rtl::OUString& ResourceID ) + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveStringForLocale( const ::rtl::OUString& ResourceID, + virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForId( const ::rtl::OUString& ResourceID ) + virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, + virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDs( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDsForLocale + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale ( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale( ) @@ -380,15 +380,15 @@ public: virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStringForLocale( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, + virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeId( const ::rtl::OUString& ResourceID ) + virtual void SAL_CALL removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL removeIdForLocale( const ::rtl::OUString& ResourceID, + virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); @@ -409,14 +409,14 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComment( const ::rtl::OUString& Comment ) + virtual void SAL_CALL setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL storeToStorage ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeToURL( const ::rtl::OUString& URL, const ::rtl::OUString& NameBase, - const ::rtl::OUString& Comment, const ::com::sun::star::uno::Reference + virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, + const OUString& Comment, const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& Handler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) @@ -445,11 +445,11 @@ public: virtual ~StringResourceWithStorageImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -463,20 +463,20 @@ public: throw (::com::sun::star::uno::RuntimeException); // XStringResourceResolver - virtual ::rtl::OUString SAL_CALL resolveString( const ::rtl::OUString& ResourceID ) + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveStringForLocale( const ::rtl::OUString& ResourceID, + virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForId( const ::rtl::OUString& ResourceID ) + virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, + virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDs( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDsForLocale + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale ( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale( ) @@ -494,15 +494,15 @@ public: virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStringForLocale( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, + virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeId( const ::rtl::OUString& ResourceID ) + virtual void SAL_CALL removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL removeIdForLocale( const ::rtl::OUString& ResourceID, + virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); @@ -523,14 +523,14 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComment( const ::rtl::OUString& Comment ) + virtual void SAL_CALL setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL storeToStorage ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeToURL( const ::rtl::OUString& URL, const ::rtl::OUString& NameBase, - const ::rtl::OUString& Comment, const ::com::sun::star::uno::Reference + virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, + const OUString& Comment, const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& Handler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) @@ -555,7 +555,7 @@ typedef ::cppu::ImplInheritanceHelper2< class StringResourceWithLocationImpl : public StringResourceWithLocationImpl_BASE { - ::rtl::OUString m_aLocation; + OUString m_aLocation; bool m_bLocationChanged; com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFI; com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInteractionHandler; @@ -571,11 +571,11 @@ public: virtual ~StringResourceWithLocationImpl(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -589,20 +589,20 @@ public: throw (::com::sun::star::uno::RuntimeException); // XStringResourceResolver - virtual ::rtl::OUString SAL_CALL resolveString( const ::rtl::OUString& ResourceID ) + virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveStringForLocale( const ::rtl::OUString& ResourceID, + virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForId( const ::rtl::OUString& ResourceID ) + virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const ::rtl::OUString& ResourceID, + virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDs( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getResourceIDsForLocale + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale ( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getCurrentLocale( ) @@ -620,15 +620,15 @@ public: virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL setString( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str ) + virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStringForLocale( const ::rtl::OUString& ResourceID, const ::rtl::OUString& Str, + virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeId( const ::rtl::OUString& ResourceID ) + virtual void SAL_CALL removeId( const OUString& ResourceID ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); - virtual void SAL_CALL removeIdForLocale( const ::rtl::OUString& ResourceID, + virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NoSupportException); @@ -649,14 +649,14 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComment( const ::rtl::OUString& Comment ) + virtual void SAL_CALL setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL storeToStorage ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, - const ::rtl::OUString& NameBase, const ::rtl::OUString& Comment ) + const OUString& NameBase, const OUString& Comment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeToURL( const ::rtl::OUString& URL, const ::rtl::OUString& NameBase, - const ::rtl::OUString& Comment, const ::com::sun::star::uno::Reference + virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase, + const OUString& Comment, const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& Handler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary( ) @@ -665,9 +665,9 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XStringResourceWithLocation - virtual void SAL_CALL storeAsURL( const ::rtl::OUString& URL ) + virtual void SAL_CALL storeAsURL( const OUString& URL ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setURL( const ::rtl::OUString& URL ) + virtual void SAL_CALL setURL( const OUString& URL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); }; diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index a7b3e7584c1d..97fc38d6cb52 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -94,11 +94,11 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::uno; using namespace ::ooo::vba; -#define MAP_CHAR_LEN(x) ::rtl::OUString(x) +#define MAP_CHAR_LEN(x) OUString(x) #define GET_TYPE(x) ::getCppuType((uno::Reference< x > *)0); // Some constants -const static rtl::OUString DELIM("::"); +const static OUString DELIM("::"); const static sal_Int32 DELIMLEN = DELIM.getLength(); bool isKeyEventOk( awt::KeyEvent& evt, const Sequence< Any >& params ) @@ -191,22 +191,22 @@ typedef Sequence< Any > (*Translator)(const Sequence< Any >&); //expand the "TranslateInfo" struct to support more kinds of events struct TranslateInfo { - rtl::OUString sVBAName; //vba event name + OUString sVBAName; //vba event name Translator toVBA; //the method to convert OO event parameters to VBA event parameters bool (*ApproveRule)(const ScriptEvent& evt, void* pPara); //this method is used to determine which types of controls should execute the event void *pPara; //Parameters for the above approve method }; -typedef boost::unordered_map< rtl::OUString, +typedef boost::unordered_map< OUString, std::list< TranslateInfo >, -::rtl::OUStringHash, -::std::equal_to< ::rtl::OUString > > EventInfoHash; +OUStringHash, +::std::equal_to< OUString > > EventInfoHash; struct TranslatePropMap { - rtl::OUString sEventInfo; //OO event name + OUString sEventInfo; //OO event name TranslateInfo aTransInfo; }; @@ -288,7 +288,7 @@ EventInfoHash& getEventTransInfo() static EventInfoHash eventTransInfo; if ( !initialised ) { - rtl::OUString sEventInfo = MAP_CHAR_LEN(""); + OUString sEventInfo = MAP_CHAR_LEN(""); TranslatePropMap* pTransProp = aTranslatePropMap_Impl; int nCount = sizeof(aTranslatePropMap_Impl) / sizeof(aTranslatePropMap_Impl[0]); @@ -317,22 +317,22 @@ class ScriptEventHelper { public: ScriptEventHelper( const Reference< XInterface >& xControl ); - Sequence< ScriptEventDescriptor > createEvents( const rtl::OUString& sCodeName ); - Sequence< rtl::OUString > getEventListeners(); + Sequence< ScriptEventDescriptor > createEvents( const OUString& sCodeName ); + Sequence< OUString > getEventListeners(); private: Reference< XComponentContext > m_xCtx; Reference< XInterface > m_xControl; }; bool -eventMethodToDescriptor( const ::rtl::OUString& rEventMethod, ScriptEventDescriptor& evtDesc, const ::rtl::OUString& sCodeName ) +eventMethodToDescriptor( const OUString& rEventMethod, ScriptEventDescriptor& evtDesc, const OUString& sCodeName ) { // format of ControlListener is TypeName::methodname e.g. // "com.sun.star.awt.XActionListener::actionPerformed" or // "XActionListener::actionPerformed - ::rtl::OUString sMethodName; - ::rtl::OUString sTypeName; + OUString sMethodName; + OUString sTypeName; sal_Int32 nDelimPos = rEventMethod.indexOf( DELIM ); if ( nDelimPos == -1 ) { @@ -358,7 +358,7 @@ eventMethodToDescriptor( const ::rtl::OUString& rEventMethod, ScriptEventDescrip // set this it VBAInterop, ensures that it doesn't // get persisted or shown in property editors - evtDesc.ScriptType = rtl::OUString( + evtDesc.ScriptType = OUString( "VBAInterop" ); return true; } @@ -371,10 +371,10 @@ ScriptEventHelper::ScriptEventHelper( const Reference< XInterface >& xControl ): m_xControl( xControl ) {} -Sequence< rtl::OUString > +Sequence< OUString > ScriptEventHelper::getEventListeners() { - std::list< rtl::OUString > eventMethods; + std::list< OUString > eventMethods; Reference< beans::XIntrospection > xIntrospection = beans::Introspection::create( m_xCtx ); @@ -386,22 +386,22 @@ ScriptEventHelper::getEventListeners() for ( sal_Int32 i = 0; i< nLength; ++i ) { Type& listType = aControlListeners[ i ]; - rtl::OUString sFullTypeName = listType.getTypeName(); - Sequence< ::rtl::OUString > sMeths = + OUString sFullTypeName = listType.getTypeName(); + Sequence< OUString > sMeths = comphelper::getEventMethodsForType( listType ); sal_Int32 sMethLen = sMeths.getLength(); for ( sal_Int32 j=0 ; j < sMethLen; ++j ) { - rtl::OUString sEventMethod = sFullTypeName; + OUString sEventMethod = sFullTypeName; sEventMethod += DELIM; sEventMethod += sMeths[ j ]; eventMethods.push_back( sEventMethod ); } } - Sequence< rtl::OUString > sEventMethodNames( eventMethods.size() ); - std::list< rtl::OUString >::const_iterator it = eventMethods.begin(); - rtl::OUString* pDest = sEventMethodNames.getArray(); + Sequence< OUString > sEventMethodNames( eventMethods.size() ); + std::list< OUString >::const_iterator it = eventMethods.begin(); + OUString* pDest = sEventMethodNames.getArray(); for ( ; it != eventMethods.end(); ++it, ++pDest ) *pDest = *it; @@ -410,10 +410,10 @@ ScriptEventHelper::getEventListeners() } Sequence< ScriptEventDescriptor > -ScriptEventHelper::createEvents( const rtl::OUString& sCodeName ) +ScriptEventHelper::createEvents( const OUString& sCodeName ) { - Sequence< rtl::OUString > aControlListeners = getEventListeners(); - rtl::OUString* pSrc = aControlListeners.getArray(); + Sequence< OUString > aControlListeners = getEventListeners(); + OUString* pSrc = aControlListeners.getArray(); sal_Int32 nLength = aControlListeners.getLength(); Sequence< ScriptEventDescriptor > aDest( nLength ); @@ -445,47 +445,47 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > NameContainer_BASE; class ReadOnlyEventsNameContainer : public NameContainer_BASE { public: - ReadOnlyEventsNameContainer( const Sequence< rtl::OUString >& eventMethods, const rtl::OUString& sCodeName ); + ReadOnlyEventsNameContainer( const Sequence< OUString >& eventMethods, const OUString& sCodeName ); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException) + virtual void SAL_CALL insertByName( const OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException) { - throw RuntimeException( rtl::OUString("ReadOnly container"), Reference< XInterface >() ); + throw RuntimeException( OUString("ReadOnly container"), Reference< XInterface >() ); } - virtual void SAL_CALL removeByName( const ::rtl::OUString& ) throw (::com::sun::star::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) + virtual void SAL_CALL removeByName( const OUString& ) throw (::com::sun::star::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { - throw RuntimeException( rtl::OUString("ReadOnly container"), Reference< XInterface >() ); + throw RuntimeException( OUString("ReadOnly container"), Reference< XInterface >() ); } // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) + virtual void SAL_CALL replaceByName( const OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { - throw RuntimeException( rtl::OUString("ReadOnly container"), Reference< XInterface >() ); + throw RuntimeException( OUString("ReadOnly container"), Reference< XInterface >() ); } // XNameAccess - virtual Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (RuntimeException); + virtual Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (RuntimeException); // XElementAccess virtual Type SAL_CALL getElementType( ) throw (RuntimeException) - { return getCppuType(static_cast< const rtl::OUString * >(0) ); } + { return getCppuType(static_cast< const OUString * >(0) ); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException) { return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); } private: -typedef boost::unordered_map< rtl::OUString, Any, ::rtl::OUStringHash, -::std::equal_to< ::rtl::OUString > > EventSupplierHash; +typedef boost::unordered_map< OUString, Any, OUStringHash, +::std::equal_to< OUString > > EventSupplierHash; EventSupplierHash m_hEvents; }; -ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< rtl::OUString >& eventMethods, const rtl::OUString& sCodeName ) +ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< OUString >& eventMethods, const OUString& sCodeName ) { - const rtl::OUString* pSrc = eventMethods.getConstArray(); + const OUString* pSrc = eventMethods.getConstArray(); sal_Int32 nLen = eventMethods.getLength(); for ( sal_Int32 index = 0; index < nLen; ++index, ++pSrc ) { @@ -500,18 +500,18 @@ ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< rtl::O } Any SAL_CALL -ReadOnlyEventsNameContainer::getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException){ +ReadOnlyEventsNameContainer::getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException){ EventSupplierHash::const_iterator it = m_hEvents.find( aName ); if ( it == m_hEvents.end() ) throw container::NoSuchElementException(); return it->second; } -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL ReadOnlyEventsNameContainer::getElementNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > names(m_hEvents.size()); - rtl::OUString* pDest = names.getArray(); + Sequence< OUString > names(m_hEvents.size()); + OUString* pDest = names.getArray(); EventSupplierHash::const_iterator it = m_hEvents.begin(); EventSupplierHash::const_iterator it_end = m_hEvents.end(); for ( sal_Int32 index = 0; it != it_end; ++index, ++pDest, ++it ) @@ -520,7 +520,7 @@ ReadOnlyEventsNameContainer::getElementNames( ) throw (RuntimeException) } sal_Bool SAL_CALL -ReadOnlyEventsNameContainer::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException) +ReadOnlyEventsNameContainer::hasByName( const OUString& aName ) throw (RuntimeException) { EventSupplierHash::const_iterator it = m_hEvents.find( aName ); if ( it == m_hEvents.end() ) @@ -533,7 +533,7 @@ typedef ::cppu::WeakImplHelper1< XScriptEventsSupplier > EventsSupplier_BASE; class ReadOnlyEventsSupplier : public EventsSupplier_BASE { public: - ReadOnlyEventsSupplier( const Sequence< ::rtl::OUString >& eventMethods, const rtl::OUString& sCodeName ) + ReadOnlyEventsSupplier( const Sequence< OUString >& eventMethods, const OUString& sCodeName ) { m_xNameContainer = new ReadOnlyEventsNameContainer( eventMethods, sCodeName ); } // XScriptEventSupplier @@ -545,7 +545,7 @@ private: typedef ::cppu::WeakImplHelper3< XScriptListener, util::XCloseListener, lang::XInitialization > EventListener_BASE; #define EVENTLSTNR_PROPERTY_ID_MODEL 1 -#define EVENTLSTNR_PROPERTY_MODEL ::rtl::OUString( "Model" ) +#define EVENTLSTNR_PROPERTY_MODEL OUString( "Model" ) class EventListener : public EventListener_BASE ,public ::comphelper::OMutexAndBroadcastHelper @@ -619,7 +619,7 @@ private: Reference< frame::XModel > m_xModel; bool m_bDocClosed; SfxObjectShell* mpShell; - rtl::OUString msProject; + OUString msProject; }; EventListener::EventListener( const Reference< XComponentContext >& rxContext ) : @@ -627,7 +627,7 @@ OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed( { registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL, beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) ); - msProject = rtl::OUString("Standard"); + msProject = OUString("Standard"); } void @@ -649,7 +649,7 @@ EventListener::setShellFromModel() try { uno::Reference< beans::XPropertySet > xProps( m_xModel, UNO_QUERY_THROW ); - uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); msProject = xVBAMode->getProjectName(); } catch ( uno::Exception& ) {} @@ -834,18 +834,18 @@ void EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeException) { OSL_TRACE("EventListener::firing_Impl( FAKE VBA_EVENTS )"); - static const ::rtl::OUString vbaInterOp = - ::rtl::OUString("VBAInterop"); + static const OUString vbaInterOp = + OUString("VBAInterop"); // let default handlers deal with non vba stuff if ( !evt.ScriptType.equals( vbaInterOp ) ) return; lang::EventObject aEvent; evt.Arguments[ 0 ] >>= aEvent; - OSL_TRACE("evt.MethodName is %s", rtl::OUStringToOString( evt.MethodName, RTL_TEXTENCODING_UTF8 ).getStr() ); - OSL_TRACE("Argument[0] is %s", rtl::OUStringToOString( comphelper::anyToString( evt.Arguments[0] ), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("evt.MethodName is %s", OUStringToOString( evt.MethodName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Argument[0] is %s", OUStringToOString( comphelper::anyToString( evt.Arguments[0] ), RTL_TEXTENCODING_UTF8 ).getStr() ); OSL_TRACE("Getting Control"); - rtl::OUString sName = rtl::OUString( "UserForm" ); + OUString sName = OUString( "UserForm" ); OSL_TRACE("Getting Name"); uno::Reference< awt::XDialog > xDlg( aEvent.Source, uno::UNO_QUERY ); @@ -877,7 +877,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce uno::Reference< beans::XPropertySet > xProps; OSL_TRACE("Getting properties"); xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( rtl::OUString( "Name" ) ) >>= sName; + xProps->getPropertyValue( OUString( "Name" ) ) >>= sName; } } //dumpEvent( evt ); @@ -887,7 +887,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce if ( eventInfo_it == it_end ) { OSL_TRACE("Bogus event for %s", - rtl::OUStringToOString( evt.ScriptType, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( evt.ScriptType, RTL_TEXTENCODING_UTF8 ).getStr() ); return; } @@ -904,13 +904,13 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce std::list< TranslateInfo >::const_iterator txInfo_end = eventInfo_it->second.end(); BasicManager* pBasicManager = mpShell->GetBasicManager(); - rtl::OUString sProject; - rtl::OUString sScriptCode( evt.ScriptCode ); + OUString sProject; + OUString sScriptCode( evt.ScriptCode ); // dialogs pass their own library, presence of Dot determines that if ( sScriptCode.indexOf( '.' ) == -1 ) { //'Project' is a better default but I want to force failures - //rtl::OUString sMacroLoc("Project"); + //OUString sMacroLoc("Project"); sProject = "Standard"; if (!pBasicManager->GetName().isEmpty()) @@ -924,11 +924,11 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce sProject = sScriptCode.copy( 0, nIndex ); sScriptCode = sScriptCode.copy( nIndex + 1 ); } - rtl::OUString sMacroLoc = sProject; - sMacroLoc = sMacroLoc.concat( rtl::OUString(".") ); - sMacroLoc = sMacroLoc.concat( sScriptCode ).concat( rtl::OUString(".") ); + OUString sMacroLoc = sProject; + sMacroLoc = sMacroLoc.concat( OUString(".") ); + sMacroLoc = sMacroLoc.concat( sScriptCode ).concat( OUString(".") ); - OSL_TRACE("sMacroLoc is %s", rtl::OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("sMacroLoc is %s", OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() ); for ( ; txInfo != txInfo_end; ++txInfo ) { // If the document is closed, we should not execute macro. @@ -937,13 +937,13 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce break; } - rtl::OUString sTemp = sName.concat( (*txInfo).sVBAName ); + OUString sTemp = sName.concat( (*txInfo).sVBAName ); // see if we have a match for the handlerextension // where ScriptCode is methodname_handlerextension - rtl::OUString sToResolve = sMacroLoc.concat( sTemp ); + OUString sToResolve = sMacroLoc.concat( sTemp ); OSL_TRACE("*** trying to invoke %s ", - rtl::OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() ); ooo::vba::MacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve ); if ( aMacroResolvedInfo.mbFound ) { @@ -968,14 +968,14 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce // call basic event handlers for event // create script url - rtl::OUString url = aMacroResolvedInfo.msResolvedMacro; + OUString url = aMacroResolvedInfo.msResolvedMacro; OSL_TRACE("resolved script = %s", - rtl::OUStringToOString( url, + OUStringToOString( url, RTL_TEXTENCODING_UTF8 ).getStr() ); try { - uno::Any aDummyCaller = uno::makeAny( rtl::OUString("Error") ); + uno::Any aDummyCaller = uno::makeAny( OUString("Error") ); if ( pRet ) { ooo::vba::executeMacro( mpShell, url, aArguments, *pRet, aDummyCaller ); @@ -988,7 +988,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce } catch ( uno::Exception& e ) { - OSL_TRACE("event script raised %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("event script raised %s", OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } } @@ -1005,8 +1005,8 @@ public: VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext ); // XVBAToOOEventDescGen - virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const Reference< XInterface >& control, const rtl::OUString& sCodeName ) throw (RuntimeException); - virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException); + virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const Reference< XInterface >& control, const OUString& sCodeName ) throw (RuntimeException); + virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException); private: Reference< XComponentContext > m_xContext; @@ -1015,14 +1015,14 @@ private: VBAToOOEventDescGen::VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext ):m_xContext( rxContext ) {} Sequence< ScriptEventDescriptor > SAL_CALL -VBAToOOEventDescGen::getEventDescriptions( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName ) throw (RuntimeException) +VBAToOOEventDescGen::getEventDescriptions( const Reference< XInterface >& xControl, const OUString& sCodeName ) throw (RuntimeException) { ScriptEventHelper evntHelper( xControl ); return evntHelper.createEvents( sCodeName ); } Reference< XScriptEventsSupplier > SAL_CALL -VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException) +VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException) { ScriptEventHelper evntHelper( xControl ); Reference< XScriptEventsSupplier > xSupplier = @@ -1035,15 +1035,15 @@ VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, namespace evtlstner { - ::rtl::OUString SAL_CALL getImplementationName() + OUString SAL_CALL getImplementationName() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "ooo.vba.EventListener" ); + static OUString aImplName( "ooo.vba.EventListener" ); pImplName = &aImplName; } } @@ -1057,23 +1057,23 @@ namespace evtlstner return static_cast< lang::XTypeProvider * >( new EventListener( xContext ) ); } - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + Sequence< OUString > SAL_CALL getSupportedServiceNames() { - const ::rtl::OUString strName( ::evtlstner::getImplementationName() ); - return Sequence< ::rtl::OUString >( &strName, 1 ); + const OUString strName( ::evtlstner::getImplementationName() ); + return Sequence< OUString >( &strName, 1 ); } } namespace ooevtdescgen { - ::rtl::OUString SAL_CALL getImplementationName() + OUString SAL_CALL getImplementationName() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "ooo.vba.VBAToOOEventDesc" ); + static OUString aImplName( "ooo.vba.VBAToOOEventDesc" ); pImplName = &aImplName; } } @@ -1087,10 +1087,10 @@ namespace ooevtdescgen return static_cast< lang::XTypeProvider * >( new VBAToOOEventDescGen( xContext ) ); } - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + Sequence< OUString > SAL_CALL getSupportedServiceNames() { - const ::rtl::OUString strName( ::ooevtdescgen::getImplementationName() ); - return Sequence< ::rtl::OUString >( &strName, 1 ); + const OUString strName( ::ooevtdescgen::getImplementationName() ); + return Sequence< OUString >( &strName, 1 ); } } diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index 11b51d0189dd..07a7f19277fd 100644 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx @@ -39,9 +39,9 @@ namespace evtlstner // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL getImplementationName(); + OUString SAL_CALL getImplementationName(); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(); + Sequence< OUString > SAL_CALL getSupportedServiceNames(); Reference SAL_CALL create( Sequence const &, Reference const & ); @@ -59,9 +59,9 @@ namespace ooevtdescgen // ----------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL getImplementationName(); + OUString SAL_CALL getImplementationName(); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(); + Sequence< OUString > SAL_CALL getSupportedServiceNames(); Reference SAL_CALL create( Sequence const &, Reference const & ); diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index 0cea04fe568e..da337cd84e33 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -72,9 +72,9 @@ public: CustomAnimationEffectPtr clone() const; // attributes - const rtl::OUString& getPresetId() const { return maPresetId; } - const rtl::OUString& getPresetSubType() const { return maPresetSubType; } - const rtl::OUString& getProperty() const { return maProperty; } + const OUString& getPresetId() const { return maPresetId; } + const OUString& getPresetSubType() const { return maPresetSubType; } + const OUString& getProperty() const { return maProperty; } sal_Int16 getPresetClass() const { return mnPresetClass; } void setPresetClass( sal_Int16 nPresetClass ); @@ -135,8 +135,8 @@ public: sal_Bool getAutoReverse() const { return mbAutoReverse; } void setAutoReverse( sal_Bool bAutoReverse ); - ::com::sun::star::uno::Any getProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue ); - bool setProperty( sal_Int32 nNodeType, const rtl::OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue ); + ::com::sun::star::uno::Any getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue ); + bool setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue ); ::com::sun::star::uno::Any getTransformationProperty( sal_Int32 nTransformType, EValue eValue ); bool setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const ::com::sun::star::uno::Any& rValue ); @@ -153,8 +153,8 @@ public: sal_Int16 getTargetSubItem() const { return mnTargetSubItem; } SD_DLLPUBLIC void setTargetSubItem( sal_Int16 nSubItem ); - ::rtl::OUString getPath() const; - void setPath( const ::rtl::OUString& rPath ); + OUString getPath() const; + void setPath( const OUString& rPath ); bool checkForText(); bool calculateIterateDuration(); @@ -185,9 +185,9 @@ protected: private: sal_Int16 mnNodeType; - rtl::OUString maPresetId; - rtl::OUString maPresetSubType; - rtl::OUString maProperty; + OUString maPresetId; + OUString maPresetSubType; + OUString maProperty; sal_Int16 mnPresetClass; double mfBegin; double mfDuration; // this is the maximum duration of the subeffects @@ -291,7 +291,7 @@ public: SD_DLLPUBLIC void append( const CustomAnimationEffectPtr& pEffect ); void insert( EffectSequence::iterator& rPos, const CustomAnimationEffectPtr& pEffect ); void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, double fDuration = -1.0 ); - void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const rtl::OUString& rPresetSubType, double fDuration = -1.0 ); + void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const OUString& rPresetSubType, double fDuration = -1.0 ); void remove( const CustomAnimationEffectPtr& pEffect ); void create( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index dd1836304d3c..49092161322f 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -31,9 +31,9 @@ namespace sd { -typedef boost::unordered_map< rtl::OUString, CustomAnimationEffectPtr, rtl::OUStringHash, comphelper::UStringEqual > EffectsSubTypeMap; -typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, comphelper::UStringEqual > UStringMap; -typedef std::vector< rtl::OUString > UStringList; +typedef boost::unordered_map< OUString, CustomAnimationEffectPtr, OUStringHash, comphelper::UStringEqual > EffectsSubTypeMap; +typedef boost::unordered_map< OUString, OUString, OUStringHash, comphelper::UStringEqual > UStringMap; +typedef std::vector< OUString > UStringList; class CustomAnimationPreset { @@ -44,26 +44,26 @@ public: void add( CustomAnimationEffectPtr pEffect ); - SD_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > create( const rtl::OUString& rstrSubType ); + SD_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > create( const OUString& rstrSubType ); - const rtl::OUString& getPresetId() const { return maPresetId; } - const rtl::OUString& getProperty() const { return maProperty; } - const rtl::OUString& getLabel() const { return maLabel; } + const OUString& getPresetId() const { return maPresetId; } + const OUString& getProperty() const { return maProperty; } + const OUString& getLabel() const { return maLabel; } sal_Int16 getPresetClass() const { return mnPresetClass; } double getDuration() const { return mfDuration; } UStringList getSubTypes(); UStringList getProperties() const; - bool hasProperty( const rtl::OUString& rProperty ) const; + bool hasProperty( const OUString& rProperty ) const; bool isTextOnly() const { return mbIsTextOnly; } private: - rtl::OUString maPresetId; - rtl::OUString maProperty; + OUString maPresetId; + OUString maProperty; sal_Int16 mnPresetClass; - rtl::OUString maLabel; - rtl::OUString maDefaultSubTyp; + OUString maLabel; + OUString maDefaultSubTyp; double mfDuration; bool mbIsTextOnly; @@ -71,15 +71,15 @@ private: }; typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr; -typedef boost::unordered_map EffectDescriptorMap; +typedef boost::unordered_map EffectDescriptorMap; typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList; struct PresetCategory { - rtl::OUString maLabel; + OUString maLabel; EffectDescriptorList maEffects; - PresetCategory( const rtl::OUString& rLabel, const EffectDescriptorList& rEffects ) + PresetCategory( const OUString& rLabel, const EffectDescriptorList& rEffects ) : maLabel( rLabel ), maEffects( rEffects ) {} }; typedef boost::shared_ptr< PresetCategory > PresetCategoryPtr; @@ -97,10 +97,10 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getRandomPreset( sal_Int16 nPresetClass ) const; - SD_DLLPUBLIC CustomAnimationPresetPtr getEffectDescriptor( const rtl::OUString& rPresetId ) const; + SD_DLLPUBLIC CustomAnimationPresetPtr getEffectDescriptor( const OUString& rPresetId ) const; - const rtl::OUString& getUINameForPresetId( const rtl::OUString& rPresetId ) const; - const rtl::OUString& getUINameForProperty( const rtl::OUString& rProperty ) const; + const OUString& getUINameForPresetId( const OUString& rPresetId ) const; + const OUString& getUINameForProperty( const OUString& rProperty ) const; const PresetCategoryList& getEntrancePresets() const { return maEntrancePresets; } const PresetCategoryList& getEmphasisPresets() const { return maEmphasisPresets; } @@ -108,15 +108,15 @@ public: const PresetCategoryList& getMotionPathsPresets() const { return maMotionPathsPresets; } const PresetCategoryList& getMiscPresets() const { return maMiscPresets; } - void changePresetSubType( CustomAnimationEffectPtr pEffect, const rtl::OUString& rPresetSubType ) const; + void changePresetSubType( CustomAnimationEffectPtr pEffect, const OUString& rPresetSubType ) const; private: void importEffects(); void importResources(); - void importPresets( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xConfigProvider, const rtl::OUString& rNodePath, PresetCategoryList& rPresetMap ); + void importPresets( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath, PresetCategoryList& rPresetMap ); - const rtl::OUString& translateName( const rtl::OUString& rId, const UStringMap& rNameMap ) const; + const OUString& translateName( const OUString& rId, const UStringMap& rNameMap ) const; private: ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxRootNode; diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx index 511cec499568..2387d4390491 100644 --- a/sd/inc/EffectMigration.hxx +++ b/sd/inc/EffectMigration.hxx @@ -41,8 +41,8 @@ public: static ::com::sun::star::presentation::AnimationSpeed ConvertDuration( double fDuration ); static double ConvertAnimationSpeed( ::com::sun::star::presentation::AnimationSpeed eSpeed ); - static bool ConvertPreset( const ::rtl::OUString& rPresetId, const ::rtl::OUString* pPresetSubType, ::com::sun::star::presentation::AnimationEffect& rEffect ); - static bool ConvertAnimationEffect( const ::com::sun::star::presentation::AnimationEffect& rEffect, ::rtl::OUString& rPresetId, ::rtl::OUString& rPresetSubType ); + static bool ConvertPreset( const OUString& rPresetId, const OUString* pPresetSubType, ::com::sun::star::presentation::AnimationEffect& rEffect ); + static bool ConvertAnimationEffect( const ::com::sun::star::presentation::AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType ); public: void AddEffectFromAnimationInfo( SdrObject* pObject, SdAnimationInfo* pInfo ); @@ -67,7 +67,7 @@ public: static void SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos ); static sal_Int32 GetPresentationOrder( SvxShape* pShape ); static void UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInfo ); - static ::rtl::OUString GetSoundFile( SvxShape* pShape ); + static OUString GetSoundFile( SvxShape* pShape ); static sal_Bool GetSoundOn( SvxShape* pShape ); static void SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj ); diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx index ae5fe218e5ad..7010a3394647 100644 --- a/sd/inc/TransitionPreset.hxx +++ b/sd/inc/TransitionPreset.hxx @@ -41,7 +41,7 @@ namespace sd { class TransitionPreset; typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr; typedef std::list< TransitionPresetPtr > TransitionPresetList; -typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, comphelper::UStringEqual > UStringMap; +typedef boost::unordered_map< OUString, OUString, OUStringHash, comphelper::UStringEqual > UStringMap; class TransitionPreset { @@ -56,8 +56,8 @@ public: sal_Bool getDirection() const { return mbDirection; } sal_Int32 getFadeColor() const { return mnFadeColor; } - const rtl::OUString& getUIName() const { return maUIName; } - const rtl::OUString& getPresetId() const { return maPresetId; } + const OUString& getUIName() const { return maUIName; } + const OUString& getPresetId() const { return maPresetId; } private: TransitionPreset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); @@ -66,8 +66,8 @@ private: sal_Int16 mnSubtype; sal_Bool mbDirection; sal_Int32 mnFadeColor; - rtl::OUString maPresetId; - rtl::OUString maUIName; + OUString maPresetId; + OUString maUIName; static bool importTransitionsFile( TransitionPresetList& rList, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index d9b96793e28a..77ac6b676b2a 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -112,7 +112,7 @@ namespace sd { struct PresentationSettings { - rtl::OUString maPresPage; + OUString maPresPage; sal_Bool mbAll; sal_Bool mbEndless; sal_Bool mbCustomShow; @@ -186,7 +186,7 @@ private: DECL_LINK(OnlineSpellingHdl, void *); DECL_LINK(OnlineSpellEventHdl, EditStatus*); - std::vector< rtl::OUString > maAnnotationAuthors; + std::vector< OUString > maAnnotationAuthors; bool mbUseEmbedFonts; @@ -249,8 +249,8 @@ public: SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const String& rBookmarkFile); SdDrawDocument* OpenBookmarkDoc(SfxMedium& rMedium); - sal_Bool InsertBookmark(const std::vector &rBookmarkList, - std::vector &rExchangeList, sal_Bool bLink, + sal_Bool InsertBookmark(const std::vector &rBookmarkList, + std::vector &rExchangeList, sal_Bool bLink, sal_Bool bReplace, sal_uInt16 nPgPos, sal_Bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh, sal_Bool bCopy, Point* pObjPos); @@ -304,15 +304,15 @@ public: page, or preserve the old name */ - sal_Bool InsertBookmarkAsPage(const std::vector &rBookmarkList, - std::vector *pExchangeList, + sal_Bool InsertBookmarkAsPage(const std::vector &rBookmarkList, + std::vector *pExchangeList, sal_Bool bLink, sal_Bool bReplace, sal_uInt16 nPgPos, sal_Bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh, sal_Bool bCopy, sal_Bool bMergeMasterPages, sal_Bool bPreservePageNames); - sal_Bool InsertBookmarkAsObject(const std::vector &rBookmarkList, - const std::vector &rExchangeList, + sal_Bool InsertBookmarkAsObject(const std::vector &rBookmarkList, + const std::vector &rExchangeList, sal_Bool bLink, ::sd::DrawDocShell* pBookmarkDocSh, Point* pObjPos, bool bCalcObjCount = false); @@ -557,7 +557,7 @@ public: void SetCalcFieldValueHdl( ::Outliner* pOutliner); - sal_uInt16 GetAnnotationAuthorIndex( const rtl::OUString& rAuthor ); + sal_uInt16 GetAnnotationAuthorIndex( const OUString& rAuthor ); bool IsUsingEmbededFonts() { return mbUseEmbedFonts; } void SetIsUsingEmbededFonts( bool bUse ) { mbUseEmbedFonts = bUse; } diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 4051149257d1..21c78b7aadba 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -110,7 +110,7 @@ class AbstractSdInsertLayerDlg : public VclAbstractDialog //add for SdInsertLay public: virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; //from class ::Window - virtual void SetHelpId( const rtl::OString& rHelpId ) = 0; + virtual void SetHelpId( const OString& rHelpId ) = 0; }; class AbstractSdInsertPasteDlg : public VclAbstractDialog //add for SdInsertPasteDlg @@ -123,7 +123,7 @@ class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInser { public: virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer - virtual std::vector GetList ( const sal_uInt16 nType ) = 0; + virtual std::vector GetList ( const sal_uInt16 nType ) = 0; virtual sal_Bool IsLink() = 0; virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0; }; diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 73886ba1fc4f..6bcbcf20e2b0 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -52,7 +52,7 @@ public: class SdAttrLayerTitle : public SfxStringItem { public: - SdAttrLayerTitle() : SfxStringItem( ATTR_LAYER_TITLE, rtl::OUString()) {} + SdAttrLayerTitle() : SfxStringItem( ATTR_LAYER_TITLE, OUString()) {} SdAttrLayerTitle( const String& aStr ) : SfxStringItem( ATTR_LAYER_TITLE, aStr ) {} }; @@ -61,7 +61,7 @@ public: class SdAttrLayerDesc : public SfxStringItem { public: - SdAttrLayerDesc() : SfxStringItem( ATTR_LAYER_DESC, rtl::OUString()) {} + SdAttrLayerDesc() : SfxStringItem( ATTR_LAYER_DESC, OUString()) {} SdAttrLayerDesc( const String& aStr ) : SfxStringItem( ATTR_LAYER_DESC, aStr ) {} }; diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx index 5dc9502dfa8e..beca2badc741 100644 --- a/sd/inc/sdfilter.hxx +++ b/sd/inc/sdfilter.hxx @@ -58,13 +58,13 @@ protected: sal_Bool mbIsDraw : 1; sal_Bool mbShowProgress : 1; #ifndef DISABLE_DYNLOADING - ::osl::Module* OpenLibrary( const ::rtl::OUString& rLibraryName ) const; + ::osl::Module* OpenLibrary( const OUString& rLibraryName ) const; #endif void CreateStatusIndicator(); private: - ::rtl::OUString ImplGetFullLibraryName( const ::rtl::OUString& rLibraryName ) const; + OUString ImplGetFullLibraryName( const OUString& rLibraryName ) const; }; diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx index bc8f1d71c292..2035fa6d934b 100644 --- a/sd/inc/sdundo.hxx +++ b/sd/inc/sdundo.hxx @@ -34,7 +34,7 @@ public: virtual ~SdUndoAction() {} void SetComment(String& rStr) { maComment = rStr; } - virtual rtl::OUString GetComment() const { return maComment; } + virtual OUString GetComment() const { return maComment; } virtual SdUndoAction* Clone() const { return NULL; } protected: diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx index 0adf85fc3182..24f27dfaa78a 100644 --- a/sd/inc/stlfamily.hxx +++ b/sd/inc/stlfamily.hxx @@ -55,18 +55,18 @@ public: virtual ~SdStyleFamily(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException); // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException); // XElementAccess virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException); @@ -77,11 +77,11 @@ public: virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); // XSingleServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) throw(css::uno::Exception, css::uno::RuntimeException); @@ -94,17 +94,17 @@ public: // XPropertySet virtual css::uno::Reference SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, const css::uno::Reference& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName,const css::uno::Reference&aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,const css::uno::Reference&aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); private: void throwIfDisposed() const throw(css::uno::RuntimeException); SdStyleSheet* GetValidNewSheet( const css::uno::Any& rElement ) throw(css::lang::IllegalArgumentException); - SdStyleSheet* GetSheetByName( const ::rtl::OUString& rName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException ); + SdStyleSheet* GetSheetByName( const OUString& rName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException ); SfxStyleFamily mnFamily; rtl::Reference< SfxStyleSheetPool > mxPool; diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 294dec2912e8..624d5da15a02 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -97,14 +97,14 @@ public: void throwIfDisposed() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); @@ -141,7 +141,7 @@ private: SdStyleFamilyRef mxCellFamily; SdStyleFamilyMap maStyleFamilyMap; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxTableFamily; - rtl::OUString msTableFamilyName; + OUString msTableFamilyName; }; #endif // _SD_STLPOOL_HXX diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 84762222a7b7..5a9662c28747 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -51,7 +51,7 @@ typedef cppu::ImplInheritanceHelper5< SfxUnoStyleSheet, class SdStyleSheet : public SdStyleSheetBase, private ::cppu::BaseMutex { public: - SdStyleSheet( const rtl::OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask ); + SdStyleSheet( const OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask ); SdStyleSheet( const SdStyleSheet& ); virtual bool SetParent (const String& rParentName); @@ -68,10 +68,10 @@ public: SdStyleSheet* GetRealStyleSheet() const; SdStyleSheet* GetPseudoStyleSheet() const; - void SetApiName( const ::rtl::OUString& rApiName ); - rtl::OUString GetApiName() const; + void SetApiName( const OUString& rApiName ); + OUString GetApiName() const; - static rtl::OUString GetFamilyString( SfxStyleFamily eFamily ); + static OUString GetFamilyString( SfxStyleFamily eFamily ); static SdStyleSheet* CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily ); @@ -79,34 +79,34 @@ public: virtual void SAL_CALL release( ) throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XStyle virtual sal_Bool SAL_CALL isUserDefined( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isInUse( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getParentStyle( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getParentStyle( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -120,7 +120,7 @@ public: void notifyModifyListener(); protected: - const SfxItemPropertySimpleEntry* getPropertyMapEntry( const ::rtl::OUString& rPropertyName ) const throw(); + const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName ) const throw(); virtual void Load (SvStream& rIn, sal_uInt16 nVersion); virtual void Store(SvStream& rOut); @@ -132,7 +132,7 @@ protected: virtual void disposing(); - rtl::OUString msApiName; + OUString msApiName; rtl::Reference< SfxStyleSheetBasePool > mxPool; /** boradcast helper for events */ diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h index 1122abe78f6e..6ae356a20135 100644 --- a/sd/inc/strmname.h +++ b/sd/inc/strmname.h @@ -21,13 +21,13 @@ #define _SD_STRMNAME_H // PowerPoint-Filter -static const rtl::OUString pFilterPowerPoint97( "MS PowerPoint 97" ); -static const rtl::OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" ); -static const rtl::OUString pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" ); +static const OUString pFilterPowerPoint97( "MS PowerPoint 97" ); +static const OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" ); +static const OUString pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" ); // XML content stream -static const rtl::OUString pStarDrawXMLContent( "content.xml" ); -static const rtl::OUString pStarDrawOldXMLContent( "Content.xml" ); +static const OUString pStarDrawXMLContent( "content.xml" ); +static const OUString pStarDrawOldXMLContent( "Content.xml" ); #endif // _SD_STRMNAME_H diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx index 3fe7855b17e3..04322224a6be 100644 --- a/sd/inc/undoanim.hxx +++ b/sd/inc/undoanim.hxx @@ -43,7 +43,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: boost::scoped_ptr mpImpl; @@ -59,7 +59,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: boost::scoped_ptr mpImpl; @@ -76,7 +76,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: boost::scoped_ptr mpImpl; diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx index a834686b48e7..bcec85035f95 100644 --- a/sd/qa/unit/filters-test.cxx +++ b/sd/qa/unit/filters-test.cxx @@ -61,9 +61,9 @@ class SdFiltersTest public: SdFiltersTest(); - ::sd::DrawDocShellRef loadURL( const rtl::OUString &rURL ); - virtual bool load( const rtl::OUString &rFilter, - const rtl::OUString &rURL, const rtl::OUString &rUserData, + ::sd::DrawDocShellRef loadURL( const OUString &rURL ); + virtual bool load( const OUString &rFilter, + const OUString &rURL, const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion); @@ -98,7 +98,7 @@ FileFormat aFileFormats[] = { { 0, 0, 0, 0 } }; -::sd::DrawDocShellRef SdFiltersTest::loadURL( const rtl::OUString &rURL ) +::sd::DrawDocShellRef SdFiltersTest::loadURL( const OUString &rURL ) { FileFormat *pFmt = NULL; @@ -114,11 +114,11 @@ FileFormat aFileFormats[] = { if (pFmt->nFormatType) nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS; SfxFilter* aFilter = new SfxFilter( - rtl::OUString::createFromAscii( pFmt->pFilterName ), - rtl::OUString(), pFmt->nFormatType, nFormat, - rtl::OUString::createFromAscii( pFmt->pTypeName ), - 0, rtl::OUString(), rtl::OUString(), /* userdata */ - rtl::OUString("private:factory/sdraw*") ); + OUString::createFromAscii( pFmt->pFilterName ), + OUString(), pFmt->nFormatType, nFormat, + OUString::createFromAscii( pFmt->pTypeName ), + 0, OUString(), OUString(), /* userdata */ + OUString("private:factory/sdraw*") ); aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -181,14 +181,14 @@ void SdFiltersTest::testN778859() } } -bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, +bool SdFiltersTest::load(const OUString &rFilter, const OUString &rURL, + const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion) { SfxFilter aFilter( rFilter, - rtl::OUString(), nFilterFlags, nClipboardID, rtl::OUString(), 0, rtl::OUString(), - rUserData, rtl::OUString() ); + OUString(), nFilterFlags, nClipboardID, OUString(), 0, OUString(), + rUserData, OUString() ); aFilter.SetVersion(nFilterVersion); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -202,13 +202,13 @@ bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL void SdFiltersTest::testCVEs() { #ifndef DISABLE_CVE_TESTS - testDir(rtl::OUString("MS PowerPoint 97"), + testDir(OUString("MS PowerPoint 97"), getURLFromSrc("/sd/qa/unit/data/ppt/"), - rtl::OUString("sdfilt")); + OUString("sdfilt")); - testDir(rtl::OUString("draw8"), + testDir(OUString("draw8"), getURLFromSrc("/sd/qa/unit/data/odg/"), - rtl::OUString("sdfilt")); + OUString("sdfilt")); #endif } diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx index a19a0566a008..2bda506d717e 100644 --- a/sd/qa/unit/regression-test.cxx +++ b/sd/qa/unit/regression-test.cxx @@ -75,9 +75,9 @@ class SdFiltersTest public: SdFiltersTest(); - ::sd::DrawDocShellRef loadURL( const rtl::OUString &rURL ); - virtual bool load( const rtl::OUString &rFilter, - const rtl::OUString &rURL, const rtl::OUString &rUserData, + ::sd::DrawDocShellRef loadURL( const OUString &rURL ); + virtual bool load( const OUString &rFilter, + const OUString &rURL, const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion); @@ -97,7 +97,7 @@ public: private: uno::Reference m_xFilter; uno::Reference m_xDrawComponent; - void testStuff(::sd::DrawDocShellRef xDocShRef, const rtl::OString& fileNameBase); + void testStuff(::sd::DrawDocShellRef xDocShRef, const OString& fileNameBase); }; #define PPTX_FORMAT_TYPE 268959811 @@ -114,7 +114,7 @@ FileFormat aFileFormats[] = { { 0, 0, 0, 0 } }; -::sd::DrawDocShellRef SdFiltersTest::loadURL( const rtl::OUString &rURL ) +::sd::DrawDocShellRef SdFiltersTest::loadURL( const OUString &rURL ) { FileFormat *pFmt(0); @@ -130,11 +130,11 @@ FileFormat aFileFormats[] = { if (pFmt->nFormatType) nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS; SfxFilter* aFilter = new SfxFilter( - rtl::OUString::createFromAscii( pFmt->pFilterName ), - rtl::OUString(), pFmt->nFormatType, nFormat, - rtl::OUString::createFromAscii( pFmt->pTypeName ), - 0, rtl::OUString(), rtl::OUString(), /* userdata */ - rtl::OUString("private:factory/simpress*") ); + OUString::createFromAscii( pFmt->pFilterName ), + OUString(), pFmt->nFormatType, nFormat, + OUString::createFromAscii( pFmt->pTypeName ), + 0, OUString(), OUString(), /* userdata */ + OUString("private:factory/simpress*") ); aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -154,7 +154,7 @@ void SdFiltersTest::test() { { ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/odp/shapes-test.odp")); - testStuff(xDocShRef, rtl::OUStringToOString(getPathFromSrc("/sd/qa/unit/data/xml/shapes-test_page"), RTL_TEXTENCODING_UTF8)); + testStuff(xDocShRef, OUStringToOString(getPathFromSrc("/sd/qa/unit/data/xml/shapes-test_page"), RTL_TEXTENCODING_UTF8)); } /* { @@ -206,10 +206,10 @@ void SdFiltersTest::testFdo47434() // The problem was the arrow that has cy < 180 and flipH = 0 is rendered incorrectly. // Its height should be 1, not negative. ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/fdo47434-all.pptx")); - testStuff(xDocShRef, rtl::OUStringToOString(getPathFromSrc("/sd/qa/unit/data/pptx/xml/fdo47434_page"), RTL_TEXTENCODING_UTF8)); + testStuff(xDocShRef, OUStringToOString(getPathFromSrc("/sd/qa/unit/data/pptx/xml/fdo47434_page"), RTL_TEXTENCODING_UTF8)); } -void SdFiltersTest::testStuff(::sd::DrawDocShellRef xDocShRef, const rtl::OString& fileNameBase) +void SdFiltersTest::testStuff(::sd::DrawDocShellRef xDocShRef, const OString& fileNameBase) { CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() ); CPPUNIT_ASSERT_MESSAGE( "not in destruction", !xDocShRef->IsInDestruction() ); @@ -223,39 +223,39 @@ void SdFiltersTest::testStuff(::sd::DrawDocShellRef xDocShRef, const rtl::OStrin XShapeDumper xShapeDumper; sal_Int32 nLength = xDrawPages->getCount(); - rtl::OString aFileNameExt(".xml"); + OString aFileNameExt(".xml"); for (sal_Int32 i = 0; i < nLength; ++i) { uno::Reference xDrawPage; uno::Any aAny = xDrawPages->getByIndex(i); aAny >>= xDrawPage; uno::Reference< drawing::XShapes > xShapes(xDrawPage, uno::UNO_QUERY_THROW); - rtl::OUString aString = xShapeDumper.dump(xShapes); - rtl::OStringBuffer aFileNameBuf(fileNameBase); + OUString aString = xShapeDumper.dump(xShapes); + OStringBuffer aFileNameBuf(fileNameBase); aFileNameBuf.append(i); aFileNameBuf.append(aFileNameExt); - rtl::OString aFileName = aFileNameBuf.makeStringAndClear(); + OString aFileName = aFileNameBuf.makeStringAndClear(); std::cout << aString << std::endl; doXMLDiff(aFileName.getStr(), - rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr(), static_cast(aString.getLength()), - rtl::OUStringToOString( + OUStringToOString( getPathFromSrc("/sd/qa/unit/data/tolerance.xml"), RTL_TEXTENCODING_UTF8).getStr()); } xDocShRef->DoClose(); } -bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, +bool SdFiltersTest::load(const OUString &rFilter, const OUString &rURL, + const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion) { SfxFilter aFilter( rFilter, - rtl::OUString(), nFilterFlags, nClipboardID, rtl::OUString(), 0, rtl::OUString(), - rUserData, rtl::OUString() ); + OUString(), nFilterFlags, nClipboardID, OUString(), 0, OUString(), + rUserData, OUString() ); aFilter.SetVersion(nFilterVersion); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -277,7 +277,7 @@ void SdFiltersTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xDrawComponent = - getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Draw.PresentationDocument")); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Draw.PresentationDocument")); CPPUNIT_ASSERT_MESSAGE("no impress component!", m_xDrawComponent.is()); } diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index 3ea6f70ecc65..60e06570070a 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -52,8 +52,6 @@ using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::container; -using ::rtl::OUString; -using ::rtl::OString; using ::com::sun::star::drawing::XShape; using ::com::sun::star::beans::NamedValue; @@ -131,7 +129,7 @@ namespace sd OSL_FAIL( OString(OString("sd::CustomAnimationClonerImpl::Clone(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); @@ -215,7 +213,7 @@ namespace sd OSL_FAIL( OString(OString("sd::CustomAnimationClonerImpl::transformNode(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -289,7 +287,7 @@ namespace sd OSL_FAIL( OString(OString("sd::CustomAnimationClonerImpl::transformValue(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 94a50020ff67..c24b3c9dbf90 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -74,7 +74,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::animations; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; @@ -1137,9 +1136,9 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval ) // -------------------------------------------------------------------- -::rtl::OUString CustomAnimationEffect::getPath() const +OUString CustomAnimationEffect::getPath() const { - ::rtl::OUString aPath; + OUString aPath; if( mxNode.is() ) try { @@ -1165,7 +1164,7 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval ) // -------------------------------------------------------------------- -void CustomAnimationEffect::setPath( const ::rtl::OUString& rPath ) +void CustomAnimationEffect::setPath( const OUString& rPath ) { if( mxNode.is() ) try { diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 9ac81d682214..91b0836a9aaf 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; -using ::rtl::OUString; using ::com::sun::star::io::XInputStream; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::container::XNameAccess; @@ -171,7 +170,7 @@ UStringList CustomAnimationPreset::getSubTypes() return aSubTypes; } -Reference< XAnimationNode > CustomAnimationPreset::create( const rtl::OUString& rstrSubType ) +Reference< XAnimationNode > CustomAnimationPreset::create( const OUString& rstrSubType ) { try { @@ -320,16 +319,16 @@ void CustomAnimationPresets::importEffects() xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", Sequence( &propValue, 1 ) ), UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aFiles; + uno::Sequence< OUString > aFiles; xNameAccess->getByName( "EffectFiles" ) >>= aFiles; for( sal_Int32 i=0; igetPresetSubType() != rPresetSubType ) { diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 41d4eba0befd..0a496a3444cd 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; using ::com::sun::star::drawing::XShape; -using ::rtl::OUString; struct deprecated_FadeEffect_conversion_table_entry { diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 127b3027bdb4..de67f40c0667 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::animations; -using ::rtl::OUString; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::Any; @@ -170,16 +169,16 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) "com.sun.star.configuration.ConfigurationAccess", Sequence( &propValue, 1 ) ), UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aFiles; + uno::Sequence< OUString > aFiles; xNameAccess->getByName("TransitionFiles") >>= aFiles; for( sal_Int32 i=0; i& xSource ); +extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, const Reference< XInterface >& xSource ); namespace sd { @@ -170,7 +169,7 @@ void createAnnotation( Reference< XAnnotation >& xAnnotation, SdPage* pPage ) Annotation::Annotation( const Reference< XComponentContext >& context, SdPage* pPage ) : ::cppu::WeakComponentImplHelper1< XAnnotation >(m_aMutex) -, ::cppu::PropertySetMixin< XAnnotation >(context, static_cast< Implements >(IMPLEMENTS_PROPERTY_SET), Sequence< ::rtl::OUString >()) +, ::cppu::PropertySetMixin< XAnnotation >(context, static_cast< Implements >(IMPLEMENTS_PROPERTY_SET), Sequence< OUString >()) , mpPage( pPage ) { } diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 3fa27ff94efa..844b93053e95 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -84,7 +84,6 @@ #include -using ::rtl::OUString; using namespace ::sd; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -949,7 +948,7 @@ void SdDrawDocument::SetCalcFieldValueHdl(::Outliner* pOutliner) pOutliner->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl)); } -sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const rtl::OUString& rAuthor ) +sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const OUString& rAuthor ) { // force current user to have first color if( maAnnotationAuthors.empty() ) diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 0e8f5d67e229..9e4adb22aa48 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -311,7 +311,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_ if (aURL.Len() && (aURL.GetChar(0) == 35)) { - XubString aHashSlide = rtl::OUString('#'); + XubString aHashSlide = OUString('#'); aHashSlide += SD_RESSTR(STR_PAGE); if (aURL.CompareTo(aHashSlide, aHashSlide.Len()) == COMPARE_EQUAL) diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 2389beb6a7ab..903998c692f5 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -70,11 +70,11 @@ using namespace ::com::sun::star; class InsertBookmarkAsPage_FindDuplicateLayouts { public: - InsertBookmarkAsPage_FindDuplicateLayouts( std::vector &rLayoutsToTransfer ) + InsertBookmarkAsPage_FindDuplicateLayouts( std::vector &rLayoutsToTransfer ) : mrLayoutsToTransfer(rLayoutsToTransfer) {} void operator()( SdDrawDocument&, SdPage* ); private: - std::vector &mrLayoutsToTransfer; + std::vector &mrLayoutsToTransfer; }; void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage ) @@ -85,9 +85,9 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc String aFullNameLayout( pBMMPage->GetLayoutName() ); aFullNameLayout.Erase( aFullNameLayout.SearchAscii( SD_LT_SEPARATOR )); - rtl::OUString aLayout(aFullNameLayout); + OUString aLayout(aFullNameLayout); - std::vector::const_iterator pIter = + std::vector::const_iterator pIter = find(mrLayoutsToTransfer.begin(),mrLayoutsToTransfer.end(),aLayout); bool bFound = pIter != mrLayoutsToTransfer.end(); @@ -100,7 +100,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc String aFullTest(pTestPage->GetLayoutName()); aFullTest.Erase( aFullTest.SearchAscii( SD_LT_SEPARATOR )); - rtl::OUString aTest(aFullTest); + OUString aTest(aFullTest); if (aTest == aLayout) bFound = true; @@ -112,7 +112,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc // Inserts a bookmark as a page static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBookmarkDoc, - const std::vector &rBookmarkList, sal_uInt16 nBMSdPageCount, + const std::vector &rBookmarkList, sal_uInt16 nBMSdPageCount, InsertBookmarkAsPage_FindDuplicateLayouts& rPageIterator ) { // @@ -260,8 +260,8 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const String& rBookmarkFile) // Inserts a bookmark (page or object) sal_Bool SdDrawDocument::InsertBookmark( - const std::vector &rBookmarkList, // List of names of the bookmarks to be inserted - std::vector &rExchangeList, // List of the names to be used + const std::vector &rBookmarkList, // List of names of the bookmarks to be inserted + std::vector &rExchangeList, // List of the names to be used sal_Bool bLink, // Insert bookmarks as links? sal_Bool bReplace, // Replace current default and notes pages? sal_uInt16 nInsertPos, // Insertion position of pages @@ -296,7 +296,7 @@ sal_Bool SdDrawDocument::InsertBookmark( else bOK = sal_False; - std::vector::const_iterator pIter; + std::vector::const_iterator pIter; for ( pIter = rBookmarkList.begin(); bOK && pIter != rBookmarkList.end() && !bInsertPages; ++pIter ) { // Is there a page name in the bookmark list? @@ -351,8 +351,8 @@ lcl_removeUnusedStyles(SfxStyleSheetBasePool* const pStyleSheetPool, SdStyleShee } sal_Bool SdDrawDocument::InsertBookmarkAsPage( - const std::vector &rBookmarkList, - std::vector *pExchangeList, // List of names to be used + const std::vector &rBookmarkList, + std::vector *pExchangeList, // List of names to be used sal_Bool bLink, sal_Bool bReplace, sal_uInt16 nInsertPos, @@ -465,7 +465,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( // // Refactored copy'n'pasted layout name collection into IterateBookmarkPages // - std::vector aLayoutsToTransfer; + std::vector aLayoutsToTransfer; InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( aLayoutsToTransfer ); lcl_IterateBookmarkPages( *this, pBookmarkDoc, rBookmarkList, nBMSdPageCount, aSearchFunctor ); @@ -478,7 +478,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( if( !aLayoutsToTransfer.empty() ) bMergeMasterPages = sal_True; - std::vector::const_iterator pIter; + std::vector::const_iterator pIter; for ( pIter = aLayoutsToTransfer.begin(); pIter != aLayoutsToTransfer.end(); ++pIter ) { SdStyleSheetVector aCreatedStyles; @@ -527,7 +527,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( sal_uInt16 nBMSdPage; std::set aRenameSet; - std::map aNameMap; + std::map aNameMap; for (nBMSdPage=0; nBMSdPage < nBMSdPageCount; nBMSdPage++) { @@ -795,7 +795,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( nSdPageEnd = nSdPageStart + nReplacedStandardPages - 1; } - std::vector::iterator pExchangeIter; + std::vector::iterator pExchangeIter; if (pExchangeList) pExchangeIter = pExchangeList->begin(); @@ -919,8 +919,8 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage( // Inserts a bookmark as an object sal_Bool SdDrawDocument::InsertBookmarkAsObject( - const std::vector &rBookmarkList, - const std::vector &rExchangeList, // List of names to use + const std::vector &rBookmarkList, + const std::vector &rExchangeList, // List of names to use sal_Bool /* bLink */, ::sd::DrawDocShell* pBookmarkDocSh, Point* pObjPos, bool bCalcObjCount) @@ -962,7 +962,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject( SdrPage* pPage; SdrPageView* pPV; - std::vector::const_iterator pIter; + std::vector::const_iterator pIter; for ( pIter = rBookmarkList.begin(); pIter != rBookmarkList.end(); ++pIter ) { // Get names of bookmarks from the list @@ -1072,7 +1072,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject( // Get number of objects after inserting. sal_uLong nCount = pPage->GetObjCount(); - std::vector::const_iterator pIter = rExchangeList.begin(); + std::vector::const_iterator pIter = rExchangeList.begin(); for (sal_uLong nObj = nCountBefore; nObj < nCount; nObj++) { // Get the name to use from the Exchange list diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 0c850dbf7cd4..3f24709bb5c9 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -106,7 +106,6 @@ #include #include "app.hrc" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index 6c4287242d29..af17feb0e099 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -92,7 +92,7 @@ SdPageLink::~SdPageLink() pPage->SetBookmarkName(aBookmarkName); } - std::vector aBookmarkList; + std::vector aBookmarkList; aBookmarkList.push_back(aBookmarkName); sal_uInt16 nInsertPos = pPage->GetPageNum(); sal_Bool bLink = sal_True; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 9057a4f68c73..0411ef93cac8 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -314,7 +314,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const case PRESOBJ_CHART: { pSdrObj = new SdrOle2Obj(); - ( (SdrOle2Obj*) pSdrObj)->SetProgName( rtl::OUString( "StarChart" ) ); + ( (SdrOle2Obj*) pSdrObj)->SetProgName( OUString( "StarChart" ) ); BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_CHART ) ); Graphic aGraphic( aBmpEx ); ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); @@ -324,7 +324,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const case PRESOBJ_ORGCHART: { pSdrObj = new SdrOle2Obj(); - ( (SdrOle2Obj*) pSdrObj)->SetProgName( rtl::OUString( "StarOrg" ) ); + ( (SdrOle2Obj*) pSdrObj)->SetProgName( OUString( "StarOrg" ) ); BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_ORGCHART ) ); Graphic aGraphic( aBmpEx ); ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); @@ -335,7 +335,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const case PRESOBJ_CALC: { pSdrObj = new SdrOle2Obj(); - ( (SdrOle2Obj*) pSdrObj)->SetProgName( rtl::OUString( "StarCalc" ) ); + ( (SdrOle2Obj*) pSdrObj)->SetProgName( OUString( "StarCalc" ) ); BitmapEx aBmpEx( SdResId( BMP_PRESOBJ_TABLE ) ); Graphic aGraphic( aBmpEx ); ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); @@ -2365,7 +2365,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO // to inside this method to work even when outliner is fetched here. pOutl->SetStyleSheet(0, pObj->GetStyleSheet()); - rtl::OUString aString; + OUString aString; switch( eObjKind ) { @@ -2537,7 +2537,7 @@ const String& SdPage::GetName() const } else if (mePageKind == PK_HANDOUT && mbMaster) { - aCreatedPageName += rtl::OUString(" ("); + aCreatedPageName += OUString(" ("); aCreatedPageName += SdResId(STR_HANDOUT).toString(); aCreatedPageName += sal_Unicode( ')' ); } diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 7007bf5fae69..cb4259d0cf49 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::office; -extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEventName, const Reference< XInterface >& xSource ); +extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, const Reference< XInterface >& xSource ); /************************************************************************* |* @@ -633,7 +633,7 @@ void SdPage::removeAnnotation( const Reference< XAnnotation >& xAnnotation ) { pModel->SetChanged(); Reference< XInterface > xSource( xAnnotation, UNO_QUERY ); - NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), rtl::OUString( "OnAnnotationRemoved" ), xSource ); + NotifyDocumentEvent( static_cast< SdDrawDocument* >( pModel ), OUString( "OnAnnotationRemoved" ), xSource ); } } diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index b895906189bf..e14bba4eafab 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.cxx @@ -31,7 +31,6 @@ #include "undoanim.hxx" #include "EffectMigration.hxx" -using ::rtl::OUString; using namespace ::sd; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::animations; diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index 9aa2178f20c1..2f140a2d438f 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -39,7 +39,6 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -48,7 +47,7 @@ using namespace ::com::sun::star::beans; // ---------------------------------------------------------- -typedef std::map< rtl::OUString, rtl::Reference< SdStyleSheet > > PresStyleMap; +typedef std::map< OUString, rtl::Reference< SdStyleSheet > > PresStyleMap; struct SdStyleFamilyImpl { @@ -223,7 +222,7 @@ OUString SAL_CALL SdStyleFamily::getName() throw (RuntimeException) // ---------------------------------------------------------- -void SAL_CALL SdStyleFamily::setName( const ::rtl::OUString& ) throw (RuntimeException) +void SAL_CALL SdStyleFamily::setName( const OUString& ) throw (RuntimeException) { } diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 14d29774db35..67db6eaeeb09 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -63,7 +63,6 @@ #include #include "app.hrc" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::style; @@ -1021,8 +1020,8 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, SvxNumberFormat aFrmt( pDefaultRule->GetLevel(i) ); aFrmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); // #i93908# clear suffix for bullet lists - aFrmt.SetPrefix(::rtl::OUString()); - aFrmt.SetSuffix(::rtl::OUString()); + aFrmt.SetPrefix(OUString()); + aFrmt.SetSuffix(OUString()); aFrmt.SetStart(1); aFrmt.SetBulletRelSize(45); aFrmt.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34 diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index ccd29d87f277..da5a606f6946 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -152,7 +152,7 @@ void SdStyleSheet::SetApiName( const OUString& rApiName ) msApiName = rApiName; } -rtl::OUString SdStyleSheet::GetApiName() const +OUString SdStyleSheet::GetApiName() const { if( !msApiName.isEmpty() ) return msApiName; diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 82aa311f2c63..8e76f7e6a5f2 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -30,7 +30,6 @@ #include "Outliner.hxx" #include -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx index 27ca99fca39e..ac0af9a84e68 100644 --- a/sd/source/core/undoanim.cxx +++ b/sd/source/core/undoanim.cxx @@ -105,7 +105,7 @@ void UndoAnimation::Redo() } } -rtl::OUString UndoAnimation::GetComment() const +OUString UndoAnimation::GetComment() const { return SdResId(STR_UNDO_ANIMATION).toString(); } @@ -114,8 +114,8 @@ struct UndoAnimationPathImpl { SdPage* mpPage; sal_Int32 mnEffectOffset; - ::rtl::OUString msUndoPath; - ::rtl::OUString msRedoPath; + OUString msUndoPath; + OUString msRedoPath; UndoAnimationPathImpl( SdPage* pThePage, const com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) : mpPage( pThePage ) @@ -183,7 +183,7 @@ void UndoAnimationPath::Redo() } } -rtl::OUString UndoAnimationPath::GetComment() const +OUString UndoAnimationPath::GetComment() const { return SdResId(STR_UNDO_ANIMATION).toString(); } @@ -273,7 +273,7 @@ void UndoTransition::Redo() mpImpl->mpPage->mbStopSound = mpImpl->mbNewStopSound; } -rtl::OUString UndoTransition::GetComment() const +OUString UndoTransition::GetComment() const { return SdResId(STR_UNDO_SLIDE_PARAMS).toString(); } diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 6ebd25fe4b54..7bf3d0a43536 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -40,12 +40,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); -typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); +typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); #ifdef DISABLE_DYNLOADING -extern "C" sal_uInt32 ImportCGM( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +extern "C" sal_uInt32 ImportCGM( OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); #endif @@ -76,7 +76,7 @@ sal_Bool SdCGMFilter::Import() #else ImportCGMPointer FncImportCGM = ImportCGM; #endif - ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); sal_uInt32 nRetValue; if( mrDocument.GetPageCount() == 0L ) @@ -125,7 +125,7 @@ sal_Bool SdCGMFilter::Export() if( FncCGMExport ) { - ::rtl::OUString aPhysicalName( mrMedium.GetPhysicalName() ); + OUString aPhysicalName( mrMedium.GetPhysicalName() ); CreateStatusIndicator(); bRet = FncCGMExport( aPhysicalName, mxModel, mxStatusIndicator, NULL ); diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 8068caf4480d..7bd42c74802c 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -97,21 +97,21 @@ void PPTWriter::exportPPTPre( const std::vector< com::sun::star::beans::Property { mbStatusIndicator = sal_True; mnStatMaxValue = ( mnPages + mnMasterPages ) * 5; - mXStatusIndicator->start( rtl::OUString( "PowerPoint Export" ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); + mXStatusIndicator->start( OUString( "PowerPoint Export" ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); } SvGlobalName aGName( 0x64818d10L, 0x4f9b, 0x11cf, 0x86, 0xea, 0x00, 0xaa, 0x00, 0xb9, 0x29, 0xe8 ); - mrStg->SetClass( aGName, 0, rtl::OUString("MS PowerPoint 97") ); + mrStg->SetClass( aGName, 0, OUString("MS PowerPoint 97") ); if ( !ImplCreateCurrentUserStream() ) return; - mpStrm = mrStg->OpenSotStream( rtl::OUString( "PowerPoint Document" ) ); + mpStrm = mrStg->OpenSotStream( OUString( "PowerPoint Document" ) ); if ( !mpStrm ) return; if ( !mpPicStrm ) - mpPicStrm = mrStg->OpenSotStream( rtl::OUString( "Pictures" ) ); + mpPicStrm = mrStg->OpenSotStream( OUString( "Pictures" ) ); for (std::vector< com::sun::star::beans::PropertyValue >::const_iterator aIter( rMediaData.begin() ), aEnd( rMediaData.end() ); aIter != aEnd ; ++aIter) @@ -132,7 +132,7 @@ void PPTWriter::exportPPTPost( ) if ( mbStatusIndicator ) { - mXStatusIndicator->setText( rtl::OUString( "PowerPoint Export" ) ); + mXStatusIndicator->setText( OUString( "PowerPoint Export" ) ); sal_uInt32 nValue = mnStatMaxValue + ( mnStatMaxValue >> 3 ); if ( nValue > mnLatestStatValue ) { @@ -178,9 +178,9 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ sal_Bool bVisible = sal_True; ::com::sun::star::presentation::FadeEffect eFe = ::com::sun::star::presentation::FadeEffect_NONE; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Visible" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Visible" ) ) ) aAny >>= bVisible; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Change" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Change" ) ) ) { switch ( *(sal_Int32*)aAny.getValue() ) { @@ -193,7 +193,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ break; } } - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Effect" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Effect" ) ) ) aAny >>= eFe; sal_uInt32 nSoundRef = 0; @@ -201,9 +201,9 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ sal_Bool bStopSound = sal_False; sal_Bool bLoopSound = sal_False; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Sound" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Sound" ) ) ) { - rtl::OUString aSoundURL; + OUString aSoundURL; if ( aAny >>= aSoundURL ) { nSoundRef = maSoundCollection.GetId( aSoundURL ); @@ -212,7 +212,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ else aAny >>= bStopSound; } - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "LoopSound" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "LoopSound" ) ) ) aAny >>= bLoopSound; sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == sal_False ) @@ -228,18 +228,18 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ sal_Int32 nSlideTime = 0; // still has to !!! sal_uInt8 nSpeed = 1; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Speed" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Speed" ) ) ) { ::com::sun::star::presentation::AnimationSpeed aAs; aAny >>= aAs; nSpeed = (sal_uInt8)aAs; } sal_Int16 nTT = 0; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "TransitionType" ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "TransitionType" ) ) && ( aAny >>= nTT ) ) { sal_Int16 nTST = 0; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "TransitionSubtype" ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "TransitionSubtype" ) ) && ( aAny >>= nTST ) ) nTransitionType = GetTransition( nTT, nTST, eFe, nDirection ); @@ -257,7 +257,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ if ( bStopSound ) nBuildFlags |= 256; - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Duration" ) ) )// duration of this slide + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Duration" ) ) )// duration of this slide nSlideTime = *(sal_Int32*)aAny.getValue() << 10; // in ticks mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom ); @@ -461,7 +461,7 @@ PPTWriter::~PPTWriter() sal_Bool PPTWriter::ImplCreateCurrentUserStream() { - mpCurUserStrm = mrStg->OpenSotStream( rtl::OUString( "Current User" ) ); + mpCurUserStrm = mrStg->OpenSotStream( OUString( "Current User" ) ); if ( !mpCurUserStrm ) return sal_False; char pUserName[] = "Current User"; @@ -524,7 +524,7 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() if ( mnCnvrtFlags & 0x8000 ) { uno::Sequence aThumbSeq; - if ( GetPageByIndex( 0, NORMAL ) && ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "PreviewBitmap" ) ) ) + if ( GetPageByIndex( 0, NORMAL ) && ImplGetPropertyValue( mXPagePropSet, OUString( "PreviewBitmap" ) ) ) { aThumbSeq = *static_cast*>(mAny.getValue()); @@ -563,19 +563,19 @@ void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star { if ( rXPagePropSet.is() ) { - rtl::OUString aString; + OUString aString; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "HeaderText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "HeaderText" ), sal_True ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 1 ); } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "FooterText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "FooterText" ), sal_True ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 2 ); } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "DateTimeText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeText" ), sal_True ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 0 ); @@ -592,34 +592,34 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com sal_Bool bVal = sal_False; sal_uInt32 nVal = 0; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsHeaderVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsHeaderVisible" ), sal_True ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x100000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsFooterVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsFooterVisible" ), sal_True ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x200000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsDateTimeVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeVisible" ), sal_True ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x010000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsPageNumberVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsPageNumberVisible" ), sal_True ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x080000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "IsDateTimeFixed" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeFixed" ), sal_True ) ) { if ( ( aAny >>= bVal ) && !bVal ) nVal |= 0x20000; else nVal |= 0x40000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, rtl::OUString( "DateTimeFormat" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeFormat" ), sal_True ) ) { sal_Int32 nFormat = *(sal_Int32*)aAny.getValue(); SvxDateFormat eDateFormat = (SvxDateFormat)( nFormat & 0xf ); @@ -741,7 +741,7 @@ sal_Bool PPTWriter::ImplCreateDocument() if ( aXName.is() ) maSlideNameList.push_back( aXName->getName() ); else - maSlideNameList.push_back( ::rtl::OUString() ); + maSlideNameList.push_back( OUString() ); } mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText @@ -771,7 +771,7 @@ sal_Bool PPTWriter::ImplCreateDocument() ( aXPresentation, ::com::sun::star::uno::UNO_QUERY ); if ( mXPropSet.is() ) { - ::rtl::OUString aCustomShow; + OUString aCustomShow; sal_uInt32 nPenColor = 0x1000000; sal_Int32 nRestartTime = 0x7fffffff; sal_Int16 nStartSlide = 0; @@ -785,9 +785,9 @@ sal_Bool PPTWriter::ImplCreateDocument() // Bit 7 loop continously // Bit ? show scrollbar - if ( ImplGetPropertyValue( rtl::OUString( "CustomShow" ) ) ) + if ( ImplGetPropertyValue( OUString( "CustomShow" ) ) ) { - aCustomShow = ( *(::rtl::OUString*)mAny.getValue() ); + aCustomShow = ( *(OUString*)mAny.getValue() ); if ( !aCustomShow.isEmpty() ) { nFlags |= 8; @@ -795,11 +795,11 @@ sal_Bool PPTWriter::ImplCreateDocument() } if ( ( nFlags & 8 ) == 0 ) { - if ( ImplGetPropertyValue( rtl::OUString( "FirstPage" ) ) ) + if ( ImplGetPropertyValue( OUString( "FirstPage" ) ) ) { - ::rtl::OUString aSlideName( *(::rtl::OUString*)mAny.getValue() ); + OUString aSlideName( *(OUString*)mAny.getValue() ); - std::vector::const_iterator pIter = std::find( + std::vector::const_iterator pIter = std::find( maSlideNameList.begin(),maSlideNameList.end(),aSlideName); if (pIter != maSlideNameList.end()) @@ -811,7 +811,7 @@ sal_Bool PPTWriter::ImplCreateDocument() } } - if ( ImplGetPropertyValue( rtl::OUString("IsAutomatic" ) ) ) + if ( ImplGetPropertyValue( OUString("IsAutomatic" ) ) ) { sal_Bool bBool = sal_False; mAny >>= bBool; @@ -819,14 +819,14 @@ sal_Bool PPTWriter::ImplCreateDocument() nFlags |= 1; } - if ( ImplGetPropertyValue( rtl::OUString( "IsEndless" ) ) ) // the correct name would be IsNotEndless: WTF? + if ( ImplGetPropertyValue( OUString( "IsEndless" ) ) ) // the correct name would be IsNotEndless: WTF? { sal_Bool bBool = sal_False; mAny >>= bBool; if ( bBool ) nFlags |= 0x80; } - if ( ImplGetPropertyValue( rtl::OUString( "IsFullScreen" ) ) ) + if ( ImplGetPropertyValue( OUString( "IsFullScreen" ) ) ) { sal_Bool bBool = sal_False; mAny >>= bBool; @@ -859,8 +859,8 @@ sal_Bool PPTWriter::ImplCreateDocument() aXCont( aXCPSup->getCustomPresentations() ); if ( aXCont.is() ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString> aNameSeq( aXCont->getElementNames() ); - const ::rtl::OUString* pUString = aNameSeq.getArray(); + ::com::sun::star::uno::Sequence< OUString> aNameSeq( aXCont->getElementNames() ); + const OUString* pUString = aNameSeq.getArray(); sal_uInt32 nCount = aNameSeq.getLength(); if ( nCount ) { @@ -902,8 +902,8 @@ sal_Bool PPTWriter::ImplCreateDocument() aXName( aXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( aXName.is() ) { - ::rtl::OUString aSlideName( aXName->getName() ); - std::vector::const_iterator pIter = std::find( + OUString aSlideName( aXName->getName() ); + std::vector::const_iterator pIter = std::find( maSlideNameList.begin(),maSlideNameList.end(),aSlideName); if (pIter != maSlideNameList.end()) @@ -1060,9 +1060,9 @@ sal_Bool PPTWriter::ImplCreateMainNotes() // --------------------------------------------------------------------------------------------- -static rtl::OUString getInitials( const rtl::OUString& rName ) +static OUString getInitials( const OUString& rName ) { - rtl::OUString sInitials; + OUString sInitials; const sal_Unicode * pStr = rName.getStr(); sal_Int32 nLength = rName.getLength(); @@ -1078,7 +1078,7 @@ static rtl::OUString getInitials( const rtl::OUString& rName ) // take letter if( nLength ) { - sInitials += rtl::OUString( *pStr ); + sInitials += OUString( *pStr ); nLength--; pStr++; } @@ -1112,10 +1112,10 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr Point aPoint( OutputDevice::LogicToLogic( Point( static_cast< sal_Int32 >( aRealPoint2D.X * 100.0 ), static_cast< sal_Int32 >( aRealPoint2D.Y * 100.0 ) ), MAP_100TH_MM, aMapDest ) ); - rtl::OUString sAuthor( xAnnotation->getAuthor() ); + OUString sAuthor( xAnnotation->getAuthor() ); uno::Reference< text::XText > xText( xAnnotation->getTextRange() ); - rtl::OUString sText( xText->getString() ); - rtl::OUString sInitials( getInitials( sAuthor ) ); + OUString sText( xText->getString() ); + OUString sInitials( getInitials( sAuthor ) ); util::DateTime aDateTime( xAnnotation->getDateTime() ); if ( !sAuthor.isEmpty() ) PPTWriter::WriteCString( rBinaryTagData10Atom, sAuthor, 0 ); @@ -1206,7 +1206,7 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect ); aPropOpt.AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid ); ::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE ); - if ( ImplGetPropertyValue( rXPropSet, rtl::OUString( "FillStyle" ) ) ) + if ( ImplGetPropertyValue( rXPropSet, OUString( "FillStyle" ) ) ) mAny >>= aFS; switch( aFS ) @@ -1221,16 +1221,16 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su break; case ::com::sun::star::drawing::FillStyle_BITMAP : - aPropOpt.CreateGraphicProperties( rXPropSet, rtl::OUString( "FillBitmapURL" ), sal_True ); + aPropOpt.CreateGraphicProperties( rXPropSet, OUString( "FillBitmapURL" ), sal_True ); break; case ::com::sun::star::drawing::FillStyle_HATCH : - aPropOpt.CreateGraphicProperties( rXPropSet, rtl::OUString( "FillHatch" ), sal_True ); + aPropOpt.CreateGraphicProperties( rXPropSet, OUString( "FillHatch" ), sal_True ); break; case ::com::sun::star::drawing::FillStyle_SOLID : { - if ( ImplGetPropertyValue( rXPropSet, rtl::OUString( "FillColor" ) ) ) + if ( ImplGetPropertyValue( rXPropSet, OUString( "FillColor" ) ) ) { nFillColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) ); nFillBackColor = nFillColor ^ 0xffffff; @@ -1295,7 +1295,7 @@ void PPTWriter::ImplWriteOLE( ) aOleExport.ExportOLEObject( xObj, *xTempStorage ); //TODO/MBA: testing - rtl::OUString aPersistStream( SVEXT_PERSIST_STREAM ); + OUString aPersistStream( SVEXT_PERSIST_STREAM ); SvMemoryStream aStream; SvStorageRef xCleanStorage( new SvStorage( sal_False, aStream ) ); xTempStorage->CopyTo( xCleanStorage ); @@ -1321,7 +1321,7 @@ void PPTWriter::ImplWriteOLE( ) { if ( pPtr->xControlModel.is() ) { - rtl::OUString aName; + OUString aName; ::com::sun::star::awt::Size aSize; SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) ); sal_Bool bOk = oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xDest, pPtr->xControlModel, aSize, aName ); @@ -1486,15 +1486,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocS { SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) ); SvxImportMSVBasic aMSVBas( rDocShell, *xDest ); - aMSVBas.SaveOrDelMSVBAStorage( sal_True, rtl::OUString( "_MS_VBA_Overhead" ) ); + aMSVBas.SaveOrDelMSVBAStorage( sal_True, OUString( "_MS_VBA_Overhead" ) ); - SvStorageRef xOverhead = xDest->OpenSotStorage( rtl::OUString( "_MS_VBA_Overhead") ); + SvStorageRef xOverhead = xDest->OpenSotStorage( OUString( "_MS_VBA_Overhead") ); if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) { - SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( rtl::OUString( "_MS_VBA_Overhead") ); + SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( OUString( "_MS_VBA_Overhead") ); if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) { - SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( rtl::OUString( "_MS_VBA_Overhead2") ); + SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( OUString( "_MS_VBA_Overhead2") ); if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) { sal_uInt32 nLen = xTemp->GetSize(); diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 2765660a8684..982ddeee5752 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -168,8 +168,8 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider sal_uInt32 mnStatMaxValue; sal_uInt32 mnLatestStatValue; - std::vector maSlideNameList; - rtl::OUString maBaseURI; + std::vector maSlideNameList; + OUString maBaseURI; ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > mXText; // TextRef of the global text ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > mXCursor; diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 20670b7bc683..f84360db01d6 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -128,7 +128,7 @@ class PPTExBulletProvider public : - sal_uInt16 GetId( const rtl::OString& rUniqueId, Size& rGraphicSize ); + sal_uInt16 GetId( const OString& rUniqueId, Size& rGraphicSize ); PPTExBulletProvider(); ~PPTExBulletProvider(); @@ -179,7 +179,7 @@ public : ~FontCollection(); - short GetScriptDirection( const rtl::OUString& rText ) const; + short GetScriptDirection( const OUString& rText ) const; sal_uInt32 GetId( FontCollectionEntry& rFontDescriptor ); @@ -341,7 +341,7 @@ protected: ::com::sun::star::awt::Size maSize; ::com::sun::star::awt::Point maPosition; Rectangle maRect; - rtl::OString mType; + OString mType; sal_Bool mbPresObj; sal_Bool mbEmptyPresObj; sal_Int32 mnAngle; diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 7135b3f693db..66d4711956b5 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -101,12 +101,12 @@ protected: virtual ::oox::ole::VbaProject* implCreateVbaProject() const; sal_Bool WriteNotesMaster(); - void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const ::rtl::OUString& rAttributeName ); + void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const OUString& rAttributeName ); void WriteAnimateValues( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& rXAnimate ); void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any& rAny, sal_Bool bWriteEvent, sal_Bool bMainSeqChild ); void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, sal_Bool bHasFDelay ); void WriteAnimations( ::sax_fastparser::FSHelperPtr pFS ); - void WriteAnimationAttributeName( ::sax_fastparser::FSHelperPtr pFS, const ::rtl::OUString& rAttributeName ); + void WriteAnimationAttributeName( ::sax_fastparser::FSHelperPtr pFS, const OUString& rAttributeName ); void WriteAnimationNode( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bMainSeqChild ); void WriteAnimationNodeAnimate( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild ); void WriteAnimationNodeAnimateInside( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bMainSeqChild, sal_Bool bSimple ); @@ -126,12 +126,12 @@ protected: sal_uInt32 GetNewSlideId() { return mnSlideIdMax ++; } sal_uInt32 GetNewSlideMasterId() { return mnSlideMasterIdMax ++; } - sal_Int32 GetAuthorIdAndLastIndex( ::rtl::OUString sAuthor, sal_Int32& nLastIndex ); + sal_Int32 GetAuthorIdAndLastIndex( OUString sAuthor, sal_Int32& nLastIndex ); private: void AddLayoutIdAndRelation( ::sax_fastparser::FSHelperPtr pFS, sal_Int32 nLayoutFileId ); - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; @@ -156,7 +156,7 @@ private: sal_Int32 nId; sal_Int32 nLastIndex; }; - typedef ::boost::unordered_map< ::rtl::OUString, struct AuthorComments, rtl::OUStringHash, comphelper::UStringEqual > AuthorsMap; + typedef ::boost::unordered_map< OUString, struct AuthorComments, OUStringHash, comphelper::UStringEqual > AuthorsMap; AuthorsMap maAuthors; void WriteAuthors(); diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 37a687772149..a67fbdf186f9 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -111,7 +111,7 @@ PPTExBulletProvider::~PPTExBulletProvider() delete pGraphicProv; } -sal_uInt16 PPTExBulletProvider::GetId( const rtl::OString& rUniqueId, Size& rGraphicSize ) +sal_uInt16 PPTExBulletProvider::GetId( const OString& rUniqueId, Size& rGraphicSize ) { sal_uInt16 nRetValue = 0xffff; @@ -385,12 +385,12 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const String& rBookmarkURL, const s { sal_uInt32 nHyperId = ++mnExEmbed; - rtl::OUString sBookmarkURL( rBookmarkURL ); + OUString sBookmarkURL( rBookmarkURL ); INetURLObject aBaseURI( maBaseURI ); INetURLObject aBookmarkURI( rBookmarkURL ); if( aBaseURI.GetProtocol() == aBookmarkURI.GetProtocol() ) { - rtl::OUString aRelUrl( INetURLObject::GetRelURL( maBaseURI, rBookmarkURL, + OUString aRelUrl( INetURLObject::GetRelURL( maBaseURI, rBookmarkURL, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_TO_IURI, RTL_TEXTENCODING_UTF8, INetURLObject::FSYS_DETECT ) ); if ( !aRelUrl.isEmpty() ) sBookmarkURL = aRelUrl; @@ -820,7 +820,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) { sal_Bool bIsDark = sal_False; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) aAny >>= bIsDark; nBulletColor = bIsDark ? 0xffffff : 0x000000; } @@ -871,7 +871,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) { sal_Bool bIsDark = sal_False; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) aAny >>= bIsDark; nCharColor = bIsDark ? 0xffffff : 0x000000; } @@ -889,7 +889,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) ::com::sun::star::uno::Any aAny; ::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE ); - if ( PropValue::GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FillStyle" ) ) ) + if ( PropValue::GetPropertyValue( aAny, mXPropSet, OUString( "FillStyle" ) ) ) aAny >>= aFS; switch( aFS ) { @@ -904,7 +904,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) break; case ::com::sun::star::drawing::FillStyle_SOLID : { - if ( PropValue::GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FillColor" ) ) ) + if ( PropValue::GetPropertyValue( aAny, mXPropSet, OUString( "FillColor" ) ) ) nBackgroundColor = mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) ); } break; @@ -912,7 +912,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) { ::com::sun::star::uno::Any aBackAny; ::com::sun::star::drawing::FillStyle aBackFS( ::com::sun::star::drawing::FillStyle_NONE ); - if ( PropValue::GetPropertyValue( aBackAny, mXBackgroundPropSet, rtl::OUString( "FillStyle" ) ) ) + if ( PropValue::GetPropertyValue( aBackAny, mXBackgroundPropSet, OUString( "FillStyle" ) ) ) aBackAny >>= aBackFS; switch( aBackFS ) { @@ -927,7 +927,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) break; case ::com::sun::star::drawing::FillStyle_SOLID : { - if ( PropValue::GetPropertyValue( aAny, mXBackgroundPropSet, rtl::OUString( "FillColor" ) ) ) + if ( PropValue::GetPropertyValue( aAny, mXBackgroundPropSet, OUString( "FillColor" ) ) ) nBackgroundColor = mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) ); } break; @@ -961,7 +961,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) if ( aPropSetOfNextShape.is() ) { if ( PropValue::GetPropertyValue( aAny, aPropSetOfNextShape, - rtl::OUString( "FillColor" ), sal_True ) ) + OUString( "FillColor" ), sal_True ) ) { if ( nCharColor == mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) ) ) { @@ -1051,7 +1051,7 @@ sal_Bool PPTWriter::ImplGetText() { mnTextSize = mXText->getString().getLength(); ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FontIndependentLineSpacing" ) ), sal_True ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ) ), sal_True ) aAny >>= mbFontIndependentLineSpacing; } return ( mnTextSize != 0 ); @@ -1211,17 +1211,17 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u String aPage( INetURLObject::decode( pFieldEntry->aFieldUrl, '%', INetURLObject::DECODE_WITH_CHARSET ) ); aPage.Erase( 0, 1 ); - rtl::OUString aUPage(aPage); - std::vector::const_iterator pIter = std::find( + OUString aUPage(aPage); + std::vector::const_iterator pIter = std::find( maSlideNameList.begin(),maSlideNameList.end(),aUPage); if ( pIter != maSlideNameList.end() ) { nPageIndex = pIter - maSlideNameList.begin(); - aPageUrl = rtl::OUString::valueOf(static_cast(256 + nPageIndex)); - aPageUrl.Append( rtl::OUString( "," ) ); + aPageUrl = OUString::valueOf(static_cast(256 + nPageIndex)); + aPageUrl.Append( OUString( "," ) ); aPageUrl.Append( OUString::number( nPageIndex + 1 ) ); - aPageUrl.Append( rtl::OUString( ",Slide " ) ); + aPageUrl.Append( OUString( ",Slide " ) ); aPageUrl.Append( OUString::number( nPageIndex + 1 ) ); } } @@ -1312,7 +1312,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u const uno::Reference< beans::XPropertySet > xPropSet( mXModel, uno::UNO_QUERY ); if ( xPropSet.is() ) { - ImplGetPropertyValue( xPropSet, rtl::OUString( "TabStop" ) ); + ImplGetPropertyValue( xPropSet, OUString( "TabStop" ) ); sal_Int32 nTabStop( 0 ); if ( mAny >>= nTabStop ) nDefaultTabSizeSrc = nTabStop; @@ -1934,15 +1934,15 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, nFlags |= 4; if ( eTe != ::com::sun::star::presentation::AnimationEffect_NONE ) nBuildType = 2; - if ( ImplGetPropertyValue( rtl::OUString( "SoundOn" ) ) ) + if ( ImplGetPropertyValue( OUString( "SoundOn" ) ) ) { sal_Bool bBool(sal_False); mAny >>= bBool; if ( bBool ) { - if ( ImplGetPropertyValue( rtl::OUString( "Sound" ) ) ) + if ( ImplGetPropertyValue( OUString( "Sound" ) ) ) { - nSoundRef = maSoundCollection.GetId( *(::rtl::OUString*)mAny.getValue() ); + nSoundRef = maSoundCollection.GetId( *(OUString*)mAny.getValue() ); if ( nSoundRef ) nFlags |= 0x10; } @@ -1950,15 +1950,15 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, } sal_Bool bDimHide = sal_False; sal_Bool bDimPrevious = sal_False; - if ( ImplGetPropertyValue( rtl::OUString( "DimHide" ) ) ) + if ( ImplGetPropertyValue( OUString( "DimHide" ) ) ) mAny >>= bDimHide; - if ( ImplGetPropertyValue( rtl::OUString( "DimPrevious" ) ) ) + if ( ImplGetPropertyValue( OUString( "DimPrevious" ) ) ) mAny >>= bDimPrevious; if ( bDimPrevious ) nAfterEffect |= 1; if ( bDimHide ) nAfterEffect |= 2; - if ( ImplGetPropertyValue( rtl::OUString( "DimColor" ) ) ) + if ( ImplGetPropertyValue( OUString( "DimColor" ) ) ) nDimColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) ) | 0xfe000000; rSt << nDimColor << nFlags << nSoundRef << nDelayTime @@ -2025,15 +2025,15 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat break; case ::com::sun::star::presentation::ClickAction_SOUND : { - if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) ) - nSoundRef = maSoundCollection.GetId( *(::rtl::OUString*)mAny.getValue() ); + if ( ImplGetPropertyValue( OUString( "Bookmark" ) ) ) + nSoundRef = maSoundCollection.GetId( *(OUString*)mAny.getValue() ); } break; case ::com::sun::star::presentation::ClickAction_PROGRAM : { - if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) ) + if ( ImplGetPropertyValue( OUString( "Bookmark" ) ) ) { - INetURLObject aUrl( *(::rtl::OUString*)mAny.getValue() ); + INetURLObject aUrl( *(OUString*)mAny.getValue() ); if ( INET_PROT_FILE == aUrl.GetProtocol() ) { aFile = aUrl.PathToFileName(); @@ -2045,11 +2045,11 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat case ::com::sun::star::presentation::ClickAction_BOOKMARK : { - if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) ) + if ( ImplGetPropertyValue( OUString( "Bookmark" ) ) ) { - rtl::OUString aBookmark( *(::rtl::OUString*)mAny.getValue() ); + OUString aBookmark( *(OUString*)mAny.getValue() ); sal_uInt32 nIndex = 0; - std::vector::const_iterator pIter; + std::vector::const_iterator pIter; for ( pIter = maSlideNameList.begin(); pIter != maSlideNameList.end(); ++pIter, nIndex++ ) { if ( *pIter == aBookmark ) @@ -2059,10 +2059,10 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat nHyperLinkType = 7; String aEmpty; - String aHyperString = rtl::OUString::valueOf(static_cast(256 + nIndex)); - aHyperString.Append( rtl::OUString( "," ) ); + String aHyperString = OUString::valueOf(static_cast(256 + nIndex)); + aHyperString.Append( OUString( "," ) ); aHyperString.Append( OUString::number( nIndex + 1 ) ); - aHyperString.Append( rtl::OUString( ",Slide " ) ); + aHyperString.Append( OUString( ",Slide " ) ); aHyperString.Append( OUString::number( nIndex + 1 ) ); nHyperLinkID = ImplInsertBookmarkURL( aHyperString, 1 | ( nIndex << 8 ) | ( 1 << 31 ), aBookmark, aEmpty, aEmpty, aHyperString ); } @@ -2073,9 +2073,9 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat case ::com::sun::star::presentation::ClickAction_DOCUMENT : { - if ( ImplGetPropertyValue( rtl::OUString( "Bookmark" ) ) ) + if ( ImplGetPropertyValue( OUString( "Bookmark" ) ) ) { - String aBookmark( *(::rtl::OUString*)mAny.getValue() ); + String aBookmark( *(OUString*)mAny.getValue() ); if ( aBookmark.Len() ) { nAction = 4; @@ -2134,16 +2134,16 @@ sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com sal_Bool& bIsSound ) { ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, rPropSet, rtl::OUString( "Effect" ) ) ) + if ( GetPropertyValue( aAny, rPropSet, OUString( "Effect" ) ) ) aAny >>= eEffect; else eEffect = ::com::sun::star::presentation::AnimationEffect_NONE; - if ( GetPropertyValue( aAny, rPropSet, rtl::OUString( "TextEffect" ) ) ) + if ( GetPropertyValue( aAny, rPropSet, OUString( "TextEffect" ) ) ) aAny >>= eTextEffect; else eTextEffect = ::com::sun::star::presentation::AnimationEffect_NONE; - if ( GetPropertyValue( aAny, rPropSet, rtl::OUString( "SoundOn" ) ) ) + if ( GetPropertyValue( aAny, rPropSet, OUString( "SoundOn" ) ) ) aAny >>= bIsSound; else bIsSound = sal_False; @@ -2281,12 +2281,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ::com::sun::star::presentation::AnimationEffect eAe; ::com::sun::star::presentation::AnimationEffect eTe; - if ( ImplGetPropertyValue( rtl::OUString( "PresentationOrder" ) ) ) + if ( ImplGetPropertyValue( OUString( "PresentationOrder" ) ) ) nEffectCount = *(sal_uInt16*)mAny.getValue(); sal_Bool bEffect = ImplGetEffect( mXPropSet, eAe, eTe, bIsSound ); ::com::sun::star::presentation::ClickAction eCa = ::com::sun::star::presentation::ClickAction_NONE; - if ( ImplGetPropertyValue( rtl::OUString( "OnClick" ) ) ) + if ( ImplGetPropertyValue( OUString( "OnClick" ) ) ) mAny >>= eCa; sal_Bool bGroup = mType == "drawing.Group"; @@ -2329,16 +2329,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a sal_Bool bIsHatching = sal_False; ::com::sun::star::uno::Any aAny; ::com::sun::star::drawing::FillStyle eFS; - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "IsFontwork" ), sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "IsFontwork" ), sal_True ) ) aAny >>= bIsFontwork; - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FillStyle" ), sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "FillStyle" ), sal_True ) ) { aAny >>= eFS; bIsHatching = eFS == ::com::sun::star::drawing::FillStyle_HATCH; } if ( bIsHatching || bIsFontwork || ( mType == "drawing.Measure" ) || ( mType == "drawing.Caption" ) ) { - if ( ImplGetPropertyValue( rtl::OUString( "BoundRect" ) ) ) + if ( ImplGetPropertyValue( OUString( "BoundRect" ) ) ) { ::com::sun::star::awt::Rectangle aRect( *(::com::sun::star::awt::Rectangle*)mAny.getValue() ); maPosition = MapPoint( ::com::sun::star::awt::Point( aRect.X, aRect.Y ) ); @@ -2357,12 +2357,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); sal_uInt32 nMirrorFlags; - rtl::OUString sCustomShapeType; + OUString sCustomShapeType; MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( mXShape, nMirrorFlags, sCustomShapeType ); if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" ) { // sj: creating metafile for customshapes that can't be saved to ms format properly ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "MetaFile" ), sal_False ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "MetaFile" ), sal_False ) ) { aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); SdrObject* pObj = GetSdrObjectFromXShape( mXShape ); @@ -2392,7 +2392,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { sal_Int32 nRadius = 0; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); - if ( ImplGetPropertyValue( rtl::OUString( "CornerRadius" ) ) ) + if ( ImplGetPropertyValue( OUString( "CornerRadius" ) ) ) { mAny >>= nRadius; nRadius = MapSize( ::com::sun::star::awt::Size( nRadius, 0 ) ).Width; @@ -2422,7 +2422,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { ::com::sun::star::drawing::CircleKind eCircleKind( ::com::sun::star::drawing::CircleKind_FULL ); PolyStyle ePolyKind = POLY_CHORD; - if ( ImplGetPropertyValue( rtl::OUString( "CircleKind" ) ) ) + if ( ImplGetPropertyValue( OUString( "CircleKind" ) ) ) { mAny >>= eCircleKind; switch ( eCircleKind ) @@ -2459,10 +2459,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else { sal_Int32 nStartAngle, nEndAngle; - if ( !ImplGetPropertyValue( rtl::OUString( "CircleStartAngle" ) ) ) + if ( !ImplGetPropertyValue( OUString( "CircleStartAngle" ) ) ) continue; nStartAngle = *( (sal_Int32*)mAny.getValue() ); - if( !ImplGetPropertyValue( rtl::OUString( "CircleEndAngle" ) ) ) + if( !ImplGetPropertyValue( OUString( "CircleEndAngle" ) ) ) continue; nEndAngle = *( (sal_Int32*)mAny.getValue() ); ::com::sun::star::awt::Point aPoint( mXShape->getPosition() ); @@ -2538,7 +2538,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // try to get the aspect when available ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xShapeProps( mXShape, ::com::sun::star::uno::UNO_QUERY_THROW ); - xShapeProps->getPropertyValue( ::rtl::OUString( "Aspect" ) ) >>= nAspect; + xShapeProps->getPropertyValue( OUString( "Aspect" ) ) >>= nAspect; } catch( ::com::sun::star::uno::Exception& ) {} @@ -2572,7 +2572,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a << (sal_uInt32)0x0012de00; ::com::sun::star::awt::Size aSize; - rtl::OUString aControlName; + OUString aControlName; SvStorageRef xTemp( new SvStorage( new SvMemoryStream(), sal_True ) ); if ( oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xTemp, aXControlModel, aSize, aControlName ) ) { @@ -2581,7 +2581,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( aUserName.Len() ) { SvStorageStreamRef xCompObj = xTemp->OpenSotStream( - rtl::OUString( "\1CompObj" ), + OUString( "\1CompObj" ), STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL ); xCompObj->Seek( STREAM_SEEK_TO_END ); sal_uInt32 nStreamLen = xCompObj->Tell(); @@ -2604,8 +2604,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a *xCompObj >> nStringLen; if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) ) { // i think that the OleIdentifier will follow - rtl::OString aTemp = read_uInt8s_ToOString(*xCompObj, nStringLen - 1); - aOleIdentifier = rtl::OStringToOUString(aTemp, RTL_TEXTENCODING_MS_1252); + OString aTemp = read_uInt8s_ToOString(*xCompObj, nStringLen - 1); + aOleIdentifier = OStringToOUString(aTemp, RTL_TEXTENCODING_MS_1252); } } } @@ -2627,7 +2627,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); sal_uInt32 nSpFlags = SHAPEFLAG_HAVESPT | SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_OLESHAPE; ImplCreateShape( ESCHER_ShpInst_HostControl, nSpFlags, aSolverContainer ); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "MetaFile" ), sal_False ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "MetaFile" ), sal_False ) ) aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); aPropOpt.AddOpt( ESCHER_Prop_pictureId, mnExEmbed ); aPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0x10000 ); @@ -2801,7 +2801,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a have to create a simpe Rectangle with fill bitmap instead (while not allowing BitmapMode_Repeat). */ ImplCreateShape( ESCHER_ShpInst_Rectangle, 0xa00, aSolverContainer ); // Flags: Connector | HasSpt - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "GraphicURL" ), sal_True, sal_True, sal_False ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "GraphicURL" ), sal_True, sal_True, sal_False ) ) { aPropOpt.AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone ); aPropOpt.AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle ); @@ -2815,7 +2815,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else { ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "GraphicURL" ), sal_False, sal_True ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "GraphicURL" ), sal_False, sal_True ) ) aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); } } @@ -2853,7 +2853,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { if ( mnTextSize ) { - ::rtl::OUString aUString( mXText->getString() ); + OUString aUString( mXText->getString() ); sal_uInt16 nChar; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -3087,7 +3087,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // try to get the aspect when available ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xShapeProps( mXShape, ::com::sun::star::uno::UNO_QUERY_THROW ); - xShapeProps->getPropertyValue( ::rtl::OUString( "Aspect" ) ) >>= nAspect; + xShapeProps->getPropertyValue( OUString( "Aspect" ) ) >>= nAspect; } catch( ::com::sun::star::uno::Exception& ) {} @@ -3164,13 +3164,13 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else if ( (mType.getLength() > 9) && (mType[8] == '3') && (mType[9] == 'D') ) // drawing.3D { // SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject - if ( !ImplGetPropertyValue( rtl::OUString( "Bitmap" ) ) ) + if ( !ImplGetPropertyValue( OUString( "Bitmap" ) ) ) continue; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "Bitmap" ), sal_False ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "Bitmap" ), sal_False ) ) aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); } else if ( mType == "drawing.Media" ) @@ -3180,9 +3180,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, mXPropSet, rtl::OUString( "MediaURL" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, mXPropSet, OUString( "MediaURL" ), sal_True ) ) { - rtl::OUString aMediaURL; + OUString aMediaURL; if ( (aAny >>= aMediaURL ) && !aMediaURL.isEmpty() ) { // SJ: creating the Media RefObj @@ -3253,7 +3253,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a mnAngle = 0; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer ); - if ( aPropOpt.CreateGraphicProperties( mXPropSet, rtl::OUString( "MetaFile" ), sal_False ) ) + if ( aPropOpt.CreateGraphicProperties( mXPropSet, OUString( "MetaFile" ), sal_False ) ) aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 ); } else @@ -3452,7 +3452,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ::com::sun::star::uno::Any aAny; EscherPropertyContainer aPropOpt; mnAngle = ( PropValue::GetPropertyValue( aAny, - mXPropSet, rtl::OUString( "RotateAngle" ), sal_True ) ) + mXPropSet, OUString( "RotateAngle" ), sal_True ) ) ? *((sal_Int32*)aAny.getValue() ) : 0; @@ -3586,9 +3586,9 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc EscherPropertyContainer aPropOpt2; try { - static const rtl::OUString sModel( "Model" ); - static const rtl::OUString sWidth( "Width" ); - static const rtl::OUString sHeight( "Height" ); + static const OUString sModel( "Model" ); + static const OUString sWidth( "Width" ); + static const OUString sHeight( "Height" ); uno::Reference< table::XTable > xTable; if ( mXPropSet->getPropertyValue( sModel ) >>= xTable ) @@ -3685,7 +3685,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc mnTextSize = mXText->getString().getLength(); ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "FontIndependentLineSpacing" ) ), sal_True ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ) ), sal_True ) aAny >>= mbFontIndependentLineSpacing; EscherPropertyContainer aPropOptSp; @@ -3717,10 +3717,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc } } - static const rtl::OUString sTopBorder( "TopBorder" ); - static const rtl::OUString sBottomBorder( "BottomBorder" ); - static const rtl::OUString sLeftBorder( "LeftBorder" ); - static const rtl::OUString sRightBorder( "RightBorder" ); + static const OUString sTopBorder( "TopBorder" ); + static const OUString sBottomBorder( "BottomBorder" ); + static const OUString sLeftBorder( "LeftBorder" ); + static const OUString sRightBorder( "RightBorder" ); // creating horz lines sal_Int32 nYPos = MapPoint( rXShape->getPosition() ).Y; diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index fa1347bed5b5..e8df344b228e 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -23,7 +23,7 @@ // --------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------- -PptEscherEx::PptEscherEx( SvStream& rOutStrm, const rtl::OUString& rBaseURI ) : +PptEscherEx::PptEscherEx( SvStream& rOutStrm, const OUString& rBaseURI ) : EscherEx( EscherExGlobalRef( new EscherExGlobal ), &rOutStrm ) { mxGlobal->SetBaseURI( rBaseURI ); diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index 334b0ba107f3..eecd15c4e9b2 100644 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -48,7 +48,7 @@ class PptEscherEx : public EscherEx public: - PptEscherEx( SvStream& rOut, const rtl::OUString& ); + PptEscherEx( SvStream& rOut, const OUString& ); ~PptEscherEx(); void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 ); diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 663bd98a19a6..6dbaeecddbea 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -66,8 +66,6 @@ #include using ::std::map; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::container::XChild; using ::com::sun::star::util::XCloneable; @@ -91,7 +89,7 @@ using namespace ::com::sun::star::presentation; namespace ppt { -void ImplTranslateAttribute( rtl::OUString& rString, const TranslateMode eTranslateMode ) +void ImplTranslateAttribute( OUString& rString, const TranslateMode eTranslateMode ) { if ( eTranslateMode != TRANSLATE_NONE ) { @@ -108,7 +106,7 @@ void ImplTranslateAttribute( rtl::OUString& rString, const TranslateMode eTransl { if ( eTranslateMode & TRANSLATE_VALUE ) { - rString = rtl::OUString( (sal_Unicode)'#' ); + rString = OUString( (sal_Unicode)'#' ); rString += OUString::createFromAscii( p->mpMSName ); } else @@ -147,7 +145,7 @@ void ImplTranslateAttribute( rtl::OUString& rString, const TranslateMode eTransl } } -sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const rtl::OUString& rPresetSubType ) +sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const OUString& rPresetSubType ) { sal_uInt32 nPresetSubType = 0; sal_Bool bTranslated = sal_False; @@ -659,7 +657,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > if( xAudio.is() ) { Any aAny( xAudio->getSource() ); - rtl::OUString aURL; + OUString aURL; if ( ( aAny >>= aURL) && !aURL.isEmpty() ) { @@ -908,17 +906,17 @@ void AnimationExporter::GetUserData( const Sequence< NamedValue >& rUserData, co } } -sal_uInt32 AnimationExporter::GetPresetID( const rtl::OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ) +sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ) { sal_uInt32 nPresetId = 0; bPresetId = sal_False; - if ( rPreset.match( rtl::OUString( "ppt_" ), 0 ) ) + if ( rPreset.match( OUString( "ppt_" ), 0 ) ) { sal_Int32 nLast = rPreset.lastIndexOf( '_' ); if ( ( nLast != -1 ) && ( ( nLast + 1 ) < rPreset.getLength() ) ) { - rtl::OUString aNumber( rPreset.copy( nLast + 1 ) ); + OUString aNumber( rPreset.copy( nLast + 1 ) ); nPresetId = aNumber.toInt32(); bPresetId = sal_True; } @@ -1024,14 +1022,14 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer } if ( pAny[ DFF_ANIM_PRESET_ID ] ) { - rtl::OUString sPreset; + OUString sPreset; if ( *pAny[ DFF_ANIM_PRESET_ID ] >>= sPreset ) nPresetId = GetPresetID( sPreset, nAPIPresetClass, bPresetId ); } if ( pAny[ DFF_ANIM_PRESET_SUB_TYPE ] ) { - rtl::OUString sPresetSubType; + OUString sPresetSubType; if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) { nPresetSubType = TranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType ); @@ -1157,7 +1155,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 if ( eTranslateMode & TRANSLATE_NUMBER_TO_STRING ) { Any aAny; - rtl::OUString aNumber( rtl::OUString::valueOf( fVal ) ); + OUString aNumber( OUString::valueOf( fVal ) ); aAny <<= aNumber; exportAnimPropertyString( rStrm, nPropertyId, aNumber, eTranslateMode ); } @@ -1171,7 +1169,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 break; case ::com::sun::star::uno::TypeClass_STRING : { - rtl::OUString aStr; + OUString aStr; if ( rAny >>= aStr ) { exportAnimPropertyString( rStrm, nPropertyId, aStr, eTranslateMode ); @@ -1185,12 +1183,12 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 } return bRet; } -void AnimationExporter::exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const rtl::OUString& rVal, const TranslateMode eTranslateMode ) +void AnimationExporter::exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode ) { EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId ); sal_uInt8 nType = DFF_ANIM_PROP_TYPE_UNISTRING; rStrm << nType; - rtl::OUString aStr( rVal ); + OUString aStr( rVal ); if ( eTranslateMode != TRANSLATE_NONE ) ImplTranslateAttribute( aStr, eTranslateMode ); writeZString( rStrm, aStr ); @@ -1221,7 +1219,7 @@ void AnimationExporter::exportAnimPropertyByte( SvStream& rStrm, const sal_uInt1 << nVal; } -void AnimationExporter::writeZString( SvStream& rStrm, const rtl::OUString& rVal ) +void AnimationExporter::writeZString( SvStream& rStrm, const OUString& rVal ) { sal_Int32 i; for ( i = 0; i < rVal.getLength(); i++ ) @@ -1393,16 +1391,16 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim } } -Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::OUString& rAttributeName ) +Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const OUString& rAttributeName ) { - rtl::OUString aDest; + OUString aDest; if ( rAttributeName == "X" || rAttributeName == "Y" || rAttributeName == "Width" || rAttributeName == "Height" ) { - rtl::OUString aStr; + OUString aStr; if ( rSourceValue >>= aStr ) { ImplTranslateAttribute( aStr, TRANSLATE_MEASURE ); @@ -1417,7 +1415,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: { double fNumber = 0.0; if ( rSourceValue >>= fNumber ) - aDest += rtl::OUString::valueOf( fNumber ); + aDest += OUString::valueOf( fNumber ); } else if ( rAttributeName == "Color" || rAttributeName == "FillColor" // "Fillcolor" or "FillColor" ? @@ -1427,25 +1425,25 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl:: { sal_Int32 nColor = 0; Sequence< double > aHSL( 3 ); - rtl::OUString aP( "," ); + OUString aP( "," ); if ( rSourceValue >>= aHSL ) { aDest += "hsl("; - aDest += rtl::OUString::valueOf( (sal_Int32)( aHSL[ 0 ] / ( 360.0 / 255 ) ) ); + aDest += OUString::valueOf( (sal_Int32)( aHSL[ 0 ] / ( 360.0 / 255 ) ) ); aDest += aP; - aDest += rtl::OUString::valueOf( (sal_Int32)( aHSL[ 1 ] * 255.0 ) ); + aDest += OUString::valueOf( (sal_Int32)( aHSL[ 1 ] * 255.0 ) ); aDest += aP; - aDest += rtl::OUString::valueOf( (sal_Int32)( aHSL[ 2 ] * 255.0 ) ); + aDest += OUString::valueOf( (sal_Int32)( aHSL[ 2 ] * 255.0 ) ); aDest += ")"; } else if ( rSourceValue >>= nColor ) { aDest += "rgb("; - aDest += rtl::OUString::valueOf( (sal_Int32)( (sal_Int8)nColor ) ); + aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)nColor ) ); aDest += aP; - aDest += rtl::OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 8 ) ) ); + aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 8 ) ) ); aDest += aP; - aDest += rtl::OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 16 ) ) ); + aDest += OUString::valueOf( (sal_Int32)( (sal_Int8)( nColor >> 16 ) ) ); aDest += ")"; } } @@ -1542,7 +1540,7 @@ void AnimationExporter::exportAnimateSet( SvStream& rStrm, const Reference< XAni } } -sal_uInt32 AnimationExporter::GetValueTypeForAttributeName( const rtl::OUString& rAttributeName ) +sal_uInt32 AnimationExporter::GetValueTypeForAttributeName( const OUString& rAttributeName ) { sal_uInt32 nValueType = 0; @@ -1680,7 +1678,7 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X if ( !xAnimate->getAttributeName().isEmpty() || nForceAttributeNames ) { EscherExContainer aAnimateAttributeNames( rStrm, DFF_msofbtAnimateAttributeNames, 1 ); - rtl::OUString aAttributeName( xAnimate->getAttributeName() ); + OUString aAttributeName( xAnimate->getAttributeName() ); if ( nForceAttributeNames ) { if( nForceAttributeNames == 1 ) @@ -1744,7 +1742,7 @@ Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, s Reference< XTextRange > xTextRange( xTextParagraphEnumeration->nextElement(), UNO_QUERY ); if ( xTextRange.is() ) { - rtl::OUString aParaText( xTextRange->getString() ); + OUString aParaText( xTextRange->getString() ); sal_Int32 nLength = aParaText.getLength() + 1; rEnd += nLength; if ( nCurrentParagraph == nParagraph ) diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index b40742a14b3a..570b5222740f 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -68,10 +68,10 @@ class AnimationExporter { ::com::sun::star::uno::Any aTarget; - void writeZString( SvStream& rStrm, const rtl::OUString& rVal ); + void writeZString( SvStream& rStrm, const OUString& rVal ); sal_Bool getColorAny( const ::com::sun::star::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const; sal_Bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ); - void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const rtl::OUString& rVal, const TranslateMode eTranslateMode ); + void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode ); void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal, const TranslateMode eTranslateMode ); void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode ); void exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal, const TranslateMode eTranslateMode ); @@ -119,13 +119,13 @@ public: sal_Int32 mnCurrentGroup; // helper methods also used in ooxml export - static ::com::sun::star::uno::Any convertAnimateValue( const ::com::sun::star::uno::Any& rSource, const rtl::OUString& rAttributeName ); + static ::com::sun::star::uno::Any convertAnimateValue( const ::com::sun::star::uno::Any& rSource, const OUString& rAttributeName ); static sal_Bool GetNodeType( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, sal_Int16& nType ); static sal_Int16 GetFillMode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_Int16 nFillDefault ); static void GetUserData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rUserData, const ::com::sun::star::uno::Any ** pAny, sal_Size nLen ); - static sal_uInt32 TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const rtl::OUString& rPresetSubType ); - static sal_uInt32 GetPresetID( const rtl::OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ); - static sal_uInt32 GetValueTypeForAttributeName( const rtl::OUString& rAttributeName ); + static sal_uInt32 TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const OUString& rPresetSubType ); + static sal_uInt32 GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ); + static sal_uInt32 GetValueTypeForAttributeName( const OUString& rAttributeName ); static const sal_Char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection ); static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetElementShape( const ::com::sun::star::uno::Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, sal_Bool& rParagraphTarget ); diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 3519ed516d1d..efa58fdbc02b 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -28,7 +28,7 @@ namespace ppt { -ExSoundEntry::ExSoundEntry(const rtl::OUString& rString) +ExSoundEntry::ExSoundEntry(const OUString& rString) : nFileSize(0) , aSoundURL(rString) { @@ -38,7 +38,7 @@ ExSoundEntry::ExSoundEntry(const rtl::OUString& rString) ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); sal_Int64 nVal = 0; - ::cppu::convertPropertyValue( nVal, aCnt.getPropertyValue( ::rtl::OUString( "Size" ) ) ); + ::cppu::convertPropertyValue( nVal, aCnt.getPropertyValue( OUString( "Size" ) ) ); nFileSize = (sal_uInt32)nVal; } catch( ::com::sun::star::uno::Exception& ) @@ -47,13 +47,13 @@ ExSoundEntry::ExSoundEntry(const rtl::OUString& rString) } }; -rtl::OUString ExSoundEntry::ImplGetName() const +OUString ExSoundEntry::ImplGetName() const { INetURLObject aTmp( aSoundURL ); return aTmp.GetName(); } -rtl::OUString ExSoundEntry::ImplGetExtension() const +OUString ExSoundEntry::ImplGetExtension() const { INetURLObject aTmp( aSoundURL ); String aExtension( aTmp.GetExtension() ); @@ -62,15 +62,15 @@ rtl::OUString ExSoundEntry::ImplGetExtension() const return aExtension; } -sal_Bool ExSoundEntry::IsSameURL(const rtl::OUString& rURL) const +sal_Bool ExSoundEntry::IsSameURL(const OUString& rURL) const { return ( rURL == aSoundURL ); } sal_uInt32 ExSoundEntry::GetSize( sal_uInt32 nId ) const { - rtl::OUString aName( ImplGetName() ); - rtl::OUString aExtension( ImplGetExtension() ); + OUString aName( ImplGetName() ); + OUString aExtension( ImplGetExtension() ); sal_uInt32 nSize = 8; // SoundContainer Header if ( !aName.isEmpty() ) // String Atom ( instance 0 - name of sound ) @@ -78,7 +78,7 @@ sal_uInt32 ExSoundEntry::GetSize( sal_uInt32 nId ) const if ( !aExtension.isEmpty() ) // String Atom ( instance 1 - extension of sound ) nSize += aExtension.getLength() * 2 + 8; - rtl::OUString aId( OUString::number(nId) ); // String Atom ( instance 2 - reference id ) + OUString aId( OUString::number(nId) ); // String Atom ( instance 2 - reference id ) nSize += 2 * aId.getLength() + 8; nSize += nFileSize + 8; // SoundData Atom @@ -97,7 +97,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const // create SoundContainer rSt << (sal_uInt32)( ( EPP_Sound << 16 ) | 0xf ) << (sal_uInt32)( GetSize( nId ) - 8 ); - rtl::OUString aSoundName( ImplGetName() ); + OUString aSoundName( ImplGetName() ); sal_Int32 i, nSoundNameLen = aSoundName.getLength(); if ( nSoundNameLen ) { @@ -106,7 +106,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const for ( i = 0; i < nSoundNameLen; ++i ) rSt << aSoundName[i]; } - rtl::OUString aExtension( ImplGetExtension() ); + OUString aExtension( ImplGetExtension() ); sal_Int32 nExtensionLen = aExtension.getLength(); if ( nExtensionLen ) { @@ -116,7 +116,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const rSt << aExtension[i]; } // id of sound ( instance 2 ) - rtl::OUString aId( OUString::number(nId ) ); + OUString aId( OUString::number(nId ) ); sal_Int32 nIdLen = aId.getLength(); rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 32 ) << (sal_uInt32)( nIdLen * 2 ); for ( i = 0; i < nIdLen; ++i ) @@ -145,7 +145,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const } } -sal_uInt32 ExSoundCollection::GetId(const rtl::OUString& rString) +sal_uInt32 ExSoundCollection::GetId(const OUString& rString) { sal_uInt32 nSoundId = 0; if (!rString.isEmpty()) diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index efbf9cccc87c..a83bf5ba9238 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -34,17 +34,17 @@ namespace ppt class ExSoundEntry { sal_uInt32 nFileSize; - rtl::OUString aSoundURL; + OUString aSoundURL; - rtl::OUString ImplGetName() const; - rtl::OUString ImplGetExtension() const; + OUString ImplGetName() const; + OUString ImplGetExtension() const; public : - sal_Bool IsSameURL(const rtl::OUString& rURL) const; + sal_Bool IsSameURL(const OUString& rURL) const; sal_uInt32 GetFileSize( ) const { return nFileSize; }; - ExSoundEntry(const rtl::OUString& rSoundURL); + ExSoundEntry(const OUString& rSoundURL); /// @return size of a complete SoundContainer. sal_uInt32 GetSize( sal_uInt32 nId ) const; @@ -55,7 +55,7 @@ class ExSoundCollection { public: - sal_uInt32 GetId(const rtl::OUString&); + sal_uInt32 GetId(const OUString&); /// @return size of a complete SoundCollectionContainer. sal_uInt32 GetSize() const; diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index f9c15f7b9753..8e9ff5c4fbc7 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -169,7 +169,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert if ( !InitSOIface() ) return; - FontCollectionEntry aDefaultFontDesc( rtl::OUString( "Times New Roman" ), + FontCollectionEntry aDefaultFontDesc( OUString( "Times New Roman" ), ROMAN, awt::FontPitch::VARIABLE, RTL_TEXTENCODING_MS_1252 ); @@ -179,10 +179,10 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert return; sal_Int32 nWidth = 21000; - if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Width" ) ) ) + if ( ImplGetPropertyValue( mXPagePropSet, OUString( "Width" ) ) ) mAny >>= nWidth; sal_Int32 nHeight = 29700; - if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Height" ) ) ) + if ( ImplGetPropertyValue( mXPagePropSet, OUString( "Height" ) ) ) mAny >>= nHeight; maNotesPageSize = MapSize( awt::Size( nWidth, nHeight ) ); @@ -191,10 +191,10 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert return; nWidth = 28000; - if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Width" ) ) ) + if ( ImplGetPropertyValue( mXPagePropSet, OUString( "Width" ) ) ) mAny >>= nWidth; nHeight = 21000; - if ( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Height" ) ) ) + if ( ImplGetPropertyValue( mXPagePropSet, OUString( "Height" ) ) ) mAny >>= nHeight; maDestPageSize = MapSize( awt::Size( nWidth, nHeight ) ); @@ -325,7 +325,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) /* try to get the "real" background PropertySet. If the normal page is not supporting this property, it is taken the property from the master */ - sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Background" ), sal_True ); + sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ), sal_True ); if ( bHasBackground ) bHasBackground = ( aAny >>= mXBackgroundPropSet ); if ( !bHasBackground ) @@ -342,7 +342,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) ( aXMasterDrawPage, UNO_QUERY ); if ( aXMasterPagePropSet.is() ) { - sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet, rtl::OUString( "Background" ) ); + sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet, OUString( "Background" ) ); if ( bBackground ) { aAny >>= mXBackgroundPropSet; @@ -369,7 +369,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) SetCurrentStyleSheet( nMasterNum ); Reference< XPropertySet > aXBackgroundPropSet; - sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Background" ) ); + sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ) ); if ( bHasBackground ) bHasBackground = ( aAny >>= aXBackgroundPropSet ); @@ -388,7 +388,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) } } */ - if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "IsBackgroundObjectsVisible" ) ) ) + if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundObjectsVisible" ) ) ) { sal_Bool bBackgroundObjectsVisible = sal_False; if ( aAny >>= bBackgroundObjectsVisible ) @@ -424,7 +424,7 @@ sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) return sal_False; SetCurrentStyleSheet( nPageNum ); - if ( !ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Background" ) ) ) // load background shape + if ( !ImplGetPropertyValue( mXPagePropSet, OUString( "Background" ) ) ) // load background shape return sal_False; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet; if ( !( mAny >>= aXBackgroundPropSet ) ) @@ -441,7 +441,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference { ::com::sun::star::uno::Any aAny; sal_Int32 nLayout = 20; - if ( GetPropertyValue( aAny, rXPropSet, rtl::OUString( "Layout" ) ), sal_True ) + if ( GetPropertyValue( aAny, rXPropSet, OUString( "Layout" ) ), sal_True ) aAny >>= nLayout; DBG(printf("GetLayoutOffset %" SAL_PRIdINT32 "\n", nLayout)); @@ -499,7 +499,7 @@ sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType ) if ( aXPropertySet.is() ) { - if ( ImplGetPropertyValue( aXPropertySet, rtl::OUString( "Number" ) ) ) + if ( ImplGetPropertyValue( aXPropertySet, OUString( "Number" ) ) ) nRetValue |= *(sal_Int16*)mAny.getValue(); if ( nRetValue & 0xffff ) // avoid overflow nRetValue--; @@ -546,7 +546,7 @@ sal_Bool PPTWriterBase::GetStyleSheets() Reference< XPropertySet > aXPropSet( mXModel, UNO_QUERY ); - sal_uInt16 nDefaultTab = ( aXPropSet.is() && ImplGetPropertyValue( aXPropSet, rtl::OUString( "TabStop" ) ) ) + sal_uInt16 nDefaultTab = ( aXPropSet.is() && ImplGetPropertyValue( aXPropSet, OUString( "TabStop" ) ) ) ? (sal_uInt16)( *(sal_Int32*)mAny.getValue() / 4.40972 ) : 1250; @@ -571,25 +571,25 @@ sal_Bool PPTWriterBase::GetStyleSheets() case EPP_TEXTTYPE_CenterTitle : case EPP_TEXTTYPE_Title : { - aStyle = rtl::OUString( "title" ); + aStyle = OUString( "title" ); aFamily = aXNamed->getName(); } break; case EPP_TEXTTYPE_Body : { - aStyle = rtl::OUString( "outline1" ); // SD_LT_SEPARATOR + aStyle = OUString( "outline1" ); // SD_LT_SEPARATOR aFamily = aXNamed->getName(); } break; case EPP_TEXTTYPE_Other : { - aStyle = rtl::OUString( "standard" ); - aFamily = rtl::OUString( "graphics" ); + aStyle = OUString( "standard" ); + aFamily = OUString( "graphics" ); } break; case EPP_TEXTTYPE_CenterBody : { - aStyle = rtl::OUString( "subtitle" ); + aStyle = OUString( "subtitle" ); aFamily = aXNamed->getName(); } break; @@ -754,7 +754,7 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) maSize = MapSize( mXShape->getSize() ); maRect = Rectangle( Point( maPosition.X, maPosition.Y ), Size( maSize.Width, maSize.Height ) ); - rtl::OStringBuffer aTypeBuffer(rtl::OUStringToOString( + OStringBuffer aTypeBuffer(OUStringToOString( mXShape->getShapeType(), RTL_TEXTENCODING_UTF8)); // remove "com.sun.star." aTypeBuffer.remove(0, RTL_CONSTASCII_LENGTH("com.sun.star.")); @@ -764,14 +764,14 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) mType = aTypeBuffer.makeStringAndClear(); mbPresObj = mbEmptyPresObj = sal_False; - if ( ImplGetPropertyValue( rtl::OUString( "IsPresentationObject" ) ) ) + if ( ImplGetPropertyValue( OUString( "IsPresentationObject" ) ) ) mAny >>= mbPresObj; - if ( mbPresObj && ImplGetPropertyValue( rtl::OUString( "IsEmptyPresentationObject" ) ) ) + if ( mbPresObj && ImplGetPropertyValue( OUString( "IsEmptyPresentationObject" ) ) ) mAny >>= mbEmptyPresObj; mnAngle = ( PropValue::GetPropertyValue( aAny, - mXPropSet, rtl::OUString( "RotateAngle" ), sal_True ) ) + mXPropSet, OUString( "RotateAngle" ), sal_True ) ) ? *((sal_Int32*)aAny.getValue() ) : 0; diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 7260f27467db..724acfe6edfa 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -70,9 +70,6 @@ FSNS( XML_xmlns, XML_p ), "http://schemas.openxmlformats.org/presentationml/2006/main", \ FSNS( XML_xmlns, XML_r ), "http://schemas.openxmlformats.org/officeDocument/2006/relationships" -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::beans; @@ -348,7 +345,7 @@ bool PowerPointExport::exportDocument() throw() mXModel.set( getModel(), UNO_QUERY ); mXStatusIndicator.set( getStatusIndicator(), UNO_QUERY ); - rtl::OUString sBaseURI( "BaseURI"); + OUString sBaseURI( "BaseURI"); std::vector< PropertyValue > aProperties; PropertyValue aProperty; aProperty.Name = sBaseURI; @@ -421,7 +418,7 @@ void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropert " #define GETA(propName) \ - ImplGetPropertyValue( mXPagePropSet, rtl::OUString( #propName ) ) + ImplGetPropertyValue( mXPagePropSet, OUString( #propName ) ) #define GET(variable, propName) \ if ( GETA(propName) ) \ @@ -1024,7 +1021,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons sal_uInt32 nPresetId = 0; sal_Bool bPresetId = sal_False; if ( pAny[ DFF_ANIM_PRESET_ID ] ) { - rtl::OUString sPreset; + OUString sPreset; if ( *pAny[ DFF_ANIM_PRESET_ID ] >>= sPreset ) nPresetId = AnimationExporter::GetPresetID( sPreset, nPresetClass, bPresetId ); } @@ -1032,7 +1029,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons sal_uInt32 nPresetSubType = 0; sal_Bool bPresetSubType = sal_False; if ( pAny[ DFF_ANIM_PRESET_SUB_TYPE ] ) { - rtl::OUString sPresetSubType; + OUString sPresetSubType; if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) { nPresetSubType = AnimationExporter::TranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType ); bPresetSubType = sal_True; @@ -2098,7 +2095,7 @@ sal_Bool PowerPointExport::WriteNotesMaster() pFS->startElementNS( XML_p, XML_cSld, FSEND ); Reference< XPropertySet > aXBackgroundPropSet; - if( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Background" ) ) && + if( ImplGetPropertyValue( mXPagePropSet, OUString( "Background" ) ) && ( mAny >>= aXBackgroundPropSet ) ) ImplWriteBackground( pFS, aXBackgroundPropSet ); diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index a4697fb4fbbc..d9fd8fd8f4c4 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -108,7 +108,7 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo { sal_Bool bIsDark = sal_False; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) aAny >>= bIsDark; nFontColor = bIsDark ? 0xffffff : 0x000000; } @@ -239,7 +239,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co if ( nLineSpacing > 0 ) // if nLinespacing is < 0 the linespacing is an absolute spacing { sal_Bool bFixedLineSpacing = sal_False; - uno::Any aAny = rXPropSet->getPropertyValue( ::rtl::OUString( "FontIndependentLineSpacing" ) ); + uno::Any aAny = rXPropSet->getPropertyValue( OUString( "FontIndependentLineSpacing" ) ); if( !(aAny >>= bFixedLineSpacing) || !bFixedLineSpacing ) { const FontCollectionEntry* pDesc = rFontCollection.GetById( rCharLevel.mnFont ); @@ -351,7 +351,7 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo { sal_Bool bIsDark = sal_False; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rPagePropSet, rtl::OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) aAny >>= bIsDark; nBulletColor = bIsDark ? 0xffffff : 0x000000; } diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 534a31b71c91..adadc4459aab 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -110,7 +110,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text } sal_Bool bSymbol = sal_False; - if ( bPropSetsValid && ImplGetPropertyValue( rtl::OUString( "CharFontCharSet" ), sal_False ) ) + if ( bPropSetsValid && ImplGetPropertyValue( OUString( "CharFontCharSet" ), sal_False ) ) { sal_Int16 nCharset = 0; mAny >>= nCharset; @@ -219,21 +219,21 @@ void PortionObj::Write( SvStream* pStrm, sal_Bool bLast ) void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue ) { - sal_Bool bOk = ImplGetPropertyValue( rtl::OUString( "CharFontName" ), bGetPropStateValue ); + sal_Bool bOk = ImplGetPropertyValue( OUString( "CharFontName" ), bGetPropStateValue ); meFontName = ePropState; if ( bOk ) { - FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() ); + FontCollectionEntry aFontDesc( *(OUString*)mAny.getValue() ); sal_uInt32 nCount = rFontCollection.GetCount(); mnFont = (sal_uInt16)rFontCollection.GetId( aFontDesc ); if ( mnFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( rtl::OUString( "CharFontCharSet" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSet" ), sal_False ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontFamily" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamily" ), sal_False ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontPitch" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitch" ), sal_False ) ) mAny >>= rFontDesc.Pitch; } } @@ -241,53 +241,53 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool sal_Int16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); if ( mpText && mnTextSize && xPPTBreakIter.is() ) { - rtl::OUString sT( mpText, mnTextSize ); + OUString sT( mpText, mnTextSize ); nScriptType = xPPTBreakIter->getScriptType( sT, 0 ); } if ( nScriptType != com::sun::star::i18n::ScriptType::COMPLEX ) { - bOk = ImplGetPropertyValue( rtl::OUString( "CharFontNameAsian" ), bGetPropStateValue ); + bOk = ImplGetPropertyValue( OUString( "CharFontNameAsian" ), bGetPropStateValue ); meAsianOrComplexFont = ePropState; if ( bOk ) { - FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() ); + FontCollectionEntry aFontDesc( *(OUString*)mAny.getValue() ); sal_uInt32 nCount = rFontCollection.GetCount(); mnAsianOrComplexFont = (sal_uInt16)rFontCollection.GetId( aFontDesc ); if ( mnAsianOrComplexFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( rtl::OUString( "CharFontCharSetAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSetAsian" ), sal_False ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontFamilyAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamilyAsian" ), sal_False ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontPitchAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitchAsian" ), sal_False ) ) mAny >>= rFontDesc.Pitch; } } } else { - bOk = ImplGetPropertyValue( rtl::OUString( "CharFontNameComplex" ), bGetPropStateValue ); + bOk = ImplGetPropertyValue( OUString( "CharFontNameComplex" ), bGetPropStateValue ); meAsianOrComplexFont = ePropState; if ( bOk ) { - FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() ); + FontCollectionEntry aFontDesc( *(OUString*)mAny.getValue() ); sal_uInt32 nCount = rFontCollection.GetCount(); mnAsianOrComplexFont = (sal_uInt16)rFontCollection.GetId( aFontDesc ); if ( mnAsianOrComplexFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( rtl::OUString( "CharFontCharSetComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSetComplex" ), sal_False ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontFamilyComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamilyComplex" ), sal_False ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( rtl::OUString( "CharFontPitchComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitchComplex" ), sal_False ) ) mAny >>= rFontDesc.Pitch; } } } - rtl::OUString aCharHeightName, aCharWeightName, aCharLocaleName, aCharPostureName; + OUString aCharHeightName, aCharWeightName, aCharLocaleName, aCharPostureName; switch( nScriptType ) { case com::sun::star::i18n::ScriptType::ASIAN : @@ -362,7 +362,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool } } - if ( ImplGetPropertyValue( rtl::OUString( "CharUnderline" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "CharUnderline" ), bGetPropStateValue ) ) { sal_Int16 nVal(0); mAny >>= nVal; @@ -377,7 +377,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) mnCharAttrHard |= 4; - if ( ImplGetPropertyValue( rtl::OUString( "CharShadowed" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "CharShadowed" ), bGetPropStateValue ) ) { sal_Bool bBool(sal_False); mAny >>= bBool; @@ -387,7 +387,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) mnCharAttrHard |= 16; - if ( ImplGetPropertyValue( rtl::OUString( "CharRelief" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "CharRelief" ), bGetPropStateValue ) ) { sal_Int16 nVal(0); mAny >>= nVal; @@ -397,7 +397,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) mnCharAttrHard |= 512; - if ( ImplGetPropertyValue( rtl::OUString( "CharColor" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "CharColor" ), bGetPropStateValue ) ) { sal_uInt32 nSOColor = *( (sal_uInt32*)mAny.getValue() ); mnCharColor = nSOColor & 0xff00ff00; // green and hibyte @@ -407,7 +407,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool meCharColor = ePropState; mnCharEscapement = 0; - if ( ImplGetPropertyValue( rtl::OUString( "CharEscapement" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "CharEscapement" ), bGetPropStateValue ) ) { mAny >>= mnCharEscapement; if ( mnCharEscapement > 100 ) @@ -478,9 +478,9 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com sal_uInt32 nRetValue = 0; sal_Int32 nFormat; ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, rXPropSet, rtl::OUString( "TextPortionType" ), sal_True ) ) + if ( GetPropertyValue( aAny, rXPropSet, OUString( "TextPortionType" ), sal_True ) ) { - rtl::OUString aTextFieldType( *(::rtl::OUString*)aAny.getValue() ); + OUString aTextFieldType( *(OUString*)aAny.getValue() ); if ( aTextFieldType == "TextField" ) { if ( GetPropertyValue( aAny, rXPropSet, aTextFieldType, sal_True ) ) @@ -494,16 +494,16 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com xFieldPropSet( aXTextField, ::com::sun::star::uno::UNO_QUERY ); if ( xFieldPropSet.is() ) { - rtl::OUString aFieldKind( aXTextField->getPresentation( sal_True ) ); + OUString aFieldKind( aXTextField->getPresentation( sal_True ) ); if ( aFieldKind == "Date" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { sal_Bool bBool = sal_False; aAny >>= bBool; if ( !bBool ) // Fixed DateFields does not exist in PPT { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "Format" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ) ), sal_True ) { nFormat = *(sal_Int32*)aAny.getValue(); switch ( nFormat ) @@ -525,8 +525,8 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com } else if ( aFieldKind == "URL" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "URL" ) ), sal_True ) - rURL = String( *(::rtl::OUString*)aAny.getValue() ); + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "URL" ) ), sal_True ) + rURL = String( *(OUString*)aAny.getValue() ); nRetValue = 4 << 28; } else if ( aFieldKind == "Page" ) @@ -539,13 +539,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com } else if ( aFieldKind == "Time" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { sal_Bool bBool = sal_False; aAny >>= bBool; if ( !bBool ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { nFormat = *(sal_Int32*)aAny.getValue(); nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000; @@ -563,13 +563,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com } else if ( aFieldKind == "ExtTime" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "IsFix" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { sal_Bool bBool = sal_False; aAny >>= bBool; if ( !bBool ) { - if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "Format" ) ), sal_True ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ) ), sal_True ) { nFormat = *(sal_Int32*)aAny.getValue(); switch ( nFormat ) @@ -740,23 +740,23 @@ void ParagraphObj::CalculateGraphicBulletSize( sal_uInt16 nFontHeight ) void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue ) { ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "ParaLeftMargin" ) ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "ParaLeftMargin" ) ) ) { sal_Int32 nVal(0); if ( aAny >>= nVal ) nTextOfs = static_cast< sal_Int16 >( nVal / ( 2540.0 / 576 ) + 0.5 ) ; } - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "ParaFirstLineIndent" ) ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "ParaFirstLineIndent" ) ) ) { if ( aAny >>= nBulletOfs ) nBulletOfs = static_cast< sal_Int32 >( nBulletOfs / ( 2540.0 / 576 ) + 0.5 ); } - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "NumberingIsNumber" ) ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "NumberingIsNumber" ) ) ) aAny >>= bNumberingIsNumber; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > aXIndexReplace; - if ( bIsBullet && ImplGetPropertyValue( rtl::OUString( "NumberingRules" ), bGetPropStateValue ) ) + if ( bIsBullet && ImplGetPropertyValue( OUString( "NumberingRules" ), bGetPropStateValue ) ) { if ( ( mAny >>= aXIndexReplace ) && nNumberingDepth < aXIndexReplace->getCount() ) { @@ -779,14 +779,14 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 const void* pValue = pPropValue[ i ].Value.getValue(); if ( pValue ) { - ::rtl::OUString aPropName( pPropValue[ i ].Name ); + OUString aPropName( pPropValue[ i ].Name ); if ( aPropName == "NumberingType" ) nNumberingType = *( (sal_Int16*)pValue ); else if ( aPropName == "Adjust" ) nHorzAdjust = *( (sal_Int16*)pValue ); else if ( aPropName == "BulletChar" ) { - rtl::OUString aString( *( (::rtl::OUString*)pValue ) ); + OUString aString( *( (OUString*)pValue ) ); if ( !aString.isEmpty() ) cBulletId = aString[ 0 ]; } @@ -803,7 +803,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 } else if ( aPropName == "GraphicURL" ) - aGraphicURL = ( *(::rtl::OUString*)pValue ); + aGraphicURL = ( *(OUString*)pValue ); else if ( aPropName == "GraphicSize" ) { if ( pPropValue[ i ].Value.getValueType() == ::getCppuType( (::com::sun::star::awt::Size*)0) ) @@ -835,9 +835,9 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 nBulletFlags |= 8; } else if ( aPropName == "Prefix" ) - sPrefix = ( *(::rtl::OUString*)pValue ); + sPrefix = ( *(OUString*)pValue ); else if ( aPropName == "Suffix" ) - sSuffix = ( *(::rtl::OUString*)pValue ); + sSuffix = ( *(OUString*)pValue ); #ifdef DBG_UTIL else if ( ! ( ( aPropName == "SymbolTextDistance" ) @@ -859,7 +859,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 nIndex++; if ( aGraphicURL.Len() > nIndex ) { - rtl::OString aUniqueId(rtl::OUStringToOString(aGraphicURL.Copy(nIndex, aGraphicURL.Len() - nIndex), RTL_TEXTENCODING_UTF8)); + OString aUniqueId(OUStringToOString(aGraphicURL.Copy(nIndex, aGraphicURL.Len() - nIndex), RTL_TEXTENCODING_UTF8)); if ( !aUniqueId.isEmpty() ) { nBulletId = rBuProv.GetId( aUniqueId, aBuGraSize ); @@ -1082,10 +1082,10 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo } ImplGetNumberingLevel( rBuProv, nDepth, mbIsBullet, bGetPropStateValue ); - if ( ImplGetPropertyValue( rtl::OUString( "ParaTabStops" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaTabStops" ), bGetPropStateValue ) ) maTabStop = *( ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop>*)mAny.getValue(); sal_Int16 eTextAdjust( ::com::sun::star::style::ParagraphAdjust_LEFT ); - if ( GetPropertyValue( aAny, mXPropSet, rtl::OUString( "ParaAdjust" ), bGetPropStateValue ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "ParaAdjust" ), bGetPropStateValue ) ) aAny >>= eTextAdjust; switch ( (::com::sun::star::style::ParagraphAdjust)eTextAdjust ) { @@ -1105,7 +1105,7 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo } meTextAdjust = ePropState; - if ( ImplGetPropertyValue( rtl::OUString( "ParaLineSpacing" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaLineSpacing" ), bGetPropStateValue ) ) { ::com::sun::star::style::LineSpacing aLineSpacing = *( (::com::sun::star::style::LineSpacing*)mAny.getValue() ); @@ -1129,30 +1129,30 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo } meLineSpacing = ePropState; - if ( ImplGetPropertyValue( rtl::OUString( "ParaBottomMargin" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaBottomMargin" ), bGetPropStateValue ) ) { double fSpacing = *( (sal_uInt32*)mAny.getValue() ) + ( 2540.0 / 576.0 ) - 1; mnLineSpacingBottom = (sal_Int16)(-( fSpacing * 576.0 / 2540.0 ) ); } meLineSpacingBottom = ePropState; - if ( ImplGetPropertyValue( rtl::OUString( "ParaTopMargin" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaTopMargin" ), bGetPropStateValue ) ) { double fSpacing = *( (sal_uInt32*)mAny.getValue() ) + ( 2540.0 / 576.0 ) - 1; mnLineSpacingTop = (sal_Int16)(-( fSpacing * 576.0 / 2540.0 ) ); } meLineSpacingTop = ePropState; - if ( ImplGetPropertyValue( rtl::OUString( "ParaIsForbiddenRules" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaIsForbiddenRules" ), bGetPropStateValue ) ) mAny >>= mbForbiddenRules; meForbiddenRules = ePropState; - if ( ImplGetPropertyValue( rtl::OUString( "ParaIsHangingPunctuation" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "ParaIsHangingPunctuation" ), bGetPropStateValue ) ) mAny >>= mbParagraphPunctation; meParagraphPunctation = ePropState; mnBiDi = 0; - if ( ImplGetPropertyValue( rtl::OUString( "WritingMode" ), bGetPropStateValue ) ) + if ( ImplGetPropertyValue( OUString( "WritingMode" ), bGetPropStateValue ) ) { sal_Int16 nWritingMode = 0; mAny >>= nWritingMode; @@ -1349,7 +1349,7 @@ FontCollection::FontCollection() : xPPTBreakIter = com::sun::star::i18n::BreakIterator::create( xContext ); } -short FontCollection::GetScriptDirection( const rtl::OUString& rString ) const +short FontCollection::GetScriptDirection( const OUString& rString ) const { short nRet = ScriptTypeDetector::getScriptDirection( rString, 0, com::sun::star::i18n::ScriptDirection::NEUTRAL ); return nRet; diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index e8df14893f61..8c9af66a08c4 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -86,7 +86,6 @@ using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::io; using namespace ::com::sun::star::ucb; using namespace com::sun::star::ui::dialogs; -using rtl::OUString; using namespace ::sfx2; @@ -295,15 +294,15 @@ sal_Bool SdGRFFilter::Export() beans::PropertyValues aArgs; TransformItems( SID_SAVEASDOC, *pSet, aArgs ); - rtl::OUString sInteractionHandler( "InteractionHandler" ); - rtl::OUString sFilterName( "FilterName" ); - rtl::OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) ); + OUString sInteractionHandler( "InteractionHandler" ); + OUString sFilterName( "FilterName" ); + OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) ); sal_Bool bFilterNameFound = sal_False; sal_Int32 i, nCount; for ( i = 0, nCount = aArgs.getLength(); i < nCount; i++ ) { - rtl::OUString& rStr = aArgs[ i ].Name; + OUString& rStr = aArgs[ i ].Name; if ( rStr == sFilterName ) { bFilterNameFound = sal_True; diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 3a2aa5ff7956..75c7e74df591 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -55,7 +55,7 @@ class SdHtmlOptionsDialog : public cppu::WeakImplHelper5 { Sequence< PropertyValue > maMediaDescriptor; Sequence< PropertyValue > maFilterDataSequence; - ::rtl::OUString aDialogTitle; + OUString aDialogTitle; DocumentType meDocType; public: @@ -71,9 +71,9 @@ public: virtual void SAL_CALL initialize( const Sequence< Any > & aArguments ) throw ( Exception, RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw ( RuntimeException ); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw ( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException ); // XPropertyAccess virtual Sequence< PropertyValue > SAL_CALL getPropertyValues() throw ( RuntimeException ); @@ -85,7 +85,7 @@ public: // XExecuteDialog virtual sal_Int16 SAL_CALL execute() throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( ::com::sun::star::uno::RuntimeException ); // XExporter @@ -105,24 +105,24 @@ Reference< XInterface > return static_cast< ::cppu::OWeakObject* > ( new SdHtmlOptionsDialog ); } -::rtl::OUString SdHtmlOptionsDialog_getImplementationName() +OUString SdHtmlOptionsDialog_getImplementationName() throw( RuntimeException ) { - return ::rtl::OUString( "com.sun.star.comp.draw.SdHtmlOptionsDialog" ); + return OUString( "com.sun.star.comp.draw.SdHtmlOptionsDialog" ); } -sal_Bool SAL_CALL SdHtmlOptionsDialog_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SdHtmlOptionsDialog_supportsService( const OUString& ServiceName ) throw( RuntimeException ) { return ServiceName.equals("com.sun.star.ui.dialog.FilterOptionsDialog"); } -Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames() +Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aRet(1); - ::rtl::OUString* pArray = aRet.getArray(); - pArray[0] = ::rtl::OUString("com.sun.star.ui.dialog.FilterOptionsDialog"); + Sequence< OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString("com.sun.star.ui.dialog.FilterOptionsDialog"); return aRet; } @@ -160,17 +160,17 @@ void SAL_CALL SdHtmlOptionsDialog::initialize( const Sequence< Any > & ) } // XServiceInfo -::rtl::OUString SAL_CALL SdHtmlOptionsDialog::getImplementationName() +OUString SAL_CALL SdHtmlOptionsDialog::getImplementationName() throw( RuntimeException ) { return SdHtmlOptionsDialog_getImplementationName(); } -sal_Bool SAL_CALL SdHtmlOptionsDialog::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool SAL_CALL SdHtmlOptionsDialog::supportsService( const OUString& rServiceName ) throw( RuntimeException ) { return SdHtmlOptionsDialog_supportsService( rServiceName ); } -Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog::getSupportedServiceNames() +Sequence< OUString > SAL_CALL SdHtmlOptionsDialog::getSupportedServiceNames() throw ( RuntimeException ) { return SdHtmlOptionsDialog_getSupportedServiceNames(); @@ -215,7 +215,7 @@ void SdHtmlOptionsDialog::setPropertyValues( const Sequence< PropertyValue > & a } // XExecutableDialog -void SdHtmlOptionsDialog::setTitle( const ::rtl::OUString& aTitle ) +void SdHtmlOptionsDialog::setTitle( const OUString& aTitle ) throw ( RuntimeException ) { aDialogTitle = aTitle; diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index 64603ca0879e..3f7daf14f5af 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -38,7 +38,6 @@ #include "buttonset.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::embed; @@ -89,13 +88,13 @@ Reference< XInputStream > ButtonsImpl::getInputStream( const OUString& rName ) return xInputStream; } -bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvider, const rtl::OUString& rName, Graphic& rGraphic ) +bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvider, const OUString& rName, Graphic& rGraphic ) { Reference< XInputStream > xInputStream( getInputStream( rName ) ); if( xInputStream.is() && xGraphicProvider.is() ) try { Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString("InputStream" ); + aMediaProperties[0].Name = OUString("InputStream" ); aMediaProperties[0].Value <<= xInputStream; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) ); @@ -142,8 +141,8 @@ public: int getCount() const; - bool getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ); - bool exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ); + bool getPreview( int nSet, const std::vector< OUString >& rButtons, Image& rImage ); + bool exportButton( int nSet, const OUString& rPath, const OUString& rName ); void scanForButtonSets( const OUString& rPath ); @@ -190,7 +189,7 @@ int ButtonSetImpl::getCount() const return maButtons.size(); } -bool ButtonSetImpl::getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ) +bool ButtonSetImpl::getPreview( int nSet, const std::vector< OUString >& rButtons, Image& rImage ) { if( (nSet >= 0) && (nSet < static_cast(maButtons.size()))) { @@ -202,7 +201,7 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< rtl::OUString >& rB aDev.SetMapMode(MapMode(MAP_PIXEL)); Size aSize; - std::vector< rtl::OUString >::const_iterator aIter( rButtons.begin() ); + std::vector< OUString >::const_iterator aIter( rButtons.begin() ); while( aIter != rButtons.end() ) { Graphic aGraphic; @@ -241,7 +240,7 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< rtl::OUString >& rB return false; } -bool ButtonSetImpl::exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ) +bool ButtonSetImpl::exportButton( int nSet, const OUString& rPath, const OUString& rName ) { if( (nSet >= 0) && (nSet < static_cast(maButtons.size()))) { @@ -278,12 +277,12 @@ int ButtonSet::getCount() const return mpImpl->getCount(); } -bool ButtonSet::getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ) +bool ButtonSet::getPreview( int nSet, const std::vector< OUString >& rButtons, Image& rImage ) { return mpImpl->getPreview( nSet, rButtons, rImage ); } -bool ButtonSet::exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ) +bool ButtonSet::exportButton( int nSet, const OUString& rPath, const OUString& rName ) { return mpImpl->exportButton( nSet, rPath, rName ); } diff --git a/sd/source/filter/html/buttonset.hxx b/sd/source/filter/html/buttonset.hxx index 666778e792f7..537f3280b6fe 100644 --- a/sd/source/filter/html/buttonset.hxx +++ b/sd/source/filter/html/buttonset.hxx @@ -37,8 +37,8 @@ public: int getCount() const; - bool getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ); - bool exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ); + bool getPreview( int nSet, const std::vector< OUString >& rButtons, Image& rImage ); + bool exportButton( int nSet, const OUString& rPath, const OUString& rName ); private: ButtonSetImpl* mpImpl; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 5cc1a4f1baf3..a792e20b8041 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -82,8 +82,6 @@ #include "buttonset.hxx" #include -using ::rtl::OUString; -using ::rtl::OString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -939,7 +937,7 @@ bool HtmlExport::SavePresentation() aProperties[ 0 ].Name = "Overwrite"; aProperties[ 0 ].Value <<= (sal_Bool)sal_True; aProperties[ 1 ].Name = "FilterName"; - aProperties[ 1 ].Value <<= rtl::OUString("impress8"); + aProperties[ 1 ].Value <<= OUString("impress8"); xStorable->storeToURL( aURL, aProperties ); mpDocSh->EnableSetModified( false ); @@ -1148,7 +1146,7 @@ bool HtmlExport::WriteHtml( const String& rFileName, bool bAddExtension, const S nErr = aFile.createStream(aFull , pStr); if(nErr == 0) { - rtl::OString aStr(rtl::OUStringToOString(rHtmlData, + OString aStr(OUStringToOString(rHtmlData, RTL_TEXTENCODING_UTF8)); *pStr << aStr.getStr(); nErr = aFile.close(); @@ -2868,7 +2866,7 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S INetURLObject aURL( SvtPathOptions().GetConfigPath() ); String aScript; - aURL.Append( rtl::OUString("webcast") ); + aURL.Append( OUString("webcast") ); aURL.Append( rSource ); meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource ); @@ -2878,7 +2876,7 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S if( pIStm ) { - rtl::OString aLine; + OString aLine; while( pIStm->ReadLine( aLine ) ) { @@ -2926,7 +2924,7 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S nErr = aFile.createStream(aDest, pStr); if(nErr == 0) { - rtl::OString aStr(rtl::OUStringToOString(aScript, + OString aStr(OUStringToOString(aScript, RTL_TEXTENCODING_UTF8)); *pStr << aStr.getStr(); @@ -2977,10 +2975,10 @@ bool HtmlExport::CreatePERLScripts() return false; } - if(!CopyScript(maExportPath, rtl::OUString("edit.pl"), maIndex, true )) + if(!CopyScript(maExportPath, OUString("edit.pl"), maIndex, true )) return false; - if(!CopyScript(maExportPath, rtl::OUString("index.pl"), maIndexUrl, true )) + if(!CopyScript(maExportPath, OUString("index.pl"), maIndexUrl, true )) return false; return true; @@ -3086,7 +3084,7 @@ bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileA catch( com::sun::star::uno::Exception& ) { OSL_FAIL(OString(OString("sd::HtmlExport::checkFileExists(), exception caught: ") + - rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } return false; @@ -3148,7 +3146,7 @@ bool HtmlExport::checkForExistingFiles() catch( Exception& ) { OSL_FAIL(OString(OString("sd::HtmlExport::checkForExistingFiles(), exception caught: ") + - rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); bFound = false; } @@ -3238,7 +3236,7 @@ sal_uLong EasyFile::createFileName( const String& rURL, String& rFileName ) if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aURLStr; + OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rURL, aURLStr ); aURL = INetURLObject( aURLStr ); } @@ -3294,8 +3292,8 @@ sal_Bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr ) rCtxStr = SdResId( mnResId ); - rCtxStr = rCtxStr.replaceAll( rtl::OUString("$(URL1)"), maURL1 ); - rCtxStr = rCtxStr.replaceAll( rtl::OUString("$(URL2)"), maURL2 ); + rCtxStr = rCtxStr.replaceAll( OUString("$(URL1)"), maURL1 ); + rCtxStr = rCtxStr.replaceAll( OUString("$(URL2)"), maURL2 ); return true; } diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 3a8f586d8818..e9b35a9d6dda 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -210,7 +210,7 @@ class HtmlExport String GetButtonName( int nButton ) const; public: - HtmlExport( rtl::OUString aPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell ); + HtmlExport( OUString aPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell ); virtual ~HtmlExport(); static String ColorToHTMLString( Color aColor ); diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 092cd990fcaa..2a3975815e9e 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -57,7 +57,6 @@ using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using ::rtl::OUString; #define NOOFPAGES 6 @@ -1319,9 +1318,9 @@ void SdPublishingDlg::LoadPreviewButtons() "collapse.png", }; - std::vector< rtl::OUString > aButtonNames; + std::vector< OUString > aButtonNames; for( int i = 0; i < nButtonCount; ++i ) - aButtonNames.push_back( rtl::OUString::createFromAscii( pButtonNames[i] ) ); + aButtonNames.push_back( OUString::createFromAscii( pButtonNames[i] ) ); int nSetCount = mpButtonSet->getCount(); diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 87e7e98787db..d5124155c8a2 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -158,7 +158,7 @@ sal_uInt32 Ppt97Animation::GetSoundRef() const { return m_aAtom.nSoundRef; } -void Ppt97Animation::SetSoundFileUrl( const ::rtl::OUString& rSoundFileUrl ) +void Ppt97Animation::SetSoundFileUrl( const OUString& rSoundFileUrl ) { m_aSoundFileUrl = rSoundFileUrl; } @@ -256,12 +256,12 @@ sal_Int16 Ppt97Animation::GetTextAnimationType() const } return nRet; } -::rtl::OUString Ppt97Animation::GetPresetId() const +OUString Ppt97Animation::GetPresetId() const { UpdateCacheData(); return m_aPresetId; } -::rtl::OUString Ppt97Animation::GetPresetSubType() const +OUString Ppt97Animation::GetPresetSubType() const { UpdateCacheData(); return m_aSubType; @@ -269,7 +269,7 @@ sal_Int16 Ppt97Animation::GetTextAnimationType() const void Ppt97Animation::ClearCacheData() const { - m_aPresetId = m_aSubType = rtl::OUString(); + m_aPresetId = m_aSubType = OUString(); m_bHasSpecialDuration = false; m_fDurationInSeconds = 0.001; } diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index 8a876f1f0227..dc653895c97b 100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -104,7 +104,7 @@ public: //public methods //set methods void SetDimColor( sal_Int32 nDimColor ); - void SetSoundFileUrl( const ::rtl::OUString& rSoundFileUrl ); + void SetSoundFileUrl( const OUString& rSoundFileUrl ); void SetAnimateAssociatedShape( bool bAnimate ); //true if the shape should be animated in addition to the text //action methods @@ -116,8 +116,8 @@ public: //public methods private: //private methods //read methods - ::rtl::OUString GetPresetId() const; - ::rtl::OUString GetPresetSubType() const; + OUString GetPresetId() const; + OUString GetPresetSubType() const; bool HasAfterEffect() const; bool HasAfterEffect_ChangeColor() const; bool HasAfterEffect_DimAtNextEffect() const; @@ -146,12 +146,12 @@ private: //private methods private: //private member //input information: Ppt97AnimationInfoAtom m_aAtom; ///< pure input from stream - ::rtl::OUString m_aSoundFileUrl; ///< this needs to be set in addition from outside as this class has not the knowledge to translate the sound bits to a file url + OUString m_aSoundFileUrl; ///< this needs to be set in addition from outside as this class has not the knowledge to translate the sound bits to a file url //cached generated output information: mutable bool m_bDirtyCache; - mutable ::rtl::OUString m_aPresetId; // m_aPresetId and m_aSubType match to the values in sd/xml/effects.xml - mutable ::rtl::OUString m_aSubType; + mutable OUString m_aPresetId; // m_aPresetId and m_aSubType match to the values in sd/xml/effects.xml + mutable OUString m_aSubType; mutable bool m_bHasSpecialDuration; mutable double m_fDurationInSeconds; }; diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index 92054bd6ddb5..04abeeecd920 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -242,7 +242,7 @@ struct transition sal_Int16 mnSubType; sal_Bool mbDirection; // true: default geometric direction - static const transition* find( const rtl::OUString& rName ); + static const transition* find( const OUString& rName ); static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const sal_Bool bDirection ); }; static const transition gTransitions[] = diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 9dc25d8af73b..1bbb9155c80f 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -126,7 +126,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto #endif PowerPointImportParam aParam( rDocStream, nImportFlags ); - SvStream* pCurrentUserStream = rStorage.OpenSotStream( rtl::OUString( "Current User" ), STREAM_STD_READ ); + SvStream* pCurrentUserStream = rStorage.OpenSotStream( OUString( "Current User" ), STREAM_STD_READ ); if( pCurrentUserStream ) { *pCurrentUserStream >> aParam.aCurrentUserAtom; @@ -183,7 +183,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage { sal_uLong nPosMerk = rStCtrl.Tell(); - pStData = rStorage_.OpenSotStream( rtl::OUString( "Pictures" ), STREAM_STD_READ ); + pStData = rStorage_.OpenSotStream( OUString( "Pictures" ), STREAM_STD_READ ); rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 ); sal_uLong nDocLen = maDocHd.GetRecEndFilePos(); @@ -257,7 +257,7 @@ sal_Bool ImplSdPPTImport::Import() SeekOle( pDocShell, mnFilterOptions ); // hyperlinks - PropRead* pDInfoSec2 = new PropRead( mrStorage, rtl::OUString( "\005DocumentSummaryInformation" ) ); + PropRead* pDInfoSec2 = new PropRead( mrStorage, OUString( "\005DocumentSummaryInformation" ) ); if ( pDInfoSec2->IsValid() ) { PropItem aPropItem; @@ -358,7 +358,7 @@ sal_Bool ImplSdPPTImport::Import() Dictionary aDict; if ( pSection->GetDictionary( aDict ) ) { - Dictionary::const_iterator iter = aDict.find( rtl::OUString("_PID_HLINKS") ); + Dictionary::const_iterator iter = aDict.find( OUString("_PID_HLINKS") ); if ( iter != aDict.end() ) { @@ -413,13 +413,13 @@ sal_Bool ImplSdPPTImport::Import() { sal_uInt32 nPageNumber = 0; OUString aString( pHyperlink->aSubAdress ); - rtl::OString aStringAry[ 3 ]; + OString aStringAry[ 3 ]; sal_uInt16 nTokenCount = comphelper::string::getTokenCount(aString, ','); if ( nTokenCount > 3 ) nTokenCount = 3; sal_uInt16 nToken; for( nToken = 0; nToken < nTokenCount; nToken++ ) - aStringAry[nToken] = rtl::OUStringToOString(aString.getToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8); + aStringAry[nToken] = OUStringToOString(aString.getToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8); sal_Bool bSucceeded = sal_False; @@ -1251,7 +1251,7 @@ sal_Bool ImplSdPPTImport::Import() DffRecordHeader aContent; if ( SeekToRec( rStCtrl, PPT_PST_CString, aCuHeader.GetRecEndFilePos(), &aContent ) ) { - rtl::OUString aCuShow; + OUString aCuShow; aContent.SeekToBegOfRecord( rStCtrl ); if ( ReadString( aCuShow ) ) { @@ -1368,7 +1368,7 @@ sal_Bool ImplSdPPTImport::Import() uno::Reference xDocProps = xDPS->getDocumentProperties(); sfx2::LoadOlePropertySet(xDocProps, &mrStorage); - xDocProps->setTemplateName(::rtl::OUString()); + xDocProps->setTemplateName(OUString()); pSdrModel->setLock(false); pSdrModel->EnableUndo(true); @@ -1853,7 +1853,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const { - rtl::OUString aRetval; + OUString aRetval; sal_uInt32 nPosMerk = rStCtrl.Tell(); DffRecordHeader aDocHd; if ( SeekToDocument( &aDocHd ) ) @@ -1870,7 +1870,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const while( !bDone && SeekToRec( rStCtrl, PPT_PST_Sound, nDataLen, &aSoundRecHd ) ) { sal_uInt32 nStrLen = aSoundRecHd.GetRecEndFilePos(); - rtl::OUString aRefStr; + OUString aRefStr; sal_uInt32 nPosMerk2 = rStCtrl.Tell(); if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 2 ) ) { @@ -1962,7 +1962,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const { - rtl::OUString aRetVal; + OUString aRetVal; DffRecordHeader* pHd( const_cast(this)->aDocRecManager.GetRecordHeader( PPT_PST_ExObjList, SEEK_FROM_BEGINNING ) ); if ( pHd ) { @@ -1996,7 +1996,7 @@ String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const case PPT_PST_CString : { aHd.SeekToBegOfRecord( rStCtrl ); - rtl::OUString aStr; + OUString aStr; if ( ReadString( aStr ) ) { if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aStr, aRetVal ) ) @@ -2605,7 +2605,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi case PPT_PST_InteractiveInfo: { sal_uInt32 nFilePosMerk2 = rSt.Tell(); - rtl::OUString aMacroName; + OUString aMacroName; if(SeekToRec( rSt, PPT_PST_CString, nHdRecEnd, NULL, 0 ) ) ReadString(aMacroName); diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 192169da1fd5..8b5a2f251856 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -66,8 +66,6 @@ #include using ::std::map; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; @@ -236,10 +234,10 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec #ifdef DBG_ANIM_LOG static int ppt_anim_debug_stream_number = 1; - rtl::OUString ppt_anim_debug_filename("ppt-animation-import-debug-output-"); - ppt_anim_debug_filename += rtl::OUString::valueOf(ppt_anim_debug_stream_number++); - ppt_anim_debug_filename += rtl::OUString(".xml"); - mpFile = fopen( rtl::OUStringToOString( ppt_anim_debug_filename, RTL_TEXTENCODING_UTF8).getStr() , "w+" ); + OUString ppt_anim_debug_filename("ppt-animation-import-debug-output-"); + ppt_anim_debug_filename += OUString::valueOf(ppt_anim_debug_stream_number++); + ppt_anim_debug_filename += OUString(".xml"); + mpFile = fopen( OUStringToOString( ppt_anim_debug_filename, RTL_TEXTENCODING_UTF8).getStr() , "w+" ); #endif dump("\n"); @@ -1310,7 +1308,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim // TODO: DFF_ANIM_ID if( rSet.hasProperty( DFF_ANIM_ID ) ) { - rtl::OUString aString; + OUString aString; rSet.getProperty( DFF_ANIM_ID ) >>= aString; //if( !aString.isEmpty() ) //{ @@ -1320,7 +1318,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim // TODO: DFF_ANIM_EVENT_FILTER if( rSet.hasProperty( DFF_ANIM_EVENT_FILTER ) ) { - rtl::OUString aString; + OUString aString; rSet.getProperty( DFF_ANIM_EVENT_FILTER ) >>= aString; //if( !aString.isEmpty() ) //{ @@ -1333,7 +1331,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim Reference< XAnimate > xAnim( xNode, UNO_QUERY ); if( xAnim.is() ) { - rtl::OUString aString; + OUString aString; rSet.getProperty( DFF_ANIM_TIMEFILTER ) >>= aString; if( !aString.isEmpty() ) { @@ -1624,7 +1622,7 @@ void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const R Any aAny; if ( importAttributeValue( pChildAtom, aAny ) ) { - rtl::OUString filter; + OUString filter; aAny >>= filter; dump( " filter=\"%s\"", filter ); @@ -2132,7 +2130,7 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R Any aPath; if ( importAttributeValue( pChildAtom, aPath ) ) { - rtl::OUString aStr; + OUString aStr; if ( aPath >>= aStr ) { aStr = aStr.replace( 'E', ' ' ); @@ -2754,7 +2752,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen if( aValues[i] >>= aStr ) dump( "%s", - ::rtl::OUStringToOString( aStr, + OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValues[i] >>= nVal ) dump( "%f", nVal ); @@ -2766,7 +2764,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen { if( aValuePair.First >>= aStr ) dump( "%s", - ::rtl::OUStringToOString( aStr, + OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValuePair.First >>= nVal ) dump( "%f", nVal ); @@ -2775,7 +2773,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen if( aValuePair.Second >>= aStr ) dump( ",%s", - ::rtl::OUStringToOString( aStr, + OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ).getStr() ); else if( aValuePair.Second >>= nVal ) dump( ",%f", nVal ); @@ -2853,7 +2851,7 @@ bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny ) { if ( ( nRecLen & 1 ) && ( nRecLen > 1 ) ) { - rtl::OUString aOUString = mpPPTImport->MSDFFReadZString( mrStCtrl, nRecLen - 1, sal_True ); + OUString aOUString = mpPPTImport->MSDFFReadZString( mrStCtrl, nRecLen - 1, sal_True ); rAny <<= aOUString; bOk = true; @@ -3282,7 +3280,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine ) if( importAttributeValue( pChildAtom, aValue ) ) { sal_Int32 nInt; - rtl::OUString aString; + OUString aString; double fDouble; if( aValue >>= nInt ) @@ -3292,7 +3290,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine ) else if( aValue >>= aString ) { fprintf(mpFile, " value=\"%s\"", - rtl::OUStringToOString(aString, + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr()); } else if( aValue >>= fDouble ) @@ -3443,7 +3441,7 @@ void AnimationImporter::dump( Any& rAny ) } else if( rAny >>= aString ) { - fprintf( mpFile, "%s", rtl::OUStringToOString(aString, + fprintf( mpFile, "%s", OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() ); } else if( rAny >>= nInt ) @@ -3655,11 +3653,11 @@ void AnimationImporter::dump( const PropertySet& rSet ) case DFF_ANIM_ID: { - rtl::OUString aString; + OUString aString; if( aAny >>= aString ) { fprintf( mpFile, " id=\"%s\"", - rtl::OUStringToOString(aString, + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() ); bKnown = true; } @@ -3668,11 +3666,11 @@ void AnimationImporter::dump( const PropertySet& rSet ) case DFF_ANIM_EVENT_FILTER: { - rtl::OUString aString; + OUString aString; if( aAny >>= aString ) { fprintf( mpFile, " eventFilter=\"%s\"", - rtl::OUStringToOString(aString, + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() ); bKnown = true; } @@ -3691,11 +3689,11 @@ void AnimationImporter::dump( const PropertySet& rSet ) case DFF_ANIM_TIMEFILTER: { - rtl::OUString aString; + OUString aString; if( aAny >>= aString ) { fprintf( mpFile, " timeFilter=\"%s\"", - rtl::OUStringToOString(aString, + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() ); bKnown = true; } @@ -3704,11 +3702,11 @@ void AnimationImporter::dump( const PropertySet& rSet ) case DFF_ANIM_RUNTIMECONTEXT: { - rtl::OUString aString; + OUString aString; if( aAny >>= aString ) { fprintf( mpFile, " runtimeContext=\"%s\"", - rtl::OUStringToOString(aString, + OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() ); bKnown = true; } @@ -3786,9 +3784,9 @@ void AnimationImporter::dump( const char * pText ) fprintf( mpFile, "%s", pText ); } -void AnimationImporter::dump( const rtl::OUString& rString ) +void AnimationImporter::dump( const OUString& rString ) { - fprintf( mpFile, rtl::OUStringToOString(rString, + fprintf( mpFile, OUStringToOString(rString, RTL_TEXTENCODING_UTF8).getStr() ); } @@ -3814,7 +3812,7 @@ void AnimationImporter::dump( const char * pText, const char * pText2 ) void AnimationImporter::dump( const char * pText, const OUString& rString ) { - fprintf( mpFile, pText, rtl::OUStringToOString(rString, + fprintf( mpFile, pText, OUStringToOString(rString, RTL_TEXTENCODING_UTF8).getStr() ); } @@ -3860,7 +3858,7 @@ void AnimationImporter::dump( const char * , const char * ) { } -void AnimationImporter::dump( const char * , const rtl::OUString& ) +void AnimationImporter::dump( const char * , const OUString& ) { } diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 6f39990ed935..691e41872cdf 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -72,7 +72,7 @@ private: void importAnimateKeyPoints( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void importPropertySetContainer( const Atom* pAtom,PropertySet& rSet ); bool importAttributeValue( const Atom* pAtom, com::sun::star::uno::Any& rAny ); - bool importAttributeNamesContainer( const Atom* pAtom, rtl::OUString& rAttributeNames ); + bool importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames ); sal_Int32 importTargetElementContainer( const Atom* pAtom, ::com::sun::star::uno::Any& rTarget, sal_Int16& nSubType ); void fillNode( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTiming, const AnimationNode& rNode, const PropertySet& rSet ); @@ -100,7 +100,7 @@ private: #ifdef DBG_ANIM_LOG FILE * mpFile; void dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen ); - void dump( const rtl::OUString& rString ); + void dump( const OUString& rString ); void dump( sal_uInt32 nLen, bool bNewLine = true ); #endif @@ -115,7 +115,7 @@ private: void dump( const char * pText, sal_Int64 nInt ); void dump( const char * pText, double fDouble ); void dump( const char * pText, const char * pText2 ); - void dump( const char * pText, const rtl::OUString& rString ); + void dump( const char * pText, const OUString& rString ); }; } // namespace ppt diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index e835e25d1815..f8809fb1b528 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -65,12 +65,12 @@ SdFilter::~SdFilter() // ----------------------------------------------------------------------------- -::rtl::OUString SdFilter::ImplGetFullLibraryName( const ::rtl::OUString& rLibraryName ) const +OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const { - String aTemp(::rtl::OUString(SVLIBRARY("?"))); + String aTemp(OUString(SVLIBRARY("?"))); xub_StrLen nIndex = aTemp.Search( (sal_Unicode)'?' ); aTemp.Replace( nIndex, 1, rLibraryName ); - ::rtl::OUString aLibraryName( aTemp ); + OUString aLibraryName( aTemp ); return aLibraryName; } @@ -79,7 +79,7 @@ SdFilter::~SdFilter() #ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } -::osl::Module* SdFilter::OpenLibrary( const ::rtl::OUString& rLibraryName ) const +::osl::Module* SdFilter::OpenLibrary( const OUString& rLibraryName ) const { std::auto_ptr< osl::Module > mod(new osl::Module); return mod->loadRelative(&thisModule, ImplGetFullLibraryName(rLibraryName), diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index bbb383937f9f..f70b12a31764 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -96,13 +96,13 @@ sal_Bool SdPPTFilter::Import() xDualStorage = pStorage->OpenSotStorage( sDualStorage, STREAM_STD_READ ); pStorage = xDualStorage; } - SvStream* pDocStream = pStorage->OpenSotStream( rtl::OUString("PowerPoint Document") , STREAM_STD_READ ); + SvStream* pDocStream = pStorage->OpenSotStream( OUString("PowerPoint Document") , STREAM_STD_READ ); if( pDocStream ) { pDocStream->SetVersion( pStorage->GetVersion() ); pDocStream->SetCryptMaskKey(pStorage->GetKey()); - if ( pStorage->IsStream( rtl::OUString("EncryptedSummary" ) ) ) + if ( pStorage->IsStream( OUString("EncryptedSummary" ) ) ) mrMedium.SetError( ERRCODE_SVX_READ_FILTER_PPOINT, OSL_LOG_PREFIX ); else { @@ -173,7 +173,7 @@ sal_Bool SdPPTFilter::Export() if( mbShowProgress ) CreateStatusIndicator(); - //rtl::OUString sBaseURI( "BaseURI"); + //OUString sBaseURI( "BaseURI"); std::vector< PropertyValue > aProperties; PropertyValue aProperty; aProperty.Name = "BaseURI"; diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 42e70de3158d..e8c622f53720 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -34,7 +34,6 @@ #include "drawdoc.hxx" #include "glob.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::style; class SdTransformOOo2xDocument diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 5cf4f2c708a6..e82ae25753b5 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -69,7 +69,6 @@ #include -using rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -269,9 +268,9 @@ sal_Int32 ReadThroughComponent( return ERRCODE_SFX_WRONGPASSWORD; #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX parse exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -305,9 +304,9 @@ sal_Int32 ReadThroughComponent( return ERRCODE_SFX_WRONGPASSWORD; #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -316,9 +315,9 @@ sal_Int32 ReadThroughComponent( catch (const packages::zip::ZipIOException& r) { #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "Zip exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #else @@ -329,9 +328,9 @@ sal_Int32 ReadThroughComponent( catch (const io::IOException& r) { #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "IO exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #else @@ -342,9 +341,9 @@ sal_Int32 ReadThroughComponent( catch (const uno::Exception& r) { #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "uno exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #else @@ -458,7 +457,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) { RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sd", "cl93746", "SdXMLFilter::Import" ); #ifdef TIMELOG - rtl::OString aFile(rtl::OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aFile(OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "importing %s", aFile.getStr() ); #endif @@ -840,7 +839,7 @@ sal_Bool SdXMLFilter::Export() { #ifdef TIMELOG RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sd", "cl93746", "SdXMLFilter::Export" ); - rtl::OString aFile(rtl::OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aFile(OUStringToOString(mrMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "exporting %s", aFile.getStr() ); #endif @@ -1083,9 +1082,9 @@ sal_Bool SdXMLFilter::Export() catch (const uno::Exception &e) { #if OSL_DEBUG_LEVEL > 1 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "uno Exception caught while exporting:\n")); - aError.append(rtl::OUStringToOString(e.Message, + aError.append(OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #else diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index bd3cf7d43864..e4d0281a3069 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -60,7 +60,7 @@ void SimpleReferenceComponent::release() ) // don't break throw () { #if OSL_DEBUG_LEVEL > 0 - rtl::OString msg( rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); + OString msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( msg.getStr() ); #endif } diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 00e1ac2b2d0f..d07489869b6a 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -46,7 +46,6 @@ #include "View.hxx" #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; @@ -267,7 +266,7 @@ Reference SAL_CALL if (nIndex == 0) return mxAccessibleOLEObject; - throw lang::IndexOutOfBoundsException ( "no child with index " + rtl::OUString::valueOf(nIndex), NULL); + throw lang::IndexOutOfBoundsException ( "no child with index " + OUString::valueOf(nIndex), NULL); } @@ -452,17 +451,17 @@ void SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleDocumentViewBase::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessibleDocumentViewBase"); + return OUString("AccessibleDocumentViewBase"); } -::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL +::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleDocumentViewBase::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { @@ -704,11 +703,11 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void) /// Create a name for this view. -::rtl::OUString +OUString AccessibleDocumentViewBase::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString ("AccessibleDocumentViewBase"); + return OUString ("AccessibleDocumentViewBase"); } @@ -717,11 +716,11 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void) /** Create a description for this view. Use the model's description or URL if a description is not available. */ -::rtl::OUString +OUString AccessibleDocumentViewBase::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { - rtl::OUString sDescription; + OUString sDescription; uno::Reference xInfo (mxController, uno::UNO_QUERY); if (xInfo.is()) diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 047421716a5f..7d0f2f6a46b5 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -52,7 +52,6 @@ #include "sdresid.hxx" #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; @@ -240,7 +239,7 @@ uno::Reference SAL_CALL } else throw lang::IndexOutOfBoundsException ( - "no accessible child with index " + rtl::OUString::valueOf(nIndex), + "no accessible child with index " + OUString::valueOf(nIndex), static_cast(this)); } @@ -333,17 +332,17 @@ void SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleDrawDocumentView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessibleDrawDocumentView"); + return OUString("AccessibleDrawDocumentView"); } -::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL +::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleDrawDocumentView::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { @@ -365,16 +364,16 @@ void SAL_CALL /// Create a name for this view. -::rtl::OUString +OUString AccessibleDrawDocumentView::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { - rtl::OUString sName; + OUString sName; uno::Reference xInfo (mxController, uno::UNO_QUERY); if (xInfo.is()) { - uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() ); + uno::Sequence< OUString > aServices( xInfo->getSupportedServiceNames() ); OUString sFirstService = aServices[0]; if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" ) { @@ -421,16 +420,16 @@ void SAL_CALL /** Create a description for this view. Use the model's description or URL if a description is not available. */ -::rtl::OUString +OUString AccessibleDrawDocumentView::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { - rtl::OUString sDescription; + OUString sDescription; uno::Reference xInfo (mxController, uno::UNO_QUERY); if (xInfo.is()) { - uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() ); + uno::Sequence< OUString > aServices( xInfo->getSupportedServiceNames() ); OUString sFirstService = aServices[0]; if ( sFirstService == "com.sun.star.drawing.DrawingDocumentDrawView" ) { diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 9c066d3ddbbc..5074eaff09ae 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -156,11 +156,11 @@ void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::R //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleOutlineView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessibleOutlineView"); + return OUString("AccessibleOutlineView"); } @@ -239,7 +239,7 @@ void SAL_CALL /// Create a name for this view. -::rtl::OUString +OUString AccessibleOutlineView::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -252,7 +252,7 @@ void SAL_CALL /** Create a description for this view. Use the model's description or URL if a description is not available. */ -::rtl::OUString +OUString AccessibleOutlineView::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 1cd092af0367..84b3695401a1 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace accessibility { @@ -248,18 +247,18 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessiblePageShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); - return ::rtl::OUString("AccessiblePageShape"); + return OUString("AccessiblePageShape"); } -::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL +::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessiblePageShape::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { @@ -307,17 +306,17 @@ void AccessiblePageShape::dispose (void) //===== protected internal ================================================== -::rtl::OUString +OUString AccessiblePageShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString ("PageShape"); + return OUString ("PageShape"); } -::rtl::OUString +OUString AccessiblePageShape::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -342,11 +341,11 @@ void AccessiblePageShape::dispose (void) -::rtl::OUString +OUString AccessiblePageShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString ("Page Shape"); + return OUString ("Page Shape"); } diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index 4d2461c739a5..220792dc0c2e 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -51,22 +51,22 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessiblePresentationGraphicShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessiblePresentationGraphicShape"); + return OUString("AccessiblePresentationGraphicShape"); } /// Set this object's name if is different to the current name. -::rtl::OUString +OUString AccessiblePresentationGraphicShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName; + OUString sName; ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape); switch (nShapeType) @@ -87,7 +87,7 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) -::rtl::OUString +OUString AccessiblePresentationGraphicShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 9423b89490d3..64e14d9e8ce4 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -45,19 +45,19 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessiblePresentationOLEShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessiblePresentationOLEShape"); + return OUString("AccessiblePresentationOLEShape"); } /// Set this object's name if it is different to the current name. -::rtl::OUString +OUString AccessiblePresentationOLEShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName; + OUString sName; ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape); switch (nShapeType) @@ -81,7 +81,7 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) return sName; } -::rtl::OUString +OUString AccessiblePresentationOLEShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index e3f58046a07d..2b48c2b436cf 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -51,22 +51,22 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessiblePresentationShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessiblePresentationShape"); + return OUString("AccessiblePresentationShape"); } /// Set this object's name if is different to the current name. -::rtl::OUString +OUString AccessiblePresentationShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName; + OUString sName; ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape); switch (nShapeType) @@ -114,7 +114,7 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) -::rtl::OUString +OUString AccessiblePresentationShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx index 01ca61973424..09bcaa0796ca 100644 --- a/sd/source/ui/accessibility/AccessibleScrollPanel.cxx +++ b/sd/source/ui/accessibility/AccessibleScrollPanel.cxx @@ -29,7 +29,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; @@ -39,8 +38,8 @@ namespace accessibility { AccessibleScrollPanel::AccessibleScrollPanel ( ::sd::toolpanel::ScrollPanel& rScrollPanel, - const ::rtl::OUString& rsName, - const ::rtl::OUString& rsDescription) + const OUString& rsName, + const OUString& rsDescription) : AccessibleTreeNode( rScrollPanel, rsName, diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 1fc462615207..9366bd16af40 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -40,7 +40,6 @@ #include "glob.hrc" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; @@ -200,7 +199,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) +OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -210,7 +209,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) +OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -490,7 +489,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleSlideSorterObject::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -508,7 +507,7 @@ sal_Bool SAL_CALL // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); for (int i=0; i SAL_CALL +uno::Sequence< OUString> SAL_CALL AccessibleSlideSorterObject::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 14ac486a9e07..ba31c04cb623 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -45,7 +45,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; @@ -289,7 +288,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) +OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -301,7 +300,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) +OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -716,7 +715,7 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleSlideSorterView::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -734,7 +733,7 @@ sal_Bool SAL_CALL // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); for (int i=0; i SAL_CALL +uno::Sequence< OUString> SAL_CALL AccessibleSlideSorterView::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx index 393e2816dd49..282208555d92 100644 --- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx +++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx @@ -33,7 +33,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; @@ -231,7 +230,7 @@ sal_Int16 SAL_CALL AccessibleTreeNode::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleTreeNode::getAccessibleDescription (void) +OUString SAL_CALL AccessibleTreeNode::getAccessibleDescription (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -241,7 +240,7 @@ sal_Int16 SAL_CALL AccessibleTreeNode::getAccessibleRole (void) -::rtl::OUString SAL_CALL AccessibleTreeNode::getAccessibleName (void) +OUString SAL_CALL AccessibleTreeNode::getAccessibleName (void) throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -565,7 +564,7 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getBackground (void) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleTreeNode::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -583,7 +582,7 @@ sal_Bool SAL_CALL // Iterate over all supported service names and return true if on of them // matches the given name. - uno::Sequence< ::rtl::OUString> aSupportedServices ( + uno::Sequence< OUString> aSupportedServices ( getSupportedServiceNames ()); for (int i=0; i SAL_CALL +uno::Sequence< OUString> SAL_CALL AccessibleTreeNode::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 08bc6eae3122..b24b8ef056a4 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::Any; @@ -490,7 +489,7 @@ bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) // -------------------------------------------------------------------- -CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const ::rtl::OUString& rsPresetId, double fDuration ) +CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) : TabDialog( pParent, SdResId( DLG_CUSTOMANIMATION_CREATE ) ) , mpPane( pPane ) , mrTargets( rTargets ) @@ -651,7 +650,7 @@ void CustomAnimationCreateDialog::setPosition() E_TABDIALOG, OUString::number(DLG_CUSTOMANIMATION_CREATE)); if ( aDlgOpt.Exists() ) { - SetWindowState( rtl::OUStringToOString(aDlgOpt.GetWindowState(), + SetWindowState( OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US) ); } else diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index 2f5fb2b3ab2b..4a0af710b320 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -41,7 +41,7 @@ class CustomAnimationCreateDialog : public TabDialog { friend class CustomAnimationCreateTabPage; public: - CustomAnimationCreateDialog( ::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const ::rtl::OUString& rsPresetId, double fDuration ); + CustomAnimationCreateDialog( ::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ); ~CustomAnimationCreateDialog(); PathKind getCreatePathKind() const; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index e6c03d6eb88c..797cd6809ee2 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -78,7 +78,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; -using ::rtl::OUString; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::Any; @@ -110,7 +109,7 @@ public: virtual Control* getControl(); private: - std::map< sal_uInt16, rtl::OUString > maPropertyValues; + std::map< sal_uInt16, OUString > maPropertyValues; ListBox* mpControl; }; @@ -567,7 +566,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window mpMenu = new PopupMenu(); for( sal_Int32 i = 25; i < 101; i += 25 ) { - String aStr(rtl::OUString::valueOf(i)); + String aStr(OUString::valueOf(i)); aStr += sal_Unicode('%'); mpMenu->InsertItem( i, aStr ); } @@ -1908,7 +1907,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, if( nPos != LISTBOX_ENTRY_NOTFOUND ) mpCBDuration->SelectEntryPos( nPos ); else - mpCBDuration->SetText(rtl::OUString::valueOf(fDuration)); + mpCBDuration->SetText(OUString::valueOf(fDuration)); } } @@ -1939,7 +1938,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, if( nPos != LISTBOX_ENTRY_NOTFOUND ) mpCBRepeat->SelectEntryPos( nPos ); else - mpCBRepeat->SetText(rtl::OUString::valueOf(fRepeat)); + mpCBRepeat->SetText(OUString::valueOf(fRepeat)); } else if( aRepeatCount.getValueType() == ::getCppuType((const Timing*)0) ) { @@ -2083,7 +2082,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) break; default: { - rtl::OUString aText( mpCBRepeat->GetText() ); + OUString aText( mpCBRepeat->GetText() ); if( !aText.isEmpty() ) aRepeatCount <<= aText.toDouble(); } @@ -2114,7 +2113,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) } else { - rtl::OUString aText( mpCBDuration->GetText() ); + OUString aText( mpCBDuration->GetText() ); if( !aText.isEmpty() ) { fDuration = aText.toDouble(); diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index a951fc01651b..38fd8df408b4 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -106,7 +106,7 @@ public: virtual ~PropertySubControl(); virtual ::com::sun::star::uno::Any getValue() = 0; - virtual void setValue( const ::com::sun::star::uno::Any& rValue, const rtl::OUString& rPresetId ) = 0; + virtual void setValue( const ::com::sun::star::uno::Any& rValue, const OUString& rPresetId ) = 0; virtual Control* getControl() = 0; @@ -114,7 +114,7 @@ public: create( sal_Int32 nType, ::Window* pParent, const ::com::sun::star::uno::Any& rValue, - const rtl::OUString& rPresetId, + const OUString& rPresetId, const Link& rModifyHdl ); sal_Int32 getControlType() const { return mnType; } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 1fde2cf6b6b2..d0e6d76fd1ad 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; -using ::rtl::OUString; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::Any; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index d1e29d0545c1..4dc8ef9b2fcf 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -88,7 +88,6 @@ using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::text; -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; using ::com::sun::star::view::XSelectionSupplier; diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx index c1f734610302..07330828526f 100644 --- a/sd/source/ui/animations/STLPropertySet.cxx +++ b/sd/source/ui/animations/STLPropertySet.cxx @@ -21,7 +21,6 @@ using namespace com::sun::star::beans; -using rtl::OUString; using com::sun::star::uno::Any; namespace sd diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 8c3913e73575..05ac403eaa07 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::uno::RuntimeException; using ::sd::framework::FrameworkHelper; @@ -946,7 +945,7 @@ void SlideTransitionPane::openSoundFileDialog() else { String aStrWarning(SdResId(STR_WARNING_NOSOUNDFILE)); - rtl::OUString aStr('%'); + OUString aStr('%'); aStrWarning.SearchAndReplace( aStr , aFile ); WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning ); aWarningBox.SetModalInputMode (sal_True); diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 8f2e1a992458..f5f7ac22e6af 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -56,7 +56,6 @@ #include #include -using ::rtl::OUString; using ::sdr::PolyPolygonEditor; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -377,7 +376,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con } XDash aDash( XDASH_RECT, 1, 80, 1, 80, 80); - rtl::OUString aEmpty( "?" ); + OUString aEmpty( "?" ); mpPathObj->SetMergedItem( XLineDashItem( aEmpty, aDash ) ); mpPathObj->SetMergedItem( XLineStyleItem( XLINE_DASH ) ); mpPathObj->SetMergedItem( XLineColorItem(aEmpty, ::Color(COL_GRAY)) ); @@ -420,7 +419,7 @@ MotionPathTag::~MotionPathTag() void MotionPathTag::updatePathAttributes() { - rtl::OUString aEmpty( "?" ); + OUString aEmpty( "?" ); ::basegfx::B2DPolygon aCandidate; if( mxPolyPoly.count() ) diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index 867a81fab099..05afa8dbb3da 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -109,7 +109,7 @@ private: SdrPathObj* mpPathObj; ::com::sun::star::awt::Point maOriginPos; SdrMark* mpMark; - rtl::OUString msLastPath; + OUString msLastPath; bool mbInUpdatePath; }; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index c4c6897ce8a6..e3fe236b591d 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -80,7 +80,6 @@ #include "textapi.hxx" #include "optsitem.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; @@ -463,16 +462,16 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) aStr.SearchAndReplaceAscii("%1", sAuthor); - aStr.Append( rtl::OUString(" (") ); - aStr.Append( rtl::OUString( getAnnotationDateTimeString( xAnnotation ) ) ); - aStr.Append( rtl::OUString("): \"") ); + aStr.Append( OUString(" (") ); + aStr.Append( OUString( getAnnotationDateTimeString( xAnnotation ) ) ); + aStr.Append( OUString("): \"") ); String sQuote( pTextApi->GetText() ); if( sQuote.Len() == 0 ) - sQuote = rtl::OUString( "..." ); + sQuote = OUString( "..." ); aStr.Append( sQuote ); - aStr.Append( rtl::OUString("\"\n") ); + aStr.Append( OUString("\"\n") ); sal_uInt16 nParaCount = comphelper::string::getTokenCount(aStr, '\n'); for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ ) @@ -524,7 +523,7 @@ void AnnotationManagerImpl::DeleteAnnotation( Reference< XAnnotation > xAnnotati } } -void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const rtl::OUString& sAuthor ) +void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const OUString& sAuthor ) { if( mpDoc->IsUndoEnabled() ) mpDoc->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_DELETE ) ) ); diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index c0d83fdafe1f..9e7a3e5e202c 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -75,7 +75,7 @@ public: void InsertAnnotation(); void DeleteAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation ); - void DeleteAnnotationsByAuthor( const rtl::OUString& sAuthor ); + void DeleteAnnotationsByAuthor( const OUString& sAuthor ); void DeleteAllAnnotations(); void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index a10b5ba00960..53b6f7de2d53 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -46,7 +46,6 @@ #include "Window.hxx" #include "drawdoc.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index d03548ad85fa..f539d1f4800a 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -84,7 +84,6 @@ #include "textapi.hxx" #include "sdresid.hxx" -using rtl::OUString; using namespace ::sd; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -233,7 +232,7 @@ void AnnotationTextWindow::LoseFocus() Window::LoseFocus(); } -rtl::OUString AnnotationTextWindow::GetSurroundingText() const +OUString AnnotationTextWindow::GetSurroundingText() const { if( mpOutlinerView ) { @@ -246,7 +245,7 @@ rtl::OUString AnnotationTextWindow::GetSurroundingText() const return aEditEngine->GetText(aSelection.nStartPara); } } - return rtl::OUString(); + return OUString(); } Selection AnnotationTextWindow::GetSurroundingTextSelection() const diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 116a9cd15f6e..ef4d3763f6a2 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -66,7 +66,7 @@ public: void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; } - virtual rtl::OUString GetSurroundingText() const; + virtual OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; virtual void GetFocus(); diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index ce978d37e231..c97b6577c1ea 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -69,7 +69,7 @@ void SdOptionsItem::Commit() mrParent.Commit( *this ); }; -void SdOptionsItem::Notify( const com::sun::star::uno::Sequence& ) +void SdOptionsItem::Notify( const com::sun::star::uno::Sequence& ) {} diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index da7583992243..8b8f78a0b08e 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -79,7 +79,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) bWaterCan(sal_False), mpResourceContainer(new ::sd::SdGlobalResourceContainer()) { - SetName( rtl::OUString( "StarDraw" ) ); // Do not translate! + SetName( OUString( "StarDraw" ) ); // Do not translate! pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM); pSearchItem->SetAppFlag(SVX_SEARCHAPP_DRAW); StartListening( *SFX_APP() ); @@ -194,7 +194,7 @@ SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName, { INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); - aURL.Append( rtl::OUString( "drawing.cfg" ) ); + aURL.Append( OUString( "drawing.cfg" ) ); SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE ); diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 0a2905e489b4..ec2c033c5911 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -550,7 +550,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) //we start without wizard //check whether we should load a template document - const ::rtl::OUString aServiceName( "com.sun.star.presentation.PresentationDocument" ); + const OUString aServiceName( "com.sun.star.presentation.PresentationDocument" ); String aStandardTemplate( SfxObjectFactory::GetStandardTemplate( aServiceName ) ); if( aStandardTemplate.Len() > 0 ) @@ -591,7 +591,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > aPasswrd( pPilotDlg->GetPassword() ); SfxStringItem aFile( SID_FILE_NAME, aFileToOpen ); - SfxStringItem aReferer( SID_REFERER, rtl::OUString()); + SfxStringItem aReferer( SID_REFERER, OUString()); SfxUnoAnyItem aPassword( SID_ENCRYPTIONDATA, com::sun::star::uno::makeAny(aPasswrd) ); if ( xTargetFrame.is() ) @@ -620,7 +620,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) aRequest.AppendItem (aPassword); aRequest.AppendItem (SfxStringItem ( SID_TARGETNAME, - rtl::OUString("_default"))); + OUString("_default"))); try { const SfxPoolItem* pRet = SFX_APP()->ExecuteSlot (aRequest); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index a46761342b21..16397d398f35 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -200,7 +200,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) if( aTmp >>= eButtonType ) { - ::rtl::OUString aLabel, aURL; + OUString aLabel, aURL; xPropSet->getPropertyValue( "Label" ) >>= aLabel; xPropSet->getPropertyValue( "TargetURL" ) >>= aURL; @@ -665,7 +665,7 @@ void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rO PrepareOLE( rObjDesc ); } -void SdTransferable::SetPageBookmarks( const std::vector &rPageBookmarks, sal_Bool bPersistent ) +void SdTransferable::SetPageBookmarks( const std::vector &rPageBookmarks, sal_Bool bPersistent ) { if( mpSourceDoc ) { diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index c668976d7ceb..99ba867f57e2 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -65,8 +65,8 @@ SfxPopupWindowType SdTbxControl::GetPopupWindowType() const SfxPopupWindow* SdTbxControl::CreatePopupWindow() { SfxPopupWindow *pWin = NULL; - rtl::OUString aToolBarResStr; - rtl::OUStringBuffer aTbxResName( "private:resource/toolbar/" ); + OUString aToolBarResStr; + OUStringBuffer aTbxResName( "private:resource/toolbar/" ); switch( GetSlotId() ) { case SID_OBJECT_ALIGN: @@ -148,8 +148,8 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId, } else { - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nImage )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nImage )); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index ddd61701c279..115f7eb581ef 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -53,7 +53,6 @@ #include "pres.hxx" #include "slidelayoutcontroller.hxx" -using rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -66,7 +65,7 @@ using namespace ::com::sun::star::beans; namespace sd { -extern ::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); +extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); // ----------------------------------------------------------------------- @@ -363,7 +362,7 @@ Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Ref // class SlideLayoutController //======================================================================== -SlideLayoutController::SlideLayoutController( const Reference< lang::XMultiServiceFactory >& rServiceManager, const rtl::OUString& sCommandURL, bool bInsertPage ) +SlideLayoutController::SlideLayoutController( const Reference< lang::XMultiServiceFactory >& rServiceManager, const OUString& sCommandURL, bool bInsertPage ) : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), sCommandURL ) , mbInsertPage( bInsertPage ) { diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 139aa56be00e..785cba0fb9ac 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -28,13 +28,13 @@ namespace sd class SlideLayoutController : public svt::PopupWindowController { public: - SlideLayoutController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const rtl::OUString& sCommandURL, bool bInsertPage ); + SlideLayoutController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const OUString& sCommandURL, bool bInsertPage ); virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; private: diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 8f0c9809477b..67edc11a9f7b 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -172,7 +172,7 @@ ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, sal_uInt1 //---------------------------------------------------------------------------------------------------------------------- struct DelayedToolPanelActivation { - DelayedToolPanelActivation( ToolPanelChildWindow& i_rToolPanelWindow, const ::rtl::OUString& i_rPanelURL ) + DelayedToolPanelActivation( ToolPanelChildWindow& i_rToolPanelWindow, const OUString& i_rPanelURL ) :m_rToolPanelWindow( i_rToolPanelWindow ) ,m_sPanelURL( i_rPanelURL ) { @@ -185,11 +185,11 @@ struct DelayedToolPanelActivation private: ToolPanelChildWindow& m_rToolPanelWindow; - const ::rtl::OUString m_sPanelURL; + const OUString m_sPanelURL; }; //---------------------------------------------------------------------------------------------------------------------- -void ToolPanelChildWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) +void ToolPanelChildWindow::ActivateToolPanel( const OUString& i_rPanelURL ) { SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() ); ViewShellBase* pViewShellBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame() ); diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 74330206c7ed..fb8169102d32 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -40,7 +40,7 @@ namespace sd { PaneDockingWindow::PaneDockingWindow( SfxBindings *_pBindings, SfxChildWindow *pChildWindow, ::Window* pParent, - const ResId& rResId, const ::rtl::OUString& rsTitle ) + const ResId& rResId, const OUString& rsTitle ) :TitledDockingWindow( _pBindings, pChildWindow, pParent, rResId ) { SetTitle( rsTitle ); diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index 5040a9614d41..668d7abd9b09 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -49,7 +49,7 @@ TYPEINIT1(LeftImpressPaneShell, SfxShell); LeftImpressPaneShell::LeftImpressPaneShell (void) : SfxShell() { - SetName(rtl::OUString("LeftImpressPane")); + SetName(OUString("LeftImpressPane")); } @@ -82,7 +82,7 @@ TYPEINIT1(LeftDrawPaneShell, SfxShell); LeftDrawPaneShell::LeftDrawPaneShell (void) : SfxShell() { - SetName(rtl::OUString("LeftDrawPane")); + SetName(OUString("LeftDrawPane")); } @@ -112,7 +112,7 @@ TYPEINIT1( ToolPanelPaneShell, SfxShell ); ToolPanelPaneShell::ToolPanelPaneShell() :SfxShell() { - SetName(rtl::OUString("ToolPanel")); + SetName(OUString("ToolPanel")); } ToolPanelPaneShell::~ToolPanelPaneShell(void) diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 0e57cf36ac5e..5b18349a0f1e 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -66,9 +66,9 @@ class FolderDescriptor public: FolderDescriptor ( int nPriority, - const ::rtl::OUString& rsTitle, - const ::rtl::OUString& rsTargetDir, - const ::rtl::OUString& rsContentIdentifier, + const OUString& rsTitle, + const OUString& rsTargetDir, + const OUString& rsContentIdentifier, const Reference& rxFolderEnvironment) : mnPriority(nPriority), msTitle(rsTitle), @@ -77,9 +77,9 @@ public: mxFolderEnvironment(rxFolderEnvironment) { } int mnPriority; - ::rtl::OUString msTitle; - ::rtl::OUString msTargetDir; - ::rtl::OUString msContentIdentifier; + OUString msTitle; + OUString msTargetDir; + OUString msContentIdentifier; // Reference mxFolderResultSet; Reference mxFolderEnvironment; @@ -94,7 +94,7 @@ public: /** Use a heuristic based on the URL of a top-level template folder to assign a priority that is used to sort the folders. */ -int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL) +int Classify (const OUString&, const OUString& rsURL) { int nPriority (0); @@ -232,10 +232,10 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) // We are interested only in three properties: the entry's name, // its URL, and its content type. - Sequence aProps (3); - aProps[0] = rtl::OUString(TITLE); - aProps[1] = rtl::OUString(TARGET_URL); - aProps[2] = rtl::OUString(DESCRIPTION); + Sequence aProps (3); + aProps[0] = OUString(TITLE); + aProps[1] = OUString(TARGET_URL); + aProps[2] = OUString(DESCRIPTION); // Create a cursor to iterate over the templates in this folders. ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_DOCUMENTS_ONLY; @@ -262,11 +262,11 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) { if (mxEntryResultSet->next()) { - ::rtl::OUString sTitle (xRow->getString (1)); - ::rtl::OUString sTargetURL (xRow->getString (2)); - ::rtl::OUString sContentType (xRow->getString (3)); + OUString sTitle (xRow->getString (1)); + OUString sTargetURL (xRow->getString (2)); + OUString sContentType (xRow->getString (3)); - ::rtl::OUString aId = xContentAccess->queryContentIdentifierString(); + OUString aId = xContentAccess->queryContentIdentifierString(); ::ucbhelper::Content aContent = ::ucbhelper::Content (aId, mxEntryEnvironment, comphelper::getProcessComponentContext()); if (aContent.isDocument ()) { @@ -279,7 +279,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) || (sContentType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(IMPRESS_XML_TEMPLATE))) || (sContentType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(IMPRESS_XML_TEMPLATE_B)))) { - ::rtl::OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString( + OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString( STR_TEMPLATE_NAME1_DEF, STR_TEMPLATE_NAME1, NUM_TEMPLATE_NAMES, sTitle ); mpLastAddedEntry = new TemplateEntry(sLocalisedTitle, sTargetURL); mpTemplateDirectory->InsertEntry(mpLastAddedEntry); @@ -326,9 +326,9 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) ::ucbhelper::Content aTemplateDir (mxTemplateRoot, mxFolderEnvironment, comphelper::getProcessComponentContext()); // Define the list of properties we are interested in. - Sequence aProps (2); - aProps[0] = rtl::OUString(TITLE); - aProps[1] = rtl::OUString(TARGET_DIR_URL); + Sequence aProps (2); + aProps[0] = OUString(TITLE); + aProps[1] = OUString(TARGET_DIR_URL); // Create an cursor to iterate over the template folders. ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_ONLY; @@ -360,9 +360,9 @@ TemplateScanner::State TemplateScanner::GatherFolderList (void) Reference xRow (mxFolderResultSet, UNO_QUERY); if (xRow.is()) { - ::rtl::OUString sTitle (xRow->getString (1)); - ::rtl::OUString sTargetDir (xRow->getString (2)); - ::rtl::OUString aId = xContentAccess->queryContentIdentifierString(); + OUString sTitle (xRow->getString (1)); + OUString sTargetDir (xRow->getString (2)); + OUString aId = xContentAccess->queryContentIdentifierString(); mpFolderDescriptors->insert( FolderDescriptor( @@ -392,9 +392,9 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) FolderDescriptor aDescriptor (*mpFolderDescriptors->begin()); mpFolderDescriptors->erase(mpFolderDescriptors->begin()); - ::rtl::OUString sTitle (aDescriptor.msTitle); - ::rtl::OUString sTargetDir (aDescriptor.msTargetDir); - ::rtl::OUString aId (aDescriptor.msContentIdentifier); + OUString sTitle (aDescriptor.msTitle); + OUString sTargetDir (aDescriptor.msTargetDir); + OUString aId (aDescriptor.msContentIdentifier); maFolderContent = ::ucbhelper::Content (aId, aDescriptor.mxFolderEnvironment, comphelper::getProcessComponentContext()); if (maFolderContent.isFolder()) diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 85c14e850d18..8735f44edc4b 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -287,7 +287,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) bDisableCtrls = sal_True; aBtnStop.Enable(); aBtnStop.Update(); - rtl::OUString aStr("Animator:"); // here we should think about something smart + OUString aStr("Animator:"); // here we should think about something smart pProgress = new SfxProgress( NULL, aStr, nFullTime ); } @@ -581,7 +581,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls) aCtlDisplay.Invalidate(); aCtlDisplay.Update(); - aFiCount.SetText(rtl::OUString::valueOf( + aFiCount.SetText(OUString::valueOf( static_cast(m_FrameList.size()))); if (!m_FrameList.empty() && !bMovie) @@ -887,7 +887,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) if( !nLoopCount ) // endless aLbLoopCount.SelectEntryPos( aLbLoopCount.GetEntryCount() - 1); else - aLbLoopCount.SelectEntry(rtl::OUString::valueOf( nLoopCount ) ); + aLbLoopCount.SelectEntry(OUString::valueOf( nLoopCount ) ); } long nTime = rAnimBmp.nWait; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index b1ae03f5a5da..1676e051f4a9 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -253,8 +253,8 @@ public: void ChangePage(); void LeavePage(); - String GetUiTextForCommand (const ::rtl::OUString& aCommandURL); - Image GetUiIconForCommand (const ::rtl::OUString& aCommandURL); + String GetUiTextForCommand (const OUString& aCommandURL); + Image GetUiIconForCommand (const OUString& aCommandURL); DECL_LINK( StartScanHdl, void * ); DECL_LINK( SelectFileHdl, void * ); @@ -425,8 +425,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, String sText (GetUiTextForCommand(".uno:Open")); // Remove the mnemonic and add a leading space so that icon and text // are not too close together. - sText.SearchAndReplaceAll(rtl::OUString("~"),String()); - sText.Insert(rtl::OUString(" "),0); + sText.SearchAndReplaceAll(OUString("~"),String()); + sText.Insert(OUString(" "),0); mpPage1OpenPB->SetText(sText); // Place icon left of text and both centered in the button. mpPage1OpenPB->SetModeImage( @@ -619,7 +619,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, UpdatePreview( sal_True ); //check whether we should start with a template document initialy and preselect it - const ::rtl::OUString aServiceName( "com.sun.star.presentation.PresentationDocument" ); + const OUString aServiceName( "com.sun.star.presentation.PresentationDocument" ); String aStandardTemplate( SfxObjectFactory::GetStandardTemplate( aServiceName ) ); if( aStandardTemplate.Len() ) { @@ -784,10 +784,10 @@ void AssistentDlgImpl::ScanDocmenu (void) { // Get the current history item's properties. uno::Sequence aPropertySet = aHistory[nItem]; - rtl::OUString sURL; - rtl::OUString sFilter; - rtl::OUString sTitle; - rtl::OUString sPassword; + OUString sURL; + OUString sFilter; + OUString sTitle; + OUString sPassword; sal_uInt32 nPropertyCount = aPropertySet.getLength(); for (sal_uInt32 nProperty=0; nPropertyGetPool() ); aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile )); aReq.AppendItem( SfxStringItem( SID_REFERER, aEmptyStr ) ); - aReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); + aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); aReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) ); aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) ); @@ -1724,7 +1724,7 @@ sal_Bool AssistentDlgImpl::IsOwnFormat( const String& rPath ) -String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL) +String AssistentDlgImpl::GetUiTextForCommand (const OUString& sCommandURL) { String sLabel; Reference xUICommandLabels; @@ -1749,7 +1749,7 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL if ( ! xUICommandLabels.is()) break; - ::rtl::OUString sString; + OUString sString; Sequence aProperties; Any aAny (xUICommandLabels->getByName(sCommandURL)); if (aAny >>= aProperties) @@ -1757,7 +1757,7 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL sal_Int32 nCount (aProperties.getLength()); for (sal_Int32 i=0; i>= sString; @@ -1779,7 +1779,7 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL -Image AssistentDlgImpl::GetUiIconForCommand (const ::rtl::OUString& sCommandURL) +Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) { Image aIcon; Reference xUICommandLabels; @@ -1809,7 +1809,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const ::rtl::OUString& sCommandURL) xManager->getImageManager(), UNO_QUERY_THROW); - Sequence aCommandList(1); + Sequence aCommandList(1); aCommandList[0] = sCommandURL; Sequence > xIconList ( xImageManager->getImages(0,aCommandList)); @@ -1852,7 +1852,7 @@ IMPL_LINK_NOARG(AssistentDlg, FinishHdl) { sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0, - rtl::OUString("simpress") ); + OUString("simpress") ); if ( aFileDlg.Execute() == ERRCODE_NONE ) aFileToOpen = aFileDlg.GetPath(); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 86610c9ecb83..2c16005c715e 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -134,7 +134,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) } else { - rtl::OUString aUrl( GetPath() ); + OUString aUrl( GetPath() ); if ( !aUrl.isEmpty() ) { try @@ -305,25 +305,25 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() : { String aDescr; aDescr = String(SdResId(STR_ALL_FILES)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.*")); + mpImpl->AddFilter( aDescr, OUString("*.*")); // setup filter #if defined UNX aDescr = String(SdResId(STR_AU_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.au;*.snd" )); + mpImpl->AddFilter( aDescr, OUString("*.au;*.snd" )); aDescr = String(SdResId(STR_VOC_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.voc" )); + mpImpl->AddFilter( aDescr, OUString("*.voc" )); aDescr = String(SdResId(STR_WAV_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.wav" )); + mpImpl->AddFilter( aDescr, OUString("*.wav" )); aDescr = String(SdResId(STR_AIFF_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.aiff" )); + mpImpl->AddFilter( aDescr, OUString("*.aiff" )); aDescr = String(SdResId(STR_SVX_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.svx" )); + mpImpl->AddFilter( aDescr, OUString("*.svx" )); #else aDescr = String(SdResId(STR_WAV_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.wav;*.mp3;*.ogg" )); + mpImpl->AddFilter( aDescr, OUString("*.wav;*.mp3;*.ogg" )); aDescr = String(SdResId(STR_MIDI_FILE)); - mpImpl->AddFilter( aDescr, rtl::OUString("*.mid" )); + mpImpl->AddFilter( aDescr, OUString("*.mid" )); #endif } diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 5e81d819775d..9ffe406f5293 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -86,7 +86,7 @@ void SdInsertPagesObjsDlg::Reset() aCbxMasters.Check( sal_True ); } -std::vector SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType ) +std::vector SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType ) { // With Draw documents, we have to return NULL on selection of the document if( pMedium ) @@ -99,7 +99,7 @@ std::vector SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType // the whole document is inserted (but not more!) if( aLbTree.GetSelectionCount() == 0 || ( aLbTree.IsSelected( aLbTree.First() ) ) ) - return std::vector(); + return std::vector(); } return aLbTree.GetSelectEntryList( nType ); diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 114ad8322c15..2b682bddb8d7 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -72,7 +72,7 @@ MorphDlg::~MorphDlg() void MorphDlg::LoadSettings() { - SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( rtl::OUString(SD_OPTION_MORPHING) , + SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) , SD_OPTION_LOAD ) ); sal_uInt16 nSteps; sal_Bool bOrient, bAttrib; @@ -98,7 +98,7 @@ void MorphDlg::LoadSettings() void MorphDlg::SaveSettings() const { - SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( rtl::OUString(SD_OPTION_MORPHING) , + SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) , SD_OPTION_STORE ) ); if( xOStm.Is() ) diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 235dfb4b4114..b80f7e385ddf 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -564,7 +564,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName) if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aURLStr; + OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aURLStr ); aURL = INetURLObject( aURLStr ); } @@ -586,7 +586,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName) if (aFileName != maDropFileName) { SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE)); - SfxFilterMatcher aMatch( rtl::OUString("simpress") ); + SfxFilterMatcher aMatch( OUString("simpress") ); aMed.UseInteractionHandler( sal_True ); nErr = aMatch.GuessFilter(aMed, &pFilter); } diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index f2a6d9a0be0b..9fce09b1e878 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -30,7 +30,6 @@ #include "cusshow.hxx" #include "customshowlist.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index aa8fcfc48e4d..b62eea74fda9 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -41,7 +41,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() #ifndef DISABLE_DYNLOADING SdFuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; - static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True)); + static const OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) ) fp = ( SdAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( "CreateDialogFactory" ); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 53cd8975e353..0103a32b7ac2 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -269,7 +269,7 @@ void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } -void AbstractSdInsertLayerDlg_Impl::SetHelpId( const rtl::OString& rHelpId ) +void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OString& rHelpId ) { pDlg->SetHelpId( rHelpId ); } @@ -288,7 +288,7 @@ sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const return (::Window*)pDlg; } -std::vector AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt16 nType) +std::vector AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt16 nType) { return pDlg->GetList(nType); } diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 21a0f2c1dcc7..bd44d54e5022 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -163,7 +163,7 @@ class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg DECL_ABSTDLG_BASE(AbstractSdInsertLayerDlg_Impl,SdInsertLayerDlg) virtual void GetAttr( SfxItemSet& rOutAttrs ) ; //from class Window - virtual void SetHelpId( const rtl::OString& rHelpId ) ; + virtual void SetHelpId( const OString& rHelpId ) ; }; // add for SdInsertPasteDlg @@ -180,7 +180,7 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) virtual ::Window * GetWindow(); //this method is added for return a Window type pointer - virtual std::vector GetList ( const sal_uInt16 nType ); + virtual std::vector GetList ( const sal_uInt16 nType ); virtual sal_Bool IsLink(); virtual sal_Bool IsRemoveUnnessesaryMasterPages() const; }; diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 42e883e47968..f769db33e8f8 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -208,7 +208,7 @@ SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::ge sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void) { if (mnListBoxDropFormatId == SAL_MAX_UINT32) - mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(rtl::OUString( + mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(OUString( "application/x-openoffice-treelistbox-moveonly;windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\"")); return mnListBoxDropFormatId; } @@ -420,7 +420,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium, void SdPageObjsTLB::AddShapeList ( const SdrObjList& rList, SdrObject* pShape, - const ::rtl::OUString& rsName, + const OUString& rsName, const bool bIsExcluded, SvTreeListEntry* pParentEntry, const IconProvider& rIconProvider) @@ -626,9 +626,9 @@ String SdPageObjsTLB::GetSelectEntry() return( GetEntryText( GetCurEntry() ) ); } -std::vector SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 nDepth ) const +std::vector SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 nDepth ) const { - std::vector aEntries; + std::vector aEntries; SvTreeListEntry* pEntry = FirstSelected(); while( pEntry ) diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 2e5b27e792b0..30a540df7855 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -441,7 +441,7 @@ void SdTPAction::OpenFileDialog() Application::SetDefDialogParent( this ); // choose macro dialog - ::rtl::OUString aScriptURL = SfxApplication::ChooseScript(); + OUString aScriptURL = SfxApplication::ChooseScript(); if ( !aScriptURL.isEmpty() ) { @@ -466,7 +466,7 @@ void SdTPAction::OpenFileDialog() // links on the desktop to directories. aFileDialog.AddFilter ( String (SfxResId (STR_SFX_FILTERNAME_ALL)), - rtl::OUString("*.*")); + OUString("*.*")); if( aFileDialog.Execute() == ERRCODE_NONE ) diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index aee8b264737c..e87baa8d654c 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -686,7 +686,7 @@ sal_Bool SdTpOptionsMisc::SetScale( const String& aScale, sal_Int32& rX, sal_Int if( comphelper::string::getTokenCount(aScale, TOKEN) != 2 ) return( sal_False ); - rtl::OUString aTmp(aScale.GetToken( 0, TOKEN )); + OUString aTmp(aScale.GetToken( 0, TOKEN )); if (!comphelper::string::isdigitAsciiString(aTmp)) return sal_False; diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 35e70621a068..68315604a326 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -132,7 +132,7 @@ StyleSheetUndoAction::~StyleSheetUndoAction() } -rtl::OUString StyleSheetUndoAction::GetComment() const +OUString StyleSheetUndoAction::GetComment() const { return aComment; } diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index bfdd5e01249e..de8ce7c2a0b0 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl) void SdVectorizeDlg::LoadSettings() { SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( - rtl::OUString( SD_OPTION_VECTORIZE ) , + OUString( SD_OPTION_VECTORIZE ) , SD_OPTION_LOAD ) ); sal_uInt16 nLayers; sal_uInt16 nReduce; @@ -333,7 +333,7 @@ void SdVectorizeDlg::LoadSettings() void SdVectorizeDlg::SaveSettings() const { SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( - rtl::OUString(SD_OPTION_VECTORIZE) , + OUString(SD_OPTION_VECTORIZE) , SD_OPTION_STORE ) ); if( xOStm.Is() ) diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index f611e84b7a97..85c87d593fcb 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -367,7 +367,7 @@ bool DrawDocShell::IsNewPageNameValid( String & rInOutPageName, bool bResetStrin else { // check for upper/lower case roman numbering - String sReserved( rtl::OUString("cdilmvx") ); + String sReserved( OUString("cdilmvx") ); // gobble up all following characters contained in one reserved class String sRemainder = rInOutPageName.GetToken( 1, sal_Unicode(' ') ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index c5154fa1b7c4..64f24c6a9cdd 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -324,7 +324,7 @@ sal_Bool DrawDocShell::Load( SfxMedium& rMedium ) SetError( ERRCODE_IO_BROKENPACKAGE, OSL_LOG_PREFIX ); // TODO/LATER: correct error handling?! - //pStore->SetError( SVSTREAM_WRONGVERSION, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + //pStore->SetError( SVSTREAM_WRONGVERSION, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); else SetError( ERRCODE_ABORT, OSL_LOG_PREFIX ); } @@ -411,7 +411,7 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium& rMedium ) { mbNewDocument = sal_False; - const rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); + const OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); sal_Bool bRet = sal_False; bool bStartPresentation = false; @@ -556,7 +556,7 @@ sal_Bool DrawDocShell::ConvertTo( SfxMedium& rMedium ) if( mpDoc->GetPageCount() ) { const SfxFilter* pMediumFilter = rMedium.GetFilter(); - const rtl::OUString aTypeName( pMediumFilter->GetTypeName() ); + const OUString aTypeName( pMediumFilter->GetTypeName() ); SdFilter* pFilter = NULL; if( aTypeName.indexOf( "graphic_HTML" ) >= 0 ) @@ -670,14 +670,14 @@ sal_Bool DrawDocShell::GotoBookmark(const String& rBookmark) sal_uInt16 nPageNumber = SDRPAGE_NOTFOUND; SdrObject* pObj = NULL; - rtl::OUString sBookmark( rBookmark ); - const rtl::OUString sInteraction( "action?" ); + OUString sBookmark( rBookmark ); + const OUString sInteraction( "action?" ); if ( sBookmark.match( sInteraction ) ) { - const rtl::OUString sJump( "jump=" ); + const OUString sJump( "jump=" ); if ( sBookmark.match( sJump, sInteraction.getLength() ) ) { - rtl::OUString aDestination( sBookmark.copy( sInteraction.getLength() + sJump.getLength() ) ); + OUString aDestination( sBookmark.copy( sInteraction.getLength() + sJump.getLength() ) ); if ( aDestination.match( "firstslide" ) ) { nPageNumber = 1; @@ -741,7 +741,7 @@ sal_Bool DrawDocShell::GotoBookmark(const String& rBookmark) { // change work area GetFrameView()->SetPageKind(eNewPageKind); - ::rtl::OUString sViewURL; + OUString sViewURL; switch (eNewPageKind) { case PK_STANDARD: diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 2ddb21823636..3b0182e4b947 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -42,7 +42,7 @@ void TraceRequest (const Reference& rxRequest) Reference xNamed (rxRequest, UNO_QUERY); if (xNamed.is()) SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << - ::rtl::OUStringToOString(xNamed->getName(), RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(xNamed->getName(), RTL_TEXTENCODING_UTF8).getStr()); } #endif diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 864766ea062f..9ad7bf4a1bff 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -using ::rtl::OUString; namespace { /** Use the XResourceId::compareTo() method to implement a compare operator @@ -83,11 +82,11 @@ OUString Configuration_getImplementationName (void) throw(RuntimeException) -Sequence SAL_CALL Configuration_getSupportedServiceNames (void) +Sequence SAL_CALL Configuration_getSupportedServiceNames (void) throw (RuntimeException) { static const OUString sServiceName("com.sun.star.drawing.framework.Configuration"); - return Sequence(&sServiceName, 1); + return Sequence(&sServiceName, 1); } @@ -185,7 +184,7 @@ void SAL_CALL Configuration::removeResource (const Reference& rxRes Sequence > SAL_CALL Configuration::getResources ( const Reference& rxAnchorId, - const ::rtl::OUString& rsResourceURLPrefix, + const OUString& rsResourceURLPrefix, AnchorBindingMode eMode) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 212a235ea8bd..b8c0d757ee6c 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index efdbde6460fc..275f1ab04553 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using rtl::OUString; using ::sd::framework::FrameworkHelper; namespace sd { namespace framework { @@ -63,11 +62,11 @@ OUString ConfigurationController_getImplementationName (void) throw(RuntimeExcep -Sequence SAL_CALL ConfigurationController_getSupportedServiceNames (void) +Sequence SAL_CALL ConfigurationController_getSupportedServiceNames (void) throw (RuntimeException) { static const OUString sServiceName("com.sun.star.drawing.framework.ConfigurationController"); - return Sequence(&sServiceName, 1); + return Sequence(&sServiceName, 1); } @@ -219,7 +218,7 @@ void ConfigurationController::RequestSynchronousUpdate (void) void SAL_CALL ConfigurationController::addConfigurationChangeListener ( const Reference& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Any& rUserData) throw (RuntimeException) { diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index a612fe63612f..a5640f85fbb0 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using rtl::OUString; namespace sd { namespace framework { @@ -43,7 +42,7 @@ ConfigurationControllerBroadcaster::ConfigurationControllerBroadcaster ( void ConfigurationControllerBroadcaster::AddListener( const Reference& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Any& rUserData) { if ( ! rxListener.is()) diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index 1858b69f860c..fd1ceddb3bfa 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -68,7 +68,7 @@ public: void AddListener( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const css::uno::Any& rUserData); /** Remove all references to the given listener. When one listener has @@ -96,7 +96,7 @@ public: the given arguments. */ void NotifyListeners ( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const css::uno::Reference& rxResourceId, const css::uno::Reference& rxResourceObject); @@ -117,9 +117,9 @@ private: }; typedef ::std::vector ListenerList; typedef ::boost::unordered_map - ListenerMap; ListenerMap maListenerMap; diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index b974b3b4e92c..4b9f3e8b7adb 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index 74839b903aee..24d0f1f1dd99 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -59,11 +59,11 @@ void ConfigurationTracer::TraceBoundResources ( const int nIndentation) { Sequence > aResourceList ( - rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT)); - const ::rtl::OUString sIndentation (" "); + rxConfiguration->getResources(rxResourceId, OUString(), AnchorBindingMode_DIRECT)); + const OUString sIndentation (" "); for (sal_Int32 nIndex=0; nIndexgetResourceURL()); + OUString sLine (aResourceList[nIndex]->getResourceURL()); for (int i=0; i& rxFactory) throw (css::uno::RuntimeException); @@ -57,7 +57,7 @@ public: is registered for other URLs then these remain registered. */ void RemoveFactoryForURL( - const ::rtl::OUString& rsURL) + const OUString& rsURL) throw (css::uno::RuntimeException); /** Unregister the specified factory. @@ -78,21 +78,21 @@ public: is returned. Otherwise an empty reference is returned. */ css::uno::Reference GetFactory ( - const ::rtl::OUString& rsURL) + const OUString& rsURL) throw (css::uno::RuntimeException); private: ::osl::Mutex maMutex; typedef ::boost::unordered_map< - ::rtl::OUString, + OUString, css::uno::Reference, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> FactoryMap; FactoryMap maFactoryMap; typedef ::std::vector< ::std::pair< - rtl::OUString, + OUString, css::uno::Reference > > FactoryPatternList; FactoryPatternList maFactoryPatternList; @@ -108,7 +108,7 @@ private: When the factory has not yet been added then return NULL. */ css::uno::Reference FindFactory ( - const ::rtl::OUString& rsURLBase) + const OUString& rsURLBase) throw (css::uno::RuntimeException); }; diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 2c8a1362d243..fb1c771dc687 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; /** When the USE_OPTIMIZATIONS symbol is defined then at some optimizations are activated that work only together with XResourceId objects that are @@ -53,19 +52,19 @@ Reference SAL_CALL ResourceId_createInstance ( -::rtl::OUString ResourceId_getImplementationName (void) throw(RuntimeException) +OUString ResourceId_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.ResourceId"); + return OUString("com.sun.star.comp.Draw.framework.ResourceId"); } -Sequence SAL_CALL ResourceId_getSupportedServiceNames (void) +Sequence SAL_CALL ResourceId_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.ResourceId"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.ResourceId"); + return Sequence(&sServiceName, 1); } diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index aa781777c2d3..621a2f41b98a 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index 0ce2797ef046..e1f72d03d1d9 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -70,13 +70,13 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual ::rtl::OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName (void) throw (::com::sun::star::uno::RuntimeException); /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ - virtual void SAL_CALL setName (const ::rtl::OUString& rName) + virtual void SAL_CALL setName (const OUString& rName) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 042bfdf28a9c..4d2651dff923 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { @@ -96,19 +95,19 @@ Reference SAL_CALL BasicPaneFactory_createInstance ( -::rtl::OUString BasicPaneFactory_getImplementationName (void) throw(RuntimeException) +OUString BasicPaneFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicPaneFactory"); + return OUString("com.sun.star.comp.Draw.framework.BasicPaneFactory"); } -Sequence SAL_CALL BasicPaneFactory_getSupportedServiceNames (void) +Sequence SAL_CALL BasicPaneFactory_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicPaneFactory"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.BasicPaneFactory"); + return Sequence(&sServiceName, 1); } diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 66e060290f01..5a2c061087c7 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -44,19 +44,19 @@ Reference SAL_CALL BasicToolBarFactory_createInstance ( -::rtl::OUString BasicToolBarFactory_getImplementationName (void) throw(RuntimeException) +OUString BasicToolBarFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicToolBarFactory"); + return OUString("com.sun.star.comp.Draw.framework.BasicToolBarFactory"); } -Sequence SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void) +Sequence SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void) throw (RuntimeException) { - const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicToolBarFactory"); - return Sequence(&sServiceName, 1); + const OUString sServiceName("com.sun.star.drawing.framework.BasicToolBarFactory"); + return Sequence(&sServiceName, 1); } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 6cac67a66f00..927a26159cd4 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; @@ -65,19 +64,19 @@ Reference SAL_CALL BasicViewFactory_createInstance ( -::rtl::OUString BasicViewFactory_getImplementationName (void) throw(RuntimeException) +OUString BasicViewFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicViewFactory"); + return OUString("com.sun.star.comp.Draw.framework.BasicViewFactory"); } -Sequence SAL_CALL BasicViewFactory_getSupportedServiceNames (void) +Sequence SAL_CALL BasicViewFactory_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicViewFactory"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.BasicViewFactory"); + return Sequence(&sServiceName, 1); } diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 4cb0bc8727fc..c4d5dd11bf72 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index b80fcce5c399..4eeb5c5f3e0c 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 7bca561c972e..ce7b026ff834 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; @@ -107,19 +106,19 @@ Reference SAL_CALL PresentationFactoryProvider_createInstance ( -::rtl::OUString PresentationFactoryProvider_getImplementationName (void) throw(RuntimeException) +OUString PresentationFactoryProvider_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.PresentationFactoryProvider"); + return OUString("com.sun.star.comp.Draw.framework.PresentationFactoryProvider"); } -Sequence SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void) +Sequence SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.PresentationFactoryProvider"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.PresentationFactoryProvider"); + return Sequence(&sServiceName, 1); } @@ -127,7 +126,7 @@ Sequence SAL_CALL PresentationFactoryProvider_getSupportedService //===== PresentationFactory =================================================== -const ::rtl::OUString PresentationFactory::msPresentationViewURL("private:resource/view/Presentation"); +const OUString PresentationFactory::msPresentationViewURL("private:resource/view/Presentation"); PresentationFactory::PresentationFactory ( diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 2269463471bc..b8e7e79cfb7e 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace sd { namespace framework { @@ -43,19 +42,19 @@ Reference SAL_CALL TaskPanelFactory_createInstance ( -::rtl::OUString TaskPanelFactory_getImplementationName (void) throw(RuntimeException) +OUString TaskPanelFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.TaskPanelFactory"); + return OUString("com.sun.star.comp.Draw.framework.TaskPanelFactory"); } -Sequence SAL_CALL TaskPanelFactory_getSupportedServiceNames (void) +Sequence SAL_CALL TaskPanelFactory_getSupportedServiceNames (void) throw (RuntimeException) { const OUString sServiceName("com.sun.star.drawing.framework.TaskPanelFactory"); - return Sequence(&sServiceName, 1); + return Sequence(&sServiceName, 1); } @@ -173,13 +172,13 @@ void SAL_CALL TaskPanelFactory::initialize( namespace { - void lcl_collectResourceURLs( const Reference< XResourceId >& i_rResourceId, ::std::vector< ::rtl::OUString >& o_rResourceURLs ) + void lcl_collectResourceURLs( const Reference< XResourceId >& i_rResourceId, ::std::vector< OUString >& o_rResourceURLs ) { ENSURE_OR_RETURN_VOID( i_rResourceId.is(), "illegal resource ID" ); o_rResourceURLs.resize(0); Reference< XResourceId > xResourceId( i_rResourceId ); - ::rtl::OUString sResourceURL = xResourceId->getResourceURL(); + OUString sResourceURL = xResourceId->getResourceURL(); while ( !sResourceURL.isEmpty() ) { o_rResourceURLs.push_back( sResourceURL ); @@ -209,10 +208,10 @@ Reference SAL_CALL TaskPanelFactory::createResource ( ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); // assume that the top-level anchor is the URL of the pane - ::std::vector< ::rtl::OUString > aResourceURLs; + ::std::vector< OUString > aResourceURLs; lcl_collectResourceURLs( rxResourceId, aResourceURLs ); - const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; + const OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); @@ -237,18 +236,18 @@ void SAL_CALL TaskPanelFactory::releaseResource ( const Reference< XResourceId > xResourceId( rxResource->getResourceId(), UNO_SET_THROW ); // assume that the top-level anchor is the URL of the pane - ::std::vector< ::rtl::OUString > aResourceURLs; + ::std::vector< OUString > aResourceURLs; lcl_collectResourceURLs( xResourceId, aResourceURLs ); OSL_ENSURE( !aResourceURLs.empty(), "TaskPanelFactory::releaseResource: illegal resource/URL!" ); if ( !aResourceURLs.empty() ) { - const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; + const OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); if ( pPaneViewShell != NULL ) { - const ::rtl::OUString sPanelResourceURL( xResourceId->getResourceURL() ); + const OUString sPanelResourceURL( xResourceId->getResourceURL() ); const toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sPanelResourceURL ) ); toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index bc50d9b8dc46..e017cbf21566 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -55,7 +55,6 @@ using ::com::sun::star::awt::XWindow; using ::com::sun::star::rendering::XCanvas; using ::com::sun::star::lang::DisposedException; -using ::rtl::OUString; using ::sd::toolpanel::ToolPanelViewShell; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 5be26e1b5c0a..067f46c86a19 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 4e5080fbaaa7..a1825f28bd86 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::tools::ConfigurationAccess; namespace sd { namespace framework { @@ -44,9 +43,9 @@ static const sal_uInt32 snStartupPropertyCount (1); class ModuleController::ResourceToFactoryMap : public ::boost::unordered_map< - rtl::OUString, - rtl::OUString, - ::rtl::OUStringHash, + OUString, + OUString, + OUStringHash, ::comphelper::UStringEqual> { public: @@ -56,9 +55,9 @@ public: class ModuleController::LoadedFactoryContainer : public ::boost::unordered_map< - rtl::OUString, + OUString, WeakReference, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> { public: @@ -78,19 +77,19 @@ Reference SAL_CALL ModuleController_createInstance ( -::rtl::OUString ModuleController_getImplementationName (void) throw(RuntimeException) +OUString ModuleController_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.module.ModuleController"); + return OUString("com.sun.star.comp.Draw.framework.module.ModuleController"); } -Sequence SAL_CALL ModuleController_getSupportedServiceNames (void) +Sequence SAL_CALL ModuleController_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.ModuleController"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.ModuleController"); + return Sequence(&sServiceName, 1); } @@ -149,7 +148,7 @@ void ModuleController::LoadFactories (const Reference& rxCont Reference xFactories ( aConfiguration.GetConfigurationNode("MultiPaneGUI/Framework/ResourceFactories"), UNO_QUERY); - ::std::vector aProperties (snFactoryPropertyCount); + ::std::vector aProperties (snFactoryPropertyCount); aProperties[0] = "ServiceName"; aProperties[1] = "ResourceList"; ConfigurationAccess::ForAll( @@ -171,12 +170,12 @@ void ModuleController::ProcessFactory (const ::std::vector& rValues) OSL_ASSERT(rValues.size() == snFactoryPropertyCount); // Get the service name of the factory. - rtl::OUString sServiceName; + OUString sServiceName; rValues[0] >>= sServiceName; // Get all resource URLs that are created by the factory. Reference xResources (rValues[1], UNO_QUERY); - ::std::vector aURLs; + ::std::vector aURLs; tools::ConfigurationAccess::FillList( xResources, "URL", @@ -186,7 +185,7 @@ void ModuleController::ProcessFactory (const ::std::vector& rValues) OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8).getStr()); // Add the resource URLs to the map. - ::std::vector::const_iterator iResource; + ::std::vector::const_iterator iResource; for (iResource=aURLs.begin(); iResource!=aURLs.end(); ++iResource) { (*mpResourceToFactoryMap)[*iResource] = sServiceName; @@ -208,7 +207,7 @@ void ModuleController::InstantiateStartupServices (void) Reference xFactories ( aConfiguration.GetConfigurationNode("MultiPaneGUI/Framework/StartupServices"), UNO_QUERY); - ::std::vector aProperties (snStartupPropertyCount); + ::std::vector aProperties (snStartupPropertyCount); aProperties[0] = "ServiceName"; tools::ConfigurationAccess::ForAll( xFactories, @@ -231,7 +230,7 @@ void ModuleController::ProcessStartupService (const ::std::vector& rValues) try { // Get the service name of the startup service. - rtl::OUString sServiceName; + OUString sServiceName; rValues[0] >>= sServiceName; // Instantiate service. diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index c0b07c71bfeb..352ea00ff208 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 71e440840899..67979a8e1ab6 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -59,8 +59,8 @@ public: /** Remember the given URL as one of a center pane view for which to activate the resource managed by the called object. */ - void AddActiveMainView (const ::rtl::OUString& rsMainViewURL); - sal_Bool IsResourceActive (const ::rtl::OUString& rsMainViewURL); + void AddActiveMainView (const OUString& rsMainViewURL); + sal_Bool IsResourceActive (const OUString& rsMainViewURL); virtual void SaveResourceState (void); virtual void SAL_CALL disposing (void); @@ -91,10 +91,10 @@ private: /// The anchor of the main view. css::uno::Reference mxMainViewAnchorId; - ::rtl::OUString msCurrentMainViewURL; + OUString msCurrentMainViewURL; void HandleMainViewSwitch ( - const ::rtl::OUString& rsViewURL, + const OUString& rsViewURL, const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, const bool bIsActivated); diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index f0a8ad973423..6d56720d39d0 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index 7852136b537d..412a7c608e48 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index 64897c09d5c9..ce4c41eb83bd 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -36,7 +36,7 @@ class SlideSorterModule public: SlideSorterModule ( const css::uno::Reference& rxController, - const ::rtl::OUString& rsLeftPaneURL); + const OUString& rsLeftPaneURL); virtual ~SlideSorterModule (void); virtual void SaveResourceState (void); diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index 5d15204d5b50..c731435182cb 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 880a49d2ffe7..aa2c9e8a9e24 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index d02404fa9a14..ce28ef826330 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -35,7 +35,7 @@ class ToolPanelModule public: ToolPanelModule ( const css::uno::Reference& rxController, - const ::rtl::OUString& rsRightPaneURL); + const OUString& rsRightPaneURL); virtual ~ToolPanelModule (void); virtual void SaveResourceState (void); diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index cee1e8a1fe3a..e490cdbfcd44 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 97c0ba9440dd..fb7fa1a2a328 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace { @@ -193,12 +192,12 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa // Task panel URLs. -const ::rtl::OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/"); -const ::rtl::OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages"); -const ::rtl::OUString FrameworkHelper::msLayoutTaskPanelURL( msTaskPanelURLPrefix + "Layouts"); -const ::rtl::OUString FrameworkHelper::msTableDesignPanelURL( msTaskPanelURLPrefix + "TableDesign"); -const ::rtl::OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPrefix + "CustomAnimations"); -const ::rtl::OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions"); +const OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/"); +const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages"); +const OUString FrameworkHelper::msLayoutTaskPanelURL( msTaskPanelURLPrefix + "Layouts"); +const OUString FrameworkHelper::msTableDesignPanelURL( msTaskPanelURLPrefix + "TableDesign"); +const OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPrefix + "CustomAnimations"); +const OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions"); // Event URLs. @@ -262,9 +261,9 @@ namespace */ class FrameworkHelper::ViewURLMap : public ::boost::unordered_map< - rtl::OUString, + OUString, ViewShell::ShellType, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> { public: @@ -571,7 +570,7 @@ void FrameworkHelper::RequestTaskPanel ( -ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) +ViewShell::ShellType FrameworkHelper::GetViewId (const OUString& rsViewURL) { if (mpViewURLMap->empty()) { @@ -594,7 +593,7 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) -::rtl::OUString FrameworkHelper::GetViewURL (ViewShell::ShellType eType) +OUString FrameworkHelper::GetViewURL (ViewShell::ShellType eType) { switch (eType) { @@ -656,7 +655,7 @@ void FrameworkHelper::HandleModeChangeSlot ( Reference xView (GetView(xPaneId)); ::boost::shared_ptr pCenterViewShell (GetViewShell(xView)); - ::rtl::OUString sRequestedView; + OUString sRequestedView; if (bIsActive) { switch (nSlotId) @@ -721,7 +720,7 @@ void FrameworkHelper::HandleModeChangeSlot ( void FrameworkHelper::RunOnConfigurationEvent( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Callback& rCallback) { RunOnEvent( @@ -814,7 +813,7 @@ void FrameworkHelper::WaitForUpdate (void) const void FrameworkHelper::RunOnEvent( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const ConfigurationChangeEventFilter& rFilter, const Callback& rCallback) const { @@ -878,7 +877,7 @@ OUString FrameworkHelper::ResourceIdToString (const Reference& rxRe -Reference FrameworkHelper::CreateResourceId (const ::rtl::OUString& rsResourceURL) +Reference FrameworkHelper::CreateResourceId (const OUString& rsResourceURL) { return new ::sd::framework::ResourceId(rsResourceURL); } @@ -911,7 +910,7 @@ Reference FrameworkHelper::CreateResourceId ( Reference FrameworkHelper::CreateResourceId ( - const ::rtl::OUString& rsResourceURL, + const OUString& rsResourceURL, const Reference& rxAnchorId) { if (rxAnchorId.is()) diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 2a2321213076..7795cb8ac451 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -132,7 +132,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) aEmptyStr ); // insert given text - rtl::OUString aStr( cMark ); + OUString aStr( cMark ); pOV->InsertText( aStr, sal_True); ESelection aSel = pOV->GetSelection(); diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index ab7c3b369cdf..45586622e4d4 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -196,7 +196,7 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj ) if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - std::vector< rtl::OUString > aObjList; + std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { sal_uInt16 i; diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 2492a5335da3..f932e68e8e48 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -341,7 +341,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, * Objects was created on the slide master page ***********************************************/ String aName( pPage->GetLayoutName() ); - String aSep = rtl::OUString(SD_LT_SEPARATOR); + String aSep = OUString(SD_LT_SEPARATOR); sal_uInt16 n = aName.Search(aSep); n = n + aSep.Len(); aName.Erase(n); diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 344515e9d355..87b0c571cf95 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -256,7 +256,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma // except in a few cases (?) if( pObj ) { - rtl::OUString sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush" ) ); + OUString sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush" ) ); mpDoc->BegUndo( sLabel ); mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, sal_False, sal_True ) ); } diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index e9bb90c84319..f21dd7e0c689 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -256,7 +256,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) SdrObject* pPickObj = mpView->GetEmptyPresentationObject( ePresObjKind ); // insert diagram or Calc table - ::rtl::OUString aObjName; + OUString aObjName; SvGlobalName aName; if (nSlotId == SID_INSERT_DIAGRAM) aName = SvGlobalName( SO3_SCH_CLASSID); @@ -345,15 +345,15 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { if (nSlotId == SID_INSERT_DIAGRAM) { - pOleObj->SetProgName( rtl::OUString( "StarChart" )); + pOleObj->SetProgName( OUString( "StarChart" )); } else if (nSlotId == SID_ATTR_TABLE) { - pOleObj->SetProgName( rtl::OUString( "StarCalc" ) ); + pOleObj->SetProgName( OUString( "StarCalc" ) ); } else if (nSlotId == SID_INSERT_MATH) { - pOleObj->SetProgName( rtl::OUString( "StarMath" ) ); + pOleObj->SetProgName( OUString( "StarMath" ) ); } pOleObj->SetLogicRect(aRect); @@ -387,9 +387,9 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) uno::Reference < embed::XEmbeddedObject > xObj; uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); SvObjectServerList aServerLst; - ::rtl::OUString aName; + OUString aName; - ::rtl::OUString aIconMediaType; + OUString aIconMediaType; uno::Reference< io::XInputStream > xIconMetaFile; SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); @@ -467,7 +467,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) if ( xSet.is() ) { xSet->setPropertyValue("PluginURL", - uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); + uno::makeAny( OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); } } } @@ -665,7 +665,7 @@ FunctionReference FuInsertAVMedia::Create( ViewShell* pViewSh, ::sd::Window* pWi void FuInsertAVMedia::DoExecute( SfxRequest& rReq ) { - ::rtl::OUString aURL; + OUString aURL; const SfxItemSet* pReqArgs = rReq.GetArgs(); bool bAPI = false; diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 40d4eede8c42..821b156116e9 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -64,7 +64,6 @@ #include "Outliner.hxx" #include "sdabstdlg.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ui::dialogs; @@ -107,8 +106,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) SFXWB_INSERT ); Reference< XFilePicker > xFilePicker( aFileDialog.GetFilePicker(), UNO_QUERY ); Reference< XFilterManager > xFilterManager( xFilePicker, UNO_QUERY ); - rtl::OUString aOwnCont; - rtl::OUString aOtherCont; + OUString aOwnCont; + OUString aOtherCont; const SfxFilter* pFilter = NULL; aFileDialog.SetTitle( String( SdResId(STR_DLG_INSERT_PAGES_FROM_FILE ) ) ); @@ -134,7 +133,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) String aExt; String aAllSpec( SdResId( STR_ALL_FILES ) ); - xFilterManager->appendFilter( aAllSpec, rtl::OUString("*.*") ); + xFilterManager->appendFilter( aAllSpec, OUString("*.*") ); xFilterManager->setCurrentFilter( aAllSpec ); // set default-filter () // Get main filter @@ -160,7 +159,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() ); // get Powerpoint filter - aExt = rtl::OUString(".ppt"); + aExt = OUString(".ppt"); pFilter = aMatch.GetFilter4Extension( aExt ); if( pFilter ) xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() ); @@ -343,7 +342,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) { /* list with page names (if NULL, then all pages) First, insert pages */ - std::vector aBookmarkList = pDlg->GetList( 1 ); // pages + std::vector aBookmarkList = pDlg->GetList( 1 ); // pages sal_Bool bLink = pDlg->IsLink(); sal_Bool bReplace = sal_False; SdPage* pPage = NULL; @@ -373,8 +372,8 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) } sal_Bool bNameOK; - std::vector aExchangeList; - std::vector aObjectBookmarkList = pDlg->GetList( 2 ); // objects + std::vector aExchangeList; + std::vector aObjectBookmarkList = pDlg->GetList( 2 ); // objects /* if pBookmarkList is NULL, we insert selected pages, and/or selected objects or everything. */ diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 566d2dcbd71d..9bf40b570052 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -823,7 +823,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if(bPrintable) { // try to activate textedit mode for the selected object - SfxStringItem aInputString(SID_ATTR_CHAR, rtl::OUString(rKEvt.GetCharCode())); + SfxStringItem aInputString(SID_ATTR_CHAR, OUString(rKEvt.GetCharCode())); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, @@ -874,7 +874,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { mpView->UnMarkAll(); mpView->MarkObj(pCandidate, mpView->GetSdrPageView()); - SfxStringItem aInputString(SID_ATTR_CHAR, rtl::OUString(rKEvt.GetCharCode())); + SfxStringItem aInputString(SID_ATTR_CHAR, OUString(rKEvt.GetCharCode())); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_ATTR_CHAR, diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index fecabb9d3fa8..93db40368f92 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -116,7 +116,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) AbstractSdStartPresDlg* pDlg = pFact ? pFact->CreateSdStartPresentationDlg(mpWindow, aDlgSet, aPageNameList, pCustomShowList) : 0; if( pDlg && (pDlg->Execute() == RET_OK) ) { - rtl::OUString aPage; + OUString aPage; long nValue32; sal_Bool bValue; bool bValuesChanged = sal_False; diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index c59e3e59aebf..7ce9b1bfa0db 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -66,7 +66,6 @@ #include "helpids.h" #include "sdabstdlg.hxx" -using rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::container; using namespace com::sun::star::beans; diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 17de3c9c5d04..5724d2e4a7d5 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -67,7 +67,6 @@ #include "pres.hxx" #include "optsitem.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index cdb8a9d861f7..9a4012c1f1d4 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -41,7 +41,6 @@ #include "Window.hxx" #include "sdresid.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx index 7553e4c9e34e..ff42ebef9cd4 100644 --- a/sd/source/ui/func/unmovss.cxx +++ b/sd/source/ui/func/unmovss.cxx @@ -84,9 +84,9 @@ SdMoveStyleSheetsUndoAction::~SdMoveStyleSheetsUndoAction() { } -rtl::OUString SdMoveStyleSheetsUndoAction::GetComment() const +OUString SdMoveStyleSheetsUndoAction::GetComment() const { - return rtl::OUString(); + return OUString(); } diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index 96d7268280ad..35cb13bb3a27 100644 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -67,7 +67,7 @@ SdPresentationLayoutUndoAction::~SdPresentationLayoutUndoAction() { } -rtl::OUString SdPresentationLayoutUndoAction::GetComment() const +OUString SdPresentationLayoutUndoAction::GetComment() const { return aComment; } diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 2d55c2898881..f117682ab938 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -192,11 +192,11 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -309,7 +309,7 @@ protected: @return A name string. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); @@ -320,7 +320,7 @@ protected: @return A description string. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 05790c4e2893..0ae803dd63d4 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -87,11 +87,11 @@ protected: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -133,14 +133,14 @@ protected: AccessiblePageShape* CreateDrawPageShape (void); /// Create an accessible name that contains the current view mode. - virtual ::rtl::OUString + virtual OUString CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); /** Create an accessible description that contains the current view mode. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 2b6c115c3290..dc77370de124 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -90,7 +90,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); @@ -126,13 +126,13 @@ protected: virtual void SAL_CALL disposing (void); /// Create an accessible name that contains the current view mode. - virtual ::rtl::OUString + virtual OUString CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); /// Create an accessible description that contains the current /// view mode. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index b079b28ed3bf..4a06b0f8c00c 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -117,11 +117,11 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -138,16 +138,16 @@ public: protected: /** Create a base name string that contains the accessible name. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString + virtual OUString CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index d5b4921481e3..deddc03958c2 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -41,19 +41,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); //===== internal ======================================================== /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 853218c3c67d..2648e06dbf7a 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -41,19 +41,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); //===== internal ======================================================== /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index 194aa4e62cbd..bf43a73792b5 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -40,19 +40,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); //===== internal ======================================================== /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleScrollPanel.hxx b/sd/source/ui/inc/AccessibleScrollPanel.hxx index 8a2f71dbd6e3..47aa7a3734c2 100644 --- a/sd/source/ui/inc/AccessibleScrollPanel.hxx +++ b/sd/source/ui/inc/AccessibleScrollPanel.hxx @@ -38,8 +38,8 @@ class AccessibleScrollPanel public: AccessibleScrollPanel ( ::sd::toolpanel::ScrollPanel& rScrollPanel, - const ::rtl::OUString& rsName, - const ::rtl::OUString& rsDescription); + const OUString& rsName, + const OUString& rsDescription); ~AccessibleScrollPanel (void); //===== XAccessibleContext ============================================== @@ -59,7 +59,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 22f516e3a6fe..2c51b2251cb9 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -137,11 +137,11 @@ public: getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); @@ -197,19 +197,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index aa38601a4944..feb117f78e1d 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -148,12 +148,12 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); @@ -274,19 +274,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessibleTreeNode.hxx b/sd/source/ui/inc/AccessibleTreeNode.hxx index 25925fb94bf5..f1a3a5094a57 100644 --- a/sd/source/ui/inc/AccessibleTreeNode.hxx +++ b/sd/source/ui/inc/AccessibleTreeNode.hxx @@ -82,8 +82,8 @@ public: */ AccessibleTreeNode( ::sd::toolpanel::TreeNode& rNode, - const ::rtl::OUString& rsName, - const ::rtl::OUString& rsDescription, + const OUString& rsName, + const OUString& rsDescription, sal_Int16 eRole); void FireAccessibleEvent ( @@ -151,12 +151,12 @@ public: throw (::com::sun::star::uno::RuntimeException); /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); @@ -218,19 +218,19 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -241,8 +241,8 @@ protected: ::sd::toolpanel::TreeNode& mrTreeNode; ::rtl::Reference< ::utl::AccessibleStateSetHelper> mrStateSet; - const ::rtl::OUString msName; - const ::rtl::OUString msDescription; + const OUString msName; + const OUString msDescription; const sal_Int16 meRole; virtual ~AccessibleTreeNode (void); diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 7cf975da08d5..a53f7b95685d 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -162,9 +162,9 @@ public: virtual ::sal_Bool SAL_CALL suspend( ::sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XSelectionSupplier virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 4d34d2209de6..8aa6b834136e 100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -37,9 +37,9 @@ namespace sd { ::com::sun::star::lang::XServiceInfo >( aMutex ) {} // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; }; } diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 28d3d2fdc010..9c1c04e63c7d 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -83,7 +83,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID( ToolPanelChildWindow ); // ::sfx2::ITaskPaneToolPanelAccess - virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); + virtual void ActivateToolPanel( const OUString& i_rPanelURL ); }; diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 2d02a88186ca..7975225061de 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -52,7 +52,7 @@ public: SfxChildWindow *pChildWindow, ::Window* pParent, const ResId& rResId, - const ::rtl::OUString& rsTitle); + const OUString& rsTitle); virtual ~PaneDockingWindow (void); virtual void StateChanged( StateChangedType nType ); diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index f209561fcd49..bc1e7c556576 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -39,11 +39,11 @@ namespace sd struct ClientInfo { - rtl::OUString mName; - rtl::OUString mAddress; + OUString mName; + OUString mAddress; enum PROTOCOL { NETWORK = 1, BLUETOOTH }; - ClientInfo( const rtl::OUString rName, const rtl::OUString rAddress ) : + ClientInfo( const OUString rName, const OUString rAddress ) : mName( rName ), mAddress( rAddress ) {} }; @@ -64,7 +64,7 @@ namespace sd // For the control dialog SD_DLLPUBLIC static std::vector getClients(); SD_DLLPUBLIC static sal_Bool connectClient( ClientInfo *pClient, - rtl::OUString aPin ); + OUString aPin ); /// ensure that discoverability (eg. for Bluetooth) is enabled SD_DLLPUBLIC static void ensureDiscoverable(); diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index d572ac7a8227..27935df07462 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -93,9 +93,9 @@ public: css::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); protected: sal_Bool getMasterPageMode(void) const throw(); diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 21b3432b759a..652128ba3e39 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -95,9 +95,9 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); private: OutlineViewShell& mrOutlineViewShell; diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 392925fde054..b02d9bbaecd1 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -89,9 +89,9 @@ public: css::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); private: slidesorter::SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index ec44027b2ff3..0d60c74f54b0 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -104,25 +104,25 @@ public: /** The set of tool bars that are handled by this manager class. */ - const static ::rtl::OUString msToolBar; // RID_DRAW_TOOLBOX, 23011 + const static OUString msToolBar; // RID_DRAW_TOOLBOX, 23011 // RID_GRAPHIC_TOOLBOX, 23025 - const static ::rtl::OUString msOptionsToolBar; // RID_DRAW_OPTIONS_TOOLBOX, 23020 + const static OUString msOptionsToolBar; // RID_DRAW_OPTIONS_TOOLBOX, 23020 // RID_GRAPHIC_OPTIONS_TOOLBOX, 23026 - const static ::rtl::OUString msCommonTaskToolBar; // RID_DRAW_COMMONTASK_TOOLBOX, 23021 - const static ::rtl::OUString msViewerToolBar; // RID_DRAW_VIEWER_TOOLBOX, 23023 + const static OUString msCommonTaskToolBar; // RID_DRAW_COMMONTASK_TOOLBOX, 23021 + const static OUString msViewerToolBar; // RID_DRAW_VIEWER_TOOLBOX, 23023 // RID_GRAPHIC_VIEWER_TOOLBOX, 23024 - const static ::rtl::OUString msSlideSorterToolBar; // RID_SLIDE_TOOLBOX, 23012 - const static ::rtl::OUString msSlideSorterObjectBar; // RID_SLIDE_OBJ_TOOLBOX, 23014 - const static ::rtl::OUString msOutlineToolBar; // RID_OUTLINE_TOOLBOX, 23017 - const static ::rtl::OUString msMasterViewToolBar; // SID_MASTERPAGE, 27053 - const static ::rtl::OUString msDrawingObjectToolBar; // RID_DRAW_OBJ_TOOLBOX, 23013 - const static ::rtl::OUString msGluePointsToolBar; // RID_GLUEPOINTS_TOOLBOX, 23019 - const static ::rtl::OUString msTextObjectBar; // RID_DRAW_TEXT_TOOLBOX, 23016 + const static OUString msSlideSorterToolBar; // RID_SLIDE_TOOLBOX, 23012 + const static OUString msSlideSorterObjectBar; // RID_SLIDE_OBJ_TOOLBOX, 23014 + const static OUString msOutlineToolBar; // RID_OUTLINE_TOOLBOX, 23017 + const static OUString msMasterViewToolBar; // SID_MASTERPAGE, 27053 + const static OUString msDrawingObjectToolBar; // RID_DRAW_OBJ_TOOLBOX, 23013 + const static OUString msGluePointsToolBar; // RID_GLUEPOINTS_TOOLBOX, 23019 + const static OUString msTextObjectBar; // RID_DRAW_TEXT_TOOLBOX, 23016 // RID_GRAPHIC_TEXT_TOOLBOX, 23028 - const static ::rtl::OUString msBezierObjectBar; // RID_BEZIER_TOOLBOX, 23015 - const static ::rtl::OUString msGraphicObjectBar; // RID_DRAW_GRAF_TOOLBOX, 23030 - const static ::rtl::OUString msMediaObjectBar; // RID_DRAW_MEDIA_TOOLBOX, 23031 - const static ::rtl::OUString msTableObjectBar; // RID_DRAW_TABLE_TOOLBOX + const static OUString msBezierObjectBar; // RID_BEZIER_TOOLBOX, 23015 + const static OUString msGraphicObjectBar; // RID_DRAW_GRAF_TOOLBOX, 23030 + const static OUString msMediaObjectBar; // RID_DRAW_MEDIA_TOOLBOX, 23031 + const static OUString msTableObjectBar; // RID_DRAW_TABLE_TOOLBOX /** The set of tool bar groups. */ @@ -167,7 +167,7 @@ public: */ void AddToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName); + const OUString& rsToolBarName); /** Add the tool bar shell to the shell stack. This method basically forwards the call to the ViewShellManager. @@ -191,7 +191,7 @@ public: */ void RemoveToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName); + const OUString& rsToolBarName); /** This is basically a shortcut for ResetToolBars(),AddToolBar(). The main difference is, that all sub shells of the specified parent @@ -208,7 +208,7 @@ public: */ void SetToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName); + const OUString& rsToolBarName); /** This is basically a shortcut for ResetToolBars(),AddToolBar(). The main difference is, that all sub shells of the specified parent diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index ae0bb5166de8..3dee2a95a310 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -142,7 +142,7 @@ public: SdrGrafObj* InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, const Point& rPos, SdrObject* pSelectedObj, ImageMap* pImageMap ); - SdrMediaObj* InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAction, + SdrMediaObj* InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction, const Point& rPos, const Size& rSize, bool const bLink ); @@ -164,8 +164,8 @@ public: nType == 1 -> objects nType == 2 -> pages and objects */ - bool GetExchangeList( std::vector &rExchangeList, - std::vector &rBookmarkList, + bool GetExchangeList( std::vector &rExchangeList, + std::vector &rBookmarkList, const sal_uInt16 nType ); virtual void onAccessibilityOptionsChanged(); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 458896a042f8..0de9a17007db 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -82,7 +82,7 @@ public: /** This method is part of the object construction. It HAS to be called after the constructor has created a new object. */ - virtual void LateInit (const ::rtl::OUString& rsDefaultView); + virtual void LateInit (const OUString& rsDefaultView); ::boost::shared_ptr GetViewShellManager (void) const; @@ -226,7 +226,7 @@ public: /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration and not cached, so do not use it excessive (f.e. in status updates) */ - ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const; + OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) const; protected: osl::Mutex maMutex; @@ -247,7 +247,7 @@ private: we check that the right type is active and change again if that is not the case because something went wrong. */ - ::rtl::OUString GetInitialViewShellType (void); + OUString GetInitialViewShellType (void); }; } // end of namespace sd diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 530e1bd7915f..995f71777b83 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -192,7 +192,7 @@ protected: ::com::sun::star::accessibility::XAccessible> CreateAccessible (void); - rtl::OUString GetSurroundingText() const; + OUString GetSurroundingText() const; Selection GetSurroundingTextSelection() const; }; diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index e9474f4a618d..58f73f6a386d 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -103,7 +103,7 @@ public: com::sun::star::drawing::framework::XResourceId> > SAL_CALL getResources ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxAnchorId, - const ::rtl::OUString& rsResourceURLPrefix, + const OUString& rsResourceURLPrefix, ::com::sun::star::drawing::framework::AnchorBindingMode eMode) throw (::com::sun::star::uno::RuntimeException); @@ -125,13 +125,13 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual ::rtl::OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName (void) throw (::com::sun::star::uno::RuntimeException); /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ - virtual void SAL_CALL setName (const ::rtl::OUString& rName) + virtual void SAL_CALL setName (const OUString& rName) throw (::com::sun::star::uno::RuntimeException); private: diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index ea40b2d20bfc..a47818ebbb0d 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -131,7 +131,7 @@ public: virtual void SAL_CALL addConfigurationChangeListener ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const css::uno::Any& rUserData) throw (css::uno::RuntimeException); @@ -159,12 +159,12 @@ public: // XResourceFactoryManager virtual void SAL_CALL addResourceFactory( - const ::rtl::OUString& sResourceURL, + const OUString& sResourceURL, const css::uno::Reference& rxResourceFactory) throw (css::uno::RuntimeException); virtual void SAL_CALL removeResourceFactoryForURL( - const ::rtl::OUString& sResourceURL) + const OUString& sResourceURL) throw (css::uno::RuntimeException); virtual void SAL_CALL removeResourceFactoryForReference( @@ -173,7 +173,7 @@ public: virtual css::uno::Reference SAL_CALL getResourceFactory ( - const ::rtl::OUString& sResourceURL) + const OUString& sResourceURL) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 2024b3ba6ffb..ab6a57e5930c 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -61,47 +61,47 @@ class FrameworkHelper { public: // URLs of frequently used panes. - static const ::rtl::OUString msPaneURLPrefix; - static const ::rtl::OUString msCenterPaneURL; - static const ::rtl::OUString msFullScreenPaneURL; - static const ::rtl::OUString msLeftImpressPaneURL; - static const ::rtl::OUString msLeftDrawPaneURL; - static const ::rtl::OUString msRightPaneURL; + static const OUString msPaneURLPrefix; + static const OUString msCenterPaneURL; + static const OUString msFullScreenPaneURL; + static const OUString msLeftImpressPaneURL; + static const OUString msLeftDrawPaneURL; + static const OUString msRightPaneURL; // URLs of frequently used views. - static const ::rtl::OUString msViewURLPrefix; - static const ::rtl::OUString msImpressViewURL; - static const ::rtl::OUString msDrawViewURL; - static const ::rtl::OUString msOutlineViewURL; - static const ::rtl::OUString msNotesViewURL; - static const ::rtl::OUString msHandoutViewURL; - static const ::rtl::OUString msSlideSorterURL; - static const ::rtl::OUString msPresentationViewURL; - static const ::rtl::OUString msTaskPaneURL; + static const OUString msViewURLPrefix; + static const OUString msImpressViewURL; + static const OUString msDrawViewURL; + static const OUString msOutlineViewURL; + static const OUString msNotesViewURL; + static const OUString msHandoutViewURL; + static const OUString msSlideSorterURL; + static const OUString msPresentationViewURL; + static const OUString msTaskPaneURL; // URLs of frequently used tool bars. - static const ::rtl::OUString msToolBarURLPrefix; - static const ::rtl::OUString msViewTabBarURL; + static const OUString msToolBarURLPrefix; + static const OUString msViewTabBarURL; // URLs of task panels. - static const ::rtl::OUString msTaskPanelURLPrefix; - static const ::rtl::OUString msMasterPagesTaskPanelURL; - static const ::rtl::OUString msLayoutTaskPanelURL; - static const ::rtl::OUString msTableDesignPanelURL; - static const ::rtl::OUString msCustomAnimationTaskPanelURL; - static const ::rtl::OUString msSlideTransitionTaskPanelURL; + static const OUString msTaskPanelURLPrefix; + static const OUString msMasterPagesTaskPanelURL; + static const OUString msLayoutTaskPanelURL; + static const OUString msTableDesignPanelURL; + static const OUString msCustomAnimationTaskPanelURL; + static const OUString msSlideTransitionTaskPanelURL; // Names of frequently used events. - static const ::rtl::OUString msResourceActivationRequestEvent; - static const ::rtl::OUString msResourceDeactivationRequestEvent; - static const ::rtl::OUString msResourceActivationEvent; - static const ::rtl::OUString msResourceDeactivationEvent; - static const ::rtl::OUString msConfigurationUpdateStartEvent; - static const ::rtl::OUString msConfigurationUpdateEndEvent; + static const OUString msResourceActivationRequestEvent; + static const OUString msResourceDeactivationRequestEvent; + static const OUString msResourceActivationEvent; + static const OUString msResourceDeactivationEvent; + static const OUString msConfigurationUpdateStartEvent; + static const OUString msConfigurationUpdateEndEvent; // Service names of the common controllers. - static const ::rtl::OUString msModuleControllerService; - static const ::rtl::OUString msConfigurationControllerService; + static const OUString msModuleControllerService; + static const OUString msConfigurationControllerService; /** Return the FrameworkHelper object that is associated with the given ViewShellBase. If such an object does not yet exist, a new one is @@ -132,12 +132,12 @@ public: used in a switch statement. See GetViewURL() for a mapping in the opposite direction. */ - static ViewShell::ShellType GetViewId (const rtl::OUString& rsViewURL); + static ViewShell::ShellType GetViewId (const OUString& rsViewURL); /** Return a view URL for the given identifier. See GetViewId() for a mapping in the opposite direction. */ - static ::rtl::OUString GetViewURL (ViewShell::ShellType eType); + static OUString GetViewURL (ViewShell::ShellType eType); /** Return a ViewShell pointer for the given XView reference. This assumes that the given reference is implemented by the @@ -175,7 +175,7 @@ public: of the involved objects does not support XUnoTunnel (where necessary). */ - ::boost::shared_ptr GetViewShell (const ::rtl::OUString& rsPaneURL); + ::boost::shared_ptr GetViewShell (const OUString& rsPaneURL); /** Return a reference to the view that is displayed in the specified pane. See GetViewShell () for a variant that returns a ViewShell @@ -208,8 +208,8 @@ public: do some initialization after the requested view becomes active. */ css::uno::Reference RequestView ( - const ::rtl::OUString& rsResourceURL, - const ::rtl::OUString& rsAnchorURL); + const OUString& rsResourceURL, + const OUString& rsAnchorURL); /** Request the activation of the specified task panel in the standard task pane. @@ -223,7 +223,7 @@ public: is not active then this call is silently ignored. */ void RequestTaskPanel ( - const ::rtl::OUString& rsTaskPanelURL, + const OUString& rsTaskPanelURL, const bool bEnsureTaskPaneIsVisible = true); /** Process a slot call that requests a view shell change. @@ -240,7 +240,7 @@ public: the event it waits for has been sent. */ void RunOnConfigurationEvent( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Callback& rCallback); /** Run the given callback when the specified resource has been @@ -272,7 +272,7 @@ public: controller. When the configuration controller is not processing any requests the method returns immediately. */ - void WaitForEvent (const ::rtl::OUString& rsEventName) const; + void WaitForEvent (const OUString& rsEventName) const; /** This is a short cut for WaitForEvent(msConfigurationUpdateEndEvent). Call this method to execute the pending requests. @@ -289,7 +289,7 @@ public: /** Return a string representation of the given XResourceId object. */ - static ::rtl::OUString ResourceIdToString ( + static OUString ResourceIdToString ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxResourceId); @@ -298,7 +298,7 @@ public: static css::uno::Reference< css::drawing::framework::XResourceId> CreateResourceId ( - const ::rtl::OUString& rsResourceURL); + const OUString& rsResourceURL); /** Create a new XResourceId object for the given resource URL and a single anchor URL. @@ -306,8 +306,8 @@ public: static css::uno::Reference< css::drawing::framework::XResourceId> CreateResourceId ( - const ::rtl::OUString& rsResourceURL, - const ::rtl::OUString& rsAnchorURL); + const OUString& rsResourceURL, + const OUString& rsAnchorURL); /** Create a new XResourceId object for the given resource URL and the two given anchor URLs. @@ -315,16 +315,16 @@ public: static css::uno::Reference< css::drawing::framework::XResourceId> CreateResourceId ( - const ::rtl::OUString& rsResourceURL, - const ::rtl::OUString& rsFirstAnchorURL, - const ::rtl::OUString& rsSecondAnchorURL); + const OUString& rsResourceURL, + const OUString& rsFirstAnchorURL, + const OUString& rsSecondAnchorURL); /** Create a new XResourceId object for the given resource URL. */ static css::uno::Reference< css::drawing::framework::XResourceId> CreateResourceId ( - const ::rtl::OUString& rsResourceURL, + const OUString& rsResourceURL, const css::uno::Reference< css::drawing::framework::XResourceId>& rxAnchor); @@ -372,7 +372,7 @@ private: The callback functor to be called. */ void RunOnEvent( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const ConfigurationChangeEventFilter& rFilter, const Callback& rCallback) const; diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index bf83930ba8ba..d986112be6aa 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -79,7 +79,7 @@ public: // XModuleController - virtual void SAL_CALL requestResource(const ::rtl::OUString& rsResourceURL) + virtual void SAL_CALL requestResource(const OUString& rsResourceURL) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 4634bed147af..8dc234b51180 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -57,7 +57,7 @@ class PresentationFactory public PresentationFactoryInterfaceBase { public: - static const ::rtl::OUString msPresentationViewURL; + static const OUString msPresentationViewURL; PresentationFactory ( const css::uno::Reference& rxController); diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index 460db6db2bd6..a0f763fbc8b2 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -59,7 +59,7 @@ public: The set of URLs may be empty. The result is then the same as returned by ResourceId() default constructor. */ - ResourceId (const ::std::vector& rsResourceURLs); + ResourceId (const ::std::vector& rsResourceURLs); /** Create a new resource id that has an empty anchor. @param rsResourceURL @@ -68,7 +68,7 @@ public: had been called. */ ResourceId ( - const ::rtl::OUString& rsResourceURL); + const OUString& rsResourceURL); /** Create a new resource id for the given resource type and an anchor that is specified by a single URL. This constructor can be used for @@ -79,8 +79,8 @@ public: The single URL of the anchor. */ ResourceId ( - const ::rtl::OUString& rsResourceURL, - const ::rtl::OUString& rsAnchorURL); + const OUString& rsResourceURL, + const OUString& rsAnchorURL); /** Create a new resource id for the specified resource type and the given list of anchor URLs. @@ -90,8 +90,8 @@ public: The possibly empty list of anchor URLs. */ ResourceId ( - const ::rtl::OUString& rsResourceURL, - const ::std::vector& rAnchorURLs); + const OUString& rsResourceURL, + const ::std::vector& rAnchorURLs); /** Create a new resource id with an anchor that consists of a sequence of URLs that is extended by a further URL. @@ -103,20 +103,20 @@ public: An anchor as it is returned by XResourceId::getAnchorURLs(). */ ResourceId ( - const ::rtl::OUString& rsResourceURL, - const ::rtl::OUString& rsFirstAnchorURL, - const css::uno::Sequence& rAnchorURLs); + const OUString& rsResourceURL, + const OUString& rsFirstAnchorURL, + const css::uno::Sequence& rAnchorURLs); virtual ~ResourceId (void); /** Return the list of URLs of both the resource URL and the anchor URLs. */ - const ::std::vector& GetResourceURLs (void) const; + const ::std::vector& GetResourceURLs (void) const; //===== XResourceId ======================================================= - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getResourceURL (void) throw(css::uno::RuntimeException); @@ -133,11 +133,11 @@ public: getAnchor (void) throw (css::uno::RuntimeException); - virtual css::uno::Sequence SAL_CALL + virtual css::uno::Sequence SAL_CALL getAnchorURLs (void) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getResourceTypePrefix (void) throw (css::uno::RuntimeException); @@ -155,7 +155,7 @@ public: virtual sal_Bool SAL_CALL isBoundToURL ( - const ::rtl::OUString& rsAnchorURL, + const OUString& rsAnchorURL, css::drawing::framework::AnchorBindingMode eMode) throw (css::uno::RuntimeException); @@ -174,7 +174,7 @@ private: /** The set of URLs that consist of the resource URL at index 0 and the anchor URLs and indices 1 and above. */ - ::std::vector maResourceURLs; + ::std::vector maResourceURLs; ::boost::scoped_ptr mpURL; @@ -208,8 +208,8 @@ private: it can be bound indirectly, too. */ bool IsBoundToAnchor ( - const rtl::OUString* psFirstAnchorURL, - const css::uno::Sequence* paAnchorURLs, + const OUString* psFirstAnchorURL, + const css::uno::Sequence* paAnchorURLs, css::drawing::framework::AnchorBindingMode eMode) const; /** Return whether the called ResourceId object is bound to the anchor @@ -222,7 +222,7 @@ private: it can be bound indirectly, too. */ bool IsBoundToAnchor ( - const ::std::vector& rResourceURLs, + const ::std::vector& rResourceURLs, css::drawing::framework::AnchorBindingMode eMode) const; void ParseResourceURL (void); diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index 463704177cec..43eb7ba27eea 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -61,7 +61,7 @@ protected: SfxRequest& rReq); private: - rtl::OUString aCustomShape; + OUString aCustomShape; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index 1dcec9fa7ba9..0fe091aab63c 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -37,7 +37,7 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); - static void GetSupportedFilterVector( ::std::vector< ::rtl::OUString >& rFilterVector ); + static void GetSupportedFilterVector( ::std::vector< OUString >& rFilterVector ); private: FuInsertFile ( diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 4041108805d0..16bd9b88e123 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -56,7 +56,7 @@ public: nType == 0 -> pages nType == 1 -> objects */ - std::vector GetList ( const sal_uInt16 nType ) ; + std::vector GetList ( const sal_uInt16 nType ) ; sal_Bool IsLink(); sal_Bool IsRemoveUnnessesaryMasterPages() const; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 84555318ebbb..99e6bf3ed5a1 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -59,15 +59,15 @@ private: public: - SdOptionsItem( const SdOptionsGeneric& rParent, const ::rtl::OUString rSubTree ); + SdOptionsItem( const SdOptionsGeneric& rParent, const OUString rSubTree ); virtual ~SdOptionsItem(); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); - sal_Bool PutProperties( const com::sun::star::uno::Sequence< rtl::OUString >& rNames, + const ::com::sun::star::uno::Sequence< OUString >& rNames ); + sal_Bool PutProperties( const com::sun::star::uno::Sequence< OUString >& rNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues ); void SetModified(); }; @@ -78,14 +78,14 @@ friend class SdOptionsItem; private: - ::rtl::OUString maSubTree; + OUString maSubTree; SdOptionsItem* mpCfgItem; sal_uInt16 mnConfigId; sal_Bool mbInit : 1; sal_Bool mbEnableModify : 1; SAL_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const; + SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const; protected: @@ -100,10 +100,10 @@ protected: public: - SdOptionsGeneric( sal_uInt16 nConfigId, const ::rtl::OUString& rSubTree ); + SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTree ); virtual ~SdOptionsGeneric(); - const ::rtl::OUString& GetSubTree() const { return maSubTree; } + const OUString& GetSubTree() const { return maSubTree; } sal_uInt16 GetConfigId() const { return mnConfigId; } void EnableModify( sal_Bool bModify ) { mbEnableModify = bModify; } diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 5f8cdcf3f922..e863aff63441 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -202,7 +202,7 @@ public: nDepth == 0 -> pages nDepth == 1 -> objects */ - std::vector GetSelectEntryList (const sal_uInt16 nDepth) const; + std::vector GetSelectEntryList (const sal_uInt16 nDepth) const; SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } @@ -261,7 +261,7 @@ private: void AddShapeList ( const SdrObjList& rList, SdrObject* pShape, - const ::rtl::OUString& rsName, + const OUString& rsName, const bool bIsExcluded, SvTreeListEntry* pParentEntry, const IconProvider& rIconProvider); diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 66e36345d069..b09056f2832e 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -67,10 +67,10 @@ public: sal_Bool HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } - void SetPageBookmarks( const std::vector& rPageBookmarks, sal_Bool bPersistent ); + void SetPageBookmarks( const std::vector& rPageBookmarks, sal_Bool bPersistent ); sal_Bool IsPageTransferable() const { return mbPageTransferable; } sal_Bool HasPageBookmarks() const { return( mpPageDocShell && ( !maPageBookmarks.empty() ) ); } - const std::vector& GetPageBookmarks() const { return maPageBookmarks; } + const std::vector& GetPageBookmarks() const { return maPageBookmarks; } ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } sal_Bool SetTableRTF( SdDrawDocument*, const ::com::sun::star::datatransfer::DataFlavor& ); @@ -119,7 +119,7 @@ private: SfxObjectShellRef maDocShellRef; ::sd::DrawDocShell* mpPageDocShell; - std::vector maPageBookmarks; + std::vector maPageBookmarks; TransferableDataHelper* mpOLEDataHelper; TransferableObjectDescriptor* mpObjDesc; const ::sd::View* mpSdView; diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 31d43589896d..a309c82a8de2 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -118,18 +118,18 @@ public: virtual void SAL_CALL disposing (void); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPresentation virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException); @@ -146,7 +146,7 @@ public: // actions void jumpToPageNumber( sal_Int32 nPage ); // a.k.a. FuSlideShow::JumpToPage() void jumpToPageIndex( sal_Int32 nIndex ); - void jumpToBookmark( const ::rtl::OUString& sBookmark ); // a.k.a. FuSlideShow::JumpToBookmark() + void jumpToBookmark( const OUString& sBookmark ); // a.k.a. FuSlideShow::JumpToBookmark() /** sets or clears the pause state of the running slideshow. !!!! This should only be called by the SdShowWindow !!!!*/ diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index 6c1f401770f2..f37dcfed7d02 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -46,7 +46,7 @@ namespace sd { namespace toolpanel PID_UNKNOWN = 5 }; - PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ); + PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL ); //...................................................................................................................... } } // namespace sd::toolpanel diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index 3440ba58d3f4..f3cfd1d72eb4 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -68,7 +68,7 @@ public: TitledControl* AddControl ( ::std::auto_ptr pControl, const String& rTitle, - const rtl::OString& sHelpId); + const OString& sHelpId); /** Add a control to the sub panel without a title bar. */ diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 89a093169130..ccef40366b41 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -86,11 +86,11 @@ public: /** deactivates the given panel, bypassing the configuration controller. Only valid for tool panels which are not under the drawing framework's control. */ - void ActivatePanel( const ::rtl::OUString& i_rPanelResourceURL ); + void ActivatePanel( const OUString& i_rPanelResourceURL ); /** deactivates the given panel, bypassing the configuration controller */ - void DeactivatePanel( const ::rtl::OUString& i_rPanelResourceURL ); + void DeactivatePanel( const OUString& i_rPanelResourceURL ); /** Return a pointer to the docking window that is the parent or a predecessor of the content window. @@ -118,7 +118,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > CreatePanelUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocFrame, - const ::rtl::OUString& i_rPanelResourceURL + const OUString& i_rPanelResourceURL ); private: diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx index 6b4e49a727f8..16dbdea13b0c 100644 --- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx +++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx @@ -49,12 +49,12 @@ public: access. */ ConfigurationAccess( - const ::rtl::OUString& rsRootName, + const OUString& rsRootName, const WriteMode eMode); ConfigurationAccess( const css::uno::Reference& rxContext, - const ::rtl::OUString& rsRootName, + const OUString& rsRootName, const WriteMode eMode); /** Return a configuration node below the root of the called object. @@ -66,7 +66,7 @@ public: It is empty when the node was not found. */ css::uno::Any GetConfigurationNode ( - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); /** Return a configuration node below the given node. @param rxNode @@ -79,7 +79,7 @@ public: */ static css::uno::Any GetConfigurationNode ( const css::uno::Reference& rxNode, - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); /** Write any changes that have been made back to the configuration. This call is ignored when the called ConfigurationAccess object was @@ -92,7 +92,7 @@ public: and the value of the item. */ typedef ::boost::function&) > Functor; /** Execute a functor for all elements of the given container. @@ -109,7 +109,7 @@ public: */ static void ForAll ( const css::uno::Reference& rxContainer, - const ::std::vector& rArguments, + const ::std::vector& rArguments, const Functor& rFunctor); /** Fill a list with the string contents of all sub-elements in the given container. @@ -125,15 +125,15 @@ public: */ static void FillList( const css::uno::Reference& rxContainer, - const ::rtl::OUString& rsArgument, - ::std::vector& rList); + const OUString& rsArgument, + ::std::vector& rList); private: css::uno::Reference mxRoot; void Initialize ( const css::uno::Reference& rxProvider, - const ::rtl::OUString& rsRootName, + const OUString& rsRootName, const WriteMode eMode); }; diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index 0dedecda0beb..7955a60c1627 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -59,7 +59,7 @@ public: throw(css::uno::RuntimeException); virtual void SAL_CALL setPropertyValue ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rsPropertyValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -67,34 +67,34 @@ public: css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getPropertyValue (const rtl::OUString& rsPropertyName) + virtual css::uno::Any SAL_CALL getPropertyValue (const OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -105,18 +105,18 @@ protected: @throw com::sun::star::beans::UnknownPropertyException when the property is not supported. */ - virtual css::uno::Any GetPropertyValue (const ::rtl::OUString& rsPropertyName) = 0; + virtual css::uno::Any GetPropertyValue (const OUString& rsPropertyName) = 0; /** Set the given property value. @return the old value. @throw com::sun::star::beans::UnknownPropertyException when the property is not supported. */ virtual css::uno::Any SetPropertyValue ( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rValue) = 0; private: - typedef ::std::multimap > ChangeListenerContainer; ::boost::scoped_ptr mpChangeListeners; @@ -125,7 +125,7 @@ private: are registered for all properties. */ void CallListeners ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::beans::PropertyChangeEvent& rEvent); /** This method throws a DisposedException when the object has already been diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index cd6b07409662..785fe0c31b91 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -56,7 +56,7 @@ public: Link& rCallback, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider>& rxDispatchProvider, - const ::rtl::OUString& rSlotName); + const OUString& rSlotName); /** The constructor de-registers all remaining listeners. Usually a prior dispose() call should have done that already. @@ -86,7 +86,7 @@ public: ".uno:VerticalTextState". @throws DisposedException */ - void ObserveSlot (const ::rtl::OUString& rSlotName); + void ObserveSlot (const OUString& rSlotName); //===== frame::XStatusListener ========================================== @@ -136,7 +136,7 @@ private: /** Transform the given string into a URL object. */ - ::com::sun::star::util::URL MakeURL (const ::rtl::OUString& rSlotName) const; + ::com::sun::star::util::URL MakeURL (const OUString& rSlotName) const; /** Return an XDispatch object for the given URL. */ diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx index 1787c635501f..16927cf17b9e 100644 --- a/sd/source/ui/inc/unchss.hxx +++ b/sd/source/ui/inc/unchss.hxx @@ -44,7 +44,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; #endif // _SD_UNCHSS_HXX diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 0e9c219c9325..44b942e75037 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -54,7 +54,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; // -------------------------------------------------------------------- @@ -67,7 +67,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; private: String maOldName; diff --git a/sd/source/ui/inc/unmovss.hxx b/sd/source/ui/inc/unmovss.hxx index 92b68ced2e1a..34f12bb18663 100644 --- a/sd/source/ui/inc/unmovss.hxx +++ b/sd/source/ui/inc/unmovss.hxx @@ -39,7 +39,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; #endif // _SD_UNMOVSS_HXX diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 9827f06fbe51..5d476e82c9d5 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -56,8 +56,8 @@ namespace sd { class DrawDocShell; } -extern ::rtl::OUString getPageApiName( SdPage* pPage ); -extern ::rtl::OUString getPageApiNameFromUiName( const String& rUIName ); +extern OUString getPageApiName( SdPage* pPage ); +extern OUString getPageApiNameFromUiName( const String& rUIName ); /*********************************************************************** * * @@ -113,7 +113,7 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; - rtl::OUString maBuildId; + OUString maBuildId; void initializeDocument(); public: @@ -178,22 +178,22 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation > SAL_CALL getPresentation( ) throw(::com::sun::star::uno::RuntimeException); // XMultiServiceFactory ( SvxFmMSFactory ) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XLinkTargetSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException); @@ -202,7 +202,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException); // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // XRenderable virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -241,9 +241,9 @@ public: virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; @@ -254,9 +254,9 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); @@ -292,9 +292,9 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); @@ -317,18 +317,18 @@ public: virtual ~SdDocLinkTargets() throw(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); @@ -336,7 +336,7 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // intern - SdPage* FindPage( const ::rtl::OUString& rName ) const throw(); + SdPage* FindPage( const OUString& rName ) const throw(); }; #endif diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index caf5006052b7..66bb2f912f36 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -42,7 +42,7 @@ protected: ::com::sun::star::drawing::XDrawPage* mpPage; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > Search( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xText, SdUnoSearchReplaceDescriptor* pDescr ) throw(); - sal_Bool Search( const ::rtl::OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); + sal_Bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); ESelection GetSelection( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetShape( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetNextShape( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > xShapes, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xCurrentShape ) throw(); @@ -83,8 +83,8 @@ protected: sal_Bool mbReplace; - ::rtl::OUString maSearchStr; - ::rtl::OUString maReplaceStr; + OUString maSearchStr; + OUString maReplaceStr; public: SdUnoSearchReplaceDescriptor( sal_Bool bReplace ) throw(); @@ -97,21 +97,21 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoSearchReplaceDescriptor ) // XSearchDescriptor - virtual ::rtl::OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XReplaceDescriptor - virtual ::rtl::OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReplaceString( const ::rtl::OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; /* ================================================================= */ diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index dd02d7c4fa1e..28ff9c757882 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -50,7 +50,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; #endif // _SD_UNPRLOUT_HXX diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index 9d5c625d8278..16e1fd488c37 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace presenter { diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 086cb41857c4..f93cade9dec4 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace presenter { @@ -52,7 +51,7 @@ Reference SAL_CALL PresenterCanvas_createInstance ( -::rtl::OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException) +OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterCanvasFactory"); } @@ -60,11 +59,11 @@ Reference SAL_CALL PresenterCanvas_createInstance ( -Sequence SAL_CALL PresenterCanvas_getSupportedServiceNames (void) +Sequence SAL_CALL PresenterCanvas_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.rendering.Canvas"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.rendering.Canvas"); + return Sequence(&sServiceName, 1); } diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index dda4cef92956..97bc4f1c7abe 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace presenter { @@ -53,7 +52,7 @@ Reference SAL_CALL PresenterHelperService_createInstance ( -::rtl::OUString PresenterHelperService_getImplementationName (void) +OUString PresenterHelperService_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterHelper"); @@ -62,11 +61,11 @@ Reference SAL_CALL PresenterHelperService_createInstance ( -Sequence SAL_CALL PresenterHelperService_getSupportedServiceNames (void) +Sequence SAL_CALL PresenterHelperService_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterHelper"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.PresenterHelper"); + return Sequence(&sServiceName, 1); } diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index 2bfe3ff1c890..053b1e69d136 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -75,7 +75,7 @@ public: virtual css::uno::Reference SAL_CALL createCanvas ( const css::uno::Reference& rxWindow, sal_Int16 nRequestedCanvasFeatures, - const ::rtl::OUString& rsOptionalCanvasServiceName) + const OUString& rsOptionalCanvasServiceName) throw (css::uno::RuntimeException); virtual void SAL_CALL toTop ( @@ -83,7 +83,7 @@ public: throw (css::uno::RuntimeException); virtual css::uno::Reference SAL_CALL loadBitmap ( - const ::rtl::OUString& rsURL, + const OUString& rsURL, const css::uno::Reference& rxCanvas) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 757f8067a78e..48101513c30e 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::sd::slidesorter::cache; -using ::rtl::OUString; namespace sd { namespace presenter { @@ -87,7 +86,7 @@ Reference SAL_CALL PresenterPreviewCache_createInstance ( -::rtl::OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException) +OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterPreviewCache"); } @@ -95,11 +94,11 @@ Reference SAL_CALL PresenterPreviewCache_createInstance ( -Sequence SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void) +Sequence SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterPreviewCache"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.PresenterPreviewCache"); + return Sequence(&sServiceName, 1); } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 88829865027a..349eefef3b97 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; namespace sd { namespace presenter { @@ -61,7 +60,7 @@ Reference SAL_CALL PresenterTextViewService_createInstance ( -::rtl::OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException) +OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.PresenterTextView"); } @@ -69,11 +68,11 @@ Reference SAL_CALL PresenterTextViewService_createInstance ( -Sequence SAL_CALL PresenterTextViewService_getSupportedServiceNames (void) +Sequence SAL_CALL PresenterTextViewService_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.PresenterTextView"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.PresenterTextView"); + return Sequence(&sServiceName, 1); } @@ -215,7 +214,7 @@ Any PresenterTextView::GetPropertyValue (const OUString& rsPropertyName) Any PresenterTextView::SetPropertyValue ( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rValue) { ThrowIfDisposed(); @@ -392,7 +391,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) pEditEngine->EnableUndo (sal_True); pEditEngine->SetDefTab (sal_uInt16( - Application::GetDefaultDevice()->GetTextWidth(rtl::OUString("XXXX")))); + Application::GetDefaultDevice()->GetTextWidth(OUString("XXXX")))); pEditEngine->SetControlWord( (pEditEngine->GetControlWord() @@ -400,7 +399,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) (~EE_CNTRL_UNDOATTRIBS) & (~EE_CNTRL_PASTESPECIAL)); - pEditEngine->SetWordDelimiters (rtl::OUString(" .=+-*/(){}[];\"")); + pEditEngine->SetWordDelimiters (OUString(" .=+-*/(){}[];\"")); pEditEngine->SetRefMapMode (MAP_PIXEL); pEditEngine->SetPaperSize (Size(800, 0)); pEditEngine->EraseVirtualDevice(); diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index 19cfd9110d9c..1b4918f93dc6 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -59,9 +59,9 @@ protected: virtual void SAL_CALL disposing (void); virtual css::uno::Any GetPropertyValue ( - const ::rtl::OUString& rsPropertyName); + const OUString& rsPropertyName); virtual css::uno::Any SetPropertyValue ( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rValue); private: diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index e653bda12241..ccd6e795e087 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace presenter { @@ -42,7 +41,7 @@ Reference SAL_CALL SlideRenderer_createInstance ( -::rtl::OUString SlideRenderer_getImplementationName (void) throw(RuntimeException) +OUString SlideRenderer_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.SlideRenderer"); } @@ -50,11 +49,11 @@ Reference SAL_CALL SlideRenderer_createInstance ( -Sequence SAL_CALL SlideRenderer_getSupportedServiceNames (void) +Sequence SAL_CALL SlideRenderer_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.SlideRenderer"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.SlideRenderer"); + return Sequence(&sServiceName, 1); } @@ -216,7 +215,7 @@ BitmapEx SlideRenderer::CreatePreview ( const Image aPreview = maPreviewRenderer.RenderPage ( pPage, Size(aPreviewSize.Width*nFactor, aPreviewSize.Height*nFactor), - ::rtl::OUString()); + OUString()); if (nFactor == 1) return aPreview.GetBitmapEx(); else diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index a874a6ad819c..c87f1b82fb10 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -290,7 +290,7 @@ OSXBluetoothWrapper::OSXBluetoothWrapper( IOBluetoothRFCOMMChannel* channel ) : SAL_INFO( "sdremote.bluetooth", "OSXBluetoothWrapper::OSXBluetoothWrapper(): mnMTU=" << mnMTU ); } -sal_Int32 OSXBluetoothWrapper::readLine( rtl::OString& aLine ) +sal_Int32 OSXBluetoothWrapper::readLine( OString& aLine ) { SAL_INFO( "sdremote.bluetooth", "OSXBluetoothWrapper::readLine()" ); diff --git a/sd/source/ui/remotecontrol/IBluetoothSocket.hxx b/sd/source/ui/remotecontrol/IBluetoothSocket.hxx index 0359807d549f..cef365ac7e4e 100644 --- a/sd/source/ui/remotecontrol/IBluetoothSocket.hxx +++ b/sd/source/ui/remotecontrol/IBluetoothSocket.hxx @@ -26,7 +26,7 @@ namespace sd @return whatever the last call of recv returned, i.e. 0 or less if there was a problem in communications. */ - virtual sal_Int32 readLine(rtl::OString& aLine) = 0; + virtual sal_Int32 readLine(OString& aLine) = 0; /** Write a number of bytes diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index e9f9c22d9099..14d62d78e976 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -221,9 +221,9 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber ) return ""; - static const ::rtl::OUString sNotesShapeName ( + static const OUString sNotesShapeName ( "com.sun.star.presentation.NotesShape" ); - static const ::rtl::OUString sTextShapeName ( + static const OUString sTextShapeName ( "com.sun.star.drawing.TextShape" ); uno::Reference xIndexAccess ( aNotesPage, UNO_QUERY); @@ -253,7 +253,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber ) xIndexAccess->getByIndex(nIndex), UNO_QUERY); if (xShapeDescriptor.is()) { - ::rtl::OUString sType (xShapeDescriptor->getShapeType()); + OUString sType (xShapeDescriptor->getShapeType()); if (sType.equals(sNotesShapeName) || sType.equals(sTextShapeName)) { uno::Reference xText ( @@ -283,7 +283,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber ) sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl ) { - ::rtl::OUString aFilterName( "XHTML Draw File" ); + OUString aFilterName( "XHTML Draw File" ); uno::Reference< document::XExporter > xExporter; { @@ -298,7 +298,7 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl else fprintf( stderr, "Couldn't find by name.\n" ); - ::rtl::OUString aFilterImplName; + OUString aFilterImplName; sal_Int32 nFilterProps = aProps.getLength(); for ( sal_Int32 nFilterProp = 0; nFilterProp& aNotesPage, String aUrl if ( !bHasBaseURL ) { aArgs.realloc ( ++nEnd ); - aArgs[nEnd-1].Name = ::rtl::OUString( "DocumentBaseURL" ); + aArgs[nEnd-1].Name = OUString( "DocumentBaseURL" ); aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( sal_True ); } diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx index 66b30aeeee4c..750d2535e139 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.hxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx @@ -38,7 +38,7 @@ private: sal_uInt32 aWidth, sal_uInt32 aHeight, sal_uInt64 &rSize ); void sendNotes( sal_uInt32 aSlideNumber ); - rtl::OString prepareNotes( sal_uInt32 aSlideNumber ); + OString prepareNotes( sal_uInt32 aSlideNumber ); }; } diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index 2052fbf4d065..67259d70a963 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -20,8 +20,6 @@ using namespace sd; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::frame; -using rtl::OString; -using rtl::OStringBuffer; Listener::Listener( const ::rtl::Reference& rCommunicator, @@ -105,7 +103,7 @@ void SAL_CALL Listener::slideEnded (sal_Bool bReverse) (void) bReverse; } -void SAL_CALL Listener::hyperLinkClicked (const rtl::OUString &) +void SAL_CALL Listener::hyperLinkClicked (const OUString &) throw (css::uno::RuntimeException) { } diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx index e3385eb359fc..111076b47595 100644 --- a/sd/source/ui/remotecontrol/Listener.hxx +++ b/sd/source/ui/remotecontrol/Listener.hxx @@ -51,7 +51,7 @@ public: virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException); virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException); virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException); - virtual void SAL_CALL hyperLinkClicked( const ::rtl::OUString& hyperLink ) + virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (css::uno::RuntimeException); // XEventListener diff --git a/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx b/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx index cecaa7a8b1e5..d744a60cff81 100644 --- a/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx +++ b/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx @@ -29,7 +29,7 @@ namespace sd public: OSXBluetoothWrapper( IOBluetoothRFCOMMChannel* channel ); - virtual sal_Int32 readLine( rtl::OString& aLine ); + virtual sal_Int32 readLine( OString& aLine ); virtual sal_Int32 write( const void* pBuffer, sal_uInt32 len ); void appendData(void* pBuffer, size_t len ); void channelClosed(); diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index 3ec14de911a8..c3fe6fcb80dd 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -23,8 +23,6 @@ using namespace sd; using namespace ::com::sun::star; -using rtl::OUString; -using rtl::OString; using namespace ::osl; using namespace std; @@ -50,7 +48,7 @@ void Receiver::Timeout() { if( maExecQueue.size() ) { - std::vector< rtl::OString > aCommands( maExecQueue.front() ); + std::vector< OString > aCommands( maExecQueue.front() ); maExecQueue.pop_front(); if( !aCommands.empty() ) executeCommand( aCommands ); diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx index a4a915c4b3a9..261a72cc06ce 100644 --- a/sd/source/ui/remotecontrol/Receiver.hxx +++ b/sd/source/ui/remotecontrol/Receiver.hxx @@ -29,13 +29,13 @@ namespace sd // Timer is protected by the solar mutex => so are we. class Receiver : Timer { - std::deque< std::vector< rtl::OString > > maExecQueue; + std::deque< std::vector< OString > > maExecQueue; public: Receiver( Transmitter *aTransmitter ); ~Receiver(); virtual void Timeout(); - void pushCommand( const std::vector &rCommand ); - void executeCommand( const std::vector &aCommand ); + void pushCommand( const std::vector &rCommand ); + void executeCommand( const std::vector &aCommand ); private: Transmitter *pTransmitter; diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 5b53b87d4494..846ea9eae3db 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -using rtl::OString; using namespace ::osl; using namespace ::comphelper; @@ -51,11 +50,11 @@ namespace sd { ClientInfo { BufferedStreamSocket *mpStreamSocket; - rtl::OUString mPin; + OUString mPin; - ClientInfoInternal( const rtl::OUString rName, - const rtl::OUString rAddress, - BufferedStreamSocket *pSocket, rtl::OUString rPin ): + ClientInfoInternal( const OUString rName, + const OUString rAddress, + BufferedStreamSocket *pSocket, OUString rPin ): ClientInfo( rName, rAddress ), mpStreamSocket( pSocket ), mPin( rPin ) {} @@ -249,7 +248,7 @@ std::vector RemoteServer::getClients() return aClients; } -sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin ) +sal_Bool RemoteServer::connectClient( ClientInfo* pClient, OUString aPin ) { SAL_INFO( "sdremote", "RemoteServer::connectClient called" ); if ( !spServer ) diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx b/sd/source/ui/remotecontrol/Transmitter.cxx index a7c211b20ad1..f5861e4286f2 100644 --- a/sd/source/ui/remotecontrol/Transmitter.cxx +++ b/sd/source/ui/remotecontrol/Transmitter.cxx @@ -8,7 +8,6 @@ */ #include "Transmitter.hxx" -using rtl::OString; using namespace std; using namespace osl; // Sockets etc. using namespace sd; diff --git a/sd/source/ui/remotecontrol/Transmitter.hxx b/sd/source/ui/remotecontrol/Transmitter.hxx index 783e1d5dbc3c..9412ccc2faa4 100644 --- a/sd/source/ui/remotecontrol/Transmitter.hxx +++ b/sd/source/ui/remotecontrol/Transmitter.hxx @@ -28,7 +28,7 @@ public: enum Priority { PRIORITY_LOW = 1, PRIORITY_HIGH }; Transmitter( ::sd::IBluetoothSocket* aSocket ); ~Transmitter(); - void addMessage( const rtl::OString& aMessage, const Priority aPriority ); + void addMessage( const OString& aMessage, const Priority aPriority ); void notifyFinished(); private: @@ -41,8 +41,8 @@ private: ::osl::Mutex mQueueMutex; - std::queue mLowPriority; - std::queue mHighPriority; + std::queue mLowPriority; + std::queue mHighPriority; }; } diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index 90ed5146ac6e..b4fb2b0d218c 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 99e7efc991f2..f9154e255431 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -57,7 +57,6 @@ using ::com::sun::star::presentation::XSlideShowController; using ::com::sun::star::container::XIndexAccess; using ::sd::framework::FrameworkHelper; -using ::rtl::OUString; using ::com::sun::star::awt::XWindow; using namespace ::sd; using namespace ::cppu; @@ -69,7 +68,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::drawing::framework; -extern String getUiNameFromPageApiNameImpl( const ::rtl::OUString& rApiName ); +extern String getUiNameFromPageApiNameImpl( const OUString& rApiName ); namespace { @@ -831,7 +830,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) uno::Reference< frame::XDispatch > xDispatch( xProvider->queryDispatch( - aURL, ::rtl::OUString(), 0)); + aURL, OUString(), 0)); if( xDispatch.is() ) { xDispatch->dispatch(aURL, diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index fd29a7bd9996..7bb32b86995d 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -78,8 +78,6 @@ #include -using ::rtl::OUString; -using ::rtl::OString; using ::cppu::OInterfaceContainerHelper; using ::comphelper::ImplementationReference; using ::com::sun::star::animations::XAnimationNode; @@ -94,7 +92,7 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::beans; -extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEventName ); +extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName ); extern String getUiNameFromPageApiNameImpl( const OUString& rApiName ); namespace sd @@ -327,7 +325,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X OSL_FAIL( OString(OString("sd::AnimationSlideController::getSlideAPI(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); @@ -651,7 +649,7 @@ void SAL_CALL SlideshowImpl::disposing() OSL_FAIL( OString(OString("sd::SlideshowImpl::stop(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); @@ -879,7 +877,7 @@ bool SlideshowImpl::startPreview( OSL_FAIL( OString(OString("sd::SlideshowImpl::startPreview(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); bRet = false; @@ -1106,7 +1104,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) OSL_FAIL( OString(OString("sd::SlideshowImpl::startShow(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); bRet = false; @@ -1167,7 +1165,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp OSL_FAIL( OString(OString("sd::SlideshowImpl::startShowImpl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); return false; @@ -1205,7 +1203,7 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ ) OSL_FAIL( OString(OString("sd::SlideshowImpl::paint(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1259,7 +1257,7 @@ void SlideshowImpl::removeShapeEvents() OSL_FAIL( OString(OString("sd::SlideshowImpl::removeShapeEvents(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1294,7 +1292,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) OSL_FAIL( OString(OString("sd::SlideshowImpl::registerShapeEvents(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1372,7 +1370,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( OSL_FAIL( OString(OString("sd::SlideshowImpl::registerShapeEvents(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1443,7 +1441,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException) OSL_FAIL( OString(OString("sd::SlideshowImpl::pause(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1479,7 +1477,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) OSL_FAIL( OString(OString("sd::SlideshowImpl::resume(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1663,7 +1661,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark // --------------------------------------------------------- -void SlideshowImpl::hyperLinkClicked( rtl::OUString const& aHyperLink ) throw (RuntimeException) +void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) { OUString aBookmark( aHyperLink ); @@ -1901,7 +1899,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void) { OSL_FAIL( OString(OString("sd::SlideshowImpl::updateSlideShow(), exception caught: ") - + rtl::OUStringToOString( + + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -2033,7 +2031,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) OSL_FAIL( OString(OString("sd::SlideshowImpl::keyInput(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -2422,7 +2420,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const OSL_FAIL( OString(OString("sd::SlideshowImpl::createSlideShow(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -2631,7 +2629,7 @@ void SlideshowImpl::resize( const Size& rSize ) OSL_FAIL( OString(OString("sd::SlideshowImpl::resize(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -2987,7 +2985,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc OSL_FAIL( OString(OString("sd::SlideshowImpl::setUsePen(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -3280,7 +3278,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) OSL_FAIL( OString(OString("sd::SlideshowImpl::gotoPreviousSlide(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -3380,7 +3378,7 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException) OSL_FAIL( OString(OString("sd::SlideshowImpl::stopSound(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -3728,7 +3726,7 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti // --------------------------------------------------------- -void SlideShowListenerProxy::hyperLinkClicked( rtl::OUString const& aHyperLink ) throw (RuntimeException) +void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) { { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 7f87ea01ccd5..8be006b320da 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -102,7 +102,7 @@ struct PresentationSettingsEx : public PresentationSettings void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ) throw (css::lang::IllegalArgumentException); - void SetPropertyValue( const ::rtl::OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException); + void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException); }; // -------------------------------------------------------------------- @@ -111,7 +111,7 @@ struct WrappedShapeEventImpl { css::presentation::ClickAction meClickAction; sal_Int32 mnVerb; - ::rtl::OUString maStrBookmark; + OUString maStrBookmark; WrappedShapeEventImpl() : meClickAction( css::presentation::ClickAction_NONE ), mnVerb( 0 ) {}; }; @@ -148,7 +148,7 @@ public: virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException); virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException); virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException); - virtual void SAL_CALL hyperLinkClicked(const ::rtl::OUString & hyperLink) throw (css::uno::RuntimeException); + virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException); // css::lang::XEventListener: virtual void SAL_CALL disposing(const css::lang::EventObject & Source) throw (css::uno::RuntimeException); @@ -201,7 +201,7 @@ public: virtual void SAL_CALL gotoNextSlide( ) throw (css::uno::RuntimeException); virtual void SAL_CALL gotoPreviousSlide( ) throw (css::uno::RuntimeException); virtual void SAL_CALL gotoLastSlide( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL gotoBookmark( const ::rtl::OUString& Bookmark ) throw (css::uno::RuntimeException); + virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) throw (css::uno::RuntimeException); virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) throw (css::uno::RuntimeException); virtual void SAL_CALL stopSound( ) throw (css::uno::RuntimeException); @@ -227,7 +227,7 @@ public: // will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow void slideEnded(const bool bReverse); - void hyperLinkClicked(const ::rtl::OUString & hyperLink) throw (css::uno::RuntimeException); + void hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException); void click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent); /// ends the presentation async @@ -311,7 +311,7 @@ private: SfxDispatcher* getDispatcher() const; SfxBindings* getBindings() const; - sal_Int32 getSlideNumberForBookmark( const rtl::OUString& rStrBookmark ); + sal_Int32 getSlideNumberForBookmark( const OUString& rStrBookmark ); void removeShapeEvents(); void registerShapeEvents( sal_Int32 nSlideNumber ); @@ -388,9 +388,9 @@ private: sal_Int32 mnLastSlideNumber; WrappedShapeEventImplMap maShapeEventMap; - ::rtl::OUString msOnClick; - ::rtl::OUString msBookmark; - ::rtl::OUString msVerb; + OUString msOnClick; + OUString msBookmark; + OUString msVerb; css::uno::Reference< css::drawing::XDrawPage > mxPreviewDrawPage; css::uno::Reference< css::animations::XAnimationNode > mxPreviewAnimationNode; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 5fccaed09ca2..032345b5491c 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -44,7 +44,6 @@ using ::com::sun::star::presentation::XShapeEventListener; using ::com::sun::star::presentation::XSlideShowListener; using ::comphelper::ImplementationReference; -using ::rtl::OUString; using namespace ::com::sun::star; namespace sd diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 50f82bc6a2c5..6022d273b01a 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -87,16 +87,16 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH BitmapCache& rCache, sal_Int32 nMaximalCacheSize) { - static const ::rtl::OUString sNone ("None"); - static const ::rtl::OUString sCompress ("Compress"); - static const ::rtl::OUString sErase ("Erase"); - static const ::rtl::OUString sResolution ("ResolutionReduction"); - static const ::rtl::OUString sPNGCompression ("PNGCompression"); + static const OUString sNone ("None"); + static const OUString sCompress ("Compress"); + static const OUString sErase ("Erase"); + static const OUString sResolution ("ResolutionReduction"); + static const OUString sPNGCompression ("PNGCompression"); ::boost::shared_ptr pCompressor; - ::rtl::OUString sCompressionPolicy(sPNGCompression); + OUString sCompressionPolicy(sPNGCompression); Any aCompressionPolicy (CacheConfiguration::Instance()->GetValue("CompressionPolicy")); - if (aCompressionPolicy.has()) + if (aCompressionPolicy.has()) aCompressionPolicy >>= sCompressionPolicy; if (sCompressionPolicy == sNone) pCompressor.reset(new NoBitmapCompression()); @@ -108,9 +108,9 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH pCompressor.reset(new PngCompression()); ::std::auto_ptr pCompactor (NULL); - ::rtl::OUString sCompactionPolicy(sCompress); + OUString sCompactionPolicy(sCompress); Any aCompactionPolicy (CacheConfiguration::Instance()->GetValue("CompactionPolicy")); - if (aCompactionPolicy.has()) + if (aCompactionPolicy.has()) aCompactionPolicy >>= sCompactionPolicy; if (sCompactionPolicy == sNone) pCompactor.reset(new NoCacheCompaction(rCache,nMaximalCacheSize)); diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 0300bc0534c7..a67a16d37294 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -74,8 +74,8 @@ Timer CacheConfiguration::maReleaseTimer; CacheConfiguration::CacheConfiguration (void) { // Get the cache size from configuration. - const ::rtl::OUString sPathToImpressConfigurationRoot("/org.openoffice.Office.Impress/"); - const ::rtl::OUString sPathToNode("MultiPaneGUI/SlideSorter/PreviewCache"); + const OUString sPathToImpressConfigurationRoot("/org.openoffice.Office.Impress/"); + const OUString sPathToNode("MultiPaneGUI/SlideSorter/PreviewCache"); try { @@ -126,7 +126,7 @@ CacheConfiguration::CacheConfiguration (void) -Any CacheConfiguration::GetValue (const ::rtl::OUString& rName) +Any CacheConfiguration::GetValue (const OUString& rName) { Any aResult; diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index 056d4988e56d..f44d7a4a172d 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -44,7 +44,7 @@ public: MultiPaneGUI/SlideSorter/PreviewCache. When the specified value does not exist then an empty Any is returned. */ - ::com::sun::star::uno::Any GetValue (const ::rtl::OUString& rName); + ::com::sun::star::uno::Any GetValue (const OUString& rName); private: /** When a caller holds a reference after we have released ours we use diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 322b20127fcd..fa4e09f955bc 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -1010,8 +1010,8 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const String& rs if (pChild == NULL || pChild->GetPage() == NULL) return; - ::rtl::OUString sOldName (rsOldName); - ::rtl::OUString sNewName (pChild->GetPage()->GetName()); + OUString sOldName (rsOldName); + OUString sNewName (pChild->GetPage()->GetName()); pChild->FireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventId::NAME_CHANGED, makeAny(sOldName), diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 1e7e11a58752..7d658eab6a9d 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -337,7 +337,7 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) sal_Int32 nInsertPageCount (0); if (pClipTransferable->HasPageBookmarks()) { - const std::vector &rBookmarkList = pClipTransferable->GetPageBookmarks(); + const std::vector &rBookmarkList = pClipTransferable->GetPageBookmarks(); const SolarMutexGuard aGuard; nInsertPageCount = (sal_uInt16) rBookmarkList.size(); @@ -367,7 +367,7 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) bMergeMasterPages = (pDataDoc != rModel.GetDocument()); nInsertPageCount = pDataDoc->GetSdPageCount( PK_STANDARD ); rModel.GetDocument()->InsertBookmarkAsPage( - std::vector(), + std::vector(), NULL, sal_False, sal_False, @@ -415,7 +415,7 @@ void Clipboard::CreateSlideTransferable ( ::Window* pWindow, bool bDrag) { - std::vector aBookmarkList; + std::vector aBookmarkList; // Insert all selected pages into a bookmark list and remember them in // maPagesToRemove for possible later removal. @@ -540,7 +540,7 @@ void Clipboard::CreateSlideTransferable ( INetBookmark aINetBookmark; if ( ! aDataHelper.GetINetBookmark(SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark)) break; - const rtl::OUString sURL (aINetBookmark.GetURL()); + const OUString sURL (aINetBookmark.GetURL()); const sal_Int32 nIndex (sURL.indexOf((sal_Unicode)'#')); if (nIndex == -1) break; @@ -584,7 +584,7 @@ void Clipboard::CreateSlideTransferable ( // pTransferable->SetView(&mrSlideSorter.GetView()); // Set page bookmark list. - std::vector aPageBookmarks; + std::vector aPageBookmarks; aPageBookmarks.push_back(sBookmark); pTransferable->SetPageBookmarks(aPageBookmarks, false); diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 45ae28150ff6..8518279d74ef 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -245,7 +245,7 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript Any aPage; aPage <<= rpDescriptor->GetPage()->getUnoPage(); xSet->setPropertyValue ( - rtl::OUString("CurrentPage"), + OUString("CurrentPage"), aPage); } } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 439cc942d66d..17a8a141045b 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -224,7 +224,7 @@ void Listener::ConnectToController (void) { try { - xSet->addPropertyChangeListener(rtl::OUString("CurrentPage"), this); + xSet->addPropertyChangeListener(OUString("CurrentPage"), this); } catch (beans::UnknownPropertyException&) { @@ -232,7 +232,7 @@ void Listener::ConnectToController (void) } try { - xSet->addPropertyChangeListener(rtl::OUString("IsMasterPageMode"), this); + xSet->addPropertyChangeListener(OUString("IsMasterPageMode"), this); } catch (beans::UnknownPropertyException&) { @@ -268,10 +268,10 @@ void Listener::DisconnectFromController (void) if (xSet.is()) { xSet->removePropertyChangeListener ( - rtl::OUString("CurrentPage"), + OUString("CurrentPage"), this); xSet->removePropertyChangeListener ( - rtl::OUString("IsMasterPageMode"), + OUString("IsMasterPageMode"), this); } @@ -479,8 +479,8 @@ void SAL_CALL Listener::propertyChange ( { ThrowIfDisposed(); - static const ::rtl::OUString sCurrentPagePropertyName ("CurrentPage"); - static const ::rtl::OUString sEditModePropertyName ("IsMasterPageMode"); + static const OUString sCurrentPagePropertyName ("CurrentPage"); + static const OUString sEditModePropertyName ("IsMasterPageMode"); if (rEvent.PropertyName.equals(sCurrentPagePropertyName)) { diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index bc26e73bc5d9..87dcd7d8f105 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -55,7 +55,7 @@ public: private: SlideSorter& mrSlideSorter; model::SharedPageDescriptor mpDescriptor; - ::rtl::OUString msCurrentHelpText; + OUString msCurrentHelpText; sal_uLong mnHelpWindowHandle; Timer maShowTimer; Timer maHiddenTimer; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index a13af5a9dd95..5d9512156f3c 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::slidesorter::view::Layouter; namespace sd { namespace slidesorter { @@ -68,7 +67,7 @@ Reference SAL_CALL SlideSorterService_createInstance ( -::rtl::OUString SlideSorterService_getImplementationName (void) throw(RuntimeException) +OUString SlideSorterService_getImplementationName (void) throw(RuntimeException) { return OUString("com.sun.star.comp.Draw.SlideSorter"); } @@ -76,11 +75,11 @@ Reference SAL_CALL SlideSorterService_createInstance ( -Sequence SAL_CALL SlideSorterService_getSupportedServiceNames (void) +Sequence SAL_CALL SlideSorterService_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.SlideSorter"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.SlideSorter"); + return Sequence(&sServiceName, 1); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index e86b696c6bad..91dadc05807c 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -131,7 +131,7 @@ SlideSorterViewShell::SlideSorterViewShell ( mpFrameView = new FrameView(GetDoc()); GetFrameView()->Connect(); - SetName (rtl::OUString("SlideSorterViewShell")); + SetName (OUString("SlideSorterViewShell")); pParentWindow->SetStyle(pParentWindow->GetStyle() | WB_DIALOGCONTROL); } @@ -216,12 +216,12 @@ SlideSorterViewShell* SlideSorterViewShell::GetSlideSorter (ViewShellBase& rBase SlideSorterViewShell* pViewShell = NULL; // Test the center, left, and then the right pane for showing a slide sorter. - ::rtl::OUString aPaneURLs[] = { + OUString aPaneURLs[] = { FrameworkHelper::msCenterPaneURL, FrameworkHelper::msFullScreenPaneURL, FrameworkHelper::msLeftImpressPaneURL, FrameworkHelper::msRightPaneURL, - ::rtl::OUString()}; + OUString()}; try { diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 196b99df6cbf..5186521bf6b4 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -743,7 +743,7 @@ void SlideSorterView::CompleteRedraw ( mrSlideSorter.GetContentWindow()->SetTextColor(COL_WHITE); mrSlideSorter.GetContentWindow()->DrawText( gFrameTimeBox, - ::rtl::OUString::valueOf(1 / (gFrameTimeSum / gFrameTimeCount)), + OUString::valueOf(1 / (gFrameTimeSum / gFrameTimeCount)), TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER); // mrSlideSorter.GetContentWindow()->Invalidate(gFrameTimeBox); #endif diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 6aadcb720e14..fc5248384358 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -270,7 +270,7 @@ void InsertionIndicatorOverlay::PaintPageCount ( ::boost::shared_ptr pFont(Theme::GetFont(Theme::Font_PageCount, rDevice)); if (pFont) { - ::rtl::OUString sNumber (::rtl::OUString::valueOf(nSelectionCount)); + OUString sNumber (OUString::valueOf(nSelectionCount)); // Determine the size of the (painted) text and create a bounding // box that centers the text on the first preview. diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 06750bf21e25..21c42ad78591 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -243,16 +243,16 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount) String sPageNumberTemplate; if (nPageCount < 10) - sPageNumberTemplate = rtl::OUString("9"); + sPageNumberTemplate = OUString("9"); else if (nPageCount < 100) - sPageNumberTemplate = rtl::OUString("99"); + sPageNumberTemplate = OUString("99"); else if (nPageCount < 200) // Just for the case that 1 is narrower than 9. - sPageNumberTemplate = rtl::OUString("199"); + sPageNumberTemplate = OUString("199"); else if (nPageCount < 1000) - sPageNumberTemplate = rtl::OUString("999"); + sPageNumberTemplate = OUString("999"); else - sPageNumberTemplate = rtl::OUString("9999"); + sPageNumberTemplate = OUString("9999"); // More then 9999 pages are not handled. const Size aSize ( diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 2d8fcf584dd8..9bf75e6148f2 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -319,7 +319,7 @@ void PageObjectPainter::PaintPageNumber ( // Paint the page number. OSL_ASSERT(rpDescriptor->GetPage()!=NULL); const sal_Int32 nPageNumber ((rpDescriptor->GetPage()->GetPageNum() - 1) / 2 + 1); - const rtl::OUString sPageNumber(rtl::OUString::valueOf(nPageNumber)); + const OUString sPageNumber(OUString::valueOf(nPageNumber)); rDevice.SetFont(*mpPageNumberFont); rDevice.SetTextColor(aPageNumberColor); rDevice.DrawText(aBox, sPageNumber, TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER); diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index c0babd796165..9542055a5e0f 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -27,7 +27,6 @@ #include "glob.hrc" #include -using ::rtl::OUString; namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 754801cf1055..8e44325f4a99 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -53,7 +53,6 @@ #include "sdresid.hxx" #include "EventMultiplexer.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 0714be8ba6fa..021bddc55161 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -78,7 +78,7 @@ private: private: ViewShellBase& mrBase; - const rtl::OUString msTableTemplate; + const OUString msTableTemplate; boost::scoped_ptr< Control > mxControls[DESIGNPANE_CONTROL_COUNT]; int mnOrgOffsetY[DESIGNPANE_CONTROL_COUNT]; diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 57a9b69e85dc..950949cdbf6c 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -62,7 +62,6 @@ #include "sdresid.hxx" #include "undo/undoobjects.hxx" -using ::rtl::OUString; using namespace ::sd; using namespace ::sdr::table; using namespace ::com::sun::star; diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 24bcdc1d6284..8f444a355c6b 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -197,7 +197,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) SetExtraSpacing(2); SetSelectHdl (LINK(this, LayoutMenu, ClickHandler)); SetPool (&rDocumentShell.GetDoc()->GetPool()); - SetName(rtl::OUString("LayoutMenu")); + SetName(OUString("LayoutMenu")); InvalidateContent(); Link aEventListenerLink (LINK(this,LayoutMenu,EventMultiplexerListener)); @@ -759,7 +759,7 @@ void LayoutMenu::Fill (void) && pDocument->GetDefaultWritingMode() == WritingMode_RL_TB); // Get URL of the view in the center pane. - ::rtl::OUString sCenterPaneViewName; + OUString sCenterPaneViewName; try { Reference xControllerManager ( diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index ba7de514cfd5..8d9a6b0afc60 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -51,7 +51,7 @@ ScrollPanel::ScrollPanel ( void ScrollPanel::Construct() { - SetAccessibleName (::rtl::OUString("Sub Task Panel")); + SetAccessibleName (OUString("Sub Task Panel")); mpControlContainer->SetMultiSelection (true); SetBorderStyle (WINDOW_BORDER_NORMAL); @@ -107,7 +107,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH TitledControl* ScrollPanel::AddControl ( ::std::auto_ptr pControl, const String& rTitle, - const rtl::OString& rHelpId) + const OString& rHelpId) { // We are interested only in the title. The control itself is // managed by the content object. diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index 3206262eb74d..58999e88721d 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -43,7 +43,7 @@ SubToolPanel::SubToolPanel ( mnVerticalGap(3), mnHorizontalBorder(2) { - SetAccessibleName (::rtl::OUString("Sub Task Panel")); + SetAccessibleName (OUString("Sub Task Panel")); mpControlContainer->SetMultiSelection (true); SetBorderStyle (WINDOW_BORDER_NORMAL); diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 0a366b4ff613..c89d64847faf 100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -69,7 +69,7 @@ namespace sd { namespace toolpanel void ToolPanel::checkDisposed() { if ( m_pControl.get() == NULL ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/sd/source/ui/toolpanel/ToolPanelFactory.cxx b/sd/source/ui/toolpanel/ToolPanelFactory.cxx index 9ae0087c08c4..e1c63e250e09 100644 --- a/sd/source/ui/toolpanel/ToolPanelFactory.cxx +++ b/sd/source/ui/toolpanel/ToolPanelFactory.cxx @@ -79,12 +79,12 @@ namespace sd { namespace toolpanel ToolPanelFactory( const Reference< XComponentContext >& i_rContext ); // XUIElementFactory - virtual Reference< XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException); + virtual Reference< XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException); @@ -104,17 +104,17 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ToolPanelFactory_getImplementationName() throw(RuntimeException) + OUString ToolPanelFactory_getImplementationName() throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.drawing.ToolPanelFactory" ) ; + return OUString( "com.sun.star.comp.drawing.ToolPanelFactory" ) ; } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory_getSupportedServiceNames (void) + Sequence< OUString > SAL_CALL ToolPanelFactory_getSupportedServiceNames (void) throw (RuntimeException) { - const ::rtl::OUString sServiceName( "com.sun.star.drawing.DefaultToolPanelFactory" ); - return Sequence< ::rtl::OUString >( &sServiceName, 1 ); + const OUString sServiceName( "com.sun.star.drawing.DefaultToolPanelFactory" ); + return Sequence< OUString >( &sServiceName, 1 ); } //------------------------------------------------------------------------------------------------------------------ @@ -129,7 +129,7 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const ::rtl::OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException) + Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -206,16 +206,16 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw (RuntimeException) { return ToolPanelFactory_getImplementationName(); } //------------------------------------------------------------------------------------------------------------------ - ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const ::rtl::OUString& i_rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const OUString& i_rServiceName ) throw (RuntimeException) { - const Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pSupported = aSupported.getConstArray(); + const Sequence< OUString > aSupported( getSupportedServiceNames() ); + for ( const OUString* pSupported = aSupported.getConstArray(); pSupported != aSupported.getConstArray() + aSupported.getLength(); ++pSupported ) @@ -226,7 +226,7 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames( ) throw (RuntimeException) { return ToolPanelFactory_getSupportedServiceNames(); } diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.cxx b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx index 841edfc0a5d9..284bd44ef61f 100644 --- a/sd/source/ui/toolpanel/ToolPanelUIElement.cxx +++ b/sd/source/ui/toolpanel/ToolPanelUIElement.cxx @@ -55,7 +55,7 @@ namespace sd { namespace toolpanel //= ToolPanelUIElement //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ - ToolPanelUIElement::ToolPanelUIElement( const Reference< XFrame >& i_rFrame, const ::rtl::OUString& i_rResourceURL, + ToolPanelUIElement::ToolPanelUIElement( const Reference< XFrame >& i_rFrame, const OUString& i_rResourceURL, const Reference< XToolPanel >& i_rToolPanel ) :ToolPanelUIElement_Base( m_aMutex ) ,m_xFrame( i_rFrame ) @@ -73,7 +73,7 @@ namespace sd { namespace toolpanel void ToolPanelUIElement::checkDisposed() { if ( !m_xToolPanel.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); } //------------------------------------------------------------------------------------------------------------------ @@ -84,7 +84,7 @@ namespace sd { namespace toolpanel } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ToolPanelUIElement::getResourceURL() throw (RuntimeException) + OUString SAL_CALL ToolPanelUIElement::getResourceURL() throw (RuntimeException) { UIElementMethodGuard aGuard( *this ); return m_sResourceURL; diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx index ff0dfdaec08c..567344d1101a 100644 --- a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx +++ b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx @@ -44,13 +44,13 @@ namespace sd { namespace toolpanel public: ToolPanelUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, - const ::rtl::OUString& i_rResourceURL, + const OUString& i_rResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel >& i_rToolPanel ); // XUIElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface( ) throw (::com::sun::star::uno::RuntimeException); @@ -65,7 +65,7 @@ namespace sd { namespace toolpanel private: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - const ::rtl::OUString m_sResourceURL; + const OUString m_sResourceURL; const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel > m_xToolPanel; }; diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 08e8e7b2a9fb..1d43547aac01 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx @@ -118,7 +118,7 @@ namespace sd { namespace toolpanel { // = misc helper // ===================================================================================================================== // --------------------------------------------------------------------------------------------------------------------- -PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL, const bool i_bIgnoreUnknown ) +PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL, const bool i_bIgnoreUnknown ) { PanelId ePanelId( PID_UNKNOWN ); @@ -152,7 +152,7 @@ PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL, cons } // --------------------------------------------------------------------------------------------------------------------- -PanelId GetStandardPanelId( const ::rtl::OUString& i_rTaskPanelResourceURL ) +PanelId GetStandardPanelId( const OUString& i_rTaskPanelResourceURL ) { return GetStandardPanelId( i_rTaskPanelResourceURL, false ); } @@ -184,7 +184,7 @@ protected: void impl_checkDisposed_throw() { if ( !m_pShellImpl ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); } private: @@ -218,13 +218,13 @@ public: /** activates the panel which has the given resource URL */ - void ActivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ); + void ActivatePanelByResource( const OUString& i_rPanelResourceURL ); /** de-activates the panel given by its resource URL, bypassing the configuration controller If the panel is not active currently, nothing happens. */ - void DeactivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ); + void DeactivatePanelByResource( const OUString& i_rPanelResourceURL ); /** provides access to the VCL window of the panel deck */ @@ -248,12 +248,12 @@ private: virtual void Dying(); // IToolPanelCompare overridables - virtual short compareToolPanelsURLs( const ::rtl::OUString& i_rLHS, const ::rtl::OUString& i_rRHS ) const; + virtual short compareToolPanelsURLs( const OUString& i_rLHS, const OUString& i_rRHS ) const; private: struct InitialPanel { - ::rtl::OUString sPanelResourceURL; + OUString sPanelResourceURL; bool bActivateDirectly; InitialPanel() :sPanelResourceURL() @@ -262,7 +262,7 @@ private: } }; InitialPanel impl_determineInitialPanel(); - ::rtl::OUString impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel ); + OUString impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel ); private: ToolPanelViewShell& m_rPanelViewShell; @@ -289,7 +289,7 @@ ConfigurationListener::ConfigurationListener( ToolPanelViewShell_Impl& i_rShellI osl_atomic_increment( &m_refCount ); { - xBroadcaster->addConfigurationChangeListener( this, ::rtl::OUString(), Any() ); + xBroadcaster->addConfigurationChangeListener( this, OUString(), Any() ); } osl_atomic_decrement( &m_refCount ); } @@ -315,7 +315,7 @@ void SAL_CALL ConfigurationListener::notifyConfigurationChange( const Configurat xAnchorId = i_rEvent.ResourceId->getAnchor(); if ( !xAnchorId.is() ) return; - const ::rtl::OUString sAnchorURL( xAnchorId->getResourceURL() ); + const OUString sAnchorURL( xAnchorId->getResourceURL() ); if ( sAnchorURL != FrameworkHelper::msTaskPaneURL ) return; @@ -376,7 +376,7 @@ ToolPanelViewShell_Impl::InitialPanel ToolPanelViewShell_Impl::impl_determineIni if ( aViewIds.getLength() > 0 ) { - const ::rtl::OUString sResourceURL( aViewIds[0]->getResourceURL() ); + const OUString sResourceURL( aViewIds[0]->getResourceURL() ); PanelId nRequestedPanel = GetStandardPanelId( sResourceURL ); if ( nRequestedPanel != PID_UNKNOWN ) { @@ -434,7 +434,7 @@ void ToolPanelViewShell_Impl::Cleanup() } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::ActivatePanelByResource( const ::rtl::OUString& i_rResourceURL ) +void ToolPanelViewShell_Impl::ActivatePanelByResource( const OUString& i_rResourceURL ) { // determine position of the requested panel ::boost::optional< size_t > aPanelPos = GetTaskPane().GetPanelPos( i_rResourceURL ); @@ -444,7 +444,7 @@ void ToolPanelViewShell_Impl::ActivatePanelByResource( const ::rtl::OUString& i_ } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell_Impl::DeactivatePanelByResource( const ::rtl::OUString& i_rPanelResourceURL ) +void ToolPanelViewShell_Impl::DeactivatePanelByResource( const OUString& i_rPanelResourceURL ) { // determine position of the requested panel ::boost::optional< size_t > aPanelPos = GetTaskPane().GetPanelPos( i_rPanelResourceURL ); @@ -500,7 +500,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi mpHorizontalRuler.reset(); mpVerticalRuler.reset(); - SetName( rtl::OUString( "ToolPanelViewShell" ) ); + SetName( OUString( "ToolPanelViewShell" ) ); // enforce the creation of the Accessible object here. // In some not-always-to-reproduce situations, creating the accessible on demand only leads to some @@ -672,8 +672,8 @@ namespace struct PanelFactory { ControlFactoryFactory pFactory; - rtl::OString sHelpID; - PanelFactory( const ControlFactoryFactory i_pFactory, const rtl::OString& i_nHelpID ) + OString sHelpID; + PanelFactory( const ControlFactoryFactory i_pFactory, const OString& i_nHelpID ) :pFactory( i_pFactory ) ,sHelpID( i_nHelpID ) { @@ -702,7 +702,7 @@ namespace } //--------------------------------------------------------------------------------------------------------------------- -Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Reference< XFrame >& i_rDocFrame, const ::rtl::OUString& i_rPanelResourceURL ) +Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Reference< XFrame >& i_rDocFrame, const OUString& i_rPanelResourceURL ) { const PanelId ePanelId( GetStandardPanelId( i_rPanelResourceURL ) ); ENSURE_OR_RETURN( ePanelId != PID_UNKNOWN, "ToolPanelViewShell::CreatePanelUIElement: illegal panel URL!", NULL ); @@ -727,7 +727,7 @@ Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Referenc } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::ActivatePanel( const ::rtl::OUString& i_rPanelResourceURL ) +void ToolPanelViewShell::ActivatePanel( const OUString& i_rPanelResourceURL ) { OSL_ENSURE( i_rPanelResourceURL.indexOf( FrameworkHelper::msTaskPanelURLPrefix ) < 0, "ToolPanelViewShell::ActivatePanel: for drawing-framework-controller panels, please use FrameworkHelper::RequestTaskPanel!" ); @@ -735,7 +735,7 @@ void ToolPanelViewShell::ActivatePanel( const ::rtl::OUString& i_rPanelResourceU } // --------------------------------------------------------------------------------------------------------------------- -void ToolPanelViewShell::DeactivatePanel( const ::rtl::OUString& i_rPanelResourceURL ) +void ToolPanelViewShell::DeactivatePanel( const OUString& i_rPanelResourceURL ) { mpImpl->DeactivatePanelByResource( i_rPanelResourceURL ); } @@ -777,15 +777,15 @@ void ToolPanelViewShell_Impl::PanelRemoved( const size_t i_nPosition ) } // --------------------------------------------------------------------------------------------------------------------- -::rtl::OUString ToolPanelViewShell_Impl::impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel ) +OUString ToolPanelViewShell_Impl::impl_getPanelURL( const ::boost::optional< size_t >& i_rPanel ) { - ::rtl::OUString sPanelURL; + OUString sPanelURL; if ( !!i_rPanel ) { sPanelURL = GetTaskPane().GetPanelResourceURL( *i_rPanel ); const PanelId ePanelId( GetStandardPanelId( sPanelURL, true ) ); if ( ePanelId == PID_UNKNOWN ) - sPanelURL = ::rtl::OUString(); + sPanelURL = OUString(); } return sPanelURL; } @@ -796,8 +796,8 @@ void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_ // update the configuration controller, since this change in the active panel might have been triggered by means other // than the drawing framework, so it does not yet know about it. - const ::rtl::OUString sOldPanelURL( impl_getPanelURL( i_rOldActive ) ); - const ::rtl::OUString sNewPanelURL( impl_getPanelURL( i_rNewActive ) ); + const OUString sOldPanelURL( impl_getPanelURL( i_rOldActive ) ); + const OUString sNewPanelURL( impl_getPanelURL( i_rNewActive ) ); const ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) ); if ( !sNewPanelURL.isEmpty() ) @@ -842,7 +842,7 @@ void ToolPanelViewShell_Impl::Dying() } // --------------------------------------------------------------------------------------------------------------------- -short ToolPanelViewShell_Impl::compareToolPanelsURLs( const ::rtl::OUString& i_rLHS, const ::rtl::OUString& i_rRHS ) const +short ToolPanelViewShell_Impl::compareToolPanelsURLs( const OUString& i_rLHS, const OUString& i_rRHS ) const { const PanelId eLHS( GetStandardPanelId( i_rLHS, true ) ); const PanelId eRHS( GetStandardPanelId( i_rRHS, true ) ); diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx index 5ec1a0d1a17f..fe6ca42c2a5d 100644 --- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx @@ -89,7 +89,7 @@ AllMasterPagesSelector::AllMasterPagesSelector ( mrViewShell(rViewShell), mpSortedMasterPages(new SortedMasterPageDescriptorList()) { - SetName (rtl::OUString("AllMasterPagesSelector")); + SetName (OUString("AllMasterPagesSelector")); MasterPagesSelector::Fill(); } diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx index f688f783327b..4d901cf91f7a 100644 --- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx @@ -51,7 +51,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector ( const ::boost::shared_ptr& rpContainer) : MasterPagesSelector (pParent, rDocument, rBase, rpContainer) { - SetName(rtl::OUString("CurrentMasterPagesSelector")); + SetName(OUString("CurrentMasterPagesSelector")); // For this master page selector only we change the default action for // left clicks. diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index 58f8a525891b..25842f015b56 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx @@ -513,7 +513,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( SdPage* pMasterPageInDocument = NULL; // Search for a master page with the same name as the given one in // the target document. - const rtl::OUString sMasterPageLayoutName (pMasterPage->GetLayoutName()); + const OUString sMasterPageLayoutName (pMasterPage->GetLayoutName()); for (sal_uInt16 nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex(rTargetDocument.GetMasterPage(nIndex)); diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index f5bd19d90e52..1a59444fe92d 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -995,7 +995,7 @@ Reference MasterPageContainer::Implementation::GetModel (void) ::comphelper::getProcessComponentContext() ); // Create a new model. - ::rtl::OUString sModelServiceName ( "com.sun.star.presentation.PresentationDocument"); + OUString sModelServiceName ( "com.sun.star.presentation.PresentationDocument"); mxModel = uno::Reference( ::comphelper::getProcessServiceFactory()->createInstance( sModelServiceName), diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx index 68939582bb6a..7c5636f31301 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx @@ -163,7 +163,7 @@ private: /** Retrieve the preview of the document specified by the given URL. */ - static BitmapEx LoadPreviewFromURL (const ::rtl::OUString& aURL); + static BitmapEx LoadPreviewFromURL (const OUString& aURL); }; diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx index 7bc2713abaad..a476219297a3 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx @@ -64,7 +64,7 @@ Image PagePreviewProvider::operator () ( aPreview = rRenderer.RenderPage( pPage, nWidth, - rtl::OUString(), + OUString(), false); } @@ -92,7 +92,7 @@ bool PagePreviewProvider::NeedsPageObject (void) //===== TemplatePreviewProvider =============================================== -TemplatePreviewProvider::TemplatePreviewProvider (const ::rtl::OUString& rsURL) +TemplatePreviewProvider::TemplatePreviewProvider (const OUString& rsURL) : msURL(rsURL) { } @@ -146,9 +146,9 @@ Image TemplatePreviewProvider::operator() ( { OSL_TRACE ( "caught exception while trying to access Thumbnail/thumbnail.png of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } @@ -176,9 +176,9 @@ Image TemplatePreviewProvider::operator() ( { OSL_TRACE ( "caught exception while trying to access Thumbnails/thumbnail.png of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -186,9 +186,9 @@ Image TemplatePreviewProvider::operator() ( { OSL_TRACE ( "caught exception while trying to access tuhmbnail of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } @@ -229,7 +229,7 @@ bool TemplatePreviewProvider::NeedsPageObject (void) //===== TemplatePageObjectProvider ============================================= -TemplatePageObjectProvider::TemplatePageObjectProvider (const ::rtl::OUString& rsURL) +TemplatePageObjectProvider::TemplatePageObjectProvider (const OUString& rsURL) : msURL(rsURL), mxDocumentShell() { @@ -277,7 +277,7 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume -::sd::DrawDocShell* TemplatePageObjectProvider::LoadDocument (const ::rtl::OUString& sFileName) +::sd::DrawDocShell* TemplatePageObjectProvider::LoadDocument (const OUString& sFileName) { SfxApplication* pSfxApp = SFX_APP(); SfxItemSet* pSet = new SfxAllItemSet (pSfxApp->GetPool()); diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx index 8d09ff838c87..dfe4785357f7 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx @@ -124,15 +124,15 @@ private: class TemplatePageObjectProvider : public PageObjectProvider { public: - TemplatePageObjectProvider (const ::rtl::OUString& rsURL); + TemplatePageObjectProvider (const OUString& rsURL); virtual ~TemplatePageObjectProvider (void) {}; virtual SdPage* operator () (SdDrawDocument* pDocument); virtual int GetCostIndex (void); virtual bool operator== (const PageObjectProvider& rProvider); private: - ::rtl::OUString msURL; + OUString msURL; SfxObjectShellLock mxDocumentShell; - ::sd::DrawDocShell* LoadDocument (const ::rtl::OUString& sFileName); + ::sd::DrawDocShell* LoadDocument (const OUString& sFileName); }; @@ -144,13 +144,13 @@ private: class TemplatePreviewProvider : public PreviewProvider { public: - TemplatePreviewProvider (const ::rtl::OUString& rsURL); + TemplatePreviewProvider (const OUString& rsURL); virtual ~TemplatePreviewProvider (void) {}; virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer); virtual int GetCostIndex (void); virtual bool NeedsPageObject (void); private: - ::rtl::OUString msURL; + OUString msURL; }; diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx index 692cdd27b8ae..d2fc2ccca2cb 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx @@ -308,7 +308,7 @@ MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassificati //===== URLComparator ========================================================= -MasterPageDescriptor::URLComparator::URLComparator (const ::rtl::OUString& sURL) +MasterPageDescriptor::URLComparator::URLComparator (const OUString& sURL) : msURL(sURL) { } @@ -330,7 +330,7 @@ bool MasterPageDescriptor::URLComparator::operator() ( // ===== StyleNameComparator ================================================== -MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const ::rtl::OUString& sStyleName) +MasterPageDescriptor::StyleNameComparator::StyleNameComparator (const OUString& sStyleName) : msStyleName(sStyleName) { } diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx index 0896a093537e..5627b53c7e61 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx @@ -151,15 +151,15 @@ public: /** The URL is not empty for master pages loaded from a template document. */ - ::rtl::OUString msURL; + OUString msURL; /** Taken from the title of the template file. */ - ::rtl::OUString msPageName; + OUString msPageName; /** Taken from the master page object. */ - ::rtl::OUString msStyleName; + OUString msStyleName; const bool mbIsPrecious; @@ -203,13 +203,13 @@ public: sal_Int32 mnUseCount; class URLComparator { public: - ::rtl::OUString msURL; - URLComparator (const ::rtl::OUString& sURL); + OUString msURL; + URLComparator (const OUString& sURL); bool operator() (const SharedMasterPageDescriptor& rDescriptor); }; class StyleNameComparator { public: - ::rtl::OUString msStyleName; - StyleNameComparator (const ::rtl::OUString& sStyleName); + OUString msStyleName; + StyleNameComparator (const OUString& sStyleName); bool operator() (const SharedMasterPageDescriptor& rDescriptor); }; class PageObjectComparator { public: diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 1eb94c9db5a2..a8d9caf50b61 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -326,7 +326,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( aCurrentMasterPages.insert (pMasterPage->GetName()); OSL_TRACE("currently used master page %d is %s", nIndex, - ::rtl::OUStringToOString(pMasterPage->GetName(), + OUStringToOString(pMasterPage->GetName(), RTL_TEXTENCODING_UTF8).getStr()); } @@ -346,7 +346,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( ++J) OSL_TRACE("old used master page %d is %s", i++, - ::rtl::OUStringToOString(*J, + OUStringToOString(*J, RTL_TEXTENCODING_UTF8).getStr()); // Send events about the newly used master pages. @@ -359,7 +359,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( for (I=aNewMasterPages.begin(); I!=aNewMasterPages.end(); ++I) { OSL_TRACE(" added master page %s", - ::rtl::OUStringToOString(*I, + OUStringToOString(*I, RTL_TEXTENCODING_UTF8).getStr()); MasterPageObserverEvent aEvent ( @@ -379,7 +379,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages ( for (I=aRemovedMasterPages.begin(); I!=aRemovedMasterPages.end(); ++I) { OSL_TRACE(" removed master page %s", - ::rtl::OUStringToOString(*I, + OUStringToOString(*I, RTL_TEXTENCODING_UTF8).getStr()); MasterPageObserverEvent aEvent ( diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index 58fa05f86f49..cc806ca416be 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -743,7 +743,7 @@ void MasterPagesSelector::ClearPageSet (void) -void MasterPagesSelector::SetHelpId( const rtl::OString& aId ) +void MasterPagesSelector::SetHelpId( const OString& aId ) { const ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index c79d7cde1b86..ed1f83a768fb 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -110,7 +110,7 @@ public: void ClearPageSet (void); using SfxShell::SetHelpId; - void SetHelpId( const rtl::OString& aId ); + void SetHelpId( const OString& aId ); /** Mark the preview that belongs to the given index as not up-to-date anymore with respect to page content or preview size. diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx index c8472cecab71..e866a636aa75 100644 --- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx @@ -39,7 +39,7 @@ RecentMasterPagesSelector::RecentMasterPagesSelector ( const ::boost::shared_ptr& rpContainer) : MasterPagesSelector (pParent, rDocument, rBase, rpContainer) { - SetName (rtl::OUString("RecentMasterPagesSelector")); + SetName (OUString("RecentMasterPagesSelector")); } diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx index 257a246eefde..b471040d4b53 100644 --- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx @@ -44,7 +44,6 @@ #include using namespace ::std; -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -66,16 +65,16 @@ static const OUString& GetPathToSetNode (void) class Descriptor { public: - ::rtl::OUString msURL; - ::rtl::OUString msName; + OUString msURL; + OUString msName; ::sd::toolpanel::controls::MasterPageContainer::Token maToken; - Descriptor (const ::rtl::OUString& rsURL, const ::rtl::OUString& rsName) + Descriptor (const OUString& rsURL, const OUString& rsName) : msURL(rsURL), msName(rsName), maToken(::sd::toolpanel::controls::MasterPageContainer::NIL_TOKEN) {} Descriptor (::sd::toolpanel::controls::MasterPageContainer::Token aToken, - const ::rtl::OUString& rsURL, const ::rtl::OUString& rsName) + const OUString& rsURL, const OUString& rsName) : msURL(rsURL), msName(rsName), maToken(aToken) diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index ffe8e5c63317..1f57fed1d5ed 100644 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace tools { @@ -130,8 +129,8 @@ Any ConfigurationAccess::GetConfigurationNode ( catch (const Exception& rException) { OSL_TRACE ("caught exception while getting configuration node %s: %s", - ::rtl::OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } return Any(); @@ -180,7 +179,7 @@ void ConfigurationAccess::ForAll ( void ConfigurationAccess::FillList( const Reference& rxContainer, - const ::rtl::OUString& rsArgument, + const OUString& rsArgument, ::std::vector& rList) { try diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index a6ccc572b04c..284c452bc64f 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; class SdDrawDocument; @@ -427,7 +426,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) { try { - xSet->addPropertyChangeListener(rtl::OUString(aCurrentPagePropertyName), this); + xSet->addPropertyChangeListener(OUString(aCurrentPagePropertyName), this); } catch (const beans::UnknownPropertyException&) { @@ -436,7 +435,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) try { - xSet->addPropertyChangeListener(rtl::OUString(aEditModePropertyName), this); + xSet->addPropertyChangeListener(OUString(aEditModePropertyName), this); } catch (const beans::UnknownPropertyException&) { @@ -474,7 +473,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) { try { - xSet->removePropertyChangeListener(rtl::OUString(aCurrentPagePropertyName), this); + xSet->removePropertyChangeListener(OUString(aCurrentPagePropertyName), this); } catch (const beans::UnknownPropertyException&) { @@ -483,7 +482,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) try { - xSet->removePropertyChangeListener(rtl::OUString(aEditModePropertyName), this); + xSet->removePropertyChangeListener(OUString(aEditModePropertyName), this); } catch (const beans::UnknownPropertyException&) { diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 35212dfafb8e..defe3f2b5939 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { namespace tools { @@ -60,7 +59,7 @@ Reference SAL_CALL PropertySet::getPropertySetInfo (voi void SAL_CALL PropertySet::setPropertyValue ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rsPropertyValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -104,7 +103,7 @@ Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName) void SAL_CALL PropertySet::addPropertyChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -126,7 +125,7 @@ void SAL_CALL PropertySet::addPropertyChangeListener ( void SAL_CALL PropertySet::removePropertyChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -157,7 +156,7 @@ void SAL_CALL PropertySet::removePropertyChangeListener ( void SAL_CALL PropertySet::addVetoableChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -173,7 +172,7 @@ void SAL_CALL PropertySet::addVetoableChangeListener ( void SAL_CALL PropertySet::removeVetoableChangeListener ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, @@ -191,7 +190,7 @@ void SAL_CALL PropertySet::removeVetoableChangeListener ( //----------------------------------------------------------------------------- void PropertySet::CallListeners ( - const rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const beans::PropertyChangeEvent& rEvent) { ::std::pair diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 52bf38fbc890..00833dd2c270 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -37,7 +37,7 @@ namespace sd { namespace tools { SlotStateListener::SlotStateListener ( Link& rCallback, const uno::Reference& rxDispatchProvider, - const ::rtl::OUString& rSlotName) + const OUString& rSlotName) : SlotStateListenerInterfaceBase(maMutex), maCallback(), mxDispatchProviderWeak(NULL) @@ -84,7 +84,7 @@ void SlotStateListener::ConnectToDispatchProvider ( -void SlotStateListener::ObserveSlot (const ::rtl::OUString& rSlotName) +void SlotStateListener::ObserveSlot (const OUString& rSlotName) { ThrowIfDisposed(); diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 22084783bf54..e45f4f1d0119 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -49,7 +49,6 @@ #include using namespace ::std; -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -516,7 +515,7 @@ void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw() { OSL_FAIL( OString("sd::SdUnoDrawView::FireSwitchCurrentPage(), exception caught: " + - ::rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index b0cfd043a1f5..ec0a54c17b7c 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -44,7 +44,6 @@ #include -using rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index e887e8952798..282b080be86b 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -32,7 +32,6 @@ #include #include -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index 6e554e9f7583..f1eb8e4688ad 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -33,7 +33,6 @@ #include "sdpage.hxx" #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 2711af2e34fe..22777ed698db 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -53,7 +53,6 @@ using namespace ::comphelper; using namespace ::osl; -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -83,19 +82,19 @@ namespace sd // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); @@ -115,7 +114,7 @@ namespace sd virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ); private: - bool LoadList( XPropertyListType t, const rtl::OUString &rPath, + bool LoadList( XPropertyListType t, const OUString &rPath, const uno::Reference< embed::XStorage > &xStorage ); void AssignURL( XPropertyListType t, const Any* pValue, bool *pOk, bool *pChanged ); void ExtractURL( XPropertyListType t, Any* pValue ); @@ -226,13 +225,13 @@ DocumentSettings::~DocumentSettings() throw() { } -bool DocumentSettings::LoadList( XPropertyListType t, const rtl::OUString &rInPath, +bool DocumentSettings::LoadList( XPropertyListType t, const OUString &rInPath, const uno::Reference< embed::XStorage > &xStorage ) { SdDrawDocument* pDoc = mpModel->GetDoc(); sal_Int32 nSlash = rInPath.lastIndexOf('/'); - rtl::OUString aPath, aName; + OUString aPath, aName; if (nSlash < -1) aName = rInPath; else { @@ -276,7 +275,7 @@ static struct { { "BitmapTableURL", XBITMAP_LIST } }; -static XPropertyListType getTypeOfName( const rtl::OUString &aName ) +static XPropertyListType getTypeOfName( const OUString &aName ) { for( size_t i = 0; i < SAL_N_ELEMENTS( aURLPropertyNames ); i++ ) { if( aName.equalsAscii( aURLPropertyNames[i].pName ) ) @@ -285,15 +284,15 @@ static XPropertyListType getTypeOfName( const rtl::OUString &aName ) return (XPropertyListType) -1; } -static rtl::OUString getNameOfType( XPropertyListType t ) +static OUString getNameOfType( XPropertyListType t ) { for( size_t i = 0; i < SAL_N_ELEMENTS( aURLPropertyNames ); i++ ) { if( t == aURLPropertyNames[i].t ) - return rtl::OUString( aURLPropertyNames[i].pName, + return OUString( aURLPropertyNames[i].pName, strlen( aURLPropertyNames[i].pName ) - 3, RTL_TEXTENCODING_UTF8 ); } - return rtl::OUString(); + return OUString(); } uno::Sequence @@ -310,7 +309,7 @@ uno::Sequence aRet[nRet++] = aConfigProps[i]; else { - rtl::OUString aURL; + OUString aURL; aConfigProps[i].Value >>= aURL; LoadList( t, aURL, xStorage ); } @@ -357,14 +356,14 @@ uno::Sequence else { // Such specific path construction is grim. - rtl::OUString aValue; + OUString aValue; aRet[i].Value >>= aValue; - rtl::OUStringBuffer aName( getNameOfType( t ) ); - rtl::OUString aResult; + OUStringBuffer aName( getNameOfType( t ) ); + OUString aResult; if( pList->SaveTo( xSubStorage, aName.makeStringAndClear(), &aResult ) ) { - rtl::OUString aRealPath( "Settings/" ); + OUString aRealPath( "Settings/" ); aRealPath += aResult; aRet[i].Value <<= aRealPath; } @@ -382,7 +381,7 @@ uno::Sequence } catch (const uno::Exception &e) { (void)e; // fprintf (stderr, "saving etc. exception '%s'\n", -// rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); +// OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); } return aRet; diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 5f926805f20b..d3cdfc9b287b 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star; -using ::rtl::OUString; // Forward declarations of the factories. @@ -242,7 +241,7 @@ enum FactoryId SlideLayoutControllerFactoryId, InsertSlideControllerFactoryId, }; -typedef ::boost::unordered_map FactoryMap; +typedef ::boost::unordered_map FactoryMap; namespace { diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 1844827b1f17..ee3c74b15e4d 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -35,7 +35,6 @@ using ::osl::Mutex; using ::osl::Guard; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx index 2c58ef0b801f..adefbdb9b820 100644 --- a/sd/source/ui/unoidl/sddetect.hxx +++ b/sd/source/ui/unoidl/sddetect.hxx @@ -61,7 +61,7 @@ public: //---------------------------------------------------------------------------------- // XExtendedFilterDetect //---------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); }; #endif diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 4f29b0c58cd6..84f102f8a2c3 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -65,9 +65,9 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdXCustomPresentation) // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -85,8 +85,8 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -114,32 +114,32 @@ private: // intern inline SdCustomShowList* GetCustomShowList() const throw(); - SdCustomShow * getSdCustomShow( const ::rtl::OUString& Name ) const throw(); + SdCustomShow * getSdCustomShow( const OUString& Name ) const throw(); public: SdXCustomPresentationAccess(SdXImpressDocument& rMyModel) throw(); ~SdXCustomPresentationAccess() throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XSingleServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index f5a7614d9c25..c33dd80697da 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -32,14 +32,14 @@ using namespace ::com::sun::star; // com.sun.star.comp.Draw.DrawingDocument -::rtl::OUString SAL_CALL SdDrawingDocument_getImplementationName() throw( uno::RuntimeException ) +OUString SAL_CALL SdDrawingDocument_getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" ); + return OUString( "com.sun.star.comp.Draw.DrawingDocument" ); } -uno::Sequence< rtl::OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSeq( 2 ); + uno::Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.drawing.DrawingDocument"; aSeq[1] = "com.sun.star.drawing.DrawingDocumentFactory"; @@ -61,14 +61,14 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( // com.sun.star.comp.Draw.PresentationDocument -::rtl::OUString SAL_CALL SdPresentationDocument_getImplementationName() throw( uno::RuntimeException ) +OUString SAL_CALL SdPresentationDocument_getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" ); + return OUString( "com.sun.star.comp.Draw.PresentationDocument" ); } -uno::Sequence< rtl::OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSeq( 2 ); + uno::Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.drawing.DrawingDocumentFactory"; aSeq[1] = "com.sun.star.presentation.PresentationDocument"; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 16d37b1253a2..15dfadcde042 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -531,7 +531,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) ) { aLayerName = String(SdResId(STR_LAYER)); - aLayerName += rtl::OUString::valueOf(nLayer); + aLayerName += OUString::valueOf(nLayer); ++nLayer; } diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 4f003e6b2b0c..220880255c2e 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -54,25 +54,25 @@ public: // intern SdrLayer* GetSdrLayer() const throw() { return pLayer; } - static String convertToInternalName( const ::rtl::OUString& rName ); - static ::rtl::OUString convertToExternalName( const String& rName ); + static String convertToInternalName( const OUString& rName ); + static OUString convertToExternalName( const String& rName ); // uno helper UNO3_GETIMPLEMENTATION_DECL( SdLayer ) // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XChild @@ -125,9 +125,9 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdLayerManager ) // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XLayerManager virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); @@ -140,9 +140,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 32249c19df99..6ff443fc69d9 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -100,7 +100,6 @@ #include #include -using ::rtl::OUString; #include @@ -188,7 +187,7 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() // Attention: the first parameter HAS TO BE sorted!!! const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] = { - { MAP_CHAR_LEN("BuildId"), WID_MODEL_BUILDID, &::getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0}, + { MAP_CHAR_LEN("BuildId"), WID_MODEL_BUILDID, &::getCppuType(static_cast< const OUString * >(0)), 0, 0}, { MAP_CHAR_LEN(sUNO_Prop_CharLocale), WID_MODEL_LANGUAGE, &::getCppuType((const lang::Locale*)0), 0, 0}, { MAP_CHAR_LEN(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(sUNO_Prop_VisibleArea), WID_MODEL_VISAREA, &::getCppuType((const awt::Rectangle*)0), 0, 0}, @@ -198,7 +197,7 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() { MAP_CHAR_LEN(sUNO_Prop_ApplyFrmDsgnMode), WID_MODEL_DSGNMODE, &::getBooleanCppuType(), 0, 0}, { MAP_CHAR_LEN("BasicLibraries"), WID_MODEL_BASICLIBS,&::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN("DialogLibraries"), WID_MODEL_DIALOGLIBS, &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN(sUNO_Prop_RuntimeUID), WID_MODEL_RUNTIMEUID, &::getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0 }, + { MAP_CHAR_LEN(sUNO_Prop_RuntimeUID), WID_MODEL_RUNTIMEUID, &::getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN(sUNO_Prop_HasValidSignatures), WID_MODEL_HASVALIDSIGNATURES, &::getCppuType(static_cast< const sal_Bool * >(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN("Fonts"), WID_MODEL_FONTS, SEQTYPE(::getCppuType((uno::Sequence*)0)), beans::PropertyAttribute::READONLY, 0}, { 0,0,0,0,0,0 } @@ -1544,7 +1543,7 @@ sal_Int32 ImplPDFGetBookmarkPage( const String& rBookmark, SdDrawDocument& rDoc sal_Int32 nPage = -1; OSL_TRACE("GotoBookmark %s", - ::rtl::OUStringToOString(rBookmark, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(rBookmark, RTL_TEXTENCODING_UTF8).getStr()); String aBookmark( rBookmark ); @@ -1605,9 +1604,9 @@ void ImplPDFExportComments( uno::Reference< drawing::XDrawPage > xPage, vcl::PDF void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, SdDrawDocument& rDoc, vcl::PDFExtOutDevData& rPDFExtOutDevData ) { - const rtl::OUString sGroup ( "com.sun.star.drawing.GroupShape"); - const rtl::OUString sOnClick ( "OnClick" ); - const rtl::OUString sBookmark( "Bookmark" ); + const OUString sGroup ( "com.sun.star.drawing.GroupShape"); + const OUString sOnClick ( "OnClick" ); + const OUString sBookmark( "Bookmark" ); if ( xShape->getShapeType().equals( sGroup ) ) { @@ -1683,7 +1682,7 @@ void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, Sd case presentation::ClickAction_BOOKMARK : case presentation::ClickAction_DOCUMENT : { - rtl::OUString aBookmark; + OUString aBookmark; xShapePropSet->getPropertyValue( sBookmark ) >>= aBookmark; if( !aBookmark.isEmpty() ) { @@ -1989,8 +1988,8 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // exporting transition effects to pdf if ( mbImpressDoc && !pPDFExtOutDevData->GetIsExportNotesPages() && pPDFExtOutDevData->GetIsExportTransitionEffects() ) { - const rtl::OUString sEffect( "Effect" ); - const rtl::OUString sSpeed ( "Speed" ); + const OUString sEffect( "Effect" ); + const OUString sSpeed ( "Speed" ); sal_Int32 nTime = 800; presentation::AnimationSpeed aAs; if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sSpeed ) ) @@ -3036,7 +3035,7 @@ rtl::Reference< SdXImpressDocument > SdXImpressDocument::GetModel( SdDrawDocumen return xRet; } -void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEventName ) +void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName ) { rtl::Reference< SdXImpressDocument > xModel( SdXImpressDocument::GetModel( pDocument ) ); @@ -3048,7 +3047,7 @@ void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEvent } } -void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEventName, const uno::Reference< uno::XInterface >& xSource ) +void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, const uno::Reference< uno::XInterface >& xSource ) { rtl::Reference< SdXImpressDocument > xModel( SdXImpressDocument::GetModel( pDocument ) ); diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx index 19bf68f23a68..04522e56dca6 100644 --- a/sd/source/ui/unoidl/unomodule.hxx +++ b/sd/source/ui/unoidl/unomodule.hxx @@ -68,12 +68,12 @@ public: // XDispatchProvider virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException ) ; virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , - const ::rtl::OUString & sTargetFrameName, + const OUString & sTargetFrameName, sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException ) ; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); }; #endif diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 73946fc36f37..1b9590be9a1b 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -79,8 +79,6 @@ #endif #endif -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::sd; using namespace ::com::sun::star; using namespace ::com::sun::star::presentation; @@ -92,7 +90,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::drawing::XShape; extern OUString getPageApiNameFromUiName( const String& rUIName ); -extern String getUiNameFromPageApiNameImpl( const ::rtl::OUString& rApiName ); +extern String getUiNameFromPageApiNameImpl( const OUString& rApiName ); /////////////////////////////////////////////////////////////////////// @@ -478,7 +476,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) return pInfo; } -void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) +void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -695,7 +693,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, mpModel->SetModified(); } -::com::sun::star::uno::Any SAL_CALL SdXShape::getPropertyValue( const ::rtl::OUString& PropertyName ) +::com::sun::star::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -864,7 +862,7 @@ SdAnimationInfo* SdXShape::GetAnimationInfo( sal_Bool bCreate ) const throw() return pInfo; } -uno::Sequence< ::rtl::OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) { uno::Sequence< OUString > aSeq( mpShape->_getSupportedServiceNames() ); @@ -1122,21 +1120,21 @@ public: SdUnoEventsAccess( SdXShape* pShape ) throw(); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; // XEventsSupplier diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 37962db8c2e9..46e927fb9a41 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -62,7 +62,7 @@ private: void SetMasterDepend( sal_Bool bDepend ) throw(); SdrObject* GetSdrObject() const throw(); - ::rtl::OUString GetPlaceholderText() const; + OUString GetPlaceholderText() const; com::sun::star::uno::Sequence< sal_Int8 >* mpImplementationId; @@ -83,17 +83,17 @@ public: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index a5c237b05cf0..94aac3c8795d 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -71,8 +71,6 @@ using ::com::sun::star::animations::XAnimationNode; using ::com::sun::star::animations::XAnimationNodeSupplier; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::osl; using namespace ::com::sun::star; @@ -1526,7 +1524,7 @@ OUString SdGenericDrawPage::getBookmarkURL() const } //---------------------------------------------------------------------- -void SdGenericDrawPage::setBookmarkURL( rtl::OUString& rURL ) +void SdGenericDrawPage::setBookmarkURL( OUString& rURL ) { if( SvxFmDrawPage::mpPage ) { diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index e7f37e00c99c..a2b3a489c7f8 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -70,8 +70,8 @@ protected: virtual void setBackground( const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); virtual void getBackground( ::com::sun::star::uno::Any& rValue ) throw(); - rtl::OUString getBookmarkURL() const; - void setBookmarkURL( rtl::OUString& rURL ); + OUString getBookmarkURL() const; + void setBookmarkURL( OUString& rURL ); void SetLftBorder( sal_Int32 nValue ); void SetRgtBorder( sal_Int32 nValue ); @@ -123,25 +123,25 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // XLinkTargetSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XAnimationNodeSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > SAL_CALL getAnimationNode( ) throw (::com::sun::star::uno::RuntimeException); @@ -172,9 +172,9 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdDrawPage ) - static ::rtl::OUString getPageApiName( SdPage* pPage ); - static ::rtl::OUString getPageApiNameFromUiName( const String& rUIName ); - static String getUiNameFromPageApiName( const ::rtl::OUString& rApiName ); + static OUString getPageApiName( SdPage* pPage ); + static OUString getPageApiNameFromUiName( const String& rUIName ); + static String getUiNameFromPageApiName( const OUString& rApiName ); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -186,9 +186,9 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XMasterPageTarget virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getMasterPage( ) throw(::com::sun::star::uno::RuntimeException); @@ -198,8 +198,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; @@ -243,9 +243,9 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; @@ -259,8 +259,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XShapes virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); @@ -288,14 +288,14 @@ public: SdrObject* FindObject( const String& rName ) const throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 9fdc6283c2d3..5ee16950eeb7 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -129,7 +129,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) { setPropertyValue( aPropertyName, *pAny ); } - else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && + else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) && ( aIt->nMemberId == MID_NAME ) ) { setPropertyValue( aPropertyName, *pAny ); @@ -143,7 +143,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) { setPropertyValue( aPropertyName, *pAny ); } - else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && + else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) && ( aIt->nMemberId == MID_NAME ) ) { setPropertyValue( aPropertyName, *pAny ); @@ -158,7 +158,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) { setPropertyValue( aPropertyName, *pAny ); } - else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && + else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) && ( ( aIt->nMemberId == MID_NAME ) || ( aIt->nMemberId == MID_GRAFURL ) ) ) { setPropertyValue( aPropertyName, *pAny ); diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index e60d1c7c5964..851e8a3f59fd 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -47,7 +47,7 @@ protected: SfxItemSet* mpSet; SdrModel* mpDoc; - const SfxItemPropertySimpleEntry* getPropertyMapEntry( const ::rtl::OUString& rPropertyName ) const throw(); + const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName ) const throw(); public: SdUnoPageBackground( SdDrawDocument* pDoc = NULL, const SfxItemSet* pSet = NULL) throw(); ~SdUnoPageBackground() throw(); @@ -60,24 +60,24 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoPageBackground ) // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; #endif diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 83fe43a9ccf5..1ce91e46e96a 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -742,7 +742,7 @@ OUString SAL_CALL SdUnoSearchReplaceDescriptor::getReplaceString() return maReplaceStr; } -void SAL_CALL SdUnoSearchReplaceDescriptor::setReplaceString( const ::rtl::OUString& aReplaceString ) +void SAL_CALL SdUnoSearchReplaceDescriptor::setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException) { maReplaceStr = aReplaceString; @@ -756,7 +756,7 @@ uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL SdUnoSearch return mpPropSet->getPropertySetInfo(); } -void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) +void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -784,7 +784,7 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const ::rtl::OUStr throw lang::IllegalArgumentException(); } -uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const ::rtl::OUString& PropertyName ) +uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -811,10 +811,10 @@ uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const ::rtl::O return aAny; } -void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const ::rtl::OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const ::rtl::OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const ::rtl::OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const ::rtl::OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} /* ================================================================= */ diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index b250e8a71eaf..a6533b1898d2 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sd { @@ -195,7 +194,7 @@ namespace { OUString GetPrinterSelection (sal_Int32 nPageCount, sal_Int32 nCurrentPageIndex) const { sal_Int32 nContent = static_cast(mrProperties.getIntValue( "PrintContent", 0 )); - OUString sFullRange = ::rtl::OUStringBuffer() + OUString sFullRange = OUStringBuffer() .append(static_cast(1)) .append(static_cast('-')) .append(nPageCount).makeStringAndClear(); @@ -291,8 +290,8 @@ namespace { const Printer* mpPrinter; sal_uLong mnDrawMode; - ::rtl::OUString msTimeDate; - ::rtl::OUString msPageString; + OUString msTimeDate; + OUString msPageString; Size maPrintSize; Size maPageSize; Orientation meOrientation; @@ -343,7 +342,7 @@ namespace { */ void PrintMessage ( Printer& rPrinter, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset) { const Font aOriginalFont (rPrinter.OutputDevice::GetFont()); @@ -397,11 +396,11 @@ namespace { { // load the writer PrinterOptions into the custom tab beans::PropertyValue aOptionsUIFile; - aOptionsUIFile.Name = rtl::OUString("OptionsUIFile"); + aOptionsUIFile.Name = OUString("OptionsUIFile"); if( mbImpress ) - aOptionsUIFile.Value <<= rtl::OUString("modules/simpress/ui/printeroptions.ui"); + aOptionsUIFile.Value <<= OUString("modules/simpress/ui/printeroptions.ui"); else - aOptionsUIFile.Value <<= rtl::OUString("modules/sdraw/ui/printeroptions.ui"); + aOptionsUIFile.Value <<= OUString("modules/sdraw/ui/printeroptions.ui"); maProperties.push_back(aOptionsUIFile); SvtModuleOptions aOpt; @@ -410,7 +409,7 @@ namespace { aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) ); AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage")); - uno::Sequence< rtl::OUString > aHelpIds, aWidgetIds; + uno::Sequence< OUString > aHelpIds, aWidgetIds; if( mbImpress ) { vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt; @@ -623,7 +622,7 @@ namespace { ); // create a choice for the content to create - rtl::OUString aPrintRangeName( "PrintContent" ); + OUString aPrintRangeName( "PrintContent" ); aHelpIds.realloc( 3 ); aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ; aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ; @@ -656,22 +655,22 @@ namespace { maProperties.push_back( aVal ); } - Sequence CreateChoice (const sal_uInt16 nResourceId) const + Sequence CreateChoice (const sal_uInt16 nResourceId) const { SdResId aResourceId (nResourceId); ResStringArray aChoiceStrings (aResourceId); const sal_uInt32 nCount (aChoiceStrings.Count()); - Sequence aChoices (nCount); + Sequence aChoices (nCount); for (sal_uInt32 nIndex=0; nIndex GetSlidesPerPageSequence() + Sequence GetSlidesPerPageSequence() { - const Sequence aChoice ( + const Sequence aChoice ( CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES)); maSlidesPerPage.clear(); maSlidesPerPage.push_back(0); // first is using the default @@ -702,7 +701,7 @@ namespace { const PageKind ePageKind, const MapMode& rMapMode, const bool bPrintMarkedOnly, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset, const sal_uLong nDrawMode, const Orientation eOrientation, @@ -737,7 +736,7 @@ namespace { const PageKind mePageKind; const MapMode maMap; const bool mbPrintMarkedOnly; - const ::rtl::OUString msPageString; + const OUString msPageString; const Point maPageStringOffset; const sal_uLong mnDrawMode; const Orientation meOrientation; @@ -758,7 +757,7 @@ namespace { const PageKind ePageKind, const MapMode& rMapMode, const bool bPrintMarkedOnly, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset, const sal_uLong nDrawMode, const Orientation eOrientation, @@ -815,7 +814,7 @@ namespace { const PageKind ePageKind, const sal_Int32 nGap, const bool bPrintMarkedOnly, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset, const sal_uLong nDrawMode, const Orientation eOrientation, @@ -975,7 +974,7 @@ namespace { const sal_uInt16 nHandoutPageIndex, const ::std::vector& rPageIndices, const MapMode& rMapMode, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset, const sal_uLong nDrawMode, const Orientation eOrientation, @@ -999,7 +998,7 @@ namespace { SdPage& rHandoutPage (*rDocument.GetSdPage(0, PK_HANDOUT)); Reference< com::sun::star::beans::XPropertySet > xHandoutPage( rHandoutPage.getUnoPage(), UNO_QUERY ); - const rtl::OUString sPageNumber( "Number" ); + const OUString sPageNumber( "Number" ); // Collect the page objects of the handout master. std::vector aHandoutPageObjects; @@ -1120,7 +1119,7 @@ namespace { OutlinerPrinterPage ( OutlinerParaObject* pParaObject, const MapMode& rMapMode, - const ::rtl::OUString& rsPageString, + const OUString& rsPageString, const Point& rPageStringOffset, const sal_uLong nDrawMode, const Orientation eOrientation, @@ -1499,7 +1498,7 @@ private: if (mpOptions->IsDate()) { aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getDate( Date( Date::SYSTEM ) ); - aInfo.msTimeDate += ::rtl::OUString((sal_Unicode)' '); + aInfo.msTimeDate += OUString((sal_Unicode)' '); } if (mpOptions->IsTime()) @@ -2006,7 +2005,7 @@ private: if (mpOptions->IsPrintPageName()) { rInfo.msPageString = pPage->GetName(); - rInfo.msPageString += rtl::OUString(sal_Unicode(' ')); + rInfo.msPageString += OUString(sal_Unicode(' ')); } else rInfo.msPageString = ""; diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 466c09b49608..aed500bef3c6 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -84,7 +84,7 @@ GraphicObjectBar::GraphicObjectBar ( SetUndoManager( pDocShell->GetUndoManager() ); SetRepeatTarget( mpView ); SetHelpId( SD_IF_SDDRAWGRAFOBJECTBAR ); - SetName( rtl::OUString( "Graphic objectbar" )); + SetName( OUString( "Graphic objectbar" )); } // ----------------------------------------------------------------------------- diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 508a1b63f3a8..ccead8452eb9 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -68,7 +68,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -1263,7 +1262,7 @@ void Outliner::SetViewMode (PageKind ePageKind) pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, sal_False); SetStatusEventHdl(Link()); - ::rtl::OUString sViewURL; + OUString sViewURL; switch (ePageKind) { case PK_STANDARD: diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index cc0e64655040..bb427ce30c74 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -67,7 +67,7 @@ private: }; -typedef ::std::vector NameList; +typedef ::std::vector NameList; /** Store a list of tool bars for each of the tool bar groups. From this the list of requested tool bars is built. @@ -78,14 +78,14 @@ public: ToolBarList (void); void ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup); - void AddToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const ::rtl::OUString& rsName); - bool RemoveToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const ::rtl::OUString& rsName); + void AddToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName); + bool RemoveToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName); void GetToolBarsToActivate (NameList& rToolBars) const; void GetToolBarsToDeactivate (NameList& rToolBars) const; - void MarkToolBarAsActive (const ::rtl::OUString& rsName); - void MarkToolBarAsNotActive (const ::rtl::OUString& rsName); + void MarkToolBarAsActive (const OUString& rsName); + void MarkToolBarAsNotActive (const OUString& rsName); void MarkAllToolBarsAsNotActive (void); private: @@ -263,9 +263,9 @@ public: void ResetToolBars (ToolBarGroup eGroup); void ResetAllToolBars (void); - void AddToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName); + void AddToolBar (ToolBarGroup eGroup, const OUString& rsToolBarName); void AddToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId); - void RemoveToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName); + void RemoveToolBar (ToolBarGroup eGroup, const OUString& rsToolBarName); /** Release all tool bar shells and the associated framework tool bars. Typically called when the main view shell is being replaced by @@ -309,7 +309,7 @@ public: ToolBarRules& GetToolBarRules (void); private: - const static ::rtl::OUString msToolBarResourcePrefix; + const static OUString msToolBarResourcePrefix; mutable ::osl::Mutex maMutex; ViewShellBase& mrBase; @@ -335,8 +335,8 @@ private: sal_uLong mnPendingSetValidCall; ToolBarRules maToolBarRules; - ::rtl::OUString GetToolBarResourceName (const ::rtl::OUString& rsBaseName) const; - bool CheckPlugInMode (const ::rtl::OUString& rsName) const; + OUString GetToolBarResourceName (const OUString& rsBaseName) const; + bool CheckPlugInMode (const OUString& rsName) const; DECL_LINK(UpdateCallback, void *); DECL_LINK(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent*); @@ -347,21 +347,21 @@ private: //===== ToolBarManager ======================================================== -const ::rtl::OUString ToolBarManager::msToolBar("toolbar"); -const ::rtl::OUString ToolBarManager::msOptionsToolBar("optionsbar"); -const ::rtl::OUString ToolBarManager::msCommonTaskToolBar("commontaskbar"); -const ::rtl::OUString ToolBarManager::msViewerToolBar("viewerbar"); -const ::rtl::OUString ToolBarManager::msSlideSorterToolBar("slideviewtoolbar"); -const ::rtl::OUString ToolBarManager::msSlideSorterObjectBar("slideviewobjectbar"); -const ::rtl::OUString ToolBarManager::msOutlineToolBar("outlinetoolbar"); -const ::rtl::OUString ToolBarManager::msMasterViewToolBar("masterviewtoolbar"); -const ::rtl::OUString ToolBarManager::msDrawingObjectToolBar("drawingobjectbar"); -const ::rtl::OUString ToolBarManager::msGluePointsToolBar("gluepointsobjectbar"); -const ::rtl::OUString ToolBarManager::msTextObjectBar("textobjectbar"); -const ::rtl::OUString ToolBarManager::msBezierObjectBar("bezierobjectbar"); -const ::rtl::OUString ToolBarManager::msGraphicObjectBar("graphicobjectbar"); -const ::rtl::OUString ToolBarManager::msMediaObjectBar("mediaobjectbar"); -const ::rtl::OUString ToolBarManager::msTableObjectBar("tableobjectbar"); +const OUString ToolBarManager::msToolBar("toolbar"); +const OUString ToolBarManager::msOptionsToolBar("optionsbar"); +const OUString ToolBarManager::msCommonTaskToolBar("commontaskbar"); +const OUString ToolBarManager::msViewerToolBar("viewerbar"); +const OUString ToolBarManager::msSlideSorterToolBar("slideviewtoolbar"); +const OUString ToolBarManager::msSlideSorterObjectBar("slideviewobjectbar"); +const OUString ToolBarManager::msOutlineToolBar("outlinetoolbar"); +const OUString ToolBarManager::msMasterViewToolBar("masterviewtoolbar"); +const OUString ToolBarManager::msDrawingObjectToolBar("drawingobjectbar"); +const OUString ToolBarManager::msGluePointsToolBar("gluepointsobjectbar"); +const OUString ToolBarManager::msTextObjectBar("textobjectbar"); +const OUString ToolBarManager::msBezierObjectBar("bezierobjectbar"); +const OUString ToolBarManager::msGraphicObjectBar("graphicobjectbar"); +const OUString ToolBarManager::msMediaObjectBar("mediaobjectbar"); +const OUString ToolBarManager::msTableObjectBar("tableobjectbar"); ::boost::shared_ptr ToolBarManager::Create ( @@ -428,7 +428,7 @@ void ToolBarManager::ResetAllToolBars (void) void ToolBarManager::AddToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName) + const OUString& rsToolBarName) { if (mpImpl.get() != NULL) { @@ -456,7 +456,7 @@ void ToolBarManager::AddToolBarShell ( void ToolBarManager::RemoveToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName) + const OUString& rsToolBarName) { if (mpImpl.get() != NULL) { @@ -470,7 +470,7 @@ void ToolBarManager::RemoveToolBar ( void ToolBarManager::SetToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName) + const OUString& rsToolBarName) { if (mpImpl.get() != NULL) { @@ -585,7 +585,7 @@ void ToolBarManager::ToolBarsDestroyed(void) //===== ToolBarManager::Implementation ======================================= -const ::rtl::OUString ToolBarManager::Implementation::msToolBarResourcePrefix("private:resource/toolbar/"); +const OUString ToolBarManager::Implementation::msToolBarResourcePrefix("private:resource/toolbar/"); ToolBarManager::Implementation::Implementation ( ViewShellBase& rBase, @@ -705,7 +705,7 @@ void ToolBarManager::Implementation::ResetAllToolBars (void) void ToolBarManager::Implementation::AddToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName) + const OUString& rsToolBarName) { ::osl::MutexGuard aGuard(maMutex); @@ -724,7 +724,7 @@ void ToolBarManager::Implementation::AddToolBar ( void ToolBarManager::Implementation::RemoveToolBar ( ToolBarGroup eGroup, - const ::rtl::OUString& rsToolBarName) + const OUString& rsToolBarName) { ::osl::MutexGuard aGuard(maMutex); @@ -796,9 +796,9 @@ void ToolBarManager::Implementation::PreUpdate (void) NameList::const_iterator iToolBar; for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar) { - ::rtl::OUString sFullName (GetToolBarResourceName(*iToolBar)); + OUString sFullName (GetToolBarResourceName(*iToolBar)); SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning off tool bar " << - ::rtl::OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr()); mxLayouter->destroyElement(sFullName); maToolBarList.MarkToolBarAsNotActive(*iToolBar); } @@ -830,9 +830,9 @@ void ToolBarManager::Implementation::PostUpdate (void) NameList::const_iterator iToolBar; for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar) { - ::rtl::OUString sFullName (GetToolBarResourceName(*iToolBar)); + OUString sFullName (GetToolBarResourceName(*iToolBar)); SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning on tool bar " << - ::rtl::OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr()); mxLayouter->requestElement(sFullName); maToolBarList.MarkToolBarAsActive(*iToolBar); } @@ -1029,10 +1029,10 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback) -::rtl::OUString ToolBarManager::Implementation::GetToolBarResourceName ( - const ::rtl::OUString& rsBaseName) const +OUString ToolBarManager::Implementation::GetToolBarResourceName ( + const OUString& rsBaseName) const { - ::rtl::OUString sToolBarName (msToolBarResourcePrefix); + OUString sToolBarName (msToolBarResourcePrefix); sToolBarName += rsBaseName; return sToolBarName; } @@ -1040,7 +1040,7 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback) -bool ToolBarManager::Implementation::CheckPlugInMode (const ::rtl::OUString& rsName) const +bool ToolBarManager::Implementation::CheckPlugInMode (const OUString& rsName) const { bool bValid (false); @@ -1400,7 +1400,7 @@ void ToolBarList::ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup) void ToolBarList::AddToolBar ( sd::ToolBarManager::ToolBarGroup eGroup, - const ::rtl::OUString& rsName) + const OUString& rsName) { Groups::iterator iGroup (maGroups.find(eGroup)); if (iGroup == maGroups.end()) @@ -1422,7 +1422,7 @@ void ToolBarList::AddToolBar ( bool ToolBarList::RemoveToolBar ( sd::ToolBarManager::ToolBarGroup eGroup, - const ::rtl::OUString& rsName) + const OUString& rsName) { Groups::iterator iGroup (maGroups.find(eGroup)); if (iGroup != maGroups.end()) @@ -1496,7 +1496,7 @@ void ToolBarList::GetToolBarsToDeactivate (NameList& rToolBars) const -void ToolBarList::MarkToolBarAsActive (const ::rtl::OUString& rsName) +void ToolBarList::MarkToolBarAsActive (const OUString& rsName) { maActiveToolBars.push_back(rsName); } @@ -1504,7 +1504,7 @@ void ToolBarList::MarkToolBarAsActive (const ::rtl::OUString& rsName) -void ToolBarList::MarkToolBarAsNotActive (const ::rtl::OUString& rsName) +void ToolBarList::MarkToolBarAsNotActive (const OUString& rsName) { maActiveToolBars.erase( ::std::find(maActiveToolBars.begin(),maActiveToolBars.end(), rsName)); diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index 1f3597a3267a..867fa2a8bc68 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -74,7 +74,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) { do { - const std::vector &rBookmarks = rTransferable.GetPageBookmarks(); + const std::vector &rBookmarks = rTransferable.GetPageBookmarks(); if (rBookmarks.empty()) break; @@ -87,7 +87,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) if (pDocument == NULL) break; - std::vector::const_iterator pIter; + std::vector::const_iterator pIter; for ( pIter = rBookmarks.begin(); pIter != rBookmarks.end(); ++pIter ) { String sName (*pIter); @@ -207,7 +207,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( sal_Bool bMergeMasterPages = !rTransferable.HasSourceDoc( &rDoc ); // Prepare the insertion. - const std::vector *pBookmarkList = NULL; + const std::vector *pBookmarkList = NULL; DrawDocShell* pDataDocSh; if (rTransferable.HasPageBookmarks()) { @@ -238,7 +238,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( pWin->LeaveWait(); rDoc.InsertBookmarkAsPage( - pBookmarkList ? *pBookmarkList : std::vector(), + pBookmarkList ? *pBookmarkList : std::vector(), NULL, sal_False, sal_False, diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 0cd5c67b7902..37c39bec67e1 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -87,7 +87,6 @@ using namespace sd; #include "sdslots.hxx" using ::sd::framework::FrameworkHelper; -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::frame; using namespace com::sun::star::container; @@ -177,8 +176,8 @@ public: */ void SetPaneVisibility ( const SfxRequest& rRequest, - const ::rtl::OUString& rsPaneURL, - const ::rtl::OUString& rsViewURL); + const OUString& rsPaneURL, + const OUString& rsViewURL); void GetSlotState (SfxItemSet& rSet); @@ -301,7 +300,7 @@ ViewShellBase::~ViewShellBase (void) -void ViewShellBase::LateInit (const ::rtl::OUString& rsDefaultView) +void ViewShellBase::LateInit (const OUString& rsDefaultView) { StartListening(*GetViewFrame(),sal_True); StartListening(*GetDocShell(),sal_True); @@ -781,7 +780,7 @@ void ViewShellBase::ReadUserDataSequence ( case ViewShell::ST_NOTES: case ViewShell::ST_HANDOUT: { - ::rtl::OUString sViewURL; + OUString sViewURL; switch (PTR_CAST(DrawViewShell, pShell)->GetPageKind()) { default: @@ -1116,9 +1115,9 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference& rViewTabB } -::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const ::rtl::OUString& aCmdURL ) +OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ) { - ::rtl::OUString aLabel; + OUString aLabel; if ( !aCmdURL.isEmpty() ) try { @@ -1128,7 +1127,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference& rViewTabB Reference< XModuleManager2 > xModuleManager( ModuleManager::create(xContext) ); Reference< XInterface > xIfac( xFrame, UNO_QUERY_THROW ); - ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) ); + OUString aModuleIdentifier( xModuleManager->identify( xIfac ) ); if( !aModuleIdentifier.isEmpty() ) { @@ -1156,7 +1155,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference& rViewTabB return aLabel; } -::rtl::OUString ViewShellBase::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const +OUString ViewShellBase::RetrieveLabelFromCommand( const OUString& aCmdURL ) const { Reference< XFrame > xFrame( GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(), UNO_QUERY ); return ImplRetrieveLabelFromCommand( xFrame, aCmdURL ); @@ -1295,8 +1294,8 @@ void ViewShellBase::Implementation::ResizePixel ( void ViewShellBase::Implementation::SetPaneVisibility ( const SfxRequest& rRequest, - const ::rtl::OUString& rsPaneURL, - const ::rtl::OUString& rsViewURL) + const OUString& rsPaneURL, + const OUString& rsViewURL) { try { @@ -1587,7 +1586,7 @@ void CurrentPageSetter::operator() (bool) // Switch to the page last edited by setting the CurrentPage // property. Reference xSet (mrBase.GetController(), UNO_QUERY_THROW); - xSet->setPropertyValue (rtl::OUString("CurrentPage"), aPage); + xSet->setPropertyValue (OUString("CurrentPage"), aPage); } catch (const RuntimeException&) { diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 2df51ea80499..109da58163c0 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -1304,7 +1304,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) if (*iEntry != NULL) SAL_INFO("sd.view", OSL_THIS_FUNC << ": " << *iEntry << " : " << - ::rtl::OUStringToOString((*iEntry)->GetName(),RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString((*iEntry)->GetName(),RTL_TEXTENCODING_UTF8).getStr()); else SAL_INFO("sd.view", OSL_THIS_FUNC << " null"); } diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 167f2f752122..ae0891d90b4c 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; using ::sd::tools::EventMultiplexerEvent; -using ::rtl::OUString; namespace sd { diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index bd12b3c987be..25eb71a565df 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -117,7 +117,7 @@ TextObjectBar::TextObjectBar ( } } - SetName( rtl::OUString( "TextObjectBar" )); + SetName( OUString( "TextObjectBar" )); // SetHelpId( SD_IF_SDDRAWTEXTOBJECTBAR ); } diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index e74f82c81413..c69c2efae8a2 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -232,9 +232,9 @@ void DrawViewShell::SelectionHasChanged (void) catch( ::com::sun::star::uno::Exception& ) { OSL_FAIL( - OString(rtl::OString("sd::DrawViewShell::SelectionHasChanged(), " + OString(OString("sd::DrawViewShell::SelectionHasChanged(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 77a1c2acdcf2..d9cee3c2af1f 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -401,7 +401,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if (pBookmark) { - rtl::OUString sBookmark(INetURLObject::decode(pBookmark->GetValue(), '%', INetURLObject::DECODE_WITH_CHARSET)); + OUString sBookmark(INetURLObject::decode(pBookmark->GetValue(), '%', INetURLObject::DECODE_WITH_CHARSET)); rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) ); if(xSlideshow.is() && xSlideshow->isRunning()) diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 64100504a41f..d3651b09568e 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -80,7 +80,6 @@ #include "fubullet.hxx" #include "fuformatpaintbrush.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index b75289e456d3..840979562272 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -352,7 +352,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) mbIsRulerDrag = sal_False; - rtl::OUString aName( "DrawViewShell" ); + OUString aName( "DrawViewShell" ); SetName (aName); mnLockCount = 0UL; diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 969ac97cf826..02d9cbecc531 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -94,7 +94,6 @@ #include "Window.hxx" #include "fuformatpaintbrush.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index aa5ced7823f0..3e1a3af3dad1 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -58,7 +58,6 @@ #include "cfgids.hxx" #include "anminfo.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; namespace sd { diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index cc563af5f3f7..5e7a88b59a3a 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::std; -using ::rtl::OUString; namespace sd { @@ -94,7 +93,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * { nSdViewShellCount++; - ::rtl::OUString sViewURL; + OUString sViewURL; Reference xView ( framework::FrameworkHelper::Instance(*pBase)->GetView( drawing::framework::ResourceId::create( @@ -390,7 +389,7 @@ EditMode FrameView::GetViewShEditModeOnLoad (void) const static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines ) { - ::rtl::OUStringBuffer aLines; + OUStringBuffer aLines; const sal_uInt16 nCount = rHelpLines.GetCount(); for( sal_uInt16 nHlpLine = 0; nHlpLine < nCount; nHlpLine++ ) @@ -510,11 +509,11 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: } #undef addValue -static void createHelpLinesFromString( const rtl::OUString& rLines, SdrHelpLineList& rHelpLines ) +static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList& rHelpLines ) { const sal_Unicode * pStr = rLines.getStr(); SdrHelpLine aNewHelpLine; - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; while( *pStr ) { @@ -583,7 +582,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : sal_Bool bBool = sal_False; sal_Int32 nInt32 = 0; sal_Int16 nInt16 = 0; - rtl::OUString aString; + OUString aString; sal_Int32 aSnapGridWidthXNum = GetSnapGridWidthX().GetNumerator(); sal_Int32 aSnapGridWidthXDom = GetSnapGridWidthX().GetDenominator(); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 1da13815f082..595886d3b07d 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -84,7 +84,6 @@ #include "DrawController.hxx" #include "framework/FrameworkHelper.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 9758fc94f57e..25c6ff0d8a1e 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -70,7 +70,6 @@ #include "undo/undomanager.hxx" #include "stlsheet.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 2bc148a4c1c9..a2a467cc4622 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -56,7 +56,6 @@ using namespace sd; #include "sdslots.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 3d804aed035f..eece2095344e 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -757,7 +757,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( PickObj( aPos, getHitTolLog(), pPickObj, pPageView ) ) { // insert as clip action => jump - rtl::OUString aBookmark( aINetBookmark.GetURL() ); + OUString aBookmark( aINetBookmark.GetURL() ); SdAnimationInfo* pInfo = mrDoc.GetAnimationInfo( pPickObj ); sal_Bool bCreated = sal_False; @@ -841,20 +841,20 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv if( pPageObjsTransferable && aDataHelper.GetINetBookmark( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark ) ) { Point aPos; - rtl::OUString aBookmark; + OUString aBookmark; SdPage* pPage = (SdPage*) GetSdrPageView()->GetPage(); sal_uInt16 nPgPos = 0xFFFF; if( pSdNavigatorDropEvent->mpTargetWindow ) aPos = pSdNavigatorDropEvent->mpTargetWindow->PixelToLogic( pSdNavigatorDropEvent->maPosPixel ); - const rtl::OUString aURL( aINetBookmark.GetURL() ); + const OUString aURL( aINetBookmark.GetURL() ); sal_Int32 nIndex = aURL.indexOf( (sal_Unicode)'#' ); if( nIndex != -1 ) aBookmark = aURL.copy( nIndex+1 ); - std::vector aExchangeList; - std::vector aBookmarkList(1,aBookmark); + std::vector aExchangeList; + std::vector aBookmarkList(1,aBookmark); if( !pPage->IsMasterPage() ) { @@ -889,8 +889,8 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv return 0; } -bool View::GetExchangeList (std::vector &rExchangeList, - std::vector &rBookmarkList, +bool View::GetExchangeList (std::vector &rExchangeList, + std::vector &rBookmarkList, const sal_uInt16 nType) { assert(rExchangeList.empty()); @@ -898,7 +898,7 @@ bool View::GetExchangeList (std::vector &rExchangeList, bool bListIdentical = true; ///< Bookmark list and exchange list are identical bool bNameOK = true; ///< name is unique - std::vector::const_iterator pIter; + std::vector::const_iterator pIter; for ( pIter = rBookmarkList.begin(); bNameOK && pIter != rBookmarkList.end(); ++pIter ) { String aNewName = *pIter; @@ -910,8 +910,8 @@ bool View::GetExchangeList (std::vector &rExchangeList, { if( mrDoc.GetObj( aNewName ) ) { - rtl::OUString aTitle(SD_RESSTR(STR_TITLE_NAMEGROUP)); - rtl::OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP)); + OUString aTitle(SD_RESSTR(STR_TITLE_NAMEGROUP)); + OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP)); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); AbstractSvxNameDialog* pDlg = 0; diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 7d6bf5e696c9..cc201163496d 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -328,7 +328,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, { xStm->Seek( 0 ); - rtl::OString aLine; + OString aLine; while (xStm->ReadLine(aLine)) { sal_Int32 x = aLine.indexOf( "\\trowd" ); @@ -785,7 +785,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, } else if( CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE ) ) { - ::rtl::OUString aOUString; + OUString aOUString; if( aDataHelper.GetString( SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE, aOUString ) ) { @@ -867,7 +867,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, } else { - ::rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = mpDocSh->GetEmbeddedObjectContainer().InsertEmbeddedObject( xStm, aName ); if ( xObj.is() ) { @@ -995,7 +995,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if ( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE, aObjDesc ) ) { uno::Reference < embed::XEmbeddedObject > xObj; - ::rtl::OUString aName; + OUString aName; if ( aDataHelper.GetInputStream( nFormat ? nFormat : SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, xStm ) || aDataHelper.GetInputStream( SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, xStm ) ) @@ -1402,7 +1402,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, !aDataHelper.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ) && !aDataHelper.HasFormat( SOT_FORMATSTR_ID_FILENAME ) ) ) { - ::rtl::OUString aOUString; + OUString aOUString; if( aDataHelper.GetString( FORMAT_STRING, aOUString ) ) { diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index a58b387b141d..075cf79074be 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -261,11 +261,11 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, // ----------------------------------------------------------------------------- -SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAction, +SdrMediaObj* View::InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction, const Point& rPos, const Size& rSize, bool const bLink ) { - ::rtl::OUString realURL; + OUString realURL; if (bLink) { realURL = rMediaURL; @@ -368,7 +368,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aURLStr; + OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aCurrentDropFile, aURLStr ); aURL = INetURLObject( aURLStr ); } @@ -404,7 +404,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) if( pFoundFilter && !nErr ) { - ::std::vector< ::rtl::OUString > aFilterVector; + ::std::vector< OUString > aFilterVector; const String aFilterName( pFoundFilter->GetFilterName() ); String aLowerAsciiFileName( aCurrentDropFile ); aLowerAsciiFileName.ToLowerAscii(); @@ -466,10 +466,10 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) try { //TODO/MBA: testing - ::rtl::OUString aName; + OUString aName; uno::Sequence < beans::PropertyValue > aMedium(1); aMedium[0].Name = "URL" ; - aMedium[0].Value <<= ::rtl::OUString(aCurrentDropFile) ; + aMedium[0].Value <<= OUString(aCurrentDropFile) ; uno::Reference < embed::XEmbeddedObject > xObj = mpDocSh->GetEmbeddedObjectContainer(). InsertEmbeddedObject( aMedium, aName ); diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 4967cfea64de..d02f9c1703bd 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -1040,16 +1040,16 @@ void Window::DropScroll(const Point& rMousePos) } } -rtl::OUString Window::GetSurroundingText() const +OUString Window::GetSurroundingText() const { if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE ) - return rtl::OUString(); + return OUString(); else if ( mpViewShell->GetView()->IsTextEdit() ) { OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView(); return pOLV->GetEditView().GetSurroundingText(); } - return rtl::OUString(); + return OUString(); } Selection Window::GetSurroundingTextSelection() const diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 08a97b4dd490..068c28483277 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -169,7 +169,7 @@ ModifyPageUndoAction::~ModifyPageUndoAction() } -rtl::OUString ModifyPageUndoAction::GetComment() const +OUString ModifyPageUndoAction::GetComment() const { return maComment; } @@ -205,7 +205,7 @@ void RenameLayoutTemplateUndoAction::Redo() mpDoc->RenameLayoutTemplate( aLayoutName, maNewName ); } -rtl::OUString RenameLayoutTemplateUndoAction::GetComment() const +OUString RenameLayoutTemplateUndoAction::GetComment() const { return maComment; } diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 0a9c9de0011a..e834999a5350 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -56,7 +56,6 @@ #include "drawdoc.hxx" #include "smarttag.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -190,7 +189,7 @@ void ImageButtonHdl::HideTip() // -------------------------------------------------------------------- -extern ::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); +extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL ); void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) { diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 69cc2be872a2..6f88cf1b73d6 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -741,14 +741,14 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) SfxViewShell* pViewShell = GetViewShell(); OSL_ASSERT (pViewShell!=NULL); bool bChangeDefaultsForChart = false; - rtl::OUString aName; + OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef(); if ( !xObj.is() ) { // provide OLE object to empty OLE object aName = pObj->GetProgName(); - ::rtl::OUString aObjName; + OUString aObjName; SvGlobalName aClass; if( aName == "StarChart" || aName == "StarOrg" ) @@ -995,8 +995,8 @@ void ViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < sal_uInt16 nViewID (IMPRESS_FACTORY_ID); if (GetViewShellBase().GetMainViewShell().get() != NULL) nViewID = GetViewShellBase().GetMainViewShell()->mpImpl->GetViewId(); - rSequence[nIndex].Name = rtl::OUString( sUNO_View_ViewId ); - rtl::OUStringBuffer sBuffer( "view" ); + rSequence[nIndex].Name = OUString( sUNO_View_ViewId ); + OUStringBuffer sBuffer( "view" ); sBuffer.append( static_cast(nViewID)); rSequence[nIndex].Value <<= sBuffer.makeStringAndClear(); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 224e7e52acce..2b1060998376 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -208,7 +208,7 @@ void ViewShell::construct(void) mpScrollBarBox.reset(new ScrollBarBox(GetParentWindow(), WB_SIZEABLE)); } - rtl::OUString aName( "ViewShell" ); + OUString aName( "ViewShell" ); SetName (aName); GetDoc()->StartOnlineSpelling(sal_False); diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx index 6e09e942699e..ab855a1564e1 100644 --- a/sd/workben/custompanel/ctp_panel.cxx +++ b/sd/workben/custompanel/ctp_panel.cxx @@ -86,7 +86,7 @@ namespace sd { namespace colortoolpanel WindowDescriptor aWindow; aWindow.Type = WindowClass_SIMPLE; - aWindow.WindowServiceName = ::rtl::OUString( "window" ); + aWindow.WindowServiceName = OUString( "window" ); aWindow.Parent = i_rParentWindow; aWindow.WindowAttributes = WindowAttribute::BORDER; @@ -153,7 +153,7 @@ namespace sd { namespace colortoolpanel { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.get() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return m_xWindow; } @@ -171,7 +171,7 @@ namespace sd { namespace colortoolpanel { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return m_xResourceId; } @@ -180,7 +180,7 @@ namespace sd { namespace colortoolpanel { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return sal_False; } diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 2a3421758bc3..50592c52737c 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -162,9 +162,9 @@ ConfigurationAccess::~ConfigurationAccess() { } -rtl::OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken ) +OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken ) { - rtl::OUString aPath; + OUString aPath; try { static const OUString sProtocol( "vnd.sun.star.expand:" ); @@ -173,7 +173,7 @@ rtl::OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken ) xSet->getByName( TKGet( eToken ) ) >>= aPath; if ( aPath.match( sProtocol, 0 ) ) { - rtl::OUString aTmp( aPath.copy( 20 ) ); + OUString aTmp( aPath.copy( 20 ) ); Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(mxMSF); aPath = xExpander->expandMacros( aTmp ); } @@ -184,10 +184,10 @@ rtl::OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken ) return aPath; } -rtl::OUString ConfigurationAccess::getString( const PPPOptimizerTokenEnum eToken ) const +OUString ConfigurationAccess::getString( const PPPOptimizerTokenEnum eToken ) const { - std::map< PPPOptimizerTokenEnum, rtl::OUString, Compare >::const_iterator aIter( maStrings.find( eToken ) ); - return aIter != maStrings.end() ? ((*aIter).second) : rtl::OUString(); + std::map< PPPOptimizerTokenEnum, OUString, Compare >::const_iterator aIter( maStrings.find( eToken ) ); + return aIter != maStrings.end() ? ((*aIter).second) : OUString(); } void ConfigurationAccess::LoadStrings() @@ -364,9 +364,9 @@ Reference< XInterface > ConfigurationAccess::GetConfigurationNode( catch (const Exception& rException) { OSL_TRACE ("caught exception while getting configuration node %s: %s", - ::rtl::OUStringToOString(sPathToNode, + OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); (void)rException; } @@ -501,7 +501,7 @@ Sequence< PropertyValue > ConfigurationAccess::GetConfigurationSequence() return aRet; } -std::vector< OptimizerSettings >::iterator ConfigurationAccess::GetOptimizerSettingsByName( const rtl::OUString& rName ) +std::vector< OptimizerSettings >::iterator ConfigurationAccess::GetOptimizerSettingsByName( const OUString& rName ) { std::vector< OptimizerSettings >::iterator aIter( maSettings.begin() + 1 ); const std::vector< OptimizerSettings >::const_iterator aEnd( maSettings.end() ); diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index bfe019be09dc..85af8b94a832 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -38,7 +38,7 @@ struct OptimizerSettings { - rtl::OUString maName; + OUString maName; sal_Bool mbJPEGCompression; sal_Int32 mnJPEGQuality; sal_Bool mbRemoveCropArea; @@ -49,10 +49,10 @@ struct OptimizerSettings sal_Bool mbDeleteUnusedMasterPages; sal_Bool mbDeleteHiddenSlides; sal_Bool mbDeleteNotesPages; - rtl::OUString maCustomShowName; + OUString maCustomShowName; sal_Bool mbSaveAs; - rtl::OUString maSaveAsURL; - rtl::OUString maFilterName; + OUString maSaveAsURL; + OUString maFilterName; sal_Bool mbOpenNewDocument; sal_Int64 mnEstimatedFileSize; @@ -87,8 +87,8 @@ class ConfigurationAccess ~ConfigurationAccess(); void SaveConfiguration(); - rtl::OUString getPath( const PPPOptimizerTokenEnum ); - rtl::OUString getString( const PPPOptimizerTokenEnum ) const; + OUString getPath( const PPPOptimizerTokenEnum ); + OUString getString( const PPPOptimizerTokenEnum ) const; // access to current OptimizerSettings (stored in the first entry of maSettings) com::sun::star::uno::Any GetConfigProperty( const PPPOptimizerTokenEnum ) const; @@ -102,7 +102,7 @@ class ConfigurationAccess // getting access to the OptimizerSettings list std::vector< OptimizerSettings >& GetOptimizerSettings() { return maSettings; }; - std::vector< OptimizerSettings >::iterator GetOptimizerSettingsByName( const rtl::OUString& rName ); + std::vector< OptimizerSettings >::iterator GetOptimizerSettingsByName( const OUString& rName ); private : @@ -113,7 +113,7 @@ class ConfigurationAccess return s1 < s2; } }; - std::map < PPPOptimizerTokenEnum, rtl::OUString, Compare > maStrings; + std::map < PPPOptimizerTokenEnum, OUString, Compare > maStrings; std::vector< OptimizerSettings > maSettings; std::vector< OptimizerSettings > maInitialSettings; @@ -124,7 +124,7 @@ class ConfigurationAccess void LoadConfiguration(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > OpenConfiguration( bool bReadOnly ); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > GetConfigurationNode( - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xRoot, const rtl::OUString& sPathToNode ); + const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xRoot, const OUString& sPathToNode ); }; #endif // _CONFIGURATION_ACCESS_HXX_ diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx index 3e30d216adc4..93f2cb76a702 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.cxx @@ -92,7 +92,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext { case TK_DocumentService : { - rtl::OUString sDocumentService; + OUString sDocumentService; rProperty.Value >>= sDocumentService; if ( sDocumentService == "com.sun.star.presentation.PresentationDocument" ) bImpressFilter = sal_True; @@ -158,20 +158,20 @@ sal_Int16 FileOpenDialog::execute() { return mxFilePicker->execute(); } -void FileOpenDialog::setDefaultName( const rtl::OUString& rDefaultName ) +void FileOpenDialog::setDefaultName( const OUString& rDefaultName ) { mxFilePicker->setDefaultName( rDefaultName ); } -::rtl::OUString FileOpenDialog::getURL() const +OUString FileOpenDialog::getURL() const { Sequence< OUString > aFileSeq( mxFilePicker->getFiles() ); return aFileSeq.getLength() ? aFileSeq[ 0 ] : OUString(); }; -::rtl::OUString FileOpenDialog::getFilterName() const +OUString FileOpenDialog::getFilterName() const { - rtl::OUString aFilterName; + OUString aFilterName; Reference< XFilterManager > xFilterManager( mxFilePicker, UNO_QUERY_THROW ); - rtl::OUString aUIName( xFilterManager->getCurrentFilter() ); + OUString aUIName( xFilterManager->getCurrentFilter() ); for( std::vector< FilterEntry >::const_iterator aIter(aFilterEntryList.begin()), aEnd(aFilterEntryList.end()); aIter != aEnd; ++aIter ) { if ( aIter->maUIName == aUIName ) diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx index 5611d29857eb..d8a735c66fab 100644 --- a/sdext/source/minimizer/fileopendialog.hxx +++ b/sdext/source/minimizer/fileopendialog.hxx @@ -32,12 +32,12 @@ class FileOpenDialog // a list of filters that are provided within the SaveDialog struct FilterEntry { - rtl::OUString maName; - rtl::OUString maType; - rtl::OUString maUIName; - rtl::OUString maFilter; + OUString maName; + OUString maType; + OUString maUIName; + OUString maFilter; sal_Int32 maFlags; - com::sun::star::uno::Sequence< rtl::OUString > maExtensions; + com::sun::star::uno::Sequence< OUString > maExtensions; FilterEntry() : maFlags( 0 ) {} @@ -52,11 +52,11 @@ public : sal_Int16 execute(); - void setDefaultName( const rtl::OUString& ); -// void setDefaultDirectory( const rtl::OUString& ); + void setDefaultName( const OUString& ); +// void setDefaultDirectory( const OUString& ); - ::rtl::OUString getURL() const; - ::rtl::OUString getFilterName() const; + OUString getURL() const; + OUString getFilterName() const; }; #endif // _FILEOPEN_DIALOG_HXX_ diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index 10558e2933e1..13fcff570d09 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -62,8 +62,8 @@ const DeviceInfo& GraphicCollector::GetDeviceInfo( const Reference< XComponentCo void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, const GraphicSettings& rGraphicSettings, const GraphicCollector::GraphicUser& rUser ) { - const rtl::OUString aGraphicURL( rUser.maGraphicURL ); - const rtl::OUString sPackageURL( "vnd.sun.star.GraphicObject:" ); + const OUString aGraphicURL( rUser.maGraphicURL ); + const OUString sPackageURL( "vnd.sun.star.GraphicObject:" ); if ( rGraphicSettings.mbEmbedLinkedGraphics || (aGraphicURL.isEmpty() || aGraphicURL.match( sPackageURL, 0 ) ) ) { diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx index d8bff403eaaf..f0fca3cf9866 100644 --- a/sdext/source/minimizer/graphiccollector.hxx +++ b/sdext/source/minimizer/graphiccollector.hxx @@ -57,8 +57,8 @@ class GraphicCollector com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; // if mbFillBitmap is false the xShape has com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPropertySet; // to be used otherwise the PropertySet com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPagePropertySet; - rtl::OUString maGraphicURL; - rtl::OUString maGraphicStreamURL; + OUString maGraphicURL; + OUString maGraphicStreamURL; com::sun::star::text::GraphicCrop maGraphicCropLogic; com::sun::star::awt::Size maLogicalSize; sal_Bool mbFillBitmap; diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index 4a496d57e6f2..d3350651310b 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -358,7 +358,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& } else // this is a metafile { - rtl::OUString aDestMimeType( aSourceMimeType ); + OUString aDestMimeType( aSourceMimeType ); Reference< XStream > xTempFile( io::TempFile::create(rxMSF), UNO_QUERY_THROW ); Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() ); Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create( rxMSF ) ); @@ -424,7 +424,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont { if ( aGraphicUserIter->mxShape.is() ) { - rtl::OUString sEmptyGraphicURL; + OUString sEmptyGraphicURL; Reference< XPropertySet > xShapePropertySet( aGraphicUserIter->mxShape, UNO_QUERY_THROW ); xShapePropertySet->setPropertyValue( TKGet( TK_GraphicURL ), Any( sEmptyGraphicURL ) ); xShapePropertySet->setPropertyValue( TKGet( TK_Graphic ), Any( xNewGraphic ) ); diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx index 6e60970d2769..a07952d73a94 100644 --- a/sdext/source/minimizer/impoptimizer.hxx +++ b/sdext/source/minimizer/impoptimizer.hxx @@ -49,12 +49,12 @@ private: sal_Bool mbEmbedLinkedGraphics; sal_Bool mbOLEOptimization; sal_Int32 mnOLEOptimizationType; - rtl::OUString maCustomShowName; + OUString maCustomShowName; sal_Bool mbDeleteUnusedMasterPages; sal_Bool mbDeleteHiddenSlides; sal_Bool mbDeleteNotesPages; - rtl::OUString maSaveAsURL; - rtl::OUString maFilterName; + OUString maSaveAsURL; + OUString maFilterName; sal_Bool mbOpenNewDocument; com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxInformationDialog; diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 4e53ec01a932..92accb20a60b 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::container; // ----------------------------------------------------------------------------- -rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl::OUString& rControlName, const OUString& rLabel, +OUString InsertFixedText( InformationDialog& rInformationDialog, const OUString& rControlName, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex ) { OUString pNames[] = { @@ -83,14 +83,14 @@ rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl: sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rInformationDialog.insertFixedText( rControlName, aNames, aValues ); return rControlName; } -rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString& rControlName, const OUString& rURL, +OUString InsertImage( InformationDialog& rInformationDialog, const OUString& rControlName, const OUString& rURL, sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight ) { OUString pNames[] = { @@ -112,14 +112,14 @@ rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString Any( nWidth ) }; sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rInformationDialog.insertImage( rControlName, aNames, aValues ); return rControlName; } -rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUString& rControlName, +OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUString& rControlName, const Reference< XItemListener > xItemListener, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) { @@ -145,7 +145,7 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XCheckBox > xCheckBox( rInformationDialog.insertCheckBox( rControlName, aNames, aValues ) ); @@ -154,7 +154,7 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr return rControlName; } -rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, +OUString InsertButton( InformationDialog& rInformationDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, PPPOptimizerTokenEnum nResID ) { OUString pNames[] = { @@ -182,7 +182,7 @@ rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUStrin sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rInformationDialog.insertButton( rControlName, xActionListener, aNames, aValues ); @@ -195,7 +195,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal ) double fVal( static_cast( rVal ) ); fVal /= ( 1 << 20 ); fVal += 0.05; - rtl::OUStringBuffer aVal( OUString::valueOf( fVal ) ); + OUStringBuffer aVal( OUString::valueOf( fVal ) ); sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) ); if ( nX > 0 ) aVal.setLength( nX + 2 ); @@ -204,7 +204,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal ) OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL ) { - rtl::OUString sURL; + OUString sURL; try { mxTempFile = Reference< XStream >( io::TempFile::create(mxMSF), UNO_QUERY_THROW ); @@ -263,7 +263,7 @@ void InformationDialog::InitDialog() sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); @@ -290,20 +290,20 @@ void InformationDialog::InitDialog() nDest = mnApproxSize; } - rtl::OUString aTitle; + OUString aTitle; if ( !maSaveAsURL.isEmpty() ) { Reference< XURLTransformer > xURLTransformer( URLTransformer::create(mxMSF) ); util::URL aURL, aPresentationURL; aURL.Complete = maSaveAsURL; - xURLTransformer->parseSmart( aURL, rtl::OUString() ); + xURLTransformer->parseSmart( aURL, OUString() ); const OUString sFileProtocol( "file:///" ); aPresentationURL.Complete = sFileProtocol.concat( aURL.Name ); aTitle = xURLTransformer->getPresentation( aPresentationURL, sal_False ); if ( aTitle.match( sFileProtocol, 0 ) ) - aTitle = aTitle.replaceAt( 0, sFileProtocol.getLength(), rtl::OUString() ); + aTitle = aTitle.replaceAt( 0, sFileProtocol.getLength(), OUString() ); } OUString aInfoString( getString( eInfoString ) ); @@ -325,11 +325,11 @@ void InformationDialog::InitDialog() aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle ); com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener; - InsertImage( *this, rtl::OUString("aboutimage"), ImpGetStandardImage( rtl::OUString("private:standardimage/query") ), 5, 5, 25, 25 ); - InsertFixedText( *this, rtl::OUString("fixedtext"), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 ); + InsertImage( *this, OUString("aboutimage"), ImpGetStandardImage( OUString("private:standardimage/query") ), 5, 5, 25, 25 ); + InsertFixedText( *this, OUString("fixedtext"), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 ); if ( !maSaveAsURL.isEmpty() ) InsertCheckBox( *this, TKGet( TK_OpenNewDocument ), xItemListener, getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 ); - InsertButton( *this, rtl::OUString("button"), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK ); + InsertButton( *this, OUString("button"), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK ); sal_Bool bOpenNewDocument = mrbOpenNewDocument; setControlProperty( TKGet( TK_OpenNewDocument ), TKGet( TK_State ), Any( (sal_Int16)bOpenNewDocument ) ); @@ -337,7 +337,7 @@ void InformationDialog::InitDialog() // ----------------------------------------------------------------------------- -InformationDialog::InformationDialog( const Reference< XComponentContext > &rxMSF, Reference< XFrame >& rxFrame, const rtl::OUString& rSaveAsURL, sal_Bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) : +InformationDialog::InformationDialog( const Reference< XComponentContext > &rxMSF, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, sal_Bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) : UnoDialog( rxMSF, rxFrame ), ConfigurationAccess( rxMSF, NULL ), mxMSF( rxMSF ), diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index b3331b4a46a0..8486de362c0a 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -47,7 +47,7 @@ class InformationDialog : public UnoDialog, public ConfigurationAccess public : InformationDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF, - com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, const rtl::OUString& rSaveAsURL, + com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, const OUString& rSaveAsURL, sal_Bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest ); ~InformationDialog(); @@ -61,14 +61,14 @@ private : com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener; - rtl::OUString ImpGetStandardImage( const rtl::OUString& rPrivateURL ); + OUString ImpGetStandardImage( const OUString& rPrivateURL ); void InitDialog(); sal_Int64 mnSourceSize; sal_Int64 mnDestSize; sal_Int64 mnApproxSize; sal_Bool& mrbOpenNewDocument; - const rtl::OUString& maSaveAsURL; + const OUString& maSaveAsURL; public : diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 9dcaf2990695..d6c73488725d 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -72,7 +72,7 @@ void OptimizerDialog::InitDialog() sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); @@ -102,7 +102,7 @@ void OptimizerDialog::InitRoadmap() sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); mxRoadmapControlModel = insertControlModel( OUString( "com.sun.star.awt.UnoControlRoadmapModel" ), @@ -117,9 +117,9 @@ void OptimizerDialog::InitRoadmap() InsertRoadmapItem( 3, sal_True, getString( STR_OLE_OBJECTS ), ITEM_ID_OLE_OPTIMIZATION ); InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY ); - rtl::OUString sBitmapPath( getPath( TK_BitmapPath ) ); - rtl::OUString sBitmap( "/minimizepresi_80.png" ); - rtl::OUString sURL( sBitmapPath += sBitmap ); + OUString sBitmapPath( getPath( TK_BitmapPath ) ); + OUString sBitmap( "/minimizepresi_80.png" ); + OUString sURL( sBitmapPath += sBitmap ); xPropertySet->setPropertyValue( TKGet( TK_ImageURL ), Any( sURL ) ); xPropertySet->setPropertyValue( TKGet( TK_Activated ), Any( (sal_Bool)sal_True ) ); @@ -134,7 +134,7 @@ void OptimizerDialog::InitRoadmap() // ----------------------------------------------------------------------------- -void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const rtl::OUString& rLabel, const sal_Int32 nItemID ) +void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID ) { try { @@ -308,7 +308,7 @@ void OptimizerDialog::UpdateControlStates( sal_Int16 nPage ) // ----------------------------------------------------------------------------- -rtl::OUString OptimizerDialog::GetSelectedString( const PPPOptimizerTokenEnum eToken ) +OUString OptimizerDialog::GetSelectedString( const PPPOptimizerTokenEnum eToken ) { OUString aSelectedItem; Sequence< sal_Int16 > sSelectedItems; @@ -337,7 +337,7 @@ void OptimizerDialog::UpdateStatus( const com::sun::star::uno::Sequence< com::su const Any* pVal( maStats.GetStatusValue( TK_Status ) ); if ( pVal ) { - rtl::OUString sStatus; + OUString sStatus; if ( *pVal >>= sStatus ) { setControlProperty( TKGet( TK_FixedText1Pg4 ), TKGet( TK_Enabled ), Any( sal_True ) ); @@ -521,14 +521,14 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) mrOptimizerDialog.getControlProperty( TKGet( TK_RadioButton1Pg4 ), TKGet( TK_State ) ) >>= nInt16; if ( nInt16 ) { - rtl::OUString aSaveAsURL; + OUString aSaveAsURL; FileOpenDialog aFileOpenDialog( ((UnoDialog&)mrOptimizerDialog).mxMSF ); // generating default file name Reference< XStorable > xStorable( mrOptimizerDialog.mxController->getModel(), UNO_QUERY ); if ( xStorable.is() && xStorable->hasLocation() ) { - rtl::OUString aLocation( xStorable->getLocation() ); + OUString aLocation( xStorable->getLocation() ); if ( !aLocation.isEmpty() ) { sal_Int32 nIndex = aLocation.lastIndexOf( '/', aLocation.getLength() - 1 ); @@ -685,7 +685,7 @@ void TextListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::Ev void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ ) throw ( com::sun::star::uno::RuntimeException ) { - rtl::OUString aString; + OUString aString; Any aAny = mrOptimizerDialog.getControlProperty( TKGet( TK_ComboBox0Pg1 ), TKGet( TK_Text ) ); if ( aAny >>= aString ) { diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index dab9a88613db..3bd5080ab6ca 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -87,7 +87,7 @@ private : com::sun::star::uno::Reference< com::sun::star::awt::XSpinListener > mxSpinListenerFormattedField0Pg1; com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher; - std::vector< std::vector< rtl::OUString > > maControlPages; + std::vector< std::vector< OUString > > maControlPages; void InitDialog(); void InitRoadmap(); @@ -105,7 +105,7 @@ private : void ActivatePage( sal_Int16 nStep ); void DeactivatePage( sal_Int16 nStep ); - void InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const rtl::OUString& rLabel, const sal_Int32 nItemID ); + void InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID ); public : @@ -122,7 +122,7 @@ public : void SwitchPage( sal_Int16 nNewStep ); void UpdateControlStates( sal_Int16 nStep = -1 ); - rtl::OUString GetSelectedString( PPPOptimizerTokenEnum eListBox ); + OUString GetSelectedString( PPPOptimizerTokenEnum eListBox ); com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; }; com::sun::star::uno::Reference< com::sun::star::frame::XFrame>& GetFrame() { return mxFrame; }; const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxMSF; }; diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index 3eb04b098034..0c5445940103 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star::presentation; // ----------------------------------------------------------------------------- -void SetBold( OptimizerDialog& rOptimizerDialog, const rtl::OUString& rControl ) +void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl ) { FontDescriptor aFontDescriptor; if ( rOptimizerDialog.getControlProperty( rControl, TKGet( TK_FontDescriptor ) ) >>= aFontDescriptor ) @@ -60,7 +60,7 @@ void SetBold( OptimizerDialog& rOptimizerDialog, const rtl::OUString& rControl ) // ----------------------------------------------------------------------------- -rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, sal_Int32 nOrientation, +OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, sal_Int32 nOrientation, sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight ) { OUString pNames[] = { @@ -81,7 +81,7 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rOptimizerDialog.insertControlModel( OUString( "com.sun.star.awt.UnoControlFixedLineModel" ), @@ -91,7 +91,7 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString // ----------------------------------------------------------------------------- -rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, +OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, sal_Bool bEnabled, PPPOptimizerTokenEnum nResID, sal_Int16 nPushButtonType ) { OUString pNames[] = { @@ -119,7 +119,7 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rOptimizerDialog.insertButton( rControlName, xActionListener, aNames, aValues ); @@ -128,7 +128,7 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r // ----------------------------------------------------------------------------- -rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUString& rControlName, const OUString& rLabel, +OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Bool bBold, sal_Int16 nTabIndex ) { OUString pNames[] = { @@ -153,7 +153,7 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rOptimizerDialog.insertFixedText( rControlName, aNames, aValues ); @@ -164,7 +164,7 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS // ----------------------------------------------------------------------------- -rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, +OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener > xItemListener, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) { @@ -190,7 +190,7 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XCheckBox > xCheckBox( rOptimizerDialog.insertCheckBox( rControlName, aNames, aValues ) ); @@ -201,7 +201,7 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& // ----------------------------------------------------------------------------- -rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, +OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XTextListener > xTextListener, const Reference< XSpinListener > xSpinListener, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, double fEffectiveMin, double fEffectiveMax, sal_Int16 nTabIndex ) { @@ -233,7 +233,7 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XTextComponent > xTextComponent( rOptimizerDialog.insertFormattedField( rControlName, aNames, aValues ), UNO_QUERY_THROW ); @@ -249,7 +249,7 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS // ----------------------------------------------------------------------------- -rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, +OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XTextListener > xTextListener, const sal_Bool bEnabled, const Sequence< OUString >& rItemList, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) { @@ -279,7 +279,7 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XTextComponent > xTextComponent( rOptimizerDialog.insertComboBox( rControlName, aNames, aValues ), UNO_QUERY_THROW ); @@ -290,7 +290,7 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& // ----------------------------------------------------------------------------- -rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::OUString& rControlName, const Reference< XItemListener > xItemListener, +OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener > xItemListener, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex ) { OUString pNames[] = { @@ -315,7 +315,7 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XRadioButton > xRadioButton( rOptimizerDialog.insertRadioButton( rControlName, aNames, aValues ) ); @@ -326,7 +326,7 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O // ----------------------------------------------------------------------------- -rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, +OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XActionListener > xActionListener, const sal_Bool bEnabled, const Sequence< OUString >& rItemList, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) { @@ -358,7 +358,7 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XListBox > xListBox( rOptimizerDialog.insertListBox( rControlName, aNames, aValues ) ); @@ -424,7 +424,7 @@ void OptimizerDialog::UpdateControlStatesPage0() void OptimizerDialog::InitPage0() { Sequence< OUString > aItemList; - std::vector< rtl::OUString > aControlList; + std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg0 ), getString( STR_INTRODUCTION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText1Pg0 ), getString( STR_INTRODUCTION_T ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 100, sal_True, sal_False, mnTabIndex++ ) ); aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator1Pg0 ), 0, PAGE_POS_X + 6, DIALOG_HEIGHT - 66, PAGE_WIDTH - 12, 1 ) ); @@ -459,7 +459,7 @@ void OptimizerDialog::InitPage1() if ( aXCont.is() ) aCustomShowList = aXCont->getElementNames(); } - std::vector< rtl::OUString > aControlList; + std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg3 ), getString( STR_CHOOSE_SLIDES ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox0Pg3 ), mxItemListener, getString( STR_DELETE_MASTER_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) ); aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox2Pg3 ), mxItemListener, getString( STR_DELETE_HIDDEN_SLIDES ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, mnTabIndex++ ) ); @@ -526,7 +526,7 @@ void OptimizerDialog::InitPage2() aResolutionItemList[ 2 ] = getString( STR_IMAGE_RESOLUTION_2 ).getToken( 1, ';', nI2 ); aResolutionItemList[ 3 ] = getString( STR_IMAGE_RESOLUTION_3 ).getToken( 1, ';', nI3 ); - std::vector< rtl::OUString > aControlList; + std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg1 ), getString( STR_GRAPHIC_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); aControlList.push_back( InsertRadioButton( *this, TKGet( TK_RadioButton0Pg1 ), mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) ); aControlList.push_back( InsertRadioButton( *this, TKGet( TK_RadioButton1Pg1 ), mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) ); @@ -572,7 +572,7 @@ void OptimizerDialog::InitPage3() } } - std::vector< rtl::OUString > aControlList; + std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg2 ), getString( STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox0Pg2 ), mxItemListener, getString( STR_OLE_REPLACE ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) ); aControlList.push_back( InsertRadioButton( *this, TKGet( TK_RadioButton0Pg2 ), mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH - 22, 8, sal_False, mnTabIndex++ ) ); @@ -590,7 +590,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator = double fVal( static_cast( rVal ) ); fVal /= ( 1 << 20 ); fVal += 0.05; - rtl::OUStringBuffer aVal( OUString::valueOf( fVal ) ); + OUStringBuffer aVal( OUString::valueOf( fVal ) ); sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) ); if ( nX >= 0 ) { @@ -649,7 +649,7 @@ void OptimizerDialog::UpdateControlStatesPage4() // taking care of deleted slides sal_Int32 nDeletedSlides = 0; - rtl::OUString aCustomShowName; + OUString aCustomShowName; if ( getControlProperty( TKGet( TK_CheckBox3Pg3 ), TKGet( TK_State ) ) >>= nInt16 ) { if ( nInt16 ) @@ -858,7 +858,7 @@ void OptimizerDialog::InitPage4() sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XMultiPropertySet > xMultiPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlProgressBarModel" ), @@ -866,7 +866,7 @@ void OptimizerDialog::InitPage4() } Reference< XTextListener > xTextListener; Sequence< OUString > aItemList; - std::vector< rtl::OUString > aControlList; + std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg4 ), getString( STR_SUMMARY_TITLE ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); // aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator0Pg4 ), 0, PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ) ); @@ -920,29 +920,29 @@ void OptimizerDialog::InitPage4() // ----------------------------------------------------------------------------- void OptimizerDialog::EnablePage( sal_Int16 nStep ) { - std::vector< rtl::OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); - std::vector< rtl::OUString >::iterator aEnd( maControlPages[ nStep ].end() ); + std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); + std::vector< OUString >::iterator aEnd( maControlPages[ nStep ].end() ); while( aBeg != aEnd ) setControlProperty( *aBeg++, TKGet( TK_Enabled ), Any( sal_True ) ); } void OptimizerDialog::DisablePage( sal_Int16 nStep ) { - std::vector< rtl::OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); - std::vector< rtl::OUString >::iterator aEnd( maControlPages[ nStep ].end() ); + std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); + std::vector< OUString >::iterator aEnd( maControlPages[ nStep ].end() ); while( aBeg != aEnd ) setControlProperty( *aBeg++, TKGet( TK_Enabled ), Any( sal_False ) ); } void OptimizerDialog::ActivatePage( sal_Int16 nStep ) { - std::vector< rtl::OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); - std::vector< rtl::OUString >::iterator aEnd( maControlPages[ nStep ].end() ); + std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); + std::vector< OUString >::iterator aEnd( maControlPages[ nStep ].end() ); while( aBeg != aEnd ) setVisible( *aBeg++, sal_True ); } void OptimizerDialog::DeactivatePage( sal_Int16 nStep ) { - std::vector< rtl::OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); - std::vector< rtl::OUString >::iterator aEnd( maControlPages[ nStep ].end() ); + std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); + std::vector< OUString >::iterator aEnd( maControlPages[ nStep ].end() ); while( aBeg != aEnd ) setVisible( *aBeg++, sal_False ); } diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx index 113f3baaf8bb..0e592eab4c6a 100644 --- a/sdext/source/minimizer/pagecollector.cxx +++ b/sdext/source/minimizer/pagecollector.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::presentation; -void PageCollector::CollectCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, const rtl::OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rUsedPageList ) +void PageCollector::CollectCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, const OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rUsedPageList ) { try { @@ -79,7 +79,7 @@ void PageCollector::CollectCustomShowPages( const com::sun::star::uno::Reference } } -void PageCollector::CollectNonCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, const rtl::OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rNonUsedPageList ) +void PageCollector::CollectNonCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, const OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rNonUsedPageList ) { try { diff --git a/sdext/source/minimizer/pagecollector.hxx b/sdext/source/minimizer/pagecollector.hxx index fe7548680ee6..c934444a6d9b 100644 --- a/sdext/source/minimizer/pagecollector.hxx +++ b/sdext/source/minimizer/pagecollector.hxx @@ -33,8 +33,8 @@ class PageCollector com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > xMasterPage; bool bUsed; }; - static void CollectCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const rtl::OUString& rCustomShow, std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > >& ); - static void CollectNonCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const rtl::OUString& rCustomShow, std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > >& ); + static void CollectCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const OUString& rCustomShow, std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > >& ); + static void CollectNonCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const OUString& rCustomShow, std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > >& ); static void CollectMasterPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, std::vector< MasterPageEntity >& ); }; diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index 4d58933248be..9e4f04ff0bc1 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -91,7 +91,7 @@ Sequence< OUString > SAL_CALL PPPOptimizer::getSupportedServiceNames() // ----------------------------------------------------------------------------- Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispatch( - const URL& aURL, const ::rtl::OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException ) + const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException ) { Reference < XDispatch > xRet; if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) == 0 ) @@ -162,7 +162,7 @@ void SAL_CALL PPPOptimizer::removeStatusListener( const Reference< XStatusListen // ----------------------------------------------------------------------------- // returning filesize, on error zero is returned -sal_Int64 PPPOptimizer::GetFileSize( const rtl::OUString& rURL ) +sal_Int64 PPPOptimizer::GetFileSize( const OUString& rURL ) { sal_Int64 nFileSize = 0; osl::DirectoryItem aItem; diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index cf4b0be17f58..f01f4dc31c52 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -52,18 +52,18 @@ public: throw( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); // XDispatchProvider virtual com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( - const com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) + const com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( @@ -81,11 +81,11 @@ public: const com::sun::star::util::URL& aURL ) throw( com::sun::star::uno::RuntimeException ); - static sal_Int64 GetFileSize( const rtl::OUString& rURL ); + static sal_Int64 GetFileSize( const OUString& rURL ); }; -rtl::OUString PPPOptimizer_getImplementationName(); -com::sun::star::uno::Sequence< rtl::OUString > PPPOptimizer_getSupportedServiceNames(); +OUString PPPOptimizer_getImplementationName(); +com::sun::star::uno::Sequence< OUString > PPPOptimizer_getSupportedServiceNames(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > PPPOptimizer_createInstance( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rSMgr ) throw( com::sun::star::uno::Exception ); diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index d7632d299e37..e8c707b501d6 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -89,7 +89,7 @@ Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames() // ----------------------------------------------------------------------------- Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch( - const URL& aURL, const ::rtl::OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException ) + const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException ) { Reference < XDispatch > xRet; if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.SunPresentationMinimizer:" ) == 0 ) @@ -142,11 +142,11 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, if ( nFileSizeSource && nFileSizeDest ) { - rtl::OUStringBuffer sBuf( rtl::OUString("Your Presentation has been minimized from:") ); - sBuf.append( rtl::OUString::valueOf( nFileSizeSource >> 10 ) ); - sBuf.append( rtl::OUString("KB to ") ); - sBuf.append( rtl::OUString::valueOf( nFileSizeDest >> 10 ) ); - sBuf.append( rtl::OUString("KB.") ); + OUStringBuffer sBuf( OUString("Your Presentation has been minimized from:") ); + sBuf.append( OUString::valueOf( nFileSizeSource >> 10 ) ); + sBuf.append( OUString("KB to ") ); + sBuf.append( OUString::valueOf( nFileSizeDest >> 10 ) ); + sBuf.append( OUString("KB.") ); OUString sResult( sBuf.makeStringAndClear() ); SAL_INFO("sdext.minimizer", sResult ); } diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index 4bf3cbdcb84d..69d9a937d84b 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.hxx @@ -61,18 +61,18 @@ public: throw( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); // XDispatchProvider virtual com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( - const com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) + const com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( @@ -91,8 +91,8 @@ public: throw( com::sun::star::uno::RuntimeException ); }; -rtl::OUString PPPOptimizerDialog_getImplementationName(); -com::sun::star::uno::Sequence< rtl::OUString > PPPOptimizerDialog_getSupportedServiceNames(); +OUString PPPOptimizerDialog_getImplementationName(); +com::sun::star::uno::Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > PPPOptimizerDialog_createInstance( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rSMgr ) throw( com::sun::star::uno::Exception ); diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx index e446863f77eb..78ae022b4d9c 100644 --- a/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/sdext/source/minimizer/pppoptimizertoken.cxx @@ -296,7 +296,7 @@ static const TokenTable pTokenTableArray[] = { "NotFound", TK_NotFound } }; -PPPOptimizerTokenEnum TKGet( const rtl::OUString& rToken ) +PPPOptimizerTokenEnum TKGet( const OUString& rToken ) { if ( !pHashMap ) { // init hash map @@ -324,12 +324,12 @@ PPPOptimizerTokenEnum TKGet( const rtl::OUString& rToken ) return eRetValue; } -rtl::OUString TKGet( const PPPOptimizerTokenEnum eToken ) +OUString TKGet( const PPPOptimizerTokenEnum eToken ) { sal_uInt32 i = eToken >= TK_Last ? (sal_uInt32)TK_NotFound : (sal_uInt32)eToken; - return rtl::OUString::createFromAscii( pTokenTableArray[ i ].pS ); + return OUString::createFromAscii( pTokenTableArray[ i ].pS ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx index dee94a585bea..6d97989a1967 100644 --- a/sdext/source/minimizer/pppoptimizertoken.hxx +++ b/sdext/source/minimizer/pppoptimizertoken.hxx @@ -266,8 +266,8 @@ enum PPPOptimizerTokenEnum TK_NotFound }; -PPPOptimizerTokenEnum TKGet( const rtl::OUString& ); -rtl::OUString TKGet( const PPPOptimizerTokenEnum ); +PPPOptimizerTokenEnum TKGet( const OUString& ); +OUString TKGet( const PPPOptimizerTokenEnum ); #endif diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index 6384f6dd3b4b..b08ce1e5d8fe 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.hxx @@ -70,41 +70,41 @@ public : com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > createWindowPeer( com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > xParentPeer ) throw ( com::sun::star::uno::Exception ); - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > insertControlModel( const rtl::OUString& rServiceName, const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::uno::XInterface > insertControlModel( const OUString& rServiceName, const OUString& rName, + const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues ); - void setVisible( const rtl::OUString& rName, sal_Bool bVisible ); + void setVisible( const OUString& rName, sal_Bool bVisible ); - com::sun::star::uno::Reference< com::sun::star::awt::XButton > insertButton( const rtl::OUString& rName, - com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > xActionListener, const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames, + com::sun::star::uno::Reference< com::sun::star::awt::XButton > insertButton( const OUString& rName, + com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > xActionListener, const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XFixedText > insertFixedText( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XFixedText > insertFixedText( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XCheckBox > insertCheckBox( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XCheckBox > insertCheckBox( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XControl > insertFormattedField( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XControl > insertFormattedField( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XComboBox > insertComboBox( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XComboBox > insertComboBox( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XRadioButton > insertRadioButton( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XRadioButton > insertRadioButton( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XListBox > insertListBox( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XListBox > insertListBox( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XControl > insertImage( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XControl > insertImage( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - void setControlProperty( const rtl::OUString& rControlName, const rtl::OUString& rPropertyName, const com::sun::star::uno::Any& rPropertyValue ); - com::sun::star::uno::Any getControlProperty( const rtl::OUString& rControlName, const rtl::OUString& rPropertyName ); + void setControlProperty( const OUString& rControlName, const OUString& rPropertyName, const com::sun::star::uno::Any& rPropertyValue ); + com::sun::star::uno::Any getControlProperty( const OUString& rControlName, const OUString& rPropertyName ); - void enableControl( const rtl::OUString& rControlName ); - void disableControl( const rtl::OUString& rControlName ); + void enableControl( const OUString& rControlName ); + void disableControl( const OUString& rControlName ); com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF; com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController; diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index efe23acab074..032ac5777721 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -95,53 +95,53 @@ namespace { {} void initControls( const uno::Reference& xControls, - const rtl::OUString& rFilename ) + const OUString& rFilename ) { m_xListbox.set(xControls->getControl( - rtl::OUString( "ListBox" )), + OUString( "ListBox" )), uno::UNO_QUERY_THROW ); m_xWriterText.set(xControls->getControl( - rtl::OUString( "InfoWriter" )), + OUString( "InfoWriter" )), uno::UNO_QUERY_THROW ); m_xImpressText.set(xControls->getControl( - rtl::OUString( "InfoImpress" )), + OUString( "InfoImpress" )), uno::UNO_QUERY_THROW ); m_xDrawText.set(xControls->getControl( - rtl::OUString( "InfoDraw" )), + OUString( "InfoDraw" )), uno::UNO_QUERY_THROW ); uno::Reference xControl; xControl.set(xControls->getControl( - rtl::OUString( "ListBoxWriter" )), + OUString( "ListBoxWriter" )), uno::UNO_QUERY_THROW ); xControl->setVisible(sal_False); xControl.set(xControls->getControl( - rtl::OUString( "ListBoxImpress" )), + OUString( "ListBoxImpress" )), uno::UNO_QUERY_THROW ); xControl->setVisible(sal_False); xControl.set(xControls->getControl( - rtl::OUString( "ListBoxDraw" )), + OUString( "ListBoxDraw" )), uno::UNO_QUERY_THROW ); xControl->setVisible(sal_False); uno::Reference xPropSet( xControls->getControl( - rtl::OUString( "ComboLabel" ))->getModel(), + OUString( "ComboLabel" ))->getModel(), uno::UNO_QUERY_THROW ); - rtl::OUString aFilename( rFilename.copy(rFilename.lastIndexOf('/')+1) ); - rtl::OUString aLabel; - xPropSet->getPropertyValue(rtl::OUString( "Label" )) >>= aLabel; + OUString aFilename( rFilename.copy(rFilename.lastIndexOf('/')+1) ); + OUString aLabel; + xPropSet->getPropertyValue(OUString( "Label" )) >>= aLabel; const char pFileName[] = "%FILENAME"; aLabel = aLabel.replaceAt( aLabel.indexOfAsciiL(pFileName,SAL_N_ELEMENTS(pFileName)-1), SAL_N_ELEMENTS(pFileName)-1, aFilename ); - xPropSet->setPropertyValue(rtl::OUString( "Label" ), + xPropSet->setPropertyValue(OUString( "Label" ), uno::makeAny(aLabel)); - uno::Sequence aListboxItems(3); - aListboxItems[DRAW_INDEX] = rtl::OUString( "Drawing" ); - aListboxItems[IMPRESS_INDEX] = rtl::OUString( "Presentation" ); - aListboxItems[WRITER_INDEX] = rtl::OUString( "Text Document" ); + uno::Sequence aListboxItems(3); + aListboxItems[DRAW_INDEX] = OUString( "Drawing" ); + aListboxItems[IMPRESS_INDEX] = OUString( "Presentation" ); + aListboxItems[WRITER_INDEX] = OUString( "Text Document" ); m_xListbox->addItems(aListboxItems,0); m_xListbox->selectItemPos(0,sal_True); @@ -155,7 +155,7 @@ namespace { virtual ::sal_Bool SAL_CALL callHandlerMethod( const uno::Reference< awt::XDialog >& /*xDialog*/, const uno::Any& /*EventObject*/, - const ::rtl::OUString& MethodName ) throw (lang::WrappedTargetException, uno::RuntimeException) + const OUString& MethodName ) throw (lang::WrappedTargetException, uno::RuntimeException) { (void)MethodName; OSL_ENSURE( MethodName.compareToAscii("SelectionChanged") == 0, @@ -164,10 +164,10 @@ namespace { return sal_True; } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedMethodNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getSupportedMethodNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aMethods(1); - aMethods[0] = rtl::OUString( "SelectionChanged" ); + uno::Sequence< OUString > aMethods(1); + aMethods[0] = OUString( "SelectionChanged" ); return aMethods; } }; @@ -183,7 +183,7 @@ private: uno::Reference< io::XOutputStream > m_xOut; public: - FileEmitContext( const rtl::OUString& rOrigFile, + FileEmitContext( const OUString& rOrigFile, const uno::Reference< uno::XComponentContext >& xContext, const pdfparse::PDFContainer* pTop ); virtual ~FileEmitContext(); @@ -196,7 +196,7 @@ public: const uno::Reference< io::XStream >& getContextStream() const { return m_xContextStream; } }; -FileEmitContext::FileEmitContext( const rtl::OUString& rOrigFile, +FileEmitContext::FileEmitContext( const OUString& rOrigFile, const uno::Reference< uno::XComponentContext >& xContext, const pdfparse::PDFContainer* pTop ) : pdfparse::EmitContext( pTop ), @@ -320,7 +320,7 @@ PDFDetector::PDFDetector( const uno::Reference< uno::XComponentContext >& xConte {} // XExtendedFilterDetection -rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException ) +OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException ) { osl::MutexGuard const guard( m_aMutex ); bool bSuccess = false; @@ -328,9 +328,9 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue // get the InputStream carrying the PDF content uno::Reference< io::XInputStream > xInput; uno::Reference< io::XStream > xEmbedStream; - rtl::OUString aOutFilterName, aOutTypeName; - rtl::OUString aURL; - rtl::OUString aPwd; + OUString aOutFilterName, aOutTypeName; + OUString aURL; + OUString aPwd; const beans::PropertyValue* pAttribs = rFilterData.getConstArray(); sal_Int32 nAttribs = rFilterData.getLength(); sal_Int32 nFilterNamePos = -1; @@ -338,11 +338,11 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue for( sal_Int32 i = 0; i < nAttribs; i++ ) { #if OSL_DEBUG_LEVEL > 1 - rtl::OUString aVal( "" ); + OUString aVal( "" ); pAttribs[i].Value >>= aVal; OSL_TRACE( "doDetection: Attrib: %s = %s\n", - rtl::OUStringToOString( pAttribs[i].Name, RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( aVal, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( pAttribs[i].Name, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( aVal, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif if ( pAttribs[i].Name == "InputStream" ) pAttribs[i].Value >>= xInput; @@ -398,7 +398,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { #if OSL_DEBUG_LEVEL > 1 OSL_TRACE( "created temp file %s\n", - rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif osl_writeFile( aFile, aBuf.getConstArray(), nBytes, &nWritten ); @@ -426,7 +426,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue } osl_closeFile( aFile ); } - rtl::OUString aEmbedMimetype; + OUString aEmbedMimetype; xEmbedStream = getAdditionalStream( aURL, aEmbedMimetype, aPwd, m_xContext, rFilterData, false ); if( aFile ) osl_removeFile( aURL.pData ); @@ -434,14 +434,14 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text" ) ) || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text-master" ) ) ) - aOutFilterName = rtl::OUString( "writer_pdf_addstream_import" ); + aOutFilterName = OUString( "writer_pdf_addstream_import" ); else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.presentation" ) - aOutFilterName = rtl::OUString( "impress_pdf_addstream_import" ); + aOutFilterName = OUString( "impress_pdf_addstream_import" ); else if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.graphics" ) ) || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.drawing" ) ) ) - aOutFilterName = rtl::OUString( "draw_pdf_addstream_import" ); + aOutFilterName = OUString( "draw_pdf_addstream_import" ); else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.spreadsheet" ) - aOutFilterName = rtl::OUString( "calc_pdf_addstream_import" ); + aOutFilterName = OUString( "calc_pdf_addstream_import" ); } } @@ -454,19 +454,19 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue nFilterNamePos = nAttribs; rFilterData.realloc( ++nAttribs ); rFilterData[ nFilterNamePos ].Name = - rtl::OUString( "FilterName" ); + OUString( "FilterName" ); } - aOutTypeName = rtl::OUString("pdf_Portable_Document_Format"); + aOutTypeName = OUString("pdf_Portable_Document_Format"); OSL_TRACE( "setting filter name %s, input stream %s\n", - rtl::OUStringToOString( aOutFilterName, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( aOutFilterName, RTL_TEXTENCODING_UTF8 ).getStr(), xEmbedStream.is() ? "present" : "not present" ); rFilterData[nFilterNamePos].Value <<= aOutFilterName; if( xEmbedStream.is() ) { rFilterData.realloc( ++nAttribs ); - rFilterData[nAttribs-1].Name = rtl::OUString( "EmbeddedSubstream" ); + rFilterData[nAttribs-1].Name = OUString( "EmbeddedSubstream" ); rFilterData[nAttribs-1].Value <<= xEmbedStream; } if( !aPwd.isEmpty() ) @@ -475,7 +475,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { nPwdPos = nAttribs; rFilterData.realloc( ++nAttribs ); - rFilterData[ nPwdPos ].Name = rtl::OUString( "Password" ); + rFilterData[ nPwdPos ].Name = OUString( "Password" ); } rFilterData[ nPwdPos ].Value <<= aPwd; } @@ -486,42 +486,42 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { nFilterNamePos = nAttribs; rFilterData.realloc( ++nAttribs ); - rFilterData[ nFilterNamePos ].Name = rtl::OUString( "FilterName" ); + rFilterData[ nFilterNamePos ].Name = OUString( "FilterName" ); } const sal_Int32 nDocumentType = 0; //const sal_Int32 nDocumentType = queryDocumentTypeDialog(m_xContext,aURL); if( nDocumentType < 0 ) { - return rtl::OUString(); + return OUString(); } else switch( nDocumentType ) { case 0: - rFilterData[nFilterNamePos].Value <<= rtl::OUString( "draw_pdf_import" ); + rFilterData[nFilterNamePos].Value <<= OUString( "draw_pdf_import" ); break; case 1: - rFilterData[nFilterNamePos].Value <<= rtl::OUString( "impress_pdf_import" ); + rFilterData[nFilterNamePos].Value <<= OUString( "impress_pdf_import" ); break; case 2: - rFilterData[nFilterNamePos].Value <<= rtl::OUString( "writer_pdf_import" ); + rFilterData[nFilterNamePos].Value <<= OUString( "writer_pdf_import" ); break; default: OSL_FAIL("Unexpected case"); } - aOutTypeName = rtl::OUString("pdf_Portable_Document_Format"); + aOutTypeName = OUString("pdf_Portable_Document_Format"); } } return aOutTypeName; } -bool checkDocChecksum( const rtl::OUString& rInPDFFileURL, +bool checkDocChecksum( const OUString& rInPDFFileURL, sal_uInt32 nBytes, - const rtl::OUString& rChkSum ) + const OUString& rChkSum ) { bool bRet = false; if( rChkSum.getLength() != 2* RTL_DIGEST_LENGTH_MD5 ) @@ -595,19 +595,19 @@ bool checkDocChecksum( const rtl::OUString& rInPDFFileURL, return bRet; } -uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& rInPDFFileURL, - rtl::OUString& rOutMimetype, - rtl::OUString& io_rPwd, +uno::Reference< io::XStream > getAdditionalStream( const OUString& rInPDFFileURL, + OUString& rOutMimetype, + OUString& io_rPwd, const uno::Reference& xContext, const uno::Sequence& rFilterData, bool bMayUseUI ) { uno::Reference< io::XStream > xEmbed; - rtl::OString aPDFFile; - rtl::OUString aSysUPath; + OString aPDFFile; + OUString aSysUPath; if( osl_getSystemPathFromFileURL( rInPDFFileURL.pData, &aSysUPath.pData ) != osl_File_E_None ) return xEmbed; - aPDFFile = rtl::OUStringToOString( aSysUPath, osl_getThreadTextEncoding() ); + aPDFFile = OUStringToOString( aSysUPath, osl_getThreadTextEncoding() ); pdfparse::PDFReader aParser; boost::scoped_ptr pEntry( aParser.read( aPDFFile.getStr() )); @@ -623,9 +623,9 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& if( pTrailer && pTrailer->m_pDict ) { // search document checksum entry - boost::unordered_map< rtl::OString, + boost::unordered_map< OString, pdfparse::PDFEntry*, - rtl::OStringHash >::iterator chk; + OStringHash >::iterator chk; chk = pTrailer->m_pDict->m_aMap.find( "DocChecksum" ); if( chk == pTrailer->m_pDict->m_aMap.end() ) { @@ -640,9 +640,9 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } // search for AdditionalStreams entry - boost::unordered_map< rtl::OString, + boost::unordered_map< OString, pdfparse::PDFEntry*, - rtl::OStringHash >::iterator add_stream; + OStringHash >::iterator add_stream; add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); if( add_stream == pTrailer->m_pDict->m_aMap.end() ) { @@ -657,7 +657,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } // check checksum - rtl::OUString aChkSum = pChkSumName->getFilteredName(); + OUString aChkSum = pChkSumName->getFilteredName(); if( ! checkDocChecksum( rInPDFFileURL, pTrailer->m_nOffset, aChkSum ) ) continue; @@ -679,7 +679,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& bool bAuthenticated = false; if( !io_rPwd.isEmpty() ) { - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + OString aIsoPwd = OUStringToOString( io_rPwd, RTL_TEXTENCODING_ISO_8859_1 ); bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); } @@ -700,13 +700,13 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& break; } - rtl::OUString aDocName( rInPDFFileURL.copy( rInPDFFileURL.lastIndexOf( sal_Unicode('/') )+1 ) ); + OUString aDocName( rInPDFFileURL.copy( rInPDFFileURL.lastIndexOf( sal_Unicode('/') )+1 ) ); bool bEntered = false; do { bEntered = getPassword( xIntHdl, io_rPwd, ! bEntered, aDocName ); - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + OString aIsoPwd = OUStringToOString( io_rPwd, RTL_TEXTENCODING_ISO_8859_1 ); bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); } while( bEntered && ! bAuthenticated ); @@ -732,7 +732,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } OSL_TRACE( "extracted add stream: mimetype %s\n", - rtl::OUStringToOString( rOutMimetype, + OUStringToOString( rOutMimetype, RTL_TEXTENCODING_UTF8 ).getStr()); return xEmbed; } diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx index 42a09f7809f8..d8dc60979c69 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -48,7 +48,7 @@ public: ::com::sun::star::uno::XComponentContext >& xContext ); // XExtendedFilterDetection - virtual rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& io_rDescriptor ) throw (com::sun::star::uno::RuntimeException); }; @@ -82,22 +82,22 @@ public: password */ com::sun::star::uno::Reference< com::sun::star::io::XStream > - getAdditionalStream( const rtl::OUString& rPDFFile, - rtl::OUString& o_rOutMimetype, - rtl::OUString& io_rOutPwd, + getAdditionalStream( const OUString& rPDFFile, + OUString& o_rOutMimetype, + OUString& io_rOutPwd, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData, bool bMayUseUI ); -bool checkDocChecksum( const rtl::OUString& rInPDFFileURL, +bool checkDocChecksum( const OUString& rInPDFFileURL, sal_uInt32 nBytes, - const rtl::OUString& rChkSum ); + const OUString& rChkSum ); bool getPassword( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler, - rtl::OUString& o_rPwd, + OUString& o_rPwd, bool bFirstTry, - const rtl::OUString& i_rDocName + const OUString& i_rDocName ); } diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx index bfa1da5059d8..f7cc7d0b7c0b 100644 --- a/sdext/source/pdfimport/inc/contentsink.hxx +++ b/sdext/source/pdfimport/inc/contentsink.hxx @@ -48,7 +48,7 @@ namespace pdfi { struct FontAttributes { - FontAttributes( const rtl::OUString& familyName_, + FontAttributes( const OUString& familyName_, bool isBold_, bool isItalic_, bool isUnderline_, @@ -71,7 +71,7 @@ namespace pdfi size(0.0) {} - ::rtl::OUString familyName; + OUString familyName; bool isBold; bool isItalic; bool isUnderline; @@ -104,7 +104,7 @@ namespace pdfi virtual void endPage() = 0; virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds, - const ::rtl::OUString& rURI ) = 0; + const OUString& rURI ) = 0; virtual void pushState() = 0; virtual void popState() = 0; @@ -136,7 +136,7 @@ namespace pdfi virtual void intersectEoClip(const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0; - virtual void drawGlyphs( const rtl::OUString& rGlyphs, + virtual void drawGlyphs( const OUString& rGlyphs, const ::com::sun::star::geometry::RealRectangle2D& rRect, const ::com::sun::star::geometry::Matrix2D& rFontMatrix ) = 0; diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index 2db7b555b4cd..d233e134cbfb 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -40,14 +40,14 @@ namespace com { namespace sun { namespace star { namespace task namespace pdfi { - typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap; + typedef boost::unordered_map< OUString, OUString, OUStringHash > PropertyMap; typedef sal_Int32 ImageId; /// What to do with a polygon. values can be ORed together enum PolygonAction { PATH_STROKE=1, PATH_FILL=2, PATH_EOFILL=4 }; - rtl::OUString unitMMString( double fMM ); - rtl::OUString convertPixelToUnitString( double fPix ); + OUString unitMMString( double fMM ); + OUString convertPixelToUnitString( double fPix ); inline double convPx2mm( double fPix ) { @@ -69,7 +69,7 @@ namespace pdfi } /// Convert color to "#FEFEFE" color notation - rtl::OUString getColorString( const ::com::sun::star::rendering::ARGBColor& ); + OUString getColorString( const ::com::sun::star::rendering::ARGBColor& ); struct FontAttrHash { @@ -181,9 +181,9 @@ namespace pdfi */ bool getPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler, - rtl::OUString& rOutPwd, + OUString& rOutPwd, bool bFirstTry, - const rtl::OUString& rDocName + const OUString& rDocName ); void reportUnsupportedEncryptionFormat( diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index e2051c573cd9..f1073c71b70a 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -68,9 +68,9 @@ struct PDFEntry struct PDFComment : public PDFEntry { - rtl::OString m_aComment; + OString m_aComment; - PDFComment( const rtl::OString& rComment ) + PDFComment( const OString& rComment ) : PDFEntry(), m_aComment( rComment ) {} virtual ~PDFComment(); virtual bool emit( EmitContext& rWriteContext ) const; @@ -86,28 +86,28 @@ struct PDFValue : public PDFEntry struct PDFName : public PDFValue { - rtl::OString m_aName; + OString m_aName; - PDFName( const rtl::OString& rName ) + PDFName( const OString& rName ) : PDFValue(), m_aName( rName ) {} virtual ~PDFName(); virtual bool emit( EmitContext& rWriteContext ) const; virtual PDFEntry* clone() const; - rtl::OUString getFilteredName() const; + OUString getFilteredName() const; }; struct PDFString : public PDFValue { - rtl::OString m_aString; + OString m_aString; - PDFString( const rtl::OString& rString ) + PDFString( const OString& rString ) : PDFValue(), m_aString( rString ) {} virtual ~PDFString(); virtual bool emit( EmitContext& rWriteContext ) const; virtual PDFEntry* clone() const; - rtl::OString getFilteredString() const; + OString getFilteredString() const; }; struct PDFNumber : public PDFValue @@ -180,7 +180,7 @@ struct PDFArray : public PDFContainer struct PDFDict : public PDFContainer { - typedef boost::unordered_map Map; + typedef boost::unordered_map Map; Map m_aMap; PDFDict() {} @@ -190,9 +190,9 @@ struct PDFDict : public PDFContainer // inserting a value of NULL will remove rName and the previous value // from the dictionary - void insertValue( const rtl::OString& rName, PDFEntry* pValue ); + void insertValue( const OString& rName, PDFEntry* pValue ); // removes a name/value pair from the dict - void eraseValue( const rtl::OString& rName ); + void eraseValue( const OString& rName ); // builds new map as of sub elements // returns NULL if successful, else the first offending element PDFEntry* buildMap(); @@ -250,13 +250,13 @@ struct PDFFile : public PDFContainer // this method checks whether rPwd is compatible with // either user or owner password and sets up decrypt data in that case // returns true if decryption can be done - bool setupDecryptionData( const rtl::OString& rPwd ) const; + bool setupDecryptionData( const OString& rPwd ) const; bool decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen, sal_uInt8* pOutBuffer, unsigned int nObject, unsigned int nGeneration ) const; - rtl::OUString getDecryptionKey() const; + OUString getDecryptionKey() const; }; struct PDFObject : public PDFContainer diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx index 72c8fed8a7d2..1b9c5c3f3e81 100644 --- a/sdext/source/pdfimport/inc/wrapper.hxx +++ b/sdext/source/pdfimport/inc/wrapper.hxx @@ -35,11 +35,11 @@ namespace com { namespace sun { namespace star { namespace pdfi { - bool xpdf_ImportFromFile( const rtl::OUString& rURL, + bool xpdf_ImportFromFile( const OUString& rURL, const ContentSinkSharedPtr& rSink, const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); bool xpdf_ImportFromStream( const com::sun::star::uno::Reference< @@ -47,7 +47,7 @@ namespace pdfi const ContentSinkSharedPtr& rSink, const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); } diff --git a/sdext/source/pdfimport/inc/xmlemitter.hxx b/sdext/source/pdfimport/inc/xmlemitter.hxx index 6beb96c1f990..800196794912 100644 --- a/sdext/source/pdfimport/inc/xmlemitter.hxx +++ b/sdext/source/pdfimport/inc/xmlemitter.hxx @@ -39,7 +39,7 @@ namespace pdfi virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) = 0; /** Write PCTEXT as-is to output */ - virtual void write( const rtl::OUString& rString ) = 0; + virtual void write( const OUString& rString ) = 0; /** Close previously opened tag */ virtual void endTag( const char* pTag ) = 0; diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx index 64422419f2cc..eaa6304274c2 100644 --- a/sdext/source/pdfimport/misc/pdfihelper.cxx +++ b/sdext/source/pdfimport/misc/pdfihelper.cxx @@ -26,9 +26,9 @@ using namespace pdfi; using namespace com::sun::star; -rtl::OUString pdfi::getColorString( const rendering::ARGBColor& rCol ) +OUString pdfi::getColorString( const rendering::ARGBColor& rCol ) { - rtl::OUStringBuffer aBuf( 7 ); + OUStringBuffer aBuf( 7 ); const sal_uInt8 nRed ( sal::static_int_cast( basegfx::fround( rCol.Red * 255.0 ) ) ); const sal_uInt8 nGreen( sal::static_int_cast( basegfx::fround( rCol.Green * 255.0 ) ) ); const sal_uInt8 nBlue ( sal::static_int_cast( basegfx::fround( rCol.Blue * 255.0 ) ) ); @@ -49,18 +49,18 @@ rtl::OUString pdfi::getColorString( const rendering::ARGBColor& rCol ) return aBuf.makeStringAndClear(); } -rtl::OUString pdfi::unitMMString( double fMM ) +OUString pdfi::unitMMString( double fMM ) { - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( rtl_math_round( fMM, 2, rtl_math_RoundingMode_Floor ) ); aBuf.appendAscii( "mm" ); return aBuf.makeStringAndClear(); } -rtl::OUString pdfi::convertPixelToUnitString( double fPix ) +OUString pdfi::convertPixelToUnitString( double fPix ) { - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( rtl_math_round( convPx2mm( fPix ), 2, rtl_math_RoundingMode_Floor ) ); aBuf.appendAscii( "mm" ); diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 977690a50a87..6e7d0040b725 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -50,19 +50,19 @@ class PDFPasswordRequest: private: mutable osl::Mutex m_aMutex; uno::Any m_aRequest; - rtl::OUString m_aPassword; + OUString m_aPassword; bool m_bSelected; public: - explicit PDFPasswordRequest(bool bFirstTry, const rtl::OUString& rName); + explicit PDFPasswordRequest(bool bFirstTry, const OUString& rName); // XInteractionRequest virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException); virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw (uno::RuntimeException); // XInteractionPassword - virtual void SAL_CALL setPassword( const rtl::OUString& rPwd ) throw (uno::RuntimeException); - virtual rtl::OUString SAL_CALL getPassword() throw (uno::RuntimeException); + virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException); + virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException); // XInteractionContinuation virtual void SAL_CALL select() throw (uno::RuntimeException); @@ -73,7 +73,7 @@ private: virtual ~PDFPasswordRequest() {} }; -PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const rtl::OUString& rName ) : +PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const OUString& rName ) : m_aRequest( uno::makeAny( task::DocumentPasswordRequest( @@ -98,14 +98,14 @@ uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordReq return aRet; } -void PDFPasswordRequest::setPassword( const rtl::OUString& rPwd ) throw (uno::RuntimeException) +void PDFPasswordRequest::setPassword( const OUString& rPwd ) throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); m_aPassword = rPwd; } -rtl::OUString PDFPasswordRequest::getPassword() throw (uno::RuntimeException) +OUString PDFPasswordRequest::getPassword() throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); @@ -151,9 +151,9 @@ namespace pdfi { bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, - rtl::OUString& rOutPwd, + OUString& rOutPwd, bool bFirstTry, - const rtl::OUString& rDocName + const OUString& rDocName ) { bool bSuccess = false; diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index 10df3ac8243d..540d6476931e 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -42,7 +42,7 @@ public: explicit OdfEmitter( const uno::Reference& xOutput ); virtual void beginTag( const char* pTag, const PropertyMap& rProperties ); - virtual void write( const rtl::OUString& rString ); + virtual void write( const OUString& rString ); virtual void endTag( const char* pTag ); }; @@ -54,7 +54,7 @@ OdfEmitter::OdfEmitter( const uno::Reference& xOutput ) : OSL_PRECOND(m_xOutput.is(), "OdfEmitter(): invalid output stream"); m_aLineFeed[0] = '\n'; - rtl::OUStringBuffer aElement; + OUStringBuffer aElement; aElement.appendAscii(""); write(aElement.makeStringAndClear()); } @@ -63,17 +63,17 @@ void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) { OSL_PRECOND(pTag,"Invalid tag string"); - rtl::OUStringBuffer aElement; + OUStringBuffer aElement; aElement.appendAscii("<"); aElement.appendAscii(pTag); aElement.appendAscii(" "); - std::vector aAttributes; + std::vector aAttributes; PropertyMap::const_iterator aCurr(rProperties.begin()); const PropertyMap::const_iterator aEnd(rProperties.end()); while( aCurr != aEnd ) { - rtl::OUStringBuffer aAttribute; + OUStringBuffer aAttribute; aAttribute.append(aCurr->first); aAttribute.appendAscii("=\""); aAttribute.append(aCurr->second); @@ -88,8 +88,8 @@ void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) std::sort(aAttributes.begin(), aAttributes.end()); std::for_each(aAttributes.begin(), aAttributes.end(), - boost::bind( (rtl::OUStringBuffer& (rtl::OUStringBuffer::*)(const rtl::OUString&)) - (&rtl::OUStringBuffer::append), + boost::bind( (OUStringBuffer& (OUStringBuffer::*)(const OUString&)) + (&OUStringBuffer::append), boost::ref(aElement), _1 )); aElement.appendAscii(">"); @@ -97,9 +97,9 @@ void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) write(aElement.makeStringAndClear()); } -void OdfEmitter::write( const rtl::OUString& rText ) +void OdfEmitter::write( const OUString& rText ) { - const rtl::OString aStr = rtl::OUStringToOString(rText,RTL_TEXTENCODING_UTF8); + const OString aStr = OUStringToOString(rText,RTL_TEXTENCODING_UTF8); const sal_Int32 nLen( aStr.getLength() ); m_aBuf.realloc( nLen ); const sal_Char* pStr = aStr.getStr(); @@ -111,7 +111,7 @@ void OdfEmitter::write( const rtl::OUString& rText ) void OdfEmitter::endTag( const char* pTag ) { - rtl::OUStringBuffer aElement; + OUStringBuffer aElement; aElement.appendAscii(""); diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 92a2376585fb..344845b76534 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -62,14 +62,14 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert if( m_xModel.is() ) { uno::Reference< io::XStream > xSubStream; - rtl::OUString aPwd; + OUString aPwd; const beans::PropertyValue* pAttribs = rFilterData.getConstArray(); sal_Int32 nAttribs = rFilterData.getLength(); sal_Int32 nPwPos = -1; for( sal_Int32 i = 0; i < nAttribs; i++ ) { #if OSL_DEBUG_LEVEL > 1 - rtl::OUString aVal( "" ); + OUString aVal( "" ); pAttribs[i].Value >>= aVal; SAL_INFO("sdext.pdfimport", "filter: Attrib: " << pAttribs[i].Name << " = " << aVal << "\n"); #endif @@ -101,7 +101,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert xSeek->seek( 0 ); oslFileHandle aFile = NULL; sal_uInt64 nWritten = 0; - rtl::OUString aURL; + OUString aURL; if( osl_createTempFile( NULL, &aFile, &aURL.pData ) == osl_File_E_None ) { SAL_INFO("sdext.pdfimport", "created temp file " << aURL); @@ -125,8 +125,8 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert osl_closeFile( aFile ); if( xInput.is() ) { - rtl::OUString aEmbedMimetype; - rtl::OUString aOrgPwd( aPwd ); + OUString aEmbedMimetype; + OUString aOrgPwd( aPwd ); xSubStream = getAdditionalStream( aURL, aEmbedMimetype, aPwd, m_xContext, rFilterData, true ); if( aOrgPwd != aPwd ) bAddPwdProp = true; @@ -148,7 +148,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert try { xSubFilter = uno::Reference( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - rtl::OUString( "com.sun.star.document.OwnSubFilter" ), + OUString( "com.sun.star.document.OwnSubFilter" ), aArgs, m_xContext ), uno::UNO_QUERY ); @@ -169,7 +169,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert { nPwPos = aFilterData.getLength(); aFilterData.realloc( nPwPos+1 ); - aFilterData[nPwPos].Name = rtl::OUString( "Password" ); + aFilterData[nPwPos].Name = OUString( "Password" ); } aFilterData[nPwPos].Value <<= aPwd; bRet = xSubFilter->filter( aFilterData ); @@ -222,10 +222,10 @@ void PDFIRawAdaptor::setTreeVisitorFactory(const TreeVisitorFactorySharedPtr& rV bool PDFIRawAdaptor::parse( const uno::Reference& xInput, const uno::Reference& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const uno::Reference& xStatus, const XmlEmitterSharedPtr& rEmitter, - const rtl::OUString& rURL ) + const OUString& rURL ) { // container for metaformat boost::shared_ptr pSink( @@ -248,14 +248,14 @@ bool PDFIRawAdaptor::parse( const uno::Reference& xInput return bSuccess; } -bool PDFIRawAdaptor::odfConvert( const rtl::OUString& rURL, +bool PDFIRawAdaptor::odfConvert( const OUString& rURL, const uno::Reference& xOutput, const uno::Reference& xStatus ) { XmlEmitterSharedPtr pEmitter = createOdfEmitter(xOutput); const bool bSuccess = parse(uno::Reference(), uno::Reference(), - rtl::OUString(), + OUString(), xStatus,pEmitter,rURL); // tell input stream that it is no longer needed @@ -267,14 +267,14 @@ bool PDFIRawAdaptor::odfConvert( const rtl::OUString& r // XImportFilter sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::PropertyValue >& rSourceData, const uno::Reference< xml::sax::XDocumentHandler >& rHdl, - const uno::Sequence< rtl::OUString >& /*rUserData*/ ) throw( uno::RuntimeException ) + const uno::Sequence< OUString >& /*rUserData*/ ) throw( uno::RuntimeException ) { // get the InputStream carrying the PDF content uno::Reference< io::XInputStream > xInput; uno::Reference< task::XStatusIndicator > xStatus; uno::Reference< task::XInteractionHandler > xInteractionHandler; - rtl::OUString aURL; - rtl::OUString aPwd; + OUString aURL; + OUString aPwd; const beans::PropertyValue* pAttribs = rSourceData.getConstArray(); sal_Int32 nAttribs = rSourceData.getLength(); for( sal_Int32 i = 0; i < nAttribs; i++, pAttribs++ ) diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx index 22197d384942..c41cb2954602 100644 --- a/sdext/source/pdfimport/pdfiadaptor.hxx +++ b/sdext/source/pdfimport/pdfiadaptor.hxx @@ -85,10 +85,10 @@ namespace pdfi bool parse( const com::sun::star::uno::Reference& xInput, const com::sun::star::uno::Reference& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const com::sun::star::uno::Reference& xStatus, const XmlEmitterSharedPtr& rEmitter, - const rtl::OUString& rURL ); + const OUString& rURL ); public: explicit PDFIRawAdaptor( const ::com::sun::star::uno::Reference< @@ -112,14 +112,14 @@ namespace pdfi @param xStatus Optional status indicator */ - bool odfConvert( const rtl::OUString& rURL, + bool odfConvert( const OUString& rURL, const com::sun::star::uno::Reference& xOutput, const com::sun::star::uno::Reference& xStatus ); // XImportFilter virtual sal_Bool SAL_CALL importer( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rSourceData, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& rHdl, - const com::sun::star::uno::Sequence< rtl::OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException ); + const com::sun::star::uno::Sequence< OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException ); // XImporter virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument ) diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 4ce780455f45..b9120ed4a077 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -38,10 +38,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringHash; -using ::rtl::OStringBuffer; namespace pdfparse @@ -350,7 +346,7 @@ PDFNumber::~PDFNumber() bool PDFNumber::emit( EmitContext& rWriteContext ) const { - rtl::OStringBuffer aBuf( 32 ); + OStringBuffer aBuf( 32 ); aBuf.append( ' ' ); double fValue = m_fValue; @@ -998,7 +994,7 @@ bool PDFTrailer::emit( EmitContext& rWriteContext ) const return false; if( ! rWriteContext.write( "startxref\n", 10 ) ) return false; - rtl::OString aOffset( rtl::OString::valueOf( sal_Int32(nXRefPos) ) ); + OString aOffset( OString::valueOf( sal_Int32(nXRefPos) ) ); if( ! rWriteContext.write( aOffset.getStr(), aOffset.getLength() ) ) return false; return rWriteContext.write( "\n%%EOF\n", 7 ); @@ -1277,9 +1273,9 @@ bool PDFFile::setupDecryptionData( const OString& rPwd ) const return bValid; } -rtl::OUString PDFFile::getDecryptionKey() const +OUString PDFFile::getDecryptionKey() const { - rtl::OUStringBuffer aBuf( ENCRYPTION_KEY_LEN * 2 ); + OUStringBuffer aBuf( ENCRYPTION_KEY_LEN * 2 ); if( impl_getData()->m_bIsEncrypted ) { for( sal_uInt32 i = 0; i < m_pData->m_nKeyLength; i++ ) diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 9d68e43be524..b50e60e10303 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -47,8 +47,6 @@ using namespace boost::spirit; using namespace pdfparse; -using ::rtl::OString; -using ::rtl::OStringBuffer; class StringEmitContext : public EmitContext { @@ -94,7 +92,7 @@ public: double m_fDouble; std::vector< unsigned int > m_aUIntStack; std::vector< PDFEntry* > m_aObjectStack; - rtl::OString m_aErrorString; + OString m_aErrorString; iteratorT m_aGlobalBegin; public: @@ -279,9 +277,9 @@ public: throw_( pLocation, pMessage ); } - rtl::OString iteratorToString( iteratorT first, iteratorT last ) const + OString iteratorToString( iteratorT first, iteratorT last ) const { - rtl::OStringBuffer aStr( 32 ); + OStringBuffer aStr( 32 ); while( first != last ) { aStr.append( *first ); diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx index f9204407d506..0a856ea29de1 100644 --- a/sdext/source/pdfimport/sax/emitcontext.cxx +++ b/sdext/source/pdfimport/sax/emitcontext.cxx @@ -52,10 +52,10 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc static const char* pDir = getenv( "DBG_PDFIMPORT_DIR" ); if( pDir ) { - rtl::OUString aStr( rtl::OStringToOUString( pDir, RTL_TEXTENCODING_UTF8 ) ); - rtl::OUString aFileURL; + OUString aStr( OStringToOUString( pDir, RTL_TEXTENCODING_UTF8 ) ); + OUString aFileURL; osl_getFileURLFromSystemPath( aStr.pData, &aFileURL.pData ); - rtl::OUStringBuffer aBuf( 256 ); + OUStringBuffer aBuf( 256 ); aBuf.append( aFileURL ); aBuf.appendAscii( "/pdfimport.xml" ); pStream = new osl::File( aBuf.makeStringAndClear() ); @@ -91,7 +91,7 @@ SaxEmitter::~SaxEmitter() void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) { - rtl::OUString aTag = rtl::OUString::createFromAscii( pTag ); + OUString aTag = OUString::createFromAscii( pTag ); uno::Reference< xml::sax::XAttributeList > xAttr( new SaxAttrList( rProperties ) ); try @@ -108,15 +108,15 @@ void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) for( int i = 0; i < nIndent; i++ ) pStream->write( " ", 4, nWritten ); - rtl::OStringBuffer aBuf( 1024 ); + OStringBuffer aBuf( 1024 ); aBuf.append( '<' ); aBuf.append( pTag ); for( PropertyMap::const_iterator it = rProperties.begin(); it != rProperties.end(); ++it ) { aBuf.append( ' ' ); - aBuf.append( rtl::OUStringToOString( it->first, RTL_TEXTENCODING_UTF8 ) ); + aBuf.append( OUStringToOString( it->first, RTL_TEXTENCODING_UTF8 ) ); aBuf.append( "=\"" ); - aBuf.append( rtl::OUStringToOString( it->second, RTL_TEXTENCODING_UTF8 ) ); + aBuf.append( OUStringToOString( it->second, RTL_TEXTENCODING_UTF8 ) ); aBuf.append( "\"" ); } aBuf.append( ">\n" ); @@ -126,7 +126,7 @@ void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) #endif } -void SaxEmitter::write( const rtl::OUString& rText ) +void SaxEmitter::write( const OUString& rText ) { try { @@ -138,7 +138,7 @@ void SaxEmitter::write( const rtl::OUString& rText ) #if OSL_DEBUG_LEVEL > 1 if( pStream ) { - rtl::OString aStr( rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8 ) ); + OString aStr( OUStringToOString( rText, RTL_TEXTENCODING_UTF8 ) ); sal_uInt64 nWritten = 0; pStream->write( aStr.getStr(), aStr.getLength(), nWritten ); } @@ -147,7 +147,7 @@ void SaxEmitter::write( const rtl::OUString& rText ) void SaxEmitter::endTag( const char* pTag ) { - rtl::OUString aTag = rtl::OUString::createFromAscii( pTag ); + OUString aTag = OUString::createFromAscii( pTag ); try { m_xDocHdl->endElement( aTag ); @@ -162,7 +162,7 @@ void SaxEmitter::endTag( const char* pTag ) for( int i = 0; i < nIndent; i++ ) pStream->write( " ", 4, nWritten ); - rtl::OStringBuffer aBuf( 1024 ); + OStringBuffer aBuf( 1024 ); aBuf.append( "\n" ); diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx index 635944cb3537..2d70ca32f16d 100644 --- a/sdext/source/pdfimport/sax/emitcontext.hxx +++ b/sdext/source/pdfimport/sax/emitcontext.hxx @@ -41,7 +41,7 @@ namespace pdfi ~SaxEmitter(); virtual void beginTag( const char* pTag, const PropertyMap& rProperties ); - virtual void write( const rtl::OUString& rString ); + virtual void write( const OUString& rString ); virtual void endTag( const char* pTag ); }; } diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx index c31ef1409111..056dfcbdb342 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -23,12 +23,12 @@ namespace pdfi { -SaxAttrList::SaxAttrList( const boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& rMap ) +SaxAttrList::SaxAttrList( const boost::unordered_map< OUString, OUString, OUStringHash >& rMap ) { m_aAttributes.reserve(rMap.size()); - for( boost::unordered_map< rtl::OUString, - rtl::OUString, - rtl::OUStringHash >::const_iterator it = rMap.begin(); + for( boost::unordered_map< OUString, + OUString, + OUStringHash >::const_iterator it = rMap.begin(); it != rMap.end(); ++it ) { m_aIndexMap[ it->first ] = m_aAttributes.size(); @@ -48,9 +48,9 @@ SaxAttrList::~SaxAttrList() } namespace { - static const rtl::OUString& getCDATAString() + static const OUString& getCDATAString() { - static rtl::OUString aStr( "CDATA" ); + static OUString aStr( "CDATA" ); return aStr; } } @@ -59,30 +59,30 @@ sal_Int16 SAL_CALL SaxAttrList::getLength() throw() { return sal_Int16(m_aAttributes.size()); } -rtl::OUString SAL_CALL SaxAttrList::getNameByIndex( sal_Int16 i_nIndex ) throw() +OUString SAL_CALL SaxAttrList::getNameByIndex( sal_Int16 i_nIndex ) throw() { - return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aName : rtl::OUString(); + return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aName : OUString(); } -rtl::OUString SAL_CALL SaxAttrList::getTypeByIndex( sal_Int16 i_nIndex) throw() +OUString SAL_CALL SaxAttrList::getTypeByIndex( sal_Int16 i_nIndex) throw() { - return (i_nIndex < sal_Int16(m_aAttributes.size())) ? getCDATAString() : rtl::OUString(); + return (i_nIndex < sal_Int16(m_aAttributes.size())) ? getCDATAString() : OUString(); } -rtl::OUString SAL_CALL SaxAttrList::getTypeByName( const ::rtl::OUString& i_rName ) throw() +OUString SAL_CALL SaxAttrList::getTypeByName( const OUString& i_rName ) throw() { - return (m_aIndexMap.find( i_rName ) != m_aIndexMap.end()) ? getCDATAString() : rtl::OUString(); + return (m_aIndexMap.find( i_rName ) != m_aIndexMap.end()) ? getCDATAString() : OUString(); } -rtl::OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw() +OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw() { - return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aValue : rtl::OUString(); + return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aValue : OUString(); } -rtl::OUString SAL_CALL SaxAttrList::getValueByName(const ::rtl::OUString& i_rName) throw() +OUString SAL_CALL SaxAttrList::getValueByName(const OUString& i_rName) throw() { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); - return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : rtl::OUString(); + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); + return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : OUString(); } com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL SaxAttrList::createClone() throw() diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index 408f9baec66a..f4866de2a36a 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -37,28 +37,28 @@ namespace pdfi { struct AttrEntry { - rtl::OUString m_aName; - rtl::OUString m_aValue; + OUString m_aName; + OUString m_aValue; - AttrEntry( const rtl::OUString& i_rName, const rtl::OUString& i_rValue ) + AttrEntry( const OUString& i_rName, const OUString& i_rValue ) : m_aName( i_rName ), m_aValue( i_rValue ) {} }; std::vector< AttrEntry > m_aAttributes; - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > m_aIndexMap; + boost::unordered_map< OUString, size_t, OUStringHash > m_aIndexMap; public: SaxAttrList() {} - SaxAttrList( const boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& ); + SaxAttrList( const boost::unordered_map< OUString, OUString, OUStringHash >& ); SaxAttrList( const SaxAttrList& ); virtual ~SaxAttrList(); // ::com::sun::star::xml::sax::XAttributeList virtual sal_Int16 SAL_CALL getLength() throw(); - virtual rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(); - virtual rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(); - virtual rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) throw(); - virtual rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(); - virtual rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) throw(); + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(); + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(); + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(); + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(); + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(); // ::com::sun::star::util::XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(); diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 9b186757cfb7..75c6e0649e0f 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -115,7 +115,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdfimport_component_getFactory( SAL_UNUSED_PARAMETER void* /*pServiceManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) { - ::rtl::OUString sImplementationName( ::rtl::OUString::createFromAscii( pImplementationName ) ); + OUString sImplementationName( OUString::createFromAscii( pImplementationName ) ); Reference< XSingleComponentFactory > xFactory; @@ -124,8 +124,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdfimport_component_getFactory( { if ( 0 == sImplementationName.compareToAscii( pComponents->pAsciiImplementationName ) ) { - Sequence< ::rtl::OUString > sServices(1); - sServices[0] = ::rtl::OUString::createFromAscii( pComponents->pAsciiServiceName ); + Sequence< OUString > sServices(1); + sServices[0] = OUString::createFromAscii( pComponents->pAsciiServiceName ); xFactory = ::cppu::createSingleComponentFactory( pComponents->pFactory, diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx index 5272ee120621..bac32f2da2c1 100644 --- a/sdext/source/pdfimport/test/outputwrap.hxx +++ b/sdext/source/pdfimport/test/outputwrap.hxx @@ -38,7 +38,7 @@ typedef ::cppu::WeakComponentImplHelper1< public: - explicit OutputWrap( const rtl::OUString& rURL ) : OutputWrapBase(m_aMutex), maFile(rURL) + explicit OutputWrap( const OUString& rURL ) : OutputWrapBase(m_aMutex), maFile(rURL) { maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write); } diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx index 71e9f633a195..d18bfa07c210 100644 --- a/sdext/source/pdfimport/test/pdf2xml.cxx +++ b/sdext/source/pdfimport/test/pdf2xml.cxx @@ -40,7 +40,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if( argc != 5 ) return 1; - ::rtl::OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; + OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; TreeVisitorFactorySharedPtr pTreeFactory; if( rtl_str_compare(argv[1], "-writer") == 0 ) @@ -53,15 +53,15 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 1; osl_getProcessWorkingDir(&aBaseURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[2]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[2]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aSrcURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[3]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[3]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aDstURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[4]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[4]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aIniUrl.pData); diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx index 0e2016b9ab1f..5558e0cb7e38 100644 --- a/sdext/source/pdfimport/test/pdfunzip.cxx +++ b/sdext/source/pdfimport/test/pdfunzip.cxx @@ -30,10 +30,6 @@ using namespace pdfparse; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; void printHelp( const char* pExe ) { @@ -268,7 +264,7 @@ int write_addStreamArray( const char* pOutFile, PDFArray* pStreams, PDFFile* pPD PDFObject* pObject = pPDFFile->findObject( pStreamRef->m_nNumber, pStreamRef->m_nGeneration ); if( pObject ) { - rtl::OStringBuffer aOutStream( pOutFile ); + OStringBuffer aOutStream( pOutFile ); aOutStream.append( "_stream_" ); aOutStream.append( sal_Int32(pStreamRef->m_nNumber) ); aOutStream.append( "_" ); @@ -300,7 +296,7 @@ int write_addStreams( const char* pInFile, const char* pOutFile, PDFFile* pPDFFi if( pTrailer && pTrailer->m_pDict ) { // search for AdditionalStreams entry - boost::unordered_map::iterator add_stream; + boost::unordered_map::iterator add_stream; add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); if( add_stream != pTrailer->m_pDict->m_aMap.end() ) { @@ -327,7 +323,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF if( ! pDict ) continue; - boost::unordered_map::iterator map_it = + boost::unordered_map::iterator map_it = pDict->m_aMap.find( "Type" ); if( map_it == pDict->m_aMap.end() ) continue; @@ -346,7 +342,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF pName = dynamic_cast(map_it->second); if( ! pName ) continue; - rtl::OString aFontName( pName->m_aName ); + OString aFontName( pName->m_aName ); PDFObjectRef* pStreamRef = 0; const char* pFileType = NULL; @@ -378,7 +374,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF if( ! pStream ) continue; - rtl::OStringBuffer aOutStream( i_pOutFile ); + OStringBuffer aOutStream( i_pOutFile ); aOutStream.append( "_font_" ); aOutStream.append( sal_Int32(pStreamRef->m_nNumber) ); aOutStream.append( "_" ); @@ -414,7 +410,7 @@ int write_objects( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPD continue; } - rtl::OStringBuffer aOutStream( i_pOutFile ); + OStringBuffer aOutStream( i_pOutFile ); aOutStream.append( "_stream_" ); aOutStream.append( nObject ); aOutStream.append( "_" ); @@ -472,11 +468,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) nArg++; if( nArg < argc ) { - rtl::OString aObjs( argv[nArg] ); + OString aObjs( argv[nArg] ); sal_Int32 nIndex = 0; while( nIndex != -1 ) { - rtl::OString aToken( aObjs.getToken( 0, ',', nIndex ) ); + OString aToken( aObjs.getToken( 0, ',', nIndex ) ); sal_Int32 nObject = 0; sal_Int32 nGeneration = 0; sal_Int32 nGenIndex = 0; diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 226c1d8cc6a2..ec3681011626 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -96,17 +96,17 @@ namespace rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) && rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) && rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString("http://download.openoffice.org/") ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, OUString("http://download.openoffice.org/") ); const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n" "Hyperlink, this is\n?\nThis is more text\noutline mode\n?\nNew paragraph\n"; - ::rtl::OString aTmp; + OString aTmp; m_aTextOut.makeStringAndClear().convertToString( &aTmp, RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Imported text is \"This is a testtext New paragraph, new line" " Hyperlink, this is * This is more text outline mode * New paragraph\"", - rtl::OString(sText), aTmp ); + OString(sText), aTmp ); CPPUNIT_ASSERT_MESSAGE( "red circle seen in input", m_bRedCircleSeen ); CPPUNIT_ASSERT_MESSAGE( "green stroke seen in input", m_bGreenStrokeSeen ); @@ -133,7 +133,7 @@ namespace } virtual void hyperLink( const geometry::RealRectangle2D& rBounds, - const ::rtl::OUString& rURI ) + const OUString& rURI ) { m_aHyperlinkBounds = rBounds; m_aURI = rURI; @@ -346,7 +346,7 @@ namespace getCurrentContext().Clip = aNewClip; } - virtual void drawGlyphs( const rtl::OUString& rGlyphs, + virtual void drawGlyphs( const OUString& rGlyphs, const geometry::RealRectangle2D& /*rRect*/, const geometry::Matrix2D& /*rFontMatrix*/ ) { @@ -355,7 +355,7 @@ namespace virtual void endText() { - m_aTextOut.append( ::rtl::OUString("\n") ); + m_aTextOut.append( OUString("\n") ); } virtual void drawMask(const uno::Sequence& xBitmap, @@ -443,8 +443,8 @@ namespace GraphicsContextStack m_aGCStack; geometry::RealSize2D m_aPageSize; geometry::RealRectangle2D m_aHyperlinkBounds; - ::rtl::OUString m_aURI; - ::rtl::OUStringBuffer m_aTextOut; + OUString m_aURI; + OUStringBuffer m_aTextOut; sal_Int32 m_nNumPages; bool m_bPageEnded; bool m_bRedCircleSeen; @@ -461,7 +461,7 @@ namespace pdfi::xpdf_ImportFromFile( getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"), pSink, uno::Reference< task::XInteractionHandler >(), - rtl::OUString(), + OUString(), getComponentContext() ); // make destruction explicit, a bunch of things are @@ -474,7 +474,7 @@ namespace pdfi::PDFIRawAdaptor aAdaptor( getComponentContext() ); aAdaptor.setTreeVisitorFactory( createDrawTreeVisitorFactory() ); - ::rtl::OUString tempFileURL; + OUString tempFileURL; CPPUNIT_ASSERT( osl::File::createTempFile( NULL, NULL, &tempFileURL ) == osl::File::E_None ); osl::File::remove( tempFileURL ); // FIXME the below apparently fails silently if the file already exists CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", @@ -489,7 +489,7 @@ namespace pdfi::PDFIRawAdaptor aAdaptor( getComponentContext() ); aAdaptor.setTreeVisitorFactory( createWriterTreeVisitorFactory() ); - ::rtl::OUString tempFileURL; + OUString tempFileURL; CPPUNIT_ASSERT( osl::File::createTempFile( NULL, NULL, &tempFileURL ) == osl::File::E_None ); osl::File::remove( tempFileURL ); // FIXME the below apparently fails silently if the file already exists CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 421728b71cca..514401586fb2 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -94,17 +94,17 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons if( ! elem.Text.getLength() ) return; - rtl::OUString strSpace(32); - rtl::OUString strNbSpace(160); - rtl::OUString tabSpace(0x09); + OUString strSpace(32); + OUString strNbSpace(160); + OUString tabSpace(0x09); PropertyMap aProps; if( elem.StyleId != -1 ) { - aProps[ rtl::OUString( "text:style-name" ) ] = + aProps[ OUString( "text:style-name" ) ] = m_rEmitContext.rStyles.getStyleName( elem.StyleId ); } - rtl::OUString str(elem.Text.getStr()); + OUString str(elem.Text.getStr()); // Check for RTL bool isRTL = false; @@ -130,7 +130,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons for(int i=0; i< elem.Text.getLength(); i++) { - rtl::OUString strToken= str.copy(i,1) ; + OUString strToken= str.copy(i,1) ; if( strSpace.equals(strToken) || strNbSpace.equals(strToken)) { aProps[ "text:c" ] = "1"; @@ -191,7 +191,7 @@ void DrawXmlEmitter::fillFrameProps( DrawElement& rElem, { double rel_x = rElem.x, rel_y = rElem.y; - rProps[ "draw:z-index" ] = rtl::OUString::valueOf( rElem.ZOrder ); + rProps[ "draw:z-index" ] = OUString::valueOf( rElem.ZOrder ); rProps[ "draw:style-name"] = rEmitContext.rStyles.getStyleName( rElem.StyleId ); rProps[ "svg:width" ] = convertPixelToUnitString( rElem.w ); rProps[ "svg:height" ] = convertPixelToUnitString( rElem.h ); @@ -210,7 +210,7 @@ void DrawXmlEmitter::fillFrameProps( DrawElement& rElem, rGC.Transformation.decompose( aScale, aTranslation, fRotate, fShearX ); - rtl::OUStringBuffer aBuf( 256 ); + OUStringBuffer aBuf( 256 ); // TODO(F2): general transformation case missing; if implemented, note // that ODF rotation is oriented the other way @@ -329,7 +329,7 @@ void DrawXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >:: // so we need to tell fillFrameProps here that the transformation for // a PolyPolyElement was already applied (aside form translation) fillFrameProps( elem, aProps, m_rEmitContext, true ); - rtl::OUStringBuffer aBuf( 64 ); + OUStringBuffer aBuf( 64 ); aBuf.appendAscii( "0 0 " ); aBuf.append( convPx2mmPrec2(elem.w)*100.0 ); aBuf.append( sal_Unicode(' ') ); @@ -696,7 +696,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent) { TextElement* pNext = dynamic_cast(*next); bool isComplex = false; - rtl::OUString str(pCur->Text.getStr()); + OUString str(pCur->Text.getStr()); for(int i=0; i< str.getLength(); i++) { sal_Int16 nType = GetBreakIterator()->getScriptType( str, i ); @@ -791,7 +791,7 @@ void DrawXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* > aVec.setX ( convPx2mmPrec2( aVec.getX() )*100.0 ); aVec.setY ( convPx2mmPrec2( aVec.getY() )*100.0 ); - aGCProps[ "svg:stroke-width" ] = rtl::OUString::valueOf( aVec.getLength() ); + aGCProps[ "svg:stroke-width" ] = OUString::valueOf( aVec.getLength() ); } } else @@ -860,10 +860,10 @@ void DrawXmlFinalizer::visit( TextElement& elem, const std::list< Element* >::co aFontProps[ "style:text-outline" ] = "true"; } // size - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( rFont.size*72/PDFI_OUTDEV_RESOLUTION ); aBuf.appendAscii( "pt" ); - rtl::OUString aFSize = aBuf.makeStringAndClear(); + OUString aFSize = aBuf.makeStringAndClear(); aFontProps[ "fo:font-size" ] = aFSize; aFontProps[ "style:font-size-asian" ] = aFSize; aFontProps[ "style:font-size-complex" ] = aFSize; @@ -1028,7 +1028,7 @@ void DrawXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::co sal_Int32 nPageStyle = m_rStyleContainer.impl_getStyleId( aStyle, false ); // create master page - rtl::OUString aMasterPageLayoutName = m_rStyleContainer.getStyleName( nPageStyle ); + OUString aMasterPageLayoutName = m_rStyleContainer.getStyleName( nPageStyle ); aPageProps[ "style:page-layout-name" ] = aMasterPageLayoutName; StyleContainer::Style aMPStyle( "style:master-page", aPageProps); diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx index 6ca3c8a5a02b..bb862dacd57b 100644 --- a/sdext/source/pdfimport/tree/genericelements.hxx +++ b/sdext/source/pdfimport/tree/genericelements.hxx @@ -114,13 +114,13 @@ namespace pdfi { friend class ElementFactory; protected: - HyperlinkElement( Element* pParent, const rtl::OUString& rURI ) + HyperlinkElement( Element* pParent, const OUString& rURI ) : Element( pParent ), URI( rURI ) {} public: // ElementTreeVisitable virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); - rtl::OUString URI; + OUString URI; }; struct GraphicalElement : public Element @@ -168,7 +168,7 @@ namespace pdfi // ElementTreeVisitable virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); - rtl::OUStringBuffer Text; + OUStringBuffer Text; sal_Int32 FontId; }; @@ -285,7 +285,7 @@ namespace pdfi ElementFactory() {} virtual ~ElementFactory(); - virtual HyperlinkElement* createHyperlinkElement( Element* pParent, const rtl::OUString& rURI ) + virtual HyperlinkElement* createHyperlinkElement( Element* pParent, const OUString& rURI ) { return new HyperlinkElement( pParent, rURI ); } virtual TextElement* createTextElement( Element* pParent, sal_Int32 nGCId, sal_Int32 nFontId ) diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index 7b4ecefeabb4..71619da32447 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -49,9 +49,9 @@ static const sal_Char aBase64EncodeTable[] = 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' }; -rtl::OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBufferLength ) +OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBufferLength ) { - rtl::OUStringBuffer aBuf( (i_nBufferLength+1) * 4 / 3 ); + OUStringBuffer aBuf( (i_nBufferLength+1) * 4 / 3 ); const sal_Int32 nRemain(i_nBufferLength%3); const sal_Int32 nFullTripleLength( i_nBufferLength - (i_nBufferLength%3)); sal_Int32 nBufPos( 0 ); @@ -129,7 +129,7 @@ void ImageContainer::writeBase64EncodedStream( ImageId nId, EmitContext& rContex std::find_if(pAry,pAry+nLen, boost::bind(comphelper::TPropertyValueEqualFunctor(), _1, - rtl::OUString("InputSequence")))); + OUString("InputSequence")))); OSL_ENSURE( pValue != pAry+nLen, "InputSequence not found" ); diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index df255434bbf5..83be259d3b69 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -425,7 +425,7 @@ void PDFIProcessor::processGlyph( double fPreAvarageSpaceValue, } } -void PDFIProcessor::drawGlyphLine( const rtl::OUString& rGlyphs, +void PDFIProcessor::drawGlyphLine( const OUString& rGlyphs, const geometry::RealRectangle2D& rRect, const geometry::Matrix2D& rFontMatrix ) { @@ -455,8 +455,8 @@ void PDFIProcessor::drawGlyphLine( const rtl::OUString& rGlyphs, if( !m_bIsWhiteSpaceInLine ) { - static rtl::OUString tempWhiteSpaceStr( 0x20 ); - static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 ); + static OUString tempWhiteSpaceStr( 0x20 ); + static OUString tempWhiteSpaceNonBreakingStr( 0xa0 ); m_bIsWhiteSpaceInLine=(rGlyphs.equals( tempWhiteSpaceStr ) || rGlyphs.equals( tempWhiteSpaceNonBreakingStr )); } } @@ -485,7 +485,7 @@ GraphicsContext& PDFIProcessor::getTransformGlyphContext( CharGlyph& rGlyph ) return rGlyph.getGC(); } -void PDFIProcessor::drawCharGlyphs( rtl::OUString& rGlyphs, +void PDFIProcessor::drawCharGlyphs( OUString& rGlyphs, geometry::RealRectangle2D& rRect, const GraphicsContext& aGC, ParagraphElement* pPara, @@ -494,7 +494,7 @@ void PDFIProcessor::drawCharGlyphs( rtl::OUString& rGlyphs, { - rtl::OUString tempStr( 32 ); + OUString tempStr( 32 ); geometry::RealRectangle2D aRect(rRect); ::basegfx::B2DRange aRect2; @@ -523,7 +523,7 @@ void PDFIProcessor::drawCharGlyphs( rtl::OUString& rGlyphs, } -void PDFIProcessor::drawGlyphs( const rtl::OUString& rGlyphs, +void PDFIProcessor::drawGlyphs( const OUString& rGlyphs, const geometry::RealRectangle2D& rRect, const geometry::Matrix2D& rFontMatrix ) { @@ -712,7 +712,7 @@ void PDFIProcessor::intersectEoClip(const uno::Reference< rendering::XPolyPolygo } void PDFIProcessor::hyperLink( const geometry::RealRectangle2D& rBounds, - const ::rtl::OUString& rURI ) + const OUString& rURI ) { if( !rURI.isEmpty() ) { @@ -780,7 +780,7 @@ void PDFIProcessor::startPage( const geometry::RealSize2D& rSize ) if( m_xStatusIndicator.is() ) { if( nNextPageNr == 1 ) - startIndicator( rtl::OUString( " " ) ); + startIndicator( OUString( " " ) ); m_xStatusIndicator->setValue( nNextPageNr ); } m_pCurPage = m_pElFactory->createPageElement(m_pDocument.get(), nNextPageNr); @@ -802,7 +802,7 @@ void PDFIProcessor::emit( XmlEmitter& rEmitter, ElementTreeVisitorSharedPtr optimizingVisitor( rVisitorFactory.createOptimizingVisitor(*this)); // FIXME: localization - startIndicator( rtl::OUString( " " ) ); + startIndicator( OUString( " " ) ); m_pDocument->visitedBy( *optimizingVisitor, std::list::const_iterator()); #if OSL_DEBUG_LEVEL > 1 @@ -855,14 +855,14 @@ void PDFIProcessor::emit( XmlEmitter& rEmitter, endIndicator(); } -void PDFIProcessor::startIndicator( const rtl::OUString& rText, sal_Int32 nElements ) +void PDFIProcessor::startIndicator( const OUString& rText, sal_Int32 nElements ) { if( nElements == -1 ) nElements = m_nPages; if( m_xStatusIndicator.is() ) { sal_Int32 nUnicodes = rText.getLength(); - rtl::OUStringBuffer aStr( nUnicodes*2 ); + OUStringBuffer aStr( nUnicodes*2 ); const sal_Unicode* pText = rText.getStr(); for( int i = 0; i < nUnicodes; i++ ) { @@ -1009,10 +1009,10 @@ void PDFIProcessor::sortElements( Element* pEle, bool bDeep ) } // helper method: get a mirrored string -rtl::OUString PDFIProcessor::mirrorString( const rtl::OUString& i_rString ) const +OUString PDFIProcessor::mirrorString( const OUString& i_rString ) const { const sal_Int32 nLen = i_rString.getLength(); - rtl::OUStringBuffer aMirror( nLen ); + OUStringBuffer aMirror( nLen ); sal_Int32 i = 0; while(i < nLen) diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index bd792bc4d35d..093fd937cd23 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -99,7 +99,7 @@ namespace pdfi void sortElements( Element* pElement, bool bDeep = false ); - rtl::OUString mirrorString( const rtl::OUString& i_rInString ) const; + OUString mirrorString( const OUString& i_rInString ) const; private: void processGlyphLine(); @@ -109,11 +109,11 @@ namespace pdfi FrameElement* pFrame, bool bIsWhiteSpaceInLine ); - void drawGlyphLine( const rtl::OUString& rGlyphs, + void drawGlyphLine( const OUString& rGlyphs, const ::com::sun::star::geometry::RealRectangle2D& rRect, const ::com::sun::star::geometry::Matrix2D& rFontMatrix ); - void drawCharGlyphs( rtl::OUString& rGlyphs, + void drawCharGlyphs( OUString& rGlyphs, ::com::sun::star::geometry::RealRectangle2D& rRect, const GraphicsContext& aGC, ParagraphElement* pPara, @@ -129,7 +129,7 @@ namespace pdfi virtual void endPage(); virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds, - const ::rtl::OUString& rURI ); + const OUString& rURI ); virtual void pushState(); virtual void popState(); virtual void setFlatness( double ); @@ -158,7 +158,7 @@ namespace pdfi virtual void intersectEoClip(const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& rPath); - virtual void drawGlyphs( const rtl::OUString& rGlyphs, + virtual void drawGlyphs( const OUString& rGlyphs, const ::com::sun::star::geometry::RealRectangle2D& rRect, const ::com::sun::star::geometry::Matrix2D& rFontMatrix ); virtual void endText(); @@ -188,7 +188,7 @@ namespace pdfi ::com::sun::star::beans::PropertyValue>& xMask); /// nElements == -1 means fill in number of pages - void startIndicator( const rtl::OUString& rText, sal_Int32 nElements = -1 ); + void startIndicator( const OUString& rText, sal_Int32 nElements = -1 ); void endIndicator(); void setupImage(ImageId nImage); @@ -238,13 +238,13 @@ namespace pdfi public: CharGlyph(double fXPrevGlyphPosition, double fYPrevGlyphPosition, double fPrevGlyphHeight, double fPrevGlyphWidth, Element* pCurElement, const GraphicsContext& rCurrentContext, const com::sun::star::geometry::Matrix2D& rFontMatrix, - const com::sun::star::geometry::RealRectangle2D& rRect, const rtl::OUString& rGlyphs ) + const com::sun::star::geometry::RealRectangle2D& rRect, const OUString& rGlyphs ) : m_fXPrevGlyphPosition(fXPrevGlyphPosition), m_fYPrevGlyphPosition(fYPrevGlyphPosition), m_fPrevGlyphHeight(fPrevGlyphHeight), m_fPrevGlyphWidth(fPrevGlyphWidth), m_pCurElement(pCurElement), m_rCurrentContext(rCurrentContext), m_rFontMatrix(rFontMatrix), m_rRect(rRect), m_rGlyphs(rGlyphs) {}; virtual ~CharGlyph(){}; - rtl::OUString& getGlyph(){ return m_rGlyphs; } + OUString& getGlyph(){ return m_rGlyphs; } com::sun::star::geometry::RealRectangle2D& getRect(){ return m_rRect; } com::sun::star::geometry::Matrix2D& getFontMatrix(){ return m_rFontMatrix; } GraphicsContext& getGC(){ return m_rCurrentContext; } @@ -272,7 +272,7 @@ namespace pdfi GraphicsContext m_rCurrentContext ; com::sun::star::geometry::Matrix2D m_rFontMatrix ; com::sun::star::geometry::RealRectangle2D m_rRect ; - rtl::OUString m_rGlyphs ; + OUString m_rGlyphs ; }; } diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx index 772e81f35690..d3523828d784 100644 --- a/sdext/source/pdfimport/tree/style.cxx +++ b/sdext/source/pdfimport/tree/style.cxx @@ -28,8 +28,6 @@ using namespace pdfi; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; StyleContainer::StyleContainer() : m_nNextId( 1 ) @@ -75,10 +73,10 @@ sal_Int32 StyleContainer::impl_getStyleId( const Style& rStyle, bool bSubStyle ) return nRet; } -sal_Int32 StyleContainer::getStandardStyleId( const rtl::OString& rName ) +sal_Int32 StyleContainer::getStandardStyleId( const OString& rName ) { PropertyMap aProps; - aProps[ "style:family" ] = rtl::OStringToOUString( rName, RTL_TEXTENCODING_UTF8 ); + aProps[ "style:family" ] = OStringToOUString( rName, RTL_TEXTENCODING_UTF8 ); aProps[ "style:name" ] = "standard"; Style aStyle( "style:style", aProps ); diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx index 0db40d440276..1ef45e605c58 100644 --- a/sdext/source/pdfimport/tree/style.hxx +++ b/sdext/source/pdfimport/tree/style.hxx @@ -38,14 +38,14 @@ namespace pdfi public: struct Style { - rtl::OString Name; + OString Name; PropertyMap Properties; - rtl::OUString Contents; + OUString Contents; Element* ContainedElement; std::vector< Style* > SubStyles; Style() : ContainedElement( NULL ) {} - Style( const rtl::OString& rName, const PropertyMap& rProps ) : + Style( const OString& rName, const PropertyMap& rProps ) : Name( rName ), Properties( rProps ), ContainedElement( NULL ) @@ -55,9 +55,9 @@ namespace pdfi private: struct HashedStyle { - rtl::OString Name; + OString Name; PropertyMap Properties; - rtl::OUString Contents; + OUString Contents; Element* ContainedElement; std::vector SubStyles; @@ -161,12 +161,12 @@ namespace pdfi sal_Int32 impl_getStyleId( const Style& rStyle, bool bSubStyle ); sal_Int32 getStyleId( const Style& rStyle ) { return impl_getStyleId( rStyle, false ); } - sal_Int32 getStandardStyleId( const rtl::OString& rFamily ); + sal_Int32 getStandardStyleId( const OString& rFamily ); // returns NULL for an invalid style id const PropertyMap* getProperties( sal_Int32 nStyleId ) const; sal_Int32 setProperties( sal_Int32 nStyleId, const PropertyMap &rNewProps ); - rtl::OUString getStyleName( sal_Int32 nStyle ) const; + OUString getStyleName( sal_Int32 nStyle ) const; }; } diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index 487bc7a5a6dd..dcb863e0358a 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -64,7 +64,7 @@ void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::co PropertyMap aProps; if( elem.StyleId != -1 ) { - aProps[ rtl::OUString( "text:style-name" ) ] = + aProps[ OUString( "text:style-name" ) ] = m_rEmitContext.rStyles.getStyleName( elem.StyleId ); } @@ -127,13 +127,13 @@ void WriterXmlEmitter::fillFrameProps( DrawElement& rElem, { PageElement* pPage = dynamic_cast(pAnchor); rProps[ "text:anchor-type" ] = "page"; - rProps[ "text:anchor-page-number" ] = rtl::OUString::valueOf(pPage->PageNumber); + rProps[ "text:anchor-page-number" ] = OUString::valueOf(pPage->PageNumber); } rel_x -= pAnchor->x; rel_y -= pAnchor->y; } - rProps[ "draw:z-index" ] = rtl::OUString::valueOf( rElem.ZOrder ); + rProps[ "draw:z-index" ] = OUString::valueOf( rElem.ZOrder ); rProps[ "draw:style-name"] = rEmitContext.rStyles.getStyleName( rElem.StyleId ); rProps[ "svg:width" ] = convertPixelToUnitString( rElem.w ); rProps[ "svg:height" ] = convertPixelToUnitString( rElem.h ); @@ -155,7 +155,7 @@ void WriterXmlEmitter::fillFrameProps( DrawElement& rElem, rGC.Transformation.decompose( aScale, aTranslation, fRotate, fShearX ); - rtl::OUStringBuffer aBuf( 256 ); + OUStringBuffer aBuf( 256 ); // TODO(F2): general transformation case missing; if implemented, note // that ODF rotation is oriented the other way @@ -269,7 +269,7 @@ void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* > PropertyMap aProps; fillFrameProps( elem, aProps, m_rEmitContext ); - rtl::OUStringBuffer aBuf( 64 ); + OUStringBuffer aBuf( 64 ); aBuf.appendAscii( "0 0 " ); aBuf.append( convPx2mmPrec2(elem.w)*100.0 ); aBuf.append( sal_Unicode(' ') ); @@ -856,7 +856,7 @@ void WriterXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* aVec.setX ( convPx2mmPrec2( aVec.getX() )*100.0 ); aVec.setY ( convPx2mmPrec2( aVec.getY() )*100.0 ); - aGCProps[ "svg:stroke-width" ] = rtl::OUString::valueOf( aVec.getLength() ); + aGCProps[ "svg:stroke-width" ] = OUString::valueOf( aVec.getLength() ); } } else @@ -923,10 +923,10 @@ void WriterXmlFinalizer::visit( TextElement& elem, const std::list< Element* >:: aFontProps[ "style:text-outline" ] = "true"; } // size - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( rFont.size*72/PDFI_OUTDEV_RESOLUTION ); aBuf.appendAscii( "pt" ); - rtl::OUString aFSize = aBuf.makeStringAndClear(); + OUString aFSize = aBuf.makeStringAndClear(); aFontProps[ "fo:font-size" ] = aFSize; aFontProps[ "style:font-size-asian" ] = aFSize; aFontProps[ "style:font-size-complex" ] = aFSize; @@ -975,7 +975,7 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element if( ! bIsCenter && elem.x > p_x + p_w/10 ) { // indent - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( convPx2mm( elem.x - p_x ) ); aBuf.appendAscii( "mm" ); aParaProps[ "fo:margin-left" ] = aBuf.makeStringAndClear(); @@ -991,7 +991,7 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element { if( pNextPara->y - (elem.y+elem.h) > convmm2Px( 10 ) ) { - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( convPx2mm( pNextPara->y - (elem.y+elem.h) ) ); aBuf.appendAscii( "mm" ); aParaProps[ "fo:margin-bottom" ] = aBuf.makeStringAndClear(); @@ -1036,7 +1036,7 @@ void WriterXmlFinalizer::visit( ImageElement&, const std::list< Element* >::cons void WriterXmlFinalizer::setFirstOnPage( ParagraphElement& rElem, StyleContainer& rStyles, - const rtl::OUString& rMasterPageName ) + const OUString& rMasterPageName ) { PropertyMap aProps; if( rElem.StyleId != -1 ) @@ -1161,7 +1161,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >:: sal_Int32 nPageStyle = m_rStyleContainer.impl_getStyleId( aStyle, false ); // create master page - rtl::OUString aMasterPageLayoutName = m_rStyleContainer.getStyleName( nPageStyle ); + OUString aMasterPageLayoutName = m_rStyleContainer.getStyleName( nPageStyle ); aPageProps[ "style:page-layout-name" ] = aMasterPageLayoutName; StyleContainer::Style aMPStyle( "style:master-page", aPageProps ); StyleContainer::Style aHeaderStyle( "style:header", PropertyMap() ); @@ -1181,7 +1181,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >:: elem.StyleId = m_rStyleContainer.impl_getStyleId( aMPStyle,false ); - rtl::OUString aMasterPageName = m_rStyleContainer.getStyleName( elem.StyleId ); + OUString aMasterPageName = m_rStyleContainer.getStyleName( elem.StyleId ); // create styles for children elem.applyToChildren(*this); diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx index f4b84f91ef74..dec3e913bb14 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.hxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx @@ -58,7 +58,7 @@ namespace pdfi void setFirstOnPage( ParagraphElement& rElem, StyleContainer& rStyles, - const rtl::OUString& rMasterPageName ); + const OUString& rMasterPageName ); public: explicit WriterXmlFinalizer(StyleContainer& rStyleContainer, diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 9a3c63ffc646..87f2b85418db 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -136,7 +136,7 @@ class Parser const uno::Reference m_xContext; const ContentSinkSharedPtr m_pSink; const oslFileHandle m_pErr; - ::rtl::OString m_aLine; + OString m_aLine; FontMapType m_aFontMap; sal_Int32 m_nNextToken; sal_Int32 m_nCharIndex; @@ -144,7 +144,7 @@ class Parser const double minAreaThreshold; const double minLineWidth; - ::rtl::OString readNextToken(); + OString readNextToken(); void readInt32( sal_Int32& o_Value ); sal_Int32 readInt32(); void readInt64( sal_Int64& o_Value ); @@ -189,7 +189,7 @@ public: minLineWidth( 12 ) {} - void parseLine( const ::rtl::OString& rLine ); + void parseLine( const OString& rLine ); }; @@ -200,7 +200,7 @@ namespace characters are encoded as pairs of characters: '\\' 'n', resp. '\\' 'r'. This function converts them back to '\n', resp. '\r'. */ - rtl::OString lcl_unescapeLineFeeds(const rtl::OString& i_rStr) + OString lcl_unescapeLineFeeds(const OString& i_rStr) { const size_t nOrigLen(sal::static_int_cast(i_rStr.getLength())); const sal_Char* const pOrig(i_rStr.getStr()); @@ -238,7 +238,7 @@ namespace } *pWrite = '\0'; - rtl::OString aResult(pBuffer); + OString aResult(pBuffer); delete[] pBuffer; return aResult; } @@ -246,7 +246,7 @@ namespace } -::rtl::OString Parser::readNextToken() +OString Parser::readNextToken() { OSL_PRECOND(m_nCharIndex!=-1,"insufficient input"); return m_aLine.getToken(m_nNextToken,' ',m_nCharIndex); @@ -295,7 +295,7 @@ void Parser::readBinaryData( uno::Sequence& rBuf ) uno::Reference Parser::readPath( double* pArea = NULL ) { - const rtl::OString aSubPathMarker( "subpath" ); + const OString aSubPathMarker( "subpath" ); if( 0 != readNextToken().compareTo( aSubPathMarker ) ) OSL_PRECOND(false, "broken path"); @@ -311,7 +311,7 @@ uno::Reference Parser::readPath( double* pArea = NULL sal_Int32 nContiguousControlPoints(0); sal_Int32 nDummy=m_nCharIndex; - rtl::OString aCurrToken( m_aLine.getToken(m_nNextToken,' ',nDummy) ); + OString aCurrToken( m_aLine.getToken(m_nNextToken,' ',nDummy) ); while( m_nCharIndex != -1 && 0 != aCurrToken.compareTo(aSubPathMarker) ) { @@ -380,12 +380,12 @@ void Parser::readChar() readDouble(aUnoMatrix.m10); readDouble(aUnoMatrix.m11); - rtl::OString aChars = lcl_unescapeLineFeeds( m_aLine.copy( m_nCharIndex ) ); + OString aChars = lcl_unescapeLineFeeds( m_aLine.copy( m_nCharIndex ) ); // chars gobble up rest of line m_nCharIndex = -1; - m_pSink->drawGlyphs( rtl::OStringToOUString( aChars, + m_pSink->drawGlyphs( OStringToOUString( aChars, RTL_TEXTENCODING_UTF8 ), aRect, aUnoMatrix ); } @@ -490,7 +490,7 @@ int Parser::parseFontRemoveSuffix( const sal_Unicode* pCopy, const char* s, sal_ void Parser::parseFontFamilyName( FontAttributes& aResult ) { - rtl::OUStringBuffer aNewFamilyName( aResult.familyName.getLength() ); + OUStringBuffer aNewFamilyName( aResult.familyName.getLength() ); const sal_Unicode* pCopy = aResult.familyName.getStr(); sal_Int32 nLen = aResult.familyName.getLength(); @@ -527,7 +527,7 @@ void Parser::parseFontFamilyName( FontAttributes& aResult ) void Parser::readFont() { - ::rtl::OString aFontName; + OString aFontName; sal_Int64 nFontID; sal_Int32 nIsEmbedded, nIsBold, nIsItalic, nIsUnderline, nFileLen; double nSize; @@ -558,7 +558,7 @@ void Parser::readFont() } // yet unknown font - get info and add to map - FontAttributes aResult( rtl::OStringToOUString( aFontName, + FontAttributes aResult( OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ), nIsBold != 0, nIsItalic != 0, @@ -582,7 +582,7 @@ void Parser::readFont() { uno::Reference< beans::XMaterialHolder > xMat( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - rtl::OUString( "com.sun.star.awt.FontIdentificator" ), + OUString( "com.sun.star.awt.FontIdentificator" ), aArgs, m_xContext ), uno::UNO_QUERY ); @@ -608,7 +608,7 @@ void Parser::readFont() if( aResult.familyName.isEmpty() ) { // last fallback - aResult.familyName = ::rtl::OUString( "Arial" ); + aResult.familyName = OUString( "Arial" ); aResult.isUnderline = false; } @@ -621,19 +621,19 @@ void Parser::readFont() uno::Sequence Parser::readImageImpl() { - static const rtl::OString aJpegMarker( "JPEG" ); - static const rtl::OString aPbmMarker( "PBM" ); - static const rtl::OString aPpmMarker( "PPM" ); - static const rtl::OString aPngMarker( "PNG" ); - static const rtl::OUString aJpegFile( "DUMMY.JPEG" ); - static const rtl::OUString aPbmFile( "DUMMY.PBM" ); - static const rtl::OUString aPpmFile( "DUMMY.PPM" ); - static const rtl::OUString aPngFile( "DUMMY.PNG" ); + static const OString aJpegMarker( "JPEG" ); + static const OString aPbmMarker( "PBM" ); + static const OString aPpmMarker( "PPM" ); + static const OString aPngMarker( "PNG" ); + static const OUString aJpegFile( "DUMMY.JPEG" ); + static const OUString aPbmFile( "DUMMY.PBM" ); + static const OUString aPpmFile( "DUMMY.PPM" ); + static const OUString aPngFile( "DUMMY.PNG" ); - rtl::OString aToken = readNextToken(); + OString aToken = readNextToken(); const sal_Int32 nImageSize( readInt32() ); - rtl::OUString aFileName; + OUString aFileName; if( aToken.compareTo( aPngMarker ) == 0 ) aFileName = aPngFile; else if( aToken.compareTo( aJpegMarker ) == 0 ) @@ -655,19 +655,19 @@ uno::Sequence Parser::readImageImpl() uno::Reference< uno::XComponentContext > xContext( m_xContext, uno::UNO_SET_THROW ); uno::Reference< lang::XMultiComponentFactory > xFactory( xContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< io::XInputStream > xDataStream( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( "com.sun.star.io.SequenceInputStream" ), + OUString( "com.sun.star.io.SequenceInputStream" ), aStreamCreationArgs, m_xContext ), uno::UNO_QUERY_THROW ); uno::Sequence aSequence(3); - aSequence[0] = beans::PropertyValue( ::rtl::OUString("URL"), + aSequence[0] = beans::PropertyValue( OUString("URL"), 0, uno::makeAny(aFileName), beans::PropertyState_DIRECT_VALUE ); - aSequence[1] = beans::PropertyValue( ::rtl::OUString("InputStream"), + aSequence[1] = beans::PropertyValue( OUString("InputStream"), 0, uno::makeAny( xDataStream ), beans::PropertyState_DIRECT_VALUE ); - aSequence[2] = beans::PropertyValue( ::rtl::OUString("InputSequence"), + aSequence[2] = beans::PropertyValue( OUString("InputSequence"), 0, uno::makeAny(aDataSequence), beans::PropertyState_DIRECT_VALUE ); @@ -727,7 +727,7 @@ void Parser::readLink() readDouble(aBounds.Y2); m_pSink->hyperLink( aBounds, - rtl::OStringToOUString( lcl_unescapeLineFeeds( + OStringToOUString( lcl_unescapeLineFeeds( m_aLine.copy(m_nCharIndex) ), RTL_TEXTENCODING_UTF8 ) ); // name gobbles up rest of line @@ -761,7 +761,7 @@ void Parser::readSoftMaskedImage() m_pSink->drawAlphaMaskedImage( aImage, aMask ); } -void Parser::parseLine( const ::rtl::OString& rLine ) +void Parser::parseLine( const OString& rLine ) { OSL_PRECOND( m_pSink, "Invalid sink" ); OSL_PRECOND( m_pErr, "Invalid filehandle" ); @@ -769,7 +769,7 @@ void Parser::parseLine( const ::rtl::OString& rLine ) m_nNextToken = 0; m_nCharIndex = 0; m_aLine = rLine; uno::Reference xPoly; - const ::rtl::OString& rCmd = readNextToken(); + const OString& rCmd = readNextToken(); const hash_entry* pEntry = PdfKeywordHash::in_word_set( rCmd.getStr(), rCmd.getLength() ); OSL_ASSERT(pEntry); @@ -865,7 +865,7 @@ void Parser::parseLine( const ::rtl::OString& rLine ) OSL_POSTCOND(m_nCharIndex==-1,"leftover scanner input"); } -oslFileError readLine( oslFileHandle pFile, ::rtl::OStringBuffer& line ) +oslFileError readLine( oslFileHandle pFile, OStringBuffer& line ) { OSL_PRECOND( line.isEmpty(), "line buf not empty" ); @@ -893,16 +893,16 @@ oslFileError readLine( oslFileHandle pFile, ::rtl::OStringBuffer& line ) } // namespace -static bool checkEncryption( const rtl::OUString& i_rPath, +static bool checkEncryption( const OUString& i_rPath, const uno::Reference< task::XInteractionHandler >& i_xIHdl, - rtl::OUString& io_rPwd, + OUString& io_rPwd, bool& o_rIsEncrypted, - const rtl::OUString& i_rDocName + const OUString& i_rDocName ) { bool bSuccess = false; - rtl::OString aPDFFile; - aPDFFile = rtl::OUStringToOString( i_rPath, osl_getThreadTextEncoding() ); + OString aPDFFile; + aPDFFile = OUStringToOString( i_rPath, osl_getThreadTextEncoding() ); pdfparse::PDFReader aParser; boost::scoped_ptr pEntry( aParser.read( aPDFFile.getStr() )); @@ -919,7 +919,7 @@ static bool checkEncryption( const rtl::OUString& bool bAuthenticated = false; if( !io_rPwd.isEmpty() ) { - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + OString aIsoPwd = OUStringToOString( io_rPwd, RTL_TEXTENCODING_ISO_8859_1 ); bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); } @@ -933,7 +933,7 @@ static bool checkEncryption( const rtl::OUString& do { bEntered = getPassword( i_xIHdl, io_rPwd, ! bEntered, i_rDocName ); - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + OString aIsoPwd = OUStringToOString( io_rPwd, RTL_TEXTENCODING_ISO_8859_1 ); bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); } while( bEntered && ! bAuthenticated ); @@ -944,7 +944,7 @@ static bool checkEncryption( const rtl::OUString& } if( bAuthenticated ) { - rtl::OUStringBuffer aBuf( 128 ); + OUStringBuffer aBuf( 128 ); aBuf.appendAscii( "_OOO_pdfi_Credentials_" ); aBuf.append( pPDFFile->getDecryptionKey() ); io_rPwd = aBuf.makeStringAndClear(); @@ -967,15 +967,15 @@ static bool checkEncryption( const rtl::OUString& return bSuccess; } -bool xpdf_ImportFromFile( const ::rtl::OUString& rURL, +bool xpdf_ImportFromFile( const OUString& rURL, const ContentSinkSharedPtr& rSink, const uno::Reference< task::XInteractionHandler >& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const uno::Reference< uno::XComponentContext >& xContext ) { OSL_ASSERT(rSink); - ::rtl::OUString aSysUPath; + OUString aSysUPath; if( osl_getSystemPathFromFileURL( rURL.pData, &aSysUPath.pData ) != osl_File_E_None ) { SAL_WARN( @@ -983,10 +983,10 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR "getSystemPathFromFileURL(" << rURL << ") failed"); return false; } - rtl::OUString aDocName( rURL.copy( rURL.lastIndexOf( sal_Unicode('/') )+1 ) ); + OUString aDocName( rURL.copy( rURL.lastIndexOf( sal_Unicode('/') )+1 ) ); // check for encryption, if necessary get password - rtl::OUString aPwd( rPwd ); + OUString aPwd( rPwd ); bool bIsEncrypted = false; if( checkEncryption( aSysUPath, xIHdl, aPwd, bIsEncrypted, aDocName ) == false ) { @@ -1018,11 +1018,11 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR sal_uInt32 nEnv = 0; #if defined UNX && ! defined MACOSX - rtl::OUString aStr( "$URE_LIB_DIR" ); + OUString aStr( "$URE_LIB_DIR" ); rtl_bootstrap_expandMacros( &aStr.pData ); - rtl::OUString aSysPath; + OUString aSysPath; osl_getSystemPathFromFileURL( aStr.pData, &aSysPath.pData ); - rtl::OUStringBuffer aEnvBuf( aStr.getLength() + 20 ); + OUStringBuffer aEnvBuf( aStr.getLength() + 20 ); aEnvBuf.appendAscii( "LD_LIBRARY_PATH=" ); aEnvBuf.append( aSysPath ); aStr = aEnvBuf.makeStringAndClear(); @@ -1060,9 +1060,9 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR if( pIn ) { - rtl::OStringBuffer aBuf(256); + OStringBuffer aBuf(256); if( bIsEncrypted ) - aBuf.append( rtl::OUStringToOString( aPwd, RTL_TEXTENCODING_ISO_8859_1 ) ); + aBuf.append( OUStringToOString( aPwd, RTL_TEXTENCODING_ISO_8859_1 ) ); aBuf.append( '\n' ); sal_uInt64 nWritten = 0; @@ -1075,7 +1075,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR // OutputDev. stderr is used for alternate streams, like // embedded fonts and bitmaps Parser aParser(rSink,pErr,xContext); - ::rtl::OStringBuffer line; + OStringBuffer line; while( osl_File_E_None == readLine(pOut, line) && line.getLength() ) aParser.parseLine(line.makeStringAndClear()); } @@ -1100,7 +1100,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR bool xpdf_ImportFromStream( const uno::Reference< io::XInputStream >& xInput, const ContentSinkSharedPtr& rSink, const uno::Reference& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const uno::Reference< uno::XComponentContext >& xContext ) { OSL_ASSERT(xInput.is()); @@ -1108,7 +1108,7 @@ bool xpdf_ImportFromStream( const uno::Reference< io::XInputStream >& xI // convert XInputStream to local temp file oslFileHandle aFile = NULL; - rtl::OUString aURL; + OUString aURL; if( osl_createTempFile( NULL, &aFile, &aURL.pData ) != osl_File_E_None ) return false; diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 59d2396c6117..b442f76d3148 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; //===== PresenterAccessibleObject ============================================= @@ -70,7 +69,7 @@ public: AccessibleObject ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName); + const OUString& rsName); void LateInitialization (void); virtual ~AccessibleObject (void); @@ -88,7 +87,7 @@ public: void RemoveChild (const ::rtl::Reference& rpChild); void SetIsFocused (const bool bIsFocused); - void SetAccessibleName (const ::rtl::OUString& rsName); + void SetAccessibleName (const OUString& rsName); void FireAccessibleEvent ( const sal_Int16 nEventId, @@ -130,10 +129,10 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) + virtual OUString SAL_CALL getAccessibleDescription (void) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName (void) + virtual OUString SAL_CALL getAccessibleName (void) throw (cssu::RuntimeException); virtual cssu::Reference SAL_CALL @@ -210,7 +209,7 @@ public: throw (cssu::RuntimeException); protected: - ::rtl::OUString msName; + OUString msName; cssu::Reference mxContentWindow; cssu::Reference mxBorderWindow; const css::lang::Locale maLocale; @@ -328,7 +327,7 @@ public: AccessibleParagraph ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName, + const OUString& rsName, const SharedPresenterTextParagraph& rpParagraph, const sal_Int32 nParagraphIndex); @@ -354,7 +353,7 @@ public: virtual cssu::Sequence SAL_CALL getCharacterAttributes ( ::sal_Int32 nIndex, - const cssu::Sequence& rRequestedAttributes) + const cssu::Sequence& rRequestedAttributes) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) @@ -366,7 +365,7 @@ public: virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText (void) + virtual OUString SAL_CALL getSelectedText (void) throw (cssu::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionStart (void) @@ -378,10 +377,10 @@ public: virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText (void) + virtual OUString SAL_CALL getText (void) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange ( + virtual OUString SAL_CALL getTextRange ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); @@ -490,7 +489,7 @@ public: AccessibleNotes ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName); + const OUString& rsName); static rtl::Reference Create ( const css::uno::Reference& rxContext, @@ -642,7 +641,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (void) void PresenterAccessible::UpdateAccessibilityHierarchy ( const Reference& rxPreviewContentWindow, const Reference& rxPreviewBorderWindow, - const ::rtl::OUString& rsTitle, + const OUString& rsTitle, const Reference& rxNotesContentWindow, const Reference& rxNotesBorderWindow, const ::boost::shared_ptr& rpNotesTextView) @@ -710,7 +709,7 @@ void PresenterAccessible::NotifyCurrentSlideChange ( mpAccessiblePreview->SetAccessibleName( (pPreviewPane&&pPreviewPane->mxPane.is() ? pPreviewPane->mxPane->GetTitle() - : rtl::OUString())); + : OUString())); } // Play some focus ping-pong to trigger AT tools. @@ -1270,7 +1269,7 @@ void PresenterAccessible::AccessibleObject::SetIsFocused (const bool bIsFocused) } } -void PresenterAccessible::AccessibleObject::SetAccessibleName (const ::rtl::OUString& rsName) +void PresenterAccessible::AccessibleObject::SetAccessibleName (const OUString& rsName) { if (msName != rsName) { @@ -1601,7 +1600,7 @@ sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal Sequence SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterAttributes ( ::sal_Int32 nIndex, - const cssu::Sequence& rRequestedAttributes) + const cssu::Sequence& rRequestedAttributes) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) { ThrowIfDisposed(); @@ -1678,7 +1677,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( return nIndex; } -::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void) +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void) throw (cssu::RuntimeException) { ThrowIfDisposed(); @@ -1713,26 +1712,26 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( return setCaretPosition(nStartIndex); } -::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) throw (cssu::RuntimeException) { ThrowIfDisposed(); - ::rtl::OUString sText; + OUString sText; if (mpParagraph) sText = mpParagraph->GetText(); return sText; } -::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange ( +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange ( sal_Int32 nLocalStartIndex, sal_Int32 nLocalEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) { ThrowIfDisposed(); - ::rtl::OUString sText; + OUString sText; if (mpParagraph) { const TextSegment aSegment ( @@ -1867,7 +1866,7 @@ bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 n AccessibleNotes::AccessibleNotes ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName) + const OUString& rsName) : AccessibleObject(aLocale,nRole,rsName), mpTextView() { diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 6a70c9ed625e..10740d193d93 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -121,7 +121,7 @@ private: void UpdateAccessibilityHierarchy ( const css::uno::Reference& rxPreviewContentWindow, const css::uno::Reference& rxPreviewBorderWindow, - const ::rtl::OUString& rsTitle, + const OUString& rsTitle, const css::uno::Reference& rxNotesContentWindow, const css::uno::Reference& rxNotesBorderWindow, const ::boost::shared_ptr& rpNotesTextView); diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 66d0cf86a25a..37e2f08a7c7c 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -31,14 +31,13 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::std; -using ::rtl::OUString; namespace sdext { namespace presenter { //===== PresenterBitmapContainer ============================================== PresenterBitmapContainer::PresenterBitmapContainer ( - const ::rtl::OUString& rsConfigurationBase, + const OUString& rsConfigurationBase, const ::boost::shared_ptr& rpParentContainer, const css::uno::Reference& rxComponentContext, const css::uno::Reference& rxCanvas, @@ -141,7 +140,7 @@ void PresenterBitmapContainer::LoadBitmaps ( SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( const css::uno::Reference& rxNode, - const ::rtl::OUString& rsPath, + const OUString& rsPath, const css::uno::Reference& rxPresenterHelper, const css::uno::Reference& rxCanvas, const SharedBitmapDescriptor& rpDefault) diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index 60f029629f29..c88dfb5082f6 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -92,7 +92,7 @@ public: bitmap sets. */ PresenterBitmapContainer ( - const ::rtl::OUString& rsConfigurationBase, + const OUString& rsConfigurationBase, const ::boost::shared_ptr& rpParentContainer, const css::uno::Reference& rxComponentContext, const css::uno::Reference& rxCanvas, @@ -110,18 +110,18 @@ public: /** Return the bitmap set that is associated with the given name. */ - ::boost::shared_ptr GetBitmap (const ::rtl::OUString& rsName) const; + ::boost::shared_ptr GetBitmap (const OUString& rsName) const; static ::boost::shared_ptr LoadBitmap ( const css::uno::Reference& rxNode, - const ::rtl::OUString& rsPathToBitmapNode, + const OUString& rsPathToBitmapNode, const css::uno::Reference& rxPresenterHelper, const css::uno::Reference& rxCanvas, const ::boost::shared_ptr& rpDefaultBitmap); private: ::boost::shared_ptr mpParentContainer; - typedef ::std::map > BitmapContainer; + typedef ::std::map > BitmapContainer; BitmapContainer maIconContainer; css::uno::Reference mxCanvas; css::uno::Reference mxPresenterHelper; @@ -129,7 +129,7 @@ private: void LoadBitmaps ( const css::uno::Reference& rsRootNode); void ProcessBitmap ( - const ::rtl::OUString& rsKey, + const OUString& rsKey, const css::uno::Reference& rProperties); static ::boost::shared_ptr LoadBitmap ( const css::uno::Reference& rxProperties, @@ -137,7 +137,7 @@ private: const css::uno::Reference& rxCanvas, const ::boost::shared_ptr& rpDefault); static BitmapDescriptor::TexturingMode - StringToTexturingMode (const ::rtl::OUString& rsTexturingMode); + StringToTexturingMode (const OUString& rsTexturingMode); }; typedef PresenterBitmapContainer::BitmapDescriptor PresenterBitmapDescriptor; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index bc9a1274a4d0..0326735277f9 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index 2c56e2195498..069b647207c8 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -63,7 +63,7 @@ public: const ::boost::shared_ptr& rpTheme, const css::uno::Reference& rxParentWindow, const css::uno::Reference& rxParentCanvas, - const ::rtl::OUString& rsConfigurationName); + const OUString& rsConfigurationName); ~PresenterButton (void); virtual void SAL_CALL disposing (void); @@ -125,10 +125,10 @@ private: css::uno::Reference mxWindow; css::uno::Reference mxCanvas; css::uno::Reference mxPresenterHelper; - const ::rtl::OUString msText; + const OUString msText; const PresenterTheme::SharedFontDescriptor mpFont; const PresenterTheme::SharedFontDescriptor mpMouseOverFont; - const ::rtl::OUString msAction; + const OUString msAction; css::geometry::RealPoint2D maCenter; css::geometry::IntegerSize2D maButtonSize; PresenterBitmapDescriptor::Mode meState; @@ -142,8 +142,8 @@ private: const css::uno::Reference& rxParentWindow, const PresenterTheme::SharedFontDescriptor& rFont, const PresenterTheme::SharedFontDescriptor& rMouseOverFont, - const ::rtl::OUString& rxText, - const ::rtl::OUString& rxAction); + const OUString& rxText, + const OUString& rxAction); void RenderButton ( const css::uno::Reference& rxCanvas, const css::geometry::IntegerSize2D& rSize, @@ -160,7 +160,7 @@ private: void SetupButtonBitmaps (void); static css::uno::Reference GetConfigurationProperties ( const css::uno::Reference& rxComponentContext, - const ::rtl::OUString& rsConfgurationName); + const OUString& rsConfgurationName); void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException); diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index 92f3f1ac6200..596fda71237c 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -261,7 +261,7 @@ void PresenterCanvasHelper::SetDeviceColor( css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox ( const css::uno::Reference& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 nTextDirection) { if (rxFont.is() && !rsText.isEmpty()) @@ -279,7 +279,7 @@ css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox ( css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize ( const css::uno::Reference& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 nTextDirection) { const geometry::RealRectangle2D aTextBBox (GetTextBoundingBox(rxFont, rsText, nTextDirection)); diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx index d9e10dd04967..dc5477e85229 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.hxx +++ b/sdext/source/presenter/PresenterCanvasHelper.hxx @@ -63,12 +63,12 @@ public: static css::geometry::RealRectangle2D GetTextBoundingBox ( const css::uno::Reference& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 = css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT); static css::geometry::RealSize2D GetTextSize ( const css::uno::Reference& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 = css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT); private: diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index de18f450ea0e..f285d1346898 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace cppu; using namespace osl; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index be5d839af0bf..3a36cb332623 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -27,11 +27,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { -const ::rtl::OUString PresenterConfigurationAccess::msPresenterScreenRootName = +const OUString PresenterConfigurationAccess::msPresenterScreenRootName = "/org.openoffice.Office.PresenterScreen/"; PresenterConfigurationAccess::PresenterConfigurationAccess ( @@ -78,7 +77,7 @@ PresenterConfigurationAccess::PresenterConfigurationAccess ( catch (const Exception& rException) { OSL_TRACE ("caught exception while opening configuration: %s", - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -99,7 +98,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode (const OUString& sPathToN sPathToNode); } -bool PresenterConfigurationAccess::GoToChild (const ::rtl::OUString& rsPathToNode) +bool PresenterConfigurationAccess::GoToChild (const OUString& rsPathToNode) { if ( ! IsValid()) return false; @@ -132,7 +131,7 @@ bool PresenterConfigurationAccess::GoToChild (const Predicate& rPredicate) } bool PresenterConfigurationAccess::SetProperty ( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const Any& rValue) { Reference xProperties (maNode, UNO_QUERY); @@ -162,8 +161,8 @@ Any PresenterConfigurationAccess::GetConfigurationNode ( catch (const Exception& rException) { OSL_TRACE ("caught exception while getting configuration node %s: %s", - ::rtl::OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } return Any(); @@ -171,7 +170,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode ( Reference PresenterConfigurationAccess::GetNodeProperties ( const css::uno::Reference& rxNode, - const ::rtl::OUString& rsPathToNode) + const OUString& rsPathToNode) { return Reference(GetConfigurationNode(rxNode, rsPathToNode), UNO_QUERY); } @@ -257,8 +256,8 @@ Any PresenterConfigurationAccess::Find ( } bool PresenterConfigurationAccess::IsStringPropertyEqual ( - const ::rtl::OUString& rsValue, - const ::rtl::OUString& rsPropertyName, + const OUString& rsValue, + const OUString& rsPropertyName, const css::uno::Reference& rxNode) { OUString sValue; diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index ee2035a2dab4..ea663e46a3c0 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -49,9 +49,9 @@ class PresenterConfigurationAccess public: enum WriteMode { READ_WRITE, READ_ONLY }; typedef ::boost::function&)> Predicate; - static const ::rtl::OUString msPresenterScreenRootName; + static const OUString msPresenterScreenRootName; /** Create a new object to access the configuration entries below the given root. @@ -64,7 +64,7 @@ public: */ PresenterConfigurationAccess( const css::uno::Reference& rxContext, - const ::rtl::OUString& rsRootName, + const OUString& rsRootName, WriteMode eMode); ~PresenterConfigurationAccess (void); @@ -74,7 +74,7 @@ public: The relative path from the root (as given the constructor) to the node. */ css::uno::Any GetConfigurationNode ( - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); /** Return when opening the configuration (via creating a new PresenterConfigurationAccess object) or previous calls to @@ -85,7 +85,7 @@ public: /** Move the focused node to the (possibly indirect) child specified by the given path. */ - bool GoToChild (const ::rtl::OUString& rsPathToNode); + bool GoToChild (const OUString& rsPathToNode); /** Move the focused node to the first direct child that fulfills the given predicate. */ @@ -95,7 +95,7 @@ public: mind to call CommitChanges() to write the change back to the configuration. */ - bool SetProperty (const ::rtl::OUString& rsPropertyName, const css::uno::Any& rValue); + bool SetProperty (const OUString& rsPropertyName, const css::uno::Any& rValue); /** Return a configuration node below the given node. @param rxNode @@ -109,11 +109,11 @@ public: */ static css::uno::Any GetConfigurationNode ( const css::uno::Reference& rxNode, - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); static css::uno::Reference GetNodeProperties ( const css::uno::Reference& rxNode, - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); /** Write any changes that have been made back to the configuration. This call is ignored when the called ConfigurationAccess object was @@ -122,10 +122,10 @@ public: void CommitChanges (void); typedef ::boost::function&) > ItemProcessor; typedef ::boost::function&) > PropertySetProcessor; /** Execute a functor for all elements of the given container. @@ -142,7 +142,7 @@ public: */ static void ForAll ( const css::uno::Reference& rxContainer, - const ::std::vector& rArguments, + const ::std::vector& rArguments, const ItemProcessor& rProcessor); static void ForAll ( const css::uno::Reference& rxContainer, @@ -153,8 +153,8 @@ public: const Predicate& rPredicate); static bool IsStringPropertyEqual ( - const ::rtl::OUString& rsValue, - const ::rtl::OUString& rsPropertyName, + const OUString& rsValue, + const OUString& rsPropertyName, const css::uno::Reference& rxNode); /** This method wraps a call to getPropertyValue() and returns an empty @@ -163,7 +163,7 @@ public: */ static css::uno::Any GetProperty ( const css::uno::Reference& rxProperties, - const ::rtl::OUString& rsKey); + const OUString& rsKey); private: css::uno::Reference mxRoot; diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 18d0aa943f17..0532de6b6f93 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -60,8 +60,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace { const sal_Int32 ResourceActivationEventType = 0; @@ -429,7 +427,7 @@ void PresenterController::UpdateViews (void) } SharedBitmapDescriptor - PresenterController::GetViewBackground (const ::rtl::OUString& rsViewURL) const + PresenterController::GetViewBackground (const OUString& rsViewURL) const { if (mpTheme.get() != NULL) { @@ -440,7 +438,7 @@ SharedBitmapDescriptor } PresenterTheme::SharedFontDescriptor - PresenterController::GetViewFont (const ::rtl::OUString& rsViewURL) const + PresenterController::GetViewFont (const OUString& rsViewURL) const { if (mpTheme.get() != NULL) { @@ -555,7 +553,7 @@ Reference PresenterController::GetDispatch (const util::U frame::FrameSearchFlag::SELF); } -util::URL PresenterController::CreateURLFromString (const ::rtl::OUString& rsURL) const +util::URL PresenterController::CreateURLFromString (const OUString& rsURL) const { util::URL aURL; diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index fb66f31b2e4b..e8b4ec6c2c9a 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -97,9 +97,9 @@ public: void UpdateCurrentSlide (const sal_Int32 nOffset); SharedBitmapDescriptor - GetViewBackground (const ::rtl::OUString& rsViewURL) const; + GetViewBackground (const OUString& rsViewURL) const; PresenterTheme::SharedFontDescriptor - GetViewFont (const ::rtl::OUString& rsViewURL) const; + GetViewFont (const OUString& rsViewURL) const; ::boost::shared_ptr GetTheme (void) const; ::rtl::Reference GetWindowManager (void) const; css::uno::Reference @@ -111,13 +111,13 @@ public: ::boost::shared_ptr GetPaintManager (void) const; void HideSlideSorter (void); double GetSlideAspectRatio (void) const; - void ShowView (const ::rtl::OUString& rsViewURL); - void HideView (const ::rtl::OUString& rsViewURL); + void ShowView (const OUString& rsViewURL); + void HideView (const OUString& rsViewURL); void SwitchMonitors (void); - void DispatchUnoCommand (const ::rtl::OUString& rsCommand) const; + void DispatchUnoCommand (const OUString& rsCommand) const; css::uno::Reference GetDispatch ( const css::util::URL& rURL) const; - css::util::URL CreateURLFromString (const ::rtl::OUString& rsURL) const; + css::util::URL CreateURLFromString (const OUString& rsURL) const; css::uno::Reference GetConfigurationController (void) const; css::uno::Reference GetCurrentSlide (void) const; diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx index ef77190e8d92..d9ba2009158a 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -21,7 +21,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -106,7 +105,7 @@ void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse) mpPresenterController->UpdateCurrentSlide(+1); } -void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const rtl::OUString &) +void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const OUString &) throw (css::uno::RuntimeException) { } diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 1c009c3af53d..cddb6d64af02 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -63,7 +63,7 @@ public: virtual void SAL_CALL slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL hyperLinkClicked( const ::rtl::OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException); // XAnimationListener virtual void SAL_CALL beginEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 0c318463a198..782742bf20ea 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 57153bdcf188..b855793fb3a2 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -57,7 +57,7 @@ public: throw (css::uno::RuntimeException); private: - ::rtl::OUString msEventType; + OUString msEventType; css::uno::Reference mxConfigurationController; Predicate maPredicate; Action maAction; @@ -75,7 +75,7 @@ private: */ PresenterFrameworkObserver ( const css::uno::Reference&rxController, - const ::rtl::OUString& rsEventName, + const OUString& rsEventName, const Predicate& rPredicate, const Action& rAction); virtual ~PresenterFrameworkObserver (void); diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 638b72855964..70fe8b87af17 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::std::vector; namespace sdext { namespace presenter { @@ -88,9 +87,9 @@ namespace { const OUString msText; ::boost::shared_ptr > mpLineDescriptors; - void SplitText (const ::rtl::OUString& rsText, vector& rTextParts); + void SplitText (const OUString& rsText, vector& rTextParts); void FormatText ( - const vector& rTextParts, + const vector& rTextParts, const css::uno::Reference& rxFont, const sal_Int32 nMaximalWidth); }; diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index 0145eb922ff1..1e5fae0b47c1 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx index d0145afffc53..b140d464a0fa 100644 --- a/sdext/source/presenter/PresenterHelper.hxx +++ b/sdext/source/presenter/PresenterHelper.hxx @@ -35,19 +35,19 @@ class PresenterHelper : ::boost::noncopyable { public: - static const ::rtl::OUString msPaneURLPrefix; - static const ::rtl::OUString msCenterPaneURL; - static const ::rtl::OUString msFullScreenPaneURL; + static const OUString msPaneURLPrefix; + static const OUString msCenterPaneURL; + static const OUString msFullScreenPaneURL; - static const ::rtl::OUString msViewURLPrefix; - static const ::rtl::OUString msPresenterScreenURL; - static const ::rtl::OUString msSlideSorterURL; + static const OUString msViewURLPrefix; + static const OUString msPresenterScreenURL; + static const OUString msSlideSorterURL; - static const ::rtl::OUString msResourceActivationEvent; - static const ::rtl::OUString msResourceDeactivationEvent; + static const OUString msResourceActivationEvent; + static const OUString msResourceDeactivationEvent; - static const ::rtl::OUString msDefaultPaneStyle; - static const ::rtl::OUString msDefaultViewStyle; + static const OUString msDefaultPaneStyle; + static const OUString msDefaultViewStyle; /** Return the slide show controller of a running presentation that has the same document as the given framework controller. diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 2ffb8ceb7b59..90450a414d97 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; static const sal_Int32 gnSpaceBelowSeparator (10); static const sal_Int32 gnSpaceAboveSeparator (10); @@ -226,15 +225,15 @@ void PresenterNotesView::CreateToolBar ( void PresenterNotesView::SetSlide (const Reference& rxNotesPage) { - static const ::rtl::OUString sNotesShapeName ( + static const OUString sNotesShapeName ( "com.sun.star.presentation.NotesShape"); - static const ::rtl::OUString sTextShapeName ( + static const OUString sTextShapeName ( "com.sun.star.drawing.TextShape"); Reference xIndexAccess (rxNotesPage, UNO_QUERY); if (xIndexAccess.is()) { - ::rtl::OUString sText; + OUString sText; // Iterate over all shapes and find the one that holds the text. sal_Int32 nCount (xIndexAccess->getCount()); @@ -258,7 +257,7 @@ void PresenterNotesView::SetSlide (const Reference& rxNotesP xIndexAccess->getByIndex(nIndex), UNO_QUERY); if (xShapeDescriptor.is()) { - ::rtl::OUString sType (xShapeDescriptor->getShapeType()); + OUString sType (xShapeDescriptor->getShapeType()); if (sType.equals(sNotesShapeName) || sType.equals(sTextShapeName)) { Reference xText ( diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 8f79086e61dc..458ea7d6c38f 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index 67bf1814c2f4..61ec241d5cb3 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -50,8 +50,8 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterPane (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference Create( const css::uno::Reference& rxContext) SAL_THROW((css::uno::Exception)); diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index d20b530b7be4..2ded1b0e3c31 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -117,7 +116,7 @@ void PresenterPaneBase::SetTitle (const OUString& rsTitle) mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow); } -::rtl::OUString PresenterPaneBase::GetTitle (void) const +OUString PresenterPaneBase::GetTitle (void) const { return msTitle; } @@ -448,7 +447,7 @@ void PresenterPaneBase::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString( "PresenterPane object has already been disposed"), + OUString( "PresenterPane object has already been disposed"), static_cast(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index eb9fa8d9b3a3..170a743c299c 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -74,8 +74,8 @@ public: css::uno::Reference GetBorderWindow (void) const; void SetBackground (const SharedBitmapDescriptor& rpBackground); - void SetTitle (const ::rtl::OUString& rsTitle); - ::rtl::OUString GetTitle (void) const; + void SetTitle (const OUString& rsTitle); + OUString GetTitle (void) const; css::uno::Reference GetPaneBorderPainter (void) const; void SetCalloutAnchor (const css::awt::Point& rAnchorPosition); css::awt::Point GetCalloutAnchor (void) const; @@ -122,7 +122,7 @@ protected: css::uno::Reference mxPaneId; css::uno::Reference mxBorderPainter; css::uno::Reference mxPresenterHelper; - ::rtl::OUString msTitle; + OUString msTitle; css::uno::Reference mxComponentContext; SharedBitmapDescriptor mpViewBackground; bool mbHasCallout; diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 7f09074721c7..5cb992a6d1de 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -52,9 +51,9 @@ OUString PresenterPaneBorderManager::getImplementationName_static (void) Sequence PresenterPaneBorderManager::getSupportedServiceNames_static (void) { - static const ::rtl::OUString sServiceName( + static const OUString sServiceName( "com.sun.star.drawing.PresenterPaneBorderManager"); - return Sequence(&sServiceName, 1); + return Sequence(&sServiceName, 1); } Reference PresenterPaneBorderManager::Create (const Reference& rxContext) @@ -504,7 +503,7 @@ void PresenterPaneBorderManager::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString( "PresenterPaneBorderManager object has already been disposed"), + OUString( "PresenterPaneBorderManager object has already been disposed"), static_cast(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx index a37fde6db78e..e95147a5dfdd 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.hxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx @@ -71,8 +71,8 @@ public: virtual void SAL_CALL disposing (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference Create( const css::uno::Reference& rxContext) SAL_THROW((css::uno::Exception)); diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index bcee08161b8e..9b03dc3a576e 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -173,7 +172,7 @@ PresenterPaneBorderPainter::~PresenterPaneBorderPainter (void) //----- XPaneBorderPainter ---------------------------------------------------- awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, drawing::framework::BorderType eBorderType) throw(css::uno::RuntimeException) @@ -186,7 +185,7 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( } awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, drawing::framework::BorderType eBorderType) throw(css::uno::RuntimeException) @@ -199,11 +198,11 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( } void SAL_CALL PresenterPaneBorderPainter::paintBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle) + const OUString& rsTitle) throw(css::uno::RuntimeException) { ThrowIfDisposed(); @@ -234,11 +233,11 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorder ( } void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle, + const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) throw(css::uno::RuntimeException) { @@ -271,7 +270,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( } awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset ( - const rtl::OUString& rsPaneBorderStyleName) + const OUString& rsPaneBorderStyleName) throw(css::uno::RuntimeException) { ThrowIfDisposed(); @@ -351,7 +350,7 @@ void PresenterPaneBorderPainter::SetTheme (const ::boost::shared_ptr& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle) + const OUString& rsTitle) throw(css::uno::RuntimeException); virtual void SAL_CALL paintBorderWithCallout ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle, + const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) throw(css::uno::RuntimeException); virtual css::awt::Point SAL_CALL getCalloutOffset ( - const rtl::OUString& rsPaneBorderStyleName) + const OUString& rsPaneBorderStyleName) throw(css::uno::RuntimeException); private: diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 9a06197cd04d..76ead71214d5 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -327,7 +326,7 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindViewURL return SharedPaneDescriptor(); } -::rtl::OUString PresenterPaneContainer::GetPaneURLForViewURL (const ::rtl::OUString& rsViewURL) +OUString PresenterPaneContainer::GetPaneURLForViewURL (const OUString& rsViewURL) { SharedPaneDescriptor pDescriptor (FindViewURL(rsViewURL)); if (pDescriptor.get() != NULL) diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index 951ee1564c40..abe7df99e6f7 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -82,14 +82,14 @@ public: typedef ::boost::function Activator; typedef ::boost::function()> SpriteProvider; css::uno::Reference mxPaneId; - ::rtl::OUString msViewURL; + OUString msViewURL; ::rtl::Reference mxPane; css::uno::Reference mxView; css::uno::Reference mxContentWindow; css::uno::Reference mxBorderWindow; - ::rtl::OUString msTitleTemplate; - ::rtl::OUString msAccessibleTitleTemplate; - ::rtl::OUString msTitle; + OUString msTitleTemplate; + OUString msAccessibleTitleTemplate; + OUString msTitle; ViewInitializationFunction maViewInitialization; double mnLeft; double mnTop; @@ -113,9 +113,9 @@ public: void PreparePane ( const css::uno::Reference& rxPaneId, - const ::rtl::OUString& rsViewURL, - const ::rtl::OUString& rsTitle, - const ::rtl::OUString& rsAccessibleTitle, + const OUString& rsViewURL, + const OUString& rsTitle, + const OUString& rsAccessibleTitle, const bool bIsOpaque, const ViewInitializationFunction& rViewIntialization, const double nLeft, @@ -156,16 +156,16 @@ public: /** Find the pane whose pane URL is identical to the given URL string. */ - SharedPaneDescriptor FindPaneURL (const ::rtl::OUString& rsPaneURL); + SharedPaneDescriptor FindPaneURL (const OUString& rsPaneURL); /** Find the pane whose resource id is identical to the given one. */ SharedPaneDescriptor FindPaneId (const css::uno::Reference< css::drawing::framework::XResourceId>& rxPaneId); - SharedPaneDescriptor FindViewURL (const ::rtl::OUString& rsViewURL); + SharedPaneDescriptor FindViewURL (const OUString& rsViewURL); - ::rtl::OUString GetPaneURLForViewURL (const ::rtl::OUString& rsViewURL); + OUString GetPaneURLForViewURL (const OUString& rsViewURL); void ToTop (const SharedPaneDescriptor& rpDescriptor); @@ -178,7 +178,7 @@ public: private: css::uno::Reference mxPresenterHelper; - PaneList::const_iterator FindIteratorForPaneURL (const ::rtl::OUString& rsPaneURL); + PaneList::const_iterator FindIteratorForPaneURL (const OUString& rsPaneURL); }; } } // end of namespace ::sdext::presenter diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 775244ddfc8b..958bc363e1ab 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -36,24 +36,23 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { -const ::rtl::OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL( +const OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL( "private:resource/pane/Presenter/Pane1"); -const ::rtl::OUString PresenterPaneFactory::msNextSlidePreviewPaneURL( +const OUString PresenterPaneFactory::msNextSlidePreviewPaneURL( "private:resource/pane/Presenter/Pane2"); -const ::rtl::OUString PresenterPaneFactory::msNotesPaneURL( +const OUString PresenterPaneFactory::msNotesPaneURL( "private:resource/pane/Presenter/Pane3"); -const ::rtl::OUString PresenterPaneFactory::msToolBarPaneURL( +const OUString PresenterPaneFactory::msToolBarPaneURL( "private:resource/pane/Presenter/Pane4"); -const ::rtl::OUString PresenterPaneFactory::msSlideSorterPaneURL( +const OUString PresenterPaneFactory::msSlideSorterPaneURL( "private:resource/pane/Presenter/Pane5"); -const ::rtl::OUString PresenterPaneFactory::msHelpPaneURL( +const OUString PresenterPaneFactory::msHelpPaneURL( "private:resource/pane/Presenter/Pane6"); -const ::rtl::OUString PresenterPaneFactory::msOverlayPaneURL( +const OUString PresenterPaneFactory::msOverlayPaneURL( "private:resource/pane/Presenter/Overlay"); //===== PresenterPaneFactory ================================================== diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index c03674dd69ad..ec2db5a54357 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -53,13 +53,13 @@ class PresenterPaneFactory public PresenterPaneFactoryInterfaceBase { public: - static const ::rtl::OUString msCurrentSlidePreviewPaneURL; - static const ::rtl::OUString msNextSlidePreviewPaneURL; - static const ::rtl::OUString msNotesPaneURL; - static const ::rtl::OUString msToolBarPaneURL; - static const ::rtl::OUString msSlideSorterPaneURL; - static const ::rtl::OUString msHelpPaneURL; - static const ::rtl::OUString msOverlayPaneURL; + static const OUString msCurrentSlidePreviewPaneURL; + static const OUString msNextSlidePreviewPaneURL; + static const OUString msNotesPaneURL; + static const OUString msToolBarPaneURL; + static const OUString msSlideSorterPaneURL; + static const OUString msHelpPaneURL; + static const OUString msOverlayPaneURL; /** Create a new instance of this class and register it as resource factory in the drawing framework of the given controller. @@ -73,8 +73,8 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterPaneFactory (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference Create( const css::uno::Reference& rxContext) SAL_THROW((css::uno::Exception)); @@ -101,7 +101,7 @@ private: css::uno::WeakReference mxConfigurationControllerWeak; ::rtl::Reference mpPresenterController; - typedef ::std::map > + typedef ::std::map > ResourceContainer; ::boost::scoped_ptr mpResourceCache; @@ -113,10 +113,10 @@ private: css::uno::Reference CreatePane ( const css::uno::Reference& rxPaneId, - const ::rtl::OUString& rsTitle); + const OUString& rsTitle); css::uno::Reference CreatePane ( const css::uno::Reference& rxPaneId, - const ::rtl::OUString& rsTitle, + const OUString& rsTitle, const css::uno::Reference& rxParentPane, const bool bIsSpritePane); diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 18500ee0e2ab..60068de88daf 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -241,8 +240,8 @@ OUString PresenterProtocolHandler::getImplementationName_static (void) Sequence PresenterProtocolHandler::getSupportedServiceNames_static (void) { - static const ::rtl::OUString sServiceName("com.sun.star.frame.ProtocolHandler"); - return Sequence(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.frame.ProtocolHandler"); + return Sequence(&sServiceName, 1); } Reference PresenterProtocolHandler::Create ( @@ -295,7 +294,7 @@ void SAL_CALL PresenterProtocolHandler::initialize (const Sequence& aArgume Reference SAL_CALL PresenterProtocolHandler::queryDispatch ( const css::util::URL& rURL, - const rtl::OUString& rsTargetFrameName, + const OUString& rsTargetFrameName, sal_Int32 nSearchFlags) throw(RuntimeException) { diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index 0d3994fa24d1..1e8db5f584da 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -51,8 +51,8 @@ public: void SAL_CALL disposing (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference Create( const css::uno::Reference& rxContext) SAL_THROW((css::uno::Exception)); @@ -68,7 +68,7 @@ public: virtual css::uno::Reference SAL_CALL queryDispatch ( const css::util::URL& aURL, - const rtl::OUString& aTargetFrameName, + const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException); diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 202888710519..8fe7fcebaf8f 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -99,7 +98,7 @@ OUString PresenterScreenJob::getImplementationName_static (void) Sequence PresenterScreenJob::getSupportedServiceNames_static (void) { - return Sequence(); + return Sequence(); } Reference PresenterScreenJob::Create (const Reference& rxContext) @@ -684,7 +683,7 @@ void PresenterScreen::ProcessLayout ( OUString("Layout")), UNO_QUERY_THROW); - ::std::vector aProperties (6); + ::std::vector aProperties (6); aProperties[0] = OUString("PaneURL"); aProperties[1] = OUString("ViewURL"); aProperties[2] = OUString("RelativeX"); @@ -715,7 +714,7 @@ void PresenterScreen::ProcessViewDescriptions ( rConfiguration.GetConfigurationNode("Presenter/Views"), UNO_QUERY_THROW); - ::std::vector aProperties (4); + ::std::vector aProperties (4); aProperties[0] = OUString("ViewURL"); aProperties[1] = OUString("Title"); aProperties[2] = OUString("AccessibleTitle"); diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 2538fea31219..1647f84b99d7 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -62,8 +62,8 @@ class PresenterScreenJob public PresenterScreenJobInterfaceBase { public: - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference Create( const css::uno::Reference& rxContext) SAL_THROW((css::uno::Exception)); @@ -153,7 +153,7 @@ private: { } }; - typedef ::std::map ViewDescriptorContainer; + typedef ::std::map ViewDescriptorContainer; ViewDescriptorContainer maViewDescriptors; void ShutdownPresenterScreen (void); @@ -181,7 +181,7 @@ private: */ void ProcessLayout ( PresenterConfigurationAccess& rConfiguration, - const ::rtl::OUString& rsLayoutName, + const OUString& rsLayoutName, const css::uno::Reference& rxContext, const css::uno::Reference& rxAnchorId); @@ -189,7 +189,7 @@ private: configuration list. */ void ProcessComponent ( - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector& rValues, const css::uno::Reference& rxContext, const css::uno::Reference& rxAnchorId); @@ -202,14 +202,14 @@ private: /** Called by ProcessViewDescriptions for a single entry. */ void ProcessViewDescription ( - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector& rValues); void SetupView ( const css::uno::Reference& rxContext, const css::uno::Reference& rxAnchorId, - const ::rtl::OUString& rsPaneURL, - const ::rtl::OUString& rsViewURL, + const OUString& rsPaneURL, + const OUString& rsViewURL, const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization, const double nLeft, const double nTop, diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 774d5dfa00b9..c48b8d148a34 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; const static double gnScrollBarGap (10); diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 1829d9c1da7d..e7b7b51b6594 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace { @@ -356,7 +355,7 @@ void PresenterSlidePreview::ThrowIfDisposed (void) if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString( "PresenterSlidePreview object has already been disposed"), + OUString( "PresenterSlidePreview object has already been disposed"), static_cast(this)); } } diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index e0ddc680c520..34457f18d9d8 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index ed676c13ccb3..a392842d2e99 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -235,9 +235,9 @@ private: bool mbIsInModifyNotification; bool mbIsForcedPaintPending; bool mbIsPaintPending; - ::rtl::OUString msClickToExitPresentationText; - ::rtl::OUString msClickToExitPresentationTitle; - ::rtl::OUString msTitleTemplate; + OUString msClickToExitPresentationText; + OUString msClickToExitPresentationTitle; + OUString msTitleTemplate; bool mbIsEndSlideVisible; css::uno::Reference mxCurrentSlide; diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index a49ba0aeeab0..daad9e1c5284 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace { const static sal_Int32 gnVerticalGap (10); diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index c7364477eef7..b1bd9045f332 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 43687e3b87df..8787c4505ca2 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -61,8 +61,8 @@ public: ::boost::shared_ptr GetSprite (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference Create( const css::uno::Reference& rxContext) SAL_THROW((css::uno::Exception)); diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 2be9a4b9b3b2..4463ea236c10 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -712,7 +712,7 @@ void PresenterTextParagraph::AddWord ( if ( ! maLines.empty()) nLineStart = rCurrentLine.startPos; - const ::rtl::OUString sLineCandidate ( + const OUString sLineCandidate ( msParagraphText.copy(nLineStart, nWordBoundary-nLineStart)); css::geometry::RealRectangle2D aLineBox ( @@ -792,7 +792,7 @@ sal_Unicode PresenterTextParagraph::GetCharacter ( } } -::rtl::OUString PresenterTextParagraph::GetText (void) const +OUString PresenterTextParagraph::GetText (void) const { return msParagraphText; } @@ -859,7 +859,7 @@ TextSegment PresenterTextParagraph::GetTextSegment ( return CreateTextSegment(nIndex+nOffset, nIndex+nOffset+1); } - return TextSegment(::rtl::OUString(), 0,0); + return TextSegment(OUString(), 0,0); } TextSegment PresenterTextParagraph::GetWordTextSegment ( @@ -913,7 +913,7 @@ TextSegment PresenterTextParagraph::CreateTextSegment ( { if (nEndIndex <= nStartIndex) return TextSegment( - ::rtl::OUString(), + OUString(), nStartIndex, nEndIndex); else @@ -1239,7 +1239,7 @@ void PresenterTextParagraph::Line::ProvideCellBoxes (void) } void PresenterTextParagraph::Line::ProvideLayoutedLine ( - const ::rtl::OUString& rsParagraphText, + const OUString& rsParagraphText, const PresenterTheme::SharedFontDescriptor& rpFont, const sal_Int8 nTextDirection) { diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 5eba5bfb1457..2cbb37517558 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -111,7 +111,7 @@ public: void SetCharacterOffset (const sal_Int32 nCharacterOffset); sal_Int32 GetCharacterCount (void) const; sal_Unicode GetCharacter (const sal_Int32 nGlobalCharacterIndex) const; - ::rtl::OUString GetText (void) const; + OUString GetText (void) const; cssa::TextSegment GetTextSegment ( const sal_Int32 nOffset, const sal_Int32 nGlobalCharacterIndex, @@ -142,7 +142,7 @@ public: css::awt::Size GetSize (void); private: - ::rtl::OUString msParagraphText; + OUString msParagraphText; const sal_Int32 mnParagraphIndex; SharedPresenterTextCaret mpCaret; @@ -174,7 +174,7 @@ private: cssu::Sequence maCellBoxes; void ProvideLayoutedLine ( - const ::rtl::OUString& rsParagraphText, + const OUString& rsParagraphText, const PresenterTheme::SharedFontDescriptor& rpFont, const sal_Int8 nTextDirection); void ProvideCellBoxes (void); diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 58ee37b4ecb9..5a37c1e281ea 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::std; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -103,7 +102,7 @@ public: */ static PresenterTheme::SharedFontDescriptor ReadFont ( const css::uno::Reference& rxTheme, - const ::rtl::OUString& rsFontPath, + const OUString& rsFontPath, const PresenterTheme::SharedFontDescriptor& rpDefault); static PresenterTheme::SharedFontDescriptor ReadFont ( const Reference& rxFontProperties, @@ -159,7 +158,7 @@ public: private: void ProcessPaneStyle ( ReadContext& rReadContext, - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector& rValues); }; @@ -220,7 +219,7 @@ private: void ProcessStyleAssociation( ReadContext& rReadContext, - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector& rValues); }; @@ -249,7 +248,7 @@ public: StyleAssociationContainer maStyleAssociations; Reference mxThemeRoot; ::boost::shared_ptr mpIconContainer; - typedef map FontContainer; + typedef map FontContainer; FontContainer maFontContainer; SharedPaneStyle GetPaneStyle (const OUString& rsStyleName) const; @@ -266,7 +265,7 @@ private: PresenterTheme::PresenterTheme ( const css::uno::Reference& rxContext, - const rtl::OUString& rsThemeName, + const OUString& rsThemeName, const css::uno::Reference& rxCanvas) : mxContext(rxContext), msThemeName(rsThemeName), @@ -307,7 +306,7 @@ void PresenterTheme::ProvideCanvas (const Reference& rxCanva } } -OUString PresenterTheme::GetStyleName (const ::rtl::OUString& rsResourceURL) const +OUString PresenterTheme::GetStyleName (const OUString& rsResourceURL) const { OUString sStyleName; ::boost::shared_ptr pTheme (mpTheme); @@ -320,7 +319,7 @@ OUString PresenterTheme::GetStyleName (const ::rtl::OUString& rsResourceURL) con } ::std::vector PresenterTheme::GetBorderSize ( - const ::rtl::OUString& rsStyleName, + const OUString& rsStyleName, const bool bOuter) const { OSL_ASSERT(mpTheme.get() != NULL); @@ -366,7 +365,7 @@ bool PresenterTheme::ConvertToColor ( } ::boost::shared_ptr PresenterTheme::GetNodeForViewStyle ( - const ::rtl::OUString& rsStyleName) const + const OUString& rsStyleName) const { if (mpTheme.get() == NULL) return ::boost::shared_ptr(); @@ -853,7 +852,7 @@ void PaneStyleContainer::Read ( UNO_QUERY); if (xPaneStyleList.is()) { - ::std::vector aProperties; + ::std::vector aProperties; aProperties.reserve(6); aProperties.push_back("StyleName"); aProperties.push_back("ParentStyle"); @@ -1117,7 +1116,7 @@ void StyleAssociationContainer::Read ( UNO_QUERY); if (xStyleAssociationList.is()) { - ::std::vector aProperties (2); + ::std::vector aProperties (2); aProperties[0] = "ResourceURL"; aProperties[1] = "StyleName"; PresenterConfigurationAccess::ForAll( diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 436758f123e1..45bb5da01b46 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -60,16 +60,16 @@ class PresenterTheme public: PresenterTheme ( const css::uno::Reference& rxContext, - const rtl::OUString& rsThemeName, + const OUString& rsThemeName, const css::uno::Reference& rxCanvas); ~PresenterTheme (void); bool HasCanvas (void) const; void ProvideCanvas (const css::uno::Reference& rxCanvas); - ::rtl::OUString GetStyleName (const ::rtl::OUString& rsResourceURL) const; + OUString GetStyleName (const OUString& rsResourceURL) const; ::std::vector GetBorderSize ( - const ::rtl::OUString& rsStyleName, + const OUString& rsStyleName, const bool bOuter) const; class Theme; @@ -78,11 +78,11 @@ public: public: explicit FontDescriptor (const ::boost::shared_ptr& rpDescriptor); - ::rtl::OUString msFamilyName; - ::rtl::OUString msStyleName; + OUString msFamilyName; + OUString msStyleName; sal_Int32 mnSize; sal_uInt32 mnColor; - ::rtl::OUString msAnchor; + OUString msAnchor; sal_Int32 mnXOffset; sal_Int32 mnYOffset; css::uno::Reference mxFont; @@ -100,20 +100,20 @@ public: typedef ::boost::shared_ptr SharedFontDescriptor; SharedBitmapDescriptor GetBitmap ( - const ::rtl::OUString& rsStyleName, - const ::rtl::OUString& rsBitmapName) const; + const OUString& rsStyleName, + const OUString& rsBitmapName) const; SharedBitmapDescriptor GetBitmap ( - const ::rtl::OUString& rsBitmapName) const; + const OUString& rsBitmapName) const; ::boost::shared_ptr GetBitmapContainer (void) const; SharedFontDescriptor GetFont ( - const ::rtl::OUString& rsStyleName) const; + const OUString& rsStyleName) const; static SharedFontDescriptor ReadFont ( const css::uno::Reference& rxNode, - const ::rtl::OUString& rsFontPath, + const OUString& rsFontPath, const SharedFontDescriptor& rDefaultFount); static bool ConvertToColor ( @@ -121,11 +121,11 @@ public: sal_uInt32& rColor); ::boost::shared_ptr GetNodeForViewStyle ( - const ::rtl::OUString& rsStyleName) const; + const OUString& rsStyleName) const; private: css::uno::Reference mxContext; - const ::rtl::OUString msThemeName; + const OUString msThemeName; ::boost::shared_ptr mpTheme; ::boost::shared_ptr mpBitmapContainer; css::uno::Reference mxCanvas; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 76aaa7ca4fec..ce5c61f41ac6 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -105,7 +104,7 @@ namespace { void ReadElementMode ( const Reference& rxProperties, - const ::rtl::OUString& rsModeName, + const OUString& rsModeName, ::boost::shared_ptr& rpDefaultMode, ::sdext::presenter::PresenterToolBar::Context& rContext); }; @@ -387,7 +386,7 @@ PresenterToolBar::PresenterToolBar ( } void PresenterToolBar::Initialize ( - const ::rtl::OUString& rsConfigurationPath) + const OUString& rsConfigurationPath) { try { @@ -621,7 +620,7 @@ Reference SAL_CALL PresenterToolBar::getCurrentPage (void) //----------------------------------------------------------------------------- void PresenterToolBar::CreateControls ( - const ::rtl::OUString& rsConfigurationPath) + const OUString& rsConfigurationPath) { if ( ! mxWindow.is()) return; @@ -1806,7 +1805,7 @@ TimeFormatter::TimeFormatter (void) OUString TimeFormatter::FormatTime (const oslDateTime& rTime) { - ::rtl::OUStringBuffer sText; + OUStringBuffer sText; const sal_Int32 nHours (sal::static_int_cast(rTime.Hours)); const sal_Int32 nMinutes (sal::static_int_cast(rTime.Minutes)); diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index d289394067a9..edbd55a5f979 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -91,7 +91,7 @@ public: virtual ~PresenterToolBar (void); void Initialize ( - const ::rtl::OUString& rsConfigurationPath); + const OUString& rsConfigurationPath); virtual void SAL_CALL disposing (void); @@ -184,7 +184,7 @@ private: css::geometry::RealSize2D maMinimalSize; void CreateControls ( - const ::rtl::OUString& rsConfigurationPath); + const OUString& rsConfigurationPath); void Layout (const css::uno::Reference& rxCanvas); css::geometry::RealSize2D CalculatePartSize ( const css::uno::Reference& rxCanvas, diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 46c763a08cfd..4ebc8fe59245 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -41,21 +41,20 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { -const ::rtl::OUString PresenterViewFactory::msCurrentSlidePreviewViewURL( +const OUString PresenterViewFactory::msCurrentSlidePreviewViewURL( "private:resource/view/Presenter/CurrentSlidePreview"); -const ::rtl::OUString PresenterViewFactory::msNextSlidePreviewViewURL( +const OUString PresenterViewFactory::msNextSlidePreviewViewURL( "private:resource/view/Presenter/NextSlidePreview"); -const ::rtl::OUString PresenterViewFactory::msNotesViewURL( +const OUString PresenterViewFactory::msNotesViewURL( "private:resource/view/Presenter/Notes"); -const ::rtl::OUString PresenterViewFactory::msToolBarViewURL( +const OUString PresenterViewFactory::msToolBarViewURL( "private:resource/view/Presenter/ToolBar"); -const ::rtl::OUString PresenterViewFactory::msSlideSorterURL( +const OUString PresenterViewFactory::msSlideSorterURL( "private:resource/view/Presenter/SlideSorter"); -const ::rtl::OUString PresenterViewFactory::msHelpViewURL( +const OUString PresenterViewFactory::msHelpViewURL( "private:resource/view/Presenter/Help"); //===== SimpleView ============================================================ diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 80df427fa171..5d616f34ed92 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -79,12 +79,12 @@ class PresenterViewFactory public PresenterViewFactoryInterfaceBase { public: - static const ::rtl::OUString msCurrentSlidePreviewViewURL; - static const ::rtl::OUString msNextSlidePreviewViewURL; - static const ::rtl::OUString msNotesViewURL; - static const ::rtl::OUString msToolBarViewURL; - static const ::rtl::OUString msSlideSorterURL; - static const ::rtl::OUString msHelpViewURL; + static const OUString msCurrentSlidePreviewViewURL; + static const OUString msNextSlidePreviewViewURL; + static const OUString msNotesViewURL; + static const OUString msToolBarViewURL; + static const OUString msSlideSorterURL; + static const OUString msHelpViewURL; /** Create a new instance of this class and register it as resource factory in the drawing framework of the given controller. @@ -98,8 +98,8 @@ public: const ::rtl::Reference& rpPresenterController); virtual ~PresenterViewFactory (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference Create( const css::uno::Reference& rxContext) SAL_THROW((css::uno::Exception)); @@ -127,7 +127,7 @@ private: ::rtl::Reference mpPresenterController; typedef ::std::pair, css::uno::Reference > ViewResourceDescriptor; - typedef ::std::map ResourceContainer; + typedef ::std::map ResourceContainer; ::boost::scoped_ptr mpResourceCache; PresenterViewFactory ( diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index c195c5b4bc44..fddf3e53554e 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 02c45fee05c0..3544c45aaeed 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -79,7 +79,7 @@ public: void SetTheme (const ::boost::shared_ptr& rpTheme); void NotifyViewCreation (const css::uno::Reference& rxView); void SetPanePosSizeAbsolute ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const double nX, const double nY, const double nWidth, @@ -214,7 +214,7 @@ private: css::awt::Size CalculatePaneSize ( const double nOuterWidth, - const ::rtl::OUString& rsPaneURL); + const OUString& rsPaneURL); /** Notify changes of the layout mode and of the slide sorter state. */ diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx index 6768ccc449fe..18b31de66bcb 100644 --- a/sfx2/inc/bluthsndapi.hxx +++ b/sfx2/inc/bluthsndapi.hxx @@ -45,7 +45,7 @@ class SFX2_DLLPUBLIC SfxBluetoothModel:public SfxMailModel { public: SendMailResult SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& rType ); + const OUString& rType ); SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); }; diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx index 35f106ee8b2e..a62ea316a1e7 100644 --- a/sfx2/inc/frmload.hxx +++ b/sfx2/inc/frmload.hxx @@ -64,16 +64,16 @@ protected: private: const SfxFilter* impl_getFilterFromServiceName_nothrow( - const ::rtl::OUString& i_rServiceName + const OUString& i_rServiceName ) const; - ::rtl::OUString impl_askForFilter_nothrow( + OUString impl_askForFilter_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& i_rxHandler, - const ::rtl::OUString& i_rDocumentURL + const OUString& i_rDocumentURL ) const; const SfxFilter* impl_detectFilterForURL( - const ::rtl::OUString& _rURL, + const OUString& _rURL, const ::comphelper::NamedValueCollection& i_rDescriptor, const SfxFilterMatcher& rMatcher ) const; @@ -93,7 +93,7 @@ private: ) const; sal_uInt16 impl_findSlotParam( - const ::rtl::OUString& i_rFactoryURL + const OUString& i_rFactoryURL ) const; SfxObjectShellRef impl_findObjectShell( @@ -129,7 +129,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel2 >& i_rModel, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::comphelper::NamedValueCollection& i_rViewFactoryArgs, - const ::rtl::OUString& i_rViewName + const OUString& i_rViewName ); }; diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx index 906e22f67cf2..a6d6b7c7ba12 100644 --- a/sfx2/inc/guisaveas.hxx +++ b/sfx2/inc/guisaveas.hxx @@ -59,15 +59,15 @@ public: sal_Bool GUIStoreModel( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel, - const ::rtl::OUString& aSlotName, + const OUString& aSlotName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsSequence, sal_Bool bPreselectPassword, - ::rtl::OUString aUserSelectedName, + OUString aUserSelectedName, sal_uInt16 nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES ); static sal_Bool CheckFilterOptionsAppearence( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, - const ::rtl::OUString& aFilterName ); + const OUString& aFilterName ); static void SetDocInfoState( @@ -78,8 +78,8 @@ public: static sal_Bool WarnUnacceptableFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel, - ::rtl::OUString aOldUIName, - ::rtl::OUString aDefUIName, + OUString aOldUIName, + OUString aDefUIName, sal_Bool bCanProceedFurther ); static Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); diff --git a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx index 33808a4b916b..d81401266ac3 100644 --- a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx +++ b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx @@ -67,8 +67,8 @@ createBaseURI( const & i_xContext, ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> const & i_xStorage, - ::rtl::OUString const & i_rPkgURI, - ::rtl::OUString const & i_rSubDocument = ::rtl::OUString()); + OUString const & i_rPkgURI, + OUString const & i_rSubDocument = OUString()); class IXmlIdRegistrySupplier; @@ -84,7 +84,7 @@ public: explicit DocumentMetadataAccess(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_xContext, IXmlIdRegistrySupplier const & i_rRegistrySupplier, - ::rtl::OUString const & i_rBaseURI); + OUString const & i_rBaseURI); // N.B.: in contrast to previous, this constructor does _not_ initialize! // caller must immediately call loadFromStorage/Medium! explicit DocumentMetadataAccess(::com::sun::star::uno::Reference< @@ -93,13 +93,13 @@ public: virtual ~DocumentMetadataAccess(); // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() + virtual OUString SAL_CALL getStringValue() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::rdf::XURI: - virtual ::rtl::OUString SAL_CALL getNamespace() + virtual OUString SAL_CALL getNamespace() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLocalName() + virtual OUString SAL_CALL getLocalName() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::rdf::XRepositorySupplier: @@ -127,7 +127,7 @@ public: ::com::sun::star::lang::IllegalArgumentException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI> SAL_CALL - addMetadataFile(const ::rtl::OUString & i_rFileName, + addMetadataFile(const OUString & i_rFileName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > > & i_rTypes) @@ -139,7 +139,7 @@ public: importMetadataFile(::sal_Int16 i_Format, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & i_xInStream, - const ::rtl::OUString & i_rFileName, + const OUString & i_rFileName, const ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > & i_xBaseURI, const ::com::sun::star::uno::Sequence< @@ -158,12 +158,12 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException); virtual void SAL_CALL addContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException); virtual void SAL_CALL removeContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException); diff --git a/sfx2/inc/sfx2/Metadatable.hxx b/sfx2/inc/sfx2/Metadatable.hxx index 432f02eed213..70737da920ce 100644 --- a/sfx2/inc/sfx2/Metadatable.hxx +++ b/sfx2/inc/sfx2/Metadatable.hxx @@ -146,13 +146,13 @@ public: virtual ~MetadatableMixin() {} // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() + virtual OUString SAL_CALL getStringValue() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::rdf::XURI: - virtual ::rtl::OUString SAL_CALL getLocalName() + virtual OUString SAL_CALL getLocalName() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNamespace() + virtual OUString SAL_CALL getNamespace() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::rdf::XMetadatable: diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx index d93eaacb0cbd..a7540dc469b0 100644 --- a/sfx2/inc/sfx2/XmlIdRegistry.hxx +++ b/sfx2/inc/sfx2/XmlIdRegistry.hxx @@ -36,10 +36,10 @@ namespace sfx2 { // XML ID utilities -------------------------------------------------- /** is i_rIdref a valid NCName ? */ -bool SFX2_DLLPUBLIC isValidNCName(::rtl::OUString const & i_rIdref); +bool SFX2_DLLPUBLIC isValidNCName(OUString const & i_rIdref); -bool SFX2_DLLPUBLIC isValidXmlId(::rtl::OUString const & i_rStreamName, - ::rtl::OUString const & i_rIdref); +bool SFX2_DLLPUBLIC isValidXmlId(OUString const & i_rStreamName, + OUString const & i_rIdref); // XML ID handling --------------------------------------------------- diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index bc8613fadce6..2f81d6d61335 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -183,7 +183,7 @@ public: // Basic/Scripting static sal_Bool IsXScriptURL( const String& rScriptURL ); - static ::rtl::OUString ChooseScript(); + static OUString ChooseScript(); static void MacroOrganizer( sal_Int16 nTabId ); static ErrCode CallBasic( const String&, BasicManager*, SbxArray *pArgs, SbxValue *pRet ); static ErrCode CallAppBasic( const String& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL ) diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx index 3679eb26dc7c..90bf2d5edf58 100644 --- a/sfx2/inc/sfx2/appuno.hxx +++ b/sfx2/inc/sfx2/appuno.hxx @@ -65,10 +65,10 @@ public: SfxMacroLoader( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) {} - static ErrCode loadMacro( const ::rtl::OUString& aURL, ::com::sun::star::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( ::com::sun::star::uno::RuntimeException ); + static ErrCode loadMacro( const OUString& aURL, ::com::sun::star::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > SAL_CALL - queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTargetFrameName, + queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTargetFrameName, FrameSearchFlags eSearchFlags ) throw( ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence < ::com::sun::star::frame::DispatchDescriptor >& seqDescriptor ) @@ -93,7 +93,7 @@ public: SFX_DECL_XSERVICEINFO virtual ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > SAL_CALL - queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTargetFrameName, + queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTargetFrameName, FrameSearchFlags eSearchFlags ) throw( ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence < ::com::sun::star::frame::DispatchDescriptor >& seqDescriptor ) diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index fe86e3d0d659..95278e89e605 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -69,7 +69,7 @@ private: protected: SfxModalDialog(Window *pParent, const ResId& ); - SfxModalDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription); + SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); SfxModalDialog(Window* pParent, sal_uInt32 nUniqueId, WinBits nWinStyle = WB_STDMODAL ); String& GetExtraData() { return aExtraData; } @@ -104,7 +104,7 @@ protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, Window*, const ResId& ); SfxModelessDialog( SfxBindings*, SfxChildWindow*, - Window*, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + Window*, const OString& rID, const OUString& rUIXMLDescription ); ~SfxModelessDialog(); virtual sal_Bool Close(); virtual void Resize(); diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx index 73fce08a118e..73ac3dc6bc3b 100644 --- a/sfx2/inc/sfx2/bindings.hxx +++ b/sfx2/inc/sfx2/bindings.hxx @@ -206,9 +206,9 @@ public: #define ENTERREGISTRATIONS() EnterRegistrations(__FILE__, __LINE__) #define LEAVEREGISTRATIONS() LeaveRegistrations(USHRT_MAX, __FILE__, __LINE__) #define DENTERREGISTRATIONS() \ - EnterRegistrations( rtl::OStringBuffer(__FILE__).append('(').append(reinterpret_cast(this)).append(')').getStr(), __LINE__ ) + EnterRegistrations( OStringBuffer(__FILE__).append('(').append(reinterpret_cast(this)).append(')').getStr(), __LINE__ ) #define DLEAVEREGISTRATIONS( ) \ - LeaveRegistrations( USHRT_MAX, rtl::OStringBuffer(__FILE__).append('(').append(reinterpret_cast(this)).append(')').getStr(), __LINE__ ) + LeaveRegistrations( USHRT_MAX, OStringBuffer(__FILE__).append('(').append(reinterpret_cast(this)).append(')').getStr(), __LINE__ ) #else #define ENTERREGISTRATIONS() EnterRegistrations() #define LEAVEREGISTRATIONS() LeaveRegistrations() diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx index 747e888dab84..85cd33402f3c 100644 --- a/sfx2/inc/sfx2/brokenpackageint.hxx +++ b/sfx2/inc/sfx2/brokenpackageint.hxx @@ -28,7 +28,7 @@ class SFX2_DLLPUBLIC RequestPackageReparation { RequestPackageReparation_Impl* pImp; public: - RequestPackageReparation( ::rtl::OUString aName ); + RequestPackageReparation( OUString aName ); ~RequestPackageReparation(); sal_Bool isApproved(); com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); @@ -39,7 +39,7 @@ class SFX2_DLLPUBLIC NotifyBrokenPackage { NotifyBrokenPackage_Impl* pImp; public: - NotifyBrokenPackage( ::rtl::OUString aName ); + NotifyBrokenPackage( OUString aName ); ~NotifyBrokenPackage(); sal_Bool isAborted(); com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); diff --git a/sfx2/inc/sfx2/checkin.hxx b/sfx2/inc/sfx2/checkin.hxx index 65aa2e75cd1b..9a9c20f485d7 100644 --- a/sfx2/inc/sfx2/checkin.hxx +++ b/sfx2/inc/sfx2/checkin.hxx @@ -26,7 +26,7 @@ class SfxCheckinDialog : public ModalDialog public: SfxCheckinDialog( Window* pParent ); - rtl::OUString GetComment( ); + OUString GetComment( ); bool IsMajor( ); }; diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx index 017bf2809f6f..d0c5e50fce1f 100644 --- a/sfx2/inc/sfx2/childwin.hxx +++ b/sfx2/inc/sfx2/childwin.hxx @@ -55,7 +55,7 @@ struct SfxChildWinInfo Size aSize; sal_uInt16 nFlags; String aExtraString; - rtl::OString aWinState; + OString aWinState; SfxChildWinInfo() { diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx index 4743952d334e..c0758b56bc00 100644 --- a/sfx2/inc/sfx2/dinfdlg.hxx +++ b/sfx2/inc/sfx2/dinfdlg.hxx @@ -57,22 +57,22 @@ class SFX2_DLLPUBLIC SfxDocumentInfoItem : public SfxStringItem { private: sal_Int32 m_AutoloadDelay; - ::rtl::OUString m_AutoloadURL; + OUString m_AutoloadURL; sal_Bool m_isAutoloadEnabled; - ::rtl::OUString m_DefaultTarget; - ::rtl::OUString m_TemplateName; - ::rtl::OUString m_Author; + OUString m_DefaultTarget; + OUString m_TemplateName; + OUString m_Author; ::com::sun::star::util::DateTime m_CreationDate; - ::rtl::OUString m_ModifiedBy; + OUString m_ModifiedBy; ::com::sun::star::util::DateTime m_ModificationDate; - ::rtl::OUString m_PrintedBy; + OUString m_PrintedBy; ::com::sun::star::util::DateTime m_PrintDate; sal_Int16 m_EditingCycles; sal_Int32 m_EditingDuration; - ::rtl::OUString m_Description; - ::rtl::OUString m_Keywords; - ::rtl::OUString m_Subject; - ::rtl::OUString m_Title; + OUString m_Description; + OUString m_Keywords; + OUString m_Subject; + OUString m_Title; sal_Bool m_bHasTemplate; sal_Bool m_bDeleteUserData; sal_Bool m_bUseUserData; @@ -99,30 +99,30 @@ public: void setAutoloadEnabled(sal_Bool i_val) { m_isAutoloadEnabled = i_val; } sal_Int32 getAutoloadDelay() const { return m_AutoloadDelay; } void setAutoloadDelay(sal_Int32 i_val) { m_AutoloadDelay = i_val; } - ::rtl::OUString getAutoloadURL() const { return m_AutoloadURL; } - void setAutoloadURL(::rtl::OUString i_val) { m_AutoloadURL = i_val; } - ::rtl::OUString getDefaultTarget() const { return m_DefaultTarget; } - void setDefaultTarget(::rtl::OUString i_val) { m_DefaultTarget = i_val; } - ::rtl::OUString getTemplateName() const { return m_TemplateName; } - void setTemplateName(::rtl::OUString i_val) { m_TemplateName = i_val; } - ::rtl::OUString getAuthor() const { return m_Author; } - void setAuthor(::rtl::OUString i_val) { m_Author = i_val; } + OUString getAutoloadURL() const { return m_AutoloadURL; } + void setAutoloadURL(OUString i_val) { m_AutoloadURL = i_val; } + OUString getDefaultTarget() const { return m_DefaultTarget; } + void setDefaultTarget(OUString i_val) { m_DefaultTarget = i_val; } + OUString getTemplateName() const { return m_TemplateName; } + void setTemplateName(OUString i_val) { m_TemplateName = i_val; } + OUString getAuthor() const { return m_Author; } + void setAuthor(OUString i_val) { m_Author = i_val; } ::com::sun::star::util::DateTime getCreationDate() const { return m_CreationDate; } void setCreationDate(::com::sun::star::util::DateTime i_val) { m_CreationDate = i_val; } - ::rtl::OUString getModifiedBy() const { return m_ModifiedBy; } - void setModifiedBy(::rtl::OUString i_val) { m_ModifiedBy = i_val; } + OUString getModifiedBy() const { return m_ModifiedBy; } + void setModifiedBy(OUString i_val) { m_ModifiedBy = i_val; } ::com::sun::star::util::DateTime getModificationDate() const { return m_ModificationDate; } void setModificationDate(::com::sun::star::util::DateTime i_val) { m_ModificationDate = i_val; } - ::rtl::OUString getPrintedBy() const { return m_PrintedBy; } - void setPrintedBy(::rtl::OUString i_val) { m_PrintedBy = i_val; } + OUString getPrintedBy() const { return m_PrintedBy; } + void setPrintedBy(OUString i_val) { m_PrintedBy = i_val; } ::com::sun::star::util::DateTime getPrintDate() const { return m_PrintDate; } void setPrintDate(::com::sun::star::util::DateTime i_val) { @@ -132,17 +132,17 @@ public: void setEditingCycles(sal_Int16 i_val) { m_EditingCycles = i_val; } sal_Int32 getEditingDuration() const { return m_EditingDuration; } void setEditingDuration(sal_Int32 i_val) { m_EditingDuration = i_val; } - ::rtl::OUString getDescription() const { return m_Description; } - void setDescription(::rtl::OUString i_val) { m_Description = i_val; } - ::rtl::OUString getKeywords() const { return m_Keywords; } - void setKeywords(::rtl::OUString i_val) { m_Keywords = i_val; } - ::rtl::OUString getSubject() const { return m_Subject; } - void setSubject(::rtl::OUString i_val) { m_Subject = i_val; } - ::rtl::OUString getTitle() const { return m_Title; } - void setTitle(::rtl::OUString i_val) { m_Title = i_val; } + OUString getDescription() const { return m_Description; } + void setDescription(OUString i_val) { m_Description = i_val; } + OUString getKeywords() const { return m_Keywords; } + void setKeywords(OUString i_val) { m_Keywords = i_val; } + OUString getSubject() const { return m_Subject; } + void setSubject(OUString i_val) { m_Subject = i_val; } + OUString getTitle() const { return m_Title; } + void setTitle(OUString i_val) { m_Title = i_val; } /// reset user-specific data (author, modified-by, ...) - void resetUserData(const ::rtl::OUString & i_rAuthor); + void resetUserData(const OUString & i_rAuthor); void SetTemplate( sal_Bool b ) { m_bHasTemplate = b; } sal_Bool HasTemplate() const { return m_bHasTemplate; } @@ -153,7 +153,7 @@ public: std::vector< CustomProperty* > GetCustomProperties() const; void ClearCustomProperties(); - void AddCustomProperty( const ::rtl::OUString& sName, + void AddCustomProperty( const OUString& sName, const com::sun::star::uno::Any& rValue ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; @@ -431,7 +431,7 @@ public: void InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar ); sal_uInt16 GetVisibleLineCount() const; inline sal_Int32 GetLineHeight() const { return m_nLineHeight; } - void AddLine( const ::rtl::OUString& sName, com::sun::star::uno::Any& rAny ); + void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny ); bool AreAllLinesValid() const; void ClearAllLines(); void DoScroll( sal_Int32 nNewPos ); @@ -463,7 +463,7 @@ public: CustomPropertiesControl(Window* pParent); ~CustomPropertiesControl(); - void AddLine( const ::rtl::OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive ); + void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive ); inline bool AreAllLinesValid() const { return m_pPropertiesWin->AreAllLinesValid(); } inline void ClearAllLines() { m_pPropertiesWin->ClearAllLines(); } diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx index 168050f4be54..e8d15a8366cd 100644 --- a/sfx2/inc/sfx2/docfac.hxx +++ b/sfx2/inc/sfx2/docfac.hxx @@ -74,7 +74,7 @@ public: SfxObjectShellFlags GetFlags() { return nFlags; } const char* GetShortName() const { return pShortName; } String GetFactoryURL() const; // shortcut for "private:factory/GetShortName()" - String GetFactoryName() const { return rtl::OUString::createFromAscii(pShortName); } + String GetFactoryName() const { return OUString::createFromAscii(pShortName); } String GetModuleName() const; SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const; @@ -92,8 +92,8 @@ public: static void SetStandardTemplate( const String& rServiceName, const String& rTemplateName ); static void SetSystemTemplate( const String& rServiceName, const String& rTemplateName ); - void SetDocumentServiceName( const rtl::OUString& rServiceName ); - const rtl::OUString& GetDocumentServiceName() const; + void SetDocumentServiceName( const OUString& rServiceName ); + const OUString& GetDocumentServiceName() const; SfxModule* GetModule() const; diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index ae055b5db0bd..5aef2f2e1e7d 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -118,14 +118,14 @@ public: void SetFilter(const SfxFilter *pFlt, sal_Bool bResetOrig = sal_False); const SfxFilter* GetFilter() const; const SfxFilter * GetOrigFilter( sal_Bool bNotCurrent = sal_False ) const; - const rtl::OUString& GetOrigURL() const; + const OUString& GetOrigURL() const; SfxItemSet * GetItemSet() const; void Close(); void CloseAndRelease(); void ReOpen(); void CompleteReOpen(); - const rtl::OUString& GetName() const; + const OUString& GetName() const; const INetURLObject& GetURLObject() const; void CheckFileDate( const css::util::DateTime& aInitDate ); @@ -133,7 +133,7 @@ public: css::util::DateTime GetInitFileDate( sal_Bool bIgnoreOldValue ); css::uno::Reference< css::ucb::XContent > GetContent() const; - const rtl::OUString& GetPhysicalName() const; + const OUString& GetPhysicalName() const; sal_Bool IsRemote(); sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; } void DownLoad( const Link& aLink = Link()); @@ -144,9 +144,9 @@ public: { return ERRCODE_TOERROR(GetErrorCode()); } sal_uInt32 GetLastStorageCreationState(); - void SetError( sal_uInt32 nError, const ::rtl::OUString& aLogMessage ); + void SetError( sal_uInt32 nError, const OUString& aLogMessage ); - void AddLog( const ::rtl::OUString& aMessage ); + void AddLog( const OUString& aMessage ); void CloseInStream(); sal_Bool CloseOutStream(); @@ -162,7 +162,7 @@ public: sal_Bool Commit(); sal_Bool IsStorage(); - sal_Int8 ShowLockedDocumentDialog( const css::uno::Sequence< ::rtl::OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock ); + sal_Int8 ShowLockedDocumentDialog( const css::uno::Sequence< OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock ); bool LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ); void UnlockFile( sal_Bool bReleaseLockStream ); @@ -189,17 +189,17 @@ public: void CreateTempFile( sal_Bool bReplace = sal_True ); void CreateTempFileNoCopy(); - ::rtl::OUString SwitchDocumentToTempFile(); - sal_Bool SwitchDocumentToFile( const rtl::OUString& aURL ); + OUString SwitchDocumentToTempFile(); + sal_Bool SwitchDocumentToFile( const OUString& aURL ); - ::rtl::OUString GetBaseURL( bool bForSaving=false ); + OUString GetBaseURL( bool bForSaving=false ); void SetInCheckIn( bool bInCheckIn ); bool IsInCheckIn( ); SAL_DLLPRIVATE sal_Bool HasStorage_Impl() const; SAL_DLLPRIVATE void StorageBackup_Impl(); - SAL_DLLPRIVATE ::rtl::OUString GetBackup_Impl(); + SAL_DLLPRIVATE OUString GetBackup_Impl(); SAL_DLLPRIVATE css::uno::Reference< css::embed::XStorage > GetZipStorageToSign_Impl( sal_Bool bReadOnly = sal_True ); SAL_DLLPRIVATE void CloseZipStorage_Impl(); @@ -212,7 +212,7 @@ public: SAL_DLLPRIVATE sal_uInt16 AddVersion_Impl( css::util::RevisionTag& rVersion ); SAL_DLLPRIVATE sal_Bool TransferVersionList_Impl( SfxMedium& rMedium ); SAL_DLLPRIVATE sal_Bool SaveVersionList_Impl( sal_Bool bUseXML ); - SAL_DLLPRIVATE sal_Bool RemoveVersion_Impl( const ::rtl::OUString& rVersion ); + SAL_DLLPRIVATE sal_Bool RemoveVersion_Impl( const OUString& rVersion ); SAL_DLLPRIVATE void SetExpired_Impl( const DateTime& rDateTime ); SAL_DLLPRIVATE SvKeyValueIterator* GetHeaderAttributes_Impl(); @@ -225,19 +225,19 @@ public: SAL_DLLPRIVATE void GetLockingStream_Impl(); SAL_DLLPRIVATE void GetMedium_Impl(); - SAL_DLLPRIVATE sal_Bool TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& aTargetSet ); + SAL_DLLPRIVATE sal_Bool TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet ); SAL_DLLPRIVATE void Transfer_Impl(); SAL_DLLPRIVATE void CreateFileStream(); SAL_DLLPRIVATE void SetUpdatePickList(sal_Bool); SAL_DLLPRIVATE sal_Bool IsUpdatePickList() const; - SAL_DLLPRIVATE void SetLongName(const rtl::OUString &rName); - SAL_DLLPRIVATE const rtl::OUString & GetLongName() const; + SAL_DLLPRIVATE void SetLongName(const OUString &rName); + SAL_DLLPRIVATE const OUString & GetLongName() const; SAL_DLLPRIVATE ErrCode CheckOpenMode_Impl( sal_Bool bSilent, sal_Bool bAllowRO = sal_True ); SAL_DLLPRIVATE sal_Bool IsPreview_Impl(); SAL_DLLPRIVATE void ClearBackup_Impl(); SAL_DLLPRIVATE void Done_Impl( ErrCode ); - SAL_DLLPRIVATE void SetPhysicalName_Impl(const rtl::OUString& rName); + SAL_DLLPRIVATE void SetPhysicalName_Impl(const OUString& rName); SAL_DLLPRIVATE void CanDisposeStorage_Impl( sal_Bool bDisposeStorage ); SAL_DLLPRIVATE sal_Bool WillDisposeStorageOnClose_Impl(); @@ -257,7 +257,7 @@ public: const INetURLObject& aDest, const css::uno::Reference< css::ucb::XCommandEnvironment >& xComEnv ); - SAL_DLLPRIVATE sal_Bool SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::OUString& aODFVersion, sal_Bool bHasValidDocumentSignature ); + SAL_DLLPRIVATE sal_Bool SignContents_Impl( sal_Bool bScriptingContent, const OUString& aODFVersion, sal_Bool bHasValidDocumentSignature ); // the following two methods must be used and make sence only during saving currently // TODO/LATER: in future the signature state should be controlled by the medium not by the document @@ -267,11 +267,11 @@ public: static css::uno::Sequence < css::util::RevisionTag > GetVersionList( const css::uno::Reference< css::embed::XStorage >& xStorage ); - static ::rtl::OUString CreateTempCopyWithExt( const ::rtl::OUString& aURL ); + static OUString CreateTempCopyWithExt( const OUString& aURL ); static sal_Bool CallApproveHandler( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, css::uno::Any aRequest, sal_Bool bAllowAbort ); - static sal_Bool SetWritableForUserOnly( const ::rtl::OUString& aURL ); - static sal_uInt32 CreatePasswordToModifyHash( const ::rtl::OUString& aPasswd, sal_Bool bWriter ); + static sal_Bool SetWritableForUserOnly( const OUString& aURL ); + static sal_uInt32 CreatePasswordToModifyHash( const OUString& aPasswd, sal_Bool bWriter ); }; SV_DECL_IMPL_REF( SfxMedium ) diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx index c017f849be8e..18ccfc80f389 100644 --- a/sfx2/inc/sfx2/docfilt.hxx +++ b/sfx2/inc/sfx2/docfilt.hxx @@ -44,11 +44,11 @@ friend class SfxFilterContainer; WildCard aWildCard; sal_uIntPtr lFormat; String aTypeName; - rtl::OUString aUserData; + OUString aUserData; SfxFilterFlags nFormatType; sal_uInt16 nDocIcon; - rtl::OUString aServiceName; - rtl::OUString aMimeType; + OUString aServiceName; + OUString aMimeType; String aFilterName; String aPattern; sal_uIntPtr nVersion; @@ -76,7 +76,7 @@ public: bool IsInternal() const { return nFormatType & SFX_FILTER_INTERNAL; } SfxFilterFlags GetFilterFlags() const { return nFormatType; } const String& GetFilterName() const { return aFilterName; } - const ::rtl::OUString& GetMimeType() const { return aMimeType; } + const OUString& GetMimeType() const { return aMimeType; } const String& GetName() const { return aFilterName; } const WildCard& GetWildcard() const { return aWildCard; } const String& GetRealTypeName() const { return aTypeName; } @@ -84,7 +84,7 @@ public: const String& GetTypeName() const { return aTypeName; } const String& GetUIName() const { return aUIName; } sal_uInt16 GetDocIconId() const { return nDocIcon; } - const rtl::OUString& GetUserData() const { return aUserData; } + const OUString& GetUserData() const { return aUserData; } const String& GetDefaultTemplate() const { return aDefaultTemplate; } void SetDefaultTemplate( const String& rStr ) { aDefaultTemplate = rStr; } sal_Bool UsesStorage() const { return GetFormat() != 0; } @@ -95,7 +95,7 @@ public: sal_uIntPtr GetVersion() const { return nVersion; } String GetSuffixes() const; String GetDefaultExtension() const; - const rtl::OUString& GetServiceName() const { return aServiceName; } + const OUString& GetServiceName() const { return aServiceName; } static const SfxFilter* GetDefaultFilter( const String& rName ); static const SfxFilter* GetFilterByName( const String& rName ); diff --git a/sfx2/inc/sfx2/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx index 6372b619c484..cefcf034f48e 100644 --- a/sfx2/inc/sfx2/docinsert.hxx +++ b/sfx2/inc/sfx2/docinsert.hxx @@ -47,7 +47,7 @@ private: sfx2::FileDialogHelper* m_pFileDlg; SfxItemSet* m_pItemSet; - std::vector m_pURLList; + std::vector m_pURLList; DECL_LINK(DialogClosedHdl, void *); diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx index dca8e563cc91..d64b6ed7a6f7 100644 --- a/sfx2/inc/sfx2/dockwin.hxx +++ b/sfx2/inc/sfx2/dockwin.hxx @@ -33,8 +33,8 @@ class SfxSplitWindow; class SfxDockingWindow_Impl; -void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName ); -bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName ); +void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); +bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); class SFX2_DLLPUBLIC SfxDockingWindow : public DockingWindow { diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/sfx2/inc/sfx2/docmacromode.hxx index 1b5857f8ae43..4e089d7e3d55 100644 --- a/sfx2/inc/sfx2/docmacromode.hxx +++ b/sfx2/inc/sfx2/docmacromode.hxx @@ -98,7 +98,7 @@ namespace sfx2 we could replace this method with a newly introduced method getDocumentModel and some internal code. */ - virtual ::rtl::OUString + virtual OUString getDocumentLocation() const = 0; /** returns a zip-storage based on the last commited version of the document, diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx index a84ac1195542..a5b24cf81993 100644 --- a/sfx2/inc/sfx2/doctempl.hxx +++ b/sfx2/inc/sfx2/doctempl.hxx @@ -71,15 +71,15 @@ public: String GetPath(sal_uInt16 nRegion, sal_uInt16 nIdx) const; // Allows to retrieve the target template URL from the UCB - ::rtl::OUString GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName, - const ::rtl::OUString& aTitle ); + OUString GetTemplateTargetURLFromComponent( const OUString& aGroupName, + const OUString& aTitle ); // Convert a resource string - a template name - to its localised pair // if it exists in templatelocnames.src - static ::rtl::OUString ConvertResourceString(int nSourceResIds, + static OUString ConvertResourceString(int nSourceResIds, int nDestResIds, int nCount, - const ::rtl::OUString& rString); + const OUString& rString); sal_Bool Copy(sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, @@ -107,7 +107,7 @@ public: sal_True if the action could be performed, sal_False otherwise */ - sal_Bool SetName(const rtl::OUString &rName, sal_uInt16 nRegion, sal_uInt16 nIdx); + sal_Bool SetName(const OUString &rName, sal_uInt16 nRegion, sal_uInt16 nIdx); sal_Bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const String &rName) const; sal_Bool CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, String &rName); diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx index 760a90627aa2..bcdc88ec2edb 100644 --- a/sfx2/inc/sfx2/event.hxx +++ b/sfx2/inc/sfx2/event.hxx @@ -37,12 +37,12 @@ class SfxObjectShell; class SFX2_DLLPUBLIC SfxEventHint : public SfxHint { SfxObjectShell* pObjShell; - ::rtl::OUString aEventName; + OUString aEventName; sal_uInt16 nEventId; public: TYPEINFO(); - SfxEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj = 0 ) + SfxEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj = 0 ) : pObjShell(pObj), aEventName(aName), nEventId(nId) @@ -51,7 +51,7 @@ public: sal_uInt16 GetEventId() const { return nEventId; } - ::rtl::OUString GetEventName() const + OUString GetEventName() const { return aEventName; } SfxObjectShell* GetObjShell() const @@ -67,12 +67,12 @@ class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint public: TYPEINFO(); - SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) + SfxViewEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) : SfxEventHint( nId, aName, pObj ) , xViewController( xController, ::com::sun::star::uno::UNO_QUERY ) {} - SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController ) + SfxViewEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController ) : SfxEventHint( nId, aName, pObj ) , xViewController( xController ) {} diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx index 6e6331a86213..2f181ad820b1 100644 --- a/sfx2/inc/sfx2/evntconf.hxx +++ b/sfx2/inc/sfx2/evntconf.hxx @@ -111,7 +111,7 @@ public: class SFX2_DLLPUBLIC SfxEventConfiguration { public: - static void ConfigureEvent( ::rtl::OUString aName, const SvxMacro&, SfxObjectShell* pObjSh); + static void ConfigureEvent( OUString aName, const SvxMacro&, SfxObjectShell* pObjSh); static SvxMacro* ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp ); }; diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index b2eb214f2cda..de7d9a961de4 100644 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -94,7 +94,7 @@ public: const SfxFilter* GetFilter4FilterName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; SAL_DLLPRIVATE static void ReadFilters_Impl( sal_Bool bUpdate=sal_False ); - SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName, + SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, sal_Bool bUpdate ); @@ -120,7 +120,7 @@ public: sal_uInt32 GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, sal_Bool bDefUI = sal_True ) const; sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter **, sal_Bool bPlugIn, sal_Bool bAPI = sal_False ) const; - const SfxFilter* GetFilter4Mime( const ::rtl::OUString& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const; + const SfxFilter* GetFilter4Mime( const OUString& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const; const SfxFilter* GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; const SfxFilter* GetFilter4EA( const String& rEA, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; const SfxFilter* GetFilter4Extension( const String& rExt, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index d576c208dbb1..304fd5cdff58 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -122,14 +122,14 @@ public: SfxFilterFlags nMust, SfxFilterFlags nDont, const String& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList); + const ::com::sun::star::uno::Sequence< OUString >& rBlackList); FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - const ::rtl::OUString& aFilterUIName, - const ::rtl::OUString& aExtName, - const ::rtl::OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList, + const OUString& aFilterUIName, + const OUString& aExtName, + const OUString& rStandardDir, + const ::com::sun::star::uno::Sequence< OUString >& rBlackList, Window* _pPreferredParent = NULL ); @@ -150,10 +150,10 @@ public: to different folders. As this method always provides the root folder for all selected files this cannot work. */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetMPath() const; + ::com::sun::star::uno::Sequence< OUString > GetMPath() const; /** Provides the selected files with full path information */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSelectedFiles() const; + ::com::sun::star::uno::Sequence< OUString > GetSelectedFiles() const; void AddFilter( const String& rFilterName, const String& rExtension ); void SetCurrentFilter( const String& rFilter ); @@ -206,7 +206,7 @@ public: virtual void SAL_CALL DirectoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); virtual void SAL_CALL ControlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); virtual void SAL_CALL DialogSizeChanged(); - virtual ::rtl::OUString SAL_CALL HelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); + virtual OUString SAL_CALL HelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); // XDialogClosedListener methods virtual void SAL_CALL DialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ); @@ -230,7 +230,7 @@ public: DECL_LINK( ExecuteSystemFilePicker, void* ); - ErrCode Execute( std::vector& rpURLList, + ErrCode Execute( std::vector& rpURLList, SfxItemSet *& rpSet, String& rFilter, const String& rDirPath ); @@ -245,16 +245,16 @@ public: ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, sal_Int64 nFlags, const String& rFact, - std::vector& rpURLList, + std::vector& rpURLList, String& rFilter, SfxItemSet *& rpSet, const String* pPath = NULL, sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, - const String& rStandardDir = rtl::OUString(), - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >()); + const String& rStandardDir = OUString(), + const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >()); -ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, SfxItemSet* pSet); +ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItemSet* pSet); } #endif diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx index ba4f7f984a57..3abdfbee3107 100644 --- a/sfx2/inc/sfx2/frmhtmlw.hxx +++ b/sfx2/inc/sfx2/frmhtmlw.hxx @@ -73,7 +73,7 @@ inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, rtl_TextEncoding eDestEnc, String *pNonConvertableChars ) { - String sTmp = rtl::OUString::createFromAscii(pName); + String sTmp = OUString::createFromAscii(pName); OutMeta( rStrm, pIndent, sTmp, rContent, bHTTPEquiv, eDestEnc, pNonConvertableChars ); } diff --git a/sfx2/inc/sfx2/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx index 85143abb01d7..92df8e70c573 100644 --- a/sfx2/inc/sfx2/imagemgr.hxx +++ b/sfx2/inc/sfx2/imagemgr.hxx @@ -27,7 +27,7 @@ SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& aURL, + const OUString& aURL, bool bBig ); diff --git a/sfx2/inc/sfx2/infobar.hxx b/sfx2/inc/sfx2/infobar.hxx index b72dbbdb85f5..b91d01ad4927 100644 --- a/sfx2/inc/sfx2/infobar.hxx +++ b/sfx2/inc/sfx2/infobar.hxx @@ -41,18 +41,18 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow class SfxInfoBarWindow : public Window { private: - rtl::OUString m_sId; + OUString m_sId; FixedText* m_pMessage; Button* m_pCloseBtn; std::vector< PushButton* > m_aActionBtns; public: - SfxInfoBarWindow( Window* parent, const rtl::OUString& sId, - const rtl::OUString& sMessage, + SfxInfoBarWindow( Window* parent, const OUString& sId, + const OUString& sMessage, std::vector< PushButton* > aButtons ); ~SfxInfoBarWindow( ); - virtual const rtl::OUString& getId() const { return m_sId; } + virtual const OUString& getId() const { return m_sId; } virtual void Paint( const Rectangle& ); virtual void Resize( ); @@ -70,8 +70,8 @@ class SfxInfoBarContainerWindow : public Window SfxInfoBarContainerWindow( SfxInfoBarContainerChild* pChildWin ); ~SfxInfoBarContainerWindow( ); - void appendInfoBar( const rtl::OUString& sId, const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ); - SfxInfoBarWindow* getInfoBar( const rtl::OUString& sId ); + void appendInfoBar( const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons ); + SfxInfoBarWindow* getInfoBar( const OUString& sId ); void removeInfoBar( SfxInfoBarWindow* pInfoBar ); virtual void Resize( ); diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx index 39c3beda9886..24a5f6315edb 100644 --- a/sfx2/inc/sfx2/linkmgr.hxx +++ b/sfx2/inc/sfx2/linkmgr.hxx @@ -110,8 +110,8 @@ public: const String* pRange = 0 ); bool InsertFileLink( - sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const rtl::OUString& rFileNm, - const rtl::OUString* pFilterNm = NULL, const rtl::OUString* pRange = NULL); + sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const OUString& rFileNm, + const OUString* pFilterNm = NULL, const OUString* pRange = NULL); void ReconnectDdeLink(SfxObjectShell& rServer); @@ -122,7 +122,7 @@ public: * @param rServer server document shell instance * @param rLink link object of the client document */ - void LinkServerShell(const ::rtl::OUString& rPath, SfxObjectShell& rServer, ::sfx2::SvBaseLink& rLink) const; + void LinkServerShell(const OUString& rPath, SfxObjectShell& rServer, ::sfx2::SvBaseLink& rLink) const; // Obtain the string for the dialog bool GetDisplayNames( const SvBaseLink *, @@ -132,8 +132,8 @@ public: String* pFilter = 0 ) const; bool GetDisplayNames( - const SvBaseLink* pLink, rtl::OUString* pType, rtl::OUString* pFile = NULL, - rtl::OUString* pLinkStr = NULL, rtl::OUString* pFilter = NULL) const; + const SvBaseLink* pLink, OUString* pType, OUString* pFile = NULL, + OUString* pLinkStr = NULL, OUString* pFilter = NULL) const; SvLinkSourceRef CreateObj( SvBaseLink* ); diff --git a/sfx2/inc/sfx2/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx index 47bae9b7b870..042a364e2b5a 100644 --- a/sfx2/inc/sfx2/mailmodelapi.hxx +++ b/sfx2/inc/sfx2/mailmodelapi.hxx @@ -64,11 +64,11 @@ protected: SAVE_CANCELLED, SAVE_ERROR }; - ::std::vector< ::rtl::OUString > maAttachedDocuments; - SaveResult SaveDocumentAsFormat( const rtl::OUString& aSaveFileName, + ::std::vector< OUString > maAttachedDocuments; + SaveResult SaveDocumentAsFormat( const OUString& aSaveFileName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel, - const rtl::OUString& rType, - rtl::OUString& rFileNamePath ); + const OUString& rType, + OUString& rFileNamePath ); private: AddressList_Impl* mpToList; @@ -83,8 +83,8 @@ private: void ClearList( AddressList_Impl* pList ); SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel, - const ::rtl::OUString& rFilterName, - const ::rtl::OUString& rType, + const OUString& rFilterName, + const OUString& rType, bool bModified, sal_Int32& rNumArgs, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); @@ -118,12 +118,12 @@ public: The title which will be used as attachment title * \return @see error code */ - SendMailResult AttachDocument( const ::rtl::OUString& sDocumentType, + SendMailResult AttachDocument( const OUString& sDocumentType, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel, - const ::rtl::OUString& sAttachmentTitle ); + const OUString& sAttachmentTitle ); SendMailResult SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& rType ); + const OUString& rType ); SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); sal_Bool IsEmpty() const; diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index 78f4140b2042..eca6618cc118 100644 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -272,8 +272,8 @@ public: sal_uInt16 GetValue() const { return nValue; } const SfxType* GetType() const { return pType; } const char* GetUnoName() const { return pUnoName; } - SFX2_DLLPUBLIC rtl::OString GetCommand() const; - SFX2_DLLPUBLIC rtl::OUString GetCommandString() const; + SFX2_DLLPUBLIC OString GetCommand() const; + SFX2_DLLPUBLIC OUString GetCommandString() const; sal_uInt16 GetFormalArgumentCount() const { return nArgDefCount; } const SfxFormalArgument& GetFormalArgument( sal_uInt16 nNo ) const diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx index 667094f7e95b..90315d0ad755 100644 --- a/sfx2/inc/sfx2/objface.hxx +++ b/sfx2/inc/sfx2/objface.hxx @@ -70,8 +70,8 @@ public: const char* GetClassName() const { return pName; } bool HasName() const { return 0 != aNameResId.GetId(); } - rtl::OUString GetName() const - { return HasName() ? aNameResId.toString() : rtl::OUString(); } + OUString GetName() const + { return HasName() ? aNameResId.toString() : OUString(); } ResMgr* GetResMgr() const { return aNameResId.GetResMgr(); } diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 2070f6b12f4c..5f1018e6ad6e 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -275,18 +275,18 @@ public: #if HAVE_FEATURE_MULTIUSER_ENVIRONMENT sal_Bool IsDocShared() const; - ::rtl::OUString GetSharedFileURL() const; + OUString GetSharedFileURL() const; sal_Bool SwitchToShared( sal_Bool bShared, sal_Bool bSave ); SAL_DLLPRIVATE void FreeSharedFile(); - SAL_DLLPRIVATE void FreeSharedFile( const ::rtl::OUString& aTempFileURL ); + SAL_DLLPRIVATE void FreeSharedFile( const OUString& aTempFileURL ); SAL_DLLPRIVATE void DoNotCleanShareControlFile(); void SetSharedXMLFlag( sal_Bool bFlag ) const; sal_Bool HasSharedXMLFlagSet() const; #else sal_Bool IsDocShared() const { return sal_False; }; - ::rtl::OUString GetSharedFileURL() const - { return ::rtl::OUString(); }; + OUString GetSharedFileURL() const + { return OUString(); }; #endif SAL_DLLPRIVATE void SetModalMode_Impl(sal_Bool bModal=sal_True); @@ -295,9 +295,9 @@ public: void ResetError(); sal_uInt32 GetError() const; sal_uInt32 GetErrorCode() const; - void SetError( sal_uInt32 rErr, const ::rtl::OUString& aLogMessage ); + void SetError( sal_uInt32 rErr, const OUString& aLogMessage ); - void AddLog( const ::rtl::OUString& aMessage ); + void AddLog( const OUString& aMessage ); void StoreLog(); /** @@ -308,7 +308,7 @@ public: bool DoInitUnitTest(); sal_Bool DoInitNew( SfxMedium* pMedium=0 ); sal_Bool DoLoad( SfxMedium* pMedium ); - bool DoLoadExternal(SfxMedium* pMed, const rtl::OUString& rProvider); + bool DoLoadExternal(SfxMedium* pMed, const OUString& rProvider); sal_Bool DoSave(); sal_Bool DoSaveAs( SfxMedium &rNewStor ); sal_Bool DoSaveObjectAs( SfxMedium &rNewStor, sal_Bool bCommit ); @@ -329,7 +329,7 @@ public: virtual sal_Bool SwitchPersistance( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual void UpdateLinks(); - virtual bool LoadExternal(SfxMedium& rMedium, const rtl::OUString& rProvider); + virtual bool LoadExternal(SfxMedium& rMedium, const OUString& rProvider); /** * Called when the Options dialog is dismissed with the OK button, to * handle potentially conflicting option settings. @@ -374,7 +374,7 @@ public: static ErrCode CallXScript( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxScriptContext, - const ::rtl::OUString& rScriptURL, + const OUString& rScriptURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Any& aRet, ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex, @@ -553,7 +553,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetBaseModel() const; // Only temporarily for the applications! - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames(); + virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); Window* GetDialogParent( SfxMedium* pMedium=0 ); static SfxObjectShell* CreateObject( const String& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); @@ -656,11 +656,11 @@ public: SAL_DLLPRIVATE sal_Bool DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& rTargetMedium ); SAL_DLLPRIVATE sal_Bool PutURLContentsToVersionStream_Impl( - ::rtl::OUString aURL, + OUString aURL, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDocStorage, - ::rtl::OUString aStreamName ); + OUString aStreamName ); - SAL_DLLPRIVATE ::rtl::OUString CreateTempCopyOfStorage_Impl( + SAL_DLLPRIVATE OUString CreateTempCopyOfStorage_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); SAL_DLLPRIVATE void InitOwnModel_Impl(); diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx index daa7950d3325..475d3cd00765 100644 --- a/sfx2/inc/sfx2/querystatus.hxx +++ b/sfx2/inc/sfx2/querystatus.hxx @@ -35,7 +35,7 @@ class SfxQueryStatus_Impl; class SFX2_DLLPUBLIC SfxQueryStatus { public: - SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand ); + SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); ~SfxQueryStatus(); // Query method diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx index b502c7270342..df2635f711ed 100644 --- a/sfx2/inc/sfx2/sfxbasecontroller.hxx +++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx @@ -123,7 +123,7 @@ public: // XController2 //____________________________________________________________________________________________________ virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException); //____________________________________________________________________________________________________ @@ -253,7 +253,7 @@ public: */ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , - const ::rtl::OUString & sTargetFrameName, + const OUString & sTargetFrameName, FrameSearchFlags eSearchFlags ) throw( css::uno::RuntimeException ) ; /**___________________________________________________________________________________________________ @@ -343,8 +343,8 @@ public: virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException); // css::frame::XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException); // css::frame::XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException); diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 6839bcb72b80..9c15b500cd79 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -308,21 +308,21 @@ public: /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ - virtual void SAL_CALL createLibrary( const ::rtl::OUString& LibName, const ::rtl::OUString& Password, - const ::rtl::OUString& ExternalSourceURL, const ::rtl::OUString& LinkTargetURL ) + virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password, + const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) throw(css::container::ElementExistException, css::uno::RuntimeException); /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ - virtual void SAL_CALL addModule( const ::rtl::OUString& LibraryName, const ::rtl::OUString& ModuleName, - const ::rtl::OUString& Language, const ::rtl::OUString& Source ) + virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName, + const OUString& Language, const OUString& Source ) throw( css::container::NoSuchElementException, css::uno::RuntimeException); /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ - virtual void SAL_CALL addDialog( const ::rtl::OUString& LibraryName, const ::rtl::OUString& DialogName, + virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName, const css::uno::Sequence< sal_Int8 >& Data ) throw(css::container::NoSuchElementException, css::uno::RuntimeException); @@ -452,7 +452,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL attachResource(const ::rtl::OUString& sURL, + virtual sal_Bool SAL_CALL attachResource(const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) throw (css::uno::RuntimeException); @@ -469,7 +469,7 @@ public: @onerror - */ - virtual ::rtl::OUString SAL_CALL getURL() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException); /**___________________________________________________________________________________________________ @short - @@ -613,7 +613,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers() throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableViewControllerNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController(const css::uno::Reference< css::frame::XFrame >& Frame ) @@ -621,7 +621,7 @@ public: css::lang::IllegalArgumentException, css::uno::Exception ); - virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController(const ::rtl::OUString& ViewName , + virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController(const OUString& ViewName , const css::uno::Sequence< css::beans::PropertyValue >& Arguments , const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::uno::RuntimeException , @@ -806,7 +806,7 @@ public: @onerror - */ - virtual ::rtl::OUString SAL_CALL getLocation() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLocation() throw (css::uno::RuntimeException); /**___________________________________________________________________________________________________ @short - @@ -851,7 +851,7 @@ public: @onerror - */ - virtual void SAL_CALL storeAsURL( const ::rtl::OUString& sURL, + virtual void SAL_CALL storeAsURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) throw (css::io::IOException, css::uno::RuntimeException) ; @@ -868,7 +868,7 @@ public: @onerror - */ - virtual void SAL_CALL storeToURL( const ::rtl::OUString& sURL, + virtual void SAL_CALL storeToURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) throw (css::io::IOException, css::uno::RuntimeException); @@ -920,10 +920,10 @@ public: // XDocumentSubStorageSupplier //____________________________________________________________________________________________________ - virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw ( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getDocumentSubStoragesNames() + virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames() throw ( css::io::IOException, css::uno::RuntimeException ); //____________________________________________________________________________________________________ @@ -1131,7 +1131,7 @@ public: virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException); virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException); + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException); //____________________________________________________________________________________________________ // XUnoTunnel @@ -1140,19 +1140,19 @@ public: virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException); // css.frame.XModule - virtual void SAL_CALL setIdentifier(const ::rtl::OUString& sIdentifier) + virtual void SAL_CALL setIdentifier(const OUString& sIdentifier) throw (css::uno::RuntimeException); // css.frame.XModule - virtual ::rtl::OUString SAL_CALL getIdentifier() + virtual OUString SAL_CALL getIdentifier() throw (css::uno::RuntimeException); // css.frame.XTitle - virtual ::rtl::OUString SAL_CALL getTitle() + virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException); // css.frame.XTitle - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException); // css.frame.XTitleChangeBroadcaster @@ -1179,17 +1179,17 @@ public: css::uno::RuntimeException ); // css.frame.XUntitledNumbers - virtual ::rtl::OUString SAL_CALL getUntitledPrefix() + virtual OUString SAL_CALL getUntitledPrefix() throw (css::uno::RuntimeException); // css.document.XDocumentRecovery virtual ::sal_Bool SAL_CALL wasModifiedSinceLastSave() throw ( css::uno::RuntimeException ); - virtual void SAL_CALL storeToRecoveryFile( const ::rtl::OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) + virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, css::lang::WrappedTargetException ); - virtual void SAL_CALL recoverFromFile( const ::rtl::OUString& i_SourceLocation, const ::rtl::OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) + virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, css::lang::WrappedTargetException ); @@ -1200,13 +1200,13 @@ public: //____________________________________________________________________________________________________ // css::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); // css::rdf::XURI: - virtual ::rtl::OUString SAL_CALL getNamespace() + virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLocalName() + virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException); // css::rdf::XRepositorySupplier: @@ -1234,7 +1234,7 @@ public: css::lang::IllegalArgumentException); virtual css::uno::Reference< css::rdf::XURI> SAL_CALL - addMetadataFile(const ::rtl::OUString & i_rFileName, + addMetadataFile(const OUString & i_rFileName, const css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > & i_rTypes) @@ -1246,7 +1246,7 @@ public: importMetadataFile(::sal_Int16 i_Format, const css::uno::Reference< css::io::XInputStream > & i_xInStream, - const ::rtl::OUString & i_rFileName, + const OUString & i_rFileName, const css::uno::Reference< css::rdf::XURI > & i_xBaseURI, const css::uno::Sequence< @@ -1265,12 +1265,12 @@ public: css::lang::IllegalArgumentException, css::container::NoSuchElementException); virtual void SAL_CALL addContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException); virtual void SAL_CALL removeContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException); @@ -1323,7 +1323,7 @@ public: virtual void SAL_CALL checkOut( ) throw ( css::uno::RuntimeException ); virtual void SAL_CALL cancelCheckOut( ) throw ( css::uno::RuntimeException ); - virtual void SAL_CALL checkIn( sal_Bool bIsMajor, const rtl::OUString & rMessage ) + virtual void SAL_CALL checkIn( sal_Bool bIsMajor, const OUString & rMessage ) throw ( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL isVersionable( ) throw ( css::uno::RuntimeException ); @@ -1331,7 +1331,7 @@ public: virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException ); - sal_Bool getBoolPropertyValue( const rtl::OUString& rName ) throw ( css::uno::RuntimeException ); + sal_Bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException ); //____________________________________________________________________________________________________ // SfxListener @@ -1406,7 +1406,7 @@ protected: /* returns a unique id for the model that is valid as long as the document is loaded. The id is not saved across document close/reload. */ - rtl::OUString getRuntimeUID() const; + OUString getRuntimeUID() const; /* returns true if the document signatures are valid, otherwise false */ sal_Bool hasValidSignatures() const; @@ -1433,13 +1433,13 @@ private: css::uno::Reference< css::ui::XUIConfigurationManager2 > getUIConfigurationManager2() throw ( css::uno::RuntimeException ); bool impl_getPrintHelper(); SAL_DLLPRIVATE void ListenForStorage_Impl( const css::uno::Reference< css::embed::XStorage >& xStorage ); - SAL_DLLPRIVATE ::rtl::OUString GetMediumFilterName_Impl(); + SAL_DLLPRIVATE OUString GetMediumFilterName_Impl(); - SAL_DLLPRIVATE void impl_store( const ::rtl::OUString& sURL, + SAL_DLLPRIVATE void impl_store( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments , sal_Bool bSaveTo ) ; - SAL_DLLPRIVATE void postEvent_Impl( const ::rtl::OUString& aName, const css::uno::Reference< css::frame::XController2 >& xController = css::uno::Reference< css::frame::XController2 >() ); + SAL_DLLPRIVATE void postEvent_Impl( const OUString& aName, const css::uno::Reference< css::frame::XController2 >& xController = css::uno::Reference< css::frame::XController2 >() ); SAL_DLLPRIVATE String getEventName_Impl( long nID ); SAL_DLLPRIVATE bool QuerySaveSizeExceededModules( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler ); diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx index 2f69d442495b..a994c7dfa77a 100644 --- a/sfx2/inc/sfx2/sfxdlg.hxx +++ b/sfx2/inc/sfx2/sfxdlg.hxx @@ -82,7 +82,7 @@ class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog { public: virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()=0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType )=0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType )=0; virtual sal_Bool IsCreateNew()=0; }; @@ -130,10 +130,10 @@ public: const String *pUserButtonText=0 ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 )=0; - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, + virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0; virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0; virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML=sal_False, sfx2::SvBaseLink* p=0 )=0; @@ -150,7 +150,7 @@ public: Window* pParent, com::sun::star::uno::Any aException ) = 0; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext ) = 0; + Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0; }; #endif diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/sfx2/inc/sfx2/sfxmodelfactory.hxx index 3ff0c317c72f..612aea61d07e 100644 --- a/sfx2/inc/sfx2/sfxmodelfactory.hxx +++ b/sfx2/inc/sfx2/sfxmodelfactory.hxx @@ -53,9 +53,9 @@ namespace sfx2 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SFX2_DLLPUBLIC createSfxModelFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceFactory, - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames + const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames ); //........................................................................ diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx index 8c1212f77536..9e6be020db10 100644 --- a/sfx2/inc/sfx2/sfxstatuslistener.hxx +++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx @@ -51,7 +51,7 @@ class SFX2_DLLPUBLIC SfxStatusListener : public: SFX_DECL_XINTERFACE_XTYPEPROVIDER - SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand ); + SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); virtual ~SfxStatusListener(); // old methods from SfxControllerItem diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx index 3f48698be7c8..6b0a2763497e 100644 --- a/sfx2/inc/sfx2/sfxuno.hxx +++ b/sfx2/inc/sfx2/sfxuno.hxx @@ -68,8 +68,8 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be // Macros to convert string -> unicode and unicode -> string. // We use UTF8 everytime. Its the best way to do this! -#define S2U(STRING) ::rtl::OStringToOUString(STRING, RTL_TEXTENCODING_UTF8) -#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8) +#define S2U(STRING) OStringToOUString(STRING, RTL_TEXTENCODING_UTF8) +#define U2S(STRING) OUStringToOString(STRING, RTL_TEXTENCODING_UTF8) //________________________________________________________________________________________________________________________ // macros for declaration and definition of uno-services @@ -111,13 +111,13 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be //************************************************************************************************************************ #define SFX_DECL_XSERVICEINFO_NOFACTORY \ /* XServiceInfo */ \ - virtual rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); \ - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ); \ - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); \ + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); \ + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ); \ + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); \ \ /* Helper for XServiceInfo */ \ - static css::uno::Sequence< rtl::OUString > impl_getStaticSupportedServiceNames(); \ - static rtl::OUString impl_getStaticImplementationName(); \ + static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); \ + static OUString impl_getStaticImplementationName(); \ \ /* Helper for registry */ \ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ); @@ -480,16 +480,16 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be #define SFX_IMPL_XSERVICEINFO( IMPLCLASS, IMPLSERVICENAME, IMPLNAME ) \ \ /* XServiceInfo */ \ - rtl::OUString SAL_CALL IMPLCLASS::getImplementationName() throw( css::uno::RuntimeException ) \ + OUString SAL_CALL IMPLCLASS::getImplementationName() throw( css::uno::RuntimeException ) \ { \ return impl_getStaticImplementationName(); \ } \ \ /* XServiceInfo */ \ - sal_Bool SAL_CALL IMPLCLASS::supportsService( const rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \ + sal_Bool SAL_CALL IMPLCLASS::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) \ { \ - css::uno::Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames(); \ - const rtl::OUString* pArray = seqServiceNames.getConstArray(); \ + css::uno::Sequence< OUString > seqServiceNames = getSupportedServiceNames(); \ + const OUString* pArray = seqServiceNames.getConstArray(); \ for ( sal_Int32 nCounter=0; nCounter SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ + css::uno::Sequence< OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ { \ return impl_getStaticSupportedServiceNames(); \ } \ \ /* Helper for XServiceInfo */ \ - css::uno::Sequence< rtl::OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \ + css::uno::Sequence< OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \ { \ - css::uno::Sequence< rtl::OUString > seqServiceNames( 1 ); \ - seqServiceNames.getArray() [0] = rtl::OUString::createFromAscii( IMPLSERVICENAME ); \ + css::uno::Sequence< OUString > seqServiceNames( 1 ); \ + seqServiceNames.getArray() [0] = OUString::createFromAscii( IMPLSERVICENAME ); \ return seqServiceNames ; \ } \ \ /* Helper for XServiceInfo */ \ - rtl::OUString IMPLCLASS::impl_getStaticImplementationName() \ + OUString IMPLCLASS::impl_getStaticImplementationName() \ { \ - return rtl::OUString::createFromAscii( IMPLNAME ); \ + return OUString::createFromAscii( IMPLNAME ); \ } \ \ /* Helper for registry */ \ @@ -537,16 +537,16 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be #define SFX_IMPL_XSERVICEINFO_CTX( IMPLCLASS, IMPLSERVICENAME, IMPLNAME ) \ \ /* XServiceInfo */ \ - rtl::OUString SAL_CALL IMPLCLASS::getImplementationName() throw( css::uno::RuntimeException ) \ + OUString SAL_CALL IMPLCLASS::getImplementationName() throw( css::uno::RuntimeException ) \ { \ return impl_getStaticImplementationName(); \ } \ \ /* XServiceInfo */ \ - sal_Bool SAL_CALL IMPLCLASS::supportsService( const rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \ + sal_Bool SAL_CALL IMPLCLASS::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) \ { \ - css::uno::Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames(); \ - const rtl::OUString* pArray = seqServiceNames.getConstArray(); \ + css::uno::Sequence< OUString > seqServiceNames = getSupportedServiceNames(); \ + const OUString* pArray = seqServiceNames.getConstArray(); \ for ( sal_Int32 nCounter=0; nCounter SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ + css::uno::Sequence< OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ { \ return impl_getStaticSupportedServiceNames(); \ } \ \ /* Helper for XServiceInfo */ \ - css::uno::Sequence< rtl::OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \ + css::uno::Sequence< OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \ { \ - css::uno::Sequence< rtl::OUString > seqServiceNames( 1 ); \ - seqServiceNames.getArray() [0] = rtl::OUString::createFromAscii( IMPLSERVICENAME ); \ + css::uno::Sequence< OUString > seqServiceNames( 1 ); \ + seqServiceNames.getArray() [0] = OUString::createFromAscii( IMPLSERVICENAME ); \ return seqServiceNames ; \ } \ \ /* Helper for XServiceInfo */ \ - rtl::OUString IMPLCLASS::impl_getStaticImplementationName() \ + OUString IMPLCLASS::impl_getStaticImplementationName() \ { \ - return rtl::OUString::createFromAscii( IMPLNAME ); \ + return OUString::createFromAscii( IMPLNAME ); \ } \ \ /* Helper for registry */ \ @@ -628,7 +628,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be //************************************************************************************************************************ #define IF_NAME_CREATECOMPONENTFACTORY(CLASS) \ \ - if ( CLASS::impl_getStaticImplementationName().equals( rtl::OUString::createFromAscii( pImplementationName ) ) ) \ + if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ { \ CREATEFACTORY ( CLASS ) \ } diff --git a/sfx2/inc/sfx2/stbitem.hxx b/sfx2/inc/sfx2/stbitem.hxx index eee606529de1..d94e76841045 100644 --- a/sfx2/inc/sfx2/stbitem.hxx +++ b/sfx2/inc/sfx2/stbitem.hxx @@ -35,7 +35,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, - const ::rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); struct SfxStbCtrlFactory diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index 435a4158d0b0..17016489e917 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -252,7 +252,7 @@ private: protected: SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet ); - SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet &rAttrSet); + SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } diff --git a/sfx2/inc/sfx2/taskpane.hxx b/sfx2/inc/sfx2/taskpane.hxx index 0f42a0672b01..0d0dd6eea199 100644 --- a/sfx2/inc/sfx2/taskpane.hxx +++ b/sfx2/inc/sfx2/taskpane.hxx @@ -46,7 +46,7 @@ namespace sfx2 class SAL_NO_VTABLE ITaskPaneToolPanelAccess { public: - virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) = 0; + virtual void ActivateToolPanel( const OUString& i_rPanelURL ) = 0; protected: ~ITaskPaneToolPanelAccess() {} @@ -69,7 +69,7 @@ namespace sfx2 SFX_DECL_CHILDWINDOW( TaskPaneWrapper ); // ITaskPaneToolPanelAccess - virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); + virtual void ActivateToolPanel( const OUString& i_rPanelURL ); }; //================================================================================================================== @@ -87,8 +87,8 @@ namespace sfx2 */ virtual short compareToolPanelsURLs( - const ::rtl::OUString& i_rLHS, - const ::rtl::OUString& i_rRHS + const OUString& i_rLHS, + const OUString& i_rRHS ) const = 0; protected: @@ -152,11 +152,11 @@ namespace sfx2 /** returns the position of the panel with the given resource URL */ ::boost::optional< size_t > - GetPanelPos( const ::rtl::OUString& i_rResourceURL ); + GetPanelPos( const OUString& i_rResourceURL ); /** returns the resource URL of the panel at the specified position */ - ::rtl::OUString + OUString GetPanelResourceURL( const size_t i_nPanelPos ) const; /// sets the "classical" layout of the tool panel deck, using drawers @@ -193,7 +193,7 @@ namespace sfx2 ~TaskPaneController(); /// activates the panel with the given URL - void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); + void ActivateToolPanel( const OUString& i_rPanelURL ); private: ::boost::scoped_ptr< TaskPaneController_Impl > m_pImpl; @@ -210,7 +210,7 @@ namespace sfx2 Window* i_pParent, WinBits i_nBits ); // ITaskPaneToolPanelAccess - virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); + virtual void ActivateToolPanel( const OUString& i_rPanelURL ); protected: // Window overridables diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index c5a890a2a87f..62331f3c9cdf 100644 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -45,7 +45,7 @@ class SfxBindings; class SfxModule; class SfxUnoControllerItem; -svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ); +svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ); typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); @@ -129,7 +129,7 @@ protected: void BindListener(); void UnbindListener(); - void AddStatusListener( const rtl::OUString& rCommandURL ); + void AddStatusListener( const OUString& rCommandURL ); // SfxStatusListenerInterface using FloatingWindow::StateChanged; @@ -237,8 +237,8 @@ protected: // XSubToolbarController virtual ::sal_Bool SAL_CALL opensSubToolbar( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage( ) throw (::com::sun::star::uno::RuntimeException); // XDockableWindowListener @@ -251,8 +251,8 @@ protected: virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException); // helper methods - void createAndPositionSubToolBar( const ::rtl::OUString& rSubToolBarResName ); - ::Size getPersistentFloatingSize( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const ::rtl::OUString& rSubToolBarResName ); + void createAndPositionSubToolBar( const OUString& rSubToolBarResName ); + ::Size getPersistentFloatingSize( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& rSubToolBarResName ); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -264,10 +264,10 @@ public: unsigned short GetId() const; unsigned short GetSlotId() const; - void Dispatch( const ::rtl::OUString& aCommand, + void Dispatch( const OUString& aCommand, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); static void Dispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, - const rtl::OUString& rCommand, + const OUString& rCommand, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); static SfxItemState GetItemState( const SfxPoolItem* pState ); diff --git a/sfx2/inc/sfx2/templateabstractview.hxx b/sfx2/inc/sfx2/templateabstractview.hxx index 71ce703e59bf..5f1eca6a80fa 100644 --- a/sfx2/inc/sfx2/templateabstractview.hxx +++ b/sfx2/inc/sfx2/templateabstractview.hxx @@ -53,7 +53,7 @@ public: virtual bool operator () (const ThumbnailViewItem *pItem); - bool isValid (const rtl::OUString& rPath) const; + bool isValid (const OUString& rPath) const; protected: @@ -120,7 +120,7 @@ public: static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height); - static BitmapEx getDefaultThumbnail( const rtl::OUString& rPath ); + static BitmapEx getDefaultThumbnail( const OUString& rPath ); static BitmapEx fetchThumbnail (const OUString &msURL, long width, long height); diff --git a/sfx2/inc/sfx2/templatelocalview.hxx b/sfx2/inc/sfx2/templatelocalview.hxx index fe7d50aa87a2..bd1b43130230 100644 --- a/sfx2/inc/sfx2/templatelocalview.hxx +++ b/sfx2/inc/sfx2/templatelocalview.hxx @@ -89,7 +89,7 @@ public: bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString &rName) const; - virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle); + virtual bool renameItem(ThumbnailViewItem* pItem, OUString sNewTitle); private: diff --git a/sfx2/inc/sfx2/templateproperties.hxx b/sfx2/inc/sfx2/templateproperties.hxx index 1f109c525105..f0db901073f0 100644 --- a/sfx2/inc/sfx2/templateproperties.hxx +++ b/sfx2/inc/sfx2/templateproperties.hxx @@ -19,8 +19,8 @@ struct TemplateItemProperties sal_uInt16 nId; ///< Index for ThumbnailView sal_uInt16 nDocId; ///< Index based on SfxTemplateDocument sal_uInt16 nRegionId; - rtl::OUString aName; - rtl::OUString aPath; + OUString aName; + OUString aPath; BitmapEx aThumbnail; }; diff --git a/sfx2/inc/sfx2/templaterepository.hxx b/sfx2/inc/sfx2/templaterepository.hxx index 0c7725c26067..f134c9897bf6 100644 --- a/sfx2/inc/sfx2/templaterepository.hxx +++ b/sfx2/inc/sfx2/templaterepository.hxx @@ -20,9 +20,9 @@ public: virtual ~TemplateRepository () { }; - void setURL (const rtl::OUString &rURL) { maUrl = rURL; } + void setURL (const OUString &rURL) { maUrl = rURL; } - const rtl::OUString& getURL () const { return maUrl; } + const OUString& getURL () const { return maUrl; } void insertTemplate (const TemplateItemProperties &prop) { maTemplates.push_back(prop); } @@ -33,11 +33,11 @@ public: public: sal_uInt16 mnId; - rtl::OUString maTitle; + OUString maTitle; private: - rtl::OUString maUrl; + OUString maUrl; std::vector maTemplates; }; diff --git a/sfx2/inc/sfx2/templateviewitem.hxx b/sfx2/inc/sfx2/templateviewitem.hxx index 0a3cb3e10b44..efabd34ea4fd 100644 --- a/sfx2/inc/sfx2/templateviewitem.hxx +++ b/sfx2/inc/sfx2/templateviewitem.hxx @@ -20,21 +20,21 @@ public: virtual ~TemplateViewItem (); - void setPath (const rtl::OUString &rPath) { maPath = rPath; } + void setPath (const OUString &rPath) { maPath = rPath; } - const rtl::OUString& getPath () const { return maPath; } + const OUString& getPath () const { return maPath; } - void setAuthor (const rtl::OUString &rAuthor) { maAuthor = rAuthor; } + void setAuthor (const OUString &rAuthor) { maAuthor = rAuthor; } - const rtl::OUString& getAuthor () const { return maAuthor; } + const OUString& getAuthor () const { return maAuthor; } - void setKeywords (const rtl::OUString &rKeywords) { maKeywords = rKeywords; } + void setKeywords (const OUString &rKeywords) { maKeywords = rKeywords; } - const rtl::OUString& getKeywords () const { return maKeywords; } + const OUString& getKeywords () const { return maKeywords; } - void setSubTitle (const rtl::OUString &rTitle) { maSubTitle = rTitle; } + void setSubTitle (const OUString &rTitle) { maSubTitle = rTitle; } - const rtl::OUString& getSubTitle () const { return maSubTitle; } + const OUString& getSubTitle () const { return maSubTitle; } virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, const long nPadding, sal_uInt32 nMaxTextLenght, @@ -48,10 +48,10 @@ public: private: - rtl::OUString maPath; - rtl::OUString maAuthor; - rtl::OUString maKeywords; - rtl::OUString maSubTitle; + OUString maPath; + OUString maAuthor; + OUString maKeywords; + OUString maSubTitle; Point maSubTitlePos; }; diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx index 14bfd653ef0a..2bdf1b94ae09 100644 --- a/sfx2/inc/sfx2/thumbnailview.hxx +++ b/sfx2/inc/sfx2/thumbnailview.hxx @@ -240,7 +240,7 @@ public: virtual void Resize(); - virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle); + virtual bool renameItem(ThumbnailViewItem* pItem, OUString sNewTitle); protected: diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx b/sfx2/inc/sfx2/thumbnailviewitem.hxx index 2acc8de9f9e3..64a20cda910f 100644 --- a/sfx2/inc/sfx2/thumbnailviewitem.hxx +++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx @@ -70,7 +70,7 @@ public: bool mbSelected; bool mbHover; BitmapEx maPreview1; - rtl::OUString maTitle; + OUString maTitle; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc; ThumbnailViewItem (ThumbnailView &rView); @@ -91,7 +91,7 @@ public: void setEditTitle (bool edit, bool bChangeFocus = true); void updateTitleEditSize (); - virtual void setTitle (const rtl::OUString& rTitle); + virtual void setTitle (const OUString& rTitle); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible( bool bIsTransientChildrenDisabled ); @@ -113,7 +113,7 @@ public: virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs); - void addTextPrimitives (const rtl::OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, drawinglayer::primitive2d::Primitive2DSequence& rSeq); + void addTextPrimitives (const OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, drawinglayer::primitive2d::Primitive2DSequence& rSeq); static drawinglayer::primitive2d::PolygonHairlinePrimitive2D* createBorderLine (const basegfx::B2DPolygon &rPolygon); diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx index 00131fcedd61..09b500caa6bc 100644 --- a/sfx2/inc/sfx2/titledockwin.hxx +++ b/sfx2/inc/sfx2/titledockwin.hxx @@ -63,7 +63,7 @@ namespace sfx2 @return the ID of the newly created toolbox item */ - sal_uInt16 AddDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ) + sal_uInt16 AddDropDownToolBoxItem( const String& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ) { return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback ); } @@ -113,7 +113,7 @@ namespace sfx2 /** internal version of AddDropDownToolBoxItem */ - sal_uInt16 impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ); + sal_uInt16 impl_addDropDownToolBoxItem( const String& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ); /** returns the current title. diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx index fe2917c52565..d1d41b8ae689 100644 --- a/sfx2/inc/sfx2/unoctitm.hxx +++ b/sfx2/inc/sfx2/unoctitm.hxx @@ -78,11 +78,11 @@ public: struct SfxStatusDispatcher_Impl_hashType { - size_t operator()(const ::rtl::OUString& s) const + size_t operator()(const OUString& s) const { return s.hashCode(); } }; -typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, SfxStatusDispatcher_Impl_hashType, std::equal_to< ::rtl::OUString > > SfxStatusDispatcher_Impl_ListenerContainer ; +typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, SfxStatusDispatcher_Impl_hashType, std::equal_to< OUString > > SfxStatusDispatcher_Impl_ListenerContainer ; class SfxStatusDispatcher : public ::com::sun::star::frame::XNotifyingDispatch, public ::com::sun::star::lang::XTypeProvider, @@ -145,7 +145,7 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 >& impl_getStaticIdentifier(); static sal_Bool IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); - static rtl::OUString GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); + static OUString GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); @@ -179,7 +179,7 @@ public: const ::com::sun::star::util::URL& rURL ); ~SfxDispatchController_Impl(); - static rtl::OUString getSlaveCommand( const ::com::sun::star::util::URL& rURL ); + static OUString getSlaveCommand( const ::com::sun::star::util::URL& rURL ); void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer* pServ ); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index 4373a52ae6c1..522b4719eac0 100644 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -150,7 +150,7 @@ public: void UpdateTitle(); - static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL ); + static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ); // interne Handler SAL_DLLPRIVATE virtual sal_Bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder ); @@ -190,8 +190,8 @@ public: The buttons will be added from Right to Left at the right of the info bar. The parent, size and position of each button will be changed: only the width will remain unchanged. */ - void AppendInfoBar( const rtl::OUString& sId, const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ); - void RemoveInfoBar( const rtl::OUString& sId ); + void AppendInfoBar( const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons ); + void RemoveInfoBar( const OUString& sId ); SAL_DLLPRIVATE void SetDowning_Impl(); SAL_DLLPRIVATE void GetDocNumber_Impl(); @@ -224,14 +224,14 @@ public: SAL_DLLPRIVATE void MiscExec_Impl(SfxRequest &); SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &); SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( sal_uInt16 nId ); - SAL_DLLPRIVATE void AddDispatchMacroToBasic_Impl(const ::rtl::OUString& sMacro); + SAL_DLLPRIVATE void AddDispatchMacroToBasic_Impl(const OUString& sMacro); SAL_DLLPRIVATE void Exec_Impl(SfxRequest &); SAL_DLLPRIVATE void INetExecute_Impl(SfxRequest &); SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &); SAL_DLLPRIVATE void SetCurViewId_Impl( const sal_uInt16 i_nID ); - SAL_DLLPRIVATE void ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL ); + SAL_DLLPRIVATE void ActivateToolPanel_Impl( const OUString& i_rPanelURL ); private: SAL_DLLPRIVATE sal_Bool SwitchToViewShell_Impl( sal_uInt16 nNo, sal_Bool bIsIndex = sal_False ); diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 5eea56a3481d..759394d77cf5 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -254,7 +254,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > GetController(); - sal_Bool TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent ); + sal_Bool TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent ); void ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool ); diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index a4d4ad6dd70f..5913917592f8 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -49,8 +49,8 @@ private: Link m_aCloseHdl; String m_sToggleText; - ::rtl::OUString m_sConfigName; - ::rtl::OString m_sWinState; + OUString m_sConfigName; + OString m_sWinState; bool m_bIsConstructed; @@ -61,7 +61,7 @@ private: DECL_LINK(ToggleHdl, void *); public: - SearchDialog( Window* pWindow, const ::rtl::OUString& rConfigName ); + SearchDialog( Window* pWindow, const OUString& rConfigName ); ~SearchDialog(); inline void SetFindHdl( const Link& rLink ) { m_aFindHdl = rLink; } diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 97f9fc753a18..f828b41c2a6d 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -105,13 +105,13 @@ void MetadatableTest::test() MockMetadatable m3(*pReg); MockMetadatable m4(*pReg); MockMetadatable m5(*pReg); - ::rtl::OUString empty; - ::rtl::OUString content( "content.xml" ); - ::rtl::OUString styles( "styles.xml" ); - ::rtl::OUString sid1( "id1" ); - ::rtl::OUString sid2( "id2" ); - ::rtl::OUString sid3( "id3" ); - ::rtl::OUString sid4( "id4" ); + OUString empty; + OUString content( "content.xml" ); + OUString styles( "styles.xml" ); + OUString sid1( "id1" ); + OUString sid2( "id2" ); + OUString sid3( "id3" ); + OUString sid4( "id4" ); beans::StringPair id1(content, sid1); beans::StringPair id2(content, sid2); beans::StringPair id3(content, sid3); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 3b31dbdad56f..b973bc41ea97 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -198,7 +198,7 @@ SfxApplication::SfxApplication() #ifdef DBG_UTIL if( !bOk ) { - rtl::OStringBuffer aStr( + OStringBuffer aStr( RTL_CONSTASCII_STRINGPARAM("No DDE-Service possible. Error: ")); if( GetDdeService() ) aStr.append(static_cast(GetDdeService()->GetError())); @@ -503,14 +503,14 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) #ifndef DISABLE_DYNLOADING // get basctl dllname - static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); + static OUString aLibName( SVLIBRARY( "basctl" ) ); // load module oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); // get symbol - ::rtl::OUString aSymbol( "basicide_handle_basic_error" ); + OUString aSymbol( "basicide_handle_basic_error" ); basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) osl_getFunctionSymbol( handleMod, aSymbol.pData ); // call basicide_handle_basic_error in basctl @@ -562,10 +562,10 @@ sal_Bool SfxApplication::IsXScriptURL( const String& rScriptURL ) return result; } -::rtl::OUString +OUString SfxApplication::ChooseScript() { - ::rtl::OUString aScriptURL; + OUString aScriptURL; #ifndef DISABLE_SCRIPTING SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); @@ -605,14 +605,14 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) #ifndef DISABLE_DYNLOADING // get basctl dllname - static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); + static OUString aLibName( SVLIBRARY( "basctl" ) ); // load module oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); // get symbol - ::rtl::OUString aSymbol( "basicide_macro_organizer" ); + OUString aSymbol( "basicide_macro_organizer" ); basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); // call basicide_macro_organizer in basctl diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 1c72b4476201..1dae64a69125 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -106,7 +106,7 @@ SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject, (void) eClassType; return 0; #else - SbxVariable *pVar = pBas->Make( rtl::OUString::createFromAscii(pName), eClassType, eType ); //SbxCLASS_PROPERTY + SbxVariable *pVar = pBas->Make( OUString::createFromAscii(pName), eClassType, eType ); //SbxCLASS_PROPERTY pVar->SetUserData( nSID ); pVar->SetFlag( SBX_DONTSTORE ); pObject->StartListening( pVar->GetBroadcaster() ); diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx index cd2f721aed8f..14125482f4f1 100644 --- a/sfx2/source/appl/appbaslib.cxx +++ b/sfx2/source/appl/appbaslib.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::script; using namespace ::com::sun::star::embed; -using ::rtl::OUString; using ::osl::MutexGuard; using ::osl::Mutex; @@ -142,7 +141,7 @@ void SfxBasicManagerHolder::impl_releaseContainers() } sal_Bool -SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< rtl::OUString >& sModules ) +SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< OUString >& sModules ) { #ifdef DISABLE_SCRIPTING (void) sModules; diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 061f697de81c..03aaf69c2e0b 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -135,8 +135,8 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer) #ifdef DBG_UTIL if (!xRef.Is()) { - rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: ")); - aTmp.append(rtl::OUStringToOString(aHint.GetEventName(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: ")); + aTmp.append(OUStringToOString(aHint.GetEventName(), RTL_TEXTENCODING_UTF8)); OSL_TRACE( "%s", aTmp.getStr() ); } #endif @@ -375,7 +375,7 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) bRet = sal_True; if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS)) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs = aSecurityOptions.GetSecureURLs(); + ::com::sun::star::uno::Sequence< OUString > seqURLs = aSecurityOptions.GetSecureURLs(); std::vector aList; sal_uInt32 nCount = seqURLs.getLength(); sal_uInt32 nURL; @@ -457,7 +457,7 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) nProp <= SvtPathOptions::PATH_WORK; nProp++ ) { aNames.InsertValue( nProp, SfxResId(CONFIG_PATH_START + nProp).toString() ); - rtl::OUString aValue; + OUString aValue; switch ( nProp ) { case SvtPathOptions::PATH_ADDIN: ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aPathCfg.GetAddinPath(), aValue ); break; @@ -783,7 +783,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) DBG_ASSERT(pItem->ISA(SfxStringListItem), "StringListItem expected"); const std::vector &aList = ((SfxStringListItem*)pItem)->GetList(); sal_uInt32 nCount = aList.size(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs(nCount); + ::com::sun::star::uno::Sequence< OUString > seqURLs(nCount); for( sal_uInt32 nPosition=0;nPositionISA(SfxAllEnumItem), "AllEnumItem expected"); const SfxAllEnumItem* pEnumItem = (const SfxAllEnumItem *)pItem; sal_uInt32 nCount = pEnumItem->GetValueCount(); - rtl::OUString aNoChangeStr( ' ' ); + OUString aNoChangeStr( ' ' ); for( sal_uInt32 nPath=0; nPathGetValueTextByPos((sal_uInt16)nPath); + OUString sValue = pEnumItem->GetValueTextByPos((sal_uInt16)nPath); if ( sValue != aNoChangeStr ) { switch( nPath ) { case SvtPathOptions::PATH_ADDIN: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetAddinPath( aTmp ); break; @@ -848,7 +848,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_FAVORITES: aPathOptions.SetFavoritesPath( sValue );break; case SvtPathOptions::PATH_FILTER: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetFilterPath( aTmp ); break; @@ -857,7 +857,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_GRAPHIC: aPathOptions.SetGraphicPath( sValue );break; case SvtPathOptions::PATH_HELP: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetHelpPath( aTmp ); break; @@ -866,7 +866,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_LINGUISTIC: aPathOptions.SetLinguisticPath( sValue );break; case SvtPathOptions::PATH_MODULE: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetModulePath( aTmp ); break; @@ -875,7 +875,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_PALETTE: aPathOptions.SetPalettePath( sValue );break; case SvtPathOptions::PATH_PLUGIN: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetPluginPath( aTmp ); break; @@ -883,7 +883,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_STORAGE: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetStoragePath( aTmp ); break; @@ -919,8 +919,8 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron #ifdef DBG_UTIL if (!pDoc) { - rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: ")); - aTmp.append(rtl::OUStringToOString(rEventHint.GetEventName(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: ")); + aTmp.append(OUStringToOString(rEventHint.GetEventName(), RTL_TEXTENCODING_UTF8)); OSL_TRACE( "%s", aTmp.getStr() ); } #endif diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 801a8a0fcf86..8080942b953d 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -67,7 +67,7 @@ public: ImplDdeService( const String& rNm ) : DdeService( rNm ) {} - virtual sal_Bool MakeTopic( const rtl::OUString& ); + virtual sal_Bool MakeTopic( const OUString& ); virtual String Topics(); @@ -111,7 +111,7 @@ namespace } } -sal_Bool ImplDdeService::MakeTopic( const rtl::OUString& rNm ) +sal_Bool ImplDdeService::MakeTopic( const OUString& rNm ) { // Workaround for Event after Main() under OS/2 // happens when exiting starts the App again @@ -224,7 +224,7 @@ public: virtual sal_Bool Put( const DdeData* ); virtual sal_Bool Execute( const String* ); virtual sal_Bool StartAdviseLoop(); - virtual sal_Bool MakeItem( const rtl::OUString& rItem ); + virtual sal_Bool MakeItem( const OUString& rItem ); }; @@ -254,7 +254,7 @@ sal_Bool SfxAppEvent_Impl( ApplicationEvent &rAppEvent, sEvent += "("; if (rCmd.startsWithIgnoreAsciiCase(sEvent)) { - ::rtl::OUStringBuffer aData( rCmd ); + OUStringBuffer aData( rCmd ); aData.remove(0, sEvent.getLength()); if ( aData.getLength() > 2 ) { @@ -665,7 +665,7 @@ sal_Bool SfxDdeDocTopic_Impl::Execute( const String* pStr ) return 0 != nRet; } -sal_Bool SfxDdeDocTopic_Impl::MakeItem( const rtl::OUString& rItem ) +sal_Bool SfxDdeDocTopic_Impl::MakeItem( const OUString& rItem ) { AddItem( DdeItem( rItem ) ); return sal_True; diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index cef12aaafbce..6dc25eed1908 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -81,9 +81,9 @@ public: virtual void SAL_CALL disposing( const EventObject& Source ) throw( RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) throw (RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); }; void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw( RuntimeException ) @@ -122,14 +122,14 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a Application::Quit(); } -::rtl::OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (RuntimeException) +OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.sfx2.SfxTerminateListener"); + return OUString("com.sun.star.comp.sfx2.SfxTerminateListener"); } -::sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (RuntimeException) +::sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const OUString& sServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > lNames = getSupportedServiceNames(); + Sequence< OUString > lNames = getSupportedServiceNames(); ::sal_Int32 c = lNames.getLength(); ::sal_Int32 i = 0; @@ -142,7 +142,7 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceNames() throw (RuntimeException) { // Note: That service does not realy exists .-) // But this implementation is not thought to be registered realy within our service.rdb. @@ -150,8 +150,8 @@ Sequence< ::rtl::OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServ // The desktop must know, which listener will terminate the SfxApplication in real ! // It must call this special listener as last one ... otherwise we shutdown the SfxApplication BEFORE other listener // can react ... - static const ::rtl::OUString SERVICENAME("com.sun.star.frame.TerminateListener"); - Sequence< ::rtl::OUString > lNames(1); + static const OUString SERVICENAME("com.sun.star.frame.TerminateListener"); + Sequence< OUString > lNames(1); lNames[0] = SERVICENAME; return lNames; } @@ -195,7 +195,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) &thisModule, aLibName.pData, 0 ); // get symbol - ::rtl::OUString aSymbol( "GetSpecialCharsForEdit" ); + OUString aSymbol( "GetSpecialCharsForEdit" ); pfunc_getSpecialCharsForEdit = (PFunc_getSpecialCharsForEdit)osl_getFunctionSymbol( handleMod, aSymbol.pData ); DBG_ASSERT( pfunc_getSpecialCharsForEdit, "GetSpecialCharsForEdit() not found!" ); #else diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 8008e9071605..f6d1597148a9 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -187,15 +187,15 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid { // Load from disk // --------------------------------------------------------------------- - rtl::OUString aBaseName = ( rtl::OUString("/") + - rtl::OUString::createFromAscii( pName ) ); - rtl::OUString aSvg( ".svg" ); + OUString aBaseName = ( OUString("/") + + OUString::createFromAscii( pName ) ); + OUString aSvg( ".svg" ); rtl_Locale *pLoc = NULL; osl_getProcessLocale (&pLoc); LanguageTag aLanguageTag( *pLoc); - rtl::OUString uri = rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ) + aBaseName+aSvg; + OUString uri = OUString::createFromAscii( "$BRAND_BASE_DIR/program" ) + aBaseName+aSvg; rtl::Bootstrap::expandMacros( uri ); INetURLObject aObj( uri ); SvgData aSvgData(aObj.PathToFileName()); @@ -219,7 +219,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid // UNO dance to render from drawinglayer // --------------------------------------------------------------------- uno::Reference< lang::XMultiServiceFactory > xFactory(::comphelper::getProcessServiceFactory()); - const rtl::OUString aServiceName("com.sun.star.graphic.Primitive2DTools"); + const OUString aServiceName("com.sun.star.graphic.Primitive2DTools"); try { diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index cce73e64be4c..d88ecb7e9825 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -158,7 +158,7 @@ public: mxStorage( rxStorage ) {} virtual ::comphelper::DocPasswordVerifierResult - verifyPassword( const ::rtl::OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ); + verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ); virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData ); @@ -168,7 +168,7 @@ private: }; //-------------------------------------------------------------------- -::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyPassword( const ::rtl::OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) +::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) { o_rEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( rPassword ); return verifyEncryptionData( o_rEncryptionData ); @@ -187,7 +187,7 @@ private: ::comphelper::OStorageHelper::SetCommonStorageEncryptionData( mxStorage, rEncryptionData ); mxStorage->openStreamElement( - ::rtl::OUString( "content.xml" ), + OUString( "content.xml" ), embed::ElementModes::READ | embed::ElementModes::NOCREATE ); // no exception -> success @@ -237,7 +237,7 @@ sal_uInt32 CheckPasswd_Impl { sal_Bool bIsEncrypted = sal_False; try { - xStorageProps->getPropertyValue( ::rtl::OUString("HasEncryptedEntries") ) + xStorageProps->getPropertyValue( OUString("HasEncryptedEntries") ) >>= bIsEncrypted; } catch( uno::Exception& ) { @@ -261,7 +261,7 @@ sal_uInt32 CheckPasswd_Impl if( xInteractionHandler.is() ) { // use the comphelper password helper to request a password - ::rtl::OUString aPassword; + OUString aPassword; SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False); if ( pPasswordItem ) aPassword = pPasswordItem->GetValue(); @@ -271,7 +271,7 @@ sal_uInt32 CheckPasswd_Impl if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; - ::rtl::OUString aDocumentName = INetURLObject( pFile->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ); + OUString aDocumentName = INetURLObject( pFile->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ); SfxDocPasswordVerifier aVerifier( xStorage ); aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword( @@ -349,8 +349,8 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String DBG_ASSERT( !xDoc.Is(), "Sorry, not implemented!" ); delete pSet; SfxStringItem aName( SID_FILE_NAME, rFileName ); - SfxStringItem aReferer( SID_REFERER, rtl::OUString("private:user") ); - SfxStringItem aFlags( SID_OPTIONS, rtl::OUString("T") ); + SfxStringItem aReferer( SID_REFERER, OUString("private:user") ); + SfxStringItem aFlags( SID_OPTIONS, OUString("T") ); SfxBoolItem aHidden( SID_HIDDEN, sal_True ); const SfxPoolItem *pRet = GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, &aName, &aHidden, &aReferer, &aFlags, 0L ); const SfxObjectItem *pObj = PTR_CAST( SfxObjectItem, pRet ); @@ -431,8 +431,8 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String sal_Int32 nLength = aArgs.getLength(); aArgs.realloc( nLength + 1 ); aArgs[nLength].Name = "Title"; - aArgs[nLength].Value <<= ::rtl::OUString( xDoc->GetTitle( SFX_TITLE_DETECT ) ); - xModel->attachResource( ::rtl::OUString(), aArgs ); + aArgs[nLength].Value <<= OUString( xDoc->GetTitle( SFX_TITLE_DETECT ) ); + xModel->attachResource( OUString(), aArgs ); delete pNew; } @@ -452,11 +452,11 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, GetPool() ); - String aFact = rtl::OUString("private:factory/"); + String aFact = OUString("private:factory/"); aFact += aFactName; aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aFact ) ); aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, GetFrame() ) ); - aReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString( "_default" ) ) ); + aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString( "_default" ) ) ); // TODO/LATER: Should the other arguments be transferred as well? SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, sal_False); @@ -593,7 +593,7 @@ bool lcl_isFilterNativelySupported(const SfxFilter& rFilter) if (rFilter.IsOwnFormat()) return true; - ::rtl::OUString aName = rFilter.GetFilterName(); + OUString aName = rFilter.GetFilterName(); if (aName.indexOf("MS Excel") == 0) // We can handle all Excel variants natively. return true; @@ -605,7 +605,7 @@ bool lcl_isFilterNativelySupported(const SfxFilter& rFilter) void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { - rtl::OUString aDocService; + OUString aDocService; SFX_REQUEST_ARG(rReq, pDocSrvItem, SfxStringItem, SID_DOC_SERVICE, false); if (pDocSrvItem) aDocService = pDocSrvItem->GetValue(); @@ -635,7 +635,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( !pFileNameItem ) { // get FileName from dialog - std::vector pURLList; + std::vector pURLList; String aFilter; SfxItemSet* pSet = NULL; String aPath; @@ -663,7 +663,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( pStandardDirItem ) sStandardDir = pStandardDirItem->GetValue(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aBlackList; + ::com::sun::star::uno::Sequence< OUString > aBlackList; SFX_REQUEST_ARG( rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST, sal_False ); if ( pBlackListItem ) @@ -684,8 +684,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.SetArgs( *(SfxAllItemSet*)pSet ); if (aFilter.Len() >0 ) rReq.AppendItem( SfxStringItem( SID_FILTER_NAME, aFilter ) ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); - rReq.AppendItem( SfxStringItem( SID_REFERER, rtl::OUString(SFX_REFERER_USER) ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); + rReq.AppendItem( SfxStringItem( SID_REFERER, OUString(SFX_REFERER_USER) ) ); delete pSet; if(!pURLList.empty()) @@ -725,7 +725,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.AppendItem(SfxStringItem(SID_DOC_SERVICE, aDocService)); } - for(std::vector::const_iterator i = pURLList.begin(); i != pURLList.end(); ++i) + for(std::vector::const_iterator i = pURLList.begin(); i != pURLList.end(); ++i) { rReq.RemoveItem( SID_FILE_NAME ); rReq.AppendItem( SfxStringItem( SID_FILE_NAME, *i ) ); @@ -844,12 +844,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString("com.sun.star.document.TypeDetection")), + OUString("com.sun.star.document.TypeDetection")), UNO_QUERY ); if ( xTypeDetection.is() ) { URL aURL; - ::rtl::OUString aTypeName; + OUString aTypeName; aURL.Complete = aFileName; Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); @@ -880,7 +880,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { // don't dispatch mailto hyperlink to desktop dispatcher rReq.RemoveItem( SID_TARGETNAME ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_self") ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_self") ) ); } else if ( aINetProtocol == INET_PROT_FTP || aINetProtocol == INET_PROT_HTTP || @@ -892,20 +892,20 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) else { // check for "internal" protocols that should not be forwarded to the system - Sequence < ::rtl::OUString > aProtocols(2); + Sequence < OUString > aProtocols(2); // add special protocols that always should be treated as internal - aProtocols[0] = ::rtl::OUString("private:*"); - aProtocols[1] = ::rtl::OUString("vnd.sun.star.*"); + aProtocols[0] = OUString("private:*"); + aProtocols[1] = OUString("vnd.sun.star.*"); try { // get registered protocol handlers from configuration Reference < XNameAccess > xAccess( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - ::rtl::OUString("org.openoffice.Office.ProtocolHandler/HandlerSet"), ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY ); + OUString("org.openoffice.Office.ProtocolHandler/HandlerSet"), ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY ); if ( xAccess.is() ) { - Sequence < ::rtl::OUString > aNames = xAccess->getElementNames(); + Sequence < OUString > aNames = xAccess->getElementNames(); for ( sal_Int32 nName = 0; nName < aNames.getLength(); nName ++) { Reference < XPropertySet > xSet; @@ -914,8 +914,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( xSet.is() ) { // copy protocols - aRet = xSet->getPropertyValue( ::rtl::OUString("Protocols") ); - Sequence < ::rtl::OUString > aTmp; + aRet = xSet->getPropertyValue( OUString("Protocols") ); + Sequence < OUString > aTmp; aRet >>= aTmp; // todo: add operator+= to SequenceAsVector class and use SequenceAsVector for aProtocols @@ -948,7 +948,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) sal_Bool bLoadInternal = sal_False; // security reservation: => we have to check the referer before executing - if (SFX_APP()->IsSecureURL(rtl::OUString(), &aReferer)) + if (SFX_APP()->IsSecureURL(OUString(), &aReferer)) { try { @@ -958,7 +958,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) catch ( ::com::sun::star::system::SystemShellExecuteException& ) { rReq.RemoveItem( SID_TARGETNAME ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); bLoadInternal = sal_True; } } @@ -977,7 +977,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { // hyperlink document must be loaded into a new frame rReq.RemoveItem( SID_TARGETNAME ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); } } } @@ -1043,7 +1043,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } // extract target name - ::rtl::OUString aTarget; + OUString aTarget; SFX_REQUEST_ARG(rReq, pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False); if ( pTargetItem ) aTarget = pTargetItem->GetValue(); @@ -1051,12 +1051,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, sal_False ); if ( pNewViewItem && pNewViewItem->GetValue() ) - aTarget = rtl::OUString("_blank" ); + aTarget = OUString("_blank" ); } if ( bHidden ) { - aTarget = rtl::OUString("_blank"); + aTarget = OUString("_blank"); DBG_ASSERT( rReq.IsSynchronCall() || pLinkItem, "Hidden load process must be done synchronously!" ); } diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index d631b7beebdd..c80b4d4a2df4 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -163,9 +163,9 @@ namespace using namespace org::freedesktop::PackageKit; using namespace svtools; Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext())); - Sequence< ::rtl::OUString > vPackages(1); + Sequence< OUString > vPackages(1); vPackages[0] = "libreoffice-base"; - ::rtl::OUString sInteraction; + OUString sInteraction; xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction); // Ill be back (hopefully)! SolarMutexGuard aGuard; @@ -179,22 +179,22 @@ namespace } return; } - SfxStringItem aURL(SID_FILE_NAME, rtl::OUString(".component:Bibliography/View1")); - SfxStringItem aRef(SID_REFERER, rtl::OUString("private:user")); - SfxStringItem aTarget(SID_TARGETNAME, rtl::OUString("_blank")); + SfxStringItem aURL(SID_FILE_NAME, OUString(".component:Bibliography/View1")); + SfxStringItem aRef(SID_REFERER, OUString("private:user")); + SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank")); SfxViewFrame::Current()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aURL, &aRef, &aTarget, 0L); } } /// Find the correct location of the document (LICENSE.odt, etc.), and return /// it in rURL if found. -static sal_Bool checkURL( const char *pName, const char *pExt, rtl::OUString &rURL ) +static sal_Bool checkURL( const char *pName, const char *pExt, OUString &rURL ) { using namespace osl; DirectoryItem aDirItem; - rURL = rtl::OUString( "$BRAND_BASE_DIR/" ); - rURL += rtl::OUString::createFromAscii( pName ); - rURL += rtl::OUString::createFromAscii( pExt ); + rURL = OUString( "$BRAND_BASE_DIR/" ); + rURL += OUString::createFromAscii( pName ); + rURL += OUString::createFromAscii( pExt ); rtl::Bootstrap::expandMacros( rURL ); if (!rURL.isEmpty()) @@ -209,16 +209,16 @@ static void showDocument( const char* pBaseName ) try { Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); Sequence < com::sun::star::beans::PropertyValue > args(2); - args[0].Name = ::rtl::OUString("ViewOnly"); + args[0].Name = OUString("ViewOnly"); args[0].Value <<= sal_True; - args[1].Name = ::rtl::OUString("ReadOnly"); + args[1].Name = OUString("ReadOnly"); args[1].Value <<= sal_True; - rtl::OUString aURL; + OUString aURL; if ( checkURL ( pBaseName, ".odt", aURL ) || checkURL ( pBaseName, ".html", aURL ) || checkURL ( pBaseName, "", aURL ) ) { - xDesktop->loadComponentFromURL( aURL, ::rtl::OUString("_blank"), 0, args ); + xDesktop->loadComponentFromURL( aURL, OUString("_blank"), 0, args ); } } catch (const ::com::sun::star::uno::Exception &) { } @@ -286,7 +286,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) return; } - SfxStringItem aNameItem( SID_FILE_NAME, rtl::OUString("vnd.sun.star.cmd:logout") ); + SfxStringItem aNameItem( SID_FILE_NAME, OUString("vnd.sun.star.cmd:logout") ); SfxStringItem aReferer( SID_REFERER, "private/user" ); pAppData_Impl->pAppDispat->Execute( SID_OPENDOC, SFX_CALLMODE_SLOT, &aNameItem, &aReferer, 0L ); return; @@ -428,14 +428,14 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_SEND_FEEDBACK: { - ::rtl::OUString module = SfxHelp::GetCurrentModuleIdentifier(); - ::rtl::OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() + + OUString module = SfxHelp::GetCurrentModuleIdentifier(); + OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() + "&LOlocale=" + utl::ConfigManager::getLocale() + "&LOmodule=" + module.copy(module.lastIndexOf(".") + 1 ) ); try { uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); - xSystemShellExecute->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); } catch ( uno::Exception& ) { @@ -462,7 +462,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) Help* pHelp = Application::GetHelp(); if ( pHelp ) { - pHelp->Start( rtl::OUString(".uno:HelpIndex"), NULL ); // show start page + pHelp->Start( OUString(".uno:HelpIndex"), NULL ); // show start page bDone = true; } break; @@ -658,7 +658,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) { try { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } catch ( const ::com::sun::star::uno::RuntimeException& ) @@ -672,12 +672,12 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( xLayoutManager.is() ) { - rtl::OUString aToolbarResName( "private:resource/toolbar/" ); - rtl::OUStringBuffer aBuf( aToolbarResName ); + OUString aToolbarResName( "private:resource/toolbar/" ); + OUStringBuffer aBuf( aToolbarResName ); aBuf.append( pToolbarName->GetValue() ); // Evaluate Parameter - rtl::OUString aToolbarName( aBuf.makeStringAndClear() ); + OUString aToolbarName( aBuf.makeStringAndClear() ); sal_Bool bShow( !xLayoutManager->isElementVisible( aToolbarName )); if ( bShow ) @@ -843,18 +843,18 @@ extern "C" void basicide_macro_organizer( sal_Int16 ); #endif -::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, sal_Bool bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() ) +OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, sal_Bool bChooseOnly, const OUString& rMacroDesc = OUString() ) { #ifndef DISABLE_DYNLOADING // get basctl dllname - static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); + static OUString aLibName( SVLIBRARY( "basctl" ) ); // load module oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); // get symbol - ::rtl::OUString aSymbol( "basicide_choose_macro" ); + OUString aSymbol( "basicide_choose_macro" ); basicide_choose_macro pSymbol = (basicide_choose_macro) osl_getFunctionSymbol( handleMod, aSymbol.pData ); #else #define pSymbol basicide_choose_macro @@ -862,7 +862,7 @@ extern "C" void basicide_macro_organizer( sal_Int16 ); // call basicide_choose_macro in basctl rtl_uString* pScriptURL = pSymbol( rxLimitToDocument.get(), bChooseOnly, rMacroDesc.pData ); - ::rtl::OUString aScriptURL( pScriptURL ); + OUString aScriptURL( pScriptURL ); rtl_uString_release( pScriptURL ); return aScriptURL; @@ -875,14 +875,14 @@ void MacroOrganizer( sal_Int16 nTabId ) { #ifndef DISABLE_DYNLOADING // get basctl dllname - static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); + static OUString aLibName( SVLIBRARY( "basctl" ) ); // load module oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); // get symbol - ::rtl::OUString aSymbol( "basicide_macro_organizer" ); + OUString aSymbol( "basicide_macro_organizer" ); basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); // call basicide_macro_organizer in basctl pSymbol( nTabId ); @@ -928,9 +928,9 @@ namespace return _pFallback; } - const ::rtl::OUString& lcl_getBasicIDEServiceName() + const OUString& lcl_getBasicIDEServiceName() { - static const ::rtl::OUString s_sBasicName( "com.sun.star.script.BasicIDE" ); + static const OUString s_sBasicName( "com.sun.star.script.BasicIDE" ); return s_sBasicName; } @@ -960,7 +960,7 @@ namespace try { Reference < XFrame > xFrame( xContainer->getByIndex(i), UNO_QUERY_THROW ); - ::rtl::OUString sModule = xCheck->identify( xFrame ); + OUString sModule = xCheck->identify( xFrame ); if ( sModule == "com.sun.star.frame.StartModule" ) return xFrame; } @@ -984,13 +984,13 @@ namespace #endif // !DISABLE_SCRIPTING } -static ::rtl::OUString getConfigurationStringValue( - const ::rtl::OUString& rPackage, - const ::rtl::OUString& rRelPath, - const ::rtl::OUString& rKey, - const ::rtl::OUString& rDefaultValue ) +static OUString getConfigurationStringValue( + const OUString& rPackage, + const OUString& rRelPath, + const OUString& rKey, + const OUString& rDefaultValue ) { - ::rtl::OUString aDefVal( rDefaultValue ); + OUString aDefVal( rDefaultValue ); try { @@ -1060,29 +1060,29 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) css::system::SystemShellExecute::create(xContext) ); // read repository URL from configuration - ::rtl::OUString sTemplRepoURL = + OUString sTemplRepoURL = getConfigurationStringValue( - ::rtl::OUString("org.openoffice.Office.Common"), - ::rtl::OUString("Dictionaries"), - ::rtl::OUString("RepositoryURL"), - ::rtl::OUString()); + OUString("org.openoffice.Office.Common"), + OUString("Dictionaries"), + OUString("RepositoryURL"), + OUString()); if ( xSystemShell.is() && !sTemplRepoURL.isEmpty() ) { - ::rtl::OUStringBuffer aURLBuf( sTemplRepoURL ); + OUStringBuffer aURLBuf( sTemplRepoURL ); aURLBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM("?lang=")); // read locale from configuration - ::rtl::OUString sLocale = getConfigurationStringValue( - ::rtl::OUString("org.openoffice.Setup"), - ::rtl::OUString("L10N"), - ::rtl::OUString("ooLocale"), - ::rtl::OUString("en-US")); + OUString sLocale = getConfigurationStringValue( + OUString("org.openoffice.Setup"), + OUString("L10N"), + OUString("ooLocale"), + OUString("en-US")); aURLBuf.append( sLocale ); xSystemShell->execute( aURLBuf.makeStringAndClear(), - ::rtl::OUString(), + OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); } } @@ -1115,7 +1115,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) UNO_QUERY_THROW ); ::comphelper::NamedValueCollection aLoadArgs; aLoadArgs.put( "Model", pBasicIDE->GetModel() ); - aLoadArgs.put( "URL", ::rtl::OUString( "private:factory/sbasic" ) ); + aLoadArgs.put( "URL", OUString( "private:factory/sbasic" ) ); Reference< XFrame > xTargetFrame( lcl_findStartModuleFrame( xContext ) ); if ( !xTargetFrame.is() ) @@ -1264,8 +1264,8 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) aLanguage = ((SfxScriptOrganizerItem*)pItem)->getLanguage(); } - ::rtl::OUString aLang( aLanguage ); - OSL_TRACE("SfxApplication::OfaExec_Impl: about to create dialog for: %s", ::rtl::OUStringToOString( aLang , RTL_TEXTENCODING_ASCII_US ).pData->buffer); + OUString aLang( aLanguage ); + OSL_TRACE("SfxApplication::OfaExec_Impl: about to create dialog for: %s", OUStringToOString( aLang , RTL_TEXTENCODING_ASCII_US ).pData->buffer); // not sure about the Window* VclAbstractDialog* pDlg = pFact->CreateSvxScriptOrgDialog( GetTopWindow(), aLanguage ); if( pDlg ) @@ -1332,12 +1332,12 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext ); - ::rtl::OUString aCmd = ::rtl::OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() ); + OUString aCmd = OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() ); Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); Sequence < beans::PropertyValue > aSeq; if ( rReq.GetArgs() ) TransformItems( rReq.GetSlot(), *rReq.GetArgs(), aSeq ); - Any aResult = xHelper->executeDispatch( xProv, aCmd, ::rtl::OUString(), 0, aSeq ); + Any aResult = xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aSeq ); frame::DispatchResultEvent aEvent; sal_Bool bSuccess = (aResult >>= aEvent) && (aEvent.State == frame::DispatchResultState::SUCCESS); @@ -1352,12 +1352,12 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< frame::XDispatchProvider > xProv = text::ModuleDispatcher::create( xContext ); - ::rtl::OUString aCmd = ::rtl::OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() ); + OUString aCmd = OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() ); Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); Sequence < beans::PropertyValue > aSeq; if ( rReq.GetArgs() ) TransformItems( rReq.GetSlot(), *rReq.GetArgs(), aSeq ); - Any aResult = xHelper->executeDispatch( xProv, aCmd, ::rtl::OUString(), 0, aSeq ); + Any aResult = xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aSeq ); frame::DispatchResultEvent aEvent; sal_Bool bSuccess = (aResult >>= aEvent) && (aEvent.State == frame::DispatchResultState::SUCCESS); diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 62b2dfedc88b..9bc3e9e7578f 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -241,7 +241,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque if ( !pItem ) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "No creator method for item: ")); aStr.append(static_cast(nSlotId)); OSL_FAIL(aStr.getStr()); @@ -266,7 +266,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque #ifdef DBG_UTIL else { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); aStr.append(pSlot->pUnoName); OSL_FAIL( aStr.getStr() ); } @@ -276,8 +276,8 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque else if ( nSubCount == 0 ) { // for a simple property there can be only one parameter and its name *must* match - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property name does not match: ")); - aStr.append(rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8)); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property name does not match: ")); + aStr.append(OUStringToOString(aName, RTL_TEXTENCODING_UTF8)); OSL_FAIL( aStr.getStr() ); } #endif @@ -291,7 +291,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque // so this should be notified as a warning only if ( nCount != nSubCount ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "MacroPlayer: wrong number of parameters for slot: ")); aStr.append(static_cast(nSlotId)); DBG_WARNING(aStr.getStr()); @@ -306,7 +306,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque for ( nSub=0; nSubpUnoName).append('.').append(pType->aAttrib[nSub].pName); if ( rPropValue.Name.equalsAsciiL(aStr.getStr(), aStr.getLength()) ) { @@ -318,7 +318,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque #ifdef DBG_UTIL else { - rtl::OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); + OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); aDbgStr.append(pSlot->pUnoName); OSL_FAIL( aDbgStr.getStr() ); } @@ -331,8 +331,8 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque if ( nSub >= nSubCount ) { // there was a parameter with a name that didn't match to any of the members - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property name does not match: ")); - aStr.append(rtl::OUStringToOString(rPropValue.Name, RTL_TEXTENCODING_UTF8)); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property name does not match: ")); + aStr.append(OUStringToOString(rPropValue.Name, RTL_TEXTENCODING_UTF8)); OSL_FAIL( aStr.getStr() ); } #endif @@ -361,7 +361,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque if ( !pItem ) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("No creator method for argument: ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("No creator method for argument: ")); aStr.append(rArg.pName); OSL_FAIL( aStr.getStr() ); #endif @@ -391,7 +391,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque #ifdef DBG_UTIL else { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); aStr.append(rArg.pName); OSL_FAIL( aStr.getStr() ); } @@ -420,7 +420,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque #ifdef DBG_UTIL else { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); aStr.append(rArg.pName); OSL_FAIL( aStr.getStr() ); } @@ -440,7 +440,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque for ( sal_uInt16 nSub=0; nSubaAttrib[nSub].pName); if ( rProp.Name.equalsAsciiL(aStr.getStr(), aStr.getLength()) ) { @@ -457,7 +457,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque // ... but it was not convertible bRet = sal_False; #ifdef DBG_UTIL - rtl::OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); + OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); aDbgStr.append(rArg.pName); OSL_FAIL( aDbgStr.getStr() ); #endif @@ -488,7 +488,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque for ( sal_uInt16 n=0; n xFrame; @@ -512,7 +512,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque ++nFoundArgs; #endif const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[n]; - rtl::OUString aName = rProp.Name; + OUString aName = rProp.Name; if ( aName == sModel ) rSet.Put( SfxUnoAnyItem( SID_DOCUMENT, rProp.Value ) ); else if ( aName == sComponentData ) @@ -721,7 +721,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sStandardDir ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for StandardDir" ); if (bOK) @@ -729,7 +729,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sBlackList ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > xVal; + ::com::sun::star::uno::Sequence< OUString > xVal; sal_Bool bOK = (rProp.Value >>= xVal); DBG_ASSERT( bOK, "invalid type or value for BlackList" ); if (bOK) @@ -741,7 +741,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sFileName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for FileName" ); if (bOK) @@ -749,7 +749,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sSalvagedFile ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type or value for SalvagedFile" ); if (bOK) @@ -757,7 +757,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sFolderName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type or value for FolderName" ); if (bOK) @@ -765,7 +765,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sFrameName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type for FrameName" ); if (bOK && !sVal.isEmpty()) @@ -773,7 +773,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sMediaType ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for MediaType" ); if (bOK) @@ -781,7 +781,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sTemplateName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for TemplateName" ); if (bOK) @@ -789,7 +789,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sTemplateRegionName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for TemplateRegionName" ); if (bOK) @@ -797,7 +797,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sJumpMark ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for JumpMark" ); if (bOK) @@ -805,7 +805,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sCharacterSet ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for CharacterSet" ); if (bOK) @@ -813,7 +813,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sFilterFlags ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for FilterFlags" ); if (bOK) @@ -845,7 +845,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sDocumentTitle ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for DocumentTitle" ); if (bOK) @@ -853,7 +853,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sDocumentBaseURL ) { - ::rtl::OUString sVal; + OUString sVal; // the base url can be set to empty ( for embedded objects for example ) sal_Bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type or value for DocumentBaseURL" ); @@ -862,7 +862,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sHierarchicalDocumentName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for HierarchicalDocumentName" ); if (bOK) @@ -894,7 +894,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sSuggestedSaveAsDir ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for SuggestedSaveAsDir" ); if (bOK) @@ -902,7 +902,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sSuggestedSaveAsName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for SuggestedSaveAsName" ); if (bOK) @@ -910,7 +910,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if (aName == sDocumentService) { - rtl::OUString aVal; + OUString aVal; bool bOK = ((rProp.Value >>= aVal) && !aVal.isEmpty()); if (bOK) rSet.Put(SfxStringItem(SID_DOC_SERVICE, aVal)); @@ -935,7 +935,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque String sName( rProp.Name ); if ( sName == sPropName ) { - ::rtl::OUString sURL; + OUString sURL; if ( rProp.Value >>= sURL ) rSet.Put( SfxStringItem( SID_OPTIONS_PAGEURL, sURL ) ); break; @@ -947,7 +947,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque if ( nFoundArgs == nCount ) { // except for the "special" slots: assure that every argument was convertible - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("MacroPlayer: Some properties didn't match to any formal argument for slot: ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("MacroPlayer: Some properties didn't match to any formal argument for slot: ")); aStr.append(pSlot->pUnoName); DBG_WARNING( aStr.getStr() ); } @@ -996,7 +996,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta else { // we will not rely on the "toggle" ability of some property slots - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Processing property slot without argument: ")); aStr.append(static_cast(nSlotId)); OSL_FAIL(aStr.getStr()); @@ -1293,7 +1293,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta continue; } - rtl::OStringBuffer aDbg(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aDbg(RTL_CONSTASCII_STRINGPARAM( "Unknown item detected: ")); aDbg.append(static_cast(nId)); DBG_ASSERT(nArgnAttribs; if ( !nSubCount ) { - pValue[nActProp].Name = rtl::OUString::createFromAscii(pSlot->pUnoName) ; + pValue[nActProp].Name = OUString::createFromAscii(pSlot->pUnoName) ; if ( !pItem->QueryValue( pValue[nActProp].Value ) ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Item not convertable: ")); aStr.append(static_cast(nSlotId)); OSL_FAIL(aStr.getStr()); @@ -1340,13 +1340,13 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta nSubId |= CONVERT_TWIPS; DBG_ASSERT(( pType->aAttrib[n-1].nAID ) <= 127, "Member ID out of range" ); - String aName( rtl::OUString::createFromAscii( pSlot->pUnoName ) ) ; + String aName( OUString::createFromAscii( pSlot->pUnoName ) ) ; aName += '.'; - aName += rtl::OUString::createFromAscii( pType->aAttrib[n-1].pName ) ; + aName += OUString::createFromAscii( pType->aAttrib[n-1].pName ) ; pValue[nActProp].Name = aName; if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Sub item ")); aStr.append(static_cast( pType->aAttrib[n-1].nAID)); @@ -1374,10 +1374,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta sal_uInt16 nSubCount = rArg.pType->nAttribs; if ( !nSubCount ) { - pValue[nActProp].Name = rtl::OUString::createFromAscii( rArg.pName ) ; + pValue[nActProp].Name = OUString::createFromAscii( rArg.pName ) ; if ( !pItem->QueryValue( pValue[nActProp++].Value ) ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Item not convertable: ")); aStr.append(static_cast(rArg.nSlotId)); OSL_FAIL(aStr.getStr()); @@ -1393,13 +1393,13 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta nSubId |= CONVERT_TWIPS; DBG_ASSERT((rArg.pType->aAttrib[n-1].nAID) <= 127, "Member ID out of range" ); - String aName( rtl::OUString::createFromAscii( rArg.pName ) ) ; + String aName( OUString::createFromAscii( rArg.pName ) ) ; aName += '.'; - aName += rtl::OUString::createFromAscii( rArg.pType->aAttrib[n-1].pName ) ; + aName += OUString::createFromAscii( rArg.pType->aAttrib[n-1].pName ) ; pValue[nActProp].Name = aName; if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Sub item ")); aStr.append(static_cast( rArg.pType->aAttrib[n-1].nAID)); @@ -1419,67 +1419,67 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta const SfxPoolItem *pItem=0; if ( rSet.GetItemState( SID_COMPONENTDATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sComponentData); + pValue[nActProp].Name = OUString(sComponentData); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_COMPONENTCONTEXT, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sComponentContext); + pValue[nActProp].Name = OUString(sComponentContext); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_PROGRESS_STATUSBAR_CONTROL, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sStatusInd); + pValue[nActProp].Name = OUString(sStatusInd); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_INTERACTIONHANDLER, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sInteractionHdl); + pValue[nActProp].Name = OUString(sInteractionHdl); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_VIEW_DATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sViewData); + pValue[nActProp].Name = OUString(sViewData); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_FILTER_DATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sFilterData); + pValue[nActProp].Name = OUString(sFilterData); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_DOCUMENT, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sModel); + pValue[nActProp].Name = OUString(sModel); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_CONTENT, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sUCBContent); + pValue[nActProp].Name = OUString(sUCBContent); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_INPUTSTREAM, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sInputStream); + pValue[nActProp].Name = OUString(sInputStream); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_STREAM, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sStream); + pValue[nActProp].Name = OUString(sStream); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_OUTPUTSTREAM, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sOutputStream); + pValue[nActProp].Name = OUString(sOutputStream); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_POSTDATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sPostData); + pValue[nActProp].Name = OUString(sPostData); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_FILLFRAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sFrame); + pValue[nActProp].Name = OUString(sFrame); if ( pItem->ISA( SfxUsrAnyItem ) ) { OSL_FAIL( "TransformItems: transporting an XFrame via an SfxUsrAnyItem is not deprecated!" ); @@ -1492,202 +1492,202 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta } if ( rSet.GetItemState( SID_TEMPLATE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sAsTemplate); + pValue[nActProp].Name = OUString(sAsTemplate); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_OPEN_NEW_VIEW, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sOpenNewView); + pValue[nActProp].Name = OUString(sOpenNewView); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_FAIL_ON_WARNING, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sFailOnWarning)); + pValue[nActProp].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(sFailOnWarning)); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_VIEW_ID, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sViewId); + pValue[nActProp].Name = OUString(sViewId); pValue[nActProp++].Value <<= ( (sal_Int16) ((SfxUInt16Item*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_PLUGIN_MODE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sPluginMode); + pValue[nActProp].Name = OUString(sPluginMode); pValue[nActProp++].Value <<= ( (sal_Int16) ((SfxUInt16Item*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_DOC_READONLY, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sReadOnly); + pValue[nActProp].Name = OUString(sReadOnly); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_DDE_RECONNECT_ONLOAD, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sDdeReconnect); + pValue[nActProp].Name = OUString(sDdeReconnect); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_DOC_STARTPRESENTATION, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sStartPresentation); + pValue[nActProp].Name = OUString(sStartPresentation); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_SELECTION, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sSelectionOnly); + pValue[nActProp].Name = OUString(sSelectionOnly); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_HIDDEN, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sHidden); + pValue[nActProp].Name = OUString(sHidden); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_MINIMIZED, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sMinimized); + pValue[nActProp].Name = OUString(sMinimized); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_SILENT, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sSilent); + pValue[nActProp].Name = OUString(sSilent); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_PREVIEW, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sPreview); + pValue[nActProp].Name = OUString(sPreview); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_VIEWONLY, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sViewOnly); + pValue[nActProp].Name = OUString(sViewOnly); pValue[nActProp++].Value <<= (sal_Bool) (( ((SfxBoolItem*)pItem)->GetValue() )); } if ( rSet.GetItemState( SID_EDITDOC, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sDontEdit); + pValue[nActProp].Name = OUString(sDontEdit); pValue[nActProp++].Value <<= (sal_Bool) (!( ((SfxBoolItem*)pItem)->GetValue() )); } if ( rSet.GetItemState( SID_FILE_DIALOG, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sUseSystemDialog); + pValue[nActProp].Name = OUString(sUseSystemDialog); pValue[nActProp++].Value <<= (sal_Bool) ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_STANDARD_DIR, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sStandardDir); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sStandardDir); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_BLACK_LIST, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sBlackList); + pValue[nActProp].Name = OUString(sBlackList); - com::sun::star::uno::Sequence< rtl::OUString > aList; + com::sun::star::uno::Sequence< OUString > aList; ((SfxStringListItem*)pItem)->GetStringList( aList ); pValue[nActProp++].Value <<= aList ; } if ( rSet.GetItemState( SID_TARGETNAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sFrameName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sFrameName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_DOC_SALVAGE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sSalvagedFile); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sSalvagedFile); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_PATH, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sFolderName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sFolderName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_CONTENTTYPE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sMediaType); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sMediaType); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_TEMPLATE_NAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sTemplateName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sTemplateName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_TEMPLATE_REGIONNAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sTemplateRegionName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sTemplateRegionName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_JUMPMARK, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sJumpMark); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sJumpMark); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_CHARSET, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sCharacterSet); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sCharacterSet); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_MACROEXECMODE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sMacroExecMode); + pValue[nActProp].Name = OUString(sMacroExecMode); pValue[nActProp++].Value <<= ( (sal_Int16) ((SfxUInt16Item*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_UPDATEDOCMODE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sUpdateDocMode); + pValue[nActProp].Name = OUString(sUpdateDocMode); pValue[nActProp++].Value <<= ( (sal_Int16) ((SfxUInt16Item*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_REPAIRPACKAGE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sRepairPackage); + pValue[nActProp].Name = OUString(sRepairPackage); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_DOCINFO_TITLE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sDocumentTitle); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sDocumentTitle); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_DOC_BASEURL, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sDocumentBaseURL); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sDocumentBaseURL); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_DOC_HIERARCHICALNAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sHierarchicalDocumentName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sHierarchicalDocumentName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_COPY_STREAM_IF_POSSIBLE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sCopyStreamIfPossible); + pValue[nActProp].Name = OUString(sCopyStreamIfPossible); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_NOAUTOSAVE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sNoAutoSave); + pValue[nActProp].Name = OUString(sNoAutoSave); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_MODIFYPASSWORDINFO, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sModifyPasswordInfo); + pValue[nActProp].Name = OUString(sModifyPasswordInfo); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_ENCRYPTIONDATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sEncryptionData); + pValue[nActProp].Name = OUString(sEncryptionData); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_SUGGESTEDSAVEASDIR, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sSuggestedSaveAsDir); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sSuggestedSaveAsDir); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_SUGGESTEDSAVEASNAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sSuggestedSaveAsName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sSuggestedSaveAsName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_DOC_SERVICE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sDocumentService); - pValue[nActProp++].Value <<= rtl::OUString(static_cast(pItem)->GetValue()); + pValue[nActProp].Name = OUString(sDocumentService); + pValue[nActProp++].Value <<= OUString(static_cast(pItem)->GetValue()); } } } @@ -1733,7 +1733,7 @@ SfxObjectShell* SfxMacroLoader::GetObjectShell_Impl() // ----------------------------------------------------------------------- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SfxMacroLoader::queryDispatch( const ::com::sun::star::util::URL& aURL , - const ::rtl::OUString& /*sTargetFrameName*/, + const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( ::com::sun::star::uno::RuntimeException ) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatcher; @@ -1822,7 +1822,7 @@ void SAL_CALL SfxMacroLoader::removeStatusListener( { } -ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star::uno::Any& rRetval, SfxObjectShell* pSh ) +ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::Any& rRetval, SfxObjectShell* pSh ) throw ( ::com::sun::star::uno::RuntimeException ) { #ifdef DISABLE_SCRIPTING @@ -1960,7 +1960,7 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star:: else { // direct API call on a specified object - rtl::OUStringBuffer aCall; + OUStringBuffer aCall; aCall.append('[').append(INetURLObject::decode(aMacro.Copy(6), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET)); aCall.append(']'); @@ -1988,7 +1988,7 @@ void SAL_CALL SfxAppDispatchProvider::initialize( const ::com::sun::star::uno::S Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch( const ::com::sun::star::util::URL& aURL, - const ::rtl::OUString& /*sTargetFrameName*/, + const OUString& /*sTargetFrameName*/, FrameSearchFlags /*eSearchFlags*/ ) throw( RuntimeException ) { sal_uInt16 nId( 0 ); @@ -2080,7 +2080,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( pAppSlotPool ) { const sal_uIntPtr nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG ); - rtl::OUString aCmdPrefix( ".uno:" ); + OUString aCmdPrefix( ".uno:" ); // Gruppe anw"ahlen ( Gruppe 0 ist intern ) for ( sal_uInt16 i=0; iGetGroupCount(); i++ ) @@ -2097,7 +2097,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( pSfxSlot->GetMode() & nMode ) { ::com::sun::star::frame::DispatchInformation aCmdInfo; - ::rtl::OUStringBuffer aBuf( aCmdPrefix ); + OUStringBuffer aBuf( aCmdPrefix ); aBuf.appendAscii( pSfxSlot->GetUnoName() ); aCmdInfo.Command = aBuf.makeStringAndClear(); aCmdInfo.GroupId = nCommandGroup; @@ -2231,7 +2231,7 @@ SFX2_DLLPUBLIC void* SAL_CALL sfx_component_getFactory( IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::IFrameObject ) IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::OwnSubFilterService ) if ( ::comp_SfxDocumentMetaData::_getImplementationName().equals( - ::rtl::OUString::createFromAscii( pImplementationName ) ) ) + OUString::createFromAscii( pImplementationName ) ) ) { xFactory = ::cppu::createSingleComponentFactory( ::comp_SfxDocumentMetaData::_create, @@ -2239,7 +2239,7 @@ SFX2_DLLPUBLIC void* SAL_CALL sfx_component_getFactory( ::comp_SfxDocumentMetaData::_getSupportedServiceNames()); } if ( ::comp_CompatWriterDocProps::_getImplementationName().equals( - ::rtl::OUString::createFromAscii( pImplementationName ) ) ) + OUString::createFromAscii( pImplementationName ) ) ) { xFactory = ::cppu::createSingleComponentFactory( ::comp_CompatWriterDocProps::_create, @@ -2282,7 +2282,7 @@ void SAL_CALL FilterOptionsContinuation::setFilterOptions( RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > rModel, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties ) { - ::rtl::OUString temp; + OUString temp; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2; ::com::sun::star::document::FilterOptionsRequest aOptionsRequest( temp, temp2, @@ -2321,16 +2321,16 @@ class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< ::com::sun comphelper::OInteractionDisapprove* m_pDisapprove; public: - RequestPackageReparation_Impl( ::rtl::OUString aName ); + RequestPackageReparation_Impl( OUString aName ); sal_Bool isApproved(); virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); }; -RequestPackageReparation_Impl::RequestPackageReparation_Impl( ::rtl::OUString aName ) +RequestPackageReparation_Impl::RequestPackageReparation_Impl( OUString aName ) { - ::rtl::OUString temp; + OUString temp; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2; ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp, temp2, @@ -2361,7 +2361,7 @@ sal_Bool RequestPackageReparation_Impl::isApproved() return m_lContinuations; } -RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName ) +RequestPackageReparation::RequestPackageReparation( OUString aName ) { pImp = new RequestPackageReparation_Impl( aName ); pImp->acquire(); @@ -2390,15 +2390,15 @@ class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< ::com::sun::sta comphelper::OInteractionAbort* m_pAbort; public: - NotifyBrokenPackage_Impl( ::rtl::OUString aName ); + NotifyBrokenPackage_Impl( OUString aName ); virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); }; -NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( ::rtl::OUString aName ) +NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( OUString aName ) { - ::rtl::OUString temp; + OUString temp; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2; ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp, temp2, @@ -2422,7 +2422,7 @@ NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( ::rtl::OUString aName ) return m_lContinuations; } -NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName ) +NotifyBrokenPackage::NotifyBrokenPackage( OUString aName ) { pImp = new NotifyBrokenPackage_Impl( aName ); pImp->acquire(); diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 0df98290416b..9740cad2b9ba 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -278,7 +278,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) { sal_uInt16 nID = GetType(); - rtl::OUStringBuffer aWinData; + OUStringBuffer aWinData; aWinData.append('V').append(static_cast(nVersion)). append(',').append(rInfo.bVisible ? 'V' : 'H').append(','). append(static_cast(rInfo.nFlags)); @@ -289,10 +289,10 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) } SvtViewOptions aWinOpt( E_WINDOW, OUString::number( nID ) ); - aWinOpt.SetWindowState(rtl::OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8)); + aWinOpt.SetWindowState(OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8)); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString("Data"); + aSeq[0].Name = OUString("Data"); aSeq[0].Value <<= aWinData.makeStringAndClear(); aWinOpt.SetUserData( aSeq ); @@ -357,12 +357,12 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt.GetUserData(); - ::rtl::OUString aTmp; + OUString aTmp; if ( aSeq.getLength() ) aSeq[0].Value >>= aTmp; String aWinData( aTmp ); - rInfo.aWinState = rtl::OUStringToOString(aWinOpt.GetWindowState(), RTL_TEXTENCODING_UTF8); + rInfo.aWinState = OUStringToOString(aWinOpt.GetWindowState(), RTL_TEXTENCODING_UTF8); if ( aWinData.Len() ) diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index da4412e42421..3fc73f07be01 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -99,7 +99,7 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, // The media in the application must be opened to lookup the // relative file links!! This is done through the link manager // of the Storage. - rData <<= rtl::OUString( sFileNm ); + rData <<= OUString( sFileNm ); } break; @@ -197,7 +197,7 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, break; case FILETYPE_OBJECT: // TODO/LATER: possibility to insert a new object - rData <<= rtl::OUString( sFileNm ); + rData <<= OUString( sFileNm ); break; } return sal_True/*0 != aTypeList.Count()*/; @@ -381,15 +381,15 @@ String impl_getFilter( const String& _rURL ) { css::uno::Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString("com.sun.star.document.TypeDetection") ), + OUString("com.sun.star.document.TypeDetection") ), css::uno::UNO_QUERY ); if ( xTypeDetection.is() ) { ::comphelper::MediaDescriptor aDescr; - aDescr[ ::comphelper::MediaDescriptor::PROP_URL() ] <<= ::rtl::OUString( _rURL ); + aDescr[ ::comphelper::MediaDescriptor::PROP_URL() ] <<= OUString( _rURL ); css::uno::Sequence< css::beans::PropertyValue > aDescrList = aDescr.getAsConstPropertyValueList(); - ::rtl::OUString sType = xTypeDetection->queryTypeByDescriptor( aDescrList, sal_True ); + OUString sType = xTypeDetection->queryTypeByDescriptor( aDescrList, sal_True ); if ( !sType.isEmpty() ) { css::uno::Reference< css::container::XNameAccess > xTypeCont( xTypeDetection, @@ -398,7 +398,7 @@ String impl_getFilter( const String& _rURL ) { ::comphelper::SequenceAsHashMap lTypeProps( xTypeCont->getByName( sType ) ); sFilter = lTypeProps.getUnpackedValueOrDefault( - ::rtl::OUString("PreferredFilter"), ::rtl::OUString() ); + OUString("PreferredFilter"), OUString() ); } } } @@ -606,7 +606,7 @@ void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState ) if( !bStateChangeCalled && HasDataLinks() ) { css::uno::Any aAny; - aAny <<= rtl::OUString::valueOf( (sal_Int32)nState ); + aAny <<= OUString::valueOf( (sal_Int32)nState ); DataChanged( SotExchange::GetFormatName( sfx2::LinkManager::RegisterStatusInfoId()), aAny ); bStateChangeCalled = sal_True; diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx index 3d9cbe8ee5fd..3073e896d366 100644 --- a/sfx2/source/appl/helpdispatch.cxx +++ b/sfx2/source/appl/helpdispatch.cxx @@ -66,7 +66,7 @@ void SAL_CALL HelpDispatch_Impl::dispatch( { if ( 0 == ( *pBegin ).Name.compareToAscii( "HelpKeyword" ) ) { - rtl::OUString sHelpKeyword; + OUString sHelpKeyword; if ( ( ( *pBegin ).Value >>= sHelpKeyword ) && !sHelpKeyword.isEmpty() ) { sKeyword = String( sHelpKeyword ); diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index cac32bf9f5c7..3be6436e5466 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -134,7 +134,7 @@ sal_Bool HelpInterceptor_Impl::HasHistorySucc() const Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( - const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) + const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw( RuntimeException ) @@ -218,12 +218,12 @@ void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference< // ----------------------------------------------------------------------- // XInterceptorInfo -Sequence< ::rtl::OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() +Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aURLList( 1 ); + Sequence< OUString > aURLList( 1 ); aURLList[0] = "vnd.sun.star.help://*"; return aURLList; } diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 1bf5c3ae6ea9..8d8a0ff46fa7 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -87,7 +87,7 @@ public: // XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL - queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); + queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException); @@ -100,7 +100,7 @@ public: virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMaster ) throw(::com::sun::star::uno::RuntimeException); // XInterceptorInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getInterceptedURLs( ) throw(::com::sun::star::uno::RuntimeException); // XDispatch diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index 8f0447bf4689..67e440650f31 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -50,15 +50,15 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::ui; -typedef boost::unordered_map< ::rtl::OUString, +typedef boost::unordered_map< OUString, WeakReference< XImageManager >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr; + OUStringHash, + ::std::equal_to< OUString > > ModuleIdToImagegMgr; Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& aURL, + const OUString& aURL, bool bBig ) { @@ -76,7 +76,7 @@ Image SAL_CALL GetImage( if ( xController.is() ) xModel = xController->getModel(); - rtl::OUString aCommandURL( aURL ); + OUString aCommandURL( aURL ); if ( nProtocol == INET_PROT_SLOT ) { sal_uInt16 nId = ( sal_uInt16 ) String(aURL).Copy(5).ToInt32(); @@ -98,11 +98,11 @@ Image SAL_CALL GetImage( if ( pSlot ) { - aCommandURL = rtl::OUString( ".uno:" ); - aCommandURL += rtl::OUString::createFromAscii( pSlot->GetUnoName() ); + aCommandURL = OUString( ".uno:" ); + aCommandURL += OUString::createFromAscii( pSlot->GetUnoName() ); } else - aCommandURL = rtl::OUString(); + aCommandURL = OUString(); } Reference< XImageManager > xDocImgMgr; @@ -124,7 +124,7 @@ Image SAL_CALL GetImage( if ( xDocImgMgr.is() ) { Sequence< Reference< ::com::sun::star::graphic::XGraphic > > aGraphicSeq; - Sequence< rtl::OUString > aImageCmdSeq( 1 ); + Sequence< OUString > aImageCmdSeq( 1 ); aImageCmdSeq[0] = aCommandURL; try @@ -156,7 +156,7 @@ Image SAL_CALL GetImage( if ( !aCommandURL.isEmpty() ) { Reference< XImageManager > xModuleImageManager; - rtl::OUString aModuleId = xModuleManager->identify( rFrame ); + OUString aModuleId = xModuleManager->identify( rFrame ); static ModuleIdToImagegMgr m_aModuleIdToImageMgrMap; @@ -183,7 +183,7 @@ Image SAL_CALL GetImage( } Sequence< Reference< ::com::sun::star::graphic::XGraphic > > aGraphicSeq; - Sequence< rtl::OUString > aImageCmdSeq( 1 ); + Sequence< OUString > aImageCmdSeq( 1 ); aImageCmdSeq[0] = aCommandURL; aGraphicSeq = xModuleImageManager->getImages( nImageType, aImageCmdSeq ); diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index cd645b7da1b4..5644f7803edb 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -95,7 +95,7 @@ void ImeStatusWindow::init() { sal_Bool bShow = sal_Bool(); if (getConfig()->getPropertyValue( - rtl::OUString( + OUString( "ShowStatusWindow")) >>= bShow) Application::ShowImeStatusWindow(bShow); @@ -114,7 +114,7 @@ bool ImeStatusWindow::isShowing() { sal_Bool bShow = sal_Bool(); if (getConfig()->getPropertyValue( - rtl::OUString("ShowStatusWindow")) + OUString("ShowStatusWindow")) >>= bShow) return bShow; } @@ -133,7 +133,7 @@ void ImeStatusWindow::show(bool bShow) { css::uno::Reference< css::beans::XPropertySet > xConfig(getConfig()); xConfig->setPropertyValue( - rtl::OUString("ShowStatusWindow"), + OUString("ShowStatusWindow"), css::uno::makeAny(static_cast< sal_Bool >(bShow))); css::uno::Reference< css::util::XChangesBatch > xCommit( xConfig, css::uno::UNO_QUERY); @@ -162,7 +162,7 @@ ImeStatusWindow::~ImeStatusWindow() try { m_xConfig->removePropertyChangeListener( - rtl::OUString("ShowStatusWindow"), + OUString("ShowStatusWindow"), m_xConfigListener); } catch (css::uno::Exception &) @@ -201,15 +201,15 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() throw css::lang::DisposedException(); if (!m_xContext.is()) throw css::uno::RuntimeException( - rtl::OUString( + OUString( "null comphelper::getProcessServiceFactory"), 0); css::uno::Reference< css::lang::XMultiServiceFactory > xProvider = css::configuration::theDefaultProvider::get( m_xContext ); css::beans::PropertyValue aArg( - rtl::OUString("nodepath"), -1, + OUString("nodepath"), -1, css::uno::makeAny( - rtl::OUString( + OUString( "/org.openoffice.Office.Common/I18N/InputMethod")), css::beans::PropertyState_DIRECT_VALUE); css::uno::Sequence< css::uno::Any > aArgs(1); @@ -217,13 +217,13 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() m_xConfig = css::uno::Reference< css::beans::XPropertySet >( xProvider->createInstanceWithArguments( - rtl::OUString( + OUString( "com.sun.star.configuration.ConfigurationUpdateAccess"), aArgs), css::uno::UNO_QUERY); if (!m_xConfig.is()) throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." "ConfigurationUpdateAccess")), 0); @@ -238,7 +238,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() // no dispose notifications): m_xConfigListener = new WeakPropertyChangeListener(this); xConfig->addPropertyChangeListener( - rtl::OUString("ShowStatusWindow"), + OUString("ShowStatusWindow"), m_xConfigListener); } return xConfig; diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 686ca3c28092..dfa3948862ae 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -186,7 +186,7 @@ sal_Bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/, pRequest->Execute(); } - ::rtl::OUString aEmptyStr; + OUString aEmptyStr; rData <<= aEmptyStr; } return 0 == pConnection->GetError(); @@ -230,7 +230,7 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink ) { sal_Bool bSysTopic; { - DdeConnection aTmp(sServer, rtl::OUString("SYSTEM")); + DdeConnection aTmp(sServer, OUString("SYSTEM")); bSysTopic = !aTmp.GetError(); } @@ -247,9 +247,9 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink ) // Server not up, try once more to start it. if( !bInWinExec ) { - rtl::OStringBuffer aCmdLine(rtl::OUStringToOString(sServer, RTL_TEXTENCODING_ASCII_US)); + OStringBuffer aCmdLine(OUStringToOString(sServer, RTL_TEXTENCODING_ASCII_US)); aCmdLine.append(RTL_CONSTASCII_STRINGPARAM(".exe ")); - aCmdLine.append(rtl::OUStringToOString(sTopic, RTL_TEXTENCODING_ASCII_US)); + aCmdLine.append(OUStringToOString(sTopic, RTL_TEXTENCODING_ASCII_US)); if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 ) nError = DDELINK_ERROR_APP; diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 182bed8cdf1b..d5e6451f77d2 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -49,8 +49,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Reference; using ::com::sun::star::lang::XComponent; using ::com::sun::star::util::XCloseable; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace sfx2 { @@ -285,8 +283,8 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink, } bool LinkManager::GetDisplayNames( - const SvBaseLink* pLink, rtl::OUString* pType, rtl::OUString* pFile, - rtl::OUString* pLinkStr, rtl::OUString* pFilter) const + const SvBaseLink* pLink, OUString* pType, OUString* pFile, + OUString* pLinkStr, OUString* pFilter) const { String aType, aFile, aLinkStr, aFilter; bool bRet = GetDisplayNames(pLink, &aType, &aFile, &aLinkStr, &aFilter); @@ -436,7 +434,7 @@ void LinkManager::ReconnectDdeLink(SfxObjectShell& rServer) // DDE connections between OOo apps are always named 'soffice'. continue; - rtl::OUString aTmp; + OUString aTmp; OUString aURL = aFile; if (utl::LocalFileHelper::ConvertPhysicalNameToURL(aFile, aTmp)) aURL = aTmp; @@ -486,13 +484,13 @@ bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink, } bool LinkManager::InsertFileLink( - sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const rtl::OUString& rFileNm, - const rtl::OUString* pFilterNm, const rtl::OUString* pRange) + sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const OUString& rFileNm, + const OUString* pFilterNm, const OUString* pRange) { if (!(OBJECT_CLIENT_SO & rLink.GetObjType())) return false; - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rFileNm); aBuf.append(sfx2::cTokenSeperator); @@ -535,7 +533,7 @@ sal_uIntPtr LinkManager::RegisterStatusInfoId() if( !nFormat ) { nFormat = SotExchange::RegisterFormatName( - rtl::OUString("StatusInfo from SvxInternalLink")); + OUString("StatusInfo from SvxInternalLink")); } return nFormat; } @@ -689,7 +687,7 @@ sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) SfxStringItem aName( SID_FILE_NAME, sTopic ); SfxBoolItem aMinimized(SID_MINIMIZED, sal_True); SfxBoolItem aHidden(SID_HIDDEN, sal_True); - SfxStringItem aTarget( SID_TARGETNAME, rtl::OUString("_blank") ); + SfxStringItem aTarget( SID_TARGETNAME, OUString("_blank") ); SfxStringItem aReferer( SID_REFERER, sReferer ); SfxUInt16Item aUpdate( SID_UPDATEDOCMODE, nUpdateMode ); SfxBoolItem aReadOnly(SID_DOC_READONLY, false); diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index f649c603f354..c3c2f39155e4 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -581,7 +581,7 @@ void ImplDdeItem::AdviseLoop( sal_Bool bOpen ) // A connection is re-established if( OBJECT_DDE_EXTERN == pLink->GetObjType() ) { - pLink->GetObj()->AddDataAdvise( pLink, rtl::OUString("text/plain;charset=utf-16"), ADVISEMODE_NODATA ); + pLink->GetObj()->AddDataAdvise( pLink, OUString("text/plain;charset=utf-16"), ADVISEMODE_NODATA ); pLink->GetObj()->AddConnectAdvise( pLink ); } } @@ -603,7 +603,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) String sNm( rLinkName ); sal_Int32 nTokenPos = 0; - rtl::OUString sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); + OUString sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); DdeServices& rSvc = DdeService::GetServices(); for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI) @@ -612,7 +612,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) if( pService->GetName() == sService ) { // then we search for the Topic - rtl::OUString sTopic( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); + OUString sTopic( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); if( pItemStt ) *pItemStt = nTokenPos; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 052c7063a44d..b75168c91ca9 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -374,7 +374,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) { pEntry = InsertEntry( aTitle, aDocumentImage, aDocumentImage, pParent ); Any aAny( ::utl::UCBContentHelper::GetProperty( aURL, String("TargetURL" ) ) ); - rtl::OUString aTargetURL; + OUString aTargetURL; if ( aAny >>= aTargetURL ) pEntry->SetUserData( new ContentEntry_Impl( aTargetURL, sal_False ) ); } @@ -570,7 +570,7 @@ namespace sfx2 { struct equalOUString { - bool operator()( const ::rtl::OUString& rKey1, const ::rtl::OUString& rKey2 ) const + bool operator()( const OUString& rKey1, const OUString& rKey2 ) const { return !!( rKey1 == rKey2 ); } @@ -579,20 +579,20 @@ namespace sfx2 { struct hashOUString { - size_t operator()( const ::rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } }; - typedef ::boost::unordered_map< ::rtl::OUString, int, hashOUString, equalOUString > KeywordInfo; + typedef ::boost::unordered_map< OUString, int, hashOUString, equalOUString > KeywordInfo; } #define UNIFY_AND_INSERT_TOKEN( aToken ) \ it = \ aInfo.insert( sfx2::KeywordInfo::value_type( aToken, 0 ) ).first; \ if ( ( tmp = it->second++ ) != 0 ) \ - nPos = aIndexCB.InsertEntry( aToken + rtl::OUString( append, tmp ) ); \ + nPos = aIndexCB.InsertEntry( aToken + OUString( append, tmp ) ); \ else \ nPos = aIndexCB.InsertEntry( aToken ) @@ -629,7 +629,7 @@ void IndexTabPage_Impl::InitializeIndex() ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties(); if ( xInfo->hasPropertyByName( PROPERTY_ANCHORREF ) ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aPropSeq( 4 ); + ::com::sun::star::uno::Sequence< OUString > aPropSeq( 4 ); aPropSeq[0] = PROPERTY_KEYWORDLIST; aPropSeq[1] = PROPERTY_KEYWORDREF; aPropSeq[2] = PROPERTY_ANCHORREF; @@ -639,10 +639,10 @@ void IndexTabPage_Impl::InitializeIndex() ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aAnySeq = aCnt.getPropertyValues( aPropSeq ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aKeywordList; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > aKeywordRefList; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > aAnchorRefList; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > aTitleRefList; + ::com::sun::star::uno::Sequence< OUString > aKeywordList; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > aKeywordRefList; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > aAnchorRefList; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > aTitleRefList; if ( ( aAnySeq[0] >>= aKeywordList ) && ( aAnySeq[1] >>= aKeywordRefList ) && ( aAnySeq[2] >>= aAnchorRefList ) && ( aAnySeq[3] >>= aTitleRefList ) ) @@ -650,18 +650,18 @@ void IndexTabPage_Impl::InitializeIndex() sal_Bool insert; sal_uInt16 nPos; int ndx,tmp; - ::rtl::OUString aIndex, aTempString; - ::rtl::OUStringBuffer aData( 128 ); // Capacity of up to 128 characters + OUString aIndex, aTempString; + OUStringBuffer aData( 128 ); // Capacity of up to 128 characters sfx2::KeywordInfo::iterator it; for ( int i = 0; i < aKeywordList.getLength(); ++i ) { // abi: Do not copy, but use references - const ::rtl::OUString& aKeywordPair = aKeywordList[i]; + const OUString& aKeywordPair = aKeywordList[i]; DBG_ASSERT( !aKeywordPair.isEmpty(), "invalid help index" ); - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRefList = aKeywordRefList[i]; - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAnchorList = aAnchorRefList[i]; - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aTitleList = aTitleRefList[i]; + const ::com::sun::star::uno::Sequence< OUString >& aRefList = aKeywordRefList[i]; + const ::com::sun::star::uno::Sequence< OUString >& aAnchorList = aAnchorRefList[i]; + const ::com::sun::star::uno::Sequence< OUString >& aTitleList = aTitleRefList[i]; DBG_ASSERT( aRefList.getLength() == aAnchorList.getLength(),"reference list and title list of different length" ); @@ -677,7 +677,7 @@ void IndexTabPage_Impl::InitializeIndex() } } else - aIndex = ::rtl::OUString(); + aIndex = OUString(); // Assume the token is trimed UNIFY_AND_INSERT_TOKEN( aKeywordPair ); @@ -976,7 +976,7 @@ SearchTabPage_Impl::SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl { String aUserData; Any aUserItem = aViewOpt.GetUserItem( USERITEM_NAME ); - ::rtl::OUString aTemp; + OUString aTemp; if ( aUserItem >>= aTemp ) { aUserData = String( aTemp ); @@ -1012,7 +1012,7 @@ SearchTabPage_Impl::~SearchTabPage_Impl() for ( sal_uInt16 i = 0; i < nCount; ++i ) { - rtl::OUString aText = aSearchED.GetEntry(i); + OUString aText = aSearchED.GetEntry(i); aUserData += String(INetURLObject::encode( aText, INetURLObject::PART_UNO_PARAM_VALUE, '%', INetURLObject::ENCODE_ALL )); @@ -1020,7 +1020,7 @@ SearchTabPage_Impl::~SearchTabPage_Impl() } aUserData = comphelper::string::stripEnd(aUserData, ';'); - Any aUserItem = makeAny( ::rtl::OUString( aUserData ) ); + Any aUserItem = makeAny( OUString( aUserData ) ); aViewOpt.SetUserItem( USERITEM_NAME, aUserItem ); } @@ -1217,8 +1217,8 @@ sal_Bool SearchTabPage_Impl::OpenKeyword( const String& rKeyword ) void GetBookmarkEntry_Impl ( Sequence< PropertyValue >& aBookmarkEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL + OUString& rTitle, + OUString& rURL ) { for ( int i = 0; i < aBookmarkEntry.getLength(); i++ ) @@ -1247,13 +1247,13 @@ BookmarksBox_Impl::~BookmarksBox_Impl() // save bookmarks to configuration SvtHistoryOptions aHistOpt; aHistOpt.Clear( eHELPBOOKMARKS ); - rtl::OUString sEmpty; + OUString sEmpty; sal_uInt16 nCount = GetEntryCount(); for ( sal_uInt16 i = 0; i < nCount; ++i ) { String aTitle = GetEntry(i); String* pURL = (String*)(sal_uIntPtr)GetEntryData(i); - aHistOpt.AppendItem( eHELPBOOKMARKS, rtl::OUString( *pURL ), sEmpty, rtl::OUString( aTitle ), sEmpty ); + aHistOpt.AppendItem( eHELPBOOKMARKS, OUString( *pURL ), sEmpty, OUString( aTitle ), sEmpty ); delete pURL; } } @@ -1279,7 +1279,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) { String* pURL = (String*)(sal_uIntPtr)GetEntryData( nPos ); RemoveEntry( nPos ); - rtl::OUString aImageURL = IMAGE_URL; + OUString aImageURL = IMAGE_URL; aImageURL += INetURLObject( *pURL ).GetHost(); nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL, false ) ); SetEntryData( nPos, (void*)(sal_uIntPtr)( new String( *pURL ) ) ); @@ -1366,8 +1366,8 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindo Sequence< Sequence< PropertyValue > > aBookmarkSeq; aBookmarkSeq = SvtHistoryOptions().GetList( eHELPBOOKMARKS ); - ::rtl::OUString aTitle; - ::rtl::OUString aURL; + OUString aTitle; + OUString aURL; sal_uInt32 i, nCount = aBookmarkSeq.getLength(); for ( i = 0; i < nCount; ++i ) @@ -1452,18 +1452,18 @@ String BookmarksTabPage_Impl::GetSelectEntry() const void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rURL ) { - rtl::OUString aImageURL = IMAGE_URL; + OUString aImageURL = IMAGE_URL; aImageURL += INetURLObject( rURL ).GetHost(); sal_uInt16 nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL, false ) ); aBookmarksBox.SetEntryData( nPos, (void*)(sal_uIntPtr)( new String( rURL ) ) ); } -::rtl::OUString SfxHelpWindow_Impl::buildHelpURL(const ::rtl::OUString& sFactory , - const ::rtl::OUString& sContent , - const ::rtl::OUString& sAnchor , +OUString SfxHelpWindow_Impl::buildHelpURL(const OUString& sFactory , + const OUString& sContent , + const OUString& sAnchor , sal_Bool bUseQuestionMark) { - ::rtl::OUStringBuffer sHelpURL(256); + OUStringBuffer sHelpURL(256); sHelpURL.append(HELP_URL); sHelpURL.append(sFactory); sHelpURL.append(sContent); @@ -1473,7 +1473,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rU return sHelpURL.makeStringAndClear(); } -void SfxHelpWindow_Impl::loadHelpContent(const ::rtl::OUString& sHelpURL, sal_Bool bAddToHistory) +void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, sal_Bool bAddToHistory) { Reference< XComponentLoader > xLoader(getTextFrame(), UNO_QUERY); if (!xLoader.is()) @@ -2006,7 +2006,7 @@ long TextWin_Impl::Notify( NotifyEvent& rNEvt ) // remove docking area acceptor from layoutmanager, so it will not layout anything further .-) static void lcl_disableLayoutOfFrame(const Reference< XFrame >& xFrame) { - static const ::rtl::OUString PROP_LAYOUT_MANAGER("LayoutManager"); + static const OUString PROP_LAYOUT_MANAGER("LayoutManager"); Reference< XPropertySet > xPropSet(xFrame, UNO_QUERY_THROW); xPropSet->setPropertyValue(PROP_LAYOUT_MANAGER, makeAny(Reference< XLayoutManager >())); @@ -2160,9 +2160,9 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XInterface > xConfig; - ::rtl::OUString sPath( PATH_OFFICE_FACTORIES ); + OUString sPath( PATH_OFFICE_FACTORIES ); sPath += sCurrentFactory; - ::rtl::OUString sKey( KEY_HELP_ON_OPEN ); + OUString sKey( KEY_HELP_ON_OPEN ); // Attention: This check boy knows two states: // 1) Reading of the config key fails with an exception or by getting an empty Any (!) => check box must be hidden @@ -2195,7 +2195,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) if ( xConfiguration.is() ) { - ::rtl::OUString sTemp; + OUString sTemp; sKey = KEY_UI_NAME; try { @@ -2213,7 +2213,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) { // set module name in checkbox text String sText( aOnStartupText ); - sText.SearchAndReplace( rtl::OUString("%MODULENAME"), sModuleName ); + sText.SearchAndReplace( OUString("%MODULENAME"), sModuleName ); aOnStartupCB.SetText( sText ); // and show it aOnStartupCB.Show(); @@ -2479,7 +2479,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox ) if ( xConfiguration.is() ) { sal_Bool bChecked = pBox->IsChecked(); - ::rtl::OUString sPath( PATH_OFFICE_FACTORIES ); + OUString sPath( PATH_OFFICE_FACTORIES ); sPath += sCurrentFactory; try { @@ -2575,7 +2575,7 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aURL.Complete = ".uno:SelectTextMode"; PARSE_URL( aURL ); Reference < XDispatch > xDisp = xProv.is() ? - xProv->queryDispatch( aURL, rtl::OUString(), 0 ) : Reference < XDispatch >(); + xProv->queryDispatch( aURL, OUString(), 0 ) : Reference < XDispatch >(); if(xDisp.is()) { HelpStatusListener_Impl* pStateListener; @@ -2720,7 +2720,7 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const { Reference < XText > xText = xRange->getText(); Reference < XPropertySet > xProps( xText->createTextCursorByRange( xRange ), UNO_QUERY ); - ::rtl::OUString sStyleName; + OUString sStyleName; if ( xProps->getPropertyValue( "PageStyleName" ) >>= sStyleName ) { Reference < XStyleFamiliesSupplier > xStyles( xController->getModel(), UNO_QUERY ); @@ -2936,7 +2936,7 @@ void SfxHelpWindow_Impl::LoadConfig() bIndex = aViewOpt.IsVisible(); String aUserData; Any aUserItem = aViewOpt.GetUserItem( USERITEM_NAME ); - rtl::OUString aTemp; + OUString aTemp; if ( aUserItem >>= aTemp ) { aUserData = String( aTemp ); @@ -2994,16 +2994,16 @@ void SfxHelpWindow_Impl::SaveConfig() aUserData += ';'; aUserData += OUString::number( aWinPos.Y() ); - aViewOpt.SetUserItem( USERITEM_NAME, makeAny( rtl::OUString( aUserData ) ) ); + aViewOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aUserData ) ) ); } // ----------------------------------------------------------------------- void SfxHelpWindow_Impl::ShowStartPage() { - ::rtl::OUString sHelpURL = SfxHelpWindow_Impl::buildHelpURL(pIndexWin->GetFactory(), + OUString sHelpURL = SfxHelpWindow_Impl::buildHelpURL(pIndexWin->GetFactory(), "/start", - ::rtl::OUString(), + OUString(), sal_True); loadHelpContent(sHelpURL); } @@ -3031,16 +3031,16 @@ IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl) if ( aEntry.Len() < 1 ) return 0; - ::rtl::OUString sHelpURL; + OUString sHelpURL; - bool bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString("vnd.sun.star.help"),0); + bool bComplete = OUString(aEntry).toAsciiLowerCase().match(OUString("vnd.sun.star.help"),0); if (bComplete) - sHelpURL = ::rtl::OUString(aEntry); + sHelpURL = OUString(aEntry); else { String aId; - String aAnchor = rtl::OUString('#'); + String aAnchor = OUString('#'); if ( comphelper::string::getTokenCount(aEntry, '#') == 2 ) { aId = aEntry.GetToken( 0, '#' ); @@ -3093,7 +3093,7 @@ IMPL_LINK( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl*, pListener ) // ----------------------------------------------------------------------- -void SfxHelpWindow_Impl::openDone(const ::rtl::OUString& sURL , +void SfxHelpWindow_Impl::openDone(const OUString& sURL , sal_Bool bSuccess) { INetURLObject aObj( sURL ); @@ -3327,7 +3327,7 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) if ( xInfo->hasPropertyByName( PROPERTY_TITLE ) ) { ::com::sun::star::uno::Any aAny = aCnt.getPropertyValue( PROPERTY_TITLE ); - rtl::OUString aValue; + OUString aValue; if ( aAny >>= aValue ) { String aTitle( aValue ); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index a43477762a67..a3ed34e3ccb9 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -440,7 +440,7 @@ private: String aIndexOffText; String aSearchText; String aOnStartupText; - ::rtl::OUString sCurrentFactory; + OUString sCurrentFactory; SfxHelpWindow_Impl* pHelpWin; Window* pTextWin; @@ -568,15 +568,15 @@ public: sal_Bool HasHistoryPredecessor() const; // forward to interceptor sal_Bool HasHistorySuccessor() const; // forward to interceptor - void openDone(const ::rtl::OUString& sURL , + void openDone(const OUString& sURL , sal_Bool bSuccess); - static ::rtl::OUString buildHelpURL(const ::rtl::OUString& sFactory , - const ::rtl::OUString& sContent , - const ::rtl::OUString& sAnchor , + static OUString buildHelpURL(const OUString& sFactory , + const OUString& sContent , + const OUString& sAnchor , sal_Bool bUseQuestionMark); - void loadHelpContent(const ::rtl::OUString& sHelpURL , + void loadHelpContent(const OUString& sHelpURL , sal_Bool bAddToHistory = sal_True); }; @@ -598,7 +598,7 @@ public: }; /// Appends ?Language=xy&System=abc to the help URL in rURL -void AppendConfigToken(OUStringBuffer& rURL, sal_Bool bQuestionMark, const OUString &rLang = rtl::OUString()); +void AppendConfigToken(OUStringBuffer& rURL, sal_Bool bQuestionMark, const OUString &rLang = OUString()); #endif // #ifndef INCLUDED_SFX_NEWHELP_HXX diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx index b80a1678b4db..97a6a7812f1d 100644 --- a/sfx2/source/appl/openuriexternally.cxx +++ b/sfx2/source/appl/openuriexternally.cxx @@ -50,19 +50,19 @@ #include "app.hrc" bool sfx2::openUriExternally( - rtl::OUString const & uri, bool handleSystemShellExecuteException) + OUString const & uri, bool handleSystemShellExecuteException) { css::uno::Reference< css::system::XSystemShellExecute > exec( css::system::SystemShellExecute::create(comphelper::getProcessComponentContext())); try { exec->execute( - uri, rtl::OUString(), + uri, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY); return true; } catch (css::lang::IllegalArgumentException & e) { if (e.ArgumentPosition != 0) { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( "unexpected IllegalArgumentException: ") + e.Message), css::uno::Reference< css::uno::XInterface >()); diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 8bb2ffc6b3a1..1da4614d1255 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -66,40 +66,40 @@ class StringLength : public ::cppu::WeakImplHelper1< XStringWidth > virtual ~StringLength() {} // XStringWidth - sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString ) + sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) throw (::com::sun::star::uno::RuntimeException) { return aString.getLength(); } }; -void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const ::rtl::OUString& aURLString, sal_uInt32 nNo ) +void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const OUString& aURLString, sal_uInt32 nNo ) { - ::rtl::OUStringBuffer aPickEntry; + OUStringBuffer aPickEntry; if ( nNo < 9 ) { aPickEntry.append('~'); - aPickEntry.append(::rtl::OUString::valueOf(static_cast(nNo + 1))); + aPickEntry.append(OUString::valueOf(static_cast(nNo + 1))); } else if ( nNo == 9 ) aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM("1~0")); else - aPickEntry.append(::rtl::OUString::valueOf(static_cast(nNo + 1))); + aPickEntry.append(OUString::valueOf(static_cast(nNo + 1))); aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM(": ")); INetURLObject aURL( aURLString ); - rtl::OUString aTipHelpText; - rtl::OUString aAccessibleName = aPickEntry.toString(); + OUString aTipHelpText; + OUString aAccessibleName = aPickEntry.toString(); if ( aURL.GetProtocol() == INET_PROT_FILE ) { // Do handle file URL differently => convert it to a system // path and abbreviate it with a special function: - ::rtl::OUString aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); + OUString aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); - ::rtl::OUString aSystemPath( aFileSystemPath ); - ::rtl::OUString aCompactedSystemPath; + OUString aSystemPath( aFileSystemPath ); + OUString aCompactedSystemPath; aTipHelpText = aSystemPath; aAccessibleName += aSystemPath; @@ -118,7 +118,7 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, cons else { // Use INetURLObject to abbreviate all other URLs - ::rtl::OUString aShortURL; + OUString aShortURL; aShortURL = aURL.getAbbreviated( m_xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS ); aPickEntry.append(aShortURL); aTipHelpText = aURLString; @@ -167,7 +167,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) return; // Help not in History - INetURLObject aURL( pDocSh->IsDocShared() ? pDocSh->GetSharedFileURL() : ::rtl::OUString( pMed->GetOrigURL() ) ); + INetURLObject aURL( pDocSh->IsDocShared() ? pDocSh->GetSharedFileURL() : OUString( pMed->GetOrigURL() ) ); if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP ) return; @@ -183,8 +183,8 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) if ( !SfxViewFrame::GetFirst( pDocSh, sal_True ) ) return; - ::rtl::OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); - ::rtl::OUString aFilter; + OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); + OUString aFilter; const SfxFilter* pFilter = pMed->GetOrigFilter(); if ( pFilter ) aFilter = pFilter->GetFilterName(); @@ -197,7 +197,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) OUString() ); if ( aURL.GetProtocol() == INET_PROT_FILE ) - Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : ::rtl::OUString() ); + Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : OUString() ); } SfxPickList& SfxPickList::Get() @@ -234,9 +234,9 @@ void SfxPickList::CreatePickListEntries() Sequence< PropertyValue > seqPropertySet = seqPicklist[ nItem ]; INetURLObject aURL; - ::rtl::OUString sURL; - ::rtl::OUString sFilter; - ::rtl::OUString sTitle; + OUString sURL; + OUString sFilter; + OUString sTitle; sal_uInt32 nPropertyCount = seqPropertySet.getLength(); for( sal_uInt32 nProperty=0; nPropertyInsertSeparator(); - rtl::OUString aEmptyString; + OUString aEmptyString; for ( sal_uInt32 i = 0; i < m_aPicklistVector.size(); i++ ) { PickListEntry* pEntry = GetPickListEntry( i ); @@ -316,7 +316,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) sal_uInt16 nPos=aFilter.Search('|'); if( nPos != STRING_NOTFOUND ) { - rtl::OUString aOptions(aFilter.Copy(nPos).GetBuffer()+1); + OUString aOptions(aFilter.Copy(nPos).GetBuffer()+1); aFilter.Erase( nPos ); aReq.AppendItem( SfxStringItem(SID_FILE_FILTEROPTIONS, aOptions)); } @@ -387,12 +387,12 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint ) return; // Help not in History - INetURLObject aURL( pDocSh->IsDocShared() ? pDocSh->GetSharedFileURL() : ::rtl::OUString( pMed->GetOrigURL() ) ); + INetURLObject aURL( pDocSh->IsDocShared() ? pDocSh->GetSharedFileURL() : OUString( pMed->GetOrigURL() ) ); if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP ) return; - ::rtl::OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); - ::rtl::OUString aFilter; + OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); + OUString aFilter; const SfxFilter* pFilter = pMed->GetOrigFilter(); if ( pFilter ) aFilter = pFilter->GetFilterName(); @@ -425,7 +425,7 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint ) // not a "new" document) to the "Recent Documents" list before we // switch to the new path. // If the current document is new, path will be empty. - rtl::OUString path = pMedium->GetOrigURL(); + OUString path = pMedium->GetOrigURL(); if (!path.isEmpty()) { AddDocumentToPickList(pDocSh); diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 59af38e54694..2fa5ba902b54 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -69,7 +69,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::com::sun::star::ui::dialogs; #ifdef WNT -using ::rtl::OUString; #else using namespace ::rtl; #endif @@ -280,7 +279,7 @@ ShutdownIcon::~ShutdownIcon() // --------------------------------------------------------------------------- -void ShutdownIcon::OpenURL( const ::rtl::OUString& aURL, const ::rtl::OUString& rTarget, const Sequence< PropertyValue >& aArgs ) +void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const Sequence< PropertyValue >& aArgs ) { if ( getInstance() && getInstance()->m_xDesktop.is() ) { @@ -344,16 +343,16 @@ void ShutdownIcon::FromTemplate() if ( xProv.is() ) { if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL ) - xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDisp = xProv->queryDispatch( aTargetURL, OUString(), 0 ); else - xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString("_blank"), 0 ); + xDisp = xProv->queryDispatch( aTargetURL, OUString("_blank"), 0 ); } if ( xDisp.is() ) { Sequence aArgs(1); PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = rtl::OUString("Referer"); - pArg[0].Value <<= ::rtl::OUString("private:user"); + pArg[0].Name = OUString("Referer"); + pArg[0].Value <<= OUString("private:user"); Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY ); if ( xNotifyer.is() ) { @@ -800,7 +799,7 @@ static OUString getAutostartDir( bool bCreate = false ) } #endif -rtl::OUString ShutdownIcon::getShortcutName() +OUString ShutdownIcon::getShortcutName() { #ifndef ENABLE_QUICKSTART_APPLET return OUString(); diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index bbcef09d31a8..958c59d3c267 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -85,7 +85,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase oslGenericFunction *pDeInit ); static void EnterModalMode(); static void LeaveModalMode(); - static rtl::OUString getShortcutName(); + static OUString getShortcutName(); friend class SfxNotificationListener_Impl; @@ -103,7 +103,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase static void addTerminateListener(); static void FileOpen(); - static void OpenURL( const ::rtl::OUString& aURL, const ::rtl::OUString& rTarget, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& = + static void OpenURL( const OUString& aURL, const OUString& rTarget, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& = ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >( 0 ) ); static void FromTemplate(); @@ -115,10 +115,10 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > GetWrapperFactory( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xSMgr ); - static ::rtl::OUString GetImplementationName_static(); + static OUString GetImplementationName_static(); - ::rtl::OUString GetResString( int id ); - ::rtl::OUString GetUrlDescription( const ::rtl::OUString& aUrl ); + OUString GetResString( int id ); + OUString GetUrlDescription( const OUString& aUrl ); void SetVeto( bool bVeto ) { m_bVeto = bVeto;} bool GetVeto() { return m_bVeto; } @@ -162,8 +162,8 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2 > m_xDesktop; #ifdef WNT - static void EnableAutostartW32( const rtl::OUString &aShortcutName ); - static rtl::OUString GetAutostartFolderNameW32(); + static void EnableAutostartW32( const OUString &aShortcutName ); + static OUString GetAutostartFolderNameW32(); #endif }; diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 5d3fef78480d..2d3ecf7c0e8a 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -201,8 +201,8 @@ static void add_ugly_db_item( GtkMenuShell *pMenuShell, const char *pAsciiURL, Sequence < Sequence < PropertyValue > > aMenu = aOpt.GetMenu( E_NEWMENU ); for ( sal_Int32 n=0; n& aEntry = aMenu[n]; for ( sal_Int32 m=0; mGetResString( STR_QUICKSTART_TIP ), RTL_TEXTENCODING_UTF8 ); @@ -397,9 +397,9 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray() #ifdef ENABLE_GIO GFile* pFile = NULL; - rtl::OUString sLibraryFileUrl; + OUString sLibraryFileUrl; if (osl::Module::getUrlFromAddress(plugin_init_sys_tray, sLibraryFileUrl)) - pFile = g_file_new_for_uri(rtl::OUStringToOString(sLibraryFileUrl, RTL_TEXTENCODING_UTF8).getStr()); + pFile = g_file_new_for_uri(OUStringToOString(sLibraryFileUrl, RTL_TEXTENCODING_UTF8).getStr()); if (pFile) { diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 3220bb5c4a86..dbff12d75fb3 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -169,17 +169,17 @@ static HMENU createSystrayMenu( ) #if defined(USE_APP_SHORTCUTS) // collect the URLs of the entries in the File/New menu - ::std::set< ::rtl::OUString > aFileNewAppsAvailable; + ::std::set< OUString > aFileNewAppsAvailable; SvtDynamicMenuOptions aOpt; Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU ); - const ::rtl::OUString sURLKey( "URL" ); + const OUString sURLKey( "URL" ); const Sequence< PropertyValue >* pNewMenu = aNewMenu.getConstArray(); const Sequence< PropertyValue >* pNewMenuEnd = aNewMenu.getConstArray() + aNewMenu.getLength(); for ( ; pNewMenu != pNewMenuEnd; ++pNewMenu ) { ::comphelper::SequenceAsHashMap aEntryItems( *pNewMenu ); - ::rtl::OUString sURL( aEntryItems.getUnpackedValueOrDefault( sURLKey, ::rtl::OUString() ) ); + OUString sURL( aEntryItems.getUnpackedValueOrDefault( sURLKey, OUString() ) ); if ( sURL.getLength() ) aFileNewAppsAvailable.insert( sURL ); } @@ -210,7 +210,7 @@ static HMENU createSystrayMenu( ) // the complete application is not even installed continue; - ::rtl::OUString sURL( ::rtl::OUString::createFromAscii( aMenuItems[i].pAsciiURLDescription ) ); + OUString sURL( OUString::createFromAscii( aMenuItems[i].pAsciiURLDescription ) ); if ( aFileNewAppsAvailable.find( sURL ) == aFileNewAppsAvailable.end() ) // the application is installed, but the entry has been configured to *not* appear in the File/New @@ -834,7 +834,7 @@ bool ShutdownIcon::IsQuickstarterInstalled() return FileExistsW( reinterpret_cast(quickstartExe.getStr()) ); } -void ShutdownIcon::EnableAutostartW32( const rtl::OUString &aShortcut ) +void ShutdownIcon::EnableAutostartW32( const OUString &aShortcut ) { wchar_t aPath[_MAX_PATH]; GetModuleFileNameW( NULL, aPath, _MAX_PATH-1); diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 410810257777..2f43e60e81ba 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -195,7 +195,7 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr if ( xPropSet.is() ) { aValue = xPropSet->getPropertyValue( - ::rtl::OUString( "LockCount" ) ); + OUString( "LockCount" ) ); aValue >>= m_pWrkWin->m_nLock; } } @@ -327,7 +327,7 @@ namespace class FilledToolBarResIdToResourceURLMap { private: - typedef boost::unordered_map< sal_Int32, rtl::OUString > ToolBarResIdToResourceURLMap; + typedef boost::unordered_map< sal_Int32, OUString > ToolBarResIdToResourceURLMap; ToolBarResIdToResourceURLMap m_aResIdToResourceURLMap; public: FilledToolBarResIdToResourceURLMap() @@ -335,19 +335,19 @@ namespace sal_Int32 nIndex( 0 ); while ( pToolBarResToName[nIndex].nId != 0 ) { - rtl::OUString aResourceURL( rtl::OUString::createFromAscii( pToolBarResToName[nIndex].pName )); + OUString aResourceURL( OUString::createFromAscii( pToolBarResToName[nIndex].pName )); m_aResIdToResourceURLMap.insert( ToolBarResIdToResourceURLMap::value_type( sal_Int32( pToolBarResToName[nIndex].nId ), aResourceURL )); ++nIndex; } } - rtl::OUString findURL(sal_uInt16 nResId) const + OUString findURL(sal_uInt16 nResId) const { ToolBarResIdToResourceURLMap::const_iterator aIter = m_aResIdToResourceURLMap.find( nResId ); if ( aIter != m_aResIdToResourceURLMap.end() ) return aIter->second; - return rtl::OUString(); + return OUString(); } }; @@ -358,7 +358,7 @@ namespace }; } -static rtl::OUString GetResourceURLFromResId( sal_uInt16 nResId ) +static OUString GetResourceURLFromResId( sal_uInt16 nResId ) { return theFilledToolBarResIdToResourceURLMap::get().findURL(nResId); } @@ -1387,14 +1387,14 @@ void SfxWorkWindow::UpdateObjectBars_Impl() bool bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode ); if ( bDestroy ) { - rtl::OUString aTbxId( m_aTbxTypeName ); + OUString aTbxId( m_aTbxTypeName ); aTbxId += GetResourceURLFromResId( aObjBarList[n].nId ); xLayoutManager->destroyElement( aTbxId ); } else if ( nId != 0 && ( ( bModesMatching && !bIsFullScreen ) || ( bIsFullScreen && bFullScreenTbx ) ) ) { - rtl::OUString aTbxId( m_aTbxTypeName ); + OUString aTbxId( m_aTbxTypeName ); aTbxId += GetResourceURLFromResId( aObjBarList[n].nId ); if ( !IsDockingAllowed() && !xLayoutManager->isElementFloating( aTbxId )) xLayoutManager->destroyElement( aTbxId ); @@ -1408,7 +1408,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl() else if ( nId != 0 ) { // Delete the Toolbox at this Position if possible - rtl::OUString aTbxId( m_aTbxTypeName ); + OUString aTbxId( m_aTbxTypeName ); aTbxId += GetResourceURLFromResId( aObjBarList[n].nId ); xLayoutManager->destroyElement( aTbxId ); } diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index 302833dc9658..c71d29120658 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -35,18 +35,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.PackageStructureCreator"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.PackageStructureCreator"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.PackageStructureCreator"); + aRet[1] = OUString("com.sun.star.comp.embed.PackageStructureCreator"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OPackageStructureCreator::impl_getStaticImplementationName() +OUString SAL_CALL OPackageStructureCreator::impl_getStaticImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.PackageStructureCreator"); + return OUString("com.sun.star.comp.embed.PackageStructureCreator"); } //------------------------------------------------------------------------- @@ -68,7 +68,7 @@ uno::Reference< uno::XInterface > SAL_CALL OPackageStructureCreator::impl_static //------------------------------------------------------------------------- -void SAL_CALL OPackageStructureCreator::convertToPackage( const ::rtl::OUString& aFolderUrl, +void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolderUrl, const uno::Reference< io::XOutputStream >& xTargetStream ) throw ( io::IOException, uno::RuntimeException ) @@ -84,7 +84,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const ::rtl::OUString& { SvStream* pTempStream = NULL; - ::rtl::OUString aTempURL = ::utl::TempFile().GetURL(); + OUString aTempURL = ::utl::TempFile().GetURL(); try { if ( aContent.isFolder() ) { @@ -165,17 +165,17 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const ::rtl::OUString& } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OPackageStructureCreator::getImplementationName() +OUString SAL_CALL OPackageStructureCreator::getImplementationName() throw ( uno::RuntimeException ) { return impl_getStaticImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OPackageStructureCreator::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OPackageStructureCreator::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_getStaticSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_getStaticSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName.compareTo( aSeq[nInd] ) == 0 ) @@ -185,7 +185,7 @@ sal_Bool SAL_CALL OPackageStructureCreator::supportsService( const ::rtl::OUStri } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OPackageStructureCreator::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OPackageStructureCreator::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_getStaticSupportedServiceNames(); diff --git a/sfx2/source/appl/xpackcreator.hxx b/sfx2/source/appl/xpackcreator.hxx index fa204aac0e02..3691d12900ac 100644 --- a/sfx2/source/appl/xpackcreator.hxx +++ b/sfx2/source/appl/xpackcreator.hxx @@ -41,9 +41,9 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_getStaticImplementationName(); + static OUString SAL_CALL impl_getStaticImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL impl_createFactory( @@ -54,12 +54,12 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); // XPackageStructureCreator - virtual void SAL_CALL convertToPackage( const ::rtl::OUString& aFolderUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xTargetStream ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL convertToPackage( const OUString& aFolderUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xTargetStream ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 3acc3f0faef4..ff9d51ca88ac 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -247,12 +247,12 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const String& rName class SfxFilterMatcher_Impl { public: - ::rtl::OUString aName; + OUString aName; SfxFilterList_Impl* pList; // is created on demand void InitForIterating() const; void Update(); - SfxFilterMatcher_Impl(const ::rtl::OUString &rName) + SfxFilterMatcher_Impl(const OUString &rName) : aName(rName) , pList(0) { @@ -269,18 +269,18 @@ namespace public std::unary_function { private: - const rtl::OUString& mrName; + const OUString& mrName; public: - hasName(const rtl::OUString &rName) : mrName(rName) {} + hasName(const OUString &rName) : mrName(rName) {} bool operator() (const SfxFilterMatcher_Impl& rImpl) const { return rImpl.aName == mrName; } }; - SfxFilterMatcher_Impl & getSfxFilterMatcher_Impl(const rtl::OUString &rName) + SfxFilterMatcher_Impl & getSfxFilterMatcher_Impl(const OUString &rName) { - rtl::OUString aName; + OUString aName; if (!rName.isEmpty()) aName = SfxObjectShell::GetServiceNameFromFactory(rName); @@ -307,7 +307,7 @@ SfxFilterMatcher::SfxFilterMatcher( const OUString& rName ) } SfxFilterMatcher::SfxFilterMatcher() - : m_rImpl( getSfxFilterMatcher_Impl(::rtl::OUString()) ) + : m_rImpl( getSfxFilterMatcher_Impl(OUString()) ) { // global FilterMatcher always uses global filter array (also created on // demand) @@ -380,8 +380,8 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent( SfxFilterFlags nMust, SfxFilterFlags nDont ) const { - Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.document.TypeDetection")), UNO_QUERY ); - ::rtl::OUString sTypeName; + Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.document.TypeDetection")), UNO_QUERY ); + OUString sTypeName; try { sTypeName = xDetection->queryTypeByURL( rMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); @@ -415,19 +415,19 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c const SfxFilter* pOldFilter = *ppFilter; // no detection service -> nothing to do ! - Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.document.TypeDetection")), UNO_QUERY ); + Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.document.TypeDetection")), UNO_QUERY ); if (!xDetection.is()) return ERRCODE_ABORT; - ::rtl::OUString sTypeName; + OUString sTypeName; try { // open the stream one times only ... // Otherwhise it will be tried more then once and show the same interaction more then once ... - ::rtl::OUString sURL( rMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); + OUString sURL( rMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInStream = rMedium.GetInputStream(); - rtl::OUString aFilterName; + OUString aFilterName; // stream exists => deep detection (with preselection ... if possible) if (xInStream.is()) @@ -443,8 +443,8 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c if ( pOldFilter ) { - aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME() ] <<= ::rtl::OUString( pOldFilter->GetTypeName() ); - aDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= ::rtl::OUString( pOldFilter->GetFilterName() ); + aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME() ] <<= OUString( pOldFilter->GetTypeName() ); + aDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= OUString( pOldFilter->GetFilterName() ); } ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > lDescriptor = aDescriptor.getAsConstPropertyValueList(); @@ -454,7 +454,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c { if (lDescriptor[i].Name == "FilterName") // Type detection picked a preferred filter for this format. - aFilterName = lDescriptor[i].Value.get(); + aFilterName = lDescriptor[i].Value.get(); } } // no stream exists => try flat detection without preselection as fallback @@ -476,7 +476,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c // The DocumentService property is only a preselection, and all preselections are considered as optional! // This "wrong" type will be sorted out now because we match only allowed filters to the detected type ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lQuery(1); - lQuery[0].Name = ::rtl::OUString("Name"); + lQuery[0].Name = OUString("Name"); lQuery[0].Value <<= sTypeName; pFilter = GetFilterForProps(lQuery, nMust, nDont); @@ -618,10 +618,10 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno: while ( xEnum->hasMoreElements() ) { ::comphelper::SequenceAsHashMap aProps( xEnum->nextElement() ); - ::rtl::OUString aValue; + OUString aValue; // try to get the preferred filter (works without loading all filters!) - if ( (aProps[::rtl::OUString("PreferredFilter")] >>= aValue) && !aValue.isEmpty() ) + if ( (aProps[OUString("PreferredFilter")] >>= aValue) && !aValue.isEmpty() ) { const SfxFilter* pFilter = SfxFilter::GetFilterByName( aValue ); if ( !pFilter || (pFilter->GetFilterFlags() & nMust) != nMust || (pFilter->GetFilterFlags() & nDont ) ) @@ -636,7 +636,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno: { // preferred filter belongs to another document type; now we must search the filter m_rImpl.InitForIterating(); - aProps[::rtl::OUString("Name")] >>= aValue; + aProps[OUString("Name")] >>= aValue; pFilter = GetFilter4EA( aValue, nMust, nDont ); if ( pFilter ) return pFilter; @@ -653,7 +653,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno: return 0; } -const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const ::rtl::OUString& rMediaType, SfxFilterFlags nMust, SfxFilterFlags nDont ) const +const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const OUString& rMediaType, SfxFilterFlags nMust, SfxFilterFlags nDont ) const { if ( m_rImpl.pList ) { @@ -669,7 +669,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const ::rtl::OUString& rMedia } com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString("MediaType"); + aSeq[0].Name = OUString("MediaType"); aSeq[0].Value <<= rMediaType; return GetFilterForProps( aSeq, nMust, nDont ); } @@ -698,8 +698,8 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const String& rType,SfxFilterFl } com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString("Name"); - aSeq[0].Value <<= ::rtl::OUString( rType ); + aSeq[0].Name = OUString("Name"); + aSeq[0].Value <<= OUString( rType ); return GetFilterForProps( aSeq, nMust, nDont ); } @@ -737,8 +737,8 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const String& rExt, SfxF sExt.Erase(0,1); com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString("Extensions"); - ::com::sun::star::uno::Sequence < ::rtl::OUString > aExts(1); + aSeq[0].Name = OUString("Extensions"); + ::com::sun::star::uno::Sequence < OUString > aExts(1); aExts[0] = sExt; aSeq[0].Value <<= aExts; return GetFilterForProps( aSeq, nMust, nDont ); @@ -750,8 +750,8 @@ const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( sal_uInt32 nId, SfxFil return 0; com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - ::rtl::OUString aName = SotExchange::GetFormatName( nId ); - aSeq[0].Name = ::rtl::OUString("ClipboardFormat"); + OUString aName = SotExchange::GetFormatName( nId ); + aSeq[0].Name = OUString("ClipboardFormat"); aSeq[0].Value <<= aName; return GetFilterForProps( aSeq, nMust, nDont ); } @@ -891,11 +891,11 @@ const SfxFilter* SfxFilterMatcherIter::Next() helper to build own formated string from given stringlist by using given seperator ---------------------------------------------------------------*/ -::rtl::OUString implc_convertStringlistToString( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& lList , +OUString implc_convertStringlistToString( const ::com::sun::star::uno::Sequence< OUString >& lList , const sal_Unicode& cSeperator, - const ::rtl::OUString& sPrefix ) + const OUString& sPrefix ) { - ::rtl::OUStringBuffer sString ( 1000 ) ; + OUStringBuffer sString ( 1000 ) ; sal_Int32 nCount = lList.getLength(); sal_Int32 nItem = 0 ; for( nItem=0; nItem& xTypeCFG, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, sal_Bool bUpdate ) { - ::rtl::OUString sFilterName( rName ); + OUString sFilterName( rName ); SfxFilterList_Impl& rList = *pFilterArr; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > lFilterProperties; ::com::sun::star::uno::Any aResult; @@ -942,15 +942,15 @@ void SfxFilterContainer::ReadSingleFilter_Impl( sal_Int32 nClipboardId = 0 ; sal_Int32 nDocumentIconId = 0 ; sal_Int32 nFormatVersion = 0 ; - ::rtl::OUString sMimeType ; - ::rtl::OUString sType ; - ::rtl::OUString sUIName ; - ::rtl::OUString sHumanName ; - ::rtl::OUString sDefaultTemplate ; - ::rtl::OUString sUserData ; - ::rtl::OUString sExtension ; - ::rtl::OUString sPattern ; - ::rtl::OUString sServiceName ; + OUString sMimeType ; + OUString sType ; + OUString sUIName ; + OUString sHumanName ; + OUString sDefaultTemplate ; + OUString sUserData ; + OUString sExtension ; + OUString sPattern ; + OUString sServiceName ; // first get directly available properties sal_Int32 nFilterPropertyCount = lFilterProperties.getLength(); @@ -975,9 +975,9 @@ void SfxFilterContainer::ReadSingleFilter_Impl( } else if ( lFilterProperties[nFilterProperty].Name == "UserData" ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > lUserData; + ::com::sun::star::uno::Sequence< OUString > lUserData; lFilterProperties[nFilterProperty].Value >>= lUserData; - sUserData = implc_convertStringlistToString( lUserData, ',', ::rtl::OUString() ); + sUserData = implc_convertStringlistToString( lUserData, ',', OUString() ); } else if ( lFilterProperties[nFilterProperty].Name == "DocumentService" ) { @@ -1028,16 +1028,16 @@ void SfxFilterContainer::ReadSingleFilter_Impl( { if (sExtension.isEmpty()) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensions; + ::com::sun::star::uno::Sequence< OUString > lExtensions; lTypeProperties[nTypeProperty].Value >>= lExtensions; sExtension = implc_convertStringlistToString( lExtensions, ';', "*." ); } } else if ( lTypeProperties[nTypeProperty].Name == "URLPattern" ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > lPattern; + ::com::sun::star::uno::Sequence< OUString > lPattern; lTypeProperties[nTypeProperty].Value >>= lPattern; - sPattern = implc_convertStringlistToString( lPattern, ';', ::rtl::OUString() ); + sPattern = implc_convertStringlistToString( lPattern, ';', OUString() ); } } } @@ -1138,7 +1138,7 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate ) ) { // select right query to get right set of filters for search modul - ::com::sun::star::uno::Sequence< ::rtl::OUString > lFilterNames = xFilterCFG->getElementNames(); + ::com::sun::star::uno::Sequence< OUString > lFilterNames = xFilterCFG->getElementNames(); if ( lFilterNames.getLength() ) { // If list of filters already exist ... @@ -1163,7 +1163,7 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate ) { // Try to get filter .. but look for any exceptions! // May be filter was deleted by another thread ... - ::rtl::OUString sFilterName = lFilterNames[nFilter]; + OUString sFilterName = lFilterNames[nFilter]; ReadSingleFilter_Impl( sFilterName, xTypeCFG, xFilterCFG, bUpdate ); } } diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index bf79d7f4f924..1f24a5952288 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -72,7 +72,7 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, if( pIndent ) rStrm << pIndent; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta).append(' ') .append(bHTTPEquiv ? OOO_STRING_SVTOOLS_HTML_O_httpequiv : OOO_STRING_SVTOOLS_HTML_O_name).append("=\""); rStrm << sOut.makeStringAndClear().getStr(); @@ -96,7 +96,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, if( pCharSet ) { - String aContentType = rtl::OUString(sHTML_MIME_text_html); + String aContentType = OUString(sHTML_MIME_text_html); aContentType.AppendAscii( pCharSet ); OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, sal_True, eDestEnc, pNonConvertableChars ); @@ -125,7 +125,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, if( pIndent ) rStrm << pIndent; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_base).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_target).append("=\""); rStrm << sOut.makeStringAndClear().getStr(); @@ -136,7 +136,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, // Who we are String sGenerator( SfxResId(STR_HTML_GENERATOR).toString() ); - ::rtl::OUString os( "$_OS" ); + OUString os( "$_OS" ); ::rtl::Bootstrap::expandMacros(os); sGenerator.SearchAndReplaceAscii( "%1", os ); OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, sal_False, eDestEnc, pNonConvertableChars ); @@ -227,11 +227,11 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, { try { - ::rtl::OUString name = props[i].Name; + OUString name = props[i].Name; uno::Any aStr = xConverter->convertToSimpleType( xUserDefinedProps->getPropertyValue(name), uno::TypeClass_STRING); - ::rtl::OUString str; + OUString str; aStr >>= str; String valstr(comphelper::string::stripEnd(str, ' ')); OutMeta( rStrm, pIndent, name, valstr, sal_False, @@ -252,9 +252,9 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( { try { - rtl::OStringBuffer sOut; - ::rtl::OUString aStr; - uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString("FrameURL") ); + OStringBuffer sOut; + OUString aStr; + uno::Any aAny = xSet->getPropertyValue( OUString("FrameURL") ); if ( (aAny >>= aStr) && !aStr.isEmpty() ) { String aURL = INetURLObject( aStr ).GetMainURL( INetURLObject::DECODE_TO_IURI ); @@ -270,7 +270,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } } - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameName") ); + aAny = xSet->getPropertyValue( OUString("FrameName") ); if ( (aAny >>= aStr) && !aStr.isEmpty() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name) @@ -281,13 +281,13 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } sal_Int32 nVal = SIZE_NOT_SET; - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginWidth") ); + aAny = xSet->getPropertyValue( OUString("FrameMarginWidth") ); if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginwidth) .append('=').append(nVal); } - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginHeight") ); + aAny = xSet->getPropertyValue( OUString("FrameMarginHeight") ); if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginheight) @@ -295,10 +295,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } sal_Bool bVal = sal_True; - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoScroll") ); + aAny = xSet->getPropertyValue( OUString("FrameIsAutoScroll") ); if ( (aAny >>= bVal) && !bVal ) { - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsScrollingMode") ); + aAny = xSet->getPropertyValue( OUString("FrameIsScrollingMode") ); if ( aAny >>= bVal ) { const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no; @@ -308,10 +308,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } // frame border (MS+Netscape-Extension) - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoBorder") ); + aAny = xSet->getPropertyValue( OUString("FrameIsAutoBorder") ); if ( (aAny >>= bVal) && !bVal ) { - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsBorder") ); + aAny = xSet->getPropertyValue( OUString("FrameIsBorder") ); if ( aAny >>= bVal ) { const char* pStr = bVal ? sHTML_SC_yes : sHTML_SC_no; diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 434d7a81e243..24b5de1b3a80 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -54,7 +54,6 @@ using namespace osl; using ::std::vector; -using ::rtl::OStringToOUString; std::vector SfxContentHelper::GetResultSet( const OUString& rURL ) { diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx index 7f6b9384f0b5..d9e50ea7c2fd 100644 --- a/sfx2/source/bastyp/mieclip.cxx +++ b/sfx2/source/bastyp/mieclip.cxx @@ -37,7 +37,7 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream ) if( pStrm ) delete pStrm, pStrm = 0; - rtl::OString sLine, sVersion; + OString sLine, sVersion; sal_Int32 nStt = -1, nEnd = -1, nFragStart = -1, nFragEnd = -1; sal_Int32 nIndex = 0; @@ -51,7 +51,7 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream ) while( rStream.ReadLine( sLine ) ) { nIndex = 0; - rtl::OString sTmp(sLine.getToken(0, ':', nIndex)); + OString sTmp(sLine.getToken(0, ':', nIndex)); if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartHTML"))) nStt = sLine.copy(nIndex).toInt32(); else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndHTML"))) diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index c7d5dd8989f3..bbbd5de96fad 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -254,7 +254,7 @@ sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr ) : STRING_MAXLEN; aStream.Seek( 0 ); - rtl::OString sBuffer = read_uInt8s_ToOString(aStream, nLen); + OString sBuffer = read_uInt8s_ToOString(aStream, nLen); rStr = S2U(sBuffer); } diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 74b5f790eeb6..0bd334f7bd3d 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -161,17 +161,17 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) uno::Sequence < beans::PropertyValue > aProperties(3); beans::PropertyValue *pValues = aProperties.getArray(); - ::rtl::OUString aType(STAR_BASIC ); - ::rtl::OUString aLib = pMacro->GetLibName(); - ::rtl::OUString aMacro = pMacro->GetMacName(); + OUString aType(STAR_BASIC ); + OUString aLib = pMacro->GetLibName(); + OUString aMacro = pMacro->GetMacName(); - pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE ); + pValues[ 0 ].Name = OUString(PROP_EVENT_TYPE ); pValues[ 0 ].Value <<= aType; - pValues[ 1 ].Name = ::rtl::OUString(PROP_LIBRARY ); + pValues[ 1 ].Name = OUString(PROP_LIBRARY ); pValues[ 1 ].Value <<= aLib; - pValues[ 2 ].Name = ::rtl::OUString(PROP_MACRO_NAME ); + pValues[ 2 ].Name = OUString(PROP_MACRO_NAME ); pValues[ 2 ].Value <<= aMacro; aEventData <<= aProperties; @@ -181,13 +181,13 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) uno::Sequence < beans::PropertyValue > aProperties(2); beans::PropertyValue *pValues = aProperties.getArray(); - ::rtl::OUString aLib = pMacro->GetLibName(); - ::rtl::OUString aMacro = pMacro->GetMacName(); + OUString aLib = pMacro->GetLibName(); + OUString aMacro = pMacro->GetMacName(); - pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE ); + pValues[ 0 ].Name = OUString(PROP_EVENT_TYPE ); pValues[ 0 ].Value <<= aLib; - pValues[ 1 ].Name = ::rtl::OUString(PROP_SCRIPT ); + pValues[ 1 ].Name = OUString(PROP_SCRIPT ); pValues[ 1 ].Value <<= aMacro; aEventData <<= aProperties; @@ -197,12 +197,12 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) uno::Sequence < beans::PropertyValue > aProperties(2); beans::PropertyValue *pValues = aProperties.getArray(); - ::rtl::OUString aMacro = pMacro->GetMacName(); + OUString aMacro = pMacro->GetMacName(); - pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE ); - pValues[ 0 ].Value <<= ::rtl::OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT); + pValues[ 0 ].Name = OUString(PROP_EVENT_TYPE ); + pValues[ 0 ].Value <<= OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT); - pValues[ 1 ].Name = ::rtl::OUString(PROP_MACRO_NAME ); + pValues[ 1 ].Name = OUString(PROP_MACRO_NAME ); pValues[ 1 ].Value <<= aMacro; aEventData <<= aProperties; @@ -222,7 +222,7 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) } //-------------------------------------------------------------------------- -void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const SvxMacro* pMacro ) +void PropagateEvent_Impl( SfxObjectShell *pDoc, OUString aEventName, const SvxMacro* pMacro ) { uno::Reference < document::XEventsSupplier > xSupplier; if ( pDoc ) @@ -263,7 +263,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const } //-------------------------------------------------------------------------------------------------------- -void SfxEventConfiguration::ConfigureEvent( rtl::OUString aName, const SvxMacro& rMacro, SfxObjectShell *pDoc ) +void SfxEventConfiguration::ConfigureEvent( OUString aName, const SvxMacro& rMacro, SfxObjectShell *pDoc ) { boost::scoped_ptr pMacro; if ( rMacro.HasMacro() ) diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 457f70e70214..d2981d44371b 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1943,13 +1943,13 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) ::com::sun::star::util::URL aURL; OUString aCmd( ".uno:" ); aURL.Protocol = aCmd; - aURL.Path = ::rtl::OUString::createFromAscii(pSlot->GetUnoName()); + aURL.Path = OUString::createFromAscii(pSlot->GetUnoName()); aCmd += aURL.Path; aURL.Complete = aCmd; aURL.Main = aCmd; if ( !xDisp.is() ) - xDisp = pImp->xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDisp = pImp->xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) { @@ -2003,9 +2003,9 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) aAny >>= nTemp ; pItem = new SfxUInt32Item( nSlot, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; aAny >>= sTemp ; pItem = new SfxStringItem( nSlot, sTemp ); } @@ -2191,7 +2191,7 @@ sal_Bool SfxBindings::ExecuteCommand_Impl( const String& rCommand ) aURL.Complete = rCommand; Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aURL ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = pImp->xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = pImp->xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) { new SfxAsyncExec_Impl( aURL, xDisp ); diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 17394c7a0679..d7f259285284 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -219,7 +219,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest if ( xSet.is() ) { - com::sun::star::uno::Any aProp = xSet->getPropertyValue(::rtl::OUString("DispatchRecorderSupplier")); + com::sun::star::uno::Any aProp = xSet->getPropertyValue(OUString("DispatchRecorderSupplier")); com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder; aProp >>= xSupplier; @@ -246,7 +246,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest pView = SfxViewFrame::Current(); if ( pView ) { - rtl::OString aCmd(".uno:"); + OString aCmd(".uno:"); aCmd += rSlot.GetUnoName(); SfxHelp::OpenHelpAgent( &pView->GetFrame(), aCmd ); } @@ -379,7 +379,7 @@ SfxDispatcher::~SfxDispatcher() { #ifdef DBG_UTIL - rtl::OStringBuffer sTemp(RTL_CONSTASCII_STRINGPARAM("Delete Dispatcher ")); + OStringBuffer sTemp(RTL_CONSTASCII_STRINGPARAM("Delete Dispatcher ")); sTemp.append(reinterpret_cast(this)); OSL_TRACE("%s", sTemp.getStr()); DBG_ASSERT( !pImp->bActive, "deleting active Dispatcher" ); @@ -689,7 +689,7 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ ) if ( bMDI ) { #ifdef DBG_UTIL - rtl::OStringBuffer sTemp( + OStringBuffer sTemp( RTL_CONSTASCII_STRINGPARAM("Activate Dispatcher ")); sTemp.append(reinterpret_cast(this)); OSL_TRACE("%s", sTemp.getStr()); @@ -707,7 +707,7 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ ) else { #ifdef DBG_UTIL - rtl::OStringBuffer sTemp( + OStringBuffer sTemp( RTL_CONSTASCII_STRINGPARAM("Non-MDI-Activate Dispatcher")); sTemp.append(reinterpret_cast(this)); OSL_TRACE("%s", sTemp.getStr()); @@ -771,7 +771,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew ) if ( bMDI ) { - OSL_TRACE(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Deactivate Dispatcher")).append(reinterpret_cast(this)).getStr()); + OSL_TRACE(OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Deactivate Dispatcher")).append(reinterpret_cast(this)).getStr()); DBG_ASSERT( pImp->bActive, "Deactivate error" ); pImp->bActive = sal_False; @@ -792,7 +792,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew ) } } else { - OSL_TRACE(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Non-MDI-DeActivate Dispatcher")).append(reinterpret_cast(this)).getStr()); + OSL_TRACE(OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Non-MDI-DeActivate Dispatcher")).append(reinterpret_cast(this)).getStr()); } if ( IsAppDispatcher() && !pSfxApp->IsDowning() ) @@ -1261,11 +1261,11 @@ void SfxDispatcher::SetMenu_Impl() if ( xPropSet.is() ) { com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) { - rtl::OUString aMenuBarURL( "private:resource/menubar/menubar" ); + OUString aMenuBarURL( "private:resource/menubar/menubar" ); if ( !xLayoutManager->isElementVisible( aMenuBarURL ) ) xLayoutManager->createElement( aMenuBarURL ); } @@ -1325,7 +1325,7 @@ void SfxDispatcher::Update_Impl( sal_Bool bForce ) { try { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" ) ); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; } catch (const com::sun::star::uno::Exception&) @@ -2041,7 +2041,7 @@ sal_Bool SfxDispatcher::_FillState sal_uInt16 nSlotId = rState.GetPool()->GetSlotId(pItem->Which()); if ( !pItem->IsA(pIF->GetSlot(nSlotId)->GetType()->Type()) ) { - rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM( "item-type unequal to IDL (=> no BASIC)")); aMsg.append(RTL_CONSTASCII_STRINGPARAM("\nwith SID: ")); aMsg.append(static_cast(nSlotId)); @@ -2170,7 +2170,7 @@ void SfxDispatcher::HideUI( sal_Bool bHide ) if ( xPropSet.is() ) { com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) xLayoutManager->setVisible( !bHide ); diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 1d97ea532484..855d4f1942e3 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -50,16 +50,16 @@ sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const return nMasterSlotId; } -::rtl::OString SfxSlot::GetCommand() const +OString SfxSlot::GetCommand() const { - rtl::OString sRet(".uno:"); + OString sRet(".uno:"); sRet += pUnoName; return sRet; } -::rtl::OUString SfxSlot::GetCommandString() const +OUString SfxSlot::GetCommandString() const { - return rtl::OStringToOUString(GetCommand(), RTL_TEXTENCODING_UTF8); + return OStringToOUString(GetCommand(), RTL_TEXTENCODING_UTF8); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index a43e5c95e8f7..e8946e10cf20 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -172,13 +172,13 @@ String SfxSlotPool::SeekGroup( sal_uInt16 nNo ) if ( !aResId.GetResMgr()->IsAvailable(aResId) ) { OSL_FAIL( "GroupId-Name not defined in SFX!" ); - return rtl::OUString(); + return OUString(); } return aResId.toString(); } - return rtl::OUString(); + return OUString(); } diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index caf46f7c893d..90be4b585acc 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -227,7 +227,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) { if ( pSlave->pLinkedSlot != pMasterSlot ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Wrong Master/Slave- link: ")); aStr.append(static_cast( pMasterSlot->GetSlotId())); @@ -239,7 +239,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) if ( pSlave->nMasterSlotId != pMasterSlot->GetSlotId() ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Wrong Master/Slave-Ids: ")); aStr.append(static_cast( pMasterSlot->GetSlotId())); @@ -259,7 +259,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) { if ( pIter->pLinkedSlot->GetKind() != SFX_KIND_ENUM ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Slave is no enum: ")); aStr.append(static_cast(pIter->GetSlotId())); aStr.append(RTL_CONSTASCII_STRINGPARAM(" , ")); @@ -275,7 +275,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) pCurSlot = pCurSlot->pNextSlot; if ( pCurSlot->GetStateFnc() != pIter->GetStateFnc() ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Linked Slots with different State Methods : ")); aStr.append(static_cast( pCurSlot->GetSlotId())); diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index d9fab1820e13..c978b42cede3 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -35,7 +35,6 @@ #include #include -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -50,7 +49,7 @@ class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener , public: SFX_DECL_XINTERFACE_XTYPEPROVIDER - SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand ); + SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); virtual ~SfxQueryStatus_Impl(); // Query method @@ -90,7 +89,7 @@ SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( m_aCommand ); if ( rDispatchProvider.is() ) - m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 ); + m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, OUString(), 0 ); m_aCondition.reset(); } @@ -136,9 +135,9 @@ throw( RuntimeException ) rEvent.State >>= nTemp ; m_pItem = new SfxUInt32Item( m_nSlotID, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; m_pItem = new SfxStringItem( m_nSlotID, sTemp ); } diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 8170a0480ded..d2a8a104130a 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -201,7 +201,7 @@ SfxRequest::SfxRequest #ifdef DBG_UTIL else { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Recording unsupported slot: ")); aStr.append(static_cast(pImp->pPool->GetSlotId(nSlotId))); OSL_FAIL(aStr.getStr()); @@ -331,9 +331,9 @@ void SfxRequest_Impl::Record */ { - String aCommand = rtl::OUString(".uno:"); + String aCommand = OUString(".uno:"); aCommand.AppendAscii( pSlot->GetUnoName() ); - ::rtl::OUString aCmd( aCommand ); + OUString aCmd( aCommand ); if(xRecorder.is()) { uno::Reference< container::XIndexReplace > xReplace( xRecorder, uno::UNO_QUERY ); @@ -346,8 +346,8 @@ void SfxRequest_Impl::Record uno::Any aElement = xReplace->getByIndex(nCount-1); if ( (aElement >>= aStatement) && aStatement.aCommand == aCmd ) { - ::rtl::OUString aStr; - ::rtl::OUString aNew; + OUString aStr; + OUString aNew; aStatement.aArgs[0].Value >>= aStr; rArgs[0].Value >>= aNew; aStr += aNew; @@ -689,7 +689,7 @@ void SfxRequest::Done_Impl // new Recording uses UnoName! if ( !pImp->pSlot->pUnoName ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Recording not exported slot: ")); aStr.append(static_cast(pImp->pSlot->GetSlotId())); OSL_FAIL(aStr.getStr()); @@ -711,7 +711,7 @@ void SfxRequest::Done_Impl #ifdef DBG_UTIL if ( SFX_ITEM_SET != eState ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Recording property not available: ")); aStr.append(static_cast(pImp->pSlot->GetSlotId())); OSL_FAIL(aStr.getStr()); @@ -812,7 +812,7 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe if(xSet.is()) { - com::sun::star::uno::Any aProp = xSet->getPropertyValue(rtl::OUString("DispatchRecorderSupplier")); + com::sun::star::uno::Any aProp = xSet->getPropertyValue(OUString("DispatchRecorderSupplier")); com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; aProp >>= xSupplier; if(xSupplier.is()) diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index bb4bad355126..b44dd04ca48e 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -41,7 +41,6 @@ #include #include -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -61,7 +60,7 @@ SfxStatusListener::SfxStatusListener( const Reference< XDispatchProvider >& rDis Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( m_aCommand ); if ( rDispatchProvider.is() ) - m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 ); + m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, OUString(), 0 ); } SfxStatusListener::~SfxStatusListener() @@ -93,7 +92,7 @@ void SfxStatusListener::ReBind() { try { - m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 ); + m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, OUString(), 0 ); if ( m_xDispatch.is() ) m_xDispatch->addStatusListener( aStatusListener, m_aCommand ); } @@ -198,9 +197,9 @@ throw( RuntimeException ) rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( m_nSlotID, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( m_nSlotID, sTemp ); } diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index ed2e628c2451..836becb6b171 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -82,14 +82,14 @@ bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uIn return false; } - rVal <<= ::rtl::OUString( aValue ); + rVal <<= OUString( aValue ); return true; } bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { - ::rtl::OUString aValue; + OUString aValue; sal_Bool bRet = false; nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 82df20df6a55..5b42f5fb8b8e 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -124,9 +124,9 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame:: aAny >>= nTemp ; pItem = new SfxUInt32Item( nId, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; aAny >>= sTemp ; pItem = new SfxStringItem( nId, sTemp ); } @@ -272,13 +272,13 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons ::com::sun::star::util::URL aURL; OUString aCmd = ".uno:"; aURL.Protocol = aCmd; - aURL.Path = ::rtl::OUString::createFromAscii( pSlot->GetUnoName() ); + aURL.Path = OUString::createFromAscii( pSlot->GetUnoName() ); aCmd += aURL.Path; aURL.Complete = aCmd; aURL.Main = aCmd; // try to get a dispatch object for this command - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) { // test the dispatch object if it is just a wrapper for a SfxDispatcher diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 69be29dbc251..ae9a343754d9 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -325,9 +325,9 @@ BitmapEx TemplateAbstractView::fetchThumbnail (const OUString &msURL, long width { OSL_TRACE ( "caught exception while trying to access Thumbnail/thumbnail.png of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } @@ -355,9 +355,9 @@ BitmapEx TemplateAbstractView::fetchThumbnail (const OUString &msURL, long width { OSL_TRACE ( "caught exception while trying to access Thumbnails/thumbnail.png of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -365,9 +365,9 @@ BitmapEx TemplateAbstractView::fetchThumbnail (const OUString &msURL, long width { OSL_TRACE ( "caught exception while trying to access tuhmbnail of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 9ceb12809e15..28b51cd79c53 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -806,7 +806,7 @@ bool TemplateLocalView::isTemplateNameUnique(const sal_uInt16 nRegionItemId, con return true; } -bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle) +bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, OUString sNewTitle) { sal_uInt16 nRegionId = 0; sal_uInt16 nDocId = USHRT_MAX; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 39b1ce8f0511..051d828fd0ca 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -1252,7 +1252,7 @@ void ThumbnailView::sortItems (const boost::functionGetAccessibleName(); @@ -260,7 +260,7 @@ lang::Locale SAL_CALL ThumbnailViewAcc::getLocale() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); @@ -601,7 +601,7 @@ void ThumbnailViewAcc::ThrowIfDisposed (void) { OSL_TRACE ("Calling disposed object. Throwing exception:"); throw lang::DisposedException ( - ::rtl::OUString("object has been already disposed"), + OUString("object has been already disposed"), static_cast(this)); } else @@ -712,17 +712,17 @@ sal_Int16 SAL_CALL ThumbnailViewItemAcc::getAccessibleRole() return accessibility::AccessibleRole::LIST_ITEM; } -::rtl::OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleDescription() +OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleDescription() throw (uno::RuntimeException) { - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleName() +OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleName() throw (uno::RuntimeException) { const SolarMutexGuard aSolarGuard; - rtl::OUString aRet; + OUString aRet; if( mpParent ) { @@ -730,7 +730,7 @@ sal_Int16 SAL_CALL ThumbnailViewItemAcc::getAccessibleRole() if( aRet.isEmpty() ) { - rtl::OUStringBuffer aBuffer("Item "); + OUStringBuffer aBuffer("Item "); aBuffer.append(static_cast(mpParent->mnId)); aRet = aBuffer.makeStringAndClear(); } @@ -779,7 +779,7 @@ lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException) { const SolarMutexGuard aSolarGuard; - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 612cf7dfcba6..6794ceca11bc 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -97,8 +97,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -206,8 +206,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index 2a83bc175774..4dac397439f1 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -185,7 +185,7 @@ void ThumbnailViewItem::updateTitleEditSize() mpTitleED->SetPosSizePixel(aPos, aSize); } -void ThumbnailViewItem::setTitle (const rtl::OUString& rTitle) +void ThumbnailViewItem::setTitle (const OUString& rTitle) { if (mrParent.renameItem(this, rTitle)) maTitle = rTitle; @@ -288,13 +288,13 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc pProcessor->process(aSeq); } -void ThumbnailViewItem::addTextPrimitives (const rtl::OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, Primitive2DSequence& rSeq) +void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, Primitive2DSequence& rSeq) { drawinglayer::primitive2d::TextLayouterDevice aTextDev; aPos.setY(aPos.getY() + aTextDev.getTextHeight()); - rtl::OUString aText (rText); + OUString aText (rText); TextEngine aTextEngine; aTextEngine.SetMaxTextWidth(maDrawArea.getWidth()); @@ -314,7 +314,7 @@ void ThumbnailViewItem::addTextPrimitives (const rtl::OUString& rText, const Thu if (bTooLong && (nLineLength + nLineStart) < rText.getLength()) { // Add the '...' to the last line to show, even though it may require to shorten the line - double nDotsWidth = aTextDev.getTextWidth(rtl::OUString("..."),0,3); + double nDotsWidth = aTextDev.getTextWidth(OUString("..."),0,3); sal_uInt16 nLength = nLineLength - 1; while ( nDotsWidth + aTextDev.getTextWidth(aText, nLineStart, nLength) > maDrawArea.getWidth() && nLength > 0) diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 11047ab1e8c7..9f30889f9310 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -161,9 +161,9 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame: rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( pCtrlItem->GetId(), nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( pCtrlItem->GetId(), sTemp ); } @@ -219,7 +219,7 @@ void SfxUnoControllerItem::GetNewDispatch() ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = rFrame.GetFrameInterface(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, ::com::sun::star::uno::UNO_QUERY ); if ( xProv.is() ) - xDispatch = xProv->queryDispatch( aCommand, ::rtl::OUString(), 0 ); + xDispatch = xProv->queryDispatch( aCommand, OUString(), 0 ); } if ( xDispatch.is() ) @@ -243,7 +243,7 @@ void SfxUnoControllerItem::GetNewDispatch() ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = pFrame->GetFrameInterface(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, ::com::sun::star::uno::UNO_QUERY ); if ( xProv.is() ) - xDisp = xProv->queryDispatch( aCommand, ::rtl::OUString(), 0 ); + xDisp = xProv->queryDispatch( aCommand, OUString(), 0 ); } return xDisp; @@ -423,9 +423,9 @@ sal_Bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::UR return sal_False; } -rtl::OUString SfxOfficeDispatch::GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ) +OUString SfxOfficeDispatch::GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ) { - rtl::OUString aMasterCommand; + OUString aMasterCommand; if ( IsMasterUnoCommand( aURL )) { sal_Int32 nIndex = aURL.Path.indexOf( '.' ); @@ -454,9 +454,9 @@ SfxDispatchController_Impl::SfxDispatchController_Impl( { if ( aDispatchURL.Protocol == "slot:" && pUnoName ) { - rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(".uno:")); + OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(".uno:")); aTmp.append(pUnoName); - aDispatchURL.Complete = ::rtl::OStringToOUString(aTmp.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); + aDispatchURL.Complete = OStringToOUString(aTmp.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aDispatchURL ); } @@ -516,23 +516,23 @@ void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util sal_Int32 nQueryIndex = aURL.Complete.indexOf( '?' ); if ( nQueryIndex > 0 ) { - rtl::OUString aParamString( aURL.Complete.copy( nQueryIndex+1 )); + OUString aParamString( aURL.Complete.copy( nQueryIndex+1 )); sal_Int32 nIndex = 0; do { - rtl::OUString aToken = aParamString.getToken( 0, '&', nIndex ); + OUString aToken = aParamString.getToken( 0, '&', nIndex ); sal_Int32 nParmIndex = 0; - rtl::OUString aParamType; - rtl::OUString aParamName = aToken.getToken( 0, '=', nParmIndex ); - rtl::OUString aValue = (nParmIndex!=-1) ? aToken.getToken( 0, '=', nParmIndex ) : ::rtl::OUString(); + OUString aParamType; + OUString aParamName = aToken.getToken( 0, '=', nParmIndex ); + OUString aValue = (nParmIndex!=-1) ? aToken.getToken( 0, '=', nParmIndex ) : OUString(); if ( !aParamName.isEmpty() ) { nParmIndex = 0; aToken = aParamName; - aParamName = (nParmIndex!=-1) ? aToken.getToken( 0, ':', nParmIndex ) : ::rtl::OUString(); - aParamType = (nParmIndex!=-1) ? aToken.getToken( 0, ':', nParmIndex ) : ::rtl::OUString(); + aParamName = (nParmIndex!=-1) ? aToken.getToken( 0, ':', nParmIndex ) : OUString(); + aParamType = (nParmIndex!=-1) ? aToken.getToken( 0, ':', nParmIndex ) : OUString(); } sal_Int32 nLen = rArgs.getLength(); @@ -577,7 +577,7 @@ void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_STRING], 6 )) { // STRING support - rArgs[nLen].Value <<= rtl::OUString( INetURLObject::decode( aValue, '%', INetURLObject::DECODE_WITH_CHARSET )); + rArgs[nLen].Value <<= OUString( INetURLObject::decode( aValue, '%', INetURLObject::DECODE_WITH_CHARSET )); } else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_DOUBLE], 6)) { @@ -595,9 +595,9 @@ SfxMapUnit SfxDispatchController_Impl::GetCoreMetric( SfxItemPool& rPool, sal_uI return rPool.GetMetric( nWhich ); } -rtl::OUString SfxDispatchController_Impl::getSlaveCommand( const ::com::sun::star::util::URL& rURL ) +OUString SfxDispatchController_Impl::getSlaveCommand( const ::com::sun::star::util::URL& rURL ) { - rtl::OUString aSlaveCommand; + OUString aSlaveCommand; sal_Int32 nIndex = rURL.Path.indexOf( '.' ); if (( nIndex > 0 ) && ( nIndex < rURL.Path.getLength() )) aSlaveCommand = rURL.Path.copy( nIndex+1 ); @@ -676,7 +676,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util // so we must retrieve this as an argument from the parsed URL lNewArgs.realloc( lNewArgs.getLength()+1 ); nMarkArg = lNewArgs.getLength()-1; - lNewArgs[nMarkArg].Name = ::rtl::OUString("Bookmark"); + lNewArgs[nMarkArg].Name = OUString("Bookmark"); lNewArgs[nMarkArg].Value <<= aURL.Mark; } @@ -710,7 +710,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util // have a argument that has the same name as the master slot and type is SfxStringItem. sal_Int32 nIndex = lNewArgs.getLength(); lNewArgs.realloc( nIndex+1 ); - lNewArgs[nIndex].Name = rtl::OUString::createFromAscii( pSlot->pUnoName ); + lNewArgs[nIndex].Name = OUString::createFromAscii( pSlot->pUnoName ); lNewArgs[nIndex].Value = makeAny( SfxDispatchController_Impl::getSlaveCommand( aDispatchURL )); } diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 65f393496ed3..5fedbc3ff620 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -48,7 +48,7 @@ using namespace ::rtl; class SfxModelessDialog_Impl : public SfxListener { public: - rtl::OString aWinState; + OString aWinState; SfxChildWindow* pMgr; sal_Bool bConstructed; void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -72,7 +72,7 @@ void SfxModelessDialog_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) class SfxFloatingWindow_Impl : public SfxListener { public: - rtl::OString aWinState; + OString aWinState; SfxChildWindow* pMgr; sal_Bool bConstructed; Timer aMoveTimer; @@ -120,7 +120,7 @@ void SfxModalDialog::GetDialogData_Impl() if ( aDlgOpt.Exists() ) { // load settings - SetWindowState( rtl::OUStringToOString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); + SetWindowState( OUStringToOString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); Any aUserItem = aDlgOpt.GetUserItem( USERITEM_NAME ); OUString aTemp; if ( aUserItem >>= aTemp ) @@ -153,7 +153,7 @@ SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId ) init(); } -SfxModalDialog::SfxModalDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ) +SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : ModalDialog(pParent, rID, rUIXMLDescription), nUniqId(0), //todo pInputSet(0), @@ -332,8 +332,8 @@ SfxModelessDialog::SfxModelessDialog(SfxBindings *pBindinx, } SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx, - SfxChildWindow *pCW, Window *pParent, const rtl::OString& rID, - const rtl::OUString& rUIXMLDescription) + SfxChildWindow *pCW, Window *pParent, const OString& rID, + const OUString& rUIXMLDescription) : ModelessDialog(pParent, rID, rUIXMLDescription) { Init(pBindinx, pCW); @@ -368,7 +368,7 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt ) pBindings->SetActiveFrame( pImp->pMgr->GetFrame() ); pImp->pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - rtl::OString sHelpId; + OString sHelpId; while ( sHelpId.isEmpty() && pWindow ) { sHelpId = pWindow->GetHelpId(); @@ -466,7 +466,7 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt ) pBindings->SetActiveFrame( pImp->pMgr->GetFrame() ); pImp->pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - rtl::OString sHelpId; + OString sHelpId; while ( sHelpId.isEmpty() && pWindow ) { sHelpId = pWindow->GetHelpId(); diff --git a/sfx2/source/dialog/bluthsnd.cxx b/sfx2/source/dialog/bluthsnd.cxx index e7266622ce8d..6b6f1773f9cf 100644 --- a/sfx2/source/dialog/bluthsnd.cxx +++ b/sfx2/source/dialog/bluthsnd.cxx @@ -38,13 +38,13 @@ #include "bluthsndapi.hxx" SfxBluetoothModel::SendMailResult SfxBluetoothModel::SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& rType ) + const OUString& rType ) { SaveResult eSaveResult; SendMailResult eResult = SEND_MAIL_ERROR; - rtl::OUString aFileName; + OUString aFileName; - eSaveResult = SaveDocumentAsFormat( rtl::OUString(), xFrame, rType, aFileName ); + eSaveResult = SaveDocumentAsFormat( OUString(), xFrame, rType, aFileName ); if( eSaveResult == SAVE_SUCCESSFULL ) { maAttachedDocuments.push_back( aFileName ); @@ -60,8 +60,8 @@ SfxBluetoothModel::SendMailResult SfxBluetoothModel::Send( const ::com::sun::sta { char bthsend[300]; SendMailResult eResult = SEND_MAIL_OK; - rtl::OUString aFileName = maAttachedDocuments[0]; - snprintf(bthsend,300,"bluetooth-sendto %s",rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8).getStr() ); + OUString aFileName = maAttachedDocuments[0]; + snprintf(bthsend,300,"bluetooth-sendto %s",OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8).getStr() ); if( !system( bthsend ) ) eResult = SEND_MAIL_ERROR; return eResult; diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx index a2bac2570771..cbe1c620eaec 100644 --- a/sfx2/source/dialog/checkin.cxx +++ b/sfx2/source/dialog/checkin.cxx @@ -20,7 +20,7 @@ SfxCheckinDialog::SfxCheckinDialog( Window* pParent ) : m_pOKBtn->SetClickHdl( LINK( this, SfxCheckinDialog, OKHdl ) ); } -rtl::OUString SfxCheckinDialog::GetComment( ) +OUString SfxCheckinDialog::GetComment( ) { return m_pCommentED->GetText( ); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 86461460f2aa..b198ca24822b 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -79,10 +79,10 @@ const sal_uInt16 FONT_PAGE_ID = 99; struct CustomProperty { - ::rtl::OUString m_sName; + OUString m_sName; com::sun::star::uno::Any m_aValue; - CustomProperty( const ::rtl::OUString& sName, + CustomProperty( const OUString& sName, const com::sun::star::uno::Any& rValue ) : m_sName( sName ), m_aValue( rValue ) {} @@ -117,7 +117,7 @@ namespace { String CreateSizeText( sal_Int64 nSize ) { - String aUnitStr = rtl::OUString(' '); + String aUnitStr = OUString(' '); aUnitStr += SfxResId(STR_BYTES).toString(); sal_Int64 nSize1 = nSize; sal_Int64 nSize2 = nSize1; @@ -179,7 +179,7 @@ String ConvertDateTime_Impl( const String& rName, String aStr( rWrapper.getDate( aD ) ); aStr += pDelim; aStr += rWrapper.getTime( aT, sal_True, sal_False ); - rtl::OUString aAuthor = comphelper::string::stripStart(rName, ' '); + OUString aAuthor = comphelper::string::stripStart(rName, ' '); if (!aAuthor.isEmpty()) { aStr += pDelim; @@ -347,15 +347,15 @@ int SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const } //------------------------------------------------------------------------ -void SfxDocumentInfoItem::resetUserData(const ::rtl::OUString & i_rAuthor) +void SfxDocumentInfoItem::resetUserData(const OUString & i_rAuthor) { setAuthor(i_rAuthor); DateTime now( DateTime::SYSTEM ); setCreationDate( util::DateTime( now.Get100Sec(), now.GetSec(), now.GetMin(), now.GetHour(), now.GetDay(), now.GetMonth(), now.GetYear() ) ); - setModifiedBy(::rtl::OUString()); - setPrintedBy(::rtl::OUString()); + setModifiedBy(OUString()); + setPrintedBy(OUString()); setModificationDate(util::DateTime()); setPrintDate(util::DateTime()); setEditingDuration(0); @@ -372,7 +372,7 @@ void SfxDocumentInfoItem::UpdateDocumentInfo( i_xDocProps->setAutoloadURL(getAutoloadURL()); } else { i_xDocProps->setAutoloadSecs(0); - i_xDocProps->setAutoloadURL(::rtl::OUString()); + i_xDocProps->setAutoloadURL(OUString()); } i_xDocProps->setDefaultTarget(getDefaultTarget()); i_xDocProps->setAuthor(getAuthor()); @@ -475,7 +475,7 @@ void SfxDocumentInfoItem::ClearCustomProperties() m_aCustomProperties.clear(); } -void SfxDocumentInfoItem::AddCustomProperty( const ::rtl::OUString& sName, const Any& rValue ) +void SfxDocumentInfoItem::AddCustomProperty( const OUString& sName, const Any& rValue ) { CustomProperty* pProp = new CustomProperty( sName, rValue ); m_aCustomProperties.push_back( pProp ); @@ -534,7 +534,7 @@ bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const } if ( bIsString ) - rVal <<= ::rtl::OUString( aValue ); + rVal <<= OUString( aValue ); else if ( bIsInt ) rVal <<= nValue; else @@ -544,7 +544,7 @@ bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId ) { - ::rtl::OUString aValue; + OUString aValue; sal_Int32 nValue=0; sal_Bool bValue = sal_False; bool bRet = false; @@ -784,7 +784,7 @@ SfxDocumentPage::SfxDocumentPage(Window* pParent, const SfxItemSet& rItemSet) // on the main list enable/disable the pushbutton accordingly SvtCommandOptions aCmdOptions; if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( DOCUMENT_SIGNATURE_MENU_CMD ) ) ) ) + OUString( RTL_CONSTASCII_USTRINGPARAM( DOCUMENT_SIGNATURE_MENU_CMD ) ) ) ) m_pSignatureBtn->Disable(); } @@ -806,7 +806,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl) m_pPrintValFt->SetText( aEmpty ); const Time aTime( 0 ); m_pTimeLogValFt->SetText( rLocaleWrapper.getDuration( aTime ) ); - m_pDocNoValFt->SetText(rtl::OUString('1')); + m_pDocNoValFt->SetText(OUString('1')); bHandleDelete = sal_True; return 0; } @@ -838,7 +838,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl) if (!pFilter) break; - rtl::OUString aDocName; + OUString aDocName; sfx2::RequestPassword(pFilter, aDocName, pMedSet); pShell->SetModified(true); } @@ -865,7 +865,7 @@ void SfxDocumentPage::ImplUpdateSignatures() s = m_aMultiSignedStr; else if ( aInfos.getLength() == 1 ) { - rtl::OUString aCN_Id("CN"); + OUString aCN_Id("CN"); const security::DocumentSignatureInformation& rInfo = aInfos[ 0 ]; s = GetDateTimeString( rInfo.SignatureDate, rInfo.SignatureTime ); s.AppendAscii( ", " ); @@ -952,7 +952,7 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) SfxDocumentInfoItem newItem( *m_pInfoItem ); newItem.resetUserData( bUseAuthor ? SvtUserOptions().GetFullName() - : ::rtl::OUString() ); + : OUString() ); m_pInfoItem->SetUseUserData( STATE_CHECK == m_pUseUserDataCB->GetState() ); newItem.SetUseUserData( STATE_CHECK == m_pUseUserDataCB->GetState() ); @@ -1290,14 +1290,14 @@ void CustomPropertiesDurationField::RequestHelp( const HelpEvent& rHEvt ) void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration ) { m_aDuration = rDuration; - String sText(rDuration.Negative ? rtl::OUString('-') : rtl::OUString('+')); + String sText(rDuration.Negative ? OUString('-') : OUString('+')); sText += m_pLine->m_sDurationFormat; - sText.SearchAndReplace(rtl::OUString("%1"), OUString::number( rDuration.Years ) ); - sText.SearchAndReplace(rtl::OUString("%2"), OUString::number( rDuration.Months ) ); - sText.SearchAndReplace(rtl::OUString("%3"), OUString::number( rDuration.Days ) ); - sText.SearchAndReplace(rtl::OUString("%4"), OUString::number( rDuration.Hours ) ); - sText.SearchAndReplace(rtl::OUString("%5"), OUString::number( rDuration.Minutes) ); - sText.SearchAndReplace(rtl::OUString("%6"), OUString::number( rDuration.Seconds) ); + sText.SearchAndReplace(OUString("%1"), OUString::number( rDuration.Years ) ); + sText.SearchAndReplace(OUString("%2"), OUString::number( rDuration.Months ) ); + sText.SearchAndReplace(OUString("%3"), OUString::number( rDuration.Days ) ); + sText.SearchAndReplace(OUString("%4"), OUString::number( rDuration.Hours ) ); + sText.SearchAndReplace(OUString("%5"), OUString::number( rDuration.Minutes) ); + sText.SearchAndReplace(OUString("%6"), OUString::number( rDuration.Seconds) ); SetText( sText ); } @@ -1666,7 +1666,7 @@ void CustomPropertiesWindow::updateLineWidth() } } -void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny ) +void CustomPropertiesWindow::AddLine( const OUString& sName, Any& rAny ) { CustomPropertyLine* pNewLine = new CustomPropertyLine( this ); pNewLine->m_aTypeBox.SetSelectHdl( LINK( this, CustomPropertiesWindow, TypeHdl ) ); @@ -1711,7 +1711,7 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny ) double nTmpValue = 0; bool bTmpValue = false; - ::rtl::OUString sTmpValue; + OUString sTmpValue; util::DateTime aTmpDateTime; util::Date aTmpDate; util::Duration aTmpDuration; @@ -1883,7 +1883,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c } else { - ::rtl::OUString sValue( pLine->m_aValueEdit.GetText() ); + OUString sValue( pLine->m_aValueEdit.GetText() ); aPropertiesSeq[i].Value <<= makeAny( sValue ); } } @@ -1992,7 +1992,7 @@ IMPL_LINK_NOARG(CustomPropertiesControl, RemovedHdl) return 0; } -void CustomPropertiesControl::AddLine( const ::rtl::OUString& sName, Any& rAny, bool bInteractive ) +void CustomPropertiesControl::AddLine( const OUString& sName, Any& rAny, bool bInteractive ) { m_pPropertiesWin->AddLine( sName, rAny ); m_pVertScroll->SetRangeMax( m_pPropertiesWin->GetVisibleLineCount() + 1 ); @@ -2012,7 +2012,7 @@ SfxCustomPropertiesPage::SfxCustomPropertiesPage( Window* pParent, const SfxItem IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl) { Any aAny; - m_pPropertiesCtrl->AddLine( ::rtl::OUString(), aAny, true ); + m_pPropertiesCtrl->AddLine( OUString(), aAny, true ); return 0; } diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 9c126122f7c9..4affce8ea377 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -89,11 +89,11 @@ namespace { struct WindowState { - ::rtl::OUString sTitle; + OUString sTitle; }; } -static bool lcl_getWindowState( const uno::Reference< container::XNameAccess >& xWindowStateMgr, const ::rtl::OUString& rResourceURL, WindowState& rWindowState ) +static bool lcl_getWindowState( const uno::Reference< container::XNameAccess >& xWindowStateMgr, const OUString& rResourceURL, WindowState& rWindowState ) { bool bResult = false; @@ -130,7 +130,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , : SfxChildWindow( pParentWnd , nId ) { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - const rtl::OUString aDockWindowResourceURL( "private:resource/dockingwindow/" ); + const OUString aDockWindowResourceURL( "private:resource/dockingwindow/" ); SfxTitleDockingWindow* pTitleDockWindow = new SfxTitleDockingWindow( pBindings, this, pParentWnd, WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE); @@ -145,14 +145,14 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , uno::Reference< frame::XFrame > xFrame( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); uno::Sequence< uno::Any > aArgs(2); beans::PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( "Frame" ); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value = uno::makeAny( xFrame ); aArgs[0] <<= aPropValue; - aPropValue.Name = rtl::OUString( "ResourceURL" ); + aPropValue.Name = OUString( "ResourceURL" ); // create a resource URL from the nId provided by the sfx2 - ::rtl::OUString aResourceURL( aDockWindowResourceURL ); - aResourceURL += ::rtl::OUString::valueOf(sal_Int32(nId)); + OUString aResourceURL( aDockWindowResourceURL ); + aResourceURL += OUString::valueOf(sal_Int32(nId)); aPropValue.Value = uno::makeAny( aResourceURL ); aArgs[1] <<= aPropValue; @@ -181,7 +181,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , m_xWindowStateConfiguration = xWindowStateConfiguration; } - ::rtl::OUString sModuleIdentifier = xModuleManager->identify( xFrame ); + OUString sModuleIdentifier = xModuleManager->identify( xFrame ); uno::Reference< container::XNameAccess > xModuleWindowState( xWindowStateConfiguration->getByName( sModuleIdentifier ), @@ -350,7 +350,7 @@ static SfxWorkWindow* lcl_getWorkWindowFromXFrame( const uno::Reference< frame:: The string rDockingWindowName MUST BE a valid ID! The ID is pre-defined by a certain slot range located in sfxsids.hrc (currently SID_DOCKWIN_START = 9800). */ -void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName ) +void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rFrame, const OUString& rDockingWindowName ) { SolarMutexGuard aGuard; sal_uInt16 nID = sal_uInt16(rDockingWindowName.toInt32()); @@ -376,7 +376,7 @@ void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rF a special name. The string rDockingWindowName MUST BE a valid ID! The ID is pre-defined by a certain slot range located in sfxsids.hrc (currently SID_DOCKWIN_START = 9800). */ -bool SAL_CALL IsDockingWindowVisible( const uno::Reference< frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName ) +bool SAL_CALL IsDockingWindowVisible( const uno::Reference< frame::XFrame >& rFrame, const OUString& rDockingWindowName ) { SolarMutexGuard aGuard; @@ -421,7 +421,7 @@ friend class SfxDockingWindow; sal_uInt16 nDockPos; sal_Bool bNewLine; sal_Bool bDockingPrevented; - rtl::OString aWinState; + OString aWinState; SfxChildAlignment GetLastAlignment() const { return eLastAlignment; } @@ -874,7 +874,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); if ( pSlot ) { - rtl::OString aCmd("SFXDOCKINGWINDOW_"); + OString aCmd("SFXDOCKINGWINDOW_"); aCmd += pSlot->GetUnoName(); SetUniqueId( aCmd ); } @@ -925,7 +925,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); if ( pSlot ) { - rtl::OString aCmd("SFXDOCKINGWINDOW_"); + OString aCmd("SFXDOCKINGWINDOW_"); aCmd += pSlot->GetUnoName(); SetUniqueId( aCmd ); } @@ -1782,7 +1782,7 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt ) pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - rtl::OString sHelpId; + OString sHelpId; while ( sHelpId.isEmpty() && pWindow ) { sHelpId = pWindow->GetHelpId(); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 1712f5108561..ee8da3dc9b8f 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -218,7 +218,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve { //!!! todo: cache the help strings (here or TRA) - rtl::OString sHelpId; + OString sHelpId; // mapping from element id -> help id switch ( aEvent.ElementId ) { @@ -276,7 +276,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve OUString aHelpText; Help* pHelp = Application::GetHelp(); if ( pHelp ) - aHelpText = String( pHelp->GetHelpText( rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), NULL ) ); + aHelpText = String( pHelp->GetHelpText( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), NULL ) ); return aHelpText; } @@ -422,7 +422,7 @@ sal_Bool FileDialogHelper_Impl::CheckFilterOptionsCapability( const SfxFilter* _ Any aAny = mxFilterCFG->getByName( _pFilter->GetName() ); if ( aAny >>= aProps ) { - ::rtl::OUString aServiceName; + OUString aServiceName; sal_Int32 nPropertyCount = aProps.getLength(); for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty ) { @@ -524,7 +524,7 @@ void FileDialogHelper_Impl::updateSelectionBox() uno::Reference< XControlInformation > xCtrlInfo( mxFileDlg, UNO_QUERY ); if ( xCtrlInfo.is() ) { - Sequence< ::rtl::OUString > aCtrlList = xCtrlInfo->getSupportedControls(); + Sequence< OUString > aCtrlList = xCtrlInfo->getSupportedControls(); sal_uInt32 nCount = aCtrlList.getLength(); for ( sal_uInt32 nCtrl = 0; nCtrl < nCount; ++nCtrl ) if ( aCtrlList[ nCtrl ] == "SelectionBox" ) @@ -890,7 +890,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( sal_Int16 nDialog, Window* _pPreferredParentWindow, const String& sStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) :m_nDialogType ( nDialogType ) ,meContext ( FileDialogHelper::UNKNOWN_CONTEXT ) @@ -902,7 +902,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( pServiceName = FILE_OPEN_SERVICE_NAME_OOO; else pServiceName = "com.sun.star.ui.dialogs.FilePicker"; - OUString aService = ::rtl::OUString::createFromAscii( pServiceName ); + OUString aService = OUString::createFromAscii( pServiceName ); uno::Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); @@ -1065,26 +1065,26 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( else { aInitArguments[0] <<= NamedValue( - ::rtl::OUString( "TemplateDescription" ), + OUString( "TemplateDescription" ), makeAny( nTemplateDescription ) ); - ::rtl::OUString sStandardDirTemp = ::rtl::OUString( sStandardDir ); + OUString sStandardDirTemp = OUString( sStandardDir ); aInitArguments[1] <<= NamedValue( - ::rtl::OUString( "StandardDir" ), + OUString( "StandardDir" ), makeAny( sStandardDirTemp ) ); aInitArguments[2] <<= NamedValue( - ::rtl::OUString( "BlackList" ), + OUString( "BlackList" ), makeAny( rBlackList ) ); if ( mpPreferredParentWindow ) aInitArguments[3] <<= NamedValue( - ::rtl::OUString( "ParentWindow" ), + OUString( "ParentWindow" ), makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) ) ); } @@ -1207,16 +1207,16 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con // forward these ids to the file picker try { - const ::rtl::OUString sHelpIdPrefix( INET_HID_SCHEME ); + const OUString sHelpIdPrefix( INET_HID_SCHEME ); // the ids for the single controls uno::Reference< XFilePickerControlAccess > xControlAccess( mxFileDlg, UNO_QUERY ); if ( xControlAccess.is() ) { while ( *_pControlId ) { - DBG_ASSERT( INetURLObject( rtl::OStringToOUString( *_pHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); - ::rtl::OUString sId( sHelpIdPrefix ); - sId += ::rtl::OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 ); + DBG_ASSERT( INetURLObject( OStringToOUString( *_pHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); + OUString sId( sHelpIdPrefix ); + sId += OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 ); xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) ); ++_pControlId; ++_pHelpId; @@ -1372,20 +1372,20 @@ void FileDialogHelper_Impl::implStartExecute() } // ------------------------------------------------------------------------ -void lcl_saveLastURLs(std::vector& rpURLList, - ::comphelper::SequenceAsVector< ::rtl::OUString >& lLastURLs ) +void lcl_saveLastURLs(std::vector& rpURLList, + ::comphelper::SequenceAsVector< OUString >& lLastURLs ) { lLastURLs.clear(); - for(std::vector::iterator i = rpURLList.begin(); i != rpURLList.end(); ++i) + for(std::vector::iterator i = rpURLList.begin(); i != rpURLList.end(); ++i) lLastURLs.push_back(*i); } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterface >& xPicker, std::vector& rpURLList, const SfxFilter* pFilter) +void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterface >& xPicker, std::vector& rpURLList, const SfxFilter* pFilter) { rpURLList.clear(); - rtl::OUString sExtension; + OUString sExtension; if (pFilter) { sExtension = pFilter->GetDefaultExtension (); @@ -1434,7 +1434,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterfac } // ------------------------------------------------------------------------ -ErrCode FileDialogHelper_Impl::execute( std::vector& rpURLList, +ErrCode FileDialogHelper_Impl::execute( std::vector& rpURLList, SfxItemSet *& rpSet, String& rFilter ) { @@ -1565,7 +1565,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector& rpURLList, if ( ( aValue >>= bPassWord ) && bPassWord ) { // ask for a password - rtl::OUString aDocName(rpURLList[0]); + OUString aDocName(rpURLList[0]); ErrCode errCode = RequestPassword(pCurrentFilter, aDocName, rpSet); if (errCode != ERRCODE_NONE) return errCode; @@ -1662,7 +1662,7 @@ void FileDialogHelper_Impl::verifyPath() url.insertName( maFileName, false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL); - rtl::OUString sysPathU; + OUString sysPathU; osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL( url.GetMainURL(INetURLObject::NO_DECODE), sysPathU); if (e != osl::FileBase::E_None) { @@ -1673,7 +1673,7 @@ void FileDialogHelper_Impl::verifyPath() << +e); return; } - rtl::OString sysPathC; + OString sysPathC; if (!sysPathU.convertToString( &sysPathC, osl_getThreadTextEncoding(), (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR @@ -1700,7 +1700,7 @@ void FileDialogHelper_Impl::verifyPath() } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath ) +void FileDialogHelper_Impl::displayFolder( const OUString& _rPath ) { if ( _rPath.isEmpty() ) // nothing to do @@ -1722,7 +1722,7 @@ void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath ) } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setFileName( const ::rtl::OUString& _rFile ) +void FileDialogHelper_Impl::setFileName( const OUString& _rFile ) { maFileName = _rFile; if ( mxFileDlg.is() ) @@ -1798,7 +1798,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory, uno::Reference< XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); uno::Reference< XContainerQuery > xFilterCont( - xSMGR->createInstance(::rtl::OUString("com.sun.star.document.FilterFactory")), + xSMGR->createInstance(OUString("com.sun.star.document.FilterFactory")), UNO_QUERY); if ( ! xFilterCont.is() ) return; @@ -1807,14 +1807,14 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory, m_nDontFlags |= nDont; // create the list of filters - ::rtl::OUStringBuffer sQuery(256); + OUStringBuffer sQuery(256); sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM("getSortedFilterList()")); sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":module=")); sQuery.append(rFactory); // use long name here ! sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":iflags=")); - sQuery.append(::rtl::OUString::valueOf((sal_Int32)m_nMustFlags)); + sQuery.append(OUString::valueOf((sal_Int32)m_nMustFlags)); sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":eflags=")); - sQuery.append(::rtl::OUString::valueOf((sal_Int32)m_nDontFlags)); + sQuery.append(OUString::valueOf((sal_Int32)m_nDontFlags)); uno::Reference< XEnumeration > xResult; try @@ -1832,7 +1832,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory, mbDeleteMatcher = sal_False; // append the filters - ::rtl::OUString sFirstFilter; + OUString sFirstFilter; if (OPEN == lcl_OpenOrSave(m_nDialogType)) ::sfx2::appendFiltersForOpen( aIter, xFltMgr, sFirstFilter, *this ); else if ( mbExport ) @@ -2052,7 +2052,7 @@ void FileDialogHelper_Impl::saveConfig() // ------------------------------------------------------------------------ namespace { - static ::rtl::OUString getInitPath( const String& _rFallback, const xub_StrLen _nFallbackToken ) + static OUString getInitPath( const String& _rFallback, const xub_StrLen _nFallbackToken ) { SfxApplication *pSfxApp = SFX_APP(); String sPath = pSfxApp->GetLastDir_Impl(); @@ -2291,7 +2291,7 @@ FileDialogHelper::FileDialogHelper( SfxFilterFlags nMust, SfxFilterFlags nDont, const String& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, nDialog, NULL, rStandardDir, rBlackList ); mxImp = mpImp; @@ -2315,28 +2315,28 @@ FileDialogHelper::FileDialogHelper( FileDialogHelper::FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - const ::rtl::OUString& aFilterUIName, - const ::rtl::OUString& aExtName, - const ::rtl::OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList, + const OUString& aFilterUIName, + const OUString& aExtName, + const OUString& rStandardDir, + const ::com::sun::star::uno::Sequence< OUString >& rBlackList, Window* _pPreferredParent ) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, _pPreferredParent,rStandardDir, rBlackList ); mxImp = mpImp; // the wildcard here is expected in form "*.extension" - ::rtl::OUString aWildcard; + OUString aWildcard; if ( aExtName.indexOf( (sal_Unicode)'*' ) != 0 ) { if ( !aExtName.isEmpty() && aExtName.indexOf( (sal_Unicode)'.' ) != 0 ) - aWildcard = ::rtl::OUString( "*." ); + aWildcard = OUString( "*." ); else - aWildcard = ::rtl::OUString( "*" ); + aWildcard = OUString( "*" ); } aWildcard += aExtName; - ::rtl::OUString const aUIString = ::sfx2::addExtension( aFilterUIName, + OUString const aUIString = ::sfx2::addExtension( aFilterUIName, aWildcard, (OPEN == lcl_OpenOrSave(mpImp->m_nDialogType)), *mpImp); AddFilter( aUIString, aWildcard ); } @@ -2377,7 +2377,7 @@ IMPL_LINK_NOARG(FileDialogHelper, ExecuteSystemFilePicker) // ------------------------------------------------------------------------ // rDirPath has to be a directory -ErrCode FileDialogHelper::Execute( std::vector& rpURLList, +ErrCode FileDialogHelper::Execute( std::vector& rpURLList, SfxItemSet *& rpSet, String& rFilter, const String& rDirPath ) @@ -2398,7 +2398,7 @@ ErrCode FileDialogHelper::Execute( SfxItemSet *& rpSet, String& rFilter ) { ErrCode nRet; - std::vector rURLList; + std::vector rURLList; nRet = mpImp->execute(rURLList, rpSet, rFilter); return nRet; } @@ -2481,10 +2481,10 @@ Sequence < OUString > FileDialogHelper::GetMPath() const } // ------------------------------------------------------------------------ -Sequence< ::rtl::OUString > FileDialogHelper::GetSelectedFiles() const +Sequence< OUString > FileDialogHelper::GetSelectedFiles() const { // a) the new way (optional!) - uno::Sequence< ::rtl::OUString > aResultSeq; + uno::Sequence< OUString > aResultSeq; uno::Reference< XFilePicker2 > xPickNew(mpImp->mxFileDlg, UNO_QUERY); if (xPickNew.is()) { @@ -2498,7 +2498,7 @@ Sequence< ::rtl::OUString > FileDialogHelper::GetSelectedFiles() const ::sal_Int32 nFiles = lFiles.getLength(); if ( nFiles > 1 ) { - aResultSeq = Sequence< ::rtl::OUString >( nFiles-1 ); + aResultSeq = Sequence< OUString >( nFiles-1 ); INetURLObject aPath( lFiles[0] ); aPath.setFinalSlash(); @@ -2510,7 +2510,7 @@ Sequence< ::rtl::OUString > FileDialogHelper::GetSelectedFiles() const else aPath.setName( lFiles[i] ); - aResultSeq[i-1] = ::rtl::OUString(aPath.GetMainURL( INetURLObject::NO_DECODE )); + aResultSeq[i-1] = OUString(aPath.GetMainURL( INetURLObject::NO_DECODE )); } } else @@ -2569,9 +2569,9 @@ void FileDialogHelper::SetDisplayDirectory( const String& _rPath ) INetURLObject aObj( _rPath ); - ::rtl::OUString sFileName = aObj.GetName( INetURLObject::DECODE_WITH_CHARSET ); + OUString sFileName = aObj.GetName( INetURLObject::DECODE_WITH_CHARSET ); aObj.removeSegment(); - ::rtl::OUString sPath = aObj.GetMainURL( INetURLObject::NO_DECODE ); + OUString sPath = aObj.GetMainURL( INetURLObject::NO_DECODE ); int nIsFolder = impl_isFolder( _rPath ); if ( nIsFolder == 0 || @@ -2583,7 +2583,7 @@ void FileDialogHelper::SetDisplayDirectory( const String& _rPath ) else { INetURLObject aObjPathName( _rPath ); - ::rtl::OUString sFolder( aObjPathName.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString sFolder( aObjPathName.GetMainURL( INetURLObject::NO_DECODE ) ); if ( sFolder.isEmpty() ) { // _rPath is not a valid path -> fallback to home directory @@ -2673,13 +2673,13 @@ void SAL_CALL FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent ) ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, sal_Int64 nFlags, const String& rFact, - std::vector& rpURLList, + std::vector& rpURLList, String& rFilter, SfxItemSet *& rpSet, const String* pPath, sal_Int16 nDialog, const String& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { ErrCode nRet; FileDialogHelper aDialog( nDialogType, nFlags, @@ -2695,7 +2695,7 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, return nRet; } -ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, SfxItemSet* pSet) +ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItemSet* pSet) { uno::Reference < task::XInteractionHandler2 > xInteractionHandler = task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 ); // TODO: need a save way to distinguish MS filters from other filters @@ -2723,8 +2723,8 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, Sf if ( aEncryptionKey.getLength() ) { ::comphelper::SequenceAsHashMap aHashData; - aHashData[ ::rtl::OUString( "STD97EncryptionKey" ) ] <<= aEncryptionKey; - aHashData[ ::rtl::OUString( "STD97UniqueID" ) ] <<= aUniqueID; + aHashData[ OUString( "STD97EncryptionKey" ) ] <<= aEncryptionKey; + aHashData[ OUString( "STD97UniqueID" ) ] <<= aUniqueID; pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aHashData.getAsConstNamedValueList() ) ) ); } @@ -2743,7 +2743,7 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, Sf if ( bMSType ) { // the empty password has 0 as Hash - sal_Int32 nHash = SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( "com.sun.star.text.TextDocument" ).equals( pCurrentFilter->GetServiceName() ) ); + sal_Int32 nHash = SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), OUString( "com.sun.star.text.TextDocument" ).equals( pCurrentFilter->GetServiceName() ) ); if ( nHash ) pSet->Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, uno::makeAny( nHash ) ) ); } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 10b8bac3d8cb..2662de1bb53d 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -56,13 +56,13 @@ namespace sfx2 FileDialogHelper* mpAntiImpl; Window* mpPreferredParentWindow; - ::comphelper::SequenceAsVector< ::rtl::OUString > mlLastURLs; + ::comphelper::SequenceAsVector< OUString > mlLastURLs; - ::rtl::OUString maPath; - ::rtl::OUString maFileName; - ::rtl::OUString maCurFilter; - ::rtl::OUString maSelectFilter; - ::rtl::OUString maButtonLabel; + OUString maPath; + OUString maFileName; + OUString maCurFilter; + OUString maSelectFilter; + OUString maButtonLabel; Timer maPreViewTimer; Graphic maGraphic; @@ -103,8 +103,8 @@ namespace sfx2 void addFilters( const String& rFactory, SfxFilterFlags nMust, SfxFilterFlags nDont ); - void addFilter( const ::rtl::OUString& rFilterName, - const ::rtl::OUString& rExtension ); + void addFilter( const OUString& rFilterName, + const OUString& rExtension ); void addGraphicFilter(); void enablePasswordBox( sal_Bool bInit ); void updateFilterOptionsBox(); @@ -120,7 +120,7 @@ namespace sfx2 const SfxFilter* getCurentSfxFilter(); sal_Bool updateExtendedControl( sal_Int16 _nExtendedControlId, sal_Bool _bEnable ); - ErrCode getGraphic( const ::rtl::OUString& rURL, Graphic& rGraphic ) const; + ErrCode getGraphic( const OUString& rURL, Graphic& rGraphic ) const; void setDefaultValues(); void preExecute(); @@ -137,8 +137,8 @@ namespace sfx2 sal_Bool isInOpenMode() const; String getCurrentFilterUIName() const; - void LoadLastUsedFilter( const ::rtl::OUString& _rContextIdentifier ); - void SaveLastUsedFilter( const ::rtl::OUString& _rContextIdentifier ); + void LoadLastUsedFilter( const OUString& _rContextIdentifier ); + void SaveLastUsedFilter( const OUString& _rContextIdentifier ); void SaveLastUsedFilter( void ); void implInitializeFileName( ); @@ -146,7 +146,7 @@ namespace sfx2 void verifyPath( ); void implGetAndCacheFiles( const ::com::sun::star::uno::Reference< XInterface >& xPicker , - std::vector& rpURLList, + std::vector& rpURLList, const SfxFilter* pFilter ); DECL_LINK(TimeOutHdl_Impl, void *); @@ -157,7 +157,7 @@ namespace sfx2 // XFilePickerListener methods virtual void SAL_CALL fileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL directoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL controlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL dialogSizeChanged() throw( ::com::sun::star::uno::RuntimeException ); @@ -170,7 +170,7 @@ namespace sfx2 // handle XFilePickerListener events void handleFileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); void handleDirectoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); - ::rtl::OUString handleHelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); + OUString handleHelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); void handleControlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); void handleDialogSizeChanged(); @@ -181,38 +181,38 @@ namespace sfx2 sal_Int64 nFlags, sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, Window* _pPreferredParentWindow = NULL, - const String& sStandardDir = rtl::OUString(), - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >() + const String& sStandardDir = OUString(), + const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() ); virtual ~FileDialogHelper_Impl(); - ErrCode execute( std::vector& rpURLList, + ErrCode execute( std::vector& rpURLList, SfxItemSet *& rpSet, String& rFilter ); ErrCode execute(); - void setFilter( const ::rtl::OUString& rFilter ); + void setFilter( const OUString& rFilter ); /** sets the directory which should be browsed

      If the given path does not point to a valid (existent and accessible) folder, the request is silently dropped

      */ - void displayFolder( const ::rtl::OUString& rPath ); - void setFileName( const ::rtl::OUString& _rFile ); + void displayFolder( const OUString& rPath ); + void setFileName( const OUString& _rFile ); - ::rtl::OUString getPath() const; - ::rtl::OUString getFilter() const; + OUString getPath() const; + OUString getFilter() const; void getRealFilter( String& _rFilter ) const; ErrCode getGraphic( Graphic& rGraphic ) const; void createMatcher( const String& rFactory ); sal_Bool isShowFilterExtensionEnabled() const; - void addFilterPair( const ::rtl::OUString& rFilter, - const ::rtl::OUString& rFilterWithExtension ); - ::rtl::OUString getFilterName( const ::rtl::OUString& rFilterWithExtension ) const; - ::rtl::OUString getFilterWithExtension( const ::rtl::OUString& rFilter ) const; + void addFilterPair( const OUString& rFilter, + const OUString& rFilterWithExtension ); + OUString getFilterName( const OUString& rFilterWithExtension ) const; + OUString getFilterWithExtension( const OUString& rFilter ) const; void SetContext( FileDialogHelper::Context _eNewContext ); diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 7add2fc0f180..4987d07dd9cf 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -125,35 +125,35 @@ namespace sfx2 typedef ::std::list< FilterGroup > GroupedFilterList; // a list of all filters, already grouped /// the logical name of a filter - typedef ::rtl::OUString FilterName; + typedef OUString FilterName; // a struct which holds references from a logical filter name to a filter group entry // used for quick lookup of classes (means class entries - entries representing a class) // which a given filter may belong to - typedef ::std::map< ::rtl::OUString, FilterGroup::iterator > FilterGroupEntryReferrer; + typedef ::std::map< OUString, FilterGroup::iterator > FilterGroupEntryReferrer; /// a descriptor for a filter class (which in the final dialog is represented by one filter entry) typedef struct _tagFilterClass { - ::rtl::OUString sDisplayName; // the display name + OUString sDisplayName; // the display name Sequence< FilterName > aSubFilters; // the (logical) names of the filter which belong to the class } FilterClass; typedef ::std::list< FilterClass > FilterClassList; - typedef ::std::map< ::rtl::OUString, FilterClassList::iterator > FilterClassReferrer; + typedef ::std::map< OUString, FilterClassList::iterator > FilterClassReferrer; - typedef ::std::vector< ::rtl::OUString > StringArray; + typedef ::std::vector< OUString > StringArray; // ======================================================================= // = reading of configuration data // ======================================================================= //-------------------------------------------------------------------- - void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const ::rtl::OUString& _rLogicalClassName, + void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName, FilterClass& /* [out] */ _rClass ) { - static const ::rtl::OUString sDisplaNameNodeName( "DisplayName" ); - static const ::rtl::OUString sSubFiltersNodeName( "Filters" ); + static const OUString sDisplaNameNodeName( "DisplayName" ); + static const OUString sSubFiltersNodeName( "Filters" ); // the description node for the current class OConfigurationNode aClassDesc = _rClassesNode.openNode( _rLogicalClassName ); @@ -231,11 +231,11 @@ namespace sfx2 //================================================================ // get the list describing the order of all global classes - Sequence< ::rtl::OUString > aGlobalClasses; + Sequence< OUString > aGlobalClasses; _rFilterClassification.getNodeValue( "GlobalFilters/Order" ) >>= aGlobalClasses; - const ::rtl::OUString* pNames = aGlobalClasses.getConstArray(); - const ::rtl::OUString* pNamesEnd = pNames + aGlobalClasses.getLength(); + const OUString* pNames = aGlobalClasses.getConstArray(); + const OUString* pNamesEnd = pNames + aGlobalClasses.getLength(); // copy the logical names _rGlobalClassNames.resize( aGlobalClasses.getLength() ); @@ -259,7 +259,7 @@ namespace sfx2 // go for all the single class entries OConfigurationNode aFilterClassesNode = _rFilterClassification.openNode( "GlobalFilters/Classes" ); - Sequence< ::rtl::OUString > aFilterClasses = aFilterClassesNode.getNodeNames(); + Sequence< OUString > aFilterClasses = aFilterClassesNode.getNodeNames(); ::std::for_each( aFilterClasses.getConstArray(), aFilterClasses.getConstArray() + aFilterClasses.getLength(), @@ -301,7 +301,7 @@ namespace sfx2 // the node for the local classes OConfigurationNode aFilterClassesNode = _rFilterClassification.openNode( "LocalFilters/Classes" ); - Sequence< ::rtl::OUString > aFilterClasses = aFilterClassesNode.getNodeNames(); + Sequence< OUString > aFilterClasses = aFilterClassesNode.getNodeNames(); ::std::for_each( aFilterClasses.getConstArray(), @@ -404,20 +404,20 @@ namespace sfx2 static const sal_Unicode s_cWildcardSeparator( ';' ); //==================================================================== - const ::rtl::OUString& getSeparatorString() + const OUString& getSeparatorString() { - static ::rtl::OUString s_sSeparatorString( &s_cWildcardSeparator, 1 ); + static OUString s_sSeparatorString( &s_cWildcardSeparator, 1 ); return s_sSeparatorString; } //==================================================================== - struct CheckAppendSingleWildcard : public ::std::unary_function< ::rtl::OUString, void > + struct CheckAppendSingleWildcard : public ::std::unary_function< OUString, void > { - ::rtl::OUString& _rToBeExtended; + OUString& _rToBeExtended; - CheckAppendSingleWildcard( ::rtl::OUString& _rBase ) : _rToBeExtended( _rBase ) { } + CheckAppendSingleWildcard( OUString& _rBase ) : _rToBeExtended( _rBase ) { } - void operator() ( const ::rtl::OUString& _rWC ) + void operator() ( const OUString& _rWC ) { // check for double wildcards sal_Int32 nExistentPos = _rToBeExtended.indexOf( _rWC ); @@ -451,7 +451,7 @@ namespace sfx2 struct AppendWildcardToDescriptor : public ::std::unary_function< FilterGroupEntryReferrer::value_type, void > { protected: - ::std::vector< ::rtl::OUString > aWildCards; + ::std::vector< OUString > aWildCards; public: AppendWildcardToDescriptor( const String& _rWildCard ); @@ -485,7 +485,7 @@ namespace sfx2 { if ( ( s_cWildcardSeparator == *pTokenLoop ) && ( pTokenLoop > pTokenStart ) ) { // found a new token separator (and a non-empty token) - aWildCards.push_back( ::rtl::OUString( pTokenStart, pTokenLoop - pTokenStart ) ); + aWildCards.push_back( OUString( pTokenStart, pTokenLoop - pTokenStart ) ); // search the start of the next token while ( ( pTokenStart != pTokenLoopEnd ) && ( *pTokenStart != s_cWildcardSeparator ) ) @@ -501,7 +501,7 @@ namespace sfx2 } if ( pTokenLoop > pTokenStart ) // the last one .... - aWildCards.push_back( ::rtl::OUString( pTokenStart, pTokenLoop - pTokenStart ) ); + aWildCards.push_back( OUString( pTokenStart, pTokenLoop - pTokenStart ) ); } //-------------------------------------------------------------------- @@ -613,7 +613,7 @@ namespace sfx2 String aCurrentServiceName; String sFilterWildcard; - ::rtl::OUString sFilterName; + OUString sFilterName; // loop through all the filters for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter; pFilter = _rFilterMatcher.Next() ) { @@ -629,7 +629,7 @@ namespace sfx2 if ( aServiceName != aCurrentServiceName ) { // we reached a new group - ::rtl::OUString sDocServName = aServiceName; + OUString sDocServName = aServiceName; // look for the place in _rAllFilters where this ne group belongs - this is determined // by the order of classes in aGlobalClassNames @@ -838,7 +838,7 @@ namespace sfx2 for ( ; pFilters != pEnd; ++pFilters ) pFilters->First = addExtension( pFilters->First, pFilters->Second, sal_True, *m_pFileDlgImpl ); } - m_xFilterGroupManager->appendFilterGroup( ::rtl::OUString(), aFilters ); + m_xFilterGroupManager->appendFilterGroup( OUString(), aFilters ); } } else @@ -873,9 +873,9 @@ namespace sfx2 while(xFilterList->hasMoreElements()) { ::comphelper::SequenceAsHashMap lFilterProps (xFilterList->nextElement()); - ::rtl::OUString sFilterName = lFilterProps.getUnpackedValueOrDefault( - ::rtl::OUString("Name"), - ::rtl::OUString()); + OUString sFilterName = lFilterProps.getUnpackedValueOrDefault( + OUString("Name"), + OUString()); if (!sFilterName.isEmpty()) m_lFilters.push_back(sFilterName); } @@ -900,7 +900,7 @@ namespace sfx2 { if (nIndex<0 || nIndex>=(sal_Int32)m_lFilters.size()) return 0; - const ::rtl::OUString& sFilterName = m_lFilters[nIndex]; + const OUString& sFilterName = m_lFilters[nIndex]; if (sFilterName.isEmpty()) return 0; return SfxFilter::GetFilterByName(String(sFilterName)); @@ -909,15 +909,15 @@ namespace sfx2 //-------------------------------------------------------------------- void appendFiltersForSave( TSortedFilterList& _rFilterMatcher, const Reference< XFilterManager >& _rxFilterManager, - ::rtl::OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl, - const ::rtl::OUString& _rFactory ) + OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl, + const OUString& _rFactory ) { DBG_ASSERT( _rxFilterManager.is(), "sfx2::appendFiltersForSave: invalid manager!" ); if ( !_rxFilterManager.is() ) return; - ::rtl::OUString sUIName; - ::rtl::OUString sExtension; + OUString sUIName; + OUString sExtension; // retrieve the default filter for this application module. // It must be set as first of the generated filter list. @@ -962,17 +962,17 @@ namespace sfx2 struct ExportFilter { - ExportFilter( const rtl::OUString& _aUIName, const rtl::OUString& _aWildcard ) : + ExportFilter( const OUString& _aUIName, const OUString& _aWildcard ) : aUIName( _aUIName ), aWildcard( _aWildcard ) {} - rtl::OUString aUIName; - rtl::OUString aWildcard; + OUString aUIName; + OUString aWildcard; }; //-------------------------------------------------------------------- void appendExportFilters( TSortedFilterList& _rFilterMatcher, const Reference< XFilterManager >& _rxFilterManager, - ::rtl::OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ) + OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ) { DBG_ASSERT( _rxFilterManager.is(), "sfx2::appendExportFilters: invalid manager!" ); if ( !_rxFilterManager.is() ) @@ -982,17 +982,17 @@ namespace sfx2 sal_Int32 nXHTMLIndex = -1; sal_Int32 nPDFIndex = -1; sal_Int32 nFlashIndex = -1; - ::rtl::OUString sUIName; - ::rtl::OUString sExtensions; + OUString sUIName; + OUString sExtensions; std::vector< ExportFilter > aImportantFilterGroup; std::vector< ExportFilter > aFilterGroup; Reference< XFilterGroupManager > xFilterGroupManager( _rxFilterManager, UNO_QUERY ); - ::rtl::OUString sTypeName; - const ::rtl::OUString sWriterHTMLType( "generic_HTML" ); - const ::rtl::OUString sGraphicHTMLType( "graphic_HTML" ); - const ::rtl::OUString sXHTMLType( "XHTML_File" ); - const ::rtl::OUString sPDFType( "pdf_Portable_Document_Format" ); - const ::rtl::OUString sFlashType( "graphic_SWF" ); + OUString sTypeName; + const OUString sWriterHTMLType( "generic_HTML" ); + const OUString sGraphicHTMLType( "graphic_HTML" ); + const OUString sXHTMLType( "XHTML_File" ); + const OUString sPDFType( "pdf_Portable_Document_Format" ); + const OUString sFlashType( "graphic_SWF" ); for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter; pFilter = _rFilterMatcher.Next() ) { @@ -1058,7 +1058,7 @@ namespace sfx2 try { - xFilterGroupManager->appendFilterGroup( ::rtl::OUString(), aFilters ); + xFilterGroupManager->appendFilterGroup( OUString(), aFilters ); } catch( const IllegalArgumentException& ) { @@ -1078,7 +1078,7 @@ namespace sfx2 try { - xFilterGroupManager->appendFilterGroup( ::rtl::OUString(), aFilters ); + xFilterGroupManager->appendFilterGroup( OUString(), aFilters ); } catch( const IllegalArgumentException& ) { @@ -1094,7 +1094,7 @@ namespace sfx2 { try { - rtl::OUString aUIName = addExtension( aImportantFilterGroup[n].aUIName, + OUString aUIName = addExtension( aImportantFilterGroup[n].aUIName, aImportantFilterGroup[n].aWildcard, sal_False, _rFileDlgImpl ); _rxFilterManager->appendFilter( aUIName, aImportantFilterGroup[n].aWildcard ); @@ -1112,7 +1112,7 @@ namespace sfx2 { try { - rtl::OUString aUIName = addExtension( aFilterGroup[n].aUIName, + OUString aUIName = addExtension( aFilterGroup[n].aUIName, aFilterGroup[n].aWildcard, sal_False, _rFileDlgImpl ); _rxFilterManager->appendFilter( aUIName, aFilterGroup[n].aWildcard ); @@ -1131,7 +1131,7 @@ namespace sfx2 //-------------------------------------------------------------------- void appendFiltersForOpen( TSortedFilterList& _rFilterMatcher, const Reference< XFilterManager >& _rxFilterManager, - ::rtl::OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ) + OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ) { DBG_ASSERT( _rxFilterManager.is(), "sfx2::appendFiltersForOpen: invalid manager!" ); if ( !_rxFilterManager.is() ) @@ -1171,14 +1171,14 @@ namespace sfx2 } } - ::rtl::OUString addExtension( const ::rtl::OUString& _rDisplayText, - const ::rtl::OUString& _rExtension, + OUString addExtension( const OUString& _rDisplayText, + const OUString& _rExtension, sal_Bool _bForOpen, FileDialogHelper_Impl& _rFileDlgImpl ) { - static ::rtl::OUString sAllFilter( "(*.*)" ); - static ::rtl::OUString sOpenBracket( " (" ); - static ::rtl::OUString sCloseBracket( ")" ); - ::rtl::OUString sRet = _rDisplayText; + static OUString sAllFilter( "(*.*)" ); + static OUString sOpenBracket( " (" ); + static OUString sCloseBracket( ")" ); + OUString sRet = _rDisplayText; if ( sRet.indexOf( sAllFilter ) == -1 ) { diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx index 4b35f87ef219..2112f6a58fb7 100644 --- a/sfx2/source/dialog/filtergrouping.hxx +++ b/sfx2/source/dialog/filtergrouping.hxx @@ -33,7 +33,7 @@ namespace sfx2 { private: - ::std::vector< ::rtl::OUString > m_lFilters; + ::std::vector< OUString > m_lFilters; sal_Int32 m_nIterator; public: @@ -53,15 +53,15 @@ namespace sfx2 void appendFiltersForSave( TSortedFilterList& _rFilterMatcher, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilterManager >& _rFilterManager, - ::rtl::OUString& /* [out] */ _rFirstNonEmpty, + OUString& /* [out] */ _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl, - const ::rtl::OUString& _rFactory + const OUString& _rFactory ); void appendExportFilters( TSortedFilterList& _rFilterMatcher, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilterManager >& _rFilterManager, - ::rtl::OUString& /* [out] */ _rFirstNonEmpty, + OUString& /* [out] */ _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ); @@ -72,7 +72,7 @@ namespace sfx2 void appendFiltersForOpen( TSortedFilterList& _rFilterMatcher, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilterManager >& _rFilterManager, - ::rtl::OUString& /* [out] */ _rFirstNonEmpty, + OUString& /* [out] */ _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ); @@ -80,9 +80,9 @@ namespace sfx2 /** adds the given extension to the display text.

      To be used when opening or save generic files.

      */ - ::rtl::OUString addExtension( - const ::rtl::OUString& _rDisplayText, - const ::rtl::OUString& _rExtension, + OUString addExtension( + const OUString& _rDisplayText, + const OUString& _rExtension, sal_Bool _bForOpen, FileDialogHelper_Impl& _rFileDlgImpl ); diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index f92e836abe1d..82c2c3a56cea 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -94,8 +94,8 @@ namespace } } -SfxInfoBarWindow::SfxInfoBarWindow( Window* pParent, const rtl::OUString& sId, - const rtl::OUString& sMessage, vector< PushButton* > aButtons ) : +SfxInfoBarWindow::SfxInfoBarWindow( Window* pParent, const OUString& sId, + const OUString& sMessage, vector< PushButton* > aButtons ) : Window( pParent, 0 ), m_sId( sId ), m_pMessage( NULL ), @@ -244,7 +244,7 @@ SfxInfoBarContainerWindow::~SfxInfoBarContainerWindow( ) m_pInfoBars.clear( ); } -void SfxInfoBarContainerWindow::appendInfoBar( const rtl::OUString& sId, const rtl::OUString& sMessage, vector< PushButton* > aButtons ) +void SfxInfoBarContainerWindow::appendInfoBar( const OUString& sId, const OUString& sMessage, vector< PushButton* > aButtons ) { Size aSize = GetSizePixel( ); @@ -257,7 +257,7 @@ void SfxInfoBarContainerWindow::appendInfoBar( const rtl::OUString& sId, const r SetSizePixel( aSize ); } -SfxInfoBarWindow* SfxInfoBarContainerWindow::getInfoBar( const rtl::OUString& sId ) +SfxInfoBarWindow* SfxInfoBarContainerWindow::getInfoBar( const OUString& sId ) { SfxInfoBarWindow* pRet = NULL; for ( vector< SfxInfoBarWindow* >::iterator it = m_pInfoBars.begin( ); diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx index c1bd5055a0a5..a205684dfc14 100644 --- a/sfx2/source/dialog/inputdlg.cxx +++ b/sfx2/source/dialog/inputdlg.cxx @@ -18,7 +18,7 @@ #define LABEL_TEXT_SPACE 5 -InputDialog::InputDialog (const rtl::OUString &rLabelText, Window *pParent) +InputDialog::InputDialog (const OUString &rLabelText, Window *pParent) : ModalDialog(pParent,SfxResId(DLG_INPUT_BOX)), mpEntry(new Edit(this,SfxResId(EDT_INPUT_FIELD))), mpLabel(new FixedText(this,SfxResId(LABEL_INPUT_TEXT))), @@ -68,7 +68,7 @@ InputDialog::~InputDialog() delete mpCancel; } -rtl::OUString InputDialog::getEntryText () const +OUString InputDialog::getEntryText () const { return mpEntry->GetText(); } diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index f56b4bcf7d44..2605119eef50 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -149,7 +149,7 @@ sal_Bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XMode css::uno::Reference< css::beans::XPropertySet > xPropSet( xModel, css::uno::UNO_QUERY ); if ( xPropSet.is() ) { - Any a = xPropSet->getPropertyValue( rtl::OUString( "HasValidSignatures" )); + Any a = xPropSet->getPropertyValue( OUString( "HasValidSignatures" )); sal_Bool bReturn = sal_Bool(); if ( a >>= bReturn ) return bReturn; @@ -169,8 +169,8 @@ sal_Bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XMode SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( uno::Reference< lang::XMultiServiceFactory > xSMGR, uno::Reference< frame::XModel > xModel, - const rtl::OUString& rFilterName, - const rtl::OUString& rType, + const OUString& rFilterName, + const OUString& rType, bool bModified, sal_Int32& rNumArgs, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) @@ -183,7 +183,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xFilterCFG = uno::Reference< container::XNameAccess >( xSMGR->createInstance( - ::rtl::OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY ); + OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY ); css::uno::Reference< css::util::XModifiable > xModifiable( xModel, css::uno::UNO_QUERY ); if ( !xFilterCFG.is() ) @@ -198,7 +198,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( { if( aProps[nProperty].Name == "UIComponent" ) { - ::rtl::OUString aServiceName; + OUString aServiceName; aProps[nProperty].Value >>= aServiceName; if( !aServiceName.isEmpty() ) { @@ -218,11 +218,11 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( //string for the ok button //used in filter/source/pdf/impdialog.cxx uno::Sequence< beans::PropertyValue > aFilterDataValue(1); - aFilterDataValue[0].Name = ::rtl::OUString( "_OkButtonString" ); + aFilterDataValue[0].Name = OUString( "_OkButtonString" ); aFilterDataValue[0].Value = css::uno::makeAny(SfxResId(STR_PDF_EXPORT_SEND ).toString()); //add to the filterdata property, the only one the PDF export filter dialog will care for - aPropsForDialog[0].Name = ::rtl::OUString( "FilterData" ); + aPropsForDialog[0].Name = OUString( "FilterData" ); aPropsForDialog[0].Value = css::uno::makeAny( aFilterDataValue ); //when executing the dialog will merge the persistent FilterData properties @@ -294,10 +294,10 @@ sal_Bool SfxMailModel::IsEmpty() const } SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( - const rtl::OUString& aSaveFileName, + const OUString& aSaveFileName, const css::uno::Reference< css::uno::XInterface >& xFrameOrModel, - const rtl::OUString& rType, - rtl::OUString& rFileNamePath ) + const OUString& rType, + OUString& rFileNamePath ) { SaveResult eRet( SAVE_ERROR ); bool bSendAsPDF = (rType.equalsAsciiL( PDF_DOCUMENT_TYPE, PDF_DOCUMENT_TYPE_LEN )); @@ -309,7 +309,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( css::uno::Reference< css::frame::XModuleManager2 > xModuleManager( css::frame::ModuleManager::create(xContext) ); - rtl::OUString aModule; + OUString aModule; try { aModule = xModuleManager->identify( xFrameOrModel ); @@ -345,7 +345,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( bModified = xModifiable->isModified(); if ( xStorable.is() ) { - rtl::OUString aLocation = xStorable->getLocation(); + OUString aLocation = xStorable->getLocation(); INetURLObject aFileObj( aLocation ); bool bPrivateProtocol = ( aFileObj.GetProtocol() == INET_PROT_PRIV_SOFFICE ); @@ -358,13 +358,13 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( if ( xStorable.is() ) { - rtl::OUString aFilterName; - rtl::OUString aTypeName( rType ); - rtl::OUString aFileName; - rtl::OUString aExtension; + OUString aFilterName; + OUString aTypeName( rType ); + OUString aFileName; + OUString aExtension; css::uno::Reference< css::container::XContainerQuery > xContainerQuery( - xSMGR->createInstance( rtl::OUString( + xSMGR->createInstance( OUString( "com.sun.star.document.FilterFactory" )), css::uno::UNO_QUERY ); @@ -372,9 +372,9 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { // Retrieve filter from type css::uno::Sequence< css::beans::NamedValue > aQuery( bSendAsPDF ? 3 : 2 ); - aQuery[0].Name = rtl::OUString( "Type" ); + aQuery[0].Name = OUString( "Type" ); aQuery[0].Value = css::uno::makeAny( aTypeName ); - aQuery[1].Name = rtl::OUString( "DocumentService" ); + aQuery[1].Name = OUString( "DocumentService" ); aQuery[1].Value = css::uno::makeAny( aModule ); if( bSendAsPDF ) { @@ -383,7 +383,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( // exact flag value as detailed in the filter configuration to get it // this seems to be a bug // without flags we get an import filter here, which is also unwanted - aQuery[2].Name = rtl::OUString( "Flags" ); + aQuery[2].Name = OUString( "Flags" ); aQuery[2].Value = css::uno::makeAny( sal_Int32(0x80042) ); // EXPORT ALIEN 3RDPARTY } @@ -394,17 +394,17 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { ::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() ); aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Name"), - ::rtl::OUString() ); + OUString("Name"), + OUString() ); } if ( bHasLocation ) { // Retrieve filter from media descriptor ::comphelper::SequenceAsHashMap aMediaDescrPropsHM( xModel->getArgs() ); - rtl::OUString aOrgFilterName = aMediaDescrPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString( "FilterName" ), - ::rtl::OUString() ); + OUString aOrgFilterName = aMediaDescrPropsHM.getUnpackedValueOrDefault( + OUString( "FilterName" ), + OUString() ); if ( aOrgFilterName == aFilterName ) { // We should save the document in the original format. Therefore this @@ -421,8 +421,8 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( // Retrieve filter from media descriptor ::comphelper::SequenceAsHashMap aMediaDescrPropsHM( xModel->getArgs() ); aFilterName = aMediaDescrPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString( "FilterName" ), - ::rtl::OUString() ); + OUString( "FilterName" ), + OUString() ); } if ( !bHasLocation || aFilterName.isEmpty()) @@ -432,16 +432,16 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { ::comphelper::SequenceAsHashMap aFilterPropsHM( xModuleManager->getByName( aModule ) ); aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("ooSetupFactoryDefaultFilter"), - ::rtl::OUString() ); + OUString("ooSetupFactoryDefaultFilter"), + OUString() ); css::uno::Reference< css::container::XNameAccess > xNameAccess( xContainerQuery, css::uno::UNO_QUERY ); if ( xNameAccess.is() ) { ::comphelper::SequenceAsHashMap aFilterPropsHM2( xNameAccess->getByName( aFilterName ) ); aTypeName = aFilterPropsHM2.getUnpackedValueOrDefault( - ::rtl::OUString("Type"), - ::rtl::OUString() ); + OUString("Type"), + OUString() ); } } catch ( css::container::NoSuchElementException& ) @@ -463,12 +463,12 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( if ( bHasLocation && !bStoreTo ) { INetURLObject aFileObj( xStorable->getLocation() ); - aExtension = (rtl::OUString)aFileObj.getExtension(); + aExtension = (OUString)aFileObj.getExtension(); } else { css::uno::Reference< container::XNameAccess > xTypeDetection( - xSMGR->createInstance( ::rtl::OUString( + xSMGR->createInstance( OUString( "com.sun.star.document.TypeDetection" )), css::uno::UNO_QUERY ); @@ -478,9 +478,9 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( try { ::comphelper::SequenceAsHashMap aTypeNamePropsHM( xTypeDetection->getByName( aTypeName ) ); - uno::Sequence< ::rtl::OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Extensions"), - ::uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault( + OUString("Extensions"), + ::uno::Sequence< OUString >() ); if ( aExtensions.getLength() ) aExtension = aExtensions[0]; } @@ -497,7 +497,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( if ( !bHasLocation ) { // Create a noname file name with the correct extension - const rtl::OUString aNoNameFileName( "noname" ); + const OUString aNoNameFileName( "noname" ); aFileName = aNoNameFileName; } else @@ -525,18 +525,18 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( aFilePathObj.insertName( aFileName ); aFilePathObj.setExtension( aExtension ); - rtl::OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE ); + OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE ); sal_Int32 nNumArgs(0); - const rtl::OUString aPasswordPropName( "Password" ); + const OUString aPasswordPropName( "Password" ); css::uno::Sequence< css::beans::PropertyValue > aArgs( ++nNumArgs ); - aArgs[nNumArgs-1].Name = rtl::OUString( "FilterName" ); + aArgs[nNumArgs-1].Name = OUString( "FilterName" ); aArgs[nNumArgs-1].Value = css::uno::makeAny( aFilterName ); ::comphelper::SequenceAsHashMap aMediaDescrPropsHM( xModel->getArgs() ); - rtl::OUString aPassword = aMediaDescrPropsHM.getUnpackedValueOrDefault( + OUString aPassword = aMediaDescrPropsHM.getUnpackedValueOrDefault( aPasswordPropName, - ::rtl::OUString() ); + OUString() ); if ( !aPassword.isEmpty() ) { aArgs.realloc( ++nNumArgs ); @@ -555,13 +555,13 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { // check if the document needs to be prepared for sending as mail (embedding of links, removal of invisible content) - aPrepareURL.Complete = rtl::OUString( ".uno:PrepareMailExport" ); + aPrepareURL.Complete = OUString( ".uno:PrepareMailExport" ); xURLTransformer->parseStrict( aPrepareURL ); if ( xDispatchProvider.is() ) { xPrepareDispatch = css::uno::Reference< css::frame::XDispatch >( - xDispatchProvider->queryDispatch( aPrepareURL, ::rtl::OUString(), 0 )); + xDispatchProvider->queryDispatch( aPrepareURL, OUString(), 0 )); if ( xPrepareDispatch.is() ) { PrepareListener_Impl* pPrepareListener; @@ -624,13 +624,13 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { css::util::URL aURL; // #i30432# notify that export is finished - the Writer may want to restore removed content - aURL.Complete = rtl::OUString( ".uno:MailExportFinished" ); + aURL.Complete = OUString( ".uno:MailExportFinished" ); xURLTransformer->parseStrict( aURL ); if ( xDispatchProvider.is() ) { css::uno::Reference< css::frame::XDispatch > xDispatch = css::uno::Reference< css::frame::XDispatch >( - xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 )); + xDispatchProvider->queryDispatch( aURL, OUString(), 0 )); if ( xDispatch.is() ) { try @@ -671,7 +671,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { // We need 1:1 copy of the document to preserve an added signature. aArgs.realloc( ++nNumArgs ); - aArgs[nNumArgs-1].Name = ::rtl::OUString( "CopyStreamIfPossible" ); + aArgs[nNumArgs-1].Name = OUString( "CopyStreamIfPossible" ); aArgs[nNumArgs-1].Value = css::uno::makeAny( (sal_Bool)sal_True ); try @@ -752,11 +752,11 @@ void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole ) } SfxMailModel::SendMailResult SfxMailModel::AttachDocument( - const ::rtl::OUString& sDocumentType, + const OUString& sDocumentType, const css::uno::Reference< css::uno::XInterface >& xFrameOrModel, - const ::rtl::OUString& sAttachmentTitle ) + const OUString& sAttachmentTitle ) { - rtl::OUString sFileName; + OUString sFileName; SaveResult eSaveResult = SaveDocumentAsFormat( sAttachmentTitle, xFrameOrModel, sDocumentType, sFileName ); if ( eSaveResult == SAVE_SUCCESSFULL && !sFileName.isEmpty() ) @@ -908,13 +908,13 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: return eResult; } -SfxMailModel::SendMailResult SfxMailModel::SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame, const rtl::OUString& rTypeName ) +SfxMailModel::SendMailResult SfxMailModel::SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& rTypeName ) { SaveResult eSaveResult; SendMailResult eResult = SEND_MAIL_ERROR; - rtl::OUString aFileName; + OUString aFileName; - eSaveResult = SaveDocumentAsFormat( rtl::OUString(), xFrame, rTypeName, aFileName ); + eSaveResult = SaveDocumentAsFormat( OUString(), xFrame, rTypeName, aFileName ); if ( eSaveResult == SAVE_SUCCESSFULL ) { diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 173d44f3bb89..4530ecf3b3e2 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -114,13 +114,13 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl xFrame, ::com::sun::star::uno::UNO_QUERY ); try { - const ::rtl::OUString aLayoutManager( "LayoutManager" ); + const OUString aLayoutManager( "LayoutManager" ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xLMPropSet; ::com::sun::star::uno::Any a = xPropSet->getPropertyValue( aLayoutManager ); if ( a >>= xLMPropSet ) { - const ::rtl::OUString aAutomaticToolbars( "AutomaticToolbars" ); + const OUString aAutomaticToolbars( "AutomaticToolbars" ); xLMPropSet->setPropertyValue( aAutomaticToolbars, ::com::sun::star::uno::Any( sal_False )); } } diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index ec10f80824b9..27cb93c50cea 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -40,10 +40,10 @@ using namespace ::com::sun::star; -static rtl::OUString GetLabelFromCommandURL( const rtl::OUString& rCommandURL, const uno::Reference< frame::XFrame >& xFrame ) +static OUString GetLabelFromCommandURL( const OUString& rCommandURL, const uno::Reference< frame::XFrame >& xFrame ) { - rtl::OUString aLabel; - rtl::OUString aModuleIdentifier; + OUString aLabel; + OUString aModuleIdentifier; uno::Reference< container::XNameAccess > xUICommandLabels; uno::Reference< uno::XComponentContext > xContext; uno::Reference< container::XNameAccess > xUICommandDescription; @@ -172,7 +172,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl( { // Retrieve label from helper function uno::Reference< frame::XFrame > xFrame = GetBindings().GetActiveFrame(); - rtl::OUString aCommandStr( ".uno:StopRecording" ); + OUString aCommandStr( ".uno:StopRecording" ); aTbx.SetItemText( SID_STOP_RECORDING, GetLabelFromCommandURL( aCommandStr, xFrame )); // Determine size of toolbar diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index e5b08586cc97..5a3ddd7b4ad1 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -232,7 +232,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, if ( bWithButtons ) { // Read Configuration - String aWindowId = rtl::OUString("SplitWindow"); + String aWindowId = OUString("SplitWindow"); aWindowId += OUString::number( (sal_Int32) eTbxAlign ); SvtViewOptions aWinOpt( E_WINDOW, aWindowId ); String aWinData; @@ -306,7 +306,7 @@ SfxSplitWindow::~SfxSplitWindow() void SfxSplitWindow::SaveConfig_Impl() { // Save configuration - rtl::OUStringBuffer aWinData; + OUStringBuffer aWinData; aWinData.append('V'); aWinData.append(static_cast(VERSION)); aWinData.append(','); @@ -335,7 +335,7 @@ void SfxSplitWindow::SaveConfig_Impl() aWinData.append(static_cast(pDock->nType)); } - String aWindowId = rtl::OUString("SplitWindow"); + String aWindowId = OUString("SplitWindow"); aWindowId += OUString::number( (sal_Int32) GetAlign() ); SvtViewOptions aWinOpt( E_WINDOW, aWindowId ); aWinOpt.SetUserItem( USERITEM_NAME, makeAny( aWinData.makeStringAndClear() ) ); diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index c5745f09da26..40e5027d7fb7 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -40,7 +40,7 @@ namespace sfx2 { // SearchDialog // ============================================================================ -SearchDialog::SearchDialog( Window* pWindow, const ::rtl::OUString& rConfigName ) : +SearchDialog::SearchDialog( Window* pWindow, const OUString& rConfigName ) : ModelessDialog( pWindow, SfxResId( RID_DLG_SEARCH ) ), @@ -82,9 +82,9 @@ void SearchDialog::LoadConfig() SvtViewOptions aViewOpt( E_DIALOG, m_sConfigName ); if ( aViewOpt.Exists() ) { - m_sWinState = rtl::OUStringToOString(aViewOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US); + m_sWinState = OUStringToOString(aViewOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US); Any aUserItem = aViewOpt.GetUserItem( "UserItem" ); - ::rtl::OUString aTemp; + OUString aTemp; if ( aUserItem >>= aTemp ) { String sUserData( aTemp ); @@ -109,7 +109,7 @@ void SearchDialog::LoadConfig() void SearchDialog::SaveConfig() { SvtViewOptions aViewOpt( E_DIALOG, m_sConfigName ); - aViewOpt.SetWindowState(rtl::OStringToOUString(m_sWinState, RTL_TEXTENCODING_ASCII_US)); + aViewOpt.SetWindowState(OStringToOUString(m_sWinState, RTL_TEXTENCODING_ASCII_US)); String sUserData; sal_uInt16 i = 0, nCount = Min( m_aSearchEdit.GetEntryCount(), MAX_SAVE_COUNT ); for ( ; i < nCount; ++i ) @@ -127,7 +127,7 @@ void SearchDialog::SaveConfig() sUserData += ';'; sUserData += OUString::number( m_aBackwardsBox.IsChecked() ? 1 : 0 ); - Any aUserItem = makeAny( ::rtl::OUString( sUserData ) ); + Any aUserItem = makeAny( OUString( sUserData ) ); aViewOpt.SetUserItem( "UserItem", aUserItem ); } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index bec9cc1a4ee7..ac88e91e8afd 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -234,7 +234,7 @@ SfxTabPage::SfxTabPage( Window *pParent, } -SfxTabPage::SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) +SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) : TabPage(pParent, rID, rUIXMLDescription) , pSet ( &rAttrSet ) , bHasExchangeSupport ( sal_False ) @@ -785,7 +785,7 @@ void SfxTabDialog::Start_Impl() SvtViewOptions aDlgOpt( E_TABDIALOG, OUString::number( nResId ) ); if ( aDlgOpt.Exists() ) { - SetWindowState(rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); + SetWindowState(OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); // initial TabPage from Program/Help/config nActPage = (sal_uInt16)aDlgOpt.GetPageID(); @@ -1642,7 +1642,7 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt ) if ( pViewFrame ) { Window* pWindow = rNEvt.GetWindow(); - rtl::OString sHelpId; + OString sHelpId; while ( sHelpId.isEmpty() && pWindow ) { sHelpId = pWindow->GetHelpId(); diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index c4bb67fd9a52..cb57746fa0b1 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -95,17 +95,17 @@ namespace sfx2 namespace { //-------------------------------------------------------------------------------------------------------------- - ::utl::OConfigurationTreeRoot lcl_getModuleUIElementStatesConfig( const ::rtl::OUString& i_rModuleIdentifier, - const ::rtl::OUString& i_rResourceURL = ::rtl::OUString() ) + ::utl::OConfigurationTreeRoot lcl_getModuleUIElementStatesConfig( const OUString& i_rModuleIdentifier, + const OUString& i_rResourceURL = OUString() ) { const Reference xContext( ::comphelper::getProcessComponentContext() ); - ::rtl::OUStringBuffer aPathComposer; + OUStringBuffer aPathComposer; try { const Reference< XModuleManager2 > xModuleAccess( ModuleManager::create(xContext) ); const ::comphelper::NamedValueCollection aModuleProps( xModuleAccess->getByName( i_rModuleIdentifier ) ); - const ::rtl::OUString sWindowStateRef( aModuleProps.getOrDefault( "ooSetupFactoryWindowStateConfigRef", ::rtl::OUString() ) ); + const OUString sWindowStateRef( aModuleProps.getOrDefault( "ooSetupFactoryWindowStateConfigRef", OUString() ) ); aPathComposer.appendAscii(RTL_CONSTASCII_STRINGPARAM( "org.openoffice.Office.UI.")); @@ -124,9 +124,9 @@ namespace sfx2 } //-------------------------------------------------------------------------------------------------------------- - ::rtl::OUString lcl_identifyModule( const Reference< XFrame >& i_rDocumentFrame ) + OUString lcl_identifyModule( const Reference< XFrame >& i_rDocumentFrame ) { - ::rtl::OUString sModuleName; + OUString sModuleName; try { const Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -150,16 +150,16 @@ namespace sfx2 } //-------------------------------------------------------------------------------------------------------------- - ::rtl::OUString lcl_getPanelHelpURL( const ::utl::OConfigurationNode& i_rPanelConfigNode ) + OUString lcl_getPanelHelpURL( const ::utl::OConfigurationNode& i_rPanelConfigNode ) { - const ::rtl::OUString sHelpURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "HelpURL" ) ) ); + const OUString sHelpURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "HelpURL" ) ) ); return sHelpURL; } //-------------------------------------------------------------------------------------------------------------- Image lcl_getPanelImage( const Reference< XFrame >& i_rDocFrame, const ::utl::OConfigurationNode& i_rPanelConfigNode ) { - const ::rtl::OUString sImageURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "ImageURL" ) ) ); + const OUString sImageURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "ImageURL" ) ) ); if ( !sImageURL.isEmpty() ) { try @@ -172,10 +172,10 @@ namespace sfx2 const sal_Int32 nCommandImagePrefixLen = strlen( pCommandImagePrefix ); if ( sImageURL.startsWith( pCommandImagePrefix ) ) { - ::rtl::OUStringBuffer aCommandName; + OUStringBuffer aCommandName; aCommandName.appendAscii(RTL_CONSTASCII_STRINGPARAM(".uno:")); aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) ); - const ::rtl::OUString sCommandName( aCommandName.makeStringAndClear() ); + const OUString sCommandName( aCommandName.makeStringAndClear() ); const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, sal_False ) ); return aPanelImage.GetXGraphic(); @@ -211,7 +211,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneDockingWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) + void TaskPaneDockingWindow::ActivateToolPanel( const OUString& i_rPanelURL ) { m_aPaneController.ActivateToolPanel( i_rPanelURL ); } @@ -253,7 +253,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneWrapper::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) + void TaskPaneWrapper::ActivateToolPanel( const OUString& i_rPanelURL ) { TaskPaneDockingWindow* pDockingWindow = dynamic_cast< TaskPaneDockingWindow* >( GetWindow() ); ENSURE_OR_RETURN_VOID( pDockingWindow, "TaskPaneWrapper::ActivateToolPanel: invalid docking window implementation!" ); @@ -300,9 +300,9 @@ namespace sfx2 public: CustomToolPanel( const ::utl::OConfigurationNode& i_rPanelWindowState, const Reference< XFrame >& i_rFrame ); - virtual ::rtl::OUString GetDisplayName() const; + virtual OUString GetDisplayName() const; virtual Image GetImage() const; - virtual rtl::OString GetHelpID() const; + virtual OString GetHelpID() const; virtual void Activate( Window& i_rParentWindow ); virtual void Deactivate(); virtual void SetSizePixel( const Size& i_rPanelWindowSize ); @@ -311,7 +311,7 @@ namespace sfx2 virtual Reference< XAccessible > CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ); - const ::rtl::OUString& + const OUString& GetResourceURL() const { return m_sResourceURL; } protected: @@ -322,11 +322,11 @@ namespace sfx2 void impl_updatePanelConfig( const bool i_bVisible ) const; private: - const ::rtl::OUString m_sUIName; + const OUString m_sUIName; const Image m_aPanelImage; - const ::rtl::OUString m_aPanelHelpURL; - const ::rtl::OUString m_sResourceURL; - const ::rtl::OUString m_sPanelConfigPath; + const OUString m_aPanelHelpURL; + const OUString m_sResourceURL; + const OUString m_sPanelConfigPath; Reference< XFrame > m_xFrame; CustomPanelUIElement m_aCustomPanel; bool m_bAttemptedCreation; @@ -388,7 +388,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString CustomToolPanel::GetDisplayName() const + OUString CustomToolPanel::GetDisplayName() const { return m_sUIName; } @@ -399,17 +399,17 @@ namespace sfx2 return m_aPanelImage; } - static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL ) + static OString lcl_getHelpId( const OUString& _rHelpURL ) { INetURLObject aHID( _rHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) - return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); else - return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------------------------------------------ - rtl::OString CustomToolPanel::GetHelpID() const + OString CustomToolPanel::GetHelpID() const { return lcl_getHelpId( m_aPanelHelpURL ); } @@ -523,14 +523,14 @@ namespace sfx2 void OnResize(); void OnGetFocus(); - static bool ModuleHasToolPanels( const ::rtl::OUString& i_rModuleIdentifier ); + static bool ModuleHasToolPanels( const OUString& i_rModuleIdentifier ); ::svt::ToolPanelDeck& GetPanelDeck() { return m_aPanelDeck; } const ::svt::ToolPanelDeck& GetPanelDeck() const { return m_aPanelDeck; } ::boost::optional< size_t > - GetPanelPos( const ::rtl::OUString& i_rResourceURL ); - ::rtl::OUString + GetPanelPos( const OUString& i_rResourceURL ); + OUString GetPanelResourceURL( const size_t i_nPanelPos ) const; void SetDrawersLayout(); @@ -540,13 +540,13 @@ namespace sfx2 void impl_initFromConfiguration( const IToolPanelCompare* i_pPanelCompare ); static bool - impl_isToolPanelResource( const ::rtl::OUString& i_rResourceURL ); + impl_isToolPanelResource( const OUString& i_rResourceURL ); DECL_LINK( OnActivatePanel, void* ); private: ModuleTaskPane& m_rAntiImpl; - const ::rtl::OUString m_sModuleIdentifier; + const OUString m_sModuleIdentifier; const Reference< XFrame > m_xFrame; ::svt::ToolPanelDeck m_aPanelDeck; }; @@ -571,7 +571,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - bool ModuleTaskPane_Impl::impl_isToolPanelResource( const ::rtl::OUString& i_rResourceURL ) + bool ModuleTaskPane_Impl::impl_isToolPanelResource( const OUString& i_rResourceURL ) { return i_rResourceURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/toolpanel/" ) ); } @@ -583,11 +583,11 @@ namespace sfx2 if ( !aWindowStateConfig.isValid() ) return; - ::rtl::OUString sFirstVisiblePanelResource; - ::rtl::OUString sFirstPanelResource; + OUString sFirstVisiblePanelResource; + OUString sFirstPanelResource; - const Sequence< ::rtl::OUString > aUIElements( aWindowStateConfig.getNodeNames() ); - for ( const ::rtl::OUString* resource = aUIElements.getConstArray(); + const Sequence< OUString > aUIElements( aWindowStateConfig.getNodeNames() ); + for ( const OUString* resource = aUIElements.getConstArray(); resource != aUIElements.getConstArray() + aUIElements.getLength(); ++resource ) @@ -636,14 +636,14 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - bool ModuleTaskPane_Impl::ModuleHasToolPanels( const ::rtl::OUString& i_rModuleIdentifier ) + bool ModuleTaskPane_Impl::ModuleHasToolPanels( const OUString& i_rModuleIdentifier ) { const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( i_rModuleIdentifier ) ); if ( !aWindowStateConfig.isValid() ) return false; - const Sequence< ::rtl::OUString > aUIElements( aWindowStateConfig.getNodeNames() ); - for ( const ::rtl::OUString* resource = aUIElements.getConstArray(); + const Sequence< OUString > aUIElements( aWindowStateConfig.getNodeNames() ); + for ( const OUString* resource = aUIElements.getConstArray(); resource != aUIElements.getConstArray() + aUIElements.getLength(); ++resource ) @@ -655,7 +655,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ::boost::optional< size_t > ModuleTaskPane_Impl::GetPanelPos( const ::rtl::OUString& i_rResourceURL ) + ::boost::optional< size_t > ModuleTaskPane_Impl::GetPanelPos( const OUString& i_rResourceURL ) { ::boost::optional< size_t > aPanelPos; for ( size_t i = 0; i < m_aPanelDeck.GetPanelCount(); ++i ) @@ -678,12 +678,12 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ModuleTaskPane_Impl::GetPanelResourceURL( const size_t i_nPanelPos ) const + OUString ModuleTaskPane_Impl::GetPanelResourceURL( const size_t i_nPanelPos ) const { - ENSURE_OR_RETURN( i_nPanelPos < m_aPanelDeck.GetPanelCount(), "ModuleTaskPane_Impl::GetPanelResourceURL: illegal panel position!", ::rtl::OUString() ); + ENSURE_OR_RETURN( i_nPanelPos < m_aPanelDeck.GetPanelCount(), "ModuleTaskPane_Impl::GetPanelResourceURL: illegal panel position!", OUString() ); const ::svt::PToolPanel pPanel( m_aPanelDeck.GetPanel( i_nPanelPos ) ); const CustomToolPanel* pCustomPanel = dynamic_cast< const CustomToolPanel* >( pPanel.get() ); - ENSURE_OR_RETURN( pCustomPanel != NULL, "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!", ::rtl::OUString() ); + ENSURE_OR_RETURN( pCustomPanel != NULL, "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!", OUString() ); return pCustomPanel->GetResourceURL(); } @@ -776,13 +776,13 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ::boost::optional< size_t > ModuleTaskPane::GetPanelPos( const ::rtl::OUString& i_rResourceURL ) + ::boost::optional< size_t > ModuleTaskPane::GetPanelPos( const OUString& i_rResourceURL ) { return m_pImpl->GetPanelPos( i_rResourceURL ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ModuleTaskPane::GetPanelResourceURL( const size_t i_nPanelPos ) const + OUString ModuleTaskPane::GetPanelResourceURL( const size_t i_nPanelPos ) const { return m_pImpl->GetPanelResourceURL( i_nPanelPos ); } @@ -870,7 +870,7 @@ namespace sfx2 virtual ~TaskPaneController_Impl(); void SetDefaultTitle( const String& i_rTitle ); - void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); + void ActivateToolPanel( const OUString& i_rPanelURL ); protected: // IToolPanelDeckListener overridables @@ -918,7 +918,7 @@ namespace sfx2 PanelSelectorLayout m_eCurrentLayout; PanelDescriptors m_aPanelRepository; bool m_bTogglingPanelVisibility; - ::rtl::OUString m_sDefaultTitle; + OUString m_sDefaultTitle; }; //------------------------------------------------------------------------------------------------------------------ @@ -978,7 +978,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneController_Impl::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) + void TaskPaneController_Impl::ActivateToolPanel( const OUString& i_rPanelURL ) { ::boost::optional< size_t > aPanelPos( m_rTaskPane.GetPanelPos( i_rPanelURL ) ); ENSURE_OR_RETURN_VOID( !!aPanelPos, "TaskPaneController_Impl::ActivateToolPanel: no such panel!" ); @@ -1238,9 +1238,9 @@ namespace sfx2 pMenu->InsertSeparator(); #if OSL_DEBUG_LEVEL > 0 - pMenu->InsertItem( MID_LAYOUT_TABS, rtl::OUString("Tab-Layout (exp.)"), MIB_CHECKABLE ); + pMenu->InsertItem( MID_LAYOUT_TABS, OUString("Tab-Layout (exp.)"), MIB_CHECKABLE ); pMenu->CheckItem( MID_LAYOUT_TABS, impl_getLayout() != LAYOUT_DRAWERS ); - pMenu->InsertItem( MID_LAYOUT_DRAWERS, rtl::OUString("Drawer-Layout"), MIB_CHECKABLE ); + pMenu->InsertItem( MID_LAYOUT_DRAWERS, OUString("Drawer-Layout"), MIB_CHECKABLE ); pMenu->CheckItem( MID_LAYOUT_DRAWERS, impl_getLayout() == LAYOUT_DRAWERS ); pMenu->InsertSeparator(); @@ -1279,7 +1279,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneController::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) + void TaskPaneController::ActivateToolPanel( const OUString& i_rPanelURL ) { m_pImpl->ActivateToolPanel( i_rPanelURL ); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 5cf22dae50f4..4459a2e796de 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -385,7 +385,7 @@ void SfxTemplateDialogWrapper::SetParagraphFamily() } //========================================================================= -typedef std::vector ExpandedEntries_t; +typedef std::vector ExpandedEntries_t; /* [Description] @@ -681,7 +681,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr) inline sal_Bool IsExpanded_Impl( const ExpandedEntries_t& rEntries, - const rtl::OUString &rStr) + const OUString &rStr) { for (size_t n = 0; n < rEntries.size(); ++n) { @@ -1268,7 +1268,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) SfxStyleSheetBase *pStyle = pStyleSheetPool->First(); SvTreeListEntry* pEntry = aFmtLb.First(); - std::vector aStrings; + std::vector aStrings; comphelper::string::NaturalStringSorter aSorter( ::comphelper::getProcessComponentContext(), @@ -1287,7 +1287,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) size_t nCount = aStrings.size(); size_t nPos = 0; while(nPos < nCount && pEntry && - aStrings[nPos] == rtl::OUString(aFmtLb.GetEntryText(pEntry))) + aStrings[nPos] == OUString(aFmtLb.GetEntryText(pEntry))) { ++nPos; pEntry = aFmtLb.Next( pEntry ); @@ -1845,12 +1845,12 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry) //------------------------------------------------------------------------- -static rtl::OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModMgr, SfxObjectShell* i_pObjSh ) +static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModMgr, SfxObjectShell* i_pObjSh ) { OSL_ENSURE( i_xModMgr.is(), "getModuleIdentifier(): no XModuleManager" ); OSL_ENSURE( i_pObjSh, "getModuleIdentifier(): no ObjectShell" ); - ::rtl::OUString sIdentifier; + OUString sIdentifier; try { @@ -2321,7 +2321,7 @@ void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamilyItem *pItem) { - rtl::OString sHelpId; + OString sHelpId; switch( (sal_uInt16) pItem->GetFamily() ) { case SFX_STYLE_FAMILY_CHAR: sHelpId = ".uno:CharStyle"; break; @@ -2557,9 +2557,9 @@ IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox ) //------------------------------------------------------------------------- -static ::rtl::OUString lcl_GetLabel(uno::Any& rAny) +static OUString lcl_GetLabel(uno::Any& rAny) { - ::rtl::OUString sRet; + OUString sRet; uno::Sequence< beans::PropertyValue >aPropSeq; if ( rAny >>= aPropSeq ) { @@ -2597,7 +2597,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) frame::UICommandDescription::create( ::comphelper::getProcessComponentContext()) ); uno::Reference< container::XNameAccess > xUICommands; - rtl::OUString sTextDoc("com.sun.star.text.TextDocument"); + OUString sTextDoc("com.sun.star.text.TextDocument"); if(xNameAccess->hasByName(sTextDoc)) { uno::Any a = xNameAccess->getByName( sTextDoc ); @@ -2608,18 +2608,18 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) try { uno::Sequence< beans::PropertyValue > aPropSeq; - uno::Any aCommand = xUICommands->getByName(::rtl::OUString(".uno:StyleNewByExample")); - ::rtl::OUString sLabel = lcl_GetLabel( aCommand ); + uno::Any aCommand = xUICommands->getByName(OUString(".uno:StyleNewByExample")); + OUString sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel ); pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE); - aCommand = xUICommands->getByName(::rtl::OUString(".uno:StyleUpdateByExample")); + aCommand = xUICommands->getByName(OUString(".uno:StyleUpdateByExample")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel ); pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE); - aCommand = xUICommands->getByName(::rtl::OUString(".uno:LoadStyles")); + aCommand = xUICommands->getByName(OUString(".uno:LoadStyles")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel ); pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles"); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 02d7446e7ee9..a8cb0a1610c9 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -237,7 +237,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ) + sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ) { // Add the menu before the closer button. const sal_uInt16 nItemCount( m_aToolbox.GetItemCount() ); diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index c85c452d74b1..623aa843ea91 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -79,10 +79,10 @@ using namespace ::com::sun::star; namespace sfx2 { -bool isValidNCName(::rtl::OUString const & i_rIdref) +bool isValidNCName(OUString const & i_rIdref) { - const ::rtl::OString id( - ::rtl::OUStringToOString(i_rIdref, RTL_TEXTENCODING_UTF8) ); + const OString id( + OUStringToOString(i_rIdref, RTL_TEXTENCODING_UTF8) ); return !(xmlValidateNCName( reinterpret_cast(id.getStr()), 0)); } @@ -97,24 +97,24 @@ static const char s_rdfxml [] = "application/rdf+xml"; static const char s_odfmime [] = "application/vnd.oasis.opendocument."; -static bool isContentFile(::rtl::OUString const & i_rPath) +static bool isContentFile(OUString const & i_rPath) { return i_rPath == s_content; } -static bool isStylesFile (::rtl::OUString const & i_rPath) +static bool isStylesFile (OUString const & i_rPath) { return i_rPath == s_styles; } -bool isValidXmlId(::rtl::OUString const & i_rStreamName, - ::rtl::OUString const & i_rIdref) +bool isValidXmlId(OUString const & i_rStreamName, + OUString const & i_rIdref) { return isValidNCName(i_rIdref) && (isContentFile(i_rStreamName) || isStylesFile(i_rStreamName)); } -static bool isReservedFile(::rtl::OUString const & i_rPath) +static bool isReservedFile(OUString const & i_rPath) { return isContentFile(i_rPath) || isStylesFile(i_rPath) || i_rPath == s_meta || i_rPath == s_settings; } @@ -123,7 +123,7 @@ static bool isReservedFile(::rtl::OUString const & i_rPath) uno::Reference createBaseURI( uno::Reference const & i_xContext, uno::Reference const & i_xStorage, - ::rtl::OUString const & i_rPkgURI, ::rtl::OUString const & i_rSubDocument) + OUString const & i_rPkgURI, OUString const & i_rSubDocument) { if (!i_xContext.is() || !i_xStorage.is() || i_rPkgURI.isEmpty()) { throw uno::RuntimeException(); @@ -131,7 +131,7 @@ uno::Reference createBaseURI( // #i108078# workaround non-hierarchical vnd.sun.star.expand URIs // this really should be done somewhere else, not here. - ::rtl::OUString pkgURI(i_rPkgURI); + OUString pkgURI(i_rPkgURI); if (pkgURI.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.expand:"))) { @@ -161,13 +161,13 @@ uno::Reference createBaseURI( if (true) { xBaseURI.set( xPkgURI, uno::UNO_SET_THROW ); } - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (!xBaseURI->getUriReference().endsWithAsciiL("/", 1)) { const sal_Int32 count( xBaseURI->getPathSegmentCount() ); if (count > 0) { - const ::rtl::OUString last( xBaseURI->getPathSegment(count - 1) ); + const OUString last( xBaseURI->getPathSegment(count - 1) ); buf.append(last); } buf.append(static_cast('/')); @@ -177,7 +177,7 @@ uno::Reference createBaseURI( buf.append(i_rSubDocument); buf.append(static_cast('/')); } - const ::rtl::OUString Path(buf.makeStringAndClear()); + const OUString Path(buf.makeStringAndClear()); if (!Path.isEmpty()) { const uno::Reference< uri::XUriReference > xPathURI( @@ -225,13 +225,13 @@ getURI(uno::Reference< uno::XComponentContext > const & i_xContext) /** would storing the file to a XStorage succeed? */ -static bool isFileNameValid(const ::rtl::OUString & i_rFileName) +static bool isFileNameValid(const OUString & i_rFileName) { if (i_rFileName.isEmpty()) return false; if (i_rFileName[0] == '/') return false; // no absolute paths! sal_Int32 idx(0); do { - const ::rtl::OUString segment( + const OUString segment( i_rFileName.getToken(0, static_cast ('/'), idx) ); if (segment.isEmpty() || // no empty segments segment == "." || // no . segments @@ -245,12 +245,12 @@ static bool isFileNameValid(const ::rtl::OUString & i_rFileName) /** split a uri hierarchy into first segment and rest */ static bool -splitPath(::rtl::OUString const & i_rPath, - ::rtl::OUString & o_rDir, ::rtl::OUString& o_rRest) +splitPath(OUString const & i_rPath, + OUString & o_rDir, OUString& o_rRest) { const sal_Int32 idx(i_rPath.indexOf(static_cast('/'))); if (idx < 0 || idx >= i_rPath.getLength()) { - o_rDir = ::rtl::OUString(); + o_rDir = OUString(); o_rRest = i_rPath; return true; } else if (idx == 0 || idx == i_rPath.getLength() - 1) { @@ -264,8 +264,8 @@ splitPath(::rtl::OUString const & i_rPath, } static bool -splitXmlId(::rtl::OUString const & i_XmlId, - ::rtl::OUString & o_StreamName, ::rtl::OUString& o_Idref ) +splitXmlId(OUString const & i_XmlId, + OUString & o_StreamName, OUString& o_Idref ) { const sal_Int32 idx(i_XmlId.indexOf(static_cast('#'))); if ((idx <= 0) || (idx >= i_XmlId.getLength() - 1)) { @@ -280,7 +280,7 @@ splitXmlId(::rtl::OUString const & i_XmlId, static uno::Reference getURIForStream(struct DocumentMetadataAccess_Impl& i_rImpl, - ::rtl::OUString const& i_rPath) + OUString const& i_rPath) { const uno::Reference xURI( rdf::URI::createNS( i_rImpl.m_xContext, @@ -294,7 +294,7 @@ getURIForStream(struct DocumentMetadataAccess_Impl& i_rImpl, static void addFile(struct DocumentMetadataAccess_Impl & i_rImpl, uno::Reference const& i_xType, - ::rtl::OUString const & i_rPath, + OUString const & i_rPath, const uno::Sequence < uno::Reference< rdf::XURI > > * i_pTypes = 0) { try { @@ -318,7 +318,7 @@ addFile(struct DocumentMetadataAccess_Impl & i_rImpl, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "addFile: exception"), /*this*/0, uno::makeAny(e)); } } @@ -326,7 +326,7 @@ addFile(struct DocumentMetadataAccess_Impl & i_rImpl, /** add content.xml or styles.xml to manifest */ static bool addContentOrStylesFileImpl(struct DocumentMetadataAccess_Impl & i_rImpl, - const ::rtl::OUString & i_rPath) + const OUString & i_rPath) { uno::Reference xType; if (isContentFile(i_rPath)) { @@ -343,7 +343,7 @@ addContentOrStylesFileImpl(struct DocumentMetadataAccess_Impl & i_rImpl, /** add metadata file to manifest */ static void addMetadataFileImpl(struct DocumentMetadataAccess_Impl & i_rImpl, - const ::rtl::OUString & i_rPath, + const OUString & i_rPath, const uno::Sequence < uno::Reference< rdf::XURI > > & i_rTypes) { addFile(i_rImpl, @@ -367,7 +367,7 @@ removeFile(struct DocumentMetadataAccess_Impl & i_rImpl, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("removeFile: exception"), + OUString("removeFile: exception"), 0, uno::makeAny(e)); } } @@ -396,7 +396,7 @@ getAllParts(struct DocumentMetadataAccess_Impl & i_rImpl) throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("getAllParts: exception"), + OUString("getAllParts: exception"), 0, uno::makeAny(e)); } } @@ -418,26 +418,26 @@ isPartOfType(struct DocumentMetadataAccess_Impl & i_rImpl, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("isPartOfType: exception"), + OUString("isPartOfType: exception"), 0, uno::makeAny(e)); } } static ucb::InteractiveAugmentedIOException -mkException( ::rtl::OUString const & i_rMessage, +mkException( OUString const & i_rMessage, ucb::IOErrorCode const i_ErrorCode, - ::rtl::OUString const & i_rUri, ::rtl::OUString const & i_rResource) + OUString const & i_rUri, OUString const & i_rResource) { ucb::InteractiveAugmentedIOException iaioe; iaioe.Message = i_rMessage; iaioe.Classification = task::InteractionClassification_ERROR; iaioe.Code = i_ErrorCode; - const beans::PropertyValue uriProp(::rtl::OUString("Uri"), + const beans::PropertyValue uriProp(OUString("Uri"), -1, uno::makeAny(i_rUri), static_cast(0)); const beans::PropertyValue rnProp( - ::rtl::OUString("ResourceName"), + OUString("ResourceName"), -1, uno::makeAny(i_rResource), static_cast(0)); iaioe.Arguments = ::comphelper::makeSequence( uno::makeAny(uriProp), uno::makeAny(rnProp)); @@ -457,7 +457,7 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException, const uno::Reference & i_xHandler) { if (!i_xHandler.is()) { - throw lang::WrappedTargetException(::rtl::OUString( + throw lang::WrappedTargetException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: exception"), /* *this*/ 0, uno::makeAny(i_rException)); } @@ -481,7 +481,7 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException, return false; } else { OSL_ENSURE(pAbort->wasSelected(), "no continuation selected?"); - throw lang::WrappedTargetException(::rtl::OUString( + throw lang::WrappedTargetException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: exception"), /* *this*/ 0, uno::makeAny(i_rException)); } @@ -491,11 +491,11 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException, e.g. ODB files seem to only have content.xml */ static void collectFilesFromStorage(uno::Reference const& i_xStorage, - ::rtl::OUString i_Path, - std::set< ::rtl::OUString > & o_rFiles) + OUString i_Path, + std::set< OUString > & o_rFiles) { - static ::rtl::OUString content(s_content); - static ::rtl::OUString styles(s_styles ); + static OUString content(s_content); + static OUString styles(s_styles ); try { if (i_xStorage->hasByName(content) && i_xStorage->isStreamElement(content)) @@ -516,11 +516,11 @@ collectFilesFromStorage(uno::Reference const& i_xStorage, static void readStream(struct DocumentMetadataAccess_Impl & i_rImpl, uno::Reference< embed::XStorage > const & i_xStorage, - ::rtl::OUString const & i_rPath, - ::rtl::OUString const & i_rBaseURI) + OUString const & i_rPath, + OUString const & i_rBaseURI) { - ::rtl::OUString dir; - ::rtl::OUString rest; + OUString dir; + OUString rest; try { if (!splitPath(i_rPath, dir, rest)) throw uno::RuntimeException(); if (dir.isEmpty()) { @@ -538,7 +538,7 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl, i_rImpl.m_xRepository->importGraph(rdf::FileFormat::RDF_XML, xInStream, xURI, xBaseURI); } else { - throw mkException(::rtl::OUString( + throw mkException(OUString( "readStream: is not a stream"), ucb::IOErrorCode_NO_FILE, i_rBaseURI + i_rPath, i_rPath); } @@ -550,7 +550,7 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl, const uno::Reference< beans::XPropertySet > xDirProps(xDir, uno::UNO_QUERY_THROW); try { - ::rtl::OUString mimeType; + OUString mimeType; xDirProps->getPropertyValue( ::comphelper::MediaDescriptor::PROP_MEDIATYPE() ) >>= mimeType; @@ -561,11 +561,11 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl, return; } } catch (const uno::Exception &) { } - ::rtl::OUStringBuffer buf(i_rBaseURI); + OUStringBuffer buf(i_rBaseURI); buf.append(dir).append(static_cast('/')); readStream(i_rImpl, xDir, rest, buf.makeStringAndClear() ); } else { - throw mkException(::rtl::OUString( + throw mkException(OUString( "readStream: is not a directory"), ucb::IOErrorCode_NO_DIRECTORY, i_rBaseURI + dir, dir); } @@ -586,9 +586,9 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl, static void importFile(struct DocumentMetadataAccess_Impl & i_rImpl, uno::Reference const & i_xStorage, - ::rtl::OUString const & i_rBaseURI, + OUString const & i_rBaseURI, uno::Reference const & i_xHandler, - ::rtl::OUString i_rPath) + OUString i_rPath) { retry: try { @@ -599,7 +599,7 @@ retry: throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("importFile: exception"), + OUString("importFile: exception"), 0, uno::makeAny(e)); } } @@ -609,8 +609,8 @@ static void exportStream(struct DocumentMetadataAccess_Impl & i_rImpl, uno::Reference< embed::XStorage > const & i_xStorage, uno::Reference const & i_xGraphName, - ::rtl::OUString const & i_rFileName, - ::rtl::OUString const & i_rBaseURI) + OUString const & i_rFileName, + OUString const & i_rBaseURI) { const uno::Reference xStream( i_xStorage->openStreamElement(i_rFileName, @@ -620,8 +620,8 @@ exportStream(struct DocumentMetadataAccess_Impl & i_rImpl, uno::UNO_QUERY); if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage xStreamProps->setPropertyValue( - ::rtl::OUString("MediaType"), - uno::makeAny(::rtl::OUString(s_rdfxml))); + OUString("MediaType"), + uno::makeAny(OUString(s_rdfxml))); } const uno::Reference xOutStream( xStream->getOutputStream(), uno::UNO_SET_THROW ); @@ -636,11 +636,11 @@ static void writeStream(struct DocumentMetadataAccess_Impl & i_rImpl, uno::Reference< embed::XStorage > const & i_xStorage, uno::Reference const & i_xGraphName, - ::rtl::OUString const & i_rPath, - ::rtl::OUString const & i_rBaseURI) + OUString const & i_rPath, + OUString const & i_rBaseURI) { - ::rtl::OUString dir; - ::rtl::OUString rest; + OUString dir; + OUString rest; if (!splitPath(i_rPath, dir, rest)) throw uno::RuntimeException(); try { if (dir.isEmpty()) { @@ -653,7 +653,7 @@ writeStream(struct DocumentMetadataAccess_Impl & i_rImpl, const uno::Reference< beans::XPropertySet > xDirProps(xDir, uno::UNO_QUERY_THROW); try { - ::rtl::OUString mimeType; + OUString mimeType; xDirProps->getPropertyValue( ::comphelper::MediaDescriptor::PROP_MEDIATYPE() ) >>= mimeType; @@ -663,7 +663,7 @@ writeStream(struct DocumentMetadataAccess_Impl & i_rImpl, return; } } catch (const uno::Exception &) { } - ::rtl::OUStringBuffer buf(i_rBaseURI); + OUStringBuffer buf(i_rBaseURI); buf.append(dir).append(static_cast('/')); writeStream(i_rImpl, xDir, i_xGraphName, rest, buf.makeStringAndClear()); @@ -697,9 +697,9 @@ retry: i_rImpl.m_xRepository.set(rdf::Repository::create(i_rImpl.m_xContext), uno::UNO_SET_THROW); - const ::rtl::OUString manifest ( - ::rtl::OUString::createFromAscii(s_manifest)); - const ::rtl::OUString baseURI( i_xBaseURI->getStringValue() ); + const OUString manifest ( + OUString::createFromAscii(s_manifest)); + const OUString baseURI( i_xBaseURI->getStringValue() ); // try to delay raising errors until after initialization is done uno::Any rterr; ucb::InteractiveAugmentedIOException iaioe; @@ -740,7 +740,7 @@ retry: if (rterr.hasValue()) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "exception"), 0, rterr); } @@ -757,7 +757,7 @@ static void init(struct DocumentMetadataAccess_Impl & i_rImpl) i_rImpl.m_xManifest.set(i_rImpl.m_xRepository->createGraph( getURIForStream(i_rImpl, - ::rtl::OUString::createFromAscii(s_manifest))), + OUString::createFromAscii(s_manifest))), uno::UNO_SET_THROW); // insert the document statement @@ -766,17 +766,17 @@ static void init(struct DocumentMetadataAccess_Impl & i_rImpl) getURI(i_rImpl.m_xContext).get()); } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("init: unexpected exception"), 0, + OUString("init: unexpected exception"), 0, uno::makeAny(e)); } // add top-level content files if (!addContentOrStylesFileImpl(i_rImpl, - ::rtl::OUString::createFromAscii(s_content))) { + OUString::createFromAscii(s_content))) { throw uno::RuntimeException(); } if (!addContentOrStylesFileImpl(i_rImpl, - ::rtl::OUString::createFromAscii(s_styles))) { + OUString::createFromAscii(s_styles))) { throw uno::RuntimeException(); } } @@ -794,7 +794,7 @@ DocumentMetadataAccess::DocumentMetadataAccess( DocumentMetadataAccess::DocumentMetadataAccess( uno::Reference< uno::XComponentContext > const & i_xContext, const IXmlIdRegistrySupplier & i_rRegistrySupplier, - ::rtl::OUString const & i_rURI) + OUString const & i_rURI) : m_pImpl(new DocumentMetadataAccess_Impl(i_xContext, i_rRegistrySupplier)) { OSL_ENSURE(!i_rURI.isEmpty(), "DMA::DMA: no URI given!"); @@ -825,20 +825,20 @@ DocumentMetadataAccess::getRDFRepository() throw (uno::RuntimeException) } // ::com::sun::star::rdf::XNode: -::rtl::OUString SAL_CALL +OUString SAL_CALL DocumentMetadataAccess::getStringValue() throw (uno::RuntimeException) { return m_pImpl->m_xBaseURI->getStringValue(); } // ::com::sun::star::rdf::XURI: -::rtl::OUString SAL_CALL +OUString SAL_CALL DocumentMetadataAccess::getNamespace() throw (uno::RuntimeException) { return m_pImpl->m_xBaseURI->getNamespace(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL DocumentMetadataAccess::getLocalName() throw (uno::RuntimeException) { return m_pImpl->m_xBaseURI->getLocalName(); @@ -853,7 +853,7 @@ throw (uno::RuntimeException) const IXmlIdRegistry * pReg( m_pImpl->m_rXmlIdRegistrySupplier.GetXmlIdRegistry() ); if (!pReg) { - throw uno::RuntimeException(::rtl::OUString( + throw uno::RuntimeException(OUString( "DocumentMetadataAccess::getElementByXmlId: no registry"), *this); } return pReg->GetElementByMetadataReference(i_rReference); @@ -865,18 +865,18 @@ DocumentMetadataAccess::getElementByURI( throw (uno::RuntimeException, lang::IllegalArgumentException) { if (!i_xURI.is()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::getElementByURI: URI is null"), *this, 0); } - const ::rtl::OUString baseURI( m_pImpl->m_xBaseURI->getStringValue() ); - const ::rtl::OUString name( i_xURI->getStringValue() ); + const OUString baseURI( m_pImpl->m_xBaseURI->getStringValue() ); + const OUString name( i_xURI->getStringValue() ); if (!name.match(baseURI)) { return 0; } - const ::rtl::OUString relName( name.copy(baseURI.getLength()) ); - ::rtl::OUString path; - ::rtl::OUString idref; + const OUString relName( name.copy(baseURI.getLength()) ); + OUString path; + OUString idref; if (!splitXmlId(relName, path, idref)) { return 0; } @@ -891,7 +891,7 @@ DocumentMetadataAccess::getMetadataGraphsWithType( throw (uno::RuntimeException, lang::IllegalArgumentException) { if (!i_xType.is()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::getMetadataGraphsWithType: " "type is null"), *this, 0); } @@ -908,25 +908,25 @@ throw (uno::RuntimeException, lang::IllegalArgumentException) } uno::Reference SAL_CALL -DocumentMetadataAccess::addMetadataFile(const ::rtl::OUString & i_rFileName, +DocumentMetadataAccess::addMetadataFile(const OUString & i_rFileName, const uno::Sequence < uno::Reference< rdf::XURI > > & i_rTypes) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException) { if (!isFileNameValid(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::addMetadataFile: invalid FileName"), *this, 0); } if (isReservedFile(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::addMetadataFile:" "invalid FileName: reserved"), *this, 0); } for (sal_Int32 i = 0; i < i_rTypes.getLength(); ++i) { if (!i_rTypes[i].is()) { throw lang::IllegalArgumentException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::addMetadataFile: " "null type"), *this, 2); } @@ -939,7 +939,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, m_pImpl->m_xRepository->createGraph(xGraphName); } catch (const rdf::RepositoryException & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::addMetadataFile: exception"), *this, uno::makeAny(e)); // note: all other exceptions are propagated @@ -952,7 +952,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, uno::Reference SAL_CALL DocumentMetadataAccess::importMetadataFile(::sal_Int16 i_Format, const uno::Reference< io::XInputStream > & i_xInStream, - const ::rtl::OUString & i_rFileName, + const OUString & i_rFileName, const uno::Reference< rdf::XURI > & i_xBaseURI, const uno::Sequence < uno::Reference< rdf::XURI > > & i_rTypes) throw (uno::RuntimeException, lang::IllegalArgumentException, @@ -960,19 +960,19 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException, rdf::ParseException, io::IOException) { if (!isFileNameValid(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::importMetadataFile: invalid FileName"), *this, 0); } if (isReservedFile(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::importMetadataFile:" "invalid FileName: reserved"), *this, 0); } for (sal_Int32 i = 0; i < i_rTypes.getLength(); ++i) { if (!i_rTypes[i].is()) { throw lang::IllegalArgumentException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::importMetadataFile: null type"), *this, 5); } @@ -986,7 +986,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, i_Format, i_xInStream, xGraphName, i_xBaseURI); } catch (const rdf::RepositoryException & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::importMetadataFile: " "RepositoryException"), *this, uno::makeAny(e)); // note: all other exceptions are propagated @@ -1007,7 +1007,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, m_pImpl->m_xRepository->destroyGraph(i_xGraphName); } catch (const rdf::RepositoryException & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::removeMetadataFile: " "RepositoryException"), *this, uno::makeAny(e)); // note: all other exceptions are propagated @@ -1019,18 +1019,18 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, void SAL_CALL DocumentMetadataAccess::addContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException) { if (!isFileNameValid(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::addContentOrStylesFile: " "invalid FileName"), *this, 0); } if (!addContentOrStylesFileImpl(*m_pImpl, i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::addContentOrStylesFile: " "invalid FileName: must end with content.xml or styles.xml"), *this, 0); @@ -1039,12 +1039,12 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, void SAL_CALL DocumentMetadataAccess::removeContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (uno::RuntimeException, lang::IllegalArgumentException, container::NoSuchElementException) { if (!isFileNameValid(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::removeContentOrStylesFile: " "invalid FileName"), *this, 0); } @@ -1059,7 +1059,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, uno::UNO_SET_THROW); if (!xEnum->hasMoreElements()) { throw container::NoSuchElementException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::removeContentOrStylesFile: " "cannot find stream in manifest graph: ") + i_rFileName, *this); @@ -1072,7 +1072,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::removeContentOrStylesFile: exception"), *this, uno::makeAny(e)); } @@ -1086,34 +1086,34 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, lang::WrappedTargetException) { if (!i_xStorage.is()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "storage is null"), *this, 0); } if (!i_xBaseURI.is()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "base URI is null"), *this, 1); } - const ::rtl::OUString baseURI( i_xBaseURI->getStringValue()); + const OUString baseURI( i_xBaseURI->getStringValue()); if (baseURI.indexOf('#') >= 0) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "base URI not absolute"), *this, 1); } if (baseURI.isEmpty() || !baseURI.endsWithAsciiL("/", 1)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "base URI does not end with slash"), *this, 1); } initLoading(*m_pImpl, i_xStorage, i_xBaseURI, i_xHandler); - std::set< ::rtl::OUString > StgFiles; + std::set< OUString > StgFiles; collectFilesFromStorage(i_xStorage, - ::rtl::OUString(""), StgFiles); + OUString(""), StgFiles); - std::vector< ::rtl::OUString > MfstMetadataFiles; + std::vector< OUString > MfstMetadataFiles; try { const ::std::vector< uno::Reference< rdf::XURI > > parts( @@ -1125,19 +1125,19 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, const uno::Reference xMetadataFile( getURI(m_pImpl->m_xContext)); const sal_Int32 len( baseURI.getLength() ); - const ::rtl::OUString manifest ( - ::rtl::OUString::createFromAscii(s_manifest)); + const OUString manifest ( + OUString::createFromAscii(s_manifest)); for (::std::vector< uno::Reference< rdf::XURI > >::const_iterator it = parts.begin(); it != parts.end(); ++it) { - const ::rtl::OUString name((*it)->getStringValue()); + const OUString name((*it)->getStringValue()); if (!name.match(baseURI)) { OSL_TRACE("loadMetadataFromStorage: graph not in document: %s", - ::rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8) + OUStringToOString(name, RTL_TEXTENCODING_UTF8) .getStr()); continue; } - const ::rtl::OUString relName( name.copy(len) ); + const OUString relName( name.copy(len) ); if (relName == manifest) { OSL_TRACE("loadMetadataFromStorage: " "found ourselves a recursive manifest!"); @@ -1178,7 +1178,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "exception"), *this, uno::makeAny(e)); } @@ -1197,27 +1197,27 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, lang::WrappedTargetException) { if (!i_xStorage.is()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::storeMetadataToStorage: " "storage is null"), *this, 0); } // export manifest - const ::rtl::OUString manifest ( - ::rtl::OUString::createFromAscii(s_manifest)); + const OUString manifest ( + OUString::createFromAscii(s_manifest)); const uno::Reference xManifest( getURIForStream(*m_pImpl, manifest) ); - const ::rtl::OUString baseURI( m_pImpl->m_xBaseURI->getStringValue() ); + const OUString baseURI( m_pImpl->m_xBaseURI->getStringValue() ); try { writeStream(*m_pImpl, i_xStorage, xManifest, manifest, baseURI); } catch (const uno::RuntimeException &) { throw; } catch (const io::IOException & e) { - throw lang::WrappedTargetException( ::rtl::OUString( + throw lang::WrappedTargetException( OUString( "storeMetadataToStorage: IO exception"), *this, uno::makeAny(e)); } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "storeMetadataToStorage: exception"), *this, uno::makeAny(e)); } @@ -1228,20 +1228,20 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, const sal_Int32 len( baseURI.getLength() ); for (sal_Int32 i = 0; i < graphs.getLength(); ++i) { const uno::Reference xName(graphs[i]); - const ::rtl::OUString name(xName->getStringValue()); + const OUString name(xName->getStringValue()); if (!name.match(baseURI)) { OSL_TRACE("storeMetadataToStorage: graph not in document: %s", - ::rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8) + OUStringToOString(name, RTL_TEXTENCODING_UTF8) .getStr()); continue; } - const ::rtl::OUString relName( name.copy(len) ); + const OUString relName( name.copy(len) ); if (relName == manifest) { continue; } if (!isFileNameValid(relName) || isReservedFile(relName)) { OSL_TRACE("storeMetadataToStorage: invalid file name: %s", - ::rtl::OUStringToOString(relName, RTL_TEXTENCODING_UTF8) + OUStringToOString(relName, RTL_TEXTENCODING_UTF8) .getStr()); continue; } @@ -1251,19 +1251,19 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, throw; } catch (const io::IOException & e) { throw lang::WrappedTargetException( - ::rtl::OUString( + OUString( "storeMetadataToStorage: IO exception"), *this, uno::makeAny(e)); } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "storeMetadataToStorage: exception"), *this, uno::makeAny(e)); } } } catch (const rdf::RepositoryException & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "storeMetadataToStorage: exception"), *this, uno::makeAny(e)); } } @@ -1276,15 +1276,15 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, { uno::Reference xIn; ::comphelper::MediaDescriptor md(i_rMedium); - ::rtl::OUString URL; + OUString URL; md[ ::comphelper::MediaDescriptor::PROP_URL() ] >>= URL; - ::rtl::OUString BaseURL; + OUString BaseURL; md[ ::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL() ] >>= BaseURL; if (md.addInputStream()) { md[ ::comphelper::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xIn; } if (!xIn.is() && URL.isEmpty()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::loadMetadataFromMedium: " "inalid medium: no URL, no input stream"), *this, 0); } @@ -1303,12 +1303,12 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::loadMetadataFromMedium: " "exception"), *this, uno::makeAny(e)); } if (!xStorage.is()) { - throw uno::RuntimeException(::rtl::OUString( + throw uno::RuntimeException(OUString( "DocumentMetadataAccess::loadMetadataFromMedium: " "cannot get Storage"), *this); } @@ -1335,10 +1335,10 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, lang::WrappedTargetException) { ::comphelper::MediaDescriptor md(i_rMedium); - ::rtl::OUString URL; + OUString URL; md[ ::comphelper::MediaDescriptor::PROP_URL() ] >>= URL; if (URL.isEmpty()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::storeMetadataToMedium: " "invalid medium: no URL"), *this, 0); } @@ -1355,7 +1355,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, } if (!xStorage.is()) { - throw uno::RuntimeException(::rtl::OUString( + throw uno::RuntimeException(OUString( "DocumentMetadataAccess::storeMetadataToMedium: " "cannot get Storage"), *this); } @@ -1382,9 +1382,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, if ( nError == ERRCODE_NONE ) { nError = ERRCODE_IO_GENERAL; } - task::ErrorCodeIOException ex( ::rtl::OUString(), + task::ErrorCodeIOException ex( OUString(), uno::Reference< uno::XInterface >(), nError); - throw lang::WrappedTargetException(::rtl::OUString(), *this, + throw lang::WrappedTargetException(OUString(), *this, uno::makeAny(ex)); } } diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 4d830dcc9e2c..7387baba5255 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -357,9 +357,9 @@ typedef ::cppu::ImplInheritanceHelper1< SfxDocumentMetaData, css::document::XCom class CompatWriterDocPropsImpl : public CompatWriterDocPropsImpl_BASE { - rtl::OUString msManager; - rtl::OUString msCategory; - rtl::OUString msCompany; + OUString msManager; + OUString msCategory; + OUString msCompany; protected: virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new CompatWriterDocPropsImpl( context ); }; public: @@ -380,10 +380,10 @@ public: virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > sServiceNames= getSupportedServiceNames(); + css::uno::Sequence< OUString > sServiceNames= getSupportedServiceNames(); sal_Int32 nLen = sServiceNames.getLength(); - rtl::OUString* pIt = sServiceNames.getArray(); - rtl::OUString* pEnd = ( pIt + nLen ); + OUString* pIt = sServiceNames.getArray(); + OUString* pEnd = ( pIt + nLen ); sal_Bool bRes = sal_False; for ( ; pIt != pEnd; ++pIt ) { @@ -2337,8 +2337,8 @@ namespace comp_CompatWriterDocProps { css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { - css::uno::Sequence< rtl::OUString > aServiceNames(1); - aServiceNames[ 0 ] = rtl::OUString( "com.sun.star.writer.DocumentProperties" ); + css::uno::Sequence< OUString > aServiceNames(1); + aServiceNames[ 0 ] = OUString( "com.sun.star.writer.DocumentProperties" ); return aServiceNames; } diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index d0e305895868..25254aa49951 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -69,7 +69,7 @@ struct SfxObjectFactory_Impl { SfxViewFactoryArr_Impl aViewFactoryArr;// List of s ResId* pNameResId; - ::rtl::OUString aServiceName; + OUString aServiceName; SfxFilterContainer* pFilterContainer; SfxModule* pModule; sal_uInt16 nImageId; @@ -105,9 +105,9 @@ SfxObjectFactory::SfxObjectFactory nFlags( nFlagsP ) { DBG_CTOR(SfxObjectFactory, 0); - pImpl->pFilterContainer = new SfxFilterContainer( rtl::OUString::createFromAscii( pName ) ); + pImpl->pFilterContainer = new SfxFilterContainer( OUString::createFromAscii( pName ) ); - String aShortName( rtl::OUString::createFromAscii( pShortName ) ); + String aShortName( OUString::createFromAscii( pShortName ) ); aShortName.ToLowerAscii(); pImpl->aClassName = rName; if ( aShortName.EqualsAscii( "swriter" ) ) @@ -151,9 +151,9 @@ void SfxObjectFactory::RegisterViewFactory { if ( !pImpl->aViewFactoryArr[i]->GetAPIViewName().Equals( sViewName ) ) continue; - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "SfxObjectFactory::RegisterViewFactory: duplicate view name '")); - aStr.append(rtl::OUStringToOString(sViewName, RTL_TEXTENCODING_ASCII_US)); + aStr.append(OUStringToOString(sViewName, RTL_TEXTENCODING_ASCII_US)); aStr.append(RTL_CONSTASCII_STRINGPARAM("'!")); OSL_FAIL(aStr.getStr()); break; @@ -198,24 +198,24 @@ void SfxObjectFactory::SetModule_Impl( SfxModule *pMod ) void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const String& rTemplateName ) { static const int nMaxPathSize = 16000; - static ::rtl::OUString SERVICE_FILTER_FACTORY("com.sun.star.document.FilterFactory"); - static ::rtl::OUString SERVICE_TYPE_DECTECTION("com.sun.star.document.TypeDetection"); + static OUString SERVICE_FILTER_FACTORY("com.sun.star.document.FilterFactory"); + static OUString SERVICE_TYPE_DECTECTION("com.sun.star.document.TypeDetection"); - static ::rtl::OUString CONF_ROOT("/org.openoffice.Setup"); - static ::rtl::OUString CONF_PATH = ::rtl::OUString("Office/Factories/" ) + ::rtl::OUString( rServiceName ); - static ::rtl::OUString PROP_DEF_TEMPL_CHANGED("ooSetupFactorySystemDefaultTemplateChanged"); - static ::rtl::OUString PROP_ACTUAL_FILTER("ooSetupFactoryActualFilter"); + static OUString CONF_ROOT("/org.openoffice.Setup"); + static OUString CONF_PATH = OUString("Office/Factories/" ) + OUString( rServiceName ); + static OUString PROP_DEF_TEMPL_CHANGED("ooSetupFactorySystemDefaultTemplateChanged"); + static OUString PROP_ACTUAL_FILTER("ooSetupFactoryActualFilter"); - static ::rtl::OUString DEF_TPL_STR("/soffice."); + static OUString DEF_TPL_STR("/soffice."); - rtl::OUString sURL; + OUString sURL; String sPath; sal_Unicode aPathBuffer[nMaxPathSize]; if ( SystemPath::GetUserTemplateLocation( aPathBuffer, nMaxPathSize )) - sPath = rtl::OUString( aPathBuffer ); + sPath = OUString( aPathBuffer ); ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, sURL ); - ::rtl::OUString aUserTemplateURL( sURL ); + OUString aUserTemplateURL( sURL ); if ( !aUserTemplateURL.isEmpty()) { try @@ -224,7 +224,7 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri uno::Reference< uno::XInterface > xConfig = ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), CONF_ROOT, ::comphelper::ConfigurationHelper::E_STANDARD ); - ::rtl::OUString aActualFilter; + OUString aActualFilter; ::comphelper::ConfigurationHelper::readRelativeKey( xConfig, CONF_PATH, PROP_ACTUAL_FILTER ) >>= aActualFilter; sal_Bool bChanged(sal_False); ::comphelper::ConfigurationHelper::readRelativeKey( xConfig, CONF_PATH, PROP_DEF_TEMPL_CHANGED ) >>= bChanged; @@ -234,17 +234,17 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri uno::Reference< container::XNameAccess > xTypeDetection( xFactory->createInstance( SERVICE_TYPE_DECTECTION ), uno::UNO_QUERY_THROW ); - ::rtl::OUString aActualFilterTypeName; + OUString aActualFilterTypeName; uno::Sequence< beans::PropertyValue > aActuralFilterData; xFilterFactory->getByName( aActualFilter ) >>= aActuralFilterData; for ( sal_Int32 nInd = 0; nInd < aActuralFilterData.getLength(); nInd++ ) if ( aActuralFilterData[nInd].Name == "Type" ) aActuralFilterData[nInd].Value >>= aActualFilterTypeName; ::comphelper::SequenceAsHashMap aProps1( xTypeDetection->getByName( aActualFilterTypeName ) ); - uno::Sequence< ::rtl::OUString > aAllExt = - aProps1.getUnpackedValueOrDefault( ::rtl::OUString("Extensions"), uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aAllExt = + aProps1.getUnpackedValueOrDefault( OUString("Extensions"), uno::Sequence< OUString >() ); //To-do: check if aAllExt is empty first - ::rtl::OUString aExt = aAllExt[0]; + OUString aExt = aAllExt[0]; aUserTemplateURL += DEF_TPL_STR; aUserTemplateURL += aExt; @@ -252,9 +252,9 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri uno::Reference xSimpleFileAccess( ucb::SimpleFileAccess::create( ::comphelper::getComponentContext(xFactory) ) ); - ::rtl::OUString aBackupURL; + OUString aBackupURL; ::osl::Security().getConfigDir(aBackupURL); - aBackupURL += ::rtl::OUString("/temp"); + aBackupURL += OUString("/temp"); if ( !xSimpleFileAccess->exists( aBackupURL ) ) xSimpleFileAccess->createFolder( aBackupURL ); @@ -269,22 +269,22 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri uno::Reference< document::XTypeDetection > xTypeDetector( xTypeDetection, uno::UNO_QUERY ); ::comphelper::SequenceAsHashMap aProps2( xTypeDetection->getByName( xTypeDetector->queryTypeByURL( rTemplateName ) ) ); - ::rtl::OUString aFilterName = - aProps2.getUnpackedValueOrDefault( ::rtl::OUString("PreferredFilter"), ::rtl::OUString() ); + OUString aFilterName = + aProps2.getUnpackedValueOrDefault( OUString("PreferredFilter"), OUString() ); uno::Sequence< beans::PropertyValue > aArgs( 3 ); - aArgs[0].Name = ::rtl::OUString("FilterName"); + aArgs[0].Name = OUString("FilterName"); aArgs[0].Value <<= aFilterName; - aArgs[1].Name = ::rtl::OUString("AsTemplate"); + aArgs[1].Name = OUString("AsTemplate"); aArgs[1].Value <<= sal_True; - aArgs[2].Name = ::rtl::OUString("URL"); - aArgs[2].Value <<= ::rtl::OUString( rTemplateName ); + aArgs[2].Name = OUString("URL"); + aArgs[2].Value <<= OUString( rTemplateName ); - uno::Reference< frame::XLoadable > xLoadable( xFactory->createInstance( ::rtl::OUString( rServiceName ) ), uno::UNO_QUERY ); + uno::Reference< frame::XLoadable > xLoadable( xFactory->createInstance( OUString( rServiceName ) ), uno::UNO_QUERY ); xLoadable->load( aArgs ); aArgs.realloc( 2 ); - aArgs[1].Name = ::rtl::OUString("Overwrite"); + aArgs[1].Name = OUString("Overwrite"); aArgs[1].Value <<= sal_True; uno::Reference< frame::XStorable > xStorable( xLoadable, uno::UNO_QUERY ); @@ -336,7 +336,7 @@ String SfxObjectFactory::GetStandardTemplate( const String& rServiceName ) const SfxFilter* SfxObjectFactory::GetTemplateFilter() const { sal_uInt16 nVersion=0; - SfxFilterMatcher aMatcher ( rtl::OUString::createFromAscii( pShortName ) ); + SfxFilterMatcher aMatcher ( OUString::createFromAscii( pShortName ) ); SfxFilterMatcherIter aIter( aMatcher ); const SfxFilter *pFilter = 0; const SfxFilter *pTemp = aIter.First(); @@ -354,12 +354,12 @@ const SfxFilter* SfxObjectFactory::GetTemplateFilter() const return pFilter; } -void SfxObjectFactory::SetDocumentServiceName( const ::rtl::OUString& rServiceName ) +void SfxObjectFactory::SetDocumentServiceName( const OUString& rServiceName ) { pImpl->aServiceName = rServiceName; } -const ::rtl::OUString& SfxObjectFactory::GetDocumentServiceName() const +const OUString& SfxObjectFactory::GetDocumentServiceName() const { return pImpl->aServiceName; } @@ -371,7 +371,7 @@ const SvGlobalName& SfxObjectFactory::GetClassId() const String SfxObjectFactory::GetFactoryURL() const { - ::rtl::OUStringBuffer aURLComposer; + OUStringBuffer aURLComposer; aURLComposer.appendAscii(RTL_CONSTASCII_STRINGPARAM("private:factory/")); aURLComposer.appendAscii(GetShortName()); return aURLComposer.makeStringAndClear(); @@ -386,9 +386,9 @@ String SfxObjectFactory::GetModuleName() const css::uno::Reference< css::frame::XModuleManager2 > xModuleManager( css::frame::ModuleManager::create(xContext)); - ::rtl::OUString sDocService(GetDocumentServiceName()); + OUString sDocService(GetDocumentServiceName()); ::comphelper::SequenceAsHashMap aPropSet( xModuleManager->getByName(sDocService) ); - ::rtl::OUString sModuleName = aPropSet.getUnpackedValueOrDefault("ooSetupFactoryUIName", ::rtl::OUString()); + OUString sModuleName = aPropSet.getUnpackedValueOrDefault("ooSetupFactoryUIName", OUString()); return String(sModuleName); } catch(const css::uno::RuntimeException&) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 59ccfd069aad..5a2f391c4b03 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -148,15 +148,15 @@ bool IsSystemFileLockingUsed() uno::Reference< uno::XInterface > xCommonConfig = ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - ::rtl::OUString( "/org.openoffice.Office.Common" ), + OUString( "/org.openoffice.Office.Common" ), ::comphelper::ConfigurationHelper::E_STANDARD ); if ( !xCommonConfig.is() ) throw uno::RuntimeException(); ::comphelper::ConfigurationHelper::readRelativeKey( xCommonConfig, - ::rtl::OUString( "Misc/" ), - ::rtl::OUString( "UseDocumentSystemFileLocking" ) ) >>= bUseSystemLock; + OUString( "Misc/" ), + OUString( "UseDocumentSystemFileLocking" ) ) >>= bUseSystemLock; } catch( const uno::Exception& ) { @@ -175,15 +175,15 @@ bool IsOOoLockFileUsed() uno::Reference< uno::XInterface > xCommonConfig = ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - ::rtl::OUString( "/org.openoffice.Office.Common" ), + OUString( "/org.openoffice.Office.Common" ), ::comphelper::ConfigurationHelper::E_STANDARD ); if ( !xCommonConfig.is() ) throw uno::RuntimeException(); ::comphelper::ConfigurationHelper::readRelativeKey( xCommonConfig, - ::rtl::OUString( "Misc/" ), - ::rtl::OUString( "UseDocumentOOoLockFile" ) ) >>= bOOoLockFileUsed; + OUString( "Misc/" ), + OUString( "UseDocumentOOoLockFile" ) ) >>= bOOoLockFileUsed; } catch( const uno::Exception& ) { @@ -286,7 +286,7 @@ public: SvStream* m_pOutStream; const SfxFilter* pOrigFilter; - rtl::OUString aOrigURL; + OUString aOrigURL; DateTime aExpireTime; SfxFrameWeak wLoadTargetFrame; SvKeyValueIteratorRef xAttributes; @@ -307,7 +307,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > xInteraction; - ::rtl::OUString m_aBackupURL; + OUString m_aBackupURL; // the following member is changed and makes sence only during saving // TODO/LATER: in future the signature state should be controlled by the medium not by the document @@ -388,7 +388,7 @@ sal_uInt32 SfxMedium::GetLastStorageCreationState() } //------------------------------------------------------------------ -void SfxMedium::AddLog( const ::rtl::OUString& aMessage ) +void SfxMedium::AddLog( const OUString& aMessage ) { if ( !pImp->m_xLogRing.is() ) { @@ -406,7 +406,7 @@ void SfxMedium::AddLog( const ::rtl::OUString& aMessage ) } //------------------------------------------------------------------ -void SfxMedium::SetError( sal_uInt32 nError, const ::rtl::OUString& aLogMessage ) +void SfxMedium::SetError( sal_uInt32 nError, const OUString& aLogMessage ) { pImp->m_eError = nError; if ( pImp->m_eError != ERRCODE_NONE && !aLogMessage.isEmpty() ) @@ -453,7 +453,7 @@ void SfxMedium::CheckFileDate( const util::DateTime& aInitDate ) ::rtl::Reference< ::ucbhelper::InteractionContinuation > xSelected = xInteractionRequestImpl->getSelection(); if ( uno::Reference< task::XInteractionAbort >( xSelected.get(), uno::UNO_QUERY ).is() ) { - SetError( ERRCODE_ABORT, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) ); } } catch ( const uno::Exception& ) @@ -478,7 +478,7 @@ util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue ) uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext() ); - aContent.getPropertyValue( ::rtl::OUString("DateModified" ) ) >>= pImp->m_aDateTime; + aContent.getPropertyValue( OUString("DateModified" ) ) >>= pImp->m_aDateTime; pImp->m_bGotDateTime = true; } catch ( const ::com::sun::star::uno::Exception& ) @@ -514,7 +514,7 @@ Reference < XContent > SfxMedium::GetContent() const else { // TODO: OSL_FAIL("SfxMedium::GetContent()\nCreate Content? This code exists as fallback only. Please clarify, why its used."); - rtl::OUString aURL; + OUString aURL; if ( !pImp->m_aName.isEmpty() ) ::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aURL ); else if ( !pImp->m_aLogicName.isEmpty() ) @@ -528,9 +528,9 @@ Reference < XContent > SfxMedium::GetContent() const } //------------------------------------------------------------------ -::rtl::OUString SfxMedium::GetBaseURL( bool bForSaving ) +OUString SfxMedium::GetBaseURL( bool bForSaving ) { - ::rtl::OUString aBaseURL; + OUString aBaseURL; const SfxStringItem* pBaseURLItem = static_cast( GetItemSet()->GetItem(SID_DOC_BASEURL) ); if ( pBaseURLItem ) aBaseURL = pBaseURLItem->GetValue(); @@ -538,7 +538,7 @@ Reference < XContent > SfxMedium::GetContent() const { try { - Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString("BaseURI" ) ); + Any aAny = pImp->aContent.getPropertyValue( OUString("BaseURI" ) ); aAny >>= aBaseURL; } catch ( const ::com::sun::star::uno::Exception& ) @@ -554,7 +554,7 @@ Reference < XContent > SfxMedium::GetContent() const SvtSaveOptions aOpt; bool bIsRemote = IsRemote(); if( (bIsRemote && !aOpt.IsSaveRelINet()) || (!pImp->m_bRemote && !aOpt.IsSaveRelFSys()) ) - return ::rtl::OUString(); + return OUString(); } return aBaseURL; @@ -694,7 +694,7 @@ sal_Bool SfxMedium::CloseOutStream_Impl() } //------------------------------------------------------------------ -const rtl::OUString& SfxMedium::GetPhysicalName() const +const OUString& SfxMedium::GetPhysicalName() const { if ( pImp->m_aName.isEmpty() && !pImp->m_aLogicName.isEmpty() ) (( SfxMedium*)this)->CreateFileStream(); @@ -753,7 +753,7 @@ sal_Bool SfxMedium::IsStorage() if ( pImp->pTempFile ) { - rtl::OUString aURL; + OUString aURL; if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aURL ) ) { OSL_FAIL("Physical name not convertable!"); @@ -810,12 +810,12 @@ void SfxMedium::StorageBackup_Impl() { DoInternalBackup_Impl( aOriginalContent ); if( pImp->m_aBackupURL.isEmpty() ) - SetError( ERRCODE_SFX_CANTCREATEBACKUP, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_SFX_CANTCREATEBACKUP, OUString( OSL_LOG_PREFIX ) ); } } //------------------------------------------------------------------ -::rtl::OUString SfxMedium::GetBackup_Impl() +OUString SfxMedium::GetBackup_Impl() { if ( pImp->m_aBackupURL.isEmpty() ) StorageBackup_Impl(); @@ -869,14 +869,14 @@ void SfxMedium::SetEncryptionDataToStorage_Impl() { OSL_FAIL( "It must be possible to set a common password for the storage" ); // TODO/LATER: set the error code in case of problem - // SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + // SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } } } //------------------------------------------------------------------ -sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock ) +sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock ) { sal_Int8 nResult = LOCK_UI_NOLOCK; @@ -885,8 +885,8 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri if ( ::svt::DocumentLockFile::IsInteractionAllowed() && xHandler.is() && ( bIsLoading || bOwnLock ) ) { - ::rtl::OUString aDocumentURL = GetURLObject().GetLastName(); - ::rtl::OUString aInfo; + OUString aDocumentURL = GetURLObject().GetLastName(); + OUString aInfo; ::rtl::Reference< ::ucbhelper::InteractionRequest > xInteractionRequestImpl; if ( bOwnLock ) @@ -895,7 +895,7 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri aInfo = aData[LOCKFILE_EDITTIME_ID]; xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( - document::OwnLockOnDocumentRequest( ::rtl::OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo, !bIsLoading ) ) ); + document::OwnLockOnDocumentRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo, !bIsLoading ) ) ); } else { @@ -908,21 +908,21 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri if ( !aInfo.isEmpty() && !aData[LOCKFILE_EDITTIME_ID].isEmpty() ) { - aInfo += ::rtl::OUString( " ( " ); + aInfo += OUString( " ( " ); aInfo += aData[LOCKFILE_EDITTIME_ID]; - aInfo += ::rtl::OUString( " )" ); + aInfo += OUString( " )" ); } } if ( bIsLoading ) { xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( - document::LockedDocumentRequest( ::rtl::OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); + document::LockedDocumentRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); } else { xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( - document::LockedOnSavingRequest( ::rtl::OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); + document::LockedOnSavingRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); } } @@ -938,7 +938,7 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri ::rtl::Reference< ::ucbhelper::InteractionContinuation > xSelected = xInteractionRequestImpl->getSelection(); if ( uno::Reference< task::XInteractionAbort >( xSelected.get(), uno::UNO_QUERY ).is() ) { - SetError( ERRCODE_ABORT, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) ); } else if ( uno::Reference< task::XInteractionDisapprove >( xSelected.get(), uno::UNO_QUERY ).is() ) { @@ -977,7 +977,7 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); } else - SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_ACCESSDENIED, OUString( OSL_LOG_PREFIX ) ); } @@ -1051,7 +1051,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) // MediaDescriptor does this check also, the duplication should be avoided in future Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext() ); - aContent.getPropertyValue( ::rtl::OUString( "IsReadOnly" ) ) >>= bContentReadonly; + aContent.getPropertyValue( OUString( "IsReadOnly" ) ) >>= bContentReadonly; } catch( const uno::Exception& ) {} @@ -1165,7 +1165,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) if ( !bResult ) { - uno::Sequence< ::rtl::OUString > aData; + uno::Sequence< OUString > aData; try { // impossibility to get data is no real problem @@ -1179,7 +1179,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) if ( !bHandleSysLocked ) { - uno::Sequence< ::rtl::OUString > aOwnData = aLockFile.GenerateOwnEntry(); + uno::Sequence< OUString > aOwnData = aLockFile.GenerateOwnEntry(); bOwnLock = ( aData.getLength() > LOCKFILE_USERURL_ID && aOwnData.getLength() > LOCKFILE_USERURL_ID && aOwnData[LOCKFILE_SYSUSERNAME_ID].equals( aData[LOCKFILE_SYSUSERNAME_ID] ) ); @@ -1228,7 +1228,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) SFX_ITEMSET_ARG( pImp->m_pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, false ); if ( !bLoading || (pReadOnlyItem && !pReadOnlyItem->GetValue()) ) - SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_ACCESSDENIED, OUString( OSL_LOG_PREFIX ) ); else GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); } @@ -1281,9 +1281,9 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf new utl::ProgressHandlerWrap( xStatusIndicator ) ); uno::Sequence< beans::PropertyValue > aAddProps( 2 ); - aAddProps[0].Name = ::rtl::OUString("RepairPackage"); + aAddProps[0].Name = OUString("RepairPackage"); aAddProps[0].Value <<= (sal_Bool)true; - aAddProps[1].Name = ::rtl::OUString("StatusIndicator"); + aAddProps[1].Name = OUString("StatusIndicator"); aAddProps[1].Value <<= xProgressHandler; // the first arguments will be filled later @@ -1384,7 +1384,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf pImp->m_nStorOpenMode = SFX_STREAM_READONLY; pImp->xStorage = comphelper::OStorageHelper::GetStorageFromURL( aTmpName, embed::ElementModes::READ ); pImp->bStorageBasedOnInStream = false; - rtl::OUString aTemp; + OUString aTemp; ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTmpName, aTemp ); SetPhysicalName_Impl( aTemp ); @@ -1582,13 +1582,13 @@ sal_Bool SfxMedium::StorageCommit_Impl() } if ( !GetError() ) - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } catch ( const uno::Exception& ) { //TODO/LATER: improve error handling - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } } @@ -1724,7 +1724,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, } //------------------------------------------------------------------ -sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& aTargetSet ) +sal_Bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet ) { if ( GetError() ) return false; @@ -1774,7 +1774,7 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& Any aCmdArg; aCmdArg <<= aInsertArg; - aTargetContent.executeCommand( ::rtl::OUString( "insert" ), + aTargetContent.executeCommand( OUString( "insert" ), aCmdArg ); if ( xSeek.is() ) @@ -1795,7 +1795,7 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& void SfxMedium::Transfer_Impl() { // The transfer is required only in two cases: either if there is a temporary file or if there is a salvage item - rtl::OUString aNameURL; + OUString aNameURL; if ( pImp->pTempFile ) aNameURL = pImp->pTempFile->GetURL(); else if ( !pImp->m_aLogicName.isEmpty() && pImp->m_bSalvageMode ) @@ -1864,7 +1864,7 @@ void SfxMedium::Transfer_Impl() else { OSL_FAIL( "Illegal Output stream parameter!\n" ); - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } // free the reference @@ -1896,7 +1896,7 @@ void SfxMedium::Transfer_Impl() aAny <<= pSegmentSize->GetValue(); uno::Reference < beans::XPropertySet > xSet( pImp->xStorage, uno::UNO_QUERY ); - xSet->setPropertyValue( rtl::OUString("SegmentSize"), aAny ); + xSet->setPropertyValue( OUString("SegmentSize"), aAny ); // copy the temporary storage into the disk spanned package GetStorage()->copyToStorage( xStor ); @@ -1925,7 +1925,7 @@ void SfxMedium::Transfer_Impl() xComEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< ::com::sun::star::ucb::XProgressHandler >() ); - rtl::OUString aDestURL( aDest.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aDestURL( aDest.GetMainURL( INetURLObject::NO_DECODE ) ); if ( ::utl::LocalFileHelper::IsLocalFile( aDestURL ) || !aDest.removeSegment() ) { @@ -1937,7 +1937,7 @@ void SfxMedium::Transfer_Impl() { aFile.sync(); OSL_TRACE("fsync'd saved file '%s'\n", - rtl::OUStringToOString( aDestURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aDestURL, RTL_TEXTENCODING_UTF8 ).getStr() ); aFile.close(); } } @@ -1955,7 +1955,7 @@ void SfxMedium::Transfer_Impl() // Get the parent URL from the XChild if possible: why would the URL necessarily have // a hierarchical path? It's not always the case for CMIS. Reference< ::com::sun::star::container::XChild> xChild( aDestContent.get(), uno::UNO_QUERY ); - rtl::OUString sParentUrl; + OUString sParentUrl; if ( xChild.is( ) ) { Reference< ::com::sun::star::ucb::XContent > xParent( xChild->getParent( ), uno::UNO_QUERY ); @@ -1976,8 +1976,8 @@ void SfxMedium::Transfer_Impl() // LongName wasn't defined anywhere, only used here... get the Title instead // as it's less probably empty - rtl::OUString aFileName; - Any aAny = aDestContent.getPropertyValue( ::rtl::OUString("Title" ) ); + OUString aFileName; + Any aAny = aDestContent.getPropertyValue( OUString("Title" ) ); aAny >>= aFileName; if ( aFileName.isEmpty() ) aFileName = GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); @@ -2028,10 +2028,10 @@ void SfxMedium::Transfer_Impl() try { - rtl::OUString aMimeType = pImp->getFilterMimeType(); + OUString aMimeType = pImp->getFilterMimeType(); ::ucbhelper::InsertOperation eOperation = ::ucbhelper::InsertOperation_COPY; bool bMajor = false; - rtl::OUString sComment; + OUString sComment; if ( IsInCheckIn( ) ) { eOperation = ::ucbhelper::InsertOperation_CHECKIN; @@ -2041,7 +2041,7 @@ void SfxMedium::Transfer_Impl() if ( pComments ) sComment = pComments->GetValue( ); } - rtl::OUString sResultURL; + OUString sResultURL; if (!aTransferContent.transferContent( aSourceContent, eOperation, aFileName, nNameClash, aMimeType, bMajor, sComment, &sResultURL )) pImp->m_eError = ERRCODE_IO_GENERAL; @@ -2101,7 +2101,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont aTransactTemp.EnableKillingFile( false ); INetURLObject aBackObj( aTransactTemp.GetURL() ); - ::rtl::OUString aBackupName = aBackObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aBackupName = aBackObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); Reference < ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aBackupCont; @@ -2109,7 +2109,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont { try { - rtl::OUString sMimeType = pImp->getFilterMimeType(); + OUString sMimeType = pImp->getFilterMimeType(); if( aBackupCont.transferContent( aOriginalContent, ::ucbhelper::InsertOperation_COPY, aBackupName, @@ -2134,7 +2134,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont if ( !pImp->m_aBackupURL.isEmpty() ) return; // the backup was done already - ::rtl::OUString aFileName = GetURLObject().getName( INetURLObject::LAST_SEGMENT, + OUString aFileName = GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::NO_DECODE ); @@ -2197,7 +2197,7 @@ void SfxMedium::DoBackup_Impl() try { // do the transfer ( copy source file to backup dir ) - rtl::OUString sMimeType = pImp->getFilterMimeType(); + OUString sMimeType = pImp->getFilterMimeType(); bSuccess = aContent.transferContent( aSourceContent, ::ucbhelper::InsertOperation_COPY, aFileName, @@ -2234,7 +2234,7 @@ void SfxMedium::ClearBackup_Impl() if ( ::utl::UCBContentHelper::Kill( pImp->m_aBackupURL ) ) { pImp->m_bRemoveBackup = false; - pImp->m_aBackupURL = ::rtl::OUString(); + pImp->m_aBackupURL = OUString(); } else { @@ -2244,7 +2244,7 @@ void SfxMedium::ClearBackup_Impl() } } else - pImp->m_aBackupURL = ::rtl::OUString(); + pImp->m_aBackupURL = OUString(); } //---------------------------------------------------------------- @@ -2314,7 +2314,7 @@ void SfxMedium::GetMedium_Impl() else { uno::Sequence < beans::PropertyValue > xProps; - rtl::OUString aFileName; + OUString aFileName; if (!pImp->m_aName.isEmpty()) { if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aFileName ) ) @@ -2359,7 +2359,7 @@ void SfxMedium::GetMedium_Impl() { if ( bFromTempFile ) { - aMedium[comphelper::MediaDescriptor::PROP_URL()] <<= ::rtl::OUString( aFileName ); + aMedium[comphelper::MediaDescriptor::PROP_URL()] <<= OUString( aFileName ); aMedium.erase( comphelper::MediaDescriptor::PROP_READONLY() ); aMedium.addInputStream(); } @@ -2396,7 +2396,7 @@ void SfxMedium::GetMedium_Impl() //TODO/MBA: ErrorHandling - how to transport error from MediaDescriptor if ( !GetError() && !pImp->xStream.is() && !pImp->xInputStream.is() ) - SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_ACCESSDENIED, OUString( OSL_LOG_PREFIX ) ); if ( !GetError() ) { @@ -2607,7 +2607,7 @@ const SfxFilter* SfxMedium::GetOrigFilter( sal_Bool bNotCurrent ) const //---------------------------------------------------------------- -sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const ::rtl::OUString& aPasswd, sal_Bool bWriter ) +sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, sal_Bool bWriter ) { sal_uInt32 nHash = 0; @@ -2788,7 +2788,7 @@ const OUString& SfxMedium::GetOrigURL() const //---------------------------------------------------------------- -void SfxMedium::SetPhysicalName_Impl( const rtl::OUString& rNameP ) +void SfxMedium::SetPhysicalName_Impl( const OUString& rNameP ) { if ( rNameP != pImp->m_aName ) { @@ -2890,7 +2890,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b SFX_ITEMSET_ARG( pImp->m_pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, false ); if (!pFileNameItem) throw uno::RuntimeException(); - ::rtl::OUString aNewTempFileURL = SfxMedium::CreateTempCopyWithExt( pFileNameItem->GetValue() ); + OUString aNewTempFileURL = SfxMedium::CreateTempCopyWithExt( pFileNameItem->GetValue() ); if ( !aNewTempFileURL.isEmpty() ) { pImp->m_pSet->Put( SfxStringItem( SID_FILE_NAME, aNewTempFileURL ) ); @@ -2965,7 +2965,7 @@ SfxMedium::~SfxMedium() if( pImp->bIsTemp && !pImp->m_aName.isEmpty() ) { - rtl::OUString aTemp; + OUString aTemp; if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aTemp )) { OSL_FAIL("Physical name not convertable!"); @@ -3062,11 +3062,11 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() { try { - Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString("MediaType") ); - ::rtl::OUString aContentType; + Any aAny = pImp->aContent.getPropertyValue( OUString("MediaType") ); + OUString aContentType; aAny >>= aContentType; - pImp->xAttributes->Append( SvKeyValue( ::rtl::OUString("content-type"), aContentType ) ); + pImp->xAttributes->Append( SvKeyValue( OUString("content-type"), aContentType ) ); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -3155,7 +3155,7 @@ sal_uInt16 SfxMedium::AddVersion_Impl( util::RevisionTag& rRevision ) return 0; } -sal_Bool SfxMedium::RemoveVersion_Impl( const ::rtl::OUString& rName ) +sal_Bool SfxMedium::RemoveVersion_Impl( const OUString& rName ) { if ( !pImp->aVersions.getLength() ) return false; @@ -3238,7 +3238,7 @@ bool SfxMedium::IsOriginallyReadOnly() const } //---------------------------------------------------------------- -sal_Bool SfxMedium::SetWritableForUserOnly( const ::rtl::OUString& aURL ) +sal_Bool SfxMedium::SetWritableForUserOnly( const OUString& aURL ) { // UCB does not allow to allow write access only for the user, // use osl API @@ -3282,10 +3282,10 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace ) pImp->pTempFile = new ::utl::TempFile(); pImp->pTempFile->EnableKillingFile( true ); pImp->m_aName = pImp->pTempFile->GetFileName(); - ::rtl::OUString aTmpURL = pImp->pTempFile->GetURL(); + OUString aTmpURL = pImp->pTempFile->GetURL(); if ( pImp->m_aName.isEmpty() || aTmpURL.isEmpty() ) { - SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_CANTWRITE, OUString( OSL_LOG_PREFIX ) ); return; } @@ -3303,13 +3303,13 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace ) { uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv; INetURLObject aTmpURLObj( aTmpURL ); - ::rtl::OUString aFileName = aTmpURLObj.getName( INetURLObject::LAST_SEGMENT, + OUString aFileName = aTmpURLObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); if ( !aFileName.isEmpty() && aTmpURLObj.removeSegment() ) { ::ucbhelper::Content aTargetContent( aTmpURLObj.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() ); - rtl::OUString sMimeType = pImp->getFilterMimeType(); + OUString sMimeType = pImp->getFilterMimeType(); if ( aTargetContent.transferContent( pImp->aContent, ::ucbhelper::InsertOperation_COPY, aFileName, NameClash::OVERWRITE, sMimeType ) ) { SetWritableForUserOnly( aTmpURL ); @@ -3363,7 +3363,7 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace ) if ( !bTransferSuccess ) { - SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_CANTWRITE, OUString( OSL_LOG_PREFIX ) ); return; } } @@ -3383,7 +3383,7 @@ void SfxMedium::CreateTempFileNoCopy() pImp->m_aName = pImp->pTempFile->GetFileName(); if ( pImp->m_aName.isEmpty() ) { - SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_CANTWRITE, OUString( OSL_LOG_PREFIX ) ); return; } @@ -3391,7 +3391,7 @@ void SfxMedium::CreateTempFileNoCopy() CloseStorage(); } -sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::OUString& aODFVersion, sal_Bool bHasValidDocumentSignature ) +sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const OUString& aODFVersion, sal_Bool bHasValidDocumentSignature ) { bool bChanges = false; @@ -3421,7 +3421,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl:: throw uno::RuntimeException(); uno::Reference< embed::XStorage > xMetaInf = xWriteableZipStor->openStorageElement( - ::rtl::OUString( "META-INF" ), + OUString( "META-INF" ), embed::ElementModes::READWRITE ); if ( !xMetaInf.is() ) throw uno::RuntimeException(); @@ -3438,7 +3438,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl:: if ( xSigner->signScriptingContent( GetZipStorageToSign_Impl(), xStream ) ) { // remove the document signature if any - ::rtl::OUString aDocSigName = xSigner->getDocumentContentSignatureDefaultStreamName(); + OUString aDocSigName = xSigner->getDocumentContentSignatureDefaultStreamName(); if ( !aDocSigName.isEmpty() && xMetaInf->hasByName( aDocSigName ) ) xMetaInf->removeElement( aDocSigName ); @@ -3522,21 +3522,21 @@ sal_Bool SfxMedium::IsOpen() const return pImp->m_pInStream || pImp->m_pOutStream || pImp->xStorage.is(); } -::rtl::OUString SfxMedium::CreateTempCopyWithExt( const ::rtl::OUString& aURL ) +OUString SfxMedium::CreateTempCopyWithExt( const OUString& aURL ) { - ::rtl::OUString aResult; + OUString aResult; if ( !aURL.isEmpty() ) { sal_Int32 nPrefixLen = aURL.lastIndexOf( '.' ); String aExt = ( nPrefixLen == -1 ) ? String() : String( aURL.copy( nPrefixLen ) ); - ::rtl::OUString aNewTempFileURL = ::utl::TempFile( String(), &aExt ).GetURL(); + OUString aNewTempFileURL = ::utl::TempFile( String(), &aExt ).GetURL(); if ( !aNewTempFileURL.isEmpty() ) { INetURLObject aSource( aURL ); INetURLObject aDest( aNewTempFileURL ); - ::rtl::OUString aFileName = aDest.getName( INetURLObject::LAST_SEGMENT, + OUString aFileName = aDest.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); if ( !aFileName.isEmpty() && aDest.removeSegment() ) @@ -3594,17 +3594,17 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction return bResult; } -::rtl::OUString SfxMedium::SwitchDocumentToTempFile() +OUString SfxMedium::SwitchDocumentToTempFile() { // the method returns empty string in case of failure - ::rtl::OUString aResult; - ::rtl::OUString aOrigURL = pImp->m_aLogicName; + OUString aResult; + OUString aOrigURL = pImp->m_aLogicName; if ( !aOrigURL.isEmpty() ) { sal_Int32 nPrefixLen = aOrigURL.lastIndexOf( '.' ); String aExt = ( nPrefixLen == -1 ) ? String() : String( aOrigURL.copy( nPrefixLen ) ); - ::rtl::OUString aNewURL = ::utl::TempFile( String(), &aExt ).GetURL(); + OUString aNewURL = ::utl::TempFile( String(), &aExt ).GetURL(); // TODO/LATER: In future the aLogicName should be set to shared folder URL // and a temporary file should be created. Transport_Impl should be impossible then. @@ -3667,11 +3667,11 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction return aResult; } -sal_Bool SfxMedium::SwitchDocumentToFile( const rtl::OUString& aURL ) +sal_Bool SfxMedium::SwitchDocumentToFile( const OUString& aURL ) { // the method is only for storage based documents bool bResult = false; - ::rtl::OUString aOrigURL = pImp->m_aLogicName; + OUString aOrigURL = pImp->m_aLogicName; if ( !aURL.isEmpty() && !aOrigURL.isEmpty() ) { diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index 1028f85a5a92..a6ed5aa6f84b 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -127,26 +127,26 @@ const SfxFilter* SfxFilter::GetFilterByName( const String& rName ) OUString SfxFilter::GetTypeFromStorage( const SotStorage& rStg ) { const char* pType=0; - if ( rStg.IsStream( rtl::OUString("WordDocument") ) ) + if ( rStg.IsStream( OUString("WordDocument") ) ) { - if ( rStg.IsStream( rtl::OUString("0Table") ) || rStg.IsStream( rtl::OUString("1Table") ) ) + if ( rStg.IsStream( OUString("0Table") ) || rStg.IsStream( OUString("1Table") ) ) pType = "writer_MS_Word_97"; else pType = "writer_MS_Word_95"; } - else if ( rStg.IsStream( rtl::OUString("Book") ) ) + else if ( rStg.IsStream( OUString("Book") ) ) { pType = "calc_MS_Excel_95"; } - else if ( rStg.IsStream( rtl::OUString("Workbook" ) ) ) + else if ( rStg.IsStream( OUString("Workbook" ) ) ) { pType = "calc_MS_Excel_97"; } - else if ( rStg.IsStream( rtl::OUString("PowerPoint Document") ) ) + else if ( rStg.IsStream( OUString("PowerPoint Document") ) ) { pType = "impress_MS_PowerPoint_97"; } - else if ( rStg.IsStream( rtl::OUString("Equation Native") ) ) + else if ( rStg.IsStream( OUString("Equation Native") ) ) { pType = "math_MathType_3x"; } @@ -161,7 +161,7 @@ OUString SfxFilter::GetTypeFromStorage( const SotStorage& rStg ) } } - return pType ? rtl::OUString::createFromAscii(pType) : rtl::OUString(); + return pType ? OUString::createFromAscii(pType) : OUString(); } OUString SfxFilter::GetTypeFromStorage( diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index d1b156164cd8..5dbb9dd97f29 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -82,7 +82,7 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( if( xGlobSect->GetStringValue( aStrValue, PROPID_AUTHOR) ) i_xDocProps->setAuthor( aStrValue ); else - i_xDocProps->setAuthor( ::rtl::OUString() ); + i_xDocProps->setAuthor( OUString() ); if( xGlobSect->GetFileTimeValue( aDateTime, PROPID_CREATED ) ) i_xDocProps->setCreationDate( aDateTime ); else @@ -91,13 +91,13 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( if( xGlobSect->GetStringValue( aStrValue, PROPID_LASTAUTHOR) ) i_xDocProps->setModifiedBy( aStrValue ); else - i_xDocProps->setModifiedBy( ::rtl::OUString() ); + i_xDocProps->setModifiedBy( OUString() ); if( xGlobSect->GetFileTimeValue( aDateTime, PROPID_LASTSAVED ) ) i_xDocProps->setModificationDate( aDateTime ); else i_xDocProps->setModificationDate( aInvalid ); - i_xDocProps->setPrintedBy( ::rtl::OUString() ); + i_xDocProps->setPrintedBy( OUString() ); if( xGlobSect->GetFileTimeValue( aDateTime, PROPID_LASTPRINTED ) ) i_xDocProps->setPrintDate( aDateTime ); else @@ -149,7 +149,7 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( for( ::std::vector< sal_Int32 >::const_iterator aIt = aPropIds.begin(), aEnd = aPropIds.end(); aIt != aEnd; ++aIt ) { - ::rtl::OUString aPropName = xCustomSect->GetPropertyName( *aIt ); + OUString aPropName = xCustomSect->GetPropertyName( *aIt ); uno::Any aPropValue = xCustomSect->GetAnyValue( *aIt ); if( !aPropName.isEmpty() && aPropValue.hasValue() ) { @@ -232,13 +232,13 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( rGlobSect.SetFileTimeValue( PROPID_EDITTIME, aEditTime ); rGlobSect.SetStringValue( PROPID_REVNUMBER, - rtl::OUString::valueOf( static_cast(i_xDocProps->getEditingCycles()) ) ); + OUString::valueOf( static_cast(i_xDocProps->getEditingCycles()) ) ); if ( i_pThumb && i_pThumb->getLength() ) rGlobSect.SetThumbnailValue( PROPID_THUMBNAIL, *i_pThumb ); // save the property set ErrCode nGlobError = aGlobSet.SavePropertySet(i_pStorage, - ::rtl::OUString(STREAM_SUMMARYINFO)); + OUString(STREAM_SUMMARYINFO)); // *** custom properties into stream "005DocumentSummaryInformation" *** @@ -255,7 +255,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( const sal_Int32 nPropId = rCustomSect.GetFreePropertyId(); rCustomSect.SetBlobValue( nPropId, *i_pGuid ); rCustomSect.SetPropertyName( nPropId, - ::rtl::OUString("_PID_GUID") ); + OUString("_PID_GUID") ); } // write hyperlinks @@ -263,7 +263,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( const sal_Int32 nPropId = rCustomSect.GetFreePropertyId(); rCustomSect.SetBlobValue( nPropId, *i_pHyperlinks ); rCustomSect.SetPropertyName( nPropId, - ::rtl::OUString("_PID_HLINKS") ); + OUString("_PID_HLINKS") ); } uno::Reference xUserDefinedProps( @@ -280,7 +280,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( // skip transient properties if (~props[i].Attributes & beans::PropertyAttribute::TRANSIENT) { - const ::rtl::OUString name = props[i].Name; + const OUString name = props[i].Name; const sal_Int32 nPropId = rCustomSect.GetFreePropertyId(); if (rCustomSect.SetAnyValue( nPropId, xUserDefinedProps->getPropertyValue(name))) { diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index c76372121a21..a59b43506823 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -118,7 +118,7 @@ SfxMediumList* DocumentInserter::CreateMediumList() SfxMediumList* pMediumList = new SfxMediumList; if (!m_nError && m_pItemSet && !m_pURLList.empty()) { - for(std::vector::const_iterator i = m_pURLList.begin(); i != m_pURLList.end(); ++i) + for(std::vector::const_iterator i = m_pURLList.begin(); i != m_pURLList.end(); ++i) { SfxMedium* pMedium = new SfxMedium( *i, SFX_STREAM_READONLY, @@ -144,11 +144,11 @@ SfxMediumList* DocumentInserter::CreateMediumList() return pMediumList; } -void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, std::vector& _rpURLList ) +void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, std::vector& _rpURLList ) { DBG_ASSERT( _pFileDlg, "DocumentInserter::fillURLList(): invalid file dialog" ); - Sequence < ::rtl::OUString > aPathSeq = _pFileDlg->GetSelectedFiles(); + Sequence < OUString > aPathSeq = _pFileDlg->GetSelectedFiles(); if ( aPathSeq.getLength() ) { diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index f002f23239ca..83d557203d62 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -121,7 +121,7 @@ namespace sfx2 //................................................................ sal_Bool lcl_showMacroWarning( const Reference< XInteractionHandler >& rxHandler, - const ::rtl::OUString& rDocumentLocation ) + const OUString& rDocumentLocation ) { DocumentMacroConfirmationRequest aRequest; aRequest.DocumentURL = rDocumentLocation; @@ -217,14 +217,14 @@ namespace sfx2 try { - ::rtl::OUString sReferrer( m_pData->m_rDocumentAccess.getDocumentLocation() ); + OUString sReferrer( m_pData->m_rDocumentAccess.getDocumentLocation() ); // get document location from medium name and check whether it is a trusted one // the service is created ohne document version, since it is not of interest here Reference< XDocumentDigitalSignatures > xSignatures(DocumentDigitalSignatures::createDefault(::comphelper::getProcessComponentContext())); INetURLObject aURLReferer( sReferrer ); - ::rtl::OUString aLocation; + OUString aLocation; if ( aURLReferer.removeSegment() ) aLocation = aURLReferer.GetMainURL( INetURLObject::NO_DECODE ); @@ -295,9 +295,9 @@ namespace sfx2 if ( eAutoConfirm == eNoAutoConfirm ) { - ::rtl::OUString sReferrer( m_pData->m_rDocumentAccess.getDocumentLocation() ); + OUString sReferrer( m_pData->m_rDocumentAccess.getDocumentLocation() ); - ::rtl::OUString aSystemFileURL; + OUString aSystemFileURL; if ( osl::FileBase::getSystemPathFromFileURL( sReferrer, aSystemFileURL ) == osl::FileBase::E_None ) sReferrer = aSystemFileURL; @@ -331,8 +331,8 @@ namespace sfx2 bHasMacroLib = sal_False; else { - ::rtl::OUString aStdLibName( "Standard" ); - Sequence< ::rtl::OUString > aElements = xContainer->getElementNames(); + OUString aStdLibName( "Standard" ); + Sequence< OUString > aElements = xContainer->getElementNames(); if ( aElements.getLength() ) { if ( aElements.getLength() > 1 || !aElements[0].equals( aStdLibName ) ) @@ -393,8 +393,8 @@ namespace sfx2 { try { - const ::rtl::OUString s_sBasicStorageName( ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Basic" ) ) ); - const ::rtl::OUString s_sScriptsStorageName( ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Scripts" ) ) ); + const OUString s_sBasicStorageName( OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Basic" ) ) ); + const OUString s_sScriptsStorageName( OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Scripts" ) ) ); bHasMacros =( ( rxStorage->hasByName( s_sBasicStorageName ) && rxStorage->isStorageElement( s_sBasicStorageName ) diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 5132e70384d0..802882fea206 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -483,8 +483,8 @@ String SfxDocumentTemplates::GetPath //------------------------------------------------------------------------ -::rtl::OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName, - const ::rtl::OUString& aTitle ) +OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString& aGroupName, + const OUString& aTitle ) { DocTemplLocker_Impl aLocker( *pImp ); @@ -499,7 +499,7 @@ String SfxDocumentTemplates::GetPath INetURLObject::ENCODE_ALL ); - ::rtl::OUString aResult; + OUString aResult; Content aTemplate; uno::Reference< XCommandEnvironment > aCmdEnv; if ( Content::create( aTemplateObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) ) @@ -611,7 +611,7 @@ sal_Bool SfxDocumentTemplates::CopyOrMove INetURLObject aSourceObj( pSource->GetTargetURL() ); - ::rtl::OUString aNewTargetURL = GetTemplateTargetURLFromComponent( pTargetRgn->GetTitle(), aTitle ); + OUString aNewTargetURL = GetTemplateTargetURLFromComponent( pTargetRgn->GetTitle(), aTitle ); if ( aNewTargetURL.isEmpty() ) return sal_False; @@ -833,7 +833,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom uno::Reference< XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString("Hidden"); + aArgs[0].Name = OUString("Hidden"); aArgs[0].Value <<= sal_True; INetURLObject aTemplURL( rName ); diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 130777f09121..6d993e8515c5 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -210,29 +210,29 @@ class SfxDocTplService_Impl sal_Bool bFsysFolder, Content &rNewFolder ); - sal_Bool CreateNewUniqueFolderWithPrefix( const ::rtl::OUString& aPath, - const ::rtl::OUString& aPrefix, - ::rtl::OUString& aNewFolderName, - ::rtl::OUString& aNewFolderURL, + sal_Bool CreateNewUniqueFolderWithPrefix( const OUString& aPath, + const OUString& aPrefix, + OUString& aNewFolderName, + OUString& aNewFolderURL, Content& aNewFolder ); - ::rtl::OUString CreateNewUniqueFileWithPrefix( const ::rtl::OUString& aPath, - const ::rtl::OUString& aPrefix, - const ::rtl::OUString& aExt ); + OUString CreateNewUniqueFileWithPrefix( const OUString& aPath, + const OUString& aPrefix, + const OUString& aExt ); - uno::Sequence< beans::StringPair > ReadUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath ); - sal_Bool UpdateUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aGroupName, - const ::rtl::OUString& aNewFolderName ); - sal_Bool ReplaceUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aFsysGroupName, - const ::rtl::OUString& aOldGroupName, - const ::rtl::OUString& aNewGroupName ); - sal_Bool RemoveUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aGroupName ); - sal_Bool WriteUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, + uno::Sequence< beans::StringPair > ReadUINamesForTemplateDir_Impl( const OUString& aUserPath ); + sal_Bool UpdateUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aGroupName, + const OUString& aNewFolderName ); + sal_Bool ReplaceUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aFsysGroupName, + const OUString& aOldGroupName, + const OUString& aNewGroupName ); + sal_Bool RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aGroupName ); + sal_Bool WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, const uno::Sequence< beans::StringPair >& aUINames ); - ::rtl::OUString CreateNewGroupFsys( const ::rtl::OUString& rGroupName, Content& aGroup ); + OUString CreateNewGroupFsys( const OUString& rGroupName, Content& aGroup ); sal_Bool removeContent( Content& rContent ); sal_Bool removeContent( const OUString& rContentURL ); @@ -413,12 +413,12 @@ void SfxDocTplService_Impl::init_Impl() maRootURL += OUString( '/' ); maRootURL += aLang; - ::rtl::OUString aTemplVersPropName( TEMPLATE_VERSION ); - ::rtl::OUString aTemplVers( TEMPLATE_VERSION_VALUE ); + OUString aTemplVersPropName( TEMPLATE_VERSION ); + OUString aTemplVers( TEMPLATE_VERSION_VALUE ); if ( Content::create( maRootURL, maCmdEnv, comphelper::getProcessComponentContext(), maRootContent ) ) { uno::Any aValue; - ::rtl::OUString aPropValue; + OUString aPropValue; if ( getProperty( maRootContent, aTemplVersPropName, aValue ) && ( aValue >>= aPropValue ) && aPropValue.equals( aTemplVers ) ) @@ -491,7 +491,7 @@ void SfxDocTplService_Impl::getDefaultLocale() ::osl::MutexGuard aGuard( maMutex ); if ( !mbLocaleSet ) { - rtl::OUString aLocale( utl::ConfigManager::getLocale() ); + OUString aLocale( utl::ConfigManager::getLocale() ); if ( !aLocale.isEmpty() ) { sal_Int32 nPos = aLocale.indexOf( sal_Unicode( '-' ) ); @@ -579,7 +579,7 @@ void SfxDocTplService_Impl::getDirList() maTemplateDirs = Sequence< OUString >( nCount ); uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(mxContext); - const rtl::OUString aPrefix( + const OUString aPrefix( "vnd.sun.star.expand:" ); for ( sal_uInt16 i=0; iexpandMacros( maTemplateDirs[i] ); } } @@ -643,9 +643,9 @@ sal_Bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUSt rURL, embed::ElementModes::READWRITE); uno::Sequence medium(2); - medium[0].Name = ::rtl::OUString("DocumentBaseURL"); + medium[0].Name = OUString("DocumentBaseURL"); medium[0].Value <<= rURL; - medium[1].Name = ::rtl::OUString("URL"); + medium[1].Name = OUString("URL"); medium[1].Value <<= rURL; m_xDocProps->storeToStorage(xStorage, medium); @@ -677,15 +677,15 @@ sal_Bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString& if ( aType.isEmpty() && mxType.is() ) { - ::rtl::OUString aDocType = mxType->queryTypeByURL( rURL ); + OUString aDocType = mxType->queryTypeByURL( rURL ); if ( !aDocType.isEmpty() ) try { uno::Reference< container::XNameAccess > xTypeDetection( mxType, uno::UNO_QUERY_THROW ); SequenceAsHashMap aTypeProps( xTypeDetection->getByName( aDocType ) ); aType = aTypeProps.getUnpackedValueOrDefault( - ::rtl::OUString("MediaType"), - ::rtl::OUString() ); + OUString("MediaType"), + OUString() ); } catch( uno::Exception& ) {} @@ -817,10 +817,10 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, } // ----------------------------------------------------------------------- -sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OUString& aPath, - const ::rtl::OUString& aPrefix, - ::rtl::OUString& aNewFolderName, - ::rtl::OUString& aNewFolderURL, +sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& aPath, + const OUString& aPrefix, + OUString& aNewFolderName, + OUString& aNewFolderURL, Content& aNewFolder ) { sal_Bool bCreated = sal_False; @@ -832,9 +832,9 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU { for ( sal_Int32 nInd = 0; nInd < 32000; nInd++ ) { - ::rtl::OUString aTryName = aPrefix; + OUString aTryName = aPrefix; if ( nInd ) - aTryName += ::rtl::OUString::valueOf( nInd ); + aTryName += OUString::valueOf( nInd ); try { @@ -879,11 +879,11 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU } // ----------------------------------------------------------------------- -::rtl::OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const ::rtl::OUString& aPath, - const ::rtl::OUString& aPrefix, - const ::rtl::OUString& aExt ) +OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& aPath, + const OUString& aPrefix, + const OUString& aExt ) { - ::rtl::OUString aNewFileURL; + OUString aNewFileURL; INetURLObject aDirPath( aPath ); Content aParent; @@ -895,11 +895,11 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU { Content aNewFile; sal_Bool bCreated = sal_False; - ::rtl::OUString aTryName = aPrefix; + OUString aTryName = aPrefix; if ( nInd ) - aTryName += ::rtl::OUString::valueOf( nInd ); + aTryName += OUString::valueOf( nInd ); if ( aExt.toChar() != '.' ) - aTryName += ::rtl::OUString( "." ); + aTryName += OUString( "." ); aTryName += aExt; try @@ -1105,7 +1105,7 @@ sal_Bool SfxDocTplService_Impl::getProperty( Content& rContent, // ----------------------------------------------------------------------- // static bool SfxURLRelocator_Impl::propertyCanContainOfficeDir( - const rtl::OUString & rPropName ) + const OUString & rPropName ) { // Note: TargetURL is handled by UCB itself (because it is a property // with a predefined semantic). Additional Core properties introduced @@ -1270,10 +1270,10 @@ void SfxDocTplService_Impl::doUpdate() } //----------------------------------------------------------------------------- -uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath ) +uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplateDir_Impl( const OUString& aUserPath ) { INetURLObject aLocObj( aUserPath ); - aLocObj.insertName( ::rtl::OUString( "groupuinames.xml" ), false, + aLocObj.insertName( OUString( "groupuinames.xml" ), false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL ); Content aLocContent; @@ -1296,9 +1296,9 @@ uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplate } //----------------------------------------------------------------------------- -sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aGroupName, - const ::rtl::OUString& aNewFolderName ) +sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aGroupName, + const OUString& aNewFolderName ) { uno::Sequence< beans::StringPair > aUINames = ReadUINamesForTemplateDir_Impl( aUserPath ); sal_Int32 nLen = aUINames.getLength(); @@ -1316,10 +1316,10 @@ sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const ::rtl::O } //----------------------------------------------------------------------------- -sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aDefaultFsysGroupName, - const ::rtl::OUString& aOldGroupName, - const ::rtl::OUString& aNewGroupName ) +sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aDefaultFsysGroupName, + const OUString& aOldGroupName, + const OUString& aNewGroupName ) { uno::Sequence< beans::StringPair > aUINames = ReadUINamesForTemplateDir_Impl( aUserPath ); sal_Int32 nLen = aUINames.getLength(); @@ -1342,8 +1342,8 @@ sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const ::rtl:: } //----------------------------------------------------------------------------- -sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aGroupName ) +sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aGroupName ) { uno::Sequence< beans::StringPair > aUINames = ReadUINamesForTemplateDir_Impl( aUserPath ); sal_Int32 nLen = aUINames.getLength(); @@ -1368,7 +1368,7 @@ sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const ::rtl::O //----------------------------------------------------------------------------- -sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, +sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, const uno::Sequence< beans::StringPair >& aUINames ) { sal_Bool bResult = sal_False; @@ -1377,8 +1377,8 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU io::TempFile::create(mxContext), uno::UNO_QUERY_THROW ); - ::rtl::OUString aTempURL; - uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString("Uri") ); + OUString aTempURL; + uno::Any aUrl = xTempFile->getPropertyValue( OUString("Uri") ); aUrl >>= aTempURL; uno::Reference< io::XStream > xStream( xTempFile, uno::UNO_QUERY_THROW ); @@ -1397,9 +1397,9 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU Content aSourceContent( aTempURL, maCmdEnv, comphelper::getProcessComponentContext() ); aTargetContent.transferContent( aSourceContent, InsertOperation_COPY, - ::rtl::OUString( "groupuinames.xml" ), + OUString( "groupuinames.xml" ), ucb::NameClash::OVERWRITE, - ::rtl::OUString( "text/xml" ) ); + OUString( "text/xml" ) ); bResult = sal_True; } catch ( uno::Exception& ) @@ -1410,17 +1410,17 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU } //----------------------------------------------------------------------------- -::rtl::OUString SfxDocTplService_Impl::CreateNewGroupFsys( const ::rtl::OUString& rGroupName, Content& aGroup ) +OUString SfxDocTplService_Impl::CreateNewGroupFsys( const OUString& rGroupName, Content& aGroup ) { - ::rtl::OUString aResultURL; + OUString aResultURL; if ( maTemplateDirs.getLength() ) { - ::rtl::OUString aTargetPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; + OUString aTargetPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; // create a new folder with the given name Content aNewFolder; - ::rtl::OUString aNewFolderName; + OUString aNewFolderName; // the Fsys name instead of GroupName should be used, the groupuinames must be added also if ( !CreateNewUniqueFolderWithPrefix( aTargetPath, @@ -1429,19 +1429,19 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU aResultURL, aNewFolder ) && !CreateNewUniqueFolderWithPrefix( aTargetPath, - ::rtl::OUString( "UserGroup" ), + OUString( "UserGroup" ), aNewFolderName, aResultURL, aNewFolder ) ) - return ::rtl::OUString(); + return OUString(); if ( !UpdateUINamesForTemplateDir_Impl( aTargetPath, rGroupName, aNewFolderName ) ) { // we could not create the groupuinames for the folder, so we delete the group in the // the folder and return removeContent( aNewFolder ); - return ::rtl::OUString(); + return OUString(); } // Now set the target url for this group and we are done @@ -1451,7 +1451,7 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU if ( ! setProperty( aGroup, aPropName, aValue ) ) { removeContent( aNewFolder ); - return ::rtl::OUString(); + return OUString(); } } @@ -1507,7 +1507,7 @@ sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) aNewFolderURL, aNewFolder ) && !CreateNewUniqueFolderWithPrefix( aUserPath, - ::rtl::OUString( "UserGroup" ), + OUString( "UserGroup" ), aNewFolderName, aNewFolderURL, aNewFolder ) ) @@ -1575,7 +1575,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) if ( !maTemplateDirs.getLength() ) return sal_False; - ::rtl::OUString aGeneralTempPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; + OUString aGeneralTempPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; // check that the fs location is in writeble folder and this is not a "My templates" folder INetURLObject aGroupParentFolder( aGroupTargetURL ); @@ -1636,7 +1636,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) || !::utl::UCBContentHelper::Exists( aGroupTargetURL ) ) { RemoveUINamesForTemplateDir_Impl( aGeneralTempPath, rGroupName ); - setProperty( aGroup, aPropName, uno::makeAny( ::rtl::OUString() ) ); + setProperty( aGroup, aPropName, uno::makeAny( OUString() ) ); } } } @@ -1689,7 +1689,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, if ( !maTemplateDirs.getLength() ) return sal_False; - ::rtl::OUString aGeneralTempPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; + OUString aGeneralTempPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; // check that the fs location is in writeble folder and this is not a "My templates" folder INetURLObject aGroupParentFolder( aGroupTargetURL ); @@ -1730,7 +1730,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, if ( bCanBeRenamed ) { INetURLObject aGroupTargetObj( aGroupTargetURL ); - ::rtl::OUString aFsysName = aGroupTargetObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aFsysName = aGroupTargetObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); if ( aGroupTargetObj.removeSegment() && ReplaceUINamesForTemplateDir_Impl( aGroupTargetObj.GetMainURL( INetURLObject::NO_DECODE ), @@ -1763,7 +1763,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, OUString aGroupURL, aTemplateURL, aTemplateToRemoveTargetURL; INetURLObject aGroupObj( maRootURL ); sal_Bool bRemoveOldTemplateContent = sal_False; - ::rtl::OUString sDocServiceName; + OUString sDocServiceName; aGroupObj.insertName( rGroupName, false, INetURLObject::LAST_SEGMENT, true, @@ -1773,8 +1773,8 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) ) return sal_False; - ::rtl::OUString aGroupTargetURL; - ::rtl::OUString aPropName( TARGET_DIR_URL ); + OUString aGroupTargetURL; + OUString aPropName( TARGET_DIR_URL ); Any aValue; if ( getProperty( aGroup, aPropName, aValue ) ) aValue >>= aGroupTargetURL; @@ -1814,20 +1814,20 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, throw uno::RuntimeException(); // get the actual filter name - ::rtl::OUString aFilterName; + OUString aFilterName; uno::Reference< lang::XMultiServiceFactory > xConfigProvider = configuration::theDefaultProvider::get( xContext ); uno::Sequence< uno::Any > aArgs( 1 ); beans::PropertyValue aPathProp; - aPathProp.Name = ::rtl::OUString("nodepath"); - aPathProp.Value <<= ::rtl::OUString( "/org.openoffice.Setup/Office/Factories/" ); + aPathProp.Name = OUString("nodepath"); + aPathProp.Value <<= OUString( "/org.openoffice.Setup/Office/Factories/" ); aArgs[0] <<= aPathProp; uno::Reference< container::XNameAccess > xSOFConfig( xConfigProvider->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"), + OUString("com.sun.star.configuration.ConfigurationAccess"), aArgs ), uno::UNO_QUERY_THROW ); @@ -1836,14 +1836,14 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, if ( !xApplConfig.is() ) throw uno::RuntimeException(); - xApplConfig->getByName( ::rtl::OUString( "ooSetupFactoryActualTemplateFilter" ) ) >>= aFilterName; + xApplConfig->getByName( OUString( "ooSetupFactoryActualTemplateFilter" ) ) >>= aFilterName; if ( aFilterName.isEmpty() ) throw uno::RuntimeException(); // find the related type name - ::rtl::OUString aTypeName; + OUString aTypeName; uno::Reference< container::XNameAccess > xFilterFactory( - xFactory->createInstance( ::rtl::OUString("com.sun.star.document.FilterFactory") ), + xFactory->createInstance( OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aFilterData; @@ -1862,17 +1862,17 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, mxType.is() ? uno::Reference< container::XNameAccess >( mxType, uno::UNO_QUERY_THROW ) : uno::Reference< container::XNameAccess >( - xFactory->createInstance( ::rtl::OUString("com.sun.star.document.TypeDetection") ), + xFactory->createInstance( OUString("com.sun.star.document.TypeDetection") ), uno::UNO_QUERY_THROW ); SequenceAsHashMap aTypeProps( xTypeDetection->getByName( aTypeName ) ); - uno::Sequence< ::rtl::OUString > aAllExt = - aTypeProps.getUnpackedValueOrDefault( ::rtl::OUString("Extensions"), Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aAllExt = + aTypeProps.getUnpackedValueOrDefault( OUString("Extensions"), Sequence< OUString >() ); if ( !aAllExt.getLength() ) throw uno::RuntimeException(); - ::rtl::OUString aMediaType = aTypeProps.getUnpackedValueOrDefault( ::rtl::OUString("MediaType"), ::rtl::OUString() ); - ::rtl::OUString aExt = aAllExt[0]; + OUString aMediaType = aTypeProps.getUnpackedValueOrDefault( OUString("MediaType"), OUString() ); + OUString aExt = aAllExt[0]; if ( aMediaType.isEmpty() || aExt.isEmpty() ) throw uno::RuntimeException(); @@ -1886,10 +1886,10 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, throw uno::RuntimeException(); } - ::rtl::OUString aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aGroupTargetURL, rTemplateName, aExt ); + OUString aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aGroupTargetURL, rTemplateName, aExt ); if ( aNewTemplateTargetURL.isEmpty() ) { - aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aGroupTargetURL, ::rtl::OUString( "UserTemplate" ), aExt ); + aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aGroupTargetURL, OUString( "UserTemplate" ), aExt ); if ( aNewTemplateTargetURL.isEmpty() ) throw uno::RuntimeException(); @@ -1897,9 +1897,9 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, // store template uno::Sequence< PropertyValue > aStoreArgs( 2 ); - aStoreArgs[0].Name = ::rtl::OUString("FilterName"); + aStoreArgs[0].Name = OUString("FilterName"); aStoreArgs[0].Value <<= aFilterName; - aStoreArgs[1].Name = ::rtl::OUString("DocumentTitle"); + aStoreArgs[1].Name = OUString("DocumentTitle"); aStoreArgs[1].Value <<= rTemplateName; if( !::utl::UCBContentHelper::EqualURLs( aNewTemplateTargetURL, rStorable->getLocation() )) @@ -2016,11 +2016,11 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, INetURLObject aTmpURL( aSourceObj ); aTmpURL.CutExtension(); - ::rtl::OUString aPattern = aTmpURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aPattern = aTmpURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - ::rtl::OUString aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aTargetURL, aPattern, aSourceObj.getExtension() ); + OUString aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aTargetURL, aPattern, aSourceObj.getExtension() ); INetURLObject aNewTemplateTargetObj( aNewTemplateTargetURL ); - ::rtl::OUString aNewTemplateTargetName = aNewTemplateTargetObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aNewTemplateTargetName = aNewTemplateTargetObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); if ( aNewTemplateTargetURL.isEmpty() || aNewTemplateTargetName.isEmpty() ) return sal_False; @@ -2048,7 +2048,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, Content aResultContent; if ( Content::create( aNewTemplateTargetURL, xEnv, comphelper::getProcessComponentContext(), aResultContent ) ) { - ::rtl::OUString aPropertyName( "IsReadOnly" ); + OUString aPropertyName( "IsReadOnly" ); uno::Any aProperty; sal_Bool bReadOnly = sal_False; if ( getProperty( aResultContent, aPropertyName, aProperty ) && ( aProperty >>= bReadOnly ) && bReadOnly ) @@ -2473,7 +2473,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList, const OUString& rOwnURL, sal_Bool bWriteableGroup ) { - ::rtl::OUString aTitle; + OUString aTitle; if ( rUITitle.isEmpty() ) { @@ -2569,7 +2569,7 @@ void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList, if ( ! bHierarchy ) { OUString aUIStdTitle = getLongName( OUString( STANDARD_FOLDER ) ); - addFsysGroup( rList, ::rtl::OUString(), aUIStdTitle, aTargetURL, bWriteableContent ); + addFsysGroup( rList, OUString(), aUIStdTitle, aTargetURL, bWriteableContent ); } // search for predefined UI names @@ -2608,7 +2608,7 @@ void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList, addHierGroup( rList, aTitle, aTargetSubfolderURL ); else { - ::rtl::OUString aUITitle; + OUString aUITitle; for ( sal_Int32 nInd = 0; nInd < aUINames.getLength(); nInd++ ) if ( aUINames[nInd].First.equals( aTitle ) ) { @@ -2828,7 +2828,7 @@ void SfxURLRelocator_Impl::initOfficeInstDirs() } // ----------------------------------------------------------------------- -void SfxURLRelocator_Impl::implExpandURL( ::rtl::OUString& io_url ) +void SfxURLRelocator_Impl::implExpandURL( OUString& io_url ) { const INetURLObject aParser( io_url ); if ( aParser.GetProtocol() != INET_PROT_VND_SUN_STAR_EXPAND ) @@ -2850,7 +2850,7 @@ void SfxURLRelocator_Impl::implExpandURL( ::rtl::OUString& io_url ) } // ----------------------------------------------------------------------- -void SfxURLRelocator_Impl::makeRelocatableURL( rtl::OUString & rURL ) +void SfxURLRelocator_Impl::makeRelocatableURL( OUString & rURL ) { if ( !rURL.isEmpty() ) { @@ -2861,7 +2861,7 @@ void SfxURLRelocator_Impl::makeRelocatableURL( rtl::OUString & rURL ) } // ----------------------------------------------------------------------- -void SfxURLRelocator_Impl::makeAbsoluteURL( rtl::OUString & rURL ) +void SfxURLRelocator_Impl::makeAbsoluteURL( OUString & rURL ) { if ( !rURL.isEmpty() ) { diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index 770625aa2900..33ddb3341dbf 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; uno::Sequence< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { - ::rtl::OUString aStringID = ::rtl::OUString( "groupuinames.xml" ); + OUString aStringID = OUString( "groupuinames.xml" ); return ReadLocalizationSequence_Impl( xInStream, aStringID, xContext ); } @@ -52,20 +52,20 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R xWriterHandler->setOutputStream( xOutStream ); - ::rtl::OUString aGroupListElement( "groupuinames:template-group-list" ); - ::rtl::OUString aGroupElement( "groupuinames:template-group" ); - ::rtl::OUString aNameAttr( "groupuinames:name" ); - ::rtl::OUString aUINameAttr( "groupuinames:default-ui-name" ); - ::rtl::OUString aCDATAString( "CDATA" ); - ::rtl::OUString aWhiteSpace( " " ); + OUString aGroupListElement( "groupuinames:template-group-list" ); + OUString aGroupElement( "groupuinames:template-group" ); + OUString aNameAttr( "groupuinames:name" ); + OUString aUINameAttr( "groupuinames:default-ui-name" ); + OUString aCDATAString( "CDATA" ); + OUString aWhiteSpace( " " ); // write the namespace ::comphelper::AttributeList* pRootAttrList = new ::comphelper::AttributeList; uno::Reference< xml::sax::XAttributeList > xRootAttrList( pRootAttrList ); pRootAttrList->AddAttribute( - ::rtl::OUString( "xmlns" ), + OUString( "xmlns" ), aCDATAString, - ::rtl::OUString( "http://openoffice.org/2006/groupuinames" ) ); + OUString( "http://openoffice.org/2006/groupuinames" ) ); xWriterHandler->startDocument(); xWriterHandler->startElement( aGroupListElement, xRootAttrList ); @@ -90,7 +90,7 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R // ================================================================================== // ----------------------------------- -uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, const uno::Reference< uno::XComponentContext > xContext ) +uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { if ( !xContext.is() || !xInStream.is() ) @@ -148,7 +148,7 @@ void SAL_CALL DocTemplLocaleHelper::endDocument() } // ----------------------------------- -void SAL_CALL DocTemplLocaleHelper::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) +void SAL_CALL DocTemplLocaleHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw( xml::sax::SAXException, uno::RuntimeException ) { if ( aName == m_aGroupListElement ) @@ -175,11 +175,11 @@ void SAL_CALL DocTemplLocaleHelper::startElement( const ::rtl::OUString& aName, sal_Int32 nNewEntryNum = m_aResultSeq.getLength() + 1; m_aResultSeq.realloc( nNewEntryNum ); - ::rtl::OUString aNameValue = xAttribs->getValueByName( m_aNameAttr ); + OUString aNameValue = xAttribs->getValueByName( m_aNameAttr ); if ( aNameValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the ID value must present - ::rtl::OUString aUINameValue = xAttribs->getValueByName( m_aUINameAttr ); + OUString aUINameValue = xAttribs->getValueByName( m_aUINameAttr ); if ( aUINameValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the ID value must present @@ -200,7 +200,7 @@ void SAL_CALL DocTemplLocaleHelper::startElement( const ::rtl::OUString& aName, } // ----------------------------------- -void SAL_CALL DocTemplLocaleHelper::endElement( const ::rtl::OUString& aName ) +void SAL_CALL DocTemplLocaleHelper::endElement( const OUString& aName ) throw( xml::sax::SAXException, uno::RuntimeException ) { sal_Int32 nLength = m_aElementsSeq.getLength(); @@ -214,19 +214,19 @@ void SAL_CALL DocTemplLocaleHelper::endElement( const ::rtl::OUString& aName ) } // ----------------------------------- -void SAL_CALL DocTemplLocaleHelper::characters( const ::rtl::OUString& /*aChars*/ ) +void SAL_CALL DocTemplLocaleHelper::characters( const OUString& /*aChars*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL DocTemplLocaleHelper::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) +void SAL_CALL DocTemplLocaleHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL DocTemplLocaleHelper::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) +void SAL_CALL DocTemplLocaleHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx index b6f7fc286b0a..e1e413856fa4 100644 --- a/sfx2/source/doc/doctemplateslocal.hxx +++ b/sfx2/source/doc/doctemplateslocal.hxx @@ -30,18 +30,18 @@ class DocTemplLocaleHelper : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::XDocumentHandler > { // Relations info related strings - ::rtl::OUString m_aGroupListElement; - ::rtl::OUString m_aGroupElement; - ::rtl::OUString m_aNameAttr; - ::rtl::OUString m_aUINameAttr; + OUString m_aGroupListElement; + OUString m_aGroupElement; + OUString m_aNameAttr; + OUString m_aUINameAttr; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > m_aResultSeq; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aElementsSeq; // stack of elements being parsed + ::com::sun::star::uno::Sequence< OUString > m_aElementsSeq; // stack of elements being parsed DocTemplLocaleHelper(); // must not be created directly ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > GetParsingResult(); - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) + static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const OUString& aStringID, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) throw( ::com::sun::star::uno::Exception ); public: @@ -66,11 +66,11 @@ public: // XDocumentHandler virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); }; diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index a3f046c9d719..086eca2217c6 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -117,7 +117,7 @@ namespace sfx2 if ( pObjectShell != NULL ) pUndoManager = pObjectShell->GetUndoManager(); if ( !pUndoManager ) - throw NotInitializedException( ::rtl::OUString(), *&i_baseModel ); + throw NotInitializedException( OUString(), *&i_baseModel ); return pUndoManager; } }; @@ -265,7 +265,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL DocumentUndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException) + void SAL_CALL DocumentUndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -339,28 +339,28 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getCurrentUndoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getCurrentRedoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getAllUndoActionTitles(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getAllRedoActionTitles(); @@ -442,7 +442,7 @@ namespace sfx2 void SAL_CALL DocumentUndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) { (void)i_parent; - throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() ); + throw NoSupportException( OUString(), m_pImpl->getThis() ); } //...................................................................................................................... diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 392840e5d8d9..8f3a5b528421 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -108,15 +108,15 @@ void* GraphicHelper::getEnhMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta ) #ifdef WNT if ( pGDIMeta ) { - String aStr = ::rtl::OUString(".emf"); - ::utl::TempFile aTempFile( ::rtl::OUString(), + String aStr = OUString(".emf"); + ::utl::TempFile aTempFile( OUString(), &aStr, NULL, sal_False ); - ::rtl::OUString aMetaFile = aTempFile.GetFileName(); - ::rtl::OUString aMetaURL = aTempFile.GetURL(); - ::rtl::OString aWinFile = ::rtl::OUStringToOString( aMetaFile, osl_getThreadTextEncoding() ); + OUString aMetaFile = aTempFile.GetFileName(); + OUString aMetaURL = aTempFile.GetURL(); + OString aWinFile = OUStringToOString( aMetaFile, osl_getThreadTextEncoding() ); SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMetaURL, STREAM_STD_READWRITE ); if ( pStream ) @@ -450,8 +450,8 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un try { uno::Reference< graphic::XGraphicProvider > xGraphProvider(graphic::GraphicProvider::create(xContext)); - ::rtl::OUString aURL("private:resource/sfx/bitmapex/"); - aURL += ::rtl::OUString::valueOf( nResID ); + OUString aURL("private:resource/sfx/bitmapex/"); + aURL += OUString::valueOf( nResID ); uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); aMediaProps[0].Name = "URL"; @@ -464,7 +464,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un aStoreProps[0].Name = "OutputStream"; aStoreProps[0].Value <<= xStream; aStoreProps[1].Name = "MimeType"; - aStoreProps[1].Value <<= ::rtl::OUString("image/png"); + aStoreProps[1].Value <<= OUString("image/png"); xGraphProvider->storeGraphic( xGraphic, aStoreProps ); bResult = sal_True; @@ -480,7 +480,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un //--------------------------------------------------------------- // static -sal_uInt16 GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const ::rtl::OUString& aFactoryShortName, sal_Bool /*bIsTemplate*/ ) +sal_uInt16 GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, sal_Bool /*bIsTemplate*/ ) { sal_uInt16 nResult = 0; diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx index 0c4eeb9825c1..0dc980d38a00 100644 --- a/sfx2/source/doc/graphhelp.hxx +++ b/sfx2/source/doc/graphhelp.hxx @@ -56,7 +56,7 @@ public: const BitmapEx& aBitmap, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); - static sal_uInt16 getThumbnailReplacementIDByFactoryName_Impl( const ::rtl::OUString& aFactoryShortName, + static sal_uInt16 getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, sal_Bool bIsTemplate ); static sal_Bool getThumbnailReplacement_Impl( diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index e1834b3c809c..d795ea8228d8 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -139,7 +139,7 @@ static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode ) } //------------------------------------------------------------------------- -static sal_uInt8 getStoreModeFromSlotName( const ::rtl::OUString& aSlotName ) +static sal_uInt8 getStoreModeFromSlotName( const OUString& aSlotName ) { sal_uInt8 nResult = 0; if ( aSlotName == "ExportTo" ) @@ -155,7 +155,7 @@ static sal_uInt8 getStoreModeFromSlotName( const ::rtl::OUString& aSlotName ) else if ( aSlotName == "SaveACopy" ) nResult = SAVEACOPY_REQUESTED; else - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER ); @@ -199,10 +199,10 @@ public: uno::Reference< lang::XMultiServiceFactory > xDocSettingsSupplier( xModel, uno::UNO_QUERY_THROW ); m_xDocumentSettings.set( xDocSettingsSupplier->createInstance( - ::rtl::OUString( "com.sun.star.document.Settings" ) ), + OUString( "com.sun.star.document.Settings" ) ), uno::UNO_QUERY_THROW ); - ::rtl::OUString aLoadReadonlyString( "LoadReadonly" ); + OUString aLoadReadonlyString( "LoadReadonly" ); try { @@ -224,7 +224,7 @@ public: { if ( m_bRestoreSettings ) { - ::rtl::OUString aLoadReadonlyString( "LoadReadonly" ); + OUString aLoadReadonlyString( "LoadReadonly" ); try { @@ -251,7 +251,7 @@ class ModelData_Impl uno::Reference< frame::XStorable2 > m_xStorable2; uno::Reference< util::XModifiable > m_xModifiable; - ::rtl::OUString m_aModuleName; + OUString m_aModuleName; ::comphelper::SequenceAsHashMap* m_pDocumentPropsHM; ::comphelper::SequenceAsHashMap* m_pModulePropsHM; @@ -279,43 +279,43 @@ public: const ::comphelper::SequenceAsHashMap& GetDocProps(); - ::rtl::OUString GetModuleName(); + OUString GetModuleName(); const ::comphelper::SequenceAsHashMap& GetModuleProps(); void CheckInteractionHandler(); - ::rtl::OUString GetDocServiceName(); + OUString GetDocServiceName(); uno::Sequence< beans::PropertyValue > GetDocServiceDefaultFilterCheckFlags( sal_Int32 nMust, sal_Int32 nDont ); uno::Sequence< beans::PropertyValue > GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont ); uno::Sequence< beans::PropertyValue > GetPreselectedFilter_Impl( sal_Int8 nStoreMode ); uno::Sequence< beans::PropertyValue > GetDocServiceDefaultFilter(); - sal_Bool ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilterName ); + sal_Bool ExecuteFilterDialog_Impl( const OUString& aFilterName ); sal_Int8 CheckSaveAcceptable( sal_Int8 nCurStatus ); sal_Int8 CheckStateForSave(); - sal_Int8 CheckFilter( const ::rtl::OUString& ); + sal_Int8 CheckFilter( const OUString& ); sal_Bool CheckFilterOptionsDialogExistence(); sal_Bool OutputFileDialog( sal_Int8 nStoreMode, const ::comphelper::SequenceAsHashMap& aPreselectedFilterPropsHM, sal_Bool bSetStandardName, - ::rtl::OUString& aSuggestedName, + OUString& aSuggestedName, sal_Bool bPreselectPassword, - ::rtl::OUString& aSuggestedDir, + OUString& aSuggestedDir, sal_Int16 nDialog, - const ::rtl::OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList + const OUString& rStandardDir, + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ); sal_Bool ShowDocumentInfoDialog(); - ::rtl::OUString GetRecommendedDir( const ::rtl::OUString& aSuggestedDir ); - ::rtl::OUString GetRecommendedName( const ::rtl::OUString& aSuggestedName, - const ::rtl::OUString& aTypeName ); + OUString GetRecommendedDir( const OUString& aSuggestedDir ); + OUString GetRecommendedName( const OUString& aSuggestedName, + const OUString& aTypeName ); }; @@ -331,7 +331,7 @@ ModelData_Impl::ModelData_Impl( SfxStoringHelper& aOwner, , m_bRecommendReadOnly( sal_False ) { CheckInteractionHandler(); - rtl::OUString sModuleName; + OUString sModuleName; try { uno::Reference< lang::XComponent > xCurrentComponent = frame::Desktop::create( comphelper::getProcessComponentContext() )->getCurrentComponent(); @@ -435,7 +435,7 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetDocProps() } //------------------------------------------------------------------------- -::rtl::OUString ModelData_Impl::GetModuleName() +OUString ModelData_Impl::GetModuleName() { if ( m_aModuleName.isEmpty() ) { @@ -463,21 +463,21 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetModuleProps() } //------------------------------------------------------------------------- -::rtl::OUString ModelData_Impl::GetDocServiceName() +OUString ModelData_Impl::GetDocServiceName() { - return GetModuleProps().getUnpackedValueOrDefault(::rtl::OUString("ooSetupFactoryDocumentService"), ::rtl::OUString()); + return GetModuleProps().getUnpackedValueOrDefault(OUString("ooSetupFactoryDocumentService"), OUString()); } //------------------------------------------------------------------------- void ModelData_Impl::CheckInteractionHandler() { ::comphelper::SequenceAsHashMap::const_iterator aInteractIter = - m_aMediaDescrHM.find( ::rtl::OUString("InteractionHandler") ); + m_aMediaDescrHM.find( OUString("InteractionHandler") ); if ( aInteractIter == m_aMediaDescrHM.end() ) { try { - m_aMediaDescrHM[ ::rtl::OUString("InteractionHandler") ] + m_aMediaDescrHM[ OUString("InteractionHandler") ] <<= task::InteractionHandler::createWithParent( comphelper::getProcessComponentContext(), 0); } catch( const uno::Exception& ) @@ -496,9 +496,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter { uno::Sequence< beans::PropertyValue > aProps; - ::rtl::OUString aFilterName = GetModuleProps().getUnpackedValueOrDefault( - ::rtl::OUString("ooSetupFactoryDefaultFilter"), - ::rtl::OUString() ); + OUString aFilterName = GetModuleProps().getUnpackedValueOrDefault( + OUString("ooSetupFactoryDefaultFilter"), + OUString() ); m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aProps; @@ -514,7 +514,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter if ( aProps.getLength() ) { ::comphelper::SequenceAsHashMap aFiltHM( aProps ); - sal_Int32 nFlags = aFiltHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), + sal_Int32 nFlags = aFiltHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); if ( ( ( nFlags & nMust ) == nMust ) && !( nFlags & nDont ) ) aFilterProps = aProps; @@ -528,7 +528,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont ) { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); - aSearchRequest[0].Name = ::rtl::OUString("DocumentService"); + aSearchRequest[0].Name = OUString("DocumentService"); aSearchRequest[0].Value <<= GetDocServiceName(); return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); @@ -546,9 +546,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( { // Preselect PDF-Filter for EXPORT uno::Sequence< beans::NamedValue > aSearchRequest( 2 ); - aSearchRequest[0].Name = ::rtl::OUString("Type"); - aSearchRequest[0].Value <<= ::rtl::OUString("pdf_Portable_Document_Format"); - aSearchRequest[1].Name = ::rtl::OUString("DocumentService"); + aSearchRequest[0].Name = OUString("Type"); + aSearchRequest[0].Value <<= OUString("pdf_Portable_Document_Format"); + aSearchRequest[1].Name = OUString("DocumentService"); aSearchRequest[1].Value <<= GetDocServiceName(); aFilterProps = ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); @@ -568,7 +568,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( } //------------------------------------------------------------------------- -sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilterName ) +sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName ) { sal_Bool bDialogUsed = sal_False; @@ -581,7 +581,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilte for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty ) if( aProps[nProperty].Name == "UIComponent" ) { - ::rtl::OUString aServiceName; + OUString aServiceName; aProps[nProperty].Value >>= aServiceName; if( !aServiceName.isEmpty() ) { @@ -611,7 +611,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilte } else { - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } @@ -625,7 +625,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilte catch( const container::NoSuchElementException& ) { // the filter name is unknown - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER ); } @@ -652,7 +652,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) // it is done only for documents that have persistence already uno::Reference< uno::XInterface > xCommonConfig = ::comphelper::ConfigurationHelper::openConfig( comphelper::getProcessComponentContext(), - ::rtl::OUString( "/org.openoffice.Office.Common" ), + OUString( "/org.openoffice.Office.Common" ), ::comphelper::ConfigurationHelper::E_STANDARD ); if ( !xCommonConfig.is() ) throw uno::RuntimeException(); // should the saving proceed as usual instead? @@ -664,11 +664,11 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) // the saving is acceptable // in case the configuration entry is not set or set to false // or in case of version creation - ::rtl::OUString aVersionCommentString = ::rtl::OUString("VersionComment"); + OUString aVersionCommentString = OUString("VersionComment"); if ( ( ::comphelper::ConfigurationHelper::readRelativeKey( xCommonConfig, - ::rtl::OUString( "Save/Document/" ), - ::rtl::OUString( "AlwaysSaveAs" ) ) >>= bAlwaysSaveAs ) + OUString( "Save/Document/" ), + OUString( "AlwaysSaveAs" ) ) >>= bAlwaysSaveAs ) && bAlwaysSaveAs && GetMediaDescr().find( aVersionCommentString ) == GetMediaDescr().end() ) { @@ -701,11 +701,11 @@ sal_Int8 ModelData_Impl::CheckStateForSave() sal_Bool bVersInfoNeedsStore = sal_False; ::comphelper::SequenceAsHashMap aAcceptedArgs; - ::rtl::OUString aVersionCommentString("VersionComment"); - ::rtl::OUString aAuthorString("Author"); - ::rtl::OUString aInteractionHandlerString("InteractionHandler"); - ::rtl::OUString aStatusIndicatorString("StatusIndicator"); - ::rtl::OUString aFailOnWarningString("FailOnWarning"); + OUString aVersionCommentString("VersionComment"); + OUString aAuthorString("Author"); + OUString aInteractionHandlerString("InteractionHandler"); + OUString aStatusIndicatorString("StatusIndicator"); + OUString aFailOnWarningString("FailOnWarning"); if ( GetMediaDescr().find( aVersionCommentString ) != GetMediaDescr().end() ) { @@ -737,9 +737,9 @@ sal_Int8 ModelData_Impl::CheckStateForSave() } // check that the old filter is acceptable - ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( - rtl::OUString(aFilterNameString), - ::rtl::OUString() ); + OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( + OUString(aFilterNameString), + OUString() ); sal_Int8 nResult = CheckFilter( aOldFilterName ); return nResult; @@ -758,7 +758,7 @@ sal_Bool hasMacros( const uno::Reference< frame::XModel >& xModel ) return bHasMacros; } -sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) +sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) { ::comphelper::SequenceAsHashMap aFiltPropsHM; sal_Int32 nFiltFlags = 0; @@ -770,13 +770,13 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps; aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps ); - nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), (sal_Int32)0 ); + nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); } // only a temporary solution until default filter retrieving feature is implemented // then GetDocServiceDefaultFilter() must be used ::comphelper::SequenceAsHashMap aDefFiltPropsHM = GetDocServiceDefaultFilterCheckFlags( 3, 0 ); - sal_Int32 nDefFiltFlags = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), (sal_Int32)0 ); + sal_Int32 nDefFiltFlags = aDefFiltPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); // if the old filter is not acceptable // and there is no default filter or it is not acceptable for requested parameters then proceed with saveAs @@ -796,13 +796,13 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) { // the default filter is acceptable and the old filter is alian one // so ask to make a saveAs operation - ::rtl::OUString aUIName = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("UIName"), - ::rtl::OUString() ); - ::rtl::OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("UIName"), - ::rtl::OUString() ); - ::rtl::OUString aPreusedFilterName = GetDocProps().getUnpackedValueOrDefault( - ::rtl::OUString("PreusedFilterName"), - ::rtl::OUString() ); + OUString aUIName = aFiltPropsHM.getUnpackedValueOrDefault( OUString("UIName"), + OUString() ); + OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( OUString("UIName"), + OUString() ); + OUString aPreusedFilterName = GetDocProps().getUnpackedValueOrDefault( + OUString("PreusedFilterName"), + OUString() ); if ( !aPreusedFilterName.equals( aFilterName ) && !aUIName.equals( aDefUIName ) ) { // is it possible to get these names from somewhere and not just @@ -852,7 +852,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); - aSearchRequest[0].Name = ::rtl::OUString("DocumentService"); + aSearchRequest[0].Name = OUString("DocumentService"); aSearchRequest[0].Value <<= GetDocServiceName(); uno::Reference< container::XEnumeration > xFilterEnum = @@ -864,9 +864,9 @@ sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() if ( xFilterEnum->nextElement() >>= pProps ) { ::comphelper::SequenceAsHashMap aPropsHM( pProps ); - ::rtl::OUString aUIServName = aPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIComponent"), - ::rtl::OUString() ); + OUString aUIServName = aPropsHM.getUnpackedValueOrDefault( + OUString("UIComponent"), + OUString() ); if ( !aUIServName.isEmpty() ) return sal_True; } @@ -879,21 +879,21 @@ sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, const ::comphelper::SequenceAsHashMap& aPreselectedFilterPropsHM, sal_Bool bSetStandardName, - ::rtl::OUString& aSuggestedName, + OUString& aSuggestedName, sal_Bool bPreselectPassword, - ::rtl::OUString& aSuggestedDir, + OUString& aSuggestedDir, sal_Int16 nDialog, - const ::rtl::OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList) + const OUString& rStandardDir, + const ::com::sun::star::uno::Sequence< OUString >& rBlackList) { sal_Bool bUseFilterOptions = sal_False; ::comphelper::SequenceAsHashMap::const_iterator aOverwriteIter = - GetMediaDescr().find( ::rtl::OUString("Overwrite") ); + GetMediaDescr().find( OUString("Overwrite") ); // the file name must be specified if overwrite option is set if ( aOverwriteIter != GetMediaDescr().end() ) - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER ); @@ -934,7 +934,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, boost::scoped_ptr pFileDlg; - ::rtl::OUString aDocServiceName = GetDocServiceName(); + OUString aDocServiceName = GetDocServiceName(); DBG_ASSERT( !aDocServiceName.isEmpty(), "No document service for this module set!" ); sal_Int32 nMust = getMustFlags( nStoreMode ); @@ -947,11 +947,11 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, { // this is a PDF export // the filter options has been shown already - ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIName"), - ::rtl::OUString() ); + OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( + OUString("UIName"), + OUString() ); - pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, ::rtl::OUString( "pdf" ), rStandardDir, rBlackList )); + pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, OUString( "pdf" ), rStandardDir, rBlackList )); pFileDlg->SetCurrentFilter( aFilterUIName ); } else @@ -978,7 +978,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, if ( xControlAccess.is() ) { - ::rtl::OUString aCtrlText = SfxResId(STR_EXPORTBUTTON).toString(); + OUString aCtrlText = SfxResId(STR_EXPORTBUTTON).toString(); xControlAccess->setLabel( ui::dialogs::CommonFilePickerElementIds::PUSHBUTTON_OK, aCtrlText ); aCtrlText = SfxResId(STR_LABEL_FILEFORMAT).toString(); @@ -992,62 +992,62 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, pFileDlg->CreateMatcher( aDocServiceName ); } - ::rtl::OUString aAdjustToType; + OUString aAdjustToType; - const ::rtl::OUString sFilterNameString(aFilterNameString); + const OUString sFilterNameString(aFilterNameString); if ( ( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED ) ) { // it is export, set the preselected filter - ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIName"), - ::rtl::OUString() ); + OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( + OUString("UIName"), + OUString() ); pFileDlg->SetCurrentFilter( aFilterUIName ); } // it is no export, bSetStandardName == true means that user agreed to store document in the default (default default ;-)) format else if ( bSetStandardName || GetStorable()->hasLocation() ) { uno::Sequence< beans::PropertyValue > aOldFilterProps; - ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( + OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); + OUString() ); if ( !aOldFilterName.isEmpty() ) m_pOwner->GetFilterConfiguration()->getByName( aOldFilterName ) >>= aOldFilterProps; ::comphelper::SequenceAsHashMap aOldFiltPropsHM( aOldFilterProps ); - sal_Int32 nOldFiltFlags = aOldFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), (sal_Int32)0 ); + sal_Int32 nOldFiltFlags = aOldFiltPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); if ( bSetStandardName || ( nOldFiltFlags & nMust ) != nMust || nOldFiltFlags & nDont ) { // the suggested type will be changed, the extension should be adjusted aAdjustToType = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Type"), - ::rtl::OUString() ); + OUString("Type"), + OUString() ); - ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIName"), - ::rtl::OUString() ); + OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( + OUString("UIName"), + OUString() ); pFileDlg->SetCurrentFilter( aFilterUIName ); } else { pFileDlg->SetCurrentFilter( aOldFiltPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIName"), - ::rtl::OUString() ) ); + OUString("UIName"), + OUString() ) ); } } - ::rtl::OUString aRecommendedDir = GetRecommendedDir( aSuggestedDir ); + OUString aRecommendedDir = GetRecommendedDir( aSuggestedDir ); if ( !aRecommendedDir.isEmpty() ) pFileDlg->SetDisplayFolder( aRecommendedDir ); - ::rtl::OUString aRecommendedName = GetRecommendedName( aSuggestedName, aAdjustToType ); + OUString aRecommendedName = GetRecommendedName( aSuggestedName, aAdjustToType ); if ( !aRecommendedName.isEmpty() ) pFileDlg->SetFileName( aRecommendedName ); uno::Reference < view::XSelectionSupplier > xSel( GetModel()->getCurrentController(), uno::UNO_QUERY ); if ( xSel.is() && xSel->getSelection().hasValue() ) - GetMediaDescr()[::rtl::OUString("SelectionOnly")] <<= sal_True; + GetMediaDescr()[OUString("SelectionOnly")] <<= sal_True; // This is a temporary hardcoded solution must be removed when // dialogs do not need parameters in SidSet representation any more @@ -1076,10 +1076,10 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, String aStringTypeFN; if ( pFileDlg->Execute( pDialogParams, aStringTypeFN ) != ERRCODE_NONE ) { - throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } - ::rtl::OUString aFilterName = aStringTypeFN; + OUString aFilterName = aStringTypeFN; // the following two arguments can not be converted in MediaDescriptor, // so they should be removed from the ItemSet after retrieving @@ -1099,15 +1099,15 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, // old filter options should be cleared in case different filter is used - ::rtl::OUString aFilterFromMediaDescr = GetMediaDescr().getUnpackedValueOrDefault( + OUString aFilterFromMediaDescr = GetMediaDescr().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); - ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( + OUString() ); + OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); + OUString() ); - const ::rtl::OUString sFilterOptionsString(aFilterOptionsString); - const ::rtl::OUString sFilterDataString(aFilterDataString); + const OUString sFilterOptionsString(aFilterOptionsString); + const OUString sFilterDataString(aFilterDataString); if ( aFilterName.equals( aFilterFromMediaDescr ) ) { @@ -1176,8 +1176,8 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, } // merge in results of the dialog execution - GetMediaDescr()[::rtl::OUString("URL")] <<= - ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE )); + GetMediaDescr()[OUString("URL")] <<= + OUString( aURL.GetMainURL( INetURLObject::NO_DECODE )); GetMediaDescr()[sFilterNameString] <<= aFilterName; return bUseFilterOptions; @@ -1196,14 +1196,14 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() if ( xFrameDispatch.is() ) { util::URL aURL; - aURL.Complete = ::rtl::OUString(".uno:SetDocumentProperties"); + aURL.Complete = OUString(".uno:SetDocumentProperties"); uno::Reference < util::XURLTransformer > xTransformer( util::URLTransformer::create( comphelper::getProcessComponentContext() ) ); if ( xTransformer->parseStrict( aURL ) ) { uno::Reference< frame::XDispatch > xDispatch = xFrameDispatch->queryDispatch( aURL, - ::rtl::OUString("_self"), + OUString("_self"), 0 ); if ( xDispatch.is() ) { @@ -1222,12 +1222,12 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() } //------------------------------------------------------------------------- -::rtl::OUString ModelData_Impl::GetRecommendedDir( const ::rtl::OUString& aSuggestedDir ) +OUString ModelData_Impl::GetRecommendedDir( const OUString& aSuggestedDir ) { - ::rtl::OUString aRecommendedDir; + OUString aRecommendedDir; if ( ( !aSuggestedDir.isEmpty() || GetStorable()->hasLocation() ) - && !GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString("RepairPackage"), + && !GetMediaDescr().getUnpackedValueOrDefault( OUString("RepairPackage"), sal_False ) ) { INetURLObject aLocation; @@ -1235,7 +1235,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() aLocation = INetURLObject( aSuggestedDir ); else { - ::rtl::OUString aOldURL = GetStorable()->getLocation(); + OUString aOldURL = GetStorable()->getLocation(); if ( !aOldURL.isEmpty() ) { INetURLObject aTmp( aOldURL ); @@ -1260,10 +1260,10 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() } //------------------------------------------------------------------------- -::rtl::OUString ModelData_Impl::GetRecommendedName( const ::rtl::OUString& aSuggestedName, const ::rtl::OUString& aTypeName ) +OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, const OUString& aTypeName ) { // the last used name might be provided by aSuggestedName from the old selection, or from the MediaDescriptor - ::rtl::OUString aRecommendedName; + OUString aRecommendedName; if ( !aSuggestedName.isEmpty() ) aRecommendedName = aSuggestedName; @@ -1282,19 +1282,19 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() { // adjust the extension to the type uno::Reference< container::XNameAccess > xTypeDetection = uno::Reference< container::XNameAccess >( - comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.document.TypeDetection") ), + comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.document.TypeDetection") ), uno::UNO_QUERY ); if ( xTypeDetection.is() ) { - INetURLObject aObj( ::rtl::OUString( "file:///c:/" ) + aRecommendedName ); + INetURLObject aObj( OUString( "file:///c:/" ) + aRecommendedName ); uno::Sequence< beans::PropertyValue > aTypeNameProps; if ( ( xTypeDetection->getByName( aTypeName ) >>= aTypeNameProps ) && aTypeNameProps.getLength() ) { ::comphelper::SequenceAsHashMap aTypeNamePropsHM( aTypeNameProps ); - uno::Sequence< ::rtl::OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Extensions"), - ::uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault( + OUString("Extensions"), + ::uno::Sequence< OUString >() ); if ( aExtensions.getLength() ) aObj.SetExtension( aExtensions[0] ); } @@ -1322,7 +1322,7 @@ uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguratio if ( !m_xFilterCFG.is() ) { m_xFilterCFG = uno::Reference< container::XNameAccess >( - comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.document.FilterFactory") ), + comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY ); if ( !m_xFilterCFG.is() ) @@ -1359,10 +1359,10 @@ uno::Reference< ::com::sun::star::frame::XModuleManager2 > SfxStoringHelper::Get //------------------------------------------------------------------------- sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel, - const ::rtl::OUString& aSlotName, + const OUString& aSlotName, uno::Sequence< beans::PropertyValue >& aArgsSequence, sal_Bool bPreselectPassword, - ::rtl::OUString aSuggestedName, + OUString aSuggestedName, sal_uInt16 nDocumentSignatureState ) { ModelData_Impl aModelData( *this, xModel, aArgsSequence ); @@ -1381,7 +1381,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( nStoreMode & SAVEAS_REQUESTED ) { ::comphelper::SequenceAsHashMap::const_iterator aSaveToIter = - aModelData.GetMediaDescr().find( ::rtl::OUString("SaveTo") ); + aModelData.GetMediaDescr().find( OUString("SaveTo") ); if ( aSaveToIter != aModelData.GetMediaDescr().end() ) { sal_Bool bWideExport = sal_False; @@ -1392,7 +1392,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel // if saving is not acceptable the warning must be shown even in case of SaveAs operation if ( ( nStoreMode & SAVEAS_REQUESTED ) && aModelData.CheckSaveAcceptable( STATUS_SAVEAS ) == STATUS_NO_ACTION ) - throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } else if ( nStoreMode & SAVE_REQUESTED ) { @@ -1400,7 +1400,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel nStatusSave = aModelData.CheckSaveAcceptable( STATUS_SAVE ); if ( nStatusSave == STATUS_NO_ACTION ) - throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); else if ( nStatusSave == STATUS_SAVE ) { // check whether it is possible to use save operation @@ -1409,7 +1409,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( nStatusSave == STATUS_NO_ACTION ) { - throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } else if ( nStatusSave != STATUS_SAVE ) { @@ -1431,7 +1431,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( QueryBox( NULL, SfxResId( RID_XMLSEC_QUERY_LOSINGSIGNATURE ) ).Execute() != RET_YES ) { // the user has decided not to store the document - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } @@ -1469,30 +1469,30 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel DBG_ASSERT( aFilterProps.getLength(), "No filter for storing!\n" ); if ( !aFilterProps.getLength() ) - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER ); ::comphelper::SequenceAsHashMap aFilterPropsHM( aFilterProps ); - ::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Name"), - ::rtl::OUString() ); + OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( + OUString("Name"), + OUString() ); - const ::rtl::OUString sFilterNameString(aFilterNameString); + const OUString sFilterNameString(aFilterNameString); - ::rtl::OUString aFilterFromMediaDescr = aModelData.GetMediaDescr().getUnpackedValueOrDefault( + OUString aFilterFromMediaDescr = aModelData.GetMediaDescr().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); - ::rtl::OUString aOldFilterName = aModelData.GetDocProps().getUnpackedValueOrDefault( + OUString() ); + OUString aOldFilterName = aModelData.GetDocProps().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); + OUString() ); sal_Bool bUseFilterOptions = sal_False; - ::comphelper::SequenceAsHashMap::const_iterator aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString("URL") ); + ::comphelper::SequenceAsHashMap::const_iterator aFileNameIter = aModelData.GetMediaDescr().find( OUString("URL") ); - const ::rtl::OUString sFilterOptionsString(aFilterOptionsString); - const ::rtl::OUString sFilterDataString(aFilterDataString); - const ::rtl::OUString sFilterFlagsString(aFilterFlagsString); + const OUString sFilterOptionsString(aFilterOptionsString); + const OUString sFilterDataString(aFilterDataString); + const OUString sFilterFlagsString(aFilterFlagsString); if ( ( nStoreMode & EXPORT_REQUESTED ) && ( nStoreMode & PDFEXPORT_REQUESTED ) && !( nStoreMode & PDFDIRECTEXPORT_REQUESTED ) ) { @@ -1512,7 +1512,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel { sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG; ::comphelper::SequenceAsHashMap::const_iterator aDlgIter = - aModelData.GetMediaDescr().find( ::rtl::OUString("UseSystemDialog") ); + aModelData.GetMediaDescr().find( OUString("UseSystemDialog") ); if ( aDlgIter != aModelData.GetMediaDescr().end() ) { sal_Bool bUseSystemDialog = sal_True; @@ -1526,28 +1526,28 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel } // The Dispatch supports parameter FolderName that overwrites SuggestedSaveAsDir - ::rtl::OUString aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( "FolderName" ), ::rtl::OUString() ); + OUString aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( OUString( "FolderName" ), OUString() ); if ( aSuggestedDir.isEmpty() ) { - aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsDir" ), ::rtl::OUString() ); + aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsDir" ), OUString() ); if ( aSuggestedDir.isEmpty() ) - aSuggestedDir = aModelData.GetDocProps().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsDir" ), ::rtl::OUString() ); + aSuggestedDir = aModelData.GetDocProps().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsDir" ), OUString() ); } - aSuggestedName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsName" ), ::rtl::OUString() ); + aSuggestedName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsName" ), OUString() ); if ( aSuggestedName.isEmpty() ) - aSuggestedName = aModelData.GetDocProps().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsName" ), ::rtl::OUString() ); + aSuggestedName = aModelData.GetDocProps().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsName" ), OUString() ); - ::rtl::OUString sStandardDir; + OUString sStandardDir; ::comphelper::SequenceAsHashMap::const_iterator aStdDirIter = - aModelData.GetMediaDescr().find( ::rtl::OUString("StandardDir") ); + aModelData.GetMediaDescr().find( OUString("StandardDir") ); if ( aStdDirIter != aModelData.GetMediaDescr().end() ) aStdDirIter->second >>= sStandardDir; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aBlackList; + ::com::sun::star::uno::Sequence< OUString > aBlackList; ::comphelper::SequenceAsHashMap::const_iterator aBlackListIter = - aModelData.GetMediaDescr().find( ::rtl::OUString("BlackList") ); + aModelData.GetMediaDescr().find( OUString("BlackList") ); if ( aBlackListIter != aModelData.GetMediaDescr().end() ) aBlackListIter->second >>= aBlackList; @@ -1559,9 +1559,9 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( nStoreMode == SAVEAS_REQUESTED ) { // in case of saving check filter for possible alien warning - ::rtl::OUString aSelFilterName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( + OUString aSelFilterName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); + OUString() ); sal_Int8 nStatusFilterSave = aModelData.CheckFilter( aSelFilterName ); if ( nStatusFilterSave == STATUS_SAVEAS_STANDARDNAME ) { @@ -1579,7 +1579,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel } bDialogUsed = sal_True; - aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString("URL") ); + aFileNameIter = aModelData.GetMediaDescr().find( OUString("URL") ); } else { @@ -1602,7 +1602,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( aFileNameIter != aModelData.GetMediaDescr().end() ) { - ::rtl::OUString aFileName; + OUString aFileName; aFileNameIter->second >>= aFileName; aURL.SetURL( aFileName ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "Illegal URL!" ); @@ -1620,13 +1620,13 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel else { DBG_ASSERT( sal_False, "This code must be unreachable!\n" ); - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER ); } ::comphelper::SequenceAsHashMap::const_iterator aIter = - aModelData.GetMediaDescr().find( ::rtl::OUString("FilterFlags") ); + aModelData.GetMediaDescr().find( OUString("FilterFlags") ); sal_Bool bFilterFlagsSet = ( aIter != aModelData.GetMediaDescr().end() ); if( !( nStoreMode & PDFEXPORT_REQUESTED ) && !bFilterFlagsSet @@ -1645,7 +1645,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel DocumentSettingsGuard aSettingsGuard( aModelData.GetModel(), aModelData.IsRecommendReadOnly(), nStoreMode & EXPORT_REQUESTED ); - OSL_ENSURE( aModelData.GetMediaDescr().find( ::rtl::OUString( "Password" ) ) == aModelData.GetMediaDescr().end(), "The Password property of MediaDescriptor should not be used here!" ); + OSL_ENSURE( aModelData.GetMediaDescr().find( OUString( "Password" ) ) == aModelData.GetMediaDescr().end(), "The Password property of MediaDescriptor should not be used here!" ); if ( aOptions.IsDocInfoSave() && ( !aModelData.GetStorable()->hasLocation() || INetURLObject( aModelData.GetStorable()->getLocation() ) != aURL ) ) @@ -1711,7 +1711,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel // static sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( const uno::Reference< container::XNameAccess >& xFilterCFG, - const ::rtl::OUString& aFilterName ) + const OUString& aFilterName ) { sal_Bool bUseFilterOptions = sal_False; @@ -1724,9 +1724,9 @@ sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( if ( aAny >>= aProps ) { ::comphelper::SequenceAsHashMap aPropsHM( aProps ); - ::rtl::OUString aServiceName = aPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIComponent"), - ::rtl::OUString() ); + OUString aServiceName = aPropsHM.getUnpackedValueOrDefault( + OUString("UIComponent"), + OUString() ); if( !aServiceName.isEmpty() ) bUseFilterOptions = sal_True; } @@ -1822,8 +1822,8 @@ void SfxStoringHelper::SetDocInfoState( //------------------------------------------------------------------------- // static sal_Bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XModel >& xModel, - ::rtl::OUString aOldUIName, - ::rtl::OUString /*aDefUIName*/, + OUString aOldUIName, + OUString /*aDefUIName*/, sal_Bool /*bCanProceedFurther*/ ) { if ( !SvtSaveOptions().IsWarnAlienFormat() ) diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 757c2a089030..a93d5bc301dc 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -85,8 +85,8 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl() { MAP_CHAR_LEN("FrameIsScrollingMode"), WID_FRAME_IS_SCROLLING_MODE, &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, { MAP_CHAR_LEN("FrameMarginHeight"), WID_FRAME_MARGIN_HEIGHT, &::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 }, { MAP_CHAR_LEN("FrameMarginWidth"), WID_FRAME_MARGIN_WIDTH, &::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("FrameName"), WID_FRAME_NAME, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("FrameURL"), WID_FRAME_URL, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameName"), WID_FRAME_NAME, &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameURL"), WID_FRAME_URL, &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, {0,0,0,0,0,0} }; return aIFramePropertyMap_Impl; @@ -144,7 +144,7 @@ throw( uno::RuntimeException ) uno::Reference< frame::XDispatchProvider > xProv( mxFrame, uno::UNO_QUERY ); util::URL aTargetURL; - aTargetURL.Complete = ::rtl::OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); + aTargetURL.Complete = OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); uno::Reference < util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getComponentContext(mxFact) ) ); xTrans->parseStrict( aTargetURL ); @@ -200,7 +200,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL IFrameObject::getPropertySetI return xInfo; } -void SAL_CALL IFrameObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny) +void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, const uno::Any& aAny) throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); @@ -210,14 +210,14 @@ void SAL_CALL IFrameObject::setPropertyValue(const ::rtl::OUString& aPropertyNam { case WID_FRAME_URL: { - ::rtl::OUString aURL; + OUString aURL; aAny >>= aURL; maFrmDescr.SetURL( String(aURL) ); } break; case WID_FRAME_NAME: { - ::rtl::OUString aName; + OUString aName; if ( aAny >>= aName ) maFrmDescr.SetName( aName ); } @@ -281,7 +281,7 @@ void SAL_CALL IFrameObject::setPropertyValue(const ::rtl::OUString& aPropertyNam } } -uno::Any SAL_CALL IFrameObject::getPropertyValue(const ::rtl::OUString& aPropertyName) +uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); @@ -292,12 +292,12 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const ::rtl::OUString& aPropert { case WID_FRAME_URL: { - aAny <<= ::rtl::OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); + aAny <<= OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); } break; case WID_FRAME_NAME: { - aAny <<= ::rtl::OUString( maFrmDescr.GetName() ); + aAny <<= OUString( maFrmDescr.GetName() ); } break; case WID_FRAME_IS_AUTO_SCROLL: @@ -338,19 +338,19 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const ::rtl::OUString& aPropert return aAny; } -void SAL_CALL IFrameObject::addPropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::addPropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL IFrameObject::removePropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::removePropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL IFrameObject::addVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::addVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } @@ -363,7 +363,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&, return 0; } -void SAL_CALL IFrameObject::setTitle( const ::rtl::OUString& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL IFrameObject::setTitle( const OUString& ) throw (::com::sun::star::uno::RuntimeException) { } diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index e0de9eec5799..cb25ce948373 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -227,7 +227,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update) { // temp. fix until Templates are managed by UCB compatible service // does NOT work with locally cached components ! - rtl::OUString aTemp; + OUString aTemp; utl::LocalFileHelper::ConvertPhysicalNameToURL( aFileName, aTemp ); aFileName = aTemp; } diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 950e669c101d..e6722b7f9af1 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -181,7 +181,7 @@ void SfxObjectShell::UpdateDocInfoForSave() if ( SvtSecurityOptions().IsOptionSet( SvtSecurityOptions::E_DOCWARN_REMOVEPERSONALINFO ) ) { - xDocProps->resetUserData( ::rtl::OUString() ); + xDocProps->resetUserData( OUString() ); } else if ( IsModified() ) { @@ -190,11 +190,11 @@ void SfxObjectShell::UpdateDocInfoForSave() { // remove all data pointing to the current user if (xDocProps->getAuthor().equals(aUserName)) { - xDocProps->setAuthor( ::rtl::OUString() ); + xDocProps->setAuthor( OUString() ); } - xDocProps->setModifiedBy( ::rtl::OUString() ); + xDocProps->setModifiedBy( OUString() ); if (xDocProps->getPrintedBy().equals(aUserName)) { - xDocProps->setPrintedBy( ::rtl::OUString() ); + xDocProps->setPrintedBy( OUString() ); } } else @@ -693,8 +693,8 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) // created from template? uno::Reference xDocProps(getDocProperties()); - ::rtl::OUString aTemplName( xDocProps->getTemplateName() ); - ::rtl::OUString aTemplURL( xDocProps->getTemplateURL() ); + OUString aTemplName( xDocProps->getTemplateName() ); + OUString aTemplURL( xDocProps->getTemplateURL() ); String aFoundName; if ( !aTemplName.isEmpty() || (!aTemplURL.isEmpty() && !IsReadOnly()) ) @@ -762,7 +762,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) else if ( bCanUpdateFromTemplate == document::UpdateDocMode::ACCORDING_TO_CONFIG ) { String sMessage( SfxResId(STR_QRYTEMPL_MESSAGE).toString() ); - sMessage.SearchAndReplace( rtl::OUString("$(ARG1)"), aTemplName ); + sMessage.SearchAndReplace( OUString("$(ARG1)"), aTemplName ); sfx2::QueryTemplateBox aBox( GetDialogParent(), sMessage ); if ( RET_YES == aBox.Execute() ) bLoad = sal_True; @@ -816,10 +816,10 @@ void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const Strin if ( IsOwnStorageFormat_Impl( *GetMedium()) ) { uno::Reference xDocProps(getDocProperties()); - xDocProps->setTemplateURL( ::rtl::OUString() ); - xDocProps->setTemplateName( ::rtl::OUString() ); + xDocProps->setTemplateURL( OUString() ); + xDocProps->setTemplateName( OUString() ); xDocProps->setTemplateDate( util::DateTime() ); - xDocProps->resetUserData( ::rtl::OUString() ); + xDocProps->resetUserData( OUString() ); // TODO/REFACTOR: // Title? diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 853eddb2b034..33c9c180307c 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -213,7 +213,7 @@ void SfxObjectShell::FlushDocInfo() SetModified(sal_True); uno::Reference xDocProps(getDocProperties()); DoFlushDocInfo(); // call template method - ::rtl::OUString url(xDocProps->getAutoloadURL()); + OUString url(xDocProps->getAutoloadURL()); sal_Int32 delay(xDocProps->getAutoloadSecs()); SetAutoLoad( INetURLObject(url), delay * 1000, (delay > 0) || !url.isEmpty() ); @@ -221,7 +221,7 @@ void SfxObjectShell::FlushDocInfo() //------------------------------------------------------------------------- -void SfxObjectShell::SetError( sal_uInt32 lErr, const ::rtl::OUString& aLogMessage ) +void SfxObjectShell::SetError( sal_uInt32 lErr, const OUString& aLogMessage ) { if(pImp->lErr==ERRCODE_NONE) { @@ -254,7 +254,7 @@ sal_uInt32 SfxObjectShell::GetErrorCode() const void SfxObjectShell::ResetError() { if( pImp->lErr != ERRCODE_NONE ) - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Resetting Error." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Resetting Error." ) ); pImp->lErr=0; SfxMedium * pMed = GetMedium(); @@ -302,7 +302,7 @@ sal_Bool SfxObjectShell::IsModified() return sal_False; } - uno::Sequence < ::rtl::OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames(); + uno::Sequence < OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames(); for ( sal_Int32 n=0; n xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aNames[n] ); @@ -504,7 +504,7 @@ sal_Bool SfxObjectShell::SwitchToShared( sal_Bool bShared, sal_Bool bSave ) if ( bShared != IsDocShared() ) { - ::rtl::OUString aOrigURL = GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); + OUString aOrigURL = GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); if ( aOrigURL.isEmpty() && bSave ) { @@ -567,9 +567,9 @@ sal_Bool SfxObjectShell::SwitchToShared( sal_Bool bShared, sal_Bool bSave ) } else { - ::rtl::OUString aTempFileURL = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); + OUString aTempFileURL = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); GetMedium()->SwitchDocumentToFile( GetSharedFileURL() ); - pImp->m_aSharedFileURL = ::rtl::OUString(); + pImp->m_aSharedFileURL = OUString(); // now remove the temporary file the document was based on ::utl::UCBContentHelper::Kill( aTempFileURL ); @@ -620,7 +620,7 @@ void SfxObjectShell::FreeSharedFile() } //-------------------------------------------------------------------- -void SfxObjectShell::FreeSharedFile( const ::rtl::OUString& aTempFileURL ) +void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL ) { SetSharedXMLFlag( sal_False ); @@ -645,7 +645,7 @@ void SfxObjectShell::FreeSharedFile( const ::rtl::OUString& aTempFileURL ) // now remove the temporary file the document is based currently on ::utl::UCBContentHelper::Kill( aTempFileURL ); - pImp->m_aSharedFileURL = ::rtl::OUString(); + pImp->m_aSharedFileURL = OUString(); } } @@ -676,7 +676,7 @@ sal_Bool SfxObjectShell::IsDocShared() const //-------------------------------------------------------------------- -::rtl::OUString SfxObjectShell::GetSharedFileURL() const +OUString SfxObjectShell::GetSharedFileURL() const { return pImp->m_aSharedFileURL; } @@ -868,18 +868,18 @@ String SfxObjectShell::GetTitle return X(pImp->aTitle); // must it be numbered? - rtl::OUString aNoName(SFX2_RESSTR(STR_NONAME)); + OUString aNoName(SFX2_RESSTR(STR_NONAME)); if (pImp->bIsNamedVisible) { // Append number - aNoName += rtl::OUString::valueOf(static_cast(pImp->nVisualDocumentNumber)); + aNoName += OUString::valueOf(static_cast(pImp->nVisualDocumentNumber)); } // Document called "noname" for the time being return X(aNoName); } - const INetURLObject aURL( IsDocShared() ? GetSharedFileURL() : ::rtl::OUString( GetMedium()->GetName() ) ); + const INetURLObject aURL( IsDocShared() ? GetSharedFileURL() : OUString( GetMedium()->GetName() ) ); if ( nMaxLength > SFX_TITLE_CAPTION && nMaxLength <= SFX_TITLE_HISTORY ) { sal_uInt16 nRemote; @@ -980,7 +980,7 @@ void SfxObjectShell::SetNoName() { bHasName = 0; bIsTmp = sal_True; - GetModel()->attachResource( ::rtl::OUString(), GetModel()->getArgs() ); + GetModel()->attachResource( OUString(), GetModel()->getArgs() ); } //-------------------------------------------------------------------- @@ -1102,16 +1102,16 @@ void SfxObjectShell::CheckSecurityOnLoading_Impl() //------------------------------------------------------------------------- void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteractionHandler >& xHandler ) { - ::rtl::OUString aVersion; + OUString aVersion; sal_Bool bIsEncrypted = sal_False; sal_Bool bHasNonEncrypted = sal_False; try { uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aVersion; - xPropSet->getPropertyValue( ::rtl::OUString( "HasEncryptedEntries" ) ) >>= bIsEncrypted; - xPropSet->getPropertyValue( ::rtl::OUString( "HasNonEncryptedEntries" ) ) >>= bHasNonEncrypted; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue( OUString( "HasEncryptedEntries" ) ) >>= bIsEncrypted; + xPropSet->getPropertyValue( OUString( "HasNonEncryptedEntries" ) ) >>= bHasNonEncrypted; } catch( uno::Exception& ) { @@ -1195,7 +1195,7 @@ void SfxObjectShell::InitOwnModel_Impl() uno::Reference< frame::XModel > xModel ( GetModel(), uno::UNO_QUERY ); if ( xModel.is() ) { - ::rtl::OUString aURL = GetMedium()->GetOrigURL(); + OUString aURL = GetMedium()->GetOrigURL(); SfxItemSet *pSet = GetMedium()->GetItemSet(); if ( !GetMedium()->IsReadOnly() ) pSet->ClearItem( SID_INPUTSTREAM ); @@ -1249,7 +1249,7 @@ void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags ) pImp->nFlagsInProgress |= SFX_LOADED_IMAGES; uno::Reference xDocProps( getDocProperties()); - ::rtl::OUString url(xDocProps->getAutoloadURL()); + OUString url(xDocProps->getAutoloadURL()); sal_Int32 delay(xDocProps->getAutoloadSecs()); SetAutoLoad( INetURLObject(url), delay * 1000, (delay > 0) || !url.isEmpty() ); @@ -1356,7 +1356,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() ForgetMedium(); if( !DoSaveCompleted( pTmpMedium ) ) - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); else { SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False ); @@ -1521,7 +1521,7 @@ namespace } } -ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const ::rtl::OUString& _rScriptURL, +ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const ::com::sun::star::uno::Any* pCaller ) { OSL_TRACE( "in CallXScript" ); @@ -1562,7 +1562,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon { Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] = *pCaller; - xProps->setPropertyValue( rtl::OUString("Caller"), uno::makeAny( aArgs ) ); + xProps->setPropertyValue( OUString("Caller"), uno::makeAny( aArgs ) ); } } aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam ); @@ -1733,7 +1733,7 @@ void SfxObjectShell::SetWaitCursor( sal_Bool bSet ) const String SfxObjectShell::GetAPIName() const { - INetURLObject aURL( IsDocShared() ? GetSharedFileURL() : ::rtl::OUString( GetMedium()->GetName() ) ); + INetURLObject aURL( IsDocShared() ? GetSharedFileURL() : OUString( GetMedium()->GetName() ) ); String aName( aURL.GetBase() ); if( !aName.Len() ) aName = aURL.GetURLNoPass(); @@ -1900,9 +1900,9 @@ sal_Bool SfxObjectShell_Impl::setCurrentMacroExecMode( sal_uInt16 nMacroMode ) return sal_False; } -::rtl::OUString SfxObjectShell_Impl::getDocumentLocation() const +OUString SfxObjectShell_Impl::getDocumentLocation() const { - ::rtl::OUString sLocation; + OUString sLocation; const SfxMedium* pMedium( rDocShell.GetMedium() ); OSL_PRECOND( pMedium, "SfxObjectShell_Impl::getDocumentLocation: no medium!" ); @@ -1959,11 +1959,11 @@ sal_Bool SfxObjectShell_Impl::hasTrustedScriptingSignature( sal_Bool bAllowUIToA try { - ::rtl::OUString aVersion; + OUString aVersion; try { uno::Reference < beans::XPropertySet > xPropSet( rDocShell.GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; } catch( uno::Exception& ) { @@ -2026,7 +2026,7 @@ void SfxObjectShell_Impl::showBrokenSignatureWarning( const uno::Reference< task } } -void SfxObjectShell::AddLog( const ::rtl::OUString& aMessage ) +void SfxObjectShell::AddLog( const OUString& aMessage ) { if ( !pImp->m_xLogRing.is() ) { @@ -2045,11 +2045,11 @@ void SfxObjectShell::AddLog( const ::rtl::OUString& aMessage ) namespace { -void WriteStringInStream( const uno::Reference< io::XOutputStream >& xOutStream, const ::rtl::OUString& aString ) +void WriteStringInStream( const uno::Reference< io::XOutputStream >& xOutStream, const OUString& aString ) { if ( xOutStream.is() ) { - ::rtl::OString aStrLog = ::rtl::OUStringToOString( aString, RTL_TEXTENCODING_UTF8 ); + OString aStrLog = OUStringToOString( aString, RTL_TEXTENCODING_UTF8 ); uno::Sequence< sal_Int8 > aLogData( (const sal_Int8*)aStrLog.getStr(), aStrLog.getLength() ); xOutStream->writeBytes( aLogData ); @@ -2077,24 +2077,24 @@ void SfxObjectShell::StoreLog() if ( pImp->m_xLogRing.is() ) { #ifdef WNT - ::rtl::OUString aFileURL = ::rtl::OUString( "${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}" ); + OUString aFileURL = OUString( "${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}" ); #else - ::rtl::OUString aFileURL = ::rtl::OUString( "${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}" ); + OUString aFileURL = OUString( "${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}" ); #endif ::rtl::Bootstrap::expandMacros( aFileURL ); #ifdef WNT - ::rtl::OUString aBuildID = ::rtl::OUString( "${$BRAND_BASE_DIR/program/setup.ini:buildid}" ); + OUString aBuildID = OUString( "${$BRAND_BASE_DIR/program/setup.ini:buildid}" ); #else - ::rtl::OUString aBuildID = ::rtl::OUString( "${$BRAND_BASE_DIR/program/setuprc:buildid}" ); + OUString aBuildID = OUString( "${$BRAND_BASE_DIR/program/setuprc:buildid}" ); #endif ::rtl::Bootstrap::expandMacros( aBuildID ); if ( !aFileURL.isEmpty() ) { - aFileURL += ::rtl::OUString( "/user/temp/document_io_logring.txt" ); + aFileURL += OUString( "/user/temp/document_io_logring.txt" ); try { uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -2107,7 +2107,7 @@ void SfxObjectShell::StoreLog() if ( !aBuildID.isEmpty() ) WriteStringInStream( xOutStream, aBuildID ); - uno::Sequence< ::rtl::OUString > aLogSeq = pImp->m_xLogRing->getCollectedLog(); + uno::Sequence< OUString > aLogSeq = pImp->m_xLogRing->getCollectedLog(); for ( sal_Int32 nInd = 0; nInd < aLogSeq.getLength(); nInd++ ) WriteStringInStream( xOutStream, aLogSeq[nInd] ); } diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 6c5b6d2f5cd2..ef09a7efb972 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -306,7 +306,7 @@ sal_Bool SfxObjectShell::APISaveAs_Impl SFX_ITEMSET_ARG( aParams, pContentTypeItem, SfxStringItem, SID_CONTENTTYPE, sal_False ); if ( pContentTypeItem ) { - const SfxFilter* pFilter = SfxFilterMatcher( rtl::OUString::createFromAscii(GetFactory().GetShortName()) ).GetFilter4Mime( pContentTypeItem->GetValue(), SFX_FILTER_EXPORT ); + const SfxFilter* pFilter = SfxFilterMatcher( OUString::createFromAscii(GetFactory().GetShortName()) ).GetFilter4Mime( pContentTypeItem->GetValue(), SFX_FILTER_EXPORT ); if ( pFilter ) aFilterName = pFilter->GetName(); } @@ -389,7 +389,7 @@ void SfxObjectShell::CheckIn( ) SfxCheckinDialog checkinDlg( &GetFrame( )->GetWindow( ) ); if ( checkinDlg.Execute( ) == RET_OK ) { - rtl::OUString sComment = checkinDlg.GetComment( ); + OUString sComment = checkinDlg.GetComment( ); sal_Bool bMajor = checkinDlg.IsMajor( ); xCmisDoc->checkIn( bMajor, sComment ); uno::Reference< util::XModifiable > xModifiable( GetModel( ), uno::UNO_QUERY ); @@ -669,7 +669,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( QueryHiddenInformation( bIsPDFExport ? WhenCreatingPDF : WhenSaving, NULL ) == RET_YES ) { bDialogUsed = aHelper.GUIStoreModel( GetModel(), - ::rtl::OUString::createFromAscii( pSlot->GetUnoName() ), + OUString::createFromAscii( pSlot->GetUnoName() ), aDispatchArgs, bPreselectPassword, GetSharedFileURL(), @@ -678,7 +678,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) else { // the user has decided not to store the document - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } @@ -692,8 +692,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) rReq.SetArgs( aResultParams ); SFX_REQUEST_ARG( rReq, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, sal_False ); - ::rtl::OUString aFilterName = pFilterNameItem ? ::rtl::OUString( pFilterNameItem->GetValue() ) - : ::rtl::OUString(); + OUString aFilterName = pFilterNameItem ? OUString( pFilterNameItem->GetValue() ) + : OUString(); const SfxFilter* pFilt = GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ); OSL_ENSURE( nId == SID_SAVEDOC || pFilt, "The filter can not be zero since it was used for storing!\n" ); @@ -1143,21 +1143,21 @@ void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq) case SID_DOCINFO_AUTHOR : { - ::rtl::OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); + OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); getDocProperties()->setAuthor( aStr ); break; } case SID_DOCINFO_COMMENTS : { - ::rtl::OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); + OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); getDocProperties()->setDescription( aStr ); break; } case SID_DOCINFO_KEYWORDS : { - ::rtl::OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); + OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); getDocProperties()->setKeywords( ::comphelper::string::convertCommaSeparated(aStr) ); break; @@ -1339,7 +1339,7 @@ uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::ImplAnal try { uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; } catch( uno::Exception& ) { @@ -1412,12 +1412,12 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent ) SvtSaveOptions::ODFDefaultVersion nVersion = aSaveOpt.GetODFDefaultVersion(); // the document is not new and is not modified - ::rtl::OUString aODFVersion; + OUString aODFVersion; try { // check the version of the document uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aODFVersion; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aODFVersion; } catch( uno::Exception& ) {} diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index fbc392180d26..223ae5e90720 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -201,7 +201,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::Named SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False); if ( pPasswordItem ) { - ::rtl::OUString aPassword = pPasswordItem->GetValue(); + OUString aPassword = pPasswordItem->GetValue(); o_rEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPassword ); bResult = true; } @@ -213,15 +213,15 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::Named //------------------------------------------------------------------------- sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl( - ::rtl::OUString aURL, + OUString aURL, const uno::Reference< embed::XStorage >& xDocStorage, - ::rtl::OUString aStreamName ) + OUString aStreamName ) { sal_Bool bResult = sal_False; try { uno::Reference< embed::XStorage > xVersion = xDocStorage->openStorageElement( - ::rtl::OUString("Versions"), + OUString("Versions"), embed::ElementModes::READWRITE ); DBG_ASSERT( xVersion.is(), @@ -262,16 +262,16 @@ sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl( catch( uno::Exception& ) { // TODO/LATER: handle the error depending on exception - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } return bResult; } //------------------------------------------------------------------------- -::rtl::OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< embed::XStorage >& xStorage ) +OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< embed::XStorage >& xStorage ) { - ::rtl::OUString aTempURL = ::utl::TempFile().GetURL(); + OUString aTempURL = ::utl::TempFile().GetURL(); DBG_ASSERT( !aTempURL.isEmpty(), "Can't create a temporary file!\n" ); if ( !aTempURL.isEmpty() ) @@ -291,10 +291,10 @@ sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl( OSL_FAIL( "Creation of a storage copy is failed!" ); ::utl::UCBContentHelper::Kill( aTempURL ); - aTempURL = ::rtl::OUString(); + aTempURL = OUString(); // TODO/LATER: may need error code setting based on exception - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } @@ -364,20 +364,20 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto { try { - xProps->setPropertyValue( ::rtl::OUString("MediaType"), uno::makeAny( aDataFlavor.MimeType ) ); + xProps->setPropertyValue( OUString("MediaType"), uno::makeAny( aDataFlavor.MimeType ) ); } catch( uno::Exception& ) { - const_cast( this )->SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + const_cast( this )->SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } SvtSaveOptions aSaveOpt; SvtSaveOptions::ODFDefaultVersion nDefVersion = aSaveOpt.GetODFDefaultVersion(); uno::Sequence< beans::NamedValue > aEncryptionAlgs( 3 ); - aEncryptionAlgs[0].Name = ::rtl::OUString( "StartKeyGenerationAlgorithm" ); - aEncryptionAlgs[1].Name = ::rtl::OUString( "EncryptionAlgorithm" ); - aEncryptionAlgs[2].Name = ::rtl::OUString( "ChecksumAlgorithm" ); + aEncryptionAlgs[0].Name = OUString( "StartKeyGenerationAlgorithm" ); + aEncryptionAlgs[1].Name = OUString( "EncryptionAlgorithm" ); + aEncryptionAlgs[2].Name = OUString( "ChecksumAlgorithm" ); // the default values, that should be used for ODF1.1 and older formats aEncryptionAlgs[0].Value <<= xml::crypto::DigestID::SHA1; aEncryptionAlgs[1].Value <<= xml::crypto::CipherID::BLOWFISH_CFB_8; @@ -388,7 +388,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto try { // older versions can not have this property set, it exists only starting from ODF1.2 - xProps->setPropertyValue( ::rtl::OUString("Version" ), uno::makeAny( ODFVER_012_TEXT ) ); + xProps->setPropertyValue( OUString("Version" ), uno::makeAny( ODFVER_012_TEXT ) ); } catch( uno::Exception& ) { @@ -413,7 +413,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto } catch( uno::Exception& ) { - const_cast( this )->SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + const_cast( this )->SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } @@ -445,13 +445,13 @@ sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage try { uno::Reference < beans::XPropertySet > xPropSet( xStorage, uno::UNO_QUERY_THROW ); - Any a = xPropSet->getPropertyValue( ::rtl::OUString("MediaType" ) ); - ::rtl::OUString aMediaType; + Any a = xPropSet->getPropertyValue( OUString("MediaType" ) ); + OUString aMediaType; if ( !(a>>=aMediaType) || aMediaType.isEmpty() ) { if ( bTypeMustBeSetAlready ) { - SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_BROKENPACKAGE, OUString( OSL_LOG_PREFIX ) ); return sal_False; } @@ -535,8 +535,8 @@ sal_Bool SfxObjectShell::DoInitNew( SfxMedium* pMed ) sal_Int32 nLength = aArgs.getLength(); aArgs.realloc( nLength + 1 ); aArgs[nLength].Name = "Title"; - aArgs[nLength].Value <<= ::rtl::OUString( GetTitle( SFX_TITLE_DETECT ) ); - xModel->attachResource( ::rtl::OUString(), aArgs ); + aArgs[nLength].Value <<= OUString( GetTitle( SFX_TITLE_DETECT ) ); + xModel->attachResource( OUString(), aArgs ); impl_addToModelCollection(xModel); } @@ -629,7 +629,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) SFX_ITEMSET_ARG( pSet, pBaseItem, SfxStringItem, SID_BASEURL, sal_False); - rtl::OUString aBaseURL; + OUString aBaseURL; SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False); if( pBaseItem ) aBaseURL = pBaseItem->GetValue(); @@ -637,7 +637,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { if ( pSalvageItem ) { - rtl::OUString aName( pMed->GetPhysicalName() ); + OUString aName( pMed->GetPhysicalName() ); ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aBaseURL ); } else @@ -655,7 +655,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { sal_uInt32 nError = HandleFilter( pMedium, this ); if ( nError != ERRCODE_NONE ) - SetError( nError, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( nError, OUString( OSL_LOG_PREFIX ) ); if (pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARTPRESENTATION) pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, sal_True) ); @@ -681,7 +681,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) // treat the package as broken if the mediatype was retrieved as a fallback uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW ); - xStorProps->getPropertyValue( ::rtl::OUString( "MediaTypeFallbackUsed" ) ) + xStorProps->getPropertyValue( OUString( "MediaTypeFallbackUsed" ) ) >>= bWarnMediaTypeFallback; if ( pRepairPackageItem && pRepairPackageItem->GetValue() ) @@ -695,12 +695,12 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) } if ( bWarnMediaTypeFallback || !xStorage->getElementNames().getLength() ) - SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_BROKENPACKAGE, OUString( OSL_LOG_PREFIX ) ); } catch( uno::Exception& ) { // TODO/LATER: may need error code setting based on exception - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } // Load @@ -717,11 +717,11 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) bHasName = sal_True; } else - SetError( ERRCODE_ABORT, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) ); } } else - SetError( pMed->GetLastStorageCreationState(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pMed->GetLastStorageCreationState(), OUString( OSL_LOG_PREFIX ) ); } else if ( GetError() == ERRCODE_NONE && InitNew(0) ) { @@ -741,7 +741,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( pMedium->GetFilter() && ( pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) { uno::Reference < beans::XPropertySet > xSet( GetModel(), uno::UNO_QUERY ); - ::rtl::OUString sLockUpdates("LockUpdates"); + OUString sLockUpdates("LockUpdates"); bool bSetProperty = true; try { @@ -783,11 +783,11 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) com::sun::star::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties(); if ( xProps.is() ) { - ::rtl::OUString aAuthor( "Author" ); - ::rtl::OUString aKeywords( "Keywords" ); - ::rtl::OUString aSubject( "Subject" ); + OUString aAuthor( "Author" ); + OUString aKeywords( "Keywords" ); + OUString aSubject( "Subject" ); Any aAny; - ::rtl::OUString aValue; + OUString aValue; uno::Reference xDPS( GetModel(), uno::UNO_QUERY_THROW); uno::Reference xDocProps @@ -877,7 +877,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo if( xServiceManager.is() ) { xFilterCFG = com::sun::star::uno::Reference< XNameAccess >( - xServiceManager->createInstance( ::rtl::OUString("com.sun.star.document.FilterFactory") ), + xServiceManager->createInstance( OUString("com.sun.star.document.FilterFactory") ), UNO_QUERY ); } @@ -894,7 +894,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty ) if( aProps[nProperty].Name == "UIComponent" ) { - ::rtl::OUString aServiceName; + OUString aServiceName; aProps[nProperty].Value >>= aServiceName; if( !aServiceName.isEmpty() ) { @@ -1017,7 +1017,7 @@ sal_Bool SfxObjectShell::DoSave() } catch( uno::Exception& ) { - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } DBG_ASSERT( bOk, "The root storage must allow to set common password!\n" ); @@ -1037,8 +1037,8 @@ sal_Bool SfxObjectShell::DoSave() if ( !xTmpStorage.is() ) throw uno::RuntimeException(); - ::rtl::OUString aBasicStorageName( "Basic" ); - ::rtl::OUString aDialogsStorageName( "Dialogs" ); + OUString aBasicStorageName( "Basic" ); + OUString aDialogsStorageName( "Dialogs" ); if ( GetMedium()->GetStorage()->hasByName( aBasicStorageName ) ) GetMedium()->GetStorage()->copyElementTo( aBasicStorageName, xTmpStorage, aBasicStorageName ); if ( GetMedium()->GetStorage()->hasByName( aDialogsStorageName ) ) @@ -1057,7 +1057,7 @@ sal_Bool SfxObjectShell::DoSave() } catch( uno::Exception& ) { - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); bOk = sal_False; } } @@ -1106,12 +1106,12 @@ sal_Bool SfxObjectShell::SaveTo_Impl RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE SfxObjectShell::SaveTo_Impl" ); if( RTL_LOGFILE_HASLOGFILE() ) { - rtl::OString aString( - rtl::OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aString( + OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1(aLog, "saving \"%s\"", aString.getStr()); } - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Begin" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Begin" ) ); ModifyBlocker_Impl aMod(this); @@ -1134,7 +1134,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // protected libraries exceed the size we can handler if ( bOwnTarget && !QuerySaveSizeExceededModules_Impl( rMedium.GetInteractionHandler() ) ) { - SetError( ERRCODE_IO_ABORT, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_ABORT, OUString( OSL_LOG_PREFIX ) ); return sal_False; } @@ -1151,7 +1151,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl || pImp->nScriptingSignatureState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED || pImp->nScriptingSignatureState == SIGNATURESTATE_SIGNATURES_INVALID ) ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "MacroSignaturePreserving" ) ); + AddLog( OUString( OSL_LOG_PREFIX "MacroSignaturePreserving" ) ); // the checking of the library modified state iterates over the libraries, should be done only when required // currently the check is commented out since it is broken, we have to check the signature every time we save @@ -1163,11 +1163,11 @@ sal_Bool SfxObjectShell::SaveTo_Impl SvtSaveOptions aSaveOpt; SvtSaveOptions::ODFDefaultVersion nVersion = aSaveOpt.GetODFDefaultVersion(); - ::rtl::OUString aODFVersion; + OUString aODFVersion; try { uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aODFVersion; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aODFVersion; } catch( uno::Exception& ) {} @@ -1198,7 +1198,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl && ::utl::UCBContentHelper::EqualURLs( pMedium->GetName(), rMedium.GetName() ) ) { bStoreToSameLocation = sal_True; - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save" ) ); if ( pMedium->DocNeedsFileDateCheck() ) rMedium.CheckFileDate( pMedium->GetInitFileDate( sal_False ) ); @@ -1206,7 +1206,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl if ( bCopyTo && GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) { // export to the same location is forbidden - SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_CANTWRITE, OUString( OSL_LOG_PREFIX ) ); } else { @@ -1215,11 +1215,11 @@ sal_Bool SfxObjectShell::SaveTo_Impl const sal_Bool bDoBackup = SvtSaveOptions().IsBackup(); if ( bDoBackup ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "DoBackup" ) ); + AddLog( OUString( OSL_LOG_PREFIX "DoBackup" ) ); rMedium.DoBackup_Impl(); if ( rMedium.GetError() ) { - SetError( rMedium.GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( rMedium.GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); rMedium.ResetError(); } } @@ -1243,7 +1243,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // if the last step is failed the stream should stay to be transacted and should be commited on any flush // so we can forget the stream in any way and the next storage commit will flush it - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save: Own to Own" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save: Own to Own" ) ); bNeedsDisconnectionOnFail = DisconnectStorage_Impl( *pMedium, rMedium ); @@ -1266,7 +1266,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // just disconnect the stream from the source format // so that the target medium can use it - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save: Alien to Alien" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save: Alien to Alien" ) ); pMedium->CloseAndRelease(); rMedium.CloseAndRelease(); @@ -1279,7 +1279,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // format is an own one so just disconnect the source // medium - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save: Alien to Own" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save: Alien to Own" ) ); pMedium->CloseAndRelease(); rMedium.CloseAndRelease(); @@ -1291,7 +1291,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // an alien format, just connect the source to temporary // storage - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save: Own to Alien" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save: Own to Alien" ) ); bNeedsDisconnectionOnFail = DisconnectStorage_Impl( *pMedium, rMedium ); @@ -1313,7 +1313,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // but for now the framework has to be ready for it // TODO/LATER: let the medium be prepared for alien formats as well - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "SaveAs/Export" ) ); + AddLog( OUString( OSL_LOG_PREFIX "SaveAs/Export" ) ); rMedium.CloseAndRelease(); if ( bStorageBasedTarget ) @@ -1326,7 +1326,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl if( rMedium.GetErrorCode() || pMedium->GetErrorCode() || GetErrorCode() ) return sal_False; - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Locking" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Locking" ) ); rMedium.LockOrigFileOnDemand( sal_False, sal_False ); @@ -1355,7 +1355,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl if ( !xProps.is() ) throw uno::RuntimeException(); - xProps->setPropertyValue( ::rtl::OUString("MediaType"), + xProps->setPropertyValue( OUString("MediaType"), uno::makeAny( aDataFlavor.MimeType ) ); } catch( uno::Exception& ) @@ -1380,14 +1380,14 @@ sal_Bool SfxObjectShell::SaveTo_Impl if( bOwnTarget && !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing in own format." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Storing in own format." ) ); uno::Reference< embed::XStorage > xMedStorage = rMedium.GetStorage(); if ( !xMedStorage.is() ) { // no saving without storage, unlock UI and return Lock_Impl( this, sal_False ); pImp->bForbidReload = bOldStat; - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing failed, still no error set." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Storing failed, still no error set." ) ); return sal_False; } @@ -1404,7 +1404,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl catch( uno::Exception& ) { OSL_FAIL( "Setting of common encryption key failed!" ); - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } else @@ -1414,7 +1414,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl const SfxStringItem *pVersionItem = ( !rMedium.IsInCheckIn( ) && pSet ) ? (const SfxStringItem*) SfxRequest::GetItem( pSet, SID_DOCINFO_COMMENTS, sal_False, TYPE(SfxStringItem) ) : NULL; - ::rtl::OUString aTmpVersionURL; + OUString aTmpVersionURL; if ( bOk ) { @@ -1423,18 +1423,18 @@ sal_Bool SfxObjectShell::SaveTo_Impl if ( xMedStorage == GetStorage() ) { OSL_ENSURE( !pVersionItem, "This scenario is impossible currently!\n" ); - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Should be impossible." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Should be impossible." ) ); // usual save procedure bOk = Save(); } else { // save to target - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save as own format." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save as own format." ) ); bOk = SaveAsOwnFormat( rMedium ); if ( bOk && pVersionItem ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "pVersionItem != NULL" ) ); + AddLog( OUString( OSL_LOG_PREFIX "pVersionItem != NULL" ) ); aTmpVersionURL = CreateTempCopyOfStorage_Impl( xMedStorage ); bOk = !aTmpVersionURL.isEmpty(); } @@ -1446,7 +1446,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl { // store the thumbnail representation image // the thumbnail is not stored in case of encrypted document - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Thumbnail creation." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Thumbnail creation." ) ); if ( !GenerateAndStoreThumbnail( bPasswdProvided, sal_False, pFilter->IsOwnTemplateFormat(), @@ -1461,14 +1461,14 @@ sal_Bool SfxObjectShell::SaveTo_Impl { if ( pImp->bIsSaving || pImp->bPreserveVersions ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Preserve versions." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Preserve versions." ) ); try { Sequence < util::RevisionTag > aVersions = rMedium.GetVersionList(); if ( aVersions.getLength() ) { // copy the version streams - ::rtl::OUString aVersionsName( "Versions" ); + OUString aVersionsName( "Versions" ); uno::Reference< embed::XStorage > xNewVerStor = xMedStorage->openStorageElement( aVersionsName, embed::ElementModes::READWRITE ); @@ -1491,7 +1491,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl } catch( uno::Exception& ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Preserve versions has failed." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Preserve versions has failed." ) ); OSL_FAIL( "Couldn't copy versions!\n" ); bOk = sal_False; // TODO/LATER: a specific error could be set @@ -1543,7 +1543,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl } else { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing in alien format." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Storing in alien format." ) ); // it's a "SaveAs" in an alien format if ( rMedium.GetFilter() && ( rMedium.GetFilter()->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) bOk = ExportTo( rMedium ); @@ -1572,7 +1572,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl uno::Reference< security::XDocumentDigitalSignatures > xDDSigns; if ( bOk && bTryToPreserveScriptSignature ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Copying scripting signature." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Copying scripting signature." ) ); // if the scripting code was not changed and it is signed the signature should be preserved // unfortunately at this point we have only information whether the basic code has changed or not @@ -1584,7 +1584,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl try { uno::Reference < beans::XPropertySet > xPropSet( rMedium.GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; } catch( uno::Exception& ) { @@ -1592,7 +1592,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl xDDSigns = security::DocumentDigitalSignatures::createWithVersion(comphelper::getProcessComponentContext(), aVersion); - ::rtl::OUString aScriptSignName = xDDSigns->getScriptingContentSignatureDefaultStreamName(); + OUString aScriptSignName = xDDSigns->getScriptingContentSignatureDefaultStreamName(); if ( !aScriptSignName.isEmpty() ) { @@ -1607,14 +1607,14 @@ sal_Bool SfxObjectShell::SaveTo_Impl if ( !xReadOrig.is() ) throw uno::RuntimeException(); uno::Reference< embed::XStorage > xMetaInf = xReadOrig->openStorageElement( - ::rtl::OUString( "META-INF" ), + OUString( "META-INF" ), embed::ElementModes::READ ); uno::Reference< embed::XStorage > xTarget = rMedium.GetZipStorageToSign_Impl( sal_False ); if ( !xTarget.is() ) throw uno::RuntimeException(); uno::Reference< embed::XStorage > xTargetMetaInf = xTarget->openStorageElement( - ::rtl::OUString( "META-INF" ), + OUString( "META-INF" ), embed::ElementModes::READWRITE ); if ( xMetaInf.is() && xTargetMetaInf.is() ) @@ -1659,18 +1659,18 @@ sal_Bool SfxObjectShell::SaveTo_Impl rMedium.CloseZipStorage_Impl(); } - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Medium commit." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Medium commit." ) ); - rtl::OUString sName( rMedium.GetName( ) ); + OUString sName( rMedium.GetName( ) ); bOk = rMedium.Commit(); - rtl::OUString sNewName( rMedium.GetName( ) ); + OUString sNewName( rMedium.GetName( ) ); if ( sName != sNewName ) GetMedium( )->SwitchDocumentToFile( sNewName ); if ( bOk ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing is successful." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Storing is successful." ) ); // if the target medium is an alien format and the "old" medium was an own format and the "old" medium // has a name, the object storage must be exchanged, because now we need a new temporary storage @@ -1691,7 +1691,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // copy storage of old medium to new temporary storage and take this over if( !ConnectTmpStorage_Impl( pMedium->GetStorage(), pMedium ) ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Process after storing has failed." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Process after storing has failed." ) ); bOk = sal_False; } } @@ -1699,7 +1699,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl } else { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing has failed." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Storing has failed." ) ); // in case the document storage was connected to backup temporarely it must be disconnected now if ( bNeedsDisconnectionOnFail ) @@ -1719,9 +1719,9 @@ sal_Bool SfxObjectShell::SaveTo_Impl com::sun::star::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties(); if ( xProps.is() ) { - ::rtl::OUString aAuthor( "Author" ); - ::rtl::OUString aKeywords( "Keywords" ); - ::rtl::OUString aSubject( "Subject" ); + OUString aAuthor( "Author" ); + OUString aKeywords( "Keywords" ); + OUString aSubject( "Subject" ); Any aAny; uno::Reference xDPS( @@ -1770,7 +1770,7 @@ sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMediu try { uno::Reference< embed::XOptimizedStorage > xOptStorage( xStorage, uno::UNO_QUERY_THROW ); - ::rtl::OUString aBackupURL = rTargetMedium.GetBackup_Impl(); + OUString aBackupURL = rTargetMedium.GetBackup_Impl(); if ( aBackupURL.isEmpty() ) { // the backup could not be created, try to disconnect the storage and close the source SfxMedium @@ -1879,7 +1879,7 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl( if ( !bResult ) { // TODO/LATER: may need error code setting based on exception - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } @@ -1901,8 +1901,8 @@ sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit ) uno::Reference < beans::XPropertySet > xPropSet( xNewStor, uno::UNO_QUERY ); if ( xPropSet.is() ) { - Any a = xPropSet->getPropertyValue( ::rtl::OUString("MediaType" ) ); - ::rtl::OUString aMediaType; + Any a = xPropSet->getPropertyValue( OUString("MediaType" ) ); + OUString aMediaType; if ( !(a>>=aMediaType) || aMediaType.isEmpty() ) { OSL_FAIL( "The mediatype must be set already!\n" ); @@ -1935,7 +1935,7 @@ sal_Bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium ) { // here only root storages are included, which are stored via temp file rMedium.CreateTempFileNoCopy(); - SetError(rMedium.GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError(rMedium.GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); if ( GetError() ) return sal_False; @@ -1945,7 +1945,7 @@ sal_Bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium ) sal_Bool bRet = SaveTo_Impl( rMedium, NULL ); if ( !bRet ) - SetError(rMedium.GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError(rMedium.GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); return bRet; } @@ -2057,7 +2057,7 @@ sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed ) uno::Reference< frame::XModel > xModel = GetModel(); if ( xModel.is() ) { - ::rtl::OUString aURL = pNewMed->GetOrigURL(); + OUString aURL = pNewMed->GetOrigURL(); uno::Sequence< beans::PropertyValue > aMediaDescr; TransformItems( SID_OPENDOC, *pNewMed->GetItemSet(), aMediaDescr ); try @@ -2108,7 +2108,7 @@ void SfxObjectShell::AddToRecentlyUsedList() { const SfxFilter* pOrgFilter = pMedium->GetOrigFilter(); Application::AddToRecentDocumentList( aUrl.GetURLNoPass( INetURLObject::NO_DECODE ), - (pOrgFilter) ? pOrgFilter->GetMimeType() : ::rtl::OUString() ); + (pOrgFilter) ? pOrgFilter->GetMimeType() : OUString() ); } } @@ -2170,7 +2170,7 @@ sal_Bool SfxObjectShell::ConvertFrom sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert ) { - ::rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); + OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); uno::Reference< lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory(); uno::Reference < lang::XMultiServiceFactory > xFilterFact ( @@ -2184,7 +2184,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert ) rMedium.GetItemSet()->Put( SfxStringItem( SID_FILTER_NAME, aFilterName ) ); } - ::rtl::OUString aFilterImplName; + OUString aFilterImplName; sal_Int32 nFilterProps = aProps.getLength(); for ( sal_Int32 nFilterProp = 0; nFilterPropGetFilterName() ); + OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); uno::Reference< document::XExporter > xExporter; { @@ -2293,7 +2293,7 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) if ( xFilters->hasByName( aFilterName ) ) xFilters->getByName( aFilterName ) >>= aProps; - ::rtl::OUString aFilterImplName; + OUString aFilterImplName; sal_Int32 nFilterProps = aProps.getLength(); for ( sal_Int32 nFilterProp = 0; nFilterPropSetLongName( pRetrMedium->GetLongName() ); if ( pMediumTmp->GetErrorCode() != ERRCODE_NONE ) { - SetError( pMediumTmp->GetError(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pMediumTmp->GetError(), OUString( OSL_LOG_PREFIX ) ); delete pMediumTmp; return sal_False; } @@ -2498,7 +2498,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) pMediumTmp->GetItemSet()->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); } - SetError(pMediumTmp->GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError(pMediumTmp->GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); sal_Bool bOpen( sal_False ); bOpen = DoSaveCompleted( pMediumTmp ); @@ -2509,7 +2509,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) else { // transfer error code from medium to objectshell - SetError( pMediumTmp->GetError(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pMediumTmp->GetError(), OUString( OSL_LOG_PREFIX ) ); // reconnect to object storage DoSaveCompleted( 0 ); @@ -2533,7 +2533,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) { if ( IsReadOnly() ) { - SetError( ERRCODE_SFX_DOCUMENTREADONLY, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_SFX_DOCUMENTREADONLY, OUString( OSL_LOG_PREFIX ) ); return sal_False; } @@ -2548,7 +2548,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) String aFilterName; const SfxFilter *pFilter = NULL; if ( pFilterItem ) - pFilter = SfxFilterMatcher( rtl::OUString::createFromAscii( GetFactory().GetShortName()) ).GetFilter4FilterName( aFilterName ); + pFilter = SfxFilterMatcher( OUString::createFromAscii( GetFactory().GetShortName()) ).GetFilter4FilterName( aFilterName ); SfxMedium *pMed = new SfxMedium( pSalvageItem->GetValue(), STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, pFilter ); @@ -2579,11 +2579,11 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl { if( aURL.HasError() ) { - SetError( ERRCODE_IO_INVALIDPARAMETER, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_INVALIDPARAMETER, OUString( OSL_LOG_PREFIX ) ); return sal_False; } - if ( aURL != INetURLObject( ::rtl::OUString( "private:stream" ) ) ) + if ( aURL != INetURLObject( OUString( "private:stream" ) ) ) { // Is there already a Document with this name? SfxObjectShell* pDoc = 0; @@ -2601,7 +2601,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl if ( pDoc ) { // Then error message: "already opened" - SetError(ERRCODE_SFX_ALREADYOPEN, ::rtl::OUString( OSL_LOG_PREFIX )); + SetError(ERRCODE_SFX_ALREADYOPEN, OUString( OSL_LOG_PREFIX )); return sal_False; } } @@ -2617,7 +2617,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl || !pFilter->CanExport() || (!bSaveTo && !pFilter->CanImport()) ) { - SetError( ERRCODE_IO_INVALIDPARAMETER, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_INVALIDPARAMETER, OUString( OSL_LOG_PREFIX ) ); return sal_False; } @@ -2639,14 +2639,14 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl if ( aURL == aActName && aURL != INetURLObject( OUString("private:stream") ) && IsReadOnly() ) { - SetError(ERRCODE_SFX_DOCUMENTREADONLY, ::rtl::OUString( OSL_LOG_PREFIX )); + SetError(ERRCODE_SFX_DOCUMENTREADONLY, OUString( OSL_LOG_PREFIX )); return sal_False; } if( SFX_ITEM_SET != aParams->GetItemState(SID_UNPACK) && SvtSaveOptions().IsSaveUnpacked() ) aParams->Put( SfxBoolItem( SID_UNPACK, sal_False ) ); - ::rtl::OUString aTempFileURL; + OUString aTempFileURL; if ( IsDocShared() ) aTempFileURL = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); @@ -2770,7 +2770,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl if ( pNewFile->GetErrorCode() != ERRCODE_NONE ) { // creating temporary file failed ( f.e. floppy disk not inserted! ) - SetError( pNewFile->GetError(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pNewFile->GetError(), OUString( OSL_LOG_PREFIX ) ); delete pNewFile; return sal_False; } @@ -2793,7 +2793,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl bOk = sal_True; // transfer a possible error from the medium to the document - SetError( pNewFile->GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pNewFile->GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); // notify the document that saving was done successfully if ( !bCopyTo ) @@ -2814,7 +2814,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl // and the DoSaveCompleted call should not be able to fail in general DBG_ASSERT( !bCopyTo, "Error while reconnecting to medium, can't be handled!"); - SetError( pNewFile->GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pNewFile->GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); if ( !bCopyTo ) { @@ -2833,7 +2833,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl } else { - SetError( pNewFile->GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pNewFile->GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); // reconnect to the old storage DoSaveCompleted( 0 ); @@ -2861,8 +2861,8 @@ sal_Bool SfxObjectShell::LoadFrom( SfxMedium& /*rMedium*/ ) sal_Bool SfxObjectShell::IsInformationLost() { Sequence< PropertyValue > aProps = GetModel()->getArgs(); - ::rtl::OUString aFilterName; - ::rtl::OUString aPreusedFilterName; + OUString aFilterName; + OUString aPreusedFilterName; for ( sal_Int32 nInd = 0; nInd < aProps.getLength(); nInd++ ) { if ( aProps[nInd].Name == "FilterName" ) @@ -3006,8 +3006,8 @@ sal_Bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium ) RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE SfxObjectShell::LoadOwnFormat" ); if( RTL_LOGFILE_HASLOGFILE() ) { - rtl::OString aString( - rtl::OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aString( + OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1(aLog, "loading \"%s\"", aString.getStr()); } @@ -3146,7 +3146,7 @@ sal_Bool SfxObjectShell::SaveCompletedChildren( sal_Bool bSuccess ) if ( pImp->mpObjectContainer ) { - uno::Sequence < ::rtl::OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames(); + uno::Sequence < OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames(); for ( sal_Int32 n=0; n xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aNames[n] ); @@ -3262,13 +3262,13 @@ sal_Bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed:: try { - uno::Sequence< ::rtl::OUString > aSubElements = xSource->getElementNames(); + uno::Sequence< OUString > aSubElements = xSource->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aSubElements.getLength(); nInd++ ) { if ( xSource->isStorageElement( aSubElements[nInd] ) ) { - ::rtl::OUString aMediaType; - ::rtl::OUString aMediaTypePropName( "MediaType" ); + OUString aMediaType; + OUString aMediaTypePropName( "MediaType" ); sal_Bool bGotMediaType = sal_False; try @@ -3390,7 +3390,7 @@ sal_Bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< e try { - uno::Sequence< ::rtl::OUString > aSubElements = xSource->getElementNames(); + uno::Sequence< OUString > aSubElements = xSource->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aSubElements.getLength(); nInd++ ) { if ( aSubElements[nInd] == "Configurations" ) @@ -3406,8 +3406,8 @@ sal_Bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< e } else if ( xSource->isStorageElement( aSubElements[nInd] ) ) { - ::rtl::OUString aMediaType; - ::rtl::OUString aMediaTypePropName( "MediaType" ); + OUString aMediaType; + OUString aMediaTypePropName( "MediaType" ); sal_Bool bGotMediaType = sal_False; try @@ -3504,12 +3504,12 @@ sal_Bool SfxObjectShell::GenerateAndStoreThumbnail( sal_Bool bEncrypted, try { uno::Reference< embed::XStorage > xThumbnailStor = - xStor->openStorageElement( ::rtl::OUString("Thumbnails"), + xStor->openStorageElement( OUString("Thumbnails"), embed::ElementModes::READWRITE ); if ( xThumbnailStor.is() ) { uno::Reference< io::XStream > xStream = xThumbnailStor->openStreamElement( - ::rtl::OUString("thumbnail.png"), + OUString("thumbnail.png"), embed::ElementModes::READWRITE ); if ( xStream.is() && WriteThumbnail( bEncrypted, bSigned, bIsTemplate, xStream ) ) @@ -3542,12 +3542,12 @@ sal_Bool SfxObjectShell::WriteThumbnail( sal_Bool bEncrypted, uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY ); if ( xSet.is() ) - xSet->setPropertyValue( ::rtl::OUString("MediaType"), - uno::makeAny( ::rtl::OUString("image/png") ) ); + xSet->setPropertyValue( OUString("MediaType"), + uno::makeAny( OUString("image/png") ) ); if ( bEncrypted ) { sal_uInt16 nResID = GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( - ::rtl::OUString::createFromAscii( GetFactory().GetShortName() ), + OUString::createFromAscii( GetFactory().GetShortName() ), bIsTemplate ); if ( nResID ) { @@ -3618,7 +3618,7 @@ sal_Bool SfxObjectShell::QuerySaveSizeExceededModules_Impl( const uno::Reference if ( !pImp->pBasicManager->isValid() ) GetBasicManager(); - uno::Sequence< rtl::OUString > sModules; + uno::Sequence< OUString > sModules; if ( xHandler.is() ) { if( pImp->pBasicManager->LegacyPsswdBinaryLimitExceeded( sModules ) ) diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index b0a021330609..b699be98a85e 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -121,10 +121,10 @@ class theCurrentComponent : public rtl::Static< WeakReference< XInterface >, the #ifndef DISABLE_SCRIPTING // remember all registered components for VBA compatibility, to be able to remove them on disposing the model -typedef ::std::map< XInterface*, ::rtl::OString > VBAConstantNameMap; +typedef ::std::map< XInterface*, OString > VBAConstantNameMap; static VBAConstantNameMap s_aRegisteredVBAConstants; -::rtl::OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent ) +OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent ) { OSL_ENSURE( rxComponent.is(), "lclGetVBAGlobalConstName - missing component" ); @@ -135,14 +135,14 @@ static VBAConstantNameMap s_aRegisteredVBAConstants; uno::Reference< beans::XPropertySet > xProps( rxComponent, uno::UNO_QUERY ); if( xProps.is() ) try { - ::rtl::OUString aConstName; - xProps->getPropertyValue( ::rtl::OUString( "ThisVBADocObj" ) ) >>= aConstName; - return ::rtl::OUStringToOString( aConstName, RTL_TEXTENCODING_ASCII_US ); + OUString aConstName; + xProps->getPropertyValue( OUString( "ThisVBADocObj" ) ) >>= aConstName; + return OUStringToOString( aConstName, RTL_TEXTENCODING_ASCII_US ); } catch (const uno::Exception&) // not supported { } - return ::rtl::OString(); + return OString(); } #endif @@ -401,7 +401,7 @@ SfxObjectShell::~SfxObjectShell() // The removing of the temporary file must be done as the latest step in the document destruction if ( pImp->aTempName.Len() ) { - rtl::OUString aTmp; + OUString aTmp; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->aTempName, aTmp ); ::utl::UCBContentHelper::Kill( aTmp ); } @@ -627,7 +627,7 @@ sal_uInt16 SfxObjectShell::PrepareClose SfxHelp::OpenHelpAgent( &pFirst->GetFrame(), HID_CLOSE_WARNING ); } const Reference< XTitle > xTitle( *pImp->pBaseModel.get(), UNO_QUERY_THROW ); - const ::rtl::OUString sTitle = xTitle->getTitle (); + const OUString sTitle = xTitle->getTitle (); nRet = ExecuteQuerySaveDocument(&pFrame->GetWindow(),sTitle); } /*HACK for plugin::destroy()*/ @@ -880,16 +880,16 @@ SfxObjectShell* SfxObjectShell::GetObjectShell() //-------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SfxObjectShell::GetEventNames() +uno::Sequence< OUString > SfxObjectShell::GetEventNames() { - static uno::Sequence< ::rtl::OUString >* pEventNameContainer = NULL; + static uno::Sequence< OUString >* pEventNameContainer = NULL; if ( !pEventNameContainer ) { SolarMutexGuard aGuard; if ( !pEventNameContainer ) { - static uno::Sequence< ::rtl::OUString > aEventNameContainer = GlobalEventConfig().getElementNames(); + static uno::Sequence< OUString > aEventNameContainer = GlobalEventConfig().getElementNames(); pEventNameContainer = &aEventNameContainer; } } @@ -956,7 +956,7 @@ void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComp // set new current component for VBA compatibility if ( _rxComponent.is() ) { - ::rtl::OString aVBAConstName = lclGetVBAGlobalConstName( _rxComponent ); + OString aVBAConstName = lclGetVBAGlobalConstName( _rxComponent ); if ( !aVBAConstName.isEmpty() ) { pAppMgr->SetGlobalUNOConstant( aVBAConstName.getStr(), Any( _rxComponent ) ); @@ -966,7 +966,7 @@ void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComp // no new component passed -> remove last registered VBA component else if ( xOldCurrentComp.is() ) { - ::rtl::OString aVBAConstName = lclGetVBAGlobalConstName( xOldCurrentComp ); + OString aVBAConstName = lclGetVBAGlobalConstName( xOldCurrentComp ); if ( !aVBAConstName.isEmpty() ) { pAppMgr->SetGlobalUNOConstant( aVBAConstName.getStr(), Any( Reference< XInterface >() ) ); @@ -987,7 +987,7 @@ String SfxObjectShell::GetServiceNameFromFactory( const String& rFact ) { //! Remove everything behind name! String aFact( rFact ); - String aPrefix = rtl::OUString("private:factory/"); + String aPrefix = OUString("private:factory/"); if ( aPrefix.Len() == aFact.Match( aPrefix ) ) aFact.Erase( 0, aPrefix.Len() ); sal_uInt16 nPos = aFact.Search( '?' ); @@ -1005,50 +1005,50 @@ String SfxObjectShell::GetServiceNameFromFactory( const String& rFact ) // a factory short name. Set return value directly to this service name as fallback // in case next lines of code does nothing ... // use rFact instead of normed aFact value ! - ::rtl::OUString aServiceName = rFact; + OUString aServiceName = rFact; if ( aFact.EqualsAscii("swriter") ) { - aServiceName = ::rtl::OUString("com.sun.star.text.TextDocument"); + aServiceName = OUString("com.sun.star.text.TextDocument"); } else if ( aFact.EqualsAscii("sweb") || aFact.EqualsAscii("swriter/web") ) { - aServiceName = ::rtl::OUString("com.sun.star.text.WebDocument"); + aServiceName = OUString("com.sun.star.text.WebDocument"); } else if ( aFact.EqualsAscii("sglobal") || aFact.EqualsAscii("swriter/globaldocument") ) { - aServiceName = ::rtl::OUString("com.sun.star.text.GlobalDocument"); + aServiceName = OUString("com.sun.star.text.GlobalDocument"); } else if ( aFact.EqualsAscii("scalc") ) { - aServiceName = ::rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"); + aServiceName = OUString("com.sun.star.sheet.SpreadsheetDocument"); } else if ( aFact.EqualsAscii("sdraw") ) { - aServiceName = ::rtl::OUString("com.sun.star.drawing.DrawingDocument"); + aServiceName = OUString("com.sun.star.drawing.DrawingDocument"); } else if ( aFact.EqualsAscii("simpress") ) { - aServiceName = ::rtl::OUString("com.sun.star.presentation.PresentationDocument"); + aServiceName = OUString("com.sun.star.presentation.PresentationDocument"); } else if ( aFact.EqualsAscii("schart") ) { - aServiceName = ::rtl::OUString("com.sun.star.chart.ChartDocument"); + aServiceName = OUString("com.sun.star.chart.ChartDocument"); } else if ( aFact.EqualsAscii("smath") ) { - aServiceName = ::rtl::OUString("com.sun.star.formula.FormulaProperties"); + aServiceName = OUString("com.sun.star.formula.FormulaProperties"); } #ifndef DISABLE_SCRIPTING else if ( aFact.EqualsAscii("sbasic") ) { - aServiceName = ::rtl::OUString("com.sun.star.script.BasicIDE"); + aServiceName = OUString("com.sun.star.script.BasicIDE"); } #endif #ifndef DISABLE_DBCONNECTIVITY else if ( aFact.EqualsAscii("sdatabase") ) { - aServiceName = ::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument"); + aServiceName = OUString("com.sun.star.sdb.OfficeDatabaseDocument"); } #endif @@ -1090,8 +1090,8 @@ Reference SfxObjectShell::CreateAndLoadComponent( const SfxIte TransformItems( SID_OPENDOC, rSet, aProps ); SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False); SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False); - ::rtl::OUString aURL; - ::rtl::OUString aTarget("_blank"); + OUString aURL; + OUString aTarget("_blank"); if ( pFileNameItem ) aURL = pFileNameItem->GetValue(); if ( pTargetItem ) diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 0524f5993277..48f19c324a16 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -34,7 +34,6 @@ #define STREAM_BUFFER_SIZE 2048 // usings -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::makeAny; @@ -314,7 +313,7 @@ String SfxOleStringHelper::ImplLoadString8( SvStream& rStrm ) const rStrm >> nSize; // size field includes trailing NUL character DBG_ASSERT( (0 < nSize) && (nSize <= 0xFFFF), - rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer(RTL_CONSTASCII_STRINGPARAM( "SfxOleStringHelper::ImplLoadString8 - invalid string of len ")). append(nSize).getStr() ); if( (0 < nSize) && (nSize <= 0xFFFF) ) @@ -352,7 +351,7 @@ String SfxOleStringHelper::ImplLoadString16( SvStream& rStrm ) const rStrm.SeekRel( 2 ); // create string from character array aBuffer.push_back( 0 ); - aValue = rtl::OUString( &aBuffer.front() ); + aValue = OUString( &aBuffer.front() ); } return aValue; } @@ -360,7 +359,7 @@ String SfxOleStringHelper::ImplLoadString16( SvStream& rStrm ) const void SfxOleStringHelper::ImplSaveString8( SvStream& rStrm, const String& rValue ) const { // encode to byte string - rtl::OString aEncoded(rtl::OUStringToOString(rValue, GetTextEncoding())); + OString aEncoded(OUStringToOString(rValue, GetTextEncoding())); // write size field (including trailing NUL character) sal_Int32 nSize = aEncoded.getLength() + 1; rStrm << nSize; diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 1cb518141d8a..3cad59816e8a 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -40,18 +40,18 @@ OwnSubFilterService::~OwnSubFilterService() } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OwnSubFilterService::impl_getStaticSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OwnSubFilterService::impl_getStaticSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.document.OwnSubFilter"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.document.OwnSubFilter"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.document.OwnSubFilter"); + aRet[1] = OUString("com.sun.star.comp.document.OwnSubFilter"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OwnSubFilterService::impl_getStaticImplementationName() +OUString SAL_CALL OwnSubFilterService::impl_getStaticImplementationName() { - return ::rtl::OUString("com.sun.star.comp.document.OwnSubFilter"); + return OUString("com.sun.star.comp.document.OwnSubFilter"); } //------------------------------------------------------------------------- @@ -125,17 +125,17 @@ void SAL_CALL OwnSubFilterService::initialize( const uno::Sequence< uno::Any >& // XServiceInfo //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OwnSubFilterService::getImplementationName() +OUString SAL_CALL OwnSubFilterService::getImplementationName() throw ( uno::RuntimeException ) { return impl_getStaticImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OwnSubFilterService::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OwnSubFilterService::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_getStaticSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_getStaticSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName.compareTo( aSeq[nInd] ) == 0 ) @@ -145,7 +145,7 @@ sal_Bool SAL_CALL OwnSubFilterService::supportsService( const ::rtl::OUString& S } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OwnSubFilterService::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OwnSubFilterService::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_getStaticSupportedServiceNames(); diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 3df5b426dfee..07857565212c 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -63,8 +63,8 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl() static SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] = { { MAP_CHAR_LEN("PluginCommands"), WID_COMMANDS, &::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), PROPERTY_UNBOUND, 0}, - { MAP_CHAR_LEN("PluginMimeType"), WID_MIMETYPE, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("PluginURL"), WID_URL , &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("PluginMimeType"), WID_MIMETYPE, &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("PluginURL"), WID_URL , &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, {0,0,0,0,0,0} }; return aPluginPropertyMap_Impl; @@ -105,8 +105,8 @@ throw( uno::RuntimeException ) pWin->Show(); size_t nCount = maCmdList.size(); - uno::Sequence < ::rtl::OUString > aCmds( nCount ), aArgs( nCount ); - ::rtl::OUString *pCmds = aCmds.getArray(), *pArgs = aArgs.getArray(); + uno::Sequence < OUString > aCmds( nCount ), aArgs( nCount ); + OUString *pCmds = aCmds.getArray(), *pArgs = aArgs.getArray(); for( size_t i = 0; i < nCount; i++ ) { pCmds[i] = maCmdList[ i ].GetCommand(); @@ -136,9 +136,9 @@ throw( uno::RuntimeException ) uno::Reference< beans::XPropertySet > xProp( xModel, ::uno::UNO_QUERY ); if( xProp.is() ) { - uno::Any aValue = xProp->getPropertyValue( ::rtl::OUString( "URL" ) ); + uno::Any aValue = xProp->getPropertyValue( OUString( "URL" ) ); aValue >>= maURL; - aValue = xProp->getPropertyValue( ::rtl::OUString( "TYPE" ) ); + aValue = xProp->getPropertyValue( OUString( "TYPE" ) ); aValue >>= maMimeType; } } @@ -190,7 +190,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PluginObject::getPropertySetI return xInfo; } -void SAL_CALL PluginObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny) +void SAL_CALL PluginObject::setPropertyValue(const OUString& aPropertyName, const uno::Any& aAny) throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if ( aPropertyName == "PluginURL" ) @@ -212,7 +212,7 @@ void SAL_CALL PluginObject::setPropertyValue(const ::rtl::OUString& aPropertyNam throw beans::UnknownPropertyException(); } -uno::Any SAL_CALL PluginObject::getPropertyValue(const ::rtl::OUString& aPropertyName) +uno::Any SAL_CALL PluginObject::getPropertyValue(const OUString& aPropertyName) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aAny; @@ -235,19 +235,19 @@ uno::Any SAL_CALL PluginObject::getPropertyValue(const ::rtl::OUString& aPropert return aAny; } -void SAL_CALL PluginObject::addPropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::addPropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL PluginObject::removePropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::removePropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL PluginObject::addVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::addVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL PluginObject::removeVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::removeVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 8b78c9b15e82..85ddf0d3c366 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -300,7 +300,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() thro aPrinter.getArray()[0].Name = "Name"; String sStringTemp = pPrinter->GetName() ; - aPrinter.getArray()[0].Value <<= ::rtl::OUString( sStringTemp ); + aPrinter.getArray()[0].Value <<= OUString( sStringTemp ); return aPrinter; } @@ -334,7 +334,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > // Name-Property? if ( rProp.Name.compareToAscii( "Name" ) == 0 ) { - ::rtl::OUString aPrinterName; + OUString aPrinterName; if ( ! ( rProp.Value >>= aPrinterName ) ) throw ::com::sun::star::lang::IllegalArgumentException(); @@ -408,13 +408,13 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > // PrinterTray-Property else if ( rProp.Name.compareToAscii( "PrinterPaperTray" ) == 0 ) { - rtl::OUString aTmp; + OUString aTmp; if ( ( rProp.Value >>= aTmp ) == sal_False ) throw ::com::sun::star::lang::IllegalArgumentException(); sal_uInt16 nCount = pPrinter->GetPaperBinCount(); for (sal_uInt16 nBin=0; nBinGetPaperBinName(nBin) ); + OUString aName( pPrinter->GetPaperBinName(nBin) ); if ( aName == aTmp ) { pPrinter->SetPaperBin(nBin); @@ -533,19 +533,19 @@ class ImplUCBPrintWatcher : public ::osl::Thread if (aSplitter.removeSegment() && sFileName.Len()>0) { ::ucbhelper::Content aSource( - ::rtl::OUString((*ppTempFile)->GetURL()), + OUString((*ppTempFile)->GetURL()), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); ::ucbhelper::Content aTarget( - ::rtl::OUString(aSplitter.GetMainURL(INetURLObject::NO_DECODE)), + OUString(aSplitter.GetMainURL(INetURLObject::NO_DECODE)), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); aTarget.transferContent( aSource, ::ucbhelper::InsertOperation_COPY, - ::rtl::OUString(sFileName), + OUString(sFileName), ::com::sun::star::ucb::NameClash::OVERWRITE); } } @@ -618,9 +618,9 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& if ( rProp.Name.compareToAscii( "FileName" ) == 0 ) { // unpack th URL and check for a valid and well known protocol - ::rtl::OUString sTemp; + OUString sTemp; if ( - ( rProp.Value.getValueType()!=::getCppuType((const ::rtl::OUString*)0)) || + ( rProp.Value.getValueType()!=::getCppuType((const OUString*)0)) || (!(rProp.Value>>=sTemp)) ) { @@ -640,16 +640,16 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& // No ucb or thread will be necessary then. In case it couldnt be // converted its not an URL nor a system path. Then we can't accept // this parameter and have to throw an exception. - ::rtl::OUString sSystemPath(sTemp); - ::rtl::OUString sFileURL; + OUString sSystemPath(sTemp); + OUString sFileURL; if (::osl::FileBase::getFileURLFromSystemPath(sSystemPath,sFileURL)!=::osl::FileBase::E_None) throw ::com::sun::star::lang::IllegalArgumentException(); aCheckedArgs[nProps].Name = rProp.Name; aCheckedArgs[nProps++].Value <<= sFileURL; // and append the local filename aCheckedArgs.realloc( aCheckedArgs.getLength()+1 ); - aCheckedArgs[nProps].Name = rtl::OUString("LocalFileName"); - aCheckedArgs[nProps++].Value <<= ::rtl::OUString( sTemp ); + aCheckedArgs[nProps].Name = OUString("LocalFileName"); + aCheckedArgs[nProps++].Value <<= OUString( sTemp ); } else // It's a valid URL. but now we must know, if it is a local one or not. @@ -664,7 +664,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& aCheckedArgs[nProps++].Value <<= sTemp; // and append the local filename aCheckedArgs.realloc( aCheckedArgs.getLength()+1 ); - aCheckedArgs[nProps].Name = rtl::OUString("LocalFileName"); + aCheckedArgs[nProps].Name = OUString("LocalFileName"); aCheckedArgs[nProps++].Value <<= sPath; } else @@ -683,7 +683,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& //FIXME: does it work? aCheckedArgs[nProps].Name = "LocalFileName"; - aCheckedArgs[nProps++].Value <<= ::rtl::OUString( pUCBPrintTempFile->GetFileName() ); + aCheckedArgs[nProps++].Value <<= OUString( pUCBPrintTempFile->GetFileName() ); sUcbUrl = sURL; } } @@ -707,7 +707,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& sal_Bool bTemp = sal_Bool(); if ( rProp.Value >>= bTemp ) { - aCheckedArgs[nProps].Name = rtl::OUString("Collate"); + aCheckedArgs[nProps].Name = OUString("Collate"); aCheckedArgs[nProps++].Value <<= bTemp; } else @@ -717,7 +717,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& // Pages-Property else if ( rProp.Name.compareToAscii( "Pages" ) == 0 ) { - ::rtl::OUString sTemp; + OUString sTemp; if( rProp.Value >>= sTemp ) { aCheckedArgs[nProps].Name = rProp.Name; diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 974fab629555..3cfec8c97554 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -183,9 +183,9 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument // counter for SfxBaseModel instances created. static sal_Int64 g_nInstanceCounter ; SfxObjectShellRef m_pObjectShell ; - ::rtl::OUString m_sURL ; - ::rtl::OUString m_sRuntimeUID ; - ::rtl::OUString m_aPreusedFilterName; + OUString m_sURL ; + OUString m_sRuntimeUID ; + OUString m_aPreusedFilterName; ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer ; Reference< XInterface > m_xParent ; Reference< frame::XController > m_xCurrent ; @@ -207,7 +207,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument Reference< script::provider::XScriptProvider > m_xScriptProvider; Reference< ui::XUIConfigurationManager2 > m_xUIConfigurationManager; ::rtl::Reference< ::sfx2::DocumentStorageModifyListener > m_pStorageModifyListen; - ::rtl::OUString m_sModuleIdentifier; + OUString m_sModuleIdentifier; Reference< frame::XTitle > m_xTitleHelper; Reference< frame::XUntitledNumbers > m_xNumberedControllers; Reference< rdf::XDocumentMetadataAccess> m_xDocumentMetadata; @@ -238,7 +238,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument // increase global instance counter. ++g_nInstanceCounter; // set own Runtime UID - m_sRuntimeUID = rtl::OUString::valueOf( g_nInstanceCounter ); + m_sRuntimeUID = OUString::valueOf( g_nInstanceCounter ); } virtual ~IMPL_SfxBaseModel_DataContainer() @@ -267,7 +267,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument const Reference xContext( ::comphelper::getProcessComponentContext()); - ::rtl::OUString uri; + OUString uri; const Reference xModel( m_pObjectShell->GetModel()); const Reference xMsf( @@ -275,7 +275,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument const Reference xTDDCF( xMsf->createInstanceWithContext( - ::rtl::OUString("com.sun.star.frame." + OUString("com.sun.star.frame." "TransientDocumentsDocumentContentFactory"), xContext), UNO_QUERY_THROW); @@ -290,7 +290,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument OSL_ENSURE(!uri.isEmpty(), "GetDMA: empty uri?"); if (!uri.isEmpty() && !uri.endsWithAsciiL("/", 1)) { - uri = uri + ::rtl::OUString("/"); + uri = uri + OUString("/"); } m_xDocumentMetadata = new ::sfx2::DocumentMetadataAccess( @@ -466,7 +466,7 @@ SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >& xModel { if ( m_pData->m_bClosed ) throw lang::DisposedException( - ::rtl::OUString("Object already disposed."), + OUString("Object already disposed."), Reference< XInterface >()); if ( @@ -474,7 +474,7 @@ SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >& xModel m_pData->m_bSaving ) throw io::IOException( - ::rtl::OUString("Concurrent save requests on the same document are not possible."), + OUString("Concurrent save requests on the same document are not possible."), Reference< XInterface >()); m_pData->m_bSaving = sal_True; @@ -686,8 +686,8 @@ Reference< container::XNameContainer > SAL_CALL SfxBaseModel::getLibraryContaine /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ -void SAL_CALL SfxBaseModel::createLibrary( const ::rtl::OUString& LibName, const ::rtl::OUString& Password, - const ::rtl::OUString& ExternalSourceURL, const ::rtl::OUString& LinkTargetURL ) +void SAL_CALL SfxBaseModel::createLibrary( const OUString& LibName, const OUString& Password, + const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) throw(container::ElementExistException, RuntimeException) { #ifdef DISABLE_SCRIPTING @@ -710,8 +710,8 @@ void SAL_CALL SfxBaseModel::createLibrary( const ::rtl::OUString& LibName, const /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ -void SAL_CALL SfxBaseModel::addModule( const ::rtl::OUString& LibraryName, const ::rtl::OUString& ModuleName, - const ::rtl::OUString& Language, const ::rtl::OUString& Source ) +void SAL_CALL SfxBaseModel::addModule( const OUString& LibraryName, const OUString& ModuleName, + const OUString& Language, const OUString& Source ) throw( container::NoSuchElementException, RuntimeException) { #ifdef DISABLE_SCRIPTING @@ -734,7 +734,7 @@ void SAL_CALL SfxBaseModel::addModule( const ::rtl::OUString& LibraryName, const /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ -void SAL_CALL SfxBaseModel::addDialog( const ::rtl::OUString& LibraryName, const ::rtl::OUString& DialogName, +void SAL_CALL SfxBaseModel::addDialog( const OUString& LibraryName, const OUString& DialogName, const Sequence< sal_Int8 >& Data ) throw(container::NoSuchElementException, RuntimeException) { @@ -907,7 +907,7 @@ void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject ) // frame::XModel //________________________________________________________________________________________________________ -sal_Bool SAL_CALL SfxBaseModel::attachResource( const ::rtl::OUString& rURL , +sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) throw(RuntimeException) { @@ -994,7 +994,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const ::rtl::OUString& // frame::XModel //________________________________________________________________________________________________________ -::rtl::OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException) +OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException) { SfxModelGuard aGuard( *this ); return m_pData->m_sURL ; @@ -1038,13 +1038,13 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE aRectSeq[3] = aTmpRect.Bottom(); seqArgsNew.realloc( ++nNewLength ); - seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString("WinExtent"); + seqArgsNew[ nNewLength - 1 ].Name = OUString("WinExtent"); seqArgsNew[ nNewLength - 1 ].Value <<= aRectSeq; if ( !m_pData->m_aPreusedFilterName.isEmpty() ) { seqArgsNew.realloc( ++nNewLength ); - seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString("PreusedFilterName"); + seqArgsNew[ nNewLength - 1 ].Name = OUString("PreusedFilterName"); seqArgsNew[ nNewLength - 1 ].Value <<= m_pData->m_aPreusedFilterName; } @@ -1060,7 +1060,7 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE aBorderSeq[3] = aBorder.Bottom(); seqArgsNew.realloc( ++nNewLength ); - seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString("DocumentBorder"); + seqArgsNew[ nNewLength - 1 ].Name = OUString("DocumentBorder"); seqArgsNew[ nNewLength - 1 ].Value <<= aBorderSeq; } @@ -1170,7 +1170,7 @@ namespace } // XUndoAction - virtual ::rtl::OUString SAL_CALL getTitle() throw (RuntimeException); + virtual OUString SAL_CALL getTitle() throw (RuntimeException); virtual void SAL_CALL undo( ) throw (UndoFailedException, RuntimeException); virtual void SAL_CALL redo( ) throw (UndoFailedException, RuntimeException); @@ -1179,10 +1179,10 @@ namespace const bool m_bUndoIsUnlock; }; - ::rtl::OUString SAL_CALL ControllerLockUndoAction::getTitle() throw (RuntimeException) + OUString SAL_CALL ControllerLockUndoAction::getTitle() throw (RuntimeException) { // this action is intended to be used within an UndoContext only, so nobody will ever see this title ... - return ::rtl::OUString(); + return OUString(); } void SAL_CALL ControllerLockUndoAction::undo( ) throw (UndoFailedException, RuntimeException) @@ -1422,7 +1422,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo if (bDeliverOwnership) m_pData->m_bSuicide = sal_True; throw util::CloseVetoException( - ::rtl::OUString("Cant close while saving."), + OUString("Cant close while saving."), static_cast< util::XCloseable* >(this)); } @@ -1520,7 +1520,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException) // XStorable //________________________________________________________________________________________________________ -::rtl::OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException) +OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException) { SfxModelGuard aGuard( *this ); @@ -1530,7 +1530,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException) if ( m_pData->m_pObjectShell->IsDocShared() ) return m_pData->m_pObjectShell->GetSharedFileURL(); else - return ::rtl::OUString(m_pData->m_pObjectShell->GetMedium()->GetName()); + return OUString(m_pData->m_pObjectShell->GetMedium()->GetName()); } return m_pData->m_sURL; @@ -1562,7 +1562,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > if ( m_pData->m_pObjectShell.Is() ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "storeSelf" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeSelf" ) ); SfxSaveGuard aSaveGuard(this, m_pData, sal_False); sal_Bool bCheckIn = sal_False; @@ -1573,10 +1573,10 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > && aSeqArgs[nInd].Name != "InteractionHandler" && aSeqArgs[nInd].Name != "StatusIndicator" && aSeqArgs[nInd].Name != "VersionMajor" && aSeqArgs[nInd].Name != "CheckIn" ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "unexpected parameter for storeSelf, might be no problem if SaveAs is executed." ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "unexpected parameter for storeSelf, might be no problem if SaveAs is executed." ) ); m_pData->m_pObjectShell->StoreLog(); - ::rtl::OUString aMessage( "Unexpected MediaDescriptor parameter: " ); + OUString aMessage( "Unexpected MediaDescriptor parameter: " ); aMessage += aSeqArgs[nInd].Name; throw lang::IllegalArgumentException( aMessage, Reference< XInterface >(), 1 ); } @@ -1647,20 +1647,20 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > if ( bRet ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "successful saving." ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "successful saving." ) ); m_pData->m_aPreusedFilterName = GetMediumFilterName_Impl(); SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVEDOCDONE, GlobalEventConfig::GetEventName(STR_EVENT_SAVEDOCDONE), m_pData->m_pObjectShell ) ); } else { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing failed!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Storing failed!" ) ); m_pData->m_pObjectShell->StoreLog(); // write the contents of the logger to the file SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVEDOCFAILED, GlobalEventConfig::GetEventName(STR_EVENT_SAVEDOCFAILED), m_pData->m_pObjectShell ) ); - throw task::ErrorCodeIOException( ::rtl::OUString(), Reference< XInterface >(), nErrCode ); + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nErrCode ); } } @@ -1679,7 +1679,7 @@ void SAL_CALL SfxBaseModel::store() throw (io::IOException, RuntimeException) // XStorable //________________________________________________________________________________________________________ -void SAL_CALL SfxBaseModel::storeAsURL( const ::rtl::OUString& rURL , +void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) throw (io::IOException, RuntimeException) { @@ -1689,7 +1689,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const ::rtl::OUString& if ( m_pData->m_pObjectShell.Is() ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "storeAsURL" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeAsURL" ) ); SfxSaveGuard aSaveGuard(this, m_pData, sal_False); impl_store( rURL, rArgs, sal_False ); @@ -1722,7 +1722,7 @@ Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager( ) throw (Runti // XStorable //________________________________________________________________________________________________________ -void SAL_CALL SfxBaseModel::storeToURL( const ::rtl::OUString& rURL , +void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) throw (io::IOException, RuntimeException) { @@ -1730,7 +1730,7 @@ void SAL_CALL SfxBaseModel::storeToURL( const ::rtl::OUString& if ( m_pData->m_pObjectShell.Is() ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "storeToURL" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeToURL" ) ); SfxSaveGuard aSaveGuard(this, m_pData, sal_False); impl_store( rURL, rArgs, sal_True ); } @@ -1742,7 +1742,7 @@ void SAL_CALL SfxBaseModel::storeToURL( const ::rtl::OUString& return m_pData->m_bModifiedSinceLastSave; } -void SAL_CALL SfxBaseModel::storeToRecoveryFile( const ::rtl::OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException ) +void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException ) { SfxModelGuard aGuard( *this ); @@ -1754,7 +1754,7 @@ void SAL_CALL SfxBaseModel::storeToRecoveryFile( const ::rtl::OUString& i_Target m_pData->m_bModifiedSinceLastSave = sal_False; } -void SAL_CALL SfxBaseModel::recoverFromFile( const ::rtl::OUString& i_SourceLocation, const ::rtl::OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException ) +void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException ) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); @@ -1762,12 +1762,12 @@ void SAL_CALL SfxBaseModel::recoverFromFile( const ::rtl::OUString& i_SourceLoca ::comphelper::NamedValueCollection aMediaDescriptor( i_MediaDescriptor ); // our load implementation expects the SalvagedFile to be in the media descriptor - OSL_ENSURE( !aMediaDescriptor.has( "SalvagedFile" ) || ( aMediaDescriptor.getOrDefault( "SalvagedFile", ::rtl::OUString() ) == i_SalvagedFile ), + OSL_ENSURE( !aMediaDescriptor.has( "SalvagedFile" ) || ( aMediaDescriptor.getOrDefault( "SalvagedFile", OUString() ) == i_SalvagedFile ), "SfxBaseModel::recoverFromFile: inconsistent information!" ); aMediaDescriptor.put( "SalvagedFile", i_SalvagedFile ); // similar for the to-be-loaded file - OSL_ENSURE( !aMediaDescriptor.has( "URL" ) || ( aMediaDescriptor.getOrDefault( "URL", ::rtl::OUString() ) == i_SourceLocation ), + OSL_ENSURE( !aMediaDescriptor.has( "URL" ) || ( aMediaDescriptor.getOrDefault( "URL", OUString() ) == i_SourceLocation ), "SfxBaseModel::recoverFromFile: inconsistent information!" ); aMediaDescriptor.put( "URL", i_SourceLocation ); @@ -1793,7 +1793,7 @@ void SAL_CALL SfxBaseModel::initNew() { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( IsInitialized() ) - throw frame::DoubleInitializationException( ::rtl::OUString(), *this ); + throw frame::DoubleInitializationException( OUString(), *this ); // the object shell should exist always DBG_ASSERT( m_pData->m_pObjectShell.Is(), "Model is useless without an ObjectShell" ); @@ -1808,7 +1808,7 @@ void SAL_CALL SfxBaseModel::initNew() m_pData->m_pObjectShell->ResetError(); if ( !bRes ) - throw task::ErrorCodeIOException( ::rtl::OUString(), Reference< XInterface >(), nErrCode ); + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nErrCode ); } } @@ -1838,7 +1838,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( IsInitialized() ) - throw frame::DoubleInitializationException( ::rtl::OUString(), *this ); + throw frame::DoubleInitializationException( OUString(), *this ); // the object shell should exist always DBG_ASSERT( m_pData->m_pObjectShell.Is(), "Model is useless without an ObjectShell" ); @@ -1887,7 +1887,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA nError = m_pData->m_pObjectShell->GetErrorCode(); if ( nError == ERRCODE_IO_BROKENPACKAGE && xHandler.is() ) { - ::rtl::OUString aDocName = pMedium->GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aDocName = pMedium->GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False ); if ( !pRepairItem || !pRepairItem->GetValue() ) { @@ -1972,7 +1972,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA if ( !bWarning ) // #i30711# don't abort loading if it's only a warning { - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nError ? nError : ERRCODE_IO_CANTREAD ); } @@ -2248,55 +2248,55 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo Sequence< datatransfer::DataFlavor > aFlavorSeq( nSuppFlavors ); aFlavorSeq[0].MimeType = - ::rtl::OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); - aFlavorSeq[0].HumanPresentableName = ::rtl::OUString( "GDIMetaFile" ); + OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); + aFlavorSeq[0].HumanPresentableName = OUString( "GDIMetaFile" ); aFlavorSeq[0].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[1].MimeType = - ::rtl::OUString( "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); - aFlavorSeq[1].HumanPresentableName = ::rtl::OUString( "GDIMetaFile" ); + OUString( "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); + aFlavorSeq[1].HumanPresentableName = OUString( "GDIMetaFile" ); aFlavorSeq[1].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[2].MimeType = - ::rtl::OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); - aFlavorSeq[2].HumanPresentableName = ::rtl::OUString( "Enhanced Windows MetaFile" ); + OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); + aFlavorSeq[2].HumanPresentableName = OUString( "Enhanced Windows MetaFile" ); aFlavorSeq[2].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[3].MimeType = - ::rtl::OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); - aFlavorSeq[3].HumanPresentableName = ::rtl::OUString( "Windows MetaFile" ); + OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); + aFlavorSeq[3].HumanPresentableName = OUString( "Windows MetaFile" ); aFlavorSeq[3].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[4].MimeType = - ::rtl::OUString( "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ); - aFlavorSeq[4].HumanPresentableName = ::rtl::OUString( "Star Object Descriptor (XML)" ); + OUString( "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ); + aFlavorSeq[4].HumanPresentableName = OUString( "Star Object Descriptor (XML)" ); aFlavorSeq[4].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[5].MimeType = - ::rtl::OUString( "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"" ); - aFlavorSeq[5].HumanPresentableName = ::rtl::OUString( "Star Embed Source (XML)" ); + OUString( "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"" ); + aFlavorSeq[5].HumanPresentableName = OUString( "Star Embed Source (XML)" ); aFlavorSeq[5].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[6].MimeType = - ::rtl::OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ); - aFlavorSeq[6].HumanPresentableName = ::rtl::OUString( "Bitmap" ); + OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ); + aFlavorSeq[6].HumanPresentableName = OUString( "Bitmap" ); aFlavorSeq[6].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[7].MimeType = - ::rtl::OUString( "image/png" ); - aFlavorSeq[7].HumanPresentableName = ::rtl::OUString( "PNG" ); + OUString( "image/png" ); + aFlavorSeq[7].HumanPresentableName = OUString( "PNG" ); aFlavorSeq[7].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); if ( nSuppFlavors == 10 ) { aFlavorSeq[8].MimeType = - ::rtl::OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); - aFlavorSeq[8].HumanPresentableName = ::rtl::OUString( "Enhanced Windows MetaFile" ); + OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); + aFlavorSeq[8].HumanPresentableName = OUString( "Enhanced Windows MetaFile" ); aFlavorSeq[8].DataType = getCppuType( (const sal_uInt64*) 0 ); aFlavorSeq[9].MimeType = - ::rtl::OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); - aFlavorSeq[9].HumanPresentableName = ::rtl::OUString( "Windows MetaFile" ); + OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); + aFlavorSeq[9].HumanPresentableName = OUString( "Windows MetaFile" ); aFlavorSeq[9].DataType = getCppuType( (const sal_uInt64*) 0 ); } @@ -2491,10 +2491,10 @@ void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< docume } // --------------------------------- -void SAL_CALL SfxBaseModel::notifyDocumentEvent( const ::rtl::OUString&, const Reference< frame::XController2 >&, const Any& ) +void SAL_CALL SfxBaseModel::notifyDocumentEvent( const OUString&, const Reference< frame::XController2 >&, const Any& ) throw ( lang::IllegalArgumentException, lang::NoSupportException, RuntimeException ) { - throw lang::NoSupportException( ::rtl::OUString( "SfxBaseModel controlls all the sent notifications itself!" ), Reference< XInterface >() ); + throw lang::NoSupportException( OUString( "SfxBaseModel controlls all the sent notifications itself!" ), Reference< XInterface >() ); } Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getCmisPropertiesValues() @@ -2533,7 +2533,7 @@ void SAL_CALL SfxBaseModel::checkOut( ) throw ( RuntimeException ) comphelper::getProcessComponentContext() ); Any aResult = aContent.executeCommand( "checkout", Any( ) ); - rtl::OUString sURL; + OUString sURL; aResult >>= sURL; m_pData->m_pObjectShell->GetMedium( )->SwitchDocumentToFile( sURL ); @@ -2564,7 +2564,7 @@ void SAL_CALL SfxBaseModel::cancelCheckOut( ) throw ( RuntimeException ) comphelper::getProcessComponentContext() ); Any aResult = aContent.executeCommand( "cancelCheckout", Any( ) ); - rtl::OUString sURL; + OUString sURL; aResult >>= sURL; m_pData->m_pObjectShell->GetMedium( )->SwitchDocumentToFile( sURL ); @@ -2583,7 +2583,7 @@ void SAL_CALL SfxBaseModel::cancelCheckOut( ) throw ( RuntimeException ) } } -void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const rtl::OUString& rMessage ) throw ( RuntimeException ) +void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage ) throw ( RuntimeException ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); if ( pMedium ) @@ -2598,12 +2598,12 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const rtl::OUString& rMe aProps[2].Name = "CheckIn"; aProps[2].Value = makeAny( sal_True ); - rtl::OUString sName( pMedium->GetName( ) ); + OUString sName( pMedium->GetName( ) ); storeSelf( aProps ); // Refresh pMedium as it has probably changed during the storeSelf call pMedium = m_pData->m_pObjectShell->GetMedium( ); - rtl::OUString sNewName( pMedium->GetName( ) ); + OUString sNewName( pMedium->GetName( ) ); // URL has changed, update the document if ( sName != sNewName ) @@ -2624,7 +2624,7 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const rtl::OUString& rMe } } -sal_Bool SfxBaseModel::getBoolPropertyValue( const rtl::OUString& rName ) throw ( RuntimeException ) +sal_Bool SfxBaseModel::getBoolPropertyValue( const OUString& rName ) throw ( RuntimeException ) { sal_Bool bValue = sal_False; if ( m_pData->m_pObjectShell ) @@ -2684,8 +2684,8 @@ void SfxBaseModel::loadCmisProperties( ) Reference(), comphelper::getProcessComponentContext() ); Reference < beans::XPropertySetInfo > xProps = aContent.getProperties(); - ::rtl::OUString aCmisPropsValues( "CmisPropertiesValues" ); - ::rtl::OUString aCmisPropsNames( "CmisPropertiesDisplayNames" ); + OUString aCmisPropsValues( "CmisPropertiesValues" ); + OUString aCmisPropsNames( "CmisPropertiesDisplayNames" ); if ( xProps->hasPropertyByName( aCmisPropsValues ) ) { beans::PropertyValues aCmisValues; @@ -2712,7 +2712,7 @@ void SfxBaseModel::loadCmisProperties( ) // SfxListener //________________________________________________________________________________________________________ -void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const ::rtl::OUString& rTitle ) +void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const OUString& rTitle ) { sal_Int32 nCount = rSeq.getLength(); sal_Int32 nArg; @@ -2730,7 +2730,7 @@ void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const ::rtl::OUStri if ( nArg == nCount ) { rSeq.realloc( nCount+1 ); - rSeq[nCount].Name = ::rtl::OUString( "Title" ); + rSeq[nCount].Name = OUString( "Title" ); rSeq[nCount].Value <<= rTitle; } } @@ -2759,7 +2759,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , && m_pData->m_pObjectShell->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) { Reference< embed::XStorage > xConfigStorage; - rtl::OUString aUIConfigFolderName( "Configurations2" ); + OUString aUIConfigFolderName( "Configurations2" ); xConfigStorage = getDocumentSubStorage( aUIConfigFolderName, embed::ElementModes::READWRITE ); if ( !xConfigStorage.is() ) @@ -2794,7 +2794,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , SfxItemSet *pSet = m_pData->m_pObjectShell->GetMedium()->GetItemSet(); Sequence< beans::PropertyValue > aArgs; - ::rtl::OUString aTitle = m_pData->m_pObjectShell->GetTitle(); + OUString aTitle = m_pData->m_pObjectShell->GetTitle(); TransformItems( SID_SAVEASDOC, *pSet, aArgs ); addTitle_Impl( aArgs, aTitle ); attachResource( m_pData->m_pObjectShell->GetMedium()->GetName(), aArgs ); @@ -2824,7 +2824,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , { if ( pSimpleHint->GetId() == SFX_HINT_TITLECHANGED ) { - ::rtl::OUString aTitle = m_pData->m_pObjectShell->GetTitle(); + OUString aTitle = m_pData->m_pObjectShell->GetTitle(); addTitle_Impl( m_pData->m_seqArguments, aTitle ); postEvent_Impl( GlobalEventConfig::GetEventName( STR_EVENT_TITLECHANGED ) ); } @@ -2892,9 +2892,9 @@ sal_Bool SfxBaseModel::IsInitialized() const void SfxBaseModel::MethodEntryCheck( const bool i_mustBeInitialized ) const { if ( impl_isDisposed() ) - throw lang::DisposedException( ::rtl::OUString(), *const_cast< SfxBaseModel* >( this ) ); + throw lang::DisposedException( OUString(), *const_cast< SfxBaseModel* >( this ) ); if ( i_mustBeInitialized && !IsInitialized() ) - throw lang::NotInitializedException( ::rtl::OUString(), *const_cast< SfxBaseModel* >( this ) ); + throw lang::NotInitializedException( OUString(), *const_cast< SfxBaseModel* >( this ) ); } sal_Bool SfxBaseModel::impl_isDisposed() const @@ -2906,7 +2906,7 @@ sal_Bool SfxBaseModel::impl_isDisposed() const // private impl. //________________________________________________________________________________________________________ -::rtl::OUString SfxBaseModel::GetMediumFilterName_Impl() +OUString SfxBaseModel::GetMediumFilterName_Impl() { const SfxFilter* pFilter = NULL; SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); @@ -2916,10 +2916,10 @@ sal_Bool SfxBaseModel::impl_isDisposed() const if ( pFilter ) return pFilter->GetName(); - return ::rtl::OUString(); + return OUString(); } -void SfxBaseModel::impl_store( const ::rtl::OUString& sURL , +void SfxBaseModel::impl_store( const OUString& sURL , const Sequence< beans::PropertyValue >& seqArguments , sal_Bool bSaveTo ) { @@ -2934,8 +2934,8 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL // this is the same file URL as the current document location, try to use storeOwn if possible ::comphelper::SequenceAsHashMap aArgHash( seqArguments ); - ::rtl::OUString aFilterString( "FilterName" ); - ::rtl::OUString aFilterName = aArgHash.getUnpackedValueOrDefault( aFilterString, ::rtl::OUString() ); + OUString aFilterString( "FilterName" ); + OUString aFilterName = aArgHash.getUnpackedValueOrDefault( aFilterString, OUString() ); if ( !aFilterName.isEmpty() ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); @@ -2945,7 +2945,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL if ( pFilter && aFilterName.equals( pFilter->GetFilterName() ) ) { aArgHash.erase( aFilterString ); - aArgHash.erase( ::rtl::OUString( "URL" ) ); + aArgHash.erase( OUString( "URL" ) ); try { @@ -2961,13 +2961,13 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL // TODO/LATER: need a new interaction for this case if ( m_pData->m_pObjectShell->IsDocShared() ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Can't store shared document!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Can't store shared document!" ) ); m_pData->m_pObjectShell->StoreLog(); - Sequence< beans::NamedValue > aNewEncryptionData = aArgHash.getUnpackedValueOrDefault( ::rtl::OUString( "EncryptionData" ), Sequence< beans::NamedValue >() ); + Sequence< beans::NamedValue > aNewEncryptionData = aArgHash.getUnpackedValueOrDefault( OUString( "EncryptionData" ), Sequence< beans::NamedValue >() ); if ( !aNewEncryptionData.getLength() ) { - ::rtl::OUString aNewPassword = aArgHash.getUnpackedValueOrDefault( ::rtl::OUString( "Password" ), ::rtl::OUString() ); + OUString aNewPassword = aArgHash.getUnpackedValueOrDefault( OUString( "Password" ), OUString() ); aNewEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( aNewPassword ); } @@ -2979,7 +2979,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL else { // if the password is changed a special error should be used in case of shared document - throw task::ErrorCodeIOException( ::rtl::OUString( "Cant change password for shared document." ), Reference< XInterface >(), ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ); + throw task::ErrorCodeIOException( OUString( "Cant change password for shared document." ), Reference< XInterface >(), ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ); } } #endif @@ -3005,11 +3005,11 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL if ( pCopyStreamItem && pCopyStreamItem->GetValue() && !bSaveTo ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Misuse of CopyStreamIfPossible!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Misuse of CopyStreamIfPossible!" ) ); m_pData->m_pObjectShell->StoreLog(); throw frame::IllegalArgumentIOException( - ::rtl::OUString( "CopyStreamIfPossible parameter is not acceptable for storeAsURL() call!"), + OUString( "CopyStreamIfPossible parameter is not acceptable for storeAsURL() call!"), Reference< XInterface >() ); } @@ -3065,7 +3065,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL sal_uInt32 nErrCode = m_pData->m_pObjectShell->GetErrorCode(); if ( !bRet && !nErrCode ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing has failed, no error is set!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Storing has failed, no error is set!" ) ); nErrCode = ERRCODE_IO_CANTWRITE; } m_pData->m_pObjectShell->ResetError(); @@ -3086,7 +3086,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL } } - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing succeeded!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Storing succeeded!" ) ); if ( !bSaveTo ) { m_pData->m_aPreusedFilterName = GetMediumFilterName_Impl(); @@ -3105,7 +3105,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL else { // let the logring be stored to the related file - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing failed!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Storing failed!" ) ); m_pData->m_pObjectShell->StoreLog(); m_pData->m_pObjectShell->SetModifyPasswordHash( nOldModifyPasswordHash ); @@ -3115,7 +3115,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL SFX_APP()->NotifyEvent( SfxEventHint( bSaveTo ? SFX_EVENT_SAVETODOCFAILED : SFX_EVENT_SAVEASDOCFAILED, GlobalEventConfig::GetEventName( bSaveTo ? STR_EVENT_SAVETODOCFAILED : STR_EVENT_SAVEASDOCFAILED), m_pData->m_pObjectShell ) ); - throw task::ErrorCodeIOException( ::rtl::OUString(), Reference< XInterface >(), nErrCode ); + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nErrCode ); } } } @@ -3146,7 +3146,7 @@ public: }; } // anonymous namespace -void SfxBaseModel::postEvent_Impl( const ::rtl::OUString& aName, const Reference< frame::XController2 >& xController ) +void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame::XController2 >& xController ) { // object already disposed? if ( impl_isDisposed() ) @@ -3336,7 +3336,7 @@ void SfxBaseModel::ListenForStorage_Impl( const Reference< embed::XStorage >& xS } } -Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) +Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw ( RuntimeException) { SfxModelGuard aGuard( *this ); @@ -3360,13 +3360,13 @@ Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const return xResult; } -Sequence< ::rtl::OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() +Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() throw ( io::IOException, RuntimeException ) { SfxModelGuard aGuard( *this ); - Sequence< ::rtl::OUString > aResult; + Sequence< OUString > aResult; sal_Bool bSuccess = sal_False; if ( m_pData->m_pObjectShell.Is() ) { @@ -3374,7 +3374,7 @@ Sequence< ::rtl::OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() Reference < container::XNameAccess > xAccess( xStorage, UNO_QUERY ); if ( xAccess.is() ) { - Sequence< ::rtl::OUString > aTemp = xAccess->getElementNames(); + Sequence< OUString > aTemp = xAccess->getElementNames(); sal_Int32 nResultSize = 0; for ( sal_Int32 n = 0; n < aTemp.getLength(); n++ ) { @@ -3427,7 +3427,7 @@ Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptP // XUIConfigurationManagerSupplier //____________________________________________________________________________________________________ -rtl::OUString SfxBaseModel::getRuntimeUID() const +OUString SfxBaseModel::getRuntimeUID() const { OSL_ENSURE( !m_pData->m_sRuntimeUID.isEmpty(), "SfxBaseModel::getRuntimeUID - ID is empty!" ); @@ -3442,7 +3442,7 @@ sal_Bool SfxBaseModel::hasValidSignatures() const return sal_False; } -static void GetCommandFromSequence( rtl::OUString& rCommand, sal_Int32& nIndex, const Sequence< beans::PropertyValue >& rSeqPropValue ) +static void GetCommandFromSequence( OUString& rCommand, sal_Int32& nIndex, const Sequence< beans::PropertyValue >& rSeqPropValue ) { nIndex = -1; @@ -3463,27 +3463,27 @@ static void ConvertSlotsToCommands( SfxObjectShell* pDoc, Reference< container:: { Any aAny; SfxModule* pModule( pDoc->GetFactory().GetModule() ); - rtl::OUString aSlotCmd( "slot:" ); - rtl::OUString aUnoCmd( ".uno:" ); + OUString aSlotCmd( "slot:" ); + OUString aUnoCmd( ".uno:" ); Sequence< beans::PropertyValue > aSeqPropValue; for ( sal_Int32 i = 0; i < rToolbarDefinition->getCount(); i++ ) { sal_Int32 nIndex( -1 ); - rtl::OUString aCommand; + OUString aCommand; if ( rToolbarDefinition->getByIndex( i ) >>= aSeqPropValue ) { GetCommandFromSequence( aCommand, nIndex, aSeqPropValue ); if ( nIndex >= 0 && ( aCommand.indexOf( aSlotCmd ) == 0 )) { - rtl::OUString aSlot( aCommand.copy( 5 )); + OUString aSlot( aCommand.copy( 5 )); // We have to replace the old "slot-Command" with our new ".uno:-Command" const SfxSlot* pSlot = pModule->GetSlotPool()->GetSlot( sal_uInt16( aSlot.toInt32() )); if ( pSlot ) { - rtl::OUStringBuffer aStrBuf( aUnoCmd ); + OUStringBuffer aStrBuf( aUnoCmd ); aStrBuf.appendAscii( pSlot->GetUnoName() ); aCommand = aStrBuf.makeStringAndClear(); @@ -3514,15 +3514,15 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage Reference< embed::XStorage > xConfigStorage; - rtl::OUString aUIConfigFolderName( "Configurations2" ); + OUString aUIConfigFolderName( "Configurations2" ); // First try to open with READWRITE and then READ xConfigStorage = getDocumentSubStorage( aUIConfigFolderName, embed::ElementModes::READWRITE ); if ( xConfigStorage.is() ) { - rtl::OUString aMediaTypeProp( "MediaType" ); - rtl::OUString aUIConfigMediaType( + OUString aMediaTypeProp( "MediaType" ); + OUString aUIConfigMediaType( "application/vnd.sun.xml.ui.configuration" ); - rtl::OUString aMediaType; + OUString aMediaType; Reference< beans::XPropertySet > xPropSet( xConfigStorage, UNO_QUERY ); Any a = xPropSet->getPropertyValue( aMediaTypeProp ); if ( !( a >>= aMediaType ) || aMediaType.isEmpty()) @@ -3543,7 +3543,7 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage { // Import old UI configuration from OOo 1.x Reference< embed::XStorage > xOOo1ConfigStorage; - rtl::OUString aOOo1UIConfigFolderName( "Configurations" ); + OUString aOOo1UIConfigFolderName( "Configurations" ); // Try to open with READ xOOo1ConfigStorage = getDocumentSubStorage( aOOo1UIConfigFolderName, embed::ElementModes::READ ); @@ -3558,12 +3558,12 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage { SfxObjectShell* pObjShell = SfxBaseModel::GetObjectShell(); - rtl::OUString aNum( "private:resource/toolbar/custom_OOo1x_" ); - rtl::OUString aTitle( "Toolbar " ); + OUString aNum( "private:resource/toolbar/custom_OOo1x_" ); + OUString aTitle( "Toolbar " ); for ( sal_Int32 i = 0; i < rToolbars.getLength(); i++ ) { - rtl::OUString aCustomTbxName = aNum + rtl::OUString::valueOf( i + 1 ); - rtl::OUString aCustomTbxTitle = aTitle + rtl::OUString::valueOf( i + 1 ); + OUString aCustomTbxName = aNum + OUString::valueOf( i + 1 ); + OUString aCustomTbxTitle = aTitle + OUString::valueOf( i + 1 ); Reference< container::XIndexContainer > xToolbar = rToolbars[i]; ConvertSlotsToCommands( pObjShell, xToolbar ); @@ -3575,7 +3575,7 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage { try { - rtl::OUString aPropName( "UIName" ); + OUString aPropName( "UIName" ); Any aAny( aCustomTbxTitle ); xPropSet->setPropertyValue( aPropName, aAny ); } @@ -3672,8 +3672,8 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat SfxModelGuard aGuard( *this ); datatransfer::DataFlavor aDataFlavor( - ::rtl::OUString("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ), - ::rtl::OUString("GDIMetaFile"), + OUString("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ), + OUString("GDIMetaFile"), ::getCppuType( (const Sequence< sal_Int8 >*) NULL ) ); embed::VisualRepresentation aVisualRepresentation; @@ -3697,7 +3697,7 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( IsInitialized() ) - throw frame::DoubleInitializationException( ::rtl::OUString(), *this ); + throw frame::DoubleInitializationException( OUString(), *this ); // after i36090 is fixed the pool from object shell can be used // SfxAllItemSet aSet( m_pData->m_pObjectShell->GetPool() ); @@ -3720,7 +3720,7 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& if ( !m_pData->m_pObjectShell->DoLoad(pMedium) ) { sal_uInt32 nError = m_pData->m_pObjectShell->GetErrorCode(); - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nError ? nError : ERRCODE_IO_CANTREAD ); } @@ -3783,7 +3783,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >& // the warnings are currently not transported if ( !bSuccess ) { - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nError ? nError : ERRCODE_IO_GENERAL ); } @@ -3807,7 +3807,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const Reference< embed::XStorage >& if ( !m_pData->m_pObjectShell->SwitchPersistance( xStorage ) ) { sal_uInt32 nError = m_pData->m_pObjectShell->GetErrorCode(); - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nError ? nError : ERRCODE_IO_GENERAL ); } @@ -3871,7 +3871,7 @@ bool SfxBaseModel::impl_getPrintHelper() //============================================================================= // css.frame.XModule - void SAL_CALL SfxBaseModel::setIdentifier(const ::rtl::OUString& Identifier) + void SAL_CALL SfxBaseModel::setIdentifier(const OUString& Identifier) throw (RuntimeException) { SfxModelGuard aGuard( *this ); @@ -3880,7 +3880,7 @@ bool SfxBaseModel::impl_getPrintHelper() //============================================================================= // css.frame.XModule - ::rtl::OUString SAL_CALL SfxBaseModel::getIdentifier() + OUString SAL_CALL SfxBaseModel::getIdentifier() throw (RuntimeException) { SfxModelGuard aGuard( *this ); @@ -3888,7 +3888,7 @@ bool SfxBaseModel::impl_getPrintHelper() return m_pData->m_sModuleIdentifier; if (m_pData->m_pObjectShell) return m_pData->m_pObjectShell->GetFactory().GetDocumentServiceName(); - return ::rtl::OUString(); + return OUString(); } //============================================================================= @@ -3924,7 +3924,7 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () m_pData->m_xNumberedControllers = Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), UNO_QUERY_THROW); pHelper->setOwner (xThis); - pHelper->setUntitledPrefix (::rtl::OUString(" : ")); + pHelper->setUntitledPrefix (OUString(" : ")); } return m_pData->m_xNumberedControllers; @@ -3932,13 +3932,13 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () //============================================================================= // css.frame.XTitle -::rtl::OUString SAL_CALL SfxBaseModel::getTitle() +OUString SAL_CALL SfxBaseModel::getTitle() throw (RuntimeException) { // SYNCHRONIZED -> SfxModelGuard aGuard( *this ); - ::rtl::OUString aResult = impl_getTitleHelper()->getTitle (); + OUString aResult = impl_getTitleHelper()->getTitle (); if ( !m_pData->m_bExternalTitle && m_pData->m_pObjectShell ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); @@ -3952,7 +3952,7 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () = aContent.getProperties(); if ( xProps.is() ) { - ::rtl::OUString aServerTitle( "TitleOnServer" ); + OUString aServerTitle( "TitleOnServer" ); if ( xProps->hasPropertyByName( aServerTitle ) ) { Any aAny = aContent.getPropertyValue( aServerTitle ); @@ -3985,7 +3985,7 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () //============================================================================= // css.frame.XTitle -void SAL_CALL SfxBaseModel::setTitle( const ::rtl::OUString& sTitle ) +void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle ) throw (RuntimeException) { // SYNCHRONIZED -> @@ -4054,7 +4054,7 @@ void SAL_CALL SfxBaseModel::releaseNumberForComponent( const Reference< XInterfa //============================================================================= // css.frame.XUntitledNumbers -::rtl::OUString SAL_CALL SfxBaseModel::getUntitledPrefix() +OUString SAL_CALL SfxBaseModel::getUntitledPrefix() throw (RuntimeException) { SfxModelGuard aGuard( *this ); @@ -4081,7 +4081,7 @@ Reference< container::XEnumeration > SAL_CALL SfxBaseModel::getControllers() //============================================================================= // frame::XModel2 -Sequence< ::rtl::OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNames() +Sequence< OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNames() throw (RuntimeException) { SfxModelGuard aGuard( *this ); @@ -4089,7 +4089,7 @@ Sequence< ::rtl::OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNam const SfxObjectFactory& rDocumentFactory = GetObjectShell()->GetFactory(); const sal_Int16 nViewFactoryCount = rDocumentFactory.GetViewFactoryCount(); - Sequence< ::rtl::OUString > aViewNames( nViewFactoryCount ); + Sequence< OUString > aViewNames( nViewFactoryCount ); for ( sal_Int16 nViewNo = 0; nViewNo < nViewFactoryCount; ++nViewNo ) aViewNames[nViewNo] = rDocumentFactory.GetViewFactory( nViewNo ).GetAPIViewName(); return aViewNames; @@ -4105,7 +4105,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createDefaultViewControl SfxModelGuard aGuard( *this ); const SfxObjectFactory& rDocumentFactory = GetObjectShell()->GetFactory(); - const ::rtl::OUString sDefaultViewName = rDocumentFactory.GetViewFactory( 0 ).GetAPIViewName(); + const OUString sDefaultViewName = rDocumentFactory.GetViewFactory( 0 ).GetAPIViewName(); aGuard.clear(); @@ -4213,7 +4213,7 @@ SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame //============================================================================= // frame::XModel2 Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( - const ::rtl::OUString& i_rViewName, const Sequence< PropertyValue >& i_rArguments, const Reference< XFrame >& i_rFrame ) + const OUString& i_rViewName, const Sequence< PropertyValue >& i_rArguments, const Reference< XFrame >& i_rFrame ) throw (RuntimeException , lang::IllegalArgumentException, Exception ) @@ -4221,12 +4221,12 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( SfxModelGuard aGuard( *this ); if ( !i_rFrame.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(), *this, 3 ); + throw lang::IllegalArgumentException( OUString(), *this, 3 ); // find the proper SFX view factory SfxViewFactory* pViewFactory = GetObjectShell()->GetFactory().GetViewFactoryByViewName( i_rViewName ); if ( !pViewFactory ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); // determine previous shell (used in some special cases) Reference< XController > xPreviousController( i_rFrame->getController() ); @@ -4308,7 +4308,7 @@ SfxBaseModel::getRDFRepository() throw (RuntimeException) const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4316,14 +4316,14 @@ SfxBaseModel::getRDFRepository() throw (RuntimeException) } // rdf::XNode: -::rtl::OUString SAL_CALL +OUString SAL_CALL SfxBaseModel::getStringValue() throw (RuntimeException) { SfxModelGuard aGuard( *this ); const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4331,28 +4331,28 @@ SfxBaseModel::getStringValue() throw (RuntimeException) } // rdf::XURI: -::rtl::OUString SAL_CALL +OUString SAL_CALL SfxBaseModel::getNamespace() throw (RuntimeException) { SfxModelGuard aGuard( *this ); const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } return xDMA->getNamespace(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL SfxBaseModel::getLocalName() throw (RuntimeException) { SfxModelGuard aGuard( *this ); const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4369,7 +4369,7 @@ throw (RuntimeException) const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4384,7 +4384,7 @@ throw (RuntimeException, lang::IllegalArgumentException) const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4400,7 +4400,7 @@ throw (RuntimeException, lang::IllegalArgumentException) const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4408,7 +4408,7 @@ throw (RuntimeException, lang::IllegalArgumentException) } Reference SAL_CALL -SfxBaseModel::addMetadataFile(const ::rtl::OUString & i_rFileName, +SfxBaseModel::addMetadataFile(const OUString & i_rFileName, const Sequence < Reference< rdf::XURI > > & i_rTypes) throw (RuntimeException, lang::IllegalArgumentException, container::ElementExistException) @@ -4417,7 +4417,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4427,7 +4427,7 @@ throw (RuntimeException, lang::IllegalArgumentException, Reference SAL_CALL SfxBaseModel::importMetadataFile(::sal_Int16 i_Format, const Reference< io::XInputStream > & i_xInStream, - const ::rtl::OUString & i_rFileName, + const OUString & i_rFileName, const Reference< rdf::XURI > & i_xBaseURI, const Sequence < Reference< rdf::XURI > > & i_rTypes) throw (RuntimeException, lang::IllegalArgumentException, @@ -4438,7 +4438,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4456,7 +4456,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4464,7 +4464,7 @@ throw (RuntimeException, lang::IllegalArgumentException, } void SAL_CALL -SfxBaseModel::addContentOrStylesFile(const ::rtl::OUString & i_rFileName) +SfxBaseModel::addContentOrStylesFile(const OUString & i_rFileName) throw (RuntimeException, lang::IllegalArgumentException, container::ElementExistException) { @@ -4472,7 +4472,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4480,7 +4480,7 @@ throw (RuntimeException, lang::IllegalArgumentException, } void SAL_CALL -SfxBaseModel::removeContentOrStylesFile(const ::rtl::OUString & i_rFileName) +SfxBaseModel::removeContentOrStylesFile(const OUString & i_rFileName) throw (RuntimeException, lang::IllegalArgumentException, container::NoSuchElementException) { @@ -4488,7 +4488,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4508,7 +4508,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference xDMA( m_pData->CreateDMAUninitialized()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4535,7 +4535,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4553,7 +4553,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference xDMA( m_pData->CreateDMAUninitialized()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4579,7 +4579,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index 4adb3b96c077..bb6b1d68745c 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -69,9 +69,9 @@ namespace sfx2 public: SfxModelFactory( const Reference< XMultiServiceFactory >& _rxServiceFactory, - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, - const Sequence< ::rtl::OUString >& _rServiceNames + const Sequence< OUString >& _rServiceNames ); // XSingleServiceFactory @@ -79,9 +79,9 @@ namespace sfx2 virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); protected: virtual ~SfxModelFactory(); @@ -91,8 +91,8 @@ namespace sfx2 private: const Reference< XMultiServiceFactory > m_xServiceFactory; - const ::rtl::OUString m_sImplementationName; - const Sequence< ::rtl::OUString > m_aServiceNames; + const OUString m_sImplementationName; + const Sequence< OUString > m_aServiceNames; const SfxModelFactoryFunc m_pComponentFactoryFunc; }; @@ -101,8 +101,8 @@ namespace sfx2 //==================================================================== //-------------------------------------------------------------------- SfxModelFactory::SfxModelFactory( const Reference< XMultiServiceFactory >& _rxServiceFactory, - const ::rtl::OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, - const Sequence< ::rtl::OUString >& _rServiceNames ) + const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, + const Sequence< OUString >& _rServiceNames ) :m_xServiceFactory( _rxServiceFactory ) ,m_sImplementationName( _rImplementationName ) ,m_aServiceNames( _rServiceNames ) @@ -132,7 +132,7 @@ namespace sfx2 { struct IsSpecialArgument : public ::std::unary_function< Any, bool > { - static bool isSpecialArgumentName( const ::rtl::OUString& _rValueName ) + static bool isSpecialArgumentName( const OUString& _rValueName ) { return _rValueName == "EmbeddedObject" || _rValueName == "EmbeddedScriptSupport" || _rValueName == "DocumentRecoverySupport"; } @@ -189,13 +189,13 @@ namespace sfx2 } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL SfxModelFactory::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL SfxModelFactory::getImplementationName( ) throw (RuntimeException) { return m_sImplementationName; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL SfxModelFactory::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL SfxModelFactory::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::std::find( m_aServiceNames.getConstArray(), @@ -205,15 +205,15 @@ namespace sfx2 } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SfxModelFactory::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SfxModelFactory::getSupportedServiceNames( ) throw (RuntimeException) { return m_aServiceNames; } //-------------------------------------------------------------------- Reference< XSingleServiceFactory > createSfxModelFactory( const Reference< XMultiServiceFactory >& _rxServiceFactory, - const ::rtl::OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, - const Sequence< ::rtl::OUString >& _rServiceNames ) + const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, + const Sequence< OUString >& _rServiceNames ) { return new SfxModelFactory( _rxServiceFactory, _rImplementationName, _pComponentFactoryFunc, _rServiceNames ); } diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 888272a72642..939141b5f957 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -113,11 +113,11 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberI assert(nMemberId == 0); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOM_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUE )); + aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUE )); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUESET )); + aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUESET )); aSeq[1].Value <<= sal_Int16( nValueSet ); - aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); + aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); aSeq[2].Value <<= sal_Int16( eType ); rVal <<= aSeq; diff --git a/sfx2/source/inc/SfxDocumentMetaData.hxx b/sfx2/source/inc/SfxDocumentMetaData.hxx index 080713a2efeb..2f7ad4ad12f5 100644 --- a/sfx2/source/inc/SfxDocumentMetaData.hxx +++ b/sfx2/source/inc/SfxDocumentMetaData.hxx @@ -28,8 +28,8 @@ namespace comp_SfxDocumentMetaData { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); @@ -38,8 +38,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( namespace comp_CompatWriterDocProps { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx index e45205e23566..afec42ee9107 100644 --- a/sfx2/source/inc/appbaslib.hxx +++ b/sfx2/source/inc/appbaslib.hxx @@ -84,7 +84,7 @@ public: /** checks if any modules in the SfxLibraryContainer exceed the binary limits. */ - sal_Bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< rtl::OUString >& sModules ); + sal_Bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& sModules ); private: @@ -99,8 +99,8 @@ class SfxApplicationScriptLibraryContainer { public: // Service - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); - static ::rtl::OUString impl_getStaticImplementationName(); + static ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); + static OUString impl_getStaticImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::Exception ); @@ -113,8 +113,8 @@ class SfxApplicationDialogLibraryContainer { public: // Service - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); - static ::rtl::OUString impl_getStaticImplementationName(); + static ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); + static OUString impl_getStaticImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::Exception ); diff --git a/sfx2/source/inc/doctemplates.hxx b/sfx2/source/inc/doctemplates.hxx index a363f9e1c391..99a1b94863e4 100644 --- a/sfx2/source/inc/doctemplates.hxx +++ b/sfx2/source/inc/doctemplates.hxx @@ -56,21 +56,21 @@ public: // --- XDocumentTemplates --- css::uno::Reference< css::ucb::XContent > SAL_CALL getContent() throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL storeTemplate( const ::rtl::OUString& GroupName, - const ::rtl::OUString& TemplateName, + sal_Bool SAL_CALL storeTemplate( const OUString& GroupName, + const OUString& TemplateName, const css::uno::Reference< css::frame::XStorable >& Storable ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL addTemplate( const ::rtl::OUString& GroupName, - const ::rtl::OUString& TemplateName, - const ::rtl::OUString& SourceURL ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL removeTemplate( const ::rtl::OUString& GroupName, - const ::rtl::OUString& TemplateName ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL renameTemplate( const ::rtl::OUString& GroupName, - const ::rtl::OUString& OldTemplateName, - const ::rtl::OUString& NewTemplateName ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL addGroup( const ::rtl::OUString& GroupName ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL removeGroup( const ::rtl::OUString& GroupName ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL renameGroup( const ::rtl::OUString& OldGroupName, - const ::rtl::OUString& NewGroupName ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL addTemplate( const OUString& GroupName, + const OUString& TemplateName, + const OUString& SourceURL ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL removeTemplate( const OUString& GroupName, + const OUString& TemplateName ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL renameTemplate( const OUString& GroupName, + const OUString& OldTemplateName, + const OUString& NewTemplateName ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL addGroup( const OUString& GroupName ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL removeGroup( const OUString& GroupName ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL renameGroup( const OUString& OldGroupName, + const OUString& NewGroupName ) throw( css::uno::RuntimeException ); void SAL_CALL update() throw( css::uno::RuntimeException ); }; diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index 2ac1da4b33d4..569fdb7ff509 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -64,7 +64,7 @@ namespace sfx2 virtual void SAL_CALL release( ) throw (); // XUndoManager - virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -72,10 +72,10 @@ namespace sfx2 virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 9380cbd980e3..84209181266b 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -57,7 +57,7 @@ class SvxMacro; class SfxEvents_Impl : public ::cppu::WeakImplHelper2< css::container::XNameReplace, css::document::XEventListener > { - css::uno::Sequence< ::rtl::OUString > maEventNames; + css::uno::Sequence< OUString > maEventNames; css::uno::Sequence< css::uno::Any > maEventData; css::uno::Reference< css::document::XEventBroadcaster > mxBroadcaster; ::osl::Mutex maMutex; @@ -71,16 +71,16 @@ public: ~SfxEvents_Impl(); // --- XNameReplace --- - virtual void SAL_CALL replaceByName( const ::rtl::OUString & aName, const css::uno::Any & aElement ) + virtual void SAL_CALL replaceByName( const OUString & aName, const css::uno::Any & aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); // --- XNameAccess ( parent of XNameReplace ) --- - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw ( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw ( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw ( css::uno::RuntimeException ); // --- XElementAccess ( parent of XNameAccess ) --- virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException ); @@ -181,7 +181,7 @@ public: // css.document.XDocumentEventBroadcaster virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException); virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException); + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException); // css.document.XEventListener virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx index 1e3174fea9b7..0dfc1c3c5a53 100644 --- a/sfx2/source/inc/iframe.hxx +++ b/sfx2/source/inc/iframe.hxx @@ -67,15 +67,15 @@ class IFrameObject : public ::cppu::WeakImplHelper6 < virtual void SAL_CALL addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); public: SFX_DECL_XSERVICEINFO diff --git a/sfx2/source/inc/inputdlg.hxx b/sfx2/source/inc/inputdlg.hxx index 1dce2fb2baa9..cf7b3a3b8872 100644 --- a/sfx2/source/inc/inputdlg.hxx +++ b/sfx2/source/inc/inputdlg.hxx @@ -20,11 +20,11 @@ class InputDialog : public ModalDialog { public: - InputDialog (const rtl::OUString &labelText, Window *pParent = NULL); + InputDialog (const OUString &labelText, Window *pParent = NULL); virtual ~InputDialog(); - rtl::OUString getEntryText () const; + OUString getEntryText () const; private: diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 868995f24c65..251d24222c24 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -57,7 +57,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess xBasicLibraries; ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > xDialogLibraries; - com::sun::star::uno::Sequence < rtl::OUString > xEventNames; + com::sun::star::uno::Sequence < OUString > xEventNames; ::sfx2::DocumentMacroMode aMacroMode; SfxProgress* pProgress; @@ -130,7 +130,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess sal_Bool m_bIsInit; - ::rtl::OUString m_aSharedFileURL; + OUString m_aSharedFileURL; ::com::sun::star::uno::Reference< ::com::sun::star::logging::XSimpleLogRing > m_xLogRing; @@ -147,7 +147,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess // IMacroDocumentAccess overridables virtual sal_Int16 getCurrentMacroExecMode() const; virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 nMacroMode ); - virtual ::rtl::OUString getDocumentLocation() const; + virtual OUString getDocumentLocation() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getZipStorageToSign(); virtual sal_Bool documentStorageHasMacros() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const; diff --git a/sfx2/source/inc/openuriexternally.hxx b/sfx2/source/inc/openuriexternally.hxx index 79a05a86b03d..baf7e1761ce8 100644 --- a/sfx2/source/inc/openuriexternally.hxx +++ b/sfx2/source/inc/openuriexternally.hxx @@ -48,7 +48,7 @@ namespace sfx2 { /// /// @return true iff execution was successful bool openUriExternally( - rtl::OUString const & uri, bool handleSystemShellExecuteException); + OUString const & uri, bool handleSystemShellExecuteException); } diff --git a/sfx2/source/inc/ownsubfilterservice.hxx b/sfx2/source/inc/ownsubfilterservice.hxx index fb02505f1d86..baea7d948171 100644 --- a/sfx2/source/inc/ownsubfilterservice.hxx +++ b/sfx2/source/inc/ownsubfilterservice.hxx @@ -46,10 +46,10 @@ public: OwnSubFilterService(const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > &xNewFactory); virtual ~OwnSubFilterService(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_getStaticImplementationName(); + static OUString SAL_CALL impl_getStaticImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -68,9 +68,9 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx index 2846e0ca2c57..ee1fe4adb278 100644 --- a/sfx2/source/inc/plugin.hxx +++ b/sfx2/source/inc/plugin.hxx @@ -54,8 +54,8 @@ class PluginObject : public ::cppu::WeakImplHelper5 < com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxObj; SfxItemPropertyMap maPropMap; SvCommandList maCmdList; - ::rtl::OUString maURL; - ::rtl::OUString maMimeType; + OUString maURL; + OUString maMimeType; PluginObject( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rFact ); ~PluginObject(); @@ -68,12 +68,12 @@ class PluginObject : public ::cppu::WeakImplHelper5 < virtual void SAL_CALL removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); public: SFX_DECL_XSERVICEINFO diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 932750c2e951..443e85df4491 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -33,13 +33,13 @@ class SfxPickList : public SfxListener { struct PickListEntry { - PickListEntry( const ::rtl::OUString& _aName, const ::rtl::OUString& _aFilter, const ::rtl::OUString& _aTitle ) : + PickListEntry( const OUString& _aName, const OUString& _aFilter, const OUString& _aTitle ) : aName( _aName ), aFilter( _aFilter ), aTitle( _aTitle ) {} - ::rtl::OUString aName; - ::rtl::OUString aFilter; - ::rtl::OUString aTitle; - ::rtl::OUString aOptions; + OUString aName; + OUString aFilter; + OUString aTitle; + OUString aOptions; }; std::vector< PickListEntry* > m_aPicklistVector; @@ -49,7 +49,7 @@ class SfxPickList : public SfxListener SfxPickList( sal_uInt32 nMenuSize ); ~SfxPickList(); - void CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const ::rtl::OUString& aURL, sal_uInt32 nNo ); + void CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const OUString& aURL, sal_uInt32 nNo ); PickListEntry* GetPickListEntry( sal_uInt32 nIndex ); void CreatePickListEntries(); void RemovePickListEntries(); diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx index 1406d60e9cf8..51a4fb767fca 100644 --- a/sfx2/source/inc/sfxurlrelocator.hxx +++ b/sfx2/source/inc/sfxurlrelocator.hxx @@ -34,16 +34,16 @@ class SfxURLRelocator_Impl ::com::sun::star::uno::Reference< ::com::sun::star::util::XMacroExpander > mxMacroExpander; public: - static bool propertyCanContainOfficeDir( const rtl::OUString & rPropName ); + static bool propertyCanContainOfficeDir( const OUString & rPropName ); void initOfficeInstDirs(); - void makeRelocatableURL( rtl::OUString & rURL ); - void makeAbsoluteURL( rtl::OUString & rURL ); + void makeRelocatableURL( OUString & rURL ); + void makeAbsoluteURL( OUString & rURL ); SfxURLRelocator_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); ~SfxURLRelocator_Impl(); private: - void implExpandURL( ::rtl::OUString& io_url ); + void implExpandURL( OUString& io_url ); }; #endif diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 4bb52fa0c8bd..dfe6975c7dcd 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -211,7 +211,7 @@ class LayoutManagerListener : public ::com::sun::star::frame::XLayoutManagerList sal_Bool m_bHasFrame; SfxWorkWindow* m_pWrkWin; ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xFrame; - rtl::OUString m_aLayoutManagerPropName; + OUString m_aLayoutManagerPropName; }; class SfxWorkWindow @@ -242,10 +242,10 @@ protected: sal_Bool bIsFullScreen : 1; sal_Bool bShowStatusBar : 1; sal_Int32 m_nLock; - rtl::OUString m_aStatusBarResName; - rtl::OUString m_aLayoutManagerPropName; - rtl::OUString m_aTbxTypeName; - rtl::OUString m_aProgressBarResName; + OUString m_aStatusBarResName; + OUString m_aLayoutManagerPropName; + OUString m_aTbxTypeName; + OUString m_aProgressBarResName; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xLayoutManagerListener; protected: diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 14737d7d084e..b882ff0b8dd8 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -67,7 +67,7 @@ SfxURLToolBoxControl_Impl::SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uI : SfxToolBoxControl( nSlotId, nId, rBox ), pAccExec( 0 ) { - addStatusListener( rtl::OUString( ".uno:CurrentURL" )); + addStatusListener( OUString( ".uno:CurrentURL" )); } SfxURLToolBoxControl_Impl::~SfxURLToolBoxControl_Impl() @@ -104,7 +104,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, sal_Bool /*bNew*/ if ( xDispatchProvider.is() && m_xServiceManager.is() ) { URL aTargetURL; - ::rtl::OUString aTarget( ::rtl::OUString("_default")); + OUString aTarget( OUString("_default")); aTargetURL.Complete = aName; @@ -113,18 +113,18 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, sal_Bool /*bNew*/ if ( xDispatch.is() ) { Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = ::rtl::OUString("Referer"); - aArgs[0].Value = makeAny( ::rtl::OUString(SFX_REFERER_USER )); - aArgs[1].Name = ::rtl::OUString( "FileName" ); - aArgs[1].Value = makeAny( ::rtl::OUString( aName )); + aArgs[0].Name = OUString("Referer"); + aArgs[0].Value = makeAny( OUString(SFX_REFERER_USER )); + aArgs[1].Name = OUString( "FileName" ); + aArgs[1].Value = makeAny( OUString( aName )); if ( aFilter.Len() ) { aArgs.realloc( 4 ); - aArgs[2].Name = ::rtl::OUString("FilterOptions"); - aArgs[2].Value = makeAny( ::rtl::OUString( aOptions )); - aArgs[3].Name = ::rtl::OUString("FilterName"); - aArgs[3].Value = makeAny( ::rtl::OUString( aFilter )); + aArgs[2].Name = OUString("FilterOptions"); + aArgs[2].Value = makeAny( OUString( aOptions )); + aArgs[3].Name = OUString("FilterName"); + aArgs[3].Value = makeAny( OUString( aFilter )); } SfxURLToolBoxControl_Impl::ExecuteInfo* pExecuteInfo = new SfxURLToolBoxControl_Impl::ExecuteInfo; @@ -235,7 +235,7 @@ void SfxURLToolBoxControl_Impl::StateChanged if (lProps[p].Name != HISTORY_PROPERTYNAME_URL) continue; - ::rtl::OUString sURL; + OUString sURL; if (!(lProps[p].Value>>=sURL) || sURL.isEmpty()) continue; diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index c4e0ee26e092..db8c498e3d2c 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -134,11 +134,11 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen //-------------------------------------------------------------------- -static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl ) +static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) { Image aRes; - ::rtl::OUString aTmp; + OUString aTmp; osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); Graphic aGraphic; @@ -171,9 +171,9 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) if (aThesLookUpStr.Len() > 0 && nDelimPos != STRING_NOTFOUND) { // get synonym list for sub menu - std::vector< ::rtl::OUString > aSynonyms; + std::vector< OUString > aSynonyms; SfxThesSubMenuHelper aHelper; - ::rtl::OUString aText( aHelper.GetText( aThesLookUpStr, nDelimPos ) ); + OUString aText( aHelper.GetText( aThesLookUpStr, nDelimPos ) ); lang::Locale aLocale; aHelper.GetLocale( aLocale, aThesLookUpStr, nDelimPos ); const bool bHasMoreSynonyms = aHelper.GetMeanings( aSynonyms, aText, aLocale, 7 /*max number of synonyms to retrieve*/ ); @@ -188,7 +188,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) Image aImage; String sThesImplName( aHelper.GetThesImplName( aLocale ) ); - ::rtl::OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName ) ); + OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName ) ); if (sThesImplName.Len() > 0 && !aSynonymsImageUrl.isEmpty()) aImage = Image( lcl_GetImageFromPngUrl( aSynonymsImageUrl ) ); @@ -199,7 +199,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) String aItemText( linguistic::GetThesaurusReplaceText( aSynonyms[i] ) ); pThesSubMenu->InsertItem( nId, aItemText ); - ::rtl::OUString aCmd(".uno:ThesaurusFromContext?WordReplace:string=" ); + OUString aCmd(".uno:ThesaurusFromContext?WordReplace:string=" ); aCmd += aItemText; pThesSubMenu->SetItemCommand( nId, aCmd ); @@ -209,16 +209,16 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) } else // nNumSynonyms == 0 { - const rtl::OUString aItemText( SfxResId(STR_MENU_NO_SYNONYM_FOUND).toString() ); + const OUString aItemText( SfxResId(STR_MENU_NO_SYNONYM_FOUND).toString() ); pThesSubMenu->InsertItem( 1, aItemText, MIB_NOSELECT ); } pThesSubMenu->InsertSeparator(); - const rtl::OUString sThesaurus( SfxResId(STR_MENU_THESAURUS).toString() ); + const OUString sThesaurus( SfxResId(STR_MENU_THESAURUS).toString() ); pThesSubMenu->InsertItem( 100, sThesaurus ); - pThesSubMenu->SetItemCommand( 100, ::rtl::OUString(".uno:ThesaurusDialog") ); + pThesSubMenu->SetItemCommand( 100, OUString(".uno:ThesaurusDialog") ); pSVMenu->InsertSeparator(); - const rtl::OUString sSynonyms( SfxResId(STR_MENU_SYNONYMS).toString() ); + const OUString sSynonyms( SfxResId(STR_MENU_SYNONYMS).toString() ); pSVMenu->InsertItem( SID_THES, sSynonyms ); pSVMenu->SetPopupMenu( SID_THES, pThesSubMenu ); } @@ -331,7 +331,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra aEvent.SourceWindow = VCLUnoHelper::GetInterface( pWindow ); aEvent.ExecutePosition.X = rPoint.X(); aEvent.ExecutePosition.Y = rPoint.Y(); - ::rtl::OUString sDummyMenuName; + OUString sDummyMenuName; if ( pFrame->GetViewShell()->TryContextMenuInterception( *pSVMenu, sDummyMenuName, pMenu, aEvent ) ) { if ( pMenu ) @@ -381,7 +381,7 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram aEvent.SourceWindow = VCLUnoHelper::GetInterface( pWindow ); aEvent.ExecutePosition.X = rPoint.X(); aEvent.ExecutePosition.Y = rPoint.Y(); - ::rtl::OUString sDummyMenuName; + OUString sDummyMenuName; if ( pFrame->GetViewShell()->TryContextMenuInterception( *pSVMenu, sDummyMenuName, pMenu, aEvent ) ) { if ( pMenu ) diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx index b1075f42640a..287ed2000546 100644 --- a/sfx2/source/menu/thessubmenu.cxx +++ b/sfx2/source/menu/thessubmenu.cxx @@ -38,7 +38,6 @@ #include "thessubmenu.hxx" using namespace ::com::sun::star; -using ::rtl::OUString; OUString SfxThesSubMenuHelper::GetText( const String &rLookUpString, diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx index a6a274fa5d40..2a12c6ae1728 100644 --- a/sfx2/source/menu/thessubmenu.hxx +++ b/sfx2/source/menu/thessubmenu.hxx @@ -42,7 +42,7 @@ public: SfxThesSubMenuHelper(); ~SfxThesSubMenuHelper(); - static ::rtl::OUString GetText( const String &rLookUpString, xub_StrLen nDelimPos ); + static OUString GetText( const String &rLookUpString, xub_StrLen nDelimPos ); // returns the Locale to be used for the selected text when the thesaurus is to be called static void GetLocale( css::lang::Locale /*out */ &rLocale, const String &rLookUpString, xub_StrLen nDelimPos ); @@ -51,7 +51,7 @@ public: bool IsSupportedLocale( const css::lang::Locale & rLocale ) const; // get the first nMax Synonym entries, even if different meanings need to be evaluated - bool GetMeanings( std::vector< ::rtl::OUString > & rSynonyms, const ::rtl::OUString & rWord, const css::lang::Locale & rLocale, sal_Int16 nMaxSynonms ); + bool GetMeanings( std::vector< OUString > & rSynonyms, const OUString & rWord, const css::lang::Locale & rLocale, sal_Int16 nMaxSynonms ); String GetThesImplName( const css::lang::Locale &rLocale ) const; }; diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index d052c39240d1..ac5f07b20600 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -112,8 +112,8 @@ void SfxMenuImageControl_Impl::Update() //========================================================================= static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame, - const rtl::OUString& aImageId, - const rtl::OUString& aURL, + const OUString& aImageId, + const OUString& aURL, bool bBigImage ) { @@ -391,8 +391,8 @@ void SfxVirtualMenu::CreateFromSVMenu() if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() ) { - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nSlotId )); Image aImage = GetImage( xFrame, aSlotURL, false ); pSVMenu->SetItemImage( nSlotId, aImage ); } @@ -455,7 +455,7 @@ void SfxVirtualMenu::CreateFromSVMenu() Image aImage; if ( bIsAddonPopupMenu || framework::AddonMenuManager::IsAddonMenuId( nSlotId )) { - rtl::OUString aImageId; + OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pSVMenu->GetUserValue( nSlotId ); @@ -467,8 +467,8 @@ void SfxVirtualMenu::CreateFromSVMenu() } else { - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nSlotId )); aImage = GetImage( xFrame, aSlotURL, false ); } @@ -535,8 +535,8 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged) if ( framework::AddonMenuManager::IsAddonMenuId( nSlotId )) { // Special code for Add-On menu items. They can appear inside the help menu. - rtl::OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) ); - rtl::OUString aImageId; + OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) ); + OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pSVMenu->GetUserValue( nSlotId ); @@ -548,8 +548,8 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged) } else { - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nSlotId )); pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false )); } } @@ -604,7 +604,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu ) PopupMenu* pPopup = pMenu->GetPopupMenu( nSlotId ); if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR ) { - rtl::OUString aImageId; + OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nSlotId ); @@ -671,7 +671,7 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu ) // Check if the popup is an Add-On popup menu // Either the popup menu has a special ID or a special command URL prefix! - rtl::OUString aCommand = pSVMenu->GetItemCommand( nSID ); + OUString aCommand = pSVMenu->GetItemCommand( nSID ); if ( ( nSID == SID_ADDONS ) || ( nSID == SID_ADDONHELP ) || (( (sal_uInt32)aCommand.getLength() > nAddonsPopupPrefixLen ) && @@ -782,7 +782,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) if ( pAddonMenu && pAddonMenu->GetItemCount() > 0 ) { sal_uInt16 nItemCount = pMenu->GetItemCount(); - rtl::OUString aAddonsTitle(SfxResId(STR_MENU_ADDONS).toString()); + OUString aAddonsTitle(SfxResId(STR_MENU_ADDONS).toString()); if ( nItemCount > 0 && pMenu->GetItemType( nItemCount-1 ) != MENUITEM_SEPARATOR ) pMenu->InsertSeparator(); pMenu->InsertItem( SID_ADDONS, aAddonsTitle ); @@ -790,8 +790,8 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() ) { - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( SID_ADDONS )); pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, false )); } } @@ -840,7 +840,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) if ( pParent && pSVMenu == pParent->pWindowMenu ) { // update window list - ::std::vector< ::rtl::OUString > aNewWindowListVector; + ::std::vector< OUString > aNewWindowListVector; Reference< XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );; sal_uInt16 nActiveItemId = 0; diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index a71788e08706..d760a30385e4 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -58,7 +58,7 @@ using namespace css; //-------------------------------------------------------------------------------------------------------- // --- XNameReplace --- //-------------------------------------------------------------------------------------------------------- -void SAL_CALL SfxEvents_Impl::replaceByName( const rtl::OUString & aName, const uno::Any & rElement ) +void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno::Any & rElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -83,7 +83,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const rtl::OUString & aName, const ::comphelper::NamedValueCollection aNormalizedDescriptor; NormalizeMacro( aEventDescriptor, aNormalizedDescriptor, mpObjShell ); - ::rtl::OUString sType; + OUString sType; if ( ( aNormalizedDescriptor.size() == 1 ) && ( aNormalizedDescriptor.has( PROP_EVENT_TYPE) == 0 ) && ( aNormalizedDescriptor.get( PROP_EVENT_TYPE ) >>= sType ) @@ -116,7 +116,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const rtl::OUString & aName, const //-------------------------------------------------------------------------------------------------------- // --- XNameAccess --- //-------------------------------------------------------------------------------------------------------- -uno::Any SAL_CALL SfxEvents_Impl::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL SfxEvents_Impl::getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -136,13 +136,13 @@ uno::Any SAL_CALL SfxEvents_Impl::getByName( const rtl::OUString& aName ) } //-------------------------------------------------------------------------------------------------------- -uno::Sequence< rtl::OUString > SAL_CALL SfxEvents_Impl::getElementNames() throw ( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SfxEvents_Impl::getElementNames() throw ( uno::RuntimeException ) { return maEventNames; } //-------------------------------------------------------------------------------------------------------- -sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const rtl::OUString& aName ) throw ( uno::RuntimeException ) +sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -184,10 +184,10 @@ static void Execute( uno::Any& aEventData, const document::DocumentEvent& aTrigg uno::Sequence < beans::PropertyValue > aProperties; if ( aEventData >>= aProperties ) { - rtl::OUString aType; - rtl::OUString aScript; - rtl::OUString aLibrary; - rtl::OUString aMacroName; + OUString aType; + OUString aScript; + OUString aLibrary; + OUString aMacroName; sal_Int32 nCount = aProperties.getLength(); @@ -249,7 +249,7 @@ static void Execute( uno::Any& aEventData, const document::DocumentEvent& aTrigg uno::Reference < frame::XDispatch > xDisp; if ( xProv.is() ) - xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) { @@ -281,7 +281,7 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent ) // get the event name, find the coresponding data, execute the data - rtl::OUString aName = aEvent.EventName; + OUString aName = aEvent.EventName; long nCount = maEventNames.getLength(); long nIndex = 0; sal_Bool bFound = sal_False; @@ -354,10 +354,10 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShe if ( aAny >>= aProperties ) { - rtl::OUString aType; - rtl::OUString aScriptURL; - rtl::OUString aLibrary; - rtl::OUString aMacroName; + OUString aType; + OUString aScriptURL; + OUString aLibrary; + OUString aMacroName; long nCount = aProperties.getLength(); long nIndex = 0; @@ -398,7 +398,7 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShe if ( aLibrary == "application" ) aLibrary = SFX_APP()->GetName(); else - aLibrary = ::rtl::OUString(); + aLibrary = OUString(); pMacro = new SvxMacro( aMacroName, aLibrary, eType ); } else if ( eType == EXTENDED_STYPE ) @@ -425,10 +425,10 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i if ( !pDoc ) pDoc = SfxObjectShell::Current(); - ::rtl::OUString aType = i_eventDescriptor.getOrDefault( PROP_EVENT_TYPE, ::rtl::OUString() ); - ::rtl::OUString aScript = i_eventDescriptor.getOrDefault( PROP_SCRIPT, ::rtl::OUString() ); - ::rtl::OUString aLibrary = i_eventDescriptor.getOrDefault( PROP_LIBRARY, ::rtl::OUString() ); - ::rtl::OUString aMacroName = i_eventDescriptor.getOrDefault( PROP_MACRO_NAME, ::rtl::OUString() ); + OUString aType = i_eventDescriptor.getOrDefault( PROP_EVENT_TYPE, OUString() ); + OUString aScript = i_eventDescriptor.getOrDefault( PROP_SCRIPT, OUString() ); + OUString aLibrary = i_eventDescriptor.getOrDefault( PROP_LIBRARY, OUString() ); + OUString aMacroName = i_eventDescriptor.getOrDefault( PROP_MACRO_NAME, OUString() ); if ( !aType.isEmpty() ) o_normalizedDescriptor.put( PROP_EVENT_TYPE, aType ); @@ -445,7 +445,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i sal_Int32 nArgsPos = aScript.indexOf( '(' ); if ( ( nHashPos != STRING_NOTFOUND ) && ( nHashPos < nArgsPos ) ) { - rtl::OUString aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) ); + OUString aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) ); if ( aBasMgrName == "." ) aLibrary = pDoc->GetTitle(); else @@ -462,13 +462,13 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i } else if ( !aMacroName.isEmpty() ) { - aScript = rtl::OUString( MACRO_PRFIX ); + aScript = OUString( MACRO_PRFIX ); if ( aLibrary.compareTo( SFX_APP()->GetName() ) != 0 && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StarDesktop")) && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) ) - aScript += rtl::OUString('.'); + aScript += OUString('.'); - aScript += rtl::OUString('/'); + aScript += OUString('/'); aScript += aMacroName; - aScript += rtl::OUString( MACRO_POSTFIX ); + aScript += OUString( MACRO_POSTFIX ); } else // wrong properties @@ -477,9 +477,9 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i if (!aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("document"))) { if ( aLibrary.isEmpty() || (pDoc && ( String(aLibrary) == pDoc->GetTitle( SFX_TITLE_APINAME ) || String(aLibrary) == pDoc->GetTitle() )) ) - aLibrary = rtl::OUString("document"); + aLibrary = OUString("document"); else - aLibrary = rtl::OUString("application"); + aLibrary = OUString("application"); } o_normalizedDescriptor.put( PROP_SCRIPT, aScript ); @@ -526,7 +526,7 @@ uno::Any SAL_CALL ModelCollectionEnumeration::nextElement() ::osl::ResettableMutexGuard aLock(m_aLock); if (m_pEnumerationIt == m_lModels.end()) throw container::NoSuchElementException( - ::rtl::OUString("End of model enumeration reached."), + OUString("End of model enumeration reached."), static_cast< container::XEnumeration* >(this)); uno::Reference< frame::XModel > xModel(*m_pEnumerationIt, uno::UNO_QUERY); ++m_pEnumerationIt; @@ -600,12 +600,12 @@ void SAL_CALL SfxGlobalEvents_Impl::removeDocumentEventListener( const uno::Refe } //----------------------------------------------------------------------------- -void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const ::rtl::OUString& /*_EventName*/, +void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const OUString& /*_EventName*/, const uno::Reference< frame::XController2 >& /*_ViewController*/, const uno::Any& /*_Supplement*/ ) throw (lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException) { // we're a multiplexer only, no chance to generate artifical events here - throw lang::NoSupportException(::rtl::OUString(), *this); + throw lang::NoSupportException(OUString(), *this); } //----------------------------------------------------------------------------- @@ -672,7 +672,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement ) aElement >>= xDoc; if (!xDoc.is()) throw lang::IllegalArgumentException( - ::rtl::OUString("Cant locate at least the model parameter."), + OUString("Cant locate at least the model parameter."), static_cast< container::XSet* >(this), 0); @@ -681,7 +681,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement ) TModelList::iterator pIt = impl_searchDoc(xDoc); if (pIt != m_lModels.end()) throw container::ElementExistException( - ::rtl::OUString(), + OUString(), static_cast< container::XSet* >(this)); m_lModels.push_back(xDoc); aLock.clear(); @@ -709,7 +709,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement ) aElement >>= xDoc; if (!xDoc.is()) throw lang::IllegalArgumentException( - ::rtl::OUString("Cant locate at least the model parameter."), + OUString("Cant locate at least the model parameter."), static_cast< container::XSet* >(this), 0); @@ -718,7 +718,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement ) TModelList::iterator pIt = impl_searchDoc(xDoc); if (pIt == m_lModels.end()) throw container::NoSuchElementException( - ::rtl::OUString(), + OUString(), static_cast< container::XSet* >(this)); m_lModels.erase(pIt); aLock.clear(); diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 027ec944a5ca..63c1cdcc219b 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -72,7 +72,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( const uno::Reference< frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, - const ::rtl::OUString& aCommandURL ) + const OUString& aCommandURL ) { SolarMutexGuard aGuard; @@ -118,7 +118,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( sal_uInt16 nSlotId = pSlot->GetSlotId(); if ( nSlotId > 0 ) { - rtl::OString aCmd(".uno:"); + OString aCmd(".uno:"); aCmd += pSlot->GetUnoName(); pStatusBar->SetHelpId( nSlotId, aCmd ); return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule ); @@ -222,7 +222,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) uno::Reference < frame::XDispatchProvider > xProvider( xController, uno::UNO_QUERY ); if ( xProvider.is() ) { - uno::Reference < frame::XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, ::rtl::OUString(), 0 ); + uno::Reference < frame::XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, OUString(), 0 ); if ( xDisp.is() ) { uno::Reference< lang::XUnoTunnel > xTunnel( xDisp, uno::UNO_QUERY ); @@ -280,9 +280,9 @@ throw ( ::com::sun::star::uno::RuntimeException ) rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( nSlotID, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( nSlotID, sTemp ); } diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 007c17e479f9..8ed58cab5eba 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -129,7 +129,7 @@ static Window* GetTopMostParentSystemWindow( Window* pWindow ) return NULL; } -svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ) +svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ) { SolarMutexGuard aGuard; @@ -422,7 +422,7 @@ SfxItemState SfxToolBoxControl::GetItemState( void SfxToolBoxControl::Dispatch( const Reference< XDispatchProvider >& rProvider, - const rtl::OUString& rCommand, + const OUString& rCommand, Sequence< ::PropertyValue >& aArgs ) { if ( rProvider.is() ) @@ -432,13 +432,13 @@ void SfxToolBoxControl::Dispatch( Reference < XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aTargetURL ); - Reference < XDispatch > xDispatch = rProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + Reference < XDispatch > xDispatch = rProvider->queryDispatch( aTargetURL, OUString(), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( aTargetURL, aArgs ); } } -void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) +void SfxToolBoxControl::Dispatch( const OUString& aCommand, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) { Reference < XController > xController; @@ -453,7 +453,7 @@ void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::s aTargetURL.Complete = aCommand; getURLTransformer()->parseStrict( aTargetURL ); - Reference < XDispatch > xDispatch = xProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + Reference < XDispatch > xDispatch = xProvider->queryDispatch( aTargetURL, OUString(), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( aTargetURL, aArgs ); } @@ -499,7 +499,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) Reference < XDispatchProvider > xProvider( xController, UNO_QUERY ); if ( xProvider.is() ) { - Reference < XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, ::rtl::OUString(), 0 ); + Reference < XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, OUString(), 0 ); if ( xDisp.is() ) { Reference< XUnoTunnel > xTunnel( xDisp, UNO_QUERY ); @@ -559,9 +559,9 @@ throw ( ::com::sun::star::uno::RuntimeException ) rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( nSlotId, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( nSlotId, sTemp ); } @@ -604,12 +604,12 @@ throw ( ::com::sun::star::uno::RuntimeException ) return sal_False; } -::rtl::OUString SAL_CALL SfxToolBoxControl::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL SfxToolBoxControl::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) { - return rtl::OUString(); + return OUString(); } -void SAL_CALL SfxToolBoxControl::functionSelected( const ::rtl::OUString& /*aCommand*/ ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxToolBoxControl::functionSelected( const OUString& /*aCommand*/ ) throw (::com::sun::star::uno::RuntimeException) { // must be implemented by sub-class } @@ -690,7 +690,7 @@ throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aSubToolBarResName; + OUString aSubToolBarResName; if ( pImpl->mxUIElement.is() ) { Reference< XPropertySet > xPropSet( pImpl->mxUIElement, UNO_QUERY ); @@ -698,7 +698,7 @@ throw (::com::sun::star::uno::RuntimeException) { try { - xPropSet->getPropertyValue( ::rtl::OUString( "ResourceURL" )) >>= aSubToolBarResName; + xPropSet->getPropertyValue( OUString( "ResourceURL" )) >>= aSubToolBarResName; } catch ( com::sun::star::beans::UnknownPropertyException& ) { @@ -732,7 +732,7 @@ throw (::com::sun::star::uno::RuntimeException) Reference< ::com::sun::star::beans::XPropertySet > xProp( xUIElement, UNO_QUERY ); if ( xSubToolBar.is() && xProp.is() ) { - rtl::OUString aPersistentString( "Persistent" ); + OUString aPersistentString( "Persistent" ); try { Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); @@ -748,7 +748,7 @@ throw (::com::sun::star::uno::RuntimeException) xLayoutManager->setElementPos( aSubToolBarResName, aEvent.FloatingPosition ); xLayoutManager->showElement( aSubToolBarResName ); - xProp->setPropertyValue( rtl::OUString( "Persistent" ), a ); + xProp->setPropertyValue( OUString( "Persistent" ), a ); } } catch ( ::com::sun::star::uno::RuntimeException& ) @@ -763,13 +763,13 @@ throw (::com::sun::star::uno::RuntimeException) } } -::Size SfxToolBoxControl::getPersistentFloatingSize( const Reference< XFrame >& /*xFrame*/, const ::rtl::OUString& /*rSubToolBarResName*/ ) +::Size SfxToolBoxControl::getPersistentFloatingSize( const Reference< XFrame >& /*xFrame*/, const OUString& /*rSubToolBarResName*/ ) { ::Size aToolboxSize; return aToolboxSize; } -void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSubToolBarResName ) +void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBarResName ) { SolarMutexGuard aGuard; @@ -796,11 +796,11 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub } Sequence< PropertyValue > aPropSeq( 3 ); - aPropSeq[0].Name = rtl::OUString( "Frame" ); + aPropSeq[0].Name = OUString( "Frame" ); aPropSeq[0].Value <<= xFrame; - aPropSeq[1].Name = rtl::OUString( "Persistent" ); + aPropSeq[1].Name = OUString( "Persistent" ); aPropSeq[1].Value <<= sal_False; - aPropSeq[2].Name = rtl::OUString( "PopupMode" ); + aPropSeq[2].Name = OUString( "PopupMode" ); aPropSeq[2].Value <<= sal_True; try @@ -1045,7 +1045,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) Reference < XDispatchProvider > xProvider( xController, UNO_QUERY ); if ( xProvider.is() ) { - Reference < XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, ::rtl::OUString(), 0 ); + Reference < XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, OUString(), 0 ); if ( xDisp.is() ) { Reference< XUnoTunnel > xTunnel( xDisp, UNO_QUERY ); @@ -1106,9 +1106,9 @@ throw ( ::com::sun::star::uno::RuntimeException ) rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( nSlotId, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( nSlotId, sTemp ); } @@ -1253,7 +1253,7 @@ void SfxPopupWindow::UnbindListener() //-------------------------------------------------------------------- -void SfxPopupWindow::AddStatusListener( const rtl::OUString& rCommandURL ) +void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) { GetOrCreateStatusListener(); if ( m_xStatusListener.is() ) @@ -1582,7 +1582,7 @@ void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 ) aTargetURL.Complete = aLastURL; getURLTransformer()->parseStrict( aTargetURL ); - ::rtl::OUString aTarget( ::rtl::OUString("_default")); + OUString aTarget( OUString("_default")); if ( pMenu ) { ::framework::MenuConfiguration::Attributes* pMenuAttributes = @@ -1598,8 +1598,8 @@ void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 ) { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString("Referer"); - aArgs[0].Value = makeAny( ::rtl::OUString(SFX_REFERER_USER ) ); + aArgs[0].Name = OUString("Referer"); + aArgs[0].Value = makeAny( OUString(SFX_REFERER_USER ) ); ExecuteInfo* pExecuteInfo = new ExecuteInfo; pExecuteInfo->xDispatch = xDispatch; @@ -1632,10 +1632,10 @@ long Select_Impl( void* /*pHdl*/, void* pVoid ) Reference < XDispatch > xDisp; if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL ) - xDisp = xDesktop->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDisp = xDesktop->queryDispatch( aTargetURL, OUString(), 0 ); else { - ::rtl::OUString aTargetFrame( ::rtl::OUString("_blank") ); + OUString aTargetFrame( OUString("_blank") ); ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() ); @@ -1680,7 +1680,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu ) if ( bShowMenuImages ) { sal_Bool bImageSet = sal_False; - ::rtl::OUString aImageId; + OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nId ); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 75964a5deeb3..8d3507f468ef 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -117,7 +117,7 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) // TODO/LATER: do we still need this code? Window* pWindow = rNEvt.GetWindow(); - rtl::OString sHelpId; + OString sHelpId; while ( sHelpId.isEmpty() && pWindow ) { sHelpId = pWindow->GetHelpId(); @@ -268,11 +268,11 @@ SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nV aLoadArgs = aArgs.getPropertyValues(); // load the doc into that frame - ::rtl::OUString sLoaderURL( "private:object" ); + OUString sLoaderURL( "private:object" ); Reference< XComponentLoader > xLoader( xFrame, UNO_QUERY_THROW ); xLoader->loadComponentFromURL( sLoaderURL, - ::rtl::OUString( "_self" ), + OUString( "_self" ), 0, aLoadArgs ); @@ -339,7 +339,7 @@ void SfxFrame::SetPresentationMode( sal_Bool bSet ) if ( xPropSet.is() ) { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } @@ -391,13 +391,13 @@ void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn ) if ( xPropSet.is() ) { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } if ( xLayoutManager.is() ) { - rtl::OUString aMenuBarURL( "private:resource/menubar/menubar" ); + OUString aMenuBarURL( "private:resource/menubar/menubar" ); if ( bOn ) xLayoutManager->showElement( aMenuBarURL ); diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 1ebdc4dc5116..03f242bd8b3c 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -105,10 +105,10 @@ SfxFrameLoader_Impl::~SfxFrameLoader_Impl() } // -------------------------------------------------------------------------------------------------------------------- -const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const ::rtl::OUString& sURL, +const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const OUString& sURL, const ::comphelper::NamedValueCollection& i_rDescriptor, const SfxFilterMatcher& rMatcher ) const { - ::rtl::OUString sFilter; + OUString sFilter; try { if ( sURL.isEmpty() ) @@ -127,7 +127,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const ::rtl::OUSt aNewArgs.put( "StatusIndicator", i_rDescriptor.get( "StatusIndicator" ) ); Sequence< PropertyValue > aQueryArgs( aNewArgs.getPropertyValues() ); - ::rtl::OUString sType = xDetect->queryTypeByDescriptor( aQueryArgs, sal_True ); + OUString sType = xDetect->queryTypeByDescriptor( aQueryArgs, sal_True ); if ( !sType.isEmpty() ) { const SfxFilter* pFilter = rMatcher.GetFilter4EA( sType ); @@ -142,7 +142,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const ::rtl::OUSt catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); - sFilter = ::rtl::OUString(); + sFilter = OUString(); } const SfxFilter* pFilter = 0; @@ -152,7 +152,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const ::rtl::OUSt } // -------------------------------------------------------------------------------------------------------------------- -const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( const ::rtl::OUString& i_rServiceName ) const +const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( const OUString& i_rServiceName ) const { try { @@ -172,7 +172,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con while ( xEnum->hasMoreElements() ) { ::comphelper::NamedValueCollection aType( xEnum->nextElement() ); - ::rtl::OUString sFilterName = aType.getOrDefault( "Name", ::rtl::OUString() ); + OUString sFilterName = aType.getOrDefault( "Name", OUString() ); if ( sFilterName.isEmpty() ) continue; @@ -197,12 +197,12 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con } // -------------------------------------------------------------------------------------------------------------------- -::rtl::OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInteractionHandler >& i_rxHandler, - const ::rtl::OUString& i_rDocumentURL ) const +OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInteractionHandler >& i_rxHandler, + const OUString& i_rDocumentURL ) const { ENSURE_OR_THROW( i_rxHandler.is(), "invalid interaction handler" ); - ::rtl::OUString sFilterName; + OUString sFilterName; try { ::framework::RequestFilterSelect aRequest( i_rDocumentURL ); @@ -254,10 +254,10 @@ sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _ // -------------------------------------------------------------------------------------------------------------------- void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollection& io_rDescriptor ) const { - const ::rtl::OUString sURL = io_rDescriptor.getOrDefault( "URL", ::rtl::OUString() ); - const ::rtl::OUString sTypeName = io_rDescriptor.getOrDefault( "TypeName", ::rtl::OUString() ); - const ::rtl::OUString sFilterName = io_rDescriptor.getOrDefault( "FilterName", ::rtl::OUString() ); - const ::rtl::OUString sServiceName = io_rDescriptor.getOrDefault( "DocumentService", ::rtl::OUString() ); + const OUString sURL = io_rDescriptor.getOrDefault( "URL", OUString() ); + const OUString sTypeName = io_rDescriptor.getOrDefault( "TypeName", OUString() ); + const OUString sFilterName = io_rDescriptor.getOrDefault( "FilterName", OUString() ); + const OUString sServiceName = io_rDescriptor.getOrDefault( "DocumentService", OUString() ); const Reference< XInteractionHandler > xInteraction = io_rDescriptor.getOrDefault( "InteractionHandler", Reference< XInteractionHandler >() ); @@ -279,14 +279,14 @@ void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollecti // or use interaction to ask user for right filter. if ( !pFilter && xInteraction.is() && !sURL.isEmpty() ) { - ::rtl::OUString sSelectedFilter = impl_askForFilter_nothrow( xInteraction, sURL ); + OUString sSelectedFilter = impl_askForFilter_nothrow( xInteraction, sURL ); if ( !sSelectedFilter.isEmpty() ) pFilter = rMatcher.GetFilter4FilterName( sSelectedFilter ); } if ( pFilter ) { - io_rDescriptor.put( "FilterName", ::rtl::OUString( pFilter->GetFilterName() ) ); + io_rDescriptor.put( "FilterName", OUString( pFilter->GetFilterName() ) ); // If detected filter indicates using of an own template format // add property "AsTemplate" to descriptor. But suppress this step @@ -296,7 +296,7 @@ void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollecti // The DocumentService property will finally be used to determine the document type to create, so // override it with the service name as indicated by the found filter. - io_rDescriptor.put( "DocumentService", ::rtl::OUString( pFilter->GetServiceName() ) ); + io_rDescriptor.put( "DocumentService", OUString( pFilter->GetServiceName() ) ); } } @@ -318,10 +318,10 @@ SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XM // -------------------------------------------------------------------------------------------------------------------- bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedValueCollection& io_rDescriptor ) const { - const ::rtl::OUString sTemplateRegioName = io_rDescriptor.getOrDefault( "TemplateRegionName", ::rtl::OUString() ); - const ::rtl::OUString sTemplateName = io_rDescriptor.getOrDefault( "TemplateName", ::rtl::OUString() ); - const ::rtl::OUString sServiceName = io_rDescriptor.getOrDefault( "DocumentService", ::rtl::OUString() ); - const ::rtl::OUString sURL = io_rDescriptor.getOrDefault( "URL", ::rtl::OUString() ); + const OUString sTemplateRegioName = io_rDescriptor.getOrDefault( "TemplateRegionName", OUString() ); + const OUString sTemplateName = io_rDescriptor.getOrDefault( "TemplateName", OUString() ); + const OUString sServiceName = io_rDescriptor.getOrDefault( "DocumentService", OUString() ); + const OUString sURL = io_rDescriptor.getOrDefault( "URL", OUString() ); // determine the full URL of the template to use, if any String sTemplateURL; @@ -346,14 +346,14 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedVal if ( pTemplateFilter ) { // load the template document, but, well, "as template" - io_rDescriptor.put( "FilterName", ::rtl::OUString( pTemplateFilter->GetName() ) ); - io_rDescriptor.put( "FileName", ::rtl::OUString( sTemplateURL ) ); + io_rDescriptor.put( "FilterName", OUString( pTemplateFilter->GetName() ) ); + io_rDescriptor.put( "FileName", OUString( sTemplateURL ) ); io_rDescriptor.put( "AsTemplate", sal_True ); // #i21583# // the DocumentService property will finally be used to create the document. Thus, override any possibly // present value with the document service of the template. - io_rDescriptor.put( "DocumentService", ::rtl::OUString( pTemplateFilter->GetServiceName() ) ); + io_rDescriptor.put( "DocumentService", OUString( pTemplateFilter->GetServiceName() ) ); return true; } } @@ -361,9 +361,9 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedVal } // -------------------------------------------------------------------------------------------------------------------- -sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const ::rtl::OUString& i_rFactoryURL ) const +sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const OUString& i_rFactoryURL ) const { - ::rtl::OUString sSlotParam; + OUString sSlotParam; const sal_Int32 nParamPos = i_rFactoryURL.indexOf( '?' ); if ( nParamPos >= 0 ) { @@ -461,7 +461,7 @@ sal_Int16 SfxFrameLoader_Impl::impl_determineEffectiveViewId_nothrow( const SfxO break; ::comphelper::NamedValueCollection aNamedViewData( aViewData ); - ::rtl::OUString sViewId = aNamedViewData.getOrDefault( "ViewId", ::rtl::OUString() ); + OUString sViewId = aNamedViewData.getOrDefault( "ViewId", OUString() ); if ( sViewId.isEmpty() ) break; @@ -487,7 +487,7 @@ sal_Int16 SfxFrameLoader_Impl::impl_determineEffectiveViewId_nothrow( const SfxO // -------------------------------------------------------------------------------------------------------------------- Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Reference< XModel2 >& i_rModel, const Reference< XFrame >& i_rFrame, const ::comphelper::NamedValueCollection& i_rViewFactoryArgs, - const ::rtl::OUString& i_rViewName ) + const OUString& i_rViewName ) { // let the model create a new controller const Reference< XController2 > xController( i_rModel->createViewController( @@ -521,19 +521,19 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA // ensure the descriptor contains a referrer if ( !aDescriptor.has( "Referer" ) ) - aDescriptor.put( "Referer", ::rtl::OUString() ); + aDescriptor.put( "Referer", OUString() ); // did the caller already pass a model? Reference< XModel2 > xModel = aDescriptor.getOrDefault( "Model", Reference< XModel2 >() ); const bool bExternalModel = xModel.is(); // check for factory URLs to create a new doc, instead of loading one - const ::rtl::OUString sURL = aDescriptor.getOrDefault( "URL", ::rtl::OUString() ); + const OUString sURL = aDescriptor.getOrDefault( "URL", OUString() ); const bool bIsFactoryURL = sURL.startsWith( "private:factory/" ); bool bInitNewModel = bIsFactoryURL; if ( bIsFactoryURL && !bExternalModel ) { - const ::rtl::OUString sFactory = sURL.copy( sizeof( "private:factory/" ) -1 ); + const OUString sFactory = sURL.copy( sizeof( "private:factory/" ) -1 ); // special handling for some weird factory URLs a la private:factory/swriter?slot=21053 const sal_uInt16 nSlotParam = impl_findSlotParam( sFactory ); if ( nSlotParam != 0 ) @@ -551,7 +551,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA } else { - const ::rtl::OUString sServiceName = SfxObjectShell::GetServiceNameFromFactory( sFactory ); + const OUString sServiceName = SfxObjectShell::GetServiceNameFromFactory( sFactory ); aDescriptor.put( "DocumentService", sServiceName ); } } @@ -581,7 +581,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA } // create the new doc - const ::rtl::OUString sServiceName = aDescriptor.getOrDefault( "DocumentService", ::rtl::OUString() ); + const OUString sServiceName = aDescriptor.getOrDefault( "DocumentService", OUString() ); xModel.set( m_aContext->getServiceManager()->createInstanceWithContext(sServiceName, m_aContext), UNO_QUERY_THROW ); // load resp. init it @@ -591,7 +591,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA xLoadable->initNew(); impl_removeLoaderArguments( aDescriptor ); - xModel->attachResource( ::rtl::OUString(), aDescriptor.getPropertyValues() ); + xModel->attachResource( OUString(), aDescriptor.getPropertyValues() ); } else { @@ -614,7 +614,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA // ensure the ID of the to-be-created view is in the descriptor, if possible const sal_Int16 nViewId = impl_determineEffectiveViewId_nothrow( *xDoc, aDescriptor ); const sal_Int16 nViewNo = xDoc->GetFactory().GetViewNo_Impl( nViewId, 0 ); - const ::rtl::OUString sViewName( xDoc->GetFactory().GetViewFactory( nViewNo ).GetAPIViewName() ); + const OUString sViewName( xDoc->GetFactory().GetViewFactory( nViewNo ).GetAPIViewName() ); // plug the document into the frame impl_createDocumentView( xModel, _rTargetFrame, aViewCreationArgs, sViewName ); @@ -651,16 +651,16 @@ void SfxFrameLoader_Impl::cancel() throw( RuntimeException ) SFX_IMPL_SINGLEFACTORY( SfxFrameLoader_Impl ) /* XServiceInfo */ -rtl::OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException ) { return impl_getStaticImplementationName(); } \ /* XServiceInfo */ -sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const rtl::OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const OUString& sServiceName ) throw( RuntimeException ) { - Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames(); - const rtl::OUString* pArray = seqServiceNames.getConstArray(); + Sequence< OUString > seqServiceNames = getSupportedServiceNames(); + const OUString* pArray = seqServiceNames.getConstArray(); for ( sal_Int32 nCounter=0; nCounter SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException ) { return impl_getStaticSupportedServiceNames(); } /* Helper for XServiceInfo */ -Sequence< rtl::OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames() +Sequence< OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames() { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - Sequence< rtl::OUString > seqServiceNames( 1 ); - seqServiceNames.getArray() [0] = ::rtl::OUString( "com.sun.star.frame.SynchronousFrameLoader" ); + Sequence< OUString > seqServiceNames( 1 ); + seqServiceNames.getArray() [0] = OUString( "com.sun.star.frame.SynchronousFrameLoader" ); return seqServiceNames ; } /* Helper for XServiceInfo */ -rtl::OUString SfxFrameLoader_Impl::impl_getStaticImplementationName() +OUString SfxFrameLoader_Impl::impl_getStaticImplementationName() { - return ::rtl::OUString( "com.sun.star.comp.office.FrameLoader" ); + return OUString( "com.sun.star.comp.office.FrameLoader" ); } /* Helper for registry */ diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 336bcb309900..9816437de6b1 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -210,16 +210,16 @@ public: --m_refCount; } - virtual void SAL_CALL start(const ::rtl::OUString& aText, sal_Int32 nRange) throw(RuntimeException); + virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException); virtual void SAL_CALL end(void) throw(RuntimeException); - virtual void SAL_CALL setText(const ::rtl::OUString& aText) throw(RuntimeException); + virtual void SAL_CALL setText(const OUString& aText) throw(RuntimeException); virtual void SAL_CALL setValue(sal_Int32 nValue) throw(RuntimeException); virtual void SAL_CALL reset() throw(RuntimeException); virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw(RuntimeException); }; -void SAL_CALL SfxStatusIndicator::start(const ::rtl::OUString& aText, sal_Int32 nRange) throw(RuntimeException) +void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -253,7 +253,7 @@ void SAL_CALL SfxStatusIndicator::end(void) throw(RuntimeException) } } -void SAL_CALL SfxStatusIndicator::setText(const ::rtl::OUString& aText) throw(RuntimeException) +void SAL_CALL SfxStatusIndicator::setText(const OUString& aText) throw(RuntimeException) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -376,7 +376,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const la pShell->TakeFrameOwnership_Impl(); } - throw util::CloseVetoException(::rtl::OUString("Controller disagree ..."),static_cast< ::cppu::OWeakObject*>(this)); + throw util::CloseVetoException(OUString("Controller disagree ..."),static_cast< ::cppu::OWeakObject*>(this)); } } } @@ -505,7 +505,7 @@ Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (Run return Reference< XWindow >( GetViewFrame_Impl().GetFrame().GetWindow().GetComponentInterface(), UNO_QUERY_THROW ); } -::rtl::OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeException) +OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeException) { SolarMutexGuard aGuard; if ( !m_pData->m_pViewShell || !m_pData->m_pViewShell->GetObjectShell() ) @@ -515,7 +515,7 @@ Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (Run sal_uInt16 nViewNo = rDocFac.GetViewNo_Impl( GetViewFrame_Impl().GetCurViewId(), rDocFac.GetViewFactoryCount() ); OSL_ENSURE( nViewNo < rDocFac.GetViewFactoryCount(), "SfxBaseController::getViewControllerName: view ID not found in view factories!" ); - ::rtl::OUString sViewName; + OUString sViewName; if ( nViewNo < rDocFac.GetViewFactoryCount() ) sViewName = rDocFac.GetViewFactory( nViewNo ).GetAPIViewName(); @@ -672,7 +672,7 @@ uno::Any SfxBaseController::getViewData() throw( RuntimeException ) if ( m_pData->m_pViewShell ) { m_pData->m_pViewShell->WriteUserData( sData1 ) ; - ::rtl::OUString sData( sData1 ); + OUString sData( sData1 ); aAny <<= sData ; } @@ -688,7 +688,7 @@ void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw SolarMutexGuard aGuard; if ( m_pData->m_pViewShell ) { - ::rtl::OUString sData; + OUString sData; aValue >>= sData ; m_pData->m_pViewShell->ReadUserData( sData ) ; } @@ -719,7 +719,7 @@ Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( Runtime //________________________________________________________________________________________________________ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const util::URL& aURL , - const ::rtl::OUString& sTargetFrameName, + const OUString& sTargetFrameName, sal_Int32 eSearchFlags ) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -748,7 +748,7 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const if ( aURL.Protocol == ".uno:" ) { - rtl::OUString aMasterCommand = SfxOfficeDispatch::GetMasterUnoCommand( aURL ); + OUString aMasterCommand = SfxOfficeDispatch::GetMasterUnoCommand( aURL ); sal_Bool bMasterCommand( !aMasterCommand.isEmpty() ); pAct = m_pData->m_pViewShell->GetViewFrame() ; @@ -1180,7 +1180,7 @@ throw (RuntimeException) SfxViewFrame* pViewFrame( m_pData->m_pViewShell->GetFrame() ); SfxSlotPool* pPool( &SfxSlotPool::GetSlotPool( pViewFrame )); - rtl::OUString aCmdPrefix( ".uno:" ); + OUString aCmdPrefix( ".uno:" ); SfxSlotPool* pSlotPool = pPool ? pPool : &SFX_SLOTPOOL(); for ( sal_uInt16 i=0; iGetGroupCount(); i++ ) @@ -1197,7 +1197,7 @@ throw (RuntimeException) if ( pSfxSlot->GetMode() & nMode ) { frame::DispatchInformation aCmdInfo; - ::rtl::OUStringBuffer aBuf( aCmdPrefix ); + OUStringBuffer aBuf( aCmdPrefix ); aBuf.appendAscii( pSfxSlot->GetUnoName() ); aCmdInfo.Command = aBuf.makeStringAndClear(); aCmdInfo.GroupId = nCommandGroup; @@ -1260,8 +1260,8 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) { Reference< beans::XPropertySet > xFrameProps( m_pData->m_xFrame, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySet > xLayouterProps( - xFrameProps->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ), uno::UNO_QUERY_THROW ); - xLayouterProps->setPropertyValue( ::rtl::OUString( "PreserveContentSize" ), uno::makeAny( sal_True ) ); + xFrameProps->getPropertyValue( OUString( "LayoutManager" ) ), uno::UNO_QUERY_THROW ); + xLayouterProps->setPropertyValue( OUString( "PreserveContentSize" ), uno::makeAny( sal_True ) ); } catch (const uno::Exception&) { @@ -1345,7 +1345,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) // if there's a JumpMark given, then, well, jump to it ::comphelper::NamedValueCollection aViewArgs( getCreationArguments() ); - const ::rtl::OUString sJumpMark = aViewArgs.getOrDefault( "JumpMark", ::rtl::OUString() ); + const OUString sJumpMark = aViewArgs.getOrDefault( "JumpMark", OUString() ); const bool bHasJumpMark = !sJumpMark.isEmpty(); OSL_ENSURE( ( !m_pData->m_pViewShell->GetObjectShell()->IsLoading() ) || ( sJumpMark.isEmpty() ), @@ -1385,7 +1385,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) for ( sal_Int32 i=0; igetByIndex(i) ); - ::rtl::OUString sViewId( aViewData.getOrDefault( "ViewId", ::rtl::OUString() ) ); + OUString sViewId( aViewData.getOrDefault( "ViewId", OUString() ) ); if ( sViewId.isEmpty() ) continue; @@ -1492,7 +1492,7 @@ Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper () //============================================================================= // frame::XTitle -::rtl::OUString SAL_CALL SfxBaseController::getTitle() +OUString SAL_CALL SfxBaseController::getTitle() throw (RuntimeException) { return impl_getTitleHelper()->getTitle (); @@ -1500,7 +1500,7 @@ Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper () //============================================================================= // frame::XTitle -void SAL_CALL SfxBaseController::setTitle(const ::rtl::OUString& sTitle) +void SAL_CALL SfxBaseController::setTitle(const OUString& sTitle) throw (RuntimeException) { impl_getTitleHelper()->setTitle (sTitle); diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index d1b9528fbdbd..52e418046f9f 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -33,7 +33,7 @@ SfxViewShell *SfxViewFactory::CreateInstance(SfxViewFrame *pFrame, SfxViewShell String SfxViewFactory::GetLegacyViewName() const { - ::rtl::OUStringBuffer aViewName; + OUStringBuffer aViewName; aViewName.appendAscii(RTL_CONSTASCII_STRINGPARAM("view")); aViewName.append( sal_Int32( GetOrdinal() ) ); return aViewName.makeStringAndClear(); @@ -45,7 +45,7 @@ String SfxViewFactory::GetAPIViewName() const return m_sViewName; if ( GetOrdinal() == 0 ) - return rtl::OUString( "Default" ); + return OUString( "Default" ); return GetLegacyViewName(); } @@ -56,7 +56,7 @@ SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, sal_uInt16 nOrdinal, const sal_Char* asciiViewName ): fnCreate(fnC), nOrd(nOrdinal), - m_sViewName( rtl::OUString::createFromAscii( asciiViewName ) ) + m_sViewName( OUString::createFromAscii( asciiViewName ) ) { DBG_CTOR(SfxViewFactory, 0); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 526c45aac83f..3de0b3655b6c 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -179,7 +179,7 @@ namespace } //------------------------------------------------------------------------- -static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const ::rtl::OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo ) +static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo ) { // TODO/LATER: In future the info should replace the direct hash completely sal_Bool bResult = ( !nPasswordHash && !aInfo.getLength() ); @@ -214,7 +214,7 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti else { // the binary format - bResult = ( SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( "com.sun.star.text.TextDocument" ).equals( pFilter->GetServiceName() ) ) == nPasswordHash ); + bResult = ( SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), OUString( "com.sun.star.text.TextDocument" ).equals( pFilter->GetServiceName() ) ) == nPasswordHash ); } } else @@ -363,7 +363,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxAllItemSet aSet( pApp->GetPool() ); aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetURLObject().GetMainURL(INetURLObject::NO_DECODE) ) ); aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); - aSet.Put( SfxStringItem( SID_TARGETNAME, rtl::OUString("_blank") ) ); + aSet.Put( SfxStringItem( SID_TARGETNAME, OUString("_blank") ) ); SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False ); if ( pReferer ) aSet.Put( *pReferer ); @@ -411,7 +411,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) && ( pSh->GetModifyPasswordHash() || pSh->GetModifyPasswordInfo().getLength() ) && !pSh->IsModifyPasswordEntered() ) { - ::rtl::OUString aDocumentName = INetURLObject( pMed->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ); + OUString aDocumentName = INetURLObject( pMed->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ); if( !AskPasswordToModify_Impl( pMed->GetInteractionHandler(), aDocumentName, pMed->GetOrigFilter(), pSh->GetModifyPasswordHash(), pSh->GetModifyPasswordInfo() ) ) { // this is a read-only document, if it has "Password to modify" @@ -449,7 +449,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // doing - rtl::OUString aTemp; + OUString aTemp; utl::LocalFileHelper::ConvertPhysicalNameToURL( pMed->GetPhysicalName(), aTemp ); INetURLObject aPhysObj( aTemp ); SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), @@ -768,7 +768,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { SfxAllItemSet aSet( pApp->GetPool() ); aSet.Put( SfxStringItem( SID_FILE_NAME, pMedium->GetName() ) ); - aSet.Put( SfxStringItem( SID_TARGETNAME, rtl::OUString("_blank") ) ); + aSet.Put( SfxStringItem( SID_TARGETNAME, OUString("_blank") ) ); if ( pSavedOptions ) aSet.Put( *pSavedOptions ); if ( pSavedReferer ) @@ -1953,12 +1953,12 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc else aTransformLoadArgs.remove( "Hidden" ); - ::rtl::OUString sURL( "private:object" ); + OUString sURL( "private:object" ); if ( sURL.isEmpty() ) sURL = i_rDoc.GetFactory().GetFactoryURL(); Reference< XComponentLoader > xLoader( i_rFrame, UNO_QUERY_THROW ); - xLoader->loadComponentFromURL( sURL, ::rtl::OUString("_self"), 0, + xLoader->loadComponentFromURL( sURL, OUString("_self"), 0, aTransformLoadArgs.getPropertyValues() ); SfxViewShell* pViewShell = SfxViewShell::Get( i_rFrame->getController() ); @@ -2085,7 +2085,7 @@ void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ) for ( sal_Int32 i=0; igetByIndex(i) ); - ::rtl::OUString sViewId( aCurViewData.getOrDefault( "ViewId", ::rtl::OUString() ) ); + OUString sViewId( aCurViewData.getOrDefault( "ViewId", OUString() ) ); if ( sViewId.isEmpty() ) continue; @@ -2332,9 +2332,9 @@ sal_Bool impl_maxOpenDocCountReached() css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey( xContext, - ::rtl::OUString("org.openoffice.Office.Common/"), - ::rtl::OUString("Misc"), - ::rtl::OUString("MaxOpenDocuments"), + OUString("org.openoffice.Office.Common/"), + OUString("Misc"), + OUString("MaxOpenDocuments"), ::comphelper::ConfigurationHelper::E_READONLY); // NIL means: count of allowed documents = infinite ! @@ -2551,7 +2551,7 @@ void SfxViewFrame::Resize( sal_Bool bForce ) #define LINE_SEP 0x0A -void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool bEraseTrailingEmptyLines ) +void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool bEraseTrailingEmptyLines ) { sal_Int32 nStartPos = 0; sal_Int32 nLine = 0; @@ -2577,7 +2577,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sa else nEndPos++; - ::rtl::OUString aEndStr = rStr.copy( nEndPos ); + OUString aEndStr = rStr.copy( nEndPos ); rStr = rStr.copy( 0, nStartPos ); rStr += aEndStr; } @@ -2590,7 +2590,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sa if ( n > nStartPos ) { - ::rtl::OUString aEndStr = rStr.copy( n ); + OUString aEndStr = rStr.copy( n ); rStr = rStr.copy( 0, nStartPos ); rStr += aEndStr; } @@ -2602,7 +2602,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sa lib container. It generates a new unique id for it and insert the macro by using this number as name for the modul */ -void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) +void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) { #ifdef DISABLE_SCRIPTING (void) sMacro; @@ -2631,7 +2631,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) if ( xUrl.is() ) { // get name - ::rtl::OUString aName = xUrl->getName(); + OUString aName = xUrl->getName(); sal_Unicode cTok = '.'; sal_Int32 nIndex = 0; aLibName = aName.getToken( 0, cTok, nIndex ); @@ -2641,7 +2641,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) aMacroName = aName.getToken( 0, cTok, nIndex ); // get location - ::rtl::OUString aLocKey("location"); + OUString aLocKey("location"); if ( xUrl->hasParameter( aLocKey ) ) aLocation = xUrl->getParameter( aLocKey ); } @@ -2657,7 +2657,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) pBasMgr = GetObjectShell()->GetBasicManager(); } - ::rtl::OUString aOUSource; + OUString aOUSource; if ( pBasMgr) { StarBASIC* pBasic = pBasMgr->GetLib( aLibName ); @@ -2700,7 +2700,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) xLibCont, com::sun::star::uno::UNO_QUERY); - ::rtl::OUString sLib( aLibName ); + OUString sLib( aLibName ); com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xLib; if(xRoot->hasByName(sLib)) { @@ -2717,13 +2717,13 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) } // pack the macro as direct usable "sub" routine - ::rtl::OUString sCode; - ::rtl::OUStringBuffer sRoutine(10000); - ::rtl::OUString sMacroName( aMacroName ); + OUString sCode; + OUStringBuffer sRoutine(10000); + OUString sMacroName( aMacroName ); sal_Bool bReplace = sal_False; // get module - ::rtl::OUString sModule( aModuleName ); + OUString sModule( aModuleName ); if(xLib->hasByName(sModule)) { if ( !aOUSource.isEmpty() ) @@ -2794,7 +2794,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) case SID_RECORDMACRO : { // try to find any active recorder on this frame - ::rtl::OUString sProperty("DispatchRecorderSupplier"); + OUString sProperty("DispatchRecorderSupplier"); com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame( GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY); @@ -2865,7 +2865,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { try { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } catch ( Exception& ) @@ -2875,7 +2875,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) if ( xLayoutManager.is() ) { - rtl::OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); + OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); // Evaluate parameter. SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), sal_False); sal_Bool bShow( sal_True ); @@ -2919,7 +2919,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { try { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } catch ( Exception& ) @@ -2936,7 +2936,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) try { xLMPropSet->setPropertyValue( - ::rtl::OUString( "HideCurrentUI" ), + OUString( "HideCurrentUI" ), makeAny( bNewFullScreenMode )); } catch ( ::com::sun::star::beans::UnknownPropertyException& ) @@ -2995,7 +2995,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) break; } - ::rtl::OUString sProperty("DispatchRecorderSupplier"); + OUString sProperty("DispatchRecorderSupplier"); com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet( GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY); @@ -3020,7 +3020,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) break; } - ::rtl::OUString sProperty("DispatchRecorderSupplier"); + OUString sProperty("DispatchRecorderSupplier"); com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet( GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY); @@ -3039,13 +3039,13 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY); com::sun::star::uno::Any aProp = xSet->getPropertyValue( - rtl::OUString( "LayoutManager" ) ); + OUString( "LayoutManager" ) ); if ( !( aProp >>= xLayoutManager )) rSet.Put( SfxBoolItem( nWhich, sal_False )); else { - rtl::OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); + OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); sal_Bool bShow = xLayoutManager->isElementVisible( aStatusbarResString ); rSet.Put( SfxBoolItem( nWhich, bShow )); } @@ -3124,7 +3124,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) else { ::com::sun::star::util::URL aTargetURL; - aTargetURL.Complete = ::rtl::OUString(".component:DB/DataSourceBrowser"); + aTargetURL.Complete = OUString(".component:DB/DataSourceBrowser"); Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::com::sun::star::util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); @@ -3133,13 +3133,13 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY ); Reference < ::com::sun::star::frame::XDispatch > xDisp; if ( xProv.is() ) - xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString("_beamer"), 31 ); + xDisp = xProv->queryDispatch( aTargetURL, OUString("_beamer"), 31 ); if ( xDisp.is() ) { Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1); ::com::sun::star::beans::PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = rtl::OUString("Referer"); - pArg[0].Value <<= ::rtl::OUString("private:user"); + pArg[0].Name = OUString("Referer"); + pArg[0].Value <<= OUString("private:user"); xDisp->dispatch( aTargetURL, aArgs ); } } @@ -3313,7 +3313,7 @@ void SfxViewFrame::SetViewFrame( SfxViewFrame* pFrame ) } // --------------------------------------------------------------------------------------------------------------------- -void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL ) +void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ) { SolarMutexGuard aGuard; @@ -3331,7 +3331,7 @@ void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< :: } // --------------------------------------------------------------------------------------------------------------------- -void SfxViewFrame::ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL ) +void SfxViewFrame::ActivateToolPanel_Impl( const OUString& i_rPanelURL ) { // ensure the task pane is visible ENSURE_OR_RETURN_VOID( KnowsChildWindow( SID_TASKPANE ), "SfxViewFrame::ActivateToolPanel: this frame/module does not allow for a task pane!" ); @@ -3346,7 +3346,7 @@ void SfxViewFrame::ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL ) pPanelAccess->ActivateToolPanel( i_rPanelURL ); } -void SfxViewFrame::AppendInfoBar( const rtl::OUString& sId, const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ) +void SfxViewFrame::AppendInfoBar( const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons ) { const sal_uInt16 nId = SfxInfoBarContainerChild::GetChildWindowId(); @@ -3362,7 +3362,7 @@ void SfxViewFrame::AppendInfoBar( const rtl::OUString& sId, const rtl::OUString& } } -void SfxViewFrame::RemoveInfoBar( const rtl::OUString& sId ) +void SfxViewFrame::RemoveInfoBar( const OUString& sId ) { const sal_uInt16 nId = SfxInfoBarContainerChild::GetChildWindowId(); diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 86ce6401bc10..f84b209a6784 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -122,7 +122,7 @@ void SfxViewFrame::UpdateTitle() DBG_CHKTHIS(SfxViewFrame, 0); const SfxObjectFactory &rFact = GetObjectShell()->GetFactory(); - pImp->aFactoryName = rtl::OUString::createFromAscii(rFact.GetShortName()); + pImp->aFactoryName = OUString::createFromAscii(rFact.GetShortName()); SfxObjectShell *pObjSh = GetObjectShell(); if ( !pObjSh ) @@ -221,11 +221,11 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) } SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, GetPool() ); - String aFact = rtl::OUString("private:factory/"); + String aFact = OUString("private:factory/"); aFact += aFactName; aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aFact ) ); aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, &GetFrame() ) ); - aReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString( "_blank" ) ) ); + aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString( "_blank" ) ) ); SFX_APP()->ExecuteSlot( aReq ); const SfxViewFrameItem* pItem = PTR_CAST( SfxViewFrameItem, aReq.GetReturnValue() ); if ( pItem ) @@ -298,7 +298,7 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet ) { if ( pImp->aFactoryName.Len() ) { - String aFact = rtl::OUString("private:factory/"); + String aFact = OUString("private:factory/"); aFact += pImp->aFactoryName; rSet.Put( SfxStringItem( nWhich, aFact ) ); } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index cc3add543a17..f518bae40dbb 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -72,7 +72,7 @@ class SfxPrinterController : public vcl::PrinterController, public SfxListener sal_Bool m_bApi; sal_Bool m_bTempPrinter; util::DateTime m_aLastPrinted; - ::rtl::OUString m_aLastPrintedBy; + OUString m_aLastPrintedBy; Sequence< beans::PropertyValue > getMergedOptions() const; const Any& getSelectionObject() const; @@ -132,10 +132,10 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr& i_ setValue( rProps[nProp].Name, rProps[nProp].Value ); Sequence< beans::PropertyValue > aRenderOptions( 3 ); - aRenderOptions[0].Name = rtl::OUString( "ExtraPrintUIOptions" ); - aRenderOptions[1].Name = rtl::OUString( "View" ); + aRenderOptions[0].Name = OUString( "ExtraPrintUIOptions" ); + aRenderOptions[1].Name = OUString( "View" ); aRenderOptions[1].Value = i_rViewProp; - aRenderOptions[2].Name = rtl::OUString( "IsPrinter" ); + aRenderOptions[2].Name = OUString( "IsPrinter" ); aRenderOptions[2].Value <<= sal_True; try { @@ -163,10 +163,10 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr& i_ } // set some job parameters - setValue( rtl::OUString( "IsApi" ), makeAny( i_bApi ) ); - setValue( rtl::OUString( "IsDirect" ), makeAny( i_bDirect ) ); - setValue( rtl::OUString( "IsPrinter" ), makeAny( sal_True ) ); - setValue( rtl::OUString( "View" ), i_rViewProp ); + setValue( OUString( "IsApi" ), makeAny( i_bApi ) ); + setValue( OUString( "IsDirect" ), makeAny( i_bDirect ) ); + setValue( OUString( "IsPrinter" ), makeAny( sal_True ) ); + setValue( OUString( "View" ), i_rViewProp ); } void SfxPrinterController::Notify( SfxBroadcaster& , const SfxHint& rHint ) @@ -189,7 +189,7 @@ SfxPrinterController::~SfxPrinterController() const Any& SfxPrinterController::getSelectionObject() const { - const beans::PropertyValue* pVal = getValue( rtl::OUString( "PrintSelectionOnly" ) ); + const beans::PropertyValue* pVal = getValue( OUString( "PrintSelectionOnly" ) ); if( pVal ) { sal_Bool bSel = sal_False; @@ -198,7 +198,7 @@ const Any& SfxPrinterController::getSelectionObject() const } sal_Int32 nChoice = 0; - pVal = getValue( rtl::OUString( "PrintContent" ) ); + pVal = getValue( OUString( "PrintContent" ) ); if( pVal ) pVal->Value >>= nChoice; return (nChoice > 1) ? maSelection : maCompleteSelection; @@ -216,7 +216,7 @@ Sequence< beans::PropertyValue > SfxPrinterController::getMergedOptions() const } Sequence< beans::PropertyValue > aRenderOptions( 1 ); - aRenderOptions[ 0 ].Name = rtl::OUString( "RenderDevice" ); + aRenderOptions[ 0 ].Name = OUString( "RenderDevice" ); aRenderOptions[ 0 ].Value <<= mxDevice; aRenderOptions = getJobProperties( aRenderOptions ); @@ -312,8 +312,8 @@ void SfxPrinterController::jobStarted() m_aLastPrinted = xDocProps->getPrintDate(); xDocProps->setPrintedBy( mpObjectShell->IsUseUserData() - ? ::rtl::OUString( SvtUserOptions().GetFullName() ) - : ::rtl::OUString() ); + ? OUString( SvtUserOptions().GetFullName() ) + : OUString() ); ::DateTime now( ::DateTime::SYSTEM ); xDocProps->setPrintDate( util::DateTime( @@ -338,7 +338,7 @@ void SfxPrinterController::jobFinished( com::sun::star::view::PrintableState nSt case view::PrintableState_JOB_FAILED : { // "real" problem (not simply printing cancelled by user) - rtl::OUString aMsg( SfxResId(STR_NOSTARTPRINTER).toString() ); + OUString aMsg( SfxResId(STR_NOSTARTPRINTER).toString() ); if ( !m_bApi ) ErrorBox( mpViewShell->GetWindow(), WB_OK | WB_DEF_OK, aMsg ).Execute(); // intentionally no break @@ -510,7 +510,7 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter ) bSizeToDoc; // Message and Flags for page format, summaries changes - rtl::OUString aMsg; + OUString aMsg; sal_uInt16 nNewOpt=0; if( bOriChg && bPgSzChg ) { @@ -599,7 +599,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro { if ( pVal[i].Name == "PrinterName" ) { - rtl::OUString aPrinterName; + OUString aPrinterName; pVal[i].Value >>= aPrinterName; aPrt.reset( new Printer( aPrinterName ) ); break; @@ -620,8 +620,8 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro pImp->m_pPrinterController = pController; SfxObjectShell *pObjShell = GetObjectShell(); - pController->setValue( rtl::OUString( "JobName" ), - makeAny( rtl::OUString( pObjShell->GetTitle(0) ) ) ); + pController->setValue( OUString( "JobName" ), + makeAny( OUString( pObjShell->GetTitle(0) ) ) ); // FIXME: job setup SfxPrinter* pDocPrt = GetPrinter(sal_False); @@ -713,22 +713,22 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) { if ( aProps[nProp].Name == "Copies" ) { - aProps[nProp]. Name = rtl::OUString("CopyCount"); + aProps[nProp]. Name = OUString("CopyCount"); } else if ( aProps[nProp].Name == "RangeText" ) { - aProps[nProp]. Name = rtl::OUString("Pages"); + aProps[nProp]. Name = OUString("Pages"); } else if ( aProps[nProp].Name == "Asynchron" ) { - aProps[nProp]. Name = rtl::OUString("Wait"); + aProps[nProp]. Name = OUString("Wait"); sal_Bool bAsynchron = sal_False; aProps[nProp].Value >>= bAsynchron; aProps[nProp].Value <<= (sal_Bool) (!bAsynchron); } else if ( aProps[nProp].Name == "Silent" ) { - aProps[nProp]. Name = rtl::OUString("MonitorVisible"); + aProps[nProp]. Name = OUString("MonitorVisible"); sal_Bool bPrintSilent = sal_False; aProps[nProp].Value >>= bPrintSilent; aProps[nProp].Value <<= (sal_Bool) (!bPrintSilent); @@ -748,13 +748,13 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) // it would be better if writer handled this internally if( nId == SID_PRINTDOCDIRECT ) { - aProps[nLen].Name = rtl::OUString( "PrintSelectionOnly" ); + aProps[nLen].Name = OUString( "PrintSelectionOnly" ); aProps[nLen].Value = makeAny( bSelection ); } else // if nId == SID_PRINTDOC ; nothing to do with the previous HACK { // should the printer selection and properties dialogue display an help button - aProps[nLen].Name = rtl::OUString( "HideHelpButton" ); + aProps[nLen].Name = OUString( "HideHelpButton" ); aProps[nLen].Value = makeAny( bPrintOnHelp ); } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index d5c778e56aa6..d0d299cfa100 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -217,14 +217,14 @@ void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::c //========================================================================= -static ::rtl::OUString RetrieveLabelFromCommand( - const ::rtl::OUString& rCommandURL, +static OUString RetrieveLabelFromCommand( + const OUString& rCommandURL, const css::uno::Reference< css::frame::XFrame >& rFrame ) { static css::uno::WeakReference< frame::XModuleManager2 > s_xModuleManager; static css::uno::WeakReference< container::XNameAccess > s_xNameAccess; - ::rtl::OUString aLabel; + OUString aLabel; css::uno::Reference< css::frame::XModuleManager2 > xModuleManager( s_xModuleManager ); css::uno::Reference< css::container::XNameAccess > xNameAccess( s_xNameAccess ); css::uno::Reference< css::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -237,7 +237,7 @@ static ::rtl::OUString RetrieveLabelFromCommand( s_xModuleManager = xModuleManager; } - ::rtl::OUString aModuleIdentifier = xModuleManager->identify( rFrame ); + OUString aModuleIdentifier = xModuleManager->identify( rFrame ); if ( !xNameAccess.is() ) { @@ -251,7 +251,7 @@ static ::rtl::OUString RetrieveLabelFromCommand( css::uno::Reference< css::container::XNameAccess > xUICommands; a >>= xUICommands; - rtl::OUString aStr; + OUString aStr; css::uno::Sequence< css::beans::PropertyValue > aPropSeq; a = xUICommands->getByName( rCommandURL ); @@ -303,32 +303,32 @@ TYPEINIT2(SfxViewShell,SfxShell,SfxListener); /** search for a filter name dependent on type and module */ -static ::rtl::OUString impl_retrieveFilterNameFromTypeAndModule( +static OUString impl_retrieveFilterNameFromTypeAndModule( const css::uno::Reference< css::container::XContainerQuery >& rContainerQuery, - const ::rtl::OUString& rType, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rType, + const OUString& rModuleIdentifier, const sal_Int32 nFlags ) { // Retrieve filter from type css::uno::Sequence< css::beans::NamedValue > aQuery( 2 ); - aQuery[0].Name = rtl::OUString( "Type" ); + aQuery[0].Name = OUString( "Type" ); aQuery[0].Value = css::uno::makeAny( rType ); - aQuery[1].Name = rtl::OUString( "DocumentService" ); + aQuery[1].Name = OUString( "DocumentService" ); aQuery[1].Value = css::uno::makeAny( rModuleIdentifier ); css::uno::Reference< css::container::XEnumeration > xEnumeration = rContainerQuery->createSubSetEnumerationByProperties( aQuery ); - ::rtl::OUString aFoundFilterName; + OUString aFoundFilterName; while ( xEnumeration->hasMoreElements() ) { ::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() ); - ::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Name"), - ::rtl::OUString() ); + OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( + OUString("Name"), + OUString() ); sal_Int32 nFilterFlags = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Flags"), + OUString("Flags"), sal_Int32( 0 ) ); if ( nFilterFlags & nFlags ) @@ -351,7 +351,7 @@ enum ETypeFamily E_OOO_DOC }; -::rtl::OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFrame >& xFrame , +OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFrame >& xFrame , ETypeFamily eTypeFamily) { try @@ -359,40 +359,40 @@ enum ETypeFamily css::uno::Reference< css::uno::XComponentContext > xContext (::comphelper::getProcessComponentContext()); css::uno::Reference< css::frame::XModuleManager2 > xModuleManager(css::frame::ModuleManager::create(xContext)); - ::rtl::OUString sModule = xModuleManager->identify(xFrame); - ::rtl::OUString sType ; + OUString sModule = xModuleManager->identify(xFrame); + OUString sType ; switch(eTypeFamily) { case E_MS_DOC: { if ( sModule == "com.sun.star.text.TextDocument" ) - sType = ::rtl::OUString( "writer_MS_Word_97" ); + sType = OUString( "writer_MS_Word_97" ); else if ( sModule == "com.sun.star.sheet.SpreadsheetDocument" ) - sType = ::rtl::OUString( "calc_MS_Excel_97" ); + sType = OUString( "calc_MS_Excel_97" ); else if ( sModule == "com.sun.star.drawing.DrawingDocument" ) - sType = ::rtl::OUString( "impress_MS_PowerPoint_97" ); + sType = OUString( "impress_MS_PowerPoint_97" ); else if ( sModule == "com.sun.star.presentation.PresentationDocument" ) - sType = ::rtl::OUString( "impress_MS_PowerPoint_97" ); + sType = OUString( "impress_MS_PowerPoint_97" ); } break; case E_OOO_DOC: { if ( sModule == "com.sun.star.text.TextDocument" ) - sType = ::rtl::OUString( "writer8" ); + sType = OUString( "writer8" ); else if ( sModule == "com.sun.star.sheet.SpreadsheetDocument" ) - sType = ::rtl::OUString( "calc8" ); + sType = OUString( "calc8" ); else if ( sModule == "com.sun.star.drawing.DrawingDocument" ) - sType = ::rtl::OUString( "draw8" ); + sType = OUString( "draw8" ); else if ( sModule == "com.sun.star.presentation.PresentationDocument" ) - sType = ::rtl::OUString( "impress8" ); + sType = OUString( "impress8" ); } break; } @@ -407,7 +407,7 @@ enum ETypeFamily { } - return ::rtl::OUString(); + return OUString(); } //-------------------------------------------------------------------- @@ -456,20 +456,20 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { try { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) { - rtl::OUString aTextResString( "private:resource/toolbar/textobjectbar" ); + OUString aTextResString( "private:resource/toolbar/textobjectbar" ); uno::Reference< ui::XUIElement > xElement = xLayoutManager->getElement( aTextResString ); if(!xElement.is()) { - rtl::OUString aFrameResString( "private:resource/toolbar/frameobjectbar" ); + OUString aFrameResString( "private:resource/toolbar/frameobjectbar" ); xElement = xLayoutManager->getElement( aFrameResString ); } if(!xElement.is()) { - rtl::OUString aOleResString( "private:resource/toolbar/oleobjectbar" ); + OUString aOleResString( "private:resource/toolbar/oleobjectbar" ); xElement = xLayoutManager->getElement( aOleResString ); } if(xElement.is()) @@ -519,7 +519,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { SfxMailModel aModel; - rtl::OUString aDocType; + OUString aDocType; SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, sal_False ); if ( pMailSubject ) @@ -529,7 +529,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) if ( pMailRecipient ) { String aRecipient( pMailRecipient->GetValue() ); - String aMailToStr(rtl::OUString("mailto:")); + String aMailToStr(OUString("mailto:")); if ( aRecipient.Search( aMailToStr ) == 0 ) aRecipient = aRecipient.Erase( 0, aMailToStr.Len() ); @@ -543,9 +543,9 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) SfxMailModel::SendMailResult eResult = SfxMailModel::SEND_MAIL_ERROR; if ( nId == SID_MAIL_SENDDOC ) - eResult = aModel.SaveAndSend( xFrame, rtl::OUString() ); + eResult = aModel.SaveAndSend( xFrame, OUString() ); else if ( nId == SID_MAIL_SENDDOCASPDF ) - eResult = aModel.SaveAndSend( xFrame, rtl::OUString( "pdf_Portable_Document_Format" )); + eResult = aModel.SaveAndSend( xFrame, OUString( "pdf_Portable_Document_Format" )); else if ( nId == SID_MAIL_SENDDOCASMS ) { aDocType = impl_searchFormatTypeForApp(xFrame, E_MS_DOC); @@ -580,7 +580,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES ) break; uno::Reference < frame::XFrame > xFrame( pFrame->GetFrame().GetFrameInterface() ); - SfxMailModel::SendMailResult eResult = aModel.SaveAndSend( xFrame, rtl::OUString() ); + SfxMailModel::SendMailResult eResult = aModel.SaveAndSend( xFrame, OUString() ); if( eResult == SfxMailModel::SEND_MAIL_ERROR ) { InfoBox aBox( SFX_APP()->GetTopWindow(), SfxResId( MSG_ERROR_SEND_MAIL )); @@ -606,7 +606,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) css::uno::Reference< css::frame::XModuleManager2 > xModuleManager( css::frame::ModuleManager::create(xContext) ); - rtl::OUString aModule; + OUString aModule; try { aModule = xModuleManager->identify( xFrame ); @@ -630,19 +630,19 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) css::uno::Reference< css::frame::XStorable > xStorable( xModel, css::uno::UNO_QUERY ); if ( xModel.is() && xStorable.is() ) { - rtl::OUString aFilterName; - rtl::OUString aTypeName( HTML_DOCUMENT_TYPE ); - rtl::OUString aFileName; - rtl::OUString aExtension( "htm" ); + OUString aFilterName; + OUString aTypeName( HTML_DOCUMENT_TYPE ); + OUString aFileName; + OUString aExtension( "htm" ); - rtl::OUString aLocation = xStorable->getLocation(); + OUString aLocation = xStorable->getLocation(); INetURLObject aFileObj( aLocation ); bool bPrivateProtocol = ( aFileObj.GetProtocol() == INET_PROT_PRIV_SOFFICE ); bool bHasLocation = !aLocation.isEmpty() && !bPrivateProtocol; css::uno::Reference< css::container::XContainerQuery > xContainerQuery( - xSMGR->createInstance( rtl::OUString( + xSMGR->createInstance( OUString( "com.sun.star.document.FilterFactory" )), css::uno::UNO_QUERY_THROW ); @@ -653,7 +653,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { // Draw/Impress uses a different type. 2nd chance try to use alternative type name aFilterName = impl_retrieveFilterNameFromTypeAndModule( - xContainerQuery, ::rtl::OUString( HTML_GRAPHIC_TYPE ), aModule, nFilterFlags ); + xContainerQuery, OUString( HTML_GRAPHIC_TYPE ), aModule, nFilterFlags ); } // No filter found => error @@ -668,7 +668,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) if ( !bHasLocation ) { // Create a default file name with the correct extension - const rtl::OUString aPreviewFileName( "webpreview" ); + const OUString aPreviewFileName( "webpreview" ); aFileName = aPreviewFileName; } else @@ -688,10 +688,10 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) aFilePathObj.insertName( aFileName ); aFilePathObj.setExtension( aExtension ); - rtl::OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE ); + OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE ); css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "FilterName" ); + aArgs[0].Name = OUString( "FilterName" ); aArgs[0].Value = css::uno::makeAny( aFilterName ); // Store document in the html format @@ -806,7 +806,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) if ( SID_PRINTDOCDIRECT == nSID ) { - rtl::OUString aPrinterName; + OUString aPrinterName; if ( pPrinter != NULL ) aPrinterName = pPrinter->GetName(); else @@ -815,9 +815,9 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) { uno::Reference < frame::XFrame > xFrame( pFrame->GetFrame().GetFrameInterface() ); - ::rtl::OUStringBuffer aBuffer( 60 ); + OUStringBuffer aBuffer( 60 ); aBuffer.append( RetrieveLabelFromCommand( - ::rtl::OUString( ".uno:PrintDefault" ), + OUString( ".uno:PrintDefault" ), xFrame )); aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")); aBuffer.append( aPrinterName ); @@ -1961,7 +1961,7 @@ void Change( Menu* pMenu, SfxViewShell* pView ) } -sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent ) +sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent ) { rpOut = NULL; sal_Bool bModified = sal_False; diff --git a/sfx2/workben/custompanel/ctp_factory.cxx b/sfx2/workben/custompanel/ctp_factory.cxx index 185862030ff6..1fb01a5136b2 100644 --- a/sfx2/workben/custompanel/ctp_factory.cxx +++ b/sfx2/workben/custompanel/ctp_factory.cxx @@ -65,14 +65,14 @@ namespace sd { namespace colortoolpanel } //------------------------------------------------------------------------------------------------------------------ - Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const ::rtl::OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException) + Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !i_rResourceURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/toolpanel/org.openoffice.example.colorpanel/" ) ) ) throw NoSuchElementException( i_rResourceURL, *this ); - const ::rtl::OUString sColor( i_rResourceURL.copy( i_rResourceURL.lastIndexOf( '/' ) + 1 ) ); + const OUString sColor( i_rResourceURL.copy( i_rResourceURL.lastIndexOf( '/' ) + 1 ) ); const sal_Int32 nPanelColor = sColor.toInt32( 16 ); // retrieve the parent window @@ -91,7 +91,7 @@ namespace sd { namespace colortoolpanel { OSL_FAIL( "ToolPanelFactory::createUIElement: no parent window in the args!" ); throw IllegalArgumentException( - ::rtl::OUString( "No parent window provided in the creation arguments. Cannot create tool panel." ), + OUString( "No parent window provided in the creation arguments. Cannot create tool panel." ), *this, 2 ); @@ -103,22 +103,22 @@ namespace sd { namespace colortoolpanel } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL ToolPanelFactory::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.example.custompanel.ToolPanelFactory" ); + return OUString( "org.openoffice.comp.example.custompanel.ToolPanelFactory" ); } //------------------------------------------------------------------------------------------------------------------ - ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const ::rtl::OUString& i_rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const OUString& i_rServiceName ) throw (RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* serviceName = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); + for ( const OUString* serviceName = aServiceNames.getConstArray(); serviceName != aServiceNames.getConstArray() + aServiceNames.getLength(); ++serviceName ) @@ -130,16 +130,16 @@ namespace sd { namespace colortoolpanel } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames() throw (RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames_static() throw (RuntimeException) + Sequence< OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames_static() throw (RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "org.openoffice.example.colorpanel.ToolPanelFactory" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "org.openoffice.example.colorpanel.ToolPanelFactory" ); return aServiceNames; } diff --git a/sfx2/workben/custompanel/ctp_factory.hxx b/sfx2/workben/custompanel/ctp_factory.hxx index 91d6ef8dc7d8..2399807b2106 100644 --- a/sfx2/workben/custompanel/ctp_factory.hxx +++ b/sfx2/workben/custompanel/ctp_factory.hxx @@ -48,16 +48,16 @@ namespace sd { namespace colortoolpanel ~ToolPanelFactory(); // XUIElementFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& i_rResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rArgs ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const OUString& i_rResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rArgs ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ) throw (::com::sun::star::uno::RuntimeException); private: diff --git a/sfx2/workben/custompanel/ctp_panel.cxx b/sfx2/workben/custompanel/ctp_panel.cxx index 34c4a6c7d237..a56e04ab4063 100644 --- a/sfx2/workben/custompanel/ctp_panel.cxx +++ b/sfx2/workben/custompanel/ctp_panel.cxx @@ -84,7 +84,7 @@ namespace sd { namespace colortoolpanel WindowDescriptor aWindow; aWindow.Type = WindowClass_SIMPLE; - aWindow.WindowServiceName = ::rtl::OUString( "window" ); + aWindow.WindowServiceName = OUString( "window" ); aWindow.Parent = i_rParentWindow; aWindow.WindowAttributes = WindowAttribute::BORDER; @@ -135,7 +135,7 @@ namespace sd { namespace colortoolpanel { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return m_xWindow; } @@ -144,7 +144,7 @@ namespace sd { namespace colortoolpanel { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); // TODO: the following is wrong, since it doesn't respect i_rParentAccessible. In a real extension, you should // implement this correctly :) @@ -203,7 +203,7 @@ namespace sd { namespace colortoolpanel //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ PanelUIElement::PanelUIElement( const Reference< XComponentContext >& i_rContext, const Reference< XWindow >& i_rParentWindow, - const ::rtl::OUString& i_rResourceURL, const ::sal_Int32 i_nPanelColor ) + const OUString& i_rResourceURL, const ::sal_Int32 i_nPanelColor ) :PanelUIElement_Base( m_aMutex ) ,m_sResourceURL( i_rResourceURL ) ,m_xToolPanel( new SingleColorPanel( i_rContext, i_rParentWindow, i_nPanelColor ) ) @@ -223,7 +223,7 @@ namespace sd { namespace colortoolpanel } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL PanelUIElement::getResourceURL() throw (RuntimeException) + OUString SAL_CALL PanelUIElement::getResourceURL() throw (RuntimeException) { return m_sResourceURL; } diff --git a/sfx2/workben/custompanel/ctp_panel.hxx b/sfx2/workben/custompanel/ctp_panel.hxx index 82b74d0d2d3f..5ef7f19742f2 100644 --- a/sfx2/workben/custompanel/ctp_panel.hxx +++ b/sfx2/workben/custompanel/ctp_panel.hxx @@ -86,13 +86,13 @@ namespace sd { namespace colortoolpanel PanelUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& i_rParentWindow, - const ::rtl::OUString& i_rResourceURL, + const OUString& i_rResourceURL, const ::sal_Int32 i_nPanelColor ); // XUIElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface( ) throw (::com::sun::star::uno::RuntimeException); @@ -103,7 +103,7 @@ namespace sd { namespace colortoolpanel ~PanelUIElement(); private: - const ::rtl::OUString m_sResourceURL; + const OUString m_sResourceURL; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel > m_xToolPanel; }; diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index c4c8ddbde4f3..3e8e8c176b84 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -53,15 +53,15 @@ namespace { -rtl::OUString SAL_CALL getDefaultImplementationName() { - return rtl::OUString( +OUString SAL_CALL getDefaultImplementationName() { + return OUString( "com.sun.star.comp.configuration.backend.DesktopBackend"); } -css::uno::Sequence< rtl::OUString > SAL_CALL getDefaultSupportedServiceNames() { - rtl::OUString name( +css::uno::Sequence< OUString > SAL_CALL getDefaultSupportedServiceNames() { + OUString name( "com.sun.star.configuration.backend.DesktopBackend"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + return css::uno::Sequence< OUString >(&name, 1); } class Default: @@ -75,15 +75,15 @@ public: private: virtual ~Default() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getDefaultImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == getSupportedServiceNames()[0]; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getDefaultSupportedServiceNames(); } @@ -92,7 +92,7 @@ private: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -100,13 +100,13 @@ private: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -114,7 +114,7 @@ private: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -122,7 +122,7 @@ private: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -130,7 +130,7 @@ private: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -138,18 +138,18 @@ private: {} }; -void Default::setPropertyValue(rtl::OUString const &, css::uno::Any const &) +void Default::setPropertyValue(OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString("setPropertyValue not supported"), + OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } -css::uno::Any Default::getPropertyValue(rtl::OUString const & PropertyName) +css::uno::Any Default::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) @@ -168,7 +168,7 @@ css::uno::Any Default::getPropertyValue(rtl::OUString const & PropertyName) css::uno::Reference< css::uno::XInterface > createBackend( css::uno::Reference< css::uno::XComponentContext > const & context, - rtl::OUString const & name) + OUString const & name) { try { return css::uno::Reference< css::lang::XMultiComponentFactory >( @@ -181,8 +181,8 @@ css::uno::Reference< css::uno::XInterface > createBackend( // Assuming these exceptions indicate that the service is not installed: OSL_TRACE( "createInstance(%s) failed with %s", - rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr(), - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); return css::uno::Reference< css::uno::XInterface >(); } } @@ -190,12 +190,12 @@ css::uno::Reference< css::uno::XInterface > createBackend( css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( css::uno::Reference< css::uno::XComponentContext > const & context) { - rtl::OUString desktop; + OUString desktop; css::uno::Reference< css::uno::XCurrentContext > current( css::uno::getCurrentContext()); if (current.is()) { current->getValueByName( - rtl::OUString("system.desktop-environment")) >>= + OUString("system.desktop-environment")) >>= desktop; } @@ -204,17 +204,17 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( if ( desktop == "GNOME" ) { backend = createBackend( context, - rtl::OUString( + OUString( "com.sun.star.configuration.backend.GconfBackend")); } else if ( desktop == "KDE" ) { backend = createBackend( context, - rtl::OUString( + OUString( "com.sun.star.configuration.backend.KDEBackend")); } else if ( desktop == "KDE4" ) { backend = createBackend( context, - rtl::OUString( + OUString( "com.sun.star.configuration.backend.KDE4Backend")); } return backend.is() diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index b0cc1778be32..1a1131cd828c 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -45,10 +45,6 @@ namespace { namespace uno = css::uno ; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringBuffer; GConfClient* getGconfClient() { @@ -72,7 +68,7 @@ GConfClient* getGconfClient() mClient = gconf_client_get_default(); if (!mClient) { - throw uno::RuntimeException(rtl::OUString("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL); + throw uno::RuntimeException(OUString("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL); } static const char * const PreloadValuesList[] = @@ -111,7 +107,7 @@ static OUString xdg_user_dir_lookup (const char *type) if (!aSecurity.getHomeDir( aHomeDirURL ) ) { - osl::FileBase::getFileURLFromSystemPath(rtl::OUString("/tmp"), aDocumentsDirURL); + osl::FileBase::getFileURLFromSystemPath(OUString("/tmp"), aDocumentsDirURL); return aDocumentsDirURL; } @@ -215,7 +211,7 @@ uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue ) return uno::makeAny( (sal_Int32) gconf_value_get_int( pGconfValue ) ); case GCONF_VALUE_STRING: - return uno::makeAny( OStringToOUString( rtl::OString( + return uno::makeAny( OStringToOUString( OString( gconf_value_get_string(pGconfValue) ), RTL_TEXTENCODING_UTF8 ) ); default: @@ -228,20 +224,20 @@ uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue ) //------------------------------------------------------------------------------ -static void splitFontName( GConfValue *pGconfValue, rtl::OUString &rName, sal_Int16 &rHeight) +static void splitFontName( GConfValue *pGconfValue, OUString &rName, sal_Int16 &rHeight) { - rtl::OString aFont( gconf_value_get_string( pGconfValue ) ); + OString aFont( gconf_value_get_string( pGconfValue ) ); aFont = aFont.trim(); sal_Int32 nIdx = aFont.lastIndexOf( ' ' ); if (nIdx < 1) { // urk rHeight = 12; nIdx = aFont.getLength(); } else { - rtl::OString aSize = aFont.copy( nIdx + 1 ); + OString aSize = aFont.copy( nIdx + 1 ); rHeight = static_cast( aSize.toInt32() ); } - rName = rtl::OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 ); + rName = OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------ @@ -253,7 +249,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal { case SETTING_PROXY_MODE: { - rtl::OUString aProxyMode; + OUString aProxyMode; uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue ); aOriginalValue >>= aProxyMode; @@ -266,7 +262,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal case SETTING_NO_PROXY_FOR: { - rtl::OStringBuffer aBuffer; + OStringBuffer aBuffer; if( (GCONF_VALUE_LIST == pGconfValue->type) && (GCONF_VALUE_STRING == gconf_value_get_list_type(pGconfValue)) ) { GSList * list = gconf_value_get_list(pGconfValue); @@ -276,7 +272,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal } // Remove trailing ";" aBuffer.setLength(aBuffer.getLength()-1); - return uno::makeAny(rtl::OStringToOUString(aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); + return uno::makeAny(OStringToOUString(aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); } else g_warning( "unexpected type for ignore_hosts" ); @@ -285,7 +281,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal case SETTING_MAILER_PROGRAM: { - rtl::OUString aMailer; + OUString aMailer; uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue ); aOriginalValue >>= aMailer; sal_Int32 nIndex = 0; @@ -314,22 +310,22 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal sal_Bool bBooleanValue = false; uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue ); aOriginalValue >>= bBooleanValue; - return uno::makeAny( rtl::OUString::valueOf( (sal_Bool) bBooleanValue ) ); + return uno::makeAny( OUString::valueOf( (sal_Bool) bBooleanValue ) ); } case SETTING_WORK_DIRECTORY: { - rtl::OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS"); + OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS"); return uno::makeAny( aDocumentsDirURL ); } case SETTING_USER_GIVENNAME: { - rtl::OUString aCompleteName( rtl::OStringToOUString( + OUString aCompleteName( OStringToOUString( g_get_real_name(), osl_getThreadTextEncoding() ) ); sal_Int32 nIndex = 0; - rtl::OUString aGivenName; + OUString aGivenName; do aGivenName = aCompleteName.getToken( 0, ' ', nIndex ); while ( nIndex == 0 ); @@ -340,10 +336,10 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal case SETTING_USER_SURNAME: { - rtl::OUString aCompleteName( rtl::OStringToOUString( + OUString aCompleteName( OStringToOUString( g_get_real_name(), osl_getThreadTextEncoding() ) ); sal_Int32 nIndex = 0; - rtl::OUString aSurname; + OUString aSurname; do aSurname = aCompleteName.getToken( 0, ' ', nIndex ); while ( nIndex >= 0 ); @@ -354,7 +350,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal case SETTING_SOURCEVIEWFONT_NAME: case SETTING_SOURCEVIEWFONT_HEIGHT: { - rtl::OUString aName; + OUString aName; sal_Int16 nHeight; splitFontName (pGconfValue, aName, nHeight); @@ -394,7 +390,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati case SETTING_WORK_DIRECTORY: { - rtl::OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS"); + OUString aDocumentsDirURL = xdg_user_dir_lookup("DOCUMENTS"); osl::Directory aDocumentsDir( aDocumentsDirURL ); if( osl::FileBase::E_None == aDocumentsDir.open() ) @@ -404,7 +400,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati case SETTING_USER_GIVENNAME: { - rtl::OUString aCompleteName( rtl::OStringToOUString( + OUString aCompleteName( OStringToOUString( g_get_real_name(), osl_getThreadTextEncoding() ) ); if( aCompleteName != "Unknown" ) return sal_True; @@ -413,7 +409,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati case SETTING_USER_SURNAME: { - rtl::OUString aCompleteName( rtl::OStringToOUString( + OUString aCompleteName( OStringToOUString( g_get_real_name(), osl_getThreadTextEncoding() ) ); if( aCompleteName != "Unknown" ) { diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index bf40d7cb4571..97441d9e8303 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -54,15 +54,15 @@ namespace { -rtl::OUString SAL_CALL getServiceImplementationName() { - return rtl::OUString( +OUString SAL_CALL getServiceImplementationName() { + return OUString( "com.sun.star.comp.configuration.backend.GconfBackend"); } -css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { - rtl::OUString name( +css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() { + OUString name( "com.sun.star.configuration.backend.GconfBackend"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + return css::uno::Sequence< OUString >(&name, 1); } class Service: @@ -76,15 +76,15 @@ public: private: virtual ~Service() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getServiceImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == getSupportedServiceNames()[0]; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getServiceSupportedServiceNames(); } @@ -93,7 +93,7 @@ private: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -101,13 +101,13 @@ private: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -115,7 +115,7 @@ private: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -123,7 +123,7 @@ private: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -131,7 +131,7 @@ private: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -145,26 +145,26 @@ Service::Service(): enabled_(false) { css::uno::Reference< css::uno::XCurrentContext > context( css::uno::getCurrentContext()); if (context.is()) { - rtl::OUString desktop; + OUString desktop; context->getValueByName( - rtl::OUString("system.desktop-environment")) >>= + OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "GNOME"; } } -void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) +void Service::setPropertyValue(OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString("setPropertyValue not supported"), + OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } -css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName) +css::uno::Any Service::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx index 1669263b3c95..6bd8f4a45bd0 100644 --- a/shell/source/backends/kde4be/kde4access.cxx +++ b/shell/source/backends/kde4be/kde4access.cxx @@ -46,11 +46,11 @@ namespace uno = css::uno ; } -css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { +css::beans::Optional< css::uno::Any > getValue(OUString const & id) { if ( id == "ExternalMailer" ) { KEMailSettings aEmailSettings; QString aClientProgram; - ::rtl::OUString sClientProgram; + OUString sClientProgram; aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram ); if ( aClientProgram.isEmpty() ) @@ -75,7 +75,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { { QFont aFixedFont; QString aFontName; - :: rtl::OUString sFontName; + :: OUString sFontName; aFixedFont = KGlobalSettings::fixedFont(); aFontName = aFixedFont.family(); @@ -88,13 +88,13 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { /* does not make much sense without an accessibility bridge */ sal_Bool ATToolSupport = sal_False; return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( rtl::OUString::valueOf( ATToolSupport ) ) ); + true, uno::makeAny( OUString::valueOf( ATToolSupport ) ) ); } else if (id.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"))) { QString aDocumentsDir( KGlobalSettings::documentPath() ); - rtl::OUString sDocumentsDir; - rtl::OUString sDocumentsURL; + OUString sDocumentsDir; + OUString sDocumentsURL; if ( aDocumentsDir.endsWith(QChar('/')) ) aDocumentsDir.truncate ( aDocumentsDir.length() - 1 ); sDocumentsDir = (const sal_Unicode *) aDocumentsDir.utf16(); @@ -124,7 +124,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aFTPProxy.isEmpty() ) { KUrl aProxy(aFTPProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); + OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -178,7 +178,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aHTTPProxy.isEmpty() ) { KUrl aProxy(aHTTPProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); + OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -232,7 +232,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aHTTPSProxy.isEmpty() ) { KUrl aProxy(aHTTPSProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); + OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -278,7 +278,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { } if ( !aNoProxyFor.isEmpty() ) { - ::rtl::OUString sNoProxyFor; + OUString sNoProxyFor; aNoProxyFor = aNoProxyFor.replace( COMMA, SEMI_COLON ); sNoProxyFor = (const sal_Unicode *) aNoProxyFor.utf16(); diff --git a/shell/source/backends/kde4be/kde4access.hxx b/shell/source/backends/kde4be/kde4access.hxx index 26228fb05af5..f77a2ecad7cf 100644 --- a/shell/source/backends/kde4be/kde4access.hxx +++ b/shell/source/backends/kde4be/kde4access.hxx @@ -32,7 +32,7 @@ namespace rtl { class OUString; } namespace kde4access { com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue( - rtl::OUString const & id); + OUString const & id); } diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index d39eb5a6974e..672c41e059ed 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -54,15 +54,15 @@ namespace { -rtl::OUString SAL_CALL getServiceImplementationName() { - return rtl::OUString( +OUString SAL_CALL getServiceImplementationName() { + return OUString( "com.sun.star.comp.configuration.backend.KDE4Backend"); } -css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { - rtl::OUString name( +css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() { + OUString name( "com.sun.star.configuration.backend.KDE4Backend"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + return css::uno::Sequence< OUString >(&name, 1); } class Service: @@ -76,15 +76,15 @@ public: private: virtual ~Service() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getServiceImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == getSupportedServiceNames()[0]; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getServiceSupportedServiceNames(); } @@ -93,7 +93,7 @@ private: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -101,13 +101,13 @@ private: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -115,7 +115,7 @@ private: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -123,7 +123,7 @@ private: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -131,7 +131,7 @@ private: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -145,26 +145,26 @@ Service::Service(): enabled_(false) { css::uno::Reference< css::uno::XCurrentContext > context( css::uno::getCurrentContext()); if (context.is()) { - rtl::OUString desktop; + OUString desktop; context->getValueByName( - rtl::OUString("system.desktop-environment")) >>= + OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "KDE4" && KApplication::kApplication() != 0; } } -void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) +void Service::setPropertyValue(OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString("setPropertyValue not supported"), + OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } -css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName) +css::uno::Any Service::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx index 5785579c06c2..57618e6d3f24 100644 --- a/shell/source/backends/kdebe/kdeaccess.cxx +++ b/shell/source/backends/kdebe/kdeaccess.cxx @@ -42,11 +42,11 @@ namespace uno = css::uno ; } -css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { +css::beans::Optional< css::uno::Any > getValue(OUString const & id) { if ( id == "ExternalMailer" ) { KEMailSettings aEmailSettings; QString aClientProgram; - ::rtl::OUString sClientProgram; + OUString sClientProgram; aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram ); if ( aClientProgram.isEmpty() ) @@ -71,7 +71,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { { QFont aFixedFont; QString aFontName; - :: rtl::OUString sFontName; + :: OUString sFontName; aFixedFont = KGlobalSettings::fixedFont(); aFontName = aFixedFont.family(); @@ -84,13 +84,13 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { /* does not make much sense without an accessibility bridge */ sal_Bool ATToolSupport = sal_False; return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( rtl::OUString::valueOf( ATToolSupport ) ) ); + true, uno::makeAny( OUString::valueOf( ATToolSupport ) ) ); } else if (id.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"))) { QString aDocumentsDir( KGlobalSettings::documentPath() ); - rtl::OUString sDocumentsDir; - rtl::OUString sDocumentsURL; + OUString sDocumentsDir; + OUString sDocumentsURL; if ( aDocumentsDir.endsWith(QChar('/')) ) aDocumentsDir.truncate ( aDocumentsDir.length() - 1 ); sDocumentsDir = (const sal_Unicode *) aDocumentsDir.ucs2(); @@ -120,7 +120,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aFTPProxy.isEmpty() ) { KURL aProxy(aFTPProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); + OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -174,7 +174,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aHTTPProxy.isEmpty() ) { KURL aProxy(aHTTPProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); + OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -228,7 +228,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aHTTPSProxy.isEmpty() ) { KURL aProxy(aHTTPSProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); + OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -274,7 +274,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { } if ( !aNoProxyFor.isEmpty() ) { - ::rtl::OUString sNoProxyFor; + OUString sNoProxyFor; aNoProxyFor = aNoProxyFor.replace( COMMA, SEMI_COLON ); sNoProxyFor = (const sal_Unicode *) aNoProxyFor.ucs2(); diff --git a/shell/source/backends/kdebe/kdeaccess.hxx b/shell/source/backends/kdebe/kdeaccess.hxx index cfee08bb129e..2e4cba96e699 100644 --- a/shell/source/backends/kdebe/kdeaccess.hxx +++ b/shell/source/backends/kdebe/kdeaccess.hxx @@ -32,7 +32,7 @@ namespace rtl { class OUString; } namespace kdeaccess { com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue( - rtl::OUString const & id); + OUString const & id); } diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 5f1825a7da50..607e1b5f12a2 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -54,15 +54,15 @@ namespace { -rtl::OUString SAL_CALL getServiceImplementationName() { - return rtl::OUString( +OUString SAL_CALL getServiceImplementationName() { + return OUString( "com.sun.star.comp.configuration.backend.KDEBackend"); } -css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { - rtl::OUString name( +css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() { + OUString name( "com.sun.star.configuration.backend.KDEBackend"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + return css::uno::Sequence< OUString >(&name, 1); } class Service: @@ -76,15 +76,15 @@ public: private: virtual ~Service() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getServiceImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == getSupportedServiceNames()[0]; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getServiceSupportedServiceNames(); } @@ -93,7 +93,7 @@ private: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -101,13 +101,13 @@ private: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -115,7 +115,7 @@ private: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -123,7 +123,7 @@ private: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -131,7 +131,7 @@ private: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -145,26 +145,26 @@ Service::Service(): enabled_(false) { css::uno::Reference< css::uno::XCurrentContext > context( css::uno::getCurrentContext()); if (context.is()) { - rtl::OUString desktop; + OUString desktop; context->getValueByName( - rtl::OUString("system.desktop-environment")) >>= + OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "KDE" && KApplication::kApplication() != 0; } } -void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) +void Service::setPropertyValue(OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString("setPropertyValue not supported"), + OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } -css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName) +css::uno::Any Service::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 5e38f3a66162..42405d76f0db 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -39,7 +39,7 @@ #pragma warning(pop) #endif -rtl::OUString ImplGetLocale(LCID lcid) +OUString ImplGetLocale(LCID lcid) { TCHAR buffer[8]; LPTSTR cp = buffer; @@ -51,10 +51,10 @@ rtl::OUString ImplGetLocale(LCID lcid) // #i50822# minus character must be written before cp *(cp - 1) = '-'; - return rtl::OUString::createFromAscii(buffer); + return OUString::createFromAscii(buffer); } - return rtl::OUString(); + return OUString(); } #elif defined(MACOSX) @@ -71,7 +71,7 @@ rtl::OUString ImplGetLocale(LCID lcid) namespace /* private */ { - void OUStringBufferAppendCFString(rtl::OUStringBuffer& buffer, const CFStringRef s) + void OUStringBufferAppendCFString(OUStringBuffer& buffer, const CFStringRef s) { CFIndex lstr = CFStringGetLength(s); for (CFIndex i = 0; i < lstr; i++) @@ -119,12 +119,12 @@ namespace /* private */ return CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, sref); } - rtl::OUString ImplGetLocale(const char* pref) + OUString ImplGetLocale(const char* pref) { CFStringRef sref = ImplGetAppPreference(pref); CFStringGuard srefGuard(sref); - rtl::OUStringBuffer aLocaleBuffer; + OUStringBuffer aLocaleBuffer; aLocaleBuffer.appendAscii("en-US"); // initialize with fallback value if (sref != NULL) @@ -168,13 +168,13 @@ namespace /* private */ * is called from the main thread only. */ -static rtl::OUString ImplGetLocale(int category) +static OUString ImplGetLocale(int category) { const char *locale = setlocale(category, ""); // Return "en-US" for C locales if( (locale == NULL) || ( locale[0] == 'C' && locale[1] == '\0' ) ) - return rtl::OUString( "en-US" ); + return OUString( "en-US" ); const char *cp; @@ -191,7 +191,7 @@ static rtl::OUString ImplGetLocale(int category) break; } - rtl::OUStringBuffer aLocaleBuffer; + OUStringBuffer aLocaleBuffer; if( uscore != NULL ) { aLocaleBuffer.appendAscii(locale, uscore++ - locale); @@ -229,7 +229,7 @@ LocaleBackend* LocaleBackend::createInstance() // --------------------------------------------------------------------------------------- -rtl::OUString LocaleBackend::getLocale(void) +OUString LocaleBackend::getLocale(void) { #if defined WNT return ImplGetLocale( GetUserDefaultLCID() ); @@ -242,7 +242,7 @@ rtl::OUString LocaleBackend::getLocale(void) //------------------------------------------------------------------------------ -rtl::OUString LocaleBackend::getUILocale(void) +OUString LocaleBackend::getUILocale(void) { #if defined WNT return ImplGetLocale( MAKELCID(GetUserDefaultUILanguage(), SORT_DEFAULT) ); @@ -255,7 +255,7 @@ rtl::OUString LocaleBackend::getUILocale(void) // --------------------------------------------------------------------------------------- -rtl::OUString LocaleBackend::getSystemLocale(void) +OUString LocaleBackend::getSystemLocale(void) { // note: the implementation differs from getLocale() only on Windows #if defined WNT @@ -267,20 +267,20 @@ rtl::OUString LocaleBackend::getSystemLocale(void) //------------------------------------------------------------------------------ void LocaleBackend::setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( + OUString( "setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } css::uno::Any LocaleBackend::getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) @@ -307,13 +307,13 @@ css::uno::Any LocaleBackend::getPropertyValue( //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL LocaleBackend::getBackendName(void) { - return rtl::OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ; +OUString SAL_CALL LocaleBackend::getBackendName(void) { + return OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ; } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL LocaleBackend::getImplementationName(void) +OUString SAL_CALL LocaleBackend::getImplementationName(void) throw (uno::RuntimeException) { return getBackendName() ; @@ -321,19 +321,19 @@ rtl::OUString SAL_CALL LocaleBackend::getImplementationName(void) //------------------------------------------------------------------------------ -uno::Sequence SAL_CALL LocaleBackend::getBackendServiceNames(void) +uno::Sequence SAL_CALL LocaleBackend::getBackendServiceNames(void) { - uno::Sequence aServiceNameList(1); - aServiceNameList[0] = rtl::OUString( "com.sun.star.configuration.backend.LocaleBackend") ; + uno::Sequence aServiceNameList(1); + aServiceNameList[0] = OUString( "com.sun.star.configuration.backend.LocaleBackend") ; return aServiceNameList ; } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL LocaleBackend::supportsService(const rtl::OUString& aServiceName) +sal_Bool SAL_CALL LocaleBackend::supportsService(const OUString& aServiceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > const svc = getBackendServiceNames(); + uno::Sequence< OUString > const svc = getBackendServiceNames(); for(sal_Int32 i = 0; i < svc.getLength(); ++i ) if(svc[i] == aServiceName) @@ -344,7 +344,7 @@ sal_Bool SAL_CALL LocaleBackend::supportsService(const rtl::OUString& aServiceNa //------------------------------------------------------------------------------ -uno::Sequence SAL_CALL LocaleBackend::getSupportedServiceNames(void) +uno::Sequence SAL_CALL LocaleBackend::getSupportedServiceNames(void) throw (uno::RuntimeException) { return getBackendServiceNames() ; diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx index e84be5e2285e..3eea01286f68 100644 --- a/shell/source/backends/localebe/localebackend.hxx +++ b/shell/source/backends/localebe/localebackend.hxx @@ -38,15 +38,15 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < static LocaleBackend* createInstance(); // XServiceInfo - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException) ; virtual sal_Bool SAL_CALL - supportsService( const rtl::OUString& aServiceName ) + supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) ; - virtual uno::Sequence SAL_CALL + virtual uno::Sequence SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException) ; @@ -55,13 +55,13 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < @return implementation name */ - static rtl::OUString SAL_CALL getBackendName(void) ; + static OUString SAL_CALL getBackendName(void) ; /** Provides the supported services names @return service names */ - static uno::Sequence SAL_CALL getBackendServiceNames(void) ; + static uno::Sequence SAL_CALL getBackendServiceNames(void) ; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL @@ -69,7 +69,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -77,13 +77,13 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -91,7 +91,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -99,7 +99,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -107,7 +107,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -127,13 +127,13 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < private: // Returns the user locale - static rtl::OUString getLocale(void); + static OUString getLocale(void); // Returns the user UI locale - static rtl::OUString getUILocale(void); + static OUString getUILocale(void); // Returns the system default locale - static rtl::OUString getSystemLocale(void); + static OUString getSystemLocale(void); } ; diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx index bc623709449f..041e129cf8f8 100644 --- a/shell/source/backends/macbe/macbackend.hxx +++ b/shell/source/backends/macbe/macbackend.hxx @@ -39,13 +39,13 @@ public: static MacOSXBackend* createInstance(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& aServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& aServiceName) throw (uno::RuntimeException); - virtual uno::Sequence SAL_CALL getSupportedServiceNames() + virtual uno::Sequence SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); /** @@ -53,14 +53,14 @@ public: @return implementation name */ - static rtl::OUString SAL_CALL getBackendName(void); + static OUString SAL_CALL getBackendName(void); /** Provides the supported services names @return service names */ - static uno::Sequence SAL_CALL getBackendServiceNames(void); + static uno::Sequence SAL_CALL getBackendServiceNames(void); // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL @@ -68,7 +68,7 @@ public: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -76,13 +76,13 @@ public: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -90,7 +90,7 @@ public: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -98,7 +98,7 @@ public: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -106,7 +106,7 @@ public: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 0b24a47ffb2e..559eb0e51d5b 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -52,8 +52,8 @@ struct Library { typedef struct { - rtl::OUString Server; - rtl::OUString Port; + OUString Server; + OUString Port; } ProxyEntry; //------------------------------------------------------------------------ @@ -62,7 +62,7 @@ typedef struct namespace // private { - ProxyEntry ReadProxyEntry(const rtl::OUString& aProxy, sal_Int32& i) + ProxyEntry ReadProxyEntry(const OUString& aProxy, sal_Int32& i) { ProxyEntry aProxyEntry; @@ -73,14 +73,14 @@ namespace // private return aProxyEntry; } - ProxyEntry FindProxyEntry(const rtl::OUString& aProxyList, const rtl::OUString& aType) + ProxyEntry FindProxyEntry(const OUString& aProxyList, const OUString& aType) { sal_Int32 nIndex = 0; do { // get the next token, e.g. ftp=server:port - rtl::OUString nextToken = aProxyList.getToken( 0, SPACE, nIndex ); + OUString nextToken = aProxyList.getToken( 0, SPACE, nIndex ); // split the next token again into the parts separated // through '=', e.g. ftp=server:port -> ftp and server:port @@ -167,8 +167,8 @@ WinInetBackend::WinInetBackend() // an empty proxy list, so we don't have to check if // proxy is enabled or not - rtl::OUString aProxyList = rtl::OUString::createFromAscii( lpi->lpszProxy ); - rtl::OUString aProxyBypassList = rtl::OUString::createFromAscii( lpi->lpszProxyBypass ); + OUString aProxyList = OUString::createFromAscii( lpi->lpszProxy ); + OUString aProxyBypassList = OUString::createFromAscii( lpi->lpszProxyBypass ); // override default for ProxyType, which is "0" meaning "No proxies". sal_Int32 nProperties = 1; @@ -179,11 +179,11 @@ WinInetBackend::WinInetBackend() // fill proxy bypass list if( aProxyBypassList.getLength() > 0 ) { - rtl::OUStringBuffer aReverseList; + OUStringBuffer aReverseList; sal_Int32 nIndex = 0; do { - rtl::OUString aToken = aProxyBypassList.getToken( 0, SPACE, nIndex ); + OUString aToken = aProxyBypassList.getToken( 0, SPACE, nIndex ); if ( aProxyList.indexOf( aToken ) == -1 ) { if ( aReverseList.getLength() ) @@ -222,13 +222,13 @@ WinInetBackend::WinInetBackend() // there is one and it has a port //------------------------------------------------- - ProxyEntry aTypeIndepProxy = FindProxyEntry( aProxyList, rtl::OUString()); - ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, rtl::OUString( + ProxyEntry aTypeIndepProxy = FindProxyEntry( aProxyList, OUString()); + ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, OUString( "http" ) ); - ProxyEntry aHttpsProxy = FindProxyEntry( aProxyList, rtl::OUString( + ProxyEntry aHttpsProxy = FindProxyEntry( aProxyList, OUString( "https" ) ); - ProxyEntry aFtpProxy = FindProxyEntry( aProxyList, rtl::OUString( + ProxyEntry aFtpProxy = FindProxyEntry( aProxyList, OUString( "ftp" ) ); if( aTypeIndepProxy.Server.getLength() ) @@ -312,20 +312,20 @@ WinInetBackend* WinInetBackend::createInstance() // --------------------------------------------------------------------------------------- void WinInetBackend::setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString( + OUString( "setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } css::uno::Any WinInetBackend::getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) @@ -362,13 +362,13 @@ css::uno::Any WinInetBackend::getPropertyValue( //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL WinInetBackend::getBackendName(void) { - return rtl::OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ; +OUString SAL_CALL WinInetBackend::getBackendName(void) { + return OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ; } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL WinInetBackend::getImplementationName(void) +OUString SAL_CALL WinInetBackend::getImplementationName(void) throw (uno::RuntimeException) { return getBackendName() ; @@ -376,20 +376,20 @@ rtl::OUString SAL_CALL WinInetBackend::getImplementationName(void) //------------------------------------------------------------------------------ -uno::Sequence SAL_CALL WinInetBackend::getBackendServiceNames(void) +uno::Sequence SAL_CALL WinInetBackend::getBackendServiceNames(void) { - uno::Sequence aServiceNameList(1); - aServiceNameList[0] = rtl::OUString( "com.sun.star.configuration.backend.WinInetBackend") ; + uno::Sequence aServiceNameList(1); + aServiceNameList[0] = OUString( "com.sun.star.configuration.backend.WinInetBackend") ; return aServiceNameList ; } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL WinInetBackend::supportsService(const rtl::OUString& aServiceName) +sal_Bool SAL_CALL WinInetBackend::supportsService(const OUString& aServiceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > const svc = getBackendServiceNames(); + uno::Sequence< OUString > const svc = getBackendServiceNames(); for(sal_Int32 i = 0; i < svc.getLength(); ++i ) if(svc[i] == aServiceName) @@ -400,7 +400,7 @@ sal_Bool SAL_CALL WinInetBackend::supportsService(const rtl::OUString& aServiceN //------------------------------------------------------------------------------ -uno::Sequence SAL_CALL WinInetBackend::getSupportedServiceNames(void) +uno::Sequence SAL_CALL WinInetBackend::getSupportedServiceNames(void) throw (uno::RuntimeException) { return getBackendServiceNames() ; diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx index dd6edf165afb..62a9f5d35fc2 100644 --- a/shell/source/backends/wininetbe/wininetbackend.hxx +++ b/shell/source/backends/wininetbe/wininetbackend.hxx @@ -38,15 +38,15 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < static WinInetBackend* createInstance(); // XServiceInfo - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException) ; virtual sal_Bool SAL_CALL - supportsService( const rtl::OUString& aServiceName ) + supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) ; - virtual uno::Sequence SAL_CALL + virtual uno::Sequence SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException) ; @@ -55,13 +55,13 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < @return implementation name */ - static rtl::OUString SAL_CALL getBackendName(void) ; + static OUString SAL_CALL getBackendName(void) ; /** Provides the supported services names @return service names */ - static uno::Sequence SAL_CALL getBackendServiceNames(void) ; + static uno::Sequence SAL_CALL getBackendServiceNames(void) ; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL @@ -69,7 +69,7 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -77,13 +77,13 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -91,7 +91,7 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -99,7 +99,7 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -107,7 +107,7 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx index bf0c3f49466b..ca56e0f2e18d 100644 --- a/shell/source/cmdmail/cmdmailmsg.cxx +++ b/shell/source/cmdmail/cmdmailmsg.cxx @@ -32,7 +32,6 @@ using com::sun::star::lang::IllegalArgumentException; using com::sun::star::lang::WrappedTargetException; using com::sun::star::container::NoSuchElementException; using com::sun::star::container::XNameAccess; -using rtl::OUString; using osl::MutexGuard; using namespace cppu; @@ -41,7 +40,7 @@ using namespace com::sun::star::uno; //------------------------------------------------ -void SAL_CALL CmdMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) +void SAL_CALL CmdMailMsg::setRecipient( const OUString& aRecipient ) throw (RuntimeException) { MutexGuard aGuard( m_aMutex ); @@ -50,7 +49,7 @@ void SAL_CALL CmdMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) //------------------------------------------------ -::rtl::OUString SAL_CALL CmdMailMsg::getRecipient( ) +OUString SAL_CALL CmdMailMsg::getRecipient( ) throw (RuntimeException) { MutexGuard aGuard( m_aMutex ); @@ -131,7 +130,7 @@ OUString SAL_CALL CmdMailMsg::getSubject( ) //------------------------------------------------ -void SAL_CALL CmdMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAttachment ) +void SAL_CALL CmdMailMsg::setAttachement( const Sequence< OUString >& aAttachment ) throw (IllegalArgumentException, RuntimeException) { MutexGuard aGuard( m_aMutex ); @@ -210,7 +209,7 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) //------------------------------------------------ - sal_Bool SAL_CALL CmdMailMsg::hasByName( const ::rtl::OUString& aName ) + sal_Bool SAL_CALL CmdMailMsg::hasByName( const OUString& aName ) throw (RuntimeException) { MutexGuard aGuard( m_aMutex ); diff --git a/shell/source/cmdmail/cmdmailmsg.hxx b/shell/source/cmdmail/cmdmailmsg.hxx index 1cd1e60baa39..3c810f7194fa 100644 --- a/shell/source/cmdmail/cmdmailmsg.hxx +++ b/shell/source/cmdmail/cmdmailmsg.hxx @@ -37,12 +37,12 @@ class CmdMailMsg : ::com::sun::star::system::XSimpleMailMessage, ::com::sun::star::container::XNameAccess > { - ::rtl::OUString m_aRecipient; - ::rtl::OUString m_aOriginator; - ::rtl::OUString m_aSubject; - ::com::sun::star::uno::Sequence< rtl::OUString > m_CcRecipients; - ::com::sun::star::uno::Sequence< rtl::OUString > m_BccRecipients; - ::com::sun::star::uno::Sequence< rtl::OUString > m_Attachments; + OUString m_aRecipient; + OUString m_aOriginator; + OUString m_aSubject; + ::com::sun::star::uno::Sequence< OUString > m_CcRecipients; + ::com::sun::star::uno::Sequence< OUString > m_BccRecipients; + ::com::sun::star::uno::Sequence< OUString > m_Attachments; ::osl::Mutex m_aMutex; @@ -54,53 +54,53 @@ public: // XSimpleMailMessage //------------------------------------------------ - virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient ) + virtual void SAL_CALL setRecipient( const OUString& aRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRecipient( ) + virtual OUString SAL_CALL getRecipient( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient ) + virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< OUString >& aCcRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCcRecipient( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCcRecipient( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient ) + virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< OUString >& aBccRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getBccRecipient( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getBccRecipient( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator ) + virtual void SAL_CALL setOriginator( const OUString& aOriginator ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOriginator( ) + virtual OUString SAL_CALL getOriginator( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject ) + virtual void SAL_CALL setSubject( const OUString& aSubject ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubject( ) + virtual OUString SAL_CALL getSubject( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement ) + virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< OUString >& aAttachement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAttachement( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAttachement( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ // XNameAccess //------------------------------------------------ - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index c12bf984f22b..40c19f9cd278 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -47,10 +47,6 @@ using com::sun::star::system::XSimpleMailClient; using com::sun::star::system::XSimpleMailMessage; using com::sun::star::container::XNameAccess; using com::sun::star::container::NoSuchElementException; -using rtl::OUString; -using rtl::OUStringToOString; -using rtl::OString; -using rtl::OStringBuffer; using osl::MutexGuard; using osl::FileBase; diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx index 3b2fc1422227..e72ebdb2dfd7 100644 --- a/shell/source/cmdmail/cmdmailsuppl.hxx +++ b/shell/source/cmdmail/cmdmailsuppl.hxx @@ -66,13 +66,13 @@ public: // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx index 47f0749400a4..e8337845c303 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx @@ -42,7 +42,7 @@ namespace }; static inline GDBusProxy* lcl_GetPackageKitProxy(const OUString sInterface) { - const OString sFullInterface = rtl::OUStringToOString("org.freedesktop.PackageKit." + sInterface, RTL_TEXTENCODING_ASCII_US); + const OString sFullInterface = OUStringToOString("org.freedesktop.PackageKit." + sInterface, RTL_TEXTENCODING_ASCII_US); GErrorWrapper error(NULL); GDBusProxy* proxy = NULL; proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, @@ -71,7 +71,7 @@ namespace shell { namespace sessioninstall boost::shared_ptr pBuilder(g_variant_builder_new(G_VARIANT_TYPE ("as")), GVariantBuilderDeleter()); for( const OUString* pPackage = stl_begin(vPackages); pPackage != stl_end(vPackages); ++pPackage) { - vPackagesOString.push_back(rtl::OUStringToOString(*pPackage, RTL_TEXTENCODING_ASCII_US)); + vPackagesOString.push_back(OUStringToOString(*pPackage, RTL_TEXTENCODING_ASCII_US)); g_variant_builder_add(pBuilder.get(), "s", vPackagesOString.back().getStr()); } diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx index 78bbc8ef668c..e97f1f61958d 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx @@ -23,30 +23,30 @@ namespace shell { namespace sessioninstall SyncDbusSessionHelper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&); virtual ~SyncDbusSessionHelper() {} // XModify Methods - virtual void SAL_CALL InstallPackageNames( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* packages */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL InstallPackageNames( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* packages */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL InstallPackageFiles( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* files */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallPackageFiles( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* files */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallProvideFiles( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* files */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallProvideFiles( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* files */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallCatalogs( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* files */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallCatalogs( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* files */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallMimeTypes( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* mime_types */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallMimeTypes( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* mime_types */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallFontconfigResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallFontconfigResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* resources */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallGStreamerResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallGStreamerResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* resources */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* types */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* resources */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* types */, const ::com::sun::star::uno::Sequence< OUString >& /* resources */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL RemovePackageByFiles( SAL_UNUSED_PARAMETER ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* files */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL RemovePackageByFiles( SAL_UNUSED_PARAMETER ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* files */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented - virtual void SAL_CALL InstallPrinterDrivers( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* files */, const ::rtl::OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL InstallPrinterDrivers( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* files */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented // XQuery Methods - virtual void SAL_CALL IsInstalled( const ::rtl::OUString& /* package_name */, const ::rtl::OUString& /* interaction */, ::sal_Bool& /* installed */ ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL IsInstalled( const OUString& /* package_name */, const OUString& /* interaction */, ::sal_Bool& /* installed */ ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL SearchFile( const ::rtl::OUString& /* file_name */, const ::rtl::OUString& /* interaction */, ::sal_Bool& /* installed */, ::rtl::OUString& /* package_name */ ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL SearchFile( const OUString& /* file_name */, const OUString& /* interaction */, ::sal_Bool& /* installed */, OUString& /* package_name */ ) throw (::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::uno::RuntimeException(); } // not implemented private: diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index 1d702eb11798..ea326c702c49 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -68,8 +68,6 @@ typedef unsigned short WORD; namespace /* private */ { -using rtl::OUString; -using rtl::OString; void ShowUsage() { @@ -82,10 +80,10 @@ void ShowUsage() } inline OUString OStringToOUString(const OString& str) -{ return rtl::OStringToOUString(str, osl_getThreadTextEncoding()); } +{ return OStringToOUString(str, osl_getThreadTextEncoding()); } inline OString OUStringToOString(const OUString& str) -{ return rtl::OUStringToOString(str, osl_getThreadTextEncoding()); } +{ return OUStringToOString(str, osl_getThreadTextEncoding()); } /** Get the directory where the module is located as system directory, the @@ -316,7 +314,7 @@ typedef std::map< unsigned short , std::string , std::less< unsigned short > > s void add_group_entries( Config& aConfig, - const rtl::OString& GroupName, + const OString& GroupName, Substitutor& Substitutor) { OSL_ASSERT(aConfig.HasGroup(GroupName)); @@ -327,8 +325,8 @@ void add_group_entries( for (size_t i = 0; i < key_count; i++) { - rtl::OString iso_lang = aConfig.GetKeyName(sal::static_int_cast(i)); - rtl::OString key_value_utf8 = aConfig.ReadKey(sal::static_int_cast(i)); + OString iso_lang = aConfig.GetKeyName(sal::static_int_cast(i)); + OString key_value_utf8 = aConfig.ReadKey(sal::static_int_cast(i)); iso_lang_identifier myiso_lang( iso_lang ); LanguageType ltype = LanguageTag( OStringToOUString( myiso_lang.language(), RTL_TEXTENCODING_UTF8), @@ -340,7 +338,7 @@ void add_group_entries( key_value_utf8 = comphelper::string::strip(key_value_utf8, '\"'); OUString key_value_utf16 = - rtl::OStringToOUString(key_value_utf8, RTL_TEXTENCODING_UTF8); + OStringToOUString(key_value_utf8, RTL_TEXTENCODING_UTF8); Substitutor.add_substitution( GroupName.getStr(), make_winrc_unicode_string(key_value_utf16)); @@ -364,10 +362,10 @@ void read_ulf_file(const std::string& FileName, Substitutor& Substitutor) // as the Config class is currently not able to deal correctly with // UTF8 files starting with a byte-order-mark we create a copy of the // original file without the byte-order-mark - rtl::OUString tmpfile_url; + OUString tmpfile_url; osl_createTempFile(NULL, NULL, &tmpfile_url.pData); - rtl::OUString tmpfile_sys; + OUString tmpfile_sys; osl::FileBase::getSystemPathFromFileURL(tmpfile_url, tmpfile_sys); std::ifstream in(FileName.c_str()); diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 755e1ecef321..dc1192cdb0f9 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -45,10 +45,6 @@ using com::sun::star::system::XSystemShellExecute; using com::sun::star::system::SystemShellExecuteException; -using rtl::OString; -using rtl::OUString; -using rtl::OStringBuffer; -using rtl::OUStringBuffer; using osl::FileBase; using namespace ::com::sun::star::uno; @@ -72,7 +68,7 @@ namespace // private } } -void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL) +void escapeForShell( OStringBuffer & rBuffer, const OString & rURL) { sal_Int32 nmax = rURL.getLength(); for(sal_Int32 n=0; n < nmax; ++n) @@ -172,7 +168,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar OUString aProgramURL; try { aProgramURL = exp->expandMacros( - rtl::OUString( "$BRAND_BASE_DIR/program/")); + OUString( "$BRAND_BASE_DIR/program/")); } catch (com::sun::star::lang::IllegalArgumentException &) { throw SystemShellExecuteException( @@ -225,7 +221,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar } else if ((nFlags & css::system::SystemShellExecuteFlags::URIS_ONLY) != 0) { throw css::lang::IllegalArgumentException( - (rtl::OUString( + (OUString( "XSystemShellExecute.execute URIS_ONLY with non-absolute" " URI reference ") + aCommand), diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx index daa5937ce0b6..741cdac8642d 100644 --- a/shell/source/unix/exec/shellexec.hxx +++ b/shell/source/unix/exec/shellexec.hxx @@ -34,7 +34,7 @@ class ShellExec : public ::cppu::WeakImplHelper2< com::sun::star::system::XSystemShellExecute, com::sun::star::lang::XServiceInfo > { - ::rtl::OString m_aDesktopEnvironment; + OString m_aDesktopEnvironment; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; @@ -45,26 +45,26 @@ public: // XSystemShellExecute //------------------------------------------------ - virtual void SAL_CALL execute( const ::rtl::OUString& aCommand, const ::rtl::OUString& aParameter, sal_Int32 nFlags ) + virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException, ::com::sun::star::uno::RuntimeException); //------------------------------------------------ // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; // helper function - needed for urltest -void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL); +void escapeForShell( OStringBuffer & rBuffer, const OString & rURL); #endif diff --git a/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx index bfdd69e05957..5a85dbe18dfa 100644 --- a/shell/source/unix/exec/urltest.cxx +++ b/shell/source/unix/exec/urltest.cxx @@ -64,8 +64,8 @@ int main(int argc, const char *argv[]) printf( "Passing URL: %s\n", url ); // test the encoding functionality from shellexec.cxx - rtl::OString aURL( url ); - rtl::OStringBuffer aBuffer; + OString aURL( url ); + OStringBuffer aBuffer; escapeForShell(aBuffer, aURL); // append encoded URL as (only) parameter to the script diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx index f0430e52a5c9..b1a71b795ab4 100644 --- a/shell/source/unix/sysshell/recently_used_file.cxx +++ b/shell/source/unix/sysshell/recently_used_file.cxx @@ -30,12 +30,12 @@ #include -const rtl::OUString RECENTLY_USED_FILE_NAME(".recently-used"); -const rtl::OUString SLASH("/"); +const OUString RECENTLY_USED_FILE_NAME(".recently-used"); +const OUString SLASH("/"); namespace /* private */ { -inline void ensure_final_slash(/*inout*/ rtl::OUString& path) +inline void ensure_final_slash(/*inout*/ OUString& path) { if (!path.isEmpty() && (SLASH.pData->buffer[0] != path.pData->buffer[path.getLength() - 1])) @@ -49,19 +49,19 @@ recently_used_file::recently_used_file() : file_(NULL) { osl::Security sec; - rtl::OUString homedir_url; + OUString homedir_url; if (sec.getHomeDir(homedir_url)) { - rtl::OUString homedir; + OUString homedir; osl::FileBase::getSystemPathFromFileURL(homedir_url, homedir); - rtl::OUString rufn = homedir; + OUString rufn = homedir; ensure_final_slash(rufn); rufn += RECENTLY_USED_FILE_NAME; - rtl::OString tmp = - rtl::OUStringToOString(rufn, osl_getThreadTextEncoding()); + OString tmp = + OUStringToOString(rufn, osl_getThreadTextEncoding()); file_ = fopen(tmp.getStr(), "r+"); diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index 21c467d0ed8f..92695077c2df 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -122,7 +122,7 @@ namespace /* private */ { write_xml_tag(TAG_URI, uri_, file); write_xml_tag(TAG_MIME_TYPE, mime_type_, file); - rtl::OString ts = rtl::OString::valueOf((sal_sSize)timestamp_); + OString ts = OString::valueOf((sal_sSize)timestamp_); write_xml_tag(TAG_TIMESTAMP, ts.getStr(), file); if (is_private_) @@ -143,9 +143,9 @@ namespace /* private */ { write_xml_end_tag(TAG_RECENT_ITEM, file); } - static rtl::OString escape_content(const string_t &text) + static OString escape_content(const string_t &text) { - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; for (sal_uInt32 i = 0; i < text.length(); i++) { switch (text[i]) @@ -164,7 +164,7 @@ namespace /* private */ { void write_xml_tag(const string_t& name, const string_t& value, const recently_used_file& file) const { write_xml_start_tag(name, file); - rtl::OString escaped = escape_content (value); + OString escaped = escape_content (value); file.write(escaped.getStr(), escaped.getLength()); write_xml_end_tag(name, file); } @@ -398,9 +398,9 @@ namespace /* private */ { //------------------------------------------------ void recently_used_item_list_add( - recently_used_item_list_t& item_list, const rtl::OUString& file_url, const rtl::OUString& mime_type) + recently_used_item_list_t& item_list, const OUString& file_url, const OUString& mime_type) { - rtl::OString f = rtl::OUStringToOString(file_url, RTL_TEXTENCODING_UTF8); + OString f = OUStringToOString(file_url, RTL_TEXTENCODING_UTF8); recently_used_item_list_t::iterator iter = std::find_if( @@ -427,7 +427,7 @@ namespace /* private */ { groups.push_back(GROUP_STAR_SUITE); string_t uri(f.getStr()); - string_t mimetype(rtl::OUStringToOString(mime_type, osl_getThreadTextEncoding()).getStr()); + string_t mimetype(OUStringToOString(mime_type, osl_getThreadTextEncoding()).getStr()); if (mimetype.length() == 0) mimetype = "application/octet-stream"; @@ -481,8 +481,8 @@ namespace /* private */ { */ extern "C" SAL_DLLPUBLIC_EXPORT -void add_to_recently_used_file_list(const rtl::OUString& file_url, - const rtl::OUString& mime_type) +void add_to_recently_used_file_list(const OUString& file_url, + const OUString& mime_type) { try { diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 30ff62deb07b..1279dafa2c19 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -47,7 +47,6 @@ using com::sun::star::uno::XInterface; using com::sun::star::lang::EventObject; using com::sun::star::lang::XServiceInfo; using com::sun::star::lang::IllegalArgumentException; -using rtl::OUString; using osl::Mutex; using com::sun::star::system::XSystemShellExecute; using com::sun::star::system::SystemShellExecuteException; @@ -282,7 +281,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa if (!(uri.is() && uri->isAbsolute())) { throw css::lang::IllegalArgumentException( - (rtl::OUString( + (OUString( "XSystemShellExecute.execute URIS_ONLY with" " non-absolute URI reference ") + aCommand), diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx index 01941cc2b215..39cd51e47f6f 100644 --- a/shell/source/win32/SysShExec.hxx +++ b/shell/source/win32/SysShExec.hxx @@ -53,20 +53,20 @@ public: // XSystemShellExecute //------------------------------------------------ - virtual void SAL_CALL execute( const ::rtl::OUString& aCommand, const ::rtl::OUString& aParameter, sal_Int32 nFlags ) + virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException, ::com::sun::star::uno::RuntimeException); //------------------------------------------------ // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index 5a27c849012b..869a683d0bb6 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -164,7 +164,7 @@ void initMapiMessage( rtl_uString_newFromAscii(&subject, const_cast(gSubject.c_str())); rtl_uString *decoded_subject = NULL; rtl_uriDecode(subject, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8, &decoded_subject); - rtl::OUString ou_subject(decoded_subject); + OUString ou_subject(decoded_subject); pMapiMessage->lpszSubject = strdup(OUStringToOString(ou_subject, osl_getThreadTextEncoding(), RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK).getStr()); } catch (...) { diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index 55445ad32f7a..9db17ce8347c 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -49,25 +49,25 @@ using css::system::XSimpleMailMessage; using css::system::SimpleMailClientFlags::NO_USER_INTERFACE; using css::system::SimpleMailClientFlags::NO_LOGON_DIALOG; -typedef std::vector StringList_t; +typedef std::vector StringList_t; -const rtl::OUString TO("--to"); -const rtl::OUString CC("--cc"); -const rtl::OUString BCC("--bcc"); -const rtl::OUString FROM("--from"); -const rtl::OUString SUBJECT("--subject"); -const rtl::OUString ATTACH("--attach"); -const rtl::OUString FLAG_MAPI_DIALOG("--mapi-dialog"); -const rtl::OUString FLAG_MAPI_LOGON_UI("--mapi-logon-ui"); +const OUString TO("--to"); +const OUString CC("--cc"); +const OUString BCC("--bcc"); +const OUString FROM("--from"); +const OUString SUBJECT("--subject"); +const OUString ATTACH("--attach"); +const OUString FLAG_MAPI_DIALOG("--mapi-dialog"); +const OUString FLAG_MAPI_LOGON_UI("--mapi-logon-ui"); namespace /* private */ { /** @internal look if an alternative program is configured which should be used as senddoc executable */ - rtl::OUString getAlternativeSenddocUrl() + OUString getAlternativeSenddocUrl() { - rtl::OUString altSenddocUrl; + OUString altSenddocUrl; HKEY hkey; LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\LibreOffice\\SendAsEMailClient", &hkey); if (lret == ERROR_SUCCESS) @@ -91,13 +91,13 @@ namespace /* private */ the absolute file Url of the senddoc executable. In case of an error an empty string will be returned. */ - rtl::OUString getSenddocUrl() + OUString getSenddocUrl() { - rtl::OUString senddocUrl = getAlternativeSenddocUrl(); + OUString senddocUrl = getAlternativeSenddocUrl(); if (senddocUrl.getLength() == 0) { - senddocUrl = rtl::OUString( "$BRAND_BASE_DIR/program/senddoc.exe"); + senddocUrl = OUString( "$BRAND_BASE_DIR/program/senddoc.exe"); rtl::Bootstrap::expandMacros(senddocUrl); //TODO: detect failure } return senddocUrl; @@ -114,7 +114,7 @@ namespace /* private */ */ bool executeSenddoc(const StringList_t& rCommandArgs) { - rtl::OUString senddocUrl = getSenddocUrl(); + OUString senddocUrl = getSenddocUrl(); if (senddocUrl.getLength() == 0) return false; @@ -122,7 +122,7 @@ namespace /* private */ oslProcessError err = osl_Process_E_Unknown; /* for efficiency reasons we are using a 'bad' cast here - as a vector or rtl::OUStrings is nothing else than + as a vector or OUStrings is nothing else than an array of pointers to rtl_uString's */ err = osl_executeProcess( senddocUrl.pData, @@ -175,49 +175,49 @@ void CSmplMailClient::assembleCommandLine( { OSL_ENSURE(rCommandArgs.empty(), "Provided command argument buffer not empty"); - rtl::OUString to = xSimpleMailMessage->getRecipient(); + OUString to = xSimpleMailMessage->getRecipient(); if (to.getLength() > 0) { rCommandArgs.push_back(TO); rCommandArgs.push_back(to); } - Sequence ccRecipients = xSimpleMailMessage->getCcRecipient(); + Sequence ccRecipients = xSimpleMailMessage->getCcRecipient(); for (int i = 0; i < ccRecipients.getLength(); i++) { rCommandArgs.push_back(CC); rCommandArgs.push_back(ccRecipients[i]); } - Sequence bccRecipients = xSimpleMailMessage->getBccRecipient(); + Sequence bccRecipients = xSimpleMailMessage->getBccRecipient(); for (int i = 0; i < bccRecipients.getLength(); i++) { rCommandArgs.push_back(BCC); rCommandArgs.push_back(bccRecipients[i]); } - rtl::OUString from = xSimpleMailMessage->getOriginator(); + OUString from = xSimpleMailMessage->getOriginator(); if (from.getLength() > 0) { rCommandArgs.push_back(FROM); rCommandArgs.push_back(from); } - rtl::OUString subject = xSimpleMailMessage->getSubject(); + OUString subject = xSimpleMailMessage->getSubject(); if (subject.getLength() > 0) { rCommandArgs.push_back(SUBJECT); rCommandArgs.push_back(subject); } - Sequence attachments = xSimpleMailMessage->getAttachement(); + Sequence attachments = xSimpleMailMessage->getAttachement(); for (int i = 0; i < attachments.getLength(); i++) { - rtl::OUString sysPath; + OUString sysPath; osl::FileBase::RC err = osl::FileBase::getSystemPathFromFileURL(attachments[i], sysPath); if (err != osl::FileBase::E_None) throw IllegalArgumentException( - rtl::OUString("Invalid attachment file URL"), + OUString("Invalid attachment file URL"), static_cast(this), 1); @@ -243,7 +243,7 @@ void SAL_CALL CSmplMailClient::sendSimpleMailMessage( if (!executeSenddoc(senddocParams)) throw Exception( - rtl::OUString("Send email failed"), + OUString("Send email failed"), static_cast(this)); } @@ -252,7 +252,7 @@ void CSmplMailClient::validateParameter( { if (!xSimpleMailMessage.is()) throw IllegalArgumentException( - rtl::OUString("Empty mail message reference"), + OUString("Empty mail message reference"), static_cast(this), 1); @@ -261,14 +261,14 @@ void CSmplMailClient::validateParameter( // check the flags, the allowed range is 0 - (2^n - 1) if (aFlag < 0 || aFlag > 3) throw IllegalArgumentException( - rtl::OUString("Invalid flag value"), + OUString("Invalid flag value"), static_cast(this), 2); // check if a recipient is specified of the flags NO_USER_INTERFACE is specified if ((aFlag & NO_USER_INTERFACE) && !xSimpleMailMessage->getRecipient().getLength()) throw IllegalArgumentException( - rtl::OUString("No recipient specified"), + OUString("No recipient specified"), static_cast(this), 1); } diff --git a/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx index 58214bcf5878..c9020678b30d 100644 --- a/shell/source/win32/simplemail/smplmailclient.hxx +++ b/shell/source/win32/simplemail/smplmailclient.hxx @@ -36,7 +36,7 @@ public: private: void validateParameter(const css::uno::Reference& xSimpleMailMessage, sal_Int32 aFlag); - void assembleCommandLine(const css::uno::Reference& xSimpleMailMessage, sal_Int32 aFlag, std::vector& rCommandArgs); + void assembleCommandLine(const css::uno::Reference& xSimpleMailMessage, sal_Int32 aFlag, std::vector& rCommandArgs); }; #endif diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx index d5f23844a055..bae8bec90db7 100644 --- a/shell/source/win32/simplemail/smplmailmsg.cxx +++ b/shell/source/win32/simplemail/smplmailmsg.cxx @@ -31,7 +31,6 @@ using com::sun::star::uno::RuntimeException; using com::sun::star::uno::Sequence; using com::sun::star::lang::XServiceInfo; using com::sun::star::lang::IllegalArgumentException; -using rtl::OUString; using osl::Mutex; using namespace cppu; @@ -46,7 +45,7 @@ CSmplMailMsg::CSmplMailMsg( ) //------------------------------------------------ -void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) +void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient ) throw (RuntimeException) { m_aRecipient = aRecipient; @@ -54,7 +53,7 @@ void SAL_CALL CSmplMailMsg::setRecipient( const ::rtl::OUString& aRecipient ) //------------------------------------------------ -::rtl::OUString SAL_CALL CSmplMailMsg::getRecipient( ) +OUString SAL_CALL CSmplMailMsg::getRecipient( ) throw (RuntimeException) { return m_aRecipient; @@ -126,7 +125,7 @@ OUString SAL_CALL CSmplMailMsg::getSubject( ) //------------------------------------------------ -void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< ::rtl::OUString >& aAttachement ) +void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttachement ) throw (IllegalArgumentException, RuntimeException) { m_Attachements = aAttachement; diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx index addaab07adff..76e3822a6a32 100644 --- a/shell/source/win32/simplemail/smplmailmsg.hxx +++ b/shell/source/win32/simplemail/smplmailmsg.hxx @@ -38,59 +38,59 @@ public: //------------------------------------------------ - virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient ) + virtual void SAL_CALL setRecipient( const OUString& aRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRecipient( ) + virtual OUString SAL_CALL getRecipient( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient ) + virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< OUString >& aCcRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCcRecipient( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCcRecipient( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient ) + virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< OUString >& aBccRecipient ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getBccRecipient( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getBccRecipient( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator ) + virtual void SAL_CALL setOriginator( const OUString& aOriginator ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOriginator( ) + virtual OUString SAL_CALL getOriginator( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject ) + virtual void SAL_CALL setSubject( const OUString& aSubject ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubject( ) + virtual OUString SAL_CALL getSubject( ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ - virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement ) + virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< OUString >& aAttachement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAttachement( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAttachement( ) throw (::com::sun::star::uno::RuntimeException); private: - rtl::OUString m_aRecipient; - rtl::OUString m_aOriginator; - rtl::OUString m_aSubject; - com::sun::star::uno::Sequence< rtl::OUString > m_CcRecipients; - com::sun::star::uno::Sequence< rtl::OUString > m_BccRecipients; - com::sun::star::uno::Sequence< rtl::OUString > m_Attachements; + OUString m_aRecipient; + OUString m_aOriginator; + OUString m_aSubject; + com::sun::star::uno::Sequence< OUString > m_CcRecipients; + com::sun::star::uno::Sequence< OUString > m_BccRecipients; + com::sun::star::uno::Sequence< OUString > m_Attachements; }; #endif diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx index 3dc241a911be..76ba6c0dabc4 100644 --- a/shell/source/win32/simplemail/smplmailsuppl.cxx +++ b/shell/source/win32/simplemail/smplmailsuppl.cxx @@ -27,7 +27,6 @@ using com::sun::star::uno::Sequence; using com::sun::star::lang::XServiceInfo; using com::sun::star::system::XSimpleMailClientSupplier; using com::sun::star::system::XSimpleMailClient; -using rtl::OUString; using osl::Mutex; using namespace cppu; diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx b/shell/source/win32/simplemail/smplmailsuppl.hxx index ca88982547c1..557c01d78e53 100644 --- a/shell/source/win32/simplemail/smplmailsuppl.hxx +++ b/shell/source/win32/simplemail/smplmailsuppl.hxx @@ -50,13 +50,13 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 61e89896176c..3c12fee17ad4 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -113,7 +113,7 @@ typedef cppu::WeakComponentImplHelper1 OGLTransitione class TimerContext { public: - explicit TimerContext(rtl::OUString const& rWhat) + explicit TimerContext(OUString const& rWhat) : m_aWhat(rWhat) , m_aStartTime(microsec_clock::local_time()) { @@ -124,7 +124,7 @@ public: SAL_INFO("slideshow.opengl", m_aWhat << " took: " << aDuration); } private: - rtl::OUString const m_aWhat; + OUString const m_aWhat; ptime const m_aStartTime; }; #endif @@ -643,7 +643,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta uno::Sequence< uno::Any > aDeviceParams; ::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams ); - ::rtl::OUString aImplName; + OUString aImplName; aDeviceParams[ 0 ] >>= aImplName; sal_Int64 aVal = 0; diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx index f14af9ac918c..36a96cba97cb 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx @@ -553,7 +553,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta uno::Sequence< uno::Any > aDeviceParams; ::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams ); - ::rtl::OUString aImplName; + OUString aImplName; aDeviceParams[ 0 ] >>= aImplName; sal_Int64 aVal = 0; diff --git a/slideshow/source/engine/activities/accumulation.hxx b/slideshow/source/engine/activities/accumulation.hxx index 5ef4ebead50a..92e4f1564421 100644 --- a/slideshow/source/engine/activities/accumulation.hxx +++ b/slideshow/source/engine/activities/accumulation.hxx @@ -61,9 +61,9 @@ namespace slideshow } /// Specialization for non-addable strings - template<> ::rtl::OUString accumulate< ::rtl::OUString >( const ::rtl::OUString&, + template<> OUString accumulate< OUString >( const OUString&, sal_uInt32, - const ::rtl::OUString& rCurrValue ) + const OUString& rCurrValue ) { // always return rCurrValue, it's impossible to add strings... return rCurrValue; diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 18afdf7e1b6d..2354e51d9b0a 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -691,7 +691,7 @@ AnimationActivitySharedPtr createActivity( rParms.mbAutoReverse ); // is a formula given? - const ::rtl::OUString& rFormulaString( xNode->getFormula() ); + const OUString& rFormulaString( xNode->getFormula() ); if( !rFormulaString.isEmpty() ) { // yep, parse and pass to ActivityParameters diff --git a/slideshow/source/engine/activities/interpolation.hxx b/slideshow/source/engine/activities/interpolation.hxx index e5232653ec56..cd4255d40548 100644 --- a/slideshow/source/engine/activities/interpolation.hxx +++ b/slideshow/source/engine/activities/interpolation.hxx @@ -52,11 +52,11 @@ namespace basegfx } /// Specialization also for string, although this code should not be called - template<> ::rtl::OUString lerp< ::rtl::OUString >( const ::rtl::OUString&, - const ::rtl::OUString& rTo, + template<> OUString lerp< OUString >( const OUString&, + const OUString& rTo, double ) { - OSL_FAIL( "lerp<::rtl::OUString> called" ); + OSL_FAIL( "lerp called" ); return rTo; } @@ -151,9 +151,9 @@ namespace slideshow } /// Specialization for non-interpolatable strings - template<> ::rtl::OUString lerp< ::rtl::OUString >( const Interpolator< ::rtl::OUString >& /*rInterpolator*/, - const ::rtl::OUString& rFrom, - const ::rtl::OUString& rTo, + template<> OUString lerp< OUString >( const Interpolator< OUString >& /*rInterpolator*/, + const OUString& rFrom, + const OUString& rTo, sal_uInt32 nFrame, ::std::size_t nTotalFrames ) { diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index ba50b7d02a64..7a3c215a4738 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -63,7 +63,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -131,7 +131,7 @@ namespace slideshow // since this will also capture segmentation // violations and the like. In such a case, we // still better let our clients now... - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 072f2b47586a..8f443059e3b1 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -208,7 +208,7 @@ namespace slideshow class PathAnimation : public NumberAnimation { public: - PathAnimation( const ::rtl::OUString& rSVGDPath, + PathAnimation( const OUString& rSVGDPath, sal_Int16 nAdditive, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, @@ -656,7 +656,7 @@ namespace slideshow uno::Any getShapeDefault( const AnimatableShapeSharedPtr& rShape, - const ::rtl::OUString& rPropertyName ) + const OUString& rPropertyName ) { uno::Reference< drawing::XShape > xShape( rShape->getXShape() ); @@ -675,7 +675,7 @@ namespace slideshow } template< typename ValueType > ValueType getDefault( const AnimatableShapeSharedPtr& rShape, - const ::rtl::OUString& rPropertyName ) + const OUString& rPropertyName ) { const uno::Any& rAny( getShapeDefault( rShape, rPropertyName ) ); @@ -684,7 +684,7 @@ namespace slideshow { OSL_FAIL( "getDefault(): cannot get requested shape property" ); OSL_TRACE( "getDefault(): cannot get '%s' shape property", - ::rtl::OUStringToOString( rPropertyName, + OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return ValueType(); } @@ -696,7 +696,7 @@ namespace slideshow { OSL_FAIL( "getDefault(): cannot extract requested shape property" ); OSL_TRACE( "getDefault(): cannot extract '%s' shape property", - ::rtl::OUStringToOString( rPropertyName, + OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return ValueType(); } @@ -706,7 +706,7 @@ namespace slideshow } template<> RGBColor getDefault< RGBColor >( const AnimatableShapeSharedPtr& rShape, - const ::rtl::OUString& rPropertyName ) + const OUString& rPropertyName ) { const uno::Any& rAny( getShapeDefault( rShape, rPropertyName ) ); @@ -715,7 +715,7 @@ namespace slideshow { OSL_FAIL( "getDefault(): cannot get requested shape color property" ); OSL_TRACE( "getDefault(): cannot get '%s' shape color property", - ::rtl::OUStringToOString( rPropertyName, + OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return RGBColor(); } @@ -727,7 +727,7 @@ namespace slideshow { OSL_FAIL( "getDefault(): cannot extract requested shape color property" ); OSL_TRACE( "getDefault(): cannot extract '%s' shape color property", - ::rtl::OUStringToOString( rPropertyName, + OUStringToOString( rPropertyName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return RGBColor(); } @@ -739,7 +739,7 @@ namespace slideshow } } - AnimationFactory::AttributeClass AnimationFactory::classifyAttributeName( const ::rtl::OUString& rAttrName ) + AnimationFactory::AttributeClass AnimationFactory::classifyAttributeName( const OUString& rAttrName ) { // ATTENTION: When changing this map, also the create*PropertyAnimation() methods must // be checked and possibly adapted in their switch statements @@ -804,7 +804,7 @@ namespace slideshow } } - NumberAnimationSharedPtr AnimationFactory::createNumberPropertyAnimation( const ::rtl::OUString& rAttrName, + NumberAnimationSharedPtr AnimationFactory::createNumberPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, @@ -968,7 +968,7 @@ namespace slideshow return NumberAnimationSharedPtr(); } - EnumAnimationSharedPtr AnimationFactory::createEnumPropertyAnimation( const ::rtl::OUString& rAttrName, + EnumAnimationSharedPtr AnimationFactory::createEnumPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, @@ -1064,7 +1064,7 @@ namespace slideshow return EnumAnimationSharedPtr(); } - ColorAnimationSharedPtr AnimationFactory::createColorPropertyAnimation( const ::rtl::OUString& rAttrName, + ColorAnimationSharedPtr AnimationFactory::createColorPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, @@ -1216,7 +1216,7 @@ namespace slideshow return PairAnimationSharedPtr(); } - StringAnimationSharedPtr AnimationFactory::createStringPropertyAnimation( const ::rtl::OUString& rAttrName, + StringAnimationSharedPtr AnimationFactory::createStringPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, @@ -1282,7 +1282,7 @@ namespace slideshow return makeGenericAnimation( rShapeManager, nFlags, &ShapeAttributeLayer::isFontFamilyValid, - getDefault< ::rtl::OUString >( rShape, rAttrName ), + getDefault< OUString >( rShape, rAttrName ), &ShapeAttributeLayer::getFontFamily, &ShapeAttributeLayer::setFontFamily ); } @@ -1290,7 +1290,7 @@ namespace slideshow return StringAnimationSharedPtr(); } - BoolAnimationSharedPtr AnimationFactory::createBoolPropertyAnimation( const ::rtl::OUString& rAttrName, + BoolAnimationSharedPtr AnimationFactory::createBoolPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& /*rShape*/, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& /*rSlideSize*/, @@ -1365,7 +1365,7 @@ namespace slideshow return BoolAnimationSharedPtr(); } - NumberAnimationSharedPtr AnimationFactory::createPathMotionAnimation( const ::rtl::OUString& rSVGDPath, + NumberAnimationSharedPtr AnimationFactory::createPathMotionAnimation( const OUString& rSVGDPath, sal_Int16 nAdditive, const AnimatableShapeSharedPtr& /*rShape*/, const ShapeManagerSharedPtr& rShapeManager, diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx index fe130d7f1f0d..76723968ad4f 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.hxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx @@ -56,7 +56,7 @@ private: private: ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio > mxAudioNode; - ::rtl::OUString maSoundURL; + OUString maSoundURL; mutable SoundPlayerSharedPtr mpPlayer; void createPlayer() const; diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index 83db50909500..fe0c804e4925 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -212,7 +212,7 @@ bool AnimationBaseNode::init_st() mpActivity = createActivity(); } catch (uno::Exception const&) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString(cppu::getCaughtException()), RTL_TEXTENCODING_UTF8).getStr() ); // catch and ignore. We later handle empty activities, but for diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx index c43547f086d0..8d77a9be9a90 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx @@ -36,7 +36,7 @@ void AnimationPathMotionNode::dispose() AnimationActivitySharedPtr AnimationPathMotionNode::createActivity() const { - rtl::OUString aString; + OUString aString; ENSURE_OR_THROW( (mxPathMotionNode->getPath() >>= aString), "no string-based SVG:d path found" ); diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx b/slideshow/source/engine/animationnodes/animationsetnode.cxx index bf4c474b6c8f..2b1230a6e649 100644 --- a/slideshow/source/engine/animationnodes/animationsetnode.cxx +++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx @@ -44,7 +44,7 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const { ActivitiesFactory::CommonParameters aParms( fillCommonParameters() ); uno::Reference const xAnimateNode = getXAnimateNode(); - rtl::OUString const attrName( xAnimateNode->getAttributeName() ); + OUString const attrName( xAnimateNode->getAttributeName() ); AttributableShapeSharedPtr const pShape( getShape() ); // make deactivation a two-step procedure. Normally, we diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index 4ea1d9b8c220..966ce7fbdfaf 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -69,7 +69,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString("Rotate"), + OUString("Rotate"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), @@ -79,7 +79,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString("SkewX"), + OUString("SkewX"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), @@ -89,7 +89,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString("SkewY"), + OUString("SkewY"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index b803b441a39f..570401b04818 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -249,7 +249,7 @@ bool isMainSequenceRootNode_( // detect main sequence root node (need that for // end-of-mainsequence signalling below) beans::NamedValue const aSearchKey( - rtl::OUString( "node-type" ), + OUString( "node-type" ), uno::makeAny( presentation::EffectNodeType::MAIN_SEQUENCE ) ); uno::Sequence const userData(xNode->getUserData()); @@ -717,13 +717,13 @@ void BaseNode::showState() const uno::UNO_QUERY ); // read shape name - ::rtl::OUString aName; + OUString aName; if( (xPropSet->getPropertyValue( - ::rtl::OUString("Name") ) + OUString("Name") ) >>= aName) ) { - const ::rtl::OString& rAsciiName( - ::rtl::OUStringToOString( aName, + const OString& rAsciiName( + OUStringToOString( aName, RTL_TEXTENCODING_ASCII_US ) ); VERBOSE_TRACE( "Node info: n0x%X, name \"%s\"", diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx index 05e6dc2343f9..c589d73eb080 100644 --- a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx +++ b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx @@ -35,7 +35,7 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const // Create AnimationActivity from common XAnimate parameters: ActivitiesFactory::CommonParameters aParms( fillCommonParameters() ); uno::Reference const& xAnimateNode =getXAnimateNode(); - rtl::OUString const attrName( xAnimateNode->getAttributeName() ); + OUString const attrName( xAnimateNode->getAttributeName() ); AttributableShapeSharedPtr const pShape( getShape() ); switch (AnimationFactory::classifyAttributeName( attrName )) { diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx index fa8bdeb3c955..9bcf37d3d7ae 100644 --- a/slideshow/source/engine/attributemap.cxx +++ b/slideshow/source/engine/attributemap.cxx @@ -32,7 +32,7 @@ namespace slideshow { typedef ::canvas::tools::ValueMap< AttributeType > AnimateAttributeMap; - AttributeType mapAttributeName( const ::rtl::OUString& rAttrName ) + AttributeType mapAttributeName( const OUString& rAttrName ) { /** Maps attribute name to AttributeType enum. @@ -80,7 +80,7 @@ namespace slideshow eAttributeType ) ) { OSL_TRACE( "mapAttributeName(): attribute name %s not found in map.", - ::rtl::OUStringToOString( rAttrName, + OUStringToOString( rAttrName, RTL_TEXTENCODING_ASCII_US ).getStr() ); return ATTRIBUTE_INVALID; } diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index d97290c4253a..67625937317b 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -1235,7 +1235,7 @@ bool EventMultiplexer::notifyViewClobbered( } bool EventMultiplexer::notifyHyperlinkClicked( - rtl::OUString const& hyperLink ) + OUString const& hyperLink ) { return mpImpl->maHyperlinkHandlers.apply( boost::bind(&HyperlinkHandler::handleHyperlink, diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 0967d29c1e28..59efda2c9001 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -78,7 +78,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -244,7 +244,7 @@ namespace slideshow // since this will also capture segmentation // violations and the like. In such a case, we // still better let our clients now... - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 76efb42046c4..44e03051fd00 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -184,7 +184,7 @@ RehearseTimingsActivity::~RehearseTimingsActivity() } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -424,7 +424,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) // build timer string: const sal_Int32 nTimeSecs = static_cast(maElapsedTime.getElapsedTime()); - rtl::OUStringBuffer buf; + OUStringBuffer buf; sal_Int32 n = (nTimeSecs / 3600); if (n < 10) buf.append( static_cast('0') ); @@ -439,7 +439,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas ) if (n < 10) buf.append( static_cast('0') ); buf.append( n ); - const rtl::OUString time = buf.makeStringAndClear(); + const OUString time = buf.makeStringAndClear(); // create the MetaFile: GDIMetaFile metaFile; diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx index fe2073540093..8352d5a74551 100644 --- a/slideshow/source/engine/shapeattributelayer.cxx +++ b/slideshow/source/engine/shapeattributelayer.cxx @@ -727,7 +727,7 @@ namespace slideshow return mbFontFamilyValid ? true : haveChild() ? mpChild->isFontFamilyValid() : false; } - ::rtl::OUString ShapeAttributeLayer::getFontFamily() const + OUString ShapeAttributeLayer::getFontFamily() const { // mnAdditiveMode is ignored, cannot combine strings in // any sensible way @@ -736,10 +736,10 @@ namespace slideshow else if( haveChild() ) return mpChild->getFontFamily(); else - return ::rtl::OUString(); + return OUString(); } - void ShapeAttributeLayer::setFontFamily( const ::rtl::OUString& rName ) + void ShapeAttributeLayer::setFontFamily( const OUString& rName ) { maFontFamily = rName; mbFontFamilyValid = true; diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index fbd3befccea7..57506f1da921 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -74,7 +74,7 @@ namespace slideshow AppletShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, double nPrio, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; @@ -102,7 +102,7 @@ namespace slideshow virtual bool implIsIntrinsicAnimationPlaying() const; virtual void implSetIntrinsicAnimationTime(double); - const ::rtl::OUString maServiceName; + const OUString maServiceName; const char** mpPropCopyTable; const sal_Size mnNumPropEntries; @@ -114,7 +114,7 @@ namespace slideshow AppletShape::AppletShape( const uno::Reference< drawing::XShape >& xShape, double nPrio, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const SlideShowContext& rContext ) : @@ -301,7 +301,7 @@ namespace slideshow boost::shared_ptr createAppletShape( const uno::Reference< drawing::XShape >& xShape, double nPrio, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const SlideShowContext& rContext ) diff --git a/slideshow/source/engine/shapes/appletshape.hxx b/slideshow/source/engine/shapes/appletshape.hxx index fe9117b8c109..6001f07c5368 100644 --- a/slideshow/source/engine/shapes/appletshape.hxx +++ b/slideshow/source/engine/shapes/appletshape.hxx @@ -42,7 +42,7 @@ namespace slideshow const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, double nPrio, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const SlideShowContext& rContext ); diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index 355892abf130..1fe56fc68625 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -154,8 +154,8 @@ namespace slideshow sal_Int32 nDocWidth=0; sal_Int32 nDocHeight=0; - xPropSet->getPropertyValue( ::rtl::OUString("Width") ) >>= nDocWidth; - xPropSet->getPropertyValue( ::rtl::OUString("Height") ) >>= nDocHeight; + xPropSet->getPropertyValue( OUString("Width") ) >>= nDocWidth; + xPropSet->getPropertyValue( OUString("Height") ) >>= nDocHeight; mpMtf = pMtf; maBounds = ::basegfx::B2DRectangle( 0,0,nDocWidth, nDocHeight ); diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 1d8ef74dcd1b..044e81cd22c1 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -958,7 +958,7 @@ boost::shared_ptr createDrawingLayerAnimActivity( catch( uno::Exception& ) { // translate any error into empty factory product. - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 79c6d4ab672c..ace22211aefd 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -621,7 +621,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -940,7 +940,7 @@ namespace slideshow maHyperlinkRegions.push_back( HyperlinkRegion( basegfx::B2DRectangle(), - rtl::OUString( + OUString( reinterpret_cast( pAct->GetData()), pAct->GetDataSize() / sizeof(sal_Unicode) ) diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 59a22b1fb75f..ddb5ee46397d 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -81,7 +81,7 @@ namespace slideshow // skip comment if not a special XTEXT... comment if( pAct->GetComment().matchIgnoreAsciiCase( - rtl::OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")), + OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")), 0) ) { // fill classification vector with NOOPs, @@ -161,7 +161,7 @@ namespace slideshow { MetaTextAction* pText = static_cast(pCurrAct); VERBOSE_TRACE( "Shape text \"%s\" at action #%d", - rtl::OUStringToOString(pText->GetText(), + OUStringToOString(pText->GetText(), RTL_TEXTENCODING_ISO_8859_1).getStr(), nActionIndex ); } diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 136fc46a8a99..d6375a9e1cdf 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -112,7 +112,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 83eff701e6eb..9850f3e3a546 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -451,7 +451,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect, static_cast(pCurrAct); // skip comment if not a special XTEXT... comment if( pAct->GetComment().matchIgnoreAsciiCase( - rtl::OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")), + OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")), 0) ) { if (pAct->GetComment().equalsIgnoreAsciiCaseL( diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index 1aef0501601a..a24d18e4b4b5 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -77,7 +77,7 @@ bool importShapeGraphic( GraphicObject & o_rGraphic, uno::Reference const& xPropSet ) { - rtl::OUString aURL; + OUString aURL; if( !getPropertyValue( aURL, xPropSet, "GraphicURL") || aURL.isEmpty() ) { @@ -85,7 +85,7 @@ bool importShapeGraphic( return false; } - rtl::OUString const aVndUrl( + OUString const aVndUrl( "vnd.sun.star.GraphicObject:" ); sal_Int32 nIndex( aURL.indexOf( aVndUrl ) ); @@ -103,7 +103,7 @@ bool importShapeGraphic( // unique ID string found in URL, extract // to separate string - rtl::OUString const aUniqueId( + OUString const aUniqueId( aURL.copy( nIndex, aURL.getLength() - nIndex ) ); // TODO(T2): Creating a GraphicObject is not @@ -111,7 +111,7 @@ bool importShapeGraphic( // unguarded internal singleton mpGlobalMgr) // fetch already loaded graphic from graphic manager. - rtl::OString const aOldString(rtl::OUStringToOString(aUniqueId, + OString const aOldString(OUStringToOString(aUniqueId, RTL_TEXTENCODING_UTF8)); o_rGraphic = GraphicObject( aOldString ); @@ -280,7 +280,7 @@ bool ShapeOfGroup::isBackgroundDetached() const ShapeSharedPtr ShapeImporter::createShape( uno::Reference const& xCurrShape, uno::Reference const& xPropSet, - rtl::OUString const& shapeType ) const + OUString const& shapeType ) const { if( shapeType == "com.sun.star.drawing.MediaShape" || shapeType == "com.sun.star.presentation.MediaShape" ) { @@ -302,7 +302,7 @@ ShapeSharedPtr ShapeImporter::createShape( // (Netscape)Plugin shape. This is a special object return createAppletShape( xCurrShape, mnAscendingPrio, - ::rtl::OUString( "com.sun.star.comp.sfx2.PluginObject" ), + OUString( "com.sun.star.comp.sfx2.PluginObject" ), aPropertyValues, SAL_N_ELEMENTS(aPropertyValues), mrContext ); @@ -322,7 +322,7 @@ ShapeSharedPtr ShapeImporter::createShape( // (Java)Applet shape. This is a special object return createAppletShape( xCurrShape, mnAscendingPrio, - ::rtl::OUString( "com.sun.star.comp.sfx2.AppletObject" ), + OUString( "com.sun.star.comp.sfx2.AppletObject" ), aPropertyValues, SAL_N_ELEMENTS(aPropertyValues), mrContext ); @@ -436,7 +436,7 @@ ShapeSharedPtr ShapeImporter::createShape( bool ShapeImporter::isSkip( uno::Reference const& xPropSet, - rtl::OUString const& shapeType, + OUString const& shapeType, uno::Reference< drawing::XLayer> const& xLayer ) { // skip empty presentation objects: @@ -452,10 +452,10 @@ bool ShapeImporter::isSkip( //skip shapes which corresponds to annotations if(xLayer.is()) { - rtl::OUString layerName; + OUString layerName; uno::Reference xPropLayerSet( xLayer, uno::UNO_QUERY ); - const uno::Any& a(xPropLayerSet->getPropertyValue(rtl::OUString("Name")) ); + const uno::Any& a(xPropLayerSet->getPropertyValue(OUString("Name")) ); bool const bRet = (a >>= layerName); if(bRet) { @@ -574,7 +574,7 @@ ShapeSharedPtr ShapeImporter::importShape() // throw (ShapeLoadFailedException) xDrawnInSlideshow = xLayerManager->getLayerForShape(xCurrShape); } - rtl::OUString const shapeType( xCurrShape->getShapeType()); + OUString const shapeType( xCurrShape->getShapeType()); // is this shape presentation-invisible? if( !isSkip(xPropSet, shapeType, xDrawnInSlideshow) ) diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index d4ee1d2b64d7..0d6dbe0f1109 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -62,7 +62,7 @@ namespace slideshow { ViewAppletShape::ViewAppletShape( const ViewLayerSharedPtr& rViewLayer, const uno::Reference< drawing::XShape >& rxShape, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const uno::Reference< uno::XComponentContext >& rxContext ) : @@ -90,10 +90,10 @@ namespace slideshow uno::UNO_QUERY_THROW ); // copy shape properties to applet viewer - ::rtl::OUString aPropName; + OUString aPropName; for( sal_Size i=0; isetPropertyValue( aPropName, xShapePropSet->getPropertyValue( aPropName )); @@ -110,7 +110,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -139,7 +139,7 @@ namespace slideshow uno::Reference< awt::XWindow2 > xParentWindow( xPropSet->getPropertyValue( - ::rtl::OUString("Window" )), + OUString("Window" )), uno::UNO_QUERY_THROW ); uno::Reference xFactory( @@ -153,7 +153,7 @@ namespace slideshow uno::Reference< awt::XToolkit2 > xToolkit = awt::Toolkit::create(mxComponentContext); awt::WindowDescriptor aOwnWinDescriptor( awt::WindowClass_SIMPLE, - ::rtl::OUString(), + OUString(), uno::Reference< awt::XWindowPeer >(xParentWindow, uno::UNO_QUERY_THROW), 0, @@ -172,7 +172,7 @@ namespace slideshow mxFrame.set( xFactory->createInstanceWithContext( - ::rtl::OUString("com.sun.star.frame.Frame" ), + OUString("com.sun.star.frame.Frame" ), mxComponentContext ), uno::UNO_QUERY_THROW ); diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index 9712243406be..92514d942f36 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -75,7 +75,7 @@ namespace slideshow ViewAppletShape( const ViewLayerSharedPtr& rViewLayer, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const char** pPropCopyTable, sal_Size nNumPropEntries, const ::com::sun::star::uno::Reference< diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index 90562778bc3e..51e3fc3373d6 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -187,7 +187,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 1f8fbacebd94..bf3d6ad66f7e 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -99,7 +99,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -212,7 +212,7 @@ namespace slideshow if( xPropSet.is() && getPropertyValue( xParentWindow, xPropSet, - ::rtl::OUString("Window" )) ) + OUString("Window" )) ) { const awt::Rectangle aRect( xParentWindow->getPosSize() ); @@ -268,7 +268,7 @@ namespace slideshow if( xCanvas.is() ) { uno::Reference< beans::XPropertySet > xPropSet; - ::rtl::OUString aURL; + OUString aURL; try { @@ -278,13 +278,13 @@ namespace slideshow if (xPropSet.is()) { if ((xPropSet->getPropertyValue( - ::rtl::OUString( "PrivateTempFileURL")) >>= aURL) + OUString( "PrivateTempFileURL")) >>= aURL) && !aURL.isEmpty()) { implInitializeMediaPlayer( aURL ); } else if (xPropSet->getPropertyValue( - ::rtl::OUString( "MediaURL")) >>= aURL) + OUString( "MediaURL")) >>= aURL) { implInitializeMediaPlayer( aURL ); } @@ -295,7 +295,7 @@ namespace slideshow if( ::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams ).getLength() > 1 ) { - ::rtl::OUString aImplName; + OUString aImplName; aDeviceParams[ 0 ] >>= aImplName; @@ -323,7 +323,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -346,19 +346,19 @@ namespace slideshow sal_Bool bLoop( false ); getPropertyValue( bLoop, rxProps, - ::rtl::OUString( "Loop" )); + OUString( "Loop" )); mxPlayer->setPlaybackLoop( bLoop ); sal_Bool bMute( false ); getPropertyValue( bMute, rxProps, - ::rtl::OUString( "Mute" )); + OUString( "Mute" )); mxPlayer->setMute( bMute || !mbIsSoundEnabled); sal_Int16 nVolumeDB(0); getPropertyValue( nVolumeDB, rxProps, - ::rtl::OUString( "VolumeDB" )); + OUString( "VolumeDB" )); mxPlayer->setVolumeDB( nVolumeDB ); if( mxPlayerWindow.is() ) @@ -366,7 +366,7 @@ namespace slideshow media::ZoomLevel eZoom(media::ZoomLevel_FIT_TO_WINDOW); getPropertyValue( eZoom, rxProps, - ::rtl::OUString( "Zoom" )); + OUString( "Zoom" )); mxPlayerWindow->setZoomLevel( eZoom ); } } @@ -375,7 +375,7 @@ namespace slideshow // --------------------------------------------------------------------- - void ViewMediaShape::implInitializeMediaPlayer( const ::rtl::OUString& rMediaURL ) + void ViewMediaShape::implInitializeMediaPlayer( const OUString& rMediaURL ) { if( !mxPlayer.is() ) { @@ -394,7 +394,7 @@ namespace slideshow catch( const uno::Exception& ) { throw lang::NoSupportException( - rtl::OUString( "No video support for " ) + rMediaURL, + OUString( "No video support for " ) + rMediaURL, uno::Reference() ); } } @@ -472,7 +472,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -530,7 +530,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index c3dc61f98412..3bf4997d16ef 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -140,7 +140,7 @@ namespace slideshow bool implInitialize( const ::basegfx::B2DRectangle& rBounds ); void implSetMediaProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxProps ); - void implInitializeMediaPlayer( const ::rtl::OUString& rMediaURL ); + void implInitializeMediaPlayer( const OUString& rMediaURL ); bool implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rVCLDeviceParams ); bool implInitializeDXBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds, diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index da2815936b50..50e1b2522243 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -82,7 +82,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index d206a6e9279d..91bdb7bb81ac 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -689,7 +689,7 @@ namespace slideshow { // TODO(E1): Might be superfluous. Nowadays, // addViewLayer swallows all errors, anyway. - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index eb72a582213d..a8d324838bcf 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -137,7 +137,7 @@ bool ShapeManagerImpl::handleMouseReleased( awt::MouseEvent const& e ) // first check for hyperlinks, because these have // highest prio: - rtl::OUString const hyperlink( checkForHyperlink(aPosition) ); + OUString const hyperlink( checkForHyperlink(aPosition) ); if( !hyperlink.isEmpty() ) { mrMultiplexer.notifyHyperlinkClicked(hyperlink); @@ -400,7 +400,7 @@ bool ShapeManagerImpl::cursorChanged( const uno::Reference& x return true; } -rtl::OUString ShapeManagerImpl::checkForHyperlink( basegfx::B2DPoint const& hitPos ) const +OUString ShapeManagerImpl::checkForHyperlink( basegfx::B2DPoint const& hitPos ) const { // find matching region (scan reversely, to coarsely match // paint order): set is ordered by priority @@ -421,7 +421,7 @@ rtl::OUString ShapeManagerImpl::checkForHyperlink( basegfx::B2DPoint const& hitP } } - return rtl::OUString(); + return OUString(); } void ShapeManagerImpl::addIntrinsicAnimationHandler( const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index 6851c1eb8437..b52ab564a847 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -168,7 +168,7 @@ private: sal_Int16 nCursor ); - ::rtl::OUString checkForHyperlink( ::basegfx::B2DPoint const& hitPos )const; + OUString checkForHyperlink( ::basegfx::B2DPoint const& hitPos )const; typedef std::mapcreateInstanceWithContext( - ::rtl::OUString( + OUString( "com.sun.star.animations.TargetPropertiesCreator"), maContext.mxComponentContext ), uno::UNO_QUERY_THROW ); @@ -990,7 +990,7 @@ bool SlideImpl::applyInitialShapeAttributes( catch( uno::Exception& ) { OSL_FAIL( - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString(cppu::getCaughtException()), RTL_TEXTENCODING_UTF8).getStr() ); @@ -1170,7 +1170,7 @@ bool SlideImpl::loadShapes() } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -1212,7 +1212,7 @@ bool SlideImpl::loadShapes() } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -1231,8 +1231,8 @@ basegfx::B2ISize SlideImpl::getSlideSizeImpl() const sal_Int32 nDocWidth = 0; sal_Int32 nDocHeight = 0; - xPropSet->getPropertyValue( ::rtl::OUString("Width") ) >>= nDocWidth; - xPropSet->getPropertyValue( ::rtl::OUString("Height") ) >>= nDocHeight; + xPropSet->getPropertyValue( OUString("Width") ) >>= nDocWidth; + xPropSet->getPropertyValue( OUString("Height") ) >>= nDocHeight; return basegfx::B2ISize( nDocWidth, nDocHeight ); } diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index dd85891474b1..86341488107f 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -528,7 +528,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx index 80ca2c8dd71e..998f4d1c764b 100644 --- a/slideshow/source/engine/slidebitmap.cxx +++ b/slideshow/source/engine/slidebitmap.cxx @@ -86,7 +86,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index c1d0b2a4a765..5ce6a9ba913f 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -269,7 +269,7 @@ public: /** Notification from eventmultiplexer that a hyperlink has been clicked. */ - bool notifyHyperLinkClicked( rtl::OUString const& hyperLink ); + bool notifyHyperLinkClicked( OUString const& hyperLink ); /** Notification from eventmultiplexer that an animation event has occoured. This will be forewarded to all registered XSlideShowListener @@ -545,7 +545,7 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler, } // HyperlinkHandler - virtual bool handleHyperlink( ::rtl::OUString const& rLink ) + virtual bool handleHyperlink( OUString const& rLink ) { return mrShow.notifyHyperLinkClicked(rLink); } @@ -614,7 +614,7 @@ SlideShowImpl::SlideShowImpl( // #i82460# try to retrieve special transition factory mxOptionalTransitionFactory.set( xFactory->createInstanceWithContext( - ::rtl::OUString("com.sun.star.presentation.TransitionFactory" ), + OUString("com.sun.star.presentation.TransitionFactory" ), mxComponentContext ), uno::UNO_QUERY ); } @@ -707,7 +707,7 @@ void SlideShowImpl::stopSlideTransitionSound() SoundPlayerSharedPtr SlideShowImpl::resetSlideTransitionSound( const uno::Any& rSound, bool bLoopSound ) { sal_Bool bStopSound = sal_False; - rtl::OUString url; + OUString url; if( !(rSound >>= bStopSound) ) bStopSound = sal_False; @@ -1055,7 +1055,7 @@ public: } else { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( rProperty.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -1446,17 +1446,17 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult uno::Reference< beans::XPropertySet > xLayerPropSet(xDrawnInSlideshow, uno::UNO_QUERY); //Layer Name which enables to catch annotations - rtl::OUString layerName = rtl::OUString("DrawnInSlideshow"); + OUString layerName = OUString("DrawnInSlideshow"); uno::Any aPropLayer; aPropLayer <<= layerName; - xLayerPropSet->setPropertyValue(rtl::OUString("Name"), aPropLayer); + xLayerPropSet->setPropertyValue(OUString("Name"), aPropLayer); aPropLayer <<= true; - xLayerPropSet->setPropertyValue(rtl::OUString("IsVisible"), aPropLayer); + xLayerPropSet->setPropertyValue(OUString("IsVisible"), aPropLayer); aPropLayer <<= false; - xLayerPropSet->setPropertyValue(rtl::OUString("IsLocked"), aPropLayer); + xLayerPropSet->setPropertyValue(OUString("IsLocked"), aPropLayer); PolygonMap::iterator aIter=maPolygons.begin(); @@ -1488,7 +1488,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult { //create the PolyLineShape uno::Reference< uno::XInterface > polyshape(xDocFactory->createInstance( - rtl::OUString("com.sun.star.drawing.PolyLineShape") ) ); + OUString("com.sun.star.drawing.PolyLineShape") ) ); uno::Reference< drawing::XShape > rPolyShape(polyshape, uno::UNO_QUERY); //Add the shape to the slide @@ -1518,27 +1518,27 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult //Give the built PointSequenceSequence. uno::Any aParam; aParam <<= aRetval; - aXPropSet->setPropertyValue( rtl::OUString("PolyPolygon"), aParam ); + aXPropSet->setPropertyValue( OUString("PolyPolygon"), aParam ); //LineStyle : SOLID by default uno::Any aAny; drawing::LineStyle eLS; eLS = drawing::LineStyle_SOLID; aAny <<= eLS; - aXPropSet->setPropertyValue( rtl::OUString("LineStyle"), aAny ); + aXPropSet->setPropertyValue( OUString("LineStyle"), aAny ); //LineColor sal_uInt32 nLineColor; nLineColor = pPolyPoly->getRGBALineColor(); //Transform polygon color from RRGGBBAA to AARRGGBB aAny <<= RGBAColor2UnoColor(nLineColor); - aXPropSet->setPropertyValue( rtl::OUString("LineColor"), aAny ); + aXPropSet->setPropertyValue( OUString("LineColor"), aAny ); //LineWidth double fLineWidth; fLineWidth = pPolyPoly->getStrokeWidth(); aAny <<= (sal_Int32)fLineWidth; - aXPropSet->setPropertyValue( rtl::OUString("LineWidth"), aAny ); + aXPropSet->setPropertyValue( OUString("LineWidth"), aAny ); // make polygons special xLayerManager->attachShapeToLayer(rPolyShape, xDrawnInSlideshow); @@ -2113,7 +2113,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -2162,7 +2162,7 @@ void queryAutomaticSlideTransition( uno::Reference const& xD if( !xPropSet.is() || !getPropertyValue( nChange, xPropSet, - ::rtl::OUString( + OUString( "Change")) ) { OSL_TRACE( @@ -2175,7 +2175,7 @@ void queryAutomaticSlideTransition( uno::Reference const& xD if( !xPropSet.is() || !getPropertyValue( nAutomaticNextSlideTimeout, xPropSet, - ::rtl::OUString( + OUString( "HighResDuration")) ) { OSL_TRACE( @@ -2338,7 +2338,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse) sal_Bool(bReverse))); } -bool SlideShowImpl::notifyHyperLinkClicked( rtl::OUString const& hyperLink ) +bool SlideShowImpl::notifyHyperLinkClicked( OUString const& hyperLink ) { osl::MutexGuard const guard( m_aMutex ); diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index 446ca70118e2..b466a1ac4d41 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -532,14 +532,14 @@ namespace slideshow #endif } - ExpressionNodeSharedPtr SmilFunctionParser::parseSmilValue( const ::rtl::OUString& rSmilValue, + ExpressionNodeSharedPtr SmilFunctionParser::parseSmilValue( const OUString& rSmilValue, const ::basegfx::B2DRectangle& rRelativeShapeBounds ) { // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiSmilValue( - rtl::OUStringToOString( rSmilValue, RTL_TEXTENCODING_ASCII_US ) ); + const OString& rAsciiSmilValue( + OUStringToOString( rSmilValue, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiSmilValue.getStr() ); StringIteratorT aEnd( rAsciiSmilValue.getStr()+rAsciiSmilValue.getLength() ); @@ -578,14 +578,14 @@ namespace slideshow return pContext->maOperandStack.top(); } - ExpressionNodeSharedPtr SmilFunctionParser::parseSmilFunction( const ::rtl::OUString& rSmilFunction, + ExpressionNodeSharedPtr SmilFunctionParser::parseSmilFunction( const OUString& rSmilFunction, const ::basegfx::B2DRectangle& rRelativeShapeBounds ) { // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiSmilFunction( - rtl::OUStringToOString( rSmilFunction, RTL_TEXTENCODING_ASCII_US ) ); + const OString& rAsciiSmilFunction( + OUStringToOString( rSmilFunction, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiSmilFunction.getStr() ); StringIteratorT aEnd( rAsciiSmilFunction.getStr()+rAsciiSmilFunction.getLength() ); diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index 00b716b13efd..4f0eb6fb2b99 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -48,7 +48,7 @@ namespace slideshow boost::shared_ptr SoundPlayer::create( EventMultiplexer & rEventMultiplexer, - const ::rtl::OUString& rSoundURL, + const OUString& rSoundURL, const uno::Reference< uno::XComponentContext>& rComponentContext ) { boost::shared_ptr pPlayer( @@ -86,7 +86,7 @@ namespace slideshow SoundPlayer::SoundPlayer( EventMultiplexer & rEventMultiplexer, - const ::rtl::OUString& rSoundURL, + const OUString& rSoundURL, const uno::Reference< uno::XComponentContext>& rComponentContext ) : mrEventMultiplexer(rEventMultiplexer), mThis(), @@ -112,7 +112,7 @@ namespace slideshow if( !mxPlayer.is() ) throw lang::NoSupportException( - rtl::OUString( + OUString( "No sound support for ") + rSoundURL, uno::Reference() ); } @@ -124,7 +124,7 @@ namespace slideshow dispose(); } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 5d3c1c01b468..fac4bed6e1f5 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -61,7 +61,7 @@ namespace slideshow class NamedValueStringComparator { public: - NamedValueStringComparator( const ::rtl::OUString& rSearchString ) : + NamedValueStringComparator( const OUString& rSearchString ) : mrSearchString( rSearchString ) { } @@ -72,7 +72,7 @@ namespace slideshow } private: - const ::rtl::OUString& mrSearchString; + const OUString& mrSearchString; }; class NamedValueComparator @@ -164,7 +164,7 @@ namespace slideshow } // try to extract string - ::rtl::OUString aString; + OUString aString; if( !(rSourceAny >>= aString) ) return false; // nothing left to try @@ -323,7 +323,7 @@ namespace slideshow } // try to extract string - ::rtl::OUString aString; + OUString aString; if( !(rSourceAny >>= aString) ) return false; // nothing left to try @@ -373,7 +373,7 @@ namespace slideshow } /// extract plain string from Any - bool extractValue( ::rtl::OUString& o_rValue, + bool extractValue( OUString& o_rValue, const uno::Any& rSourceAny, const ShapeSharedPtr& /*rShape*/, const ::basegfx::B2DVector& /*rSlideBounds*/ ) @@ -402,7 +402,7 @@ namespace slideshow } // try to extract string - ::rtl::OUString aString; + OUString aString; if( !(rSourceAny >>= aString) ) return false; // nothing left to try @@ -745,7 +745,7 @@ namespace slideshow // read bound rect awt::Rectangle aTmpRect; if( !(xPropSet->getPropertyValue( - ::rtl::OUString("BoundRect") ) >>= aTmpRect) ) + OUString("BoundRect") ) >>= aTmpRect) ) { ENSURE_OR_THROW( false, "getAPIShapeBounds(): Could not get \"BoundRect\" property from shape" ); @@ -767,7 +767,7 @@ namespace slideshow // read prio sal_Int32 nPrio(0); if( !(xPropSet->getPropertyValue( - ::rtl::OUString("ZOrder") ) >>= nPrio) ) + OUString("ZOrder") ) >>= nPrio) ) { ENSURE_OR_THROW( false, "getAPIShapePrio(): Could not get \"ZOrder\" property from shape" ); diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 2db843b47390..3eed4b7d7aa2 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -112,7 +112,7 @@ ClippingAnimation::~ClippingAnimation() } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -354,7 +354,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString("Opacity"), + OUString("Opacity"), rShape, rShapeManager, rSlideSize ), diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index 0ded7aa435f1..3155738399e7 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -676,7 +676,7 @@ UserEventQueue::~UserEventQueue() clear(); } catch (uno::Exception &) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index 78eb9d418f6e..01ce9dbf0def 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -137,7 +137,7 @@ void WaitSymbol::viewAdded( const UnoViewSharedPtr& rView ) } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/source/inc/animationfactory.hxx b/slideshow/source/inc/animationfactory.hxx index ee564d1e33ef..aab3cf98d23f 100644 --- a/slideshow/source/inc/animationfactory.hxx +++ b/slideshow/source/inc/animationfactory.hxx @@ -77,7 +77,7 @@ namespace slideshow CLASS_BOOL_PROPERTY }; - static AttributeClass classifyAttributeName( const ::rtl::OUString& rAttrName ); + static AttributeClass classifyAttributeName( const OUString& rAttrName ); /// Collection of flags common to all factory methods enum FactoryFlags @@ -89,19 +89,19 @@ namespace slideshow FLAG_NO_SPRITE = 1 }; - static NumberAnimationSharedPtr createNumberPropertyAnimation( const ::rtl::OUString& rAttrName, + static NumberAnimationSharedPtr createNumberPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, int nFlags=0 ); - static EnumAnimationSharedPtr createEnumPropertyAnimation( const ::rtl::OUString& rAttrName, + static EnumAnimationSharedPtr createEnumPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, int nFlags=0 ); - static ColorAnimationSharedPtr createColorPropertyAnimation( const ::rtl::OUString& rAttrName, + static ColorAnimationSharedPtr createColorPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, @@ -120,19 +120,19 @@ namespace slideshow sal_Int16 nTransformType, int nFlags=0 ); - static StringAnimationSharedPtr createStringPropertyAnimation( const ::rtl::OUString& rAttrName, + static StringAnimationSharedPtr createStringPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, int nFlags=0 ); - static BoolAnimationSharedPtr createBoolPropertyAnimation( const ::rtl::OUString& rAttrName, + static BoolAnimationSharedPtr createBoolPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, int nFlags=0 ); - static NumberAnimationSharedPtr createPathMotionAnimation( const ::rtl::OUString& rSVGDPath, + static NumberAnimationSharedPtr createPathMotionAnimation( const OUString& rSVGDPath, sal_Int16 nAdditive, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, diff --git a/slideshow/source/inc/attributemap.hxx b/slideshow/source/inc/attributemap.hxx index cdad4a24cba7..4bb401acf1ab 100644 --- a/slideshow/source/inc/attributemap.hxx +++ b/slideshow/source/inc/attributemap.hxx @@ -65,7 +65,7 @@ namespace slideshow @returns ATTRIBUTE_INVALID, if name was not found in the mapping table. */ - AttributeType mapAttributeName( const ::rtl::OUString& rAttrName ); + AttributeType mapAttributeName( const OUString& rAttrName ); } } diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx index ba7ac03b904a..00c30df9c727 100644 --- a/slideshow/source/inc/delayevent.hxx +++ b/slideshow/source/inc/delayevent.hxx @@ -37,13 +37,13 @@ public: template Delay( FuncT const& func, double nTimeout - , const ::rtl::OUString& rsDescription + , const OUString& rsDescription ) : Event(rsDescription), mnTimeout(nTimeout), maFunc(func), mbWasFired(false) {} Delay( const boost::function0& func, double nTimeout - , const ::rtl::OUString& rsDescription + , const OUString& rsDescription ) : Event(rsDescription), mnTimeout(nTimeout), maFunc(func), @@ -75,7 +75,7 @@ private: @return generated delay event */ template -inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, rtl::OUString const& rsDescription ) +inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, OUString const& rsDescription ) { return EventSharedPtr( new Delay( func, nTimeout, rsDescription ) ); } @@ -88,7 +88,7 @@ inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, rtl::OUStr @return generated immediate event. */ template -inline EventSharedPtr makeEvent_( FuncT const& func, rtl::OUString const& rsDescription) +inline EventSharedPtr makeEvent_( FuncT const& func, OUString const& rsDescription) { return EventSharedPtr( new Delay( func, 0.0, rsDescription ) ); } @@ -104,7 +104,7 @@ public: template Delay_( FuncT const& func, double nTimeout, char const* from_function, char const* from_file, int from_line, - const ::rtl::OUString& rsDescription) + const OUString& rsDescription) : Delay(func, nTimeout, rsDescription), FROM_FUNCTION(from_function), FROM_FILE(from_file), FROM_LINE(from_line) {} @@ -118,7 +118,7 @@ template inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, char const* from_function, char const* from_file, int from_line, - const ::rtl::OUString& rsDescription) + const OUString& rsDescription) { return EventSharedPtr( new Delay_( func, nTimeout, from_function, from_file, from_line, rsDescription) ); diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx index 44b5bd8d7507..be5db455c7c7 100644 --- a/slideshow/source/inc/event.hxx +++ b/slideshow/source/inc/event.hxx @@ -32,7 +32,7 @@ namespace internal { class Event : public Disposable { public: - Event (const ::rtl::OUString& rsDescription) : msDescription(rsDescription) {} + Event (const OUString& rsDescription) : msDescription(rsDescription) {} /** Execute the event. @@ -64,10 +64,10 @@ public: */ virtual double getActivationTime( double nCurrentTime ) const = 0; - const ::rtl::OUString& GetDescription (void) const { return msDescription; } + const OUString& GetDescription (void) const { return msDescription; } private: - const ::rtl::OUString msDescription; + const OUString msDescription; }; typedef ::boost::shared_ptr< Event > EventSharedPtr; diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx index 394c0d2c92fc..cb75b37f9898 100644 --- a/slideshow/source/inc/eventmultiplexer.hxx +++ b/slideshow/source/inc/eventmultiplexer.hxx @@ -630,7 +630,7 @@ public: anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ - bool notifyHyperlinkClicked( ::rtl::OUString const& hyperLink ); + bool notifyHyperlinkClicked( OUString const& hyperLink ); private: boost::scoped_ptr mpImpl; diff --git a/slideshow/source/inc/hyperlinkarea.hxx b/slideshow/source/inc/hyperlinkarea.hxx index f1f0f36b95a4..acd8d89024f9 100644 --- a/slideshow/source/inc/hyperlinkarea.hxx +++ b/slideshow/source/inc/hyperlinkarea.hxx @@ -46,7 +46,7 @@ namespace slideshow { public: typedef std::pair< ::basegfx::B2DRange, - ::rtl::OUString > HyperlinkRegion; + OUString > HyperlinkRegion; typedef std::vector HyperlinkRegions; diff --git a/slideshow/source/inc/hyperlinkhandler.hxx b/slideshow/source/inc/hyperlinkhandler.hxx index 3971a909788f..25fca7450859 100644 --- a/slideshow/source/inc/hyperlinkhandler.hxx +++ b/slideshow/source/inc/hyperlinkhandler.hxx @@ -49,7 +49,7 @@ namespace slideshow possibly other, less prioritized handlers are called, too. */ - virtual bool handleHyperlink( ::rtl::OUString const& rLink ) = 0; + virtual bool handleHyperlink( OUString const& rLink ) = 0; protected: ~HyperlinkHandler() {} diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index d725255919d7..ac4bf3de9bf7 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -414,10 +414,10 @@ namespace slideshow If there is no unique font family, the font family of the first text of the shape is returned. */ - ::rtl::OUString getFontFamily() const; + OUString getFontFamily() const; /** Set the text font family name globally for the whole shape */ - void setFontFamily( const ::rtl::OUString& rName ); + void setFontFamily( const OUString& rName ); /** Query whether the italic mode attribute is valid */ @@ -481,7 +481,7 @@ namespace slideshow ::basegfx::B2DPoint maPosition; ::basegfx::B2DPolyPolygon maClip; - ::rtl::OUString maFontFamily; + OUString maFontFamily; double mnRotationAngle; double mnShearXAngle; diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx index 08de7138d39d..c3ad90f4ddaf 100644 --- a/slideshow/source/inc/shapeimporter.hxx +++ b/slideshow/source/inc/shapeimporter.hxx @@ -99,7 +99,7 @@ public: private: bool isSkip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> const& xPropSet, - ::rtl::OUString const& shapeType, + OUString const& shapeType, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> const& xLayer); @@ -108,7 +108,7 @@ private: ::com::sun::star::drawing::XShape> const& xCurrShape, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> const& xPropSet, - ::rtl::OUString const& shapeType ) const; + OUString const& shapeType ) const; void importPolygons(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xPropSet) ; diff --git a/slideshow/source/inc/smilfunctionparser.hxx b/slideshow/source/inc/smilfunctionparser.hxx index 1b4973cfa2b0..b29e80513e92 100644 --- a/slideshow/source/inc/smilfunctionparser.hxx +++ b/slideshow/source/inc/smilfunctionparser.hxx @@ -97,7 +97,7 @@ namespace slideshow @return the generated function object. */ - static ExpressionNodeSharedPtr parseSmilValue( const ::rtl::OUString& rSmilValue, + static ExpressionNodeSharedPtr parseSmilValue( const OUString& rSmilValue, const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError /** Parse a string containing a SMIL function. @@ -145,7 +145,7 @@ namespace slideshow @return the generated function object. */ - static ExpressionNodeSharedPtr parseSmilFunction( const ::rtl::OUString& rSmilFunction, + static ExpressionNodeSharedPtr parseSmilFunction( const OUString& rSmilFunction, const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError private: diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx index 6ac359b7349b..8f534f489435 100644 --- a/slideshow/source/inc/soundplayer.hxx +++ b/slideshow/source/inc/soundplayer.hxx @@ -63,7 +63,7 @@ namespace slideshow */ static ::boost::shared_ptr create( EventMultiplexer & rEventMultiplexer, - const ::rtl::OUString& rSoundURL, + const OUString& rSoundURL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rComponentContext ); @@ -92,7 +92,7 @@ namespace slideshow private: SoundPlayer( EventMultiplexer & rEventMultiplexer, - const ::rtl::OUString& rSoundURL, + const OUString& rSoundURL, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rComponentContext ); diff --git a/slideshow/source/inc/stringanimation.hxx b/slideshow/source/inc/stringanimation.hxx index 9a1e7d9a498d..fb1701875ddd 100644 --- a/slideshow/source/inc/stringanimation.hxx +++ b/slideshow/source/inc/stringanimation.hxx @@ -39,7 +39,7 @@ namespace slideshow class StringAnimation : public Animation { public: - typedef ::rtl::OUString ValueType; + typedef OUString ValueType; /** Set the animation to value rStr diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index 9aefb98857b8..d0ee0b751e2f 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -149,7 +149,7 @@ namespace slideshow const basegfx::B2DVector& rSlideBounds ); /// extract plain string from Any - bool extractValue( ::rtl::OUString& o_rValue, + bool extractValue( OUString& o_rValue, const ::com::sun::star::uno::Any& rSourceAny, const boost::shared_ptr& rShape, const basegfx::B2DVector& rSlideBounds ); @@ -310,7 +310,7 @@ namespace slideshow ValueType & rValue, com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet> const & xPropSet, - rtl::OUString const & propName ) + OUString const & propName ) { try { const com::sun::star::uno::Any& a( @@ -319,10 +319,10 @@ namespace slideshow #if OSL_DEBUG_LEVEL > 0 if( !bRet ) OSL_TRACE( "%s: while retrieving property %s, cannot extract Any of type %s\n", - ::rtl::OUStringToOString( propName, + OUStringToOString( propName, RTL_TEXTENCODING_ASCII_US ).getStr(), BOOST_CURRENT_FUNCTION, - ::rtl::OUStringToOString( a.getValueTypeRef()->pTypeName, + OUStringToOString( a.getValueTypeRef()->pTypeName, RTL_TEXTENCODING_ASCII_US ).getStr() ); #endif return bRet; @@ -342,7 +342,7 @@ namespace slideshow com::sun::star::uno::Reference< ValueType >& rIfc, com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet> const & xPropSet, - rtl::OUString const & propName ) + OUString const & propName ) { try { @@ -355,10 +355,10 @@ namespace slideshow #if OSL_DEBUG_LEVEL > 0 if( !bRet ) OSL_TRACE( "%s: while retrieving property %s, cannot extract Any of type %s to interface\n", - ::rtl::OUStringToOString( propName, + OUStringToOString( propName, RTL_TEXTENCODING_ASCII_US ).getStr(), BOOST_CURRENT_FUNCTION, - ::rtl::OUStringToOString( a.getValueTypeRef()->pTypeName, + OUStringToOString( a.getValueTypeRef()->pTypeName, RTL_TEXTENCODING_ASCII_US ).getStr() ); #endif return bRet; diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 11ce065702ff..e7385123df83 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -245,12 +245,12 @@ private: return uno::Reference< beans::XPropertySetInfo >(); } - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& /*aPropertyName*/, + virtual void SAL_CALL setPropertyValue( const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { typedef ::canvas::tools::ValueMap< sal_Int16 > PropMapT; @@ -276,22 +276,22 @@ private: return uno::makeAny(aRes); } - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, + virtual void SAL_CALL addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, + virtual void SAL_CALL removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, + virtual void SAL_CALL addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } @@ -357,7 +357,7 @@ void ChildWindow::init() catch (const uno::Exception &e) { OSL_TRACE( "Exception '%s' thrown\n" , - ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -371,7 +371,7 @@ void ChildWindow::Paint( const Rectangle& /*rRect*/ ) catch (const uno::Exception &e) { OSL_TRACE( "Exception '%s' thrown\n" , - ::rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -410,7 +410,7 @@ DemoWindow::DemoWindow() : maUpdateTimer(), mbSlideDisplayed( false ) { - SetText( rtl::OUString("Slideshow Demo" ) ); + SetText( OUString("Slideshow Demo" ) ); SetSizePixel( Size( 640, 480 ) ); EnablePaint( true ); @@ -449,7 +449,7 @@ void DemoWindow::init() uno::Reference< animations::XAnimationNode >(), uno::Sequence< beans::PropertyValue >() ); mxShow->setProperty( beans::PropertyValue( - rtl::OUString("RehearseTimings"), + OUString("RehearseTimings"), 0, uno::makeAny( sal_True ), beans::PropertyState_DIRECT_VALUE )); @@ -459,7 +459,7 @@ void DemoWindow::init() catch (const uno::Exception &e) { OSL_TRACE( "Exception '%s' thrown\n" , - ::rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -503,7 +503,7 @@ void DemoApp::Main() for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ ) { - ::rtl::OUString aParam = GetCommandLineParam( i ); + OUString aParam = GetCommandLineParam( i ); if( aParam == "--help" || aParam == "-h" ) bHelp = true; @@ -531,7 +531,7 @@ void DemoApp::Main() } catch( uno::Exception& ) { - OSL_FAIL( rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index b25ce129939b..153aa7065014 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -83,10 +83,10 @@ private: } // XShape - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (uno::RuntimeException) + virtual OUString SAL_CALL getShapeType( ) throw (uno::RuntimeException) { CPPUNIT_ASSERT_MESSAGE( "TestShape::getShapeType: unexpected method call", false ); - return ::rtl::OUString(); + return OUString(); } virtual awt::Point SAL_CALL getPosition( ) throw (uno::RuntimeException) diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index 7327f8997c0a..2b24d493634d 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -58,7 +58,7 @@ namespace { struct Result: private boost::noncopyable { osl::Condition condition; bool success; - rtl::OUString result; + OUString result; }; class Listener: @@ -135,22 +135,22 @@ void Test::tearDown() { } void Test::test() { - rtl::OUString doc; + OUString doc; CPPUNIT_ASSERT( test::getTestArgument( - rtl::OUString("smoketest.doc"), &doc)); + OUString("smoketest.doc"), &doc)); css::uno::Sequence< css::beans::PropertyValue > args(2); - args[0].Name = rtl::OUString("MacroExecutionMode"); + args[0].Name = OUString("MacroExecutionMode"); args[0].Handle = -1; args[0].Value <<= com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN; args[0].State = css::beans::PropertyState_DIRECT_VALUE; - args[1].Name = rtl::OUString("ReadOnly"); + args[1].Name = OUString("ReadOnly"); args[1].Handle = -1; args[1].Value <<= sal_True; args[1].State = css::beans::PropertyState_DIRECT_VALUE; css::util::URL url; - url.Complete = rtl::OUString( + url.Complete = OUString( "vnd.sun.star.script:Standard.Global.StartTestWithDefaultOptions?" "language=Basic&location=document"); @@ -162,12 +162,12 @@ void Test::test() { css::uno::Reference< css::frame::XModel >( xDesktop->loadComponentFromURL( test::toAbsoluteFileUrl(doc), - rtl::OUString("_default"), + OUString("_default"), 0, args), css::uno::UNO_QUERY_THROW)->getCurrentController(), css::uno::UNO_SET_THROW)->getFrame(), css::uno::UNO_QUERY_THROW)->queryDispatch( - url, rtl::OUString("_self"), 0), + url, OUString("_self"), 0), css::uno::UNO_QUERY_THROW); Result result; // Shifted to main thread to work around potential deadlocks (i112867): @@ -188,7 +188,7 @@ void Test::test() { CPPUNIT_ASSERT(connection_.isStillAlive()); } CPPUNIT_ASSERT(result.success); - CPPUNIT_ASSERT_EQUAL(rtl::OUString(), result.result); + CPPUNIT_ASSERT_EQUAL(OUString(), result.result); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx index b1b9316afcd3..435dda8d4626 100644 --- a/sot/inc/sot/object.hxx +++ b/sot/inc/sot/object.hxx @@ -57,7 +57,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ + OUString( #ClassName ), ClassName::CreateInstance ); \ } \ return *ppFactory; \ } \ @@ -93,7 +93,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ + OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ } \ return *ppFactory; \ @@ -134,7 +134,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ + OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \ } \ @@ -175,7 +175,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ + OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super3::ClassFactory() ); \ @@ -220,7 +220,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new SotFactory( GlobalName, \ - rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ + OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super3::ClassFactory() ); \ diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx index 61a047650a3c..bd124cc8df00 100644 --- a/sot/inc/sot/stg.hxx +++ b/sot/inc/sot/stg.hxx @@ -113,7 +113,7 @@ public: virtual sal_Bool Revert() = 0; virtual BaseStorageStream* OpenStream( const String & rEleName, StreamMode = STREAM_STD_READWRITE, - sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ) = 0; + sal_Bool bDirect = sal_True, const OString* pKey=0 ) = 0; virtual BaseStorage* OpenStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, bool bDirect = false ) = 0; @@ -213,7 +213,7 @@ public: virtual sal_Bool Revert(); virtual BaseStorageStream* OpenStream( const String & rEleName, StreamMode = STREAM_STD_READWRITE, - sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ); + sal_Bool bDirect = sal_True, const OString* pKey=0 ); virtual BaseStorage* OpenStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, bool bDirect = false ); @@ -249,7 +249,7 @@ protected: ~UCBStorageStream(); public: TYPEINFO(); - UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const rtl::OString* pKey, sal_Bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress ); + UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const OString* pKey, sal_Bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress ); UCBStorageStream( UCBStorageStream_Impl* ); virtual sal_uLong Read( void * pData, sal_uLong nSize ); @@ -329,7 +329,7 @@ public: virtual sal_Bool Revert(); virtual BaseStorageStream* OpenStream( const String & rEleName, StreamMode = STREAM_STD_READWRITE, - sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ); + sal_Bool bDirect = sal_True, const OString* pKey=0 ); virtual BaseStorage* OpenStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, bool bDirect = false ); diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index 2f92517270c0..db3995dfc374 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -103,7 +103,7 @@ friend class SvStorage; String m_aName; // Name des Storage sal_Bool m_bIsRoot:1, // z.B.: File-Storage m_bDelStm:1; - rtl::OString m_aKey; // aKey.Len != 0 -> Verschluesselung + OString m_aKey; // aKey.Len != 0 -> Verschluesselung long m_nVersion; protected: @@ -132,7 +132,7 @@ public: virtual sal_Bool Validate(); - const rtl::OString& GetKey() const; + const OString& GetKey() const; void SetVersion( long nVers ) { diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx index dc4b38f782e9..6113b9dc0fbb 100644 --- a/sot/qa/cppunit/test_sot.cxx +++ b/sot/qa/cppunit/test_sot.cxx @@ -51,8 +51,8 @@ namespace sal_uLong nSize ); bool checkStorage( const SotStorageRef &xObjStor ); - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); void test(); @@ -120,8 +120,8 @@ namespace return true; } - bool SotTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + bool SotTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { SvFileStream aStream(rURL, STREAM_READ); @@ -135,9 +135,9 @@ namespace void SotTest::test() { - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/sot/qa/cppunit/data/"), - rtl::OUString()); + OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(SotTest); diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 69164b07eff3..a9f1db500ffe 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -62,7 +62,7 @@ namespace static const DataFlavorRepresentation aInstance[] = { /* 0 SOT_FORMAT_SYSTEM_START*/ { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - /* 1 SOT_FORMAT_STRING*/ { "text/plain;charset=utf-16", "Text", &::getCppuType( (const ::rtl::OUString*) 0 ) }, + /* 1 SOT_FORMAT_STRING*/ { "text/plain;charset=utf-16", "Text", &::getCppuType( (const OUString*) 0 ) }, /* 2 SOT_FORMAT_BITMAP*/ { "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /* 3 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", "GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /* 4 SOT_FORMAT_PRIVATE*/ { "application/x-openoffice-private;windows_formatname=\"Private\"", "Private", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, @@ -261,7 +261,7 @@ sal_uLong SotExchange::RegisterFormatName( const String& rName ) pNewFlavor->MimeType = rName; pNewFlavor->HumanPresentableName = rName; - pNewFlavor->DataType = ::getCppuType( (const ::rtl::OUString*) 0 ); + pNewFlavor->DataType = ::getCppuType( (const OUString*) 0 ); rL.push_back( pNewFlavor ); @@ -296,7 +296,7 @@ sal_uLong SotExchange::RegisterFormatMimeType( const String& rMimeType ) pNewFlavor->MimeType = rMimeType; pNewFlavor->HumanPresentableName = rMimeType; - pNewFlavor->DataType = ::getCppuType( (const ::rtl::OUString*) 0 ); + pNewFlavor->DataType = ::getCppuType( (const OUString*) 0 ); rL.push_back( pNewFlavor ); @@ -336,8 +336,8 @@ sal_Bool SotExchange::GetFormatDataFlavor( sal_uLong nFormat, DataFlavor& rFlavo if( SOT_FORMATSTR_ID_USER_END >= nFormat ) { const DataFlavorRepresentation& rData = FormatArray_Impl::get()[nFormat]; - rFlavor.MimeType = ::rtl::OUString::createFromAscii( rData.pMimeType ); - rFlavor.HumanPresentableName = ::rtl::OUString::createFromAscii( rData.pName ); + rFlavor.MimeType = OUString::createFromAscii( rData.pMimeType ); + rFlavor.HumanPresentableName = OUString::createFromAscii( rData.pName ); rFlavor.DataType = *rData.pType; bRet = sal_True; @@ -417,7 +417,7 @@ sal_uLong SotExchange::GetFormatIdFromMimeType( const String& rMimeType ) // dann in der dynamischen Liste tDataFlavorList& rL = InitFormats_Impl(); - ::rtl::OUString aMimeType( rMimeType ); + OUString aMimeType( rMimeType ); for( i = 0, nMax = rL.size(); i < nMax; i++ ) { DataFlavor* pFlavor = rL[ i ]; @@ -437,7 +437,7 @@ sal_uLong SotExchange::GetFormatIdFromMimeType( const String& rMimeType ) sal_uLong SotExchange::GetFormat( const DataFlavor& rFlavor ) { // teste zuerst die Standard - Name - const ::rtl::OUString& rMimeType = rFlavor.MimeType; + const OUString& rMimeType = rFlavor.MimeType; const String aMimeType( rMimeType ); sal_uLong i, nMax = SOT_FORMAT_FILE_LIST; const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get(); diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 2f904526b0bf..620b997e3d3c 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -1311,7 +1311,7 @@ static sal_Bool CheckTransferableContext_Impl( const Reference< XTransferable >* if( pFDesc->cItems ) { - rtl::OString sDesc( pFDesc->fgd[ 0 ].cFileName ); + OString sDesc( pFDesc->fgd[ 0 ].cFileName ); bRet = 4 < sDesc.getLength() && sDesc.copy(sDesc.getLength()-4).equalsIgnoreAsciiCase(".URL"); } } diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 04cd70e082ba..635272acdd6f 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -633,7 +633,7 @@ BaseStorage* Storage::OpenStorage( const String& rName, StreamMode m, bool bDire // Open a stream BaseStorageStream* Storage::OpenStream( const String& rName, StreamMode m, sal_Bool, -const rtl::OString* +const OString* #ifdef DBG_UTIL pB #endif diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index fc110ad35b0b..e79e8f0a880e 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -786,7 +786,7 @@ StgDirStrm::StgDirStrm( StgIo& r ) { StgEntry aRoot; aRoot.Init(); - aRoot.SetName( rtl::OUString("Root Entry") ); + aRoot.SetName( OUString("Root Entry") ); aRoot.SetType( STG_ROOT ); pRoot = new StgDirEntry( aRoot ); pRoot->SetDirty(); diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 48938f5604d9..265381e0c257 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -337,7 +337,7 @@ void StgEntry::GetName( String& rName ) const sal_uInt16 n = nNameLen; if( n ) n = ( n >> 1 ) - 1; - rName = rtl::OUString(nName, n); + rName = OUString(nName, n); } // Compare two entries. Do this case-insensitive. @@ -397,7 +397,7 @@ sal_Bool StgEntry::Load( const void* pFrom, sal_uInt32 nBufSize ) return sal_False; } - aName = rtl::OUString( nName, n ); + aName = OUString( nName, n ); // I don't know the locale, so en_US is hopefully fine aName = ToUpperUnicode( aName ); aName.Erase( nMaxLegalStr ); diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index 55639a7a4364..ac7682b4af10 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -92,7 +92,7 @@ void StgInternalStream::Commit() ///////////////////////// class StgCompObjStream ///////////////////////// StgCompObjStream::StgCompObjStream( BaseStorage& rStg, sal_Bool bWr ) - : StgInternalStream( rStg, rtl::OUString("\1CompObj"), bWr ) + : StgInternalStream( rStg, OUString("\1CompObj"), bWr ) { memset( &aClsId, 0, sizeof( ClsId ) ); nCbFormat = 0; @@ -144,7 +144,7 @@ sal_Bool StgCompObjStream::Store() if( GetError() != SVSTREAM_OK ) return sal_False; Seek( 0L ); - rtl::OString aAsciiUserName(rtl::OUStringToOString(aUserName, RTL_TEXTENCODING_MS_1252)); + OString aAsciiUserName(OUStringToOString(aUserName, RTL_TEXTENCODING_MS_1252)); *this << (sal_Int16) 1 // Version? << (sal_Int16) -2 // 0xFFFE = Byte Order Indicator << (sal_Int32) 0x0A03 // Windows 3.10 @@ -162,7 +162,7 @@ sal_Bool StgCompObjStream::Store() /////////////////////////// class StgOleStream /////////////////////////// StgOleStream::StgOleStream( BaseStorage& rStg, sal_Bool bWr ) - : StgInternalStream( rStg, rtl::OUString("\1Ole"), bWr ) + : StgInternalStream( rStg, OUString("\1Ole"), bWr ) { nFlags = 0; } diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 52057a4759bb..02e65bd8ff93 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -439,7 +439,7 @@ void SotStorage::CreateStorage( sal_Bool bForceUCBStorage, StreamMode nMode, Sto INetURLObject aObj( m_aName ); if ( aObj.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aURL; + OUString aURL; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( m_aName, aURL ); aObj.SetURL( aURL ); m_aName = aObj.GetMainURL( INetURLObject::NO_DECODE ); @@ -658,7 +658,7 @@ sal_Bool SotStorage::IsStorageFile( const String & rFileName ) INetURLObject aObj( aName ); if ( aObj.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aURL; + OUString aURL; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL ); aObj.SetURL( aURL ); aName = aObj.GetMainURL( INetURLObject::NO_DECODE ); @@ -701,7 +701,7 @@ const String & SotStorage::GetName() const return m_aName; } -const rtl::OString& SotStorage::GetKey() const +const OString& SotStorage::GetKey() const { return m_aKey; } @@ -1083,8 +1083,8 @@ SotStorage* SotStorage::OpenOLEStorage( const com::sun::star::uno::Reference < c { uno::Reference < beans::XPropertySet > xStreamProps( xStream, uno::UNO_QUERY_THROW ); xStreamProps->setPropertyValue( - ::rtl::OUString( "MediaType" ), - uno::makeAny( ::rtl::OUString( "application/vnd.sun.star.oleobject" ) ) ); + OUString( "MediaType" ), + uno::makeAny( OUString( "application/vnd.sun.star.oleobject" ) ) ); } pStream = utl::UcbStreamHelper::CreateStream( xStream ); @@ -1105,8 +1105,8 @@ sal_Int32 SotStorage::GetFormatID( const com::sun::star::uno::Reference < com::s if ( !xProps.is() ) return 0; - ::rtl::OUString aMediaType; - xProps->getPropertyValue( ::rtl::OUString("MediaType") ) >>= aMediaType; + OUString aMediaType; + xProps->getPropertyValue( OUString("MediaType") ) >>= aMediaType; if ( !aMediaType.isEmpty() ) { ::com::sun::star::datatransfer::DataFlavor aDataFlavor; diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx index df1c12c59262..34a664fde425 100644 --- a/sot/source/sdstor/storinfo.cxx +++ b/sot/source/sdstor/storinfo.cxx @@ -38,7 +38,7 @@ sal_uLong ReadClipboardFormat( SvStream & rStm ) sal_Char * p = new( ::std::nothrow ) sal_Char[ nLen ]; if( p && rStm.Read( p, nLen ) == (sal_uLong) nLen ) { - nFormat = SotExchange::RegisterFormatName(rtl::OUString(p, nLen-1, RTL_TEXTENCODING_ASCII_US)); + nFormat = SotExchange::RegisterFormatName(OUString(p, nLen-1, RTL_TEXTENCODING_ASCII_US)); } else rStm.SetError( SVSTREAM_GENERALERROR ); @@ -71,7 +71,7 @@ void WriteClipboardFormat( SvStream & rStm, sal_uLong nFormat ) aCbFmt = SotExchange::GetFormatName( nFormat ); if( aCbFmt.Len() ) { - rtl::OString aAsciiCbFmt(rtl::OUStringToOString(aCbFmt, + OString aAsciiCbFmt(OUStringToOString(aCbFmt, RTL_TEXTENCODING_ASCII_US)); rStm << (sal_Int32) (aAsciiCbFmt.getLength() + 1); rStm << (const char *)aAsciiCbFmt.getStr(); diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 6771dcc45ee7..71d541ea12ac 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -140,7 +140,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::readBytes(Sequence< sal_Int8 >& aData checkConnected(); if (nBytesToRead < 0) - throw BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw BufferSizeExceededException(OUString(),static_cast(this)); ::osl::MutexGuard aGuard( m_aMutex ); @@ -168,7 +168,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::readSomeBytes(Sequence< sal_Int8 >& a checkError(); if (nMaxBytesToRead < 0) - throw BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw BufferSizeExceededException(OUString(),static_cast(this)); if (m_pSvStream->IsEof()) { @@ -282,7 +282,7 @@ sal_Int64 SAL_CALL FileStreamWrapper_Impl::getLength( ) throw (IOException, Run void FileStreamWrapper_Impl::checkConnected() { if ( !m_aURL.Len() ) - throw NotConnectedException(::rtl::OUString(), const_cast(static_cast(this))); + throw NotConnectedException(OUString(), const_cast(static_cast(this))); if ( !m_pSvStream ) { m_pSvStream = ::utl::UcbStreamHelper::CreateStream( m_aURL, STREAM_STD_READ ); @@ -299,7 +299,7 @@ void FileStreamWrapper_Impl::checkError() if (m_pSvStream->SvStream::GetError() != ERRCODE_NONE) // TODO: really evaluate the error - throw NotConnectedException(::rtl::OUString(), const_cast(static_cast(this))); + throw NotConnectedException(OUString(), const_cast(static_cast(this))); } TYPEINIT1( UCBStorageStream, BaseStorageStream ); @@ -418,7 +418,7 @@ public: String m_aURL; // the full path name to create the content String m_aContentType; String m_aOriginalContentType; - rtl::OString m_aKey; + OString m_aKey; ::ucbhelper::Content* m_pContent; // the content that provides the data Reference m_rSource; // the stream covering the original data of the content SvStream* m_pStream; // the stream worked on; for readonly streams it is the original stream of the content @@ -435,7 +435,7 @@ public: // reference is destroyed sal_Bool m_bIsOLEStorage;// an OLEStorage on a UCBStorageStream makes this an Autocommit-stream - UCBStorageStream_Impl( const String&, StreamMode, UCBStorageStream*, sal_Bool, const rtl::OString* pKey=0, sal_Bool bRepair = sal_False, Reference< XProgressHandler > xProgress = Reference< XProgressHandler >() ); + UCBStorageStream_Impl( const String&, StreamMode, UCBStorageStream*, sal_Bool, const OString* pKey=0, sal_Bool bRepair = sal_False, Reference< XProgressHandler > xProgress = Reference< XProgressHandler >() ); void Free(); sal_Bool Init(); @@ -504,7 +504,7 @@ public: sal_Bool Revert(); sal_Bool Insert( ::ucbhelper::Content *pContent ); UCBStorage_Impl* OpenStorage( UCBStorageElement_Impl* pElement, StreamMode nMode, bool bDirect ); - UCBStorageStream_Impl* OpenStream( UCBStorageElement_Impl*, StreamMode, sal_Bool, const rtl::OString* pKey=0 ); + UCBStorageStream_Impl* OpenStream( UCBStorageElement_Impl*, StreamMode, sal_Bool, const OString* pKey=0 ); void SetProps( const Sequence < Sequence < PropertyValue > >& rSequence, const String& ); void GetProps( sal_Int32&, Sequence < Sequence < PropertyValue > >& rSequence, const String& ); sal_Int32 GetObjectCount(); @@ -547,7 +547,7 @@ struct UCBStorageElement_Impl UCBStorage_ImplRef m_xStorage; // reference to the "real" storage UCBStorageStream_ImplRef m_xStream; // reference to the "real" stream - UCBStorageElement_Impl( const ::rtl::OUString& rName, + UCBStorageElement_Impl( const OUString& rName, sal_Bool bIsFolder = sal_False, sal_uLong nSize = 0 ) : m_aName( rName ) , m_aOriginalName( rName ) @@ -628,7 +628,7 @@ sal_Bool UCBStorageElement_Impl::IsModified() return bModified; } -UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nMode, UCBStorageStream* pStream, sal_Bool bDirect, const rtl::OString* pKey, sal_Bool bRepair, Reference< XProgressHandler > xProgress ) +UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nMode, UCBStorageStream* pStream, sal_Bool bDirect, const OString* pKey, sal_Bool bRepair, Reference< XProgressHandler > xProgress ) : m_pAntiImpl( pStream ) , m_aURL( rName ) , m_pContent( NULL ) @@ -650,13 +650,13 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nM // create the content Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv; - ::rtl::OUString aTemp( rName ); + OUString aTemp( rName ); if ( bRepair ) { xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(), xProgress ); - aTemp += rtl::OUString("?repairpackage"); + aTemp += OUString("?repairpackage"); } m_pContent = new ::ucbhelper::Content( aTemp, xComEnv, comphelper::getProcessComponentContext() ); @@ -674,7 +674,7 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nM ::com::sun::star::uno::Sequence < sal_Int8 > aSequ( (sal_Int8*) pBuffer, RTL_DIGEST_LENGTH_SHA1 ); ::com::sun::star::uno::Any aAny; aAny <<= aSequ; - m_pContent->setPropertyValue( ::rtl::OUString("EncryptionKey"), aAny ); + m_pContent->setPropertyValue( OUString("EncryptionKey"), aAny ); } } } @@ -812,7 +812,7 @@ sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary() } catch (const Exception &e) { - OSL_FAIL( ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); (void)e; } } @@ -851,7 +851,7 @@ sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary( sal_uLong aLength ) } catch( const Exception & e ) { - OSL_FAIL( ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); (void)e; } } @@ -905,7 +905,7 @@ sal_uLong UCBStorageStream_Impl::GetData( void* pData, sal_uLong nSize ) } catch (const Exception &e) { - OSL_FAIL( ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); (void)e; } @@ -1107,7 +1107,7 @@ sal_Int16 UCBStorageStream_Impl::Commit() aArg.Data = xStream; aArg.ReplaceExisting = sal_True; aAny <<= aArg; - m_pContent->executeCommand( ::rtl::OUString("insert"), aAny ); + m_pContent->executeCommand( OUString("insert"), aAny ); // wrapper now controls lifetime of temporary file m_aTempURL.Erase(); @@ -1250,7 +1250,7 @@ void UCBStorageStream_Impl::PrepareCachedForReopen( StreamMode nMode ) } } -UCBStorageStream::UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const rtl::OString* pKey, sal_Bool bRepair, Reference< XProgressHandler > xProgress ) +UCBStorageStream::UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const OString* pKey, sal_Bool bRepair, Reference< XProgressHandler > xProgress ) { // pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized // to class UCBStorageStream ! @@ -1423,7 +1423,7 @@ sal_Bool UCBStorageStream::SetProperty( const String& rName, const ::com::sun::s if ( rName.CompareToAscii("MediaType") == COMPARE_EQUAL ) { - ::rtl::OUString aTmp; + OUString aTmp; rValue >>= aTmp; pImp->m_aContentType = aTmp; } @@ -1587,7 +1587,7 @@ UCBStorage_Impl::UCBStorage_Impl( const String& rName, StreamMode nMode, UCBStor if ( m_bIsRoot ) { // create the special package URL for the package content - String aTemp = rtl::OUString("vnd.sun.star.pkg://"); + String aTemp = OUString("vnd.sun.star.pkg://"); aTemp += String(INetURLObject::encode( aName, INetURLObject::PART_AUTHORITY, '%', INetURLObject::ENCODE_ALL )); m_aURL = aTemp; @@ -1632,7 +1632,7 @@ UCBStorage_Impl::UCBStorage_Impl( SvStream& rStream, UCBStorage* pStorage, sal_B // UCBStorages work on a content, so a temporary file for a content must be created, even if the stream is only // accessed readonly // the root storage opens the package; create the special package URL for the package content - String aTemp = rtl::OUString("vnd.sun.star.pkg://"); + String aTemp = OUString("vnd.sun.star.pkg://"); aTemp += String(INetURLObject::encode( m_pTempFile->GetURL(), INetURLObject::PART_AUTHORITY, '%', INetURLObject::ENCODE_ALL )); m_aURL = aTemp; @@ -1671,7 +1671,7 @@ void UCBStorage_Impl::Init() { // Hack! Avoid access to the manifest file until mediatype is not available in the first segment of a // disk spanned file - m_aContentType = m_aOriginalContentType = ::rtl::OUString( "application/vnd.sun.xml.impress" ); + m_aContentType = m_aOriginalContentType = OUString( "application/vnd.sun.xml.impress" ); } else if ( m_pContent ) { @@ -1719,8 +1719,8 @@ void UCBStorage_Impl::Init() { // get the manifest information from the package try { - Any aAny = m_pContent->getPropertyValue( ::rtl::OUString("MediaType") ); - rtl::OUString aTmp; + Any aAny = m_pContent->getPropertyValue( OUString("MediaType") ); + OUString aTmp; if ( ( aAny >>= aTmp ) && !aTmp.isEmpty() ) m_aContentType = m_aOriginalContentType = aTmp; } @@ -1758,13 +1758,13 @@ void UCBStorage_Impl::CreateContent() // create content; where to put StreamMode ?! ( already done when opening the file of the package ? ) Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv; - ::rtl::OUString aTemp( m_aURL ); + OUString aTemp( m_aURL ); if ( m_bRepairPackage ) { xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(), m_xProgressHandler ); - aTemp += rtl::OUString("?repairpackage"); + aTemp += OUString("?repairpackage"); } m_pContent = new ::ucbhelper::Content( aTemp, xComEnv, comphelper::getProcessComponentContext() ); @@ -1789,12 +1789,12 @@ void UCBStorage_Impl::ReadContent() m_bListCreated = sal_True; // create cursor for access to children - Sequence< ::rtl::OUString > aProps(4); - ::rtl::OUString* pProps = aProps.getArray(); - pProps[0] = ::rtl::OUString("Title"); - pProps[1] = ::rtl::OUString("IsFolder"); - pProps[2] = ::rtl::OUString("MediaType"); - pProps[3] = ::rtl::OUString("Size"); + Sequence< OUString > aProps(4); + OUString* pProps = aProps.getArray(); + pProps[0] = OUString("Title"); + pProps[1] = OUString("IsFolder"); + pProps[2] = OUString("MediaType"); + pProps[3] = OUString("Size"); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; try @@ -1811,8 +1811,8 @@ void UCBStorage_Impl::ReadContent() while ( xResultSet->next() ) { // insert all into the children list - ::rtl::OUString aTitle( xRow->getString(1) ); - ::rtl::OUString aContentType; + OUString aTitle( xRow->getString(1) ); + OUString aContentType; if ( m_bIsLinked ) { // unpacked storages have to deal with the meta-inf folder by themselves @@ -1854,8 +1854,8 @@ void UCBStorage_Impl::ReadContent() ::ucbhelper::Content aContent( aName, xComEnv, comphelper::getProcessComponentContext() ); - ::rtl::OUString aMediaType; - Any aAny = aContent.getPropertyValue( ::rtl::OUString("MediaType") ); + OUString aMediaType; + Any aAny = aContent.getPropertyValue( OUString("MediaType") ); if ( ( aAny >>= aMediaType ) && ( aMediaType.compareToAscii("application/vnd.sun.star.oleobject") == 0 ) ) pElement->m_bIsStorage = sal_True; else if ( aMediaType.isEmpty() ) @@ -1928,20 +1928,20 @@ sal_Int32 UCBStorage_Impl::GetObjectCount() return nCount; } -::rtl::OUString Find_Impl( const Sequence < Sequence < PropertyValue > >& rSequence, const ::rtl::OUString& rPath ) +OUString Find_Impl( const Sequence < Sequence < PropertyValue > >& rSequence, const OUString& rPath ) { sal_Bool bFound = sal_False; for ( sal_Int32 nSeqs=0; nSeqs& rMyProps = rSequence[nSeqs]; - ::rtl::OUString aType; + OUString aType; for ( sal_Int32 nProps=0; nProps>= aTmp ) && aTmp == rPath ) bFound = sal_True; if ( !aType.isEmpty() ) @@ -1958,7 +1958,7 @@ sal_Int32 UCBStorage_Impl::GetObjectCount() return aType; } - return ::rtl::OUString(); + return OUString(); } void UCBStorage_Impl::SetProps( const Sequence < Sequence < PropertyValue > >& rSequence, const String& rPath ) @@ -2015,10 +2015,10 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert if ( !m_bIsRoot ) aPath += m_aName; aPath += '/'; - aProps[0].Name = ::rtl::OUString("MediaType"); - aProps[0].Value <<= (::rtl::OUString ) m_aContentType; - aProps[1].Name = ::rtl::OUString("FullPath"); - aProps[1].Value <<= (::rtl::OUString ) aPath; + aProps[0].Name = OUString("MediaType"); + aProps[0].Value <<= (OUString ) m_aContentType; + aProps[1].Name = OUString("FullPath"); + aProps[1].Value <<= (OUString ) aPath; rSequence[ nProps++ ] = aProps; if ( m_bIsRoot ) @@ -2038,10 +2038,10 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert // properties of streams String aElementPath( aPath ); aElementPath += pElement->m_aName; - aProps[0].Name = ::rtl::OUString("MediaType"); - aProps[0].Value <<= (::rtl::OUString ) pElement->GetContentType(); - aProps[1].Name = ::rtl::OUString("FullPath"); - aProps[1].Value <<= (::rtl::OUString ) aElementPath; + aProps[0].Name = OUString("MediaType"); + aProps[0].Value <<= (OUString ) pElement->GetContentType(); + aProps[1].Name = OUString("FullPath"); + aProps[1].Value <<= (OUString ) aElementPath; rSequence[ nProps++ ] = aProps; } } @@ -2085,12 +2085,12 @@ sal_Bool UCBStorage_Impl::Insert( ::ucbhelper::Content *pContent ) if ( rProps[ 0 ].Name != "Title" ) continue; - Sequence < ::rtl::OUString > aNames(1); - ::rtl::OUString* pNames = aNames.getArray(); - pNames[0] = ::rtl::OUString( "Title" ); + Sequence < OUString > aNames(1); + OUString* pNames = aNames.getArray(); + pNames[0] = OUString( "Title" ); Sequence < Any > aValues(1); Any* pValues = aValues.getArray(); - pValues[0] = makeAny( ::rtl::OUString( m_aName ) ); + pValues[0] = makeAny( OUString( m_aName ) ); Content aNewFolder; if ( !pContent->insertNewContent( rCurr.Type, aNames, aValues, aNewFolder ) ) @@ -2157,7 +2157,7 @@ sal_Int16 UCBStorage_Impl::Commit() // first remove all open stream handles if( !pElement->m_xStream.Is() || pElement->m_xStream->Clear() ) { - pContent->executeCommand( ::rtl::OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); + pContent->executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); nRet = COMMIT_RESULT_SUCCESS; } else @@ -2188,10 +2188,10 @@ sal_Int16 UCBStorage_Impl::Commit() if ( pElement->m_xStream->m_bIsOLEStorage ) { // OLE storage should be stored encrytped, if the storage uses encryption - pElement->m_xStream->m_aContentType = rtl::OUString("application/vnd.sun.star.oleobject"); + pElement->m_xStream->m_aContentType = OUString("application/vnd.sun.star.oleobject"); Any aValue; aValue <<= (sal_Bool) sal_True; - pElement->m_xStream->m_pContent->setPropertyValue(rtl::OUString("Encrypted"), aValue ); + pElement->m_xStream->m_pContent->setPropertyValue(OUString("Encrypted"), aValue ); } pContent = pElement->GetContent(); @@ -2202,8 +2202,8 @@ sal_Int16 UCBStorage_Impl::Commit() // name ( title ) of the element was changed nLocalRet = COMMIT_RESULT_SUCCESS; Any aAny; - aAny <<= (rtl::OUString) pElement->m_aName; - pContent->setPropertyValue( ::rtl::OUString("Title"), aAny ); + aAny <<= (OUString) pElement->m_aName; + pContent->setPropertyValue( OUString("Title"), aAny ); } if ( pElement->IsLoaded() && pElement->GetContentType() != pElement->GetOriginalContentType() ) @@ -2211,8 +2211,8 @@ sal_Int16 UCBStorage_Impl::Commit() // mediatype of the element was changed nLocalRet = COMMIT_RESULT_SUCCESS; Any aAny; - aAny <<= (rtl::OUString) pElement->GetContentType(); - pContent->setPropertyValue( ::rtl::OUString("MediaType"), aAny ); + aAny <<= (OUString) pElement->GetContentType(); + pContent->setPropertyValue( OUString("MediaType"), aAny ); } if ( nLocalRet != COMMIT_RESULT_NOTHING_TO_DO ) @@ -2262,15 +2262,15 @@ sal_Int16 UCBStorage_Impl::Commit() // commit the media type to the JAR file // clipboard format and ClassId will be retrieved from the media type when the file is loaded again Any aType; - aType <<= (rtl::OUString) m_aContentType; - m_pContent->setPropertyValue( ::rtl::OUString("MediaType"), aType ); + aType <<= (OUString) m_aContentType; + m_pContent->setPropertyValue( OUString("MediaType"), aType ); if ( m_bIsLinked ) { // write a manifest file // first create a subfolder "META-inf" Content aNewSubFolder; - sal_Bool bRet = ::utl::UCBContentHelper::MakeFolder( *m_pContent, rtl::OUString("META-INF"), aNewSubFolder ); + sal_Bool bRet = ::utl::UCBContentHelper::MakeFolder( *m_pContent, OUString("META-INF"), aNewSubFolder ); if ( bRet ) { // create a stream to write the manifest file - use a temp file @@ -2297,7 +2297,7 @@ sal_Int16 UCBStorage_Impl::Commit() xWriter = NULL; xOutputStream = NULL; DELETEZ( pTempFile ); - aNewSubFolder.transferContent( aSource, InsertOperation_MOVE, ::rtl::OUString("manifest.xml"), NameClash::OVERWRITE ); + aNewSubFolder.transferContent( aSource, InsertOperation_MOVE, OUString("manifest.xml"), NameClash::OVERWRITE ); } } else @@ -2308,7 +2308,7 @@ sal_Int16 UCBStorage_Impl::Commit() #endif // force writing Any aAny; - m_pContent->executeCommand( ::rtl::OUString("flush"), aAny ); + m_pContent->executeCommand( OUString("flush"), aAny ); if ( m_pSource != 0 ) { SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( m_pTempFile->GetURL(), STREAM_STD_READ ); @@ -2690,7 +2690,7 @@ sal_Bool UCBStorage::Revert() return pImp->Revert(); } -BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nMode, sal_Bool bDirect, const rtl::OString* pKey ) +BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nMode, sal_Bool bDirect, const OString* pKey ) { if( !rEleName.Len() ) return NULL; @@ -2736,7 +2736,7 @@ BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nM { // check if stream is opened with the same keyword as before // if not, generate a new stream because it could be encrypted vs. decrypted! - rtl::OString aKey; + OString aKey; if ( pKey ) aKey = *pKey; if ( pElement->m_xStream->m_aKey == aKey ) @@ -2759,7 +2759,7 @@ BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nM return NULL; } -UCBStorageStream_Impl* UCBStorage_Impl::OpenStream( UCBStorageElement_Impl* pElement, StreamMode nMode, sal_Bool bDirect, const rtl::OString* pKey ) +UCBStorageStream_Impl* UCBStorage_Impl::OpenStream( UCBStorageElement_Impl* pElement, StreamMode nMode, sal_Bool bDirect, const OString* pKey ) { String aName( m_aURL ); aName += '/'; @@ -3165,10 +3165,10 @@ String UCBStorage::GetLinkedFile( SvStream &rStream ) rStream >> nBytes; if( nBytes == 0x04034b50 ) { - rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString(rStream); + OString aTmp = read_lenPrefixed_uInt8s_ToOString(rStream); if (aTmp.match("ContentURL=")) { - aString = rtl::OStringToOUString(aTmp.copy(11), RTL_TEXTENCODING_UTF8); + aString = OStringToOUString(aTmp.copy(11), RTL_TEXTENCODING_UTF8); } } @@ -3194,7 +3194,7 @@ String UCBStorage::CreateLinkFile( const String& rName ) // assemble a new folder name in the destination folder INetURLObject aObj( rName ); String aTmpName = aObj.GetName(); - String aTitle = rtl::OUString( "content." ); + String aTitle = OUString( "content." ); aTitle += aTmpName; // create a folder and store its URL @@ -3234,7 +3234,7 @@ String UCBStorage::CreateLinkFile( const String& rName ) String aURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); // store it as key/value pair - String aLink = rtl::OUString("ContentURL="); + String aLink = OUString("ContentURL="); aLink += aURL; write_lenPrefixed_uInt8s_FromOUString(*pStream, aLink, RTL_TEXTENCODING_UTF8); pStream->Flush(); diff --git a/sot/source/unoolestorage/register.cxx b/sot/source/unoolestorage/register.cxx index 5031b143e20d..ad88bc0da3ff 100644 --- a/sot/source/unoolestorage/register.cxx +++ b/sot/source/unoolestorage/register.cxx @@ -34,7 +34,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sot_component_getFactory( { void * pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); + OUString aImplName( OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if ( pServiceManager && aImplName.equals( OLESimpleStorage::impl_staticGetImplementationName() ) ) diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 85ec2b361623..3141915ab9be 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -72,17 +72,17 @@ OLESimpleStorage::~OLESimpleStorage() } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OLESimpleStorage::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"); + uno::Sequence< OUString > aRet(1); + aRet[0] = OUString("com.sun.star.embed.OLESimpleStorage"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OLESimpleStorage::impl_staticGetImplementationName() +OUString SAL_CALL OLESimpleStorage::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.OLESimpleStorage"); + return OUString("com.sun.star.comp.embed.OLESimpleStorage"); } //------------------------------------------------------------------------- @@ -119,7 +119,7 @@ void OLESimpleStorage::UpdateOriginal_Impl() } //------------------------------------------------------------------------- -void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const uno::Reference< io::XInputStream >& xInputStream ) +void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, OUString aName, const uno::Reference< io::XInputStream >& xInputStream ) throw ( uno::Exception ) { if ( !pStorage || aName.isEmpty() || !xInputStream.is() ) @@ -164,7 +164,7 @@ void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, : } //------------------------------------------------------------------------- -void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const uno::Reference< container::XNameAccess >& xNameAccess ) +void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, OUString aName, const uno::Reference< container::XNameAccess >& xNameAccess ) throw ( uno::Exception ) { if ( !pStorage || aName.isEmpty() || !xNameAccess.is() ) @@ -184,7 +184,7 @@ void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, :: try { - uno::Sequence< ::rtl::OUString > aElements = xNameAccess->getElementNames(); + uno::Sequence< OUString > aElements = xNameAccess->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aElements.getLength(); nInd++ ) { uno::Reference< io::XInputStream > xInputStream; @@ -315,7 +315,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr //____________________________________________________________________________________________________ // -------------------------------------------------------------------------------- -void SAL_CALL OLESimpleStorage::insertByName( const ::rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL OLESimpleStorage::insertByName( const OUString& aName, const uno::Any& aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, @@ -360,14 +360,14 @@ void SAL_CALL OLESimpleStorage::insertByName( const ::rtl::OUString& aName, cons } catch( const uno::Exception& e ) { - throw lang::WrappedTargetException( ::rtl::OUString( "Insert has failed!" ), + throw lang::WrappedTargetException( OUString( "Insert has failed!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); } } // -------------------------------------------------------------------------------- -void SAL_CALL OLESimpleStorage::removeByName( const ::rtl::OUString& aName ) +void SAL_CALL OLESimpleStorage::removeByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) @@ -396,7 +396,7 @@ void SAL_CALL OLESimpleStorage::removeByName( const ::rtl::OUString& aName ) } // -------------------------------------------------------------------------------- -void SAL_CALL OLESimpleStorage::replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL OLESimpleStorage::replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, @@ -417,14 +417,14 @@ void SAL_CALL OLESimpleStorage::replaceByName( const ::rtl::OUString& aName, con { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw lang::WrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< uno::XInterface >(), aCaught ); } } // -------------------------------------------------------------------------------- -uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName ) +uno::Any SAL_CALL OLESimpleStorage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -479,7 +479,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName ) uno::Reference< container::XNameContainer > xResultNameContainer( m_xFactory->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"), + OUString("com.sun.star.embed.OLESimpleStorage"), aArgs ), uno::UNO_QUERY_THROW ); @@ -537,7 +537,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName ) } // -------------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::getElementNames() +uno::Sequence< OUString > SAL_CALL OLESimpleStorage::getElementNames() throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -557,7 +557,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::getElementNames() throw uno::RuntimeException(); // TODO: } - uno::Sequence< ::rtl::OUString > aSeq( aList.size() ); + uno::Sequence< OUString > aSeq( aList.size() ); for ( sal_uInt32 nInd = 0; nInd < aList.size(); nInd++ ) aSeq[nInd] = aList[nInd].GetName(); @@ -565,7 +565,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::getElementNames() } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL OLESimpleStorage::hasByName( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL OLESimpleStorage::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -755,14 +755,14 @@ uno::Sequence< sal_Int8 > SAL_CALL OLESimpleStorage::getClassID() return m_pStorage->GetClassName().GetByteSequence(); } -::rtl::OUString SAL_CALL OLESimpleStorage::getClassName() +OUString SAL_CALL OLESimpleStorage::getClassName() throw ( uno::RuntimeException ) { - return ::rtl::OUString(); + return OUString(); } void SAL_CALL OLESimpleStorage::setClassInfo( const uno::Sequence< sal_Int8 >& /*aClassID*/, - const ::rtl::OUString& /*sClassName*/ ) + const OUString& /*sClassName*/ ) throw ( lang::NoSupportException, uno::RuntimeException ) { @@ -774,17 +774,17 @@ void SAL_CALL OLESimpleStorage::setClassInfo( const uno::Sequence< sal_Int8 >& / //____________________________________________________________________________________________________ // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OLESimpleStorage::getImplementationName() +OUString SAL_CALL OLESimpleStorage::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } // -------------------------------------------------------------------------------- -::sal_Bool SAL_CALL OLESimpleStorage::supportsService( const ::rtl::OUString& ServiceName ) +::sal_Bool SAL_CALL OLESimpleStorage::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName.compareTo( aSeq[nInd] ) == 0 ) @@ -794,7 +794,7 @@ void SAL_CALL OLESimpleStorage::setClassInfo( const uno::Sequence< sal_Int8 >& / } // -------------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OLESimpleStorage::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx index 0759ae3651fa..a2872778fb39 100644 --- a/sot/source/unoolestorage/xolesimplestorage.hxx +++ b/sot/source/unoolestorage/xolesimplestorage.hxx @@ -59,10 +59,10 @@ class OLESimpleStorage : public ::cppu::WeakImplHelper3 void UpdateOriginal_Impl(); - static void InsertInputStreamToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream ) + static void InsertInputStreamToStorage_Impl( BaseStorage* pStorage, OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream ) throw ( ::com::sun::star::uno::Exception ); - static void InsertNameAccessToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xNameAccess ) + static void InsertNameAccessToStorage_Impl( BaseStorage* pStorage, OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xNameAccess ) throw ( ::com::sun::star::uno::Exception ); public: @@ -71,8 +71,8 @@ public: virtual ~OLESimpleStorage(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); @@ -90,32 +90,32 @@ public: // XNameContainer //____________________________________________________________________________________________________ - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Type SAL_CALL getElementType() @@ -160,11 +160,11 @@ public: virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getClassID() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getClassName() + virtual OUString SAL_CALL getClassName() throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setClassInfo( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, - const ::rtl::OUString& sClassName ) + const OUString& sClassName ) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); @@ -172,13 +172,13 @@ public: // XServiceInfo //____________________________________________________________________________________________________ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException ); }; diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx index e55d445a0523..9a89fedf9ac9 100644 --- a/starmath/inc/action.hxx +++ b/starmath/inc/action.hxx @@ -37,7 +37,7 @@ public: virtual void Undo(); virtual void Redo(); virtual void Repeat(SfxRepeatTarget& rDocSh); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; #endif diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx index b7a0d9c618e9..bcc8397b09d5 100644 --- a/starmath/inc/cursor.hxx +++ b/starmath/inc/cursor.hxx @@ -139,7 +139,7 @@ public: void DeletePrev(OutputDevice* pDev); /** Insert text at the current position */ - void InsertText(rtl::OUString aString); + void InsertText(OUString aString); /** Insert an element into the formula */ void InsertElement(SmFormulaElement element); @@ -166,7 +166,7 @@ public: * For more complex expressions use InsertCommandText, this method doesn't * use SmParser, this means that it's faster, but not as strong. */ - void InsertSpecial(rtl::OUString aString); + void InsertSpecial(OUString aString); /** Create sub-/super script * diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 51782f0ecb91..ac0508f4ae29 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -196,8 +196,8 @@ public: class SmCategoryDesc : public Resource { - rtl::OUString Name; - rtl::OUString *Strings[4]; + OUString Name; + OUString *Strings[4]; Bitmap *Graphics[4]; /* regular bitmaps */ sal_uInt16 Minimum[4]; sal_uInt16 Maximum[4]; @@ -207,8 +207,8 @@ public: SmCategoryDesc(const ResId &rResId, sal_uInt16 nCategoryIdx); ~SmCategoryDesc(); - const rtl::OUString& GetName() const { return Name; } - const rtl::OUString* GetString(sal_uInt16 Index) const { return Strings[Index]; } + const OUString& GetName() const { return Name; } + const OUString* GetString(sal_uInt16 Index) const { return Strings[Index]; } sal_uInt16 GetMinimum(sal_uInt16 Index) { return Minimum[Index]; } sal_uInt16 GetMaximum(sal_uInt16 Index) { return Maximum[Index]; } sal_uInt16 GetValue(sal_uInt16 Index) const { return Value[Index]; } @@ -251,7 +251,7 @@ class SmDistanceDialog : public ModalDialog DECL_LINK(CheckBoxClickHdl, CheckBox *); using Window::SetHelpId; - void SetHelpId(MetricField &rField, const rtl::OString& sHelpId); + void SetHelpId(MetricField &rField, const OString& sHelpId); void SetCategory(sal_uInt16 Category); public: @@ -357,7 +357,7 @@ class SmSymbolDialog : public ModalDialog SmViewShell &rViewSh; SmSymbolManager &rSymbolMgr; - rtl::OUString aSymbolSetName; + OUString aSymbolSetName; SymbolPtrVec_t aSymbolSet; OutputDevice *pFontListDev; diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index b08a59a870e5..d4f132455abc 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -109,7 +109,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener sal_uInt16 nModifyCount; bool bIsFormulaArranged; SmCursor *pCursor; - std::set< rtl::OUString > aUsedSymbols; // to export used symbols only when saving + std::set< OUString > aUsedSymbols; // to export used symbols only when saving @@ -195,7 +195,7 @@ public: const SmNode * GetFormulaTree() const { return pTree; } void SetFormulaTree(SmNode *&rTree) { pTree = rTree; } - const std::set< rtl::OUString > & GetUsedSymbols() const { return aUsedSymbols; } + const std::set< OUString > & GetUsedSymbols() const { return aUsedSymbols; } OUString GetAccessibleText(); diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 7a89a7a2d64b..8d4bc8c15630 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -563,7 +563,7 @@ protected: { sal_Unicode cChar = GetToken().cMathChar; if ((sal_Unicode) '\0' != cChar) - SetText(rtl::OUString(cChar)); + SetText(OUString(cChar)); } public: @@ -640,7 +640,7 @@ public: SmErrorNode(SmParseError /*eError*/, const SmToken &rNodeToken) : SmMathSymbolNode(NERROR, rNodeToken) { - SetText(rtl::OUString(MS_ERROR)); + SetText(OUString(MS_ERROR)); } virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell); diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index d5affc7e84f0..f4118032dc41 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -197,7 +197,7 @@ class SmParser m_bExportSymNames; // map of used symbols (used to reduce file size by exporting only actually used symbols) - std::set< rtl::OUString > m_aUsedSymbols; + std::set< OUString > m_aUsedSymbols; //! locale where '.' is decimal seperator! ::com::sun::star::lang::Locale m_aDotLoc; @@ -281,7 +281,7 @@ public: const SmErrorDesc* GetError(size_t i = size_t(-1) ); static const SmTokenTableEntry* GetTokenTableEntry( const String &rName ); bool IsUsedSymbol( const String &rSymbolName ) const { return m_aUsedSymbols.find( rSymbolName ) != m_aUsedSymbols.end(); } - std::set< rtl::OUString > GetUsedSymbols() const { return m_aUsedSymbols; } + std::set< OUString > GetUsedSymbols() const { return m_aUsedSymbols; } }; diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx index 254d59ffab59..17ed2da1ced1 100644 --- a/starmath/inc/rect.hxx +++ b/starmath/inc/rect.hxx @@ -31,9 +31,9 @@ bool SmGetGlyphBoundRect(const OutputDevice &rDev, - const rtl::OUString &rText, Rectangle &rRect); + const OUString &rText, Rectangle &rRect); -bool SmIsMathAlpha(const rtl::OUString &rText); +bool SmIsMathAlpha(const OUString &rText); inline long SmFromTo(long nFrom, long nTo, double fRelDist) @@ -101,9 +101,9 @@ class SmRect protected: void BuildRect (const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, sal_uInt16 nBorderWidth); + const OUString &rText, sal_uInt16 nBorderWidth); void Init(const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, sal_uInt16 nBorderWidth); + const OUString &rText, sal_uInt16 nBorderWidth); void ClearBaseline() { bHasBaseline = false; }; inline void CopyMBL(const SmRect& rRect); @@ -114,7 +114,7 @@ protected: public: SmRect(); SmRect(const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, long nBorderWidth); + const OUString &rText, long nBorderWidth); SmRect(long nWidth, long nHeight); SmRect(const SmRect &rRect); diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index dbf4b1fcb9a4..d5fe5e6f8e7b 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -85,9 +85,9 @@ public: virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); @@ -98,8 +98,8 @@ public: virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream ); virtual Size getFormulaSize() const; - static ::com::sun::star::uno::Sequence< rtl::OUString > getSupportedServiceNames_Static(); - static ::rtl::OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); }; //////////////////////////////////////////////////////////// diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 1184c8522afd..0f4a7484f105 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -89,7 +89,7 @@ public: Font(), nBorderWidth(-1) { Impl_Init(); } SmFace(const Font& rFont) : Font(rFont), nBorderWidth(-1) { Impl_Init(); } - SmFace(const rtl::OUString& rName, const Size& rSize) : + SmFace(const OUString& rName, const Size& rSize) : Font(rName, rSize), nBorderWidth(-1) { Impl_Init(); } SmFace( FontFamily eFamily, const Size& rSize) : Font(eFamily, rSize), nBorderWidth(-1) { Impl_Init(); } diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index b64a5849a459..3f067be4b35e 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -49,7 +49,7 @@ struct assertion_traits static std::string toString(const String& x) { OStringStream ost; - ost << rtl::OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr(); + ost << OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr(); return ost.str(); } }; diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index f493354748ee..f4bf3f1b5bec 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -126,15 +126,15 @@ void Test::tearDown() void Test::editMarker() { { - rtl::OUString sMarkedText(" under under "); + OUString sMarkedText(" under under "); m_pEditWindow->SetText(sMarkedText); m_pEditWindow->Flush(); - rtl::OUString sFinalText = m_pEditWindow->GetText(); + OUString sFinalText = m_pEditWindow->GetText(); CPPUNIT_ASSERT_MESSAGE("Should be equal text", sFinalText == sMarkedText); } { - rtl::OUString sTargetText("a under b under c"); + OUString sTargetText("a under b under c"); m_pEditWindow->SelNextMark(); m_pEditWindow->Delete(); @@ -150,12 +150,12 @@ void Test::editMarker() m_pEditWindow->InsertText("b"); m_pEditWindow->Flush(); - rtl::OUString sFinalText = m_pEditWindow->GetText(); + OUString sFinalText = m_pEditWindow->GetText(); CPPUNIT_ASSERT_MESSAGE("Should be a under b under c", sFinalText == sTargetText); } { - m_pEditWindow->SetText(rtl::OUString()); + m_pEditWindow->SetText(OUString()); m_pEditWindow->Flush(); } } @@ -189,19 +189,19 @@ void Test::editUndoRedo() { EditEngine &rEditEngine = m_xDocShRef->GetEditEngine(); - rtl::OUString sStringOne("a under b"); + OUString sStringOne("a under b"); { rEditEngine.SetText(0, sStringOne); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringOne == sFinalText); } - rtl::OUString sStringTwo("a over b"); + OUString sStringTwo("a over b"); { rEditEngine.SetText(0, sStringTwo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringTwo == sFinalText); } @@ -210,14 +210,14 @@ void Test::editUndoRedo() { m_xDocShRef->Execute(aUndo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings much match", sStringOne == sFinalText); } { m_xDocShRef->Execute(aUndo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Must now be empty", !sFinalText.getLength()); } @@ -225,15 +225,15 @@ void Test::editUndoRedo() { m_xDocShRef->Execute(aRedo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings much match", sStringOne == sFinalText); } { - rEditEngine.SetText(0, rtl::OUString()); + rEditEngine.SetText(0, OUString()); m_xDocShRef->UpdateText(); rEditEngine.ClearModifyFlag(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Must be empty", !sFinalText.getLength()); } @@ -245,11 +245,11 @@ void Test::viewZoom() EditEngine &rEditEngine = m_xDocShRef->GetEditEngine(); - rtl::OUString sStringOne("a under b"); + OUString sStringOne("a under b"); { rEditEngine.SetText(0, sStringOne); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringOne == sFinalText); } diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index d88d4906e808..02ed5f8739b4 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -53,7 +53,6 @@ #include #include -using rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::uno; @@ -469,7 +468,7 @@ sal_Unicode SAL_CALL SmGraphicAccessible::getCharacter( sal_Int32 nIndex ) Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttributes( sal_Int32 nIndex, - const uno::Sequence< ::rtl::OUString > & /*rRequestedAttributes*/ ) + const uno::Sequence< OUString > & /*rRequestedAttributes*/ ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aGuard; @@ -766,7 +765,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::copyText( Reference< datatransfer::clipboard::XClipboard > xClipboard = pWin->GetClipboard(); if ( xClipboard.is() ) { - ::rtl::OUString sText( getTextRange(nStartIndex, nEndIndex) ); + OUString sText( getTextRange(nStartIndex, nEndIndex) ); ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText ); const sal_uInt32 nRef = Application::ReleaseSolarMutex(); @@ -1858,14 +1857,14 @@ sal_Int16 SAL_CALL SmEditAccessible::getAccessibleRole( ) return AccessibleRole::PANEL /*TEXT ?*/; } -rtl::OUString SAL_CALL SmEditAccessible::getAccessibleDescription( ) +OUString SAL_CALL SmEditAccessible::getAccessibleDescription( ) throw (RuntimeException) { SolarMutexGuard aGuard; return OUString(); // empty as agreed with product-management } -rtl::OUString SAL_CALL SmEditAccessible::getAccessibleName( ) +OUString SAL_CALL SmEditAccessible::getAccessibleName( ) throw (RuntimeException) { SolarMutexGuard aGuard; diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index cac3fdc0a170..b311508a6f12 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -117,8 +117,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -131,25 +131,25 @@ public: virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; ////////////////////////////////////////////////////////////////////// @@ -369,8 +369,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -380,9 +380,9 @@ public: virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; ////////////////////////////////////////////////////////////////////// diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx index 67dd8ca22da9..41ac8a23ea21 100644 --- a/starmath/source/action.cxx +++ b/starmath/source/action.cxx @@ -47,7 +47,7 @@ void SmFormatAction::Repeat(SfxRepeatTarget& rDocSh) dynamic_cast< SmDocShell & >(rDocSh).SetFormat(aNewFormat); } -rtl::OUString SmFormatAction::GetComment() const +OUString SmFormatAction::GetComment() const { return SmResId(RID_UNDOFORMATNAME).toString(); } diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 56ba7bc77a8a..e180fcaebb8e 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using ::rtl::OUString; static const char aRootName[] = "Office.Math"; @@ -380,27 +379,27 @@ const String SmFontFormatList::GetFontFormatId( size_t nPos ) const } -const rtl::OUString SmFontFormatList::GetNewFontFormatId() const +const OUString SmFontFormatList::GetNewFontFormatId() const { // returns first unused FormatId - rtl::OUString aPrefix("Id"); + OUString aPrefix("Id"); sal_Int32 nCnt = GetCount(); for (sal_Int32 i = 1; i <= nCnt + 1; ++i) { - rtl::OUString aTmpId = aPrefix + rtl::OUString::valueOf(i); + OUString aTmpId = aPrefix + OUString::valueOf(i); if (!GetFontFormat(aTmpId)) return aTmpId; } OSL_ENSURE( !this, "failed to create new FontFormatId" ); - return rtl::OUString(); + return OUString(); } ///////////////////////////////////////////////////////////////// SmMathConfig::SmMathConfig() : - ConfigItem(rtl::OUString(aRootName)) + ConfigItem(OUString(aRootName)) { pFormat = 0; pOther = 0; @@ -441,8 +440,8 @@ void SmMathConfig::SetFontFormatListModified( bool bVal ) void SmMathConfig::ReadSymbol( SmSym &rSymbol, - const rtl::OUString &rSymbolName, - const rtl::OUString &rBaseNode ) const + const OUString &rSymbolName, + const OUString &rBaseNode ) const { Sequence< OUString > aNames = lcl_GetSymbolPropertyNames(); sal_Int32 nProps = aNames.getLength(); @@ -1271,7 +1270,7 @@ void SmMathConfig::SetShowFormulaCursor( bool bVal ) SetOtherIfNotEqual( pOther->bFormulaCursor, bVal ); } -void SmMathConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SmMathConfig::Notify( const com::sun::star::uno::Sequence< OUString >& ) {} ///////////////////////////////////////////////////////////////// diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx index ba548618219e..cf4c3ea2a3bf 100644 --- a/starmath/source/cfgitem.hxx +++ b/starmath/source/cfgitem.hxx @@ -95,7 +95,7 @@ public: const String GetFontFormatId( const SmFontFormat &rFntFmt ) const; const String GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd ); const String GetFontFormatId( size_t nPos ) const; - const rtl::OUString GetNewFontFormatId() const; + const OUString GetNewFontFormatId() const; size_t GetCount() const { return aEntries.size(); } bool IsModified() const { return bModified; } @@ -125,11 +125,11 @@ class SmMathConfig : public utl::ConfigItem void Save(); void ReadSymbol( SmSym &rSymbol, - const rtl::OUString &rSymbolName, - const rtl::OUString &rBaseNode ) const; + const OUString &rSymbolName, + const OUString &rBaseNode ) const; void ReadFontFormat( SmFontFormat &rFontFormat, - const rtl::OUString &rSymbolName, - const rtl::OUString &rBaseNode ) const; + const OUString &rSymbolName, + const OUString &rBaseNode ) const; void SetOtherIfNotEqual( bool &rbItem, bool bNewVal ); @@ -159,7 +159,7 @@ public: virtual ~SmMathConfig(); // utl::ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); virtual void Commit(); SmSymbolManager & GetSymbolManager(); diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index c4f7c304c685..1658cd46c178 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -984,7 +984,7 @@ void SmCursor::InsertFraction() { FinishEdit(pLineList, pLineParent, nParentIndex, SmCaretPos(pSelectedNode, 1)); } -void SmCursor::InsertText(rtl::OUString aString) +void SmCursor::InsertText(OUString aString) { BeginEdit(); @@ -1113,7 +1113,7 @@ void SmCursor::InsertElement(SmFormulaElement element){ EndEdit(); } -void SmCursor::InsertSpecial(rtl::OUString aString) +void SmCursor::InsertSpecial(OUString aString) { BeginEdit(); Delete(); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 29c0328239a4..005b41a383b4 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -313,7 +313,7 @@ IMPL_LINK( SmFontDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ ) Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_FONTDIALOG" ), &aHelpButton1 ); + pHelp->Start( OUString( "HID_SMA_FONTDIALOG" ), &aHelpButton1 ); } return 0; } @@ -436,7 +436,7 @@ IMPL_LINK( SmFontSizeDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_FONTSIZEDIALOG" ), &aHelpButton1 ); + pHelp->Start( OUString( "HID_SMA_FONTSIZEDIALOG" ), &aHelpButton1 ); } return 0; } @@ -556,7 +556,7 @@ IMPL_LINK( SmFontTypeDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_FONTTYPEDIALOG" ), &aHelpButton1 ); + pHelp->Start( OUString( "HID_SMA_FONTTYPEDIALOG" ), &aHelpButton1 ); } return 0; } @@ -687,7 +687,7 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) : if (IsAvailableRes(ResId(nI2,*rResId.GetResMgr()).SetRT(RSC_STRING))) { - Strings [i] = new rtl::OUString(ResId(nI2,*rResId.GetResMgr()).toString()); + Strings [i] = new OUString(ResId(nI2,*rResId.GetResMgr()).toString()); Graphics [i] = new Bitmap(ResId(10*nI2,*rResId.GetResMgr())); } else @@ -769,7 +769,7 @@ IMPL_LINK( SmDistanceDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_DISTANCEDIALOG" ), &aHelpButton1 ); + pHelp->Start( OUString( "HID_SMA_DISTANCEDIALOG" ), &aHelpButton1 ); } return 0; } @@ -789,7 +789,7 @@ IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox ) } -void SmDistanceDialog::SetHelpId(MetricField &rField, const rtl::OString& sHelpId) +void SmDistanceDialog::SetHelpId(MetricField &rField, const OString& sHelpId) { const OUString aEmptyText; @@ -884,7 +884,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) { eUnit = FUNIT_CUSTOM; nDigits = 0; - pMF->SetCustomUnitText(rtl::OUString('%')); + pMF->SetCustomUnitText(OUString('%')); } else { @@ -1083,7 +1083,7 @@ IMPL_LINK( SmAlignDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ ) Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_ALIGNDIALOG" ), &aHelpButton1 ); + pHelp->Start( OUString( "HID_SMA_ALIGNDIALOG" ), &aHelpButton1 ); } return 0; } @@ -1526,7 +1526,7 @@ IMPL_LINK( SmSymbolDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ ) Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_SYMBOLDIALOG" ), &aHelpBtn ); + pHelp->Start( OUString( "HID_SMA_SYMBOLDIALOG" ), &aHelpBtn ); } return 0; } @@ -1551,7 +1551,7 @@ SmSymbolDialog::SmSymbolDialog(Window *pParent, OutputDevice *pFntListDevice, FreeResource(); aHelpBtn.SetClickHdl(LINK(this, SmSymbolDialog, HelpButtonClickHdl)); - aSymbolSetName = rtl::OUString(); + aSymbolSetName = OUString(); aSymbolSet.clear(); FillSymbolSets(); if (aSymbolSets.GetEntryCount() > 0) @@ -1616,7 +1616,7 @@ bool SmSymbolDialog::SelectSymbolSet(const OUString &rSymbolSetName) bool bRet = false; sal_uInt16 nPos = aSymbolSets.GetEntryPos(rSymbolSetName); - aSymbolSetName = rtl::OUString(); + aSymbolSetName = OUString(); aSymbolSet.clear(); if (nPos != LISTBOX_ENTRY_NOTFOUND) { @@ -1717,7 +1717,7 @@ void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText) rComboBox.Clear(); if (bDeleteText) - rComboBox.SetText(rtl::OUString()); + rComboBox.SetText(OUString()); ComboBox &rBox = &rComboBox == &aOldSymbols ? aOldSymbolSets : aSymbolSets; SymbolPtrVec_t aSymSet( aSymbolMgrCopy.GetSymbolSet( rBox.GetText() ) ); @@ -1735,7 +1735,7 @@ void SmSymDefineDialog::FillSymbolSets(ComboBox &rComboBox, bool bDeleteText) rComboBox.Clear(); if (bDeleteText) - rComboBox.SetText(rtl::OUString()); + rComboBox.SetText(OUString()); const std::set< OUString > aSymbolSetNames( aSymbolMgrCopy.GetSymbolSetNames() ); std::set< OUString >::const_iterator aIt( aSymbolSetNames.begin() ); @@ -1766,7 +1766,7 @@ void SmSymDefineDialog::FillStyles(bool bDeleteText) { aStyles.Clear(); if (bDeleteText) - aStyles.SetText(rtl::OUString()); + aStyles.SetText(OUString()); OUString aText (aFonts.GetSelectEntry()); if (!aText.isEmpty()) @@ -1910,7 +1910,7 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl) UpdateButtons(); // display Unicode position as symbol name while iterating over characters - const OUString aHex(rtl::OUString::valueOf(static_cast(cChar), 16 ).toAsciiUpperCase()); + const OUString aHex(OUString::valueOf(static_cast(cChar), 16 ).toAsciiUpperCase()); const OUString aPattern( (aHex.getLength() > 4) ? OUString("Ux000000") : OUString("Ux0000") ); OUString aUnicodePos( aPattern.copy( 0, aPattern.getLength() - aHex.getLength() ) ); aUnicodePos += aHex; @@ -1974,7 +1974,7 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton ) // clear display for original symbol if necessary if (bNameChanged) - SetOrigSymbol(NULL, rtl::OUString()); + SetOrigSymbol(NULL, OUString()); // update display of new symbol aSymbolDisplay.SetSymbol( &aNewSymbol ); @@ -2006,7 +2006,7 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton ) aSymbolMgrCopy.RemoveSymbol( pOrigSymbol->GetName() ); // clear display for original symbol - SetOrigSymbol(NULL, rtl::OUString()); + SetOrigSymbol(NULL, OUString()); // update list box entries FillSymbolSets(aOldSymbolSets, false); @@ -2063,7 +2063,7 @@ IMPL_LINK( SmSymDefineDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString( "HID_SMA_SYMDEFINEDIALOG" ), &aHelpBtn ); + pHelp->Start( OUString( "HID_SMA_SYMDEFINEDIALOG" ), &aHelpBtn ); } return 0; } @@ -2254,7 +2254,7 @@ bool SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox, bRet = true; } else if (bDeleteText) - rComboBox.SetText(rtl::OUString()); + rComboBox.SetText(OUString()); bool bIsOld = &rComboBox == &aOldSymbolSets; @@ -2301,7 +2301,7 @@ void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol, } else { // delete displayed symbols - aOldSymbolDisplay.SetText(rtl::OUString()); + aOldSymbolDisplay.SetText(OUString()); aOldSymbolDisplay.Invalidate(); } aOldSymbolName .SetText(aSymName); @@ -2359,7 +2359,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, bRet = true; } else if (bDeleteText) - rComboBox.SetText(rtl::OUString()); + rComboBox.SetText(OUString()); if (bIsOld) { @@ -2467,7 +2467,7 @@ bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont) bRet = sal_True; } else - aStyles.SetText(rtl::OUString()); + aStyles.SetText(OUString()); UpdateButtons(); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 6f6222163e48..37e0b4d448c7 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -387,14 +387,14 @@ EditEngine& SmDocShell::GetEditEngine() pEditEngine->EnableUndo( true ); pEditEngine->SetDefTab( sal_uInt16( - Application::GetDefaultDevice()->GetTextWidth(rtl::OUString("XXXX"))) ); + Application::GetDefaultDevice()->GetTextWidth(OUString("XXXX"))) ); pEditEngine->SetControlWord( (pEditEngine->GetControlWord() | EE_CNTRL_AUTOINDENTING) & (~EE_CNTRL_UNDOATTRIBS) & (~EE_CNTRL_PASTESPECIAL) ); - pEditEngine->SetWordDelimiters( rtl::OUString(" .=+-*/(){}[];\"" ) ); + pEditEngine->SetWordDelimiters( OUString(" .=+-*/(){}[];\"" ) ); pEditEngine->SetRefMapMode( MAP_PIXEL ); pEditEngine->SetPaperSize( Size( 800, 0 ) ); @@ -770,7 +770,7 @@ sal_Bool SmDocShell::ConvertFrom(SfxMedium &rMedium) if ( SotStorage::IsStorageFile( pStream ) ) { SvStorageRef aStorage = new SotStorage( pStream, false ); - if ( aStorage->IsStream(rtl::OUString("Equation Native")) ) + if ( aStorage->IsStream(OUString("Equation Native")) ) { // is this a MathType Storage? MathType aEquation( aText ); @@ -817,12 +817,12 @@ sal_Bool SmDocShell::Load( SfxMedium& rMedium ) uno::Reference < container::XNameAccess > xAccess (xStorage, uno::UNO_QUERY); if ( ( - xAccess->hasByName( rtl::OUString("content.xml") ) && - xStorage->isStreamElement( rtl::OUString("content.xml") ) + xAccess->hasByName( OUString("content.xml") ) && + xStorage->isStreamElement( OUString("content.xml") ) ) || ( - xAccess->hasByName( rtl::OUString("Content.xml") ) && - xStorage->isStreamElement( rtl::OUString("Content.xml") ) + xAccess->hasByName( OUString("Content.xml") ) && + xStorage->isStreamElement( OUString("Content.xml") ) ) ) { @@ -1257,7 +1257,7 @@ void SmDocShell::GetState(SfxItemSet &rSet) sal_Unicode cMod = ' '; if (IsModified()) cMod = '*'; - rSet.Put(SfxStringItem(SID_MODIFYSTATUS, rtl::OUString(cMod))); + rSet.Put(SfxStringItem(SID_MODIFYSTATUS, OUString(cMod))); } break; @@ -1290,7 +1290,7 @@ void SmDocShell::GetState(SfxItemSet &rSet) ::svl::IUndoManager* pTmpUndoMgr = GetUndoManager(); if( pTmpUndoMgr ) { - rtl::OUString(::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const; + OUString(::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const; sal_uInt16 nCount; if( SID_GETUNDOSTRINGS == nWh ) diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 9d9e1641cba3..395e274a2548 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -225,7 +225,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) //! see also SmDocShell::GetEditEngine() ! //! - pEditEngine->SetDefTab(sal_uInt16(GetTextWidth(rtl::OUString("XXXX")))); + pEditEngine->SetDefTab(sal_uInt16(GetTextWidth(OUString("XXXX")))); SetEditEngineDefaultFonts(*pEditEngineItemPool); @@ -343,7 +343,7 @@ void SmEditWindow::Command(const CommandEvent& rCEvt) aEvent.SourceWindow = VCLUnoHelper::GetInterface( this ); aEvent.ExecutePosition.X = aPoint.X(); aEvent.ExecutePosition.Y = aPoint.Y(); - ::rtl::OUString sDummy; + OUString sDummy; if ( GetView()->TryContextMenuInterception( *pPopupMenu, sDummy, pMenu, aEvent ) ) { if ( pMenu ) diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx index 23a4be0789ce..a017963d41bf 100644 --- a/starmath/source/eqnolefilehdr.cxx +++ b/starmath/source/eqnolefilehdr.cxx @@ -33,7 +33,7 @@ sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) // code snippet copied from MathType::Parse // SvStorageStreamRef xSrc = pStor->OpenSotStream( - rtl::OUString("Equation Native"), + OUString("Equation Native"), STREAM_STD_READ | STREAM_NOCREATE); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) return bSuccess; diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index 9fa5b616960a..c18b4923077e 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -73,7 +73,7 @@ String GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent ) "index out opd range" ); if (FNT_MATH == nIdent) - return rtl::OUString(FNTNAME_MATH); + return OUString(FNTNAME_MATH); else { const sal_uInt16 *pTable; @@ -139,10 +139,10 @@ SmFormat::SmFormat() vFont[FNT_FUNCTION] = vFont[FNT_NUMBER] = vFont[FNT_TEXT] = - vFont[FNT_SERIF] = SmFace(rtl::OUString(FNTNAME_TIMES), aBaseSize); - vFont[FNT_SANS] = SmFace(rtl::OUString(FNTNAME_HELV), aBaseSize); - vFont[FNT_FIXED] = SmFace(rtl::OUString(FNTNAME_COUR), aBaseSize); - vFont[FNT_MATH] = SmFace(rtl::OUString(FNTNAME_MATH), aBaseSize); + vFont[FNT_SERIF] = SmFace(OUString(FNTNAME_TIMES), aBaseSize); + vFont[FNT_SANS] = SmFace(OUString(FNTNAME_HELV), aBaseSize); + vFont[FNT_FIXED] = SmFace(OUString(FNTNAME_COUR), aBaseSize); + vFont[FNT_MATH] = SmFace(OUString(FNTNAME_MATH), aBaseSize); vFont[FNT_MATH].SetCharSet( RTL_TEXTENCODING_UNICODE ); diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index f18ebbc2ec5f..d87195dfd8e1 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -82,8 +82,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define EXPORT_SVC_NAME "com.sun.star.xml.XMLExportFilter" @@ -532,7 +530,7 @@ throw( uno::Exception ) // XServiceInfo // override empty method from parent class -rtl::OUString SAL_CALL SmXMLExport::getImplementationName() +OUString SAL_CALL SmXMLExport::getImplementationName() throw(uno::RuntimeException) { OUString aTxt; @@ -714,7 +712,7 @@ void SmXMLExport::GetConfigurationSettings( Sequence < PropertyValue > & rProps) { pProps->Name = rPropName; - rtl::OUString aActualName( rPropName ); + OUString aActualName( rPropName ); // handle 'save used symbols only' if (bUsedSymbolsOnly && rPropName == "Symbols" ) diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx index 98da8d7e8ee0..52b558eeb51e 100644 --- a/starmath/source/mathmlexport.hxx +++ b/starmath/source/mathmlexport.hxx @@ -108,7 +108,7 @@ public: virtual ~SmXMLExport() {}; // XServiceInfo (override parent method) - ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // XUnoTunnel sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException); diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 3d730eb63d80..3487a386be29 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -77,8 +77,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define IMPORT_SVC_NAME "com.sun.star.xml.XMLImportFilter" @@ -507,7 +505,7 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLImportSettings_createInstance( // XServiceInfo // override empty method from parent class -rtl::OUString SAL_CALL SmXMLImport::getImplementationName() +OUString SAL_CALL SmXMLImport::getImplementationName() throw(uno::RuntimeException) { OUString aTxt; diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx index 3e3c45092865..483256e7b554 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -92,7 +92,7 @@ public: virtual ~SmXMLImport() throw (); // XServiceInfo (override parent method) - ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); // XUnoTunnel sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException); @@ -103,131 +103,131 @@ public: ::com::sun::star::uno::RuntimeException ); SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateMathContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateRowContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateFracContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateNumberContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateTextContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateAnnotationContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateStringContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateIdentifierContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateOperatorContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateSpaceContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateSqrtContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateRootContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateStyleContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreatePaddedContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreatePhantomContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateFencedContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateErrorContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateSubContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateSupContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateSubSupContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateUnderContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateOverContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateUnderOverContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateMultiScriptsContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateNoneContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreatePrescriptsContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateTableContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateTableRowContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateTableCellContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateAlignGroupContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); SvXMLImportContext *CreateActionContext(sal_uInt16 nPrefix, - const rtl::OUString &rLocalName, + const OUString &rLocalName, const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList> &xAttrList); diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index c003c9d9ce8b..8a73c1a604b3 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -555,7 +555,7 @@ void MathType::TypeFaceToString(String &rTxt,sal_uInt8 nFace) int MathType::Parse(SotStorage *pStor) { SvStorageStreamRef xSrc = pStor->OpenSotStream( - rtl::OUString("Equation Native"), + OUString("Equation Native"), STREAM_STD_READ | STREAM_NOCREATE); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) return 0; @@ -658,7 +658,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, int i,nRet=1,newline=0; bool bSilent=false; int nPart=0; - rtl::OUString sPush,sMainTerm; + OUString sPush,sMainTerm; int nSetSize=0,nSetAlign=0; int nCurRow=0,nCurCol=0; bool bOpenString=false; @@ -1898,7 +1898,7 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium ) SvGlobalName aGName(0x0002ce02L, 0x0000, 0x0000,0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46 ); - pStor->SetClass( aGName, 0, rtl::OUString("Microsoft Equation 3.0")); + pStor->SetClass( aGName, 0, OUString("Microsoft Equation 3.0")); static sal_uInt8 const aCompObj[] = { 0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00, @@ -1915,7 +1915,7 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium ) 0xB2, 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - SvStorageStreamRef xStor( pStor->OpenSotStream(rtl::OUString("\1CompObj"))); + SvStorageStreamRef xStor( pStor->OpenSotStream(OUString("\1CompObj"))); xStor->Write(aCompObj,sizeof(aCompObj)); static sal_uInt8 const aOle[] = { @@ -1923,12 +1923,12 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium ) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - SvStorageStreamRef xStor2( pStor->OpenSotStream(rtl::OUString("\1Ole"))); + SvStorageStreamRef xStor2( pStor->OpenSotStream(OUString("\1Ole"))); xStor2->Write(aOle,sizeof(aOle)); xStor.Clear(); xStor2.Clear(); - SvStorageStreamRef xSrc = pStor->OpenSotStream(rtl::OUString("Equation Native")); + SvStorageStreamRef xSrc = pStor->OpenSotStream(OUString("Equation Native")); if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError())) return 0; diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index fd857d9c7657..ee6b8b39213e 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -563,7 +563,7 @@ void SmNode::DumpAsDot(std::ostream &out, OUString* label, int number, int& id, eq = eq.replaceAll("\\", "\\\\"); eq = eq.replaceAll("\"", "\\\""); out<<"label= \"Equation: \\\""; - out<< rtl::OUStringToOString(eq, RTL_TEXTENCODING_UTF8).getStr(); + out<< OUStringToOString(eq, RTL_TEXTENCODING_UTF8).getStr(); out<<"\\\"\";"<GetText(), RTL_TEXTENCODING_UTF8).getStr(); + out<< OUStringToOString(((SmTextNode*)this)->GetText(), RTL_TEXTENCODING_UTF8).getStr(); break; case NSPECIAL: out<<"SmSpecialNode"; break; case NGLYPH_SPECIAL: out<<"SmGlyphSpecialNode"; break; case NMATH: out<<"SmMathSymbolNode: "; - out<< rtl::OUStringToOString(((SmMathSymbolNode*)this)->GetText(), RTL_TEXTENCODING_UTF8).getStr(); + out<< OUStringToOString(((SmMathSymbolNode*)this)->GetText(), RTL_TEXTENCODING_UTF8).getStr(); break; case NBLANK: out<<"SmBlankNode"; break; case NERROR: out<<"SmErrorNode"; break; @@ -864,7 +864,7 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SmTmpDevice aTmpDev ((OutputDevice &) rDev, sal_True); aTmpDev.SetFont(GetFont()); - SmRect aRect = (SmRect(aTmpDev, &rFormat, rtl::OUString("a"), + SmRect aRect = (SmRect(aTmpDev, &rFormat, OUString("a"), GetFont().GetBorderWidth())); nFormulaBaseline = GetAlignM(); // move from middle position by constant - distance @@ -924,7 +924,7 @@ void SmLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) //! be sure to use a character that has explicitly defined HiAttribut //! line in rect.cxx such as 'a' in order to make 'vec a' look same to //! 'vec {a}'. - SmRect::operator = (SmRect(aTmpDev, &rFormat, rtl::OUString("a"), + SmRect::operator = (SmRect(aTmpDev, &rFormat, OUString("a"), GetFont().GetBorderWidth())); // make sure that the rectangle occupies (almost) no space SetWidth(1); @@ -2643,7 +2643,7 @@ SmMathSymbolNode::SmMathSymbolNode(const SmToken &rNodeToken) { sal_Unicode cChar = GetToken().cMathChar; if ((sal_Unicode) '\0' != cChar) - SetText(rtl::OUString(cChar)); + SetText(OUString(cChar)); } void SmMathSymbolNode::AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) @@ -3056,7 +3056,7 @@ void SmBlankNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) nSpace = nNum * nDist; // get a SmRect with Baseline and all the bells and whistles - SmRect::operator = (SmRect(aTmpDev, &rFormat, rtl::OUString(' '), + SmRect::operator = (SmRect(aTmpDev, &rFormat, OUString(' '), GetFont().GetBorderWidth())); // and resize it to the requested size diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 78734943b5b5..04278e1e2d9a 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -1023,7 +1023,7 @@ void SmParser::Align() if (CONVERT_40_TO_50 == GetConversion()) // encapsulate expression to be aligned in group braces // (here group-open brace) - { Insert(rtl::OUString('{'), GetTokenIndex()); + { Insert(OUString('{'), GetTokenIndex()); bNeedGroupClose = true; // get first valid align statement in sequence @@ -1061,7 +1061,7 @@ void SmParser::Align() Expression(); if (bNeedGroupClose) - Insert(rtl::OUString('}'), GetTokenIndex()); + Insert(OUString('}'), GetTokenIndex()); if (pSNode) { @@ -1551,7 +1551,7 @@ void SmParser::Term() else // encapsulate old 4.0 style parsing in braces { // insert opening brace - Insert(rtl::OUString('{'), GetTokenIndex()); + Insert(OUString('{'), GetTokenIndex()); // // parse in 4.0 style @@ -1568,7 +1568,7 @@ void SmParser::Term() } // insert closing brace - Insert(rtl::OUString('}'), GetTokenIndex()); + Insert(OUString('}'), GetTokenIndex()); SmStructureNode *pSNode = new SmExpressionNode(pFunc->GetToken()); pSNode->SetSubNodes(pFunc, lcl_popOrZero(m_aNodeStack)); @@ -1901,7 +1901,7 @@ void SmParser::Font() // gets number used as arguments in Math formulas (e.g. 'size' command) // Format: no negative numbers, must start with a digit, no exponent notation, ... -static bool lcl_IsNumber(const rtl::OUString& rText) +static bool lcl_IsNumber(const OUString& rText) { bool bPoint = false; const sal_Unicode* pBuffer = rText.getStr(); @@ -1959,7 +1959,7 @@ void SmParser::FontSize() Fraction aValue( 1L ); if (lcl_IsNumber( m_aCurToken.aText )) { - double fTmp = rtl::OUString(m_aCurToken.aText).toDouble(); + double fTmp = OUString(m_aCurToken.aText).toDouble(); if (fTmp != 0.0) { aValue = fTmp; diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index 1d3be5b0dda8..93f7d4dbd9ee 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -48,7 +48,7 @@ static sal_Unicode const aMathAlpha[] = sal_Unicode('\0') }; -bool SmIsMathAlpha(const rtl::OUString &rText) +bool SmIsMathAlpha(const OUString &rText) // true iff symbol (from StarMath Font) should be treated as letter { if (rText.isEmpty()) @@ -126,7 +126,7 @@ void SmRect::CopyAlignInfo(const SmRect &rRect) void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, sal_uInt16 nBorder) + const OUString &rText, sal_uInt16 nBorder) { OSL_ENSURE(aTopLeft == Point(0, 0), "Sm: Ooops..."); @@ -221,7 +221,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat, void SmRect::Init(const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, sal_uInt16 nEBorderWidth) + const OUString &rText, sal_uInt16 nEBorderWidth) // get rectangle fitting for drawing 'rText' on OutputDevice 'rDev' { BuildRect(rDev, pFormat, rText, nEBorderWidth); @@ -229,7 +229,7 @@ void SmRect::Init(const OutputDevice &rDev, const SmFormat *pFormat, SmRect::SmRect(const OutputDevice &rDev, const SmFormat *pFormat, - const rtl::OUString &rText, long nEBorderWidth) + const OUString &rText, long nEBorderWidth) { OSL_ENSURE( nEBorderWidth >= 0, "BorderWidth is negative" ); if (nEBorderWidth < 0) @@ -601,7 +601,7 @@ SmRect SmRect::AsGlyphRect() const } bool SmGetGlyphBoundRect(const OutputDevice &rDev, - const rtl::OUString &rText, Rectangle &rRect) + const OUString &rText, Rectangle &rRect) // basically the same as 'GetTextBoundRect' (in class 'OutputDevice') // but with a string as argument. { diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx index 0cc0a7d769d4..8bd7db94462c 100644 --- a/starmath/source/smdetect.hxx +++ b/starmath/source/smdetect.hxx @@ -62,7 +62,7 @@ public: //---------------------------------------------------------------------------------- // XExtendedFilterDetect //---------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); }; #endif diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx index f1ee279f4c7a..8395c09d63e9 100644 --- a/starmath/source/smdll.cxx +++ b/starmath/source/smdll.cxx @@ -56,7 +56,7 @@ namespace SmModule *pModule = new SmModule( &rFactory ); *ppShlPtr = pModule; - rFactory.SetDocumentServiceName( rtl::OUString("com.sun.star.formula.FormulaProperties") ); + rFactory.SetDocumentServiceName( OUString("com.sun.star.formula.FormulaProperties") ); SmModule::RegisterInterface(pModule); SmDocShell::RegisterInterface(pModule); diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 8c33c1af06fa..8fd26f90959e 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -226,7 +226,7 @@ SmModule::SmModule(SfxObjectFactory* pObjFact) : pSysLocale( 0 ), pVirtualDev( 0 ) { - SetName(rtl::OUString("StarMath")); + SetName(OUString("StarMath")); SvxModifyControl::RegisterControl(SID_DOC_MODIFIED, this); } diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx index 138ff10530d9..8a38ea19016b 100644 --- a/starmath/source/unodoc.cxx +++ b/starmath/source/unodoc.cxx @@ -28,14 +28,14 @@ using namespace ::com::sun::star; -::rtl::OUString SAL_CALL SmDocument_getImplementationName() throw() +OUString SAL_CALL SmDocument_getImplementationName() throw() { - return rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" ); + return OUString( "com.sun.star.comp.Math.FormulaDocument" ); } -uno::Sequence< rtl::OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw() { - uno::Sequence< rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); aSeq[0] = "com.sun.star.formula.FormulaProperties"; return aSeq; } diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 6efe36f70275..7b6415e28e89 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -83,8 +83,8 @@ SmPrintUIOptions::SmPrintUIOptions() m_aUIProperties.realloc( nNumProps ); // load the math PrinterOptions into the custom tab - m_aUIProperties[nIdx].Name = rtl::OUString("OptionsUIFile"); - m_aUIProperties[nIdx++].Value <<= rtl::OUString("modules/smath/ui/printeroptions.ui"); + m_aUIProperties[nIdx].Name = OUString("OptionsUIFile"); + m_aUIProperties[nIdx++].Value <<= OUString("modules/smath/ui/printeroptions.ui"); // create Section for formula (results in an extra tab page in dialog) SvtModuleOptions aOpt; @@ -94,7 +94,7 @@ SmPrintUIOptions::SmPrintUIOptions() m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"); // create subgroup for print options - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("contents", aLocalizedStrings.GetString(1), rtl::OUString()); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("contents", aLocalizedStrings.GetString(1), OUString()); // create a bool option for title row (matches to SID_PRINTTITLE) m_aUIProperties[nIdx++].Value = setBoolControlOpt("title", aLocalizedStrings.GetString( 2 ), @@ -113,23 +113,23 @@ SmPrintUIOptions::SmPrintUIOptions() pConfig->IsPrintFrame()); // create subgroup for print format - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("size", aLocalizedStrings.GetString(5), rtl::OUString()); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("size", aLocalizedStrings.GetString(5), OUString()); // create a radio button group for print format (matches to SID_PRINTSIZE) - Sequence< rtl::OUString > aChoices( 3 ); + Sequence< OUString > aChoices( 3 ); aChoices[0] = aLocalizedStrings.GetString( 6 ); aChoices[1] = aLocalizedStrings.GetString( 7 ); aChoices[2] = aLocalizedStrings.GetString( 8 ); - Sequence< rtl::OUString > aHelpIds( 3 ); + Sequence< OUString > aHelpIds( 3 ); aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0"; aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1"; aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2"; - Sequence< rtl::OUString > aWidgetIds( 3 ); + Sequence< OUString > aWidgetIds( 3 ); aWidgetIds[0] = "originalsize"; aWidgetIds[1] = "fittopage"; aWidgetIds[2] = "scaling"; OUString aPrintFormatProp( PRTUIOPT_PRINT_FORMAT ); - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintFormatProp, aChoices, static_cast< sal_Int32 >(pConfig->GetPrintSize()) @@ -137,7 +137,7 @@ SmPrintUIOptions::SmPrintUIOptions() // create a numeric box for scale dependent on PrintFormat = "Scaling" (matches to SID_PRINTZOOM) vcl::PrinterOptionsHelper::UIControlOptions aRangeOpt( aPrintFormatProp, 2, sal_True ); - m_aUIProperties[nIdx++].Value = setRangeControlOpt("scalingspin", rtl::OUString(), + m_aUIProperties[nIdx++].Value = setRangeControlOpt("scalingspin", OUString(), ".HelpID:vcl:PrintDialog:PrintScale:NumericField", PRTUIOPT_PRINT_SCALE, pConfig->GetPrintZoomFactor(), // initial value @@ -294,7 +294,7 @@ static PropertySetInfo * lcl_createModelPropertyInfo () { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolPrimaryHeight" ), HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_ORNAMENTSIZE }, { RTL_CONSTASCII_STRINGPARAM( "RelativeUpperLimitDistance" ), HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_UPPERLIMIT }, { RTL_CONSTASCII_STRINGPARAM( "RightMargin" ), HANDLE_RIGHT_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_RIGHTSPACE }, - { RTL_CONSTASCII_STRINGPARAM( "RuntimeUID" ), HANDLE_RUNTIME_UID , &::getCppuType(static_cast< const rtl::OUString * >(0)), PropertyAttribute::READONLY, 0 }, + { RTL_CONSTASCII_STRINGPARAM( "RuntimeUID" ), HANDLE_RUNTIME_UID , &::getCppuType(static_cast< const OUString * >(0)), PropertyAttribute::READONLY, 0 }, { RTL_CONSTASCII_STRINGPARAM( "Symbols" ), HANDLE_SYMBOLS , &::getCppuType((const Sequence < SymbolDescriptor > *)0), PROPERTY_NONE, 0 }, { RTL_CONSTASCII_STRINGPARAM( "UserDefinedSymbolsInUse" ), HANDLE_USED_SYMBOLS , &::getCppuType((const Sequence < SymbolDescriptor > *)0), PropertyAttribute::READONLY, 0 }, { RTL_CONSTASCII_STRINGPARAM( "TopMargin" ), HANDLE_TOP_MARGIN , &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, DIS_TOPSPACE }, @@ -407,9 +407,9 @@ OUString SmModel::getImplementationName(void) throw( uno::RuntimeException ) } -::rtl::OUString SmModel::getImplementationName_Static() +OUString SmModel::getImplementationName_Static() { - return rtl::OUString("com.sun.star.comp.math.FormulaDocument"); + return OUString("com.sun.star.comp.math.FormulaDocument"); } sal_Bool SmModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) @@ -863,7 +863,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu case HANDLE_USED_SYMBOLS: { const bool bUsedSymbolsOnly = (*ppEntries)->mnHandle == HANDLE_USED_SYMBOLS; - const std::set< rtl::OUString > &rUsedSymbols = pDocSh->GetUsedSymbols(); + const std::set< OUString > &rUsedSymbols = pDocSh->GetUsedSymbols(); // this is get SmModule *pp = SM_MOD(); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 964e284f3df6..bca602edade9 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -527,7 +527,7 @@ void SmGraphicWindow::KeyInput(const KeyEvent& rKEvt) rCursor.MoveAfterBracket(pBraceNode); }else{ if(code != 0){ - rCursor.InsertText(rtl::OUString(code)); + rCursor.InsertText(OUString(code)); }else if (! (GetView() && GetView()->KeyInput(rKEvt)) ) ScrollableWindow::KeyInput(rKEvt); } @@ -1003,7 +1003,7 @@ Size SmViewShell::GetTextLineSize(OutputDevice& rDevice, const String& rLine) if (nTabs > 0) { - long TabPos = rDevice.GetTextWidth(rtl::OUString('n')) * 8; + long TabPos = rDevice.GetTextWidth(OUString('n')) * 8; aSize.Width() = 0; @@ -1093,7 +1093,7 @@ void SmViewShell::DrawTextLine(OutputDevice& rDevice, const Point& rPosition, co if (nTabs > 0) { - long TabPos = rDevice.GetTextWidth(rtl::OUString('n')) * 8; + long TabPos = rDevice.GetTextWidth(OUString('n')) * 8; for (sal_uInt16 i = 0; i < nTabs; i++) { @@ -1453,7 +1453,7 @@ bool SmViewShell::Insert( SfxMedium& rMedium ) uno::Reference< container::XNameAccess > xNameAccess( xStorage, uno::UNO_QUERY ); if ( xNameAccess.is() && xNameAccess->getElementNames().getLength() ) { - if ( xNameAccess->hasByName( rtl::OUString("content.xml") ) || xNameAccess->hasByName( rtl::OUString("Content.xml") )) + if ( xNameAccess->hasByName( OUString("content.xml") ) || xNameAccess->hasByName( OUString("Content.xml") )) { // is this a fabulous math package ? Reference xModel(pDoc->GetModel()); @@ -1953,7 +1953,7 @@ SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *): SetStatusText(OUString()); SetWindow(&aGraphic); - SfxShell::SetName(rtl::OUString("SmView")); + SfxShell::SetName(OUString("SmView")); SfxShell::SetUndoManager( &GetDoc()->GetEditEngine().GetUndoManager() ); SetHelpId( HID_SMA_VIEWSHELL_DOCUMENT ); } diff --git a/stoc/inc/bootstrapservices.hxx b/stoc/inc/bootstrapservices.hxx index fb25ade9cc93..57b9ca907cb0 100644 --- a/stoc/inc/bootstrapservices.hxx +++ b/stoc/inc/bootstrapservices.hxx @@ -33,71 +33,71 @@ namespace stoc_bootstrap //servicemanager ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OServiceManager_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > smgr_wrapper_getSupportedServiceNames(); - ::rtl::OUString smgr_wrapper_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > smgr_wrapper_getSupportedServiceNames(); + OUString smgr_wrapper_getImplementationName(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OServiceManagerWrapper_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ) throw (::com::sun::star::uno::Exception); - ::com::sun::star::uno::Sequence< ::rtl::OUString > smgr_getSupportedServiceNames(); - ::rtl::OUString smgr_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > smgr_getSupportedServiceNames(); + OUString smgr_getImplementationName(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ORegistryServiceManager_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > regsmgr_getSupportedServiceNames(); - ::rtl::OUString regsmgr_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > regsmgr_getSupportedServiceNames(); + OUString regsmgr_getImplementationName(); //security ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ac_create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xComponentContext ) SAL_THROW( (::com::sun::star::uno::Exception) ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > ac_getSupportedServiceNames() SAL_THROW(()); - ::rtl::OUString ac_getImplementationName() SAL_THROW(()); + ::com::sun::star::uno::Sequence< OUString > ac_getSupportedServiceNames() SAL_THROW(()); + OUString ac_getImplementationName() SAL_THROW(()); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL filepolicy_create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xComponentContext ) SAL_THROW( (com::sun::star::uno::Exception) ); - ::com::sun::star::uno::Sequence< rtl::OUString > filepolicy_getSupportedServiceNames() SAL_THROW(()); - ::rtl::OUString filepolicy_getImplementationName() SAL_THROW(()); + ::com::sun::star::uno::Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW(()); + OUString filepolicy_getImplementationName() SAL_THROW(()); //defaultregistry ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL NestedRegistry_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ) throw( ::com::sun::star::uno::Exception); - ::com::sun::star::uno::Sequence< ::rtl::OUString > defreg_getSupportedServiceNames(); - ::rtl::OUString defreg_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > defreg_getSupportedServiceNames(); + OUString defreg_getImplementationName(); //simpleregistry ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SimpleRegistry_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > simreg_getSupportedServiceNames(); - ::rtl::OUString simreg_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > simreg_getSupportedServiceNames(); + OUString simreg_getImplementationName(); //implementationregistry ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ImplementationRegistration_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); // throw(Exception) - ::com::sun::star::uno::Sequence< ::rtl::OUString > impreg_getSupportedServiceNames(); - ::rtl::OUString impreg_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > impreg_getSupportedServiceNames(); + OUString impreg_getImplementationName(); //loader ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL DllComponentLoader_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ) throw(::com::sun::star::uno::Exception); - ::com::sun::star::uno::Sequence< ::rtl::OUString > loader_getSupportedServiceNames(); - ::rtl::OUString loader_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > loader_getSupportedServiceNames(); + OUString loader_getImplementationName(); //registry_tdprovider ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ProviderImpl_create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ) throw(::com::sun::star::uno::Exception); - ::com::sun::star::uno::Sequence< ::rtl::OUString > rdbtdp_getSupportedServiceNames(); - ::rtl::OUString rdbtdp_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > rdbtdp_getSupportedServiceNames(); + OUString rdbtdp_getImplementationName(); //tdmanager ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ManagerImpl_create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ) SAL_THROW( (::com::sun::star::uno::Exception) ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL tdmgr_getSupportedServiceNames(); - ::rtl::OUString SAL_CALL tdmgr_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL tdmgr_getSupportedServiceNames(); + OUString SAL_CALL tdmgr_getImplementationName(); } // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/inc/stocservices.hxx b/stoc/inc/stocservices.hxx index 46d7efde70a2..3017c060815b 100644 --- a/stoc/inc/stocservices.hxx +++ b/stoc/inc/stocservices.hxx @@ -34,16 +34,16 @@ namespace stoc_services ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL TypeConverter_Impl_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & ) throw( ::com::sun::star::uno::RuntimeException ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > tcv_getSupportedServiceNames(); - ::rtl::OUString tcv_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > tcv_getSupportedServiceNames(); + OUString tcv_getImplementationName(); namespace ExternalUriReferenceTranslator { com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context) SAL_THROW((com::sun::star::uno::Exception)); - rtl::OUString SAL_CALL getImplementationName(); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(); + OUString SAL_CALL getImplementationName(); + com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } namespace UriReferenceFactory @@ -51,8 +51,8 @@ namespace stoc_services com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context) SAL_THROW((com::sun::star::uno::Exception)); - rtl::OUString SAL_CALL getImplementationName(); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(); + OUString SAL_CALL getImplementationName(); + com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } namespace UriSchemeParser_vndDOTsunDOTstarDOTexpand @@ -60,8 +60,8 @@ namespace stoc_services ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const &) SAL_THROW((::com::sun::star::uno::Exception)); - ::rtl::OUString SAL_CALL getImplementationName(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(); + OUString SAL_CALL getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } namespace UriSchemeParser_vndDOTsunDOTstarDOTscript @@ -69,8 +69,8 @@ namespace stoc_services com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &) SAL_THROW((com::sun::star::uno::Exception)); - rtl::OUString SAL_CALL getImplementationName(); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(); + OUString SAL_CALL getImplementationName(); + com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } namespace VndSunStarPkgUrlReferenceFactory @@ -78,8 +78,8 @@ namespace stoc_services com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL create( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context) SAL_THROW((com::sun::star::uno::Exception)); - rtl::OUString SAL_CALL getImplementationName(); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(); + OUString SAL_CALL getImplementationName(); + com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } } // namespace diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index a8f45329993b..6bb8b11d9bca 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -26,6 +26,7 @@ #include #include #include +#include #include "lrucache.hxx" @@ -52,8 +53,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::reflection; using namespace com::sun::star::container; -using ::rtl::OUString; - namespace stoc_corefl { diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 5015c69659fa..edec3880ec2e 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -31,9 +31,6 @@ using namespace com::sun::star::registry; using namespace cppu; using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; #include "base.hxx" diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 12d6a6bd2b25..d199c9361cef 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -146,7 +146,7 @@ Reference< XIdlClass > IdlAttributeFieldImpl::getDeclaringClass() MutexGuard aGuard( getMutexAccess() ); if (! _xDeclClass.is()) { - rtl::OUString aName(getAttributeTypeDescr()->aBase.aBase.pTypeName); + OUString aName(getAttributeTypeDescr()->aBase.aBase.pTypeName); sal_Int32 i = aName.indexOf(':'); OSL_ASSERT(i >= 0); _xDeclClass = getReflection()->forName(aName.copy(0, i)); @@ -451,7 +451,7 @@ Reference< XIdlClass > IdlInterfaceMethodImpl::getDeclaringClass() MutexGuard aGuard( getMutexAccess() ); if (! _xDeclClass.is()) { - rtl::OUString aName(getMethodTypeDescr()->aBase.aBase.pTypeName); + OUString aName(getMethodTypeDescr()->aBase.aBase.pTypeName); sal_Int32 i = aName.indexOf(':'); OSL_ASSERT(i >= 0); _xDeclClass = getReflection()->forName(aName.copy(0, i)); diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx index 991fa26d5d4c..1d21df16e630 100644 --- a/stoc/source/corereflection/lrucache.hxx +++ b/stoc/source/corereflection/lrucache.hxx @@ -221,16 +221,16 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear() } //================================================================================================== -struct FctHashOUString : public ::std::unary_function< const ::rtl::OUString &, size_t > +struct FctHashOUString : public ::std::unary_function< const OUString &, size_t > { - size_t operator()( const ::rtl::OUString & rKey ) const + size_t operator()( const OUString & rKey ) const { return rKey.hashCode(); } }; /** Template instance for OUString keys, Any values.
      */ -typedef LRU_Cache< ::rtl::OUString, ::com::sun::star::uno::Any, - FctHashOUString, ::std::equal_to< ::rtl::OUString > > +typedef LRU_Cache< OUString, ::com::sun::star::uno::Any, + FctHashOUString, ::std::equal_to< OUString > > LRU_CacheAnyByOUString; diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index b6534fb06122..198b90b85254 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -44,7 +44,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace cppu; using namespace osl; -using ::rtl::OUString; #define SERVICENAME "com.sun.star.registry.NestedRegistry" #define IMPLNAME "com.sun.star.comp.stoc.NestedRegistry" diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 568bc0560e7d..ccdfd90cf97a 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -61,8 +61,6 @@ using namespace com::sun::star::registry; using namespace cppu; using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define IMPLNAME "com.sun.star.comp.stoc.ImplementationRegistration" #define SERVICENAME "com.sun.star.registry.ImplementationRegistration" namespace stoc_impreg @@ -583,7 +581,7 @@ static void deleteUserLink(const Reference < XRegistryKey >& xRootKey, } else { oldImpl = implEntries.getConstArray()[0]; - rtl::OUString path(xOldKey->getKeyName()); + OUString path(xOldKey->getKeyName()); xOldKey->closeKey(); xRootKey->deleteKey(path); } @@ -599,7 +597,7 @@ static void deleteUserLink(const Reference < XRegistryKey >& xRootKey, { bClean = sal_True; hasNoImplementations = sal_False; - rtl::OUString path(xOldKey->getKeyName()); + OUString path(xOldKey->getKeyName()); xOldKey->closeKey(); xRootKey->deleteKey(path); } @@ -762,7 +760,7 @@ static void deleteAllImplementations( const Reference < XSimpleRegistry >& xRe if (hasLocationUrl) { hasLocationUrl = sal_False; - rtl::OUString path(xImplKey->getKeyName()); + OUString path(xImplKey->getKeyName()); xImplKey->closeKey(); xReg->getRootKey()->deleteKey(path); } @@ -771,13 +769,13 @@ static void deleteAllImplementations( const Reference < XSimpleRegistry >& xRe subKeys = xSource->openKeys(); if (subKeys.getLength() == 0) { - rtl::OUString path(xSource->getKeyName()); + OUString path(xSource->getKeyName()); xSource->closeKey(); xReg->getRootKey()->deleteKey(path); } } else { - rtl::OUString path(xSource->getKeyName()); + OUString path(xSource->getKeyName()); xSource->closeKey(); xReg->getRootKey()->deleteKey(path); } @@ -904,7 +902,7 @@ static void deleteAllServiceEntries( const Reference < XSimpleRegistry >& xRe if (hasNoImplementations) { hasNoImplementations = sal_False; - rtl::OUString path(xServiceKey->getKeyName()); + OUString path(xServiceKey->getKeyName()); xServiceKey->closeKey(); xReg->getRootKey()->deleteKey(path); } @@ -913,13 +911,13 @@ static void deleteAllServiceEntries( const Reference < XSimpleRegistry >& xRe subKeys = xSource->openKeys(); if (subKeys.getLength() == 0) { - rtl::OUString path(xSource->getKeyName()); + OUString path(xSource->getKeyName()); xSource->closeKey(); xReg->getRootKey()->deleteKey(path); } } else { - rtl::OUString path(xSource->getKeyName()); + OUString path(xSource->getKeyName()); xSource->closeKey(); xReg->getRootKey()->deleteKey(path); } diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index a7cea62c707f..4c36dc546037 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -134,7 +134,7 @@ sal_Bool isDerivedFrom( Reference xToTestClass, Reference // Hashtable for the search of names struct hashName_Impl { - size_t operator()(const ::rtl::OUString Str) const + size_t operator()(const OUString Str) const { return (size_t)Str.hashCode(); } @@ -142,7 +142,7 @@ struct hashName_Impl struct eqName_Impl { - sal_Bool operator()(const ::rtl::OUString Str1, const ::rtl::OUString Str2) const + sal_Bool operator()(const OUString Str1, const OUString Str2) const { return ( Str1 == Str2 ); } @@ -150,7 +150,7 @@ struct eqName_Impl typedef boost::unordered_map < - ::rtl::OUString, + OUString, sal_Int32, hashName_Impl, eqName_Impl @@ -162,8 +162,8 @@ IntrospectionNameMap; // converted names, for the support of XExactName typedef boost::unordered_map < - ::rtl::OUString, - ::rtl::OUString, + OUString, + OUString, hashName_Impl, eqName_Impl > @@ -245,13 +245,13 @@ public: { delete[] mpOrgPropertyHandleArray; } - sal_Int32 getPropertyIndex( const ::rtl::OUString& aPropertyName ) const; - sal_Int32 getMethodIndex( const ::rtl::OUString& aMethodName ) const; + sal_Int32 getPropertyIndex( const OUString& aPropertyName ) const; + sal_Int32 getMethodIndex( const OUString& aMethodName ) const; // Methods of XIntrospectionAccess (OLD, now only Impl) - void setPropertyValue(const Any& obj, const ::rtl::OUString& aPropertyName, const Any& aValue) const; -// void setPropertyValue(Any& obj, const ::rtl::OUString& aPropertyName, const Any& aValue) const; - Any getPropertyValue(const Any& obj, const ::rtl::OUString& aPropertyName) const; + void setPropertyValue(const Any& obj, const OUString& aPropertyName, const Any& aValue) const; +// void setPropertyValue(Any& obj, const OUString& aPropertyName, const Any& aValue) const; + Any getPropertyValue(const Any& obj, const OUString& aPropertyName) const; void setPropertyValueByIndex(const Any& obj, sal_Int32 nIndex, const Any& aValue) const; // void setPropertyValueByIndex(Any& obj, sal_Int32 nIndex, const Any& aValue) const; Any getPropertyValueByIndex(const Any& obj, sal_Int32 nIndex) const; @@ -289,7 +289,7 @@ IntrospectionAccessStatic_Impl::IntrospectionAccessStatic_Impl( Reference< XIdlR mnMethCount = 0; } -sal_Int32 IntrospectionAccessStatic_Impl::getPropertyIndex( const ::rtl::OUString& aPropertyName ) const +sal_Int32 IntrospectionAccessStatic_Impl::getPropertyIndex( const OUString& aPropertyName ) const { sal_Int32 iHashResult = -1; IntrospectionAccessStatic_Impl* pThis = (IntrospectionAccessStatic_Impl*)this; @@ -299,7 +299,7 @@ sal_Int32 IntrospectionAccessStatic_Impl::getPropertyIndex( const ::rtl::OUStrin return iHashResult; } -sal_Int32 IntrospectionAccessStatic_Impl::getMethodIndex( const ::rtl::OUString& aMethodName ) const +sal_Int32 IntrospectionAccessStatic_Impl::getMethodIndex( const OUString& aMethodName ) const { sal_Int32 iHashResult = -1; IntrospectionAccessStatic_Impl* pThis = (IntrospectionAccessStatic_Impl*)this; @@ -319,15 +319,15 @@ sal_Int32 IntrospectionAccessStatic_Impl::getMethodIndex( const ::rtl::OUString& if( nFound == -1 ) break; - ::rtl::OUString aPureMethodName = aMethodName.copy( nFound + 1 ); + OUString aPureMethodName = aMethodName.copy( nFound + 1 ); aIt = pThis->maMethodNameMap.find( aPureMethodName ); if( !( aIt == pThis->maMethodNameMap.end() ) ) { // Check if it can be a type? // Problem: Does not work if package names contain _ ?! - ::rtl::OUString aStr = aMethodName.copy( 0, nFound ); - ::rtl::OUString aTypeName = aStr.replace( '_', '.' ); + OUString aStr = aMethodName.copy( 0, nFound ); + OUString aTypeName = aStr.replace( '_', '.' ); Reference< XIdlClass > xClass = mxCoreReflection->forName( aTypeName ); if( xClass.is() ) { @@ -380,8 +380,8 @@ sal_Int32 IntrospectionAccessStatic_Impl::getMethodIndex( const ::rtl::OUString& return iHashResult; } -void IntrospectionAccessStatic_Impl::setPropertyValue( const Any& obj, const ::rtl::OUString& aPropertyName, const Any& aValue ) const -//void IntrospectionAccessStatic_Impl::setPropertyValue( Any& obj, const ::rtl::OUString& aPropertyName, const Any& aValue ) const +void IntrospectionAccessStatic_Impl::setPropertyValue( const Any& obj, const OUString& aPropertyName, const Any& aValue ) const +//void IntrospectionAccessStatic_Impl::setPropertyValue( Any& obj, const OUString& aPropertyName, const Any& aValue ) const { sal_Int32 i = getPropertyIndex( aPropertyName ); if( i != -1 ) @@ -429,7 +429,7 @@ void IntrospectionAccessStatic_Impl::setPropertyValueByIndex(const Any& obj, sal if( eValType == TypeClass_INTERFACE ) { Type aPropType = rProp.Type; - ::rtl::OUString aTypeName( aPropType.getTypeName() ); + OUString aTypeName( aPropType.getTypeName() ); Reference< XIdlClass > xPropClass = mxCoreReflection->forName( aTypeName ); //Reference xPropClass = rProp.Type; if( xPropClass.is() && xPropClass->getTypeClass() == TypeClass_INTERFACE ) @@ -524,7 +524,7 @@ void IntrospectionAccessStatic_Impl::setPropertyValueByIndex(const Any& obj, sal } } -Any IntrospectionAccessStatic_Impl::getPropertyValue( const Any& obj, const ::rtl::OUString& aPropertyName ) const +Any IntrospectionAccessStatic_Impl::getPropertyValue( const Any& obj, const OUString& aPropertyName ) const { sal_Int32 i = getPropertyIndex( aPropertyName ); if( i != -1 ) @@ -720,15 +720,15 @@ public: throw( RuntimeException ); virtual sal_Int32 SAL_CALL getSuppliedPropertyConcepts(void) throw( RuntimeException ); - virtual Property SAL_CALL getProperty(const ::rtl::OUString& Name, sal_Int32 PropertyConcepts) + virtual Property SAL_CALL getProperty(const OUString& Name, sal_Int32 PropertyConcepts) throw( NoSuchElementException, RuntimeException ); - virtual sal_Bool SAL_CALL hasProperty(const ::rtl::OUString& Name, sal_Int32 PropertyConcepts) + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name, sal_Int32 PropertyConcepts) throw( RuntimeException ); virtual Sequence< Property > SAL_CALL getProperties(sal_Int32 PropertyConcepts) throw( RuntimeException ); - virtual Reference SAL_CALL getMethod(const ::rtl::OUString& Name, sal_Int32 MethodConcepts) + virtual Reference SAL_CALL getMethod(const OUString& Name, sal_Int32 MethodConcepts) throw( NoSuchMethodException, RuntimeException ); - virtual sal_Bool SAL_CALL hasMethod(const ::rtl::OUString& Name, sal_Int32 MethodConcepts) + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name, sal_Int32 MethodConcepts) throw( RuntimeException ); virtual Sequence< Reference > SAL_CALL getMethods(sal_Int32 MethodConcepts) throw( RuntimeException ); @@ -742,7 +742,7 @@ public: virtual Any SAL_CALL getMaterial(void) throw(RuntimeException); // Methoden von XExactName - virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& rApproximateName ) throw( RuntimeException ); + virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException ); }; ImplIntrospectionAccess::ImplIntrospectionAccess @@ -809,17 +809,17 @@ public: // Methoden von XPropertySet virtual Reference SAL_CALL getPropertySetInfo() throw( RuntimeException ); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& aPropertyName, const Any& aValue) + virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ); - virtual Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName) + virtual Any SAL_CALL getPropertyValue(const OUString& aPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference& aListener) + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const Reference& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference& aListener) + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const Reference& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const Reference& aListener) + virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const Reference& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const Reference& aListener) + virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const Reference& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); // Methoden von XFastPropertySet @@ -830,25 +830,25 @@ public: // Methoden von XPropertySetInfo virtual Sequence< Property > SAL_CALL getProperties(void) throw( RuntimeException ); - virtual Property SAL_CALL getPropertyByName(const ::rtl::OUString& Name) throw( RuntimeException ); - virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& Name) throw( RuntimeException ); + virtual Property SAL_CALL getPropertyByName(const OUString& Name) throw( RuntimeException ); + virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) throw( RuntimeException ); // Methoden von XElementAccess virtual Type SAL_CALL getElementType(void) throw( RuntimeException ); virtual sal_Bool SAL_CALL hasElements(void) throw( RuntimeException ); // Methoden von XNameAccess - virtual Any SAL_CALL getByName(const ::rtl::OUString& Name) + virtual Any SAL_CALL getByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException ); - virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames(void) throw( RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& Name) throw( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getElementNames(void) throw( RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( RuntimeException ); // Methoden von XNameContainer - virtual void SAL_CALL insertByName(const ::rtl::OUString& Name, const Any& Element) + virtual void SAL_CALL insertByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL replaceByName(const ::rtl::OUString& Name, const Any& Element) + virtual void SAL_CALL replaceByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL removeByName(const ::rtl::OUString& Name) + virtual void SAL_CALL removeByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException ); // Methoden von XIndexAccess @@ -940,19 +940,19 @@ Reference ImplIntrospectionAdapter::getPropertySetInfo(void) return (XPropertySetInfo *)this; } -void ImplIntrospectionAdapter::setPropertyValue(const ::rtl::OUString& aPropertyName, const Any& aValue) +void ImplIntrospectionAdapter::setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) { mpStaticImpl->setPropertyValue( mrInspectedObject, aPropertyName, aValue ); } -Any ImplIntrospectionAdapter::getPropertyValue(const ::rtl::OUString& aPropertyName) +Any ImplIntrospectionAdapter::getPropertyValue(const OUString& aPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { return mpStaticImpl->getPropertyValue( mrInspectedObject, aPropertyName ); } -void ImplIntrospectionAdapter::addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference& aListener) +void ImplIntrospectionAdapter::addPropertyChangeListener(const OUString& aPropertyName, const Reference& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { if( mxIface.is() ) @@ -965,7 +965,7 @@ void ImplIntrospectionAdapter::addPropertyChangeListener(const ::rtl::OUString& } } -void ImplIntrospectionAdapter::removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference& aListener) +void ImplIntrospectionAdapter::removePropertyChangeListener(const OUString& aPropertyName, const Reference& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { if( mxIface.is() ) @@ -978,7 +978,7 @@ void ImplIntrospectionAdapter::removePropertyChangeListener(const ::rtl::OUStrin } } -void ImplIntrospectionAdapter::addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const Reference& aListener) +void ImplIntrospectionAdapter::addVetoableChangeListener(const OUString& aPropertyName, const Reference& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { if( mxIface.is() ) @@ -991,7 +991,7 @@ void ImplIntrospectionAdapter::addVetoableChangeListener(const ::rtl::OUString& } } -void ImplIntrospectionAdapter::removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const Reference& aListener) +void ImplIntrospectionAdapter::removeVetoableChangeListener(const OUString& aPropertyName, const Reference& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { if( mxIface.is() ) @@ -1022,13 +1022,13 @@ Sequence< Property > ImplIntrospectionAdapter::getProperties(void) throw( Runtim return mpStaticImpl->getProperties(); } -Property ImplIntrospectionAdapter::getPropertyByName(const ::rtl::OUString& Name) +Property ImplIntrospectionAdapter::getPropertyByName(const OUString& Name) throw( RuntimeException ) { return mpAccess->getProperty( Name, PropertyConcept::ALL ); } -sal_Bool ImplIntrospectionAdapter::hasPropertyByName(const ::rtl::OUString& Name) +sal_Bool ImplIntrospectionAdapter::hasPropertyByName(const OUString& Name) throw( RuntimeException ) { return mpAccess->hasProperty( Name, PropertyConcept::ALL ); @@ -1046,38 +1046,38 @@ sal_Bool ImplIntrospectionAdapter::hasElements(void) throw( RuntimeException ) } // Methoden von XNameAccess -Any ImplIntrospectionAdapter::getByName(const ::rtl::OUString& Name) +Any ImplIntrospectionAdapter::getByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException ) { return mxObjNameAccess->getByName( Name ); } -Sequence< ::rtl::OUString > ImplIntrospectionAdapter::getElementNames(void) +Sequence< OUString > ImplIntrospectionAdapter::getElementNames(void) throw( RuntimeException ) { return mxObjNameAccess->getElementNames(); } -sal_Bool ImplIntrospectionAdapter::hasByName(const ::rtl::OUString& Name) +sal_Bool ImplIntrospectionAdapter::hasByName(const OUString& Name) throw( RuntimeException ) { return mxObjNameAccess->hasByName( Name ); } // Methoden von XNameContainer -void ImplIntrospectionAdapter::insertByName(const ::rtl::OUString& Name, const Any& Element) +void ImplIntrospectionAdapter::insertByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException ) { mxObjNameContainer->insertByName( Name, Element ); } -void ImplIntrospectionAdapter::replaceByName(const ::rtl::OUString& Name, const Any& Element) +void ImplIntrospectionAdapter::replaceByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException ) { mxObjNameContainer->replaceByName( Name, Element ); } -void ImplIntrospectionAdapter::removeByName(const ::rtl::OUString& Name) +void ImplIntrospectionAdapter::removeByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException ) { mxObjNameContainer->removeByName( Name ); @@ -1173,7 +1173,7 @@ sal_Int32 ImplIntrospectionAccess::getSuppliedPropertyConcepts(void) METHODS; } -Property ImplIntrospectionAccess::getProperty(const ::rtl::OUString& Name, sal_Int32 PropertyConcepts) +Property ImplIntrospectionAccess::getProperty(const OUString& Name, sal_Int32 PropertyConcepts) throw( NoSuchElementException, RuntimeException ) { Property aRet; @@ -1194,7 +1194,7 @@ Property ImplIntrospectionAccess::getProperty(const ::rtl::OUString& Name, sal_I return aRet; } -sal_Bool ImplIntrospectionAccess::hasProperty(const ::rtl::OUString& Name, sal_Int32 PropertyConcepts) +sal_Bool ImplIntrospectionAccess::hasProperty(const OUString& Name, sal_Int32 PropertyConcepts) throw( RuntimeException ) { sal_Int32 i = mpStaticImpl->getPropertyIndex( Name ); @@ -1265,7 +1265,7 @@ Sequence< Property > ImplIntrospectionAccess::getProperties(sal_Int32 PropertyCo return maLastPropertySeq; } -Reference ImplIntrospectionAccess::getMethod(const ::rtl::OUString& Name, sal_Int32 MethodConcepts) +Reference ImplIntrospectionAccess::getMethod(const OUString& Name, sal_Int32 MethodConcepts) throw( NoSuchMethodException, RuntimeException ) { Reference xRet; @@ -1285,7 +1285,7 @@ Reference ImplIntrospectionAccess::getMethod(const ::rtl::OUString& return xRet; } -sal_Bool ImplIntrospectionAccess::hasMethod(const ::rtl::OUString& Name, sal_Int32 MethodConcepts) +sal_Bool ImplIntrospectionAccess::hasMethod(const OUString& Name, sal_Int32 MethodConcepts) throw( RuntimeException ) { sal_Int32 i = mpStaticImpl->getMethodIndex( Name ); @@ -1350,8 +1350,8 @@ Sequence< Reference > ImplIntrospectionAccess::getMethods(sal_Int32 { // Methode mit Concepts ausgeben const Reference< XIdlMethod >& rxMethod = pSourceMethods[ i ]; - ::rtl::OString aNameStr = ::rtl::OUStringToOString( rxMethod->getName(), osl_getThreadTextEncoding() ); - ::rtl::OString ConceptStr; + OString aNameStr = OUStringToOString( rxMethod->getName(), osl_getThreadTextEncoding() ); + OString ConceptStr; if( nConcept & MethodConcept::DANGEROUS ) ConceptStr += "DANGEROUS |"; if( nConcept & MethodConcept::PROPERTY ) @@ -1407,20 +1407,20 @@ Any ImplIntrospectionAccess::getMaterial(void) throw(RuntimeException) return maInspectedObject; } -// Hilfs-Funktion zur LowerCase-Wandlung eines ::rtl::OUString -::rtl::OUString toLower( ::rtl::OUString aUStr ) +// Hilfs-Funktion zur LowerCase-Wandlung eines OUString +OUString toLower( OUString aUStr ) { // Tabelle fuer XExactName pflegen - ::rtl::OUString aOWStr( aUStr.getStr() ); - ::rtl::OUString aOWLowerStr = aOWStr.toAsciiLowerCase(); - ::rtl::OUString aLowerUStr( aOWLowerStr.getStr() ); + OUString aOWStr( aUStr.getStr() ); + OUString aOWLowerStr = aOWStr.toAsciiLowerCase(); + OUString aLowerUStr( aOWLowerStr.getStr() ); return aLowerUStr; } // Methoden von XExactName -::rtl::OUString ImplIntrospectionAccess::getExactName( const ::rtl::OUString& rApproximateName ) throw( RuntimeException ) +OUString ImplIntrospectionAccess::getExactName( const OUString& rApproximateName ) throw( RuntimeException ) { - ::rtl::OUString aRetStr; + OUString aRetStr; LowerToExactNameMap::iterator aIt = mpStaticImpl->maLowerToExactNameMap.find( toLower( rApproximateName ) ); if( !( aIt == mpStaticImpl->maLowerToExactNameMap.end() ) ) @@ -1626,11 +1626,11 @@ public: Sequence SAL_CALL getImplementationId( ) throw( RuntimeException ); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw(); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw(); - static ::rtl::OUString SAL_CALL getImplementationName_Static( ); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(void) throw(); + OUString SAL_CALL getImplementationName() throw(); + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(); + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(); + static OUString SAL_CALL getImplementationName_Static( ); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(void) throw(); // Methoden von XIntrospection virtual Reference SAL_CALL inspect(const Any& aToInspectObj) @@ -1661,7 +1661,7 @@ ImplIntrospection::ImplIntrospection( const Reference & rX mpTypeProviderCache = NULL; // Spezielle Klassen holen -// Reference< XInterface > xServiceIface = m_xSMgr->createInstance( ::rtl::OUString("com.sun.star.reflection.CoreReflection") ); +// Reference< XInterface > xServiceIface = m_xSMgr->createInstance( OUString("com.sun.star.reflection.CoreReflection") ); // if( xServiceIface.is() ) // mxCoreReflection = Reference< XIdlReflection >::query( xServiceIface ); Reference< XPropertySet > xProps( rXSMgr, UNO_QUERY ); @@ -1670,30 +1670,30 @@ ImplIntrospection::ImplIntrospection( const Reference & rX { Reference< XComponentContext > xContext; xProps->getPropertyValue( - ::rtl::OUString("DefaultContext") ) >>= xContext; + OUString("DefaultContext") ) >>= xContext; OSL_ASSERT( xContext.is() ); if (xContext.is()) { xContext->getValueByName( - ::rtl::OUString("/singletons/com.sun.star.reflection.theCoreReflection") ) >>= mxCoreReflection; + OUString("/singletons/com.sun.star.reflection.theCoreReflection") ) >>= mxCoreReflection; OSL_ENSURE( mxCoreReflection.is(), "### CoreReflection singleton not accessible!?" ); } } if (! mxCoreReflection.is()) { throw DeploymentException( - ::rtl::OUString("/singletons/com.sun.star.reflection.theCoreReflection singleton not accessible"), + OUString("/singletons/com.sun.star.reflection.theCoreReflection singleton not accessible"), Reference< XInterface >() ); } - mxElementAccessClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XElementAccess") ); - mxNameContainerClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XNameContainer") ); - mxNameAccessClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XNameAccess") ); - mxIndexContainerClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XIndexContainer") ); - mxIndexAccessClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XIndexAccess") ); - mxEnumerationAccessClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.container.XEnumerationAccess") ); - mxInterfaceClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.uno.XInterface") ); - mxAggregationClass = mxCoreReflection->forName( ::rtl::OUString("com.sun.star.uno.XAggregation") ); + mxElementAccessClass = mxCoreReflection->forName( OUString("com.sun.star.container.XElementAccess") ); + mxNameContainerClass = mxCoreReflection->forName( OUString("com.sun.star.container.XNameContainer") ); + mxNameAccessClass = mxCoreReflection->forName( OUString("com.sun.star.container.XNameAccess") ); + mxIndexContainerClass = mxCoreReflection->forName( OUString("com.sun.star.container.XIndexContainer") ); + mxIndexAccessClass = mxCoreReflection->forName( OUString("com.sun.star.container.XIndexAccess") ); + mxEnumerationAccessClass = mxCoreReflection->forName( OUString("com.sun.star.container.XEnumerationAccess") ); + mxInterfaceClass = mxCoreReflection->forName( OUString("com.sun.star.uno.XInterface") ); + mxAggregationClass = mxCoreReflection->forName( OUString("com.sun.star.uno.XAggregation") ); mbDisposed = sal_False; } @@ -1772,16 +1772,16 @@ Sequence< sal_Int8 > ImplIntrospection::getImplementationId() // XServiceInfo -::rtl::OUString ImplIntrospection::getImplementationName() throw() +OUString ImplIntrospection::getImplementationName() throw() { return getImplementationName_Static(); } // XServiceInfo -sal_Bool ImplIntrospection::supportsService(const ::rtl::OUString& ServiceName) throw() +sal_Bool ImplIntrospection::supportsService(const OUString& ServiceName) throw() { - Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -1789,23 +1789,23 @@ sal_Bool ImplIntrospection::supportsService(const ::rtl::OUString& ServiceName) } // XServiceInfo -Sequence< ::rtl::OUString > ImplIntrospection::getSupportedServiceNames(void) throw() +Sequence< OUString > ImplIntrospection::getSupportedServiceNames(void) throw() { return getSupportedServiceNames_Static(); } //************************************************************************* // Helper XServiceInfo -::rtl::OUString ImplIntrospection::getImplementationName_Static( ) +OUString ImplIntrospection::getImplementationName_Static( ) { - return ::rtl::OUString::createFromAscii( IMPLEMENTATION_NAME ); + return OUString::createFromAscii( IMPLEMENTATION_NAME ); } // ORegistryServiceManager_Static -Sequence< ::rtl::OUString > ImplIntrospection::getSupportedServiceNames_Static(void) throw() +Sequence< OUString > ImplIntrospection::getSupportedServiceNames_Static(void) throw() { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString::createFromAscii( SERVICE_NAME ); + Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString::createFromAscii( SERVICE_NAME ); return aSNS; } @@ -1885,10 +1885,10 @@ Reference TypeToIdlClass( const Type& rType, const Reference< XMultiS rType.getDescription( &pTD ); if( pTD ) { - ::rtl::OUString sOWName( pTD->pTypeName ); + OUString sOWName( pTD->pTypeName ); if( !xRefl.is() ) { - xRefl = Reference< XIdlReflection >( xMgr->createInstance( ::rtl::OUString("com.sun.star.reflection.CoreReflection") ), UNO_QUERY ); + xRefl = Reference< XIdlReflection >( xMgr->createInstance( OUString("com.sun.star.reflection.CoreReflection") ), UNO_QUERY ); OSL_ENSURE( xRefl.is(), "### no corereflection!" ); } xRetClass = xRefl->forName( sOWName ); @@ -2134,7 +2134,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( pAccess->mnPropertySetPropCount++; // Namen in Hashtable eintragen, wenn nicht schon bekannt - ::rtl::OUString aPropName = rProp.Name; + OUString aPropName = rProp.Name; // Haben wir den Namen schon? IntrospectionNameMap::iterator aIt = rPropNameMap.find( aPropName ); @@ -2226,7 +2226,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( // In eigenes Property-Array eintragen Property& rProp = pAllPropArray[ rPropCount ]; - ::rtl::OUString aFieldName = xField->getName(); + OUString aFieldName = xField->getName(); rProp.Name = aFieldName; rProp.Handle = rPropCount; Type aFieldType( xPropType->getTypeClass(), xPropType->getName() ); @@ -2237,7 +2237,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( ? READONLY : 0; // Namen in Hashtable eintragen - ::rtl::OUString aPropName = rProp.Name; + OUString aPropName = rProp.Name; // Haben wir den Namen schon? IntrospectionNameMap::iterator aIt = rPropNameMap.find( aPropName ); @@ -2289,9 +2289,9 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( pLocalMethodConcepts[ i ] = 0; } - ::rtl::OUString aMethName; - ::rtl::OUString aPropName; - ::rtl::OUString aStartStr; + OUString aMethName; + OUString aPropName; + OUString aStartStr; for( i = 0 ; i < nSourceMethodCount ; i++ ) { // Methode ansprechen @@ -2316,7 +2316,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( } else { - if( aMethName != ::rtl::OUString("queryInterface") ) + if( aMethName != OUString("queryInterface") ) { rMethodConcept_i |= MethodConcept::DANGEROUS; continue; @@ -2428,15 +2428,15 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( continue; // Name holen und auswerten - ::rtl::OUString aMethName2 = rxMethod_k->getName(); - ::rtl::OUString aStartStr2 = aMethName2.copy( 0, 3 ); - // ACHTUNG: Wegen SDL-Bug NICHT != bei ::rtl::OUString verwenden !!! + OUString aMethName2 = rxMethod_k->getName(); + OUString aStartStr2 = aMethName2.copy( 0, 3 ); + // ACHTUNG: Wegen SDL-Bug NICHT != bei OUString verwenden !!! if( !( aStartStr2 == "set" ) ) continue; // Ist es denn der gleiche Name? - ::rtl::OUString aPropName2 = aMethName2.copy( 3 ); - // ACHTUNG: Wegen SDL-Bug NICHT != bei ::rtl::OUString verwenden !!! + OUString aPropName2 = aMethName2.copy( 3 ); + // ACHTUNG: Wegen SDL-Bug NICHT != bei OUString verwenden !!! if( !( aPropName == aPropName2 ) ) continue; @@ -2481,20 +2481,20 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( // Ist es eine addListener-Methode? else if( aStartStr == "add" ) { - ::rtl::OUString aListenerStr( "Listener" ); + OUString aListenerStr( "Listener" ); // Namen der potentiellen Property sal_Int32 nStrLen = aMethName.getLength(); sal_Int32 nCopyLen = nStrLen - aListenerStr.getLength(); - ::rtl::OUString aEndStr = aMethName.copy( nCopyLen > 0 ? nCopyLen : 0 ); + OUString aEndStr = aMethName.copy( nCopyLen > 0 ? nCopyLen : 0 ); // Endet das Teil auf Listener? - // ACHTUNG: Wegen SDL-Bug NICHT != bei ::rtl::OUString verwenden !!! + // ACHTUNG: Wegen SDL-Bug NICHT != bei OUString verwenden !!! if( !( aEndStr == aListenerStr ) ) continue; // Welcher Listener? - ::rtl::OUString aListenerName = aMethName.copy( 3, nStrLen - aListenerStr.getLength() - 3 ); + OUString aListenerName = aMethName.copy( 3, nStrLen - aListenerStr.getLength() - 3 ); // TODO: Hier koennten noch genauere Pruefungen vorgenommen werden // - Rueckgabe-Typ @@ -2513,21 +2513,21 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( continue; // Name holen und auswerten - ::rtl::OUString aMethName2 = rxMethod_k->getName(); + OUString aMethName2 = rxMethod_k->getName(); sal_Int32 nNameLen = aMethName2.getLength(); sal_Int32 nCopyLen2 = (nNameLen < 6) ? nNameLen : 6; - ::rtl::OUString aStartStr2 = aMethName2.copy( 0, nCopyLen2 ); - ::rtl::OUString aRemoveStr("remove" ); - // ACHTUNG: Wegen SDL-Bug NICHT != bei ::rtl::OUString verwenden !!! + OUString aStartStr2 = aMethName2.copy( 0, nCopyLen2 ); + OUString aRemoveStr("remove" ); + // ACHTUNG: Wegen SDL-Bug NICHT != bei OUString verwenden !!! if( !( aStartStr2 == aRemoveStr ) ) continue; // Ist es denn der gleiche Listener? if( aMethName2.getLength() - aRemoveStr.getLength() <= aListenerStr.getLength() ) continue; - ::rtl::OUString aListenerName2 = aMethName2.copy + OUString aListenerName2 = aMethName2.copy ( 6, aMethName2.getLength() - aRemoveStr.getLength() - aListenerStr.getLength() ); - // ACHTUNG: Wegen SDL-Bug NICHT != bei ::rtl::OUString verwenden !!! + // ACHTUNG: Wegen SDL-Bug NICHT != bei OUString verwenden !!! if( !( aListenerName == aListenerName2 ) ) continue; @@ -2676,7 +2676,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( const Reference& rxMethod = pSourceMethods[i]; // Namen in Hashtable eintragen, wenn nicht schon bekannt - ::rtl::OUString aMethName2 = rxMethod->getName(); + OUString aMethName2 = rxMethod->getName(); IntrospectionNameMap::iterator aIt = rMethodNameMap.find( aMethName2 ); if( aIt == rMethodNameMap.end() ) { @@ -2809,7 +2809,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( { Reference xField = pFields[i]; Reference xPropType = xField->getType(); - ::rtl::OUString aPropName = xField->getName(); + OUString aPropName = xField->getName(); // Ist die PropertySequence gross genug? pAccess->checkPropertyArraysSize @@ -2878,7 +2878,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL introspection_component_getFactory( { Reference< XSingleServiceFactory > xFactory( createOneInstanceFactory( reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - ::rtl::OUString::createFromAscii( pImplName ), + OUString::createFromAscii( pImplName ), stoc_inspect::ImplIntrospection_CreateInstance, stoc_inspect::ImplIntrospection::getSupportedServiceNames_Static() ) ); diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index fd2d75e29123..dd34050b501c 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -63,7 +63,6 @@ using namespace com::sun::star::registry; using namespace com::sun::star::container; using namespace cppu; using namespace osl; -using ::rtl::OUString; namespace stoc_inv { diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index e40ca2f4f139..2600f94eff4c 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -199,16 +199,16 @@ osl::Mutex SingletonFactory::m_aMutex; css::uno::Reference< css::uno::XInterface > SingletonFactory::m_xSingleton; bool SingletonFactory::m_bDisposed = false; -rtl::OUString serviceGetImplementationName() +OUString serviceGetImplementationName() { - return rtl::OUString( + return OUString( "com.sun.star.comp.stoc.JavaVirtualMachine"); } -css::uno::Sequence< rtl::OUString > serviceGetSupportedServiceNames() +css::uno::Sequence< OUString > serviceGetSupportedServiceNames() { - rtl::OUString aServiceName("com.sun.star.java.JavaVirtualMachine"); - return css::uno::Sequence< rtl::OUString >(&aServiceName, 1); + OUString aServiceName("com.sun.star.java.JavaVirtualMachine"); + return css::uno::Sequence< OUString >(&aServiceName, 1); } css::uno::Reference< css::uno::XInterface > SAL_CALL serviceCreateInstance( @@ -257,7 +257,7 @@ bool askForRetry(css::uno::Any const & rException) if (xContext.is()) { css::uno::Reference< css::task::XInteractionHandler > xHandler; - xContext->getValueByName(rtl::OUString( + xContext->getValueByName(OUString( "java-vm.interaction-handler")) >>= xHandler; if (xHandler.is()) @@ -278,31 +278,31 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, const css::uno::Reference &xCtx ) throw (css::uno::Exception) { css::uno::Reference xConfRegistry = xSMgr->createInstanceWithContext( - rtl::OUString("com.sun.star.configuration.ConfigurationRegistry"), + OUString("com.sun.star.configuration.ConfigurationRegistry"), xCtx ); - if(!xConfRegistry.is()) throw css::uno::RuntimeException(rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); + if(!xConfRegistry.is()) throw css::uno::RuntimeException(OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); css::uno::Reference xConfRegistry_simple(xConfRegistry, css::uno::UNO_QUERY); - if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException(rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); + if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException(OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); - xConfRegistry_simple->open(rtl::OUString("org.openoffice.Inet"), sal_True, sal_False); + xConfRegistry_simple->open(OUString("org.openoffice.Inet"), sal_True, sal_False); css::uno::Reference xRegistryRootKey = xConfRegistry_simple->getRootKey(); // if ooInetProxyType is not 0 then read the settings - css::uno::Reference proxyEnable= xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetProxyType")); + css::uno::Reference proxyEnable= xRegistryRootKey->openKey(OUString("Settings/ooInetProxyType")); if( proxyEnable.is() && 0 != proxyEnable->getLongValue()) { // read ftp proxy name - css::uno::Reference ftpProxy_name = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetFTPProxyName")); + css::uno::Reference ftpProxy_name = xRegistryRootKey->openKey(OUString("Settings/ooInetFTPProxyName")); if(ftpProxy_name.is() && !ftpProxy_name->getStringValue().isEmpty()) { - rtl::OUString ftpHost = rtl::OUString("ftp.proxyHost="); + OUString ftpHost = OUString("ftp.proxyHost="); ftpHost += ftpProxy_name->getStringValue(); // read ftp proxy port - css::uno::Reference ftpProxy_port = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetFTPProxyPort")); + css::uno::Reference ftpProxy_port = xRegistryRootKey->openKey(OUString("Settings/ooInetFTPProxyPort")); if(ftpProxy_port.is() && ftpProxy_port->getLongValue()) { - rtl::OUString ftpPort = rtl::OUString("ftp.proxyPort="); - ftpPort += rtl::OUString::valueOf(ftpProxy_port->getLongValue()); + OUString ftpPort = OUString("ftp.proxyPort="); + ftpPort += OUString::valueOf(ftpProxy_port->getLongValue()); pjvm->pushProp(ftpHost); pjvm->pushProp(ftpPort); @@ -310,16 +310,16 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, } // read http proxy name - css::uno::Reference httpProxy_name = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetHTTPProxyName")); + css::uno::Reference httpProxy_name = xRegistryRootKey->openKey(OUString("Settings/ooInetHTTPProxyName")); if(httpProxy_name.is() && !httpProxy_name->getStringValue().isEmpty()) { - rtl::OUString httpHost = rtl::OUString("http.proxyHost="); + OUString httpHost = OUString("http.proxyHost="); httpHost += httpProxy_name->getStringValue(); // read http proxy port - css::uno::Reference httpProxy_port = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetHTTPProxyPort")); + css::uno::Reference httpProxy_port = xRegistryRootKey->openKey(OUString("Settings/ooInetHTTPProxyPort")); if(httpProxy_port.is() && httpProxy_port->getLongValue()) { - rtl::OUString httpPort = rtl::OUString("http.proxyPort="); - httpPort += rtl::OUString::valueOf(httpProxy_port->getLongValue()); + OUString httpPort = OUString("http.proxyPort="); + httpPort += OUString::valueOf(httpProxy_port->getLongValue()); pjvm->pushProp(httpHost); pjvm->pushProp(httpPort); @@ -327,16 +327,16 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, } // read https proxy name - css::uno::Reference httpsProxy_name = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetHTTPSProxyName")); + css::uno::Reference httpsProxy_name = xRegistryRootKey->openKey(OUString("Settings/ooInetHTTPSProxyName")); if(httpsProxy_name.is() && !httpsProxy_name->getStringValue().isEmpty()) { - rtl::OUString httpsHost = rtl::OUString("https.proxyHost="); + OUString httpsHost = OUString("https.proxyHost="); httpsHost += httpsProxy_name->getStringValue(); // read https proxy port - css::uno::Reference httpsProxy_port = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetHTTPSProxyPort")); + css::uno::Reference httpsProxy_port = xRegistryRootKey->openKey(OUString("Settings/ooInetHTTPSProxyPort")); if(httpsProxy_port.is() && httpsProxy_port->getLongValue()) { - rtl::OUString httpsPort = rtl::OUString("https.proxyPort="); - httpsPort += rtl::OUString::valueOf(httpsProxy_port->getLongValue()); + OUString httpsPort = OUString("https.proxyPort="); + httpsPort += OUString::valueOf(httpsProxy_port->getLongValue()); pjvm->pushProp(httpsHost); pjvm->pushProp(httpsPort); @@ -344,11 +344,11 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm, } // read nonProxyHosts - css::uno::Reference nonProxies_name = xRegistryRootKey->openKey(rtl::OUString("Settings/ooInetNoProxy")); + css::uno::Reference nonProxies_name = xRegistryRootKey->openKey(OUString("Settings/ooInetNoProxy")); if(nonProxies_name.is() && !nonProxies_name->getStringValue().isEmpty()) { - rtl::OUString httpNonProxyHosts = rtl::OUString("http.nonProxyHosts="); - rtl::OUString ftpNonProxyHosts= rtl::OUString("ftp.nonProxyHosts="); - rtl::OUString value= nonProxies_name->getStringValue(); + OUString httpNonProxyHosts = OUString("http.nonProxyHosts="); + OUString ftpNonProxyHosts= OUString("ftp.nonProxyHosts="); + OUString value= nonProxies_name->getStringValue(); // replace the separator ";" by "|" value= value.replace((sal_Unicode)';', (sal_Unicode)'|'); @@ -386,26 +386,26 @@ void getDefaultLocaleFromConfig( { css::uno::Reference xConfRegistry = xSMgr->createInstanceWithContext( - rtl::OUString( + OUString( "com.sun.star.configuration.ConfigurationRegistry"), xCtx ); if(!xConfRegistry.is()) throw css::uno::RuntimeException( - rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); + OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); css::uno::Reference xConfRegistry_simple( xConfRegistry, css::uno::UNO_QUERY); if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException( - rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); + OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); - xConfRegistry_simple->open(rtl::OUString("org.openoffice.Setup"), sal_True, sal_False); + xConfRegistry_simple->open(OUString("org.openoffice.Setup"), sal_True, sal_False); css::uno::Reference xRegistryRootKey = xConfRegistry_simple->getRootKey(); // read locale - css::uno::Reference locale = xRegistryRootKey->openKey(rtl::OUString("L10N/ooLocale")); + css::uno::Reference locale = xRegistryRootKey->openKey(OUString("L10N/ooLocale")); if(locale.is() && !locale->getStringValue().isEmpty()) { - rtl::OUString language; - rtl::OUString country; + OUString language; + OUString country; sal_Int32 index = locale->getStringValue().indexOf((sal_Unicode) '-'); @@ -414,14 +414,14 @@ void getDefaultLocaleFromConfig( country = locale->getStringValue().copy(index + 1); if(!language.isEmpty()) { - rtl::OUString prop("user.language="); + OUString prop("user.language="); prop += language; pjvm->pushProp(prop); } if(!country.isEmpty()) { - rtl::OUString prop("user.country="); + OUString prop("user.country="); prop += country; pjvm->pushProp(prop); @@ -441,55 +441,55 @@ void getJavaPropsFromSafetySettings( { css::uno::Reference xConfRegistry = xSMgr->createInstanceWithContext( - rtl::OUString( + OUString( "com.sun.star.configuration.ConfigurationRegistry"), xCtx); if(!xConfRegistry.is()) throw css::uno::RuntimeException( - rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); + OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); css::uno::Reference xConfRegistry_simple( xConfRegistry, css::uno::UNO_QUERY); if(!xConfRegistry_simple.is()) throw css::uno::RuntimeException( - rtl::OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); + OUString("javavm.cxx: couldn't get ConfigurationRegistry"), 0); xConfRegistry_simple->open( - rtl::OUString("org.openoffice.Office.Java"), + OUString("org.openoffice.Office.Java"), sal_True, sal_False); css::uno::Reference xRegistryRootKey = xConfRegistry_simple->getRootKey(); if (xRegistryRootKey.is()) { - css::uno::Reference key_NetAccess= xRegistryRootKey->openKey(rtl::OUString("VirtualMachine/NetAccess")); + css::uno::Reference key_NetAccess= xRegistryRootKey->openKey(OUString("VirtualMachine/NetAccess")); if (key_NetAccess.is()) { sal_Int32 val= key_NetAccess->getLongValue(); - rtl::OUString sVal; + OUString sVal; switch( val) { - case 0: sVal= rtl::OUString("host"); + case 0: sVal= OUString("host"); break; - case 1: sVal= rtl::OUString("unrestricted"); + case 1: sVal= OUString("unrestricted"); break; - case 3: sVal= rtl::OUString("none"); + case 3: sVal= OUString("none"); break; } - rtl::OUString sProperty("appletviewer.security.mode="); + OUString sProperty("appletviewer.security.mode="); sProperty= sProperty + sVal; pjvm->pushProp(sProperty); } css::uno::Reference key_CheckSecurity= xRegistryRootKey->openKey( - rtl::OUString("VirtualMachine/Security")); + OUString("VirtualMachine/Security")); if( key_CheckSecurity.is()) { sal_Bool val= (sal_Bool) key_CheckSecurity->getLongValue(); - rtl::OUString sProperty("stardiv.security.disableSecurity="); + OUString sProperty("stardiv.security.disableSecurity="); if( val) - sProperty= sProperty + rtl::OUString("false"); + sProperty= sProperty + OUString("false"); else - sProperty= sProperty + rtl::OUString("true"); + sProperty= sProperty + OUString("true"); pjvm->pushProp( sProperty); } } @@ -515,7 +515,7 @@ static void setTimeZone(stoc_javavm::JVM * pjvm) throw() { #endif if (!strcmp(TIMEZONE, p)) - pjvm->pushProp(rtl::OUString("user.timezone=ECT")); + pjvm->pushProp(OUString("user.timezone=ECT")); } void initVMConfiguration( @@ -529,7 +529,7 @@ void initVMConfiguration( } catch(const css::uno::Exception & exception) { #if OSL_DEBUG_LEVEL > 1 - rtl::OString message = rtl::OUStringToOString(exception.Message, RTL_TEXTENCODING_ASCII_US); + OString message = OUStringToOString(exception.Message, RTL_TEXTENCODING_ASCII_US); OSL_TRACE("javavm.cxx: can not get INetProps cause of >%s<", message.getStr()); #else (void) exception; // unused @@ -541,7 +541,7 @@ void initVMConfiguration( } catch(const css::uno::Exception & exception) { #if OSL_DEBUG_LEVEL > 1 - rtl::OString message = rtl::OUStringToOString(exception.Message, RTL_TEXTENCODING_ASCII_US); + OString message = OUStringToOString(exception.Message, RTL_TEXTENCODING_ASCII_US); OSL_TRACE("javavm.cxx: can not get locale cause of >%s<", message.getStr()); #else (void) exception; // unused @@ -554,7 +554,7 @@ void initVMConfiguration( } catch(const css::uno::Exception & exception) { #if OSL_DEBUG_LEVEL > 1 - rtl::OString message = rtl::OUStringToOString(exception.Message, RTL_TEXTENCODING_ASCII_US); + OString message = OUStringToOString(exception.Message, RTL_TEXTENCODING_ASCII_US); OSL_TRACE("javavm.cxx: couldn't get safety settings because of >%s<", message.getStr()); #else (void) exception; // unused @@ -614,10 +614,10 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & osl::MutexGuard aGuard(*this); if (m_bDisposed) throw css::lang::DisposedException( - rtl::OUString(), static_cast< cppu::OWeakObject * >(this)); + OUString(), static_cast< cppu::OWeakObject * >(this)); if (m_xUnoVirtualMachine.is()) throw css::uno::RuntimeException( - rtl::OUString( + OUString( "bad call to initialize"), static_cast< cppu::OWeakObject * >(this)); css::beans::NamedValue val; @@ -646,7 +646,7 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & m_xUnoVirtualMachine = new jvmaccess::UnoVirtualMachine(vm, 0); } catch (jvmaccess::UnoVirtualMachine::CreationException &) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( "jvmaccess::UnoVirtualMachine::CreationException"), static_cast< cppu::OWeakObject * >(this)); } @@ -654,7 +654,7 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & } if (!m_xUnoVirtualMachine.is()) { throw css::lang::IllegalArgumentException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "sequence of exactly one any containing either (a) a" " com.sun.star.beans.NamedValue with Name" @@ -667,24 +667,24 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & m_xVirtualMachine = m_xUnoVirtualMachine->getVirtualMachine(); } -rtl::OUString SAL_CALL JavaVirtualMachine::getImplementationName() +OUString SAL_CALL JavaVirtualMachine::getImplementationName() throw (css::uno::RuntimeException) { return serviceGetImplementationName(); } sal_Bool SAL_CALL -JavaVirtualMachine::supportsService(rtl::OUString const & rServiceName) +JavaVirtualMachine::supportsService(OUString const & rServiceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > aNames(getSupportedServiceNames()); + css::uno::Sequence< OUString > aNames(getSupportedServiceNames()); for (sal_Int32 i = 0; i < aNames.getLength(); ++i) if (aNames[i] == rServiceName) return true; return false; } -css::uno::Sequence< rtl::OUString > SAL_CALL +css::uno::Sequence< OUString > SAL_CALL JavaVirtualMachine::getSupportedServiceNames() throw (css::uno::RuntimeException) { @@ -715,7 +715,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) osl::MutexGuard aGuard(*this); if (m_bDisposed) throw css::lang::DisposedException( - rtl::OUString(), static_cast< cppu::OWeakObject * >(this)); + OUString(), static_cast< cppu::OWeakObject * >(this)); css::uno::Sequence< sal_Int8 > aId(16); rtl_getGlobalProcessId(reinterpret_cast< sal_uInt8 * >(aId.getArray())); enum ReturnType { @@ -745,26 +745,26 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) initVMConfiguration(&aJvm, m_xContext->getServiceManager(), m_xContext); //Create the JavaVMOption array - const std::vector & props = aJvm.getProperties(); + const std::vector & props = aJvm.getProperties(); boost::scoped_array sarOptions( new JavaVMOption[props.size()]); JavaVMOption * arOptions = sarOptions.get(); //Create an array that contains the strings which are passed //into the options - boost::scoped_array sarPropStrings( - new rtl::OString[props.size()]); - rtl::OString * arPropStrings = sarPropStrings.get(); + boost::scoped_array sarPropStrings( + new OString[props.size()]); + OString * arPropStrings = sarPropStrings.get(); - rtl::OString sJavaOption("-"); - typedef std::vector::const_iterator cit; + OString sJavaOption("-"); + typedef std::vector::const_iterator cit; int index = 0; for (cit i = props.begin(); i != props.end(); ++i) { - rtl::OString sOption = rtl::OUStringToOString( + OString sOption = OUStringToOString( *i, osl_getThreadTextEncoding()); if (!sOption.matchIgnoreAsciiCase(sJavaOption, 0)) - arPropStrings[index]= rtl::OString("-D") + sOption; + arPropStrings[index]= OString("-D") + sOption; else arPropStrings[index] = sOption; @@ -805,7 +805,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. //Please install a JRE and restart %PRODUCTNAME. css::java::JavaNotFoundException exc( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" " No suitable JRE found!")), @@ -817,7 +817,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) { //An unexpected error occurred throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString(RTL_CONSTASCII_USTRINGPARAM( "[JavaVirtualMachine]:An unexpected error occurred" " while searching for a Java!")), 0); } @@ -829,7 +829,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) // - Options - %PRODUCTNAME - Java, select the Java runtime environment // you want to have used by %PRODUCTNAME. css::java::InvalidJavaSettingsException exc( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" " Java settings have changed!")), @@ -844,7 +844,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //this task. However, use of a JRE has been disabled. Do you want to //enable the use of a JRE now? css::java::JavaDisabledException exc( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" " Java is disabled!")), @@ -886,7 +886,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //is defective. Please select another version or install a new JRE //and select it under Tools - Options - %PRODUCTNAME - Java. css::java::JavaVMCreationFailureException exc( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" " Java is defective!")), @@ -906,7 +906,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //For the selected Java runtime environment to work properly, //%PRODUCTNAME must be restarted. Please restart %PRODUCTNAME now. css::java::RestartRequiredException exc( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" "Office must be restarted before Java can be used!")), @@ -918,7 +918,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //RuntimeException: error is somewhere in the java framework. //An unexpected error occurred throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString(RTL_CONSTASCII_USTRINGPARAM( "[JavaVirtualMachine]:An unexpected error occurred" " while starting Java!")), 0); } @@ -947,7 +947,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) setUpUnoVirtualMachine(guard.getEnvironment()); } catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "jvmaccess::VirtualMachine::AttachGuard::" "CreationException occurred")), @@ -958,7 +958,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) default: // RETURN_JAVAVM if (m_pJavaVm == 0) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine service was initialized in a way" " that the requested JavaVM pointer is not available")), @@ -983,7 +983,7 @@ sal_Bool SAL_CALL JavaVirtualMachine::isVMStarted() osl::MutexGuard aGuard(*this); if (m_bDisposed) throw css::lang::DisposedException( - rtl::OUString(), static_cast< cppu::OWeakObject * >(this)); + OUString(), static_cast< cppu::OWeakObject * >(this)); return m_xUnoVirtualMachine.is(); } @@ -994,7 +994,7 @@ sal_Bool SAL_CALL JavaVirtualMachine::isVMEnabled() osl::MutexGuard aGuard(*this); if (m_bDisposed) throw css::lang::DisposedException( - rtl::OUString(), static_cast< cppu::OWeakObject * >(this)); + OUString(), static_cast< cppu::OWeakObject * >(this)); } // stoc_javavm::JVM aJvm; // initVMConfiguration(&aJvm, m_xContext->getServiceManager(), m_xContext); @@ -1012,7 +1012,7 @@ sal_Bool SAL_CALL JavaVirtualMachine::isThreadAttached() osl::MutexGuard aGuard(*this); if (m_bDisposed) throw css::lang::DisposedException( - rtl::OUString(), static_cast< cppu::OWeakObject * >(this)); + OUString(), static_cast< cppu::OWeakObject * >(this)); // TODO isThreadAttached only returns true if the thread was attached via // registerThread: GuardStack * pStack @@ -1026,10 +1026,10 @@ void SAL_CALL JavaVirtualMachine::registerThread() osl::MutexGuard aGuard(*this); if (m_bDisposed) throw css::lang::DisposedException( - rtl::OUString(), static_cast< cppu::OWeakObject * >(this)); + OUString(), static_cast< cppu::OWeakObject * >(this)); if (!m_xUnoVirtualMachine.is()) throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString(RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::registerThread:" " null VirtualMachine")), static_cast< cppu::OWeakObject * >(this)); @@ -1049,7 +1049,7 @@ void SAL_CALL JavaVirtualMachine::registerThread() catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::registerThread: jvmaccess::" "VirtualMachine::AttachGuard::CreationException")), @@ -1063,10 +1063,10 @@ void SAL_CALL JavaVirtualMachine::revokeThread() osl::MutexGuard aGuard(*this); if (m_bDisposed) throw css::lang::DisposedException( - rtl::OUString(), static_cast< cppu::OWeakObject * >(this)); + OUString(), static_cast< cppu::OWeakObject * >(this)); if (!m_xUnoVirtualMachine.is()) throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString(RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::revokeThread:" " null VirtualMachine")), static_cast< cppu::OWeakObject * >(this)); @@ -1074,7 +1074,7 @@ void SAL_CALL JavaVirtualMachine::revokeThread() = static_cast< GuardStack * >(m_aAttachGuards.getData()); if (pStack == 0 || pStack->empty()) throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString(RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::revokeThread:" " no matching registerThread")), static_cast< cppu::OWeakObject * >(this)); @@ -1118,11 +1118,11 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( // solution must atomically (i.e., protected by a mutex) read the latest // value from the configuration and set it as a system property at the JVM. - rtl::OUString aAccessor; + OUString aAccessor; rEvent.Accessor >>= aAccessor; - rtl::OUString aPropertyName; - rtl::OUString aPropertyName2; - rtl::OUString aPropertyValue; + OUString aPropertyName; + OUString aPropertyName2; + OUString aPropertyValue; bool bSecurityChanged = false; if ( aAccessor == "ooInetProxyType" ) { @@ -1134,73 +1134,73 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( } else if ( aAccessor == "ooInetHTTPProxyName" ) { - aPropertyName = rtl::OUString( + aPropertyName = OUString( "http.proxyHost"); rEvent.Element >>= aPropertyValue; } else if ( aAccessor == "ooInetHTTPProxyPort" ) { aPropertyName - = rtl::OUString("http.proxyPort"); + = OUString("http.proxyPort"); sal_Int32 n = 0; rEvent.Element >>= n; - aPropertyValue = rtl::OUString::valueOf(n); + aPropertyValue = OUString::valueOf(n); } else if ( aAccessor == "ooInetHTTPSProxyName" ) { - aPropertyName = rtl::OUString( + aPropertyName = OUString( "https.proxyHost"); rEvent.Element >>= aPropertyValue; } else if ( aAccessor == "ooInetHTTPSProxyPort" ) { aPropertyName - = rtl::OUString("https.proxyPort"); + = OUString("https.proxyPort"); sal_Int32 n = 0; rEvent.Element >>= n; - aPropertyValue = rtl::OUString::valueOf(n); + aPropertyValue = OUString::valueOf(n); } else if ( aAccessor == "ooInetFTPProxyName" ) { - aPropertyName = rtl::OUString( + aPropertyName = OUString( "ftp.proxyHost"); rEvent.Element >>= aPropertyValue; } else if ( aAccessor == "ooInetFTPProxyPort" ) { - aPropertyName = rtl::OUString( + aPropertyName = OUString( "ftp.proxyPort"); sal_Int32 n = 0; rEvent.Element >>= n; - aPropertyValue = rtl::OUString::valueOf(n); + aPropertyValue = OUString::valueOf(n); } else if ( aAccessor == "ooInetNoProxy" ) { - aPropertyName = rtl::OUString( + aPropertyName = OUString( "http.nonProxyHosts"); - aPropertyName2 = rtl::OUString( + aPropertyName2 = OUString( "ftp.nonProxyHosts"); rEvent.Element >>= aPropertyValue; aPropertyValue = aPropertyValue.replace(';', '|'); } else if ( aAccessor == "NetAccess" ) { - aPropertyName = rtl::OUString( + aPropertyName = OUString( "appletviewer.security.mode"); sal_Int32 n = 0; if (rEvent.Element >>= n) switch (n) { case 0: - aPropertyValue = rtl::OUString( + aPropertyValue = OUString( "host"); break; case 1: - aPropertyValue = rtl::OUString( + aPropertyValue = OUString( "unrestricted"); break; case 3: - aPropertyValue = rtl::OUString( + aPropertyValue = OUString( "none"); break; } @@ -1210,15 +1210,15 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( } else if ( aAccessor == "Security" ) { - aPropertyName = rtl::OUString( + aPropertyName = OUString( "stardiv.security.disableSecurity"); sal_Bool b = sal_Bool(); if (rEvent.Element >>= b) if (b) - aPropertyValue = rtl::OUString( + aPropertyValue = OUString( "false"); else - aPropertyValue = rtl::OUString( + aPropertyValue = OUString( "true"); else return; @@ -1245,12 +1245,12 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( // call java.lang.System.setProperty // String setProperty( String key, String value) jclass jcSystem= pJNIEnv->FindClass("java/lang/System"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:FindClass java/lang/System"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:FindClass java/lang/System"), 0); jmethodID jmSetProps= pJNIEnv->GetStaticMethodID( jcSystem, "setProperty","(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetStaticMethodID java.lang.System.setProperty"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:GetStaticMethodID java.lang.System.setProperty"), 0); jstring jsPropName= pJNIEnv->NewString( aPropertyName.getStr(), aPropertyName.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); // remove the property if it does not have a value ( user left the dialog field empty) // or if the port is set to 0 @@ -1261,14 +1261,14 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( { // call java.lang.System.getProperties jmethodID jmGetProps= pJNIEnv->GetStaticMethodID( jcSystem, "getProperties","()Ljava/util/Properties;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetStaticMethodID java.lang.System.getProperties"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:GetStaticMethodID java.lang.System.getProperties"), 0); jobject joProperties= pJNIEnv->CallStaticObjectMethod( jcSystem, jmGetProps); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.getProperties"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallStaticObjectMethod java.lang.System.getProperties"), 0); // call java.util.Properties.remove jclass jcProperties= pJNIEnv->FindClass("java/util/Properties"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:FindClass java/util/Properties"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:FindClass java/util/Properties"), 0); jmethodID jmRemove= pJNIEnv->GetMethodID( jcProperties, "remove", "(Ljava/lang/Object;)Ljava/lang/Object;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetMethodID java.util.Properties.remove"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:GetMethodID java.util.Properties.remove"), 0); pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsPropName); // special calse for ftp.nonProxyHosts and http.nonProxyHosts. The office only @@ -1276,7 +1276,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( if (!aPropertyName2.isEmpty()) { jstring jsPropName2= pJNIEnv->NewString( aPropertyName2.getStr(), aPropertyName2.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsPropName2); } } @@ -1284,20 +1284,20 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( { // Change the Value of the property jstring jsPropValue= pJNIEnv->NewString( aPropertyValue.getStr(), aPropertyValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsPropName, jsPropValue); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); // special calse for ftp.nonProxyHosts and http.nonProxyHosts. The office only // has a value for two java properties if (!aPropertyName2.isEmpty()) { jstring jsPropName2= pJNIEnv->NewString( aPropertyName2.getStr(), aPropertyName2.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); jsPropValue= pJNIEnv->NewString( aPropertyValue.getStr(), aPropertyValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsPropName2, jsPropValue); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } } @@ -1307,7 +1307,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( if (bSecurityChanged) { jmethodID jmGetSecur= pJNIEnv->GetStaticMethodID( jcSystem,"getSecurityManager","()Ljava/lang/SecurityManager;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetStaticMethodID java.lang.System.getSecurityManager"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:GetStaticMethodID java.lang.System.getSecurityManager"), 0); jobject joSecur= pJNIEnv->CallStaticObjectMethod( jcSystem, jmGetSecur); if (joSecur != 0) { @@ -1321,12 +1321,12 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( // The SecurityManagers class Name must be com.sun.star.lib.sandbox.SandboxSecurity jclass jcSec= pJNIEnv->GetObjectClass( joSecur); jclass jcClass= pJNIEnv->FindClass("java/lang/Class"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:FindClass java.lang.Class"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:FindClass java.lang.Class"), 0); jmethodID jmName= pJNIEnv->GetMethodID( jcClass,"getName","()Ljava/lang/String;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetMethodID java.lang.Class.getName"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:GetMethodID java.lang.Class.getName"), 0); jstring jsClass= (jstring) pJNIEnv->CallObjectMethod( jcSec, jmName); const jchar* jcharName= pJNIEnv->GetStringChars( jsClass, NULL); - rtl::OUString sName( jcharName); + OUString sName( jcharName); jboolean bIsSandbox; if ( sName == "com.sun.star.lib.sandbox.SandboxSecurity" ) bIsSandbox= JNI_TRUE; @@ -1338,9 +1338,9 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( { // call SandboxSecurity.reset jmethodID jmReset= pJNIEnv->GetMethodID( jcSec,"reset","()V"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetMethodID com.sun.star.lib.sandbox.SandboxSecurity.reset"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:GetMethodID com.sun.star.lib.sandbox.SandboxSecurity.reset"), 0); pJNIEnv->CallVoidMethod( joSecur, jmReset); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallVoidMethod com.sun.star.lib.sandbox.SandboxSecurity.reset"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallVoidMethod com.sun.star.lib.sandbox.SandboxSecurity.reset"), 0); } } } @@ -1348,7 +1348,7 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString(RTL_CONSTASCII_USTRINGPARAM( "jvmaccess::VirtualMachine::AttachGuard::" "CreationException")), 0); @@ -1409,7 +1409,7 @@ void JavaVirtualMachine::registerConfigChangesListener() try { css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider( - m_xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( + m_xContext->getServiceManager()->createInstanceWithContext( OUString( "com.sun.star.configuration.ConfigurationProvider"), m_xContext), css::uno::UNO_QUERY); if (xConfigProvider.is()) @@ -1418,13 +1418,13 @@ void JavaVirtualMachine::registerConfigChangesListener() // arguments for ConfigurationAccess css::uno::Sequence< css::uno::Any > aArguments(2); aArguments[0] <<= css::beans::PropertyValue( - rtl::OUString("nodepath"), + OUString("nodepath"), 0, - css::uno::makeAny(rtl::OUString("org.openoffice.Inet/Settings")), + css::uno::makeAny(OUString("org.openoffice.Inet/Settings")), css::beans::PropertyState_DIRECT_VALUE); // depth: -1 means unlimited aArguments[1] <<= css::beans::PropertyValue( - rtl::OUString("depth"), + OUString("depth"), 0, css::uno::makeAny( (sal_Int32)-1), css::beans::PropertyState_DIRECT_VALUE); @@ -1432,7 +1432,7 @@ void JavaVirtualMachine::registerConfigChangesListener() m_xInetConfiguration = css::uno::Reference< css::container::XContainer >( xConfigProvider->createInstanceWithArguments( - rtl::OUString( + OUString( "com.sun.star.configuration.ConfigurationAccess"), aArguments), css::uno::UNO_QUERY); @@ -1443,13 +1443,13 @@ void JavaVirtualMachine::registerConfigChangesListener() // now register as listener to changes in org.openoffice.Java/VirtualMachine css::uno::Sequence< css::uno::Any > aArguments2(2); aArguments2[0] <<= css::beans::PropertyValue( - rtl::OUString("nodepath"), + OUString("nodepath"), 0, - css::uno::makeAny(rtl::OUString("org.openoffice.Office.Java/VirtualMachine")), + css::uno::makeAny(OUString("org.openoffice.Office.Java/VirtualMachine")), css::beans::PropertyState_DIRECT_VALUE); // depth: -1 means unlimited aArguments2[1] <<= css::beans::PropertyValue( - rtl::OUString("depth"), + OUString("depth"), 0, css::uno::makeAny( (sal_Int32)-1), css::beans::PropertyState_DIRECT_VALUE); @@ -1457,7 +1457,7 @@ void JavaVirtualMachine::registerConfigChangesListener() m_xJavaConfiguration = css::uno::Reference< css::container::XContainer >( xConfigProvider->createInstanceWithArguments( - rtl::OUString( + OUString( "com.sun.star.configuration.ConfigurationAccess"), aArguments2), css::uno::UNO_QUERY); @@ -1468,7 +1468,7 @@ void JavaVirtualMachine::registerConfigChangesListener() }catch(const css::uno::Exception & e) { #if OSL_DEBUG_LEVEL > 1 - rtl::OString message = rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); + OString message = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); OSL_TRACE("javavm.cxx: could not set up listener for Configuration because of >%s<", message.getStr()); #else (void) e; // unused @@ -1490,98 +1490,98 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset) JNIEnv * pJNIEnv = aAttachGuard.getEnvironment(); // The Java Properties - rtl::OUString sFtpProxyHost("ftp.proxyHost"); - rtl::OUString sFtpProxyPort("ftp.proxyPort"); - rtl::OUString sFtpNonProxyHosts ("ftp.nonProxyHosts"); - rtl::OUString sHttpProxyHost("http.proxyHost"); - rtl::OUString sHttpProxyPort("http.proxyPort"); - rtl::OUString sHttpNonProxyHosts("http.nonProxyHosts"); + OUString sFtpProxyHost("ftp.proxyHost"); + OUString sFtpProxyPort("ftp.proxyPort"); + OUString sFtpNonProxyHosts ("ftp.nonProxyHosts"); + OUString sHttpProxyHost("http.proxyHost"); + OUString sHttpProxyPort("http.proxyPort"); + OUString sHttpNonProxyHosts("http.nonProxyHosts"); // creat Java Properties as JNI strings jstring jsFtpProxyHost= pJNIEnv->NewString( sFtpProxyHost.getStr(), sFtpProxyHost.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); jstring jsFtpProxyPort= pJNIEnv->NewString( sFtpProxyPort.getStr(), sFtpProxyPort.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); jstring jsFtpNonProxyHosts= pJNIEnv->NewString( sFtpNonProxyHosts.getStr(), sFtpNonProxyHosts.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); jstring jsHttpProxyHost= pJNIEnv->NewString( sHttpProxyHost.getStr(), sHttpProxyHost.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); jstring jsHttpProxyPort= pJNIEnv->NewString( sHttpProxyPort.getStr(), sHttpProxyPort.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); jstring jsHttpNonProxyHosts= pJNIEnv->NewString( sHttpNonProxyHosts.getStr(), sHttpNonProxyHosts.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); // prepare java.lang.System.setProperty jclass jcSystem= pJNIEnv->FindClass("java/lang/System"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:FindClass java/lang/System"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:FindClass java/lang/System"), 0); jmethodID jmSetProps= pJNIEnv->GetStaticMethodID( jcSystem, "setProperty","(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetStaticMethodID java.lang.System.setProperty"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:GetStaticMethodID java.lang.System.setProperty"), 0); // call java.lang.System.getProperties jmethodID jmGetProps= pJNIEnv->GetStaticMethodID( jcSystem, "getProperties","()Ljava/util/Properties;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetStaticMethodID java.lang.System.getProperties"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:GetStaticMethodID java.lang.System.getProperties"), 0); jobject joProperties= pJNIEnv->CallStaticObjectMethod( jcSystem, jmGetProps); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.getProperties"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallStaticObjectMethod java.lang.System.getProperties"), 0); // prepare java.util.Properties.remove jclass jcProperties= pJNIEnv->FindClass("java/util/Properties"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:FindClass java/util/Properties"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:FindClass java/util/Properties"), 0); if (set_reset) { // Set all network properties with the VM JVM jvm; getINetPropsFromConfig( &jvm, m_xContext->getServiceManager(), m_xContext); - const ::std::vector< rtl::OUString> & Props = jvm.getProperties(); - typedef ::std::vector< rtl::OUString >::const_iterator C_IT; + const ::std::vector< OUString> & Props = jvm.getProperties(); + typedef ::std::vector< OUString >::const_iterator C_IT; for( C_IT i= Props.begin(); i != Props.end(); ++i) { - rtl::OUString prop= *i; + OUString prop= *i; sal_Int32 index= prop.indexOf( (sal_Unicode)'='); - rtl::OUString propName= prop.copy( 0, index); - rtl::OUString propValue= prop.copy( index + 1); + OUString propName= prop.copy( 0, index); + OUString propValue= prop.copy( index + 1); if( propName.equals( sFtpProxyHost)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsFtpProxyHost, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } else if( propName.equals( sFtpProxyPort)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsFtpProxyPort, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } else if( propName.equals( sFtpNonProxyHosts)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsFtpNonProxyHosts, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } else if( propName.equals( sHttpProxyHost)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsHttpProxyHost, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } else if( propName.equals( sHttpProxyPort)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsHttpProxyPort, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } else if( propName.equals( sHttpNonProxyHosts)) { jstring jsVal= pJNIEnv->NewString( propValue.getStr(), propValue.getLength()); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:NewString"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:NewString"), 0); pJNIEnv->CallStaticObjectMethod( jcSystem, jmSetProps, jsHttpNonProxyHosts, jsVal); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:CallStaticObjectMethod java.lang.System.setProperty"), 0); } } } @@ -1589,7 +1589,7 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset) { // call java.util.Properties.remove jmethodID jmRemove= pJNIEnv->GetMethodID( jcProperties, "remove", "(Ljava/lang/Object;)Ljava/lang/Object;"); - if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(rtl::OUString("JNI:GetMethodID java.util.Property.remove"), 0); + if(pJNIEnv->ExceptionOccurred()) throw css::uno::RuntimeException(OUString("JNI:GetMethodID java.util.Property.remove"), 0); pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsFtpProxyHost); pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsFtpProxyPort); pJNIEnv->CallObjectMethod( joProperties, jmRemove, jsFtpNonProxyHosts); @@ -1611,20 +1611,20 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset) void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) { css::uno::Reference< css::util::XMacroExpander > exp = css::util::theMacroExpander::get(m_xContext); - rtl::OUString baseUrl; + OUString baseUrl; try { baseUrl = exp->expandMacros( - rtl::OUString("$URE_INTERNAL_JAVA_DIR/")); + OUString("$URE_INTERNAL_JAVA_DIR/")); } catch (css::lang::IllegalArgumentException &) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( "com::sun::star::lang::IllegalArgumentException"), static_cast< cppu::OWeakObject * >(this)); } - rtl::OUString classPath; + OUString classPath; try { classPath = exp->expandMacros( - rtl::OUString("$URE_INTERNAL_JAVA_CLASSPATH")); + OUString("$URE_INTERNAL_JAVA_CLASSPATH")); } catch (css::lang::IllegalArgumentException &) {} jclass class_URLClassLoader = environment->FindClass( "java/net/URLClassLoader"); @@ -1719,7 +1719,7 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) { m_xVirtualMachine, cl2); } catch (jvmaccess::UnoVirtualMachine::CreationException &) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( "jvmaccess::UnoVirtualMachine::CreationException"), static_cast< cppu::OWeakObject * >(this)); } @@ -1728,7 +1728,7 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) { void JavaVirtualMachine::handleJniException(JNIEnv * environment) { environment->ExceptionClear(); throw css::uno::RuntimeException( - rtl::OUString("JNI exception occurred"), + OUString("JNI exception occurred"), static_cast< cppu::OWeakObject * >(this)); } diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx index 913106aa42c7..c165d172d23a 100644 --- a/stoc/source/javavm/javavm.hxx +++ b/stoc/source/javavm/javavm.hxx @@ -71,14 +71,14 @@ public: throw (com::sun::star::uno::Exception); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - supportsService(rtl::OUString const & rServiceName) + supportsService(OUString const & rServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); // XJavaVM diff --git a/stoc/source/javavm/jvmargs.cxx b/stoc/source/javavm/jvmargs.cxx index 7497fcbbc89e..2ab9e20cc378 100644 --- a/stoc/source/javavm/jvmargs.cxx +++ b/stoc/source/javavm/jvmargs.cxx @@ -32,7 +32,7 @@ void JVM::pushProp(const OUString & property) _props.push_back(property); } -const ::std::vector< ::rtl::OUString > & JVM::getProperties() const +const ::std::vector< OUString > & JVM::getProperties() const { return _props; } diff --git a/stoc/source/javavm/jvmargs.hxx b/stoc/source/javavm/jvmargs.hxx index c003835ba9b5..6a5202f5ee2a 100644 --- a/stoc/source/javavm/jvmargs.hxx +++ b/stoc/source/javavm/jvmargs.hxx @@ -37,13 +37,13 @@ extern "C" { namespace stoc_javavm { class JVM { - ::std::vector _props; + ::std::vector _props; public: JVM() throw(); - void pushProp(const ::rtl::OUString & uString); - const ::std::vector< ::rtl::OUString> & getProperties() const; + void pushProp(const OUString & uString); + const ::std::vector< OUString> & getProperties() const; }; } diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index b2e20e37f8c6..45f9959b3bce 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -53,7 +53,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace cppu; using namespace osl; -using ::rtl::OUString; extern rtl_StandardModuleCount g_moduleCount; namespace stoc_bootstrap @@ -189,15 +188,15 @@ Reference SAL_CALL DllComponentLoader::activate( throw(CannotActivateFactoryException, RuntimeException) { - rtl::OUString aPrefix; + OUString aPrefix; if( xKey.is() ) { Reference xActivatorKey = xKey->openKey( - rtl::OUString("/UNO/ACTIVATOR") ); + OUString("/UNO/ACTIVATOR") ); if (xActivatorKey.is() && xActivatorKey->getValueType() == RegistryValueType_ASCII ) { Reference xPrefixKey = xKey->openKey( - rtl::OUString("/UNO/PREFIX") ); + OUString("/UNO/PREFIX") ); if( xPrefixKey.is() && xPrefixKey->getValueType() == RegistryValueType_ASCII ) { aPrefix = xPrefixKey->getAsciiValue(); diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 4f08a9c128ef..cfbab255fe85 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -41,7 +41,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -using ::rtl::OUString; #define SERVICENAME "com.sun.star.uno.NamingService" #define IMPLNAME "com.sun.star.comp.stoc.NamingService" @@ -105,9 +104,9 @@ public: return Sequence< OUString >( &aStr, 1 ); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRegisteredObject( const ::rtl::OUString& Name ) throw(Exception, RuntimeException); - virtual void SAL_CALL registerObject( const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Object ) throw(Exception, RuntimeException); - virtual void SAL_CALL revokeObject( const ::rtl::OUString& Name ) throw(Exception, RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) throw(Exception, RuntimeException); + virtual void SAL_CALL registerObject( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Object ) throw(Exception, RuntimeException); + virtual void SAL_CALL revokeObject( const OUString& Name ) throw(Exception, RuntimeException); }; //================================================================================================== diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 34d060c95371..a788aa196c6b 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace diff --git a/stoc/source/registry_tdprovider/base.hxx b/stoc/source/registry_tdprovider/base.hxx index eaa2bf8b1819..8c68646fd3df 100644 --- a/stoc/source/registry_tdprovider/base.hxx +++ b/stoc/source/registry_tdprovider/base.hxx @@ -60,8 +60,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace com::sun::star::reflection; -using ::rtl::OUString; - //-------------------------------------------------------------------------------------------------- extern rtl_StandardModuleCount g_moduleCount; diff --git a/stoc/source/registry_tdprovider/functiondescription.cxx b/stoc/source/registry_tdprovider/functiondescription.cxx index 0d7d160ddb31..3b477d15c285 100644 --- a/stoc/source/registry_tdprovider/functiondescription.cxx +++ b/stoc/source/registry_tdprovider/functiondescription.cxx @@ -65,14 +65,14 @@ FunctionDescription::getExceptions() const { css::uno::Reference< css::reflection::XCompoundTypeDescription > > exceptions(n); for (sal_uInt16 i = 0; i < n; ++i) { - rtl::OUString name( + OUString name( reader.getMethodExceptionTypeName(m_index, i).replace('/', '.')); css::uno::Any any; try { any = m_manager->getByHierarchicalName(name); } catch (const css::container::NoSuchElementException & e) { throw new css::uno::RuntimeException( - (rtl::OUString( + (OUString( "com.sun.star.container.NoSuchElementException: ") + e.Message), css::uno::Reference< css::uno::XInterface >()); //TODO @@ -81,7 +81,7 @@ FunctionDescription::getExceptions() const { || exceptions[i]->getTypeClass() != css::uno::TypeClass_EXCEPTION) { throw new css::uno::RuntimeException( - (rtl::OUString("not an exception type: ") + (OUString("not an exception type: ") + name), css::uno::Reference< css::uno::XInterface >()); //TODO } diff --git a/stoc/source/registry_tdprovider/methoddescription.cxx b/stoc/source/registry_tdprovider/methoddescription.cxx index d5ab8e14099d..b51b3dd618ac 100644 --- a/stoc/source/registry_tdprovider/methoddescription.cxx +++ b/stoc/source/registry_tdprovider/methoddescription.cxx @@ -44,7 +44,7 @@ public: Parameter( css::uno::Reference< css::container::XHierarchicalNameAccess > const & manager, - rtl::OUString const & name, rtl::OUString const & typeName, + OUString const & name, OUString const & typeName, RTParamMode mode, sal_Int32 position): m_manager(manager), m_name(name), m_typeName(typeName.replace('/', '.')), m_mode(mode), @@ -52,7 +52,7 @@ public: virtual ~Parameter() {} - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException) { return m_name; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL @@ -76,8 +76,8 @@ private: void operator =(Parameter); // not implemented css::uno::Reference< css::container::XHierarchicalNameAccess > m_manager; - rtl::OUString m_name; - rtl::OUString m_typeName; + OUString m_name; + OUString m_typeName; RTParamMode m_mode; sal_Int32 m_position; }; @@ -91,7 +91,7 @@ css::uno::Reference< css::reflection::XTypeDescription > Parameter::getType() css::uno::UNO_QUERY_THROW); } catch (const css::container::NoSuchElementException & e) { throw new css::uno::RuntimeException( - (rtl::OUString( + (OUString( "com.sun.star.container.NoSuchElementException: ") + e.Message), static_cast< cppu::OWeakObject * >(this)); @@ -103,7 +103,7 @@ css::uno::Reference< css::reflection::XTypeDescription > Parameter::getType() MethodDescription::MethodDescription( css::uno::Reference< css::container::XHierarchicalNameAccess > const & manager, - rtl::OUString const & name, + OUString const & name, com::sun::star::uno::Sequence< sal_Int8 > const & bytes, sal_uInt16 index): FunctionDescription(manager, bytes, index), m_name(name), diff --git a/stoc/source/registry_tdprovider/methoddescription.hxx b/stoc/source/registry_tdprovider/methoddescription.hxx index 59d4565c9845..12d2512b0808 100644 --- a/stoc/source/registry_tdprovider/methoddescription.hxx +++ b/stoc/source/registry_tdprovider/methoddescription.hxx @@ -45,13 +45,13 @@ public: com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > const & manager, - rtl::OUString const & name, + OUString const & name, com::sun::star::uno::Sequence< sal_Int8 > const & bytes, sal_uInt16 index); ~MethodDescription(); - rtl::OUString getName() const { return m_name; } + OUString getName() const { return m_name; } com::sun::star::uno::Sequence< com::sun::star::uno::Reference< @@ -62,7 +62,7 @@ private: MethodDescription(MethodDescription &); // not implemented void operator =(MethodDescription); // not implemented - rtl::OUString m_name; + OUString m_name; mutable com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::reflection::XParameter > > m_parameters; diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx index 4c2cd50da07a..9af018d9736b 100644 --- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx +++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx @@ -45,7 +45,7 @@ class IndividualConstantTypeDescriptionImpl: { public: IndividualConstantTypeDescriptionImpl( - rtl::OUString const & name, com::sun::star::uno::Any const & value, + OUString const & name, com::sun::star::uno::Any const & value, bool published): cppu::ImplInheritanceHelper1< stoc_rdbtdp::ConstantTypeDescriptionImpl, @@ -77,7 +77,7 @@ namespace stoc_rdbtdp rtl::Reference< TypeDescriptionEnumerationImpl > TypeDescriptionEnumerationImpl::createInstance( const uno::Reference< container::XHierarchicalNameAccess > & xTDMgr, - const rtl::OUString & rModuleName, + const OUString & rModuleName, const uno::Sequence< uno::TypeClass > & rTypes, reflection::TypeDescriptionSearchDepth eDepth, const RegistryKeyList & rBaseKeys ) @@ -95,7 +95,7 @@ TypeDescriptionEnumerationImpl::createInstance( RegistryKeyList aModuleKeys; - rtl::OUString aKey( rModuleName.replace( '.', '/' ) ); + OUString aKey( rModuleName.replace( '.', '/' ) ); bool bOpenKeySucceeded = false; @@ -272,7 +272,7 @@ TypeDescriptionEnumerationImpl::nextTypeDescription() return xTD; throw container::NoSuchElementException( - rtl::OUString("No further elements in enumeration!"), + OUString("No further elements in enumeration!"), static_cast< cppu::OWeakObject * >( this ) ); } @@ -488,7 +488,7 @@ bool TypeDescriptionEnumerationImpl::queryMore() sal_uInt16 nFields = aReader.getFieldCount(); while ( nFields-- ) { - rtl::OUStringBuffer aName( + OUStringBuffer aName( aReader.getTypeName().replace( '/', '.' ) ); aName.appendAscii( "." ); aName.append( aReader.getFieldName( nFields ) ); diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx index 51ccc4735b51..863d314f611e 100644 --- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx +++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx @@ -48,7 +48,7 @@ public: static rtl::Reference< TypeDescriptionEnumerationImpl > createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > & xTDMgr, - const rtl::OUString & rModuleName, + const OUString & rModuleName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::TypeClass > & rTypes, ::com::sun::star::reflection::TypeDescriptionSearchDepth eDepth, diff --git a/stoc/source/registry_tdprovider/structtypedescription.cxx b/stoc/source/registry_tdprovider/structtypedescription.cxx index 5c2959a857ad..a95a1802e173 100644 --- a/stoc/source/registry_tdprovider/structtypedescription.cxx +++ b/stoc/source/registry_tdprovider/structtypedescription.cxx @@ -42,7 +42,7 @@ using stoc::registry_tdprovider::StructTypeDescription; StructTypeDescription::StructTypeDescription( css::uno::Reference< css::container::XHierarchicalNameAccess > const & manager, - rtl::OUString const & name, rtl::OUString const & baseTypeName, + OUString const & name, OUString const & baseTypeName, css::uno::Sequence< sal_Int8 > const & data, bool published): m_data(data), m_base( @@ -60,7 +60,7 @@ css::uno::TypeClass StructTypeDescription::getTypeClass() return m_base->getTypeClass(); } -rtl::OUString StructTypeDescription::getName() +OUString StructTypeDescription::getName() throw (css::uno::RuntimeException) { return m_base->getName(); @@ -78,13 +78,13 @@ StructTypeDescription::getMemberTypes() throw (css::uno::RuntimeException) return m_base->getMemberTypes(); } -css::uno::Sequence< rtl::OUString > StructTypeDescription::getMemberNames() +css::uno::Sequence< OUString > StructTypeDescription::getMemberNames() throw (css::uno::RuntimeException) { return m_base->getMemberNames(); } -css::uno::Sequence< rtl::OUString > StructTypeDescription::getTypeParameters() +css::uno::Sequence< OUString > StructTypeDescription::getTypeParameters() throw (css::uno::RuntimeException) { try { @@ -93,13 +93,13 @@ css::uno::Sequence< rtl::OUString > StructTypeDescription::getTypeParameters() TYPEREG_VERSION_1); OSL_ASSERT(reader.isValid()); sal_uInt16 n = reader.getReferenceCount(); - css::uno::Sequence< rtl::OUString > parameters(n); + css::uno::Sequence< OUString > parameters(n); for (sal_uInt16 i = 0; i < n; ++i) { if (reader.getReferenceFlags(i) != RT_ACCESS_INVALID || reader.getReferenceSort(i) != RT_REF_TYPE_PARAMETER) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "type parameter of polymorphic struct type template" " not RT_ACCESS_INVALID/RT_REF_TYPE_PARAMETER")), @@ -110,7 +110,7 @@ css::uno::Sequence< rtl::OUString > StructTypeDescription::getTypeParameters() return parameters; } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString("std::bad_alloc"), + OUString("std::bad_alloc"), static_cast< cppu::OWeakObject * >(this)); } } diff --git a/stoc/source/registry_tdprovider/structtypedescription.hxx b/stoc/source/registry_tdprovider/structtypedescription.hxx index 247124af87cd..1a750a1c0457 100644 --- a/stoc/source/registry_tdprovider/structtypedescription.hxx +++ b/stoc/source/registry_tdprovider/structtypedescription.hxx @@ -47,7 +47,7 @@ public: com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > const & manager, - rtl::OUString const & name, rtl::OUString const & baseTypeName, + OUString const & name, OUString const & baseTypeName, com::sun::star::uno::Sequence< sal_Int8 > const & data, bool published); virtual ~StructTypeDescription(); @@ -55,7 +55,7 @@ public: virtual com::sun::star::uno::TypeClass SAL_CALL getTypeClass() throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (com::sun::star::uno::RuntimeException); virtual @@ -69,10 +69,10 @@ public: com::sun::star::reflection::XTypeDescription > > SAL_CALL getMemberTypes() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getMemberNames() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getTypeParameters() throw (com::sun::star::uno::RuntimeException); virtual diff --git a/stoc/source/registry_tdprovider/tdconsts.cxx b/stoc/source/registry_tdprovider/tdconsts.cxx index 73a4ca037417..e0a91bf57e8d 100644 --- a/stoc/source/registry_tdprovider/tdconsts.cxx +++ b/stoc/source/registry_tdprovider/tdconsts.cxx @@ -72,7 +72,7 @@ ConstantsTypeDescriptionImpl::getConstants() while ( nFields-- ) { - rtl::OUStringBuffer aName( _aName ); + OUStringBuffer aName( _aName ); aName.appendAscii( "." ); aName.append( aReader.getFieldName( nFields ) ); diff --git a/stoc/source/registry_tdprovider/tdiface.cxx b/stoc/source/registry_tdprovider/tdiface.cxx index 36c17f913b94..c558042b3661 100644 --- a/stoc/source/registry_tdprovider/tdiface.cxx +++ b/stoc/source/registry_tdprovider/tdiface.cxx @@ -357,7 +357,7 @@ private: void calculate(Reference< XInterfaceTypeDescription2 > const & desc); - std::set< rtl::OUString > set; + std::set< OUString > set; sal_Int32 offset; }; @@ -462,8 +462,8 @@ Sequence< Reference< XInterfaceMemberTypeDescription > > InterfaceTypeDescriptio _members.realloc(count); sal_Int32 index = 0; for (sal_uInt16 i = 0; i < fieldCount; ++i) { - rtl::OUString name(reader.getFieldName(i)); - rtl::OUStringBuffer typeName(getName()); + OUString name(reader.getFieldName(i)); + OUStringBuffer typeName(getName()); typeName.appendAscii(RTL_CONSTASCII_STRINGPARAM("::")); typeName.append(name); RTFieldAccess flags = reader.getFieldFlags(i); @@ -509,8 +509,8 @@ Sequence< Reference< XInterfaceMemberTypeDescription > > InterfaceTypeDescriptio if (flags != RT_MODE_ATTRIBUTE_GET && flags != RT_MODE_ATTRIBUTE_SET) { - rtl::OUString name(reader.getMethodName(i)); - rtl::OUStringBuffer typeName(getName()); + OUString name(reader.getMethodName(i)); + OUStringBuffer typeName(getName()); typeName.appendAscii(RTL_CONSTASCII_STRINGPARAM("::")); typeName.append(name); _members[index] = new InterfaceMethodImpl( diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx index 84223360787b..b99eefc2a726 100644 --- a/stoc/source/registry_tdprovider/tdprovider.cxx +++ b/stoc/source/registry_tdprovider/tdprovider.cxx @@ -112,7 +112,7 @@ class ProviderImpl virtual uno::Reference< reflection::XTypeDescriptionEnumeration > SAL_CALL createTypeDescriptionEnumeration( - const ::rtl::OUString& moduleName, + const OUString& moduleName, const uno::Sequence< uno::TypeClass >& types, reflection::TypeDescriptionSearchDepth depth ) throw ( reflection::NoSuchTypeNameException, @@ -152,7 +152,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XTypeDescriptionEnumeration > SAL_CALL createTypeDescriptionEnumeration( - const ::rtl::OUString& moduleName, + const OUString& moduleName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::TypeClass >& types, ::com::sun::star::reflection::TypeDescriptionSearchDepth depth ) @@ -202,7 +202,7 @@ sal_Bool ProviderImpl::TypeDescriptionManagerWrapper::hasByHierarchicalName( //______________________________________________________________________________ uno::Reference< reflection::XTypeDescriptionEnumeration > SAL_CALL ProviderImpl::TypeDescriptionManagerWrapper::createTypeDescriptionEnumeration( - const ::rtl::OUString& moduleName, + const OUString& moduleName, const uno::Sequence< uno::TypeClass >& types, reflection::TypeDescriptionSearchDepth depth ) throw ( reflection::NoSuchTypeNameException, @@ -482,13 +482,13 @@ com::sun::star::uno::Reference< XTypeDescription > createTypeDescription( case RT_TYPE_INTERFACE: { sal_uInt16 n = aReader.getSuperTypeCount(); - com::sun::star::uno::Sequence< rtl::OUString > aBaseTypeNames(n); + com::sun::star::uno::Sequence< OUString > aBaseTypeNames(n); for (sal_uInt16 i = 0; i < n; ++i) { aBaseTypeNames[i] = aReader.getSuperTypeName(i).replace( '/', '.'); } sal_uInt16 n2 = aReader.getReferenceCount(); - com::sun::star::uno::Sequence< rtl::OUString > + com::sun::star::uno::Sequence< OUString > aOptionalBaseTypeNames(n2); for (sal_uInt16 i = 0; i < n2; ++i) { OSL_ASSERT( @@ -520,7 +520,7 @@ com::sun::star::uno::Reference< XTypeDescription > createTypeDescription( case RT_TYPE_STRUCT: { - rtl::OUString superTypeName; + OUString superTypeName; if (aReader.getSuperTypeCount() == 1) { superTypeName = aReader.getSuperTypeName(0).replace( '/', '.'); @@ -541,7 +541,7 @@ com::sun::star::uno::Reference< XTypeDescription > createTypeDescription( case RT_TYPE_EXCEPTION: { - rtl::OUString superTypeName; + OUString superTypeName; if (aReader.getSuperTypeCount() == 1) { superTypeName = aReader.getSuperTypeName(0).replace( '/', '.'); diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx index 294f000db92c..de7795672938 100644 --- a/stoc/source/registry_tdprovider/tdservice.cxx +++ b/stoc/source/registry_tdprovider/tdservice.cxx @@ -30,7 +30,6 @@ #include using namespace com::sun::star; -using ::rtl::OUStringBuffer; namespace { @@ -40,7 +39,7 @@ class Constructor: public: Constructor( Reference< XHierarchicalNameAccess > const & manager, - rtl::OUString const & name, Sequence< sal_Int8 > const & bytes, + OUString const & name, Sequence< sal_Int8 > const & bytes, sal_uInt16 index): m_desc(manager, name, bytes, index) {} @@ -49,7 +48,7 @@ public: virtual sal_Bool SAL_CALL isDefaultConstructor() throw (RuntimeException) { return m_desc.getName().isEmpty(); } - virtual rtl::OUString SAL_CALL getName() throw (RuntimeException) + virtual OUString SAL_CALL getName() throw (RuntimeException) { return m_desc.getName(); } virtual Sequence< Reference< XParameter > > SAL_CALL getParameters() @@ -338,7 +337,7 @@ ServiceTypeDescriptionImpl::getConstructors() throw (RuntimeException) { ctorCount)); SAL_WNODEPRECATED_DECLARATIONS_POP for (sal_uInt16 i = 0; i < ctorCount; ++i) { - rtl::OUString name(reader.getMethodName(i)); + OUString name(reader.getMethodName(i)); if (reader.getMethodFlags(i) != RT_MODE_TWOWAY || (reader.getMethodReturnTypeName(i) != "void") || (name.isEmpty() @@ -346,7 +345,7 @@ ServiceTypeDescriptionImpl::getConstructors() throw (RuntimeException) { || reader.getMethodExceptionCount(i) != 0))) { throw RuntimeException( - rtl::OUString( + OUString( "Service has bad constructors"), static_cast< OWeakObject * >(this)); } @@ -373,7 +372,7 @@ void ServiceTypeDescriptionImpl::getReferences() sal_uInt16 superTypes = aReader.getSuperTypeCount(); if (superTypes > 1) { throw RuntimeException( - rtl::OUString( + OUString( "Service has more than one supertype"), static_cast< OWeakObject * >(this)); } diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index c774793b2221..10e3bdabbcda 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -60,9 +60,6 @@ using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; extern ::rtl_StandardModuleCount g_moduleCount; @@ -348,7 +345,7 @@ static inline Reference< security::XAccessControlContext > getDynamicRestriction { if (xContext.is()) { - Any acc(xContext->getValueByName(rtl::OUString(s_acRestriction))); + Any acc(xContext->getValueByName(OUString(s_acRestriction))); if (typelib_TypeClass_INTERFACE == acc.pType->eTypeClass) { // avoid ref-counting @@ -409,7 +406,7 @@ class AccessController bool m_defaultPerm_init; bool m_singleUser_init; // for multi-user mode - lru_cache< OUString, PermissionCollection, ::rtl::OUStringHash, equal_to< OUString > > + lru_cache< OUString, PermissionCollection, OUStringHash, equal_to< OUString > > m_user2permissions; ThreadData m_rec; @@ -606,13 +603,13 @@ static void dumpPermissions( buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> dumping default permissions:") ); } - OString str( ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); + OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); Sequence< OUString > permissions( collection.toStrings() ); OUString const * p = permissions.getConstArray(); for ( sal_Int32 nPos = 0; nPos < permissions.getLength(); ++nPos ) { - OString str( ::rtl::OUStringToOString( p[ nPos ], RTL_TEXTENCODING_ASCII_US ) ); + OString str( OUStringToOString( p[ nPos ], RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); } OSL_TRACE( "> permission dump done" ); @@ -754,7 +751,7 @@ PermissionCollection AccessController::getEffectivePermissions( buf.append( userId ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"") ); OString str( - ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); + OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); #endif return PermissionCollection( new AllPermission() ); diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h index bb0fcba130db..be081b761074 100644 --- a/stoc/source/security/lru_cache.h +++ b/stoc/source/security/lru_cache.h @@ -188,11 +188,11 @@ inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup( Entry * entry = iFind->second; toFront( entry ); #ifdef __CACHE_DIAGNOSE - ::rtl::OUStringBuffer buf( 48 ); + OUStringBuffer buf( 48 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> retrieved element \"") ); buf.append( entry->m_key ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") ); - ::rtl::OString str( ::rtl::OUStringToOString( + OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); #endif @@ -217,11 +217,11 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set( #ifdef __CACHE_DIAGNOSE if (entry->m_key.getLength()) { - ::rtl::OUStringBuffer buf( 48 ); + OUStringBuffer buf( 48 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> kicking element \"") ); buf.append( entry->m_key ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") ); - ::rtl::OString str( ::rtl::OUStringToOString( + OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); } @@ -239,11 +239,11 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set( { entry = iFind->second; #ifdef __CACHE_DIAGNOSE - ::rtl::OUStringBuffer buf( 48 ); + OUStringBuffer buf( 48 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> replacing element \"") ); buf.append( entry->m_key ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" in cache") ); - ::rtl::OString str( ::rtl::OUStringToOString( + OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); #endif diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index c6edcf2004db..4cf385e9361a 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -40,8 +40,6 @@ using namespace ::std; using namespace ::osl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace stoc_sec { @@ -74,7 +72,7 @@ static inline sal_Int32 makeMask( OUStringBuffer buf( 48 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("### ignoring unknown socket action: ") ); buf.append( item ); - ::rtl::OString str( ::rtl::OUStringToOString( + OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); } @@ -565,8 +563,8 @@ static void demanded_diag( buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("demanding ") ); buf.append( perm.toString() ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" => ok.") ); - ::rtl::OString str( - ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); + OString str( + OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); } #endif diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h index 05c6b9e61a92..39532990a220 100644 --- a/stoc/source/security/permissions.h +++ b/stoc/source/security/permissions.h @@ -49,7 +49,7 @@ public: {} virtual bool implies( Permission const & perm ) const SAL_THROW(()) = 0; - virtual ::rtl::OUString toString() const SAL_THROW(()) = 0; + virtual OUString toString() const SAL_THROW(()) = 0; }; //================================================================================================== class AllPermission : public Permission @@ -62,7 +62,7 @@ public: {} virtual bool implies( Permission const & ) const SAL_THROW(()); - virtual ::rtl::OUString toString() const SAL_THROW(()); + virtual OUString toString() const SAL_THROW(()); }; //================================================================================================== @@ -83,7 +83,7 @@ public: PermissionCollection const & addition = PermissionCollection() ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); #ifdef __DIAGNOSE - ::com::sun::star::uno::Sequence< ::rtl::OUString > toStrings() const SAL_THROW(()); + ::com::sun::star::uno::Sequence< OUString > toStrings() const SAL_THROW(()); #endif void checkPermission( ::com::sun::star::uno::Any const & perm ) const SAL_THROW( (::com::sun::star::uno::RuntimeException) ); diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 3b2c25b7abcf..93923c2f6ddb 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -70,10 +70,6 @@ using namespace cppu; using namespace osl; using namespace std; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index 816c35547bcc..dbf7d13ad262 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -68,10 +68,10 @@ public: osl::Mutex mutex_; private: - virtual rtl::OUString SAL_CALL getURL() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException); virtual void SAL_CALL open( - rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) + OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); @@ -92,20 +92,20 @@ private: css::registry::InvalidRegistryException, css::uno::RuntimeException); virtual void SAL_CALL mergeKey( - rtl::OUString const & aKeyName, rtl::OUString const & aUrl) + OUString const & aKeyName, OUString const & aUrl) throw ( css::registry::InvalidRegistryException, css::registry::MergeConflictException, css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return stoc_bootstrap::simreg_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == getSupportedServiceNames()[0]; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return stoc_bootstrap::simreg_getSupportedServiceNames(); } @@ -120,7 +120,7 @@ public: registry_(registry), key_(key) {} private: - virtual rtl::OUString SAL_CALL getKeyName() + virtual OUString SAL_CALL getKeyName() throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly() throw ( @@ -129,7 +129,7 @@ private: virtual sal_Bool SAL_CALL isValid() throw(css::uno::RuntimeException); virtual css::registry::RegistryKeyType SAL_CALL getKeyType( - rtl::OUString const & rKeyName) + OUString const & rKeyName) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); @@ -154,38 +154,38 @@ private: css::registry::InvalidRegistryException, css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getAsciiValue() throw ( + virtual OUString SAL_CALL getAsciiValue() throw ( css::registry::InvalidRegistryException, css::registry::InvalidValueException, css::uno::RuntimeException); - virtual void SAL_CALL setAsciiValue(rtl::OUString const & value) throw ( + virtual void SAL_CALL setAsciiValue(OUString const & value) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getAsciiListValue() + virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue() throw ( css::registry::InvalidRegistryException, css::registry::InvalidValueException, css::uno::RuntimeException); virtual void SAL_CALL setAsciiListValue( - css::uno::Sequence< rtl::OUString > const & seqValue) + css::uno::Sequence< OUString > const & seqValue) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getStringValue() throw( + virtual OUString SAL_CALL getStringValue() throw( css::registry::InvalidRegistryException, css::registry::InvalidValueException, css::uno::RuntimeException); - virtual void SAL_CALL setStringValue(rtl::OUString const & value) throw ( + virtual void SAL_CALL setStringValue(OUString const & value) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getStringListValue() + virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue() throw ( css::registry::InvalidRegistryException, css::registry::InvalidValueException, css::uno::RuntimeException); virtual void SAL_CALL setStringListValue( - css::uno::Sequence< rtl::OUString > const & seqValue) + css::uno::Sequence< OUString > const & seqValue) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); @@ -201,19 +201,19 @@ private: css::uno::RuntimeException); virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey( - rtl::OUString const & aKeyName) + OUString const & aKeyName) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL - createKey(rtl::OUString const & aKeyName) throw ( + createKey(OUString const & aKeyName) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); virtual void SAL_CALL closeKey() throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); - virtual void SAL_CALL deleteKey(rtl::OUString const & rKeyName) throw ( + virtual void SAL_CALL deleteKey(OUString const & rKeyName) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); virtual @@ -221,26 +221,26 @@ private: SAL_CALL openKeys() throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getKeyNames() throw ( + virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); virtual sal_Bool SAL_CALL createLink( - rtl::OUString const & aLinkName, rtl::OUString const & aLinkTarget) + OUString const & aLinkName, OUString const & aLinkTarget) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); - virtual void SAL_CALL deleteLink(rtl::OUString const & rLinkName) throw ( + virtual void SAL_CALL deleteLink(OUString const & rLinkName) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLinkTarget( - rtl::OUString const & rLinkName) + virtual OUString SAL_CALL getLinkTarget( + OUString const & rLinkName) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getResolvedName( - rtl::OUString const & aKeyName) + virtual OUString SAL_CALL getResolvedName( + OUString const & aKeyName) throw ( css::registry::InvalidRegistryException, css::uno::RuntimeException); @@ -249,7 +249,7 @@ private: RegistryKey key_; }; -rtl::OUString Key::getKeyName() throw (css::uno::RuntimeException) { +OUString Key::getKeyName() throw (css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); return key_.getName(); } @@ -266,7 +266,7 @@ sal_Bool Key::isValid() throw (css::uno::RuntimeException) { return key_.isValid(); } -css::registry::RegistryKeyType Key::getKeyType(rtl::OUString const & rKeyName) +css::registry::RegistryKeyType Key::getKeyType(OUString const & rKeyName) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); @@ -274,7 +274,7 @@ css::registry::RegistryKeyType Key::getKeyType(rtl::OUString const & rKeyName) RegError err = key_.getKeyType(rKeyName, &type); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyType:" " underlying RegistryKey::getKeyType() = ")) + @@ -298,7 +298,7 @@ css::registry::RegistryValueType Key::getValueType() osl::MutexGuard guard(registry_->mutex_); RegValueType type; sal_uInt32 size; - RegError err = key_.getValueInfo(rtl::OUString(), &type, &size); + RegError err = key_.getValueInfo(OUString(), &type, &size); switch (err) { case REG_NO_ERROR: break; @@ -307,7 +307,7 @@ css::registry::RegistryValueType Key::getValueType() break; default: throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getValueType:" " underlying RegistryKey::getValueInfo() = ")) + @@ -343,20 +343,20 @@ sal_Int32 Key::getLongValue() throw ( { osl::MutexGuard guard(registry_->mutex_); sal_Int32 value; - RegError err = key_.getValue(rtl::OUString(), &value); + RegError err = key_.getValue(OUString(), &value); switch (err) { case REG_NO_ERROR: break; case REG_INVALID_VALUE: throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongValue:" " underlying RegistryKey::getValue() = REG_INVALID_VALUE")), static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongValue:" " underlying RegistryKey::getValue() = ")) + @@ -371,10 +371,10 @@ void Key::setLongValue(sal_Int32 value) { osl::MutexGuard guard(registry_->mutex_); RegError err = key_.setValue( - rtl::OUString(), RG_VALUETYPE_LONG, &value, sizeof (sal_Int32)); + OUString(), RG_VALUETYPE_LONG, &value, sizeof (sal_Int32)); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setLongValue:" " underlying RegistryKey::setValue() = ")) + @@ -389,7 +389,7 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( { osl::MutexGuard guard(registry_->mutex_); RegistryValueList< sal_Int32 > list; - RegError err = key_.getLongListValue(rtl::OUString(), list); + RegError err = key_.getLongListValue(OUString(), list); switch (err) { case REG_NO_ERROR: break; @@ -397,7 +397,7 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( return css::uno::Sequence< sal_Int32 >(); case REG_INVALID_VALUE: throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongListValue:" " underlying RegistryKey::getLongListValue() =" @@ -405,7 +405,7 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongListValue:" " underlying RegistryKey::getLongListValue() = ")) + @@ -415,7 +415,7 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( sal_uInt32 n = list.getLength(); if (n > SAL_MAX_INT32) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongListValue:" " underlying RegistryKey::getLongListValue() too large")), @@ -437,11 +437,11 @@ void Key::setLongListValue(css::uno::Sequence< sal_Int32 > const & seqValue) list.push_back(seqValue[i]); } RegError err = key_.setLongListValue( - rtl::OUString(), list.empty() ? 0 : &list[0], + OUString(), list.empty() ? 0 : &list[0], static_cast< sal_uInt32 >(list.size())); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setLongListValue:" " underlying RegistryKey::setLongListValue() = ")) + @@ -450,17 +450,17 @@ void Key::setLongListValue(css::uno::Sequence< sal_Int32 > const & seqValue) } } -rtl::OUString Key::getAsciiValue() throw ( +OUString Key::getAsciiValue() throw ( css::registry::InvalidRegistryException, css::registry::InvalidValueException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); RegValueType type; sal_uInt32 size; - RegError err = key_.getValueInfo(rtl::OUString(), &type, &size); + RegError err = key_.getValueInfo(OUString(), &type, &size); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey::getValueInfo() = ")) + @@ -469,7 +469,7 @@ rtl::OUString Key::getAsciiValue() throw ( } if (type != RG_VALUETYPE_STRING) { throw css::registry::InvalidValueException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey type = ")) + @@ -479,7 +479,7 @@ rtl::OUString Key::getAsciiValue() throw ( // size contains terminating null (error in underlying registry.cxx): if (size == 0) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey size 0 cannot happen due to" @@ -488,17 +488,17 @@ rtl::OUString Key::getAsciiValue() throw ( } if (size > SAL_MAX_INT32) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey size too large")), static_cast< OWeakObject * >(this)); } std::vector< char > list(size); - err = key_.getValue(rtl::OUString(), &list[0]); + err = key_.getValue(OUString(), &list[0]); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey::getValue() = ")) + @@ -507,14 +507,14 @@ rtl::OUString Key::getAsciiValue() throw ( } if (list[size - 1] != '\0') { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey value must be null-terminated due" " to design error")), static_cast< OWeakObject * >(this)); } - rtl::OUString value; + OUString value; if (!rtl_convertStringToUString( &value.pData, &list[0], static_cast< sal_Int32 >(size - 1), RTL_TEXTENCODING_UTF8, @@ -523,7 +523,7 @@ rtl::OUString Key::getAsciiValue() throw ( RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey not UTF-8")), @@ -532,30 +532,30 @@ rtl::OUString Key::getAsciiValue() throw ( return value; } -void Key::setAsciiValue(rtl::OUString const & value) +void Key::setAsciiValue(OUString const & value) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); - rtl::OString utf8; + OString utf8; if (!value.convertToString( &utf8, RTL_TEXTENCODING_UTF8, (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setAsciiValue:" " value not UTF-16")), static_cast< OWeakObject * >(this)); } RegError err = key_.setValue( - rtl::OUString(), RG_VALUETYPE_STRING, + OUString(), RG_VALUETYPE_STRING, const_cast< char * >(utf8.getStr()), utf8.getLength() + 1); // +1 for terminating null (error in underlying registry.cxx) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setAsciiValue:" " underlying RegistryKey::setValue() = ")) + @@ -564,21 +564,21 @@ void Key::setAsciiValue(rtl::OUString const & value) } } -css::uno::Sequence< rtl::OUString > Key::getAsciiListValue() throw ( +css::uno::Sequence< OUString > Key::getAsciiListValue() throw ( css::registry::InvalidRegistryException, css::registry::InvalidValueException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); RegistryValueList< char * > list; - RegError err = key_.getStringListValue(rtl::OUString(), list); + RegError err = key_.getStringListValue(OUString(), list); switch (err) { case REG_NO_ERROR: break; case REG_VALUE_NOT_EXISTS: - return css::uno::Sequence< rtl::OUString >(); + return css::uno::Sequence< OUString >(); case REG_INVALID_VALUE: throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying" @@ -586,7 +586,7 @@ css::uno::Sequence< rtl::OUString > Key::getAsciiListValue() throw ( static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying" @@ -597,14 +597,14 @@ css::uno::Sequence< rtl::OUString > Key::getAsciiListValue() throw ( sal_uInt32 n = list.getLength(); if (n > SAL_MAX_INT32) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying" " RegistryKey::getStringListValue() too large")), static_cast< OWeakObject * >(this)); } - css::uno::Sequence< rtl::OUString > value(static_cast< sal_Int32 >(n)); + css::uno::Sequence< OUString > value(static_cast< sal_Int32 >(n)); for (sal_uInt32 i = 0; i < n; ++i) { char * el = list.getElement(i); sal_Int32 size = rtl_str_getLength(el); @@ -616,7 +616,7 @@ css::uno::Sequence< rtl::OUString > Key::getAsciiListValue() throw ( RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying RegistryKey not" @@ -628,20 +628,20 @@ css::uno::Sequence< rtl::OUString > Key::getAsciiListValue() throw ( } void Key::setAsciiListValue( - css::uno::Sequence< rtl::OUString > const & seqValue) + css::uno::Sequence< OUString > const & seqValue) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); - std::vector< rtl::OString > list; + std::vector< OString > list; for (sal_Int32 i = 0; i < seqValue.getLength(); ++i) { - rtl::OString utf8; + OString utf8; if (!seqValue[i].convertToString( &utf8, RTL_TEXTENCODING_UTF8, (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " setAsciiListValue: value not UTF-16")), @@ -650,17 +650,17 @@ void Key::setAsciiListValue( list.push_back(utf8); } std::vector< char * > list2; - for (std::vector< rtl::OString >::iterator i(list.begin()); i != list.end(); + for (std::vector< OString >::iterator i(list.begin()); i != list.end(); ++i) { list2.push_back(const_cast< char * >(i->getStr())); } RegError err = key_.setStringListValue( - rtl::OUString(), list2.empty() ? 0 : &list2[0], + OUString(), list2.empty() ? 0 : &list2[0], static_cast< sal_uInt32 >(list2.size())); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " setAsciiListValue: underlying" @@ -670,17 +670,17 @@ void Key::setAsciiListValue( } } -rtl::OUString Key::getStringValue() throw ( +OUString Key::getStringValue() throw ( css::registry::InvalidRegistryException, css::registry::InvalidValueException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); RegValueType type; sal_uInt32 size; - RegError err = key_.getValueInfo(rtl::OUString(), &type, &size); + RegError err = key_.getValueInfo(OUString(), &type, &size); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey::getValueInfo() = ")) + @@ -689,7 +689,7 @@ rtl::OUString Key::getStringValue() throw ( } if (type != RG_VALUETYPE_UNICODE) { throw css::registry::InvalidValueException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey type = ")) + @@ -700,7 +700,7 @@ rtl::OUString Key::getStringValue() throw ( // registry.cxx): if (size == 0 || (size & 1) == 1) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey size 0 or odd cannot happen due to" @@ -709,17 +709,17 @@ rtl::OUString Key::getStringValue() throw ( } if (size > SAL_MAX_INT32) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey size too large")), static_cast< OWeakObject * >(this)); } std::vector< sal_Unicode > list(size); - err = key_.getValue(rtl::OUString(), &list[0]); + err = key_.getValue(OUString(), &list[0]); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey::getValue() = ")) + @@ -728,28 +728,28 @@ rtl::OUString Key::getStringValue() throw ( } if (list[size/2 - 1] != 0) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey value must be null-terminated due" " to design error")), static_cast< OWeakObject * >(this)); } - return rtl::OUString(&list[0], static_cast< sal_Int32 >(size/2 - 1)); + return OUString(&list[0], static_cast< sal_Int32 >(size/2 - 1)); } -void Key::setStringValue(rtl::OUString const & value) +void Key::setStringValue(OUString const & value) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); RegError err = key_.setValue( - rtl::OUString(), RG_VALUETYPE_UNICODE, + OUString(), RG_VALUETYPE_UNICODE, const_cast< sal_Unicode * >(value.getStr()), (value.getLength() + 1) * sizeof (sal_Unicode)); // +1 for terminating null (error in underlying registry.cxx) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setStringValue:" " underlying RegistryKey::setValue() = ")) + @@ -758,21 +758,21 @@ void Key::setStringValue(rtl::OUString const & value) } } -css::uno::Sequence< rtl::OUString > Key::getStringListValue() throw ( +css::uno::Sequence< OUString > Key::getStringListValue() throw ( css::registry::InvalidRegistryException, css::registry::InvalidValueException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); RegistryValueList< sal_Unicode * > list; - RegError err = key_.getUnicodeListValue(rtl::OUString(), list); + RegError err = key_.getUnicodeListValue(OUString(), list); switch (err) { case REG_NO_ERROR: break; case REG_VALUE_NOT_EXISTS: - return css::uno::Sequence< rtl::OUString >(); + return css::uno::Sequence< OUString >(); case REG_INVALID_VALUE: throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getStringListValue: underlying" @@ -780,7 +780,7 @@ css::uno::Sequence< rtl::OUString > Key::getStringListValue() throw ( static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getStringListValue: underlying" @@ -791,14 +791,14 @@ css::uno::Sequence< rtl::OUString > Key::getStringListValue() throw ( sal_uInt32 n = list.getLength(); if (n > SAL_MAX_INT32) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getStringListValue: underlying" " RegistryKey::getUnicodeListValue() too large")), static_cast< OWeakObject * >(this)); } - css::uno::Sequence< rtl::OUString > value(static_cast< sal_Int32 >(n)); + css::uno::Sequence< OUString > value(static_cast< sal_Int32 >(n)); for (sal_uInt32 i = 0; i < n; ++i) { value[static_cast< sal_Int32 >(i)] = list.getElement(i); } @@ -806,7 +806,7 @@ css::uno::Sequence< rtl::OUString > Key::getStringListValue() throw ( } void Key::setStringListValue( - css::uno::Sequence< rtl::OUString > const & seqValue) + css::uno::Sequence< OUString > const & seqValue) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); @@ -815,11 +815,11 @@ void Key::setStringListValue( list.push_back(const_cast< sal_Unicode * >(seqValue[i].getStr())); } RegError err = key_.setUnicodeListValue( - rtl::OUString(), list.empty() ? 0 : &list[0], + OUString(), list.empty() ? 0 : &list[0], static_cast< sal_uInt32 >(list.size())); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " setStringListValue: underlying" @@ -837,10 +837,10 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() osl::MutexGuard guard(registry_->mutex_); RegValueType type; sal_uInt32 size; - RegError err = key_.getValueInfo(rtl::OUString(), &type, &size); + RegError err = key_.getValueInfo(OUString(), &type, &size); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" " underlying RegistryKey::getValueInfo() = ")) + @@ -849,7 +849,7 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() } if (type != RG_VALUETYPE_BINARY) { throw css::registry::InvalidValueException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" " underlying RegistryKey type = ")) + @@ -858,17 +858,17 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() } if (size > SAL_MAX_INT32) { throw css::registry::InvalidValueException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" " underlying RegistryKey size too large")), static_cast< OWeakObject * >(this)); } css::uno::Sequence< sal_Int8 > value(static_cast< sal_Int32 >(size)); - err = key_.getValue(rtl::OUString(), value.getArray()); + err = key_.getValue(OUString(), value.getArray()); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" " underlying RegistryKey::getValue() = ")) + @@ -883,12 +883,12 @@ void Key::setBinaryValue(css::uno::Sequence< sal_Int8 > const & value) { osl::MutexGuard guard(registry_->mutex_); RegError err = key_.setValue( - rtl::OUString(), RG_VALUETYPE_BINARY, + OUString(), RG_VALUETYPE_BINARY, const_cast< sal_Int8 * >(value.getConstArray()), static_cast< sal_uInt32 >(value.getLength())); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setBinaryValue:" " underlying RegistryKey::setValue() = ")) + @@ -898,7 +898,7 @@ void Key::setBinaryValue(css::uno::Sequence< sal_Int8 > const & value) } css::uno::Reference< css::registry::XRegistryKey > Key::openKey( - rtl::OUString const & aKeyName) + OUString const & aKeyName) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); @@ -911,7 +911,7 @@ css::uno::Reference< css::registry::XRegistryKey > Key::openKey( return css::uno::Reference< css::registry::XRegistryKey >(); default: throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key openKey:" " underlying RegistryKey::openKey() = ")) + @@ -921,7 +921,7 @@ css::uno::Reference< css::registry::XRegistryKey > Key::openKey( } css::uno::Reference< css::registry::XRegistryKey > Key::createKey( - rtl::OUString const & aKeyName) + OUString const & aKeyName) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); @@ -934,7 +934,7 @@ css::uno::Reference< css::registry::XRegistryKey > Key::createKey( return css::uno::Reference< css::registry::XRegistryKey >(); default: throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key createKey:" " underlying RegistryKey::createKey() = ")) + @@ -950,7 +950,7 @@ void Key::closeKey() RegError err = key_.closeKey(); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key closeKey:" " underlying RegistryKey::closeKey() = ")) + @@ -959,14 +959,14 @@ void Key::closeKey() } } -void Key::deleteKey(rtl::OUString const & rKeyName) +void Key::deleteKey(OUString const & rKeyName) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); RegError err = key_.deleteKey(rKeyName); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key deleteKey:" " underlying RegistryKey::deleteKey() = ")) + @@ -981,10 +981,10 @@ Key::openKeys() { osl::MutexGuard guard(registry_->mutex_); RegistryKeyArray list; - RegError err = key_.openSubKeys(rtl::OUString(), list); + RegError err = key_.openSubKeys(OUString(), list); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key openKeys:" " underlying RegistryKey::openSubKeys() = ")) + @@ -994,7 +994,7 @@ Key::openKeys() sal_uInt32 n = list.getLength(); if (n > SAL_MAX_INT32) { throw css::registry::InvalidRegistryException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyNames:" " underlying RegistryKey::getKeyNames() too large")), @@ -1009,15 +1009,15 @@ Key::openKeys() return keys; } -css::uno::Sequence< rtl::OUString > Key::getKeyNames() +css::uno::Sequence< OUString > Key::getKeyNames() throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); RegistryKeyNames list; - RegError err = key_.getKeyNames(rtl::OUString(), list); + RegError err = key_.getKeyNames(OUString(), list); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyNames:" " underlying RegistryKey::getKeyNames() = ")) + @@ -1027,13 +1027,13 @@ css::uno::Sequence< rtl::OUString > Key::getKeyNames() sal_uInt32 n = list.getLength(); if (n > SAL_MAX_INT32) { throw css::registry::InvalidRegistryException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyNames:" " underlying RegistryKey::getKeyNames() too large")), static_cast< OWeakObject * >(this)); } - css::uno::Sequence< rtl::OUString > names(static_cast< sal_Int32 >(n)); + css::uno::Sequence< OUString > names(static_cast< sal_Int32 >(n)); for (sal_uInt32 i = 0; i < n; ++i) { names[static_cast< sal_Int32 >(i)] = list.getElement(i); } @@ -1041,7 +1041,7 @@ css::uno::Sequence< rtl::OUString > Key::getKeyNames() } sal_Bool Key::createLink( - rtl::OUString const & aLinkName, rtl::OUString const & aLinkTarget) + OUString const & aLinkName, OUString const & aLinkTarget) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); @@ -1052,7 +1052,7 @@ sal_Bool Key::createLink( case REG_INVALID_KEY: case REG_DETECT_RECURSION: throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key createLink:" " underlying RegistryKey::createLink() = ")) + @@ -1063,14 +1063,14 @@ sal_Bool Key::createLink( } } -void Key::deleteLink(rtl::OUString const & rLinkName) +void Key::deleteLink(OUString const & rLinkName) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); RegError err = key_.deleteLink(rLinkName); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key deleteLink:" " underlying RegistryKey::deleteLink() = ")) + @@ -1079,15 +1079,15 @@ void Key::deleteLink(rtl::OUString const & rLinkName) } } -rtl::OUString Key::getLinkTarget(rtl::OUString const & rLinkName) +OUString Key::getLinkTarget(OUString const & rLinkName) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); - rtl::OUString target; + OUString target; RegError err = key_.getLinkTarget(rLinkName, target); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLinkTarget:" " underlying RegistryKey::getLinkTarget() = ")) + @@ -1097,15 +1097,15 @@ rtl::OUString Key::getLinkTarget(rtl::OUString const & rLinkName) return target; } -rtl::OUString Key::getResolvedName(rtl::OUString const & aKeyName) +OUString Key::getResolvedName(OUString const & aKeyName) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(registry_->mutex_); - rtl::OUString resolved; + OUString resolved; RegError err = key_.getResolvedKeyName(aKeyName, true, resolved); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getResolvedName:" " underlying RegistryKey::getResolvedName() = ")) + @@ -1115,13 +1115,13 @@ rtl::OUString Key::getResolvedName(rtl::OUString const & aKeyName) return resolved; } -rtl::OUString SimpleRegistry::getURL() throw (css::uno::RuntimeException) { +OUString SimpleRegistry::getURL() throw (css::uno::RuntimeException) { osl::MutexGuard guard(mutex_); return registry_.getName(); } void SimpleRegistry::open( - rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) + OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(mutex_); @@ -1133,10 +1133,10 @@ void SimpleRegistry::open( } if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( "com.sun.star.registry.SimpleRegistry.open(") + rURL + - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "): underlying Registry::open/create() = ")) + OUString::number(err)), @@ -1156,7 +1156,7 @@ void SimpleRegistry::close() RegError err = registry_.close(); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.close:" " underlying Registry::close() = ")) + @@ -1169,10 +1169,10 @@ void SimpleRegistry::destroy() throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(mutex_); - RegError err = registry_.destroy(rtl::OUString()); + RegError err = registry_.destroy(OUString()); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.destroy:" " underlying Registry::destroy() = ")) + @@ -1189,7 +1189,7 @@ css::uno::Reference< css::registry::XRegistryKey > SimpleRegistry::getRootKey() RegError err = registry_.openRootKey(root); if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.getRootKey:" " underlying Registry::getRootKey() = ")) + @@ -1207,7 +1207,7 @@ sal_Bool SimpleRegistry::isReadOnly() } void SimpleRegistry::mergeKey( - rtl::OUString const & aKeyName, rtl::OUString const & aUrl) + OUString const & aKeyName, OUString const & aUrl) throw ( css::registry::InvalidRegistryException, css::registry::MergeConflictException, css::uno::RuntimeException) @@ -1224,14 +1224,14 @@ void SimpleRegistry::mergeKey( break; case REG_MERGE_ERROR: throw css::registry::MergeConflictException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.mergeKey:" " underlying Registry::mergeKey() = REG_MERGE_ERROR")), static_cast< cppu::OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.mergeKey:" " underlying Registry::getRootKey/mergeKey() = ")) + @@ -1251,14 +1251,14 @@ css::uno::Reference< css::uno::XInterface > SimpleRegistry_CreateInstance( return static_cast< cppu::OWeakObject * >(new SimpleRegistry); } -css::uno::Sequence< rtl::OUString > simreg_getSupportedServiceNames() { - css::uno::Sequence< rtl::OUString > names(1); - names[0] = rtl::OUString("com.sun.star.registry.SimpleRegistry"); +css::uno::Sequence< OUString > simreg_getSupportedServiceNames() { + css::uno::Sequence< OUString > names(1); + names[0] = OUString("com.sun.star.registry.SimpleRegistry"); return names; } -rtl::OUString simreg_getImplementationName() { - return rtl::OUString("com.sun.star.comp.stoc.SimpleRegistry"); +OUString simreg_getImplementationName() { + return OUString("com.sun.star.comp.stoc.SimpleRegistry"); } } diff --git a/stoc/source/tdmanager/lrucache.hxx b/stoc/source/tdmanager/lrucache.hxx index b7a6895a5808..0ab1712fb793 100644 --- a/stoc/source/tdmanager/lrucache.hxx +++ b/stoc/source/tdmanager/lrucache.hxx @@ -224,16 +224,16 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear() } //================================================================================================== -struct FctHashOUString : public ::std::unary_function< ::rtl::OUString const &, size_t > +struct FctHashOUString : public ::std::unary_function< OUString const &, size_t > { - size_t operator()( ::rtl::OUString const & rKey ) const + size_t operator()( OUString const & rKey ) const { return (size_t)rKey.hashCode(); } }; /** Template instance for OUString keys, Any values.
      */ -typedef LRU_Cache< ::rtl::OUString, ::com::sun::star::uno::Any, - FctHashOUString, ::std::equal_to< ::rtl::OUString > > +typedef LRU_Cache< OUString, ::com::sun::star::uno::Any, + FctHashOUString, ::std::equal_to< OUString > > LRU_CacheAnyByOUString; diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx index 458bded2165c..2ac14838d434 100644 --- a/stoc/source/tdmanager/tdmgr.cxx +++ b/stoc/source/tdmanager/tdmgr.cxx @@ -59,8 +59,6 @@ using namespace com::sun::star::reflection; using namespace com::sun::star::container; using namespace com::sun::star::registry; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; static const sal_Int32 CACHE_SIZE = 512; @@ -179,7 +177,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XTypeDescriptionEnumeration > SAL_CALL createTypeDescriptionEnumeration( - const ::rtl::OUString& moduleName, + const OUString& moduleName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::TypeClass >& types, ::com::sun::star::reflection::TypeDescriptionSearchDepth depth ) @@ -1000,7 +998,7 @@ Reference< XTypeDescription > ManagerImpl::getInstantiatedStruct( && name[i] == '>' && !args.empty(); } // args.size() cannot exceed SAL_MAX_INT32, as each argument consumes at - // least one position within an rtl::OUString (which is no longer than + // least one position within an OUString (which is no longer than // SAL_MAX_INT32): if (!good || (args.size() diff --git a/stoc/source/tdmanager/tdmgr_check.cxx b/stoc/source/tdmanager/tdmgr_check.cxx index ff9e763bea1e..2ffb80a32c97 100644 --- a/stoc/source/tdmanager/tdmgr_check.cxx +++ b/stoc/source/tdmanager/tdmgr_check.cxx @@ -33,8 +33,6 @@ #include "com/sun/star/reflection/XSingletonTypeDescription2.hpp" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::stoc_tdmgr; diff --git a/stoc/source/tdmanager/tdmgr_common.hxx b/stoc/source/tdmanager/tdmgr_common.hxx index 33f1a2ad307b..e841f5de5a3a 100644 --- a/stoc/source/tdmanager/tdmgr_common.hxx +++ b/stoc/source/tdmanager/tdmgr_common.hxx @@ -33,15 +33,15 @@ namespace stoc_tdmgr struct IncompatibleTypeException { - ::rtl::OUString m_cause; - IncompatibleTypeException( ::rtl::OUString const & cause ) + OUString m_cause; + IncompatibleTypeException( OUString const & cause ) : m_cause( cause ) {} }; void check( css::uno::Reference const & xNewTD, css::uno::Reference const & xExistingTD, - ::rtl::OUString const & context = ::rtl::OUString() ); + OUString const & context = OUString() ); /* throw (css::uno::RuntimeException, IncompatibleTypeException) */ } // namespace stoc_tdmgr diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx index ea44a750835e..0cacac0b86e8 100644 --- a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx +++ b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx @@ -37,7 +37,7 @@ namespace stoc_tdmgr //========================================================================= TypeDescriptionEnumerationImpl::TypeDescriptionEnumerationImpl( - const rtl::OUString & rModuleName, + const OUString & rModuleName, const com::sun::star::uno::Sequence< com::sun::star::uno::TypeClass > & rTypes, com::sun::star::reflection::TypeDescriptionSearchDepth eDepth, @@ -88,7 +88,7 @@ uno::Any SAL_CALL TypeDescriptionEnumerationImpl::nextElement() return xEnum->nextElement(); throw container::NoSuchElementException( - rtl::OUString("No further elements in enumeration!"), + OUString("No further elements in enumeration!"), static_cast< cppu::OWeakObject * >( this ) ); } @@ -110,7 +110,7 @@ TypeDescriptionEnumerationImpl::nextTypeDescription() return xEnum->nextTypeDescription(); throw container::NoSuchElementException( - rtl::OUString("No further elements in enumeration!"), + OUString("No further elements in enumeration!"), static_cast< cppu::OWeakObject * >( this ) ); } diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.hxx b/stoc/source/tdmanager/tdmgr_tdenumeration.hxx index d8ad3ffffb7b..81672ce5c0f8 100644 --- a/stoc/source/tdmanager/tdmgr_tdenumeration.hxx +++ b/stoc/source/tdmanager/tdmgr_tdenumeration.hxx @@ -39,7 +39,7 @@ class TypeDescriptionEnumerationImpl { public: TypeDescriptionEnumerationImpl( - const rtl::OUString & rModuleName, + const OUString & rModuleName, const com::sun::star::uno::Sequence< com::sun::star::uno::TypeClass > & rTypes, com::sun::star::reflection::TypeDescriptionSearchDepth eDepth, @@ -67,7 +67,7 @@ private: queryCurrentChildEnumeration(); osl::Mutex m_aMutex; - rtl::OUString m_aModuleName; + OUString m_aModuleName; com::sun::star::uno::Sequence< com::sun::star::uno::TypeClass > m_aTypes; com::sun::star::reflection::TypeDescriptionSearchDepth m_eDepth; TDEnumerationAccessStack m_aChildren; diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index 125f50bf5ce2..09dd9142ef78 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -46,7 +46,6 @@ using namespace com::sun::star::script; using namespace com::sun::star::registry; using namespace cppu; using namespace osl; -using ::rtl::OUString; #define SERVICENAME "com.sun.star.script.Converter" #define IMPLNAME "com.sun.star.comp.stoc.TypeConverter" diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx index 0888326e340a..fde82194d410 100644 --- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx +++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx @@ -53,21 +53,21 @@ public: css::uno::Reference< css::uno::XComponentContext > const & context): m_context(context) {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL - translateToInternal(rtl::OUString const & externalUriReference) + virtual OUString SAL_CALL + translateToInternal(OUString const & externalUriReference) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL - translateToExternal(rtl::OUString const & internalUriReference) + virtual OUString SAL_CALL + translateToExternal(OUString const & internalUriReference) throw (css::uno::RuntimeException); private: @@ -79,29 +79,29 @@ private: css::uno::Reference< css::uno::XComponentContext > m_context; }; -rtl::OUString Translator::getImplementationName() +OUString Translator::getImplementationName() throw (css::uno::RuntimeException) { return stoc_services::ExternalUriReferenceTranslator::getImplementationName(); } -sal_Bool Translator::supportsService(rtl::OUString const & serviceName) +sal_Bool Translator::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { return stoc::uriproc::supportsService( getSupportedServiceNames(), serviceName); } -css::uno::Sequence< rtl::OUString > Translator::getSupportedServiceNames() +css::uno::Sequence< OUString > Translator::getSupportedServiceNames() throw (css::uno::RuntimeException) { return stoc_services::ExternalUriReferenceTranslator:: getSupportedServiceNames(); } -rtl::OUString Translator::translateToInternal( - rtl::OUString const & externalUriReference) +OUString Translator::translateToInternal( + OUString const & externalUriReference) throw (css::uno::RuntimeException) { if (!externalUriReference.matchIgnoreAsciiCaseAsciiL( @@ -110,7 +110,7 @@ rtl::OUString Translator::translateToInternal( return externalUriReference; } sal_Int32 i = RTL_CONSTASCII_LENGTH("file:"); - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append(externalUriReference.getStr(), i); // Some environments (e.g., Java) produce illegal file URLs without an // authority part; treat them as having an empty authority part: @@ -128,7 +128,7 @@ rtl::OUString Translator::translateToInternal( ++j; } if (j != i) { - rtl::OUString seg( + OUString seg( rtl::Uri::encode( rtl::Uri::decode( externalUriReference.copy(i, j - i), @@ -136,7 +136,7 @@ rtl::OUString Translator::translateToInternal( rtl_UriCharClassPchar, rtl_UriEncodeStrict, RTL_TEXTENCODING_UTF8)); if (seg.isEmpty()) { - return rtl::OUString(); + return OUString(); } buf.append(seg); } @@ -150,8 +150,8 @@ rtl::OUString Translator::translateToInternal( return buf.makeStringAndClear(); } -rtl::OUString Translator::translateToExternal( - rtl::OUString const & internalUriReference) +OUString Translator::translateToExternal( + OUString const & internalUriReference) throw (css::uno::RuntimeException) { if (!internalUriReference.matchIgnoreAsciiCaseAsciiL( @@ -160,7 +160,7 @@ rtl::OUString Translator::translateToExternal( return internalUriReference; } sal_Int32 i = RTL_CONSTASCII_LENGTH("file://"); - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append(internalUriReference.getStr(), i); rtl_TextEncoding encoding = osl_getThreadTextEncoding(); for (bool path = true;;) { @@ -175,7 +175,7 @@ rtl::OUString Translator::translateToExternal( // Use rtl_UriDecodeToIuri -> rtl_UriEncodeStrictKeepEscapes instead // of rtl_UriDecodeStrict -> rtl_UriEncodeStrict, so that spurious // non--UTF-8 octets like "%FE" are copied verbatim: - rtl::OUString seg( + OUString seg( rtl::Uri::encode( rtl::Uri::decode( internalUriReference.copy(i, j - i), @@ -183,7 +183,7 @@ rtl::OUString Translator::translateToExternal( rtl_UriCharClassPchar, rtl_UriEncodeStrictKeepEscapes, encoding)); if (seg.isEmpty()) { - return rtl::OUString(); + return OUString(); } buf.append(seg); } @@ -209,17 +209,17 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Translator(context)); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString("std::bad_alloc"), 0); + OUString("std::bad_alloc"), 0); } } -rtl::OUString getImplementationName() { - return rtl::OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator"); +OUString getImplementationName() { + return OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator"); } -css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { - css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString("com.sun.star.uri.ExternalUriReferenceTranslator"); +css::uno::Sequence< OUString > getSupportedServiceNames() { + css::uno::Sequence< OUString > s(1); + s[0] = OUString("com.sun.star.uri.ExternalUriReferenceTranslator"); return s; } diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx index f823286cc439..3da16dbcd0bb 100644 --- a/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx +++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx @@ -40,9 +40,9 @@ namespace ExternalUriReferenceTranslator { const & context) SAL_THROW((com::sun::star::uno::Exception)); - rtl::OUString SAL_CALL getImplementationName(); + OUString SAL_CALL getImplementationName(); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx index 2dafb685a8d9..312203d78587 100644 --- a/stoc/source/uriproc/UriReference.cxx +++ b/stoc/source/uriproc/UriReference.cxx @@ -30,9 +30,9 @@ using stoc::uriproc::UriReference; UriReference::UriReference( - rtl::OUString const & scheme, bool bIsHierarchical, bool bHasAuthority, - rtl::OUString const & authority, rtl::OUString const & path, - bool bHasQuery, rtl::OUString const & query): + OUString const & scheme, bool bIsHierarchical, bool bHasAuthority, + OUString const & authority, OUString const & path, + bool bHasQuery, OUString const & query): m_scheme(scheme), m_authority(authority), m_path(path), @@ -51,10 +51,10 @@ UriReference::UriReference( UriReference::~UriReference() {} -rtl::OUString UriReference::getUriReference() throw (css::uno::RuntimeException) +OUString UriReference::getUriReference() throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); - rtl::OUStringBuffer buf; + OUStringBuffer buf; if (!m_scheme.isEmpty()) { buf.append(m_scheme); buf.append(static_cast< sal_Unicode >(':')); @@ -71,15 +71,15 @@ sal_Bool UriReference::isAbsolute() throw (css::uno::RuntimeException) { return !m_scheme.isEmpty(); } -rtl::OUString UriReference::getScheme() throw (css::uno::RuntimeException) { +OUString UriReference::getScheme() throw (css::uno::RuntimeException) { return m_scheme; } -rtl::OUString UriReference::getSchemeSpecificPart() +OUString UriReference::getSchemeSpecificPart() throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); - rtl::OUStringBuffer buf; + OUStringBuffer buf; appendSchemeSpecificPart(buf); return buf.makeStringAndClear(); } @@ -94,12 +94,12 @@ sal_Bool UriReference::hasAuthority() throw (css::uno::RuntimeException) { return m_hasAuthority; } -rtl::OUString UriReference::getAuthority() throw (css::uno::RuntimeException) { +OUString UriReference::getAuthority() throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); return m_authority; } -rtl::OUString UriReference::getPath() throw (css::uno::RuntimeException) { +OUString UriReference::getPath() throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); return m_path; } @@ -128,7 +128,7 @@ sal_Int32 UriReference::getPathSegmentCount() throw (css::uno::RuntimeException) } } -rtl::OUString UriReference::getPathSegment(sal_Int32 index) +OUString UriReference::getPathSegment(sal_Int32 index) throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); @@ -144,7 +144,7 @@ rtl::OUString UriReference::getPathSegment(sal_Int32 index) } } } - return rtl::OUString(); + return OUString(); } sal_Bool UriReference::hasQuery() throw (css::uno::RuntimeException) { @@ -152,7 +152,7 @@ sal_Bool UriReference::hasQuery() throw (css::uno::RuntimeException) { return m_hasQuery; } -rtl::OUString UriReference::getQuery() throw (css::uno::RuntimeException) { +OUString UriReference::getQuery() throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); return m_query; } @@ -162,12 +162,12 @@ sal_Bool UriReference::hasFragment() throw (css::uno::RuntimeException) { return m_hasFragment; } -rtl::OUString UriReference::getFragment() throw (css::uno::RuntimeException) { +OUString UriReference::getFragment() throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); return m_fragment; } -void UriReference::setFragment(rtl::OUString const & fragment) +void UriReference::setFragment(OUString const & fragment) throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); @@ -178,10 +178,10 @@ void UriReference::setFragment(rtl::OUString const & fragment) void UriReference::clearFragment() throw (css::uno::RuntimeException) { osl::MutexGuard g(m_mutex); m_hasFragment = false; - m_fragment = rtl::OUString(); + m_fragment = OUString(); } -void UriReference::appendSchemeSpecificPart(rtl::OUStringBuffer & buffer) const +void UriReference::appendSchemeSpecificPart(OUStringBuffer & buffer) const { if (m_hasAuthority) { buffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("//")); diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx index e6557cc4cb26..f6037a2325ea 100644 --- a/stoc/source/uriproc/UriReference.hxx +++ b/stoc/source/uriproc/UriReference.hxx @@ -24,65 +24,64 @@ #include "osl/mutex.hxx" #include "rtl/ustring.hxx" #include "sal/types.h" - -namespace rtl { class OUStringBuffer; } +#include "rtl/ustrbuf.hxx" namespace stoc { namespace uriproc { class UriReference { public: UriReference( - rtl::OUString const & scheme, bool isHierarchical, bool hasAuthority, - rtl::OUString const & authority, rtl::OUString const & path, - bool hasQuery, rtl::OUString const & query); + OUString const & scheme, bool isHierarchical, bool hasAuthority, + OUString const & authority, OUString const & path, + bool hasQuery, OUString const & query); ~UriReference(); - rtl::OUString getUriReference() + OUString getUriReference() throw (com::sun::star::uno::RuntimeException); sal_Bool isAbsolute() throw (com::sun::star::uno::RuntimeException); - rtl::OUString getScheme() throw (com::sun::star::uno::RuntimeException); + OUString getScheme() throw (com::sun::star::uno::RuntimeException); - rtl::OUString getSchemeSpecificPart() + OUString getSchemeSpecificPart() throw (com::sun::star::uno::RuntimeException); sal_Bool isHierarchical() throw (com::sun::star::uno::RuntimeException); sal_Bool hasAuthority() throw (com::sun::star::uno::RuntimeException); - rtl::OUString getAuthority() throw (com::sun::star::uno::RuntimeException); + OUString getAuthority() throw (com::sun::star::uno::RuntimeException); - rtl::OUString getPath() throw (com::sun::star::uno::RuntimeException); + OUString getPath() throw (com::sun::star::uno::RuntimeException); sal_Bool hasRelativePath() throw (com::sun::star::uno::RuntimeException); sal_Int32 getPathSegmentCount() throw (com::sun::star::uno::RuntimeException); - rtl::OUString getPathSegment(sal_Int32 index) + OUString getPathSegment(sal_Int32 index) throw (com::sun::star::uno::RuntimeException); sal_Bool hasQuery() throw (com::sun::star::uno::RuntimeException); - rtl::OUString getQuery() throw (com::sun::star::uno::RuntimeException); + OUString getQuery() throw (com::sun::star::uno::RuntimeException); sal_Bool hasFragment() throw (com::sun::star::uno::RuntimeException); - rtl::OUString getFragment() throw (com::sun::star::uno::RuntimeException); + OUString getFragment() throw (com::sun::star::uno::RuntimeException); - void setFragment(rtl::OUString const & fragment) + void setFragment(OUString const & fragment) throw (com::sun::star::uno::RuntimeException); void clearFragment() throw (com::sun::star::uno::RuntimeException); osl::Mutex m_mutex; - rtl::OUString m_scheme; - rtl::OUString m_authority; - rtl::OUString m_path; - rtl::OUString m_query; - rtl::OUString m_fragment; + OUString m_scheme; + OUString m_authority; + OUString m_path; + OUString m_query; + OUString m_fragment; bool m_isHierarchical; bool m_hasAuthority; bool m_hasQuery; @@ -92,7 +91,7 @@ private: UriReference(UriReference &); // not implemented void operator =(UriReference); // not implemented - void appendSchemeSpecificPart(rtl::OUStringBuffer & buffer) const; + void appendSchemeSpecificPart(OUStringBuffer & buffer) const; }; } } diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx index a5f6041339ab..26b693e96651 100644 --- a/stoc/source/uriproc/UriReferenceFactory.cxx +++ b/stoc/source/uriproc/UriReferenceFactory.cxx @@ -84,7 +84,7 @@ bool equalIgnoreCase(sal_Unicode c1, sal_Unicode c2) { return toLowerCase(c1) == toLowerCase(c2); } -bool equalIgnoreEscapeCase(rtl::OUString const & s1, rtl::OUString const & s2) { +bool equalIgnoreEscapeCase(OUString const & s1, OUString const & s2) { if (s1.getLength() == s2.getLength()) { for (sal_Int32 i = 0; i < s1.getLength();) { if (s1[i] == '%' && s2[i] == '%' && s1.getLength() - i > 2 @@ -106,7 +106,7 @@ bool equalIgnoreEscapeCase(rtl::OUString const & s1, rtl::OUString const & s2) { } } -sal_Int32 parseScheme(rtl::OUString const & uriReference) { +sal_Int32 parseScheme(OUString const & uriReference) { if (uriReference.getLength() >= 2 && isAlpha(uriReference[0])) { for (sal_Int32 i = 0; i < uriReference.getLength(); ++i) { sal_Unicode c = uriReference[i]; @@ -125,15 +125,15 @@ sal_Int32 parseScheme(rtl::OUString const & uriReference) { class UriReference: public cppu::WeakImplHelper1< css::uri::XUriReference > { public: UriReference( - rtl::OUString const & scheme, bool bIsHierarchical, bool bHasAuthority, - rtl::OUString const & authority, rtl::OUString const & path, - bool bHasQuery, rtl::OUString const & query): + OUString const & scheme, bool bIsHierarchical, bool bHasAuthority, + OUString const & authority, OUString const & path, + bool bHasQuery, OUString const & query): m_base( scheme, bIsHierarchical, bHasAuthority, authority, path, bHasQuery, query) {} - virtual rtl::OUString SAL_CALL getUriReference() + virtual OUString SAL_CALL getUriReference() throw (com::sun::star::uno::RuntimeException) { return m_base.getUriReference(); } @@ -141,11 +141,11 @@ public: throw (com::sun::star::uno::RuntimeException) { return m_base.isAbsolute(); } - virtual rtl::OUString SAL_CALL getScheme() + virtual OUString SAL_CALL getScheme() throw (com::sun::star::uno::RuntimeException) { return m_base.getScheme(); } - virtual rtl::OUString SAL_CALL getSchemeSpecificPart() + virtual OUString SAL_CALL getSchemeSpecificPart() throw (com::sun::star::uno::RuntimeException) { return m_base.getSchemeSpecificPart(); } @@ -157,11 +157,11 @@ public: throw (com::sun::star::uno::RuntimeException) { return m_base.hasAuthority(); } - virtual rtl::OUString SAL_CALL getAuthority() + virtual OUString SAL_CALL getAuthority() throw (com::sun::star::uno::RuntimeException) { return m_base.getAuthority(); } - virtual rtl::OUString SAL_CALL getPath() + virtual OUString SAL_CALL getPath() throw (com::sun::star::uno::RuntimeException) { return m_base.getPath(); } @@ -173,7 +173,7 @@ public: throw (com::sun::star::uno::RuntimeException) { return m_base.getPathSegmentCount(); } - virtual rtl::OUString SAL_CALL getPathSegment(sal_Int32 index) + virtual OUString SAL_CALL getPathSegment(sal_Int32 index) throw (com::sun::star::uno::RuntimeException) { return m_base.getPathSegment(index); } @@ -181,7 +181,7 @@ public: throw (com::sun::star::uno::RuntimeException) { return m_base.hasQuery(); } - virtual rtl::OUString SAL_CALL getQuery() + virtual OUString SAL_CALL getQuery() throw (com::sun::star::uno::RuntimeException) { return m_base.getQuery(); } @@ -189,11 +189,11 @@ public: throw (com::sun::star::uno::RuntimeException) { return m_base.hasFragment(); } - virtual rtl::OUString SAL_CALL getFragment() + virtual OUString SAL_CALL getFragment() throw (com::sun::star::uno::RuntimeException) { return m_base.getFragment(); } - virtual void SAL_CALL setFragment(rtl::OUString const & fragment) + virtual void SAL_CALL setFragment(OUString const & fragment) throw (com::sun::star::uno::RuntimeException) { m_base.setFragment(fragment); } @@ -212,17 +212,17 @@ private: // throws std::bad_alloc css::uno::Reference< css::uri::XUriReference > parseGeneric( - rtl::OUString const & scheme, rtl::OUString const & schemeSpecificPart) + OUString const & scheme, OUString const & schemeSpecificPart) { bool isAbsolute = !scheme.isEmpty(); bool isHierarchical = !isAbsolute || (!schemeSpecificPart.isEmpty() && schemeSpecificPart[0] == '/'); bool hasAuthority = false; - rtl::OUString authority; - rtl::OUString path; + OUString authority; + OUString path; bool hasQuery = false; - rtl::OUString query; + OUString query; if (isHierarchical) { sal_Int32 len = schemeSpecificPart.getLength(); sal_Int32 i = 0; @@ -270,7 +270,7 @@ void processSegments( OSL_ASSERT(count <= SAL_MAX_INT32 - 1 && -count >= SAL_MIN_INT32 + 1); for (sal_Int32 i = 0; i < count; ++i) { if (processSpecialSegments) { - rtl::OUString segment(uriReference->getPathSegment(i)); + OUString segment(uriReference->getPathSegment(i)); if ( segment == "." ) { if (!base && i == count - 1) { segments.push_back(0); @@ -299,17 +299,17 @@ public: css::uno::Reference< css::uno::XComponentContext > const & context): m_context(context) {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL - parse(rtl::OUString const & uriReference) + parse(OUString const & uriReference) throw (css::uno::RuntimeException); virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL @@ -342,41 +342,41 @@ private: css::uno::Reference< css::uno::XComponentContext > m_context; }; -rtl::OUString Factory::getImplementationName() +OUString Factory::getImplementationName() throw (css::uno::RuntimeException) { return stoc_services::UriReferenceFactory::getImplementationName(); } -sal_Bool Factory::supportsService(rtl::OUString const & serviceName) +sal_Bool Factory::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { return stoc::uriproc::supportsService( getSupportedServiceNames(), serviceName); } -css::uno::Sequence< rtl::OUString > Factory::getSupportedServiceNames() +css::uno::Sequence< OUString > Factory::getSupportedServiceNames() throw (css::uno::RuntimeException) { return stoc_services::UriReferenceFactory::getSupportedServiceNames(); } css::uno::Reference< css::uri::XUriReference > Factory::parse( - rtl::OUString const & uriReference) throw (css::uno::RuntimeException) + OUString const & uriReference) throw (css::uno::RuntimeException) { sal_Int32 fragment = uriReference.indexOf('#'); if (fragment == -1) { fragment = uriReference.getLength(); } - rtl::OUString scheme; - rtl::OUString schemeSpecificPart; - rtl::OUString serviceName; + OUString scheme; + OUString schemeSpecificPart; + OUString serviceName; sal_Int32 n = parseScheme(uriReference); OSL_ASSERT(n < fragment); if (n >= 0) { scheme = uriReference.copy(0, n); schemeSpecificPart = uriReference.copy(n + 1, fragment - (n + 1)); - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("com.sun.star.uri.UriSchemeParser_")); for (sal_Int32 i = 0; i < scheme.getLength(); ++i) { @@ -411,7 +411,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse( throw; } catch (const css::uno::Exception & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString("creating service ") + OUString("creating service ") + serviceName, static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); //TODO: preserve type of e @@ -430,7 +430,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse( uriRef = parseGeneric(scheme, schemeSpecificPart); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString("std::bad_alloc"), + OUString("std::bad_alloc"), static_cast< cppu::OWeakObject * >(this)); } } @@ -464,7 +464,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( } return abs; } else { - rtl::OUStringBuffer abs(baseUriReference->getScheme()); + OUStringBuffer abs(baseUriReference->getScheme()); abs.append(static_cast< sal_Unicode >(':')); if (uriReference->hasAuthority()) { abs.appendAscii(RTL_CONSTASCII_STRINGPARAM("//")); @@ -492,7 +492,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( ++i) { if (*i < -1) { - rtl::OUString segment( + OUString segment( baseUriReference->getPathSegment(-(*i + 2))); if (!segment.isEmpty() || segments.size() > 1) { if (!slash) { @@ -503,7 +503,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute( abs.append(static_cast< sal_Unicode >('/')); } } else if (*i > 1) { - rtl::OUString segment(uriReference->getPathSegment(*i - 2)); + OUString segment(uriReference->getPathSegment(*i - 2)); if (!segment.isEmpty() || segments.size() > 1) { if (!slash) { abs.append(static_cast< sal_Unicode >('/')); @@ -571,7 +571,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative( uriReference->getScheme())) { return clone(uriReference); } else { - rtl::OUStringBuffer rel; + OUStringBuffer rel; bool omitQuery = false; if ((baseUriReference->hasAuthority() != uriReference->hasAuthority()) || !equalIgnoreEscapeCase( @@ -651,7 +651,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative( if (segments) { rel.append(static_cast< sal_Unicode >('/')); } - rtl::OUString s(uriReference->getPathSegment(i)); + OUString s(uriReference->getPathSegment(i)); if (encodeRetainedSpecialSegments && s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("."))) { @@ -694,17 +694,17 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Factory(context)); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString("std::bad_alloc"), 0); + OUString("std::bad_alloc"), 0); } } -rtl::OUString getImplementationName() { - return rtl::OUString("com.sun.star.comp.uri.UriReferenceFactory"); +OUString getImplementationName() { + return OUString("com.sun.star.comp.uri.UriReferenceFactory"); } -css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { - css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString("com.sun.star.uri.UriReferenceFactory"); +css::uno::Sequence< OUString > getSupportedServiceNames() { + css::uno::Sequence< OUString > s(1); + s[0] = OUString("com.sun.star.uri.UriReferenceFactory"); return s; } diff --git a/stoc/source/uriproc/UriReferenceFactory.hxx b/stoc/source/uriproc/UriReferenceFactory.hxx index 39758d29421c..4a18d502467e 100644 --- a/stoc/source/uriproc/UriReferenceFactory.hxx +++ b/stoc/source/uriproc/UriReferenceFactory.hxx @@ -40,9 +40,9 @@ namespace UriReferenceFactory { const & context) SAL_THROW((com::sun::star::uno::Exception)); - rtl::OUString SAL_CALL getImplementationName(); + OUString SAL_CALL getImplementationName(); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx index ffeb1dbde867..d8545d692a0c 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx @@ -48,7 +48,7 @@ namespace { -bool parseSchemeSpecificPart(::rtl::OUString const & part) { +bool parseSchemeSpecificPart(OUString const & part) { // Liberally accepts both an empty opaque_part and an opaque_part that // starts with a non-escaped "/": return part.isEmpty() @@ -59,24 +59,24 @@ class UrlReference: public ::cppu::WeakImplHelper1< css::uri::XVndSunStarExpandUrlReference > { public: - UrlReference(::rtl::OUString const & scheme, ::rtl::OUString const & path): + UrlReference(OUString const & scheme, OUString const & path): base_( - scheme, false, false, ::rtl::OUString(), path, false, - ::rtl::OUString()) + scheme, false, false, OUString(), path, false, + OUString()) {} - virtual ::rtl::OUString SAL_CALL getUriReference() + virtual OUString SAL_CALL getUriReference() throw (css::uno::RuntimeException) { return base_.getUriReference(); } virtual ::sal_Bool SAL_CALL isAbsolute() throw (css::uno::RuntimeException) { return base_.isAbsolute(); } - virtual ::rtl::OUString SAL_CALL getScheme() + virtual OUString SAL_CALL getScheme() throw (css::uno::RuntimeException) { return base_.getScheme(); } - virtual ::rtl::OUString SAL_CALL getSchemeSpecificPart() + virtual OUString SAL_CALL getSchemeSpecificPart() throw (css::uno::RuntimeException) { return base_.getSchemeSpecificPart(); } @@ -88,11 +88,11 @@ public: throw (css::uno::RuntimeException) { return base_.hasAuthority(); } - virtual ::rtl::OUString SAL_CALL getAuthority() + virtual OUString SAL_CALL getAuthority() throw (css::uno::RuntimeException) { return base_.getAuthority(); } - virtual ::rtl::OUString SAL_CALL getPath() + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException) { return base_.getPath(); } @@ -104,32 +104,32 @@ public: throw (css::uno::RuntimeException) { return base_.getPathSegmentCount(); } - virtual ::rtl::OUString SAL_CALL getPathSegment(sal_Int32 index) + virtual OUString SAL_CALL getPathSegment(sal_Int32 index) throw (css::uno::RuntimeException) { return base_.getPathSegment(index); } virtual ::sal_Bool SAL_CALL hasQuery() throw (css::uno::RuntimeException) { return base_.hasQuery(); } - virtual ::rtl::OUString SAL_CALL getQuery() + virtual OUString SAL_CALL getQuery() throw (css::uno::RuntimeException) { return base_.getQuery(); } virtual ::sal_Bool SAL_CALL hasFragment() throw (css::uno::RuntimeException) { return base_.hasFragment(); } - virtual ::rtl::OUString SAL_CALL getFragment() + virtual OUString SAL_CALL getFragment() throw (css::uno::RuntimeException) { return base_.getFragment(); } - virtual void SAL_CALL setFragment(::rtl::OUString const & fragment) + virtual void SAL_CALL setFragment(OUString const & fragment) throw (css::uno::RuntimeException) { base_.setFragment(fragment); } virtual void SAL_CALL clearFragment() throw (css::uno::RuntimeException) { base_.clearFragment(); } - virtual ::rtl::OUString SAL_CALL expand( + virtual OUString SAL_CALL expand( css::uno::Reference< css::util::XMacroExpander > const & expander) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); @@ -142,7 +142,7 @@ private: stoc::uriproc::UriReference base_; }; -::rtl::OUString UrlReference::expand( +OUString UrlReference::expand( css::uno::Reference< css::util::XMacroExpander > const & expander) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) { @@ -158,20 +158,20 @@ class Parser: public ::cppu::WeakImplHelper2< public: Parser() {} - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( - ::rtl::OUString const & serviceName) + OUString const & serviceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL parse( - ::rtl::OUString const & scheme, - ::rtl::OUString const & schemeSpecificPart) + OUString const & scheme, + OUString const & schemeSpecificPart) throw (css::uno::RuntimeException); private: @@ -181,21 +181,21 @@ private: virtual ~Parser() {} }; -::rtl::OUString Parser::getImplementationName() +OUString Parser::getImplementationName() throw (css::uno::RuntimeException) { return ::stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTexpand:: getImplementationName(); } -::sal_Bool Parser::supportsService(::rtl::OUString const & serviceName) +::sal_Bool Parser::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { return ::stoc::uriproc::supportsService( getSupportedServiceNames(), serviceName); } -css::uno::Sequence< ::rtl::OUString > Parser::getSupportedServiceNames() +css::uno::Sequence< OUString > Parser::getSupportedServiceNames() throw (css::uno::RuntimeException) { return ::stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTexpand:: @@ -203,7 +203,7 @@ css::uno::Sequence< ::rtl::OUString > Parser::getSupportedServiceNames() } css::uno::Reference< css::uri::XUriReference > Parser::parse( - ::rtl::OUString const & scheme, ::rtl::OUString const & schemeSpecificPart) + OUString const & scheme, OUString const & schemeSpecificPart) throw (css::uno::RuntimeException) { if (!parseSchemeSpecificPart(schemeSpecificPart)) { @@ -213,7 +213,7 @@ css::uno::Reference< css::uri::XUriReference > Parser::parse( return new UrlReference(scheme, schemeSpecificPart); } catch (::std::bad_alloc &) { throw css::uno::RuntimeException( - ::rtl::OUString("std::bad_alloc"), + OUString("std::bad_alloc"), css::uno::Reference< css::uno::XInterface >()); } } @@ -232,19 +232,19 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< ::cppu::OWeakObject * >(new Parser); } catch (::std::bad_alloc &) { throw css::uno::RuntimeException( - ::rtl::OUString("std::bad_alloc"), + OUString("std::bad_alloc"), css::uno::Reference< css::uno::XInterface >()); } } -::rtl::OUString getImplementationName() { - return ::rtl::OUString( +OUString getImplementationName() { + return OUString( "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand"); } -css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > s(1); - s[0] = ::rtl::OUString( +css::uno::Sequence< OUString > getSupportedServiceNames() { + css::uno::Sequence< OUString > s(1); + s[0] = OUString( "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand"); return s; } diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index 073d279dafb5..f82178fa57a1 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -52,7 +52,7 @@ int getHexWeight(sal_Unicode c) { : -1; } -int parseEscaped(rtl::OUString const & part, sal_Int32 * index) { +int parseEscaped(OUString const & part, sal_Int32 * index) { if (part.getLength() - *index < 3 || part[*index] != '%') { return -1; } @@ -65,10 +65,10 @@ int parseEscaped(rtl::OUString const & part, sal_Int32 * index) { return (n1 << 4) | n2; } -rtl::OUString parsePart( - rtl::OUString const & part, bool namePart, sal_Int32 * index) +OUString parsePart( + OUString const & part, bool namePart, sal_Int32 * index) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; while (*index < part.getLength()) { sal_Unicode c = part[*index]; if (namePart ? c == '?' : c == '&' || c == '=') { @@ -140,7 +140,7 @@ rtl::OUString parsePart( namespace { - static rtl::OUString encodeNameOrParamFragment( rtl::OUString const & fragment ) + static OUString encodeNameOrParamFragment( OUString const & fragment ) { static sal_Bool const aCharClass[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* NameOrParamFragment */ @@ -162,7 +162,7 @@ namespace } } -bool parseSchemeSpecificPart(rtl::OUString const & part) { +bool parseSchemeSpecificPart(OUString const & part) { sal_Int32 len = part.getLength(); sal_Int32 i = 0; if (parsePart(part, true, &i).isEmpty() || part[0] == '/') { @@ -193,12 +193,12 @@ class UrlReference: public cppu::WeakImplHelper1< css::uri::XVndSunStarScriptUrlReference > { public: - UrlReference(rtl::OUString const & scheme, rtl::OUString const & path): + UrlReference(OUString const & scheme, OUString const & path): m_base( - scheme, false, false, rtl::OUString(), path, false, rtl::OUString()) + scheme, false, false, OUString(), path, false, OUString()) {} - virtual rtl::OUString SAL_CALL getUriReference() + virtual OUString SAL_CALL getUriReference() throw (com::sun::star::uno::RuntimeException) { return m_base.getUriReference(); } @@ -206,11 +206,11 @@ public: throw (com::sun::star::uno::RuntimeException) { return m_base.isAbsolute(); } - virtual rtl::OUString SAL_CALL getScheme() + virtual OUString SAL_CALL getScheme() throw (com::sun::star::uno::RuntimeException) { return m_base.getScheme(); } - virtual rtl::OUString SAL_CALL getSchemeSpecificPart() + virtual OUString SAL_CALL getSchemeSpecificPart() throw (com::sun::star::uno::RuntimeException) { return m_base.getSchemeSpecificPart(); } @@ -222,11 +222,11 @@ public: throw (com::sun::star::uno::RuntimeException) { return m_base.hasAuthority(); } - virtual rtl::OUString SAL_CALL getAuthority() + virtual OUString SAL_CALL getAuthority() throw (com::sun::star::uno::RuntimeException) { return m_base.getAuthority(); } - virtual rtl::OUString SAL_CALL getPath() + virtual OUString SAL_CALL getPath() throw (com::sun::star::uno::RuntimeException) { return m_base.getPath(); } @@ -238,7 +238,7 @@ public: throw (com::sun::star::uno::RuntimeException) { return m_base.getPathSegmentCount(); } - virtual rtl::OUString SAL_CALL getPathSegment(sal_Int32 index) + virtual OUString SAL_CALL getPathSegment(sal_Int32 index) throw (com::sun::star::uno::RuntimeException) { return m_base.getPathSegment(index); } @@ -246,7 +246,7 @@ public: throw (com::sun::star::uno::RuntimeException) { return m_base.hasQuery(); } - virtual rtl::OUString SAL_CALL getQuery() + virtual OUString SAL_CALL getQuery() throw (com::sun::star::uno::RuntimeException) { return m_base.getQuery(); } @@ -254,11 +254,11 @@ public: throw (com::sun::star::uno::RuntimeException) { return m_base.hasFragment(); } - virtual rtl::OUString SAL_CALL getFragment() + virtual OUString SAL_CALL getFragment() throw (com::sun::star::uno::RuntimeException) { return m_base.getFragment(); } - virtual void SAL_CALL setFragment(rtl::OUString const & fragment) + virtual void SAL_CALL setFragment(OUString const & fragment) throw (com::sun::star::uno::RuntimeException) { m_base.setFragment(fragment); } @@ -266,18 +266,18 @@ public: throw (com::sun::star::uno::RuntimeException) { m_base.clearFragment(); } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName(rtl::OUString const & name) + virtual void SAL_CALL setName(OUString const & name) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); - virtual sal_Bool SAL_CALL hasParameter(rtl::OUString const & key) + virtual sal_Bool SAL_CALL hasParameter(OUString const & key) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getParameter(rtl::OUString const & key) + virtual OUString SAL_CALL getParameter(OUString const & key) throw (css::uno::RuntimeException); - virtual void SAL_CALL setParameter(rtl::OUString const & key, rtl::OUString const & value) + virtual void SAL_CALL setParameter(OUString const & key, OUString const & value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); private: @@ -286,54 +286,54 @@ private: virtual ~UrlReference() {} - sal_Int32 findParameter(rtl::OUString const & key); + sal_Int32 findParameter(OUString const & key); stoc::uriproc::UriReference m_base; }; -rtl::OUString UrlReference::getName() throw (css::uno::RuntimeException) { +OUString UrlReference::getName() throw (css::uno::RuntimeException) { osl::MutexGuard g(m_base.m_mutex); sal_Int32 i = 0; return parsePart(m_base.m_path, true, &i); } -void SAL_CALL UrlReference::setName(rtl::OUString const & name) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) +void SAL_CALL UrlReference::setName(OUString const & name) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) { if (name.isEmpty()) throw css::lang::IllegalArgumentException( - ::rtl::OUString(), *this, 1); + OUString(), *this, 1); osl::MutexGuard g(m_base.m_mutex); sal_Int32 i = 0; parsePart(m_base.m_path, true, &i); - rtl::OUStringBuffer newPath; + OUStringBuffer newPath; newPath.append(encodeNameOrParamFragment(name)); newPath.append(m_base.m_path.copy(i)); m_base.m_path = newPath.makeStringAndClear(); } -sal_Bool UrlReference::hasParameter(rtl::OUString const & key) +sal_Bool UrlReference::hasParameter(OUString const & key) throw (css::uno::RuntimeException) { osl::MutexGuard g(m_base.m_mutex); return findParameter(key) >= 0; } -rtl::OUString UrlReference::getParameter(rtl::OUString const & key) +OUString UrlReference::getParameter(OUString const & key) throw (css::uno::RuntimeException) { osl::MutexGuard g(m_base.m_mutex); sal_Int32 i = findParameter(key); - return i >= 0 ? parsePart(m_base.m_path, false, &i) : rtl::OUString(); + return i >= 0 ? parsePart(m_base.m_path, false, &i) : OUString(); } -void UrlReference::setParameter(rtl::OUString const & key, rtl::OUString const & value) +void UrlReference::setParameter(OUString const & key, OUString const & value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) { if (key.isEmpty()) throw css::lang::IllegalArgumentException( - ::rtl::OUString(), *this, 1); + OUString(), *this, 1); osl::MutexGuard g(m_base.m_mutex); sal_Int32 i = findParameter(key); @@ -342,7 +342,7 @@ void UrlReference::setParameter(rtl::OUString const & key, rtl::OUString const & i = m_base.m_path.getLength(); } - rtl::OUStringBuffer newPath; + OUStringBuffer newPath; newPath.append(m_base.m_path.copy(0, i)); if (!bExistent) { newPath.append(sal_Unicode(m_base.m_path.indexOf('?') < 0 ? '?' : '&')); @@ -359,7 +359,7 @@ void UrlReference::setParameter(rtl::OUString const & key, rtl::OUString const & m_base.m_path = newPath.makeStringAndClear(); } -sal_Int32 UrlReference::findParameter(rtl::OUString const & key) { +sal_Int32 UrlReference::findParameter(OUString const & key) { sal_Int32 i = 0; parsePart(m_base.m_path, true, &i); // skip name for (;;) { @@ -367,7 +367,7 @@ sal_Int32 UrlReference::findParameter(rtl::OUString const & key) { return -1; } ++i; // skip '?' or '&' - rtl::OUString k = parsePart(m_base.m_path, false, &i); + OUString k = parsePart(m_base.m_path, false, &i); ++i; // skip '=' if (k == key) { return i; @@ -382,18 +382,18 @@ class Parser: public cppu::WeakImplHelper2< public: Parser() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL parse( - rtl::OUString const & scheme, rtl::OUString const & schemeSpecificPart) + OUString const & scheme, OUString const & schemeSpecificPart) throw (css::uno::RuntimeException); private: @@ -403,21 +403,21 @@ private: virtual ~Parser() {} }; -rtl::OUString Parser::getImplementationName() +OUString Parser::getImplementationName() throw (css::uno::RuntimeException) { return stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTscript:: getImplementationName(); } -sal_Bool Parser::supportsService(rtl::OUString const & serviceName) +sal_Bool Parser::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { return stoc::uriproc::supportsService( getSupportedServiceNames(), serviceName); } -css::uno::Sequence< rtl::OUString > Parser::getSupportedServiceNames() +css::uno::Sequence< OUString > Parser::getSupportedServiceNames() throw (css::uno::RuntimeException) { return stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTscript:: @@ -426,7 +426,7 @@ css::uno::Sequence< rtl::OUString > Parser::getSupportedServiceNames() css::uno::Reference< css::uri::XUriReference > Parser::parse( - rtl::OUString const & scheme, rtl::OUString const & schemeSpecificPart) + OUString const & scheme, OUString const & schemeSpecificPart) throw (css::uno::RuntimeException) { if (!parseSchemeSpecificPart(schemeSpecificPart)) { @@ -436,7 +436,7 @@ Parser::parse( return new UrlReference(scheme, schemeSpecificPart); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString("std::bad_alloc"), 0); + OUString("std::bad_alloc"), 0); } } @@ -455,17 +455,17 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Parser); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString("std::bad_alloc"), 0); + OUString("std::bad_alloc"), 0); } } -rtl::OUString getImplementationName() { - return rtl::OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); +OUString getImplementationName() { + return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); } -css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { - css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString("com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); +css::uno::Sequence< OUString > getSupportedServiceNames() { + css::uno::Sequence< OUString > s(1); + s[0] = OUString("com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); return s; } diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx index c6259e433deb..8393fc90c995 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx @@ -42,9 +42,9 @@ namespace UriSchemeParser_vndDOTsunDOTstarDOTscript { const &) SAL_THROW((com::sun::star::uno::Exception)); - rtl::OUString SAL_CALL getImplementationName(); + OUString SAL_CALL getImplementationName(); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx index 2083d056715f..2dd5ac6f472d 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx @@ -55,13 +55,13 @@ public: css::uno::Reference< css::uno::XComponentContext > const & context): m_context(context) {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL @@ -78,7 +78,7 @@ private: css::uno::Reference< css::uno::XComponentContext > m_context; }; -rtl::OUString Factory::getImplementationName() +OUString Factory::getImplementationName() throw (css::uno::RuntimeException) { return @@ -86,14 +86,14 @@ rtl::OUString Factory::getImplementationName() getImplementationName(); } -sal_Bool Factory::supportsService(rtl::OUString const & serviceName) +sal_Bool Factory::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { return stoc::uriproc::supportsService( getSupportedServiceNames(), serviceName); } -css::uno::Sequence< rtl::OUString > Factory::getSupportedServiceNames() +css::uno::Sequence< OUString > Factory::getSupportedServiceNames() throw (css::uno::RuntimeException) { return stoc_services::VndSunStarPkgUrlReferenceFactory:: @@ -107,7 +107,7 @@ Factory::createVndSunStarPkgUrlReference( { OSL_ASSERT(authority.is()); if (authority->isAbsolute() && !authority->hasFragment()) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pkg://")); buf.append( rtl::Uri::encode( @@ -136,17 +136,17 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Factory(context)); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString("std::bad_alloc"), 0); + OUString("std::bad_alloc"), 0); } } -rtl::OUString getImplementationName() { - return rtl::OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory"); +OUString getImplementationName() { + return OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory"); } -css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { - css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString("com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"); +css::uno::Sequence< OUString > getSupportedServiceNames() { + css::uno::Sequence< OUString > s(1); + s[0] = OUString("com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"); return s; } diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx index aac2adaf7dd0..01da290700ad 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx @@ -40,9 +40,9 @@ namespace VndSunStarPkgUrlReferenceFactory { const & context) SAL_THROW((com::sun::star::uno::Exception)); - rtl::OUString SAL_CALL getImplementationName(); + OUString SAL_CALL getImplementationName(); - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } diff --git a/stoc/source/uriproc/supportsService.cxx b/stoc/source/uriproc/supportsService.cxx index d20f5749e8b6..b5a835f47c0d 100644 --- a/stoc/source/uriproc/supportsService.cxx +++ b/stoc/source/uriproc/supportsService.cxx @@ -27,8 +27,8 @@ namespace stoc { namespace uriproc { bool supportsService( - com::sun::star::uno::Sequence< rtl::OUString > const & serviceNames, - rtl::OUString const & serviceName) + com::sun::star::uno::Sequence< OUString > const & serviceNames, + OUString const & serviceName) { for (sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) { diff --git a/stoc/source/uriproc/supportsService.hxx b/stoc/source/uriproc/supportsService.hxx index c410360eee96..2ca3a5321463 100644 --- a/stoc/source/uriproc/supportsService.hxx +++ b/stoc/source/uriproc/supportsService.hxx @@ -27,8 +27,8 @@ namespace rtl { class OUString; } namespace stoc { namespace uriproc { bool supportsService( - com::sun::star::uno::Sequence< rtl::OUString > const & serviceNames, - rtl::OUString const & serviceName); + com::sun::star::uno::Sequence< OUString > const & serviceNames, + OUString const & serviceName); } } diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx index d95eb666ffcf..48ccb1e50db2 100644 --- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx +++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx @@ -57,9 +57,6 @@ using namespace com::sun::star::registry; using namespace com::sun::star::java; using namespace com::sun::star::task; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; #define INTERACTION_HANDLER_NAME "java-vm.interaction-handler" diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx index 97418fa1df42..ece8cb16fee5 100644 --- a/stoc/test/javavm/testjavavm.cxx +++ b/stoc/test/javavm/testjavavm.cxx @@ -42,9 +42,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace com::sun::star::java; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr ) diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx index 4e03b5aaf68b..c3ffaf1ee73d 100644 --- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx +++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx @@ -61,12 +61,12 @@ namespace { class Service: public cppu::WeakImplHelper1< css::lang::XMain > { public: virtual sal_Int32 SAL_CALL - run(css::uno::Sequence< rtl::OUString > const & arguments) + run(css::uno::Sequence< OUString > const & arguments) throw (css::uno::RuntimeException); - static rtl::OUString getImplementationName(); + static OUString getImplementationName(); - static css::uno::Sequence< rtl::OUString > getSupportedServiceNames(); + static css::uno::Sequence< OUString > getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( css::uno::Reference< css::uno::XComponentContext > const & context) @@ -85,8 +85,8 @@ private: namespace { -std::ostream & operator <<(std::ostream & out, rtl::OUString const & value) { - return out << rtl::OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr(); +std::ostream & operator <<(std::ostream & out, OUString const & value) { + return out << OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr(); } void assertTrue(bool argument) { @@ -116,7 +116,7 @@ template< typename T > void assertEqual(T const & value, T const & argument) { } -sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) +sal_Int32 Service::run(css::uno::Sequence< OUString > const &) throw (css::uno::RuntimeException) { css::uno::Reference< css::lang::XMultiComponentFactory > factory( @@ -125,10 +125,10 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) css::uno::Sequence< css::uno::Any > args(1); args[0] = css::uno::Reference< css::beans::XPropertySet >( factory, css::uno::UNO_QUERY_THROW)->getPropertyValue( - rtl::OUString("Registry")); + OUString("Registry")); css::uno::Reference< css::container::XHierarchicalNameAccess > provider( factory->createInstanceWithArgumentsAndContext( - rtl::OUString( "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"), + OUString( "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"), args, m_context), css::uno::UNO_QUERY_THROW); @@ -141,65 +141,65 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual< bool >( false, provider->hasByHierarchicalName( - rtl::OUString( "[][]boolean"))); + OUString( "[][]boolean"))); assertEqual< bool >( false, provider->hasByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Struct3"))); + OUString( "test.registrytdprovider.Struct3"))); assertEqual< bool >( false, provider->hasByHierarchicalName( - rtl::OUString( "com.sun.star.uno.XComponentContext::getValueByName"))); + OUString( "com.sun.star.uno.XComponentContext::getValueByName"))); css::uno::Reference< css::reflection::XCompoundTypeDescription > exception; exception = css::uno::Reference< css::reflection::XCompoundTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "com.sun.star.uno.Exception")), + OUString( "com.sun.star.uno.Exception")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_EXCEPTION, exception->getTypeClass()); - assertEqual( rtl::OUString( "com.sun.star.uno.Exception"), + assertEqual( OUString( "com.sun.star.uno.Exception"), exception->getName()); assertFalse(exception->getBaseType().is()); exception = css::uno::Reference< css::reflection::XCompoundTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "com.sun.star.uno.RuntimeException")), + OUString( "com.sun.star.uno.RuntimeException")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_EXCEPTION, exception->getTypeClass()); - assertEqual( rtl::OUString( "com.sun.star.uno.RuntimeException"), + assertEqual( OUString( "com.sun.star.uno.RuntimeException"), exception->getName()); - assertEqual( rtl::OUString( "com.sun.star.uno.Exception"), + assertEqual( OUString( "com.sun.star.uno.Exception"), exception->getBaseType()->getName()); css::uno::Reference< css::reflection::XStructTypeDescription > structure; structure = css::uno::Reference< css::reflection::XStructTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Struct2")), + OUString( "test.registrytdprovider.Struct2")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass()); - assertEqual( rtl::OUString( "test.registrytdprovider.Struct2"), + assertEqual( OUString( "test.registrytdprovider.Struct2"), structure->getName()); assertFalse(structure->getBaseType().is()); assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength()); assertEqual( - rtl::OUString( "test.registrytdprovider.Struct1"), + OUString( "test.registrytdprovider.Struct1"), structure->getMemberTypes()[0]->getName()); assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength()); assertEqual( - rtl::OUString("s1"), + OUString("s1"), structure->getMemberNames()[0]); assertEqual< sal_Int32 >(0, structure->getTypeParameters().getLength()); assertEqual< sal_Int32 >(0, structure->getTypeArguments().getLength()); structure = css::uno::Reference< css::reflection::XStructTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Struct3")), + OUString( "test.registrytdprovider.Struct3")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass()); assertEqual( - rtl::OUString( "test.registrytdprovider.Struct3"), + OUString( "test.registrytdprovider.Struct3"), structure->getName()); assertFalse(structure->getBaseType().is()); assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength()); @@ -207,41 +207,41 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) css::uno::TypeClass_UNKNOWN, structure->getMemberTypes()[0]->getTypeClass()); assertEqual( - rtl::OUString("U"), + OUString("U"), structure->getMemberTypes()[0]->getName()); assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength()); assertEqual( - rtl::OUString("s2"), + OUString("s2"), structure->getMemberNames()[0]); assertEqual< sal_Int32 >(2, structure->getTypeParameters().getLength()); assertEqual( - rtl::OUString("T"), + OUString("T"), structure->getTypeParameters()[0]); assertEqual( - rtl::OUString("U"), + OUString("U"), structure->getTypeParameters()[1]); assertEqual< sal_Int32 >(0, structure->getTypeArguments().getLength()); structure = css::uno::Reference< css::reflection::XStructTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Struct4")), + OUString( "test.registrytdprovider.Struct4")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass()); assertEqual( - rtl::OUString( "test.registrytdprovider.Struct4"), + OUString( "test.registrytdprovider.Struct4"), structure->getName()); assertEqual( - rtl::OUString( "test.registrytdprovider.Struct2"), + OUString( "test.registrytdprovider.Struct2"), structure->getBaseType()->getName()); assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength()); assertEqual( - rtl::OUString( "test.registrytdprovider.Struct3<" + OUString( "test.registrytdprovider.Struct3<" "test.registrytdprovider.Struct2," "test.registrytdprovider.Struct3>"), structure->getMemberTypes()[0]->getName()); assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength()); assertEqual( - rtl::OUString("s2"), + OUString("s2"), structure->getMemberNames()[0]); assertEqual< sal_Int32 >(0, structure->getTypeParameters().getLength()); assertEqual< sal_Int32 >(0, structure->getTypeArguments().getLength()); @@ -252,25 +252,25 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) interface = css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.XTest1")), + OUString( "test.registrytdprovider.XTest1")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_INTERFACE, interface->getTypeClass()); assertEqual( - rtl::OUString( "test.registrytdprovider.XTest1"), + OUString( "test.registrytdprovider.XTest1"), interface->getName()); css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > bases( interface->getBaseTypes()); assertEqual< sal_Int32 >(1, bases.getLength()); assertEqual( - rtl::OUString( "com.sun.star.uno.XInterface"), + OUString( "com.sun.star.uno.XInterface"), bases[0]->getName()); css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > optionalBases(interface->getOptionalBaseTypes()); assertEqual< sal_Int32 >(1, optionalBases.getLength()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.XBase"), optionalBases[0]->getName()); css::uno::Sequence< @@ -296,15 +296,15 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual( css::uno::TypeClass_INTERFACE_ATTRIBUTE, attribute->getTypeClass()); assertEqual( - rtl::OUString( "test.registrytdprovider.XTest1::a1"), + OUString( "test.registrytdprovider.XTest1::a1"), attribute->getName()); assertEqual( - rtl::OUString("a1"), + OUString("a1"), attribute->getMemberName()); assertEqual< sal_Int32 >(3, attribute->getPosition()); assertEqual< bool >(false, attribute->isReadOnly()); assertEqual( - rtl::OUString("short"), + OUString("short"), attribute->getType()->getName()); assertEqual< bool >(true, attribute->isBound()); getExceptions = attribute->getGetExceptions(); @@ -318,32 +318,32 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual( css::uno::TypeClass_INTERFACE_ATTRIBUTE, attribute->getTypeClass()); assertEqual( - rtl::OUString( "test.registrytdprovider.XTest1::a2"), + OUString( "test.registrytdprovider.XTest1::a2"), attribute->getName()); assertEqual( - rtl::OUString("a2"), + OUString("a2"), attribute->getMemberName()); assertEqual< sal_Int32 >(4, attribute->getPosition()); assertEqual< bool >(false, attribute->isReadOnly()); assertEqual( - rtl::OUString("long"), + OUString("long"), attribute->getType()->getName()); assertEqual< bool >(false, attribute->isBound()); getExceptions = attribute->getGetExceptions(); assertEqual< sal_Int32 >(2, getExceptions.getLength()); assertEqual( - rtl::OUString( "com.sun.star.lang.WrappedTargetException"), + OUString( "com.sun.star.lang.WrappedTargetException"), getExceptions[0]->getName()); assertEqual( - rtl::OUString( "com.sun.star.uno.RuntimeException"), + OUString( "com.sun.star.uno.RuntimeException"), getExceptions[1]->getName()); setExceptions = attribute->getSetExceptions(); assertEqual< sal_Int32 >(2, setExceptions.getLength()); assertEqual( - rtl::OUString( "com.sun.star.uno.Exception"), + OUString( "com.sun.star.uno.Exception"), setExceptions[0]->getName()); assertEqual( - rtl::OUString( "com.sun.star.lang.WrappedTargetException"), + OUString( "com.sun.star.lang.WrappedTargetException"), setExceptions[1]->getName()); attribute = css::uno::Reference< @@ -352,22 +352,22 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual( css::uno::TypeClass_INTERFACE_ATTRIBUTE, attribute->getTypeClass()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.XTest1::a3"), attribute->getName()); assertEqual( - rtl::OUString("a3"), + OUString("a3"), attribute->getMemberName()); assertEqual< sal_Int32 >(5, attribute->getPosition()); assertEqual< bool >(true, attribute->isReadOnly()); assertEqual( - rtl::OUString("hyper"), + OUString("hyper"), attribute->getType()->getName()); assertEqual< bool >(true, attribute->isBound()); getExceptions = attribute->getGetExceptions(); assertEqual< sal_Int32 >(1, getExceptions.getLength()); assertEqual( - rtl::OUString( "com.sun.star.lang.WrappedTargetException"), + OUString( "com.sun.star.lang.WrappedTargetException"), getExceptions[0]->getName()); setExceptions = attribute->getSetExceptions(); assertEqual< sal_Int32 >(0, setExceptions.getLength()); @@ -377,26 +377,26 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) members[3], css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_INTERFACE_METHOD, method->getTypeClass()); assertEqual( - rtl::OUString( "test.registrytdprovider.XTest1::f1"), + OUString( "test.registrytdprovider.XTest1::f1"), method->getName()); assertEqual( - rtl::OUString("f1"), + OUString("f1"), method->getMemberName()); assertEqual< sal_Int32 >(6, method->getPosition()); assertEqual< bool >(false, method->isOneway()); assertEqual< sal_Int32 >(1, method->getParameters().getLength()); assertEqual( - rtl::OUString("p"), + OUString("p"), method->getParameters()[0]->getName()); assertEqual( - rtl::OUString("any"), + OUString("any"), method->getParameters()[0]->getType()->getName()); assertEqual< bool >(false, method->getParameters()[0]->isIn()); assertEqual< bool >(true, method->getParameters()[0]->isOut()); assertEqual< sal_Int32 >(0, method->getParameters()[0]->getPosition()); assertEqual< sal_Int32 >(1, method->getExceptions().getLength()); assertEqual( - rtl::OUString( "com.sun.star.uno.RuntimeException"), + OUString( "com.sun.star.uno.RuntimeException"), method->getExceptions()[0]->getName()); method = css::uno::Reference< @@ -404,10 +404,10 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) members[4], css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_INTERFACE_METHOD, method->getTypeClass()); assertEqual( - rtl::OUString( "test.registrytdprovider.XTest1::f2"), + OUString( "test.registrytdprovider.XTest1::f2"), method->getName()); assertEqual( - rtl::OUString("f2"), + OUString("f2"), method->getMemberName()); assertEqual< sal_Int32 >(7, method->getPosition()); assertEqual< bool >(true, method->isOneway()); @@ -417,15 +417,15 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) interface = css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.XTest2")), + OUString( "test.registrytdprovider.XTest2")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_INTERFACE, interface->getTypeClass()); assertEqual( - rtl::OUString( "test.registrytdprovider.XTest2"), + OUString( "test.registrytdprovider.XTest2"), interface->getName()); assertEqual< sal_Int32 >(1, interface->getBaseTypes().getLength()); assertEqual( - rtl::OUString( "test.registrytdprovider.Typedef2"), + OUString( "test.registrytdprovider.Typedef2"), interface->getBaseTypes()[0]->getName()); assertEqual< sal_Int32 >(0, interface->getOptionalBaseTypes().getLength()); assertEqual< sal_Int32 >(0, interface->getMembers().getLength()); @@ -434,11 +434,11 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) service = css::uno::Reference< css::reflection::XServiceTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Service1")), + OUString( "test.registrytdprovider.Service1")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SERVICE, service->getTypeClass()); assertEqual( - rtl::OUString( "test.registrytdprovider.Service1"), + OUString( "test.registrytdprovider.Service1"), service->getName()); assertEqual< sal_Int32 >(0, service->getMandatoryServices().getLength()); assertEqual< sal_Int32 >(0, service->getOptionalServices().getLength()); @@ -446,27 +446,27 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual< sal_Int32 >(0, service->getOptionalInterfaces().getLength()); assertEqual< bool >(true, service->isSingleInterfaceBased()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.XTest1"), service->getInterface()->getName()); assertEqual< sal_Int32 >(2, service->getConstructors().getLength()); assertEqual( - rtl::OUString("c1"), + OUString("c1"), service->getConstructors()[0]->getName()); assertEqual< sal_Int32 >( 0, service->getConstructors()[0]->getParameters().getLength()); assertEqual< sal_Int32 >( 0, service->getConstructors()[0]->getExceptions().getLength()); assertEqual( - rtl::OUString("c2"), + OUString("c2"), service->getConstructors()[1]->getName()); assertEqual< sal_Int32 >( 1, service->getConstructors()[1]->getParameters().getLength()); assertEqual( - rtl::OUString("p"), + OUString("p"), service->getConstructors()[1]->getParameters()[0]->getName()); assertEqual( - rtl::OUString("any"), + OUString("any"), (service->getConstructors()[1]->getParameters()[0]->getType()-> getName())); assertEqual< bool >( @@ -481,26 +481,26 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual< sal_Int32 >( 1, service->getConstructors()[1]->getExceptions().getLength()); assertEqual( - rtl::OUString( "com.sun.star.uno.RuntimeException"), + OUString( "com.sun.star.uno.RuntimeException"), service->getConstructors()[1]->getExceptions()[0]->getName()); service = css::uno::Reference< css::reflection::XServiceTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Service2")), + OUString( "test.registrytdprovider.Service2")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SERVICE, service->getTypeClass()); assertEqual( - rtl::OUString( "test.registrytdprovider.Service2"), + OUString( "test.registrytdprovider.Service2"), service->getName()); assertEqual< sal_Int32 >(0, service->getMandatoryServices().getLength()); assertEqual< sal_Int32 >(0, service->getOptionalServices().getLength()); assertEqual< sal_Int32 >(1, service->getMandatoryInterfaces().getLength()); assertEqual( - rtl::OUString( "test.registrytdprovider.XTest1"), + OUString( "test.registrytdprovider.XTest1"), service->getMandatoryInterfaces()[0]->getName()); assertEqual< sal_Int32 >(1, service->getOptionalInterfaces().getLength()); assertEqual( - rtl::OUString( "test.registrytdprovider.XBase"), + OUString( "test.registrytdprovider.XBase"), service->getOptionalInterfaces()[0]->getName()); assertEqual< bool >(false, service->isSingleInterfaceBased()); assertFalse(service->getInterface().is()); @@ -508,11 +508,11 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) service = css::uno::Reference< css::reflection::XServiceTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Service3")), + OUString( "test.registrytdprovider.Service3")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SERVICE, service->getTypeClass()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.Service3"), service->getName()); assertEqual< sal_Int32 >(0, service->getMandatoryServices().getLength()); @@ -521,7 +521,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual< sal_Int32 >(0, service->getOptionalInterfaces().getLength()); assertEqual< bool >(true, service->isSingleInterfaceBased()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.Typedef2"), service->getInterface()->getName()); assertEqual< sal_Int32 >(0, service->getConstructors().getLength()); @@ -532,32 +532,32 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) singleton = css::uno::Reference< css::reflection::XSingletonTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Singleton1")), + OUString( "test.registrytdprovider.Singleton1")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SINGLETON, singleton->getTypeClass()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.Singleton1"), singleton->getName()); assertFalse(singleton->getService().is()); assertEqual< bool >(true, singleton->isInterfaceBased()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.XTest1"), singleton->getInterface()->getName()); singleton = css::uno::Reference< css::reflection::XSingletonTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Singleton2")), + OUString( "test.registrytdprovider.Singleton2")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SINGLETON, singleton->getTypeClass()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.Singleton2"), singleton->getName()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.Service1"), singleton->getService()->getName()); assertEqual< bool >(false, singleton->isInterfaceBased()); @@ -566,17 +566,17 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) singleton = css::uno::Reference< css::reflection::XSingletonTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Singleton3")), + OUString( "test.registrytdprovider.Singleton3")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SINGLETON, singleton->getTypeClass()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.Singleton3"), singleton->getName()); assertFalse(singleton->getService().is()); assertEqual< bool >(true, singleton->isInterfaceBased()); assertEqual( - rtl::OUString( + OUString( "test.registrytdprovider.Typedef2"), singleton->getInterface()->getName()); @@ -584,7 +584,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Enum1")), + OUString( "test.registrytdprovider.Enum1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -592,7 +592,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Enum2")), + OUString( "test.registrytdprovider.Enum2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -600,7 +600,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Struct1")), + OUString( "test.registrytdprovider.Struct1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -608,7 +608,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Struct2")), + OUString( "test.registrytdprovider.Struct2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -616,7 +616,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Struct3")), + OUString( "test.registrytdprovider.Struct3")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -624,14 +624,14 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XStructTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Struct3")), + OUString( "test.registrytdprovider.Struct3")), css::uno::UNO_QUERY_THROW)->getMemberTypes()[0], css::uno::UNO_QUERY); assertFalse(published.is()); published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Struct3a")), + OUString( "test.registrytdprovider.Struct3a")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -639,7 +639,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Exception1")), + OUString( "test.registrytdprovider.Exception1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -647,7 +647,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Exception2")), + OUString( "test.registrytdprovider.Exception2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -655,7 +655,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.XTest1")), + OUString( "test.registrytdprovider.XTest1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -663,7 +663,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.XTest2")), + OUString( "test.registrytdprovider.XTest2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -671,7 +671,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Typedef1")), + OUString( "test.registrytdprovider.Typedef1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -679,7 +679,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Typedef2")), + OUString( "test.registrytdprovider.Typedef2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -691,7 +691,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Consts1")), + OUString( "test.registrytdprovider.Consts1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -699,7 +699,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Consts2")), + OUString( "test.registrytdprovider.Consts2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -707,14 +707,14 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider")), + OUString( "test.registrytdprovider")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertFalse(published.is()); published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Service1")), + OUString( "test.registrytdprovider.Service1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -722,7 +722,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Service2")), + OUString( "test.registrytdprovider.Service2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -730,7 +730,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Singleton2")), + OUString( "test.registrytdprovider.Singleton2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -738,7 +738,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( "test.registrytdprovider.Singleton1")), + OUString( "test.registrytdprovider.Singleton1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -747,12 +747,12 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) return 0; } -rtl::OUString Service::getImplementationName() { - return rtl::OUString("test.registrytdprovider.impl"); +OUString Service::getImplementationName() { + return OUString("test.registrytdprovider.impl"); } -css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames() { - return css::uno::Sequence< rtl::OUString >(); +css::uno::Sequence< OUString > Service::getSupportedServiceNames() { + return css::uno::Sequence< OUString >(); } css::uno::Reference< css::uno::XInterface > Service::createInstance( @@ -782,11 +782,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const namespace { -bool writeInfo(void * registryKey, rtl::OUString const & implementationName, - css::uno::Sequence< rtl::OUString > const & serviceNames) { - rtl::OUString keyName("/"); +bool writeInfo(void * registryKey, OUString const & implementationName, + css::uno::Sequence< OUString > const & serviceNames) { + OUString keyName("/"); keyName += implementationName; - keyName += rtl::OUString("/UNO/SERVICES"); + keyName += OUString("/UNO/SERVICES"); css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx index 9e45fb3ff27c..31bf83c95bc7 100644 --- a/stoc/test/tdmanager/testtdmanager.cxx +++ b/stoc/test/tdmanager/testtdmanager.cxx @@ -59,12 +59,12 @@ namespace { class Service: public cppu::WeakImplHelper1< css::lang::XMain > { public: virtual sal_Int32 SAL_CALL - run(css::uno::Sequence< rtl::OUString > const & arguments) + run(css::uno::Sequence< OUString > const & arguments) throw (css::uno::RuntimeException); - static rtl::OUString getImplementationName(); + static OUString getImplementationName(); - static css::uno::Sequence< rtl::OUString > getSupportedServiceNames(); + static css::uno::Sequence< OUString > getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( css::uno::Reference< css::uno::XComponentContext > const & context) @@ -83,8 +83,8 @@ private: namespace { -std::ostream & operator <<(std::ostream & out, rtl::OUString const & value) { - return out << rtl::OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr(); +std::ostream & operator <<(std::ostream & out, OUString const & value) { + return out << OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr(); } void assertTrue(bool argument) { @@ -114,7 +114,7 @@ template< typename T > void assertEqual(T const & value, T const & argument) { } -sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) +sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments) throw (css::uno::RuntimeException) { css::uno::Reference< css::lang::XMultiComponentFactory > factory( @@ -122,7 +122,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) assertTrue(factory.is()); css::uno::Reference< css::container::XHierarchicalNameAccess > manager( m_context->getValueByName( - rtl::OUString( + OUString( "/singletons/" "com.sun.star.reflection.theTypeDescriptionManager")), css::uno::UNO_QUERY_THROW); @@ -135,7 +135,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) css::uno::Reference xSet( manager, css::uno::UNO_QUERY_THROW ); for ( sal_Int32 argPos = 0; argPos < arguments.getLength(); ++argPos ) { - rtl::OUString url; + OUString url; OSL_VERIFY( osl_File_E_None == osl_getFileURLFromSystemPath( arguments[argPos].pData, &url.pData ) ); bool supposedToBeCompatible = ! url.endsWithIgnoreAsciiCaseAsciiL( @@ -143,14 +143,14 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) css::uno::Reference xReg( m_context->getServiceManager()->createInstanceWithContext( - rtl::OUString( "com.sun.star.registry.SimpleRegistry" ), + OUString( "com.sun.star.registry.SimpleRegistry" ), m_context ), css::uno::UNO_QUERY_THROW ); xReg->open( url, true /* read-only */, false /* ! create */ ); css::uno::Any arg( css::uno::makeAny(xReg) ); css::uno::Reference xTDprov( m_context->getServiceManager()-> createInstanceWithArgumentsAndContext( - rtl::OUString( "com.sun.star.comp.stoc." + OUString( "com.sun.star.comp.stoc." "RegistryTypeDescriptionProvider" ), css::uno::Sequence( &arg, 1 ), m_context ), css::uno::UNO_QUERY_THROW ); @@ -158,7 +158,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) xSet->insert( css::uno::makeAny(xTDprov) ); if (! supposedToBeCompatible) std::cerr << "current rdb file: " << - rtl::OUStringToOString( + OUStringToOString( url, osl_getThreadTextEncoding()).getStr() << std::endl; assertTrue(supposedToBeCompatible); } catch (css::lang::IllegalArgumentException &) { @@ -172,67 +172,67 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) css::uno::Reference< css::reflection::XIndirectTypeDescription > sequence( manager->getByHierarchicalName( - rtl::OUString("[][]boolean")), + OUString("[][]boolean")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SEQUENCE, sequence->getTypeClass()); assertEqual( - rtl::OUString("[][]boolean"), + OUString("[][]boolean"), sequence->getName()); assertEqual( - rtl::OUString("[]boolean"), + OUString("[]boolean"), sequence->getReferencedType()->getName()); css::uno::Reference< css::reflection::XStructTypeDescription > structure( manager->getByHierarchicalName( - rtl::OUString( "test.tdmanager.Struct>")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass()); assertEqual( - rtl::OUString( "test.tdmanager.Struct>"), structure->getName()); assertEqual< bool >(false, structure->getBaseType().is()); assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength()); assertEqual( - rtl::OUString( "test.tdmanager.Struct"), + OUString( "test.tdmanager.Struct"), structure->getMemberTypes()[0]->getName()); assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength()); assertEqual( - rtl::OUString("s"), + OUString("s"), structure->getMemberNames()[0]); assertEqual< sal_Int32 >(0, structure->getTypeParameters().getLength()); assertEqual< sal_Int32 >(2, structure->getTypeArguments().getLength()); assertEqual( - rtl::OUString("boolean"), + OUString("boolean"), structure->getTypeArguments()[0]->getName()); assertEqual( - rtl::OUString( "test.tdmanager.Struct"), + OUString( "test.tdmanager.Struct"), structure->getTypeArguments()[1]->getName()); css::uno::Reference< css::reflection::XInterfaceMethodTypeDescription > method( manager->getByHierarchicalName( - rtl::OUString( "com.sun.star.uno.XComponentContext::getValueByName")), + OUString( "com.sun.star.uno.XComponentContext::getValueByName")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_INTERFACE_METHOD, method->getTypeClass()); assertEqual( - rtl::OUString( "com.sun.star.uno.XComponentContext::getValueByName"), + OUString( "com.sun.star.uno.XComponentContext::getValueByName"), method->getName()); assertEqual( - rtl::OUString("getValueByName"), + OUString("getValueByName"), method->getMemberName()); assertEqual< sal_Int32 >(3, method->getPosition()); assertEqual( - rtl::OUString("any"), + OUString("any"), method->getReturnType()->getName()); assertEqual< bool >(false, method->isOneway()); assertEqual< sal_Int32 >(1, method->getParameters().getLength()); assertEqual( - rtl::OUString("Name"), + OUString("Name"), method->getParameters()[0]->getName()); assertEqual( - rtl::OUString("string"), + OUString("string"), method->getParameters()[0]->getType()->getName()); assertEqual< bool >(true, method->getParameters()[0]->isIn()); assertEqual< bool >(false, method->getParameters()[0]->isOut()); @@ -243,21 +243,21 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( manager->getByHierarchicalName( - rtl::OUString("[]boolean")), + OUString("[]boolean")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY).is()); assertFalse( css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( manager->getByHierarchicalName( - rtl::OUString( "com.sun.star.beans.XIntroTest::ObjectName")), + OUString( "com.sun.star.beans.XIntroTest::ObjectName")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY).is()); assertFalse( css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( manager->getByHierarchicalName( - rtl::OUString( "com.sun.star.beans.XIntroTest::writeln")), + OUString( "com.sun.star.beans.XIntroTest::writeln")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY).is()); //TODO: check that the reflection of a property of an accumulation-based @@ -266,12 +266,12 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) return 0; } -rtl::OUString Service::getImplementationName() { - return rtl::OUString("test.tdmanager.impl"); +OUString Service::getImplementationName() { + return OUString("test.tdmanager.impl"); } -css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames() { - return css::uno::Sequence< rtl::OUString >(); +css::uno::Sequence< OUString > Service::getSupportedServiceNames() { + return css::uno::Sequence< OUString >(); } css::uno::Reference< css::uno::XInterface > Service::createInstance( @@ -301,11 +301,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const namespace { -bool writeInfo(void * registryKey, rtl::OUString const & implementationName, - css::uno::Sequence< rtl::OUString > const & serviceNames) { - rtl::OUString keyName("/"); +bool writeInfo(void * registryKey, OUString const & implementationName, + css::uno::Sequence< OUString > const & serviceNames) { + OUString keyName("/"); keyName += implementationName; - keyName += rtl::OUString("/UNO/SERVICES"); + keyName += OUString("/UNO/SERVICES"); css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx index 8708e826c096..21fc5a37baa9 100644 --- a/stoc/test/testconv.cxx +++ b/stoc/test/testconv.cxx @@ -41,8 +41,6 @@ using namespace com::sun::star::script; using namespace com::sun::star::reflection; using namespace com::sun::star::registry; -using ::rtl::OUString; -using ::rtl::OUStringToOString; const double MIN_DOUBLE = -DBL_MAX; const double MAX_DOUBLE = DBL_MAX; diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index 213989abb6ae..f8a89ab85d9e 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -55,9 +55,6 @@ using namespace com::sun::star::registry; using namespace com::sun::star::reflection; using namespace com::sun::star::container; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; //================================================================================================== class OInterfaceA : public WeakImplHelper1< XInterfaceA > diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx index 1bcce146518b..e48bb44f59d6 100644 --- a/stoc/test/testiadapter.cxx +++ b/stoc/test/testiadapter.cxx @@ -48,9 +48,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::reflection; using namespace com::sun::star::registry; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; //================================================================================================== @@ -119,7 +116,7 @@ void assign( test::TestElement & rData, sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, - test::TestEnum eEnum, const ::rtl::OUString& rStr, + test::TestEnum eEnum, const OUString& rStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, const ::com::sun::star::uno::Any& rAny ) { @@ -146,7 +143,7 @@ void assign( test::TestData & rData, sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, - test::TestEnum eEnum, const ::rtl::OUString& rStr, + test::TestEnum eEnum, const OUString& rStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, const ::com::sun::star::uno::Any& rAny, const com::sun::star::uno::Sequence< test::TestElement >& rSequence ) @@ -172,7 +169,7 @@ public: sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, - test::TestEnum eEnum, const ::rtl::OUString& rStr, + test::TestEnum eEnum, const OUString& rStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Sequence& rSequence, @@ -184,7 +181,7 @@ public: sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, - test::TestEnum& eEnum, rtl::OUString& rStr, + test::TestEnum& eEnum, OUString& rStr, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, ::com::sun::star::uno::Any& rAny, ::com::sun::star::uno::Sequence& rSequence, @@ -196,7 +193,7 @@ public: sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, - test::TestEnum& eEnum, rtl::OUString& rStr, + test::TestEnum& eEnum, OUString& rStr, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, ::com::sun::star::uno::Any& rAny, ::com::sun::star::uno::Sequence< test::TestElement >& rSequence, @@ -227,7 +224,7 @@ public: { return _aData.Double; } virtual test::TestEnum SAL_CALL getEnum() throw(com::sun::star::uno::RuntimeException) { return _aData.Enum; } - virtual rtl::OUString SAL_CALL getString() throw(com::sun::star::uno::RuntimeException) + virtual OUString SAL_CALL getString() throw(com::sun::star::uno::RuntimeException) { return _aData.String; } virtual com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getInterface( ) throw(com::sun::star::uno::RuntimeException) { return _aData.Interface; } @@ -262,7 +259,7 @@ public: { _aData.Double = _double; } virtual void SAL_CALL setEnum( test::TestEnum _enum ) throw(::com::sun::star::uno::RuntimeException) { _aData.Enum = _enum; } - virtual void SAL_CALL setString( const ::rtl::OUString& _string ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setString( const OUString& _string ) throw(::com::sun::star::uno::RuntimeException) { _aData.String = _string; } virtual void SAL_CALL setInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _interface ) throw(::com::sun::star::uno::RuntimeException) { _aData.Interface = _interface; } @@ -274,7 +271,7 @@ public: { _aStructData = _struct; } // XLanguageBindingTest - virtual test::TestData SAL_CALL raiseException( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, test::TestEnum& eEnum, ::rtl::OUString& aString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInterface, ::com::sun::star::uno::Any& aAny, ::com::sun::star::uno::Sequence& aSequence,test::TestData& aStruct ) + virtual test::TestData SAL_CALL raiseException( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, test::TestEnum& eEnum, OUString& aString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInterface, ::com::sun::star::uno::Any& aAny, ::com::sun::star::uno::Sequence& aSequence,test::TestData& aStruct ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException); @@ -676,7 +673,7 @@ void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, - test::TestEnum eEnum, const ::rtl::OUString& rStr, + test::TestEnum eEnum, const OUString& rStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Sequence& rSequence, @@ -694,7 +691,7 @@ test::TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_I sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, - test::TestEnum& eEnum, rtl::OUString& rStr, + test::TestEnum& eEnum, OUString& rStr, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, ::com::sun::star::uno::Any& rAny, ::com::sun::star::uno::Sequence& rSequence, @@ -713,7 +710,7 @@ test::TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_In sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, - test::TestEnum& eEnum, rtl::OUString& rStr, + test::TestEnum& eEnum, OUString& rStr, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, ::com::sun::star::uno::Any& rAny, ::com::sun::star::uno::Sequence& rSequence, @@ -853,7 +850,7 @@ sal_Bool performTest( const Reference & xLBT ) } //__________________________________________________________________________________________________ -test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cChar*/, sal_Int8& /*nByte*/, sal_Int16& /*nShort*/, sal_uInt16& /*nUShort*/, sal_Int32& /*nLong*/, sal_uInt32& /*nULong*/, sal_Int64& /*nHyper*/, sal_uInt64& /*nUHyper*/, float& /*fFloat*/, double& /*fDouble*/, test::TestEnum& /*eEnum*/, ::rtl::OUString& /*aString*/, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& /*xInterface*/, ::com::sun::star::uno::Any& /*aAny*/, ::com::sun::star::uno::Sequence< test::TestElement >& /*aSequence*/, test::TestData& /*aStruct*/ ) +test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cChar*/, sal_Int8& /*nByte*/, sal_Int16& /*nShort*/, sal_uInt16& /*nUShort*/, sal_Int32& /*nLong*/, sal_uInt32& /*nULong*/, sal_Int64& /*nHyper*/, sal_uInt64& /*nUHyper*/, float& /*fFloat*/, double& /*fDouble*/, test::TestEnum& /*eEnum*/, OUString& /*aString*/, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& /*xInterface*/, ::com::sun::star::uno::Any& /*aAny*/, ::com::sun::star::uno::Sequence< test::TestElement >& /*aSequence*/, test::TestData& /*aStruct*/ ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { IllegalArgumentException aExc; diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index b583ebc6169d..bcec385465bb 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -52,10 +52,6 @@ using namespace com::sun::star::reflection; using namespace com::sun::star::container; using namespace com::sun::star::beans::PropertyAttribute; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; -using ::rtl::OStringToOUString; typedef WeakImplHelper4< XIntroTest, XPropertySet, XNameAccess, XIndexAccess > ImplIntroTestHelper; diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx index 44af57bf4cae..edb4a281a3ff 100644 --- a/stoc/test/testloader.cxx +++ b/stoc/test/testloader.cxx @@ -43,7 +43,6 @@ using namespace com::sun::star::lang; using namespace osl; using namespace cppu; -using ::rtl::OUString; class EmptyComponentContext : public WeakImplHelper1< XComponentContext > { diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx index c118cbdfa976..9d23f95ca8b1 100644 --- a/stoc/test/testregistry.cxx +++ b/stoc/test/testregistry.cxx @@ -51,9 +51,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; namespace stoc_impreg { diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx index 7f6ece41f2a0..b8e100f18952 100644 --- a/stoc/test/testsmgr_cpnt.cxx +++ b/stoc/test/testsmgr_cpnt.cxx @@ -58,9 +58,6 @@ using namespace com::sun::star::container; using namespace osl; using namespace cppu; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; Reference getProcessServiceManager() diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx index 34a3b2d9c0c1..a82875a13e08 100644 --- a/stoc/test/uriproc/test_uriproc.cxx +++ b/stoc/test/uriproc/test_uriproc.cxx @@ -58,32 +58,32 @@ namespace { (actual) == (expected)) template< typename T > void append( - rtl::OUStringBuffer & buffer, T const & value) + OUStringBuffer & buffer, T const & value) { buffer.append(value); } -template<> void append(rtl::OUStringBuffer & buffer, bool const & value) { +template<> void append(OUStringBuffer & buffer, bool const & value) { buffer.append(static_cast< sal_Bool >(value)); } -template<> void append(rtl::OUStringBuffer & buffer, std::size_t const & value) +template<> void append(OUStringBuffer & buffer, std::size_t const & value) { buffer.append(static_cast< sal_Int32 >(value)); } -template<> void append(rtl::OUStringBuffer & buffer, char const * const & value) +template<> void append(OUStringBuffer & buffer, char const * const & value) { buffer.appendAscii(value); } template< typename T1, typename T2, typename T3, typename T4 > -rtl::OString createTestAssertEqualMessage( +OString createTestAssertEqualMessage( char const * token1, T1 const & token2, T2 const & token3, char const * expectedExpr, char const * actualExpr, T3 const & expected, T4 const & actual) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii(token1); buf.append(static_cast< sal_Unicode >('|')); append(buf, token2); @@ -98,7 +98,7 @@ rtl::OString createTestAssertEqualMessage( buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("> != <")); append(buf, actual); buf.append(static_cast< sal_Unicode >('>')); - return rtl::OUStringToOString( + return OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); } @@ -196,24 +196,24 @@ void Test::testParse() { for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) { css::uno::Reference< css::uri::XUriReference > uriRef( m_uriFactory->parse( - rtl::OUString::createFromAscii(data[i].uriReference))); + OUString::createFromAscii(data[i].uriReference))); CPPUNIT_ASSERT(uriRef.is() == (data[i].schemeSpecificPart != 0)); if (uriRef.is()) { TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].uriReference), + OUString::createFromAscii(data[i].uriReference), uriRef->getUriReference()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, data[i].scheme != 0, uriRef->isAbsolute()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].scheme == 0 ? "" : data[i].scheme), uriRef->getScheme()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].schemeSpecificPart), + OUString::createFromAscii(data[i].schemeSpecificPart), uriRef->getSchemeSpecificPart()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, @@ -224,12 +224,12 @@ void Test::testParse() { data[i].authority != 0, uriRef->hasAuthority()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].authority == 0 ? "" : data[i].authority), uriRef->getAuthority()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].path), + OUString::createFromAscii(data[i].path), uriRef->getPath()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, @@ -240,36 +240,36 @@ void Test::testParse() { data[i].pathSegmentCount, uriRef->getPathSegmentCount()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString(""), uriRef->getPathSegment(-1)); + OUString(""), uriRef->getPathSegment(-1)); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].pathSegment0), + OUString::createFromAscii(data[i].pathSegment0), uriRef->getPathSegment(0)); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].pathSegment1), + OUString::createFromAscii(data[i].pathSegment1), uriRef->getPathSegment(1)); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].pathSegment2), + OUString::createFromAscii(data[i].pathSegment2), uriRef->getPathSegment(2)); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].pathSegment3), + OUString::createFromAscii(data[i].pathSegment3), uriRef->getPathSegment(3)); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].pathSegment4), + OUString::createFromAscii(data[i].pathSegment4), uriRef->getPathSegment(4)); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString(), uriRef->getPathSegment(5)); + OUString(), uriRef->getPathSegment(5)); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, data[i].query != 0, uriRef->hasQuery()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].query == 0 ? "" : data[i].query), uriRef->getQuery()); TEST_ASSERT_EQUAL( @@ -277,7 +277,7 @@ void Test::testParse() { data[i].fragment != 0, uriRef->hasFragment()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].fragment == 0 ? "" : data[i].fragment), uriRef->getFragment()); } @@ -586,11 +586,11 @@ void Test::testMakeAbsolute() { for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) { css::uno::Reference< css::uri::XUriReference > baseUriRef( m_uriFactory->parse( - rtl::OUString::createFromAscii(data[i].baseUriReference))); + OUString::createFromAscii(data[i].baseUriReference))); CPPUNIT_ASSERT(baseUriRef.is()); css::uno::Reference< css::uri::XUriReference > uriRef( m_uriFactory->parse( - rtl::OUString::createFromAscii(data[i].uriReference))); + OUString::createFromAscii(data[i].uriReference))); CPPUNIT_ASSERT(uriRef.is()); css::uno::Reference< css::uri::XUriReference > absolute( m_uriFactory->makeAbsolute( @@ -602,7 +602,7 @@ void Test::testMakeAbsolute() { if (absolute.is()) { TEST_ASSERT_EQUAL( "testMakeAbsolute", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].absolute), + OUString::createFromAscii(data[i].absolute), absolute->getUriReference()); } } @@ -691,11 +691,11 @@ void Test::testMakeRelative() { for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) { css::uno::Reference< css::uri::XUriReference > baseUriRef( m_uriFactory->parse( - rtl::OUString::createFromAscii(data[i].baseUriReference))); + OUString::createFromAscii(data[i].baseUriReference))); CPPUNIT_ASSERT(baseUriRef.is()); css::uno::Reference< css::uri::XUriReference > uriRef( m_uriFactory->parse( - rtl::OUString::createFromAscii(data[i].uriReference))); + OUString::createFromAscii(data[i].uriReference))); CPPUNIT_ASSERT(uriRef.is()); css::uno::Reference< css::uri::XUriReference > relative( m_uriFactory->makeRelative( @@ -708,7 +708,7 @@ void Test::testMakeRelative() { if (relative.is()) { TEST_ASSERT_EQUAL( "testMakeRelative", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].relative), + OUString::createFromAscii(data[i].relative), relative->getUriReference()); css::uno::Reference< css::uri::XUriReference > absolute( m_uriFactory->makeAbsolute( @@ -717,7 +717,7 @@ void Test::testMakeRelative() { CPPUNIT_ASSERT(absolute.is()); TEST_ASSERT_EQUAL( "testMakeRelative", i, data[i].uriReference, - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].absolute == 0 ? data[i].uriReference : data[i].absolute), absolute->getUriReference()); @@ -737,12 +737,12 @@ void Test::testVndSunStarExpand() { { "vnd.sun.star.expand:%5C$%5C%24%5C%5C", "$$\\" } }; css::uno::Reference< css::util::XMacroExpander > expander( m_context->getValueByName( - rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander")), + OUString( "/singletons/com.sun.star.util.theMacroExpander")), css::uno::UNO_QUERY_THROW); for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) { css::uno::Reference< css::uri::XUriReference > uriRef( m_uriFactory->parse( - rtl::OUString::createFromAscii(data[i].uriReference))); + OUString::createFromAscii(data[i].uriReference))); TEST_ASSERT_EQUAL( "testVndSunStarExpand", i, data[i].uriReference, data[i].expanded != 0, uriRef.is()); @@ -751,7 +751,7 @@ void Test::testVndSunStarExpand() { expandUrl(uriRef, css::uno::UNO_QUERY_THROW); TEST_ASSERT_EQUAL( "testVndSunStarExpand", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].expanded), + OUString::createFromAscii(data[i].expanded), expandUrl->expand(expander)); } } @@ -782,7 +782,7 @@ void Test::testVndSunStarScript() { for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) { css::uno::Reference< css::uri::XUriReference > uriRef( m_uriFactory->parse( - rtl::OUString::createFromAscii(data[i].uriReference))); + OUString::createFromAscii(data[i].uriReference))); TEST_ASSERT_EQUAL( "testVndSunStarScript", i, data[i].uriReference, data[i].name != 0, uriRef.is()); @@ -791,13 +791,13 @@ void Test::testVndSunStarScript() { scriptUrl(uriRef, css::uno::UNO_QUERY_THROW); TEST_ASSERT_EQUAL( "testVndSunStarScript", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].uriReference), + OUString::createFromAscii(data[i].uriReference), scriptUrl->getUriReference()); TEST_ASSERT_EQUAL( "testVndSunStarScript", i, data[i].uriReference, - rtl::OUString::createFromAscii(data[i].name), + OUString::createFromAscii(data[i].name), scriptUrl->getName()); - rtl::OUString originalReference(uriRef->getUriReference()); + OUString originalReference(uriRef->getUriReference()); for (std::size_t j = 0; j < parameterCount; ++j) { if (data[i].parameters[j].key != 0) { TEST_ASSERT_EQUAL( @@ -807,35 +807,35 @@ void Test::testVndSunStarScript() { data[i].uriReference, data[i].parameters[j].value != 0, scriptUrl->hasParameter( - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].parameters[j].key))); TEST_ASSERT_EQUAL( "testVndSunStarScript", static_cast< double >(i) + static_cast< double >(j) / 10.0, data[i].uriReference, - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].parameters[j].value), scriptUrl->getParameter( - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].parameters[j].key))); // setting the parameter to its original value should not change // the overall uri reference (provided it was normalized before) if ( data[i].normalized ) { - if ( scriptUrl->hasParameter(rtl::OUString::createFromAscii( + if ( scriptUrl->hasParameter(OUString::createFromAscii( data[i].parameters[j].key)) ) { scriptUrl->setParameter( - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].parameters[j].key), scriptUrl->getParameter( - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].parameters[j].key))); TEST_ASSERT_EQUAL( "testVndSunStarScript", static_cast< double >(i) + static_cast< double >(j) / 10.0, - ::rtl::OUString("setParameter"), + OUString("setParameter"), originalReference, uriRef->getUriReference()); } @@ -847,7 +847,7 @@ void Test::testVndSunStarScript() { TEST_ASSERT_EQUAL( "testVndSunStarScript", i, - ::rtl::OUString("setName"), + OUString("setName"), originalReference, uriRef->getUriReference()); } @@ -856,55 +856,55 @@ void Test::testVndSunStarScript() { css::uno::Reference< css::uri::XUriReference > uriRef( m_uriFactory->parse( - rtl::OUString( "vnd.sun.star.script:Hello?location=Library.Module")), + OUString( "vnd.sun.star.script:Hello?location=Library.Module")), css::uno::UNO_SET_THROW); css::uno::Reference< css::uri::XVndSunStarScriptUrlReference > scriptUrl(uriRef, css::uno::UNO_QUERY_THROW); scriptUrl->setParameter( - ::rtl::OUString("location"), - ::rtl::OUString("foo")); + OUString("location"), + OUString("foo")); TEST_ASSERT_EQUAL( "testVndSunStarScript", (sal_Int32)10, (sal_Int32)1, uriRef->getUriReference(), - ::rtl::OUString("vnd.sun.star.script:Hello?location=foo")); + OUString("vnd.sun.star.script:Hello?location=foo")); scriptUrl->setParameter( - ::rtl::OUString("language"), - ::rtl::OUString("StarBasic")); + OUString("language"), + OUString("StarBasic")); TEST_ASSERT_EQUAL( "testVndSunStarScript", (sal_Int32)10, (sal_Int32)2, uriRef->getUriReference(), - ::rtl::OUString("vnd.sun.star.script:Hello?location=foo&language=StarBasic")); + OUString("vnd.sun.star.script:Hello?location=foo&language=StarBasic")); bool caughtExpected = false; try { - scriptUrl->setName(::rtl::OUString()); + scriptUrl->setName(OUString()); } catch( const css::lang::IllegalArgumentException& ) { caughtExpected = true; } TEST_ASSERT_EQUAL( "testVndSunStarScript", - ::rtl::OUString("illegal arguments"), - ::rtl::OUString("name"), + OUString("illegal arguments"), + OUString("name"), caughtExpected, true); caughtExpected = false; try { scriptUrl->setParameter( - ::rtl::OUString(), - ::rtl::OUString("non-empty")); + OUString(), + OUString("non-empty")); } catch( const css::lang::IllegalArgumentException& ) { caughtExpected = true; } TEST_ASSERT_EQUAL( "testVndSunStarScript", - ::rtl::OUString("illegal arguments"), - ::rtl::OUString("parameter"), + OUString("illegal arguments"), + OUString("parameter"), caughtExpected, true); } @@ -939,17 +939,17 @@ void Test::testTranslator() { TEST_ASSERT_EQUAL( "testTranslator, translateToInternal", i, data[i].externalUriReference, - rtl::OUString::createFromAscii(data[i].internalUriReference), + OUString::createFromAscii(data[i].internalUriReference), translator->translateToInternal( - rtl::OUString::createFromAscii( + OUString::createFromAscii( data[i].externalUriReference))); } TEST_ASSERT_EQUAL( "testTranslator, translateToExternal", i, data[i].internalUriReference, - rtl::OUString::createFromAscii(data[i].externalUriReference), + OUString::createFromAscii(data[i].externalUriReference), translator->translateToExternal( - rtl::OUString::createFromAscii(data[i].internalUriReference))); + OUString::createFromAscii(data[i].internalUriReference))); } } @@ -969,14 +969,14 @@ void Test::testPkgUrlFactory() { css::uno::Reference< css::uri::XUriReference > url( factory->createVndSunStarPkgUrlReference( m_uriFactory->parse( - rtl::OUString::createFromAscii(data[i].authority)))); + OUString::createFromAscii(data[i].authority)))); TEST_ASSERT_EQUAL( "testVndSunStarPkgFactory", i, data[i].authority, data[i].result != 0, static_cast< bool >(url.is())); if (data[i].result != 0) { TEST_ASSERT_EQUAL( "testVndSunStarPkgFactory", i, data[i].authority, - rtl::OUString::createFromAscii(data[i].result), + OUString::createFromAscii(data[i].result), url->getUriReference()); } } diff --git a/store/inc/store/store.hxx b/store/inc/store/store.hxx index d5a2f604e254..43ef8859c52e 100644 --- a/store/inc/store/store.hxx +++ b/store/inc/store/store.hxx @@ -99,8 +99,8 @@ public: */ inline storeError create ( storeFileHandle hFile, - rtl::OUString const & rPath, - rtl::OUString const & rName, + OUString const & rPath, + OUString const & rName, storeAccessMode eMode) SAL_THROW(()) { if (m_hImpl) @@ -264,8 +264,8 @@ public: */ inline storeError create ( storeFileHandle hFile, - rtl::OUString const & rPath, - rtl::OUString const & rName, + OUString const & rPath, + OUString const & rName, storeAccessMode eMode) SAL_THROW(()) { if (m_hImpl) @@ -429,7 +429,7 @@ public: @see store_openFile() */ inline storeError create ( - rtl::OUString const & rFilename, + OUString const & rFilename, storeAccessMode eAccessMode, sal_uInt16 nPageSize = STORE_DEFAULT_PAGESIZE) SAL_THROW(()) { @@ -504,8 +504,8 @@ public: @see store_attrib() */ inline storeError attrib ( - rtl::OUString const & rPath, - rtl::OUString const & rName, + OUString const & rPath, + OUString const & rName, sal_uInt32 nMask1, sal_uInt32 nMask2, sal_uInt32 & rnAttrib) SAL_THROW(()) @@ -520,8 +520,8 @@ public: @see store_attrib() */ inline storeError attrib ( - rtl::OUString const & rPath, - rtl::OUString const & rName, + OUString const & rPath, + OUString const & rName, sal_uInt32 nMask1, sal_uInt32 nMask2) SAL_THROW(()) { @@ -535,8 +535,8 @@ public: @see store_link() */ inline storeError link ( - rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName, - rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(()) + OUString const & rSrcPath, OUString const & rSrcName, + OUString const & rDstPath, OUString const & rDstName) SAL_THROW(()) { if (!m_hImpl) return store_E_InvalidHandle; @@ -549,8 +549,8 @@ public: @see store_symlink() */ inline storeError symlink ( - rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName, - rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(()) + OUString const & rSrcPath, OUString const & rSrcName, + OUString const & rDstPath, OUString const & rDstName) SAL_THROW(()) { if (!m_hImpl) return store_E_InvalidHandle; @@ -562,8 +562,8 @@ public: @see store_rename() */ inline storeError rename ( - rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName, - rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(()) + OUString const & rSrcPath, OUString const & rSrcName, + OUString const & rDstPath, OUString const & rDstName) SAL_THROW(()) { if (!m_hImpl) return store_E_InvalidHandle; @@ -575,7 +575,7 @@ public: @see store_remove() */ inline storeError remove ( - rtl::OUString const & rPath, rtl::OUString const & rName) SAL_THROW(()) + OUString const & rPath, OUString const & rName) SAL_THROW(()) { if (!m_hImpl) return store_E_InvalidHandle; diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx index 9a05e94c57ef..2c322bacc6d4 100644 --- a/store/source/lockbyte.cxx +++ b/store/source/lockbyte.cxx @@ -221,7 +221,7 @@ struct FileHandle return store_E_InvalidParameter; // Convert into FileUrl. - rtl::OUString aFileUrl; + OUString aFileUrl; if (osl_getFileURLFromSystemPath (pFilename, &(aFileUrl.pData)) != osl_File_E_None) { // Not system path. Assume file url. @@ -230,7 +230,7 @@ struct FileHandle if (!aFileUrl.startsWith("file://")) { // Not file url. Assume relative path. - rtl::OUString aCwdUrl; + OUString aCwdUrl; (void) osl_getProcessWorkingDir (&(aCwdUrl.pData)); // Absolute file url. diff --git a/store/source/store.cxx b/store/source/store.cxx index 184de2ca2cd0..11780b6e57d6 100644 --- a/store/source/store.cxx +++ b/store/source/store.cxx @@ -33,7 +33,6 @@ #include "storlckb.hxx" using rtl::Reference; -using rtl::OString; namespace store { diff --git a/store/workben/t_base.cxx b/store/workben/t_base.cxx index e60db8970121..99320b7052a6 100644 --- a/store/workben/t_base.cxx +++ b/store/workben/t_base.cxx @@ -184,7 +184,7 @@ static storeError __store_namei ( const sal_Unicode *pszName, OStorePageKey &rKey) { - rtl::OString aName ( + OString aName ( pszName, rtl_ustr_getLength (pszName), RTL_TEXTENCODING_UTF8); rtl_String *pszNameA = 0; @@ -304,7 +304,7 @@ int SAL_CALL main (int argc, char **argv) rtl::Reference xLockBytes; - rtl::OUString aFilename ( + OUString aFilename ( argv[1], rtl_str_getLength(argv[1]), osl_getThreadTextEncoding()); diff --git a/store/workben/t_file.cxx b/store/workben/t_file.cxx index 058d04b3577a..62b7540c363b 100644 --- a/store/workben/t_file.cxx +++ b/store/workben/t_file.cxx @@ -46,7 +46,7 @@ int SAL_CALL main (int argc, char **argv) if (argc > 1) { - rtl::OUString aFilename ( + OUString aFilename ( argv[1], rtl_str_getLength(argv[1]), osl_getThreadTextEncoding()); diff --git a/store/workben/t_page.cxx b/store/workben/t_page.cxx index 8abbd563ba24..5fa7ca62bc29 100644 --- a/store/workben/t_page.cxx +++ b/store/workben/t_page.cxx @@ -852,7 +852,7 @@ struct FileHandle return osl_File_E_INVAL; // Convert into FileUrl. - rtl::OUString aFileUrl; + OUString aFileUrl; if (osl_getFileURLFromSystemPath (pFilename, &(aFileUrl.pData)) != osl_File_E_None) { // Not system path. Maybe a file url, already. diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx index 507edde5d6a3..e1c1a1c4a1fd 100644 --- a/store/workben/t_store.cxx +++ b/store/workben/t_store.cxx @@ -37,7 +37,6 @@ extern "C" } #endif /* PROFILE */ -using rtl::OUString; /*======================================================================== * @@ -180,7 +179,7 @@ sal_Bool DirectoryTraveller::visit (const iter& it) m_nCount++; if (m_nOptions & OPTION_DUMP) { - rtl::OString aName (it.m_pszName, it.m_nLength, RTL_TEXTENCODING_UTF8); + OString aName (it.m_pszName, it.m_nLength, RTL_TEXTENCODING_UTF8); printf ("Visit(%u,%u): %s [0x%08x] %d [Bytes]\n", m_nLevel, m_nCount, aName.pData->buffer, (unsigned int)(it.m_nAttrib), (unsigned int)(it.m_nSize)); diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgio/svgreader/svgcharacternode.hxx index ebd9daa8f344..5c0ffaf005ef 100644 --- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx +++ b/svgio/inc/svgio/svgreader/svgcharacternode.hxx @@ -49,7 +49,7 @@ namespace svgio public: SvgTextPositions(); - void parseTextPositionAttributes(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + void parseTextPositionAttributes(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); /// X content const SvgNumberVector& getX() const { return maX; } @@ -144,7 +144,7 @@ namespace svgio { private: /// the string data - rtl::OUString maText; + OUString maText; /// local helpers drawinglayer::primitive2d::TextSimplePortionPrimitive2D* createSimpleTextPrimitive( @@ -159,17 +159,17 @@ namespace svgio SvgCharacterNode( SvgDocument& rDocument, SvgNode* pParent, - const rtl::OUString& rText); + const OUString& rText); virtual ~SvgCharacterNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; virtual void decomposeText(drawinglayer::primitive2d::Primitive2DSequence& rTarget, SvgTextPosition& rSvgTextPosition) const; void whiteSpaceHandling(); void addGap(); - void concatenate(const rtl::OUString& rText); + void concatenate(const OUString& rText); /// Text content - const rtl::OUString& getText() const { return maText; } + const OUString& getText() const { return maText; } }; } // end of namespace svgreader } // end of namespace svgio diff --git a/svgio/inc/svgio/svgreader/svgcirclenode.hxx b/svgio/inc/svgio/svgreader/svgcirclenode.hxx index bb1f9039fc3b..b58b3a1bfca3 100644 --- a/svgio/inc/svgio/svgreader/svgcirclenode.hxx +++ b/svgio/inc/svgio/svgreader/svgcirclenode.hxx @@ -48,7 +48,7 @@ namespace svgio virtual ~SvgCircleNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// Cx content, set if found in current context diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx b/svgio/inc/svgio/svgreader/svgclippathnode.hxx index 1b3b6817bf8c..3cc9dbdabcde 100644 --- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgclippathnode.hxx @@ -46,7 +46,7 @@ namespace svgio virtual ~SvgClipPathNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// apply contained clipPath to given geometry diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx index 6a5c31617216..b791d759e48d 100644 --- a/svgio/inc/svgio/svgreader/svgdocument.hxx +++ b/svgio/inc/svgio/svgreader/svgdocument.hxx @@ -36,45 +36,45 @@ namespace svgio SvgNodeVector maNodes; /// the absolute path of the Svg file in progress (if available) - const rtl::OUString maAbsolutePath; + const OUString maAbsolutePath; /// hash mapper to find nodes by their id - typedef boost::unordered_map< const rtl::OUString, const SvgNode*, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > IdTokenMapper; - typedef std::pair< const rtl::OUString, const SvgNode* > IdTokenValueType; + typedef boost::unordered_map< const OUString, const SvgNode*, + OUStringHash, + ::std::equal_to< OUString > > IdTokenMapper; + typedef std::pair< const OUString, const SvgNode* > IdTokenValueType; IdTokenMapper maIdTokenMapperList; /// hash mapper to find css styles by their id - typedef boost::unordered_map< const rtl::OUString, const SvgStyleAttributes*, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > IdStyleTokenMapper; - typedef std::pair< const rtl::OUString, const SvgStyleAttributes* > IdStyleTokenValueType; + typedef boost::unordered_map< const OUString, const SvgStyleAttributes*, OUStringHash, ::std::equal_to< OUString > > IdStyleTokenMapper; + typedef std::pair< const OUString, const SvgStyleAttributes* > IdStyleTokenValueType; IdStyleTokenMapper maIdStyleTokenMapperList; public: - SvgDocument(const rtl::OUString& rAbsolutePath); + SvgDocument(const OUString& rAbsolutePath); ~SvgDocument(); /// append anopther root node, ownership changes void appendNode(SvgNode* pNode); /// add/remove nodes with Id to mapper - void addSvgNodeToMapper(const rtl::OUString& rStr, const SvgNode& rNode); - void removeSvgNodeFromMapper(const rtl::OUString& rStr); + void addSvgNodeToMapper(const OUString& rStr, const SvgNode& rNode); + void removeSvgNodeFromMapper(const OUString& rStr); /// find a node by it's Id bool hasSvgNodesById() const { return !maIdTokenMapperList.empty(); } - const SvgNode* findSvgNodeById(const rtl::OUString& rStr) const; + const SvgNode* findSvgNodeById(const OUString& rStr) const; /// add/remove styles to mapper - void addSvgStyleAttributesToMapper(const rtl::OUString& rStr, const SvgStyleAttributes& rSvgStyleAttributes); + void addSvgStyleAttributesToMapper(const OUString& rStr, const SvgStyleAttributes& rSvgStyleAttributes); /// find a style by it's Id bool hasSvgStyleAttributesById() const { return !maIdStyleTokenMapperList.empty(); } - const SvgStyleAttributes* findSvgStyleAttributesById(const rtl::OUString& rStr) const; + const SvgStyleAttributes* findSvgStyleAttributesById(const OUString& rStr) const; /// data read access const SvgNodeVector& getSvgNodeVector() const { return maNodes; } - const rtl::OUString& getAbsolutePath() const { return maAbsolutePath; } + const OUString& getAbsolutePath() const { return maAbsolutePath; } }; } // end of namespace svgreader } // end of namespace svgio diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx index 2bdd56a4a0f1..a94db1bb8d67 100644 --- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx +++ b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx @@ -44,20 +44,20 @@ namespace svgio SvgNode* mpTarget; // text collector string stack for css styles - std::vector< rtl::OUString > maCssContents; + std::vector< OUString > maCssContents; public: - SvgDocHdl(const rtl::OUString& rAbsolutePath); + SvgDocHdl(const OUString& rAbsolutePath); ~SvgDocHdl(); // Methods XDocumentHandler virtual void SAL_CALL startDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); const SvgDocument& getSvgDocument() const { return maDocument; } diff --git a/svgio/inc/svgio/svgreader/svgellipsenode.hxx b/svgio/inc/svgio/svgreader/svgellipsenode.hxx index 52d232428fc0..d24576382807 100644 --- a/svgio/inc/svgio/svgreader/svgellipsenode.hxx +++ b/svgio/inc/svgio/svgreader/svgellipsenode.hxx @@ -49,7 +49,7 @@ namespace svgio virtual ~SvgEllipseNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// Cx content, set if found in current context diff --git a/svgio/inc/svgio/svgreader/svggnode.hxx b/svgio/inc/svgio/svgreader/svggnode.hxx index 7398ed211e51..0649370689d0 100644 --- a/svgio/inc/svgio/svgreader/svggnode.hxx +++ b/svgio/inc/svgio/svgreader/svggnode.hxx @@ -46,7 +46,7 @@ namespace svgio virtual ~SvgGNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// transform content diff --git a/svgio/inc/svgio/svgreader/svggradientnode.hxx b/svgio/inc/svgio/svgreader/svggradientnode.hxx index 4b3e4d2b79ac..b820e5903554 100644 --- a/svgio/inc/svgio/svgreader/svggradientnode.hxx +++ b/svgio/inc/svgio/svgreader/svggradientnode.hxx @@ -57,7 +57,7 @@ namespace svgio /// link to another gradient used as style. If maXLink /// is set, the node can be fetched on demand by using // tryToFindLink (buffered) - rtl::OUString maXLink; + OUString maXLink; const SvgGradientNode* mpXLink; /// link on demand @@ -71,7 +71,7 @@ namespace svgio virtual ~SvgGradientNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); /// collect gradient stop entries void collectGradientEntries(drawinglayer::primitive2d::SvgGradientEntryVector& aVector) const; diff --git a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx index 8ddbff794e35..7368fa46c210 100644 --- a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx +++ b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx @@ -45,7 +45,7 @@ namespace svgio virtual ~SvgGradientStopNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); /// offset content const SvgNumber getOffset() const { return maOffset; } diff --git a/svgio/inc/svgio/svgreader/svgimagenode.hxx b/svgio/inc/svgio/svgreader/svgimagenode.hxx index 11c3cd0bdc05..5e5f037c4ffb 100644 --- a/svgio/inc/svgio/svgreader/svgimagenode.hxx +++ b/svgio/inc/svgio/svgreader/svgimagenode.hxx @@ -43,11 +43,11 @@ namespace svgio SvgNumber maWidth; SvgNumber maHeight; - rtl::OUString maXLink; // internal link - rtl::OUString maUrl; // external link + OUString maXLink; // internal link + OUString maUrl; // external link - rtl::OUString maMimeType; // mimetype and - rtl::OUString maData; // base64 data + OUString maMimeType; // mimetype and + OUString maData; // base64 data public: SvgImageNode( @@ -56,7 +56,7 @@ namespace svgio virtual ~SvgImageNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// SvgAspectRatio content @@ -84,7 +84,7 @@ namespace svgio void setHeight(const SvgNumber& rHeight = SvgNumber()) { maHeight = rHeight; } /// XLink access - const rtl::OUString& getXLink() const { return maXLink; } + const OUString& getXLink() const { return maXLink; } }; } // end of namespace svgreader } // end of namespace svgio diff --git a/svgio/inc/svgio/svgreader/svglinenode.hxx b/svgio/inc/svgio/svgreader/svglinenode.hxx index e2d5addef069..56fd95409b29 100644 --- a/svgio/inc/svgio/svgreader/svglinenode.hxx +++ b/svgio/inc/svgio/svgreader/svglinenode.hxx @@ -49,7 +49,7 @@ namespace svgio virtual ~SvgLineNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// X1 content, set if found in current context diff --git a/svgio/inc/svgio/svgreader/svgmarkernode.hxx b/svgio/inc/svgio/svgreader/svgmarkernode.hxx index 71a3c4944aae..14fa5f14082b 100644 --- a/svgio/inc/svgio/svgreader/svgmarkernode.hxx +++ b/svgio/inc/svgio/svgreader/svgmarkernode.hxx @@ -65,7 +65,7 @@ namespace svgio virtual ~SvgMarkerNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); /// get marker primitives buffered, uses decomposeSvgNode internally const drawinglayer::primitive2d::Primitive2DSequence& getMarkerPrimitives() const; diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx b/svgio/inc/svgio/svgreader/svgmasknode.hxx index c382b607edcb..a20a9f5bb95b 100644 --- a/svgio/inc/svgio/svgreader/svgmasknode.hxx +++ b/svgio/inc/svgio/svgreader/svgmasknode.hxx @@ -51,7 +51,7 @@ namespace svgio virtual ~SvgMaskNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// apply contained clipPath to given geometry diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx index 42c3d7c14e94..1fc1e50deb44 100644 --- a/svgio/inc/svgio/svgreader/svgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgnode.hxx @@ -68,10 +68,10 @@ namespace svgio SvgNodeVector maChildren; /// Id svan value - rtl::OUString* mpId; + OUString* mpId; /// Class svan value - rtl::OUString* mpClass; + OUString* mpClass; /// XmlSpace value XmlSpace maXmlSpace; @@ -85,7 +85,7 @@ namespace svgio void parseAttributes(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// basic data read access @@ -100,12 +100,12 @@ namespace svgio virtual double getCurrentXHeight() const; /// Id access - const rtl::OUString* getId() const { return mpId; } - void setId(const rtl::OUString* pfId = 0); + const OUString* getId() const { return mpId; } + void setId(const OUString* pfId = 0); /// Class access - const rtl::OUString* getClass() const { return mpClass; } - void setClass(const rtl::OUString* pfClass = 0); + const OUString* getClass() const { return mpClass; } + void setClass(const OUString* pfClass = 0); /// XmlSpace access XmlSpace getXmlSpace() const; diff --git a/svgio/inc/svgio/svgreader/svgpathnode.hxx b/svgio/inc/svgio/svgreader/svgpathnode.hxx index c149faed19f9..a9e61d3361f4 100644 --- a/svgio/inc/svgio/svgreader/svgpathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgpathnode.hxx @@ -47,7 +47,7 @@ namespace svgio virtual ~SvgPathNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// path content, set if found in current context diff --git a/svgio/inc/svgio/svgreader/svgpatternnode.hxx b/svgio/inc/svgio/svgreader/svgpatternnode.hxx index 888fd3d94fca..e70abce816dd 100644 --- a/svgio/inc/svgio/svgreader/svgpatternnode.hxx +++ b/svgio/inc/svgio/svgreader/svgpatternnode.hxx @@ -52,7 +52,7 @@ namespace svgio /// link to another pattern used as style. If maXLink /// is set, the node can be fetched on demand by using // tryToFindLink (buffered) - rtl::OUString maXLink; + OUString maXLink; const SvgPatternNode* mpXLink; /// link on demand @@ -65,7 +65,7 @@ namespace svgio virtual ~SvgPatternNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); /// global helpers void getValuesRelative(double& rfX, double& rfY, double& rfW, double& rfH, const basegfx::B2DRange& rGeoRange, SvgNode& rUser) const; diff --git a/svgio/inc/svgio/svgreader/svgpolynode.hxx b/svgio/inc/svgio/svgreader/svgpolynode.hxx index 0ce90960f6dc..f7dfe9d1051a 100644 --- a/svgio/inc/svgio/svgreader/svgpolynode.hxx +++ b/svgio/inc/svgio/svgreader/svgpolynode.hxx @@ -51,7 +51,7 @@ namespace svgio virtual ~SvgPolyNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// type read access diff --git a/svgio/inc/svgio/svgreader/svgrectnode.hxx b/svgio/inc/svgio/svgreader/svgrectnode.hxx index 01b46c9c75b1..0665770312ae 100644 --- a/svgio/inc/svgio/svgreader/svgrectnode.hxx +++ b/svgio/inc/svgio/svgreader/svgrectnode.hxx @@ -51,7 +51,7 @@ namespace svgio virtual ~SvgRectNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// x content, set if found in current context diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx index 81682ab1c243..6de635109810 100644 --- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx +++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx @@ -169,19 +169,19 @@ namespace svgio TextAnchor maTextAnchor; SvgPaint maColor; SvgNumber maOpacity; - rtl::OUString maTitle; - rtl::OUString maDesc; + OUString maTitle; + OUString maDesc; /// link to content. If set, the node can be fetched on demand - rtl::OUString maClipPathXLink; - rtl::OUString maMaskXLink; + OUString maClipPathXLink; + OUString maMaskXLink; /// link to markers. If set, the node can be fetched on demand - rtl::OUString maMarkerStartXLink; + OUString maMarkerStartXLink; const SvgMarkerNode* mpMarkerStartXLink; - rtl::OUString maMarkerMidXLink; + OUString maMarkerMidXLink; const SvgMarkerNode* mpMarkerMidXLink; - rtl::OUString maMarkerEndXLink; + OUString maMarkerEndXLink; const SvgMarkerNode* mpMarkerEndXLink; /// bitfield @@ -239,7 +239,7 @@ namespace svgio public: /// local attribute scanner - void parseStyleAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + void parseStyleAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); /// helper which does the necessary with a given path void add_text( @@ -254,10 +254,10 @@ namespace svgio const basegfx::B2DHomMatrix* pTransform) const; /// helper to evtl. link to css style - void checkForCssStyle(const rtl::OUString& rClassStr) const; + void checkForCssStyle(const OUString& rClassStr) const; /// scan helpers - void readStyle(const rtl::OUString& rCandidate); + void readStyle(const OUString& rCandidate); const SvgStyleAttributes* getParentStyle() const; SvgStyleAttributes(SvgNode& rOwner); @@ -376,35 +376,35 @@ namespace svgio void setOpacity(const SvgNumber& rOpacity = SvgNumber()) { maOpacity = rOpacity; } // Title content - const rtl::OUString& getTitle() const { return maTitle; } - void setTitle(const rtl::OUString& rNew) { maTitle = rNew; } + const OUString& getTitle() const { return maTitle; } + void setTitle(const OUString& rNew) { maTitle = rNew; } // Desc content - const rtl::OUString& getDesc() const { return maDesc; } - void setDesc(const rtl::OUString& rNew) { maDesc = rNew; } + const OUString& getDesc() const { return maDesc; } + void setDesc(const OUString& rNew) { maDesc = rNew; } // ClipPathXLink content - const rtl::OUString getClipPathXLink() const { return maClipPathXLink; } - void setClipPathXLink(const rtl::OUString& rNew) { maClipPathXLink = rNew; } + const OUString getClipPathXLink() const { return maClipPathXLink; } + void setClipPathXLink(const OUString& rNew) { maClipPathXLink = rNew; } // MaskXLink content - const rtl::OUString getMaskXLink() const { return maMaskXLink; } - void setMaskXLink(const rtl::OUString& rNew) { maMaskXLink = rNew; } + const OUString getMaskXLink() const { return maMaskXLink; } + void setMaskXLink(const OUString& rNew) { maMaskXLink = rNew; } // MarkerStartXLink content - const rtl::OUString getMarkerStartXLink() const; + const OUString getMarkerStartXLink() const; const SvgMarkerNode* accessMarkerStartXLink() const; - void setMarkerStartXLink(const rtl::OUString& rNew) { maMarkerStartXLink = rNew; } + void setMarkerStartXLink(const OUString& rNew) { maMarkerStartXLink = rNew; } // MarkerMidXLink content - const rtl::OUString getMarkerMidXLink() const; + const OUString getMarkerMidXLink() const; const SvgMarkerNode* accessMarkerMidXLink() const; - void setMarkerMidXLink(const rtl::OUString& rNew) { maMarkerMidXLink = rNew; } + void setMarkerMidXLink(const OUString& rNew) { maMarkerMidXLink = rNew; } // MarkerEndXLink content - const rtl::OUString getMarkerEndXLink() const; + const OUString getMarkerEndXLink() const; const SvgMarkerNode* accessMarkerEndXLink() const; - void setMarkerEndXLink(const rtl::OUString& rNew) { maMarkerEndXLink = rNew; } + void setMarkerEndXLink(const OUString& rNew) { maMarkerEndXLink = rNew; } }; } // end of namespace svgreader diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx b/svgio/inc/svgio/svgreader/svgstylenode.hxx index cd98d4bbd6d0..9762763e1c3e 100644 --- a/svgio/inc/svgio/svgreader/svgstylenode.hxx +++ b/svgio/inc/svgio/svgreader/svgstylenode.hxx @@ -44,8 +44,8 @@ namespace svgio SvgNode* pParent); virtual ~SvgStyleNode(); - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); - void addCssStyleSheet(const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); + void addCssStyleSheet(const OUString& aContent); /// textCss access bool isTextCss() const { return mbTextCss; } diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgio/svgreader/svgsvgnode.hxx index f052aeb2c883..02f7e50e25c9 100644 --- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgsvgnode.hxx @@ -50,7 +50,7 @@ namespace svgio virtual ~SvgSvgNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// InfoProvider support for % values diff --git a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx index c03fb288cf13..10a778e1ee56 100644 --- a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx +++ b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx @@ -45,7 +45,7 @@ namespace svgio virtual ~SvgSymbolNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); /// viewBox content const basegfx::B2DRange* getViewBox() const { return mpViewBox; } diff --git a/svgio/inc/svgio/svgreader/svgtextnode.hxx b/svgio/inc/svgio/svgreader/svgtextnode.hxx index e34ff0b78b25..9624295578c4 100644 --- a/svgio/inc/svgio/svgreader/svgtextnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtextnode.hxx @@ -57,7 +57,7 @@ namespace svgio virtual ~SvgTextNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// transform content, set if found in current context diff --git a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx index d12b63cd0c3f..900f609362db 100644 --- a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx @@ -38,7 +38,7 @@ namespace svgio /// link to path content. If maXLink /// is set, the node can be fetched on demand - rtl::OUString maXLink; + OUString maXLink; /// variable scan values, dependent of given XAttributeList SvgNumber maStartOffset; @@ -54,7 +54,7 @@ namespace svgio virtual ~SvgTextPathNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); void decomposePathNode( const drawinglayer::primitive2d::Primitive2DSequence& rPathContent, drawinglayer::primitive2d::Primitive2DSequence& rTarget, diff --git a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx b/svgio/inc/svgio/svgreader/svgtitledescnode.hxx index d84b06dab1b5..4897553eba36 100644 --- a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtitledescnode.hxx @@ -30,7 +30,7 @@ namespace svgio { private: /// contained chars - rtl::OUString maText; + OUString maText; public: SvgTitleDescNode( @@ -40,10 +40,10 @@ namespace svgio virtual ~SvgTitleDescNode(); /// add new chars - void concatenate(const rtl::OUString& rChars); + void concatenate(const OUString& rChars); /// x content, set if found in current context - const rtl::OUString& getText() const { return maText; } + const OUString& getText() const { return maText; } }; } // end of namespace svgreader } // end of namespace svgio diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx b/svgio/inc/svgio/svgreader/svgtoken.hxx index e1218620a85d..9e81c9d1697f 100644 --- a/svgio/inc/svgio/svgreader/svgtoken.hxx +++ b/svgio/inc/svgio/svgreader/svgtoken.hxx @@ -181,10 +181,10 @@ namespace svgio SVGTokenLast }; - SVGToken StrToSVGToken(const rtl::OUString& rStr); + SVGToken StrToSVGToken(const OUString& rStr); - const rtl::OUString& getStrTitle(); - const rtl::OUString& getStrDesc(); + const OUString& getStrTitle(); + const OUString& getStrDesc(); } // end of namespace svgreader } // end of namespace svgio diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgio/svgreader/svgtools.hxx index 12c70a49dd28..0dbedf87eac5 100644 --- a/svgio/inc/svgio/svgreader/svgtools.hxx +++ b/svgio/inc/svgio/svgreader/svgtools.hxx @@ -34,16 +34,16 @@ namespace svgio { #ifdef DBG_UTIL // error helper - void myAssert(const rtl::OUString& rMessage); + void myAssert(const OUString& rMessage); #endif // common non-token strings struct commonStrings { - static const rtl::OUString aStrUserSpaceOnUse; - static const rtl::OUString aStrObjectBoundingBox; - static const rtl::OUString aStrNonzero; - static const rtl::OUString aStrEvenOdd; + static const OUString aStrUserSpaceOnUse; + static const OUString aStrObjectBoundingBox; + static const OUString aStrNonzero; + static const OUString aStrEvenOdd; }; enum SvgUnits @@ -181,40 +181,40 @@ namespace svgio basegfx::B2DHomMatrix createMapping(const basegfx::B2DRange& rTarget, const basegfx::B2DRange& rSource) const; }; - void skip_char(const rtl::OUString& rCandidate, const sal_Unicode& rChar, sal_Int32& nPos, const sal_Int32 nLen); - void skip_char(const rtl::OUString& rCandidate, const sal_Unicode& rCharA, const sal_Unicode& rCharB, sal_Int32& nPos, const sal_Int32 nLen); - void copySign(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen); - void copyNumber(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen); - void copyHex(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen); - void copyString(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen); - void copyToLimiter(const rtl::OUString& rCandidate, const sal_Unicode& rLimiter, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen); - bool readNumber(const rtl::OUString& rCandidate, sal_Int32& nPos, double& fNum, const sal_Int32 nLen); - SvgUnit readUnit(const rtl::OUString& rCandidate, sal_Int32& nPos, const sal_Int32 nLen); - bool readNumberAndUnit(const rtl::OUString& rCandidate, sal_Int32& nPos, SvgNumber& aNum, const sal_Int32 nLen); - bool readAngle(const rtl::OUString& rCandidate, sal_Int32& nPos, double& fAngle, const sal_Int32 nLen); + void skip_char(const OUString& rCandidate, const sal_Unicode& rChar, sal_Int32& nPos, const sal_Int32 nLen); + void skip_char(const OUString& rCandidate, const sal_Unicode& rCharA, const sal_Unicode& rCharB, sal_Int32& nPos, const sal_Int32 nLen); + void copySign(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen); + void copyNumber(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen); + void copyHex(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen); + void copyString(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen); + void copyToLimiter(const OUString& rCandidate, const sal_Unicode& rLimiter, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen); + bool readNumber(const OUString& rCandidate, sal_Int32& nPos, double& fNum, const sal_Int32 nLen); + SvgUnit readUnit(const OUString& rCandidate, sal_Int32& nPos, const sal_Int32 nLen); + bool readNumberAndUnit(const OUString& rCandidate, sal_Int32& nPos, SvgNumber& aNum, const sal_Int32 nLen); + bool readAngle(const OUString& rCandidate, sal_Int32& nPos, double& fAngle, const sal_Int32 nLen); sal_Int32 read_hex(const sal_Unicode& rChar); - bool match_colorKeyword(basegfx::BColor& rColor, const rtl::OUString& rName); - bool read_color(const rtl::OUString& rCandidate, basegfx::BColor& rColor); - basegfx::B2DRange readViewBox(const rtl::OUString& rCandidate, InfoProvider& rInfoProvider); - basegfx::B2DHomMatrix readTransform(const rtl::OUString& rCandidate, InfoProvider& rInfoProvider); - bool readSingleNumber(const rtl::OUString& rCandidate, SvgNumber& aNum); - bool readLocalUrl(const rtl::OUString& rCandidate, rtl::OUString& rURL); - bool readSvgPaint(const rtl::OUString& rCandidate, SvgPaint& rSvgPaint, rtl::OUString& rURL); + bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName); + bool read_color(const OUString& rCandidate, basegfx::BColor& rColor); + basegfx::B2DRange readViewBox(const OUString& rCandidate, InfoProvider& rInfoProvider); + basegfx::B2DHomMatrix readTransform(const OUString& rCandidate, InfoProvider& rInfoProvider); + bool readSingleNumber(const OUString& rCandidate, SvgNumber& aNum); + bool readLocalUrl(const OUString& rCandidate, OUString& rURL); + bool readSvgPaint(const OUString& rCandidate, SvgPaint& rSvgPaint, OUString& rURL); - bool readSvgNumberVector(const rtl::OUString& rCandidate, SvgNumberVector& rSvgNumberVector); + bool readSvgNumberVector(const OUString& rCandidate, SvgNumberVector& rSvgNumberVector); ::std::vector< double > solveSvgNumberVector(const SvgNumberVector& rInput, const InfoProvider& rInfoProvider, NumberType aNumberType = length); - SvgAspectRatio readSvgAspectRatio(const rtl::OUString& rCandidate); + SvgAspectRatio readSvgAspectRatio(const OUString& rCandidate); - typedef ::std::vector< rtl::OUString > SvgStringVector; - bool readSvgStringVector(const rtl::OUString& rCandidate, SvgStringVector& rSvgStringVector); + typedef ::std::vector< OUString > SvgStringVector; + bool readSvgStringVector(const OUString& rCandidate, SvgStringVector& rSvgStringVector); - void readImageLink(const rtl::OUString& rCandidate, rtl::OUString& rXLink, rtl::OUString& rUrl, rtl::OUString& rMimeType, rtl::OUString& rData); + void readImageLink(const OUString& rCandidate, OUString& rXLink, OUString& rUrl, OUString& rMimeType, OUString& rData); - rtl::OUString convert(const rtl::OUString& rCandidate, const sal_Unicode& rPattern, const sal_Unicode& rNew, bool bRemove); - rtl::OUString consolidateContiguosSpace(const rtl::OUString& rCandidate); - rtl::OUString whiteSpaceHandlingDefault(const rtl::OUString& rCandidate); - rtl::OUString whiteSpaceHandlingPreserve(const rtl::OUString& rCandidate); + OUString convert(const OUString& rCandidate, const sal_Unicode& rPattern, const sal_Unicode& rNew, bool bRemove); + OUString consolidateContiguosSpace(const OUString& rCandidate); + OUString whiteSpaceHandlingDefault(const OUString& rCandidate); + OUString whiteSpaceHandlingPreserve(const OUString& rCandidate); } // end of namespace svgreader } // end of namespace svgio diff --git a/svgio/inc/svgio/svgreader/svgtrefnode.hxx b/svgio/inc/svgio/svgreader/svgtrefnode.hxx index e2442fb7a6f7..d9ab4e70e8dc 100644 --- a/svgio/inc/svgio/svgreader/svgtrefnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtrefnode.hxx @@ -38,7 +38,7 @@ namespace svgio /// link to text content. If maXLink /// is set, the node can be fetched on demand - rtl::OUString maXLink; + OUString maXLink; public: SvgTrefNode( @@ -47,7 +47,7 @@ namespace svgio virtual ~SvgTrefNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); /// access to referenced SvgTextNode const SvgTextNode* getReferencedSvgTextNode() const; diff --git a/svgio/inc/svgio/svgreader/svgtspannode.hxx b/svgio/inc/svgio/svgreader/svgtspannode.hxx index b48c76cd5fc6..2302485a05b5 100644 --- a/svgio/inc/svgio/svgreader/svgtspannode.hxx +++ b/svgio/inc/svgio/svgreader/svgtspannode.hxx @@ -46,7 +46,7 @@ namespace svgio virtual ~SvgTspanNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); /// access to SvgTextPositions const SvgTextPositions& getSvgTextPositions() const { return maSvgTextPositions; } diff --git a/svgio/inc/svgio/svgreader/svgusenode.hxx b/svgio/inc/svgio/svgreader/svgusenode.hxx index e53a19e90d07..dffa1a61cfb7 100644 --- a/svgio/inc/svgio/svgreader/svgusenode.hxx +++ b/svgio/inc/svgio/svgreader/svgusenode.hxx @@ -44,7 +44,7 @@ namespace svgio /// link to content. If maXLink is set, the node can be fetched // on demand - rtl::OUString maXLink; + OUString maXLink; public: SvgUseNode( @@ -53,7 +53,7 @@ namespace svgio virtual ~SvgUseNode(); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; - virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); + virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; /// transform content diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index 552db36ea939..e6a4a1982a4e 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -43,7 +43,7 @@ namespace svgio { } - void SvgTextPositions::parseTextPositionAttributes(const rtl::OUString& /*rTokenName*/, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgTextPositions::parseTextPositionAttributes(const OUString& /*rTokenName*/, SVGToken aSVGToken, const OUString& aContent) { // parse own switch(aSVGToken) @@ -130,8 +130,8 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrSpacing(rtl::OUString::createFromAscii("spacing")); - static rtl::OUString aStrSpacingAndGlyphs(rtl::OUString::createFromAscii("spacingAndGlyphs")); + static OUString aStrSpacing(OUString::createFromAscii("spacing")); + static OUString aStrSpacingAndGlyphs(OUString::createFromAscii("spacingAndGlyphs")); if(aContent.match(aStrSpacing)) { @@ -208,7 +208,7 @@ namespace svgio SvgCharacterNode::SvgCharacterNode( SvgDocument& rDocument, SvgNode* pParent, - const rtl::OUString& rText) + const OUString& rText) : SvgNode(SVGTokenCharacter, rDocument, pParent), maText(rText) { @@ -243,8 +243,8 @@ namespace svgio if(nLength) { // prepare FontAttribute - const rtl::OUString aFontFamily = rSvgStyleAttributes.getFontFamily().empty() ? - rtl::OUString(rtl::OUString::createFromAscii("Times New Roman")) : + const OUString aFontFamily = rSvgStyleAttributes.getFontFamily().empty() ? + OUString(OUString::createFromAscii("Times New Roman")) : rSvgStyleAttributes.getFontFamily()[0]; const ::FontWeight nFontWeight(getVclFontWeight(rSvgStyleAttributes.getFontWeight())); bool bSymbol(false); @@ -257,7 +257,7 @@ namespace svgio const drawinglayer::attribute::FontAttribute aFontAttribute( aFontFamily, - rtl::OUString(), + OUString(), nFontWeight, bSymbol, bVertical, @@ -520,10 +520,10 @@ namespace svgio void SvgCharacterNode::addGap() { - maText += rtl::OUString(sal_Unicode(' ')); + maText += OUString(sal_Unicode(' ')); } - void SvgCharacterNode::concatenate(const rtl::OUString& rText) + void SvgCharacterNode::concatenate(const OUString& rText) { maText += rText; } diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx index b9ef1f7bd624..4f26ae9abae2 100644 --- a/svgio/source/svgreader/svgcirclenode.cxx +++ b/svgio/source/svgreader/svgcirclenode.cxx @@ -46,13 +46,13 @@ namespace svgio const SvgStyleAttributes* SvgCircleNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("circle")); + static OUString aClassStr(OUString::createFromAscii("circle")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgCircleNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgCircleNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx index 5c271400d5f0..16a126e2dfd3 100644 --- a/svgio/source/svgreader/svgclippathnode.cxx +++ b/svgio/source/svgreader/svgclippathnode.cxx @@ -51,7 +51,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgClipPathNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgClipPathNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgdocument.cxx b/svgio/source/svgreader/svgdocument.cxx index d8c379d8b512..705df546838a 100644 --- a/svgio/source/svgreader/svgdocument.cxx +++ b/svgio/source/svgreader/svgdocument.cxx @@ -25,7 +25,7 @@ namespace svgio { namespace svgreader { - SvgDocument::SvgDocument(const rtl::OUString& rAbsolutePath) + SvgDocument::SvgDocument(const OUString& rAbsolutePath) : maNodes(), maAbsolutePath(rAbsolutePath), maIdTokenMapperList(), @@ -49,7 +49,7 @@ namespace svgio maNodes.push_back(pNode); } - void SvgDocument::addSvgNodeToMapper(const rtl::OUString& rStr, const SvgNode& rNode) + void SvgDocument::addSvgNodeToMapper(const OUString& rStr, const SvgNode& rNode) { if(rStr.getLength()) { @@ -57,7 +57,7 @@ namespace svgio } } - void SvgDocument::removeSvgNodeFromMapper(const rtl::OUString& rStr) + void SvgDocument::removeSvgNodeFromMapper(const OUString& rStr) { if(rStr.getLength()) { @@ -65,7 +65,7 @@ namespace svgio } } - const SvgNode* SvgDocument::findSvgNodeById(const rtl::OUString& rStr) const + const SvgNode* SvgDocument::findSvgNodeById(const OUString& rStr) const { const IdTokenMapper::const_iterator aResult(maIdTokenMapperList.find(rStr)); @@ -79,7 +79,7 @@ namespace svgio } } - void SvgDocument::addSvgStyleAttributesToMapper(const rtl::OUString& rStr, const SvgStyleAttributes& rSvgStyleAttributes) + void SvgDocument::addSvgStyleAttributesToMapper(const OUString& rStr, const SvgStyleAttributes& rSvgStyleAttributes) { if(rStr.getLength()) { @@ -87,7 +87,7 @@ namespace svgio } } - const SvgStyleAttributes* SvgDocument::findSvgStyleAttributesById(const rtl::OUString& rStr) const + const SvgStyleAttributes* SvgDocument::findSvgStyleAttributesById(const OUString& rStr) const { const IdStyleTokenMapper::const_iterator aResult(maIdStyleTokenMapperList.find(rStr)); diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx index 29c40b30cd30..3312221bfcaf 100644 --- a/svgio/source/svgreader/svgdocumenthandler.cxx +++ b/svgio/source/svgreader/svgdocumenthandler.cxx @@ -118,7 +118,7 @@ namespace svgio { namespace svgreader { - SvgDocHdl::SvgDocHdl(const rtl::OUString& aAbsolutePath) + SvgDocHdl::SvgDocHdl(const OUString& aAbsolutePath) : maDocument(aAbsolutePath), mpTarget(0), maCssContents() @@ -149,7 +149,7 @@ namespace svgio OSL_ENSURE(!maCssContents.size(), "SvgDocHdl endDocument with active css style stack entry (!)"); } - void SvgDocHdl::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) { if(aName.getLength()) { @@ -308,7 +308,7 @@ namespace svgio if(pNew->isTextCss()) { - maCssContents.push_back(rtl::OUString()); + maCssContents.push_back(OUString()); } break; } @@ -353,9 +353,9 @@ namespace svgio /// invalid token, ignore #ifdef DBG_UTIL myAssert( - rtl::OUString::createFromAscii("Unknown Base SvgToken <") + + OUString::createFromAscii("Unknown Base SvgToken <") + aName + - rtl::OUString::createFromAscii("> (!)")); + OUString::createFromAscii("> (!)")); #endif break; } @@ -363,7 +363,7 @@ namespace svgio } } - void SvgDocHdl::endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) { if(aName.getLength()) { @@ -449,7 +449,7 @@ namespace svgio if(pSvgTitleDescNode && mpTarget) { - const rtl::OUString aText(pSvgTitleDescNode->getText()); + const OUString aText(pSvgTitleDescNode->getText()); if(aText.getLength()) { @@ -487,7 +487,7 @@ namespace svgio } } - void SvgDocHdl::characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) { const sal_uInt32 nLength(aChars.getLength()); @@ -529,11 +529,11 @@ namespace svgio // collect characters for css style if(maCssContents.size()) { - const ::rtl::OUString aTrimmedChars(aChars.trim()); + const OUString aTrimmedChars(aChars.trim()); if(aTrimmedChars.getLength()) { - std::vector< rtl::OUString >::iterator aString(maCssContents.end() - 1); + std::vector< OUString >::iterator aString(maCssContents.end() - 1); (*aString) += aTrimmedChars; } } @@ -562,11 +562,11 @@ namespace svgio } } - void SvgDocHdl::ignorableWhitespace(const ::rtl::OUString& /*aWhitespaces*/) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (xml::sax::SAXException, uno::RuntimeException) { } - void SvgDocHdl::processingInstruction(const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (xml::sax::SAXException, uno::RuntimeException) { } diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx index f34edb244f4a..12289929dbd8 100644 --- a/svgio/source/svgreader/svgellipsenode.cxx +++ b/svgio/source/svgreader/svgellipsenode.cxx @@ -47,13 +47,13 @@ namespace svgio const SvgStyleAttributes* SvgEllipseNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("ellipse")); + static OUString aClassStr(OUString::createFromAscii("ellipse")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgEllipseNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgEllipseNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx index df2ad5aed125..80a0fa141d96 100644 --- a/svgio/source/svgreader/svggnode.cxx +++ b/svgio/source/svgreader/svggnode.cxx @@ -45,13 +45,13 @@ namespace svgio const SvgStyleAttributes* SvgGNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("g")); + static OUString aClassStr(OUString::createFromAscii("g")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgGNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgGNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx index 74878d1ecb9e..215ce391b460 100644 --- a/svgio/source/svgreader/svggradientnode.cxx +++ b/svgio/source/svgreader/svggradientnode.cxx @@ -69,7 +69,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgGradientNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgGradientNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); @@ -197,9 +197,9 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrPad(rtl::OUString::createFromAscii("pad")); - static rtl::OUString aStrReflect(rtl::OUString::createFromAscii("reflect")); - static rtl::OUString aStrRepeat(rtl::OUString::createFromAscii("repeat")); + static OUString aStrPad(OUString::createFromAscii("pad")); + static OUString aStrReflect(OUString::createFromAscii("reflect")); + static OUString aStrRepeat(OUString::createFromAscii("repeat")); if(aContent.match(aStrPad, 0)) { diff --git a/svgio/source/svgreader/svggradientstopnode.cxx b/svgio/source/svgreader/svggradientstopnode.cxx index cf9b069395d5..f9a9289f3bbc 100644 --- a/svgio/source/svgreader/svggradientstopnode.cxx +++ b/svgio/source/svgreader/svggradientstopnode.cxx @@ -43,7 +43,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgGradientStopNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgGradientStopNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx index 8e933c0f32c5..952472c1cff4 100644 --- a/svgio/source/svgreader/svgimagenode.cxx +++ b/svgio/source/svgreader/svgimagenode.cxx @@ -64,13 +64,13 @@ namespace svgio const SvgStyleAttributes* SvgImageNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("image")); + static OUString aClassStr(OUString::createFromAscii("image")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgImageNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgImageNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); @@ -236,8 +236,8 @@ namespace svgio } else if(maUrl.getLength()) { - const rtl::OUString& rPath = getDocument().getAbsolutePath(); - const rtl::OUString aAbsUrl(rtl::Uri::convertRelToAbs(rPath, maUrl)); + const OUString& rPath = getDocument().getAbsolutePath(); + const OUString aAbsUrl(rtl::Uri::convertRelToAbs(rPath, maUrl)); if(aAbsUrl.getLength()) { diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx index bd8ad988635c..877bd222014d 100644 --- a/svgio/source/svgreader/svglinenode.cxx +++ b/svgio/source/svgreader/svglinenode.cxx @@ -47,13 +47,13 @@ namespace svgio const SvgStyleAttributes* SvgLineNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("line")); + static OUString aClassStr(OUString::createFromAscii("line")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgLineNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgLineNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgmarkernode.cxx b/svgio/source/svgreader/svgmarkernode.cxx index 444ff3266420..5ee664d08e42 100644 --- a/svgio/source/svgreader/svgmarkernode.cxx +++ b/svgio/source/svgreader/svgmarkernode.cxx @@ -50,13 +50,13 @@ namespace svgio const SvgStyleAttributes* SvgMarkerNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("marker")); + static OUString aClassStr(OUString::createFromAscii("marker")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgMarkerNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgMarkerNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); @@ -111,7 +111,7 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrStrokeWidth(rtl::OUString::createFromAscii("strokeWidth")); + static OUString aStrStrokeWidth(OUString::createFromAscii("strokeWidth")); if(aContent.match(aStrStrokeWidth, 0)) { @@ -156,7 +156,7 @@ namespace svgio if(nLen) { - static rtl::OUString aStrAuto(rtl::OUString::createFromAscii("auto")); + static OUString aStrAuto(OUString::createFromAscii("auto")); if(aContent.match(aStrAuto, 0)) { diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx index bc1ac3243e85..831cf3990e9c 100644 --- a/svgio/source/svgreader/svgmasknode.cxx +++ b/svgio/source/svgreader/svgmasknode.cxx @@ -58,7 +58,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgMaskNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgMaskNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx index 639aa0cafadb..d00beaf1908f 100644 --- a/svgio/source/svgreader/svgnode.cxx +++ b/svgio/source/svgreader/svgnode.cxx @@ -83,13 +83,13 @@ namespace svgio for(sal_uInt32 a(0); a < nAttributes; a++) { - const ::rtl::OUString aTokenName(xAttribs->getNameByIndex(a)); + const OUString aTokenName(xAttribs->getNameByIndex(a)); parseAttribute(aTokenName, StrToSVGToken(aTokenName), xAttribs->getValueByIndex(a)); } } - void SvgNode::parseAttribute(const rtl::OUString& /*rTokenName*/, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgNode::parseAttribute(const OUString& /*rTokenName*/, SVGToken aSVGToken, const OUString& aContent) { switch(aSVGToken) { @@ -113,8 +113,8 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrDefault(rtl::OUString::createFromAscii("default")); - static rtl::OUString aStrPreserve(rtl::OUString::createFromAscii("preserve")); + static OUString aStrDefault(OUString::createFromAscii("default")); + static OUString aStrPreserve(OUString::createFromAscii("preserve")); if(aContent.match(aStrDefault)) { @@ -193,13 +193,13 @@ namespace svgio if(pStyles) { // check if we have Title or Desc - const rtl::OUString& rTitle = pStyles->getTitle(); - const rtl::OUString& rDesc = pStyles->getDesc(); + const OUString& rTitle = pStyles->getTitle(); + const OUString& rDesc = pStyles->getDesc(); if(rTitle.getLength() || rDesc.getLength()) { // default object name is empty - rtl::OUString aObjectName; + OUString aObjectName; // use path as object name when outmost element if(SVGTokenSvg == getType()) @@ -277,7 +277,7 @@ namespace svgio } } - void SvgNode::setId(const rtl::OUString* pfId) + void SvgNode::setId(const OUString* pfId) { if(mpId) { @@ -288,12 +288,12 @@ namespace svgio if(pfId) { - mpId = new rtl::OUString(*pfId); + mpId = new OUString(*pfId); mrDocument.addSvgNodeToMapper(*mpId, *this); } } - void SvgNode::setClass(const rtl::OUString* pfClass) + void SvgNode::setClass(const OUString* pfClass) { if(mpClass) { @@ -304,7 +304,7 @@ namespace svgio if(pfClass) { - mpClass = new rtl::OUString(*pfClass); + mpClass = new OUString(*pfClass); mrDocument.addSvgNodeToMapper(*mpClass, *this); } } diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx index cd66017a5765..a50beefc306c 100644 --- a/svgio/source/svgreader/svgpathnode.cxx +++ b/svgio/source/svgreader/svgpathnode.cxx @@ -45,13 +45,13 @@ namespace svgio const SvgStyleAttributes* SvgPathNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("path")); + static OUString aClassStr(OUString::createFromAscii("path")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgPathNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgPathNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx index 6aa7a7cd63a3..c507bd3ffdf3 100644 --- a/svgio/source/svgreader/svgpatternnode.cxx +++ b/svgio/source/svgreader/svgpatternnode.cxx @@ -64,13 +64,13 @@ namespace svgio const SvgStyleAttributes* SvgPatternNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("pattern")); + static OUString aClassStr(OUString::createFromAscii("pattern")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgPatternNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgPatternNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx index a814402d46f8..3100fc30a00e 100644 --- a/svgio/source/svgreader/svgpolynode.cxx +++ b/svgio/source/svgreader/svgpolynode.cxx @@ -47,14 +47,14 @@ namespace svgio const SvgStyleAttributes* SvgPolyNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStrA(rtl::OUString::createFromAscii("polygon")); - static rtl::OUString aClassStrB(rtl::OUString::createFromAscii("polyline")); + static OUString aClassStrA(OUString::createFromAscii("polygon")); + static OUString aClassStrB(OUString::createFromAscii("polyline")); maSvgStyleAttributes.checkForCssStyle(mbIsPolyline? aClassStrB : aClassStrA); return &maSvgStyleAttributes; } - void SvgPolyNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgPolyNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx index e826b8546f03..c3948164e342 100644 --- a/svgio/source/svgreader/svgrectnode.cxx +++ b/svgio/source/svgreader/svgrectnode.cxx @@ -49,13 +49,13 @@ namespace svgio const SvgStyleAttributes* SvgRectNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("rect")); + static OUString aClassStr(OUString::createFromAscii("rect")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgRectNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgRectNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index f5370729d56e..a64e66e0b734 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -171,7 +171,7 @@ namespace svgio return nRetval; } - void SvgStyleAttributes::readStyle(const rtl::OUString& rCandidate) + void SvgStyleAttributes::readStyle(const OUString& rCandidate) { const sal_Int32 nLen(rCandidate.getLength()); sal_Int32 nPos(0); @@ -180,17 +180,17 @@ namespace svgio { const sal_Int32 nInitPos(nPos); skip_char(rCandidate, sal_Unicode(' '), nPos, nLen); - rtl::OUStringBuffer aTokenName; + OUStringBuffer aTokenName; copyString(rCandidate, nPos, aTokenName, nLen); if(aTokenName.getLength()) { skip_char(rCandidate, sal_Unicode(' '), sal_Unicode(':'), nPos, nLen); - rtl::OUStringBuffer aTokenValue; + OUStringBuffer aTokenValue; copyToLimiter(rCandidate, sal_Unicode(';'), nPos, aTokenValue, nLen); skip_char(rCandidate, sal_Unicode(' '), sal_Unicode(';'), nPos, nLen); - const rtl::OUString aOUTokenName(aTokenName.makeStringAndClear()); - const rtl::OUString aOUTokenValue(aTokenValue.makeStringAndClear()); + const OUString aOUTokenName(aTokenName.makeStringAndClear()); + const OUString aOUTokenValue(aTokenValue.makeStringAndClear()); parseStyleAttribute(aOUTokenName, StrToSVGToken(aOUTokenName), aOUTokenValue); } @@ -203,7 +203,7 @@ namespace svgio } } - void SvgStyleAttributes::checkForCssStyle(const rtl::OUString& rClassStr) const + void SvgStyleAttributes::checkForCssStyle(const OUString& rClassStr) const { if(!mpCssStyleParent) { @@ -214,7 +214,7 @@ namespace svgio { if(mrOwner.getClass()) { - rtl::OUString aId(rtl::OUString::createFromAscii(".")); + OUString aId(OUString::createFromAscii(".")); aId = aId + *mrOwner.getClass(); pNew = rDocument.findSvgStyleAttributesById(aId); @@ -1216,14 +1216,14 @@ namespace svgio { } - void SvgStyleAttributes::parseStyleAttribute(const rtl::OUString& /*rTokenName*/, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgStyleAttributes::parseStyleAttribute(const OUString& /*rTokenName*/, SVGToken aSVGToken, const OUString& aContent) { switch(aSVGToken) { case SVGTokenFill: { SvgPaint aSvgPaint; - rtl::OUString aURL; + OUString aURL; if(readSvgPaint(aContent, aSvgPaint, aURL)) { @@ -1280,7 +1280,7 @@ namespace svgio case SVGTokenStroke: { SvgPaint aSvgPaint; - rtl::OUString aURL; + OUString aURL; if(readSvgPaint(aContent, aSvgPaint, aURL)) { @@ -1334,9 +1334,9 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrButt(rtl::OUString::createFromAscii("butt")); - static rtl::OUString aStrRound(rtl::OUString::createFromAscii("round")); - static rtl::OUString aStrSquare(rtl::OUString::createFromAscii("square")); + static OUString aStrButt(OUString::createFromAscii("butt")); + static OUString aStrRound(OUString::createFromAscii("round")); + static OUString aStrSquare(OUString::createFromAscii("square")); if(aContent.match(aStrButt)) { @@ -1357,9 +1357,9 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrMiter(rtl::OUString::createFromAscii("miter")); - static rtl::OUString aStrRound(rtl::OUString::createFromAscii("round")); - static rtl::OUString aStrBevel(rtl::OUString::createFromAscii("bevel")); + static OUString aStrMiter(OUString::createFromAscii("miter")); + static OUString aStrRound(OUString::createFromAscii("round")); + static OUString aStrBevel(OUString::createFromAscii("bevel")); if(aContent.match(aStrMiter)) { @@ -1418,7 +1418,7 @@ namespace svgio case SVGTokenStopColor: { SvgPaint aSvgPaint; - rtl::OUString aURL; + OUString aURL; if(readSvgPaint(aContent, aSvgPaint, aURL)) { @@ -1471,17 +1471,17 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrNormal(rtl::OUString::createFromAscii("normal")); - static rtl::OUString aStrWider(rtl::OUString::createFromAscii("wider")); - static rtl::OUString aStrNarrower(rtl::OUString::createFromAscii("narrower")); - static rtl::OUString aStrUltra_condensed(rtl::OUString::createFromAscii("ultra-condensed")); - static rtl::OUString aStrExtra_condensed(rtl::OUString::createFromAscii("extra-condensed")); - static rtl::OUString aStrCondensed(rtl::OUString::createFromAscii("condensed")); - static rtl::OUString aStrSemi_condensed(rtl::OUString::createFromAscii("semi-condensed")); - static rtl::OUString aStrSemi_expanded(rtl::OUString::createFromAscii("semi-expanded")); - static rtl::OUString aStrExpanded(rtl::OUString::createFromAscii("expanded")); - static rtl::OUString aStrExtra_expanded(rtl::OUString::createFromAscii("extra-expanded")); - static rtl::OUString aStrUltra_expanded(rtl::OUString::createFromAscii("ultra-expanded")); + static OUString aStrNormal(OUString::createFromAscii("normal")); + static OUString aStrWider(OUString::createFromAscii("wider")); + static OUString aStrNarrower(OUString::createFromAscii("narrower")); + static OUString aStrUltra_condensed(OUString::createFromAscii("ultra-condensed")); + static OUString aStrExtra_condensed(OUString::createFromAscii("extra-condensed")); + static OUString aStrCondensed(OUString::createFromAscii("condensed")); + static OUString aStrSemi_condensed(OUString::createFromAscii("semi-condensed")); + static OUString aStrSemi_expanded(OUString::createFromAscii("semi-expanded")); + static OUString aStrExpanded(OUString::createFromAscii("expanded")); + static OUString aStrExtra_expanded(OUString::createFromAscii("extra-expanded")); + static OUString aStrUltra_expanded(OUString::createFromAscii("ultra-expanded")); if(aContent.match(aStrNormal)) { @@ -1534,9 +1534,9 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrNormal(rtl::OUString::createFromAscii("normal")); - static rtl::OUString aStrItalic(rtl::OUString::createFromAscii("italic")); - static rtl::OUString aStrOblique(rtl::OUString::createFromAscii("oblique")); + static OUString aStrNormal(OUString::createFromAscii("normal")); + static OUString aStrItalic(OUString::createFromAscii("italic")); + static OUString aStrOblique(OUString::createFromAscii("oblique")); if(aContent.match(aStrNormal)) { @@ -1557,8 +1557,8 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrNormal(rtl::OUString::createFromAscii("normal")); - static rtl::OUString aStrSmallCaps(rtl::OUString::createFromAscii("small-caps")); + static OUString aStrNormal(OUString::createFromAscii("normal")); + static OUString aStrSmallCaps(OUString::createFromAscii("small-caps")); if(aContent.match(aStrNormal)) { @@ -1575,19 +1575,19 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrNormal(rtl::OUString::createFromAscii("normal")); - static rtl::OUString aStrBold(rtl::OUString::createFromAscii("bold")); - static rtl::OUString aStrBolder(rtl::OUString::createFromAscii("bolder")); - static rtl::OUString aStrLighter(rtl::OUString::createFromAscii("lighter")); - static rtl::OUString aStr100(rtl::OUString::createFromAscii("100")); - static rtl::OUString aStr200(rtl::OUString::createFromAscii("200")); - static rtl::OUString aStr300(rtl::OUString::createFromAscii("300")); - static rtl::OUString aStr400(rtl::OUString::createFromAscii("400")); - static rtl::OUString aStr500(rtl::OUString::createFromAscii("500")); - static rtl::OUString aStr600(rtl::OUString::createFromAscii("600")); - static rtl::OUString aStr700(rtl::OUString::createFromAscii("700")); - static rtl::OUString aStr800(rtl::OUString::createFromAscii("800")); - static rtl::OUString aStr900(rtl::OUString::createFromAscii("900")); + static OUString aStrNormal(OUString::createFromAscii("normal")); + static OUString aStrBold(OUString::createFromAscii("bold")); + static OUString aStrBolder(OUString::createFromAscii("bolder")); + static OUString aStrLighter(OUString::createFromAscii("lighter")); + static OUString aStr100(OUString::createFromAscii("100")); + static OUString aStr200(OUString::createFromAscii("200")); + static OUString aStr300(OUString::createFromAscii("300")); + static OUString aStr400(OUString::createFromAscii("400")); + static OUString aStr500(OUString::createFromAscii("500")); + static OUString aStr600(OUString::createFromAscii("600")); + static OUString aStr700(OUString::createFromAscii("700")); + static OUString aStr800(OUString::createFromAscii("800")); + static OUString aStr900(OUString::createFromAscii("900")); if(aContent.match(aStr100)) { @@ -1648,11 +1648,11 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrNone(rtl::OUString::createFromAscii("none")); - static rtl::OUString aStrUnderline(rtl::OUString::createFromAscii("underline")); - static rtl::OUString aStrOverline(rtl::OUString::createFromAscii("overline")); - static rtl::OUString aStrLineThrough(rtl::OUString::createFromAscii("line-through")); - static rtl::OUString aStrBlink(rtl::OUString::createFromAscii("blink")); + static OUString aStrNone(OUString::createFromAscii("none")); + static OUString aStrUnderline(OUString::createFromAscii("underline")); + static OUString aStrOverline(OUString::createFromAscii("overline")); + static OUString aStrLineThrough(OUString::createFromAscii("line-through")); + static OUString aStrBlink(OUString::createFromAscii("blink")); if(aContent.match(aStrNone)) { @@ -1689,9 +1689,9 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrStart(rtl::OUString::createFromAscii("start")); - static rtl::OUString aStrMiddle(rtl::OUString::createFromAscii("middle")); - static rtl::OUString aStrEnd(rtl::OUString::createFromAscii("end")); + static OUString aStrStart(OUString::createFromAscii("start")); + static OUString aStrMiddle(OUString::createFromAscii("middle")); + static OUString aStrEnd(OUString::createFromAscii("end")); if(aContent.match(aStrStart)) { @@ -1712,10 +1712,10 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrLeft(rtl::OUString::createFromAscii("left")); - static rtl::OUString aStrRight(rtl::OUString::createFromAscii("right")); - static rtl::OUString aStrCenter(rtl::OUString::createFromAscii("center")); - static rtl::OUString aStrJustify(rtl::OUString::createFromAscii("justify")); + static OUString aStrLeft(OUString::createFromAscii("left")); + static OUString aStrRight(OUString::createFromAscii("right")); + static OUString aStrCenter(OUString::createFromAscii("center")); + static OUString aStrJustify(OUString::createFromAscii("justify")); if(aContent.match(aStrLeft)) { @@ -1739,7 +1739,7 @@ namespace svgio case SVGTokenColor: { SvgPaint aSvgPaint; - rtl::OUString aURL; + OUString aURL; if(readSvgPaint(aContent, aSvgPaint, aURL)) { @@ -2381,7 +2381,7 @@ namespace svgio return 0; } - const rtl::OUString SvgStyleAttributes::getMarkerStartXLink() const + const OUString SvgStyleAttributes::getMarkerStartXLink() const { if(maMarkerStartXLink.getLength()) { @@ -2395,14 +2395,14 @@ namespace svgio return pSvgStyleAttributes->getMarkerStartXLink(); } - return rtl::OUString(); + return OUString(); } const SvgMarkerNode* SvgStyleAttributes::accessMarkerStartXLink() const { if(!mpMarkerStartXLink) { - const rtl::OUString aMarker(getMarkerStartXLink()); + const OUString aMarker(getMarkerStartXLink()); if(aMarker.getLength()) { @@ -2413,7 +2413,7 @@ namespace svgio return mpMarkerStartXLink; } - const rtl::OUString SvgStyleAttributes::getMarkerMidXLink() const + const OUString SvgStyleAttributes::getMarkerMidXLink() const { if(maMarkerMidXLink.getLength()) { @@ -2427,14 +2427,14 @@ namespace svgio return pSvgStyleAttributes->getMarkerMidXLink(); } - return rtl::OUString(); + return OUString(); } const SvgMarkerNode* SvgStyleAttributes::accessMarkerMidXLink() const { if(!mpMarkerMidXLink) { - const rtl::OUString aMarker(getMarkerMidXLink()); + const OUString aMarker(getMarkerMidXLink()); if(aMarker.getLength()) { @@ -2445,7 +2445,7 @@ namespace svgio return mpMarkerMidXLink; } - const rtl::OUString SvgStyleAttributes::getMarkerEndXLink() const + const OUString SvgStyleAttributes::getMarkerEndXLink() const { if(maMarkerEndXLink.getLength()) { @@ -2459,14 +2459,14 @@ namespace svgio return pSvgStyleAttributes->getMarkerEndXLink(); } - return rtl::OUString(); + return OUString(); } const SvgMarkerNode* SvgStyleAttributes::accessMarkerEndXLink() const { if(!mpMarkerEndXLink) { - const rtl::OUString aMarker(getMarkerEndXLink()); + const OUString aMarker(getMarkerEndXLink()); if(aMarker.getLength()) { diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx index 9060ac0b9a7d..13d5085d98cb 100644 --- a/svgio/source/svgreader/svgstylenode.cxx +++ b/svgio/source/svgreader/svgstylenode.cxx @@ -44,7 +44,7 @@ namespace svgio } } - void SvgStyleNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgStyleNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); @@ -56,7 +56,7 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrTextCss(rtl::OUString::createFromAscii("text/css")); + static OUString aStrTextCss(OUString::createFromAscii("text/css")); if(aContent.match(aStrTextCss)) { @@ -72,28 +72,28 @@ namespace svgio } } - void SvgStyleNode::addCssStyleSheet(const rtl::OUString& aContent) + void SvgStyleNode::addCssStyleSheet(const OUString& aContent) { const sal_Int32 nLen(aContent.getLength()); if(nLen) { sal_Int32 nPos(0); - rtl::OUStringBuffer aTokenValue; + OUStringBuffer aTokenValue; while(nPos < nLen) { const sal_Int32 nInitPos(nPos); skip_char(aContent, sal_Unicode(' '), sal_Unicode('#'), nPos, nLen); copyToLimiter(aContent, sal_Unicode('{'), nPos, aTokenValue, nLen); - const rtl::OUString aStyleName = aTokenValue.makeStringAndClear().trim(); + const OUString aStyleName = aTokenValue.makeStringAndClear().trim(); if(aStyleName.getLength() && nPos < nLen) { skip_char(aContent, sal_Unicode(' '), sal_Unicode('{'), nPos, nLen); copyToLimiter(aContent, sal_Unicode('}'), nPos, aTokenValue, nLen); skip_char(aContent, sal_Unicode(' '), sal_Unicode('}'), nPos, nLen); - const rtl::OUString aStyleContent = aTokenValue.makeStringAndClear().trim(); + const OUString aStyleContent = aTokenValue.makeStringAndClear().trim(); if(aStyleContent.getLength()) { diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx index ecf74d9bb4a6..dc4d619290f6 100644 --- a/svgio/source/svgreader/svgsvgnode.cxx +++ b/svgio/source/svgreader/svgsvgnode.cxx @@ -63,7 +63,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgSvgNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgSvgNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx index 2c8ec2ef8149..0f780836208b 100644 --- a/svgio/source/svgreader/svgsymbolnode.cxx +++ b/svgio/source/svgreader/svgsymbolnode.cxx @@ -47,7 +47,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgSymbolNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgSymbolNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx index 8340abd31d98..17cbd901e29d 100644 --- a/svgio/source/svgreader/svgtextnode.cxx +++ b/svgio/source/svgreader/svgtextnode.cxx @@ -49,13 +49,13 @@ namespace svgio const SvgStyleAttributes* SvgTextNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("text")); + static OUString aClassStr(OUString::createFromAscii("text")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgTextNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgTextNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx index 4fb8e090cab7..e01c70b495a3 100644 --- a/svgio/source/svgreader/svgtextpathnode.cxx +++ b/svgio/source/svgreader/svgtextpathnode.cxx @@ -155,8 +155,8 @@ namespace svgio if(basegfx::fTools::more(fSnippetWidth, 0.0)) { - const ::rtl::OUString aText(getSource().getText()); - const ::rtl::OUString aTrimmedChars(aText.copy(nIndex, nLength).trim()); + const OUString aText(getSource().getText()); + const OUString aTrimmedChars(aText.copy(nIndex, nLength).trim()); const double fEndPos(mfPosition + fSnippetWidth); if(aTrimmedChars.getLength() && (mfPosition < mfBasegfxPathLength || fEndPos > 0.0)) @@ -269,7 +269,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgTextPathNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgTextPathNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); @@ -302,8 +302,8 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrAlign(rtl::OUString::createFromAscii("align")); - static rtl::OUString aStrStretch(rtl::OUString::createFromAscii("stretch")); + static OUString aStrAlign(OUString::createFromAscii("align")); + static OUString aStrStretch(OUString::createFromAscii("stretch")); if(aContent.match(aStrAlign)) { @@ -320,8 +320,8 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrAuto(rtl::OUString::createFromAscii("auto")); - static rtl::OUString aStrExact(rtl::OUString::createFromAscii("exact")); + static OUString aStrAuto(OUString::createFromAscii("auto")); + static OUString aStrExact(OUString::createFromAscii("exact")); if(aContent.match(aStrAuto)) { diff --git a/svgio/source/svgreader/svgtitledescnode.cxx b/svgio/source/svgreader/svgtitledescnode.cxx index 2a5b546980ac..3501c798ac56 100644 --- a/svgio/source/svgreader/svgtitledescnode.cxx +++ b/svgio/source/svgreader/svgtitledescnode.cxx @@ -37,7 +37,7 @@ namespace svgio { } - void SvgTitleDescNode::concatenate(const rtl::OUString& rChars) + void SvgTitleDescNode::concatenate(const OUString& rChars) { maText += rChars; } diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx index 44b20d49f2d6..cbb171b51d14 100644 --- a/svgio/source/svgreader/svgtoken.cxx +++ b/svgio/source/svgreader/svgtoken.cxx @@ -25,145 +25,145 @@ namespace svgio { namespace svgreader { - static rtl::OUString aSVGStrWidth(rtl::OUString::createFromAscii("width")); - static rtl::OUString aSVGStrHeight(rtl::OUString::createFromAscii("height")); - static rtl::OUString aSVGStrViewBox(rtl::OUString::createFromAscii("viewBox")); - static rtl::OUString aSVGStrTransform(rtl::OUString::createFromAscii("transform")); - static rtl::OUString aSVGStrStyle(rtl::OUString::createFromAscii("style")); - static rtl::OUString aSVGStrD(rtl::OUString::createFromAscii("d")); - static rtl::OUString aSVGStrX(rtl::OUString::createFromAscii("x")); - static rtl::OUString aSVGStrY(rtl::OUString::createFromAscii("y")); - static rtl::OUString aSVGStrXmlns(rtl::OUString::createFromAscii("xmlns")); - static rtl::OUString aSVGStrVersion(rtl::OUString::createFromAscii("version")); - static rtl::OUString aSVGStrId(rtl::OUString::createFromAscii("id")); - static rtl::OUString aSVGStrRx(rtl::OUString::createFromAscii("rx")); - static rtl::OUString aSVGStrRy(rtl::OUString::createFromAscii("ry")); - static rtl::OUString aSVGStrPoints(rtl::OUString::createFromAscii("points")); - static rtl::OUString aSVGStrDx(rtl::OUString::createFromAscii("dx")); - static rtl::OUString aSVGStrDy(rtl::OUString::createFromAscii("dy")); - static rtl::OUString aSVGStrRotate(rtl::OUString::createFromAscii("rotate")); - static rtl::OUString aSVGStrTextLength(rtl::OUString::createFromAscii("textLength")); - static rtl::OUString aSVGStrLengthAdjust(rtl::OUString::createFromAscii("lengthAdjust")); - static rtl::OUString aSVGStrFont(rtl::OUString::createFromAscii("font")); - static rtl::OUString aSVGStrFontFamily(rtl::OUString::createFromAscii("font-family")); - static rtl::OUString aSVGStrFontSize(rtl::OUString::createFromAscii("font-size")); - static rtl::OUString aSVGStrFontSizeAdjust(rtl::OUString::createFromAscii("font-size-adjust")); - static rtl::OUString aSVGStrFontStretch(rtl::OUString::createFromAscii("font-stretch")); - static rtl::OUString aSVGStrFontStyle(rtl::OUString::createFromAscii("font-style")); - static rtl::OUString aSVGStrFontVariant(rtl::OUString::createFromAscii("font-variant")); - static rtl::OUString aSVGStrFontWeight(rtl::OUString::createFromAscii("font-weight")); - static rtl::OUString aSVGStrDirection(rtl::OUString::createFromAscii("direction")); - static rtl::OUString aSVGStrLetterSpacing(rtl::OUString::createFromAscii("letter-spacing")); - static rtl::OUString aSVGStrTextDecoration(rtl::OUString::createFromAscii("text-decoration")); - static rtl::OUString aSVGStrUnicodeBidi(rtl::OUString::createFromAscii("unicode-bidi")); - static rtl::OUString aSVGStrWordSpacing(rtl::OUString::createFromAscii("word-spacing")); - static rtl::OUString aSVGStrTspan(rtl::OUString::createFromAscii("tspan")); - static rtl::OUString aSVGStrTref(rtl::OUString::createFromAscii("tref")); - static rtl::OUString aSVGStrTextPath(rtl::OUString::createFromAscii("textPath")); - static rtl::OUString aSVGStrStartOffset(rtl::OUString::createFromAscii("startOffset")); - static rtl::OUString aSVGStrMethod(rtl::OUString::createFromAscii("method")); - static rtl::OUString aSVGStrSpacing(rtl::OUString::createFromAscii("spacing")); - static rtl::OUString aSVGStrTextAlign(rtl::OUString::createFromAscii("text-align")); - static rtl::OUString aSVGStrPathLength(rtl::OUString::createFromAscii("pathLength")); - static rtl::OUString aSVGStrType(rtl::OUString::createFromAscii("type")); - static rtl::OUString aSVGStrClass(rtl::OUString::createFromAscii("class")); - static rtl::OUString aSVGStrTextAnchor(rtl::OUString::createFromAscii("text-anchor")); - static rtl::OUString aSVGStrXmlSpace(rtl::OUString::createFromAscii("xml:space")); - static rtl::OUString aSVGStrColor(rtl::OUString::createFromAscii("color")); - static rtl::OUString aSVGStrClipPathNode(rtl::OUString::createFromAscii("clipPath")); - static rtl::OUString aSVGStrClipPathProperty(rtl::OUString::createFromAscii("clip-path")); - static rtl::OUString aSVGStrMask(rtl::OUString::createFromAscii("mask")); - static rtl::OUString aSVGStrClipPathUnits(rtl::OUString::createFromAscii("clipPathUnits")); - static rtl::OUString aSVGStrMaskUnits(rtl::OUString::createFromAscii("maskUnits")); - static rtl::OUString aSVGStrMaskContentUnits(rtl::OUString::createFromAscii("maskContentUnits")); - static rtl::OUString aSVGStrClipRule(rtl::OUString::createFromAscii("clip-rule")); - static rtl::OUString aSVGStrMarker(rtl::OUString::createFromAscii("marker")); - static rtl::OUString aSVGStrMarkerStart(rtl::OUString::createFromAscii("marker-start")); - static rtl::OUString aSVGStrMarkerMid(rtl::OUString::createFromAscii("marker-mid")); - static rtl::OUString aSVGStrMarkerEnd(rtl::OUString::createFromAscii("marker-end")); - static rtl::OUString aSVGStrRefX(rtl::OUString::createFromAscii("refX")); - static rtl::OUString aSVGStrRefY(rtl::OUString::createFromAscii("refY")); - static rtl::OUString aSVGStrMarkerUnits(rtl::OUString::createFromAscii("markerUnits")); - static rtl::OUString aSVGStrMarkerWidth(rtl::OUString::createFromAscii("markerWidth")); - static rtl::OUString aSVGStrMarkerHeight(rtl::OUString::createFromAscii("markerHeight")); - static rtl::OUString aSVGStrOrient(rtl::OUString::createFromAscii("orient")); - static rtl::OUString aSVGStrPattern(rtl::OUString::createFromAscii("pattern")); - static rtl::OUString aSVGStrPatternUnits(rtl::OUString::createFromAscii("patternUnits")); - static rtl::OUString aSVGStrPatternContentUnits(rtl::OUString::createFromAscii("patternContentUnits")); - static rtl::OUString aSVGStrPatternTransform(rtl::OUString::createFromAscii("patternTransform")); - static rtl::OUString aSVGStrOpacity(rtl::OUString::createFromAscii("opacity")); - static rtl::OUString aSVGStrTitle(rtl::OUString::createFromAscii("title")); - static rtl::OUString aSVGStrDesc(rtl::OUString::createFromAscii("desc")); + static OUString aSVGStrWidth(OUString::createFromAscii("width")); + static OUString aSVGStrHeight(OUString::createFromAscii("height")); + static OUString aSVGStrViewBox(OUString::createFromAscii("viewBox")); + static OUString aSVGStrTransform(OUString::createFromAscii("transform")); + static OUString aSVGStrStyle(OUString::createFromAscii("style")); + static OUString aSVGStrD(OUString::createFromAscii("d")); + static OUString aSVGStrX(OUString::createFromAscii("x")); + static OUString aSVGStrY(OUString::createFromAscii("y")); + static OUString aSVGStrXmlns(OUString::createFromAscii("xmlns")); + static OUString aSVGStrVersion(OUString::createFromAscii("version")); + static OUString aSVGStrId(OUString::createFromAscii("id")); + static OUString aSVGStrRx(OUString::createFromAscii("rx")); + static OUString aSVGStrRy(OUString::createFromAscii("ry")); + static OUString aSVGStrPoints(OUString::createFromAscii("points")); + static OUString aSVGStrDx(OUString::createFromAscii("dx")); + static OUString aSVGStrDy(OUString::createFromAscii("dy")); + static OUString aSVGStrRotate(OUString::createFromAscii("rotate")); + static OUString aSVGStrTextLength(OUString::createFromAscii("textLength")); + static OUString aSVGStrLengthAdjust(OUString::createFromAscii("lengthAdjust")); + static OUString aSVGStrFont(OUString::createFromAscii("font")); + static OUString aSVGStrFontFamily(OUString::createFromAscii("font-family")); + static OUString aSVGStrFontSize(OUString::createFromAscii("font-size")); + static OUString aSVGStrFontSizeAdjust(OUString::createFromAscii("font-size-adjust")); + static OUString aSVGStrFontStretch(OUString::createFromAscii("font-stretch")); + static OUString aSVGStrFontStyle(OUString::createFromAscii("font-style")); + static OUString aSVGStrFontVariant(OUString::createFromAscii("font-variant")); + static OUString aSVGStrFontWeight(OUString::createFromAscii("font-weight")); + static OUString aSVGStrDirection(OUString::createFromAscii("direction")); + static OUString aSVGStrLetterSpacing(OUString::createFromAscii("letter-spacing")); + static OUString aSVGStrTextDecoration(OUString::createFromAscii("text-decoration")); + static OUString aSVGStrUnicodeBidi(OUString::createFromAscii("unicode-bidi")); + static OUString aSVGStrWordSpacing(OUString::createFromAscii("word-spacing")); + static OUString aSVGStrTspan(OUString::createFromAscii("tspan")); + static OUString aSVGStrTref(OUString::createFromAscii("tref")); + static OUString aSVGStrTextPath(OUString::createFromAscii("textPath")); + static OUString aSVGStrStartOffset(OUString::createFromAscii("startOffset")); + static OUString aSVGStrMethod(OUString::createFromAscii("method")); + static OUString aSVGStrSpacing(OUString::createFromAscii("spacing")); + static OUString aSVGStrTextAlign(OUString::createFromAscii("text-align")); + static OUString aSVGStrPathLength(OUString::createFromAscii("pathLength")); + static OUString aSVGStrType(OUString::createFromAscii("type")); + static OUString aSVGStrClass(OUString::createFromAscii("class")); + static OUString aSVGStrTextAnchor(OUString::createFromAscii("text-anchor")); + static OUString aSVGStrXmlSpace(OUString::createFromAscii("xml:space")); + static OUString aSVGStrColor(OUString::createFromAscii("color")); + static OUString aSVGStrClipPathNode(OUString::createFromAscii("clipPath")); + static OUString aSVGStrClipPathProperty(OUString::createFromAscii("clip-path")); + static OUString aSVGStrMask(OUString::createFromAscii("mask")); + static OUString aSVGStrClipPathUnits(OUString::createFromAscii("clipPathUnits")); + static OUString aSVGStrMaskUnits(OUString::createFromAscii("maskUnits")); + static OUString aSVGStrMaskContentUnits(OUString::createFromAscii("maskContentUnits")); + static OUString aSVGStrClipRule(OUString::createFromAscii("clip-rule")); + static OUString aSVGStrMarker(OUString::createFromAscii("marker")); + static OUString aSVGStrMarkerStart(OUString::createFromAscii("marker-start")); + static OUString aSVGStrMarkerMid(OUString::createFromAscii("marker-mid")); + static OUString aSVGStrMarkerEnd(OUString::createFromAscii("marker-end")); + static OUString aSVGStrRefX(OUString::createFromAscii("refX")); + static OUString aSVGStrRefY(OUString::createFromAscii("refY")); + static OUString aSVGStrMarkerUnits(OUString::createFromAscii("markerUnits")); + static OUString aSVGStrMarkerWidth(OUString::createFromAscii("markerWidth")); + static OUString aSVGStrMarkerHeight(OUString::createFromAscii("markerHeight")); + static OUString aSVGStrOrient(OUString::createFromAscii("orient")); + static OUString aSVGStrPattern(OUString::createFromAscii("pattern")); + static OUString aSVGStrPatternUnits(OUString::createFromAscii("patternUnits")); + static OUString aSVGStrPatternContentUnits(OUString::createFromAscii("patternContentUnits")); + static OUString aSVGStrPatternTransform(OUString::createFromAscii("patternTransform")); + static OUString aSVGStrOpacity(OUString::createFromAscii("opacity")); + static OUString aSVGStrTitle(OUString::createFromAscii("title")); + static OUString aSVGStrDesc(OUString::createFromAscii("desc")); - static rtl::OUString aSVGStrPreserveAspectRatio(rtl::OUString::createFromAscii("preserveAspectRatio")); - static rtl::OUString aSVGStrDefer(rtl::OUString::createFromAscii("defer")); - static rtl::OUString aSVGStrNone(rtl::OUString::createFromAscii("none")); - static rtl::OUString aSVGStrXMinYMin(rtl::OUString::createFromAscii("xMinYMin")); - static rtl::OUString aSVGStrXMidYMin(rtl::OUString::createFromAscii("xMidYMin")); - static rtl::OUString aSVGStrXMaxYMin(rtl::OUString::createFromAscii("xMaxYMin")); - static rtl::OUString aSVGStrXMinYMid(rtl::OUString::createFromAscii("xMinYMid")); - static rtl::OUString aSVGStrXMidYMid(rtl::OUString::createFromAscii("xMidYMid")); - static rtl::OUString aSVGStrXMaxYMid(rtl::OUString::createFromAscii("xMaxYMid")); - static rtl::OUString aSVGStrXMinYMax(rtl::OUString::createFromAscii("xMinYMax")); - static rtl::OUString aSVGStrXMidYMax(rtl::OUString::createFromAscii("xMidYMax")); - static rtl::OUString aSVGStrXMaxYMax(rtl::OUString::createFromAscii("xMaxYMax")); - static rtl::OUString aSVGStrMeet(rtl::OUString::createFromAscii("meet")); - static rtl::OUString aSVGStrSlice(rtl::OUString::createFromAscii("slice")); + static OUString aSVGStrPreserveAspectRatio(OUString::createFromAscii("preserveAspectRatio")); + static OUString aSVGStrDefer(OUString::createFromAscii("defer")); + static OUString aSVGStrNone(OUString::createFromAscii("none")); + static OUString aSVGStrXMinYMin(OUString::createFromAscii("xMinYMin")); + static OUString aSVGStrXMidYMin(OUString::createFromAscii("xMidYMin")); + static OUString aSVGStrXMaxYMin(OUString::createFromAscii("xMaxYMin")); + static OUString aSVGStrXMinYMid(OUString::createFromAscii("xMinYMid")); + static OUString aSVGStrXMidYMid(OUString::createFromAscii("xMidYMid")); + static OUString aSVGStrXMaxYMid(OUString::createFromAscii("xMaxYMid")); + static OUString aSVGStrXMinYMax(OUString::createFromAscii("xMinYMax")); + static OUString aSVGStrXMidYMax(OUString::createFromAscii("xMidYMax")); + static OUString aSVGStrXMaxYMax(OUString::createFromAscii("xMaxYMax")); + static OUString aSVGStrMeet(OUString::createFromAscii("meet")); + static OUString aSVGStrSlice(OUString::createFromAscii("slice")); - static rtl::OUString aSVGStrDefs(rtl::OUString::createFromAscii("defs")); - static rtl::OUString aSVGStrG(rtl::OUString::createFromAscii("g")); - static rtl::OUString aSVGStrSvg(rtl::OUString::createFromAscii("svg")); - static rtl::OUString aSVGStrSymbol(rtl::OUString::createFromAscii("symbol")); - static rtl::OUString aSVGStrUse(rtl::OUString::createFromAscii("use")); + static OUString aSVGStrDefs(OUString::createFromAscii("defs")); + static OUString aSVGStrG(OUString::createFromAscii("g")); + static OUString aSVGStrSvg(OUString::createFromAscii("svg")); + static OUString aSVGStrSymbol(OUString::createFromAscii("symbol")); + static OUString aSVGStrUse(OUString::createFromAscii("use")); - static rtl::OUString aSVGStrCircle(rtl::OUString::createFromAscii("circle")); - static rtl::OUString aSVGStrEllipse(rtl::OUString::createFromAscii("ellipse")); - static rtl::OUString aSVGStrLine(rtl::OUString::createFromAscii("line")); - static rtl::OUString aSVGStrPath(rtl::OUString::createFromAscii("path")); - static rtl::OUString aSVGStrPolygon(rtl::OUString::createFromAscii("polygon")); - static rtl::OUString aSVGStrPolyline(rtl::OUString::createFromAscii("polyline")); - static rtl::OUString aSVGStrRect(rtl::OUString::createFromAscii("rect")); - static rtl::OUString aSVGStrImage(rtl::OUString::createFromAscii("image")); + static OUString aSVGStrCircle(OUString::createFromAscii("circle")); + static OUString aSVGStrEllipse(OUString::createFromAscii("ellipse")); + static OUString aSVGStrLine(OUString::createFromAscii("line")); + static OUString aSVGStrPath(OUString::createFromAscii("path")); + static OUString aSVGStrPolygon(OUString::createFromAscii("polygon")); + static OUString aSVGStrPolyline(OUString::createFromAscii("polyline")); + static OUString aSVGStrRect(OUString::createFromAscii("rect")); + static OUString aSVGStrImage(OUString::createFromAscii("image")); - static rtl::OUString aSVGStrLinearGradient(rtl::OUString::createFromAscii("linearGradient")); - static rtl::OUString aSVGStrRadialGradient(rtl::OUString::createFromAscii("radialGradient")); - static rtl::OUString aSVGStrStop(rtl::OUString::createFromAscii("stop")); - static rtl::OUString aSVGStrOffset(rtl::OUString::createFromAscii("offset")); - static rtl::OUString aSVGStrX1(rtl::OUString::createFromAscii("x1")); - static rtl::OUString aSVGStrY1(rtl::OUString::createFromAscii("y1")); - static rtl::OUString aSVGStrX2(rtl::OUString::createFromAscii("x2")); - static rtl::OUString aSVGStrY2(rtl::OUString::createFromAscii("y2")); - static rtl::OUString aSVGStrCx(rtl::OUString::createFromAscii("cx")); - static rtl::OUString aSVGStrCy(rtl::OUString::createFromAscii("cy")); - static rtl::OUString aSVGStrFx(rtl::OUString::createFromAscii("fx")); - static rtl::OUString aSVGStrFy(rtl::OUString::createFromAscii("fy")); - static rtl::OUString aSVGStrR(rtl::OUString::createFromAscii("r")); - static rtl::OUString aSVGStrGradientUnits(rtl::OUString::createFromAscii("gradientUnits")); - static rtl::OUString aSVGStrGradientTransform(rtl::OUString::createFromAscii("gradientTransform")); - static rtl::OUString aSVGStrSpreadMethod(rtl::OUString::createFromAscii("spreadMethod")); - static rtl::OUString aSVGStrXlinkHref(rtl::OUString::createFromAscii("xlink:href")); - static rtl::OUString aSVGStrStopColor(rtl::OUString::createFromAscii("stop-color")); - static rtl::OUString aSVGStrStopOpacity(rtl::OUString::createFromAscii("stop-opacity")); + static OUString aSVGStrLinearGradient(OUString::createFromAscii("linearGradient")); + static OUString aSVGStrRadialGradient(OUString::createFromAscii("radialGradient")); + static OUString aSVGStrStop(OUString::createFromAscii("stop")); + static OUString aSVGStrOffset(OUString::createFromAscii("offset")); + static OUString aSVGStrX1(OUString::createFromAscii("x1")); + static OUString aSVGStrY1(OUString::createFromAscii("y1")); + static OUString aSVGStrX2(OUString::createFromAscii("x2")); + static OUString aSVGStrY2(OUString::createFromAscii("y2")); + static OUString aSVGStrCx(OUString::createFromAscii("cx")); + static OUString aSVGStrCy(OUString::createFromAscii("cy")); + static OUString aSVGStrFx(OUString::createFromAscii("fx")); + static OUString aSVGStrFy(OUString::createFromAscii("fy")); + static OUString aSVGStrR(OUString::createFromAscii("r")); + static OUString aSVGStrGradientUnits(OUString::createFromAscii("gradientUnits")); + static OUString aSVGStrGradientTransform(OUString::createFromAscii("gradientTransform")); + static OUString aSVGStrSpreadMethod(OUString::createFromAscii("spreadMethod")); + static OUString aSVGStrXlinkHref(OUString::createFromAscii("xlink:href")); + static OUString aSVGStrStopColor(OUString::createFromAscii("stop-color")); + static OUString aSVGStrStopOpacity(OUString::createFromAscii("stop-opacity")); - static rtl::OUString aSVGStrFill(rtl::OUString::createFromAscii("fill")); - static rtl::OUString aSVGStrFillOpacity(rtl::OUString::createFromAscii("fill-opacity")); - static rtl::OUString aSVGStrFillRule(rtl::OUString::createFromAscii("fill-rule")); + static OUString aSVGStrFill(OUString::createFromAscii("fill")); + static OUString aSVGStrFillOpacity(OUString::createFromAscii("fill-opacity")); + static OUString aSVGStrFillRule(OUString::createFromAscii("fill-rule")); - static rtl::OUString aSVGStrStroke(rtl::OUString::createFromAscii("stroke")); - static rtl::OUString aSVGStrStrokeDasharray(rtl::OUString::createFromAscii("stroke-dasharray")); - static rtl::OUString aSVGStrStrokeDashoffset(rtl::OUString::createFromAscii("stroke-dashoffset")); - static rtl::OUString aSVGStrStrokeLinecap(rtl::OUString::createFromAscii("stroke-linecap")); - static rtl::OUString aSVGStrStrokeLinejoin(rtl::OUString::createFromAscii("stroke-linejoin")); - static rtl::OUString aSVGStrStrokeMiterlimit(rtl::OUString::createFromAscii("stroke-miterlimit")); - static rtl::OUString aSVGStrStrokeOpacity(rtl::OUString::createFromAscii("stroke-opacity")); - static rtl::OUString aSVGStrStrokeWidth(rtl::OUString::createFromAscii("stroke-width")); + static OUString aSVGStrStroke(OUString::createFromAscii("stroke")); + static OUString aSVGStrStrokeDasharray(OUString::createFromAscii("stroke-dasharray")); + static OUString aSVGStrStrokeDashoffset(OUString::createFromAscii("stroke-dashoffset")); + static OUString aSVGStrStrokeLinecap(OUString::createFromAscii("stroke-linecap")); + static OUString aSVGStrStrokeLinejoin(OUString::createFromAscii("stroke-linejoin")); + static OUString aSVGStrStrokeMiterlimit(OUString::createFromAscii("stroke-miterlimit")); + static OUString aSVGStrStrokeOpacity(OUString::createFromAscii("stroke-opacity")); + static OUString aSVGStrStrokeWidth(OUString::createFromAscii("stroke-width")); - static rtl::OUString aSVGStrText(rtl::OUString::createFromAscii("text")); + static OUString aSVGStrText(OUString::createFromAscii("text")); - SVGToken StrToSVGToken(const rtl::OUString& rStr) + SVGToken StrToSVGToken(const OUString& rStr) { - typedef boost::unordered_map< rtl::OUString, SVGToken, rtl::OUStringHash,::std::equal_to< ::rtl::OUString > > SVGTokenMapper; - typedef std::pair< rtl::OUString, SVGToken > SVGTokenValueType; + typedef boost::unordered_map< OUString, SVGToken, OUStringHash,::std::equal_to< OUString > > SVGTokenMapper; + typedef std::pair< OUString, SVGToken > SVGTokenValueType; static SVGTokenMapper aSVGTokenMapperList; if(aSVGTokenMapperList.empty()) @@ -314,12 +314,12 @@ namespace svgio } } - const rtl::OUString& getStrTitle() + const OUString& getStrTitle() { return aSVGStrTitle; } - const rtl::OUString& getStrDesc() + const OUString& getStrDesc() { return aSVGStrDesc; } diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx index 892221cc527d..8e107a7eaae0 100644 --- a/svgio/source/svgreader/svgtools.cxx +++ b/svgio/source/svgreader/svgtools.cxx @@ -32,9 +32,9 @@ namespace svgio namespace svgreader { #ifdef DBG_UTIL - void myAssert(const rtl::OUString& rMessage) + void myAssert(const OUString& rMessage) { - rtl::OString aMessage2; + OString aMessage2; rMessage.convertToString(&aMessage2, osl_getThreadTextEncoding(), RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR|RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR); OSL_ENSURE(false, aMessage2.getStr()); @@ -42,10 +42,10 @@ namespace svgio #endif // common non-token strings - const rtl::OUString commonStrings::aStrUserSpaceOnUse(rtl::OUString::createFromAscii("userSpaceOnUse")); - const rtl::OUString commonStrings::aStrObjectBoundingBox(rtl::OUString::createFromAscii("objectBoundingBox")); - const rtl::OUString commonStrings::aStrNonzero(rtl::OUString::createFromAscii("nonzero")); - const rtl::OUString commonStrings::aStrEvenOdd(rtl::OUString::createFromAscii("evenodd")); + const OUString commonStrings::aStrUserSpaceOnUse(OUString::createFromAscii("userSpaceOnUse")); + const OUString commonStrings::aStrObjectBoundingBox(OUString::createFromAscii("objectBoundingBox")); + const OUString commonStrings::aStrNonzero(OUString::createFromAscii("nonzero")); + const OUString commonStrings::aStrEvenOdd(OUString::createFromAscii("evenodd")); basegfx::B2DHomMatrix SvgAspectRatio::createLinearMapping(const basegfx::B2DRange& rTarget, const basegfx::B2DRange& rSource) { @@ -250,7 +250,7 @@ namespace svgio return basegfx::fTools::moreOrEqual(mfNumber, 0.0); } - void skip_char(const rtl::OUString& rCandidate, const sal_Unicode& rChar, sal_Int32& nPos, const sal_Int32 nLen) + void skip_char(const OUString& rCandidate, const sal_Unicode& rChar, sal_Int32& nPos, const sal_Int32 nLen) { while(nPos < nLen && rChar == rCandidate[nPos]) { @@ -258,7 +258,7 @@ namespace svgio } } - void skip_char(const rtl::OUString& rCandidate, const sal_Unicode& rCharA, const sal_Unicode& rCharB, sal_Int32& nPos, const sal_Int32 nLen) + void skip_char(const OUString& rCandidate, const sal_Unicode& rCharA, const sal_Unicode& rCharB, sal_Int32& nPos, const sal_Int32 nLen) { while(nPos < nLen && (rCharA == rCandidate[nPos] || rCharB == rCandidate[nPos])) { @@ -266,7 +266,7 @@ namespace svgio } } - void copySign(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen) + void copySign(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen) { if(nPos < nLen) { @@ -280,7 +280,7 @@ namespace svgio } } - void copyNumber(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen) + void copyNumber(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen) { bool bOnNumber(true); @@ -298,7 +298,7 @@ namespace svgio } } - void copyHex(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen) + void copyHex(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen) { bool bOnHex(true); @@ -318,7 +318,7 @@ namespace svgio } } - void copyString(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen) + void copyString(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen) { bool bOnChar(true); @@ -338,7 +338,7 @@ namespace svgio } } - void copyToLimiter(const rtl::OUString& rCandidate, const sal_Unicode& rLimiter, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen) + void copyToLimiter(const OUString& rCandidate, const sal_Unicode& rLimiter, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen) { while(nPos < nLen && rLimiter != rCandidate[nPos]) { @@ -347,11 +347,11 @@ namespace svgio } } - bool readNumber(const rtl::OUString& rCandidate, sal_Int32& nPos, double& fNum, const sal_Int32 nLen) + bool readNumber(const OUString& rCandidate, sal_Int32& nPos, double& fNum, const sal_Int32 nLen) { if(nPos < nLen) { - rtl::OUStringBuffer aNum; + OUStringBuffer aNum; copySign(rCandidate, nPos, aNum, nLen); copyNumber(rCandidate, nPos, aNum, nLen); @@ -367,7 +367,7 @@ namespace svgio // by error. First try if there are numbers after the 'e', // safe current state nPos++; - const rtl::OUStringBuffer aNum2(aNum); + const OUStringBuffer aNum2(aNum); const sal_Int32 nPosAfterE(nPos); aNum.append(aChar); @@ -399,7 +399,7 @@ namespace svgio return false; } - SvgUnit readUnit(const rtl::OUString& rCandidate, sal_Int32& nPos, const sal_Int32 nLen) + SvgUnit readUnit(const OUString& rCandidate, sal_Int32& nPos, const sal_Int32 nLen) { SvgUnit aRetval(Unit_px); @@ -502,7 +502,7 @@ namespace svgio return aRetval; } - bool readNumberAndUnit(const rtl::OUString& rCandidate, sal_Int32& nPos, SvgNumber& aNum, const sal_Int32 nLen) + bool readNumberAndUnit(const OUString& rCandidate, sal_Int32& nPos, SvgNumber& aNum, const sal_Int32 nLen) { double fNum(0.0); @@ -517,7 +517,7 @@ namespace svgio return false; } - bool readAngle(const rtl::OUString& rCandidate, sal_Int32& nPos, double& fAngle, const sal_Int32 nLen) + bool readAngle(const OUString& rCandidate, sal_Int32& nPos, double& fAngle, const sal_Int32 nLen) { if(readNumber(rCandidate, nPos, fAngle, nLen)) { @@ -533,8 +533,8 @@ namespace svgio if(nPos < nLen) { const sal_Unicode aChar(rCandidate[nPos]); - static rtl::OUString aStrGrad(rtl::OUString::createFromAscii("grad")); - static rtl::OUString aStrRad(rtl::OUString::createFromAscii("rad")); + static OUString aStrGrad(OUString::createFromAscii("grad")); + static OUString aStrRad(OUString::createFromAscii("rad")); switch(aChar) { @@ -601,164 +601,164 @@ namespace svgio } } - bool match_colorKeyword(basegfx::BColor& rColor, const rtl::OUString& rName) + bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName) { - typedef boost::unordered_map< rtl::OUString, Color, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > + typedef boost::unordered_map< OUString, Color, + OUStringHash, + ::std::equal_to< OUString > > ColorTokenMapper; - typedef std::pair< rtl::OUString, Color > ColorTokenValueType; + typedef std::pair< OUString, Color > ColorTokenValueType; ColorTokenMapper aColorTokenMapperList; if(aColorTokenMapperList.empty()) { - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("aliceblue"), Color(240, 248, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("antiquewhite"), Color(250, 235, 215))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("aqua"), Color( 0, 255, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("aquamarine"), Color(127, 255, 212))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("azure"), Color(240, 255, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("beige"), Color(245, 245, 220))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("bisque"), Color(255, 228, 196))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("black"), Color( 0, 0, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("blanchedalmond"), Color(255, 235, 205))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("blue"), Color( 0, 0, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("blueviolet"), Color(138, 43, 226))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("brown"), Color(165, 42, 42))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("burlywood"), Color(222, 184, 135))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("cadetblue"), Color( 95, 158, 160))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("chartreuse"), Color(127, 255, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("chocolate"), Color(210, 105, 30))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("coral"), Color(255, 127, 80))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("cornflowerblue"), Color(100, 149, 237))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("cornsilk"), Color(255, 248, 220))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("crimson"), Color(220, 20, 60))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("cyan"), Color( 0, 255, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkblue"), Color( 0, 0, 139))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkcyan"), Color( 0, 139, 139))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkgoldenrod"), Color(184, 134, 11))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkgray"), Color(169, 169, 169))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkgreen"), Color( 0, 100, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkgrey"), Color(169, 169, 169))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkkhaki"), Color(189, 183, 107))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkmagenta"), Color(139, 0, 139))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkolivegreen"), Color( 85, 107, 47))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkorange"), Color(255, 140, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkorchid"), Color(153, 50, 204))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkred"), Color(139, 0, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darksalmon"), Color(233, 150, 122))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkseagreen"), Color(143, 188, 143))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkslateblue"), Color( 72, 61, 139))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkslategray"), Color( 47, 79, 79))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkslategrey"), Color( 47, 79, 79))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkturquoise"), Color( 0, 206, 209))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkviolet"), Color(148, 0, 211))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("deeppink"), Color(255, 20, 147))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("deepskyblue"), Color( 0, 191, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("dimgray"), Color(105, 105, 105))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("dimgrey"), Color(105, 105, 105))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("dodgerblue"), Color( 30, 144, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("firebrick"), Color(178, 34, 34))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("floralwhite"), Color(255, 250, 240))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("forestgreen"), Color( 34, 139, 34))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("fuchsia"), Color(255, 0, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("gainsboro"), Color(220, 220, 220))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("ghostwhite"), Color(248, 248, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("gold"), Color(255, 215, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("goldenrod"), Color(218, 165, 32))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("gray"), Color(128, 128, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("grey"), Color(128, 128, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("green"), Color(0, 128, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("greenyellow"), Color(173, 255, 47))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("honeydew"), Color(240, 255, 240))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("hotpink"), Color(255, 105, 180))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("indianred"), Color(205, 92, 92))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("indigo"), Color( 75, 0, 130))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("ivory"), Color(255, 255, 240))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("khaki"), Color(240, 230, 140))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lavender"), Color(230, 230, 250))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lavenderblush"), Color(255, 240, 245))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lawngreen"), Color(124, 252, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lemonchiffon"), Color(255, 250, 205))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightblue"), Color(173, 216, 230))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightcoral"), Color(240, 128, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightcyan"), Color(224, 255, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightgoldenrodyellow"), Color(250, 250, 210))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightgray"), Color(211, 211, 211))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightgreen"), Color(144, 238, 144))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightgrey"), Color(211, 211, 211))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightpink"), Color(255, 182, 193))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightsalmon"), Color(255, 160, 122))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightseagreen"), Color( 32, 178, 170))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightskyblue"), Color(135, 206, 250))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightslategray"), Color(119, 136, 153))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightslategrey"), Color(119, 136, 153))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightsteelblue"), Color(176, 196, 222))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightyellow"), Color(255, 255, 224))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lime"), Color( 0, 255, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("limegreen"), Color( 50, 205, 50))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("linen"), Color(250, 240, 230))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("magenta"), Color(255, 0, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("maroon"), Color(128, 0, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumaquamarine"), Color(102, 205, 170))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumblue"), Color( 0, 0, 205))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumorchid"), Color(186, 85, 211))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumpurple"), Color(147, 112, 219))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumseagreen"), Color( 60, 179, 113))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumslateblue"), Color(123, 104, 238))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumspringgreen"), Color( 0, 250, 154))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumturquoise"), Color( 72, 209, 204))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumvioletred"), Color(199, 21, 133))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("midnightblue"), Color( 25, 25, 112))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mintcream"), Color(245, 255, 250))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mistyrose"), Color(255, 228, 225))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("moccasin"), Color(255, 228, 181))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("navajowhite"), Color(255, 222, 173))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("navy"), Color( 0, 0, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("oldlace"), Color(253, 245, 230))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("olive"), Color(128, 128, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("olivedrab"), Color(107, 142, 35))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("orange"), Color(255, 165, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("orangered"), Color(255, 69, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("orchid"), Color(218, 112, 214))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("palegoldenrod"), Color(238, 232, 170))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("palegreen"), Color(152, 251, 152))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("paleturquoise"), Color(175, 238, 238))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("palevioletred"), Color(219, 112, 147))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("papayawhip"), Color(255, 239, 213))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("peachpuff"), Color(255, 218, 185))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("peru"), Color(205, 133, 63))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("pink"), Color(255, 192, 203))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("plum"), Color(221, 160, 221))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("powderblue"), Color(176, 224, 230))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("purple"), Color(128, 0, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("red"), Color(255, 0, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("rosybrown"), Color(188, 143, 143))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("royalblue"), Color( 65, 105, 225))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("saddlebrown"), Color(139, 69, 19))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("salmon"), Color(250, 128, 114))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("sandybrown"), Color(244, 164, 96))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("seagreen"), Color( 46, 139, 87))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("seashell"), Color(255, 245, 238))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("sienna"), Color(160, 82, 45))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("silver"), Color(192, 192, 192))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("skyblue"), Color(135, 206, 235))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("slateblue"), Color(106, 90, 205))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("slategray"), Color(112, 128, 144))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("slategrey"), Color(112, 128, 144))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("snow"), Color(255, 250, 250))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("springgreen"), Color( 0, 255, 127))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("steelblue"), Color( 70, 130, 180))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("tan"), Color(210, 180, 140))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("teal"), Color( 0, 128, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("thistle"), Color(216, 191, 216))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("tomato"), Color(255, 99, 71))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("turquoise"), Color( 64, 224, 208))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("violet"), Color(238, 130, 238))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("wheat"), Color(245, 222, 179))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("white"), Color(255, 255, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("whitesmoke"), Color(245, 245, 245))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("yellow"), Color(255, 255, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("yellowgreen"), Color(154, 205, 50))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("aliceblue"), Color(240, 248, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("antiquewhite"), Color(250, 235, 215))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("aqua"), Color( 0, 255, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("aquamarine"), Color(127, 255, 212))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("azure"), Color(240, 255, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("beige"), Color(245, 245, 220))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("bisque"), Color(255, 228, 196))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("black"), Color( 0, 0, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("blanchedalmond"), Color(255, 235, 205))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("blue"), Color( 0, 0, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("blueviolet"), Color(138, 43, 226))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("brown"), Color(165, 42, 42))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("burlywood"), Color(222, 184, 135))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cadetblue"), Color( 95, 158, 160))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("chartreuse"), Color(127, 255, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("chocolate"), Color(210, 105, 30))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("coral"), Color(255, 127, 80))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cornflowerblue"), Color(100, 149, 237))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cornsilk"), Color(255, 248, 220))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("crimson"), Color(220, 20, 60))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cyan"), Color( 0, 255, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkblue"), Color( 0, 0, 139))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkcyan"), Color( 0, 139, 139))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgoldenrod"), Color(184, 134, 11))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgray"), Color(169, 169, 169))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgreen"), Color( 0, 100, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgrey"), Color(169, 169, 169))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkkhaki"), Color(189, 183, 107))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkmagenta"), Color(139, 0, 139))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkolivegreen"), Color( 85, 107, 47))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkorange"), Color(255, 140, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkorchid"), Color(153, 50, 204))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkred"), Color(139, 0, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darksalmon"), Color(233, 150, 122))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkseagreen"), Color(143, 188, 143))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkslateblue"), Color( 72, 61, 139))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkslategray"), Color( 47, 79, 79))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkslategrey"), Color( 47, 79, 79))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkturquoise"), Color( 0, 206, 209))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkviolet"), Color(148, 0, 211))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("deeppink"), Color(255, 20, 147))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("deepskyblue"), Color( 0, 191, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("dimgray"), Color(105, 105, 105))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("dimgrey"), Color(105, 105, 105))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("dodgerblue"), Color( 30, 144, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("firebrick"), Color(178, 34, 34))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("floralwhite"), Color(255, 250, 240))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("forestgreen"), Color( 34, 139, 34))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("fuchsia"), Color(255, 0, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("gainsboro"), Color(220, 220, 220))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("ghostwhite"), Color(248, 248, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("gold"), Color(255, 215, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("goldenrod"), Color(218, 165, 32))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("gray"), Color(128, 128, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("grey"), Color(128, 128, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("green"), Color(0, 128, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("greenyellow"), Color(173, 255, 47))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("honeydew"), Color(240, 255, 240))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("hotpink"), Color(255, 105, 180))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("indianred"), Color(205, 92, 92))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("indigo"), Color( 75, 0, 130))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("ivory"), Color(255, 255, 240))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("khaki"), Color(240, 230, 140))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lavender"), Color(230, 230, 250))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lavenderblush"), Color(255, 240, 245))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lawngreen"), Color(124, 252, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lemonchiffon"), Color(255, 250, 205))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightblue"), Color(173, 216, 230))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightcoral"), Color(240, 128, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightcyan"), Color(224, 255, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightgoldenrodyellow"), Color(250, 250, 210))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightgray"), Color(211, 211, 211))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightgreen"), Color(144, 238, 144))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightgrey"), Color(211, 211, 211))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightpink"), Color(255, 182, 193))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightsalmon"), Color(255, 160, 122))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightseagreen"), Color( 32, 178, 170))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightskyblue"), Color(135, 206, 250))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightslategray"), Color(119, 136, 153))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightslategrey"), Color(119, 136, 153))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightsteelblue"), Color(176, 196, 222))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightyellow"), Color(255, 255, 224))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lime"), Color( 0, 255, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("limegreen"), Color( 50, 205, 50))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("linen"), Color(250, 240, 230))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("magenta"), Color(255, 0, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("maroon"), Color(128, 0, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumaquamarine"), Color(102, 205, 170))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumblue"), Color( 0, 0, 205))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumorchid"), Color(186, 85, 211))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumpurple"), Color(147, 112, 219))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumseagreen"), Color( 60, 179, 113))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumslateblue"), Color(123, 104, 238))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumspringgreen"), Color( 0, 250, 154))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumturquoise"), Color( 72, 209, 204))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumvioletred"), Color(199, 21, 133))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("midnightblue"), Color( 25, 25, 112))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mintcream"), Color(245, 255, 250))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mistyrose"), Color(255, 228, 225))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("moccasin"), Color(255, 228, 181))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("navajowhite"), Color(255, 222, 173))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("navy"), Color( 0, 0, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("oldlace"), Color(253, 245, 230))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("olive"), Color(128, 128, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("olivedrab"), Color(107, 142, 35))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("orange"), Color(255, 165, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("orangered"), Color(255, 69, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("orchid"), Color(218, 112, 214))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("palegoldenrod"), Color(238, 232, 170))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("palegreen"), Color(152, 251, 152))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("paleturquoise"), Color(175, 238, 238))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("palevioletred"), Color(219, 112, 147))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("papayawhip"), Color(255, 239, 213))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("peachpuff"), Color(255, 218, 185))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("peru"), Color(205, 133, 63))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("pink"), Color(255, 192, 203))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("plum"), Color(221, 160, 221))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("powderblue"), Color(176, 224, 230))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("purple"), Color(128, 0, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("red"), Color(255, 0, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("rosybrown"), Color(188, 143, 143))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("royalblue"), Color( 65, 105, 225))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("saddlebrown"), Color(139, 69, 19))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("salmon"), Color(250, 128, 114))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("sandybrown"), Color(244, 164, 96))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("seagreen"), Color( 46, 139, 87))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("seashell"), Color(255, 245, 238))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("sienna"), Color(160, 82, 45))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("silver"), Color(192, 192, 192))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("skyblue"), Color(135, 206, 235))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("slateblue"), Color(106, 90, 205))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("slategray"), Color(112, 128, 144))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("slategrey"), Color(112, 128, 144))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("snow"), Color(255, 250, 250))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("springgreen"), Color( 0, 255, 127))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("steelblue"), Color( 70, 130, 180))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("tan"), Color(210, 180, 140))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("teal"), Color( 0, 128, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("thistle"), Color(216, 191, 216))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("tomato"), Color(255, 99, 71))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("turquoise"), Color( 64, 224, 208))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("violet"), Color(238, 130, 238))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("wheat"), Color(245, 222, 179))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("white"), Color(255, 255, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("whitesmoke"), Color(245, 245, 245))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("yellow"), Color(255, 255, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("yellowgreen"), Color(154, 205, 50))); } const ColorTokenMapper::const_iterator aResult(aColorTokenMapperList.find(rName)); @@ -774,7 +774,7 @@ namespace svgio } } - bool read_color(const rtl::OUString& rCandidate, basegfx::BColor& rColor) + bool read_color(const OUString& rCandidate, basegfx::BColor& rColor) { const sal_Int32 nLen(rCandidate.getLength()); @@ -786,7 +786,7 @@ namespace svgio if(aChar == sal_Unicode('#')) { // hex definition - rtl::OUStringBuffer aNum; + OUStringBuffer aNum; sal_Int32 nPos(1); copyHex(rCandidate, nPos, aNum, nLen); @@ -822,7 +822,7 @@ namespace svgio } else { - static rtl::OUString aStrRgb(rtl::OUString::createFromAscii("rgb")); + static OUString aStrRgb(OUString::createFromAscii("rgb")); if(rCandidate.matchIgnoreAsciiCase(aStrRgb, 0)) { @@ -893,7 +893,7 @@ namespace svgio return false; } - basegfx::B2DRange readViewBox(const rtl::OUString& rCandidate, InfoProvider& rInfoProvider) + basegfx::B2DRange readViewBox(const OUString& rCandidate, InfoProvider& rInfoProvider) { const sal_Int32 nLen(rCandidate.getLength()); @@ -934,7 +934,7 @@ namespace svgio return basegfx::B2DRange(); } - basegfx::B2DHomMatrix readTransform(const rtl::OUString& rCandidate, InfoProvider& rInfoProvider) + basegfx::B2DHomMatrix readTransform(const OUString& rCandidate, InfoProvider& rInfoProvider) { basegfx::B2DHomMatrix aMatrix; const sal_Int32 nLen(rCandidate.getLength()); @@ -948,12 +948,12 @@ namespace svgio { const sal_Unicode aChar(rCandidate[nPos]); const sal_Int32 nInitPos(nPos); - static rtl::OUString aStrMatrix(rtl::OUString::createFromAscii("matrix")); - static rtl::OUString aStrTranslate(rtl::OUString::createFromAscii("translate")); - static rtl::OUString aStrScale(rtl::OUString::createFromAscii("scale")); - static rtl::OUString aStrRotate(rtl::OUString::createFromAscii("rotate")); - static rtl::OUString aStrSkewX(rtl::OUString::createFromAscii("skewX")); - static rtl::OUString aStrSkewY(rtl::OUString::createFromAscii("skewY")); + static OUString aStrMatrix(OUString::createFromAscii("matrix")); + static OUString aStrTranslate(OUString::createFromAscii("translate")); + static OUString aStrScale(OUString::createFromAscii("scale")); + static OUString aStrRotate(OUString::createFromAscii("rotate")); + static OUString aStrSkewX(OUString::createFromAscii("skewX")); + static OUString aStrSkewY(OUString::createFromAscii("skewY")); switch(aChar) { @@ -1139,7 +1139,7 @@ namespace svgio return aMatrix; } - bool readSingleNumber(const rtl::OUString& rCandidate, SvgNumber& aNum) + bool readSingleNumber(const OUString& rCandidate, SvgNumber& aNum) { const sal_Int32 nLen(rCandidate.getLength()); sal_Int32 nPos(0); @@ -1147,9 +1147,9 @@ namespace svgio return readNumberAndUnit(rCandidate, nPos, aNum, nLen); } - bool readLocalUrl(const rtl::OUString& rCandidate, rtl::OUString& rURL) + bool readLocalUrl(const OUString& rCandidate, OUString& rURL) { - static rtl::OUString aStrUrl(rtl::OUString::createFromAscii("url")); + static OUString aStrUrl(OUString::createFromAscii("url")); if(rCandidate.match(aStrUrl, 0)) { @@ -1157,7 +1157,7 @@ namespace svgio sal_Int32 nPos(aStrUrl.getLength()); skip_char(rCandidate, sal_Unicode('('), sal_Unicode('#'), nPos, nLen); - rtl::OUStringBuffer aTokenValue; + OUStringBuffer aTokenValue; copyToLimiter(rCandidate, sal_Unicode(')'), nPos, aTokenValue, nLen); rURL = aTokenValue.makeStringAndClear(); @@ -1167,7 +1167,7 @@ namespace svgio return false; } - bool readSvgPaint(const rtl::OUString& rCandidate, SvgPaint& rSvgPaint, rtl::OUString& rURL) + bool readSvgPaint(const OUString& rCandidate, SvgPaint& rSvgPaint, OUString& rURL) { const sal_Int32 nLen(rCandidate.getLength()); @@ -1182,8 +1182,8 @@ namespace svgio } else { - static rtl::OUString aStrNone(rtl::OUString::createFromAscii("none")); - static rtl::OUString aStrCurrentColor(rtl::OUString::createFromAscii("currentColor")); + static OUString aStrNone(OUString::createFromAscii("none")); + static OUString aStrCurrentColor(OUString::createFromAscii("currentColor")); if(rCandidate.match(aStrNone, 0)) { @@ -1206,7 +1206,7 @@ namespace svgio return false; } - bool readSvgNumberVector(const rtl::OUString& rCandidate, SvgNumberVector& rSvgNumberVector) + bool readSvgNumberVector(const OUString& rCandidate, SvgNumberVector& rSvgNumberVector) { const sal_Int32 nLen(rCandidate.getLength()); rSvgNumberVector.clear(); @@ -1229,7 +1229,7 @@ namespace svgio return false; } - SvgAspectRatio readSvgAspectRatio(const rtl::OUString& rCandidate) + SvgAspectRatio readSvgAspectRatio(const OUString& rCandidate) { const sal_Int32 nLen(rCandidate.getLength()); @@ -1245,7 +1245,7 @@ namespace svgio { const sal_Int32 nInitPos(nPos); skip_char(rCandidate, sal_Unicode(' '), nPos, nLen); - rtl::OUStringBuffer aTokenName; + OUStringBuffer aTokenName; copyString(rCandidate, nPos, aTokenName, nLen); if(aTokenName.getLength()) @@ -1353,7 +1353,7 @@ namespace svgio return SvgAspectRatio(); } - bool readSvgStringVector(const rtl::OUString& rCandidate, SvgStringVector& rSvgStringVector) + bool readSvgStringVector(const OUString& rCandidate, SvgStringVector& rSvgStringVector) { rSvgStringVector.clear(); const sal_Int32 nLen(rCandidate.getLength()); @@ -1361,14 +1361,14 @@ namespace svgio if(nLen) { sal_Int32 nPos(0); - rtl::OUStringBuffer aTokenValue; + OUStringBuffer aTokenValue; skip_char(rCandidate, sal_Unicode(' '), sal_Unicode(','), nPos, nLen); while(nPos < nLen) { copyToLimiter(rCandidate, sal_Unicode(','), nPos, aTokenValue, nLen); skip_char(rCandidate, sal_Unicode(','), sal_Unicode(' '), nPos, nLen); - const rtl::OUString aString = aTokenValue.makeStringAndClear(); + const OUString aString = aTokenValue.makeStringAndClear(); if(aString.getLength()) { @@ -1380,9 +1380,9 @@ namespace svgio return !rSvgStringVector.empty(); } - void readImageLink(const rtl::OUString& rCandidate, rtl::OUString& rXLink, rtl::OUString& rUrl, rtl::OUString& rMimeType, rtl::OUString& rData) + void readImageLink(const OUString& rCandidate, OUString& rXLink, OUString& rUrl, OUString& rMimeType, OUString& rData) { - rXLink = rUrl = rMimeType = rData = rtl::OUString(); + rXLink = rUrl = rMimeType = rData = OUString(); if(sal_Unicode('#') == rCandidate[0]) { @@ -1391,14 +1391,14 @@ namespace svgio } else { - static rtl::OUString aStrData(rtl::OUString::createFromAscii("data:")); + static OUString aStrData(OUString::createFromAscii("data:")); if(rCandidate.match(aStrData, 0)) { // embedded data sal_Int32 nPos(aStrData.getLength()); sal_Int32 nLen(rCandidate.getLength()); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; // read mime type skip_char(rCandidate, sal_Unicode(' '), nPos, nLen); @@ -1408,13 +1408,13 @@ namespace svgio if(rMimeType.getLength() && nPos < nLen) { - static rtl::OUString aStrImage(rtl::OUString::createFromAscii("image")); + static OUString aStrImage(OUString::createFromAscii("image")); if(rMimeType.match(aStrImage, 0)) { // image data - rtl::OUString aData(rCandidate.copy(nPos)); - static rtl::OUString aStrBase64(rtl::OUString::createFromAscii("base64")); + OUString aData(rCandidate.copy(nPos)); + static OUString aStrBase64(OUString::createFromAscii("base64")); if(aData.match(aStrBase64, 0)) { @@ -1440,14 +1440,14 @@ namespace svgio } } - rtl::OUString convert(const rtl::OUString& rCandidate, const sal_Unicode& rPattern, const sal_Unicode& rNew, bool bRemove) + OUString convert(const OUString& rCandidate, const sal_Unicode& rPattern, const sal_Unicode& rNew, bool bRemove) { const sal_Int32 nLen(rCandidate.getLength()); if(nLen) { sal_Int32 nPos(0); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; bool bChanged(false); while(nPos < nLen) @@ -1480,14 +1480,14 @@ namespace svgio return rCandidate; } - rtl::OUString consolidateContiguosSpace(const rtl::OUString& rCandidate) + OUString consolidateContiguosSpace(const OUString& rCandidate) { const sal_Int32 nLen(rCandidate.getLength()); if(nLen) { sal_Int32 nPos(0); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; bool bInsideSpace(false); const sal_Unicode aSpace(' '); @@ -1527,14 +1527,14 @@ namespace svgio return rCandidate; } - rtl::OUString whiteSpaceHandlingDefault(const rtl::OUString& rCandidate) + OUString whiteSpaceHandlingDefault(const OUString& rCandidate) { const sal_Unicode aNewline('\n'); const sal_Unicode aTab('\t'); const sal_Unicode aSpace(' '); // remove all newline characters - rtl::OUString aRetval(convert(rCandidate, aNewline, aNewline, true)); + OUString aRetval(convert(rCandidate, aNewline, aNewline, true)); // convert tab to space aRetval = convert(aRetval, aTab, aSpace, false); @@ -1548,14 +1548,14 @@ namespace svgio return aRetval; } - rtl::OUString whiteSpaceHandlingPreserve(const rtl::OUString& rCandidate) + OUString whiteSpaceHandlingPreserve(const OUString& rCandidate) { const sal_Unicode aNewline('\n'); const sal_Unicode aTab('\t'); const sal_Unicode aSpace(' '); // convert newline to space - rtl::OUString aRetval(convert(rCandidate, aNewline, aSpace, false)); + OUString aRetval(convert(rCandidate, aNewline, aSpace, false)); // convert tab to space aRetval = convert(rCandidate, aTab, aSpace, false); diff --git a/svgio/source/svgreader/svgtrefnode.cxx b/svgio/source/svgreader/svgtrefnode.cxx index 7e4586345908..98563bc01336 100644 --- a/svgio/source/svgreader/svgtrefnode.cxx +++ b/svgio/source/svgreader/svgtrefnode.cxx @@ -44,7 +44,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgTrefNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgTrefNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgtspannode.cxx b/svgio/source/svgreader/svgtspannode.cxx index 177830c770f9..96f521f819f0 100644 --- a/svgio/source/svgreader/svgtspannode.cxx +++ b/svgio/source/svgreader/svgtspannode.cxx @@ -43,7 +43,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgTspanNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgTspanNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx index d978f39ab352..65a6949595a6 100644 --- a/svgio/source/svgreader/svgusenode.cxx +++ b/svgio/source/svgreader/svgusenode.cxx @@ -48,13 +48,13 @@ namespace svgio const SvgStyleAttributes* SvgUseNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("use")); + static OUString aClassStr(OUString::createFromAscii("use")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgUseNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgUseNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index 23742d7f0754..126eb43a37a6 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -58,12 +58,12 @@ namespace svgio // XSvgParser virtual uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > SAL_CALL getDecomposition( const uno::Reference< ::io::XInputStream >& xSVGStream, - const ::rtl::OUString& aAbsolutePath) throw (uno::RuntimeException); + const OUString& aAbsolutePath) 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 svgreader } // end of namespace svgio @@ -75,17 +75,17 @@ namespace svgio { namespace svgreader { - uno::Sequence< rtl::OUString > XSvgParser_getSupportedServiceNames() + uno::Sequence< OUString > XSvgParser_getSupportedServiceNames() { - static rtl::OUString aServiceName("com.sun.star.graphic.SvgTools" ); - static uno::Sequence< rtl::OUString > aServiceNames( &aServiceName, 1 ); + static OUString aServiceName("com.sun.star.graphic.SvgTools" ); + static uno::Sequence< OUString > aServiceNames( &aServiceName, 1 ); return( aServiceNames ); } - rtl::OUString XSvgParser_getImplementationName() + OUString XSvgParser_getImplementationName() { - return rtl::OUString( "svgio::svgreader::XSvgParser" ); + return OUString( "svgio::svgreader::XSvgParser" ); } uno::Reference< uno::XInterface > SAL_CALL XSvgParser_createInstance(const uno::Reference< uno::XComponentContext >& context) @@ -113,7 +113,7 @@ namespace svgio uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > XSvgParser::getDecomposition( const uno::Reference< ::io::XInputStream >& xSVGStream, - const ::rtl::OUString& aAbsolutePath ) throw (uno::RuntimeException) + const OUString& aAbsolutePath ) throw (uno::RuntimeException) { drawinglayer::primitive2d::Primitive2DSequence aRetval; @@ -173,14 +173,14 @@ namespace svgio return aRetval; } - rtl::OUString SAL_CALL XSvgParser::getImplementationName() throw(uno::RuntimeException) + OUString SAL_CALL XSvgParser::getImplementationName() throw(uno::RuntimeException) { return(XSvgParser_getImplementationName()); } - sal_Bool SAL_CALL XSvgParser::supportsService(const rtl::OUString& rServiceName) throw(uno::RuntimeException) + sal_Bool SAL_CALL XSvgParser::supportsService(const OUString& rServiceName) throw(uno::RuntimeException) { - const uno::Sequence< rtl::OUString > aServices(XSvgParser_getSupportedServiceNames()); + const uno::Sequence< OUString > aServices(XSvgParser_getSupportedServiceNames()); for(sal_Int32 nService(0); nService < aServices.getLength(); nService++) { @@ -193,7 +193,7 @@ namespace svgio return sal_False; } - uno::Sequence< rtl::OUString > SAL_CALL XSvgParser::getSupportedServiceNames() throw(uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL XSvgParser::getSupportedServiceNames() throw(uno::RuntimeException) { return XSvgParser_getSupportedServiceNames(); } diff --git a/svgio/source/svguno/xsvgparser.hxx b/svgio/source/svguno/xsvgparser.hxx index 861f322a0f8b..43bcaf1abd99 100644 --- a/svgio/source/svguno/xsvgparser.hxx +++ b/svgio/source/svguno/xsvgparser.hxx @@ -41,9 +41,9 @@ XSvgParser_createInstance( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &); -rtl::OUString SAL_CALL XSvgParser_getImplementationName(); +OUString SAL_CALL XSvgParser_getImplementationName(); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL +com::sun::star::uno::Sequence< OUString > SAL_CALL XSvgParser_getSupportedServiceNames(); } } diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx index 613fca989aa4..7dd741592015 100644 --- a/svl/inc/svl/aeitem.hxx +++ b/svl/inc/svl/aeitem.hxx @@ -44,14 +44,14 @@ public: ~SfxAllEnumItem(); void InsertValue( sal_uInt16 nValue ); - void InsertValue( sal_uInt16 nValue, const rtl::OUString &rText ); + void InsertValue( sal_uInt16 nValue, const OUString &rText ); void RemoveValue( sal_uInt16 nValue ); sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const; virtual sal_uInt16 GetValueCount() const; virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const; - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; virtual sal_Bool IsEnabled( sal_uInt16 ) const; diff --git a/svl/inc/svl/asiancfg.hxx b/svl/inc/svl/asiancfg.hxx index db213c8f16f7..9824a6a7a059 100644 --- a/svl/inc/svl/asiancfg.hxx +++ b/svl/inc/svl/asiancfg.hxx @@ -53,12 +53,12 @@ public: GetStartEndCharLocales() const; bool GetStartEndChars( - com::sun::star::lang::Locale const & locale, rtl::OUString & startChars, - rtl::OUString & endChars) const; + com::sun::star::lang::Locale const & locale, OUString & startChars, + OUString & endChars) const; void SetStartEndChars( com::sun::star::lang::Locale const & locale, - rtl::OUString const * startChars, rtl::OUString const * endChars); + OUString const * startChars, OUString const * endChars); private: struct Impl; diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx index 470c6d6f8cc4..35024c3a6d44 100644 --- a/svl/inc/svl/cenumitm.hxx +++ b/svl/inc/svl/cenumitm.hxx @@ -52,7 +52,7 @@ public: virtual sal_uInt16 GetValueCount() const = 0; - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual sal_uInt16 GetValueByPos(sal_uInt16 nPos) const; @@ -158,7 +158,7 @@ public: virtual sal_uInt16 GetValueCount() const; - virtual rtl::OUString GetValueTextByVal(sal_Bool bTheValue) const; + virtual OUString GetValueTextByVal(sal_Bool bTheValue) const; sal_Bool GetValue() const { return m_bValue; } diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx index d810a1b4752b..581c558b2575 100644 --- a/svl/inc/svl/cntwall.hxx +++ b/svl/inc/svl/cntwall.hxx @@ -31,7 +31,7 @@ class SvStream; class SVL_DLLPUBLIC CntWallpaperItem : public SfxPoolItem { private: - rtl::OUString _aURL; + OUString _aURL; Color _nColor; sal_uInt16 _nStyle; @@ -55,11 +55,11 @@ public: virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - void SetBitmapURL( const rtl::OUString& rURL ) { _aURL = rURL; } + void SetBitmapURL( const OUString& rURL ) { _aURL = rURL; } void SetColor( Color nColor ) { _nColor = nColor; } void SetStyle( sal_uInt16 nStyle ) { _nStyle = nStyle; } - const rtl::OUString& GetBitmapURL() const { return _aURL; } + const OUString& GetBitmapURL() const { return _aURL; } Color GetColor() const { return _nColor; } sal_uInt16 GetStyle() const { return _nStyle; } }; diff --git a/svl/inc/svl/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx index f0c105e17200..437b59fbf127 100644 --- a/svl/inc/svl/documentlockfile.hxx +++ b/svl/inc/svl/documentlockfile.hxx @@ -39,14 +39,14 @@ class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > OpenStream(); - void WriteEntryToStream( ::com::sun::star::uno::Sequence< ::rtl::OUString > aEntry, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xStream ); + void WriteEntryToStream( ::com::sun::star::uno::Sequence< OUString > aEntry, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xStream ); public: - DocumentLockFile( const ::rtl::OUString& aOrigURL ); + DocumentLockFile( const OUString& aOrigURL ); ~DocumentLockFile(); sal_Bool CreateOwnLockFile(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetLockData(); + ::com::sun::star::uno::Sequence< OUString > GetLockData(); sal_Bool OverwriteOwnLockFile(); void RemoveFile(); diff --git a/svl/inc/svl/filenotation.hxx b/svl/inc/svl/filenotation.hxx index 91686dedf16c..00c2c16ed77c 100644 --- a/svl/inc/svl/filenotation.hxx +++ b/svl/inc/svl/filenotation.hxx @@ -34,8 +34,8 @@ namespace svt class SVL_DLLPUBLIC OFileNotation { protected: - ::rtl::OUString m_sSystem; - ::rtl::OUString m_sFileURL; + OUString m_sSystem; + OUString m_sFileURL; public: enum NOTATION @@ -44,15 +44,15 @@ namespace svt N_URL }; - OFileNotation( const ::rtl::OUString& _rUrlOrPath ); - OFileNotation( const ::rtl::OUString& _rUrlOrPath, NOTATION _eInputNotation ); + OFileNotation( const OUString& _rUrlOrPath ); + OFileNotation( const OUString& _rUrlOrPath, NOTATION _eInputNotation ); - ::rtl::OUString get(NOTATION _eOutputNotation); + OUString get(NOTATION _eOutputNotation); private: - SVL_DLLPRIVATE void construct( const ::rtl::OUString& _rUrlOrPath ); - SVL_DLLPRIVATE bool implInitWithSystemNotation( const ::rtl::OUString& _rSystemPath ); - SVL_DLLPRIVATE bool implInitWithURLNotation( const ::rtl::OUString& _rURL ); + SVL_DLLPRIVATE void construct( const OUString& _rUrlOrPath ); + SVL_DLLPRIVATE bool implInitWithSystemNotation( const OUString& _rSystemPath ); + SVL_DLLPRIVATE bool implInitWithURLNotation( const OUString& _rURL ); }; //......................................................................... diff --git a/svl/inc/svl/fstathelper.hxx b/svl/inc/svl/fstathelper.hxx index ec92dee4a8d0..9e69c6ed28ec 100644 --- a/svl/inc/svl/fstathelper.hxx +++ b/svl/inc/svl/fstathelper.hxx @@ -39,18 +39,18 @@ namespace FStatHelper { @return it was be able to get the date/time stamp */ -SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const rtl::OUString& rURL, +SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const OUString& rURL, Date* pDate, Time* pTime ); /** Return if under the URL a document exist. This is only a wrapper for the UCB.IsContent. */ -SVL_DLLPUBLIC sal_Bool IsDocument( const rtl::OUString& rURL ); +SVL_DLLPUBLIC sal_Bool IsDocument( const OUString& rURL ); /** Return if under the URL a folder exist. This is only a wrapper for the UCB.isFolder. */ -SVL_DLLPUBLIC sal_Bool IsFolder( const rtl::OUString& rURL ); +SVL_DLLPUBLIC sal_Bool IsFolder( const OUString& rURL ); } diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx index 3a2c208b654b..48fca19aa5d6 100644 --- a/svl/inc/svl/inettype.hxx +++ b/svl/inc/svl/inettype.hxx @@ -256,7 +256,7 @@ public: static INetContentType GetContentType(OUString const & rTypeName); - static rtl::OUString GetContentType(INetContentType eTypeID); + static OUString GetContentType(INetContentType eTypeID); static OUString GetPresentation(INetContentType eTypeID, const LanguageTag& aLocale); diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 8636c2847c7f..ab9ff84d173d 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -129,7 +129,7 @@ protected: public: SfxItemPool( const SfxItemPool &rPool, sal_Bool bCloneStaticDefaults = sal_False ); - SfxItemPool( const rtl::OUString &rName, + SfxItemPool( const OUString &rName, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxItemInfo *pItemInfos, SfxPoolItem **pDefaults = 0, @@ -158,7 +158,7 @@ public: const IntlWrapper * pIntlWrapper = 0 ) const; virtual SfxItemPool* Clone() const; - const rtl::OUString& GetName() const; + const OUString& GetName() const; virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ); virtual void Remove( const SfxPoolItem& ); diff --git a/svl/inc/svl/itemprop.hxx b/svl/inc/svl/itemprop.hxx index 055948bad54e..c1b7ed68b400 100644 --- a/svl/inc/svl/itemprop.hxx +++ b/svl/inc/svl/itemprop.hxx @@ -72,7 +72,7 @@ struct SfxItemPropertySimpleEntry }; struct SfxItemPropertyNamedEntry : public SfxItemPropertySimpleEntry { - ::rtl::OUString sName; + OUString sName; SfxItemPropertyNamedEntry( const String& rName, const SfxItemPropertySimpleEntry& rSimpleEntry) : SfxItemPropertySimpleEntry( rSimpleEntry ), sName( rName ){} @@ -88,11 +88,11 @@ public: SfxItemPropertyMap( const SfxItemPropertyMap& rSource ); ~SfxItemPropertyMap(); - const SfxItemPropertySimpleEntry* getByName( const ::rtl::OUString &rName ) const; + const SfxItemPropertySimpleEntry* getByName( const OUString &rName ) const; com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties() const; - com::sun::star::beans::Property getPropertyByName( const ::rtl::OUString rName ) const + com::sun::star::beans::Property getPropertyByName( const OUString rName ) const throw( ::com::sun::star::beans::UnknownPropertyException ); - sal_Bool hasPropertyByName( const ::rtl::OUString& rName ) const; + sal_Bool hasPropertyByName( const OUString& rName ) const; void mergeProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rPropSeq ); PropertyEntryVector_t getPropertyEntries() const; @@ -116,13 +116,13 @@ public: const SfxItemSet& rSet, com::sun::star::uno::Any& rAny) const throw(::com::sun::star::uno::RuntimeException); - void getPropertyValue( const ::rtl::OUString &rName, + void getPropertyValue( const OUString &rName, const SfxItemSet& rSet, com::sun::star::uno::Any& rAny) const throw(::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); com::sun::star::uno::Any - getPropertyValue( const ::rtl::OUString &rName, + getPropertyValue( const OUString &rName, const SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); @@ -131,7 +131,7 @@ public: SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException); - void setPropertyValue( const ::rtl::OUString& rPropertyName, + void setPropertyValue( const OUString& rPropertyName, const com::sun::star::uno::Any& aVal, SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, @@ -139,7 +139,7 @@ public: ::com::sun::star::beans::UnknownPropertyException); com::sun::star::beans::PropertyState - getPropertyState(const ::rtl::OUString& rName, const SfxItemSet& rSet)const + getPropertyState(const OUString& rName, const SfxItemSet& rSet)const throw(com::sun::star::beans::UnknownPropertyException); com::sun::star::beans::PropertyState getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const @@ -166,12 +166,12 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::beans::Property SAL_CALL - getPropertyByName( const ::rtl::OUString& aName ) + getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - hasPropertyByName( const ::rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException); }; @@ -190,11 +190,11 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::beans::Property SAL_CALL - getPropertyByName( const ::rtl::OUString& aName ) + getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - hasPropertyByName( const ::rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx index 6bb0b5ed693a..ef8fb1b4ae5d 100644 --- a/svl/inc/svl/languageoptions.hxx +++ b/svl/inc/svl/languageoptions.hxx @@ -96,14 +96,14 @@ public: class SVL_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem { private: - ::rtl::OUString m_sWin16SystemLocale; + OUString m_sWin16SystemLocale; public: SvtSystemLanguageOptions(); ~SvtSystemLanguageOptions(); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); LanguageType GetWin16SystemLanguage(); }; diff --git a/svl/inc/svl/lngmisc.hxx b/svl/inc/svl/lngmisc.hxx index 72b5aab2b04a..c1b4a0160277 100644 --- a/svl/inc/svl/lngmisc.hxx +++ b/svl/inc/svl/lngmisc.hxx @@ -43,12 +43,12 @@ namespace linguistic return cChar < static_cast(' '); } - SVL_DLLPRIVATE sal_Int32 GetNumControlChars( const rtl::OUString &rTxt ); + SVL_DLLPRIVATE sal_Int32 GetNumControlChars( const OUString &rTxt ); - SVL_DLLPUBLIC bool RemoveHyphens(rtl::OUString &rTxt); - SVL_DLLPUBLIC bool RemoveControlChars(rtl::OUString &rTxt); - SVL_DLLPUBLIC bool ReplaceControlChars(rtl::OUString &rTxt); - SVL_DLLPUBLIC ::rtl::OUString GetThesaurusReplaceText(const ::rtl::OUString &rText); + SVL_DLLPUBLIC bool RemoveHyphens(OUString &rTxt); + SVL_DLLPUBLIC bool RemoveControlChars(OUString &rTxt); + SVL_DLLPUBLIC bool ReplaceControlChars(OUString &rTxt); + SVL_DLLPUBLIC OUString GetThesaurusReplaceText(const OUString &rText); } // namespace linguistic #endif diff --git a/svl/inc/svl/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx index bcf0d58088dd..b9f62cd78504 100644 --- a/svl/inc/svl/lockfilecommon.hxx +++ b/svl/inc/svl/lockfilecommon.hxx @@ -45,21 +45,21 @@ class SVL_DLLPUBLIC LockFileCommon { protected: ::osl::Mutex m_aMutex; - ::rtl::OUString m_aURL; + OUString m_aURL; INetURLObject ResolveLinks( const INetURLObject& aDocURL ); public: - LockFileCommon( const ::rtl::OUString& aOrigURL, const ::rtl::OUString& aPrefix ); + LockFileCommon( const OUString& aOrigURL, const OUString& aPrefix ); ~LockFileCommon(); - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > ParseList( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > ParseEntry( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); - static ::rtl::OUString ParseName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); - static ::rtl::OUString EscapeCharacters( const ::rtl::OUString& aSource ); - static ::rtl::OUString GetOOOUserName(); - static ::rtl::OUString GetCurrentLocalTime(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > GenerateOwnEntry(); + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > ParseList( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer ); + static ::com::sun::star::uno::Sequence< OUString > ParseEntry( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); + static OUString ParseName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos ); + static OUString EscapeCharacters( const OUString& aSource ); + static OUString GetOOOUserName(); + static OUString GetCurrentLocalTime(); + static ::com::sun::star::uno::Sequence< OUString > GenerateOwnEntry(); }; } diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx index 8433ddb664a5..9d73f6a3ded3 100644 --- a/svl/inc/svl/macitem.hxx +++ b/svl/inc/svl/macitem.hxx @@ -60,25 +60,25 @@ class SjJSbxObject; class SVL_DLLPUBLIC SvxMacro { - ::rtl::OUString aMacName; - ::rtl::OUString aLibName; + OUString aMacName; + OUString aLibName; // Fuer JavaScript muss ein Function-Objekt gehalten werden SjJSbxObjectBase* pFunctionObject; ScriptType eType; public: - SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLanguage); + SvxMacro( const OUString &rMacName, const OUString &rLanguage); - SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLibName, + SvxMacro( const OUString &rMacName, const OUString &rLibName, ScriptType eType); // = STARBASIC entfernt - SvxMacro( SjJSbxObjectBase* _pFunctionObject, const ::rtl::OUString &rSource ); + SvxMacro( SjJSbxObjectBase* _pFunctionObject, const OUString &rSource ); ~SvxMacro(); // noetig fuer pFunctionObject - const ::rtl::OUString &GetLibName() const { return aLibName; } - const ::rtl::OUString &GetMacName() const { return aMacName; } - ::rtl::OUString GetLanguage()const; + const OUString &GetLibName() const { return aLibName; } + const OUString &GetMacName() const { return aMacName; } + OUString GetLanguage()const; ScriptType GetScriptType() const { return eType; } @@ -93,12 +93,12 @@ public: SvxMacro& operator=( const SvxMacro& rBase ); }; -inline SvxMacro::SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLibName, +inline SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLibName, ScriptType eTyp ) : aMacName( rMacName ), aLibName( rLibName ), pFunctionObject(NULL), eType( eTyp ) {} -inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const ::rtl::OUString &rSource ) +inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const OUString &rSource ) : aMacName( rSource ), pFunctionObject( _pFunctionObject ), eType( JAVASCRIPT ) {} diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx index 5597f8ff10d6..e4cead159c8b 100644 --- a/svl/inc/svl/ownlist.hxx +++ b/svl/inc/svl/ownlist.hxx @@ -40,17 +40,17 @@ class SvCommand aus: Kommando = Argument. */ { - ::rtl::OUString aCommand; - ::rtl::OUString aArgument; + OUString aCommand; + OUString aArgument; public: SvCommand() {} - SvCommand( const ::rtl::OUString & rCommand, const ::rtl::OUString & rArg ) + SvCommand( const OUString & rCommand, const OUString & rArg ) { aCommand = rCommand; aArgument = rArg; } - const ::rtl::OUString & GetCommand() const { return aCommand; } - const ::rtl::OUString & GetArgument() const { return aArgument; } + const OUString & GetCommand() const { return aCommand; } + const OUString & GetArgument() const { return aArgument; } }; typedef ::std::vector< SvCommand > SvCommandList_impl; @@ -68,8 +68,8 @@ private: SvCommandList_impl aCommandList; public: - SvCommand& Append( const ::rtl::OUString & rCommand, const ::rtl::OUString & rArg ); - bool AppendCommands( const ::rtl::OUString & rCmd, sal_Int32 * pEaten ); + SvCommand& Append( const OUString & rCommand, const OUString & rArg ); + bool AppendCommands( const OUString & rCmd, sal_Int32 * pEaten ); bool FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index 4e50e1ceb270..2feea5f5ddbd 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -234,7 +234,7 @@ public: @return True if the string was successfuly read and reconstructed. */ - static rtl::OUString readByteString(SvStream & rStream); + static OUString readByteString(SvStream & rStream); /** Write a byte string representation of a Unicode string into a stream. @@ -244,7 +244,7 @@ public: @param rString Some Unicode string. */ static void writeByteString(SvStream & rStream, - const rtl::OUString& rString); + const OUString& rString); /** Read in a Unicode string from either a streamed Unicode or byte string representation. @@ -257,7 +257,7 @@ public: @return On success, returns the reconstructed Unicode string. */ - static rtl::OUString readUnicodeString(SvStream & rStream, bool bUnicode); + static OUString readUnicodeString(SvStream & rStream, bool bUnicode); /** Write a Unicode string representation of a Unicode string into a stream. @@ -267,7 +267,7 @@ public: @param rString Some Unicode string. */ static void writeUnicodeString(SvStream & rStream, - const rtl::OUString& rString); + const OUString& rString); private: SfxPoolItem& operator=( const SfxPoolItem& ); // n.i.!! diff --git a/svl/inc/svl/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx index 8ac3abacd969..d2c842d98ebb 100644 --- a/svl/inc/svl/sharecontrolfile.hxx +++ b/svl/inc/svl/sharecontrolfile.hxx @@ -47,7 +47,7 @@ class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable; ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > m_aUsersData; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > m_aUsersData; void OpenStream(); void Close(); @@ -59,14 +59,14 @@ class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon public: // The constructor will throw exception in case the stream can not be opened - ShareControlFile( const ::rtl::OUString& aOrigURL ); + ShareControlFile( const OUString& aOrigURL ); ~ShareControlFile(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > GetUsersData(); - void SetUsersDataAndStore( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aUserNames ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > InsertOwnEntry(); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > GetUsersData(); + void SetUsersDataAndStore( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aUserNames ); + ::com::sun::star::uno::Sequence< OUString > InsertOwnEntry(); bool HasOwnEntry(); - void RemoveEntry( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aOptionalSpecification = ::com::sun::star::uno::Sequence< ::rtl::OUString >() ); + void RemoveEntry( const ::com::sun::star::uno::Sequence< OUString >& aOptionalSpecification = ::com::sun::star::uno::Sequence< OUString >() ); void RemoveFile(); }; diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx index a374377bfef0..90c873119b80 100644 --- a/svl/inc/svl/slstitm.hxx +++ b/svl/inc/svl/slstitm.hxx @@ -50,8 +50,8 @@ public: virtual void SetString( const XubString& ); virtual XubString GetString(); - void SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList ); - void GetStringList( com::sun::star::uno::Sequence< rtl::OUString >& rList ) const; + void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ); + void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx index 739b985278cb..5d4413ea8cab 100644 --- a/svl/inc/svl/srchitem.hxx +++ b/svl/inc/svl/srchitem.hxx @@ -92,7 +92,7 @@ public: OUString &rText, const IntlWrapper * = 0 ) const; // ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); virtual void Commit(); sal_uInt16 GetCommand() const { return nCommand; } diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index e1c1b554ee36..664ca5cb1ec2 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -110,10 +110,10 @@ public: /** returns the display name of this style, it is used at the user interface. If the display name is empty, this method returns the internal name. */ - virtual rtl::OUString GetDisplayName() const; + virtual OUString GetDisplayName() const; // sets the display name of this style - virtual void SetDisplayName( const rtl::OUString& ); + virtual void SetDisplayName( const OUString& ); virtual const UniString& GetParent() const; virtual bool SetParent( const UniString& ); @@ -169,7 +169,7 @@ public: virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx); virtual SfxStyleSheetBase* First(); virtual SfxStyleSheetBase* Next(); - virtual SfxStyleSheetBase* Find(const rtl::OUString& rStr); + virtual SfxStyleSheetBase* Find(const OUString& rStr); virtual ~SfxStyleSheetIterator(); protected: @@ -284,7 +284,7 @@ public: protected: SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2 - : SfxStyleSheetBase(rtl::OUString("dummy"), + : SfxStyleSheetBase(OUString("dummy"), NULL, SFX_STYLE_FAMILY_ALL, 0) { assert(false); diff --git a/svl/inc/svl/stylepool.hxx b/svl/inc/svl/stylepool.hxx index 172b152fd116..deaed2591a83 100644 --- a/svl/inc/svl/stylepool.hxx +++ b/svl/inc/svl/stylepool.hxx @@ -73,7 +73,7 @@ public: virtual ~StylePool(); - static ::rtl::OUString nameOf( SfxItemSet_Pointer_t pSet ); + static OUString nameOf( SfxItemSet_Pointer_t pSet ); }; class SVL_DLLPUBLIC IStylePoolIteratorAccess @@ -83,7 +83,7 @@ public: If there is no more SfxItemSet, the delivered share_pointer is empty. */ virtual StylePool::SfxItemSet_Pointer_t getNext() = 0; - virtual ::rtl::OUString getName() = 0; + virtual OUString getName() = 0; virtual ~IStylePoolIteratorAccess() {}; }; #endif diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx index 785c1f4183da..c8a08beffbb9 100644 --- a/svl/inc/svl/svdde.hxx +++ b/svl/inc/svl/svdde.hxx @@ -108,7 +108,7 @@ public: virtual ~DdeTransaction(); bool IsBusy() { return bBusy; } - const rtl::OUString GetName() const; + const OUString GetName() const; void Execute(); @@ -258,7 +258,7 @@ public: DdeItem( const DdeItem& ); virtual ~DdeItem(); - const rtl::OUString GetName() const; + const OUString GetName() const; short GetLinks(); void NotifyClient(); }; @@ -294,7 +294,7 @@ public: virtual sal_Bool Put( const DdeData* ); virtual sal_Bool Execute( const String* ); // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden - virtual sal_Bool MakeItem( const rtl::OUString& rItem ); + virtual sal_Bool MakeItem( const OUString& rItem ); // es wird ein Warm-/Hot-Link eingerichtet. Return-Wert // besagt ob es geklappt hat @@ -308,7 +308,7 @@ private: private: DdeString* pName; - rtl::OUString aItem; + OUString aItem; std::vector aItems; Link aConnectLink; Link aDisconnectLink; @@ -317,10 +317,10 @@ private: Link aExecLink; public: - DdeTopic( SAL_UNUSED_PARAMETER const rtl::OUString& ); + DdeTopic( SAL_UNUSED_PARAMETER const OUString& ); virtual ~DdeTopic(); - const rtl::OUString GetName() const; + const OUString GetName() const; long GetConvId(); void SetConnectHdl( const Link& rLink ) { aConnectLink = rLink; } @@ -340,7 +340,7 @@ public: void InsertItem( DdeItem* ); // fuer eigene Ableitungen! DdeItem* AddItem( const DdeItem& ); // werden kopiert ! void RemoveItem( const DdeItem& ); - const rtl::OUString& GetCurItem() { return aItem; } + const OUString& GetCurItem() { return aItem; } const std::vector& GetItems() const { return aItems; } private: @@ -360,7 +360,7 @@ public: virtual sal_Bool IsBusy(); virtual String GetHelp(); // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden - virtual sal_Bool MakeTopic( const rtl::OUString& rItem ); + virtual sal_Bool MakeTopic( const OUString& rItem ); protected: virtual String Topics(); @@ -385,7 +385,7 @@ public: DdeService( SAL_UNUSED_PARAMETER const String& ); virtual ~DdeService(); - const rtl::OUString GetName() const; + const OUString GetName() const; short GetError() { return nStatus; } static DdeServices& GetServices(); diff --git a/svl/inc/svl/urihelper.hxx b/svl/inc/svl/urihelper.hxx index c00d5331472a..321d9cd2ae0b 100644 --- a/svl/inc/svl/urihelper.hxx +++ b/svl/inc/svl/urihelper.hxx @@ -92,7 +92,7 @@ SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference normalizedMakeRelative( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context, - rtl::OUString const & baseUriReference, rtl::OUString const & uriReference); + OUString const & baseUriReference, OUString const & uriReference); /** A variant of normalizedMakeRelative with a simplified interface. diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx index a5ad679f8665..adb72d0578e7 100644 --- a/svl/inc/svl/visitem.hxx +++ b/svl/inc/svl/visitem.hxx @@ -75,7 +75,7 @@ public: virtual sal_uInt16 GetValueCount() const; - virtual rtl::OUString GetValueTextByVal(sal_Bool bTheValue) const; + virtual OUString GetValueTextByVal(sal_Bool bTheValue) const; sal_Bool GetValue() const { return m_nValue.bVisible; } diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index dd8e9ff60f50..20cc4d110c24 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -683,7 +683,7 @@ private: { return ImpGetNatNumString( rNum, nVal, nMinDigits ); } - return rtl::OUString::valueOf(nVal); + return OUString::valueOf(nVal); } // transliterate according to NativeNumber diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index d67a2c3b2168..ec88131b9e11 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -60,8 +60,6 @@ #endif using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #if DEBUG_UNIT_TEST using ::std::cout; @@ -73,7 +71,7 @@ namespace { #if DEBUG_UNIT_TEST ::std::ostream& operator<< (::std::ostream& os, const OUString& str) { - return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); + return os << OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); } #endif diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 90ca5fa71044..3d160d66bee5 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -79,10 +79,10 @@ public: return m_identifier; } - virtual rtl::OUString SAL_CALL getContentType() + virtual OUString SAL_CALL getContentType() throw (css::uno::RuntimeException) { - return rtl::OUString(); + return OUString(); } virtual void SAL_CALL addContentEventListener( @@ -123,7 +123,7 @@ Content::Content( m_identifier(identifier) { assert(m_identifier.is()); - rtl::OUString uri(m_identifier->getContentIdentifier()); + OUString uri(m_identifier->getContentIdentifier()); if (!uri.matchIgnoreAsciiCase(m_prefix) || uri.indexOf('#', RTL_CONSTASCII_LENGTH(m_prefix)) != -1) { @@ -146,10 +146,10 @@ css::uno::Any Content::execute( // otherwise, if the last non-empty segment starts with '1', add a final // slash, and if the last non-empty segment starts with '2', remove a final // slash (if any); also, turn the given uri into all-lowercase: - rtl::OUString uri(m_identifier->getContentIdentifier()); + OUString uri(m_identifier->getContentIdentifier()); sal_Unicode c = '0'; for (sal_Int32 i = RTL_CONSTASCII_LENGTH(m_prefix); i != -1;) { - rtl::OUString seg(uri.getToken(0, '/', i)); + OUString seg(uri.getToken(0, '/', i)); if (seg.getLength() > 0) { c = seg[0]; if (c < '0' || c > '2') { @@ -228,7 +228,7 @@ void Test::finish() { void Test::testNormalizedMakeRelative() { css::ucb::UniversalContentBroker::create(m_context)-> registerContentProvider( - new Provider, rtl::OUString("test"), + new Provider, OUString("test"), true); struct Data { char const * base; @@ -259,14 +259,14 @@ void Test::testNormalizedMakeRelative() { for (std::size_t i = 0; i < SAL_N_ELEMENTS(tests); ++i) { css::uno::Reference< css::uri::XUriReference > ref( URIHelper::normalizedMakeRelative( - m_context, rtl::OUString::createFromAscii(tests[i].base), - rtl::OUString::createFromAscii(tests[i].absolute))); + m_context, OUString::createFromAscii(tests[i].base), + OUString::createFromAscii(tests[i].absolute))); bool ok = tests[i].relative == 0 ? !ref.is() : ref.is() && ref->getUriReference().equalsAscii(tests[i].relative); - rtl::OString msg; + OString msg; if (!ok) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append('<'); buf.append(tests[i].base); buf.append(">, <"); @@ -275,7 +275,7 @@ void Test::testNormalizedMakeRelative() { if (ref.is()) { buf.append('<'); buf.append( - rtl::OUStringToOString( + OUStringToOString( ref->getUriReference(), RTL_TEXTENCODING_UTF8)); buf.append('>'); } else { @@ -386,19 +386,19 @@ void Test::testFindFirstURLInText() { }; CharClass charClass( m_context, LanguageTag( com::sun::star::lang::Locale("en", "US", ""))); for (std::size_t i = 0; i < SAL_N_ELEMENTS(tests); ++i) { - rtl::OUString input(rtl::OUString::createFromAscii(tests[i].input)); + OUString input(OUString::createFromAscii(tests[i].input)); sal_Int32 begin = 0; sal_Int32 end = input.getLength(); - rtl::OUString result( + OUString result( URIHelper::FindFirstURLInText(input, begin, end, charClass)); bool ok = tests[i].result == 0 ? (result.getLength() == 0 && begin == input.getLength() && end == input.getLength()) : (result.equalsAscii(tests[i].result) && begin == tests[i].begin && end == tests[i].end); - rtl::OString msg; + OString msg; if (!ok) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append('"'); buf.append(tests[i].input); buf.append("\" -> "); @@ -409,7 +409,7 @@ void Test::testFindFirstURLInText() { buf.append(static_cast< sal_Int32 >(tests[i].end)); buf.append(')'); buf.append(" != "); - buf.append(rtl::OUStringToOString(result, RTL_TEXTENCODING_UTF8)); + buf.append(OUStringToOString(result, RTL_TEXTENCODING_UTF8)); buf.append(" ("); buf.append(static_cast< sal_Int32 >(begin)); buf.append(", "); diff --git a/svl/qa/unit/test_lngmisc.cxx b/svl/qa/unit/test_lngmisc.cxx index febc64b533b8..3381126aff1e 100644 --- a/svl/qa/unit/test_lngmisc.cxx +++ b/svl/qa/unit/test_lngmisc.cxx @@ -58,16 +58,16 @@ namespace void LngMiscTest::testRemoveHyphens() { - ::rtl::OUString str1(""); - ::rtl::OUString str2("a-b--c---"); + OUString str1(""); + OUString str2("a-b--c---"); - ::rtl::OUStringBuffer str3Buf; + OUStringBuffer str3Buf; str3Buf.append(SVT_SOFT_HYPHEN); str3Buf.append(SVT_HARD_HYPHEN); str3Buf.append(SVT_HARD_HYPHEN); - ::rtl::OUString str3(str3Buf.makeStringAndClear()); + OUString str3(str3Buf.makeStringAndClear()); - ::rtl::OUString str4("asdf"); + OUString str4("asdf"); bool bModified = linguistic::RemoveHyphens(str1); CPPUNIT_ASSERT(!bModified); @@ -89,17 +89,17 @@ namespace void LngMiscTest::testRemoveControlChars() { - ::rtl::OUString str1(""); - ::rtl::OUString str2("asdf"); - ::rtl::OUString str3("asdf\nasdf"); + OUString str1(""); + OUString str2("asdf"); + OUString str3("asdf\nasdf"); - ::rtl::OUStringBuffer str4Buf(33); + OUStringBuffer str4Buf(33); str4Buf.setLength(33); for(int i = 0; i < 33; i++) str4Buf[i] = static_cast(i); // TODO: is this a bug? shouldn't RemoveControlChars remove this? // str4Buf[33] = static_cast(0x7F); - ::rtl::OUString str4(str4Buf.makeStringAndClear()); + OUString str4(str4Buf.makeStringAndClear()); bool bModified = linguistic::RemoveControlChars(str1); CPPUNIT_ASSERT(!bModified); @@ -120,17 +120,17 @@ namespace void LngMiscTest::testReplaceControlChars() { - ::rtl::OUString str1(""); - ::rtl::OUString str2("asdf"); - ::rtl::OUString str3("asdf\nasdf"); + OUString str1(""); + OUString str2("asdf"); + OUString str3("asdf\nasdf"); - ::rtl::OUStringBuffer str4Buf(33); + OUStringBuffer str4Buf(33); str4Buf.setLength(33); for(int i = 0; i < 33; i++) str4Buf[i] = static_cast(i); // TODO: is this a bug? shouldn't RemoveControlChars remove this? // str4Buf[33] = static_cast(0x7F); - ::rtl::OUString str4(str4Buf.makeStringAndClear()); + OUString str4(str4Buf.makeStringAndClear()); bool bModified = linguistic::ReplaceControlChars(str1); CPPUNIT_ASSERT(!bModified); @@ -153,16 +153,16 @@ namespace void LngMiscTest::testGetThesaurusReplaceText() { - const ::rtl::OUString str1(""); - const ::rtl::OUString str2("asdf"); - const ::rtl::OUString str3("asdf (abc)"); - const ::rtl::OUString str4("asdf*"); - const ::rtl::OUString str5("asdf * "); - const ::rtl::OUString str6("asdf (abc) *"); - const ::rtl::OUString str7("asdf asdf * (abc)"); - const ::rtl::OUString str8(" * (abc) asdf *"); + const OUString str1(""); + const OUString str2("asdf"); + const OUString str3("asdf (abc)"); + const OUString str4("asdf*"); + const OUString str5("asdf * "); + const OUString str6("asdf (abc) *"); + const OUString str7("asdf asdf * (abc)"); + const OUString str8(" * (abc) asdf *"); - ::rtl::OUString r = linguistic::GetThesaurusReplaceText(str1); + OUString r = linguistic::GetThesaurusReplaceText(str1); CPPUNIT_ASSERT(r.isEmpty()); r = linguistic::GetThesaurusReplaceText(str2); diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx index 29868af5e5f7..57d903c91e1f 100644 --- a/svl/source/config/asiancfg.cxx +++ b/svl/source/config/asiancfg.cxx @@ -44,11 +44,11 @@ namespace { -rtl::OUString toString(css::lang::Locale const & locale) { +OUString toString(css::lang::Locale const & locale) { SAL_WARN_IF( locale.Language.indexOf('-') != -1, "svl", "Locale language \"" << locale.Language << "\" contains \"-\""); - rtl::OUStringBuffer buf(locale.Language); + OUStringBuffer buf(locale.Language); SAL_WARN_IF( locale.Country.isEmpty() && !locale.Variant.isEmpty(), "svl", "Locale has empty country but non-empty variant \"" << locale.Variant @@ -113,7 +113,7 @@ void SvxAsianConfig::SetCharDistanceCompression(sal_Int16 value) { css::uno::Sequence< css::lang::Locale > SvxAsianConfig::GetStartEndCharLocales() const { - css::uno::Sequence< rtl::OUString > ns( + css::uno::Sequence< OUString > ns( officecfg::Office::Common::AsianLayout::StartEndCharacters::get( impl_->context)-> getElementNames()); @@ -128,8 +128,8 @@ css::uno::Sequence< css::lang::Locale > SvxAsianConfig::GetStartEndCharLocales() } bool SvxAsianConfig::GetStartEndChars( - css::lang::Locale const & locale, rtl::OUString & startChars, - rtl::OUString & endChars) const + css::lang::Locale const & locale, OUString & startChars, + OUString & endChars) const { css::uno::Reference< css::container::XNameAccess > set( officecfg::Office::Common::AsianLayout::StartEndCharacters::get( @@ -143,20 +143,20 @@ bool SvxAsianConfig::GetStartEndChars( css::uno::Reference< css::beans::XPropertySet > el( v.get< css::uno::Reference< css::beans::XPropertySet > >(), css::uno::UNO_SET_THROW); - startChars = el->getPropertyValue("StartCharacters").get< rtl::OUString >(); - endChars = el->getPropertyValue("EndCharacters").get< rtl::OUString >(); + startChars = el->getPropertyValue("StartCharacters").get< OUString >(); + endChars = el->getPropertyValue("EndCharacters").get< OUString >(); return true; } void SvxAsianConfig::SetStartEndChars( - css::lang::Locale const & locale, rtl::OUString const * startChars, - rtl::OUString const * endChars) + css::lang::Locale const & locale, OUString const * startChars, + OUString const * endChars) { assert((startChars == 0) == (endChars == 0)); css::uno::Reference< css::container::XNameContainer > set( officecfg::Office::Common::AsianLayout::StartEndCharacters::get( impl_->batch, impl_->context)); - rtl::OUString name(toString(locale)); + OUString name(toString(locale)); if (startChars == 0) { try { set->removeByName(name); diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 1ba855cb36cc..ed152c198e09 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -63,7 +63,7 @@ public: SvtCJKOptions_Impl(); ~SvtCJKOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); virtual void Commit(); void Load(); diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 78f0a548d3e9..05904ded71bf 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -61,7 +61,7 @@ public: SvtCTLOptions_Impl(); ~SvtCTLOptions_Impl(); - virtual void Notify( const Sequence< rtl::OUString >& _aPropertyNames ); + virtual void Notify( const Sequence< OUString >& _aPropertyNames ); virtual void Commit(); void Load(); @@ -92,7 +92,7 @@ public: namespace { struct PropertyNames - : public rtl::Static< Sequence< rtl::OUString >, PropertyNames > {}; + : public rtl::Static< Sequence< OUString >, PropertyNames > {}; } //------------------------------------------------------------------------------ bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const @@ -136,7 +136,7 @@ SvtCTLOptions_Impl::~SvtCTLOptions_Impl() Commit(); } // ----------------------------------------------------------------------------- -void SvtCTLOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtCTLOptions_Impl::Notify( const Sequence< OUString >& ) { Load(); NotifyListeners(SFX_HINT_CTL_SETTINGS_CHANGED); @@ -144,14 +144,14 @@ void SvtCTLOptions_Impl::Notify( const Sequence< rtl::OUString >& ) // ----------------------------------------------------------------------------- void SvtCTLOptions_Impl::Commit() { - Sequence< rtl::OUString > &rPropertyNames = PropertyNames::get(); - rtl::OUString* pOrgNames = rPropertyNames.getArray(); + Sequence< OUString > &rPropertyNames = PropertyNames::get(); + OUString* pOrgNames = rPropertyNames.getArray(); sal_Int32 nOrgCount = rPropertyNames.getLength(); - Sequence< rtl::OUString > aNames( nOrgCount ); + Sequence< OUString > aNames( nOrgCount ); Sequence< Any > aValues( nOrgCount ); - rtl::OUString* pNames = aNames.getArray(); + OUString* pNames = aNames.getArray(); Any* pValues = aValues.getArray(); sal_Int32 nRealCount = 0; @@ -236,11 +236,11 @@ void SvtCTLOptions_Impl::Commit() // ----------------------------------------------------------------------------- void SvtCTLOptions_Impl::Load() { - Sequence< rtl::OUString >& rPropertyNames = PropertyNames::get(); + Sequence< OUString >& rPropertyNames = PropertyNames::get(); if ( !rPropertyNames.getLength() ) { rPropertyNames.realloc(6); - rtl::OUString* pNames = rPropertyNames.getArray(); + OUString* pNames = rPropertyNames.getArray(); pNames[0] = "CTLFont"; pNames[1] = "CTLSequenceChecking"; pNames[2] = "CTLCursorMovement"; diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index e8129d35a6c9..f2d9f71ec468 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -52,8 +52,8 @@ ItemHolder2::ItemHolder2() if(bMessage) { bMessage = sal_False; - ::rtl::OString sMsg("CreateInstance with arguments exception: "); - sMsg += ::rtl::OString(rEx.Message.getStr(), + OString sMsg("CreateInstance with arguments exception: "); + sMsg += OString(rEx.Message.getStr(), rEx.Message.getLength(), RTL_TEXTENCODING_ASCII_US); OSL_FAIL(sMsg.getStr()); diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index 98b9bdee1e91..eb7a711d54ff 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -171,8 +171,8 @@ sal_uInt16 SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang ) SvtSystemLanguageOptions::SvtSystemLanguageOptions() : utl::ConfigItem( "System/L10N") { - uno::Sequence< rtl::OUString > aPropertyNames(1); - rtl::OUString* pNames = aPropertyNames.getArray(); + uno::Sequence< OUString > aPropertyNames(1); + OUString* pNames = aPropertyNames.getArray(); pNames[0] = "SystemLocale"; uno::Sequence< uno::Any > aValues = GetProperties( aPropertyNames ); @@ -191,7 +191,7 @@ void SvtSystemLanguageOptions::Commit() //does nothing } -void SvtSystemLanguageOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SvtSystemLanguageOptions::Notify( const com::sun::star::uno::Sequence< OUString >& ) { // no listeners supported yet } diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index dc762a73ace0..ffe84f83be3c 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -37,18 +37,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.FileSystemStorageFactory"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.FileSystemStorageFactory"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.FileSystemStorageFactory"); + aRet[1] = OUString("com.sun.star.comp.embed.FileSystemStorageFactory"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL FSStorageFactory::impl_staticGetImplementationName() +OUString SAL_CALL FSStorageFactory::impl_staticGetImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.FileSystemStorageFactory"); + return OUString("com.sun.star.comp.embed.FileSystemStorageFactory"); } //------------------------------------------------------------------------- @@ -63,7 +63,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance() throw ( uno::Exception, uno::RuntimeException ) { - ::rtl::OUString aTempURL; + OUString aTempURL; aTempURL = ::utl::TempFile( NULL, sal_True ).GetURL(); @@ -119,7 +119,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA } // retrieve storage source URL - ::rtl::OUString aURL; + OUString aURL; if ( !( aArguments[0] >>= aURL ) || aURL.isEmpty() ) { @@ -165,17 +165,17 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL FSStorageFactory::getImplementationName() +OUString SAL_CALL FSStorageFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL FSStorageFactory::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL FSStorageFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName.compareTo( aSeq[nInd] ) == 0 ) @@ -185,7 +185,7 @@ sal_Bool SAL_CALL FSStorageFactory::supportsService( const ::rtl::OUString& Serv } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL FSStorageFactory::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL FSStorageFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 6cb798d0e38a..41bf495b4195 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -65,9 +65,9 @@ using namespace ::com::sun::star; //========================================================= // TODO: move to a standard helper -sal_Bool isLocalFile_Impl( ::rtl::OUString aURL ) +sal_Bool isLocalFile_Impl( OUString aURL ) { - ::rtl::OUString aSystemPath; + OUString aSystemPath; try { @@ -88,7 +88,7 @@ sal_Bool isLocalFile_Impl( ::rtl::OUString aURL ) struct FSStorage_Impl { - ::rtl::OUString m_aURL; + OUString m_aURL; ::ucbhelper::Content* m_pContent; sal_Int32 m_nMode; @@ -99,7 +99,7 @@ struct FSStorage_Impl uno::Reference< lang::XMultiServiceFactory > m_xFactory; - FSStorage_Impl( const ::rtl::OUString& aURL, sal_Int32 nMode, uno::Reference< lang::XMultiServiceFactory > xFactory ) + FSStorage_Impl( const OUString& aURL, sal_Int32 nMode, uno::Reference< lang::XMultiServiceFactory > xFactory ) : m_aURL( aURL ) , m_pContent( NULL ) , m_nMode( nMode ) @@ -168,10 +168,10 @@ FSStorage::~FSStorage() } //----------------------------------------------- -sal_Bool FSStorage::MakeFolderNoUI( const ::rtl::OUString& rFolder ) +sal_Bool FSStorage::MakeFolderNoUI( const OUString& rFolder ) { INetURLObject aURL( rFolder ); - ::rtl::OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); aURL.removeSegment(); ::ucbhelper::Content aParent; ::ucbhelper::Content aResultContent; @@ -206,9 +206,9 @@ sal_Bool FSStorage::MakeFolderNoUI( const ::rtl::OUString& rFolder ) } //----------------------------------------------- -void FSStorage::CopyStreamToSubStream( const ::rtl::OUString& aSourceURL, +void FSStorage::CopyStreamToSubStream( const OUString& aSourceURL, const uno::Reference< embed::XStorage >& xDest, - const ::rtl::OUString& aNewEntryName ) + const OUString& aNewEntryName ) { if ( !xDest.is() ) throw uno::RuntimeException(); @@ -242,10 +242,10 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const // get list of contents of the Content // create cursor for access to children - uno::Sequence< ::rtl::OUString > aProps( 2 ); - ::rtl::OUString* pProps = aProps.getArray(); - pProps[0] = ::rtl::OUString("TargetURL"); - pProps[1] = ::rtl::OUString("IsFolder"); + uno::Sequence< OUString > aProps( 2 ); + OUString* pProps = aProps.getArray(); + pProps[0] = OUString("TargetURL"); + pProps[1] = OUString("IsFolder"); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; try @@ -258,11 +258,11 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const // go through the list: insert files as streams, insert folders as substorages using recursion while ( xResultSet->next() ) { - ::rtl::OUString aSourceURL( xRow->getString( 1 ) ); + OUString aSourceURL( xRow->getString( 1 ) ); sal_Bool bIsFolder( xRow->getBoolean(2) ); // TODO/LATER: not sure whether the entry name must be encoded - ::rtl::OUString aNewEntryName( INetURLObject( aSourceURL ).getName( INetURLObject::LAST_SEGMENT, + OUString aNewEntryName( INetURLObject( aSourceURL ).getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::NO_DECODE ) ); if ( bIsFolder ) @@ -429,7 +429,7 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } @@ -437,7 +437,7 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& //----------------------------------------------- uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( - const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode ) + const OUString& aStreamName, sal_Int32 nOpenMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::WrongPasswordException, @@ -538,7 +538,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } @@ -548,7 +548,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( //----------------------------------------------- uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement( - const ::rtl::OUString&, sal_Int32, const ::rtl::OUString& ) + const OUString&, sal_Int32, const OUString& ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::NoEncryptionException, @@ -562,7 +562,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement( //----------------------------------------------- uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( - const ::rtl::OUString& aStorName, sal_Int32 nStorageMode ) + const OUString& aStorName, sal_Int32 nStorageMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, io::IOException, @@ -646,7 +646,7 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } @@ -655,7 +655,7 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( } //----------------------------------------------- -uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rtl::OUString& aStreamName ) +uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const OUString& aStreamName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::WrongPasswordException, @@ -721,7 +721,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } @@ -731,8 +731,8 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt //----------------------------------------------- uno::Reference< io::XStream > SAL_CALL FSStorage::cloneEncryptedStreamElement( - const ::rtl::OUString&, - const ::rtl::OUString& ) + const OUString&, + const OUString& ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::NoEncryptionException, @@ -758,7 +758,7 @@ void SAL_CALL FSStorage::copyLastCommitTo( //----------------------------------------------- void SAL_CALL FSStorage::copyStorageElementLastCommitTo( - const ::rtl::OUString& aStorName, + const OUString& aStorName, const uno::Reference< embed::XStorage >& xTargetStorage ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -777,7 +777,7 @@ void SAL_CALL FSStorage::copyStorageElementLastCommitTo( } //----------------------------------------------- -sal_Bool SAL_CALL FSStorage::isStreamElement( const ::rtl::OUString& aElementName ) +sal_Bool SAL_CALL FSStorage::isStreamElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -798,7 +798,7 @@ sal_Bool SAL_CALL FSStorage::isStreamElement( const ::rtl::OUString& aElementNam } //----------------------------------------------- -sal_Bool SAL_CALL FSStorage::isStorageElement( const ::rtl::OUString& aElementName ) +sal_Bool SAL_CALL FSStorage::isStorageElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -819,7 +819,7 @@ sal_Bool SAL_CALL FSStorage::isStorageElement( const ::rtl::OUString& aElementNa } //----------------------------------------------- -void SAL_CALL FSStorage::removeElement( const ::rtl::OUString& aElementName ) +void SAL_CALL FSStorage::removeElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -846,7 +846,7 @@ void SAL_CALL FSStorage::removeElement( const ::rtl::OUString& aElementName ) } //----------------------------------------------- -void SAL_CALL FSStorage::renameElement( const ::rtl::OUString& aElementName, const ::rtl::OUString& aNewName ) +void SAL_CALL FSStorage::renameElement( const OUString& aElementName, const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -919,16 +919,16 @@ void SAL_CALL FSStorage::renameElement( const ::rtl::OUString& aElementName, con catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } } //----------------------------------------------- -void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName, +void SAL_CALL FSStorage::copyElementTo( const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -1004,16 +1004,16 @@ void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName, catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } } //----------------------------------------------- -void SAL_CALL FSStorage::moveElementTo( const ::rtl::OUString& aElementName, +void SAL_CALL FSStorage::moveElementTo( const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -1036,7 +1036,7 @@ void SAL_CALL FSStorage::moveElementTo( const ::rtl::OUString& aElementName, //____________________________________________________________________________________________________ //----------------------------------------------- -uno::Any SAL_CALL FSStorage::getByName( const ::rtl::OUString& aName ) +uno::Any SAL_CALL FSStorage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1084,7 +1084,7 @@ uno::Any SAL_CALL FSStorage::getByName( const ::rtl::OUString& aName ) catch ( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetException( ::rtl::OUString("Can not open element!\n"), + throw lang::WrappedTargetException( OUString("Can not open element!\n"), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1095,7 +1095,7 @@ uno::Any SAL_CALL FSStorage::getByName( const ::rtl::OUString& aName ) //----------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() +uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames() throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1106,12 +1106,12 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() if ( !GetContent() ) throw io::IOException(); // TODO: error handling - uno::Sequence< ::rtl::OUString > aProps( 1 ); - ::rtl::OUString* pProps = aProps.getArray(); - pProps[0] = ::rtl::OUString("Title"); + uno::Sequence< OUString > aProps( 1 ); + OUString* pProps = aProps.getArray(); + pProps[0] = OUString("Title"); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; - uno::Sequence< ::rtl::OUString > aResult; + uno::Sequence< OUString > aResult; sal_Int32 nSize = 0; try @@ -1124,7 +1124,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() // go through the list while ( xResultSet->next() ) { - ::rtl::OUString aName( xRow->getString( 1 ) ); + OUString aName( xRow->getString( 1 ) ); aResult.realloc( ++nSize ); aResult[nSize-1] = aName; } @@ -1137,7 +1137,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() else { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetRuntimeException( ::rtl::OUString("Can not open storage!\n"), + throw lang::WrappedTargetRuntimeException( OUString("Can not open storage!\n"), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1150,7 +1150,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() catch ( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetRuntimeException( ::rtl::OUString("Can not open storage!\n"), + throw lang::WrappedTargetRuntimeException( OUString("Can not open storage!\n"), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1161,7 +1161,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames() //----------------------------------------------- -sal_Bool SAL_CALL FSStorage::hasByName( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL FSStorage::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1184,7 +1184,7 @@ sal_Bool SAL_CALL FSStorage::hasByName( const ::rtl::OUString& aName ) catch ( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw lang::WrappedTargetRuntimeException( ::rtl::OUString("Can not open storage!\n"), + throw lang::WrappedTargetRuntimeException( OUString("Can not open storage!\n"), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -1222,8 +1222,8 @@ sal_Bool SAL_CALL FSStorage::hasElements() if ( !GetContent() ) throw io::IOException(); // TODO: error handling - uno::Sequence< ::rtl::OUString > aProps( 1 ); - aProps[0] = ::rtl::OUString("TargetURL"); + uno::Sequence< OUString > aProps( 1 ); + aProps[0] = OUString("TargetURL"); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; try @@ -1310,7 +1310,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL FSStorage::getPropertySetInfo //----------------------------------------------- -void SAL_CALL FSStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& ) +void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const uno::Any& ) throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, @@ -1330,7 +1330,7 @@ void SAL_CALL FSStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, //----------------------------------------------- -uno::Any SAL_CALL FSStorage::getPropertyValue( const ::rtl::OUString& aPropertyName ) +uno::Any SAL_CALL FSStorage::getPropertyValue( const OUString& aPropertyName ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1351,7 +1351,7 @@ uno::Any SAL_CALL FSStorage::getPropertyValue( const ::rtl::OUString& aPropertyN //----------------------------------------------- void SAL_CALL FSStorage::addPropertyChangeListener( - const ::rtl::OUString& /*aPropertyName*/, + const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1368,7 +1368,7 @@ void SAL_CALL FSStorage::addPropertyChangeListener( //----------------------------------------------- void SAL_CALL FSStorage::removePropertyChangeListener( - const ::rtl::OUString& /*aPropertyName*/, + const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1385,7 +1385,7 @@ void SAL_CALL FSStorage::removePropertyChangeListener( //----------------------------------------------- void SAL_CALL FSStorage::addVetoableChangeListener( - const ::rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1402,7 +1402,7 @@ void SAL_CALL FSStorage::addVetoableChangeListener( //----------------------------------------------- void SAL_CALL FSStorage::removeVetoableChangeListener( - const ::rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1420,7 +1420,7 @@ void SAL_CALL FSStorage::removeVetoableChangeListener( // XHierarchicalStorageAccess //____________________________________________________________________________________________________ //----------------------------------------------- -uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode ) +uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::WrongPasswordException, @@ -1535,7 +1535,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl catch( uno::Exception& ) { uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"), + throw embed::StorageWrappedTargetException( OUString("Can't copy raw stream"), uno::Reference< io::XInputStream >(), aCaught ); } @@ -1544,7 +1544,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl } //----------------------------------------------- -uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& /*sStreamName*/, ::sal_Int32 /*nOpenMode*/, const ::rtl::OUString& /*sPassword*/ ) +uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncryptedStreamElementByHierarchicalName( const OUString& /*sStreamName*/, ::sal_Int32 /*nOpenMode*/, const OUString& /*sPassword*/ ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::NoEncryptionException, @@ -1557,7 +1557,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncrypte } //----------------------------------------------- -void SAL_CALL FSStorage::removeStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath ) +void SAL_CALL FSStorage::removeStreamElementByHierarchicalName( const OUString& sStreamPath ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx index 8c23e61665ee..71dcf676e5d6 100644 --- a/svl/source/fsstor/fsstorage.hxx +++ b/svl/source/fsstor/fsstorage.hxx @@ -57,14 +57,14 @@ public: ::ucbhelper::Content* GetContent(); - void CopyStreamToSubStream( const ::rtl::OUString& aSourceURL, + void CopyStreamToSubStream( const OUString& aSourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, - const ::rtl::OUString& aNewEntryName ); + const OUString& aNewEntryName ); void CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest ); - static sal_Bool MakeFolderNoUI( const ::rtl::OUString& rFolder ); + static sal_Bool MakeFolderNoUI( const OUString& rFolder ); //____________________________________________________________________________________________________ // XInterface @@ -99,7 +99,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement( - const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode ) + const OUString& aStreamName, sal_Int32 nOpenMode ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::WrongPasswordException, @@ -108,7 +108,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( - const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const ::rtl::OUString& aPass ) + const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::NoEncryptionException, @@ -118,7 +118,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement( - const ::rtl::OUString& aStorName, sal_Int32 nStorageMode ) + const OUString& aStorName, sal_Int32 nStorageMode ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, @@ -126,7 +126,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement( - const ::rtl::OUString& aStreamName ) + const OUString& aStreamName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::WrongPasswordException, @@ -135,7 +135,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( - const ::rtl::OUString& aStreamName, const ::rtl::OUString& aPass ) + const OUString& aStreamName, const OUString& aPass ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::NoEncryptionException, @@ -153,7 +153,7 @@ public: ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL copyStorageElementLastCommitTo( - const ::rtl::OUString& aStorName, + const OUString& aStorName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTargetStorage ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, @@ -161,19 +161,19 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isStreamElement( const ::rtl::OUString& aElementName ) + virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isStorageElement( const ::rtl::OUString& aElementName ) + virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeElement( const ::rtl::OUString& aElementName ) + virtual void SAL_CALL removeElement( const OUString& aElementName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -181,7 +181,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL renameElement( const ::rtl::OUString& rEleName, const ::rtl::OUString& rNewName ) + virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -190,9 +190,9 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL copyElementTo( const ::rtl::OUString& aElementName, + virtual void SAL_CALL copyElementTo( const OUString& aElementName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -201,9 +201,9 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL moveElementTo( const ::rtl::OUString& aElementName, + virtual void SAL_CALL moveElementTo( const OUString& aElementName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, - const ::rtl::OUString& rNewName ) + const OUString& rNewName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -216,15 +216,15 @@ public: // XNameAccess //____________________________________________________________________________________________________ - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Type SAL_CALL getElementType() @@ -255,40 +255,40 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); @@ -297,7 +297,7 @@ public: // XHierarchicalStorageAccess //____________________________________________________________________________________________________ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::WrongPasswordException, @@ -305,7 +305,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::rtl::OUString& sPassword ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::packages::NoEncryptionException, @@ -314,7 +314,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeStreamElementByHierarchicalName( const ::rtl::OUString& sElementPath ) + virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index aa6269f3d219..2c08995f61ac 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -36,10 +36,10 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -51,9 +51,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index 5dfd5c6685ab..1c079484361d 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -49,18 +49,18 @@ class NamePassRecord { - ::rtl::OUString m_aName; + OUString m_aName; // there are two lists of passwords, memory passwords and persistent passwords bool m_bHasMemPass; - ::std::vector< ::rtl::OUString > m_aMemPass; + ::std::vector< OUString > m_aMemPass; // persistent passwords are encrypted in one string bool m_bHasPersPass; - ::rtl::OUString m_aPersPass; + OUString m_aPersPass; - void InitArrays( bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList, - bool bHasPersistentList, const ::rtl::OUString& aPersistentList ) + void InitArrays( bool bHasMemoryList, const ::std::vector< OUString >& aMemoryList, + bool bHasPersistentList, const OUString& aPersistentList ) { m_bHasMemPass = bHasMemoryList; if ( bHasMemoryList ) @@ -73,14 +73,14 @@ class NamePassRecord public: - NamePassRecord( const ::rtl::OUString& aName ) + NamePassRecord( const OUString& aName ) : m_aName( aName ) , m_bHasMemPass( false ) , m_bHasPersPass( false ) { } - NamePassRecord( const ::rtl::OUString& aName, const ::std::vector< ::rtl::OUString >& aMemoryList ) + NamePassRecord( const OUString& aName, const ::std::vector< OUString >& aMemoryList ) : m_aName( aName ) , m_bHasMemPass( true ) , m_aMemPass( aMemoryList ) @@ -88,7 +88,7 @@ public: { } - NamePassRecord( const ::rtl::OUString& aName, const ::rtl::OUString& aPersistentList ) + NamePassRecord( const OUString& aName, const OUString& aPersistentList ) : m_aName( aName ) , m_bHasMemPass( false ) , m_bHasPersPass( true ) @@ -96,9 +96,9 @@ public: { } - NamePassRecord( const ::rtl::OUString& aName, - bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList, - bool bHasPersistentList, const ::rtl::OUString aPersistentList ) + NamePassRecord( const OUString& aName, + bool bHasMemoryList, const ::std::vector< OUString >& aMemoryList, + bool bHasPersistentList, const OUString aPersistentList ) : m_aName( aName ) , m_bHasMemPass( bHasMemoryList ) , m_bHasPersPass( bHasPersistentList ) @@ -119,13 +119,13 @@ public: m_aName = aRecord.m_aName; m_aMemPass.clear(); - m_aPersPass = ::rtl::OUString(); + m_aPersPass = OUString(); InitArrays( aRecord.m_bHasMemPass, aRecord.m_aMemPass, aRecord.m_bHasPersPass, aRecord.m_aPersPass ); return *this; } - ::rtl::OUString GetUserName() const + OUString GetUserName() const { return m_aName; } @@ -140,29 +140,29 @@ public: return sal_False; } - ::std::vector< ::rtl::OUString > GetMemPasswords() const + ::std::vector< OUString > GetMemPasswords() const { if ( m_bHasMemPass ) return m_aMemPass; - return ::std::vector< ::rtl::OUString >(); + return ::std::vector< OUString >(); } - ::rtl::OUString GetPersPasswords() const + OUString GetPersPasswords() const { if ( m_bHasPersPass ) return m_aPersPass; - return ::rtl::OUString(); + return OUString(); } - void SetMemPasswords( const ::std::vector< ::rtl::OUString >& aMemList ) + void SetMemPasswords( const ::std::vector< OUString >& aMemList ) { m_aMemPass = aMemList; m_bHasMemPass = true; } - void SetPersPasswords( const ::rtl::OUString& aPersList ) + void SetPersPasswords( const OUString& aPersList ) { m_aPersPass = aPersList; m_bHasPersPass = true; @@ -178,7 +178,7 @@ public: else if ( nStatus == PERSISTENT_RECORD ) { m_bHasPersPass = false; - m_aPersPass = ::rtl::OUString(); + m_aPersPass = OUString(); } } @@ -186,8 +186,8 @@ public: //---------------------------------------------------------------------------------- -typedef ::std::pair< const ::rtl::OUString, ::std::list< NamePassRecord > > PairUrlRecord; -typedef ::std::map< ::rtl::OUString, ::std::list< NamePassRecord > > PassMap; +typedef ::std::pair< const OUString, ::std::list< NamePassRecord > > PairUrlRecord; +typedef ::std::map< OUString, ::std::list< NamePassRecord > > PassMap; //---------------------------------------------------------------------------------- @@ -196,30 +196,30 @@ class PasswordContainer; class StorageItem : public ::utl::ConfigItem { PasswordContainer* mainCont; bool hasEncoded; - ::rtl::OUString mEncoded; + OUString mEncoded; public: - StorageItem( PasswordContainer* point, const ::rtl::OUString& path ) : + StorageItem( PasswordContainer* point, const OUString& path ) : ConfigItem( path, CONFIG_MODE_IMMEDIATE_UPDATE ), mainCont( point ), hasEncoded( false ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNode( 1 ); + ::com::sun::star::uno::Sequence< OUString > aNode( 1 ); *aNode.getArray() = path; *aNode.getArray() += "/Store"; EnableNotification( aNode ); } PassMap getInfo(); - void update( const ::rtl::OUString& url, const NamePassRecord& rec ); - void remove( const ::rtl::OUString& url, const ::rtl::OUString& rec ); + void update( const OUString& url, const NamePassRecord& rec ); + void remove( const OUString& url, const OUString& rec ); void clear(); - bool getEncodedMP( ::rtl::OUString& aResult ); - void setEncodedMP( const ::rtl::OUString& aResult, bool bAcceptEnmpty = false ); + bool getEncodedMP( OUString& aResult ); + void setEncodedMP( const OUString& aResult, bool bAcceptEnmpty = false ); void setUseStorage( bool bUse ); bool useStorage(); - virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); }; @@ -240,7 +240,7 @@ private: PassMap m_aContainer; StorageItem* m_pStorageFile; ::osl::Mutex mMutex; - ::rtl::OUString m_aMasterPasswd; // master password is set when the string is not empty + OUString m_aMasterPasswd; // master password is set when the string is not empty ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mComponent; SysCredentialsConfig mUrlContainer; @@ -256,81 +256,81 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > FindUsr( const ::std::list< NamePassRecord >& userlist, - const ::rtl::OUString& name, + const OUString& name, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); bool createUrlRecord( const PassMap::iterator & rIter, bool bName, - const ::rtl::OUString & aName, + const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler, ::com::sun::star::task::UrlRecord & rRec ) throw( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::task::UrlRecord find( - const ::rtl::OUString& aURL, - const ::rtl::OUString& aName, + const OUString& aURL, + const OUString& aName, bool bName, // only needed to support empty user names const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString GetDefaultMasterPassword(); + OUString GetDefaultMasterPassword(); - ::rtl::OUString RequestPasswordFromUser( + OUString RequestPasswordFromUser( ::com::sun::star::task::PasswordRequestMode aRMode, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ); - ::rtl::OUString GetMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) + OUString GetMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - void UpdateVector( const ::rtl::OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile ) + void UpdateVector( const OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile ) throw(::com::sun::star::uno::RuntimeException); - void PrivateAdd( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords, + void PrivateAdd( const OUString& aUrl, + const OUString& aUserName, + const ::com::sun::star::uno::Sequence< OUString >& aPasswords, char aMode, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - ::std::vector< ::rtl::OUString > DecodePasswords( const ::rtl::OUString& aLine, const ::rtl::OUString& aMasterPassword ) + ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString EncodePasswords( ::std::vector< ::rtl::OUString > lines, const ::rtl::OUString& aMasterPassword ) + OUString EncodePasswords( ::std::vector< OUString > lines, const OUString& aMasterPassword ) throw(::com::sun::star::uno::RuntimeException); public: PasswordContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); ~PasswordContainer(); - virtual void SAL_CALL add( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords, + virtual void SAL_CALL add( const OUString& aUrl, + const OUString& aUserName, + const ::com::sun::star::uno::Sequence< OUString >& aPasswords, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPersistent( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords, + virtual void SAL_CALL addPersistent( const OUString& aUrl, + const OUString& aUserName, + const ::com::sun::star::uno::Sequence< OUString >& aPasswords, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::task::UrlRecord SAL_CALL - find( const ::rtl::OUString& aUrl, + find( const OUString& aUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::task::UrlRecord SAL_CALL - findForName( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, + findForName( const OUString& aUrl, + const OUString& aUserName, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName ) + virtual void SAL_CALL remove( const OUString& aUrl, + const OUString& aUserName ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePersistent( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName ) + virtual void SAL_CALL removePersistent( const OUString& aUrl, + const OUString& aUserName ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeAllPersistent() throw(::com::sun::star::uno::RuntimeException); @@ -340,8 +340,8 @@ public: // provide factory - static ::rtl::OUString SAL_CALL impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static OUString SAL_CALL impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager ) throw(::com::sun::star::uno::RuntimeException); @@ -349,10 +349,10 @@ public: impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XEventListener @@ -373,10 +373,10 @@ public: virtual ::sal_Bool SAL_CALL isDefaultMasterPasswordUsed( ) throw (::com::sun::star::uno::RuntimeException); // XUrlContainer - virtual void SAL_CALL addUrl( const ::rtl::OUString& Url, ::sal_Bool MakePersistent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL findUrl( const ::rtl::OUString& Url ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeUrl( const ::rtl::OUString& Url ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getUrls( ::sal_Bool OnlyPersistent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addUrl( const OUString& Url, ::sal_Bool MakePersistent ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL findUrl( const OUString& Url ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeUrl( const OUString& Url ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUrls( ::sal_Bool OnlyPersistent ) throw (::com::sun::star::uno::RuntimeException); void Notify(); }; diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 13477ebe278c..d3e2a8edb40e 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -66,7 +66,7 @@ struct SfxItemPool_Impl SfxBroadcaster aBC; std::vector maPoolItems; std::vector maSfxItemPoolUsers; /// ObjectUser section - rtl::OUString aName; + OUString aName; SfxPoolItem** ppPoolDefaults; SfxPoolItem** ppStaticDefaults; SfxItemPool* mpMaster; @@ -87,7 +87,7 @@ struct SfxItemPool_Impl bool bStreaming; // in Load() bzw. Store() bool mbPersistentRefCounts; - SfxItemPool_Impl( SfxItemPool* pMaster, const rtl::OUString& rName, sal_uInt16 nStart, sal_uInt16 nEnd ) + SfxItemPool_Impl( SfxItemPool* pMaster, const OUString& rName, sal_uInt16 nStart, sal_uInt16 nEnd ) : maPoolItems(nEnd - nStart + 1, static_cast(NULL)) , aName(rName) , ppPoolDefaults(new SfxPoolItem* [nEnd - nStart + 1]) diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index a079d99d301e..e699bd07fe1f 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -34,7 +34,7 @@ TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem) struct SfxAllEnumValue_Impl { sal_uInt16 nValue; - rtl::OUString aText; + OUString aText; }; class SfxAllEnumValueArr : public std::vector @@ -136,7 +136,7 @@ sal_uInt16 SfxAllEnumItem::GetValueCount() const // ----------------------------------------------------------------------- -rtl::OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const +OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_CHKTHIS(SfxAllEnumItem, 0); DBG_ASSERT( pValues && nPos < pValues->size(), "enum overflow" ); @@ -216,7 +216,7 @@ sal_uInt16 SfxAllEnumItem::GetPosByValue( sal_uInt16 nValue ) const // ----------------------------------------------------------------------- -void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const rtl::OUString &rValue ) +void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue ) { DBG_CHKTHIS(SfxAllEnumItem, 0); SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl; diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 200618e7d206..e9cb52366ba6 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -82,10 +82,10 @@ bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal, } //============================================================================ -rtl::OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const +OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const { DBG_WARNING("SfxEnumItemInterface::GetValueTextByPos(): Pure virtual"); - return rtl::OUString(); + return OUString(); } //============================================================================ @@ -272,9 +272,9 @@ sal_uInt16 CntBoolItem::GetValueCount() const //============================================================================ // virtual -rtl::OUString CntBoolItem::GetValueTextByVal(sal_Bool bTheValue) const +OUString CntBoolItem::GetValueTextByVal(sal_Bool bTheValue) const { - return bTheValue ? rtl::OUString("TRUE") : rtl::OUString("FALSE"); + return bTheValue ? OUString("TRUE") : OUString("FALSE"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index b62254c4bf72..285f07bc30e1 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -74,7 +74,7 @@ SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream, { // CntContentTypeItem used to be derived from CntStringItem, so take that // into account: - rtl::OUString aValue = readUnicodeString(rStream, nItemVersion >= 1); + OUString aValue = readUnicodeString(rStream, nItemVersion >= 1); sal_uInt32 nMagic = 0; rStream >> nMagic; if (nMagic == CNTSTRINGITEM_STREAM_MAGIC) @@ -199,7 +199,7 @@ void CntContentTypeItem::SetValue( const INetContentType eType ) // virtual bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8) const { - rVal <<= rtl::OUString(GetValue()); + rVal <<= OUString(GetValue()); return true; } @@ -207,7 +207,7 @@ bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8) // virtual bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8) { - rtl::OUString aValue; + OUString aValue; if ( rVal >>= aValue ) { // SetValue with an empty string resets the item; so call that diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index 7db9160139c0..9a127754ed16 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -74,7 +74,7 @@ bool SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const aSeq[0] = ::com::sun::star::uno::makeAny( GetValue() ); aSeq[1] = ::com::sun::star::uno::makeAny( pImp->nAngle ); aSeq[2] = ::com::sun::star::uno::makeAny( pImp->bMirrored ); - aSeq[3] = ::com::sun::star::uno::makeAny( rtl::OUString( pImp->aURL )); + aSeq[3] = ::com::sun::star::uno::makeAny( OUString( pImp->aURL )); rVal = ::com::sun::star::uno::makeAny( aSeq ); return true; @@ -86,7 +86,7 @@ bool SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) if (( rVal >>= aSeq ) && ( aSeq.getLength() == 4 )) { sal_Int16 nVal = sal_Int16(); - rtl::OUString aURL; + OUString aURL; if ( aSeq[0] >>= nVal ) SetValue( nVal ); aSeq[1] >>= pImp->nAngle; diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 54593b34be82..89a661858167 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -94,7 +94,7 @@ SfxBroadcaster& SfxItemPool::BC() SfxItemPool::SfxItemPool ( - const rtl::OUString& rName, /* Name des Pools zur Idetifikation + const OUString& rName, /* Name des Pools zur Idetifikation im File-Format */ sal_uInt16 nStartWhich, /* erste Which-Id des Pools */ sal_uInt16 nEndWhich, /* letzte Which-Id des Pools */ @@ -454,7 +454,7 @@ void SfxItemPool::SetDefaultMetric( SfxMapUnit eNewMetric ) pImp->eDefMetric = eNewMetric; } -const rtl::OUString& SfxItemPool::GetName() const +const OUString& SfxItemPool::GetName() const { return pImp->aName; } diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index b9a4cc6a4918..001ed129960c 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -33,15 +33,15 @@ using namespace com::sun::star::uno; struct equalOUString { - bool operator()(const ::rtl::OUString& r1, const ::rtl::OUString& r2) const + bool operator()(const OUString& r1, const OUString& r2) const { return r1.equals( r2 ); } }; -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, SfxItemPropertySimpleEntry, - ::rtl::OUStringHash, + OUStringHash, equalOUString > SfxItemPropertyHashMap_t; class SfxItemPropertyMap_Impl : public SfxItemPropertyHashMap_t @@ -64,7 +64,7 @@ SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries { while( pEntries->pName ) { - ::rtl::OUString sEntry(pEntries->pName, pEntries->nNameLen, RTL_TEXTENCODING_ASCII_US ); + OUString sEntry(pEntries->pName, pEntries->nNameLen, RTL_TEXTENCODING_ASCII_US ); (*m_pImpl) [ sEntry ] = pEntries; ++pEntries; } @@ -80,7 +80,7 @@ SfxItemPropertyMap::~SfxItemPropertyMap() delete m_pImpl; } -const SfxItemPropertySimpleEntry* SfxItemPropertyMap::getByName( const ::rtl::OUString &rName ) const +const SfxItemPropertySimpleEntry* SfxItemPropertyMap::getByName( const OUString &rName ) const { SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName); if( aIter == m_pImpl->end() ) @@ -114,7 +114,7 @@ uno::Sequence SfxItemPropertyMap::getProperties() const return m_pImpl->m_aPropSeq; } -beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rName ) const +beans::Property SfxItemPropertyMap::getPropertyByName( const OUString rName ) const throw( beans::UnknownPropertyException ) { SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName); @@ -130,7 +130,7 @@ beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rNa return aProp; } -sal_Bool SfxItemPropertyMap::hasPropertyByName( const ::rtl::OUString& rName ) const +sal_Bool SfxItemPropertyMap::hasPropertyByName( const OUString& rName ) const { SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName); return aIter != m_pImpl->end(); @@ -217,7 +217,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn } } -void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName, +void SfxItemPropertySet::getPropertyValue( const OUString &rName, const SfxItemSet& rSet, Any& rAny ) const throw(RuntimeException, UnknownPropertyException) { @@ -228,7 +228,7 @@ void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName, getPropertyValue( *pEntry,rSet, rAny ); } -Any SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName, +Any SfxItemPropertySet::getPropertyValue( const OUString &rName, const SfxItemSet& rSet ) const throw(RuntimeException, UnknownPropertyException) { @@ -276,7 +276,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn } } -void SfxItemPropertySet::setPropertyValue( const rtl::OUString &rName, +void SfxItemPropertySet::setPropertyValue( const OUString &rName, const Any& aVal, SfxItemSet& rSet ) const throw(RuntimeException, @@ -307,7 +307,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn return eRet; } PropertyState SfxItemPropertySet::getPropertyState( - const rtl::OUString& rName, const SfxItemSet& rSet) const + const OUString& rName, const SfxItemSet& rSet) const throw(UnknownPropertyException) { PropertyState eRet = PropertyState_DIRECT_VALUE; @@ -372,14 +372,14 @@ SfxItemPropertySetInfo::~SfxItemPropertySetInfo() } Property SAL_CALL - SfxItemPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) + SfxItemPropertySetInfo::getPropertyByName( const OUString& rName ) throw(UnknownPropertyException, RuntimeException) { return m_pImpl->m_pOwnMap->getPropertyByName( rName ); } sal_Bool SAL_CALL - SfxItemPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) + SfxItemPropertySetInfo::hasPropertyByName( const OUString& rName ) throw(RuntimeException) { return m_pImpl->m_pOwnMap->hasPropertyByName( rName ); @@ -404,14 +404,14 @@ Sequence< Property > SAL_CALL } Property SAL_CALL -SfxExtItemPropertySetInfo::getPropertyByName( const rtl::OUString& rPropertyName ) +SfxExtItemPropertySetInfo::getPropertyByName( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException) { return aExtMap.getPropertyByName( rPropertyName ); } sal_Bool SAL_CALL -SfxExtItemPropertySetInfo::hasPropertyByName( const rtl::OUString& rPropertyName ) +SfxExtItemPropertySetInfo::hasPropertyByName( const OUString& rPropertyName ) throw(RuntimeException) { return aExtMap.hasPropertyByName( rPropertyName ); diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 3bed1d719c4a..cd812c6c16d0 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -41,7 +41,7 @@ SjJSbxObjectBase* SjJSbxObjectBase::Clone( void ) return NULL; } -SvxMacro::SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLanguage) +SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLanguage) : aMacName( rMacName ), aLibName( rLanguage), pFunctionObject(NULL), eType( EXTENDED_STYPE) { @@ -57,19 +57,19 @@ SvxMacro::~SvxMacro() delete pFunctionObject; } -::rtl::OUString SvxMacro::GetLanguage()const +OUString SvxMacro::GetLanguage()const { if(eType==STARBASIC) { - return ::rtl::OUString(SVX_MACRO_LANGUAGE_STARBASIC); + return OUString(SVX_MACRO_LANGUAGE_STARBASIC); } else if(eType==JAVASCRIPT) { - return ::rtl::OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT); + return OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT); } else if(eType==EXTENDED_STYPE) { - return ::rtl::OUString(SVX_MACRO_LANGUAGE_SF); + return OUString(SVX_MACRO_LANGUAGE_SF); } return aLibName; diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index dc9bcc42948e..76ce00819a6d 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -550,7 +550,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) // Einzel-Header int bOwnPool = sal_True; - rtl::OUString aExternName; + OUString aExternName; { // Header-Record suchen SfxMiniRecordReader aPoolHeaderRec( &rStream, SFX_ITEMPOOL_REC_HEADER ); @@ -705,7 +705,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) // wenn nicht own-Pool, dann kein Name if ( aExternName != pImp->aName ) - pImp->aName = rtl::OUString(); + pImp->aName = OUString(); pImp->bStreaming = sal_False; return rStream; @@ -734,7 +734,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) } sal_uInt32 nAttribSize(0); int bOwnPool = sal_True; - rtl::OUString aExternName; + OUString aExternName; if ( pImp->nMajorVer > 1 || pImp->nMinorVer >= 2 ) rStream >> pImp->nLoadingVersion; aExternName = SfxPoolItem::readByteString(rStream); @@ -1011,7 +1011,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) } if ( aExternName != pImp->aName ) - pImp->aName = rtl::OUString(); + pImp->aName = OUString(); pImp->bStreaming = sal_False; return rStream; diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 532107f7b14f..6fc44fbe03be 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -177,21 +177,21 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const //============================================================================ // static -rtl::OUString SfxPoolItem::readByteString(SvStream& rStream) +OUString SfxPoolItem::readByteString(SvStream& rStream) { return rStream.ReadUniOrByteString(rStream.GetStreamCharSet()); } //============================================================================ // static -void SfxPoolItem::writeByteString(SvStream & rStream, const rtl::OUString& rString) +void SfxPoolItem::writeByteString(SvStream & rStream, const OUString& rString) { rStream.WriteUniOrByteString(rString, rStream.GetStreamCharSet()); } //============================================================================ // static -rtl::OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode) +OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode) { return rStream.ReadUniOrByteString(bUnicode ? RTL_TEXTENCODING_UCS2 : rStream.GetStreamCharSet()); @@ -199,7 +199,7 @@ rtl::OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode) //============================================================================ // static -void SfxPoolItem::writeUnicodeString(SvStream & rStream, const rtl::OUString& rString) +void SfxPoolItem::writeUnicodeString(SvStream & rStream, const OUString& rString) { rStream.WriteUniOrByteString(rString, RTL_TEXTENCODING_UCS2); } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index ea34fde877e8..7e7ab2ea4df1 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -271,7 +271,7 @@ XubString SfxStringListItem::GetString() //------------------------------------------------------------------------ -void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList ) +void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ) { DBG_ASSERT(GetRefCount()==0,"SetString:RefCount!=0"); @@ -290,7 +290,7 @@ void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl: } //---------------------------------------------------------------------------- -void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< rtl::OUString >& rList ) const +void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const { long nCount = pImp->aList.size(); @@ -303,7 +303,7 @@ void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< rtl::OUStr // virtual bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { - com::sun::star::uno::Sequence< rtl::OUString > aValue; + com::sun::star::uno::Sequence< OUString > aValue; if ( rVal >>= aValue ) { SetStringList( aValue ); @@ -321,7 +321,7 @@ bool SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) // GetString() is not const!!! SfxStringListItem* pThis = const_cast< SfxStringListItem * >( this ); - com::sun::star::uno::Sequence< rtl::OUString > aStringList; + com::sun::star::uno::Sequence< OUString > aStringList; pThis->GetStringList( aStringList ); rVal = ::com::sun::star::uno::makeAny( aStringList ); return true; diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 2560b0b78cda..e3212da4f9f8 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -59,7 +59,7 @@ TYPEINIT1_FACTORY(SvxSearchItem, SfxPoolItem, new SvxSearchItem(0)); // ----------------------------------------------------------------------- -static Sequence< ::rtl::OUString > lcl_GetNotifyNames() +static Sequence< OUString > lcl_GetNotifyNames() { // names of transliteration relevant properties static const char* aTranslitNames[] = @@ -86,10 +86,10 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames() }; const int nCount = SAL_N_ELEMENTS( aTranslitNames ); - Sequence< ::rtl::OUString > aNames( nCount ); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames( nCount ); + OUString* pNames = aNames.getArray(); for (sal_Int32 i = 0; i < nCount; ++i) - pNames[i] = ::rtl::OUString::createFromAscii( aTranslitNames[i] ); + pNames[i] = OUString::createFromAscii( aTranslitNames[i] ); return aNames; } @@ -98,12 +98,12 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames() SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), - ConfigItem( ::rtl::OUString(CFG_ROOT_NODE ) ), + ConfigItem( OUString(CFG_ROOT_NODE ) ), aSearchOpt ( SearchAlgorithms_ABSOLUTE, SearchFlags::LEV_RELAXED, - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), Locale(), 2, 2, 2, TransliterationModules_IGNORE_CASE ), @@ -186,7 +186,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : SfxPoolItem ( rItem ), - ConfigItem( ::rtl::OUString(CFG_ROOT_NODE ) ), + ConfigItem( OUString(CFG_ROOT_NODE ) ), aSearchOpt ( rItem.aSearchOpt ), eFamily ( rItem.eFamily ), @@ -268,7 +268,7 @@ SfxItemPresentation SvxSearchItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & ) +void SvxSearchItem::Notify( const Sequence< OUString > & ) { // applies transliteration changes in the configuration database // to the current SvxSearchItem @@ -361,29 +361,29 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe case 0 : { Sequence< PropertyValue > aSeq( SRCH_PARAMS ); - aSeq[0].Name = rtl::OUString( SRCH_PARA_OPTIONS ); + aSeq[0].Name = OUString( SRCH_PARA_OPTIONS ); aSeq[0].Value <<= aSearchOpt; - aSeq[1].Name = rtl::OUString( SRCH_PARA_FAMILY ); + aSeq[1].Name = OUString( SRCH_PARA_FAMILY ); aSeq[1].Value <<= sal_Int16( eFamily ); - aSeq[2].Name = rtl::OUString( SRCH_PARA_COMMAND ); + aSeq[2].Name = OUString( SRCH_PARA_COMMAND ); aSeq[2].Value <<= nCommand; - aSeq[3].Name = rtl::OUString( SRCH_PARA_CELLTYPE ); + aSeq[3].Name = OUString( SRCH_PARA_CELLTYPE ); aSeq[3].Value <<= nCellType; - aSeq[4].Name = rtl::OUString( SRCH_PARA_APPFLAG ); + aSeq[4].Name = OUString( SRCH_PARA_APPFLAG ); aSeq[4].Value <<= nAppFlag; - aSeq[5].Name = rtl::OUString( SRCH_PARA_ROWDIR ); + aSeq[5].Name = OUString( SRCH_PARA_ROWDIR ); aSeq[5].Value <<= bRowDirection; - aSeq[6].Name = rtl::OUString( SRCH_PARA_ALLTABLES ); + aSeq[6].Name = OUString( SRCH_PARA_ALLTABLES ); aSeq[6].Value <<= bAllTables; - aSeq[6].Name = rtl::OUString( SRCH_PARA_SEARCHFILTERED ); + aSeq[6].Name = OUString( SRCH_PARA_SEARCHFILTERED ); aSeq[6].Value <<= bSearchFiltered; - aSeq[7].Name = rtl::OUString( SRCH_PARA_BACKWARD ); + aSeq[7].Name = OUString( SRCH_PARA_BACKWARD ); aSeq[7].Value <<= bBackward; - aSeq[8].Name = rtl::OUString( SRCH_PARA_PATTERN ); + aSeq[8].Name = OUString( SRCH_PARA_PATTERN ); aSeq[8].Value <<= bPattern; - aSeq[9].Name = rtl::OUString( SRCH_PARA_CONTENT ); + aSeq[9].Name = OUString( SRCH_PARA_CONTENT ); aSeq[9].Value <<= bContent; - aSeq[10].Name = rtl::OUString( SRCH_PARA_ASIANOPT ); + aSeq[10].Name = OUString( SRCH_PARA_ASIANOPT ); aSeq[10].Value <<= bAsianOptions; rVal <<= aSeq; } diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 3e0651257511..cd44bea2bbb7 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -182,7 +182,7 @@ bool SfxStyleSheetBase::SetName( const XubString& rName ) return sal_True; } -rtl::OUString SfxStyleSheetBase::GetDisplayName() const +OUString SfxStyleSheetBase::GetDisplayName() const { if( maDisplayName.isEmpty() ) { @@ -194,7 +194,7 @@ rtl::OUString SfxStyleSheetBase::GetDisplayName() const } } -void SfxStyleSheetBase::SetDisplayName( const rtl::OUString& rDisplayName ) +void SfxStyleSheetBase::SetDisplayName( const OUString& rDisplayName ) { maDisplayName = rDisplayName; } @@ -491,7 +491,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next() } -SfxStyleSheetBase* SfxStyleSheetIterator::Find(const rtl::OUString& rStr) +SfxStyleSheetBase* SfxStyleSheetIterator::Find(const OUString& rStr) { for ( sal_uInt16 n = 0; n < pBasePool->aStyles.size(); ++n ) { diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 3fdc6e8dfae4..c1577a4c7b3f 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -296,7 +296,7 @@ namespace { mbSkipIgnorable( bSkipIgnorable ) {} virtual StylePool::SfxItemSet_Pointer_t getNext(); - virtual ::rtl::OUString getName(); + virtual OUString getName(); }; StylePool::SfxItemSet_Pointer_t Iterator::getNext() @@ -331,9 +331,9 @@ namespace { return pReturn; } - ::rtl::OUString Iterator::getName() + OUString Iterator::getName() { - ::rtl::OUString aString; + OUString aString; if( mpNode && mpNode->hasItemSet( false ) ) { aString = StylePool::nameOf( mpNode->getUsedOrLastAddedItemSet() ); @@ -346,9 +346,9 @@ namespace { /* This static method creates a unique name from a shared pointer to a SfxItemSet The name is the memory address of the SfxItemSet itself. */ -::rtl::OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet ) +OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet ) { - return ::rtl::OUString::valueOf( reinterpret_cast( pSet.get() ), 16 ); + return OUString::valueOf( reinterpret_cast( pSet.get() ), 16 ); } // class StylePoolImpl organized a tree-structure where every node represents a SfxItemSet. diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index 6c130a882f5f..3e6440f04d46 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -53,8 +53,8 @@ namespace svt { sal_Bool DocumentLockFile::m_bAllowInteraction = sal_True; // ---------------------------------------------------------------------- -DocumentLockFile::DocumentLockFile( const ::rtl::OUString& aOrigURL ) -: LockFileCommon( aOrigURL, ::rtl::OUString( ".~lock." ) ) +DocumentLockFile::DocumentLockFile( const OUString& aOrigURL ) +: LockFileCommon( aOrigURL, OUString( ".~lock." ) ) { } @@ -64,11 +64,11 @@ DocumentLockFile::~DocumentLockFile() } // ---------------------------------------------------------------------- -void DocumentLockFile::WriteEntryToStream( uno::Sequence< ::rtl::OUString > aEntry, uno::Reference< io::XOutputStream > xOutput ) +void DocumentLockFile::WriteEntryToStream( uno::Sequence< OUString > aEntry, uno::Reference< io::XOutputStream > xOutput ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; for ( sal_Int32 nEntryInd = 0; nEntryInd < aEntry.getLength(); nEntryInd++ ) { @@ -79,7 +79,7 @@ void DocumentLockFile::WriteEntryToStream( uno::Sequence< ::rtl::OUString > aEnt aBuffer.append( (sal_Unicode)';' ); } - ::rtl::OString aStringData( ::rtl::OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) ); + OString aStringData( OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ) ); uno::Sequence< sal_Int8 > aData( (sal_Int8*)aStringData.getStr(), aStringData.getLength() ); xOutput->writeBytes( aData ); } @@ -102,7 +102,7 @@ sal_Bool DocumentLockFile::CreateOwnLockFile() if ( !xInput.is() || !xOutput.is() ) throw uno::RuntimeException(); - uno::Sequence< ::rtl::OUString > aNewEntry = GenerateOwnEntry(); + uno::Sequence< OUString > aNewEntry = GenerateOwnEntry(); WriteEntryToStream( aNewEntry, xOutput ); xOutput->closeOutput(); @@ -116,11 +116,11 @@ sal_Bool DocumentLockFile::CreateOwnLockFile() aInsertArg.ReplaceExisting = sal_False; uno::Any aCmdArg; aCmdArg <<= aInsertArg; - aTargetContent.executeCommand( ::rtl::OUString( "insert" ), aCmdArg ); + aTargetContent.executeCommand( OUString( "insert" ), aCmdArg ); // try to let the file be hidden if possible try { - aTargetContent.setPropertyValue( ::rtl::OUString( "IsHidden" ), uno::makeAny( sal_True ) ); + aTargetContent.setPropertyValue( OUString( "IsHidden" ), uno::makeAny( sal_True ) ); } catch( uno::Exception& ) {} } catch( ucb::NameClashException& ) @@ -132,7 +132,7 @@ sal_Bool DocumentLockFile::CreateOwnLockFile() } // ---------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > DocumentLockFile::GetLockData() +uno::Sequence< OUString > DocumentLockFile::GetLockData() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -176,7 +176,7 @@ sal_Bool DocumentLockFile::OverwriteOwnLockFile() uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; ::ucbhelper::Content aTargetContent( m_aURL, xEnv, comphelper::getProcessComponentContext() ); - uno::Sequence< ::rtl::OUString > aNewEntry = GenerateOwnEntry(); + uno::Sequence< OUString > aNewEntry = GenerateOwnEntry(); uno::Reference< io::XStream > xStream = aTargetContent.openWriteableStreamNoLock(); uno::Reference< io::XOutputStream > xOutput = xStream->getOutputStream(); @@ -200,8 +200,8 @@ void DocumentLockFile::RemoveFile() ::osl::MutexGuard aGuard( m_aMutex ); // TODO/LATER: the removing is not atomic, is it possible in general to make it atomic? - uno::Sequence< ::rtl::OUString > aNewEntry = GenerateOwnEntry(); - uno::Sequence< ::rtl::OUString > aFileData = GetLockData(); + uno::Sequence< OUString > aNewEntry = GenerateOwnEntry(); + uno::Sequence< OUString > aFileData = GetLockData(); if ( aFileData.getLength() < LOCKFILE_ENTRYSIZE ) throw io::WrongFormatException(); @@ -213,7 +213,7 @@ void DocumentLockFile::RemoveFile() uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; ::ucbhelper::Content aCnt(m_aURL, xEnv, comphelper::getProcessComponentContext()); - aCnt.executeCommand(rtl::OUString("delete"), + aCnt.executeCommand(OUString("delete"), uno::makeAny(sal_Bool(sal_True))); } diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx index f5f902f4c1b9..1b7dee2067b5 100644 --- a/svl/source/misc/filenotation.cxx +++ b/svl/source/misc/filenotation.cxx @@ -31,13 +31,13 @@ namespace svt //= OFileNotation //===================================================================== //--------------------------------------------------------------------- - OFileNotation::OFileNotation( const ::rtl::OUString& _rUrlOrPath ) + OFileNotation::OFileNotation( const OUString& _rUrlOrPath ) { construct( _rUrlOrPath ); } //--------------------------------------------------------------------- - OFileNotation::OFileNotation( const ::rtl::OUString& _rUrlOrPath, NOTATION _eInputNotation ) + OFileNotation::OFileNotation( const OUString& _rUrlOrPath, NOTATION _eInputNotation ) { if ( _eInputNotation == N_URL ) { @@ -52,7 +52,7 @@ namespace svt } //--------------------------------------------------------------------- - bool OFileNotation::implInitWithSystemNotation( const ::rtl::OUString& _rSystemPath ) + bool OFileNotation::implInitWithSystemNotation( const OUString& _rSystemPath ) { bool bSuccess = false; @@ -79,7 +79,7 @@ namespace svt } //--------------------------------------------------------------------- - bool OFileNotation::implInitWithURLNotation( const ::rtl::OUString& _rURL ) + bool OFileNotation::implInitWithURLNotation( const OUString& _rURL ) { m_sFileURL = _rURL; osl_getSystemPathFromFileURL( _rURL.pData, &m_sSystem.pData ); @@ -87,7 +87,7 @@ namespace svt } //--------------------------------------------------------------------- - void OFileNotation::construct( const ::rtl::OUString& _rUrlOrPath ) + void OFileNotation::construct( const OUString& _rUrlOrPath ) { bool bSuccess = false; // URL notation? @@ -117,7 +117,7 @@ namespace svt } //--------------------------------------------------------------------- - ::rtl::OUString OFileNotation::get(NOTATION _eOutputNotation) + OUString OFileNotation::get(NOTATION _eOutputNotation) { switch (_eOutputNotation) { @@ -126,7 +126,7 @@ namespace svt } OSL_FAIL("OFileNotation::get: inavlid enum value!"); - return ::rtl::OUString(); + return OUString(); } //......................................................................... diff --git a/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx index 908b7dc7a631..17562510cc44 100644 --- a/svl/source/misc/folderrestriction.cxx +++ b/svl/source/misc/folderrestriction.cxx @@ -26,7 +26,7 @@ //----------------------------------------------------------------------------- static void convertStringListToUrls ( - const rtl::OUString& _rColonSeparatedList, ::std::vector< String >& _rTokens, bool _bFinalSlash ) + const OUString& _rColonSeparatedList, ::std::vector< String >& _rTokens, bool _bFinalSlash ) { const sal_Unicode cSeparator = #if defined(WNT) @@ -40,12 +40,12 @@ static void convertStringListToUrls ( do { // the current token in the list - rtl::OUString sCurrentToken = _rColonSeparatedList.getToken( 0, cSeparator, nIndex ); + OUString sCurrentToken = _rColonSeparatedList.getToken( 0, cSeparator, nIndex ); if (!sCurrentToken.isEmpty()) { INetURLObject aCurrentURL; - rtl::OUString sURL; + OUString sURL; if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sCurrentToken, sURL ) ) aCurrentURL = INetURLObject( sURL ); else @@ -67,10 +67,10 @@ static void convertStringListToUrls ( /** retrieves the value of an environment variable @return if and only if the retrieved string value is not empty */ -static bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, ::rtl::OUString& _rValue ) +static bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, OUString& _rValue ) { - _rValue = ::rtl::OUString(); - ::rtl::OUString sEnvName = ::rtl::OUString::createFromAscii( _pAsciiEnvName ); + _rValue = OUString(); + OUString sEnvName = OUString::createFromAscii( _pAsciiEnvName ); osl_getEnvironment( sEnvName.pData, &_rValue.pData ); return !_rValue.isEmpty(); } @@ -83,7 +83,7 @@ namespace svt void getUnrestrictedFolders( ::std::vector< String >& _rFolders ) { _rFolders.resize( 0 ); - ::rtl::OUString sRestrictedPathList; + OUString sRestrictedPathList; if ( getEnvironmentValue( "RestrictedPath", sRestrictedPathList ) ) { // append a final slash. This ensures that when we later on check diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx index 3e0a08001ef8..f1692f256e18 100644 --- a/svl/source/misc/fstathelper.cxx +++ b/svl/source/misc/fstathelper.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::rtl; -sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const rtl::OUString& rURL, +sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& rURL, Date* pDate, Time* pTime ) { sal_Bool bRet = sal_False; @@ -59,7 +59,7 @@ sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const rtl::OUString& rURL, return bRet; } -sal_Bool FStatHelper::IsDocument( const rtl::OUString& rURL ) +sal_Bool FStatHelper::IsDocument( const OUString& rURL ) { sal_Bool bExist = sal_False; try @@ -75,7 +75,7 @@ sal_Bool FStatHelper::IsDocument( const rtl::OUString& rURL ) return bExist; } -sal_Bool FStatHelper::IsFolder( const rtl::OUString& rURL ) +sal_Bool FStatHelper::IsFolder( const OUString& rURL ) { sal_Bool bExist = sal_False; try diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx index faed06461969..f59295e4ed50 100644 --- a/svl/source/misc/getstringresource.cxx +++ b/svl/source/misc/getstringresource.cxx @@ -42,7 +42,7 @@ public: SimpleResMgr * get(LanguageTag const & locale); private: - typedef std::map< rtl::OUString, SimpleResMgr * > Map; + typedef std::map< OUString, SimpleResMgr * > Map; Map map_; // one SimpleResMgr for each language for which a resource was requested @@ -76,7 +76,7 @@ struct theResMgrMap: public rtl::Static< ResMgrMap, theResMgrMap > {}; namespace svl { -rtl::OUString getStringResource(sal_uInt16 id, LanguageTag const & locale) +OUString getStringResource(sal_uInt16 id, LanguageTag const & locale) { return theResMgrMap::get().get(locale)->ReadString(id); } diff --git a/svl/source/misc/getstringresource.hxx b/svl/source/misc/getstringresource.hxx index 1410c1577e99..4fedb5987bc8 100644 --- a/svl/source/misc/getstringresource.hxx +++ b/svl/source/misc/getstringresource.hxx @@ -31,7 +31,7 @@ namespace rtl { class OUString; } namespace svl { -rtl::OUString getStringResource( +OUString getStringResource( sal_uInt16 id, LanguageTag const & locale); } diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 71da0c842659..032f0b169beb 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -432,14 +432,14 @@ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl) if (!rUrl.HasPort()) rUrl.SetPort (INETHIST_DEF_HTTP_PORT); if (!rUrl.HasURLPath()) - rUrl.SetURLPath (rtl::OString("/")); + rUrl.SetURLPath (OString("/")); break; case INET_PROT_HTTPS: if (!rUrl.HasPort()) rUrl.SetPort (INETHIST_DEF_HTTPS_PORT); if (!rUrl.HasURLPath()) - rUrl.SetURLPath (rtl::OString("/")); + rUrl.SetURLPath (OString("/")); break; default: diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx index 5797c256160c..2deb2d3d2843 100644 --- a/svl/source/misc/lngmisc.cxx +++ b/svl/source/misc/lngmisc.cxx @@ -26,7 +26,7 @@ namespace linguistic { - sal_Int32 GetNumControlChars(const rtl::OUString &rTxt) + sal_Int32 GetNumControlChars(const OUString &rTxt) { sal_Int32 nCnt = 0; for (sal_Int32 i = 0; i < rTxt.getLength(); ++i) @@ -35,7 +35,7 @@ namespace linguistic return nCnt; } - bool RemoveHyphens(rtl::OUString &rTxt) + bool RemoveHyphens(OUString &rTxt) { sal_Int32 n = rTxt.getLength(); rTxt = comphelper::string::remove(rTxt, SVT_SOFT_HYPHEN); @@ -43,13 +43,13 @@ namespace linguistic return n != rTxt.getLength(); } - bool RemoveControlChars(rtl::OUString &rTxt) + bool RemoveControlChars(OUString &rTxt) { sal_Int32 nSize = rTxt.getLength() - GetNumControlChars(rTxt); if(nSize == rTxt.getLength()) return false; - rtl::OUStringBuffer aBuf(nSize); + OUStringBuffer aBuf(nSize); aBuf.setLength(nSize); for (sal_Int32 i = 0, j = 0; i < rTxt.getLength() && j < nSize; ++i) if (!IsControlChar(rTxt[i])) @@ -61,7 +61,7 @@ namespace linguistic return true; } - bool ReplaceControlChars(rtl::OUString &rTxt) + bool ReplaceControlChars(OUString &rTxt) { // non breaking field character static const sal_Char CH_TXTATR_INWORD = static_cast(0x02); @@ -75,7 +75,7 @@ namespace linguistic sal_Int32 n = rTxt.getLength(); - rtl::OUStringBuffer aBuf(n); + OUStringBuffer aBuf(n); aBuf.setLength(n); sal_Int32 j = 0; @@ -93,14 +93,14 @@ namespace linguistic return true; } - ::rtl::OUString GetThesaurusReplaceText(const ::rtl::OUString &rText) + OUString GetThesaurusReplaceText(const OUString &rText) { // The strings for synonyms returned by the thesaurus sometimes have some // explanation text put in between '(' and ')' or a trailing '*'. // These parts should not be put in the ReplaceEdit Text that may get // inserted into the document. Thus we strip them from the text. - ::rtl::OUString aText(rText); + OUString aText(rText); sal_Int32 nPos = aText.indexOf('('); while (nPos >= 0) @@ -108,7 +108,7 @@ namespace linguistic sal_Int32 nEnd = aText.indexOf(')', nPos); if (nEnd >= 0) { - ::rtl::OUStringBuffer aTextBuf(aText); + OUStringBuffer aTextBuf(aText); aTextBuf.remove(nPos, nEnd - nPos + 1); aText = aTextBuf.makeStringAndClear(); } @@ -119,7 +119,7 @@ namespace linguistic nPos = aText.indexOf('*'); if(nPos == 0) - return ::rtl::OUString(); + return OUString(); else if(nPos > 0) aText = aText.copy(0, nPos); diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx index bb5ae628bf6b..eb77be2b07c3 100644 --- a/svl/source/misc/lockfilecommon.cxx +++ b/svl/source/misc/lockfilecommon.cxx @@ -54,11 +54,11 @@ using namespace ::com::sun::star; namespace svt { // ---------------------------------------------------------------------- -LockFileCommon::LockFileCommon( const ::rtl::OUString& aOrigURL, const ::rtl::OUString& aPrefix ) +LockFileCommon::LockFileCommon( const OUString& aOrigURL, const OUString& aPrefix ) { INetURLObject aDocURL = ResolveLinks( INetURLObject( aOrigURL ) ); - ::rtl::OUString aShareURLString = aDocURL.GetPartBeforeLastName(); + OUString aShareURLString = aDocURL.GetPartBeforeLastName(); aShareURLString += aPrefix; aShareURLString += aDocURL.GetName(); aShareURLString += "%23"; // '#' @@ -76,7 +76,7 @@ INetURLObject LockFileCommon::ResolveLinks( const INetURLObject& aDocURL ) if ( aDocURL.HasError() ) throw lang::IllegalArgumentException(); - ::rtl::OUString aURLToCheck = aDocURL.GetMainURL(INetURLObject::NO_DECODE); + OUString aURLToCheck = aDocURL.GetMainURL(INetURLObject::NO_DECODE); // there is currently no UCB functionality to resolve the symbolic links; // since the lock files are used only for local file systems the osl @@ -95,11 +95,11 @@ INetURLObject LockFileCommon::ResolveLinks( const INetURLObject& aDocURL ) } // ---------------------------------------------------------------------- -uno::Sequence< uno::Sequence< ::rtl::OUString > > LockFileCommon::ParseList( const uno::Sequence< sal_Int8 >& aBuffer ) +uno::Sequence< uno::Sequence< OUString > > LockFileCommon::ParseList( const uno::Sequence< sal_Int8 >& aBuffer ) { sal_Int32 nCurPos = 0; sal_Int32 nCurEntry = 0; - uno::Sequence< uno::Sequence< ::rtl::OUString > > aResult( 10 ); + uno::Sequence< uno::Sequence< OUString > > aResult( 10 ); while ( nCurPos < aBuffer.getLength() ) { @@ -114,9 +114,9 @@ uno::Sequence< uno::Sequence< ::rtl::OUString > > LockFileCommon::ParseList( con } // ---------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& io_nCurPos ) +uno::Sequence< OUString > LockFileCommon::ParseEntry( const uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& io_nCurPos ) { - uno::Sequence< ::rtl::OUString > aResult( LOCKFILE_ENTRYSIZE ); + uno::Sequence< OUString > aResult( LOCKFILE_ENTRYSIZE ); for ( int nInd = 0; nInd < LOCKFILE_ENTRYSIZE; nInd++ ) { @@ -131,9 +131,9 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence } // ---------------------------------------------------------------------- -::rtl::OUString LockFileCommon::ParseName( const uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& io_nCurPos ) +OUString LockFileCommon::ParseName( const uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& io_nCurPos ) { - ::rtl::OStringBuffer aResult; + OStringBuffer aResult; sal_Bool bHaveName = sal_False; sal_Bool bEscape = sal_False; @@ -165,13 +165,13 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence } } - return ::rtl::OStringToOUString( aResult.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); + return OStringToOUString( aResult.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); } // ---------------------------------------------------------------------- -::rtl::OUString LockFileCommon::EscapeCharacters( const ::rtl::OUString& aSource ) +OUString LockFileCommon::EscapeCharacters( const OUString& aSource ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; const sal_Unicode* pStr = aSource.getStr(); for ( sal_Int32 nInd = 0; nInd < aSource.getLength() && pStr[nInd] != 0; nInd++ ) { @@ -184,10 +184,10 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence } // ---------------------------------------------------------------------- -::rtl::OUString LockFileCommon::GetOOOUserName() +OUString LockFileCommon::GetOOOUserName() { SvtUserOptions aUserOpt; - ::rtl::OUString aName = aUserOpt.GetFirstName(); + OUString aName = aUserOpt.GetFirstName(); if ( !aName.isEmpty() ) aName += " "; aName += aUserOpt.GetLastName(); @@ -196,9 +196,9 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence } // ---------------------------------------------------------------------- -::rtl::OUString LockFileCommon::GetCurrentLocalTime() +OUString LockFileCommon::GetCurrentLocalTime() { - ::rtl::OUString aTime; + OUString aTime; TimeValue aSysTime; if ( osl_getSystemTime( &aSysTime ) ) @@ -211,7 +211,7 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence { char pDateTime[20]; sprintf( pDateTime, "%02d.%02d.%4d %02d:%02d", aDateTime.Day, aDateTime.Month, aDateTime.Year, aDateTime.Hours, aDateTime.Minutes ); - aTime = ::rtl::OUString::createFromAscii( pDateTime ); + aTime = OUString::createFromAscii( pDateTime ); } } } @@ -220,9 +220,9 @@ uno::Sequence< ::rtl::OUString > LockFileCommon::ParseEntry( const uno::Sequence } // ---------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > LockFileCommon::GenerateOwnEntry() +uno::Sequence< OUString > LockFileCommon::GenerateOwnEntry() { - uno::Sequence< ::rtl::OUString > aResult( LOCKFILE_ENTRYSIZE ); + uno::Sequence< OUString > aResult( LOCKFILE_ENTRYSIZE ); aResult[LOCKFILE_OOOUSERNAME_ID] = GetOOOUserName(); diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index 21ad1599bb4e..24cdf8991a1a 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.cxx @@ -29,9 +29,9 @@ using namespace com::sun::star; //============== SvCommandList ============================================ //========================================================================= -static ::rtl::OUString parseString(const ::rtl::OUString & rCmd, sal_Int32 * pIndex) +static OUString parseString(const OUString & rCmd, sal_Int32 * pIndex) { - ::rtl::OUString result; + OUString result; if(rCmd[*pIndex] == sal_Unicode('\"')) { (*pIndex) ++; @@ -46,7 +46,7 @@ static ::rtl::OUString parseString(const ::rtl::OUString & rCmd, sal_Int32 * pIn return result; } -static ::rtl::OUString parseWord(const ::rtl::OUString & rCmd, sal_Int32 * pIndex) +static OUString parseWord(const OUString & rCmd, sal_Int32 * pIndex) { sal_Int32 begin = *pIndex; @@ -58,7 +58,7 @@ static ::rtl::OUString parseWord(const ::rtl::OUString & rCmd, sal_Int32 * pInde return rCmd.copy(begin, *pIndex - begin); } -static void eatSpace(const ::rtl::OUString & rCmd, sal_Int32 * pIndex) +static void eatSpace(const OUString & rCmd, sal_Int32 * pIndex) { while(*pIndex < rCmd.getLength() && isspace(sal::static_int_cast(rCmd[*pIndex]))) (*pIndex) ++; @@ -68,7 +68,7 @@ static void eatSpace(const ::rtl::OUString & rCmd, sal_Int32 * pIndex) //========================================================================= bool SvCommandList::AppendCommands ( - const ::rtl::OUString & rCmd, /* Dieser Text wird in Kommandos umgesetzt */ + const OUString & rCmd, /* Dieser Text wird in Kommandos umgesetzt */ sal_Int32 * pEaten /* Anzahl der Zeichen, die gelesen wurden */ ) /* [Beschreibung] @@ -87,10 +87,10 @@ bool SvCommandList::AppendCommands { eatSpace(rCmd, &index); - ::rtl::OUString name = (rCmd[index] == sal_Unicode('\"')) ? parseString(rCmd, &index) : parseWord(rCmd, &index); + OUString name = (rCmd[index] == sal_Unicode('\"')) ? parseString(rCmd, &index) : parseWord(rCmd, &index); eatSpace(rCmd, &index); - ::rtl::OUString value; + OUString value; if(index < rCmd.getLength() && rCmd[index] == sal_Unicode('=')) { index ++; @@ -110,8 +110,8 @@ bool SvCommandList::AppendCommands //========================================================================= SvCommand & SvCommandList::Append ( - const ::rtl::OUString & rCommand, /* das Kommando */ - const ::rtl::OUString & rArg /* dasArgument des Kommandos */ + const OUString & rCommand, /* das Kommando */ + const OUString & rArg /* dasArgument des Kommandos */ ) /* [Beschreibung] @@ -130,8 +130,8 @@ SvCommand & SvCommandList::Append bool SvCommandList::FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& aCommandSequence ) { const sal_Int32 nCount = aCommandSequence.getLength(); - ::rtl::OUString aCommand, aArg; - ::rtl::OUString aApiArg; + OUString aCommand, aArg; + OUString aApiArg; for( sal_Int32 nIndex=0; nIndex
      - SVT_DLLPUBLIC static rtl::OString CreateTableDataOptionsValNum( + SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum( sal_Bool bValue, double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, diff --git a/svtools/inc/svtools/hyperlabel.hxx b/svtools/inc/svtools/hyperlabel.hxx index be1fc21acc11..745c50798f1d 100644 --- a/svtools/inc/svtools/hyperlabel.hxx +++ b/svtools/inc/svtools/hyperlabel.hxx @@ -63,7 +63,7 @@ namespace svt void SetIndex( sal_Int32 _Index ); sal_Int32 GetIndex() const; - void SetLabel( const ::rtl::OUString& _rText ); + void SetLabel( const OUString& _rText ); void ToggleBackgroundColor( const Color& _rGBColor ); void SetInteractive( sal_Bool _bInteractive ); diff --git a/svtools/inc/svtools/imageresourceaccess.hxx b/svtools/inc/svtools/imageresourceaccess.hxx index 4f3899b14c60..b8282da72167 100644 --- a/svtools/inc/svtools/imageresourceaccess.hxx +++ b/svtools/inc/svtools/imageresourceaccess.hxx @@ -46,7 +46,7 @@ namespace svt /** determines whether the given URL denotes an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ) */ - SVT_DLLPUBLIC static bool isSupportedURL( const ::rtl::OUString& _rURL ); + SVT_DLLPUBLIC static bool isSupportedURL( const OUString& _rURL ); /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves an SvStream for this image. @@ -59,7 +59,7 @@ namespace svt */ SVT_DLLPUBLIC static SvStream* getImageStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rImageResourceURL + const OUString& _rImageResourceURL ); /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves @@ -68,7 +68,7 @@ namespace svt SVT_DLLPUBLIC static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > getImageXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rImageResourceURL + const OUString& _rImageResourceURL ); }; diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx index 84e84eefa99e..790cdebef60f 100644 --- a/svtools/inc/svtools/imap.hxx +++ b/svtools/inc/svtools/imap.hxx @@ -52,12 +52,12 @@ protected: sal_uLong ImpReadCERN( SvStream& rOStm, const String& rBaseURL ); sal_uLong ImpReadNCSA( SvStream& rOStm, const String& rBaseURL ); - void ImpReadCERNLine( const rtl::OString& rLine, const String& rBaseURL ); + void ImpReadCERNLine( const OString& rLine, const String& rBaseURL ); Point ImpReadCERNCoords( const char** ppStr ); long ImpReadCERNRadius( const char** ppStr ); String ImpReadCERNURL( const char** ppStr, const String& rBaseURL ); - void ImpReadNCSALine( const rtl::OString& rLine, const String& rBaseURL ); + void ImpReadNCSALine( const OString& rLine, const String& rBaseURL ); String ImpReadNCSAURL( const char** ppStr, const String& rBaseURL ); Point ImpReadNCSACoords( const char** ppStr ); diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx index 0043e8df2461..e90902bec0f0 100644 --- a/svtools/inc/svtools/imapobj.hxx +++ b/svtools/inc/svtools/imapobj.hxx @@ -70,10 +70,10 @@ protected: virtual void ReadIMapObject( SvStream& rIStm ) = 0; // Hilfsmethoden - void AppendCERNCoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const; - void AppendCERNURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const; - void AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const; - void AppendNCSAURL(rtl::OStringBuffer&rBuf, const String& rBaseURL) const; + void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const; + void AppendCERNURL(OStringBuffer& rBuf, const String& rBaseURL) const; + void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const; + void AppendNCSAURL(OStringBuffer&rBuf, const String& rBaseURL) const; public: diff --git a/svtools/inc/svtools/indexentryres.hxx b/svtools/inc/svtools/indexentryres.hxx index f6532b7f8f2b..9e2a54a8ef0b 100644 --- a/svtools/inc/svtools/indexentryres.hxx +++ b/svtools/inc/svtools/indexentryres.hxx @@ -33,7 +33,7 @@ class SVT_DLLPUBLIC IndexEntryResource public: IndexEntryResource (); ~IndexEntryResource (); - const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm); + const OUString& GetTranslation (const OUString& r_Algorithm); }; #endif /* SVTOOLS_INDEXENTRYRESOURCE_HXX */ diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx index f06a53c6d24d..3c5aafc57848 100644 --- a/svtools/inc/svtools/ivctrl.hxx +++ b/svtools/inc/svtools/ivctrl.hxx @@ -231,7 +231,7 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control protected: virtual void KeyInput( const KeyEvent& rKEvt ); - virtual sal_Bool EditedEntry( SvxIconChoiceCtrlEntry*, const rtl::OUString& rNewText, sal_Bool bCancelled ); + virtual sal_Bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, sal_Bool bCancelled ); virtual void DocumentRectChanged(); virtual void VisibleRectChanged(); virtual sal_Bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); diff --git a/svtools/inc/svtools/javacontext.hxx b/svtools/inc/svtools/javacontext.hxx index 0649975e55b2..2c81cbf43d42 100644 --- a/svtools/inc/svtools/javacontext.hxx +++ b/svtools/inc/svtools/javacontext.hxx @@ -59,7 +59,7 @@ namespace svt virtual void SAL_CALL release() throw (); // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name ) + virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) throw (com::sun::star::uno::RuntimeException); private: diff --git a/svtools/inc/svtools/langhelp.hxx b/svtools/inc/svtools/langhelp.hxx index ccc946c305b6..b126292f65c2 100644 --- a/svtools/inc/svtools/langhelp.hxx +++ b/svtools/inc/svtools/langhelp.hxx @@ -29,7 +29,7 @@ #include -namespace rtl { class OUString; } +#include /** Localize a URI to one of the foundation's webservices @@ -37,7 +37,7 @@ namespace rtl { class OUString; } URI to localize - depending on your UI locale, a country local part is appended to the URI (like "en", or "fr", or "es") */ -SVT_DLLPUBLIC void localizeWebserviceURI( ::rtl::OUString& io_rURI ); +SVT_DLLPUBLIC void localizeWebserviceURI( OUString& io_rURI ); #endif diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx index aeed99454006..1ef5875d2948 100644 --- a/svtools/inc/svtools/langtab.hxx +++ b/svtools/inc/svtools/langtab.hxx @@ -40,7 +40,7 @@ public: Tools->Options->LanguageSettings->UserInterface listbox. If FALSE, do replace. */ - const rtl::OUString GetString( const LanguageType eType, bool bUserInterfaceSelection = false ) const; + const OUString GetString( const LanguageType eType, bool bUserInterfaceSelection = false ) const; LanguageType GetType( const String& rStr ) const; sal_uInt32 GetEntryCount() const; diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx index f8c0c61729f8..9011dad9a266 100644 --- a/svtools/inc/svtools/parhtml.hxx +++ b/svtools/inc/svtools/parhtml.hxx @@ -225,7 +225,7 @@ protected: static rtl_TextEncoding GetEncodingByMIME( const String& rMime ); /// template method: called when ParseMetaOptions adds a user-defined meta - virtual void AddMetaUserDefined( ::rtl::OUString const & i_rMetaName ); + virtual void AddMetaUserDefined( OUString const & i_rMetaName ); private: /// parse meta options into XDocumentProperties and encoding diff --git a/svtools/inc/svtools/place.hxx b/svtools/inc/svtools/place.hxx index 138186da6a98..f6ca8cd7f7b0 100644 --- a/svtools/inc/svtools/place.hxx +++ b/svtools/inc/svtools/place.hxx @@ -22,7 +22,7 @@ private: public: - Place( OUString sName, rtl::OUString sUrl, bool bEditable = false ) : + Place( OUString sName, OUString sUrl, bool bEditable = false ) : msName( sName ), maUrl( sUrl ), mbEditable( bEditable ) {}; diff --git a/svtools/inc/svtools/popupmenucontrollerbase.hxx b/svtools/inc/svtools/popupmenucontrollerbase.hxx index a3f1095cb7b2..daddbed7e9fd 100644 --- a/svtools/inc/svtools/popupmenucontrollerbase.hxx +++ b/svtools/inc/svtools/popupmenucontrollerbase.hxx @@ -62,9 +62,9 @@ namespace svt virtual ~PopupMenuControllerBase(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; // XPopupMenuController virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException); @@ -83,7 +83,7 @@ namespace svt virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException ); // XDispatch @@ -94,13 +94,13 @@ namespace svt // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - void dispatchCommand( const ::rtl::OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); + void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); protected: void throwIfDisposed() throw ( ::com::sun::star::uno::RuntimeException ); /** helper method to cause statusChanged is called once for the given command url */ - void SAL_CALL updateCommand( const rtl::OUString& rCommandURL ); + void SAL_CALL updateCommand( const OUString& rCommandURL ); /** this function is called upon disposing the component */ @@ -109,15 +109,15 @@ namespace svt virtual void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); virtual void impl_setPopupMenu(); virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); - ::rtl::OUString determineBaseURL( const ::rtl::OUString& aURL ); + OUString determineBaseURL( const OUString& aURL ); DECL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, PopupMenuControllerBaseDispatchInfo* ); bool m_bInitialized; - rtl::OUString m_aCommandURL; - rtl::OUString m_aBaseURL; - rtl::OUString m_aModuleName; + OUString m_aCommandURL; + OUString m_aBaseURL; + OUString m_aModuleName; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xDispatch; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; diff --git a/svtools/inc/svtools/popupwindowcontroller.hxx b/svtools/inc/svtools/popupwindowcontroller.hxx index b4e62f809e79..a02281e17d4a 100644 --- a/svtools/inc/svtools/popupwindowcontroller.hxx +++ b/svtools/inc/svtools/popupwindowcontroller.hxx @@ -38,7 +38,7 @@ class SVT_DLLPUBLIC PopupWindowController : public svt::ToolboxController, publi public: PopupWindowController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); ~PopupWindowController(); virtual ::Window* createPopupWindow( ::Window* pParent ) = 0; @@ -49,9 +49,9 @@ public: virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) = 0; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) = 0; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) = 0; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) = 0; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); diff --git a/svtools/inc/svtools/roadmap.hxx b/svtools/inc/svtools/roadmap.hxx index da9b10336b8a..d36a1a3165bb 100644 --- a/svtools/inc/svtools/roadmap.hxx +++ b/svtools/inc/svtools/roadmap.hxx @@ -63,7 +63,7 @@ namespace svt void EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex = 0 ); - void ChangeRoadmapItemLabel( ItemId _nID, const ::rtl::OUString& sLabel, ItemIndex _nStartIndex = 0 ); + void ChangeRoadmapItemLabel( ItemId _nID, const OUString& sLabel, ItemIndex _nStartIndex = 0 ); void ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex = 0 ); void SetRoadmapInteractive( sal_Bool _bInteractive ); @@ -75,8 +75,8 @@ namespace svt ItemIndex GetItemCount() const; ItemId GetItemID( ItemIndex _nIndex ) const; - void InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled = sal_True ); - void ReplaceRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ); + void InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled = sal_True ); + void ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ); void DeleteRoadmapItem( ItemIndex _nIndex ); ItemId GetCurrentRoadmapItemID() const; @@ -110,7 +110,7 @@ namespace svt ItemId GetNextAvailableItemId( ItemIndex _NewIndex ); ItemId GetPreviousAvailableItemId( ItemIndex _NewIndex ); RoadmapItem* GetByPointer(Window* pWindow); - RoadmapItem* InsertHyperLabel( ItemIndex _Index, const ::rtl::OUString& _aStr, ItemId _RMID, sal_Bool _bEnabled = sal_True ); + RoadmapItem* InsertHyperLabel( ItemIndex _Index, const OUString& _aStr, ItemId _RMID, sal_Bool _bEnabled = sal_True ); void UpdatefollowingHyperLabels( ItemIndex _Index ); }; diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx index 5cdf1a0e975c..aae7ebfc5d7b 100644 --- a/svtools/inc/svtools/roadmapwizard.hxx +++ b/svtools/inc/svtools/roadmapwizard.hxx @@ -79,7 +79,7 @@ namespace svt ); ~RoadmapWizard( ); - void SetRoadmapHelpId( const rtl::OString& _rId ); + void SetRoadmapHelpId( const OString& _rId ); void SetRoadmapInteractive( sal_Bool _bInteractive ); virtual void Resize(); diff --git a/svtools/inc/svtools/sampletext.hxx b/svtools/inc/svtools/sampletext.hxx index 5911eb7530f3..44693ffedcc2 100644 --- a/svtools/inc/svtools/sampletext.hxx +++ b/svtools/inc/svtools/sampletext.hxx @@ -47,18 +47,18 @@ SVT_DLLPUBLIC bool canRenderNameOfSelectedFont(OutputDevice &rDevice); //These ones are typically for use in the font dropdown box beside the //fontname, so say things roughly like "Script/Alphabet/Name-Of-Major-Language" -SVT_DLLPUBLIC rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice); -SVT_DLLPUBLIC rtl::OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice); -SVT_DLLPUBLIC rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript); +SVT_DLLPUBLIC OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice); +SVT_DLLPUBLIC OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice); +SVT_DLLPUBLIC OUString makeShortRepresentativeTextForScript(UScriptCode eScript); //For the cases where the font doesn't fully support a script, but has partial support //for a useful subset -SVT_DLLPUBLIC rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript); +SVT_DLLPUBLIC OUString makeShortMinimalTextForScript(UScriptCode eScript); //These ones are typically for use in the font preview window in format character -SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont); -SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang); -SVT_DLLPUBLIC rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript); -SVT_DLLPUBLIC rtl::OUString makeMinimalTextForScript(UScriptCode eScript); +SVT_DLLPUBLIC OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont); +SVT_DLLPUBLIC OUString makeRepresentativeTextForLanguage(LanguageType eLang); +SVT_DLLPUBLIC OUString makeRepresentativeTextForScript(UScriptCode eScript); +SVT_DLLPUBLIC OUString makeMinimalTextForScript(UScriptCode eScript); #endif diff --git a/svtools/inc/svtools/scriptedtext.hxx b/svtools/inc/svtools/scriptedtext.hxx index 9d99588126c3..f25823e793f2 100644 --- a/svtools/inc/svtools/scriptedtext.hxx +++ b/svtools/inc/svtools/scriptedtext.hxx @@ -76,7 +76,7 @@ public: @param _xBreakIter The break iterator for iterating through the script portions. */ void SetText( - const ::rtl::OUString& _rText, + const OUString& _rText, const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& _xBreakIter ); /** Returns a size struct containing the width and height of the text in the current output device. diff --git a/svtools/inc/svtools/statusbarcontroller.hxx b/svtools/inc/svtools/statusbarcontroller.hxx index 5042e6de54c0..eba45e543525 100644 --- a/svtools/inc/svtools/statusbarcontroller.hxx +++ b/svtools/inc/svtools/statusbarcontroller.hxx @@ -52,7 +52,7 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu public: StatusbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& aCommandURL, + const OUString& aCommandURL, unsigned short nID ); StatusbarController(); virtual ~StatusbarController(); @@ -108,19 +108,19 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; + OUStringHash, + ::std::equal_to< OUString > > URLToDispatchMap; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation - void addStatusListener( const rtl::OUString& aCommandURL ); + void addStatusListener( const OUString& aCommandURL ); void bindListener(); // execute methods // execute bound status bar controller command/execute various commands void execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); - void execute( const rtl::OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); + void execute( const OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); sal_Bool m_bInitialized : 1, m_bDisposed : 1; @@ -128,7 +128,7 @@ class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatu ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParentWindow; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - rtl::OUString m_aCommandURL; + OUString m_aCommandURL; URLToDispatchMap m_aListenerMap; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; diff --git a/svtools/inc/svtools/stringtransfer.hxx b/svtools/inc/svtools/stringtransfer.hxx index a5b8e2d1678e..82c125442d1b 100644 --- a/svtools/inc/svtools/stringtransfer.hxx +++ b/svtools/inc/svtools/stringtransfer.hxx @@ -34,10 +34,10 @@ namespace svt class SVT_DLLPUBLIC OStringTransferable : public TransferableHelper { protected: - ::rtl::OUString m_sContent; + OUString m_sContent; public: - OStringTransferable(const ::rtl::OUString& _rContent); + OStringTransferable(const OUString& _rContent); protected: // TransferableHelper overridables @@ -55,16 +55,16 @@ namespace svt

      Beware: In opposite to the old DragServer::CopyString, this method does not add the string to the clipboard, instead the old clipboard content is replaced!

      */ - SVT_DLLPUBLIC static void CopyString( const ::rtl::OUString& _rContent, Window* _pWindow = NULL ); + SVT_DLLPUBLIC static void CopyString( const OUString& _rContent, Window* _pWindow = NULL ); /** extracts a string from the system clipboard given @return if the extraction was successfull, i.e. if the clipboard contained a string content */ - SVT_DLLPUBLIC static sal_Bool PasteString( ::rtl::OUString& _rContent, Window* _pWindow = NULL ); + SVT_DLLPUBLIC static sal_Bool PasteString( OUString& _rContent, Window* _pWindow = NULL ); /** starts dragging a simple string */ - SVT_DLLPUBLIC static void StartStringDrag( const ::rtl::OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ); + SVT_DLLPUBLIC static void StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ); }; //........................................................................ diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx index 31cf6343def8..14784835fa6b 100644 --- a/svtools/inc/svtools/svlbitm.hxx +++ b/svtools/inc/svtools/svlbitm.hxx @@ -93,15 +93,15 @@ public: class SVT_DLLPUBLIC SvLBoxString : public SvLBoxItem { protected: - rtl::OUString maText; + OUString maText; public: - SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const rtl::OUString& rStr); + SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const OUString& rStr); SvLBoxString(); virtual ~SvLBoxString(); virtual sal_uInt16 GetType() const; virtual void InitViewData(SvTreeListBox*, SvTreeListEntry*, SvViewDataItem*); - rtl::OUString GetText() const { return maText; } - void SetText( const rtl::OUString& rText ) { maText = rText; } + OUString GetText() const { return maText; } + void SetText( const OUString& rText ) { maText = rText; } virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx index 208a8a70fbd9..7bcd0591b2d1 100644 --- a/svtools/inc/svtools/svtabbx.hxx +++ b/svtools/inc/svtools/svtabbx.hxx @@ -179,10 +179,10 @@ public: /** @return The description of a row. @param _nRow The row which description is in demand. */ - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const; /** @return The description of a column. @param _nColumn The column which description is in demand. */ - virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumn ) const; + virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const; /** @return , if the object has a row header. */ virtual sal_Bool HasRowHeader() const; //GetColumnId @@ -224,8 +224,8 @@ public: virtual sal_Bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ); virtual sal_Bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ); - virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; - virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; virtual Window* GetWindowInstance(); using SvTreeListBox::FillAccessibleStateSet; diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx index 0a950081c20d..265723ecf8b8 100644 --- a/svtools/inc/svtools/tabbar.hxx +++ b/svtools/inc/svtools/tabbar.hxx @@ -513,7 +513,7 @@ public: void SetPageText( sal_uInt16 nPageId, const OUString& rText ); OUString GetPageText( sal_uInt16 nPageId ) const; XubString GetHelpText( sal_uInt16 nPageId ) const; - rtl::OString GetHelpId( sal_uInt16 nPageId ) const; + OString GetHelpId( sal_uInt16 nPageId ) const; long GetSplitSize() const { return mnSplitSize; } @@ -521,9 +521,9 @@ public: { Window::SetHelpText( rText ); } XubString GetHelpText() const { return Window::GetHelpText(); }; - void SetHelpId( const rtl::OString& rId ) + void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); } - const rtl::OString& GetHelpId() const + const OString& GetHelpId() const { return Window::GetHelpId(); } void SetStyle( WinBits nStyle ); diff --git a/svtools/inc/svtools/table/gridtablerenderer.hxx b/svtools/inc/svtools/table/gridtablerenderer.hxx index 66ef7c995613..21a096268fe1 100644 --- a/svtools/inc/svtools/table/gridtablerenderer.hxx +++ b/svtools/inc/svtools/table/gridtablerenderer.hxx @@ -94,7 +94,7 @@ namespace svt { namespace table virtual bool GetFormattedCellString( ::com::sun::star::uno::Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, - ::rtl::OUString & o_cellString + OUString & o_cellString ) const; private: @@ -109,7 +109,7 @@ namespace svt { namespace table ); void impl_paintCellText( CellRenderContext const & i_context, - ::rtl::OUString const & i_text + OUString const & i_text ); }; //........................................................................ diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx index 193ac865d7a2..a170a38a4648 100644 --- a/svtools/inc/svtools/table/tablecontrol.hxx +++ b/svtools/inc/svtools/table/tablecontrol.hxx @@ -152,9 +152,9 @@ namespace svt { namespace table /** Creates and returns the accessible object of the whole GridControl. */ SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ); - SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const; SVT_DLLPRIVATE virtual sal_Bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ); - SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const; SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const; // temporary methods @@ -184,14 +184,14 @@ namespace svt { namespace table virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const; - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; - virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const; - virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const; - virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual OUString GetRowName(sal_Int32 _nIndex) const; + virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const; + virtual OUString GetColumnName( sal_Int32 _nIndex ) const; virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const; virtual sal_Bool HasRowHeader(); virtual sal_Bool HasColHeader(); - virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const; + virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const; virtual sal_Int32 GetSelectedRowCount() const; virtual sal_Int32 GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const; diff --git a/svtools/inc/svtools/table/tablerenderer.hxx b/svtools/inc/svtools/table/tablerenderer.hxx index be1951c8fb31..05ee87571c4c 100644 --- a/svtools/inc/svtools/table/tablerenderer.hxx +++ b/svtools/inc/svtools/table/tablerenderer.hxx @@ -268,7 +268,7 @@ namespace svt { namespace table virtual bool GetFormattedCellString( ::com::sun::star::uno::Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, - ::rtl::OUString & o_cellString + OUString & o_cellString ) const = 0; /// deletes the renderer instance diff --git a/svtools/inc/svtools/toolbarmenu.hxx b/svtools/inc/svtools/toolbarmenu.hxx index bc5b612ce0be..247483440947 100644 --- a/svtools/inc/svtools/toolbarmenu.hxx +++ b/svtools/inc/svtools/toolbarmenu.hxx @@ -95,7 +95,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); // todo: move to new base class that will replace SfxPopupWindow - void AddStatusListener( const rtl::OUString& rCommandURL ); + void AddStatusListener( const OUString& rCommandURL ); bool IsInPopupMode(); void EndPopupMode(); diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/svtools/inc/svtools/toolboxcontroller.hxx index 461bfcd6a3c6..4cc240729df7 100644 --- a/svtools/inc/svtools/toolboxcontroller.hxx +++ b/svtools/inc/svtools/toolboxcontroller.hxx @@ -61,7 +61,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL public: ToolboxController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); ToolboxController(); virtual ~ToolboxController(); @@ -69,7 +69,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const; - void updateStatus( const rtl::OUString aCommandURL ); + void updateStatus( const OUString aCommandURL ); void updateStatus(); // XInterface @@ -111,10 +111,10 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; - const rtl::OUString& getCommandURL() const { return m_aCommandURL; } - const rtl::OUString& getModuleName() const; + const OUString& getCommandURL() const { return m_aCommandURL; } + const OUString& getModuleName() const; - void dispatchCommand( const ::rtl::OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); + void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); void enable( bool bEnable ); @@ -130,14 +130,14 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; }; - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; + OUStringHash, + ::std::equal_to< OUString > > URLToDispatchMap; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation - void addStatusListener( const rtl::OUString& aCommandURL ); - void removeStatusListener( const rtl::OUString& aCommandURL ); + void addStatusListener( const OUString& aCommandURL ); + void removeStatusListener( const OUString& aCommandURL ); void bindListener(); void unbindListener(); sal_Bool isBound() const; @@ -150,7 +150,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ToolboxController_Impl* m_pImpl; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - rtl::OUString m_aCommandURL; + OUString m_aCommandURL; URLToDispatchMap m_aListenerMap; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener }; diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx index ee050bb4ed24..4c2d0f736ba0 100644 --- a/svtools/inc/svtools/toolpanel/toolpanel.hxx +++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx @@ -48,13 +48,13 @@ namespace svt { public: /// retrieves the display name of the panel - virtual ::rtl::OUString GetDisplayName() const = 0; + virtual OUString GetDisplayName() const = 0; /// retrieves the image associated with the panel, if any virtual Image GetImage() const = 0; /// retrieves the help ID associated with the panel, if any. - virtual rtl::OString GetHelpID() const = 0; + virtual OString GetHelpID() const = 0; /** activates the panel diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx index 342b29c51b0f..5d63d166bfa5 100644 --- a/svtools/inc/svtools/transfer.hxx +++ b/svtools/inc/svtools/transfer.hxx @@ -161,7 +161,7 @@ private: private: ::com::sun::star::uno::Any maAny; - ::rtl::OUString maLastFormat; + OUString maLastFormat; mutable ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener > mxTerminateListener; DataFlavorExVector* mpFormats; @@ -223,7 +223,7 @@ protected: void ClearFormats(); sal_Bool SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetString( const ::rtl::OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + sal_Bool SetString( const OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); sal_Bool SetBitmap( const Bitmap& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); sal_Bool SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); sal_Bool SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); @@ -318,8 +318,8 @@ public: sal_Bool GetString( SotFormatStringId nFormat, String& rStr ); sal_Bool GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, String& rStr ); - sal_Bool GetString( SotFormatStringId nFormat, ::rtl::OUString& rStr ); - sal_Bool GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::rtl::OUString& rStr ); + sal_Bool GetString( SotFormatStringId nFormat, OUString& rStr ); + sal_Bool GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, OUString& rStr ); sal_Bool GetBitmap( SotFormatStringId nFormat, Bitmap& rBmp ); sal_Bool GetBitmap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Bitmap& rBmp ); @@ -504,7 +504,7 @@ public: void CopyString( sal_uInt16 nFmt, const String& rStr ); void CopyAny( sal_uInt16 nFmt, const ::com::sun::star::uno::Any& rAny ); - void CopyByteString( sal_uLong nFormatId, const rtl::OString& rStr ); + void CopyByteString( sal_uLong nFormatId, const OString& rStr ); void CopyAnyData( sal_uLong nFormatId, const sal_Char* pData, sal_uLong nLen ); sal_Bool HasAnyData() const; diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx index 30d05bd2a23e..180050560bf9 100644 --- a/svtools/inc/svtools/treelistbox.hxx +++ b/svtools/inc/svtools/treelistbox.hxx @@ -650,7 +650,7 @@ public: // Edits the Entry's first StringItem, 0 == Cursor void EditEntry( SvTreeListEntry* pEntry = NULL ); virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); diff --git a/svtools/inc/svtools/unoevent.hxx b/svtools/inc/svtools/unoevent.hxx index 2e41bdf945ff..581df582a64e 100644 --- a/svtools/inc/svtools/unoevent.hxx +++ b/svtools/inc/svtools/unoevent.hxx @@ -60,20 +60,20 @@ class SVT_DLLPUBLIC SvBaseEventDescriptor : public cppu::WeakImplHelper2 ::com::sun::star::lang::XServiceInfo > { - const ::rtl::OUString sEventType; - const ::rtl::OUString sMacroName; - const ::rtl::OUString sLibrary; - const ::rtl::OUString sStarBasic; - const ::rtl::OUString sJavaScript; - const ::rtl::OUString sScript; - const ::rtl::OUString sNone; + const OUString sEventType; + const OUString sMacroName; + const OUString sLibrary; + const OUString sStarBasic; + const OUString sJavaScript; + const OUString sScript; + const OUString sNone; /// name of own service - const ::rtl::OUString sServiceName; + const OUString sServiceName; protected: - const ::rtl::OUString sEmpty; + const OUString sEmpty; /// last element is 0, 0 const SvEventDescription* mpSupportedMacroItems; @@ -89,7 +89,7 @@ public: // XNameReplace /// calls replaceByName(const sal_uInt16, const SvxMacro&) virtual void SAL_CALL replaceByName( - const ::rtl::OUString& rName, /// API name of event + const OUString& rName, /// API name of event const ::com::sun::star::uno::Any& rElement ) /// event (PropertyValues) throw( ::com::sun::star::lang::IllegalArgumentException, @@ -100,20 +100,20 @@ public: // XNameAccess (via XNameReplace) /// calls getByName(sal_uInt16) virtual ::com::sun::star::uno::Any SAL_CALL getByName( - const ::rtl::OUString& rName ) /// API name of event + const OUString& rName ) /// API name of event throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAxcess (via XNameReplace) - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); // XNameAccess (via XNameReplace) virtual sal_Bool SAL_CALL hasByName( - const ::rtl::OUString& rName ) + const OUString& rName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess (via XNameReplace) @@ -126,15 +126,15 @@ public: // XServiceInfo /// must be implemented in subclass - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ) = 0; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -160,10 +160,10 @@ protected: ::com::sun::star::uno::RuntimeException) = 0; /// convert an API event name to the event ID as used by SvxMacroItem - sal_uInt16 mapNameToEventID(const ::rtl::OUString& rName) const; + sal_uInt16 mapNameToEventID(const OUString& rName) const; /// get the event ID for the name; return 0 if not supported - sal_uInt16 getMacroID(const ::rtl::OUString& rName) const; + sal_uInt16 getMacroID(const OUString& rName) const; /// create PropertyValues and Any from macro void getAnyFromMacro( @@ -254,7 +254,7 @@ class SVT_DLLPUBLIC SvDetachedEventDescriptor : public SvBaseEventDescriptor // the macros; aMacros[i] is the value for aSupportedMacroItemIDs[i] SvxMacro** aMacros; - const ::rtl::OUString sImplName; + const OUString sImplName; public: @@ -263,7 +263,7 @@ public: virtual ~SvDetachedEventDescriptor(); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); protected: diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx index 41ef0242c337..1a809c63fb99 100644 --- a/svtools/langsupport/langsupport.cxx +++ b/svtools/langsupport/langsupport.cxx @@ -73,9 +73,9 @@ SAL_IMPLEMENT_MAIN() continue; } - rtl::OUString sTag( LanguageTag( eLang).getBcp47()); + OUString sTag( LanguageTag( eLang).getBcp47()); - std::cout << rtl::OUStringToOString(sTag, osl_getThreadTextEncoding()).getStr() + std::cout << OUStringToOString(sTag, osl_getThreadTextEncoding()).getStr() << std::endl; } } diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index ed66e866fe58..5d59ff2cdc2f 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -230,7 +230,7 @@ void BrowseBox::SetFont( const Font& rNewFont ) sal_uLong BrowseBox::GetDefaultColumnWidth( const String& _rText ) const { - return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(rtl::OUString('0')) * 4; + return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(OUString('0')) * 4; } //------------------------------------------------------------------- @@ -550,8 +550,8 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const String& rTitle ) BrowserColumn *pCol = (*pCols)[ nItemPos ]; if ( pCol->Title() != rTitle ) { - ::rtl::OUString sNew(rTitle); - ::rtl::OUString sOld(pCol->Title()); + OUString sNew(rTitle); + OUString sOld(pCol->Title()); pCol->Title() = rTitle; diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index ff34cb059317..6a3018553a5d 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -29,7 +29,6 @@ // Accessibility ============================================================== -using ::rtl::OUString; using namespace ::com::sun::star::uno; using ::com::sun::star::accessibility::XAccessible; using namespace ::com::sun::star::accessibility; diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 1c9d839a8b7f..5249a14540a6 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -138,7 +138,7 @@ void SvtTabAppearanceCfg::Commit() PutProperties(rNames, aValues); } -void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< OUString >& ) { } diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 7b13df8e0964..f2dbec06358c 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -43,7 +43,6 @@ using namespace utl; using namespace com::sun::star; -using ::rtl::OUString; namespace svtools { @@ -63,32 +62,32 @@ class ColorConfig_Impl : public utl::ConfigItem { ColorConfigValue m_aConfigValues[ColorConfigEntryCount]; sal_Bool m_bEditMode; - rtl::OUString m_sIsVisible; - rtl::OUString m_sLoadedScheme; + OUString m_sIsVisible; + OUString m_sLoadedScheme; - uno::Sequence< ::rtl::OUString> GetPropertyNames(const rtl::OUString& rScheme); + uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme); public: ColorConfig_Impl(sal_Bool bEditMode = sal_False); virtual ~ColorConfig_Impl(); - void Load(const rtl::OUString& rScheme); + void Load(const OUString& rScheme); void CommitCurrentSchemeName(); //changes the name of the current scheme but doesn't load it! - void SetCurrentSchemeName(const rtl::OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} + void SetCurrentSchemeName(const OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} virtual void Commit(); - virtual void Notify( const uno::Sequence& aPropertyNames); + virtual void Notify( const uno::Sequence& aPropertyNames); const ColorConfigValue& GetColorConfigValue(ColorConfigEntry eValue) {return m_aConfigValues[eValue];} void SetColorConfigValue(ColorConfigEntry eValue, const ColorConfigValue& rValue ); - const rtl::OUString& GetLoadedScheme() const {return m_sLoadedScheme;} + const OUString& GetLoadedScheme() const {return m_sLoadedScheme;} - uno::Sequence< ::rtl::OUString> GetSchemeNames(); + uno::Sequence< OUString> GetSchemeNames(); - sal_Bool AddScheme(const rtl::OUString& rNode); - sal_Bool RemoveScheme(const rtl::OUString& rNode); + sal_Bool AddScheme(const OUString& rNode); + sal_Bool RemoveScheme(const OUString& rNode); void SetModified(){ConfigItem::SetModified();} void ClearModified(){ConfigItem::ClearModified();} void SettingsChanged(); @@ -99,7 +98,7 @@ public: void ImplUpdateApplicationSettings(); }; -uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme) +uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const OUString& rScheme) { uno::Sequence aNames(2 * ColorConfigEntryCount); OUString* pNames = aNames.getArray(); @@ -166,7 +165,7 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& const int nCount = ColorConfigEntryCount; for(sal_Int32 i = 0; i < 4 * nCount; i+= 4) { - rtl::OUString sBaseName(sBase); + OUString sBaseName(sBase); sal_Int32 nPos = i / 4; sBaseName += OUString(cNames[nPos].cName, cNames[nPos].nLength, cNames[nPos].eEncoding); pNames[nIndex] += sBaseName; @@ -189,10 +188,10 @@ ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) : if(!m_bEditMode) { //try to register on the root node - if possible - uno::Sequence < ::rtl::OUString > aNames(1); + uno::Sequence < OUString > aNames(1); EnableNotification( aNames ); } - Load(::rtl::OUString()); + Load(OUString()); ImplUpdateApplicationSettings(); @@ -207,23 +206,23 @@ ColorConfig_Impl::~ColorConfig_Impl() ::Application::RemoveEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) ); } -void ColorConfig_Impl::Load(const rtl::OUString& rScheme) +void ColorConfig_Impl::Load(const OUString& rScheme) { - rtl::OUString sScheme(rScheme); + OUString sScheme(rScheme); if(sScheme.isEmpty()) { //detect current scheme name - uno::Sequence < ::rtl::OUString > aCurrent(1); + uno::Sequence < OUString > aCurrent(1); aCurrent.getArray()[0] = "CurrentColorScheme"; uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); aCurrentVal.getConstArray()[0] >>= sScheme; } m_sLoadedScheme = sScheme; // - uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(sScheme); + uno::Sequence < OUString > aColorNames = GetPropertyNames(sScheme); uno::Sequence< uno::Any > aColors = GetProperties( aColorNames ); const uno::Any* pColors = aColors.getConstArray(); - const ::rtl::OUString* pColorNames = aColorNames.getConstArray(); + const OUString* pColorNames = aColorNames.getConstArray(); sal_Int32 nIndex = 0; for(int i = 0; i < 2 * ColorConfigEntryCount && aColors.getLength() > nIndex; i+= 2) { @@ -243,16 +242,16 @@ void ColorConfig_Impl::Load(const rtl::OUString& rScheme) void ColorConfig_Impl::Notify( const uno::Sequence& ) { //loading via notification always uses the default setting - Load(::rtl::OUString()); + Load(OUString()); NotifyListeners(0); } void ColorConfig_Impl::Commit() { - uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(m_sLoadedScheme); + uno::Sequence < OUString > aColorNames = GetPropertyNames(m_sLoadedScheme); uno::Sequence < beans::PropertyValue > aPropValues(aColorNames.getLength()); beans::PropertyValue* pPropValues = aPropValues.getArray(); - const ::rtl::OUString* pColorNames = aColorNames.getConstArray(); + const OUString* pColorNames = aColorNames.getConstArray(); sal_Int32 nIndex = 0; const uno::Type& rBoolType = ::getBooleanCppuType(); for(int i = 0; i < 2 * ColorConfigEntryCount && aColorNames.getLength() > nIndex; i+= 2) @@ -273,7 +272,7 @@ void ColorConfig_Impl::Commit() nIndex++; } } - rtl::OUString sNode("ColorSchemes"); + OUString sNode("ColorSchemes"); SetSetProperties(sNode, aPropValues); CommitCurrentSchemeName(); @@ -282,7 +281,7 @@ void ColorConfig_Impl::Commit() void ColorConfig_Impl::CommitCurrentSchemeName() { //save current scheme name - uno::Sequence < ::rtl::OUString > aCurrent(1); + uno::Sequence < OUString > aCurrent(1); aCurrent.getArray()[0] = "CurrentColorScheme"; uno::Sequence< uno::Any > aCurrentVal(1); aCurrentVal.getArray()[0] <<= m_sLoadedScheme; @@ -298,12 +297,12 @@ void ColorConfig_Impl::SetColorConfigValue(ColorConfigEntry eValue, const ColorC } } -uno::Sequence< ::rtl::OUString> ColorConfig_Impl::GetSchemeNames() +uno::Sequence< OUString> ColorConfig_Impl::GetSchemeNames() { return GetNodeNames("ColorSchemes"); } -sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme) +sal_Bool ColorConfig_Impl::AddScheme(const OUString& rScheme) { if(ConfigItem::AddNode("ColorSchemes", rScheme)) { @@ -314,9 +313,9 @@ sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme) return sal_False; } -sal_Bool ColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme) +sal_Bool ColorConfig_Impl::RemoveScheme(const OUString& rScheme) { - uno::Sequence< rtl::OUString > aElements(1); + uno::Sequence< OUString > aElements(1); aElements.getArray()[0] = rScheme; return ClearNodeElements("ColorSchemes", aElements); } @@ -499,22 +498,22 @@ EditableColorConfig::~EditableColorConfig() delete m_pImpl; } -uno::Sequence< ::rtl::OUString > EditableColorConfig::GetSchemeNames() const +uno::Sequence< OUString > EditableColorConfig::GetSchemeNames() const { return m_pImpl->GetSchemeNames(); } -void EditableColorConfig::DeleteScheme(const ::rtl::OUString& rScheme ) +void EditableColorConfig::DeleteScheme(const OUString& rScheme ) { m_pImpl->RemoveScheme(rScheme); } -void EditableColorConfig::AddScheme(const ::rtl::OUString& rScheme ) +void EditableColorConfig::AddScheme(const OUString& rScheme ) { m_pImpl->AddScheme(rScheme); } -sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme ) +sal_Bool EditableColorConfig::LoadScheme(const OUString& rScheme ) { if(m_bModified) m_pImpl->SetModified(); @@ -527,13 +526,13 @@ sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme ) return sal_True; } -const ::rtl::OUString& EditableColorConfig::GetCurrentSchemeName()const +const OUString& EditableColorConfig::GetCurrentSchemeName()const { return m_pImpl->GetLoadedScheme(); } // Changes the name of the current scheme but doesn't load it! -void EditableColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme) +void EditableColorConfig::SetCurrentSchemeName(const OUString& rScheme) { m_pImpl->SetCurrentSchemeName(rScheme); m_pImpl->CommitCurrentSchemeName(); diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index b5a94597daad..eee51dd35c26 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -41,7 +41,6 @@ using namespace utl; using namespace com::sun::star; -using ::rtl::OUString; namespace svtools { @@ -57,7 +56,7 @@ ExtendedColorConfig_Impl* ExtendedColorConfig::m_pImpl = NULL; class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster { - DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, TDisplayNames); + DECLARE_STL_USTRINGACCESS_MAP( OUString, TDisplayNames); DECLARE_STL_USTRINGACCESS_MAP(ExtendedColorConfigValue,TConfigValues); typedef ::std::vector TMapPos; typedef ::std::pair< TConfigValues, TMapPos > TComponentMapping; @@ -67,32 +66,32 @@ class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster ::std::vector m_aConfigValuesPos; sal_Bool m_bEditMode; - rtl::OUString m_sLoadedScheme; + OUString m_sLoadedScheme; sal_Bool m_bIsBroadcastEnabled; static sal_Bool m_bLockBroadcast; static sal_Bool m_bBroadcastWhenUnlocked; - uno::Sequence< ::rtl::OUString> GetPropertyNames(const rtl::OUString& rScheme); - void FillComponentColors(uno::Sequence < ::rtl::OUString >& _rComponents,const TDisplayNames& _rDisplayNames); + uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme); + void FillComponentColors(uno::Sequence < OUString >& _rComponents,const TDisplayNames& _rDisplayNames); public: ExtendedColorConfig_Impl(sal_Bool bEditMode = sal_False); virtual ~ExtendedColorConfig_Impl(); - void Load(const rtl::OUString& rScheme); + void Load(const OUString& rScheme); void CommitCurrentSchemeName(); //changes the name of the current scheme but doesn't load it! - void SetCurrentSchemeName(const rtl::OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} - sal_Bool ExistsScheme(const ::rtl::OUString& _sSchemeName); + void SetCurrentSchemeName(const OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} + sal_Bool ExistsScheme(const OUString& _sSchemeName); virtual void Commit(); - virtual void Notify( const uno::Sequence& aPropertyNames); + virtual void Notify( const uno::Sequence& aPropertyNames); sal_Int32 GetComponentCount() const; - ::rtl::OUString GetComponentName(sal_uInt32 _nPos) const; - ::rtl::OUString GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const; - sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const; - ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const; + OUString GetComponentName(sal_uInt32 _nPos) const; + OUString GetComponentDisplayName(const OUString& _sComponentName) const; + sal_Int32 GetComponentColorCount(const OUString& _sName) const; + ExtendedColorConfigValue GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const; - ExtendedColorConfigValue GetColorConfigValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName) + ExtendedColorConfigValue GetColorConfigValue(const OUString& _sComponentName,const OUString& _sName) { TComponents::iterator aFind = m_aConfigValues.find(_sComponentName); if ( aFind != m_aConfigValues.end() ) @@ -102,22 +101,22 @@ public: return aFind2->second; } #if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer aMessage( "Could find the required config:\n" ); + OStringBuffer aMessage( "Could find the required config:\n" ); aMessage.append( "component: " ); - aMessage.append( ::rtl::OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) ); + aMessage.append( OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) ); aMessage.append( "\nname: " ); - aMessage.append( ::rtl::OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) ); + aMessage.append( OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) ); OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif return ExtendedColorConfigValue(); } - void SetColorConfigValue(const ::rtl::OUString& _sName, + void SetColorConfigValue(const OUString& _sName, const ExtendedColorConfigValue& rValue ); - const rtl::OUString& GetLoadedScheme() const {return m_sLoadedScheme;} + const OUString& GetLoadedScheme() const {return m_sLoadedScheme;} - sal_Bool AddScheme(const rtl::OUString& rNode); - sal_Bool RemoveScheme(const rtl::OUString& rNode); + sal_Bool AddScheme(const OUString& rNode); + sal_Bool RemoveScheme(const OUString& rNode); void SetModified(){ConfigItem::SetModified();} void ClearModified(){ConfigItem::ClearModified();} void SettingsChanged(); @@ -133,12 +132,12 @@ public: DECL_LINK( DataChangedEventListener, VclWindowEvent* ); }; -uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme) +uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const OUString& rScheme) { uno::Sequence< OUString> aNames(GetNodeNames(rScheme)); - ::rtl::OUString* pIter = aNames.getArray(); - ::rtl::OUString* pEnd = pIter + aNames.getLength(); - ::rtl::OUString sSep("/"); + OUString* pIter = aNames.getArray(); + OUString* pEnd = pIter + aNames.getLength(); + OUString sSep("/"); for(;pIter != pEnd;++pIter) { *pIter = rScheme + sSep + *pIter; @@ -151,7 +150,7 @@ sal_Int32 ExtendedColorConfig_Impl::GetComponentCount() const return m_aConfigValues.size(); } // ----------------------------------------------------------------------------- -sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const ::rtl::OUString& _sName) const +sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const OUString& _sName) const { sal_Int32 nSize = 0; TComponents::const_iterator aFind = m_aConfigValues.find(_sName); @@ -162,7 +161,7 @@ sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const ::rtl::OUString return nSize; } // ----------------------------------------------------------------------------- -ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const +ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const { TComponents::const_iterator aFind = m_aConfigValues.find(_sName); if ( aFind != m_aConfigValues.end() ) @@ -175,18 +174,18 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue( return ExtendedColorConfigValue(); } // ----------------------------------------------------------------------------- -::rtl::OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const +OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const OUString& _sComponentName) const { - ::rtl::OUString sRet; + OUString sRet; TDisplayNames::const_iterator aFind = m_aComponentDisplayNames.find(_sComponentName); if ( aFind != m_aComponentDisplayNames.end() ) sRet = aFind->second; return sRet; } // ----------------------------------------------------------------------------- -::rtl::OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const +OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const { - ::rtl::OUString sRet; + OUString sRet; if ( _nPos < m_aConfigValuesPos.size() ) sRet = m_aConfigValuesPos[_nPos]->first; return sRet; @@ -195,17 +194,17 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue( sal_Bool ExtendedColorConfig_Impl::m_bLockBroadcast = sal_False; sal_Bool ExtendedColorConfig_Impl::m_bBroadcastWhenUnlocked = sal_False; ExtendedColorConfig_Impl::ExtendedColorConfig_Impl(sal_Bool bEditMode) : - ConfigItem(rtl::OUString("Office.ExtendedColorScheme")), + ConfigItem(OUString("Office.ExtendedColorScheme")), m_bEditMode(bEditMode), m_bIsBroadcastEnabled(sal_True) { if(!m_bEditMode) { //try to register on the root node - if possible - uno::Sequence < ::rtl::OUString > aNames(1); + uno::Sequence < OUString > aNames(1); EnableNotification( aNames ); } - Load(::rtl::OUString()); + Load(OUString()); // #100822# ::Application::AddEventListener( LINK(this, ExtendedColorConfig_Impl, DataChangedEventListener) ); @@ -235,15 +234,15 @@ sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast() return ExtendedColorConfig::m_pImpl ? ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled : sal_False; } -void lcl_addString(uno::Sequence < ::rtl::OUString >& _rSeq,const ::rtl::OUString& _sAdd) +void lcl_addString(uno::Sequence < OUString >& _rSeq,const OUString& _sAdd) { - ::rtl::OUString* pIter = _rSeq.getArray(); - ::rtl::OUString* pEnd = pIter + _rSeq.getLength(); + OUString* pIter = _rSeq.getArray(); + OUString* pEnd = pIter + _rSeq.getLength(); for(;pIter != pEnd;++pIter) *pIter += _sAdd; } // ----------------------------------------------------------------------------- -void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) +void ExtendedColorConfig_Impl::Load(const OUString& rScheme) { m_aComponentDisplayNames.clear(); m_aConfigValuesPos.clear(); @@ -251,58 +250,58 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) // fill display names TDisplayNames aDisplayNameMap; - ::rtl::OUString sEntryNames("EntryNames"); - uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sEntryNames); - ::rtl::OUString sDisplayName("/DisplayName"); - ::rtl::OUString* pIter = aComponentNames.getArray(); - ::rtl::OUString* pEnd = pIter + aComponentNames.getLength(); + OUString sEntryNames("EntryNames"); + uno::Sequence < OUString > aComponentNames = GetPropertyNames(sEntryNames); + OUString sDisplayName("/DisplayName"); + OUString* pIter = aComponentNames.getArray(); + OUString* pEnd = pIter + aComponentNames.getLength(); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) { - uno::Sequence < ::rtl::OUString > aComponentDisplayNames(1); + uno::Sequence < OUString > aComponentDisplayNames(1); aComponentDisplayNames[0] = *pIter; aComponentDisplayNames[0] += sDisplayName; uno::Sequence< uno::Any > aComponentDisplayNamesValue = GetProperties( aComponentDisplayNames ); - ::rtl::OUString sComponentDisplayName; + OUString sComponentDisplayName; if ( aComponentDisplayNamesValue.getLength() && (aComponentDisplayNamesValue[0] >>= sComponentDisplayName) ) { sal_Int32 nIndex = 0; m_aComponentDisplayNames.insert(TDisplayNames::value_type(pIter->getToken(1,'/',nIndex),sComponentDisplayName)); } - *pIter += ::rtl::OUString("/Entries"); - uno::Sequence < ::rtl::OUString > aDisplayNames = GetPropertyNames(*pIter); + *pIter += OUString("/Entries"); + uno::Sequence < OUString > aDisplayNames = GetPropertyNames(*pIter); lcl_addString(aDisplayNames,sDisplayName); uno::Sequence< uno::Any > aDisplayNamesValue = GetProperties( aDisplayNames ); - const ::rtl::OUString* pDispIter = aDisplayNames.getConstArray(); - const ::rtl::OUString* pDispEnd = pDispIter + aDisplayNames.getLength(); + const OUString* pDispIter = aDisplayNames.getConstArray(); + const OUString* pDispEnd = pDispIter + aDisplayNames.getLength(); for(sal_Int32 j = 0;pDispIter != pDispEnd;++pDispIter,++j) { sal_Int32 nIndex = 0; pDispIter->getToken(0,'/',nIndex); - ::rtl::OUString sName = pDispIter->copy(nIndex); + OUString sName = pDispIter->copy(nIndex); sName = sName.copy(0,sName.lastIndexOf(sDisplayName)); - ::rtl::OUString sCurrentDisplayName; + OUString sCurrentDisplayName; aDisplayNamesValue[j] >>= sCurrentDisplayName; aDisplayNameMap.insert(TDisplayNames::value_type(sName,sCurrentDisplayName)); } } // load color settings - rtl::OUString sScheme(rScheme); + OUString sScheme(rScheme); if(sScheme.isEmpty()) { //detect current scheme name - uno::Sequence < ::rtl::OUString > aCurrent(1); - aCurrent.getArray()[0] = ::rtl::OUString("ExtendedColorScheme/CurrentColorScheme"); + uno::Sequence < OUString > aCurrent(1); + aCurrent.getArray()[0] = OUString("ExtendedColorScheme/CurrentColorScheme"); uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); aCurrentVal.getConstArray()[0] >>= sScheme; } // if(!sScheme.getLength()) m_sLoadedScheme = sScheme; - ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes/"); + OUString sBase("ExtendedColorScheme/ColorSchemes/"); sBase += sScheme; sal_Bool bFound = ExistsScheme(sScheme); @@ -313,14 +312,14 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) } if ( m_sLoadedScheme.isEmpty() ) - m_sLoadedScheme = ::rtl::OUString("default"); + m_sLoadedScheme = OUString("default"); if ( sScheme != "default" ) { - ::rtl::OUString sDefault("default"); + OUString sDefault("default"); if ( ExistsScheme(sDefault) ) { - ::rtl::OUString sBaseDefault("ExtendedColorScheme/ColorSchemes/default"); + OUString sBaseDefault("ExtendedColorScheme/ColorSchemes/default"); aComponentNames = GetPropertyNames(sBaseDefault); FillComponentColors(aComponentNames,aDisplayNameMap); } @@ -332,24 +331,24 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) } } // ----------------------------------------------------------------------------- -void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUString >& _rComponents,const TDisplayNames& _rDisplayNames) +void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < OUString >& _rComponents,const TDisplayNames& _rDisplayNames) { - const ::rtl::OUString sColorEntries("/Entries"); - ::rtl::OUString* pIter = _rComponents.getArray(); - ::rtl::OUString* pEnd = pIter + _rComponents.getLength(); + const OUString sColorEntries("/Entries"); + OUString* pIter = _rComponents.getArray(); + OUString* pEnd = pIter + _rComponents.getLength(); for(;pIter != pEnd;++pIter) { - ::rtl::OUString sComponentName = pIter->copy(pIter->lastIndexOf('/')+1); + OUString sComponentName = pIter->copy(pIter->lastIndexOf('/')+1); if ( m_aConfigValues.find(sComponentName) == m_aConfigValues.end() ) { - ::rtl::OUString sEntry = *pIter; + OUString sEntry = *pIter; sEntry += sColorEntries; - uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(sEntry); - uno::Sequence < ::rtl::OUString > aDefaultColorNames = aColorNames; + uno::Sequence < OUString > aColorNames = GetPropertyNames(sEntry); + uno::Sequence < OUString > aDefaultColorNames = aColorNames; - const ::rtl::OUString sColor("/Color"); - const ::rtl::OUString sDefaultColor("/DefaultColor"); + const OUString sColor("/Color"); + const OUString sDefaultColor("/DefaultColor"); lcl_addString(aColorNames,sColor); lcl_addString(aDefaultColorNames,sDefaultColor); uno::Sequence< uno::Any > aColors = GetProperties( aColorNames ); @@ -359,8 +358,8 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri bool bDefaultColorFound = aDefaultColors.getLength() != 0; const uno::Any* pDefaultColors = aDefaultColors.getConstArray(); - ::rtl::OUString* pColorIter = aColorNames.getArray(); - ::rtl::OUString* pColorEnd = pColorIter + aColorNames.getLength(); + OUString* pColorIter = aColorNames.getArray(); + OUString* pColorEnd = pColorIter + aColorNames.getLength(); m_aConfigValuesPos.push_back(m_aConfigValues.insert(TComponents::value_type(sComponentName,TComponentMapping(TConfigValues(),TMapPos()))).first); TConfigValues& aConfigValues = (*m_aConfigValuesPos.rbegin())->second.first; @@ -371,8 +370,8 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri { sal_Int32 nIndex = 0; pColorIter->getToken(2,'/',nIndex); - ::rtl::OUString sName(pColorIter->copy(nIndex)),sDisplayName; - ::rtl::OUString sTemp = sName.copy(0,sName.lastIndexOf(sColor)); + OUString sName(pColorIter->copy(nIndex)),sDisplayName; + OUString sTemp = sName.copy(0,sName.lastIndexOf(sColor)); TDisplayNames::const_iterator aFind = _rDisplayNames.find(sTemp); nIndex = 0; @@ -400,7 +399,7 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri void ExtendedColorConfig_Impl::Notify( const uno::Sequence& /*rPropertyNames*/) { //loading via notification always uses the default setting - Load(::rtl::OUString()); + Load(OUString()); SolarMutexGuard aVclGuard; @@ -416,22 +415,22 @@ void ExtendedColorConfig_Impl::Commit() { if ( m_sLoadedScheme.isEmpty() ) return; - const ::rtl::OUString sColorEntries("Entries"); - const ::rtl::OUString sColor("/Color"); - ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes/"); - const ::rtl::OUString s_sSep("/"); + const OUString sColorEntries("Entries"); + const OUString sColor("/Color"); + OUString sBase("ExtendedColorScheme/ColorSchemes/"); + const OUString s_sSep("/"); sBase += m_sLoadedScheme; TComponents::iterator aIter = m_aConfigValues.begin(); TComponents::iterator aEnd = m_aConfigValues.end(); for( ;aIter != aEnd;++aIter ) { - ::rtl::OUString sEntry = aIter->first; + OUString sEntry = aIter->first; sEntry += sColorEntries; if ( ConfigItem::AddNode(sBase, aIter->first) ) { - rtl::OUString sNode = sBase; + OUString sNode = sBase; sNode += s_sSep; sNode += aIter->first; //ConfigItem::AddNode(sNode, sColorEntries); @@ -450,7 +449,7 @@ void ExtendedColorConfig_Impl::Commit() pPropValues->Value <<= aConIter->second.getColor(); // the default color will never be changed } - ::rtl::OUString s("ExtendedColorScheme/ColorSchemes"); + OUString s("ExtendedColorScheme/ColorSchemes"); SetSetProperties(s, aPropValues); } } @@ -461,27 +460,27 @@ void ExtendedColorConfig_Impl::Commit() void ExtendedColorConfig_Impl::CommitCurrentSchemeName() { //save current scheme name - uno::Sequence < ::rtl::OUString > aCurrent(1); - aCurrent.getArray()[0] = rtl::OUString("ExtendedColorScheme/CurrentColorScheme"); + uno::Sequence < OUString > aCurrent(1); + aCurrent.getArray()[0] = OUString("ExtendedColorScheme/CurrentColorScheme"); uno::Sequence< uno::Any > aCurrentVal(1); aCurrentVal.getArray()[0] <<= m_sLoadedScheme; PutProperties(aCurrent, aCurrentVal); } // ----------------------------------------------------------------------------- -sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeName) +sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const OUString& _sSchemeName) { - ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes"); + OUString sBase("ExtendedColorScheme/ColorSchemes"); - uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sBase); - sBase += ::rtl::OUString("/") + _sSchemeName; - const ::rtl::OUString* pCompIter = aComponentNames.getConstArray(); - const ::rtl::OUString* pCompEnd = pCompIter + aComponentNames.getLength(); + uno::Sequence < OUString > aComponentNames = GetPropertyNames(sBase); + sBase += OUString("/") + _sSchemeName; + const OUString* pCompIter = aComponentNames.getConstArray(); + const OUString* pCompEnd = pCompIter + aComponentNames.getLength(); for(;pCompIter != pCompEnd && *pCompIter != sBase;++pCompIter) ; return pCompIter != pCompEnd; } -void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName, const ExtendedColorConfigValue& rValue ) +void ExtendedColorConfig_Impl::SetColorConfigValue(const OUString& _sName, const ExtendedColorConfigValue& rValue ) { TComponents::iterator aFind = m_aConfigValues.find(_sName); if ( aFind != m_aConfigValues.end() ) @@ -493,9 +492,9 @@ void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName } } -sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme) +sal_Bool ExtendedColorConfig_Impl::AddScheme(const OUString& rScheme) { - if(ConfigItem::AddNode(rtl::OUString("ExtendedColorScheme/ColorSchemes"), rScheme)) + if(ConfigItem::AddNode(OUString("ExtendedColorScheme/ColorSchemes"), rScheme)) { m_sLoadedScheme = rScheme; Commit(); @@ -504,11 +503,11 @@ sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme) return sal_False; } -sal_Bool ExtendedColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme) +sal_Bool ExtendedColorConfig_Impl::RemoveScheme(const OUString& rScheme) { - uno::Sequence< rtl::OUString > aElements(1); + uno::Sequence< OUString > aElements(1); aElements.getArray()[0] = rScheme; - return ClearNodeElements(rtl::OUString("ExtendedColorScheme/ColorSchemes"), aElements); + return ClearNodeElements(OUString("ExtendedColorScheme/ColorSchemes"), aElements); } void ExtendedColorConfig_Impl::SettingsChanged() @@ -580,7 +579,7 @@ ExtendedColorConfig::~ExtendedColorConfig() } } -ExtendedColorConfigValue ExtendedColorConfig::GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const +ExtendedColorConfigValue ExtendedColorConfig::GetColorValue(const OUString& _sComponentName,const OUString& _sName)const { return m_pImpl->GetColorConfigValue(_sComponentName,_sName); } @@ -590,22 +589,22 @@ sal_Int32 ExtendedColorConfig::GetComponentCount() const return m_pImpl->GetComponentCount(); } // ----------------------------------------------------------------------------- -sal_Int32 ExtendedColorConfig::GetComponentColorCount(const ::rtl::OUString& _sName) const +sal_Int32 ExtendedColorConfig::GetComponentColorCount(const OUString& _sName) const { return m_pImpl->GetComponentColorCount(_sName); } // ----------------------------------------------------------------------------- -ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const +ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const { return m_pImpl->GetComponentColorConfigValue(_sName,_nPos); } // ----------------------------------------------------------------------------- -::rtl::OUString ExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const +OUString ExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const { return m_pImpl->GetComponentName(_nPos); } // ----------------------------------------------------------------------------- -::rtl::OUString ExtendedColorConfig::GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const +OUString ExtendedColorConfig::GetComponentDisplayName(const OUString& _sComponentName) const { return m_pImpl->GetComponentDisplayName(_sComponentName); } @@ -634,17 +633,17 @@ EditableExtendedColorConfig::~EditableExtendedColorConfig() delete m_pImpl; } -void EditableExtendedColorConfig::DeleteScheme(const ::rtl::OUString& rScheme ) +void EditableExtendedColorConfig::DeleteScheme(const OUString& rScheme ) { m_pImpl->RemoveScheme(rScheme); } -void EditableExtendedColorConfig::AddScheme(const ::rtl::OUString& rScheme ) +void EditableExtendedColorConfig::AddScheme(const OUString& rScheme ) { m_pImpl->AddScheme(rScheme); } -sal_Bool EditableExtendedColorConfig::LoadScheme(const ::rtl::OUString& rScheme ) +sal_Bool EditableExtendedColorConfig::LoadScheme(const OUString& rScheme ) { if(m_bModified) m_pImpl->SetModified(); @@ -658,14 +657,14 @@ sal_Bool EditableExtendedColorConfig::LoadScheme(const ::rtl::OUString& rScheme } // Changes the name of the current scheme but doesn't load it! -void EditableExtendedColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme) +void EditableExtendedColorConfig::SetCurrentSchemeName(const OUString& rScheme) { m_pImpl->SetCurrentSchemeName(rScheme); m_pImpl->CommitCurrentSchemeName(); } void EditableExtendedColorConfig::SetColorValue( - const ::rtl::OUString& _sName, const ExtendedColorConfigValue& rValue) + const OUString& _sName, const ExtendedColorConfigValue& rValue) { m_pImpl->SetColorConfigValue(_sName, rValue); m_pImpl->ClearModified(); @@ -701,17 +700,17 @@ sal_Int32 EditableExtendedColorConfig::GetComponentCount() const return m_pImpl->GetComponentCount(); } // ----------------------------------------------------------------------------- -sal_Int32 EditableExtendedColorConfig::GetComponentColorCount(const ::rtl::OUString& _sName) const +sal_Int32 EditableExtendedColorConfig::GetComponentColorCount(const OUString& _sName) const { return m_pImpl->GetComponentColorCount(_sName); } // ----------------------------------------------------------------------------- -ExtendedColorConfigValue EditableExtendedColorConfig::GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const +ExtendedColorConfigValue EditableExtendedColorConfig::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const { return m_pImpl->GetComponentColorConfigValue(_sName,_nPos); } // ----------------------------------------------------------------------------- -::rtl::OUString EditableExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const +OUString EditableExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const { return m_pImpl->GetComponentName(_nPos); } diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index 03debe3783d3..b3ccb4fb725f 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using ::rtl::OUString; const sal_Char cReplacement[] = "Replacement"; const sal_Char cFontPairs[] = "FontPairs"; @@ -50,7 +49,7 @@ struct SvtFontSubstConfig_Impl }; SvtFontSubstConfig::SvtFontSubstConfig() : - ConfigItem(rtl::OUString("Office.Common/Font/Substitution")), + ConfigItem(OUString("Office.Common/Font/Substitution")), bIsEnabled(sal_False), pImpl(new SvtFontSubstConfig_Impl) { @@ -69,13 +68,13 @@ SvtFontSubstConfig::SvtFontSubstConfig() : Sequence aPropNames(aNodeNames.getLength() * 4); OUString* pNames = aPropNames.getArray(); sal_Int32 nName = 0; - sPropPrefix += rtl::OUString("/"); + sPropPrefix += OUString("/"); sal_Int32 nNode; for(nNode = 0; nNode < aNodeNames.getLength(); nNode++) { OUString sStart(sPropPrefix); sStart += pNodeNames[nNode]; - sStart += rtl::OUString("/"); + sStart += OUString("/"); pNames[nName] = sStart; pNames[nName++] += cReplaceFont; pNames[nName] = sStart; pNames[nName++] += cSubstituteFont; pNames[nName] = sStart; pNames[nName++] += cAlways; @@ -100,7 +99,7 @@ SvtFontSubstConfig::~SvtFontSubstConfig() delete pImpl; } -void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< OUString >& ) { } diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index f5a9d053eaa7..6380e9534a28 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -35,7 +35,6 @@ using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star; -using ::rtl::OUString; static SvtHelpOptions_Impl* pOptions = NULL; static sal_Int32 nRefCount = 0; @@ -70,8 +69,8 @@ class SvtHelpOptions_Impl : public utl::ConfigItem public: SvtHelpOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - void Load( const ::com::sun::star::uno::Sequence< ::rtl::OUString>& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + void Load( const ::com::sun::star::uno::Sequence< OUString>& aPropertyNames); virtual void Commit(); void SetExtendedHelp( sal_Bool b ) { bExtendedHelp= b; SetModified(); } @@ -102,7 +101,7 @@ protected: void implLoadURLCounters(); void implSaveURLCounters(); // to be called with aIgnoreCounterSafety locked - void implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounter ); + void implGetURLCounters( Sequence< OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounter ); }; Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames() @@ -162,8 +161,8 @@ SvtHelpOptions_Impl::SvtHelpOptions_Impl() } // ----------------------------------------------------------------------- -static int lcl_MapPropertyName( const ::rtl::OUString rCompare, - const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames) +static int lcl_MapPropertyName( const OUString rCompare, + const uno::Sequence< OUString>& aInternalPropertyNames) { for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp) { @@ -173,9 +172,9 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare, return -1; } -void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rPropertyNames) +void SvtHelpOptions_Impl::Load(const uno::Sequence< OUString>& rPropertyNames) { - const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames()); + const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames()); Sequence< Any > aValues = GetProperties( rPropertyNames ); const Any* pValues = aValues.getConstArray(); DBG_ASSERT( aValues.getLength() == rPropertyNames.getLength(), "GetProperties failed" ); @@ -189,7 +188,7 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty if ( pValues[nProp].hasValue() ) { sal_Bool bTmp = sal_Bool(); - ::rtl::OUString aTmpStr; + OUString aTmpStr; sal_Int32 nTmpInt = 0; if ( pValues[nProp] >>= bTmp ) { @@ -260,29 +259,29 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty // ----------------------------------------------------------------------- -void SvtHelpOptions_Impl::implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters ) +void SvtHelpOptions_Impl::implGetURLCounters( Sequence< OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters ) { // the ignore counters for the help agent URLs - const ::rtl::OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" ); - const ::rtl::OUString sPathSeparator( "/" ); - const ::rtl::OUString sURLLocalPath( "/Name" ); - const ::rtl::OUString sCounterLocalPath( "/Counter" ); + const OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" ); + const OUString sPathSeparator( "/" ); + const OUString sURLLocalPath( "/Name" ); + const OUString sCounterLocalPath( "/Counter" ); // get the names of all the nodes containing ignore counters // collect the node names we have to ask // first get the node names of all children of HelpAgent/IgnoreList _rNodeNames = GetNodeNames(sIgnoreListNodePath); - const ::rtl::OUString* pIgnoredURLsNodes = _rNodeNames.getConstArray(); - const ::rtl::OUString* pIgnoredURLsNodesEnd = pIgnoredURLsNodes + _rNodeNames.getLength(); + const OUString* pIgnoredURLsNodes = _rNodeNames.getConstArray(); + const OUString* pIgnoredURLsNodesEnd = pIgnoredURLsNodes + _rNodeNames.getLength(); // then assemble the two lists (of node paths) for the URLs and the counters - Sequence< ::rtl::OUString > aIgnoredURLs(_rNodeNames.getLength()); - Sequence< ::rtl::OUString > aIgnoredURLsCounter(_rNodeNames.getLength()); - ::rtl::OUString* pIgnoredURLs = aIgnoredURLs.getArray(); - ::rtl::OUString* pIgnoredURLsCounter = aIgnoredURLsCounter.getArray(); + Sequence< OUString > aIgnoredURLs(_rNodeNames.getLength()); + Sequence< OUString > aIgnoredURLsCounter(_rNodeNames.getLength()); + OUString* pIgnoredURLs = aIgnoredURLs.getArray(); + OUString* pIgnoredURLsCounter = aIgnoredURLsCounter.getArray(); for (;pIgnoredURLsNodes != pIgnoredURLsNodesEnd; ++pIgnoredURLsNodes, ++pIgnoredURLs, ++pIgnoredURLsCounter) { - ::rtl::OUString sLocalURLAccess = sIgnoreListNodePath; + OUString sLocalURLAccess = sIgnoreListNodePath; sLocalURLAccess += sPathSeparator; sLocalURLAccess += *pIgnoredURLsNodes; @@ -323,36 +322,36 @@ void SvtHelpOptions_Impl::implSaveURLCounters() { ::osl::MutexGuard aGuard(aIgnoreCounterSafety); - const ::rtl::OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" ); - const ::rtl::OUString sPathSeparator( "/" ); - const ::rtl::OUString sURLLocalPath( "/Name" ); - const ::rtl::OUString sCounterLocalPath( "/Counter" ); + const OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" ); + const OUString sPathSeparator( "/" ); + const OUString sURLLocalPath( "/Name" ); + const OUString sCounterLocalPath( "/Counter" ); // get the current URL/counter pairs (as they're persistent at the moment) - Sequence< ::rtl::OUString > aNodeNames; + Sequence< OUString > aNodeNames; Sequence< Any > aURLs; Sequence< Any > aCounters; implGetURLCounters(aNodeNames, aURLs, aCounters); sal_Int32 nKnownURLs = aURLs.getLength(); - const ::rtl::OUString* pNodeNames = aNodeNames.getConstArray(); + const OUString* pNodeNames = aNodeNames.getConstArray(); const Any* pURLs = aURLs.getConstArray(); const Any* pCounters = aCounters.getConstArray(); // check which of them must be deleted/modified - Sequence< ::rtl::OUString > aDeleteFromConfig(nKnownURLs); // names of nodes to be deleted - ::rtl::OUString* pDeleteFromConfig = aDeleteFromConfig.getArray(); - ::std::set< ::rtl::OUString > aAlreadyPresent; // URLs currently persistent + Sequence< OUString > aDeleteFromConfig(nKnownURLs); // names of nodes to be deleted + OUString* pDeleteFromConfig = aDeleteFromConfig.getArray(); + ::std::set< OUString > aAlreadyPresent; // URLs currently persistent // for modifying already existent nodes - Sequence< ::rtl::OUString > aNewCounterNodePaths(nKnownURLs); + Sequence< OUString > aNewCounterNodePaths(nKnownURLs); Sequence< Any > aNewCounterValues(nKnownURLs); - ::rtl::OUString* pNewCounterNodePaths = aNewCounterNodePaths.getArray(); + OUString* pNewCounterNodePaths = aNewCounterNodePaths.getArray(); Any* pNewCounterValues = aNewCounterValues.getArray(); // temporaries needed inside the loop - ::rtl::OUString sCurrentURL, sCurrentURLNodeName; + OUString sCurrentURL, sCurrentURLNodeName; for (sal_Int32 i=0; i aNewCounterDataNodeNames(2); + OUString sNewNodeName; + Sequence< OUString > aNewCounterDataNodeNames(2); Sequence< Any > aNewCounterDataValues(2); - const ::rtl::OUString sNodeNameBase( "URL" ); + const OUString sNodeNameBase( "URL" ); for ( ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin(); aCollectNew != aURLIgnoreCounters.end(); ++aCollectNew @@ -451,7 +450,7 @@ void SvtHelpOptions_Impl::implLoadURLCounters() { ::osl::MutexGuard aGuard(aIgnoreCounterSafety); - Sequence< ::rtl::OUString > aNodeNames; + Sequence< OUString > aNodeNames; Sequence< Any > aURLs; Sequence< Any > aCounters; @@ -461,7 +460,7 @@ void SvtHelpOptions_Impl::implLoadURLCounters() const Any* pURLs = aURLs.getConstArray(); const Any* pCounters = aCounters.getConstArray(); - ::rtl::OUString sCurrentURL; + OUString sCurrentURL; sal_Int32 nCurrentCounter; for (sal_Int32 i=0; i& aPropertyNames ) +void SvtHelpOptions_Impl::Notify( const Sequence& aPropertyNames ) { Load( aPropertyNames ); } diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index 7cfcddf3706f..f3f2e7d03158 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -41,7 +41,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; struct HtmlOptions_Impl { @@ -249,7 +248,7 @@ void SvxHtmlOptions::CallListeners() } -void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< OUString >& ) { Load( GetPropertyNames() ); CallListeners(); diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index beb5e478c585..856125f4a8d2 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -61,8 +61,8 @@ ItemHolder2::ItemHolder2() if(bMessage) { bMessage = sal_False; - ::rtl::OString sMsg("CreateInstance with arguments exception: "); - sMsg += ::rtl::OString(rEx.Message.getStr(), + OString sMsg("CreateInstance with arguments exception: "); + sMsg += OString(rEx.Message.getStr(), rEx.Message.getLength(), RTL_TEXTENCODING_ASCII_US); OSL_FAIL(sMsg.getStr()); diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 6b03eb937ad5..2191a9d020cd 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -181,13 +181,13 @@ class SvtMiscOptions_Impl : public ConfigItem { return m_bIsSymbolsSizeRO; } sal_Int16 GetSymbolsStyle() const; - ::rtl::OUString GetSymbolsStyleName() const; + OUString GetSymbolsStyleName() const; sal_Int16 GetCurrentSymbolsStyle() const; inline void SetSymbolsStyle( sal_Int16 nSet ) - { ImplSetSymbolsStyle( true, nSet, ::rtl::OUString() ); } + { ImplSetSymbolsStyle( true, nSet, OUString() ); } - inline void SetSymbolsStyleName( ::rtl::OUString &rName ) + inline void SetSymbolsStyleName( OUString &rName ) { ImplSetSymbolsStyle( false, 0, rName ); } inline sal_Bool IsGetSymbolsStyleReadOnly() @@ -247,7 +247,7 @@ class SvtMiscOptions_Impl : public ConfigItem static Sequence< OUString > GetPropertyNames(); protected: - void ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const ::rtl::OUString &rName ); + void ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const OUString &rName ); }; //***************************************************************************************************************** @@ -356,7 +356,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() case PROPERTYHANDLE_SYMBOLSTYLE : { - ::rtl::OUString aSymbolsStyle; + OUString aSymbolsStyle; if( seqValues[nProperty] >>= aSymbolsStyle ) SetSymbolsStyleName( aSymbolsStyle ); else @@ -411,8 +411,8 @@ SvtMiscOptions_Impl::~SvtMiscOptions_Impl() } } -static int lcl_MapPropertyName( const ::rtl::OUString rCompare, - const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames) +static int lcl_MapPropertyName( const OUString rCompare, + const uno::Sequence< OUString>& aInternalPropertyNames) { for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp) { @@ -424,7 +424,7 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare, void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) { - const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames()); + const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames()); Sequence< Any > seqValues = GetProperties( rPropertyNames ); // Safe impossible cases. @@ -483,7 +483,7 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) } break; case PROPERTYHANDLE_SYMBOLSTYLE : { - ::rtl::OUString aSymbolsStyle; + OUString aSymbolsStyle; if( seqValues[nProperty] >>= aSymbolsStyle ) SetSymbolsStyleName( aSymbolsStyle ); else @@ -550,7 +550,7 @@ sal_Int16 SvtMiscOptions_Impl::GetSymbolsStyle() const return (sal_Int16)Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); } -::rtl::OUString SvtMiscOptions_Impl::GetSymbolsStyleName() const +OUString SvtMiscOptions_Impl::GetSymbolsStyleName() const { return Application::GetSettings().GetStyleSettings().GetSymbolsStyleName(); } @@ -560,7 +560,7 @@ sal_Int16 SvtMiscOptions_Impl::GetCurrentSymbolsStyle() const return (sal_Int16)Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyle(); } -void SvtMiscOptions_Impl::ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const ::rtl::OUString &rName ) +void SvtMiscOptions_Impl::ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const OUString &rName ) { if ( ( bValue && ( nSet != GetSymbolsStyle() ) ) || ( !bValue && ( rName != GetSymbolsStyleName() ) ) ) diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 415c501121fa..9af953964bdb 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -174,7 +174,7 @@ public: //--------------------------------------------------------------------------------------------------------- virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); //--------------------------------------------------------------------------------------------------------- // public interface @@ -684,7 +684,7 @@ void SvtOptionsDrawinglayer_Impl::Commit() PutProperties( aSeqNames, aSeqValues ); } -void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence& ) +void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence& ) { } diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index 3dfbd2998a13..ffae299aafc9 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -105,9 +105,9 @@ public: //------------------------------------------------------------------------------------------------------------- private: - void impl_setValue (const ::rtl::OUString& sProp, + void impl_setValue (const OUString& sProp, ::sal_Bool bNew ); - void impl_setValue (const ::rtl::OUString& sProp, + void impl_setValue (const OUString& sProp, ::sal_Int16 nNew ); //------------------------------------------------------------------------------------------------------------- @@ -135,7 +135,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot) using comphelper::string::getTokenCount; using comphelper::string::getToken; sal_Int32 nTokenCount = getTokenCount(rConfigRoot, '/'); - rtl::OUString sTok = getToken(rConfigRoot, nTokenCount - 1, '/'); + OUString sTok = getToken(rConfigRoot, nTokenCount - 1, '/'); m_xCfg->getByName(sTok) >>= m_xNode; } } @@ -447,7 +447,7 @@ SvtPrintOptions_Impl::~SvtPrintOptions_Impl() m_xCfg.clear(); } -void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp, +void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp, ::sal_Bool bNew ) { try @@ -475,7 +475,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp, } } -void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp, +void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp, ::sal_Int16 nNew ) { try diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx index 5906a03cd4fd..cf0208ea0ac7 100644 --- a/svtools/source/config/slidesorterbaropt.cxx +++ b/svtools/source/config/slidesorterbaropt.cxx @@ -183,8 +183,8 @@ SvtSlideSorterBarOptions_Impl::~SvtSlideSorterBarOptions_Impl() Commit(); } -static int lcl_MapPropertyName( const ::rtl::OUString rCompare, - const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames) +static int lcl_MapPropertyName( const OUString rCompare, + const uno::Sequence< OUString>& aInternalPropertyNames) { for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp) { @@ -196,7 +196,7 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare, void SvtSlideSorterBarOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) { - const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames()); + const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames()); Sequence< Any > seqValues = GetProperties( rPropertyNames ); // Safe impossible cases. diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx index 8f92b94a323b..2e62765b49d1 100644 --- a/svtools/source/config/toolpanelopt.cxx +++ b/svtools/source/config/toolpanelopt.cxx @@ -181,8 +181,8 @@ SvtToolPanelOptions_Impl::~SvtToolPanelOptions_Impl() Commit(); } -static int lcl_MapPropertyName( const ::rtl::OUString rCompare, - const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames) +static int lcl_MapPropertyName( const OUString rCompare, + const uno::Sequence< OUString>& aInternalPropertyNames) { for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp) { @@ -194,7 +194,7 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare, void SvtToolPanelOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) { - const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames()); + const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames()); Sequence< Any > seqValues = GetProperties( rPropertyNames ); // Safe impossible cases. diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index dd4aae281288..7ee9dd96d0c0 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -58,12 +58,12 @@ void ODocumentInfoPreview::Resize() { } void ODocumentInfoPreview::clear() { - m_pEditWin.SetText(rtl::OUString()); + m_pEditWin.SetText(OUString()); } void ODocumentInfoPreview::fill( css::uno::Reference< css::document::XDocumentProperties > const & xDocProps, - rtl::OUString const & rURL) + OUString const & rURL) { assert(xDocProps.is()); @@ -102,15 +102,15 @@ void ODocumentInfoPreview::fill( user->getPropertySetInfo()); css::uno::Sequence< css::beans::Property > props(info->getProperties()); for (sal_Int32 i = 0; i < props.getLength(); ++i) { - rtl::OUString name(props[i].Name); + OUString name(props[i].Name); css::uno::Any aAny(user->getPropertyValue(name)); css::uno::Reference< css::script::XTypeConverter > conv( css::script::Converter::create( comphelper::getProcessComponentContext())); - rtl::OUString value; + OUString value; try { value = conv->convertToSimpleType(aAny, css::uno::TypeClass_STRING). - get< rtl::OUString >(); + get< OUString >(); } catch (css::script::CannotConvertException & e) { SAL_INFO("svtools.contnr", "ignored CannotConvertException " << e.Message); } @@ -124,12 +124,12 @@ void ODocumentInfoPreview::fill( } void ODocumentInfoPreview::insertEntry( - rtl::OUString const & title, rtl::OUString const & value) + OUString const & title, OUString const & value) { if (!m_pEditWin.GetText().isEmpty()) { - m_pEditWin.InsertText(rtl::OUString("\n\n")); + m_pEditWin.InsertText(OUString("\n\n")); } - rtl::OUString caption(title + rtl::OUString(":\n")); + OUString caption(title + OUString(":\n")); m_pEditWin.InsertText(caption); m_pEditWin.SetAttrib( TextAttribFontWeight(WEIGHT_BOLD), m_pEditWin.GetParagraphCount() - 2, @@ -137,7 +137,7 @@ void ODocumentInfoPreview::insertEntry( m_pEditWin.InsertText(value); } -void ODocumentInfoPreview::insertNonempty(long id, rtl::OUString const & value) +void ODocumentInfoPreview::insertNonempty(long id, OUString const & value) { if (!value.isEmpty()) { insertEntry(m_pInfoTable->GetString(id), value); @@ -153,7 +153,7 @@ void ODocumentInfoPreview::insertDateTime( value.Hours, value.Minutes, value.Seconds, value.HundredthSeconds)); if (aToolsDT.IsValidAndGregorian()) { const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); - rtl::OUStringBuffer buf(rLocaleWrapper.getDate(aToolsDT)); + OUStringBuffer buf(rLocaleWrapper.getDate(aToolsDT)); buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); buf.append(rLocaleWrapper.getTime(aToolsDT)); insertEntry(m_pInfoTable->GetString(id), buf.makeStringAndClear()); diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index 16fd91535a54..7e62273bf460 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -74,7 +74,6 @@ namespace svt using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::document::DocumentProperties; - using ::rtl::OUString; using ::ucbhelper::ResultSetInclude; using ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; @@ -93,7 +92,7 @@ namespace svt ,m_pFilter ( NULL ) ,m_pTranslator ( _pTranslator ) ,m_bCancelled ( false ) - ,m_rBlackList ( ::com::sun::star::uno::Sequence< ::rtl::OUString >() ) + ,m_rBlackList ( ::com::sun::star::uno::Sequence< OUString >() ) { } @@ -118,7 +117,7 @@ namespace svt EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync( const FolderDescriptor& _rFolder, const IUrlFilter* _pFilter, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -361,9 +360,9 @@ namespace svt //-------------------------------------------------------------------- - sal_Bool FileViewContentEnumerator::URLOnBlackList ( const ::rtl::OUString& sRealURL ) + sal_Bool FileViewContentEnumerator::URLOnBlackList ( const OUString& sRealURL ) { - ::rtl::OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( '/' ) + 1 ); + OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( '/' ) + 1 ); for (int i = 0; i < m_rBlackList.getLength() ; i++) { diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx index 775f2a661f25..ab4c3442f4b1 100644 --- a/svtools/source/contnr/contentenumeration.hxx +++ b/svtools/source/contnr/contentenumeration.hxx @@ -41,16 +41,16 @@ namespace svt struct SortingData_Impl { private: - ::rtl::OUString maFilename; // only filename in upper case - for compare purposes - ::rtl::OUString maTitle; // -> be carefull when changing maTitle to update maFilename only when new - ::rtl::OUString maLowerTitle; + OUString maFilename; // only filename in upper case - for compare purposes + OUString maTitle; // -> be carefull when changing maTitle to update maFilename only when new + OUString maLowerTitle; public: - ::rtl::OUString maType; - ::rtl::OUString maTargetURL; - ::rtl::OUString maImageURL; - ::rtl::OUString maDisplayText; + OUString maType; + OUString maTargetURL; + OUString maImageURL; + OUString maDisplayText; DateTime maModDate; Image maImage; sal_Int64 maSize; @@ -62,14 +62,14 @@ namespace svt sal_Bool mbIsCompactDisc; inline SortingData_Impl(); - inline const ::rtl::OUString& GetTitle() const; - inline const ::rtl::OUString& GetLowerTitle() const; - inline const ::rtl::OUString& GetFileName() const; - inline void SetNewTitle( const ::rtl::OUString& rNewTitle ); // new maTitle is set -> maFilename is set to same! - inline void ChangeTitle( const ::rtl::OUString& rChangedTitle ); // maTitle is changed, maFilename is unchanged! + inline const OUString& GetTitle() const; + inline const OUString& GetLowerTitle() const; + inline const OUString& GetFileName() const; + inline void SetNewTitle( const OUString& rNewTitle ); // new maTitle is set -> maFilename is set to same! + inline void ChangeTitle( const OUString& rChangedTitle ); // maTitle is changed, maFilename is unchanged! private: - inline void SetTitles( const ::rtl::OUString& rNewTitle ); + inline void SetTitles( const OUString& rNewTitle ); }; inline SortingData_Impl::SortingData_Impl() : @@ -84,33 +84,33 @@ namespace svt { } - inline const ::rtl::OUString& SortingData_Impl::GetTitle() const + inline const OUString& SortingData_Impl::GetTitle() const { return maTitle; } - inline const ::rtl::OUString& SortingData_Impl::GetLowerTitle() const + inline const OUString& SortingData_Impl::GetLowerTitle() const { return maLowerTitle; } - inline const ::rtl::OUString& SortingData_Impl::GetFileName() const + inline const OUString& SortingData_Impl::GetFileName() const { return maFilename; } - inline void SortingData_Impl::SetNewTitle( const ::rtl::OUString& rNewTitle ) + inline void SortingData_Impl::SetNewTitle( const OUString& rNewTitle ) { SetTitles( rNewTitle ); maFilename = rNewTitle.toAsciiUpperCase(); } - inline void SortingData_Impl::ChangeTitle( const ::rtl::OUString& rChangedTitle ) + inline void SortingData_Impl::ChangeTitle( const OUString& rChangedTitle ) { SetTitles( rChangedTitle ); } - inline void SortingData_Impl::SetTitles( const ::rtl::OUString& rNewTitle ) + inline void SortingData_Impl::SetTitles( const OUString& rNewTitle ) { maTitle = rNewTitle; maLowerTitle = rNewTitle.toAsciiLowerCase(); @@ -122,7 +122,7 @@ namespace svt class IContentTitleTranslation { public: - virtual sal_Bool GetTranslation( const ::rtl::OUString& _rOriginalName, ::rtl::OUString& _rTranslatedName ) const = 0; + virtual sal_Bool GetTranslation( const OUString& _rOriginalName, OUString& _rTranslatedName ) const = 0; protected: ~IContentTitleTranslation() {} @@ -202,9 +202,9 @@ namespace svt ::com::sun::star::document::XDocumentProperties> m_xDocProps; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_rBlackList; + ::com::sun::star::uno::Sequence< OUString > m_rBlackList; - sal_Bool URLOnBlackList ( const ::rtl::OUString& sRealURL ); + sal_Bool URLOnBlackList ( const OUString& sRealURL ); public: /** constructs an enumerator instance @@ -243,7 +243,7 @@ namespace svt EnumerationResult enumerateFolderContentSync( const FolderDescriptor& _rFolder, const IUrlFilter* _pFilter, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >() + const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() ); /** cancels the running operation. @@ -263,7 +263,7 @@ namespace svt virtual void execute(); private: - sal_Bool implGetDocTitle( const ::rtl::OUString& _rTargetURL, ::rtl::OUString& _rRet ) const; + sal_Bool implGetDocTitle( const OUString& _rTargetURL, OUString& _rRet ) const; }; //........................................................................ diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 8213006459ea..827e9865ab44 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -82,7 +82,6 @@ using namespace ::com::sun::star::beans; using namespace ::comphelper; using ::svt::SortingData_Impl; using ::svt::FolderDescriptor; -using ::rtl::OUString; #define ALL_FILES_FILTER "*.*" @@ -190,7 +189,7 @@ private: protected: virtual sal_Bool DoubleClickHdl(); - virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const; public: ViewTabListBox_Impl( Window* pParentWin, SvtFileView_Impl* pParent, sal_Int16 nFlags ); @@ -198,7 +197,7 @@ public: virtual void Resize(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); void ClearAll(); HeaderBar* GetHeaderBar() const { return mpHeaderBar; } @@ -288,8 +287,8 @@ class NameTranslationEntry : public HashedEntry protected: OUString maTranslatedName; public: - inline NameTranslationEntry( const rtl::OUString& rOriginalName, const rtl::OUString& rTranslatedName ); - inline NameTranslationEntry( const rtl::OString& rOriginalName, const rtl::OString& rTranslatedName ); + inline NameTranslationEntry( const OUString& rOriginalName, const OUString& rTranslatedName ); + inline NameTranslationEntry( const OString& rOriginalName, const OString& rTranslatedName ); inline const OUString& GetTranslation() const; }; @@ -300,9 +299,9 @@ inline NameTranslationEntry::NameTranslationEntry( const OUString& rOrg, const O { } -inline NameTranslationEntry::NameTranslationEntry( const rtl::OString& rOrg, const rtl::OString& rTrans ) - : HashedEntry(rtl::OStringToOUString(rOrg, RTL_TEXTENCODING_ASCII_US)) - , maTranslatedName(rtl::OStringToOUString(rTrans, RTL_TEXTENCODING_UTF8)) +inline NameTranslationEntry::NameTranslationEntry( const OString& rOrg, const OString& rTrans ) + : HashedEntry(OStringToOUString(rOrg, RTL_TEXTENCODING_ASCII_US)) + , maTranslatedName(OStringToOUString(rTrans, RTL_TEXTENCODING_UTF8)) { } @@ -365,7 +364,7 @@ void NameTranslationList::Init() String aFsysName( maTransFile.getFSysPath( INetURLObject::FSYS_DETECT ) ); Config aConfig( aFsysName ); - aConfig.SetGroup( rtl::OString(RTL_CONSTASCII_STRINGPARAM("TRANSLATIONNAMES")) ); + aConfig.SetGroup( OString(RTL_CONSTASCII_STRINGPARAM("TRANSLATIONNAMES")) ); sal_uInt16 nKeyCnt = aConfig.GetKeyCount(); @@ -379,7 +378,7 @@ void NameTranslationList::Init() NameTranslationList::NameTranslationList( const INetURLObject& rBaseURL ): maTransFile( rBaseURL ), maHashedURL( rBaseURL ), - maTransFileName( rtl::OUString(".nametranslation.table") ) + maTransFileName( OUString(".nametranslation.table") ) { maTransFile.insertName( maTransFileName ); Init(); @@ -489,12 +488,12 @@ public: FileViewResult GetFolderContent_Impl( const String& rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >() ); + const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() ); FileViewResult GetFolderContent_Impl( const FolderDescriptor& _rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >()); + const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >()); void FilterFolderContent_Impl( const OUString &rFilter ); void CancelRunningAsyncAction(); @@ -594,7 +593,7 @@ OUString CreateExactSizeText( sal_Int64 nSize ) long nMega = 1024 * 1024; long nGiga = nMega * 1024; - rtl::OUString aUnitStr(' '); + OUString aUnitStr(' '); if ( nSize < 10000 ) { @@ -906,7 +905,7 @@ void ViewTabListBox_Impl::DeleteEntries() SvTreeListEntry* pEntry = FirstSelected(); String aURL; - rtl::OString sDialogPosition; + OString sDialogPosition; while ( pEntry && ( eResult != svtools::QUERYDELETE_CANCEL ) ) { SvTreeListEntry *pCurEntry = pEntry; @@ -971,7 +970,7 @@ void ViewTabListBox_Impl::DeleteEntries() // ----------------------------------------------------------------------- sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry, - const rtl::OUString& rNewText ) + const OUString& rNewText ) { sal_Bool bRet = sal_False; @@ -1082,9 +1081,9 @@ sal_Bool ViewTabListBox_Impl::DoubleClickHdl() // who knows ...) } -::rtl::OUString ViewTabListBox_Impl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const +OUString ViewTabListBox_Impl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const { - ::rtl::OUString sRet = SvHeaderTabListBox::GetAccessibleObjectDescription( _eType, _nPos ); + OUString sRet = SvHeaderTabListBox::GetAccessibleObjectDescription( _eType, _nPos ); if ( ::svt::BBTYPE_TABLECELL == _eType ) { sal_Int32 nRow = -1; @@ -1102,7 +1101,7 @@ sal_Bool ViewTabListBox_Impl::DoubleClickHdl() String aText( msAccessibleDescText ); aText.SearchAndReplace( sVar1, pData->mbIsFolder ? msFolder : msFile ); aText.SearchAndReplace( sVar2, pData->maURL ); - sRet += ::rtl::OUString( aText ); + sRet += OUString( aText ); } } } @@ -1268,14 +1267,14 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const // ----------------------------------------------------------------------- -const rtl::OString& SvtFileView::GetHelpId( ) const +const OString& SvtFileView::GetHelpId( ) const { return mpImp->mpView->GetHelpId( ); } // ----------------------------------------------------------------------- -void SvtFileView::SetHelpId( const rtl::OString& rHelpId ) +void SvtFileView::SetHelpId( const OString& rHelpId ) { mpImp->mpView->SetHelpId( rHelpId ); } @@ -1323,7 +1322,7 @@ FileViewResult SvtFileView::Initialize( const String& rURL, const String& rFilter, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { WaitObject aWaitCursor( this ); mpBlackList = rBlackList; @@ -1355,7 +1354,7 @@ FileViewResult SvtFileView::Initialize( const String& rFilter, const FileViewAsyncAction* pAsyncDescriptor ) { - return Initialize( rURL, rFilter, pAsyncDescriptor, ::com::sun::star::uno::Sequence< ::rtl::OUString >()); + return Initialize( rURL, rFilter, pAsyncDescriptor, ::com::sun::star::uno::Sequence< OUString >()); } // ----------------------------------------------------------------------- @@ -1716,7 +1715,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand ,mxCmdEnv ( xEnv ) { - maAllFilter = rtl::OUString("*.*"); + maAllFilter = OUString("*.*"); mpView = new ViewTabListBox_Impl( mpAntiImpl, this, nFlags ); mpView->EnableCellFocus(); } @@ -1752,7 +1751,7 @@ void SvtFileView_Impl::Clear() FileViewResult SvtFileView_Impl::GetFolderContent_Impl( const String& rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { ::osl::ClearableMutexGuard aGuard( maMutex ); INetURLObject aFolderObj( rFolder ); @@ -1771,7 +1770,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl( FileViewResult SvtFileView_Impl::GetFolderContent_Impl( const FolderDescriptor& _rFolder, const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { DBG_TESTSOLARMUTEX(); ::osl::ClearableMutexGuard aGuard( maMutex ); diff --git a/svtools/source/contnr/fileview.hxx b/svtools/source/contnr/fileview.hxx index d24d57b68422..9a2fb34ace80 100644 --- a/svtools/source/contnr/fileview.hxx +++ b/svtools/source/contnr/fileview.hxx @@ -23,10 +23,9 @@ #include "sal/config.h" #include "sal/types.h" +#include -namespace rtl { class OUString; } - -rtl::OUString CreateExactSizeText(sal_Int64 nSize); +OUString CreateExactSizeText(sal_Int64 nSize); #endif diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index f49647144a20..86292294f3f7 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -95,7 +95,7 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, con return pEntry; } -sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const rtl::OUString&, sal_Bool ) +sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const OUString&, sal_Bool ) { return sal_True; } diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 1c37d6de2943..3e10acb130b8 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -1045,7 +1045,7 @@ void SvImpLBox::DrawNet() Rectangle aCtrlRegion( aTemp, Size( 0, 0 ) ); ControlState nState = CTRL_STATE_ENABLED; if( pView->DrawNativeControl( CTRL_LISTNET, PART_ENTIRE_CONTROL, - aCtrlRegion, nState, aControlValue, rtl::OUString() ) ) + aCtrlRegion, nState, aControlValue, OUString() ) ) { return; } diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index d64735e77f02..bc349048c75e 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -189,7 +189,7 @@ sal_Bool SvLBoxButtonData::IsRadio() { DBG_NAME(SvLBoxString); -SvLBoxString::SvLBoxString(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const rtl::OUString& rStr) +SvLBoxString::SvLBoxString(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr) : SvLBoxItem(pEntry, nFlags) { DBG_CTOR(SvLBoxString,0); @@ -390,7 +390,7 @@ void SvLBoxButton::Paint( aControlValue.setTristateVal( BUTTONVALUE_MIXED ); bNativeOK = rDev.DrawNativeControl( eCtrlType, PART_ENTIRE_CONTROL, - aCtrlRegion, nState, aControlValue, rtl::OUString() ); + aCtrlRegion, nState, aControlValue, OUString() ); } if( !bNativeOK) @@ -425,7 +425,7 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo aCtrlRegion, nState, aControlValue, - rtl::OUString(), + OUString(), aNativeBounds, aNativeContent ); if( bNativeOK ) diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index c433ef97a78a..3774a450f9bf 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -84,7 +84,7 @@ void SvTabListBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ ) { if( pCurToken && nCurTokenLen ) - aToken = rtl::OUString(pCurToken, nCurTokenLen); + aToken = OUString(pCurToken, nCurTokenLen); else aToken.Erase(); SvLBoxString* pStr = new SvLBoxString( pEntry, 0, aToken ); @@ -331,7 +331,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvTreeListEntry* pEntry, if( nCol == 0xffff ) { if( pCurToken ) - aTemp = rtl::OUString(pCurToken, nCurTokenLen); + aTemp = OUString(pCurToken, nCurTokenLen); else aTemp.Erase(); // delete all columns without a token ((SvLBoxString*)pStr)->SetText( aTemp ); @@ -342,7 +342,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvTreeListEntry* pEntry, { if( !nCol ) { - aTemp = rtl::OUString(pCurToken, nCurTokenLen); + aTemp = OUString(pCurToken, nCurTokenLen); ((SvLBoxString*)pStr)->SetText( aTemp ); if( !pNextToken ) break; @@ -796,14 +796,14 @@ sal_uInt16 SvHeaderTabListBox::GetCurrColumn() const return nPos; } // ----------------------------------------------------------------------- -::rtl::OUString SvHeaderTabListBox::GetRowDescription( sal_Int32 _nRow ) const +OUString SvHeaderTabListBox::GetRowDescription( sal_Int32 _nRow ) const { - return ::rtl::OUString( GetEntryText( _nRow ) ); + return OUString( GetEntryText( _nRow ) ); } // ----------------------------------------------------------------------- -::rtl::OUString SvHeaderTabListBox::GetColumnDescription( sal_uInt16 _nColumn ) const +OUString SvHeaderTabListBox::GetColumnDescription( sal_uInt16 _nColumn ) const { - return ::rtl::OUString( m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) ) ); + return OUString( m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) ) ); } // ----------------------------------------------------------------------- sal_Bool SvHeaderTabListBox::HasRowHeader() const @@ -891,7 +891,7 @@ sal_Bool SvHeaderTabListBox::IsCellVisible( sal_Int32, sal_uInt16 ) const // ----------------------------------------------------------------------- String SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const { - return ::rtl::OUString( GetTabEntryText( _nRow, _nColumnPos ) ); + return OUString( GetTabEntryText( _nRow, _nColumnPos ) ); } // ----------------------------------------------------------------------- Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen ) @@ -1050,16 +1050,16 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin return sal_False; } // ----------------------------------------------------------------------- -::rtl::OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const +OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const { - ::rtl::OUString aRetText; + OUString aRetText; switch( _eType ) { case ::svt::BBTYPE_BROWSEBOX: case ::svt::BBTYPE_TABLE: case ::svt::BBTYPE_COLUMNHEADERBAR: // should be empty now (see #i63983) - aRetText = ::rtl::OUString(); + aRetText = OUString(); break; case ::svt::BBTYPE_TABLECELL: @@ -1089,7 +1089,7 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin case ::svt::BBTYPE_ROWHEADERBAR: case ::svt::BBTYPE_ROWHEADERCELL: - aRetText = ::rtl::OUString( "error" ); + aRetText = OUString( "error" ); break; default: @@ -1098,9 +1098,9 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin return aRetText; } // ----------------------------------------------------------------------- -::rtl::OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const +OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const { - ::rtl::OUString aRetText; + OUString aRetText; if( _eType == ::svt::BBTYPE_TABLECELL && _nPos != -1 ) { diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 2c27933710d8..793485cbf84f 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -117,7 +117,7 @@ struct FolderHistory m_sURL( _rURL ), m_nGroup( _nGroup ) {} }; -typedef ::std::vector< ::rtl::OUString* > NewDocList_Impl; +typedef ::std::vector< OUString* > NewDocList_Impl; // class SvtDummyHeaderBar_Impl ------------------------------------------ @@ -427,10 +427,10 @@ SvtFileViewWindow_Impl::~SvtFileViewWindow_Impl() void GetMenuEntry_Impl ( Sequence< PropertyValue >& aDynamicMenuEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL, - ::rtl::OUString& rFrame, - ::rtl::OUString& rImageId + OUString& rTitle, + OUString& rURL, + OUString& rFrame, + OUString& rImageId ) { for ( int i = 0; i < aDynamicMenuEntry.getLength(); i++ ) @@ -446,20 +446,20 @@ void GetMenuEntry_Impl } } -Sequence< ::rtl::OUString > SvtFileViewWindow_Impl::GetNewDocContents() const +Sequence< OUString > SvtFileViewWindow_Impl::GetNewDocContents() const { NewDocList_Impl aNewDocs; Sequence< Sequence< PropertyValue > > aDynamicMenuEntries; aDynamicMenuEntries = SvtDynamicMenuOptions().GetMenu( E_NEWMENU ); - ::rtl::OUString aTitle; - ::rtl::OUString aURL; - ::rtl::OUString aImageURL; - ::rtl::OUString aTargetFrame; + OUString aTitle; + OUString aURL; + OUString aImageURL; + OUString aTargetFrame; sal_uInt32 i, nCount = aDynamicMenuEntries.getLength(); - ::rtl::OUString sSeparator( "private:separator" ); - ::rtl::OUString sSlotURL( "slot:5500" ); + OUString sSeparator( "private:separator" ); + OUString sSlotURL( "slot:5500" ); for ( i = 0; i < nCount; ++i ) { @@ -469,7 +469,7 @@ Sequence< ::rtl::OUString > SvtFileViewWindow_Impl::GetNewDocContents() const if( aURL == sSeparator ) { String aSeparator( aSeparatorStr ); - ::rtl::OUString* pSeparator = new ::rtl::OUString( aSeparator ); + OUString* pSeparator = new OUString( aSeparator ); aNewDocs.push_back( pSeparator ); } else @@ -495,17 +495,17 @@ Sequence< ::rtl::OUString > SvtFileViewWindow_Impl::GetNewDocContents() const aRow += String( aImageURL ); } - ::rtl::OUString* pRow = new ::rtl::OUString( aRow ); + OUString* pRow = new OUString( aRow ); aNewDocs.push_back( pRow ); } } nCount = aNewDocs.size(); - Sequence < ::rtl::OUString > aRet( nCount ); - ::rtl::OUString* pRet = aRet.getArray(); + Sequence < OUString > aRet( nCount ); + OUString* pRet = aRet.getArray(); for ( i = 0; i < nCount; ++i ) { - ::rtl::OUString* pNewDoc = aNewDocs[i]; + OUString* pNewDoc = aNewDocs[i]; pRet[i] = *( pNewDoc ); delete pNewDoc; } @@ -563,7 +563,7 @@ sal_Bool SvtFileViewWindow_Impl::HasPreviousLevel( String& rURL ) const String SvtFileViewWindow_Impl::GetFolderTitle() const { - rtl::OUString aTitle; + OUString aTitle; ::utl::UCBContentHelper::GetTitle( aFolderURL, &aTitle ); return aTitle; } @@ -583,14 +583,14 @@ SvtDocInfoTable_Impl::SvtDocInfoTable_Impl() : } // ----------------------------------------------------------------------- -rtl::OUString SvtDocInfoTable_Impl::GetString( long nId ) const +OUString SvtDocInfoTable_Impl::GetString( long nId ) const { sal_uInt32 nPos( FindIndex( nId ) ); if ( RESARRAY_INDEX_NOTFOUND != nPos ) return ResStringArray::GetString( nPos ); - return rtl::OUString(); + return OUString(); } // class SvtFrameWindow_Impl --------------------------------------------- @@ -663,7 +663,7 @@ void SvtFrameWindow_Impl::ShowDocInfo( const String& rURL ) uno::Reference < task::XInteractionHandler2 > xInteractionHandler( task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); uno::Sequence < beans::PropertyValue> aProps(1); - aProps[0].Name = ::rtl::OUString( "InteractionHandler" ); + aProps[0].Name = OUString( "InteractionHandler" ); aProps[0].Value <<= xInteractionHandler; m_xDocProps->loadFromMedium( rURL, aProps ); pEditWin->fill( m_xDocProps, rURL ); @@ -745,14 +745,14 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B uno::Reference < task::XInteractionHandler2 > xInteractionHandler( task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); - aArgs[3].Name = ::rtl::OUString( "InteractionHandler" ); + aArgs[3].Name = OUString( "InteractionHandler" ); aArgs[3].Value <<= xInteractionHandler; b = sal_False; aArgs[2].Value.setValue( &b, ::getBooleanCppuType() ); xDisp->dispatch( aURL, aArgs ); - ::rtl::OUString aDispURL; + OUString aDispURL; Reference< ::com::sun::star::frame::XController > xCtrl = xFrame->getController(); if( xCtrl.is() ) { @@ -765,7 +765,7 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B { xFrame->setComponent( Reference < com::sun::star::awt::XWindow >(), Reference < XController >() ); ViewEmptyWin(); - m_aOpenURL = rtl::OUString(); + m_aOpenURL = OUString(); } else m_aOpenURL = aDispURL; @@ -778,13 +778,13 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B aArgs[0].Name = "AsTemplate"; aArgs[0].Value <<= bAsTemplate; xDisp->dispatch( aURL, aArgs ); - m_aOpenURL = rtl::OUString(); + m_aOpenURL = OUString(); } else { Sequence < PropertyValue > aArgs; xDisp->dispatch( aURL, aArgs ); - m_aOpenURL = rtl::OUString(); + m_aOpenURL = OUString(); } } } @@ -1309,7 +1309,7 @@ void SvtTemplateWindow::ReadViewSettings() sal_Int32 nSelectedGroup = ICON_POS_TEMPLATES; sal_Int32 nSelectedView = TI_DOCTEMPLATE_DOCINFO; double nSplitRatio = 0.5; - ::rtl::OUString sLastFolder; + OUString sLastFolder; SvtViewOptions aViewSettings( E_DIALOG, VIEWSETTING_NEWFROMTEMPLATE ); if ( aViewSettings.Exists() ) @@ -1380,7 +1380,7 @@ void SvtTemplateWindow::WriteViewSettings() // last folder aSettings[3].Name = VIEWSETTING_LASTFOLDER; - aSettings[3].Value <<= ::rtl::OUString( pFileWin->GetFolderURL() ); + aSettings[3].Value <<= OUString( pFileWin->GetFolderURL() ); // write SvtViewOptions aViewSettings( E_DIALOG, VIEWSETTING_NEWFROMTEMPLATE ); @@ -1532,10 +1532,10 @@ sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const { sal_Bool bEnable = sal_False; - ::rtl::OUString aFolderURL = pImpl->pWin->GetFolderURL(); + OUString aFolderURL = pImpl->pWin->GetFolderURL(); if ( pImpl->pWin->IsFileSelected() && !aFolderURL.isEmpty() ) { - ::rtl::OUString aFileTargetURL = pImpl->pWin->GetSelectedFile(); + OUString aFileTargetURL = pImpl->pWin->GetSelectedFile(); bEnable = !aFileTargetURL.isEmpty(); } @@ -1627,7 +1627,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog , OrganizerHdl_Impl) Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY ); Reference < XDispatch > xDisp; - xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDisp = xProv->queryDispatch( aTargetURL, OUString(), 0 ); if ( xDisp.is() ) { @@ -1649,9 +1649,9 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog, PackageHdl_Impl) { using namespace org::freedesktop::PackageKit; Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext()), UNO_QUERY); - Sequence< ::rtl::OUString > vPackages(1); + Sequence< OUString > vPackages(1); vPackages[0] = "libreoffice-templates"; - ::rtl::OUString sInteraction(""); + OUString sInteraction(""); xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction); } catch (Exception & e) @@ -1702,7 +1702,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource ) IMPL_LINK_NOARG(SvtDocumentTemplateDialog, OpenLinkHdl_Impl) { - ::rtl::OUString sURL( aMoreTemplatesLink.GetURL() ); + OUString sURL( aMoreTemplatesLink.GetURL() ); if ( !sURL.isEmpty() ) { localizeWebserviceURI(sURL); @@ -1713,13 +1713,13 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog, OpenLinkHdl_Impl) uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShell( com::sun::star::system::SystemShellExecute::create(xContext) ); if ( xSystemShell.is() ) - xSystemShell->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + xSystemShell->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); EndDialog( RET_CANCEL ); } catch( const uno::Exception& e ) { OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); } } return 0; diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index b0807e79c34b..6de3ba541d1d 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -127,7 +127,7 @@ private: sal_Bool bIsTemplateFolder; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > GetNewDocContents() const; public: @@ -161,7 +161,7 @@ class SvtDocInfoTable_Impl : public ResStringArray public: SvtDocInfoTable_Impl(); - rtl::OUString GetString( long nId ) const; + OUString GetString( long nId ) const; }; class SvtFrameWindow_Impl : public Window @@ -181,7 +181,7 @@ private: ::com::sun::star::lang::Locale aLocale; SvtDocInfoTable_Impl aInfoTable; String aCurrentURL; - ::rtl::OUString m_aOpenURL; + OUString m_aOpenURL; sal_Bool bDocInfo; void ShowDocInfo( const String& rURL ); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index c39051814e5d..f19018246040 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -2154,7 +2154,7 @@ sal_Bool SvTreeListBox::EditingEntry( SvTreeListEntry*, Selection& ) return sal_True; } -sal_Bool SvTreeListBox::EditedEntry( SvTreeListEntry* /*pEntry*/,const rtl::OUString& /*rNewText*/) +sal_Bool SvTreeListBox::EditedEntry( SvTreeListEntry* /*pEntry*/,const OUString& /*rNewText*/) { DBG_CHKTHIS(SvTreeListBox,0); return sal_True; @@ -2206,7 +2206,7 @@ void SvTreeListBox::RequestingChildren( SvTreeListEntry* pParent ) { DBG_CHKTHIS(SvTreeListBox,0); if( !pParent->HasChildren() ) - InsertEntry( rtl::OUString(""), pParent, sal_False, LIST_APPEND ); + InsertEntry( OUString(""), pParent, sal_False, LIST_APPEND ); } void SvTreeListBox::GetFocus() @@ -2319,7 +2319,7 @@ short SvTreeListBox::GetHeightOffset(const Font& /* rFont */, Size& aSizeLogic ) { DBG_CHKTHIS(SvTreeListBox,0); short nOffset = 0; - aSizeLogic = Size(GetTextWidth(rtl::OUString('X')), GetTextHeight()); + aSizeLogic = Size(GetTextWidth(OUString('X')), GetTextHeight()); if( GetEntryHeight() > aSizeLogic.Height() ) nOffset = ( GetEntryHeight() - (short)aSizeLogic.Height()) / 2; return nOffset; @@ -3190,7 +3190,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT } bNativeOK = DrawNativeControl( CTRL_LISTNODE, PART_ENTIRE_CONTROL, - aCtrlRegion, nState, aControlValue, rtl::OUString() ); + aCtrlRegion, nState, aControlValue, OUString() ); } if( !bNativeOK) { diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index d0601b5d514f..8ef2de24ef0c 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -191,7 +191,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) mbAllSel = sal_False; mbDropPos = sal_False; - ::rtl::OUString aGregorian( "gregorian"); + OUString aGregorian( "gregorian"); maCalendarWrapper.loadCalendar( aGregorian, Application::GetAppLocaleDataWrapper().getLanguageTag().getLocale()); if (maCalendarWrapper.getUniqueID() != aGregorian) @@ -329,7 +329,7 @@ void Calendar::ImplFormat() if ( (aOutSize.Width() <= 1) || (aOutSize.Height() <= 1) ) return; - rtl::OUString a99Text("99"); + OUString a99Text("99"); Font aOldFont = GetFont(); @@ -958,7 +958,7 @@ void Calendar::ImplDraw( sal_Bool bPaint ) for ( sal_uInt16 nWeekCount = 0; nWeekCount < 6; nWeekCount++ ) { sal_Int32 nWeek = maCalendarWrapper.getValue( i18n::CalendarFieldIndex::WEEK_OF_YEAR); - rtl::OUString aWeekText(rtl::OUString::valueOf(nWeek)); + OUString aWeekText(OUString::valueOf(nWeek)); long nOffX = (mnWeekWidth-WEEKNUMBER_OFFX)-GetTextWidth( aWeekText ); long nOffY = (mnDayHeight-GetTextHeight())/2; DrawText( Point( nDayX+nOffX, nDayY+nOffY ), aWeekText ); @@ -2146,7 +2146,7 @@ void Calendar::EndSelection() Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine, long nCalcLines ) const { - rtl::OUString a99Text("99"); + OUString a99Text("99"); Font aOldFont = GetFont(); // Wochenanzeige beruecksichtigen diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index 91e7d2c3f2e9..cc2d73062955 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -32,17 +32,17 @@ class CollatorResourceData { friend class CollatorResource; private: /* data */ - rtl::OUString ma_Name; - rtl::OUString ma_Translation; + OUString ma_Name; + OUString ma_Translation; private: /* member functions */ CollatorResourceData () {} public: - CollatorResourceData ( const rtl::OUString &r_Algorithm, const rtl::OUString &r_Translation) + CollatorResourceData ( const OUString &r_Algorithm, const OUString &r_Translation) : ma_Name (r_Algorithm), ma_Translation (r_Translation) {} - const rtl::OUString& GetAlgorithm () const { return ma_Name; } + const OUString& GetAlgorithm () const { return ma_Name; } - const rtl::OUString& GetTranslation () const { return ma_Translation; } + const OUString& GetTranslation () const { return ma_Translation; } ~CollatorResourceData () {} @@ -87,11 +87,11 @@ CollatorResource::~CollatorResource() delete[] mp_Data; } -const rtl::OUString& -CollatorResource::GetTranslation(const rtl::OUString &r_Algorithm) +const OUString& +CollatorResource::GetTranslation(const OUString &r_Algorithm) { sal_Int32 nIndex = r_Algorithm.indexOf('.'); - rtl::OUString aLocaleFreeAlgorithm; + OUString aLocaleFreeAlgorithm; if (nIndex == -1) { diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 53b8bd14fcb8..a51f14eb5d29 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -82,7 +82,7 @@ public: void ColorListBox::ImplInit() { pColorList = new ImpColorList(); - aImageSize.Width() = GetTextWidth( rtl::OUString("xxx") ); + aImageSize.Width() = GetTextWidth( OUString("xxx") ); aImageSize.Height() = GetTextHeight(); aImageSize.Height() -= 2; @@ -120,7 +120,7 @@ namespace bool extractDropdown(VclBuilder::stringmap &rMap) { bool bDropdown = true; - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("dropdown"))); + VclBuilder::stringmap::iterator aFind = rMap.find(OString(RTL_CONSTASCII_STRINGPARAM("dropdown"))); if (aFind != rMap.end()) { bDropdown = toBool(aFind->second); @@ -746,7 +746,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance, void LineListBox::ImplInit() { - aTxtSize.Width() = GetTextWidth( rtl::OUString( " " ) ); + aTxtSize.Width() = GetTextWidth( OUString( " " ) ); aTxtSize.Height() = GetTextHeight(); pLineList = new ImpLineList(); eUnit = FUNIT_POINT; @@ -974,7 +974,7 @@ void LineListBox::UpdateEntries( long nOldWidth ) GetColorLine2( GetEntryCount( ) ), GetColorDist( GetEntryCount( ) ), pData->GetStyle(), aBmp ); - ListBox::InsertEntry( rtl::OUString( " " ), aBmp, LISTBOX_APPEND ); + ListBox::InsertEntry( OUString( " " ), aBmp, LISTBOX_APPEND ); if ( n == nTypePos ) SelectEntryPos( GetEntryCount() - 1 ); } @@ -1072,7 +1072,7 @@ FontNameBox::~FontNameBox() void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep ) const { - rtl::OString aEntries(rtl::OUStringToOString(GetMRUEntries(cSep), + OString aEntries(OUStringToOString(GetMRUEntries(cSep), RTL_TEXTENCODING_UTF8)); if (aEntries.isEmpty() || !aFontMRUEntriesFile.Len()) @@ -1083,14 +1083,14 @@ void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode if( ! (aStream.IsOpen() && aStream.IsWritable()) ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "FontNameBox::SaveMRUEntries: opening mru entries file %s failed\n", rtl::OUStringToOString(aFontMRUEntriesFile, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( stderr, "FontNameBox::SaveMRUEntries: opening mru entries file %s failed\n", OUStringToOString(aFontMRUEntriesFile, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif return; } aStream.SetLineDelimiter( LINEEND_LF ); aStream.WriteLine( aEntries ); - aStream.WriteLine( rtl::OString() ); + aStream.WriteLine( OString() ); } // ------------------------------------------------------------------- @@ -1104,14 +1104,14 @@ void FontNameBox::LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode if( ! aStream.IsOpen() ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "FontNameBox::LoadMRUEntries: opening mru entries file %s failed\n", rtl::OUStringToOString(aFontMRUEntriesFile, RTL_TEXTENCODING_UTF8).getStr() ); + fprintf( stderr, "FontNameBox::LoadMRUEntries: opening mru entries file %s failed\n", OUStringToOString(aFontMRUEntriesFile, RTL_TEXTENCODING_UTF8).getStr() ); #endif return; } - rtl::OString aLine; + OString aLine; aStream.ReadLine( aLine ); - rtl::OUString aEntries = rtl::OStringToOUString(aLine, + OUString aEntries = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8); SetMRUEntries( aEntries, cSep ); } @@ -1120,7 +1120,7 @@ void FontNameBox::LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode void FontNameBox::InitFontMRUEntriesFile() { - rtl::OUString sUserConfigDir("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"); + OUString sUserConfigDir("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"); rtl::Bootstrap::expandMacros(sUserConfigDir); maFontMRUEntriesFile = sUserConfigDir; @@ -1208,7 +1208,7 @@ void FontNameBox::ImplCalcUserItemSize() namespace { - long shrinkFontToFit(rtl::OUString &rSampleText, long nH, Font &rFont, OutputDevice &rDevice, Rectangle &rTextRect) + long shrinkFontToFit(OUString &rSampleText, long nH, Font &rFont, OutputDevice &rDevice, Rectangle &rTextRect) { long nWidth = 0; @@ -1264,7 +1264,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) Rectangle aTextRect; // Preview the font name - rtl::OUString sFontName = rInfo.GetName(); + OUString sFontName = rInfo.GetName(); //If it shouldn't or can't draw its own name because it doesn't have the glyphs if (!canRenderNameOfSelectedFont(*rUDEvt.GetDevice())) @@ -1291,7 +1291,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) if (!bUsingCorrectFont) rUDEvt.GetDevice()->SetFont( aFont ); - rtl::OUString sSampleText; + OUString sSampleText; if (!bSymbolFont) { @@ -1343,7 +1343,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) for (size_t i = 0; i < SAL_N_ELEMENTS(aScripts); ++i) { - rtl::OUString sText = makeShortRepresentativeTextForScript(aScripts[i]); + OUString sText = makeShortRepresentativeTextForScript(aScripts[i]); if (!sText.isEmpty()) { bool bHasSampleTextGlyphs = (STRING_LEN == rUDEvt.GetDevice()->HasGlyphs(aFont, sText)); @@ -1363,7 +1363,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) for (size_t i = 0; i < SAL_N_ELEMENTS(aMinimalScripts); ++i) { - rtl::OUString sText = makeShortMinimalTextForScript(aMinimalScripts[i]); + OUString sText = makeShortMinimalTextForScript(aMinimalScripts[i]); if (!sText.isEmpty()) { bool bHasSampleTextGlyphs = (STRING_LEN == rUDEvt.GetDevice()->HasGlyphs(aFont, sText)); @@ -1913,7 +1913,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText(rtl::OUString('%')); + SetCustomUnitText(OUString('%')); SetUnit( FUNIT_CUSTOM ); Clear(); diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index fe1201c6495a..e225bc3c50e2 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -584,7 +584,7 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const namespace { - FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const rtl::OUString &rName, + FontInfo makeMissing(ImplFontListFontInfo* pFontNameInfo, const OUString &rName, FontWeight eWeight, FontItalic eItalic) { FontInfo aInfo; @@ -592,7 +592,7 @@ namespace if (pFontNameInfo) { aInfo = *pFontNameInfo; - aInfo.SetStyleName(rtl::OUString()); + aInfo.SetStyleName(OUString()); } aInfo.SetWeight(eWeight); @@ -600,7 +600,7 @@ namespace //If this is a known but uninstalled symbol font which we can remap to //OpenSymbol then toggle its charset to be a symbol font - if (ConvertChar::GetRecodeData(rName, rtl::OUString("OpenSymbol"))) + if (ConvertChar::GetRecodeData(rName, OUString("OpenSymbol"))) aInfo.SetCharSet(RTL_TEXTENCODING_SYMBOL); return aInfo; @@ -891,7 +891,7 @@ long FontSizeNames::Name2Size( const String& rName ) const { if ( mnElem ) { - rtl::OString aName(rtl::OUStringToOString(rName, + OString aName(OUStringToOString(rName, RTL_TEXTENCODING_UTF8)); // linear search is sufficient for this rare case diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 1365975a15bb..f605f8a8ab59 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -157,7 +157,7 @@ void FileControl::Resize() } else { - rtl::OUString aSmallText( "..." ); + OUString aSmallText( "..." ); maButton.SetText( aSmallText ); nButtonTextWidth = maButton.GetTextWidth( aSmallText ); } diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx index bf69f32cc55b..0dcb13a6bcea 100644 --- a/svtools/source/control/filectrl2.cxx +++ b/svtools/source/control/filectrl2.cxx @@ -40,13 +40,13 @@ void FileControl::ImplBrowseFile( ) Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); Reference < dialogs::XFilePicker3 > xFilePicker = dialogs::FilePicker::createWithMode( xContext, dialogs::TemplateDescription::FILEOPEN_SIMPLE ); // transform the system notation text into a file URL - ::rtl::OUString sSystemNotation = GetText(), sFileURL; + OUString sSystemNotation = GetText(), sFileURL; oslFileError nError = osl_getFileURLFromSystemPath( sSystemNotation.pData, &sFileURL.pData ); if ( nError == osl_File_E_INVAL ) sFileURL = GetText(); // #97709# Maybe URL is already a file URL... //#90430# Check if URL is really a file URL - ::rtl::OUString aTmp; + OUString aTmp; if ( osl_getSystemPathFromFileURL( sFileURL.pData, &aTmp.pData ) == osl_File_E_None ) { // initially set this directory @@ -55,7 +55,7 @@ void FileControl::ImplBrowseFile( ) if ( xFilePicker->execute() ) { - Sequence < rtl::OUString > aPathSeq = xFilePicker->getFiles(); + Sequence < OUString > aPathSeq = xFilePicker->getFiles(); if ( aPathSeq.getLength() ) { diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index f3931bbad7ea..53ccc338e2a7 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -1262,7 +1262,7 @@ void DoubleCurrencyField::UpdateCurrencyFormat() { sNewFormat.append(aLocaleInfo.getNumDecimalSep()); - rtl::OUStringBuffer sTemp; + OUStringBuffer sTemp; comphelper::string::padToLength(sTemp, nDigits, '0'); sNewFormat.append(sTemp); } diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 82dad150d8c1..6e7f88e4b8b3 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -36,7 +36,7 @@ public: sal_uInt16 mnId; HeaderBarItemBits mnBits; long mnSize; - rtl::OString maHelpId; + OString maHelpId; Image maImage; XubString maOutText; XubString maText; @@ -347,7 +347,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, aCtrlRegion=aRect; pWin->DrawNativeControl( CTRL_WINDOW_BACKGROUND, PART_ENTIRE_CONTROL, aCtrlRegion, nState, aControlValue, - rtl::OUString() ); + OUString() ); } else @@ -381,7 +381,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, nState|=CTRL_STATE_PRESSED; pWin->DrawNativeControl( CTRL_LISTHEADER, PART_BUTTON, aCtrlRegion, nState, aControlValue, - rtl::OUString() ); + OUString() ); } else { @@ -605,7 +605,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, nState|=CTRL_STATE_PRESSED; pWin->DrawNativeControl( CTRL_LISTHEADER, PART_ARROW, aCtrlRegion, nState, aControlValue, - rtl::OUString() ); + OUString() ); } else { @@ -1153,7 +1153,7 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + OUString aHelpId( OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); if ( !aHelpId.isEmpty() ) { // Wenn eine Hilfe existiert, dann ausloesen @@ -1482,7 +1482,7 @@ XubString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -1493,10 +1493,10 @@ XubString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -rtl::OString HeaderBar::GetHelpId( sal_uInt16 nItemId ) const +OString HeaderBar::GetHelpId( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); - rtl::OString aRet; + OString aRet; if ( nPos != HEADERBAR_ITEM_NOTFOUND ) return (*mpItemList)[ nPos ]->maHelpId; return aRet; diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index 8b6f6be9ad0a..a67c3842b547 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -203,7 +203,7 @@ namespace svt m_pImpl->Index = _Index; } - void HyperLabel::SetLabel( const ::rtl::OUString& _rText ) + void HyperLabel::SetLabel( const OUString& _rText ) { SetText(_rText); } diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index 0a495447a29d..c80507f015a7 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -32,17 +32,17 @@ class IndexEntryResourceData { friend class IndexEntryResource; private: /* data */ - rtl::OUString ma_Name; - rtl::OUString ma_Translation; + OUString ma_Name; + OUString ma_Translation; private: /* member functions */ IndexEntryResourceData () {} public: - IndexEntryResourceData ( const rtl::OUString &r_Algorithm, const rtl::OUString &r_Translation) + IndexEntryResourceData ( const OUString &r_Algorithm, const OUString &r_Translation) : ma_Name (r_Algorithm), ma_Translation (r_Translation) {} - const rtl::OUString& GetAlgorithm () const { return ma_Name; } + const OUString& GetAlgorithm () const { return ma_Name; } - const rtl::OUString& GetTranslation () const { return ma_Translation; } + const OUString& GetTranslation () const { return ma_Translation; } ~IndexEntryResourceData () {} @@ -99,10 +99,10 @@ IndexEntryResource::~IndexEntryResource() delete[] mp_Data; } -const rtl::OUString& IndexEntryResource::GetTranslation(const rtl::OUString &r_Algorithm) +const OUString& IndexEntryResource::GetTranslation(const OUString &r_Algorithm) { sal_Int32 nIndex = r_Algorithm.indexOf('.'); - rtl::OUString aLocaleFreeAlgorithm; + OUString aLocaleFreeAlgorithm; if (nIndex == -1) aLocaleFreeAlgorithm = r_Algorithm; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 603e5ee38f91..c7779c5702d1 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -76,8 +76,8 @@ using namespace ::com::sun::star::uno; class SvtURLBox_Impl { public: - std::vector aURLs; - std::vector aCompletions; + std::vector aURLs; + std::vector aCompletions; const IUrlFilter* pUrlFilter; ::std::vector< WildCard > m_aFilters; @@ -94,9 +94,9 @@ class SvtMatchContext_Impl: public salhelper::Thread { static ::osl::Mutex* pDirMutex; - std::vector aPickList; - std::vector aCompletions; - std::vector aURLs; + std::vector aPickList; + std::vector aCompletions; + std::vector aURLs; svtools::AsynchronLink aLink; String aBaseURL; String aText; @@ -116,7 +116,7 @@ class SvtMatchContext_Impl: public salhelper::Thread void doExecute(); void Insert( const String& rCompletion, const String& rURL, sal_Bool bForce = sal_False); void ReadFolder( const String& rURL, const String& rMatch, sal_Bool bSmart ); - void FillPicklist(std::vector& rPickList); + void FillPicklist(std::vector& rPickList); public: SvtMatchContext_Impl( SvtURLBox* pBoxP, const String& rText ); @@ -151,7 +151,7 @@ SvtMatchContext_Impl::~SvtMatchContext_Impl() aLink.ClearPendingCall(); } -void SvtMatchContext_Impl::FillPicklist(std::vector& rPickList) +void SvtMatchContext_Impl::FillPicklist(std::vector& rPickList) { // Einlesung der Historypickliste Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( eHISTORY ); @@ -231,12 +231,12 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, ) // insert all completed strings into the listbox pBox->Clear(); - for(std::vector::iterator i = pThis->aCompletions.begin(); i != pThis->aCompletions.end(); ++i) + for(std::vector::iterator i = pThis->aCompletions.begin(); i != pThis->aCompletions.end(); ++i) { String sCompletion(*i); // convert the file into an URL - rtl::OUString sURL( sCompletion ); + OUString sURL( sCompletion ); ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sCompletion, sURL ); // note: if this doesn't work, we're not interested in: we're checking the // untouched sCompletion then @@ -303,7 +303,7 @@ void SvtMatchContext_Impl::Insert( const String& rCompletion, if( !bForce ) { // avoid doubles - if(find(aCompletions.begin(), aCompletions.end(), rtl::OUString(rCompletion)) != aCompletions.end()) + if(find(aCompletions.begin(), aCompletions.end(), OUString(rCompletion)) != aCompletions.end()) return; } @@ -333,7 +333,7 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL, // for pure home paths ( ~username ) the '.' at the end of rMatch // means that it poits to root catalog // this is done only for file contents since home paths parsing is useful only for them - if ( bPureHomePath && rMatch.Equals( rtl::OUString("file:///.") ) ) + if ( bPureHomePath && rMatch.Equals( OUString("file:///.") ) ) { // a home that refers to / @@ -721,7 +721,7 @@ void SvtMatchContext_Impl::doExecute() aObj.SetSmartProtocol( eSmartProt == INET_PROT_NOT_VALID ? INET_PROT_HTTP : eSmartProt ); for( ;; ) { - for(std::vector::iterator i = aPickList.begin(); schedule() && i != aPickList.end(); ++i) + for(std::vector::iterator i = aPickList.begin(); schedule() && i != aPickList.end(); ++i) { aCurObj.SetURL(*i); aCurObj.SetSmartURL( aCurObj.GetURLNoPass()); @@ -1193,7 +1193,7 @@ String SvtURLBox::GetURL() return aPlaceHolder; // try to get the right case preserving URL from the list of URLs - for(std::vector::iterator i = pImp->aCompletions.begin(), j = pImp->aURLs.begin(); i != pImp->aCompletions.end() && j != pImp->aURLs.end(); ++i, ++j) + for(std::vector::iterator i = pImp->aCompletions.begin(), j = pImp->aURLs.begin(); i != pImp->aCompletions.end() && j != pImp->aURLs.end(); ++i, ++j) { if((*i).equals(aText)) return *j; @@ -1223,9 +1223,9 @@ String SvtURLBox::GetURL() if ( aObj.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aName = ParseSmart( aText, aBaseURL, SvtPathOptions().GetWorkPath() ); + OUString aName = ParseSmart( aText, aBaseURL, SvtPathOptions().GetWorkPath() ); aObj.SetURL(aName); - ::rtl::OUString aURL( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aURL( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); if ( aURL.isEmpty() ) // aText itself is invalid, and even together with aBaseURL, it could not // made valid -> no chance @@ -1233,13 +1233,13 @@ String SvtURLBox::GetURL() bool bSlash = aObj.hasFinalSlash(); { - const rtl::OUString aPropName("CasePreservingURL"); + const OUString aPropName("CasePreservingURL"); - rtl::OUString aFileURL; + OUString aFileURL; Any aAny = UCBContentHelper::GetProperty(aURL, aPropName); sal_Bool success = (aAny >>= aFileURL); - rtl::OUString aTitle; + OUString aTitle; if(success) aTitle = String( INetURLObject(aFileURL).getName( @@ -1306,7 +1306,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing( if( !aHomeLocation ) aHomeLocation = ""; - aParseTilde = rtl::OUString::createFromAscii(aHomeLocation); + aParseTilde = OUString::createFromAscii(aHomeLocation); // in case the whole path is just "~" then there should // be no trailing slash at the end @@ -1317,7 +1317,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing( { // covers "~username" and "~username/..." cases xub_StrLen nNameEnd = aText.Search( '/' ); - rtl::OUString aUserName = aText.Copy( 1, ( nNameEnd != STRING_NOTFOUND ) ? nNameEnd : ( aText.Len() - 1 ) ); + OUString aUserName = aText.Copy( 1, ( nNameEnd != STRING_NOTFOUND ) ? nNameEnd : ( aText.Len() - 1 ) ); struct passwd* pPasswd = NULL; #ifdef SOLARIS @@ -1329,13 +1329,13 @@ sal_Bool SvtURLBox_Impl::TildeParsing( 1024, &pPasswd ); if( !nRes && pPasswd ) - aParseTilde = rtl::OUString::createFromAscii(pPasswd->pw_dir); + aParseTilde = OUString::createFromAscii(pPasswd->pw_dir); else return sal_False; // no such user #else pPasswd = getpwnam( OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ).getStr() ); if( pPasswd ) - aParseTilde = rtl::OUString::createFromAscii(pPasswd->pw_dir); + aParseTilde = OUString::createFromAscii(pPasswd->pw_dir); else return sal_False; // no such user #endif @@ -1351,7 +1351,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing( if( !aParseTilde.Len() || aParseTilde.EqualsAscii( "/" ) ) { // "/" path should be converted to "/." - aParseTilde = rtl::OUString("/."); + aParseTilde = OUString("/."); } else { diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 93e57f345946..a07a1eacd5e6 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -96,7 +96,7 @@ namespace svt void SetIndex( ItemIndex _Index ); ItemIndex GetIndex() const; - void Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText ); + void Update( ItemIndex _RMIndex, const OUString& _rText ); void SetPosition( RoadmapItem* OldHyperLabel ); @@ -267,7 +267,7 @@ namespace svt //--------------------------------------------------------------------- - RoadmapItem* ORoadmap::InsertHyperLabel( ItemIndex _Index, const ::rtl::OUString& _sLabel, ItemId _RMID, sal_Bool _bEnabled) + RoadmapItem* ORoadmap::InsertHyperLabel( ItemIndex _Index, const OUString& _sLabel, ItemId _RMID, sal_Bool _bEnabled) { if ( m_pImpl->getItemCount() == 0 ) m_pImpl->initItemSize(); @@ -338,7 +338,7 @@ namespace svt } } else if ( bWasComplete ) - m_pImpl->InCompleteHyperLabel = InsertHyperLabel( m_pImpl->getItemCount(), rtl::OUString("..."), RMINCOMPLETE ); + m_pImpl->InCompleteHyperLabel = InsertHyperLabel( m_pImpl->getItemCount(), OUString("..."), RMINCOMPLETE ); } //--------------------------------------------------------------------- @@ -363,12 +363,12 @@ namespace svt { RoadmapItem* pOldItem = GetPreviousHyperLabel( m_pImpl->getItemCount() ); m_pImpl->InCompleteHyperLabel->SetPosition( pOldItem ); - m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), rtl::OUString("...") ); + m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), OUString("...") ); } } //--------------------------------------------------------------------- - void ORoadmap::ReplaceRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _RMID, sal_Bool _bEnabled ) + void ORoadmap::ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _RMID, sal_Bool _bEnabled ) { RoadmapItem* pItem = GetByIndex( _Index); if ( pItem != NULL ) @@ -395,7 +395,7 @@ namespace svt } //--------------------------------------------------------------------- - void ORoadmap::InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ) + void ORoadmap::InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ) { InsertHyperLabel( _Index, _RoadmapItem, _nUniqueId, _bEnabled ); // Todo: YPos is superfluous, if items are always appended @@ -427,7 +427,7 @@ namespace svt } //--------------------------------------------------------------------- - void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const ::rtl::OUString& _sLabel, ItemIndex _nStartIndex ) + void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const OUString& _sLabel, ItemIndex _nStartIndex ) { RoadmapItem* pItem = GetByID( _nID, _nStartIndex ); if ( pItem != NULL ) @@ -762,7 +762,7 @@ namespace svt if ( mpID ) { - ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) + ::rtl::OUString( "." ); + OUString aIDText = OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) + OUString( "." ); mpID->SetText( aIDText ); } @@ -838,7 +838,7 @@ namespace svt { // calculate widths long nIDWidth = mpID->GetTextWidth( mpID->GetText() ); - long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString( "100." ) ); + long nMaxIDWidth = mpID->GetTextWidth( OUString( "100." ) ); nIDWidth = ::std::min( nIDWidth, nMaxIDWidth ); // check how many space the description would need @@ -854,7 +854,7 @@ namespace svt } //--------------------------------------------------------------------- - void RoadmapItem::Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText ) + void RoadmapItem::Update( ItemIndex _RMIndex, const OUString& _rText ) { // update description label mpDescription->SetLabel( _rText ); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 5e19a661dff1..ab7e320c03fe 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -277,7 +277,7 @@ void Ruler::ImplInit( WinBits nWinBits ) // Setup the default size Rectangle aRect; - GetTextBoundRect( aRect, rtl::OUString( "0123456789" ) ); + GetTextBoundRect( aRect, OUString( "0123456789" ) ); long nDefHeight = aRect.GetHeight() + RULER_OFF*2 + RULER_TEXTOFF*2 + mnBorderWidth; Size aDefSize; diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 34ab2900a024..0d4eb047e617 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -53,7 +53,7 @@ struct ImplTabBarItem OUString maHelpText; Rectangle maRect; long mnWidth; - rtl::OString maHelpId; + OString maHelpId; sal_Bool mbShort; sal_Bool mbSelect; sal_Bool mbEnable; @@ -1323,7 +1323,7 @@ void TabBar::Paint( const Rectangle& rect ) { if(IsNativeControlSupported(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL)) DrawNativeControl(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL,rect, - CTRL_STATE_ENABLED,ImplControlValue(0),rtl::OUString()); + CTRL_STATE_ENABLED,ImplControlValue(0),OUString()); // Items berechnen und ausgeben sal_uInt16 nItemCount = (sal_uInt16)mpItemList->size(); @@ -1542,7 +1542,7 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + OUString aHelpId( OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); if ( !aHelpId.isEmpty() ) { // Wenn eine Hilfe existiert, dann ausloesen @@ -2489,7 +2489,7 @@ XubString TabBar::GetHelpText( sal_uInt16 nPageId ) const { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -2499,10 +2499,10 @@ XubString TabBar::GetHelpText( sal_uInt16 nPageId ) const // ----------------------------------------------------------------------- -rtl::OString TabBar::GetHelpId( sal_uInt16 nPageId ) const +OString TabBar::GetHelpId( sal_uInt16 nPageId ) const { sal_uInt16 nPos = GetPagePos( nPageId ); - rtl::OString aRet; + OString aRet; if ( nPos != PAGE_NOT_FOUND ) return (*mpItemList)[ nPos ]->maHelpId; return aRet; diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 4b817c110da6..d8d9b396f2ab 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -31,7 +31,6 @@ #include "svtools/toolbarmenu.hxx" #include "toolbarmenuimp.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; @@ -1301,7 +1300,7 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, i_rRect, nState, aControlValue, - rtl::OUString() ); + OUString() ); } if( ! bNativeOk ) @@ -1566,7 +1565,7 @@ Reference< ::com::sun::star::accessibility::XAccessible > ToolbarMenu::CreateAcc // -------------------------------------------------------------------- // todo: move to new base class that will replace SfxPopupWindo -void ToolbarMenu::AddStatusListener( const rtl::OUString& rCommandURL ) +void ToolbarMenu::AddStatusListener( const OUString& rCommandURL ) { initStatusListener(); mpImpl->mxStatusListener->addStatusListener( rCommandURL ); diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 7694838759da..4291e0686752 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -30,7 +30,6 @@ #include "toolbarmenuimp.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -282,7 +281,7 @@ Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentSta { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; Reference< XAccessible > xParent( getAccessibleParent() ); Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); @@ -597,7 +596,7 @@ void ToolbarMenuAcc::ThrowIfDisposed (void) throw (DisposedException) { if(rBHelper.bDisposed || rBHelper.bInDispose || !mpParent) { - throw DisposedException ( ::rtl::OUString("object has been already disposed"), static_cast(this)); + throw DisposedException ( OUString("object has been already disposed"), static_cast(this)); } } @@ -727,14 +726,14 @@ sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeExcept // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() throw (RuntimeException) +OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() throw (RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException) +OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException) { const SolarMutexGuard aSolarGuard; String aRet; @@ -791,7 +790,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStat Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException) { - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); Reference< XAccessible > xParent( getAccessibleParent() ); diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 81c71a3955aa..2747e01e6336 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -145,8 +145,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -233,8 +233,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 0a7273f6cb42..53c443266bfe 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -266,7 +266,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ValueSetAcc::getAccessibleDescription() +OUString SAL_CALL ValueSetAcc::getAccessibleDescription() throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -278,7 +278,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ValueSetAcc::getAccessibleName() +OUString SAL_CALL ValueSetAcc::getAccessibleName() throw (uno::RuntimeException) { ThrowIfDisposed(); @@ -336,7 +336,7 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); @@ -745,7 +745,7 @@ void ValueSetAcc::ThrowIfDisposed (void) { OSL_TRACE ("Calling disposed object. Throwing exception:"); throw lang::DisposedException ( - ::rtl::OUString("object has been already disposed"), + OUString("object has been already disposed"), static_cast(this)); } else @@ -927,19 +927,19 @@ sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ValueItemAcc::getAccessibleDescription() +OUString SAL_CALL ValueItemAcc::getAccessibleDescription() throw (uno::RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ValueItemAcc::getAccessibleName() +OUString SAL_CALL ValueItemAcc::getAccessibleName() throw (uno::RuntimeException) { const SolarMutexGuard aSolarGuard; - rtl::OUString aRet; + OUString aRet; if( mpParent ) { @@ -947,7 +947,7 @@ sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() if( aRet.isEmpty() ) { - rtl::OUStringBuffer aBuffer("Item "); + OUStringBuffer aBuffer("Item "); aBuffer.append(static_cast(mpParent->mnId)); aRet = aBuffer.makeStringAndClear(); } @@ -1002,7 +1002,7 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException) { const SolarMutexGuard aSolarGuard; - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 47bfacfc0b34..9095903576f5 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -121,8 +121,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -241,8 +241,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index c0afffd44508..d26c3805991e 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -106,7 +106,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, V { WinBits nWinBits = WB_TABSTOP; - VclBuilder::stringmap::iterator aFind = rMap.find(rtl::OString("border")); + VclBuilder::stringmap::iterator aFind = rMap.find(OString("border")); if (aFind != rMap.end()) { if (toBool(aFind->second)) @@ -2162,7 +2162,7 @@ void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText) // Remember old and new name for accessibility event. ::com::sun::star::uno::Any aOldName, aNewName; - ::rtl::OUString sString (pItem->maText); + OUString sString (pItem->maText); aOldName <<= sString; sString = rText; aNewName <<= sString; diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 55e208d7c5e8..cf350ea13bed 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -104,13 +104,13 @@ PlaceEditDialog::~PlaceEditDialog() { } -rtl::OUString PlaceEditDialog::GetServerUrl() +OUString PlaceEditDialog::GetServerUrl() { - rtl::OUString sUrl; + OUString sUrl; if ( m_pCurrentDetails.get( ) ) { INetURLObject aUrl = m_pCurrentDetails->getUrl(); - rtl::OUString sUsername = rtl::OUString( m_pEDUsername->GetText( ) ).trim( ); + OUString sUsername = OUString( m_pEDUsername->GetText( ) ).trim( ); if ( !sUsername.isEmpty( ) ) aUrl.SetUser( sUsername ); if ( !aUrl.HasError( ) ) @@ -171,8 +171,8 @@ IMPL_LINK ( PlaceEditDialog, DelHdl, Button *, EMPTYARG ) IMPL_LINK ( PlaceEditDialog, EditHdl, void *, EMPTYARG ) { - rtl::OUString sUrl = GetServerUrl( ); - rtl::OUString sName = rtl::OUString( m_pEDServerName->GetText() ).trim( ); + OUString sUrl = GetServerUrl( ); + OUString sName = OUString( m_pEDServerName->GetText() ).trim( ); m_pBTOk->Enable( !sName.isEmpty( ) && !sUrl.isEmpty( ) ); return 1; } @@ -182,7 +182,7 @@ IMPL_LINK ( PlaceEditDialog, EditUsernameHdl, void *, EMPTYARG ) for ( std::vector< boost::shared_ptr< DetailsContainer > >::iterator it = m_aDetailsContainers.begin( ); it != m_aDetailsContainers.end( ); ++it ) { - ( *it )->setUsername( rtl::OUString( m_pEDUsername->GetText() ) ); + ( *it )->setUsername( OUString( m_pEDUsername->GetText() ) ); } return 1; } diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 51b93e538db8..91b95629a1aa 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -49,7 +49,7 @@ using namespace com::sun::star::task; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -DetailsContainer::DetailsContainer( VclBuilderContainer* pBuilder, const rtl::OString& rFrame ) +DetailsContainer::DetailsContainer( VclBuilderContainer* pBuilder, const OString& rFrame ) { pBuilder->get( m_pFrame, rFrame ); } @@ -87,7 +87,7 @@ IMPL_LINK( DetailsContainer, ValueChangeHdl, void *, EMPTYARG ) return 0; } -HostDetailsContainer::HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, rtl::OUString sScheme ) : +HostDetailsContainer::HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, OUString sScheme ) : DetailsContainer( pBuilder, "HostDetails" ), m_nDefaultPort( nPort ), m_sScheme( sScheme ) @@ -113,16 +113,16 @@ void HostDetailsContainer::show( bool bShow ) INetURLObject HostDetailsContainer::getUrl( ) { - rtl::OUString sHost = rtl::OUString( m_pEDHost->GetText() ).trim( ); + OUString sHost = OUString( m_pEDHost->GetText() ).trim( ); sal_Int64 nPort = m_pEDPort->GetValue(); - rtl::OUString sPath = rtl::OUString( m_pEDPath->GetText() ).trim( ); + OUString sPath = OUString( m_pEDPath->GetText() ).trim( ); - rtl::OUString sUrl; + OUString sUrl; if ( !sHost.isEmpty( ) ) { sUrl = m_sScheme + "://" + sHost; if ( nPort != m_nDefaultPort ) - sUrl += ":" + rtl::OUString::valueOf( nPort ); + sUrl += ":" + OUString::valueOf( nPort ); if ( !sPath.isEmpty( ) ) if ( sPath.indexOf( '/' ) != 0 ) sUrl += "/"; @@ -146,7 +146,7 @@ bool HostDetailsContainer::setUrl( const INetURLObject& rUrl ) return bSuccess; } -bool HostDetailsContainer::verifyScheme( const rtl::OUString& sScheme ) +bool HostDetailsContainer::verifyScheme( const OUString& sScheme ) { return sScheme.equals( m_sScheme + "://" ); } @@ -170,7 +170,7 @@ void DavDetailsContainer::show( bool bShow ) m_pCBDavs->Check( false ); } -bool DavDetailsContainer::verifyScheme( const rtl::OUString& rScheme ) +bool DavDetailsContainer::verifyScheme( const OUString& rScheme ) { bool bValid = false; if ( rScheme.equals( "http://" ) ) @@ -195,7 +195,7 @@ IMPL_LINK( DavDetailsContainer, ToggledDavsHdl, CheckBox*, pCheckBox ) else if ( m_pEDPort->GetValue() == 443 && bCheckedDavs == sal_False ) m_pEDPort->SetValue( 80 ); - rtl::OUString sScheme( "http" ); + OUString sScheme( "http" ); if ( bCheckedDavs ) sScheme = "https"; setScheme( sScheme ); @@ -222,11 +222,11 @@ SmbDetailsContainer::SmbDetailsContainer( VclBuilderContainer* pBuilder ) : INetURLObject SmbDetailsContainer::getUrl( ) { - rtl::OUString sHost = rtl::OUString( m_pEDHost->GetText() ).trim( ); - rtl::OUString sShare = rtl::OUString( m_pEDShare->GetText() ).trim( ); - rtl::OUString sPath = rtl::OUString( m_pEDPath->GetText() ).trim( ); + OUString sHost = OUString( m_pEDHost->GetText() ).trim( ); + OUString sShare = OUString( m_pEDShare->GetText() ).trim( ); + OUString sPath = OUString( m_pEDPath->GetText() ).trim( ); - rtl::OUString sUrl; + OUString sUrl; if ( !sHost.isEmpty( ) ) { sUrl = "smb://" + sHost + "/"; @@ -247,9 +247,9 @@ bool SmbDetailsContainer::setUrl( const INetURLObject& rUrl ) if ( bSuccess ) { - rtl::OUString sShare = rUrl.getName( 0 ); - rtl::OUString sFullPath = rUrl.GetURLPath( ); - rtl::OUString sPath; + OUString sShare = rUrl.getName( 0 ); + OUString sFullPath = rUrl.GetURLPath( ); + OUString sPath; if ( sFullPath.getLength( ) > sShare.getLength( ) ) { sal_Int32 nPos = sShare.getLength( ); @@ -297,8 +297,8 @@ CmisDetailsContainer::CmisDetailsContainer( VclBuilderContainer* pBuilder ) : show( false ); // Load the ServerType entries - Sequence< ::rtl::OUString > aTypesUrlsList( officecfg::Office::Common::Misc::CmisServersUrls::get( xContext ) ); - Sequence< ::rtl::OUString > aTypesNamesList( officecfg::Office::Common::Misc::CmisServersNames::get( xContext ) ); + Sequence< OUString > aTypesUrlsList( officecfg::Office::Common::Misc::CmisServersUrls::get( xContext ) ); + Sequence< OUString > aTypesNamesList( officecfg::Office::Common::Misc::CmisServersNames::get( xContext ) ); for ( sal_Int32 i = 0; i < aTypesUrlsList.getLength( ) && aTypesNamesList.getLength( ); ++i ) { m_pLBServerType->InsertEntry( aTypesNamesList[i] ); @@ -308,13 +308,13 @@ CmisDetailsContainer::CmisDetailsContainer( VclBuilderContainer* pBuilder ) : INetURLObject CmisDetailsContainer::getUrl( ) { - rtl::OUString sBindingUrl = rtl::OUString( m_pEDBinding->GetText() ).trim( ); - rtl::OUString sPath = rtl::OUString( m_pEDPath->GetText() ).trim( ); + OUString sBindingUrl = OUString( m_pEDBinding->GetText() ).trim( ); + OUString sPath = OUString( m_pEDPath->GetText() ).trim( ); - rtl::OUString sUrl; + OUString sUrl; if ( !sBindingUrl.isEmpty( ) && !m_sRepoId.isEmpty() ) { - rtl::OUString sEncodedBinding = rtl::Uri::encode( + OUString sEncodedBinding = rtl::Uri::encode( sBindingUrl + "#" + m_sRepoId, rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, @@ -332,10 +332,10 @@ bool CmisDetailsContainer::setUrl( const INetURLObject& rUrl ) if ( bSuccess ) { - rtl::OUString sBindingUrl; - rtl::OUString sRepositoryId; + OUString sBindingUrl; + OUString sRepositoryId; - rtl::OUString sDecodedHost = rUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET ); + OUString sDecodedHost = rUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET ); INetURLObject aHostUrl( sDecodedHost ); sBindingUrl = aHostUrl.GetURLNoMark( ); sRepositoryId = aHostUrl.GetMark( ); @@ -346,9 +346,9 @@ bool CmisDetailsContainer::setUrl( const INetURLObject& rUrl ) return bSuccess; } -void CmisDetailsContainer::setUsername( const rtl::OUString& rUsername ) +void CmisDetailsContainer::setUsername( const OUString& rUsername ) { - m_sUsername = rtl::OUString( rUsername ); + m_sUsername = OUString( rUsername ); } void CmisDetailsContainer::selectRepository( ) @@ -370,17 +370,17 @@ IMPL_LINK( CmisDetailsContainer, SelectServerTypeHdl, void *, EMPTYARG ) IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) { - rtl::OUString sBindingUrl = rtl::OUString( m_pEDBinding->GetText() ).trim( ); + OUString sBindingUrl = OUString( m_pEDBinding->GetText() ).trim( ); // Clean the listbox m_pLBRepository->Clear( ); m_aRepoIds.clear( ); // Compute the URL - rtl::OUString sUrl; + OUString sUrl; if ( !sBindingUrl.isEmpty( ) ) { - rtl::OUString sEncodedBinding = rtl::Uri::encode( + OUString sEncodedBinding = rtl::Uri::encode( sBindingUrl, rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, @@ -390,8 +390,8 @@ IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) // Get the Content ::ucbhelper::Content aCnt( sUrl, m_xCmdEnv, comphelper::getProcessComponentContext() ); - Sequence< rtl::OUString > aProps( 1 ); - aProps[0] = rtl::OUString( "Title" ); + Sequence< OUString > aProps( 1 ); + aProps[0] = OUString( "Title" ); try { @@ -399,14 +399,14 @@ IMPL_LINK( CmisDetailsContainer, RefreshReposHdl, void *, EMPTYARG ) Reference< XContentAccess > xAccess( xResultSet, UNO_QUERY_THROW ); while ( xResultSet->next() ) { - rtl::OUString sURL = xAccess->queryContentIdentifierString( ); + OUString sURL = xAccess->queryContentIdentifierString( ); INetURLObject aURL( sURL ); - rtl::OUString sId = aURL.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); + OUString sId = aURL.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); sId = sId.copy( 1 ); m_aRepoIds.push_back( sId ); Reference< XRow > xRow( xResultSet, UNO_QUERY ); - rtl::OUString sName = xRow->getString( 1 ); + OUString sName = xRow->getString( 1 ); m_pLBRepository->InsertEntry( sName ); } } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 74984e68b55e..e15faf7ed2c7 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -71,8 +71,8 @@ namespace svt using namespace ::utl; DECLARE_STL_VECTOR( String, StringArray ); - DECLARE_STL_STDKEY_SET( ::rtl::OUString, StringBag ); - DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, MapString2String ); + DECLARE_STL_STDKEY_SET( OUString, StringBag ); + DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String ); namespace { @@ -98,10 +98,10 @@ namespace svt virtual ~IAssigmentData(); /// the data source to use for the address book - virtual ::rtl::OUString getDatasourceName() const = 0; + virtual OUString getDatasourceName() const = 0; /// the command to use for the address book - virtual ::rtl::OUString getCommand() const = 0; + virtual OUString getCommand() const = 0; /** the command type to use for the address book @return @@ -110,17 +110,17 @@ namespace svt virtual sal_Int32 getCommandType() const = 0; /// checks whether or not there is an assignment for a given logical field - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; + virtual sal_Bool hasFieldAssignment(const OUString& _rLogicalName) = 0; /// retrieves the assignment for a given logical field - virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; + virtual OUString getFieldAssignment(const OUString& _rLogicalName) = 0; /// set the assignment for a given logical field - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) = 0; + virtual void setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) = 0; /// clear the assignment for a given logical field - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; + virtual void clearFieldAssignment(const OUString& _rLogicalName) = 0; - virtual void setDatasourceName(const ::rtl::OUString& _rName) = 0; - virtual void setCommand(const ::rtl::OUString& _rCommand) = 0; + virtual void setDatasourceName(const OUString& _rName) = 0; + virtual void setCommand(const OUString& _rCommand) = 0; }; // ------------------------------------------------------------------- @@ -135,35 +135,35 @@ namespace svt { protected: Reference< XDataSource > m_xDataSource; - ::rtl::OUString m_sDSName; - ::rtl::OUString m_sTableName; + OUString m_sDSName; + OUString m_sTableName; MapString2String m_aAliases; public: AssigmentTransientData( const Reference< XDataSource >& _rxDataSource, - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rTableName, + const OUString& _rDataSourceName, + const OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ); // IAssigmentData overridables - virtual ::rtl::OUString getDatasourceName() const; - virtual ::rtl::OUString getCommand() const; + virtual OUString getDatasourceName() const; + virtual OUString getCommand() const; virtual sal_Int32 getCommandType() const; - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual sal_Bool hasFieldAssignment(const OUString& _rLogicalName); + virtual OUString getFieldAssignment(const OUString& _rLogicalName); + virtual void setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment); + virtual void clearFieldAssignment(const OUString& _rLogicalName); - virtual void setDatasourceName(const ::rtl::OUString& _rName); - virtual void setCommand(const ::rtl::OUString& _rCommand); + virtual void setDatasourceName(const OUString& _rName); + virtual void setCommand(const OUString& _rCommand); }; // ------------------------------------------------------------------- AssigmentTransientData::AssigmentTransientData( const Reference< XDataSource >& _rxDataSource, - const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rTableName, + const OUString& _rDataSourceName, const OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ) :m_xDataSource( _rxDataSource ) ,m_sDSName( _rDataSourceName ) @@ -173,11 +173,11 @@ public: // first collect all known programmatic names StringBag aKnownNames; - rtl::OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); + OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); sal_Int32 nIndex = 0; do { - rtl::OUString aToken = sLogicalFieldNames.getToken(0, ';', nIndex); + OUString aToken = sLogicalFieldNames.getToken(0, ';', nIndex); aKnownNames.insert(aToken); } while ( nIndex >= 0); @@ -194,9 +194,9 @@ public: } else { - OSL_FAIL( ( ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") - += ::rtl::OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString(")!") + OSL_FAIL( ( OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") + += OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) + += OString(")!") ).getStr() ); } @@ -204,13 +204,13 @@ public: } // ------------------------------------------------------------------- - ::rtl::OUString AssigmentTransientData::getDatasourceName() const + OUString AssigmentTransientData::getDatasourceName() const { return m_sDSName; } // ------------------------------------------------------------------- - ::rtl::OUString AssigmentTransientData::getCommand() const + OUString AssigmentTransientData::getCommand() const { return m_sTableName; } @@ -222,7 +222,7 @@ public: } // ------------------------------------------------------------------- - sal_Bool AssigmentTransientData::hasFieldAssignment(const ::rtl::OUString& _rLogicalName) + sal_Bool AssigmentTransientData::hasFieldAssignment(const OUString& _rLogicalName) { ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); return ( m_aAliases.end() != aPos ) @@ -230,9 +230,9 @@ public: } // ------------------------------------------------------------------- - ::rtl::OUString AssigmentTransientData::getFieldAssignment(const ::rtl::OUString& _rLogicalName) + OUString AssigmentTransientData::getFieldAssignment(const OUString& _rLogicalName) { - ::rtl::OUString sReturn; + OUString sReturn; ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); if ( m_aAliases.end() != aPos ) sReturn = aPos->second; @@ -241,13 +241,13 @@ public: } // ------------------------------------------------------------------- - void AssigmentTransientData::setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) + void AssigmentTransientData::setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) { m_aAliases[ _rLogicalName ] = _rAssignment; } // ------------------------------------------------------------------- - void AssigmentTransientData::clearFieldAssignment(const ::rtl::OUString& _rLogicalName) + void AssigmentTransientData::clearFieldAssignment(const OUString& _rLogicalName) { MapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); if ( m_aAliases.end() != aPos ) @@ -255,13 +255,13 @@ public: } // ------------------------------------------------------------------- - void AssigmentTransientData::setDatasourceName(const ::rtl::OUString&) + void AssigmentTransientData::setDatasourceName(const OUString&) { OSL_FAIL( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" ); } // ------------------------------------------------------------------- - void AssigmentTransientData::setCommand(const ::rtl::OUString&) + void AssigmentTransientData::setCommand(const OUString&) { OSL_FAIL( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" ); } @@ -278,40 +278,40 @@ public: protected: ::com::sun::star::uno::Any - getProperty(const ::rtl::OUString& _rLocalName) const; + getProperty(const OUString& _rLocalName) const; ::com::sun::star::uno::Any getProperty(const sal_Char* _pLocalName) const; - ::rtl::OUString getStringProperty(const sal_Char* _pLocalName) const; + OUString getStringProperty(const sal_Char* _pLocalName) const; sal_Int32 getInt32Property(const sal_Char* _pLocalName) const; - ::rtl::OUString getStringProperty(const ::rtl::OUString& _rLocalName) const; + OUString getStringProperty(const OUString& _rLocalName) const; - void setStringProperty(const sal_Char* _pLocalName, const ::rtl::OUString& _rValue); + void setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue); public: AssignmentPersistentData(); ~AssignmentPersistentData(); // IAssigmentData overridables - virtual ::rtl::OUString getDatasourceName() const; - virtual ::rtl::OUString getCommand() const; + virtual OUString getDatasourceName() const; + virtual OUString getCommand() const; virtual sal_Int32 getCommandType() const; - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual sal_Bool hasFieldAssignment(const OUString& _rLogicalName); + virtual OUString getFieldAssignment(const OUString& _rLogicalName); + virtual void setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment); + virtual void clearFieldAssignment(const OUString& _rLogicalName); - virtual void setDatasourceName(const ::rtl::OUString& _rName); - virtual void setCommand(const ::rtl::OUString& _rCommand); + virtual void setDatasourceName(const OUString& _rName); + virtual void setCommand(const OUString& _rCommand); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); virtual void Commit(); }; -void AssignmentPersistentData::Notify( const com::sun::star::uno::Sequence& ) +void AssignmentPersistentData::Notify( const com::sun::star::uno::Sequence& ) { } @@ -321,10 +321,10 @@ void AssignmentPersistentData::Commit() // ------------------------------------------------------------------- AssignmentPersistentData::AssignmentPersistentData() - :ConfigItem( ::rtl::OUString( "Office.DataAccess/AddressBook" )) + :ConfigItem( OUString( "Office.DataAccess/AddressBook" )) { - Sequence< ::rtl::OUString > aStoredNames = GetNodeNames(::rtl::OUString("Fields")); - const ::rtl::OUString* pStoredNames = aStoredNames.getConstArray(); + Sequence< OUString > aStoredNames = GetNodeNames(OUString("Fields")); + const OUString* pStoredNames = aStoredNames.getConstArray(); for (sal_Int32 i=0; i aProperties(&_rLocalName, 1); + Sequence< OUString > aProperties(&_rLocalName, 1); Sequence< Any > aValues = const_cast(this)->GetProperties(aProperties); DBG_ASSERT(aValues.getLength() == 1, "AssignmentPersistentData::getProperty: invalid sequence length!"); return aValues[0]; } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getStringProperty(const ::rtl::OUString& _rLocalName) const + OUString AssignmentPersistentData::getStringProperty(const OUString& _rLocalName) const { - ::rtl::OUString sReturn; + OUString sReturn; getProperty( _rLocalName ) >>= sReturn; return sReturn; } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const + OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const { - ::rtl::OUString sReturn; + OUString sReturn; getProperty( _pLocalName ) >>= sReturn; return sReturn; } @@ -394,17 +394,17 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - void AssignmentPersistentData::setStringProperty(const sal_Char* _pLocalName, const ::rtl::OUString& _rValue) + void AssignmentPersistentData::setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue) { - Sequence< ::rtl::OUString > aNames(1); + Sequence< OUString > aNames(1); Sequence< Any > aValues(1); - aNames[0] = ::rtl::OUString::createFromAscii(_pLocalName); + aNames[0] = OUString::createFromAscii(_pLocalName); aValues[0] <<= _rValue; PutProperties(aNames, aValues); } // ------------------------------------------------------------------- - void AssignmentPersistentData::setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) + void AssignmentPersistentData::setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) { if (_rAssignment.isEmpty()) { @@ -417,21 +417,21 @@ void AssignmentPersistentData::Commit() } // Fields - ::rtl::OUString sDescriptionNodePath("Fields"); + OUString sDescriptionNodePath("Fields"); // Fields/ - ::rtl::OUString sFieldElementNodePath(sDescriptionNodePath); - sFieldElementNodePath += ::rtl::OUString("/"); + OUString sFieldElementNodePath(sDescriptionNodePath); + sFieldElementNodePath += OUString("/"); sFieldElementNodePath += _rLogicalName; Sequence< PropertyValue > aNewFieldDescription(2); // Fields//ProgrammaticFieldName aNewFieldDescription[0].Name = sFieldElementNodePath; - aNewFieldDescription[0].Name += ::rtl::OUString("/ProgrammaticFieldName"); + aNewFieldDescription[0].Name += OUString("/ProgrammaticFieldName"); aNewFieldDescription[0].Value <<= _rLogicalName; // Fields//AssignedFieldName aNewFieldDescription[1].Name = sFieldElementNodePath; - aNewFieldDescription[1].Name += ::rtl::OUString("/AssignedFieldName"); + aNewFieldDescription[1].Name += OUString("/AssignedFieldName"); aNewFieldDescription[1].Value <<= _rAssignment; // just set the new value @@ -443,37 +443,37 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - void AssignmentPersistentData::clearFieldAssignment(const ::rtl::OUString& _rLogicalName) + void AssignmentPersistentData::clearFieldAssignment(const OUString& _rLogicalName) { if (!hasFieldAssignment(_rLogicalName)) // nothing to do return; - ::rtl::OUString sDescriptionNodePath("Fields"); - Sequence< ::rtl::OUString > aNames(&_rLogicalName, 1); + OUString sDescriptionNodePath("Fields"); + Sequence< OUString > aNames(&_rLogicalName, 1); ClearNodeElements(sDescriptionNodePath, aNames); } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getDatasourceName() const + OUString AssignmentPersistentData::getDatasourceName() const { return getStringProperty( "DataSourceName" ); } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getCommand() const + OUString AssignmentPersistentData::getCommand() const { return getStringProperty( "Command" ); } // ------------------------------------------------------------------- - void AssignmentPersistentData::setDatasourceName(const ::rtl::OUString& _rName) + void AssignmentPersistentData::setDatasourceName(const OUString& _rName) { setStringProperty( "DataSourceName", _rName ); } // ------------------------------------------------------------------- - void AssignmentPersistentData::setCommand(const ::rtl::OUString& _rCommand) + void AssignmentPersistentData::setCommand(const OUString& _rCommand) { setStringProperty( "Command", _rCommand ); } @@ -524,8 +524,8 @@ void AssignmentPersistentData::Commit() } // ................................................................ - AddressBookSourceDialogData( const Reference< XDataSource >& _rxTransientDS, const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ) + AddressBookSourceDialogData( const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, + const OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ) :m_xTransientDataSource( _rxTransientDS ) ,nFieldScrollPos(0) ,nLastVisibleListIndex(0) @@ -573,8 +573,8 @@ void AssignmentPersistentData::Commit() // ------------------------------------------------------------------- AddressBookSourceDialog::AddressBookSourceDialog( Window* _pParent, const Reference< XComponentContext >& _rxORB, - const Reference< XDataSource >& _rxTransientDS, const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping ) + const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, + const OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping ) :INIT_FIELDS() ,m_pImpl( new AddressBookSourceDialogData( _rxTransientDS, _rDataSourceName, _rTable, _rMapping ) ) { @@ -685,7 +685,7 @@ void AssignmentPersistentData::Commit() implScrollFields(0, sal_False, sal_False); // the logical names - rtl::OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); + OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); sal_Int32 nAdjustedTokenCount = comphelper::string::getTokenCount(sLogicalFieldNames, ';') + (m_pImpl->bOddFieldNumber ? 1 : 0); DBG_ASSERT(nAdjustedTokenCount == (sal_Int32)m_pImpl->aFieldLabels.size(), "AddressBookSourceDialog::AddressBookSourceDialog: inconsistence between logical and UI field names!"); @@ -722,7 +722,7 @@ void AssignmentPersistentData::Commit() _rMapping.realloc( m_pImpl->aLogicalFieldNames.size() ); AliasProgrammaticPair* pPair = _rMapping.getArray(); - ::rtl::OUString sCurrent; + OUString sCurrent; for ( ConstStringArrayIterator aProgrammatic = m_pImpl->aLogicalFieldNames.begin(); aProgrammatic != m_pImpl->aLogicalFieldNames.end(); ++aProgrammatic @@ -744,7 +744,7 @@ void AssignmentPersistentData::Commit() // ------------------------------------------------------------------- void AddressBookSourceDialog::loadConfiguration() { - ::rtl::OUString sName = m_pImpl->pConfigData->getDatasourceName(); + OUString sName = m_pImpl->pConfigData->getDatasourceName(); INetURLObject aURL( sName ); if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) { @@ -798,7 +798,7 @@ void AssignmentPersistentData::Commit() catch(const Exception&) { } if (!m_xDatabaseContext.is()) { - const rtl::OUString sContextServiceName("com.sun.star.sdb.DatabaseContext"); + const OUString sContextServiceName("com.sun.star.sdb.DatabaseContext"); ShowServiceNotAvailableError( this, sContextServiceName, sal_False); return; } @@ -806,7 +806,7 @@ void AssignmentPersistentData::Commit() m_aDatasource.Clear(); // fill the datasources listbox - Sequence< ::rtl::OUString > aDatasourceNames; + Sequence< OUString > aDatasourceNames; try { aDatasourceNames = m_xDatabaseContext->getElementNames(); @@ -815,8 +815,8 @@ void AssignmentPersistentData::Commit() { OSL_FAIL("AddressBookSourceDialog::initializeDatasources: caught an exception while asking for the data source names!"); } - const ::rtl::OUString* pDatasourceNames = aDatasourceNames.getConstArray(); - const ::rtl::OUString* pEnd = pDatasourceNames + aDatasourceNames.getLength(); + const OUString* pDatasourceNames = aDatasourceNames.getConstArray(); + const OUString* pEnd = pDatasourceNames + aDatasourceNames.getLength(); for (; pDatasourceNames < pEnd; ++pDatasourceNames) m_aDatasource.InsertEntry(*pDatasourceNames); } @@ -850,20 +850,20 @@ void AssignmentPersistentData::Commit() catch(const Exception&) { } if (!xHandler.is()) { - const rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); + const OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); ShowServiceNotAvailableError(this, sInteractionHandlerServiceName, sal_True); return; } // the currently selected table - ::rtl::OUString sOldTable = m_aTable.GetText(); + OUString sOldTable = m_aTable.GetText(); m_aTable.Clear(); m_xCurrentDatasourceTables= NULL; // get the tables of the connection - Sequence< ::rtl::OUString > aTableNames; + Sequence< OUString > aTableNames; Any aException; try { @@ -917,8 +917,8 @@ void AssignmentPersistentData::Commit() sal_Bool bKnowOldTable = sal_False; // fill the table list - const ::rtl::OUString* pTableNames = aTableNames.getConstArray(); - const ::rtl::OUString* pEnd = pTableNames + aTableNames.getLength(); + const OUString* pTableNames = aTableNames.getConstArray(); + const OUString* pEnd = pTableNames + aTableNames.getLength(); for (;pTableNames != pEnd; ++pTableNames) { m_aTable.InsertEntry(*pTableNames); @@ -928,7 +928,7 @@ void AssignmentPersistentData::Commit() // set the old table, if the new data source knows a table with this name, too. Else reset the tables edit field. if (!bKnowOldTable) - sOldTable = ::rtl::OUString(); + sOldTable = OUString(); m_aTable.SetText(sOldTable); resetFields(); @@ -943,7 +943,7 @@ void AssignmentPersistentData::Commit() m_aDatasource.SaveValue(); String sSelectedTable = m_aTable.GetText(); - Sequence< ::rtl::OUString > aColumnNames; + Sequence< OUString > aColumnNames; try { if (m_xCurrentDatasourceTables.is()) @@ -965,8 +965,8 @@ void AssignmentPersistentData::Commit() } - const ::rtl::OUString* pColumnNames = aColumnNames.getConstArray(); - const ::rtl::OUString* pEnd = pColumnNames + aColumnNames.getLength(); + const OUString* pColumnNames = aColumnNames.getConstArray(); + const OUString* pEnd = pColumnNames + aColumnNames.getLength(); // for quicker access ::std::set< String > aColumnNameSet; @@ -1223,7 +1223,7 @@ void AssignmentPersistentData::Commit() catch(const Exception&) { } if (!xAdminDialog.is()) { - ShowServiceNotAvailableError(this, rtl::OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"), sal_True); + ShowServiceNotAvailableError(this, OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"), sal_True); return 1L; } @@ -1235,8 +1235,8 @@ void AssignmentPersistentData::Commit() Reference xProp(xAdminDialog,UNO_QUERY); if ( xProp.is() ) { - ::rtl::OUString sName; - xProp->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sName; + OUString sName; + xProp->getPropertyValue(OUString("DataSourceName")) >>= sName; INetURLObject aURL( sName ); if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 38e738e1a102..21a70661dd11 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -30,7 +30,6 @@ #include -using rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index b268cc4b2a3e..f26d72f09a97 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -105,11 +105,11 @@ void SvObjectServerList::FillInsertObjects() uno::Reference< lang::XMultiServiceFactory > sProviderMSFactory = configuration::theDefaultProvider::get(xContext); - ::rtl::OUString sReaderService( "com.sun.star.configuration.ConfigurationAccess" ); + OUString sReaderService( "com.sun.star.configuration.ConfigurationAccess" ); uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aPathProp; - aPathProp.Name = ::rtl::OUString( "nodepath" ); - aPathProp.Value <<= ::rtl::OUString( "/org.openoffice.Office.Embedding/ObjectNames" ); + aPathProp.Name = OUString( "nodepath" ); + aPathProp.Value <<= OUString( "/org.openoffice.Office.Embedding/ObjectNames" ); aArguments[0] <<= aPathProp; uno::Reference< container::XNameAccess > xNameAccess( @@ -118,13 +118,13 @@ void SvObjectServerList::FillInsertObjects() if( xNameAccess.is()) { - uno::Sequence< ::rtl::OUString > seqNames= xNameAccess->getElementNames(); + uno::Sequence< OUString > seqNames= xNameAccess->getElementNames(); sal_Int32 nInd; - ::rtl::OUString aStringProductName( "%PRODUCTNAME" ); + OUString aStringProductName( "%PRODUCTNAME" ); sal_Int32 nStringProductNameLength = aStringProductName.getLength(); - ::rtl::OUString aStringProductVersion( "%PRODUCTVERSION" ); + OUString aStringProductVersion( "%PRODUCTVERSION" ); sal_Int32 nStringProductVersionLength = aStringProductVersion.getLength(); for( nInd = 0; nInd < seqNames.getLength(); nInd++ ) @@ -133,10 +133,10 @@ void SvObjectServerList::FillInsertObjects() xNameAccess->getByName( seqNames[nInd] ) >>= xEntry; if ( xEntry.is() ) { - ::rtl::OUString aUIName; - ::rtl::OUString aClassID; - xEntry->getByName( ::rtl::OUString( "ObjectUIName" ) ) >>= aUIName; - xEntry->getByName( ::rtl::OUString( "ClassID" ) ) >>= aClassID; + OUString aUIName; + OUString aClassID; + xEntry->getByName( OUString( "ObjectUIName" ) ) >>= aUIName; + xEntry->getByName( OUString( "ClassID" ) ) >>= aClassID; if ( !aUIName.isEmpty() ) { diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index b240f0b52ecf..ff289d2c59c8 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -29,7 +29,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter, { ImplFreePrnDlgListBox( pBox ); - const std::vector& rPrinters = Printer::GetPrinterQueues(); + const std::vector& rPrinters = Printer::GetPrinterQueues(); unsigned int nCount = rPrinters.size(); if ( nCount ) { diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 11b3480f3e55..3b785a04aff7 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -217,7 +217,7 @@ namespace svt } //-------------------------------------------------------------------- - void RoadmapWizard::SetRoadmapHelpId( const rtl::OString& _rId ) + void RoadmapWizard::SetRoadmapHelpId( const OString& _rId ) { m_pImpl->pRoadmap->SetHelpId( _rId ); } diff --git a/svtools/source/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter/SvFilterOptionsDialog.hxx index 3bbc3cff35b0..37e0888aed27 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.hxx +++ b/svtools/source/filter/SvFilterOptionsDialog.hxx @@ -48,7 +48,7 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper5 com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxSourceDocument; - rtl::OUString maDialogTitle; + OUString maDialogTitle; FieldUnit meFieldUnit; sal_Bool mbExportSelection; @@ -66,11 +66,11 @@ public: throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( com::sun::star::uno::RuntimeException ); // XPropertyAccess @@ -84,7 +84,7 @@ public: // XExecuteDialog virtual sal_Int16 SAL_CALL execute() throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( ::com::sun::star::uno::RuntimeException ); // XExporter diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index dac63180f188..9c8ca91dc769 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -78,7 +78,7 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic ) // ------------------------------------------------------------------------------ -void GraphicDescriptor::init( const ::rtl::OUString& rURL ) +void GraphicDescriptor::init( const OUString& rURL ) throw() { SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rURL, STREAM_READ ); @@ -92,7 +92,7 @@ void GraphicDescriptor::init( const ::rtl::OUString& rURL ) // ------------------------------------------------------------------------------ -void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const ::rtl::OUString& rURL ) +void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL ) throw() { SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rxIStm ); @@ -106,7 +106,7 @@ void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, // ------------------------------------------------------------------------------ -void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL ) +void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) { String aURL; if( pURL ) @@ -114,7 +114,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL ::GraphicDescriptor aDescriptor( rIStm, &aURL ); mpGraphic = NULL; - maMimeType = ::rtl::OUString(); + maMimeType = OUString(); meType = GRAPHIC_NONE; mnBitsPerPixel = 0; mbTransparent = false; @@ -172,20 +172,20 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL // ------------------------------------------------------------------------------ -::rtl::OUString GraphicDescriptor::getImplementationName_Static() +OUString GraphicDescriptor::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicDescriptor" ); + return OUString( "com.sun.star.comp.graphic.GraphicDescriptor" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GraphicDescriptor::getSupportedServiceNames_Static() +uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() throw( ) { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicDescriptor" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.GraphicDescriptor" ); return aSeq; } @@ -239,7 +239,7 @@ void SAL_CALL GraphicDescriptor::release() // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GraphicDescriptor::getImplementationName() +OUString SAL_CALL GraphicDescriptor::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -247,11 +247,11 @@ void SAL_CALL GraphicDescriptor::release() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GraphicDescriptor::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -262,7 +262,7 @@ sal_Bool SAL_CALL GraphicDescriptor::supportsService( const rtl::OUString& Servi // ------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -307,7 +307,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() static ::comphelper::PropertyMapEntry aEntries[] = { { MAP_CHAR_LEN( "GraphicType" ), UNOGRAPHIC_GRAPHICTYPE, &::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "MimeType" ), UNOGRAPHIC_MIMETYPE, &::getCppuType( (const ::rtl::OUString*)(0)), beans::PropertyAttribute::READONLY, 0 }, + { MAP_CHAR_LEN( "MimeType" ), UNOGRAPHIC_MIMETYPE, &::getCppuType( (const OUString*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "SizePixel" ), UNOGRAPHIC_SIZEPIXEL, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "Size100thMM" ), UNOGRAPHIC_SIZE100THMM, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "BitsPerPixel" ), UNOGRAPHIC_BITSPERPIXEL, &::getCppuType( (const sal_uInt8*)(0)), beans::PropertyAttribute::READONLY, 0 }, @@ -358,7 +358,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** case( UNOGRAPHIC_MIMETYPE ): { - ::rtl::OUString aMimeType; + OUString aMimeType; if( mpGraphic ) { @@ -384,11 +384,11 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** } if( pMimeType ) - aMimeType = ::rtl::OUString::createFromAscii( pMimeType ); + aMimeType = OUString::createFromAscii( pMimeType ); } if( aMimeType.isEmpty() && ( mpGraphic->GetType() != GRAPHIC_NONE ) ) - aMimeType = ::rtl::OUString(MIMETYPE_VCLGRAPHIC ); + aMimeType = OUString(MIMETYPE_VCLGRAPHIC ); } else aMimeType = maMimeType; diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx index aab4b13f74fc..e5babc70764e 100644 --- a/svtools/source/graphic/descriptor.hxx +++ b/svtools/source/graphic/descriptor.hxx @@ -77,11 +77,11 @@ public: ~GraphicDescriptor() throw(); void init( const ::Graphic& rGraphic ) throw(); - void init( const ::rtl::OUString& rURL ) throw(); - void init( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxIStm, const ::rtl::OUString& rURL ) throw(); + void init( const OUString& rURL ) throw(); + void init( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxIStm, const OUString& rURL ) throw(); - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: @@ -94,9 +94,9 @@ protected: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -110,7 +110,7 @@ private: const ::Graphic* mpGraphic; GraphicType meType; - ::rtl::OUString maMimeType; + OUString maMimeType; Size maSizePixel; Size maSize100thMM; sal_uInt16 mnBitsPerPixel; @@ -122,7 +122,7 @@ private: GraphicDescriptor& operator=( const GraphicDescriptor& ); - void implCreate( SvStream& rIStm, const ::rtl::OUString* pPath ); + void implCreate( SvStream& rIStm, const OUString* pPath ); }; } diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index ee322a14152a..a3c17517fb11 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -116,27 +116,27 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static() // ------------------------------------------------------------------------------ -::rtl::OUString Graphic::getImplementationName_Static() +OUString Graphic::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.graphic.Graphic" ); + return OUString( "com.sun.star.comp.graphic.Graphic" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > Graphic::getSupportedServiceNames_Static() +uno::Sequence< OUString > Graphic::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.Graphic" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.Graphic" ); return aSeq; } // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL Graphic::getImplementationName() +OUString SAL_CALL Graphic::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -144,15 +144,15 @@ uno::Sequence< ::rtl::OUString > Graphic::getSupportedServiceNames_Static() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL Graphic::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool SAL_CALL Graphic::supportsService( const OUString& rServiceName ) throw( uno::RuntimeException ) { if( ::unographic::GraphicDescriptor::supportsService( rServiceName ) ) return true; else { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == rServiceName ) @@ -164,11 +164,11 @@ sal_Bool SAL_CALL Graphic::supportsService( const ::rtl::OUString& rServiceName // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL Graphic::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Graphic::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() ); - uno::Sequence< ::rtl::OUString > aNew( getSupportedServiceNames_Static() ); + uno::Sequence< OUString > aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() ); + uno::Sequence< OUString > aNew( getSupportedServiceNames_Static() ); sal_Int32 nOldCount = aRet.getLength(); aRet.realloc( nOldCount + aNew.getLength() ); diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx index 33319357b83b..adecace1c5ce 100644 --- a/svtools/source/graphic/graphic.hxx +++ b/svtools/source/graphic/graphic.hxx @@ -54,8 +54,8 @@ public: static const ::Graphic* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); static ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: @@ -66,9 +66,9 @@ protected: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx index bcd652c14057..b7fffe7645ec 100644 --- a/svtools/source/graphic/graphicunofactory.cxx +++ b/svtools/source/graphic/graphicunofactory.cxx @@ -42,17 +42,17 @@ public: // XGraphicObject virtual uno::Reference< graphic::XGraphic > SAL_CALL getGraphic() throw (uno::RuntimeException); virtual void SAL_CALL setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) throw (uno::RuntimeException); - ::rtl::OUString SAL_CALL getUniqueID() throw (uno::RuntimeException); + OUString SAL_CALL getUniqueID() throw (uno::RuntimeException); }; GObjectImpl::GObjectImpl( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & /*xComponentContext*/ ) throw (uno::RuntimeException) { if ( args.getLength() == 1 ) { - rtl::OUString sId; + OUString sId; if ( !( args[ 0 ] >>= sId ) || sId.isEmpty() ) throw lang::IllegalArgumentException(); - rtl::OString bsId(rtl::OUStringToOString(sId, RTL_TEXTENCODING_UTF8)); + OString bsId(OUStringToOString(sId, RTL_TEXTENCODING_UTF8)); mpGObject.reset( new GraphicObject( bsId ) ); } else @@ -76,12 +76,12 @@ void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic > mpGObject->SetGraphic( aGraphic ); } -::rtl::OUString SAL_CALL GObjectImpl::getUniqueID() throw (uno::RuntimeException) +OUString SAL_CALL GObjectImpl::getUniqueID() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - rtl::OUString sId; + OUString sId; if ( mpGObject.get() ) - sId = rtl::OStringToOUString(mpGObject->GetUniqueID(), RTL_TEXTENCODING_ASCII_US); + sId = OStringToOUString(mpGObject->GetUniqueID(), RTL_TEXTENCODING_ASCII_US); return sId; } diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 0e5a763e9a32..372ecf96f1e0 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -56,7 +56,7 @@ public: rID.mnID3 == mnID3 && rID.mnID4 == mnID4 ); } - rtl::OString GetIDString() const; + OString GetIDString() const; sal_Bool IsEmpty() const { return( 0 == mnID4 ); } }; @@ -118,9 +118,9 @@ GraphicID::GraphicID( const GraphicObject& rObj ) } } -rtl::OString GraphicID::GetIDString() const +OString GraphicID::GetIDString() const { - rtl::OStringBuffer aHexStr; + OStringBuffer aHexStr; sal_Int32 nShift, nIndex = 0; aHexStr.setLength(32); @@ -845,7 +845,7 @@ GraphicCache::~GraphicCache() void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute, - const rtl::OString* pID, + const OString* pID, const GraphicObject* pCopyObj ) { @@ -1103,9 +1103,9 @@ sal_Bool GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, c return bFound; } -rtl::OString GraphicCache::GetUniqueID( const GraphicObject& rObj ) const +OString GraphicCache::GetUniqueID( const GraphicObject& rObj ) const { - rtl::OString aRet; + OString aRet; GraphicCacheEntry* pEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj ); // ensure that the entry is correctly initialized (it has to be read at least once) diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index 1ae4c00cc63c..ac5428729200 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -67,7 +67,7 @@ public: void AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute, - const rtl::OString* pID, + const OString* pID, const GraphicObject* pCopyObj ); @@ -77,7 +77,7 @@ public: sal_Bool FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); void GraphicObjectWasSwappedIn( const GraphicObject& rObj ); - rtl::OString GetUniqueID( const GraphicObject& rObj ) const; + OString GetUniqueID( const GraphicObject& rObj ) const; public: diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 3d21da07c949..136aa578e961 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -89,7 +89,7 @@ GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicMan ImplSetGraphicManager( pMgr, NULL, &rGraphicObj ); } -GraphicObject::GraphicObject( const rtl::OString& rUniqueID, const GraphicManager* pMgr ) : +GraphicObject::GraphicObject( const OString& rUniqueID, const GraphicManager* pMgr ) : mpLink ( NULL ), mpUserData ( NULL ) { @@ -146,7 +146,7 @@ void GraphicObject::ImplAssignGraphicData() mnAnimationLoopCount = ( mbAnimated ? maGraphic.GetAnimationLoopCount() : 0 ); } -void GraphicObject::ImplSetGraphicManager( const GraphicManager* pMgr, const rtl::OString* pID, const GraphicObject* pCopyObj ) +void GraphicObject::ImplSetGraphicManager( const GraphicManager* pMgr, const OString* pID, const GraphicObject* pCopyObj ) { if( !mpMgr || ( pMgr != mpMgr ) ) { @@ -208,7 +208,7 @@ void GraphicObject::ImplAutoSwapIn() { if( HasLink() ) { - rtl::OUString aURLStr; + OUString aURLStr; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( GetLink(), aURLStr ) ) { @@ -364,12 +364,12 @@ void GraphicObject::Assign( const SvDataCopyStream& rCopyStream ) *this = (const GraphicObject& ) rCopyStream; } -rtl::OString GraphicObject::GetUniqueID() const +OString GraphicObject::GetUniqueID() const { if ( !IsInSwapIn() && IsEPS() ) const_cast(this)->FireSwapInRequest(); - rtl::OString aRet; + OString aRet; if( mpMgr ) aRet = mpMgr->ImplGetUniqueID( *this ); @@ -1096,7 +1096,7 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) if( bLink ) { - rtl::OUString aLink = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); + OUString aLink = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); rGraphicObj.SetLink(aLink); } else @@ -1122,13 +1122,13 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) #define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" -GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString &rURL ) +GraphicObject GraphicObject::CreateGraphicObjectFromURL( const OUString &rURL ) { const String aURL( rURL ), aPrefix( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX) ); if( aURL.Search( aPrefix ) == 0 ) { // graphic manager url - rtl::OString aUniqueID(rtl::OUStringToOString(rURL.copy(sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX) - 1), RTL_TEXTENCODING_UTF8)); + OString aUniqueID(OUStringToOString(rURL.copy(sizeof(UNO_NAME_GRAPHOBJ_URLPREFIX) - 1), RTL_TEXTENCODING_UTF8)); return GraphicObject( aUniqueID ); } else @@ -1146,16 +1146,16 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString & } void -GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& xIf, std::vector< rtl::OUString >& rvEmbedImgUrls ) +GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& xIf, std::vector< OUString >& rvEmbedImgUrls ) { - static rtl::OUString sImageURL( "ImageURL" ); + static OUString sImageURL( "ImageURL" ); Reference< XPropertySet > xProps( xIf, UNO_QUERY ); if ( xProps.is() ) { if ( xProps->getPropertySetInfo()->hasPropertyByName( sImageURL ) ) { - rtl::OUString sURL; + OUString sURL; xProps->getPropertyValue( sImageURL ) >>= sURL; if ( !sURL.isEmpty() && sURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) rvEmbedImgUrls.push_back( sURL ); @@ -1164,7 +1164,7 @@ GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& x Reference< XNameContainer > xContainer( xIf, UNO_QUERY ); if ( xContainer.is() ) { - Sequence< rtl::OUString > sNames = xContainer->getElementNames(); + Sequence< OUString > sNames = xContainer->getElementNames(); sal_Int32 nContainees = sNames.getLength(); for ( sal_Int32 index = 0; index < nContainees; ++index ) { diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 6439ff7b37c4..7eb8233fb9fa 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -139,7 +139,7 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si } void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute, - const rtl::OString* pID, const GraphicObject* pCopyObj ) + const OString* pID, const GraphicObject* pCopyObj ) { maObjList.push_back( (GraphicObject*)&rObj ); mpCache->AddGraphicObject( rObj, rSubstitute, pID, pCopyObj ); @@ -162,7 +162,7 @@ void GraphicManager::ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj ) mpCache->GraphicObjectWasSwappedOut( rObj ); } -rtl::OString GraphicManager::ImplGetUniqueID( const GraphicObject& rObj ) const +OString GraphicManager::ImplGetUniqueID( const GraphicObject& rObj ) const { return mpCache->GetUniqueID( rObj ); } diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index e7435569d400..18a68f9fe36e 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -67,27 +67,27 @@ GraphicProvider::~GraphicProvider() // ------------------------------------------------------------------------------ -::rtl::OUString GraphicProvider::getImplementationName_Static() +OUString GraphicProvider::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicProvider" ); + return OUString( "com.sun.star.comp.graphic.GraphicProvider" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GraphicProvider::getSupportedServiceNames_Static() +uno::Sequence< OUString > GraphicProvider::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicProvider" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.GraphicProvider" ); return aSeq; } // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GraphicProvider::getImplementationName() +OUString SAL_CALL GraphicProvider::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -95,11 +95,11 @@ uno::Sequence< ::rtl::OUString > GraphicProvider::getSupportedServiceNames_Stati // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GraphicProvider::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GraphicProvider::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -110,7 +110,7 @@ sal_Bool SAL_CALL GraphicProvider::supportsService( const ::rtl::OUString& Servi // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GraphicProvider::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GraphicProvider::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -144,14 +144,14 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() // ------------------------------------------------------------------------------ -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const ::rtl::OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL ) const { uno::Reference< ::graphic::XGraphic > xRet; if( rResourceURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) { // graphic manager url String aTmpStr( rResourceURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ) ); - rtl::OString aUniqueID(rtl::OUStringToOString(aTmpStr, + OString aUniqueID(OUStringToOString(aTmpStr, RTL_TEXTENCODING_UTF8)); GraphicObject aGrafObj(aUniqueID); // I don't call aGrafObj.GetXGraphic because it will call us back @@ -163,7 +163,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( co return xRet; } -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const ::rtl::OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUString& rResourceURL ) const { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; @@ -186,7 +186,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const ::r // ------------------------------------------------------------------------------ -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const ::rtl::OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL ) const { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; @@ -207,14 +207,14 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( // ------------------------------------------------------------------------------ -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const ::rtl::OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL ) const { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:standardimage" ) ) ) { - rtl::OUString sImageName( rResourceURL.copy( nIndex ) ); + OUString sImageName( rResourceURL.copy( nIndex ) ); if ( sImageName == "info" ) { xRet = InfoBox::GetStandardImage().GetXGraphic(); @@ -270,21 +270,21 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno // ------------------------------------------------------------------------------ -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const ::rtl::OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) const { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:resource" ) ) ) { - rtl::OString aResMgrName(rtl::OUStringToOString( + OString aResMgrName(OUStringToOString( rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US)); ResMgr* pResMgr = ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() ); if( pResMgr ) { - const ::rtl::OUString aResourceType( rResourceURL.getToken( 0, '/', nIndex ) ); + const OUString aResourceType( rResourceURL.getToken( 0, '/', nIndex ) ); const ResId aResId( rResourceURL.getToken( 0, '/', nIndex ).toInt32(), *pResMgr ); if( !aResourceType.isEmpty() ) @@ -355,13 +355,13 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc { uno::Reference< beans::XPropertySet > xRet; - ::rtl::OUString aURL; + OUString aURL; uno::Reference< io::XInputStream > xIStm; uno::Reference< awt::XBitmap >xBtm; for( sal_Int32 i = 0; ( i < rMediaProperties.getLength() ) && !xRet.is(); ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const OUString aName( rMediaProperties[ i ].Name ); const uno::Any aValue( rMediaProperties[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) ) @@ -435,12 +435,12 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co for( sal_Int32 i = 0; ( i < rMediaProperties.getLength() ) && !pIStm && !xRet.is(); ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const OUString aName( rMediaProperties[ i ].Name ); const uno::Any aValue( rMediaProperties[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) ) { - ::rtl::OUString aURL; + OUString aURL; aValue >>= aURL; aPath = aURL; } @@ -464,7 +464,7 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co sal_uInt16 nExtMapMode = 0; for( sal_Int32 i = 0; i < aFilterData.getLength(); ++i ) { - const ::rtl::OUString aName( aFilterData[ i ].Name ); + const OUString aName( aFilterData[ i ].Name ); const uno::Any aValue( aFilterData[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "ExternalWidth" ) ) @@ -637,7 +637,7 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal for( sal_Int32 i = 0; i < rFilterData.getLength(); ++i ) { - const ::rtl::OUString aName( rFilterData[ i ].Name ); + const OUString aName( rFilterData[ i ].Name ); const uno::Any aValue( rFilterData[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "PixelWidth" ) ) @@ -773,12 +773,12 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG for( i = 0; ( i < rMediaProperties.getLength() ) && !pOStm; ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const OUString aName( rMediaProperties[ i ].Name ); const uno::Any aValue( rMediaProperties[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) ) { - ::rtl::OUString aURL; + OUString aURL; aValue >>= aURL; pOStm = ::utl::UcbStreamHelper::CreateStream( aURL, STREAM_WRITE | STREAM_TRUNC ); @@ -802,7 +802,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG for( i = 0; i < rMediaProperties.getLength(); ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const OUString aName( rMediaProperties[ i ].Name ); const uno::Any aValue( rMediaProperties[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "FilterData" ) ) @@ -811,7 +811,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG } else if( COMPARE_EQUAL == aName.compareToAscii( "MimeType" ) ) { - ::rtl::OUString aMimeType; + OUString aMimeType; aValue >>= aMimeType; @@ -876,7 +876,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG else { rFilter.ExportGraphic( aGraphic, aPath, aMemStrm, - rFilter.GetExportFormatNumberForShortName( ::rtl::OUString::createFromAscii( pFilterShortName ) ), + rFilter.GetExportFormatNumberForShortName( OUString::createFromAscii( pFilterShortName ) ), ( aFilterDataSeq.getLength() ? &aFilterDataSeq : NULL ) ); } aMemStrm.Seek( STREAM_SEEK_TO_END ); diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 2f90fa39a885..95097fbe7bd1 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -64,20 +64,20 @@ GraphicRendererVCL::~GraphicRendererVCL() // ------------------------------------------------------------------------------ -::rtl::OUString GraphicRendererVCL::getImplementationName_Static() +OUString GraphicRendererVCL::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicRendererVCL" ); + return OUString( "com.sun.star.comp.graphic.GraphicRendererVCL" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GraphicRendererVCL::getSupportedServiceNames_Static() +uno::Sequence< OUString > GraphicRendererVCL::getSupportedServiceNames_Static() throw( ) { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicRendererVCL" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.GraphicRendererVCL" ); return aSeq; } @@ -133,7 +133,7 @@ void SAL_CALL GraphicRendererVCL::release() // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GraphicRendererVCL::getImplementationName() +OUString SAL_CALL GraphicRendererVCL::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -141,11 +141,11 @@ void SAL_CALL GraphicRendererVCL::release() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -156,7 +156,7 @@ sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const rtl::OUString& Serv // ------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 4057f6a5180d..35233046d4d8 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -87,7 +87,7 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserReq xWindow->setVisible( sal_False ); // reparent the window - xWinPeer->setProperty( ::rtl::OUString( "PluginParent" ), + xWinPeer->setProperty( OUString( "PluginParent" ), uno::makeAny( (sal_Int64) 0 ) ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -206,13 +206,13 @@ void SAL_CALL ODocumentCloser::initialize( const uno::Sequence< uno::Any >& aArg sal_Int32 nLen = aArguments.getLength(); if ( nLen != 1 ) throw lang::IllegalArgumentException( - ::rtl::OUString("Wrong count of parameters!" ), + OUString("Wrong count of parameters!" ), uno::Reference< uno::XInterface >(), 0 ); if ( !( aArguments[0] >>= m_xFrame ) || !m_xFrame.is() ) throw lang::IllegalArgumentException( - ::rtl::OUString("Nonempty reference is expected as the first argument!" ), + OUString("Nonempty reference is expected as the first argument!" ), uno::Reference< uno::XInterface >(), 0 ); @@ -222,17 +222,17 @@ void SAL_CALL ODocumentCloser::initialize( const uno::Sequence< uno::Any >& aArg // XServiceInfo // -------------------------------------------------------- -::rtl::OUString SAL_CALL ODocumentCloser::getImplementationName( ) +OUString SAL_CALL ODocumentCloser::getImplementationName( ) throw (uno::RuntimeException) { return impl_staticGetImplementationName(); } // -------------------------------------------------------- -::sal_Bool SAL_CALL ODocumentCloser::supportsService( const ::rtl::OUString& ServiceName ) +::sal_Bool SAL_CALL ODocumentCloser::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName.compareTo( aSeq[nInd] ) == 0 ) @@ -242,7 +242,7 @@ void SAL_CALL ODocumentCloser::initialize( const uno::Sequence< uno::Any >& aArg } // -------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames() throw (uno::RuntimeException) { return impl_staticGetSupportedServiceNames(); @@ -250,16 +250,16 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::getSupportedServiceNa // Static methods // -------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL ODocumentCloser::impl_staticGetSupportedServiceNames() { - const rtl::OUString aServiceName( "com.sun.star.embed.DocumentCloser" ); - return uno::Sequence< rtl::OUString >( &aServiceName, 1 ); + const OUString aServiceName( "com.sun.star.embed.DocumentCloser" ); + return uno::Sequence< OUString >( &aServiceName, 1 ); } // -------------------------------------------------------- -::rtl::OUString SAL_CALL ODocumentCloser::impl_staticGetImplementationName() +OUString SAL_CALL ODocumentCloser::impl_staticGetImplementationName() { - return rtl::OUString( "com.sun.star.comp.embed.DocumentCloser" ); + return OUString( "com.sun.star.comp.embed.DocumentCloser" ); } // -------------------------------------------------------- diff --git a/svtools/source/hatchwindow/documentcloser.hxx b/svtools/source/hatchwindow/documentcloser.hxx index c07168634ed7..f5658229d80f 100644 --- a/svtools/source/hatchwindow/documentcloser.hxx +++ b/svtools/source/hatchwindow/documentcloser.hxx @@ -53,10 +53,10 @@ public: ODocumentCloser( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); ~ODocumentCloser(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -71,9 +71,9 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index 033710bc439a..5f93ebdc3b2b 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -28,18 +28,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OHatchWindowFactory::impl_staticGetSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::impl_staticGetSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString( "com.sun.star.embed.HatchWindowFactory" ); - aRet[1] = ::rtl::OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString( "com.sun.star.embed.HatchWindowFactory" ); + aRet[1] = OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OHatchWindowFactory::impl_staticGetImplementationName() +OUString SAL_CALL OHatchWindowFactory::impl_staticGetImplementationName() { - return ::rtl::OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); + return OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); } //------------------------------------------------------------------------- @@ -67,17 +67,17 @@ uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchW } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OHatchWindowFactory::getImplementationName() +OUString SAL_CALL OHatchWindowFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OHatchWindowFactory::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OHatchWindowFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName.compareTo( aSeq[nInd] ) == 0 ) @@ -87,7 +87,7 @@ sal_Bool SAL_CALL OHatchWindowFactory::supportsService( const ::rtl::OUString& S } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OHatchWindowFactory::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/svtools/source/hatchwindow/hatchwindowfactory.hxx b/svtools/source/hatchwindow/hatchwindowfactory.hxx index 205f82742356..9f9e68541df8 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.hxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.hxx @@ -41,9 +41,9 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); + static OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -54,9 +54,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XHatchWindow > SAL_CALL createHatchWindowInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent, const ::com::sun::star::awt::Rectangle& aBounds, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx index c1c111a4405c..6095e5f8fed1 100644 --- a/svtools/source/inc/provider.hxx +++ b/svtools/source/inc/provider.hxx @@ -40,15 +40,15 @@ public: GraphicProvider(); ~GraphicProvider(); - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -61,12 +61,12 @@ protected: private: - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const ::rtl::OUString& rResourceURL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadGraphicObject( const ::rtl::OUString& rResourceURL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadResource( const ::rtl::OUString& rResourceURL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadRepositoryImage( const ::rtl::OUString& rResourceURL ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadResource( const OUString& rResourceURL ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL ) const; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rBitmap ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadStandardImage( const ::rtl::OUString& rResourceURL ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL ) const; }; } diff --git a/svtools/source/inc/renderer.hxx b/svtools/source/inc/renderer.hxx index 69a662c40001..58d2774c8a82 100644 --- a/svtools/source/inc/renderer.hxx +++ b/svtools/source/inc/renderer.hxx @@ -49,8 +49,8 @@ public: GraphicRendererVCL(); ~GraphicRendererVCL() throw(); - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: @@ -63,9 +63,9 @@ protected: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index f047c1df37c1..d7be59c24710 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -76,10 +76,10 @@ public: // ::com::sun::star::awt::XTextComponent void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException); @@ -88,7 +88,7 @@ public: sal_Int16 SAL_CALL getMaxTextLen( ) throw(::com::sun::star::uno::RuntimeException); //XTextArea - ::rtl::OUString SAL_CALL getTextLines( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getTextLines( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XLayoutConstrains ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException); @@ -100,8 +100,8 @@ public: void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XWindow void SAL_CALL setFocus( ) throw(::com::sun::star::uno::RuntimeException); @@ -138,10 +138,10 @@ public: // ::com::sun::star::awt::XTextComponent void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException); @@ -158,7 +158,7 @@ public: ::com::sun::star::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -183,8 +183,8 @@ public: ~SVTXFormattedField(); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); protected: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getFormatsSupplier(void) const; @@ -231,7 +231,7 @@ struct RMItemData { sal_Bool b_Enabled; sal_Int32 n_ID; - ::rtl::OUString Label; + OUString Label; }; typedef ::cppu::ImplInheritanceHelper3 < VCLXGraphicControl @@ -261,9 +261,9 @@ public: void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { VCLXWindow::disposing( Source ); } // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // XContainerListener void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); @@ -347,8 +347,8 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XCurrencyField void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException); @@ -407,8 +407,8 @@ public: sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -424,7 +424,7 @@ public: ~SVTXDateField(); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index 279b9d2e7370..93e42e3c3a1a 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -61,7 +61,7 @@ void SAL_CALL JavaContext::release( ) throw () delete this; } -Any SAL_CALL JavaContext::getValueByName( const ::rtl::OUString& Name) throw (RuntimeException) +Any SAL_CALL JavaContext::getValueByName( const OUString& Name) throw (RuntimeException) { Any retVal; diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index b167234f937d..b86d31aed27c 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -178,7 +178,7 @@ sal_Bool AcceleratorExecute::execute(const KeyCode& aVCLKey) //----------------------------------------------- sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) { - ::rtl::OUString sCommand = impl_ts_findCommand(aAWTKey); + OUString sCommand = impl_ts_findCommand(aAWTKey); // No Command found? Do nothing! User isnt interested on any error handling .-) if (sCommand.isEmpty()) @@ -199,7 +199,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) xParser->parseStrict(aURL); // ask for dispatch object - css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, ::rtl::OUString(), 0); + css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, OUString(), 0); sal_Bool bRet = xDispatch.is(); if ( bRet ) { @@ -241,12 +241,12 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) return KeyCode(nKey, bShift, bMod1, bMod2, bMod3); } //----------------------------------------------- -::rtl::OUString AcceleratorExecute::findCommand(const css::awt::KeyEvent& aKey) +OUString AcceleratorExecute::findCommand(const css::awt::KeyEvent& aKey) { return impl_ts_findCommand(aKey); } //----------------------------------------------- -::rtl::OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey) +OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey) { // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -258,7 +258,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) aLock.clear(); // <- SAFE ---------------------------------- - ::rtl::OUString sCommand; + OUString sCommand; try { @@ -296,71 +296,71 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) switch( aKey.KeyCode ) { case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: - return rtl::OUString( ".uno:DelToStartOfLine" ); + return OUString( ".uno:DelToStartOfLine" ); case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: - return rtl::OUString( ".uno:DelToEndOfLine" ); + return OUString( ".uno:DelToEndOfLine" ); case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: - return rtl::OUString( ".uno:DelToStartOfPara" ); + return OUString( ".uno:DelToStartOfPara" ); case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH: - return rtl::OUString( ".uno:DelToEndOfPara" ); + return OUString( ".uno:DelToEndOfPara" ); case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: - return rtl::OUString( ".uno:DelToStartOfWord" ); + return OUString( ".uno:DelToStartOfWord" ); case com::sun::star::awt::Key::DELETE_WORD_FORWARD: - return rtl::OUString( ".uno:DelToEndOfWord" ); + return OUString( ".uno:DelToEndOfWord" ); case com::sun::star::awt::Key::INSERT_LINEBREAK: - return rtl::OUString( ".uno:InsertLinebreak" ); + return OUString( ".uno:InsertLinebreak" ); case com::sun::star::awt::Key::INSERT_PARAGRAPH: - return rtl::OUString( ".uno:InsertPara" ); + return OUString( ".uno:InsertPara" ); case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: - return rtl::OUString( ".uno:GoToPrevWord" ); + return OUString( ".uno:GoToPrevWord" ); case com::sun::star::awt::Key::MOVE_WORD_FORWARD: - return rtl::OUString( ".uno:GoToNextWord" ); + return OUString( ".uno:GoToNextWord" ); case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: - return rtl::OUString( ".uno:GoToStartOfLine" ); + return OUString( ".uno:GoToStartOfLine" ); case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: - return rtl::OUString( ".uno:GoToEndOfLine" ); + return OUString( ".uno:GoToEndOfLine" ); case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: - return rtl::OUString( ".uno:GoToStartOfPara" ); + return OUString( ".uno:GoToStartOfPara" ); case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: - return rtl::OUString( ".uno:GoToEndOfPara" ); + return OUString( ".uno:GoToEndOfPara" ); case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: - return rtl::OUString( ".uno:GoToStartOfDoc" ); + return OUString( ".uno:GoToStartOfDoc" ); case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: - return rtl::OUString( ".uno:GoToEndOfDoc" ); + return OUString( ".uno:GoToEndOfDoc" ); case com::sun::star::awt::Key::SELECT_BACKWARD: - return rtl::OUString( ".uno:CharLeftSel" ); + return OUString( ".uno:CharLeftSel" ); case com::sun::star::awt::Key::SELECT_FORWARD: - return rtl::OUString( ".uno:CharRightSel" ); + return OUString( ".uno:CharRightSel" ); case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: - return rtl::OUString( ".uno:WordLeftSel" ); + return OUString( ".uno:WordLeftSel" ); case com::sun::star::awt::Key::SELECT_WORD_FORWARD: - return rtl::OUString( ".uno:WordRightSel" ); + return OUString( ".uno:WordRightSel" ); case com::sun::star::awt::Key::SELECT_WORD: - return rtl::OUString( ".uno:SelectWord" ); + return OUString( ".uno:SelectWord" ); case com::sun::star::awt::Key::SELECT_LINE: - return rtl::OUString(); + return OUString(); case com::sun::star::awt::Key::SELECT_PARAGRAPH: - return rtl::OUString( ".uno:SelectText" ); + return OUString( ".uno:SelectText" ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: - return rtl::OUString( ".uno:StartOfLineSel" ); + return OUString( ".uno:StartOfLineSel" ); case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: - return rtl::OUString( ".uno:EndOfLineSel" ); + return OUString( ".uno:EndOfLineSel" ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: - return rtl::OUString( ".uno:StartOfParaSel" ); + return OUString( ".uno:StartOfParaSel" ); case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: - return rtl::OUString( ".uno:EndOfParaSel" ); + return OUString( ".uno:EndOfParaSel" ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: - return rtl::OUString( ".uno:StartOfDocumentSel" ); + return OUString( ".uno:StartOfDocumentSel" ); case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: - return rtl::OUString( ".uno:EndOfDocumentSel" ); + return OUString( ".uno:EndOfDocumentSel" ); case com::sun::star::awt::Key::SELECT_ALL: - return rtl::OUString( ".uno:SelectAll" ); + return OUString( ".uno:SelectAll" ); default: break; } } - return ::rtl::OUString(); + return OUString(); } //----------------------------------------------- @@ -370,7 +370,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st css::uno::Reference< css::frame::XModuleManager2 > xModuleDetection( css::frame::ModuleManager::create(rxContext)); - ::rtl::OUString sModule; + OUString sModule; try { sModule = xModuleDetection->identify(xFrame); diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx index 904d2b5d768c..c6243c1c9169 100644 --- a/svtools/source/misc/bindablecontrolhelper.cxx +++ b/svtools/source/misc/bindablecontrolhelper.cxx @@ -38,10 +38,10 @@ namespace svt using namespace ::com::sun::star; -bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress ) +bool lcl_isNamedRange( const OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress ) { bool bRes = false; - const static rtl::OUString sNamedRanges("NamedRanges"); + const static OUString sNamedRanges("NamedRanges"); uno::Reference< sheet::XCellRangeReferrer > xReferrer; try { @@ -67,7 +67,7 @@ bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< fram void -BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource, sal_uInt16 nRefTab ) +BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab ) { // XBindable etc. uno::Reference< lang::XMultiServiceFactory > xFac; diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index c94ea3a2cce6..e6a9eff4184a 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -84,9 +84,9 @@ static sal_uInt16 aWndFunc( String aErr(SvtResId(STR_ERR_HDLMESS).toString()); String aAction(rAction); if ( aAction.Len() ) - aAction += rtl::OUString(":\n"); - aErr.SearchAndReplace(rtl::OUString("$(ACTION)"), aAction); - aErr.SearchAndReplace(rtl::OUString("$(ERROR)"), rErr); + aAction += OUString(":\n"); + aErr.SearchAndReplace(OUString("$(ACTION)"), aAction); + aErr.SearchAndReplace(OUString("$(ERROR)"), rErr); MessBox* pBox; switch ( nFlags & 0xf000 ) @@ -191,7 +191,7 @@ sal_Bool SfxErrorHandler::CreateString( StringErrorInfo *pStringInfo=PTR_CAST(StringErrorInfo,pErr); if(pStringInfo) { - rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), + rStr = rStr.replaceAll(OUString("$(ARG1)"), pStringInfo->GetErrorString()); } else @@ -349,7 +349,7 @@ sal_Bool SfxErrorHandler::GetErrorString( sal_uInt16 nResFlags = aErrorString.GetFlags(); if ( nResFlags ) nFlags = nResFlags; - rStr = rStr.replaceAll(rtl::OUString("$(ERROR)"), aErrorString.GetString()); + rStr = rStr.replaceAll(OUString("$(ERROR)"), aErrorString.GetString()); bRet = sal_True; } else @@ -362,8 +362,8 @@ sal_Bool SfxErrorHandler::GetErrorString( GetClassString(lErrId & ERRCODE_CLASS_MASK, aErrStr); if(aErrStr.Len()) - aErrStr += rtl::OUString(".\n"); - rStr = rStr.replaceAll(rtl::OUString("$(CLASS)"),aErrStr); + aErrStr += OUString(".\n"); + rStr = rStr.replaceAll(OUString("$(CLASS)"),aErrStr); } return bRet; @@ -417,7 +417,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr) if ( aTestEr ) { rStr = ( (ResString)aTestEr ).GetString(); - rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), aArg1 ); + rStr = rStr.replaceAll(OUString("$(ARG1)"), aArg1 ); bRet = true; } else @@ -431,7 +431,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr) sal_uInt16 nId = ( nErrId & ERRCODE_WARNING_MASK ) ? ERRCTX_WARNING : ERRCTX_ERROR; ResId aSfxResId( RID_ERRCTX, *pMgr ); ErrorResource_Impl aEr( aSfxResId, nId ); - rStr = rStr.replaceAll( rtl::OUString("$(ERR)"), ( (ResString)aEr ).GetString() ); + rStr = rStr.replaceAll( OUString("$(ERR)"), ( (ResString)aEr ).GetString() ); } } diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index ad57f9ff28e4..e074a30424de 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -222,8 +222,8 @@ struct EmbeddedObjectRef_Impl uno::Reference mxObj; EmbedEventListener_Impl* xListener; - ::rtl::OUString aPersistName; - ::rtl::OUString aMediaType; + OUString aPersistName; + OUString aMediaType; comphelper::EmbeddedObjectContainer* pContainer; Graphic* pGraphic; sal_Int64 nViewAspect; @@ -372,13 +372,13 @@ bool EmbeddedObjectRef::is() const return mpImpl->mxObj.is(); } -void EmbeddedObjectRef::AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const ::rtl::OUString& rPersistName ) +void EmbeddedObjectRef::AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const OUString& rPersistName ) { mpImpl->pContainer = pContainer; mpImpl->aPersistName = rPersistName; if ( mpImpl->pGraphic && !mpImpl->bNeedUpdate && pContainer ) - SetGraphicToContainer( *mpImpl->pGraphic, *pContainer, mpImpl->aPersistName, ::rtl::OUString() ); + SetGraphicToContainer( *mpImpl->pGraphic, *pContainer, mpImpl->aPersistName, OUString() ); } comphelper::EmbeddedObjectContainer* EmbeddedObjectRef::GetContainer() const @@ -411,7 +411,7 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate ) if ( bUpdate ) { DELETEZ( mpImpl->pGraphic ); - mpImpl->aMediaType = ::rtl::OUString(); + mpImpl->aMediaType = OUString(); mpImpl->pGraphic = new Graphic; mpImpl->mnGraphicVersion++; } @@ -510,7 +510,7 @@ Size EmbeddedObjectRef::GetSize( MapMode* pTargetMapMode ) const } void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream >& xInGrStream, - const ::rtl::OUString& rMediaType ) + const OUString& rMediaType ) { if ( mpImpl->pGraphic ) delete mpImpl->pGraphic; @@ -541,7 +541,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream } -void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const ::rtl::OUString& rMediaType ) +void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const OUString& rMediaType ) { if ( mpImpl->pGraphic ) delete mpImpl->pGraphic; @@ -617,7 +617,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const OUSt { MapMode aMM( MAP_APPFONT ); Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, NULL ); - Font aFnt( rtl::OUString("Helvetica"), aAppFontSz ); + Font aFnt( OUString("Helvetica"), aAppFontSz ); aFnt.SetTransparent( true ); aFnt.SetColor( Color( COL_LIGHTRED ) ); aFnt.SetWeight( WEIGHT_BOLD ); @@ -739,8 +739,8 @@ bool EmbeddedObjectRef::TryRunningState( const uno::Reference < embed::XEmbedded void EmbeddedObjectRef::SetGraphicToContainer( const Graphic& rGraphic, comphelper::EmbeddedObjectContainer& aContainer, - const ::rtl::OUString& aName, - const ::rtl::OUString& aMediaType ) + const OUString& aName, + const OUString& aMediaType ) { SvMemoryStream aStream; aStream.SetVersion( SOFFICE_FILEFORMAT_CURRENT ); @@ -758,7 +758,7 @@ void EmbeddedObjectRef::SetGraphicToContainer( const Graphic& rGraphic, uno::Reference< io::XInputStream > EmbeddedObjectRef::GetGraphicReplacementStream( sal_Int64 nViewAspect, const uno::Reference< embed::XEmbeddedObject >& xObj, - ::rtl::OUString* pMediaType ) + OUString* pMediaType ) throw() { return ::comphelper::EmbeddedObjectContainer::GetGraphicReplacementStream(nViewAspect,xObj,pMediaType); diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index 9dfb5208eeaf..3c87d03144e3 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -105,7 +105,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D if ( xPers.is() ) { uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetTemporaryStorage(); - ::rtl::OUString aName( "Dummy" ); + OUString aName( "Dummy" ); SvStream* pStream = NULL; sal_Bool bDeleteStream = sal_False; uno::Sequence < beans::PropertyValue > aEmpty; diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx index 7ee8d850c0ca..88342c6fe419 100644 --- a/svtools/source/misc/filechangedchecker.cxx +++ b/svtools/source/misc/filechangedchecker.cxx @@ -26,7 +26,7 @@ #include "svtools/filechangedchecker.hxx" -FileChangedChecker::FileChangedChecker(const rtl::OUString& rFilename, const ::boost::function0& rCallback) : +FileChangedChecker::FileChangedChecker(const OUString& rFilename, const ::boost::function0& rCallback) : mTimer(), mFileName(rFilename), mLastModTime(), diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 749bc20c01a7..fc5ce1cc5f4c 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -209,7 +209,7 @@ static String GetImageExtensionByFactory_Impl( const String& rURL ) if ( aPath.EqualsAscii( Fac2ExtMap_Impl[ nIndex ]._pFactory ) ) { // extension found - aExtension = rtl::OUString::createFromAscii(Fac2ExtMap_Impl[ nIndex ]._pExtension); + aExtension = OUString::createFromAscii(Fac2ExtMap_Impl[ nIndex ]._pExtension); // and return it return aExtension; } @@ -227,7 +227,7 @@ static String GetImageExtensionByFactory_Impl( const String& rURL ) xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", xContext), ::com::sun::star::uno::UNO_QUERY ); - ::rtl::OUString aInternalType = xTypeDetector->queryTypeByURL( rURL ); + OUString aInternalType = xTypeDetector->queryTypeByURL( rURL ); ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameAccess > xAccess( xTypeDetector, ::com::sun::star::uno::UNO_QUERY ); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aTypeProps; if ( !aInternalType.isEmpty() && xAccess->hasByName( aInternalType ) ) @@ -239,10 +239,10 @@ static String GetImageExtensionByFactory_Impl( const String& rURL ) const ::com::sun::star::beans::PropertyValue& rProp = aTypeProps[i]; if ( rProp.Name.compareToAscii("Extensions") == COMPARE_EQUAL ) { - ::com::sun::star::uno::Sequence < ::rtl::OUString > aExtensions; + ::com::sun::star::uno::Sequence < OUString > aExtensions; if ( ( rProp.Value >>= aExtensions ) && aExtensions.getLength() > 0 ) { - const ::rtl::OUString* pExtensions = aExtensions.getConstArray(); + const OUString* pExtensions = aExtensions.getConstArray(); aExtension = String( pExtensions[0] ); break; } @@ -454,7 +454,7 @@ static String GetDescriptionByFactory_Impl( const String& rFactory ) SolarMutexGuard aGuard; return SvtResId(nResId).toString(); } - return rtl::OUString(); + return OUString(); } static sal_uInt16 GetFolderDescriptionId_Impl( const String& rURL ) diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index b21d576ab632..40df75d7e98f 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -124,7 +124,7 @@ namespace svt //= GraphicAccess //==================================================================== //-------------------------------------------------------------------- - bool GraphicAccess::isSupportedURL( const ::rtl::OUString& _rURL ) + bool GraphicAccess::isSupportedURL( const OUString& _rURL ) { if ( ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/" ) ) == 0 ) || ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:graphicrepository/" ) ) == 0 ) @@ -137,7 +137,7 @@ namespace svt } //-------------------------------------------------------------------- - SvStream* GraphicAccess::getImageStream( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rImageResourceURL ) + SvStream* GraphicAccess::getImageStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL ) { SvStream* pReturn = NULL; @@ -148,7 +148,7 @@ namespace svt // let it create a graphic from the given URL Sequence< PropertyValue > aMediaProperties( 1 ); - aMediaProperties[0].Name = ::rtl::OUString( "URL" ); + aMediaProperties[0].Name = OUString( "URL" ); aMediaProperties[0].Value <<= _rImageResourceURL; Reference< XGraphic > xGraphic( xProvider->queryGraphic( aMediaProperties ) ); OSL_ENSURE( xGraphic.is(), "GraphicAccess::getImageStream: the provider did not give us a graphic object!" ); @@ -163,10 +163,10 @@ namespace svt ); aMediaProperties.realloc( 2 ); - aMediaProperties[0].Name = ::rtl::OUString( "OutputStream" ); + aMediaProperties[0].Name = OUString( "OutputStream" ); aMediaProperties[0].Value <<= xBufferAccess; - aMediaProperties[1].Name = ::rtl::OUString( "MimeType" ); - aMediaProperties[1].Value <<= ::rtl::OUString( "image/png" ); + aMediaProperties[1].Name = OUString( "MimeType" ); + aMediaProperties[1].Value <<= OUString( "image/png" ); xProvider->storeGraphic( xGraphic, aMediaProperties ); pMemBuffer->Seek( 0 ); @@ -181,7 +181,7 @@ namespace svt } //-------------------------------------------------------------------- - Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rImageResourceURL ) + Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL ) { return new OSeekableInputStreamWrapper( getImageStream( _rxContext, _rImageResourceURL ), sal_True ); // take ownership } diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index ea8e24fb7e92..597d90a34a3b 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -86,7 +86,7 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const rOStm << GetVersion(); rOStm << ( (sal_uInt16) eEncoding ); - const rtl::OString aRelURL = rtl::OUStringToOString( + const OString aRelURL = OUStringToOString( URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); write_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); write_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); @@ -951,7 +951,7 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const rOStm << IMAPMAGIC; rOStm << GetVersion(); write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); - write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); //dummy + write_lenPrefixed_uInt8s_FromOString(rOStm, OString()); //dummy rOStm << nCount; write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index 562daab907de..456db307cead 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -39,7 +39,7 @@ TYPEINIT0_AUTOFACTORY( ImageMap ); -void IMapObject::AppendCERNCoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const +void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const { const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); @@ -50,7 +50,7 @@ void IMapObject::AppendCERNCoords(rtl::OStringBuffer& rBuf, const Point& rPoint1 rBuf.append(RTL_CONSTASCII_STRINGPARAM(") ")); } -void IMapObject::AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const +void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const { const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); @@ -60,20 +60,20 @@ void IMapObject::AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint1 rBuf.append(' '); } -void IMapObject::AppendCERNURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const +void IMapObject::AppendCERNURL(OStringBuffer& rBuf, const String& rBaseURL) const { - rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding())); + rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding())); } -void IMapObject::AppendNCSAURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const +void IMapObject::AppendNCSAURL(OStringBuffer& rBuf, const String& rBaseURL) const { - rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding())); + rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding())); rBuf.append(' '); } void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rectangle ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rectangle ")); AppendCERNCoords(aStrBuf, aRect.TopLeft()); AppendCERNCoords(aStrBuf, aRect.BottomRight()); @@ -84,7 +84,7 @@ void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) c void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rect ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rect ")); AppendNCSAURL(aStrBuf, rBaseURL); AppendNCSACoords(aStrBuf, aRect.TopLeft()); @@ -95,7 +95,7 @@ void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) c void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle ")); AppendCERNCoords(aStrBuf, aCenter); aStrBuf.append(nRadius); @@ -107,7 +107,7 @@ void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) cons void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle ")); AppendNCSAURL(aStrBuf, rBaseURL); AppendNCSACoords(aStrBuf, aCenter); @@ -118,7 +118,7 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) cons void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("polygon ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("polygon ")); const sal_uInt16 nCount = aPoly.GetSize(); for (sal_uInt16 i = 0; i < nCount; ++i) @@ -131,7 +131,7 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) co void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const { - rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("poly ")); + OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("poly ")); const sal_uInt16 nCount = Min( aPoly.GetSize(), (sal_uInt16) 100 ); AppendNCSAURL(aStrBuf, rBaseURL); @@ -241,16 +241,16 @@ sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL ) // alten Inhalt loeschen ClearImageMap(); - rtl::OString aStr; + OString aStr; while ( rIStm.ReadLine( aStr ) ) ImpReadCERNLine( aStr, rBaseURL ); return IMAP_ERR_OK; } -void ImageMap::ImpReadCERNLine( const rtl::OString& rLine, const String& rBaseURL ) +void ImageMap::ImpReadCERNLine( const OString& rLine, const String& rBaseURL ) { - rtl::OString aStr = comphelper::string::stripStart(rLine, ' '); + OString aStr = comphelper::string::stripStart(rLine, ' '); aStr = comphelper::string::stripStart(aStr, '\t'); aStr = comphelper::string::remove(aStr, ';'); aStr = aStr.toAsciiLowerCase(); @@ -259,13 +259,13 @@ void ImageMap::ImpReadCERNLine( const rtl::OString& rLine, const String& rBaseUR char cChar = *pStr++; // Anweisung finden - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) ) { aBuf.append(cChar); cChar = *pStr++; } - rtl::OString aToken = aBuf.makeStringAndClear(); + OString aToken = aBuf.makeStringAndClear(); if ( NOTEOL( cChar ) ) { @@ -368,7 +368,7 @@ long ImageMap::ImpReadCERNRadius( const char** ppStr ) String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL ) { - rtl::OUString aStr(rtl::OUString::createFromAscii(*ppStr)); + OUString aStr(OUString::createFromAscii(*ppStr)); aStr = comphelper::string::stripStart(aStr, ' '); aStr = comphelper::string::stripStart(aStr, '\t'); @@ -383,16 +383,16 @@ sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL ) // alten Inhalt loeschen ClearImageMap(); - rtl::OString aStr; + OString aStr; while ( rIStm.ReadLine( aStr ) ) ImpReadNCSALine( aStr, rBaseURL ); return IMAP_ERR_OK; } -void ImageMap::ImpReadNCSALine( const rtl::OString& rLine, const String& rBaseURL ) +void ImageMap::ImpReadNCSALine( const OString& rLine, const String& rBaseURL ) { - rtl::OString aStr = comphelper::string::stripStart(rLine, ' '); + OString aStr = comphelper::string::stripStart(rLine, ' '); aStr = comphelper::string::stripStart(aStr, '\t'); aStr = comphelper::string::remove(aStr, ';'); aStr = aStr.toAsciiLowerCase(); @@ -401,13 +401,13 @@ void ImageMap::ImpReadNCSALine( const rtl::OString& rLine, const String& rBaseUR char cChar = *pStr++; // Anweisung finden - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) ) { aBuf.append(cChar); cChar = *pStr++; } - rtl::OString aToken = aBuf.makeStringAndClear(); + OString aToken = aBuf.makeStringAndClear(); if ( NOTEOL( cChar ) ) { @@ -519,7 +519,7 @@ sal_uLong ImageMap::ImpDetectFormat( SvStream& rIStm ) long nCount = 128; rIStm.Seek( nPos ); - rtl::OString aStr; + OString aStr; while ( rIStm.ReadLine( aStr ) && nCount-- ) { aStr = aStr.toAsciiLowerCase(); diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 584a205ed9a7..b83443d2754e 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -134,7 +134,7 @@ SvtLanguageTable::~SvtLanguageTable() //------------------------------------------------------------------------ -const rtl::OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const +const OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const { LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType, bUserInterfaceSelection); sal_uInt32 nPos = FindIndex( eLang ); diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index c6d7a719338f..59bd9094a039 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -66,7 +66,7 @@ bool canRenderNameOfSelectedFont(OutputDevice &rDevice) return !isSymbolFont(rFont) && (STRING_LEN == rDevice.HasGlyphs(rFont, rFont.GetName())); } -rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice) +OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice) { const bool bOpenSymbol = isOpenSymbolFont(rDevice.GetFont()); @@ -104,7 +104,7 @@ rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDe aText[ i+1 ] = 0; } - return rtl::OUString(aText); + return OUString(aText); } } @@ -113,9 +113,9 @@ rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDe static sal_Unicode aImplStarSymbolText[] = { 0x2706,0x2704,0x270D,0xE033,0x2211,0x2288,0}; const sal_Unicode* pText = bOpenSymbol ? aImplStarSymbolText : aImplSymbolFontText; - rtl::OUString sSampleText(pText); + OUString sSampleText(pText); bool bHasSampleTextGlyphs = (STRING_LEN == rDevice.HasGlyphs(rDevice.GetFont(), sSampleText)); - return bHasSampleTextGlyphs ? sSampleText : rtl::OUString(); + return bHasSampleTextGlyphs ? sSampleText : OUString(); } //These ones are typically for use in the font dropdown box beside the @@ -128,9 +128,9 @@ rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDe //readers of the minor languages, e.g. Yiddish is written with the HEBREW //script as well, the vast majority of Yiddish readers will be able to read //Hebrew as well. -rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) +OUString makeShortRepresentativeTextForScript(UScriptCode eScript) { - rtl::OUString sSampleText; + OUString sSampleText; switch (eScript) { case USCRIPT_GREEK: @@ -138,7 +138,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aGrek[] = { 0x0391, 0x03BB, 0x03C6, 0x03AC, 0x03B2, 0x03B7, 0x03C4, 0x03BF }; - sSampleText = rtl::OUString(aGrek, SAL_N_ELEMENTS(aGrek)); + sSampleText = OUString(aGrek, SAL_N_ELEMENTS(aGrek)); break; } case USCRIPT_HEBREW: @@ -148,7 +148,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x05BC, 0x05D9, 0x05EA, 0x0020, 0x05E2, 0x05B4, 0x05D1, 0x05B0, 0x05E8, 0x05B4, 0x05D9 }; - sSampleText = rtl::OUString(aHebr, SAL_N_ELEMENTS(aHebr)); + sSampleText = OUString(aHebr, SAL_N_ELEMENTS(aHebr)); break; } case USCRIPT_ARABIC: @@ -157,7 +157,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0623, 0x0628, 0x062C, 0x062F, 0x064A, 0x0629, 0x0020, 0x0639, 0x0631, 0x0628, 0x064A, 0x0629 }; - sSampleText = rtl::OUString(aArab, SAL_N_ELEMENTS(aArab)); + sSampleText = OUString(aArab, SAL_N_ELEMENTS(aArab)); break; } case USCRIPT_DEVANAGARI: @@ -165,7 +165,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aDeva[] = { 0x0926, 0x0947, 0x0935, 0x0928, 0x093E, 0x0917, 0x0930, 0x0940 }; - sSampleText = rtl::OUString(aDeva, SAL_N_ELEMENTS(aDeva)); + sSampleText = OUString(aDeva, SAL_N_ELEMENTS(aDeva)); break; } case USCRIPT_BENGALI: @@ -174,7 +174,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x09AC, 0x09BE, 0x0982, 0x09B2, 0x09BE, 0x0020, 0x09B2, 0x09BF, 0x09AA, 0x09BF }; - sSampleText = rtl::OUString(aBeng, SAL_N_ELEMENTS(aBeng)); + sSampleText = OUString(aBeng, SAL_N_ELEMENTS(aBeng)); break; } case USCRIPT_GURMUKHI: @@ -182,7 +182,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aGuru[] = { 0x0A17, 0x0A41, 0x0A30, 0x0A2E, 0x0A41, 0x0A16, 0x0A40 }; - sSampleText = rtl::OUString(aGuru, SAL_N_ELEMENTS(aGuru)); + sSampleText = OUString(aGuru, SAL_N_ELEMENTS(aGuru)); break; } case USCRIPT_GUJARATI: @@ -191,7 +191,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0A97, 0x0AC1, 0x0A9C, 0x0AB0, 0x0ABE, 0x0AA4, 0x0aC0, 0x0020, 0x0AB2, 0x0ABF, 0x0AAA, 0x0ABF }; - sSampleText = rtl::OUString(aGujr, SAL_N_ELEMENTS(aGujr)); + sSampleText = OUString(aGujr, SAL_N_ELEMENTS(aGujr)); break; } case USCRIPT_ORIYA: @@ -200,7 +200,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0B09, 0x0B24, 0x0B4D, 0x0B15, 0x0B33, 0x0020, 0x0B32, 0x0B3F, 0x0B2A, 0x0B3F }; - sSampleText = rtl::OUString(aOrya, SAL_N_ELEMENTS(aOrya)); + sSampleText = OUString(aOrya, SAL_N_ELEMENTS(aOrya)); break; } case USCRIPT_TAMIL: @@ -209,7 +209,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0B85, 0x0BB0, 0x0BBF, 0x0B9A, 0x0BCD, 0x0B9A, 0x0BC1, 0x0BB5, 0x0B9F, 0x0BBF }; - sSampleText = rtl::OUString(aTaml, SAL_N_ELEMENTS(aTaml)); + sSampleText = OUString(aTaml, SAL_N_ELEMENTS(aTaml)); break; } case USCRIPT_TELUGU: @@ -217,7 +217,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aTelu[] = { 0x0C24, 0x0C46, 0x0C32, 0x0C41, 0x0C17, 0x0C41 }; - sSampleText = rtl::OUString(aTelu, SAL_N_ELEMENTS(aTelu)); + sSampleText = OUString(aTelu, SAL_N_ELEMENTS(aTelu)); break; } case USCRIPT_KANNADA: @@ -226,7 +226,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0C95, 0x0CA8, 0x0CCD, 0x0CA8, 0x0CA1, 0x0020, 0x0CB2, 0x0CBF, 0x0CAA, 0x0CBF }; - sSampleText = rtl::OUString(aKnda, SAL_N_ELEMENTS(aKnda)); + sSampleText = OUString(aKnda, SAL_N_ELEMENTS(aKnda)); break; } case USCRIPT_MALAYALAM: @@ -235,7 +235,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0D2E, 0x0D32, 0x0D2F, 0x0D3E, 0x0D33, 0x0D32, 0x0D3F, 0x0D2A, 0x0D3F }; - sSampleText = rtl::OUString(aMlym, SAL_N_ELEMENTS(aMlym)); + sSampleText = OUString(aMlym, SAL_N_ELEMENTS(aMlym)); break; } case USCRIPT_THAI: @@ -243,7 +243,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aThai[] = { 0x0E2D, 0x0E31, 0x0E01, 0x0E29, 0x0E23, 0x0E44, 0x0E17, 0x0E22 }; - sSampleText = rtl::OUString(aThai, SAL_N_ELEMENTS(aThai)); + sSampleText = OUString(aThai, SAL_N_ELEMENTS(aThai)); break; } case USCRIPT_LAO: @@ -252,7 +252,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0EAD, 0x0EB1, 0x0E81, 0x0EAA, 0x0EAD, 0x0E99, 0x0EA5, 0x0EB2, 0x0EA7 }; - sSampleText = rtl::OUString(aLao, SAL_N_ELEMENTS(aLao)); + sSampleText = OUString(aLao, SAL_N_ELEMENTS(aLao)); break; } case USCRIPT_GEORGIAN: @@ -261,7 +261,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x10D3, 0x10D0, 0x10DB, 0x10EC, 0x10D4, 0x10E0, 0x10DA, 0x10DD, 0x10D1, 0x10D0 }; - sSampleText = rtl::OUString(aGeorgian, SAL_N_ELEMENTS(aGeorgian)); + sSampleText = OUString(aGeorgian, SAL_N_ELEMENTS(aGeorgian)); break; } case USCRIPT_HANGUL: @@ -270,7 +270,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aHang[] = { 0xD55C, 0xAE00 }; - sSampleText = rtl::OUString(aHang, SAL_N_ELEMENTS(aHang)); + sSampleText = OUString(aHang, SAL_N_ELEMENTS(aHang)); break; } case USCRIPT_TIBETAN: @@ -278,7 +278,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aTibt[] = { 0x0F51, 0x0F56, 0x0F74, 0x0F0B, 0x0F45, 0x0F53, 0x0F0B }; - sSampleText = rtl::OUString(aTibt, SAL_N_ELEMENTS(aTibt)); + sSampleText = OUString(aTibt, SAL_N_ELEMENTS(aTibt)); break; } case USCRIPT_SYRIAC: @@ -286,7 +286,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aSyri[] = { 0x0723, 0x071B, 0x072A, 0x0722, 0x0713, 0x0720, 0x0710 }; - sSampleText = rtl::OUString(aSyri, SAL_N_ELEMENTS(aSyri)); + sSampleText = OUString(aSyri, SAL_N_ELEMENTS(aSyri)); break; } case USCRIPT_THAANA: @@ -294,7 +294,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aThaa[] = { 0x078C, 0x07A7, 0x0782, 0x07A6 }; - sSampleText = rtl::OUString(aThaa, SAL_N_ELEMENTS(aThaa)); + sSampleText = OUString(aThaa, SAL_N_ELEMENTS(aThaa)); break; } case USCRIPT_SINHALA: @@ -303,7 +303,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x0DC1, 0x0DD4, 0x0DAF, 0x0DCA, 0x0DB0, 0x0020, 0x0DC3, 0x0DD2, 0x0D82, 0x0DC4, 0x0DBD }; - sSampleText = rtl::OUString(aSinh, SAL_N_ELEMENTS(aSinh)); + sSampleText = OUString(aSinh, SAL_N_ELEMENTS(aSinh)); break; } case USCRIPT_MYANMAR: @@ -312,7 +312,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x1019, 0x103C, 0x1014, 0x103A, 0x1019, 0x102C, 0x1021, 0x1000, 0x1039, 0x1001, 0x101B, 0x102C }; - sSampleText = rtl::OUString(aMymr, SAL_N_ELEMENTS(aMymr)); + sSampleText = OUString(aMymr, SAL_N_ELEMENTS(aMymr)); break; } case USCRIPT_ETHIOPIC: @@ -320,7 +320,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aEthi[] = { 0x130D, 0x12D5, 0x12DD }; - sSampleText = rtl::OUString(aEthi, SAL_N_ELEMENTS(aEthi)); + sSampleText = OUString(aEthi, SAL_N_ELEMENTS(aEthi)); break; } case USCRIPT_CHEROKEE: @@ -328,7 +328,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aCher[] = { 0x13D7, 0x13AA, 0x13EA, 0x13B6, 0x13D9, 0x13D7 }; - sSampleText = rtl::OUString(aCher, SAL_N_ELEMENTS(aCher)); + sSampleText = OUString(aCher, SAL_N_ELEMENTS(aCher)); break; } case USCRIPT_KHMER: @@ -338,7 +338,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x1798, 0x1781, 0x17C1, 0x1798, 0x179A, 0x1797, 0x17B6, 0x179F, 0x17B6 }; - sSampleText = rtl::OUString(aKhmr, SAL_N_ELEMENTS(aKhmr)); + sSampleText = OUString(aKhmr, SAL_N_ELEMENTS(aKhmr)); break; } case USCRIPT_MONGOLIAN: @@ -346,7 +346,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aMongolian[] = { 0x182A, 0x1822, 0x1834, 0x1822, 0x182D, 0x180C }; - sSampleText = rtl::OUString(aMongolian, SAL_N_ELEMENTS(aMongolian)); + sSampleText = OUString(aMongolian, SAL_N_ELEMENTS(aMongolian)); break; } case USCRIPT_TAGALOG: @@ -354,7 +354,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aTagalog[] = { 0x170A, 0x170A, 0x170C, 0x1712 }; - sSampleText = rtl::OUString(aTagalog, SAL_N_ELEMENTS(aTagalog)); + sSampleText = OUString(aTagalog, SAL_N_ELEMENTS(aTagalog)); break; } case USCRIPT_NEW_TAI_LUE: @@ -362,7 +362,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aTalu[] = { 0x1991, 0x19BA, 0x199F, 0x19B9, 0x19C9 }; - sSampleText = rtl::OUString(aTalu, SAL_N_ELEMENTS(aTalu)); + sSampleText = OUString(aTalu, SAL_N_ELEMENTS(aTalu)); break; } case USCRIPT_TRADITIONAL_HAN: @@ -370,7 +370,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aHant[] = { 0x7E41 }; - sSampleText = rtl::OUString(aHant, SAL_N_ELEMENTS(aHant)); + sSampleText = OUString(aHant, SAL_N_ELEMENTS(aHant)); break; } case USCRIPT_SIMPLIFIED_HAN: @@ -378,7 +378,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aHans[] = { 0x7B80 }; - sSampleText = rtl::OUString(aHans, SAL_N_ELEMENTS(aHans)); + sSampleText = OUString(aHans, SAL_N_ELEMENTS(aHans)); break; } case USCRIPT_HAN: @@ -386,7 +386,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aSimplifiedAndTraditionalChinese[] = { 0x7B80, 0x7E41 }; - sSampleText = rtl::OUString(aSimplifiedAndTraditionalChinese, + sSampleText = OUString(aSimplifiedAndTraditionalChinese, SAL_N_ELEMENTS(aSimplifiedAndTraditionalChinese)); break; } @@ -395,7 +395,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aJpan[] = { 0x65E5, 0x672C, 0x8A9E }; - sSampleText = rtl::OUString(aJpan, SAL_N_ELEMENTS(aJpan)); + sSampleText = OUString(aJpan, SAL_N_ELEMENTS(aJpan)); break; } case USCRIPT_YI: @@ -403,7 +403,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aYiii[] = { 0xA188, 0xA320, 0xA071, 0xA0B7 }; - sSampleText = rtl::OUString(aYiii, SAL_N_ELEMENTS(aYiii)); + sSampleText = OUString(aYiii, SAL_N_ELEMENTS(aYiii)); break; } case USCRIPT_PHAGS_PA: @@ -412,7 +412,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0xA84F, 0xA861, 0xA843, 0x0020, 0xA863, 0xA861, 0xA859, 0x0020, 0xA850, 0xA85C, 0xA85E }; - sSampleText = rtl::OUString(aPhag, SAL_N_ELEMENTS(aPhag)); + sSampleText = OUString(aPhag, SAL_N_ELEMENTS(aPhag)); break; } case USCRIPT_TAI_LE: @@ -421,11 +421,11 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) 0x1956, 0x196D, 0x1970, 0x1956, 0x196C, 0x1973, 0x1951, 0x1968, 0x1952, 0x1970 }; - sSampleText = rtl::OUString(aTale, SAL_N_ELEMENTS(aTale)); + sSampleText = OUString(aTale, SAL_N_ELEMENTS(aTale)); break; } case USCRIPT_LATIN: - sSampleText = rtl::OUString("Lorem ipsum"); + sSampleText = OUString("Lorem ipsum"); break; default: break; @@ -433,9 +433,9 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript) return sSampleText; } -rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript) +OUString makeRepresentativeTextForScript(UScriptCode eScript) { - rtl::OUString sSampleText; + OUString sSampleText; switch (eScript) { case USCRIPT_TRADITIONAL_HAN: @@ -446,7 +446,7 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aZh[] = { 0x4EBA, 0x4E4B, 0x521D, 0x0020, 0x6027, 0x672C, 0x5584 }; - sSampleText = rtl::OUString(aZh, SAL_N_ELEMENTS(aZh)); + sSampleText = OUString(aZh, SAL_N_ELEMENTS(aZh)); break; } case USCRIPT_JAPANESE: @@ -455,7 +455,7 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript) const sal_Unicode aJa[] = { 0x7F8E, 0x3057, 0x3044, 0x65E5, 0x672C, 0x8A9E }; - sSampleText = rtl::OUString(aJa, SAL_N_ELEMENTS(aJa)); + sSampleText = OUString(aJa, SAL_N_ELEMENTS(aJa)); break; } case USCRIPT_KOREAN: @@ -466,7 +466,7 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript) 0xD0A4, 0xC2A4, 0xC758, 0x0020, 0xACE0, 0xC720, 0xC870, 0xAC74, 0xC740 }; - sSampleText = rtl::OUString(aKo, SAL_N_ELEMENTS(aKo)); + sSampleText = OUString(aKo, SAL_N_ELEMENTS(aKo)); break; } default: @@ -478,9 +478,9 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript) return sSampleText; } -rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript) +OUString makeShortMinimalTextForScript(UScriptCode eScript) { - rtl::OUString sSampleText; + OUString sSampleText; switch (eScript) { case USCRIPT_GREEK: @@ -488,7 +488,7 @@ rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript) const sal_Unicode aGrek[] = { 0x0391, 0x0392 }; - sSampleText = rtl::OUString(aGrek, SAL_N_ELEMENTS(aGrek)); + sSampleText = OUString(aGrek, SAL_N_ELEMENTS(aGrek)); break; } case USCRIPT_HEBREW: @@ -496,7 +496,7 @@ rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript) const sal_Unicode aHebr[] = { 0x05D0, 0x05D1 }; - sSampleText = rtl::OUString(aHebr, SAL_N_ELEMENTS(aHebr)); + sSampleText = OUString(aHebr, SAL_N_ELEMENTS(aHebr)); break; } default: @@ -505,7 +505,7 @@ rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript) return sSampleText; } -rtl::OUString makeMinimalTextForScript(UScriptCode eScript) +OUString makeMinimalTextForScript(UScriptCode eScript) { return makeShortMinimalTextForScript(eScript); } @@ -518,9 +518,9 @@ rtl::OUString makeMinimalTextForScript(UScriptCode eScript) // //Currently we fall back to makeShortRepresentativeTextForScript when we don't //have suitable strings -rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang) +OUString makeRepresentativeTextForLanguage(LanguageType eLang) { - rtl::OUString sRet; + OUString sRet; switch( eLang & LANGUAGE_MASK_PRIMARY ) { case LANGUAGE_CHINESE & LANGUAGE_MASK_PRIMARY: @@ -545,7 +545,7 @@ rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang) 0x0985, 0x09B8, 0x09AE, 0x09C0, 0x09AF, 0x09BC, 0x09BE, 0x0020, 0x0986, 0x0996, 0x09F0 }; - sRet = rtl::OUString(aAs, SAL_N_ELEMENTS(aAs)); + sRet = OUString(aAs, SAL_N_ELEMENTS(aAs)); break; } case LANGUAGE_BENGALI & LANGUAGE_MASK_PRIMARY: @@ -619,7 +619,7 @@ rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang) const sal_Unicode aGa[] = { 'T', 0x00E9, 'a', 'c', 's', ' ', 'S', 'a', 'm', 'p', 'l', 'a', 'c', 'h' }; - sRet = rtl::OUString(aGa, SAL_N_ELEMENTS(aGa)); + sRet = OUString(aGa, SAL_N_ELEMENTS(aGa)); break; } default: @@ -1124,22 +1124,22 @@ namespace bool bKore = false, bJpan = false, bHant = false, bHans = false; const sal_Unicode aKorean[] = { 0x3131 }; - rtl::OUString sKorean(aKorean, SAL_N_ELEMENTS(aKorean)); + OUString sKorean(aKorean, SAL_N_ELEMENTS(aKorean)); if (STRING_LEN == rDevice.HasGlyphs(rFont, sKorean)) bKore = true; const sal_Unicode aJapanese[] = { 0x3007, 0x9F9D }; - rtl::OUString sJapanese(aJapanese, SAL_N_ELEMENTS(aJapanese)); + OUString sJapanese(aJapanese, SAL_N_ELEMENTS(aJapanese)); if (STRING_LEN == rDevice.HasGlyphs(rFont, sJapanese)) bJpan = true; const sal_Unicode aTraditionalChinese[] = { 0x570B }; - rtl::OUString sTraditionalChinese(aTraditionalChinese, SAL_N_ELEMENTS(aTraditionalChinese)); + OUString sTraditionalChinese(aTraditionalChinese, SAL_N_ELEMENTS(aTraditionalChinese)); if (STRING_LEN == rDevice.HasGlyphs(rFont, sTraditionalChinese)) bHant = true; const sal_Unicode aSimplifiedChinese[] = { 0x56FD }; - rtl::OUString sSimplifiedChinese(aSimplifiedChinese, SAL_N_ELEMENTS(aSimplifiedChinese)); + OUString sSimplifiedChinese(aSimplifiedChinese, SAL_N_ELEMENTS(aSimplifiedChinese)); if (STRING_LEN == rDevice.HasGlyphs(rFont, sSimplifiedChinese)) bHans = true; @@ -1157,15 +1157,15 @@ namespace } } -rtl::OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice) +OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice) { vcl::FontCapabilities aFontCapabilities; if (!rDevice.GetFontCapabilities(aFontCapabilities)) - return rtl::OUString(); + return OUString(); #if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "font is %s\n", - rtl::OUStringToOString(rDevice.GetFont().GetName(), RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(rDevice.GetFont().GetName(), RTL_TEXTENCODING_UTF8).getStr()); lcl_dump_unicode_coverage(aFontCapabilities.maUnicodeRange); lcl_dump_codepage_coverage(aFontCapabilities.maCodePageRange); #endif @@ -1177,13 +1177,13 @@ rtl::OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice) //chunk of representative text for that script UScriptCode eScript = getScript(aFontCapabilities); if (!eScript != USCRIPT_COMMON) - return rtl::OUString(); + return OUString(); eScript = attemptToDisambiguateHan(eScript, rDevice); - rtl::OUString sSampleText = makeShortRepresentativeTextForScript(eScript); + OUString sSampleText = makeShortRepresentativeTextForScript(eScript); bool bHasSampleTextGlyphs = (STRING_LEN == rDevice.HasGlyphs(rDevice.GetFont(), sSampleText)); - return bHasSampleTextGlyphs ? sSampleText : rtl::OUString(); + return bHasSampleTextGlyphs ? sSampleText : OUString(); } UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCoverage) @@ -1507,9 +1507,9 @@ UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCove return eRet; } -rtl::OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont) +OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont) { - rtl::OUString sRet(makeRepresentativeTextForLanguage(rFont.GetLanguage())); + OUString sRet(makeRepresentativeTextForLanguage(rFont.GetLanguage())); VirtualDevice aDevice; if (sRet.isEmpty() || (STRING_LEN != aDevice.HasGlyphs(rFont, sRet))) diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx index 0ceae6dccb8a..eba7a5697c0e 100644 --- a/svtools/source/misc/stringtransfer.cxx +++ b/svtools/source/misc/stringtransfer.cxx @@ -31,7 +31,7 @@ namespace svt //= OStringTransferable //==================================================================== //-------------------------------------------------------------------- - OStringTransferable::OStringTransferable(const ::rtl::OUString& _rContent) + OStringTransferable::OStringTransferable(const OUString& _rContent) :TransferableHelper() ,m_sContent( _rContent ) { @@ -57,7 +57,7 @@ namespace svt //= OStringTransfer //==================================================================== //-------------------------------------------------------------------- - void OStringTransfer::CopyString( const ::rtl::OUString& _rContent, Window* _pWindow ) + void OStringTransfer::CopyString( const OUString& _rContent, Window* _pWindow ) { OStringTransferable* pTransferable = new OStringTransferable( _rContent ); Reference< XTransferable > xTransfer = pTransferable; @@ -65,7 +65,7 @@ namespace svt } //-------------------------------------------------------------------- - sal_Bool OStringTransfer::PasteString( ::rtl::OUString& _rContent, Window* _pWindow ) + sal_Bool OStringTransfer::PasteString( OUString& _rContent, Window* _pWindow ) { TransferableDataHelper aClipboardData = TransferableDataHelper::CreateFromSystemClipboard( _pWindow ); @@ -89,7 +89,7 @@ namespace svt } //-------------------------------------------------------------------- - void OStringTransfer::StartStringDrag( const ::rtl::OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ) + void OStringTransfer::StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ) { OStringTransferable* pTransferable = new OStringTransferable( _rContent ); Reference< XTransferable > xTransfer = pTransferable; diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 84efebd54455..ee5a9c048ac8 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -279,11 +279,11 @@ namespace svt if ( !s_pFactory.get() ) { #ifndef DISABLE_DYNLOADING - const ::rtl::OUString sModuleName( SVLIBRARY( "acc" )); + const OUString sModuleName( SVLIBRARY( "acc" )); s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); if ( s_hAccessibleImplementationModule != NULL ) { - const ::rtl::OUString sFactoryCreationFunc( "getSvtAccessibilityComponentFactory" ); + const OUString sFactoryCreationFunc( "getSvtAccessibilityComponentFactory" ); s_pAccessibleFactoryFunc = (GetSvtAccessibilityComponentFactory) osl_getFunctionSymbol( s_hAccessibleImplementationModule, sFactoryCreationFunc.pData ); diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 2039c3d41c5b..d8103cfcd050 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -470,7 +470,7 @@ namespace svt sal_Bool implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ); - static rtl::OUString getCacheFileName(); + static OUString getCacheFileName(); static sal_Int32 getMagicNumber(); static void normalize( TemplateFolderContent& _rState ); @@ -513,9 +513,9 @@ namespace svt } //--------------------------------------------------------------------- - rtl::OUString TemplateFolderCacheImpl::getCacheFileName() + OUString TemplateFolderCacheImpl::getCacheFileName() { - return rtl::OUString(".templdir.cache"); + return OUString(".templdir.cache"); } @@ -581,7 +581,7 @@ namespace svt aParser.SetURL( _rPath, INetURLObject::WAS_ENCODED ); if ( INET_PROT_NOT_VALID == aParser.GetProtocol() ) { - rtl::OUString sURL; + OUString sURL; LocalFileHelper::ConvertPhysicalNameToURL( _rPath, sURL ); aParser.SetURL( sURL, INetURLObject::WAS_ENCODED ); } @@ -601,11 +601,11 @@ namespace svt { // create a content for the current folder root Reference< XResultSet > xResultSet; - Sequence< ::rtl::OUString > aContentProperties( 4); - aContentProperties[0] = ::rtl::OUString( "Title" ); - aContentProperties[1] = ::rtl::OUString( "DateModified" ); - aContentProperties[2] = ::rtl::OUString( "DateCreated" ); - aContentProperties[3] = ::rtl::OUString( "IsFolder" ); + Sequence< OUString > aContentProperties( 4); + aContentProperties[0] = OUString( "Title" ); + aContentProperties[1] = OUString( "DateModified" ); + aContentProperties[2] = OUString( "DateCreated" ); + aContentProperties[3] = OUString( "IsFolder" ); // get the set of sub contents in the folder try @@ -675,7 +675,7 @@ namespace svt // the template directories from the config const SvtPathOptions aPathOptions; - rtl::OUString aDirs = aPathOptions.GetTemplatePath(); + OUString aDirs = aPathOptions.GetTemplatePath(); // loop through all the root-level template folders sal_Int32 nIndex = 0; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index a682f54060ed..0d8ce74af190 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -142,22 +142,22 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD // a similar approach should be implemented for creation of the mimetype string; // for now the set of acceptable characters has to be hardcoded, in future it should be part of the service that creates the mimetype -static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc ) +static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc ) { - const ::rtl::OUString aChar( RTL_CONSTASCII_USTRINGPARAM( "\"" )); - const ::rtl::OUString aClassName( rObjDesc.maClassName.GetHexName() ); - ::rtl::OUString aParams; + const OUString aChar( RTL_CONSTASCII_USTRINGPARAM( "\"" )); + const OUString aClassName( rObjDesc.maClassName.GetHexName() ); + OUString aParams; if( !aClassName.isEmpty() ) { - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";classname=\"" )); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";classname=\"" )); aParams += aClassName; aParams += aChar; } if( !rObjDesc.maTypeName.isEmpty() ) { - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";typename=\"" )); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";typename=\"" )); aParams += rObjDesc.maTypeName; aParams += aChar; } @@ -180,29 +180,29 @@ static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescripto pToAccept[nChar] = sal_True; } - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";displayname=\"" )); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";displayname=\"" )); aParams += ::rtl::Uri::encode( rObjDesc.maDisplayName, pToAccept, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); aParams += aChar; } - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";viewaspect=\"" )); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";viewaspect=\"" )); aParams += OUString::number( rObjDesc.mnViewAspect ); aParams += aChar; - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";width=\"" )); - aParams += ::rtl::OUString::valueOf( rObjDesc.maSize.Width() ); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";width=\"" )); + aParams += OUString::valueOf( rObjDesc.maSize.Width() ); aParams += aChar; - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";height=\"" )); - aParams += ::rtl::OUString::valueOf( rObjDesc.maSize.Height() ); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";height=\"" )); + aParams += OUString::valueOf( rObjDesc.maSize.Height() ); aParams += aChar; - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";posx=\"" )); - aParams += ::rtl::OUString::valueOf( rObjDesc.maDragStartPos.X() ); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";posx=\"" )); + aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() ); aParams += aChar; - aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";posy=\"" )); - aParams += ::rtl::OUString::valueOf( rObjDesc.maDragStartPos.X() ); + aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";posy=\"" )); + aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() ); aParams += aChar; return aParams; @@ -222,14 +222,14 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons if( xMimeType.is() ) { - const ::rtl::OUString aClassNameString( "classname" ); - const ::rtl::OUString aTypeNameString( "typename" ); - const ::rtl::OUString aDisplayNameString( "displayname" ); - const ::rtl::OUString aViewAspectString( "viewaspect" ); - const ::rtl::OUString aWidthString( "width" ); - const ::rtl::OUString aHeightString( "height" ); - const ::rtl::OUString aPosXString( "posx" ); - const ::rtl::OUString aPosYString( "posy" ); + const OUString aClassNameString( "classname" ); + const OUString aTypeNameString( "typename" ); + const OUString aDisplayNameString( "displayname" ); + const OUString aViewAspectString( "viewaspect" ); + const OUString aWidthString( "width" ); + const OUString aHeightString( "height" ); + const OUString aPosXString( "posx" ); + const OUString aPosYString( "posy" ); if( xMimeType->hasParameter( aClassNameString ) ) { @@ -436,7 +436,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th #ifdef DEBUG if( maAny.hasValue() && ::com::sun::star::uno::TypeClass_STRING != maAny.getValueType().getTypeClass() ) - fprintf( stderr, "TransferableHelper delivers sequence of data [ %s ]\n", rtl::OUStringToOString(rFlavor.MimeType, RTL_TEXTENCODING_ASCII_US).getStr() ); + fprintf( stderr, "TransferableHelper delivers sequence of data [ %s ]\n", OUStringToOString(rFlavor.MimeType, RTL_TEXTENCODING_ASCII_US).getStr() ); #endif } catch( const ::com::sun::star::uno::Exception& ) @@ -645,7 +645,7 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) #ifdef DEBUG fprintf( stderr, "TransferableHelper exchanged objectdescriptor [ %s ]\n", - rtl::OUStringToOString(aIter->MimeType, RTL_TEXTENCODING_ASCII_US).getStr() ); + OUStringToOString(aIter->MimeType, RTL_TEXTENCODING_ASCII_US).getStr() ); #endif } @@ -742,7 +742,7 @@ sal_Bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) // ----------------------------------------------------------------------------- -sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const DataFlavor& rFlavor ) +sal_Bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& rFlavor ) { DataFlavor aFileFlavor; @@ -750,7 +750,7 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da SotExchange::GetFormatDataFlavor( FORMAT_FILE, aFileFlavor ) && TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) ) { - const rtl::OString aByteStr(rtl::OUStringToOString(rString, osl_getThreadTextEncoding())); + const OString aByteStr(OUStringToOString(rString, osl_getThreadTextEncoding())); Sequence< sal_Int8 > aSeq( aByteStr.getLength() + 1 ); memcpy( aSeq.getArray(), aByteStr.getStr(), aByteStr.getLength() ); @@ -849,9 +849,9 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, { case( SOT_FORMATSTR_ID_SOLK ): { - rtl::OString sURL(rtl::OUStringToOString(rBmk.GetURL(), eSysCSet)); - rtl::OString sDesc(rtl::OUStringToOString(rBmk.GetDescription(), eSysCSet)); - rtl::OStringBuffer sOut; + OString sURL(OUStringToOString(rBmk.GetURL(), eSysCSet)); + OString sDesc(OUStringToOString(rBmk.GetDescription(), eSysCSet)); + OStringBuffer sOut; sOut.append(sURL.getLength()); sOut.append('@').append(sURL); sOut.append(sDesc.getLength()); @@ -864,12 +864,12 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, break; case( FORMAT_STRING ): - maAny <<= ::rtl::OUString( rBmk.GetURL() ); + maAny <<= OUString( rBmk.GetURL() ); break; case( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ): { - rtl::OString sURL(rtl::OUStringToOString(rBmk.GetURL(), eSysCSet)); + OString sURL(OUStringToOString(rBmk.GetURL(), eSysCSet)); Sequence< sal_Int8 > aSeq( sURL.getLength() ); memcpy( aSeq.getArray(), sURL.getStr(), sURL.getLength() ); maAny <<= aSeq; @@ -881,8 +881,8 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, Sequence< sal_Int8 > aSeq( 2048 ); memset( aSeq.getArray(), 0, 2048 ); - strcpy( reinterpret_cast< char* >( aSeq.getArray() ), rtl::OUStringToOString(rBmk.GetURL(), eSysCSet).getStr() ); - strcpy( reinterpret_cast< char* >( aSeq.getArray() ) + 1024, rtl::OUStringToOString(rBmk.GetDescription(), eSysCSet).getStr() ); + strcpy( reinterpret_cast< char* >( aSeq.getArray() ), OUStringToOString(rBmk.GetURL(), eSysCSet).getStr() ); + strcpy( reinterpret_cast< char* >( aSeq.getArray() ) + 1024, OUStringToOString(rBmk.GetDescription(), eSysCSet).getStr() ); maAny <<= aSeq; } @@ -899,7 +899,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, memset( &rFDesc1, 0, sizeof( FILEDESCRIPTOR ) ); rFDesc1.dwFlags = FD_LINKUI; - rtl::OStringBuffer aStr(rtl::OUStringToOString( + OStringBuffer aStr(OUStringToOString( rBmk.GetDescription(), eSysCSet)); for( sal_uInt16 nChar = 0; nChar < aStr.getLength(); ++nChar ) if( strchr( "\\/:*?\"<>|", aStr[nChar] ) ) @@ -916,7 +916,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, case SOT_FORMATSTR_ID_FILECONTENT: { String aStr( RTL_CONSTASCII_USTRINGPARAM( "[InternetShortcut]\x0aURL=" ) ); - maAny <<= ::rtl::OUString( aStr += rBmk.GetURL() ); + maAny <<= OUString( aStr += rBmk.GetURL() ); } break; #endif @@ -965,7 +965,7 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec // writes now UTF16 format into the stream //JP 6.8.2001: and now it writes UTF8 because then exist no problem with // little / big endians! - Bug 88121 - maAny <<= ::rtl::OUString( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 ); + maAny <<= OUString( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 ); } else maAny <<= aSeq; @@ -1332,7 +1332,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference< XMimeContentTypeFactory > xMimeFact = MimeContentTypeFactory::create( xContext ); DataFlavorEx aFlavorEx; - const ::rtl::OUString aCharsetStr( "charset" ); + const OUString aCharsetStr( "charset" ); for( sal_Int32 i = 0; i < rDataFlavorSeq.getLength(); i++ ) @@ -1380,33 +1380,33 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor aFlavorEx.mnSotId = SOT_FORMATSTR_ID_HTML_NO_COMMENT; rDataFlavorExVector.push_back( aFlavorEx ); } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/plain" ) ) ) { // add, if it is a UTF-8 byte buffer if( xMimeType->hasParameter( aCharsetStr ) ) { - if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) || - xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) ) + if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( OUString( "unicode" ) ) || + xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( OUString( "utf-16" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_STRING; } } } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/rtf" ) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/rtf" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_RTF; } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/html" ) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/html" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_HTML; } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/uri-list" ) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/uri-list" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMAT_FILE_LIST; } - else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice-objectdescriptor-xml" ) ) ) + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "application/x-openoffice-objectdescriptor-xml" ) ) ) { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_OBJECTDESCRIPTOR; } @@ -1597,7 +1597,7 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor ) const sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, String& rStr ) { - ::rtl::OUString aOUString; + OUString aOUString; sal_Bool bRet = GetString( nFormat, aOUString ); rStr = aOUString; @@ -1609,7 +1609,7 @@ sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, String& r sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, String& rStr ) { - ::rtl::OUString aOUString; + OUString aOUString; sal_Bool bRet = GetString( rFlavor, aOUString ); rStr = aOUString; @@ -1619,7 +1619,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, String& r // ----------------------------------------------------------------------------- -sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, ::rtl::OUString& rStr ) +sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString& rStr ) { DataFlavor aFlavor; return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetString( aFlavor, rStr ) ); @@ -1627,14 +1627,14 @@ sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, ::rtl::OU // ----------------------------------------------------------------------------- -sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, ::rtl::OUString& rStr ) +sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rStr ) { Any aAny( GetAny( rFlavor ) ); sal_Bool bRet = sal_False; if( aAny.hasValue() ) { - ::rtl::OUString aOUString; + OUString aOUString; Sequence< sal_Int8 > aSeq; if( aAny >>= aOUString ) @@ -1653,7 +1653,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, ::rtl::OU while( nLen && ( 0 == *( pChars + nLen - 1 ) ) ) --nLen; - rStr = ::rtl::OUString( pChars, nLen, osl_getThreadTextEncoding() ); + rStr = OUString( pChars, nLen, osl_getThreadTextEncoding() ); bRet = sal_True; } } @@ -1943,12 +1943,12 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pFDesc->cItems ) { - rtl::OString aDesc( pFDesc->fgd[ 0 ].cFileName ); + OString aDesc( pFDesc->fgd[ 0 ].cFileName ); rtl_TextEncoding eTextEncoding = osl_getThreadTextEncoding(); if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.getLength() - 4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(".URL")) ) { - SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( INetURLObject( rtl::OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ), + SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ ); if( !pStream || pStream->GetError() ) @@ -1969,7 +1969,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pStream ) { - rtl::OString aLine; + OString aLine; sal_Bool bSttFnd = sal_False; while( pStream->ReadLine( aLine ) ) @@ -1978,8 +1978,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr bSttFnd = sal_True; else if (bSttFnd && aLine.copy(0, 4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("URL="))) { - rBmk = INetBookmark( rtl::OStringToOUString(aLine.copy(4), eTextEncoding), - rtl::OStringToOUString(aDesc.copy(0, aDesc.getLength() - 4), eTextEncoding) ); + rBmk = INetBookmark( OStringToOUString(aLine.copy(4), eTextEncoding), + OStringToOUString(aDesc.copy(0, aDesc.getLength() - 4), eTextEncoding) ); bRet = sal_True; break; } @@ -2050,11 +2050,11 @@ sal_Bool TransferableDataHelper::GetFileList( { if( aFlavor.MimeType.indexOf( "text/uri-list" ) > -1 ) { - rtl::OString aDiskString; + OString aDiskString; while( xStm->ReadLine( aDiskString ) ) if( !aDiskString.isEmpty() && aDiskString[0] != '#' ) - rFileList.AppendFile( rtl::OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) ); + rFileList.AppendFile( OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) ); bRet = sal_True; } @@ -2256,22 +2256,22 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer:: { if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( xRequestType2->getFullMediaType() ) ) { - if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) ) + if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/plain" ) ) ) { // special handling for text/plain media types - const ::rtl::OUString aCharsetString( "charset" ); + const OUString aCharsetString( "charset" ); if( !xRequestType2->hasParameter( aCharsetString ) || - xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) || - xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) ) + xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( OUString( "utf-16" ) ) || + xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( OUString( "unicode" ) ) ) { bRet = sal_True; } } - else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice" ) ) ) + else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( OUString( "application/x-openoffice" ) ) ) { // special handling for application/x-openoffice media types - const ::rtl::OUString aFormatString( "windows_formatname" ); + const OUString aFormatString( "windows_formatname" ); if( xRequestType1->hasParameter( aFormatString ) && xRequestType2->hasParameter( aFormatString ) && diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index f28c101eae40..5fc1d14ab3f6 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -498,7 +498,7 @@ void TransferDataContainer::CopyAnyData( sal_uLong nFormatId, // ----------------------------------------------------------------------------- void TransferDataContainer::CopyByteString( sal_uLong nFormatId, - const rtl::OString& rStr ) + const OString& rStr ) { CopyAnyData( nFormatId, rStr.getStr(), rStr.getLength() ); } @@ -553,7 +553,7 @@ void TransferDataContainer::CopyString( sal_uInt16 nFmt, const String& rStr ) { TDataCntnrEntry_Impl aEntry; aEntry.nId = nFmt; - rtl::OUString aStr( rStr ); + OUString aStr( rStr ); aEntry.aAny <<= aStr; pImpl->aFmtList.push_back( aEntry ); AddFormat( aEntry.nId ); diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 14d62066d3f1..a126e4ea79f5 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -391,11 +391,11 @@ static const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, return pStr; } -static rtl::OString lcl_ConvertCharToHTML( sal_Unicode c, +static OString lcl_ConvertCharToHTML( sal_Unicode c, HTMLOutContext& rContext, String *pNonConvertableChars ) { - rtl::OStringBuffer aDest; + OStringBuffer aDest; DBG_ASSERT( RTL_TEXTENCODING_DONTKNOW != rContext.m_eDestEnc, "wrong destination encoding" ); const sal_Char *pStr = 0; @@ -478,9 +478,9 @@ static rtl::OString lcl_ConvertCharToHTML( sal_Unicode c, return aDest.makeStringAndClear(); } -static rtl::OString lcl_FlushToAscii( HTMLOutContext& rContext ) +static OString lcl_FlushToAscii( HTMLOutContext& rContext ) { - rtl::OStringBuffer aDest; + OStringBuffer aDest; sal_Unicode c = 0; sal_Char cBuffer[TXTCONV_BUFFER_SIZE]; @@ -502,11 +502,11 @@ static rtl::OString lcl_FlushToAscii( HTMLOutContext& rContext ) return aDest.makeStringAndClear(); } -rtl::OString HTMLOutFuncs::ConvertStringToHTML( const String& rSrc, +OString HTMLOutFuncs::ConvertStringToHTML( const String& rSrc, rtl_TextEncoding eDestEnc, String *pNonConvertableChars ) { HTMLOutContext aContext( eDestEnc ); - rtl::OStringBuffer aDest; + OStringBuffer aDest; for( sal_uInt32 i=0UL, nLen = rSrc.Len(); i < nLen; i++ ) aDest.append(lcl_ConvertCharToHTML( rSrc.GetChar( (xub_StrLen)i ), aContext, pNonConvertableChars)); @@ -527,7 +527,7 @@ SvStream& HTMLOutFuncs::Out_Char( SvStream& rStream, sal_Unicode c, HTMLOutContext& rContext, String *pNonConvertableChars ) { - rtl::OString sOut = lcl_ConvertCharToHTML( c, rContext, pNonConvertableChars ); + OString sOut = lcl_ConvertCharToHTML( c, rContext, pNonConvertableChars ); rStream << sOut.getStr(); return rStream; } @@ -548,7 +548,7 @@ SvStream& HTMLOutFuncs::Out_String( SvStream& rStream, const String& rStr, SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream, HTMLOutContext& rContext ) { - rtl::OString sOut = lcl_FlushToAscii( rContext ); + OString sOut = lcl_FlushToAscii( rContext ); if (!sOut.isEmpty()) rStream << sOut.getStr(); @@ -617,7 +617,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, if( !rOutName.Len() ) return rStream; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<') .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_map)) .append(' ') @@ -635,7 +635,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, if( pObj ) { const sal_Char *pShape = 0; - rtl::OString aCoords; + OString aCoords; switch( pObj->GetType() ) { case( IMAP_OBJ_RECTANGLE ): @@ -645,7 +645,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, pShape = OOO_STRING_SVTOOLS_HTML_SH_rect; Rectangle aRect( pRectObj->GetRectangle() ); - aCoords = rtl::OStringBuffer() + aCoords = OStringBuffer() .append(static_cast(aRect.Left())) .append(',') .append(static_cast(aRect.Top())) @@ -664,7 +664,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, Point aCenter( pCirc->GetCenter() ); long nOff = pCirc->GetRadius(); - aCoords = rtl::OStringBuffer() + aCoords = OStringBuffer() .append(static_cast(aCenter.X())) .append(',') .append(static_cast(aCenter.Y())) @@ -680,7 +680,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, pShape= OOO_STRING_SVTOOLS_HTML_SH_poly; Polygon aPoly( pPolyObj->GetPolygon() ); sal_uInt16 nCount = aPoly.GetSize(); - rtl::OStringBuffer aTmpBuf; + OStringBuffer aTmpBuf; if( nCount>0 ) { const Point& rPoint = aPoly[0]; @@ -795,7 +795,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, eDestEnc = osl_getThreadTextEncoding(); // Script wird komplett nicht eingerueckt! - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<') .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_script)); @@ -856,7 +856,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, sOut.append(RTL_CONSTASCII_STRINGPARAM("' ")) .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_SB_library)) .append(' ') - .append(rtl::OUStringToOString(*pSBLibrary, eDestEnc)); + .append(OUStringToOString(*pSBLibrary, eDestEnc)); rStrm << sOut.makeStringAndClear().getStr() << sNewLine; } @@ -865,7 +865,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, sOut.append(RTL_CONSTASCII_STRINGPARAM("' ")) .append(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_SB_module)) .append(' ') - .append(rtl::OUStringToOString(*pSBModule, eDestEnc)); + .append(OUStringToOString(*pSBModule, eDestEnc)); rStrm << sOut.makeStringAndClear().getStr() << sNewLine; } } @@ -874,7 +874,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, { // Wir schreiben das Modul mm ANSI-Zeichensatz, aber mit // System-Zeilenumbruechen raus. - const rtl::OString sSource(rtl::OUStringToOString(rSource, eDestEnc)); + const OString sSource(OUStringToOString(rSource, eDestEnc)); rStrm << sSource.getStr() << sNewLine; } rStrm << sNewLine; @@ -917,7 +917,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm, if( pStr ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(' ').append(pStr).append("=\""); rStrm << sOut.makeStringAndClear().getStr(); @@ -930,19 +930,19 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm, return rStrm; } -rtl::OString HTMLOutFuncs::CreateTableDataOptionsValNum( +OString HTMLOutFuncs::CreateTableDataOptionsValNum( sal_Bool bValue, double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc, String* pNonConvertableChars) { - rtl::OStringBuffer aStrTD; + OStringBuffer aStrTD; if ( bValue ) { // printf / scanf ist zu ungenau String aValStr; rFormatter.GetInputLineString( fVal, 0, aValStr ); - rtl::OString sTmp(rtl::OUStringToOString(aValStr, eDestEnc)); + OString sTmp(OUStringToOString(aValStr, eDestEnc)); aStrTD.append(' '). append(OOO_STRING_SVTOOLS_HTML_O_SDval). append(RTL_CONSTASCII_STRINGPARAM("=\"")). @@ -958,7 +958,7 @@ rtl::OString HTMLOutFuncs::CreateTableDataOptionsValNum( append(';'); // Language fuer Format 0 if ( nFormat ) { - rtl::OString aNumStr; + OString aNumStr; LanguageType nLang; const SvNumberformat* pFormatEntry = rFormatter.GetEntry( nFormat ); if ( pFormatEntry ) diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index e34f16c8ced3..dd1b60d9658b 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -420,7 +420,7 @@ int HTMLParser::FilterToken( int nToken ) int HTMLParser::ScanText( const sal_Unicode cBreak ) { - ::rtl::OUStringBuffer sTmpBuffer( MAX_LEN ); + OUStringBuffer sTmpBuffer( MAX_LEN ); int bContinue = true; int bEqSignFound = false; sal_Unicode cQuote = 0U; @@ -482,7 +482,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT; sal_Char cEncodedChar = static_cast(cChar); - cChar = rtl::OUString(&cEncodedChar, 1, eSrcEnc, convertFlags).toChar(); + cChar = OUString(&cEncodedChar, 1, eSrcEnc, convertFlags).toChar(); if( 0U == cChar ) { // If the character could not be @@ -497,7 +497,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) } else if( HTML_ISALPHA( nNextCh ) ) { - ::rtl::OUStringBuffer sEntityBuffer( MAX_ENTITY_LEN ); + OUStringBuffer sEntityBuffer( MAX_ENTITY_LEN ); xub_StrLen nPos = 0L; do { @@ -510,7 +510,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) if( IsParserWorking() && !rInput.IsEof() ) { - rtl::OUString sEntity(sEntityBuffer.getStr(), nPos); + OUString sEntity(sEntityBuffer.getStr(), nPos); cChar = GetHTMLCharName( sEntity ); // not found ( == 0 ): plain text @@ -524,7 +524,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) { nNextCh = sEntityBuffer[i]; sEntityBuffer.setLength( i ); - sEntity = rtl::OUString(sEntityBuffer.getStr(), i); + sEntity = OUString(sEntityBuffer.getStr(), i); cChar = GetHTMLCharName( sEntity ); if( cChar ) { @@ -831,7 +831,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) int HTMLParser::_GetNextRawToken() { - ::rtl::OUStringBuffer sTmpBuffer( MAX_LEN ); + OUStringBuffer sTmpBuffer( MAX_LEN ); if( bEndTokenFound ) { @@ -1100,7 +1100,7 @@ int HTMLParser::_GetNextToken() } if( HTML_ISALPHA( nNextCh ) || '!'==nNextCh ) { - ::rtl::OUStringBuffer sTmpBuffer; + OUStringBuffer sTmpBuffer; do { sTmpBuffer.append( nNextCh ); if( MAX_LEN == sTmpBuffer.getLength() ) @@ -1867,7 +1867,7 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader, // ^ is not interpreted as HTML. Otherwise the output of the DOS command "DIR" // could be interpreted as HTML. - rtl::OUString sTest(rtl::OStringToOUString(sCmp.copy(nStart, nPos-nStart), RTL_TEXTENCODING_ASCII_US)); + OUString sTest(OStringToOUString(sCmp.copy(nStart, nPos-nStart), RTL_TEXTENCODING_ASCII_US)); int nTok = GetHTMLToken( sTest ); if( 0 != nTok && HTML_DIRLIST_ON != nTok ) return true; @@ -2067,7 +2067,7 @@ static HTMLOptionEnum const aHTMLMetaNameTable[] = }; -void HTMLParser::AddMetaUserDefined( ::rtl::OUString const & ) +void HTMLParser::AddMetaUserDefined( OUString const & ) { } @@ -2204,7 +2204,7 @@ bool HTMLParser::ParseMetaOptionsImpl( try { xUDProps->addProperty(aName, beans::PropertyAttribute::REMOVABLE, - uno::makeAny(::rtl::OUString(aContent))); + uno::makeAny(OUString(aContent))); AddMetaUserDefined(aName); bChanged = true; } catch (uno::Exception &) { @@ -2255,7 +2255,7 @@ rtl_TextEncoding HTMLParser::GetEncodingByMIME( const String& rMime ) const INetContentTypeParameter * pCharset = aParameters.find("charset"); if (pCharset != 0) { - OString sValue(rtl::OUStringToOString(pCharset->m_sValue, RTL_TEXTENCODING_ASCII_US)); + OString sValue(OUStringToOString(pCharset->m_sValue, RTL_TEXTENCODING_ASCII_US)); return GetExtendedCompatibilityTextEncoding( rtl_getTextEncodingFromMimeCharset( sValue.getStr() ) ); } } diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 3614de2dc075..1f4936ef8244 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -320,13 +320,13 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak ) case '\'': { - rtl::OStringBuffer aByteString; + OStringBuffer aByteString; while (1) { char c = (char)GetHexValue(); /* * Note: \'00 is a valid internal character in a - * string in RTF. rtl::OStringBuffer supports + * string in RTF. OStringBuffer supports * appending nulls fine */ aByteString.append(c); @@ -339,7 +339,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak ) if (__next>0xFF) // fix for #i43933# and #i35653# { if (aByteString.getLength()) - aStrBuffer.Append(String(rtl::OStringToOUString(aByteString.makeStringAndClear(), GetSrcEncoding()))); + aStrBuffer.Append(String(OStringToOUString(aByteString.makeStringAndClear(), GetSrcEncoding()))); aStrBuffer.Append((sal_Unicode)__next); continue; @@ -374,7 +374,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak ) bNextCh = false; if (aByteString.getLength()) - aStrBuffer.Append(String(rtl::OStringToOUString(aByteString.makeStringAndClear(), GetSrcEncoding()))); + aStrBuffer.Append(String(OStringToOUString(aByteString.makeStringAndClear(), GetSrcEncoding()))); } break; case '\\': diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 4c15bcf2db36..64a9a8b48c9f 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OString; #if defined(UNX) const sal_Char RTFOutFuncs::sNewLine = '\012'; @@ -133,11 +131,11 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, // #i47831# add an additional whitespace, so that // "document whitespaces" are not ignored.; rStream << "\\uc" - << rtl::OString::valueOf(nLen).getStr() << " "; + << OString::valueOf(nLen).getStr() << " "; *pUCMode = nLen; } rStream << "\\u" - << rtl::OString::valueOf( + << OString::valueOf( static_cast(c)).getStr(); } diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index ad7213b622e2..0f26ab2811fb 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -98,7 +98,7 @@ namespace svt }; typedef ::boost::shared_ptr< IValueNormalization > PValueNormalization; - typedef ::boost::unordered_map< ::rtl::OUString, PValueNormalization, ::rtl::OUStringHash > NormalizerCache; + typedef ::boost::unordered_map< OUString, PValueNormalization, OUStringHash > NormalizerCache; //================================================================================================================== //= CellValueConversion_Data @@ -334,7 +334,7 @@ namespace svt // ensure a NullDate we will assume later on UnoDate const aNullDate( 1, 1, 1900 ); Reference< XPropertySet > const xFormatSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW ); - xFormatSettings->setPropertyValue( ::rtl::OUString::createFromAscii( "NullDate" ), makeAny( aNullDate ) ); + xFormatSettings->setPropertyValue( OUString::createFromAscii( "NullDate" ), makeAny( aNullDate ) ); // knit xFormatter->attachNumberFormatsSupplier( xSupplier ); @@ -360,7 +360,7 @@ namespace svt // never encountered this type before o_formatter.reset(); - ::rtl::OUString const sTypeName( i_valueType.getTypeName() ); + OUString const sTypeName( i_valueType.getTypeName() ); TypeClass const eTypeClass = i_valueType.getTypeClass(); if ( sTypeName.equals( ::cppu::UnoType< DateTime >::get().getTypeName() ) ) @@ -423,9 +423,9 @@ namespace svt } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString CellValueConversion::convertToString( const Any& i_value ) + OUString CellValueConversion::convertToString( const Any& i_value ) { - ::rtl::OUString sStringValue; + OUString sStringValue; if ( !i_value.hasValue() ) return sStringValue; diff --git a/svtools/source/table/cellvalueconversion.hxx b/svtools/source/table/cellvalueconversion.hxx index c9cb66b9d173..8c9f6b236d9f 100644 --- a/svtools/source/table/cellvalueconversion.hxx +++ b/svtools/source/table/cellvalueconversion.hxx @@ -40,7 +40,7 @@ namespace svt CellValueConversion(); ~CellValueConversion(); - ::rtl::OUString convertToString( const ::com::sun::star::uno::Any& i_cellValue ); + OUString convertToString( const ::com::sun::star::uno::Any& i_cellValue ); private: ::boost::scoped_ptr< CellValueConversion_Data > m_pData; diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index a96c1c225e3b..0d56ee5b88ae 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -390,7 +390,7 @@ namespace svt { namespace table _rDevice.DrawLine( _rArea.BottomLeft(), _rArea.BottomRight() ); Any const rowHeading( m_pImpl->rModel.getRowHeading( m_pImpl->nCurrentRow ) ); - ::rtl::OUString const rowTitle( m_pImpl->aStringConverter.convertToString( rowHeading ) ); + OUString const rowTitle( m_pImpl->aStringConverter.convertToString( rowHeading ) ); if ( !rowTitle.isEmpty() ) { ::Color const textColor = lcl_getEffectiveColor( m_pImpl->rModel.getHeaderTextColor(), _rStyle, &StyleSettings::GetFieldTextColor ); @@ -526,12 +526,12 @@ namespace svt { namespace table return; } - const ::rtl::OUString sText( m_pImpl->aStringConverter.convertToString( aCellContent ) ); + const OUString sText( m_pImpl->aStringConverter.convertToString( aCellContent ) ); impl_paintCellText( i_context, sText ); } //------------------------------------------------------------------------------------------------------------------ - void GridTableRenderer::impl_paintCellText( CellRenderContext const & i_context, ::rtl::OUString const & i_text ) + void GridTableRenderer::impl_paintCellText( CellRenderContext const & i_context, OUString const & i_text ) { if ( i_context.bSelected ) { @@ -586,7 +586,7 @@ namespace svt { namespace table return true; } - ::rtl::OUString const sText( m_pImpl->aStringConverter.convertToString( i_cellContent ) ); + OUString const sText( m_pImpl->aStringConverter.convertToString( i_cellContent ) ); if ( sText.isEmpty() ) return true; @@ -608,7 +608,7 @@ namespace svt { namespace table } //------------------------------------------------------------------------------------------------------------------ - bool GridTableRenderer::GetFormattedCellString( Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, ::rtl::OUString & o_cellString ) const + bool GridTableRenderer::GetFormattedCellString( Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, OUString & o_cellString ) const { o_cellString = m_pImpl->aStringConverter.convertToString( i_cellValue ); diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 6a1fc18447fe..877f32d12e3f 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -288,23 +288,23 @@ namespace svt { namespace table } // ----------------------------------------------------------------------------------------------------------------- - ::rtl::OUString TableControl::GetAccessibleObjectName( AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const + OUString TableControl::GetAccessibleObjectName( AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const { - ::rtl::OUString aRetText; + OUString aRetText; //Window* pWin; switch( eObjType ) { case TCTYPE_GRIDCONTROL: - aRetText = ::rtl::OUString( "Grid control" ); + aRetText = OUString( "Grid control" ); break; case TCTYPE_TABLE: - aRetText = ::rtl::OUString( "Grid conrol" ); + aRetText = OUString( "Grid conrol" ); break; case TCTYPE_ROWHEADERBAR: - aRetText = ::rtl::OUString( "RowHeaderBar" ); + aRetText = OUString( "RowHeaderBar" ); break; case TCTYPE_COLUMNHEADERBAR: - aRetText = ::rtl::OUString( "ColumnHeaderBar" ); + aRetText = OUString( "ColumnHeaderBar" ); break; case TCTYPE_TABLECELL: //the name of the cell constists of column name and row name if defined @@ -312,12 +312,12 @@ namespace svt { namespace table if(GetModel()->hasColumnHeaders()) { aRetText = GetColumnName(_nCol); - aRetText += rtl::OUString::createFromAscii(" , "); + aRetText += OUString::createFromAscii(" , "); } if(GetModel()->hasRowHeaders()) { aRetText += GetRowName(_nRow); - aRetText += rtl::OUString::createFromAscii(" , "); + aRetText += OUString::createFromAscii(" , "); } //aRetText = GetAccessibleCellText(_nRow, _nCol); break; @@ -334,22 +334,22 @@ namespace svt { namespace table } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetAccessibleObjectDescription( AccessibleTableControlObjType eObjType, sal_Int32 ) const + OUString TableControl::GetAccessibleObjectDescription( AccessibleTableControlObjType eObjType, sal_Int32 ) const { - ::rtl::OUString aRetText; + OUString aRetText; switch( eObjType ) { case TCTYPE_GRIDCONTROL: - aRetText = ::rtl::OUString( "Grid control description" ); + aRetText = OUString( "Grid control description" ); break; case TCTYPE_TABLE: - aRetText = ::rtl::OUString( "TABLE description" ); + aRetText = OUString( "TABLE description" ); break; case TCTYPE_ROWHEADERBAR: - aRetText = ::rtl::OUString( "ROWHEADERBAR description" ); + aRetText = OUString( "ROWHEADERBAR description" ); break; case TCTYPE_COLUMNHEADERBAR: - aRetText = ::rtl::OUString( "COLUMNHEADERBAR description" ); + aRetText = OUString( "COLUMNHEADERBAR description" ); break; case TCTYPE_TABLECELL: // the description of the cell consists of column name and row name if defined @@ -357,7 +357,7 @@ namespace svt { namespace table if ( GetModel()->hasColumnHeaders() ) { aRetText = GetColumnName( GetCurrentColumn() ); - aRetText += rtl::OUString::createFromAscii( " , " ); + aRetText += OUString::createFromAscii( " , " ); } if ( GetModel()->hasRowHeaders() ) { @@ -365,39 +365,39 @@ namespace svt { namespace table } break; case TCTYPE_ROWHEADERCELL: - aRetText = ::rtl::OUString( "ROWHEADERCELL description" ); + aRetText = OUString( "ROWHEADERCELL description" ); break; case TCTYPE_COLUMNHEADERCELL: - aRetText = ::rtl::OUString( "COLUMNHEADERCELL description" ); + aRetText = OUString( "COLUMNHEADERCELL description" ); break; } return aRetText; } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetRowDescription( sal_Int32 _nRow) const + OUString TableControl::GetRowDescription( sal_Int32 _nRow) const { (void)_nRow; - return rtl::OUString( "row description" ); + return OUString( "row description" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetRowName( sal_Int32 _nIndex) const + OUString TableControl::GetRowName( sal_Int32 _nIndex) const { - ::rtl::OUString sRowName; + OUString sRowName; GetModel()->getRowHeading( _nIndex ) >>= sRowName; return sRowName; } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetColumnDescription( sal_uInt16 _nColumn) const + OUString TableControl::GetColumnDescription( sal_uInt16 _nColumn) const { (void)_nColumn; - return rtl::OUString( "col description" ); + return OUString( "col description" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetColumnName( sal_Int32 _nIndex) const + OUString TableControl::GetColumnName( sal_Int32 _nIndex) const { return GetModel()->getColumnModel(_nIndex)->getName(); } @@ -411,7 +411,7 @@ namespace svt { namespace table } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString TableControl::GetAccessibleCellText( sal_Int32 _nRowPos, sal_Int32 _nColPos) const + OUString TableControl::GetAccessibleCellText( sal_Int32 _nRowPos, sal_Int32 _nColPos) const { return m_pImpl->getCellContentAsString( _nRowPos, _nColPos ); } diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index a02d64a2a000..5b059aedaab6 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -2290,12 +2290,12 @@ namespace svt { namespace table } //-------------------------------------------------------------------- - ::rtl::OUString TableControl_Impl::getCellContentAsString( RowPos const i_row, ColPos const i_col ) + OUString TableControl_Impl::getCellContentAsString( RowPos const i_row, ColPos const i_col ) { Any aCellValue; m_pModel->getCellContent( i_col, i_row, aCellValue ); - ::rtl::OUString sCellStringContent; + OUString sCellStringContent; m_pModel->getRenderer()->GetFormattedCellString( aCellValue, i_col, i_row, sCellStringContent ); return sCellStringContent; diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index d8bf51f94b30..5c02c21c2d68 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -210,7 +210,7 @@ namespace svt { namespace table /** retrieves the content of the given cell, converted to a string */ - ::rtl::OUString getCellContentAsString( RowPos const i_row, ColPos const i_col ); + OUString getCellContentAsString( RowPos const i_row, ColPos const i_col ); /** returns the position of the current row in the selection vector */ int getRowSelectedNumber(const ::std::vector& selectedRows, RowPos current); diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index a797587a4b69..65703e5d45c5 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -87,7 +87,7 @@ namespace svt { namespace table return; } - ::rtl::OUString sHelpText; + OUString sHelpText; sal_uInt16 nHelpStyle = 0; Point const aMousePos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() ) ); diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx index 87668a54a710..9be075276538 100644 --- a/svtools/source/toolpanel/dummypanel.cxx +++ b/svtools/source/toolpanel/dummypanel.cxx @@ -60,9 +60,9 @@ namespace svt } //-------------------------------------------------------------------- - ::rtl::OUString DummyPanel::GetDisplayName() const + OUString DummyPanel::GetDisplayName() const { - return ::rtl::OUString(); + return OUString(); } //-------------------------------------------------------------------- @@ -72,9 +72,9 @@ namespace svt } //-------------------------------------------------------------------- - rtl::OString DummyPanel::GetHelpID() const + OString DummyPanel::GetHelpID() const { - return rtl::OString(); + return OString(); } //-------------------------------------------------------------------- diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx index b5d5f2751d83..58a1b9ded26b 100644 --- a/svtools/source/toolpanel/dummypanel.hxx +++ b/svtools/source/toolpanel/dummypanel.hxx @@ -40,9 +40,9 @@ namespace svt ~DummyPanel(); // IToolPanel - virtual ::rtl::OUString GetDisplayName() const; + virtual OUString GetDisplayName() const; virtual Image GetImage() const; - virtual rtl::OString GetHelpID() const; + virtual OString GetHelpID() const; virtual void Activate( Window& i_rParentWindow ); virtual void Deactivate(); virtual void SetSizePixel( const Size& i_rPanelWindowSize ); diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 34ef11563289..c4cb2d5163ee 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -217,7 +217,7 @@ namespace svt // bool bNativeOK = m_rTargetWindow.GetNativeControlRegion( // CTRL_TOOLBAR, PART_BUTTON, // i_rContentArea, nState, -// aControlValue, ::rtl::OUString(), +// aControlValue, OUString(), // aBoundingRegion, aContentRegion // ); (void)i_nItemFlags; @@ -235,7 +235,7 @@ namespace svt ImplControlValue aControlValue; aControlValue.setTristateVal( ( i_nItemFlags & ITEM_STATE_ACTIVE ) ? BUTTONVALUE_ON : BUTTONVALUE_OFF ); - bool bNativeOK = getTargetDevice().DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, i_rContentRect, nState, aControlValue, rtl::OUString() ); + bool bNativeOK = getTargetDevice().DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, i_rContentRect, nState, aControlValue, OUString() ); (void)bNativeOK; OSL_ENSURE( bNativeOK, "NWFToolboxItemRenderer::preRenderItem: inconsistent NWF implementation!" ); // IsNativeControlSupported returned true, previously, otherwise we would not be here ... @@ -286,7 +286,7 @@ namespace svt aBackground.Top() = aBackground.Bottom(); getTargetDevice().DrawNativeControl( CTRL_TAB_PANE, PART_ENTIRE_CONTROL, aBackground, - CTRL_STATE_ENABLED, ImplControlValue(), ::rtl::OUString() ); + CTRL_STATE_ENABLED, ImplControlValue(), OUString() ); } //------------------------------------------------------------------------------------------------------------------ @@ -300,7 +300,7 @@ namespace svt bool bNativeOK = getTargetDevice().GetNativeControlRegion( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, i_rContentArea, nState, - tiValue, ::rtl::OUString(), + tiValue, OUString(), aBoundingRegion, aContentRegion ); (void)bNativeOK; @@ -321,7 +321,7 @@ namespace svt tiValue.mnAlignment |= TABITEM_LAST_IN_GROUP; - bool bNativeOK = getTargetDevice().DrawNativeControl( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, i_rContentRect, nState, tiValue, rtl::OUString() ); + bool bNativeOK = getTargetDevice().DrawNativeControl( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, i_rContentRect, nState, tiValue, OUString() ); (void)bNativeOK; OSL_ENSURE( bNativeOK, "NWFTabItemRenderer::preRenderItem: inconsistent NWF implementation!" ); // IsNativeControlSupported returned true, previously, otherwise we would not be here ... @@ -587,7 +587,7 @@ namespace svt const Image aImage( i_pPanel->GetImage() ); const bool bUseImage = !!aImage && ( i_eItemContent != TABITEM_TEXT_ONLY ); - const ::rtl::OUString sItemText( i_pPanel->GetDisplayName() ); + const OUString sItemText( i_pPanel->GetDisplayName() ); const bool bUseText = ( !sItemText.isEmpty() ) && ( i_eItemContent != TABITEM_IMAGE_ONLY ); Size aItemContentSize; @@ -658,7 +658,7 @@ namespace svt m_rTabBar.DrawImage( aImagePos, aItemImage ); } - const ::rtl::OUString sItemText( i_pPanel->GetDisplayName() ); + const OUString sItemText( i_pPanel->GetDisplayName() ); const bool bUseText = ( !sItemText.isEmpty() ) && ( i_eItemContent != TABITEM_IMAGE_ONLY ); if ( bUseText ) @@ -1173,7 +1173,7 @@ namespace svt // if the text is displayed for the item, we do not need to show it as tooltip return; - const ::rtl::OUString sItemText( rItem.pPanel->GetDisplayName() ); + const OUString sItemText( rItem.pPanel->GetDisplayName() ); if ( i_rHelpEvent.GetMode() == HELPMODE_BALLOON ) Help::ShowBalloon( this, OutputToScreenPixel( rItem.GetCurrentRect().Center() ), rItem.GetCurrentRect(), sItemText ); else diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx index fcc452e3543f..31c307476f46 100644 --- a/svtools/source/toolpanel/paneltabbarpeer.cxx +++ b/svtools/source/toolpanel/paneltabbarpeer.cxx @@ -65,7 +65,7 @@ namespace svt { SolarMutexGuard aSolarGuard; if ( m_pTabBar == NULL ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx index 1496b753f407..f5a18d039272 100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx @@ -65,7 +65,7 @@ namespace svt { SolarMutexGuard aSolarGuard; if ( m_pDeck == NULL ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); Window* pAccessibleParent( m_pDeck->GetAccessibleParentWindow() ); ENSURE_OR_RETURN( pAccessibleParent != NULL, "no accessible parent => no accessible context", NULL ); diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index 7d161c5bf38b..ba11c65931cf 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -70,7 +70,7 @@ namespace svt //= ToolPanelDrawer //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ - ToolPanelDrawer::ToolPanelDrawer( Window& i_rParent, const ::rtl::OUString& i_rTitle ) + ToolPanelDrawer::ToolPanelDrawer( Window& i_rParent, const OUString& i_rTitle ) :Window( &i_rParent, WB_TABSTOP ) ,m_pPaintDevice( new VirtualDevice( *this ) ) ,m_aVisualization( *this ) diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx index f380b74a6c21..f2dfea75b1ff 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawer.hxx @@ -60,7 +60,7 @@ namespace svt class ToolPanelDrawer : public Window { public: - ToolPanelDrawer( Window& i_rParent, const ::rtl::OUString& i_rTitle ); + ToolPanelDrawer( Window& i_rParent, const OUString& i_rTitle ); ~ToolPanelDrawer(); long GetPreferredHeightPixel() const; diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index c7e6cebd0e23..691c278e0369 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -50,8 +50,8 @@ namespace svt protected: Sequence< AliasProgrammaticPair > m_aAliases; Reference< XDataSource > m_xDataSource; - ::rtl::OUString m_sDataSourceName; - ::rtl::OUString m_sTable; + OUString m_sDataSourceName; + OUString m_sTable; protected: OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB); @@ -61,12 +61,12 @@ namespace svt virtual Sequence SAL_CALL getImplementationId( ) throw(RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(RuntimeException); // XServiceInfo - static methods - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( RuntimeException ); + static Sequence< OUString > getSupportedServiceNames_Static(void) throw( RuntimeException ); + static OUString getImplementationName_Static(void) throw( RuntimeException ); static Reference< XInterface > SAL_CALL Create(const Reference< com::sun::star::lang::XMultiServiceFactory >&); @@ -101,7 +101,7 @@ namespace svt OAddressBookSourceDialogUno::OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB) :OGenericUnoDialog(_rxORB) { - registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_ALIASES), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY, + registerProperty(OUString(UNODIALOG_PROPERTY_ALIASES), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY, &m_aAliases, getCppuType(&m_aAliases)); } @@ -119,15 +119,15 @@ namespace svt } //------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------- - ::rtl::OUString OAddressBookSourceDialogUno::getImplementationName_Static() throw(RuntimeException) + OUString OAddressBookSourceDialogUno::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" ); + return OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" ); } //------------------------------------------------------------------------- @@ -140,7 +140,7 @@ namespace svt ::comphelper::StringSequence OAddressBookSourceDialogUno::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString( "com.sun.star.ui.AddressBookSourceDialog" ); + aSupported.getArray()[0] = OUString( "com.sun.star.ui.AddressBookSourceDialog" ); return aSupported; } @@ -181,9 +181,9 @@ namespace svt { Reference xParentWindow; Reference xDataSource; - rtl::OUString sDataSourceName; - rtl::OUString sCommand; - rtl::OUString sTitle; + OUString sDataSourceName; + OUString sCommand; + OUString sTitle; if ( (rArguments[0] >>= xParentWindow) && (rArguments[1] >>= xDataSource) && (rArguments[2] >>= sDataSourceName) diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 4b1ba9410842..5ceaa94cc976 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -57,7 +57,7 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener, public: StateEventHelper( const uno::Reference< frame::XDispatchProvider >& xDispatchProvider, const uno::Reference< util::XURLTransformer >& xURLTransformer, - const rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); virtual ~StateEventHelper(); bool isCommandEnabled(); @@ -79,7 +79,7 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener, StateEventHelper& operator=( const StateEventHelper& ); bool m_bCurrentCommandEnabled; - ::rtl::OUString m_aCommandURL; + OUString m_aCommandURL; uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; uno::Reference< util::XURLTransformer > m_xURLTransformer; osl::Condition m_aCondition; @@ -88,7 +88,7 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener, StateEventHelper::StateEventHelper( const uno::Reference< frame::XDispatchProvider >& xDispatchProvider, const uno::Reference< util::XURLTransformer >& xURLTransformer, - const rtl::OUString& rCommandURL ) : + const OUString& rCommandURL ) : m_bCurrentCommandEnabled( true ), m_aCommandURL( rCommandURL ), m_xDispatchProvider( xDispatchProvider ), @@ -157,7 +157,7 @@ bool StateEventHelper::isCommandEnabled() SolarMutexGuard aSolarGuard; if ( m_xDispatchProvider.is() && m_xURLTransformer.is() ) { - ::rtl::OUString aSelf( "_self" ); + OUString aSelf( "_self" ); aTargetURL.Complete = m_aCommandURL; m_xURLTransformer->parseStrict( aTargetURL ); @@ -238,13 +238,13 @@ static const PopupMenu* lcl_FindPopupFromItemId( const PopupMenu* pPopupMenu, sa return NULL; } -static ::rtl::OUString lcl_GetItemCommandRecursive( const PopupMenu* pPopupMenu, sal_uInt16 nItemId ) +static OUString lcl_GetItemCommandRecursive( const PopupMenu* pPopupMenu, sal_uInt16 nItemId ) { const PopupMenu* pPopup = lcl_FindPopupFromItemId( pPopupMenu, nItemId ); if ( pPopup ) return pPopup->GetItemCommand( nItemId ); else - return ::rtl::OUString(); + return OUString(); } /*************************************************************************/ @@ -318,7 +318,7 @@ ContextMenuHelper::executePopupMenu( if ( nResult > 0 ) { - ::rtl::OUString aCommand = lcl_GetItemCommandRecursive( pMenu, nResult ); + OUString aCommand = lcl_GetItemCommandRecursive( pMenu, nResult ); if ( !aCommand.isEmpty() ) dispatchCommand( xFrame, aCommand ); } @@ -330,7 +330,7 @@ ContextMenuHelper::executePopupMenu( bool ContextMenuHelper::dispatchCommand( const uno::Reference< ::frame::XFrame >& rFrame, - const ::rtl::OUString& aCommandURL ) + const OUString& aCommandURL ) { if ( !m_xURLTransformer.is() ) { @@ -412,7 +412,7 @@ ContextMenuHelper::associateUIConfigurationManagers() frame::ModuleManager::create( ::comphelper::getProcessComponentContext() ) ); uno::Reference< ui::XImageManager > xModuleImageManager; - rtl::OUString aModuleId; + OUString aModuleId; // retrieve module image manager aModuleId = xModuleManager->identify( xFrame ); @@ -456,14 +456,14 @@ ContextMenuHelper::associateUIConfigurationManagers() } Image -ContextMenuHelper::getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) const +ContextMenuHelper::getImageFromCommandURL( const OUString& aCmdURL ) const { Image aImage; sal_Int16 nImageType( ui::ImageType::COLOR_NORMAL| ui::ImageType::SIZE_DEFAULT ); uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq; - uno::Sequence< ::rtl::OUString > aImageCmdSeq( 1 ); + uno::Sequence< OUString > aImageCmdSeq( 1 ); aImageCmdSeq[0] = aCmdURL; if ( m_xDocImageMgr.is() ) @@ -509,11 +509,11 @@ ContextMenuHelper::getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) cons return aImage; } -rtl::OUString +OUString ContextMenuHelper::getLabelFromCommandURL( - const ::rtl::OUString& aCmdURL ) const + const OUString& aCmdURL ) const { - ::rtl::OUString aLabel; + OUString aLabel; if ( m_xUICommandLabels.is() ) { @@ -521,7 +521,7 @@ ContextMenuHelper::getLabelFromCommandURL( { if ( !aCmdURL.isEmpty() ) { - rtl::OUString aStr; + OUString aStr; uno::Sequence< beans::PropertyValue > aPropSeq; uno::Any a( m_xUICommandLabels->getByName( aCmdURL )); if ( a >>= aPropSeq ) @@ -576,7 +576,7 @@ ContextMenuHelper::completeMenuProperties( completeMenuProperties( pPopupMenu ); if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR ) { - ::rtl::OUString aCmdURL( pMenu->GetItemCommand( nId )); + OUString aCmdURL( pMenu->GetItemCommand( nId )); if ( bShowMenuImages ) { @@ -590,7 +590,7 @@ ContextMenuHelper::completeMenuProperties( if ( pMenu->GetItemText( nId ).Len() == 0 ) { - ::rtl::OUString aLabel( getLabelFromCommandURL( aCmdURL )); + OUString aLabel( getLabelFromCommandURL( aCmdURL )); pMenu->SetItemText( nId, aLabel ); } diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index 5e42e7150d34..6070041dd7af 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -155,7 +155,7 @@ throw ( RuntimeException ) bindListener(); } -void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL ) +void FrameStatusListener::addStatusListener( const OUString& aCommandURL ) { Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; @@ -186,7 +186,7 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL ) Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( m_xContext ) ); aTargetURL.Complete = aCommandURL; xURLTransformer->parseStrict( aTargetURL ); - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); URLToDispatchMap::iterator aIter = m_aListenerMap.find( aCommandURL ); @@ -263,7 +263,7 @@ void FrameStatusListener::bindListener() // Query for dispatch object. Old dispatch will be released with this, too. try { - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } catch (const Exception&) { diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index 6841e3136d77..73bbeb0f2083 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -53,7 +53,7 @@ GenericToolboxController::GenericToolboxController( const Reference< XMultiServi const Reference< XFrame >& rFrame, ToolBox* pToolbox, sal_uInt16 nID, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : svt::ToolboxController( rServiceManager, rFrame, aCommand ) , m_pToolbox( pToolbox ) , m_nID( nID ) @@ -86,7 +86,7 @@ throw ( RuntimeException ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; - ::rtl::OUString aCommandURL; + OUString aCommandURL; { SolarMutexGuard aSolarMutexGuard; @@ -142,7 +142,7 @@ throw ( RuntimeException ) TriState eTri = STATE_NOCHECK; sal_Bool bValue = sal_Bool(); - rtl::OUString aStrValue; + OUString aStrValue; ItemStatus aItemState; if ( Event.State >>= bValue ) diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 204ed20d4b9f..e3e0af5ef953 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -55,9 +55,9 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo ,m_bNeedInitialization( false ) ,m_aContext(_rxContext) { - registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT, + registerProperty(OUString(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT, &m_sTitle, getCppuType(&m_sTitle)); - registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT, + registerProperty(OUString(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT, &m_xParent, getCppuType(&m_xParent)); } @@ -98,10 +98,10 @@ Sequence SAL_CALL OGenericUnoDialog::getTypes( ) throw(RuntimeException) } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const ::rtl::OUString& ServiceName) throw(RuntimeException) +sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const OUString& ServiceName) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pArray = aSupported.getConstArray(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pArray = aSupported.getConstArray(); for (sal_Int32 i = 0; i < aSupported.getLength(); ++i, ++pArray) if (pArray->equals(ServiceName)) return sal_True; @@ -147,13 +147,13 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& } //------------------------------------------------------------------------- -void SAL_CALL OGenericUnoDialog::setTitle( const ::rtl::OUString& _rTitle ) throw(RuntimeException) +void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) throw(RuntimeException) { UnoDialogEntryGuard aGuard( *this ); try { - setPropertyValue(::rtl::OUString(UNODIALOG_PROPERTY_TITLE), makeAny(_rTitle)); + setPropertyValue(OUString(UNODIALOG_PROPERTY_TITLE), makeAny(_rTitle)); } catch(RuntimeException&) { @@ -215,7 +215,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException) if (m_bExecuting) throw RuntimeException( - ::rtl::OUString( "already executing the dialog (recursive call)" ), + OUString( "already executing the dialog (recursive call)" ), *this ); @@ -307,7 +307,7 @@ void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) - throw AlreadyInitializedException( ::rtl::OUString(), *this ); + throw AlreadyInitializedException( OUString(), *this ); const Any* pArguments = aArguments.getConstArray(); for (sal_Int32 i=0; i aSNL( getSupportedServiceNames() ); - const rtl::OUString * pArray = aSNL.getConstArray(); + const Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -158,7 +157,7 @@ void SAL_CALL PopupMenuControllerBase::select( const awt::MenuEvent& rEvent ) th } } -void PopupMenuControllerBase::dispatchCommand( const ::rtl::OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) +void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) { osl::MutexGuard aLock( m_aMutex ); @@ -206,7 +205,7 @@ void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::sta updateCommand( m_aCommandURL ); } -void SAL_CALL PopupMenuControllerBase::updateCommand( const rtl::OUString& rCommandURL ) +void SAL_CALL PopupMenuControllerBase::updateCommand( const OUString& rCommandURL ) { osl::ClearableMutexGuard aLock( m_aMutex ); Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); @@ -229,7 +228,7 @@ void SAL_CALL PopupMenuControllerBase::updateCommand( const rtl::OUString& rComm Reference< XDispatch > SAL_CALL PopupMenuControllerBase::queryDispatch( const URL& /*aURL*/, - const rtl::OUString& /*sTarget*/, + const OUString& /*sTarget*/, sal_Int32 /*nFlags*/ ) throw( RuntimeException ) { @@ -312,12 +311,12 @@ throw( ::com::sun::star::uno::RuntimeException ) rBHelper.removeListener( ::getCppuType( &xControl ), xControl ); } -::rtl::OUString PopupMenuControllerBase::determineBaseURL( const ::rtl::OUString& aURL ) +OUString PopupMenuControllerBase::determineBaseURL( const OUString& aURL ) { // Just use the main part of the URL for popup menu controllers sal_Int32 nQueryPart( 0 ); sal_Int32 nSchemePart( 0 ); - rtl::OUString aMainURL( "vnd.sun.star.popup:" ); + OUString aMainURL( "vnd.sun.star.popup:" ); nSchemePart = aURL.indexOf( ':' ); if (( nSchemePart > 0 ) && @@ -342,7 +341,7 @@ void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArgum if ( !bInitalized ) { PropertyValue aPropValue; - rtl::OUString aCommandURL; + OUString aCommandURL; Reference< XFrame > xFrame; for ( int i = 0; i < aArguments.getLength(); i++ ) @@ -386,7 +385,7 @@ void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopu URL aTargetURL; aTargetURL.Complete = m_aCommandURL; m_xURLTransformer->parseStrict( aTargetURL ); - m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + m_xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); impl_setPopupMenu(); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 0fbed242396c..c5ae27a27b40 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -26,7 +26,6 @@ #include "svtools/popupwindowcontroller.hxx" #include "svtools/toolbarmenu.hxx" -using rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index a6289f9f3f28..cee30a4f2d63 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -47,7 +47,7 @@ namespace svt StatusbarController::StatusbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& xFrame, - const ::rtl::OUString& aCommandURL, + const OUString& aCommandURL, unsigned short nID ) : OWeakObject() , m_bInitialized( sal_False ) @@ -274,7 +274,7 @@ throw ( RuntimeException ) Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR && m_nID != 0 ) { - rtl::OUString aStrValue; + OUString aStrValue; StatusBar* pStatusBar = (StatusBar *)pWindow; if ( Event.State >>= aStrValue ) @@ -340,7 +340,7 @@ void SAL_CALL StatusbarController::doubleClick() throw (::com::sun::star::uno::R execute( aArgs ); } -void StatusbarController::addStatusListener( const rtl::OUString& aCommandURL ) +void StatusbarController::addStatusListener( const OUString& aCommandURL ) { Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; @@ -371,7 +371,7 @@ void StatusbarController::addStatusListener( const rtl::OUString& aCommandURL ) Reference< XURLTransformer > xURLTransformer = getURLTransformer(); aTargetURL.Complete = aCommandURL; xURLTransformer->parseStrict( aTargetURL ); - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); URLToDispatchMap::iterator aIter = m_aListenerMap.find( aCommandURL ); @@ -450,7 +450,7 @@ void StatusbarController::bindListener() // Query for dispatch object. Old dispatch will be released with this, too. try { - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } catch ( Exception& ) { @@ -524,7 +524,7 @@ void StatusbarController::execute( const ::com::sun::star::uno::Sequence< ::com: { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; - rtl::OUString aCommandURL; + OUString aCommandURL; { SolarMutexGuard aSolarMutexGuard; @@ -562,7 +562,7 @@ void StatusbarController::execute( const ::com::sun::star::uno::Sequence< ::com: } void StatusbarController::execute( - const rtl::OUString& aCommandURL, + const OUString& aCommandURL, const Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) { Reference< XDispatch > xDispatch; @@ -591,7 +591,7 @@ void StatusbarController::execute( Reference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider( m_xFrame->getController(), UNO_QUERY ); if ( xDispatchProvider.is() ) - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } } } diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 59d1f6f22d6e..daaa2d405d32 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -99,14 +99,14 @@ void SVTXGridControl::SetWindow( Window* pWindow ) void SVTXGridControl::impl_checkColumnIndex_throw( ::svt::table::TableControl const & i_table, sal_Int32 const i_columnIndex ) const { if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= i_table.GetColumnCount() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *const_cast< SVTXGridControl* >( this ) ); + throw IndexOutOfBoundsException( OUString(), *const_cast< SVTXGridControl* >( this ) ); } // --------------------------------------------------------------------------------------------------------------------- void SVTXGridControl::impl_checkRowIndex_throw( ::svt::table::TableControl const & i_table, sal_Int32 const i_rowIndex ) const { if ( ( i_rowIndex < 0 ) || ( i_rowIndex >= i_table.GetRowCount() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *const_cast< SVTXGridControl* >( this ) ); + throw IndexOutOfBoundsException( OUString(), *const_cast< SVTXGridControl* >( this ) ); } // --------------------------------------------------------------------------------------------------------------------- @@ -184,7 +184,7 @@ void SAL_CALL SVTXGridControl::removeSelectionListener(const Reference< XGridSel } // --------------------------------------------------------------------------------------------------------------------- -void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException) +void SVTXGridControl::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -402,7 +402,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An { Reference< XGridDataModel > const xDataModel( aValue, UNO_QUERY ); if ( !xDataModel.is() ) - throw GridInvalidDataException( ::rtl::OUString( "Invalid data model." ), *this ); + throw GridInvalidDataException( OUString( "Invalid data model." ), *this ); m_pTableModel->setDataModel( xDataModel ); impl_checkTableModelInit(); @@ -414,7 +414,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An // obtain new col model Reference< XGridColumnModel > const xColumnModel( aValue, UNO_QUERY ); if ( !xColumnModel.is() ) - throw GridInvalidModelException( ::rtl::OUString( "Invalid column model." ), *this ); + throw GridInvalidModelException( OUString( "Invalid column model." ), *this ); // remove all old columns m_pTableModel->removeAllColumns(); @@ -468,7 +468,7 @@ namespace } } -Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) +Any SVTXGridControl::getProperty( const OUString& PropertyName ) throw(RuntimeException) { SolarMutexGuard aGuard; diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx index 2d320f58538e..e406b7be0025 100644 --- a/svtools/source/uno/svtxgridcontrol.hxx +++ b/svtools/source/uno/svtxgridcontrol.hxx @@ -95,8 +95,8 @@ public: virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index becdcd04bbbf..4992c16c8c1e 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -36,7 +36,6 @@ const int TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE = 1; const char TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE[] = "SupportsVisible"; -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star::awt; @@ -63,7 +62,7 @@ struct ToolboxController_Impl { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParentWindow; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; - rtl::OUString m_sModuleName; + OUString m_sModuleName; sal_uInt16 m_nToolBoxId; DECL_STATIC_LINK( ToolboxController_Impl, ExecuteHdl_Impl, DispatchInfo* ); @@ -77,7 +76,7 @@ ToolboxController::ToolboxController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& xFrame, - const ::rtl::OUString& aCommandURL ) : + const OUString& aCommandURL ) : OPropertyContainer(GetBroadcastHelper()) , OWeakObject() , m_bSupportVisible(sal_False) @@ -88,7 +87,7 @@ ToolboxController::ToolboxController( , m_aCommandURL( aCommandURL ) , m_aListenerContainer( m_aMutex ) { - registerProperty(rtl::OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, + registerProperty(OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, &m_bSupportVisible, getCppuType(&m_bSupportVisible)); m_pImpl = new ToolboxController_Impl; @@ -112,7 +111,7 @@ ToolboxController::ToolboxController() : , m_bDisposed( sal_False ) , m_aListenerContainer( m_aMutex ) { - registerProperty(rtl::OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, + registerProperty(OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, &m_bSupportVisible, getCppuType(&m_bSupportVisible)); m_pImpl = new ToolboxController_Impl; @@ -148,7 +147,7 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const { try { - xLayoutManager.set(xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" )),UNO_QUERY); + xLayoutManager.set(xPropSet->getPropertyValue( OUString( "LayoutManager" )),UNO_QUERY); } catch ( Exception& ) { @@ -351,7 +350,7 @@ void SAL_CALL ToolboxController::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException) { Reference< XDispatch > xDispatch; - ::rtl::OUString aCommandURL; + OUString aCommandURL; { SolarMutexGuard aSolarMutexGuard; @@ -380,7 +379,7 @@ throw (::com::sun::star::uno::RuntimeException) Sequence aArgs( 1 ); // Provide key modifier information to dispatch function - aArgs[0].Name = rtl::OUString( "KeyModifier" ); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value = makeAny( KeyModifier ); aTargetURL.Complete = aCommandURL; @@ -416,7 +415,7 @@ throw (::com::sun::star::uno::RuntimeException) return Reference< XWindow >(); } -void ToolboxController::addStatusListener( const rtl::OUString& aCommandURL ) +void ToolboxController::addStatusListener( const OUString& aCommandURL ) { Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; @@ -447,7 +446,7 @@ void ToolboxController::addStatusListener( const rtl::OUString& aCommandURL ) aTargetURL.Complete = aCommandURL; if ( m_pImpl->m_xUrlTransformer.is() ) m_pImpl->m_xUrlTransformer->parseStrict( aTargetURL ); - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); URLToDispatchMap::iterator aIter = m_aListenerMap.find( aCommandURL ); @@ -482,7 +481,7 @@ void ToolboxController::addStatusListener( const rtl::OUString& aCommandURL ) } } -void ToolboxController::removeStatusListener( const rtl::OUString& aCommandURL ) +void ToolboxController::removeStatusListener( const OUString& aCommandURL ) { SolarMutexGuard aSolarMutexGuard; @@ -553,7 +552,7 @@ void ToolboxController::bindListener() // Query for dispatch object. Old dispatch will be released with this, too. try { - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } catch ( Exception& ) { @@ -665,7 +664,7 @@ void ToolboxController::updateStatus() bindListener(); } -void ToolboxController::updateStatus( const rtl::OUString aCommandURL ) +void ToolboxController::updateStatus( const OUString aCommandURL ) { Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; @@ -685,7 +684,7 @@ void ToolboxController::updateStatus( const rtl::OUString aCommandURL ) aTargetURL.Complete = aCommandURL; if ( m_pImpl->m_xUrlTransformer.is() ) m_pImpl->m_xUrlTransformer->parseStrict( aTargetURL ); - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } } @@ -716,7 +715,7 @@ Reference< ::com::sun::star::awt::XWindow > ToolboxController::getParent() const return m_pImpl->m_xParentWindow; } -const rtl::OUString& ToolboxController::getModuleName() const +const OUString& ToolboxController::getModuleName() const { return m_pImpl->m_sModuleName; } diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 692b23a9a9c2..a403e317b5ae 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -41,7 +41,6 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -95,7 +94,7 @@ public: virtual void RequestingChildren( SvTreeListEntry* pParent ); virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); DECL_LINK(OnSelectionChangeHdl, void *); DECL_LINK(OnExpandingHdl, void *); @@ -707,7 +706,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com:: // -------------------------------------------------------------------- -void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; if( msDefaultExpandedGraphicURL != sDefaultExpandedGraphicURL ) @@ -745,7 +744,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com: // -------------------------------------------------------------------- -void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; if( msDefaultCollapsedGraphicURL != sDefaultCollapsedGraphicURL ) @@ -980,7 +979,7 @@ bool TreeControlPeer::onEditingEntry( UnoTreeListEntry* pEntry ) return true; } -bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const rtl::OUString& rNewText ) +bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const OUString& rNewText ) { if( mpTreeImpl && pEntry && pEntry->mxNode.is() ) try { @@ -1282,7 +1281,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere // ::com::sun::star::awt::XVclWindowPeer // -------------------------------------------------------------------- -void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException) +void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -1385,7 +1384,7 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An } } -Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) +Any TreeControlPeer::getProperty( const OUString& PropertyName ) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -1454,7 +1453,7 @@ void TreeControlPeer::onChangeRootDisplayed( sal_Bool bIsRootDisplayed ) } } -bool TreeControlPeer::loadImage( const ::rtl::OUString& rURL, Image& rImage ) +bool TreeControlPeer::loadImage( const OUString& rURL, Image& rImage ) { if( !mxGraphicProvider.is() ) { @@ -1571,7 +1570,7 @@ sal_Bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& ) // -------------------------------------------------------------------- -sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) +sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { return mxPeer.is() ? mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ) : false; } @@ -1581,7 +1580,7 @@ sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const rtl::OU // ==================================================================== UnoTreeListItem::UnoTreeListItem( SvTreeListEntry* pEntry ) -: SvLBoxString(pEntry, 0, rtl::OUString()) +: SvLBoxString(pEntry, 0, OUString()) { } diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 4610b9540efd..8e3dcf77fd5d 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -75,10 +75,10 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration( ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTreeControl - virtual ::rtl::OUString SAL_CALL getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultExpandedGraphicURL( const ::rtl::OUString& _defaultexpandedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultCollapsedGraphicURL( const ::rtl::OUString& _defaultcollapsedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isNodeExpanded( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isNodeCollapsed( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL makeNodeVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException); @@ -112,8 +112,8 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); private: UnoTreeListEntry* getEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, bool bThrow = true ) throw (::com::sun::star::lang::IllegalArgumentException ); @@ -121,7 +121,7 @@ private: void disposeControl(); bool onEditingEntry( UnoTreeListEntry* pEntry ); - bool onEditedEntry( UnoTreeListEntry* pEntry, const rtl::OUString& rNewText ); + bool onEditedEntry( UnoTreeListEntry* pEntry, const OUString& rNewText ); void eraseTree( UnoTreeListBoxImpl& rTree ); void fillTree( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >& xDataModel ); @@ -134,7 +134,7 @@ private: void updateNode( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, bool bRecursive ); void updateChildNodes( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry ); - ::rtl::OUString getEntryString( const ::com::sun::star::uno::Any& rValue ); + OUString getEntryString( const ::com::sun::star::uno::Any& rValue ); UnoTreeListBoxImpl& getTreeListBoxOrThrow() const throw (::com::sun::star::uno::RuntimeException ); void ChangeNodesSelection( const ::com::sun::star::uno::Any& rSelection, bool bSelect, bool bSetSelection ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); @@ -151,7 +151,7 @@ private: void addEntry( UnoTreeListEntry* pEntry ); void removeEntry( UnoTreeListEntry* pEntry ); - bool loadImage( const ::rtl::OUString& rURL, Image& rImage ); + bool loadImage( const OUString& rURL, Image& rImage ); private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >mxDataModel; @@ -161,8 +161,8 @@ private: sal_Bool mbIsRootDisplayed; UnoTreeListBoxImpl* mpTreeImpl; sal_Int32 mnEditLock; - ::rtl::OUString msDefaultCollapsedGraphicURL; - ::rtl::OUString msDefaultExpandedGraphicURL; + OUString msDefaultCollapsedGraphicURL; + OUString msDefaultExpandedGraphicURL; Image maDefaultExpandedImage; Image maDefaultCollapsedImage; TreeNodeMap* mpTreeNodeMap; diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index ada18afb5981..0f967fe45709 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -35,8 +35,6 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::lang::XServiceInfo; using ::com::sun::star::beans::PropertyValue; using ::cppu::WeakImplHelper2; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; const sal_Char sAPI_ServiceName[] = "com.sun.star.container.XNameReplace"; diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx index 2ee6782004f1..48e6319e6a70 100644 --- a/svtools/source/uno/unogridcolumnfacade.cxx +++ b/svtools/source/uno/unogridcolumnfacade.cxx @@ -267,7 +267,7 @@ namespace svt { namespace table //------------------------------------------------------------------------------------------------------------------ String UnoGridColumnFacade::getName() const { - ::rtl::OUString sName; + OUString sName; ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", sName ); try { @@ -297,7 +297,7 @@ namespace svt { namespace table //------------------------------------------------------------------------------------------------------------------ String UnoGridColumnFacade::getHelpText() const { - ::rtl::OUString sHelpText; + OUString sHelpText; ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", sHelpText ); try { diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 43612825ac3f..658623f8ca53 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -210,7 +210,7 @@ void VCLXMultiLineEdit::removeTextListener( const ::com::sun::star::uno::Referen maTextListeners.removeInterface( l ); } -void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXMultiLineEdit::setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -227,7 +227,7 @@ void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun } } -void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -239,22 +239,22 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel } } -::rtl::OUString VCLXMultiLineEdit::getText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXMultiLineEdit::getText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow(); if ( pEdit ) aText = pEdit->GetText( meLineEndType ); return aText; } -::rtl::OUString VCLXMultiLineEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXMultiLineEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow(); if ( pMultiLineEdit) aText = pMultiLineEdit->GetSelected( meLineEndType ); @@ -321,11 +321,11 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim return pMultiLineEdit ? (sal_Int16)pMultiLineEdit->GetMaxTextLen() : (sal_Int16)0; } -::rtl::OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow(); if ( pEdit ) aText = pEdit->GetTextLines( meLineEndType ); @@ -407,7 +407,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven } } -void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -463,7 +463,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const } } -::com::sun::star::uno::Any VCLXMultiLineEdit::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXMultiLineEdit::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -562,7 +562,7 @@ IMPL_XTYPEPROVIDER_START( VCLXFileControl ) VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END -void SAL_CALL VCLXFileControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -612,7 +612,7 @@ void VCLXFileControl::removeTextListener( const ::com::sun::star::uno::Reference maTextListeners.removeInterface( l ); } -void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXFileControl::setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -627,7 +627,7 @@ void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun:: } } -void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -639,22 +639,22 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, } } -::rtl::OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); return aText; } -::rtl::OUString VCLXFileControl::getSelectedText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXFileControl::getSelectedText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; FileControl* pFileControl = (FileControl*) GetWindow(); if ( pFileControl) aText = pFileControl->GetEdit().GetSelected(); @@ -831,7 +831,7 @@ void SVTXFormattedField::SetWindow( Window* _pWindow ) } // -------------------------------------------------------------------------------------- -void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -956,7 +956,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const } // -------------------------------------------------------------------------------------- -::com::sun::star::uno::Any SVTXFormattedField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1053,12 +1053,12 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const rValue >>= d; String sConverted; pFormatter->GetOutputString(d, 0, sConverted, &pDum); - aReturn <<= ::rtl::OUString( sConverted ); + aReturn <<= OUString( sConverted ); } break; case ::com::sun::star::uno::TypeClass_STRING: { - ::rtl::OUString aStr; + OUString aStr; rValue >>= aStr; String sValue = aStr; if (pField->TreatingAsNumber()) @@ -1186,7 +1186,7 @@ void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValu break; case ::com::sun::star::uno::TypeClass_STRING: { - ::rtl::OUString aStr; + OUString aStr; aConverted >>= aStr; pField->SetDefaultText( aStr ); } @@ -1209,7 +1209,7 @@ void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValu if (pField->TreatingAsNumber()) aReturn <<= pField->GetDefaultValue(); else - aReturn <<= ::rtl::OUString( pField->GetDefaultText() ); + aReturn <<= OUString( pField->GetDefaultText() ); return aReturn; } @@ -1241,7 +1241,7 @@ void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet) ::com::sun::star::uno::Any aReturn; if (!pField->TreatingAsNumber()) { - ::rtl::OUString sText = pField->GetTextValue(); + OUString sText = pField->GetTextValue(); aReturn <<= sText; } else @@ -1276,7 +1276,7 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue) { DBG_ASSERT(rValue.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING, "SVTXFormattedField::SetValue : invalid argument !"); - ::rtl::OUString sText; + OUString sText; rValue >>= sText; String aStr( sText ); if (!pField->TreatingAsNumber()) @@ -1449,12 +1449,12 @@ void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeE xRoadmapItem = evt.Source; sal_Int32 nID = 0; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY ); - ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( "ID" )); + ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(OUString( "ID" )); aValue >>= nID; ::com::sun::star::uno::Any rVal = evt.NewValue; evt.NewValue >>= rVal; - ::rtl::OUString sPropertyName = evt.PropertyName; + OUString sPropertyName = evt.PropertyName; if ( sPropertyName == "Enabled" ) { sal_Bool bEnable = false; @@ -1463,7 +1463,7 @@ void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeE } else if ( sPropertyName == "Label" ) { - ::rtl::OUString sLabel; + OUString sLabel; evt.NewValue >>= sLabel; pField->ChangeRoadmapItemLabel( (RoadmapTypes::ItemId)nID , sLabel ); } @@ -1498,11 +1498,11 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY ); if ( xPropertySet.is() ) { - ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( "Label" )); + ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(OUString( "Label" )); aValue >>= aCurRMItemData.Label; - aValue = xPropertySet->getPropertyValue(::rtl::OUString( "ID" )); + aValue = xPropertySet->getPropertyValue(OUString( "ID" )); aValue >>= aCurRMItemData.n_ID; - aValue = xPropertySet->getPropertyValue(::rtl::OUString( "Enabled" )); + aValue = xPropertySet->getPropertyValue(OUString( "Enabled" )); aValue >>= aCurRMItemData.b_Enabled; } return aCurRMItemData; @@ -1549,7 +1549,7 @@ void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerE // -------------------------------------------------------------------------------------- -void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void SVTXRoadmap::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1585,7 +1585,7 @@ void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com: case BASEPROPERTY_TEXT: { - ::rtl::OUString aStr; + OUString aStr; Value >>= aStr; pField->SetText( aStr ); pField->Invalidate(); @@ -1604,7 +1604,7 @@ void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com: // -------------------------------------------------------------------------------------- -::com::sun::star::uno::Any SVTXRoadmap::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1980,7 +1980,7 @@ sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::Runtim return pField ? pField->IsStrictFormat() : sal_False; } -void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void SVTXCurrencyField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1994,7 +1994,7 @@ void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const { case BASEPROPERTY_CURRENCYSYMBOL: { - ::rtl::OUString aStr; + OUString aStr; Value >>= aStr; pField->setCurrencySymbol( aStr ); } @@ -2015,7 +2015,7 @@ void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const SVTXFormattedField::setProperty(PropertyName, Value); } -::com::sun::star::uno::Any SVTXCurrencyField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2029,7 +2029,7 @@ void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const { case BASEPROPERTY_CURRENCYSYMBOL: { - aReturn <<= ::rtl::OUString( pField->getCurrencySymbol() ); + aReturn <<= OUString( pField->getCurrencySymbol() ); } break; case BASEPROPERTY_CURSYM_POSITION: @@ -2198,7 +2198,7 @@ sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeExcept } // ::com::sun::star::awt::VclWindowPeer -void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXProgressBar::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2256,7 +2256,7 @@ void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const :: } } -::com::sun::star::uno::Any VCLXProgressBar::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2314,7 +2314,7 @@ SVTXDateField::~SVTXDateField() { } -void SAL_CALL SVTXDateField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { VCLXDateField::setProperty( PropertyName, Value ); diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index a3272144fa68..d08a734e26f3 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -109,9 +109,9 @@ public: virtual Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName( ) throw( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( RuntimeException ); private: static PropertySetInfo* createPropertySetInfo( sal_uInt16 nType ); @@ -119,11 +119,11 @@ private: sal_uInt16 mnType; - ::rtl::OUString maURL; - ::rtl::OUString maAltText; - ::rtl::OUString maDesc; - ::rtl::OUString maTarget; - ::rtl::OUString maName; + OUString maURL; + OUString maAltText; + OUString maDesc; + OUString maTarget; + OUString maName; sal_Bool mbIsActive; awt::Rectangle maBoundary; awt::Point maCenter; @@ -141,11 +141,11 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { static PropertyMapEntry aPolygonObj_Impl[] = { - { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, { MAP_LEN( "Polygon" ), HANDLE_POLYGON, SEQTYPE(::getCppuType((const PointSequence*)0)), 0, 0 }, {0,0,0,0,0,0} @@ -157,11 +157,11 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { static PropertyMapEntry aCircleObj_Impl[] = { - { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, { MAP_LEN( "Center" ), HANDLE_CENTER, &::getCppuType((const awt::Point*)0), 0, 0 }, { MAP_LEN( "Radius" ), HANDLE_RADIUS, &::getCppuType((const sal_Int32*)0), 0, 0 }, @@ -175,11 +175,11 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { static PropertyMapEntry aRectangleObj_Impl[] = { - { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + { MAP_LEN( "URL" ), HANDLE_URL, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Title" ), HANDLE_TITLE, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, { MAP_LEN( "Boundary" ), HANDLE_BOUNDARY, &::getCppuType((const awt::Rectangle*)0), 0, 0 }, {0,0,0,0,0,0} @@ -384,10 +384,10 @@ uno::Sequence< sal_Int8 > SAL_CALL SvUnoImageMapObject::getImplementationId() // XServiceInfo -sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); const sal_Int32 nCount = aSNL.getLength(); for( sal_Int32 i = 0; i < nCount; i++ ) @@ -397,38 +397,38 @@ sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const ::rtl::OUString& return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames() +Sequence< OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames() throw(RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.image.ImageMapObject" ); + Sequence< OUString > aSNS( 2 ); + aSNS.getArray()[0] = OUString("com.sun.star.image.ImageMapObject" ); switch( mnType ) { case IMAP_OBJ_POLYGON: default: - aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapPolygonObject" ); + aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapPolygonObject" ); break; case IMAP_OBJ_RECTANGLE: - aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapRectangleObject" ); + aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapRectangleObject" ); break; case IMAP_OBJ_CIRCLE: - aSNS.getArray()[1] = ::rtl::OUString("com.sun.star.image.ImageMapCircleObject" ); + aSNS.getArray()[1] = OUString("com.sun.star.image.ImageMapCircleObject" ); break; } return aSNS; } -::rtl::OUString SAL_CALL SvUnoImageMapObject::getImplementationName() throw(RuntimeException) +OUString SAL_CALL SvUnoImageMapObject::getImplementationName() throw(RuntimeException) { switch( mnType ) { case IMAP_OBJ_POLYGON: default: - return ::rtl::OUString("org.openoffice.comp.svt.ImageMapPolygonObject"); + return OUString("org.openoffice.comp.svt.ImageMapPolygonObject"); case IMAP_OBJ_CIRCLE: - return ::rtl::OUString("org.openoffice.comp.svt.ImageMapCircleObject"); + return OUString("org.openoffice.comp.svt.ImageMapCircleObject"); case IMAP_OBJ_RECTANGLE: - return ::rtl::OUString("org.openoffice.comp.svt.ImageMapRectangleObject"); + return OUString("org.openoffice.comp.svt.ImageMapRectangleObject"); } } @@ -571,12 +571,12 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw( RuntimeException ); // XSerivceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName( ) throw( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( RuntimeException ); private: - ::rtl::OUString maName; + OUString maName; std::list< SvUnoImageMapObject* > maObjectList; }; @@ -718,17 +718,17 @@ sal_Bool SAL_CALL SvUnoImageMap::hasElements( ) throw(RuntimeException) } // XSerivceInfo -::rtl::OUString SAL_CALL SvUnoImageMap::getImplementationName( ) +OUString SAL_CALL SvUnoImageMap::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.svt.SvUnoImageMap" ); + return OUString( "org.openoffice.comp.svt.SvUnoImageMap" ); } -sal_Bool SAL_CALL SvUnoImageMap::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); const sal_Int32 nCount = aSNL.getLength(); for( sal_Int32 i = 0; i < nCount; i++ ) @@ -738,11 +738,11 @@ sal_Bool SAL_CALL SvUnoImageMap::supportsService( const ::rtl::OUString& Service return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames( ) +Sequence< OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames( ) throw(RuntimeException) { - const ::rtl::OUString aSN( "com.sun.star.image.ImageMap" ); - return Sequence< ::rtl::OUString >( &aSN, 1 ); + const OUString aSN( "com.sun.star.image.ImageMap" ); + return Sequence< OUString >( &aSN, 1 ); } sal_Bool SvUnoImageMap::fillImageMap( ImageMap& rMap ) const diff --git a/svtools/source/uno/unowizard.hxx b/svtools/source/uno/unowizard.hxx index 1ef6f7d1a6d0..4ec9a4798a34 100644 --- a/svtools/source/uno/unowizard.hxx +++ b/svtools/source/uno/unowizard.hxx @@ -49,14 +49,14 @@ namespace svt { namespace uno Wizard( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); // ::com::sun::star::lang::XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_static() throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static() throw(::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static() throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); protected: // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); @@ -66,8 +66,8 @@ namespace svt { namespace uno virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // ::com::sun::star::ui::dialogs::XWizard - virtual ::rtl::OUString SAL_CALL getHelpURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpURL( const ::rtl::OUString& _helpurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHelpURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpURL( const OUString& _helpurl ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getDialogWindow() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage > SAL_CALL getCurrentPage( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enableButton( ::sal_Int16 WizardButton, ::sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException); @@ -81,7 +81,7 @@ namespace svt { namespace uno virtual void SAL_CALL activatePath( ::sal_Int16 PathIndex, ::sal_Bool Final ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::ui::dialogs::XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XInitialization @@ -98,7 +98,7 @@ namespace svt { namespace uno ::comphelper::ComponentContext m_aContext; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int16 > > m_aWizardSteps; ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController > m_xController; - ::rtl::OUString m_sHelpURL; + OUString m_sHelpURL; }; //...................................................................................................................... diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index d2b3838e7fb2..963853c0bd8e 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -121,13 +121,13 @@ namespace svt { namespace uno { // need at least one path if ( i_rPaths.getLength() == 0 ) - throw IllegalArgumentException( ::rtl::OUString(), i_rContext, 2 ); + throw IllegalArgumentException( OUString(), i_rContext, 2 ); // each path must be of length 1, at least for ( sal_Int32 i = 0; i < i_rPaths.getLength(); ++i ) { if ( i_rPaths[i].getLength() == 0 ) - throw IllegalArgumentException( ::rtl::OUString(), i_rContext, 2 ); + throw IllegalArgumentException( OUString(), i_rContext, 2 ); // page IDs must be in ascending order sal_Int16 nPreviousPageID = i_rPaths[i][0]; @@ -135,12 +135,12 @@ namespace svt { namespace uno { if ( i_rPaths[i][j] <= nPreviousPageID ) { - ::rtl::OStringBuffer message; + OStringBuffer message; message.append( "Path " ); message.append( i ); message.append( ": invalid page ID sequence - each page ID must be greater than the previous one." ); throw IllegalArgumentException( - ::rtl::OStringToOUString( message.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ), + OStringToOUString( message.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ), i_rContext, 2 ); } nPreviousPageID = i_rPaths[i][j]; @@ -157,7 +157,7 @@ namespace svt { namespace uno { if ( i_rPaths[i][0] != nFirstPageId ) throw IllegalArgumentException( - ::rtl::OUString( "All paths must start with the same page id." ), + OUString( "All paths must start with the same page id." ), i_rContext, 2 ); } } @@ -168,15 +168,15 @@ namespace svt { namespace uno { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) - throw AlreadyInitializedException( ::rtl::OUString(), *this ); + throw AlreadyInitializedException( OUString(), *this ); if ( i_Arguments.getLength() != 2 ) - throw IllegalArgumentException( ::rtl::OUString(), *this, -1 ); + throw IllegalArgumentException( OUString(), *this, -1 ); // the second argument must be a XWizardController, for each constructor m_xController.set( i_Arguments[1], UNO_QUERY ); if ( !m_xController.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 2 ); + throw IllegalArgumentException( OUString(), *this, 2 ); // the first arg is either a single path (short[]), or multiple paths (short[][]) Sequence< sal_Int16 > aSinglePath; @@ -196,21 +196,21 @@ namespace svt { namespace uno m_bInitialized = true; } - static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL ) + static OString lcl_getHelpId( const OUString& _rHelpURL ) { INetURLObject aHID( _rHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) - return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); else - return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------ - static ::rtl::OUString lcl_getHelpURL( const rtl::OString& sHelpId ) + static OUString lcl_getHelpURL( const OString& sHelpId ) { - ::rtl::OUStringBuffer aBuffer; - ::rtl::OUString aTmp( - rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ); + OUStringBuffer aBuffer; + OUString aTmp( + OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ); INetURLObject aHID( aTmp ); if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) aBuffer.appendAscii( INET_HID_SCHEME ); @@ -237,27 +237,27 @@ namespace svt { namespace uno } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL Wizard::getImplementationName_static() throw(RuntimeException) + OUString SAL_CALL Wizard::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.svtools.uno.Wizard" ); + return OUString( "com.sun.star.comp.svtools.uno.Wizard" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException) + Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException) { - Sequence< ::rtl::OUString > aServices(1); - aServices[0] = ::rtl::OUString( "com.sun.star.ui.dialogs.Wizard" ); + Sequence< OUString > aServices(1); + aServices[0] = OUString( "com.sun.star.ui.dialogs.Wizard" ); return aServices; } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL Wizard::getImplementationName() throw(RuntimeException) + OUString SAL_CALL Wizard::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } @@ -283,7 +283,7 @@ namespace svt { namespace uno } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL Wizard::getHelpURL() throw (RuntimeException) + OUString SAL_CALL Wizard::getHelpURL() throw (RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -295,7 +295,7 @@ namespace svt { namespace uno } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL Wizard::setHelpURL( const ::rtl::OUString& i_HelpURL ) throw (RuntimeException) + void SAL_CALL Wizard::setHelpURL( const OUString& i_HelpURL ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -374,10 +374,10 @@ namespace svt { namespace uno ENSURE_OR_RETURN_VOID( pWizardImpl, "Wizard::enablePage: invalid dialog implementation!" ); if ( !pWizardImpl->knowsPage( i_PageID ) ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); if ( i_PageID == pWizardImpl->getCurrentPage() ) - throw InvalidStateException( ::rtl::OUString(), *this ); + throw InvalidStateException( OUString(), *this ); pWizardImpl->enablePage( i_PageID, i_Enable ); } @@ -437,7 +437,7 @@ namespace svt { namespace uno ::osl::MutexGuard aGuard( m_aMutex ); if ( ( i_PathIndex < 0 ) || ( i_PathIndex >= m_aWizardSteps.getLength() ) ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog ); ENSURE_OR_RETURN_VOID( pWizardImpl, "Wizard::activatePath: invalid dialog implementation!" ); @@ -446,7 +446,7 @@ namespace svt { namespace uno } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL Wizard::setTitle( const ::rtl::OUString& i_Title ) throw (RuntimeException) + void SAL_CALL Wizard::setTitle( const OUString& i_Title ) throw (RuntimeException) { // simply disambiguate Wizard_Base::OGenericUnoDialog::setTitle( i_Title ); diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index 263404c171de..e57c194b8870 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -40,7 +40,7 @@ sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const sString += TOKEN_SEPARATOR; sString += OUString::number( aSizePixel.Height() ); - rtl::OString sOut(rtl::OUStringToOString(sString, + OString sOut(OUStringToOString(sString, RTL_TEXTENCODING_UTF8)); rOStm.Write(sOut.getStr(), sOut.getLength()); diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/svx/inc/svx/AccessibleControlShape.hxx index a1df3ff8bd42..54cdd7719c99 100644 --- a/svx/inc/svx/AccessibleControlShape.hxx +++ b/svx/inc/svx/AccessibleControlShape.hxx @@ -73,7 +73,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); //--- XServiceInfo --------------------------------------- - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); //--- XInterface ----------------------------------------- DECLARE_XINTERFACE( ) @@ -111,19 +111,19 @@ protected: virtual void Init( ); /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName( ) throw(::com::sun::star::uno::RuntimeException); /** Create a unique name string that contains the accessible name. The name consists of the base name and the index. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleName( ) throw(::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription( ) throw(::com::sun::star::uno::RuntimeException); @@ -133,14 +133,14 @@ protected: #endif // DBG_UTIL /// (safely) reads the given property from the model of the UNO control - ::rtl::OUString getControlModelStringProperty( const ::rtl::OUString& _rPropertyName ) const SAL_THROW(( )); + OUString getControlModelStringProperty( const OUString& _rPropertyName ) const SAL_THROW(( )); /// ensure that our control model exists(will be retrieved upon need only) sal_Bool ensureControlModelAccess( ) SAL_THROW(( )); /// ensures that we're listening for the given property if(and only if!) necessary bool ensureListeningState( const bool _bCurrentlyListening, const bool _bNeedNewListening, - const ::rtl::OUString& _rPropertyName ); + const OUString& _rPropertyName ); /// starts multiplexing the state changes of our aggregate context void startStateMultiplexing( ); diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/svx/inc/svx/AccessibleGraphicShape.hxx index e92181392a6f..cfe87332fe38 100644 --- a/svx/inc/svx/AccessibleGraphicShape.hxx +++ b/svx/inc/svx/AccessibleGraphicShape.hxx @@ -45,7 +45,7 @@ public: //===== XAccessibleImage ================================================ - ::rtl::OUString SAL_CALL getAccessibleImageDescription (void) + OUString SAL_CALL getAccessibleImageDescription (void) throw (::com::sun::star::uno::RuntimeException); sal_Int32 SAL_CALL getAccessibleImageHeight (void) @@ -72,11 +72,11 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -88,12 +88,12 @@ public: protected: /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx index 02cb0f758019..1c3fe797ed59 100644 --- a/svx/inc/svx/AccessibleOLEShape.hxx +++ b/svx/inc/svx/AccessibleOLEShape.hxx @@ -52,7 +52,7 @@ public: throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) + OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -78,11 +78,11 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -94,12 +94,12 @@ public: protected: /// Create a name string that contains the accessible name. - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx index 00fe4d679dea..450b090f7562 100644 --- a/svx/inc/svx/AccessibleShape.hxx +++ b/svx/inc/svx/AccessibleShape.hxx @@ -261,11 +261,11 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -352,19 +352,19 @@ protected: /** Create a base name string that contains the accessible name. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException); /** Create a unique name string that contains the accessible name. The name consists of the base name and the index. */ - virtual ::rtl::OUString + virtual OUString CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); /// Create a description string that contains the accessible description. - virtual ::rtl::OUString + virtual OUString CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/svx/inc/svx/AccessibleTableShape.hxx index 5906b4d96060..fe239cf271c7 100644 --- a/svx/inc/svx/AccessibleTableShape.hxx +++ b/svx/inc/svx/AccessibleTableShape.hxx @@ -72,8 +72,8 @@ public: // XAccessibleTable virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException); @@ -100,7 +100,7 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL disposing( ); @@ -108,7 +108,7 @@ public: using AccessibleShape::disposing; protected: - virtual ::rtl::OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException); sdr::table::SvxTableController* getTableController(); diff --git a/svx/inc/svx/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx index f1543f432da5..ce616409922e 100644 --- a/svx/inc/svx/ActionDescriptionProvider.hxx +++ b/svx/inc/svx/ActionDescriptionProvider.hxx @@ -50,8 +50,8 @@ public: }; public: - static ::rtl::OUString createDescription( ActionType eActionType - , const ::rtl::OUString& rObjectName ); + static OUString createDescription( ActionType eActionType + , const OUString& rObjectName ); }; #endif diff --git a/svx/inc/svx/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx index ea676eb46815..fce8478719c9 100644 --- a/svx/inc/svx/DescriptionGenerator.hxx +++ b/svx/inc/svx/DescriptionGenerator.hxx @@ -64,7 +64,7 @@ public: An introductory description of the shape that is made more specific by later calls to addProperty. */ - void Initialize (::rtl::OUString sPrefix); + void Initialize (OUString sPrefix); /** Initialize the description with the specified string from the resource followed by the shape's style in parantheses and a colon. @@ -80,7 +80,7 @@ public: @return The description string in its current form. */ - ::rtl::OUString operator() (void); + OUString operator() (void); /** Add the given property name and its associated value to the description string. If the property value does not differ from the @@ -98,9 +98,9 @@ public: This which id is used to localize the property value. If it is not known a value of -1 signals to use a default representation. */ - void AddProperty (const ::rtl::OUString& sPropertyName, + void AddProperty (const OUString& sPropertyName, PropertyType aType, - const ::rtl::OUString& sLocalizedName=::rtl::OUString(), + const OUString& sLocalizedName=OUString(), long nWhichId=-1); /** Add the given property name and its associated value to the @@ -120,7 +120,7 @@ public: This which id is used to localize the property value. If it is not known a value of -1 signals to use a default representation. */ - void AddProperty (const ::rtl::OUString& sPropertyName, + void AddProperty (const OUString& sPropertyName, PropertyType aType, sal_Int32 nResourceId, long nWhichId=-1); @@ -130,7 +130,7 @@ public: String to append to the current description. It is not modified in any way. */ - void AppendString (const ::rtl::OUString& sString); + void AppendString (const OUString& sString); /** Add properties that describe line and border attributes. */ @@ -156,7 +156,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> mxSet; /// The description string that is build. - ::rtl::OUStringBuffer msDescription; + OUStringBuffer msDescription; /** This flag is used to determine whether to insert a separator e.g. a comma before the next property. @@ -165,20 +165,20 @@ private: /** Add a property value formated as color to the description string. */ - SVX_DLLPRIVATE void AddColor (const ::rtl::OUString& sPropertyName, - const ::rtl::OUString& sLocalizedName); + SVX_DLLPRIVATE void AddColor (const OUString& sPropertyName, + const OUString& sLocalizedName); /** Add a property value formated as integer to the description string. */ - SVX_DLLPRIVATE void AddInteger (const ::rtl::OUString& sPropertyName, - const ::rtl::OUString& sLocalizedName); + SVX_DLLPRIVATE void AddInteger (const OUString& sPropertyName, + const OUString& sLocalizedName); /** Add a property value formated as string to the description string. @param sPropertyName Name of the property. */ - SVX_DLLPRIVATE void AddString (const ::rtl::OUString& sPropertyName, - const ::rtl::OUString& sLocalizedName, long nWhichId = -1); + SVX_DLLPRIVATE void AddString (const OUString& sPropertyName, + const OUString& sLocalizedName, long nWhichId = -1); /** Add a property value formated as fill style to the description string. If the fill style is HATCH, @@ -187,8 +187,8 @@ private: @param sPropertyName Name of the property. Usually this will be "FillStyle". */ - SVX_DLLPRIVATE void AddFillStyle (const ::rtl::OUString& sPropertyName, - const ::rtl::OUString& sLocalizedName); + SVX_DLLPRIVATE void AddFillStyle (const OUString& sPropertyName, + const OUString& sLocalizedName); }; diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx index 35690ce03374..600e247db6b5 100644 --- a/svx/inc/svx/EnhancedCustomShape2d.hxx +++ b/svx/inc/svx/EnhancedCustomShape2d.hxx @@ -103,7 +103,7 @@ class EnhancedCustomShape2d : public SfxItemSet sal_Bool bReady; double fValue; }; - com::sun::star::uno::Sequence< rtl::OUString > seqEquations; + com::sun::star::uno::Sequence< OUString > seqEquations; std::vector< ::boost::shared_ptr< EnhancedCustomShape::ExpressionNode > > vNodesSharedPtr; std::vector< EquationResult > vEquationResults; @@ -209,9 +209,9 @@ class EnhancedCustomShape2d : public SfxItemSet double GetEquationValueAsDouble( const sal_Int32 nIndex ) const; sal_Int32 GetAdjustValueAsInteger( const sal_Int32 nIndex, const sal_Int32 nDefault = 0 ) const; - SVX_DLLPUBLIC static rtl::OUString GetEquation( const sal_uInt16 nFlags, sal_Int16 nPara1, sal_Int16 nPara2, sal_Int16 nPara3 ); + SVX_DLLPUBLIC static OUString GetEquation( const sal_uInt16 nFlags, sal_Int16 nPara1, sal_Int16 nPara2, sal_Int16 nPara3 ); - static void AppendEnhancedCustomShapeEquationParameter( rtl::OUString& rParameter, const sal_Int16 nPara, const bool bIsSpecialValue ); + static void AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int16 nPara, const bool bIsSpecialValue ); static void SetEnhancedCustomShapeEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, const sal_Int16 nPara, const sal_Bool bIsSpecialValue ); diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx index e2f45100bbcb..28df983df61c 100644 --- a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx @@ -189,7 +189,7 @@ public: @return the generated function object. */ - SVX_DLLPUBLIC static ExpressionNodeSharedPtr parseFunction( const ::rtl::OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ); + SVX_DLLPUBLIC static ExpressionNodeSharedPtr parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ); private: // disabled constructor/destructor, since this is diff --git a/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx index 6f0be14150b0..6be004105956 100644 --- a/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx +++ b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx @@ -24,8 +24,8 @@ namespace EnhancedCustomShapeTypeNames { - SVX_DLLPUBLIC MSO_SPT Get( const rtl::OUString& ); - SVX_DLLPUBLIC rtl::OUString Get( const MSO_SPT ); + SVX_DLLPUBLIC MSO_SPT Get( const OUString& ); + SVX_DLLPUBLIC OUString Get( const MSO_SPT ); } #endif diff --git a/svx/inc/svx/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx index 1211589d07c6..55934efcc545 100644 --- a/svx/inc/svx/ParseContext.hxx +++ b/svx/inc/svx/ParseContext.hxx @@ -43,13 +43,13 @@ namespace svxform virtual ~OSystemParseContext(); // retrieves language specific error messages - virtual ::rtl::OUString getErrorMessage(ErrorCode _eCodes) const; + virtual OUString getErrorMessage(ErrorCode _eCodes) const; // retrieves language specific keyword strings (only ASCII allowed) - virtual ::rtl::OString getIntlKeywordAscii(InternationalKeyCode _eKey) const; + virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const; // finds out, if we have an international keyword (only ASCII allowed) - virtual InternationalKeyCode getIntlKeyCode(const ::rtl::OString& rToken) const; + virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const; /** get's a locale instance which should be used when parsing in the context specified by this instance

      if this is not overridden by derived classes, it returns the static default locale.

      diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx index 83e1adf66d4c..4dea0232bc90 100644 --- a/svx/inc/svx/ShapeTypeHandler.hxx +++ b/svx/inc/svx/ShapeTypeHandler.hxx @@ -56,10 +56,10 @@ typedef AccessibleShape* (*tCreateFunction) struct ShapeTypeDescriptor { ShapeTypeId mnShapeTypeId; - rtl::OUString msServiceName; + OUString msServiceName; tCreateFunction maCreateFunction; ShapeTypeDescriptor ( - ShapeTypeId nId, const rtl::OUString& sName, tCreateFunction aFunction) + ShapeTypeId nId, const OUString& sName, tCreateFunction aFunction) : mnShapeTypeId (nId), msServiceName (sName), maCreateFunction (aFunction) @@ -95,7 +95,7 @@ public: Returns the type id of the shape with the given service name or -1 when the service name is not known. */ - ShapeTypeId GetTypeId (const ::rtl::OUString& aServiceName) const; + ShapeTypeId GetTypeId (const OUString& aServiceName) const; /** Determines the type id of the specified shape. @param xShape @@ -154,7 +154,7 @@ public: ShapeTypeDescriptor aDescriptorList[]); /// get the accessible base name for an object - static ::rtl::OUString CreateAccessibleBaseName ( + static OUString CreateAccessibleBaseName ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape) throw (::com::sun::star::uno::RuntimeException); @@ -186,8 +186,8 @@ private: given service name. */ typedef ::boost::unordered_map< - ::rtl::OUString,ShapeTypeId, - ::rtl::OUStringHash, + OUString,ShapeTypeId, + OUStringHash, ::comphelper::UStringEqual> tServiceNameToSlotId; mutable tServiceNameToSlotId maServiceNameToSlotId; @@ -199,7 +199,7 @@ private: Returns the slot id of the shape with the given service name or 0 when the service name is not known. */ - SVX_DLLPRIVATE long GetSlotId (const ::rtl::OUString& aServiceName) const; + SVX_DLLPRIVATE long GetSlotId (const OUString& aServiceName) const; /** Determine the slot id of the specified shape type. With this id internal methods can access the associated type descriptor. diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx index d0cf27836b6c..8b4364b979a8 100644 --- a/svx/inc/svx/SmartTagItem.hxx +++ b/svx/inc/svx/SmartTagItem.hxx @@ -47,8 +47,8 @@ class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem const com::sun::star::uno::Reference mxRange; const com::sun::star::uno::Reference mxController; const com::sun::star::lang::Locale maLocale; - const rtl::OUString maApplicationName; - const rtl::OUString maRangeText; + const OUString maApplicationName; + const OUString maRangeText; public: TYPEINFO(); @@ -60,8 +60,8 @@ public: const com::sun::star::uno::Reference rRange, const com::sun::star::uno::Reference rController, const com::sun::star::lang::Locale rLocale, - const rtl::OUString& rApplicationName, - const rtl::OUString& rRangeText ); + const OUString& rApplicationName, + const OUString& rRangeText ); // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; @@ -77,8 +77,8 @@ public: const com::sun::star::uno::Reference& GetTextRange() const { return mxRange; } const com::sun::star::uno::Reference& GetController() const { return mxController; } const com::sun::star::lang::Locale& GetLocale() const { return maLocale; } - const rtl::OUString GetApplicationName() const { return maApplicationName; } - const rtl::OUString GetRangeText() const { return maRangeText; } + const OUString GetApplicationName() const { return maApplicationName; } + const OUString GetRangeText() const { return maRangeText; } }; #endif // #ifndef _SVX_SMARTTAGITEM_HXX diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx index ce60a1a3dda3..836ff820650f 100644 --- a/svx/inc/svx/SmartTagMgr.hxx +++ b/svx/inc/svx/SmartTagMgr.hxx @@ -85,11 +85,11 @@ class SVX_DLLPUBLIC SmartTagMgr : public cppu::WeakImplHelper2< ::com::sun::star { private: - const rtl::OUString maApplicationName; + const OUString maApplicationName; std::vector< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagRecognizer > > maRecognizerList; std::vector< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > maActionList; - std::set< rtl::OUString > maDisabledSmartTagTypes; - std::multimap < rtl::OUString, ActionReference > maSmartTagMap; + std::set< OUString > maDisabledSmartTagTypes; + std::multimap < OUString, ActionReference > maSmartTagMap; mutable com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > mxBreakIter; com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext> mxContext; com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxConfigurationSettings; @@ -102,7 +102,7 @@ private: /** Prepare configuration access. */ - void PrepareConfiguration( const rtl::OUString& rConfigurationGroupName ); + void PrepareConfiguration( const OUString& rConfigurationGroupName ); /** Reads the configuration data. */ @@ -120,13 +120,13 @@ private: public: - SmartTagMgr( const rtl::OUString& rApplicationName ); + SmartTagMgr( const OUString& rApplicationName ); virtual ~SmartTagMgr(); /** Triggeres configuration reading, library loading and listener registration NOTE: MUST BE CALLED AFTER CONSTRUCTION! */ - void Init( const rtl::OUString& rConfigurationGroupName ); + void Init( const OUString& rConfigurationGroupName ); /** Dispatches the recognize call to all installed smart tag recognizers @@ -149,7 +149,7 @@ public: The length of the text to be scanned. */ - void Recognize( const rtl::OUString& rText, + void Recognize( const OUString& rText, const com::sun::star::uno::Reference< com::sun::star::text::XTextMarkup > xMarkup, const com::sun::star::uno::Reference< com::sun::star::frame::XController > xController, const com::sun::star::lang::Locale& rLocale, @@ -166,7 +166,7 @@ public: @param rActionIndicesSequence Output parameter */ - void GetActionSequences( com::sun::star::uno::Sequence < rtl::OUString >& rSmartTagTypes, + void GetActionSequences( com::sun::star::uno::Sequence < OUString >& rSmartTagTypes, com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence, com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence ) const; @@ -178,11 +178,11 @@ public: @param rLocale The locale. */ - rtl::OUString GetSmartTagCaption( const rtl::OUString& rSmartTagType, const com::sun::star::lang::Locale& rLocale ) const; + OUString GetSmartTagCaption( const OUString& rSmartTagType, const com::sun::star::lang::Locale& rLocale ) const; /** Returns true if the given smart tag type is enabled. */ - bool IsSmartTagTypeEnabled( const rtl::OUString& rSmartTagType ) const; + bool IsSmartTagTypeEnabled( const OUString& rSmartTagType ) const; /** Enable or disable smart tags. */ @@ -205,11 +205,11 @@ public: /** Writes configuration settings. */ void WriteConfiguration( const bool* bLabelTextWithSmartTags, - const std::vector< rtl::OUString >* pDisabledTypes ) const; + const std::vector< OUString >* pDisabledTypes ) const; /** Returns the name of the application this instance has been created by. */ - const rtl::OUString GetApplicationName() const { return maApplicationName; } + const OUString GetApplicationName() const { return maApplicationName; } // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/svx/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx index b3d1e94f2266..2debc5e0747d 100644 --- a/svx/inc/svx/clipfmtitem.hxx +++ b/svx/inc/svx/clipfmtitem.hxx @@ -43,12 +43,12 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); void AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos = USHRT_MAX ); - void AddClipbrdFormat( sal_uIntPtr nId, const rtl::OUString& rName, + void AddClipbrdFormat( sal_uIntPtr nId, const OUString& rName, sal_uInt16 nPos = USHRT_MAX ); sal_uInt16 Count() const; sal_uIntPtr GetClipbrdFormatId( sal_uInt16 nPos ) const; - const rtl::OUString GetClipbrdFormatName( sal_uInt16 nPos ) const; + const OUString GetClipbrdFormatName( sal_uInt16 nPos ) const; }; diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx index 6817189db41c..67ecb5165805 100644 --- a/svx/inc/svx/dataaccessdescriptor.hxx +++ b/svx/inc/svx/dataaccessdescriptor.hxx @@ -116,14 +116,14 @@ namespace svx /** returns either the data source name if given or the database location */ - ::rtl::OUString getDataSource() const; + OUString getDataSource() const; /** set the data source name, if it is not file URL @param _sDataSourceNameOrLocation the data source name or database location */ - void setDataSource(const ::rtl::OUString& _sDataSourceNameOrLocation); + void setDataSource(const OUString& _sDataSourceNameOrLocation); }; //........................................................................ diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx index 52d44e1b8e57..f4f40673d87b 100644 --- a/svx/inc/svx/dbaexchange.hxx +++ b/svx/inc/svx/dbaexchange.hxx @@ -45,18 +45,18 @@ namespace svx { protected: ODataAccessDescriptor m_aDescriptor; - ::rtl::OUString m_sCompatibleFormat; + OUString m_sCompatibleFormat; sal_Int32 m_nFormatFlags; public: /** construct the transferable */ OColumnTransferable( - const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand - ,const ::rtl::OUString& _rFieldName + ,const OUString& _rCommand + ,const OUString& _rFieldName ,sal_Int32 _nFormats ); @@ -102,7 +102,7 @@ namespace svx */ OColumnTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, - const ::rtl::OUString& _rFieldName, + const OUString& _rFieldName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, sal_Int32 _nFormats @@ -120,12 +120,12 @@ namespace svx */ static sal_Bool extractColumnDescriptor( const TransferableDataHelper& _rData - ,::rtl::OUString& _rDatasource - ,::rtl::OUString& _rDatabaseLocation - ,::rtl::OUString& _rConnectionResource + ,OUString& _rDatasource + ,OUString& _rDatabaseLocation + ,OUString& _rConnectionResource ,sal_Int32& _nCommandType - ,::rtl::OUString& _rCommand - ,::rtl::OUString& _rFieldName + ,OUString& _rCommand + ,OUString& _rFieldName ); /** extracts a column descriptor from the transferable given @@ -154,11 +154,11 @@ namespace svx private: SVX_DLLPRIVATE void implConstruct( - const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand - ,const ::rtl::OUString& _rFieldName + ,const OUString& _rCommand + ,const OUString& _rFieldName ); }; @@ -170,7 +170,7 @@ namespace svx class SVX_DLLPUBLIC ODataAccessObjectTransferable : public TransferableHelper { ODataAccessDescriptor m_aDescriptor; - ::rtl::OUString m_sCompatibleObjectDescription; + OUString m_sCompatibleObjectDescription; // needed to provide a SOT_FORMATSTR_ID_SBA_DATAEXCHANGE format public: @@ -183,10 +183,10 @@ namespace svx The command, either a name of a table or query or a SQL statement. */ ODataAccessObjectTransferable( - const ::rtl::OUString& _rDatasourceOrLocation - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasourceOrLocation + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); @@ -199,10 +199,10 @@ namespace svx The command, either a name of a table or query or a SQL statement. */ ODataAccessObjectTransferable( - const ::rtl::OUString& _rDatasourceOrLocation - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasourceOrLocation + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ); /** with this ctor, only the object descriptor format will be provided @@ -241,13 +241,13 @@ namespace svx // derived classes (our class is the only one which should be contaminated with this) private: - SVX_DLLPRIVATE void construct( const ::rtl::OUString& _rDatasourceOrLocation - ,const ::rtl::OUString& _rConnectionResource + SVX_DLLPRIVATE void construct( const OUString& _rDatasourceOrLocation + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ,sal_Bool _bAddCommand - ,const ::rtl::OUString& _sActiveCommand); + ,const OUString& _sActiveCommand); }; //==================================================================== diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx index 08d9b92fe26b..9be3bfbf0da2 100644 --- a/svx/inc/svx/dbaobjectex.hxx +++ b/svx/inc/svx/dbaobjectex.hxx @@ -46,7 +46,7 @@ namespace svx /** construct the transferable */ OComponentTransferable( - const ::rtl::OUString& _rDatasourceOrLocation + const OUString& _rDatasourceOrLocation ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent ); diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index 501bc1552655..c1afd4690509 100644 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx @@ -98,9 +98,9 @@ namespace svxform // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, - const ::rtl::OUString& _rPwd, + const OUString& _rDataSourceName, + const OUString& _rUser, + const OUString& _rPwd, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ); @@ -126,20 +126,20 @@ namespace svxform ) const; // ------------------------------------------------ - ::rtl::OUString quoteName( - const ::rtl::OUString& _rQuote, - const ::rtl::OUString& _rName + OUString quoteName( + const OUString& _rQuote, + const OUString& _rName ) const; // ------------------------------------------------ - ::rtl::OUString composeTableNameForSelect( + OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ) const; // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource( - const ::rtl::OUString& _rsRegisteredName, + const OUString& _rsRegisteredName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ) const; @@ -160,7 +160,7 @@ namespace svxform getFieldsByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const ::rtl::OUString& _rCommand, + const OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ); diff --git a/svx/inc/svx/fmdmod.hxx b/svx/inc/svx/fmdmod.hxx index 42b9b921e52e..b59eb65c7f59 100644 --- a/svx/inc/svx/fmdmod.hxx +++ b/svx/inc/svx/fmdmod.hxx @@ -30,9 +30,9 @@ public: virtual ~SvxFmMSFactory() {} - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; #endif // _SVX_FMDMOD_HXX diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx index 523c672bab64..50b99f8116a6 100644 --- a/svx/inc/svx/fmdpage.hxx +++ b/svx/inc/svx/fmdpage.hxx @@ -59,7 +59,7 @@ public: virtual sal_Bool SAL_CALL hasForms(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; #endif // _SVX_FMDPAGE_HXX diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx index c388693cc8e5..c3f631363b2b 100644 --- a/svx/inc/svx/fmgridcl.hxx +++ b/svx/inc/svx/fmgridcl.hxx @@ -138,7 +138,7 @@ public: @return The name of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; /** return the description of the specified object. @param eObjType @@ -148,7 +148,7 @@ public: @return The description of the specified object. */ - virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; protected: virtual void Command(const CommandEvent& rEvt); diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index 4336e60fa0d9..156d5b96dd45 100644 --- a/svx/inc/svx/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx @@ -236,9 +236,9 @@ public: virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(); + virtual OUString SAL_CALL getImplementationName() throw(); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(); // ::com::sun::star::awt::XControl virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent) throw(::com::sun::star::uno::RuntimeException); @@ -277,24 +277,24 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException); // UnoControl - virtual ::rtl::OUString GetComponentServiceName(); + virtual OUString GetComponentServiceName(); // ::com::sun::star::util::XModifyBroadcaster virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XModeSelector - virtual void SAL_CALL setMode(const ::rtl::OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMode(const ::rtl::OUString& Mode) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMode(const OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XContainer virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches(const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProviderInterception @@ -348,7 +348,7 @@ class SVX_DLLPUBLIC FmXGridPeer :public VCLXWindow m_aSelectionListeners, m_aGridControlListeners; - ::rtl::OUString m_aMode; + OUString m_aMode; sal_Int32 m_nCursorListening; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > m_xFirstDispatchInterceptor; @@ -437,8 +437,8 @@ public: virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException); // VCLXWindow - virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); @@ -477,10 +477,10 @@ public: void stopCursorListening(); // ::com::sun::star::util::XModeSelector - virtual void SAL_CALL setMode(const ::rtl::OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMode(const ::rtl::OUString& Mode) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMode(const OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XContainer virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException); @@ -493,7 +493,7 @@ public: virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches(const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProviderInterception diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx index a4bbf910a4e2..2cd75167ea05 100644 --- a/svx/inc/svx/fmsearch.hxx +++ b/svx/inc/svx/fmsearch.hxx @@ -42,7 +42,7 @@ namespace com { namespace sun { namespace star { // Hilfsmethoden SVX_DLLPUBLIC sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xControl, - ::rtl::OUString* pCurrentText = NULL); + OUString* pCurrentText = NULL); // check if the control has one of the interfaces we can use for searching // *pCurrentText will be filled with the current text of the control (as used when searching this control) diff --git a/svx/inc/svx/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx index 970ccd0137fd..8ad3d2edc569 100644 --- a/svx/inc/svx/fmsrccfg.hxx +++ b/svx/inc/svx/fmsrccfg.hxx @@ -54,9 +54,9 @@ namespace svxform public: // no bit fields at all (want to pass the addresses to the OConfigurationValueContainer) - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > aHistory; - ::rtl::OUString sSingleSearchField; + OUString sSingleSearchField; sal_Int16 nSearchForType; sal_Int16 nPosition; @@ -101,8 +101,8 @@ namespace svxform // wrapper properties: // some of the members of FmSearchParams are must be translated to be stored in the configuration - ::rtl::OUString m_sSearchForType; - ::rtl::OUString m_sSearchPosition; + OUString m_sSearchForType; + OUString m_sSearchPosition; sal_Bool m_bIsMatchCase; sal_Bool m_bIsMatchFullHalfWidthForms; diff --git a/svx/inc/svx/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx index 7d033a456062..6fc1a2aeaa4e 100644 --- a/svx/inc/svx/fmsrcimp.hxx +++ b/svx/inc/svx/fmsrcimp.hxx @@ -134,28 +134,28 @@ namespace svxform { ControlTextWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xControl) { m_xControl = _xControl; } virtual ~ControlTextWrapper() { } - virtual ::rtl::OUString getCurrentText() const = 0; + virtual OUString getCurrentText() const = 0; }; class SimpleTextWrapper : public ControlTextWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > m_xText; public: SimpleTextWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& _xText); - virtual ::rtl::OUString getCurrentText() const; + virtual OUString getCurrentText() const; }; class ListBoxWrapper : public ControlTextWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox > m_xBox; public: ListBoxWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox >& _xBox); - virtual ::rtl::OUString getCurrentText() const; + virtual OUString getCurrentText() const; }; class CheckBoxWrapper : public ControlTextWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox > m_xBox; public: CheckBoxWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox >& _xBox); - virtual ::rtl::OUString getCurrentText() const; + virtual OUString getCurrentText() const; }; } @@ -206,7 +206,7 @@ class SVX_DLLPUBLIC FmSearchEngine FieldCollectionIterator m_iterPreviousLocField; // field of the last finding // Kommunikation mit dem Thread, der die eigentliche Suche durchfuehrt - ::rtl::OUString m_strSearchExpression; // forward direction + OUString m_strSearchExpression; // forward direction SEARCHFOR_TYPE m_eSearchForType; // ditto SEARCH_RESULT m_srResult; // backward direction @@ -296,13 +296,13 @@ public: FmSearchEngine( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, - const ::rtl::OUString& strVisibleFields, + const OUString& strVisibleFields, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xFormat, FMSEARCH_MODE eMode); FmSearchEngine( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, - const ::rtl::OUString& strVisibleFields, + const OUString& strVisibleFields, const InterfaceArray& arrFields, FMSEARCH_MODE eMode); @@ -315,11 +315,11 @@ public: void SetProgressHandler(Link aHdl) { m_aProgressHandler = aHdl; } /// search for the next appearance (for nDirection values check DIRECTION_*-defines) - void SearchNext(const ::rtl::OUString& strExpression); + void SearchNext(const OUString& strExpression); /// analogous, search for "NULL" (_bSearchForNull==sal_True) or "not NULL" void SearchNextSpecial(sal_Bool _bSearchForNull); /// search for the next appearance, dependent on nDirection from the start or end - void StartOver(const ::rtl::OUString& strExpression); + void StartOver(const OUString& strExpression); /// analogous, search for "NULL" (_bSearchForNull==sal_True) or "not NULL" void StartOverSpecial(sal_Bool _bSearchForNull); /// invalidate previous search reference @@ -330,7 +330,7 @@ public: (calls InvalidatePreviousLoc) */ void RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce = sal_False); - ::rtl::OUString FormatField(sal_Int32 nWhich); + OUString FormatField(sal_Int32 nWhich); /// returns directly; once it was really aborted, ProgressHandler is called with STATE_CANCELED void CancelSearch(); @@ -338,11 +338,11 @@ public: /** only valid, if not an (asynchronous) search is running, the next search will then be executed on top of the new iterator with the new parameter */ - sal_Bool SwitchToContext(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const ::rtl::OUString& strVisibleFields, const InterfaceArray& arrFields, + sal_Bool SwitchToContext(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, const InterfaceArray& arrFields, sal_Int32 nFieldIndex); protected: - void Init(const ::rtl::OUString& strVisibleFields); + void Init(const OUString& strVisibleFields); void SearchNextImpl(); // this Impl method is running in SearchThread @@ -359,9 +359,9 @@ private: // starting the loop), not in every loop step SVX_DLLPRIVATE SEARCH_RESULT SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd); - SVX_DLLPRIVATE SEARCH_RESULT SearchWildcard(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, + SVX_DLLPRIVATE SEARCH_RESULT SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd); - SVX_DLLPRIVATE SEARCH_RESULT SearchRegularApprox(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, + SVX_DLLPRIVATE SEARCH_RESULT SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd); SVX_DLLPRIVATE void PropagateProgress(sal_Bool _bDontPropagateOverflow); @@ -375,7 +375,7 @@ private: SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xAllFields, sal_Int32 nField); // builds a FieldInfo in relation to field number nField (in xAllFields) and adds it to m_arrUsedFields // xAllFields needs to support the DatabaseRecord service - SVX_DLLPRIVATE ::rtl::OUString FormatField(const FieldInfo& rField); + SVX_DLLPRIVATE OUString FormatField(const FieldInfo& rField); // formats the field with the NumberFormatter SVX_DLLPRIVATE sal_Bool HasPreviousLoc() { return m_aPreviousLocBookmark.hasValue(); } diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx index 85e31c67cc36..bd24488c73a8 100644 --- a/svx/inc/svx/fmtools.hxx +++ b/svx/inc/svx/fmtools.hxx @@ -85,7 +85,7 @@ void displayException(const ::com::sun::star::uno::Any&, Window* _pParent = NULL sal_Int32 getElementPos(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& xCont, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElement); -SVX_DLLPUBLIC ::rtl::OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel); +SVX_DLLPUBLIC OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel); // =================================================================================================== // = class CursorWrapper - a helper class which works in common with a ::com::sun::star::uno::Reference, diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx index d31c225df119..07ce4c02c106 100644 --- a/svx/inc/svx/fmview.hxx +++ b/svx/inc/svx/fmview.hxx @@ -93,7 +93,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, + const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index 355ff6147351..cd8449117d76 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -78,7 +78,7 @@ public: void AutoCorrectFontColor( void ); - void SetPreviewText( const ::rtl::OUString& rString ); + void SetPreviewText( const OUString& rString ); void SetFontNameAsPreviewText(); void SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont ); diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx index 1bbbd226b405..102a6de9aa07 100644 --- a/svx/inc/svx/gallery.hxx +++ b/svx/inc/svx/gallery.hxx @@ -78,10 +78,10 @@ public: // FillObjList is filling rObjList with Strings of the internal Gallery Object URL static sal_Bool FillObjList( const String& rThemeName, std::vector &rObjList ); static sal_Bool FillObjList( const sal_uInt32 nThemeId, std::vector &rObjList ); - static bool FillObjList( const sal_uInt32 nThemeId, std::vector &rObjList ); + static bool FillObjList( const sal_uInt32 nThemeId, std::vector &rObjList ); // FillObjTitleList is filling the rList with the title for each gallery object - static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList ); + static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList ); static sal_Bool InsertURL( const String& rThemeName, const String& rURL ); static sal_Bool InsertURL( sal_uIntPtr nThemeId, const String& rURL ); diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index ac1350949f99..e116c14b8cf6 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -38,7 +38,7 @@ class GalleryThemeEntry { private: - rtl::OUString aName; + OUString aName; INetURLObject aThmURL; INetURLObject aSdgURL; INetURLObject aSdvURL; @@ -58,7 +58,7 @@ public: sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource ); ~GalleryThemeEntry() {}; - const rtl::OUString& GetThemeName() const { return aName; } + const OUString& GetThemeName() const { return aName; } sal_uInt32 GetFileNumber() const { return nFileNumber; } const INetURLObject& GetThmURL() const { return aThmURL; } @@ -73,7 +73,7 @@ public: sal_Bool IsModified() const { return bModified; } void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsReadOnly() ); } - void SetName( const rtl::OUString& rNewName ); + void SetName( const OUString& rNewName ); sal_Bool IsNameFromResource() const { return bThemeNameFromResource; } sal_uInt32 GetId() const { return nId; } @@ -88,8 +88,8 @@ typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; struct GalleryImportThemeEntry { - rtl::OUString aThemeName; - rtl::OUString aUIName; + OUString aThemeName; + OUString aUIName; INetURLObject aURL; }; @@ -111,7 +111,7 @@ class GalleryThemeCacheEntry; class Gallery : public SfxBroadcaster { // only for gengal utility! - friend Gallery* createGallery( const rtl::OUString& ); + friend Gallery* createGallery( const OUString& ); friend void disposeGallery( Gallery* ); typedef std::vector GalleryCacheThemeList; @@ -127,16 +127,16 @@ private: sal_uIntPtr nLastFileNumber; sal_Bool bMultiPath; - void ImplLoad( const rtl::OUString& rMultiPath ); + void ImplLoad( const OUString& rMultiPath ); void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly ); - SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const rtl::OUString& rThemeName ); + SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const OUString& rThemeName ); GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId ); GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); void ImplDeleteCachedTheme( GalleryTheme* pTheme ); - SVX_DLLPUBLIC Gallery( const rtl::OUString& rMultiPath ); + SVX_DLLPUBLIC Gallery( const OUString& rMultiPath ); SVX_DLLPUBLIC ~Gallery(); public: @@ -149,7 +149,7 @@ public: const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); - rtl::OUString GetThemeName( sal_uIntPtr nThemeId ) const; + OUString GetThemeName( sal_uIntPtr nThemeId ) const; SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 ); sal_Bool RenameTheme( const String& rOldName, const String& rNewName ); diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index a40e59820ac4..16f84cbe907b 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -198,8 +198,8 @@ class GalleryHint : public SfxHint private: sal_uIntPtr mnType; - rtl::OUString maThemeName; - rtl::OUString maStringData; + OUString maThemeName; + OUString maStringData; sal_uIntPtr mnData1; sal_uIntPtr mnData2; @@ -212,8 +212,8 @@ public: mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {} sal_uIntPtr GetType() const { return mnType; } - const rtl::OUString& GetThemeName() const { return maThemeName; } - const rtl::OUString& GetStringData() const { return maStringData; } + const OUString& GetThemeName() const { return maThemeName; } + const OUString& GetStringData() const { return maStringData; } sal_uIntPtr GetData1() const { return mnData1; } sal_uIntPtr GetData2() const { return mnData2; } }; diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 043139390132..0326418e8e6a 100644 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -63,8 +63,8 @@ struct GalDragParams { Region aDragRegion; sal_uIntPtr nDragObjPos; - rtl::OUString aThemeName; - rtl::OUString aFileName; + OUString aThemeName; + OUString aFileName; SgaObjKind eObjKind; }; @@ -137,8 +137,8 @@ public: SVX_DLLPUBLIC bool RemoveObject( size_t nPos ); bool ChangeObjectPos( size_t nOldPos, size_t nNewPos ); - SVX_DLLPUBLIC const rtl::OUString& GetName() const; - const rtl::OUString& GetRealName() const; + SVX_DLLPUBLIC const OUString& GetName() const; + const OUString& GetRealName() const; const String& GetDestDir() const { return m_aDestDir; } void SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; } diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx index a86bb1c0d9d7..d2a1b25997e0 100644 --- a/svx/inc/svx/itemwin.hxx +++ b/svx/inc/svx/itemwin.hxx @@ -72,7 +72,7 @@ class SvxColorBox : public ColorLB Timer aDelayTimer; Size aLogicalSize; sal_Bool bRelease; - ::rtl::OUString maCommand; + OUString maCommand; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; #ifdef _SVX_ITEMWIN_CXX @@ -81,7 +81,7 @@ class SvxColorBox : public ColorLB public: SvxColorBox( Window* pParent, - const rtl::OUString& rCommand, + const OUString& rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); ~SvxColorBox(); diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx index 65c5b5289ebe..2c449b0db745 100644 --- a/svx/inc/svx/lboxctrl.hxx +++ b/svx/inc/svx/lboxctrl.hxx @@ -56,8 +56,8 @@ public: class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl { - std::vector< ::rtl::OUString > aUndoRedoList; - ::rtl::OUString aDefaultText; + std::vector< OUString > aUndoRedoList; + OUString aDefaultText; public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index 6f767c70c372..2a8607c13b42 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -169,12 +169,12 @@ public: short GetListPos4Entry(sal_uInt32 nIdx); short GetListPos4Entry( const String& rFmtString ); - void GetCurrencySymbols(std::vector& rList, sal_uInt16* pPos ); - void GetCurrencySymbols(std::vector& rList, bool bFlag ); + void GetCurrencySymbols(std::vector& rList, sal_uInt16* pPos ); + void GetCurrencySymbols(std::vector& rList, bool bFlag ); sal_uInt16 FindCurrencyTableEntry( const String& rFmtString, bool &bTestBanking ); bool IsInTable(sal_uInt16 nPos, bool bTmpBanking, - ::rtl::OUString const& rFmtString); + OUString const& rFmtString); void SetUseStarFormat( bool bUse ) { bUseStarFormat = bUse; } bool IsUseStarFormat( void ) { return bUseStarFormat; } diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index b788ed296760..e54bf1f654e2 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -46,12 +46,12 @@ class SdrCustomShapeDataItem : public SfxStringItem class SVX_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem { public: - typedef std::pair < const ::rtl::OUString, const ::rtl::OUString > PropertyPair; + typedef std::pair < const OUString, const OUString > PropertyPair; private: struct SVX_DLLPUBLIC PropertyEq { - bool operator()( const rtl::OUString&, const rtl::OUString& ) const; + bool operator()( const OUString&, const OUString& ) const; }; struct SVX_DLLPUBLIC PropertyPairEq { @@ -62,7 +62,7 @@ private: size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair& ) const; }; typedef boost::unordered_map < PropertyPair, sal_Int32, PropertyPairHash, PropertyPairEq > PropertyPairHashMap; - typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, PropertyEq > PropertyHashMap; + typedef boost::unordered_map< OUString, sal_Int32, OUStringHash, PropertyEq > PropertyHashMap; PropertyHashMap aPropHashMap; PropertyPairHashMap aPropPairHashMap; @@ -94,13 +94,13 @@ private: const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const; - com::sun::star::uno::Any* GetPropertyValueByName( const rtl::OUString& rPropName ); - com::sun::star::uno::Any* GetPropertyValueByName( const rtl::OUString& rPropName, const rtl::OUString& rPropName2 ); + com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName ); + com::sun::star::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 ); void SetPropertyValue( const com::sun::star::beans::PropertyValue& rPropVal ); - void SetPropertyValue( const rtl::OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ); + void SetPropertyValue( const OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ); - void ClearPropertyValue( const rtl::OUString& rPropertyName ); + void ClearPropertyValue( const OUString& rPropertyName ); }; class SdrCustomShapeReplacementURLItem : public SfxStringItem diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index 77cdf3c590d5..b97178357244 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -43,7 +43,7 @@ public: virtual sal_uInt16 GetValueCount() const; GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); } - virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index c3250ff7af60..ff6a1f9b0bfa 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -37,7 +37,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual rtl::OUString GetValueTextByVal(sal_Bool bVal) const; + virtual OUString GetValueTextByVal(sal_Bool bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx index 320e5fca6519..d602d28d4f5c 100644 --- a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx @@ -63,8 +63,8 @@ namespace drawinglayer virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException); // UNO API helpers - SVX_DLLPUBLIC static rtl::OUString getImplementationName_Static(); - SVX_DLLPUBLIC static com::sun::star::uno::Sequence< rtl::OUString > getSupportedServiceNames_Static(); + SVX_DLLPUBLIC static OUString getImplementationName_Static(); + SVX_DLLPUBLIC static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index 25694f32044e..687e906bf2f0 100644 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -45,7 +45,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index e6b0a765df50..82e002a95df2 100644 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -46,7 +46,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 89d91970ae89..387c3c40f725 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -36,7 +36,7 @@ public: SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual rtl::OUString GetValueTextByVal(sal_Bool bVal) const; + virtual OUString GetValueTextByVal(sal_Bool bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx index 457104c40926..e16c23089658 100644 --- a/svx/inc/svx/shapepropertynotifier.hxx +++ b/svx/inc/svx/shapepropertynotifier.hxx @@ -50,7 +50,7 @@ namespace svx public: /** returns the name of the property which this provider is responsible for */ - virtual ::rtl::OUString getPropertyName() const = 0; + virtual OUString getPropertyName() const = 0; /** returns the current value of the property which the provider is responsible for */ @@ -74,18 +74,18 @@ namespace svx public: PropertyValueProvider( ::cppu::OWeakObject& _rContext, const sal_Char* _pAsciiPropertyName ) :m_rContext( _rContext ) - ,m_sPropertyName( ::rtl::OUString::createFromAscii( _pAsciiPropertyName ) ) + ,m_sPropertyName( OUString::createFromAscii( _pAsciiPropertyName ) ) { } - virtual ::rtl::OUString getPropertyName() const; + virtual OUString getPropertyName() const; virtual void getCurrentValue( ::com::sun::star::uno::Any& _out_rValue ) const; protected: ::cppu::OWeakObject& getContext() const { return m_rContext; } private: ::cppu::OWeakObject& m_rContext; - const ::rtl::OUString m_sPropertyName; + const OUString m_sPropertyName; }; //==================================================================== @@ -110,8 +110,8 @@ namespace svx ~PropertyChangeNotifier(); // listener maintanance - void addPropertyChangeListener( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ); - void removePropertyChangeListener( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ); + void addPropertyChangeListener( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ); + void removePropertyChangeListener( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ); /** registers a IPropertyValueProvider */ diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index fc1abc779a89..8e448bc8b2c0 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -97,7 +97,7 @@ public: void UpdateViewSize(); - void InsertHeaderEntry(const rtl::OUString& rText, + void InsertHeaderEntry(const OUString& rText, sal_uInt16 nCol=HEADERBAR_APPEND, HeaderBarItemBits nBits = HIB_STDSTYLE); @@ -146,7 +146,7 @@ public: void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; } const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } - void SetHeaderBarHelpId(const rtl::OString& rHelpId) {aHeaderBar.SetHelpId(rHelpId);} + void SetHeaderBarHelpId(const OString& rHelpId) {aHeaderBar.SetHelpId(rHelpId);} HeaderBar& GetTheHeaderBar() {return aHeaderBar;} }; diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index b34dd89c7249..9282e3e8cc7e 100644 --- a/svx/inc/svx/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -207,8 +207,8 @@ private: String aLayoutCalcStr; String aCalcStr; - std::vector aSearchStrings; - std::vector aReplaceStrings; + std::vector aSearchStrings; + std::vector aReplaceStrings; SearchDlg_Impl* pImpl; SearchAttrItemList* pSearchList; diff --git a/svx/inc/svx/stddlg.hxx b/svx/inc/svx/stddlg.hxx index ff77060e4f5f..8f65c17a8781 100644 --- a/svx/inc/svx/stddlg.hxx +++ b/svx/inc/svx/stddlg.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog { public: SvxStandardDialog( Window* pParent, const ResId& rResId ); - SvxStandardDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + SvxStandardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); ~SvxStandardDialog(); short Execute(); diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx index c5c776e8863d..9599ae3f3fc4 100644 --- a/svx/inc/svx/strarray.hxx +++ b/svx/inc/svx/strarray.hxx @@ -31,7 +31,7 @@ public: SvxStringArray( const ResId& rResId ); ~SvxStringArray(); - const rtl::OUString GetStringByPos( sal_uInt32 nPos ) const; + const OUString GetStringByPos( sal_uInt32 nPos ) const; }; diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx index 1997dfb4145b..3a5f09cdb6d8 100644 --- a/svx/inc/svx/svddrgv.hxx +++ b/svx/inc/svx/svddrgv.hxx @@ -53,7 +53,7 @@ protected: SdrDragMethod* mpCurrentSdrDragMethod; SdrUndoGeoObj* pInsPointUndo; Rectangle aDragLimit; - rtl::OUString aInsPointUndoStr; + OUString aInsPointUndoStr; SdrMarkList aFollowingEdges; // If nodes are dragged, all edges should follow as Xor SdrHdlKind eDragHdl; diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index f8fbf825bbdd..d436fd9e0810 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -226,7 +226,7 @@ public: sal_uInt32 GetNextUniqueCommentID(); // get the author name - ::rtl::OUString GetDocumentAuthorName() const; + OUString GetDocumentAuthorName() const; // for export sal_uInt32 GetUniqueCommentID() const { return mnUniqueCommentID; } @@ -317,7 +317,7 @@ public: ::com::sun::star::embed::XStorage> GetDocumentStorage() const; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - GetDocumentStream(::rtl::OUString const& rURL, + GetDocumentStream(OUString const& rURL, ::comphelper::LifecycleProxy & rProxy) const; // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln. void BurnInStyleSheetAttributes(); @@ -405,8 +405,8 @@ public: bool IsUIOnlyKomma() const { return bUIOnlyKomma; } static void TakeUnitStr(FieldUnit eUnit, String& rStr); - void TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const; - void TakeWinkStr(long nWink, rtl::OUString& rStr, bool bNoDegChar = false) const; + void TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const; + void TakeWinkStr(long nWink, OUString& rStr, bool bNoDegChar = false) const; void TakePercentStr(const Fraction& rVal, String& rStr, bool bNoPercentChar = false) const; // RecalcPageNums wird idR. nur von der Page gerufen. diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index aae1f51df7f2..ee7e11ba194a 100644 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -153,7 +153,7 @@ public: /* is merging default attributes from type-shype into the SdrCustomShapeGeometryItem. If pType is NULL then the type is being taken from the "Type" property of the SdrCustomShapeGeometryItem. MergeDefaultAttributes is called when creating CustomShapes via UI and after importing */ - void MergeDefaultAttributes( const rtl::OUString* pType = NULL ); + void MergeDefaultAttributes( const OUString* pType = NULL ); /* the method is checking if the geometry data is unchanged/default, in this case the data might not be stored */ enum DefaultType @@ -253,7 +253,7 @@ public: virtual SdrHdl* GetHdl( sal_uInt32 nHdlNum ) const; // #i33136# - static bool doConstructOrthogonal(const ::rtl::OUString& rName); + static bool doConstructOrthogonal(const OUString& rName); using SdrTextObj::NbcSetOutlinerParaObject; }; diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 27a4568ed40e..5d4f76d0b804 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -219,7 +219,7 @@ public: virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual bool DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); - virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; + virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; }; //************************************************************ @@ -284,9 +284,9 @@ class SdrObjPlusData // #i68101# // object name, title and description - rtl::OUString aObjName; - rtl::OUString aObjTitle; - rtl::OUString aObjDescription; + OUString aObjName; + OUString aObjTitle; + OUString aObjDescription; public: TYPEINFO(); @@ -461,12 +461,12 @@ protected: Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; // Fuer GetDragComment - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, rtl::OUString& rStr, sal_uInt16 nVal=0) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0) const; void ImpForcePlusData(); - rtl::OUString GetWinkStr(long nWink, bool bNoDegChar = false) const; - rtl::OUString GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const; + OUString GetWinkStr(long nWink, bool bNoDegChar = false) const; + OUString GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const; // bNotMyself=true bedeutet: Nur die ObjList auf Dirty setzen, nicht mich. // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect @@ -547,12 +547,12 @@ public: // An object may have a user-set Name (Get/SetName()), e.g SdrGrafObj, SdrObjGroup // or SdrOle2Obj. // It may also have a Title and a Description for accessibility purposes. - void SetName(const rtl::OUString& rStr); - rtl::OUString GetName() const; - void SetTitle(const rtl::OUString& rStr); - rtl::OUString GetTitle() const; - void SetDescription(const rtl::OUString& rStr); - rtl::OUString GetDescription() const; + void SetName(const OUString& rStr); + OUString GetName() const; + void SetTitle(const OUString& rStr); + OUString GetTitle() const; + void SetDescription(const OUString& rStr); + OUString GetDescription() const; // Fuer Gruppenobjekte bool IsGroupObject() const; @@ -838,7 +838,7 @@ public: virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; virtual bool DoMacro (const SdrObjMacroHitRec& rRec); - virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; + virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; bool IsMacroHit(const SdrObjMacroHitRec& rRec) const; // Konnektoren. (siehe auch Dokumentation in SvdoEdge.HXX, SdrEdgeObj diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 5d663dcc3215..036a83e6144a 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -78,8 +78,8 @@ private: void ImpSetAttrToGrafInfo(); // Werte vom Pool kopieren GraphicAttr aGrafInfo; - rtl::OUString aFileName; // Wenn es sich um einen Link handelt, steht hier der Dateiname drin. - rtl::OUString aFilterName; + OUString aFileName; // Wenn es sich um einen Link handelt, steht hier der Dateiname drin. + OUString aFilterName; GraphicObject* pGraphic; // Zur Beschleunigung von Bitmapausgaben, besonders von gedrehten. GraphicObject* mpReplacementGraphic; SdrGraphicLink* pGraphicLink; // Und hier noch ein Pointer fuer gelinkte Grafiken @@ -137,12 +137,12 @@ public: void ForceSwapIn() const; void ForceSwapOut() const; - void SetGraphicLink(const rtl::OUString& rFileName, const String& rFilterName); + void SetGraphicLink(const OUString& rFileName, const String& rFilterName); void ReleaseGraphicLink(); bool IsLinkedGraphic() const; - const rtl::OUString& GetFileName() const; - const rtl::OUString& GetFilterName() const; + const OUString& GetFileName() const; + const OUString& GetFilterName() const; void StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize, long nExtraData=0L); diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx index 77ef633d0bed..48a29cb029f7 100644 --- a/svx/inc/svx/svdomedia.hxx +++ b/svx/inc/svx/svdomedia.hxx @@ -60,8 +60,8 @@ public: public: - void setURL( const ::rtl::OUString& rURL ); - const ::rtl::OUString& getURL() const; + void setURL( const OUString& rURL ); + const OUString& getURL() const; void setMediaProperties( const ::avmedia::MediaItem& rState ); const ::avmedia::MediaItem& getMediaProperties() const; diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx index b5442dc19617..ee5542c90def 100644 --- a/svx/inc/svx/svdoole2.hxx +++ b/svx/inc/svx/svdoole2.hxx @@ -173,9 +173,9 @@ public: void CheckFileLink_Impl(); // allows to transfer the graphics to the object helper - void SetGraphicToObj( const Graphic& aGraphic, const ::rtl::OUString& aMediaType ); + void SetGraphicToObj( const Graphic& aGraphic, const OUString& aMediaType ); void SetGraphicToObj( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xGrStream, - const ::rtl::OUString& aMediaType ); + const OUString& aMediaType ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetParentXModel() const; sal_Bool CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize ); diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx index 248f9589e080..f984bb2c68ad 100644 --- a/svx/inc/svx/svdorect.hxx +++ b/svx/inc/svx/svdorect.hxx @@ -111,7 +111,7 @@ public: virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); virtual bool DoMacro(const SdrObjMacroHitRec& rRec); - virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; + virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx index 425c1a3f5516..e7493f55ac90 100644 --- a/svx/inc/svx/svdovirt.hxx +++ b/svx/inc/svx/svdovirt.hxx @@ -143,7 +143,7 @@ public: virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; virtual bool DoMacro (const SdrObjMacroHitRec& rRec); - virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; + virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; // OD 30.06.2003 #108784# - virtual returns Point(0,0) // #i73248# for default SdrVirtObj, offset is aAnchor, not (0,0) diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index 379e15824ff8..fd8ced079923 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -185,9 +185,9 @@ class AbstractSvxNameDialog :public VclAbstractDialog //add for SvxNameDialog public: virtual void GetName( String& rName ) = 0; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) = 0; - virtual void SetEditHelpId(const rtl::OString&) = 0; + virtual void SetEditHelpId(const OString&) = 0; //from class Window - virtual void SetHelpId( const rtl::OString& ) = 0; + virtual void SetHelpId( const OString& ) = 0; virtual void SetText( const OUString& rStr ) = 0; }; @@ -233,7 +233,7 @@ public: //from SvxMultiPathDialog virtual void SetClassPathMode() = 0; //From Class Window - virtual void SetHelpId( const rtl::OString& ) = 0; + virtual void SetHelpId( const OString& ) = 0; }; class AbstractSvxHpLinkDlg : public VclAbstractDialog //add for SvxHpLinkDlg @@ -491,7 +491,7 @@ public: virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) = 0; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) = 0; }; #endif diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index 3dc610ff1e76..436370e588b1 100644 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -40,7 +40,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index 2f2d420e5da2..73bb20959fd9 100644 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -43,7 +43,7 @@ public: SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); } virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index 130f386c6621..56fe21d7478a 100644 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -40,7 +40,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index 4d2182ae14c3..bc4966228c8c 100644 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -42,7 +42,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; @@ -62,7 +62,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index 0ce1cf0f858a..24a07a252e7f 100644 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -39,7 +39,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index 0a4c5ded26c6..b4bffeee4831 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -373,7 +373,7 @@ public: class SVX_DLLPUBLIC SvxSimpleUndoRedoController : public SfxToolBoxControl { private: - ::rtl::OUString aDefaultText; + OUString aDefaultText; public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/svx/inc/svx/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx index 34dbb1b1a140..e41a07813404 100644 --- a/svx/inc/svx/tbxalign.hxx +++ b/svx/inc/svx/tbxalign.hxx @@ -27,8 +27,8 @@ class SVX_DLLPUBLIC SvxTbxCtlAlign: public SfxToolBoxControl { public: virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); virtual SfxPopupWindowType GetPopupWindowType() const; @@ -39,9 +39,9 @@ public: SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxTbxCtlAlign() {} private: - rtl::OUString m_aSubTbName; - rtl::OUString m_aSubTbResName; - rtl::OUString m_aCommand; + OUString m_aSubTbName; + OUString m_aSubTbResName; + OUString m_aCommand; }; #endif diff --git a/svx/inc/svx/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx index 830df5cc0024..e0a1d27f1aec 100644 --- a/svx/inc/svx/tbxcolor.hxx +++ b/svx/inc/svx/tbxcolor.hxx @@ -34,12 +34,12 @@ namespace svx { private: bool m_bDocking; - ::rtl::OUString m_sToolboxResName; + OUString m_sToolboxResName; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > m_xLayouter; public: - ToolboxAccess( const ::rtl::OUString& rToolboxName ); + ToolboxAccess( const OUString& rToolboxName ); public: /** toggles the toolbox diff --git a/svx/inc/svx/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx index f4e043bb4710..07cf3a57c5ae 100644 --- a/svx/inc/svx/tbxctl.hxx +++ b/svx/inc/svx/tbxctl.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SvxTbxCtlDraw : public SfxToolBoxControl { private: - ::rtl::OUString m_sToolboxName; + OUString m_sToolboxName; void toggleToolbox(); diff --git a/svx/inc/svx/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx index 3d9c3195a93f..66fde8a2cb79 100644 --- a/svx/inc/svx/tbxcustomshapes.hxx +++ b/svx/inc/svx/tbxcustomshapes.hxx @@ -45,14 +45,14 @@ public: //interface XSubToolbarController: virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); private: - rtl::OUString m_aSubTbName; - rtl::OUString m_aSubTbxResName; - rtl::OUString m_aCommand; + OUString m_aSubTbName; + OUString m_aSubTbxResName; + OUString m_aCommand; }; diff --git a/svx/inc/svx/txenctab.hxx b/svx/inc/svx/txenctab.hxx index de665420787b..0b8d14e89b74 100644 --- a/svx/inc/svx/txenctab.hxx +++ b/svx/inc/svx/txenctab.hxx @@ -34,7 +34,7 @@ public: SvxTextEncodingTable(); ~SvxTextEncodingTable(); - const rtl::OUString GetTextString( const rtl_TextEncoding nEnc ) const; + const OUString GetTextString( const rtl_TextEncoding nEnc ) const; rtl_TextEncoding GetTextEncoding( const String& rStr ) const; }; diff --git a/svx/inc/svx/unoapi.hxx b/svx/inc/svx/unoapi.hxx index 88708aa95c9c..2ceca3ec895d 100644 --- a/svx/inc/svx/unoapi.hxx +++ b/svx/inc/svx/unoapi.hxx @@ -55,7 +55,7 @@ SVX_DLLPUBLIC SdrPage* GetSdrPageFromXDrawPage( ::com::sun::star::uno::Reference /** returns the SvxNumBulletItem with the given name from the pool or a null if there is no item with that name */ -SvxNumBulletItem* SvxGetNumBulletItemByName( SfxItemPool* pPool, const ::rtl::OUString& aName ) throw(); +SvxNumBulletItem* SvxGetNumBulletItemByName( SfxItemPool* pPool, const OUString& aName ) throw(); /** maps the API constant MeasureUnit to a vcl MapUnit enum. Returns false if conversion is not supported. diff --git a/svx/inc/svx/unomaster.hxx b/svx/inc/svx/unomaster.hxx index 4f6f6dbf0fde..c0f32d0f1346 100644 --- a/svx/inc/svx/unomaster.hxx +++ b/svx/inc/svx/unomaster.hxx @@ -36,16 +36,16 @@ public: virtual sal_Bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) = 0; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) = 0; virtual void dispose() = 0; diff --git a/svx/inc/svx/unomod.hxx b/svx/inc/svx/unomod.hxx index 3f1a16ee6773..fe648ea4419f 100644 --- a/svx/inc/svx/unomod.hxx +++ b/svx/inc/svx/unomod.hxx @@ -36,15 +36,15 @@ class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public ::com::sun::star::lang::XMultiS public: SvxUnoDrawMSFactory() throw() {}; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createTextField( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createTextField( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // internal - ::com::sun::star::uno::Sequence< ::rtl::OUString > - concatServiceNames( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rServices1, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& rServices2 ) throw(); + ::com::sun::star::uno::Sequence< OUString > + concatServiceNames( ::com::sun::star::uno::Sequence< OUString >& rServices1, + ::com::sun::star::uno::Sequence< OUString >& rServices2 ) throw(); /** fills the given EventObject from the given SdrHint. @returns diff --git a/svx/inc/svx/unomodel.hxx b/svx/inc/svx/unomodel.hxx index db69e751f8c1..fcf203fa47e8 100644 --- a/svx/inc/svx/unomodel.hxx +++ b/svx/inc/svx/unomodel.hxx @@ -77,16 +77,16 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException); // XMultiServiceFactory ( SvxFmMSFactory ) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); }; SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference& xOut ); diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index 1c06c69f023c..68150aff0312 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -90,7 +90,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun: SdrObject *CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(); // Typ und Inventor bestimmen - void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const ::rtl::OUString& aName ) const throw(); + void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) const throw(); // Erzeugen eines SdrObjects anhand einer Description. Kann von // abgeleiteten Klassen dazu benutzt werden, eigene Shapes zu @@ -129,9 +129,9 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun: virtual void SAL_CALL ungroup( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup >& aGroup ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/svx/unopool.hxx b/svx/inc/svx/unopool.hxx index 8b3e6c43dceb..7db02b2a85dd 100644 --- a/svx/inc/svx/unopool.hxx +++ b/svx/inc/svx/unopool.hxx @@ -70,9 +70,9 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); protected: void init(); diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index 713442216554..0414e1228211 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -37,9 +37,9 @@ class UHashMap { UHashMap() {} public: - static sal_uInt32 getId( const ::rtl::OUString& rCompareString ); - static rtl::OUString getNameFromId (sal_uInt32 nId); - static ::com::sun::star::uno::Sequence< rtl::OUString > getServiceNames(); + static sal_uInt32 getId( const OUString& rCompareString ); + static OUString getNameFromId (sal_uInt32 nId); + static ::com::sun::star::uno::Sequence< OUString > getServiceNames(); }; /*********************************************************************** diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index 6c2a5051d061..23cbf8811a3a 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -110,8 +110,8 @@ class SVX_DLLPUBLIC SvxShape : public SvxShape_UnoImplHelper, private: ::com::sun::star::awt::Size maSize; ::com::sun::star::awt::Point maPosition; - ::rtl::OUString maShapeType; - ::rtl::OUString maShapeName; + OUString maShapeType; + OUString maShapeName; /** these members are used to optimize XMultiProperty calls */ SvxShapeImpl* mpImpl; @@ -138,7 +138,7 @@ protected: ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const; - sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const ::rtl::OUString& rName ); + sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName ); /** called from the XActionLockable interface methods on initial locking */ virtual void lock(); @@ -155,8 +155,8 @@ protected: void endSetPropertyValues(); // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); @@ -182,7 +182,7 @@ public: void InvalidateSdrObject() { mpObj.reset( NULL ); }; const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; } SdrObject* GetSdrObject() const {return mpObj.get();} - void SetShapeType( const ::rtl::OUString& ShapeType ) { maShapeType = ShapeType; } + void SetShapeType( const OUString& ShapeType ) { maShapeType = ShapeType; } ::com::sun::star::uno::Any GetBitmap( sal_Bool bMetaFile = sal_False ) const throw (); ::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier(); @@ -191,8 +191,8 @@ public: sal_uInt32 getShapeKind() const; // styles need this - static sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const ::rtl::OUString& rName, SfxItemSet& rSet, SdrModel* pModel ); - static sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const ::rtl::OUString& rName, SfxItemSet& rSet ); + static sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ); + static sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ); /** same as SetFillAttribute but for property names instead of which ids, and the property found is returned instead of set at the object @@ -203,14 +203,14 @@ public: // access methods for master objects ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL _getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL _setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL _setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL _getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL _setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL _getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL _getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -223,11 +223,11 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); @@ -242,46 +242,46 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertyStates virtual void SAL_CALL setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aPropertyNames ) + OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& aPropertyNames ) + OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XGluePointsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL getGluePoints( ) throw(::com::sun::star::uno::RuntimeException); @@ -322,8 +322,8 @@ protected: protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); @@ -341,15 +341,15 @@ public: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::text::XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); @@ -372,7 +372,7 @@ public: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; #include #include @@ -413,7 +413,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); @@ -426,7 +426,7 @@ public: virtual void SAL_CALL leaveGroup( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -451,7 +451,7 @@ public: virtual void SAL_CALL release() throw(); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); @@ -466,7 +466,7 @@ public: virtual void SAL_CALL disconnectEnd( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -494,16 +494,16 @@ public: virtual void SAL_CALL release() throw(); // XPropertySet - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); @@ -516,7 +516,7 @@ public: virtual void SAL_CALL setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xControl ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -533,7 +533,7 @@ public: virtual ~SvxShapeDimensioning() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -546,7 +546,7 @@ public: virtual ~SvxShapeCircle() throw (); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -558,12 +558,12 @@ class SVX_DLLPUBLIC SvxOle2Shape : public SvxShapeText { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); void resetModifiedState(); - const SvGlobalName GetClassName_Impl(rtl::OUString& rHexCLSID); + const SvGlobalName GetClassName_Impl(OUString& rHexCLSID); public: SvxOle2Shape( SdrObject* pObj ) throw(); SvxOle2Shape( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw (); @@ -571,7 +571,7 @@ public: sal_Bool createObject( const SvGlobalName &aClassName ); - sal_Bool createLink( const ::rtl::OUString& aLinkURL ); + sal_Bool createLink( const OUString& aLinkURL ); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -593,8 +593,8 @@ protected: using SvxUnoTextRangeBase::getPropertyValue; // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: SvxShapePolyPolygon( SdrObject* pObj , ::com::sun::star::drawing::PolygonKind eNew = com::sun::star::drawing::PolygonKind_LINE ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::beans::PropertyVetoException); @@ -606,7 +606,7 @@ public: basegfx::B2DPolyPolygon GetPolygon() const throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -624,8 +624,8 @@ protected: public: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); SvxShapePolyPolygonBezier( SdrObject* pObj , ::com::sun::star::drawing::PolygonKind eNew = com::sun::star::drawing::PolygonKind_PATHLINE) throw(); virtual ~SvxShapePolyPolygonBezier() throw(); @@ -636,7 +636,7 @@ public: basegfx::B2DPolyPolygon GetPolygon() const throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -649,8 +649,8 @@ protected: using SvxUnoTextRangeBase::getPropertyValue; // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: SvxGraphicObject( SdrObject* pObj ) throw(); @@ -672,8 +672,8 @@ protected: public: Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw(); // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ~Svx3DSceneObject() throw(); @@ -698,7 +698,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -712,15 +712,15 @@ class Svx3DCubeObject : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: Svx3DCubeObject( SdrObject* pObj ) throw(); virtual ~Svx3DCubeObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -732,13 +732,13 @@ public: Svx3DSphereObject( SdrObject* pObj ) throw(); protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ~Svx3DSphereObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -748,15 +748,15 @@ class Svx3DLatheObject : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: Svx3DLatheObject( SdrObject* pObj ) throw(); virtual ~Svx3DLatheObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -768,13 +768,13 @@ public: Svx3DExtrudeObject( SdrObject* pObj ) throw(); protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ~Svx3DExtrudeObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -784,15 +784,15 @@ class Svx3DPolygonObject : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: Svx3DPolygonObject( SdrObject* pObj ) throw(); virtual ~Svx3DPolygonObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -814,7 +814,7 @@ protected: public: SvxCustomShape( SdrObject* pObj ) throw (); // overide these for special property handling in subcasses. Return true if property is handled - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ~SvxCustomShape() throw (); @@ -828,7 +828,7 @@ public: virtual void SAL_CALL release() throw(); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); @@ -837,14 +837,14 @@ public: virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); // XPropertySet - void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException); + void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); //XEnhancedCustomShapeDefaulter - virtual void SAL_CALL createCustomShapeDefaults( const rtl::OUString& rShapeType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL createCustomShapeDefaults( const OUString& rShapeType ) throw (::com::sun::star::uno::RuntimeException); }; /*********************************************************************** @@ -859,8 +859,8 @@ public: protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; #endif diff --git a/svx/inc/svx/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx index 3e3bfa1159ec..7db908c88a92 100644 --- a/svx/inc/svx/unoshcol.hxx +++ b/svx/inc/svx/unoshcol.hxx @@ -78,11 +78,11 @@ public: virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); - static ::rtl::OUString getImplementationName_Static(); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); }; ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxShapeCollection_createInstance( const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMgr ); diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index 1d4f72cfb06d..c39854f76b97 100644 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx @@ -225,14 +225,14 @@ #define LINE_PROPERTIES \ { MAP_CHAR_LEN(UNO_NAME_LINEDASH), XATTR_LINEDASH, &::getCppuType((const ::com::sun::star::drawing::LineDash*)0) , 0, MID_LINEDASH}, \ - { MAP_CHAR_LEN("LineDashName"), XATTR_LINEDASH, &::getCppuType((const ::rtl::OUString*)0) , 0, MID_NAME}, \ + { MAP_CHAR_LEN("LineDashName"), XATTR_LINEDASH, &::getCppuType((const OUString*)0) , 0, MID_NAME}, \ LINE_PROPERTIES_DEFAULTS #define LINE_PROPERTIES_START_END \ { MAP_CHAR_LEN(UNO_NAME_LINEEND), XATTR_LINEEND, SEQTYPE(::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { MAP_CHAR_LEN("LineEndName"), XATTR_LINEEND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \ + { MAP_CHAR_LEN("LineEndName"), XATTR_LINEEND, &::getCppuType((const OUString*)0), 0, MID_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_LINESTART), XATTR_LINESTART, SEQTYPE(::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0)), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \ - { MAP_CHAR_LEN("LineStartName"), XATTR_LINESTART, &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, + { MAP_CHAR_LEN("LineStartName"), XATTR_LINESTART, &::getCppuType((const OUString*)0), 0, MID_NAME }, #define FILL_PROPERTIES_BMP \ { MAP_CHAR_LEN(UNO_NAME_FILLBMP_LOGICAL_SIZE), XATTR_FILLBMP_SIZELOG, &::getBooleanCppuType() , 0, 0}, \ @@ -255,17 +255,17 @@ FILL_PROPERTIES_DEFAULTS \ { MAP_CHAR_LEN(UNO_NAME_FILLBACKGROUND), XATTR_FILLBACKGROUND , &::getBooleanCppuType(), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_FILLBITMAP), XATTR_FILLBITMAP , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) , 0, MID_BITMAP}, \ - { MAP_CHAR_LEN("FillBitmapName"), XATTR_FILLBITMAP , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \ - { MAP_CHAR_LEN("FillBitmapURL"), XATTR_FILLBITMAP , &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAFURL }, \ + { MAP_CHAR_LEN("FillBitmapName"), XATTR_FILLBITMAP , &::getCppuType((const OUString*)0), 0, MID_NAME }, \ + { MAP_CHAR_LEN("FillBitmapURL"), XATTR_FILLBITMAP , &::getCppuType((const OUString*)0), 0, MID_GRAFURL }, \ { MAP_CHAR_LEN("FillGradientStepCount"), XATTR_GRADIENTSTEPCOUNT , &::getCppuType((const sal_Int16*)0), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_FILLGRADIENT), XATTR_FILLGRADIENT , &::getCppuType((const ::com::sun::star::awt::Gradient*)0), 0, MID_FILLGRADIENT}, \ - { MAP_CHAR_LEN("FillGradientName"), XATTR_FILLGRADIENT , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \ + { MAP_CHAR_LEN("FillGradientName"), XATTR_FILLGRADIENT , &::getCppuType((const OUString*)0), 0, MID_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_FILLHATCH), XATTR_FILLHATCH , &::getCppuType((const ::com::sun::star::drawing::Hatch*)0), 0, MID_FILLHATCH}, \ - { MAP_CHAR_LEN("FillHatchName"), XATTR_FILLHATCH , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \ + { MAP_CHAR_LEN("FillHatchName"), XATTR_FILLHATCH , &::getCppuType((const OUString*)0), 0, MID_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_FILLSTYLE), XATTR_FILLSTYLE , &::getCppuType((const ::com::sun::star::drawing::FillStyle*)0) , 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_FILL_TRANSPARENCE), XATTR_FILLTRANSPARENCE, &::getCppuType((const sal_Int16*)0) , 0, 0}, \ { MAP_CHAR_LEN("FillTransparenceGradient"), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const ::com::sun::star::awt::Gradient*)0), 0, MID_FILLGRADIENT}, \ - { MAP_CHAR_LEN("FillTransparenceGradientName"), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \ + { MAP_CHAR_LEN("FillTransparenceGradientName"), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const OUString*)0), 0, MID_NAME }, \ { MAP_CHAR_LEN(UNO_NAME_FILLCOLOR_2), XATTR_SECONDARYFILLCOLOR, &::getCppuType((const sal_Int32*)0), 0, 0}, #define EDGERADIUS_PROPERTIES \ @@ -322,20 +322,20 @@ #define SHAPE_DESCRIPTOR_PROPERTIES \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT , &::getBooleanCppuType(), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME , &::getCppuType((const OUString*)0), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , &::getBooleanCppuType(), 0, 0}, \ { MAP_CHAR_LEN("Visible"), SDRATTR_OBJVISIBLE , &::getBooleanCppuType(), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT , &::getBooleanCppuType(), 0, 0},\ - { MAP_CHAR_LEN("UINameSingular"), OWN_ATTR_UINAME_SINGULAR , &::getCppuType((const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ - { MAP_CHAR_LEN("UINamePlural"), OWN_ATTR_UINAME_PLURAL , &::getCppuType((const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN("UINameSingular"), OWN_ATTR_UINAME_SINGULAR , &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN("UINamePlural"), OWN_ATTR_UINAME_PLURAL , &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ /* #i68101# */ \ - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, #define LINKTARGET_PROPERTIES \ - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType((const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \ { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, @@ -367,7 +367,7 @@ #define SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \ { MAP_CHAR_LEN(UNO_NAME_MEASUREBELOWREFEDGE), SDRATTR_MEASUREBELOWREFEDGE, &::getBooleanCppuType(), 0, 0}, \ - { MAP_CHAR_LEN(UNO_NAME_MEASUREFORMATSTRING), SDRATTR_MEASUREFORMATSTRING, &::getCppuType((const ::rtl::OUString*)0), 0, 0}, \ + { MAP_CHAR_LEN(UNO_NAME_MEASUREFORMATSTRING), SDRATTR_MEASUREFORMATSTRING, &::getCppuType((const OUString*)0), 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_MEASUREHELPLINE1LEN), SDRATTR_MEASUREHELPLINE1LEN, &::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ { MAP_CHAR_LEN(UNO_NAME_MEASUREHELPLINE2LEN), SDRATTR_MEASUREHELPLINE2LEN, &::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ { MAP_CHAR_LEN(UNO_NAME_MEASUREHELPLINEDIST), SDRATTR_MEASUREHELPLINEDIST, &::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \ @@ -421,9 +421,9 @@ #define SPECIAL_GRAPHOBJ_PROPERTIES \ SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \ { MAP_CHAR_LEN(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP , &::getCppuType((const ::com::sun::star::text::GraphicCrop*)0), 0, 0 }, \ - { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAFURL), OWN_ATTR_GRAFURL , &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, \ - { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL), OWN_ATTR_REPLACEMENTGRAFURL , &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, \ - { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL), OWN_ATTR_GRAFSTREAMURL , &::getCppuType((const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, \ + { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAFURL), OWN_ATTR_GRAFURL , &::getCppuType((const OUString*)0), 0, 0 }, \ + { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL), OWN_ATTR_REPLACEMENTGRAFURL , &::getCppuType((const OUString*)0), 0, 0 }, \ + { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL), OWN_ATTR_GRAFSTREAMURL , &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, \ { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_FILLBITMAP), OWN_ATTR_VALUE_FILLBITMAP , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>*)0) , 0, 0}, \ { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0) , 0, 0}, diff --git a/svx/inc/svx/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx index 507f73876d69..934606fe8917 100644 --- a/svx/inc/svx/xmleohlp.hxx +++ b/svx/inc/svx/xmleohlp.hxx @@ -55,15 +55,15 @@ class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper : public ::cppu::WeakComponentImpl ::com::sun::star::document::XEmbeddedObjectResolver, ::com::sun::star::container::XNameAccess > { - typedef ::std::map< ::rtl::OUString, OutputStorageWrapper_Impl*, + typedef ::std::map< OUString, OutputStorageWrapper_Impl*, OUStringLess > SvXMLEmbeddedObjectHelper_Impl; private: ::osl::Mutex maMutex; - const ::rtl::OUString maReplacementGraphicsContainerStorageName; - const ::rtl::OUString maReplacementGraphicsContainerStorageName60; - ::rtl::OUString maCurContainerStorageName; + const OUString maReplacementGraphicsContainerStorageName; + const OUString maReplacementGraphicsContainerStorageName60; + OUString maCurContainerStorageName; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxRootStorage; // package @@ -75,25 +75,25 @@ private: SvXMLEmbeddedObjectHelper_Impl *mpStreamMap; SVX_DLLPRIVATE sal_Bool ImplGetStorageNames( - const ::rtl::OUString& rURLStr, - ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjectStorageName, + const OUString& rURLStr, + OUString& rContainerStorageName, + OUString& rObjectStorageName, sal_Bool bInternalToExternal, sal_Bool *pGraphicRepl=0, sal_Bool *pOasisFormat=0 ) const; SVX_DLLPRIVATE com::sun::star::uno::Reference < com::sun::star::embed::XStorage > ImplGetContainerStorage( - const ::rtl::OUString& rStorageName ); + const OUString& rStorageName ); SVX_DLLPRIVATE String ImplGetUniqueName( ::comphelper::IEmbeddedHelper*, const sal_Char* p ) const; SVX_DLLPRIVATE sal_Bool ImplReadObject( - const ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjName, + const OUString& rContainerStorageName, + OUString& rObjName, const SvGlobalName *pClassId, SvStream* pTemp ); - SVX_DLLPRIVATE ::rtl::OUString ImplInsertEmbeddedObjectURL( - const ::rtl::OUString& rURLStr ); + SVX_DLLPRIVATE OUString ImplInsertEmbeddedObjectURL( + const OUString& rURLStr ); SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > ImplGetReplacementImage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj ); @@ -126,21 +126,21 @@ public: void Flush(); // XEmbeddedObjectResolver - virtual ::rtl::OUString SAL_CALL resolveEmbeddedObjectURL( const ::rtl::OUString& aURL ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL resolveEmbeddedObjectURL( const OUString& aURL ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XNameAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); - static void splitObjectURL(::rtl::OUString aURLNoPar, - ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjectStorageName); + static void splitObjectURL(OUString aURLNoPar, + OUString& rContainerStorageName, + OUString& rObjectStorageName); }; #endif diff --git a/svx/inc/svx/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx index c3175321eeb2..d14c9dc5cd23 100644 --- a/svx/inc/svx/xmlgrhlp.hxx +++ b/svx/inc/svx/xmlgrhlp.hxx @@ -55,15 +55,15 @@ class SVX_DLLPUBLIC SvXMLGraphicHelper : public ::cppu::WeakComponentImplHelper2 { private: - typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > URLPair; + typedef ::std::pair< OUString, OUString > URLPair; typedef ::std::vector< URLPair > URLPairVector; typedef ::std::vector< GraphicObject > GraphicObjectVector; - typedef ::std::set< ::rtl::OUString > URLSet; + typedef ::std::set< OUString > URLSet; typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > > GraphicOutputStreamVector; ::osl::Mutex maMutex; ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > mxRootStorage; - ::rtl::OUString maCurStorageName; + OUString maCurStorageName; URLPairVector maGrfURLs; GraphicObjectVector maGrfObjs; GraphicOutputStreamVector maGrfStms; @@ -71,21 +71,21 @@ private: SvXMLGraphicHelperMode meCreateMode; sal_Bool mbDirect; - SVX_DLLPRIVATE sal_Bool ImplGetStreamNames( const ::rtl::OUString& rURLStr, - ::rtl::OUString& rPictureStorageName, - ::rtl::OUString& rPictureStreamName ); - SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const ::rtl::OUString& rPictureStorageName ); - SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName, + SVX_DLLPRIVATE sal_Bool ImplGetStreamNames( const OUString& rURLStr, + OUString& rPictureStorageName, + OUString& rPictureStreamName ); + SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const OUString& rPictureStorageName ); + SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const OUString& rPictureStorageName, + const OUString& rPictureStreamName, sal_Bool bTruncate ); SVX_DLLPRIVATE String ImplGetGraphicMimeType( const String& rFileName ) const; - SVX_DLLPRIVATE Graphic ImplReadGraphic( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName ); - SVX_DLLPRIVATE sal_Bool ImplWriteGraphic( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName, - const ::rtl::OUString& rGraphicId, + SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString& rPictureStorageName, + const OUString& rPictureStreamName ); + SVX_DLLPRIVATE sal_Bool ImplWriteGraphic( const OUString& rPictureStorageName, + const OUString& rPictureStreamName, + const OUString& rGraphicId, bool bUseGfxLink ); - SVX_DLLPRIVATE void ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, sal_uInt32 nInsertPos, rtl::OUString& rRequestedFileName ); + SVX_DLLPRIVATE void ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt32 nInsertPos, OUString& rRequestedFileName ); protected: SvXMLGraphicHelper(); @@ -109,12 +109,12 @@ public: public: // XGraphicObjectResolver - virtual ::rtl::OUString SAL_CALL resolveGraphicObjectURL( const ::rtl::OUString& aURL ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) throw(::com::sun::star::uno::RuntimeException); // XBinaryStreamResolver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( const ::rtl::OUString& rURL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( const OUString& rURL ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL createOutputStream( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxBinaryStream ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL resolveOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxBinaryStream ) throw (::com::sun::star::uno::RuntimeException); }; @@ -133,8 +133,8 @@ namespace svx SvXMLGraphicHelper */ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicImportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); -SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicImportHelper_getSupportedServiceNames() throw(); -SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementationName() throw(); +SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > SAL_CALL SvXMLGraphicImportHelper_getSupportedServiceNames() throw(); +SVX_DLLPUBLIC OUString SAL_CALL SvXMLGraphicImportHelper_getImplementationName() throw(); /** Create this with createInstanceWithArguments. service name "com.sun.star.comp.Svx.GraphicExportHelper", one argument which is the @@ -149,8 +149,8 @@ SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementatio SvXMLGraphicHelper */ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicExportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); -SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServiceNames() throw(); -SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicExportHelper_getImplementationName() throw(); +SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServiceNames() throw(); +SVX_DLLPUBLIC OUString SAL_CALL SvXMLGraphicExportHelper_getImplementationName() throw(); } #endif diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index 7ccf526b6e66..93ad230ea75f 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -272,21 +272,21 @@ public: bool IsEmbedInDocument() const { return bEmbedInDocument; } void SetEmbedInDocument(bool b) { bEmbedInDocument = b; } - static rtl::OUString GetDefaultExt(XPropertyListType t); - static rtl::OUString GetDefaultExtFilter(XPropertyListType t); - rtl::OUString GetDefaultExt() const { return GetDefaultExt( eType ); } + static OUString GetDefaultExt(XPropertyListType t); + static OUString GetDefaultExtFilter(XPropertyListType t); + OUString GetDefaultExt() const { return GetDefaultExt( eType ); } virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() = 0; bool Load(); bool LoadFrom( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage, - const rtl::OUString &rURL ); + const OUString &rURL ); bool Save(); bool SaveTo ( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage, - const rtl::OUString &rURL, - rtl::OUString *pOptName ); + const OUString &rURL, + OUString *pOptName ); virtual sal_Bool Create() = 0; virtual sal_Bool CreateBitmapsForUI() = 0; virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0; @@ -297,7 +297,7 @@ public: XOutdevItemPool* pXPool = NULL ); // as above but initializes name as expected static XPropertyListRef CreatePropertyListFromURL( XPropertyListType t, - const rtl::OUString & rUrl, + const OUString & rUrl, XOutdevItemPool* pXPool = NULL ); // helper accessors diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx index 02365fcee169..58f17418fd53 100644 --- a/svx/inc/tbunocontroller.hxx +++ b/svx/inc/tbunocontroller.hxx @@ -42,16 +42,16 @@ class FontHeightToolBoxControl : public svt::ToolboxController, virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static() throw() + static OUString getImplementationName_Static() throw() { - return ::rtl::OUString("com.sun.star.svx.FontHeightToolBoxController"); + return OUString("com.sun.star.svx.FontHeightToolBoxController"); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index dd57f0c697fe..720d6232ed95 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -70,9 +70,9 @@ public: static SearchToolbarControllersManager& createControllersManager(); - void registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL ); - void freeController ( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL ); - css::uno::Reference< css::frame::XStatusListener > findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const ::rtl::OUString& sCommandURL ); + void registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const OUString& sCommandURL ); + void freeController ( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const OUString& sCommandURL ); + css::uno::Reference< css::frame::XStatusListener > findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& sCommandURL ); void saveSearchHistory(const FindTextFieldControl* m_pFindTextFieldControl); void loadSearchHistory(FindTextFieldControl* m_pFindTextFieldControl); @@ -82,7 +82,7 @@ private: typedef ::comphelper::SequenceAsVector< css::beans::PropertyValue > SearchToolbarControllersVec; typedef ::std::map< css::uno::Reference< css::frame::XFrame >, SearchToolbarControllersVec > SearchToolbarControllersMap; SearchToolbarControllersMap aSearchToolbarControllersMap; - std::vector m_aSearchStrings; + std::vector m_aSearchStrings; }; @@ -100,16 +100,16 @@ public: virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static() throw() + static OUString getImplementationName_Static() throw() { - return ::rtl::OUString("com.sun.star.svx.FindTextToolboxController"); + return OUString("com.sun.star.svx.FindTextToolboxController"); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // XComponent virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException ); @@ -148,16 +148,16 @@ public: virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static( ) throw() + static OUString getImplementationName_Static( ) throw() { - return ::rtl::OUString( "com.sun.star.svx.ExitFindbarToolboxController" ); + return OUString( "com.sun.star.svx.ExitFindbarToolboxController" ); } - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // XComponent virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException ); @@ -187,17 +187,17 @@ public: virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static( Type eType ) throw() + static OUString getImplementationName_Static( Type eType ) throw() { - return eType == UP? ::rtl::OUString( "com.sun.star.svx.UpSearchToolboxController" ) : - ::rtl::OUString( "com.sun.star.svx.DownSearchToolboxController" ); + return eType == UP? OUString( "com.sun.star.svx.UpSearchToolboxController" ) : + OUString( "com.sun.star.svx.DownSearchToolboxController" ); } - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // XComponent virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException ); @@ -234,22 +234,22 @@ public: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ); static OUString getImplementationName_Static() throw() { return OUString("com.sun.star.comp.svx.Impl.FindbarDispatcher"); } - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException ); // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const ::rtl::OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException ); // XDispatch diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 536967f84425..fe548111eacd 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -55,26 +55,26 @@ using namespace ::com::sun::star::container; namespace { //................................................................ - const ::rtl::OUString& lcl_getNamePropertyName( ) + const OUString& lcl_getNamePropertyName( ) { - static ::rtl::OUString s_sNamePropertyName( "Name" ); + static OUString s_sNamePropertyName( "Name" ); return s_sNamePropertyName; } //................................................................ - const ::rtl::OUString& lcl_getDescPropertyName( ) + const OUString& lcl_getDescPropertyName( ) { - static ::rtl::OUString s_sDescPropertyDesc( "HelpText" ); + static OUString s_sDescPropertyDesc( "HelpText" ); return s_sDescPropertyDesc; } //................................................................ - const ::rtl::OUString& lcl_getLabelPropertyName( ) + const OUString& lcl_getLabelPropertyName( ) { - static ::rtl::OUString s_sLabelPropertyLabel( "Label" ); + static OUString s_sLabelPropertyLabel( "Label" ); return s_sLabelPropertyLabel; } //................................................................ // return the property which should be used as AccessibleName - const ::rtl::OUString& lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI ) + const OUString& lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI ) { if ( _rxPSI.is() && _rxPSI->hasPropertyByName( lcl_getLabelPropertyName() ) ) return lcl_getLabelPropertyName(); @@ -318,15 +318,15 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException) } //----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException) +OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException) { return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" ); } //----------------------------------------------------------------------------- -::rtl::OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeException) { - ::rtl::OUString sName; + OUString sName; ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape); switch (nShapeType) @@ -348,7 +348,7 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException) //-------------------------------------------------------------------- -::rtl::OUString +OUString AccessibleControlShape::CreateAccessibleDescription (void) throw (RuntimeException) { @@ -359,7 +359,7 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException) case DRAWING_CONTROL: { // check if we can obtain the "Desc" property from the model - ::rtl::OUString sDesc( getControlModelStringProperty( lcl_getDescPropertyName() ) ); + OUString sDesc( getControlModelStringProperty( lcl_getDescPropertyName() ) ); if ( sDesc.isEmpty() ) { // no -> use the default aDG.Initialize (STR_ObjNameSingulUno); @@ -524,7 +524,7 @@ void SAL_CALL AccessibleControlShape::disposing (const EventObject& _rSource) th //-------------------------------------------------------------------- bool AccessibleControlShape::ensureListeningState( const bool _bCurrentlyListening, const bool _bNeedNewListening, - const ::rtl::OUString& _rPropertyName ) + const OUString& _rPropertyName ) { if ( ( _bCurrentlyListening == _bNeedNewListening ) || !ensureControlModelAccess() ) // nothing to do @@ -622,14 +622,14 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessib } //-------------------------------------------------------------------- -::rtl::OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException) { ensureControlModelAccess(); // check if we can obtain the "Name" resp. "Label" property from the model - const ::rtl::OUString& rAccNameProperty = lcl_getPreferredAccNameProperty( m_xModelPropsMeta ); + const OUString& rAccNameProperty = lcl_getPreferredAccNameProperty( m_xModelPropsMeta ); - ::rtl::OUString sName( getControlModelStringProperty( rAccNameProperty ) ); + OUString sName( getControlModelStringProperty( rAccNameProperty ) ); if ( sName.isEmpty() ) { // no -> use the default sName = AccessibleShape::CreateAccessibleName(); @@ -756,9 +756,9 @@ void AccessibleControlShape::stopStateMultiplexing() } //-------------------------------------------------------------------- -::rtl::OUString AccessibleControlShape::getControlModelStringProperty( const ::rtl::OUString& _rPropertyName ) const SAL_THROW(()) +OUString AccessibleControlShape::getControlModelStringProperty( const OUString& _rPropertyName ) const SAL_THROW(()) { - ::rtl::OUString sReturn; + OUString sReturn; try { if ( const_cast< AccessibleControlShape* >( this )->ensureControlModelAccess() ) diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index ad36a0de804a..ee90e33c9b90 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -44,7 +44,6 @@ namespace svx { namespace a11y { -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Reference; diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index 479be2763347..eb021c36a1db 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -48,7 +48,7 @@ AccessibleGraphicShape::~AccessibleGraphicShape (void) //===== XAccessibleImage ==================================================== -::rtl::OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) +OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) throw (::com::sun::star::uno::RuntimeException) { return AccessibleShape::getAccessibleDescription (); @@ -121,7 +121,7 @@ OUString SAL_CALL -::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL +::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleGraphicShape::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { @@ -164,7 +164,7 @@ uno::Sequence SAL_CALL /// Create the base name of this object, i.e. the name without appended number. -::rtl::OUString +OUString AccessibleGraphicShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -189,7 +189,7 @@ uno::Sequence SAL_CALL -::rtl::OUString +OUString AccessibleGraphicShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 82265860cfa2..d8b742cc767a 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -66,7 +66,7 @@ sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/) -::rtl::OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 /*nIndex*/) +OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 /*nIndex*/) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { @@ -122,7 +122,7 @@ void SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleOLEShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -132,19 +132,19 @@ void SAL_CALL -::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL +::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleOLEShape::getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed(); // Get list of supported service names from base class... - uno::Sequence< ::rtl::OUString > aServiceNames = + uno::Sequence< OUString > aServiceNames = AccessibleShape::getSupportedServiceNames(); sal_Int32 nCount (aServiceNames.getLength()); // ...and add additional names. aServiceNames.realloc (nCount + 1); - static const ::rtl::OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleOLEShape"); + static const OUString sAdditionalServiceName ("com.sun.star.drawing.AccessibleOLEShape"); aServiceNames[nCount] = sAdditionalServiceName; return aServiceNames; @@ -175,7 +175,7 @@ uno::Sequence SAL_CALL /// Set this object's name if is different to the current name. -::rtl::OUString +OUString AccessibleOLEShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -209,7 +209,7 @@ uno::Sequence SAL_CALL -::rtl::OUString +OUString AccessibleOLEShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 0122f325b790..c35a8aa21300 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -53,7 +53,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace accessibility { @@ -222,7 +221,7 @@ void AccessibleShape::UpdateStates (void) try { drawing::FillStyle aFillStyle; - bShapeIsOpaque = ( xSet->getPropertyValue (::rtl::OUString("FillStyle")) >>= aFillStyle) + bShapeIsOpaque = ( xSet->getPropertyValue (OUString("FillStyle")) >>= aFillStyle) && aFillStyle == drawing::FillStyle_SOLID; } catch (::com::sun::star::beans::UnknownPropertyException&) @@ -371,8 +370,8 @@ uno::Reference SAL_CALL } else throw lang::IndexOutOfBoundsException ( - ::rtl::OUString("shape has no child with index ") - + rtl::OUString::valueOf(nIndex), + OUString("shape has no child with index ") + + OUString::valueOf(nIndex), static_cast(this)); return xChild; @@ -541,7 +540,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) // Transform coordinates from internal to pixel. if (maShapeTreeInfo.GetViewForwarder() == NULL) - throw uno::RuntimeException (::rtl::OUString ( + throw uno::RuntimeException (OUString ( "AccessibleShape has no valid view forwarder"), static_cast(this)); ::Size aPixelSize = maShapeTreeInfo.GetViewForwarder()->LogicToPixel ( @@ -763,11 +762,11 @@ void SAL_CALL //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL +OUString SAL_CALL AccessibleShape::getImplementationName (void) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("AccessibleShape"); + return OUString("AccessibleShape"); } @@ -961,7 +960,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, //===== protected internal ================================================== /// Set this object's name if is different to the current name. -::rtl::OUString +OUString AccessibleShape::CreateAccessibleBaseName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -969,7 +968,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, } -::rtl::OUString +OUString AccessibleShape::CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { @@ -987,7 +986,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, uno::Reference xSet (mxShape, uno::UNO_QUERY); if (xSet.is()) { - uno::Any aZOrder (xSet->getPropertyValue (::rtl::OUString("ZOrder"))); + uno::Any aZOrder (xSet->getPropertyValue (OUString("ZOrder"))); aZOrder >>= nIndex; // Add one to be not zero based. @@ -997,7 +996,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, catch (const beans::UnknownPropertyException &) { // We throw our own exception that is a bit more informative. - throw uno::RuntimeException (::rtl::OUString ( + throw uno::RuntimeException (OUString ( "AccessibleShape has invalid index and no ZOrder property"), static_cast(this)); } @@ -1014,7 +1013,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, -::rtl::OUString +OUString AccessibleShape::CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index a853b78eb5c2..5ca46abcf6b2 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -121,7 +121,7 @@ uno::Reference // Check whether the given index is valid. if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size()) throw lang::IndexOutOfBoundsException ( - "no accessible child with index " + ::rtl::OUString::valueOf(nIndex), + "no accessible child with index " + OUString::valueOf(nIndex), mxParent); return GetChild (maVisibleChildren[nIndex],nIndex); @@ -666,8 +666,8 @@ void SAL_CALL const document::EventObject& rEventObject) throw (uno::RuntimeException) { - static const ::rtl::OUString sShapeInserted ("ShapeInserted"); - static const ::rtl::OUString sShapeRemoved ("ShapeRemoved"); + static const OUString sShapeInserted ("ShapeInserted"); + static const OUString sShapeRemoved ("ShapeRemoved"); if (rEventObject.EventName == sShapeInserted) diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 2a407d3f6b3f..87bf59e6bda5 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -89,7 +89,7 @@ void DescriptionGenerator::Initialize (sal_Int32 nResourceId) -void DescriptionGenerator::Initialize (::rtl::OUString sPrefix) +void DescriptionGenerator::Initialize (OUString sPrefix) { msDescription = sPrefix; if (mxSet.is()) @@ -127,7 +127,7 @@ void DescriptionGenerator::Initialize (::rtl::OUString sPrefix) -::rtl::OUString DescriptionGenerator::operator() (void) +OUString DescriptionGenerator::operator() (void) { msDescription.append (sal_Unicode ('.')); return msDescription.makeStringAndClear(); @@ -196,7 +196,7 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName, -void DescriptionGenerator::AppendString (const ::rtl::OUString& sString) +void DescriptionGenerator::AppendString (const OUString& sString) { msDescription.append (sString); } diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 61d09f9f0a23..df0d9f8104a7 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -52,7 +52,6 @@ using namespace ::cppu; using namespace ::osl; -using ::rtl::OUString; using namespace ::accessibility; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -60,7 +59,6 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -using rtl::OUString; //===== internal ============================================================ diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 719fc3eba4b3..8eaee7fd7a20 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -214,7 +214,7 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference& rxShape } /// get the accessible base name for an object -::rtl::OUString +OUString ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference& rxShape) throw (::com::sun::star::uno::RuntimeException) { diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 2644acaba3d8..fe67018aa039 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -184,13 +184,13 @@ sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole( ) throw (Runtim return css::accessibility::AccessibleRole::SCROLL_PANE; } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription( ) throw (RuntimeException) +OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName( ) throw (RuntimeException) +OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC); @@ -409,7 +409,7 @@ sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); @@ -418,7 +418,7 @@ sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); @@ -513,14 +513,14 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnCount( ) throw (Runtim return COLUMN_COUNT; } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) throw (IndexOutOfBoundsException, RuntimeException) +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) throw (IndexOutOfBoundsException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) @@ -693,7 +693,7 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() +OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx index 6c2ff2925764..d0805d2f3e1a 100644 --- a/svx/source/accessibility/lookupcolorname.cxx +++ b/svx/source/accessibility/lookupcolorname.cxx @@ -39,16 +39,16 @@ class ColorNameMap: private boost::noncopyable { public: ColorNameMap(); - rtl::OUString lookUp(long color) const; + OUString lookUp(long color) const; private: - typedef boost::unordered_map< long, rtl::OUString > Map; + typedef boost::unordered_map< long, OUString > Map; Map map_; }; ColorNameMap::ColorNameMap() { - css::uno::Sequence< rtl::OUString > aNames; + css::uno::Sequence< OUString > aNames; css::uno::Reference< css::container::XNameAccess > xNA; try @@ -94,13 +94,13 @@ ColorNameMap::ColorNameMap() { } } -rtl::OUString ColorNameMap::lookUp(long color) const { +OUString ColorNameMap::lookUp(long color) const { Map::const_iterator i(map_.find(color)); if (i != map_.end()) { return i->second; } // Did not find the given color; return its RGB tuple representation: - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append(sal_Unicode('#')); buf.append(color, 16); return buf.makeStringAndClear(); @@ -112,7 +112,7 @@ struct theColorNameMap: public rtl::Static< ColorNameMap, theColorNameMap > {}; namespace accessibility { -rtl::OUString lookUpColorName(long color) { +OUString lookUpColorName(long color) { return theColorNameMap::get().lookUp(color); } diff --git a/svx/source/accessibility/lookupcolorname.hxx b/svx/source/accessibility/lookupcolorname.hxx index 99071817f10d..30cf716beb7e 100644 --- a/svx/source/accessibility/lookupcolorname.hxx +++ b/svx/source/accessibility/lookupcolorname.hxx @@ -48,7 +48,7 @@ namespace accessibility { when no name exists, a string of the form "#RRGGBB" with two hexadecimal digits for each color component. */ -rtl::OUString lookUpColorName(long color); +OUString lookUpColorName(long color); } diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 97898ea48b7c..538d66643827 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -136,8 +136,8 @@ static long PointToIndex( RECT_POINT ePoint, bool bAngleControl ) SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext( const Reference< XAccessible >& rxParent, SvxRectCtl& rRepr, - const ::rtl::OUString* pName, - const ::rtl::OUString* pDesc ) : + const OUString* pName, + const OUString* pDesc ) : SvxRectCtlAccessibleContext_Base( m_aMutex ), mxParent( rxParent ), @@ -289,8 +289,8 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil if( !xChild.is() ) { const ChildIndexToPointData* p = IndexToPoint( nIndex, mbAngleMode ); - ::rtl::OUString aName(SVX_RESSTR(p->nResIdName)); - ::rtl::OUString aDescr(SVX_RESSTR(p->nResIdDescr)); + OUString aName(SVX_RESSTR(p->nResIdName)); + OUString aDescr(SVX_RESSTR(p->nResIdDescr)); Rectangle aFocusRect( mpRepr->CalculateFocusRectangle( p->ePoint ) ); @@ -344,13 +344,13 @@ sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole( void ) throw( return AccessibleRole::PANEL; } -::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return msDescription; } -::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); return msName; @@ -501,19 +501,19 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) //===== XServiceInfo ======================================================== -::rtl::OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException ) { - return ::rtl::OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ); + return OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ); } -sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const ::rtl::OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); // Iterate over all supported service names and return true if on of them // matches the given name. - Sequence< ::rtl::OUString > aSupportedServices( getSupportedServiceNames() ); + Sequence< OUString > aSupportedServices( getSupportedServiceNames() ); int nLength = aSupportedServices.getLength(); - const ::rtl::OUString* pStr = aSupportedServices.getConstArray(); + const OUString* pStr = aSupportedServices.getConstArray(); for( int i = nLength ; i ; --i, ++pStr ) { @@ -746,8 +746,8 @@ DBG_NAME( SvxRectCtlChildAccessibleContext ) SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext( const Reference& rxParent, const Window& rParentWindow, - const ::rtl::OUString& rName, - const ::rtl::OUString& rDescription, + const OUString& rName, + const OUString& rDescription, const Rectangle& rBoundingBox, long nIndexInParent ) : @@ -905,13 +905,13 @@ sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole( void ) t return AccessibleRole::RADIO_BUTTON; } -::rtl::OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); return msDescription; } -::rtl::OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); return msName; @@ -1038,12 +1038,12 @@ OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName( void return OUString( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" ); } -sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const ::rtl::OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException ) { // Iterate over all supported service names and return true if on of them // matches the given name. ::osl::MutexGuard aGuard( maMutex ); - Sequence< ::rtl::OUString > aSupportedServices ( getSupportedServiceNames() ); + Sequence< OUString > aSupportedServices ( getSupportedServiceNames() ); int nLength = aSupportedServices.getLength(); for( int i = 0 ; i < nLength; ++i ) { diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index fad1addceeb4..4af785bb8bb9 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -25,7 +25,6 @@ #include "cppuhelper/factory.hxx" #include "uno/lbnames.h" -using rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 41c963b22beb..b5d2d61f1fe1 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -114,14 +114,14 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 default : { EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special ); - aEquation += rtl::OUString( (sal_Unicode)'+' ); + aEquation += OUString( (sal_Unicode)'+' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special ); } break; } if ( b3Special || nP3 ) { - aEquation += rtl::OUString( (sal_Unicode)'-' ); + aEquation += OUString( (sal_Unicode)'-' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special ); } } @@ -131,12 +131,12 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special ); if ( b2Special || ( nP2 != 1 ) ) { - aEquation += rtl::OUString( (sal_Unicode)'*' ); + aEquation += OUString( (sal_Unicode)'*' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special ); } if ( b3Special || ( ( nP3 != 1 ) && ( nP3 != 0 ) ) ) { - aEquation += rtl::OUString( (sal_Unicode)'/' ); + aEquation += OUString( (sal_Unicode)'/' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special ); } } @@ -179,11 +179,11 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 { aEquation += "if("; EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special ); - aEquation += rtl::OUString( (sal_Unicode)',' ); + aEquation += OUString( (sal_Unicode)',' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP2, b2Special ); - aEquation += rtl::OUString( (sal_Unicode)',' ); + aEquation += OUString( (sal_Unicode)',' ); EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special ); - aEquation += rtl::OUString( (sal_Unicode)')' ); + aEquation += OUString( (sal_Unicode)')' ); } break; case 7 : @@ -200,7 +200,7 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special ); aEquation += "*"; EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP3, b3Special ); - aEquation += rtl::OUString( (sal_Unicode)')' ); + aEquation += OUString( (sal_Unicode)')' ); } break; case 8 : @@ -288,7 +288,7 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special ); aEquation += "*"; EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( aEquation, nP1, b1Special ); - aEquation += rtl::OUString( (sal_Unicode)')' ); + aEquation += OUString( (sal_Unicode)')' ); } break; case 0x81 : @@ -321,14 +321,14 @@ OUString EnhancedCustomShape2d::GetEquation( const sal_uInt16 nFlags, sal_Int16 return aEquation; } -void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( rtl::OUString& rParameter, const sal_Int16 nPara, const bool bIsSpecialValue ) +void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( OUString& rParameter, const sal_Int16 nPara, const bool bIsSpecialValue ) { if ( bIsSpecialValue ) { if ( nPara & 0x400 ) { rParameter += "?"; - rParameter += rtl::OUString::valueOf( (sal_Int32)( nPara & 0xff ) ); + rParameter += OUString::valueOf( (sal_Int32)( nPara & 0xff ) ); rParameter += " "; } else @@ -347,7 +347,7 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( rtl::OUS case DFF_Prop_adjust10Value : { rParameter += "$"; - rParameter += rtl::OUString::valueOf( (sal_Int32)( nPara - DFF_Prop_adjustValue ) ); + rParameter += OUString::valueOf( (sal_Int32)( nPara - DFF_Prop_adjustValue ) ); rParameter += " "; } break; @@ -376,7 +376,7 @@ void EnhancedCustomShape2d::AppendEnhancedCustomShapeEquationParameter( rtl::OUS } else { - rParameter += rtl::OUString::valueOf( (sal_Int32)( nPara ) ); + rParameter += OUString::valueOf( (sal_Int32)( nPara ) ); } } @@ -443,21 +443,21 @@ bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle( { const com::sun::star::beans::PropertyValue& rPropVal = rHandleProperties[ i ]; - const rtl::OUString sPosition ( "Position" ); - const rtl::OUString sMirroredX ( "MirroredX" ); - const rtl::OUString sMirroredY ( "MirroredY" ); - const rtl::OUString sSwitched ( "Switched" ); - const rtl::OUString sPolar ( "Polar" ); - const rtl::OUString sRefX ( "RefX" ); - const rtl::OUString sRefY ( "RefY" ); - const rtl::OUString sRefAngle ( "RefAngle" ); - const rtl::OUString sRefR ( "RefR" ); - const rtl::OUString sRadiusRangeMinimum ( "RadiusRangeMinimum" ); - const rtl::OUString sRadiusRangeMaximum ( "RadiusRangeMaximum" ); - const rtl::OUString sRangeXMinimum ( "RangeXMinimum" ); - const rtl::OUString sRangeXMaximum ( "RangeXMaximum" ); - const rtl::OUString sRangeYMinimum ( "RangeYMinimum" ); - const rtl::OUString sRangeYMaximum ( "RangeYMaximum" ); + const OUString sPosition ( "Position" ); + const OUString sMirroredX ( "MirroredX" ); + const OUString sMirroredY ( "MirroredY" ); + const OUString sSwitched ( "Switched" ); + const OUString sPolar ( "Polar" ); + const OUString sRefX ( "RefX" ); + const OUString sRefY ( "RefY" ); + const OUString sRefAngle ( "RefAngle" ); + const OUString sRefR ( "RefR" ); + const OUString sRadiusRangeMinimum ( "RadiusRangeMinimum" ); + const OUString sRadiusRangeMaximum ( "RadiusRangeMaximum" ); + const OUString sRangeXMinimum ( "RangeXMinimum" ); + const OUString sRangeXMaximum ( "RangeXMaximum" ); + const OUString sRangeYMinimum ( "RangeYMinimum" ); + const OUString sRangeYMaximum ( "RangeYMaximum" ); if ( rPropVal.Name == sPosition ) { @@ -561,7 +561,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha ////////////////////// // AdjustmentValues // ////////////////////// - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); const Any* pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sAdjustmentValues ); if ( pAny ) *pAny >>= seqAdjustmentValues; @@ -569,7 +569,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha /////////////// // Coordsize // /////////////// - const rtl::OUString sViewBox( "ViewBox" ); + const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; if ( pViewBox && (*pViewBox >>= aViewBox ) ) @@ -579,12 +579,12 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha nCoordWidthG = labs( aViewBox.Width ); nCoordHeightG = labs( aViewBox.Height); } - const rtl::OUString sPath( "Path" ); + const OUString sPath( "Path" ); ////////////////////// // Path/Coordinates // ////////////////////// - const rtl::OUString sCoordinates( "Coordinates" ); + const OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( pAny ) *pAny >>= seqCoordinates; @@ -592,7 +592,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha ///////////////////// // Path/GluePoints // ///////////////////// - const rtl::OUString sGluePoints( "GluePoints" ); + const OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( pAny ) *pAny >>= seqGluePoints; @@ -600,7 +600,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha /////////////////// // Path/Segments // /////////////////// - const rtl::OUString sSegments( "Segments" ); + const OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( pAny ) *pAny >>= seqSegments; @@ -608,7 +608,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha ////////////////////// // Path/SubViewSize // ////////////////////// - const rtl::OUString sSubViewSize( "SubViewSize" ); + const OUString sSubViewSize( "SubViewSize" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sSubViewSize ); if ( pAny ) *pAny >>= seqSubViewSize; @@ -616,7 +616,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha /////////////////// // Path/StretchX // /////////////////// - const rtl::OUString sStretchX( "StretchX" ); + const OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( pAny ) { @@ -628,7 +628,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha /////////////////// // Path/StretchY // /////////////////// - const rtl::OUString sStretchY( "StretchY" ); + const OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( pAny ) { @@ -640,7 +640,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha ///////////////////// // Path/TextFrames // ///////////////////// - const rtl::OUString sTextFrames( "TextFrames" ); + const OUString sTextFrames( "TextFrames" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( pAny ) *pAny >>= seqTextFrames; @@ -648,7 +648,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha /////////////// // Equations // /////////////// - const rtl::OUString sEquations( "Equations" ); + const OUString sEquations( "Equations" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sEquations ); if ( pAny ) *pAny >>= seqEquations; @@ -656,7 +656,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha ///////////// // Handles // ///////////// - const rtl::OUString sHandles( "Handles" ); + const OUString sHandles( "Handles" ); pAny = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sHandles ); if ( pAny ) *pAny >>= seqHandles; @@ -760,11 +760,11 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) : aP.Y() -= aS.Height() / 2; aLogicRect = Rectangle( aP, aS ); - const rtl::OUString sType( "Type" ); - const rtl::OUString sMirroredX( "MirroredX" ); - const rtl::OUString sMirroredY( "MirroredY" ); + const OUString sType( "Type" ); + const OUString sMirroredX( "MirroredX" ); + const OUString sMirroredY( "MirroredY" ); - rtl::OUString sShapeType; + OUString sShapeType; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)(const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); if ( pAny ) { @@ -1379,7 +1379,7 @@ bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nIndex // and writing them back into the GeometryItem SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&) (const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sAdjustmentValues; aPropVal.Value <<= seqAdjustmentValues; @@ -1844,7 +1844,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm case UNKNOWN : default : { - rtl::OStringBuffer aString("CustomShapes::unknown PolyFlagValue :"); + OStringBuffer aString("CustomShapes::unknown PolyFlagValue :"); aString.append(static_cast(nCommand)); OSL_FAIL(aString.getStr()); } diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index e6885a39166b..510e97664190 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -62,8 +62,8 @@ namespace { void GetOrigin( SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOriginY ) { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aOriginParaPair; - const rtl::OUString sOrigin( "Origin" ); - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sOrigin ); + const OUString sOrigin( "Origin" ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), sOrigin ); if ( ! ( pAny && ( *pAny >>= aOriginParaPair ) && ( aOriginParaPair.First.Value >>= rOriginX ) && ( aOriginParaPair.Second.Value >>= rOriginY ) ) ) { rOriginX = 0.50; @@ -74,8 +74,8 @@ void GetOrigin( SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOr void GetRotateAngle( SdrCustomShapeGeometryItem& rItem, double& rAngleX, double& rAngleY ) { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair; - const rtl::OUString sRotateAngle( "RotateAngle" ); - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sRotateAngle ); + const OUString sRotateAngle( "RotateAngle" ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), sRotateAngle ); if ( ! ( pAny && ( *pAny >>= aRotateAngleParaPair ) && ( aRotateAngleParaPair.First.Value >>= rAngleX ) && ( aRotateAngleParaPair.Second.Value >>= rAngleY ) ) ) { rAngleX = 0.0; @@ -88,8 +88,8 @@ void GetRotateAngle( SdrCustomShapeGeometryItem& rItem, double& rAngleX, double& void GetSkew( SdrCustomShapeGeometryItem& rItem, double& rSkewAmount, double& rSkewAngle ) { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; - const rtl::OUString sSkew( "Skew" ); - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sSkew ); + const OUString sSkew( "Skew" ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), sSkew ); if ( ! ( pAny && ( *pAny >>= aSkewParaPair ) && ( aSkewParaPair.First.Value >>= rSkewAmount ) && ( aSkewParaPair.Second.Value >>= rSkewAngle ) ) ) { rSkewAmount = 50; @@ -102,8 +102,8 @@ void GetExtrusionDepth( SdrCustomShapeGeometryItem& rItem, const double* pMap, d { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; double fDepth = 0, fFraction = 0; - const rtl::OUString sDepth( "Depth" ); - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sDepth ); + const OUString sDepth( "Depth" ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), sDepth ); if ( pAny && ( *pAny >>= aDepthParaPair ) && ( aDepthParaPair.First.Value >>= fDepth ) && ( aDepthParaPair.Second.Value >>= fFraction ) ) { rForwardDepth = fDepth * fFraction; @@ -122,10 +122,10 @@ void GetExtrusionDepth( SdrCustomShapeGeometryItem& rItem, const double* pMap, d } } -double GetDouble( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPropertyName, double fDefault, const double* pMap ) +double GetDouble( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, double fDefault, const double* pMap ) { double fRetValue = fDefault; - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), rPropertyName ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), rPropertyName ); if ( pAny ) *pAny >>= fRetValue; if ( pMap ) @@ -136,27 +136,27 @@ double GetDouble( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPrope drawing::ShadeMode GetShadeMode( SdrCustomShapeGeometryItem& rItem, const drawing::ShadeMode eDefault ) { drawing::ShadeMode eRet( eDefault ); - const rtl::OUString sShadeMode( "ShadeMode" ); - Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sShadeMode ); + const OUString sShadeMode( "ShadeMode" ); + Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), sShadeMode ); if ( pAny ) *pAny >>= eRet; return eRet; } -sal_Bool GetBool( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPropertyName, const sal_Bool bDefault ) +sal_Bool GetBool( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const sal_Bool bDefault ) { sal_Bool bRetValue = bDefault; - const Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), rPropertyName ); + const Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), rPropertyName ); if ( pAny ) *pAny >>= bRetValue; return bRetValue; } -drawing::Position3D GetPosition3D( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPropertyName, +drawing::Position3D GetPosition3D( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const drawing::Position3D& rDefault, const double* pMap ) { drawing::Position3D aRetValue( rDefault ); - const Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), rPropertyName ); + const Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), rPropertyName ); if ( pAny ) *pAny >>= aRetValue; if ( pMap ) @@ -168,10 +168,10 @@ drawing::Position3D GetPosition3D( SdrCustomShapeGeometryItem& rItem, const rtl: return aRetValue; } -drawing::Direction3D GetDirection3D( SdrCustomShapeGeometryItem& rItem, const rtl::OUString& rPropertyName, const drawing::Direction3D& rDefault ) +drawing::Direction3D GetDirection3D( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const drawing::Direction3D& rDefault ) { drawing::Direction3D aRetValue( rDefault ); - const Any* pAny = rItem.GetPropertyValueByName( rtl::OUString(aExtrusion), rPropertyName ); + const Any* pAny = rItem.GetPropertyValueByName( OUString(aExtrusion), rPropertyName ); if ( pAny ) *pAny >>= aRetValue; return aRetValue; @@ -185,8 +185,8 @@ EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCus , pMap( pM ) { SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - const rtl::OUString sProjectionMode( "ProjectionMode" ); - Any* pAny = rGeometryItem.GetPropertyValueByName( rtl::OUString(aExtrusion), sProjectionMode ); + const OUString sProjectionMode( "ProjectionMode" ); + Any* pAny = rGeometryItem.GetPropertyValueByName( OUString(aExtrusion), sProjectionMode ); if ( pAny ) *pAny >>= eProjectionMode; @@ -199,7 +199,7 @@ EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCus fOriginX = fOriginX * pCustomShape->GetLogicRect().GetWidth(); fOriginY = fOriginY * pCustomShape->GetLogicRect().GetHeight(); - const rtl::OUString sViewPoint( "ViewPoint" ); + const OUString sViewPoint( "ViewPoint" ); drawing::Position3D aViewPointDefault( 3472, -3472, 25000 ); drawing::Position3D aViewPoint( GetPosition3D( rGeometryItem, sViewPoint, aViewPointDefault, pMap ) ); fViewPoint.setX(aViewPoint.PositionX); @@ -316,7 +316,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con fDepth = 1.0; drawing::ProjectionMode eProjectionMode( drawing::ProjectionMode_PARALLEL ); - const rtl::OUString sProjectionMode( "ProjectionMode" ); + const OUString sProjectionMode( "ProjectionMode" ); Any* pAny = rGeometryItem.GetPropertyValueByName( aExtrusion, sProjectionMode ); if ( pAny ) *pAny >>= eProjectionMode; @@ -332,7 +332,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con bool bUseTwoFillStyles( false ); drawing::ShadeMode eShadeMode( GetShadeMode( rGeometryItem, drawing::ShadeMode_FLAT ) ); - const rtl::OUString aExtrusionColor( "Color" ); + const OUString aExtrusionColor( "Color" ); sal_Bool bUseExtrusionColor = GetBool( rGeometryItem, aExtrusionColor, sal_False ); XFillStyle eFillStyle( ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem ) ); @@ -546,7 +546,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con { aNewTransform.translate( -fOriginX, fOriginY, 0.0 ); // now set correct camera position - const rtl::OUString sViewPoint( "ViewPoint" ); + const OUString sViewPoint( "ViewPoint" ); drawing::Position3D aViewPointDefault( 3472, -3472, 25000 ); drawing::Position3D aViewPoint( GetPosition3D( rGeometryItem, sViewPoint, aViewPointDefault, pMap ) ); double fViewPointX = aViewPoint.PositionX; @@ -564,33 +564,33 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con // light // /////////// - const rtl::OUString sBrightness( "Brightness" ); + const OUString sBrightness( "Brightness" ); double fAmbientIntensity = GetDouble( rGeometryItem, sBrightness, 22178.0 / 655.36, NULL ) / 100.0; - const rtl::OUString sFirstLightDirection( "FirstLightDirection" ); + const OUString sFirstLightDirection( "FirstLightDirection" ); drawing::Direction3D aFirstLightDirectionDefault( 50000, 0, 10000 ); drawing::Direction3D aFirstLightDirection( GetDirection3D( rGeometryItem, sFirstLightDirection, aFirstLightDirectionDefault ) ); if ( aFirstLightDirection.DirectionZ == 0.0 ) aFirstLightDirection.DirectionZ = 1.0; - const rtl::OUString sFirstLightLevel( "FirstLightLevel" ); + const OUString sFirstLightLevel( "FirstLightLevel" ); double fLightIntensity = GetDouble( rGeometryItem, sFirstLightLevel, 43712.0 / 655.36, NULL ) / 100.0; - const rtl::OUString sFirstLightHarsh( "FirstLightHarsh" ); + const OUString sFirstLightHarsh( "FirstLightHarsh" ); /* sal_Bool bFirstLightHarsh = */ GetBool( rGeometryItem, sFirstLightHarsh, sal_False ); - const rtl::OUString sSecondLightDirection( "SecondLightDirection" ); + const OUString sSecondLightDirection( "SecondLightDirection" ); drawing::Direction3D aSecondLightDirectionDefault( -50000, 0, 10000 ); drawing::Direction3D aSecondLightDirection( GetDirection3D( rGeometryItem, sSecondLightDirection, aSecondLightDirectionDefault ) ); if ( aSecondLightDirection.DirectionZ == 0.0 ) aSecondLightDirection.DirectionZ = -1; - const rtl::OUString sSecondLightLevel( "SecondLightLevel" ); + const OUString sSecondLightLevel( "SecondLightLevel" ); double fLight2Intensity = GetDouble( rGeometryItem, sSecondLightLevel, 43712.0 / 655.36, NULL ) / 100.0; - const rtl::OUString sSecondLightHarsh( "SecondLightHarsh" ); - const rtl::OUString sLightFace( "LightFace" ); + const OUString sSecondLightHarsh( "SecondLightHarsh" ); + const OUString sLightFace( "LightFace" ); /* sal_Bool bLight2Harsh = */ GetBool( rGeometryItem, sSecondLightHarsh, sal_False ); /* sal_Bool bLightFace = */ GetBool( rGeometryItem, sLightFace, sal_False ); @@ -623,8 +623,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con pScene->GetProperties().SetObjectItem( Svx3DLightcolor3Item( aAmbientSpot3Color ) ); pScene->GetProperties().SetObjectItem( Svx3DLightDirection3Item( aSpotLight3 ) ); - const rtl::OUString sSpecularity( "Specularity" ); - const rtl::OUString sMetal( "Metal" ); + const OUString sSpecularity( "Specularity" ); + const OUString sMetal( "Metal" ); double fSpecular = GetDouble( rGeometryItem, sSpecularity, 0, NULL ) / 100; sal_Bool bMetal = GetBool( rGeometryItem, sMetal, sal_False ); @@ -681,7 +681,7 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* pCustomS aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i ].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(), fExtrusionBackward)); } - const rtl::OUString sRotationCenter( "RotationCenter" ); + const OUString sRotationCenter( "RotationCenter" ); drawing::Direction3D aRotationCenterDefault( 0, 0, 0 ); // default seems to be wrong, a fractional size of shape has to be used!! drawing::Direction3D aRotationCenter( GetDirection3D( rGeometryItem, sRotationCenter, aRotationCenterDefault ) ); diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx index 9c5faa150c21..c65b05e14743 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx @@ -66,11 +66,11 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException ); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& rServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw ( css::uno::RuntimeException ); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException ); // XCustomShapeEngine @@ -84,11 +84,11 @@ public: throw ( css::uno::RuntimeException ); }; -rtl::OUString EnhancedCustomShapeEngine_getImplementationName() +OUString EnhancedCustomShapeEngine_getImplementationName() throw ( css::uno::RuntimeException ); -sal_Bool SAL_CALL EnhancedCustomShapeEngine_supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL EnhancedCustomShapeEngine_supportsService( const OUString& rServiceName ) throw( css::uno::RuntimeException ); -css::uno::Sequence< rtl::OUString > SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames() throw( css::uno::RuntimeException ); #endif diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 7c26fe15726b..d095dad35ecc 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -64,7 +64,7 @@ struct FWCharacterData // representing a single character }; struct FWParagraphData // representing a single paragraph { - rtl::OUString aString; + OUString aString; std::vector< FWCharacterData > vCharacters; Rectangle aBoundRect; sal_Int16 nFrameDirection; @@ -219,7 +219,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F std::vector< FWParagraphData >::iterator aParagraphIEnd( rTextArea.vParagraphs.end() ); while( aParagraphIter != aParagraphIEnd ) { - const rtl::OUString& rText = aParagraphIter->aString; + const OUString& rText = aParagraphIter->aString; if ( !rText.isEmpty() ) { // generating vcl/font @@ -282,7 +282,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F for ( i = 0; i < rText.getLength(); i++ ) { FWCharacterData aCharacterData; - rtl::OUString aCharText( (sal_Unicode)rText[ i ] ); + OUString aCharText( (sal_Unicode)rText[ i ] ); if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, STRING_LEN, sal_True, nWidth, pDXArry ) ) { sal_Int32 nTextWidth = aVirDev.GetTextWidth( aCharText, 0, STRING_LEN ); @@ -427,8 +427,8 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) sal_Bool bSameLetterHeights = sal_False; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - const rtl::OUString sTextPath( "TextPath" ); - const rtl::OUString sSameLetterHeights( "SameLetterHeights" ); + const OUString sTextPath( "TextPath" ); + const OUString sSameLetterHeights( "SameLetterHeights" ); com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sSameLetterHeights ); if ( pAny ) *pAny >>= bSameLetterHeights; diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index cc8038e89385..a8c9cadc06a4 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -838,13 +838,13 @@ public: { case ENUM_FUNC_ADJUSTMENT : { - rtl::OUString aVal( rFirst + 1, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); + OUString aVal( rFirst + 1, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new AdjustmentExpression( *mpContext->mpCustoShape, aVal.toInt32() ) ) ); } break; case ENUM_FUNC_EQUATION : { - rtl::OUString aVal( rFirst + 1, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); + OUString aVal( rFirst + 1, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new EquationExpression( *mpContext->mpCustoShape, aVal.toInt32() ) ) ); } break; @@ -1176,13 +1176,13 @@ namespace EnhancedCustomShape { -ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ) +ExpressionNodeSharedPtr FunctionParser::parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ) { // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiFunction( - rtl::OUStringToOString( rFunction, RTL_TEXTENCODING_ASCII_US ) ); + const OString& rAsciiFunction( + OUStringToOString( rFunction, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiFunction.getStr() ); StringIteratorT aEnd( rAsciiFunction.getStr()+rAsciiFunction.getLength() ); diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index f083bc68151e..9c06dab28a9f 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -282,7 +282,7 @@ static const NameTypeTable pNameTypeTableArray[] = // gallery: fontwork-arch-left-pour // gallery: fontwork-arch-right-pour -MSO_SPT EnhancedCustomShapeTypeNames::Get( const rtl::OUString& rShapeType ) +MSO_SPT EnhancedCustomShapeTypeNames::Get( const OUString& rShapeType ) { if ( !pHashMap ) { // init hash map @@ -310,11 +310,11 @@ MSO_SPT EnhancedCustomShapeTypeNames::Get( const rtl::OUString& rShapeType ) return eRetValue; } -rtl::OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType ) +OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType ) { return eShapeType <= mso_sptTextBox - ? rtl::OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS ) - : rtl::OUString(); + ? OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS ) + : OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index 7a29065718da..87dab72ad024 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -144,14 +144,14 @@ void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ ) return sal_True; } -::rtl::OUString SAL_CALL SvxTbxCtlCustomShapes::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL SvxTbxCtlCustomShapes::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) { // Provide the controlled sub-toolbar name, so we are notified whenever // this toolbar executes a function. return m_aSubTbName; } -void SAL_CALL SvxTbxCtlCustomShapes::functionSelected( const ::rtl::OUString& rCommand ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxTbxCtlCustomShapes::functionSelected( const OUString& rCommand ) throw (::com::sun::star::uno::RuntimeException) { // remind the new command m_aCommand = rCommand; diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index fcccacb048e3..ba192eb321b3 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -249,8 +249,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() ); aStbStatus.InsertItem( 1, 130, SIB_LEFT | SIB_IN | SIB_AUTOSIZE ); - aStbStatus.InsertItem( 2, 10 + GetTextWidth( rtl::OUString(" 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN ); - aStbStatus.InsertItem( 3, 10 + GetTextWidth( rtl::OUString(" 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN ); + aStbStatus.InsertItem( 2, 10 + GetTextWidth( OUString(" 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN ); + aStbStatus.InsertItem( 3, 10 + GetTextWidth( OUString(" 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN ); aStbStatus.InsertItem( 4, 20, SIB_CENTER | SIB_IN ); Resize(); @@ -562,7 +562,7 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd ) const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0]; aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) ); - aStr.Append( rtl::OUString(" / ") ); + aStr.Append( OUString(" / ") ); aStr.Append( GetUnitString( rMousePos.Y(), eFieldUnit, cSep ) ); aStbStatus.SetItemText( 2, aStr ); @@ -579,7 +579,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd ) const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0]; aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) ); - aStr.Append( rtl::OUString(" x ") ); + aStr.Append( OUString(" x ") ); aStr.Append( GetUnitString( rSize.Height(), eFieldUnit, cSep ) ); aStbStatus.SetItemText( 3, aStr ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 1afcbca20378..f8434defeeac 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -399,7 +399,7 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2 ) int x = pix.X(); int y = pix.Y(); - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendUtf32( maFontCharMap.GetCharFromIndex( i ) ); String aCharStr(buf.makeStringAndClear()); int nTextWidth = GetTextWidth(aCharStr); @@ -722,7 +722,7 @@ void SvxShowCharSet::ReleaseAccessible() boost::shared_ptr xItem(new svx::SvxShowCharSetItem(*this, m_pAccessible->getTable(), sal::static_int_cast< sal_uInt16 >(_nPos))); aFind = m_aItems.insert(ItemsMap::value_type(_nPos, xItem)).first; - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendUtf32( maFontCharMap.GetCharFromIndex( _nPos ) ); aFind->second->maText = buf.makeStringAndClear(); Point pix = MapIndexToPixel( _nPos ); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index f1e863921717..aedc3187398b 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -456,7 +456,7 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ ) { if( pCurToken && nCurTokenLen ) - aToken = rtl::OUString(pCurToken, nCurTokenLen); + aToken = OUString(pCurToken, nCurTokenLen); else aToken.Erase(); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index ae2103614984..d5007a275807 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -567,7 +567,7 @@ void RecoveryCore::impl_stopListening() } //=============================================== -css::util::URL RecoveryCore::impl_getParsedURL(const ::rtl::OUString& sURL) +css::util::URL RecoveryCore::impl_getParsedURL(const OUString& sURL) { css::util::URL aURL; aURL.Complete = sURL; @@ -635,12 +635,12 @@ void SAL_CALL PluginProgress::removeEventListener( const css::uno::Reference< cs } //=============================================== -void SAL_CALL PluginProgress::start(const ::rtl::OUString&, +void SAL_CALL PluginProgress::start(const OUString&, sal_Int32 nRange) throw(css::uno::RuntimeException) { if (m_xProgress.is()) - m_xProgress->start(::rtl::OUString(), nRange); + m_xProgress->start(OUString(), nRange); } //=============================================== @@ -652,7 +652,7 @@ void SAL_CALL PluginProgress::end() } //=============================================== -void SAL_CALL PluginProgress::setText(const ::rtl::OUString& sText) +void SAL_CALL PluginProgress::setText(const OUString& sText) throw(css::uno::RuntimeException) { if (m_xProgress.is()) @@ -971,9 +971,9 @@ RecoveryDialog::RecoveryDialog(Window* pParent, FreeResource(); - ::rtl::OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/" ); - ::rtl::OUString CFG_PATH_CRASHREPORTER( "CrashReporter" ); - ::rtl::OUString CFG_ENTRY_ENABLED( "Enabled" ); + OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/" ); + OUString CFG_PATH_CRASHREPORTER( "CrashReporter" ); + OUString CFG_ENTRY_ENABLED( "Enabled" ); sal_Bool bCrashRepEnabled( sal_False ); css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey( @@ -1442,7 +1442,7 @@ void BrokenRecoveryDialog::impl_refresh() sal_uInt16 nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage ); m_aFileListLB.SetEntryData( nPos, (void*)&rInfo ); } - m_sSavePath = ::rtl::OUString(); + m_sSavePath = OUString(); m_aOkBtn.GrabFocus(); } @@ -1453,7 +1453,7 @@ sal_Bool BrokenRecoveryDialog::isExecutionNeeded() } //=============================================== -::rtl::OUString BrokenRecoveryDialog::getSaveDirURL() +OUString BrokenRecoveryDialog::getSaveDirURL() { return m_sSavePath; } @@ -1462,7 +1462,7 @@ sal_Bool BrokenRecoveryDialog::isExecutionNeeded() IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl) { String sPhysicalPath = comphelper::string::strip(m_aSaveDirED.GetText(), ' '); - rtl::OUString sURL; + OUString sURL; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPhysicalPath, sURL ); m_sSavePath = sURL; while (m_sSavePath.isEmpty()) @@ -1932,7 +1932,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() /////////////////////////////////////////////////////////////////////// - static ::rtl::OUString GetCrashConfigDir() + static OUString GetCrashConfigDir() { #if defined(WNT) @@ -1956,17 +1956,17 @@ void BrokenRecoveryDialog::impl_askForSavePath() #define PRVFILE ".crash_report_preview" #endif - static ::rtl::OUString GetPreviewURL() + static OUString GetPreviewURL() { - ::rtl::OUString aURL = GetCrashConfigDir(); + OUString aURL = GetCrashConfigDir(); - aURL += ::rtl::OUString( "/" ); - aURL += ::rtl::OUString( PRVFILE ); + aURL += OUString( "/" ); + aURL += OUString( PRVFILE ); return aURL; } - static String LoadCrashFile( const ::rtl::OUString &rURL ) + static String LoadCrashFile( const OUString &rURL ) { String aFileContent; ::osl::File aFile( rURL ); @@ -1974,7 +1974,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() printf( "Loading %s:", OString( rURL.getStr(), rURL.getLength(), osl_getThreadTextEncoding() ).getStr() ); if ( ::osl::FileBase::E_None == aFile.open( osl_File_OpenFlag_Read ) ) { - ::rtl::OString aContent; + OString aContent; ::osl::FileBase::RC result; sal_uInt64 aBytesRead; @@ -1986,12 +1986,12 @@ void BrokenRecoveryDialog::impl_askForSavePath() if ( ::osl::FileBase::E_None == result ) { - ::rtl::OString aTemp( aBuffer, static_cast< xub_StrLen >( aBytesRead ) ); + OString aTemp( aBuffer, static_cast< xub_StrLen >( aBytesRead ) ); aContent += aTemp; } } while ( ::osl::FileBase::E_None == result && aBytesRead ); - ::rtl::OUString ustrContent( aContent.getStr(), aContent.getLength(), RTL_TEXTENCODING_UTF8 ); + OUString ustrContent( aContent.getStr(), aContent.getLength(), RTL_TEXTENCODING_UTF8 ); aFileContent = ustrContent; aFile.close(); @@ -2019,7 +2019,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() String aPreview = LoadCrashFile( GetPreviewURL() ); ErrorRepSendDialog *pMainDlg = (ErrorRepSendDialog *)_pParent; - String aSeperator = ::rtl::OUString( "\r\n\r\n================\r\n\r\n" ); + String aSeperator = OUString( "\r\n\r\n================\r\n\r\n" ); String aContent = pMainDlg->GetDocType(); if ( aContent.Len() > 0 ) diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 451efe79cbd2..d9867c2f9e8f 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -572,7 +572,7 @@ const SvxFont& SvxFontPrevWindow::GetFont() const // ----------------------------------------------------------------------- -void SvxFontPrevWindow::SetPreviewText( const ::rtl::OUString& rString ) +void SvxFontPrevWindow::SetPreviewText( const OUString& rString ) { pImpl->aText = rString; pImpl->bTextInited = true; @@ -770,12 +770,12 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) long nTextWidth = 0; if(pImpl->cStartBracket) { - rtl::OUString sBracket(pImpl->cStartBracket); + OUString sBracket(pImpl->cStartBracket); nStartBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); } if(pImpl->cEndBracket) { - rtl::OUString sBracket(pImpl->cEndBracket); + OUString sBracket(pImpl->cEndBracket); nEndBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); } nTextWidth = pImpl->CalcTextSize( this, pPrinter, aSmallFont ).Width(); @@ -792,7 +792,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if(pImpl->cStartBracket) { - rtl::OUString sBracket(pImpl->cStartBracket); + OUString sBracket(pImpl->cStartBracket); rFont.DrawPrev( this, pPrinter, Point( _nX, nY - nOffset - 4), sBracket ); _nX += nStartBracketWidth; } @@ -806,7 +806,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if(pImpl->cEndBracket) { Point aTmpPoint( _nX + 1, nY - nOffset - 4); - rtl::OUString sBracket(pImpl->cEndBracket); + OUString sBracket(pImpl->cEndBracket); rFont.DrawPrev( this, pPrinter, aTmpPoint, sBracket ); } pImpl->aCJKFont.SetSize( aOldSize ); @@ -951,7 +951,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, if( GetWhich( rSet, SID_CHAR_DLG_PREVIEW_STRING, nWhich ) ) { const SfxStringItem& rItem = ( SfxStringItem& ) rSet.Get( nWhich ); - ::rtl::OUString aString = rItem.GetValue(); + OUString aString = rItem.GetValue(); if( !aString.isEmpty() ) SetPreviewText( aString ); else @@ -1188,7 +1188,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) if( ISITEMSET ) { const SfxStringItem& rItem = ( SfxStringItem& ) rSet.Get( nWhich ); - ::rtl::OUString aString = rItem.GetValue(); + OUString aString = rItem.GetValue(); if( !aString.isEmpty() ) SetPreviewText( aString ); else diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index f95c7685147a..b83a0db07931 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -63,7 +63,7 @@ IMapWindow::IMapWindow( Window* pParent, const ResId& rResId, const Reference< X pItemInfo = new SfxItemInfo[ 1 ]; memset( pItemInfo, 0, sizeof( SfxItemInfo ) ); - pIMapPool = new SfxItemPool( rtl::OUString("IMapItemPool"), + pIMapPool = new SfxItemPool( OUString("IMapItemPool"), SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, pItemInfo ); pIMapPool->FreezeIdRanges(); } @@ -640,8 +640,8 @@ void IMapWindow::DoMacroAssign() SfxItemSet aSet( *pIMapPool, SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 ); SfxEventNamesItem aNamesItem(SID_EVENTCONFIG); - aNamesItem.AddEvent( rtl::OUString("MouseOver"), String(), SFX_EVENT_MOUSEOVER_OBJECT ); - aNamesItem.AddEvent( rtl::OUString("MouseOut"), String(), SFX_EVENT_MOUSEOUT_OBJECT ); + aNamesItem.AddEvent( OUString("MouseOver"), String(), SFX_EVENT_MOUSEOVER_OBJECT ); + aNamesItem.AddEvent( OUString("MouseOut"), String(), SFX_EVENT_MOUSEOUT_OBJECT ); aSet.Put( aNamesItem ); SvxMacroItem aMacroItem(SID_ATTR_MACROITEM); diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx index d84d512b94e2..91aff686c092 100644 --- a/svx/source/dialog/linkwarn.cxx +++ b/svx/source/dialog/linkwarn.cxx @@ -41,7 +41,7 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const String& _rFil // replace filename String sInfoText = m_aInfoText.GetText(); - sInfoText.SearchAndReplaceAll(rtl::OUString("%FILENAME"), _rFileName); + sInfoText.SearchAndReplaceAll(OUString("%FILENAME"), _rFileName); m_aInfoText.SetText( sInfoText ); // load state of "warning on" checkbox from misc options diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 64cbdf1b67d8..f6ceeae7f3bc 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -207,14 +207,14 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : aNumFldDivisionY.SetModifyHdl( LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) ); - ::rtl::OUString sFlResolution( aFlResolution.GetDisplayText() ); - ::rtl::OUString sFtDrawX(aFtDrawX.GetDisplayText()); - ::rtl::OUString sFtDrawY(aFtDrawY.GetDisplayText()); + OUString sFlResolution( aFlResolution.GetDisplayText() ); + OUString sFtDrawX(aFtDrawX.GetDisplayText()); + OUString sFtDrawY(aFtDrawY.GetDisplayText()); aMtrFldDrawX.SetAccessibleName( sFtDrawX + sFlResolution ); aMtrFldDrawY.SetAccessibleName( sFtDrawY + sFlResolution ); - ::rtl::OUString sFlDivision( aFlDivision.GetDisplayText() ); - ::rtl::OUString sFtDivisionX(aFtDivisionX.GetDisplayText()); - ::rtl::OUString sFtDivisionY(aFtDivisionY.GetDisplayText()); + OUString sFlDivision( aFlDivision.GetDisplayText() ); + OUString sFtDivisionX(aFtDivisionX.GetDisplayText()); + OUString sFtDivisionY(aFtDivisionY.GetDisplayText()); aNumFldDivisionX.SetAccessibleName( sFtDivisionX + sFlDivision ); aNumFldDivisionY.SetAccessibleName( sFtDivisionY + sFlDivision ); } diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 2a9436e42ecb..e4469cdf58e7 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -307,10 +307,10 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s Size aDrawSize( 0, aRect.GetHeight() / 6); aFont.SetSize(aDrawSize); SetFont(aFont); - String sText(rtl::OUString("ABC")); + String sText(OUString("ABC")); Point aMove(1, GetTextHeight()); sal_Unicode cArrow = 0x2193; - long nAWidth = GetTextWidth(rtl::OUString(sText.GetChar(0))); + long nAWidth = GetTextWidth(OUString(sText.GetChar(0))); switch(pImpl->nFrameDirection) { case FRMDIR_HORI_LEFT_TOP: @@ -340,7 +340,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s sText.Append(cArrow); for(sal_uInt16 i = 0; i < sText.Len(); i++) { - rtl::OUString sDraw(sText.GetChar(i)); + OUString sDraw(sText.GetChar(i)); long nHDiff = 0; long nCharWidth = GetTextWidth(sDraw); bool bHorizontal = 0 == aMove.Y(); diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index 08221d1a6751..8782fcb343db 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -168,7 +168,7 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) // add the All-Filter String aAllFilter( ResId( STR_EXTFILTER_ALL, DIALOG_MGR() ) ); - maFileDlg.AddFilter(aAllFilter, rtl::OUString("*.*")); + maFileDlg.AddFilter(aAllFilter, OUString("*.*")); // and activate him maFileDlg.SetCurrentFilter( aAllFilter ); diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 89fe57a53839..22826bb9f417 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -99,7 +99,7 @@ void SvxRelativeField::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText( rtl::OUString('%') ); + SetCustomUnitText( OUString('%') ); SetUnit( FUNIT_CUSTOM ); } else diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index aa729ac9d498..2a19a5332561 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -48,7 +48,6 @@ using namespace com::sun::star::style; using namespace com::sun::star::view; using namespace com::sun::star::lang; using namespace com::sun::star::container; -using rtl::OUString; SFX_IMPL_CHILDWINDOW( SvxRubyChildWindow, SID_RUBY_DIALOG ); @@ -846,7 +845,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) break; case RubyAdjust_INDENT_BLOCK: { - long nCharWidth = GetTextWidth(rtl::OUString("X")); + long nCharWidth = GetTextWidth(OUString("X")); if(nOutTextWidth < (nRightEnd - nLeftStart - nCharWidth)) { nCharWidth /= 2; @@ -862,7 +861,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) long nSpace = ((nRightEnd - nLeftStart) - GetTextWidth(sOutputText)) / (nCount - 1); for(xub_StrLen i = 0; i < nCount; i++) { - rtl::OUString sChar(sOutputText.GetChar(i)); + OUString sChar(sOutputText.GetChar(i)); DrawText( Point( nLeftStart , nYOutput), sChar); long nCharWidth = GetTextWidth(sChar); nLeftStart += nCharWidth + nSpace; diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index e0c581a0159f..3271f6803f9c 100644 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx @@ -189,9 +189,9 @@ namespace svx{ { fprintf( fp, "[Options]\n" ); fprintf( fp, "UseProxy=%s\n", 2 == maParams.miHTTPConnectionType ? "true" : "false" ); - fprintf( fp, "ProxyServer=%s\n", rtl::OUStringToOString( maParams.maHTTPProxyServer, RTL_TEXTENCODING_UTF8 ).getStr() ); - fprintf( fp, "ProxyPort=%s\n", rtl::OUStringToOString( maParams.maHTTPProxyPort, RTL_TEXTENCODING_UTF8 ).getStr() ); - fprintf( fp, "ReturnAddress=%s\n", rtl::OUStringToOString( GetEMailAddress(), RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( fp, "ProxyServer=%s\n", OUStringToOString( maParams.maHTTPProxyServer, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( fp, "ProxyPort=%s\n", OUStringToOString( maParams.maHTTPProxyPort, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( fp, "ReturnAddress=%s\n", OUStringToOString( GetEMailAddress(), RTL_TEXTENCODING_UTF8 ).getStr() ); fprintf( fp, "AllowContact=%s\n", IsContactAllowed() ? "true" : "false" ); fclose( fp ); } @@ -201,8 +201,8 @@ namespace svx{ bool ErrorRepSendDialog::SendReport() { - rtl::OUString sSubEnvVar("ERRORREPORT_SUBJECT"); - rtl::OUString strSubject(GetDocType()); + OUString sSubEnvVar("ERRORREPORT_SUBJECT"); + OUString strSubject(GetDocType()); osl_setEnvironment(sSubEnvVar.pData, strSubject.pData); char szBodyFile[L_tmpnam] = ""; @@ -210,22 +210,22 @@ namespace svx{ if ( fp ) { - rtl::OString strUTF8(rtl::OUStringToOString(GetUsing(), RTL_TEXTENCODING_UTF8)); + OString strUTF8(OUStringToOString(GetUsing(), RTL_TEXTENCODING_UTF8)); size_t nWritten = fwrite(strUTF8.getStr(), 1, strUTF8.getLength(), fp); OSL_VERIFY(nWritten == static_cast(strUTF8.getLength())); fclose( fp ); - rtl::OUString sBodyEnvVar("ERRORREPORT_BODYFILE"); - rtl::OUString strBodyFile(rtl::OStringToOUString(rtl::OString(szBodyFile), + OUString sBodyEnvVar("ERRORREPORT_BODYFILE"); + OUString strBodyFile(OStringToOUString(OString(szBodyFile), osl_getThreadTextEncoding())); osl_setEnvironment(sBodyEnvVar.pData, strBodyFile.pData); } int ret = -1; - rtl::OUString path1("$BRAND_BASE_DIR/program/crashrep"); + OUString path1("$BRAND_BASE_DIR/program/crashrep"); rtl::Bootstrap::expandMacros(path1); - rtl::OString path2; + OString path2; if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == osl::FileBase::E_None) && path1.convertToString( @@ -233,7 +233,7 @@ namespace svx{ (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) { - rtl::OStringBuffer cmd; + OStringBuffer cmd; tools::appendUnixShellWord(&cmd, path2); cmd.append(" -debug -load -send -noui"); ret = system(cmd.getStr()); diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx index b49a2612931e..0a02388a3c86 100644 --- a/svx/source/dialog/sendreportw32.cxx +++ b/svx/source/dialog/sendreportw32.cxx @@ -112,7 +112,7 @@ namespace svx{ TEXT("ReturnAddress"), szBuffer, sizeof(szBuffer) ) ) - maEMailAddrED.SetText(rtl::OUString((sal_Unicode *)szBuffer)); + maEMailAddrED.SetText(OUString((sal_Unicode *)szBuffer)); DWORD fAllowContact = sal_False; RegReadValue( @@ -196,7 +196,7 @@ namespace svx{ if ( fp ) { - rtl::OString strUTF8(rtl::OUStringToOString(GetUsing(), + OString strUTF8(OUStringToOString(GetUsing(), RTL_TEXTENCODING_UTF8)); fwrite( strUTF8.getStr(), 1, strUTF8.getLength(), fp ); diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index c32ed7463c2f..46f308d86a6b 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -209,7 +209,7 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) } bPaintFlag=sal_True; } -void SvxSimpleTable::InsertHeaderEntry(const rtl::OUString& rText, +void SvxSimpleTable::InsertHeaderEntry(const OUString& rText, sal_uInt16 nCol, HeaderBarItemBits nBits) { sal_Int32 nEnd = rText.indexOf( sal_Unicode( '\t' ) ); @@ -222,7 +222,7 @@ void SvxSimpleTable::InsertHeaderEntry(const rtl::OUString& rText, sal_Int32 nIndex = 0; do { - rtl::OUString aString = rText.getToken(0, '\t', nIndex); + OUString aString = rText.getToken(0, '\t', nIndex); aHeaderBar.InsertItem(nHeaderItemId++, aString, 0, nBits, nCol); } while ( nIndex >= 0 ); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 0040b3278427..9e7296061f1f 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -117,17 +117,17 @@ struct SearchDlg_Impl bDeltaCalculated( sal_False ), pRanges ( NULL ) { - aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString("vnd.sun.search:SearchViaComponent1"); - aCommand1URL.Protocol = rtl::OUString("vnd.sun.search:"); - aCommand1URL.Path = rtl::OUString("SearchViaComponent1"); - aCommand2URL.Complete = aCommand2URL.Main = rtl::OUString("vnd.sun.search:SearchViaComponent2"); - aCommand2URL.Protocol = rtl::OUString("vnd.sun.search:"); - aCommand2URL.Path = rtl::OUString("SearchViaComponent2"); + aCommand1URL.Complete = aCommand1URL.Main = OUString("vnd.sun.search:SearchViaComponent1"); + aCommand1URL.Protocol = OUString("vnd.sun.search:"); + aCommand1URL.Path = OUString("SearchViaComponent1"); + aCommand2URL.Complete = aCommand2URL.Main = OUString("vnd.sun.search:SearchViaComponent2"); + aCommand2URL.Protocol = OUString("vnd.sun.search:"); + aCommand2URL.Path = OUString("SearchViaComponent2"); } ~SearchDlg_Impl() { delete[] pRanges; } }; -void ListToStrArr_Impl( sal_uInt16 nId, std::vector& rStrLst, ComboBox& rCBox ) +void ListToStrArr_Impl( sal_uInt16 nId, std::vector& rStrLst, ComboBox& rCBox ) { SfxStringListItem* pSrchItem = (SfxStringListItem*)SFX_APP()->GetItem( nId ); @@ -144,12 +144,12 @@ void ListToStrArr_Impl( sal_uInt16 nId, std::vector& rStrLst, Com } } -void StrArrToList_Impl( sal_uInt16 nId, const std::vector& rStrLst ) +void StrArrToList_Impl( sal_uInt16 nId, const std::vector& rStrLst ) { DBG_ASSERT( !rStrLst.empty(), "check in advance"); std::vector aLst; - for (std::vector::const_iterator i = rStrLst.begin(); i != rStrLst.end(); ++i) + for (std::vector::const_iterator i = rStrLst.begin(); i != rStrLst.end(); ++i) aLst.push_back(String(*i)); SFX_APP()->PutItem( SfxStringListItem( nId, &aLst ) ); @@ -433,7 +433,7 @@ void SvxSearchDialog::Construct_Impl() // vnd.sun.star::SearchViaComponent1 and 2 are supported const uno::Reference< frame::XFrame >xFrame = rBindings.GetActiveFrame(); const uno::Reference< frame::XDispatchProvider > xDispatchProv(xFrame, uno::UNO_QUERY); - rtl::OUString sTarget("_self"); + OUString sTarget("_self"); bool bSearchComponent1 = false; bool bSearchComponent2 = false; @@ -456,24 +456,24 @@ void SvxSearchDialog::Construct_Impl() uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider = configuration::theDefaultProvider::get( comphelper::getComponentContext(xMgr) ); uno::Sequence< uno::Any > aArgs(1); - ::rtl::OUString sPath( "/org.openoffice.Office.Common/SearchOptions/"); + OUString sPath( "/org.openoffice.Office.Common/SearchOptions/"); aArgs[0] <<= sPath; uno::Reference< uno::XInterface > xIFace = xConfigurationProvider->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess"), + OUString( "com.sun.star.configuration.ConfigurationUpdateAccess"), aArgs); uno::Reference< container::XNameAccess> xDirectAccess(xIFace, uno::UNO_QUERY); if(xDirectAccess.is()) { - ::rtl::OUString sTemp; - ::rtl::OUString sProperty( "ComponentSearchGroupLabel"); + OUString sTemp; + OUString sProperty( "ComponentSearchGroupLabel"); uno::Any aRet = xDirectAccess->getByName(sProperty); aRet >>= sTemp; aSearchComponentFL.SetText( sTemp ); - aRet = xDirectAccess->getByName(::rtl::OUString( "ComponentSearchCommandLabel1")); + aRet = xDirectAccess->getByName(OUString( "ComponentSearchCommandLabel1")); aRet >>= sTemp; aSearchComponent1PB.SetText( sTemp ); - aRet = xDirectAccess->getByName(::rtl::OUString( "ComponentSearchCommandLabel2")); + aRet = xDirectAccess->getByName(OUString( "ComponentSearchCommandLabel2")); aRet >>= sTemp; aSearchComponent2PB.SetText( sTemp ); } @@ -1527,9 +1527,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) { uno::Sequence < beans::PropertyValue > aArgs(2); beans::PropertyValue* pArgs = aArgs.getArray(); - pArgs[0].Name = ::rtl::OUString("SearchString"); - pArgs[0].Value <<= ::rtl::OUString(aSearchLB.GetText()); - pArgs[1].Name = ::rtl::OUString("ParentWindow"); + pArgs[0].Name = OUString("SearchString"); + pArgs[0].Value <<= OUString(aSearchLB.GetText()); + pArgs[1].Name = OUString("ParentWindow"); pArgs[1].Value <<= VCLUnoHelper::GetInterface( this ); if(pBtn == &aSearchComponent1PB) { @@ -1706,11 +1706,11 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch ) if ( !rStr.Len() ) return; - std::vector* pArr = _bSearch ? &aSearchStrings : &aReplaceStrings; + std::vector* pArr = _bSearch ? &aSearchStrings : &aReplaceStrings; ComboBox* pListBox = _bSearch ? &aSearchLB : &aReplaceLB; // ignore identical strings - for (std::vector::const_iterator i = pArr->begin(); i != pArr->end(); ++i) + for (std::vector::const_iterator i = pArr->begin(); i != pArr->end(); ++i) { if ((*i).equals(rStr)) return; diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index 695b546e647d..40a1390ad2cf 100644 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx @@ -42,7 +42,7 @@ SvxStandardDialog::SvxStandardDialog( Window *pParent, const ResId &rResId ) { } -SvxStandardDialog::SvxStandardDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ) +SvxStandardDialog::SvxStandardDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : SfxModalDialog(pParent, rID, rUIXMLDescription) { } diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx index 9e93b691025e..b38b45de9310 100644 --- a/svx/source/dialog/strarray.cxx +++ b/svx/source/dialog/strarray.cxx @@ -48,11 +48,11 @@ SvxStringArray::~SvxStringArray() //------------------------------------------------------------------------ -const rtl::OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const +const OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const { if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) return ResStringArray::GetString( nPos ); - return rtl::OUString(); + return OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index cfddf3fab190..a135586b947f 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -62,7 +62,6 @@ using namespace com::sun::star::i18n; using namespace com::sun::star::text; using namespace com::sun::star::container; using namespace com::sun::star::style; -using rtl::OUString; #define NUM_PAGETYPE_BULLET 0 #define NUM_PAGETYPE_SINGLENUM 1 @@ -93,7 +92,7 @@ static const sal_Unicode aBulletTypes[] = static Font& lcl_GetDefaultBulletFont() { static sal_Bool bInit = 0; - static Font aDefBulletFont( rtl::OUString("StarSymbol"), + static Font aDefBulletFont( OUString("StarSymbol"), String(), Size( 0, 14 ) ); if(!bInit) { @@ -303,9 +302,9 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } Sequence< PropertyValue > aProperties(2); PropertyValue* pProperties = aProperties.getArray(); - pProperties[0].Name = rtl::OUString("NumberingType"); + pProperties[0].Name = OUString("NumberingType"); pProperties[0].Value <<= aNumberingTypes[i]; - pProperties[1].Name = rtl::OUString("Value"); + pProperties[1].Name = OUString("Value"); pProperties[1].Value <<= (sal_Int32)1; try { diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 39ca05ac3169..2dfdebe603a8 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -161,13 +161,13 @@ void SvxSwFrameExample::InitAllRects_Impl() { aFont.SetSize(Size(0, aParaPrtArea.GetHeight() - 2)); SetFont(aFont); - aParaPrtArea.SetSize(Size(GetTextWidth(rtl::OUString(DEMOTEXT)), GetTextHeight())); + aParaPrtArea.SetSize(Size(GetTextWidth(OUString(DEMOTEXT)), GetTextHeight())); } else { aFont.SetSize(Size(0, aParaPrtArea.GetHeight() / 2)); SetFont(aFont); - aAutoCharFrame.SetSize(Size(GetTextWidth(rtl::OUString('A')), GetTextHeight())); + aAutoCharFrame.SetSize(Size(GetTextWidth(OUString('A')), GetTextHeight())); aAutoCharFrame.SetPos(Point(aParaPrtArea.Left() + (aParaPrtArea.GetWidth() - aAutoCharFrame.GetWidth()) / 2, aParaPrtArea.Top() + (aParaPrtArea.GetHeight() - aAutoCharFrame.GetHeight()) / 2)); } @@ -207,7 +207,7 @@ void SvxSwFrameExample::InitAllRects_Impl() } else { - sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(rtl::OUString(DEMOTEXT)); + sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(OUString(DEMOTEXT)); aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3); aDrawObj.SetSize(Size(Max(5L, (long)nFreeWidth / 3L), Max(5L, aFrmSize.Height() * 3L))); @@ -665,11 +665,11 @@ void SvxSwFrameExample::Paint(const Rectangle&) aPara.Bottom() -= nDiff; } if (nAnchor == TextContentAnchorType_AT_CHARACTER && bIgnoreWrap) - DrawText(aAutoCharFrame, rtl::OUString('A')); + DrawText(aAutoCharFrame, OUString('A')); } else { - DrawText(aParaPrtArea, rtl::OUString(DEMOTEXT)); + DrawText(aParaPrtArea, OUString(DEMOTEXT)); DrawRect_Impl(aDrawObj, m_aBlankCol, m_aBlankFrameCol ); } diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index 1252b93a17bf..c67f0997ceed 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -39,14 +39,14 @@ SvxTextEncodingTable::~SvxTextEncodingTable() //------------------------------------------------------------------------ -const rtl::OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const +const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const { sal_uInt32 nPos = FindIndex( (long)nEnc ); if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) return ResStringArray::GetString( nPos ); - return rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------ diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 81a809263ab0..b5e9b8e20539 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -47,11 +47,11 @@ namespace svx //= OColumnTransferable //==================================================================== //-------------------------------------------------------------------- - OColumnTransferable::OColumnTransferable(const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + OColumnTransferable::OColumnTransferable(const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand - ,const ::rtl::OUString& _rFieldName + ,const OUString& _rCommand + ,const OUString& _rFieldName ,sal_Int32 _nFormats) :m_nFormatFlags(_nFormats) { @@ -62,7 +62,7 @@ namespace svx OColumnTransferable::OColumnTransferable(const ODataAccessDescriptor& _rDescriptor, sal_Int32 _nFormats ) :m_nFormatFlags(_nFormats) { - ::rtl::OUString sDataSource, sDatabaseLocation, sConnectionResource, sCommand, sFieldName; + OUString sDataSource, sDatabaseLocation, sConnectionResource, sCommand, sFieldName; if ( _rDescriptor.has( daDataSource ) ) _rDescriptor[ daDataSource ] >>= sDataSource; if ( _rDescriptor.has( daDatabaseLocation ) ) _rDescriptor[ daDatabaseLocation ] >>= sDatabaseLocation; if ( _rDescriptor.has( daConnectionResource ) ) _rDescriptor[ daConnectionResource ] >>= sConnectionResource; @@ -88,15 +88,15 @@ namespace svx //-------------------------------------------------------------------- OColumnTransferable::OColumnTransferable(const Reference< XPropertySet >& _rxForm, - const ::rtl::OUString& _rFieldName, const Reference< XPropertySet >& _rxColumn, + const OUString& _rFieldName, const Reference< XPropertySet >& _rxColumn, const Reference< XConnection >& _rxConnection, sal_Int32 _nFormats) :m_nFormatFlags(_nFormats) { OSL_ENSURE(_rxForm.is(), "OColumnTransferable::OColumnTransferable: invalid form!"); // collect the necessary information from the form - ::rtl::OUString sCommand; + OUString sCommand; sal_Int32 nCommandType = CommandType::TABLE; - ::rtl::OUString sDatasource,sURL; + OUString sDatasource,sURL; sal_Bool bTryToParse = sal_True; try @@ -119,14 +119,14 @@ namespace svx try { Reference< XTablesSupplier > xSupTab; - _rxForm->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupTab; + _rxForm->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSupTab; if(xSupTab.is()) { Reference< XNameAccess > xNames = xSupTab->getTables(); if (xNames.is()) { - Sequence< ::rtl::OUString > aTables = xNames->getElementNames(); + Sequence< OUString > aTables = xNames->getElementNames(); if (1 == aTables.getLength()) { sCommand = aTables[0]; @@ -158,23 +158,23 @@ namespace svx static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; } //-------------------------------------------------------------------- - void OColumnTransferable::implConstruct( const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + void OColumnTransferable::implConstruct( const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand - , const ::rtl::OUString& _rFieldName) + ,const OUString& _rCommand + , const OUString& _rFieldName) { const sal_Unicode cSeparator = sal_Unicode(11); - const ::rtl::OUString sSeparator(&cSeparator, 1); + const OUString sSeparator(&cSeparator, 1); - m_sCompatibleFormat = ::rtl::OUString(); + m_sCompatibleFormat = OUString(); m_sCompatibleFormat += _rDatasource; m_sCompatibleFormat += sSeparator; m_sCompatibleFormat += _rCommand; @@ -193,7 +193,7 @@ namespace svx cCommandType = '2'; break; } - m_sCompatibleFormat += ::rtl::OUString(&cCommandType, 1); + m_sCompatibleFormat += OUString(&cCommandType, 1); m_sCompatibleFormat += sSeparator; m_sCompatibleFormat += _rFieldName; @@ -291,7 +291,7 @@ namespace svx } // only the old (compatible) format exists -> use the other extract method ... - ::rtl::OUString sDatasource, sCommand, sFieldName,sDatabaseLocation,sConnectionResource; + OUString sDatasource, sCommand, sFieldName,sDatabaseLocation,sConnectionResource; sal_Int32 nCommandType = CommandType::COMMAND; ODataAccessDescriptor aDescriptor; @@ -314,12 +314,12 @@ namespace svx //-------------------------------------------------------------------- sal_Bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData - ,::rtl::OUString& _rDatasource - ,::rtl::OUString& _rDatabaseLocation - ,::rtl::OUString& _rConnectionResource + ,OUString& _rDatasource + ,OUString& _rDatabaseLocation + ,OUString& _rConnectionResource ,sal_Int32& _nCommandType - ,::rtl::OUString& _rCommand - ,::rtl::OUString& _rFieldName) + ,OUString& _rCommand + ,OUString& _rFieldName) { if ( _rData.HasFormat(getDescriptorFormatId()) ) { @@ -384,20 +384,20 @@ namespace svx //= ODataAccessObjectTransferable //==================================================================== ODataAccessObjectTransferable::ODataAccessObjectTransferable( - const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ) { construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,NULL,(CommandType::COMMAND == _nCommandType),_rCommand); } //-------------------------------------------------------------------- ODataAccessObjectTransferable::ODataAccessObjectTransferable( - const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ,const Reference< XConnection >& _rxConnection) { OSL_ENSURE(_rxConnection.is(),"Wrong ctor used.!"); @@ -408,9 +408,9 @@ namespace svx ODataAccessObjectTransferable::ODataAccessObjectTransferable(const Reference< XPropertySet >& _rxLivingForm) { // collect some properties of the form - ::rtl::OUString sDatasourceName,sConnectionResource; + OUString sDatasourceName,sConnectionResource; sal_Int32 nObjectType = CommandType::COMMAND; - ::rtl::OUString sObjectName; + OUString sObjectName; Reference< XConnection > xConnection; try { @@ -427,7 +427,7 @@ namespace svx } // check if the SQL-statement is modified - ::rtl::OUString sCompleteStatement; + OUString sCompleteStatement; try { _rxLivingForm->getPropertyValue(FM_PROP_ACTIVECOMMAND) >>= sCompleteStatement; @@ -553,7 +553,7 @@ namespace svx void ODataAccessObjectTransferable::addCompatibleSelectionDescription( const Sequence< Any >& _rSelRows ) { const sal_Unicode cSeparator(11); - const ::rtl::OUString sSeparator(&cSeparator, 1); + const OUString sSeparator(&cSeparator, 1); const Any* pSelRows = _rSelRows.getConstArray(); const Any* pSelRowsEnd = pSelRows + _rSelRows.getLength(); @@ -562,7 +562,7 @@ namespace svx sal_Int32 nSelectedRow( 0 ); OSL_VERIFY( *pSelRows >>= nSelectedRow ); - m_sCompatibleObjectDescription += ::rtl::OUString::valueOf((sal_Int32)nSelectedRow); + m_sCompatibleObjectDescription += OUString::valueOf((sal_Int32)nSelectedRow); m_sCompatibleObjectDescription += sSeparator; } } @@ -573,13 +573,13 @@ namespace svx m_aDescriptor.clear(); } // ----------------------------------------------------------------------------- - void ODataAccessObjectTransferable::construct( const ::rtl::OUString& _rDatasource - ,const ::rtl::OUString& _rConnectionResource + void ODataAccessObjectTransferable::construct( const OUString& _rDatasource + ,const OUString& _rConnectionResource ,const sal_Int32 _nCommandType - ,const ::rtl::OUString& _rCommand + ,const OUString& _rCommand ,const Reference< XConnection >& _rxConnection ,sal_Bool _bAddCommand - ,const ::rtl::OUString& _sActiveCommand) + ,const OUString& _sActiveCommand) { m_aDescriptor.setDataSource(_rDatasource); // build the descriptor (the property sequence) @@ -592,8 +592,8 @@ namespace svx // extract the single values from the sequence - ::rtl::OUString sObjectName; - ::rtl::OUString sDatasourceName = _rDatasource; + OUString sObjectName; + OUString sDatasourceName = _rDatasource; sObjectName = _rCommand; // for compatibility: create a string which can be used for the SOT_FORMATSTR_ID_SBA_DATAEXCHANGE format @@ -602,7 +602,7 @@ namespace svx // statements are - in this old and ugly format - described as queries const sal_Unicode cSeparator = sal_Unicode(11); - const ::rtl::OUString sSeparator(&cSeparator, 1); + const OUString sSeparator(&cSeparator, 1); const sal_Unicode cTableMark = '1'; const sal_Unicode cQueryMark = '0'; @@ -610,23 +610,23 @@ namespace svx // build the descriptor string m_sCompatibleObjectDescription += sDatasourceName; m_sCompatibleObjectDescription += sSeparator; - m_sCompatibleObjectDescription += bTreatAsStatement ? ::rtl::OUString() : sObjectName; + m_sCompatibleObjectDescription += bTreatAsStatement ? OUString() : sObjectName; m_sCompatibleObjectDescription += sSeparator; switch (_nCommandType) { case CommandType::TABLE: - m_sCompatibleObjectDescription += ::rtl::OUString(&cTableMark, 1); + m_sCompatibleObjectDescription += OUString(&cTableMark, 1); break; case CommandType::QUERY: - m_sCompatibleObjectDescription += ::rtl::OUString(&cQueryMark, 1); + m_sCompatibleObjectDescription += OUString(&cQueryMark, 1); break; case CommandType::COMMAND: - m_sCompatibleObjectDescription += ::rtl::OUString(&cQueryMark, 1); + m_sCompatibleObjectDescription += OUString(&cQueryMark, 1); // think of it as a query break; } m_sCompatibleObjectDescription += sSeparator; - m_sCompatibleObjectDescription += _bAddCommand ? _sActiveCommand : ::rtl::OUString(); + m_sCompatibleObjectDescription += _bAddCommand ? _sActiveCommand : OUString(); m_sCompatibleObjectDescription += sSeparator; } @@ -640,7 +640,7 @@ namespace svx static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 1f0b1df05096..182e74fd49d1 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -47,7 +47,7 @@ namespace svx //= OComponentTransferable //==================================================================== //-------------------------------------------------------------------- - OComponentTransferable::OComponentTransferable(const ::rtl::OUString& _rDatasourceOrLocation + OComponentTransferable::OComponentTransferable(const OUString& _rDatasourceOrLocation ,const Reference< XContent>& _xContent) { m_aDescriptor.setDataSource(_rDatasourceOrLocation); @@ -62,12 +62,12 @@ namespace svx static sal_uInt32 s_nFormFormat = (sal_uInt32)-1; if ( _bExtractForm && (sal_uInt32)-1 == s_nFormFormat ) { - s_nFormFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" )); + s_nFormFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" )); OSL_ENSURE((sal_uInt32)-1 != s_nFormFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!"); } else if ( !_bExtractForm && (sal_uInt32)-1 == s_nReportFormat) { - s_nReportFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\"")); + s_nReportFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nReportFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!"); } return _bExtractForm ? s_nFormFormat : s_nReportFormat; @@ -82,7 +82,7 @@ namespace svx Reference xProp; m_aDescriptor[daComponent] >>= xProp; if ( xProp.is() ) - xProp->getPropertyValue(::rtl::OUString("IsForm")) >>= bForm; + xProp->getPropertyValue(OUString("IsForm")) >>= bForm; } catch(Exception) {} diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index f0ec0421841d..b3c259deda8b 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -89,7 +89,7 @@ using namespace ::svx; //============================================================================== //------------------------------------------------------------------------------ -::rtl::OUString FieldServiceFromId(sal_Int32 nID) +OUString FieldServiceFromId(sal_Int32 nID) { switch (nID) { @@ -104,7 +104,7 @@ using namespace ::svx; case SID_FM_PATTERNFIELD : return FM_COL_PATTERNFIELD; case SID_FM_FORMATTEDFIELD : return FM_COL_FORMATTEDFIELD; } - return ::rtl::OUString(); + return OUString(); } //============================================================================== @@ -193,7 +193,7 @@ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt ) try { Reference< ::com::sun::star::beans::XPropertySet > xColumn(xColumns->getByIndex(nPos),UNO_QUERY); - ::rtl::OUString aHelpText; + OUString aHelpText; xColumn->getPropertyValue(FM_PROP_HELPTEXT) >>= aHelpText; if ( aHelpText.isEmpty() ) xColumn->getPropertyValue(FM_PROP_DESCRIPTION) >>= aHelpText; @@ -248,7 +248,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) } // extract the descriptor - ::rtl::OUString sDatasouce, sCommand, sFieldName,sDatabaseLocation,sConnnectionResource; + OUString sDatasouce, sCommand, sFieldName,sDatabaseLocation,sConnnectionResource; sal_Int32 nCommandType = CommandType::COMMAND; Reference< XPreparedStatement > xStatement; Reference< XResultSet > xResultSet; @@ -284,8 +284,8 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { // the transferable did not contain the connection -> build an own one try { - ::rtl::OUString sSignificantSource( sDatasouce.isEmpty() ? sDatabaseLocation : sDatasouce ); - xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, ::rtl::OUString(),::rtl::OUString(), + OUString sSignificantSource( sDatasouce.isEmpty() ? sDatabaseLocation : sDatasouce ); + xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, OUString(),OUString(), comphelper::getComponentContext( static_cast(GetParent())->getServiceManager() )); } catch(NoSuchElementException&) @@ -336,7 +336,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) // not interested in any results Reference< XPropertySet > xStatProps(xStatement,UNO_QUERY); - xStatProps->setPropertyValue(rtl::OUString("MaxRows"), makeAny(sal_Int32(0))); + xStatProps->setPropertyValue(OUString("MaxRows"), makeAny(sal_Int32(0))); xResultSet = xStatement->executeQuery(); Reference< XColumnsSupplier > xSupplyCols(xResultSet, UNO_QUERY); @@ -381,12 +381,12 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) //------------------------------------------------------------------------------ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) { - ::rtl::OUString sCommand, sFieldName,sURL; + OUString sCommand, sFieldName,sURL; sal_Int32 nCommandType = CommandType::COMMAND; Reference< XPropertySet > xField; Reference< XConnection > xConnection; - ::rtl::OUString sDatasouce = m_pImpl->aDropData.getDataSource(); + OUString sDatasouce = m_pImpl->aDropData.getDataSource(); if ( sDatasouce.isEmpty() && m_pImpl->aDropData.has(daConnectionResource) ) m_pImpl->aDropData[daConnectionResource] >>= sURL; m_pImpl->aDropData[daCommand] >>= sCommand; @@ -509,7 +509,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) bDateNTimeCol = nPreferedType == SID_FM_TWOFIELDS_DATE_N_TIME; sal_uInt16 nColCount = bDateNTimeCol ? 2 : 1; - ::rtl::OUString sFieldService; + OUString sFieldService; while (nColCount--) { if (bDateNTimeCol) @@ -537,10 +537,10 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) if (bDateNTimeCol) { String sTimePostfix( SVX_RES( RID_STR_POSTFIX_TIME ) ); - xCol->setPropertyValue(FM_PROP_LABEL, makeAny( ::rtl::OUString( sFieldName + sTimePostfix ) ) ); + xCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString( sFieldName + sTimePostfix ) ) ); String sDatePostfix( SVX_RES( RID_STR_POSTFIX_DATE ) ); - xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny( ::rtl::OUString( sFieldName + sDatePostfix ) ) ); + xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString( sFieldName + sDatePostfix ) ) ); } else xCol->setPropertyValue(FM_PROP_LABEL, makeAny(sFieldName)); @@ -571,9 +571,9 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) sRealName += '_'; sRealName += sPurePostfix; if (i) - xSecondCol->setPropertyValue(FM_PROP_NAME, makeAny(::rtl::OUString(sRealName))); + xSecondCol->setPropertyValue(FM_PROP_NAME, makeAny(OUString(sRealName))); else - xCol->setPropertyValue(FM_PROP_NAME, makeAny(::rtl::OUString(sRealName))); + xCol->setPropertyValue(FM_PROP_NAME, makeAny(OUString(sRealName))); } } else @@ -794,7 +794,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe PopupMenu* pControlMenu = rMenu.GetPopupMenu(SID_FM_CHANGECOL); delete pControlMenu; - ::rtl::OUString aFieldType; + OUString aFieldType; sal_Bool bReplace = sal_False; InspectorAction eInspectorAction = eNone; Reference< XPropertySet > xColumnToInspect; @@ -940,7 +940,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe { FormControlFactory factory( ::comphelper::getProcessServiceFactory() ); - ::rtl::OUString sLabel = factory.getDefaultUniqueName_ByComponentType( + OUString sLabel = factory.getDefaultUniqueName_ByComponentType( Reference< XNameAccess >( xCols, UNO_QUERY_THROW ), xNewCol ); xNewCol->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel ) ); xNewCol->setPropertyValue( FM_PROP_NAME, makeAny( sLabel ) ); @@ -1155,7 +1155,7 @@ void FmGridControl::DeleteSelectedRows() ::com::sun::star::util::URLTransformer::create(::comphelper::getProcessComponentContext()) ); xTransformer->parseStrict( aUrl ); - Reference< ::com::sun::star::frame::XDispatch > xDispatch = xDispatcher->queryDispatch(aUrl, rtl::OUString(), 0); + Reference< ::com::sun::star::frame::XDispatch > xDispatch = xDispatcher->queryDispatch(aUrl, OUString(), 0); Reference< ::com::sun::star::form::XConfirmDeleteListener > xConfirm(xDispatch, UNO_QUERY); if (xConfirm.is()) { @@ -1608,7 +1608,7 @@ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::conta Reference< ::com::sun::star::beans::XPropertySet > xCol; ::cppu::extractInterface(xCol, xColumns->getByIndex(i)); - rtl::OUString aName( + OUString aName( comphelper::getString(xCol->getPropertyValue(FM_PROP_LABEL))); aWidth = xCol->getPropertyValue(FM_PROP_WIDTH); @@ -1646,7 +1646,7 @@ void FmGridControl::InitColumnByField( DBG_ASSERT( _rxFieldsByNames == _rxFieldsByIndex, "FmGridControl::InitColumnByField: invalid container interfaces!" ); // lookup the column which belongs to the control source - ::rtl::OUString sFieldName; + OUString sFieldName; _rxColumnModel->getPropertyValue( FM_PROP_CONTROLSOURCE ) >>= sFieldName; Reference< XPropertySet > xField; _rxColumnModel->getPropertyValue( FM_PROP_BOUNDFIELD ) >>= xField; @@ -1698,13 +1698,13 @@ void FmGridControl::InitColumnByField( } // the control type is determined by the ColumnServiceName - static ::rtl::OUString s_sPropColumnServiceName( "ColumnServiceName" ); + static OUString s_sPropColumnServiceName( "ColumnServiceName" ); if ( !::comphelper::hasProperty( s_sPropColumnServiceName, _rxColumnModel ) ) return; _pColumn->setModel( _rxColumnModel ); - ::rtl::OUString sColumnServiceName; + OUString sColumnServiceName; _rxColumnModel->getPropertyValue( s_sPropColumnServiceName ) >>= sColumnServiceName; sal_Int32 nTypeId = getColumnTypeByModelName( sColumnServiceName ); @@ -1897,9 +1897,9 @@ Sequence< Any> FmGridControl::getSelectionBookmarks() // ----------------------------------------------------------------------------- namespace { - ::rtl::OUString getColumnPropertyFromPeer(FmXGridPeer* _pPeer,sal_Int32 _nPosition,const ::rtl::OUString& _sPropName) + OUString getColumnPropertyFromPeer(FmXGridPeer* _pPeer,sal_Int32 _nPosition,const OUString& _sPropName) { - ::rtl::OUString sRetText; + OUString sRetText; if ( _pPeer && _nPosition != -1) { Reference xIndex = _pPeer->getColumns(); @@ -1915,9 +1915,9 @@ namespace } } // Object data and state ------------------------------------------------------ -::rtl::OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const +OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const { - ::rtl::OUString sRetText; + OUString sRetText; switch( _eObjType ) { case ::svt::BBTYPE_BROWSEBOX: @@ -1942,9 +1942,9 @@ namespace } // ----------------------------------------------------------------------------- -::rtl::OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const +OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const { - ::rtl::OUString sRetText; + OUString sRetText; switch( _eObjType ) { case ::svt::BBTYPE_BROWSEBOX: diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index fba1ffcfa8d4..4211c26f7f3c 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -409,10 +409,10 @@ Sequence SAL_CALL FmXGridControl::getImplementationId( ) throw(Runtim // XServiceInfo //------------------------------------------------------------------------------ -sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& ServiceName) throw() +sal_Bool SAL_CALL FmXGridControl::supportsService(const OUString& ServiceName) throw() { ::comphelper::StringSequence aSupported = getSupportedServiceNames(); - const ::rtl::OUString * pArray = aSupported.getConstArray(); + const OUString * pArray = aSupported.getConstArray(); for( sal_Int32 i = 0; i < aSupported.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -420,17 +420,17 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXGridControl::getImplementationName() throw() +OUString SAL_CALL FmXGridControl::getImplementationName() throw() { - return ::rtl::OUString("com.sun.star.form.FmXGridControl"); + return OUString("com.sun.star.form.FmXGridControl"); } //------------------------------------------------------------------------------ ::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedServiceNames() throw() { - Sequence< ::rtl::OUString > aServiceNames(2); + Sequence< OUString > aServiceNames(2); aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL; - aServiceNames[1] = ::rtl::OUString("com.sun.star.awt.UnoControl"); + aServiceNames[1] = OUString("com.sun.star.awt.UnoControl"); return aServiceNames; } @@ -449,9 +449,9 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException ) } //------------------------------------------------------------------------------ -::rtl::OUString FmXGridControl::GetComponentServiceName() +OUString FmXGridControl::GetComponentServiceName() { - ::rtl::OUString aName("DBGrid"); + OUString aName("DBGrid"); return aName; } @@ -501,7 +501,7 @@ FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent) void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt::XToolkit >& /*rToolkit*/, const Reference< ::com::sun::star::awt::XWindowPeer >& rParentPeer) throw( RuntimeException ) { if ( !mxModel.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); DBG_ASSERT(/*(0 == m_nPeerCreationLevel) && */!mbCreatingPeer, "FmXGridControl::createPeer : recursion!"); // I think this should never assert, now that we're using the base class' mbCreatingPeer in addition to @@ -791,7 +791,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio // prepare firing an event aModeChangeEvent.Source = *this; - aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString( "design" ) : ::rtl::OUString( "alive" ); + aModeChangeEvent.NewMode = mbDesignMode ? OUString( "design" ) : OUString( "alive" ); } // --- --- @@ -855,7 +855,7 @@ void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContaine } //------------------------------------------------------------------------------ -Reference< ::com::sun::star::frame::XDispatch > SAL_CALL FmXGridControl::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) +Reference< ::com::sun::star::frame::XDispatch > SAL_CALL FmXGridControl::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) { Reference< ::com::sun::star::frame::XDispatchProvider > xPeerProvider(getPeer(), UNO_QUERY); if (xPeerProvider.is()) @@ -982,7 +982,7 @@ Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoun // ::com::sun::star::util::XModeSelector //------------------------------------------------------------------------------ -void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException ) +void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); if (!xPeer.is()) @@ -992,10 +992,10 @@ void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupp } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException ) +OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); - return xPeer.is() ? xPeer->getMode() : ::rtl::OUString(); + return xPeer.is() ? xPeer->getMode() : OUString(); } //------------------------------------------------------------------------------ @@ -1006,7 +1006,7 @@ void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupp } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL FmXGridControl::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException ) +sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( RuntimeException ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->supportsMode(Mode) : sal_False; @@ -1113,9 +1113,9 @@ void FmXGridPeer::columnChanged() //------------------------------------------------------------------ namespace fmgridif { - const ::rtl::OUString getDataModeIdentifier() + const OUString getDataModeIdentifier() { - static ::rtl::OUString s_sDataModeIdentifier = ::rtl::OUString( "DataMode" ); + static OUString s_sDataModeIdentifier = OUString( "DataMode" ); return s_sDataModeIdentifier; } } @@ -1423,7 +1423,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type case TypeClass_STRING : { String sText = aColumns[ nModelPos ]->GetCellText( xPaintRow, pGrid->getNumberFormatter() ); - pReturnArray[i] <<= ::rtl::OUString(sText); + pReturnArray[i] <<= OUString(sText); } break; // everything else is requested in the DatabaseVariant @@ -1674,7 +1674,7 @@ Reference< XIndexContainer > FmXGridPeer::getColumns() throw( RuntimeException //------------------------------------------------------------------------------ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol) { - static const ::rtl::OUString aPropsListenedTo[] = + static const OUString aPropsListenedTo[] = { OUString(FM_PROP_LABEL), OUString(FM_PROP_WIDTH), OUString(FM_PROP_HIDDEN), OUString(FM_PROP_ALIGN), OUString(FM_PROP_FORMATKEY) }; @@ -1683,8 +1683,8 @@ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol) // before adding a listener Reference< XPropertySetInfo > xInfo = xCol->getPropertySetInfo(); Property aPropDesc; - const ::rtl::OUString* pProps = aPropsListenedTo; - const ::rtl::OUString* pPropsEnd = pProps + sizeof( aPropsListenedTo ) / sizeof( aPropsListenedTo[ 0 ] ); + const OUString* pProps = aPropsListenedTo; + const OUString* pPropsEnd = pProps + sizeof( aPropsListenedTo ) / sizeof( aPropsListenedTo[ 0 ] ); for (; pProps != pPropsEnd; ++pProps) { if ( xInfo->hasPropertyByName( *pProps ) ) @@ -1701,7 +1701,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol) { // the same props as in addColumnListeners ... linux has problems with global static UStrings, so // we have to do it this way .... - static ::rtl::OUString aPropsListenedTo[] = + static OUString aPropsListenedTo[] = { OUString(FM_PROP_LABEL), OUString(FM_PROP_WIDTH), OUString(FM_PROP_HIDDEN), OUString(FM_PROP_ALIGN), OUString(FM_PROP_FORMATKEY) }; @@ -1904,7 +1904,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept } //------------------------------------------------------------------------------ -void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& Value) throw( RuntimeException ) +void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -1960,12 +1960,12 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V } else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) ) { - ::rtl::OUString sHelpURL; + OUString sHelpURL; OSL_VERIFY( Value >>= sHelpURL ); INetURLObject aHID( sHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) sHelpURL = aHID.GetURLPath(); - pGrid->SetHelpId( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); + pGrid->SetHelpId( OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); } else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) ) { @@ -2117,7 +2117,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext() } //------------------------------------------------------------------------------ -Any FmXGridPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( RuntimeException ) +Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException ) { Any aProp; if (GetWindow()) @@ -2439,7 +2439,7 @@ Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, // ::com::sun::star::util::XModeSelector //------------------------------------------------------------------------------ -void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException ) +void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException ) { if (!supportsMode(Mode)) throw NoSupportException(); @@ -2460,7 +2460,7 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException } //------------------------------------------------------------------------------ -::rtl::OUString FmXGridPeer::getMode() throw( RuntimeException ) +OUString FmXGridPeer::getMode() throw( RuntimeException ) { return m_aMode; } @@ -2472,18 +2472,18 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException if (!aModes.getLength()) { aModes.realloc(2); - ::rtl::OUString* pModes = aModes.getArray(); - pModes[0] = ::rtl::OUString( "DataMode" ); - pModes[1] = ::rtl::OUString( "FilterMode" ); + OUString* pModes = aModes.getArray(); + pModes[0] = OUString( "DataMode" ); + pModes[1] = OUString( "FilterMode" ); } return aModes; } //------------------------------------------------------------------------------ -sal_Bool FmXGridPeer::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException ) +sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException ) { ::comphelper::StringSequence aModes(getSupportedModes()); - const ::rtl::OUString* pModes = aModes.getConstArray(); + const OUString* pModes = aModes.getConstArray(); for (sal_Int32 i = aModes.getLength(); i > 0; ) { if (pModes[--i] == Mode) @@ -2535,7 +2535,7 @@ void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException ) } //------------------------------------------------------------------------------ -Reference< ::com::sun::star::frame::XDispatch > FmXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) +Reference< ::com::sun::star::frame::XDispatch > FmXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException ) { Reference< ::com::sun::star::frame::XDispatch > xResult; @@ -2767,7 +2767,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs() static Sequence< ::com::sun::star::util::URL> aSupported; if (aSupported.getLength() == 0) { - static ::rtl::OUString sSupported[] = { + static OUString sSupported[] = { FMURL_RECORD_MOVEFIRST, FMURL_RECORD_MOVEPREV, FMURL_RECORD_MOVENEXT, @@ -2808,7 +2808,7 @@ void FmXGridPeer::UpdateDispatches() Reference< ::com::sun::star::frame::XDispatch > xNewDispatch; for (sal_uInt16 i=0; iaddStatusListener((::com::sun::star::frame::XStatusListener*)this, *pSupportedURLs); diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 6c054e0a68f2..17b565f87fa3 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -30,7 +30,7 @@ const ::comphelper::StringSequence& getColumnTypes() static ::comphelper::StringSequence aColumnTypes(10); if (aColumnTypes.getConstArray()[0].isEmpty()) { - ::rtl::OUString* pNames = aColumnTypes.getArray(); + OUString* pNames = aColumnTypes.getArray(); pNames[TYPE_CHECKBOX] = FM_COL_CHECKBOX; pNames[TYPE_COMBOBOX] = FM_COL_COMBOBOX; pNames[TYPE_CURRENCYFIELD] = FM_COL_CURRENCYFIELD; @@ -49,16 +49,16 @@ const ::comphelper::StringSequence& getColumnTypes() // Vergleichen von PropertyInfo extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond) { - return ((::rtl::OUString*)pFirst)->compareTo(*(::rtl::OUString*)pSecond); + return ((OUString*)pFirst)->compareTo(*(OUString*)pSecond); } namespace { //------------------------------------------------------------------------------ - sal_Int32 lcl_findPos(const ::rtl::OUString& aStr, const Sequence< ::rtl::OUString>& rList) + sal_Int32 lcl_findPos(const OUString& aStr, const Sequence< OUString>& rList) { - const ::rtl::OUString* pStrList = rList.getConstArray(); - ::rtl::OUString* pResult = (::rtl::OUString*) bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(::rtl::OUString), + const OUString* pStrList = rList.getConstArray(); + OUString* pResult = (OUString*) bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(OUString), &NameCompare); if (pResult) @@ -69,10 +69,10 @@ namespace } //------------------------------------------------------------------------------ -sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) +sal_Int32 getColumnTypeByModelName(const OUString& aModelName) { - const ::rtl::OUString aModelPrefix("com.sun.star.form.component."); - const ::rtl::OUString aCompatibleModelPrefix("stardiv.one.form.component."); + const OUString aModelPrefix("com.sun.star.form.component."); + const OUString aCompatibleModelPrefix("stardiv.one.form.component."); sal_Int32 nTypeId = -1; if (aModelName == FM_COMPONENT_EDIT) @@ -85,7 +85,7 @@ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) DBG_ASSERT( (nPrefixPos != -1) || (nCompatiblePrefixPos != -1), "::getColumnTypeByModelName() : wrong servivce !"); #endif - ::rtl::OUString aColumnType = (nPrefixPos != -1) + OUString aColumnType = (nPrefixPos != -1) ? aModelName.copy(aModelPrefix.getLength()) : aModelName.copy(aCompatibleModelPrefix.getLength()); diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index ff983b6b894d..7dac3c29f184 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -397,7 +397,7 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) m_aRecordText.SetText(XubString(SVX_RES(RID_STR_REC_TEXT))); m_aRecordOf.SetText(XubString(SVX_RES(RID_STR_REC_FROM_TEXT))); - m_aRecordCount.SetText(rtl::OUString('?')); + m_aRecordCount.SetText(OUString('?')); m_nDefaultWidth = ArrangeControls(); @@ -473,9 +473,9 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() nX = sal::static_int_cast< sal_uInt16 >(nX + nTextWidth + aBorder.Width()); // count an extra hairspace (U+200A) left and right - const rtl::OUString sevenDigits(m_aAbsolute.CreateFieldText(6000000)); - const rtl::OUString hairSpace(static_cast(0x200A)); - rtl::OUString textPattern(hairSpace); + const OUString sevenDigits(m_aAbsolute.CreateFieldText(6000000)); + const OUString hairSpace(static_cast(0x200A)); + OUString textPattern(hairSpace); textPattern += sevenDigits; textPattern += hairSpace; nTextWidth = m_aAbsolute.GetTextWidth( textPattern ); @@ -695,7 +695,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) else aText = m_aAbsolute.CreateFieldText(pParent->GetRowCount()); if(!pParent->m_bRecordCountFinal) - aText += rtl::OUString(" *"); + aText += OUString(" *"); } else aText = String(); @@ -1455,7 +1455,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt // retrieve the datebase of the Numberformatter try { - xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString("NullDate")) >>= m_aNullDate; + xSupplier->getNumberFormatSettings()->getPropertyValue(OUString("NullDate")) >>= m_aNullDate; } catch(Exception&) { @@ -3488,7 +3488,7 @@ void DbGridControl::ShowColumn(sal_uInt16 nId) DeactivateCell(); - ::rtl::OUString aName; + OUString aName; pColumn->getModel()->getPropertyValue(FM_PROP_LABEL) >>= aName; InsertDataColumn(nId, aName, CalcZoom(pColumn->m_nLastVisibleWidth), HIB_CENTER | HIB_VCENTER | HIB_CLICKABLE, nNewViewPos); pColumn->m_bHidden = sal_False; diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 14976d972f97..fecc0e6f158f 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -48,7 +48,7 @@ namespace svx const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor ); if ( SOT_FORMATSTR_ID_XFORMS == nFormatId ) { - return SetString(rtl::OUString("XForms-Transferable"), _rFlavor); + return SetString(OUString("XForms-Transferable"), _rFlavor); } return sal_False; } diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index db849212bdb4..49017c41acef 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -59,7 +59,7 @@ OSystemParseContext::~OSystemParseContext() } //----------------------------------------------------------------------------- -::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const +OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const { String aMsg; SolarMutexGuard aGuard; @@ -83,7 +83,7 @@ OSystemParseContext::~OSystemParseContext() } //----------------------------------------------------------------------------- -::rtl::OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const +OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const { size_t nIndex = 0; switch ( _eKey ) @@ -119,14 +119,14 @@ OSystemParseContext::~OSystemParseContext() OSL_ENSURE( nIndex < m_aLocalizedKeywords.size(), "OSystemParseContext::getIntlKeywordAscii: invalid index!" ); - rtl::OString sKeyword; + OString sKeyword; if ( nIndex < m_aLocalizedKeywords.size() ) - sKeyword = rtl::OUStringToOString(m_aLocalizedKeywords[nIndex], RTL_TEXTENCODING_UTF8); + sKeyword = OUStringToOString(m_aLocalizedKeywords[nIndex], RTL_TEXTENCODING_UTF8); return sKeyword; } // ----------------------------------------------------------------------------- -IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::rtl::OString& rToken) const +IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OString& rToken) const { static IParseContext::InternationalKeyCode Intl_TokenID[] = { @@ -142,7 +142,7 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const :: sal_uInt32 nCount = sizeof Intl_TokenID / sizeof Intl_TokenID[0]; for (sal_uInt32 i = 0; i < nCount; i++) { - ::rtl::OString aKey = getIntlKeywordAscii(Intl_TokenID[i]); + OString aKey = getIntlKeywordAscii(Intl_TokenID[i]); if (rToken.equalsIgnoreAsciiCase(aKey)) return Intl_TokenID[i]; } diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index cc0148df4122..d9cd76a98d0b 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -55,7 +55,7 @@ namespace svx Sequence< PropertyValue > m_aAsSequence; Reference< XPropertySet > m_xAsSet; - typedef ::std::map< ::rtl::OUString, PropertyMapEntry* > MapString2PropertyEntry; + typedef ::std::map< OUString, PropertyMapEntry* > MapString2PropertyEntry; public: ODADescriptorImpl(); @@ -193,16 +193,16 @@ namespace svx { CONST_CHAR("ActiveConnection"), daConnection, &::getCppuType( static_cast< Reference< XConnection >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("BookmarkSelection"), daBookmarkSelection, &::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("Column"), daColumnObject, &::getCppuType( static_cast< Reference< XPropertySet >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("ColumnName"), daColumnName, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("Command"), daCommand, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("ColumnName"), daColumnName, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("Command"), daCommand, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("CommandType"), daCommandType, &::getCppuType( static_cast< sal_Int32* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("Component"), daComponent, &::getCppuType( static_cast< Reference< XContent >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("ConnectionResource"), daConnectionResource, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("ConnectionResource"), daConnectionResource, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("Cursor"), daCursor, &::getCppuType( static_cast< Reference< XResultSet>* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("DataSourceName"), daDataSource, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("DatabaseLocation"), daDatabaseLocation, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("DataSourceName"), daDataSource, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("DatabaseLocation"), daDatabaseLocation, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("EscapeProcessing"), daEscapeProcessing, &::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 }, - { CONST_CHAR("Filter"), daFilter, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { CONST_CHAR("Filter"), daFilter, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { CONST_CHAR("Selection"), daSelection, &::getCppuType( static_cast< Sequence< Any >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; @@ -210,7 +210,7 @@ namespace svx PropertyMapEntry* pEntry = s_aDesriptorProperties; while ( pEntry->mpName ) { - s_aProperties[ ::rtl::OUString::createFromAscii( pEntry->mpName ) ] = pEntry; + s_aProperties[ OUString::createFromAscii( pEntry->mpName ) ] = pEntry; ++pEntry; } } @@ -244,7 +244,7 @@ namespace svx // build the property value PropertyValue aReturn; - aReturn.Name = ::rtl::OUString( pProperty->mpName, pProperty->mnNameLen, RTL_TEXTENCODING_ASCII_US ); + aReturn.Name = OUString( pProperty->mpName, pProperty->mnNameLen, RTL_TEXTENCODING_ASCII_US ); aReturn.Handle = pProperty->mnHandle; aReturn.Value = _rPos->second; aReturn.State = PropertyState_DIRECT_VALUE; @@ -387,9 +387,9 @@ namespace svx } //-------------------------------------------------------------------- - ::rtl::OUString ODataAccessDescriptor::getDataSource() const + OUString ODataAccessDescriptor::getDataSource() const { - ::rtl::OUString sDataSourceName; + OUString sDataSourceName; if ( has(daDataSource) ) (*this)[daDataSource] >>= sDataSourceName; else if ( has(daDatabaseLocation) ) @@ -397,7 +397,7 @@ namespace svx return sDataSourceName; } //-------------------------------------------------------------------- - void ODataAccessDescriptor::setDataSource(const ::rtl::OUString& _sDataSourceNameOrLocation) + void ODataAccessDescriptor::setDataSource(const OUString& _sDataSourceNameOrLocation) { if ( !_sDataSourceNameOrLocation.isEmpty() ) { @@ -405,7 +405,7 @@ namespace svx (*this)[ (( aURL.GetProtocol() == INET_PROT_FILE ) ? daDatabaseLocation : daDataSource)] <<= _sDataSourceNameOrLocation; } else - (*this)[ daDataSource ] <<= ::rtl::OUString(); + (*this)[ daDataSource ] <<= OUString(); } //........................................................................ diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 36b1a7abdc05..1fb0127e80a0 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -79,8 +79,8 @@ namespace svx const ::comphelper::ComponentContext m_aContext; ::svt::OFileURLControl& m_rLocationInput; PushButton& m_rBrowseButton; - Sequence< ::rtl::OUString > m_aFilterExtensions; - ::rtl::OUString m_sFilterUIName; + Sequence< OUString > m_aFilterExtensions; + OUString m_sFilterUIName; bool m_bNeedExistenceCheck; }; @@ -97,8 +97,8 @@ namespace svx impl_initFilterProperties_nothrow(); // forward the allowed extensions to the input control - ::rtl::OUStringBuffer aExtensionList; - for ( const ::rtl::OUString* pExtension = m_aFilterExtensions.getConstArray(); + OUStringBuffer aExtensionList; + for ( const OUString* pExtension = m_aFilterExtensions.getConstArray(); pExtension != m_aFilterExtensions.getConstArray() + m_aFilterExtensions.getLength(); ++pExtension ) @@ -122,7 +122,7 @@ namespace svx //-------------------------------------------------------------------- bool DatabaseLocationInputController_Impl::prepareCommit() { - ::rtl::OUString sURL( impl_getCurrentURL() ); + OUString sURL( impl_getCurrentURL() ); if ( sURL.isEmpty() ) return false; @@ -162,9 +162,9 @@ namespace svx ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext( m_aContext.getUNOContext(), - ::rtl::OUString( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" ) + OUString( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" ) ) ); - ::rtl::OUString sDatabaseFilter; + OUString sDatabaseFilter; OSL_VERIFY( aConfig.getNodeValue( "ooSetupFactoryActualFilter" ) >>= sDatabaseFilter ); // get the type this filter is responsible for @@ -172,7 +172,7 @@ namespace svx m_aContext.createComponent( "com.sun.star.document.FilterFactory" ), UNO_QUERY_THROW ); ::comphelper::NamedValueCollection aFilterProperties( xFilterFactory->getByName( sDatabaseFilter ) ); - ::rtl::OUString sDocumentType = aFilterProperties.getOrDefault( "Type", ::rtl::OUString() ); + OUString sDocumentType = aFilterProperties.getOrDefault( "Type", OUString() ); // get the extension(s) for this type Reference< XNameAccess > xTypeDetection( @@ -194,7 +194,7 @@ namespace svx if ( m_aFilterExtensions.getLength() == 0 ) { m_aFilterExtensions.realloc(1); - m_aFilterExtensions[0] = ::rtl::OUString( "*.odb" ); + m_aFilterExtensions[0] = OUString( "*.odb" ); } } @@ -240,7 +240,7 @@ namespace svx ); aFileDlg.SetDisplayDirectory( impl_getCurrentURL() ); - aFileDlg.AddFilter( m_sFilterUIName, ::rtl::OUStringBuffer().appendAscii( "*." ).append( m_aFilterExtensions[0] ).makeStringAndClear() ); + aFileDlg.AddFilter( m_sFilterUIName, OUStringBuffer().appendAscii( "*." ).append( m_aFilterExtensions[0] ).makeStringAndClear() ); aFileDlg.SetCurrentFilter( m_sFilterUIName ); if ( aFileDlg.Execute() == ERRCODE_NONE ) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index c48dbbf42615..82e46e711212 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -383,7 +383,7 @@ namespace svxform aExpImg = aCollImg = _rImgLst.GetImage( IID_OTHER ); } - ::rtl::OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails ); + OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails ); if ( !sName.isEmpty() ) { ItemNode* pNode = new ItemNode( xChild ); @@ -400,7 +400,7 @@ namespace svxform { Reference< css::xml::dom::XNode > xAttr = xMap->item(j); pNode = new ItemNode( xAttr ); - ::rtl::OUString sAttrName = + OUString sAttrName = m_xUIHelper->getNodeDisplayName( xAttr, bShowDetails ); m_aItemList.InsertEntry( sAttrName, aExpImg, aCollImg, @@ -686,7 +686,7 @@ namespace svxform try { String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); - ::rtl::OUString sTemp; + OUString sTemp; pNode->m_xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp; sNewName += String( sTemp ); sNewName += sDelim; @@ -755,7 +755,7 @@ namespace svxform const ImageList& rImageList = m_pNaviWin->GetItemImageList(); sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE; Image aImage = rImageList.GetImage( nImageID ); - ::rtl::OUString sName; + OUString sName; try { sName = m_xUIHelper->getNodeDisplayName( @@ -814,13 +814,13 @@ namespace svxform class lcl_ReplaceString : public lcl_ResourceString { - rtl::OUString m_sDoc_UI; - rtl::OUString m_sInstance_UI; - rtl::OUString m_sNone_UI; + OUString m_sDoc_UI; + OUString m_sInstance_UI; + OUString m_sNone_UI; - rtl::OUString m_sDoc_API; - rtl::OUString m_sInstance_API; - rtl::OUString m_sNone_API; + OUString m_sDoc_API; + OUString m_sInstance_API; + OUString m_sNone_API; lcl_ReplaceString() : lcl_ResourceString(), @@ -862,7 +862,7 @@ namespace svxform /** convert submission replace string from API value to UI value. Use 'none' as default. */ - rtl::OUString toUI( const rtl::OUString& rStr ) const + OUString toUI( const OUString& rStr ) const { if( rStr == m_sDoc_API ) return m_sDoc_UI; @@ -874,7 +874,7 @@ namespace svxform /** convert submission replace string from UI to API. Use 'none' as default. */ - rtl::OUString toAPI( const rtl::OUString& rStr ) const + OUString toAPI( const OUString& rStr ) const { if( rStr == m_sDoc_UI ) return m_sDoc_API; @@ -887,13 +887,13 @@ namespace svxform class lcl_MethodString : public lcl_ResourceString { - rtl::OUString m_sPost_UI; - rtl::OUString m_sPut_UI; - rtl::OUString m_sGet_UI; + OUString m_sPost_UI; + OUString m_sPut_UI; + OUString m_sGet_UI; - rtl::OUString m_sPost_API; - rtl::OUString m_sPut_API; - rtl::OUString m_sGet_API; + OUString m_sPost_API; + OUString m_sPut_API; + OUString m_sGet_API; lcl_MethodString() : lcl_ResourceString(), @@ -932,7 +932,7 @@ namespace svxform } /** convert from API to UI; put is default. */ - rtl::OUString toUI( const rtl::OUString& rStr ) const + OUString toUI( const OUString& rStr ) const { if( rStr == m_sGet_API ) return m_sGet_UI; @@ -943,7 +943,7 @@ namespace svxform } /** convert from UI to API; put is default */ - rtl::OUString toAPI( const rtl::OUString& rStr ) const + OUString toAPI( const OUString& rStr ) const { if( rStr == m_sGet_UI ) return m_sGet_API; @@ -962,7 +962,7 @@ namespace svxform Image aImage = rImageList.GetImage( IID_ELEMENT ); ItemNode* pNode = new ItemNode( _rEntry ); - rtl::OUString sTemp; + OUString sTemp; if ( DGTSubmission == m_eGroup ) { @@ -1007,7 +1007,7 @@ namespace svxform try { String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) ); - ::rtl::OUString sName; + OUString sName; _rEntry->getPropertyValue( PN_BINDING_ID ) >>= sTemp; sName += String( sTemp ); sName += sDelim; @@ -1029,7 +1029,7 @@ namespace svxform void XFormsPage::EditEntry( const Reference< XPropertySet >& _rEntry ) { SvTreeListEntry* pEntry = NULL; - rtl::OUString sTemp; + OUString sTemp; if ( DGTSubmission == m_eGroup ) { @@ -1319,7 +1319,7 @@ namespace svxform if ( aAny >>= xPropSet ) { String sEntry; - rtl::OUString sTemp; + OUString sTemp; xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp; sEntry += String( sTemp ); sEntry += sDelim; @@ -1360,10 +1360,10 @@ namespace svxform const Sequence< PropertyValue >& _xPropSeq, const ImageList& _rImgLst ) { String sRet; - rtl::OUString sTemp; - rtl::OUString sInstModel = PN_INSTANCE_MODEL; - rtl::OUString sInstName = PN_INSTANCE_ID; - rtl::OUString sInstURL = PN_INSTANCE_URL; + OUString sTemp; + OUString sInstModel = PN_INSTANCE_MODEL; + OUString sInstName = PN_INSTANCE_ID; + OUString sInstURL = PN_INSTANCE_URL; const PropertyValue* pProps = _xPropSeq.getConstArray(); const PropertyValue* pPropsEnd = pProps + _xPropSeq.getLength(); for ( ; pProps != pPropsEnd; ++pProps ) @@ -1382,7 +1382,7 @@ namespace svxform #if OSL_DEBUG_LEVEL > 0 css::xml::dom::NodeType eNodeType = xRoot->getNodeType(); (void)eNodeType; #endif - ::rtl::OUString sNodeName = + OUString sNodeName = m_xUIHelper->getNodeDisplayName( xRoot, m_pNaviWin->IsShowDetails() ); if ( sNodeName.isEmpty() ) sNodeName = xRoot->getNodeName(); @@ -1631,7 +1631,7 @@ namespace svxform bool bIsDocModified = false; Reference< css::xforms::XFormsUIHelper1 > xUIHelper; sal_uInt16 nSelectedPos = m_aModelsBox.GetSelectEntryPos(); - ::rtl::OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) ); + OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) ); Reference< css::xforms::XModel > xModel; try { @@ -1683,7 +1683,7 @@ namespace svxform Reference< XPropertySet > xModelProps( xNewModel, UNO_QUERY_THROW ); xModelProps->setPropertyValue( - ::rtl::OUString( "ExternalData" ), + OUString( "ExternalData" ), makeAny( sal_Bool( !bDocumentData ) ) ); sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName ); @@ -1713,7 +1713,7 @@ namespace svxform Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW ); sal_Bool bExternalData = sal_False; OSL_VERIFY( xModelProps->getPropertyValue( - ::rtl::OUString( "ExternalData" ) ) >>= bExternalData ); + OUString( "ExternalData" ) ) >>= bExternalData ); bDocumentData = ( bExternalData == sal_False ); } catch( const Exception& ) @@ -1733,7 +1733,7 @@ namespace svxform Reference< XNameContainer > xXForms( xFormsSupp->getXForms(), UNO_SET_THROW ); Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW ); xModelProps->setPropertyValue( - ::rtl::OUString( "ExternalData" ), + OUString( "ExternalData" ), makeAny( sal_Bool( !bDocumentData ) ) ); bIsDocModified = true; } @@ -1804,8 +1804,8 @@ namespace svxform if ( aDlg.Execute() == RET_OK ) { sal_uInt16 nInst = GetNewPageId(); - ::rtl::OUString sName = aDlg.GetName(); - ::rtl::OUString sURL = aDlg.GetURL(); + OUString sName = aDlg.GetName(); + OUString sURL = aDlg.GetURL(); bool bLinkOnce = aDlg.IsLinkInstance(); try { @@ -1841,7 +1841,7 @@ namespace svxform if ( aDlg.Execute() == RET_OK ) { String sNewName = aDlg.GetName(); - ::rtl::OUString sURL = aDlg.GetURL(); + OUString sURL = aDlg.GetURL(); bool bLinkOnce = aDlg.IsLinkInstance(); try { @@ -2061,9 +2061,9 @@ namespace svxform if ( xContainer.is() ) { m_xDataContainer = xContainer; - Sequence< ::rtl::OUString > aNameList = m_xDataContainer->getElementNames(); + Sequence< OUString > aNameList = m_xDataContainer->getElementNames(); sal_Int32 i, nCount = aNameList.getLength(); - ::rtl::OUString* pNames = aNameList.getArray(); + OUString* pNames = aNameList.getArray(); for ( i = 0; i < nCount; ++i ) { Any aAny = m_xDataContainer->getByName( pNames[i] ); @@ -2089,7 +2089,7 @@ namespace svxform // ----------------------------------------------------------------------- void DataNavigatorWindow::SetPageModel() { - rtl::OUString sModel( m_aModelsBox.GetSelectEntry() ); + OUString sModel( m_aModelsBox.GetSelectEntry() ); try { Any aAny = m_xDataContainer->getByName( sModel ); @@ -2122,7 +2122,7 @@ namespace svxform // ----------------------------------------------------------------------- void DataNavigatorWindow::InitPages() { - rtl::OUString sModel( m_aModelsBox.GetSelectEntry() ); + OUString sModel( m_aModelsBox.GetSelectEntry() ); try { Any aAny = m_xDataContainer->getByName( sModel ); @@ -2197,8 +2197,8 @@ namespace svxform // ----------------------------------------------------------------------- void DataNavigatorWindow::CreateInstancePage( const Sequence< PropertyValue >& _xPropSeq ) { - rtl::OUString sInstName; - rtl::OUString sID( PN_INSTANCE_ID ); + OUString sInstName; + OUString sID( PN_INSTANCE_ID ); const PropertyValue* pProps = _xPropSeq.getConstArray(); const PropertyValue* pPropsEnd = pProps + _xPropSeq.getLength(); for ( ; pProps != pPropsEnd; ++pProps ) @@ -2214,7 +2214,7 @@ namespace svxform if ( sInstName.isEmpty() ) { SAL_WARN( "svx.form", "DataNavigatorWindow::CreateInstancePage(): instance without name" ); - String sTemp = rtl::OUString("untitled"); + String sTemp = OUString("untitled"); sTemp += OUString::number( nPageId ); sInstName = sTemp; } @@ -2555,7 +2555,7 @@ namespace svxform if ( pBox && m_xTempBinding.is() ) { - ::rtl::OUString sTemp, sPropName; + OUString sTemp, sPropName; if ( &m_aRequiredCB == pBox ) sPropName = PN_REQUIRED_EXPR; else if ( &m_aRelevantCB == pBox ) @@ -2571,7 +2571,7 @@ namespace svxform if ( bIsChecked && sTemp.isEmpty() ) sTemp = TRUE_VALUE; else if ( !bIsChecked && !sTemp.isEmpty() ) - sTemp = ::rtl::OUString(); + sTemp = OUString(); m_xTempBinding->setPropertyValue( sPropName, makeAny( sTemp ) ); } @@ -2581,7 +2581,7 @@ namespace svxform //------------------------------------------------------------------------ IMPL_LINK( AddDataItemDialog, ConditionHdl, PushButton *, pBtn ) { - ::rtl::OUString sTemp, sPropName; + OUString sTemp, sPropName; if ( &m_aDefaultBtn == pBtn ) sPropName = PN_BINDING_EXPR; else if ( &m_aRequiredBtn == pBtn ) @@ -2617,7 +2617,7 @@ namespace svxform { m_xTempBinding->setPropertyValue( - sPropName, makeAny( ::rtl::OUString( sNewCondition ) ) ); + sPropName, makeAny( OUString( sNewCondition ) ) ); } } return 0; @@ -2637,7 +2637,7 @@ namespace svxform Reference< XPropertySetInfo > xFromInfo = xFrom->getPropertySetInfo(); for ( sal_Int32 i = 0; i < nProperties; ++i ) { - const ::rtl::OUString& rName = pProperties[i].Name; + const OUString& rName = pProperties[i].Name; // if both set have the property, copy the value // (catch and ignore exceptions, if any) @@ -2662,7 +2662,7 @@ namespace svxform { bool bIsHandleBinding = ( DITBinding == m_eItemType ); bool bIsHandleText = ( DITText == m_eItemType ); - ::rtl::OUString sNewName( m_aNameED.GetText() ); + OUString sNewName( m_aNameED.GetText() ); if ( ( !bIsHandleBinding && !bIsHandleText && !m_xUIHelper->isValidXMLName( sNewName ) ) || ( bIsHandleBinding && sNewName.isEmpty() ) ) @@ -2676,7 +2676,7 @@ namespace svxform return 0; } - ::rtl::OUString sDataType( m_aDataTypeLB.GetSelectEntry() ); + OUString sDataType( m_aDataTypeLB.GetSelectEntry() ); m_xTempBinding->setPropertyValue( PN_BINDING_TYPE, makeAny( sDataType ) ); if ( bIsHandleBinding ) @@ -2685,7 +2685,7 @@ namespace svxform copyPropSet( m_xTempBinding, m_pItemNode->m_xPropSet ); try { - ::rtl::OUString sValue = m_aNameED.GetText(); + OUString sValue = m_aNameED.GetText(); m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_ID, makeAny( sValue ) ); sValue = m_aDefaultED.GetText(); m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_EXPR, makeAny( sValue ) ); @@ -2792,7 +2792,7 @@ namespace svxform if ( m_eItemType != DITText ) { - ::rtl::OUString sName( m_xUIHelper->getNodeName( m_pItemNode->m_xNode ) ); + OUString sName( m_xUIHelper->getNodeName( m_pItemNode->m_xNode ) ); m_aNameED.SetText( sName ); } m_aDefaultED.SetText( m_pItemNode->m_xNode->getNodeValue() ); @@ -2820,7 +2820,7 @@ namespace svxform SAL_WARN( "svx.form", "AddDataItemDialog::InitFromNode(): exception caught" ); } } - rtl::OUString sTemp; + OUString sTemp; try { Reference< XPropertySetInfo > xInfo = m_pItemNode->m_xPropSet->getPropertySetInfo(); @@ -2853,7 +2853,7 @@ namespace svxform if ( m_xTempBinding.is() ) { - ::rtl::OUString sTemp; + OUString sTemp; try { if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp ) @@ -2928,16 +2928,16 @@ namespace svxform xModel->getDataTypeRepository(); if ( xDataTypes.is() ) { - Sequence< ::rtl::OUString > aNameList = xDataTypes->getElementNames(); + Sequence< OUString > aNameList = xDataTypes->getElementNames(); sal_Int32 i, nCount = aNameList.getLength(); - ::rtl::OUString* pNames = aNameList.getArray(); + OUString* pNames = aNameList.getArray(); for ( i = 0; i < nCount; ++i ) m_aDataTypeLB.InsertEntry( pNames[i] ); } if ( m_xTempBinding.is() ) { - rtl::OUString sTemp; + OUString sTemp; if ( m_xTempBinding->getPropertyValue( PN_BINDING_TYPE ) >>= sTemp ) { sal_uInt16 nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) ); @@ -2988,7 +2988,7 @@ namespace svxform //======================================================================== AddConditionDialog::AddConditionDialog( - Window* pParent, const ::rtl::OUString& _rPropertyName, + Window* pParent, const OUString& _rPropertyName, const Reference< XPropertySet >& _rPropSet ) : ModalDialog( pParent, SVX_RES( RID_SVXDLG_ADD_CONDITION ) ), @@ -3022,7 +3022,7 @@ namespace svxform { try { - rtl::OUString sTemp; + OUString sTemp; if ( ( m_xBinding->getPropertyValue( m_sPropertyName ) >>= sTemp ) && !sTemp.isEmpty() ) { @@ -3085,7 +3085,7 @@ namespace svxform try { if ( m_xBinding.is() ) - m_xBinding->setPropertyValue( m_sPropertyName, makeAny( ::rtl::OUString( m_aConditionED.GetText() ) ) ); + m_xBinding->setPropertyValue( m_sPropertyName, makeAny( OUString( m_aConditionED.GetText() ) ) ); } catch( const Exception& ) { @@ -3220,7 +3220,7 @@ namespace svxform { SvTreeListEntry* pEntry = m_aNamespacesList.FirstSelected(); DBG_ASSERT( pEntry, "NamespaceItemDialog::ClickHdl(): no entry" ); - ::rtl::OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); + OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); m_aRemovedList.push_back( sPrefix ); m_aNamespacesList.GetModel()->Remove( pEntry ); } @@ -3247,8 +3247,8 @@ namespace svxform for( i = 0; i < nEntryCount; ++i ) { SvTreeListEntry* pEntry = m_aNamespacesList.GetEntry(i); - ::rtl::OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); - ::rtl::OUString sURL( m_aNamespacesList.GetEntryText( pEntry, 1 ) ); + OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) ); + OUString sURL( m_aNamespacesList.GetEntryText( pEntry, 1 ) ); if ( m_rNamespaces->hasByName( sPrefix ) ) m_rNamespaces->replaceByName( sPrefix, makeAny( sURL ) ); @@ -3270,13 +3270,13 @@ namespace svxform { try { - Sequence< ::rtl::OUString > aAllNames = m_rNamespaces->getElementNames(); - const ::rtl::OUString* pAllNames = aAllNames.getConstArray(); - const ::rtl::OUString* pAllNamesEnd = pAllNames + aAllNames.getLength(); + Sequence< OUString > aAllNames = m_rNamespaces->getElementNames(); + const OUString* pAllNames = aAllNames.getConstArray(); + const OUString* pAllNamesEnd = pAllNames + aAllNames.getLength(); for ( ; pAllNames != pAllNamesEnd; ++pAllNames ) { - ::rtl::OUString sURL; - ::rtl::OUString sPrefix = *pAllNames; + OUString sURL; + OUString sPrefix = *pAllNames; if ( m_rNamespaces->hasByName( sPrefix ) ) { Any aAny = m_rNamespaces->getByName( sPrefix ); @@ -3422,7 +3422,7 @@ namespace svxform //------------------------------------------------------------------------ IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl) { - rtl::OUString sName(m_aNameED.GetText()); + OUString sName(m_aNameED.GetText()); if(sName.isEmpty()) { ErrorBox aErrorBox(this,SVX_RES(RID_ERR_EMPTY_SUBMISSIONNAME)); @@ -3454,7 +3454,7 @@ namespace svxform if ( m_xSubmission.is() ) { - rtl::OUString sTemp = m_aNameED.GetText(); + OUString sTemp = m_aNameED.GetText(); try { m_xSubmission->setPropertyValue( PN_SUBMISSION_ID, makeAny( sTemp ) ); @@ -3510,7 +3510,7 @@ namespace svxform if ( aAny >>= xPropSet ) { String sEntry; - rtl::OUString sTemp; + OUString sTemp; xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp; sEntry += String( sTemp ); sEntry += sDelim; @@ -3553,7 +3553,7 @@ namespace svxform if ( m_pItemNode && m_pItemNode->m_xPropSet.is() ) { m_xSubmission = m_pItemNode->m_xPropSet; - rtl::OUString sTemp; + OUString sTemp; try { m_xSubmission->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp; diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index aab897135bb1..e28da50ab4b3 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -116,7 +116,7 @@ namespace svxform OSL_ENSURE(NULL == s_pFactoryCreationFunc, "ODbtoolsClient::registerClient: inconsistence: already have a factory function!"); #ifndef DISABLE_DYNLOADING - const ::rtl::OUString sModuleName( SVLIBRARY( "dbtools" ) + const OUString sModuleName( SVLIBRARY( "dbtools" ) ); // load the dbtools library @@ -126,7 +126,7 @@ namespace svxform if (NULL != s_hDbtoolsModule) { // get the symbol for the method creating the factory - const ::rtl::OUString sFactoryCreationFunc( "createDataAccessToolsFactory" ); + const OUString sFactoryCreationFunc( "createDataAccessToolsFactory" ); // reinterpret_cast s_pFactoryCreationFunc = (createDataAccessToolsFactoryFunction)( osl_getFunctionSymbol(s_hDbtoolsModule, sFactoryCreationFunc.pData)); @@ -198,8 +198,8 @@ namespace svxform } //-------------------------------------------------------------------- - Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, const Reference& _rxContext) const + Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const OUString& _rDataSourceName, + const OUString& _rUser, const OUString& _rPwd, const Reference& _rxContext) const SAL_THROW ( (SQLException) ) { Reference< XConnection > xReturn; @@ -237,25 +237,25 @@ namespace svxform } //-------------------------------------------------------------------- - ::rtl::OUString OStaticDataAccessTools::quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName) const + OUString OStaticDataAccessTools::quoteName(const OUString& _rQuote, const OUString& _rName) const { - ::rtl::OUString sReturn; + OUString sReturn; if ( ensureLoaded() ) sReturn = m_xDataAccessTools->quoteName(_rQuote, _rName); return sReturn; } // ------------------------------------------------ - ::rtl::OUString OStaticDataAccessTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const + OUString OStaticDataAccessTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const { - ::rtl::OUString sReturn; + OUString sReturn; if ( ensureLoaded() ) sReturn = m_xDataAccessTools->composeTableNameForSelect( _rxConnection, _xTable ); return sReturn; } //---------------------------------------------------------------- - Reference< XDataSource > OStaticDataAccessTools::getDataSource( const ::rtl::OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const + Reference< XDataSource > OStaticDataAccessTools::getDataSource( const OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const { Reference< XDataSource > xReturn; if ( ensureLoaded() ) @@ -283,7 +283,7 @@ namespace svxform //---------------------------------------------------------------- Reference< XNameAccess > OStaticDataAccessTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection, - const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand, + const sal_Int32 _nCommandType, const OUString& _rCommand, Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) ) { Reference< XNameAccess > aFields; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 2a2b0eb3fb10..3e36b09792cd 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -124,7 +124,7 @@ sal_uInt32 OFilterItemExchange::getFormatId() static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OFilterExchangeHelper::getFormatId: bad exchange id!"); } return s_nFormat; @@ -204,8 +204,8 @@ TYPEINIT1(FmFilterItem, FmFilterData); //------------------------------------------------------------------------ FmFilterItem::FmFilterItem( const Reference< XMultiServiceFactory >& _rxFactory, FmFilterItems* pParent, - const ::rtl::OUString& aFieldName, - const ::rtl::OUString& aText, + const OUString& aFieldName, + const OUString& aText, const sal_Int32 _nComponentIndex ) :FmFilterData(_rxFactory,pParent, aText) ,m_aFieldName(aFieldName) @@ -321,7 +321,7 @@ public: void setText(sal_Int32 nPos, const FmFilterItem* pFilterItem, - const ::rtl::OUString& rText); + const OUString& rText); }; //------------------------------------------------------------------------ @@ -364,7 +364,7 @@ void FmFilterAdapter::AddOrRemoveListener( const Reference< XIndexAccess >& _rxC //------------------------------------------------------------------------ void FmFilterAdapter::setText(sal_Int32 nRowPos, const FmFilterItem* pFilterItem, - const ::rtl::OUString& rText) + const OUString& rText) { FmFormItem* pFormItem = PTR_CAST( FmFormItem, pFilterItem->GetParent()->GetParent() ); @@ -389,9 +389,9 @@ void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/) throw( Runtim //------------------------------------------------------------------------ namespace { - ::rtl::OUString lcl_getLabelName_nothrow( const Reference< XControl >& _rxControl ) + OUString lcl_getLabelName_nothrow( const Reference< XControl >& _rxControl ) { - ::rtl::OUString sLabelName; + OUString sLabelName; try { Reference< XControl > xControl( _rxControl, UNO_SET_THROW ); @@ -463,7 +463,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th else { // searching the component by field name - ::rtl::OUString aFieldName( lcl_getLabelName_nothrow( xFilterController->getFilterComponent( _Event.FilterComponent ) ) ); + OUString aFieldName( lcl_getLabelName_nothrow( xFilterController->getFilterComponent( _Event.FilterComponent ) ) ); pFilterItem = new FmFilterItem( m_pModel->getORB(), pFilter, aFieldName, _Event.PredicateExpression, _Event.FilterComponent ); m_pModel->Insert(pFilter->GetChildren().end(), pFilterItem); @@ -542,7 +542,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) TYPEINIT1(FmFilterModel, FmParentData); //------------------------------------------------------------------------ FmFilterModel::FmFilterModel(const Reference< XMultiServiceFactory >& _rxFactory) - :FmParentData(_rxFactory,NULL, ::rtl::OUString()) + :FmParentData(_rxFactory,NULL, OUString()) ,OSQLParserClient(comphelper::getComponentContext(_rxFactory)) ,m_xORB(_rxFactory) ,m_pAdapter(NULL) @@ -626,7 +626,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar Reference< XFormController > xController( xControllers->getByIndex(i), UNO_QUERY_THROW ); Reference< XPropertySet > xFormProperties( xController->getModel(), UNO_QUERY_THROW ); - ::rtl::OUString aName; + OUString aName; OSL_VERIFY( xFormProperties->getPropertyValue( FM_PROP_NAME ) >>= aName ); // Insert a new item for the form @@ -638,8 +638,8 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar // insert the existing filters for the form String aTitle( SVX_RES( RID_STR_FILTER_FILTER_FOR ) ); - Sequence< Sequence< ::rtl::OUString > > aExpressions = xFilterController->getPredicateExpressions(); - for ( const Sequence< ::rtl::OUString >* pConjunctionTerm = aExpressions.getConstArray(); + Sequence< Sequence< OUString > > aExpressions = xFilterController->getPredicateExpressions(); + for ( const Sequence< OUString >* pConjunctionTerm = aExpressions.getConstArray(); pConjunctionTerm != aExpressions.getConstArray() + aExpressions.getLength(); ++pConjunctionTerm ) @@ -648,8 +648,8 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar FmFilterItems* pFilterItems = new FmFilterItems( m_xORB, pFormItem, aTitle ); Insert( pFormItem->GetChildren().end(), pFilterItems ); - const Sequence< ::rtl::OUString >& rDisjunction( *pConjunctionTerm ); - for ( const ::rtl::OUString* pDisjunctiveTerm = rDisjunction.getConstArray(); + const Sequence< OUString >& rDisjunction( *pConjunctionTerm ); + for ( const OUString* pDisjunctiveTerm = rDisjunction.getConstArray(); pDisjunctiveTerm != rDisjunction.getConstArray() + rDisjunction.getLength(); ++pDisjunctiveTerm ) @@ -662,7 +662,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar // determine the display name of the control const Reference< XControl > xFilterControl( xFilterController->getFilterComponent( nComponentIndex ) ); - const ::rtl::OUString sDisplayName( lcl_getLabelName_nothrow( xFilterControl ) ); + const OUString sDisplayName( lcl_getLabelName_nothrow( xFilterControl ) ); // insert a new entry FmFilterItem* pANDCondition = new FmFilterItem( m_xORB, pFilterItems, sDisplayName, *pDisjunctiveTerm, nComponentIndex ); @@ -823,7 +823,7 @@ void FmFilterModel::Remove(FmFilterData* pData) { ::std::vector< FmFilterData* >::iterator removePos = rChildren.end() - 1; FmFilterItem* pFilterItem = PTR_CAST( FmFilterItem, *removePos ); - m_pAdapter->setText( nPos, pFilterItem, ::rtl::OUString() ); + m_pAdapter->setText( nPos, pFilterItem, OUString() ); Remove( removePos ); } } @@ -853,7 +853,7 @@ void FmFilterModel::Remove(FmFilterData* pData) sal_Int32 nParentPos = j - rParentParentItems.begin(); // EmptyText removes the filter - m_pAdapter->setText(nParentPos, pFilterItem, ::rtl::OUString()); + m_pAdapter->setText(nParentPos, pFilterItem, OUString()); Remove( i ); } } @@ -896,13 +896,13 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUStr Reference< XPropertySet > xField( lcl_getBoundField_nothrow( xFilterController->getFilterComponent( pItem->GetComponentIndex() ) ), UNO_SET_THROW ); // parse the given text as filter predicate - ::rtl::OUString aErr, aTxt( rText ); + OUString aErr, aTxt( rText ); ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( aErr, aTxt, xFormatter, xField ); rErrorMsg = aErr; rText = aTxt; if ( xParseNode.is() ) { - ::rtl::OUString aPreparedText; + OUString aPreparedText; Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); xParseNode->parseNodeToPredicateStr( aPreparedText, xConnection, xFormatter, xField, aAppLocale, '.', getParseContext() ); @@ -925,7 +925,7 @@ void FmFilterModel::Append(FmFilterItems* pItems, FmFilterItem* pFilterItem) } //------------------------------------------------------------------------ -void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& rText) +void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const OUString& rText) { ::std::vector& rItems = pItem->GetParent()->GetParent()->GetChildren(); ::std::vector::iterator i = ::std::find(rItems.begin(), rItems.end(), pItem->GetParent()); @@ -1217,7 +1217,7 @@ sal_Bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rS } //------------------------------------------------------------------------ -sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) +sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!"); m_pEditingCurrently = NULL; diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 2832b4047d30..c18e01056a25 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -106,7 +106,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::svxform; -::rtl::OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) +OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { sal_uInt16 nClassNameResourceId = 0; @@ -182,7 +182,7 @@ using namespace ::svxform; nClassNameResourceId = RID_STR_CONTROL; break; } - return ::rtl::OUString( String( SVX_RES( nClassNameResourceId ) ) ); + return OUString( String( SVX_RES( nClassNameResourceId ) ) ); } //======================================================================== @@ -208,7 +208,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding try { // create a frame wrapper for myself - m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString("com.sun.star.frame.Frame") ), UNO_QUERY); + m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(OUString("com.sun.star.frame.Frame") ), UNO_QUERY); if (m_xMeAsFrame.is()) { // create an intermediate window, which is to be the container window of the frame @@ -221,7 +221,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow ); m_xMeAsFrame->initialize( m_xFrameContainerWindow ); - m_xMeAsFrame->setName(::rtl::OUString("form property browser") ); + m_xMeAsFrame->setName(OUString("form property browser") ); if ( _pBindings->GetDispatcher() ) { ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFramesSupplier > @@ -282,10 +282,10 @@ FmPropBrw::~FmPropBrw() Reference xName(m_xInspectorContext,uno::UNO_QUERY); if ( xName.is() ) { - const ::rtl::OUString pProps[] = { ::rtl::OUString( "ContextDocument" ) - , ::rtl::OUString( "DialogParentWindow" ) - , ::rtl::OUString( "ControlContext" ) - , ::rtl::OUString( "ControlShapeAccess" ) }; + const OUString pProps[] = { OUString( "ContextDocument" ) + , OUString( "DialogParentWindow" ) + , OUString( "ControlContext" ) + , OUString( "ControlShapeAccess" ) }; for ( size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i ) xName->removeByName( pProps[i] ); } @@ -298,9 +298,9 @@ FmPropBrw::~FmPropBrw() } //----------------------------------------------------------------------- -::rtl::OUString FmPropBrw::getCurrentPage() const +OUString FmPropBrw::getCurrentPage() const { - ::rtl::OUString sCurrentPage; + OUString sCurrentPage; try { if ( m_xBrowserController.is() ) @@ -512,8 +512,8 @@ namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) { - const ::rtl::OUString sConfigName( "/org.openoffice.Office.Common/Forms/PropertyBrowser/" ); - const ::rtl::OUString sPropertyName( "DirectHelp" ); + const OUString sConfigName( "/org.openoffice.Office.Common/Forms/PropertyBrowser/" ); + const OUString sPropertyName( "DirectHelp" ); ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) ); @@ -564,10 +564,10 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( "ContextDocument" ), makeAny( xDocument ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( xParentWindow ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( "ControlContext" ), makeAny( xControlContext ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( "ControlShapeAccess" ), makeAny( xControlMap ) ) + ::cppu::ContextEntry_Init( OUString( "ContextDocument" ), makeAny( xDocument ) ), + ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( xParentWindow ) ), + ::cppu::ContextEntry_Init( OUString( "ControlContext" ), makeAny( xControlContext ) ), + ::cppu::ContextEntry_Init( OUString( "ControlShapeAccess" ), makeAny( xControlMap ) ) }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), @@ -589,7 +589,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) if ( !m_xBrowserController.is() ) { - ::rtl::OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); + OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); ShowServiceNotAvailableError( GetParent(), sServiceName, sal_True ); } else diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index aaaaf3adb1d0..df4a49bbeaaf 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -414,7 +414,7 @@ namespace svxform // update the explanation for invalidity (this is always done, even if the validity did not change) Reference< XValidator > xValidator = _rxValidatable->getValidator(); OSL_ENSURE( xValidator.is(), "ControlBorderManager::validityChanged: invalid, but no validator?" ); - ::rtl::OUString sExplainInvalidity = xValidator.is() ? xValidator->explainInvalid( _rxValidatable->getCurrentValue() ) : ::rtl::OUString(); + OUString sExplainInvalidity = xValidator.is() ? xValidator->explainInvalid( _rxValidatable->getCurrentValue() ) : OUString(); xPeer->setProperty( FM_PROP_HELPTEXT, makeAny( sExplainInvalidity ) ); } catch( const Exception& ) diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index a630f5b580b7..87a69ac93420 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -91,30 +91,30 @@ namespace svxform } //.................................................................... - static bool lcl_getDocumentDefaultStyleAndFamily( const Reference< XInterface >& _rxDocument, ::rtl::OUString& _rFamilyName, ::rtl::OUString& _rStyleName ) SAL_THROW(( Exception )) + static bool lcl_getDocumentDefaultStyleAndFamily( const Reference< XInterface >& _rxDocument, OUString& _rFamilyName, OUString& _rStyleName ) SAL_THROW(( Exception )) { bool bSuccess = true; Reference< XServiceInfo > xDocumentSI( _rxDocument, UNO_QUERY ); if ( xDocumentSI.is() ) { - if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.text.TextDocument" ) ) - || xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.text.WebDocument" ) ) + if ( xDocumentSI->supportsService( OUString( "com.sun.star.text.TextDocument" ) ) + || xDocumentSI->supportsService( OUString( "com.sun.star.text.WebDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( "ParagraphStyles" ); - _rStyleName = ::rtl::OUString( "Standard" ); + _rFamilyName = OUString( "ParagraphStyles" ); + _rStyleName = OUString( "Standard" ); } - else if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ) ) + else if ( xDocumentSI->supportsService( OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( "CellStyles" ); - _rStyleName = ::rtl::OUString( "Default" ); + _rFamilyName = OUString( "CellStyles" ); + _rStyleName = OUString( "Default" ); } - else if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" ) ) - || xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" ) ) + else if ( xDocumentSI->supportsService( OUString( "com.sun.star.drawing.DrawingDocument" ) ) + || xDocumentSI->supportsService( OUString( "com.sun.star.presentation.PresentationDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( "graphics" ); - _rStyleName = ::rtl::OUString( "standard" ); + _rFamilyName = OUString( "graphics" ); + _rStyleName = OUString( "standard" ); } else bSuccess = false; @@ -154,7 +154,7 @@ namespace svxform break; } - ::rtl::OUString sCharLocalePropertyName = ::rtl::OUString::createFromAscii( pCharLocalePropertyName ); + OUString sCharLocalePropertyName = OUString::createFromAscii( pCharLocalePropertyName ); Locale aDocumentCharLocale; if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) ) { @@ -163,7 +163,7 @@ namespace svxform // fall back to CharLocale property at the style if ( aDocumentCharLocale.Language.isEmpty() ) { - sCharLocalePropertyName = ::rtl::OUString( "CharLocale" ); + sCharLocalePropertyName = OUString( "CharLocale" ); if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) ) { OSL_VERIFY( xStyle->getPropertyValue( sCharLocalePropertyName ) >>= aDocumentCharLocale ); @@ -179,7 +179,7 @@ namespace svxform Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, LanguageTag( aDocumentCharLocale ).getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ); FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor( aFont ); _rxModel->setPropertyValue( - ::rtl::OUString( "FontDescriptor" ), + OUString( "FontDescriptor" ), makeAny( aFontDesc ) ); } @@ -201,9 +201,9 @@ namespace svxform Reference< XNameAccess > xStyleFamilies( xSuppStyleFamilies->getStyleFamilies(), UNO_SET_THROW ); // the names of the family, and the style - depends on the document type we live in - ::rtl::OUString sFamilyName, sStyleName; + OUString sFamilyName, sStyleName; if ( !lcl_getDocumentDefaultStyleAndFamily( xSuppStyleFamilies.get(), sFamilyName, sStyleName ) ) - throw RuntimeException( ::rtl::OUString( "unknown document type!" ), NULL ); + throw RuntimeException( OUString( "unknown document type!" ), NULL ); // the concrete style Reference< XNameAccess > xStyleFamily( xStyleFamilies->getByName( sFamilyName ), UNO_QUERY_THROW ); @@ -231,10 +231,10 @@ namespace svxform // let's see what the configuration says about the visual effect OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aVisualEffect = aConfig.getNodeValue( ::rtl::OUString( "VisualEffect" ) ); + Any aVisualEffect = aConfig.getNodeValue( OUString( "VisualEffect" ) ); if ( aVisualEffect.hasValue() ) { - ::rtl::OUString sVisualEffect; + OUString sVisualEffect; OSL_VERIFY( aVisualEffect >>= sVisualEffect ); sal_Int16 nVisualEffect = VisualEffect::NONE; @@ -282,7 +282,7 @@ namespace svxform //-------------------------------------------------------------------- ::utl::OConfigurationNode ControlLayouter::getLayoutSettings( DocumentType _eDocType ) { - ::rtl::OUString sConfigName = ::rtl::OUString( "/org.openoffice.Office.Common/Forms/ControlLayout/" ); + OUString sConfigName = OUString( "/org.openoffice.Office.Common/Forms/ControlLayout/" ); sConfigName += DocumentClassification::getModuleIdentifierForDocumentType( _eDocType ); return OConfigurationTreeRoot::createWithComponentContext( ::comphelper::getProcessComponentContext(), // TODO @@ -293,7 +293,7 @@ namespace svxform bool ControlLayouter::useDynamicBorderColor( DocumentType _eDocType ) { OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aDynamicBorderColor = aConfig.getNodeValue( ::rtl::OUString( "DynamicBorderColors" ) ); + Any aDynamicBorderColor = aConfig.getNodeValue( OUString( "DynamicBorderColors" ) ); bool bDynamicBorderColor = false; OSL_VERIFY( aDynamicBorderColor >>= bDynamicBorderColor ); return bDynamicBorderColor; @@ -305,7 +305,7 @@ namespace svxform if ( _eDocType == eUnknownDocumentType ) return false; OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aUseRefDevice = aConfig.getNodeValue( ::rtl::OUString( "UseDocumentTextMetrics" ) ); + Any aUseRefDevice = aConfig.getNodeValue( OUString( "UseDocumentTextMetrics" ) ); bool bUseRefDevice = false; OSL_VERIFY( aUseRefDevice >>= bUseRefDevice ); return bUseRefDevice; diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index ba26c79908aa..4fa6fd8455e9 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -28,7 +28,7 @@ using namespace ::svxform; //----------------------------------------------------------------------------- -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet; if ( ServiceSpecifier.indexOf( "com.sun.star.form.component." ) == 0 ) @@ -46,15 +46,15 @@ using namespace ::svxform; } //----------------------------------------------------------------------------- -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstanceWithArguments(const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstanceWithArguments(const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { return SvxUnoDrawMSFactory::createInstanceWithArguments(ServiceSpecifier, Arguments ); } //----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) { - static const ::rtl::OUString aSvxComponentServiceNameList[] = + static const OUString aSvxComponentServiceNameList[] = { FM_SUN_COMPONENT_TEXTFIELD, FM_SUN_COMPONENT_FORM, @@ -79,12 +79,12 @@ using namespace ::svxform; static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq( nSvxComponentServiceNameListCount ); - ::rtl::OUString* pStrings = aSeq.getArray(); + ::com::sun::star::uno::Sequence< OUString > aSeq( nSvxComponentServiceNameListCount ); + OUString* pStrings = aSeq.getArray(); for( sal_uInt16 nIdx = 0; nIdx < nSvxComponentServiceNameListCount; nIdx++ ) pStrings[nIdx] = aSvxComponentServiceNameList[nIdx]; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() ); + ::com::sun::star::uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() ); return concatServiceNames( aParentSeq, aSeq ); } diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index 13ccf0d0a043..35a6f7bba458 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -131,7 +131,7 @@ namespace svxform const ModuleInfo* pModuleInfo = lcl_getModuleInfo(); while ( pModuleInfo->pAsciiModuleOrServiceName ) { - if ( xSI->supportsService( ::rtl::OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName ) ) ) + if ( xSI->supportsService( OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName ) ) ) return pModuleInfo->eType; ++pModuleInfo; } @@ -168,7 +168,7 @@ namespace svxform } //-------------------------------------------------------------------- - DocumentType DocumentClassification::getDocumentTypeForModuleIdentifier( const ::rtl::OUString& _rModuleIdentifier ) + DocumentType DocumentClassification::getDocumentTypeForModuleIdentifier( const OUString& _rModuleIdentifier ) { const ModuleInfo* pModuleInfo = lcl_getModuleInfo(); while ( pModuleInfo->pAsciiModuleOrServiceName ) @@ -181,16 +181,16 @@ namespace svxform } //-------------------------------------------------------------------- - ::rtl::OUString DocumentClassification::getModuleIdentifierForDocumentType( DocumentType _eType ) + OUString DocumentClassification::getModuleIdentifierForDocumentType( DocumentType _eType ) { const ModuleInfo* pModuleInfo = lcl_getModuleInfo(); while ( pModuleInfo->pAsciiModuleOrServiceName ) { if ( pModuleInfo->eType == _eType ) - return ::rtl::OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName ); + return OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName ); ++pModuleInfo; } - return ::rtl::OUString(); + return OUString(); } //........................................................................ diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 531d2d3b6a96..5d239f5b6042 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -83,7 +83,7 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr ) throw () { - ::rtl::OUString aShapeType( xDescr->getShapeType() ); + OUString aShapeType( xDescr->getShapeType() ); if ( aShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ShapeControl" ) ) // compatibility || aShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ControlShape" ) ) @@ -128,7 +128,7 @@ sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::Ru } // ::com::sun::star::lang::XServiceInfo -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) { return SvxDrawPage::getSupportedServiceNames(); } diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index f4f387995313..c137183caf2f 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -334,7 +334,7 @@ namespace svxform static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getControlPathFormatId: bad exchange id!"); } return s_nFormat; @@ -346,7 +346,7 @@ namespace svxform static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getHiddenControlModelsFormatId: bad exchange id!"); } return s_nFormat; @@ -358,7 +358,7 @@ namespace svxform static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\"")); DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getFieldExchangeFormatId: bad exchange id!"); } return s_nFormat; diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index b2979cc36fbe..26b8b906e2ee 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -137,7 +137,7 @@ FmNavRemovedHint::~FmNavRemovedHint() TYPEINIT1( FmNavNameChangedHint, SfxHint ); DBG_NAME(FmNavNameChangedHint); //------------------------------------------------------------------------ -FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const ::rtl::OUString& rNewName ) +FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName ) :pEntryData( pData ) ,aNewName( rNewName ) { @@ -351,12 +351,12 @@ FmFormData::FmFormData( Reference< XPropertySet > xSet(m_xForm, UNO_QUERY); if (xSet.is()) { - ::rtl::OUString aEntryName(::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME ))); + OUString aEntryName(::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME ))); SetText(aEntryName); } } else - SetText( ::rtl::OUString() ); + SetText( OUString() ); } //------------------------------------------------------------------------ diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index fad3aa96fe14..5f0641a9910d 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -58,7 +58,7 @@ using namespace ::svxform; TYPEINIT1(FmFormObj, SdrUnoObj); DBG_NAME(FmFormObj); //------------------------------------------------------------------ -FmFormObj::FmFormObj(const ::rtl::OUString& rModelName) +FmFormObj::FmFormObj(const OUString& rModelName) :SdrUnoObj ( rModelName ) ,m_nPos ( -1 ) ,m_pLastKnownRefDevice ( NULL ) @@ -133,7 +133,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force ) Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW ); Reference< XPropertySetInfo > xPropertyInfo( xModelProps->getPropertySetInfo(), UNO_SET_THROW ); - static const ::rtl::OUString sRefDevicePropName( "ReferenceDevice" ); + static const OUString sRefDevicePropName( "ReferenceDevice" ); if ( xPropertyInfo->hasPropertyByName( sRefDevicePropName ) ) { VCLXDevice* pUnoRefDevice = new VCLXDevice; @@ -359,7 +359,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource) Reference< XInterface > xSourceContainer = xSourceAsChild->getParent(); m_xEnvironmentHistory = Reference< XIndexContainer >( - ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.form.Forms") ), + ::comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.form.Forms") ), UNO_QUERY); DBG_ASSERT(m_xEnvironmentHistory.is(), "FmFormObj::clonedFrom : could not create a forms collection !"); @@ -418,7 +418,7 @@ FmFormObj& FmFormObj::operator= (const FmFormObj& rObj) //------------------------------------------------------------------ namespace { - rtl::OUString lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement) + OUString lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement) { Reference< ::com::sun::star::form::XFormComponent> xChild(_xElement, UNO_QUERY); Reference< ::com::sun::star::container::XIndexAccess> xParent; @@ -457,7 +457,7 @@ namespace Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > & _rSourceContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > _rTopLevelDestContainer) { Reference< XInterface > xTopLevelSouce; - rtl::OUString sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer, xTopLevelSouce); + OUString sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer, xTopLevelSouce); if (!xTopLevelSouce.is()) // something went wrong, maybe _rSourceContainer isn't part of a valid forms hierarchy return Reference< XInterface > (); @@ -469,7 +469,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > sal_Int32 nTokIndex = 0; do { - rtl::OUString aToken = sAccessPath.getToken( 0, '\\', nTokIndex ); + OUString aToken = sAccessPath.getToken( 0, '\\', nTokIndex ); sal_uInt16 nIndex = (sal_uInt16)aToken.toInt32(); // get the DSS of the source form (we have to find an aquivalent for) @@ -564,7 +564,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > { // create and insert (into the destination) a copy of the form xCurrentDestForm.set( - ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString( "com.sun.star.form.component.DataForm" ) ), + ::comphelper::getProcessServiceFactory()->createInstance(OUString( "com.sun.star.form.component.DataForm" ) ), UNO_QUERY_THROW ); ::comphelper::copyProperties( xCurrentSourceForm, xCurrentDestForm ); diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 1ea085758c55..39be34a73722 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -108,7 +108,7 @@ FmFormObjFactory::~FmFormObjFactory() \************************************************************************/ namespace { - void lcl_initProperty( FmFormObj* _pObject, const ::rtl::OUString& _rPropName, const Any& _rValue ) + void lcl_initProperty( FmFormObj* _pObject, const OUString& _rPropName, const Any& _rValue ) { try { @@ -127,9 +127,9 @@ IMPL_LINK(FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory) { if (pObjFactory->nInventor == FmFormInventor) { - ::rtl::OUString sServiceSpecifier; + OUString sServiceSpecifier; - typedef ::std::vector< ::std::pair< ::rtl::OUString, Any > > PropertyValueArray; + typedef ::std::vector< ::std::pair< OUString, Any > > PropertyValueArray; PropertyValueArray aInitialProperties; switch ( pObjFactory->nIdentifier ) diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index e144bdbec5f3..8fd082ea217b 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -114,7 +114,7 @@ namespace size_t lhsCount = m_aComponentInfo.childCount( _components.first ); size_t rhsCount = m_aComponentInfo.childCount( _components.second ); if ( lhsCount != rhsCount ) - throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (1)!" ) ), NULL ); + throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (1)!" ) ), NULL ); return lhsCount; } @@ -144,7 +144,7 @@ namespace Reference< XControlModel > lhsControlModel( _component.first, UNO_QUERY ); Reference< XControlModel > rhsControlModel( _component.second, UNO_QUERY ); if ( lhsControlModel.is() != rhsControlModel.is() ) - throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (2)!" ) ), NULL ); + throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (2)!" ) ), NULL ); if ( lhsControlModel.is() ) m_rControlModelMap[ lhsControlModel ] = rhsControlModel; @@ -328,7 +328,7 @@ const Reference< XNameContainer >& FmFormPageImpl::getForms( bool _bForceCreate { m_bAttemptedFormCreation = true; - const ::rtl::OUString sFormsCollectionServiceName("com.sun.star.form.Forms"); + const OUString sFormsCollectionServiceName("com.sun.star.form.Forms"); m_xForms = Reference< XNameContainer > ( ::comphelper::getProcessServiceFactory()->createInstance( sFormsCollectionServiceName ), UNO_QUERY @@ -404,7 +404,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() if ( xForms->hasElements() ) { // suche die Standardform - ::rtl::OUString sStandardFormname = String( SVX_RES( RID_STR_STDFORMNAME ) ); + OUString sStandardFormname = String( SVX_RES( RID_STR_STDFORMNAME ) ); try { @@ -436,7 +436,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() { XubString aStr(SVX_RES(RID_STR_FORM)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + aUndoStr.SearchAndReplace(OUString('#'), aStr); pModel->BegUndo(aUndoStr); } @@ -449,7 +449,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() xFormProps->setPropertyValue( FM_PROP_COMMANDTYPE, makeAny( sal_Int32( CommandType::TABLE ) ) ); // and the "Standard" name - ::rtl::OUString sName = String( SVX_RES( RID_STR_STDFORMNAME ) ); + OUString sName = String( SVX_RES( RID_STR_STDFORMNAME ) ); xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) ); Reference< XIndexContainer > xContainer( xForms, UNO_QUERY ); @@ -480,7 +480,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() //------------------------------------------------------------------------------ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy( const Reference< XFormComponent > & rContent, const Reference< XDataSource > & rDatabase, - const ::rtl::OUString& rDBTitle, const ::rtl::OUString& rCursorSource, sal_Int32 nCommandType ) + const OUString& rDBTitle, const OUString& rCursorSource, sal_Int32 nCommandType ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::findPlaceInFormComponentHierarchy" ); // if the control already is child of a form, don't do anything @@ -520,7 +520,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo { XubString aStr(SVX_RES(RID_STR_FORM)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + aUndoStr.SearchAndReplace(OUString('#'), aStr); pModel->BegUndo(aUndoStr); } @@ -545,8 +545,8 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo Reference< ::com::sun::star::container::XNameAccess > xNamedSet( getForms(), UNO_QUERY ); const bool bTableOrQuery = ( CommandType::TABLE == nCommandType ) || ( CommandType::QUERY == nCommandType ); - ::rtl::OUString sName = FormControlFactory::getUniqueName( xNamedSet, - bTableOrQuery ? rCursorSource : ::rtl::OUString( String( SVX_RES( RID_STR_STDFORMNAME ) ) ) ); + OUString sName = FormControlFactory::getUniqueName( xNamedSet, + bTableOrQuery ? rCursorSource : OUString( String( SVX_RES( RID_STR_STDFORMNAME ) ) ) ); xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) ); @@ -575,7 +575,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo //------------------------------------------------------------------------------ Reference< XForm > FmFormPageImpl::findFormForDataSource( const Reference< XForm > & rForm, const Reference< XDataSource > & _rxDatabase, - const ::rtl::OUString& _rCursorSource, sal_Int32 nCommandType) + const OUString& _rCursorSource, sal_Int32 nCommandType) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::findFormForDataSource" ); Reference< XForm > xResultForm; @@ -585,8 +585,8 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( return xResultForm; OSL_ENSURE(_rxDatabase.is(), "FmFormPageImpl::findFormForDataSource: invalid data source!"); - ::rtl::OUString sLookupName; // the name of the data source we're looking for - ::rtl::OUString sFormDataSourceName; // the name of the data source the current connection in the form is based on + OUString sLookupName; // the name of the data source we're looking for + OUString sFormDataSourceName; // the name of the data source the current connection in the form is based on try { Reference< XPropertySet > xDSProps(_rxDatabase, UNO_QUERY); @@ -627,7 +627,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( if (sLookupName == sFormDataSourceName) { // jetzt noch ueberpruefen ob CursorSource und Type uebereinstimmen - ::rtl::OUString aCursorSource = ::comphelper::getString(xFormProps->getPropertyValue(FM_PROP_COMMAND)); + OUString aCursorSource = ::comphelper::getString(xFormProps->getPropertyValue(FM_PROP_COMMAND)); sal_Int32 nType = ::comphelper::getINT32(xFormProps->getPropertyValue(FM_PROP_COMMANDTYPE)); if (aCursorSource.isEmpty() || ((nType == nCommandType) && (aCursorSource == _rCursorSource))) // found the form { @@ -656,7 +656,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( } //------------------------------------------------------------------------------ -::rtl::OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xFormComponent, const Reference< XForm > & xControls) +OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xFormComponent, const Reference< XForm > & xControls) { #if OSL_DEBUG_LEVEL > 0 try @@ -669,7 +669,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( DBG_UNHANDLED_EXCEPTION(); } #endif - ::rtl::OUString sName; + OUString sName; Reference< ::com::sun::star::beans::XPropertySet > xSet(xFormComponent, UNO_QUERY); if (xSet.is()) { @@ -682,7 +682,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( sal_Int16 nClassId( FormComponentType::CONTROL ); xSet->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId; - ::rtl::OUString sDefaultName = FormControlFactory::getDefaultUniqueName_ByComponentType( + OUString sDefaultName = FormControlFactory::getDefaultUniqueName_ByComponentType( Reference< XNameAccess >( xControls, UNO_QUERY ), xSet ); // bei Radiobuttons, die einen Namen haben, diesen nicht ueberschreiben! diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 574afae82813..bbb7610fc15e 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -107,7 +107,7 @@ namespace svxform @return if and only if the method is declared oneway, i.e. can be called asynchronously */ - bool impl_allowAsynchronousCall_nothrow( const ::rtl::OUString& _rListenerType, const ::rtl::OUString& _rMethodName ) const; + bool impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const; /** determines whether the instance is already disposed */ @@ -189,7 +189,7 @@ namespace svxform } //-------------------------------------------------------------------- - bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const ::rtl::OUString& _rListenerType, const ::rtl::OUString& _rMethodName ) const + bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const { bool bAllowAsynchronousCall = false; try @@ -197,8 +197,8 @@ namespace svxform ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() ); Reference< XHierarchicalNameAccess > xTypeDescriptions( aContext.getSingleton( "com.sun.star.reflection.theTypeDescriptionManager" ), UNO_QUERY_THROW ); - ::rtl::OUString sMethodDescription( _rListenerType ); - sMethodDescription += ::rtl::OUString( "::" ); + OUString sMethodDescription( _rListenerType ); + sMethodDescription += OUString( "::" ); sMethodDescription += _rMethodName; Reference< XInterfaceMethodTypeDescription > xMethod( xTypeDescriptions->getByHierarchicalName( sMethodDescription ), UNO_QUERY_THROW ); @@ -224,7 +224,7 @@ namespace svxform void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); - static const ::rtl::OUString vbaInterOp("VBAInterop"); + static const OUString vbaInterOp("VBAInterop"); if ( _rEvent.ScriptType.equals(vbaInterOp) ) return; // not handled here @@ -385,10 +385,10 @@ namespace svxform class NewStyleUNOScript : public IScript { SfxObjectShell& m_rObjectShell; - const ::rtl::OUString m_sScriptCode; + const OUString m_sScriptCode; public: - NewStyleUNOScript( SfxObjectShell& _rObjectShell, const ::rtl::OUString& _rScriptCode ) + NewStyleUNOScript( SfxObjectShell& _rObjectShell, const OUString& _rScriptCode ) :m_rObjectShell( _rObjectShell ) ,m_sScriptCode( _rScriptCode ) { @@ -411,7 +411,7 @@ namespace svxform { Reference< XControl > xControl( aEvent.Source, UNO_QUERY_THROW ); Reference< XPropertySet > xProps( xControl->getModel(), UNO_QUERY_THROW ); - aCaller = xProps->getPropertyValue( rtl::OUString("Name") ); + aCaller = xProps->getPropertyValue( OUString("Name") ); } catch( Exception& ) {} } @@ -446,8 +446,8 @@ namespace svxform } else { - ::rtl::OUString sScriptCode = _rEvent.ScriptCode; - ::rtl::OUString sMacroLocation; + OUString sScriptCode = _rEvent.ScriptCode; + OUString sMacroLocation; // is there a location in the script name ("application" or "document")? sal_Int32 nPrefixLen = sScriptCode.indexOf( ':' ); @@ -469,19 +469,19 @@ namespace svxform { // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) ) - sMacroLocation = ::rtl::OUString( "application" ); + sMacroLocation = OUString( "application" ); else - sMacroLocation = ::rtl::OUString( "document" ); + sMacroLocation = OUString( "document" ); } - ::rtl::OUStringBuffer aScriptURI; + OUStringBuffer aScriptURI; aScriptURI.appendAscii( "vnd.sun.star.script:" ); aScriptURI.append( sScriptCode ); aScriptURI.appendAscii( "?language=Basic" ); aScriptURI.appendAscii( "&location=" ); aScriptURI.append( sMacroLocation ); - const ::rtl::OUString sScriptURI( aScriptURI.makeStringAndClear() ); + const OUString sScriptURI( aScriptURI.makeStringAndClear() ); pScript.reset( new NewStyleUNOScript( *xObjectShell, sScriptURI ) ); } diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index dac2e255754e..14834685e6a3 100644 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx @@ -29,8 +29,8 @@ #define REGISTER_SERVICE(ImplName, ServiceName) \ sString = (ServiceName); \ xSingleFactory = ::cppu::createSingleFactory(xServiceFactory, \ - ::rtl::OUString(), ImplName##_NewInstance_Impl, \ - ::com::sun::star::uno::Sequence< ::rtl::OUString>(&sString, 1)); \ + OUString(), ImplName##_NewInstance_Impl, \ + ::com::sun::star::uno::Sequence< OUString>(&sString, 1)); \ if (xSingleFactory.is()) \ xSet->insert(::com::sun::star::uno::makeAny(xSingleFactory)); @@ -47,8 +47,8 @@ namespace svxform #define DECL_SELFAWARE_SERVICE( ClassName ) \ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClassName##_Create( \ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); \ - ::rtl::OUString SAL_CALL ClassName##_GetImplementationName(); \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ClassName##_GetSupportedServiceNames(); \ + OUString SAL_CALL ClassName##_GetImplementationName(); \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL ClassName##_GetSupportedServiceNames(); \ #define REGISTER_SELFAWARE_SERVICE( ClassName ) \ @@ -72,15 +72,15 @@ namespace svxform if (!xSet.is()) return; - ::com::sun::star::uno::Sequence< ::rtl::OUString> aServices; + ::com::sun::star::uno::Sequence< OUString> aServices; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xSingleFactory; - ::rtl::OUString sString; + OUString sString; // ------------------------------------------------------------------------ // FormController REGISTER_SERVICE( FormController, OUString( "com.sun.star.form.runtime.FormController" ) ); - REGISTER_SERVICE( LegacyFormController, ::rtl::OUString( "com.sun.star.form.FormController" ) ); + REGISTER_SERVICE( LegacyFormController, OUString( "com.sun.star.form.FormController" ) ); // ------------------------------------------------------------------------ // FormController diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index ca72d6757eaf..273aca1f58c1 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -223,7 +223,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) { m_pImpl->acquire(); SetPool( &SFX_APP()->GetPool() ); - SetName( rtl::OUString("Form") ); + SetName( OUString("Form") ); SetView(m_pFormView); } @@ -773,7 +773,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } if ( nRecord != -1 ) - rController->execute( nSlot, ::rtl::OUString( "Position" ), makeAny( (sal_Int32)nRecord ) ); + rController->execute( nSlot, OUString( "Position" ), makeAny( (sal_Int32)nRecord ) ); rReq.Done(); } break; @@ -1138,7 +1138,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich) } else if ( SID_FM_RECORD_TOTAL == nWhich ) { - ::rtl::OUString sTotalCount; + OUString sTotalCount; aState.State >>= sTotalCount; rSet.Put( SfxStringItem( nWhich, sTotalCount ) ); } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 1685ace8d980..bed1a3190605 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -410,7 +410,7 @@ namespace const Type* pCurrentListeners = pCurrentArray->getConstArray(); for (j=0; jgetLength(); ++j, ++pCurrentListeners) { - rtl::OUString aListener = (*pCurrentListeners).getTypeName(); + OUString aListener = (*pCurrentListeners).getTypeName(); sal_Int32 nTokens = comphelper::string::getTokenCount(aListener, '.'); if (nTokens) aListener = comphelper::string::getToken(aListener, nTokens - 1, '.'); @@ -420,9 +420,9 @@ namespace continue; // now check the methods - Sequence< ::rtl::OUString> aMethodsNames = ::comphelper::getEventMethodsForType(*pCurrentListeners); + Sequence< OUString> aMethodsNames = ::comphelper::getEventMethodsForType(*pCurrentListeners); - const ::rtl::OUString* pMethodsNames = aMethodsNames.getConstArray(); + const OUString* pMethodsNames = aMethodsNames.getConstArray(); for (k=0; kEventMethod) != COMPARE_EQUAL) @@ -447,7 +447,7 @@ namespace } //------------------------------------------------------------------------------ - ::rtl::OUString getServiceNameByControlType(sal_Int16 nType) + OUString getServiceNameByControlType(sal_Int16 nType) { switch (nType) { @@ -474,7 +474,7 @@ namespace case OBJ_FM_SPINBUTTON : return FM_SUN_COMPONENT_SPINBUTTON; case OBJ_FM_NAVIGATIONBAR : return FM_SUN_COMPONENT_NAVIGATIONBAR; } - return ::rtl::OUString(); + return OUString(); } } @@ -483,7 +483,7 @@ namespace // check if the control has one of the interfaces we can use for searching // *_pCurrentText will be filled with the current text of the control (as used when searching this control) sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxControl, - ::rtl::OUString* _pCurrentText ) + OUString* _pCurrentText ) { if ( !_rxControl.is() ) return sal_False; @@ -511,9 +511,9 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun { switch ( (::TriState)xCheckBox->getState() ) { - case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString("0" ); break; - case STATE_CHECK: *_pCurrentText = ::rtl::OUString("1" ); break; - default: *_pCurrentText = ::rtl::OUString(); break; + case STATE_NOCHECK: *_pCurrentText = OUString("0" ); break; + case STATE_CHECK: *_pCurrentText = OUString("1" ); break; + default: *_pCurrentText = OUString(); break; } } return sal_True; @@ -639,7 +639,7 @@ DBG_NAME(FmXFormShell); //------------------------------------------------------------------------ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) - ,FmXFormShell_CFGBASE(::rtl::OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE) + ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE) ,m_eNavigate( NavigationBarMode_NONE ) ,m_nInvalidationEvent( 0 ) ,m_nActivationEvent( 0 ) @@ -676,8 +676,8 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) // cache the current configuration settings we're interested in implAdjustConfigCache(); // and register for changes on this settings - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString("FormControlPilotsEnabled"); + Sequence< OUString > aNames(1); + aNames[0] = OUString("FormControlPilotsEnabled"); EnableNotification(aNames); } @@ -1165,7 +1165,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent if ( !pFormObject ) return false; - ::rtl::OUString sNewName( getServiceNameByControlType( nObjectTypes[ lookupSlot ] ) ); + OUString sNewName( getServiceNameByControlType( nObjectTypes[ lookupSlot ] ) ); Reference< XControlModel> xNewModel( ::comphelper::getProcessServiceFactory()->createInstance( sNewName ), UNO_QUERY ); if (!xNewModel.is()) return false; @@ -1473,11 +1473,11 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel > { Sequence< Any > aDialogArgs( 3 ); aDialogArgs[0] <<= NamedValue( - ::rtl::OUString( "TabbingModel" ), + OUString( "TabbingModel" ), makeAny( _rxForForm ) ); aDialogArgs[1] <<= NamedValue( - ::rtl::OUString( "ControlContext" ), + OUString( "ControlContext" ), makeAny( getControlContainerForView() ) ); @@ -1485,13 +1485,13 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel > if ( m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() ) xParentWindow = VCLUnoHelper::GetInterface ( &m_pShell->GetViewShell()->GetViewFrame()->GetWindow() ); aDialogArgs[2] <<= NamedValue( - ::rtl::OUString( "ParentWindow" ), + OUString( "ParentWindow" ), makeAny( xParentWindow ) ); Reference< dialogs::XExecutableDialog > xDialog( ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.form.ui.TabOrderDialog" ), + OUString( "com.sun.star.form.ui.TabOrderDialog" ), aDialogArgs ), UNO_QUERY @@ -1517,7 +1517,7 @@ void FmXFormShell::ExecuteSearch() FmFormArray aEmpty; m_aSearchForms.swap( aEmpty ); ::std::vector< OUString > aContextNames; - impl_collectFormSearchContexts_nothrow( m_pShell->GetCurPage()->GetForms(), ::rtl::OUString(), m_aSearchForms, aContextNames ); + impl_collectFormSearchContexts_nothrow( m_pShell->GetCurPage()->GetForms(), OUString(), m_aSearchForms, aContextNames ); OSL_POSTCOND( m_aSearchForms.size() == aContextNames.size(), "FmXFormShell::ExecuteSearch: nonsense!" ); if ( m_aSearchForms.size() != aContextNames.size() ) @@ -1618,7 +1618,7 @@ void FmXFormShell::ExecuteSearch() Reference< XIndexAccess> xColControls(xGridPeer, UNO_QUERY); Reference< XInterface> xCurControl; xColControls->getByIndex(nViewCol) >>= xCurControl; - ::rtl::OUString sInitialText; + OUString sInitialText; if (IsSearchableControl(xCurControl, &sInitialText)) strInitialText = sInitialText.getStr(); } @@ -1679,7 +1679,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n) { try { - Any aVal( xSet->getPropertyValue(::rtl::OUString("TwoDigitDateStart")) ); + Any aVal( xSet->getPropertyValue(OUString("TwoDigitDateStart")) ); aVal >>= n; return sal_True; } @@ -1712,7 +1712,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) { Any aVal; aVal <<= n; - xSet->setPropertyValue(::rtl::OUString("TwoDigitDateStart"), aVal); + xSet->setPropertyValue(OUString("TwoDigitDateStart"), aVal); } catch(Exception&) { @@ -1753,7 +1753,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) { Any aVal; aVal <<= n; - xSet->setPropertyValue(::rtl::OUString("TwoDigitDateStart"), aVal); + xSet->setPropertyValue(OUString("TwoDigitDateStart"), aVal); } catch(Exception&) { @@ -2159,7 +2159,7 @@ void FmXFormShell::startListening() // TODO: this is strange - shouldn't this depend on a isLoaded instead of // a "has command value"? Finally, the command value only means that it was // intended to be loaded, not that it actually *is* loaded - ::rtl::OUString aSource = ::comphelper::getString(xActiveFormSet->getPropertyValue(FM_PROP_COMMAND)); + OUString aSource = ::comphelper::getString(xActiveFormSet->getPropertyValue(FM_PROP_COMMAND)); if (!aSource.isEmpty()) { m_bDatabaseBar = sal_True; @@ -2421,7 +2421,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn FmFormPage* pCurrentPage = m_pShell->GetCurPage(); DBG_ASSERT(pCurrentPage!=NULL, "FmXFormShell::OnSearchContextRequest : no page !"); // Search all SdrControls of this page... - ::rtl::OUString sControlSource, aName; + OUString sControlSource, aName; SdrObjListIter aPageIter( *pCurrentPage ); while ( aPageIter.IsMore() ) @@ -2949,7 +2949,7 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod //------------------------------------------------------------------------------ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInterface>& _rxStartingPoint, - const ::rtl::OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames ) + const OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames ) { try { @@ -2961,8 +2961,8 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt if ( nCount == 0 ) return; - ::rtl::OUString sCurrentFormName; - ::rtl::OUStringBuffer aNextLevelPrefix; + OUString sCurrentFormName; + OUStringBuffer aNextLevelPrefix; for ( sal_Int32 i=0; igetName(); // the name of the current form - ::rtl::OUStringBuffer sCompleteCurrentName( sCurrentFormName ); + OUStringBuffer sCompleteCurrentName( sCurrentFormName ); if ( !_rCurrentLevelPrefix.isEmpty() ) { sCompleteCurrentName.appendAscii( " (" ); @@ -3032,7 +3032,7 @@ void FmXFormShell::startFiltering() { Reference< XModeSelector> xModeSelector(*j, UNO_QUERY); if (xModeSelector.is()) - xModeSelector->setMode( ::rtl::OUString( "FilterMode" ) ); + xModeSelector->setMode( OUString( "FilterMode" ) ); } } @@ -3102,7 +3102,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) if ( pAdapter.is() ) { const ::std::vector< Reference< runtime::XFormController > >& rControllerList = pAdapter->GetList(); - ::std::vector < ::rtl::OUString > aOriginalFilters; + ::std::vector < OUString > aOriginalFilters; ::std::vector < sal_Bool > aOriginalApplyFlags; if (bSave) @@ -3125,7 +3125,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) if (aOriginalFilters.size() == aOriginalApplyFlags.size()) // the first getPropertyValue failed -> use two dummies - aOriginalFilters.push_back( ::rtl::OUString() ); + aOriginalFilters.push_back( OUString() ); aOriginalApplyFlags.push_back( sal_False ); } } @@ -3138,7 +3138,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) Reference< XModeSelector> xModeSelector(*j, UNO_QUERY); if (xModeSelector.is()) - xModeSelector->setMode( ::rtl::OUString( "DataMode" ) ); + xModeSelector->setMode( OUString( "DataMode" ) ); } if (bSave) // execute the filter { @@ -3162,7 +3162,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) if (!isRowSetAlive(xFormSet)) { // something went wrong -> restore the original state - ::rtl::OUString sOriginalFilter = aOriginalFilters[ j - rControllers.begin() ]; + OUString sOriginalFilter = aOriginalFilters[ j - rControllers.begin() ]; sal_Bool bOriginalApplyFlag = aOriginalApplyFlags[ j - rControllers.begin() ]; try { @@ -3194,7 +3194,7 @@ void FmXFormShell::CreateExternalView() // the frame the external view is displayed in sal_Bool bAlreadyExistent = m_xExternalViewController.is(); Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame; - ::rtl::OUString sFrameName("_beamer"); + OUString sFrameName("_beamer"); sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE; Reference< runtime::XFormController > xCurrentNavController( getNavController()); @@ -3278,7 +3278,7 @@ void FmXFormShell::CreateExternalView() URL aClearURL; aClearURL.Complete = FMURL_GRIDVIEW_CLEARVIEW; - Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, ::rtl::OUString(), 0)); + Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, OUString(), 0)); if (xClear.is()) xClear->dispatch(aClearURL, Sequence< PropertyValue>()); } @@ -3295,10 +3295,10 @@ void FmXFormShell::CreateExternalView() // collect the dispatchers we will need URL aAddColumnURL; aAddColumnURL.Complete = FMURL_GRIDVIEW_ADDCOLUMN; - Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, ::rtl::OUString(), 0)); + Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, OUString(), 0)); URL aAttachURL; aAttachURL.Complete = FMURL_GRIDVIEW_ATTACHTOFORM; - Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, ::rtl::OUString(), 0)); + Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, OUString(), 0)); if (xAddColumnDispatch.is() && xAttachDispatch.is()) { @@ -3309,7 +3309,7 @@ void FmXFormShell::CreateExternalView() sal_Int16 nAddedColumns = 0; // for radio buttons we need some special structures - typedef std::map< OUString, Sequence< ::rtl::OUString> > MapUString2UstringSeq; + typedef std::map< OUString, Sequence< OUString> > MapUString2UstringSeq; typedef std::map< OUString, OUString > FmMapUString2UString; typedef std::map< OUString, sal_Int16 > FmMapUString2Int16; @@ -3321,7 +3321,7 @@ void FmXFormShell::CreateExternalView() FmXBoundFormFieldIterator aModelIterator(xCurrentNavController->getModel()); Reference< XPropertySet> xCurrentModelSet; Any aCurrentBoundField; - ::rtl::OUString sColumnType,aGroupName,sControlSource; + OUString sColumnType,aGroupName,sControlSource; Sequence< Property> aProps; Reference< XPropertySet> xCurrentBoundField; while ((xCurrentModelSet = Reference< XPropertySet>(aModelIterator.Next(), UNO_QUERY)).is()) @@ -3340,13 +3340,13 @@ void FmXFormShell::CreateExternalView() aGroupName = getLabelName(xCurrentModelSet); // add the reference value of the radio button to the list source sequence - Sequence< ::rtl::OUString>& aThisGroupLabels = aRadioListSources[aGroupName]; + Sequence< OUString>& aThisGroupLabels = aRadioListSources[aGroupName]; sal_Int32 nNewSizeL = aThisGroupLabels.getLength() + 1; aThisGroupLabels.realloc(nNewSizeL); aThisGroupLabels.getArray()[nNewSizeL - 1] = ::comphelper::getString(xCurrentModelSet->getPropertyValue(FM_PROP_REFVALUE)); // add the label to the value list sequence - Sequence< ::rtl::OUString>& aThisGroupControlSources = aRadioValueLists[aGroupName]; + Sequence< OUString>& aThisGroupControlSources = aRadioValueLists[aGroupName]; sal_Int32 nNewSizeC = aThisGroupControlSources.getLength() + 1; aThisGroupControlSources.realloc(nNewSizeC); aThisGroupControlSources.getArray()[nNewSizeC - 1] = ::comphelper::getString(xCurrentModelSet->getPropertyValue(FM_PROP_LABEL)); @@ -3462,7 +3462,7 @@ void FmXFormShell::CreateExternalView() aColumnProps.realloc(pColumnProps - aColumnProps.getArray()); // columns props are a dispatch argument - pDispatchArgs->Name = ::rtl::OUString("ColumnProperties"); // TODO : fmurl.* + pDispatchArgs->Name = OUString("ColumnProperties"); // TODO : fmurl.* pDispatchArgs->Value = makeAny(aColumnProps); ++pDispatchArgs; DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()), @@ -3532,9 +3532,9 @@ void FmXFormShell::CreateExternalView() // column type : listbox pDispatchArgs->Name = FMARG_ADDCOL_COLUMNTYPE; - ::rtl::OUString fColName = FM_COL_LISTBOX; + OUString fColName = FM_COL_LISTBOX; pDispatchArgs->Value <<= fColName; -// pDispatchArgs->Value <<= (::rtl::OUString)FM_COL_LISTBOX; +// pDispatchArgs->Value <<= (OUString)FM_COL_LISTBOX; ++pDispatchArgs; // column position @@ -3549,7 +3549,7 @@ void FmXFormShell::CreateExternalView() ++pDispatchArgs; // the - pDispatchArgs->Name = ::rtl::OUString("ColumnProperties"); // TODO : fmurl.* + pDispatchArgs->Name = OUString("ColumnProperties"); // TODO : fmurl.* pDispatchArgs->Value = makeAny(aListBoxDescription); ++pDispatchArgs; DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()), @@ -3599,21 +3599,21 @@ void FmXFormShell::CreateExternalView() void FmXFormShell::implAdjustConfigCache() { // get (cache) the wizard usage flag - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString("FormControlPilotsEnabled"); + Sequence< OUString > aNames(1); + aNames[0] = OUString("FormControlPilotsEnabled"); Sequence< Any > aFlags = GetProperties(aNames); if (1 == aFlags.getLength()) m_bUseWizards = ::cppu::any2bool(aFlags[0]); } //------------------------------------------------------------------------ -void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames) +void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) { if ( impl_checkDisposed() ) return; - const ::rtl::OUString* pSearch = _rPropertyNames.getConstArray(); - const ::rtl::OUString* pSearchTil = pSearch + _rPropertyNames.getLength(); + const OUString* pSearch = _rPropertyNames.getConstArray(); + const OUString* pSearchTil = pSearch + _rPropertyNames.getLength(); for (;pSearch < pSearchTil; ++pSearch) if (0 == pSearch->compareToAscii("FormControlPilotsEnabled")) { @@ -3631,8 +3631,8 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) { m_bUseWizards = _bUseThem; - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString("FormControlPilotsEnabled"); + Sequence< OUString > aNames(1); + aNames[0] = OUString("FormControlPilotsEnabled"); Sequence< Any > aValues(1); aValues[0] = ::cppu::bool2any(m_bUseWizards); PutProperties(aNames, aValues); @@ -3795,8 +3795,8 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels return; } - static const ::rtl::OUString sClassIdPropertyName = FM_PROP_CLASSID; - static const ::rtl::OUString sBoundFieldPropertyName = FM_PROP_BOUNDFIELD; + static const OUString sClassIdPropertyName = FM_PROP_CLASSID; + static const OUString sBoundFieldPropertyName = FM_PROP_BOUNDFIELD; sal_Int32 nCount = _rxModels->getCount(); Reference< XPropertySet > xCurrent; Reference< XPropertySetInfo > xCurrentInfo; @@ -3876,7 +3876,7 @@ namespace if ( xConn.is() ) return sal_True; - ::rtl::OUString sPropertyValue; + OUString sPropertyValue; OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DATASOURCE ) >>= sPropertyValue ); if ( !sPropertyValue.isEmpty() ) return sal_True; @@ -4076,7 +4076,7 @@ sal_Bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterf Any aClassId( xProperties->getPropertyValue(FM_PROP_CLASSID) ); if (::comphelper::getINT16(aClassId) == FormComponentType::GRIDCONTROL) { - m_sCurrentValue = ::rtl::OUString(); + m_sCurrentValue = OUString(); return sal_True; } } diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index effb1bd4336b..32f58ced4229 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -112,7 +112,7 @@ namespace svxform return s_aSearchPositionMap; } - static sal_Int16 lcl_implMapAsciiValue( const ::rtl::OUString& _rAsciiValue, const Ascii2Int16* _pMap ) + static sal_Int16 lcl_implMapAsciiValue( const OUString& _rAsciiValue, const Ascii2Int16* _pMap ) { // search the map for the given ascii value const Ascii2Int16* pSearch = _pMap; @@ -125,9 +125,9 @@ namespace svxform } OSL_FAIL( - ( ::rtl::OString( "lcl_implMapAsciiValue: could not convert the ascii value " ) - += ::rtl::OString( _rAsciiValue.getStr(), _rAsciiValue.getLength(), RTL_TEXTENCODING_ASCII_US ) - += ::rtl::OString( " !" ) + ( OString( "lcl_implMapAsciiValue: could not convert the ascii value " ) + += OString( _rAsciiValue.getStr(), _rAsciiValue.getLength(), RTL_TEXTENCODING_ASCII_US ) + += OString( " !" ) ).getStr() ); return -1; @@ -146,9 +146,9 @@ namespace svxform } OSL_FAIL( - ( ::rtl::OString( "lcl_implMapIntValue: could not convert the integer value " ) - += ::rtl::OString::valueOf( (sal_Int32)_nValue ) - += ::rtl::OString( " !" ) + ( OString( "lcl_implMapIntValue: could not convert the integer value " ) + += OString::valueOf( (sal_Int32)_nValue ) + += OString( " !" ) ).getStr() ); static const sal_Char* s_pDummy = ""; @@ -248,10 +248,10 @@ namespace svxform void FmSearchConfigItem::implTranslateToConfig( ) { // the search-for string - m_sSearchForType = ::rtl::OUString::createFromAscii( lcl_implMapIntValue( nSearchForType, lcl_getSearchForTypeValueMap() ) ); + m_sSearchForType = OUString::createFromAscii( lcl_implMapIntValue( nSearchForType, lcl_getSearchForTypeValueMap() ) ); // the search position - m_sSearchPosition = ::rtl::OUString::createFromAscii( lcl_implMapIntValue( nPosition, lcl_getSearchPositionValueMap() ) ); + m_sSearchPosition = OUString::createFromAscii( lcl_implMapIntValue( nPosition, lcl_getSearchPositionValueMap() ) ); // the transliteration flags diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index bdd0d75528d9..2e393f0fdc08 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -169,7 +169,7 @@ SimpleTextWrapper::SimpleTextWrapper(const Reference< ::com::sun::star::awt::XTe } //------------------------------------------------------------------------ -::rtl::OUString SimpleTextWrapper::getCurrentText() const +OUString SimpleTextWrapper::getCurrentText() const { return m_xText->getText(); } @@ -183,7 +183,7 @@ ListBoxWrapper::ListBoxWrapper(const Reference< ::com::sun::star::awt::XListBox } //------------------------------------------------------------------------ -::rtl::OUString ListBoxWrapper::getCurrentText() const +OUString ListBoxWrapper::getCurrentText() const { return m_xBox->getSelectedItem(); } @@ -197,15 +197,15 @@ CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckB } //------------------------------------------------------------------------ -::rtl::OUString CheckBoxWrapper::getCurrentText() const +OUString CheckBoxWrapper::getCurrentText() const { switch ((TriState)m_xBox->getState()) { - case STATE_NOCHECK: return rtl::OUString("0"); - case STATE_CHECK: return rtl::OUString("1"); + case STATE_NOCHECK: return OUString("0"); + case STATE_CHECK: return OUString("1"); default: break; } - return rtl::OUString(); + return OUString(); } //======================================================================== @@ -239,9 +239,9 @@ sal_Bool FmSearchEngine::MoveCursor() catch(::com::sun::star::sdbc::SQLException const& e) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM( "FmSearchEngine::MoveCursor : catched a DatabaseException (")); - sDebugMessage.append(rtl::OUStringToOString(e.SQLState, RTL_TEXTENCODING_ASCII_US)); + sDebugMessage.append(OUStringToOString(e.SQLState, RTL_TEXTENCODING_ASCII_US)); sDebugMessage.append(RTL_CONSTASCII_STRINGPARAM(") !")); OSL_FAIL(sDebugMessage.getStr()); #else @@ -252,9 +252,9 @@ sal_Bool FmSearchEngine::MoveCursor() catch(Exception const& e) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM( "FmSearchEngine::MoveCursor : catched an Exception (")); - sDebugMessage.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US)); + sDebugMessage.append(OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US)); sDebugMessage.append(RTL_CONSTASCII_STRINGPARAM(") !")); OSL_FAIL(sDebugMessage.getStr()); #else @@ -331,15 +331,15 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star:: } //------------------------------------------------------------------------ -::rtl::OUString FmSearchEngine::FormatField(const FieldInfo& rField) +OUString FmSearchEngine::FormatField(const FieldInfo& rField) { DBG_ASSERT(!m_bUsingTextComponents, "FmSearchEngine::FormatField : im UsingTextComponents-Mode bitte FormatField(sal_Int32) benutzen !"); if (!m_xFormatter.is()) - return ::rtl::OUString(); + return OUString(); // sonst werden Datumsflder zum Beispiel zu irgendeinem Default-Wert formatiert - ::rtl::OUString sReturn; + OUString sReturn; try { if (rField.bDoubleHandling) @@ -350,7 +350,7 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star:: } else { - ::rtl::OUString sValue = rField.xContents->getString(); + OUString sValue = rField.xContents->getString(); if (!rField.xContents->wasNull()) sReturn = m_xFormatter->formatString(rField.nFormatKey, sValue); } @@ -364,7 +364,7 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star:: } //------------------------------------------------------------------------ -::rtl::OUString FmSearchEngine::FormatField(sal_Int32 nWhich) +OUString FmSearchEngine::FormatField(sal_Int32 nWhich) { if (m_bUsingTextComponents) { @@ -465,7 +465,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor } //------------------------------------------------------------------------ -FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos, +FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd) { // die Startposition merken @@ -493,7 +493,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri } // der aktuell zu vergleichende Inhalt - ::rtl::OUString sCurrentCheck; + OUString sCurrentCheck; if (m_bFormatter) sCurrentCheck = FormatField(nFieldPos); else @@ -543,7 +543,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri } //------------------------------------------------------------------------ -FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos, +FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd) { DBG_ASSERT(m_bLevenshtein || m_bRegular, @@ -595,7 +595,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O } // der aktuell zu vergleichende Inhalt - ::rtl::OUString sCurrentCheck; + OUString sCurrentCheck; if (m_bFormatter) sCurrentCheck = FormatField(nFieldPos); else @@ -671,7 +671,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O DBG_NAME(FmSearchEngine); //------------------------------------------------------------------------ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, - const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, + const Reference< XResultSet > & xCursor, const OUString& sVisibleFields, const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode) :m_xSearchCursor(xCursor) @@ -710,7 +710,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, //------------------------------------------------------------------------ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, - const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, + const Reference< XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields, FMSEARCH_MODE eMode) :m_xSearchCursor(xCursor) ,m_aCharacterClassficator( _rxContext, SvtSysLocale().GetLanguageTag() ) @@ -826,7 +826,7 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields) } //------------------------------------------------------------------------ -void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) +void FmSearchEngine::Init(const OUString& sVisibleFields) { // analyze the fields // additionally, create the mapping: because the list of used columns can be shorter than the list @@ -871,12 +871,12 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::Init : invalid cursor (no columns supplier) !"); Reference< ::com::sun::star::container::XNameAccess > xAllFieldNames = xSupplyCols->getColumns(); - Sequence< ::rtl::OUString > seqFieldNames = xAllFieldNames->getElementNames(); - ::rtl::OUString* pFieldNames = seqFieldNames.getArray(); + Sequence< OUString > seqFieldNames = xAllFieldNames->getElementNames(); + OUString* pFieldNames = seqFieldNames.getArray(); - ::rtl::OUString sCurrentField; - ::rtl::OUString sVis(sVisibleFields.getStr()); + OUString sCurrentField; + OUString sVis(sVisibleFields.getStr()); sal_Int32 nIndex = 0; do { @@ -978,13 +978,13 @@ void FmSearchEngine::SearchNextImpl() DBG_ASSERT(m_xSearchCursor.is(), "FmSearchEngine::SearchNextImpl : habe ungueltigen Iterator !"); // die Parameter der Suche - ::rtl::OUString strSearchExpression(m_strSearchExpression); // brauche ich non-const + OUString strSearchExpression(m_strSearchExpression); // brauche ich non-const if (!GetCaseSensitive()) // norm the string strSearchExpression = m_aCharacterClassficator.lowercase(strSearchExpression); if (!m_bRegular && !m_bLevenshtein) - { // 'normale' Suche fuehre ich auf jeden Fall ueber WildCards durch, muss aber vorher je nach Modus den ::rtl::OUString anpassen + { // 'normale' Suche fuehre ich auf jeden Fall ueber WildCards durch, muss aber vorher je nach Modus den OUString anpassen if (!m_bWildcard) { // da natuerlich in allen anderen Faellen auch * und ? im Suchstring erlaubt sind, aber nicht als WildCards zaehlen @@ -1144,7 +1144,7 @@ void FmSearchEngine::CancelSearch() } //------------------------------------------------------------------------ -sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, const InterfaceArray& arrFields, +sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields, sal_Int32 nFieldIndex) { DBG_ASSERT(!m_bSearchingCurrently, "FmSearchEngine::SwitchToContext : please do not call while I'm searching !"); @@ -1188,7 +1188,7 @@ void FmSearchEngine::ImplStartNextSearch() } //------------------------------------------------------------------------ -void FmSearchEngine::SearchNext(const ::rtl::OUString& strExpression) +void FmSearchEngine::SearchNext(const OUString& strExpression) { m_strSearchExpression = strExpression; m_eSearchForType = SEARCHFOR_STRING; @@ -1203,7 +1203,7 @@ void FmSearchEngine::SearchNextSpecial(sal_Bool _bSearchForNull) } //------------------------------------------------------------------------ -void FmSearchEngine::StartOver(const ::rtl::OUString& strExpression) +void FmSearchEngine::StartOver(const OUString& strExpression) { try { diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index be8046f2498a..3e7f1aa2f8db 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -430,9 +430,9 @@ namespace svx } //.................................................................... - ::rtl::OUString lcl_getUnoSlotName( SfxApplication&, SfxSlotId _nSlotId ) + OUString lcl_getUnoSlotName( SfxApplication&, SfxSlotId _nSlotId ) { - ::rtl::OUString sSlotUnoName; + OUString sSlotUnoName; SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool( NULL ); const SfxSlot* pSlot = rSlotPool.GetSlot( _nSlotId ); @@ -456,15 +456,15 @@ namespace svx if ( pAsciiUnoName ) { - sSlotUnoName = ::rtl::OUString( ".uno:" ); - sSlotUnoName += ::rtl::OUString::createFromAscii( pAsciiUnoName ); + sSlotUnoName = OUString( ".uno:" ); + sSlotUnoName += OUString::createFromAscii( pAsciiUnoName ); } #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sMessage( "lcl_getUnoSlotName: invalid slot id, or invalid slot, or no UNO name!\n" ); + OString sMessage( "lcl_getUnoSlotName: invalid slot id, or invalid slot, or no UNO name!\n" ); sMessage += "(slot id: "; - sMessage += ::rtl::OString::valueOf( (sal_Int32)_nSlotId ); + sMessage += OString::valueOf( (sal_Int32)_nSlotId ); sMessage += ")"; OSL_FAIL( sMessage.getStr() ); } @@ -534,7 +534,7 @@ namespace svx Reference< XPropertySetInfo > xPSI; if ( xModelProps.is() ) xPSI = xModelProps->getPropertySetInfo(); - ::rtl::OUString sRichTextPropertyName = ::rtl::OUString( "RichText" ); + OUString sRichTextPropertyName = OUString( "RichText" ); if ( xPSI.is() && xPSI->hasPropertyByName( sRichTextPropertyName ) ) { OSL_VERIFY( xModelProps->getPropertyValue( sRichTextPropertyName ) >>= bIsRichText ); @@ -593,13 +593,13 @@ namespace svx { SfxSlotId nSlotId( aFeature->first ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OUString sUnoSlotName; + OUString sUnoSlotName; if ( SFX_APP() ) sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotId ); else - sUnoSlotName = ::rtl::OUString( "" ); - ::rtl::OString sUnoSlotNameAscii( "\"" ); - sUnoSlotNameAscii += ::rtl::OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sUnoSlotName = OUString( "" ); + OString sUnoSlotNameAscii( "\"" ); + sUnoSlotNameAscii += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); sUnoSlotNameAscii += "\""; #endif @@ -632,7 +632,7 @@ namespace svx { #if OSL_DEBUG_LEVEL > 0 bool bFeatureIsEnabled = aFeature->second->isFeatureEnabled(); - ::rtl::OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " ); + OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " ); sMessage += sUnoSlotNameAscii; if ( !bFeatureIsEnabled ) sMessage += " (disabled)"; @@ -644,7 +644,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " ); + OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " ); sMessage += sUnoSlotNameAscii; sMessage += ", but could not translate it into an item!"; OSL_TRACE( "%s", sMessage.getStr() ); @@ -732,7 +732,7 @@ namespace svx if ( pBoolItem ) { aArgs.realloc( 1 ); - aArgs[ 0 ].Name = ::rtl::OUString( "Enable" ); + aArgs[ 0 ].Name = OUString( "Enable" ); aArgs[ 0 ].Value <<= (sal_Bool)pBoolItem->GetValue(); } } @@ -743,14 +743,14 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sError( "FmTextControShell::executeAttributeDialog: Could not handle the following item:" ); - sError += "\n SlotID: "; sError += ::rtl::OString::valueOf( (sal_Int32)nSlotForItemSet ); - sError += "\n WhichID: "; sError += ::rtl::OString::valueOf( (sal_Int32)nWhich ); + OString sError( "FmTextControShell::executeAttributeDialog: Could not handle the following item:" ); + sError += "\n SlotID: "; sError += OString::valueOf( (sal_Int32)nSlotForItemSet ); + sError += "\n WhichID: "; sError += OString::valueOf( (sal_Int32)nWhich ); sError += "\n UNO name: "; - ::rtl::OUString sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotForItemSet ); + OUString sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotForItemSet ); if ( !sUnoSlotName.isEmpty() ) - sError += ::rtl::OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sError += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); else sError += "unknown (no SfxSlot)"; OSL_FAIL( sError.getStr() ); @@ -798,18 +798,18 @@ namespace svx case SID_COPY: case SID_CUT: { - ::rtl::OUString sSelectedText( m_xActiveTextComponent->getSelectedText() ); + OUString sSelectedText( m_xActiveTextComponent->getSelectedText() ); ::svt::OStringTransfer::CopyString( sSelectedText, lcl_getWindow( m_xActiveControl ) ); if ( SID_CUT == _nSlot ) { awt::Selection aSelection( m_xActiveTextComponent->getSelection() ); - m_xActiveTextComponent->insertText( aSelection, ::rtl::OUString() ); + m_xActiveTextComponent->insertText( aSelection, OUString() ); } } break; case SID_PASTE: { - ::rtl::OUString sClipboardContent; + OUString sClipboardContent; OSL_VERIFY( ::svt::OStringTransfer::PasteString( sClipboardContent, lcl_getWindow( m_xActiveControl ) ) ); awt::Selection aSelection( m_xActiveTextComponent->getSelection() ); m_xActiveTextComponent->insertText( aSelection, sClipboardContent ); @@ -1065,8 +1065,8 @@ namespace svx void FmTextControlShell::formActivated( const Reference< XFormController >& _rxController ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTrace( "FmTextControlShell::formActivated: 0x" ); - sTrace += ::rtl::OString::valueOf( (sal_IntPtr)_rxController.get(), 16 ); + OString sTrace( "FmTextControlShell::formActivated: 0x" ); + sTrace += OString::valueOf( (sal_IntPtr)_rxController.get(), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif @@ -1093,8 +1093,8 @@ namespace svx void FmTextControlShell::formDeactivated( const Reference< XFormController >& _rxController ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTrace( "FmTextControlShell::formDeactivated: 0x" ); - sTrace += ::rtl::OString::valueOf( (sal_IntPtr)_rxController.get(), 16 ); + OString sTrace( "FmTextControlShell::formDeactivated: 0x" ); + sTrace += OString::valueOf( (sal_IntPtr)_rxController.get(), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif (void)_rxController; @@ -1324,7 +1324,7 @@ namespace svx URL aFeatureURL; aFeatureURL.Complete = lcl_getUnoSlotName( *_pApplication, _nSlot ); impl_parseURL_nothrow( aFeatureURL ); - Reference< XDispatch > xDispatcher = _rxProvider->queryDispatch( aFeatureURL, ::rtl::OUString(), 0xFF ); + Reference< XDispatch > xDispatcher = _rxProvider->queryDispatch( aFeatureURL, OUString(), 0xFF ); if ( xDispatcher.is() ) return new FmTextControlFeature( xDispatcher, aFeatureURL, _nSlot, this ); return NULL; @@ -1345,8 +1345,8 @@ namespace svx Reference< XControl > xControl( _rEvent.Source, UNO_QUERY ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTrace( "FmTextControlShell::focusGained: 0x" ); - sTrace += ::rtl::OString::valueOf( (sal_IntPtr)xControl.get(), 16 ); + OString sTrace( "FmTextControlShell::focusGained: 0x" ); + sTrace += OString::valueOf( (sal_IntPtr)xControl.get(), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif @@ -1361,8 +1361,8 @@ namespace svx Reference< XControl > xControl( _rEvent.Source, UNO_QUERY ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTrace( "FmTextControlShell::focusLost: 0x" ); - sTrace += ::rtl::OString::valueOf( (sal_IntPtr)xControl.get(), 16 ); + OString sTrace( "FmTextControlShell::focusLost: 0x" ); + sTrace += OString::valueOf( (sal_IntPtr)xControl.get(), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 1a5df90fc9dc..ddeb875695ac 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -204,11 +204,11 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce } //------------------------------------------------------------------ -::rtl::OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel) +OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getLabelName" ); if (!xControlModel.is()) - return ::rtl::OUString(); + return OUString(); if (::comphelper::hasProperty(FM_PROP_CONTROLLABEL, xControlModel)) { @@ -371,7 +371,7 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi if (!xPersistence.is()) return OBJ_FM_CONTROL; - ::rtl::OUString sPersistentServiceName = xPersistence->getServiceName(); + OUString sPersistentServiceName = xPersistence->getServiceName(); if (sPersistentServiceName.equals(FM_COMPONENT_EDIT)) // 5.0-Name { // may be a simple edit field or a formatted field, dependent of the supported services diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 1177dae34fe3..d176abdf4978 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -121,7 +121,7 @@ private: // SfxObjectShellRef is good here since the model controls the lifetime of the shell SfxObjectShellRef const xObjectShell = m_rModel.GetObjectShell(); ENSURE_OR_THROW( xObjectShell.Is(), "no object shell!" ); - xListenerProps->setPropertyValue( ::rtl::OUString( "Model" ), makeAny( xObjectShell->GetModel() ) ); + xListenerProps->setPropertyValue( OUString( "Model" ), makeAny( xObjectShell->GetModel() ) ); m_vbaListener = xScriptListener; } @@ -552,11 +552,11 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) return; // if it's a "default value" property of a control model, set the according "value" property - static ::rtl::OUString pDefaultValueProperties[] = { + static OUString pDefaultValueProperties[] = { OUString(FM_PROP_DEFAULT_TEXT), OUString(FM_PROP_DEFAULTCHECKED), OUString(FM_PROP_DEFAULT_DATE), OUString(FM_PROP_DEFAULT_TIME), OUString(FM_PROP_DEFAULT_VALUE), OUString(FM_PROP_DEFAULT_SELECT_SEQ), OUString(FM_PROP_EFFECTIVE_DEFAULT) }; - const ::rtl::OUString aValueProperties[] = { + const OUString aValueProperties[] = { OUString(FM_PROP_TEXT), OUString(FM_PROP_STATE), OUString(FM_PROP_DATE), OUString(FM_PROP_TIME), OUString(FM_PROP_VALUE), OUString(FM_PROP_SELECT_SEQ), OUString(FM_PROP_EFFECTIVE_VALUE) }; @@ -643,7 +643,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) if (::comphelper::hasProperty(FM_PROP_CONTROLSOURCEPROPERTY, xSet)) { Any aControlSourceProperty = xSet->getPropertyValue(FM_PROP_CONTROLSOURCEPROPERTY); - ::rtl::OUString sControlSourceProperty; + OUString sControlSourceProperty; aControlSourceProperty >>= sControlSourceProperty; aNewEntry.bIsValueProperty = (sControlSourceProperty.equals(evt.PropertyName)); @@ -691,7 +691,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // TODO: we should cache all those things, else this might be too expensive. // However, this requires we're notified of changes in the value binding - static const ::rtl::OUString s_sExternalData( "ExternalData" ); + static const OUString s_sExternalData( "ExternalData" ); if ( xBindingPropsPSI.is() && xBindingPropsPSI->hasPropertyByName( s_sExternalData ) ) { sal_Bool bExternalData = sal_True; @@ -841,9 +841,9 @@ void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & if (xSet.is()) { if (!bReadOnly) - xSet->addPropertyChangeListener( ::rtl::OUString(), this ); + xSet->addPropertyChangeListener( OUString(), this ); else - xSet->removePropertyChangeListener( ::rtl::OUString(), this ); + xSet->removePropertyChangeListener( OUString(), this ); } } @@ -920,9 +920,9 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje if ( xProps.is() ) { if ( _bStartListening ) - xProps->addPropertyChangeListener( ::rtl::OUString(), this ); + xProps->addPropertyChangeListener( OUString(), this ); else - xProps->removePropertyChangeListener( ::rtl::OUString(), this ); + xProps->removePropertyChangeListener( OUString(), this ); } } @@ -1044,12 +1044,12 @@ void FmUndoPropertyAction::Redo() } //------------------------------------------------------------------------------ -rtl::OUString FmUndoPropertyAction::GetComment() const +OUString FmUndoPropertyAction::GetComment() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoPropertyAction::GetComment" ); String aStr(static_STR_UNDO_PROPERTY); - aStr.SearchAndReplace( rtl::OUString('#'), aPropertyName ); + aStr.SearchAndReplace( OUString('#'), aPropertyName ); return aStr; } @@ -1287,7 +1287,7 @@ void FmUndoModelReplaceAction::Undo() Reference< XPropertySet > xCurrentAsSet( xCurrentModel, UNO_QUERY ); DBG_ASSERT( ::comphelper::hasProperty(FM_PROP_NAME, xCurrentAsSet ), "FmUndoModelReplaceAction::Undo : one of the models is invalid !"); - ::rtl::OUString sName; + OUString sName; xCurrentAsSet->getPropertyValue( FM_PROP_NAME ) >>= sName; xCurrentsParent->replaceByName( sName, makeAny( xComponent ) ); @@ -1304,7 +1304,7 @@ void FmUndoModelReplaceAction::Undo() } //------------------------------------------------------------------------------ -rtl::OUString FmUndoModelReplaceAction::GetComment() const +OUString FmUndoModelReplaceAction::GetComment() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoModelReplaceAction::GetComment" ); return SVX_RESSTR(RID_STR_UNDO_MODEL_REPLACE); diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 24bb95852a42..b18745e2f634 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -590,7 +590,7 @@ FmFormObj* FmFormView::getMarkedGrid() const // ----------------------------------------------------------------------------- void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, - sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, + sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl ) { FmXFormView::createControlLabelPair( diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index eaaa886bce45..3dc99ea74da4 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -723,7 +723,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) continue; } - const ::rtl::OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) ); + const OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) ); if ( !aSource.isEmpty() ) { FmXFormShell* pShImpl = m_pView->GetFormShell()->GetImpl(); @@ -1078,7 +1078,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ ) if ( !xWizard.is() ) { - ShowServiceNotAvailableError( NULL, rtl::OUString::createFromAscii(pWizardAsciiName), sal_True ); + ShowServiceNotAvailableError( NULL, OUString::createFromAscii(pWizardAsciiName), sal_True ); } else { @@ -1102,8 +1102,8 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ ) namespace { void lcl_insertIntoFormComponentHierarchy_throw( const FmFormView& _rView, const SdrUnoObj& _rSdrObj, - const Reference< XDataSource >& _rxDataSource = NULL, const ::rtl::OUString& _rDataSourceName = ::rtl::OUString(), - const ::rtl::OUString& _rCommand = ::rtl::OUString(), const sal_Int32 _nCommandType = -1 ) + const Reference< XDataSource >& _rxDataSource = NULL, const OUString& _rDataSourceName = OUString(), + const OUString& _rCommand = OUString(), const sal_Int32 _nCommandType = -1 ) { FmFormPage& rPage = static_cast< FmFormPage& >( *_rView.GetSdrPageView()->GetPage() ); @@ -1126,11 +1126,11 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript if ( !m_pView->IsDesignMode() ) return NULL; - ::rtl::OUString sCommand, sFieldName; + OUString sCommand, sFieldName; sal_Int32 nCommandType = CommandType::COMMAND; SharedConnection xConnection; - ::rtl::OUString sDataSource = _rColumnDescriptor.getDataSource(); + OUString sDataSource = _rColumnDescriptor.getDataSource(); _rColumnDescriptor[ daCommand ] >>= sCommand; _rColumnDescriptor[ daColumnName ] >>= sFieldName; _rColumnDescriptor[ daCommandType ] >>= nCommandType; @@ -1169,8 +1169,8 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript if ( !xConnection.is() ) xConnection.reset( OStaticDataAccessTools().getConnection_withFeedback( sDataSource, - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), m_aContext.getUNOContext() ) ); } @@ -1214,7 +1214,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript Reference< XNumberFormatsSupplier > xSupplier( aDBATools.getNumberFormats( xConnection, sal_False ), UNO_SET_THROW ); Reference< XNumberFormats > xNumberFormats( xSupplier->getNumberFormats(), UNO_SET_THROW ); - ::rtl::OUString sLabelPostfix; + OUString sLabelPostfix; //////////////////////////////////////////////////////////////// // nur fuer Textgroesse @@ -1367,7 +1367,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor { // determine the table/query field which we should create a control for Reference< XNumberFormats > xNumberFormats; - ::rtl::OUString sLabelPostfix = _rDesc.szName; + OUString sLabelPostfix = _rDesc.szName; //////////////////////////////////////////////////////////////// // nur fuer Textgroesse @@ -1401,11 +1401,11 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor ////////////////////////////////////////////////////////////////////// // The service name decides which control should be created sal_uInt16 nOBJID = OBJ_FM_EDIT; - if(::rtl::OUString(_rDesc.szServiceName).equals((::rtl::OUString)FM_SUN_COMPONENT_NUMERICFIELD)) + if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_NUMERICFIELD)) nOBJID = OBJ_FM_NUMERICFIELD; - if(::rtl::OUString(_rDesc.szServiceName).equals((::rtl::OUString)FM_SUN_COMPONENT_CHECKBOX)) + if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_CHECKBOX)) nOBJID = OBJ_FM_CHECKBOX; - if(::rtl::OUString(_rDesc.szServiceName).equals((::rtl::OUString)FM_COMPONENT_COMMANDBUTTON)) + if(OUString(_rDesc.szServiceName).equals((OUString)FM_COMPONENT_COMMANDBUTTON)) nOBJID = OBJ_FM_BUTTON; typedef ::com::sun::star::form::submission::XSubmission XSubmission_t; @@ -1462,7 +1462,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor // set the button label Reference< XPropertySet > xControlSet(pControl->GetUnoControlModel(), UNO_QUERY); - xControlSet->setPropertyValue(FM_PROP_LABEL, makeAny(::rtl::OUString(_rDesc.szName))); + xControlSet->setPropertyValue(FM_PROP_LABEL, makeAny(OUString(_rDesc.szName))); // connect the submission with the submission supplier (aka the button) xControlSet->setPropertyValue( FM_PROP_BUTTON_TYPE, @@ -1486,10 +1486,10 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor //------------------------------------------------------------------------ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, - sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, + sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl, - const Reference< XDataSource >& _rxDataSource, const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rCommand, const sal_Int32 _nCommandType ) + const Reference< XDataSource >& _rxDataSource, const OUString& _rDataSourceName, + const OUString& _rCommand, const sal_Int32 _nCommandType ) { if ( !createControlLabelPair( m_aContext, _rOutDev, _nXOffsetMM, _nYOffsetMM, _rxField, _rxNumberFormats, _nControlObjectID, _rFieldPostfix, FmFormInventor, OBJ_FM_FIXEDTEXT, @@ -1515,11 +1515,11 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& _rContext, OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, + const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl) { sal_Int32 nDataType = 0; - ::rtl::OUString sFieldName; + OUString sFieldName; Any aFieldName; if ( _rxField.is() ) { @@ -1567,7 +1567,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& xLabelModel.set( pLabel->GetUnoControlModel(), UNO_QUERY ); if ( xLabelModel.is() ) { - ::rtl::OUString sLabel; + OUString sLabel; if ( _rxField.is() && _rxField->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) ) _rxField->getPropertyValue(FM_PROP_LABEL) >>= sLabel; if ( sLabel.isEmpty() ) @@ -1576,7 +1576,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel + _rFieldPostfix ) ); String sObjectLabel( SVX_RES( RID_STR_OBJECT_LABEL ) ); sObjectLabel.SearchAndReplaceAllAscii( "#object#", sFieldName ); - xLabelModel->setPropertyValue( FM_PROP_NAME, makeAny( ::rtl::OUString( sObjectLabel ) ) ); + xLabelModel->setPropertyValue( FM_PROP_NAME, makeAny( OUString( sObjectLabel ) ) ); } pLabel->SetLogicRect( ::Rectangle( diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 3992a40aaa78..5197304149c6 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -142,12 +142,12 @@ namespace svxform namespace { //.................................................................... - static ::rtl::OUString lcl_getUniqueLabel_nothrow( const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rBaseLabel ) + static OUString lcl_getUniqueLabel_nothrow( const Reference< XPropertySet >& _rxControlModel, const OUString& _rBaseLabel ) { - ::rtl::OUString sLabel( _rBaseLabel ); + OUString sLabel( _rBaseLabel ); try { - typedef ::std::set< ::rtl::OUString > StringBag; + typedef ::std::set< OUString > StringBag; StringBag aUsedLabels; Reference< XFormComponent > xFormComponent( _rxControlModel, UNO_QUERY_THROW ); @@ -163,7 +163,7 @@ namespace svxform if ( !xPSI->hasPropertyByName( FM_PROP_LABEL ) ) continue; - ::rtl::OUString sElementLabel; + OUString sElementLabel; OSL_VERIFY( xElement->getPropertyValue( FM_PROP_LABEL ) >>= sElementLabel ); aUsedLabels.insert( sElementLabel ); } @@ -172,7 +172,7 @@ namespace svxform sal_Int32 i=2; while ( aUsedLabels.find( sLabel ) != aUsedLabels.end() ) { - ::rtl::OUStringBuffer aBuffer( _rBaseLabel ); + OUStringBuffer aBuffer( _rBaseLabel ); aBuffer.appendAscii( " " ); aBuffer.append( (sal_Int32)i++ ); sLabel = aBuffer.makeStringAndClear(); @@ -208,14 +208,14 @@ namespace svxform OSL_ENSURE( xForm.is(), "lcl_getDataSourceIndirectProperties: could not determine the form!" ); if ( !xForm.is() ) return aInfo; - ::rtl::OUString sDataSourceName; + OUString sDataSourceName; xForm->getPropertyValue( FM_PROP_DATASOURCE ) >>= sDataSourceName; Reference< XPropertySet > xDsProperties; if ( !sDataSourceName.isEmpty() ) xDsProperties = xDsProperties.query( OStaticDataAccessTools().getDataSource( sDataSourceName, _rContext.getUNOContext() ) ); if ( xDsProperties.is() ) - xDsProperties->getPropertyValue( ::rtl::OUString( "Info" ) ) >>= aInfo; + xDsProperties->getPropertyValue( OUString( "Info" ) ) >>= aInfo; } catch( const Exception& ) { @@ -366,11 +366,11 @@ namespace svxform Reference< XPropertySetInfo > xSourcePropInfo( xStyle->getPropertySetInfo(), UNO_SET_THROW ); Reference< XPropertySetInfo > xDestPropInfo( _rxModel->getPropertySetInfo(), UNO_SET_THROW ); - ::rtl::OUString sPropertyName; + OUString sPropertyName; const sal_Char** pCharacterProperty = aCharacterAndParagraphProperties; while ( *pCharacterProperty ) { - sPropertyName = ::rtl::OUString::createFromAscii( *pCharacterProperty ); + sPropertyName = OUString::createFromAscii( *pCharacterProperty ); if ( xSourcePropInfo->hasPropertyByName( sPropertyName ) && xDestPropInfo->hasPropertyByName( sPropertyName ) ) _rxModel->setPropertyValue( sPropertyName, xStyle->getPropertyValue( sPropertyName ) ); @@ -404,7 +404,7 @@ namespace svxform switch ( nClassId ) { case FormComponentType::SCROLLBAR: - _rxControlModel->setPropertyValue( ::rtl::OUString( "LiveScroll" ), makeAny( (sal_Bool)sal_True ) ); + _rxControlModel->setPropertyValue( OUString( "LiveScroll" ), makeAny( (sal_Bool)sal_True ) ); // NO break! case FormComponentType::SPINBUTTON: { @@ -444,7 +444,7 @@ namespace svxform case FormComponentType::CHECKBOX: case FormComponentType::FIXEDTEXT: { - ::rtl::OUString sVertAlignPropertyName( "VerticalAlign" ); + OUString sVertAlignPropertyName( "VerticalAlign" ); if ( xPSI->hasPropertyByName( sVertAlignPropertyName ) ) _rxControlModel->setPropertyValue( sVertAlignPropertyName, makeAny( VerticalAlignment_MIDDLE ) ); } @@ -453,7 +453,7 @@ namespace svxform case FormComponentType::IMAGEBUTTON: case FormComponentType::IMAGECONTROL: { - const ::rtl::OUString sScaleModeProperty( "ScaleMode" ); + const OUString sScaleModeProperty( "ScaleMode" ); if ( xPSI->hasPropertyByName( sScaleModeProperty ) ) _rxControlModel->setPropertyValue( sScaleModeProperty, makeAny( ImageScaleMode::Isotropic ) ); } @@ -463,11 +463,11 @@ namespace svxform // initial default label for the control if ( xPSI->hasPropertyByName( FM_PROP_LABEL ) ) { - ::rtl::OUString sExistingLabel; + OUString sExistingLabel; OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_LABEL ) >>= sExistingLabel ); if ( sExistingLabel.isEmpty() ) { - ::rtl::OUString sInitialLabel; + OUString sInitialLabel; OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_NAME ) >>= sInitialLabel ); sal_uInt16 nTitleResId = 0; @@ -648,7 +648,7 @@ namespace svxform } //------------------------------------------------------------------------------ - ::rtl::OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject ) + OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject ) { sal_uInt16 nResId(0); @@ -689,24 +689,24 @@ namespace svxform } //------------------------------------------------------------------------------ - ::rtl::OUString FormControlFactory::getDefaultUniqueName_ByComponentType( const Reference< XNameAccess >& _rxContainer, + OUString FormControlFactory::getDefaultUniqueName_ByComponentType( const Reference< XNameAccess >& _rxContainer, const Reference< XPropertySet >& _rxObject ) { sal_Int16 nClassId = FormComponentType::CONTROL; OSL_VERIFY( _rxObject->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId ); - ::rtl::OUString sBaseName = getDefaultName( nClassId, Reference< XServiceInfo >( _rxObject, UNO_QUERY ) ); + OUString sBaseName = getDefaultName( nClassId, Reference< XServiceInfo >( _rxObject, UNO_QUERY ) ); return getUniqueName( _rxContainer, sBaseName ); } //------------------------------------------------------------------------------ - ::rtl::OUString FormControlFactory::getUniqueName( const Reference< XNameAccess >& _rxContainer, const ::rtl::OUString& _rBaseName ) + OUString FormControlFactory::getUniqueName( const Reference< XNameAccess >& _rxContainer, const OUString& _rBaseName ) { sal_Int32 n = 0; - ::rtl::OUString sName; + OUString sName; do { - ::rtl::OUStringBuffer aBuf( _rBaseName ); + OUStringBuffer aBuf( _rBaseName ); aBuf.appendAscii( " " ); aBuf.append( ++n ); sName = aBuf.makeStringAndClear(); diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 4a5d8a06b435..c9fab0b9761c 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -217,7 +217,7 @@ struct ColumnInfo sal_Int32 nNullable; sal_Bool bAutoIncrement; sal_Bool bReadOnly; - ::rtl::OUString sName; + OUString sName; // information about the control(s) bound to this column @@ -455,7 +455,7 @@ void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyVal //================================================================== struct FmFieldInfo { - rtl::OUString aFieldName; + OUString aFieldName; Reference< XPropertySet > xField; Reference< XTextComponent > xText; @@ -478,11 +478,11 @@ public: { } - virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString("Edit");} + virtual OUString GetComponentServiceName() {return OUString("Edit");} virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw( RuntimeException ); protected: - virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const Any& rVal ); + virtual void ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ); }; //------------------------------------------------------------------------------ @@ -493,13 +493,13 @@ void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XTextComponent > xText(getPeer() , UNO_QUERY); if (xText.is()) { - xText->setText(::rtl::OUString(String(SVX_RES(RID_STR_AUTOFIELD)))); + xText->setText(OUString(String(SVX_RES(RID_STR_AUTOFIELD)))); xText->setEditable(sal_False); } } //------------------------------------------------------------------------------ -void FmXAutoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const Any& rVal ) +void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ) { // these properties are ignored if (rPropName == FM_PROP_TEXT) @@ -563,7 +563,7 @@ FormController::FormController(const Reference< XMultiServiceFactory > & _rxORB ,m_aFilterListeners(m_aMutex) ,m_pControlBorderManager( new ::svxform::ControlBorderManager ) ,m_xFormOperations() - ,m_aMode( ::rtl::OUString( "DataMode" ) ) + ,m_aMode( OUString( "DataMode" ) ) ,m_aLoadEvent( LINK( this, FormController, OnLoad ) ) ,m_aToggleEvent( LINK( this, FormController, OnToggleAutoFields ) ) ,m_aActivationEvent( LINK( this, FormController, OnActivated ) ) @@ -688,10 +688,10 @@ Sequence< Type > SAL_CALL FormController::getTypes( ) throw(RuntimeException) // XServiceInfo //------------------------------------------------------------------------------ -sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& ServiceName) throw( RuntimeException ) +sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSNL(getSupportedServiceNames()); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + Sequence< OUString> aSNL(getSupportedServiceNames()); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -699,21 +699,21 @@ sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& Service } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException ) { - return ::rtl::OUString("org.openoffice.comp.svx.FormController"); + return OUString("org.openoffice.comp.svx.FormController"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> SAL_CALL FormController::getSupportedServiceNames(void) throw( RuntimeException ) +Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames(void) throw( RuntimeException ) { // service names which are supported only, but cannot be used to created an // instance at a service factory - Sequence< ::rtl::OUString > aNonCreatableServiceNames( 1 ); - aNonCreatableServiceNames[ 0 ] = ::rtl::OUString( "com.sun.star.form.FormControllerDispatcher" ); + Sequence< OUString > aNonCreatableServiceNames( 1 ); + aNonCreatableServiceNames[ 0 ] = OUString( "com.sun.star.form.FormControllerDispatcher" ); // services which can be used to created an instance at a service factory - Sequence< ::rtl::OUString > aCreatableServiceNames( getSupportedServiceNames_Static() ); + Sequence< OUString > aCreatableServiceNames( getSupportedServiceNames_Static() ); return ::comphelper::concatSequences( aCreatableServiceNames, aNonCreatableServiceNames ); } @@ -732,14 +732,14 @@ void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( Runtime } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> FormController::getSupportedServiceNames_Static(void) +Sequence< OUString> FormController::getSupportedServiceNames_Static(void) { - static Sequence< ::rtl::OUString> aServices; + static Sequence< OUString> aServices; if (!aServices.getLength()) { aServices.realloc(2); aServices.getArray()[0] = OUString( "com.sun.star.form.runtime.FormController" ); - aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.control.TabController"); + aServices.getArray()[1] = OUString("com.sun.star.awt.control.TabController"); } return aServices; } @@ -751,7 +751,7 @@ namespace { void operator()( const Reference< XTextComponent >& _rxText ) { - _rxText->setText( ::rtl::OUString() ); + _rxText->setText( OUString() ); } }; @@ -826,7 +826,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons { case FM_ATTR_FILTER: { - ::rtl::OUStringBuffer aFilter; + OUStringBuffer aFilter; OStaticDataAccessTools aStaticTools; Reference xConnection(aStaticTools.getRowSetConnection(Reference< XRowSet>(m_xModelAsIndex, UNO_QUERY))); if (xConnection.is()) @@ -849,7 +849,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons if ( rRow.empty() ) continue; - ::rtl::OUStringBuffer aRowFilter; + OUStringBuffer aRowFilter; for ( FmFilterRow::const_iterator condition = rRow.begin(); condition != rRow.end(); ++condition ) { // get the field of the controls map @@ -857,9 +857,9 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons Reference< XPropertySet > xModelProps( xControl->getModel(), UNO_QUERY_THROW ); Reference< XPropertySet > xField( xModelProps->getPropertyValue( FM_PROP_BOUNDFIELD ), UNO_QUERY_THROW ); - ::rtl::OUString sFilterValue( condition->second ); + OUString sFilterValue( condition->second ); - ::rtl::OUString sErrorMsg, sCriteria; + OUString sErrorMsg, sCriteria; const ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( sErrorMsg, sFilterValue, xFormatter, xField ); OSL_ENSURE( xParseNode.is(), "FormController::getFastPropertyValue: could not parse the field value predicate!" ); @@ -923,7 +923,7 @@ void FormController::fillProperties( _rProps.realloc(2); sal_Int32 nPos = 0; Property* pDesc = _rProps.getArray(); - DECL_PROP1(FILTER, rtl::OUString, READONLY); + DECL_PROP1(FILTER, OUString, READONLY); DECL_PROP1(FORM_OPERATIONS, Reference< XFormOperations >, READONLY); } @@ -965,13 +965,13 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X } //------------------------------------------------------------------------------ -void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const ::rtl::OUString& _PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException ) +void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); if ( ( _Component < 0 ) || ( _Component >= getFilterComponents() ) || ( _Term < 0 ) || ( _Term >= getDisjunctiveTerms() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); Reference< XTextComponent > xText( m_aFilterComponents[ _Component ] ); xText->setText( _PredicateExpression ); @@ -990,18 +990,18 @@ Reference< XControl > FormController::getFilterComponent( ::sal_Int32 _Component impl_checkDisposed_throw(); if ( ( _Component < 0 ) || ( _Component >= getFilterComponents() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); return Reference< XControl >( m_aFilterComponents[ _Component ], UNO_QUERY ); } //------------------------------------------------------------------------------ -Sequence< Sequence< ::rtl::OUString > > FormController::getPredicateExpressions() throw( RuntimeException ) +Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); - Sequence< Sequence< ::rtl::OUString > > aExpressions( m_aFilterRows.size() ); + Sequence< Sequence< OUString > > aExpressions( m_aFilterRows.size() ); sal_Int32 termIndex = 0; for ( FmFilterRows::const_iterator row = m_aFilterRows.begin(); row != m_aFilterRows.end(); @@ -1010,7 +1010,7 @@ Sequence< Sequence< ::rtl::OUString > > FormController::getPredicateExpressions( { const FmFilterRow& rRow( *row ); - Sequence< ::rtl::OUString > aConjunction( m_aFilterComponents.size() ); + Sequence< OUString > aConjunction( m_aFilterComponents.size() ); sal_Int32 componentIndex = 0; for ( FilterComponents::const_iterator comp = m_aFilterComponents.begin(); comp != m_aFilterComponents.end(); @@ -1036,7 +1036,7 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw ( impl_checkDisposed_throw(); if ( ( _Term < 0 ) || ( _Term >= getDisjunctiveTerms() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); // if the to-be-deleted row is our current row, we need to shift if ( _Term == m_nCurrentFilterPosition ) @@ -1096,7 +1096,7 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (In impl_checkDisposed_throw(); if ( ( _ActiveTerm < 0 ) || ( _ActiveTerm >= getDisjunctiveTerms() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); if ( _ActiveTerm == getActiveTerm() ) return; @@ -1466,7 +1466,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields) && ::comphelper::getBOOL( xField->getPropertyValue(FM_PROP_AUTOINCREMENT ) ) ) { - ::rtl::OUString sServiceName; + OUString sServiceName; OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DEFAULTCONTROL ) >>= sServiceName ); Reference< XControl > xNewControl( m_aContext.createComponent( sServiceName ), UNO_QUERY ); replaceControl( xControl, xNewControl ); @@ -1504,7 +1504,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce return; Reference< XTextComponent > xText(e.Source,UNO_QUERY); - ::rtl::OUString aText = xText->getText(); + OUString aText = xText->getText(); if ( m_aFilterRows.empty() ) appendEmptyDisjunctiveTerm(); @@ -1601,7 +1601,7 @@ void FormController::modified( const EventObject& _rEvent ) throw( RuntimeExcept void FormController::impl_checkDisposed_throw() const { if ( impl_isDisposed_nofail() ) - throw DisposedException( ::rtl::OUString(), *const_cast< FormController* >( this ) ); + throw DisposedException( OUString(), *const_cast< FormController* >( this ) ); } //------------------------------------------------------------------------------ @@ -3030,17 +3030,17 @@ void SAL_CALL FormController::addChildController( const Reference< XFormControll impl_checkDisposed_throw(); if ( !_ChildController.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); // TODO: (localized) error message // the parent of our (to-be-)child must be our own model Reference< XFormComponent > xFormOfChild( _ChildController->getModel(), UNO_QUERY ); if ( !xFormOfChild.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); // TODO: (localized) error message if ( xFormOfChild->getParent() != m_xModelAsIndex ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); // TODO: (localized) error message m_aChildren.push_back( _ChildController ); @@ -3106,12 +3106,12 @@ void FormController::setFilter(::std::vector& rFieldInfos) { Reference< XMultiServiceFactory > xFactory( xConnection, UNO_QUERY_THROW ); m_xComposer.set( - xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), + xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY_THROW ); Reference< XPropertySet > xSet( xForm, UNO_QUERY ); - ::rtl::OUString sStatement = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_ACTIVECOMMAND ) ); - ::rtl::OUString sFilter = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_FILTER ) ); + OUString sStatement = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_ACTIVECOMMAND ) ); + OUString sFilter = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_FILTER ) ); m_xComposer->setElementaryQuery( sStatement ); m_xComposer->setFilter( sFilter ); } @@ -3178,7 +3178,7 @@ void FormController::setFilter(::std::vector& rFieldInfos) try { Reference< XPropertySet > xSet; - ::rtl::OUString aRealName; + OUString aRealName; // first look with the given name if (xQueryColumns->hasByName(pRefValues[j].Name)) @@ -3186,7 +3186,7 @@ void FormController::setFilter(::std::vector& rFieldInfos) xQueryColumns->getByName(pRefValues[j].Name) >>= xSet; // get the RealName - xSet->getPropertyValue(::rtl::OUString("RealName")) >>= aRealName; + xSet->getPropertyValue(OUString("RealName")) >>= aRealName; // compare the condition field name and the RealName if (aCompare(aRealName, pRefValues[j].Name)) @@ -3199,7 +3199,7 @@ void FormController::setFilter(::std::vector& rFieldInfos) for (sal_Int32 n = 0, nCount = xColumnsByIndex->getCount(); n < nCount; n++) { xColumnsByIndex->getByIndex(n) >>= xSet; - xSet->getPropertyValue(::rtl::OUString("RealName")) >>= aRealName; + xSet->getPropertyValue(OUString("RealName")) >>= aRealName; if (aCompare(aRealName, pRefValues[j].Name)) { // get the column by its alias @@ -3226,22 +3226,22 @@ void FormController::setFilter(::std::vector& rFieldInfos) // do we already have the control ? if (aRow.find((*iter).xText) != aRow.end()) { - ::rtl::OUString aCompText = aRow[(*iter).xText]; - aCompText += ::rtl::OUString(" "); - ::rtl::OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND); - aCompText += ::rtl::OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US); - aCompText += ::rtl::OUString(" "); + OUString aCompText = aRow[(*iter).xText]; + aCompText += OUString(" "); + OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND); + aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US); + aCompText += OUString(" "); aCompText += ::comphelper::getString(pRefValues[j].Value); aRow[(*iter).xText] = aCompText; } else { - ::rtl::OUString sPredicate,sErrorMsg; + OUString sPredicate,sErrorMsg; pRefValues[j].Value >>= sPredicate; ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree(sErrorMsg, sPredicate, xFormatter, xField); if ( xParseNode.is() ) { - ::rtl::OUString sCriteria; + OUString sCriteria; xParseNode->parseNodeToPredicateStr( sCriteria ,xConnection ,xFormatter @@ -3320,7 +3320,7 @@ void FormController::startFiltering() Reference< XModeSelector > xSelector(xControl, UNO_QUERY); if (xSelector.is()) { - xSelector->setMode( ::rtl::OUString( "FilterMode" ) ); + xSelector->setMode( OUString( "FilterMode" ) ); // listening for new controls of the selector Reference< XContainer > xContainer(xSelector, UNO_QUERY); @@ -3446,7 +3446,7 @@ void FormController::stopFiltering() Reference< XModeSelector > xSelector(xControl, UNO_QUERY); if (xSelector.is()) { - xSelector->setMode( ::rtl::OUString( "DataMode" ) ); + xSelector->setMode( OUString( "DataMode" ) ); // listening for new controls of the selector Reference< XContainer > xContainer(xSelector, UNO_QUERY); @@ -3468,7 +3468,7 @@ void FormController::stopFiltering() && ::comphelper::getBOOL( xField->getPropertyValue( FM_PROP_SEARCHABLE ) ) ) { - ::rtl::OUString sServiceName; + OUString sServiceName; OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DEFAULTCONTROL ) >>= sServiceName ); Reference< XControl > xNewControl( m_aContext.createComponent( sServiceName ), UNO_QUERY ); replaceControl( xControl, xNewControl ); @@ -3498,7 +3498,7 @@ void FormController::stopFiltering() // XModeSelector //------------------------------------------------------------------------------ -void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException ) +void FormController::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3526,7 +3526,7 @@ void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExcept } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL FormController::getMode(void) throw( RuntimeException ) +OUString SAL_CALL FormController::getMode(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3535,30 +3535,30 @@ void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExcept } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException ) +Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); - static Sequence< ::rtl::OUString > aModes; + static Sequence< OUString > aModes; if (!aModes.getLength()) { aModes.realloc(2); - ::rtl::OUString* pModes = aModes.getArray(); - pModes[0] = ::rtl::OUString( "DataMode" ); - pModes[1] = ::rtl::OUString( "FilterMode" ); + OUString* pModes = aModes.getArray(); + pModes[0] = OUString( "DataMode" ); + pModes[1] = OUString( "FilterMode" ); } return aModes; } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL FormController::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException ) +sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); - Sequence< ::rtl::OUString > aModes(getSupportedModes()); - const ::rtl::OUString* pModes = aModes.getConstArray(); + Sequence< OUString > aModes(getSupportedModes()); + const OUString* pModes = aModes.getConstArray(); for (sal_Int32 i = aModes.getLength(); i > 0; ) { if (pModes[--i] == Mode) @@ -3585,7 +3585,7 @@ Window* FormController::getDialogParentWindow() return pParentWindow; } //------------------------------------------------------------------------------ -bool FormController::checkFormComponentValidity( ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(()) +bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(()) { try { @@ -3676,7 +3676,7 @@ namespace { try { - static ::rtl::OUString s_sFormsCheckRequiredFields( "FormsCheckRequiredFields" ); + static OUString s_sFormsCheckRequiredFields( "FormsCheckRequiredFields" ); // first, check whether the form has a property telling us the answer // this allows people to use the XPropertyContainer interface of a form to control @@ -3698,7 +3698,7 @@ namespace return sal_True; Reference< XPropertySet > xDataSourceSettings( - xDataSource->getPropertyValue( ::rtl::OUString( "Settings" ) ), + xDataSource->getPropertyValue( OUString( "Settings" ) ), UNO_QUERY_THROW ); sal_Bool bShouldValidate = true; @@ -3739,7 +3739,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent return bValid; // if some of the control models are bound to validators, check them - ::rtl::OUString sInvalidityExplanation; + OUString sInvalidityExplanation; Reference< XControlModel > xInvalidModel; if ( !checkFormComponentValidity( sInvalidityExplanation, xInvalidModel ) ) { @@ -3783,7 +3783,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent continue; String sMessage( SVX_RES( RID_ERR_FIELDREQUIRED ) ); - sMessage.SearchAndReplace( rtl::OUString('#'), rColInfo.sName ); + sMessage.SearchAndReplace( OUString('#'), rColInfo.sName ); // the control to focus Reference< XControl > xControl( rColInfo.xFirstControlWithInputRequired ); @@ -3986,7 +3986,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& if (xParam.is()) { #ifdef DBG_UTIL - ::rtl::OUString sName; + OUString sName; xParam->getPropertyValue(FM_PROP_NAME) >>= sName; DBG_ASSERT(sName.equals(pFinalValues->Name), "FormController::approveParameter: suspicious value names!"); #endif @@ -4046,7 +4046,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th if ( nLength > 1 ) { sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS ); - sTitle.SearchAndReplace( rtl::OUString('#'), rtl::OUString::valueOf(nLength) ); + sTitle.SearchAndReplace( OUString('#'), OUString::valueOf(nLength) ); } else sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD ); @@ -4123,7 +4123,7 @@ void SAL_CALL FormController::invalidateAllFeatures( ) throw (RuntimeException) //------------------------------------------------------------------------------ Reference< XDispatch > FormController::interceptedQueryDispatch( const URL& aURL, - const ::rtl::OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/) + const OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/) throw( RuntimeException ) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 24aed5fa8f04..b86a38100f5e 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -71,7 +71,7 @@ namespace svx { struct FeatureDescription { - ::rtl::OUString sURL; // the URL + OUString sURL; // the URL sal_Int32 nSlotId; // the SFX-compatible slot ID sal_Int16 nFormFeature; // the css.form.runtime.FormFeature ID }; @@ -122,8 +122,8 @@ namespace svx //................................................................ struct MatchFeatureDescriptionByURL : public ::std::unary_function< FeatureDescription, bool > { - const ::rtl::OUString& m_rURL; - MatchFeatureDescriptionByURL( const ::rtl::OUString& _rURL ) :m_rURL( _rURL ) { } + const OUString& m_rURL; + MatchFeatureDescriptionByURL( const OUString& _rURL ) :m_rURL( _rURL ) { } bool operator()( const FeatureDescription& _compare ) { @@ -166,7 +166,7 @@ namespace svx } //-------------------------------------------------------------------- - sal_Int32 FeatureSlotTranslation::getControllerFeatureSlotIdForURL( const ::rtl::OUString& _rMainURL ) + sal_Int32 FeatureSlotTranslation::getControllerFeatureSlotIdForURL( const OUString& _rMainURL ) { const FeatureDescriptions& rDescriptions( getFeatureDescriptions() ); FeatureDescriptions::const_iterator pos = ::std::find_if( rDescriptions.begin(), rDescriptions.end(), MatchFeatureDescriptionByURL( _rMainURL ) ); @@ -325,7 +325,7 @@ namespace svx } //-------------------------------------------------------------------- - void FormControllerHelper::execute( sal_Int32 _nSlotId, const ::rtl::OUString& _rParamName, const Any& _rParamValue ) const + void FormControllerHelper::execute( sal_Int32 _nSlotId, const OUString& _rParamName, const Any& _rParamValue ) const { Sequence< NamedValue > aArguments(1); aArguments[0].Name = _rParamName; @@ -507,7 +507,7 @@ namespace svx bool bEscapeProcessing( false ); OSL_VERIFY( xCursorProperties->getPropertyValue( FM_PROP_ESCAPE_PROCESSING ) >>= bEscapeProcessing ); - ::rtl::OUString sActiveCommand; + OUString sActiveCommand; OSL_VERIFY( xCursorProperties->getPropertyValue( FM_PROP_ACTIVECOMMAND ) >>= sActiveCommand ); bool bInsertOnlyForm( false ); diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index d7ac47dab289..cfde37763c31 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -90,7 +90,7 @@ namespace svxform } //------------------------------------------------------------------------------ - Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException) + Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException) { ::osl::MutexGuard aGuard( *m_pMutex ); Reference< XDispatch> xResult; diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index 186f1a6f0be0..e15235269925 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -205,7 +205,7 @@ namespace svx void OSingleFeatureDispatcher::checkAlive() const SAL_THROW((DisposedException)) { if ( m_bDisposed ) - throw DisposedException( ::rtl::OUString(), *const_cast< OSingleFeatureDispatcher* >( this ) ); + throw DisposedException( OUString(), *const_cast< OSingleFeatureDispatcher* >( this ) ); } //........................................................................ diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 3c08fa690100..e978c9e59933 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -41,7 +41,7 @@ namespace svxform // the layout manager Reference< XPropertySet > xFrameProps( _rxFrame, UNO_QUERY ); if ( xFrameProps.is() ) - xFrameProps->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ) >>= m_xLayouter; + xFrameProps->getPropertyValue( OUString( "LayoutManager" ) ) >>= m_xLayouter; } //-------------------------------------------------------------------- @@ -53,7 +53,7 @@ namespace svxform OSL_ENSURE( xManager. is(), "FormToolboxes::toggleToolbox: couldn't obtain the layout manager!" ); if ( xManager. is() ) { - ::rtl::OUString sToolboxResource( getToolboxResourceName( _nSlotId ) ); + OUString sToolboxResource( getToolboxResourceName( _nSlotId ) ); if ( xManager->isElementVisible( sToolboxResource ) ) { xManager->hideElement( sToolboxResource ); @@ -80,7 +80,7 @@ namespace svxform } //-------------------------------------------------------------------- - ::rtl::OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const + OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const { OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ), "FormToolboxes::getToolboxResourceName: unsupported slot!" ); @@ -91,8 +91,8 @@ namespace svxform else if ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) pToolBarName = "formdesign"; - ::rtl::OUString aToolBarResStr( "private:resource/toolbar/" ); - aToolBarResStr += ::rtl::OUString::createFromAscii( pToolBarName ); + OUString aToolBarResStr( "private:resource/toolbar/" ); + aToolBarResStr += OUString::createFromAscii( pToolBarName ); return aToolBarResStr; } diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 90386864cae7..ac6279ea72b3 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -97,9 +97,9 @@ namespace svxform virtual void SAL_CALL activateLast( ) throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); private: const Reference< form::runtime::XFormController > m_xDelegator; @@ -178,16 +178,16 @@ namespace svxform } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL LegacyFormController::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL LegacyFormController::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.svx.LegacyFormController" ); + return OUString( "org.openoffice.comp.svx.LegacyFormController" ); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL LegacyFormController::supportsService( const ::rtl::OUString& _serviceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() ); - const ::rtl::OUString* pServices = aServices.getConstArray(); + Sequence< OUString > aServices( getSupportedServiceNames() ); + const OUString* pServices = aServices.getConstArray(); for ( sal_Int32 i = 0; i < aServices.getLength(); ++i, ++pServices ) if( pServices->equals( _serviceName ) ) return sal_True; @@ -195,11 +195,11 @@ namespace svxform } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices(2); - aServices.getArray()[0] = ::rtl::OUString( "com.sun.star.form.FormController" ); - aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.control.TabController"); + Sequence< OUString > aServices(2); + aServices.getArray()[0] = OUString( "com.sun.star.form.FormController" ); + aServices.getArray()[1] = OUString("com.sun.star.awt.control.TabController"); return aServices; } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 10a3e0ad793d..248428d5805b 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -466,7 +466,7 @@ namespace svxform pFormModel->BegUndo(aUndoStr); // dieser Slot war guletig bei (genau) einem selektierten Formular - rtl::OUString fControlName = FM_COMPONENT_HIDDEN; + OUString fControlName = FM_COMPONENT_HIDDEN; NewControl( fControlName, *m_arrCurrentSelection.begin() ); pFormModel->EndUndo(); @@ -1001,7 +1001,7 @@ namespace svxform for (sal_Int32 i=0; i xNewPropSet( pNewControlData->GetPropertySet() ); @@ -1019,7 +1019,7 @@ namespace svxform Property* pAllCurrentProps = seqAllCurrentProps.getArray(); for (sal_Int32 j=0; jSetText(aName); Reference< XPropertySet > xPropertySet(xNewForm, UNO_QUERY); @@ -1414,7 +1414,7 @@ namespace svxform } //------------------------------------------------------------------------ - FmControlData* NavigatorTree::NewControl( const ::rtl::OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName ) + FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NewControl" ); ////////////////////////////////////////////////////////////////////// @@ -1441,7 +1441,7 @@ namespace svxform SdrPageView* pPageView = pFormView->GetSdrPageView(); FmFormPage* pPage = (FmFormPage*)pPageView->GetPage(); - ::rtl::OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm ); + OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm ); pNewFormControlData->SetText( sName ); @@ -1463,11 +1463,11 @@ namespace svxform } //------------------------------------------------------------------------ - ::rtl::OUString NavigatorTree::GenerateName( FmEntryData* pEntryData ) + OUString NavigatorTree::GenerateName( FmEntryData* pEntryData ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::GenerateName" ); const sal_uInt16 nMaxCount = 99; - ::rtl::OUString aNewName; + OUString aNewName; ////////////////////////////////////////////////////////////////////// // BasisNamen erzeugen @@ -1486,8 +1486,8 @@ namespace svxform aNewName = aBaseName; if( i>0 ) { - aNewName += ::rtl::OUString(" "); - aNewName += ::rtl::OUString::valueOf(i).getStr(); + aNewName += OUString(" "); + aNewName += OUString::valueOf(i).getStr(); } if( GetNavModel()->FindData(aNewName, pFormParentData,sal_False) == NULL ) @@ -1498,7 +1498,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) + sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::EditedEntry" ); if (EditingCanceled()) diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 75ce4f9be5c6..4187473ef9b3 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -92,7 +92,7 @@ namespace svxform if( pEntryData ) { - ::rtl::OUString aNewName = ::comphelper::getString(evt.NewValue); + OUString aNewName = ::comphelper::getString(evt.NewValue); pEntryData->SetText( aNewName ); FmNavNameChangedHint aNameChangedHint( pEntryData, aNewName ); m_pNavModel->Broadcast( aNameChangedHint ); @@ -307,7 +307,7 @@ namespace svxform if( bUndo ) { XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + aUndoStr.SearchAndReplace(OUString('#'), aStr); m_pFormModel->BegUndo(aUndoStr); } @@ -406,7 +406,7 @@ namespace svxform if( bUndo ) { XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE)); - aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); + aUndoStr.SearchAndReplace(OUString('#'), aStr); m_pFormModel->BegUndo(aUndoStr); } } @@ -689,7 +689,7 @@ namespace svxform } //------------------------------------------------------------------------ - FmEntryData* NavigatorTreeModel::FindData( const ::rtl::OUString& rText, FmFormData* pParentData, sal_Bool bRecurs ) + FmEntryData* NavigatorTreeModel::FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::FindData" ); FmEntryDataList* pDataList; @@ -698,7 +698,7 @@ namespace svxform else pDataList = pParentData->GetChildList(); - ::rtl::OUString aEntryText; + OUString aEntryText; FmEntryData* pEntryData; FmEntryData* pChildData; @@ -948,7 +948,7 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const ::rtl::OUString& rNewText ) + sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const OUString& rNewText ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Rename" ); ////////////////////////////////////////////////////////////////////// diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index fe40442292d5..6db70cd93e95 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -55,32 +55,32 @@ namespace svxform return m_xPropertySet->getPropertySetInfo(); } - void DataColumn::setPropertyValue(const ::rtl::OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) + void DataColumn::setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) { m_xPropertySet->setPropertyValue(aPropertyName, aValue); } - Any DataColumn::getPropertyValue(const ::rtl::OUString& PropertyName) const throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + Any DataColumn::getPropertyValue(const OUString& PropertyName) const throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { return m_xPropertySet->getPropertyValue(PropertyName); } - void DataColumn::addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener>& xListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + void DataColumn::addPropertyChangeListener(const OUString& aPropertyName, const Reference< XPropertyChangeListener>& xListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { m_xPropertySet->addPropertyChangeListener(aPropertyName, xListener); } - void DataColumn::removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + void DataColumn::removePropertyChangeListener(const OUString& aPropertyName, const Reference< XPropertyChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { m_xPropertySet->removePropertyChangeListener(aPropertyName, aListener); } - void DataColumn::addVetoableChangeListener(const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + void DataColumn::addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { m_xPropertySet->addVetoableChangeListener(PropertyName, aListener); } - void DataColumn::removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + void DataColumn::removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { m_xPropertySet->removeVetoableChangeListener(PropertyName, aListener); } @@ -91,7 +91,7 @@ namespace svxform return m_xColumn->wasNull(); } - ::rtl::OUString DataColumn::getString() throw( SQLException, RuntimeException ) + OUString DataColumn::getString() throw( SQLException, RuntimeException ) { return m_xColumn->getString(); } @@ -227,7 +227,7 @@ namespace svxform m_xColumnUpdate->updateDouble(x); } - void DataColumn::updateString(const ::rtl::OUString& x) throw( SQLException, RuntimeException ) + void DataColumn::updateString(const OUString& x) throw( SQLException, RuntimeException ) { m_xColumnUpdate->updateString(x); } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index a7d96f60ef0f..a7af1eca6015 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -75,16 +75,16 @@ using namespace ::svx; struct ColumnInfo { - ::rtl::OUString sColumnName; - ::rtl::OUString sLabel; + OUString sColumnName; + OUString sLabel; bool bColumn; - ColumnInfo(const ::rtl::OUString& i_sColumnName,const ::rtl::OUString& i_sLabel) + ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel) : sColumnName(i_sColumnName) , sLabel(i_sLabel) , bColumn(true) { } - ColumnInfo(const ::rtl::OUString& i_sColumnName) + ColumnInfo(const OUString& i_sColumnName) : sColumnName(i_sColumnName) , bColumn(false) { @@ -93,13 +93,13 @@ struct ColumnInfo static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns ) { - uno::Sequence< ::rtl::OUString > aEntries = i_xColumns->getElementNames(); - const ::rtl::OUString* pEntries = aEntries.getConstArray(); + uno::Sequence< OUString > aEntries = i_xColumns->getElementNames(); + const OUString* pEntries = aEntries.getConstArray(); sal_Int32 nEntries = aEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) { uno::Reference< beans::XPropertySet> xColumn(i_xColumns->getByName(*pEntries),UNO_QUERY_THROW); - ::rtl::OUString sLabel; + OUString sLabel; if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) ) xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) @@ -254,7 +254,7 @@ sal_Bool FmFieldWin::createSelectionControls( ) aDescr[ daCommand ] <<= GetObjectName(); aDescr[ daCommandType ] <<= GetObjectType(); ColumnInfo* pInfo = static_cast(pSelected->GetUserData()); - aDescr[ daColumnName ] <<= pInfo->sColumnName;//::rtl::OUString( pListBox->GetEntryText( pSelected) ); + aDescr[ daColumnName ] <<= pInfo->sColumnName;//OUString( pListBox->GetEntryText( pSelected) ); // transfer this to the SFX world SfxUnoAnyItem aDescriptorItem( SID_FM_DATACCESS_DESCRIPTOR, makeAny( aDescr.createPropertyValueSequence() ) ); diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 7a6dcd4fd59c..8819e8067781 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -85,10 +85,10 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce ) Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "Position" ); + aArgs[0].Name = OUString( "Position" ); aPositionParam.QueryValue( a ); aArgs[0].Value = a; - m_pController->Dispatch( rtl::OUString( ".uno:AbsoluteRecord" ), + m_pController->Dispatch( OUString( ".uno:AbsoluteRecord" ), aArgs ); m_pController->updateStatus(); @@ -191,8 +191,8 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const case SID_FM_SCROLLBAR: case SID_FM_SPINBUTTON: { // set a new image, matching to this slot - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlot )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nSlot )); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); GetToolBox().SetItemImage( GetId(), aImage ); nLastSlot = nSlot; @@ -238,7 +238,7 @@ void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ ) if ( SlotToCommands[n].nSlotId > 0 ) { Sequence< PropertyValue > aArgs; - Dispatch( rtl::OUString::createFromAscii( SlotToCommands[n].pCommand ), + Dispatch( OUString::createFromAscii( SlotToCommands[n].pCommand ), aArgs ); } } diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index ec085745639a..c16e67ed5d14 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -50,17 +50,17 @@ namespace svxform } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() + Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() { ::comphelper::StringSequence aSupported( 1 ); - aSupported.getArray()[0] = ::rtl::OUString( "com.sun.star.xforms.ui.dialogs.AddCondition" ); + aSupported.getArray()[0] = OUString( "com.sun.star.xforms.ui.dialogs.AddCondition" ); return aSupported; } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAddConditionDialog_GetImplementationName() + OUString SAL_CALL OAddConditionDialog_GetImplementationName() { - return ::rtl::OUString("org.openoffice.comp.svx.OAddConditionDialog"); + return OUString("org.openoffice.comp.svx.OAddConditionDialog"); } //==================================================================== @@ -71,7 +71,7 @@ namespace svxform :OAddConditionDialogBase( _rxORB ) { registerProperty( - ::rtl::OUString( "Binding" ), + OUString( "Binding" ), PROPERTY_ID_BINDING, PropertyAttribute::TRANSIENT, &m_xBinding, @@ -79,7 +79,7 @@ namespace svxform ); registerProperty( - ::rtl::OUString( "FacetName" ), + OUString( "FacetName" ), PROPERTY_ID_FACET_NAME, PropertyAttribute::TRANSIENT, &m_sFacetName, @@ -87,7 +87,7 @@ namespace svxform ); registerProperty( - ::rtl::OUString( "ConditionValue" ), + OUString( "ConditionValue" ), PROPERTY_ID_CONDITION_VALUE, PropertyAttribute::TRANSIENT, &m_sConditionValue, @@ -95,7 +95,7 @@ namespace svxform ); registerProperty( - ::rtl::OUString( "FormModel" ), + OUString( "FormModel" ), PROPERTY_ID_FORM_MODEL, PropertyAttribute::TRANSIENT, &m_xWorkModel, @@ -126,13 +126,13 @@ namespace svxform } //------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException) { return OAddConditionDialog_GetImplementationName(); } //------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException) { return OAddConditionDialog_GetSupportedServiceNames(); } @@ -161,7 +161,7 @@ namespace svxform Dialog* OAddConditionDialog::createDialog(Window* _pParent) { if ( !m_xBinding.is() || m_sFacetName.isEmpty() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); return new AddConditionDialog( _pParent, m_sFacetName, m_xBinding ); } diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 12981a04d891..1c505c797c81 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -144,13 +144,13 @@ sal_Bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vectorGetThemeName( nThemeId ), rObjList ); } -bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector &rObjList ) +bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector &rObjList ) { std::vector aObjList; if (!FillObjList(nThemeId, aObjList)) return false; - std::vector aList; + std::vector aList; aList.reserve(aObjList.size()); std::vector::const_iterator it = aObjList.begin(), itEnd = aObjList.end(); for (; it != itEnd; ++it) @@ -162,7 +162,7 @@ bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector& rList ) +sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList ) { Gallery* pGal = ImplGetGallery(); if( pGal ) @@ -177,7 +177,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect SgaObject* pObj = pTheme->AcquireObject( i ); if ( pObj ) { - rtl::OUString aTitle( pObj->GetTitle() ); + OUString aTitle( pObj->GetTitle() ); rList.push_back( aTitle ); pTheme->ReleaseObject( pObj ); } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 4baf9166a6c3..7adec4461277 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -99,7 +99,7 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL // ----------------------------------------------------------------------------- -void GalleryThemeEntry::SetName( const rtl::OUString& rNewName ) +void GalleryThemeEntry::SetName( const OUString& rNewName ) { if( aName != rNewName ) { @@ -127,9 +127,9 @@ SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); write_lenPrefixed_uInt8s_FromOUString(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rtl::OUString(), RTL_TEXTENCODING_UTF8); //aImportName + write_lenPrefixed_uInt8s_FromOUString(rOut, OUString(), RTL_TEXTENCODING_UTF8); //aImportName - write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); + write_lenPrefixed_uInt8s_FromOString(rOut, OString()); return rOut; } @@ -170,7 +170,7 @@ public: // - Gallery - // ----------- -Gallery::Gallery( const rtl::OUString& rMultiPath ) +Gallery::Gallery( const OUString& rMultiPath ) : nReadTextEncoding ( osl_getThreadTextEncoding() ) , nLastFileNumber ( 0 ) , bMultiPath ( sal_False ) @@ -213,7 +213,7 @@ Gallery* Gallery::GetGalleryInstance() // ------------------------------------------------------------------------ -void Gallery::ImplLoad( const rtl::OUString& rMultiPath ) +void Gallery::ImplLoad( const OUString& rMultiPath ) { const sal_Int32 nTokenCount = comphelper::string::getTokenCount(rMultiPath, ';'); sal_Bool bIsReadOnlyDir; @@ -301,10 +301,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR if( xContentAccess.is() ) { - static const ::rtl::OUString s_sTitle("Title"); - static const ::rtl::OUString s_sIsReadOnly("IsReadOnly"); - static const ::rtl::OUString s_sSDG_EXT("sdg"); - static const ::rtl::OUString s_sSDV_EXT("sdv"); + static const OUString s_sTitle("Title"); + static const OUString s_sIsReadOnly("IsReadOnly"); + static const OUString s_sSDG_EXT("sdg"); + static const OUString s_sSDV_EXT("sdv"); while( xResultSet->next() ) { @@ -443,7 +443,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR // ------------------------------------------------------------------------ -GalleryThemeEntry* Gallery::ImplGetThemeEntry( const rtl::OUString& rThemeName ) +GalleryThemeEntry* Gallery::ImplGetThemeEntry( const OUString& rThemeName ) { GalleryThemeEntry* pFound = NULL; @@ -459,7 +459,7 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const rtl::OUString& rThemeName ) // ------------------------------------------------------------------------ -rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const +OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const { GalleryThemeEntry* pFound = NULL; @@ -473,7 +473,7 @@ rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const // try fallback, if no entry was found if( !pFound ) { - rtl::OString aFallback; + OString aFallback; switch( nThemeId ) { @@ -502,10 +502,10 @@ rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const break; } - pFound = const_cast(this)->ImplGetThemeEntry(rtl::OStringToOUString(aFallback, RTL_TEXTENCODING_ASCII_US)); + pFound = const_cast(this)->ImplGetThemeEntry(OStringToOUString(aFallback, RTL_TEXTENCODING_ASCII_US)); } - return( pFound ? pFound->GetThemeName() : rtl::OUString() ); + return( pFound ? pFound->GetThemeName() : OUString() ); } // ------------------------------------------------------------------------ diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index fc6834fa3673..b22091e086db 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -398,7 +398,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) : if( xMgr.is() ) { uno::Reference< awt::XProgressMonitor > xMonitor( xMgr->createInstance( - ::rtl::OUString("com.sun.star.awt.XProgressMonitor") ), + OUString("com.sun.star.awt.XProgressMonitor") ), uno::UNO_QUERY ); if ( xMonitor.is() ) diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 4fdc2bc3aeb4..6ef09c95adbe 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -177,7 +177,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) else rIn >> aThumbMtf; - rtl::OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); aURL = INetURLObject(aTmpStr); } @@ -196,7 +196,7 @@ const String SgaObject::GetTitle() const if ( aPrivateInd.EqualsAscii( "private" ) && aResourceName.Len() && ( nResId > 0 ) && ( nResId < 0x10000 ) ) { - rtl::OString aMgrName(rtl::OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8)); + OString aMgrName(OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8)); ResMgr* pResMgr = ResMgr::CreateResMgr( aMgrName.getStr(), Application::GetSettings().GetUILanguageTag() ); if ( pResMgr ) @@ -285,7 +285,7 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const SgaObject::WriteData( rOut, rDestDir ); char aDummy[ 10 ]; rOut.Write( aDummy, 10 ); - write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); //dummy + write_lenPrefixed_uInt8s_FromOString(rOut, OString()); //dummy write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 952898b9cf22..44188f1f2d18 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -711,8 +711,8 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa { sal_uInt32 nThemeId = 0; - rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(*pIStm); - aThemeName = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); + OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(*pIStm); + aThemeName = OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); // Charakterkonvertierung durchfuehren if( nVersion >= 0x0004 ) @@ -1241,7 +1241,7 @@ sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::X if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aLocalURL; + OUString aLocalURL; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFile, aLocalURL ) ) aURL = INetURLObject( aLocalURL ); @@ -1411,7 +1411,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) rtl_TextEncoding nTextEncoding; rIStm >> nVersion; - rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(rIStm); + OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> nCount; if( nVersion >= 0x0004 ) @@ -1423,7 +1423,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) else nTextEncoding = RTL_TEXTENCODING_UTF8; - aThemeName = rtl::OStringToOUString(aTmpStr, nTextEncoding); + aThemeName = OStringToOUString(aTmpStr, nTextEncoding); if( nCount <= ( 1L << 14 ) ) { @@ -1451,11 +1451,11 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) sal_uInt16 nTemp; rIStm >> bRel; - rtl::OString aTempFileName = read_lenPrefixed_uInt8s_ToOString(rIStm); + OString aTempFileName = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> pObj->nOffset; rIStm >> nTemp; pObj->eObjKind = (SgaObjKind) nTemp; - aFileName = rtl::OStringToOUString(aTempFileName, osl_getThreadTextEncoding()); + aFileName = OStringToOUString(aTempFileName, osl_getThreadTextEncoding()); if( bRel ) { @@ -1493,7 +1493,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) } else { - rtl::OUString aLocalURL; + OUString aLocalURL; pObj->aURL = INetURLObject( aFileName ); @@ -1557,7 +1557,7 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ) void GalleryTheme::ImplSetModified( sal_Bool bModified ) { pThm->SetModified( bModified ); } -const rtl::OUString& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } +const OUString& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); } const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); } const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); } @@ -1567,7 +1567,7 @@ sal_Bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFrom sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); } sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); } sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); } -const rtl::OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); } +const OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); } void GalleryTheme::InsertAllThemes( ListBox& rListBox ) { diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 346ace097ea4..b85380143f66 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -67,7 +67,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::lang; -typedef ::std::list FileNameList; +typedef ::std::list FileNameList; class GalApp : public Application { @@ -79,7 +79,7 @@ protected: void Init(); }; -Gallery* createGallery( const rtl::OUString& aGalleryURL ) +Gallery* createGallery( const OUString& aGalleryURL ) { return new Gallery( aGalleryURL ); } @@ -89,9 +89,9 @@ void disposeGallery( Gallery* pGallery ) delete pGallery; } -static void createTheme( rtl::OUString aThemeName, - rtl::OUString aGalleryURL, - rtl::OUString aDestDir, +static void createTheme( OUString aThemeName, + OUString aGalleryURL, + OUString aDestDir, sal_uInt32 nNumFrom, FileNameList &rFiles ) { @@ -99,11 +99,11 @@ static void createTheme( rtl::OUString aThemeName, if (!pGallery ) { fprintf( stderr, "Could't acquire '%s'\n", - rtl::OUStringToOString(aGalleryURL, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aGalleryURL, RTL_TEXTENCODING_UTF8).getStr() ); exit( 1 ); } fprintf( stderr, "Work on gallery '%s'\n", - rtl::OUStringToOString(aGalleryURL, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aGalleryURL, RTL_TEXTENCODING_UTF8).getStr() ); fprintf( stderr, "Existing themes: %lu\n", sal::static_int_cast< unsigned long >( @@ -131,7 +131,7 @@ static void createTheme( rtl::OUString aThemeName, } fprintf( stderr, "Using DestDir: %s\n", - rtl::OUStringToOString(aDestDir, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aDestDir, RTL_TEXTENCODING_UTF8).getStr() ); pGalTheme->SetDestDir(String(aDestDir)); FileNameList::const_iterator aIter; @@ -146,10 +146,10 @@ static void createTheme( rtl::OUString aThemeName, if ( ! pGalTheme->InsertURL( *aIter ) ) fprintf( stderr, "Failed to import '%s'\n", - rtl::OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr() ); else fprintf( stderr, "Imported file '%s' (%lu)\n", - rtl::OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8).getStr(), sal::static_int_cast< unsigned long >( pGalTheme->GetObjectCount() ) ); } @@ -178,7 +178,7 @@ static void PrintHelp() fprintf( stdout, "\t\t\tare required.\n"); } -static rtl::OUString Smartify( const rtl::OUString &rPath ) +static OUString Smartify( const OUString &rPath ) { INetURLObject aURL; aURL.SetSmartURL( rPath ); @@ -188,7 +188,7 @@ static rtl::OUString Smartify( const rtl::OUString &rPath ) void GalApp::Init() { if( getenv( "OOO_INSTALL_PREFIX" ) == NULL ) { - rtl::OUString fileName = GetAppFileName(); + OUString fileName = GetAppFileName(); int lastSlash = fileName.lastIndexOf( '/' ); #ifdef WNT // Don't know which directory separators GetAppFileName() returns on Windows. @@ -196,10 +196,10 @@ void GalApp::Init() if( fileName.lastIndexOf( '\\' ) > lastSlash ) lastSlash = fileName.lastIndexOf( '\\' ); #endif - rtl::OUString baseBinDir = fileName.copy( 0, lastSlash ); - rtl::OUString installPrefix = baseBinDir + rtl::OUString("/../.."); + OUString baseBinDir = fileName.copy( 0, lastSlash ); + OUString installPrefix = baseBinDir + OUString("/../.."); - rtl::OUString envVar("OOO_INSTALL_PREFIX"); + OUString envVar("OOO_INSTALL_PREFIX"); osl_setEnvironment(envVar.pData, installPrefix.pData); } OSL_TRACE( "OOO_INSTALL_PREFIX=%s", getenv( "OOO_INSTALL_PREFIX" ) ); @@ -220,14 +220,14 @@ void GalApp::Init() int GalApp::Main() { bool bHelp = false; - rtl::OUString aPath, aDestDir; - rtl::OUString aName("Default name"); + OUString aPath, aDestDir; + OUString aName("Default name"); sal_uInt32 nNumFrom = 0; FileNameList aFiles; for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ ) { - rtl::OUString aParam = GetCommandLineParam( i ); + OUString aParam = GetCommandLineParam( i ); if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) || aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) ) diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index bfe358b18c9b..70d5c3e1296b 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -70,8 +70,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -100,9 +100,9 @@ public: virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); void Invalidate(); void NotifyFocusListeners(sal_Bool bGetFocus); diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index bebe0520e0d3..dd6e40d2675f 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -86,8 +86,8 @@ public: SvxGraphCtrlAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, GraphCtrl& rRepresentation, - const ::rtl::OUString* pName = NULL, - const ::rtl::OUString* pDescription = NULL ); + const OUString* pName = NULL, + const OUString* pDescription = NULL ); void Notify( SfxBroadcaster& aBC, const SfxHint& aHint ); @@ -127,8 +127,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException); @@ -142,9 +142,9 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); //===== XTypeProvider =================================================== @@ -152,7 +152,7 @@ public: //===== XServiceName ==================================================== - virtual ::rtl::OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleSelection ============================================= @@ -223,11 +223,11 @@ private: /** Description of this object. This is not a constant because it can be set from the outside. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. */ - ::rtl::OUString msName; + OUString msName; /// map of accessible shapes struct SdrObjectCompareLess diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index d9abdb9a30cf..b389e5909092 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -64,8 +64,8 @@ namespace svx virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); @@ -145,8 +145,8 @@ namespace svx virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); @@ -157,8 +157,8 @@ namespace svx // XAccessibleTable virtual sal_Int32 SAL_CALL getAccessibleRowCount( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException); @@ -241,8 +241,8 @@ namespace svx virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 1d05ad23fb9d..e12630733add 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -375,7 +375,7 @@ namespace svxform HelpButton m_aHelpBtn; Timer m_aResultTimer; - ::rtl::OUString m_sPropertyName; + OUString m_sPropertyName; XFormsUIHelper1_ref m_xUIHelper; XPropertySet_ref m_xBinding; @@ -387,7 +387,7 @@ namespace svxform public: AddConditionDialog( Window* pParent, - const ::rtl::OUString& _rPropertyName, const XPropertySet_ref& _rBinding ); + const OUString& _rPropertyName, const XPropertySet_ref& _rBinding ); ~AddConditionDialog(); inline XFormsUIHelper1_ref GetUIHelper() const { return m_xUIHelper; } @@ -405,7 +405,7 @@ namespace svxform class NamespaceItemDialog : public ModalDialog { private: - typedef std::vector< ::rtl::OUString > PrefixList; + typedef std::vector< OUString > PrefixList; FixedText m_aNamespacesFT; SvxSimpleTableContainer m_aNamespacesListContainer; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 94f12a5820c4..1c0358003830 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -38,35 +38,35 @@ #include -#define RECOVERY_CMDPART_PROTOCOL rtl::OUString( "vnd.sun.star.autorecovery:") +#define RECOVERY_CMDPART_PROTOCOL OUString( "vnd.sun.star.autorecovery:") -#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString( "/doEmergencySave" ) -#define RECOVERY_CMDPART_DO_RECOVERY rtl::OUString( "/doAutoRecovery" ) -#define RECOVERY_CMDPART_DO_CRASHREPORT rtl::OUString( "/doCrashReport" ) +#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE OUString( "/doEmergencySave" ) +#define RECOVERY_CMDPART_DO_RECOVERY OUString( "/doAutoRecovery" ) +#define RECOVERY_CMDPART_DO_CRASHREPORT OUString( "/doCrashReport" ) -#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE rtl::OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave") -#define RECOVERY_CMD_DO_EMERGENCY_SAVE rtl::OUString( "vnd.sun.star.autorecovery:/doEmergencySave" ) -#define RECOVERY_CMD_DO_RECOVERY rtl::OUString( "vnd.sun.star.autorecovery:/doAutoRecovery" ) -#define RECOVERY_CMD_DO_ENTRY_BACKUP rtl::OUString( "vnd.sun.star.autorecovery:/doEntryBackup" ) -#define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp" ) +#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave") +#define RECOVERY_CMD_DO_EMERGENCY_SAVE OUString( "vnd.sun.star.autorecovery:/doEmergencySave" ) +#define RECOVERY_CMD_DO_RECOVERY OUString( "vnd.sun.star.autorecovery:/doAutoRecovery" ) +#define RECOVERY_CMD_DO_ENTRY_BACKUP OUString( "vnd.sun.star.autorecovery:/doEntryBackup" ) +#define RECOVERY_CMD_DO_ENTRY_CLEANUP OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp" ) -#define PROP_STATUSINDICATOR rtl::OUString( "StatusIndicator" ) -#define PROP_DISPATCHASYNCHRON rtl::OUString( "DispatchAsynchron") -#define PROP_SAVEPATH rtl::OUString( "SavePath" ) -#define PROP_ENTRYID rtl::OUString( "EntryID" ) +#define PROP_STATUSINDICATOR OUString( "StatusIndicator" ) +#define PROP_DISPATCHASYNCHRON OUString( "DispatchAsynchron") +#define PROP_SAVEPATH OUString( "SavePath" ) +#define PROP_ENTRYID OUString( "EntryID" ) -#define STATEPROP_ID rtl::OUString( "ID" ) -#define STATEPROP_STATE rtl::OUString( "DocumentState") -#define STATEPROP_ORGURL rtl::OUString( "OriginalURL" ) -#define STATEPROP_TEMPURL rtl::OUString( "TempURL" ) -#define STATEPROP_FACTORYURL rtl::OUString( "FactoryURL" ) -#define STATEPROP_TEMPLATEURL rtl::OUString( "TemplateURL" ) -#define STATEPROP_TITLE rtl::OUString( "Title" ) -#define STATEPROP_MODULE rtl::OUString( "Module" ) +#define STATEPROP_ID OUString( "ID" ) +#define STATEPROP_STATE OUString( "DocumentState") +#define STATEPROP_ORGURL OUString( "OriginalURL" ) +#define STATEPROP_TEMPURL OUString( "TempURL" ) +#define STATEPROP_FACTORYURL OUString( "FactoryURL" ) +#define STATEPROP_TEMPLATEURL OUString( "TemplateURL" ) +#define STATEPROP_TITLE OUString( "Title" ) +#define STATEPROP_MODULE OUString( "Module" ) -#define RECOVERY_OPERATIONSTATE_START rtl::OUString( "start" ) -#define RECOVERY_OPERATIONSTATE_STOP rtl::OUString( "stop" ) -#define RECOVERY_OPERATIONSTATE_UPDATE rtl::OUString( "update") +#define RECOVERY_OPERATIONSTATE_START OUString( "start" ) +#define RECOVERY_OPERATIONSTATE_STOP OUString( "stop" ) +#define RECOVERY_OPERATIONSTATE_UPDATE OUString( "update") #define DLG_RET_UNKNOWN -1 #define DLG_RET_OK 1 @@ -125,22 +125,22 @@ struct TURLInfo sal_Int32 ID; /// the full qualified document URL - ::rtl::OUString OrgURL; + OUString OrgURL; /// the full qualified URL of the temp. file (if it's exists) - ::rtl::OUString TempURL; + OUString TempURL; /// a may be existing factory URL (e.g. for untitled documents) - ::rtl::OUString FactoryURL; + OUString FactoryURL; /// may be the document base on a template file !? - ::rtl::OUString TemplateURL; + OUString TemplateURL; /// the pure file name, without path, disc etcpp. - ::rtl::OUString DisplayName; + OUString DisplayName; /// the application module, where this document was loaded - ::rtl::OUString Module; + OUString Module; /// state info as e.g. VALID, CORRUPTED, NON EXISTING ... sal_Int32 DocState; @@ -243,8 +243,8 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener //--------------------------------------- /** @short TODO */ static bool isBrokenTempEntry(const TURLInfo& rInfo); - virtual void saveBrokenTempEntries(const ::rtl::OUString& sSaveDir); - virtual void saveAllTempEntries(const ::rtl::OUString& sSaveDir); + virtual void saveBrokenTempEntries(const OUString& sSaveDir); + virtual void saveAllTempEntries(const OUString& sSaveDir); virtual void forgetBrokenTempEntries(); virtual void forgetAllRecoveryEntries(); void forgetBrokenRecoveryEntries(); @@ -295,7 +295,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener //--------------------------------------- /** @short TODO */ - css::util::URL impl_getParsedURL(const ::rtl::OUString& sURL); + css::util::URL impl_getParsedURL(const OUString& sURL); }; //=============================================== @@ -346,14 +346,14 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat //--------------------------------------- // XStatusIndicator - virtual void SAL_CALL start(const ::rtl::OUString& sText , + virtual void SAL_CALL start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException); virtual void SAL_CALL end() throw(css::uno::RuntimeException); - virtual void SAL_CALL setText(const ::rtl::OUString& sText) + virtual void SAL_CALL setText(const OUString& sText) throw(css::uno::RuntimeException); virtual void SAL_CALL setValue(sal_Int32 nValue) @@ -696,7 +696,7 @@ class BrokenRecoveryDialog : public ModalDialog OKButton m_aOkBtn; CancelButton m_aCancelBtn; - ::rtl::OUString m_sSavePath; + OUString m_sSavePath; RecoveryCore* m_pCore; bool m_bBeforeRecovery; sal_Bool m_bExecutionNeeded; @@ -721,7 +721,7 @@ class BrokenRecoveryDialog : public ModalDialog //--------------------------------------- /** @short TODO */ - virtual ::rtl::OUString getSaveDirURL(); + virtual OUString getSaveDirURL(); //------------------------------------------- // helper diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index aeaee7408cc1..79d01cc59ea4 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -60,19 +60,19 @@ class FmFilterData { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; FmParentData* m_pParent; - ::rtl::OUString m_aText; + OUString m_aText; public: TYPEINFO(); - FmFilterData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent = NULL, const ::rtl::OUString& rText = ::rtl::OUString()) + FmFilterData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent = NULL, const OUString& rText = OUString()) :m_xORB( _rxFactory ) ,m_pParent( pParent ) ,m_aText( rText ) {} virtual ~FmFilterData(){} - void SetText( const ::rtl::OUString& rText ){ m_aText = rText; } - ::rtl::OUString GetText() const { return m_aText; } + void SetText( const OUString& rText ){ m_aText = rText; } + OUString GetText() const { return m_aText; } FmParentData* GetParent() const {return m_pParent;} virtual Image GetImage() const; @@ -86,7 +86,7 @@ protected: public: TYPEINFO(); - FmParentData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent, const ::rtl::OUString& rText) + FmParentData(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* pParent, const OUString& rText) : FmFilterData(_rxFactory,pParent, rText) {} virtual ~FmParentData(); @@ -106,7 +106,7 @@ public: FmFormItem( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmParentData* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & _xController, - const ::rtl::OUString& _rText) + const OUString& _rText) :FmParentData( _rxFactory, _pParent, _rText ) ,m_xController( _xController ) ,m_xFilterController( _xController, ::com::sun::star::uno::UNO_QUERY_THROW ) @@ -127,8 +127,8 @@ class FmFilterItems : public FmParentData { public: TYPEINFO(); - FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory):FmParentData(_rxFactory,NULL, ::rtl::OUString()){} - FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmFormItem* pParent, const ::rtl::OUString& rText ):FmParentData(_rxFactory,pParent, rText){} + FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory):FmParentData(_rxFactory,NULL, OUString()){} + FmFilterItems(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,FmFormItem* pParent, const OUString& rText ):FmParentData(_rxFactory,pParent, rText){} FmFilterItem* Find( const ::sal_Int32 _nFilterComponentIndex ) const; virtual Image GetImage() const; @@ -137,7 +137,7 @@ public: //======================================================================== class FmFilterItem : public FmFilterData { - ::rtl::OUString m_aFieldName; + OUString m_aFieldName; const sal_Int32 m_nComponentIndex; public: @@ -145,12 +145,12 @@ public: FmFilterItem( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory, FmFilterItems* pParent, - const ::rtl::OUString& aFieldName, - const ::rtl::OUString& aCondition, + const OUString& aFieldName, + const OUString& aCondition, const sal_Int32 _nComponentIndex ); - const ::rtl::OUString& GetFieldName() const {return m_aFieldName;} + const OUString& GetFieldName() const {return m_aFieldName;} sal_Int32 GetComponentIndex() const { return m_nComponentIndex; } virtual Image GetImage() const; @@ -178,7 +178,7 @@ public: void Clear(); sal_Bool ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const; void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem); - void SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& rText); + void SetTextForItem(FmFilterItem* pItem, const OUString& rText); FmFormItem* GetCurrentForm() const {return m_pCurrentItems ? (FmFormItem*)m_pCurrentItems->GetParent() : NULL;} FmFilterItems* GetCurrentItems() const {return m_pCurrentItems;} @@ -278,7 +278,7 @@ protected: virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind); virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index 2d8c72393058..50ef095c47aa 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -45,7 +45,7 @@ class FmPropBrw : public SfxFloatingWindow, public SfxControllerItem { sal_Bool m_bInitialStateChange; bool m_bInStateChange; - ::rtl::OUString m_sLastActivePage; + OUString m_sLastActivePage; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xInspectorContext; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > @@ -73,7 +73,7 @@ protected: void implSetNewSelection( const InterfaceBag& _rSelection ); void implDetachController(); bool implIsReadOnlyModel() const; - ::rtl::OUString getCurrentPage() const; + OUString getCurrentPage() const; public: FmPropBrw( diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 39251abcd023..a7caef5bbf8c 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -97,7 +97,7 @@ namespace svxform struct ControlData : public BorderDescriptor, UnderlineDescriptor { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl; - ::rtl::OUString sOriginalHelpText; + OUString sOriginalHelpText; ControlData() : BorderDescriptor() { } ControlData( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ) @@ -109,7 +109,7 @@ namespace svxform BorderDescriptor::clear(); UnderlineDescriptor::clear(); xControl.clear(); - sOriginalHelpText = ::rtl::OUString(); + sOriginalHelpText = OUString(); } }; diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx index f28f23926992..9558e2124ee3 100644 --- a/svx/source/inc/fmdocumentclassification.hxx +++ b/svx/source/inc/fmdocumentclassification.hxx @@ -61,10 +61,10 @@ namespace svxform ) SAL_THROW(()); static DocumentType getDocumentTypeForModuleIdentifier( - const ::rtl::OUString& _rModuleIdentifier + const OUString& _rModuleIdentifier ); - static ::rtl::OUString getModuleIdentifierForDocumentType( + static OUString getModuleIdentifierForDocumentType( DocumentType _eType ); }; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index d3510b5a3939..1b20fe4f666d 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -105,15 +105,15 @@ public: class FmNavNameChangedHint : public SfxHint { FmEntryData* pEntryData; - ::rtl::OUString aNewName; + OUString aNewName; public: TYPEINFO(); - FmNavNameChangedHint( FmEntryData* pData, const ::rtl::OUString& rNewName ); + FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName ); virtual ~FmNavNameChangedHint(); FmEntryData* GetEntryData() const { return pEntryData; } - ::rtl::OUString GetNewName() const { return aNewName; } + OUString GetNewName() const { return aNewName; } }; //======================================================================== @@ -148,7 +148,7 @@ private: protected: Image m_aNormalImage; - ::rtl::OUString aText; + OUString aText; FmEntryDataList* pChildList; FmEntryData* pParent; @@ -164,12 +164,12 @@ public: virtual ~FmEntryData(); void Clear(); - void SetText( const ::rtl::OUString& rText ){ aText = rText; } + void SetText( const OUString& rText ){ aText = rText; } void SetParent( FmEntryData* pParentData ){ pParent = pParentData; } const Image& GetNormalImage() const { return m_aNormalImage; } - ::rtl::OUString GetText() const { return aText; } + OUString GetText() const { return aText; } FmEntryData* GetParent() const { return pParent; } FmEntryDataList* GetChildList() const { return pChildList; } @@ -390,7 +390,7 @@ namespace svxform sal_Bool bAlterModel = sal_False ); void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False ); - sal_Bool Rename( FmEntryData* pEntryData, const ::rtl::OUString& rNewText ); + sal_Bool Rename( FmEntryData* pEntryData, const OUString& rNewText ); void Clear(); void SetModified( sal_Bool bMod=sal_True ); @@ -399,7 +399,7 @@ namespace svxform FmFormShell* GetFormShell() const { return m_pFormShell; } FmFormPage* GetFormPage() const { return m_pFormPage; } FmEntryData* FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, sal_Bool bRecurs=sal_True ); - FmEntryData* FindData( const ::rtl::OUString& rText, FmFormData* pParentData, sal_Bool bRecurs=sal_True ); + FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs=sal_True ); FmEntryDataList* GetRootList() const { return m_pRootList; } ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); SdrObject* Search(SdrObjListIter& rIter, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xComp); @@ -454,7 +454,7 @@ namespace svxform void UpdateContent(); - FmControlData* NewControl( const ::rtl::OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName = sal_True ); + FmControlData* NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName = sal_True ); void NewForm( SvTreeListEntry* pParentEntry ); SvTreeListEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND ); void Remove( FmEntryData* pEntryData ); @@ -521,12 +521,12 @@ namespace svxform sal_Bool IsFormEntry( SvTreeListEntry* pEntry ); sal_Bool IsFormComponentEntry( SvTreeListEntry* pEntry ); - ::rtl::OUString GenerateName( FmEntryData* pEntryData ); + OUString GenerateName( FmEntryData* pEntryData ); NavigatorTreeModel* GetNavModel() const { return m_pNavModel; } SvTreeListEntry* FindEntry( FmEntryData* pEntryData ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ); + virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 608d6d1b8a80..5bbd02aa01ec 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -44,7 +44,7 @@ class FmFormObj: public SdrUnoObj // only to be used for comparison with the current ref device! public: - SVX_DLLPUBLIC FmFormObj(const ::rtl::OUString& rModelName); + SVX_DLLPUBLIC FmFormObj(const OUString& rModelName); SVX_DLLPUBLIC FmFormObj(); TYPEINFO(); diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 6fac27514003..db53cc09bf8c 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -81,8 +81,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> findPlaceInFormComponentHierarchy( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& rContent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rDatabase = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>(), - const ::rtl::OUString& rDBTitle = ::rtl::OUString(), - const ::rtl::OUString& rCursorSource = ::rtl::OUString(), + const OUString& rDBTitle = OUString(), + const OUString& rCursorSource = OUString(), sal_Int32 nCommandType = 0 ); @@ -110,12 +110,12 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> findFormForDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& rForm, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rDatabase, - const ::rtl::OUString& rCommand, + const OUString& rCommand, sal_Int32 nCommandType ); public: - ::rtl::OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); + OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); void formObjectInserted( const FmFormObj& _object ); void formObjectRemoved( const FmFormObj& _object ); diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 9c498f250263..4719360bab20 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -21,55 +21,55 @@ #include -#define FM_COMPONENT_EDIT rtl::OUString( "stardiv.one.form.component.Edit" ) -#define FM_COMPONENT_TEXTFIELD rtl::OUString( "stardiv.one.form.component.TextField" ) -#define FM_COMPONENT_LISTBOX rtl::OUString( "stardiv.one.form.component.ListBox" ) -#define FM_COMPONENT_COMBOBOX rtl::OUString( "stardiv.one.form.component.ComboBox" ) -#define FM_COMPONENT_RADIOBUTTON rtl::OUString( "stardiv.one.form.component.RadioButton" ) -#define FM_COMPONENT_GROUPBOX rtl::OUString( "stardiv.one.form.component.GroupBox" ) -#define FM_COMPONENT_FIXEDTEXT rtl::OUString( "stardiv.one.form.component.FixedText" ) -#define FM_COMPONENT_COMMANDBUTTON rtl::OUString( "stardiv.one.form.component.CommandButton" ) -#define FM_COMPONENT_CHECKBOX rtl::OUString( "stardiv.one.form.component.CheckBox" ) -#define FM_COMPONENT_GRID rtl::OUString( "stardiv.one.form.component.Grid" ) -#define FM_COMPONENT_GRIDCONTROL rtl::OUString( "stardiv.one.form.component.GridControl" ) -#define FM_COMPONENT_IMAGEBUTTON rtl::OUString( "stardiv.one.form.component.ImageButton" ) -#define FM_COMPONENT_FILECONTROL rtl::OUString( "stardiv.one.form.component.FileControl" ) -#define FM_COMPONENT_TIMEFIELD rtl::OUString( "stardiv.one.form.component.TimeField" ) -#define FM_COMPONENT_DATEFIELD rtl::OUString( "stardiv.one.form.component.DateField" ) -#define FM_COMPONENT_NUMERICFIELD rtl::OUString( "stardiv.one.form.component.NumericField" ) -#define FM_COMPONENT_CURRENCYFIELD rtl::OUString( "stardiv.one.form.component.CurrencyField" ) -#define FM_COMPONENT_PATTERNFIELD rtl::OUString( "stardiv.one.form.component.PatternField" ) -#define FM_COMPONENT_FORMATTEDFIELD rtl::OUString( "stardiv.one.form.component.FormattedField" ) -#define FM_COMPONENT_HIDDEN rtl::OUString( "stardiv.one.form.component.Hidden" ) -#define FM_COMPONENT_HIDDENCONTROL rtl::OUString( "stardiv.one.form.component.HiddenControl" ) -#define FM_COMPONENT_IMAGECONTROL rtl::OUString( "stardiv.one.form.component.ImageControl" ) -#define FM_CONTROL_GRID rtl::OUString( "stardiv.one.form.control.Grid" ) -#define FM_CONTROL_GRIDCONTROL rtl::OUString( "stardiv.one.form.control.GridControl" ) -#define SRV_SDB_CONNECTION rtl::OUString( "com.sun.star.sdb.Connection" ) -#define FM_SUN_COMPONENT_FORM rtl::OUString( "com.sun.star.form.component.Form" ) -#define FM_SUN_COMPONENT_TEXTFIELD rtl::OUString( "com.sun.star.form.component.TextField" ) -#define FM_SUN_COMPONENT_LISTBOX rtl::OUString( "com.sun.star.form.component.ListBox" ) -#define FM_SUN_COMPONENT_COMBOBOX rtl::OUString( "com.sun.star.form.component.ComboBox" ) -#define FM_SUN_COMPONENT_RADIOBUTTON rtl::OUString( "com.sun.star.form.component.RadioButton" ) -#define FM_SUN_COMPONENT_GROUPBOX rtl::OUString( "com.sun.star.form.component.GroupBox" ) -#define FM_SUN_COMPONENT_FIXEDTEXT rtl::OUString( "com.sun.star.form.component.FixedText" ) -#define FM_SUN_COMPONENT_COMMANDBUTTON rtl::OUString( "com.sun.star.form.component.CommandButton" ) -#define FM_SUN_COMPONENT_CHECKBOX rtl::OUString( "com.sun.star.form.component.CheckBox" ) -#define FM_SUN_COMPONENT_GRIDCONTROL rtl::OUString( "com.sun.star.form.component.GridControl" ) -#define FM_SUN_COMPONENT_IMAGEBUTTON rtl::OUString( "com.sun.star.form.component.ImageButton" ) -#define FM_SUN_COMPONENT_FILECONTROL rtl::OUString( "com.sun.star.form.component.FileControl" ) -#define FM_SUN_COMPONENT_TIMEFIELD rtl::OUString( "com.sun.star.form.component.TimeField" ) -#define FM_SUN_COMPONENT_DATEFIELD rtl::OUString( "com.sun.star.form.component.DateField" ) -#define FM_SUN_COMPONENT_NUMERICFIELD rtl::OUString( "com.sun.star.form.component.NumericField" ) -#define FM_SUN_COMPONENT_CURRENCYFIELD rtl::OUString( "com.sun.star.form.component.CurrencyField" ) -#define FM_SUN_COMPONENT_PATTERNFIELD rtl::OUString( "com.sun.star.form.component.PatternField" ) -#define FM_SUN_COMPONENT_HIDDENCONTROL rtl::OUString( "com.sun.star.form.component.HiddenControl" ) -#define FM_SUN_COMPONENT_IMAGECONTROL rtl::OUString( "com.sun.star.form.component.DatabaseImageControl" ) -#define FM_SUN_COMPONENT_FORMATTEDFIELD rtl::OUString( "com.sun.star.form.component.FormattedField" ) -#define FM_SUN_COMPONENT_SCROLLBAR rtl::OUString( "com.sun.star.form.component.ScrollBar" ) -#define FM_SUN_COMPONENT_SPINBUTTON rtl::OUString( "com.sun.star.form.component.SpinButton" ) -#define FM_SUN_COMPONENT_NAVIGATIONBAR rtl::OUString( "com.sun.star.form.component.NavigationToolBar" ) -#define FM_SUN_CONTROL_GRIDCONTROL rtl::OUString( "com.sun.star.form.control.GridControl" ) +#define FM_COMPONENT_EDIT OUString( "stardiv.one.form.component.Edit" ) +#define FM_COMPONENT_TEXTFIELD OUString( "stardiv.one.form.component.TextField" ) +#define FM_COMPONENT_LISTBOX OUString( "stardiv.one.form.component.ListBox" ) +#define FM_COMPONENT_COMBOBOX OUString( "stardiv.one.form.component.ComboBox" ) +#define FM_COMPONENT_RADIOBUTTON OUString( "stardiv.one.form.component.RadioButton" ) +#define FM_COMPONENT_GROUPBOX OUString( "stardiv.one.form.component.GroupBox" ) +#define FM_COMPONENT_FIXEDTEXT OUString( "stardiv.one.form.component.FixedText" ) +#define FM_COMPONENT_COMMANDBUTTON OUString( "stardiv.one.form.component.CommandButton" ) +#define FM_COMPONENT_CHECKBOX OUString( "stardiv.one.form.component.CheckBox" ) +#define FM_COMPONENT_GRID OUString( "stardiv.one.form.component.Grid" ) +#define FM_COMPONENT_GRIDCONTROL OUString( "stardiv.one.form.component.GridControl" ) +#define FM_COMPONENT_IMAGEBUTTON OUString( "stardiv.one.form.component.ImageButton" ) +#define FM_COMPONENT_FILECONTROL OUString( "stardiv.one.form.component.FileControl" ) +#define FM_COMPONENT_TIMEFIELD OUString( "stardiv.one.form.component.TimeField" ) +#define FM_COMPONENT_DATEFIELD OUString( "stardiv.one.form.component.DateField" ) +#define FM_COMPONENT_NUMERICFIELD OUString( "stardiv.one.form.component.NumericField" ) +#define FM_COMPONENT_CURRENCYFIELD OUString( "stardiv.one.form.component.CurrencyField" ) +#define FM_COMPONENT_PATTERNFIELD OUString( "stardiv.one.form.component.PatternField" ) +#define FM_COMPONENT_FORMATTEDFIELD OUString( "stardiv.one.form.component.FormattedField" ) +#define FM_COMPONENT_HIDDEN OUString( "stardiv.one.form.component.Hidden" ) +#define FM_COMPONENT_HIDDENCONTROL OUString( "stardiv.one.form.component.HiddenControl" ) +#define FM_COMPONENT_IMAGECONTROL OUString( "stardiv.one.form.component.ImageControl" ) +#define FM_CONTROL_GRID OUString( "stardiv.one.form.control.Grid" ) +#define FM_CONTROL_GRIDCONTROL OUString( "stardiv.one.form.control.GridControl" ) +#define SRV_SDB_CONNECTION OUString( "com.sun.star.sdb.Connection" ) +#define FM_SUN_COMPONENT_FORM OUString( "com.sun.star.form.component.Form" ) +#define FM_SUN_COMPONENT_TEXTFIELD OUString( "com.sun.star.form.component.TextField" ) +#define FM_SUN_COMPONENT_LISTBOX OUString( "com.sun.star.form.component.ListBox" ) +#define FM_SUN_COMPONENT_COMBOBOX OUString( "com.sun.star.form.component.ComboBox" ) +#define FM_SUN_COMPONENT_RADIOBUTTON OUString( "com.sun.star.form.component.RadioButton" ) +#define FM_SUN_COMPONENT_GROUPBOX OUString( "com.sun.star.form.component.GroupBox" ) +#define FM_SUN_COMPONENT_FIXEDTEXT OUString( "com.sun.star.form.component.FixedText" ) +#define FM_SUN_COMPONENT_COMMANDBUTTON OUString( "com.sun.star.form.component.CommandButton" ) +#define FM_SUN_COMPONENT_CHECKBOX OUString( "com.sun.star.form.component.CheckBox" ) +#define FM_SUN_COMPONENT_GRIDCONTROL OUString( "com.sun.star.form.component.GridControl" ) +#define FM_SUN_COMPONENT_IMAGEBUTTON OUString( "com.sun.star.form.component.ImageButton" ) +#define FM_SUN_COMPONENT_FILECONTROL OUString( "com.sun.star.form.component.FileControl" ) +#define FM_SUN_COMPONENT_TIMEFIELD OUString( "com.sun.star.form.component.TimeField" ) +#define FM_SUN_COMPONENT_DATEFIELD OUString( "com.sun.star.form.component.DateField" ) +#define FM_SUN_COMPONENT_NUMERICFIELD OUString( "com.sun.star.form.component.NumericField" ) +#define FM_SUN_COMPONENT_CURRENCYFIELD OUString( "com.sun.star.form.component.CurrencyField" ) +#define FM_SUN_COMPONENT_PATTERNFIELD OUString( "com.sun.star.form.component.PatternField" ) +#define FM_SUN_COMPONENT_HIDDENCONTROL OUString( "com.sun.star.form.component.HiddenControl" ) +#define FM_SUN_COMPONENT_IMAGECONTROL OUString( "com.sun.star.form.component.DatabaseImageControl" ) +#define FM_SUN_COMPONENT_FORMATTEDFIELD OUString( "com.sun.star.form.component.FormattedField" ) +#define FM_SUN_COMPONENT_SCROLLBAR OUString( "com.sun.star.form.component.ScrollBar" ) +#define FM_SUN_COMPONENT_SPINBUTTON OUString( "com.sun.star.form.component.SpinButton" ) +#define FM_SUN_COMPONENT_NAVIGATIONBAR OUString( "com.sun.star.form.component.NavigationToolBar" ) +#define FM_SUN_CONTROL_GRIDCONTROL OUString( "com.sun.star.form.control.GridControl" ) namespace svxform { diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 142a6d4999ed..16e549e0761f 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -343,7 +343,7 @@ protected: // sammelt in strNames die Namen aller Formulare static void impl_collectFormSearchContexts_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxStartingPoint, - const ::rtl::OUString& _rCurrentLevelPrefix, + const OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames ); @@ -490,7 +490,7 @@ private: // closes the task-local beamer displaying a grid view for a form // ConfigItem related stuff - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); virtual void Commit(); void implAdjustConfigCache(); @@ -557,18 +557,18 @@ inline sal_Bool FmXFormShell::IsSelectionUpdatePending() class SAL_DLLPRIVATE SearchableControlIterator : public ::comphelper::IndexAccessIterator { - ::rtl::OUString m_sCurrentValue; + OUString m_sCurrentValue; // der aktuelle Wert der ControlSource-::com::sun::star::beans::Property public: - ::rtl::OUString getCurrentValue() const { return m_sCurrentValue; } + OUString getCurrentValue() const { return m_sCurrentValue; } public: SearchableControlIterator(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xStartingPoint); virtual sal_Bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& rElement); virtual sal_Bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xContainer) const; - virtual void Invalidate() { IndexAccessIterator::Invalidate(); m_sCurrentValue = ::rtl::OUString(); } + virtual void Invalidate() { IndexAccessIterator::Invalidate(); m_sCurrentValue = OUString(); } }; // ======================================================================== diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index d68c0eea8352..dc23e6437456 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -51,7 +51,7 @@ class SdrObject; class FmUndoPropertyAction: public SdrUndoAction { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xObj; - ::rtl::OUString aPropertyName; + OUString aPropertyName; ::com::sun::star::uno::Any aNewValue; ::com::sun::star::uno::Any aOldValue; @@ -61,7 +61,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; @@ -123,7 +123,7 @@ public: virtual void Undo(); virtual void Redo() { Undo(); } - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; static void DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced ); }; diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx index 6c0b6a2795d5..c2c829611337 100644 --- a/svx/source/inc/fmurl.hxx +++ b/svx/source/inc/fmurl.hxx @@ -20,33 +20,33 @@ #ifndef _SVX_FMURL_HXX #define _SVX_FMURL_HXX -#define FMURL_FORM_POSITION rtl::OUString( ".uno:FormController/positionForm" ) -#define FMURL_FORM_RECORDCOUNT rtl::OUString( ".uno:FormController/RecordCount" ) -#define FMURL_RECORD_MOVEFIRST rtl::OUString( ".uno:FormController/moveToFirst" ) -#define FMURL_RECORD_MOVEPREV rtl::OUString( ".uno:FormController/moveToPrev" ) -#define FMURL_RECORD_MOVENEXT rtl::OUString( ".uno:FormController/moveToNext" ) -#define FMURL_RECORD_MOVELAST rtl::OUString( ".uno:FormController/moveToLast" ) -#define FMURL_RECORD_MOVETONEW rtl::OUString( ".uno:FormController/moveToNew" ) -#define FMURL_RECORD_UNDO rtl::OUString( ".uno:FormController/undoRecord" ) -#define FMURL_RECORD_SAVE rtl::OUString( ".uno:FormController/saveRecord" ) -#define FMURL_RECORD_DELETE rtl::OUString( ".uno:FormController/deleteRecord" ) -#define FMURL_FORM_REFRESH rtl::OUString( ".uno:FormController/refreshForm" ) -#define FMURL_FORM_REFRESH_CURRENT_CONTROL rtl::OUString( ".uno:FormController/refreshCurrentControl" ) -#define FMURL_FORM_SORT_UP rtl::OUString( ".uno:FormController/sortUp" ) -#define FMURL_FORM_SORT_DOWN rtl::OUString( ".uno:FormController/sortDown" ) -#define FMURL_FORM_SORT rtl::OUString( ".uno:FormController/sort" ) -#define FMURL_FORM_AUTO_FILTER rtl::OUString( ".uno:FormController/autoFilter" ) -#define FMURL_FORM_FILTER rtl::OUString( ".uno:FormController/filter" ) -#define FMURL_FORM_APPLY_FILTER rtl::OUString( ".uno:FormController/applyFilter" ) -#define FMURL_FORM_REMOVE_FILTER rtl::OUString( ".uno:FormController/removeFilterOrder" ) -#define FMURL_CONFIRM_DELETION rtl::OUString( ".uno:FormSlots/ConfirmDeletion" ) -#define FMURL_COMPONENT_FORMGRIDVIEW rtl::OUString( ".component:DB/FormGridView" ) -#define FMURL_GRIDVIEW_CLEARVIEW rtl::OUString( ".uno:FormSlots/ClearView" ) -#define FMURL_GRIDVIEW_ADDCOLUMN rtl::OUString( ".uno:FormSlots/AddGridColumn" ) -#define FMURL_GRIDVIEW_ATTACHTOFORM rtl::OUString( ".uno:FormSlots/AttachToForm" ) -#define FMARG_ATTACHTO_MASTERFORM rtl::OUString( "MasterForm" ) -#define FMARG_ADDCOL_COLUMNTYPE rtl::OUString( "ColumnType" ) -#define FMARG_ADDCOL_COLUMNPOS rtl::OUString( "ColumnPosition" ) +#define FMURL_FORM_POSITION OUString( ".uno:FormController/positionForm" ) +#define FMURL_FORM_RECORDCOUNT OUString( ".uno:FormController/RecordCount" ) +#define FMURL_RECORD_MOVEFIRST OUString( ".uno:FormController/moveToFirst" ) +#define FMURL_RECORD_MOVEPREV OUString( ".uno:FormController/moveToPrev" ) +#define FMURL_RECORD_MOVENEXT OUString( ".uno:FormController/moveToNext" ) +#define FMURL_RECORD_MOVELAST OUString( ".uno:FormController/moveToLast" ) +#define FMURL_RECORD_MOVETONEW OUString( ".uno:FormController/moveToNew" ) +#define FMURL_RECORD_UNDO OUString( ".uno:FormController/undoRecord" ) +#define FMURL_RECORD_SAVE OUString( ".uno:FormController/saveRecord" ) +#define FMURL_RECORD_DELETE OUString( ".uno:FormController/deleteRecord" ) +#define FMURL_FORM_REFRESH OUString( ".uno:FormController/refreshForm" ) +#define FMURL_FORM_REFRESH_CURRENT_CONTROL OUString( ".uno:FormController/refreshCurrentControl" ) +#define FMURL_FORM_SORT_UP OUString( ".uno:FormController/sortUp" ) +#define FMURL_FORM_SORT_DOWN OUString( ".uno:FormController/sortDown" ) +#define FMURL_FORM_SORT OUString( ".uno:FormController/sort" ) +#define FMURL_FORM_AUTO_FILTER OUString( ".uno:FormController/autoFilter" ) +#define FMURL_FORM_FILTER OUString( ".uno:FormController/filter" ) +#define FMURL_FORM_APPLY_FILTER OUString( ".uno:FormController/applyFilter" ) +#define FMURL_FORM_REMOVE_FILTER OUString( ".uno:FormController/removeFilterOrder" ) +#define FMURL_CONFIRM_DELETION OUString( ".uno:FormSlots/ConfirmDeletion" ) +#define FMURL_COMPONENT_FORMGRIDVIEW OUString( ".component:DB/FormGridView" ) +#define FMURL_GRIDVIEW_CLEARVIEW OUString( ".uno:FormSlots/ClearView" ) +#define FMURL_GRIDVIEW_ADDCOLUMN OUString( ".uno:FormSlots/AddGridColumn" ) +#define FMURL_GRIDVIEW_ATTACHTOFORM OUString( ".uno:FormSlots/AttachToForm" ) +#define FMARG_ATTACHTO_MASTERFORM OUString( "MasterForm" ) +#define FMARG_ADDCOL_COLUMNTYPE OUString( "ColumnType" ) +#define FMARG_ADDCOL_COLUMNPOS OUString( "ColumnPosition" ) #endif // _SVX_FMURL_HXX diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index e51c9e3667ef..4124f84cfcd0 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -259,7 +259,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, + const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, @@ -276,12 +276,12 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, + const OUString& _rFieldPostfix, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxDataSource = NULL, - const ::rtl::OUString& _rDataSourceName = ::rtl::OUString(), - const ::rtl::OUString& _rCommand= ::rtl::OUString(), + const OUString& _rDataSourceName = OUString(), + const OUString& _rCommand= OUString(), const sal_Int32 _nCommandType = -1 ); diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index bb956e836806..23e0fb08c80d 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -84,19 +84,19 @@ namespace svxform const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats ); - static ::rtl::OUString getDefaultName( + static OUString getDefaultName( const sal_Int16 nClassId, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo >& _rxObject ); - static ::rtl::OUString getDefaultUniqueName_ByComponentType( + static OUString getDefaultUniqueName_ByComponentType( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); - static ::rtl::OUString getUniqueName( + static OUString getUniqueName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, - const ::rtl::OUString& _rBaseName + const OUString& _rBaseName ); private: diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 44bdc513d9a8..e12180e301c4 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -89,7 +89,7 @@ struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::u } }; -typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::rtl::OUString, FmXTextComponentLess> FmFilterRow; +typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, OUString, FmXTextComponentLess> FmFilterRow; typedef ::std::vector< FmFilterRow > FmFilterRows; typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > > FmFormControllers; @@ -177,7 +177,7 @@ namespace svxform DispatcherContainer m_aFeatureDispatchers; ::std::set< sal_Int16 > m_aInvalidFeatures; // for asynchronous feature invalidation - ::rtl::OUString m_aMode; + OUString m_aMode; ::svxform::DelayedEvent m_aLoadEvent; ::svxform::DelayedEvent m_aToggleEvent; @@ -258,9 +258,9 @@ namespace svxform virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addFilterControllerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterControllerListener >& _Listener ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeFilterControllerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterControllerListener >& _Listener ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const ::rtl::OUString& _PredicateExpression ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 _Component ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getPredicateExpressions() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getPredicateExpressions() throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendEmptyDisjunctiveTerm() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getActiveTerm() throw (::com::sun::star::uno::RuntimeException); @@ -286,10 +286,10 @@ namespace svxform virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // XModeSelector - virtual void SAL_CALL setMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsMode(const ::rtl::OUString& Mode) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setMode(const OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -397,9 +397,9 @@ namespace svxform virtual sal_Bool SAL_CALL confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException); // XResetListener virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException ); @@ -410,7 +410,7 @@ namespace svxform virtual void SAL_CALL invalidateAllFeatures( ) throw (::com::sun::star::uno::RuntimeException); // method for registration - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void); // comphelper::OPropertyArrayUsageHelper virtual void fillProperties( @@ -423,7 +423,7 @@ namespace svxform virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> interceptedQueryDispatch( const ::com::sun::star::util::URL& aURL, - const ::rtl::OUString& aTargetFrameName, + const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw( ::com::sun::star::uno::RuntimeException ); @@ -551,7 +551,7 @@ namespace svxform if and only if all controls belonging to our form are valid */ bool checkFormComponentValidity( - ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, + OUString& /* [out] */ _rFirstInvalidityExplanation, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(()); diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index be168cdbe3b7..7f08fbea818a 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -44,7 +44,7 @@ namespace svx { public: /// retrieves the feature id for a given feature URL - static sal_Int32 getControllerFeatureSlotIdForURL( const ::rtl::OUString& _rMainURL ); + static sal_Int32 getControllerFeatureSlotIdForURL( const OUString& _rMainURL ); /// retrieves the css.form.runtime.FormFeature ID for a given slot ID static sal_Int16 getFormFeatureForSlotId( sal_Int32 _nSlotId ); @@ -192,7 +192,7 @@ namespace svx ) const; sal_Bool isEnabled( sal_Int32 _nSlotId ) const; void execute( sal_Int32 _nSlotId ) const; - void execute( sal_Int32 _nSlotId, const ::rtl::OUString& _rParamName, const ::com::sun::star::uno::Any& _rParamValue ) const; + void execute( sal_Int32 _nSlotId, const OUString& _rParamName, const ::com::sun::star::uno::Any& _rParamValue ) const; sal_Bool commitCurrentRecord() const; sal_Bool commitCurrentControl( ) const; sal_Bool isInsertionRow() const; diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index 59528cb3ffc0..e13997e3d9c1 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -38,7 +38,7 @@ namespace svxform { public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> interceptedQueryDispatch( - const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ) = 0; + const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ) = 0; virtual ::osl::Mutex* getInterceptorMutex() = 0; @@ -87,7 +87,7 @@ namespace svxform DECLARE_UNO3_DEFAULTS(DispatchInterceptionMultiplexer, DispatchInterceptionMultiplexer_BASE); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProviderInterceptor diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index 92158f480d87..ce8eb4aca371 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -54,7 +54,7 @@ namespace svxform /** retrieves the URI for the toolbox associated with the given slot, depending on the type of our document */ - SVX_DLLPUBLIC ::rtl::OUString + SVX_DLLPUBLIC OUString getToolboxResourceName( sal_uInt16 _nSlotId ) const; /** toggles the toolbox associated with the given slot diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx index 90e039a51ef3..555e31ea99c3 100644 --- a/svx/source/inc/gridcols.hxx +++ b/svx/source/inc/gridcols.hxx @@ -20,19 +20,18 @@ #define _SVX_GRIDCOLS_HXX #include +#include -namespace rtl { class OUString; } - -#define FM_COL_TEXTFIELD rtl::OUString( "TextField" ) -#define FM_COL_COMBOBOX rtl::OUString( "ComboBox" ) -#define FM_COL_CHECKBOX rtl::OUString( "CheckBox" ) -#define FM_COL_TIMEFIELD rtl::OUString( "TimeField" ) -#define FM_COL_DATEFIELD rtl::OUString( "DateField" ) -#define FM_COL_NUMERICFIELD rtl::OUString( "NumericField" ) -#define FM_COL_CURRENCYFIELD rtl::OUString( "CurrencyField" ) -#define FM_COL_PATTERNFIELD rtl::OUString( "PatternField" ) -#define FM_COL_LISTBOX rtl::OUString( "ListBox" ) -#define FM_COL_FORMATTEDFIELD rtl::OUString( "FormattedField" ) +#define FM_COL_TEXTFIELD OUString( "TextField" ) +#define FM_COL_COMBOBOX OUString( "ComboBox" ) +#define FM_COL_CHECKBOX OUString( "CheckBox" ) +#define FM_COL_TIMEFIELD OUString( "TimeField" ) +#define FM_COL_DATEFIELD OUString( "DateField" ) +#define FM_COL_NUMERICFIELD OUString( "NumericField" ) +#define FM_COL_CURRENCYFIELD OUString( "CurrencyField" ) +#define FM_COL_PATTERNFIELD OUString( "PatternField" ) +#define FM_COL_LISTBOX OUString( "ListBox" ) +#define FM_COL_FORMATTEDFIELD OUString( "FormattedField" ) // column type ids #define TYPE_CHECKBOX 0 @@ -47,7 +46,7 @@ namespace rtl { class OUString; } #define TYPE_TIMEFIELD 9 //------------------------------------------------------------------------------ -sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName); +sal_Int32 getColumnTypeByModelName(const OUString& aModelName); #endif // _SVX_GRIDCOLS_HXX diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index 33c5e431cc2a..d8454c9e4c35 100644 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx @@ -81,13 +81,13 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo //--------------------------------------- // css.lang.XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); //--------------------------------------- @@ -112,8 +112,8 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo //--------------------------------------- // XServiceInfo helper - static ::rtl::OUString st_getImplementationName(); - static css::uno::Sequence< ::rtl::OUString > st_getSupportedServiceNames(); + static OUString st_getImplementationName(); + static css::uno::Sequence< OUString > st_getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > SAL_CALL st_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); //------------------------------------------- diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index d0b3c83dade2..f1ee6eb5c03b 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -76,16 +76,16 @@ namespace svxform // ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> getPropertySetInfo() const throw( ::com::sun::star::uno::RuntimeException ); - inline void setPropertyValue(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline ::com::sun::star::uno::Any getPropertyValue(const ::rtl::OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - inline void removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + inline void setPropertyValue(const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + inline ::com::sun::star::uno::Any getPropertyValue(const OUString& PropertyName) const throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + inline void addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + inline void removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + inline void addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + inline void removeVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::sdb::XColumn inline sal_Bool wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline ::rtl::OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + inline OUString getString() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline sal_Bool getBoolean() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline sal_Int8 getByte() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline sal_Int16 getShort() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); @@ -114,7 +114,7 @@ namespace svxform inline void updateLong(sal_Int64 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateFloat(float x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateDouble(double x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - inline void updateString(const ::rtl::OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + inline void updateString(const OUString& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateBytes(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateDate(const com::sun::star::util::Date& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateTime(const ::com::sun::star::util::Time& x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index cc28505216cb..a7b85f154d7f 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -49,8 +49,8 @@ namespace svxform protected: inline ::rtl::Reference< ::connectivity::simple::ISQLParseNode > predicateTree( - ::rtl::OUString& _rErrorMessage, - const ::rtl::OUString& _rStatement, + OUString& _rErrorMessage, + const OUString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField ) const diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 7575d7690252..e21942d33c9d 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -73,8 +73,8 @@ public: SvxRectCtlAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, SvxRectCtl& rRepresentation, - const ::rtl::OUString* pName = NULL, - const ::rtl::OUString* pDescription = NULL ); + const OUString* pName = NULL, + const OUString* pDescription = NULL ); protected: virtual ~SvxRectCtlAccessibleContext(); public: @@ -150,10 +150,10 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL @@ -181,13 +181,13 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException ); //===== XTypeProvider =================================================== @@ -276,11 +276,11 @@ private: /** Description of this object. This is not a constant because it can be set from the outside. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. */ - ::rtl::OUString msName; + OUString msName; /// Reference to the parent object. ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > @@ -329,7 +329,7 @@ public: SvxRectCtlChildAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const Window& rParentWindow, - const ::rtl::OUString& rName, const ::rtl::OUString& rDescription, + const OUString& rName, const OUString& rDescription, const Rectangle& rBoundingBox, long nIndexInParent ); protected: @@ -405,10 +405,10 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName( void ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL @@ -449,13 +449,13 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException ); @@ -496,12 +496,12 @@ private: be set from the outside. Furthermore, it changes according the the draw page's display mode. */ - ::rtl::OUString msDescription; + OUString msDescription; /** Name of this object. It changes according the draw page's display mode. */ - ::rtl::OUString msName; + OUString msName; /// Reference to the parent object. ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index ba6f87c1be98..08723f91ca05 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -77,7 +77,7 @@ class SAL_DLLPRIVATE FmFieldWin :public SfxFloatingWindow FmFieldWinData* pData; ::svxform::SharedConnection m_aConnection; - ::rtl::OUString m_aDatabaseName, + OUString m_aDatabaseName, m_aObjectName; sal_Int32 m_nObjectType; @@ -101,9 +101,9 @@ public: void UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > &); void FillInfo( SfxChildWinInfo& rInfo ) const; - const ::rtl::OUString& GetDatabaseName() const { return m_aDatabaseName; } + const OUString& GetDatabaseName() const { return m_aDatabaseName; } ::svxform::SharedConnection GetConnection() const { return m_aConnection; } - const ::rtl::OUString& GetObjectName() const { return m_aObjectName; } + const OUString& GetObjectName() const { return m_aObjectName; } sal_Int32 GetObjectType() const { return m_nObjectType; } sal_Bool createSelectionControls( ); diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx index fa3c4b64cba1..2c8652e0edeb 100644 --- a/svx/source/inc/typeconversionclient.hxx +++ b/svx/source/inc/typeconversionclient.hxx @@ -61,14 +61,14 @@ namespace svxform } // -------------------------------------------------------- - inline ::rtl::OUString getFormattedValue( + inline OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::util::Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const { - ::rtl::OUString sReturn; + OUString sReturn; if ( ensureLoaded() ) sReturn = m_xTypeConversion->getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType); return sReturn; diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx index 70877c83054c..23c769b84d7a 100644 --- a/svx/source/inc/unogalthemeprovider.hxx +++ b/svx/source/inc/unogalthemeprovider.hxx @@ -36,8 +36,8 @@ namespace unogallery { // ------------------------- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GalleryThemeProvider_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL GalleryThemeProvider_getImplementationName() throw(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() throw(); +OUString SAL_CALL GalleryThemeProvider_getImplementationName() throw(); // ----------------- // - GalleryThemes - @@ -51,15 +51,15 @@ public: GalleryThemeProvider(); ~GalleryThemeProvider(); - SVX_DLLPUBLIC static ::rtl::OUString getImplementationName_Static() throw(); - SVX_DLLPUBLIC static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + SVX_DLLPUBLIC static OUString getImplementationName_Static() throw(); + SVX_DLLPUBLIC static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -70,16 +70,16 @@ protected: virtual ::sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); // XGalleryThemeProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::gallery::XGalleryTheme > SAL_CALL insertNewByName( const ::rtl::OUString& ThemeName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& ThemeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::gallery::XGalleryTheme > SAL_CALL insertNewByName( const OUString& ThemeName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& ThemeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 02e5adf7ec18..beaaf6b47db9 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -41,8 +41,8 @@ namespace svxform // ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xBinding; - ::rtl::OUString m_sFacetName; - ::rtl::OUString m_sConditionValue; + OUString m_sFacetName; + OUString m_sConditionValue; ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel > m_xWorkModel; // @@ -58,8 +58,8 @@ namespace svxform virtual com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); // XPropertySet virtual com::sun::star::uno::Reference SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx index 04a17e2ecd90..69cd12ddd86b 100644 --- a/svx/source/inc/xmlxtexp.hxx +++ b/svx/source/inc/xmlxtexp.hxx @@ -38,19 +38,19 @@ public: // #110680# SvxXMLXTableExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, - const rtl::OUString& rFileName, + const OUString& rFileName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > & xTable, com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& xGrfResolver); ~SvxXMLXTableExportComponent(); - static bool save( const rtl::OUString& rURL, + static bool save( const OUString& rURL, const com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xTable, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > &xStorage, - rtl::OUString *pOptName ) throw(); + OUString *pOptName ) throw(); // methods without content: virtual void _ExportAutoStyles(); diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx index ab055910ae2a..0a9ba8701766 100644 --- a/svx/source/inc/xmlxtimp.hxx +++ b/svx/source/inc/xmlxtimp.hxx @@ -42,13 +42,13 @@ public: virtual ~SvxXMLXTableImport() throw (); - static bool load( const rtl::OUString &rPath, + static bool load( const OUString &rPath, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > &xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xTable, bool *bOptLoadedFromStorage ) throw(); protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); private: diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 742f1cf19292..57c6588e6d70 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -36,8 +36,8 @@ SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, const com::sun::star::uno::Reference rRange, const com::sun::star::uno::Reference rController, const com::sun::star::lang::Locale rLocale, - const rtl::OUString& rApplicationName, - const rtl::OUString& rRangeText ) : + const OUString& rApplicationName, + const OUString& rRangeText ) : SfxPoolItem( nId ), maActionComponentsSequence( rActionComponentsSequence ), maActionIndicesSequence( rActionIndicesSequence ), diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index ca6d4a7e0e75..33fff149cf80 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -244,7 +244,7 @@ SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : XubString SvxDoubleItem::GetValueText() const { - rtl::OString aOStr( rtl::math::doubleToString( fVal, rtl_math_StringFormat_E, 4, '.', false ) ); + OString aOStr( rtl::math::doubleToString( fVal, rtl_math_StringFormat_E, 4, '.', false ) ); return String( aOStr.getStr(), (sal_uInt16)aOStr.getLength() ); } diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index e2f863d5d472..af6236d72645 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -24,7 +24,7 @@ struct SvxClipboardFmtItem_Impl { - boost::ptr_vector< boost::nullable > aFmtNms; + boost::ptr_vector< boost::nullable > aFmtNms; std::vector aFmtIds; SvxClipboardFmtItem_Impl() {} @@ -127,13 +127,13 @@ void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos ) pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId ); } -void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, const rtl::OUString& rName, +void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, const OUString& rName, sal_uInt16 nPos ) { if( nPos > pImpl->aFmtNms.size() ) nPos = pImpl->aFmtNms.size(); - pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, new rtl::OUString(rName)); + pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, new OUString(rName)); pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId ); } @@ -147,9 +147,9 @@ sal_uIntPtr SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const return pImpl->aFmtIds[ nPos ]; } -const rtl::OUString SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const +const OUString SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const { - return pImpl->aFmtNms.is_null(nPos) ? rtl::OUString() : pImpl->aFmtNms[nPos]; + return pImpl->aFmtNms.is_null(nPos) ? OUString() : pImpl->aFmtNms[nPos]; } diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 119de61bd20f..5b8ed9f51c50 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -31,7 +31,7 @@ SdrCustomShapeDataItem::SdrCustomShapeDataItem() : SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, String() ) {} -bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const rtl::OUString& r1, const rtl::OUString& r2 ) const +bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const OUString& r1, const OUString& r2 ) const { return r1.equals( r2 ); } @@ -70,7 +70,7 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< bea } } -com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const rtl::OUString& rPropName ) +com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) { com::sun::star::uno::Any* pRet = NULL; PropertyHashMap::iterator aHashIter( aPropHashMap.find( rPropName ) ); @@ -79,7 +79,7 @@ com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( co return pRet; } -com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const rtl::OUString& rSequenceName, const rtl::OUString& rPropName ) +com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) { com::sun::star::uno::Any* pRet = NULL; com::sun::star::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); @@ -138,7 +138,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const com::sun::star::beans:: } } -void SdrCustomShapeGeometryItem::SetPropertyValue( const rtl::OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ) +void SdrCustomShapeGeometryItem::SetPropertyValue( const OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ) { com::sun::star::uno::Any* pAny = GetPropertyValueByName( rSequenceName, rPropVal.Name ); if ( pAny ) // just replacing @@ -190,7 +190,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const rtl::OUString& rSequenc } } -void SdrCustomShapeGeometryItem::ClearPropertyValue( const rtl::OUString& rPropName ) +void SdrCustomShapeGeometryItem::ClearPropertyValue( const OUString& rPropName ) { if ( aPropSeq.getLength() ) { diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index a2181a2a626f..1de41eb9fa0f 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -295,16 +295,16 @@ bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMe switch(nMemberId) { case MID_HLINK_NAME : - rVal <<= ::rtl::OUString(sIntName.GetBuffer()); + rVal <<= OUString(sIntName.GetBuffer()); break; case MID_HLINK_TEXT : - rVal <<= ::rtl::OUString(sName.GetBuffer()); + rVal <<= OUString(sName.GetBuffer()); break; case MID_HLINK_URL: - rVal <<= ::rtl::OUString(sURL.GetBuffer()); + rVal <<= OUString(sURL.GetBuffer()); break; case MID_HLINK_TARGET: - rVal <<= ::rtl::OUString(sTarget.GetBuffer()); + rVal <<= OUString(sTarget.GetBuffer()); break; case MID_HLINK_TYPE: rVal <<= (sal_Int32) eType; @@ -320,7 +320,7 @@ bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - ::rtl::OUString aStr; + OUString aStr; sal_Int32 nVal = 0; switch(nMemberId) { diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index d33ca4ca0564..2616f7391ff2 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1502,7 +1502,7 @@ String SvxNumberFormatShell::GetStandardName() const return pFormatter->GetStandardName( eCurLanguage); } -void SvxNumberFormatShell::GetCurrencySymbols(std::vector& rList, sal_uInt16* pPos) +void SvxNumberFormatShell::GetCurrencySymbols(std::vector& rList, sal_uInt16* pPos) { const NfCurrencyEntry* pTmpCurrencyEntry=SvNumberFormatter::MatchSystemCurrency(); @@ -1541,7 +1541,7 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector& rList, } -void SvxNumberFormatShell::GetCurrencySymbols(std::vector& rList, bool bFlag) +void SvxNumberFormatShell::GetCurrencySymbols(std::vector& rList, bool bFlag) { aCurCurrencyList.clear(); @@ -1597,7 +1597,7 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector& rList, for(sal_uInt16 i = 1; i < nCount; ++i) { bool bInsert = true; - rtl::OUString aStr(ApplyLreOrRleEmbedding(rCurrencyTable[i].GetBankSymbol())); + OUString aStr(ApplyLreOrRleEmbedding(rCurrencyTable[i].GetBankSymbol())); sal_uInt16 j = nCont; for(; j < rList.size() && bInsert; ++j) @@ -1771,7 +1771,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat(const NfCurrencyEntry* pTmpC } bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos, - bool const bTmpBanking, ::rtl::OUString const& rFmtString) + bool const bTmpBanking, OUString const& rFmtString) { bool bFlag=false; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index d84ade527f8c..94d88e8562fd 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -99,9 +99,9 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case 0 : { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( VIEWLAYOUT_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_COLUMNS )); + aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_COLUMNS )); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_BOOKMODE )); + aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( VIEWLAYOUT_PARAM_BOOKMODE )); aSeq[1].Value <<= sal_Bool( mbBookMode ); rVal <<= aSeq; } diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index f6cfcc7d5b43..ef19d6dc52a3 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -96,13 +96,13 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM case 0 : { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOMSLIDER_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_CURRENTZOOM )); + aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_CURRENTZOOM )); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_SNAPPINGPOINTS )); + aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_SNAPPINGPOINTS )); aSeq[1].Value <<= maValues; - aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MINZOOM ) ); + aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MINZOOM ) ); aSeq[2].Value <<= mnMinZoom; - aSeq[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MAXZOOM ) ); + aSeq[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MAXZOOM ) ); aSeq[3].Value <<= mnMaxZoom; rVal <<= aSeq; } diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 36d43cc01581..4f0f3fe523b8 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -68,8 +68,8 @@ void SvxSmartTagsControl::FillMenu() const Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence = mpSmartTagItem->GetActionIndicesSequence(); const Sequence< Reference< container::XStringKeyMap > >& rStringKeyMaps = mpSmartTagItem->GetStringKeyMaps(); const lang::Locale& rLocale = mpSmartTagItem->GetLocale(); - const rtl::OUString aApplicationName = mpSmartTagItem->GetApplicationName(); - const rtl::OUString aRangeText = mpSmartTagItem->GetRangeText(); + const OUString aApplicationName = mpSmartTagItem->GetApplicationName(); + const OUString aRangeText = mpSmartTagItem->GetRangeText(); const Reference& xTextRange = mpSmartTagItem->GetTextRange(); const Reference& xController = mpSmartTagItem->GetController(); @@ -91,8 +91,8 @@ void SvxSmartTagsControl::FillMenu() continue; const sal_Int32 nSmartTagIndex = rActionIndices[0]; - const rtl::OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex ); - const rtl::OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale ); + const OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex ); + const OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale ); // no sub-menus if there's only one smart tag type listed: PopupMenu* pSbMenu = mpMenu; @@ -105,7 +105,7 @@ void SvxSmartTagsControl::FillMenu() pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) ); // sub-menu starts with smart tag caption and separator - const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + OUString(": ") + aRangeText; + const OUString aSmartTagCaption2 = aSmartTagCaption + OUString(": ") + aRangeText; nSubMenuPos = 0; pSbMenu->InsertItem(nMenuId++, aSmartTagCaption2, MIB_NOSELECT, OString(), nSubMenuPos++); pSbMenu->InsertSeparator(OString(), nSubMenuPos++); @@ -118,12 +118,12 @@ void SvxSmartTagsControl::FillMenu() for ( sal_Int32 k = 0; k < xAction->getActionCount( aSmartTagType, xController ); ++k ) { const sal_uInt32 nActionID = xAction->getActionID( aSmartTagType, k, xController ); - rtl::OUString aActionCaption = xAction->getActionCaptionFromID( nActionID, + OUString aActionCaption = xAction->getActionCaptionFromID( nActionID, aApplicationName, rLocale, xSmartTagProperties, aRangeText, - rtl::OUString(), + OUString(), xController, xTextRange ); @@ -178,7 +178,7 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen ) mpSmartTagItem->GetTextRange(), maInvokeActions[ nMyId ].mxSmartTagProperties, mpSmartTagItem->GetRangeText(), - rtl::OUString(), + OUString(), mpSmartTagItem->GetLocale() ); } diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 218bb7e92afb..ea129a988a87 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -47,7 +47,7 @@ SvxClipBoardControl::SvxClipBoardControl( pPopup (0), bDisabled( sal_False ) { - addStatusListener( rtl::OUString( ".uno:ClipboardFormatItems" )); + addStatusListener( OUString( ".uno:ClipboardFormatItems" )); ToolBox& rBox = GetToolBox(); rBox.SetItemBits( nId, TIB_DROPDOWN | rBox.GetItemBits( nId ) ); rBox.Invalidate(); @@ -95,10 +95,10 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "SelectedFormat" ); + aArgs[0].Name = OUString( "SelectedFormat" ); aItem.QueryValue( a ); aArgs[0].Value = a; - Dispatch( rtl::OUString( ".uno:ClipboardFormatItems" ), + Dispatch( OUString( ".uno:ClipboardFormatItems" ), aArgs ); } diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx index 4d1dcfdb2fe2..8aa9abe90288 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx @@ -142,7 +142,7 @@ namespace sdr // decomposition of MediaPrimitive2D to create needed invisible elements for HitTest // and/or BoundRect const basegfx::BColor aBackgroundColor(67.0 / 255.0, 67.0 / 255.0, 67.0 / 255.0); - const rtl::OUString& rURL(GetSdrMediaObj().getURL()); + const OUString& rURL(GetSdrMediaObj().getURL()); const sal_uInt32 nPixelBorder(4L); const drawinglayer::primitive2d::Primitive2DReference xRetval( new drawinglayer::primitive2d::MediaPrimitive2D( diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index ef8a8a2b33ad..6ee13eff2d74 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -1203,7 +1203,7 @@ namespace sdr { namespace contact { bool bSuccess = false; try { - const ::rtl::OUString sControlServiceName( _rUnoObject.GetUnoControlTypeName() ); + const OUString sControlServiceName( _rUnoObject.GetUnoControlTypeName() ); Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), UNO_SET_THROW ); _out_rControl = Reference< XControl >( xFactory->createInstance( sControlServiceName ), UNO_QUERY_THROW ); @@ -1382,9 +1382,9 @@ namespace sdr { namespace contact { { Reference< XPropertySet > xModelProperties( m_aControl.getModel(), UNO_QUERY_THROW ); if ( _bStart ) - xModelProperties->addPropertyChangeListener( ::rtl::OUString(), this ); + xModelProperties->addPropertyChangeListener( OUString(), this ); else - xModelProperties->removePropertyChangeListener( ::rtl::OUString(), this ); + xModelProperties->removePropertyChangeListener( OUString(), this ); } catch( const Exception& ) { @@ -1403,7 +1403,7 @@ namespace sdr { namespace contact { try { Reference< XPropertySet > xModelProperties( pUnoObject->GetUnoControlModel(), UNO_QUERY_THROW ); - static const ::rtl::OUString s_sPrintablePropertyName( "Printable" ); + static const OUString s_sPrintablePropertyName( "Printable" ); OSL_VERIFY( xModelProperties->getPropertyValue( s_sPrintablePropertyName ) >>= bIsPrintable ); } catch( const Exception& ) diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 41cbcd0327d2..818bfc6b6b27 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -137,7 +137,7 @@ namespace sdr if(bUseReducedDisplayQualityForDrag) { uno::Sequence< beans::PropertyValue > xProperties(1); - xProperties[0].Name = rtl::OUString("ReducedDisplayQuality"); + xProperties[0].Name = OUString("ReducedDisplayQuality"); xProperties[0].Value <<= true; maViewInformation2D = drawinglayer::geometry::ViewInformation2D(xProperties); } diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 39bd6cf9b0a9..23c93203b865 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -96,22 +96,22 @@ namespace drawinglayer return aRetval; } - rtl::OUString PrimitiveFactory2D::getImplementationName_Static() + OUString PrimitiveFactory2D::getImplementationName_Static() { - static rtl::OUString aRetval("com.sun.star.comp.graphic.PrimitiveFactory2D"); + static OUString aRetval("com.sun.star.comp.graphic.PrimitiveFactory2D"); return aRetval; } - uno::Sequence< rtl::OUString > PrimitiveFactory2D::getSupportedServiceNames_Static() + uno::Sequence< OUString > PrimitiveFactory2D::getSupportedServiceNames_Static() { - static uno::Sequence< rtl::OUString > aSeq; + static uno::Sequence< OUString > aSeq; osl::Mutex aMutex; osl::MutexGuard aGuard( aMutex ); if(!aSeq.getLength()) { aSeq.realloc(1L); - aSeq.getArray()[0L] = rtl::OUString("com.sun.star.graphic.PrimitiveFactory2D"); + aSeq.getArray()[0L] = OUString("com.sun.star.graphic.PrimitiveFactory2D"); } return aSeq; diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index c46aa095180a..ac3080cf5d44 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -49,7 +49,7 @@ namespace { try { - const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString("Number"))); + const uno::Any aNumber(xSet->getPropertyValue(OUString("Number"))); aNumber >>= nRetval; } catch(const uno::Exception&) diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 5bd9f7ba0cbc..ebd67334e16e 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -49,7 +49,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::i18n; -SmartTagMgr::SmartTagMgr( const rtl::OUString& rApplicationName ) +SmartTagMgr::SmartTagMgr( const OUString& rApplicationName ) : maApplicationName( rApplicationName ), maRecognizerList(), maActionList(), @@ -64,7 +64,7 @@ SmartTagMgr::~SmartTagMgr() { } -void SmartTagMgr::Init( const rtl::OUString& rConfigurationGroupName ) +void SmartTagMgr::Init( const OUString& rConfigurationGroupName ) { // get component context to pass to components: if ( mxContext.is() ) @@ -86,7 +86,7 @@ void SmartTagMgr::CreateBreakIterator() const /** Dispatches the recognize call to all installed smart tag recognizers */ -void SmartTagMgr::Recognize( const rtl::OUString& rText, +void SmartTagMgr::Recognize( const OUString& rText, const Reference< text::XTextMarkup > xMarkup, const Reference< frame::XController > xController, const lang::Locale& rLocale, @@ -102,7 +102,7 @@ void SmartTagMgr::Recognize( const rtl::OUString& rText, const sal_uInt32 nSmartTagCount = xRecognizer->getSmartTagCount(); for ( sal_uInt32 j = 0; j < nSmartTagCount && !bCallRecognizer; ++j ) { - const rtl::OUString aSmartTagName = xRecognizer->getSmartTagName(j); + const OUString aSmartTagName = xRecognizer->getSmartTagName(j); if ( IsSmartTagTypeEnabled( aSmartTagName ) ) bCallRecognizer = true; } @@ -118,9 +118,9 @@ void SmartTagMgr::Recognize( const rtl::OUString& rText, } } -typedef std::multimap < rtl::OUString, ActionReference >::const_iterator SmartTagMapIter; +typedef std::multimap < OUString, ActionReference >::const_iterator SmartTagMapIter; -void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes, +void SmartTagMgr::GetActionSequences( Sequence < OUString >& rSmartTagTypes, Sequence < Sequence< Reference< smarttags::XSmartTagAction > > >& rActionComponentsSequence, Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence ) const { @@ -129,7 +129,7 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes for ( sal_uInt16 j = 0; j < rSmartTagTypes.getLength(); ++j ) { - const rtl::OUString& rSmartTagType = rSmartTagTypes[j]; + const OUString& rSmartTagType = rSmartTagTypes[j]; const sal_Int32 nNumberOfActionRefs = maSmartTagMap.count( rSmartTagType ); @@ -153,9 +153,9 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes /** Returns the caption for a smart tag type. */ -rtl::OUString SmartTagMgr::GetSmartTagCaption( const rtl::OUString& rSmartTagType, const com::sun::star::lang::Locale& rLocale ) const +OUString SmartTagMgr::GetSmartTagCaption( const OUString& rSmartTagType, const com::sun::star::lang::Locale& rLocale ) const { - rtl::OUString aRet; + OUString aRet; SmartTagMapIter aLower = maSmartTagMap.lower_bound( rSmartTagType ); @@ -177,7 +177,7 @@ rtl::OUString SmartTagMgr::GetSmartTagCaption( const rtl::OUString& rSmartTagTyp /** Returns true if the given smart tag type is enabled. */ -bool SmartTagMgr::IsSmartTagTypeEnabled( const rtl::OUString& rSmartTagType ) const +bool SmartTagMgr::IsSmartTagTypeEnabled( const OUString& rSmartTagType ) const { return maDisabledSmartTagTypes.end() == maDisabledSmartTagTypes.find( rSmartTagType ); } @@ -185,7 +185,7 @@ bool SmartTagMgr::IsSmartTagTypeEnabled( const rtl::OUString& rSmartTagType ) co /** Writes currently disabled smart tag types to configuration. */ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, - const std::vector< rtl::OUString >* pDisabledTypes ) const + const std::vector< OUString >* pDisabledTypes ) const { if ( mxConfigurationSettings.is() ) { @@ -208,9 +208,9 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, if ( pDisabledTypes ) { const sal_Int32 nNumberOfDisabledSmartTagTypes = pDisabledTypes->size(); - Sequence< rtl::OUString > aTypes( nNumberOfDisabledSmartTagTypes ); + Sequence< OUString > aTypes( nNumberOfDisabledSmartTagTypes ); - std::vector< rtl::OUString >::const_iterator aIter; + std::vector< OUString >::const_iterator aIter; sal_Int32 nCount = 0; for ( aIter = pDisabledTypes->begin(); aIter != pDisabledTypes->end(); ++aIter ) aTypes[ nCount++ ] = *aIter; @@ -291,7 +291,7 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( Run for( sal_Int32 i = 0; i < nNumberOfChanges; ++i) { - rtl::OUString sTemp; + OUString sTemp; pElementChanges[i].Accessor >>= sTemp; if ( sTemp == "ExcludedSmartTagTypes" ) @@ -373,7 +373,7 @@ void SmartTagMgr::LoadLibraries() /** */ -void SmartTagMgr::PrepareConfiguration( const rtl::OUString& rConfigurationGroupName ) +void SmartTagMgr::PrepareConfiguration( const OUString& rConfigurationGroupName ) { Any aAny = makeAny( "/org.openoffice.Office.Common/SmartTags/" + rConfigurationGroupName ); beans::PropertyValue aPathArgument; @@ -423,7 +423,7 @@ void SmartTagMgr::ReadConfiguration( bool bExcludedTypes, bool bRecognize ) maDisabledSmartTagTypes.clear(); Any aAny = mxConfigurationSettings->getPropertyValue( "ExcludedSmartTagTypes" ); - Sequence< rtl::OUString > aValues; + Sequence< OUString > aValues; aAny >>= aValues; const sal_Int32 nValues = aValues.getLength(); @@ -473,7 +473,7 @@ void SmartTagMgr::RegisterListener() } } -typedef std::pair < const rtl::OUString, ActionReference > SmartTagMapElement; +typedef std::pair < const OUString, ActionReference > SmartTagMapElement; /** Sets up a map that maps smart tag type names to actions references. */ @@ -488,7 +488,7 @@ void SmartTagMgr::AssociateActionsWithRecognizers() const sal_uInt32 nSmartTagCount = xRecognizer->getSmartTagCount(); for ( sal_uInt32 j = 0; j < nSmartTagCount; ++j ) { - const rtl::OUString aSmartTagName = xRecognizer->getSmartTagName(j); + const OUString aSmartTagName = xRecognizer->getSmartTagName(j); // check if smart tag type has already been processed: if ( maSmartTagMap.find( aSmartTagName ) != maSmartTagMap.end() ) @@ -501,7 +501,7 @@ void SmartTagMgr::AssociateActionsWithRecognizers() const sal_uInt32 nSmartTagCountInActionLib = xActionLib->getSmartTagCount(); for ( sal_uInt32 l = 0; l < nSmartTagCountInActionLib; ++l ) { - const rtl::OUString aSmartTagNameInActionLib = xActionLib->getSmartTagName(l); + const OUString aSmartTagNameInActionLib = xActionLib->getSmartTagName(l); if ( aSmartTagName.equals( aSmartTagNameInActionLib ) ) { // found actions and recognizer for same smarttag diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index e6bd31f70556..1e931a98ae38 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -82,7 +82,7 @@ void SvxInsertStatusBarControl::Click() ::com::sun::star::uno::Any a; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "InsertMode" ); + aArgs[0].Name = OUString( "InsertMode" ); aIns.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index fed79ce0ad54..da2d40f44688 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -31,7 +31,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::PropertyValue; -using ::rtl::OUString; SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem); diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index b4485c535fc3..cfd39393c855 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -71,7 +71,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) if ( nConvVal < 0 && ( nConvVal / 100 == 0 ) ) sMetric += '-'; - sMetric += rtl::OUString::valueOf(nConvVal / 100); + sMetric += OUString::valueOf(nConvVal / 100); if( FUNIT_NONE != eOutUnit ) { @@ -82,7 +82,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) nFract *= -1; if ( nFract < 10 ) sMetric += '0'; - sMetric += rtl::OUString::valueOf(nFract); + sMetric += OUString::valueOf(nFract); } return sMetric; @@ -178,9 +178,9 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) ); pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) ); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION + addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION + addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL + addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION } // ----------------------------------------------------------------------- @@ -324,11 +324,11 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) SfxUInt16Item aItem( SID_PSZ_FUNCTION, nSelect ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "StatusBarFunc" ); + aArgs[0].Name = OUString( "StatusBarFunc" ); aItem.QueryValue( a ); aArgs[0].Value = a; - execute( rtl::OUString( ".uno:StatusBarFunc" ), aArgs ); + execute( OUString( ".uno:StatusBarFunc" ), aArgs ); // GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SFX_CALLMODE_RECORD, &aItem, 0L ); } } diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 25b0320292d7..18c33eaf92fa 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -353,7 +353,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ZoomSlider" ); + aArgs[0].Name = OUString( "ZoomSlider" ); aArgs[0].Value = a; execute( aArgs ); @@ -396,7 +396,7 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ZoomSlider" ); + aArgs[0].Name = OUString( "ZoomSlider" ); aArgs[0].Value = a; execute( aArgs ); diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx index af0a1f293c9b..66ce29e1df43 100644 --- a/svx/source/svdraw/ActionDescriptionProvider.cxx +++ b/svx/source/svdraw/ActionDescriptionProvider.cxx @@ -22,8 +22,8 @@ #include "svx/svdglob.hxx" #include "svx/svdstr.hrc" -::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType - , const ::rtl::OUString& rObjectName ) +OUString ActionDescriptionProvider::createDescription( ActionType eActionType + , const OUString& rObjectName ) { sal_uInt16 nResID=0; switch( eActionType ) @@ -63,7 +63,7 @@ break; } if(!nResID) - return rtl::OUString(); + return OUString(); OUString aStr(ImpGetResStr(nResID)); return aStr.replaceAll("%1", rObjectName); diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx index 383e5d81d817..4026a3291cd8 100644 --- a/svx/source/svdraw/charthelper.cxx +++ b/svx/source/svdraw/charthelper.cxx @@ -63,7 +63,7 @@ drawinglayer::primitive2d::Primitive2DSequence ChartHelper::tryToGetChartContent try { const uno::Reference< lang::XMultiServiceFactory > xChartFact(rXModel, uno::UNO_QUERY_THROW); - const uno::Reference< lang::XUnoTunnel > xChartView(xChartFact->createInstance(::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartView")), uno::UNO_QUERY_THROW); + const uno::Reference< lang::XUnoTunnel > xChartView(xChartFact->createInstance(OUString::createFromAscii("com.sun.star.chart2.ChartView")), uno::UNO_QUERY_THROW); const uno::Reference< util::XUpdatable > xUpdatable(xChartView, uno::UNO_QUERY_THROW); if(xUpdatable.is()) diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 99a8323d6b8a..9b5e9e486480 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -78,8 +78,8 @@ using namespace ::com::sun::star; { // Printer and VirtualDevice, or rather: no OutDev uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(rtl::OUString("com.sun.star.awt.UnoControlContainer")), uno::UNO_QUERY); - uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(rtl::OUString("com.sun.star.awt.UnoControlContainerModel")), uno::UNO_QUERY); + const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(OUString("com.sun.star.awt.UnoControlContainer")), uno::UNO_QUERY); + uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(OUString("com.sun.star.awt.UnoControlContainerModel")), uno::UNO_QUERY); uno::Reference< awt::XControl > xControl(mxControlContainer, uno::UNO_QUERY); if (xControl.is()) xControl->setModel(xModel); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index d11fea1ed665..d160b73cec22 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -728,7 +728,7 @@ SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrOnOffItem(Which(),rIn); } -rtl::OUString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const +OUString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const { if (bVal) return ImpGetResStr(STR_ItemValON); @@ -965,7 +965,7 @@ SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; } -rtl::OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos); } @@ -991,7 +991,7 @@ SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; } -rtl::OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos); } @@ -1022,7 +1022,7 @@ SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/ sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; } -rtl::OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos); } @@ -1079,7 +1079,7 @@ SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; } -rtl::OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos); } @@ -1128,7 +1128,7 @@ SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; } -rtl::OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos); } @@ -1177,7 +1177,7 @@ SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; } -rtl::OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos); } @@ -1225,7 +1225,7 @@ SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; } -rtl::OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos); } @@ -1572,7 +1572,7 @@ SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; } -rtl::OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos); } @@ -1761,7 +1761,7 @@ SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; } -rtl::OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_STD+nPos); } @@ -1809,7 +1809,7 @@ SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; } -rtl::OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos); } @@ -1857,7 +1857,7 @@ SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; } -rtl::OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos); } @@ -1905,7 +1905,7 @@ SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; } -rtl::OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const { OUString aRetval; @@ -1958,7 +1958,7 @@ SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; } -rtl::OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCIRC_FULL+nPos); } @@ -2197,9 +2197,9 @@ sal_uInt16 SdrGrafModeItem::GetValueCount() const return 4; } -rtl::OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const +OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const { - rtl::OUString aStr; + OUString aStr; switch(nPos) { diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 2b2e061777a4..35f4b9cb3bd7 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -1405,7 +1405,7 @@ SdrDragMove::SdrDragMove(SdrDragView& rNewView) void SdrDragMove::TakeSdrDragComment(XubString& rStr) const { - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_DragMethMove, rStr); rStr.AppendAscii(" (x="); @@ -2017,7 +2017,7 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const nTmpWink -= 36000; } - rtl::OUString aStr; + OUString aStr; getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr); rStr.Append(aStr); rStr += sal_Unicode(')'); @@ -2154,7 +2154,7 @@ void SdrDragShear::TakeSdrDragComment(XubString& rStr) const nTmpWink = NormAngle180(nTmpWink); - rtl::OUString aStr; + OUString aStr; getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr); rStr.Append(aStr); rStr += sal_Unicode(')'); @@ -2741,7 +2741,7 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const nVal *= 2; nVal = Abs(nVal); - rtl::OUString aStr; + OUString aStr; getSdrDragView().GetModel()->TakeWinkStr(nVal, aStr); rStr.Append(aStr); rStr += sal_Unicode(')'); @@ -3392,7 +3392,7 @@ void SdrDragDistort::TakeSdrDragComment(XubString& rStr) const { ImpTakeDescriptionStr(STR_DragMethDistort, rStr); - rtl::OUString aStr; + OUString aStr; rStr.AppendAscii(" (x="); getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr); @@ -3547,7 +3547,7 @@ void SdrDragCrop::TakeSdrDragComment(XubString& rStr) const { ImpTakeDescriptionStr(STR_DragMethCrop, rStr); - rtl::OUString aStr; + OUString aStr; rStr.AppendAscii(" (x="); getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr); diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index b99d2bb0edc1..0194e057806d 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -931,7 +931,7 @@ void SdrEditView::CopyMarkedObj() if(0L != nCloneErrCnt) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "SdrEditView::CopyMarkedObj(): Error when cloning ")); if(nCloneErrCnt == 1) diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 78e6d42a3218..50397b423b2b 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -737,7 +737,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bO bool bPrintable = true, bPrintableDC = false; bool bVisible = true, bVisibleDC = false; SdrLayerID nLayerId=0; bool bLayerDC=false; - rtl::OUString aObjName; + OUString aObjName; sal_Bool bObjNameDC=false,bObjNameSet=false; long nSnapPosX=0; bool bSnapPosXDC=false; long nSnapPosY=0; bool bSnapPosYDC=false; diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 04ee1d9285bf..ff9ba23870f4 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1157,7 +1157,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) pView->GetAttributes(aSet); SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId); - rtl::OUString aNewText(pBrowse->GetNewEntryValue()); + OUString aNewText(pBrowse->GetNewEntryValue()); sal_Bool bDel( aNewText == "del" || aNewText == "Del" || aNewText == "DEL" @@ -1184,7 +1184,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) if (nPos!=01) { bPairX=nPos>0; - rtl::OUString s(aNewText.copy(nPos+nSepLen)); + OUString s(aNewText.copy(nPos+nSepLen)); bPairY = !aNewText.isEmpty(); nLongY = s.toInt32(); } diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 12e77d0dc667..70eeeb395e81 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -299,9 +299,9 @@ SdrModel::~SdrModel() #ifdef DBG_UTIL if(pAktUndoGroup) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "In the Dtor of the SdrModel there is an open Undo left: \"")); - aStr.append(rtl::OUStringToOString(pAktUndoGroup->GetComment(), osl_getThreadTextEncoding())) + aStr.append(OUStringToOString(pAktUndoGroup->GetComment(), osl_getThreadTextEncoding())) .append('\"'); OSL_FAIL(aStr.getStr()); } @@ -913,7 +913,7 @@ uno::Reference SdrModel::GetDocumentStorage() const } uno::Reference -SdrModel::GetDocumentStream( ::rtl::OUString const& rURL, +SdrModel::GetDocumentStream( OUString const& rURL, ::comphelper::LifecycleProxy & rProxy) const { uno::Reference const xStorage(GetDocumentStorage()); @@ -1239,7 +1239,7 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr) } } -void SdrModel::TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars, sal_Int32 nNumDigits) const +void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_Int32 nNumDigits) const { // #i22167# // change to double precision usage to not lose decimal places @@ -1277,7 +1277,7 @@ void SdrModel::TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars, nKomma = nNumDigits; } - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(static_cast(fLocalValue + 0.5)); if(nKomma < 0) @@ -1355,14 +1355,14 @@ void SdrModel::TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars, rStr = aBuf.makeStringAndClear(); } -void SdrModel::TakeWinkStr(long nWink, rtl::OUString& rStr, bool bNoDegChar) const +void SdrModel::TakeWinkStr(long nWink, OUString& rStr, bool bNoDegChar) const { bool bNeg = nWink < 0; if(bNeg) nWink = -nWink; - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(static_cast(nWink)); SvtSysLocale aSysLoc; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index fe89daed66dc..03468235ea88 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -170,11 +170,11 @@ static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape ) { MSO_SPT eRetValue = mso_sptNil; - rtl::OUString aEngine( ( (SdrCustomShapeEngineItem&)rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ) ).GetValue() ); + OUString aEngine( ( (SdrCustomShapeEngineItem&)rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ) ).GetValue() ); if ( aEngine.isEmpty() || aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine" ) { - rtl::OUString sShapeType; - const rtl::OUString sType( "Type" ); + OUString sShapeType; + const OUString sType( "Type" ); SdrCustomShapeGeometryItem& rGeometryItem( (SdrCustomShapeGeometryItem&)rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); if ( pAny && ( *pAny >>= sShapeType ) ) @@ -424,7 +424,7 @@ Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const { Sequence< Any > aArgument( 1 ); Sequence< PropertyValue > aPropValues( 1 ); - aPropValues[ 0 ].Name = rtl::OUString("CustomShape"); + aPropValues[ 0 ].Name = OUString("CustomShape"); aPropValues[ 0 ].Value <<= aXShape; aArgument[ 0 ] <<= aPropValues; Reference< XInterface > xInterface( xContext->getServiceManager()->createInstanceWithArgumentsAndContext( aEngine, aArgument, xContext ) ); @@ -475,7 +475,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const sal_Bool SdrObjCustomShape::IsTextPath() const { - const rtl::OUString sTextPath( "TextPath" ); + const OUString sTextPath( "TextPath" ); sal_Bool bTextPathOn = sal_False; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath ); @@ -487,8 +487,8 @@ sal_Bool SdrObjCustomShape::IsTextPath() const sal_Bool SdrObjCustomShape::UseNoFillStyle() const { sal_Bool bRet = sal_False; - rtl::OUString sShapeType; - const rtl::OUString sType( "Type" ); + OUString sShapeType; + const OUString sType( "Type" ); SdrCustomShapeGeometryItem& rGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any* pAny = rGeometryItem.GetPropertyValueByName( sType ); if ( pAny ) @@ -502,7 +502,7 @@ sal_Bool SdrObjCustomShape::IsMirroredX() const { sal_Bool bMirroredX = sal_False; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredX( "MirroredX" ); + const OUString sMirroredX( "MirroredX" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); if ( pAny ) *pAny >>= bMirroredX; @@ -512,7 +512,7 @@ sal_Bool SdrObjCustomShape::IsMirroredY() const { sal_Bool bMirroredY = sal_False; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredY( "MirroredY" ); + const OUString sMirroredY( "MirroredY" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); if ( pAny ) *pAny >>= bMirroredY; @@ -521,7 +521,7 @@ sal_Bool SdrObjCustomShape::IsMirroredY() const void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredX( "MirroredX" ); + const OUString sMirroredX( "MirroredX" ); PropertyValue aPropVal; aPropVal.Name = sMirroredX; aPropVal.Value <<= bMirrorX; @@ -531,7 +531,7 @@ void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX ) void SdrObjCustomShape::SetMirroredY( const sal_Bool bMirrorY ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sMirroredY( "MirroredY" ); + const OUString sMirroredY( "MirroredY" ); PropertyValue aPropVal; aPropVal.Name = sMirroredY; aPropVal.Value <<= bMirrorY; @@ -559,8 +559,8 @@ double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const { const com::sun::star::uno::Any* pAny; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - const rtl::OUString sTextRotateAngle( "TextRotateAngle" ); - const rtl::OUString sTextPreRotateAngle( "TextPreRotateAngle" ); + const OUString sTextRotateAngle( "TextRotateAngle" ); + const OUString sTextPreRotateAngle( "TextPreRotateAngle" ); pAny = rGeometryItem.GetPropertyValueByName( bPreRotation ? sTextPreRotateAngle : sTextRotateAngle ); double fExtraTextRotateAngle = 0.0; if ( pAny ) @@ -742,7 +742,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s // POSITION { - const rtl::OUString sPosition( "Position" ); + const OUString sPosition( "Position" ); ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, true, true ); EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, true, false ); @@ -751,28 +751,28 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) { - const rtl::OUString sMirroredX( "MirroredX" ); + const OUString sMirroredX( "MirroredX" ); sal_Bool bMirroredX = sal_True; rPropValues[ n ].Name = sMirroredX; rPropValues[ n++ ].Value <<= bMirroredX; } if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) { - const rtl::OUString sMirroredY( "MirroredY" ); + const OUString sMirroredY( "MirroredY" ); sal_Bool bMirroredY = sal_True; rPropValues[ n ].Name = sMirroredY; rPropValues[ n++ ].Value <<= bMirroredY; } if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) { - const rtl::OUString sSwitched( "Switched" ); + const OUString sSwitched( "Switched" ); sal_Bool bSwitched = sal_True; rPropValues[ n ].Name = sSwitched; rPropValues[ n++ ].Value <<= bSwitched; } if ( nFlags & MSDFF_HANDLE_FLAGS_POLAR ) { - const rtl::OUString sPolar( "Polar" ); + const OUString sPolar( "Polar" ); ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX, ( nFlags & MSDFF_HANDLE_FLAGS_CENTER_X_IS_SPECIAL ) != 0, true ); @@ -784,7 +784,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s { if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRadiusRangeMinimum( "RadiusRangeMinimum" ); + const OUString sRadiusRangeMinimum( "RadiusRangeMinimum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, true ); @@ -793,7 +793,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRadiusRangeMaximum( "RadiusRangeMaximum" ); + const OUString sRadiusRangeMaximum( "RadiusRangeMaximum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, false ); @@ -806,7 +806,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s { if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeXMinimum( "RangeXMinimum" ); + const OUString sRangeXMinimum( "RangeXMinimum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL ) != 0, true ); @@ -815,7 +815,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeXMaximum( "RangeXMaximum" ); + const OUString sRangeXMaximum( "RangeXMaximum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL ) != 0, false ); @@ -824,7 +824,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeYMinimum( "RangeYMinimum" ); + const OUString sRangeYMinimum( "RangeYMinimum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL ) != 0, true ); @@ -833,7 +833,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s } if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { - const rtl::OUString sRangeYMaximum( "RangeYMaximum" ); + const OUString sRangeYMaximum( "RangeYMaximum" ); ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax, ( nFlags & MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL ) != 0, false ); @@ -864,11 +864,11 @@ SdrObjCustomShape::~SdrObjCustomShape() InvalidateRenderGeometry(); } -void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) +void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) { PropertyValue aPropVal; - rtl::OUString sShapeType; - const rtl::OUString sType( "Type" ); + OUString sShapeType; + const OUString sType( "Type" ); SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); if ( pType && !pType->isEmpty() ) { @@ -900,7 +900,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) ////////////////////// // AdjustmentValues // ////////////////////// - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); const Any* pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sAdjustmentValues ); if ( pAny ) *pAny >>= seqAdjustmentValues; @@ -936,7 +936,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) /////////////// // Coordsize // /////////////// - const rtl::OUString sViewBox( "ViewBox" ); + const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; if ( !pViewBox || !(*pViewBox >>= aViewBox ) ) @@ -953,12 +953,12 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } } - const rtl::OUString sPath( "Path" ); + const OUString sPath( "Path" ); ////////////////////// // Path/Coordinates // ////////////////////// - const rtl::OUString sCoordinates( "Coordinates" ); + const OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( !pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices ) { @@ -977,7 +977,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/GluePoints // - const rtl::OUString sGluePoints( "GluePoints" ); + const OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( !pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) { @@ -995,7 +995,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/Segments // - const rtl::OUString sSegments( "Segments" ); + const OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( !pAny && pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements ) { @@ -1015,7 +1015,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/StretchX // - const rtl::OUString sStretchX( "StretchX" ); + const OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( !pAny && pDefCustomShape ) { @@ -1029,7 +1029,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/StretchY // - const rtl::OUString sStretchY( "StretchY" ); + const OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( !pAny && pDefCustomShape ) { @@ -1043,7 +1043,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Path/TextFrames // - const rtl::OUString sTextFrames( "TextFrames" ); + const OUString sTextFrames( "TextFrames" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( !pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect ) { @@ -1065,11 +1065,11 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Equations // - const rtl::OUString sEquations( "Equations" ); + const OUString sEquations( "Equations" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations ); if ( !pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation ) { - com::sun::star::uno::Sequence< rtl::OUString > seqEquations; + com::sun::star::uno::Sequence< OUString > seqEquations; sal_Int32 i, nCount = pDefCustomShape->nCalculation; seqEquations.realloc( nCount ); @@ -1082,7 +1082,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType ) } // Handles // - const rtl::OUString sHandles( "Handles" ); + const OUString sHandles( "Handles" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles ); if ( !pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles ) { @@ -1111,8 +1111,8 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) sal_Bool bIsDefaultGeometry = sal_False; PropertyValue aPropVal; - rtl::OUString sShapeType; - const rtl::OUString sType( "Type" ); + OUString sShapeType; + const OUString sType( "Type" ); SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any *pAny = aGeometryItem.GetPropertyValueByName( sType ); @@ -1122,12 +1122,12 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) MSO_SPT eSpType = EnhancedCustomShapeTypeNames::Get( sShapeType ); const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType ); - const rtl::OUString sPath( "Path" ); + const OUString sPath( "Path" ); switch( eDefaultType ) { case DEFAULT_VIEWBOX : { - const rtl::OUString sViewBox( "ViewBox" ); + const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox ); com::sun::star::awt::Rectangle aViewBox; if ( pViewBox && ( *pViewBox >>= aViewBox ) ) @@ -1141,7 +1141,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_PATH : { - const rtl::OUString sCoordinates( "Coordinates" ); + const OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices ) { @@ -1166,7 +1166,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_GLUEPOINTS : { - const rtl::OUString sGluePoints( "GluePoints" ); + const OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) { @@ -1192,7 +1192,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_SEGMENTS : { // Path/Segments // - const rtl::OUString sSegments( "Segments" ); + const OUString sSegments( "Segments" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( pAny ) { @@ -1236,7 +1236,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_STRETCHX : { - const rtl::OUString sStretchX( "StretchX" ); + const OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX ); if ( pAny && pDefCustomShape ) { @@ -1254,7 +1254,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_STRETCHY : { - const rtl::OUString sStretchY( "StretchY" ); + const OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY ); if ( pAny && pDefCustomShape ) { @@ -1272,11 +1272,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_EQUATIONS : { - const rtl::OUString sEquations( "Equations" ); + const OUString sEquations( "Equations" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations ); if ( pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation ) { - com::sun::star::uno::Sequence< rtl::OUString > seqEquations1, seqEquations2; + com::sun::star::uno::Sequence< OUString > seqEquations1, seqEquations2; if ( *pAny >>= seqEquations1 ) { sal_Int32 i, nCount = pDefCustomShape->nCalculation; @@ -1297,7 +1297,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_TEXTFRAMES : { - const rtl::OUString sTextFrames( "TextFrames" ); + const OUString sTextFrames( "TextFrames" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect ) { @@ -1325,7 +1325,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) case DEFAULT_HANDLES : { - const rtl::OUString sHandles( "Handles" ); + const OUString sHandles( "Handles" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles ); if ( pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles ) { @@ -1661,7 +1661,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) // "MirroredX" // if ( bHorz ) { - const rtl::OUString sMirroredX( "MirroredX" ); + const OUString sMirroredX( "MirroredX" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); if ( pAny ) { @@ -1681,7 +1681,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 ) // "MirroredY" // if ( bVert ) { - const rtl::OUString sMirroredY( "MirroredY" ); + const OUString sMirroredY( "MirroredY" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); if ( pAny ) { @@ -2942,7 +2942,7 @@ void SdrObjCustomShape::SaveGeoData(SdrObjGeoData& rGeo) const rAGeo.bMirroredX = IsMirroredX(); rAGeo.bMirroredY = IsMirroredY(); - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); Any* pAny( ( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ).GetPropertyValueByName( sAdjustmentValues ) ); if ( pAny ) *pAny >>= rAGeo.aAdjustmentSeq; @@ -2957,7 +2957,7 @@ void SdrObjCustomShape::RestGeoData(const SdrObjGeoData& rGeo) SetMirroredY( rAGeo.bMirroredY ); SdrCustomShapeGeometryItem rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); PropertyValue aPropVal; aPropVal.Name = sAdjustmentValues; aPropVal.Value <<= rAGeo.aAdjustmentSeq; @@ -3180,14 +3180,14 @@ sdr::contact::ViewContact* SdrObjCustomShape::CreateObjectSpecificViewContact() } // #i33136# -bool SdrObjCustomShape::doConstructOrthogonal(const ::rtl::OUString& rName) +bool SdrObjCustomShape::doConstructOrthogonal(const OUString& rName) { bool bRetval(false); - static ::rtl::OUString Imps_sNameASOrtho_quadrat( "quadrat" ); - static ::rtl::OUString Imps_sNameASOrtho_round_quadrat( "round-quadrat" ); - static ::rtl::OUString Imps_sNameASOrtho_circle( "circle" ); - static ::rtl::OUString Imps_sNameASOrtho_circle_pie( "circle-pie" ); - static ::rtl::OUString Imps_sNameASOrtho_ring( "ring" ); + static OUString Imps_sNameASOrtho_quadrat( "quadrat" ); + static OUString Imps_sNameASOrtho_round_quadrat( "round-quadrat" ); + static OUString Imps_sNameASOrtho_circle( "circle" ); + static OUString Imps_sNameASOrtho_circle_pie( "circle-pie" ); + static OUString Imps_sNameASOrtho_ring( "ring" ); if(Imps_sNameASOrtho_quadrat.equalsIgnoreAsciiCase(rName)) { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 76dcf8d1f07e..c997592f440a 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -207,9 +207,9 @@ bool SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pOb return false; } -rtl::OUString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const +OUString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const { - return rtl::OUString(); + return OUString(); } SdrObjUserDataList::SdrObjUserDataList() {} @@ -723,7 +723,7 @@ SdrObject* SdrObject::GetUpGroup() const return pObjList!=NULL ? pObjList->GetOwnerObj() : NULL; } -void SdrObject::SetName(const rtl::OUString& rStr) +void SdrObject::SetName(const OUString& rStr) { if (!rStr.isEmpty() && !pPlusData) { @@ -757,17 +757,17 @@ void SdrObject::SetName(const rtl::OUString& rStr) } } -rtl::OUString SdrObject::GetName() const +OUString SdrObject::GetName() const { if(pPlusData) { return pPlusData->aObjName; } - return rtl::OUString(); + return OUString(); } -void SdrObject::SetTitle(const rtl::OUString& rStr) +void SdrObject::SetTitle(const OUString& rStr) { if (!rStr.isEmpty() && !pPlusData) { @@ -801,17 +801,17 @@ void SdrObject::SetTitle(const rtl::OUString& rStr) } } -rtl::OUString SdrObject::GetTitle() const +OUString SdrObject::GetTitle() const { if(pPlusData) { return pPlusData->aObjTitle; } - return rtl::OUString(); + return OUString(); } -void SdrObject::SetDescription(const rtl::OUString& rStr) +void SdrObject::SetDescription(const OUString& rStr) { if (!rStr.isEmpty() && !pPlusData) { @@ -845,14 +845,14 @@ void SdrObject::SetDescription(const rtl::OUString& rStr) } } -rtl::OUString SdrObject::GetDescription() const +OUString SdrObject::GetDescription() const { if(pPlusData) { return pPlusData->aObjDescription; } - return rtl::OUString(); + return OUString(); } sal_uInt32 SdrObject::GetOrdNum() const @@ -1078,7 +1078,7 @@ void SdrObject::TakeObjNamePlural(XubString& rName) const rName=ImpGetResStr(STR_ObjNamePluralNONE); } -void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, rtl::OUString& rStr, sal_uInt16 nVal) const +void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal) const { rStr = ImpGetResStr(nStrCacheID); sal_Int32 nPos = rStr.indexOf("%1"); @@ -1103,18 +1103,18 @@ void SdrObject::ImpForcePlusData() pPlusData = NewPlusData(); } -rtl::OUString SdrObject::GetWinkStr(long nWink, bool bNoDegChar) const +OUString SdrObject::GetWinkStr(long nWink, bool bNoDegChar) const { - rtl::OUString aStr; + OUString aStr; if (pModel!=NULL) { pModel->TakeWinkStr(nWink,aStr,bNoDegChar); } return aStr; } -rtl::OUString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, bool bNoUnitChars) const +OUString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, bool bNoUnitChars) const { - rtl::OUString aStr; + OUString aStr; if (pModel!=NULL) { pModel->TakeMetricStr(nVal,aStr,bNoUnitChars); } @@ -1874,13 +1874,13 @@ bool SdrObject::DoMacro(const SdrObjMacroHitRec& rRec) return false; } -rtl::OUString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const +OUString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const { SdrObjUserData* pData=ImpGetMacroUserData(); if (pData!=NULL) { return pData->GetMacroPopupComment(rRec,this); } - return rtl::OUString(); + return OUString(); } bool SdrObject::IsMacroHit(const SdrObjMacroHitRec& rRec) const diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 20e1675e4280..de6779e1c78c 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -391,7 +391,7 @@ String SdrCaptionObj::getSpecialDragComment(const SdrDragStat& rDrag) const } else { - rtl::OUString aStr; + OUString aStr; if(!pHdl) { diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index a5a24da972ba..7cfbae08468e 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -560,9 +560,9 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const if(bCreateComment) { - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_ViewCreateObj, aStr); - rtl::OUStringBuffer aBuf(aStr); + OUStringBuffer aBuf(aStr); const sal_uInt32 nPntAnz(rDrag.GetPointAnz()); if(OBJ_CIRC != meCircleKind && nPntAnz > 2) @@ -595,9 +595,9 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const { const sal_Int32 nWink(1 == rDrag.GetHdl()->GetPointNum() ? nStartWink : nEndWink); - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_DragCircAngle, aStr); - rtl::OUStringBuffer aBuf(aStr); + OUStringBuffer aBuf(aStr); aBuf.appendAscii(" ("); aBuf.append(GetWinkStr(nWink,false)); aBuf.append(sal_Unicode(')')); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index a62ec29fd651..6c1c8643f084 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -1930,7 +1930,7 @@ String SdrEdgeObj::getSpecialDragComment(const SdrDragStat& rDrag) const } else { - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_DragEdgeTail, aStr); return aStr; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index bd9be1b732a3..3f7a14e7b8be 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -91,7 +91,7 @@ const Graphic ImpLoadLinkedGraphic( const String aFileName, const String aFilter // As this is a linked graphic the GfxLink is not needed if saving/loading our own format. // But this link is required by some filters to access the native graphic (PDF export/MS export), // there we should create a new service to provide this data if needed - aFilterData[ 0 ].Name = rtl::OUString( "CreateNativeLink" ); + aFilterData[ 0 ].Name = OUString( "CreateNativeLink" ); aFilterData[ 0 ].Value = Any( true ); rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); } @@ -620,7 +620,7 @@ void SdrGrafObj::ImpLinkAbmeldung() } } -void SdrGrafObj::SetGraphicLink(const rtl::OUString& rFileName, const String& rFilterName) +void SdrGrafObj::SetGraphicLink(const OUString& rFileName, const String& rFilterName) { ImpLinkAbmeldung(); aFileName = rFileName; @@ -635,8 +635,8 @@ void SdrGrafObj::SetGraphicLink(const rtl::OUString& rFileName, const String& rF void SdrGrafObj::ReleaseGraphicLink() { ImpLinkAbmeldung(); - aFileName = rtl::OUString(); - aFilterName = rtl::OUString(); + aFileName = OUString(); + aFilterName = OUString(); } bool SdrGrafObj::IsLinkedGraphic() const @@ -644,12 +644,12 @@ bool SdrGrafObj::IsLinkedGraphic() const return !aFileName.isEmpty(); } -const rtl::OUString& SdrGrafObj::GetFileName() const +const OUString& SdrGrafObj::GetFileName() const { return aFileName; } -const rtl::OUString& SdrGrafObj::GetFilterName() const +const OUString& SdrGrafObj::GetFilterName() const { return aFilterName; } diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index a2ad1574dca5..ccd69b8b0ebd 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -112,7 +112,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe nLen = BigMulDiv(nLen, aFact.GetNumerator(), aFact.GetDenominator()); } - rtl::OUString aTmp; + OUString aTmp; pModel->TakeMetricStr(nLen, aTmp, true, nNumDigits); rStr = aTmp; diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 6d4fee8e95e2..085e805ec2ab 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -51,8 +51,8 @@ using namespace ::com::sun::star; // hence the shared_ptr. struct MediaTempFile { - ::rtl::OUString const m_TempFileURL; - MediaTempFile(::rtl::OUString const& rURL) : m_TempFileURL(rURL) {} + OUString const m_TempFileURL; + MediaTempFile(OUString const& rURL) : m_TempFileURL(rURL) {} ~MediaTempFile() { ::osl::File::remove(m_TempFileURL); @@ -184,7 +184,7 @@ uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() { if( !m_pImpl->m_xCachedSnapshot.is() ) { - rtl::OUString aRealURL = m_pImpl->m_MediaProperties.getTempURL(); + OUString aRealURL = m_pImpl->m_MediaProperties.getTempURL(); if( aRealURL.isEmpty() ) aRealURL = m_pImpl->m_MediaProperties.getURL(); m_pImpl->m_xCachedSnapshot = avmedia::MediaWindow::grabFrame( aRealURL, true ); @@ -240,7 +240,7 @@ void SdrMediaObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly / // ------------------------------------------------------------------------------ -void SdrMediaObj::setURL( const ::rtl::OUString& rURL) +void SdrMediaObj::setURL( const OUString& rURL) { ::avmedia::MediaItem aURLItem; @@ -250,7 +250,7 @@ void SdrMediaObj::setURL( const ::rtl::OUString& rURL) // ------------------------------------------------------------------------------ -const ::rtl::OUString& SdrMediaObj::getURL() const +const OUString& SdrMediaObj::getURL() const { return m_pImpl->m_MediaProperties.getURL(); } @@ -294,9 +294,9 @@ uno::Reference SdrMediaObj::GetInputStream() /// copy a stream from XStorage to temp file static bool lcl_HandlePackageURL( - ::rtl::OUString const & rURL, + OUString const & rURL, SdrModel *const pModel, - ::rtl::OUString & o_rTempFileURL) + OUString & o_rTempFileURL) { if (!pModel) { @@ -310,7 +310,7 @@ static bool lcl_HandlePackageURL( } catch (container::NoSuchElementException const&) { - SAL_INFO("svx", "not found: '" << ::rtl::OUString(rURL) << "'"); + SAL_INFO("svx", "not found: '" << OUString(rURL) << "'"); return false; } catch (uno::Exception const& e) @@ -324,7 +324,7 @@ static bool lcl_HandlePackageURL( return false; } - ::rtl::OUString tempFileURL; + OUString tempFileURL; ::osl::FileBase::RC const err = ::osl::FileBase::createTempFile(0, 0, & tempFileURL); if (::osl::FileBase::E_None != err) @@ -361,7 +361,7 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper ( rNewProperties.getURL() != getURL() )) { m_pImpl->m_xCachedSnapshot.clear(); - ::rtl::OUString const url(rNewProperties.getURL()); + OUString const url(rNewProperties.getURL()); if ((0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( url.getStr(), url.getLength(), s_PkgScheme, SAL_N_ELEMENTS(s_PkgScheme) - 1))) @@ -370,7 +370,7 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper || (m_pImpl->m_pTempFile->m_TempFileURL != rNewProperties.getTempURL())) { - ::rtl::OUString tempFileURL; + OUString tempFileURL; bool const bSuccess = lcl_HandlePackageURL( url, GetModel(), tempFileURL); if (bSuccess) @@ -381,7 +381,7 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper else // this case is for Clone via operator= { m_pImpl->m_pTempFile.reset(); - m_pImpl->m_MediaProperties.setURL(::rtl::OUString(), 0); + m_pImpl->m_MediaProperties.setURL(OUString(), 0); } } else diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index d3b409025d61..c1ee6cf38574 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -434,7 +434,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI() com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager(getLayoutManager()); if ( xLayoutManager.is() ) { - const static rtl::OUString aMenuBarURL( "private:resource/menubar/menubar" ); + const static OUString aMenuBarURL( "private:resource/menubar/menubar" ); if ( !xLayoutManager->isElementVisible( aMenuBarURL ) ) xLayoutManager->createElement( aMenuBarURL ); } @@ -450,7 +450,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbed uno::Reference < beans::XPropertySet > xFrame( lcl_getFrame_throw(mpObj)); try { - xMan.set(xFrame->getPropertyValue( ::rtl::OUString("LayoutManager") ),uno::UNO_QUERY); + xMan.set(xFrame->getPropertyValue( OUString("LayoutManager") ),uno::UNO_QUERY); } catch ( uno::Exception& ) { @@ -918,8 +918,8 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() // TODO/LATER: there should be possible to get current mediadescriptor settings from the object uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "URL" ); - aArgs[0].Value <<= ::rtl::OUString( aNewLinkURL ); + aArgs[0].Name = OUString( "URL" ); + aArgs[0].Value <<= OUString( aNewLinkURL ); xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() ); mpImpl->maLinkURL = aNewLinkURL; @@ -933,7 +933,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::UpdateLinkURL_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -975,7 +975,7 @@ void SdrOle2Obj::BreakFileLink_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::BreakFileLink_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1026,7 +1026,7 @@ void SdrOle2Obj::CheckFileLink_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::CheckFileLink_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1060,7 +1060,7 @@ void SdrOle2Obj::Connect_Impl() if ( xObjRef.is() ) { // object came from the outside, now add it to the container - ::rtl::OUString aTmp; + OUString aTmp; rContainer.InsertEmbeddedObject( xObjRef.GetObject(), aTmp ); mpImpl->aPersistName = aTmp; } @@ -1110,7 +1110,7 @@ void SdrOle2Obj::Connect_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::Connect_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1197,7 +1197,7 @@ void SdrOle2Obj::RemoveListeners_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::RemoveListeners_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1279,7 +1279,7 @@ void SdrOle2Obj::Disconnect_Impl() OSL_FAIL( OString(OString("SdrOle2Obj::Disconnect_Impl(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1397,7 +1397,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) try { // move the object's storage; ObjectRef remains the same, but PersistName may change - ::rtl::OUString aTmp; + OUString aTmp; comphelper::EmbeddedObjectContainer& rContainer = pSrcPers->getEmbeddedObjectContainer(); uno::Reference < embed::XEmbeddedObject > xObj = rContainer.GetEmbeddedObject( mpImpl->aPersistName ); DBG_ASSERT( !xObjRef.is() || xObjRef.GetObject() == xObj, "Wrong object identity!" ); @@ -1414,7 +1414,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) OSL_FAIL( OString(OString("SdrOle2Obj::SetModel(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -1647,7 +1647,7 @@ SdrOle2Obj& SdrOle2Obj::operator=(const SdrOle2Obj& rObj) uno::Reference < embed::XEmbeddedObject > xObj = rContainer.GetEmbeddedObject( mpImpl->aPersistName ); if ( xObj.is() ) { - ::rtl::OUString aTmp; + OUString aTmp; xObjRef.Assign( pDestPers->getEmbeddedObjectContainer().CopyAndGetEmbeddedObject( rContainer, xObj, aTmp ), rOle2Obj.GetAspect() ); m_bTypeAsked = false; mpImpl->aPersistName = aTmp; @@ -1937,7 +1937,7 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb OSL_FAIL( OString(OString("SdrOle2Obj::Unload=(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -2091,13 +2091,13 @@ sal_Bool SdrOle2Obj::IsChart() const } // ----------------------------------------------------------------------------- -void SdrOle2Obj::SetGraphicToObj( const Graphic& aGraphic, const ::rtl::OUString& aMediaType ) +void SdrOle2Obj::SetGraphicToObj( const Graphic& aGraphic, const OUString& aMediaType ) { xObjRef.SetGraphic( aGraphic, aMediaType ); } // ----------------------------------------------------------------------------- -void SdrOle2Obj::SetGraphicToObj( const uno::Reference< io::XInputStream >& xGrStream, const ::rtl::OUString& aMediaType ) +void SdrOle2Obj::SetGraphicToObj( const uno::Reference< io::XInputStream >& xGrStream, const OUString& aMediaType ) { xObjRef.SetGraphicStream( xGrStream, aMediaType ); } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 03b003343552..2114653c37bb 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -920,7 +920,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) ImpPathCreateUser* pU = (ImpPathCreateUser*)rDrag.GetUser(); const SdrObjKind eKindMerk(meObjectKind); mrSdrPathObject.meKind = pU->eAktKind; - rtl::OUString aTmp; + OUString aTmp; mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewCreateObj, aTmp); aStr = aTmp; mrSdrPathObject.meKind = eKindMerk; @@ -934,7 +934,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) aNow -= aPrev; aStr.AppendAscii(" ("); - rtl::OUString aMetr; + OUString aMetr; if(pU->bCircle) { @@ -972,7 +972,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) { // #i103058# fallback when no model and/or Handle, both needed // for else-path - rtl::OUString aTmp; + OUString aTmp; mrSdrPathObject.ImpTakeDescriptionStr(STR_DragPathObj, aTmp); aStr = aTmp; } @@ -997,7 +997,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) if(!pDragData->IsMultiPointDrag() && pDragData->bEliminate) { // point of ... - rtl::OUString aTmp; + OUString aTmp; mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewMarkedPoint, aTmp); aStr = aTmp; @@ -1013,7 +1013,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) // dx=0.00 dy=0.00 -- both sides bezier // dx=0.00 dy=0.00 l=0.00 0.00° -- one bezier/lever on one side, a start, or an ending // dx=0.00 dy=0.00 l=0.00 0.00° / l=0.00 0.00° -- in between - rtl::OUString aMetr; + OUString aMetr; Point aBeg(rDrag.GetStart()); Point aNow(rDrag.GetNow()); diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index a60894e46147..3e2e1d094ecf 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -439,9 +439,9 @@ String SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const if(nRad < 0) nRad = 0; - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_DragRectEckRad, aStr); - rtl::OUStringBuffer aBuf(aStr); + OUStringBuffer aBuf(aStr); aBuf.appendAscii(" ("); aBuf.append(GetMetrStr(nRad)); aBuf.append(sal_Unicode(')')); @@ -509,7 +509,7 @@ bool SdrRectObj::DoMacro(const SdrObjMacroHitRec& rRec) return SdrTextObj::DoMacro(rRec); } -rtl::OUString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const +OUString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const { return SdrTextObj::GetMacroPopupComment(rRec); } diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 763465aae58f..8aa6fd274d0d 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -857,7 +857,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS { // check whether CharStretching is possible at all GDIMetaFile* pMtf = pOut->GetConnectMetaFile(); - rtl::OUString aTestString(static_cast('J')); + OUString aTestString(static_cast('J')); if(pMtf && (!pMtf->IsRecord() || pMtf->IsPause())) pMtf = NULL; diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 99ef8f541acd..1402a426879b 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -173,7 +173,7 @@ bool SdrTextObj::applySpecialDrag(SdrDragStat& rDrag) String SdrTextObj::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const { - rtl::OUString aStr; + OUString aStr; ImpTakeDescriptionStr(STR_DragRectResize,aStr); return aStr; } diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 05699f1e3cb8..a01ab9dc6a52 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -176,7 +176,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); ::ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue( ::rtl::OUString( "DateModified" ) ) ); + ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue( OUString( "DateModified" ) ) ); ::com::sun::star::util::DateTime aDateTime; aAny >>= aDateTime; @@ -213,7 +213,7 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/ if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aFileURLStr; + OUString aFileURLStr; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aFileURLStr ) ) aFileURL = INetURLObject( aFileURLStr ); diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index f9f2ca7b689b..533668bbb309 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -245,7 +245,7 @@ void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode ) { uno::Reference< beans::XPropertySet > xModelProperties( GetUnoControlModel(), uno::UNO_QUERY_THROW ); xModelProperties->setPropertyValue( - ::rtl::OUString( "ContextWritingMode" ), + OUString( "ContextWritingMode" ), uno::makeAny( _nContextWritingMode ) ); } @@ -334,8 +334,8 @@ SdrUnoObj& SdrUnoObj::operator= (const SdrUnoObj& rObj) uno::Reference< beans::XPropertySet > xSet(xUnoControlModel, uno::UNO_QUERY); if (xSet.is()) { - uno::Any aValue( xSet->getPropertyValue( rtl::OUString("DefaultControl")) ); - ::rtl::OUString aStr; + uno::Any aValue( xSet->getPropertyValue( OUString("DefaultControl")) ); + OUString aStr; if( aValue >>= aStr ) aUnoControlTypeName = String(aStr); @@ -536,7 +536,7 @@ void SdrUnoObj::SetUnoControlModel( const uno::Reference< awt::XControlModel >& if (xSet.is()) { uno::Any aValue( xSet->getPropertyValue(String("DefaultControl", osl_getThreadTextEncoding())) ); - ::rtl::OUString aStr; + OUString aStr; if( aValue >>= aStr ) aUnoControlTypeName = String(aStr); } diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 962d671f68fe..2e80aa526488 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -624,7 +624,7 @@ bool SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec) return rRefObj.DoMacro(rRec); // TODO: positioning offset } -rtl::OUString SdrVirtObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const +OUString SdrVirtObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const { return rRefObj.GetMacroPopupComment(rRec); // TODO: positioning offset } diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 3d181c25d581..ad737bf7cce6 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -195,7 +195,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) } } else { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "SdrObjList::operator=(): Error when cloning ")); if(nCloneErrCnt == 1) diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index a85b378cfa52..e8f3a9f0d0f8 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -363,7 +363,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL if(0L != nCloneErrCnt) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "SdrExchangeView::Paste(): Error when cloning ")); if(nCloneErrCnt == 1) @@ -754,7 +754,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const if(0L != nCloneErrCnt) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "SdrExchangeView::GetMarkedObjModel(): Error when cloning ")); if(nCloneErrCnt == 1) diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index a18f3a9ced5f..61e7dfceb589 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -33,7 +33,6 @@ #include #include -using ::rtl::OUString; using namespace ::sdr::table; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -296,7 +295,7 @@ Reference SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : // Transform coordinates from internal to pixel. if (maShapeTreeInfo.GetViewForwarder() == NULL) - throw uno::RuntimeException (::rtl::OUString("AccessibleCell has no valid view forwarder"),static_cast(this)); + throw uno::RuntimeException (OUString("AccessibleCell has no valid view forwarder"),static_cast(this)); ::Size aPixelSize( maShapeTreeInfo.GetViewForwarder()->LogicToPixel(::Size(aCellRect.GetWidth(), aCellRect.GetHeight())) ); ::Point aPixelPosition( maShapeTreeInfo.GetViewForwarder()->LogicToPixel( aCellRect.TopLeft() )); @@ -425,14 +424,14 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException) // -------------------------------------------------------------------- -::rtl::OUString SAL_CALL AccessibleCell::getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL AccessibleCell::getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException) { return AccessibleComponentBase::getTitledBorderText(); } // -------------------------------------------------------------------- -::rtl::OUString SAL_CALL AccessibleCell::getToolTipText (void) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL AccessibleCell::getToolTipText (void) throw (::com::sun::star::uno::RuntimeException) { return AccessibleComponentBase::getToolTipText(); } @@ -548,7 +547,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent (void) throw (Runt return mnIndexInParent; } -::rtl::OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 0750e61e112d..6938dc2acaab 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -70,7 +70,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); @@ -87,16 +87,16 @@ public: // XAccessibleExtendedComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTipText (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getToolTipText (void) throw (::com::sun::star::uno::RuntimeException); // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName (void) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw(::com::sun::star::uno::RuntimeException); // IAccessibleViewForwarderListener virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder); diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 66ff42170751..0bd4d8b27ab7 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -34,7 +34,6 @@ #include -using ::rtl::OUString; using namespace ::accessibility; using namespace ::sdr::table; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 3a33a282b9ec..fff251a6857e 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -54,7 +54,6 @@ // ----------------------------------------------------------------------------- using ::editeng::SvxBorderLine; -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; @@ -1753,7 +1752,7 @@ void SAL_CALL Cell::disposing( const EventObject& /*Source*/ ) throw (RuntimeExc static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; if (nCol < 26*26) { diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 48f9f19dcb7b..34ce0c15d3e0 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -112,9 +112,9 @@ public: SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - SVX_DLLPRIVATE virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XLayoutConstrains SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw (::com::sun::star::uno::RuntimeException); @@ -127,8 +127,8 @@ public: SVX_DLLPRIVATE virtual ::sal_Bool SAL_CALL isMerged() throw (::com::sun::star::uno::RuntimeException); // XCell - SVX_DLLPRIVATE virtual ::rtl::OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const OUString& aFormula ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual double SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual void SAL_CALL setValue( double nValue ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual ::com::sun::star::table::CellContentType SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); @@ -136,30 +136,30 @@ public: // ::com::sun::star::beans::XPropertySet SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertyState - SVX_DLLPRIVATE virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertyStates SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XFastPropertySet SVX_DLLPRIVATE virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -172,15 +172,15 @@ public: // XSimpleText SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor( ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, ::sal_Bool bAbsorb ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const OUString& aString, ::sal_Bool bAbsorb ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, ::sal_Bool bAbsorb ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XTextRange SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart( ) throw (::com::sun::star::uno::RuntimeException); SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd( ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual ::rtl::OUString SAL_CALL getString( ) throw (::com::sun::star::uno::RuntimeException); - SVX_DLLPRIVATE virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual OUString SAL_CALL getString( ) throw (::com::sun::star::uno::RuntimeException); + SVX_DLLPRIVATE virtual void SAL_CALL setString( const OUString& aString ) throw (::com::sun::star::uno::RuntimeException); // XEventListener SVX_DLLPRIVATE virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); @@ -198,7 +198,7 @@ public: SVX_DLLPRIVATE void notifyModified(); - ::rtl::OUString getName(); + OUString getName(); protected: SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet(); @@ -216,7 +216,7 @@ private: ::com::sun::star::table::CellContentType mnCellContentType; - ::rtl::OUString msFormula; + OUString msFormula; double mfValue; ::sal_Int32 mnError; ::sal_Bool mbMerged; diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 42cd6764e59d..bd3ad5818f0f 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -28,7 +28,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index a25ca2b183c5..b5535537a48a 100644 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx @@ -46,7 +46,7 @@ public: // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); // XCellCursor virtual void SAL_CALL gotoStart( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx index 23d521713b8f..2d04fd389d95 100644 --- a/svx/source/table/cellrange.cxx +++ b/svx/source/table/cellrange.cxx @@ -22,7 +22,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index 1c588e204c01..72ba4e89dbfc 100644 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx @@ -49,7 +49,7 @@ public: // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); protected: TableModelRef mxTable; diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index 03ea0ae910f5..a5bba34dec28 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -20,7 +20,6 @@ #include "propertyset.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index e8b64966d87f..ed8540bac57c 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -36,7 +36,7 @@ namespace sdr { namespace table { // ----------------------------------------------------------------------------- typedef std::vector< ::com::sun::star::beans::Property > PropertyVector; -typedef boost::unordered_map< ::rtl::OUString, ::sal_uInt32, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > PropertyMap; +typedef boost::unordered_map< OUString, ::sal_uInt32, OUStringHash, ::std::equal_to< OUString > > PropertyMap; // ----------------------------------------------------------------------------- @@ -48,13 +48,13 @@ public: void addProperties( const PropertyVector& rProps ); - const ::com::sun::star::beans::Property& getProperty( const ::rtl::OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException ); - const ::com::sun::star::beans::Property* hasProperty( const ::rtl::OUString& aName ); + const ::com::sun::star::beans::Property& getProperty( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException ); + const ::com::sun::star::beans::Property* hasProperty( const OUString& aName ); // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException); private: PropertyVector maProperties; @@ -71,20 +71,20 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // XFastPropertySet virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) = 0; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 7c368f557cb8..85551b5ca459 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -59,7 +59,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -326,7 +325,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) Reference< XStyleFamiliesSupplier > xSFS( pNewModel->getUnoModel(), UNO_QUERY_THROW ); Reference< XNameAccess > xFamilyNameAccess( xSFS->getStyleFamilies(), UNO_QUERY_THROW ); - const rtl::OUString sFamilyName( "table" ); + const OUString sFamilyName( "table" ); Reference< XNameAccess > xTableFamilyAccess( xFamilyNameAccess->getByName( sFamilyName ), UNO_QUERY_THROW ); if( xTableFamilyAccess->hasByName( sStyleName ) ) diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 6a68466f2dbc..cd781ec9b1fb 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -27,7 +27,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index a77a0aa5b125..de135c68ca8f 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -53,11 +53,11 @@ public: // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XFastPropertySet virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -72,7 +72,7 @@ private: sal_Bool mbOptimalWidth; sal_Bool mbIsVisible; sal_Bool mbIsStartOfNewPage; - ::rtl::OUString maName; + OUString maName; }; } } diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index 349684886226..77428a8373b6 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -25,7 +25,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 0330cf7f13f5..7400cf770134 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -64,7 +64,6 @@ #include using ::editeng::SvxBorderLine; -using ::rtl::OUString; using namespace ::sdr::table; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index a84dc2e5b68b..ac36a3414e77 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::com::sun::star::container; -using ::rtl::OUString; using ::osl::MutexGuard; using ::osl::ClearableMutexGuard; using ::cppu::OInterfaceContainerHelper; diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index c00329c0d1d1..a4dfefb60bf8 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -39,7 +39,6 @@ #include "svx/svdglob.hxx" using ::editeng::SvxBorderLine; -using ::rtl::OUString; using ::com::sun::star::awt::XLayoutConstrains; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 6d2fd9e19af2..f927f6431258 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -145,7 +145,7 @@ private: com::sun::star::text::WritingMode meWritingMode; - const rtl::OUString msSize; + const OUString msSize; }; } } diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 2ed05f88dc58..62d20c204302 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -38,7 +38,6 @@ #include "svx/svdstr.hrc" #include "svx/svdglob.hxx" -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; @@ -474,7 +473,7 @@ Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo( ) throw // ----------------------------------------------------------------------------- -void SAL_CALL TableModel::setPropertyValue( const ::rtl::OUString& /*aPropertyName*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL TableModel::setPropertyValue( const OUString& /*aPropertyName*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { } diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index 44577f8dc92a..77768a635aa3 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -124,16 +124,16 @@ public: // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( ::sal_Int32 nColumn, ::sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( ::sal_Int32 nLeft, ::sal_Int32 nTop, ::sal_Int32 nRight, ::sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XFastPropertySet virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index ab164ddc48f4..a994ce01bed6 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -28,7 +28,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 212dd0aa1850..d1fd8e1ca723 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -56,11 +56,11 @@ public: // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XFastPropertySet virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -76,7 +76,7 @@ private: sal_Bool mbOptimalHeight; sal_Bool mbIsVisible; sal_Bool mbIsStartOfNewPage; - ::rtl::OUString maName; + OUString maName; }; } } diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index c9821c859b8c..6bba9e6d8ddc 100644 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx @@ -26,7 +26,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index f96cb5c8f509..c3f0afcedcf5 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -41,7 +41,6 @@ #include "editeng/outlobj.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; using namespace ::com::sun::star::container; @@ -136,7 +135,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa xRowSet->getPropertyValue( msSize ) >>= nRowHeight; mrStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30"; - mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << rtl::OString::valueOf(nRowHeight).getStr(); + mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::valueOf(nRowHeight).getStr(); const sal_Int32 nColCount = mxTable->getColumnCount(); for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) @@ -146,7 +145,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa if( !xCell.is() ) continue; - mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << rtl::OString::valueOf(aColumnStart[nCol]).getStr(); + mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::valueOf(aColumnStart[nCol]).getStr(); if ( (nCol & 0x0F) == 0x0F ) mrStrm << RTFOutFuncs::sNewLine; // Zeilen nicht zu lang werden lassen } diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index ad82f00837cd..ec6e78ac66cb 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -40,7 +40,6 @@ #include "svx/svdmodel.hxx" #include "editeng/svxrtf.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; using namespace ::com::sun::star::container; diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index 725b60eea163..e889427ef354 100644 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -30,7 +30,6 @@ // ----------------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index 79e876231df4..4f816a477650 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -60,7 +60,7 @@ private: ::com::sun::star::table::CellContentType mnCellContentType; - ::rtl::OUString msFormula; + OUString msFormula; double mfValue; ::sal_Int32 mnError; ::sal_Bool mbMerged; @@ -174,7 +174,7 @@ private: sal_Bool mbOptimalWidth; sal_Bool mbIsVisible; sal_Bool mbIsStartOfNewPage; - ::rtl::OUString maName; + OUString maName; }; void setData( const Data& rData ); @@ -207,7 +207,7 @@ private: sal_Bool mbOptimalHeight; sal_Bool mbIsVisible; sal_Bool mbIsStartOfNewPage; - ::rtl::OUString maName; + OUString maName; }; void setData( const Data& rData ); diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index a08ba91a05a0..42516081e956 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -40,7 +40,7 @@ class SvxColorWindow_Impl : public SfxPopupWindow private: const sal_uInt16 theSlotId; ValueSet aColorSet; - rtl::OUString maCommand; + OUString maCommand; const Color mLastColor; DECL_LINK( SelectHdl, void * ); @@ -50,7 +50,7 @@ protected: virtual sal_Bool Close(); public: - SvxColorWindow_Impl( const rtl::OUString& rCommand, + SvxColorWindow_Impl( const OUString& rCommand, sal_uInt16 nSlotId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const String& rWndTitle, diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 04b636094c54..20c18fae4886 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -51,7 +51,6 @@ //////////// -using ::rtl::OUString; //using ::svtools::ToolbarMenu; using namespace ::com::sun::star; @@ -465,13 +464,13 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) if ( IsInPopupMode() ) EndPopupMode(); - const rtl::OUString aCommand( ".uno:ExtrusionDepthDialog" ); + const OUString aCommand( ".uno:ExtrusionDepthDialog" ); Any a; Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = rtl::OUString( "Depth" ); + aArgs[0].Name = OUString( "Depth" ); aArgs[0].Value <<= mfDepth; - aArgs[1].Name = rtl::OUString( "Metric" ); + aArgs[1].Name = OUString( "Metric" ); aArgs[1].Value <<= static_cast( meUnit ); mrController.dispatchCommand( aCommand, aArgs ); @@ -1004,7 +1003,7 @@ SfxPopupWindowType ExtrusionColorControl::GetPopupWindowType() const SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow() { SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( - rtl::OUString( ".uno:Extrusion3DColor" ), + OUString( ".uno:Extrusion3DColor" ), SID_EXTRUSION_3D_COLOR, m_xFrame, SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ), diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index a09d111e434f..37d58e120dbc 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -53,8 +53,8 @@ private: Image maImgPerspective; Image maImgParallel; - const rtl::OUString msExtrusionDirection; - const rtl::OUString msExtrusionProjection; + const OUString msExtrusionDirection; + const OUString msExtrusionProjection; DECL_LINK( SelectHdl, void * ); void FillValueSet(); @@ -74,8 +74,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; @@ -97,8 +97,8 @@ private: FieldUnit meUnit; double mfDepth; - const rtl::OUString msExtrusionDepth; - const rtl::OUString msMetricUnit; + const OUString msExtrusionDepth; + const OUString msMetricUnit; DECL_LINK( SelectHdl, void * ); @@ -122,8 +122,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; @@ -149,8 +149,8 @@ private: int mnDirection; bool mbDirectionEnabled; - const rtl::OUString msExtrusionLightingDirection; - const rtl::OUString msExtrusionLightingIntensity; + const OUString msExtrusionLightingDirection; + const OUString msExtrusionLightingIntensity; void implSetIntensity( int nLevel, bool bEnabled ); void implSetDirection( int nDirection, bool bEnabled ); @@ -173,8 +173,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; @@ -191,7 +191,7 @@ private: Image maImgSurface3; Image maImgSurface4; - const rtl::OUString msExtrusionSurface; + const OUString msExtrusionSurface; DECL_LINK( SelectHdl, void * ); @@ -213,8 +213,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index cfd9f5b3010e..91a012c7bfc9 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -68,14 +68,14 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId bIgnoreStatusUpdate( sal_False ), eLastXFS ( XFILL_NONE ) { - addStatusListener( rtl::OUString( ".uno:FillColor" )); - addStatusListener( rtl::OUString( ".uno:FillGradient" )); - addStatusListener( rtl::OUString( ".uno:FillHatch" )); - addStatusListener( rtl::OUString( ".uno:FillBitmap" )); - addStatusListener( rtl::OUString( ".uno:ColorTableState" )); - addStatusListener( rtl::OUString( ".uno:GradientListState" )); - addStatusListener( rtl::OUString( ".uno:HatchListState" )); - addStatusListener( rtl::OUString( ".uno:BitmapListState" )); + addStatusListener( OUString( ".uno:FillColor" )); + addStatusListener( OUString( ".uno:FillGradient" )); + addStatusListener( OUString( ".uno:FillHatch" )); + addStatusListener( OUString( ".uno:FillBitmap" )); + addStatusListener( OUString( ".uno:ColorTableState" )); + addStatusListener( OUString( ".uno:GradientListState" )); + addStatusListener( OUString( ".uno:HatchListState" )); + addStatusListener( OUString( ".uno:BitmapListState" )); } //======================================================================== @@ -416,7 +416,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) XBitmapEntry* pEntry = new XBitmapEntry(pBitmapItem->GetGraphicObject(), aTmpStr); XBitmapListRef xBitmapList = XPropertyList::CreatePropertyList(XBITMAP_LIST, - rtl::OUString("TmpList"))->AsBitmapList(); + OUString("TmpList"))->AsBitmapList(); xBitmapList->Insert( pEntry ); xBitmapList->SetDirty( sal_False ); pFillAttrLB->Fill( xBitmapList ); @@ -545,7 +545,7 @@ FillControl::~FillControl() IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl) { SelectFillTypeHdl( NULL ); - ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( ".uno:FillStyle" )); + ( (SvxFillToolBoxControl*)GetData() )->updateStatus( OUString( ".uno:FillStyle" )); // ( (SvxFillToolBoxControl*)GetData() )->GetBindings().Invalidate( SID_ATTR_FILL_STYLE ); return 0; } @@ -673,12 +673,12 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) Sequence< PropertyValue > aArgs( 1 ); // First set the style - aArgs[0].Name = ::rtl::OUString( "FillStyle" ); + aArgs[0].Name = OUString( "FillStyle" ); aXFillStyleItem.QueryValue( a ); aArgs[0].Value = a; ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True ); ((SvxFillToolBoxControl*)GetData())->Dispatch( - ::rtl::OUString( ".uno:FillStyle" ), aArgs ); + OUString( ".uno:FillStyle" ), aArgs ); ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False ); switch( eXFS ) @@ -701,10 +701,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XFillColorItem aXFillColorItem( aTmpStr, pLbFillAttr->GetSelectEntryColor() ); - aArgs[0].Name = ::rtl::OUString( "FillColor" ); + aArgs[0].Name = OUString( "FillColor" ); aXFillColorItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillColor" ), + ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillColor" ), aArgs ); } break; @@ -722,10 +722,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XGradient aGradient = aItem.GetGradientList()->GetGradient( nPos )->GetGradient(); XFillGradientItem aXFillGradientItem( pLbFillAttr->GetSelectEntry(), aGradient ); - aArgs[0].Name = ::rtl::OUString( "FillGradient" ); + aArgs[0].Name = OUString( "FillGradient" ); aXFillGradientItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillGradient" ), + ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillGradient" ), aArgs ); } } @@ -745,10 +745,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XHatch aHatch = aItem.GetHatchList()->GetHatch( nPos )->GetHatch(); XFillHatchItem aXFillHatchItem( pLbFillAttr->GetSelectEntry(), aHatch ); - aArgs[0].Name = ::rtl::OUString( "FillHatch" ); + aArgs[0].Name = OUString( "FillHatch" ); aXFillHatchItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillHatch" ), + ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillHatch" ), aArgs ); } } @@ -769,10 +769,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos); const XFillBitmapItem aXFillBitmapItem(pLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); - aArgs[0].Name = ::rtl::OUString( "FillBitmap" ); + aArgs[0].Name = OUString( "FillBitmap" ); aXFillBitmapItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch(::rtl::OUString(".uno:FillBitmap"), aArgs); + ((SvxFillToolBoxControl*)GetData())->Dispatch(OUString(".uno:FillBitmap"), aArgs); } } } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index bd57fbfafafb..588483df8695 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -53,7 +53,6 @@ #include "helpid.hrc" -using ::rtl::OUString; using ::svtools::ToolbarMenu; using namespace ::com::sun::star; @@ -263,7 +262,7 @@ SfxPopupWindowType FontWorkShapeTypeControl::GetPopupWindowType() const SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow() { - rtl::OUString aSubTbxResName( "private:resource/toolbar/fontworkshapetype" ); + OUString aSubTbxResName( "private:resource/toolbar/fontworkshapetype" ); createAndPositionSubToolBar( aSubTbxResName ); return NULL; } @@ -296,7 +295,7 @@ private: Image maImgAlgin4; Image maImgAlgin5; - const rtl::OUString msFontworkAlignment; + const OUString msFontworkAlignment; DECL_LINK( SelectHdl, void * ); @@ -410,8 +409,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; @@ -482,8 +481,8 @@ public: private: svt::ToolboxController& mrController; - const rtl::OUString msFontworkCharacterSpacing; - const rtl::OUString msFontworkKernCharacterPairs; + const OUString msFontworkCharacterSpacing; + const OUString msFontworkKernCharacterPairs; DECL_LINK( SelectHdl, void * ); @@ -648,8 +647,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); using svt::PopupWindowController::createPopupWindow; }; diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 6aeb599adab1..63eb13c4de40 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -61,9 +61,9 @@ FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl() void FormatPaintBrushToolBoxControl::impl_executePaintBrush() { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "PersistentCopy" ); + aArgs[0].Name = OUString( "PersistentCopy" ); aArgs[0].Value = makeAny( static_cast(m_bPersistentCopy) ); - Dispatch( rtl::OUString( ".uno:FormatPaintbrush" ) + Dispatch( OUString( ".uno:FormatPaintbrush" ) , aArgs ); } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 44890942f5d6..bd21a7a656bd 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -52,7 +52,6 @@ #include "svx/grafctrl.hxx" #include "svx/tbxcolor.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; @@ -63,7 +62,7 @@ using namespace ::com::sun::star::lang; #define SYMBOL_TO_FIELD_OFFSET 4 #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() -#define TOOLBOX_NAME ::rtl::OUString( "colorbar" ) +#define TOOLBOX_NAME OUString( "colorbar" ) TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item ); @@ -100,19 +99,19 @@ protected: public: - ImplGrafMetricField( Window* pParent, const rtl::OUString& aCmd, const Reference< XFrame >& rFrame ); + ImplGrafMetricField( Window* pParent, const OUString& aCmd, const Reference< XFrame >& rFrame ); ~ImplGrafMetricField(); void Update( const SfxPoolItem* pItem ); const OUString& GetCommand() const { return maCommand; } }; -ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : +ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ) : MetricField( pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_3DLOOK ), maCommand( rCmd ), mxFrame( rFrame ) { - Size aSize( GetTextWidth( rtl::OUString("-100 %") ), GetTextHeight() ); + Size aSize( GetTextWidth( OUString("-100 %") ), GetTextHeight() ); aSize.Width() += 20, aSize.Height() += 6; SetSizePixel( aSize ); @@ -132,7 +131,7 @@ ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString& const long nMinVal = ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafTransparence" ) )) ? 0 : -100; SetUnit( FUNIT_CUSTOM ); - SetCustomUnitText( rtl::OUString(" %") ); + SetCustomUnitText( OUString(" %") ); SetDecimalDigits( 0 ); SetMin( nMinVal ); @@ -255,7 +254,7 @@ protected: public: - ImplGrafControl( Window* pParent, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ); + ImplGrafControl( Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ); ~ImplGrafControl(); void Update( const SfxPoolItem* pItem ) { maField.Update( pItem ); } @@ -264,7 +263,7 @@ public: ImplGrafControl::ImplGrafControl( Window* pParent, - const rtl::OUString& rCmd, + const OUString& rCmd, const Reference< XFrame >& rFrame ) : Control( pParent, WB_TABSTOP ) , maImage( this ) @@ -298,7 +297,7 @@ ImplGrafControl::ImplGrafControl( maImage.Show(); - maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); + maField.SetHelpId( OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); maField.Show(); } @@ -355,7 +354,7 @@ void ImplGrafModeControl::Select() if ( !IsTravelSelect() ) { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "GrafMode" ); + aArgs[0].Name = OUString( "GrafMode" ); aArgs[0].Value = makeAny( sal_Int16( GetSelectEntryPos() )); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. @@ -454,7 +453,7 @@ SfxPopupWindowType SvxGrafFilterToolBoxControl::GetPopupWindowType() const SfxPopupWindow* SvxGrafFilterToolBoxControl::CreatePopupWindow() { - rtl::OUString aSubTbxResName( "private:resource/toolbar/graffilterbar" ); + OUString aSubTbxResName( "private:resource/toolbar/graffilterbar" ); createAndPositionSubToolBar( aSubTbxResName ); return NULL; diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 76f170f0d21f..8043a54024df 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -130,11 +130,11 @@ void SvxLineBox::Select() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "LineDash" ); + aArgs[0].Name = OUString( "LineDash" ); aLineDashItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( ".uno:LineDash" ), + OUString( ".uno:LineDash" ), aArgs ); } } @@ -144,11 +144,11 @@ void SvxLineBox::Select() XLineStyleItem aLineStyleItem( eXLS ); Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "XLineStyle" ); + aArgs[0].Name = OUString( "XLineStyle" ); aLineStyleItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( ".uno:XLineStyle" ), + OUString( ".uno:XLineStyle" ), aArgs ); nCurPos = GetSelectEntryPos(); @@ -264,7 +264,7 @@ void SvxLineBox::FillControl() SvxColorBox::SvxColorBox( Window* pParent, - const ::rtl::OUString& rCommand, + const OUString& rCommand, const Reference< XFrame >& rFrame, WinBits nBits ) : ColorLB( pParent, nBits ), @@ -428,7 +428,7 @@ SvxMetricField::SvxMetricField( aCurTxt( String() ), mxFrame( rFrame ) { - Size aSize = Size(GetTextWidth( rtl::OUString("99,99mm") ),GetTextHeight()); + Size aSize = Size(GetTextWidth( OUString("99,99mm") ),GetTextHeight()); aSize.Width() += 20; aSize.Height() += 6; SetSizePixel( aSize ); @@ -474,11 +474,11 @@ void SvxMetricField::Modify() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "LineWidth" ); + aArgs[0].Name = OUString( "LineWidth" ); aLineWidthItem.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( ".uno:LineWidth" ), + OUString( ".uno:LineWidth" ), aArgs ); } diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index ff5bbc7b8e29..b458aa62d084 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -69,13 +69,13 @@ private: sal_Bool m_bMod1; ToolBox& rTbx; Reference< XFrame > mxFrame; - rtl::OUString maCommand; + OUString maCommand; DECL_LINK( SelectHdl, void * ); public: TableWindow( sal_uInt16 nSlotId, - const rtl::OUString& rCmd, + const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); @@ -104,7 +104,7 @@ IMPL_LINK_NOARG(TableWindow, SelectHdl) // ----------------------------------------------------------------------- -TableWindow::TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : +TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ), aTableButton( this ), nCol( 0 ), @@ -325,9 +325,9 @@ void TableWindow::PopupModeEnd() if ( !IsPopupModeCanceled() && nCol && nLine ) { Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = ::rtl::OUString( "Columns" ); + aArgs[0].Name = OUString( "Columns" ); aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = ::rtl::OUString( "Rows" ); + aArgs[1].Name = OUString( "Rows" ); aArgs[1].Value = makeAny( sal_Int16( nLine )); TableDialog( aArgs ); @@ -370,7 +370,7 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) aTargetURL.Complete = maCommand; xTrans->parseStrict( aTargetURL ); - Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, rtl::OUString(), 0 ); + Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( aTargetURL, rArgs ); } @@ -405,11 +405,11 @@ private: sal_Bool m_bMod1; ToolBox& rTbx; Reference< XFrame > mxFrame; - ::rtl::OUString maCommand; + OUString maCommand; void UpdateSize_Impl( long nNewCol ); public: - ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); + ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const String &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); void KeyInput( const KeyEvent& rKEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -424,7 +424,7 @@ public: // ----------------------------------------------------------------------- -ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : +ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nId, rFrame, WB_STDPOPUP ), bInitialKeyInput(sal_True), m_bMod1(sal_False), @@ -685,9 +685,9 @@ void ColumnsWindow::PopupModeEnd() pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast(nId)); Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = ::rtl::OUString( "Columns" ); + aArgs[0].Name = OUString( "Columns" ); aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = ::rtl::OUString( "Modifier" ); + aArgs[1].Name = OUString( "Modifier" ); aArgs[1].Value = makeAny( sal_Int16( m_bMod1 ? KEY_MOD1 : 0 )); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index e0adc57f125e..d5666600592e 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -62,7 +62,7 @@ class SvxPopupWindowListBox : public SfxPopupWindow ToolBox & rToolBox; sal_Bool bUserSel; sal_uInt16 nTbxId; - rtl::OUString maCommandURL; + OUString maCommandURL; // disallow copy-constructor and assignment-operator SvxPopupWindowListBox(const int& ); @@ -71,7 +71,7 @@ class SvxPopupWindowListBox : public SfxPopupWindow // SvxPopupWindowListBox( sal_uInt16 nSlotId, ToolBox& rTbx, sal_uInt16 nTbxItemId ); public: - SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nTbxId, ToolBox& rTbx ); + SvxPopupWindowListBox( sal_uInt16 nSlotId, const OUString& rCommandURL, sal_uInt16 nTbxId, ToolBox& rTbx ); virtual ~SvxPopupWindowListBox(); // SfxPopupWindow @@ -89,7 +89,7 @@ public: ///////////////////////////////////////////////////////////////// -SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) : +SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) : SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ), rToolBox ( rTbx ), bUserSel ( sal_False ), @@ -284,7 +284,7 @@ void SvxUndoRedoControl::StateChanged( const std::vector &aLst = rItem.GetList(); for( long nI = 0, nEnd = aLst.size(); nI < nEnd; ++nI ) - aUndoRedoList.push_back( rtl::OUString( aLst[nI] )); + aUndoRedoList.push_back( OUString( aLst[nI] )); } } } @@ -294,9 +294,9 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow() DBG_ASSERT(( SID_UNDO == GetSlotId() || SID_REDO == GetSlotId() ), "mismatching ids" ); if ( m_aCommandURL == ".uno:Undo" ) - updateStatus( rtl::OUString( ".uno:GetUndoStrings" )); + updateStatus( OUString( ".uno:GetUndoStrings" )); else - updateStatus( rtl::OUString( ".uno:GetRedoStrings" )); + updateStatus( OUString( ".uno:GetRedoStrings" )); ToolBox& rBox = GetToolBox(); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 2f26f7b52cb2..9ec8f635d928 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -65,8 +65,8 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, pDashItem ( NULL ), bUpdate ( sal_False ) { - addStatusListener( ::rtl::OUString( ".uno:LineDash" )); - addStatusListener( ::rtl::OUString( ".uno:DashListState" )); + addStatusListener( OUString( ".uno:LineDash" )); + addStatusListener( OUString( ".uno:DashListState" )); } //======================================================================== @@ -205,7 +205,7 @@ SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { - addStatusListener( rtl::OUString( ".uno:MetricUnit" )); + addStatusListener( OUString( ".uno:MetricUnit" )); } //======================================================================== @@ -272,7 +272,7 @@ SvxLineColorToolBoxControl::SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { - addStatusListener( rtl::OUString( ".uno:ColorTableState" )); + addStatusListener( OUString( ".uno:ColorTableState" )); } //======================================================================== @@ -412,7 +412,7 @@ void SvxLineEndWindow::implInit() // ValueSet mit Eintraegen der LineEndList fuellen FillValueSet(); - AddStatusListener( rtl::OUString( ".uno:LineEndListState" )); + AddStatusListener( OUString( ".uno:LineEndListState" )); //ChangeHelpId( HID_POPUP_LINEENDSTYLE ); aLineEndSet.Show(); @@ -464,13 +464,13 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) if ( pLineStartItem ) { - aArgs[0].Name = ::rtl::OUString( "LineStart" ); + aArgs[0].Name = OUString( "LineStart" ); pLineStartItem->QueryValue( a ); aArgs[0].Value = a; } else { - aArgs[0].Name = ::rtl::OUString( "LineEnd" ); + aArgs[0].Name = OUString( "LineEnd" ); pLineEndItem->QueryValue( a ); aArgs[0].Value = a; } @@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) aLineEndSet.SetNoSelection(); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( ".uno:LineEndStyle" ), + OUString( ".uno:LineEndStyle" ), aArgs ); delete pLineEndItem; diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx index 040dbf0d7fbc..e70ef72988c4 100644 --- a/svx/source/tbxctrls/subtoolboxcontrol.cxx +++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx @@ -48,7 +48,7 @@ SfxPopupWindow* SvxSubToolBoxControl::CreatePopupWindow() } if( pResource ) - createAndPositionSubToolBar( rtl::OUString::createFromAscii( pResource ) ); + createAndPositionSubToolBar( OUString::createFromAscii( pResource ) ); return NULL; } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index aac889d35cc9..55be77165dfb 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -102,7 +102,6 @@ static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ); static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ); // namespaces -using ::rtl::OUString; using namespace ::editeng; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -145,7 +144,7 @@ public: inline void SetVisibilityListener( const Link& aVisListener ) { aVisibilityListener = aVisListener; } inline void RemoveVisibilityListener() { aVisibilityListener = Link(); } - void SetDefaultStyle( const ::rtl::OUString& rDefault ) { sDefaultStyle = rDefault; } + void SetDefaultStyle( const OUString& rDefault ) { sDefaultStyle = rDefault; } DECL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control* ); protected: @@ -304,7 +303,7 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener public: SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, - const rtl::OUString& rCommand, + const OUString& rCommand, SvxStyleToolBoxControl& rTbxCtl ); protected: @@ -320,7 +319,7 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener SvxStyleBox_Impl::SvxStyleBox_Impl( Window* pParent, - const rtl::OUString& rCommand, + const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, const Reference< XFrame >& _xFrame, @@ -1048,7 +1047,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, Reference< XDispatchProvider > aDisp( GetFrame()->getController(), UNO_QUERY ); SfxQueryStatus aQueryStatus( aDisp, SID_ATTR_AUTO_COLOR_INVALID, - rtl::OUString( ".uno:AutoColorInvalid" )); + OUString( ".uno:AutoColorInvalid" )); SfxItemState eState = aQueryStatus.QueryState( pDummy ); if( (SFX_ITEM_DEFAULT > eState) || ( SID_EXTRUSION_3D_COLOR == theSlotId ) ) { @@ -1102,7 +1101,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, SetText( rWndTitle ); aColorSet.Show(); - AddStatusListener( rtl::OUString( ".uno:ColorTableState" )); + AddStatusListener( OUString( ".uno:ColorTableState" )); } SvxColorWindow_Impl::~SvxColorWindow_Impl() @@ -1248,7 +1247,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram { BindListener(); - AddStatusListener(rtl::OUString(".uno:BorderReducedMode")); + AddStatusListener(OUString(".uno:BorderReducedMode")); aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) ); /* @@ -1522,7 +1521,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame try { Reference< lang::XServiceInfo > xServices( rFrame->getController()->getModel(), UNO_QUERY_THROW ); - m_bIsWriter = xServices->supportsService(::rtl::OUString("com.sun.star.text.TextDocument")); + m_bIsWriter = xServices->supportsService(OUString("com.sun.star.text.TextDocument")); } catch(const uno::Exception& ) { @@ -1659,7 +1658,7 @@ void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, // Family-ID - const rtl::OUString& rCommand, // .uno: command bound to this item + const OUString& rCommand, // .uno: command bound to this item SvxStyleToolBoxControl& rTbxCtl ) // Controller-Instanz, dem dieses Item zugeordnet ist. : SfxStatusListener( rDispatchProvider, nSlotId, rCommand ), rControl( rTbxCtl ) @@ -1705,7 +1704,7 @@ struct SvxStyleToolBoxControl::Impl { String aClearForm; String aMore; - ::std::vector< ::rtl::OUString > aDefaultStyles; + ::std::vector< OUString > aDefaultStyles; sal_Bool bListening; sal_Bool bSpecModeWriter; sal_Bool bSpecModeCalc; @@ -1727,11 +1726,11 @@ struct SvxStyleToolBoxControl::Impl { Reference< style::XStyleFamiliesSupplier > xStylesSupplier( xModel, UNO_QUERY_THROW ); Reference< lang::XServiceInfo > xServices( xModel, UNO_QUERY_THROW ); - bSpecModeWriter = xServices->supportsService(::rtl::OUString("com.sun.star.text.TextDocument")); + bSpecModeWriter = xServices->supportsService(OUString("com.sun.star.text.TextDocument")); if(bSpecModeWriter) { Reference xParaStyles; - xStylesSupplier->getStyleFamilies()->getByName(::rtl::OUString("ParagraphStyles")) >>= + xStylesSupplier->getStyleFamilies()->getByName(OUString("ParagraphStyles")) >>= xParaStyles; static const sal_Char* aWriterStyles[] = { @@ -1748,9 +1747,9 @@ struct SvxStyleToolBoxControl::Impl try { Reference< beans::XPropertySet > xStyle; - xParaStyles->getByName( rtl::OUString::createFromAscii( aWriterStyles[nStyle] )) >>= xStyle; - ::rtl::OUString sName; - xStyle->getPropertyValue(::rtl::OUString("DisplayName")) >>= sName; + xParaStyles->getByName( OUString::createFromAscii( aWriterStyles[nStyle] )) >>= xStyle; + OUString sName; + xStyle->getPropertyValue(OUString("DisplayName")) >>= sName; if( !sName.isEmpty() ) aDefaultStyles.push_back(sName); } @@ -1760,7 +1759,7 @@ struct SvxStyleToolBoxControl::Impl } else if( 0 != ( - bSpecModeCalc = xServices->supportsService(::rtl::OUString( + bSpecModeCalc = xServices->supportsService(OUString( "com.sun.star.sheet.SpreadsheetDocument")))) { static const sal_Char* aCalcStyles[] = @@ -1772,18 +1771,18 @@ struct SvxStyleToolBoxControl::Impl }; Reference xCellStyles; xStylesSupplier->getStyleFamilies()->getByName( - ::rtl::OUString("CellStyles")) >>= + OUString("CellStyles")) >>= xCellStyles; for( sal_uInt32 nStyle = 0; nStyle < sizeof( aCalcStyles ) / sizeof( sal_Char*); ++nStyle ) { try { - const rtl::OUString sStyleName( rtl::OUString::createFromAscii( aCalcStyles[nStyle] ) ); + const OUString sStyleName( OUString::createFromAscii( aCalcStyles[nStyle] ) ); if( xCellStyles->hasByName( sStyleName ) ) { Reference< beans::XPropertySet > xStyle( xCellStyles->getByName( sStyleName), UNO_QUERY_THROW ); - ::rtl::OUString sName; - xStyle->getPropertyValue(::rtl::OUString("DisplayName")) >>= sName; + OUString sName; + xStyle->getPropertyValue(OUString("DisplayName")) >>= sName; if( !sName.isEmpty() ) aDefaultStyles.push_back(sName); } @@ -1973,7 +1972,7 @@ void SvxStyleToolBoxControl::FillStyleBox() { // sort out default styles bInsert = true; - ::rtl::OUString aName( pStyle->GetName() ); + OUString aName( pStyle->GetName() ); for( _i = 0 ; _i < nCnt ; ++_i ) { if( pImpl->aDefaultStyles[_i] == aName ) @@ -2818,7 +2817,7 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, ToolBox& rBox = GetToolBox(); if ( pItem && eState != SFX_ITEM_DISABLED ) { - ::rtl::OUString aNewText( MnemonicGenerator::EraseAllMnemonicChars( pItem->GetValue() ) ); + OUString aNewText( MnemonicGenerator::EraseAllMnemonicChars( pItem->GetValue() ) ); rBox.SetQuickHelpText( GetId(), aNewText ); } if ( eState == SFX_ITEM_DISABLED ) diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 0968974377fe..9f5145818d0f 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -119,7 +119,7 @@ void SvxFontSizeBox_Impl::Select() float fSelVal = float( nSelVal ) / 10; uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( "FontHeight.Height" ); + aArgs[0].Name = OUString( "FontHeight.Height" ); aArgs[0].Value = uno::makeAny( fSelVal ); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. @@ -242,10 +242,10 @@ FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< lang::XMultiServiceFactory >& rServiceManager ) : svt::ToolboxController( rServiceManager, uno::Reference< frame::XFrame >(), - ::rtl::OUString( ".uno:FontHeight" ) ), + OUString( ".uno:FontHeight" ) ), m_pBox( NULL ) { - addStatusListener( ::rtl::OUString( ".uno:CharFontName" )); + addStatusListener( OUString( ".uno:CharFontName" )); } FontHeightToolBoxControl::~FontHeightToolBoxControl() @@ -274,11 +274,11 @@ void SAL_CALL FontHeightToolBoxControl::release() throw () } // XServiceInfo -sal_Bool SAL_CALL FontHeightToolBoxControl::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL FontHeightToolBoxControl::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - const uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -287,23 +287,23 @@ throw(uno::RuntimeException) return false; } -::rtl::OUString SAL_CALL FontHeightToolBoxControl::getImplementationName() +OUString SAL_CALL FontHeightToolBoxControl::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); } -uno::Sequence< ::rtl::OUString > SAL_CALL FontHeightToolBoxControl::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL FontHeightToolBoxControl::getSupportedServiceNames( ) throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -uno::Sequence< ::rtl::OUString > FontHeightToolBoxControl::getSupportedServiceNames_Static() +uno::Sequence< OUString > FontHeightToolBoxControl::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.frame.ToolbarController" ); + uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -402,9 +402,9 @@ void FontHeightToolBoxControl::dispatchCommand( uno::Reference< frame::XDispatch > xDispatch; uno::Reference< util::XURLTransformer > xURLTransformer = getURLTransformer(); - aURL.Complete = ::rtl::OUString( ".uno:FontHeight" ); + aURL.Complete = OUString( ".uno:FontHeight" ); xURLTransformer->parseStrict( aURL ); - xDispatch = xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( aURL, rArgs ); } diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index d3baa05ad0d1..8bfd0c02054d 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -56,13 +56,13 @@ void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFact { css::uno::Reference< css::util::XURLTransformer > xURLTransformer( css::util::URLTransformer::create(::comphelper::getComponentContext(rSMgr)) ); css::util::URL aURL; - aURL.Complete = rtl::OUString(COMMAND_EXECUTESEARCH); + aURL.Complete = OUString(COMMAND_EXECUTESEARCH); xURLTransformer->parseStrict(aURL); css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider(xFrame, css::uno::UNO_QUERY); if ( xDispatchProvider.is() ) { - css::uno::Reference< css::frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 ); + css::uno::Reference< css::frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); if ( xDispatch.is() && !aURL.Complete.isEmpty() ) xDispatch->dispatch( aURL, lArgs ); } @@ -148,11 +148,11 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) if (xPropSet.is()) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (xLayoutManager.is()) { - const ::rtl::OUString sResourceURL( "private:resource/toolbar/findbar" ); + const OUString sResourceURL( "private:resource/toolbar/findbar" ); xLayoutManager->hideElement( sResourceURL ); xLayoutManager->destroyElement( sResourceURL ); } @@ -163,19 +163,19 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) { Remember_Impl(GetText()); - ::rtl::OUString sFindText = GetText(); + OUString sFindText = GetText(); css::uno::Sequence< css::beans::PropertyValue > lArgs(3); - lArgs[0].Name = rtl::OUString(SEARCHITEM_SEARCHSTRING); + lArgs[0].Name = OUString(SEARCHITEM_SEARCHSTRING); lArgs[0].Value <<= sFindText; - lArgs[1].Name = rtl::OUString(SEARCHITEM_SEARCHBACKWARD); + lArgs[1].Name = OUString(SEARCHITEM_SEARCHBACKWARD); if (bShift) lArgs[1].Value <<= sal_True; else lArgs[1].Value <<= sal_False; - lArgs[2].Name = rtl::OUString(SEARCHITEM_SEARCHFLAGS); + lArgs[2].Name = OUString(SEARCHITEM_SEARCHFLAGS); lArgs[2].Value <<= (sal_Int32)0; impl_executeSearch(m_xServiceManager, m_xFrame, lArgs); @@ -236,7 +236,7 @@ void SearchToolbarControllersManager::loadSearchHistory(FindTextFieldControl* pF } } -void SearchToolbarControllersManager::registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL ) +void SearchToolbarControllersManager::registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const OUString& sCommandURL ) { SearchToolbarControllersMap::iterator pIt = aSearchToolbarControllersMap.find(xFrame); if (pIt == aSearchToolbarControllersMap.end()) @@ -261,7 +261,7 @@ void SearchToolbarControllersManager::registryController( const css::uno::Refere } } -void SearchToolbarControllersManager::freeController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& /*xStatusListener*/, const ::rtl::OUString& sCommandURL ) +void SearchToolbarControllersManager::freeController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& /*xStatusListener*/, const OUString& sCommandURL ) { SearchToolbarControllersMap::iterator pIt = aSearchToolbarControllersMap.find(xFrame); if (pIt != aSearchToolbarControllersMap.end()) @@ -280,7 +280,7 @@ void SearchToolbarControllersManager::freeController( const css::uno::Reference< } } -css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManager::findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const ::rtl::OUString& sCommandURL ) +css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManager::findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& sCommandURL ) { css::uno::Reference< css::frame::XStatusListener > xStatusListener; @@ -306,7 +306,7 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager ) :svt::ToolboxController( rServiceManager, css::uno::Reference< css::frame::XFrame >(), - rtl::OUString(COMMAND_FINDTEXT) ) + OUString(COMMAND_FINDTEXT) ) { } @@ -335,15 +335,15 @@ void SAL_CALL FindTextToolbarController::release() throw () } // XServiceInfo -::rtl::OUString SAL_CALL FindTextToolbarController::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL FindTextToolbarController::getImplementationName() throw( css::uno::RuntimeException ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL FindTextToolbarController::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL FindTextToolbarController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) { - const css::uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const css::uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -352,15 +352,15 @@ sal_Bool SAL_CALL FindTextToolbarController::supportsService( const ::rtl::OUStr return false; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL FindTextToolbarController::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL FindTextToolbarController::getSupportedServiceNames() throw( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -css::uno::Sequence< ::rtl::OUString > FindTextToolbarController::getSupportedServiceNames_Static() throw() +css::uno::Sequence< OUString > FindTextToolbarController::getSupportedServiceNames_Static() throw() { - css::uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.frame.ToolbarController" ); + css::uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -389,7 +389,7 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< : sal_uInt16 nItemCount = pToolBox->GetItemCount(); for ( sal_uInt16 i=0; iGetItemCommand(i); + OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_DOWNSEARCH ) { pToolBox->EnableItem(i, sal_False); @@ -439,7 +439,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur if ( m_bDisposed ) return; - ::rtl::OUString aFeatureURL = rEvent.FeatureURL.Complete; + OUString aFeatureURL = rEvent.FeatureURL.Complete; if ( aFeatureURL == "AppendSearchHistory" ) { m_pFindTextFieldControl->Remember_Impl(m_pFindTextFieldControl->GetText()); @@ -478,7 +478,7 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl) UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager, Type eType ) : svt::ToolboxController( rServiceManager, css::uno::Reference< css::frame::XFrame >(), - (eType == UP) ? rtl::OUString( COMMAND_UPSEARCH ): rtl::OUString( COMMAND_DOWNSEARCH ) ), + (eType == UP) ? OUString( COMMAND_UPSEARCH ): OUString( COMMAND_DOWNSEARCH ) ), meType( eType ) { } @@ -508,15 +508,15 @@ void SAL_CALL UpDownSearchToolboxController::release() throw () } // XServiceInfo -::rtl::OUString SAL_CALL UpDownSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL UpDownSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException ) { return getImplementationName_Static( meType ); } -sal_Bool SAL_CALL UpDownSearchToolboxController::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL UpDownSearchToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) { - const css::uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const css::uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -525,15 +525,15 @@ sal_Bool SAL_CALL UpDownSearchToolboxController::supportsService( const ::rtl::O return false; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL UpDownSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL UpDownSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -css::uno::Sequence< ::rtl::OUString > UpDownSearchToolboxController::getSupportedServiceNames_Static() throw() +css::uno::Sequence< OUString > UpDownSearchToolboxController::getSupportedServiceNames_Static() throw() { - css::uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.frame.ToolbarController"); + css::uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.frame.ToolbarController"); return aSNS; } @@ -560,7 +560,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ if ( m_bDisposed ) throw css::lang::DisposedException(); - ::rtl::OUString sFindText; + OUString sFindText; Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox ) @@ -568,7 +568,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ sal_uInt16 nItemCount = pToolBox->GetItemCount(); for ( sal_uInt16 i=0; iGetItemCommand(i); + OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_FINDTEXT ) { Window* pItemWin = pToolBox->GetItemWindow(i); @@ -580,17 +580,17 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ } css::uno::Sequence< css::beans::PropertyValue > lArgs(3); - lArgs[0].Name = rtl::OUString(SEARCHITEM_SEARCHSTRING); + lArgs[0].Name = OUString(SEARCHITEM_SEARCHSTRING); lArgs[0].Value <<= sFindText; - lArgs[1].Name = rtl::OUString(SEARCHITEM_SEARCHBACKWARD); + lArgs[1].Name = OUString(SEARCHITEM_SEARCHBACKWARD); lArgs[1].Value <<= sal_Bool( meType == UP ); - lArgs[2].Name = rtl::OUString(SEARCHITEM_SEARCHFLAGS); + lArgs[2].Name = OUString(SEARCHITEM_SEARCHFLAGS); lArgs[2].Value <<= (sal_Int32)0; impl_executeSearch(m_xServiceManager, m_xFrame, lArgs); css::frame::FeatureStateEvent aEvent; - aEvent.FeatureURL.Complete = rtl::OUString(COMMAND_APPENDSEARCHHISTORY); + aEvent.FeatureURL.Complete = OUString(COMMAND_APPENDSEARCHHISTORY); css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager().findController(m_xFrame, COMMAND_FINDTEXT); if (xStatusListener.is()) xStatusListener->statusChanged( aEvent ); @@ -609,7 +609,7 @@ void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::Fe ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager ) : svt::ToolboxController( rServiceManager, css::uno::Reference< css::frame::XFrame >(), - rtl::OUString( COMMAND_EXITSEARCH ) ) + OUString( COMMAND_EXITSEARCH ) ) { } @@ -638,16 +638,16 @@ void SAL_CALL ExitSearchToolboxController::release() throw () } // XServiceInfo -::rtl::OUString SAL_CALL ExitSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL ExitSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException ) { return getImplementationName_Static( ); } -sal_Bool SAL_CALL ExitSearchToolboxController::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL ExitSearchToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) { - const css::uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + const css::uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -657,15 +657,15 @@ sal_Bool SAL_CALL ExitSearchToolboxController::supportsService( const ::rtl::OUS } -css::uno::Sequence< ::rtl::OUString > SAL_CALL ExitSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL ExitSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -css::uno::Sequence< ::rtl::OUString > ExitSearchToolboxController::getSupportedServiceNames_Static() throw() +css::uno::Sequence< OUString > ExitSearchToolboxController::getSupportedServiceNames_Static() throw() { - css::uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.frame.ToolbarController"); + css::uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.frame.ToolbarController"); return aSNS; } @@ -698,11 +698,11 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) if (xPropSet.is()) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (xLayoutManager.is()) { - const ::rtl::OUString sResourceURL( "private:resource/toolbar/findbar" ); + const OUString sResourceURL( "private:resource/toolbar/findbar" ); xLayoutManager->hideElement( sResourceURL ); xLayoutManager->destroyElement( sResourceURL ); } @@ -757,12 +757,12 @@ void SAL_CALL FindbarDispatcher::release() throw() } // XServiceInfo -::rtl::OUString SAL_CALL FindbarDispatcher::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL FindbarDispatcher::getImplementationName() throw( css::uno::RuntimeException ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL FindbarDispatcher::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL FindbarDispatcher::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) { return ( ServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.svx.FindbarDispatcher")) || @@ -770,16 +770,16 @@ sal_Bool SAL_CALL FindbarDispatcher::supportsService( const ::rtl::OUString& Ser ); } -css::uno::Sequence< ::rtl::OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNames() throw( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -css::uno::Sequence< ::rtl::OUString > FindbarDispatcher::getSupportedServiceNames_Static() throw() +css::uno::Sequence< OUString > FindbarDispatcher::getSupportedServiceNames_Static() throw() { - css::uno::Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.comp.svx.FindbarDispatcher" ); - aSNS.getArray()[1] = ::rtl::OUString( "com.sun.star.frame.ProtocolHandler" ); + css::uno::Sequence< OUString > aSNS( 2 ); + aSNS.getArray()[0] = OUString( "com.sun.star.comp.svx.FindbarDispatcher" ); + aSNS.getArray()[1] = OUString( "com.sun.star.frame.ProtocolHandler" ); return aSNS; } @@ -791,7 +791,7 @@ void SAL_CALL FindbarDispatcher::initialize( const css::uno::Sequence< css::uno: } // XDispatchProvider -css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDispatch( const css::util::URL& aURL, const ::rtl::OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException ) +css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatch; @@ -823,12 +823,12 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css return; css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (!xLayoutManager.is()) return; - const ::rtl::OUString sResourceURL( "private:resource/toolbar/findbar" ); + const OUString sResourceURL( "private:resource/toolbar/findbar" ); css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL); if (!xUIElement.is()) { @@ -848,7 +848,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css sal_uInt16 nItemCount = pToolBox->GetItemCount(); for ( sal_uInt16 i=0; iGetItemCommand(i); + OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_FINDTEXT ) { Window* pItemWin = pToolBox->GetItemWindow( i ); diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 30b95fee1c6c..7e06ceeec637 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -88,7 +88,7 @@ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow() return sal_True; } -::rtl::OUString SAL_CALL SvxTbxCtlAlign::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL SvxTbxCtlAlign::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) { // Provide the controlled sub-toolbar name, so we are notified whenever // this toolbar executes a function. @@ -96,7 +96,7 @@ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow() return m_aSubTbName; } -void SAL_CALL SvxTbxCtlAlign::functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxTbxCtlAlign::functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException) { // Our sub-toolbar wants to executes a function. We have to change // the image of our toolbar button to reflect the new function. diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 0d353b196d9f..645537739b63 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -34,14 +34,14 @@ SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { SetVert(sal_False); - addStatusListener( rtl::OUString( ".uno:CTLFontState" )); + addStatusListener( OUString( ".uno:CTLFontState" )); } SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { SetVert(sal_True); - addStatusListener( rtl::OUString( ".uno:VerticalTextState" )); + addStatusListener( OUString( ".uno:VerticalTextState" )); } /* ---------------------------------------------------------------------------*/ diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 4fed654bd1b2..582d462f1618 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -133,13 +133,13 @@ void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sProjectionMode( "ProjectionMode" ); - static const rtl::OUString sRotateAngle( "RotateAngle" ); - static const rtl::OUString sViewPoint( "ViewPoint" ); - static const rtl::OUString sOrigin( "Origin" ); - static const rtl::OUString sSkew( "Skew" ); - static const rtl::OUString sDepth( "Depth" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sProjectionMode( "ProjectionMode" ); + static const OUString sRotateAngle( "RotateAngle" ); + static const OUString sViewPoint( "ViewPoint" ); + static const OUString sOrigin( "Origin" ); + static const OUString sSkew( "Skew" ); + static const OUString sDepth( "Depth" ); sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -316,7 +316,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_3D_COLOR: { - static const rtl::OUString sExtrusionColor( "Color" ); + static const OUString sExtrusionColor( "Color" ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SFX_ITEM_SET) { @@ -343,10 +343,10 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_SURFACE: { - static const rtl::OUString sShadeMode( "ShadeMode" ); - static const rtl::OUString sSpecularity( "Specularity" ); - static const rtl::OUString sDiffusion( "Diffusion" ); - static const rtl::OUString sMetal( "Metal" ); + static const OUString sShadeMode( "ShadeMode" ); + static const OUString sSpecularity( "Specularity" ); + static const OUString sDiffusion( "Diffusion" ); + static const OUString sMetal( "Metal" ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_SURFACE ) == SFX_ITEM_SET) { @@ -395,12 +395,12 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_LIGHTING_INTENSITY: { - static const rtl::OUString sBrightness( "Brightness" ); - static const rtl::OUString sLightFace( "LightFace" ); - static const rtl::OUString sFirstLightHarsh( "FirstLightHarsh" ); - static const rtl::OUString sSecondLightHarsh( "SecondLightHarsh" ); - static const rtl::OUString sFirstLightLevel( "FirstLightLevel" ); - static const rtl::OUString sSecondLightLevel( "SecondLightLevel" ); + static const OUString sBrightness( "Brightness" ); + static const OUString sLightFace( "LightFace" ); + static const OUString sFirstLightHarsh( "FirstLightHarsh" ); + static const OUString sSecondLightHarsh( "SecondLightHarsh" ); + static const OUString sFirstLightLevel( "FirstLightLevel" ); + static const OUString sSecondLightLevel( "SecondLightLevel" ); if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_INTENSITY ) == SFX_ITEM_SET) { @@ -468,8 +468,8 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem if((nDirection >= 0) && (nDirection < 9)) { - const rtl::OUString sFirstLightDirection( "FirstLightDirection" ); - const rtl::OUString sSecondLightDirection( "SecondLightDirection" ); + const OUString sFirstLightDirection( "FirstLightDirection" ); + const OUString sSecondLightDirection( "SecondLightDirection" ); const Direction3D * pLighting1Defaults; const Direction3D * pLighting2Defaults; @@ -642,11 +642,11 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sViewPoint( "ViewPoint" ); - static const rtl::OUString sOrigin( "Origin" ); - static const rtl::OUString sSkew( "Skew" ); - static const rtl::OUString sProjectionMode( "ProjectionMode" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sViewPoint( "ViewPoint" ); + static const OUString sOrigin( "Origin" ); + static const OUString sSkew( "Skew" ); + static const OUString sProjectionMode( "ProjectionMode" ); com::sun::star::uno::Any* pAny; @@ -793,8 +793,8 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sProjectionMode( "ProjectionMode" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sProjectionMode( "ProjectionMode" ); com::sun::star::uno::Any* pAny; @@ -849,10 +849,10 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sShadeMode( "ShadeMode" ); - static const rtl::OUString sSpecularity( "Specularity" ); - static const rtl::OUString sMetal( "Metal" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sShadeMode( "ShadeMode" ); + static const OUString sSpecularity( "Specularity" ); + static const OUString sMetal( "Metal" ); com::sun::star::uno::Any* pAny; @@ -937,8 +937,8 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sDepth( "Depth" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sDepth( "Depth" ); com::sun::star::uno::Any* pAny; @@ -1017,9 +1017,9 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sFirstLightDirection( "FirstLightDirection" ); - static const rtl::OUString sSecondLightDirection( "SecondLightDirection" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sFirstLightDirection( "FirstLightDirection" ); + static const OUString sSecondLightDirection( "SecondLightDirection" ); const Direction3D * pLighting1Defaults; const Direction3D * pLighting2Defaults; @@ -1098,8 +1098,8 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sBrightness( "Brightness" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sBrightness( "Brightness" ); com::sun::star::uno::Any* pAny; @@ -1166,8 +1166,8 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - static const rtl::OUString sExtrusion( "Extrusion" ); - static const rtl::OUString sExtrusionColor( "Color" ); + static const OUString sExtrusion( "Extrusion" ); + static const OUString sExtrusionColor( "Color" ); com::sun::star::uno::Any* pAny; @@ -1236,7 +1236,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) namespace svx { bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded ) { - static const rtl::OUString sExtrusion( "Extrusion" ); + static const OUString sExtrusion( "Extrusion" ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index a324bb9ef184..d77bb338d169 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -41,7 +41,6 @@ #include #include "svx/fontworkgallery.hxx" -using ::rtl::OUString; using namespace ::svx; using namespace ::cppu; @@ -135,26 +134,26 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; - rtl::OUString aFontWorkShapeType; + OUString aFontWorkShapeType; for( i = 0; i < nCount; i++ ) { SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( pObj->ISA( SdrObjCustomShape ) ) { - const rtl::OUString sType( "Type" ); + const OUString sType( "Type" ); SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); Any* pAny = aGeometryItem.GetPropertyValueByName( sType ); if( pAny ) { - rtl::OUString aType; + OUString aType; if ( *pAny >>= aType ) { if ( !aFontWorkShapeType.isEmpty() ) { if ( !aFontWorkShapeType.equals( aType ) ) // different FontWorkShapeTypes selected ? { - aFontWorkShapeType = rtl::OUString(); + aFontWorkShapeType = OUString(); break; } } @@ -240,7 +239,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) if ( nCheckStatus & 2 ) return ( nCheckStatus & 1 ) != 0; - static const rtl::OUString sTextPath( "TextPath" ); + static const OUString sTextPath( "TextPath" ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; @@ -265,8 +264,8 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { - static const rtl::OUString sTextPath( "TextPath" ); - static const rtl::OUString sSameLetterHeights( "SameLetterHeights" ); + static const OUString sTextPath( "TextPath" ); + static const OUString sSameLetterHeights( "SameLetterHeights" ); sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -339,21 +338,21 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem #include #include -void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const rtl::OUString rCustomShape ) +void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const OUString rCustomShape ) { - const rtl::OUString sType( "Type" ); + const OUString sType( "Type" ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sType; aPropVal.Value <<= rCustomShape; rGeometryItem.SetPropertyValue( aPropVal ); - const rtl::OUString sAdjustmentValues( "AdjustmentValues" ); - const rtl::OUString sCoordinateOrigin( "CoordinateOrigin" ); - const rtl::OUString sCoordinateSize( "CoordinateSize" ); - const rtl::OUString sEquations( "Equations" ); - const rtl::OUString sHandles( "Handles" ); - const rtl::OUString sPath( "Path" ); + const OUString sAdjustmentValues( "AdjustmentValues" ); + const OUString sCoordinateOrigin( "CoordinateOrigin" ); + const OUString sCoordinateSize( "CoordinateSize" ); + const OUString sEquations( "Equations" ); + const OUString sHandles( "Handles" ); + const OUString sPath( "Path" ); rGeometryItem.ClearPropertyValue( sAdjustmentValues ); rGeometryItem.ClearPropertyValue( sCoordinateOrigin ); rGeometryItem.ClearPropertyValue( sCoordinateSize ); @@ -366,7 +365,7 @@ void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - std::vector< rtl::OUString > aObjList; + std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { sal_uInt16 i; @@ -458,7 +457,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi case SID_FONTWORK_SHAPE_TYPE: { - rtl::OUString aCustomShape; + OUString aCustomShape; const SfxItemSet* pArgs = rReq.GetArgs(); if ( pArgs ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index ac2ca4325f34..3d08218baabd 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -172,18 +172,18 @@ void DictionaryList::refillFromDictionary( sal_Int32 nTextConversionOptions ) if(!m_xDictionary.is()) return; - Sequence< rtl::OUString > aLeftList( m_xDictionary->getConversionEntries( linguistic2::ConversionDirection_FROM_LEFT ) ); + Sequence< OUString > aLeftList( m_xDictionary->getConversionEntries( linguistic2::ConversionDirection_FROM_LEFT ) ); sal_Int32 nCount = aLeftList.getLength(); Reference< linguistic2::XConversionPropertyType > xPropertyType( m_xDictionary, uno::UNO_QUERY ); - rtl::OUString aLeft, aRight; + OUString aLeft, aRight; sal_Int16 nConversionPropertyType; for(sal_Int32 nN=0; nN aRightList( m_xDictionary->getConversions( + Sequence< OUString > aRightList( m_xDictionary->getConversions( aLeft, 0, aLeft.getLength() , linguistic2::ConversionDirection_FROM_LEFT, nTextConversionOptions ) ); @@ -230,7 +230,7 @@ DictionaryEntry* DictionaryList::getEntryOnPos( sal_Int32 nPos ) const return pEntry; } -DictionaryEntry* DictionaryList::getTermEntry( const rtl::OUString& rTerm ) const +DictionaryEntry* DictionaryList::getTermEntry( const OUString& rTerm ) const { DictionaryEntry* pE = 0; for( sal_Int32 nN=GetRowCount(); nN--; ) @@ -242,12 +242,12 @@ DictionaryEntry* DictionaryList::getTermEntry( const rtl::OUString& rTerm ) cons return 0; } -bool DictionaryList::hasTerm( const rtl::OUString& rTerm ) const +bool DictionaryList::hasTerm( const OUString& rTerm ) const { return getTermEntry(rTerm) !=0 ; } -void DictionaryList::addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping +void DictionaryList::addEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType, sal_uIntPtr nPos ) { if( hasTerm( rTerm ) ) @@ -274,7 +274,7 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos ) } } -sal_uIntPtr DictionaryList::deleteEntries( const rtl::OUString& rTerm ) +sal_uIntPtr DictionaryList::deleteEntries( const OUString& rTerm ) { sal_uIntPtr nPos = LIST_APPEND; for( sal_Int32 nN=GetRowCount(); nN--; ) @@ -419,7 +419,7 @@ SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -DictionaryEntry::DictionaryEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping +DictionaryEntry::DictionaryEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType , sal_Bool bNewEntry ) : m_aTerm( rTerm ) @@ -482,7 +482,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); - Any aAny( aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )) ) ); + Any aAny( aLngCfg.GetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )) ) ); if( aAny >>= bValue ) m_aCB_Reverse.Check( bValue ); @@ -503,17 +503,17 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) { try { - rtl::OUString aNameTo_Simplified("ChineseT2S"); - rtl::OUString aNameTo_Traditional("ChineseS2T"); + OUString aNameTo_Simplified("ChineseT2S"); + OUString aNameTo_Traditional("ChineseS2T"); lang::Locale aLocale; - aLocale.Language = rtl::OUString("zh"); + aLocale.Language = OUString("zh"); if( xContainer->hasByName( aNameTo_Simplified ) ) xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xContainer->getByName( aNameTo_Simplified ), UNO_QUERY ); else { - aLocale.Country = rtl::OUString("TW"); + aLocale.Country = OUString("TW"); xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Simplified , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE @@ -528,7 +528,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) xContainer->getByName( aNameTo_Traditional ), UNO_QUERY ); else { - aLocale.Country = rtl::OUString("CN"); + aLocale.Country = OUString("CN"); xDictionary_To_Traditional = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Traditional , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE @@ -673,9 +673,9 @@ bool ChineseDictionaryDialog::isEditFieldsContentEqualsSelectedListContent() con DictionaryEntry* pE = getActiveDictionary().getFirstSelectedEntry(); if( pE ) { - if( pE->m_aTerm != rtl::OUString( m_aED_Term.GetText() ) ) + if( pE->m_aTerm != OUString( m_aED_Term.GetText() ) ) return false; - if( pE->m_aMapping != rtl::OUString( m_aED_Mapping.GetText() ) ) + if( pE->m_aMapping != OUString( m_aED_Mapping.GetText() ) ) return false; if( pE->m_nConversionPropertyType != m_aLB_Property.GetSelectEntryPos()+1 ) return false; @@ -752,8 +752,8 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, AddHdl) } IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl) { - rtl::OUString aTerm( m_aED_Term.GetText() ); - rtl::OUString aMapping( m_aED_Mapping.GetText() ); + OUString aTerm( m_aED_Term.GetText() ); + OUString aMapping( m_aED_Mapping.GetText() ); sal_Int16 nConversionPropertyType = m_aLB_Property.GetSelectEntryPos()+1; DictionaryList& rActive = getActiveDictionary(); @@ -792,7 +792,7 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, DeleteHdl) { DictionaryEntry* pEntry; - rtl::OUString aMapping; + OUString aMapping; for( sal_Int32 nN=rActive.GetRowCount(); nN--; ) { if( rActive.IsRowSelected( nN ) ) @@ -831,7 +831,7 @@ short ChineseDictionaryDialog::Execute() SvtLinguConfig aLngCfg; Any aAny; aAny <<= sal_Bool( !!m_aCB_Reverse.IsChecked() ); - aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )), aAny ); + aLngCfg.SetProperty( OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )), aAny ); m_aCT_DictionaryToSimplified.save(); m_aCT_DictionaryToTraditional.save(); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 98de4dba436b..2728ac93c0a5 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -47,7 +47,7 @@ namespace textconversiondlgs struct DictionaryEntry { - DictionaryEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping + DictionaryEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType //linguistic2::ConversionPropertyType , sal_Bool bNewEntry = sal_False ); @@ -55,8 +55,8 @@ struct DictionaryEntry bool operator==( const DictionaryEntry& rE ) const; - rtl::OUString m_aTerm; - rtl::OUString m_aMapping; + OUString m_aTerm; + OUString m_aMapping; sal_Int16 m_nConversionPropertyType; //linguistic2::ConversionPropertyType sal_Bool m_bNewEntry; @@ -79,12 +79,12 @@ public: void refillFromDictionary( sal_Int32 nTextConversionOptions /*i18n::TextConversionOption*/ ); void save(); - DictionaryEntry* getTermEntry( const rtl::OUString& rTerm ) const; - bool hasTerm( const rtl::OUString& rTerm ) const; + DictionaryEntry* getTermEntry( const OUString& rTerm ) const; + bool hasTerm( const OUString& rTerm ) const; - void addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping + void addEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, sal_uIntPtr nPos = LIST_APPEND ); - sal_uIntPtr deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted + sal_uIntPtr deleteEntries( const OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted void deleteEntryOnPos( sal_Int32 nPos ); DictionaryEntry* getEntryOnPos( sal_Int32 nPos ) const; DictionaryEntry* getFirstSelectedEntry() const; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index fa27c4cf40ee..4082018dee7f 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -40,8 +40,8 @@ namespace textconversiondlgs //............................................................................. using namespace ::com::sun::star; -#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog") -#define SERVICE_NAME ::rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog") +#define SERVICE_IMPLEMENTATION_NAME OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog") +#define SERVICE_NAME OUString("com.sun.star.linguistic2.ChineseTranslationDialog") ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference< uno::XComponentContext >& xContext ) : m_xCC( xContext ) @@ -73,20 +73,20 @@ void ChineseTranslation_UnoDialog::impl_DeleteDialog() //------------------------------------------------------------------------- // lang::XServiceInfo -::rtl::OUString SAL_CALL ChineseTranslation_UnoDialog::getImplementationName() throw( uno::RuntimeException ) +OUString SAL_CALL ChineseTranslation_UnoDialog::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); } -::rtl::OUString ChineseTranslation_UnoDialog::getImplementationName_Static() +OUString ChineseTranslation_UnoDialog::getImplementationName_Static() { return SERVICE_IMPLEMENTATION_NAME; } -sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) +sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString* pArray = aSNL.getArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString* pArray = aSNL.getArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) { if( pArray[ i ] == ServiceName ) @@ -95,14 +95,14 @@ sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const ::rtl::OU return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -uno::Sequence< rtl::OUString > ChineseTranslation_UnoDialog::getSupportedServiceNames_Static() +uno::Sequence< OUString > ChineseTranslation_UnoDialog::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = SERVICE_NAME; return aSNS; } @@ -110,7 +110,7 @@ uno::Sequence< rtl::OUString > ChineseTranslation_UnoDialog::getSupportedService //------------------------------------------------------------------------- // ui::dialogs::XExecutableDialog -void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const ::rtl::OUString& ) throw(uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const OUString& ) throw(uno::RuntimeException) { //not implemented - fell free to do so, if you do need this } @@ -211,12 +211,12 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ChineseTranslation_UnoDialog: { return 0; } -void SAL_CALL ChineseTranslation_UnoDialog::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { //only read only properties throw beans::PropertyVetoException(); } -uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const ::rtl::OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; @@ -250,19 +250,19 @@ uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const ::rtl::O return aRet; } -void SAL_CALL ChineseTranslation_UnoDialog::addPropertyChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //only not bound properties -> ignore listener } -void SAL_CALL ChineseTranslation_UnoDialog::removePropertyChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //only not bound properties -> ignore listener } -void SAL_CALL ChineseTranslation_UnoDialog::addVetoableChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //only not bound properties -> ignore listener } -void SAL_CALL ChineseTranslation_UnoDialog::removeVetoableChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL ChineseTranslation_UnoDialog::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //only not bound properties -> ignore listener } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index 2d268def8e58..0e8b89cf10ac 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -75,12 +75,12 @@ public: virtual ~ChineseTranslation_UnoDialog(); // lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext) throw(::com::sun::star::uno::Exception) @@ -92,17 +92,17 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // ui::dialogs::XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); // beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // lang::XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index d38eab3b389b..bf6ecc8dc9cb 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -57,14 +57,14 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); - Any aAny( aLngCfg.GetProperty( rtl::OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ) ) ); + Any aAny( aLngCfg.GetProperty( OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ) ) ); aAny >>= bValue; if( bValue ) m_pRB_To_Simplified->Check(); else m_pRB_To_Traditional->Check(); - aAny = aLngCfg.GetProperty( rtl::OUString( UPN_IS_TRANSLATE_COMMON_TERMS ) ); + aAny = aLngCfg.GetProperty( OUString( UPN_IS_TRANSLATE_COMMON_TERMS ) ); if( aAny >>= bValue ) m_pCB_Translate_Commonterms->Check( bValue ); @@ -95,9 +95,9 @@ IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl) SvtLinguConfig aLngCfg; Any aAny; aAny <<= sal_Bool( !!m_pRB_To_Simplified->IsChecked() ); - aLngCfg.SetProperty( rtl::OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ), aAny ); + aLngCfg.SetProperty( OUString( UPN_IS_DIRECTION_TO_SIMPLIFIED ), aAny ); aAny <<= sal_Bool( !!m_pCB_Translate_Commonterms->IsChecked() ); - aLngCfg.SetProperty( rtl::OUString( UPN_IS_TRANSLATE_COMMON_TERMS ), aAny ); + aLngCfg.SetProperty( OUString( UPN_IS_TRANSLATE_COMMON_TERMS ), aAny ); EndDialog( RET_OK ); return 0; diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 6062a357db5e..59062efa88d6 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -72,7 +72,6 @@ using namespace ::comphelper; using namespace ::osl; -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -158,7 +157,7 @@ namespace svx virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); // XMimeTypeInfo - virtual sal_Bool SAL_CALL supportsMimeType( const ::rtl::OUString& MimeTypeName ) throw (RuntimeException); + virtual sal_Bool SAL_CALL supportsMimeType( const OUString& MimeTypeName ) throw (RuntimeException); virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames( ) throw (RuntimeException); VirtualDevice* CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const; @@ -585,7 +584,7 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto // putting the StatusIndicator that we got from the MediaDescriptor into our local FilterData copy if ( rSettings.mxStatusIndicator.is() ) { - rtl::OUString sStatusIndicator( "StatusIndicator" ); + OUString sStatusIndicator( "StatusIndicator" ); int i = rSettings.maFilterData.getLength(); rSettings.maFilterData.realloc( i + 1 ); rSettings.maFilterData[ i ].Name = sStatusIndicator; diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx index 4a213368d8ba..db9e8f719624 100644 --- a/svx/source/unodraw/UnoGraphicExporter.hxx +++ b/svx/source/unodraw/UnoGraphicExporter.hxx @@ -25,8 +25,8 @@ namespace svx { SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GraphicExporter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); - SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GraphicExporter_getSupportedServiceNames() throw(); - SVX_DLLPUBLIC ::rtl::OUString SAL_CALL GraphicExporter_getImplementationName() throw(); + SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > SAL_CALL GraphicExporter_getSupportedServiceNames() throw(); + SVX_DLLPUBLIC OUString SAL_CALL GraphicExporter_getImplementationName() throw(); } #endif diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 939c80103128..3aa0b21afbbe 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -47,7 +47,7 @@ private: ItemPoolVector maItemSetVector; - void SAL_CALL ImplInsertByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ); + void SAL_CALL ImplInsertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ); public: SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw(); @@ -62,19 +62,19 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw (); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL getByName( const rtl::OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw( com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException); // XElementAccess virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException); diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 3be929155bd7..af77a5269b1f 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -59,18 +59,18 @@ namespace svx virtual ~NamespaceMap(); // XNameAccess - virtual Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (RuntimeException); + virtual Any SAL_CALL getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (RuntimeException); // XElementAccess virtual Type SAL_CALL getElementType( ) throw (RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); }; Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ) @@ -78,18 +78,18 @@ namespace svx return (XWeak*)new NamespaceMap( pWhichIds, pPool ); } - Sequence< ::rtl::OUString > SAL_CALL NamespaceMap_getSupportedServiceNames() + Sequence< OUString > SAL_CALL NamespaceMap_getSupportedServiceNames() throw() { - Sequence< ::rtl::OUString > aSupportedServiceNames( 1 ); - aSupportedServiceNames[0] = ::rtl::OUString( "com.sun.star.xml.NamespaceMap" ); + Sequence< OUString > aSupportedServiceNames( 1 ); + aSupportedServiceNames[0] = OUString( "com.sun.star.xml.NamespaceMap" ); return aSupportedServiceNames; } - ::rtl::OUString SAL_CALL NamespaceMap_getImplementationName() + OUString SAL_CALL NamespaceMap_getImplementationName() throw() { - return ::rtl::OUString( "com.sun.star.comp.Svx.NamespaceMap" ); + return OUString( "com.sun.star.comp.Svx.NamespaceMap" ); } @@ -111,7 +111,7 @@ namespace svx NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool ); - sal_Bool next( ::rtl::OUString& rPrefix, ::rtl::OUString& rURL ); + sal_Bool next( OUString& rPrefix, OUString& rURL ); }; } @@ -131,7 +131,7 @@ NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount2( *mpWhichId ) : 0; } -sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString& rURL ) +sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL ) { // we still need to process the current attribute if( mpCurrentAttr && (mnCurrentAttr != USHRT_MAX) ) @@ -196,12 +196,12 @@ NamespaceMap::~NamespaceMap() } // XNameAccess -Any SAL_CALL NamespaceMap::getByName( const ::rtl::OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); - ::rtl::OUString aPrefix; - ::rtl::OUString aURL; + OUString aPrefix; + OUString aURL; sal_Bool bFound; @@ -217,23 +217,23 @@ Any SAL_CALL NamespaceMap::getByName( const ::rtl::OUString& aName ) throw (NoSu return makeAny( aURL ); } -Sequence< ::rtl::OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeException) +Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeException) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); - ::rtl::OUString aPrefix; - ::rtl::OUString aURL; + OUString aPrefix; + OUString aURL; - std::set< ::rtl::OUString, comphelper::UStringLess > aPrefixSet; + std::set< OUString, comphelper::UStringLess > aPrefixSet; while( aIter.next( aPrefix, aURL ) ) aPrefixSet.insert( aPrefix ); - Sequence< ::rtl::OUString > aSeq( aPrefixSet.size() ); - ::rtl::OUString* pPrefixes = aSeq.getArray(); + Sequence< OUString > aSeq( aPrefixSet.size() ); + OUString* pPrefixes = aSeq.getArray(); - std::set< ::rtl::OUString, comphelper::UStringLess >::iterator aPrefixIter( aPrefixSet.begin() ); - const std::set< ::rtl::OUString, comphelper::UStringLess >::iterator aEnd( aPrefixSet.end() ); + std::set< OUString, comphelper::UStringLess >::iterator aPrefixIter( aPrefixSet.begin() ); + const std::set< OUString, comphelper::UStringLess >::iterator aEnd( aPrefixSet.end() ); while( aPrefixIter != aEnd ) { @@ -243,12 +243,12 @@ Sequence< ::rtl::OUString > SAL_CALL NamespaceMap::getElementNames() throw (Runt return aSeq; } -sal_Bool SAL_CALL NamespaceMap::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException) +sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (RuntimeException) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); - ::rtl::OUString aPrefix; - ::rtl::OUString aURL; + OUString aPrefix; + OUString aURL; sal_Bool bFound; @@ -264,33 +264,33 @@ sal_Bool SAL_CALL NamespaceMap::hasByName( const ::rtl::OUString& aName ) throw // XElementAccess Type SAL_CALL NamespaceMap::getElementType() throw (RuntimeException) { - return ::getCppuType( (const ::rtl::OUString*) 0 ); + return ::getCppuType( (const OUString*) 0 ); } sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); - ::rtl::OUString aPrefix; - ::rtl::OUString aURL; + OUString aPrefix; + OUString aURL; return aIter.next( aPrefix, aURL ); } // XServiceInfo -::rtl::OUString SAL_CALL NamespaceMap::getImplementationName( ) +OUString SAL_CALL NamespaceMap::getImplementationName( ) throw(RuntimeException) { return NamespaceMap_getImplementationName(); } -sal_Bool SAL_CALL NamespaceMap::supportsService( const ::rtl::OUString& ) +sal_Bool SAL_CALL NamespaceMap::supportsService( const OUString& ) throw(RuntimeException) { return sal_True; } -Sequence< ::rtl::OUString > SAL_CALL NamespaceMap::getSupportedServiceNames( ) +Sequence< OUString > SAL_CALL NamespaceMap::getSupportedServiceNames( ) throw(RuntimeException) { return NamespaceMap_getSupportedServiceNames(); diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 324b4a45800b..ad217dc1eac3 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -33,8 +33,8 @@ #include -#define IMPLEMENTATIONNAME_RECOVERYUI ::rtl::OUString("com.sun.star.comp.svx.RecoveryUI") -#define SERVICENAME_RECOVERYUI ::rtl::OUString("com.sun.star.dialog.RecoveryUI") +#define IMPLEMENTATIONNAME_RECOVERYUI OUString("com.sun.star.comp.svx.RecoveryUI") +#define SERVICENAME_RECOVERYUI OUString("com.sun.star.dialog.RecoveryUI") namespace svx @@ -59,22 +59,22 @@ RecoveryUI::~RecoveryUI() } //=============================================== -::rtl::OUString SAL_CALL RecoveryUI::getImplementationName() +OUString SAL_CALL RecoveryUI::getImplementationName() throw(css::uno::RuntimeException) { return RecoveryUI::st_getImplementationName(); } //=============================================== -sal_Bool SAL_CALL RecoveryUI::supportsService(const ::rtl::OUString& sServiceName) +sal_Bool SAL_CALL RecoveryUI::supportsService(const OUString& sServiceName) throw(css::uno::RuntimeException) { - const css::uno::Sequence< ::rtl::OUString > lServices = RecoveryUI::st_getSupportedServiceNames(); + const css::uno::Sequence< OUString > lServices = RecoveryUI::st_getSupportedServiceNames(); sal_Int32 c = lServices.getLength(); sal_Int32 i = 0; for (i=0; i SAL_CALL RecoveryUI::getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL RecoveryUI::getSupportedServiceNames() throw(css::uno::RuntimeException) { return RecoveryUI::st_getSupportedServiceNames(); @@ -150,15 +150,15 @@ void SAL_CALL RecoveryUI::removeStatusListener(const css::uno::Reference< css::f } //=============================================== -::rtl::OUString RecoveryUI::st_getImplementationName() +OUString RecoveryUI::st_getImplementationName() { - return ::rtl::OUString(IMPLEMENTATIONNAME_RECOVERYUI); + return OUString(IMPLEMENTATIONNAME_RECOVERYUI); } //=============================================== -css::uno::Sequence< ::rtl::OUString > RecoveryUI::st_getSupportedServiceNames() +css::uno::Sequence< OUString > RecoveryUI::st_getSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > lServiceNames(1); lServiceNames.getArray() [0] = SERVICENAME_RECOVERYUI; + css::uno::Sequence< OUString > lServiceNames(1); lServiceNames.getArray() [0] = SERVICENAME_RECOVERYUI; return lServiceNames; } @@ -276,9 +276,9 @@ void RecoveryUI::impl_doRecovery() { sal_Bool bRecoveryOnly( sal_False ); - ::rtl::OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/"); - ::rtl::OUString CFG_PATH_CRASHREPORTER( "CrashReporter" ); - ::rtl::OUString CFG_ENTRY_ENABLED( "Enabled" ); + OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/"); + OUString CFG_PATH_CRASHREPORTER( "CrashReporter" ); + OUString CFG_ENTRY_ENABLED( "Enabled" ); sal_Bool bCrashRepEnabled(sal_False); css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey( diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 9f8320014f72..750c622f2800 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -40,17 +40,17 @@ class SvxPluginShape : public SvxOle2Shape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: SvxPluginShape( SdrObject* pObj ) throw(); virtual ~SvxPluginShape() throw(); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); }; @@ -63,17 +63,17 @@ class SvxAppletShape : public SvxOle2Shape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: SvxAppletShape( SdrObject* pObj ) throw(); virtual ~SvxAppletShape() throw(); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); }; @@ -86,17 +86,17 @@ class SvxFrameShape : public SvxOle2Shape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: SvxFrameShape( SdrObject* pObj ) throw(); virtual ~SvxFrameShape() throw(); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) throw (); }; @@ -108,8 +108,8 @@ class SvxTableShape : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void lock(); virtual void unlock(); diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index c8f8b4440c87..ed2d7ede90e6 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -64,8 +64,8 @@ namespace svx typedef ::boost::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders; - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar < ::rtl::OUString - , ::rtl::OUStringHash + typedef ::cppu::OMultiTypeInterfaceContainerHelperVar < OUString + , OUStringHash , ::comphelper::UStringEqual > PropertyChangeListenerContainer; @@ -95,7 +95,7 @@ namespace svx //= PropertyValueProvider //==================================================================== //-------------------------------------------------------------------- - ::rtl::OUString PropertyValueProvider::getPropertyName() const + OUString PropertyValueProvider::getPropertyName() const { return m_sPropertyName; } @@ -143,10 +143,10 @@ namespace svx if ( provPos == m_pData->m_aProviders.end() ) return; - ::rtl::OUString sPropertyName( provPos->second->getPropertyName() ); + OUString sPropertyName( provPos->second->getPropertyName() ); ::cppu::OInterfaceContainerHelper* pPropListeners = m_pData->m_aPropertyChangeListeners.getContainer( sPropertyName ); - ::cppu::OInterfaceContainerHelper* pAllListeners = m_pData->m_aPropertyChangeListeners.getContainer( ::rtl::OUString() ); + ::cppu::OInterfaceContainerHelper* pAllListeners = m_pData->m_aPropertyChangeListeners.getContainer( OUString() ); if ( !pPropListeners && !pAllListeners ) return; @@ -170,13 +170,13 @@ namespace svx } //-------------------------------------------------------------------- - void PropertyChangeNotifier::addPropertyChangeListener( const ::rtl::OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) + void PropertyChangeNotifier::addPropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) { m_pData->m_aPropertyChangeListeners.addInterface( _rPropertyName, _rxListener ); } //-------------------------------------------------------------------- - void PropertyChangeNotifier::removePropertyChangeListener( const ::rtl::OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) + void PropertyChangeNotifier::removePropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) { m_pData->m_aPropertyChangeListeners.removeInterface( _rPropertyName, _rxListener ); } diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 62af47f7d31a..90fc9905847a 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -25,7 +25,6 @@ /////////////////////////////////////////////////////////////////////// -using ::rtl::OUString; using namespace ::osl; using namespace ::cppu; @@ -39,7 +38,7 @@ using namespace ::com::sun::star::beans; SvxTableShape::SvxTableShape( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_TABLE), getSvxMapProvider().GetPropertySet(SVXMAP_TABLE, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( "com.sun.star.drawing.TableShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.TableShape" ) ); } //---------------------------------------------------------------------- @@ -50,7 +49,7 @@ SvxTableShape::~SvxTableShape() throw() //---------------------------------------------------------------------- bool SvxTableShape::setPropertyValueImpl( - const ::rtl::OUString& rName, + const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) @@ -105,7 +104,7 @@ bool SvxTableShape::setPropertyValueImpl( extern Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector ); bool SvxTableShape::getPropertyValueImpl( - const ::rtl::OUString& rName, + const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 0697b7023959..398ebc9cc621 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -100,7 +100,7 @@ NameOrIndex* SvxUnoBitmapTable::createItem() const throw() uno::Type SAL_CALL SvxUnoBitmapTable::getElementType( ) throw( uno::RuntimeException ) { - return ::getCppuType( (const ::rtl::OUString*)0 ); + return ::getCppuType( (const OUString*)0 ); } /** diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 88ec2e8ab8ba..f8af587091aa 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -91,9 +91,9 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; //-//////////////////////////////////////////////////////////////////// @@ -191,7 +191,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( return xRet; } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { return SvxUnoTextCreateTextField( ServiceSpecifier ); } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index cb13fb859e77..fcef224793c2 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -45,7 +45,6 @@ #include #include -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 4e06a8057bb5..3b77721e3f9a 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -471,17 +471,17 @@ SfxItemPropertyMapEntry* ImplGetSvxOle2PropertyMap() TEXT_PROPERTIES FONTWORK_PROPERTIES - { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN("Model"), OWN_ATTR_OLEMODEL , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("OriginalSize"), OWN_ATTR_OLESIZE , &::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN("CLSID"), OWN_ATTR_CLSID , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("CLSID"), OWN_ATTR_CLSID , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN("IsInternal"), OWN_ATTR_INTERNAL_OLE , &::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("VisibleArea"), OWN_ATTR_OLE_VISAREA , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, { MAP_CHAR_LEN("Aspect"), OWN_ATTR_OLE_ASPECT , &::getCppuType((const sal_Int64*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0), 0, 0}, {0,0,0,0,0,0} @@ -494,26 +494,26 @@ SfxItemPropertyMapEntry* ImplGetSvxPluginPropertyMap() { static SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] = { - { MAP_CHAR_LEN("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN("PluginURL"), OWN_ATTR_PLUGIN_URL , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("PluginURL"), OWN_ATTR_PLUGIN_URL , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN("PluginCommands"), OWN_ATTR_PLUGIN_COMMANDS , SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0)), 0, 0}, { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, - { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("VisibleArea"), OWN_ATTR_OLE_VISAREA , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, {0,0,0,0,0,0} }; @@ -526,8 +526,8 @@ SfxItemPropertyMapEntry* ImplGetSvxFramePropertyMap() //TODO/LATER: new properties for ScrollingMode and DefaultBorder static SfxItemPropertyMapEntry aFramePropertyMap_Impl[] = { - { MAP_CHAR_LEN("FrameURL"), OWN_ATTR_FRAME_URL , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN("FrameName"), OWN_ATTR_FRAME_NAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("FrameURL"), OWN_ATTR_FRAME_URL , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("FrameName"), OWN_ATTR_FRAME_NAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN("FrameIsAutoScroll"), OWN_ATTR_FRAME_ISAUTOSCROLL , &::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { MAP_CHAR_LEN("FrameIsBorder"), OWN_ATTR_FRAME_ISBORDER , &::getBooleanCppuType() , 0, 0}, { MAP_CHAR_LEN("FrameMarginWidth"), OWN_ATTR_FRAME_MARGIN_WIDTH , &::getCppuType((const sal_Int32*)0), 0, 0}, @@ -535,20 +535,20 @@ SfxItemPropertyMapEntry* ImplGetSvxFramePropertyMap() { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, - { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("VisibleArea"), OWN_ATTR_OLE_VISAREA , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, {0,0,0,0,0,0} }; @@ -560,29 +560,29 @@ SfxItemPropertyMapEntry* ImplGetSvxAppletPropertyMap() { static SfxItemPropertyMapEntry aAppletPropertyMap_Impl[] = { - { MAP_CHAR_LEN("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , &::getCppuType(( const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN("AppletName"), OWN_ATTR_APPLET_NAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN("AppletCode"), OWN_ATTR_APPLET_CODE , &::getCppuType(( const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , &::getCppuType(( const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("AppletName"), OWN_ATTR_APPLET_NAME , &::getCppuType(( const OUString*)0), 0, 0}, + { MAP_CHAR_LEN("AppletCode"), OWN_ATTR_APPLET_CODE , &::getCppuType(( const OUString*)0), 0, 0}, { MAP_CHAR_LEN("AppletCommands"), OWN_ATTR_APPLET_COMMANDS , SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0)), 0, 0}, - { MAP_CHAR_LEN("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , &::getCppuType(( const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , &::getCppuType(( const OUString*)0), 0, 0}, { MAP_CHAR_LEN("AppletIsScript"), OWN_ATTR_APPLET_ISSCRIPT , &::getBooleanCppuType(), 0, 0 }, { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence*)0)), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, - { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , &::getCppuType(( const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("LinkURL"), OWN_ATTR_OLE_LINKURL , &::getCppuType(( const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("VisibleArea"), OWN_ATTR_OLE_VISAREA , &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, {0,0,0,0,0,0} }; @@ -595,8 +595,8 @@ SfxItemPropertyMapEntry* ImplGetSvxControlShapePropertyMap() static SfxItemPropertyMapEntry aControlPropertyMap_Impl[] = { // the following properties are mapped to the XControl Model of this shape - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME), 0, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), 0, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME), 0, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), 0, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY), 0, &::getCppuType((const sal_Int16*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET), 0, &::getCppuType((const sal_Int16*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT), 0, &::getCppuType((const float*)0), 0, 0 }, @@ -625,15 +625,15 @@ SfxItemPropertyMapEntry* ImplGetSvxControlShapePropertyMap() { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, // #i112587# { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , &::getBooleanCppuType(), 0, 0}, \ { MAP_CHAR_LEN("Visible"), SDRATTR_OBJVISIBLE , &::getBooleanCppuType(), 0, 0}, \ @@ -651,15 +651,15 @@ SfxItemPropertyMapEntry* ImplGetSvxPageShapePropertyMap() { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION , &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, {0,0,0,0,0,0} }; @@ -706,10 +706,10 @@ SfxItemPropertyMapEntry* ImplGetSvxCustomShapePropertyMap() { static SfxItemPropertyMapEntry aCustomShapePropertyMap_Impl[] = { - { MAP_CHAR_LEN("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, &::getCppuType((const OUString*)0), 0, 0 }, { MAP_CHAR_LEN("CustomShapeGeometry"), SDRATTR_CUSTOMSHAPE_GEOMETRY, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0)), 0, 0 }, - { MAP_CHAR_LEN("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, &::getCppuType((const OUString*)0), 0, 0}, CUSTOMSHAPE_PROPERTIES FILL_PROPERTIES LINE_PROPERTIES @@ -733,11 +733,11 @@ SfxItemPropertyMapEntry* ImplGetSvxMediaShapePropertyMap() { { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, &::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION, &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, - { MAP_CHAR_LEN("MediaURL"), OWN_ATTR_MEDIA_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN("MediaURL"), OWN_ATTR_MEDIA_URL, &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN("PreferredSize"), OWN_ATTR_MEDIA_PREFERREDSIZE, &::getCppuType((const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("Loop"), OWN_ATTR_MEDIA_LOOP, &::getCppuType((const sal_Bool*)0), 0, 0}, { MAP_CHAR_LEN("Mute"), OWN_ATTR_MEDIA_MUTE, &::getCppuType((const sal_Bool*)0), 0, 0}, @@ -747,10 +747,10 @@ SfxItemPropertyMapEntry* ImplGetSvxMediaShapePropertyMap() { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, {MAP_CHAR_LEN("PrivateStream"), OWN_ATTR_MEDIA_STREAM, &::com::sun::star::io::XInputStream::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, &::getCppuType((const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, &::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, {0,0,0,0,0,0} }; @@ -764,15 +764,15 @@ SfxItemPropertyMapEntry* ImplGetSvxTableShapePropertyMap() { { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, &::getCppuType((const sal_Int16*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, &::com::sun::star::awt::XBitmap::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, &::getCppuType(( const ::rtl::OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, &::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION, &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, &::getBooleanCppuType(),0, 0}, { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, - { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const ::rtl::OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , &::getCppuType((const OUString*)0), 0, 0}, + { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , &::getCppuType((const OUString*)0), 0, 0}, { MAP_CHAR_LEN("Model"), OWN_ATTR_OLEMODEL , &::com::sun::star::table::XTable::static_type(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("TableTemplate"), OWN_ATTR_TABLETEMPLATE , &::com::sun::star::container::XIndexAccess::static_type(), 0, 0}, { MAP_CHAR_LEN("UseFirstRowStyle"), OWN_ATTR_TABLETEMPLATE_FIRSTROW, &::getBooleanCppuType(),0, 0}, @@ -826,7 +826,7 @@ comphelper::PropertyMapEntry* ImplGetAdditionalWriterDrawingDefaultsPropertyMap( * class UHashMap * ***********************************************************************/ -typedef ::boost::unordered_map< rtl::OUString, sal_uInt32, rtl::OUStringHash > UHashMapImpl; +typedef ::boost::unordered_map< OUString, sal_uInt32, OUStringHash > UHashMapImpl; namespace { static const UHashMapImpl &GetUHashImpl() @@ -869,7 +869,7 @@ namespace { { RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Shape3DPolygonObject"), E3D_POLYGONOBJ_ID | E3D_INVENTOR_FLAG }, }; for (sal_uInt32 i = 0; i < sizeof(aInit)/sizeof(aInit[0]); i++) - aImpl[rtl::OUString( aInit[i].name, aInit[i].length, RTL_TEXTENCODING_ASCII_US ) ] = aInit[i].id; + aImpl[OUString( aInit[i].name, aInit[i].length, RTL_TEXTENCODING_ASCII_US ) ] = aInit[i].id; bInited = true; } return aImpl; @@ -877,7 +877,7 @@ namespace { } //---------------------------------------------------------------------- -rtl::OUString UHashMap::getNameFromId(sal_uInt32 nId) +OUString UHashMap::getNameFromId(sal_uInt32 nId) { const UHashMapImpl &rMap = GetUHashImpl(); @@ -887,7 +887,7 @@ rtl::OUString UHashMap::getNameFromId(sal_uInt32 nId) return it->first; } OSL_FAIL("[CL] unknown SdrObjekt identifier"); - return rtl::OUString(); + return OUString(); } uno::Sequence< OUString > UHashMap::getServiceNames() @@ -1298,7 +1298,7 @@ bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestRe { //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't //replace "Red Hat 1" with the translation of Red :-) - rtl::OUString sStr(rString); + OUString sStr(rString); const sal_Unicode *pStr = sStr.getStr(); sal_Int32 nLength = sStr.getLength(); while( nLength > 0 ) @@ -1308,7 +1308,7 @@ bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestRe break; nLength--; } - sStr = rtl::OUString(pStr, nLength).trim(); + sStr = OUString(pStr, nLength).trim(); for(int i = 0; i < nCount; ++i ) { @@ -1360,7 +1360,7 @@ OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rIntern /** if the given name is a predefined api name it is replaced by the predefined name for the current language. */ -OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const rtl::OUString& rApiName) throw() +OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw() { String aNew = rApiName; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index f974e51247a7..ebf92291f2b8 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -60,7 +60,6 @@ #include #include -using ::rtl::OUString; using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star; @@ -895,7 +894,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyNa } // XPropertyState -beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const ::rtl::OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) +beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) { OUString aFormsName; if ( lcl_convertPropertyName( PropertyName, aFormsName ) ) @@ -920,7 +919,7 @@ beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const ::rtl::OU } } -void SAL_CALL SvxShapeControl::setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) +void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) { OUString aFormsName; if ( lcl_convertPropertyName( PropertyName, aFormsName ) ) @@ -943,7 +942,7 @@ void SAL_CALL SvxShapeControl::setPropertyToDefault( const ::rtl::OUString& Prop } } -uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const ::rtl::OUString& aPropertyName ) +uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const OUString& aPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { OUString aFormsName; @@ -1076,7 +1075,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c //---------------------------------------------------------------------- -bool SvxShapePolyPolygon::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1186,7 +1185,7 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo //---------------------------------------------------------------------- -bool SvxShapePolyPolygon::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1311,7 +1310,7 @@ SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw() //---------------------------------------------------------------------- -bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1354,7 +1353,7 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const ::rtl::OUString& rNa //---------------------------------------------------------------------- -bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1453,7 +1452,7 @@ SvxGraphicObject::~SvxGraphicObject() throw() //---------------------------------------------------------------------- -bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { bool bOk = false; switch( pProperty->nWID ) @@ -1510,7 +1509,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const // graphic manager url aURL = aURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ); String aTmpStr(aURL); - rtl::OString aUniqueID(rtl::OUStringToOString(aTmpStr, RTL_TEXTENCODING_UTF8)); + OString aUniqueID(OUStringToOString(aTmpStr, RTL_TEXTENCODING_UTF8)); GraphicObject aGrafObj(aUniqueID); // #101808# since loading a graphic can cause a reschedule of the office @@ -1537,7 +1536,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const if( aURLObj.GetProtocol() == INET_PROT_NOT_VALID ) { - rtl::OUString aValidURL; + OUString aValidURL; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aURL, aValidURL ) ) aURLObj = INetURLObject( aValidURL ); @@ -1608,7 +1607,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const //---------------------------------------------------------------------- -bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1957,7 +1956,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c } } -bool SvxCustomShape::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1974,7 +1973,7 @@ bool SvxCustomShape::getPropertyValueImpl( const ::rtl::OUString& rName, const S } //---------------------------------------------------------------------- -void SvxCustomShape::createCustomShapeDefaults( const rtl::OUString& rValueType ) throw (::com::sun::star::uno::RuntimeException) +void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) throw (::com::sun::star::uno::RuntimeException) { ((SdrObjCustomShape*)mpObj.get())->MergeDefaultAttributes( &rValueType ); } diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index e433f399ec6c..6e15dc0c1f17 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -46,7 +46,6 @@ #include #include "shapeimpl.hxx" -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -315,7 +314,7 @@ struct ImpRememberTransAndRect Rectangle maRect; }; -bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -427,7 +426,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::OUString& rName, const //---------------------------------------------------------------------- -bool Svx3DSceneObject::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DSceneObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -495,7 +494,7 @@ Svx3DCubeObject::~Svx3DCubeObject() throw() } //---------------------------------------------------------------------- -bool Svx3DCubeObject::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -552,7 +551,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const ::rtl::OUString& rName, const //---------------------------------------------------------------------- -bool Svx3DCubeObject::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -627,7 +626,7 @@ Svx3DSphereObject::~Svx3DSphereObject() throw() //---------------------------------------------------------------------- -bool Svx3DSphereObject::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -673,7 +672,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const ::rtl::OUString& rName, cons //---------------------------------------------------------------------- -bool Svx3DSphereObject::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -831,7 +830,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon& //---------------------------------------------------------------------- -bool Svx3DLatheObject::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -878,7 +877,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const ::rtl::OUString& rName, const } //---------------------------------------------------------------------- -bool Svx3DLatheObject::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -950,7 +949,7 @@ Svx3DExtrudeObject::~Svx3DExtrudeObject() throw() //---------------------------------------------------------------------- -bool Svx3DExtrudeObject::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -987,7 +986,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const ::rtl::OUString& rName, con //---------------------------------------------------------------------- -bool Svx3DExtrudeObject::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1061,7 +1060,7 @@ Svx3DPolygonObject::~Svx3DPolygonObject() throw() } //---------------------------------------------------------------------- -bool Svx3DPolygonObject::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1135,7 +1134,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const ::rtl::OUString& rName, con } //---------------------------------------------------------------------- -bool Svx3DPolygonObject::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 3baea7086c44..bacf34b392a0 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -85,7 +85,7 @@ SvxOle2Shape::~SvxOle2Shape() throw() } //XPropertySet -bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -163,7 +163,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx { GraphicObject aGrafObj( xGraphic ); const Graphic aGraphic( aGrafObj.GetGraphic() ); - pOle->SetGraphicToObj( aGraphic, rtl::OUString() ); + pOle->SetGraphicToObj( aGraphic, OUString() ); } return true; } @@ -196,7 +196,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx throw IllegalArgumentException(); } -bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -210,7 +210,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx case OWN_ATTR_INTERNAL_OLE: { - rtl::OUString sCLSID; + OUString sCLSID; rValue <<= SotExchange::IsInternal( GetClassName_Impl(sCLSID) ); break; } @@ -350,7 +350,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx { GraphicObject aObj( *pGraphic ); aURL = OUString( UNO_NAME_GRAPHOBJ_URLPREFIX); - aURL += rtl::OStringToOUString(aObj.GetUniqueID(), + aURL += OStringToOUString(aObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US); } } @@ -408,7 +408,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) // create storage and inplace object ::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist(); - ::rtl::OUString aPersistName; + OUString aPersistName; OUString aTmpStr; if( SvxShape::getPropertyValue( UNO_NAME_OLE2_PERSISTNAME ) >>= aTmpStr ) aPersistName = aTmpStr; @@ -451,7 +451,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) return xObj.is(); } -sal_Bool SvxOle2Shape::createLink( const ::rtl::OUString& aLinkURL ) +sal_Bool SvxOle2Shape::createLink( const OUString& aLinkURL ) { DBG_TESTSOLARMUTEX(); @@ -459,19 +459,19 @@ sal_Bool SvxOle2Shape::createLink( const ::rtl::OUString& aLinkURL ) if ( !pOle2Obj || !pOle2Obj->IsEmpty() ) return sal_False; - ::rtl::OUString aPersistName; + OUString aPersistName; ::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist(); uno::Sequence< beans::PropertyValue > aMediaDescr( 1 ); - aMediaDescr[0].Name = ::rtl::OUString("URL"); + aMediaDescr[0].Name = OUString("URL"); aMediaDescr[0].Value <<= aLinkURL; uno::Reference< task::XInteractionHandler > xInteraction = pPersist->getInteractionHandler(); if ( xInteraction.is() ) { aMediaDescr.realloc( 2 ); - aMediaDescr[1].Name = ::rtl::OUString( "InteractionHandler" ); + aMediaDescr[1].Name = OUString( "InteractionHandler" ); aMediaDescr[1].Value <<= xInteraction; } @@ -530,7 +530,7 @@ void SvxOle2Shape::resetModifiedState() } } -const SvGlobalName SvxOle2Shape::GetClassName_Impl(rtl::OUString& rHexCLSID) +const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID) { DBG_TESTSOLARMUTEX(); SvGlobalName aClassName; @@ -538,7 +538,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(rtl::OUString& rHexCLSID) if( pOle2Obj ) { - rHexCLSID = rtl::OUString(); + rHexCLSID = OUString(); if( pOle2Obj->IsEmpty() ) { @@ -574,7 +574,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(rtl::OUString& rHexCLSID) SvxAppletShape::SvxAppletShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_APPLET), getSvxMapProvider().GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( "com.sun.star.drawing.AppletShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.AppletShape" ) ); } SvxAppletShape::~SvxAppletShape() throw() @@ -586,22 +586,22 @@ void SvxAppletShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aAppletClassId( SO3_APPLET_CLASSID ); createObject(aAppletClassId); - SetShapeType( rtl::OUString( "com.sun.star.drawing.AppletShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.AppletShape" ) ); } -void SAL_CALL SvxAppletShape::setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxAppletShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxAppletShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxAppletShape::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -622,7 +622,7 @@ bool SvxAppletShape::setPropertyValueImpl( const ::rtl::OUString& rName, const S } } -bool SvxAppletShape::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -647,7 +647,7 @@ bool SvxAppletShape::getPropertyValueImpl( const ::rtl::OUString& rName, const S SvxPluginShape::SvxPluginShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_PLUGIN), getSvxMapProvider().GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( "com.sun.star.drawing.PluginShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.PluginShape" ) ); } SvxPluginShape::~SvxPluginShape() throw() @@ -659,22 +659,22 @@ void SvxPluginShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aPluginClassId( SO3_PLUGIN_CLASSID ); createObject(aPluginClassId); - SetShapeType( rtl::OUString( "com.sun.star.drawing.PluginShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.PluginShape" ) ); } -void SAL_CALL SvxPluginShape::setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxPluginShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxPluginShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxPluginShape::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -695,7 +695,7 @@ bool SvxPluginShape::setPropertyValueImpl( const ::rtl::OUString& rName, const S } } -bool SvxPluginShape::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -720,7 +720,7 @@ bool SvxPluginShape::getPropertyValueImpl( const ::rtl::OUString& rName, const S SvxFrameShape::SvxFrameShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_FRAME), getSvxMapProvider().GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( "com.sun.star.drawing.FrameShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.FrameShape" ) ); } SvxFrameShape::~SvxFrameShape() throw() @@ -732,22 +732,22 @@ void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw () SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aIFrameClassId( SO3_IFRAME_CLASSID ); createObject(aIFrameClassId); - SetShapeType( rtl::OUString( "com.sun.star.drawing.FrameShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.FrameShape" ) ); } -void SAL_CALL SvxFrameShape::setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxFrameShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxFrameShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxFrameShape::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) { @@ -768,7 +768,7 @@ bool SvxFrameShape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sf } } -bool SvxFrameShape::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxFrameShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) { @@ -795,7 +795,7 @@ bool SvxFrameShape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sf SvxMediaShape::SvxMediaShape( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_MEDIA), getSvxMapProvider().GetPropertySet(SVXMAP_MEDIA, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( "com.sun.star.drawing.MediaShape" ) ); + SetShapeType( OUString( "com.sun.star.drawing.MediaShape" ) ); } //---------------------------------------------------------------------- @@ -805,7 +805,7 @@ SvxMediaShape::~SvxMediaShape() throw() //---------------------------------------------------------------------- -bool SvxMediaShape::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if( (pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM) ) { @@ -894,7 +894,7 @@ bool SvxMediaShape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sf //---------------------------------------------------------------------- -bool SvxMediaShape::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if ( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 76c46fc1ec80..a60030dd70df 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -94,7 +94,6 @@ #include #include -using ::rtl::OUString; using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star; @@ -1305,7 +1304,7 @@ OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeExce //---------------------------------------------------------------------- -void SAL_CALL SvxShape::setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxShape::setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException) { ::SolarMutexGuard aGuard; if( mpObj.is() ) @@ -1478,7 +1477,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN //---------------------------------------------------------------------- -sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const ::rtl::OUString& rName, SfxItemSet& rSet, SdrModel* pModel ) +sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ) { // check if an item with the given name and which id is inside the models // pool or the stylesheet pool, if found its puttet in the itemse @@ -1689,7 +1688,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const if( (pMap->nFlags & beans::PropertyAttribute::READONLY ) != 0 ) throw beans::PropertyVetoException( - ( rtl::OUString( + ( OUString( "Readonly property can't be set: " ) + rPropertyName ), uno::Reference< drawing::XShape >( this ) ); @@ -1864,7 +1863,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) //---------------------------------------------------------------------- // XMultiPropertySet -void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ::SolarMutexGuard aSolarGuard; @@ -1937,7 +1936,7 @@ void SvxShape::endSetPropertyValues() //---------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL SvxShape::getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL SvxShape::getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException) { const sal_Int32 nCount = aPropertyNames.getLength(); const OUString* pNames = aPropertyNames.getConstArray(); @@ -1980,7 +1979,7 @@ void SvxShape::endSetPropertyValues() return aRet; } -void SAL_CALL SvxShape::addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxShape::addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException) { } @@ -1988,7 +1987,7 @@ void SAL_CALL SvxShape::removePropertiesChangeListener( const ::com::sun::star:: { } -void SAL_CALL SvxShape::firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SvxShape::firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException) { } @@ -2159,7 +2158,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope //---------------------------------------------------------------------- -bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -2585,7 +2584,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper //---------------------------------------------------------------------- -bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -3808,7 +3807,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { Sequence< OUString > SupportedServices( getSupportedServiceNames() ); - const ::rtl::OUString * pArray = SupportedServices.getConstArray(); + const OUString * pArray = SupportedServices.getConstArray(); const sal_Int32 nCount = SupportedServices.getLength(); sal_Int32 i; for( i = 0; i < nCount; i++ ) @@ -4176,7 +4175,7 @@ void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::Runt } // overide these for special property handling in subcasses. Return true if property is handled -bool SvxShapeText::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { // HACK-fix #99090# // since SdrTextObj::SetVerticalWriting exchanges @@ -4199,7 +4198,7 @@ bool SvxShapeText::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx return SvxShape::setPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if( pProperty->nWID == SDRATTR_TEXTDIRECTION ) { diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 1c8102129b55..2f5364c5c9aa 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -212,33 +212,33 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException //---------------------------------------------------------------------- // XServiceInfo //---------------------------------------------------------------------- -::rtl::OUString SAL_CALL SvxShapeCollection::getImplementationName() +OUString SAL_CALL SvxShapeCollection::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); } -::rtl::OUString SvxShapeCollection::getImplementationName_Static() +OUString SvxShapeCollection::getImplementationName_Static() { - return ::rtl::OUString("com.sun.star.drawing.SvxShapeCollection"); + return OUString("com.sun.star.drawing.SvxShapeCollection"); } -sal_Bool SAL_CALL SvxShapeCollection::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SvxShapeCollection::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } -uno::Sequence< ::rtl::OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -uno::Sequence< ::rtl::OUString > SvxShapeCollection::getSupportedServiceNames_Static() +uno::Sequence< OUString > SvxShapeCollection::getSupportedServiceNames_Static() { - uno::Sequence< ::rtl::OUString > aSeq(2); - aSeq.getArray()[0] = ::rtl::OUString("com.sun.star.drawing.Shapes"); - aSeq.getArray()[1] = ::rtl::OUString("com.sun.star.drawing.ShapeCollection"); + uno::Sequence< OUString > aSeq(2); + aSeq.getArray()[0] = OUString("com.sun.star.drawing.Shapes"); + aSeq.getArray()[1] = OUString("com.sun.star.drawing.ShapeCollection"); return aSeq; } diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 49fe00c4011f..86734c61f779 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -641,7 +641,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() if (mpOutliner->GetParagraphCount()==1) { // if we only have one paragraph we check if it is empty - rtl::OUString aStr(mpOutliner->GetText(mpOutliner->GetParagraph(0))); + OUString aStr(mpOutliner->GetText(mpOutliner->GetParagraph(0))); if (aStr.isEmpty()) { diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 54d25ae9cb36..3eeba97be520 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -125,27 +125,27 @@ void SAL_CALL GalleryItem::release() // ------------------------------------------------------------------------------ -::rtl::OUString GalleryItem::getImplementationName_Static() +OUString GalleryItem::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryItem" ); + return OUString( "com.sun.star.comp.gallery.GalleryItem" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GalleryItem::getSupportedServiceNames_Static() +uno::Sequence< OUString > GalleryItem::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryItem" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryItem" ); return aSeq; } // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GalleryItem::getImplementationName() +OUString SAL_CALL GalleryItem::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -153,11 +153,11 @@ uno::Sequence< ::rtl::OUString > GalleryItem::getSupportedServiceNames_Static() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryItem::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GalleryItem::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -168,7 +168,7 @@ sal_Bool SAL_CALL GalleryItem::supportsService( const ::rtl::OUString& ServiceNa // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryItem::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GalleryItem::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -245,10 +245,10 @@ sal_Int8 SAL_CALL GalleryItem::getType() { MAP_CHAR_LEN( "GalleryItemType" ), UNOGALLERY_GALLERYITEMTYPE, &::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "URL" ), UNOGALLERY_URL, &::getCppuType( (const ::rtl::OUString*)(0)), + { MAP_CHAR_LEN( "URL" ), UNOGALLERY_URL, &::getCppuType( (const OUString*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "Title" ), UNOGALLERY_TITLE, &::getCppuType( (const ::rtl::OUString*)(0)), + { MAP_CHAR_LEN( "Title" ), UNOGALLERY_TITLE, &::getCppuType( (const OUString*)(0)), 0, 0 }, { MAP_CHAR_LEN( "Thumbnail" ), UNOGALLERY_THUMBNAIL, &::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)), @@ -283,7 +283,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt { if( UNOGALLERY_TITLE == (*ppEntries)->mnHandle ) { - ::rtl::OUString aNewTitle; + OUString aNewTitle; if( *pValues >>= aNewTitle ) { @@ -295,7 +295,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt if( pObj ) { - if( ::rtl::OUString( pObj->GetTitle() ) != aNewTitle ) + if( OUString( pObj->GetTitle() ) != aNewTitle ) { pObj->SetTitle( aNewTitle ); pGalTheme->InsertObject( *pObj ); @@ -339,7 +339,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt ::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : NULL ); if( pGalTheme ) - *pValue <<= ::rtl::OUString( implGetObject()->aURL.GetMainURL( INetURLObject::NO_DECODE ) ); + *pValue <<= OUString( implGetObject()->aURL.GetMainURL( INetURLObject::NO_DECODE ) ); } break; @@ -353,7 +353,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt if( pObj ) { - *pValue <<= ::rtl::OUString( pObj->GetTitle() ); + *pValue <<= OUString( pObj->GetTitle() ); pGalTheme->ReleaseObject( pObj ); } } diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index 715cde0f242b..7977e780298a 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -52,8 +52,8 @@ public: bool isValid() const; - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: @@ -64,9 +64,9 @@ protected: virtual void SAL_CALL release() throw(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 8b6284797017..eb03c477f361 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -41,7 +41,7 @@ namespace unogallery { // - GalleryTheme - // ----------------- -GalleryTheme::GalleryTheme( const ::rtl::OUString& rThemeName ) +GalleryTheme::GalleryTheme( const OUString& rThemeName ) { mpGallery = ::Gallery::GetGalleryInstance(); mpTheme = ( mpGallery ? mpGallery->AcquireTheme( rThemeName, *this ) : NULL ); @@ -71,27 +71,27 @@ GalleryTheme::~GalleryTheme() // ------------------------------------------------------------------------------ -::rtl::OUString GalleryTheme::getImplementationName_Static() +OUString GalleryTheme::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryTheme" ); + return OUString( "com.sun.star.comp.gallery.GalleryTheme" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GalleryTheme::getSupportedServiceNames_Static() +uno::Sequence< OUString > GalleryTheme::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryTheme" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryTheme" ); return aSeq; } // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GalleryTheme::getImplementationName() +OUString SAL_CALL GalleryTheme::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -99,11 +99,11 @@ uno::Sequence< ::rtl::OUString > GalleryTheme::getSupportedServiceNames_Static() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryTheme::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GalleryTheme::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -114,7 +114,7 @@ sal_Bool SAL_CALL GalleryTheme::supportsService( const ::rtl::OUString& ServiceN // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryTheme::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GalleryTheme::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -204,11 +204,11 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GalleryTheme::getName( ) +OUString SAL_CALL GalleryTheme::getName( ) throw (uno::RuntimeException) { const SolarMutexGuard aGuard; - ::rtl::OUString aRet; + OUString aRet; if( mpTheme ) aRet = mpTheme->GetName(); @@ -233,7 +233,7 @@ void SAL_CALL GalleryTheme::update( ) // ------------------------------------------------------------------------------ ::sal_Int32 SAL_CALL GalleryTheme::insertURLByIndex( - const ::rtl::OUString& rURL, ::sal_Int32 nIndex ) + const OUString& rURL, ::sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException) { const SolarMutexGuard aGuard; diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index 46659fb6ba45..0dc1a1c964e6 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -45,18 +45,18 @@ class GalleryTheme : public ::cppu::WeakImplHelper1< ::com::sun::star::gallery:: public: - GalleryTheme( const ::rtl::OUString& rThemeName ); + GalleryTheme( const OUString& rThemeName ); ~GalleryTheme(); - static ::rtl::OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); + static OUString getImplementationName_Static() throw(); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -71,9 +71,9 @@ protected: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XGalleryThemes - virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL insertURLByIndex( const ::rtl::OUString& URL, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL insertURLByIndex( const OUString& URL, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL insertGraphicByIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL insertDrawingByIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Drawing, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 672ef21ba848..af3a15ea8268 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -45,7 +45,7 @@ uno::Reference< uno::XInterface > SAL_CALL GalleryThemeProvider_createInstance( // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() throw() { return GalleryThemeProvider::getSupportedServiceNames_Static(); @@ -53,7 +53,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServi // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL GalleryThemeProvider_getImplementationName() +OUString SAL_CALL GalleryThemeProvider_getImplementationName() throw() { return GalleryThemeProvider::getImplementationName_Static(); @@ -77,27 +77,27 @@ GalleryThemeProvider::~GalleryThemeProvider() // ------------------------------------------------------------------------------ -SVX_DLLPUBLIC ::rtl::OUString GalleryThemeProvider::getImplementationName_Static() +SVX_DLLPUBLIC OUString GalleryThemeProvider::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryThemeProvider" ); + return OUString( "com.sun.star.comp.gallery.GalleryThemeProvider" ); } // ------------------------------------------------------------------------------ -SVX_DLLPUBLIC uno::Sequence< ::rtl::OUString > GalleryThemeProvider::getSupportedServiceNames_Static() +SVX_DLLPUBLIC uno::Sequence< OUString > GalleryThemeProvider::getSupportedServiceNames_Static() throw() { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryThemeProvider" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryThemeProvider" ); return aSeq; } // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GalleryThemeProvider::getImplementationName() +OUString SAL_CALL GalleryThemeProvider::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -105,11 +105,11 @@ SVX_DLLPUBLIC uno::Sequence< ::rtl::OUString > GalleryThemeProvider::getSupporte // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -120,7 +120,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const ::rtl::OUString& // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -198,7 +198,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements() // ------------------------------------------------------------------------------ -uno::Any SAL_CALL GalleryThemeProvider::getByName( const ::rtl::OUString& rName ) +uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { const SolarMutexGuard aGuard; @@ -218,12 +218,12 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const ::rtl::OUString& rName // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getElementNames() +uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames() throw (uno::RuntimeException) { const SolarMutexGuard aGuard; sal_uInt32 i = 0, nCount = ( mpGallery ? mpGallery->GetThemeCount() : 0 ), nRealCount = 0; - uno::Sequence< ::rtl::OUString > aSeq( nCount ); + uno::Sequence< OUString > aSeq( nCount ); for( ; i < nCount; ++i ) { @@ -240,7 +240,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getElementNames( // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const ::rtl::OUString& rName ) +sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) throw (uno::RuntimeException) { const SolarMutexGuard aGuard; @@ -255,7 +255,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const ::rtl::OUString& rName // ------------------------------------------------------------------------------ -uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const ::rtl::OUString& rThemeName ) +uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const OUString& rThemeName ) throw (container::ElementExistException, uno::RuntimeException) { const SolarMutexGuard aGuard; @@ -278,7 +278,7 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe // ------------------------------------------------------------------------------ -void SAL_CALL GalleryThemeProvider::removeByName( const ::rtl::OUString& rName ) +void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName ) throw (container::NoSuchElementException, uno::RuntimeException) { const SolarMutexGuard aGuard; diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 64482f87a354..d62dead1f5b8 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -126,7 +126,7 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput() struct OUStringLess { - bool operator() ( const ::rtl::OUString& r1, const ::rtl::OUString& r2 ) const + bool operator() ( const OUString& r1, const OUString& r2 ) const { return (r1 < r2) != sal_False; } @@ -181,16 +181,16 @@ void SAL_CALL SvXMLEmbeddedObjectHelper::disposing() } -void SvXMLEmbeddedObjectHelper::splitObjectURL(::rtl::OUString aURLNoPar, - ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjectStorageName) +void SvXMLEmbeddedObjectHelper::splitObjectURL(OUString aURLNoPar, + OUString& rContainerStorageName, + OUString& rObjectStorageName) { DBG_ASSERT( '#' != aURLNoPar[0], "invalid object URL" ); sal_Int32 _nPos = aURLNoPar.lastIndexOf( '/' ); if( -1 == _nPos ) { - rContainerStorageName = ::rtl::OUString(); + rContainerStorageName = OUString(); rObjectStorageName = aURLNoPar; } else @@ -223,9 +223,9 @@ void SvXMLEmbeddedObjectHelper::splitObjectURL(::rtl::OUString aURLNoPar, } sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( - const ::rtl::OUString& rURLStr, - ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjectStorageName, + const OUString& rURLStr, + OUString& rContainerStorageName, + OUString& rObjectStorageName, sal_Bool bInternalToExternal, sal_Bool *pGraphicRepl, sal_Bool *pOasisFormat ) const @@ -252,7 +252,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( // get rid of arguments sal_Int32 nPos = rURLStr.indexOf( '?' ); - ::rtl::OUString aURLNoPar; + OUString aURLNoPar; if ( nPos == -1 ) aURLNoPar = rURLStr; else @@ -263,8 +263,8 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( nPos++; while( nPos >= 0 && nPos < rURLStr.getLength() ) { - ::rtl::OUString aToken = rURLStr.getToken( 0, ',', nPos ); - if ( aToken.equalsIgnoreAsciiCase( ::rtl::OUString( "oasis=false" ) ) ) + OUString aToken = rURLStr.getToken( 0, ',', nPos ); + if ( aToken.equalsIgnoreAsciiCase( OUString( "oasis=false" ) ) ) { if ( pOasisFormat ) *pOasisFormat = sal_False; @@ -292,7 +292,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( nPos = aURLNoPar.lastIndexOf( '/' ); if( -1 == nPos ) { - rContainerStorageName = ::rtl::OUString(); + rContainerStorageName = OUString(); rObjectStorageName = aURLNoPar.copy( nPathStart ); } else if( nPos > nPathStart ) @@ -332,7 +332,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( } uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerStorage( - const ::rtl::OUString& rStorageName ) + const OUString& rStorageName ) { DBG_ASSERT( -1 == rStorageName.indexOf( '/' ) && -1 == rStorageName.indexOf( '\\' ), @@ -368,8 +368,8 @@ uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerSt } sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( - const ::rtl::OUString& rContainerStorageName, - ::rtl::OUString& rObjName, + const OUString& rContainerStorageName, + OUString& rObjName, const SvGlobalName *pClassId, SvStream* pTemp ) { @@ -413,8 +413,8 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( // This is an ole object uno::Reference< beans::XPropertySet > xProps( xStm, uno::UNO_QUERY_THROW ); xProps->setPropertyValue( - ::rtl::OUString( "MediaType" ), - uno::makeAny( ::rtl::OUString( "application/vnd.sun.star.oleobject" ) ) ); + OUString( "MediaType" ), + uno::makeAny( OUString( "application/vnd.sun.star.oleobject" ) ) ); xStm->getOutputStream()->closeOutput(); } @@ -438,7 +438,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( // make object known to the container // TODO/LATER: could be done a little bit more efficient! - ::rtl::OUString aName( rObjName ); + OUString aName( rObjName ); // TODO/LATER: The provided pClassId is ignored for now. // The stream contains OLE storage internally and this storage already has a class id specifying the @@ -450,12 +450,12 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( return sal_True; } -::rtl::OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( - const ::rtl::OUString& rURLStr ) +OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( + const OUString& rURLStr ) { - ::rtl::OUString sRetURL; + OUString sRetURL; - ::rtl::OUString aContainerStorageName, aObjectStorageName; + OUString aContainerStorageName, aObjectStorageName; if( !ImplGetStorageNames( rURLStr, aContainerStorageName, aObjectStorageName, EMBEDDEDOBJECTHELPER_MODE_WRITE == meCreateMode ) ) @@ -482,7 +482,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( } ImplReadObject( aContainerStorageName, aObjectStorageName, pClassId, pOut ? pOut->GetStream() : 0 ); - sRetURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(XML_EMBEDDEDOBJECT_URL_BASE) ); + sRetURL = OUString( RTL_CONSTASCII_USTRINGPARAM(XML_EMBEDDEDOBJECT_URL_BASE) ); sRetURL += aObjectStorageName; if( pOut ) @@ -494,11 +494,11 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( else { // Objects are written using ::comphelper::IEmbeddedHelper::SaveAs - sRetURL = ::rtl::OUString("./"); + sRetURL = OUString("./"); if( !aContainerStorageName.isEmpty() ) { sRetURL += aContainerStorageName; - sRetURL += ::rtl::OUString( '/' ); + sRetURL += OUString( '/' ); } sRetURL += aObjectStorageName; } @@ -521,7 +521,7 @@ uno::Reference< io::XInputStream > SvXMLEmbeddedObjectHelper::ImplGetReplacement { // means that the object is not active // copy replacement image from old to new container - ::rtl::OUString aMediaType; + OUString aMediaType; xStream = mpDocPersist->getEmbeddedObjectContainer().GetGraphicStream( xObj, &aMediaType ); } @@ -532,7 +532,7 @@ uno::Reference< io::XInputStream > SvXMLEmbeddedObjectHelper::ImplGetReplacement if ( nCurState == embed::EmbedStates::LOADED ) bSwitchBackToLoaded = sal_True; - ::rtl::OUString aMediaType; + OUString aMediaType; xStream = svt::EmbeddedObjectRef::GetGraphicReplacementStream( embed::Aspects::MSOLE_CONTENT, xObj, @@ -608,7 +608,7 @@ void SvXMLEmbeddedObjectHelper::Flush() } // XGraphicObjectResolver: alien objects! -::rtl::OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL( const ::rtl::OUString& aURL ) +OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL( const OUString& aURL ) throw(RuntimeException) { MutexGuard aGuard( maMutex ); @@ -618,7 +618,7 @@ void SvXMLEmbeddedObjectHelper::Flush() // XNameAccess: alien objects! Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( - const ::rtl::OUString& rURLStr ) + const OUString& rURLStr ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard( maMutex ); @@ -650,7 +650,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( sal_Bool bGraphicRepl = sal_False; sal_Bool bOasisFormat = sal_True; Reference < XInputStream > xStrm; - ::rtl::OUString aContainerStorageName, aObjectStorageName; + OUString aContainerStorageName, aObjectStorageName; if( ImplGetStorageNames( rURLStr, aContainerStorageName, aObjectStorageName, sal_True, @@ -680,7 +680,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( mxTempStorage = comphelper::OStorageHelper::GetTemporaryStorage(); Sequence < beans::PropertyValue > aDummy( 0 ), aEmbDescr( 1 ); - aEmbDescr[0].Name = ::rtl::OUString( "StoreVisualReplacement" ); + aEmbDescr[0].Name = OUString( "StoreVisualReplacement" ); aEmbDescr[0].Value <<= (sal_Bool)(!bOasisFormat); if ( !bOasisFormat ) { @@ -688,7 +688,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( if ( xGrInStream.is() ) { aEmbDescr.realloc( 2 ); - aEmbDescr[1].Name = ::rtl::OUString( "VisualReplacement" ); + aEmbDescr[1].Name = OUString( "VisualReplacement" ); aEmbDescr[1].Value <<= xGrInStream; } } @@ -716,14 +716,14 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( return aRet; } -Sequence< ::rtl::OUString > SAL_CALL SvXMLEmbeddedObjectHelper::getElementNames() +Sequence< OUString > SAL_CALL SvXMLEmbeddedObjectHelper::getElementNames() throw (RuntimeException) { MutexGuard aGuard( maMutex ); - return Sequence< ::rtl::OUString >(0); + return Sequence< OUString >(0); } -sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const ::rtl::OUString& rURLStr ) +sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr ) throw (RuntimeException) { MutexGuard aGuard( maMutex ); @@ -733,7 +733,7 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const ::rtl::OUString& r } else { - ::rtl::OUString aContainerStorageName, aObjectStorageName; + OUString aContainerStorageName, aObjectStorageName; if( !ImplGetStorageNames( rURLStr, aContainerStorageName, aObjectStorageName, sal_True ) ) diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index 1da4ad59aa42..f57351088fd1 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -40,7 +40,6 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 5a79ec753eab..3f09fe847eb9 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -88,15 +88,15 @@ private: public: - SvXMLGraphicInputStream( const ::rtl::OUString& rGraphicId ); + SvXMLGraphicInputStream( const OUString& rGraphicId ); virtual ~SvXMLGraphicInputStream(); sal_Bool Exists() const { return mxStmWrapper.is(); } }; -SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphicId ) +SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId ) { - GraphicObject aGrfObject( rtl::OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) ); + GraphicObject aGrfObject( OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) ); maTmp.EnableKillingFile(); @@ -366,9 +366,9 @@ void SAL_CALL SvXMLGraphicHelper::disposing() { } -sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const ::rtl::OUString& rURLStr, - ::rtl::OUString& rPictureStorageName, - ::rtl::OUString& rPictureStreamName ) +sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const OUString& rURLStr, + OUString& rPictureStorageName, + OUString& rPictureStreamName ) { String aURLStr( rURLStr ); sal_Bool bRet = sal_False; @@ -394,7 +394,7 @@ sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const ::rtl::OUString& rURLStr, return bRet; } -uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( const ::rtl::OUString& rStorageName ) +uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( const OUString& rStorageName ) { uno::Reference < embed::XStorage > xRetStorage; if( mxRootStorage.is() ) @@ -426,8 +426,8 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co return xRetStorage; } -SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName, +SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUString& rPictureStorageName, + const OUString& rPictureStreamName, sal_Bool bTruncate ) { SvxGraphicHelperStream_Impl aRet; @@ -446,7 +446,7 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rt aRet.xStream = aRet.xStorage->openStreamElement( rPictureStreamName, nMode ); if( aRet.xStream.is() && ( GRAPHICHELPER_MODE_WRITE == meCreateMode ) ) { - ::rtl::OUString aPropName( "UseCommonStoragePasswordEncryption" ); + OUString aPropName( "UseCommonStoragePasswordEncryption" ); uno::Reference < beans::XPropertySet > xProps( aRet.xStream, uno::UNO_QUERY ); xProps->setPropertyValue( aPropName, uno::makeAny( sal_True) ); } @@ -476,7 +476,7 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const String& rFileName ) con if( ( rFileName.Len() >= 4 ) && ( rFileName.GetChar( rFileName.Len() - 4 ) == '.' ) ) { - const rtl::OString aExt(rtl::OUStringToOString(rFileName.Copy(rFileName.Len() - 3), + const OString aExt(OUStringToOString(rFileName.Copy(rFileName.Len() - 3), RTL_TEXTENCODING_ASCII_US)); for( long i = 0, nCount = sizeof (aMapper) / sizeof (aMapper[0]); ( i < nCount ) && !aMimeType.Len(); i++ ) @@ -487,8 +487,8 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const String& rFileName ) con return aMimeType; } -Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName ) +Graphic SvXMLGraphicHelper::ImplReadGraphic( const OUString& rPictureStorageName, + const OUString& rPictureStreamName ) { Graphic aGraphic; SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) ); @@ -502,12 +502,12 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor return aGraphic; } -sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureStorageName, - const ::rtl::OUString& rPictureStreamName, - const ::rtl::OUString& rGraphicId, +sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName, + const OUString& rPictureStreamName, + const OUString& rGraphicId, bool bUseGfxLink ) { - GraphicObject aGrfObject( rtl::OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) ); + GraphicObject aGrfObject( OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) ); sal_Bool bRet = sal_False; if( aGrfObject.GetType() != GRAPHIC_NONE ) @@ -517,7 +517,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt { Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() ); const GfxLink aGfxLink( aGraphic.GetLink() ); - const ::rtl::OUString aMimeType( ImplGetGraphicMimeType( rPictureStreamName ) ); + const OUString aMimeType( ImplGetGraphicMimeType( rPictureStreamName ) ); uno::Any aAny; uno::Reference < beans::XPropertySet > xProps( aStream.xStream, uno::UNO_QUERY ); @@ -588,10 +588,10 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt return bRet; } -void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, sal_uInt32 nInsertPos, rtl::OUString& rRequestedFileName ) +void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt32 nInsertPos, OUString& rRequestedFileName ) { - rtl::OUString aURLString( rURLStr ); - ::rtl::OUString aPictureStorageName, aPictureStreamName; + OUString aURLString( rURLStr ); + OUString aPictureStorageName, aPictureStreamName; if( ( maURLSet.find( aURLString ) != maURLSet.end() ) ) { for (URLPairVector::const_iterator aIter( maGrfURLs.begin() ), aEnd( maGrfURLs.end() ); aIter != aEnd ; ++aIter) @@ -614,10 +614,10 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s if( aObj.GetType() != GRAPHIC_NONE ) { maGrfObjs.push_back( aObj ); - ::rtl::OUString aBaseURL( XML_GRAPHICOBJECT_URL_BASE ); + OUString aBaseURL( XML_GRAPHICOBJECT_URL_BASE ); rURLPair.second = aBaseURL; - rURLPair.second += rtl::OStringToOUString(aObj.GetUniqueID(), + rURLPair.second += OStringToOUString(aObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US); } else @@ -626,7 +626,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s else { const String aGraphicObjectId( aPictureStreamName ); - const rtl::OString aAsciiObjectID(rtl::OUStringToOString(aGraphicObjectId, RTL_TEXTENCODING_ASCII_US)); + const OString aAsciiObjectID(OUStringToOString(aGraphicObjectId, RTL_TEXTENCODING_ASCII_US)); const GraphicObject aGrfObject( aAsciiObjectID ); if( aGrfObject.GetType() != GRAPHIC_NONE ) { @@ -688,7 +688,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s } } - rtl::OUString aURLEntry; + OUString aURLEntry; const String sPictures( "Pictures/" ); if ( !rRequestedFileName.isEmpty() ) @@ -718,7 +718,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s #if OSL_DEBUG_LEVEL > 0 else { - rtl::OStringBuffer sMessage( + OStringBuffer sMessage( RTL_CONSTASCII_STRINGPARAM("graphic object with ID '")); sMessage.append(aAsciiObjectID). append(RTL_CONSTASCII_STRINGPARAM("' has an unknown type")); @@ -772,20 +772,20 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) } // XGraphicObjectResolver -::rtl::OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const ::rtl::OUString& rURL ) +OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& rURL ) throw(uno::RuntimeException) { ::osl::MutexGuard aGuard( maMutex ); const sal_Int32 nIndex = maGrfURLs.size(); - rtl::OUString aURL( rURL ); - rtl::OUString aUserData; - rtl::OUString aRequestedFileName; + OUString aURL( rURL ); + OUString aUserData; + OUString aRequestedFileName; sal_Int32 nUser = rURL.indexOf( '?', 0 ); if ( nUser >= 0 ) { - aURL = rtl::OUString( rURL.copy( 0, nUser ) ); + aURL = OUString( rURL.copy( 0, nUser ) ); nUser++; aUserData = rURL.copy( nUser, rURL.getLength() - nUser ); } @@ -794,14 +794,14 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) sal_Int32 nIndex2 = 0; do { - rtl::OUString aToken = aUserData.getToken( 0, ';', nIndex2 ); + OUString aToken = aUserData.getToken( 0, ';', nIndex2 ); sal_Int32 n = aToken.indexOf( '=' ); if ( ( n > 0 ) && ( ( n + 1 ) < aToken.getLength() ) ) { - rtl::OUString aParam( aToken.copy( 0, n ) ); - rtl::OUString aValue( aToken.copy( n + 1, aToken.getLength() - ( n + 1 ) ) ); + OUString aParam( aToken.copy( 0, n ) ); + OUString aValue( aToken.copy( n + 1, aToken.getLength() - ( n + 1 ) ) ); - const rtl::OUString sRequestedName( "requestedName" ); + const OUString sRequestedName( "requestedName" ); if ( aParam.match( sRequestedName ) ) aRequestedFileName = aValue; } @@ -809,18 +809,18 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) while ( nIndex2 >= 0 ); } - maGrfURLs.push_back( ::std::make_pair( aURL, ::rtl::OUString() ) ); + maGrfURLs.push_back( ::std::make_pair( aURL, OUString() ) ); ImplInsertGraphicURL( aURL, nIndex, aRequestedFileName ); return maGrfURLs[ nIndex ].second; } // XBinaryStreamResolver -Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const ::rtl::OUString& rURL ) +Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const OUString& rURL ) throw( RuntimeException ) { Reference< XInputStream > xRet; - ::rtl::OUString aPictureStorageName, aGraphicId; + OUString aPictureStorageName, aGraphicId; if( ( GRAPHICHELPER_MODE_WRITE == meCreateMode ) && @@ -855,10 +855,10 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() return xRet; } -::rtl::OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOutputStream >& rxBinaryStream ) +OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOutputStream >& rxBinaryStream ) throw( RuntimeException ) { - ::rtl::OUString aRet; + OUString aRet; if( ( GRAPHICHELPER_MODE_READ == meCreateMode ) && rxBinaryStream.is() ) { @@ -869,12 +869,12 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() if( pOStm ) { const GraphicObject& rGrfObj = pOStm->GetGraphicObject(); - const ::rtl::OUString aId(::rtl::OStringToOUString( + const OUString aId(OStringToOUString( rGrfObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US)); if( !aId.isEmpty() ) { - aRet = ::rtl::OUString( XML_GRAPHICOBJECT_URL_BASE ); + aRet = OUString( XML_GRAPHICOBJECT_URL_BASE ); aRet += aId; } } @@ -927,23 +927,23 @@ protected: RuntimeException); // ____ XGraphicObjectResolver ____ - virtual ::rtl::OUString SAL_CALL resolveGraphicObjectURL( const ::rtl::OUString& aURL ) + virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) throw (RuntimeException); // ____ XBinaryStreamResolver ____ - virtual Reference< io::XInputStream > SAL_CALL getInputStream( const ::rtl::OUString& aURL ) + virtual Reference< io::XInputStream > SAL_CALL getInputStream( const OUString& aURL ) throw (RuntimeException); virtual Reference< io::XOutputStream > SAL_CALL createOutputStream() throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) + virtual OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) throw (RuntimeException); // ____ XServiceInfo ____ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); private: @@ -985,7 +985,7 @@ void SAL_CALL SvXMLGraphicImportExportHelper::initialize( } // ____ XGraphicObjectResolver ____ -::rtl::OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL( const ::rtl::OUString& aURL ) +OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL( const OUString& aURL ) throw (uno::RuntimeException) { return m_xGraphicObjectResolver->resolveGraphicObjectURL( aURL ); @@ -993,7 +993,7 @@ void SAL_CALL SvXMLGraphicImportExportHelper::initialize( // ____ XBinaryStreamResolver ____ -Reference< io::XInputStream > SAL_CALL SvXMLGraphicImportExportHelper::getInputStream( const ::rtl::OUString& aURL ) +Reference< io::XInputStream > SAL_CALL SvXMLGraphicImportExportHelper::getInputStream( const OUString& aURL ) throw (uno::RuntimeException) { return m_xBinaryStreamResolver->getInputStream( aURL ); @@ -1003,29 +1003,29 @@ Reference< io::XOutputStream > SAL_CALL SvXMLGraphicImportExportHelper::createOu { return m_xBinaryStreamResolver->createOutputStream(); } -::rtl::OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) +OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) throw (uno::RuntimeException) { return m_xBinaryStreamResolver->resolveOutputStream( aBinaryStream ); } // ____ XServiceInfo ____ -::rtl::OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName() +OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName() throw (uno::RuntimeException) { if( m_eGraphicHelperMode == GRAPHICHELPER_MODE_READ ) return SvXMLGraphicImportHelper_getImplementationName(); return SvXMLGraphicExportHelper_getImplementationName(); } -::sal_Bool SAL_CALL SvXMLGraphicImportExportHelper::supportsService( const ::rtl::OUString& ServiceName ) +::sal_Bool SAL_CALL SvXMLGraphicImportExportHelper::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames()); - const ::rtl::OUString * pBegin = aServiceNames.getConstArray(); - const ::rtl::OUString * pEnd = pBegin + aServiceNames.getLength(); + Sequence< OUString > aServiceNames( getSupportedServiceNames()); + const OUString * pBegin = aServiceNames.getConstArray(); + const OUString * pEnd = pBegin + aServiceNames.getLength(); return (::std::find( pBegin, pEnd, ServiceName ) != pEnd); } -Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServiceNames() +Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServiceNames() throw (uno::RuntimeException) { if( m_eGraphicHelperMode == GRAPHICHELPER_MODE_READ ) @@ -1039,18 +1039,18 @@ Reference< XInterface > SAL_CALL SvXMLGraphicImportHelper_createInstance(const R { return static_cast< XWeak* >( new SvXMLGraphicImportExportHelper( GRAPHICHELPER_MODE_READ )); } -::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementationName() +OUString SAL_CALL SvXMLGraphicImportHelper_getImplementationName() throw() { - return ::rtl::OUString( "com.sun.star.comp.Svx.GraphicImportHelper" ); + return OUString( "com.sun.star.comp.Svx.GraphicImportHelper" ); } -Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicImportHelper_getSupportedServiceNames() +Sequence< OUString > SAL_CALL SvXMLGraphicImportHelper_getSupportedServiceNames() throw() { // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service - Sequence< ::rtl::OUString > aSupportedServiceNames( 2 ); - aSupportedServiceNames[0] = ::rtl::OUString( "com.sun.star.document.GraphicObjectResolver" ); - aSupportedServiceNames[1] = ::rtl::OUString( "com.sun.star.document.BinaryStreamResolver" ); + Sequence< OUString > aSupportedServiceNames( 2 ); + aSupportedServiceNames[0] = OUString( "com.sun.star.document.GraphicObjectResolver" ); + aSupportedServiceNames[1] = OUString( "com.sun.star.document.BinaryStreamResolver" ); return aSupportedServiceNames; } @@ -1060,18 +1060,18 @@ Reference< XInterface > SAL_CALL SvXMLGraphicExportHelper_createInstance(const R { return static_cast< XWeak* >( new SvXMLGraphicImportExportHelper( GRAPHICHELPER_MODE_WRITE )); } -::rtl::OUString SAL_CALL SvXMLGraphicExportHelper_getImplementationName() +OUString SAL_CALL SvXMLGraphicExportHelper_getImplementationName() throw() { - return ::rtl::OUString( "com.sun.star.comp.Svx.GraphicExportHelper" ); + return OUString( "com.sun.star.comp.Svx.GraphicExportHelper" ); } -Sequence< ::rtl::OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServiceNames() +Sequence< OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServiceNames() throw() { // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service - Sequence< ::rtl::OUString > aSupportedServiceNames( 2 ); - aSupportedServiceNames[0] = ::rtl::OUString( "com.sun.star.document.GraphicObjectResolver" ); - aSupportedServiceNames[1] = ::rtl::OUString( "com.sun.star.document.BinaryStreamResolver" ); + Sequence< OUString > aSupportedServiceNames( 2 ); + aSupportedServiceNames[0] = OUString( "com.sun.star.document.GraphicObjectResolver" ); + aSupportedServiceNames[1] = OUString( "com.sun.star.document.BinaryStreamResolver" ); return aSupportedServiceNames; } diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index afac2c05ea1f..9cb97d9fafba 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -180,12 +180,12 @@ static void initializeStreamMetadata( const uno::Reference< uno::XInterface > &x try { xProps->setPropertyValue( - rtl::OUString( "MediaType" ), - uno::makeAny( rtl::OUString( "text/xml" ) ) ); + OUString( "MediaType" ), + uno::makeAny( OUString( "text/xml" ) ) ); // use stock encryption xProps->setPropertyValue( - rtl::OUString( "UseCommonStoragePasswordEncryption" ), + OUString( "UseCommonStoragePasswordEncryption" ), uno::makeAny( sal_True ) ); } catch ( const uno::Exception & ) { @@ -199,7 +199,7 @@ static void createStorageStream( uno::Reference < io::XOutputStream > *xOut, { uno::Reference < io::XStream > xStream; xStream = xSubStorage->openStreamElement( - rtl::OUString( "Content.xml" ), + OUString( "Content.xml" ), embed::ElementModes::WRITE ); *ppGraphicHelper = SvXMLGraphicHelper::Create( xSubStorage, GRAPHICHELPER_MODE_WRITE ); initializeStreamMetadata( xStream ); @@ -210,7 +210,7 @@ bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Reference& xTable, const uno::Reference& xStorage, - rtl::OUString *pOptName ) throw() + OUString *pOptName ) throw() { bool bRet = false; SfxMedium* pMedium = NULL; @@ -259,7 +259,7 @@ bool SvxXMLXTableExportComponent::save( } else // save into the xSubStorage { - rtl::OUString aPath = rURL; + OUString aPath = rURL; if( bSaveAsStorage ) { @@ -272,7 +272,7 @@ bool SvxXMLXTableExportComponent::save( } else { - aPath += rtl::OUString( ".xml" ); + aPath += OUString( ".xml" ); try { xStream = xStorage->openStreamElement( aPath, eCreate ); if( !xStream.is() ) diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index c7f638352685..99d3e13a3dc1 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -370,7 +370,7 @@ static void openStorageStream( xml::sax::InputSource *pParserInput, *ppGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_READ ); } -bool SvxXMLXTableImport::load( const rtl::OUString &rPath, +bool SvxXMLXTableImport::load( const OUString &rPath, const uno::Reference < embed::XStorage > &xStorage, const uno::Reference< XNameContainer >& xTable, bool *bOptLoadedFromStorage ) throw() @@ -455,7 +455,7 @@ bool SvxXMLXTableImport::load( const rtl::OUString &rPath, // on the current machine. FIXME: would be better to check a file exists // before importing ... // fprintf (stderr, "parsing etc. exception '%s'\n", -// rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); +// OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); bRet = false; } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index fb7cc13b669d..9a516dafc9a0 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -91,7 +91,7 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv ) *************************************************************************/ NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) : - SfxStringItem(_nWhich, rtl::OUString()), + SfxStringItem(_nWhich, OUString()), nPalIndex(nIndex) { } @@ -1000,9 +1000,9 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem aLineDash.Distance = rXD.GetDistance(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( "Name" ); + aPropSeq[0].Name = OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( "LineDash" ); + aPropSeq[1].Name = OUString( "LineDash" ); aPropSeq[1].Value = uno::makeAny( aLineDash ); rVal = uno::makeAny( aPropSeq ); break; @@ -1091,7 +1091,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 { uno::Sequence< beans::PropertyValue > aPropSeq; ::com::sun::star::drawing::LineDash aLineDash; - rtl::OUString aName; + OUString aName; sal_Bool bLineDash( sal_False ); if ( rVal >>= aPropSeq ) @@ -1133,7 +1133,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 case MID_NAME: { - rtl::OUString aName; + OUString aName; if (!(rVal >>= aName)) return false; SetName( aName ); @@ -3397,9 +3397,9 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 aGradient2.StepCount = aXGradient.GetSteps(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( "Name" ); + aPropSeq[0].Name = OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( "FillGradient" ); + aPropSeq[1].Name = OUString( "FillGradient" ); aPropSeq[1].Value = uno::makeAny( aGradient2 ); rVal = uno::makeAny( aPropSeq ); break; @@ -3461,7 +3461,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI { uno::Sequence< beans::PropertyValue > aPropSeq; ::com::sun::star::awt::Gradient aGradient2; - rtl::OUString aName; + OUString aName; bool bGradient( false ); if ( rVal >>= aPropSeq ) @@ -3504,7 +3504,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI case MID_NAME: { - rtl::OUString aName; + OUString aName; if (!(rVal >>= aName )) return false; SetName( aName ); @@ -3985,9 +3985,9 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe aUnoHatch.Angle = aHatch.GetAngle(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( "Name" ); + aPropSeq[0].Name = OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( "FillHatch" ); + aPropSeq[1].Name = OUString( "FillHatch" ); aPropSeq[1].Value = uno::makeAny( aUnoHatch ); rVal = uno::makeAny( aPropSeq ); break; @@ -4039,7 +4039,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 { uno::Sequence< beans::PropertyValue > aPropSeq; ::com::sun::star::drawing::Hatch aUnoHatch; - rtl::OUString aName; + OUString aName; bool bHatch( false ); if ( rVal >>= aPropSeq ) @@ -4085,7 +4085,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 case MID_NAME: { - rtl::OUString aName; + OUString aName; if (!(rVal >>= aName )) return false; SetName( aName ); diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 17827a321aea..0b622d4b6d02 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -519,9 +519,9 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe if( nMemberId == MID_GRAFURL || nMemberId == 0 ) { - aURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + aURL = OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_GRAPHOBJ_URLPREFIX)); - aURL += ::rtl::OStringToOUString( + aURL += OStringToOUString( GetGraphicObject().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); } @@ -543,11 +543,11 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe DBG_ASSERT( nMemberId == 0, "invalid member-id" ); uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); - aPropSeq[0].Name = ::rtl::OUString( "Name" ); + aPropSeq[0].Name = OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aInternalName ); - aPropSeq[1].Name = ::rtl::OUString( "FillBitmapURL" ); + aPropSeq[1].Name = OUString( "FillBitmapURL" ); aPropSeq[1].Value = uno::makeAny( aURL ); - aPropSeq[2].Name = ::rtl::OUString( "Bitmap" ); + aPropSeq[2].Name = OUString( "Bitmap" ); aPropSeq[2].Value = uno::makeAny( xBmp ); rVal <<= aPropSeq; @@ -562,8 +562,8 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt { nMemberId &= ~CONVERT_TWIPS; - ::rtl::OUString aName; - ::rtl::OUString aURL; + OUString aName; + OUString aURL; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic; diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index aa3be52d9417..03dfa29447c2 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -231,7 +231,7 @@ bool XPropertyList::Load() } bool XPropertyList::LoadFrom( const uno::Reference < embed::XStorage > &xStorage, - const rtl::OUString &rURL ) + const OUString &rURL ) { if( !bListDirty ) return false; @@ -260,7 +260,7 @@ bool XPropertyList::Save() } bool XPropertyList::SaveTo( const uno::Reference< embed::XStorage > &xStorage, - const rtl::OUString &rURL, rtl::OUString *pOptName ) + const OUString &rURL, OUString *pOptName ) { return SvxXMLXTableExportComponent::save( rURL, createInstance(), xStorage, pOptName ); } @@ -292,7 +292,7 @@ XPropertyListRef XPropertyList::CreatePropertyList( XPropertyListType t, XPropertyListRef XPropertyList::CreatePropertyListFromURL( XPropertyListType t, - const rtl::OUString & rURLStr, + const OUString & rURLStr, XOutdevItemPool* pXPool ) { INetURLObject aURL( rURLStr ); @@ -332,19 +332,19 @@ static struct { { XBITMAP_LIST, "sob" } }; -rtl::OUString XPropertyList::GetDefaultExt( XPropertyListType t ) +OUString XPropertyList::GetDefaultExt( XPropertyListType t ) { for (size_t i = 0; i < SAL_N_ELEMENTS (pExtnMap); i++) { if( pExtnMap[i].t == t ) - return rtl::OUString::createFromAscii( pExtnMap[ i ].pExt ); + return OUString::createFromAscii( pExtnMap[ i ].pExt ); } - return rtl::OUString(); + return OUString(); } -rtl::OUString XPropertyList::GetDefaultExtFilter( XPropertyListType t ) +OUString XPropertyList::GetDefaultExtFilter( XPropertyListType t ) { - rtl::OUString aFilter( "*." ); + OUString aFilter( "*." ); return aFilter + GetDefaultExt( t ); } diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index bb0ce74668ed..0a5add1befe7 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -63,7 +63,6 @@ #include "xmlconfig.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; @@ -649,7 +648,7 @@ void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvTreeListEntry* p char buffer[1024]; - rtl::OUString aText; + OUString aText; AtomConfig* pAtomConfig = dynamic_cast< AtomConfig*>( gAtomConfigMap[rHeader.nRecType].get() ); if( pAtomConfig ) @@ -658,11 +657,11 @@ void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvTreeListEntry* p if( !aText.getLength() ) { sprintf( buffer, "unknown_0x%04x", rHeader.nRecType ); - aText += rtl::OUString::createFromAscii( buffer ); + aText += OUString::createFromAscii( buffer ); } sprintf( buffer, " (I: %lu L: %lu)", (UINT32)rHeader.nRecVer, (UINT32)rHeader.nRecLen ); - aText += String( rtl::OUString::createFromAscii( buffer ) ); + aText += String( OUString::createFromAscii( buffer ) ); SvTreeListEntry* pEntry = 0; if( pAtom->isContainer() && pAtom->findFirstChildAtom() ) @@ -713,13 +712,13 @@ extern void load_config( const OUString& rPath ); class PPTDocument { public: - PPTDocument( const rtl::OUString& rFilePath ); + PPTDocument( const OUString& rFilePath ); ~PPTDocument(); Atom* getRootAtom() const; private: - void Load( const rtl::OUString& rFilePath ); + void Load( const OUString& rFilePath ); Atom* mpAtom; SvStream* mpDocStream; @@ -728,7 +727,7 @@ private: typedef boost::shared_ptr< PPTDocument > PPTDocumentPtr; -PPTDocument::PPTDocument(const rtl::OUString& rFilePath) +PPTDocument::PPTDocument(const OUString& rFilePath) : mpAtom(0), mpDocStream(0) { Load( rFilePath ); @@ -740,7 +739,7 @@ PPTDocument::~PPTDocument() delete mpDocStream; } -void PPTDocument::Load( const rtl::OUString& rFilePath ) +void PPTDocument::Load( const OUString& rFilePath ) { maStorage = new SotStorage( rFilePath, STREAM_STD_READ ); if( !maStorage->GetError() ) @@ -924,7 +923,7 @@ static String GetAtomText( const Atom* pAtom ) (UINT32)rHeader.nRecInstance, (UINT32)rHeader.nImpVerInst, (UINT32)rHeader.nRecLen ); - aText = rtl::OUString::createFromAscii( buffer ); + aText = OUString::createFromAscii( buffer ); if( pAtom->isContainer() ) { @@ -1130,12 +1129,12 @@ void MSViewerWorkWindow::Resize() if( argc >= 2 ) { - const rtl::OUString aFile1( rtl::OUString::createFromAscii(argv[1]) ); + const OUString aFile1( OUString::createFromAscii(argv[1]) ); PPTDocumentPtr pDocument1( new PPTDocument( aFile1 ) ); if( argc == 3 ) { - const rtl::OUString aFile2( rtl::OUString::createFromAscii(argv[2]) ); + const OUString aFile2( OUString::createFromAscii(argv[2]) ); PPTDocumentPtr pDocument2; pDocument2.reset( new PPTDocument( aFile2 ) ); diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 1b2cbdf51e8f..e182ed64e5d1 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -39,7 +39,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::io::XInputStream; using ::com::sun::star::io::IOException; @@ -329,9 +328,9 @@ void load_config( const OUString& rPath ) catch( Exception& ) { OSL_FAIL( - (rtl::OString("load_config(), " + (OString("load_config(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -339,7 +338,7 @@ void load_config( const OUString& rPath ) /////////////////////////////////////////////////////////////////////// -rtl::OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) const +OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) const { OUString aRet; if( maName.getLength() ) @@ -360,7 +359,7 @@ rtl::OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) cons return aRet; } -rtl::OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength ) { char buffer[128]; OUString aOut, aEmpty; @@ -402,7 +401,7 @@ rtl::OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength ) return aOut; } -rtl::OUString ElementConfig::dump_byte( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_byte( SvStream& rStream, sal_Size& nLength ) { OUString aRet; if( nLength >= sizeof(sal_Char) ) @@ -419,7 +418,7 @@ rtl::OUString ElementConfig::dump_byte( SvStream& rStream, sal_Size& nLength ) return aRet; } -rtl::OUString ElementConfig::dump_uint( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_uint( SvStream& rStream, sal_Size& nLength ) { OUString aRet; if( nLength >= sizeof( sal_uInt32 ) ) @@ -436,14 +435,14 @@ rtl::OUString ElementConfig::dump_uint( SvStream& rStream, sal_Size& nLength ) return aRet; } -rtl::OUString ElementConfig::dump_unistring( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_unistring( SvStream& rStream, sal_Size& nLength ) { String aString = SvxMSDffManager::MSDFFReadZString( rStream, nLength, sal_True ); nLength = 0; return aString; } -rtl::OUString ElementConfig::dump_float( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_float( SvStream& rStream, sal_Size& nLength ) { OUString aRet; if( nLength >= sizeof( float ) ) @@ -462,7 +461,7 @@ rtl::OUString ElementConfig::dump_float( SvStream& rStream, sal_Size& nLength ) /////////////////////////////////////////////////////////////////////// -rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLength ) const +OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLength ) const { OUString aRet; @@ -528,7 +527,7 @@ rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLeng /////////////////////////////////////////////////////////////////////// -rtl::OUString SwitchElementConfig::format( SvStream& rStream, sal_Size& nLength ) const +OUString SwitchElementConfig::format( SvStream& rStream, sal_Size& nLength ) const { OUString aValue; diff --git a/svx/workben/msview/xmlconfig.hxx b/svx/workben/msview/xmlconfig.hxx index d6cd4e04e0f0..8250bf3e3753 100644 --- a/svx/workben/msview/xmlconfig.hxx +++ b/svx/workben/msview/xmlconfig.hxx @@ -32,22 +32,22 @@ class ElementConfig { public: ElementConfig() : mnType( ECT_HEXDUMP ) {} - ElementConfig( const rtl::OUString& rName, ElementConfigType rType ) : maName( rName ), mnType( rType ) {} - ElementConfig( const rtl::OUString& rName ) : maName( rName ) {} + ElementConfig( const OUString& rName, ElementConfigType rType ) : maName( rName ), mnType( rType ) {} + ElementConfig( const OUString& rName ) : maName( rName ) {} ElementConfig( ElementConfigType rType ) : mnType( rType ) {} - virtual rtl::OUString format( SvStream& rStream, sal_Size& nLength ) const; + virtual OUString format( SvStream& rStream, sal_Size& nLength ) const; - const rtl::OUString& getName() const { return maName; } + const OUString& getName() const { return maName; } ElementConfigType getType() const { return mnType; } - static rtl::OUString dump_hex( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_byte( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_uint( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_unistring( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_float( SvStream& rStream, sal_Size& nLength ); + static OUString dump_hex( SvStream& rStream, sal_Size& nLength ); + static OUString dump_byte( SvStream& rStream, sal_Size& nLength ); + static OUString dump_uint( SvStream& rStream, sal_Size& nLength ); + static OUString dump_unistring( SvStream& rStream, sal_Size& nLength ); + static OUString dump_float( SvStream& rStream, sal_Size& nLength ); private: - rtl::OUString maName; + OUString maName; ElementConfigType mnType; }; typedef boost::shared_ptr< ElementConfig > ElementConfigPtr; @@ -58,12 +58,12 @@ typedef std::list< ElementConfigPtr > ElementConfigList; class ElementValueConfig : public ElementConfig { public: - ElementValueConfig( const rtl::OUString& rName, const rtl::OUString& rValue ) : ElementConfig( rName ), maValue( rValue ) {} + ElementValueConfig( const OUString& rName, const OUString& rValue ) : ElementConfig( rName ), maValue( rValue ) {} - const rtl::OUString& getValue() const { return maValue; } + const OUString& getValue() const { return maValue; } private: - rtl::OUString maValue; + OUString maValue; }; /////////////////////////////////////////////////////////////////////// @@ -72,11 +72,11 @@ class ElementConfigContainer : public ElementConfig { public: ElementConfigContainer() : ElementConfig( ETC_CONTAINER ) {} - ElementConfigContainer( const ::rtl::OUString& rName, ElementConfigType rType ) : ElementConfig( rName, rType ) {} - ElementConfigContainer( const ::rtl::OUString& rName ) : ElementConfig( rName, ETC_CONTAINER ) {} + ElementConfigContainer( const OUString& rName, ElementConfigType rType ) : ElementConfig( rName, rType ) {} + ElementConfigContainer( const OUString& rName ) : ElementConfig( rName, ETC_CONTAINER ) {} ElementConfigContainer( ElementConfigType rType ) : ElementConfig( rType ) {} - virtual rtl::OUString format( SvStream& rStream, sal_Size& nLength ) const; + virtual OUString format( SvStream& rStream, sal_Size& nLength ) const; void addElementConfig( ElementConfigPtr p ) { maElementConfigList.push_back( p ); } @@ -89,12 +89,12 @@ protected: class CaseElementConfig : public ElementConfigContainer { public: - CaseElementConfig( const rtl::OUString& rValue ) : maValue( rValue ) {} + CaseElementConfig( const OUString& rValue ) : maValue( rValue ) {} - const rtl::OUString& getValue() const { return maValue; } + const OUString& getValue() const { return maValue; } private: - rtl::OUString maValue; + OUString maValue; }; /////////////////////////////////////////////////////////////////////// @@ -104,7 +104,7 @@ class SwitchElementConfig : public ElementConfigContainer public: SwitchElementConfig( ElementConfigType rType ) : ElementConfigContainer( rType ) {} - virtual rtl::OUString format( SvStream& rStream, sal_Size& nLength ) const; + virtual OUString format( SvStream& rStream, sal_Size& nLength ) const; }; /////////////////////////////////////////////////////////////////////// @@ -112,7 +112,7 @@ public: class AtomConfig : public ElementConfigContainer { public: - AtomConfig( const ::rtl::OUString& rName, bool bIsContainer ) : ElementConfigContainer( rName ), mbIsContainer( bIsContainer ) {} + AtomConfig( const OUString& rName, bool bIsContainer ) : ElementConfigContainer( rName ), mbIsContainer( bIsContainer ) {} bool isContainer() const { return mbIsContainer; } diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index 669660ac1296..52ed3d3b45fe 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -239,7 +239,7 @@ class SwEnhancedPDFExportHelper SwEnhancedPDFExportHelper( SwEditShell& rSh, OutputDevice& rOut, - const rtl::OUString& rPageRange, + const OUString& rPageRange, bool bSkipEmptyPages, bool bEditEngineOnly ); diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx index 96be5ad97db1..a4c5a6aee1e0 100644 --- a/sw/inc/IDocumentLinksAdministration.hxx +++ b/sw/inc/IDocumentLinksAdministration.hxx @@ -48,11 +48,11 @@ namespace sfx2 { class SvLinkSource; class LinkManager; } /** SS fuers Linken von Dokumentteilen / ?? for linking of parts of documents. */ - virtual bool GetData(const rtl::OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const = 0; + virtual bool GetData(const OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const = 0; - virtual bool SetData(const rtl::OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue) = 0; + virtual bool SetData(const OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue) = 0; - virtual ::sfx2::SvLinkSource* CreateLinkSource(const rtl::OUString& rItem) = 0; + virtual ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) = 0; /** Embed all local links (ranges/graphics). */ diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index 21e2d0c88cbb..a01915479cc0 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -77,15 +77,15 @@ class IDocumentMarkAccess a pointer to the new mark (name might have changed). */ virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, - const ::rtl::OUString& rProposedName, + const OUString& rProposedName, MarkType eMark) =0; virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, - const rtl::OUString& rType) = 0; + const OUString& rName, + const OUString& rType) = 0; virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, - const rtl::OUString& rType) = 0; + const OUString& rName, + const OUString& rType) = 0; /** Returns a mark in the document for a paragraph. If there is none, a mark will be created. @@ -123,7 +123,7 @@ class IDocumentMarkAccess @returns false, if renaming failed (because the name is already in use) */ virtual bool renameMark(::sw::mark::IMark* io_pMark, - const ::rtl::OUString& rNewName) =0; + const OUString& rNewName) =0; /** Corrects marks (absolute) This method ignores the previous position of the mark in the paragraph @@ -207,7 +207,7 @@ class IDocumentMarkAccess @returns an iterator pointing to the mark, or pointing to getMarksEnd() if nothing was found. */ - virtual const_iterator_t findMark(const ::rtl::OUString& rMark) const =0; + virtual const_iterator_t findMark(const OUString& rMark) const =0; // interface IBookmarks (BOOKMARK, CROSSREF_NUMITEM_BOOKMARK, CROSSREF_HEADING_BOOKMARK) @@ -232,7 +232,7 @@ class IDocumentMarkAccess @returns an iterator pointing to the bookmark, or getBookmarksEnd() if nothing was found. */ - virtual const_iterator_t findBookmark(const ::rtl::OUString& rMark) const =0; + virtual const_iterator_t findBookmark(const OUString& rMark) const =0; // Fieldmarks diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx index 313fc29ce8e1..26e76f0b838f 100644 --- a/sw/inc/IDocumentUndoRedo.hxx +++ b/sw/inc/IDocumentUndoRedo.hxx @@ -142,7 +142,7 @@ public: @param o_pId if not 0, receives Id of last Undo action. @return true if there is a Undo action, false if none */ - virtual bool GetLastUndoInfo(::rtl::OUString *const o_pStr, + virtual bool GetLastUndoInfo(OUString *const o_pStr, SwUndoId *const o_pId) const = 0; /** Get comments of Undo actions. @@ -160,7 +160,7 @@ public: @param o_pStr if not 0, receives comment of first Redo action. @return true if there is a Redo action, false if none */ - virtual bool GetFirstRedoInfo(::rtl::OUString *const o_pStr) const = 0; + virtual bool GetFirstRedoInfo(OUString *const o_pStr) const = 0; /** Get comments of Redo actions. @return comments of all top-level Redo actions. @@ -179,7 +179,7 @@ public: @return Id of last Undo action if it is Repeat capable, or UNDO_EMPTY if there is none or it is not Repeat capable. */ - virtual SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const = 0; + virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const = 0; /** Add new Undo action. Takes over ownership of pUndo. diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx index 49f5d67f8f71..1087ef25cf70 100644 --- a/sw/inc/IMark.hxx +++ b/sw/inc/IMark.hxx @@ -48,7 +48,7 @@ namespace sw { namespace mark virtual const SwPosition& GetOtherMarkPos() const =0; virtual const SwPosition& GetMarkStart() const =0; virtual const SwPosition& GetMarkEnd() const =0; - virtual const ::rtl::OUString& GetName() const =0; + virtual const OUString& GetName() const =0; virtual bool IsExpanded() const =0; virtual bool IsCoveringPosition(const SwPosition& rPos) const =0; @@ -71,16 +71,16 @@ namespace sw { namespace mark bool EndsAfter(const SwPosition& rPos) const { return GetMarkEnd() > rPos; } - virtual rtl::OUString ToString( ) const =0; + virtual OUString ToString( ) const =0; }; class SAL_DLLPUBLIC_EXPORT IBookmark : virtual public IMark { public: - virtual const ::rtl::OUString& GetShortName() const =0; + virtual const OUString& GetShortName() const =0; virtual const KeyCode& GetKeyCode() const =0; - virtual void SetShortName(const ::rtl::OUString&) =0; + virtual void SetShortName(const OUString&) =0; virtual void SetKeyCode(const KeyCode&) =0; }; @@ -88,16 +88,16 @@ namespace sw { namespace mark : virtual public IMark { public: - typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any> parameter_map_t; + typedef ::std::map< OUString, ::com::sun::star::uno::Any> parameter_map_t; //getters - virtual ::rtl::OUString GetFieldname() const =0; - virtual ::rtl::OUString GetFieldHelptext() const =0; + virtual OUString GetFieldname() const =0; + virtual OUString GetFieldHelptext() const =0; virtual parameter_map_t* GetParameters() =0; virtual const parameter_map_t* GetParameters() const =0; //setters - virtual void SetFieldname(const ::rtl::OUString& rFieldname) =0; - virtual void SetFieldHelptext(const ::rtl::OUString& rFieldHelptext) =0; + virtual void SetFieldname(const OUString& rFieldname) =0; + virtual void SetFieldHelptext(const OUString& rFieldHelptext) =0; virtual void Invalidate() = 0; }; diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 9bfad8414fc6..c8dc4323bc42 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -102,10 +102,10 @@ class SwNoteProps: public utl::ConfigItem bool bIsShowAnchor; public: SwNoteProps() - : ConfigItem(::rtl::OUString("Office.Writer/Notes")) + : ConfigItem(OUString("Office.Writer/Notes")) , bIsShowAnchor(false) { - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames = GetPropertyNames(); + const ::com::sun::star::uno::Sequence< OUString >& rNames = GetPropertyNames(); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aValues = GetProperties(rNames); const ::com::sun::star::uno::Any* pValues = aValues.getConstArray(); OSL_ENSURE(aValues.getLength() == rNames.getLength(), "GetProperties failed"); @@ -117,20 +117,20 @@ class SwNoteProps: public utl::ConfigItem { return bIsShowAnchor; } - ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetPropertyNames() + ::com::sun::star::uno::Sequence< OUString >& GetPropertyNames() { - static ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames; + static ::com::sun::star::uno::Sequence< OUString > aNames; if(!aNames.getLength()) { aNames.realloc(1); - ::rtl::OUString* pNames = aNames.getArray(); - pNames[0] = ::rtl::OUString("ShowAnkor"); + OUString* pNames = aNames.getArray(); + pNames[0] = OUString("ShowAnkor"); } return aNames; } virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); }; class SwPostItMgr: public SfxListener diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx index cf5bdd97c565..70579083fe2a 100644 --- a/sw/inc/SwAppletImpl.hxx +++ b/sw/inc/SwAppletImpl.hxx @@ -45,25 +45,25 @@ class SwApplet_Impl com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > xApplet; SvCommandList aCommandList; SfxItemSet aItemSet; - ::rtl::OUString sAlt; + OUString sAlt; public: - static sal_uInt16 GetOptionType( const ::rtl::OUString& rName, sal_Bool bApplet ); + static sal_uInt16 GetOptionType( const OUString& rName, sal_Bool bApplet ); SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2 ); SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {} ~SwApplet_Impl(); - void CreateApplet( const ::rtl::OUString& rCode, const ::rtl::OUString& rName, - sal_Bool bMayScript, const ::rtl::OUString& rCodeBase, - const ::rtl::OUString& rBaseURL ); + void CreateApplet( const OUString& rCode, const OUString& rName, + sal_Bool bMayScript, const OUString& rCodeBase, + const OUString& rBaseURL ); #ifdef SOLAR_JAVA - sal_Bool CreateApplet( const ::rtl::OUString& rBaseURL ); - void AppendParam( const ::rtl::OUString& rName, const ::rtl::OUString& rValue ); + sal_Bool CreateApplet( const OUString& rBaseURL ); + void AppendParam( const OUString& rName, const OUString& rValue ); #endif void FinishApplet(); com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetApplet() { return xApplet; } SfxItemSet& GetItemSet() { return aItemSet; } - const ::rtl::OUString& GetAltText() const { return sAlt; } - void SetAltText( const ::rtl::OUString& rAlt ) {sAlt = rAlt;} + const OUString& GetAltText() const { return sAlt; } + void SetAltText( const OUString& rAlt ) {sAlt = rAlt;} }; #endif diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index 71c9f3445366..6480ab2d5b2e 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -34,7 +34,7 @@ class SwSmartTagMgr : public SmartTagMgr private: static SwSmartTagMgr* mpTheSwSmartTagMgr; - SwSmartTagMgr( const rtl::OUString& rModuleName ); + SwSmartTagMgr( const OUString& rModuleName ); virtual ~SwSmartTagMgr(); public: diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx index 75e20d35f6e2..8c6abc060881 100644 --- a/sw/inc/SwXMLSectionList.hxx +++ b/sw/inc/SwXMLSectionList.hxx @@ -28,7 +28,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -49,11 +49,11 @@ private: public: SvXMLSectionListContext ( SwXMLSectionList& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SvXMLSectionListContext ( void ); @@ -66,11 +66,11 @@ private: public: SvXMLIgnoreSectionListContext ( SwXMLSectionList& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SvXMLIgnoreSectionListContext ( void ); diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 067a494f2822..44732969b774 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -156,7 +156,7 @@ public: const String& GetFieldText(ToxAuthorityField eField) const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual void SetPar1(const OUString& rStr); virtual SwFieldType* ChgTyp( SwFieldType* ); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 8319dea8c544..ff3d86d71948 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -113,12 +113,12 @@ public: return *m_pForbidden; } - sal_uInt16 GetRealScriptOfText( const rtl::OUString& rTxt, sal_Int32 nPos ) const; - sal_uInt16 GetAllScriptsOfText( const rtl::OUString& rTxt ) const; + sal_uInt16 GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const; + sal_uInt16 GetAllScriptsOfText( const OUString& rTxt ) const; - sal_Int32 getGraphemeCount(const rtl::OUString& rStr, + sal_Int32 getGraphemeCount(const OUString& rStr, sal_Int32 nStart, sal_Int32 nEnd) const; - sal_Int32 getGraphemeCount(const rtl::OUString& rStr) const + sal_Int32 getGraphemeCount(const OUString& rStr) const { return getGraphemeCount(rStr, 0, rStr.getLength()); } diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index afc1fe25aef4..4aee3bb02333 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -53,8 +53,8 @@ struct CommandStruct //*********************************************************** -sal_Int16 GetCommandContextIndex( const rtl::OUString &rContextName ); -rtl::OUString GetCommandContextByIndex( sal_Int16 nIndex ); +sal_Int16 GetCommandContextIndex( const OUString &rContextName ); +OUString GetCommandContextByIndex( sal_Int16 nIndex ); //*********************************************************** diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx index 08da53c9ee6a..06a865cd62e7 100644 --- a/sw/inc/charfmt.hxx +++ b/sw/inc/charfmt.hxx @@ -30,7 +30,7 @@ class SW_DLLPUBLIC SwCharFmt : public SwFmt SwCharFmt *pDerivedFrom ) : SwFmt( rPool, pFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT ) {} - SwCharFmt( SwAttrPool& rPool, const rtl::OUString &rFmtName, + SwCharFmt( SwAttrPool& rPool, const OUString &rFmtName, SwCharFmt *pDerivedFrom ) : SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT ) {} diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 4f9d783da7f5..2ddb6d56e13c 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -548,8 +548,8 @@ public: // at CurCrsr.SPoint ::sw::mark::IMark* SetBookmark( const KeyCode&, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName, + const OUString& rName, + const OUString& rShortName, IDocumentMarkAccess::MarkType eMark = IDocumentMarkAccess::BOOKMARK); bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurCrsr.SPoint bool GotoMark( const ::sw::mark::IMark* const pMark, bool bAtStart ); @@ -757,12 +757,12 @@ public: // get smart tags at point position void GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect, - ::com::sun::star::uno::Sequence< rtl::OUString >& rSmartTagTypes, + ::com::sun::star::uno::Sequence< OUString >& rSmartTagTypes, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, ::com::sun::star::uno::Reference& rRange ); // get smart tags at current cursor position - void GetSmartTagTerm( ::com::sun::star::uno::Sequence< rtl::OUString >& rSmartTagTypes, + void GetSmartTagTerm( ::com::sun::star::uno::Sequence< OUString >& rSmartTagTypes, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, ::com::sun::star::uno::Reference& rRange ) const; diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index a92279e06c27..b4f55a9ee3d7 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -34,7 +34,7 @@ class SwFrm; class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType { SwDBData aDBData; // - rtl::OUString sName; ///< only used in ::GetName() ! + OUString sName; ///< only used in ::GetName() ! String sColumn; long nRefCnt; @@ -43,7 +43,7 @@ public: SwDBFieldType(SwDoc* pDocPtr, const String& rColumnName, const SwDBData& rDBData); ~SwDBFieldType(); - virtual const rtl::OUString& GetName() const; + virtual const OUString& GetName() const; virtual SwFieldType* Copy() const; inline void AddRef() { nRefCnt++; } @@ -63,8 +63,8 @@ public: class SW_DLLPUBLIC SwDBField : public SwValueField { - rtl::OUString aContent; - rtl::OUString sFieldCode; ///< contains Word's field code + OUString aContent; + OUString sFieldCode; ///< contains Word's field code sal_uInt16 nSubType; bool bIsInBodyTxt : 1; bool bValidValue : 1; @@ -105,11 +105,11 @@ public: inline void SetInitialized() { bInitialized = true; } /// Get name. - virtual const rtl::OUString& GetPar1() const; + virtual const OUString& GetPar1() const; /// access to the command string - const rtl::OUString& GetFieldCode() const { return sFieldCode;} - void SetFieldCode(const rtl::OUString& rStr) { sFieldCode = rStr; } + const OUString& GetFieldCode() const { return sFieldCode;} + void SetFieldCode(const OUString& rStr) { sFieldCode = rStr; } /// DBName inline const SwDBData& GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); } @@ -172,7 +172,7 @@ public: class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField { - rtl::OUString aCond; + OUString aCond; bool bCondValid; public: @@ -187,8 +187,8 @@ public: inline bool IsCondValid() const; // Condition - virtual const rtl::OUString& GetPar1() const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual const OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; @@ -218,7 +218,7 @@ public: class SwDBNumSetField : public SwDBNameInfField { - rtl::OUString aCond; + OUString aCond; String aPar2; bool bCondValid; @@ -233,12 +233,12 @@ public: void Evaluate(SwDoc*); // Condition - virtual const rtl::OUString& GetPar1() const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual const OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); // Number of data record. - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); // Number of data record is in nFormat!! virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx index 44cc3051289b..7e41d6f26b26 100644 --- a/sw/inc/dbgoutsw.hxx +++ b/sw/inc/dbgoutsw.hxx @@ -55,7 +55,7 @@ extern bool bDbgOutPrintAttrSet; SW_DLLPUBLIC const char * dbg_out(const void * pVoid); SW_DLLPUBLIC const char * dbg_out(const String & aStr); -SW_DLLPUBLIC const char * dbg_out(const ::rtl::OUString & aStr); +SW_DLLPUBLIC const char * dbg_out(const OUString & aStr); SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect); SW_DLLPUBLIC const char * dbg_out(const SwFrmFmt & rFrmFmt); SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 33485a744032..978f779c248a 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -150,8 +150,8 @@ struct SwMergeDescriptor String sAddressFromColumn; String sMailBody; String sAttachmentName; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aCopiesTo; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aBlindCopiesTo; + ::com::sun::star::uno::Sequence< OUString > aCopiesTo; + ::com::sun::star::uno::Sequence< OUString > aBlindCopiesTo; ::com::sun::star::uno::Reference< com::sun::star::mail::XSmtpService > xSmtpServer; @@ -205,7 +205,7 @@ friend class SwConnectionDisposedListener_Impl; const SwXMailMerge* pMergeEvtSrc; ///< != 0 if mail merge events are to be send SW_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, sal_Bool bCreate); - SW_DLLPRIVATE SwDSParam* FindDSConnection(const ::rtl::OUString& rSource, sal_Bool bCreate); + SW_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, sal_Bool bCreate); SW_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * ); @@ -299,11 +299,11 @@ public: sal_uInt32 GetSelectedRecordId(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1); sal_Bool GetColumnCnt(const String& rSourceName, const String& rTableName, const String& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage, - rtl::OUString& rResult, double* pNumber); + OUString& rResult, double* pNumber); /** create and store or find an already stored connection to a data source for use in SwFldMgr and SwDBTreeList */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> - RegisterConnection(::rtl::OUString& rSource); + RegisterConnection(OUString& rSource); const SwDSParam* CreateDSData(const SwDBData& rData) {return FindDSData(rData, sal_True);} @@ -314,7 +314,7 @@ public: void CloseAll(sal_Bool bIncludingMerge = sal_True); sal_Bool GetMergeColumnCnt(const String& rColumnName, sal_uInt16 nLanguage, - rtl::OUString &rResult, double *pNumber, sal_uInt32 *pFormat); + OUString &rResult, double *pNumber, sal_uInt32 *pFormat); sal_Bool ToNextMergeRecord(); sal_Bool ToNextRecord(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1); @@ -338,7 +338,7 @@ public: const String& rTableOrQuery, sal_uInt8 eTableOrQuery = SW_DB_SELECT_UNKNOWN); - static ::com::sun::star::uno::Sequence GetExistingDatabaseNames(); + static ::com::sun::star::uno::Sequence GetExistingDatabaseNames(); /** Loads a data source from file and registers it. Returns the registered name. @@ -359,7 +359,7 @@ public: The data source. */ static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> - getDataSourceAsParent(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,const ::rtl::OUString& _sDataSourceName); + getDataSourceAsParent(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,const OUString& _sDataSourceName); /** creates a RowSet, which must be disposed after use. @param _sDataSourceName @@ -375,8 +375,8 @@ public: */ static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> - createCursor( const ::rtl::OUString& _sDataSourceName, - const ::rtl::OUString& _sCommand, + createCursor( const OUString& _sDataSourceName, + const OUString& _sCommand, sal_Int32 _nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ); diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index da239296a0f2..327766077f2b 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -31,7 +31,7 @@ class SwDoc; class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType { - rtl::OUString aName; + OUString aName; String aExpansion; ::sfx2::SvBaseLinkRef refLink; @@ -53,7 +53,7 @@ public: bCRLFFlag = sal_False; } virtual SwFieldType* Copy() const; - virtual const rtl::OUString& GetName() const; + virtual const OUString& GetName() const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); @@ -99,11 +99,11 @@ public: /** Get parameter via types. Name cannot be changed. */ - virtual const rtl::OUString& GetPar1() const; + virtual const OUString& GetPar1() const; // Command - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); }; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 7c79c097b03e..5dfb6df53076 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -802,9 +802,9 @@ public: virtual sfx2::LinkManager& GetLinkManager(); virtual const sfx2::LinkManager& GetLinkManager() const; virtual void UpdateLinks(bool bUI); - virtual bool GetData(const rtl::OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const; - virtual bool SetData(const rtl::OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue); - virtual ::sfx2::SvLinkSource* CreateLinkSource(const rtl::OUString& rItem); + virtual bool GetData(const OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const; + virtual bool SetData(const OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue); + virtual ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem); virtual bool EmbedAllLinks(); virtual void SetLinksUpdated(const bool bNewLinksUpdated); virtual bool LinksUpdated() const; @@ -1722,7 +1722,7 @@ public: /** @return names of all references that are set in document. If array pointer is 0 return only whether a RefMark is set in document. */ - sal_uInt16 GetRefMarks( std::vector* = 0 ) const; + sal_uInt16 GetRefMarks( std::vector* = 0 ) const; /// Insert label. If a FlyFormat is created, return it. SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator, diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 59e83a3ee04f..39bb3ceea796 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -142,7 +142,7 @@ public: static SfxInterface *_GetInterface() { return GetStaticInterface(); } - static rtl::OUString GetEventName( sal_Int32 nId ); + static OUString GetEventName( sal_Int32 nId ); /// Doc is required for SO data exchange! SwDocShell( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED ); @@ -277,7 +277,7 @@ public: void InvalidateModel(); void ReactivateModel(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames(); + virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); /// #i20883# Digital Signatures and Encryption virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 7932edc63a61..72ea158d3172 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -172,7 +172,7 @@ public: virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx); virtual SfxStyleSheetBase* First(); virtual SfxStyleSheetBase* Next(); - virtual SfxStyleSheetBase* Find(const rtl::OUString& rStr); + virtual SfxStyleSheetBase* Find(const OUString& rStr); virtual void Notify( SfxBroadcaster&, const SfxHint& ); }; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 35ea4c156154..c5c1cfe1a45c 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -180,8 +180,8 @@ public: virtual String Expand() const; virtual SwField* Copy() const; - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); virtual sal_uInt16 GetSubType() const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; @@ -352,11 +352,11 @@ public: class SwHiddenTxtField : public SwField { - rtl::OUString aTRUETxt; ///< Text if condition sal_True. - rtl::OUString aFALSETxt; ///< If condition false. - rtl::OUString aContent; ///< Evaluated DB-text. + OUString aTRUETxt; ///< Text if condition sal_True. + OUString aFALSETxt; ///< If condition false. + OUString aContent; ///< Evaluated DB-text. - rtl::OUString aCond; ///< Condition. + OUString aCond; ///< Condition. sal_uInt16 nSubType; sal_Bool bCanToggle : 1; ///< Can field be toggled alone? @@ -389,12 +389,12 @@ public: String GetDBName(const String& rName, SwDoc *pDoc); /// Condition - virtual void SetPar1(const rtl::OUString& rStr); - virtual const rtl::OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); + virtual const OUString& GetPar1() const; /// True/False - String - virtual void SetPar2(const rtl::OUString& rStr); - virtual rtl::OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const; virtual sal_uInt16 GetSubType() const; @@ -421,7 +421,7 @@ public: class SwHiddenParaField : public SwField { - rtl::OUString aCond; + OUString aCond; sal_Bool bIsHidden:1; public: /// Direct input, delete old value. @@ -434,8 +434,8 @@ public: sal_Bool IsHidden() const { return bIsHidden; } /// Query, set condition. - virtual const rtl::OUString& GetPar1() const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual const OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; @@ -460,8 +460,8 @@ public: class SW_DLLPUBLIC SwMacroField : public SwField { - rtl::OUString aMacro; - rtl::OUString aText; + OUString aMacro; + OUString aText; sal_Bool bIsScriptURL; virtual String Expand() const; @@ -472,7 +472,7 @@ public: SwMacroField( SwMacroFieldType*, const String& rLibAndName, const String& rTxt); - inline const rtl::OUString& GetMacro() const { return aMacro; } + inline const OUString& GetMacro() const { return aMacro; } String GetLibName() const; String GetMacroName() const; SvxMacro GetSvxMacro() const; @@ -480,16 +480,16 @@ public: virtual String GetFieldName() const; /// Library and FileName - virtual const rtl::OUString& GetPar1() const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual const OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); /// Macrotext - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); - static void CreateMacroString( rtl::OUString& rMacro, + static void CreateMacroString( OUString& rMacro, const String& rMacroName, const String& rLibraryName ); @@ -518,10 +518,10 @@ public: class SW_DLLPUBLIC SwPostItField : public SwField { - rtl::OUString sTxt; - rtl::OUString sAuthor; - rtl::OUString sInitials; ///< Initials of the author. - rtl::OUString sName; ///< Name of the comment. + OUString sTxt; + OUString sAuthor; + OUString sInitials; ///< Initials of the author. + OUString sName; ///< Name of the comment. DateTime aDateTime; OutlinerParaObject* mpText; SwTextAPIObject* m_pTextObject; @@ -542,15 +542,15 @@ public: inline const Time GetTime() const { return aDateTime.GetTime(); } /// Author - virtual const rtl::OUString& GetPar1() const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual const OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); /// Text - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); - const rtl::OUString& GetTxt() const { return sTxt; } - const rtl::OUString& GetInitials() const; - void SetName(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); + const OUString& GetTxt() const { return sTxt; } + const OUString& GetInitials() const; + void SetName(const OUString& rStr); const OUString& GetName() const; const OutlinerParaObject* GetTextObject() const; @@ -670,8 +670,8 @@ public: virtual String Expand() const; virtual SwField* Copy() const; - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); sal_Bool IsOn() const { return bOn; } @@ -739,7 +739,7 @@ public: class SwJumpEditField : public SwField { - rtl::OUString sTxt, sHelp; + OUString sTxt, sHelp; public: SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat, const String& sText, const String& sHelp ); @@ -748,12 +748,12 @@ public: virtual SwField* Copy() const; /// Placeholder-Text - virtual const rtl::OUString& GetPar1() const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual const OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); /// Hint-Text - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); SwCharFmt* GetCharFmt() const { return ((SwJumpEditFieldType*)GetTyp())->GetCharFmt(); } @@ -780,8 +780,8 @@ public: class SwScriptField : public SwField { - rtl::OUString sType; ///< Type of Code (Java/VBScript/...) - rtl::OUString sCode; /**< Code as text. + OUString sType; ///< Type of Code (Java/VBScript/...) + OUString sCode; /**< Code as text. Code as JavaCode ? */ sal_Bool bCodeURL; ///< Code contains URL of a script. @@ -796,11 +796,11 @@ public: virtual SwField* Copy() const; /// Type - virtual const rtl::OUString& GetPar1() const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual const OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); /// Text - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); sal_Bool IsCodeURL() const { return bCodeURL; } void SetCodeURL( sal_Bool bURL ) { bCodeURL = bURL; } @@ -828,7 +828,7 @@ public: class SW_DLLPUBLIC SwCombinedCharField : public SwField { - rtl::OUString sCharacters; ///< combine these characters + OUString sCharacters; ///< combine these characters public: SwCombinedCharField( SwCombinedCharFieldType*, const String& rChars ); @@ -837,8 +837,8 @@ public: virtual SwField* Copy() const; /// Characters - virtual const rtl::OUString& GetPar1() const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual const OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 459b3976d8d0..f73611c4f06b 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -559,10 +559,10 @@ public: /// Closes parenthesis of nUndoId, not used by UI. SwUndoId EndUndo( SwUndoId eUndoId = UNDO_EMPTY, const SwRewriter * pRewriter = 0 ); - bool GetLastUndoInfo(::rtl::OUString *const o_pStr, + bool GetLastUndoInfo(OUString *const o_pStr, SwUndoId *const o_pId) const; - bool GetFirstRedoInfo(::rtl::OUString *const o_pStr) const; - SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const; + bool GetFirstRedoInfo(OUString *const o_pStr) const; + SwUndoId GetRepeatInfo(OUString *const o_pStr) const; /// is it forbidden to modify cursors via API calls? bool CursorsLocked() const; @@ -766,7 +766,7 @@ public: bool GetGrammarCorrection( ::com::sun::star::linguistic2::ProofreadingResult /*out*/ &rResult, sal_Int32 /*out*/ &rErrorPosInText, sal_Int32 /*out*/ &rErrorIndexInResult, - ::com::sun::star::uno::Sequence< rtl::OUString > /*out*/ &rSuggestions, + ::com::sun::star::uno::Sequence< OUString > /*out*/ &rSuggestions, const Point* pPt, SwRect& rSelectRect ); void IgnoreGrammarErrorAt( SwPaM& rErrorPosition ); @@ -777,7 +777,7 @@ public: /** @return names of all references set in document. If ArrayPointer == 0 then return only whether a RefMark is set in document. */ - sal_uInt16 GetRefMarks( std::vector* = 0 ) const; + sal_uInt16 GetRefMarks( std::vector* = 0 ) const; /// Call AutoCorrect void AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsertMode = sal_True, diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 0b54faf6fd68..8ac6e48fa17c 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -116,8 +116,8 @@ public: virtual String GetFieldName() const; /// Change formula. - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); virtual sal_uInt16 GetSubType() const; virtual void SetSubType(sal_uInt16 nType); @@ -147,7 +147,7 @@ class SwSetExpField; class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType { - rtl::OUString sName; + OUString sName; const SwNode* pOutlChgNd; String sDelim; sal_uInt16 nType; @@ -161,7 +161,7 @@ public: SwSetExpFieldType( SwDoc* pDoc, const String& rName, sal_uInt16 nType = nsSwGetSetExpType::GSE_EXPR ); virtual SwFieldType* Copy() const; - virtual const rtl::OUString& GetName() const; + virtual const OUString& GetName() const; inline void SetType(sal_uInt16 nTyp); inline sal_uInt16 GetType() const; @@ -173,7 +173,7 @@ public: void SetDeleted( sal_Bool b ) { bDeleted = b; } /// Overlay, because set-field takes care for its being updated by itself. - inline const rtl::OUString& GetSetRefName() const; + inline const OUString& GetSetRefName() const; sal_uInt16 SetSeqRefNo( SwSetExpField& rFld ); @@ -205,7 +205,7 @@ inline void SwSetExpFieldType::SetType( sal_uInt16 nTyp ) inline sal_uInt16 SwSetExpFieldType::GetType() const { return nType; } -inline const rtl::OUString& SwSetExpFieldType::GetSetRefName() const +inline const OUString& SwSetExpFieldType::GetSetRefName() const { return sName; } @@ -248,11 +248,11 @@ public: inline sal_uInt16 GetSeqNumber() const { return nSeqNo; } /// Query name only. - virtual const rtl::OUString& GetPar1() const; + virtual const OUString& GetPar1() const; /// Query formula. - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; @@ -293,7 +293,7 @@ public: class SW_DLLPUBLIC SwInputField : public SwField { - rtl::OUString aContent; + OUString aContent; String aPText; String aHelp; String aToolTip; @@ -311,12 +311,12 @@ public: virtual String GetFieldName() const; /// Content - virtual const rtl::OUString& GetPar1() const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual const OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); /// aPromptText - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); virtual String GetHelp() const; virtual void SetHelp(const String & rStr); @@ -400,8 +400,8 @@ public: virtual String GetFieldName() const; /// The formula. - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 814ba38962a1..2c934321be8d 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -245,7 +245,7 @@ public: static const String& GetTypeStr( sal_uInt16 nTypeId ); /// Only in derived classes. - virtual const rtl::OUString& GetName() const; + virtual const OUString& GetName() const; virtual SwFieldType* Copy() const = 0; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); @@ -323,14 +323,14 @@ public: /// Query parameters for dialog and for BASIC. inline sal_uInt32 GetFormat() const; - virtual const rtl::OUString& GetPar1() const; - virtual rtl::OUString GetPar2() const; + virtual const OUString& GetPar1() const; + virtual OUString GetPar2() const; virtual String GetFormula() const; virtual void ChangeFormat(sal_uInt32 n); - virtual void SetPar1(const rtl::OUString& rStr); - virtual void SetPar2(const rtl::OUString& rStr); + virtual void SetPar1(const OUString& rStr); + virtual void SetPar2(const OUString& rStr); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index dad3266dec58..ccf8885a0f00 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -110,8 +110,8 @@ public: virtual double GetValue() const; - virtual void SetPar2(const rtl::OUString& rStr); - virtual rtl::OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); + virtual OUString GetPar2() const; inline sal_Bool IsDate() const { return (nSubType & DATEFLD) != 0; } diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index f3ad2dce471b..57d4ee25d5e2 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -60,27 +60,27 @@ class SW_DLLPUBLIC SwDropDownField : public SwField /** the possible values (aka items) of the dropdown box */ - std::vector aValues; + std::vector aValues; /** the selected item */ - rtl::OUString aSelectedItem; + OUString aSelectedItem; /** the name of the field */ - rtl::OUString aName; + OUString aName; /** help text */ - rtl::OUString aHelp; + OUString aHelp; /** tool tip string */ - rtl::OUString aToolTip; + OUString aToolTip; /** Expands the field. @@ -126,14 +126,14 @@ public: @return the selected value */ - virtual const rtl::OUString & GetPar1() const; + virtual const OUString & GetPar1() const; /** Returns the name of the field. @return the name of the field */ - virtual rtl::OUString GetPar2() const; + virtual OUString GetPar2() const; /** Sets the selected value. @@ -142,14 +142,14 @@ public: selected. Otherwise no item will be selected, i.e. the resulting selection will be empty. */ - virtual void SetPar1(const rtl::OUString & rStr); + virtual void SetPar1(const OUString & rStr); /** Sets the name of the field. @param rStr the new name of the field */ - virtual void SetPar2(const rtl::OUString & rStr); + virtual void SetPar2(const OUString & rStr); /** Sets the items of the dropdown box. @@ -158,7 +158,7 @@ public: @param rItems the new items */ - void SetItems(const std::vector & rItems); + void SetItems(const std::vector & rItems); /** Sets the items of the dropdown box. @@ -167,42 +167,42 @@ public: @param rItems the new items */ - void SetItems(const com::sun::star::uno::Sequence & rItems); + void SetItems(const com::sun::star::uno::Sequence & rItems); /** Returns the items of the dropdown box. @return the items of the dropdown box */ - com::sun::star::uno::Sequence GetItemSequence() const; + com::sun::star::uno::Sequence GetItemSequence() const; /** Returns the selected item. @return the selected item */ - const rtl::OUString & GetSelectedItem() const; + const OUString & GetSelectedItem() const; /** Returns the name of the field. @return the name of the field */ - const rtl::OUString & GetName() const; + const OUString & GetName() const; /** Returns the help text of the field. @return the help text of the field */ - const rtl::OUString & GetHelp() const; + const OUString & GetHelp() const; /** Returns the tool tip of the field. @return the tool tip of the field */ - const rtl::OUString & GetToolTip() const; + const OUString & GetToolTip() const; /** Sets the selected item. @@ -215,28 +215,28 @@ public: @retval sal_True the selected item was successfully set @retval sal_True failure (empty selection) */ - sal_Bool SetSelectedItem(const rtl::OUString & rItem); + sal_Bool SetSelectedItem(const OUString & rItem); /** Sets the name of the field. @param rName the new name of the field */ - void SetName(const rtl::OUString & rName); + void SetName(const OUString & rName); /** Sets the help text of the field. @param rHelp the help text */ - void SetHelp(const rtl::OUString & rHelp); + void SetHelp(const OUString & rHelp); /** Sets the tool tip of the field. @param rToolTip the tool tip */ - void SetToolTip(const rtl::OUString & rToolTip); + void SetToolTip(const OUString & rToolTip); /** API: Gets a property value from the dropdown field. diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 6ae1e824d98d..11258afeeee4 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -37,8 +37,8 @@ enum SwFtnEndPosEnum class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem { - rtl::OUString sPrefix; - rtl::OUString sSuffix; + OUString sPrefix; + OUString sSuffix; SvxNumberType aFmt; sal_uInt16 nOffset; @@ -78,11 +78,11 @@ public: sal_uInt16 GetOffset() const { return nOffset; } void SetOffset( sal_uInt16 nOff ) { nOffset = nOff; } - const rtl::OUString& GetPrefix() const { return sPrefix; } - void SetPrefix(const rtl::OUString& rSet) { sPrefix = rSet; } + const OUString& GetPrefix() const { return sPrefix; } + void SetPrefix(const OUString& rSet) { sPrefix = rSet; } - const rtl::OUString& GetSuffix() const { return sSuffix; } - void SetSuffix(const rtl::OUString& rSet) { sSuffix = rSet; } + const OUString& GetSuffix() const { return sSuffix; } + void SetSuffix(const OUString& rSet) { sSuffix = rSet; } }; class SW_DLLPUBLIC SwFmtFtnAtTxtEnd : public SwFmtFtnEndAtTxtEnd diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index 98ab49822baa..0a1276d3bd07 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -180,7 +180,7 @@ private: sal_uInt32 m_nNumberFormat; bool m_bIsFixedLanguage; - sal_uInt32 GetNumberFormat(::rtl::OUString const & rContent) const; + sal_uInt32 GetNumberFormat(OUString const & rContent) const; void SetNumberFormat(sal_uInt32 nNumberFormat); bool IsFixedLanguage() const { return m_bIsFixedLanguage; } void SetIsFixedLanguage(bool b) { m_bIsFixedLanguage = b; } @@ -192,7 +192,7 @@ private: public: /// get prefix/suffix from the RDF repository. @throws RuntimeException void GetPrefixAndSuffix( - ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix); + OUString *const o_pPrefix, OUString *const o_pSuffix); }; /// knows all meta-fields in the document. diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index 9565f47f37ee..3e7a0c81947a 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -34,7 +34,7 @@ class SwFmtRefMark : public SfxPoolItem /// Protected CopyCtor. SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark); - rtl::OUString aRefName; + OUString aRefName; public: SwFmtRefMark( const String& rTxt ); @@ -48,8 +48,8 @@ public: const SwTxtRefMark *GetTxtRefMark() const { return pTxtAttr; } SwTxtRefMark *GetTxtRefMark() { return pTxtAttr; } - inline rtl::OUString &GetRefName() { return aRefName; } - inline const rtl::OUString &GetRefName() const { return aRefName; } + inline OUString &GetRefName() { return aRefName; } + inline const OUString &GetRefName() const { return aRefName; } }; #endif diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 2a99ba268899..bf565f4dde6e 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -324,7 +324,7 @@ inline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, inline void SwFmt::SetName( const sal_Char* pNewName, sal_Bool bBroadcast ) { - SetName(rtl::OUString::createFromAscii(pNewName), bBroadcast); + SetName(OUString::createFromAscii(pNewName), bBroadcast); } inline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent, diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index 095b09e57600..c88e0119b20d 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -33,8 +33,8 @@ class SW_DLLPUBLIC SwEndNoteInfo : public SwClient { SwDepend aPageDescDep; SwDepend aCharFmtDep, aAnchorCharFmtDep; - rtl::OUString sPrefix; - rtl::OUString sSuffix; + OUString sPrefix; + OUString sSuffix; protected: bool m_bEndNote; virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); @@ -65,11 +65,11 @@ public: SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0); SwEndNoteInfo(const SwEndNoteInfo&); - const rtl::OUString& GetPrefix() const { return sPrefix; } - const rtl::OUString& GetSuffix() const { return sSuffix; } + const OUString& GetPrefix() const { return sPrefix; } + const OUString& GetSuffix() const { return sSuffix; } - void SetPrefix(const rtl::OUString& rSet) { sPrefix = rSet; } - void SetSuffix(const rtl::OUString& rSet) { sSuffix = rSet; } + void SetPrefix(const OUString& rSet) { sPrefix = rSet; } + void SetSuffix(const OUString& rSet) { sSuffix = rSet; } void ReleaseCollection() { if ( GetRegisteredInNonConst() ) GetRegisteredInNonConst()->Remove( this ); } }; diff --git a/sw/inc/istyleaccess.hxx b/sw/inc/istyleaccess.hxx index cbd54511b127..7f9c7f22fefc 100644 --- a/sw/inc/istyleaccess.hxx +++ b/sw/inc/istyleaccess.hxx @@ -47,7 +47,7 @@ public: /** It's slow to iterate through a stylepool looking for a special name, but if the style has been inserted via "cacheAutomaticStyle" instead of "getAutomaticStyle", it's faster */ - virtual StylePool::SfxItemSet_Pointer_t getByName( const rtl::OUString& rName, + virtual StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName, SwAutoStyleFamily eFamily ) = 0; /// insert the style to the pool and the cache (used during import) virtual StylePool::SfxItemSet_Pointer_t cacheAutomaticStyle( const SfxItemSet& rSet, diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx index c45244507015..f6616db05860 100644 --- a/sw/inc/mdiexp.hxx +++ b/sw/inc/mdiexp.hxx @@ -39,7 +39,7 @@ extern void SizeNotify(ViewShell* pVwSh, const Size &); extern void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, - const rtl::OUString& rPg ); + const OUString& rPg ); enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END }; extern void FrameNotify( ViewShell* pVwSh, FlyMode eMode = FLY_DRAG ); @@ -63,7 +63,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc ); // Read ChgMode for tables from configuration. TblChgMode GetTblChgDefaultMode(); -bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark ); +bool JumpToSwMark( ViewShell* pVwSh, const OUString& rMark ); #endif diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index b98bbf1e1d99..374d519766b0 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -58,13 +58,13 @@ class SwRevisionConfig : public utl::ConfigItem sal_uInt16 nMarkAlign; //Revision/LinesChanged/Mark Color aMarkColor; //Revision/LinesChanged/Color - const com::sun::star::uno::Sequence& GetPropertyNames(); + const com::sun::star::uno::Sequence& GetPropertyNames(); public: SwRevisionConfig(); ~SwRevisionConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -78,13 +78,13 @@ class SwCompareConfig : public utl::ConfigItem sal_Bool bIgnorePieces; //Compare/Settings/Ignore pieces of length sal_uInt16 nPieceLen; //Compare/Settings/Ignore pieces of length - const com::sun::star::uno::Sequence& GetPropertyNames(); + const com::sun::star::uno::Sequence& GetPropertyNames(); public: SwCompareConfig(); ~SwCompareConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ){ }; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ){ }; void Load(); void SetModified() {ConfigItem::SetModified(); } }; @@ -104,13 +104,13 @@ class SwInsertConfig : public utl::ConfigItem SwInsertTableOptions aInsTblOpts; sal_Bool bIsWeb; - const com::sun::star::uno::Sequence& GetPropertyNames(); + const com::sun::star::uno::Sequence& GetPropertyNames(); public: SwInsertConfig(sal_Bool bWeb); ~SwInsertConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -129,13 +129,13 @@ class SwTableConfig : public utl::ConfigItem sal_Bool bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats. sal_Bool bInsTblAlignNum; // Table/Input/Alignment // Align numbers. - const com::sun::star::uno::Sequence& GetPropertyNames(); + const com::sun::star::uno::Sequence& GetPropertyNames(); public: SwTableConfig(sal_Bool bWeb); ~SwTableConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -157,13 +157,13 @@ class SwMiscConfig : public utl::ConfigItem String sMailingPath; // FormLetter/FileOutput/Path String sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!) - const com::sun::star::uno::Sequence& GetPropertyNames(); + const com::sun::star::uno::Sequence& GetPropertyNames(); public: SwMiscConfig(); ~SwMiscConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); void Load(); void SetModified(){ConfigItem::SetModified();} }; diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx index 835044d61e3e..a6a9d96c5976 100644 --- a/sw/inc/modeltoviewhelper.hxx +++ b/sw/inc/modeltoviewhelper.hxx @@ -79,7 +79,7 @@ class ModelToViewHelper ConversionMap m_aMap; - rtl::OUString m_aRetText; + OUString m_aRetText; public: @@ -133,7 +133,7 @@ public: */ ModelPosition ConvertToModelPosition( sal_uInt32 nViewPos ) const; - rtl::OUString getViewText() const { return m_aRetText; } + OUString getViewText() const { return m_aRetText; } }; #endif diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index e76eb69776e6..8e41570f6df2 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -117,7 +117,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable /// pointer to the list, to whose the text node is added to SwList* mpList; - ::std::auto_ptr< ::rtl::OUString > m_pNumStringCache; + ::std::auto_ptr< OUString > m_pNumStringCache; ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XTextContent> m_wXParagraph; diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index b6859a53e9b0..e92c164c7bf7 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -69,7 +69,7 @@ public: bModified; sal_Int16 nPrintPostIts; - rtl::OUString sFaxName; + OUString sFaxName; SwPrintData() { @@ -147,7 +147,7 @@ public: sal_Bool IsPrintBlackFont() const { return bPrintBlackFont; } sal_Bool IsPrintSingleJobs() const { return bPrintSingleJobs; } sal_Int16 GetPrintPostIts() const { return nPrintPostIts; } - const rtl::OUString GetFaxName() const { return sFaxName; } + const OUString GetFaxName() const { return sFaxName; } sal_Bool IsPrintHiddenText() const { return bPrintHiddenText; } sal_Bool IsPrintTextPlaceholder() const { return bPrintTextPlaceholder; } @@ -166,7 +166,7 @@ public: void SetPrintPageBackground( sal_Bool b ) { doSetModified(); bPrintPageBackground = b; } void SetPrintBlackFont( sal_Bool b ) { doSetModified(); bPrintBlackFont = b; } void SetPrintSingleJobs( sal_Bool b ) { doSetModified(); bPrintSingleJobs = b; } - void SetFaxName( const rtl::OUString& rSet ) { sFaxName = rSet; } + void SetFaxName( const OUString& rSet ) { sFaxName = rSet; } void SetPrintHiddenText( sal_Bool b ) { doSetModified(); bPrintHiddenText = b; } void SetPrintTextPlaceholder( sal_Bool b ) { doSetModified(); bPrintTextPlaceholder = b; } @@ -231,7 +231,7 @@ class SwRenderData -1 indicates a half page to be left empty. */ std::vector< std::pair< sal_Int32, sal_Int32 > > m_aPagePairs; - rtl::OUString m_aPageRange; + OUString m_aPageRange; /** temp print document -- must live longer than m_pViewOptionAdjust! also this is a Lock and not a Ref because Ref does not delete the doc */ @@ -295,8 +295,8 @@ public: PagePairsVec_t & GetPagePairsForProspectPrinting() { return m_aPagePairs; } const PagePairsVec_t & GetPagePairsForProspectPrinting() const { return m_aPagePairs; } - rtl::OUString GetPageRange() const { return m_aPageRange; } - void SetPageRange( const rtl::OUString &rRange ) { m_aPageRange = rRange; } + OUString GetPageRange() const { return m_aPageRange; } + void SetPageRange( const OUString &rRange ) { m_aPageRange = rRange; } }; diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx index 4cad6c473f39..64dc9cd4c3c6 100644 --- a/sw/inc/prtopt.hxx +++ b/sw/inc/prtopt.hxx @@ -26,13 +26,13 @@ class SwPrintOptions : public SwPrintData, public utl::ConfigItem { sal_Bool bIsWeb; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SwPrintOptions(sal_Bool bWeb); virtual ~SwPrintOptions(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void doSetModified( ) { bModified = sal_True; SetModified();} SwPrintOptions& operator=(const SwPrintData& rData) diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 857c44c47fc1..9550de42539c 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -81,7 +81,7 @@ public: class SW_DLLPUBLIC SwGetRefField : public SwField { private: - rtl::OUString sSetRefName; + OUString sSetRefName; String sTxt; sal_uInt16 nSubType; sal_uInt16 nSeqNo; @@ -102,7 +102,7 @@ public: virtual String GetFieldName() const; - const rtl::OUString& GetSetRefName() const { return sSetRefName; } + const OUString& GetSetRefName() const { return sSetRefName; } // #i81002# /** The instance, which represents the text attribute for the @@ -132,10 +132,10 @@ public: void SetSeqNo( sal_uInt16 n ) { nSeqNo = n; } // Name of reference. - virtual const rtl::OUString& GetPar1() const; - virtual void SetPar1(const rtl::OUString& rStr); + virtual const OUString& GetPar1() const; + virtual void SetPar1(const OUString& rStr); - virtual rtl::OUString GetPar2() const; + virtual OUString GetPar2() const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index 255a5fec84ff..b9aae1ab8210 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -68,7 +68,7 @@ struct SwArgsBase // used for text conversion (Hangul/Hanja, ...) struct SwConversionArgs : SwArgsBase { - rtl::OUString aConvText; // convertible text found + OUString aConvText; // convertible text found LanguageType nConvSrcLang; // (source) language to look for LanguageType nConvTextLang; // language of aConvText (if the latter one was found) diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 51d28901ca4c..8992dce3d22c 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -104,8 +104,8 @@ class AbstractFldInputDlg : public VclAbstractDialog //add for SwFldInputDlg { public: //from class SalFrame - virtual void SetWindowState( const rtl::OString & rStr ) = 0; - virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; + virtual void SetWindowState( const OString & rStr ) = 0; + virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; }; class AbstractInsFootNoteDlg : public VclAbstractDialog //add for SwInsFootNoteDlg @@ -115,7 +115,7 @@ public: virtual sal_Bool IsEndNote() = 0; virtual String GetStr() = 0; //from class Window - virtual void SetHelpId( const rtl::OString& sHelpId ) = 0; + virtual void SetHelpId( const OString& sHelpId ) = 0; virtual void SetText( const OUString& rStr ) = 0; }; @@ -141,7 +141,7 @@ class AbstractMailMergeDlg : public VclAbstractDialog //add for SwMailMergeDlg { public: virtual sal_uInt16 GetMergeType() = 0; - virtual const ::rtl::OUString& GetSaveFilter() const = 0; + virtual const OUString& GetSaveFilter() const = 0; virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const = 0; virtual bool IsSaveIndividualDocs() const = 0; @@ -240,8 +240,8 @@ public: class AbstractDropDownFieldDialog : public VclAbstractDialog //add for DropDownFieldDialog { public: - virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow - virtual void SetWindowState( const rtl::OString & rStr ) =0;//this method inherit from SystemWindow + virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow + virtual void SetWindowState( const OString & rStr ) =0;//this method inherit from SystemWindow }; class AbstractSwLabDlg : public SfxAbstractTabDialog //add for SwLabDlg diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx index 99e319653867..2c908461f7d2 100644 --- a/sw/inc/swdbdata.hxx +++ b/sw/inc/swdbdata.hxx @@ -25,8 +25,8 @@ // contains the description of a data source struct SwDBData { - ::rtl::OUString sDataSource; - ::rtl::OUString sCommand; //table, query or statement + OUString sDataSource; + OUString sCommand; //table, query or statement sal_Int32 nCommandType; //com::sun::star::sdb::CommandType SwDBData() : nCommandType(0){} diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx index 91216a2925d4..da84a9f39d41 100644 --- a/sw/inc/swdbtoolsclient.hxx +++ b/sw/inc/swdbtoolsclient.hxx @@ -46,7 +46,7 @@ public: ~SwDbtoolsClient(); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource( - const ::rtl::OUString& _rsRegisteredName, + const OUString& _rsRegisteredName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext ); @@ -56,7 +56,7 @@ public: const ::com::sun::star::lang::Locale& _rLocale ); - ::rtl::OUString getFormattedValue( + OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter, const ::com::sun::star::lang::Locale& _rLocale, diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx index 2dd07f8523ff..8a21083c1d63 100644 --- a/sw/inc/swfltopt.hxx +++ b/sw/inc/swfltopt.hxx @@ -30,7 +30,7 @@ public: void GetValues( sal_uInt16 nCnt, const sal_Char** ppNames, sal_uInt32* pValues ); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); }; #endif diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx index e326f91a7535..daff93c4e5ca 100644 --- a/sw/inc/swscanner.hxx +++ b/sw/inc/swscanner.hxx @@ -33,10 +33,10 @@ class SwTxtNode; class SwScanner { - rtl::OUString aWord; + OUString aWord; const SwTxtNode& rNode; - const rtl::OUString aPreDashReplacementText; - rtl::OUString aText; + const OUString aPreDashReplacementText; + OUString aText; const LanguageType* pLanguage; const ModelToViewHelper rConversionMap; sal_Int32 nStartPos; @@ -49,7 +49,7 @@ class SwScanner sal_Bool bClip; public: - SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt, + SwScanner( const SwTxtNode& rNd, const OUString& rTxt, const LanguageType* pLang, const ModelToViewHelper& rConvMap, sal_uInt16 nWordType, @@ -61,7 +61,7 @@ public: // ! bReverse sal_Bool NextWord(); - const rtl::OUString& GetWord() const { return aWord; } + const OUString& GetWord() const { return aWord; } sal_Int32 GetBegin() const { return nBegin; } sal_Int32 GetEnd() const { return nBegin + nLen; } diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx index 0d3bd7298836..1a19e4a4ba38 100644 --- a/sw/inc/swundo.hxx +++ b/sw/inc/swundo.hxx @@ -24,7 +24,7 @@ #include -typedef ::std::vector< ::rtl::OUString > SwUndoComments_t; +typedef ::std::vector< OUString > SwUndoComments_t; // The IDs for StdActions. diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx index 671540711e2f..6aab290a09c7 100644 --- a/sw/inc/swurl.hxx +++ b/sw/inc/swurl.hxx @@ -26,8 +26,8 @@ class ViewShell; #define URLLOAD_NOFILTER 0x0000 #define URLLOAD_NEWVIEW 0x8000 -void LoadURL( ViewShell& rSh, const rtl::OUString& rName, - sal_uInt16 nFilter, const rtl::OUString& rTargetFrameName ); +void LoadURL( ViewShell& rSh, const OUString& rName, + sal_uInt16 nFilter, const OUString& rTargetFrameName ); #endif diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx index 362746849510..72deb8d869ff 100644 --- a/sw/inc/toxwrap.hxx +++ b/sw/inc/toxwrap.hxx @@ -53,7 +53,7 @@ public: String GetFollowingText( sal_Bool bMorePages ) const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const; sal_Bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl, diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 7f4a05f7ff38..3357401c1524 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -104,7 +104,7 @@ public: @return textual comment for this undo object */ - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; // UndoObject remembers which mode was turned on. // In Undo/Redo/Repeat this remembered mode is switched on. @@ -297,7 +297,7 @@ public: virtual void RedoImpl( ::sw::UndoRedoContext & ); virtual void RepeatImpl( ::sw::RepeatContext & ); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index 444a87a6da90..3537cd2769cc 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -146,12 +146,12 @@ namespace sw { return 0; } - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > GetSupportedServiceNamesImpl( size_t const nServices, char const*const pServices[]); sal_Bool SupportsServiceImpl( size_t const nServices, char const*const pServices[], - ::rtl::OUString const & rServiceName); + OUString const & rServiceName); } // namespace sw diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index eb480ecd3358..44229d823d8d 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -159,9 +159,9 @@ class SwChartDataProvider : SwChartDataProvider & operator = ( const SwChartDataProvider & ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, sal_Bool bTestOnly = sal_False ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const ::rtl::OUString& aRangeRepresentation, sal_Bool bTestOnly = sal_False ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, sal_Bool bTestOnly = sal_False ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - rtl::OUString GetBrokenCellRangeForExport( const rtl::OUString &rCellRangeRepresentation ); + OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation ); protected: //SwClient @@ -175,13 +175,13 @@ public: virtual ::sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const ::rtl::OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const ::rtl::OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (::com::sun::star::uno::RuntimeException); // XRangeXMLConversion - virtual ::rtl::OUString SAL_CALL convertRangeToXML( const ::rtl::OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL convertRangeFromXML( const ::rtl::OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); @@ -189,9 +189,9 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } @@ -235,9 +235,9 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; ////////////////////////////////////////////////////////////////////// @@ -301,12 +301,12 @@ public: // XDataSequence virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSourceRangeRepresentation( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin eLabelOrigin ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSourceRangeRepresentation( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin eLabelOrigin ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData( ) throw (::com::sun::star::uno::RuntimeException); // XNumericalDataSequence virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData( ) throw (::com::sun::star::uno::RuntimeException); @@ -316,17 +316,17 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XModifiable virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException); @@ -396,9 +396,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 0d0d5f4d0a7a..271491ec1061 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -254,10 +254,10 @@ class SwUnoCollection class SwXServiceProvider { public: - static rtl::OUString GetProviderName(sal_uInt16 nObjectType); - static sal_uInt16 GetProviderType(const rtl::OUString& rServiceName); + static OUString GetProviderName(sal_uInt16 nObjectType); + static sal_uInt16 GetProviderType(const OUString& rServiceName); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance(sal_uInt16 nObjectType, SwDoc* pDoc); - static ::com::sun::star::uno::Sequence GetAllServiceNames(); + static ::com::sun::star::uno::Sequence GetAllServiceNames(); }; @@ -283,18 +283,18 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::text::XTextTable* GetObject( SwFrmFmt& rFmt ); }; @@ -325,18 +325,18 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); FlyCntType GetType()const{return eType;} static SwXFrame* GetObject( SwFrmFmt& rFmt, FlyCntType eType ); @@ -352,9 +352,9 @@ public: //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -366,9 +366,9 @@ public: SwXTextGraphicObjects(SwDoc* pDoc); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -381,9 +381,9 @@ public: //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -401,18 +401,18 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt ); }; @@ -431,18 +431,18 @@ class SwXBookmarks : public SwCollectionBaseClass, virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -494,9 +494,9 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt ); }; @@ -515,18 +515,18 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static SwXReferenceMark* GetObject( SwDoc* pDoc, const SwFmtRefMark* pMark ); }; diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 251057e50c6e..b882582bf2af 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -119,7 +119,7 @@ namespace SwUnoCursorHelper bool DocInsertStringSplitCR( SwDoc &rDoc, const SwPaM &rNewCursor, const String &rText, const bool bForceExpandHints ); - void makeRedline( SwPaM& rPaM, const ::rtl::OUString& RedlineType, + void makeRedline( SwPaM& rPaM, const OUString& RedlineType, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -131,11 +131,11 @@ namespace SwUnoCursorHelper void GetCrsrAttr(SwPaM & rPam, SfxItemSet & rSet, const bool bOnlyTxtAttr = false, const bool bGetFromChrFmt = true); - void GetTextFromPam(SwPaM & rPam, ::rtl::OUString & rBuffer); + void GetTextFromPam(SwPaM & rPam, OUString & rBuffer); SwFmtColl * GetCurTxtFmtColl(SwPaM & rPam, const bool bConditional); void SelectPam(SwPaM & rPam, const bool bExpand); - void SetString(SwCursor & rCursor, const ::rtl::OUString & rString); + void SetString(SwCursor & rCursor, const OUString & rString); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > CreateSortDescriptor(const bool bFromTable); @@ -148,7 +148,7 @@ namespace SwUnoCursorHelper void SetPropertyValue( SwPaM& rPaM, const SfxItemPropertySet & rPropSet, - const ::rtl::OUString & rPropertyName, + const OUString & rPropertyName, const ::com::sun::star::uno::Any & rValue, const SetAttrMode nAttrMode = nsSetAttrMode::SETATTR_DEFAULT, const bool bTableMode = false) @@ -173,7 +173,7 @@ namespace SwUnoCursorHelper ::com::sun::star::uno::Any GetPropertyValue( SwPaM& rPaM, const SfxItemPropertySet & rPropSet, - const ::rtl::OUString & rPropertyName) + const OUString & rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -181,7 +181,7 @@ namespace SwUnoCursorHelper ::com::sun::star::beans::PropertyState > GetPropertyStates( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const SwGetPropertyStatesCaller eCaller = SW_PROPERTY_STATE_CALLER_DEFAULT) @@ -190,19 +190,19 @@ namespace SwUnoCursorHelper ::com::sun::star::beans::PropertyState GetPropertyState( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, - const ::rtl::OUString & rPropertyName) + const OUString & rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); void SetPropertyToDefault( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, - const ::rtl::OUString & rPropertyName) + const OUString & rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any GetPropertyDefault( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, - const ::rtl::OUString & rPropertyName) + const OUString & rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 6680ae81e017..d285554f89d2 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -106,9 +106,9 @@ public: virtual void SAL_CALL ungroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > & aGroup) throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); SwFmDrawPage* GetSvxPage(); // renamed and outlined to detect where it's called @@ -209,7 +209,7 @@ class SwXShape : public SwXShapeBaseClass, @author OD */ - ::com::sun::star::uno::Any _getPropAtAggrObj( const ::rtl::OUString& _rPropertyName ) + ::com::sun::star::uno::Any _getPropAtAggrObj( const OUString& _rPropertyName ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -235,18 +235,18 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -258,15 +258,15 @@ public: virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;} SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx index fa089e2daa51..6030b7e9d340 100644 --- a/sw/inc/unofieldcoll.hxx +++ b/sw/inc/unofieldcoll.hxx @@ -46,12 +46,12 @@ public: static sal_Bool getInstanceName(const SwFieldType& rFldType, String& rName); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -63,13 +63,13 @@ public: // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( - const ::rtl::OUString& rName) + const OUString& rName) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& rName) + virtual sal_Bool SAL_CALL hasByName(const OUString& rName) throw (::com::sun::star::uno::RuntimeException); }; @@ -98,12 +98,12 @@ public: virtual void Invalidate(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 36309b86430e..fc34804ba469 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -94,23 +94,23 @@ public: TYPEINFO(); //XNamed - virtual rtl::OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setName(const rtl::OUString& Name_) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException ); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw(::com::sun::star::uno::RuntimeException); @@ -119,7 +119,7 @@ public: virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); //XShapeDescriptor - virtual rtl::OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException ); //Base implementation //XComponent @@ -130,9 +130,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -210,9 +210,9 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException); @@ -221,7 +221,7 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); //XPropertySet - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); @@ -261,9 +261,9 @@ public: virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException); @@ -315,9 +315,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getReplacementGraphic() throw (::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx index 765a307f89bf..0c9e885cf6df 100644 --- a/sw/inc/unoidxcoll.hxx +++ b/sw/inc/unoidxcoll.hxx @@ -35,12 +35,12 @@ public: SwXDocumentIndexes(SwDoc *const pDoc); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -60,13 +60,13 @@ public: // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( - const ::rtl::OUString& rName) + const OUString& rName) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& rName) + virtual sal_Bool SAL_CALL hasByName(const OUString& rName) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index 903fa432b736..e326ad3cc3ea 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -111,12 +111,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -138,7 +138,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -146,33 +146,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -181,29 +181,29 @@ public: // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL - getPropertyState(const ::rtl::OUString& rPropertyName) + getPropertyState(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& rPropertyNames) + OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyToDefault( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet virtual void SAL_CALL setPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues) @@ -213,11 +213,11 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertiesChangeListener( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) @@ -227,7 +227,7 @@ public: ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL firePropertiesChangeEvent( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) @@ -237,7 +237,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues) @@ -246,13 +246,13 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::uno::RuntimeException); @@ -271,9 +271,9 @@ public: // XContentEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createContentEnumeration(const ::rtl::OUString& rServiceName) + createContentEnumeration(const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -297,9 +297,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() + virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(const ::rtl::OUString& rString) + virtual void SAL_CALL setString(const OUString& rString) throw (::com::sun::star::uno::RuntimeException); }; @@ -328,12 +328,12 @@ public: SwTable const*const pTable = 0); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index add008eb2bf6..25649b49ec44 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -91,12 +91,12 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx index b4213efc5645..2eedea80611d 100644 --- a/sw/inc/unoredlines.hxx +++ b/sw/inc/unoredlines.hxx @@ -58,9 +58,9 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::beans::XPropertySet* GetObject( SwRedline& rRedline, SwDoc& rDoc ); }; @@ -82,9 +82,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); protected: //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index d156ec21f4c7..eede62f2e0db 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -55,17 +55,17 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void Invalidate() {pDoc = 0;} }; @@ -86,17 +86,17 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void Invalidate() {pDoc = 0;} }; @@ -117,17 +117,17 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void Invalidate() {pDoc = 0;} }; @@ -180,21 +180,21 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XNamed - virtual rtl::OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setName(const rtl::OUString& Name_) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> @@ -207,7 +207,7 @@ public: const String* GetBulletFontNames() const {return sNewBulletFontNames;} const SwNumRule* GetNumRule() {return pNumRule;} - static bool isInvalidStyle(const rtl::OUString &rName); + static bool isInvalidStyle(const OUString &rName); void Invalidate() {pDocShell = 0;} const String& GetCreatedNumRuleName() const{return sCreatedNumRuleName; } }; @@ -223,9 +223,9 @@ public: void Invalidate() {SwXNumberingRules::Invalidate();} //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -275,17 +275,17 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); sal_Int32 GetSepLineWidth() const {return nSepLineWidth;} sal_Int32 GetSepLineColor() const {return nSepLineColor;} diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index 372778a3b153..8b71eac57ebf 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -78,21 +78,21 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); //XSearchDescriptor - virtual ::rtl::OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); //XReplaceDescriptor - virtual ::rtl::OUString SAL_CALL getReplaceString(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setReplaceString(const ::rtl::OUString& aReplaceString) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getReplaceString(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) throw( ::com::sun::star::uno::RuntimeException ); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XPropertyReplace virtual sal_Bool SAL_CALL getValueSearch(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -103,9 +103,9 @@ public: virtual void SAL_CALL setReplaceAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void FillSearchItemSet(SfxItemSet& rSet) const; void FillReplaceItemSet(SfxItemSet& rSet) const; diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 76bbd5009776..26bfc4ea3a1c 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -73,9 +73,9 @@ public: SwXStyleFamilies(SwDocShell& rDocShell); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); //XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -86,13 +86,13 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XStyleLoader - virtual void SAL_CALL loadStylesFromURL(const rtl::OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions) throw( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL loadStylesFromURL(const OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions) throw( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions(void) throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; class SwXStyleFamily : public cppu::WeakImplHelper4 @@ -122,31 +122,31 @@ public: virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); //XNameContainer - virtual void SAL_CALL insertByName(const rtl::OUString& Name, const ::com::sun::star::uno::Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL replaceByName(const rtl::OUString& Name, const ::com::sun::star::uno::Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL replaceByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; class SwXStyle : public cppu::WeakImplHelper7 @@ -185,8 +185,8 @@ protected: com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData; com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily; - void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); public: @@ -205,46 +205,46 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); //XNamed - virtual rtl::OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setName(const rtl::OUString& Name_) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException ); //XStyle virtual sal_Bool SAL_CALL isUserDefined(void) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL isInUse(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getParentStyle(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setParentStyle(const rtl::OUString& aParentStyle) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getParentStyle(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException ); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertyStates virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -289,8 +289,8 @@ public: class SwXPageStyle : public SwXStyle { protected: - void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, SfxStyleFamily eFam, @@ -298,11 +298,11 @@ public: SwXPageStyle(SwDocShell* pDocSh); ~SwXPageStyle(); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); }; @@ -330,9 +330,9 @@ public: virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -389,7 +389,7 @@ class SwXAutoStyle : public cppu::WeakImplHelper3 SfxItemSet_Pointer_t pSet; IStyleAccess::SwAutoStyleFamily eFamily; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: @@ -398,30 +398,30 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XMultiPropertyStates virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // Special virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties() throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 9ba64146e357..a8cc7b952156 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -70,7 +70,7 @@ class SwXCell : public SwXCellBaseClass, public SwXText, public SwClient { - friend void sw_setString( SwXCell &rCell, const rtl::OUString &rTxt, + friend void sw_setString( SwXCell &rCell, const OUString &rTxt, sal_Bool bKeepNumberFmt = sal_False ); friend double sw_getValue( SwXCell &rCell ); friend void sw_setValue( SwXCell &rCell, double nVal ); @@ -120,8 +120,8 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); //XCell - virtual ::rtl::OUString SAL_CALL getFormula( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFormula( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException); virtual double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellContentType SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException); @@ -130,21 +130,21 @@ public: //XText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException ); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //XEnumerationAccess - was: XParagraphEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -184,17 +184,17 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); const SwTableLine* GetTblRow() const {return pLine;} static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine); @@ -223,8 +223,8 @@ public: DECLARE_XINTERFACE() //XTextTableCursor - virtual ::rtl::OUString SAL_CALL getRangeName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL gotoCellByName( const ::rtl::OUString& aCellName, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getRangeName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); @@ -236,17 +236,17 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); @@ -322,9 +322,9 @@ public: virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableRows > SAL_CALL getRows( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableColumns > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByName( const ::rtl::OUString& aCellName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCellNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTableCursor > SAL_CALL createCursorByCellName( const ::rtl::OUString& aCellName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByName( const OUString& aCellName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCellNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTableCursor > SAL_CALL createCursorByCellName( const OUString& aCellName ) throw(::com::sun::star::uno::RuntimeException); //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -338,15 +338,15 @@ public: //XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw(::com::sun::star::uno::RuntimeException); //XChartDataArray virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException); //XChartData virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); @@ -359,29 +359,29 @@ public: virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) throw( ::com::sun::star::uno::RuntimeException ); //XAutoFormattable - virtual void SAL_CALL autoFormat(const rtl::OUString& aName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL autoFormat(const OUString& aName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XNamed - virtual rtl::OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setName(const rtl::OUString& Name_) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException ); //XCellRangeData virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw (::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -436,16 +436,16 @@ public: //XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const ::rtl::OUString& aRange ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw(::com::sun::star::uno::RuntimeException); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XChartData virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); @@ -456,10 +456,10 @@ public: //XChartDataArray virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException); //XSortable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -470,9 +470,9 @@ public: virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw (::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); @@ -486,7 +486,7 @@ public: // for SwChartDataSequence void GetDataSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > *pAnySeq, - ::com::sun::star::uno::Sequence< ::rtl::OUString > *pTxtSeq, + ::com::sun::star::uno::Sequence< OUString > *pTxtSeq, ::com::sun::star::uno::Sequence< double > *pDblSeq, sal_Bool bForceNumberResults = sal_False ) throw (::com::sun::star::uno::RuntimeException); @@ -522,9 +522,9 @@ public: virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); @@ -560,9 +560,9 @@ public: virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx index 7c01aed506fa..bb43f1d30f0b 100644 --- a/sw/inc/unotext.hxx +++ b/sw/inc/unotext.hxx @@ -119,7 +119,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -127,33 +127,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -170,16 +170,16 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() + virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(const ::rtl::OUString& rString) + virtual void SAL_CALL setString(const OUString& rString) throw (::com::sun::star::uno::RuntimeException); // XSimpleText virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, - const ::rtl::OUString& aString, sal_Bool bAbsorb) + const OUString& aString, sal_Bool bAbsorb) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< @@ -228,7 +228,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendTextPortion( - const ::rtl::OUString& rText, + const OUString& rText, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rCharacterAndParagraphProperties) @@ -238,7 +238,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL insertTextPortion( - const ::rtl::OUString& rText, + const OUString& rText, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rCharacterAndParagraphProperties, diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx index 1090ff6de824..494aaff96535 100644 --- a/sw/inc/unotextbodyhf.hxx +++ b/sw/inc/unotextbodyhf.hxx @@ -75,12 +75,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -160,12 +160,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx index 93c1bcf68c8a..6bb5bab8e9d6 100644 --- a/sw/inc/unotextcursor.hxx +++ b/sw/inc/unotextcursor.hxx @@ -96,7 +96,7 @@ public: bool IsAtEndOfMeta() const; - void DeleteAndInsert(::rtl::OUString const& rText, + void DeleteAndInsert(OUString const& rText, const bool bForceExpandHints); // OTextCursorHelper @@ -115,12 +115,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -130,7 +130,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -138,33 +138,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -173,29 +173,29 @@ public: // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL - getPropertyState(const ::rtl::OUString& rPropertyName) + getPropertyState(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& rPropertyNames) + OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyToDefault( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet virtual void SAL_CALL setPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw ( css::beans::PropertyVetoException, @@ -203,11 +203,11 @@ public: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL - getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException); virtual void SAL_CALL addPropertiesChangeListener( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException); @@ -216,7 +216,7 @@ public: throw (css::uno::RuntimeException); virtual void SAL_CALL firePropertiesChangeEvent( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException); @@ -224,13 +224,13 @@ public: virtual void SAL_CALL setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertiesToDefault( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, @@ -251,9 +251,9 @@ public: // XContentEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createContentEnumeration(const ::rtl::OUString& rServiceName) + createContentEnumeration(const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -269,7 +269,7 @@ public: // XDocumentInsertable virtual void SAL_CALL insertDocumentFromURL( - const ::rtl::OUString& rURL, + const OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rOptions) throw (::com::sun::star::lang::IllegalArgumentException, @@ -286,9 +286,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() + virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(const ::rtl::OUString& rString) + virtual void SAL_CALL setString(const OUString& rString) throw (::com::sun::star::uno::RuntimeException); // XTextCursor @@ -356,7 +356,7 @@ public: // XRedline virtual void SAL_CALL makeRedline( - const ::rtl::OUString& rRedlineType, + const OUString& rRedlineType, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties) throw (::com::sun::star::lang::IllegalArgumentException, diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index cfd373766c38..6d0e8f0f5d0d 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -70,7 +70,7 @@ namespace sw { CreateParentXText(SwDoc & rDoc, const SwPosition& rPos); bool GetDefaultTextContentValue(::com::sun::star::uno::Any& rAny, - const ::rtl::OUString& rPropertyName, sal_uInt16 nWID = 0); + const OUString& rPropertyName, sal_uInt16 nWID = 0); } // namespace sw @@ -107,7 +107,7 @@ private: void SetPositions(SwPaM const& rPam); //TODO: new exception type for protected content void DeleteAndInsert( - const ::rtl::OUString& rText, const bool bForceExpandHints) + const OUString& rText, const bool bForceExpandHints) throw (::com::sun::star::uno::RuntimeException); void Invalidate(); @@ -139,12 +139,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -154,7 +154,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -162,33 +162,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -197,22 +197,22 @@ public: // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL - getPropertyState(const ::rtl::OUString& rPropertyName) + getPropertyState(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& rPropertyNames) + OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyToDefault( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -232,9 +232,9 @@ public: // XContentEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createContentEnumeration(const ::rtl::OUString& rServiceName) + createContentEnumeration(const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -248,14 +248,14 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() + virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(const ::rtl::OUString& rString) + virtual void SAL_CALL setString(const OUString& rString) throw (::com::sun::star::uno::RuntimeException); // XRedline virtual void SAL_CALL makeRedline( - const ::rtl::OUString& rRedlineType, + const OUString& rRedlineType, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties) throw (::com::sun::star::lang::IllegalArgumentException, @@ -294,12 +294,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index e3c6acd4ac5a..79d9f303ffb5 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -221,7 +221,7 @@ private: SwDoc * GetRenderDoc( SfxViewShell *&rpView, const css::uno::Any& rSelection, bool bIsPDFExport ); SfxViewShell * GetRenderView( bool &rbIsSwSrcView, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions, bool bIsPDFExport ); - rtl::OUString maBuildId; + OUString maBuildId; // boolean for XPagePrintable // set in XPagePrintable::printPages(..) to indicate that the PagePrintSettings @@ -257,8 +257,8 @@ public: virtual void SAL_CALL reformat(void) throw( css::uno::RuntimeException ); //XModel - virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(css::uno::RuntimeException); virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw(css::uno::RuntimeException); virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException); virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException); @@ -341,18 +341,18 @@ public: virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles( ) throw (css::uno::RuntimeException); //XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const rtl::OUString& ServiceSpecifier) + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( css::uno::Exception, css::uno::RuntimeException ); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const rtl::OUString& ServiceSpecifier, + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments) throw( css::uno::Exception, css::uno::RuntimeException ); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames(void) + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) throw( css::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); // css::drawing::XDrawPageSupplier virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage(void) throw( css::uno::RuntimeException ); @@ -362,18 +362,18 @@ public: //XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< ::rtl::OUString >& rPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); //XLinkTargetSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(void) throw( css::uno::RuntimeException ); @@ -450,18 +450,18 @@ public: ~SwXLinkTargetSupplier(); //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException ); //XElementAccess virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); // void Invalidate() {pxDoc = 0;} @@ -491,9 +491,9 @@ public: ~SwXLinkNameAccessWrapper(); //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException ); //XElementAccess virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException); @@ -501,20 +501,20 @@ public: //XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); //XLinkTargetSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(void) throw( css::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); }; @@ -533,17 +533,17 @@ public: //XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException ); }; class SwXDocumentPropertyHelper : public SvxUnoForbiddenCharsTable diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 71c6f118e5ba..85fe469775a7 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -32,14 +32,14 @@ class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType bool bValidValue : 1; bool bDeleted : 1; double nValue; - rtl::OUString aName; + OUString aName; String aContent; sal_uInt16 nType; public: SwUserFieldType( SwDoc* pDocPtr, const String& ); - virtual const rtl::OUString& GetName() const; + virtual const OUString& GetName() const; virtual SwFieldType* Copy() const; String Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng); @@ -108,11 +108,11 @@ public: virtual String GetFieldName() const; // Name cannot be changed. - virtual const rtl::OUString& GetPar1() const; + virtual const OUString& GetPar1() const; // Content. - virtual rtl::OUString GetPar2() const; - virtual void SetPar2(const rtl::OUString& rStr); + virtual OUString GetPar2() const; + virtual void SetPar2(const OUString& rStr); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); }; diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 6e99bdd18258..f5c16e4de920 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -136,7 +136,7 @@ class SwViewOption protected: static sal_uInt16 nPixelTwips;// 1 Pixel == ? Twips - rtl::OUString sSymbolFont; // Symbolfont. + OUString sSymbolFont; // Symbolfont. sal_uInt32 nCoreOptions; // Bits for ViewShell. sal_uInt32 nCore2Options; // Bits for ViewShell. sal_uInt32 nUIOptions; // UI-Bits @@ -489,8 +489,8 @@ public: void SetZoomType (SvxZoomType eZoom_){ eZoom = eZoom_; } void SetTblDest( sal_uInt8 nNew ) { nTblDest = nNew; } - const rtl::OUString& GetSymbolFont() const {return sSymbolFont;} - void SetSymbolFont(const rtl::OUString& sSet) {sSymbolFont = sSet;} + const OUString& GetSymbolFont() const {return sSymbolFont;} + void SetSymbolFont(const OUString& sSet) {sSymbolFont = sSet;} const Color& GetRetoucheColor() const { return aRetoucheColor;} void SetRetoucheColor(const Color&r) { aRetoucheColor = r; } diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index e434936def2e..2435092008ab 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -62,8 +62,8 @@ class SwFiltersTest , public test::BootstrapFixture { public: - virtual bool load( const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData, unsigned int nFilterFlags, + virtual bool load( const OUString &rFilter, const OUString &rURL, + const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion); virtual void setUp(); @@ -78,14 +78,14 @@ private: uno::Reference m_xWriterComponent; }; -bool SwFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData, unsigned int nFilterFlags, +bool SwFiltersTest::load(const OUString &rFilter, const OUString &rURL, + const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion) { SfxFilter* pFilter = new SfxFilter( - rFilter, rtl::OUString(), nFilterFlags, - nClipboardID, rtl::OUString(), 0, rtl::OUString(), - rUserData, rtl::OUString()); + rFilter, OUString(), nFilterFlags, + nClipboardID, OUString(), 0, OUString(), + rUserData, OUString()); pFilter->SetVersion(nFilterVersion); SwDocShellRef xDocShRef = new SwDocShell; @@ -95,7 +95,7 @@ bool SwFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL if (rUserData == FILTER_TEXT_DLG) { pSrcMed->GetItemSet()->Put( - SfxStringItem(SID_FILE_FILTEROPTIONS, rtl::OUString("UTF8,LF,Liberation Mono,en-US"))); + SfxStringItem(SID_FILE_FILTEROPTIONS, OUString("UTF8,LF,Liberation Mono,en-US"))); } bool bLoaded = xDocShRef->DoLoad(pSrcMed); @@ -108,25 +108,25 @@ bool SwFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL void SwFiltersTest::testCVEs() { - testDir(rtl::OUString("Staroffice XML (Writer)"), + testDir(OUString("Staroffice XML (Writer)"), getURLFromSrc("/sw/qa/core/data/xml/"), - rtl::OUString(FILTER_XML), + OUString(FILTER_XML), SFX_FILTER_IMPORT | SFX_FILTER_OWN | SFX_FILTER_DEFAULT, isstorage, SOFFICE_FILEFORMAT_CURRENT); - testDir(rtl::OUString("writer8"), + testDir(OUString("writer8"), getURLFromSrc("/sw/qa/core/data/odt/"), - rtl::OUString(FILTER_XML), + OUString(FILTER_XML), SFX_FILTER_IMPORT | SFX_FILTER_OWN | SFX_FILTER_DEFAULT, isstorage, SOFFICE_FILEFORMAT_CURRENT); - testDir(rtl::OUString("MS Word 97"), + testDir(OUString("MS Word 97"), getURLFromSrc("/sw/qa/core/data/ww8/"), - rtl::OUString(FILTER_WW8)); + OUString(FILTER_WW8)); - testDir(rtl::OUString("Text (encoded)"), + testDir(OUString("Text (encoded)"), getURLFromSrc("/sw/qa/core/data/txt/"), - rtl::OUString(FILTER_TEXT_DLG)); + OUString(FILTER_TEXT_DLG)); } void SwFiltersTest::setUp() @@ -136,7 +136,7 @@ void SwFiltersTest::setUp() //This is a bit of a fudge, we do this to ensure that SwGlobals::ensure, //which is a private symbol to us, gets called m_xWriterComponent = - getMultiServiceFactory()->createInstance(rtl::OUString( + getMultiServiceFactory()->createInstance(OUString( "com.sun.star.comp.Writer.TextDocument")); CPPUNIT_ASSERT_MESSAGE("no writer component!", m_xWriterComponent.is()); } diff --git a/sw/qa/core/layout-test.cxx b/sw/qa/core/layout-test.cxx index cd56bfd6234f..f055bf6a6c3c 100644 --- a/sw/qa/core/layout-test.cxx +++ b/sw/qa/core/layout-test.cxx @@ -56,7 +56,7 @@ class SwLayoutTest : public test::BootstrapFixture, public unotest::MacrosTest public: SwLayoutTest(); - void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath); + void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); virtual void setUp(); virtual void tearDown(); @@ -71,13 +71,13 @@ public: private: uno::Reference m_xWriterComponent; - ::rtl::OUString m_aBaseString; + OUString m_aBaseString; }; -void SwLayoutTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) +void SwLayoutTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { - rtl::OUString aSep("/"); - rtl::OUStringBuffer aBuffer( getSrcRootURL() ); + OUString aSep("/"); + OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); rFilePath = aBuffer.makeStringAndClear(); @@ -85,9 +85,9 @@ void SwLayoutTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUSt void SwLayoutTest::test() { - rtl::OUString aFilePath; - rtl::OUString aFileBase("test."); - rtl::OUString aExtension("odt"); + OUString aFilePath; + OUString aFileBase("test."); + OUString aExtension("odt"); createFileURL(aFileBase, aExtension, aFilePath); uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFilePath, "com.sun.star.text.TextDocument"); CPPUNIT_ASSERT(xComponent.is()); @@ -106,7 +106,7 @@ void SwLayoutTest::setUp() // This is a bit of a fudge, we do this to ensure that SwGlobals::ensure, // which is a private symbol to us, gets called m_xWriterComponent = - getMultiServiceFactory()->createInstance(rtl::OUString( + getMultiServiceFactory()->createInstance(OUString( "com.sun.star.comp.Writer.TextDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is()); mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 70a431a4faa5..bb1b33540b4b 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -73,10 +73,10 @@ class SwMacrosTest : public test::BootstrapFixture, public unotest::MacrosTest public: SwMacrosTest(); - SwDocShellRef load(const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData, const rtl::OUString& rTypeName, sal_uLong nFormatType=0); + SwDocShellRef load(const OUString &rFilter, const OUString &rURL, + const OUString &rUserData, const OUString& rTypeName, sal_uLong nFormatType=0); - void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath); + void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); virtual void setUp(); virtual void tearDown(); @@ -97,13 +97,13 @@ public: private: uno::Reference m_xWriterComponent; - ::rtl::OUString m_aBaseString; + OUString m_aBaseString; }; -void SwMacrosTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) +void SwMacrosTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { - rtl::OUString aSep("/"); - rtl::OUStringBuffer aBuffer( getSrcRootURL() ); + OUString aSep("/"); + OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); rFilePath = aBuffer.makeStringAndClear(); @@ -113,15 +113,15 @@ void SwMacrosTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUSt void SwMacrosTest::testStarBasic() { - const rtl::OUString aFileNameBase("StarBasic."); - rtl::OUString aFileExtension(aFileFormats[0].pName, strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 ); - rtl::OUString aFileName; + const OUString aFileNameBase("StarBasic."); + OUString aFileExtension(aFileFormats[0].pName, strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 ); + OUString aFileName; createFileURL(aFileNameBase, aFileExtension, aFileName); uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.text.TextDocument"); CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is()); - rtl::OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"); + OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"); String sUrl = aURL; Any aRet; Sequence< sal_Int16 > aOutParamIndex; @@ -142,19 +142,19 @@ void SwMacrosTest::testVba() { TestMacroInfo testInfo[] = { { - rtl::OUString("testVba."), - rtl::OUString("vnd.sun.Star.script:Project.NewMacros.Macro1?language=Basic&location=document") + OUString("testVba."), + OUString("vnd.sun.Star.script:Project.NewMacros.Macro1?language=Basic&location=document") } }; - rtl::OUString aFileExtension( "doc" ); + OUString aFileExtension( "doc" ); for ( sal_uInt32 i=0; i xComponent = loadFromDesktop(aFileName, "com.sun.star.text.TextDocument"); - rtl::OUStringBuffer sMsg( rtl::OUString("Failed to load ") ); + OUStringBuffer sMsg( OUString("Failed to load ") ); sMsg.append ( aFileName ); - CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() ); + CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() ); String sUrl = testInfo[i].sMacroUrl; Any aRet; @@ -166,9 +166,9 @@ void SwMacrosTest::testVba() CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam); - rtl::OUString aStringRes; + OUString aStringRes; aRet >>= aStringRes; - std::cout << "value of Ret " << rtl::OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cout << "value of Ret " << OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; //CPPUNIT_ASSERT_MESSAGE( "script reported failure",aStringRes == "OK" ); pFoundShell->DoClose(); } @@ -219,7 +219,7 @@ void SwMacrosTest::setUp() // This is a bit of a fudge, we do this to ensure that SwGlobals::ensure, // which is a private symbol to us, gets called m_xWriterComponent = - getMultiServiceFactory()->createInstance(rtl::OUString( + getMultiServiceFactory()->createInstance(OUString( "com.sun.star.comp.Writer.TextDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is()); mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 7d590f5efe37..26dded0682a2 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -121,7 +121,7 @@ void SwDocTest::testPageDescName() { ShellResource aShellResources; - std::vector aResults; + std::vector aResults; //These names must be unique for each different combination, otherwise //duplicate page description names may exist, which will causes lookup @@ -141,7 +141,7 @@ void SwDocTest::testFileNameFields() { //Here's a file name with some chars in it that will be %% encoded, when expanding //SwFileNameFields we want to restore the original readable filename - utl::TempFile aTempFile(rtl::OUString("demo [name]")); + utl::TempFile aTempFile(OUString("demo [name]")); aTempFile.EnableKillingFile(); INetURLObject aTempFileURL(aTempFile.GetURL()); @@ -149,9 +149,9 @@ void SwDocTest::testFileNameFields() SfxMedium aDstMed(sFileURL, STREAM_STD_READWRITE); SfxFilter aFilter( - rtl::OUString("Text"), - rtl::OUString(), 0, 0, rtl::OUString(), 0, rtl::OUString(), - rtl::OUString("TEXT"), rtl::OUString() ); + OUString("Text"), + OUString(), 0, 0, OUString(), 0, OUString(), + OUString("TEXT"), OUString() ); aDstMed.SetFilter(&aFilter); m_xDocShRef->DoSaveAs(aDstMed); @@ -162,29 +162,29 @@ void SwDocTest::testFileNameFields() SwFileNameFieldType aNameField(m_pDoc); { - rtl::OUString sResult(aNameField.Expand(FF_NAME)); - rtl::OUString sExpected(rUrlObj.getName(INetURLObject::LAST_SEGMENT, + OUString sResult(aNameField.Expand(FF_NAME)); + OUString sExpected(rUrlObj.getName(INetURLObject::LAST_SEGMENT, true,INetURLObject::DECODE_WITH_CHARSET)); CPPUNIT_ASSERT_MESSAGE("Expected Readable FileName", sResult == sExpected); } { - rtl::OUString sResult(aNameField.Expand(FF_PATHNAME)); - rtl::OUString sExpected(rUrlObj.GetFull()); + OUString sResult(aNameField.Expand(FF_PATHNAME)); + OUString sExpected(rUrlObj.GetFull()); CPPUNIT_ASSERT_MESSAGE("Expected Readable FileName", sResult == sExpected); } { - rtl::OUString sResult(aNameField.Expand(FF_PATH)); + OUString sResult(aNameField.Expand(FF_PATH)); INetURLObject aTemp(rUrlObj); aTemp.removeSegment(); - rtl::OUString sExpected(aTemp.PathToFileName()); + OUString sExpected(aTemp.PathToFileName()); CPPUNIT_ASSERT_MESSAGE("Expected Readable FileName", sResult == sExpected); } { - rtl::OUString sResult(aNameField.Expand(FF_NAME_NOEXT)); - rtl::OUString sExpected(rUrlObj.getName(INetURLObject::LAST_SEGMENT, + OUString sResult(aNameField.Expand(FF_NAME_NOEXT)); + OUString sExpected(rUrlObj.getName(INetURLObject::LAST_SEGMENT, true,INetURLObject::DECODE_WITH_CHARSET)); //Chop off .tmp sExpected = sExpected.copy(0, sExpected.getLength() - 4); @@ -204,7 +204,7 @@ void SwDocTest::testDocStat() SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -1); SwPaM aPaM(aIdx); - rtl::OUString sText("Hello World"); + OUString sText("Hello World"); m_pDoc->InsertString(aPaM, sText); CPPUNIT_ASSERT_MESSAGE("Should still be non-updated 0 count", m_pDoc->GetDocStat().nChar == 0); @@ -227,14 +227,14 @@ void SwDocTest::testUserPerceivedCharCount() //Grapheme example, two different unicode code-points perceived by the user as a single //glyph const sal_Unicode ALEF_QAMATS [] = { 0x05D0, 0x05B8 }; - ::rtl::OUString sALEF_QAMATS(ALEF_QAMATS, SAL_N_ELEMENTS(ALEF_QAMATS)); + OUString sALEF_QAMATS(ALEF_QAMATS, SAL_N_ELEMENTS(ALEF_QAMATS)); sal_Int32 nGraphemeCount = pBreakIter->getGraphemeCount(sALEF_QAMATS); CPPUNIT_ASSERT_MESSAGE("Grapheme Count should be 1", nGraphemeCount == 1); //Surrogate pair example, one single unicode code-point (U+1D11E) //represented as two code units in UTF-16 const sal_Unicode GCLEF[] = { 0xD834, 0xDD1E }; - ::rtl::OUString sGCLEF(GCLEF, SAL_N_ELEMENTS(GCLEF)); + OUString sGCLEF(GCLEF, SAL_N_ELEMENTS(GCLEF)); sal_Int32 nCount = pBreakIter->getGraphemeCount(sGCLEF); CPPUNIT_ASSERT_MESSAGE("Surrogate Pair should be counted as single character", nCount == 1); } @@ -246,17 +246,17 @@ void SwDocTest::testModelToViewHelper() { SwFmtFtn aFtn; - aFtn.SetNumStr(rtl::OUString("foo")); + aFtn.SetNumStr(OUString("foo")); m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, rtl::OUString("AAAAA BBBBB ")); + m_pDoc->InsertString(aPaM, OUString("AAAAA BBBBB ")); SwTxtNode* pTxtNode = aPaM.GetNode()->GetTxtNode(); xub_StrLen nPos = aPaM.GetPoint()->nContent.GetIndex(); pTxtNode->InsertItem(aFtn, nPos, nPos); - m_pDoc->InsertString(aPaM, rtl::OUString(" CCCCC ")); + m_pDoc->InsertString(aPaM, OUString(" CCCCC ")); nPos = aPaM.GetPoint()->nContent.GetIndex(); pTxtNode->InsertItem(aFtn, nPos, nPos); - m_pDoc->InsertString(aPaM, rtl::OUString(" DDDDD")); + m_pDoc->InsertString(aPaM, OUString(" DDDDD")); CPPUNIT_ASSERT(pTxtNode->GetTxt().getLength() == (4*5) + 5 + 2); //set start of selection to first B @@ -282,21 +282,21 @@ void SwDocTest::testModelToViewHelper() { ModelToViewHelper aModelToViewHelper(*pTxtNode, PASSTHROUGH); - rtl::OUString sViewText = aModelToViewHelper.getViewText(); - rtl::OUString sModelText = pTxtNode->GetTxt(); + OUString sViewText = aModelToViewHelper.getViewText(); + OUString sModelText = pTxtNode->GetTxt(); CPPUNIT_ASSERT(sViewText == sModelText); } { ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS); - rtl::OUString sViewText = aModelToViewHelper.getViewText(); + OUString sViewText = aModelToViewHelper.getViewText(); CPPUNIT_ASSERT(sViewText == "AAAAA BBBBB foo CCCCC foo DDDDD"); } { ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEINVISIBLE); - rtl::OUString sViewText = aModelToViewHelper.getViewText(); - rtl::OUStringBuffer aBuffer; + OUString sViewText = aModelToViewHelper.getViewText(); + OUStringBuffer aBuffer; aBuffer.append("AAAAA CCCCC "); aBuffer.append(CH_TXTATR_BREAKWORD); aBuffer.append(" DDDDD"); @@ -305,8 +305,8 @@ void SwDocTest::testModelToViewHelper() { ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEREDLINED); - rtl::OUString sViewText = aModelToViewHelper.getViewText(); - rtl::OUStringBuffer aBuffer; + OUString sViewText = aModelToViewHelper.getViewText(); + OUStringBuffer aBuffer; aBuffer.append("AAAABB "); aBuffer.append(CH_TXTATR_BREAKWORD); aBuffer.append(" CCCCC "); @@ -317,20 +317,20 @@ void SwDocTest::testModelToViewHelper() { ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEINVISIBLE); - rtl::OUString sViewText = aModelToViewHelper.getViewText(); + OUString sViewText = aModelToViewHelper.getViewText(); CPPUNIT_ASSERT(sViewText == "AAAAA CCCCC foo DDDDD"); } { ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEREDLINED); - rtl::OUString sViewText = aModelToViewHelper.getViewText(); + OUString sViewText = aModelToViewHelper.getViewText(); CPPUNIT_ASSERT(sViewText == "AAAABB foo CCCCC foo DDDDD"); } { ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEINVISIBLE | HIDEREDLINED); - rtl::OUString sViewText = aModelToViewHelper.getViewText(); - rtl::OUStringBuffer aBuffer; + OUString sViewText = aModelToViewHelper.getViewText(); + OUStringBuffer aBuffer; aBuffer.append("AAAACCCCC "); aBuffer.append(CH_TXTATR_BREAKWORD); aBuffer.append(" DDDDD"); @@ -339,7 +339,7 @@ void SwDocTest::testModelToViewHelper() { ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEINVISIBLE | HIDEREDLINED); - rtl::OUString sViewText = aModelToViewHelper.getViewText(); + OUString sViewText = aModelToViewHelper.getViewText(); CPPUNIT_ASSERT(sViewText == "AAAACCCCC foo DDDDD"); } } @@ -356,23 +356,23 @@ void SwDocTest::testSwScanner() //See https://bugs.freedesktop.org/show_bug.cgi?id=40449 //See https://bugs.freedesktop.org/show_bug.cgi?id=39365 - //Use a temporary rtl::OUString as the arg, as that's the trouble behind + //Use a temporary OUString as the arg, as that's the trouble behind //fdo#40449 and fdo#39365 { SwScanner aScanner(*pTxtNode, - rtl::OUString("Hello World"), + OUString("Hello World"), 0, ModelToViewHelper(), i18n::WordType::DICTIONARY_WORD, 0, RTL_CONSTASCII_LENGTH("Hello World")); bool bFirstOk = aScanner.NextWord(); CPPUNIT_ASSERT_MESSAGE("First Token", bFirstOk); - const rtl::OUString &rHello = aScanner.GetWord(); + const OUString &rHello = aScanner.GetWord(); CPPUNIT_ASSERT_MESSAGE("Should be Hello", rHello == "Hello"); bool bSecondOk = aScanner.NextWord(); CPPUNIT_ASSERT_MESSAGE("Second Token", bSecondOk); - const rtl::OUString &rWorld = aScanner.GetWord(); + const OUString &rWorld = aScanner.GetWord(); CPPUNIT_ASSERT_MESSAGE("Should be World", rWorld == "World"); } @@ -381,7 +381,7 @@ void SwDocTest::testSwScanner() { const sal_Unicode IDEOGRAPHICFULLSTOP_D[] = { 0x3002, 'D' }; - m_pDoc->InsertString(aPaM, rtl::OUString(IDEOGRAPHICFULLSTOP_D, + m_pDoc->InsertString(aPaM, OUString(IDEOGRAPHICFULLSTOP_D, SAL_N_ELEMENTS(IDEOGRAPHICFULLSTOP_D))); SvxLanguageItem aCJKLangItem( LANGUAGE_CHINESE_SIMPLIFIED, RES_CHRATR_CJK_LANGUAGE ); @@ -417,7 +417,7 @@ void SwDocTest::testSwScanner() 0x0069, 0x0073, 0x0020, 0x0064, 0x006F, 0x003F, 0x0020, 0x0020 }; m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, rtl::OUString(test, + m_pDoc->InsertString(aPaM, OUString(test, SAL_N_ELEMENTS(test))); SvxLanguageItem aCJKLangItem( LANGUAGE_JAPANESE, RES_CHRATR_CJK_LANGUAGE ); @@ -446,7 +446,7 @@ void SwDocTest::testSwScanner() }; m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, rtl::OUString(aShouldBeThree, SAL_N_ELEMENTS(aShouldBeThree))); + m_pDoc->InsertString(aPaM, OUString(aShouldBeThree, SAL_N_ELEMENTS(aShouldBeThree))); pTxtNode = aPaM.GetNode()->GetTxtNode(); pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeThree)); CPPUNIT_ASSERT_MESSAGE("Should be 3", aDocStat.nWord == 3); @@ -463,7 +463,7 @@ void SwDocTest::testSwScanner() }; m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, rtl::OUString(aShouldBeFive, SAL_N_ELEMENTS(aShouldBeFive))); + m_pDoc->InsertString(aPaM, OUString(aShouldBeFive, SAL_N_ELEMENTS(aShouldBeFive))); pTxtNode = aPaM.GetNode()->GetTxtNode(); aDocStat.Reset(); pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive)); @@ -475,11 +475,11 @@ void SwDocTest::testSwScanner() SwDocStat aDocStat; m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, rtl::OUString("Apple")); + m_pDoc->InsertString(aPaM, OUString("Apple")); pTxtNode = aPaM.GetNode()->GetTxtNode(); xub_StrLen nPos = aPaM.GetPoint()->nContent.GetIndex(); SwFmtFtn aFtn; - aFtn.SetNumStr(rtl::OUString("banana")); + aFtn.SetNumStr(OUString("banana")); SwTxtAttr* pTA = pTxtNode->InsertItem(aFtn, nPos, nPos); CPPUNIT_ASSERT(pTA); CPPUNIT_ASSERT(pTxtNode->Len() == 6); //Apple + 0x02 @@ -489,7 +489,7 @@ void SwDocTest::testSwScanner() xub_StrLen nNextPos = aPaM.GetPoint()->nContent.GetIndex(); CPPUNIT_ASSERT(nNextPos == nPos+1); - SwFmtRefMark aRef(rtl::OUString("refmark")); + SwFmtRefMark aRef(OUString("refmark")); pTA = pTxtNode->InsertItem(aRef, nNextPos, nNextPos); CPPUNIT_ASSERT(pTA); @@ -500,15 +500,15 @@ void SwDocTest::testSwScanner() CPPUNIT_ASSERT_MESSAGE("refmark anchor should not be counted", aDocStat.nChar == 11); m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, rtl::OUString("Apple")); + m_pDoc->InsertString(aPaM, OUString("Apple")); DateTime aDate(DateTime::SYSTEM); SwPostItField aPostIt( - (SwPostItFieldType*)m_pDoc->GetSysFldType(RES_POSTITFLD), rtl::OUString("An Author"), - rtl::OUString("Some Text"), rtl::OUString("Initials"), OUString("Name"), aDate ); + (SwPostItFieldType*)m_pDoc->GetSysFldType(RES_POSTITFLD), OUString("An Author"), + OUString("Some Text"), OUString("Initials"), OUString("Name"), aDate ); m_pDoc->InsertPoolItem(aPaM, SwFmtFld(aPostIt), 0); - m_pDoc->InsertString(aPaM, rtl::OUString("Apple")); + m_pDoc->InsertString(aPaM, OUString("Apple")); pTxtNode = aPaM.GetNode()->GetTxtNode(); aDocStat.Reset(); pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); @@ -525,7 +525,7 @@ void SwDocTest::testSwScanner() const char aString[] = "Lorem ipsum"; m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, rtl::OUString(aString)); + m_pDoc->InsertString(aPaM, OUString(aString)); pTxtNode = aPaM.GetNode()->GetTxtNode(); pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast(2)); @@ -558,7 +558,7 @@ void SwDocTest::testSwScanner() pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //but word-counting the text should only count the non-deleted text CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast(1)); - rtl::OUString sLorem = pTxtNode->GetTxt(); + OUString sLorem = pTxtNode->GetTxt(); CPPUNIT_ASSERT(sLorem == "Lorem"); const SwRedlineTbl& rTbl = m_pDoc->GetRedlineTbl(); @@ -572,7 +572,7 @@ void SwDocTest::testSwScanner() pTxtNode = rNds[ pNodeIdx->GetIndex() + 1 ]->GetTxtNode(); //first deleted txtnode CPPUNIT_ASSERT(pTxtNode); - rtl::OUString sIpsum = pTxtNode->GetTxt(); + OUString sIpsum = pTxtNode->GetTxt(); CPPUNIT_ASSERT(sIpsum == " ipsum"); aDocStat.Reset(); @@ -585,7 +585,7 @@ void SwDocTest::testSwScanner() { SwDocStat aDocStat; - rtl::OUString sTemplate("ThisXis a test."); + OUString sTemplate("ThisXis a test."); m_pDoc->AppendTxtNode(*aPaM.GetPoint()); m_pDoc->InsertString(aPaM, sTemplate.replace('X', ' ')); @@ -597,7 +597,7 @@ void SwDocTest::testSwScanner() aDocStat.Reset(); m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, sTemplate.replaceAll(rtl::OUString('X'), rtl::OUString(" = "))); + m_pDoc->InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" = "))); pTxtNode = aPaM.GetNode()->GetTxtNode(); pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); CPPUNIT_ASSERT(aDocStat.nWord == 5 && @@ -606,7 +606,7 @@ void SwDocTest::testSwScanner() aDocStat.Reset(); m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, sTemplate.replaceAll(rtl::OUString('X'), rtl::OUString(" _ "))); + m_pDoc->InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" _ "))); pTxtNode = aPaM.GetNode()->GetTxtNode(); pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); CPPUNIT_ASSERT(aDocStat.nWord == 5 && @@ -615,7 +615,7 @@ void SwDocTest::testSwScanner() aDocStat.Reset(); m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, sTemplate.replaceAll(rtl::OUString('X'), rtl::OUString(" -- "))); + m_pDoc->InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" -- "))); pTxtNode = aPaM.GetNode()->GetTxtNode(); pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); CPPUNIT_ASSERT(aDocStat.nWord == 5 && @@ -680,9 +680,9 @@ void SwDocTest::testSwScanner() aDocStat.Reset(); const sal_Unicode aChunk[] = {' ', 0x2013, ' '}; - rtl::OUString sChunk(aChunk, SAL_N_ELEMENTS(aChunk)); + OUString sChunk(aChunk, SAL_N_ELEMENTS(aChunk)); m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, sTemplate.replaceAll(rtl::OUString('X'), sChunk)); + m_pDoc->InsertString(aPaM, sTemplate.replaceAll(OUString('X'), sChunk)); pTxtNode = aPaM.GetNode()->GetTxtNode(); pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); CPPUNIT_ASSERT(aDocStat.nWord == 4 && @@ -700,14 +700,14 @@ void SwDocTest::testGraphicAnchorDeletion() SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -1); SwPaM aPaM(aIdx); - m_pDoc->InsertString(aPaM, rtl::OUString("Paragraph 1")); + m_pDoc->InsertString(aPaM, OUString("Paragraph 1")); m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, rtl::OUString("graphic anchor>><InsertString(aPaM, OUString("graphic anchor>><nNode; m_pDoc->AppendTxtNode(*aPaM.GetPoint()); - m_pDoc->InsertString(aPaM, rtl::OUString("Paragraph 3")); + m_pDoc->InsertString(aPaM, OUString("Paragraph 3")); aPaM.GetPoint()->nNode = nPara2; aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), RTL_CONSTASCII_LENGTH("graphic anchor>>")); @@ -717,7 +717,7 @@ void SwDocTest::testGraphicAnchorDeletion() SwFmtAnchor aAnchor(FLY_AS_CHAR); aAnchor.SetAnchor(aPaM.GetPoint()); aFlySet.Put(aAnchor); - SwFlyFrmFmt *pFrame = m_pDoc->Insert(aPaM, rtl::OUString(), rtl::OUString(), NULL, &aFlySet, NULL, NULL); + SwFlyFrmFmt *pFrame = m_pDoc->Insert(aPaM, OUString(), OUString(), NULL, &aFlySet, NULL, NULL); CPPUNIT_ASSERT_MESSAGE("Expected frame", pFrame != NULL); CPPUNIT_ASSERT_MESSAGE("Should be 1 graphic", m_pDoc->GetFlyCount(FLYCNTTYPE_GRF) == 1); @@ -733,7 +733,7 @@ void SwDocTest::testGraphicAnchorDeletion() #ifdef DEBUG_AS_HTML { - SvFileStream aPasteDebug(rtl::OUString("cppunitDEBUG.html"), STREAM_WRITE|STREAM_TRUNC); + SvFileStream aPasteDebug(OUString("cppunitDEBUG.html"), STREAM_WRITE|STREAM_TRUNC); WriterRef xWrt; GetHTMLWriter( String(), String(), xWrt ); SwWriter aDbgWrt( aPasteDebug, *m_pDoc ); @@ -756,15 +756,15 @@ getRand(int modulus) return rand() % modulus; } -static rtl::OUString +static OUString getRandString() { - rtl::OUString aText("AAAAA BBBB CCC DD E \n"); + OUString aText("AAAAA BBBB CCC DD E \n"); int s = getRand(aText.getLength()); int j = getRand(aText.getLength() - s); - rtl::OUString aRet(aText.copy(s, j)); + OUString aRet(aText.copy(s, j)); if (!getRand(5)) - aRet += rtl::OUString(sal_Unicode('\n')); + aRet += OUString(sal_Unicode('\n')); // fprintf (stderr, "rand string '%s'\n", OUStringToOString(aRet, RTL_TEXTENCODING_UTF8).getStr()); return aRet; } @@ -805,7 +805,7 @@ void SwDocTest::randomTest() // setup redlining m_pDoc->SetRedlineMode(modes[rlm]); - SW_MOD()->SetRedlineAuthor(rtl::OUString::createFromAscii(authors[0])); + SW_MOD()->SetRedlineAuthor(OUString::createFromAscii(authors[0])); for( int i = 0; i < 2000; i++ ) { @@ -825,7 +825,7 @@ void SwDocTest::randomTest() break; case 2: { // switch author int a = getRand(SAL_N_ELEMENTS(authors)); - SW_MOD()->SetRedlineAuthor(rtl::OUString::createFromAscii(authors[a])); + SW_MOD()->SetRedlineAuthor(OUString::createFromAscii(authors[a])); break; } @@ -872,7 +872,7 @@ void SwDocTest::randomTest() // Debug / verify the produced document has real content #if 0 - rtl::OStringBuffer aBuffer("nodes-"); + OStringBuffer aBuffer("nodes-"); aBuffer.append(sal_Int32(rlm)); aBuffer.append(".xml"); diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index e265e125a703..86547b8848ad 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -141,7 +141,7 @@ protected: * * If the attribute is omitted, the text of the node is returned. */ - OUString parseDump(rtl::OString aXPath, rtl::OString aAttribute = OString()) + OUString parseDump(OString aXPath, OString aAttribute = OString()) { if (!mpXmlBuffer) dumpLayout(); diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 8ac279b4e555..5cd3ba1c956c 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; using namespace sw::access; const sal_Char sServiceName[] = "com.sun.star.table.AccessibleCellView"; diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index d62e21c13727..88e2f4948efc 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -55,25 +55,25 @@ public: // XAccessibleContext /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); // XServiceInfo // Returns an identifier for the implementation of this object. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); // Returns a list of all supported services. In this case that is just // the AccessibleContext service. - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 80e3c4d570a0..e80e97b91cb0 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -49,7 +49,6 @@ using namespace sw::access; using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; void SwAccessibleContext::InitStates() { diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 18476894e3e5..78981f851050 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -43,7 +43,6 @@ const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDoc using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; using lang::IndexOutOfBoundsException; diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 617bebfe43f7..ed2b160aab21 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -72,7 +72,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); // XAccessibleComponent @@ -126,18 +126,18 @@ public: // XServiceInfo // Returns an identifier for the implementation of this object. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); // Returns a list of all supported services. In this case that is just // the AccessibleContext service. - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 3f480b958530..899443878938 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextEmbeddedObject"; const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleEmbeddedObject"; diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx index 402b757cdffd..5341a4e4c678 100644 --- a/sw/source/core/access/accembedded.hxx +++ b/sw/source/core/access/accembedded.hxx @@ -35,18 +35,18 @@ public: // XServiceInfo // Returns an identifier for the implementation of this object. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); // Returns a list of all supported services. In this case that is just // the AccessibleContext service. - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index e289450fb6b3..5556dacf1ed8 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; const sal_Char sServiceNameFootnote[] = "com.sun.star.text.AccessibleFootnoteView"; const sal_Char sServiceNameEndnote[] = "com.sun.star.text.AccessibleEndnoteView"; diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index 123c32ebe455..316ce6d5b59b 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -44,25 +44,25 @@ public: // XAccessibleContext /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); // XServiceInfo /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index c688991413f5..4953bb3acb5f 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; sal_Bool SwAccessibleFrameBase::IsSelected() { diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index 58beaff334de..d5abfff1efed 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextGraphicObject"; const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleGraphic"; diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx index a7595313cecb..8e1eff5112bf 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -35,18 +35,18 @@ public: // XServiceInfo /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index 079d7b403616..862a7a86e9e6 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; const sal_Char sServiceNameHeader[] = "com.sun.star.text.AccessibleHeaderView"; const sal_Char sServiceNameFooter[] = "com.sun.star.text.AccessibleFooterView"; diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index deb6d148947a..81ec1099c53b 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -41,25 +41,25 @@ public: // XAccessibleContext /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); // XServiceInfo /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index 3d0a05d1b5bf..75e227c49c01 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; SwAccessibleHyperlink::SwAccessibleHyperlink( sal_uInt16 nHPos, SwAccessibleParagraph *p, sal_Int32 nStt, sal_Int32 nEnd ) : diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx index e23c5d2bb809..28f11652a77c 100644 --- a/sw/source/core/access/acchyperlink.hxx +++ b/sw/source/core/access/acchyperlink.hxx @@ -52,7 +52,7 @@ public: virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription( + virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 68eba19b837a..54359617c343 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -66,7 +66,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; using namespace ::sw::access; struct SwFrmFunc diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 98cb88759698..1cbf2f6b7ec9 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; const SwNoTxtNode *SwAccessibleNoTextFrame::GetNoTxtNode() const { diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index 19329fc577c1..d41a7d5533ab 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -28,8 +28,8 @@ class SwAccessibleNoTextFrame : public SwAccessibleFrameBase, public ::com::sun::star::accessibility::XAccessibleImage { SwDepend aDepend; - ::rtl::OUString msTitle; // #i73249# - ::rtl::OUString msDesc; + OUString msTitle; // #i73249# + OUString msDesc; protected: @@ -48,12 +48,12 @@ public: // XAccessibleContext // #i73249# - Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); @@ -75,7 +75,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // XAccessibleImage - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleImageDescription( ) throw ( ::com::sun::star::uno::RuntimeException ); diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index 861e557bbb50..287ba7be6423 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::accessibility; using uno::Reference; using uno::RuntimeException; using uno::Sequence; -using ::rtl::OUString; const sal_Char sServiceName[] = "com.sun.star.text.AccessiblePageView"; diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index 077c567e1ab3..aa0c6b927783 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -59,17 +59,17 @@ public: // XAccessibleContext methods that need to be overridden - virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) + virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName (void) + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService ( - const ::rtl::OUString& sServiceName) + const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index a1b426e2cc3d..ba8e5e2c72d7 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -44,10 +44,10 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleHyperlink; } } } } -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, ::com::sun::star::beans::PropertyValue, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > tAccParaPropValMap; + OUStringHash, + ::std::equal_to< OUString > > tAccParaPropValMap; class SwAccessibleParagraph : public SwClient, // #i108125# @@ -61,7 +61,7 @@ class SwAccessibleParagraph : { friend class SwAccessibleHyperlink; - ::rtl::OUString sDesc; // protected by base classes mutex + OUString sDesc; // protected by base classes mutex // data for this paragraph's text portions; this contains the // mapping from the core 'model string' to the accessible text @@ -86,9 +86,9 @@ class SwAccessibleParagraph : const SwTxtNode* GetTxtNode() const; /// get the (accessible) text string (requires frame; check before) - ::rtl::OUString GetString(); + OUString GetString(); - ::rtl::OUString GetDescription(); + OUString GetDescription(); // get the current care position sal_Int32 GetCaretPos(); @@ -133,12 +133,12 @@ class SwAccessibleParagraph : // #i63870# void _getDefaultAttributesImpl( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes, + const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes, tAccParaPropValMap& rDefAttrSeq, const bool bOnlyCharAttrs = false ); void _getRunAttributesImpl( const sal_Int32 nIndex, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes, + const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes, tAccParaPropValMap& rRunAttrSeq ); public: @@ -183,31 +183,31 @@ protected: //helpers for word boundaries sal_Bool GetCharBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetWordBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetSentenceBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetLineBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetParagraphBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetAttributeBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); sal_Bool GetGlyphBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos ); // get boundaries of word/sentence/etc. for specified text type // Does all argument checking, and then delegates to helper methods above. sal_Bool GetTextBoundary( com::sun::star::i18n::Boundary& rBound, - const rtl::OUString& rText, + const OUString& rText, sal_Int32 nPos, sal_Int16 aTextType ) throw ( @@ -229,7 +229,7 @@ public: // XAccessibleContext // Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); @@ -258,18 +258,18 @@ public: // XServiceInfo // Returns an identifier for the implementation of this object. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); // Returns a list of all supported services. In this case that is just // the AccessibleContext service. - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -298,16 +298,16 @@ public: virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -317,10 +317,10 @@ public: virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL insertText( const ::rtl::OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::rtl::OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setText( const ::rtl::OUString& sText ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( @@ -401,8 +401,8 @@ public: // #i63870# // XAccesibleTextAttributes - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); }; inline SwAccessibleParagraph::operator ::com::sun::star::accessibility::XAccessibleText *() diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index 1720053da77b..ecda713ac17f 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -54,8 +54,6 @@ using namespace ::com::sun::star; -using rtl::OUString; -using rtl::OUStringBuffer; using i18n::Boundary; // 'portion type' for terminating portions diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index 021b338813a9..7b4fcd597a50 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -40,13 +40,13 @@ class SwAccessiblePortionData : public SwPortionHandler const SwTxtNode* pTxtNode; // variables used while collecting the data - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; sal_Int32 nModelPosition; sal_Bool bFinished; const SwViewOption* pViewOptions; // the accessible string - rtl::OUString sAccessibleString; + OUString sAccessibleString; // positions array // instances of Position_t must always include the minimum and @@ -104,7 +104,7 @@ public: // access to the portion data /// get the text string, as presented by the layout - const rtl::OUString& GetAccessibleString() const; + const OUString& GetAccessibleString() const; /// get the start & end positions of the sentence void GetLineBoundary( com::sun::star::i18n::Boundary& rBound, diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 79a496eefac6..9eeb588d1b9d 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -29,7 +29,6 @@ const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDoc using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; // SwAccessiblePreview diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index c699054ea7a8..f699ce931b98 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -43,20 +43,20 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index d7258858a36c..8992690826ec 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -49,8 +49,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::sw::access; const sal_Char sServiceName[] = "com.sun.star.table.AccessibleTableView"; diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 3db34e492382..36a91b0544da 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -39,7 +39,7 @@ class SwAccessibleTable : public SwClient { SwAccessibleTableData_Impl *mpTableData; // the table's data, prot by Sol-Mutex - ::rtl::OUString sDesc; + OUString sDesc; const SwSelBoxes *GetSelBoxes() const; void FireTableChangeEvent( const SwAccessibleTableData_Impl& rTableData ); @@ -60,7 +60,7 @@ protected: virtual ~SwAccessibleTable(); // #i77106# - inline void SetDesc( ::rtl::OUString sNewDesc ) + inline void SetDesc( OUString sNewDesc ) { sDesc = sNewDesc; } @@ -108,7 +108,7 @@ public: //===== XAccessibleContext ============================================== /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); @@ -118,11 +118,11 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -186,20 +186,20 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); @@ -311,7 +311,7 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 10f9b513bd01..17e1a42cfbbe 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -using ::rtl::OUString; using utl::AccessibleRelationSetHelper; using ::com::sun::star::accessibility::XAccessibleContext; diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index e81a2f0d2661..7d6b13eb3dda 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -30,8 +30,8 @@ class SwAccessibleTextFrame : public SwAccessibleFrameBase { private: // #i73249# - ::rtl::OUString msTitle; - ::rtl::OUString msDesc; + OUString msTitle; + OUString msDesc; protected: @@ -46,11 +46,11 @@ public: //===== XAccessibleContext ============================================== // #i73249# - Return the object's current name. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); /// Return this object's description. - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException); @@ -58,20 +58,20 @@ public: /** Returns an identifier for the implementation of this object. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) + supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx index 70d5b97ef3f8..b20e7894416e 100644 --- a/sw/source/core/access/parachangetrackinginfo.cxx +++ b/sw/source/core/access/parachangetrackinginfo.cxx @@ -135,7 +135,7 @@ namespace { ? nTxtFrmTextEndPos : nTxtNodeChangeTrackEnd; - pMarkupList->Insert( rtl::OUString(), 0, + pMarkupList->Insert( OUString(), 0, nTxtFrmChangeTrackStart, nTxtFrmChangeTrackEnd - nTxtFrmChangeTrackStart, pMarkupList->Count() ); diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx index a7118d32108f..c3aa81a79a4b 100644 --- a/sw/source/core/access/textmarkuphelper.cxx +++ b/sw/source/core/access/textmarkuphelper.cxx @@ -136,7 +136,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp pTextMarkupList->GetElement( static_cast(nTextMarkupIndex) ); if ( pTextMarkup ) { - const ::rtl::OUString rText = mrPortionData.GetAccessibleString(); + const OUString rText = mrPortionData.GetAccessibleString(); const sal_Int32 nStartPos = mrPortionData.GetAccessiblePosition( pTextMarkup->mnPos ); const sal_Int32 nEndPos = @@ -180,7 +180,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp ::std::vector< ::com::sun::star::accessibility::TextSegment > aTmpTextMarkups; if ( pTextMarkupList ) { - const ::rtl::OUString rText = mrPortionData.GetAccessibleString(); + const OUString rText = mrPortionData.GetAccessibleString(); const sal_uInt16 nTextMarkupCount = pTextMarkupList->Count(); for ( sal_uInt16 nTextMarkupIdx = 0; nTextMarkupIdx < nTextMarkupCount; ++nTextMarkupIdx ) diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index fe0de02476e2..bdf8b003e7a7 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -41,7 +41,7 @@ // ---------- SwAttrPool::SwAttrPool( SwDoc* pD ) - : SfxItemPool( rtl::OUString("SWG"), + : SfxItemPool( OUString("SWG"), POOLATTR_BEGIN, POOLATTR_END-1, aSlotTab, aAttrTab ), pDoc( pD ) diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx index 10a53fa2ae2a..4dc6242326f5 100644 --- a/sw/source/core/bastyp/breakit.cxx +++ b/sw/source/core/bastyp/breakit.cxx @@ -95,7 +95,7 @@ void SwBreakIt::_GetForbidden( const LanguageType aLang ) m_pForbidden = new i18n::ForbiddenCharacters( aWrap.getForbiddenCharacters() ); } -sal_uInt16 SwBreakIt::GetRealScriptOfText( const rtl::OUString& rTxt, sal_Int32 nPos ) const +sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const { createBreakIterator(); sal_uInt16 nScript = i18n::ScriptType::WEAK; @@ -137,7 +137,7 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const rtl::OUString& rTxt, sal_Int32 return nScript; } -sal_uInt16 SwBreakIt::GetAllScriptsOfText( const rtl::OUString& rTxt ) const +sal_uInt16 SwBreakIt::GetAllScriptsOfText( const OUString& rTxt ) const { const sal_uInt16 coAllScripts = ( SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | @@ -170,7 +170,7 @@ sal_uInt16 SwBreakIt::GetAllScriptsOfText( const rtl::OUString& rTxt ) const return nRet; } -sal_Int32 SwBreakIt::getGraphemeCount(const rtl::OUString& rText, +sal_Int32 SwBreakIt::getGraphemeCount(const OUString& rText, sal_Int32 nStart, sal_Int32 nEnd) const { sal_Int32 nGraphemeCount = 0; diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index b8fbcfc858f4..5d013e3b000d 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -548,7 +548,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, sal_uInt16 ins ) if( 0 != ( pFnd = Find( sDBNum, VarTable, TBLSZ ) ) ) nTmpRec = ((SwCalcExp*)pFnd)->nValue.GetULong(); - rtl::OUString sResult; + OUString sResult; double nNumber = DBL_MAX; long nLang = pLclData->getLanguageTag().getLanguageType(); diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 7fc890930c0f..bd0d54384b79 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -68,7 +68,7 @@ void SwCache::Check() SwCache::SwCache( const sal_uInt16 nInitSize #ifdef DBG_UTIL - , const rtl::OString &rNm + , const OString &rNm #endif ) : m_aCacheObjects(), diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx index 8716f1836a80..8c094120200a 100644 --- a/sw/source/core/crsr/crbm.cxx +++ b/sw/source/core/crsr/crbm.cxx @@ -84,8 +84,8 @@ namespace // at CurCrsr.SPoint ::sw::mark::IMark* SwCrsrShell::SetBookmark( const KeyCode& rCode, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName, + const OUString& rName, + const OUString& rShortName, IDocumentMarkAccess::MarkType eMark) { StartAction(); diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx index 0e8a08d83818..1cc7aea1abfd 100644 --- a/sw/source/core/crsr/crossrefbookmark.cxx +++ b/sw/source/core/crsr/crossrefbookmark.cxx @@ -21,7 +21,6 @@ #include #include -using ::rtl::OUString; namespace sw { namespace mark { CrossRefBookmark::CrossRefBookmark(const SwPaM& rPaM, @@ -67,10 +66,10 @@ namespace sw { namespace mark const KeyCode& rCode, const OUString& rName, const OUString& rShortName) - : CrossRefBookmark(rPaM, rCode, rName, rShortName, rtl::OUString(CrossRefHeadingBookmark_NamePrefix)) + : CrossRefBookmark(rPaM, rCode, rName, rShortName, OUString(CrossRefHeadingBookmark_NamePrefix)) { } - bool CrossRefHeadingBookmark::IsLegalName(const ::rtl::OUString& rName) + bool CrossRefHeadingBookmark::IsLegalName(const OUString& rName) { return rName.match(CrossRefHeadingBookmark_NamePrefix); } @@ -81,10 +80,10 @@ namespace sw { namespace mark const KeyCode& rCode, const OUString& rName, const OUString& rShortName) - : CrossRefBookmark(rPaM, rCode, rName, rShortName, rtl::OUString(CrossRefNumItemBookmark_NamePrefix)) + : CrossRefBookmark(rPaM, rCode, rName, rShortName, OUString(CrossRefNumItemBookmark_NamePrefix)) { } - bool CrossRefNumItemBookmark::IsLegalName(const ::rtl::OUString& rName) + bool CrossRefNumItemBookmark::IsLegalName(const OUString& rName) { return rName.match(CrossRefNumItemBookmark_NamePrefix); } diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index e0e2ab8e770d..d5999cd591b0 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -3153,12 +3153,12 @@ String SwCrsrShell::GetCrsrDescr() const // SMARTTAGS -static void lcl_FillRecognizerData( uno::Sequence< rtl::OUString >& rSmartTagTypes, +static void lcl_FillRecognizerData( uno::Sequence< OUString >& rSmartTagTypes, uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps, const SwWrongList& rSmartTagList, xub_StrLen nCurrent ) { // Insert smart tag information - std::vector< rtl::OUString > aSmartTagTypes; + std::vector< OUString > aSmartTagTypes; std::vector< uno::Reference< container::XStringKeyMap > > aStringKeyMaps; for ( sal_uInt16 i = 0; i < rSmartTagList.Count(); ++i ) @@ -3182,7 +3182,7 @@ static void lcl_FillRecognizerData( uno::Sequence< rtl::OUString >& rSmartTagTyp rSmartTagTypes.realloc( aSmartTagTypes.size() ); rStringKeyMaps.realloc( aSmartTagTypes.size() ); - std::vector< rtl::OUString >::const_iterator aTypesIter = aSmartTagTypes.begin(); + std::vector< OUString >::const_iterator aTypesIter = aSmartTagTypes.begin(); sal_uInt16 i = 0; for ( aTypesIter = aSmartTagTypes.begin(); aTypesIter != aSmartTagTypes.end(); ++aTypesIter ) rSmartTagTypes[i++] = *aTypesIter; @@ -3211,7 +3211,7 @@ static void lcl_FillTextRange( uno::Reference& rRange, rRange = xRange; } -void SwCrsrShell::GetSmartTagTerm( uno::Sequence< rtl::OUString >& rSmartTagTypes, +void SwCrsrShell::GetSmartTagTerm( uno::Sequence< OUString >& rSmartTagTypes, uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps, uno::Reference< text::XTextRange>& rRange ) const { @@ -3249,7 +3249,7 @@ void SwCrsrShell::GetSmartTagTerm( uno::Sequence< rtl::OUString >& rSmartTagType // see also SwEditShell::GetCorrection( const Point* pPt, SwRect& rSelectRect ) void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect, - uno::Sequence< rtl::OUString >& rSmartTagTypes, + uno::Sequence< OUString >& rSmartTagTypes, uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps, uno::Reference& rRange ) { diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index b3ff53c18222..6e9d24d2446e 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1788,7 +1788,7 @@ sal_Bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode ) case FILL_TAB: case FILL_SPACE: { - rtl::OUStringBuffer sInsert; + OUStringBuffer sInsert; if (aFPos.nTabCnt) comphelper::string::padToLength(sInsert, aFPos.nTabCnt, '\t'); if (aFPos.nSpaceCnt) diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 41d47d37fa6b..ac3643817a8f 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -47,7 +47,7 @@ using namespace std; -static rtl::OString aDbgOutResult; +static OString aDbgOutResult; bool bDbgOutStdErr = false; bool bDbgOutPrintAttrSet = false; @@ -92,7 +92,7 @@ SW_DLLPUBLIC const char * dbg_out(const void * pVoid) SW_DLLPUBLIC const char * dbg_out(const String & aStr) { - aDbgOutResult = rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US); + aDbgOutResult = OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US); if (bDbgOutStdErr) fprintf(stderr, "%s", aDbgOutResult.getStr()); @@ -100,9 +100,9 @@ SW_DLLPUBLIC const char * dbg_out(const String & aStr) return aDbgOutResult.getStr(); } -SW_DLLPUBLIC const char * dbg_out(const ::rtl::OUString & aStr) +SW_DLLPUBLIC const char * dbg_out(const OUString & aStr) { - aDbgOutResult = rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US); + aDbgOutResult = OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US); return aDbgOutResult.getStr(); } diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 907ff63528c7..7ca4fa9eae72 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -133,7 +133,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; /* IInterface */ sal_Int32 SwDoc::acquire() diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx index 8b3e48ba4821..1437e6135e15 100644 --- a/sw/source/core/doc/docbasic.cxx +++ b/sw/source/core/doc/docbasic.cxx @@ -33,7 +33,6 @@ #include using namespace ::com::sun::star::uno; -using ::rtl::OUString; static Sequence *lcl_docbasic_convertArgs( SbxArray& rArgs ) { @@ -117,7 +116,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs ) Sequence< sal_Int16 > aOutArgsIndex; Sequence< Any > aOutArgs; - OSL_TRACE( "SwDoc::ExecMacro URL is %s", rtl::OUStringToOString( rMacro.GetMacName(), + OSL_TRACE( "SwDoc::ExecMacro URL is %s", OUStringToOString( rMacro.GetMacName(), RTL_TEXTENCODING_UTF8).getStr() ); eErr = mpDocShell->CallXScript( @@ -229,7 +228,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve Sequence< sal_Int16 > aOutArgsIndex; Sequence< Any > aOutArgs; - OSL_TRACE( "SwDoc::CallEvent URL is %s", rtl::OUStringToOString( + OSL_TRACE( "SwDoc::CallEvent URL is %s", OUStringToOString( rMacro.GetMacName(), RTL_TEXTENCODING_UTF8).getStr() ); nRet += 0 == mpDocShell->CallXScript( diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 93c212d7b793..7d6f59cc97d5 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -187,7 +187,7 @@ namespace if(ppCurrentMark->get() == rpMarkToFind.get()) { //OSL_TRACE("found mark named '%s'", - // ::rtl::OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr()); + // OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr()); return ppCurrentMark; } ++ppCurrentMark; @@ -216,7 +216,7 @@ namespace if(IDocumentMarkAccess::GetType(**ppCurrentMark) == eType) { //OSL_TRACE("found mark named '%s'", - // ::rtl::OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr()); + // OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr()); return ppCurrentMark; } } @@ -226,14 +226,14 @@ namespace }; static IDocumentMarkAccess::const_iterator_t lcl_FindMarkByName( - const ::rtl::OUString& rName, + const OUString& rName, IDocumentMarkAccess::const_iterator_t ppMarksBegin, IDocumentMarkAccess::const_iterator_t ppMarksEnd) { return find_if( ppMarksBegin, ppMarksEnd, - boost::bind(&::rtl::OUString::equals, boost::bind(&IMark::GetName, _1), rName)); + boost::bind(&OUString::equals, boost::bind(&IMark::GetName, _1), rName)); } #if 0 @@ -245,7 +245,7 @@ namespace ppMark++) { IMark* pMark = ppMark->get(); - ::rtl::OString sName = ::rtl::OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8); + OString sName = OUStringToOString(pMark->GetName(), RTL_TEXTENCODING_UTF8); const SwPosition* const pStPos = &pMark->GetMarkStart(); const SwPosition* const pEndPos = &pMark->GetMarkEnd(); OSL_TRACE("%s %s %d,%d %d,%d", @@ -294,12 +294,12 @@ namespace sw { namespace mark : m_pDoc(&rDoc) { } ::sw::mark::IMark* MarkManager::makeMark(const SwPaM& rPaM, - const ::rtl::OUString& rName, + const OUString& rName, const IDocumentMarkAccess::MarkType eType) { #if 0 { - ::rtl::OString sName = ::rtl::OUStringToOString(rName, RTL_TEXTENCODING_UTF8); + OString sName = OUStringToOString(rName, RTL_TEXTENCODING_UTF8); const SwPosition* const pPos1 = rPaM.GetPoint(); const SwPosition* pPos2 = pPos1; if(rPaM.HasMark()) @@ -337,16 +337,16 @@ namespace sw { namespace mark pMark = boost::shared_ptr(new NavigatorReminder(rPaM)); break; case IDocumentMarkAccess::BOOKMARK: - pMark = boost::shared_ptr(new Bookmark(rPaM, KeyCode(), rName, ::rtl::OUString())); + pMark = boost::shared_ptr(new Bookmark(rPaM, KeyCode(), rName, OUString())); break; case IDocumentMarkAccess::DDE_BOOKMARK: pMark = boost::shared_ptr(new DdeBookmark(rPaM)); break; case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK: - pMark = boost::shared_ptr(new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, ::rtl::OUString())); + pMark = boost::shared_ptr(new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, OUString())); break; case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK: - pMark = boost::shared_ptr(new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, ::rtl::OUString())); + pMark = boost::shared_ptr(new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, OUString())); break; case IDocumentMarkAccess::UNO_BOOKMARK: pMark = boost::shared_ptr(new UnoMark(rPaM)); @@ -399,8 +399,8 @@ namespace sw { namespace mark } ::sw::mark::IFieldmark* MarkManager::makeFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, - const rtl::OUString& rType ) + const OUString& rName, + const OUString& rType ) { sw::mark::IMark* pMark = makeMark( rPaM, rName, IDocumentMarkAccess::TEXT_FIELDMARK ); @@ -411,8 +411,8 @@ namespace sw { namespace mark } ::sw::mark::IFieldmark* MarkManager::makeNoTextFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, - const rtl::OUString& rType) + const OUString& rName, + const OUString& rType) { sw::mark::IMark* pMark = makeMark( rPaM, rName, IDocumentMarkAccess::CHECKBOX_FIELDMARK ); @@ -431,7 +431,7 @@ namespace sw { namespace mark if(ppExistingMark != m_vBookmarks.end()) return ppExistingMark->get(); const SwPaM aPaM(aPos); - return makeMark(aPaM, ::rtl::OUString(), eType); + return makeMark(aPaM, OUString(), eType); } void MarkManager::repositionMark( ::sw::mark::IMark* const io_pMark, @@ -453,7 +453,7 @@ namespace sw { namespace mark sortMarks(); } - bool MarkManager::renameMark(::sw::mark::IMark* io_pMark, const ::rtl::OUString& rNewName) + bool MarkManager::renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName) { OSL_PRECOND(io_pMark->GetMarkPos().GetDoc() == m_pDoc, "" @@ -789,12 +789,12 @@ namespace sw { namespace mark m_vMarks.clear(); } - IDocumentMarkAccess::const_iterator_t MarkManager::findMark(const ::rtl::OUString& rName) const + IDocumentMarkAccess::const_iterator_t MarkManager::findMark(const OUString& rName) const { return lcl_FindMarkByName(rName, m_vMarks.begin(), m_vMarks.end()); } - IDocumentMarkAccess::const_iterator_t MarkManager::findBookmark(const ::rtl::OUString& rName) const + IDocumentMarkAccess::const_iterator_t MarkManager::findBookmark(const OUString& rName) const { return lcl_FindMarkByName(rName, m_vBookmarks.begin(), m_vBookmarks.end()); } @@ -834,14 +834,14 @@ namespace sw { namespace mark { return dynamic_cast(lcl_getMarkBefore(m_vFieldmarks, rPos)); } - ::rtl::OUString MarkManager::getUniqueMarkName(const ::rtl::OUString& rName) const + OUString MarkManager::getUniqueMarkName(const OUString& rName) const { OSL_ENSURE(!rName.isEmpty(), "" " - a name should be proposed"); if(!hasMark(rName)) return rName; - ::rtl::OUStringBuffer sBuf; - ::rtl::OUString sTmp; + OUStringBuffer sBuf; + OUString sTmp; // try the name "XXX" (where XXX is a number starting from 1) unless there is // a unused name. Due to performance-reasons (especially in mailmerge-Szenarios) there @@ -868,7 +868,7 @@ namespace sw { namespace mark sort(m_vFieldmarks.begin(), m_vFieldmarks.end(), &lcl_MarkOrderingByStart); } - bool MarkManager::hasMark(const ::rtl::OUString& rName) const + bool MarkManager::hasMark(const OUString& rName) const { return (m_aMarkNamesSet.find(rName) != m_aMarkNamesSet.end()); } diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx index 20677cf0d9f8..ae7437fc14f5 100644 --- a/sw/source/core/doc/docdde.cxx +++ b/sw/source/core/doc/docdde.cxx @@ -43,10 +43,10 @@ using namespace ::com::sun::star; namespace { - static ::sw::mark::DdeBookmark* lcl_FindDdeBookmark(const IDocumentMarkAccess& rMarkAccess, const rtl::OUString& rName, bool bCaseSensitive) + static ::sw::mark::DdeBookmark* lcl_FindDdeBookmark(const IDocumentMarkAccess& rMarkAccess, const OUString& rName, bool bCaseSensitive) { //Iterating over all bookmarks, checking DdeBookmarks - const ::rtl::OUString sNameLc = bCaseSensitive ? rName : GetAppCharClass().lowercase(rName); + const OUString sNameLc = bCaseSensitive ? rName : GetAppCharClass().lowercase(rName); for(IDocumentMarkAccess::const_iterator_t ppMark = rMarkAccess.getMarksBegin(); ppMark != rMarkAccess.getMarksEnd(); ++ppMark) @@ -133,7 +133,7 @@ static bool lcl_FindTable( const SwFrmFmt* pTableFmt, _FindItem * const pItem ) -bool SwDoc::GetData( const rtl::OUString& rItem, const String& rMimeType, +bool SwDoc::GetData( const OUString& rItem, const String& rMimeType, uno::Any & rValue ) const { // search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive @@ -178,7 +178,7 @@ bool SwDoc::GetData( const rtl::OUString& rItem, const String& rMimeType, -bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType, +bool SwDoc::SetData( const OUString& rItem, const String& rMimeType, const uno::Any & rValue ) { // search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive @@ -224,7 +224,7 @@ bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType, -::sfx2::SvLinkSource* SwDoc::CreateLinkSource(const rtl::OUString& rItem) +::sfx2::SvLinkSource* SwDoc::CreateLinkSource(const OUString& rItem) { SwServerObject* pObj = NULL; diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 6ff4c1a155bb..bcd931ebd77e 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -252,7 +252,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView ) pObj->NbcMove( Size( aAnchorPos.X(), aAnchorPos.Y() ) ); } - pFmt = MakeDrawFrmFmt( rtl::OUString("DrawObject"), + pFmt = MakeDrawFrmFmt( OUString("DrawObject"), GetDfltFrmFmt() ); pFmt->SetFmtAttr( aAnch ); // #i36010# - set layout direction of the position @@ -317,7 +317,7 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView ) SdrObject *pMyObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj(); if( !pMyObj->GetUpGroup() ) { - rtl::OUString sDrwFmtNm("DrawObject"); + OUString sDrwFmtNm("DrawObject"); for ( sal_uInt16 i = 0; i < nMarkCount; ++i ) { SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); @@ -913,7 +913,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo) else { OSL_FAIL("unknown field command"); - pInfo->SetRepresentation( rtl::OUString( '?' ) ); + pInfo->SetRepresentation( OUString( '?' ) ); } } diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 67252d931e8b..7351b1dcb447 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -771,7 +771,7 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr ) // start behind the characters (to fix the attributes!) if (nStart < pNode->GetTxt().getLength()) ++rIdx; - pNode->InsertText( rtl::OUString(c), rIdx, INS_EMPTYEXPAND ); + pNode->InsertText( OUString(c), rIdx, INS_EMPTYEXPAND ); if( nStart+1 < rIdx.GetIndex() ) { rIdx = nStart; @@ -1930,7 +1930,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM, uno::Reference< lang::XComponent > xDoc( ((SwDocShell*)GetDocShell())->GetBaseModel(), uno::UNO_QUERY ); // Expand the string: const ModelToViewHelper aConversionMap(*(SwTxtNode*)pNd); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); // get XFlatParagraph to use... uno::Reference< text::XFlatParagraph > xFlatPara = new SwXFlatParagraph( *((SwTxtNode*)pNd), aExpandText, aConversionMap ); @@ -2137,7 +2137,7 @@ static bool lcl_GetTokenToParaBreak( String& rStr, String& rRet, bool bRegExpRpl if( bRegExpRplc ) { xub_StrLen nPos = 0; - rtl::OUString sPara("\\n"); + OUString sPara("\\n"); while( STRING_NOTFOUND != ( nPos = rStr.Search( sPara, nPos )) ) { // Has this been escaped? @@ -2283,7 +2283,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr, GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL); // If any Redline will change (split!) the node - const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, ::rtl::OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); + const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); //JP 06.01.98: MUSS noch optimiert werden!!! SetRedlineMode( @@ -2375,7 +2375,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr, GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL); // If any Redline will change (split!) the node - const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, ::rtl::OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); + const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); SwIndex& rIdx = aDelPam.GetPoint()->nContent; rIdx.Assign( 0, 0 ); diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 8474c968f359..a4539972320e 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2285,11 +2285,11 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) } } - rtl::OUString sTrue("TRUE"), sFalse("FALSE"); + OUString sTrue("TRUE"), sFalse("FALSE"); bool bIsDBMgr = 0 != rDoc.GetNewDBMgr(); sal_uInt16 nWhich, n; - const rtl::OUString* pFormel = 0; + const OUString* pFormel = 0; const SfxPoolItem* pItem; sal_uInt32 nMaxItems = rDoc.GetAttrPool().GetItemCount2( RES_TXTATR_FIELD ); for( n = 0; n < nMaxItems; ++n ) diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index e69c47d61850..ddac41e81653 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -198,11 +198,11 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c switch( eDocType ) { case SPLITDOC_TO_HTML: - pFilter = SwIoSystem::GetFilterOfFormat(rtl::OUString("HTML")); + pFilter = SwIoSystem::GetFilterOfFormat(OUString("HTML")); break; default: - pFilter = SwIoSystem::GetFilterOfFormat(rtl::OUString(FILTER_XML)); + pFilter = SwIoSystem::GetFilterOfFormat(OUString(FILTER_XML)); eDocType = SPLITDOC_TO_GLOBALDOC; break; } diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx index dbce466caee0..9593bf8039c8 100644 --- a/sw/source/core/doc/docglos.cxx +++ b/sw/source/core/doc/docglos.cxx @@ -86,7 +86,7 @@ static void lcl_copyDocumentProperties( = xSourceUDSet->getPropertySetInfo(); uno::Sequence srcprops = xSetInfo->getProperties(); for (sal_Int32 i = 0; i < srcprops.getLength(); ++i) { - ::rtl::OUString name = srcprops[i].Name; + OUString name = srcprops[i].Name; xTargetUD->addProperty(name, srcprops[i].Attributes, xSourceUDSet->getPropertyValue(name)); } diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 3759b6eb6207..d14e1991a3ec 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -96,7 +96,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; #define DEF_FLY_WIDTH 2268 // Default width for FlyFrms (2268 == 4cm) diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 2e4ae8187393..32cf8e3f8785 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -106,7 +106,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule ) } mpOutlineRule->SetRuleType( OUTLINE_RULE ); - mpOutlineRule->SetName( rtl::OUString::createFromAscii( + mpOutlineRule->SetName( OUString::createFromAscii( SwNumRule::GetOutlineRuleName() ), *this); diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 6d15761c3897..a706b180f349 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1734,7 +1734,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, size_t nSize = rBase.aTOXSources.size(); if (nSize > 0) { - String aInsStr = rtl::OUString(cNumRepl); + String aInsStr = OUString(cNumRepl); for (size_t i = 1; i < nSize; ++i) { aInsStr.AppendAscii( sPageDeli ); @@ -2005,10 +2005,10 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd, // collect starts end ends of main entry character style std::vector* pCharStyleIdx = pMainEntryNums ? new std::vector : 0; - rtl::OUString sSrchStr = rtl::OUStringBuffer().append(cNumRepl). + OUString sSrchStr = OUStringBuffer().append(cNumRepl). append(sPageDeli).append(cNumRepl).makeStringAndClear(); sal_Int32 nStartPos = pNd->GetTxt().indexOf(sSrchStr); - sSrchStr = rtl::OUStringBuffer().append(cNumRepl). + sSrchStr = OUStringBuffer().append(cNumRepl). append(cEndPageNum).makeStringAndClear(); sal_Int32 nEndPos = pNd->GetTxt().indexOf(sSrchStr); sal_uInt16 i; diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx index 6841e9730822..11d264b44eb4 100644 --- a/sw/source/core/doc/docxforms.cxx +++ b/sw/source/core/doc/docxforms.cxx @@ -41,7 +41,6 @@ using container::XNameContainer; using xforms::XModel2; using frame::XModule; using xforms::XFormsUIHelper1; -using ::rtl::OUString; Reference SwDoc::getXForms() const diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index c42d80201065..23252d6ebe07 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -98,7 +98,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const String &rText, pFont = new Font(); pFont->SetWeight( WEIGHT_BOLD ); pFont->SetStyleName( aEmptyStr ); - pFont->SetName(rtl::OUString("Arial Unicode")); + pFont->SetName(OUString("Arial Unicode")); pFont->SetFamily( FAMILY_SWISS ); pFont->SetTransparent( sal_True ); } diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 7c36432c29ea..6d4a0ea1584a 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -1928,7 +1928,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId ) pNewRule->Set( 1, aFmt ); aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); - aFmt.SetSuffix(rtl::OUString(static_cast(')'))); + aFmt.SetSuffix(OUString(static_cast(')'))); aFmt.SetIncludeUpperLevels( 1 ); aFmt.SetStart( 3 ); diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx index 49c0d3396a92..0ad79d78649c 100644 --- a/sw/source/core/doc/swstylemanager.cxx +++ b/sw/source/core/doc/swstylemanager.cxx @@ -26,10 +26,10 @@ #include #include -typedef ::boost::unordered_map< const ::rtl::OUString, +typedef ::boost::unordered_map< const OUString, StylePool::SfxItemSet_Pointer_t, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > SwStyleNameCache; + OUStringHash, + ::std::equal_to< OUString > > SwStyleNameCache; class SwStyleCache { @@ -39,7 +39,7 @@ public: void addStyleName( StylePool::SfxItemSet_Pointer_t pStyle ) { mMap[ StylePool::nameOf(pStyle) ] = pStyle; } void addCompletePool( StylePool& rPool ); - StylePool::SfxItemSet_Pointer_t getByName( const rtl::OUString& rName ) { return mMap[rName]; } + StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName ) { return mMap[rName]; } }; void SwStyleCache::addCompletePool( StylePool& rPool ) @@ -48,7 +48,7 @@ void SwStyleCache::addCompletePool( StylePool& rPool ) StylePool::SfxItemSet_Pointer_t pStyle = pIter->getNext(); while( pStyle.get() ) { - rtl::OUString aName( StylePool::nameOf(pStyle) ); + OUString aName( StylePool::nameOf(pStyle) ); mMap[ aName ] = pStyle; pStyle = pIter->getNext(); } @@ -73,7 +73,7 @@ public: virtual ~SwStyleManager(); virtual StylePool::SfxItemSet_Pointer_t getAutomaticStyle( const SfxItemSet& rSet, IStyleAccess::SwAutoStyleFamily eFamily ); - virtual StylePool::SfxItemSet_Pointer_t getByName( const rtl::OUString& rName, + virtual StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName, IStyleAccess::SwAutoStyleFamily eFamily ); virtual void getAllStyles( std::vector &rStyles, IStyleAccess::SwAutoStyleFamily eFamily ); @@ -121,7 +121,7 @@ StylePool::SfxItemSet_Pointer_t SwStyleManager::cacheAutomaticStyle( const SfxIt return pStyle; } -StylePool::SfxItemSet_Pointer_t SwStyleManager::getByName( const rtl::OUString& rName, +StylePool::SfxItemSet_Pointer_t SwStyleManager::getByName( const OUString& rName, IStyleAccess::SwAutoStyleFamily eFamily ) { StylePool& rAutoPool = eFamily == IStyleAccess::AUTO_STYLE_CHAR ? aAutoCharPool : aAutoParaPool; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 976273306639..516df7ae7867 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -1119,7 +1119,7 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl() sal_Bool SwTableAutoFmtTbl::Load() { sal_Bool bRet = sal_False; - String sNm(rtl::OUString(sAutoTblFmtName)); + String sNm(OUString(sAutoTblFmtName)); SvtPathOptions aOpt; if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG )) { diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 065bb3fe6ccb..38a558849628 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -679,7 +679,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData, ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo()); // The LinkFileName could only consist of separators - String sCompareString = rtl::OUString(sfx2::cTokenSeperator); + String sCompareString = OUString(sfx2::cTokenSeperator); sCompareString += sfx2::cTokenSeperator; const bool bUpdate = (!pSection->IsLinkType() && rNewData.IsLinkType()) diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 95237af5b484..5cad0d70ea8e 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1523,7 +1523,7 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara ) // Inserting the separator SwIndex aCntIdx( pDelPara->pLastNd, pDelPara->pLastNd->GetTxt().getLength()); - pDelPara->pLastNd->InsertText( rtl::OUString(pDelPara->cCh), aCntIdx, + pDelPara->pLastNd->InsertText( OUString(pDelPara->cCh), aCntIdx, IDocumentContentOperations::INS_EMPTYEXPAND ); if( pDelPara->pUndo ) pDelPara->pUndo->AddBoxPos( *pDoc, nNdIdx, aDelRg.aEnd.GetIndex(), @@ -4196,7 +4196,7 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos ) if ( pUndo ) pUndo->AddNode( *pTxtNode , sal_False ); SfxStringItem * pNewItem = (SfxStringItem*)pFmtItem->Clone(); - pNewItem->SetValue(rtl::OUString()); + pNewItem->SetValue(OUString()); rSet.Put( *pNewItem ); pTxtNode->SetAttr( rSet ); delete pNewItem; diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index ca2efd4fc7c5..ffeb80517b1c 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -268,10 +268,10 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w ) writer.startElement( "text" ); writer.writeFormatAttribute( "ptr", "%p", this ); writer.writeFormatAttribute( "index", "%lu", GetIndex() ); - rtl::OUString txt = GetTxt(); + OUString txt = GetTxt(); for( int i = 0; i < 32; ++i ) txt = txt.replace( i, '*' ); - rtl::OString txt8 = ::rtl::OUStringToOString( txt, RTL_TEXTENCODING_UTF8 ); + OString txt8 = OUStringToOString( txt, RTL_TEXTENCODING_UTF8 ); xmlTextWriterWriteString( writer, BAD_CAST( txt8.getStr())); writer.endElement(); } diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 40db3665646c..56239af0f94f 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -1140,7 +1140,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) SwBaseLink* pBLink; String sMimeType( SotExchange::GetFormatMimeType( FORMAT_FILE )); uno::Any aValue; - aValue <<= ::rtl::OUString( sName ); // Arbitrary name + aValue <<= OUString( sName ); // Arbitrary name const ::sfx2::SvBaseLinks& rLnks = pDoc->GetLinkManager().GetLinks(); for( sal_uInt16 n = rLnks.size(); n; ) @@ -1243,7 +1243,7 @@ int sw_FindDocShell( SfxObjectShellRef& xDocSh, const SfxFilter* pSfxFlt = 0; if( !pMed->GetError() ) { - String sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName())); + String sFactory(OUString::createFromAscii(SwDocShell::Factory().GetShortName())); SfxFilterMatcher aMatcher( sFactory ); // No Filter, so search for it. Else test if the one passed is a valid one @@ -1344,7 +1344,7 @@ int sw_FindDocShell( SfxObjectShellRef& xDocSh, SwSection& rSection = pSectNd->GetSection(); rSection.SetConnectFlag(false); - ::rtl::OUString sNewFileName; + OUString sNewFileName; Reader* pRead = 0; switch( nDataFormat ) { diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index 6dcee9022f1e..ae8ed8a5cde5 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -105,7 +105,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem ) nFmt == sfx2::LinkManager::RegisterStatusInfoId() ) { // Only a status change - serve Events? - ::rtl::OUString sState; + OUString sState; if( rValue.hasValue() && ( rValue >>= sState )) { sal_uInt16 nEvent = 0; diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 5b0d25255c5f..0ebf8e9b8c0d 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -133,7 +133,7 @@ SwDrawDocument::~SwDrawDocument() SdrPage* SwDrawDocument::AllocPage(bool bMasterPage) { SwDPage* pPage = new SwDPage(*this, 0 != bMasterPage); - pPage->SetName(rtl::OUString("Controls")); + pPage->SetName(OUString("Controls")); return pPage; } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 1508ab6aecf9..5cb58fd7df5b 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -298,7 +298,7 @@ void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId ) } #if OSL_DEBUG_LEVEL > 0 else - sTxt = rtl::OUString("Action-Text fehlt"); + sTxt = OUString("Action-Text fehlt"); #endif pDoc->SetAutoFmtRedlineComment( &sTxt, nSeqNo ); @@ -1258,7 +1258,7 @@ void SwAutoFormat::DelMoreLinesBlanks( bool bWithLineBreaks ) DeleteSel( *pNxt ); if( !bHasBlnks ) { - pDoc->InsertString( *pNxt, rtl::OUString(' ') ); + pDoc->InsertString( *pNxt, OUString(' ') ); } } @@ -1317,7 +1317,7 @@ void SwAutoFormat::BuildIndent() IsSentenceAtEnd( *pNxtNd ); if( DeleteAktNxtPara( pNxtNd->GetTxt() )) { - pDoc->InsertString( aDelPam, rtl::OUString(' ') ); + pDoc->InsertString( aDelPam, OUString(' ') ); } if( bBreak ) break; @@ -1358,7 +1358,7 @@ void SwAutoFormat::BuildTextIndent() IsSentenceAtEnd( *pNxtNd ); if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) { - pDoc->InsertString( aDelPam, rtl::OUString(' ') ); + pDoc->InsertString( aDelPam, OUString(' ') ); } if( bBreak ) break; @@ -1394,7 +1394,7 @@ void SwAutoFormat::BuildText() IsSentenceAtEnd( *pNxtNd ); if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) { - pDoc->InsertString( aDelPam, rtl::OUString(' ') ); + pDoc->InsertString( aDelPam, OUString(' ') ); } if( bBreak ) break; @@ -1503,8 +1503,8 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) aFmt.SetBulletChar( cBullChar ); aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); // #i93908# clear suffix for bullet lists - aFmt.SetPrefix(::rtl::OUString()); - aFmt.SetSuffix(::rtl::OUString()); + aFmt.SetPrefix(OUString()); + aFmt.SetSuffix(OUString()); aFmt.SetFirstLineOffset( lBullFirstLineOffset ); aFmt.SetAbsLSpace( nAbsPos ); if( !aFmt.GetCharFmt() ) @@ -1666,7 +1666,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) if( !aFlags.bSetNumRule ) { - String sChgStr = rtl::OUString('\t'); + String sChgStr = OUString('\t'); if( bChgBullet ) sChgStr.Insert( aFlags.cBullet, 0 ); pDoc->InsertString( aDelPam, sChgStr ); @@ -1710,7 +1710,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) IsSentenceAtEnd( *pNxtNd ); if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) { - pDoc->InsertString( aDelPam, rtl::OUString(' ') ); + pDoc->InsertString( aDelPam, OUString(' ') ); } if( bBreak ) break; @@ -1780,7 +1780,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) DeleteSel( aDelPam ); if( bInsTab ) { - pDoc->InsertString( aDelPam, rtl::OUString('\t') ); + pDoc->InsertString( aDelPam, OUString('\t') ); } } } @@ -1800,7 +1800,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) IsSentenceAtEnd( *pNxtNd ); if( DeleteAktNxtPara( pNxtNd->GetTxt() ) ) { - pDoc->InsertString( aDelPam, rtl::OUString(' ') ); + pDoc->InsertString( aDelPam, OUString(' ') ); } if( bBreak ) break; @@ -1818,7 +1818,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl ) { String sTxt(ViewShell::GetShellRes()->GetAutoFmtNameLst()[ STR_AUTOFMTREDL_SET_TMPL_HEADLINE ] ); - sTxt.SearchAndReplace( rtl::OUString("$(ARG1)"), + sTxt.SearchAndReplace( OUString("$(ARG1)"), OUString::number( nLvl + 1 ) ); pDoc->SetAutoFmtRedlineComment( &sTxt ); } @@ -1931,7 +1931,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) aDelPam.DeleteMark(); if( bSetHardBlank ) { - pDoc->InsertString( aDelPam, rtl::OUString(CHAR_HARDBLANK) ); + pDoc->InsertString( aDelPam, OUString(CHAR_HARDBLANK) ); ++nPos; } } @@ -1986,7 +1986,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) if( bSetHardBlank ) { aDelPam.GetPoint()->nContent = nPos; - pDoc->InsertString( aDelPam, rtl::OUString(CHAR_HARDBLANK) ); + pDoc->InsertString( aDelPam, OUString(CHAR_HARDBLANK) ); aDelPam.GetPoint()->nContent = ++nPos; } } diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx index 7d1fc81d3e72..290666c61688 100644 --- a/sw/source/core/edit/edfldexp.cxx +++ b/sw/source/core/edit/edfldexp.cxx @@ -34,7 +34,6 @@ #include using namespace com::sun::star; -using ::rtl::OUString; sal_Bool SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const { diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index 210ce3f3ee53..f63912efa299 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -288,7 +288,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) #if defined(UNX) rBuf += '\012'; #else - rBuf += rtl::OUString("\015\012"); + rBuf += OUString("\015\012"); #endif } } @@ -301,7 +301,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) aStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); #endif WriterRef xWrt; - SwReaderWriter::GetWriter( rtl::OUString(FILTER_TEXT), String(), xWrt ); + SwReaderWriter::GetWriter( OUString(FILTER_TEXT), String(), xWrt ); if( xWrt.Is() ) { // Selektierte Bereiche in ein ASCII Dokument schreiben @@ -336,7 +336,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) const sal_Unicode *p = (sal_Unicode*)aStream.GetBuffer(); if( p ) - rBuf = rtl::OUString(p); + rBuf = OUString(p); else { rtl_uString *pStr = rtl_uString_alloc(lLen / sizeof( sal_Unicode )); @@ -344,7 +344,7 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) aStream.ResetError(); //endian specific?, yipes! aStream.Read(pStr->buffer, lLen); - rBuf = rtl::OUString(pStr, SAL_NO_ACQUIRE); + rBuf = OUString(pStr, SAL_NO_ACQUIRE); } } } diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 2b33da081222..8185efb40488 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -72,7 +72,7 @@ void SwEditShell::Insert( sal_Unicode c, sal_Bool bOnlyCurrCrsr ) StartAllAction(); FOREACHPAM_START(this) - const bool bSuccess = GetDoc()->InsertString(*PCURCRSR, rtl::OUString(c)); + const bool bSuccess = GetDoc()->InsertString(*PCURCRSR, OUString(c)); OSL_ENSURE( bSuccess, "Doc->Insert() failed." ); (void) bSuccess; @@ -508,7 +508,7 @@ const SwFmtRefMark* SwEditShell::GetRefMark( const String& rName ) const } // returne die Namen aller im Doc gesetzten Referenzen -sal_uInt16 SwEditShell::GetRefMarks( std::vector* pStrings ) const +sal_uInt16 SwEditShell::GetRefMarks( std::vector* pStrings ) const { return GetDoc()->GetRefMarks( pStrings ); } @@ -1062,7 +1062,7 @@ String SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, sal_Bool bInsText String sRet; if( pDel ) { - rtl::OUString sTmp; + OUString sTmp; SwUnoCursorHelper::GetTextFromPam(*pDel, sTmp); sRet = sTmp; SET_CURR_SHELL( this ); diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index 598547f6abfb..7bd4337ff35f 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -361,7 +361,7 @@ void SwEditShell::ApplyAutoMark() nSrchFlags |= (SearchFlags::REG_NOT_BEGINOFLINE | SearchFlags::REG_NOT_ENDOFLINE ); // - rtl::OUString sEmpty; + OUString sEmpty; SearchOptions aSearchOpt( SearchAlgorithms_ABSOLUTE, nSrchFlags, sEmpty, sEmpty, @@ -371,7 +371,7 @@ void SwEditShell::ApplyAutoMark() while( !rStrm.GetError() && !rStrm.IsEof() ) { - rtl::OString aRdLine; + OString aRdLine; rStrm.ReadLine( aRdLine ); // # -> comment @@ -380,7 +380,7 @@ void SwEditShell::ApplyAutoMark() // Leading and trailing blanks are ignored if( !aRdLine.isEmpty() && '#' != aRdLine[0] ) { - String sLine(rtl::OStringToOUString(aRdLine, eChrSet)); + String sLine(OStringToOUString(aRdLine, eChrSet)); sal_Int32 nTokenPos = 0; String sToSelect( sLine.GetToken(0, ';', nTokenPos ) ); diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index 1f807160c790..5baad3c8a2e2 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -136,7 +136,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount) } } catch (const ::com::sun::star::uno::Exception & e) { OSL_TRACE("SwEditShell::Undo(): exception caught:\n %s", - ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) .getStr()); } @@ -191,7 +191,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount) } } catch (const ::com::sun::star::uno::Exception & e) { OSL_TRACE("SwEditShell::Redo(): exception caught:\n %s", - ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) .getStr()); } @@ -221,7 +221,7 @@ bool SwEditShell::Repeat(sal_uInt16 const nCount) || bRet; } catch (const ::com::sun::star::uno::Exception & e) { OSL_TRACE("SwEditShell::Repeat(): exception caught:\n %s", - ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8) .getStr()); } diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx index 5490252b8282..c99ea28290e9 100644 --- a/sw/source/core/edit/edws.cxx +++ b/sw/source/core/edit/edws.cxx @@ -284,14 +284,14 @@ SwUndoId SwEditShell::EndUndo(SwUndoId eUndoId, { return GetDoc()->GetIDocumentUndoRedo().EndUndo(eUndoId, pRewriter); } -bool SwEditShell::GetLastUndoInfo(::rtl::OUString *const o_pStr, +bool SwEditShell::GetLastUndoInfo(OUString *const o_pStr, SwUndoId *const o_pId) const { return GetDoc()->GetIDocumentUndoRedo().GetLastUndoInfo(o_pStr, o_pId); } -bool SwEditShell::GetFirstRedoInfo(::rtl::OUString *const o_pStr) const +bool SwEditShell::GetFirstRedoInfo(OUString *const o_pStr) const { return GetDoc()->GetIDocumentUndoRedo().GetFirstRedoInfo(o_pStr); } -SwUndoId SwEditShell::GetRepeatInfo(::rtl::OUString *const o_pStr) const +SwUndoId SwEditShell::GetRepeatInfo(OUString *const o_pStr) const { return GetDoc()->GetIDocumentUndoRedo().GetRepeatInfo(o_pStr); } diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 8870c4e4710e..ab369586a8f7 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -using rtl::OUString; SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy) @@ -396,8 +395,8 @@ bool SwAuthorityFieldType::QueryValue( Any& rVal, sal_uInt16 nWhichId ) const { Sequence aRet(m_SortKeyArr.size()); PropertyValues* pValues = aRet.getArray(); - OUString sProp1( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SORT_KEY)) ), - sProp2( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_SORT_ASCENDING))); + OUString sProp1( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SORT_KEY)) ), + sProp2( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_SORT_ASCENDING))); for(sal_uInt16 i = 0; i < m_SortKeyArr.size(); i++) { const SwTOXSortKey* pKey = &m_SortKeyArr[i]; @@ -580,7 +579,7 @@ const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const return pEntry->GetAuthorField( eField ); } -void SwAuthorityField::SetPar1(const rtl::OUString& rStr) +void SwAuthorityField::SetPar1(const OUString& rStr) { SwAuthorityFieldType* pInitType = (SwAuthorityFieldType* )GetTyp(); pInitType->RemoveField(m_nHandle); @@ -638,7 +637,7 @@ bool SwAuthorityField::QueryValue( Any& rAny, sal_uInt16 /*nWhichId*/ ) const PropertyValue* pValues = aRet.getArray(); for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++) { - pValues[i].Name = rtl::OUString::createFromAscii(aFieldNames[i]); + pValues[i].Name = OUString::createFromAscii(aFieldNames[i]); const String& rField = pAuthEntry->GetAuthorField((ToxAuthorityField) i); if(i == AUTH_FIELD_AUTHORITY_TYPE) pValues[i].Value <<= sal_Int16(rField.ToInt32()); @@ -667,7 +666,7 @@ bool SwAuthorityField::PutValue( const Any& rAny, sal_uInt16 /*nWhichId*/ ) if(!(rAny >>= aParam)) return false; - rtl::OUStringBuffer sBuf; + OUStringBuffer sBuf; comphelper::string::padToLength(sBuf, AUTH_FIELD_ISBN, TOX_STYLE_DELIMITER); String sToSet(sBuf.makeStringAndClear()); const PropertyValue* pParam = aParam.getConstArray(); diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index 44ca2e3323dd..1eb50c940dbe 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -411,7 +411,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr, if( pLastBox ) { if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, *pLastBox )) ) - rNewStr += rtl::OUString::valueOf(static_cast((sal_PtrDiff)pRelBox)); + rNewStr += OUString::valueOf(static_cast((sal_PtrDiff)pRelBox)); else rNewStr += '0'; rNewStr += ':'; @@ -419,7 +419,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr, } if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, rFirstBox )) ) - rNewStr += rtl::OUString::valueOf(static_cast((sal_PtrDiff)pRelBox)); + rNewStr += OUString::valueOf(static_cast((sal_PtrDiff)pRelBox)); else rNewStr += '0'; @@ -506,13 +506,13 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, String& rNewStr, if( pLastBox ) { pBox = rTbl.GetTblBox( *pLastBox ); - rNewStr += rtl::OUString::valueOf(static_cast((sal_PtrDiff)pBox)); + rNewStr += OUString::valueOf(static_cast((sal_PtrDiff)pBox)); rNewStr += ':'; rFirstBox.Erase( 0, pLastBox->Len()+1 ); } pBox = rTbl.GetTblBox( rFirstBox ); - rNewStr += rtl::OUString::valueOf(static_cast((sal_PtrDiff)pBox)); + rNewStr += OUString::valueOf(static_cast((sal_PtrDiff)pBox)); // Kennung fuer Box erhalten rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 ); @@ -827,7 +827,7 @@ static String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd, // in die Externe Darstellung umwandeln. SwTableBox* pBox = reinterpret_cast(sal::static_int_cast(sTmp.ToInt64())); if( rTbl.GetTabSortBoxes().find( pBox ) == rTbl.GetTabSortBoxes().end() ) - return rtl::OUString('?'); + return OUString('?'); sTmp = pBox->GetName(); } @@ -1175,8 +1175,8 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr, } if( pLastBox ) - ( rNewStr += rtl::OUString::valueOf(static_cast((sal_PtrDiff)pEndBox)) ) += ':'; - ( rNewStr += rtl::OUString::valueOf(static_cast((sal_PtrDiff)pSttBox)) ) + ( rNewStr += OUString::valueOf(static_cast((sal_PtrDiff)pEndBox)) ) += ':'; + ( rNewStr += OUString::valueOf(static_cast((sal_PtrDiff)pSttBox)) ) += rFirstBox.GetChar( rFirstBox.Len() - 1 ); } diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index bea128ecd751..c3c63381b527 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star; -using ::rtl::OUString; /*-------------------------------------------------------------------- Beschreibung: Datenbanktrenner durch Punkte fuer Anzeige ersetzen @@ -70,7 +69,7 @@ SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData& { if(!aDBData.sDataSource.isEmpty() || !aDBData.sCommand.isEmpty()) { - sName = rtl::OUStringBuffer(aDBData.sDataSource).append(DB_DELIM). + sName = OUStringBuffer(aDBData.sDataSource).append(DB_DELIM). append(aDBData.sCommand).append(DB_DELIM).makeStringAndClear(); } sName += GetColumnName(); @@ -88,7 +87,7 @@ SwFieldType* SwDBFieldType::Copy() const } //------------------------------------------------------------------------------ -const rtl::OUString& SwDBFieldType::GetName() const +const OUString& SwDBFieldType::GetName() const { return sName; } @@ -205,7 +204,7 @@ void SwDBField::InitContent() { if (!IsInitialized()) { - aContent = rtl::OUStringBuffer().append('<') + aContent = OUStringBuffer().append('<') .append(((const SwDBFieldType*)GetTyp())->GetColumnName()) .append('>').makeStringAndClear(); } @@ -364,7 +363,7 @@ void SwDBField::Evaluate() Beschreibung: Namen erfragen --------------------------------------------------------------------*/ -const rtl::OUString& SwDBField::GetPar1() const +const OUString& SwDBField::GetPar1() const { return ((const SwDBFieldType*)GetTyp())->GetName(); } @@ -640,12 +639,12 @@ void SwDBNextSetField::Evaluate(SwDoc* pDoc) Beschreibung: Bedingung --------------------------------------------------------------------*/ -const rtl::OUString& SwDBNextSetField::GetPar1() const +const OUString& SwDBNextSetField::GetPar1() const { return aCond; } -void SwDBNextSetField::SetPar1(const rtl::OUString& rStr) +void SwDBNextSetField::SetPar1(const OUString& rStr) { aCond = rStr; } @@ -743,12 +742,12 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc) Beschreibung: LogDBName --------------------------------------------------------------------*/ -const rtl::OUString& SwDBNumSetField::GetPar1() const +const OUString& SwDBNumSetField::GetPar1() const { return aCond; } -void SwDBNumSetField::SetPar1(const rtl::OUString& rStr) +void SwDBNumSetField::SetPar1(const OUString& rStr) { aCond = rStr; } @@ -757,12 +756,12 @@ void SwDBNumSetField::SetPar1(const rtl::OUString& rStr) Beschreibung: Bedingung --------------------------------------------------------------------*/ -rtl::OUString SwDBNumSetField::GetPar2() const +OUString SwDBNumSetField::GetPar2() const { return aPar2; } -void SwDBNumSetField::SetPar2(const rtl::OUString& rStr) +void SwDBNumSetField::SetPar2(const OUString& rStr) { aPar2 = rStr; } diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index e11c113c1fb7..5f79e3c7823a 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -32,7 +32,6 @@ #include #include -using rtl::OUString; using namespace ::com::sun::star; #define DDE_TXT_ENCODING osl_getThreadTextEncoding() @@ -263,7 +262,7 @@ SwFieldType* SwDDEFieldType::Copy() const return pType; } -const rtl::OUString& SwDDEFieldType::GetName() const +const OUString& SwDDEFieldType::GetName() const { return aName; } @@ -333,7 +332,7 @@ bool SwDDEFieldType::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const } break; case FIELD_PROP_PAR5: - rVal <<= ::rtl::OUString(aExpansion); + rVal <<= OUString(aExpansion); break; default: OSL_FAIL("illegal property"); @@ -358,7 +357,7 @@ bool SwDDEFieldType::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId ) break; case FIELD_PROP_PAR5: { - ::rtl::OUString sTemp; + OUString sTemp; rVal >>= sTemp; aExpansion = sTemp; } @@ -411,7 +410,7 @@ SwField* SwDDEField::Copy() const Beschreibung: Parameter des Typen erfragen Name --------------------------------------------------------------------*/ -const rtl::OUString& SwDDEField::GetPar1() const +const OUString& SwDDEField::GetPar1() const { return ((const SwDDEFieldType*)GetTyp())->GetName(); } @@ -420,12 +419,12 @@ const rtl::OUString& SwDDEField::GetPar1() const Beschreibung: Parameter des Typen erfragen Commando --------------------------------------------------------------------*/ -rtl::OUString SwDDEField::GetPar2() const +OUString SwDDEField::GetPar2() const { return ((const SwDDEFieldType*)GetTyp())->GetCmd(); } -void SwDDEField::SetPar2(const rtl::OUString& rStr) +void SwDDEField::SetPar2(const OUString& rStr) { ((SwDDEFieldType*)GetTyp())->SetCmd(rStr); } diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 98bb00f9f77d..5783b506aae9 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -96,7 +96,6 @@ #define URL_DECODE INetURLObject::DECODE_UNAMBIGUOUS -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace nsSwDocInfoSubType; @@ -236,12 +235,12 @@ SwField* SwPageNumberField::Copy() const return pTmp; } -rtl::OUString SwPageNumberField::GetPar2() const +OUString SwPageNumberField::GetPar2() const { return OUString::number(nOffset); } -void SwPageNumberField::SetPar2(const rtl::OUString& rStr) +void SwPageNumberField::SetPar2(const OUString& rStr) { nOffset = (short)rStr.toInt32(); } @@ -394,7 +393,7 @@ bool SwAuthorField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const break; case FIELD_PROP_PAR1: - rAny <<= rtl::OUString(GetContent()); + rAny <<= OUString(GetContent()); break; default: @@ -951,7 +950,7 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, break; case DI_CUSTOM: { - ::rtl::OUString sVal; + OUString sVal; try { uno::Any aAny; @@ -1109,7 +1108,7 @@ String SwDocInfoField::Expand() const if ( !IsFixed() ) { // if the field is "fixed" we don't update it from the property - ::rtl::OUString sVal; + OUString sVal; uno::Reference < script::XTypeConverter > xConverter( script::Converter::create(comphelper::getProcessComponentContext()) ); util::Date aDate; util::DateTime aDateTime; @@ -1130,14 +1129,14 @@ String SwDocInfoField::Expand() const } else if( aAny >>= aDuration ) { - String sText = aDuration.Negative ? rtl::OUString('-') : rtl::OUString('+'); + String sText = aDuration.Negative ? OUString('-') : OUString('+'); sText += ViewShell::GetShellRes()->sDurationFormat; - sText.SearchAndReplace(rtl::OUString("%1"), OUString::number( aDuration.Years ) ); - sText.SearchAndReplace(rtl::OUString("%2"), OUString::number( aDuration.Months ) ); - sText.SearchAndReplace(rtl::OUString("%3"), OUString::number( aDuration.Days ) ); - sText.SearchAndReplace(rtl::OUString("%4"), OUString::number( aDuration.Hours ) ); - sText.SearchAndReplace(rtl::OUString("%5"), OUString::number( aDuration.Minutes) ); - sText.SearchAndReplace(rtl::OUString("%6"), OUString::number( aDuration.Seconds) ); + sText.SearchAndReplace(OUString("%1"), OUString::number( aDuration.Years ) ); + sText.SearchAndReplace(OUString("%2"), OUString::number( aDuration.Months ) ); + sText.SearchAndReplace(OUString("%3"), OUString::number( aDuration.Days ) ); + sText.SearchAndReplace(OUString("%4"), OUString::number( aDuration.Hours ) ); + sText.SearchAndReplace(OUString("%5"), OUString::number( aDuration.Minutes) ); + sText.SearchAndReplace(OUString("%6"), OUString::number( aDuration.Seconds) ); sVal = sText; } else @@ -1243,7 +1242,7 @@ bool SwDocInfoField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const } break; case FIELD_PROP_PAR3: - rAny <<= rtl::OUString(Expand()); + rAny <<= OUString(Expand()); break; case FIELD_PROP_BOOL2: { @@ -1488,13 +1487,13 @@ SwField* SwHiddenTxtField::Copy() const Beschreibung: Bedingung setzen --------------------------------------------------------------------*/ -void SwHiddenTxtField::SetPar1(const rtl::OUString& rStr) +void SwHiddenTxtField::SetPar1(const OUString& rStr) { aCond = rStr; bCanToggle = aCond.getLength() > 0; } -const rtl::OUString& SwHiddenTxtField::GetPar1() const +const OUString& SwHiddenTxtField::GetPar1() const { return aCond; } @@ -1503,7 +1502,7 @@ const rtl::OUString& SwHiddenTxtField::GetPar1() const Beschreibung: True/False Text --------------------------------------------------------------------*/ -void SwHiddenTxtField::SetPar2(const rtl::OUString& rStr) +void SwHiddenTxtField::SetPar2(const OUString& rStr) { if (nSubType == TYP_CONDTXTFLD) { @@ -1520,7 +1519,7 @@ void SwHiddenTxtField::SetPar2(const rtl::OUString& rStr) aTRUETxt = rStr; } -rtl::OUString SwHiddenTxtField::GetPar2() const +OUString SwHiddenTxtField::GetPar2() const { String aRet(aTRUETxt); if(nSubType == TYP_CONDTXTFLD) @@ -1538,7 +1537,7 @@ sal_uInt16 SwHiddenTxtField::GetSubType() const bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { - const rtl::OUString* pOut = 0; + const OUString* pOut = 0; switch( nWhichId ) { case FIELD_PROP_PAR1: @@ -1573,7 +1572,7 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { case FIELD_PROP_PAR1: { - rtl::OUString sVal; + OUString sVal; rAny >>= sVal; SetPar1(sVal); } @@ -1710,12 +1709,12 @@ bool SwHiddenParaField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) Beschreibung: Bedingung setzen --------------------------------------------------------------------*/ -void SwHiddenParaField::SetPar1(const rtl::OUString& rStr) +void SwHiddenParaField::SetPar1(const OUString& rStr) { aCond = rStr; } -const rtl::OUString& SwHiddenParaField::GetPar1() const +const OUString& SwHiddenParaField::GetPar1() const { return aCond; } @@ -1800,12 +1799,12 @@ SwField* SwPostItField::Copy() const Beschreibung: Author setzen --------------------------------------------------------------------*/ -void SwPostItField::SetPar1(const rtl::OUString& rStr) +void SwPostItField::SetPar1(const OUString& rStr) { sAuthor = rStr; } -const rtl::OUString& SwPostItField::GetPar1() const +const OUString& SwPostItField::GetPar1() const { return sAuthor; } @@ -1814,27 +1813,27 @@ const rtl::OUString& SwPostItField::GetPar1() const Beschreibung: Text fuers PostIt setzen --------------------------------------------------------------------*/ -void SwPostItField::SetPar2(const rtl::OUString& rStr) +void SwPostItField::SetPar2(const OUString& rStr) { sTxt = rStr; } -rtl::OUString SwPostItField::GetPar2() const +OUString SwPostItField::GetPar2() const { return sTxt; } -const rtl::OUString& SwPostItField::GetInitials() const +const OUString& SwPostItField::GetInitials() const { return sInitials; } -void SwPostItField::SetName(const rtl::OUString& rName) +void SwPostItField::SetName(const OUString& rName) { sName = rName; } -const rtl::OUString& SwPostItField::GetName() const +const OUString& SwPostItField::GetName() const { return sName; } @@ -2146,12 +2145,12 @@ SwField* SwRefPageSetField::Copy() const return new SwRefPageSetField( (SwRefPageSetFieldType*)GetTyp(), nOffset, bOn ); } -rtl::OUString SwRefPageSetField::GetPar2() const +OUString SwRefPageSetField::GetPar2() const { return OUString::number(GetOffset()); } -void SwRefPageSetField::SetPar2(const rtl::OUString& rStr) +void SwRefPageSetField::SetPar2(const OUString& rStr) { SetOffset( (short) rStr.toInt32() ); } @@ -2477,7 +2476,7 @@ SwJumpEditField::SwJumpEditField( SwJumpEditFieldType* pTyp, sal_uInt32 nForm, String SwJumpEditField::Expand() const { - return rtl::OUStringBuffer().append('<'). + return OUStringBuffer().append('<'). append(sTxt).append('>').makeStringAndClear(); } @@ -2489,24 +2488,24 @@ SwField* SwJumpEditField::Copy() const // Platzhalter-Text -const rtl::OUString& SwJumpEditField::GetPar1() const +const OUString& SwJumpEditField::GetPar1() const { return sTxt; } -void SwJumpEditField::SetPar1(const rtl::OUString& rStr) +void SwJumpEditField::SetPar1(const OUString& rStr) { sTxt = rStr; } // HinweisText -rtl::OUString SwJumpEditField::GetPar2() const +OUString SwJumpEditField::GetPar2() const { return sHelp; } -void SwJumpEditField::SetPar2(const rtl::OUString& rStr) +void SwJumpEditField::SetPar2(const OUString& rStr) { sHelp = rStr; } @@ -2610,12 +2609,12 @@ SwField* SwCombinedCharField::Copy() const sCharacters ); } -const rtl::OUString& SwCombinedCharField::GetPar1() const +const OUString& SwCombinedCharField::GetPar1() const { return sCharacters; } -void SwCombinedCharField::SetPar1(const rtl::OUString& rStr) +void SwCombinedCharField::SetPar1(const OUString& rStr) { sCharacters = rStr.copy(0, std::min(rStr.getLength(), MAX_COMBINED_CHARACTERS)); } @@ -2626,7 +2625,7 @@ bool SwCombinedCharField::QueryValue( uno::Any& rAny, switch( nWhichId ) { case FIELD_PROP_PAR1: - rAny <<= rtl::OUString( sCharacters ); + rAny <<= OUString( sCharacters ); break; default: OSL_FAIL("illegal property"); @@ -2641,7 +2640,7 @@ bool SwCombinedCharField::PutValue( const uno::Any& rAny, { case FIELD_PROP_PAR1: { - rtl::OUString sTmp; + OUString sTmp; rAny >>= sTmp; SetPar1(sTmp); } diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 4407919bb519..fd7e96a12000 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -57,7 +57,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::text; -using ::rtl::OUString; //----------------------------------------------------------------------------- static sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType) @@ -386,12 +385,12 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld ) } } -rtl::OUString SwGetExpField::GetPar2() const +OUString SwGetExpField::GetPar2() const { return GetFormula(); } -void SwGetExpField::SetPar2(const rtl::OUString& rStr) +void SwGetExpField::SetPar2(const OUString& rStr) { SetFormula(rStr); } @@ -443,7 +442,7 @@ bool SwGetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const } break; case FIELD_PROP_PAR4: - rAny <<= rtl::OUString(GetExpStr()); + rAny <<= OUString(GetExpStr()); break; default: return SwField::QueryValue(rAny, nWhichId); @@ -495,7 +494,7 @@ SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, sal_uInt1 : SwValueFieldType( pDc, RES_SETEXPFLD ), sName( rName ), pOutlChgNd( 0 ), - sDelim( rtl::OUString(".") ), + sDelim( OUString(".") ), nType(nTyp), nLevel( UCHAR_MAX ), bDeleted( sal_False ) { @@ -513,7 +512,7 @@ SwFieldType* SwSetExpFieldType::Copy() const return pNew; } -const rtl::OUString& SwSetExpFieldType::GetName() const +const OUString& SwSetExpFieldType::GetName() const { return sName; } @@ -674,7 +673,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) if( ::GetString( rAny, sTmp ).Len() ) SetDelimiter( sTmp ); else - SetDelimiter(rtl::OUString(" ")); + SetDelimiter(OUString(" ")); } break; case FIELD_PROP_SHORT1: @@ -944,12 +943,12 @@ xub_StrLen SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc Beschreibung: Parameter setzen --------------------------------------------------------------------*/ -const rtl::OUString& SwSetExpField::GetPar1() const +const OUString& SwSetExpField::GetPar1() const { return ((const SwSetExpFieldType*)GetTyp())->GetName(); } -rtl::OUString SwSetExpField::GetPar2() const +OUString SwSetExpField::GetPar2() const { sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType(); @@ -958,7 +957,7 @@ rtl::OUString SwSetExpField::GetPar2() const return GetExpandedFormula(); } -void SwSetExpField::SetPar2(const rtl::OUString& rStr) +void SwSetExpField::SetPar2(const OUString& rStr) { sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType(); @@ -1084,12 +1083,12 @@ bool SwInputField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) Beschreibung: Bedingung setzen --------------------------------------------------------------------*/ -void SwInputField::SetPar1(const rtl::OUString& rStr) +void SwInputField::SetPar1(const OUString& rStr) { aContent = rStr; } -const rtl::OUString& SwInputField::GetPar1() const +const OUString& SwInputField::GetPar1() const { return aContent; } @@ -1098,12 +1097,12 @@ const rtl::OUString& SwInputField::GetPar1() const Beschreibung: True/False Text --------------------------------------------------------------------*/ -void SwInputField::SetPar2(const rtl::OUString& rStr) +void SwInputField::SetPar2(const OUString& rStr) { aPText = rStr; } -rtl::OUString SwInputField::GetPar2() const +OUString SwInputField::GetPar2() const { return aPText; } @@ -1200,7 +1199,7 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const } break; case FIELD_PROP_PAR4: - rAny <<= rtl::OUString(GetExpStr()); + rAny <<= OUString(GetExpStr()); break; default: return SwField::QueryValue(rAny, nWhichId); diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 93532197dbdf..da56d0dd1446 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -141,7 +141,7 @@ SwFieldType::SwFieldType( sal_uInt16 nWhichId ) { } -const rtl::OUString& SwFieldType::GetName() const +const OUString& SwFieldType::GetName() const { return aEmptyOUStr; } @@ -257,14 +257,14 @@ String SwField::GetFieldName() const Beschreibung: Parameter setzen auslesen --------------------------------------------------------------------*/ -const rtl::OUString& SwField::GetPar1() const +const OUString& SwField::GetPar1() const { return aEmptyOUStr; } -rtl::OUString SwField::GetPar2() const +OUString SwField::GetPar2() const { - return rtl::OUString(); + return OUString(); } String SwField::GetFormula() const @@ -272,10 +272,10 @@ String SwField::GetFormula() const return GetPar2(); } -void SwField::SetPar1(const rtl::OUString& ) +void SwField::SetPar1(const OUString& ) {} -void SwField::SetPar2(const rtl::OUString& ) +void SwField::SetPar2(const OUString& ) {} sal_uInt16 SwField::GetSubType() const diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index 3d841e4be409..ddd92926b508 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -106,16 +106,16 @@ void SwDateTimeField::SetSubType(sal_uInt16 nType) nSubType = nType; } -void SwDateTimeField::SetPar2(const rtl::OUString& rStr) +void SwDateTimeField::SetPar2(const OUString& rStr) { nOffset = rStr.toInt32(); } -rtl::OUString SwDateTimeField::GetPar2() const +OUString SwDateTimeField::GetPar2() const { if (nOffset) return OUString::number(nOffset); - return rtl::OUString(); + return OUString(); } void SwDateTimeField::SetDateTime(const DateTime& rDT) diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index 31cd495d0c2e..417f5e6aa236 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -28,7 +28,6 @@ using namespace com::sun::star; -using rtl::OUString; using std::vector; static String aEmptyString; @@ -68,7 +67,7 @@ String SwDropDownField::Expand() const String sSelect = GetSelectedItem(); if(!sSelect.Len()) { - vector::const_iterator aIt = aValues.begin(); + vector::const_iterator aIt = aValues.begin(); if ( aIt != aValues.end()) sSelect = *aIt; } @@ -83,27 +82,27 @@ SwField * SwDropDownField::Copy() const return new SwDropDownField(*this); } -const rtl::OUString & SwDropDownField::GetPar1() const +const OUString & SwDropDownField::GetPar1() const { return GetSelectedItem(); } -rtl::OUString SwDropDownField::GetPar2() const +OUString SwDropDownField::GetPar2() const { return GetName(); } -void SwDropDownField::SetPar1(const rtl::OUString & rStr) +void SwDropDownField::SetPar1(const OUString & rStr) { SetSelectedItem(rStr); } -void SwDropDownField::SetPar2(const rtl::OUString & rName) +void SwDropDownField::SetPar2(const OUString & rName) { SetName(rName); } -void SwDropDownField::SetItems(const vector & rItems) +void SwDropDownField::SetItems(const vector & rItems) { aValues = rItems; aSelectedItem = aEmptyString; @@ -125,7 +124,7 @@ uno::Sequence SwDropDownField::GetItemSequence() const uno::Sequence aSeq( aValues.size() ); OUString* pSeq = aSeq.getArray(); int i = 0; - vector::const_iterator aIt; + vector::const_iterator aIt; for (aIt = aValues.begin(); aIt != aValues.end(); ++aIt) { @@ -136,50 +135,50 @@ uno::Sequence SwDropDownField::GetItemSequence() const return aSeq; } -const rtl::OUString & SwDropDownField::GetSelectedItem() const +const OUString & SwDropDownField::GetSelectedItem() const { return aSelectedItem; } -const rtl::OUString & SwDropDownField::GetName() const +const OUString & SwDropDownField::GetName() const { return aName; } -const rtl::OUString & SwDropDownField::GetHelp() const +const OUString & SwDropDownField::GetHelp() const { return aHelp; } -const rtl::OUString & SwDropDownField::GetToolTip() const +const OUString & SwDropDownField::GetToolTip() const { return aToolTip; } -sal_Bool SwDropDownField::SetSelectedItem(const rtl::OUString & rItem) +sal_Bool SwDropDownField::SetSelectedItem(const OUString & rItem) { - vector::const_iterator aIt = + vector::const_iterator aIt = std::find(aValues.begin(), aValues.end(), rItem); if (aIt != aValues.end()) aSelectedItem = *aIt; else - aSelectedItem = rtl::OUString(); + aSelectedItem = OUString(); return (aIt != aValues.end()); } -void SwDropDownField::SetName(const rtl::OUString & rName) +void SwDropDownField::SetName(const OUString & rName) { aName = rName; } -void SwDropDownField::SetHelp(const rtl::OUString & rHelp) +void SwDropDownField::SetHelp(const OUString & rHelp) { aHelp = rHelp; } -void SwDropDownField::SetToolTip(const rtl::OUString & rToolTip) +void SwDropDownField::SetToolTip(const OUString & rToolTip) { aToolTip = rToolTip; } @@ -219,7 +218,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, { case FIELD_PROP_PAR1: { - rtl::OUString aTmpStr; + OUString aTmpStr; rVal >>= aTmpStr; SetSelectedItem(aTmpStr); @@ -228,7 +227,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, case FIELD_PROP_PAR2: { - rtl::OUString aTmpStr; + OUString aTmpStr; rVal >>= aTmpStr; SetName(aTmpStr); @@ -237,7 +236,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, case FIELD_PROP_PAR3: { - rtl::OUString aTmpStr; + OUString aTmpStr; rVal >>= aTmpStr; SetHelp(aTmpStr); @@ -246,7 +245,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal, case FIELD_PROP_PAR4: { - rtl::OUString aTmpStr; + OUString aTmpStr; rVal >>= aTmpStr; SetToolTip(aTmpStr); diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index c4a7e580bec3..d62f72a56d4d 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; /*-------------------------------------------------------------------- Beschreibung: MacroFeldtypen @@ -137,13 +136,13 @@ SvxMacro SwMacroField::GetSvxMacro() const Beschreibung: LibName und MacroName --------------------------------------------------------------------*/ -void SwMacroField::SetPar1(const rtl::OUString& rStr) +void SwMacroField::SetPar1(const OUString& rStr) { aMacro = rStr; bIsScriptURL = isScriptURL(aMacro); } -const rtl::OUString& SwMacroField::GetPar1() const +const OUString& SwMacroField::GetPar1() const { return aMacro; } @@ -152,12 +151,12 @@ const rtl::OUString& SwMacroField::GetPar1() const Beschreibung: Macrotext --------------------------------------------------------------------*/ -void SwMacroField::SetPar2(const rtl::OUString& rStr) +void SwMacroField::SetPar2(const OUString& rStr) { aText = rStr; } -rtl::OUString SwMacroField::GetPar2() const +OUString SwMacroField::GetPar2() const { return aText; } @@ -186,7 +185,7 @@ bool SwMacroField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { - rtl::OUString sTmp; + OUString sTmp; switch( nWhichId ) { case FIELD_PROP_PAR1: @@ -213,14 +212,14 @@ bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) // create an internally used macro name from the library and macro name parts void SwMacroField::CreateMacroString( - rtl::OUString& rMacro, + OUString& rMacro, const String& rMacroName, const String& rLibraryName ) { // concatenate library and name; use dot only if both strings have content rMacro = rLibraryName; if ( rLibraryName.Len() > 0 && rMacroName.Len() > 0 ) - rMacro += rtl::OUString('.'); + rMacro += OUString('.'); rMacro += rMacroName; } diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 43eae4b57bd3..68a00d7a47a4 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -65,7 +65,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::lang; -using ::rtl::OUString; extern void InsertSort( std::vector& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 ); @@ -294,7 +293,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr ) return ; } // where is the category name (e.g. "Illustration")? - rtl::OUString const Text = pTxtNd->GetTxt(); + OUString const Text = pTxtNd->GetTxt(); unsigned const nCatStart = Text.indexOf(sSetRefName); unsigned const nCatEnd = nCatStart == unsigned(-1) ? unsigned(-1) : nCatStart + sSetRefName.getLength(); @@ -585,19 +584,19 @@ SwField* SwGetRefField::Copy() const --------------------------------------------------------------------*/ -const rtl::OUString& SwGetRefField::GetPar1() const +const OUString& SwGetRefField::GetPar1() const { return sSetRefName; } -void SwGetRefField::SetPar1( const rtl::OUString& rName ) +void SwGetRefField::SetPar1( const OUString& rName ) { sSetRefName = rName; } -rtl::OUString SwGetRefField::GetPar2() const +OUString SwGetRefField::GetPar2() const { return Expand(); } @@ -658,11 +657,11 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const break; } } - rAny <<= rtl::OUString(sTmp); + rAny <<= OUString(sTmp); } break; case FIELD_PROP_PAR3: - rAny <<= rtl::OUString(Expand()); + rAny <<= OUString(Expand()); break; case FIELD_PROP_SHORT1: rAny <<= (sal_Int16)nSeqNo; diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx index 4aa7bcc04841..8432bad839c0 100644 --- a/sw/source/core/fields/scrptfld.cxx +++ b/sw/source/core/fields/scrptfld.cxx @@ -23,7 +23,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; /*-------------------------------------------------------------------- Beschreibung: ScriptField --------------------------------------------------------------------*/ @@ -68,12 +67,12 @@ SwField* SwScriptField::Copy() const Beschreibung: Type setzen --------------------------------------------------------------------*/ -void SwScriptField::SetPar1( const rtl::OUString& rStr ) +void SwScriptField::SetPar1( const OUString& rStr ) { sType = rStr; } -const rtl::OUString& SwScriptField::GetPar1() const +const OUString& SwScriptField::GetPar1() const { return sType; } @@ -82,13 +81,13 @@ const rtl::OUString& SwScriptField::GetPar1() const Beschreibung: Code setzen --------------------------------------------------------------------*/ -void SwScriptField::SetPar2( const rtl::OUString& rStr ) +void SwScriptField::SetPar2( const OUString& rStr ) { sCode = rStr; } -rtl::OUString SwScriptField::GetPar2() const +OUString SwScriptField::GetPar2() const { return sCode; } diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index e2af9eccd654..8b425e03996b 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -30,7 +30,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; SwTblFieldType::SwTblFieldType(SwDoc* pDocPtr) @@ -64,7 +63,7 @@ SwTblField::SwTblField( SwTblFieldType* pInitType, const String& rFormel, : SwValueField( pInitType, nFmt ), SwTableFormula( rFormel ), nSubType(nType) { - sExpand = rtl::OUString('0'); + sExpand = OUString('0'); } @@ -160,13 +159,13 @@ void SwTblField::SetValue( const double& rVal ) --------------------------------------------------------------------*/ -rtl::OUString SwTblField::GetPar2() const +OUString SwTblField::GetPar2() const { return SwTableFormula::GetFormula(); } -void SwTblField::SetPar2(const rtl::OUString& rStr) +void SwTblField::SetPar2(const OUString& rStr) { SetFormula( rStr ); } @@ -181,7 +180,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const sal_uInt16 nOldSubType = nSubType; SwTblField* pThis = (SwTblField*)this; pThis->nSubType |= nsSwExtendedSubType::SUB_CMD; - rAny <<= rtl::OUString( Expand() ); + rAny <<= OUString( Expand() ); pThis->nSubType = nOldSubType; } break; @@ -192,7 +191,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const } break; case FIELD_PROP_PAR1: - rAny <<= rtl::OUString(GetExpStr()); + rAny <<= OUString(GetExpStr()); break; case FIELD_PROP_FORMAT: rAny <<= (sal_Int32)GetFormat(); diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx index 0ae5e2eb4541..fdc145ae461e 100644 --- a/sw/source/core/fields/textapi.cxx +++ b/sw/source/core/fields/textapi.cxx @@ -39,7 +39,7 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet() SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index aa5c181ebb77..df7253b60bcb 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; /*-------------------------------------------------------------------- Beschreibung: Benutzerfelder @@ -86,7 +85,7 @@ void SwUserField::SetValue( const double& rVal ) Beschreibung: Name --------------------------------------------------------------------*/ -const rtl::OUString& SwUserField::GetPar1() const +const OUString& SwUserField::GetPar1() const { return ((const SwUserFieldType*)GetTyp())->GetName(); } @@ -95,12 +94,12 @@ const rtl::OUString& SwUserField::GetPar1() const Beschreibung: Content --------------------------------------------------------------------*/ -rtl::OUString SwUserField::GetPar2() const +OUString SwUserField::GetPar2() const { return ((SwUserFieldType*)GetTyp())->GetContent(GetFormat()); } -void SwUserField::SetPar2(const rtl::OUString& rStr) +void SwUserField::SetPar2(const OUString& rStr) { ((SwUserFieldType*)GetTyp())->SetContent(rStr, GetFormat()); } @@ -212,7 +211,7 @@ SwFieldType* SwUserFieldType::Copy() const return pTmp; } -const rtl::OUString& SwUserFieldType::GetName() const +const OUString& SwUserFieldType::GetName() const { return aName; } @@ -301,7 +300,7 @@ bool SwUserFieldType::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= (double) nValue; break; case FIELD_PROP_PAR2: - rAny <<= rtl::OUString(aContent); + rAny <<= OUString(aContent); break; case FIELD_PROP_BOOL1: { diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 9ab687510da2..2819819160b5 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -69,7 +69,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; // To register Flys in Flys in ... diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 0c0ce9494592..72a0a8920478 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -2353,7 +2353,7 @@ sal_Bool SwFEShell::GetAutoSum( String& rFml ) const if( !pTab ) return sal_False; - rFml = rtl::OUString::createFromAscii( sCalc_Sum ); + rFml = OUString::createFromAscii( sCalc_Sum ); SwCellFrms aCells; if( ::GetAutoSumSel( *this, aCells )) @@ -2383,7 +2383,7 @@ sal_Bool SwFEShell::GetAutoSum( String& rFml ) const // restore previous spaces! for( size_t i = aCells.size(); n+1 < i; ) { - String sTmp(rtl::OUString("|<")); + String sTmp(OUString("|<")); sTmp += aCells[ --i ]->GetTabBox()->GetName(); sTmp += '>'; rFml.Insert( sTmp, nInsPos ); @@ -2420,7 +2420,7 @@ sal_Bool SwFEShell::GetAutoSum( String& rFml ) const // restore previous spaces! for( size_t i = aCells.size(); n+1 < i; ) { - String sTmp(rtl::OUString("|<" )); + String sTmp(OUString("|<" )); sTmp += aCells[ --i ]->GetTabBox()->GetName(); sTmp += '>'; rFml.Insert( sTmp, nInsPos ); diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 96365a4519a1..5b52817bc967 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -885,7 +885,7 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf( String aExtStr = _aStrmName.Copy( nExtPos ); if ( GetGrfObj().GetType() != GRAPHIC_NONE ) { - _aStrmName = rtl::OStringToOUString(GetGrfObj().GetUniqueID(), + _aStrmName = OStringToOUString(GetGrfObj().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); _aStrmName += aExtStr; } diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index cf19e6037049..e5f08b342c27 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -27,7 +27,7 @@ namespace sw { namespace mark { - typedef boost::unordered_map MarkBasenameMapUniqueOffset_t; + typedef boost::unordered_map MarkBasenameMapUniqueOffset_t; class MarkManager : private ::boost::noncopyable @@ -36,19 +36,19 @@ namespace sw { public: MarkManager(/*[in/out]*/ SwDoc& rDoc); // IDocumentMarkAccess - virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const ::rtl::OUString& rName, IDocumentMarkAccess::MarkType eMark); + virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark); virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, - const rtl::OUString& rType); + const OUString& rName, + const OUString& rType); virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, - const rtl::OUString& rName, - const rtl::OUString& rType); + const OUString& rName, + const OUString& rType); virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode, IDocumentMarkAccess::MarkType eMark); virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM); - virtual bool renameMark(::sw::mark::IMark* io_pMark, const ::rtl::OUString& rNewName); + virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName); virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const xub_StrLen nOffset); virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const xub_StrLen nOffset); @@ -64,14 +64,14 @@ namespace sw { virtual const_iterator_t getMarksBegin() const; virtual const_iterator_t getMarksEnd() const; virtual sal_Int32 getMarksCount() const; - virtual const_iterator_t findMark(const ::rtl::OUString& rName) const; - virtual bool hasMark(const ::rtl::OUString& rName) const; + virtual const_iterator_t findMark(const OUString& rName) const; + virtual bool hasMark(const OUString& rName) const; // bookmarks virtual const_iterator_t getBookmarksBegin() const; virtual const_iterator_t getBookmarksEnd() const; virtual sal_Int32 getBookmarksCount() const; - virtual const_iterator_t findBookmark(const ::rtl::OUString& rName) const; + virtual const_iterator_t findBookmark(const OUString& rName) const; // Fieldmarks virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const; @@ -81,13 +81,13 @@ namespace sw { void dumpAsXml(xmlTextWriterPtr w); private: // make names - ::rtl::OUString getUniqueMarkName(const ::rtl::OUString& rName) const; + OUString getUniqueMarkName(const OUString& rName) const; void sortMarks(); container_t m_vMarks; container_t m_vBookmarks; container_t m_vFieldmarks; - boost::unordered_set m_aMarkNamesSet; + boost::unordered_set m_aMarkNamesSet; mutable MarkBasenameMapUniqueOffset_t m_aMarkBasenameMapUniqueOffset; SwDoc * const m_pDoc; }; diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index 10597655f56e..ff3c637b649a 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -34,7 +34,7 @@ public: SwXMLBlockListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, SwXMLTextBlocks & rBlocks, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLBlockListExport ( void ) {} @@ -53,7 +53,7 @@ public: SwXMLTextBlockExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, SwXMLTextBlocks & rBlocks, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLTextBlockExport ( void ) {} diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 27b470143fb1..bbe47d578c31 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -33,7 +33,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -59,7 +59,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx index 3fd001aff5cf..204de9a0cffc 100644 --- a/sw/source/core/inc/SwXMLBlockListContext.hxx +++ b/sw/source/core/inc/SwXMLBlockListContext.hxx @@ -33,12 +33,12 @@ private: public: SwXMLBlockListContext( SwXMLBlockListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLBlockListContext ( void ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -49,7 +49,7 @@ class SwXMLBlockContext : public SvXMLImportContext public: SwXMLBlockContext( SwXMLBlockListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLBlockContext ( void ); @@ -63,11 +63,11 @@ private: public: SwXMLTextBlockDocumentContext( SwXMLTextBlockImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLTextBlockDocumentContext ( void ); @@ -81,11 +81,11 @@ private: public: SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLTextBlockBodyContext ( void ); @@ -99,11 +99,11 @@ private: public: SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~SwXMLTextBlockTextContext ( void ); @@ -117,10 +117,10 @@ private: public: SwXMLTextBlockParContext( SwXMLTextBlockImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); ~SwXMLTextBlockParContext ( void ); }; diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index df6aefd52bd1..36486638d61b 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -39,7 +39,7 @@ protected: sal_Bool bBlock; SfxObjectShellRef xDocShellRef; sal_uInt16 nFlags; - rtl::OUString aPackageName; + OUString aPackageName; SfxMediumRef xMedium; void ReadInfo(); @@ -55,7 +55,7 @@ public: SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFile ); void AddName( const String&, const String&, const String&, sal_Bool bOnlyTxt = sal_False ); virtual void AddName( const String&, const String&, sal_Bool bOnlyTxt = sal_False ); - rtl::OUString GeneratePackageName ( const String& rShort ); + OUString GeneratePackageName ( const String& rShort ); virtual ~SwXMLTextBlocks(); //virtual sal_Bool IsOld() const; virtual sal_uLong Delete( sal_uInt16 ); diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index 3bf50a620518..6df0bc2cb547 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -44,33 +44,33 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& rPropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) + virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& rPropertyName ) + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& rPropertyName ) + virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& rPropertyName ) + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; #endif diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx index 3e85c4d2be8e..54f335cd4d9d 100644 --- a/sw/source/core/inc/UndoDraw.hxx +++ b/sw/source/core/inc/UndoDraw.hxx @@ -45,7 +45,7 @@ public: virtual void UndoImpl( ::sw::UndoRedoContext & ); virtual void RedoImpl( ::sw::UndoRedoContext & ); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; class SwUndoDrawGroup : public SwUndo diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx index d24359bbdee5..e16644ce5811 100644 --- a/sw/source/core/inc/UndoInsert.hxx +++ b/sw/source/core/inc/UndoInsert.hxx @@ -81,14 +81,14 @@ public: SwRewriter SW_DLLPRIVATE MakeUndoReplaceRewriter(sal_uLong const ocurrences, - ::rtl::OUString const& sOld, ::rtl::OUString const& sNew); + OUString const& sOld, OUString const& sNew); class SwUndoReplace : public SwUndo { public: SwUndoReplace(SwPaM const& rPam, - ::rtl::OUString const& rInsert, bool const bRegExp); + OUString const& rInsert, bool const bRegExp); virtual ~SwUndoReplace(); diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx index 693deaafd48c..14696b380477 100644 --- a/sw/source/core/inc/UndoManager.hxx +++ b/sw/source/core/inc/UndoManager.hxx @@ -58,15 +58,15 @@ public: virtual SwUndoId EndUndo(SwUndoId const eUndoId, SwRewriter const*const pRewriter); virtual void DelAllUndoObj(); - virtual bool GetLastUndoInfo(::rtl::OUString *const o_pStr, + virtual bool GetLastUndoInfo(OUString *const o_pStr, SwUndoId *const o_pId) const; virtual SwUndoComments_t GetUndoComments() const; - virtual bool GetFirstRedoInfo(::rtl::OUString *const o_pStr) const; + virtual bool GetFirstRedoInfo(OUString *const o_pStr) const; virtual SwUndoComments_t GetRedoComments() const; virtual bool Repeat(::sw::RepeatContext & rContext, sal_uInt16 const nRepeatCnt); - virtual SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const; + virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const; virtual void AppendUndo(SwUndo *const pUndo); virtual void ClearRedo(); virtual bool IsUndoNodes(SwNodes const& rNodes) const; diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index 54dc9722d1ec..37f32ee19e17 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -49,7 +49,7 @@ namespace sw { public: virtual SwPosition& GetMarkPos() const { return *m_pPos1; } - virtual const ::rtl::OUString& GetName() const + virtual const OUString& GetName() const { return m_aName; } virtual SwPosition& GetOtherMarkPos() const { @@ -77,14 +77,14 @@ namespace sw { virtual bool IsExpanded() const { return static_cast< bool >(m_pPos2); } - virtual void SetName(const ::rtl::OUString& rName) + virtual void SetName(const OUString& rName) { m_aName = rName; } virtual void SetMarkPos(const SwPosition& rNewPos); virtual void SetOtherMarkPos(const SwPosition& rNewPos); virtual void ClearOtherMarkPos() { m_pPos2.reset(); } - virtual rtl::OUString ToString( ) const; + virtual OUString ToString( ) const; virtual void Swap() { @@ -109,11 +109,11 @@ namespace sw { // SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); - MarkBase(const SwPaM& rPaM, const ::rtl::OUString& rName); + MarkBase(const SwPaM& rPaM, const OUString& rName); ::boost::scoped_ptr m_pPos1; ::boost::scoped_ptr m_pPos2; - ::rtl::OUString m_aName; - static ::rtl::OUString GenerateNewName(const ::rtl::OUString& rPrefix); + OUString m_aName; + static OUString GenerateNewName(const OUString& rPrefix); ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XTextContent> m_wXBookmark; @@ -164,15 +164,15 @@ namespace sw { public: Bookmark(const SwPaM& rPaM, const KeyCode& rCode, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName); + const OUString& rName, + const OUString& rShortName); virtual void InitDoc(SwDoc* const io_Doc); - virtual const ::rtl::OUString& GetShortName() const + virtual const OUString& GetShortName() const { return m_sShortName; } virtual const KeyCode& GetKeyCode() const { return m_aCode; } - virtual void SetShortName(const ::rtl::OUString& rShortName) + virtual void SetShortName(const OUString& rShortName) { m_sShortName = rShortName; } virtual void SetKeyCode(const KeyCode& rCode) { m_aCode = rCode; } @@ -187,7 +187,7 @@ namespace sw { private: KeyCode m_aCode; - ::rtl::OUString m_sShortName; + OUString m_sShortName; }; class Fieldmark @@ -197,9 +197,9 @@ namespace sw { public: Fieldmark(const SwPaM& rPaM); - virtual ::rtl::OUString GetFieldname() const + virtual OUString GetFieldname() const { return m_aFieldname; } - virtual ::rtl::OUString GetFieldHelptext() const + virtual OUString GetFieldHelptext() const { return m_aFieldHelptext; } virtual IFieldmark::parameter_map_t* GetParameters() @@ -208,19 +208,19 @@ namespace sw { virtual const IFieldmark::parameter_map_t* GetParameters() const { return &m_vParams; } - virtual void SetFieldname(const ::rtl::OUString& aFieldname) + virtual void SetFieldname(const OUString& aFieldname) { m_aFieldname = aFieldname; } - virtual void SetFieldHelptext(const ::rtl::OUString& aFieldHelptext) + virtual void SetFieldHelptext(const OUString& aFieldHelptext) { m_aFieldHelptext = aFieldHelptext; } virtual void ReleaseDoc(SwDoc* const) = 0; virtual void Invalidate(); - virtual rtl::OUString ToString() const; + virtual OUString ToString() const; private: - ::rtl::OUString m_aFieldname; - ::rtl::OUString m_aFieldHelptext; + OUString m_aFieldname; + OUString m_aFieldHelptext; IFieldmark::parameter_map_t m_vParams; }; @@ -244,7 +244,7 @@ namespace sw { bool IsChecked() const; void SetChecked(bool checked); - virtual rtl::OUString toString( ) const; + virtual OUString toString( ) const; }; } } diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx index de96ad8f7f0e..314cdf83fdb5 100644 --- a/sw/source/core/inc/crossrefbookmark.hxx +++ b/sw/source/core/inc/crossrefbookmark.hxx @@ -32,9 +32,9 @@ namespace sw { public: CrossRefBookmark(const SwPaM& rPaM, const KeyCode& rCode, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName, - const ::rtl::OUString& rPrefix); + const OUString& rName, + const OUString& rShortName, + const OUString& rPrefix); virtual SwPosition& GetOtherMarkPos() const; virtual SwPosition& GetMarkStart() const @@ -65,10 +65,10 @@ namespace sw { public: CrossRefHeadingBookmark(const SwPaM& rPaM, const KeyCode& rCode, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName); - static ::rtl::OUString GenerateNewName(); - static bool IsLegalName(const ::rtl::OUString& rName); + const OUString& rName, + const OUString& rShortName); + static OUString GenerateNewName(); + static bool IsLegalName(const OUString& rName); }; class CrossRefNumItemBookmark @@ -77,10 +77,10 @@ namespace sw { public: CrossRefNumItemBookmark(const SwPaM& rPaM, const KeyCode& rCode, - const ::rtl::OUString& rName, - const ::rtl::OUString& rShortName); - static ::rtl::OUString GenerateNewName(); - static bool IsLegalName(const ::rtl::OUString& rName); + const OUString& rName, + const OUString& rShortName); + static OUString GenerateNewName(); + static bool IsLegalName(const OUString& rName); }; } } diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx index 1a6dc5ce4b29..53890928a549 100644 --- a/sw/source/core/inc/dumpfilter.hxx +++ b/sw/source/core/inc/dumpfilter.hxx @@ -71,11 +71,11 @@ namespace sw { throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx index 4a44f7df7088..b0df0acdc808 100644 --- a/sw/source/core/inc/finalthreadmanager.hxx +++ b/sw/source/core/inc/finalthreadmanager.hxx @@ -38,8 +38,8 @@ class SwPauseThreadStarting; namespace comp_FinalThreadManager { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL _create( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context ); @@ -53,9 +53,9 @@ public: explicit FinalThreadManager(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XJobManager: virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 1757c9ab7096..12d8fa3d5cdc 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -39,7 +39,7 @@ class SwFntCache : public SwCache public: inline SwFntCache() : SwCache(50 #ifdef DBG_UTIL - , rtl::OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache")) + , OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache")) #endif ) {} diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index ecf78a659e46..5117481f86ea 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -58,8 +58,8 @@ namespace sw { namespace mark { return m_eOrigBkmType; } private: - ::rtl::OUString m_aName; - ::rtl::OUString m_aShortName; + OUString m_aName; + OUString m_aShortName; KeyCode m_aCode; bool m_bSavePos; bool m_bSaveOtherPos; diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index 3343747e680f..138c177840d2 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -257,11 +257,11 @@ class SwHistoryBookmark : public SwHistoryHint virtual void SetInDoc(SwDoc * pDoc, bool); bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk); - const ::rtl::OUString& GetName() const; + const OUString& GetName() const; private: - const ::rtl::OUString m_aName; - ::rtl::OUString m_aShortName; + const OUString m_aName; + OUString m_aShortName; KeyCode m_aKeycode; const sal_uLong m_nNode; const sal_uLong m_nOtherNode; diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx index bb05d1dae161..f9ebf7be32b5 100644 --- a/sw/source/core/inc/scriptinfo.hxx +++ b/sw/source/core/inc/scriptinfo.hxx @@ -23,8 +23,7 @@ #include #include #include "swscanner.hxx" - -namespace rtl { class OUStringBuffer; } +#include class SwTxtNode; class Point; @@ -194,7 +193,7 @@ public: If set, the hidden ranges will be deleted from the text node. */ static sal_uInt16 MaskHiddenRanges( - const SwTxtNode& rNode, ::rtl::OUStringBuffer& rText, + const SwTxtNode& rNode, OUStringBuffer& rText, const xub_StrLen nStt, const xub_StrLen nEnd, const sal_Unicode cChar ); @@ -288,7 +287,7 @@ public: Start index of the text @return Returns if the language is an Arabic language */ - static bool IsArabicText( const rtl::OUString& rTxt, sal_Int32 nStt, sal_Int32 nLen ); + static bool IsArabicText( const OUString& rTxt, sal_Int32 nStt, sal_Int32 nLen ); /** Performes a thai justification on the kerning array @@ -308,7 +307,7 @@ public: The value which has to be added to the cells. @return The number of extra spaces in the given range */ - static sal_Int32 ThaiJustify( const rtl::OUString& rTxt, sal_Int32* pKernArray, + static sal_Int32 ThaiJustify( const OUString& rTxt, sal_Int32* pKernArray, sal_Int32* pScrArray, sal_Int32 nIdx, sal_Int32 nLen, sal_Int32 nNumberOfBlanks = 0, long nSpaceAdd = 0 ); diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 74f7f716c79a..e3a58653655b 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -38,7 +38,7 @@ class SwBlockName public: String aShort; // Short name String aLong; // Long name - rtl::OUString aPackageName; // Package name + OUString aPackageName; // Package name sal_Bool bIsOnlyTxtFlagInit : 1; // ist das Flag gueltig? sal_Bool bIsOnlyTxt : 1; // unformatted text sal_Bool bInPutMuchBlocks : 1; // put serveral block entries @@ -96,7 +96,7 @@ public: sal_uInt16 GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln const String& GetShortName( sal_uInt16 ) const; // Kurzname fuer Index zurueck const String& GetLongName( sal_uInt16 ) const; // Langname fuer Index zurueck - rtl::OUString GetPackageName( sal_uInt16 ) const; // Langname fuer Index zurueck + OUString GetPackageName( sal_uInt16 ) const; // Langname fuer Index zurueck const String& GetFileName() const {return aFile;} // phys. Dateinamen liefern void SetName( const String& rName ) // logic name diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index a2b5bfae3622..6899521853f7 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -72,7 +72,7 @@ class SwCache void DeleteObj( SwCacheObj *pObj ); #ifdef DBG_UTIL - rtl::OString m_aName; + OString m_aName; long m_nAppend; /// number of entries appended long m_nInsertFree; /// number of entries inserted on freed position long m_nReplace; /// number of LRU replacements @@ -94,7 +94,7 @@ public: //nur sal_uInt8 hineinstecken!!! #ifdef DBG_UTIL - SwCache( const sal_uInt16 nInitSize, const rtl::OString &rNm ); + SwCache( const sal_uInt16 nInitSize, const OString &rNm ); #else SwCache( const sal_uInt16 nInitSize ); #endif diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 9a28e020292e..fc127574107f 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -205,7 +205,7 @@ class SwTxtFrm: public SwCntntFrm void _CalcHeightOfLastLine( const bool _bUseFont = false ); // ST2 - SwWrongList* _SmartTagScan ( ::rtl::OUString aTxtToScan, SwWrongList *pSmartTagList, + SwWrongList* _SmartTagScan ( OUString aTxtToScan, SwWrongList *pSmartTagList, xub_StrLen nBegin,xub_StrLen nEnd, xub_StrLen nInsertPos, xub_StrLen nActPos, xub_StrLen &nChgStart, xub_StrLen &nChgEnd, diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index ca43a7992bdb..74354448568d 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -106,12 +106,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -133,7 +133,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -141,33 +141,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -175,9 +175,9 @@ public: ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& rName) + virtual void SAL_CALL setName(const OUString& rName) throw (::com::sun::star::uno::RuntimeException); // XTextContent @@ -203,14 +203,14 @@ class SwXFieldmarkParameters } // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); @@ -245,14 +245,14 @@ public: ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFieldType(void) + virtual OUString SAL_CALL getFieldType(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setFieldType(const ::rtl::OUString& description ) + virtual void SAL_CALL setFieldType(const OUString& description ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getParameters( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -261,7 +261,7 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index a35756e1ea42..94926455e1aa 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -36,10 +36,10 @@ class SwFmtINetFmt; class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor { - const ::rtl::OUString sImplName; + const OUString sImplName; //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); protected: virtual ~SwHyperlinkEventDescriptor(); @@ -66,7 +66,7 @@ public: // All these objects are an SwXFrame, so they can use a common implementation class SwFrameEventDescriptor : public SvEventDescriptor { - ::rtl::OUString sSwFrameEventDescriptor; + OUString sSwFrameEventDescriptor; SwXFrame& rFrame; @@ -77,7 +77,7 @@ public: ~SwFrameEventDescriptor(); - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); protected: @@ -88,7 +88,7 @@ protected: class SwFrameStyleEventDescriptor : public SvEventDescriptor { - ::rtl::OUString sSwFrameStyleEventDescriptor; + OUString sSwFrameStyleEventDescriptor; SwXFrameStyle& rStyle; @@ -97,7 +97,7 @@ public: ~SwFrameStyleEventDescriptor(); - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); protected: diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx index 63ebb68a6dfb..f83fcd8bfac8 100644 --- a/sw/source/core/inc/unofield.hxx +++ b/sw/source/core/inc/unofield.hxx @@ -93,12 +93,12 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XComponent virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -106,12 +106,12 @@ public: virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); - static rtl::OUString GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc); - static rtl::OUString LocalizeFormula(const SwSetExpField& rFld, const rtl::OUString& rFormula, sal_Bool bQuery); + static OUString GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc); + static OUString LocalizeFormula(const SwSetExpField& rFld, const OUString& rFormula, sal_Bool bQuery); SwFieldType* GetFldType(sal_Bool bDontCreate = sal_False) const; SwDoc* GetDoc() {return m_pDoc;} @@ -171,7 +171,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getTextFieldMaster(void) throw( ::com::sun::star::uno::RuntimeException ); //XTextField - virtual rtl::OUString SAL_CALL getPresentation(sal_Bool bShowCommand) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) throw( ::com::sun::star::uno::RuntimeException ); //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -184,17 +184,17 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //XUpdatable virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException); @@ -235,9 +235,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; #endif diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index 6de6eae6a81f..ff499abe71aa 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -50,7 +50,7 @@ class SwXFlatParagraph: public SwXTextMarkup { public: - SwXFlatParagraph( SwTxtNode& rTxtNode, rtl::OUString aExpandText, const ModelToViewHelper& rConversionMap ); + SwXFlatParagraph( SwTxtNode& rTxtNode, OUString aExpandText, const ModelToViewHelper& rConversionMap ); virtual ~SwXFlatParagraph(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); @@ -62,16 +62,16 @@ public: // text::XTextMarkup: virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException); - virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException); + virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException); // text::XFlatParagraph: - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException); virtual void SAL_CALL setChecked(::sal_Int32 nType, ::sal_Bool bVal) throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException); virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); - virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const ::rtl::OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); + virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException); @@ -87,7 +87,7 @@ private: SwXFlatParagraph( const SwXFlatParagraph & ); // not defined SwXFlatParagraph & operator = ( const SwXFlatParagraph & ); // not defined - rtl::OUString maExpandText; + OUString maExpandText; }; /****************************************************************************** diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx index c16c237c681b..da579dc0516c 100644 --- a/sw/source/core/inc/unofootnote.hxx +++ b/sw/source/core/inc/unofootnote.hxx @@ -103,12 +103,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -130,7 +130,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -138,33 +138,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -194,9 +194,9 @@ public: throw (::com::sun::star::uno::RuntimeException); // XFootnote - virtual ::rtl::OUString SAL_CALL getLabel() + virtual OUString SAL_CALL getLabel() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLabel(const ::rtl::OUString& rLabel) + virtual void SAL_CALL setLabel(const OUString& rLabel) throw (::com::sun::star::uno::RuntimeException); // XSimpleText diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx index b924bf10c6a5..c975617695cd 100644 --- a/sw/source/core/inc/unoidx.hxx +++ b/sw/source/core/inc/unoidx.hxx @@ -89,12 +89,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -116,7 +116,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -124,33 +124,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -158,9 +158,9 @@ public: ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& rName) + virtual void SAL_CALL setName(const OUString& rName) throw (::com::sun::star::uno::RuntimeException); // XRefreshable @@ -187,7 +187,7 @@ public: // XDocumentIndex - virtual ::rtl::OUString SAL_CALL getServiceName() + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); @@ -233,12 +233,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -260,7 +260,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -268,33 +268,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -312,9 +312,9 @@ public: throw (::com::sun::star::uno::RuntimeException); // XDocumentIndexMark - virtual rtl::OUString SAL_CALL getMarkEntry() + virtual OUString SAL_CALL getMarkEntry() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMarkEntry(const rtl::OUString& rIndexEntry) + virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index ff39750518f9..01f1d12401ef 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -125,12 +125,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -188,9 +188,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw (::com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getString() + virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(const rtl::OUString& rString) + virtual void SAL_CALL setString(const OUString& rString) throw (::com::sun::star::uno::RuntimeException); // XSimpleText @@ -207,7 +207,7 @@ public: virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, - const rtl::OUString& aString, sal_Bool bAbsorb) + const OUString& aString, sal_Bool bAbsorb) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< @@ -267,12 +267,12 @@ public: SwXMetaField(SwDoc *const pDoc); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName) + const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); @@ -294,7 +294,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -302,33 +302,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL - getPropertyValue(const ::rtl::OUString& rPropertyName) + getPropertyValue(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -346,7 +346,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // XTextField - virtual rtl::OUString SAL_CALL getPresentation(sal_Bool bShowCommand) + virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) throw (::com::sun::star::uno::RuntimeException); }; @@ -357,7 +357,7 @@ void getPrefixAndSuffix( ::com::sun::star::frame::XModel>& xModel, const ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable>& xMetaField, - ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix); + OUString *const o_pPrefix, OUString *const o_pSuffix); #endif // SW_UNOMETA_HXX diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx index bd1d02ded56e..54d2313eacdd 100644 --- a/sw/source/core/inc/unoparaframeenum.hxx +++ b/sw/source/core/inc/unoparaframeenum.hxx @@ -91,12 +91,12 @@ public: const enum ParaFrameMode eParaFrameMode, SwFrmFmt *const pFmt = 0); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 0eacbb0ddef3..be32d74647b2 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -132,14 +132,14 @@ private: protected: void SAL_CALL SetPropertyValues_Impl( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - void GetPropertyValues( const ::rtl::OUString *pPropertyNames, + void GetPropertyValues( const OUString *pPropertyNames, ::com::sun::star::uno::Any *pValues, sal_Int32 nLength ); @@ -147,7 +147,7 @@ protected: const SfxItemPropertySimpleEntry& rEntry, SwUnoCrsr *pUnoCrsr, SfxItemSet *&pSet ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL GetPropertyValuesTolerant_Impl( - const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames, + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, sal_Bool bDirectValuesOnly ) throw (::com::sun::star::uno::RuntimeException); virtual ~SwXTextPortion(); @@ -170,35 +170,35 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException ); //XTolerantMultiPropertySet - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -214,13 +214,13 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); //XContentEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const rtl::OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException ); void SetRefMark( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > xMark) @@ -297,11 +297,11 @@ public: ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); protected: @@ -339,7 +339,7 @@ public: // XPropertySet virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx index 98bd60eb902b..6aa02a2311d9 100644 --- a/sw/source/core/inc/unorefmark.hxx +++ b/sw/source/core/inc/unorefmark.hxx @@ -72,12 +72,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -99,7 +99,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -107,33 +107,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -141,9 +141,9 @@ public: ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& rName) + virtual void SAL_CALL setName(const OUString& rName) throw (::com::sun::star::uno::RuntimeException); // XTextContent diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index 26ea51c3d26c..a7a178e9ee8d 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -88,12 +88,12 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& rServiceName) + const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); @@ -115,7 +115,7 @@ public: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -123,33 +123,33 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rPropertyName, + const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener) throw (::com::sun::star::beans::UnknownPropertyException, @@ -158,29 +158,29 @@ public: // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL - getPropertyState(const ::rtl::OUString& rPropertyName) + getPropertyState(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< - ::rtl::OUString >& rPropertyNames) + OUString >& rPropertyNames) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyToDefault( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet virtual void SAL_CALL setPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues) @@ -190,11 +190,11 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertiesChangeListener( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) @@ -204,16 +204,16 @@ public: ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL firePropertiesChangeEvent( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& rName) + virtual void SAL_CALL setName(const OUString& rName) throw (::com::sun::star::uno::RuntimeException); // XTextContent diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index de7aa158399c..8a5b3c7eb362 100644 --- a/sw/source/core/inc/unotextmarkup.hxx +++ b/sw/source/core/inc/unotextmarkup.hxx @@ -52,7 +52,7 @@ public: // ::com::sun::star::text::XTextMarkup: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL commitTextMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::text::XMultiTextMarkup: virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -80,11 +80,11 @@ public: SwXStringKeyMap(); // ::com::sun::star::container::XStringKeyMap: - virtual ::com::sun::star::uno::Any SAL_CALL getValue(const ::rtl::OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException); - virtual ::sal_Bool SAL_CALL hasValue(const ::rtl::OUString & aKey) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertValue(const ::rtl::OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException); + virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException); + virtual ::sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException); virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); + virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); private: @@ -93,7 +93,7 @@ private: virtual ~SwXStringKeyMap() {} - std::map< rtl::OUString, ::com::sun::star::uno::Any > maMap; + std::map< OUString, ::com::sun::star::uno::Any > maMap; }; #endif diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 6b90bb26a085..a2add8569bcd 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -32,14 +32,14 @@ class SwWrongList; class SwWrongArea { public: - rtl::OUString maType; + OUString maType; com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > mxPropertyBag; xub_StrLen mnPos; xub_StrLen mnLen; SwWrongList* mpSubList; SwWrongArea() : mnPos(0), mnLen(0), mpSubList(NULL) {} - SwWrongArea( const rtl::OUString& rType, + SwWrongArea( const OUString& rType, com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, xub_StrLen nPos, xub_StrLen nLen, @@ -122,7 +122,7 @@ public: inline sal_uInt16 Count() const { return (sal_uInt16)maList.size(); } - inline void Insert( const rtl::OUString& rType, + inline void Insert( const OUString& rType, com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, xub_StrLen nNewPos, xub_StrLen nNewLen, sal_uInt16 nWhere ) { @@ -134,7 +134,7 @@ public: maList.insert(i, SwWrongArea( rType, xPropertyBag, nNewPos, nNewLen, 0 ) ); } - void Insert( const rtl::OUString& rType, + void Insert( const OUString& rType, com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, xub_StrLen nNewPos, xub_StrLen nNewLen ); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 8a4aef86e7cb..447f55d4b44a 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -103,7 +103,6 @@ #endif using namespace ::com::sun::star; -using ::rtl::OUString; TYPEINIT1(SwFmtVertOrient, SfxPoolItem); TYPEINIT1(SwFmtHoriOrient, SfxPoolItem); diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 9f383dca58b3..5b61015cbfc2 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -184,7 +184,7 @@ class SwImplProtocol SvFileStream *pStream; // output stream std::set *pFrmIds; // which FrmIds shall be logged ( NULL == all) std::vector aVars; // variables - rtl::OStringBuffer aLayer; // indentation of output (" " per start/end) + OStringBuffer aLayer; // indentation of output (" " per start/end) sal_uInt16 nTypes; // which types shall be logged sal_uInt16 nLineCount; // printed lines sal_uInt16 nMaxLines; // max lines to be printed @@ -192,8 +192,8 @@ class SwImplProtocol sal_uInt8 nTestMode; // special for test formating, logging may only be done in test formating. void _Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam ); bool NewStream(); - void CheckLine( rtl::OString& rLine ); - void SectFunc( rtl::OStringBuffer& rOut, const SwFrm* pFrm, sal_uLong nAct, void* pParam ); + void CheckLine( OString& rLine ); + void SectFunc( OStringBuffer& rOut, const SwFrm* pFrm, sal_uLong nAct, void* pParam ); public: SwImplProtocol(); ~SwImplProtocol(); @@ -292,7 +292,7 @@ void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void SwProtocol::Init() { nRecord = 0; - rtl::OUString aName("dbg_lay.go"); + OUString aName("dbg_lay.go"); SvFileStream aStream( aName, STREAM_READ ); if( aStream.IsOpen() ) { @@ -325,7 +325,7 @@ SwImplProtocol::SwImplProtocol() bool SwImplProtocol::NewStream() { - rtl::OUString aName("dbg_lay.out"); + OUString aName("dbg_lay.out"); nLineCount = 0; pStream = new SvFileStream( aName, STREAM_WRITE | STREAM_TRUNC ); if( pStream->GetError() ) @@ -352,7 +352,7 @@ SwImplProtocol::~SwImplProtocol() * SwImplProtocol::CheckLine analyzes a line in the INI file * --------------------------------------------------*/ -void SwImplProtocol::CheckLine( rtl::OString& rLine ) +void SwImplProtocol::CheckLine( OString& rLine ) { rLine = rLine.toAsciiLowerCase(); // upper/lower case is the same rLine = rLine.replace( '\t', ' ' ); @@ -360,7 +360,7 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine ) return; if( '[' == rLine[0] ) // section: FrmIds, type or funciton { - rtl::OString aTmp = comphelper::string::getToken(rLine, 0, ']'); + OString aTmp = comphelper::string::getToken(rLine, 0, ']'); if (aTmp == "[frmid") // section FrmIds { nInitFile = 1; @@ -401,7 +401,7 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine ) sal_Int32 nIndex = 0; do { - rtl::OString aTok = rLine.getToken( 0, ' ', nIndex ); + OString aTok = rLine.getToken( 0, ' ', nIndex ); bool bNo = false; if( '!' == aTok[0] ) { @@ -457,11 +457,11 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine ) * --------------------------------------------------*/ void SwImplProtocol::FileInit() { - rtl::OUString aName("dbg_lay.ini"); + OUString aName("dbg_lay.ini"); SvFileStream aStream( aName, STREAM_READ ); if( aStream.IsOpen() ) { - rtl::OString aLine; + OString aLine; nInitFile = 0; while( aStream.good() ) { @@ -472,10 +472,10 @@ void SwImplProtocol::FileInit() aLine = aLine.trim(); if( !aLine.isEmpty() ) CheckLine( aLine ); // evaluate line - aLine = rtl::OString(); + aLine = OString(); } else - aLine = rtl::OString(c); + aLine = OString(c); } if( !aLine.isEmpty() ) CheckLine( aLine ); // evaluate last line @@ -487,7 +487,7 @@ void SwImplProtocol::FileInit() * lcl_Start enables indentation by two spaces during ACT_START and disables * it again at ACT_END. * --------------------------------------------------*/ -static void lcl_Start(rtl::OStringBuffer& rOut, rtl::OStringBuffer& rLay, sal_uLong nAction) +static void lcl_Start(OStringBuffer& rOut, OStringBuffer& rLay, sal_uLong nAction) { if( nAction == ACT_START ) { @@ -510,7 +510,7 @@ static void lcl_Start(rtl::OStringBuffer& rOut, rtl::OStringBuffer& rLay, sal_uL * of the frame; "+" stands for valid, "-" stands for invalid. * --------------------------------------------------*/ -static void lcl_Flags(rtl::OStringBuffer& rOut, const SwFrm* pFrm) +static void lcl_Flags(OStringBuffer& rOut, const SwFrm* pFrm) { rOut.append(" Sz"); rOut.append(pFrm->GetValidSizeFlag() ? '+' : '-'); @@ -524,7 +524,7 @@ static void lcl_Flags(rtl::OStringBuffer& rOut, const SwFrm* pFrm) * lcl_FrameType outputs the type of the frame as clear text. * --------------------------------------------------*/ -static void lcl_FrameType( rtl::OStringBuffer& rOut, const SwFrm* pFrm ) +static void lcl_FrameType( OStringBuffer& rOut, const SwFrm* pFrm ) { if( pFrm->IsTxtFrm() ) rOut.append("Txt "); @@ -602,7 +602,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong if( 1 == nTestMode && nFunction != PROT_TESTFORMAT ) return; // we may only log inside a test formating sal_Bool bTmp = sal_False; - rtl::OStringBuffer aOut(aLayer); + OStringBuffer aOut(aLayer); aOut.append(static_cast(lcl_GetFrameId(pFrm))); aOut.append(' '); lcl_FrameType( aOut, pFrm ); // then the frame type @@ -739,7 +739,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong * here we handle the output of the SectionFrms. * --------------------------------------------------*/ -void SwImplProtocol::SectFunc(rtl::OStringBuffer &rOut, const SwFrm* , sal_uLong nAct, void* pParam) +void SwImplProtocol::SectFunc(OStringBuffer &rOut, const SwFrm* , sal_uLong nAct, void* pParam) { bool bTmp = false; switch( nAct ) diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 6c982fc006e2..865193ebe844 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -465,7 +465,7 @@ void InitCurrShells( SwRootFrm *pRoot ) SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt( - rtl::OUString("Root"), pFmt ), 0 ), + OUString("Root"), pFmt ), 0 ), maPagesArea(), mnViewWidth( -1 ), mnColumns( 0 ), diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index a261fb4026e0..3e5f308c0a02 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3566,7 +3566,7 @@ void SwColumnFrm::PaintBreak( ) const aSeq.realloc( aSeq.getLength( ) + 1 ); // Add the text above - rtl::OUString aBreakText = SW_RESSTR(STR_COLUMN_BREAK); + OUString aBreakText = SW_RESSTR(STR_COLUMN_BREAK); basegfx::B2DVector aFontSize; OutputDevice* pOut = pGlobalShell->GetOut(); @@ -6892,7 +6892,7 @@ const Font& SwPageFrm::GetEmptyPageFont() pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt pEmptyPgFont->SetWeight( WEIGHT_BOLD ); pEmptyPgFont->SetStyleName( aEmptyStr ); - pEmptyPgFont->SetName(rtl::OUString("Helvetica")); + pEmptyPgFont->SetName(OUString("Helvetica")); pEmptyPgFont->SetFamily( FAMILY_SWISS ); pEmptyPgFont->SetTransparent( sal_True ); pEmptyPgFont->SetColor( COL_GRAY ); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 062c3c52683d..46f7dd7754d8 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -54,7 +54,6 @@ #include #include -using ::rtl::OUString; using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star; diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index 1db5303764c6..a93423e8c448 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -152,7 +152,7 @@ bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const break; case MID_DROPCAP_CHAR_STYLE_NAME : { - rtl::OUString sName; + OUString sName; if(GetCharFmt()) sName = SwStyleNameMapper::GetProgName( GetCharFmt()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ); @@ -240,14 +240,14 @@ int SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const bool SwNumRuleItem::QueryValue( uno::Any& rVal, sal_uInt8 ) const { - rtl::OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), nsSwGetPoolIdFromName::GET_POOLID_NUMRULE ); + OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), nsSwGetPoolIdFromName::GET_POOLID_NUMRULE ); rVal <<= sRet; return true; } bool SwNumRuleItem::PutValue( const uno::Any& rVal, sal_uInt8 ) { - rtl::OUString uName; + OUString uName; rVal >>= uName; SetValue(SwStyleNameMapper::GetUIName(uName, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE)); return true; diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx index d35b5cf40323..15dd5d95ab29 100644 --- a/sw/source/core/swg/SwXMLBlockExport.cxx +++ b/sw/source/core/swg/SwXMLBlockExport.cxx @@ -25,13 +25,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; // #110680# SwXMLBlockListExport::SwXMLBlockListExport( const uno::Reference< uno::XComponentContext > xContext, SwXMLTextBlocks & rBlocks, - const rtl::OUString &rFileName, + const OUString &rFileName, uno::Reference< xml::sax::XDocumentHandler> &rHandler) : SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ), rBlockList(rBlocks) @@ -82,7 +81,7 @@ sal_uInt32 SwXMLBlockListExport::exportDoc(enum XMLTokenEnum ) SwXMLTextBlockExport::SwXMLTextBlockExport( const uno::Reference< uno::XComponentContext > xContext, SwXMLTextBlocks & rBlocks, - const rtl::OUString &rFileName, + const OUString &rFileName, uno::Reference< xml::sax::XDocumentHandler> &rHandler) : SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ), rBlockList(rBlocks) diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx index f8258c533ad0..c007cd871e57 100644 --- a/sw/source/core/swg/SwXMLBlockImport.cxx +++ b/sw/source/core/swg/SwXMLBlockImport.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; sal_Char const sXML_np__block_list[] = "_block-list"; sal_Char const sXML_np__office[] = "_ooffice"; diff --git a/sw/source/core/swg/SwXMLBlockListContext.cxx b/sw/source/core/swg/SwXMLBlockListContext.cxx index 586a43d4b7d3..c1bf14ee2a2a 100644 --- a/sw/source/core/swg/SwXMLBlockListContext.cxx +++ b/sw/source/core/swg/SwXMLBlockListContext.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; SwXMLBlockListContext::SwXMLBlockListContext( SwXMLBlockListImport& rImport, @@ -223,7 +222,7 @@ SwXMLTextBlockParContext::SwXMLTextBlockParContext( { } -void SwXMLTextBlockParContext::Characters( const ::rtl::OUString& rChars ) +void SwXMLTextBlockParContext::Characters( const OUString& rChars ) { rLocalRef.m_rText.Append ( rChars.getStr()); } diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx index 0406e20b0170..d1e1028d65d9 100644 --- a/sw/source/core/swg/SwXMLSectionList.cxx +++ b/sw/source/core/swg/SwXMLSectionList.cxx @@ -24,7 +24,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; using namespace ::xmloff::token; sal_Char const sXML_np__office[] = "_ooffice"; diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 0d3b03a23e1f..7012180acccb 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -561,8 +561,8 @@ OUString SwXMLTextBlocks::GeneratePackageName ( const String& rShort ) String aRet = rShort; xub_StrLen nPos = 0; sal_Unicode pDelims[] = { '!', '/', ':', '.', '\\', 0 }; - rtl::OString sByte(OUStringToOString(aRet, RTL_TEXTENCODING_UTF7)); - aRet = rtl::OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US); + OString sByte(OUStringToOString(aRet, RTL_TEXTENCODING_UTF7)); + aRet = OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US); while( STRING_NOTFOUND != ( nPos = aRet.SearchChar( pDelims, nPos ))) { aRet.SetChar( nPos, '_' ); diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index 1b6ef4ea75c3..b0822d251452 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -44,7 +44,6 @@ const char XMLN_BLOCKLIST[] = "BlockList.xml"; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -using ::rtl::OUString; using ::xmloff::token::XML_BLOCK_LIST; using ::xmloff::token::XML_UNFORMATTED_TEXT; diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index e122e511778f..574d04ecc560 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -175,11 +175,11 @@ const String& SwImpBlocks::GetLongName( sal_uInt16 n ) const return aEmptyStr; } -rtl::OUString SwImpBlocks::GetPackageName( sal_uInt16 n ) const +OUString SwImpBlocks::GetPackageName( sal_uInt16 n ) const { if( n < aNames.size() ) return aNames[n]->aPackageName; - return rtl::OUString(); + return OUString(); } void SwImpBlocks::AddName( const String& rShort, const String& rLong, diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 515037c3d956..393383787d1d 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -289,7 +289,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo, else if ( mpPorInfo ) BeginInlineStructureElements(); else - BeginTag( vcl::PDFWriter::NonStructElement, rtl::OUString() ); + BeginTag( vcl::PDFWriter::NonStructElement, OUString() ); #if OSL_DEBUG_LEVEL > 1 nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement(); @@ -424,7 +424,7 @@ bool SwTaggedPDFHelper::CheckRestoreTag() const void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const String& rString ) { // write new tag - const sal_Int32 nId = mpPDFExtOutDevData->BeginStructureElement( eType, rtl::OUString( rString ) ); + const sal_Int32 nId = mpPDFExtOutDevData->BeginStructureElement( eType, OUString( rString ) ); ++nEndStructureElement; #if OSL_DEBUG_LEVEL > 1 @@ -982,12 +982,12 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements() const bool bNewItemTag = bNewListTag || pTxtNd->IsCountedInList(); // If the text node is not counted, we do not start a new list item: if ( bNewListTag ) - BeginTag( vcl::PDFWriter::List, rtl::OUString(aListString) ); + BeginTag( vcl::PDFWriter::List, OUString(aListString) ); if ( bNewItemTag ) { - BeginTag( vcl::PDFWriter::ListItem, rtl::OUString(aListItemString) ); - BeginTag( vcl::PDFWriter::LIBody, rtl::OUString(aListBodyString) ); + BeginTag( vcl::PDFWriter::ListItem, OUString(aListItemString) ); + BeginTag( vcl::PDFWriter::LIBody, OUString(aListBodyString) ); } } @@ -1023,7 +1023,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // Document: Document // nPDFType = vcl::PDFWriter::Document; - aPDFType = rtl::OUString(aDocumentString); + aPDFType = OUString(aDocumentString); break; case FRM_HEADER : @@ -1039,7 +1039,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // Footnote container: Division // nPDFType = vcl::PDFWriter::Division; - aPDFType = rtl::OUString(aDivString); + aPDFType = OUString(aDivString); break; case FRM_FTN : @@ -1049,7 +1049,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // Note: vcl::PDFWriter::Note is actually a ILSE. Nevertheless // we treat it like a grouping element! nPDFType = vcl::PDFWriter::Note; - aPDFType = rtl::OUString(aNoteString); + aPDFType = OUString(aNoteString); break; case FRM_SECTION : @@ -1067,19 +1067,19 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( TOX_INDEX == pTOXBase->GetType() ) { nPDFType = vcl::PDFWriter::Index; - aPDFType = rtl::OUString(aIndexString); + aPDFType = OUString(aIndexString); } else { nPDFType = vcl::PDFWriter::TOC; - aPDFType = rtl::OUString(aTOCString); + aPDFType = OUString(aTOCString); } } } else if ( CONTENT_SECTION == pSection->GetType() ) { nPDFType = vcl::PDFWriter::Section; - aPDFType = rtl::OUString(aSectString); + aPDFType = OUString(aSectString); } } break; @@ -1116,7 +1116,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( sStyleName.EqualsAscii(aQuotations) ) { nPDFType = static_cast(vcl::PDFWriter::BlockQuote); - aPDFType = rtl::OUString(aBlockQuoteString); + aPDFType = OUString(aBlockQuoteString); } // @@ -1125,7 +1125,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() else if ( sStyleName.EqualsAscii(aCaption) ) { nPDFType = static_cast(vcl::PDFWriter::Caption); - aPDFType = rtl::OUString(aCaptionString); + aPDFType = OUString(aCaptionString); } // @@ -1134,7 +1134,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() else if ( sParentStyleName.EqualsAscii(aCaption) ) { nPDFType = static_cast(vcl::PDFWriter::Caption); - aPDFType = sStyleName.Append(rtl::OUString(aCaptionString)); + aPDFType = sStyleName.Append(OUString(aCaptionString)); } // @@ -1143,7 +1143,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() else if ( sStyleName.EqualsAscii(aHeading) ) { nPDFType = static_cast(vcl::PDFWriter::Heading); - aPDFType = rtl::OUString(aHString); + aPDFType = OUString(aHString); } // @@ -1159,22 +1159,22 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() switch(nRealLevel) { case 0 : - aPDFType = rtl::OUString(aH1String); + aPDFType = OUString(aH1String); break; case 1 : - aPDFType = rtl::OUString(aH2String); + aPDFType = OUString(aH2String); break; case 2 : - aPDFType = rtl::OUString(aH3String); + aPDFType = OUString(aH3String); break; case 3 : - aPDFType = rtl::OUString(aH4String); + aPDFType = OUString(aH4String); break; case 4 : - aPDFType = rtl::OUString(aH5String); + aPDFType = OUString(aH5String); break; default: - aPDFType = rtl::OUString(aH6String); + aPDFType = OUString(aH6String); break; } } @@ -1194,7 +1194,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( pTOXBase && TOX_INDEX != pTOXBase->GetType() ) { // Special case: Open additional TOCI tag: - BeginTag( vcl::PDFWriter::TOCI, rtl::OUString(aTOCIString) ); + BeginTag( vcl::PDFWriter::TOCI, OUString(aTOCIString) ); } } } @@ -1206,7 +1206,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() // TabFrm: Table // nPDFType = vcl::PDFWriter::Table; - aPDFType = rtl::OUString(aTableString); + aPDFType = OUString(aTableString); { // set up table column data: @@ -1260,7 +1260,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( !static_cast(pFrm)->IsRepeatedHeadline() ) { nPDFType = vcl::PDFWriter::TableRow; - aPDFType = rtl::OUString(aTRString); + aPDFType = OUString(aTRString); } else { @@ -1277,12 +1277,12 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( pTable->IsInHeadline( *pFrm ) || lcl_IsHeadlineCell( *static_cast(pFrm) ) ) { nPDFType = vcl::PDFWriter::TableHeader; - aPDFType = rtl::OUString(aTHString); + aPDFType = OUString(aTHString); } else { nPDFType = vcl::PDFWriter::TableData; - aPDFType = rtl::OUString(aTDString); + aPDFType = OUString(aTDString); } } break; @@ -1314,18 +1314,18 @@ void SwTaggedPDFHelper::BeginBlockStructureElements() if ( bFormula ) { nPDFType = vcl::PDFWriter::Formula; - aPDFType = rtl::OUString(aFormulaString); + aPDFType = OUString(aFormulaString); } else { nPDFType = vcl::PDFWriter::Figure; - aPDFType = rtl::OUString(aFigureString); + aPDFType = OUString(aFigureString); } } else { nPDFType = vcl::PDFWriter::Division; - aPDFType = rtl::OUString(aDivString); + aPDFType = OUString(aDivString); } } break; @@ -1377,7 +1377,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() case POR_HYPHSTR : case POR_SOFTHYPHSTR : nPDFType = vcl::PDFWriter::Span; - aPDFType = rtl::OUString(aSpanString); + aPDFType = OUString(aSpanString); break; case POR_LAY : @@ -1404,18 +1404,18 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() if( pInetFmtAttr ) { nPDFType = vcl::PDFWriter::Link; - aPDFType = rtl::OUString(aLinkString); + aPDFType = OUString(aLinkString); } // Check for Quote/Code character style: else if ( sStyleName.EqualsAscii(aQuotation) ) { nPDFType = vcl::PDFWriter::Quote; - aPDFType = rtl::OUString(aQuoteString); + aPDFType = OUString(aQuoteString); } else if ( sStyleName.EqualsAscii(aSourceText) ) { nPDFType = vcl::PDFWriter::Code; - aPDFType = rtl::OUString(aCodeString); + aPDFType = OUString(aCodeString); } else { @@ -1436,7 +1436,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() if ( sStyleName.Len() > 0 ) aPDFType = sStyleName; else - aPDFType = rtl::OUString(aSpanString); + aPDFType = OUString(aSpanString); } } } @@ -1444,7 +1444,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() case POR_FTN : nPDFType = vcl::PDFWriter::Link; - aPDFType = rtl::OUString(aLinkString); + aPDFType = OUString(aLinkString); break; case POR_FLD : @@ -1461,12 +1461,12 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() if ( RES_GETREFFLD == pFld->Which() ) { nPDFType = vcl::PDFWriter::Link; - aPDFType = rtl::OUString(aLinkString); + aPDFType = OUString(aLinkString); } else if ( RES_AUTHORITY == pFld->Which() ) { nPDFType = vcl::PDFWriter::BibEntry; - aPDFType = rtl::OUString(aBibEntryString); + aPDFType = OUString(aBibEntryString); } } } @@ -1500,7 +1500,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() */ SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( SwEditShell& rSh, OutputDevice& rOut, - const rtl::OUString& rPageRange, + const OUString& rPageRange, bool bSkipEmptyPages, bool bEditEngineOnly ) : mrSh( rSh ), @@ -2060,7 +2060,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() //get the name const ::sw::mark::IMark* pBkmk = ppMark->get(); mrSh.SwCrsrShell::ClearMark(); - rtl::OUString sBkName = pBkmk->GetName(); + OUString sBkName = pBkmk->GetName(); //jump to it JumpToSwMark( &mrSh, sBkName ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 8b51fc953f6d..13f723f1fbcb 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1095,7 +1095,7 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const OSL_TRACE("Found Fieldmark"); #if OSL_DEBUG_LEVEL > 1 OUString str = pFieldmark->ToString( ); - fprintf( stderr, "%s\n", rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) ); + fprintf( stderr, "%s\n", OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) ); #endif } if(bIsStartMark) OSL_TRACE("Found StartMark"); diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index c4dee6e1e77b..fdf965d36d6a 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -30,7 +30,6 @@ #include // #include // SwInterHyphInfo -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index c6eda0a7f6d3..c12355bb5495 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -619,7 +619,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const { // 6864: always with kerning, also on printer! KSHORT nChar = Width() / nCharWidth; - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; comphelper::string::padToLength(aBuf, nChar, ' '); rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, sal_True); } @@ -638,7 +638,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const KSHORT nChar = Width() / nCharWidth; if ( cFill == '_' ) ++nChar; // to avoid gaps (Bug 13430) - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; comphelper::string::padToLength(aBuf, nChar, cFill); rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, sal_True); } diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index 2cf0fca2f1c3..5f0918d0bc33 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -178,7 +178,7 @@ class XmlPortionDumper:public SwPortionHandler BAD_CAST( "nType" ), "%s", getTypeName( nType ) ); OUString sText( rText ); - OString sText8 =::rtl::OUStringToOString( sText, + OString sText8 =OUStringToOString( sText, RTL_TEXTENCODING_UTF8 ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "rText" ), "%s", sText8.getStr( ) ); @@ -335,7 +335,7 @@ void SwFrm::dumpAsXml( xmlTextWriterPtr writer ) { aTxt = aTxt.replace( i, '*' ); } - OString aTxt8 =::rtl::OUStringToOString( aTxt, + OString aTxt8 =OUStringToOString( aTxt, RTL_TEXTENCODING_UTF8 ); xmlTextWriterWriteString( writer, ( const xmlChar * ) aTxt8.getStr( ) ); @@ -388,7 +388,7 @@ void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) { SwHeadFootFrm *pHeadFootFrm = (SwHeadFootFrm*)this; OUString aFmtName = pHeadFootFrm->GetFmt()->GetName(); - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), "%s", BAD_CAST(rtl::OUStringToOString(aFmtName, RTL_TEXTENCODING_UTF8).getStr())); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), "%s", BAD_CAST(OUStringToOString(aFmtName, RTL_TEXTENCODING_UTF8).getStr())); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtPtr" ), "%p", pHeadFootFrm->GetFmt()); } } diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 21e0fb208446..677d84fe920d 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -121,10 +121,10 @@ static SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId) aStartToken.nAuthorityField = AUTH_FIELD_IDENTIFIER; aRet.push_back( aStartToken ); SwFormToken aSeparatorToken( TOKEN_TEXT ); - aSeparatorToken.sText = rtl::OUString(": "); + aSeparatorToken.sText = OUString(": "); aRet.push_back( aSeparatorToken ); SwFormToken aTextToken( TOKEN_TEXT ); - aTextToken.sText = rtl::OUString(", "); + aTextToken.sText = OUString(", "); for(sal_uInt16 i = 0; i < 5 ; i++) { diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx index bdee756d557d..9c58de47f79e 100644 --- a/sw/source/core/tox/toxhlp.cxx +++ b/sw/source/core/tox/toxhlp.cxx @@ -72,10 +72,10 @@ String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const return sRet; } -::com::sun::star::uno::Sequence< ::rtl::OUString > +::com::sun::star::uno::Sequence< OUString > IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const { - uno::Sequence< ::rtl::OUString > sRet; + uno::Sequence< OUString > sRet; try { sRet = xIES->getAlgorithmList( rLcl ); diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 942d2399e750..106ef4741f91 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -48,7 +48,6 @@ extern bool IsFrameBehind( const SwTxtNode& rMyNd, xub_StrLen nMySttPos, using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; /*-------------------------------------------------------------------- Initialize strings --------------------------------------------------------------------*/ diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 3035a93c952b..d174d803b48c 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; TYPEINIT1_AUTOFACTORY(SwFmtINetFmt, SfxPoolItem); TYPEINIT1_AUTOFACTORY(SwFmtAutoFmt, SfxPoolItem); @@ -369,9 +368,9 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) else { // all string properties: - if(rVal.getValueType() != ::getCppuType((rtl::OUString*)0)) + if(rVal.getValueType() != ::getCppuType((OUString*)0)) return false; - XubString sVal = *(rtl::OUString*)rVal.getValue(); + XubString sVal = *(OUString*)rVal.getValue(); switch(nMemberId) { case MID_URL_URL: @@ -767,7 +766,7 @@ MetaField::MetaField(SwFmtMeta * const i_pFmt, } void MetaField::GetPrefixAndSuffix( - ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix) + OUString *const o_pPrefix, OUString *const o_pSuffix) { try { @@ -789,7 +788,7 @@ void MetaField::GetPrefixAndSuffix( } } -sal_uInt32 MetaField::GetNumberFormat(::rtl::OUString const & rContent) const +sal_uInt32 MetaField::GetNumberFormat(OUString const & rContent) const { //TODO: this probably lacks treatment for some special cases sal_uInt32 nNumberFormat( m_nNumberFormat ); diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index de510714e6bf..40369b05b7f7 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -646,8 +646,8 @@ static sal_uInt8 lcl_WhichPunctuation( sal_Unicode cChar ) static bool lcl_IsMonoSpaceFont( const OutputDevice& rOut ) { - const rtl::OUString aStr1( sal_Unicode( 0x3008 ) ); - const rtl::OUString aStr2( sal_Unicode( 0x307C ) ); + const OUString aStr1( sal_Unicode( 0x3008 ) ); + const OUString aStr2( sal_Unicode( 0x307C ) ); const long nWidth1 = rOut.GetTextWidth( aStr1 ); const long nWidth2 = rOut.GetTextWidth( aStr2 ); return nWidth1 == nWidth2; diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 6421edd675cd..248255a863ef 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1470,7 +1470,7 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest, { // #i111677# cache expansion of source (for clipboard) pDest->m_pNumStringCache.reset( - new ::rtl::OUString(this->GetNumString())); + new OUString(this->GetNumString())); } if( !nLen ) @@ -3157,7 +3157,7 @@ struct containsPos ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, int eMode) { - const rtl::OUString& rNodeText = rNode.GetTxt(); + const OUString& rNodeText = rNode.GetTxt(); m_aRetText = rNodeText; if (eMode == PASSTHROUGH) @@ -3223,7 +3223,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, int eMode) const sal_Int32 nHiddenStart = i->m_nStart; const sal_Int32 nHiddenLen = i->m_nLen; - m_aRetText = m_aRetText.replaceAt( nOffset + nHiddenStart, nHiddenLen, rtl::OUString() ); + m_aRetText = m_aRetText.replaceAt( nOffset + nHiddenStart, nHiddenLen, OUString() ); m_aMap.push_back( ConversionMapEntry( nHiddenStart, nOffset + nHiddenStart ) ); nOffset -= nHiddenLen; } @@ -3233,7 +3233,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, int eMode) { const SwTxtAttr* pAttr = *j; xub_StrLen nFieldPos = *pAttr->GetStart(); - rtl::OUString aExpand; + OUString aExpand; switch (pAttr->Which()) { case RES_TXTATR_FIELD: diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 95e199c267ed..54fe4ce5ba8c 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -797,7 +797,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) { xub_StrLen nOldIdx(rInf.GetIdx()); xub_StrLen nOldLen(rInf.GetLen()); - rtl::OUString aNewText(CH_TXT_ATR_SUBST_FIELDSTART); + OUString aNewText(CH_TXT_ATR_SUBST_FIELDSTART); rInf.SetText( aNewText ); rInf.SetIdx( 0 ); rInf.SetLen( aNewText.getLength() ); @@ -809,7 +809,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf ) { xub_StrLen nOldIdx(rInf.GetIdx()); xub_StrLen nOldLen(rInf.GetLen()); - rtl::OUString aNewText(CH_TXT_ATR_SUBST_FIELDEND); + OUString aNewText(CH_TXT_ATR_SUBST_FIELDEND); rInf.SetText( aNewText ); rInf.SetIdx( 0 ); rInf.SetLen( aNewText.getLength() ); diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 96ff07de161f..0c767c22bc28 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1253,7 +1253,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode ) (const SfxPoolItem**)&pAnchor ); SwIndex aIdx( this, *pAttr->GetStart() ); - const rtl::OUString c(GetCharOfTxtAttr(*pAttr)); + const OUString c(GetCharOfTxtAttr(*pAttr)); OUString const ins( InsertText(c, aIdx, nInsertFlags) ); if (ins.isEmpty()) { @@ -1378,7 +1378,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode ) // entstehen koennen und das Attribut im _SortArr_ am // Dokument nicht eingetrage wird. SwIndex aNdIdx( this, *pAttr->GetStart() ); - const rtl::OUString c(GetCharOfTxtAttr(*pAttr)); + const OUString c(GetCharOfTxtAttr(*pAttr)); OUString const ins( InsertText(c, aNdIdx, nInsertFlags) ); if (ins.isEmpty()) { diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index bfc312f09ed0..38b52f597df2 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -76,7 +76,6 @@ #include #include -using rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::i18n; @@ -643,7 +642,7 @@ XubString SwTxtNode::GetCurWord( xub_StrLen nPos ) const aBndry.endPos - aBndry.startPos); } -SwScanner::SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt, +SwScanner::SwScanner( const SwTxtNode& rNd, const OUString& rTxt, const LanguageType* pLang, const ModelToViewHelper& rConvMap, sal_uInt16 nType, sal_Int32 nStart, sal_Int32 nEnde, sal_Bool bClp ) : rNode( rNd ) @@ -666,8 +665,8 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt, //additional ones can be added in under tools->options if (nWordType == i18n::WordType::WORD_COUNT) { - rtl::OUString sDashes = officecfg::Office::Writer::WordCount::AdditionalSeperators::get(); - rtl::OUStringBuffer aBuf(aPreDashReplacementText); + OUString sDashes = officecfg::Office::Writer::WordCount::AdditionalSeperators::get(); + OUStringBuffer aBuf(aPreDashReplacementText); for (sal_Int32 i = nStartPos; i < nEndPos; ++i) { sal_Unicode cChar = aBuf[i]; @@ -699,7 +698,7 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const rtl::OUString& rTxt, namespace { //fdo#45271 for Asian words count characters instead of words - sal_Int32 forceEachAsianCodePointToWord(const rtl::OUString &rText, sal_Int32 nBegin, sal_Int32 nLen) + sal_Int32 forceEachAsianCodePointToWord(const OUString &rText, sal_Int32 nBegin, sal_Int32 nLen) { if (nLen > 1) { @@ -760,7 +759,7 @@ sal_Bool SwScanner::NextWord() if ( nWordType != i18n::WordType::WORD_COUNT ) { rCC.setLanguageTag( LanguageTag( pBreakIt->GetLocale( aCurrLang )) ); - if ( rCC.isLetterNumeric(rtl::OUString(aText[nBegin])) ) + if ( rCC.isLetterNumeric(OUString(aText[nBegin])) ) break; } else @@ -814,7 +813,7 @@ sal_Bool SwScanner::NextWord() // restrict boundaries to script boundaries and nEndPos const sal_uInt16 nCurrScript = pBreakIt->GetBreakIter()->getScriptType( aText, nBegin ); - rtl::OUString aTmpWord = aText.copy( nBegin, aBound.endPos - nBegin ); + OUString aTmpWord = aText.copy( nBegin, aBound.endPos - nBegin ); const sal_Int32 nScriptEnd = nBegin + pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript ); const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd ); @@ -837,7 +836,7 @@ sal_Bool SwScanner::NextWord() else { const sal_uInt16 nCurrScript = pBreakIt->GetBreakIter()->getScriptType( aText, aBound.startPos ); - rtl::OUString aTmpWord = aText.copy( aBound.startPos, + OUString aTmpWord = aText.copy( aBound.startPos, aBound.endPos - aBound.startPos ); const sal_Int32 nScriptEnd = aBound.startPos + pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript ); @@ -1056,7 +1055,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs ) ? m_Text.getLength() : ::std::min(rArgs.pEndIdx->GetIndex(), m_Text.getLength()); - rArgs.aConvText = rtl::OUString(); + rArgs.aConvText = OUString(); // modify string according to redline information and hidden text const OUString aOldTxt( m_Text ); @@ -1302,7 +1301,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV } if( pNode->GetWrong()->Fresh( nChgStart, nChgEnd, nBegin, nLen, nInsertPos, nActPos ) ) - pNode->GetWrong()->Insert( rtl::OUString(), 0, nBegin, nLen, nInsertPos++ ); + pNode->GetWrong()->Insert( OUString(), 0, nBegin, nLen, nInsertPos++ ); else { nInvStart = nBegin; @@ -1375,7 +1374,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/ { SwRect aRet; SwTxtNode *pNode = GetTxtNode(); - const rtl::OUString& rText = pNode->GetTxt(); + const OUString& rText = pNode->GetTxt(); // Iterate over language portions SmartTagMgr& rSmartTagMgr = SwSmartTagMgr::Get(); @@ -1420,7 +1419,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/ { // Expand the string: const ModelToViewHelper aConversionMap(*pNode); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); // Ownership ov ConversionMap is passed to SwXTextMarkup object! com::sun::star::uno::Reference< com::sun::star::text::XTextMarkup > xTextMarkup = @@ -1918,7 +1917,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, // count words in numbering string if started at beginning of para: bool bCountNumbering = nStt == 0; bool bHasBullet = false, bHasNumbering = false; - rtl::OUString sNumString; + OUString sNumString; if (bCountNumbering) { sNumString = GetNumString(); @@ -1949,7 +1948,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, // ConversionMap to expand fields, remove invisible and redline deleted text for scanner const ModelToViewHelper aConversionMap(*this, EXPANDFIELDS | HIDEINVISIBLE | HIDEREDLINED); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); // map start and end points onto the ConversionMap const sal_uInt32 nExpandBegin = aConversionMap.ConvertToViewPosition( nStt ); @@ -1979,7 +1978,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, nExpandBegin, nExpandEnd, true ); // used to filter out scanner returning almost empty strings (len=1; unichar=0x0001) - const rtl::OUString aBreakWord( CH_TXTATR_BREAKWORD ); + const OUString aBreakWord( CH_TXTATR_BREAKWORD ); while ( aScanner.NextWord() ) { @@ -1987,7 +1986,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, if( 1 != aExpandText.match(aBreakWord, aScanner.GetBegin() )) { ++nTmpWords; - const rtl::OUString &rWord = aScanner.GetWord(); + const OUString &rWord = aScanner.GetWord(); if (pBreakIt->GetBreakIter()->getScriptType(rWord, 0) == i18n::ScriptType::ASIAN) ++nTmpAsianWords; nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(rWord); @@ -2015,7 +2014,7 @@ bool SwTxtNode::CountWords( SwDocStat& rStat, while ( aScanner.NextWord() ) { ++nTmpWords; - const rtl::OUString &rWord = aScanner.GetWord(); + const OUString &rWord = aScanner.GetWord(); if (pBreakIt->GetBreakIter()->getScriptType(rWord, 0) == i18n::ScriptType::ASIAN) ++nTmpAsianWords; nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(rWord); diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index cc506f62f87b..f38cd4c47528 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -279,7 +279,7 @@ UndoManager::EndUndo(SwUndoId const i_eUndoId, SwRewriter const*const pRewriter) bool UndoManager::GetLastUndoInfo( - ::rtl::OUString *const o_pStr, SwUndoId *const o_pId) const + OUString *const o_pStr, SwUndoId *const o_pId) const { // this is actually expected to work on the current level, // but that was really not obvious from the previous implementation... @@ -311,7 +311,7 @@ SwUndoComments_t UndoManager::GetUndoComments() const sal_uInt16 const nUndoCount(SfxUndoManager::GetUndoActionCount(TopLevel)); for (sal_uInt16 n = 0; n < nUndoCount; ++n) { - ::rtl::OUString const comment( + OUString const comment( SfxUndoManager::GetUndoActionComment(n, TopLevel)); ret.push_back(comment); } @@ -321,7 +321,7 @@ SwUndoComments_t UndoManager::GetUndoComments() const /**************** REDO ******************/ -bool UndoManager::GetFirstRedoInfo(::rtl::OUString *const o_pStr) const +bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr) const { if (!SfxUndoManager::GetRedoActionCount(CurrentLevel)) { @@ -346,7 +346,7 @@ SwUndoComments_t UndoManager::GetRedoComments() const sal_uInt16 const nRedoCount(SfxUndoManager::GetRedoActionCount(TopLevel)); for (sal_uInt16 n = 0; n < nRedoCount; ++n) { - ::rtl::OUString const comment( + OUString const comment( SfxUndoManager::GetRedoActionComment(n, TopLevel)); ret.push_back(comment); } @@ -356,7 +356,7 @@ SwUndoComments_t UndoManager::GetRedoComments() const /**************** REPEAT ******************/ -SwUndoId UndoManager::GetRepeatInfo(::rtl::OUString *const o_pStr) const +SwUndoId UndoManager::GetRepeatInfo(OUString *const o_pStr) const { SwUndoId nRepeatId(UNDO_EMPTY); GetLastUndoInfo(o_pStr, & nRepeatId); @@ -535,8 +535,8 @@ UndoManager::Repeat(::sw::RepeatContext & rContext, return false; } - ::rtl::OUString const comment(pRepeatAction->GetComment()); - ::rtl::OUString const rcomment(pRepeatAction->GetRepeatComment(rContext)); + OUString const comment(pRepeatAction->GetComment()); + OUString const rcomment(pRepeatAction->GetRepeatComment(rContext)); sal_uInt16 const nId(pRepeatAction->GetId()); if (DoesUndo()) { diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index b90c9a127d2c..ced76e507c80 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -663,7 +663,7 @@ bool SwHistoryBookmark::IsEqualBookmark(const ::sw::mark::IMark& rBkmk) && m_aName == rBkmk.GetName(); } -const ::rtl::OUString& SwHistoryBookmark::GetName() const +const OUString& SwHistoryBookmark::GetName() const { return m_aName; } diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 8cf6e1886cf6..2fbe933c3cb0 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -460,7 +460,7 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam ) sal_Unicode cDelChar = pDelTxtNd->GetTxt()[ pStt->nContent.GetIndex() ]; CharClass& rCC = GetAppCharClass(); if( ( CH_TXTATR_BREAKWORD == cDelChar || CH_TXTATR_INWORD == cDelChar ) || - rCC.isLetterNumeric( rtl::OUString( cDelChar ), 0 ) != + rCC.isLetterNumeric( OUString( cDelChar ), 0 ) != rCC.isLetterNumeric( *pSttStr, nUChrPos ) ) return sal_False; @@ -579,7 +579,7 @@ static String lcl_DenotedPortion(String rStr, xub_StrLen nStart, case CH_TXTATR_INWORD: case CH_TXTATR_BREAKWORD: - aResult = rtl::OUString(UNDO_ARG2); + aResult = OUString(UNDO_ARG2); break; @@ -638,7 +638,7 @@ String DenoteSpecialCharacters(const String & rStr) aResult += lcl_DenotedPortion(rStr, nStart, rStr.Len()); } else - aResult = rtl::OUString(UNDO_ARG2); + aResult = OUString(UNDO_ARG2); return aResult; } @@ -686,7 +686,7 @@ SwRewriter SwUndoDelete::GetRewriter() const } else { - aStr = rtl::OUString(UNDO_ARG2); + aStr = OUString(UNDO_ARG2); } } @@ -1084,7 +1084,7 @@ void SwUndoDelete::SetTableName(const String & rName) String SwRewriter::Apply(const String & rStr) const { - rtl::OUString aResult = rStr; + OUString aResult = rStr; std::vector::const_iterator aIt; for (aIt = mRules.begin(); aIt != mRules.end(); ++aIt) diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index d6fb9fd6091e..30a86778525f 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -267,7 +267,7 @@ bool SwUndo::CanRepeatImpl( ::sw::RepeatContext & ) const return ((REPEAT_START <= GetId()) && (GetId() < REPEAT_END)); } -rtl::OUString SwUndo::GetComment() const +OUString SwUndo::GetComment() const { String aResult; diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index b2791fae0930..c99c19e97aab 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -332,7 +332,7 @@ void SwUndoInsLayFmt::RepeatImpl(::sw::RepeatContext & rContext) } // #111827# -rtl::OUString SwUndoInsLayFmt::GetComment() const +OUString SwUndoInsLayFmt::GetComment() const { String aResult; diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index f725c29fe212..e9ba3a388cbc 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -107,7 +107,7 @@ void SwSdrUndo::RedoImpl(::sw::UndoRedoContext & rContext) rContext.SetSelections(0, pMarkList); } -rtl::OUString SwSdrUndo::GetComment() const +OUString SwSdrUndo::GetComment() const { return pSdrUndo->GetComment(); } diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 18951111bc3e..4ac9ecb76ba1 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -128,7 +128,7 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd ) sal_Bool SwUndoInsert::CanGrouping( sal_Unicode cIns ) { if( !bIsAppend && bIsWordDelim == - !GetAppCharClass().isLetterNumeric( rtl::OUString( cIns )) ) + !GetAppCharClass().isLetterNumeric( OUString( cIns )) ) { nLen++; nCntnt++; @@ -433,7 +433,7 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext) // TODO/MBA: seems that here a physical copy is done - not as in drawing layer! Testing! // TODO/LATER: Copying through the container would copy the replacement image as well comphelper::EmbeddedObjectContainer aCnt; - ::rtl::OUString aName = aCnt.CreateUniqueObjectName(); + OUString aName = aCnt.CreateUniqueObjectName(); if ( aCnt.StoreEmbeddedObject( rSwOLE.GetOleRef(), aName, sal_True ) ) { uno::Reference < embed::XEmbeddedObject > aNew = aCnt.GetEmbeddedObject( aName ); @@ -486,8 +486,8 @@ SwRewriter SwUndoInsert::GetRewriter() const class SwUndoReplace::Impl : private SwUndoSaveCntnt { - ::rtl::OUString m_sOld; - ::rtl::OUString m_sIns; + OUString m_sOld; + OUString m_sIns; sal_uLong m_nSttNd, m_nEndNd, m_nOffset; xub_StrLen m_nSttCnt, m_nEndCnt, m_nSetPos, m_nSelEnd; bool m_bSplitNext : 1; @@ -497,7 +497,7 @@ class SwUndoReplace::Impl ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd; public: - Impl(SwPaM const& rPam, ::rtl::OUString const& rIns, bool const bRegExp); + Impl(SwPaM const& rPam, OUString const& rIns, bool const bRegExp); virtual ~Impl() { } @@ -507,13 +507,13 @@ public: void SetEnd(SwPaM const& rPam); - ::rtl::OUString const& GetOld() const { return m_sOld; } - ::rtl::OUString const& GetIns() const { return m_sIns; } + OUString const& GetOld() const { return m_sOld; } + OUString const& GetIns() const { return m_sIns; } }; SwUndoReplace::SwUndoReplace(SwPaM const& rPam, - ::rtl::OUString const& rIns, bool const bRegExp) + OUString const& rIns, bool const bRegExp) : SwUndo( UNDO_REPLACE ) , m_pImpl(new Impl(rPam, rIns, bRegExp)) { @@ -535,7 +535,7 @@ void SwUndoReplace::RedoImpl(::sw::UndoRedoContext & rContext) SwRewriter MakeUndoReplaceRewriter(sal_uLong const occurrences, - ::rtl::OUString const& sOld, ::rtl::OUString const& sNew) + OUString const& sOld, OUString const& sNew) { SwRewriter aResult; @@ -593,7 +593,7 @@ void SwUndoReplace::SetEnd(SwPaM const& rPam) } SwUndoReplace::Impl::Impl( - SwPaM const& rPam, ::rtl::OUString const& rIns, bool const bRegExp) + SwPaM const& rPam, OUString const& rIns, bool const bRegExp) : m_sIns( rIns ) , m_nOffset( 0 ) , m_bRegExp(bRegExp) diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx index c317354a5148..b223846b6eaf 100644 --- a/sw/source/core/undo/unovwr.cxx +++ b/sw/source/core/undo/unovwr.cxx @@ -76,7 +76,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos, bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand(); pTxtNd->SetIgnoreDontExpand( true ); - pTxtNd->InsertText( rtl::OUString(cIns), rPos.nContent, + pTxtNd->InsertText( OUString(cIns), rPos.nContent, IDocumentContentOperations::INS_EMPTYEXPAND ); aInsStr.Insert( cIns ); @@ -116,7 +116,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos, // ask the char that should be inserted if (( CH_TXTATR_BREAKWORD == cIns || CH_TXTATR_INWORD == cIns ) || - rCC.isLetterNumeric( rtl::OUString( cIns ), 0 ) != + rCC.isLetterNumeric( OUString( cIns ), 0 ) != rCC.isLetterNumeric( aInsStr, aInsStr.Len()-1 ) ) return sal_False; @@ -200,7 +200,7 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext) if( aDelStr.Len() ) { - String aTmpStr = rtl::OUString('1'); + String aTmpStr = OUString('1'); sal_Unicode* pTmpStr = aTmpStr.GetBufferAccess(); bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand(); @@ -248,10 +248,10 @@ void SwUndoOverwrite::RepeatImpl(::sw::RepeatContext & rContext) { ::sw::GroupUndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo()); - rDoc.Overwrite(*pAktPam, rtl::OUString(aInsStr.GetChar(0))); + rDoc.Overwrite(*pAktPam, OUString(aInsStr.GetChar(0))); } for( xub_StrLen n = 1; n < aInsStr.Len(); ++n ) - rDoc.Overwrite( *pAktPam, rtl::OUString(aInsStr.GetChar(n)) ); + rDoc.Overwrite( *pAktPam, OUString(aInsStr.GetChar(n)) ); } void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext) @@ -282,7 +282,7 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext) { // do it individually, to keep the attributes! OUString const ins( - pTxtNd->InsertText( rtl::OUString(aInsStr.GetChar(n)), rIdx, + pTxtNd->InsertText( OUString(aInsStr.GetChar(n)), rIdx, IDocumentContentOperations::INS_EMPTYEXPAND) ); assert(ins.getLength() == 1); // cannot fail if( n < aDelStr.Len() ) diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index 7cec5d8ef2c5..25293cc4b227 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -using rtl::OUString; SwXTextDefaults::SwXTextDefaults ( SwDoc * pNewDoc ) : @@ -241,22 +240,22 @@ Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName } -rtl::OUString SAL_CALL SwXTextDefaults::getImplementationName( ) +OUString SAL_CALL SwXTextDefaults::getImplementationName( ) throw (RuntimeException) { return OUString("SwXTextDefaults"); } -sal_Bool SAL_CALL SwXTextDefaults::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool SAL_CALL SwXTextDefaults::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - uno::Sequence< ::rtl::OUString > aSeq(getSupportedServiceNames()); + uno::Sequence< OUString > aSeq(getSupportedServiceNames()); return std::find(comphelper::stl_begin(aSeq), comphelper::stl_end(aSeq), rServiceName) != comphelper::stl_end(aSeq); } -uno::Sequence< ::rtl::OUString > SAL_CALL SwXTextDefaults::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL SwXTextDefaults::getSupportedServiceNames( ) throw (RuntimeException) { uno::Sequence< OUString > aRet(7); diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index 25026ed1ad19..471a0c3cc583 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ================================================================================ @@ -39,7 +37,7 @@ namespace class lcl_Escape : public ::std::unary_function< sal_Unicode, void > { public: - lcl_Escape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} + lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} void operator() ( sal_Unicode aChar ) { static const sal_Unicode m_aQuote( '\'' ); @@ -52,7 +50,7 @@ public: } private: - ::rtl::OUStringBuffer & m_aResultBuffer; + OUStringBuffer & m_aResultBuffer; }; // ---------------------------------------- @@ -64,7 +62,7 @@ private: class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void > { public: - lcl_UnEscape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} + lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} void operator() ( sal_Unicode aChar ) { static const sal_Unicode m_aBackslash( '\\' ); @@ -74,12 +72,12 @@ public: } private: - ::rtl::OUStringBuffer & m_aResultBuffer; + OUStringBuffer & m_aResultBuffer; }; // ---------------------------------------- -void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, rtl::OUStringBuffer * output ) +void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, OUStringBuffer * output ) { OSL_ASSERT(output != 0); @@ -113,7 +111,7 @@ void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, r } void lcl_getSingleCellAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, /*::chart::*/XMLRangeHelper::Cell & rOutCell ) { @@ -121,7 +119,7 @@ void lcl_getSingleCellAddressFromXMLString( static const sal_Unicode aDollar( '$' ); static const sal_Unicode aLetterA( 'A' ); - ::rtl::OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase(); + OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase(); const sal_Unicode* pStrArray = aCellStr.getStr(); sal_Int32 nLength = aCellStr.getLength(); sal_Int32 i = nLength - 1, nColumn = 0; @@ -157,10 +155,10 @@ void lcl_getSingleCellAddressFromXMLString( } bool lcl_getCellAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, /*::chart::*/XMLRangeHelper::Cell & rOutCell, - ::rtl::OUString& rOutTableName ) + OUString& rOutTableName ) { static const sal_Unicode aDot( '.' ); static const sal_Unicode aQuote( '\'' ); @@ -193,7 +191,7 @@ bool lcl_getCellAddressFromXMLString( { // there is a table name before the address - ::rtl::OUStringBuffer aTableNameBuffer; + OUStringBuffer aTableNameBuffer; const sal_Unicode * pTableName = rXMLString.getStr(); // remove escapes from table name @@ -206,7 +204,7 @@ bool lcl_getCellAddressFromXMLString( if( pBuf[ 0 ] == aQuote && pBuf[ aTableNameBuffer.getLength() - 1 ] == aQuote ) { - ::rtl::OUString aName = aTableNameBuffer.makeStringAndClear(); + OUString aName = aTableNameBuffer.makeStringAndClear(); rOutTableName = aName.copy( 1, aName.getLength() - 2 ); } else @@ -232,7 +230,7 @@ bool lcl_getCellAddressFromXMLString( } bool lcl_getCellRangeAddressFromXMLString( - const ::rtl::OUString& rXMLString, + const OUString& rXMLString, sal_Int32 nStartPos, sal_Int32 nEndPos, /*::chart::*/XMLRangeHelper::CellRange & rOutRange ) { @@ -270,7 +268,7 @@ bool lcl_getCellRangeAddressFromXMLString( bResult = lcl_getCellAddressFromXMLString( rXMLString, nStartPos, nDelimiterPos - 1, rOutRange.aUpperLeft, rOutRange.aTableName ); - ::rtl::OUString sTableSecondName; + OUString sTableSecondName; if( bResult ) { bResult = lcl_getCellAddressFromXMLString( rXMLString, nDelimiterPos + 1, nEndPos, @@ -353,7 +351,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange ) static const sal_Unicode aSpace( ' ' ); static const sal_Unicode aQuote( '\'' ); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if( !rRange.aTableName.isEmpty()) { diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx index 2857c4d8ead5..18f692fccb5a 100644 --- a/sw/source/core/unocore/XMLRangeHelper.hxx +++ b/sw/source/core/unocore/XMLRangeHelper.hxx @@ -55,12 +55,12 @@ struct CellRange { Cell aUpperLeft; Cell aLowerRight; - ::rtl::OUString aTableName; + OUString aTableName; }; -CellRange getCellRangeFromXMLString( const ::rtl::OUString & rXMLString ); +CellRange getCellRangeFromXMLString( const OUString & rXMLString ); -::rtl::OUString getXMLStringFromCellRange( const CellRange & rRange ); +OUString getXMLStringFromCellRange( const CellRange & rRange ); } // namespace XMLRangeHelper diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index 78b195f3855a..98d076bac5e1 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -63,7 +63,7 @@ sal_Bool UCB_DeleteFile( const String& rURL ) ucbhelper::Content aTempContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aTempContent.executeCommand(rtl::OUString("delete"), + aTempContent.executeCommand(OUString("delete"), ::com::sun::star::uno::makeAny( sal_True ) ); bRemoved = sal_True; } @@ -96,7 +96,7 @@ sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, sal_Bool bCopy aInfo.SourceURL = rURL; aInfo.MoveData = bCopyIsMove; aAny <<= aInfo; - aTempContent.executeCommand( rtl::OUString("transfer"), + aTempContent.executeCommand( OUString("transfer"), aAny ); } catch( ::com::sun::star::uno::Exception& ) @@ -142,7 +142,7 @@ sal_Bool UCB_IsReadOnlyFileName( const String& rURL ) { ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); ::com::sun::star::uno::Any aAny = aCnt.getPropertyValue( - rtl::OUString("IsReadOnly")); + OUString("IsReadOnly")); if(aAny.hasValue()) bIsReadOnly = *(sal_Bool*)aAny.getValue(); } @@ -198,11 +198,11 @@ bool UCB_GetFileListOfFolder( const String& rURL, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet; sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1; - ::com::sun::star::uno::Sequence < rtl::OUString > aProps( nSeqSize ); - rtl::OUString* pProps = aProps.getArray(); - pProps[ 0 ] = rtl::OUString("Title"); + ::com::sun::star::uno::Sequence < OUString > aProps( nSeqSize ); + OUString* pProps = aProps.getArray(); + pProps[ 0 ] = OUString("Title"); if( pDateTimeList ) - pProps[ 1 ] = rtl::OUString("DateModified"); + pProps[ 1 ] = OUString("DateModified"); try { diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 365425fcdc93..dd832ddb14eb 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -41,7 +41,6 @@ using namespace ::sw::mark; using namespace ::com::sun::star; -using ::rtl::OUString; namespace @@ -50,7 +49,7 @@ namespace { static const OUString sStart = OUString(String(SW_RES(STR_START_QUOTE))); static const OUString sEnd = OUString(String(SW_RES(STR_END_QUOTE))); - ::rtl::OUStringBuffer sBuf(64); + OUStringBuffer sBuf(64); return sBuf.append(sStart).append(rName).append(sEnd).makeStringAndClear(); } } @@ -70,7 +69,7 @@ public: ::cppu::OInterfaceContainerHelper m_EventListeners; SwDoc * m_pDoc; ::sw::mark::IMark * m_pRegisteredBookmark; - ::rtl::OUString m_sMarkName; + OUString m_sMarkName; Impl( SwXBookmark & rThis, @@ -440,7 +439,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::RuntimeException) { // nothing to set here - throw lang::IllegalArgumentException( ::rtl::OUString("Property is read-only: ") + throw lang::IllegalArgumentException( OUString("Property is read-only: ") + PropertyName, static_cast< cppu::OWeakObject * >(this), 0 ); } @@ -463,7 +462,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXBookmark::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -473,7 +472,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXBookmark::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -483,7 +482,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXBookmark::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -493,7 +492,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXBookmark::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -607,7 +606,7 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe ( isReplacementObject ? IDocumentMarkAccess::CHECKBOX_FIELDMARK : IDocumentMarkAccess::TEXT_FIELDMARK ) ); } -::rtl::OUString SwXFieldmark::getFieldType(void) +OUString SwXFieldmark::getFieldType(void) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -617,7 +616,7 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe return pBkm->GetFieldname(); } -void SwXFieldmark::setFieldType(const::rtl::OUString & fieldType) +void SwXFieldmark::setFieldType(const OUString & fieldType) throw(uno::RuntimeException) { SolarMutexGuard aGuard; @@ -667,7 +666,7 @@ SwXFieldmark::CreateXFieldmark(SwDoc & rDoc, ::sw::mark::IMark & rMark) SwXFieldmark::getCheckboxFieldmark() { ::sw::mark::ICheckboxFieldmark* pCheckboxFm = NULL; - if ( getFieldType() == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX) ) ) + if ( getFieldType() == OUString( RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX) ) ) { // evil #TODO #FIXME casting away the const-ness pCheckboxFm = const_cast(dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( GetBookmark())); diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index bfcb64724693..7fe2b3ee85ab 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -52,7 +52,6 @@ #define SN_LABELED_DATA_SEQUENCE "com.sun.star.chart2.data.LabeledDataSequence" using namespace ::com::sun::star; -using ::rtl::OUString; // from unotbl.cxx extern void sw_GetCellPosition( const String &rCellName, sal_Int32 &rColumn, sal_Int32 &rRow); @@ -1751,7 +1750,7 @@ void SwChartDataProvider::AddRowCols( } // XRangeXMLConversion --------------------------------------------------- -rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUString& rRangeRepresentation ) +OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRangeRepresentation ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { SolarMutexGuard aGuard; @@ -1819,7 +1818,7 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUStri return aRes; } -rtl::OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const rtl::OUString& rXMLRange ) +OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXMLRange ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { SolarMutexGuard aGuard; @@ -1832,7 +1831,7 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const rtl::OUSt // multiple ranges are delimeted by a ' ' like in // "Table1.$A$1:.$A$4 Table1.$C$2:.$C$5" the same table must be used in all ranges! xub_StrLen nNumRanges = comphelper::string::getTokenCount(aXMLRange, ' '); - rtl::OUString aFirstFoundTable; // to check that only one table will be used + OUString aFirstFoundTable; // to check that only one table will be used for (sal_uInt16 i = 0; i < nNumRanges; ++i) { String aRange( aXMLRange.GetToken(i, ' ') ); @@ -2169,13 +2168,13 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( String aNew; if (bUseCol) { - aRplc = rtl::OUString("%COLUMNLETTER"); - aNew = rtl::OUString(aCellName.GetBuffer(), pBuf - aCellName.GetBuffer()); + aRplc = OUString("%COLUMNLETTER"); + aNew = OUString(aCellName.GetBuffer(), pBuf - aCellName.GetBuffer()); } else { - aRplc = rtl::OUString("%ROWNUMBER"); - aNew = rtl::OUString(pBuf, (aCellName.GetBuffer() + nLen) - pBuf); + aRplc = OUString("%ROWNUMBER"); + aNew = OUString(pBuf, (aCellName.GetBuffer() + nLen) - pBuf); } xub_StrLen nPos = aTxt.Search( aRplc ); if (nPos != STRING_NOTFOUND) diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index a55f2fb56753..eb7d5b86b07a 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -79,7 +79,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::document; using namespace ::com::sun::star::uno; @@ -87,25 +86,24 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -using rtl::OUString; #ifndef DISABLE_SCRIPTING class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery > { SwDocShell* mpDocShell; - rtl::OUString msThisDocumentCodeName; + OUString msThisDocumentCodeName; public: SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {} // XCodeNameQuery - rtl::OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException ) + OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException ) { // not implemented... - return rtl::OUString(); + return OUString(); } - rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) + OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException ) { // Initialise the code name if ( msThisDocumentCodeName.isEmpty() ) @@ -113,14 +111,14 @@ public: try { uno::Reference< beans::XPropertySet > xProps( mpDocShell->GetModel(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString("BasicLibraries") ), uno::UNO_QUERY_THROW ); - rtl::OUString sProjectName( "Standard"); + uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( OUString("BasicLibraries") ), uno::UNO_QUERY_THROW ); + OUString sProjectName( "Standard"); if ( !mpDocShell->GetBasicManager()->GetName().isEmpty() ) { sProjectName = mpDocShell->GetBasicManager()->GetName(); } uno::Reference< container::XNameAccess > xLib( xLibContainer->getByName( sProjectName ), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > sModuleNames = xLib->getElementNames(); + uno::Sequence< OUString > sModuleNames = xLib->getElementNames(); uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY ); for ( sal_Int32 i=0; i < sModuleNames.getLength(); ++i ) @@ -138,7 +136,7 @@ public: { } } - rtl::OUString sCodeName; + OUString sCodeName; if ( mpDocShell ) { OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject"); @@ -173,7 +171,7 @@ public: } }; -typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > StringHashMap; +typedef boost::unordered_map< OUString, OUString, OUStringHash > StringHashMap; class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer > { StringHashMap mTemplateToProject; @@ -181,19 +179,19 @@ public: SwVbaProjectNameProvider() { } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) { return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() ); } - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); return uno::makeAny( mTemplateToProject.find( aName )->second ); } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) { - uno::Sequence< rtl::OUString > aElements( mTemplateToProject.size() ); + uno::Sequence< OUString > aElements( mTemplateToProject.size() ); StringHashMap::iterator it_end = mTemplateToProject.end(); sal_Int32 index = 0; for ( StringHashMap::iterator it = mTemplateToProject.begin(); it != it_end; ++it, ++index ) @@ -201,24 +199,24 @@ public: return aElements; } - virtual void SAL_CALL insertByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException ) + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException ) { - rtl::OUString sProjectName; + OUString sProjectName; aElement >>= sProjectName; OSL_TRACE("** Template cache inserting template name %s with project %s" - , rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() - , rtl::OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr() ); + , OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() + , OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr() ); mTemplateToProject[ aName ] = sProjectName; } - virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException ) { if ( !hasByName( Name ) ) throw container::NoSuchElementException(); mTemplateToProject.erase( Name ); } - virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException ) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException ) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -227,7 +225,7 @@ public: // XElemenAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) { - return ::getCppuType((const rtl::OUString*)0); + return ::getCppuType((const OUString*)0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException ) { @@ -246,7 +244,7 @@ public: // #FIXME #TODO is the code name for ThisDocument read anywhere? } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException ) { // #FIXME #TODO we really need to be checking against the codename for // ThisDocument @@ -255,7 +253,7 @@ public: return sal_False; } - ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -266,9 +264,9 @@ public: OSL_TRACE("Creating Object ( ooo.vba.word.Document ) 0x%x", xDocObj.get() ); return uno::makeAny( xDocObj ); } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException) { - uno::Sequence< rtl::OUString > aNames; + uno::Sequence< OUString > aNames; return aNames; } // XElemenAccess @@ -484,7 +482,7 @@ OUString SwXServiceProvider::GetProviderName(sal_uInt16 nObjectType) OUString sRet; sal_uInt16 nEntries = sizeof(aProvNamesId) / sizeof(aProvNamesId[0]); if(nObjectType < nEntries) - sRet = rtl::OUString::createFromAscii(aProvNamesId[nObjectType].pName); + sRet = OUString::createFromAscii(aProvNamesId[nObjectType].pName); return sRet; } @@ -496,7 +494,7 @@ uno::Sequence SwXServiceProvider::GetAllServiceNames() sal_uInt16 n = 0; for(sal_uInt16 i = 0; i < nEntries; i++) { - String sProv(rtl::OUString::createFromAscii(aProvNamesId[i].pName)); + String sProv(OUString::createFromAscii(aProvNamesId[i].pName)); if(sProv.Len()) { pArray[n] = sProv; @@ -612,7 +610,7 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 { uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= pDoc->GetDocShell()->GetModel(); - aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString("ooo.vba.word.Globals"), aArgs ); + aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( OUString("ooo.vba.word.Globals"), aArgs ); pDoc->GetDocShell()->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs ); } aGlobs >>= xRet; @@ -1683,7 +1681,7 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex) throw IndexOutOfBoundsException(); } -uno::Any SwXBookmarks::getByName(const rtl::OUString& rName) +uno::Any SwXBookmarks::getByName(const OUString& rName) throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -1709,7 +1707,7 @@ uno::Sequence< OUString > SwXBookmarks::getElementNames(void) if(!IsValid()) throw uno::RuntimeException(); - ::comphelper::SequenceAsVector< ::rtl::OUString > ret; + ::comphelper::SequenceAsVector< OUString > ret; IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess(); for (IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getBookmarksBegin(); @@ -1997,7 +1995,7 @@ uno::Sequence< OUString > SwXReferenceMarks::getElementNames(void) throw( uno::R uno::Sequence aRet; if(IsValid()) { - std::vector aStrings; + std::vector aStrings; sal_uInt16 nCount = GetDoc()->GetRefMarks( &aStrings ); aRet.realloc(nCount); OUString* pNames = aRet.getArray(); diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 28ab19a9bfac..d949481bb89e 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -90,7 +90,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::table; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -using ::rtl::OUString; namespace SwUnoCursorHelper { @@ -678,7 +677,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry nPaMStart = nPaMEnd; nPaMEnd = nTmp; } - Sequence< ::rtl::OUString> aCharStyles; + Sequence< OUString> aCharStyles; SwpHints* pHints = pTxtNode->GetpSwpHints(); for(sal_uInt16 nAttr = 0; nAttr < pHints->GetStartCount(); nAttr++ ) { @@ -960,8 +959,8 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, SwDoc* pDoc = pUnoCrsr->GetDoc(); SwDocShell* pDocSh = pDoc->GetDocShell(); comphelper::MediaDescriptor aMediaDescriptor( rOptions ); - ::rtl::OUString sFileName = rURL; - ::rtl::OUString sFilterName, sFilterOptions, sPassword, sBaseURL; + OUString sFileName = rURL; + OUString sFilterName, sFilterOptions, sPassword, sBaseURL; uno::Reference < io::XStream > xStream; uno::Reference < io::XInputStream > xInputStream; @@ -1163,7 +1162,7 @@ bool DocInsertStringSplitCR( } void makeRedline( SwPaM& rPaM, - const ::rtl::OUString& rRedlineType, + const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties ) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -1182,15 +1181,15 @@ void makeRedline( SwPaM& rPaM, //todo: what about REDLINE_FMTCOLL? comphelper::SequenceAsHashMap aPropMap( rRedlineProperties ); uno::Any aAuthorValue; - aAuthorValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineAuthor"), aAuthorValue); + aAuthorValue = aPropMap.getUnpackedValueOrDefault( OUString("RedlineAuthor"), aAuthorValue); sal_uInt16 nAuthor = 0; - ::rtl::OUString sAuthor; + OUString sAuthor; if( aAuthorValue >>= sAuthor ) nAuthor = pRedlineAccess->InsertRedlineAuthor(sAuthor); - ::rtl::OUString sComment; + OUString sComment; uno::Any aCommentValue; - aCommentValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineComment"), aCommentValue); + aCommentValue = aPropMap.getUnpackedValueOrDefault( OUString("RedlineComment"), aCommentValue); SwRedlineData aRedlineData( eType, nAuthor ); if( aCommentValue >>= sComment ) @@ -1198,7 +1197,7 @@ void makeRedline( SwPaM& rPaM, ::util::DateTime aStamp; uno::Any aDateTimeValue; - aDateTimeValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineDateTime"), aDateTimeValue); + aDateTimeValue = aPropMap.getUnpackedValueOrDefault( OUString("RedlineDateTime"), aDateTimeValue); if( aDateTimeValue >>= aStamp ) { aRedlineData.SetTimeStamp( diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index c86eabaa25cb..7540b1640ab8 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -61,7 +61,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence< sal_Int8 > *, SwShapeImplementationIdMap ); @@ -450,20 +449,20 @@ uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration(void) t new SwXShapesEnumeration(this)); } -rtl::OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeException ) +OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeException ) { return OUString("SwXDrawPage"); } -sal_Bool SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException ) +sal_Bool SwXDrawPage::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { return rServiceName == "com.sun.star.drawing.GenericDrawPage"; } -uno::Sequence< rtl::OUString > SwXDrawPage::getSupportedServiceNames(void) throw( uno::RuntimeException ) +uno::Sequence< OUString > SwXDrawPage::getSupportedServiceNames(void) throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence< OUString > aRet(1); + OUString* pArray = aRet.getArray(); pArray[0] = "com.sun.star.drawing.GenericDrawPage"; return aRet; } @@ -1041,7 +1040,7 @@ uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeEx if( xAggShape.is() ) { - const rtl::OUString aShapeType( xAggShape->getShapeType() ); + const OUString aShapeType( xAggShape->getShapeType() ); // did we already compute an implementation id for the agregated shape type? SwShapeImplementationIdMap::iterator aIter( aImplementationIdMap.find(aShapeType ) ); if( aIter == aImplementationIdMap.end() ) @@ -1095,7 +1094,7 @@ uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo(void) th return aRet; } -void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::Any& aValue) +void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1108,7 +1107,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A if(pEntry) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw beans::PropertyVetoException ( rtl::OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); //mit Layout kann der Anker umgesetzt werden, ohne dass sich die Position aendert if(pFmt) { @@ -1465,7 +1464,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A } } -uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) +uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -1541,7 +1540,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::Transformation> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("Transformation") ); + aRet = _getPropAtAggrObj( OUString("Transformation") ); } else if ( FN_SHAPE_POSITION_LAYOUT_DIR == pEntry->nWID ) { @@ -1552,13 +1551,13 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::StartPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("StartPosition") ); + aRet = _getPropAtAggrObj( OUString("StartPosition") ); } else if ( FN_SHAPE_ENDPOSITION_IN_HORI_L2R == pEntry->nWID ) { // get property <::drawing::Shape::EndPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("EndPosition") ); + aRet = _getPropAtAggrObj( OUString("EndPosition") ); } else { @@ -1618,7 +1617,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::Transformation> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("Transformation") ); + aRet = _getPropAtAggrObj( OUString("Transformation") ); } break; case FN_SHAPE_POSITION_LAYOUT_DIR: @@ -1631,14 +1630,14 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) { // get property <::drawing::Shape::StartPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("StartPosition") ); + aRet = _getPropAtAggrObj( OUString("StartPosition") ); } break; case FN_SHAPE_ENDPOSITION_IN_HORI_L2R: { // get property <::drawing::Shape::StartPosition> // without conversion to layout direction as below - aRet = _getPropAtAggrObj( rtl::OUString("EndPosition") ); + aRet = _getPropAtAggrObj( OUString("EndPosition") ); } break; } @@ -1685,7 +1684,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) return aRet; } -uno::Any SwXShape::_getPropAtAggrObj( const ::rtl::OUString& _rPropertyName ) +uno::Any SwXShape::_getPropAtAggrObj( const OUString& _rPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -1705,19 +1704,19 @@ uno::Any SwXShape::_getPropAtAggrObj( const ::rtl::OUString& _rPropertyName ) return aRet; } -beans::PropertyState SwXShape::getPropertyState( const rtl::OUString& rPropertyName ) +beans::PropertyState SwXShape::getPropertyState( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; - uno::Sequence< rtl::OUString > aNames(1); - rtl::OUString* pStrings = aNames.getArray(); + uno::Sequence< OUString > aNames(1); + OUString* pStrings = aNames.getArray(); pStrings[0] = rPropertyName; uno::Sequence< beans::PropertyState > aStates = getPropertyStates(aNames); return aStates.getConstArray()[0]; } uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( - const uno::Sequence< rtl::OUString >& aPropertyNames ) + const uno::Sequence< OUString >& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1734,7 +1733,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( bGroupMember = pObject->GetUpGroup() != 0; bFormControl = pObject->GetObjInventor() == FmFormInventor; } - const rtl::OUString* pNames = aPropertyNames.getConstArray(); + const OUString* pNames = aPropertyNames.getConstArray(); beans::PropertyState* pRet = aRet.getArray(); uno::Reference< XPropertyState > xShapePrState; for(sal_Int32 nProperty = 0; nProperty < aPropertyNames.getLength(); nProperty++) @@ -1818,7 +1817,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( return aRet; } -void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName ) +void SwXShape::setPropertyToDefault( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1829,7 +1828,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName ) if(pEntry) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) - throw uno::RuntimeException( rtl::OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); + throw uno::RuntimeException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if(pFmt) { const SfxItemSet& rSet = pFmt->GetAttrSet(); @@ -1880,7 +1879,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName ) throw uno::RuntimeException(); } -uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName ) +uno::Any SwXShape::getPropertyDefault( const OUString& rPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -1917,13 +1916,13 @@ uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName ) } void SwXShape::addPropertyChangeListener( - const rtl::OUString& _propertyName, + const OUString& _propertyName, const uno::Reference< beans::XPropertyChangeListener > & _listener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { if ( !xShapeAgg.is() ) - throw uno::RuntimeException( ::rtl::OUString( "no shape aggregate" ), *this ); + throw uno::RuntimeException( OUString( "no shape aggregate" ), *this ); // must be handled by the aggregate uno::Reference< beans::XPropertySet > xShapeProps; @@ -1932,13 +1931,13 @@ void SwXShape::addPropertyChangeListener( } void SwXShape::removePropertyChangeListener( - const rtl::OUString& _propertyName, + const OUString& _propertyName, const uno::Reference< beans::XPropertyChangeListener > & _listener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { if ( !xShapeAgg.is() ) - throw uno::RuntimeException( ::rtl::OUString( "no shape aggregate" ), *this ); + throw uno::RuntimeException( OUString( "no shape aggregate" ), *this ); // must be handled by the aggregate uno::Reference< beans::XPropertySet > xShapeProps; @@ -1947,7 +1946,7 @@ void SwXShape::removePropertyChangeListener( } void SwXShape::addVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1956,7 +1955,7 @@ void SwXShape::addVetoableChangeListener( } void SwXShape::removeVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -2125,12 +2124,12 @@ void SwXShape::removeEventListener( pSvxShape->removeEventListener(aListener); } -rtl::OUString SwXShape::getImplementationName(void) throw( uno::RuntimeException ) +OUString SwXShape::getImplementationName(void) throw( uno::RuntimeException ) { return OUString("SwXShape"); } -sal_Bool SwXShape::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException ) +sal_Bool SwXShape::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { sal_Bool bRet = sal_False; if(COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.drawing.Shape")) @@ -2144,9 +2143,9 @@ sal_Bool SwXShape::supportsService(const rtl::OUString& rServiceName) throw( uno return bRet; } -uno::Sequence< rtl::OUString > SwXShape::getSupportedServiceNames(void) throw( uno::RuntimeException ) +uno::Sequence< OUString > SwXShape::getSupportedServiceNames(void) throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSeq; + uno::Sequence< OUString > aSeq; if(xShapeAgg.is()) { uno::Reference< lang::XUnoTunnel > xShapeTunnel(xShapeAgg, uno::UNO_QUERY); @@ -2327,9 +2326,9 @@ void SAL_CALL SwXShape::setSize( const awt::Size& aSize ) } // #i31698# // implementation of virtual methods from drawing::XShapeDescriptor -::rtl::OUString SAL_CALL SwXShape::getShapeType() throw ( uno::RuntimeException ) +OUString SAL_CALL SwXShape::getShapeType() throw ( uno::RuntimeException ) { - ::rtl::OUString aType; + OUString aType; if ( mxShape.is() ) { aType = mxShape->getShapeType(); @@ -2367,9 +2366,9 @@ awt::Point SwXShape::_GetAttrPosition() { awt::Point aAttrPos; - uno::Any aHoriPos( getPropertyValue( rtl::OUString("HoriOrientPosition") ) ); + uno::Any aHoriPos( getPropertyValue( OUString("HoriOrientPosition") ) ); aHoriPos >>= aAttrPos.X; - uno::Any aVertPos( getPropertyValue( rtl::OUString("VertOrientPosition") ) ); + uno::Any aVertPos( getPropertyValue( OUString("VertOrientPosition") ) ); aVertPos >>= aAttrPos.Y; // #i35798# - fallback, if attribute position is (0,0) // and no anchor position is applied to the drawing object @@ -2392,7 +2391,7 @@ awt::Point SwXShape::_GetAttrPosition() text::TextContentAnchorType eTextAnchorType = text::TextContentAnchorType_AT_PARAGRAPH; { - rtl::OUString sAnchorType( "AnchorType" ); + OUString sAnchorType( "AnchorType" ); uno::Any aAny = getPropertyValue( sAnchorType ); aAny >>= eTextAnchorType; } @@ -2521,14 +2520,14 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) text::TextContentAnchorType eTextAnchorType = text::TextContentAnchorType_AT_PARAGRAPH; { - rtl::OUString sAnchorType( "AnchorType" ); + OUString sAnchorType( "AnchorType" ); uno::Any aAny = getPropertyValue( sAnchorType ); aAny >>= eTextAnchorType; } if ( eTextAnchorType != text::TextContentAnchorType_AS_CHARACTER ) { // determine current x-postion - rtl::OUString aHoriPosPropStr("HoriOrientPosition"); + OUString aHoriPosPropStr("HoriOrientPosition"); uno::Any aHoriPos( getPropertyValue( aHoriPosPropStr ) ); sal_Int32 dCurrX = 0; aHoriPos >>= dCurrX; @@ -2537,7 +2536,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) { // adjust x-position orientation to text::HoriOrientation::NONE, if needed // Note: has to be done before setting x-position attribute - rtl::OUString aHoriOrientPropStr("HoriOrient"); + OUString aHoriOrientPropStr("HoriOrient"); uno::Any aHoriOrient( getPropertyValue( aHoriOrientPropStr ) ); sal_Int16 eHoriOrient; if (aHoriOrient >>= eHoriOrient) // may be void @@ -2558,7 +2557,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) // handle y-position { // determine current y-postion - rtl::OUString aVertPosPropStr("VertOrientPosition"); + OUString aVertPosPropStr("VertOrientPosition"); uno::Any aVertPos( getPropertyValue( aVertPosPropStr ) ); sal_Int32 dCurrY = 0; aVertPos >>= dCurrY; @@ -2567,7 +2566,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) { // adjust y-position orientation to text::VertOrientation::NONE, if needed // Note: has to be done before setting y-position attribute - rtl::OUString aVertOrientPropStr("VertOrient"); + OUString aVertOrientPropStr("VertOrient"); uno::Any aVertOrient( getPropertyValue( aVertOrientPropStr ) ); sal_Int16 eVertOrient; if (aVertOrient >>= eVertOrient) // may be void diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index a5695cae9bc9..a9683f74fb5b 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -42,8 +42,6 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::lang::XServiceInfo; using ::com::sun::star::beans::PropertyValue; using ::cppu::WeakImplHelper2; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // // tables of allowed events for specific objects diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 130e668a810e..53a3de7ebb79 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -88,7 +88,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace nsSwDocInfoSubType; @@ -447,7 +446,7 @@ sal_Bool SwXFieldMaster::supportsService(const OUString& rServiceName) throw( un } if( pEntry ) { - rtl::OString aTmp = rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM( + OString aTmp = OStringBuffer(RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.fieldmaster.")).append(pEntry). makeStringAndClear(); bRet = rServiceName.equalsAsciiL(aTmp.getStr(), aTmp.getLength()); @@ -613,7 +612,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, { SwSetExpFieldType aType(m_pDoc, sTypeName); if(sParam1.Len()) - aType.SetDelimiter(rtl::OUString(sParam1.GetChar(0))); + aType.SetDelimiter(OUString(sParam1.GetChar(0))); if(nParam1 > -1 && nParam1 < MAXLEVEL) aType.SetOutlineLvl(nParam1); pType2 = m_pDoc->InsertFldType(aType); @@ -1218,7 +1217,7 @@ OUString SwXTextField::getPresentation(sal_Bool bShowCommand) throw( uno::Runtim { throw uno::RuntimeException(); } - ::rtl::OUString const ret( (bShowCommand) + OUString const ret( (bShowCommand) ? pField->GetFieldName() : pField->ExpandField(true) ); return ret; @@ -1665,7 +1664,7 @@ void SwXTextField::attachToRange( case SW_SERVICE_FIELDTYPE_MACRO: { SwFieldType* pFldType = pDoc->GetSysFldType(RES_MACROFLD); - rtl::OUString aName; + OUString aName; // support for Scripting Framework macros if (m_pProps->sPar4.Len() != 0) diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index ae666e0c19c4..2c3696a1bf77 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -61,7 +61,7 @@ CreateFlatParagraphIterator(SwDoc & rDoc, sal_Int32 const nTextMarkupType, * SwXFlatParagraph ******************************************************************************/ -SwXFlatParagraph::SwXFlatParagraph( SwTxtNode& rTxtNode, rtl::OUString aExpandText, const ModelToViewHelper& rMap ) : +SwXFlatParagraph::SwXFlatParagraph( SwTxtNode& rTxtNode, OUString aExpandText, const ModelToViewHelper& rMap ) : SwXTextMarkup( rTxtNode, rMap ), maExpandText( aExpandText ) { @@ -119,14 +119,14 @@ css::uno::Reference< css::container::XStringKeyMap > SAL_CALL SwXFlatParagraph:: return SwXTextMarkup::getMarkupInfoContainer(); } -void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException) +void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException) { SolarMutexGuard aGuard; SwXTextMarkup::commitTextMarkup( nType, rIdentifier, nStart, nLength, rxMarkupInfoContainer ); } // text::XFlatParagraph: -::rtl::OUString SAL_CALL SwXFlatParagraph::getText() throw (uno::RuntimeException) +OUString SAL_CALL SwXFlatParagraph::getText() throw (uno::RuntimeException) { return maExpandText; } @@ -201,7 +201,7 @@ lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPo } // text::XFlatParagraph: -void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const ::rtl::OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) +void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) { SolarMutexGuard aGuard; @@ -419,7 +419,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara() { // Expand the string: const ModelToViewHelper aConversionMap(*pRet); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); xRet = new SwXFlatParagraph( *pRet, aExpandText, aConversionMap ); // keep hard references... @@ -471,7 +471,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(co { // Expand the string: const ModelToViewHelper aConversionMap(*pNextTxtNode); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); xRet = new SwXFlatParagraph( *pNextTxtNode, aExpandText, aConversionMap ); // keep hard references... @@ -517,7 +517,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaBefore(c { // Expand the string: const ModelToViewHelper aConversionMap(*pPrevTxtNode); - rtl::OUString aExpandText = aConversionMap.getViewText(); + OUString aExpandText = aConversionMap.getViewText(); xRet = new SwXFlatParagraph( *pPrevTxtNode, aExpandText, aConversionMap ); // keep hard references... diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 0990c4fc9890..e2f223d3d8fb 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -115,7 +115,6 @@ extern sal_Bool sw_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ); using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::frame::XModel; using ::com::sun::star::container::XNameAccess; @@ -1189,7 +1188,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: else if( sTmp.EqualsAscii( sGraphicObjectProtocol, 0, sizeof(sGraphicObjectProtocol)-1 ) ) { - rtl::OString sId(rtl::OUStringToOString( + OString sId(OUStringToOString( sTmp.Copy(sizeof(sGraphicObjectProtocol)-1), RTL_TEXTENCODING_ASCII_US)); pGrfObj = new GraphicObject( sId ); @@ -1256,10 +1255,10 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: // the package URL based graphics are handled in different way currently // TODO/LATER: actually this is the correct place to handle them - ::rtl::OUString aGraphicProtocol( RTL_CONSTASCII_USTRINGPARAM( sGraphicObjectProtocol ) ); + OUString aGraphicProtocol( RTL_CONSTASCII_USTRINGPARAM( sGraphicObjectProtocol ) ); if( aGrfUrl.startsWith( aGraphicProtocol ) ) { - rtl::OString sId(rtl::OUStringToOString( + OString sId(OUStringToOString( aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1), RTL_TEXTENCODING_ASCII_US)); pGrfObj = new GraphicObject( sId ); @@ -1289,7 +1288,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: { svt::EmbeddedObjectRef &rObj = pOleNode->GetOLEObj().GetObject(); - ::rtl::OUString aMediaType; + OUString aMediaType; rObj.SetGraphic( aGraphic, aMediaType ); } } @@ -1565,8 +1564,8 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) } else { - rtl::OUString sPrefix( RTL_CONSTASCII_USTRINGPARAM(sGraphicObjectProtocol) ); - rtl::OUString sId(rtl::OStringToOUString( + OUString sPrefix( RTL_CONSTASCII_USTRINGPARAM(sGraphicObjectProtocol) ); + OUString sId(OStringToOUString( pGrfNode->GetGrfObj().GetUniqueID(), RTL_TEXTENCODING_ASCII_US)); sGrfName = sPrefix + sId; @@ -1740,7 +1739,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) aAny <<= aHexCLSID; else if(FN_UNO_STREAM_NAME == pEntry->nWID) { - aAny <<= ::rtl::OUString(pOleNode->GetOLEObj().GetCurrentPersistName()); + aAny <<= OUString(pOleNode->GetOLEObj().GetCurrentPersistName()); } else if(FN_EMBEDDED_OBJECT == pEntry->nWID) { @@ -2247,7 +2246,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan else if( sGraphicURL.EqualsAscii( sGraphicObjectProtocol, 0, sizeof(sGraphicObjectProtocol)-1 ) ) { - rtl::OString sId(rtl::OUStringToOString( + OString sId(OUStringToOString( sGraphicURL.Copy( sizeof(sGraphicObjectProtocol)-1 ), RTL_TEXTENCODING_ASCII_US)); pGrfObj = new GraphicObject( sId ); @@ -2290,19 +2289,19 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan } const ::uno::Any* pSurroundContour; if(pProps->GetProperty(RES_SURROUND, MID_SURROUND_CONTOUR, pSurroundContour)) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SURROUND_CONTOUR)), *pSurroundContour); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SURROUND_CONTOUR)), *pSurroundContour); const ::uno::Any* pContourOutside; if(pProps->GetProperty(RES_SURROUND, MID_SURROUND_CONTOUROUTSIDE, pContourOutside)) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_OUTSIDE)), *pContourOutside); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_OUTSIDE)), *pContourOutside); const ::uno::Any* pContourPoly; if(pProps->GetProperty(FN_PARAM_COUNTOUR_PP, 0, pContourPoly)) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_POLY_POLYGON)), *pContourPoly); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_POLY_POLYGON)), *pContourPoly); const ::uno::Any* pPixelContour; if(pProps->GetProperty(FN_UNO_IS_PIXEL_CONTOUR, 0, pPixelContour)) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_PIXEL_CONTOUR)), *pPixelContour); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_PIXEL_CONTOUR)), *pPixelContour); const ::uno::Any* pAutoContour; if(pProps->GetProperty(FN_UNO_IS_AUTOMATIC_CONTOUR, 0, pAutoContour)) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_AUTOMATIC_CONTOUR)), *pAutoContour); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_AUTOMATIC_CONTOUR)), *pAutoContour); } else { @@ -2329,7 +2328,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan } pCnt.reset( new comphelper::EmbeddedObjectContainer ); - ::rtl::OUString aName; + OUString aName; xIPObj = pCnt->CreateEmbeddedObject( aClassName.GetByteSequence(), aName ); } if ( xIPObj.is() ) @@ -2394,7 +2393,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan } else if( pStreamName ) { - ::rtl::OUString sStreamName; + OUString sStreamName; (*pStreamName) >>= sStreamName; pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL); @@ -2421,7 +2420,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan uno::Reference < container::XChild > xChild( obj, uno::UNO_QUERY ); if ( xChild.is() ) xChild->setParent( mrPers.GetModel() ); - ::rtl::OUString rName; + OUString rName; mrPers.GetEmbeddedObjectContainer().InsertEmbeddedObject( obj, rName ); SwFlyFrmFmt* pFrmFmt = 0; @@ -2436,21 +2435,21 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan GetOrCreateSdrObject( pFmt ); const ::uno::Any* pOrder; if( pProps->GetProperty(FN_UNO_Z_ORDER, 0, pOrder) ) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_Z_ORDER)), *pOrder); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_Z_ORDER)), *pOrder); const ::uno::Any* pReplacement; if( pProps->GetProperty(FN_UNO_REPLACEMENT_GRAPHIC, 0, pReplacement) ) - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_GRAPHIC)), *pReplacement); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_GRAPHIC)), *pReplacement); // new attribute Title const ::uno::Any* pTitle; if ( pProps->GetProperty(FN_UNO_TITLE, 0, pTitle) ) { - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)), *pTitle); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)), *pTitle); } // new attribute Description const ::uno::Any* pDescription; if ( pProps->GetProperty(FN_UNO_DESCRIPTION, 0, pDescription) ) { - setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_DESCRIPTION)), *pDescription); + setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_DESCRIPTION)), *pDescription); } } else diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 0e9ef54b7856..69526c940758 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; /****************************************************************** * SwXFootnote @@ -59,7 +58,7 @@ public: ::cppu::OInterfaceContainerHelper m_EventListeners; bool m_bIsDescriptor; const SwFmtFtn * m_pFmtFtn; - ::rtl::OUString m_sLabel; + OUString m_sLabel; Impl( SwXFootnote & rThis, SwDoc *const pDoc, SwFmtFtn const*const pFootnote, @@ -255,7 +254,7 @@ OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString sRet; + OUString sRet; SwFmtFtn const*const pFmt = m_pImpl->GetFootnoteFormat(); if(pFmt) { @@ -523,7 +522,7 @@ throw (uno::RuntimeException) } void SAL_CALL -SwXFootnote::setPropertyValue(const ::rtl::OUString&, const uno::Any&) +SwXFootnote::setPropertyValue(const OUString&, const uno::Any&) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -574,7 +573,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXFootnote::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -584,7 +583,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXFootnote::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -594,7 +593,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXFootnote::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -604,7 +603,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXFootnote::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 03a8c9216b15..395f05af840d 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; static OUString lcl_AnyToString(uno::Any const& rVal) throw (lang::IllegalArgumentException) @@ -196,12 +195,12 @@ public: StyleAccess_Impl(SwXDocumentIndex& rParentIdx); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); virtual sal_Bool SAL_CALL - supportsService(const ::rtl::OUString& rServiceName) + supportsService(const OUString& rServiceName) throw (uno::RuntimeException); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // XElementAccess @@ -242,12 +241,12 @@ public: TokenAccess_Impl(SwXDocumentIndex& rParentIdx); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); virtual sal_Bool SAL_CALL - supportsService(const ::rtl::OUString& rServiceName) + supportsService(const OUString& rServiceName) throw (uno::RuntimeException); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // XElementAccess @@ -1201,7 +1200,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndex::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1211,7 +1210,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndex::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1221,7 +1220,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndex::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1231,7 +1230,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndex::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1926,7 +1925,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( // deshalb hier ein Leerzeichen - ob das die ideale Loesung ist? if (!bMark && !rMark.GetAlternativeText().Len()) { - rMark.SetAlternativeText( rtl::OUString(' ') ); + rMark.SetAlternativeText( OUString(' ') ); } const bool bForceExpandHints( (!bMark && pTextCursor) @@ -1975,7 +1974,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( if (!pTxtAttr) { - throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( "SwXDocumentIndexMark::InsertTOXMark(): cannot insert attribute")), 0); } @@ -2314,7 +2313,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndexMark::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2324,7 +2323,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndexMark::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2334,7 +2333,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndexMark::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2344,7 +2343,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXDocumentIndexMark::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 0aacac71dd86..5f3cfc282fec 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using ::rtl::OUString; using namespace ::comphelper; #define SW_PROP_NMID(id) ((const char*)id), 0 diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 050b9cbbc20c..1771cdc1d3e3 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -109,8 +109,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; /**************************************************************************** Hilfsklassen @@ -178,7 +176,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) #endif WriterRef xWrt; // TODO/MBA: looks like a BaseURL doesn't make sense here - SwReaderWriter::GetWriter( rtl::OUString(FILTER_TEXT_DLG), String(), xWrt ); + SwReaderWriter::GetWriter( OUString(FILTER_TEXT_DLG), String(), xWrt ); if( xWrt.Is() ) { SwWriter aWriter( aStream, rPam ); @@ -205,7 +203,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) long lUniLen = (lLen / sizeof( sal_Unicode )); rtl_uString *pStr = rtl_uString_alloc(lUniLen); aStream.Read(pStr->buffer, lUniLen * sizeof(sal_Unicode)); - rBuffer = rtl::OUString(pStr, SAL_NO_ACQUIRE); + rBuffer = OUString(pStr, SAL_NO_ACQUIRE); } xWrt->bShowProgress = bOldShowProgress; } @@ -546,7 +544,7 @@ throw (lang::IllegalArgumentException) // #i91601# else if (FN_UNO_LIST_ID == rEntry.nWID) { - ::rtl::OUString sListId; + OUString sListId; if (rValue >>= sListId) { pTxtNd->SetListId( sListId ); @@ -825,7 +823,7 @@ SwXTextCursor::~SwXTextCursor() { } -void SwXTextCursor::DeleteAndInsert(const ::rtl::OUString& rText, +void SwXTextCursor::DeleteAndInsert(const OUString& rText, const bool bForceExpandHints) { SwUnoCrsr *const pUnoCrsr = m_pImpl->GetCursor(); @@ -1879,7 +1877,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, return; SwDoc *const pDoc = rPaM.GetDoc(); - rtl::OUString aUnknownExMsg, aPropertyVetoExMsg; + OUString aUnknownExMsg, aPropertyVetoExMsg; // Build set of attributes we want to fetch std::vector aWhichPairs; @@ -1887,7 +1885,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, aEntries.reserve(rPropertyValues.getLength()); for (sal_Int32 i = 0; i < rPropertyValues.getLength(); ++i) { - const rtl::OUString &rPropertyName = rPropertyValues[i].Name; + const OUString &rPropertyName = rPropertyValues[i].Name; SfxItemPropertySimpleEntry const* pEntry = rPropSet.getPropertyMap().getByName(rPropertyName); @@ -2249,7 +2247,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2259,7 +2257,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2269,7 +2267,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2279,7 +2277,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -2333,7 +2331,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, } void SAL_CALL SwXTextCursor::setPropertyValues( - const uno::Sequence< ::rtl::OUString >& aPropertyNames, + const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, @@ -2369,7 +2367,7 @@ void SAL_CALL SwXTextCursor::setPropertyValues( } uno::Sequence< uno::Any > SAL_CALL -SwXTextCursor::getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) +SwXTextCursor::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException) { // a banal implementation for now @@ -2380,7 +2378,7 @@ SwXTextCursor::getPropertyValues( const uno::Sequence< ::rtl::OUString >& aPrope } void SAL_CALL SwXTextCursor::addPropertiesChangeListener( - const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, + const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ ) throw (css::uno::RuntimeException) { @@ -2394,7 +2392,7 @@ void SAL_CALL SwXTextCursor::removePropertiesChangeListener( } void SAL_CALL SwXTextCursor::firePropertiesChangeEvent( - const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, + const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ ) throw (css::uno::RuntimeException) { @@ -2576,7 +2574,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::makeRedline( - const ::rtl::OUString& rRedlineType, + const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) { diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index d40071ef5ef5..aa71134fc797 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -109,13 +109,12 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; namespace sw { sal_Bool SupportsServiceImpl( size_t const nServices, char const*const pServices[], - ::rtl::OUString const & rServiceName) + OUString const & rServiceName) { for (size_t i = 0; i < nServices; ++i) { @@ -127,14 +126,14 @@ sal_Bool SupportsServiceImpl( return sal_False; } -uno::Sequence< ::rtl::OUString > +uno::Sequence< OUString > GetSupportedServiceNamesImpl( size_t const nServices, char const*const pServices[]) { - uno::Sequence< ::rtl::OUString > ret(nServices); + uno::Sequence< OUString > ret(nServices); for (size_t i = 0; i < nServices; ++i) { - ret[i] = rtl::OUString::createFromAscii(pServices[i]); + ret[i] = OUString::createFromAscii(pServices[i]); } return ret; } @@ -847,13 +846,13 @@ void SwXTextRange::SetPositions(const SwPaM& rPam) { m_pImpl->Invalidate(); IDocumentMarkAccess* const pMA = m_pImpl->m_rDoc.getIDocumentMarkAccess(); - m_pImpl->m_pMark = pMA->makeMark(rPam, ::rtl::OUString(), + m_pImpl->m_pMark = pMA->makeMark(rPam, OUString(), IDocumentMarkAccess::UNO_BOOKMARK); m_pImpl->m_pMark->Add(m_pImpl.get()); } void SwXTextRange::DeleteAndInsert( - const ::rtl::OUString& rText, const bool bForceExpandHints) + const OUString& rText, const bool bForceExpandHints) throw (uno::RuntimeException) { if (RANGE_IS_TABLE == m_pImpl->m_eRangePosition) @@ -1418,7 +1417,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextRange::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1428,7 +1427,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextRange::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1438,7 +1437,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextRange::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1448,7 +1447,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextRange::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1522,7 +1521,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextRange::makeRedline( - const ::rtl::OUString& rRedlineType, + const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties ) throw (lang::IllegalArgumentException, uno::RuntimeException) { diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 5382e1b58a80..8a27742395f2 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; class SwParaSelection { @@ -113,7 +112,7 @@ public: bool m_bIsDescriptor; sal_Int32 m_nSelectionStartPos; sal_Int32 m_nSelectionEndPos; - ::rtl::OUString m_sText; + OUString m_sText; uno::Reference m_xParentText; Impl( SwXParagraph & rThis, @@ -151,7 +150,7 @@ public: bool IsDescriptor() const { return m_bIsDescriptor; } void SetPropertyValues_Impl( - const uno::Sequence< ::rtl::OUString >& rPropertyNames, + const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, @@ -159,13 +158,13 @@ public: uno::Sequence< uno::Any > GetPropertyValues_Impl( - const uno::Sequence< ::rtl::OUString >& rPropertyNames) + const uno::Sequence< OUString >& rPropertyNames) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); uno::Sequence< beans::GetDirectPropertyTolerantResult > GetPropertyValuesTolerant_Impl( - const uno::Sequence< ::rtl::OUString >& rPropertyNames, + const uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly) throw (uno::RuntimeException); protected: @@ -811,7 +810,7 @@ bool ::sw::GetDefaultTextContentValue( void SAL_CALL SwXParagraph::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -821,7 +820,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXParagraph::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -831,7 +830,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXParagraph::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -841,7 +840,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXParagraph::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index caea251ac319..e221f80ecfa7 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -293,7 +293,7 @@ void SwXTextPortion::GetPropertyValue( OUString sRet; if( pRet ) - sRet = rtl::OUString::createFromAscii( pRet ); + sRet = OUString::createFromAscii( pRet ); rVal <<= sRet; } break; @@ -440,7 +440,7 @@ uno::Any SwXTextPortion::getPropertyValue( throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { SolarMutexGuard aGuard; - uno::Sequence< ::rtl::OUString > aPropertyNames(1); + uno::Sequence< OUString > aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; return GetPropertyValues_Impl(aPropertyNames).getConstArray()[0]; } diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index ce0e056a024e..d891e66c28fc 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; SwXRedlineText::SwXRedlineText(SwDoc* _pDoc, SwNodeIndex aIndex) : SwXText(_pDoc, CURSOR_REDLINE), @@ -232,15 +230,15 @@ static uno::Sequence lcl_GetSuccessorProperties(const SwRe if(pNext) { beans::PropertyValue* pValues = aValues.getArray(); - pValues[0].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR)); + pValues[0].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR)); // GetAuthorString(n) walks the SwRedlineData* chain; // here we always need element 1 pValues[0].Value <<= OUString(rRedline.GetAuthorString(1)); - pValues[1].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME)); + pValues[1].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME)); pValues[1].Value <<= lcl_DateTimeToUno(pNext->GetTimeStamp()); - pValues[2].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT)); + pValues[2].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT)); pValues[2].Value <<= OUString(pNext->GetComment()); - pValues[3].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE)); + pValues[3].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE)); pValues[3].Value <<= lcl_RedlineTypeToOUString(pNext->GetType()); } return aValues; @@ -354,25 +352,25 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties sRedlineIdBuf.append( sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >(&rRedline) ) ); sal_Int32 nPropIdx = 0; - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_AUTHOR)); pRet[nPropIdx++].Value <<= OUString(rRedline.GetAuthorString()); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_DATE_TIME)); pRet[nPropIdx++].Value <<= lcl_DateTimeToUno(rRedline.GetTimeStamp()); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_COMMENT)); pRet[nPropIdx++].Value <<= OUString(rRedline.GetComment()); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TYPE)); pRet[nPropIdx++].Value <<= lcl_RedlineTypeToOUString(rRedline.GetType()); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_IDENTIFIER)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_IDENTIFIER)); pRet[nPropIdx++].Value <<= sRedlineIdBuf.makeStringAndClear(); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_COLLAPSED)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_COLLAPSED)); sal_Bool bTmp = !rRedline.HasMark(); pRet[nPropIdx++].Value.setValue(&bTmp, ::getBooleanCppuType()) ; - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_START)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_START)); pRet[nPropIdx++].Value.setValue(&bIsStart, ::getBooleanCppuType()) ; bTmp = !rRedline.IsDelLastPara(); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_MERGE_LAST_PARA)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_MERGE_LAST_PARA)); pRet[nPropIdx++].Value.setValue(&bTmp, ::getBooleanCppuType()) ; SwNodeIndex* pNodeIdx = rRedline.GetContentIdx(); @@ -381,7 +379,7 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties if ( 1 < ( pNodeIdx->GetNode().EndOfSectionIndex() - pNodeIdx->GetNode().GetIndex() ) ) { uno::Reference xRet = new SwXRedlineText(rRedline.GetDoc(), *pNodeIdx); - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TEXT)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_TEXT)); pRet[nPropIdx++].Value <<= xRet; } else { @@ -390,7 +388,7 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties } if(pNext) { - pRet[nPropIdx].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_SUCCESSOR_DATA)); + pRet[nPropIdx].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_REDLINE_SUCCESSOR_DATA)); pRet[nPropIdx++].Value <<= lcl_GetSuccessorProperties(rRedline); } aRet.realloc(nPropIdx); diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 116f0aefdc49..f726abc0ae01 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -34,7 +34,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; SwXRedlines::SwXRedlines(SwDoc* _pDoc) : SwUnoCollection(_pDoc) @@ -100,7 +99,7 @@ OUString SwXRedlines::getImplementationName(void) throw( uno::RuntimeException ) return OUString("SwXRedlines"); } -sal_Bool SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/) +sal_Bool SwXRedlines::supportsService(const OUString& /*ServiceName*/) throw( uno::RuntimeException ) { OSL_FAIL("not implemented"); @@ -162,12 +161,12 @@ uno::Any SwXRedlineEnumeration::nextElement(void) return aRet; } -rtl::OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::RuntimeException ) +OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::RuntimeException ) { return OUString("SwXRedlineEnumeration"); } -sal_Bool SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException ) +sal_Bool SwXRedlineEnumeration::supportsService(const OUString& /*ServiceName*/) throw( uno::RuntimeException ) { return sal_False; } diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 5dccc5370596..3e034316af54 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; /****************************************************************** * SwXReferenceMark @@ -55,7 +54,7 @@ public: bool m_bIsDescriptor; SwDoc * m_pDoc; const SwFmtRefMark * m_pMarkFmt; - ::rtl::OUString m_sMarkName; + OUString m_sMarkName; Impl( SwXReferenceMark & rThis, SwDoc *const pDoc, SwFmtRefMark const*const pRefMark) @@ -268,7 +267,7 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam, if (!pTxtAttr) { - throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM( "SwXReferenceMark::InsertRefMark(): cannot insert attribute")), 0); } @@ -899,7 +898,7 @@ throw (uno::RuntimeException) } // XServiceInfo -::rtl::OUString SAL_CALL +OUString SAL_CALL SwXMeta::getImplementationName() throw (uno::RuntimeException) { return OUString("SwXMeta"); @@ -915,14 +914,14 @@ static const size_t g_nServicesMeta( sizeof(g_ServicesMeta)/sizeof(g_ServicesMeta[0])); sal_Bool SAL_CALL -SwXMeta::supportsService(const ::rtl::OUString& rServiceName) +SwXMeta::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) { return ::sw::SupportsServiceImpl( g_nServicesMeta, g_ServicesMeta, rServiceName); } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL SwXMeta::getSupportedServiceNames() throw (uno::RuntimeException) { return ::sw::GetSupportedServiceNamesImpl(g_nServicesMeta, g_ServicesMeta); @@ -994,7 +993,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!m_pImpl->m_bIsDescriptor) { throw uno::RuntimeException( - rtl::OUString("SwXMeta::attach(): already attached"), + OUString("SwXMeta::attach(): already attached"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1002,7 +1001,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!xRangeTunnel.is()) { throw lang::IllegalArgumentException( - rtl::OUString("SwXMeta::attach(): argument is no XUnoTunnel"), + OUString("SwXMeta::attach(): argument is no XUnoTunnel"), static_cast< ::cppu::OWeakObject* >(this), 0); } SwXTextRange *const pRange( @@ -1012,7 +1011,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!pRange && !pCursor) { throw lang::IllegalArgumentException( - rtl::OUString("SwXMeta::attach(): argument not supported type"), + OUString("SwXMeta::attach(): argument not supported type"), static_cast< ::cppu::OWeakObject* >(this), 0); } @@ -1021,7 +1020,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!pDoc) { throw lang::IllegalArgumentException( - rtl::OUString("SwXMeta::attach(): argument has no SwDoc"), + OUString("SwXMeta::attach(): argument has no SwDoc"), static_cast< ::cppu::OWeakObject* >(this), 0); } @@ -1049,14 +1048,14 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) if (!bSuccess) { throw lang::IllegalArgumentException( - rtl::OUString("SwXMeta::attach(): cannot create meta: range invalid?"), + OUString("SwXMeta::attach(): cannot create meta: range invalid?"), static_cast< ::cppu::OWeakObject* >(this), 1); } if (!pTxtAttr) { OSL_FAIL("meta inserted, but has no text attribute?"); throw uno::RuntimeException( - rtl::OUString("SwXMeta::attach(): cannot create meta"), + OUString("SwXMeta::attach(): cannot create meta"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1088,7 +1087,7 @@ SwXMeta::getAnchor() throw (uno::RuntimeException) if (m_pImpl->m_bIsDescriptor) { throw uno::RuntimeException( - rtl::OUString("SwXMeta::getAnchor(): not inserted"), + OUString("SwXMeta::getAnchor(): not inserted"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1100,7 +1099,7 @@ SwXMeta::getAnchor() throw (uno::RuntimeException) if (!bSuccess) { throw lang::DisposedException( - rtl::OUString("SwXMeta::getAnchor(): not attached"), + OUString("SwXMeta::getAnchor(): not attached"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1131,7 +1130,7 @@ SwXMeta::getEnd() throw (uno::RuntimeException) return m_pImpl->m_Text.getEnd(); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwXMeta::getString() throw (uno::RuntimeException) { SolarMutexGuard g; @@ -1139,7 +1138,7 @@ SwXMeta::getString() throw (uno::RuntimeException) } void SAL_CALL -SwXMeta::setString(const rtl::OUString& rString) throw (uno::RuntimeException) +SwXMeta::setString(const OUString& rString) throw (uno::RuntimeException) { SolarMutexGuard g; return m_pImpl->m_Text.setString(rString); @@ -1164,7 +1163,7 @@ SwXMeta::createTextCursorByRange( void SAL_CALL SwXMeta::insertString(const uno::Reference & xRange, - const rtl::OUString& rString, sal_Bool bAbsorb) + const OUString& rString, sal_Bool bAbsorb) throw (uno::RuntimeException) { SolarMutexGuard g; @@ -1224,7 +1223,7 @@ void SAL_CALL SwXMeta::setParent(uno::Reference< uno::XInterface > const& /*xParent*/) throw (uno::RuntimeException, lang::NoSupportException) { - throw lang::NoSupportException(rtl::OUString("setting parent not supported"), *this); + throw lang::NoSupportException(OUString("setting parent not supported"), *this); } // XElementAccess @@ -1255,7 +1254,7 @@ SwXMeta::createEnumeration() throw (uno::RuntimeException) if (m_pImpl->m_bIsDescriptor) { throw uno::RuntimeException( - rtl::OUString("createEnumeration(): not inserted"), + OUString("createEnumeration(): not inserted"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -1328,7 +1327,7 @@ SwXMetaField::~SwXMetaField() } // XServiceInfo -::rtl::OUString SAL_CALL +OUString SAL_CALL SwXMetaField::getImplementationName() throw (uno::RuntimeException) { return OUString("SwXMetaField"); @@ -1345,14 +1344,14 @@ static const size_t g_nServicesMetaField( sizeof(g_ServicesMetaField)/sizeof(g_ServicesMetaField[0])); sal_Bool SAL_CALL -SwXMetaField::supportsService(const ::rtl::OUString& rServiceName) +SwXMetaField::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) { return ::sw::SupportsServiceImpl( g_nServicesMetaField, g_ServicesMetaField, rServiceName); } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL SwXMetaField::getSupportedServiceNames() throw (uno::RuntimeException) { return ::sw::GetSupportedServiceNamesImpl( @@ -1410,7 +1409,7 @@ SwXMetaField::getPropertySetInfo() throw (uno::RuntimeException) void SAL_CALL SwXMetaField::setPropertyValue( - const ::rtl::OUString& rPropertyName, const uno::Any& rValue) + const OUString& rPropertyName, const uno::Any& rValue) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -1445,7 +1444,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } uno::Any SAL_CALL -SwXMetaField::getPropertyValue(const ::rtl::OUString& rPropertyName) +SwXMetaField::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1459,7 +1458,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if ( rPropertyName == "NumberFormat" ) { - const ::rtl::OUString text( getPresentation(sal_False) ); + const OUString text( getPresentation(sal_False) ); any <<= static_cast(pMeta->GetNumberFormat(text)); } else if ( rPropertyName == "IsFixedLanguage" ) @@ -1476,7 +1475,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXMetaField::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1486,7 +1485,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXMetaField::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1496,7 +1495,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXMetaField::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1506,7 +1505,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXMetaField::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1536,7 +1535,7 @@ lcl_getURI(const bool bPrefix) return (bPrefix) ? xOdfPrefix : xOdfSuffix; } -static ::rtl::OUString +static OUString lcl_getPrefixOrSuffix( uno::Reference const & xRepository, uno::Reference const & xMetaField, @@ -1558,14 +1557,14 @@ lcl_getPrefixOrSuffix( } return xObject->getValue(); } - return ::rtl::OUString(); + return OUString(); } void getPrefixAndSuffix( const uno::Reference& xModel, const uno::Reference& xMetaField, - ::rtl::OUString *const o_pPrefix, ::rtl::OUString *const o_pSuffix) + OUString *const o_pPrefix, OUString *const o_pSuffix) { try { const uno::Reference xRS( @@ -1586,13 +1585,13 @@ getPrefixAndSuffix( throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("getPrefixAndSuffix: exception"), + OUString("getPrefixAndSuffix: exception"), 0, uno::makeAny(e)); } } // XTextField -::rtl::OUString SAL_CALL +OUString SAL_CALL SwXMetaField::getPresentation(sal_Bool bShowCommand) throw (uno::RuntimeException) { @@ -1601,14 +1600,14 @@ throw (uno::RuntimeException) if (bShowCommand) { //FIXME ? - return ::rtl::OUString(); + return OUString(); } else { // getString should check if this is invalid - const ::rtl::OUString content( this->getString() ); - ::rtl::OUString prefix; - ::rtl::OUString suffix; + const OUString content( this->getString() ); + OUString prefix; + OUString suffix; getPrefixAndSuffix(GetModel(), this, &prefix, &suffix); return prefix + content + suffix; } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 88e2b3f2e896..4ea1fcf9e464 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -61,15 +61,14 @@ using namespace ::com::sun::star; -using ::rtl::OUString; struct SwTextSectionProperties_Impl { uno::Sequence m_Password; - ::rtl::OUString m_sCondition; - ::rtl::OUString m_sLinkFileName; - ::rtl::OUString m_sSectionFilter; - ::rtl::OUString m_sSectionRegion; + OUString m_sCondition; + OUString m_sLinkFileName; + OUString m_sSectionFilter; + OUString m_sSectionRegion; SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr m_pColItem; @@ -113,7 +112,7 @@ public: ::cppu::OInterfaceContainerHelper m_EventListeners; const bool m_bIndexHeader; bool m_bIsDescriptor; - ::rtl::OUString m_sName; + OUString m_sName; SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr m_pProps; SAL_WNODEPRECATED_DECLARATIONS_POP @@ -147,14 +146,14 @@ public: } void SAL_CALL SetPropertyValues_Impl( - const uno::Sequence< ::rtl::OUString >& rPropertyNames, + const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& aValues) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException); uno::Sequence< uno::Any > SAL_CALL GetPropertyValues_Impl( - const uno::Sequence< ::rtl::OUString >& rPropertyNames) + const uno::Sequence< OUString >& rPropertyNames) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); protected: @@ -337,7 +336,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) String tmp(m_pImpl->m_sName); SwSectionData aSect(eType, pDoc->GetUniqueSectionName(&tmp)); aSect.SetCondition(m_pImpl->m_pProps->m_sCondition); - ::rtl::OUStringBuffer sLinkNameBuf(m_pImpl->m_pProps->m_sLinkFileName); + OUStringBuffer sLinkNameBuf(m_pImpl->m_pProps->m_sLinkFileName); sLinkNameBuf.append(sfx2::cTokenSeperator); sLinkNameBuf.append(m_pImpl->m_pProps->m_sSectionFilter); sLinkNameBuf.append(sfx2::cTokenSeperator); @@ -623,7 +622,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, { if (!m_pProps->m_bDDE) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append(sfx2::cTokenSeperator); buf.append(sfx2::cTokenSeperator); m_pProps->m_sLinkFileName = buf.makeStringAndClear(); @@ -687,7 +686,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, { pSectionData->SetType(FILE_LINK_SECTION); } - ::rtl::OUStringBuffer sFileNameBuf; + OUStringBuffer sFileNameBuf; if (!aLink.FileURL.isEmpty()) { sFileNameBuf.append( URIHelper::SmartRel2Abs( @@ -701,7 +700,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, sFileNameBuf.append( pSectionData->GetLinkFileName().GetToken(2, sfx2::cTokenSeperator)); - const ::rtl::OUString sFileName( + const OUString sFileName( sFileNameBuf.makeStringAndClear()); pSectionData->SetLinkFileName(sFileName); if (sFileName.getLength() < 3) @@ -926,7 +925,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, void SAL_CALL SwXTextSection::setPropertyValues( - const uno::Sequence< ::rtl::OUString >& rPropertyNames, + const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -956,7 +955,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, { SolarMutexGuard aGuard; - uno::Sequence< ::rtl::OUString > aPropertyNames(1); + uno::Sequence< OUString > aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; uno::Sequence< uno::Any > aValues(1); aValues.getArray()[0] = rValue; @@ -998,7 +997,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, { OUString uTmp( (m_bIsDescriptor) ? m_pProps->m_sCondition - : ::rtl::OUString(pSect->GetCondition())); + : OUString(pSect->GetCondition())); pRet[nProperty] <<= uTmp; } break; @@ -1006,7 +1005,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, case WID_SECT_DDE_FILE: case WID_SECT_DDE_ELEMENT: { - ::rtl::OUString sRet; + OUString sRet; if (m_bIsDescriptor) { if (m_pProps->m_bDDE) @@ -1048,7 +1047,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, } else if (FILE_LINK_SECTION == pSect->GetType()) { - ::rtl::OUString sRet( pSect->GetLinkFileName() ); + OUString sRet( pSect->GetLinkFileName() ); sal_Int32 nIndex(0); aLink.FileURL = sRet.getToken(0, sfx2::cTokenSeperator, nIndex); @@ -1060,7 +1059,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, break; case WID_SECT_REGION : { - ::rtl::OUString sRet; + OUString sRet; if (m_bIsDescriptor) { sRet = m_pProps->m_sSectionRegion; @@ -1278,7 +1277,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::Sequence< uno::Any > SAL_CALL SwXTextSection::getPropertyValues( - const uno::Sequence< ::rtl::OUString >& rPropertyNames) + const uno::Sequence< OUString >& rPropertyNames) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1310,7 +1309,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, { SolarMutexGuard aGuard; - uno::Sequence< ::rtl::OUString > aPropertyNames(1); + uno::Sequence< OUString > aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; return m_pImpl->GetPropertyValues_Impl(aPropertyNames).getConstArray()[0]; } @@ -1340,7 +1339,7 @@ void SAL_CALL SwXTextSection::firePropertiesChangeEvent( void SAL_CALL SwXTextSection::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1350,7 +1349,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextSection::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1360,7 +1359,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextSection::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1370,7 +1369,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextSection::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1530,9 +1529,9 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) if (m_pImpl->m_bIsDescriptor) { m_pImpl->m_pProps->m_bDDE = false; - m_pImpl->m_pProps->m_sLinkFileName = ::rtl::OUString(); - m_pImpl->m_pProps->m_sSectionRegion = ::rtl::OUString(); - m_pImpl->m_pProps->m_sSectionFilter = ::rtl::OUString(); + m_pImpl->m_pProps->m_sLinkFileName = OUString(); + m_pImpl->m_pProps->m_sSectionRegion = OUString(); + m_pImpl->m_pProps->m_sSectionFilter = OUString(); } else { @@ -1685,7 +1684,7 @@ OUString SAL_CALL SwXTextSection::getName() throw (uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString sRet; + OUString sRet; SwSectionFmt const*const pFmt = m_pImpl->GetSectionFmt(); if(pFmt) { diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 48771155d6f5..68b135c2a605 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1112,7 +1112,7 @@ OSL_FAIL("not implemented"); ******************************************************************/ const char aInvalidStyle[] = "__XXX___invalid"; -bool SwXNumberingRules::isInvalidStyle(const rtl::OUString &rName) +bool SwXNumberingRules::isInvalidStyle(const OUString &rName) { return rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aInvalidStyle)); } @@ -1182,8 +1182,8 @@ SwXNumberingRules::SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc) : pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this); for(i = 0; i < MAXLEVEL; i++) { - sNewCharStyleNames[i] = rtl::OUString(aInvalidStyle); - sNewBulletFontNames[i] = rtl::OUString(aInvalidStyle); + sNewCharStyleNames[i] = OUString(aInvalidStyle); + sNewBulletFontNames[i] = OUString(aInvalidStyle); } } @@ -1602,7 +1602,7 @@ uno::Sequence SwXNumberingRules::GetNumberingRuleByIndex( static PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues) { - OUString sCmp = rtl::OUString::createFromAscii(cName); + OUString sCmp = OUString::createFromAscii(cName); for(sal_uInt16 i = 0; i < rPropertyValues.size(); i++) { PropValData* pTemp = rPropertyValues[i]; @@ -1748,7 +1748,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( SwStyleNameMapper::FillUIName( uTmp, sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); if(sCharFmtName.EqualsAscii(SW_PROP_NAME_STR(UNO_NAME_CHARACTER_FORMAT_NONE))) { - sNewCharStyleNames[(sal_uInt16)nIndex] = rtl::OUString(aInvalidStyle); + sNewCharStyleNames[(sal_uInt16)nIndex] = OUString(aInvalidStyle); aFmt.SetCharFmt(0); } else if(pDocShell || pDoc) diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 77303cb6251d..49502e0cdc9f 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -420,15 +420,15 @@ uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions(vo uno::Any aVal; sal_Bool bTemp = sal_True; aVal.setValue(&bTemp, ::getCppuBooleanType()); - pArray[0] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_TEXT_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[0] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_TEXT_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal.setValue(&bTemp, ::getCppuBooleanType()); - pArray[1] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_FRAME_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[1] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_FRAME_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal.setValue(&bTemp, ::getCppuBooleanType()); - pArray[2] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_PAGE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[2] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_PAGE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal.setValue(&bTemp, ::getCppuBooleanType()); - pArray[3] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_NUMBERING_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[3] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LOAD_NUMBERING_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); aVal.setValue(&bTemp, ::getCppuBooleanType()); - pArray[4] = beans::PropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_OVERWRITE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); + pArray[4] = beans::PropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_OVERWRITE_STYLES)), -1, aVal, beans::PropertyState_DIRECT_VALUE); return aSeq; } @@ -960,12 +960,12 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXStyleFamily::getPropertySe return uno::Reference< beans::XPropertySetInfo >(); } -void SAL_CALL SwXStyleFamily::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SwXStyleFamily::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; @@ -1002,22 +1002,22 @@ uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sProp return aRet; } -void SAL_CALL SwXStyleFamily::addPropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SwXStyleFamily::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL SwXStyleFamily::removePropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SwXStyleFamily::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL SwXStyleFamily::addVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SwXStyleFamily::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL SwXStyleFamily::removeVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SwXStyleFamily::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OSL_FAIL( "###unexpected!" ); } @@ -1059,11 +1059,11 @@ public: SwStyleProperties_Impl(const SfxItemPropertyMap& rMap); ~SwStyleProperties_Impl(); - sal_Bool SetProperty(const ::rtl::OUString& rName, uno::Any aVal); - sal_Bool GetProperty(const ::rtl::OUString& rName, uno::Any*& rpAny); - sal_Bool ClearProperty( const ::rtl::OUString& rPropertyName ); + sal_Bool SetProperty(const OUString& rName, uno::Any aVal); + sal_Bool GetProperty(const OUString& rName, uno::Any*& rpAny); + sal_Bool ClearProperty( const OUString& rPropertyName ); void ClearAllProperties( ); - void GetProperty(const ::rtl::OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny ); + void GetProperty(const OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny ); const PropertyEntryVector_t& GetPropertyVector() const {return aPropertyEntries; } @@ -1087,7 +1087,7 @@ SwStyleProperties_Impl::~SwStyleProperties_Impl() delete[] pAnyArr; } -sal_Bool SwStyleProperties_Impl::SetProperty(const ::rtl::OUString& rName, uno::Any aVal) +sal_Bool SwStyleProperties_Impl::SetProperty(const OUString& rName, uno::Any aVal) { sal_uInt16 nPos = 0; sal_Bool bRet = sal_False; @@ -1136,7 +1136,7 @@ void SwStyleProperties_Impl::ClearAllProperties( ) } } -sal_Bool SwStyleProperties_Impl::GetProperty(const ::rtl::OUString& rName, uno::Any*& rpAny ) +sal_Bool SwStyleProperties_Impl::GetProperty(const OUString& rName, uno::Any*& rpAny ) { sal_Bool bRet = sal_False; sal_uInt16 nPos = 0; @@ -2290,7 +2290,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, } pSeq[n].Name = GetCommandContextByIndex(n); - pSeq[n].Value <<= rtl::OUString( aStyleName ); + pSeq[n].Value <<= OUString( aStyleName ); } aRet <<= aSeq; } @@ -3601,7 +3601,7 @@ sal_Bool SwXAutoStyles::hasElements( ) throw(uno::RuntimeException) return sal_True; } -uno::Any SwXAutoStyles::getByName(const rtl::OUString& Name) +uno::Any SwXAutoStyles::getByName(const OUString& Name) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { uno::Any aRet; @@ -3616,7 +3616,7 @@ uno::Any SwXAutoStyles::getByName(const rtl::OUString& Name) return aRet; } -uno::Sequence< rtl::OUString > SwXAutoStyles::getElementNames(void) +uno::Sequence< OUString > SwXAutoStyles::getElementNames(void) throw( uno::RuntimeException ) { uno::Sequence< OUString > aNames(AUTOSTYLE_FAMILY_COUNT); @@ -3627,7 +3627,7 @@ uno::Sequence< rtl::OUString > SwXAutoStyles::getElementNames(void) return aNames; } -sal_Bool SwXAutoStyles::hasByName(const rtl::OUString& Name) +sal_Bool SwXAutoStyles::hasByName(const OUString& Name) throw( uno::RuntimeException ) { if( Name.compareToAscii("CharacterStyles") == 0 || @@ -3927,7 +3927,7 @@ void SwXAutoStyle::removeVetoableChangeListener( const OUString& /*PropertyName* } void SwXAutoStyle::setPropertyValues( - const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/, + const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Sequence< uno::Any >& /*aValues*/ ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -3980,7 +3980,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl( } uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues ( - const uno::Sequence< ::rtl::OUString >& rPropertyNames ) + const uno::Sequence< OUString >& rPropertyNames ) throw (uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4004,7 +4004,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues ( } void SwXAutoStyle::addPropertiesChangeListener( - const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/, + const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) throw (uno::RuntimeException) { @@ -4017,7 +4017,7 @@ void SwXAutoStyle::removePropertiesChangeListener( } void SwXAutoStyle::firePropertiesChangeEvent( - const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/, + const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) throw (uno::RuntimeException) { @@ -4052,7 +4052,7 @@ uno::Any SwXAutoStyle::getPropertyDefault( const OUString& rPropertyName ) } uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates( - const uno::Sequence< ::rtl::OUString >& rPropertyNames ) + const uno::Sequence< OUString >& rPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { if( !pSet.get() ) @@ -4092,13 +4092,13 @@ void SwXAutoStyle::setAllPropertiesToDefault( ) } void SwXAutoStyle::setPropertiesToDefault( - const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/ ) + const uno::Sequence< OUString >& /*aPropertyNames*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException) { } uno::Sequence< uno::Any > SwXAutoStyle::getPropertyDefaults( - const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/ ) + const uno::Sequence< OUString >& /*aPropertyNames*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 02eaaaaefd50..e0c09aad697c 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -351,8 +351,8 @@ void sw_GetCellPosition( const String &rCellName, // start of number found? if (pBuf < pEnd && ('0' <= *pBuf && *pBuf <= '9')) { - rtl::OUString aColTxt(rCellName.GetBuffer(), pBuf - rCellName.GetBuffer()); - rtl::OUString aRowTxt(pBuf, (rCellName.GetBuffer() + nLen - pBuf)); + OUString aColTxt(rCellName.GetBuffer(), pBuf - rCellName.GetBuffer()); + OUString aRowTxt(pBuf, (rCellName.GetBuffer() + nLen - pBuf)); if (!aColTxt.isEmpty() && !aRowTxt.isEmpty()) { sal_Int32 nColIdx = 0; @@ -461,13 +461,13 @@ String sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow ) #if OSL_DEBUG_LEVEL > 0 { sal_Int32 nCol, nRow2; - sw_GetCellPosition( rtl::OUString("z1"), nCol, nRow2); + sw_GetCellPosition( OUString("z1"), nCol, nRow2); OSL_ENSURE( nCol == 51, "sw_GetCellPosition failed" ); - sw_GetCellPosition( rtl::OUString("AA1"), nCol, nRow2); + sw_GetCellPosition( OUString("AA1"), nCol, nRow2); OSL_ENSURE( nCol == 52, "sw_GetCellPosition failed" ); - sw_GetCellPosition( rtl::OUString("AB1"), nCol, nRow2); + sw_GetCellPosition( OUString("AB1"), nCol, nRow2); OSL_ENSURE( nCol == 53, "sw_GetCellPosition failed" ); - sw_GetCellPosition( rtl::OUString("BB1"), nCol, nRow2); + sw_GetCellPosition( OUString("BB1"), nCol, nRow2); OSL_ENSURE( nCol == 105, "sw_GetCellPosition failed" ); } #endif @@ -684,14 +684,14 @@ static void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableB } } -static inline rtl::OUString lcl_getString( SwXCell &rCell ) +static inline OUString lcl_getString( SwXCell &rCell ) { // getString is a member function of the base class... return rCell.getString(); } /* non UNO function call to set string in SwXCell */ -void sw_setString( SwXCell &rCell, const rtl::OUString &rTxt, +void sw_setString( SwXCell &rCell, const OUString &rTxt, sal_Bool bKeepNumberFmt ) { if(rCell.IsValid()) @@ -2657,7 +2657,7 @@ void SAL_CALL SwXTextTable::setDataArray( { const uno::Any &rAny = pColArray[nCol]; if (uno::TypeClass_STRING == rAny.getValueTypeClass()) - sw_setString( *pXCell, *(rtl::OUString *) rAny.getValue() ); + sw_setString( *pXCell, *(OUString *) rAny.getValue() ); else { double d = 0; @@ -3049,7 +3049,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, { case UNO_NAME_TABLE_NAME : { - ::rtl::OUString sName; + OUString sName; aValue >>= sName; setName( sName ); } @@ -4320,7 +4320,7 @@ void SAL_CALL SwXCellRange::setDataArray( { const uno::Any &rAny = pColArray[nCol]; if (uno::TypeClass_STRING == rAny.getValueTypeClass()) - sw_setString( *pXCell, *(rtl::OUString *) rAny.getValue() ); + sw_setString( *pXCell, *(OUString *) rAny.getValue() ); else { double d = 0; diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 8d3b8c93b76a..a93a34fe73e5 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -67,7 +67,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; const sal_Char cInvalidObject[] = "this object is invalid"; @@ -464,7 +463,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) } if (cIns) { - m_pImpl->m_pDoc->InsertString( aTmp, rtl::OUString(cIns), nInsertFlags ); + m_pImpl->m_pDoc->InsertString( aTmp, OUString(cIns), nInsertFlags ); } if (bAbsorb) @@ -1119,7 +1118,7 @@ SwXText::getPropertySetInfo() throw(uno::RuntimeException) } void SAL_CALL -SwXText::setPropertyValue(const ::rtl::OUString& /*aPropertyName*/, +SwXText::setPropertyValue(const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, @@ -1130,7 +1129,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXText::getPropertyValue( - const ::rtl::OUString& rPropertyName) + const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1186,7 +1185,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXText::addPropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1196,7 +1195,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXText::removePropertyChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1206,7 +1205,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXText::addVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1216,7 +1215,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXText::removeVetoableChangeListener( - const ::rtl::OUString& /*rPropertyName*/, + const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -1283,7 +1282,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< text::XTextRange > xRet; bool bIllegalException = false; bool bRuntimeException = false; - ::rtl::OUString sMessage; + OUString sMessage; m_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_START , NULL); // find end node, go backward - don't skip tables because the new // paragraph has to be the last node @@ -1396,7 +1395,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXText::insertTextPortion( - const ::rtl::OUString& rText, + const OUString& rText, const uno::Sequence< beans::PropertyValue > & rCharacterAndParagraphProperties, const uno::Reference& xInsertPosition) @@ -1419,7 +1418,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) bool bIllegalException = false; bool bRuntimeException = false; - ::rtl::OUString sMessage; + OUString sMessage; m_pImpl->m_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL); // SwPaM aPam(*pStartNode->EndOfSectionNode()); @@ -1481,7 +1480,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) -----------------------------------------------------------------------*/ uno::Reference< text::XTextRange > SAL_CALL SwXText::appendTextPortion( - const ::rtl::OUString& rText, + const OUString& rText, const uno::Sequence< beans::PropertyValue > & rCharacterAndParagraphProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) @@ -1603,7 +1602,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) m_pImpl->m_pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); bool bIllegalException = false; bool bRuntimeException = false; - ::rtl::OUString sMessage; + OUString sMessage; SwStartNode* pStartStartNode = aStartPam.GetNode()->StartOfSectionNode(); while (pStartStartNode && pStartStartNode->IsSectionNode()) { @@ -1846,7 +1845,7 @@ void SwXText::Impl::ConvertCell( if (rCell.getLength() != 2) { throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "rCell needs to contain 2 elements" ), + OUString::createFromAscii( "rCell needs to contain 2 elements" ), uno::Reference< text::XTextCopy >( &m_rThis ), sal_Int16( 2 ) ); } const uno::Reference xStartRange = rCell[0]; @@ -1861,7 +1860,7 @@ void SwXText::Impl::ConvertCell( !::sw::XTextRangeToSwPaM(aEndCellPam, xEndRange)) { throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "Start or End range cannot be resolved to a SwPaM" ), + OUString::createFromAscii( "Start or End range cannot be resolved to a SwPaM" ), uno::Reference< text::XTextCopy >( &m_rThis ), sal_Int16( 2 ) ); } @@ -2034,7 +2033,7 @@ lcl_DebugCellProperties( const uno::Sequence< uno::Sequence< uno::Sequence< beans::PropertyValue > > >& rCellProperties) { - ::rtl::OUString sNames; + OUString sNames; for (sal_Int32 nDebugRow = 0; nDebugRow < rCellProperties.getLength(); ++nDebugRow) { @@ -2052,14 +2051,14 @@ lcl_DebugCellProperties( for (sal_Int32 nDebugProperty = 0; nDebugProperty < nDebugCellProperties; ++nDebugProperty) { - const ::rtl::OUString sName = + const OUString sName = rDebugCellProperties[nDebugProperty].Name; sNames += sName; - sNames += ::rtl::OUString('-'); + sNames += OUString('-'); } - sNames += ::rtl::OUString('+'); + sNames += OUString('+'); } - sNames += ::rtl::OUString('|'); + sNames += OUString('|'); } (void)sNames; } @@ -2193,7 +2192,7 @@ lcl_MergeCells(::std::vector & rMergedCells) while (aCellIter != aMergedIter->aCells.end()) { (*aCellIter)->setPropertyValue( - rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ROW_SPAN)), + OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ROW_SPAN)), uno::makeAny(nCellCount)); if (bFirstCell) { @@ -2527,7 +2526,7 @@ throw (uno::RuntimeException) if (::sw::XTextRangeToSwPaM(aPam, xTextPosition)) { if ( !aPam.GetNode()->GetTxtNode() ) - throw uno::RuntimeException( rtl::OUString("Invalid text range"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Invalid text range"), uno::Reference< uno::XInterface >() ); SwNode& rNode = GetDoc()->GetNodes().GetEndOfContent(); @@ -2548,7 +2547,7 @@ throw (uno::RuntimeException) } if(!aRef.is()) { - throw uno::RuntimeException( rtl::OUString::createFromAscii( "End of content node doesn't have the proper start node" ), + throw uno::RuntimeException( OUString::createFromAscii( "End of content node doesn't have the proper start node" ), uno::Reference< uno::XInterface >( *this ) ); } return aRef; diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index e1fe221773da..72ffaa762759 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -57,7 +57,7 @@ uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfo void SAL_CALL SwXTextMarkup::commitTextMarkup( ::sal_Int32 nType, - const ::rtl::OUString & rIdentifier, + const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) @@ -226,7 +226,7 @@ static void lcl_commitGrammarMarkUp( const ModelToViewHelper& rConversionMap, SwGrammarMarkUp* pWList, ::sal_Int32 nType, - const ::rtl::OUString & rIdentifier, + const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) @@ -430,23 +430,23 @@ SwXStringKeyMap::SwXStringKeyMap() { } -uno::Any SAL_CALL SwXStringKeyMap::getValue(const ::rtl::OUString & aKey) throw (uno::RuntimeException, container::NoSuchElementException) +uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString & aKey) throw (uno::RuntimeException, container::NoSuchElementException) { - std::map< rtl::OUString, uno::Any >::const_iterator aIter = maMap.find( aKey ); + std::map< OUString, uno::Any >::const_iterator aIter = maMap.find( aKey ); if ( aIter == maMap.end() ) throw container::NoSuchElementException(); return (*aIter).second; } -::sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const ::rtl::OUString & aKey) throw (uno::RuntimeException) +::sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const OUString & aKey) throw (uno::RuntimeException) { return maMap.find( aKey ) != maMap.end(); } -void SAL_CALL SwXStringKeyMap::insertValue(const ::rtl::OUString & aKey, const uno::Any & aValue) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException) +void SAL_CALL SwXStringKeyMap::insertValue(const OUString & aKey, const uno::Any & aValue) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException) { - std::map< rtl::OUString, uno::Any >::const_iterator aIter = maMap.find( aKey ); + std::map< OUString, uno::Any >::const_iterator aIter = maMap.find( aKey ); if ( aIter != maMap.end() ) throw container::ElementExistException(); @@ -458,12 +458,12 @@ void SAL_CALL SwXStringKeyMap::insertValue(const ::rtl::OUString & aKey, const u return maMap.size(); } -::rtl::OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) +OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { if ( (sal_uInt32)nIndex >= maMap.size() ) throw lang::IndexOutOfBoundsException(); - return ::rtl::OUString(); + return OUString(); } uno::Any SAL_CALL SwXStringKeyMap::getValueByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index 2e0be45974dd..b775fc094536 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -39,7 +39,6 @@ extern bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLs using namespace ::com::sun::star; -using ::rtl::OUString; ////////////////////////////////////////////////////////////////////// @@ -209,8 +208,8 @@ SwPrintUIOptions::SwPrintUIOptions( int nIdx = 0; // load the writer PrinterOptions into the custom tab - m_aUIProperties[nIdx].Name = rtl::OUString("OptionsUIFile"); - m_aUIProperties[nIdx++].Value <<= rtl::OUString("modules/swriter/ui/printeroptions.ui"); + m_aUIProperties[nIdx].Name = OUString("OptionsUIFile"); + m_aUIProperties[nIdx++].Value <<= OUString("modules/swriter/ui/printeroptions.ui"); // create "writer" section (new tab page in dialog) SvtModuleOptions aModOpt; @@ -220,7 +219,7 @@ SwPrintUIOptions::SwPrintUIOptions( m_aUIProperties[ nIdx++ ].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"); // create sub section for Contents - m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("contents", aLocalizedStrings.GetString(1), rtl::OUString()); + m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("contents", aLocalizedStrings.GetString(1), OUString()); // create a bool option for background bool bDefaultVal = rDefaultPrintData.IsPrintPageBackground(); @@ -260,7 +259,7 @@ SwPrintUIOptions::SwPrintUIOptions( bDefaultVal); // create sub section for Color - m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("color", aLocalizedStrings.GetString(7), rtl::OUString()); + m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("color", aLocalizedStrings.GetString(7), OUString()); // create a bool option for printing text with black font color bDefaultVal = rDefaultPrintData.IsPrintBlackFont(); @@ -272,7 +271,7 @@ SwPrintUIOptions::SwPrintUIOptions( if (!bWeb) { // create subgroup for misc options - m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("pages", rtl::OUString(aLocalizedStrings.GetString(9)), rtl::OUString()); + m_aUIProperties[ nIdx++ ].Value = setSubgroupControlOpt("pages", OUString(aLocalizedStrings.GetString(9)), OUString()); // create a bool option for printing automatically inserted blank pages bDefaultVal = rDefaultPrintData.IsPrintEmptyPages(); @@ -285,7 +284,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for paper tray bDefaultVal = rDefaultPrintData.IsPaperFromSetup(); vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt; - aPaperTrayOpt.maGroupHint = rtl::OUString( "OptionsPageOptGroup" ); + aPaperTrayOpt.maGroupHint = OUString( "OptionsPageOptGroup" ); m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("printpaperfromsetup", aLocalizedStrings.GetString( 11 ), ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox", "PrintPaperFromSetup", @@ -294,46 +293,46 @@ SwPrintUIOptions::SwPrintUIOptions( // print range selection vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" ); + aPrintRangeOpt.maGroupHint = OUString( "PrintRange" ); aPrintRangeOpt.mbInternalOnly = sal_True; - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aLocalizedStrings.GetString(26)), - rtl::OUString(), + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aLocalizedStrings.GetString(26)), + OUString(), aPrintRangeOpt); // create a choice for the content to create - rtl::OUString aPrintRangeName( "PrintContent" ); - uno::Sequence< rtl::OUString > aChoices( 3 ); + OUString aPrintRangeName( "PrintContent" ); + uno::Sequence< OUString > aChoices( 3 ); uno::Sequence< sal_Bool > aChoicesDisabled( 3 ); - uno::Sequence< rtl::OUString > aHelpIds( 3 ); - uno::Sequence< rtl::OUString > aWidgetIds( 3 ); + uno::Sequence< OUString > aHelpIds( 3 ); + uno::Sequence< OUString > aWidgetIds( 3 ); aChoices[0] = aLocalizedStrings.GetString( 27 ); aChoicesDisabled[0] = sal_False; - aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); + aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); aWidgetIds[0] = "printallpages"; aChoices[1] = aLocalizedStrings.GetString( 28 ); aChoicesDisabled[1] = sal_False; - aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); + aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); aWidgetIds[1] = "printpages"; aChoices[2] = aLocalizedStrings.GetString( 29 ); aChoicesDisabled[2] = sal_Bool(! bHasSelection); - aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); + aHelpIds[2] = OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); aWidgetIds[2] = "printselection"; - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), + m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintRangeName, aChoices, 0 /* always default to 'All pages' */, aChoicesDisabled); // show an Edit dependent on "Pages" selected vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True ); - m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", rtl::OUString(), + m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", OUString(), ".HelpID:vcl:PrintDialog:PageRange:Edit", "PageRange", - rtl::OUString::valueOf( sal_Int32( nCurrentPage ) ) /* set text box to current page number */, + OUString::valueOf( sal_Int32( nCurrentPage ) ) /* set text box to current page number */, aPageRangeOpt); // print content selection vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt; - aContentsOpt.maGroupHint = rtl::OUString( "JobPage" ); - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", rtl::OUString(aLocalizedStrings.GetString(12)), - rtl::OUString(), aContentsOpt); + aContentsOpt.maGroupHint = OUString( "JobPage" ); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", OUString(aLocalizedStrings.GetString(12)), + OUString(), aContentsOpt); // create a list box for notes content const sal_Int16 nPrintPostIts = rDefaultPrintData.GetPrintPostIts(); aChoices.realloc( 4 ); @@ -342,14 +341,14 @@ SwPrintUIOptions::SwPrintUIOptions( aChoices[2] = aLocalizedStrings.GetString( 15 ); aChoices[3] = aLocalizedStrings.GetString( 16 ); aHelpIds.realloc( 2 ); - aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" ); - aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" ); - vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( rtl::OUString( "PrintProspect" ), 0, sal_False ); + aHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" ); + aHelpIds[1] = OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" ); + vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( OUString( "PrintProspect" ), 0, sal_False ); aAnnotOpt.mbEnabled = bHasPostIts; m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments", aLocalizedStrings.GetString( 17 ), aHelpIds, - rtl::OUString( "PrintAnnotationMode" ), + OUString( "PrintAnnotationMode" ), aChoices, nPrintPostIts, uno::Sequence< sal_Bool >(), @@ -357,18 +356,18 @@ SwPrintUIOptions::SwPrintUIOptions( // create subsection for Page settings vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt; - aPageSetOpt.maGroupHint = rtl::OUString( "LayoutPage" ); + aPageSetOpt.maGroupHint = OUString( "LayoutPage" ); if (!bWeb) { - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pagesides", rtl::OUString(aLocalizedStrings.GetString(18)), - rtl::OUString(), aPageSetOpt); - uno::Sequence< rtl::OUString > aRLChoices( 3 ); + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pagesides", OUString(aLocalizedStrings.GetString(18)), + OUString(), aPageSetOpt); + uno::Sequence< OUString > aRLChoices( 3 ); aRLChoices[0] = aLocalizedStrings.GetString( 19 ); aRLChoices[1] = aLocalizedStrings.GetString( 20 ); aRLChoices[2] = aLocalizedStrings.GetString( 21 ); - uno::Sequence< rtl::OUString > aRLHelp( 1 ); - aRLHelp[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" ); + uno::Sequence< OUString > aRLHelp( 1 ); + aRLHelp[0] = OUString( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" ); // create a choice option for all/left/right pages // 0 : all pages (left & right) // 1 : left pages @@ -390,7 +389,7 @@ SwPrintUIOptions::SwPrintUIOptions( // create a bool option for brochure bDefaultVal = rDefaultPrintData.IsPrintProspect(); - rtl::OUString aBrochurePropertyName( "PrintProspect" ); + OUString aBrochurePropertyName( "PrintProspect" ); m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("brochure", aLocalizedStrings.GetString( 23 ), ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox", aBrochurePropertyName, @@ -400,21 +399,21 @@ SwPrintUIOptions::SwPrintUIOptions( if (bCTL) { // create a bool option for brochure RTL dependent on brochure - uno::Sequence< rtl::OUString > aBRTLChoices( 2 ); + uno::Sequence< OUString > aBRTLChoices( 2 ); aBRTLChoices[0] = aLocalizedStrings.GetString( 24 ); aBRTLChoices[1] = aLocalizedStrings.GetString( 25 ); vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, sal_True ); - uno::Sequence< rtl::OUString > aBRTLHelpIds( 1 ); - aBRTLHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" ); - aBrochureRTLOpt.maGroupHint = rtl::OUString( "LayoutPage" ); + uno::Sequence< OUString > aBRTLHelpIds( 1 ); + aBRTLHelpIds[0] = OUString( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" ); + aBrochureRTLOpt.maGroupHint = OUString( "LayoutPage" ); // RTL brochure choices // 0 : left-to-right // 1 : right-to-left const sal_Int16 nBRTLChoice = rDefaultPrintData.IsPrintProspectRTL() ? 1 : 0; m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("scriptdirection", - rtl::OUString(), + OUString(), aBRTLHelpIds, - rtl::OUString( "PrintProspectRTL" ), + OUString( "PrintProspectRTL" ), aBRTLChoices, nBRTLChoice, uno::Sequence< sal_Bool >(), @@ -501,7 +500,7 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat( const uno::Sequence< bea bool bChanged = processProperties( i_rNewProp ); uno::Reference< awt::XDevice > xRenderDevice; - uno::Any aVal( getValue( rtl::OUString( "RenderDevice" ) ) ); + uno::Any aVal( getValue( OUString( "RenderDevice" ) ) ); aVal >>= xRenderDevice; OutputDevice* pOut = 0; diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index a9ba9214a146..e22ec0f07cb1 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -241,7 +241,7 @@ void SwViewImp::MakeDrawView() pDrawView = new SwDrawView( *this, pIDDMA->GetDrawModel(), pOutDevForDrawView); } - GetDrawView()->SetActiveLayer(rtl::OUString("Heaven")); + GetDrawView()->SetActiveLayer(OUString("Heaven")); const SwViewOption* pSwViewOption = GetShell()->GetViewOptions(); Init(pSwViewOption); diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 65d004486287..bb8b9a5627d2 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -301,7 +301,7 @@ sal_uLong SwASCIIParser::ReadChars() if( pStt >= pEnd ) { if( pLastStt != pStt ) - InsertText( rtl::OUString( pLastStt )); + InsertText( OUString( pLastStt )); // Read a new block sal_uLong lGCount; @@ -424,7 +424,7 @@ sal_uLong SwASCIIParser::ReadChars() *pStt++ = 0; if( nLineLen ) { - InsertText( rtl::OUString( pLastStt )); + InsertText( OUString( pLastStt )); } pDoc->SplitNode( *pPam->GetPoint(), false ); pDoc->InsertPoolItem( *pPam, SvxFmtBreakItem( @@ -458,7 +458,7 @@ sal_uLong SwASCIIParser::ReadChars() { sal_Unicode c = *pStt; *pStt = 0; - InsertText( rtl::OUString( pLastStt )); + InsertText( OUString( pLastStt )); pDoc->SplitNode( *pPam->GetPoint(), false ); pLastStt = pStt; nLineLen = 0; @@ -470,7 +470,7 @@ sal_uLong SwASCIIParser::ReadChars() else if( bSplitNode ) { // We found a CR/LF, thus save the text - InsertText( rtl::OUString( pLastStt )); + InsertText( OUString( pLastStt )); pDoc->SplitNode( *pPam->GetPoint(), false ); pLastStt = pStt; nLineLen = 0; diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 8cc721ecfed1..089198ab0179 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -59,7 +59,6 @@ #include using namespace utl; -using rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star; @@ -158,7 +157,7 @@ oslGenericFunction Filters::GetMswordLibSymbol( const char *pSymbol ) SAL_WARN_IF(!ok, "sw", "failed to load msword library"); } if (msword_.is()) - return msword_.getFunctionSymbol( ::rtl::OUString::createFromAscii( pSymbol ) ); + return msword_.getFunctionSymbol( OUString::createFromAscii( pSymbol ) ); return NULL; } @@ -262,7 +261,7 @@ sal_Bool SwReader::CheckPasswd( const String& /*rPasswd*/, const Reader& /*rOpti */ -#define FILTER_OPTION_ROOT rtl::OUString("Office.Writer/FilterFlags") +#define FILTER_OPTION_ROOT OUString("Office.Writer/FilterFlags") SwFilterOptions::SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames, sal_uInt32* pValues ) @@ -296,7 +295,7 @@ void SwFilterOptions::GetValues( sal_uInt16 nCnt, const sal_Char** ppNames, } void SwFilterOptions::Commit() {} -void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} @@ -385,7 +384,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, // if the first node dont contained any content, then // insert one char in it calc again and delete once again SwIndex aNdIdx( pFirstTxtNd ); - pFirstTxtNd->InsertText(rtl::OUString("MM"), aNdIdx); + pFirstTxtNd->InsertText(OUString("MM"), aNdIdx); sal_uLong nAbsMinCnts; pFirstTxtNd->GetMinMaxSize( pFirstTxtNd->GetIndex(), nMinFrm, nMaxFrm, nAbsMinCnts ); @@ -587,7 +586,7 @@ String NameFromCharSet(rtl_TextEncoding nChrSet) OSL_ENSURE(pRet != pStart->pName, "TXT: That was an unknown language!"); - return rtl::OUString::createFromAscii(pRet); + return OUString::createFromAscii(pRet); } // for the automatic conversion (mail/news/...) @@ -661,7 +660,7 @@ void SwAsciiOptions::WriteUserData( String& rStr ) // 4. Language if (nLanguage) { - rtl::OUString sTmp = LanguageTag( nLanguage ).getBcp47(); + OUString sTmp = LanguageTag( nLanguage ).getBcp47(); rStr += (String)sTmp; } rStr += ','; diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 3058f06f45b9..57c548254d4c 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -63,7 +63,7 @@ const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_, }; int bRet = sal_False; - rtl::OString aName( pName ); + OString aName( pName ); if ( sHTML == aName ) bRet = HTMLParser::IsHTMLFormat( pHeader, sal_True, RTL_TEXTENCODING_DONTKNOW ); else if ( FILTER_RTF == aName ) @@ -92,21 +92,21 @@ const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_, const String SwIoSystem::GetSubStorageName( const SfxFilter& rFltr ) { /* bei den StorageFiltern noch den SubStorageNamen setzen */ - const rtl::OUString& rUserData = rFltr.GetUserData(); + const OUString& rUserData = rFltr.GetUserData(); if (rUserData == FILTER_XML || rUserData == FILTER_XMLV || rUserData == FILTER_XMLVW) - return rtl::OUString("content.xml"); + return OUString("content.xml"); if (rUserData == sWW6 || rUserData == FILTER_WW8) - return rtl::OUString("WordDocument"); - return rtl::OUString(); + return OUString("WordDocument"); + return OUString(); } const SfxFilter* SwIoSystem::GetFilterOfFormat(const String& rFmtNm, const SfxFilterContainer* pCnt) { - SfxFilterContainer aCntSw( rtl::OUString(sSWRITER) ); - SfxFilterContainer aCntSwWeb( rtl::OUString(sSWRITERWEB) ); + SfxFilterContainer aCntSw( OUString(sSWRITER) ); + SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) ); const SfxFilterContainer* pFltCnt = pCnt ? pCnt : ( IsDocShellRegistered() ? &aCntSw : &aCntSwWeb ); do { @@ -135,7 +135,7 @@ sal_Bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < co try { sal_uLong nStgFmtId = SotStorage::GetFormatID( rStg ); - bRet = rStg->isStreamElement( ::rtl::OUString("content.xml") ); + bRet = rStg->isStreamElement( OUString("content.xml") ); if ( bRet ) bRet = ( nStgFmtId && ( rFilter.GetFormat() == nStgFmtId ) ); } @@ -162,13 +162,13 @@ sal_Bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter /* Bug 62703 - und auch WinWord Docs ohne ClipBoardId! */ if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() == sWW6) { - bRet = !((rStg.IsContained( rtl::OUString("0Table")) || - rStg.IsContained( rtl::OUString("1Table"))) ^ + bRet = !((rStg.IsContained( OUString("0Table")) || + rStg.IsContained( OUString("1Table"))) ^ (rFilter.GetUserData() == FILTER_WW8)); if (bRet && !rFilter.IsAllowedAsTemplate()) { SotStorageStreamRef xRef = - rStg.OpenSotStream(rtl::OUString("WordDocument"), + rStg.OpenSotStream(OUString("WordDocument"), STREAM_STD_READ | STREAM_NOCREATE ); xRef->Seek(10); sal_uInt8 nByte; @@ -200,8 +200,8 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName) { sal_Bool bRet = sal_False; - SfxFilterContainer aCntSw( rtl::OUString(sSWRITER) ); - SfxFilterContainer aCntSwWeb( rtl::OUString(sSWRITERWEB) ); + SfxFilterContainer aCntSw( OUString(sSWRITER) ); + SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) ); const SfxFilterContainer& rFltContainer = IsDocShellRegistered() ? aCntSw : aCntSwWeb; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStor; @@ -220,7 +220,7 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName) const SfxFilter* pFltr = aIter.First(); while ( pFltr ) { - const rtl::OUString& rUserData = pFltr->GetUserData(); + const OUString& rUserData = pFltr->GetUserData(); if (rUserData.equals(rFmtName)) { if( 'C' == rUserData[0] ) @@ -274,8 +274,8 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName) const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName, const String& rPrefFltName, SfxMedium* pMedium) { - SfxFilterContainer aCntSw( rtl::OUString(sSWRITER) ); - SfxFilterContainer aCntSwWeb( rtl::OUString(sSWRITERWEB) ); + SfxFilterContainer aCntSw( OUString(sSWRITER) ); + SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) ); const SfxFilterContainer* pFCntnr = IsDocShellRegistered() ? &aCntSw : &aCntSwWeb; if( !pFCntnr ) @@ -388,7 +388,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName, { String sEmptyUserData; pNm = aFilterDetect[n].IsReader(aBuffer, nBytesRead, rFileName, sEmptyUserData); - pFilterTmp = pNm ? SwIoSystem::GetFilterOfFormat(rtl::OUString::createFromAscii(pNm), pFCntnr) : 0; + pFilterTmp = pNm ? SwIoSystem::GetFilterOfFormat(OUString::createFromAscii(pNm), pFCntnr) : 0; if (pNm && pFilterTmp) { return pFilterTmp; @@ -550,7 +550,7 @@ const SfxFilter* SwIoSystem::GetTextFilter( const sal_Char* pBuf, sal_uLong nLen { bool bAuto = IsDetectableText(pBuf, nLen); const sal_Char* pNm = bAuto ? FILTER_TEXT : FILTER_TEXT_DLG; - return SwIoSystem::GetFilterOfFormat( rtl::OUString::createFromAscii(pNm), 0 ); + return SwIoSystem::GetFilterOfFormat( OUString::createFromAscii(pNm), 0 ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index e72a084e741d..efefee8d8e8c 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -38,7 +38,7 @@ static char const sHTML_O_Object[] = "OBJECT"; } -sal_uInt16 SwApplet_Impl::GetOptionType( const ::rtl::OUString& rName, sal_Bool bApplet ) +sal_uInt16 SwApplet_Impl::GetOptionType( const OUString& rName, sal_Bool bApplet ) { sal_uInt16 nType = bApplet ? SWHTML_OPTTYPE_PARAM : SWHTML_OPTTYPE_TAG; @@ -119,12 +119,12 @@ SwApplet_Impl::SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 { } -void SwApplet_Impl::CreateApplet( const ::rtl::OUString& rCode, const ::rtl::OUString& rName, - sal_Bool bMayScript, const ::rtl::OUString& rCodeBase, - const ::rtl::OUString& rDocumentBaseURL ) +void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName, + sal_Bool bMayScript, const OUString& rCodeBase, + const OUString& rDocumentBaseURL ) { comphelper::EmbeddedObjectContainer aCnt; - ::rtl::OUString aName; + OUString aName; // create Applet; it will be in running state xApplet = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_APPLET_CLASSID ).GetByteSequence(), aName ); @@ -133,31 +133,31 @@ void SwApplet_Impl::CreateApplet( const ::rtl::OUString& rCode, const ::rtl::OUS INetURLObject aUrlBase(rDocumentBaseURL); aUrlBase.removeSegment(); - ::rtl::OUString sDocBase = aUrlBase.GetMainURL(INetURLObject::NO_DECODE); + OUString sDocBase = aUrlBase.GetMainURL(INetURLObject::NO_DECODE); uno::Reference < beans::XPropertySet > xSet( xApplet->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString("AppletCode"), uno::makeAny( rCode ) ); - xSet->setPropertyValue( ::rtl::OUString("AppletName"), uno::makeAny( rName ) ); - xSet->setPropertyValue( ::rtl::OUString("AppletIsScript"), uno::makeAny( sal_Bool(bMayScript) ) ); - xSet->setPropertyValue( ::rtl::OUString("AppletDocBase"), uno::makeAny( sDocBase ) ); + xSet->setPropertyValue( OUString("AppletCode"), uno::makeAny( rCode ) ); + xSet->setPropertyValue( OUString("AppletName"), uno::makeAny( rName ) ); + xSet->setPropertyValue( OUString("AppletIsScript"), uno::makeAny( sal_Bool(bMayScript) ) ); + xSet->setPropertyValue( OUString("AppletDocBase"), uno::makeAny( sDocBase ) ); if ( !rCodeBase.isEmpty() ) - xSet->setPropertyValue( ::rtl::OUString("AppletCodeBase"), uno::makeAny( rCodeBase ) ); + xSet->setPropertyValue( OUString("AppletCodeBase"), uno::makeAny( rCodeBase ) ); else - xSet->setPropertyValue( ::rtl::OUString("AppletCodeBase"), uno::makeAny( sDocBase ) ); + xSet->setPropertyValue( OUString("AppletCodeBase"), uno::makeAny( sDocBase ) ); } } #ifdef SOLAR_JAVA -sal_Bool SwApplet_Impl::CreateApplet( const ::rtl::OUString& rBaseURL ) +sal_Bool SwApplet_Impl::CreateApplet( const OUString& rBaseURL ) { - ::rtl::OUString aCode, aName, aCodeBase; + OUString aCode, aName, aCodeBase; sal_Bool bMayScript = sal_False; size_t nArgCount = aCommandList.size(); for( size_t i = 0; i < nArgCount; i++ ) { const SvCommand& rArg = aCommandList[i]; - const ::rtl::OUString& rName = rArg.GetCommand(); + const OUString& rName = rArg.GetCommand(); if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_code ) ) aCode = rArg.GetArgument(); else if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_codebase ) ) @@ -185,12 +185,12 @@ void SwApplet_Impl::FinishApplet() { uno::Sequence < beans::PropertyValue > aProps; aCommandList.FillSequence( aProps ); - xSet->setPropertyValue( ::rtl::OUString("AppletCommands"), uno::makeAny( aProps ) ); + xSet->setPropertyValue( OUString("AppletCommands"), uno::makeAny( aProps ) ); } } #ifdef SOLAR_JAVA -void SwApplet_Impl::AppendParam( const ::rtl::OUString& rName, const ::rtl::OUString& rValue ) +void SwApplet_Impl::AppendParam( const OUString& rName, const OUString& rValue ) { aCommandList.Append( rName, rValue ); } diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index c85cd2165cc4..05c1f84ac398 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -156,7 +156,7 @@ static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt, sal_Bool bDeep ); static Writer& OutCSS1_SwFmtLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt ); -static rtl::OString ConvToHex(sal_uInt16 nHex) +static OString ConvToHex(sal_uInt16 nHex) { sal_Char aNToABuf[] = "00"; @@ -170,7 +170,7 @@ static rtl::OString ConvToHex(sal_uInt16 nHex) nHex >>= 4; } - return rtl::OString(aNToABuf, 2); + return OString(aNToABuf, 2); } static OString GetCSS1Color(const Color& rColor) @@ -267,7 +267,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, // In STYLE-Optionen den String codieren Strm() << sOut.makeStringAndClear().getStr(); if( pVal ) - HTMLOutFuncs::Out_String( Strm(), rtl::OUString::createFromAscii(pVal), + HTMLOutFuncs::Out_String( Strm(), OUString::createFromAscii(pVal), eDestEnc, &aNonConvertableCharacters ); else if( pSVal ) HTMLOutFuncs::Out_String( Strm(), *pSVal, eDestEnc, &aNonConvertableCharacters ); @@ -285,7 +285,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, Strm() << sOut.makeStringAndClear().getStr(); } -static void AddUnitPropertyValue(rtl::OStringBuffer &rOut, long nVal, +static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, FieldUnit eUnit) { if( nVal < 0 ) @@ -446,7 +446,7 @@ static void AddUnitPropertyValue(rtl::OStringBuffer &rOut, long nVal, void SwHTMLWriter::OutCSS1_UnitProperty( const sal_Char *pProp, long nVal ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; AddUnitPropertyValue(sOut, nVal, eCSS1Unit); OutCSS1_PropertyAscii(pProp, sOut.makeStringAndClear()); } @@ -509,7 +509,7 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet, { // wenn eine Property als Bestandteil einer Style-Option // ausgegeben wurde, muss die Optiomn noch beendet werden - rtl::OStringBuffer sOut; + OStringBuffer sOut; switch( nCSS1OutMode & CSS1_OUTMODE_ANY_OFF ) { case CSS1_OUTMODE_SPAN_TAG_OFF: @@ -660,12 +660,12 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed ) // wenn pPseudo gesetzt ist werden Styles-Sheets ausgegeben, // sonst wird nur nach Token und Class fuer ein Format gesucht -sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToken, +sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken, String& rClass, sal_uInt16& rRefPoolId, String *pPseudo ) { sal_uInt16 nDeep = 0; - rToken = rtl::OString(); + rToken = OString(); rClass.Erase(); rRefPoolId = 0; if( pPseudo ) @@ -697,7 +697,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke case 'B': if( !bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_blockquote) ) { rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_blockquote); + rToken = OString(OOO_STRING_SVTOOLS_HTML_blockquote); } break; case 'C': if( bChrFmt ) @@ -705,19 +705,19 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_citiation) ) { rRefPoolId = RES_POOLCHR_HTML_CITIATION; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_citiation); + rToken = OString(OOO_STRING_SVTOOLS_HTML_citiation); } else if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_code) ) { rRefPoolId = RES_POOLCHR_HTML_CODE; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_code); + rToken = OString(OOO_STRING_SVTOOLS_HTML_code); } } break; case 'D': if( bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_definstance) ) { rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_definstance); + rToken = OString(OOO_STRING_SVTOOLS_HTML_definstance); } else if( !bChrFmt ) { @@ -735,12 +735,12 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke else if( nDefListLvl & HTML_DLCOLL_DD ) { rRefPoolId = RES_POOLCOLL_HTML_DD; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dd); + rToken = OString(OOO_STRING_SVTOOLS_HTML_dd); } else { rRefPoolId = RES_POOLCOLL_HTML_DT; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dt); + rToken = OString(OOO_STRING_SVTOOLS_HTML_dt); } } } @@ -748,7 +748,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke case 'E': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_emphasis ) ) { rRefPoolId = RES_POOLCHR_HTML_EMPHASIS; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_emphasis); + rToken = OString(OOO_STRING_SVTOOLS_HTML_emphasis); } break; case 'H': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_horzrule ) ) @@ -758,14 +758,14 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke case 'K': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_keyboard ) ) { rRefPoolId = RES_POOLCHR_HTML_KEYBOARD; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_keyboard); + rToken = OString(OOO_STRING_SVTOOLS_HTML_keyboard); } break; case 'L': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_listing ) ) { // Listing als PRE exportieren bzw. von // PRE abgeleitete Vorlage exportieren - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt); + rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt); rRefPoolId = RES_POOLCOLL_HTML_PRE; nDeep = CSS1_FMT_CMPREF; } @@ -773,7 +773,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke case 'P': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_preformtxt ) ) { rRefPoolId = RES_POOLCOLL_HTML_PRE; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt); + rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt); } break; case 'S': if( bChrFmt ) @@ -781,32 +781,32 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke if( rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_sample ) ) { rRefPoolId = RES_POOLCHR_HTML_SAMPLE; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_sample); + rToken = OString(OOO_STRING_SVTOOLS_HTML_sample); } else if( rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_strong ) ) { rRefPoolId = RES_POOLCHR_HTML_STRONG; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_strong); + rToken = OString(OOO_STRING_SVTOOLS_HTML_strong); } } break; case 'T': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_teletype ) ) { rRefPoolId = RES_POOLCHR_HTML_TELETYPE; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_teletype); + rToken = OString(OOO_STRING_SVTOOLS_HTML_teletype); } break; case 'V': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_variable ) ) { rRefPoolId = RES_POOLCHR_HTML_VARIABLE; - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_variable); + rToken = OString(OOO_STRING_SVTOOLS_HTML_variable); } break; case 'X': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_xmp ) ) { // XMP als PRE exportieren (aber nicht die // Vorlage als Style) - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt); + rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt); rRefPoolId = RES_POOLCOLL_HTML_PRE; nDeep = CSS1_FMT_CMPREF; } @@ -830,41 +830,41 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke bStop = (nDeep==0); break; case RES_POOLCOLL_TEXT: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak); + rToken = OString(OOO_STRING_SVTOOLS_HTML_parabreak); break; case RES_POOLCOLL_HEADLINE1: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head1); + rToken = OString(OOO_STRING_SVTOOLS_HTML_head1); break; case RES_POOLCOLL_HEADLINE2: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head2); + rToken = OString(OOO_STRING_SVTOOLS_HTML_head2); break; case RES_POOLCOLL_HEADLINE3: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head3); + rToken = OString(OOO_STRING_SVTOOLS_HTML_head3); break; case RES_POOLCOLL_HEADLINE4: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head4); + rToken = OString(OOO_STRING_SVTOOLS_HTML_head4); break; case RES_POOLCOLL_HEADLINE5: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head5); + rToken = OString(OOO_STRING_SVTOOLS_HTML_head5); break; case RES_POOLCOLL_HEADLINE6: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head6); + rToken = OString(OOO_STRING_SVTOOLS_HTML_head6); break; case RES_POOLCOLL_SENDADRESS: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_address); + rToken = OString(OOO_STRING_SVTOOLS_HTML_address); break; case RES_POOLCOLL_HTML_BLOCKQUOTE: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_blockquote); + rToken = OString(OOO_STRING_SVTOOLS_HTML_blockquote); break; case RES_POOLCOLL_HTML_PRE: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt); + rToken = OString(OOO_STRING_SVTOOLS_HTML_preformtxt); break; case RES_POOLCOLL_HTML_DD: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dd); + rToken = OString(OOO_STRING_SVTOOLS_HTML_dd); break; case RES_POOLCOLL_HTML_DT: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dt); + rToken = OString(OOO_STRING_SVTOOLS_HTML_dt); break; case RES_POOLCOLL_TABLE: @@ -883,7 +883,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke OString(OOO_STRING_SVTOOLS_HTML_parabreak); } else - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak); + rToken = OString(OOO_STRING_SVTOOLS_HTML_parabreak); break; case RES_POOLCOLL_HTML_HR: // HR nicht ausgeben! @@ -892,7 +892,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke case RES_POOLCOLL_FOOTNOTE: if( !nDeep ) { - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak); + rToken = OString(OOO_STRING_SVTOOLS_HTML_parabreak); rClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote ); rRefPoolId = RES_POOLCOLL_TEXT; nDeep = CSS1_FMT_CMPREF; @@ -901,7 +901,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke case RES_POOLCOLL_ENDNOTE: if( !nDeep ) { - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak); + rToken = OString(OOO_STRING_SVTOOLS_HTML_parabreak); rClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote ); rRefPoolId = RES_POOLCOLL_TEXT; nDeep = CSS1_FMT_CMPREF; @@ -910,44 +910,44 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke // Zeichen-Vorlagen case RES_POOLCHR_HTML_EMPHASIS: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_emphasis); + rToken = OString(OOO_STRING_SVTOOLS_HTML_emphasis); break; case RES_POOLCHR_HTML_CITIATION: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_citiation); + rToken = OString(OOO_STRING_SVTOOLS_HTML_citiation); break; case RES_POOLCHR_HTML_STRONG: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_strong); + rToken = OString(OOO_STRING_SVTOOLS_HTML_strong); break; case RES_POOLCHR_HTML_CODE: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_code); + rToken = OString(OOO_STRING_SVTOOLS_HTML_code); break; case RES_POOLCHR_HTML_SAMPLE: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_sample); + rToken = OString(OOO_STRING_SVTOOLS_HTML_sample); break; case RES_POOLCHR_HTML_KEYBOARD: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_keyboard); + rToken = OString(OOO_STRING_SVTOOLS_HTML_keyboard); break; case RES_POOLCHR_HTML_VARIABLE: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_variable); + rToken = OString(OOO_STRING_SVTOOLS_HTML_variable); break; case RES_POOLCHR_HTML_DEFINSTANCE: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_definstance); + rToken = OString(OOO_STRING_SVTOOLS_HTML_definstance); break; case RES_POOLCHR_HTML_TELETYPE: - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_teletype); + rToken = OString(OOO_STRING_SVTOOLS_HTML_teletype); break; case RES_POOLCHR_INET_NORMAL: if( pPseudo ) { - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_anchor); + rToken = OString(OOO_STRING_SVTOOLS_HTML_anchor); pPseudo->AssignAscii( sCSS1_link ); } break; case RES_POOLCHR_INET_VISIT: if( pPseudo ) { - rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_anchor); + rToken = OString(OOO_STRING_SVTOOLS_HTML_anchor); pPseudo->AssignAscii( sCSS1_visited ); } break; @@ -1011,7 +1011,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, String& rSelector, sal_uInt16& rRefPoolId ) { - rtl::OString aToken; + OString aToken; String aClass; String aPseudo; @@ -1020,7 +1020,7 @@ static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, String& rSelector, if( nDeep ) { if( !aToken.isEmpty() ) - rSelector = rtl::OStringToOUString(aToken, RTL_TEXTENCODING_ASCII_US); + rSelector = OStringToOUString(aToken, RTL_TEXTENCODING_ASCII_US); else rSelector.Erase(); @@ -1759,7 +1759,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, else if( pTemplate ) pRefPageDesc = pTemplate->GetPageDescFromPool( nRefPoolId, false ); - String aSelector = rtl::OUString('@'); + String aSelector = OUString('@'); aSelector.AppendAscii( sCSS1_page ); if( bPseudo ) @@ -1817,7 +1817,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, } else { - rtl::OStringBuffer sVal; + OStringBuffer sVal; AddUnitPropertyValue(sVal, rSz.Width(), rHTMLWrt.GetCSS1Unit()); sVal.append(' '); AddUnitPropertyValue(sVal, rSz.Height(), rHTMLWrt.GetCSS1Unit()); @@ -1845,7 +1845,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, if( rHTMLWrt.bFirstCSS1Property && bPseudo ) { rHTMLWrt.OutNewLine(); - rtl::OString sTmp(rtl::OUStringToOString(aSelector, rHTMLWrt.eDestEnc)); + OString sTmp(OUStringToOString(aSelector, rHTMLWrt.eDestEnc)); rWrt.Strm() << sTmp.getStr() << " {"; rHTMLWrt.bFirstCSS1Property = sal_False; } @@ -2497,7 +2497,7 @@ static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt, } } - rtl::OStringBuffer sOut; + OStringBuffer sOut; if( pUStr ) sOut.append(pUStr); @@ -2708,7 +2708,7 @@ static Writer& OutCSS1_SvxKerning( Writer& rWrt, const SfxPoolItem& rHt ) sal_Int16 nValue = ((const SvxKerningItem&)rHt).GetValue(); if( nValue ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; if( nValue < 0 ) { sOut.append('-'); @@ -2961,7 +2961,7 @@ static Writer& OutCSS1_SvxWidows( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; - rtl::OString aStr(rtl::OString::valueOf(static_cast( + OString aStr(OString::valueOf(static_cast( ((const SvxWidowsItem&)rHt).GetValue()))); rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_widows, aStr ); @@ -2972,7 +2972,7 @@ static Writer& OutCSS1_SvxOrphans( Writer& rWrt, const SfxPoolItem& rHt ) { SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; - rtl::OString aStr(rtl::OString::valueOf(static_cast( + OString aStr(OString::valueOf(static_cast( ((const SvxOrphansItem&)rHt).GetValue()))); rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_orphans, aStr ); @@ -3361,7 +3361,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt, if( pTempFileName ) sGrfNm = *pTempFileName; sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, sGrfNm, - rtl::OUString("JPG"), + OUString("JPG"), XOUTBMP_USE_NATIVE_IF_POSSIBLE ); if( !nErr ) // fehlerhaft, da ist nichts auszugeben { @@ -3463,8 +3463,8 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt, { if( bColor ) { - rtl::OString sTmp(GetCSS1Color(aColor)); - sOut += String(rtl::OStringToOUString(sTmp, + OString sTmp(GetCSS1Color(aColor)); + sOut += String(OStringToOUString(sTmp, RTL_TEXTENCODING_ASCII_US)); } @@ -3617,7 +3617,7 @@ Writer& OutCSS1_SvxBox( Writer& rWrt, const SfxPoolItem& rHt ) if( nTopDist == nBottomDist && nLeftDist == nRightDist ) { - rtl::OStringBuffer sVal; + OStringBuffer sVal; AddUnitPropertyValue(sVal, nTopDist, rHTMLWrt.GetCSS1Unit()); if( nTopDist != nLeftDist ) { diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index d3a74fbda30d..aa49869d68a8 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -98,7 +98,7 @@ sal_uInt16 SwHTMLWriter::GetDefListLvl( const String& rNm, sal_uInt16 nPoolId ) return 1 | HTML_DLCOLL_DT; } - String sDTDD( rtl::OUString(OOO_STRING_SVTOOLS_HTML_dt) ); + String sDTDD( OUString(OOO_STRING_SVTOOLS_HTML_dt) ); sDTDD += ' '; if( COMPARE_EQUAL == sDTDD.CompareTo( rNm, sDTDD.Len() ) ) // DefinitionList - term @@ -199,7 +199,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1ScriptForScriptType( sal_uInt16 nScriptType ) struct SwHTMLTxtCollOutputInfo { - rtl::OString aToken; // auszugendens End-Token + OString aToken; // auszugendens End-Token SfxItemSet *pItemSet; // harte Attributierung sal_Bool bInNumBulList; // in einer Aufzaehlungs-Liste; @@ -647,7 +647,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, { // nur einen Zeilen-Umbruch (ohne Einrueckung) am Absatz-Anfang // ausgeben - rInfo.aToken = rtl::OString(); // kein End-Tag ausgeben + rInfo.aToken = OString(); // kein End-Tag ausgeben rWrt.Strm() << SwHTMLWriter::sNewLine; return; @@ -801,7 +801,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // ggf ein List-Item aufmachen if( rInfo.bInNumBulList && bNumbered ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_li); if( USHRT_MAX != nNumStart ) { @@ -824,7 +824,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // The align=... attribute does behave strange in netscape // if there are controls in a paragraph, because the control and // all text behind the control does not recognize this attribute. - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division); rWrt.Strm() << sOut.makeStringAndClear().getStr(); @@ -844,7 +844,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // ausgegeben, wenn, // - keine Styles geschrieben werden, und // - ein untere Abstand oder eine Absatz-Ausrichtung existiert - rtl::OString aToken = rInfo.aToken; + OString aToken = rInfo.aToken; if( !rHWrt.bCfgOutStyles && rInfo.bParaPossible && !bPara && (bHasParSpace || pAdjItem) ) { @@ -903,7 +903,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, rHWrt.bTxtAttr = sal_False; rHWrt.bOutOpts = sal_True; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(aToken); if( eLang != LANGUAGE_DONTKNOW && eLang != rHWrt.eLang ) @@ -969,7 +969,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // wenn kein End-Tag geschrieben werden soll, es loeschen if( bNoEndTag ) - rInfo.aToken = rtl::OString(); + rInfo.aToken = OString(); } if( nBulletGrfLvl != 255 ) @@ -2058,7 +2058,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) rHTMLWrt.bLFPossible = sal_True; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_horzrule); const SfxItemSet* pItemSet = pNd->GetpSwAttrSet(); @@ -2592,7 +2592,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) else pStr = OOO_STRING_SVTOOLS_HTML_AL_right; - rtl::OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_linebreak)); + OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_linebreak)); sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_clear).append('=').append(pStr); HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), sOut.getStr() ); @@ -2667,7 +2667,7 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) if( COL_AUTO == aColor.GetColor() ) aColor.SetColor( COL_BLACK ); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_font).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_color).append('='); rWrt.Strm() << sOut.makeStringAndClear().getStr(); @@ -2711,7 +2711,7 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const SfxPoolItem& rHt ) String aNames; SwHTMLWriter::PrepareFontList( ((const SvxFontItem&)rHt), aNames, 0, rHTMLWrt.IsHTMLMode(HTMLMODE_FONT_GENERIC) ); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_font).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_face).append("=\""); rWrt.Strm() << sOut.makeStringAndClear().getStr(); @@ -2732,7 +2732,7 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt ) if( rHTMLWrt.bTagOn ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_font); sal_uInt32 nHeight = ((const SvxFontHeightItem&)rHt).GetHeight(); @@ -2770,7 +2770,7 @@ static Writer& OutHTML_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt ) if( rHTMLWrt.bTagOn ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_span); rWrt.Strm() << sOut.makeStringAndClear().getStr(); rHTMLWrt.OutLanguage( ((const SvxLanguageItem &)rHt).GetLanguage() ); @@ -2935,7 +2935,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bO return rWrt; } - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor); bool bScriptDependent = false; @@ -3020,7 +3020,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bO } if( sRel.Len() ) - sOut.append(rtl::OUStringToOString(sRel, RTL_TEXTENCODING_ASCII_US)); + sOut.append(OUStringToOString(sRel, RTL_TEXTENCODING_ASCII_US)); if( sOut.getLength() ) rWrt.Strm() << sOut.makeStringAndClear().getStr(); @@ -3110,7 +3110,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt ) if( rHTMLWrt.bTagOn ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<'); if( !pFmtInfo->aToken.isEmpty() ) sOut.append(pFmtInfo->aToken); @@ -3177,7 +3177,7 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt ) } if( pStr ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append('=') .append(pStr); rWrt.Strm() << sOut.makeStringAndClear().getStr(); diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index e68f00782f81..44fbb39269dc 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -110,11 +110,11 @@ void SwHTMLParser::EndScript() RemoveSGMLComment( aScriptSource, sal_True ); // get library name - ::rtl::OUString aLibName; + OUString aLibName; if( aBasicLib.Len() ) aLibName = aBasicLib; else - aLibName = ::rtl::OUString("Standard"); + aLibName = OUString("Standard"); // get module library container Reference< script::XLibraryContainer > xModLibContainer( pDocSh->GetBasicContainer(), UNO_QUERY ); @@ -144,16 +144,16 @@ void SwHTMLParser::EndScript() { aBasicModule.AssignAscii( "Modul" ); aBasicModule += OUString::number( (sal_Int32)(++nSBModuleCnt) ); - bFound = xModLib->hasByName( ::rtl::OUString( aBasicModule ) ); + bFound = xModLib->hasByName( OUString( aBasicModule ) ); } } // create module - ::rtl::OUString aModName( aBasicModule ); + OUString aModName( aBasicModule ); if ( !xModLib->hasByName( aModName ) ) { Any aElement; - aElement <<= ::rtl::OUString( aScriptSource ); + aElement <<= OUString( aScriptSource ); xModLib->insertByName( aModName , aElement ); } } @@ -232,7 +232,7 @@ void SwHTMLParser::AddScriptSource() } } -void SwHTMLParser::InsertBasicDocEvent( rtl::OUString aEvent, const String& rName, +void SwHTMLParser::InsertBasicDocEvent( OUString aEvent, const String& rName, ScriptType eScrType, const String& rScrType ) { @@ -281,13 +281,13 @@ void SwHTMLWriter::OutBasic() const SbModule *pModule = PTR_CAST( SbModule, pModules->Get(j) ); OSL_ENSURE( pModule, "Wo ist das Modul?" ); - rtl::OUString sLang(SVX_MACRO_LANGUAGE_STARBASIC); + OUString sLang(SVX_MACRO_LANGUAGE_STARBASIC); ScriptType eType = STARBASIC; if( 0==i && 0==j ) { OutNewLine(); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta) .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_httpequiv) .append("=\"") @@ -296,7 +296,7 @@ void SwHTMLWriter::OutBasic() .append("=\"text/x-"); Strm() << sOut.getStr(); // Entities aren't welcome here - Strm() << rtl::OUStringToOString(sLang, eDestEnc).getStr() + Strm() << OUStringToOString(sLang, eDestEnc).getStr() << "\">"; } @@ -328,7 +328,7 @@ void SwHTMLWriter::OutBasicBodyEvents() uno::Reference < container::XNameReplace > xEvents = xSup->getEvents(); for ( sal_Int32 i=0; i<4; i++ ) { - SvxMacro* pMacro = SfxEventConfiguration::ConvertToMacro( xEvents->getByName( ::rtl::OUString::createFromAscii(aEventNames[i]) ), pDocSh, sal_True ); + SvxMacro* pMacro = SfxEventConfiguration::ConvertToMacro( xEvents->getByName( OUString::createFromAscii(aEventNames[i]) ), pDocSh, sal_True ); if ( pMacro ) { pDocTable->Insert( aBodyEventTable[i].nEvent, *pMacro ); diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index a580a1e65433..6423ce55a1b9 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -225,7 +225,7 @@ void SwCSS1Parser::SetLinkCharFmts() OSL_ENSURE( !bLinkCharFmtsSet, "Aufruf von SetLinkCharFmts unnoetig" ); SvxCSS1MapEntry *pStyleEntry = - GetTag( rtl::OUString(OOO_STRING_SVTOOLS_HTML_anchor) ); + GetTag( OUString(OOO_STRING_SVTOOLS_HTML_anchor) ); SwCharFmt *pUnvisited = 0, *pVisited = 0; if( pStyleEntry ) { @@ -241,7 +241,7 @@ void SwCSS1Parser::SetLinkCharFmts() bBodyVLinkSet |= bColorSet; } - String sTmp( rtl::OUString(OOO_STRING_SVTOOLS_HTML_anchor) ); + String sTmp( OUString(OOO_STRING_SVTOOLS_HTML_anchor) ); sTmp.Append( ':' ); sTmp.AppendAscii( sCSS1_link ); pStyleEntry = GetTag( sTmp ); @@ -1195,7 +1195,7 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const String& rClass ) c } else { - String sCName( rtl::OUString::createFromAscii(sName) ); + String sCName( OUString::createFromAscii(sName) ); pCFmt = pDoc->FindCharFmtByName( sCName ); if( !pCFmt ) { @@ -1872,7 +1872,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn ) } - pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_first), sal_True ); + pPageEntry = GetPage( OUString::createFromAscii(sCSS1_first), sal_True ); if( pPageEntry ) { SetPageDescAttrs( GetFirstPageDesc(sal_True), pPageEntry->GetItemSet(), @@ -1880,7 +1880,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn ) bSetFirstPageDesc = sal_True; } - pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_right), sal_True ); + pPageEntry = GetPage( OUString::createFromAscii(sCSS1_right), sal_True ); if( pPageEntry ) { SetPageDescAttrs( GetRightPageDesc(sal_True), pPageEntry->GetItemSet(), @@ -1888,7 +1888,7 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const String& rIn ) bSetRightPageDesc = sal_True; } - pPageEntry = GetPage( rtl::OUString::createFromAscii(sCSS1_left), sal_True ); + pPageEntry = GetPage( OUString::createFromAscii(sCSS1_left), sal_True ); if( pPageEntry ) SetPageDescAttrs( GetLeftPageDesc(sal_True), pPageEntry->GetItemSet(), pPageEntry->GetPropertyInfo() ); diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index f68174316935..d098988d2ad8 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -682,7 +682,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, if( !pOutlinerParaObj ) return rWrt; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_marquee); // Die Attribute des Objektd holen @@ -823,7 +823,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE; if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) ) nFrmFlags |= HTML_FRMOPTS_MARQUEE_CSS1; - rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, nFrmFlags ); + OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, nFrmFlags ); if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) ) rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, &rSdrObject ); diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 59f414d7139b..688ce4335fde 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -258,7 +258,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, // -Tag ausgeben if( pTypeStr ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<'); sOut.append(OOO_STRING_SVTOOLS_HTML_sdfield).append(' '). append(OOO_STRING_SVTOOLS_HTML_O_type).append('='). @@ -448,7 +448,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) rWrt.Strm() << '/'; // TODO: HTML-Tags are written without entitities, that for, characters // not contained in the destination encoding are lost! - rtl::OString sTmp(rtl::OUStringToOString(rTxt, + OString sTmp(OUStringToOString(rTxt, ((SwHTMLWriter&)rWrt).eDestEnc)); rWrt.Strm() << sTmp.getStr() << '>'; } @@ -470,7 +470,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) String sComment(convertLineEnd(rComment, GetSystemLineEnd())); // TODO: HTML-Tags are written without entitities, that for, // characters not contained in the destination encoding are lost! - rtl::OString sTmp(rtl::OUStringToOString(sComment, + OString sTmp(OUStringToOString(sComment, ((SwHTMLWriter&)rWrt).eDestEnc)); rWrt.Strm() << sTmp.getStr(); bWritten = sal_True; @@ -486,7 +486,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) // TODO: HTML-Tags are written without entitities, that for, // characters not contained in the destination encoding are // lost! - rtl::OString sTmp(rtl::OUStringToOString(sComment, + OString sTmp(OUStringToOString(sComment, ((SwHTMLWriter&)rWrt).eDestEnc)); rWrt.Strm() << sTmp.getStr(); bWritten = sal_True; @@ -497,10 +497,10 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) if( !bWritten ) { String sComment(convertLineEnd(rComment, GetSystemLineEnd())); - rtl::OStringBuffer sOut; + OStringBuffer sOut; // TODO: ??? sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_comment) - .append(' ').append(rtl::OUStringToOString(sComment, + .append(' ').append(OUStringToOString(sComment, ((SwHTMLWriter&)rWrt).eDestEnc)).append(" -->"); rWrt.Strm() << sOut.getStr(); } diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 6ddbdde1d298..a5ae153a7e0a 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -443,7 +443,7 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt, if( bLFPossible && HTML_CNTNR_DIV == nCntnrMode ) OutNewLine(); - rtl::OStringBuffer sOut; + OStringBuffer sOut; pCntnrStr = (HTML_CNTNR_DIV == nCntnrMode) ? OOO_STRING_SVTOOLS_HTML_division : OOO_STRING_SVTOOLS_HTML_span; @@ -529,13 +529,13 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt, } -rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, +OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, const String& rAlternateTxt, sal_uInt32 nFrmOpts, - const rtl::OString &rEndTags ) + const OString &rEndTags ) { - rtl::OString sRetEndTags(rEndTags); - rtl::OStringBuffer sOut; + OString sRetEndTags(rEndTags); + OStringBuffer sOut; const SfxPoolItem* pItem; const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet(); @@ -934,7 +934,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, rHTMLWrt.aImgMapNames.push_back(aIMapName); - rtl::OString aIndMap, aIndArea; + OString aIndMap, aIndArea; const sal_Char *pLF = 0, *pIndArea = 0, *pIndMap = 0; #if defined(UNX) sal_Char aLF[2] = "\x00"; @@ -982,8 +982,8 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, rHTMLWrt.OutNewLine( sal_True ); // Attribute die ausserhelb der Grafik geschreiben werden muessen sammeln - rtl::OStringBuffer sOut; - rtl::OString aEndTags; + OStringBuffer sOut; + OString aEndTags; // implizite Sprungmarke -> ... if( pMarkType && rFrmFmt.GetName().Len() ) @@ -1056,7 +1056,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, } rWrt.Strm() << ">"; - aEndTags = rtl::OStringBuffer().append("")).append(aEndTags). makeStringAndClear(); @@ -1130,7 +1130,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, HTMLOutFuncs::Out_Color( rWrt.Strm(), pColBorderLine->GetColor(), rHTMLWrt.eDestEnc ) << '>'; - aEndTags = rtl::OStringBuffer(). + aEndTags = OStringBuffer(). append(RTL_CONSTASCII_STRINGPARAM("').append(aEndTags).makeStringAndClear(); @@ -1222,7 +1222,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt, if( rHTMLWrt.GetOrigFileName() ) rGrfName = *rHTMLWrt.GetOrigFileName(); sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rGrfName, - rtl::OUString("JPG"), + OUString("JPG"), (XOUTBMP_USE_GIF_IF_SENSIBLE | XOUTBMP_USE_NATIVE_IF_POSSIBLE)); if( !nErr ) @@ -1253,7 +1253,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt, pLink = &rGrfName; } - rtl::OStringBuffer sOut; + OStringBuffer sOut; if( pTag ) sOut.append('<').append(pTag); @@ -1390,7 +1390,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt, if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_multicol); const SwFmtCol& rFmtCol = rFrmFmt.GetCol(); @@ -1465,14 +1465,14 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt ) if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine( sal_True ); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_spacer).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_type).append('=') .append(OOO_STRING_SVTOOLS_HTML_SPTYPE_block); rWrt.Strm() << sOut.makeStringAndClear().getStr(); // ALIGN, WIDTH, HEIGHT - rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, HTML_FRMOPTS_SPACER ); + OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, HTML_FRMOPTS_SPACER ); rWrt.Strm() << '>'; if( !aEndTags.isEmpty() ) @@ -1502,14 +1502,14 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt, if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(pStr); rWrt.Strm() << sOut.makeStringAndClear().getStr(); sal_uLong nFrmFlags = HTML_FRMOPTS_DIV; if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) ) nFrmFlags |= HTML_FRMOPT_S_NOBORDER; - rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, nFrmFlags ); + OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, nFrmFlags ); rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags ); rWrt.Strm() << '>'; @@ -1559,7 +1559,7 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt, aGrfNm = *rHTMLWrt.GetOrigFileName(); if( aGrf.GetType() == GRAPHIC_NONE || XOutBitmap::WriteGraphic( aGrf, aGrfNm, - rtl::OUString("JPG"), + OUString("JPG"), (XOUTBMP_USE_GIF_IF_POSSIBLE| XOUTBMP_USE_NATIVE_IF_POSSIBLE) ) != 0 ) { @@ -1618,7 +1618,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt, MapMode( MAP_TWIP ), MapMode( MAP_100TH_MM )); sal_uInt16 nErr = XOutBitmap::WriteGraphic( pGrfNd->GetGrf(), aGrfNm, - rtl::OUString("JPG"), nFlags, &aMM100Size ); + OUString("JPG"), nFlags, &aMM100Size ); if( nErr ) // fehlerhaft, da ist nichts auszugeben { rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE; @@ -1684,7 +1684,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, // als Multicol ausgeben rHTMLWrt.OutNewLine(); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(OOO_STRING_SVTOOLS_HTML_division).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_type).append('=') .append(bHeader ? "HEADER" : "FOOTER"); @@ -1699,7 +1699,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, sal_uInt16 nSize = bHeader ? rULSpace.GetLower() : rULSpace.GetUpper(); rHTMLWrt.nHeaderFooterSpace = nSize; - rtl::OString aSpacer; + OString aSpacer; if( rHTMLWrt.IsHTMLMode(HTMLMODE_VERT_SPACER) && nSize > HTML_PARSPACE && Application::GetDefaultDevice() ) { @@ -1707,7 +1707,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, nSize = (sal_Int16)Application::GetDefaultDevice() ->LogicToPixel( Size(nSize,0), MapMode(MAP_TWIP) ).Width(); - aSpacer = rtl::OStringBuffer(OOO_STRING_SVTOOLS_HTML_spacer). + aSpacer = OStringBuffer(OOO_STRING_SVTOOLS_HTML_spacer). append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type). append('=').append(OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical). append(' ').append(OOO_STRING_SVTOOLS_HTML_O_size). diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 41d488ed39ef..093d58b34dc8 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -79,7 +79,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::form; -using ::rtl::OUString; const sal_uInt16 TABINDEX_MIN = 0; const sal_uInt16 TABINDEX_MAX = 32767; @@ -2501,7 +2500,7 @@ void SwHTMLParser::EndSelect() for(size_t i = 0; i < nEntryCnt; ++i) { - rtl::OUString sText(pFormImpl->GetStringList()[i]); + OUString sText(pFormImpl->GetStringList()[i]); sText = comphelper::string::stripEnd(sText, ' '); pStrings[i] = sText; diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index f224bf837bb1..c9b1695ba089 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -63,7 +63,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; const sal_uInt32 HTML_FRMOPTS_CONTROL = 0; @@ -165,7 +164,7 @@ static void lcl_html_outEvents( SvStream& rStrm, } } - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(' '); if( pOpt && (EXTENDED_STYPE != eScriptType || pDescs[i].AddListenerParam.isEmpty()) ) @@ -173,10 +172,10 @@ static void lcl_html_outEvents( SvStream& rStrm, else { sOut.append(OOO_STRING_SVTOOLS_HTML_O_sdevent) - .append(rtl::OUStringToOString(sListener, + .append(OUStringToOString(sListener, RTL_TEXTENCODING_ASCII_US)) .append('-') - .append(rtl::OUStringToOString(sMethod, + .append(OUStringToOString(sMethod, RTL_TEXTENCODING_ASCII_US)); } sOut.append("=\""); @@ -187,10 +186,10 @@ static void lcl_html_outEvents( SvStream& rStrm, !pDescs[i].AddListenerParam.isEmpty() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdaddparam) - .append(rtl::OUStringToOString(sListener, + .append(OUStringToOString(sListener, RTL_TEXTENCODING_ASCII_US)) .append('-') - .append(rtl::OUStringToOString(sMethod, + .append(OUStringToOString(sMethod, RTL_TEXTENCODING_ASCII_US)) .append("=\""); rStrm << sOut.makeStringAndClear().getStr(); @@ -470,7 +469,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, // die neue Form wird geoeffnet if( bLFPossible ) OutNewLine(); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_form); uno::Reference< beans::XPropertySet > xFormPropSet( rFormComps, uno::UNO_QUERY ); @@ -609,7 +608,7 @@ void SwHTMLWriter::OutHiddenControls( { if( bLFPossible ) OutNewLine( sal_True ); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_input).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_type).append('=') .append(OOO_STRING_SVTOOLS_HTML_IT_hidden); @@ -750,7 +749,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, OOO_STRING_SVTOOLS_HTML_IT_button }; Type eType = TYPE_NONE; OUString sValue; - rtl::OStringBuffer sOptions; + OStringBuffer sOptions; sal_Bool bEmptyValue = sal_False; uno::Any aTmp = xPropSet->getPropertyValue( OUString("ClassId") ); @@ -967,7 +966,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( eTag == TAG_NONE ) return rWrt; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(TagNames[eTag]); if( eType != TYPE_NONE ) { @@ -1076,7 +1075,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, ? HTML_FRMOPTS_IMG_CONTROL_CSS1 : HTML_FRMOPTS_CONTROL_CSS1); } - rtl::OString aEndTags; + OString aEndTags; if( nFrmOpts != 0 ) aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, nFrmOpts ); diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 2e4a451aca0f..00a8479a66f4 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -297,7 +297,7 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt ) rHTMLWrt.pFootEndNotes = new SwHTMLTxtFtns; rHTMLWrt.pFootEndNotes->insert( rHTMLWrt.pFootEndNotes->begin() + nPos, pTxtFtn ); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\""); rWrt.Strm() << sOut.makeStringAndClear().getStr(); @@ -357,7 +357,7 @@ void SwHTMLWriter::OutFootEndNotes() if( bLFPossible ) OutNewLine(); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division) .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id).append("=\""); Strm() << sOut.makeStringAndClear().getStr(); @@ -465,7 +465,7 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn, } } - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\""); Strm() << sOut.makeStringAndClear().getStr(); @@ -495,7 +495,7 @@ static sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, const sal_Char *pStr = SwHTMLWriter::GetNumFormat( eFmt ); if( pStr ) { - pParts[0] = rtl::OUString::createFromAscii( pStr ); + pParts[0] = OUString::createFromAscii( pStr ); nParts = 1; } } @@ -528,12 +528,12 @@ static void lcl_html_outFootEndNoteInfo( Writer& rWrt, String *pParts, { xub_StrLen nPos = 0; String aTmp( pParts[i] ); - rtl::OUString aRep("\\\\"); + OUString aRep("\\\\"); while( STRING_NOTFOUND != (nPos = aTmp.SearchAndReplaceAscii( "\\", aRep, nPos ) ) ) nPos += 2; nPos = 0; - aRep = rtl::OUString("\\;"); + aRep = OUString("\\;"); while( STRING_NOTFOUND != (nPos = aTmp.SearchAndReplaceAscii( ";", aRep, nPos ) ) ) nPos += 2; @@ -543,7 +543,7 @@ static void lcl_html_outFootEndNoteInfo( Writer& rWrt, String *pParts, } rHTMLWrt.OutNewLine(); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"").append(pName) .append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content).append("=\""); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 4c3e9afffa76..97caf18c790f 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -809,7 +809,7 @@ void SwHTMLParser::InsertBodyOptions() { const HTMLOption& rOption = rHTMLOptions[--i]; ScriptType eScriptType2 = eDfltScriptType; - rtl::OUString aEvent; + OUString aEvent; sal_Bool bSetEvent = sal_False; switch( rOption.GetToken() ) diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index c0273901bcab..3555f879ddc8 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -789,7 +789,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, rWrt.OutNewLine(); //
        /
          in eine neue Zeile rWrt.aBulletGrfs[i].Erase(); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<'); const SwNumFmt& rNumFmt = rInfo.GetNumRule()->Get( i ); sal_Int16 eType = rNumFmt.GetNumberingType(); diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 319a12c1b41f..104813f179b5 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -409,7 +409,7 @@ void SwHTMLParser::InsertEmbed() // das Plugin anlegen comphelper::EmbeddedObjectContainer aCnt; - ::rtl::OUString aObjName; + OUString aObjName; uno::Reference < embed::XEmbeddedObject > xObj = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence(), aObjName ); if ( svt::EmbeddedObjectRef::TryRunningState( xObj ) ) { @@ -417,15 +417,15 @@ void SwHTMLParser::InsertEmbed() if ( xSet.is() ) { if( bHasURL ) - xSet->setPropertyValue( ::rtl::OUString("PluginURL"), - uno::makeAny( ::rtl::OUString( aURL ) ) ); + xSet->setPropertyValue( OUString("PluginURL"), + uno::makeAny( OUString( aURL ) ) ); if( bHasType ) - xSet->setPropertyValue( ::rtl::OUString("PluginMimeType"), - uno::makeAny( ::rtl::OUString( aType ) ) ); + xSet->setPropertyValue( OUString("PluginMimeType"), + uno::makeAny( OUString( aType ) ) ); uno::Sequence < beans::PropertyValue > aProps; aCmdLst.FillSequence( aProps ); - xSet->setPropertyValue( ::rtl::OUString("PluginCommands"), uno::makeAny( aProps ) ); + xSet->setPropertyValue( OUString("PluginCommands"), uno::makeAny( aProps ) ); } } @@ -871,7 +871,7 @@ void SwHTMLParser::InsertFloatingFrame() // den Floating-Frame anlegen comphelper::EmbeddedObjectContainer aCnt; - ::rtl::OUString aObjName; + OUString aObjName; uno::Reference < embed::XEmbeddedObject > xObj = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_IFRAME_CLASSID ).GetByteSequence(), aObjName ); try @@ -882,28 +882,28 @@ void SwHTMLParser::InsertFloatingFrame() uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - ::rtl::OUString aName = aFrameDesc.GetName(); + OUString aName = aFrameDesc.GetName(); ScrollingMode eScroll = aFrameDesc.GetScrollingMode(); sal_Bool bHasBorder = aFrameDesc.HasFrameBorder(); Size aMargin = aFrameDesc.GetMargin(); - xSet->setPropertyValue( ::rtl::OUString("FrameURL"), uno::makeAny( ::rtl::OUString( aFrameDesc.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ) ) ); - xSet->setPropertyValue( ::rtl::OUString("FrameName"), uno::makeAny( aName ) ); + xSet->setPropertyValue( OUString("FrameURL"), uno::makeAny( OUString( aFrameDesc.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ) ) ); + xSet->setPropertyValue( OUString("FrameName"), uno::makeAny( aName ) ); if ( eScroll == ScrollingAuto ) - xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"), + xSet->setPropertyValue( OUString("FrameIsAutoScroll"), uno::makeAny( sal_True ) ); else - xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"), + xSet->setPropertyValue( OUString("FrameIsScrollingMode"), uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) ); - xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"), + xSet->setPropertyValue( OUString("FrameIsBorder"), uno::makeAny( bHasBorder ) ); - xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"), + xSet->setPropertyValue( OUString("FrameMarginWidth"), uno::makeAny( sal_Int32( aMargin.Width() ) ) ); - xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"), + xSet->setPropertyValue( OUString("FrameMarginHeight"), uno::makeAny( sal_Int32( aMargin.Height() ) ) ); } } @@ -1014,16 +1014,16 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, pMarkToOLE ); uno::Any aAny; SvGlobalName aGlobName( xObj->getClassID() ); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<'); if( aGlobName == SvGlobalName( SO3_PLUGIN_CLASSID ) ) { // erstmal das Plug-spezifische sOut.append(OOO_STRING_SVTOOLS_HTML_embed); - ::rtl::OUString aStr; + OUString aStr; String aURL; - aAny = xSet->getPropertyValue( ::rtl::OUString("PluginURL") ); + aAny = xSet->getPropertyValue( OUString("PluginURL") ); if( (aAny >>= aStr) && !aStr.isEmpty() ) { aURL = URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(), @@ -1039,8 +1039,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, sOut.append('\"'); } - ::rtl::OUString aType; - aAny = xSet->getPropertyValue( ::rtl::OUString("PluginMimeType") ); + OUString aType; + aAny = xSet->getPropertyValue( OUString("PluginMimeType") ); if( (aAny >>= aType) && !aType.isEmpty() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type) @@ -1071,8 +1071,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, sOut.append(OOO_STRING_SVTOOLS_HTML_applet); // CODEBASE - ::rtl::OUString aCd; - aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCodeBase") ); + OUString aCd; + aAny = xSet->getPropertyValue( OUString("AppletCodeBase") ); if( (aAny >>= aCd) && !aCd.isEmpty() ) { String sCodeBase( URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(), aCd) ); @@ -1087,8 +1087,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, } // CODE - ::rtl::OUString aClass; - aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCode") ); + OUString aClass; + aAny = xSet->getPropertyValue( OUString("AppletCode") ); aAny >>= aClass; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_code) .append("=\""); @@ -1097,8 +1097,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, sOut.append('\"'); // NAME - ::rtl::OUString aAppletName; - aAny = xSet->getPropertyValue( ::rtl::OUString("AppletName") ); + OUString aAppletName; + aAny = xSet->getPropertyValue( OUString("AppletName") ); aAny >>= aAppletName; if( !aAppletName.isEmpty() ) { @@ -1110,7 +1110,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, } sal_Bool bScript = sal_False; - aAny = xSet->getPropertyValue( ::rtl::OUString("AppletIsScript") ); + aAny = xSet->getPropertyValue( OUString("AppletIsScript") ); aAny >>= bScript; if( bScript ) sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_mayscript); @@ -1139,7 +1139,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed ) nFrmOpts |= HTML_FRMOPTS_OLE_CSS1; - rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, pOLENd->GetTitle(), nFrmOpts ); + OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, pOLENd->GetTitle(), nFrmOpts ); if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed ) rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts ); @@ -1149,7 +1149,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // und ein schreiben uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") ); + aAny = xSet->getPropertyValue( OUString("AppletCommands") ); aAny >>= aProps; SvCommandList aCommands; @@ -1186,7 +1186,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, const String& rName = rCommand.GetCommand(); const String& rValue = rCommand.GetArgument(); rHTMLWrt.OutNewLine(); - rtl::OStringBuffer sBuf; + OStringBuffer sBuf; sBuf.append('<').append(OOO_STRING_SVTOOLS_HTML_param) .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name) .append("=\""); @@ -1208,7 +1208,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // fuer Plugins die Parameter als Optionen schreiben uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( ::rtl::OUString("PluginCommands") ); + aAny = xSet->getPropertyValue( OUString("PluginCommands") ); aAny >>= aProps; SvCommandList aCommands; @@ -1265,7 +1265,7 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt, aGrfNm = *pTempFileName; sal_uInt16 nErr = XOutBitmap::WriteGraphic( aGrf, aGrfNm, - rtl::OUString("JPG"), + OUString("JPG"), (XOUTBMP_USE_GIF_IF_POSSIBLE | XOUTBMP_USE_NATIVE_IF_POSSIBLE) ); if( nErr ) // fehlerhaft, da ist nichts auszugeben diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 0949e733aa19..263c90b34aff 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -314,7 +314,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, } rWrt.OutNewLine(); //
      		/ in neue Zeile - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<'); sOut.append(bHead ? OOO_STRING_SVTOOLS_HTML_tableheader : OOO_STRING_SVTOOLS_HTML_tabledata); @@ -550,7 +550,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt, if( text::VertOrientation::TOP==eRowVertOri || text::VertOrientation::BOTTOM==eRowVertOri ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_valign) .append('=').append(text::VertOrientation::TOP==eRowVertOri ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom); rWrt.Strm() << sOut.makeStringAndClear().getStr(); @@ -634,7 +634,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, if( rWrt.bLFPossible ) rWrt.OutNewLine(); // in neue Zeile - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_table); sal_uInt16 nOldDirection = rWrt.nDirection; @@ -746,7 +746,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, if( pCaption && pCaption->Len() ) { rWrt.OutNewLine(); //
      in neue Zeile - rtl::OStringBuffer sOutStr(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_caption)); + OStringBuffer sOutStr(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_caption)); sOutStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append('=') .append(bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.getStr(), sal_True ); @@ -775,7 +775,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, const SwWriteTableCol *pColumn = aCols[nCol]; - rtl::OStringBuffer sOutStr; + OStringBuffer sOutStr; sOutStr.append('<').append(OOO_STRING_SVTOOLS_HTML_col); sal_uInt32 nWidth; @@ -1112,7 +1112,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, sal_True ); else { - rtl::OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_division)); + OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_division)); sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append('=') .append(OOO_STRING_SVTOOLS_HTML_AL_right); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr(), diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index fe8427515591..8455ab1e6999 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -149,7 +149,7 @@ CSS1Token CSS1Parser::GetNextToken() if (comphelper::string::isalphaAscii(cNextCh)) { // den naechsten Identifer scannen - ::rtl::OUStringBuffer sTmpBuffer( 32L ); + OUStringBuffer sTmpBuffer( 32L ); do { sTmpBuffer.append( cNextCh ); cNextCh = GetNextChar(); @@ -245,7 +245,7 @@ CSS1Token CSS1Parser::GetNextToken() if( 'i'==cNextCh || 'I'==cNextCh) { // den naechsten Identifer scannen - ::rtl::OUStringBuffer sTmpBuffer( 32L ); + OUStringBuffer sTmpBuffer( 32L ); do { sTmpBuffer.append( cNextCh ); cNextCh = GetNextChar(); @@ -284,7 +284,7 @@ CSS1Token CSS1Parser::GetNextToken() sal_Unicode cQuoteChar = cNextCh; cNextCh = GetNextChar(); - ::rtl::OUStringBuffer sTmpBuffer( MAX_LEN ); + OUStringBuffer sTmpBuffer( MAX_LEN ); do { sTmpBuffer.append( cNextCh ); cNextCh = GetNextChar(); @@ -315,7 +315,7 @@ CSS1Token CSS1Parser::GetNextToken() sal_Bool bEOFSave = bEOF; // erstmal versuchen eine Hex-Zahl zu scannen - ::rtl::OUStringBuffer sTmpBuffer( 16 ); + OUStringBuffer sTmpBuffer( 16 ); do { sTmpBuffer.append( cNextCh ); cNextCh = GetNextChar(); @@ -351,7 +351,7 @@ CSS1Token CSS1Parser::GetNextToken() !IsEOF() ); aToken += String(sTmpBuffer.makeStringAndClear()); - nValue = rtl::OUString(aToken).toDouble(); + nValue = OUString(aToken).toDouble(); // White Space ueberlesen while( ( ' ' == cNextCh || @@ -389,7 +389,7 @@ CSS1Token CSS1Parser::GetNextToken() // den naechsten Identifer scannen String aIdent; - ::rtl::OUStringBuffer sTmpBuffer2( 64L ); + OUStringBuffer sTmpBuffer2( 64L ); do { sTmpBuffer2.append( cNextCh ); cNextCh = GetNextChar(); @@ -539,7 +539,7 @@ CSS1Token CSS1Parser::GetNextToken() sal_Bool bEOFSave = bEOF; // erstmal versuchen eine Hex-Zahl zu scannen - ::rtl::OUStringBuffer sTmpBuffer( 6L ); + OUStringBuffer sTmpBuffer( 6L ); do { sTmpBuffer.append( cNextCh ); cNextCh = GetNextChar(); @@ -595,7 +595,7 @@ CSS1Token CSS1Parser::GetNextToken() sal_Bool bHexColor = sal_True; // den naechsten Identifer scannen - ::rtl::OUStringBuffer sTmpBuffer( 64L ); + OUStringBuffer sTmpBuffer( 64L ); do { sTmpBuffer.append( cNextCh ); if( bHexColor ) @@ -625,7 +625,7 @@ CSS1Token CSS1Parser::GetNextToken() aToken.EqualsIgnoreCaseAscii(sCSS1_rgb)) ) ) { sal_uInt16 nNestCnt = 0; - ::rtl::OUStringBuffer sTmpBuffer2( 64L ); + OUStringBuffer sTmpBuffer2( 64L ); do { sTmpBuffer2.append( cNextCh ); switch( cNextCh ) diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 01dd8bd51ef1..9c929b2e791e 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -1426,11 +1426,11 @@ void SwHTMLParser::NextToken( int nToken ) break; case HTML_NONBREAKSPACE: - pDoc->InsertString( *pPam, rtl::OUString(CHAR_HARDBLANK) ); + pDoc->InsertString( *pPam, OUString(CHAR_HARDBLANK) ); break; case HTML_SOFTHYPH: - pDoc->InsertString( *pPam, rtl::OUString(CHAR_SOFTHYPHEN) ); + pDoc->InsertString( *pPam, OUString(CHAR_SOFTHYPHEN) ); break; case HTML_LINEFEEDCHAR: @@ -1952,7 +1952,7 @@ void SwHTMLParser::NextToken( int nToken ) } else { - rtl::OUStringBuffer aComment; + OUStringBuffer aComment; aComment.append('<').append(aToken).append('>'); InsertComment( aComment.makeStringAndClear() ); } @@ -2021,7 +2021,7 @@ void SwHTMLParser::NextToken( int nToken ) if( bInsertUnknown ) { - String aComment(rtl::OUString("HTML: <")); + String aComment(OUString("HTML: <")); if( (HTML_TOKEN_ONOFF & nToken) != 0 && (1 & nToken) != 0 ) aComment += '/'; aComment += sSaveToken; @@ -2834,7 +2834,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, IDocumentMarkAccess::BOOKMARK ); // jump to bookmark - if( JUMPTO_MARK == eJumpTo && pNewMark->GetName() == ::rtl::OUString(sJmpMark) ) + if( JUMPTO_MARK == eJumpTo && pNewMark->GetName() == OUString(sJmpMark) ) { bChkJumpMark = sal_True; eJumpTo = JUMPTO_NONE; @@ -5001,7 +5001,7 @@ void SwHTMLParser::InsertSpacer() else { NewAttr( &aAttrTab.pKerning, SvxKerningItem( (short)nSize, RES_CHRATR_KERNING ) ); - rtl::OUString aTmp( ' ' ); + OUString aTmp( ' ' ); pDoc->InsertString( *pPam, aTmp ); EndAttr( aAttrTab.pKerning ); } @@ -5205,7 +5205,7 @@ void SwHTMLParser::InsertLineBreak() { // wenn kein CLEAR ausgefuehrt werden sollte oder konnte, wird // ein Zeilenumbruch eingef?gt - rtl::OUString sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-) + OUString sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-) pDoc->InsertString( *pPam, sTmp ); } else if( pPam->GetPoint()->nContent.GetIndex() ) @@ -5437,7 +5437,7 @@ void SwHTMLParser::ParseMoreMetaOptions() return; } - rtl::OUStringBuffer sText; + OUStringBuffer sText; sText.append("HTML: <"); sText.append(OOO_STRING_SVTOOLS_HTML_meta); sText.append(' '); @@ -5557,10 +5557,10 @@ bool SwHTMLParser::ParseMetaOptions( } // override so we can parse DOCINFO field subtypes INFO[1-4] -void SwHTMLParser::AddMetaUserDefined( ::rtl::OUString const & i_rMetaName ) +void SwHTMLParser::AddMetaUserDefined( OUString const & i_rMetaName ) { // unless we already have 4 names, append the argument to m_InfoNames - ::rtl::OUString* pName // the first empty string in m_InfoNames + OUString* pName // the first empty string in m_InfoNames (m_InfoNames[0].isEmpty() ? &m_InfoNames[0] : (m_InfoNames[1].isEmpty() ? &m_InfoNames[1] : (m_InfoNames[2].isEmpty() ? &m_InfoNames[2] : diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 723795e7c924..d628185827ae 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -471,7 +471,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient sal_Bool bRemoveHidden : 1; // the filter implementation might set the hidden flag /// the names corresponding to the DOCINFO field subtypes INFO[1-4] - ::rtl::OUString m_InfoNames[4]; + OUString m_InfoNames[4]; SfxViewFrame* pTempViewFrame; @@ -749,7 +749,7 @@ private: void AddScriptSource(); // ein Event in die SFX-Konfiguation eintragen (htmlbas.cxx) - void InsertBasicDocEvent( rtl::OUString aEventName, const String& rName, + void InsertBasicDocEvent( OUString aEventName, const String& rName, ScriptType eScrType, const String& rScrType ); // ein Event an ein VC-Control anhaengen (htmlform.cxx) @@ -891,7 +891,7 @@ protected: // If the document is removed, remove the parser as well virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); - virtual void AddMetaUserDefined( ::rtl::OUString const & i_rMetaName ); + virtual void AddMetaUserDefined( OUString const & i_rMetaName ); public: diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index c0eb4076026b..5eff6f95db1d 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -189,7 +189,7 @@ sal_uLong SwHTMLWriter::WriteStream() const sal_Char *pHelpHack = getenv( "HelpEx" ); if( pHelpHack ) { - rtl::OString aTmp(pHelpHack); + OString aTmp(pHelpHack); if (aTmp.equalsIgnoreAsciiCase("Hilfe")) nHTMLMode |= HTMLMODE_NO_BR_AT_PAREND; } @@ -279,7 +279,7 @@ sal_uLong SwHTMLWriter::WriteStream() GetNumInfo().Clear(); pNextNumRuleInfo = 0; - rtl::OString aStartTags; + OString aStartTags; // Tabellen und Bereiche am Doc.-Anfang beachten { @@ -310,11 +310,11 @@ sal_uLong SwHTMLWriter::WriteStream() "Export gelinkter Bereiche am Dok-Anfang ist nicht implemntiert" ); // nur das Tag fuer die Section merken - rtl::OString aName = HTMLOutFuncs::ConvertStringToHTML( + OString aName = HTMLOutFuncs::ConvertStringToHTML( pSNd->GetSection().GetSectionName(), eDestEnc, &aNonConvertableCharacters ); - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division) .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id) .append("=\"").append(aName).append('\"').append('>') @@ -526,7 +526,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, const sal_Char *pTag = pCol ? OOO_STRING_SVTOOLS_HTML_multicol : OOO_STRING_SVTOOLS_HTML_division; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(pTag); const String& rName = rSection.GetSectionName(); @@ -851,7 +851,7 @@ static void OutBodyColor( const sal_Char *pTag, const SwFmt *pFmt, if( pColorItem ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(' ').append(pTag).append('='); rHWrt.Strm() << sOut.makeStringAndClear().getStr(); Color aColor( pColorItem->GetValue() ); @@ -907,7 +907,7 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs() const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(OOO_STRING_SVTOOLS_HTML_doctype).append(' ') .append(OOO_STRING_SVTOOLS_HTML_doctype40); HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.makeStringAndClear().getStr() ); @@ -922,7 +922,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) IncIndentLevel(); // Inhalt von einruecken // DokumentInfo - rtl::OString sIndent = GetIndentString(); + OString sIndent = GetIndentString(); using namespace ::com::sun::star; uno::Reference xDocProps; SwDocShell *pDocShell(pDoc->GetDocShell()); @@ -1029,7 +1029,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) void SwHTMLWriter::OutAnchor( const String& rName ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\""); Strm() << sOut.makeStringAndClear().getStr(); @@ -1130,7 +1130,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, /// only checking, if transparency is not set. if( rBackColor.GetColor() != COL_TRANSPARENT ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append('='); Strm() << sOut.makeStringAndClear().getStr(); HTMLOutFuncs::Out_Color( Strm(), rBackColor, eDestEnc); @@ -1152,7 +1152,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, if(pTempFileName) rEmbGrfNm = *pTempFileName; sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rEmbGrfNm, - rtl::OUString("JPG"), + OUString("JPG"), XOUTBMP_USE_NATIVE_IF_POSSIBLE ); if( !nErr ) // fehlerhaft, da ist nichts auszugeben { @@ -1218,7 +1218,7 @@ void SwHTMLWriter::OutLanguage( LanguageType nLang ) { if( LANGUAGE_DONTKNOW != nLang ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_lang) .append("=\""); Strm() << sOut.makeStringAndClear().getStr(); @@ -1267,16 +1267,16 @@ void SwHTMLWriter::OutDirection( sal_uInt16 nDir ) } if( pValue != 0 ) { - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_dir) .append("=\"").append(pValue).append('\"'); Strm() << sOut.makeStringAndClear().getStr(); } } -rtl::OString SwHTMLWriter::GetIndentString(sal_uInt16 nIncLvl) +OString SwHTMLWriter::GetIndentString(sal_uInt16 nIncLvl) { - rtl::OString sRet; + OString sRet; // etwas umstaendlich, aber wir haben nur einen Indent-String! sal_uInt16 nLevel = nIndentLvl + nIncLvl; diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 5b68aaeca0aa..9d8bbf9a66fd 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -218,7 +218,7 @@ struct SwHTMLFmtInfo const SwFmt *pFmt; // das Format selbst const SwFmt *pRefFmt; // das Vergleichs-Format - rtl::OString aToken; // das auszugebende Token + OString aToken; // das auszugebende Token String aClass; // die auszugebende Klasse SfxItemSet *pItemSet; // der auszugebende Attribut-Set @@ -444,7 +444,7 @@ public: inline void OutCSS1_PropertyAscii( const sal_Char *pProp, const sal_Char *pVal ); inline void OutCSS1_PropertyAscii( const sal_Char *pProp, - const rtl::OString& rVal ); + const OString& rVal ); inline void OutCSS1_Property( const sal_Char *pProp, const String& rVal ); void OutCSS1_Property( const sal_Char *pProp, const sal_Char *pVal, const String *pSVal ); @@ -469,8 +469,8 @@ public: // ALT/ALIGN/WIDTH/HEIGHT/HSPACE/VSPACE-Optionen des aktuellen // Frame-Formats ausgeben und ggf. ein
      vorne an // rEndTags anhaengen - rtl::OString OutFrmFmtOptions( const SwFrmFmt& rFrmFmt, const String& rAltTxt, - sal_uInt32 nFrmOpts, const rtl::OString& rEndTags = rtl::OString() ); + OString OutFrmFmtOptions( const SwFrmFmt& rFrmFmt, const String& rAltTxt, + sal_uInt32 nFrmOpts, const OString& rEndTags = OString() ); void OutCSS1_TableFrmFmtOptions( const SwFrmFmt& rFrmFmt ); void OutCSS1_TableCellBorderHack(const SwFrmFmt& rFrmFmt); void OutCSS1_SectionFmtOptions( const SwFrmFmt& rFrmFmt, const SwFmtCol *pCol ); @@ -483,7 +483,7 @@ public: void IncIndentLevel() { nIndentLvl++; } void DecIndentLevel() { if ( nIndentLvl ) nIndentLvl--; } - rtl::OString GetIndentString(sal_uInt16 nIncLvl = 0); + OString GetIndentString(sal_uInt16 nIncLvl = 0); xub_StrLen GetLineLen() { return (xub_StrLen)(Strm().Tell()-nLastLFPos); } void OutNewLine( sal_Bool bCheck=sal_False ); @@ -520,7 +520,7 @@ public: static const SdrObject *GetHTMLControl( const SwDrawFrmFmt& rFmt ); static const SdrObject *GetMarqueeTextObj( const SwDrawFrmFmt& rFmt ); - static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToken, + static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, OString& rToken, String& rClass, sal_uInt16& rRefPoolId, String *pPseudo=0 ); @@ -574,7 +574,7 @@ inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp, } inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp, - const rtl::OString& rVal ) + const OString& rVal ) { OutCSS1_Property( pProp, rVal.getStr(), 0 ); } diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 00a01725e345..60fd30b26626 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -398,14 +398,14 @@ namespace sw class WrtRedlineAuthor : public boost::noncopyable { protected: - std::vector maAuthors; // Array of Sw - Bookmarknames + std::vector maAuthors; // Array of Sw - Bookmarknames sal_uInt16 GetPos( const String& rNm ); public: WrtRedlineAuthor() {} virtual ~WrtRedlineAuthor() {} - sal_uInt16 AddName( const rtl::OUString& rNm ); + sal_uInt16 AddName( const OUString& rNm ); virtual void Write(Writer &rWrt) = 0; // std::vector GetNames(); }; diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 8cb8a50c4c3a..634d4bc9ff21 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -1069,7 +1069,7 @@ SwFltShell::~SwFltShell() SwDoc& rDoc = GetDoc(); // 1. SectionFmt und Section anlegen SwSectionFmt* pSFmt = rDoc.MakeSectionFmt( 0 ); - SwSectionData aSectionData(CONTENT_SECTION, rtl::OUString("PMW-Protect")); + SwSectionData aSectionData(CONTENT_SECTION, OUString("PMW-Protect")); aSectionData.SetProtectFlag( true ); // 2. Start- und EndIdx suchen const SwNode* pEndNd = &rDoc.GetNodes().GetEndOfContent(); @@ -1143,13 +1143,13 @@ OUString SwFltShell::QuoteStr( const OUString& rIn ) SwFltShell& SwFltShell::operator << ( const sal_Unicode c ) { OSL_ENSURE( eSubMode != Style, "char insert while in style-mode"); - GetDoc().InsertString( *pPaM, rtl::OUString(c) ); + GetDoc().InsertString( *pPaM, OUString(c) ); return *this; } SwFltShell& SwFltShell::AddError( const sal_Char* pErr ) { - String aName(rtl::OUString("ErrorTag")); + String aName(OUString("ErrorTag")); SwFieldType* pFT = GetDoc().GetFldType( RES_SETEXPFLD, aName, false ); if( pFT == 0) { @@ -1157,7 +1157,7 @@ SwFltShell& SwFltShell::AddError( const sal_Char* pErr ) pFT = GetDoc().InsertFldType(aS); } SwSetExpField aFld( (SwSetExpFieldType*)pFT, - rtl::OUString::createFromAscii( pErr )); + OUString::createFromAscii( pErr )); //, VVF_INVISIBLE GetDoc().InsertPoolItem(*pPaM, SwFmtFld(aFld), 0); return *this; diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index 38b744b4b465..3ccddb0a63fd 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -61,7 +61,7 @@ sal_Unicode Ww1PlainText::operator [] ( sal_uLong ulOffset ) if( rFib.GetStream().Seek( ulFilePos + ulOffset ) == ulFilePos+ulOffset && rFib.GetStream().Read( &cRead, sizeof( cRead ) ) == sizeof( cRead ) ) { - cRet = rtl::OUString(&cRead, 1, RTL_TEXTENCODING_MS_1252).toChar(); + cRet = OUString(&cRead, 1, RTL_TEXTENCODING_MS_1252).toChar(); } else cRet = ' '; @@ -77,7 +77,7 @@ String Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const bool bSeekOk = rFib.GetStream().Seek(nPos) == nPos; return bSeekOk ? read_uInt8s_ToOUString(rFib.GetStream(), nLen, RTL_TEXTENCODING_MS_1252) : - rtl::OUString(); + OUString(); } ///////////////////////////////////////////////////////////////// Style @@ -928,7 +928,7 @@ long Ww1Bookmarks::Len() const const String Ww1Bookmarks::GetName() const { if( nIsEnd ) - return rtl::OUString("???"); + return OUString("???"); return aNames.GetStr( nPlcIdx[0] ); } @@ -1033,12 +1033,12 @@ Ww1Assoc::Ww1Assoc(Ww1Fib& _rFib) String Ww1Assoc::GetStr(sal_uInt16 code) { - rtl::OStringBuffer sRet; + OStringBuffer sRet; OSL_ENSURE(code(rStr.getLength()); @@ -147,11 +147,11 @@ void WW8FFData::Write(SvStream * pDataStrm) sal_uInt32 nListboxEntries = msListEntries.size(); *pDataStrm << nListboxEntries; - ::std::vector< ::rtl::OUString >::const_iterator aIt = msListEntries.begin(); + ::std::vector< OUString >::const_iterator aIt = msListEntries.begin(); while (aIt != msListEntries.end()) { - const ::rtl::OUString & rEntry = *aIt; + const OUString & rEntry = *aIt; WriteOUString(pDataStrm, rEntry, false); ++aIt; diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx index 9d90866e7a8e..0b639af3a1c8 100644 --- a/sw/source/filter/ww8/WW8FFData.hxx +++ b/sw/source/filter/ww8/WW8FFData.hxx @@ -48,19 +48,19 @@ private: sal_uInt16 mnCheckboxHeight; // offset 10 and beyond - ::rtl::OUString msName; - ::rtl::OUString msDefault; // only for type == 0 + OUString msName; + OUString msDefault; // only for type == 0 sal_uInt16 mnDefault; // only for type != 0 - ::rtl::OUString msFormat; - ::rtl::OUString msHelp; - ::rtl::OUString msStatus; - ::rtl::OUString msMacroEnter; - ::rtl::OUString msMacroExit; + OUString msFormat; + OUString msHelp; + OUString msStatus; + OUString msMacroEnter; + OUString msMacroExit; - ::std::vector< ::rtl::OUString > msListEntries; + ::std::vector< OUString > msListEntries; protected: - void WriteOUString(SvStream * pStream, const ::rtl::OUString & rStr, bool bAddZero); + void WriteOUString(SvStream * pStream, const OUString & rStr, bool bAddZero); public: WW8FFData(); @@ -84,24 +84,24 @@ public: sal_uInt16 getMaxLen() const { return mnMaxLen; } void setCheckboxHeight(sal_uInt16 nCheckboxHeight) { mnCheckboxHeight = nCheckboxHeight; } sal_uInt16 getCheckboxHeight() const { return mnCheckboxHeight; } - void setName(const ::rtl::OUString & rName) { msName = rName; } - const ::rtl::OUString & getName() const { return msName; } - void setDefaultString(const ::rtl::OUString & rDefault) { msDefault = rDefault; } - const ::rtl::OUString & getDefaultString() const { return msDefault; } + void setName(const OUString & rName) { msName = rName; } + const OUString & getName() const { return msName; } + void setDefaultString(const OUString & rDefault) { msDefault = rDefault; } + const OUString & getDefaultString() const { return msDefault; } void setDefaultResult(sal_uInt16 nDefault) { mnDefault = nDefault; } sal_uInt16 getDefaultResult() const { return mnDefault; } - void setFormat(const ::rtl::OUString & rFormat) { msFormat = rFormat; } - const ::rtl::OUString & getFormat() const { return msFormat; } - void setHelp(const ::rtl::OUString & rHelp); - const ::rtl::OUString getHelp() const { return msHelp; } - void setStatus(const ::rtl::OUString & rStatus); - const ::rtl::OUString & getStatus() const { return msStatus; } - void setMacroEnter(const ::rtl::OUString & rMacroEnter) { msMacroEnter = rMacroEnter; } - const ::rtl::OUString & getMacroEnter() const { return msMacroEnter; } - void setMacroExit(const ::rtl::OUString & rMacroExit) { msMacroExit = rMacroExit; } - const ::rtl::OUString & getMacroExit() const { return msMacroExit; } + void setFormat(const OUString & rFormat) { msFormat = rFormat; } + const OUString & getFormat() const { return msFormat; } + void setHelp(const OUString & rHelp); + const OUString getHelp() const { return msHelp; } + void setStatus(const OUString & rStatus); + const OUString & getStatus() const { return msStatus; } + void setMacroEnter(const OUString & rMacroEnter) { msMacroEnter = rMacroEnter; } + const OUString & getMacroEnter() const { return msMacroEnter; } + void setMacroExit(const OUString & rMacroExit) { msMacroExit = rMacroExit; } + const OUString & getMacroExit() const { return msMacroExit; } - void addListboxEntry(const ::rtl::OUString & rEntry); + void addListboxEntry(const OUString & rEntry); void Write(SvStream * pDataStrm); }; diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index 0f6705911faa..b791df619734 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -64,10 +64,10 @@ namespace ww8 return nResult; } - ::rtl::OUString WW8Struct::getUString(sal_uInt32 nOffset, + OUString WW8Struct::getUString(sal_uInt32 nOffset, sal_uInt32 nCount) { - ::rtl::OUString aResult; + OUString aResult; if (nCount > 0) { @@ -79,10 +79,10 @@ namespace ww8 if (nCount > nAvailable) nCount = nAvailable; #if defined OSL_LITENDIAN - aResult = rtl::OUString(reinterpret_cast( + aResult = OUString(reinterpret_cast( mp_data.get() + nStartOff), nCount); #else - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; for (sal_uInt32 i = 0; i < nCount; ++i) aBuf.append(static_cast(getU16(nStartOff+i*2))); aResult = aBuf.makeStringAndClear(); diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx index 5cc79a5d7bca..b7187546d0fa 100644 --- a/sw/source/filter/ww8/WW8Sttbf.hxx +++ b/sw/source/filter/ww8/WW8Sttbf.hxx @@ -48,12 +48,12 @@ class WW8Struct : public ::sw::ExternalData sal_uInt32 getU32(sal_uInt32 nOffset) { return getU16(nOffset) + (getU16(nOffset + 1) << 16); } - ::rtl::OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount); + OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount); - ::rtl::OUString getString(sal_uInt32 nOffset, sal_uInt32 nCount); + OUString getString(sal_uInt32 nOffset, sal_uInt32 nCount); }; -typedef ::std::vector StringVector_t; +typedef ::std::vector StringVector_t; template class WW8Sttb : public WW8Struct { @@ -68,7 +68,7 @@ typedef ::std::vector StringVector_t; virtual ~WW8Sttb(); sal_uInt32 getCount() const; - ::rtl::OUString getEntry(sal_uInt32 nEntry) const + OUString getEntry(sal_uInt32 nEntry) const { return m_Strings[nEntry]; } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1216829af07e..5f5934f156ca 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -120,7 +120,7 @@ using namespace ::com::sun::star; class FFDataWriterHelper { ::sax_fastparser::FSHelperPtr m_pSerializer; - void writeCommonStart( const rtl::OUString& rName ) + void writeCommonStart( const OUString& rName ) { m_pSerializer->startElementNS( XML_w, XML_ffData, FSEND ); m_pSerializer->singleElementNS( XML_w, XML_name, @@ -137,7 +137,7 @@ class FFDataWriterHelper } public: FFDataWriterHelper( const ::sax_fastparser::FSHelperPtr pSerializer ) : m_pSerializer( pSerializer ){} - void WriteFormCheckbox( const rtl::OUString& rName, const rtl::OUString& rDefault, bool bChecked ) + void WriteFormCheckbox( const OUString& rName, const OUString& rDefault, bool bChecked ) { writeCommonStart( rName ); // Checkbox specific bits @@ -150,14 +150,14 @@ public: { m_pSerializer->singleElementNS( XML_w, XML_default, FSNS( XML_w, XML_val ), - rtl::OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); + OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); } if ( bChecked ) m_pSerializer->singleElementNS( XML_w, XML_checked, FSEND ); m_pSerializer->endElementNS( XML_w, XML_checkBox ); writeFinish(); } - void WriteFormText( const rtl::OUString& rName, const rtl::OUString& rDefault ) + void WriteFormText( const OUString& rName, const OUString& rDefault ) { writeCommonStart( rName ); if ( !rDefault.isEmpty() ) @@ -165,7 +165,7 @@ public: m_pSerializer->startElementNS( XML_w, XML_textInput, FSEND ); m_pSerializer->singleElementNS( XML_w, XML_default, FSNS( XML_w, XML_val ), - rtl::OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); + OUStringToOString( rDefault, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); m_pSerializer->endElementNS( XML_w, XML_textInput ); } writeFinish(); @@ -177,9 +177,9 @@ class FieldMarkParamsHelper const sw::mark::IFieldmark& mrFieldmark; public: FieldMarkParamsHelper( const sw::mark::IFieldmark& rFieldmark ) : mrFieldmark( rFieldmark ) {} - rtl::OUString getName() { return mrFieldmark.GetName(); } + OUString getName() { return mrFieldmark.GetName(); } template < typename T > - bool extractParam( const rtl::OUString& rKey, T& rResult ) + bool extractParam( const OUString& rKey, T& rResult ) { bool bResult = false; if ( mrFieldmark.GetParameters() ) @@ -706,8 +706,8 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) const ::sw::mark::IFieldmark& rFieldmark = *rInfos.pFieldmark; if ( rInfos.eType == ww::eFORMDROPDOWN ) { - uno::Sequence< ::rtl::OUString> vListEntries; - rtl::OUString sName, sHelp, sToolTip, sSelected; + uno::Sequence< OUString> vListEntries; + OUString sName, sHelp, sToolTip, sSelected; FieldMarkParamsHelper params( rFieldmark ); params.extractParam( ODF_FORMDROPDOWN_LISTENTRY, vListEntries ); @@ -724,7 +724,7 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) } else if ( rInfos.eType == ww::eFORMCHECKBOX ) { - rtl::OUString sName; + OUString sName; bool bChecked = false; FieldMarkParamsHelper params( rFieldmark ); @@ -735,13 +735,13 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) bChecked = true; FFDataWriterHelper ffdataOut( m_pSerializer ); - ffdataOut.WriteFormCheckbox( sName, rtl::OUString(), bChecked ); + ffdataOut.WriteFormCheckbox( sName, OUString(), bChecked ); } else if ( rInfos.eType == ww::eFORMTEXT ) { FieldMarkParamsHelper params( rFieldmark ); FFDataWriterHelper ffdataOut( m_pSerializer ); - ffdataOut.WriteFormText( params.getName(), rtl::OUString() ); + ffdataOut.WriteFormText( params.getName(), OUString() ); } } @@ -767,7 +767,7 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, bool bWriteRun ) if ( rInfos.pField ) { const SwDropDownField& rFld2 = *(SwDropDownField*)rInfos.pField; - uno::Sequence aItems = + uno::Sequence aItems = rFld2.GetItemSequence(); GetExport().DoComboBox(rFld2.GetName(), rFld2.GetHelp(), @@ -836,7 +836,7 @@ void DocxAttributeOutput::CmdField_Impl( FieldInfos& rInfos ) // Replace tabs by if ( i < ( nNbToken - 1 ) ) - RunText( rtl::OUString( "\t" ) ); + RunText( OUString( "\t" ) ); } m_pSerializer->endElementNS( XML_w, XML_r ); @@ -1285,7 +1285,7 @@ bool DocxAttributeOutput::StartURL( const String& rUrl, const String& rTarget ) { OUString osUrl( sUrl ); - OString sId = rtl::OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(), + OString sId = OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(), "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", osUrl, true ), RTL_TEXTENCODING_UTF8 ); @@ -3671,7 +3671,7 @@ void DocxAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines ) void DocxAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ) { m_pSerializer->singleElementNS( XML_w, XML_w, - FSNS( XML_w, XML_val ), rtl::OString::valueOf( sal_Int32( rScaleWidth.GetValue() ) ).getStr(), FSEND ); + FSNS( XML_w, XML_val ), OString::valueOf( sal_Int32( rScaleWidth.GetValue() ) ).getStr(), FSEND ); } void DocxAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief ) @@ -3774,9 +3774,9 @@ void DocxAttributeOutput::WritePostitFields() OString idstr = OString::valueOf( sal_Int32( i )); const SwPostItField* f = m_postitFields[ i ]; m_pSerializer->startElementNS( XML_w, XML_comment, FSNS( XML_w, XML_id ), idstr.getStr(), - FSNS( XML_w, XML_author ), rtl::OUStringToOString( f->GetPar1(), RTL_TEXTENCODING_UTF8 ).getStr(), + FSNS( XML_w, XML_author ), OUStringToOString( f->GetPar1(), RTL_TEXTENCODING_UTF8 ).getStr(), FSNS( XML_w, XML_date ), msfilter::util::DateTimeToOString(f->GetDateTime()).getStr(), - FSNS( XML_w, XML_initials ), rtl::OUStringToOString( f->GetInitials(), RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); + FSNS( XML_w, XML_initials ), OUStringToOString( f->GetInitials(), RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); // Check for the text object existing, it seems that it can be NULL when saving a newly created // comment without giving focus back to the main document. As GetTxt() is empty in that case as well, // that is probably a bug in the Writer core. @@ -3934,7 +3934,7 @@ void DocxAttributeOutput::FootnoteEndnoteReference() { // autonumbered m_pSerializer->singleElementNS( XML_w, nToken, - FSNS( XML_w, XML_id ), ::rtl::OString::valueOf( nId ).getStr(), + FSNS( XML_w, XML_id ), OString::valueOf( nId ).getStr(), FSEND ); } else @@ -3942,7 +3942,7 @@ void DocxAttributeOutput::FootnoteEndnoteReference() // not autonumbered m_pSerializer->singleElementNS( XML_w, nToken, FSNS( XML_w, XML_customMarkFollows ), "1", - FSNS( XML_w, XML_id ), ::rtl::OString::valueOf( nId ).getStr(), + FSNS( XML_w, XML_id ), OString::valueOf( nId ).getStr(), FSEND ); RunText( pFootnote->GetNumStr() ); @@ -4050,7 +4050,7 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr fs->singleElementNS( XML_w, XML_numFmt, FSNS( XML_w, XML_val ), fmt, FSEND ); if( info.nFtnOffset != 0 ) fs->singleElementNS( XML_w, XML_numStart, FSNS( XML_w, XML_val ), - rtl::OString::valueOf( sal_Int32( info.nFtnOffset + 1 )).getStr(), FSEND ); + OString::valueOf( sal_Int32( info.nFtnOffset + 1 )).getStr(), FSEND ); if( listtag != 0 ) // we are writing to settings.xml, write also special footnote/endnote list { // there are currently only two hardcoded ones ( see FootnotesEndnotes()) fs->singleElementNS( XML_w, listtag, FSNS( XML_w, XML_id ), "0", FSEND ); diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 7c33d0764aae..050980eefc8b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -273,7 +273,7 @@ public: void WriteField_Impl( const SwField* pFld, ww::eField eType, const String& rFldCmd, sal_uInt8 nMode ); void WriteFormData_Impl( const ::sw::mark::IFieldmark& rFieldmark ); - void WriteBookmarks_Impl( std::vector< rtl::OUString >& rStarts, std::vector< rtl::OUString >& rEnds ); + void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds ); private: /// Initialize the structures where we are going to collect some of the paragraph properties. @@ -589,8 +589,8 @@ private: sal_Int32 m_nNextMarkId; /// Bookmarks to output - std::vector m_rMarksStart; - std::vector m_rMarksEnd; + std::vector m_rMarksStart; + std::vector m_rMarksEnd; /// Is there a postit start to output? bool m_bPostitStart; @@ -598,7 +598,7 @@ private: bool m_bPostitEnd; /// Maps of the bookmarks ids - std::map m_rOpenedMarksIds; + std::map m_rOpenedMarksIds; /// The current table helper SwWriteTable *m_pTableWrt; diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index e7bec6f95d61..b25b1eb86340 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -160,12 +160,12 @@ void DocxExport::ExportGrfBullet(const SwTxtNode&) CollectGrfsOfBullets(); } -::rtl::OString DocxExport::AddRelation( const OUString& rType, const OUString& rTarget ) +OString DocxExport::AddRelation( const OUString& rType, const OUString& rTarget ) { OUString sId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), rType, rTarget, true ); - return ::rtl::OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); } bool DocxExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt ) @@ -240,11 +240,11 @@ void DocxExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& /*rFieldmark* #endif } -void DocxExport::DoComboBox(const rtl::OUString& rName, - const rtl::OUString& rHelp, - const rtl::OUString& rToolTip, - const rtl::OUString& rSelected, - uno::Sequence& rListItems) +void DocxExport::DoComboBox(const OUString& rName, + const OUString& rHelp, + const OUString& rToolTip, + const OUString& rSelected, + uno::Sequence& rListItems) { m_pDocumentFS->startElementNS( XML_w, XML_ffData, FSEND ); @@ -278,7 +278,7 @@ void DocxExport::DoComboBox(const rtl::OUString& rName, } m_pDocumentFS->singleElementNS( XML_w, XML_result, - FSNS( XML_w, XML_val ), rtl::OString::valueOf( nId ).getStr( ), + FSNS( XML_w, XML_val ), OString::valueOf( nId ).getStr( ), FSEND ); // Loop over the entries @@ -300,7 +300,7 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/) OSL_TRACE( "TODO DocxExport::ForFormText()" ); } -rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount ) +OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount ) { OUString aFileName = "charts/chart" + OUString::valueOf(nCount) + ".xml"; OUString sId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), @@ -314,7 +314,7 @@ rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, s oox::drawingml::ChartExport aChartExport( XML_w, pChartFS, xModel, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX ); aChartExport.ExportContent(); - return ::rtl::OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); } void DocxExport::ExportDocument_Impl() @@ -634,7 +634,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* // and write the reference m_pDocumentFS->singleElementNS( XML_w, nReference, FSNS( XML_w, XML_type ), pType, - FSNS( XML_r, XML_id ), rtl::OUStringToOString( aRelId, RTL_TEXTENCODING_UTF8 ).getStr(), + FSNS( XML_r, XML_id ), OUStringToOString( aRelId, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); } @@ -700,7 +700,7 @@ void DocxExport::WriteSettings() FSEND ); // Zoom - rtl::OString aZoom(rtl::OString::valueOf(sal_Int32(pViewShell->GetViewOptions()->GetZoom()))); + OString aZoom(OString::valueOf(sal_Int32(pViewShell->GetViewOptions()->GetZoom()))); pFS->singleElementNS(XML_w, XML_zoom, FSNS(XML_w, XML_percent), aZoom.getStr(), FSEND); if( pDoc->get( IDocumentSettingAccess::EMBED_FONTS )) pFS->singleElementNS( XML_w, XML_embedTrueTypeFonts, FSEND ); @@ -708,7 +708,7 @@ void DocxExport::WriteSettings() pFS->singleElementNS( XML_w, XML_embedSystemFonts, FSEND ); if( settings.defaultTabStop != 0 ) pFS->singleElementNS( XML_w, XML_defaultTabStop, FSNS( XML_w, XML_val ), - rtl::OString::valueOf( sal_Int32( settings.defaultTabStop )).getStr(), FSEND ); + OString::valueOf( sal_Int32( settings.defaultTabStop )).getStr(), FSEND ); if( settings.evenAndOddHeaders ) pFS->singleElementNS( XML_w, XML_evenAndOddHeaders, FSEND ); diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index ac5637d09469..d8790f8ba420 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -106,12 +106,12 @@ public: virtual void AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub_StrLen nLen ); - virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false ); + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ); virtual void ExportGrfBullet(const SwTxtNode&); /// Returns the relationd id - rtl::OString AddRelation( const rtl::OUString& rType, const rtl::OUString& rTarget ); + OString AddRelation( const OUString& rType, const OUString& rTarget ); virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) { /* FIXME no-op for docx, most probably should not even be in MSWordExportBase */ } virtual void WriteChar( sal_Unicode ) { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); } @@ -131,18 +131,18 @@ public: virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ); virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ); - virtual void DoComboBox(const rtl::OUString &rName, - const rtl::OUString &rHelp, - const rtl::OUString &ToolTip, - const rtl::OUString &rSelected, - com::sun::star::uno::Sequence &rListItems); + virtual void DoComboBox(const OUString &rName, + const OUString &rHelp, + const OUString &ToolTip, + const OUString &rSelected, + com::sun::star::uno::Sequence &rListItems); virtual void DoFormText(const SwInputField * pFld); virtual sal_uLong ReplaceCr( sal_uInt8 nChar ); /// Returns the relationd id - rtl::OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount ); + OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount ); void WriteOutliner(const OutlinerParaObject& rOutliner, sal_uInt8 nTyp); @@ -165,7 +165,7 @@ protected: /// Output SwOLENode virtual void OutputOLENode( const SwOLENode& ); - virtual void OutputLinkedOLE( const rtl::OUString& ); + virtual void OutputLinkedOLE( const OUString& ); virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ); diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index 7f92fc6ff894..c18ea97a33eb 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.hxx @@ -47,7 +47,7 @@ public: private: /// Implementatio of the filter abstract method. - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; virtual ::oox::ole::VbaProject* implCreateVbaProject() const { diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx index dad80d0ab2c5..189e4b17ed72 100644 --- a/sw/source/filter/ww8/hash_wrap.hxx +++ b/sw/source/filter/ww8/hash_wrap.hxx @@ -65,7 +65,7 @@ namespace ww } #if OSL_DEBUG_LEVEL > 1 bool bBroken=false; - rtl::OUString sError; + OUString sError; pIter = pWwSprmTab; const C *pBeforeEnd = pWwSprmTab + nNoElems - 1; while (pIter < pBeforeEnd) @@ -88,11 +88,11 @@ namespace ww reinterpret_cast(&(*pIter)); for (size_t i=0; i < nSize; ++i) { - sError += rtl::OUString::valueOf( + sError += OUString::valueOf( static_cast(pHack[i]), 16); - sError += rtl::OUString::valueOf(sal_Unicode(' ')); + sError += OUString::valueOf(sal_Unicode(' ')); } - sError += rtl::OUString::valueOf(sal_Unicode('\n')); + sError += OUString::valueOf(sal_Unicode('\n')); while (*pIter == *(pIter+1) && pIter < pBeforeEnd) ++pIter; } @@ -101,7 +101,7 @@ namespace ww } if (bBroken) { - OSL_FAIL( rtl::OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OSL_FAIL( OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() ); } #endif } diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 9636254b19a3..ce0c1e0f65cd 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1435,7 +1435,7 @@ void RtfAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField /*eTyp m_aRunText->append("}}"); } -void RtfAttributeOutput::WriteBookmarks_Impl( std::vector< rtl::OUString >& rStarts, std::vector< rtl::OUString >& rEnds ) +void RtfAttributeOutput::WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds ) { for ( std::vector< OUString >::const_iterator it = rStarts.begin(), end = rStarts.end(); it != end; ++it ) { @@ -3273,7 +3273,7 @@ OString RtfAttributeOutput::WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, S static void lcl_AppendSP( OStringBuffer& rBuffer, const char cName[], - const ::rtl::OUString& rValue, + const OUString& rValue, const RtfExport& rExport ) { rBuffer.append( "{" OOO_STRING_SVTOOLS_RTF_SP "{" ); // "{\sp{" diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index fb40139341f4..5038f32787d2 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -73,8 +73,8 @@ public: virtual void RunText( const String& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ); // Access to (anyway) private buffers, used by the sdr exporter - rtl::OStringBuffer& RunText(); - rtl::OStringBuffer& Styles(); + OStringBuffer& RunText(); + OStringBuffer& Styles(); /// Output text (without markup). virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ); @@ -206,7 +206,7 @@ public: const SvxBrushItem* pBrush = 0);//For i120928,to export graphic of bullet void WriteField_Impl( const SwField* pFld, ww::eField eType, const String& rFldCmd, sal_uInt8 nMode ); - void WriteBookmarks_Impl( std::vector< rtl::OUString >& rStarts, std::vector< rtl::OUString >& rEnds ); + void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds ); void WriteHeaderFooter_Impl( const SwFrmFmt& rFmt, bool bHeader, const sal_Char* pStr, bool bTitlepg ); protected: @@ -456,20 +456,20 @@ private: /* * This is written after runs. */ - rtl::OStringBuffer m_aAfterRuns; + OStringBuffer m_aAfterRuns; /* * Same for colors and stylesheets: first we just want to output colors, * need to buffer the stylesheet table to output it after the color one. */ - rtl::OStringBuffer m_aStylesheet; + OStringBuffer m_aStylesheet; /* * This one just holds the style commands in the current style. */ - rtl::OStringBuffer m_aStyles; + OStringBuffer m_aStyles; /* * This is the same as m_aStyles but the conents of it is written last. */ - rtl::OStringBuffer m_aStylesEnd; + OStringBuffer m_aStylesEnd; /* * We just get a "end of strike" mark at the end of strike, store here what to finish: single or double strike. @@ -499,7 +499,7 @@ private: /* * For late output of row definitions. */ - rtl::OStringBuffer m_aRowDefs; + OStringBuffer m_aRowDefs; /* * Is a column break needed after the next \par? @@ -510,14 +510,14 @@ private: * If section breaks should be buffered to m_aSectionBreaks */ bool m_bBufferSectionBreaks; - rtl::OStringBuffer m_aSectionBreaks; + OStringBuffer m_aSectionBreaks; /* * If section headers (and footers) should be buffered to * m_aSectionHeaders. */ bool m_bBufferSectionHeaders; - rtl::OStringBuffer m_aSectionHeaders; + OStringBuffer m_aSectionHeaders; /* * Support for starting multiple tables at the same cell. @@ -528,7 +528,7 @@ private: * List of already started but not yet defined tables (need to be defined * after the nested tables). */ - std::vector< rtl::OString > m_aTables; + std::vector< OString > m_aTables; /* * If cell info is already output. */ @@ -560,7 +560,7 @@ public: /// Return the right export class. virtual MSWordExportBase& GetExport(); - rtl::OStringBuffer m_aTabStop; + OStringBuffer m_aTabStop; /// Access to the page style of the previous paragraph. const SwPageDesc* m_pPrevPageDesc; @@ -585,7 +585,7 @@ public: void FontPitchType( FontPitch ePitch ) const; /// Writes binary data as a hex dump. - static rtl::OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream = 0, sal_uInt32 nLimit = 64); + static OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream = 0, sal_uInt32 nLimit = 64); }; #endif // _RTFATTRIBUTEOUTPUT_HXX_ diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 3f413a5293a2..cb769c77ec04 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -317,11 +317,11 @@ void RtfExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& /*rFieldmark*/ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC); } -void RtfExport::DoComboBox(const rtl::OUString& /*rName*/, - const rtl::OUString& /*rHelp*/, - const rtl::OUString& /*rToolTip*/, - const rtl::OUString& /*rSelected*/, - uno::Sequence& /*rListItems*/) +void RtfExport::DoComboBox(const OUString& /*rName*/, + const OUString& /*rHelp*/, + const OUString& /*rToolTip*/, + const OUString& /*rSelected*/, + uno::Sequence& /*rListItems*/) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); @@ -332,10 +332,10 @@ void RtfExport::DoFormText(const SwInputField* pFld ) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); - ::rtl::OUString sResult = pFld->ExpandField(true); - ::rtl::OUString sHelp( pFld->GetHelp() ); - ::rtl::OUString sName = pFld->GetPar2(); - ::rtl::OUString sStatus = pFld->GetToolTip(); + OUString sResult = pFld->ExpandField(true); + OUString sHelp( pFld->GetHelp() ); + OUString sName = pFld->GetPar2(); + OUString sStatus = pFld->GetToolTip(); m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_FIELD "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST "{ FORMTEXT }"); m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FORMFIELD " {" OOO_STRING_SVTOOLS_RTF_FFTYPE "0" ); if( !sHelp.isEmpty() ) @@ -739,7 +739,7 @@ void RtfExport::OutputOLENode( const SwOLENode& ) /* noop, see RtfAttributeOutput::FlyFrameOLE */ } -void RtfExport::OutputLinkedOLE( const rtl::OUString& ) +void RtfExport::OutputLinkedOLE( const OUString& ) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); } diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index e071e5c621f2..4f4f24e78e41 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -26,7 +26,7 @@ class RtfAttributeOutput; class RtfExportFilter; class RtfSdrExport; typedef std::map RtfColorTbl; -typedef std::map RtfStyleTbl; +typedef std::map RtfStyleTbl; typedef std::map RtfRedlineTbl; class SwNode; class SwTxtNode; @@ -71,7 +71,7 @@ public: virtual void AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub_StrLen nLen ); - virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false ); + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ); //For i120928,add an interface to export graphic of bullet virtual void ExportGrfBullet(const SwTxtNode& rNd); @@ -97,11 +97,11 @@ public: virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ); virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ); - virtual void DoComboBox(const rtl::OUString &rName, - const rtl::OUString &rHelp, - const rtl::OUString &ToolTip, - const rtl::OUString &rSelected, - com::sun::star::uno::Sequence &rListItems); + virtual void DoComboBox(const OUString &rName, + const OUString &rHelp, + const OUString &ToolTip, + const OUString &rSelected, + com::sun::star::uno::Sequence &rListItems); virtual void DoFormText(const SwInputField * pFld); @@ -131,7 +131,7 @@ protected: /// Output SwOLENode virtual void OutputOLENode( const SwOLENode& ); - virtual void OutputLinkedOLE(const rtl::OUString&); + virtual void OutputLinkedOLE(const OUString&); virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ); @@ -169,8 +169,8 @@ public: sal_uInt16 GetRedline( const String& rAuthor ); const String* GetRedline( sal_uInt16 nId ); - void InsStyle( sal_uInt16 nId, const rtl::OString& rStyle ); - rtl::OString* GetStyle( sal_uInt16 nId ); + void InsStyle( sal_uInt16 nId, const OString& rStyle ); + OString* GetStyle( sal_uInt16 nId ); private: /// No copying. diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx index db8b2df2e7a1..212adb2a6a43 100644 --- a/sw/source/filter/ww8/rtfexportfilter.hxx +++ b/sw/source/filter/ww8/rtfexportfilter.hxx @@ -61,8 +61,8 @@ public: RtfWriter m_aWriter; }; -::rtl::OUString RtfExport_getImplementationName(); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL RtfExport_getSupportedServiceNames() +OUString RtfExport_getImplementationName(); +::com::sun::star::uno::Sequence< OUString > SAL_CALL RtfExport_getSupportedServiceNames() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL RtfExport_createInstance( const ::com::sun::star::uno::Reference< diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index b21f671c7f2a..bb1d1a02c7e1 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -411,7 +411,7 @@ void RtfSdrExport::AddLineDimensions( const Rectangle& rRectangle ) m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM).append(rRectangle.Bottom()); } -void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle ) +void RtfSdrExport::AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle ) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); @@ -426,7 +426,7 @@ void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Re extern const char* pShapeTypes[]; -static void lcl_AppendSP( ::rtl::OStringBuffer& rRunText, const char cName[], const ::rtl::OString& rValue) +static void lcl_AppendSP( OStringBuffer& rRunText, const char cName[], const OString& rValue) { rRunText.append('{').append(OOO_STRING_SVTOOLS_RTF_SP) .append('{').append(OOO_STRING_SVTOOLS_RTF_SN " ").append(cName).append('}') diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx index edf5a7d92e38..2e8d2dd52fe7 100644 --- a/sw/source/filter/ww8/rtfsdrexport.hxx +++ b/sw/source/filter/ww8/rtfsdrexport.hxx @@ -45,9 +45,9 @@ class RtfSdrExport : public EscherEx sal_uInt32 m_nShapeFlags; /// Remember style, the most important shape attribute ;-) - rtl::OStringBuffer *m_pShapeStyle; + OStringBuffer *m_pShapeStyle; - std::map m_aShapeProps; + std::map m_aShapeProps; /// Remember which shape types we had already written. bool *m_pShapeTypeWritten; @@ -91,7 +91,7 @@ private: void AddLineDimensions( const Rectangle& rRectangle ); /// Add position and size to the OStringBuffer. - void AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle ); + void AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle ); void WriteOutliner(const OutlinerParaObject& rParaObj); diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx b/sw/source/filter/ww8/rtfstringbuffer.cxx index 13546db0d40a..91d3c6170466 100644 --- a/sw/source/filter/ww8/rtfstringbuffer.cxx +++ b/sw/source/filter/ww8/rtfstringbuffer.cxx @@ -50,7 +50,7 @@ void RtfStringBufferValue::makeStringAndClear(RtfAttributeOutput* pAttributeOutp pAttributeOutput->FlyFrameGraphic(m_pFlyFrmFmt, m_pGrfNode); } -rtl::OString RtfStringBufferValue::makeStringAndClear() +OString RtfStringBufferValue::makeStringAndClear() { return m_aBuffer.makeStringAndClear(); } @@ -80,23 +80,23 @@ void RtfStringBuffer::makeStringAndClear(RtfAttributeOutput* pAttributeOutput) i->makeStringAndClear(pAttributeOutput); } -rtl::OString RtfStringBuffer::makeStringAndClear() +OString RtfStringBuffer::makeStringAndClear() { - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; for (RtfStringBuffer::Values_t::iterator i = m_aValues.begin(); i != m_aValues.end(); ++i) if (!i->isGraphic()) aBuf.append(i->makeStringAndClear()); return aBuf.makeStringAndClear(); } -rtl::OStringBuffer& RtfStringBuffer::getLastBuffer() +OStringBuffer& RtfStringBuffer::getLastBuffer() { if (m_aValues.empty() || m_aValues.back().isGraphic()) m_aValues.push_back(RtfStringBufferValue()); return m_aValues.back().m_aBuffer; } -rtl::OStringBuffer* RtfStringBuffer::operator->() +OStringBuffer* RtfStringBuffer::operator->() { return &getLastBuffer(); } diff --git a/sw/source/filter/ww8/rtfstringbuffer.hxx b/sw/source/filter/ww8/rtfstringbuffer.hxx index a6a8a8a35737..b0fc2a152f09 100644 --- a/sw/source/filter/ww8/rtfstringbuffer.hxx +++ b/sw/source/filter/ww8/rtfstringbuffer.hxx @@ -46,10 +46,10 @@ public: /// This version handles graphics. void makeStringAndClear(RtfAttributeOutput* pAttributeOutput); /// This one doesn't. - rtl::OString makeStringAndClear(); + OString makeStringAndClear(); bool isGraphic() const; - rtl::OStringBuffer m_aBuffer; + OStringBuffer m_aBuffer; const SwFlyFrmFmt* m_pFlyFrmFmt; const SwGrfNode* m_pGrfNode; }; @@ -64,10 +64,10 @@ public: /// Writes the contents of the buffer directly to the supplied stream. void makeStringAndClear(RtfAttributeOutput* pAttributeOutput); /// Returns the bufferent strings as a string (ignores graphic elements!) - rtl::OString makeStringAndClear(); + OString makeStringAndClear(); /// Access to the last buffer. - rtl::OStringBuffer& getLastBuffer(); - rtl::OStringBuffer* operator->(); + OStringBuffer& getLastBuffer(); + OStringBuffer* operator->(); /// Similar to ->setLength(0), but for all buffers. void clear(); /// Same as ->append(), but for graphics and without expanding contents to save memory. diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx index f57cb6c17397..9a596edac533 100644 --- a/sw/source/filter/ww8/sortedarray.hxx +++ b/sw/source/filter/ww8/sortedarray.hxx @@ -62,7 +62,7 @@ namespace ww std::sort(mpWwSprmTab, mpWwSprmTab + mnNoElems); #if OSL_DEBUG_LEVEL > 1 bool bBroken=false; - rtl::OUString sError; + OUString sError; const C *pIter = mpWwSprmTab; const C *pBeforeEnd = mpWwSprmTab + mnNoElems - 1; while (pIter < pBeforeEnd) @@ -85,11 +85,11 @@ namespace ww reinterpret_cast(&(*pIter)); for (size_t i=0; i < nSize; ++i) { - sError += rtl::OUString::valueOf( + sError += OUString::valueOf( static_cast(pHack[i]), 16); - sError += rtl::OUString::valueOf(sal_Unicode(' ')); + sError += OUString::valueOf(sal_Unicode(' ')); } - sError += rtl::OUString::valueOf(sal_Unicode('\n')); + sError += OUString::valueOf(sal_Unicode('\n')); while (*pIter == *(pIter+1) && pIter < pBeforeEnd) ++pIter; } @@ -98,7 +98,7 @@ namespace ww } if (bBroken) { - OSL_FAIL( rtl::OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OSL_FAIL( OUStringToOString( sError, RTL_TEXTENCODING_ASCII_US ).getStr() ); } #endif } diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 5c9e6ec42b1a..d903255a557c 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -295,7 +295,7 @@ namespace sw rObj.AbandonObject(); } - bool DrawingOLEAdaptor::TransferToDoc( rtl::OUString &rName ) + bool DrawingOLEAdaptor::TransferToDoc( OUString &rName ) { OSL_ENSURE(mxIPRef.is(), "Transferring invalid object to doc"); if (!mxIPRef.is()) @@ -312,7 +312,7 @@ namespace sw ::svt::EmbeddedObjectRef::SetGraphicToContainer( *mpGraphic, mrPers.GetEmbeddedObjectContainer(), rName, - rtl::OUString() ); + OUString() ); mxIPRef = 0; } @@ -473,7 +473,7 @@ namespace sw return aStyles; } - SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const rtl::OUString& rName) + SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const OUString& rName) { // Search first in the Doc-Styles SwTxtFmtColl* pColl = rDoc.FindTxtFmtCollByName(rName); @@ -488,7 +488,7 @@ namespace sw return pColl; } - SwCharFmt* GetCharStyle(SwDoc &rDoc, const rtl::OUString& rName) + SwCharFmt* GetCharStyle(SwDoc &rDoc, const OUString& rName) { SwCharFmt *pFmt = rDoc.FindCharFmtByName(rName); if (!pFmt) @@ -661,10 +661,10 @@ namespace sw } } - bool IsStarSymbol(const rtl::OUString &rFontName) + bool IsStarSymbol(const OUString &rFontName) { sal_Int32 nIndex = 0; - rtl::OUString sFamilyNm(GetNextFontToken(rFontName, nIndex)); + OUString sFamilyNm(GetNextFontToken(rFontName, nIndex)); return (sFamilyNm.equalsIgnoreAsciiCase("starsymbol") || sFamilyNm.equalsIgnoreAsciiCase("opensymbol")); } @@ -785,10 +785,10 @@ namespace sw std::for_each(maStack.begin(), maStack.end(), SetInDocAndDelete(mrDoc)); } - sal_uInt16 WrtRedlineAuthor::AddName( const rtl::OUString& rNm ) + sal_uInt16 WrtRedlineAuthor::AddName( const OUString& rNm ) { sal_uInt16 nRet; - typedef std::vector::iterator myiter; + typedef std::vector::iterator myiter; myiter aIter = std::find(maAuthors.begin(), maAuthors.end(), rNm); if (aIter != maAuthors.end()) nRet = static_cast< sal_uInt16 >(aIter - maAuthors.begin()); diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 4768a3efde7e..059299b66f3f 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -530,7 +530,7 @@ namespace sw @author Caolán McNamara */ - SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const rtl::OUString& rName); + SwTxtFmtColl* GetParaStyle(SwDoc &rDoc, const OUString& rName); /** Get a Character Style which fits a given name @@ -548,7 +548,7 @@ namespace sw @author Caolán McNamara */ - SwCharFmt* GetCharStyle(SwDoc &rDoc, const rtl::OUString& rName); + SwCharFmt* GetCharStyle(SwDoc &rDoc, const OUString& rName); /** Sort sequence of Paragraph Styles by assigned outline style list level @@ -757,7 +757,7 @@ namespace sw @author Caolán McNamara */ - bool IsStarSymbol(const rtl::OUString &rFontName); + bool IsStarSymbol(const OUString &rFontName); /** Make setting a drawing object's layer in a Writer document easy @@ -889,7 +889,7 @@ namespace sw class DrawingOLEAdaptor { private: - rtl::OUString msOrigPersistName; + OUString msOrigPersistName; com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxIPRef; SfxObjectShell& mrPers; const Graphic* mpGraphic; @@ -923,7 +923,7 @@ namespace sw @return On success true is returned, otherwise false. On success rName is then suitable for user with SwDoc::InsertOLE */ - bool TransferToDoc(rtl::OUString &rName); + bool TransferToDoc(OUString &rName); private: /// No assigning allowed DrawingOLEAdaptor& operator=(const DrawingOLEAdaptor&); diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 93d892ccf34e..bcb1253490bf 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -758,10 +758,10 @@ namespace sw // Force to NatNum when finding one of 'oOA' String sOldParams( rParams ); - rParams.SearchAndReplaceAll( rtl::OUString( "o" ), - rtl::OUString( "m" ) ); - rParams.SearchAndReplaceAll( rtl::OUString( "O" ), - rtl::OUString( "M" ) ); + rParams.SearchAndReplaceAll( OUString( "o" ), + OUString( "m" ) ); + rParams.SearchAndReplaceAll( OUString( "O" ), + OUString( "M" ) ); bool bForceNatNum = !sOldParams.Equals( rParams ); if (LANGUAGE_FRENCH != nDocLang) { @@ -811,7 +811,7 @@ namespace sw // But not if it's a '/' inside AM/PM if (!(IsPreviousAM(rParams, nI) && IsNextPM(rParams, nI))) { - rParams.Replace(nI, 1, rtl::OUString("\\/")); + rParams.Replace(nI, 1, OUString("\\/")); } nI++; nLen++; @@ -942,10 +942,10 @@ namespace sw rLang = LANGUAGE_JAPANESE; if (bForceNatNum) - rParams.Insert(rtl::OUString("[NatNum1][$-411]"),0); + rParams.Insert(OUString("[NatNum1][$-411]"),0); if (bHijri) - rParams.Insert(rtl::OUString("[~hijri]"), 0); + rParams.Insert(OUString("[~hijri]"), 0); OUString sTemp(rParams); pFormatter->PutEntry(sTemp, nCheckPos, nType, nKey, rLang); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index a39f12ff86a1..f0c655d05f0e 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -181,34 +181,34 @@ bool WW8Export::MiserableFormFieldExportHack(const SwFrmFmt& rFrmFmt) void WW8Export::DoComboBox(uno::Reference xPropSet) { - rtl::OUString sSelected; - uno::Sequence aListItems; + OUString sSelected; + uno::Sequence aListItems; xPropSet->getPropertyValue("StringItemList") >>= aListItems; sal_Int32 nNoStrings = aListItems.getLength(); if (nNoStrings) { uno::Any aTmp = xPropSet->getPropertyValue("DefaultText"); - const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); + const OUString *pStr = (const OUString *)aTmp.getValue(); if (pStr) sSelected = *pStr; } - rtl::OUString sName; + OUString sName; { uno::Any aTmp = xPropSet->getPropertyValue("Name"); - const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); + const OUString *pStr = (const OUString *)aTmp.getValue(); if (pStr) sName = *pStr; } - rtl::OUString sHelp; + OUString sHelp; { // property "Help" does not exist and due to the no-existence an exception is thrown. try { uno::Any aTmp = xPropSet->getPropertyValue("HelpText"); - const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); + const OUString *pStr = (const OUString *)aTmp.getValue(); if (pStr) sHelp = *pStr; } @@ -216,10 +216,10 @@ void WW8Export::DoComboBox(uno::Reference xPropSet) {} } - rtl::OUString sToolTip; + OUString sToolTip; { uno::Any aTmp = xPropSet->getPropertyValue("Name"); - const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); + const OUString *pStr = (const OUString *)aTmp.getValue(); if (pStr) sToolTip = *pStr; } @@ -227,11 +227,11 @@ void WW8Export::DoComboBox(uno::Reference xPropSet) DoComboBox(sName, sHelp, sToolTip, sSelected, aListItems); } -void WW8Export::DoComboBox(const rtl::OUString &rName, - const rtl::OUString &rHelp, - const rtl::OUString &rToolTip, - const rtl::OUString &rSelected, - uno::Sequence &rListItems) +void WW8Export::DoComboBox(const OUString &rName, + const OUString &rHelp, + const OUString &rToolTip, + const OUString &rSelected, + uno::Sequence &rListItems) { OSL_ENSURE(bWrtWW8, "Not allowed"); if (!bWrtWW8) @@ -315,21 +315,21 @@ void WW8Export::DoCheckBox(uno::Reference xPropSet) xPropSet->getPropertyValue("State") >>= nTemp; aFFData.setResult(nTemp); - ::rtl::OUString aStr; - static ::rtl::OUString sName("Name"); + OUString aStr; + static OUString sName("Name"); if (xPropSetInfo->hasPropertyByName(sName)) { xPropSet->getPropertyValue(sName) >>= aStr; aFFData.setName(aStr); } - static ::rtl::OUString sHelpText("HelpText"); + static OUString sHelpText("HelpText"); if (xPropSetInfo->hasPropertyByName(sHelpText)) { xPropSet->getPropertyValue(sHelpText) >>= aStr; aFFData.setHelp(aStr); } - static ::rtl::OUString sHelpF1Text("HelpF1Text"); + static OUString sHelpF1Text("HelpF1Text"); if (xPropSetInfo->hasPropertyByName(sHelpF1Text)) { xPropSet->getPropertyValue(sHelpF1Text) >>= aStr; @@ -1422,7 +1422,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nSh Graphic aGraphic(pGrfNd->GetGrf()); GraphicObject aGraphicObject( aGraphic ); - rtl::OString aUniqueId = aGraphicObject.GetUniqueID(); + OString aUniqueId = aGraphicObject.GetUniqueID(); if (!aUniqueId.isEmpty()) { @@ -1631,7 +1631,7 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush, sal_uInt32 nOpaque = 0; if (const GraphicObject *pGraphicObject = rBrush.GetGraphicObject()) { - rtl::OString aUniqueId = pGraphicObject->GetUniqueID(); + OString aUniqueId = pGraphicObject->GetUniqueID(); if (!aUniqueId.isEmpty()) { const Graphic &rGraphic = pGraphicObject->GetGraphic(); @@ -2731,7 +2731,7 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt, AddShape(ESCHER_ShpInst_PictureFrame, nShapeFlags, nShapeId); GraphicObject aGraphicObject(rGraphic); - rtl::OString aId = aGraphicObject.GetUniqueID(); + OString aId = aGraphicObject.GetUniqueID(); if (!aId.isEmpty()) { Rectangle aRect = rObj.GetLogicRect(); @@ -2882,11 +2882,11 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb //Open the ObjectPool SvStorageRef xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage( - rtl::OUString(SL::aObjectPool), STREAM_READWRITE | + OUString(SL::aObjectPool), STREAM_READWRITE | STREAM_SHARE_DENYALL); //Create a destination storage for the microsoft control - rtl::OUStringBuffer sStorageName; + OUStringBuffer sStorageName; sal_uInt32 nObjId = GenerateObjectID(); sStorageName.append('_').append( static_cast( nObjId )); SvStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(), @@ -2896,7 +2896,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb return false; - rtl::OUString sUName; + OUString sUName; if (!WriteOCXStream( mxModel, xOleStg,xControlModel,aSize,sUName)) return false; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index d04de434c5bf..eeaab4845dca 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -110,17 +110,17 @@ static String lcl_getFieldCode( const IFieldmark* pFieldmark ) { if ( !pFieldmark) { return String(); } else if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT ) { - return rtl::OUString(" FORMTEXT "); + return OUString(" FORMTEXT "); } else if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN ) { - return rtl::OUString(" FORMDROPDOWN "); + return OUString(" FORMDROPDOWN "); } else if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX ) { - return rtl::OUString(" FORMCHECKBOX "); + return OUString(" FORMCHECKBOX "); } else if ( pFieldmark->GetFieldname( ) == ODF_TOC ) { - return rtl::OUString(" TOC "); + return OUString(" TOC "); } else if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK ) { - return rtl::OUString(" HYPERLINK "); + return OUString(" HYPERLINK "); } else if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF ) { - return rtl::OUString(" PAGEREF "); + return OUString(" PAGEREF "); } else { return pFieldmark->GetFieldname(); } @@ -1845,7 +1845,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find( ODF_ID_PARAM ); if ( it != pFieldmark->GetParameters()->end() ) { - rtl::OUString sFieldId; + OUString sFieldId; it->second >>= sFieldId; eFieldId = (ww::eField)sFieldId.toInt32(); } @@ -1853,7 +1853,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) it = pFieldmark->GetParameters()->find( ODF_CODE_PARAM ); if ( it != pFieldmark->GetParameters()->end() ) { - rtl::OUString sOUCode; + OUString sOUCode; it->second >>= sOUCode; sCode = sOUCode; } @@ -1878,7 +1878,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find( ODF_OLE_PARAM ); if ( it != pFieldmark->GetParameters()->end() ) { - rtl::OUString sOleId; + OUString sOleId; uno::Any aValue = it->second; aValue >>= sOleId; if ( !sOleId.isEmpty() ) @@ -1899,7 +1899,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find( ODF_ID_PARAM ); if ( it != pFieldmark->GetParameters()->end() ) { - rtl::OUString sFieldId; + OUString sFieldId; it->second >>= sFieldId; eFieldId = (ww::eField)sFieldId.toInt32(); } diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 628cb41c525b..eb1cf9d08249 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -45,7 +45,7 @@ using namespace sw::util; sal_uInt16 MSWordExportBase::DuplicateNumRule( const SwNumRule *pRule, sal_uInt8 nLevel, sal_uInt16 nVal ) { sal_uInt16 nNumId = USHRT_MAX; - String sPrefix(rtl::OUString("WW8TempExport")); + String sPrefix(OUString("WW8TempExport")); sPrefix += OUString::number( nUniqueList++ ); SwNumRule* pMyNumRule = new SwNumRule( pDoc->GetUniqueNumRuleName( &sPrefix ), @@ -637,7 +637,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh, const Font& rFont = rFmt.GetBulletFont() ? *rFmt.GetBulletFont() : numfunc::GetDefBulletFont(); - String sNumStr = rtl::OUString(rFmt.GetBulletChar()); + String sNumStr = OUString(rFmt.GetBulletChar()); rtl_TextEncoding eChrSet = rFont.GetCharSet(); String sFontName = rFont.GetName(); @@ -673,7 +673,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh, *rpCh = static_cast< sal_uInt8 >(cChar - 0xF000); } else - *rpCh = rtl::OUStringToOString(rtl::OUString(cChar), eChrSet).toChar(); + *rpCh = OUStringToOString(OUString(cChar), eChrSet).toChar(); } rpCh++; rCharLen--; @@ -698,7 +698,7 @@ void MSWordExportBase::SubstituteBullet( String& rNumStr, { if (!bSubstituteBullets) return; - rtl::OUString sFontName = rFontName; + OUString sFontName = rFontName; rNumStr.SetChar(0, msfilter::util::bestFitOpenSymbolToMSFont(rNumStr.GetChar(0), rChrSet, sFontName, !SupportsUnicode())); rFontName = sFontName; diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 3be4c6718100..f8493cfc9415 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -527,7 +527,7 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos ) String aName = pFmt->GetName(); if ( aName.EqualsAscii( "Default" ) ) - aName = rtl::OUString("Normal"); + aName = OUString("Normal"); m_rExport.AttrOutput().StartStyle( aName, bFmtColl, nBase, nWwNext, GetWWId( *pFmt ), nPos, @@ -766,13 +766,13 @@ void wwFontHelper::InitFontTable(bool bWrtWW8,const SwDoc& rDoc) { mbWrtWW8 = bWrtWW8; - GetId(wwFont(rtl::OUString("Times New Roman"), PITCH_VARIABLE, + GetId(wwFont(OUString("Times New Roman"), PITCH_VARIABLE, FAMILY_ROMAN, RTL_TEXTENCODING_MS_1252,bWrtWW8)); - GetId(wwFont(rtl::OUString("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN, + GetId(wwFont(OUString("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN, RTL_TEXTENCODING_SYMBOL,bWrtWW8)); - GetId(wwFont(rtl::OUString("Arial"), PITCH_VARIABLE, FAMILY_SWISS, + GetId(wwFont(OUString("Arial"), PITCH_VARIABLE, FAMILY_SWISS, RTL_TEXTENCODING_MS_1252,bWrtWW8)); const SvxFontItem* pFont = (const SvxFontItem*)GetDfltAttr(RES_CHRATR_FONT); @@ -2049,7 +2049,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp, // Additional paragraph containing a space to // assure that by WW created RTF from written WW8 // does not crash WW. - rWrt.WriteStringAsPara( rtl::OUString(" ") ); + rWrt.WriteStringAsPara( OUString(" ") ); } } } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 86e3f5757374..2cdc3cbd975c 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -212,8 +212,8 @@ public: #define ANZ_DEFAULT_STYLES 16 // Names of the storage streams -#define sMainStream rtl::OUString("WordDocument") -#define sCompObj rtl::OUString("\1CompObj") +#define sMainStream OUString("WordDocument") +#define sCompObj OUString("\1CompObj") static void WriteDop( WW8Export& rWrt ) { @@ -339,7 +339,7 @@ const sal_Unicode *WW8DopTypography::GetJapanNotEndLevel1() return &aJapanNotEndLevel1[0]; } -static int lcl_CmpBeginEndChars( const rtl::OUString& rSWStr, +static int lcl_CmpBeginEndChars( const OUString& rSWStr, const sal_Unicode* pMSStr, int nMSStrByteLen ) { nMSStrByteLen /= sizeof( sal_Unicode ); @@ -1275,7 +1275,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt ) std::sort(aBookmarks.begin(), aBookmarks.end()); // First write the Bookmark Name Stringtable - std::vector aNames; + std::vector aNames; aNames.reserve(aBookmarks.size()); for (BkmIter bIt = aBookmarks.begin(); bIt < aBookmarks.end(); ++bIt) aNames.push_back(bIt->name); @@ -1399,7 +1399,7 @@ void WW8Export::MoveFieldMarks(sal_uLong nFrom, sal_uLong nTo) pBkmks->MoveFieldMarks(nFrom, nTo); } -void WW8Export::AppendBookmark( const rtl::OUString& rName, bool bSkip ) +void WW8Export::AppendBookmark( const OUString& rName, bool bSkip ) { sal_uLong nSttCP = Fc2Cp( Strm().Tell() ) + ( bSkip? 1: 0 ); pBkmks->Append( nSttCP, rName ); @@ -1544,14 +1544,14 @@ sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId ) if( !pRedlAuthors ) { pRedlAuthors = new WW8_WrtRedlineAuthor; - pRedlAuthors->AddName(rtl::OUString("Unknown")); + pRedlAuthors->AddName(OUString("Unknown")); } return pRedlAuthors->AddName( SW_MOD()->GetRedlineAuthor( nId ) ); } //-------------------------------------------------------------------------- -void WW8Export::WriteAsStringTable(const std::vector& rStrings, +void WW8Export::WriteAsStringTable(const std::vector& rStrings, sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen) { sal_uInt16 n, nCount = static_cast< sal_uInt16 >(rStrings.size()); @@ -1579,7 +1579,7 @@ void WW8Export::WriteAsStringTable(const std::vector& rStrings, SwWW8Writer::WriteShort( rStrm, 0 ); for( n = 0; n < nCount; ++n ) { - const rtl::OUString &rString = rStrings[n]; + const OUString &rString = rStrings[n]; const String aNm(rString.copy(0, std::min(rString.getLength(), 255))); rStrm << (sal_uInt8)aNm.Len(); SwWW8Writer::WriteString8(rStrm, aNm, false, @@ -1640,7 +1640,7 @@ void SwWW8Writer::InsAsString16(ww::bytes &rO, const String& rStr) void SwWW8Writer::InsAsString8(ww::bytes &rO, const String& rStr, rtl_TextEncoding eCodeSet) { - rtl::OString sTmp(rtl::OUStringToOString(rStr, eCodeSet)); + OString sTmp(OUStringToOString(rStr, eCodeSet)); const sal_Char *pStart = sTmp.getStr(); const sal_Char *pEnd = pStart + sTmp.getLength(); rO.reserve(rO.size() + sTmp.getLength()); @@ -2681,7 +2681,7 @@ void WW8Export::WriteFkpPlcUsw() some magic. cmc */ /* Similiarly having msvbasic storage seems to also trigger creating this stream */ - GetWriter().GetStorage().OpenSotStorage(rtl::OUString(SL::aObjectPool), + GetWriter().GetStorage().OpenSotStorage(OUString(SL::aObjectPool), STREAM_READWRITE | STREAM_SHARE_DENYALL); } @@ -2716,7 +2716,7 @@ void WW8Export::WriteFkpPlcUsw() if ( pSttbfAssoc ) // #i106057# { - ::std::vector aStrings; + ::std::vector aStrings; ::ww8::StringVector_t & aSttbStrings = pSttbfAssoc->getStrings(); ::ww8::StringVector_t::const_iterator aItEnd = aSttbStrings.end(); @@ -3017,9 +3017,9 @@ void WW8Export::ExportDocument_Impl() if( bWrtWW8 ) { pFib->fWhichTblStm = 1; - xTableStrm = GetWriter().GetStorage().OpenSotStream(rtl::OUString(SL::a1Table), + xTableStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::a1Table), STREAM_STD_WRITE ); - xDataStrm = GetWriter().GetStorage().OpenSotStream(rtl::OUString(SL::aData), + xDataStrm = GetWriter().GetStorage().OpenSotStream(OUString(SL::aData), STREAM_STD_WRITE ); xDataStrm->SetBufferSize( 32768 ); // for graphics @@ -3196,7 +3196,7 @@ void WW8Export::ExportDocument_Impl() { xDataStrm.Clear(); pDataStrm = 0; - GetWriter().GetStorage().Remove(rtl::OUString(SL::aData)); + GetWriter().GetStorage().Remove(OUString(SL::aData)); } } } @@ -3263,7 +3263,7 @@ void WW8Export::PrepareStorage() SvGlobalName aGName( nId1, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 ); - GetWriter().GetStorage().SetClass( aGName, 0, rtl::OUString::createFromAscii( pName )); + GetWriter().GetStorage().SetClass( aGName, 0, OUString::createFromAscii( pName )); SvStorageStreamRef xStor( GetWriter().GetStorage().OpenSotStream(sCompObj) ); xStor->Write( pData, nLen ); @@ -3493,7 +3493,7 @@ void WW8Export::RestoreMacroCmds() try { uno::Reference < io::XStream > xSrcStream = - xSrcRoot->openStreamElement( rtl::OUString(SL::aMSMacroCmds), embed::ElementModes::READ ); + xSrcRoot->openStreamElement( OUString(SL::aMSMacroCmds), embed::ElementModes::READ ); SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xSrcStream ); if ( pStream && SVSTREAM_OK == pStream->GetError()) @@ -3552,7 +3552,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) type=2; ::sw::mark::IFieldmark::parameter_map_t::const_iterator pNameParameter = rFieldmark.GetParameters()->find("name"); - ::rtl::OUString ffname; + OUString ffname; if(pNameParameter != rFieldmark.GetParameters()->end()) pNameParameter->second >>= ffname; @@ -3599,7 +3599,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) } aFldHeader.bits |= ( (ffres<<2) & 0x7C ); - std::vector< ::rtl::OUString > aListItems; + std::vector< OUString > aListItems; if (type==2) { aFldHeader.bits |= 0x8000; // ffhaslistbox @@ -3607,18 +3607,18 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) ::sw::mark::IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(ODF_FORMDROPDOWN_LISTENTRY); if(pListEntries != pParameters->end()) { - uno::Sequence< ::rtl::OUString > vListEntries; + uno::Sequence< OUString > vListEntries; pListEntries->second >>= vListEntries; copy(::comphelper::stl_begin(vListEntries), ::comphelper::stl_end(vListEntries), back_inserter(aListItems)); } } - const ::rtl::OUString ffdeftext; - const ::rtl::OUString ffformat; - const ::rtl::OUString ffhelptext; - const ::rtl::OUString ffstattext; - const ::rtl::OUString ffentrymcr; - const ::rtl::OUString ffexitmcr; + const OUString ffdeftext; + const OUString ffformat; + const OUString ffhelptext; + const OUString ffstattext; + const OUString ffentrymcr; + const OUString ffexitmcr; const sal_uInt8 aFldData[] = @@ -3648,7 +3648,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) slen += 4; // for num of list items const int items = aListItems.size(); for( int i = 0; i < items; i++ ) { - rtl::OUString item = aListItems[i]; + OUString item = aListItems[i]; slen += 2 * item.getLength() + 2; } } @@ -3679,7 +3679,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) const int items=aListItems.size(); *pDataStrm<<(sal_uInt32)items; for(int i=0;i &rListItems) = 0; + virtual void DoComboBox(const OUString &rName, + const OUString &rHelp, + const OUString &ToolTip, + const OUString &rSelected, + com::sun::star::uno::Sequence &rListItems) = 0; virtual void DoFormText(const SwInputField * pFld) = 0; @@ -798,7 +798,7 @@ protected: /// Output SwOLENode virtual void OutputOLENode( const SwOLENode& ) = 0; - virtual void OutputLinkedOLE( const rtl::OUString& ) = 0; + virtual void OutputLinkedOLE( const OUString& ) = 0; /// Output SwSectionNode @@ -1009,14 +1009,14 @@ public: SvStorageRef xObjStg, String &rStorageName, SwOLENode *pOLENd); virtual void AppendBookmarks( const SwTxtNode& rNd, xub_StrLen nAktPos, xub_StrLen nLen ); - virtual void AppendBookmark( const rtl::OUString& rName, bool bSkip = false ); + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ); virtual void ExportGrfBullet(const SwTxtNode& rNd); void OutGrfBullets(const sw::Frame &rFrame); void MoveFieldMarks(sal_uLong nFrom, sal_uLong nTo); - void WriteAsStringTable(const ::std::vector&, sal_Int32& rfcSttbf, + void WriteAsStringTable(const ::std::vector&, sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen = 0); virtual sal_uLong ReplaceCr( sal_uInt8 nChar ); @@ -1089,11 +1089,11 @@ public: bool bIsWW8 ); virtual ~WW8Export(); - virtual void DoComboBox(const rtl::OUString &rName, - const rtl::OUString &rHelp, - const rtl::OUString &ToolTip, - const rtl::OUString &rSelected, - com::sun::star::uno::Sequence &rListItems); + virtual void DoComboBox(const OUString &rName, + const OUString &rHelp, + const OUString &ToolTip, + const OUString &rSelected, + com::sun::star::uno::Sequence &rListItems); virtual void DoFormText(const SwInputField * pFld); @@ -1127,7 +1127,7 @@ protected: /// Output SwOLENode virtual void OutputOLENode( const SwOLENode& ); - virtual void OutputLinkedOLE( const rtl::OUString& ); + virtual void OutputLinkedOLE( const OUString& ); virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 67d5c9ac0825..61632d5f20ef 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -225,7 +225,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) pDataAdr = pSpecOLE + 2; //WW6 sprm is 1 but has 1 byte len as well. SvStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage( - rtl::OUString(SL::aObjectPool), STREAM_READWRITE | + OUString(SL::aObjectPool), STREAM_READWRITE | STREAM_SHARE_DENYALL ); if( xObjStg.Is() ) @@ -245,7 +245,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) bool bIsNotDuplicate = aRes.second; //.second is false when element already existed nPictureId = aRes.first->second; Set_UInt32(pDataAdr, nPictureId); - String sStorageName = rtl::OUString('_'); + String sStorageName = OUString('_'); sStorageName += OUString::number( nPictureId ); SvStorageRef xOleStg = xObjStg->OpenSotStorage( sStorageName, STREAM_READWRITE| STREAM_SHARE_DENYALL ); @@ -262,7 +262,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) GetOLEExp().ExportOLEObject( aObjRef, *xOleStg ); if ( nAspect == embed::Aspects::MSOLE_ICON ) { - ::rtl::OUString aObjInfo( "\3ObjInfo" ); + OUString aObjInfo( "\3ObjInfo" ); if ( !xOleStg->IsStream( aObjInfo ) ) { const sal_uInt8 pObjInfoData[] = { 0x40, 0x00, 0x03, 0x00 }; @@ -338,14 +338,14 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) } } -void WW8Export::OutputLinkedOLE( const rtl::OUString& rOleId ) +void WW8Export::OutputLinkedOLE( const OUString& rOleId ) { uno::Reference< embed::XStorage > xDocStg = pDoc->GetDocStorage(); uno::Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement( "OLELinks", embed::ElementModes::READ ); SotStorageRef xObjSrc = SotStorage::OpenOLEStorage( xOleStg, rOleId, STREAM_READ ); SotStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage( - rtl::OUString(SL::aObjectPool), STREAM_READWRITE | + OUString(SL::aObjectPool), STREAM_READWRITE | STREAM_SHARE_DENYALL ); if( xObjStg.Is() && xObjSrc.Is() ) diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 0b18e29c7884..7c8560c9e1d4 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -833,7 +833,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF pOutFmtNode = pOldMod; } -bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ) +bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo ) { const SwTxtNode* pNd; @@ -869,7 +869,7 @@ bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pNa return false; } -String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ) +String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const OUString* pName, sal_uInt16 nSeqNo ) { String sRet; switch ( nTyp ) @@ -1908,7 +1908,7 @@ void WW8Export::StartCommentOutput(const String& rName) void WW8Export::EndCommentOutput(const String& rName) { - String sStr(rtl::OUString(" [")); + String sStr(OUString(" [")); sStr += rName; sStr.AppendAscii("] "); OutputField(0, ww::eQUOTE, sStr, WRITEFIELD_CMD_END | WRITEFIELD_END | @@ -2469,7 +2469,7 @@ bool WW8AttributeOutput::DropdownField( const SwField* pFld ) if ( m_rWW8Export.bWrtWW8 ) { const SwDropDownField& rFld2 = *(SwDropDownField*)pFld; - uno::Sequence aItems = + uno::Sequence aItems = rFld2.GetItemSequence(); GetExport().DoComboBox(rFld2.GetName(), rFld2.GetHelp(), diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 365087437109..b40813e274cc 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -43,7 +43,7 @@ WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, sal_uInt8 nVersion, if (aWwFib.nFibBack >= 0x6A) //Word97 { - xTableStream = pStg->OpenSotStream(rtl::OUString::createFromAscii( + xTableStream = pStg->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError()) @@ -158,7 +158,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, while( (sal_uInt16)-1 != nCurPos ) { sShortcut.Erase( nLen ) += - rtl::OUString::valueOf(++nStart); // add an Number to it + OUString::valueOf(++nStart); // add an Number to it nCurPos = rBlocks.GetIndex( sShortcut ); } diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 21b705875c8d..11a2b3dd1df1 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -150,7 +150,7 @@ Color WW8TransCol(SVBT32 nWC) return Color(nWC[0], nWC[1], nWC[2]); } -void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const rtl::OUString &rFixed) +void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const OUString &rFixed) { if (mbIsDisabled || rFixed.isEmpty()) return; @@ -666,7 +666,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp, if (bSymbol == false && bDoingSymbol) { bDoingSymbol = false; - rtl::OUStringBuffer sTemp; + OUStringBuffer sTemp; comphelper::string::padToLength(sTemp, nTxtStart - nStartReplace, cReplaceSymbol); mpDrawEditEngine->QuickInsertText(sTemp.makeStringAndClear(), @@ -955,7 +955,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(String &rString, WW8_CP nS rString = comphelper::string::remove(rString, 0x1); rString = comphelper::string::remove(rString, 0x5); rString = comphelper::string::remove(rString, 0x8); - rString.SearchAndReplaceAllAscii("\007\007", rtl::OUString("\007\012")); + rString.SearchAndReplaceAllAscii("\007\007", OUString("\007\012")); rString.SearchAndReplaceAll(0x7, ' '); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index abdd6529ce56..8b4f9f285c6a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -144,7 +144,7 @@ public: mxCtx = comphelper::getProcessComponentContext(); } bool import( const uno::Reference< io::XInputStream >& rxIn ); - rtl::OUString getProjectName(); + OUString getProjectName(); }; bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rxIn ) @@ -156,7 +156,7 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx oox::StorageRef vbaStg = root.openSubStorage( "Macros" , false ); if ( vbaStg.get() ) { - oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), rtl::OUString("Writer") ); + oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), OUString("Writer") ); bRet = aVbaPrj.importVbaProject( *vbaStg ); } } @@ -167,9 +167,9 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx return bRet; } -rtl::OUString BasicProjImportHelper::getProjectName() +OUString BasicProjImportHelper::getProjectName() { - rtl::OUString sProjName( "Standard" ); + OUString sProjName( "Standard" ); uno::Reference< beans::XPropertySet > xProps( mrDocShell.GetModel(), uno::UNO_QUERY ); if ( xProps.is() ) { @@ -192,7 +192,7 @@ class Sttb : TBBase struct SBBItem { sal_uInt16 cchData; - rtl::OUString data; + OUString data; SBBItem() : cchData(0){} }; sal_uInt16 fExtend; @@ -208,7 +208,7 @@ public: ~Sttb(); bool Read(SvStream &rS); void Print( FILE* fp ); - rtl::OUString getStringAtIndex( sal_uInt32 ); + OUString getStringAtIndex( sal_uInt32 ); }; Sttb::Sttb() : fExtend( 0 ) @@ -248,15 +248,15 @@ void Sttb::Print( FILE* fp ) if ( cData ) { for ( sal_Int32 index = 0; index < cData; ++index ) - fprintf(fp," string dataItem[ %d(0x%x) ] has name %s\n", static_cast< int >( index ), static_cast< unsigned int >( index ), rtl::OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf(fp," string dataItem[ %d(0x%x) ] has name %s\n", static_cast< int >( index ), static_cast< unsigned int >( index ), OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr() ); } } -rtl::OUString +OUString Sttb::getStringAtIndex( sal_uInt32 index ) { - rtl::OUString aRet; + OUString aRet; if ( index < dataItems.size() ) aRet = dataItems[ index ].data; return aRet; @@ -737,7 +737,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, { fExtraTextRotation /= 100.0; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sTextRotateAngle( "TextRotateAngle" ); + const OUString sTextRotateAngle( "TextRotateAngle" ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sTextRotateAngle; aPropVal.Value <<= fExtraTextRotation; @@ -2737,7 +2737,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs) pStr->buffer[nEndUsed] = 0; pStr->length = nEndUsed; - emulateMSWordAddTextToParagraph(rtl::OUString(pStr, SAL_NO_ACQUIRE)); + emulateMSWordAddTextToParagraph(OUString(pStr, SAL_NO_ACQUIRE)); pStr = NULL; rPos += nL2; if (!maApos.back()) //a para end in apo doesn't count @@ -2759,7 +2759,7 @@ namespace //We want to force weak chars inside 0x0020 to 0x007F to LATIN sal_Int16 lcl_getScriptType( const uno::Reference& rBI, - const rtl::OUString &rString, sal_Int32 nPos) + const OUString &rString, sal_Int32 nPos) { sal_Int16 nScript = rBI->getScriptType(rString, nPos); if (nScript == i18n::ScriptType::WEAK && rString[nPos] >= 0x0020 && rString[nPos] <= 0x007F) @@ -2771,7 +2771,7 @@ namespace //useful, and see lcl_getScriptType anyway sal_Int32 lcl_endOfScript( const uno::Reference& rBI, - const rtl::OUString &rString, sal_Int32 nPos, sal_Int16 nScript) + const OUString &rString, sal_Int32 nPos, sal_Int16 nScript) { while (nPos < rString.getLength()) { @@ -2785,7 +2785,7 @@ namespace sal_Int32 lcl_getWriterScriptType( const uno::Reference& rBI, - const rtl::OUString &rString, sal_Int32 nPos) + const OUString &rString, sal_Int32 nPos) { sal_Int16 nScript = i18n::ScriptType::WEAK; @@ -2841,7 +2841,7 @@ namespace //to auto-bias to LATIN. // //See https://bugs.freedesktop.org/show_bug.cgi?id=34319 for an example -void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddString) +void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString) { if (rAddString.isEmpty()) return; @@ -2856,7 +2856,7 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS sal_Int16 nScript = lcl_getScriptType(xBI, rAddString, 0); sal_Int32 nLen = rAddString.getLength(); - rtl::OUString sParagraphText; + OUString sParagraphText; const SwCntntNode *pCntNd = pPaM->GetCntntNode(); const SwTxtNode* pNd = pCntNd ? pCntNd->GetTxtNode() : NULL; if (pNd) @@ -2871,7 +2871,7 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS if (nEnd < 0) break; - rtl::OUString sChunk(rAddString.copy(nPos, nEnd-nPos)); + OUString sChunk(rAddString.copy(nPos, nEnd-nPos)); const sal_uInt16 aIds[] = {RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT}; const SvxFontItem *pOverriddenItems[] = {NULL, NULL, NULL}; bool aForced[] = {false, false, false}; @@ -2977,7 +2977,7 @@ void SwWW8ImplReader::simpleAddTextToParagraph(const String& rAddString) #if OSL_DEBUG_LEVEL > 1 { - rtl::OString sText(rtl::OUStringToOString(rAddString, RTL_TEXTENCODING_UTF8)); + OString sText(OUStringToOString(rAddString, RTL_TEXTENCODING_UTF8)); SAL_INFO("sw.ww8", "" << sText.getStr() << ""); } #endif @@ -3029,7 +3029,7 @@ bool SwWW8ImplReader::ReadChars(WW8_CP& rPos, WW8_CP nNextAttr, long nTextEnd, { for(sal_uInt16 nCh = 0; nCh < nEnd - rPos; ++nCh) { - rDoc.InsertString( *pPaM, rtl::OUString(cSymbol) ); + rDoc.InsertString( *pPaM, OUString(cSymbol) ); } pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_CHRATR_FONT ); } @@ -3171,13 +3171,13 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) bRet = HandlePageBreakChar(); break; case 0x1e: // Non-breaking hyphen - rDoc.InsertString( *pPaM, rtl::OUString(CHAR_HARDHYPHEN) ); + rDoc.InsertString( *pPaM, OUString(CHAR_HARDHYPHEN) ); break; case 0x1f: // Non-required hyphens - rDoc.InsertString( *pPaM, rtl::OUString(CHAR_SOFTHYPHEN) ); + rDoc.InsertString( *pPaM, OUString(CHAR_SOFTHYPHEN) ); break; case 0xa0: // Non-breaking spaces - rDoc.InsertString( *pPaM, rtl::OUString(CHAR_HARDBLANK) ); + rDoc.InsertString( *pPaM, OUString(CHAR_HARDBLANK) ); break; case 0x1: /* @@ -3264,7 +3264,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) if( '\x0' != cInsert ) { - rtl::OUString sInsert(cInsert); + OUString sInsert(cInsert); emulateMSWordAddTextToParagraph(sInsert); } if (!maApos.back()) //a para end in apo doesn't count @@ -3615,7 +3615,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType) if(pAktItemSet && !pFmt) { - rtl::OUString sPrefix(rtl::OUStringBuffer("WW8Dropcap").append(nDropCap++).makeStringAndClear()); + OUString sPrefix(OUStringBuffer("WW8Dropcap").append(nDropCap++).makeStringAndClear()); pNewSwCharFmt = rDoc.MakeCharFmt(sPrefix, (SwCharFmt*)rDoc.GetDfltCharFmt()); pAktItemSet->ClearItem(RES_CHRATR_ESCAPEMENT); pNewSwCharFmt->SetFmtAttr( *pAktItemSet ); @@ -3694,8 +3694,8 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage, maSectionManager(*this), m_aExtraneousParas(rD), maInsertedTables(rD), - maSectionNameGenerator(rD, rtl::OUString("WW")), - maGrfNameGenerator(bNewDoc, rtl::OUString('G')), + maSectionNameGenerator(rD, OUString("WW")), + maGrfNameGenerator(bNewDoc, OUString('G')), maParaStyleMapper(rD), maCharStyleMapper(rD), maTxtNodesHavingFirstLineOfstSet(), // #i103711# @@ -4168,7 +4168,7 @@ void SwWW8ImplReader::StoreMacroCmds() try { uno::Reference < io::XStream > xStream = - xRoot->openStreamElement( rtl::OUString(SL::aMSMacroCmds), embed::ElementModes::READWRITE ); + xRoot->openStreamElement( OUString(SL::aMSMacroCmds), embed::ElementModes::READWRITE ); SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xStream ); sal_uInt8 *pBuffer = new sal_uInt8[pWwFib->lcbCmds]; @@ -4206,9 +4206,9 @@ void SwWW8ImplReader::ReadDocVars() for(size_t i=0; iaddProperty( name, beans::PropertyAttribute::REMOVABLE, @@ -4237,11 +4237,11 @@ void SwWW8ImplReader::ReadDocInfo() if (xDocProps.is()) { if ( pWwFib->fDot ) { - rtl::OUString sTemplateURL; + OUString sTemplateURL; SfxMedium* pMedium = mpDocShell->GetMedium(); if ( pMedium ) { - rtl::OUString aName = pMedium->GetName(); + OUString aName = pMedium->GetName(); INetURLObject aURL( aName ); sTemplateURL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); if ( !sTemplateURL.isEmpty() ) @@ -4260,7 +4260,7 @@ void SwWW8ImplReader::ReadDocInfo() aSttb.Print( stderr ); #endif String sPath = aSttb.getStringAtIndex( 0x1 ); - rtl::OUString aURL; + OUString aURL; // attempt to convert to url ( won't work for obvious reasons on linux if ( sPath.Len() ) ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, aURL ); @@ -4275,14 +4275,14 @@ void SwWW8ImplReader::ReadDocInfo() } } -static void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const rtl::OUString& sTemplatePathOrURL, const rtl::OUString& sVBAProjName ) +static void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const OUString& sTemplatePathOrURL, const OUString& sVBAProjName ) { if ( xPrjNameCache.is() ) { INetURLObject aObj; aObj.SetURL( sTemplatePathOrURL ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; - rtl::OUString aURL; + OUString aURL; if ( bIsURL ) aURL = sTemplatePathOrURL; else @@ -4292,8 +4292,8 @@ static void lcl_createTemplateToProjectEntry( const uno::Reference< container::X } try { - rtl::OUString templateNameWithExt = aObj.GetLastName(); - rtl::OUString templateName; + OUString templateNameWithExt = aObj.GetLastName(); + OUString templateName; sal_Int32 nIndex = templateNameWithExt.lastIndexOf( '.' ); if ( nIndex != -1 ) { @@ -4348,11 +4348,11 @@ bool WW8Customizations::Import( SwDocShell* pShell ) } } -bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const uno::Reference< container::XNameContainer >& xPrjNameCache ) +bool SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const uno::Reference< container::XNameContainer >& xPrjNameCache ) { SvtPathOptions aPathOpt; String aAddinPath = aPathOpt.GetAddinPath(); - uno::Sequence< rtl::OUString > sGlobalTemplates; + uno::Sequence< OUString > sGlobalTemplates; // first get the autoload addins in the directory STARTUP uno::Reference xSFA(ucb::SimpleFileAccess::create(::comphelper::getProcessComponentContext())); @@ -4367,7 +4367,7 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedF INetURLObject aObj; aObj.SetURL( sGlobalTemplates[ i ] ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; - rtl::OUString aURL; + OUString aURL; if ( bIsURL ) aURL = sGlobalTemplates[ i ]; else @@ -4382,10 +4382,10 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedF aBasicImporter.import( mpDocShell->GetMedium()->GetInputStream() ); lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aBasicImporter.getProjectName() ); // Read toolbars & menus - SvStorageStreamRef refMainStream = rRoot->OpenSotStream( rtl::OUString( "WordDocument" )); + SvStorageStreamRef refMainStream = rRoot->OpenSotStream( OUString( "WordDocument" )); refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); WW8Fib aWwFib( *refMainStream, 8 ); - SvStorageStreamRef xTableStream = rRoot->OpenSotStream(rtl::OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); + SvStorageStreamRef xTableStream = rRoot->OpenSotStream(OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError()) { @@ -4642,7 +4642,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) xDocPropSupp(mpDocShell->GetModel(), uno::UNO_QUERY_THROW); uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); - rtl::OUString sCreatedFrom = xDocProps->getTemplateURL(); + OUString sCreatedFrom = xDocProps->getTemplateURL(); uno::Reference< container::XNameContainer > xPrjNameCache; uno::Reference< lang::XMultiServiceFactory> xSF(mpDocShell->GetModel(), uno::UNO_QUERY); if ( xSF.is() ) @@ -4897,14 +4897,14 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream, break; } - rTableStream = pStg->OpenSotStream( rtl::OUString::createFromAscii( + rTableStream = pStg->OpenSotStream( OUString::createFromAscii( pWwFib->fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ); pTableStream = &rTableStream; pTableStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - rDataStream = pStg->OpenSotStream(rtl::OUString(SL::aData), + rDataStream = pStg->OpenSotStream(OUString(SL::aData), STREAM_STD_READ | STREAM_NOCREATE ); if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError()) @@ -5022,7 +5022,7 @@ namespace { String sUniPassword = QueryPasswordForMedium( rMedium ); - rtl::OString sPassword(rtl::OUStringToOString(sUniPassword, + OString sPassword(OUStringToOString(sUniPassword, WW8Fib::GetFIBCharset(pWwFib->chseTables))); sal_Int32 nLen = sPassword.getLength(); @@ -5641,7 +5641,7 @@ sal_uLong WW8Reader::OpenMainStream( SvStorageStreamRef& rRef, sal_uInt16& rBuff { sal_uLong nRet = ERR_SWG_READ_ERROR; OSL_ENSURE( pStg, "wo ist mein Storage?" ); - rRef = pStg->OpenSotStream( rtl::OUString("WordDocument"), STREAM_READ | STREAM_SHARE_DENYALL); + rRef = pStg->OpenSotStream( OUString("WordDocument"), STREAM_READ | STREAM_SHARE_DENYALL); if( rRef.Is() ) { @@ -5830,8 +5830,8 @@ sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName, if( bRet ) { rStorageName = OUString('_'); - rStorageName += rtl::OUString::valueOf(nPictureId); - rSrcStorage = rReader.pStg->OpenSotStorage(rtl::OUString( + rStorageName += OUString::valueOf(nPictureId); + rSrcStorage = rReader.pStg->OpenSotStorage(OUString( SL::aObjectPool)); if (!rReader.mpDocShell) bRet=false; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 1fabdbbb3d44..e6d706a70775 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -458,9 +458,9 @@ namespace sw class WW8FieldEntry { private: - ::rtl::OUString msBookmarkName; - ::rtl::OUString msMarkType; - ::rtl::OUString msMarkCode; + OUString msBookmarkName; + OUString msMarkType; + OUString msMarkCode; ::sw::mark::IFieldmark::parameter_map_t maParams; public: @@ -475,11 +475,11 @@ class WW8FieldEntry SwNodeIndex GetPtNode() { return maStartPos.GetPtNode(); }; xub_StrLen GetPtCntnt() { return maStartPos.GetPtCntnt(); }; - ::rtl::OUString GetBookmarkName(); - ::rtl::OUString GetBookmarkCode(); - void SetBookmarkName(::rtl::OUString bookmarkName); - void SetBookmarkType(::rtl::OUString bookmarkType); - void SetBookmarkCode(::rtl::OUString bookmarkCode); + OUString GetBookmarkName(); + OUString GetBookmarkCode(); + void SetBookmarkName(OUString bookmarkName); + void SetBookmarkType(OUString bookmarkType); + void SetBookmarkCode(OUString bookmarkCode); ::sw::mark::IFieldmark::parameter_map_t& getParameters(); }; @@ -553,7 +553,7 @@ class WW8FormulaControl : private ::boost::noncopyable protected: SwWW8ImplReader &rRdr; public: - WW8FormulaControl(const rtl::OUString& rN, SwWW8ImplReader &rR) + WW8FormulaControl(const OUString& rN, SwWW8ImplReader &rR) : rRdr(rR), fUnknown(0), fDropdownIndex(0), fToolTip(0), fNoMark(0), fUseSize(0), fNumbersOnly(0), fDateOnly(0), fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), sName( rN ) @@ -573,12 +573,12 @@ public: sal_uInt16 nChecked; sal_uInt16 nDefaultChecked; - rtl::OUString sTitle; - rtl::OUString sDefault; - rtl::OUString sFormatting; - rtl::OUString sHelp; - rtl::OUString sToolTip; - std::vector maListEntries; + OUString sTitle; + OUString sDefault; + OUString sFormatting; + OUString sHelp; + OUString sToolTip; + std::vector maListEntries; virtual ~WW8FormulaControl() {} void FormulaRead(SwWw8ControlType nWhich,SvStream *pD); virtual sal_Bool Import(const com::sun::star::uno::Reference < @@ -586,7 +586,7 @@ public: com::sun::star::uno::Reference < com::sun::star::form::XFormComponent> &rFComp, com::sun::star::awt::Size &rSz) = 0; - rtl::OUString sName; + OUString sName; }; class WW8FormulaCheckBox : public WW8FormulaControl @@ -665,7 +665,7 @@ class SwMSDffManager : public SvxMSDffManager private: SwWW8ImplReader& rReader; SvStream *pFallbackStream; - std::map aOldEscherBlipCache; + std::map aOldEscherBlipCache; virtual sal_Bool GetOLEStorageName( long nOLEId, OUString& rStorageName, SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const; @@ -840,12 +840,12 @@ public: class wwFrameNamer : private ::boost::noncopyable { private: - rtl::OUString msSeed; + OUString msSeed; sal_Int32 mnImportedGraphicsCount; bool mbIsDisabled; public: - void SetUniqueGraphName(SwFrmFmt *pFrmFmt, const rtl::OUString &rFixedPart); - wwFrameNamer(bool bIsDisabled, const rtl::OUString &rSeed) + void SetUniqueGraphName(SwFrmFmt *pFrmFmt, const OUString &rFixedPart); + wwFrameNamer(bool bIsDisabled, const OUString &rSeed) : msSeed(rSeed), mnImportedGraphicsCount(0), mbIsDisabled(bIsDisabled) { } @@ -1255,7 +1255,7 @@ private: pReffingStck = 0; } void DeleteAnchorStk() { DeleteStk( pAnchorStck ); pAnchorStck = 0; } - void emulateMSWordAddTextToParagraph(const rtl::OUString& rAddString); + void emulateMSWordAddTextToParagraph(const OUString& rAddString); void simpleAddTextToParagraph(const String& rAddString); bool HandlePageBreakChar(); bool ReadChar(long nPosCp, long nCpOfs); @@ -1542,7 +1542,7 @@ private: // #i84783# // determine object attribute "Layout in Table Cell" bool IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTableCell ) const; - bool ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap ); + bool ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap ); //No copying SwWW8ImplReader(const SwWW8ImplReader &); SwWW8ImplReader& operator=(const SwWW8ImplReader&); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 40056b8f86eb..fbc2e083c576 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -772,7 +772,7 @@ SwNumRule* SwWW8ImplReader::GetStyRule() if( pStyles->pStyRule ) // Bullet-Style already present return pStyles->pStyRule; - const String aBaseName(rtl::OUString("WW8StyleNum")); + const String aBaseName(OUString("WW8StyleNum")); const String aName( rDoc.GetUniqueNumRuleName( &aBaseName, false) ); // #i86652# @@ -848,7 +848,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor // If NumRuleItems were set, either directly or through inheritance, disable them now pAktColl->SetFmtAttr( SwNumRuleItem() ); - String aName(rtl::OUString("Outline")); + String aName(OUString("Outline")); SwNumRule aNR( rDoc.GetUniqueNumRuleName( &aName ), SvxNumberFormat::LABEL_WIDTH_AND_POSITION, OUTLINE_RULE ); @@ -4299,13 +4299,13 @@ void WW8RStyle::ImportOldFormatStyles() if (const sal_Char *pStr = GetEnglishNameFromSti(eSti)) sName = String(pStr, RTL_TEXTENCODING_ASCII_US); else - sName = rtl::OUString("Unknown"); + sName = OUString("Unknown"); } else // user style { - rtl::OString aTmp = read_uInt8s_ToOString(rSt, nCount); + OString aTmp = read_uInt8s_ToOString(rSt, nCount); nByteCount += aTmp.getLength(); - sName = rtl::OStringToOUString(aTmp, eStructChrSet); + sName = OStringToOUString(aTmp, eStructChrSet); } rSI.SetOrgWWIdent(sName, stc); rSI.bImported = true; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index b3312ba96d80..13d0646386f3 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -160,8 +160,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr ) if (aBookmarkName.Len()>0) { maFieldStack.back().SetBookmarkName(aBookmarkName); maFieldStack.back().SetBookmarkType(ODF_FORMTEXT); - maFieldStack.back().getParameters()["Description"] = uno::makeAny(::rtl::OUString(aFormula.sToolTip)); - maFieldStack.back().getParameters()["Name"] = uno::makeAny(::rtl::OUString(aFormula.sTitle)); + maFieldStack.back().getParameters()["Description"] = uno::makeAny(OUString(aFormula.sToolTip)); + maFieldStack.back().getParameters()["Name"] = uno::makeAny(OUString(aFormula.sTitle)); } return FLD_TEXT; } @@ -213,8 +213,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr ) if (pFieldmark!=NULL) { IFieldmark::parameter_map_t* const pParameters = pFieldmark->GetParameters(); ICheckboxFieldmark* pCheckboxFm = dynamic_cast(pFieldmark); - (*pParameters)[ODF_FORMCHECKBOX_NAME] = uno::makeAny(::rtl::OUString(aFormula.sTitle)); - (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] = uno::makeAny(::rtl::OUString(aFormula.sToolTip)); + (*pParameters)[ODF_FORMCHECKBOX_NAME] = uno::makeAny(OUString(aFormula.sTitle)); + (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] = uno::makeAny(OUString(aFormula.sToolTip)); if(pCheckboxFm) pCheckboxFm->SetChecked(aFormula.nChecked); @@ -285,7 +285,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr) OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?"); if ( pFieldmark != NULL ) { - uno::Sequence< ::rtl::OUString > vListEntries(aFormula.maListEntries.size()); + uno::Sequence< OUString > vListEntries(aFormula.maListEntries.size()); ::std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), ::comphelper::stl_begin(vListEntries)); (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries); sal_Int32 nIndex = aFormula.fDropdownIndex < aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0; @@ -1075,7 +1075,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, SwNumRule* WW8ListManager::CreateNextRule(bool bSimple) { // wird erstmal zur Bildung des Style Namens genommen - String sPrefix(rtl::OUString("WW8Num")); + String sPrefix(OUString("WW8Num")); sPrefix += OUString::number(nUniqueList++); // #i86652# sal_uInt16 nRul = @@ -1318,7 +1318,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) break; // Nauemsprefix aufbauen: fuer NumRule-Name (eventuell) // und (falls vorhanden) fuer Style-Name (dann auf jeden Fall) - String sPrefix(rtl::OUString("WW8NumSt")); + String sPrefix(OUString("WW8NumSt")); sPrefix += OUString::number( nLfo + 1 ); // jetzt dem pNumRule seinen RICHTIGEN Wert zuweisen !!! // (bis dahin war hier die Parent NumRule vermerkt ) @@ -2220,7 +2220,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, { if ( iRes != 25 ) nChecked = iRes; - sDefault = ( wDef == 0 ) ? rtl::OUString( "0" ) : rtl::OUString( "1" ); + sDefault = ( wDef == 0 ) ? OUString( "0" ) : OUString( "1" ); } } // xstzTextFormat @@ -2274,7 +2274,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, } WW8FormulaListBox::WW8FormulaListBox(SwWW8ImplReader &rR) - : WW8FormulaControl(rtl::OUString(SL::aListBox), rR) + : WW8FormulaControl(OUString(SL::aListBox), rR) { } @@ -2333,7 +2333,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString, String pNm; if (xPropSetInfo->hasPropertyByName(pNm = "FontStyleName")) { - aTmp <<= rtl::OUString( pFontItem->GetStyleName()); + aTmp <<= OUString( pFontItem->GetStyleName()); rPropSet->setPropertyValue( pNm, aTmp ); } if (xPropSetInfo->hasPropertyByName(pNm = "FontFamily")) @@ -2352,7 +2352,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString, rPropSet->setPropertyValue( pNm, aTmp ); } - aTmp <<= rtl::OUString( pFontItem->GetFamilyName()); + aTmp <<= OUString( pFontItem->GetFamilyName()); aFont.SetName( pFontItem->GetFamilyName() ); aFont.SetStyleName( pFontItem->GetStyleName() ); aFont.SetFamily( pFontItem->GetFamily() ); @@ -2398,8 +2398,8 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString, break; } - if (bSet && xPropSetInfo->hasPropertyByName(rtl::OUString::createFromAscii(pMap->pPropNm))) - rPropSet->setPropertyValue(rtl::OUString::createFromAscii(pMap->pPropNm), aTmp); + if (bSet && xPropSetInfo->hasPropertyByName(OUString::createFromAscii(pMap->pPropNm))) + rPropSet->setPropertyValue(OUString::createFromAscii(pMap->pPropNm), aTmp); } // now calculate the size of the control OutputDevice* pOut = Application::GetDefaultDevice(); @@ -2450,9 +2450,9 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference < if (!maListEntries.empty()) { sal_uInt32 nLen = maListEntries.size(); - uno::Sequence< ::rtl::OUString > aListSource(nLen); + uno::Sequence< OUString > aListSource(nLen); for (sal_uInt32 nI = 0; nI < nLen; ++nI) - aListSource[nI] = rtl::OUString(maListEntries[nI]); + aListSource[nI] = OUString(maListEntries[nI]); aTmp <<= aListSource; xPropSet->setPropertyValue("StringItemList", aTmp ); @@ -2475,20 +2475,20 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference < { 0x2002,0x2002,0x2002,0x2002,0x2002 }; - rSz = rRdr.MiserableDropDownFormHack(rtl::OUString(aBlank, SAL_N_ELEMENTS(aBlank)), xPropSet); + rSz = rRdr.MiserableDropDownFormHack(OUString(aBlank, SAL_N_ELEMENTS(aBlank)), xPropSet); } return sal_True; } WW8FormulaCheckBox::WW8FormulaCheckBox(SwWW8ImplReader &rR) - : WW8FormulaControl(rtl::OUString(SL::aCheckBox), rR) + : WW8FormulaControl(OUString(SL::aCheckBox), rR) { } static void lcl_AddToPropertyContainer (uno::Reference xPropSet, - const rtl::OUString & rPropertyName, const rtl::OUString & rValue) + const OUString & rPropertyName, const OUString & rValue) { uno::Reference xPropSetInfo = xPropSet->getPropertySetInfo(); @@ -2547,7 +2547,7 @@ sal_Bool WW8FormulaCheckBox::Import(const uno::Reference < } WW8FormulaEditBox::WW8FormulaEditBox(SwWW8ImplReader &rR) - : WW8FormulaControl(rtl::OUString(SL::aTextField) ,rR) + : WW8FormulaControl(OUString(SL::aTextField) ,rR) { } diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 8e92ce6c05b8..7aa31b67d17d 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -80,7 +80,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1) // 0x2c, 0x30 Skalierung x,y in Promille // 0x34, 0x38, 0x3c, 0x40 Crop Left, Top, Right, Bot in tw - SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( rtl::OUString("\3PIC"), + SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( OUString("\3PIC"), STREAM_STD_READ | STREAM_NOCREATE); SvStorageStream* pS = xSrc3; pS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -125,7 +125,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1) static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, SvStorageRef& rSrc1) { - SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( rtl::OUString("\3META"), + SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( OUString("\3META"), STREAM_STD_READ | STREAM_NOCREATE); SvStorageStream* pSt = xSrc2; pSt->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -181,7 +181,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1) { // 03-META-Stream nicht da. Vielleicht ein 03-PICT ? - SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream(rtl::OUString("\3PICT")); + SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream(OUString("\3PICT")); SvStorageStream* pStp = xSrc4; pStp->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); sal_uInt8 aTestA[10]; // Ist der 01Ole-Stream ueberhaupt vorhanden @@ -230,7 +230,7 @@ SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject, // TODO/MBA: is the object inserted multiple times here? Testing! // And is it a problem that we now use the same naming scheme as in the other apps? sw::hack::DrawingOLEAdaptor aOLEObj(rObject, *pPersist); - ::rtl::OUString sNewName; + OUString sNewName; bool bSuccess = aOLEObj.TransferToDoc(sNewName); OSL_ENSURE(bSuccess, "Insert OLE failed"); @@ -344,11 +344,11 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, long nX=0, nY=0; // nX, nY is graphic size bool bOleOk = true; - String aSrcStgName = rtl::OUString('_'); + String aSrcStgName = OUString('_'); // ergibt Name "_4711" aSrcStgName += OUString::number( nObjLocFc ); - SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool)); + SvStorageRef xSrc0 = pStg->OpenSotStorage(OUString(SL::aObjectPool)); SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName, STREAM_READWRITE| STREAM_SHARE_DENYALL ); @@ -425,7 +425,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; { - SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream(rtl::OUString("\3ObjInfo"), + SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream(OUString("\3ObjInfo"), STREAM_STD_READ | STREAM_NOCREATE ); if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() ) { diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 2b9316156751..37229ccaae89 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -349,7 +349,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) // needed if the filterflags say we will convert bookmarks // to SetExpFields! And this the exception! - rtl::OUString sHex("\\x"); + OUString sHex("\\x"); bool bSetAsHex; bool bAllowCr = SwFltGetFlag(nFieldFlags, SwFltControlStack::ALLOW_FLD_CR) ? true : false; @@ -421,8 +421,8 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) void SwWW8ImplReader::ConvertFFileName( String& rName, const String& rOrg ) { rName = rOrg; - rName.SearchAndReplaceAllAscii( "\\\\", rtl::OUString( '\\' )); - rName.SearchAndReplaceAllAscii( "%20", rtl::OUString( ' ' )); + rName.SearchAndReplaceAllAscii( "\\\\", OUString( '\\' )); + rName.SearchAndReplaceAllAscii( "%20", OUString( ' ' )); // ggfs. anhaengende Anfuehrungszeichen entfernen if( rName.Len() && '"' == rName.GetChar( rName.Len()-1 )) @@ -575,10 +575,10 @@ String GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, sal_uInt16 nL // #i36594# // Fix provided by mloiseleur@openoffice.org. // A default date can have already 4 year digits, in some case - const xub_StrLen pos = sParams.Search(rtl::OUString("YYYY")); + const xub_StrLen pos = sParams.Search(OUString("YYYY")); if ( pos == STRING_NOTFOUND ) { - sParams.SearchAndReplace(rtl::OUString("YY"), rtl::OUString("YYYY")); + sParams.SearchAndReplace(OUString("YY"), OUString("YYYY")); } return sParams; } @@ -622,7 +622,7 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat, } if (bHijri) - sParams.Insert(rtl::OUString("[~hijri]"), 0); + sParams.Insert(OUString("[~hijri]"), 0); sal_Int32 nCheckPos = 0; short nType = NUMBERFORMAT_DEFINED; @@ -721,7 +721,7 @@ sal_uInt16 SwWW8ImplReader::End_Field() *pPaM->GetPoint() = maFieldStack.back().maStartPos; break; default: - rtl::OUString aCode = maFieldStack.back().GetBookmarkCode(); + OUString aCode = maFieldStack.back().GetBookmarkCode(); if ( !aCode.isEmpty() ) { // Unhandled field with stored code @@ -740,23 +740,23 @@ sal_uInt16 SwWW8ImplReader::End_Field() { const IFieldmark::parameter_map_t& pParametersToAdd = maFieldStack.back().getParameters(); pFieldmark->GetParameters()->insert(pParametersToAdd.begin(), pParametersToAdd.end()); - rtl::OUString sFieldId = rtl::OUString::valueOf( sal_Int32( maFieldStack.back().mnFieldId ) ); + OUString sFieldId = OUString::valueOf( sal_Int32( maFieldStack.back().mnFieldId ) ); pFieldmark->GetParameters()->insert( - std::pair< rtl::OUString, uno::Any > ( + std::pair< OUString, uno::Any > ( ODF_ID_PARAM, uno::makeAny( sFieldId ) ) ); pFieldmark->GetParameters()->insert( - std::pair< rtl::OUString, uno::Any > ( + std::pair< OUString, uno::Any > ( ODF_CODE_PARAM, uno::makeAny( aCode ) ) ); if ( maFieldStack.back().mnObjLocFc > 0 ) { // Store the OLE object as an internal link - String sOleId = rtl::OUString('_'); + String sOleId = OUString('_'); sOleId += OUString::number( maFieldStack.back().mnObjLocFc ); - SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool)); + SvStorageRef xSrc0 = pStg->OpenSotStorage(OUString(SL::aObjectPool)); SvStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, STREAM_READ ); // Store it now! @@ -782,8 +782,8 @@ sal_uInt16 SwWW8ImplReader::End_Field() // Store the OLE Id as a parameter pFieldmark->GetParameters()->insert( - std::pair< rtl::OUString, uno::Any >( - ODF_OLE_PARAM, uno::makeAny( rtl::OUString( sOleId ) ) ) ); + std::pair< OUString, uno::Any >( + ODF_OLE_PARAM, uno::makeAny( OUString( sOleId ) ) ) ); } } @@ -840,27 +840,27 @@ WW8FieldEntry &WW8FieldEntry::operator=(const WW8FieldEntry &rOther) throw() return *this; } -::rtl::OUString WW8FieldEntry::GetBookmarkName() +OUString WW8FieldEntry::GetBookmarkName() { return msBookmarkName; } -::rtl::OUString WW8FieldEntry::GetBookmarkCode() +OUString WW8FieldEntry::GetBookmarkCode() { return msMarkCode; } -void WW8FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName) +void WW8FieldEntry::SetBookmarkName(OUString bookmarkName) { msBookmarkName=bookmarkName; } -void WW8FieldEntry::SetBookmarkType(::rtl::OUString bookmarkType) +void WW8FieldEntry::SetBookmarkType(OUString bookmarkType) { msMarkType=bookmarkType; } -void WW8FieldEntry::SetBookmarkCode(::rtl::OUString bookmarkCode) +void WW8FieldEntry::SetBookmarkCode(OUString bookmarkCode) { msMarkCode = bookmarkCode; } @@ -1144,7 +1144,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) // Wenn keins dieser Sonderzeichen enthalten ist, wird 0 zurueckgeliefert. void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg ) { - rtl::OUString sHex("\\x"); + OUString sHex("\\x"); bool bAllowCr = SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_IN_TEXT ) || SwFltGetFlag( nFieldFlags, SwFltControlStack::ALLOW_FLD_CR ); sal_Unicode cChar; @@ -1212,7 +1212,7 @@ void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg ) void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const String& rTagText ) { - String aName(rtl::OUString("WwFieldTag")); + String aName(OUString("WwFieldTag")); if( SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_DO_ID ) ) // Nummer? aName += OUString::number( nId ); // ausgeben ? @@ -1385,7 +1385,7 @@ long SwWW8ImplReader::MapBookmarkVariables(const WW8FieldDesc* pF, } else { - sName = rtl::OUString("WWSetBkmk"); + sName = OUString("WWSetBkmk"); nNo = pReffingStck->aFieldVarNames.size()+1; sName += OUString::number(nNo); nNo += pPlcxMan->GetBook()->GetIMax(); @@ -1506,7 +1506,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, String& rStr ) eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, String& rStr ) { if( !pNumFldType ){ // 1. Mal - SwSetExpFieldType aT( &rDoc, rtl::OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ ); + SwSetExpFieldType aT( &rDoc, OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ ); pNumFldType = rDoc.InsertFldType( aT ); } SwSetExpField aFld( (SwSetExpFieldType*)pNumFldType, aEmptyStr, @@ -1999,7 +1999,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr ) NewAttr(aSz); } - rDoc.InsertString(*pPaM, rtl::OUString(cChar)); + rDoc.InsertString(*pPaM, OUString(cChar)); if (nSize > 0) pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_CHRATR_FONTSIZE); @@ -2008,7 +2008,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr ) } else { - rDoc.InsertString(*pPaM, rtl::OUString("###")); + rDoc.InsertString(*pPaM, OUString("###")); } return FLD_OK; @@ -2217,10 +2217,10 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, String& rStr ) #if defined(WW_NATIVE_TOC) if (1) { - ::rtl::OUString aBookmarkName("_REF"); + OUString aBookmarkName("_REF"); maFieldStack.back().SetBookmarkName(aBookmarkName); maFieldStack.back().SetBookmarkType(ODF_PAGEREF); - maFieldStack.back().AddParam(rtl::OUString(), sName); + maFieldStack.back().AddParam(OUString(), sName); return FLD_TEXT; } #endif @@ -2262,7 +2262,7 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, String& rStr) aVText += aReadParam.GetResult(); if (bNewVText) { - bBracket = aVText.EqualsIgnoreCaseAscii(rtl::OUString('['), 1, 0) + bBracket = aVText.EqualsIgnoreCaseAscii(OUString('['), 1, 0) ? true : false; bNewVText = false; } @@ -2313,7 +2313,7 @@ bool CanUseRemoteLink(const String &rGrfName) ::ucbhelper::Content aCnt(rGrfName, uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - rtl::OUString aTitle; + OUString aTitle; aCnt.getPropertyValue("Title") >>= aTitle; bUseRemote = !aTitle.isEmpty(); @@ -2539,7 +2539,7 @@ void SwWW8ImplReader::Read_SubF_Combined( WW8ReadFieldParams& rReadParam) { String sCombinedCharacters; if ((-2 == rReadParam.SkipToNextToken()) && - rReadParam.GetResult().EqualsIgnoreCaseAscii(rtl::OUString('('), 1, 0)) + rReadParam.GetResult().EqualsIgnoreCaseAscii(OUString('('), 1, 0)) { for (int i=0;i<2;i++) { @@ -2549,8 +2549,8 @@ void SwWW8ImplReader::Read_SubF_Combined( WW8ReadFieldParams& rReadParam) if (-2 != rReadParam.SkipToNextToken()) break; String sF = rReadParam.GetResult(); - if ((('u' == cChar) && sF.EqualsIgnoreCaseAscii(rtl::OUString('p'), 1, 0)) - || (('d' == cChar) && sF.EqualsIgnoreCaseAscii(rtl::OUString('o'), 1, 0))) + if ((('u' == cChar) && sF.EqualsIgnoreCaseAscii(OUString('p'), 1, 0)) + || (('d' == cChar) && sF.EqualsIgnoreCaseAscii(OUString('o'), 1, 0))) { if (-2 == rReadParam.SkipToNextToken()) { @@ -2620,7 +2620,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam) if ('u' == nRet) { if (-2 == rReadParam.SkipToNextToken() && - (rReadParam.GetResult().EqualsIgnoreCaseAscii(rtl::OUString('p'), 1, 0))) + (rReadParam.GetResult().EqualsIgnoreCaseAscii(OUString('p'), 1, 0))) { if (-2 == rReadParam.SkipToNextToken()) { @@ -2924,7 +2924,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) { #if defined(WW_NATIVE_TOC) if (1) { - ::rtl::OUString aBookmarkName("_TOC"); + OUString aBookmarkName("_TOC"); maFieldStack.back().SetBookmarkName(aBookmarkName); maFieldStack.back().SetBookmarkType(ODF_TOC); return FLD_TEXT; @@ -3297,7 +3297,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) if ( aIt != aPattern.end() ) { SwFormToken aNumberEntrySeparator( TOKEN_TEXT ); - aNumberEntrySeparator.sText = rtl::OUString(" "); + aNumberEntrySeparator.sText = OUString(" "); aPattern.insert( ++aIt, aNumberEntrySeparator ); pForm->SetPattern( nStyleLevel, aPattern ); } @@ -3447,7 +3447,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr ) { #if defined(WW_NATIVE_TOC) if (1) { - ::rtl::OUString aBookmarkName("_HYPERLINK"); + OUString aBookmarkName("_HYPERLINK"); maFieldStack.back().SetBookmarkName(aBookmarkName); maFieldStack.back().SetBookmarkType(ODF_HYPERLINK); return FLD_TEXT; diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 8eb7940f9af1..43277d585541 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2705,7 +2705,7 @@ void SwWW8ImplReader::Read_Symbol(sal_uInt16, const sal_uInt8* pData, short nLen if( bVer67 ) { //convert single byte from MS1252 to Unicode - cSymbol = rtl::OUString( + cSymbol = OUString( reinterpret_cast(pData+2), 1, RTL_TEXTENCODING_MS_1252).toChar(); } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index a8ecc85e4f11..789412032541 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1903,7 +1903,7 @@ Err: String read_uInt8_BeltAndBracesString(SvStream& rStrm, rtl_TextEncoding eEnc) { - rtl::OUString aRet = read_lenPrefixed_uInt8s_ToOUString(rStrm, eEnc); + OUString aRet = read_lenPrefixed_uInt8s_ToOUString(rStrm, eEnc); rStrm.SeekRel(sizeof(sal_uInt8)); // skip null-byte at end return aRet; } @@ -3847,8 +3847,8 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen rArray.push_back(read_uInt16_PascalString(rStrm)); else { - rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString(rStrm); - rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); + OString aTmp = read_lenPrefixed_uInt8s_ToOString(rStrm); + rArray.push_back(OStringToOUString(aTmp, eCS)); } // Skip the extra data @@ -3878,8 +3878,8 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen pValueArray->push_back(read_uInt16_PascalString(rStrm)); else { - rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString(rStrm); - pValueArray->push_back(rtl::OStringToOUString(aTmp, eCS)); + OString aTmp = read_lenPrefixed_uInt8s_ToOString(rStrm); + pValueArray->push_back(OStringToOUString(aTmp, eCS)); } } } @@ -3904,9 +3904,9 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen ++nRead; if (nBChar) { - rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); + OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); nRead += aTmp.getLength(); - rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); + rArray.push_back(OStringToOUString(aTmp, eCS)); } else rArray.push_back(aEmptyStr); @@ -4146,9 +4146,9 @@ String WW8PLCFx_Book::GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex) return bFound ? aBookNames[i] : aEmptyStr; } -rtl::OUString WW8PLCFx_Book::GetUniqueBookmarkName(const rtl::OUString &rSuggestedName) +OUString WW8PLCFx_Book::GetUniqueBookmarkName(const OUString &rSuggestedName) { - rtl::OUString aRet(rSuggestedName.isEmpty() ? rtl::OUString("Unnamed") : rSuggestedName); + OUString aRet(rSuggestedName.isEmpty() ? OUString("Unnamed") : rSuggestedName); size_t i = 0; while (i < aBookNames.size()) { @@ -4158,7 +4158,7 @@ rtl::OUString WW8PLCFx_Book::GetUniqueBookmarkName(const rtl::OUString &rSuggest sal_Int32 p = len - 1; while (p > 0 && aRet[p] >= '0' && aRet[p] <= '9') --p; - aRet = aRet.copy(0, p+1) + rtl::OUString::valueOf(nBookmarkId++); + aRet = aRet.copy(0, p+1) + OUString::valueOf(nBookmarkId++); i = 0; // start search from beginning } else diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 6913545d67bd..e52cbc5b7361 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -724,7 +724,7 @@ public: bool MapName(String& rName); String GetBookmark(long nStart,long nEnd, sal_uInt16 &nIndex); eBookStatus GetStatus() const; - rtl::OUString GetUniqueBookmarkName(const rtl::OUString &rSuggestedName); + OUString GetUniqueBookmarkName(const OUString &rSuggestedName); }; /* diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 27e23ef29ada..26a80a68cfeb 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -51,7 +51,7 @@ using namespace com::sun::star; // no. of visual data elements in a SwCTB ( fixed ) const short nVisualData = 5; -typedef std::map< sal_Int16, rtl::OUString > IdToString; +typedef std::map< sal_Int16, OUString > IdToString; class MSOWordCommandConvertor : public MSOCommandConvertor { @@ -59,8 +59,8 @@ class MSOWordCommandConvertor : public MSOCommandConvertor IdToString tcidToOOcmd; public: MSOWordCommandConvertor(); - virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); - virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 key ); + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); + virtual OUString MSOTCIDToOOCommand( sal_Int16 key ); }; MSOWordCommandConvertor::MSOWordCommandConvertor() @@ -75,18 +75,18 @@ MSOWordCommandConvertor::MSOWordCommandConvertor() tcidToOOcmd[ 0x9d9 ] = ".uno:Print"; } -rtl::OUString MSOWordCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) +OUString MSOWordCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) { - rtl::OUString sResult; + OUString sResult; IdToString::iterator it = msoToOOcmd.find( key ); if ( it != msoToOOcmd.end() ) sResult = it->second; return sResult; } -rtl::OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) +OUString MSOWordCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) { - rtl::OUString sResult; + OUString sResult; IdToString::iterator it = tcidToOOcmd.find( key ); if ( it != tcidToOOcmd.end() ) sResult = it->second; @@ -117,7 +117,7 @@ Customization* SwCTBWrapper::GetCustomizaton( sal_Int16 index ) return &rCustomizations[ index ]; } -SwCTB* SwCTBWrapper::GetCustomizationData( const rtl::OUString& sTBName ) +SwCTB* SwCTBWrapper::GetCustomizationData( const OUString& sTBName ) { SwCTB* pCTB = NULL; for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it ) @@ -345,14 +345,14 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe if ( pCust ) { // currently only support built-in menu - rtl::OUString sMenuBar( "private:resource/menubar/" ); + OUString sMenuBar( "private:resource/menubar/" ); sMenuBar = sMenuBar.concat( "menubar" ); // Get menu name SwTBC* pTBC = pWrapper->GetTBCAtOffset( it->TBCStreamOffset() ); if ( !pTBC ) return false; - rtl::OUString sMenuName = pTBC->GetCustomText(); + OUString sMenuName = pTBC->GetCustomText(); sMenuName = sMenuName.replace('&','~'); // see if the document has already setting for the menubar @@ -378,7 +378,7 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe // create the popup menu uno::Sequence< beans::PropertyValue > aPopupMenu( 4 ); aPopupMenu[0].Name = "CommandURL"; - aPopupMenu[0].Value = uno::makeAny( rtl::OUString( "vnd.openoffice.org:" ) + sMenuName ); + aPopupMenu[0].Value = uno::makeAny( OUString( "vnd.openoffice.org:" ) + sMenuName ); aPopupMenu[1].Name = "Label"; aPopupMenu[1].Value <<= sMenuName; aPopupMenu[2].Name = "Type"; @@ -544,7 +544,7 @@ SwCTB::Print( FILE* fp ) { Indent a; indent_printf(fp, "[ 0x%x ] SwCTB - dump\n", nOffSet ); - indent_printf(fp, " name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf(fp, " name %s\n", OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf(fp, " cbTBData size, in bytes, of this structure excluding the name, cCtls, and rTBC fields. %x\n", static_cast< unsigned int >( cbTBData ) ); tb.Print(fp); @@ -568,7 +568,7 @@ SwCTB::Print( FILE* fp ) bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelper& helper ) { - static rtl::OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); + static OUString sToolbarPrefix( "private:resource/toolbar/custom_" ); bool bRes = false; try { @@ -582,7 +582,7 @@ bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelp // set UI name for toolbar xProps->setPropertyValue( "UIName", uno::makeAny( name.getString() ) ); - rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); + OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); for ( std::vector< SwTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) { // createToolBar item for control @@ -709,7 +709,7 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference< std::vector< css::beans::PropertyValue > props; if ( bBuiltin ) { - rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId ); + OUString sCommand = helper.MSOCommandToOOCommand( cmdId ); if ( !sCommand.isEmpty() ) { beans::PropertyValue aProp; @@ -772,10 +772,10 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference< return true; } -rtl::OUString +OUString SwTBC::GetCustomText() { - rtl::OUString sCustomText; + OUString sCustomText; if ( tbcd.get() ) sCustomText = tbcd->getGeneralInfo().CustomText(); return sCustomText; @@ -797,7 +797,7 @@ Xst::Print( FILE* fp ) { Indent a; indent_printf( fp, "[ 0x%x ] Xst -- dump\n", nOffSet ); - indent_printf( fp, " %s", rtl::OUStringToOString( sString, RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf( fp, " %s", OUStringToOString( sString, RTL_TEXTENCODING_UTF8 ).getStr() ); } Tcg::Tcg() : nTcgVer( -1 ) @@ -1143,7 +1143,7 @@ void TcgSttbfCore::Print( FILE* fp ) if ( cData ) { for ( sal_Int32 index = 0; index < cData; ++index ) - indent_printf(fp," string dataItem[ %d(0x%x) ] has name %s and if referenced %d times.\n", static_cast< int >( index ), static_cast< unsigned int >( index ), rtl::OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr(), dataItems[ index ].extraData ); + indent_printf(fp," string dataItem[ %d(0x%x) ] has name %s and if referenced %d times.\n", static_cast< int >( index ), static_cast< unsigned int >( index ), OUStringToOString( dataItems[ index ].data, RTL_TEXTENCODING_UTF8 ).getStr(), dataItems[ index ].extraData ); } } diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index 85b8a902ab6f..bb38220bffd7 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -35,11 +35,11 @@ class Xst : public TBBase { - rtl::OUString sString; + OUString sString; public: Xst(){} bool Read(SvStream &rS); - rtl::OUString getString() { return sString; } + OUString getString() { return sString; } void Print( FILE* fp ); }; @@ -55,7 +55,7 @@ public: bool Read(SvStream &rS); void Print( FILE* ); bool ImportToolBarControl( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool ); - rtl::OUString GetCustomText(); + OUString GetCustomText(); }; class SwCTB : public TBBase @@ -80,7 +80,7 @@ public: bool IsMenuToolbar(); bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenuTB( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); - rtl::OUString GetName() { return tb.getName().getString(); } + OUString GetName() { return tb.getName().getString(); } }; class TBDelta : public TBBase @@ -174,7 +174,7 @@ public: bool ImportCustomToolBar( SfxObjectShell& rDocSh ); Customization* GetCustomizaton( sal_Int16 index ); - SwCTB* GetCustomizationData( const rtl::OUString& name ); + SwCTB* GetCustomizationData( const OUString& name ); void Print( FILE* ); }; @@ -272,7 +272,7 @@ class TcgSttbfCore : public TBBase struct SBBItem { sal_uInt16 cchData; - rtl::OUString data; + OUString data; sal_uInt16 extraData; SBBItem() : cchData(0), extraData(0){} }; diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index d1cece0b1abf..b2abe8fa8642 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::frame::XModel; using ::com::sun::star::text::XTextCursor; using ::com::sun::star::text::XTextRange; diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx index 2858d70013a4..24f2517232d4 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx @@ -37,17 +37,17 @@ namespace com { namespace sun { namespace star { } } } -typedef ::std::map< ::rtl::OUString, RedlineInfo* > RedlineMapType; +typedef ::std::map< OUString, RedlineInfo* > RedlineMapType; class XMLRedlineImportHelper { - const ::rtl::OUString sEmpty; - const ::rtl::OUString sInsertion; - const ::rtl::OUString sDeletion; - const ::rtl::OUString sFormatChange; - const ::rtl::OUString sShowChanges; - const ::rtl::OUString sRecordChanges; - const ::rtl::OUString sRedlineProtectionKey; + const OUString sEmpty; + const OUString sInsertion; + const OUString sDeletion; + const OUString sFormatChange; + const OUString sShowChanges; + const OUString sRecordChanges; + const OUString sRedlineProtectionKey; RedlineMapType aRedlineMap; @@ -81,10 +81,10 @@ public: /// (The redline will be inserted into the document after both start /// and end cursor has been set.) void Add( - const ::rtl::OUString& rType, /// redline type (insert, del,... ) - const ::rtl::OUString& rId, /// use to identify this redline - const ::rtl::OUString& rAuthor, /// name of the author - const ::rtl::OUString& rComment, /// redline comment + const OUString& rType, /// redline type (insert, del,... ) + const OUString& rId, /// use to identify this redline + const OUString& rAuthor, /// name of the author + const OUString& rComment, /// redline comment const ::com::sun::star::util::DateTime& rDateTime, /// date+time sal_Bool bMergeLastParagraph); /// merge last paragraph? @@ -94,12 +94,12 @@ public: ::com::sun::star::text::XTextCursor> CreateRedlineTextSection( ::com::sun::star::uno::Reference< /// needed to get the document ::com::sun::star::text::XTextCursor> xOldCursor, - const ::rtl::OUString& rId); /// ID used to RedlineAdd() call + const OUString& rId); /// ID used to RedlineAdd() call /// Set start or end position for a redline in the text body. /// Accepts XTextRange objects. void SetCursor( - const ::rtl::OUString& rId, /// ID used in RedlineAdd() call + const OUString& rId, /// ID used in RedlineAdd() call sal_Bool bStart, /// start or end Range ::com::sun::star::uno::Reference< /// the actual XTextRange ::com::sun::star::text::XTextRange> & rRange, @@ -116,7 +116,7 @@ public: * only be considered valid if it points to the next text node * after the position given in a previous SetCursor */ void AdjustStartNodeCursor( - const ::rtl::OUString& rId, /// ID used in RedlineAdd() call + const OUString& rId, /// ID used in RedlineAdd() call sal_Bool bStart, /// XTextRange _inside_ a table/section ::com::sun::star::uno::Reference< diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 3e48044e8b27..ac78331779ec 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -83,7 +83,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; using namespace ::com::sun::star::lang; -using ::rtl::OUString; static void lcl_EnsureValidPam( SwPaM& rPam ) @@ -172,7 +171,7 @@ sal_Int32 ReadThroughComponent( #ifdef TIMELOG // if we do profiling, we want to know the stream - rtl::OString aString(rtl::OUStringToOString(rStreamName, + OString aString(OUStringToOString(rStreamName, RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_TRACE_AUTHOR1( "sw", "mb93740", "ReadThroughComponent : parsing \"%s\"", aString.getStr() ); @@ -207,9 +206,9 @@ sal_Int32 ReadThroughComponent( return ERRCODE_SFX_WRONGPASSWORD; #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX parse exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -243,9 +242,9 @@ sal_Int32 ReadThroughComponent( return ERRCODE_SFX_WRONGPASSWORD; #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "SAX exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -256,9 +255,9 @@ sal_Int32 ReadThroughComponent( { (void)r; #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "Zip exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -268,9 +267,9 @@ sal_Int32 ReadThroughComponent( { (void)r; #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "IO exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -280,9 +279,9 @@ sal_Int32 ReadThroughComponent( { (void)r; #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( "uno exception caught while importing:\n")); - aError.append(rtl::OUStringToOString(r.Message, + aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aError.getStr()); #endif @@ -698,7 +697,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con Reference< container::XNameAccess > xLateInitSettings( document::NamedPropertyValues::create(xContext), UNO_QUERY_THROW ); beans::NamedValue aLateInitSettings( - ::rtl::OUString( "LateInitSettings" ), + OUString( "LateInitSettings" ), makeAny( xLateInitSettings ) ); @@ -792,12 +791,12 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con SfxMedium* pMedDescrMedium = pMedium ? pMedium : pDocSh->GetMedium(); OSL_ENSURE( pMedDescrMedium, "There is no medium to get MediaDescriptor from!\n" ); - ::rtl::OUString aBaseURL( rBaseURL ); + OUString aBaseURL( rBaseURL ); OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, makeAny( aBaseURL ) ); // TODO/LATER: separate links from usual embedded objects - ::rtl::OUString StreamPath; + OUString StreamPath; if( SFX_CREATE_MODE_EMBEDDED == rDoc.GetDocShell()->GetCreateMode() ) { if ( pMedDescrMedium && pMedDescrMedium->GetItemSet() ) @@ -809,7 +808,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con } else { - StreamPath = ::rtl::OUString("dummyObjectName"); + StreamPath = OUString("dummyObjectName"); } if( !StreamPath.isEmpty() ) diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 11ccee0b9bb8..096d0ced53f1 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -53,7 +53,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; @@ -73,7 +72,7 @@ SwXMLWriter::~SwXMLWriter() sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& xStatusIndicator, - const rtl::OUString& aDocHierarchicalName ) + const OUString& aDocHierarchicalName ) { // Get service factory uno::Reference< uno::XComponentContext > xContext = @@ -207,7 +206,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, // Set base URI OUString sPropName("BaseURI"); - xInfoSet->setPropertyValue( sPropName, makeAny( ::rtl::OUString( GetBaseURL() ) ) ); + xInfoSet->setPropertyValue( sPropName, makeAny( OUString( GetBaseURL() ) ) ); if( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocShell()->GetCreateMode() ) { @@ -215,7 +214,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, if ( !aDocHierarchicalName.isEmpty() ) aName = aDocHierarchicalName; else - aName = ::rtl::OUString( "dummyObjectName" ); + aName = OUString( "dummyObjectName" ); sPropName = OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, makeAny( aName ) ); @@ -298,10 +297,10 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, { const uno::Reference xPropSet(xStg, uno::UNO_QUERY_THROW); - const ::rtl::OUString VersionProp("Version"); + const OUString VersionProp("Version"); try { - ::rtl::OUString Version; + OUString Version; // ODF >= 1.2 if ((xPropSet->getPropertyValue(VersionProp) >>= Version) && !Version.equals(ODFVER_010_TEXT) @@ -328,7 +327,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, Reference< frame::XModule > xModule( xModelComp, UNO_QUERY ); if ( xModule.is() ) { - ::rtl::OUString aModuleID = xModule->getIdentifier(); + OUString aModuleID = xModule->getIdentifier(); bStoreMeta = ( !aModuleID.isEmpty() && ( aModuleID == "com.sun.star.sdb.FormDesign" || aModuleID == "com.sun.star.sdb.TextReportDesign" ) ); } } @@ -410,7 +409,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, OUString aMime("application/binary"); uno::Any aAny2; aAny2 <<= aMime; - xSet->setPropertyValue( rtl::OUString("MediaType"), aAny2 ); + xSet->setPropertyValue( OUString("MediaType"), aAny2 ); pDoc->WriteLayoutCache( *pStream ); } @@ -465,13 +464,13 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, sal_uLong SwXMLWriter::WriteStorage() { - return _Write( uno::Reference < task::XStatusIndicator >(), ::rtl::OUString() ); + return _Write( uno::Reference < task::XStatusIndicator >(), OUString() ); } sal_uLong SwXMLWriter::WriteMedium( SfxMedium& aTargetMedium ) { uno::Reference < task::XStatusIndicator > xStatusIndicator; - rtl::OUString aName; + OUString aName; const SfxUnoAnyItem* pStatusBarItem = static_cast( aTargetMedium.GetItemSet()->GetItem(SID_PROGRESS_STATUSBAR_CONTROL) ); if ( pStatusBarItem ) @@ -524,7 +523,7 @@ bool SwXMLWriter::WriteThroughComponent( OUString aMime("text/xml"); uno::Any aAny; aAny <<= aMime; - xSet->setPropertyValue( rtl::OUString("MediaType"), aAny ); + xSet->setPropertyValue( OUString("MediaType"), aAny ); OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption"); diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index debc8d98d27e..8097510abf65 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { class SwXMLWriter : public StgWriter { - sal_uInt32 _Write( const com::sun::star::uno::Reference < com::sun::star::task::XStatusIndicator>&, const rtl::OUString& ); + sal_uInt32 _Write( const com::sun::star::uno::Reference < com::sun::star::task::XStatusIndicator>&, const OUString& ); using StgWriter::Write; diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index 05a24adec83d..4364c341bd72 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -37,7 +37,6 @@ #include "xmlimpit.hxx" #include "xmlexpit.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx index 923f92868cfb..e524f9b42c1f 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -50,7 +50,7 @@ public: SwXMLBrushItemImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const SvXMLUnitConverter& rUnitConv, @@ -59,7 +59,7 @@ public: SwXMLBrushItemImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const SvXMLUnitConverter& rUnitConv, @@ -68,7 +68,7 @@ public: virtual ~SwXMLBrushItemImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index ea2bbec578ce..8012a86e36bc 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -64,7 +64,6 @@ #include // #i73788# -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; @@ -446,7 +445,7 @@ void SwXMLExport::SetBodyAttributes() pDoc->GetCurrentViewShell()->GetPageCount() > 1 ) { sal_Bool bValue = sal_True; - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertBool(sBuffer, bValue); AddAttribute(XML_NAMESPACE_TEXT, XML_USE_SOFT_PAGE_BREAKS, sBuffer.makeStringAndClear()); @@ -494,7 +493,7 @@ void SwXMLExport::_ExportContent() aAny >>= nYear; if (nYear != 1930 ) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nYear); AddAttribute(XML_NAMESPACE_TABLE, XML_NULL_YEAR, sBuffer.makeStringAndClear()); SvXMLElementExport aCalcSettings(*this, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, sal_True, sal_True); diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 9af8a5cee5c8..a30bb1d74f74 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -68,7 +68,7 @@ class SwXMLExport : public SvXMLExport void ExportTableLinesAutoStyles( const SwTableLines& rLines, sal_uInt32 nAbsWidth, sal_uInt32 nBaseWidth, - const ::rtl::OUString& rNamePrefix, + const OUString& rNamePrefix, SwXMLTableColumnsSortByWidth_Impl& rExpCols, SwXMLTableFrmFmtsSort_Impl& rExpRows, SwXMLTableFrmFmtsSort_Impl& rExpCells, @@ -101,9 +101,9 @@ class SwXMLExport : public SvXMLExport virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ); // string constants for table cell export - const ::rtl::OUString sNumberFormat; - const ::rtl::OUString sIsProtected; - const ::rtl::OUString sCell; + const OUString sNumberFormat; + const OUString sIsProtected; + const OUString sCell; void setBlockMode(); private: @@ -145,7 +145,7 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo (override parent method) - ::rtl::OUString SAL_CALL getImplementationName() + OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); const SwDoc* getDoc() const; diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 71d2f7c8f067..9cf92e038205 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -52,8 +52,6 @@ using ::editeng::SvxBorderLine; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; using uno::Any; diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index 39e195d15ed1..e40e25e3a8c1 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -114,7 +114,7 @@ public: inline void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ); static bool QueryXMLValue( const SfxPoolItem& rItem, - ::rtl::OUString& rValue, sal_uInt16 nMemberId, + OUString& rValue, sal_uInt16 nMemberId, const SvXMLUnitConverter& rUnitConverter ); }; diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 8eae79fb2586..452271c6e75f 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -52,8 +52,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; class SwXMLConditionParser_Impl @@ -745,7 +743,7 @@ protected: virtual uno::Reference < container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; - virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const; // HACK public: diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 1546f3aacc92..fec9a9f4984e 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -39,7 +39,6 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -47,7 +46,6 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; using namespace ::xmloff::token; -using rtl::OUString; void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily ) { diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 8b79d6bd2327..34e16489c1b6 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -67,7 +67,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -908,7 +907,7 @@ void SwXMLImport::endDocument( void ) { Sequence< beans::PropertyValue > aXFormsSettings; - ::rtl::OUString sXFormsSettingsName( GetXMLToken( XML_XFORM_MODEL_SETTINGS ) ); + OUString sXFormsSettingsName( GetXMLToken( XML_XFORM_MODEL_SETTINGS ) ); if ( xLateInitSettings.is() && xLateInitSettings->hasByName( sXFormsSettingsName ) ) { OSL_VERIFY( xLateInitSettings->getByName( sXFormsSettingsName ) >>= aXFormsSettings ); @@ -1469,7 +1468,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC void SwXMLImport::SetDocumentSpecificSettings( - const ::rtl::OUString& _rSettingsGroupName, + const OUString& _rSettingsGroupName, const Sequence< PropertyValue>& _rSettings ) { // the only doc-specific settings group we know so far are the XForms settings diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 5e2e4959c918..76738e0d65d3 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -99,7 +99,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -128,7 +128,7 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo (override parent method) - ::rtl::OUString SAL_CALL getImplementationName() + OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); void InsertStyles( sal_Bool bAuto ); @@ -138,22 +138,22 @@ public: // NB: in contrast to other CreateFooContexts, this particular one handles // the root element (i.e. office:document-meta) - SvXMLImportContext *CreateMetaContext( const ::rtl::OUString& rLocalName ); - SvXMLImportContext *CreateScriptContext( const ::rtl::OUString& rLocalName ); + SvXMLImportContext *CreateMetaContext( const OUString& rLocalName ); + SvXMLImportContext *CreateScriptContext( const OUString& rLocalName ); SvXMLImportContext *CreateStylesContext( - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Bool bAuto ); SvXMLImportContext *CreateMasterStylesContext( - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); SvXMLImportContext *CreateFontDeclsContext( - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - SvXMLImportContext *CreateBodyContentContext( const ::rtl::OUString& rLocalName ); + SvXMLImportContext *CreateBodyContentContext( const OUString& rLocalName ); sal_uInt16 GetStyleFamilyMask() const { return nStyleFamilyMask; } bool IsInsertMode() const { return bInsert; } bool IsStylesOnlyMode() const { return !bLoadDoc; } @@ -164,7 +164,7 @@ public: inline const SvXMLImportItemMapper& GetTableItemMapper() const; inline SvXMLImportItemMapper& GetTableItemMapper(); SvXMLImportContext *CreateTableItemImportContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_uInt16 nSubFamily, SfxItemSet& rItemSet ); @@ -174,15 +174,15 @@ public: const SvXMLTokenMap& GetTableCellAttrTokenMap(); bool FindAutomaticStyle( sal_uInt16 nFamily, - const ::rtl::OUString& rName, + const OUString& rName, const SfxItemSet **ppItemSet=0, - ::rtl::OUString *pParent=0 ) const; + OUString *pParent=0 ) const; virtual void SetStatistics( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats); virtual void SetViewSettings(const com::sun::star::uno::Sequence& aViewProps); virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence& aConfigProps); - virtual void SetDocumentSpecificSettings(const ::rtl::OUString& _rSettingsGroupName, + virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName, const com::sun::star::uno::Sequence& _rSettings); SvStorage *GetPackage() { return &xPackage; } diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 22878e325e37..6d57f456249d 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -53,7 +53,6 @@ #include using ::editeng::SvxBorderLine; -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::xmloff::token; using uno::Any; @@ -228,7 +227,7 @@ SvXMLImportItemMapper::finished(SfxItemSet &, SvXMLUnitConverter const&) const // put an XML-string value into an item bool SvXMLImportItemMapper::PutXMLValue( SfxPoolItem& rItem, - const ::rtl::OUString& rValue, + const OUString& rValue, sal_uInt16 nMemberId, const SvXMLUnitConverter& rUnitConverter ) { diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx index 5b2fce09fa2a..5c044a342301 100644 --- a/sw/source/filter/xml/xmlimpit.hxx +++ b/sw/source/filter/xml/xmlimpit.hxx @@ -56,7 +56,7 @@ public: virtual bool handleSpecialItem( const SvXMLItemMapEntry& rEntry, SfxPoolItem& rItem, SfxItemSet& rSet, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ); @@ -64,7 +64,7 @@ public: MID_SW_FLAG_NO_ITEM_IMPORT flag set */ virtual bool handleNoItem( const SvXMLItemMapEntry& rEntry, SfxItemSet& rSet, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ); @@ -81,7 +81,7 @@ public: upon an XML attribute value. */ static bool PutXMLValue( SfxPoolItem& rItem, - const ::rtl::OUString& rValue, + const OUString& rValue, sal_uInt16 nMemberId, const SvXMLUnitConverter& rUnitConverter ); }; diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx index 7b6b455a86fb..75445bbfe76f 100644 --- a/sw/source/filter/xml/xmlitem.cxx +++ b/sw/source/filter/xml/xmlitem.cxx @@ -21,7 +21,6 @@ #include "xmlimpit.hxx" #include "xmlitem.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; SvXMLItemSetContext::SvXMLItemSetContext( SvXMLImport& rImp, sal_uInt16 nPrfx, @@ -63,7 +62,7 @@ SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix, SvXMLImportItemMapper with the mid flag MID_SW_FLAG_ELEMENT */ SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/, SfxItemSet& /*rItemSet*/, const SvXMLItemMapEntry& /*rEntry*/, diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index bc04c0a1b6c9..4c428364b963 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -42,7 +42,7 @@ protected: public: SvXMLItemSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, SfxItemSet& rItemSet, SvXMLImportItemMapper& rIMap, @@ -51,14 +51,14 @@ public: virtual ~SvXMLItemSetContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // This method is called from this instance implementation of // CreateChildContext if the element matches an entry in the // SvXMLImportItemMapper with the mid flag MID_SW_FLAG_ELEMENT_ITEM_IMPORT virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, SfxItemSet& rItemSet, const SvXMLItemMapEntry& rEntry, diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index f23db6f8b43b..be0e27cb8a4d 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -43,8 +43,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 379579dd6de3..1df63c9976a6 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -50,7 +50,6 @@ #include "xmlimpit.hxx" #include "xmlitem.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -77,7 +76,7 @@ public: virtual bool handleNoItem(SvXMLItemMapEntry const& rEntry, SfxItemSet & rSet, - ::rtl::OUString const& rValue, + OUString const& rValue, SvXMLUnitConverter const& rUnitConverter, SvXMLNamespaceMap const& rNamespaceMap); @@ -89,7 +88,7 @@ public: private: void Reset(); - ::rtl::OUString m_FoMarginValue; + OUString m_FoMarginValue; enum { LEFT = 0, RIGHT = 1, TOP = 2, BOTTOM = 3 }; bool m_bHaveMargin[4]; }; @@ -107,7 +106,7 @@ SwXMLImportTableItemMapper_Impl::~SwXMLImportTableItemMapper_Impl() void SwXMLImportTableItemMapper_Impl::Reset() { - m_FoMarginValue = ::rtl::OUString(); + m_FoMarginValue = OUString(); for (int i = 0; i < 3; ++i) { m_bHaveMargin[i] = false; @@ -180,7 +179,7 @@ bool SwXMLImportTableItemMapper_Impl::handleSpecialItem( bool SwXMLImportTableItemMapper_Impl::handleNoItem( SvXMLItemMapEntry const& rEntry, SfxItemSet & rSet, - ::rtl::OUString const& rValue, + OUString const& rValue, SvXMLUnitConverter const& rUnitConverter, SvXMLNamespaceMap const& rNamespaceMap) { @@ -262,7 +261,7 @@ public: virtual ~SwXMLItemSetContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::uno::Reference< xml::sax::XAttributeList > & xAttrList, SfxItemSet& rItemSet, const SvXMLItemMapEntry& rEntry, diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index db555aebe122..10627afe22e8 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -37,7 +37,6 @@ #include using ::editeng::SvxBorderLine; -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star; diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx index 1401660430cc..23a2a85e3291 100644 --- a/sw/source/filter/xml/xmlithlp.hxx +++ b/sw/source/filter/xml/xmlithlp.hxx @@ -37,7 +37,7 @@ namespace rtl { class OUString; } /** Define various helper variables and functions for xmlimpit.cxx and * xmlexpit.cxx. */ -bool sw_frmitems_parseXMLBorder( const ::rtl::OUString& rValue, +bool sw_frmitems_parseXMLBorder( const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, bool& rHasStyle, sal_uInt16& rStyle, bool& rHasWidth, sal_uInt16& rWidth, diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx index 275f2172f94c..4faacd4c82a8 100644 --- a/sw/source/filter/xml/xmlitmap.hxx +++ b/sw/source/filter/xml/xmlitmap.hxx @@ -74,7 +74,7 @@ public: virtual ~SvXMLItemMapEntries(); SvXMLItemMapEntry* getByName( sal_uInt16 nNameSpace, - const ::rtl::OUString& rString, + const OUString& rString, SvXMLItemMapEntry* pStartAt = NULL ) const; SvXMLItemMapEntry* getByIndex( sal_uInt16 nIndex ) const; diff --git a/sw/source/filter/xml/xmlitmpr.cxx b/sw/source/filter/xml/xmlitmpr.cxx index 375c36409575..f2796f8bee66 100644 --- a/sw/source/filter/xml/xmlitmpr.cxx +++ b/sw/source/filter/xml/xmlitmpr.cxx @@ -20,7 +20,6 @@ #include #include "xmlitmap.hxx" -using rtl::OUString; using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_TOKEN_INVALID; diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index 2d3334b0522b..6352f2be4134 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -34,8 +34,6 @@ #include "xmlexp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx index a50d57a28b1e..e5f55ad44c15 100644 --- a/sw/source/filter/xml/xmlscript.cxx +++ b/sw/source/filter/xml/xmlscript.cxx @@ -24,7 +24,6 @@ #include "xmlimp.hxx" #include "xmlexp.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; // --------------------------------------------------------------------- diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index d33edb61ccee..a7bce2873a7f 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -52,8 +52,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index cc273a7eea7a..ec43a0ce33c6 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -57,7 +57,6 @@ #include #include "ndtxt.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -67,7 +66,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; using ::boost::unordered_map; -using rtl::OUString; enum SwXMLTableElemTokens { @@ -1175,7 +1173,7 @@ static String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode) if (sPrefixStr.Len() == 0) { - sPrefixStr = rtl::OUString('_'); + sPrefixStr = OUString('_'); } // increase count until we find a name that is not yet taken diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index f6d9da92cabb..7062dc487a0c 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -50,10 +50,10 @@ namespace com { namespace sun { namespace star { class SwXMLTableContext : public XMLTextTableContext { - ::rtl::OUString aStyleName; - ::rtl::OUString aDfltCellStyleName; + OUString aStyleName; + OUString aDfltCellStyleName; /// NB: this contains the xml:id only if this table is a subtable! - ::rtl::OUString mXmlId; + OUString mXmlId; //! Holds basic information about a column's width. struct ColumnWidthInfo { @@ -125,7 +125,7 @@ class SwXMLTableContext : public XMLTextTableContext /** sets the appropriate SwTblBoxFmt at pBox. */ SwTableBoxFmt* GetSharedBoxFormat( SwTableBox* pBox, /// the table box - const ::rtl::OUString& rStyleName, /// XML style name + const OUString& rStyleName, /// XML style name sal_Int32 nColumnWidth, /// width of column sal_Bool bProtected, /// is cell protected? sal_Bool bMayShare, /// may the format be shared (no value, formula...) @@ -137,29 +137,29 @@ public: TYPEINFO(); SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable, - const ::rtl::OUString& i_rXmlId ); + const OUString& i_rXmlId ); virtual ~SwXMLTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } void InsertColumn( sal_Int32 nWidth, bool bRelWidth, - const ::rtl::OUString *pDfltCellStyleName = 0 ); + const OUString *pDfltCellStyleName = 0 ); sal_Int32 GetColumnWidth( sal_uInt32 nCol, sal_uInt32 nColSpan=1UL ) const; - ::rtl::OUString GetColumnDefaultCellStyleName( sal_uInt32 nCol ) const; + OUString GetColumnDefaultCellStyleName( sal_uInt32 nCol ) const; inline sal_uInt32 GetColumnCount() const; inline bool HasColumnDefaultCellStyleNames() const; @@ -168,20 +168,20 @@ public: bool IsInsertRowPossible() const { return nCurRow < USHRT_MAX; } bool IsValid() const { return pTableNode != 0; } - void InsertCell( const ::rtl::OUString& rStyleName, + void InsertCell( const OUString& rStyleName, sal_uInt32 nRowSpan=1U, sal_uInt32 nColSpan=1U, const SwStartNode *pStNd=0, - const ::rtl::OUString & i_rXmlId = ::rtl::OUString(), + const OUString & i_rXmlId = OUString(), SwXMLTableContext *pTable=0, sal_Bool bIsProtected = sal_False, - const ::rtl::OUString *pFormula=0, + const OUString *pFormula=0, sal_Bool bHasValue = sal_False, double fValue = 0.0, - ::rtl::OUString const*const pStringValue = 0); - void InsertRow( const ::rtl::OUString& rStyleName, - const ::rtl::OUString& rDfltCellStyleName, + OUString const*const pStringValue = 0); + void InsertRow( const OUString& rStyleName, + const OUString& rDfltCellStyleName, bool bInHead, - const ::rtl::OUString & i_rXmlId = ::rtl::OUString() ); + const OUString & i_rXmlId = OUString() ); void FinishRow(); void InsertRepRows( sal_uInt32 nCount ); const SwXMLTableCell_Impl *GetCell( sal_uInt32 nRow, sal_uInt32 nCol ) const; diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index efa81035479d..8e1e208334d9 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -20,7 +20,6 @@ #include #include "xmlimp.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 36b6efebffe7..987a465d59d2 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -46,8 +46,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; @@ -56,8 +54,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; using namespace ::com::sun::star::io; using namespace ::xmloff::token; -using rtl::OUString; -using rtl::OUStringBuffer; enum SvEmbeddedObjectTypes { @@ -300,36 +296,36 @@ static void lcl_addFrameProperties( if ( !xSet.is() ) return; - ::rtl::OUString aURL; - Any aAny = xSet->getPropertyValue( ::rtl::OUString("FrameURL") ); + OUString aURL; + Any aAny = xSet->getPropertyValue( OUString("FrameURL") ); aAny >>= aURL; - ::rtl::OUString aName; - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameName")); + OUString aName; + aAny = xSet->getPropertyValue( OUString("FrameName")); aAny >>= aName; sal_Bool bIsAutoScroll = sal_False, bIsScrollingMode; - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoScroll")); + aAny = xSet->getPropertyValue( OUString("FrameIsAutoScroll")); aAny >>= bIsAutoScroll; if ( !bIsAutoScroll ) { - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsScrollingMode") ); + aAny = xSet->getPropertyValue( OUString("FrameIsScrollingMode") ); aAny >>= bIsScrollingMode; } sal_Bool bIsBorderSet, bIsAutoBorder = sal_False; - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoBorder") ); + aAny = xSet->getPropertyValue( OUString("FrameIsAutoBorder") ); aAny >>= bIsAutoBorder; if ( !bIsAutoBorder ) { - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsBorder") ); + aAny = xSet->getPropertyValue( OUString("FrameIsBorder") ); aAny >>= bIsBorderSet; } sal_Int32 nWidth, nHeight; - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginWidth") ); + aAny = xSet->getPropertyValue( OUString("FrameMarginWidth") ); aAny >>= nWidth; - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginHeight") ); + aAny = xSet->getPropertyValue( OUString("FrameMarginHeight") ); aAny >>= nHeight; if( !bIsAutoScroll ) @@ -550,28 +546,28 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( if( svt::EmbeddedObjectRef::TryRunningState( rObjRef.GetObject() ) ) { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); - ::rtl::OUString aStr; - Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCodeBase") ); + OUString aStr; + Any aAny2 = xSet->getPropertyValue( OUString("AppletCodeBase") ); aAny2 >>= aStr; if (!aStr.isEmpty() ) lcl_addURL(rXMLExport, aStr); - aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletName") ); + aAny2 = xSet->getPropertyValue( OUString("AppletName") ); aAny2 >>= aStr; if (!aStr.isEmpty()) rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME, aStr ); - aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCode") ); + aAny2 = xSet->getPropertyValue( OUString("AppletCode") ); aAny2 >>= aStr; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr ); sal_Bool bScript = sal_False; - aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletIsScript") ); + aAny2 = xSet->getPropertyValue( OUString("AppletIsScript") ); aAny2 >>= bScript; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bScript ? XML_TRUE : XML_FALSE ); uno::Sequence < beans::PropertyValue > aProps; - aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") ); + aAny2 = xSet->getPropertyValue( OUString("AppletCommands") ); aAny2 >>= aProps; sal_Int32 i = aProps.getLength(); @@ -581,7 +577,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_True ); if ( nType2 == SWHTML_OPTTYPE_TAG) { - ::rtl::OUString aStr2; + OUString aStr2; aProp.Value >>= aStr2; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, aProp.Name, aStr2); } @@ -597,12 +593,12 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( if ( svt::EmbeddedObjectRef::TryRunningState( rObjRef.GetObject() ) ) { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); - ::rtl::OUString aStr; - Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("PluginURL") ); + OUString aStr; + Any aAny2 = xSet->getPropertyValue( OUString("PluginURL") ); aAny2 >>= aStr; lcl_addURL( rXMLExport, aStr ); - aAny2 = xSet->getPropertyValue( ::rtl::OUString("PluginMimeType") ); + aAny2 = xSet->getPropertyValue( OUString("PluginMimeType") ); aAny2 >>= aStr; if (!aStr.isEmpty()) rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, aStr ); @@ -616,13 +612,13 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( if ( svt::EmbeddedObjectRef::TryRunningState( rObjRef.GetObject() ) ) { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); - ::rtl::OUString aStr; - Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("FrameURL") ); + OUString aStr; + Any aAny2 = xSet->getPropertyValue( OUString("FrameURL") ); aAny2 >>= aStr; lcl_addURL( rXMLExport, aStr ); - aAny2 = xSet->getPropertyValue( ::rtl::OUString("FrameName") ); + aAny2 = xSet->getPropertyValue( OUString("FrameName") ); aAny2 >>= aStr; if (!aStr.isEmpty()) @@ -656,7 +652,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( sURL += rOLEObj.GetCurrentPersistName(); if ( ( rXMLExport.getExportFlags() & EXPORT_OASIS ) == 0 ) - sURL += ::rtl::OUString( "?oasis=false" ); + sURL += OUString( "?oasis=false" ); rXMLExport.AddEmbeddedObjectAsBase64( sURL ); } @@ -667,7 +663,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") ); + aAny = xSet->getPropertyValue( OUString("AppletCommands") ); aAny >>= aProps; sal_Int32 i = aProps.getLength(); @@ -677,7 +673,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_True ); if (SWHTML_OPTTYPE_PARAM == nType2 || SWHTML_OPTTYPE_SIZE == nType2 ) { - ::rtl::OUString aStr; + OUString aStr; aProp.Value >>= aStr; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aProp.Name ); rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr ); @@ -693,7 +689,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( ::rtl::OUString("PluginCommands") ); + aAny = xSet->getPropertyValue( OUString("PluginCommands") ); aAny >>= aProps; sal_Int32 i = aProps.getLength(); @@ -703,7 +699,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_False ); if ( nType2 == SWHTML_OPTTYPE_TAG) { - ::rtl::OUString aStr; + OUString aStr; aProp.Value >>= aStr; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aProp.Name ); rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr ); diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 34d1bb6ef5d5..7cceb4a8e880 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -32,9 +32,9 @@ namespace com { namespace sun { namespace star { namespace style { class SwXMLTextParagraphExport : public XMLTextParagraphExport { - const ::rtl::OUString sTextTable; - const ::rtl::OUString sEmbeddedObjectProtocol; - const ::rtl::OUString sGraphicObjectProtocol; + const OUString sTextTable; + const OUString sEmbeddedObjectProtocol; + const OUString sGraphicObjectProtocol; const SvGlobalName aAppletClassId; const SvGlobalName aPluginClassId; @@ -73,7 +73,7 @@ public: virtual void setTextEmbeddedGraphicURL( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rPropSet, - ::rtl::OUString& rStreamName ) const; + OUString& rStreamName ) const; }; diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 62665b2c43a0..c230dd641f70 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -63,8 +63,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -278,12 +276,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( { // create object with desired ClassId sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - ::rtl::OUString aName("DummyName"); + OUString aName("DummyName"); uno::Sequence < sal_Int8 > aClass( aClassName.GetByteSequence() ); uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() ); uno::Reference < embed::XEmbeddedObject > xObj = uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew( - aClass, ::rtl::OUString(), xStorage, aName, + aClass, OUString(), xStorage, aName, uno::Sequence < beans::PropertyValue >() ), uno::UNO_QUERY ); if ( xObj.is() ) { @@ -315,12 +313,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( SwOLENode* pExistingOLENd = pNd->GetOLENode(); if( pExistingOLENd ) { - ::rtl::OUString aExistingName = pExistingOLENd->GetOLEObj().GetCurrentPersistName(); + OUString aExistingName = pExistingOLENd->GetOLEObj().GetCurrentPersistName(); if ( aExistingName.equals( aObjName ) ) { OSL_FAIL( "The document contains duplicate object references, means it is partially broken, please let developers know how this document was generated!\n" ); - ::rtl::OUString aTmpName = pDoc->GetPersist()->GetEmbeddedObjectContainer().CreateUniqueObjectName(); + OUString aTmpName = pDoc->GetPersist()->GetEmbeddedObjectContainer().CreateUniqueObjectName(); try { pDoc->GetPersist()->GetStorage()->copyElementTo( aObjName, @@ -567,13 +565,13 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( try { // create object with desired ClassId - ::rtl::OUString aName("DummyName"); + OUString aName("DummyName"); uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::OOoEmbeddedObjectFactory::create(::comphelper::getProcessComponentContext()); uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 ); - aMediaDescriptor[0].Name = ::rtl::OUString("URL"); - aMediaDescriptor[0].Value <<= ::rtl::OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); + aMediaDescriptor[0].Name = OUString("URL"); + aMediaDescriptor[0].Value <<= OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ); if ( pDoc && pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() ) { uno::Reference< task::XInteractionHandler > xInteraction = @@ -581,7 +579,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( if ( xInteraction.is() ) { aMediaDescriptor.realloc( 2 ); - aMediaDescriptor[1].Name = ::rtl::OUString( "InteractionHandler" ); + aMediaDescriptor[1].Name = OUString( "InteractionHandler" ); aMediaDescriptor[1].Value <<= xInteraction; } } @@ -698,12 +696,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( try { // create object with desired ClassId - ::rtl::OUString aName("DummyName"); + OUString aName("DummyName"); uno::Sequence < sal_Int8 > aClass( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence() ); uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() ); uno::Reference < embed::XEmbeddedObject > xObj = uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew( - aClass, ::rtl::OUString(), xStorage, aName, + aClass, OUString(), xStorage, aName, uno::Sequence < beans::PropertyValue >() ), uno::UNO_QUERY ); // set size to the object @@ -718,11 +716,11 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( if ( xSet.is() ) { if( bValidURL ) - xSet->setPropertyValue( ::rtl::OUString("PluginURL"), - makeAny( ::rtl::OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); + xSet->setPropertyValue( OUString("PluginURL"), + makeAny( OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); if( bValidMimeType ) - xSet->setPropertyValue( ::rtl::OUString("PluginMimeType"), - makeAny( ::rtl::OUString( rMimeType ) ) ); + xSet->setPropertyValue( OUString("PluginMimeType"), + makeAny( OUString( rMimeType ) ) ); } SwFrmFmt *pFrmFmt = pDoc->Insert( *pTxtCrsr->GetPaM(), @@ -829,12 +827,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra try { // create object with desired ClassId - ::rtl::OUString aName("DummyName"); + OUString aName("DummyName"); uno::Sequence < sal_Int8 > aClass( SvGlobalName( SO3_IFRAME_CLASSID ).GetByteSequence() ); uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() ); uno::Reference < embed::XEmbeddedObject > xObj = uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew( - aClass, ::rtl::OUString(), xStorage, aName, + aClass, OUString(), xStorage, aName, uno::Sequence < beans::PropertyValue >() ), uno::UNO_QUERY ); // set size to the object @@ -848,31 +846,31 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString("FrameURL"), - makeAny( ::rtl::OUString( URIHelper::SmartRel2Abs( + xSet->setPropertyValue( OUString("FrameURL"), + makeAny( OUString( URIHelper::SmartRel2Abs( INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) ) ) ); - xSet->setPropertyValue( ::rtl::OUString("FrameName"), - makeAny( ::rtl::OUString( rName ) ) ); + xSet->setPropertyValue( OUString("FrameName"), + makeAny( OUString( rName ) ) ); if ( eScrollMode == ScrollingAuto ) - xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"), + xSet->setPropertyValue( OUString("FrameIsAutoScroll"), makeAny( sal_True ) ); else - xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"), + xSet->setPropertyValue( OUString("FrameIsScrollingMode"), makeAny( (sal_Bool) (eScrollMode == ScrollingYes) ) ); if ( bIsBorderSet ) - xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"), + xSet->setPropertyValue( OUString("FrameIsBorder"), makeAny( bHasBorder ) ); else - xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoBorder"), + xSet->setPropertyValue( OUString("FrameIsAutoBorder"), makeAny( sal_True ) ); - xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"), + xSet->setPropertyValue( OUString("FrameMarginWidth"), makeAny( sal_Int32( aMargin.Width() ) ) ); - xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"), + xSet->setPropertyValue( OUString("FrameMarginHeight"), makeAny( sal_Int32( aMargin.Height() ) ) ); } @@ -897,7 +895,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra void SwXMLTextImportHelper::endAppletOrPlugin( const uno::Reference < XPropertySet > &rPropSet, - ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess > &rParamMap) + ::std::map < const OUString, OUString, ::comphelper::UStringLess > &rParamMap) { // this method will modify the document directly -> lock SolarMutex SolarMutexGuard aGuard; @@ -922,8 +920,8 @@ void SwXMLTextImportHelper::endAppletOrPlugin( const sal_Int32 nCount = rParamMap.size(); uno::Sequence< beans::PropertyValue > aCommandSequence( nCount ); - ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess > ::iterator aIter = rParamMap.begin(); - ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess > ::iterator aEnd = rParamMap.end(); + ::std::map < const OUString, OUString, ::comphelper::UStringLess > ::iterator aIter = rParamMap.begin(); + ::std::map < const OUString, OUString, ::comphelper::UStringLess > ::iterator aEnd = rParamMap.end(); sal_Int32 nIndex=0; while (aIter != aEnd ) { @@ -935,14 +933,14 @@ void SwXMLTextImportHelper::endAppletOrPlugin( } // unfortunately the names of the properties are depending on the object - ::rtl::OUString aParaName("AppletCommands"); + OUString aParaName("AppletCommands"); try { xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) ); } catch ( uno::Exception& ) { - aParaName = ::rtl::OUString("PluginCommands"); + aParaName = OUString("PluginCommands"); try { xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) ); diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 2a5929517b46..4e30e16d2168 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -31,7 +31,7 @@ class SwXMLTextImportHelper : public XMLTextImportHelper protected: virtual SvXMLImportContext *CreateTableChildContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -50,63 +50,63 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertOLEObject( SvXMLImport& rImport, - const ::rtl::OUString& rHRef, - const ::rtl::OUString& rStyleName, - const ::rtl::OUString& rTblName, + const OUString& rHRef, + const OUString& rStyleName, + const OUString& rTblName, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertOOoLink( SvXMLImport& rImport, - const ::rtl::OUString& rHRef, - const ::rtl::OUString& rStyleName, - const ::rtl::OUString& rTblName, + const OUString& rHRef, + const OUString& rStyleName, + const OUString& rTblName, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertApplet( - const ::rtl::OUString &rName, - const ::rtl::OUString &rCode, + const OUString &rName, + const OUString &rCode, sal_Bool bMayScript, - const ::rtl::OUString& rHRef, + const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertPlugin( - const ::rtl::OUString &rMimeType, - const ::rtl::OUString& rHRef, + const OUString &rMimeType, + const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertFloatingFrame( - const ::rtl::OUString &rName, - const ::rtl::OUString &rHRef, - const ::rtl::OUString &rStyleName, + const OUString &rName, + const OUString &rHRef, + const OUString &rStyleName, sal_Int32 nWidth, sal_Int32 nHeight ); virtual void endAppletOrPlugin( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet, - ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess> &rParamMap); + ::std::map < const OUString, OUString, ::comphelper::UStringLess> &rParamMap); virtual sal_Bool IsInHeaderFooter() const; // redlining helper methods // (here is the real implementation) virtual void RedlineAdd( - const ::rtl::OUString& rType, /// redline type (insert, del,... ) - const ::rtl::OUString& rId, /// use to identify this redline - const ::rtl::OUString& rAuthor, /// name of the author - const ::rtl::OUString& rComment, /// redline comment + const OUString& rType, /// redline type (insert, del,... ) + const OUString& rId, /// use to identify this redline + const OUString& rAuthor, /// name of the author + const OUString& rComment, /// redline comment const ::com::sun::star::util::DateTime& rDateTime, /// date+time sal_Bool bMergeLastPara); /// merge last paragraph virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> RedlineCreateText( ::com::sun::star::uno::Reference< /// needed to get the document ::com::sun::star::text::XTextCursor> & rOldCursor, - const ::rtl::OUString& rId); /// ID used to RedlineAdd() call + const OUString& rId); /// ID used to RedlineAdd() call virtual void RedlineSetCursor( - const ::rtl::OUString& rId, /// ID used to RedlineAdd() call + const OUString& rId, /// ID used to RedlineAdd() call sal_Bool bStart, /// start or end Cursor sal_Bool bIsOutsideOfParagraph); virtual void RedlineAdjustStartNodeCursor( diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index cefbc1435064..a303fd749dc5 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -187,7 +187,7 @@ static SwView* lcl_LoadDoc(SwView* pView, const String& rURL) if(rURL.Len()) { SfxStringItem aURL(SID_FILE_NAME, rURL); - SfxStringItem aTargetFrameName( SID_TARGETNAME, rtl::OUString("_blank") ); + SfxStringItem aTargetFrameName( SID_TARGETNAME, OUString("_blank") ); SfxBoolItem aHidden( SID_HIDDEN, sal_True ); SfxStringItem aReferer(SID_REFERER, pView->GetDocShell()->GetTitle()); SfxObjectItem* pItem = (SfxObjectItem*)pView->GetViewFrame()->GetDispatcher()-> diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index d840bf84824e..689c760280d9 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -73,7 +73,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; // is in appenv.cxx extern String InsertLabEnvText( SwWrtShell& , SwFldMgr& , const String& ); @@ -143,7 +142,7 @@ static const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rIte String sDBName; if( (!rItem.bSynchron || !(nCol|nRow)) && (sDBName = InsertLabEnvText( rSh, rFldMgr, rItem.aWriting )).Len() && !bLast ) { - sDBName.SetToken( 3, DB_DELIM, rtl::OUString("True")); + sDBName.SetToken( 3, DB_DELIM, OUString("True")); SwInsertFld_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyStr, 0, &rSh ); rFldMgr.InsertFld( aData ); } @@ -329,7 +328,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) pSh->SetMark(); // set only the mark SwSectionData aSect(CONTENT_SECTION, - rtl::OUString(MASTER_LABEL)); + OUString(MASTER_LABEL)); pSh->InsertSection(aSect); } } @@ -337,7 +336,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) { SwSectionData aSect(FILE_LINK_SECTION, pSh->GetUniqueSectionName()); - rtl::OUStringBuffer sLinkName; + OUStringBuffer sLinkName; sLinkName.append(sfx2::cTokenSeperator); sLinkName.append(sfx2::cTokenSeperator); sLinkName.append(MASTER_LABEL); diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 1b792f8dab3e..fe93d9f87704 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -152,17 +152,17 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) using namespace ::com::sun::star::i18n::ScriptType; - Any aLang = aLinguCfg.GetProperty(rtl::OUString("DefaultLocale")); + Any aLang = aLinguCfg.GetProperty(OUString("DefaultLocale")); aLang >>= aLocale; nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aLocale).getLanguageType(false), LATIN); pRet->Put(SvxLanguageItem(nLang, SID_ATTR_LANGUAGE)); - aLang = aLinguCfg.GetProperty(rtl::OUString("DefaultLocale_CJK")); + aLang = aLinguCfg.GetProperty(OUString("DefaultLocale_CJK")); aLang >>= aLocale; nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aLocale).getLanguageType(false), ASIAN); pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CJK_LANGUAGE)); - aLang = aLinguCfg.GetProperty(rtl::OUString("DefaultLocale_CTL")); + aLang = aLinguCfg.GetProperty(OUString("DefaultLocale_CTL")); aLang >>= aLocale; nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aLocale).getLanguageType(false), COMPLEX); pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CTL_LANGUAGE)); diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 92f10005545c..e961da17cb99 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -110,7 +110,6 @@ #include #include -using rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; @@ -258,7 +257,7 @@ sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) SW_MOD()->SetEmbeddedLoadSave( sal_False ); - SetError( nErr, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( nErr, OUString( OSL_LOG_PREFIX ) ); sal_Bool bOk = !IsError( nErr ); if ( bOk && !pDoc->IsInLoadAsynchron() ) @@ -350,7 +349,7 @@ sal_Bool SwDocShell::Save() } SW_MOD()->SetEmbeddedLoadSave( sal_False ); } - SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( nErr ? nErr : nVBWarning, OUString( OSL_LOG_PREFIX ) ); SfxViewFrame* pFrm = pWrtShell ? pWrtShell->GetView().GetViewFrame() : 0; if( pFrm ) @@ -397,8 +396,8 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) GetModel(), uno::UNO_QUERY_THROW); uno::Reference xDocProps = xDPS->getDocumentProperties(); - xDocProps->setTemplateName(::rtl::OUString()); - xDocProps->setTemplateURL(::rtl::OUString()); + xDocProps->setTemplateName(OUString()); + xDocProps->setTemplateURL(OUString()); xDocProps->setTemplateDate(::util::DateTime()); } } @@ -483,7 +482,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) // Increase RSID pDoc->setRsid( pDoc->getRsid() ); } - SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( nErr ? nErr : nVBWarning, OUString( OSL_LOG_PREFIX ) ); return !IsError( nErr ); } @@ -538,7 +537,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) OSL_ENSURE( !xStg->GetError(), "No storage available for storing VBA macros!" ); if ( !xStg->GetError() ) { - nVBWarning = SaveOrDelMSVBAStorage( (SfxObjectShell&) *this, *xStg, bSave, rtl::OUString("Macros") ); + nVBWarning = SaveOrDelMSVBAStorage( (SfxObjectShell&) *this, *xStg, bSave, OUString("Macros") ); xStg->Commit(); pDoc->SetContainsMSVBasic( sal_True ); } @@ -557,18 +556,18 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) { uno::Reference< XLibraryContainer > xLibCont(GetBasicContainer(), UNO_QUERY); uno::Reference< XNameAccess > xLib; - Sequence aNames = xLibCont->getElementNames(); - const rtl::OUString* pNames = aNames.getConstArray(); + Sequence aNames = xLibCont->getElementNames(); + const OUString* pNames = aNames.getConstArray(); for(sal_Int32 nLib = 0; nLib < aNames.getLength(); nLib++) { Any aLib = xLibCont->getByName(pNames[nLib]); aLib >>= xLib; if(xLib.is()) { - Sequence aModNames = xLib->getElementNames(); + Sequence aModNames = xLib->getElementNames(); if(aModNames.getLength()) { - SetError(WARN_SWG_HTML_NO_MACROS, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError(WARN_SWG_HTML_NO_MACROS, OUString( OSL_LOG_PREFIX ) ); break; } } @@ -639,7 +638,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) // TODO/MBA: testing uno::Reference < beans::XPropertySet > xSet( rMedium.GetStorage(), uno::UNO_QUERY ); if ( xSet.is() ) - xSet->setPropertyValue( ::rtl::OUString("MediaType"), uno::makeAny( ::rtl::OUString( SotExchange::GetFormatMimeType( nSaveClipId ) ) ) ); + xSet->setPropertyValue( OUString("MediaType"), uno::makeAny( OUString( SotExchange::GetFormatMimeType( nSaveClipId ) ) ) ); } catch (const uno::Exception&) { @@ -723,7 +722,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) } SW_MOD()->SetEmbeddedLoadSave( sal_False ); - SetError( nErrno ? nErrno : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( nErrno ? nErrno : nVBWarning, OUString( OSL_LOG_PREFIX ) ); if( !rMedium.IsStorage() ) rMedium.CloseOutStream(); @@ -752,7 +751,7 @@ sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xS if( bResetModified ) EnableSetModified( sal_False ); - uno::Sequence < rtl::OUString > aNames = pOLEChildList->GetObjectNames(); + uno::Sequence < OUString > aNames = pOLEChildList->GetObjectNames(); for( sal_Int32 n = aNames.getLength(); n; n-- ) { if ( !pOLEChildList->MoveEmbeddedObject( aNames[n-1], GetEmbeddedObjectContainer() ) ) @@ -1129,7 +1128,7 @@ void SwDocShell::RemoveOLEObjects() if( !pOLEChildList ) pOLEChildList = new comphelper::EmbeddedObjectContainer; - ::rtl::OUString aObjName = pOLENd->GetOLEObj().GetCurrentPersistName(); + OUString aObjName = pOLENd->GetOLEObj().GetCurrentPersistName(); GetEmbeddedObjectContainer().MoveEmbeddedObject( aObjName, *pOLEChildList ); } } @@ -1209,13 +1208,13 @@ Sequence< OUString > SwDocShell::GetEventNames() return aRet; } -rtl::OUString SwDocShell::GetEventName( sal_Int32 nIndex ) +OUString SwDocShell::GetEventName( sal_Int32 nIndex ) { if (nIndex < s_nEvents) { - return ::rtl::OUString::createFromAscii(s_EventNames[nIndex]); + return OUString::createFromAscii(s_EventNames[nIndex]); } - return rtl::OUString(); + return OUString(); } const ::sfx2::IXmlIdRegistry* SwDocShell::GetXmlIdRegistry() const diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 483e647e5217..4f92956e4912 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -119,7 +119,6 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -using ::rtl::OUString; using namespace ::sfx2; extern bool FindPhyStyle( SwDoc& , const String& , SfxStyleFamily ); @@ -777,7 +776,7 @@ void SwDocShell::Execute(SfxRequest& rReq) xFP->setDisplayDirectory( aPathOpt.GetWorkPath() ); SfxObjectFactory &rFact = GetFactory(); - SfxFilterMatcher aMatcher( rtl::OUString::createFromAscii(rFact.GetShortName()) ); + SfxFilterMatcher aMatcher( OUString::createFromAscii(rFact.GetShortName()) ); SfxFilterMatcherIter aIter( aMatcher ); uno::Reference xFltMgr(xFP, UNO_QUERY); const SfxFilter* pFlt = aIter.First(); @@ -796,7 +795,7 @@ void SwDocShell::Execute(SfxRequest& rReq) bool bWeb = 0 != dynamic_cast< SwWebDocShell *>( this ); const SfxFilter *pOwnFlt = SwDocShell::Factory().GetFilterContainer()-> - GetFilter4FilterName(rtl::OUString("writer8")); + GetFilter4FilterName(OUString("writer8")); // make sure the default file format is also available if(bWeb) @@ -843,7 +842,7 @@ void SwDocShell::Execute(SfxRequest& rReq) bMerge = 0 != (nFlags&SFX_MERGE_STYLES); aOpt.SetMerge( !bMerge ); - SetError( LoadStylesFromFile( aFileName, aOpt, sal_False ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError( LoadStylesFromFile( aFileName, aOpt, sal_False ), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if ( !GetError() ) rReq.Done(); } @@ -864,7 +863,7 @@ void SwDocShell::Execute(SfxRequest& rReq) // 3 - file saved in non-HTML -> QueryBox to save as HTML const SfxFilter* pHtmlFlt = SwIoSystem::GetFilterOfFormat( - rtl::OUString("HTML"), + OUString("HTML"), SwWebDocShell::Factory().GetFilterContainer() ); sal_Bool bLocalHasName = HasName(); if(bLocalHasName) @@ -986,7 +985,7 @@ void SwDocShell::Execute(SfxRequest& rReq) uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext ); - ::rtl::OUString aCmd("SendOutlineToImpress"); + OUString aCmd("SendOutlineToImpress"); uno::Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); pStrm->Seek( STREAM_SEEK_TO_END ); *pStrm << '\0'; @@ -1003,9 +1002,9 @@ void SwDocShell::Execute(SfxRequest& rReq) aLockBytes.ReadAt( 0, aSeq.getArray(), nLen, &nRead ); uno::Sequence< beans::PropertyValue > aArgs(1); - aArgs[0].Name = ::rtl::OUString("RtfOutline"); + aArgs[0].Name = OUString("RtfOutline"); aArgs[0].Value <<= aSeq; - xHelper->executeDispatch( xProv, aCmd, ::rtl::OUString(), 0, aArgs ); + xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aArgs ); } } else @@ -1037,7 +1036,7 @@ void SwDocShell::Execute(SfxRequest& rReq) EnableSetModified( sal_False ); WriterRef xWrt; // mba: looks as if relative URLs don't make sense here - ::GetRTFWriter( rtl::OUString('O'), rtl::OUString(), xWrt ); + ::GetRTFWriter( OUString('O'), OUString(), xWrt ); SvMemoryStream *pStrm = new SvMemoryStream(); pStrm->SetBufferSize( 16348 ); SwWriter aWrt( *pStrm, *GetDoc() ); @@ -1053,7 +1052,7 @@ void SwDocShell::Execute(SfxRequest& rReq) uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext ); - ::rtl::OUString aCmd("SendOutlineToImpress"); + OUString aCmd("SendOutlineToImpress"); uno::Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); pStrm->Seek( STREAM_SEEK_TO_END ); *pStrm << '\0'; @@ -1070,9 +1069,9 @@ void SwDocShell::Execute(SfxRequest& rReq) aLockBytes.ReadAt( 0, aSeq.getArray(), nLen, &nRead ); uno::Sequence< beans::PropertyValue > aArgs(1); - aArgs[0].Name = ::rtl::OUString("RtfOutline"); + aArgs[0].Name = OUString("RtfOutline"); aArgs[0].Value <<= aSeq; - xHelper->executeDispatch( xProv, aCmd, ::rtl::OUString(), 0, aArgs ); + xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aArgs ); } } else @@ -1189,7 +1188,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { // for HTML there is only one filter!! pFlt = SwIoSystem::GetFilterOfFormat( - rtl::OUString("HTML"), + OUString("HTML"), SwWebDocShell::Factory().GetFilterContainer() ); nStrId = STR_LOAD_HTML_DOC; } @@ -1197,7 +1196,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { // for Global-documents we now only offer the current one. pFlt = SwGlobalDocShell::Factory().GetFilterContainer()-> - GetFilter4Extension( rtl::OUString("odm") ); + GetFilter4Extension( OUString("odm") ); nStrId = STR_LOAD_GLOBAL_DOC; } @@ -1401,8 +1400,8 @@ void SwDocShell::Execute(SfxRequest& rReq) // Ok. I did my best. break; - SfxStringItem aApp(SID_DOC_SERVICE, rtl::OUString("com.sun.star.text.TextDocument")); - SfxStringItem aTarget(SID_TARGETNAME, rtl::OUString("_blank")); + SfxStringItem aApp(SID_DOC_SERVICE, OUString("com.sun.star.text.TextDocument")); + SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank")); pViewShell->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aApp, &aTarget, 0L); } @@ -1672,7 +1671,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL, INetURLObject aURLObj( rURL ); // Set filter: - String sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName())); + String sFactory(OUString::createFromAscii(SwDocShell::Factory().GetShortName())); SfxFilterMatcher aMatcher( sFactory ); // search for filter in WebDocShell, too @@ -1681,7 +1680,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL, aMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False ); if(!pFlt) { - String sWebFactory(rtl::OUString::createFromAscii(SwWebDocShell::Factory().GetShortName())); + String sWebFactory(OUString::createFromAscii(SwWebDocShell::Factory().GetShortName())); SfxFilterMatcher aWebMatcher( sWebFactory ); aWebMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False ); } @@ -1702,7 +1701,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL, try { uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY_THROW ); - const ::rtl::OUString aMediaTypePropName( "MediaType" ); + const OUString aMediaTypePropName( "MediaType" ); xProps->getPropertyValue( aMediaTypePropName ); bImport = true; } diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 716e70fab400..fba0504f1a09 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -92,7 +92,6 @@ using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -using ::rtl::OUString; // Load Document sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) @@ -570,7 +569,7 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium ) UpdateFontList(); InitDraw(); - SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); bRet = !IsError( nErr ); if ( bRet && !pDoc->IsInLoadAsynchron() && @@ -598,7 +597,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium ) do { // middle check loop sal_uInt32 nErr = ERR_SWG_READ_ERROR; String aStreamName; - aStreamName = rtl::OUString("styles.xml"); + aStreamName = OUString("styles.xml"); uno::Reference < container::XNameAccess > xAccess( rMedium.GetStorage(), uno::UNO_QUERY ); if ( xAccess->hasByName( aStreamName ) && rMedium.GetStorage()->isStreamElement( aStreamName ) ) { @@ -621,7 +620,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium ) OSL_FAIL("Code removed!"); } - SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); bRet = !IsError( nErr ); } while( false ); diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index d7ceaf4798e7..8b546240dcc8 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -308,8 +308,8 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) xCont->getByName(pFamilyItem->GetValue()) >>= xStyles; uno::Reference< beans::XPropertySet > xInfo; xStyles->getByName( pNameItem->GetValue() ) >>= xInfo; - ::rtl::OUString aUIName; - xInfo->getPropertyValue( ::rtl::OUString("DisplayName") ) >>= aUIName; + OUString aUIName; + xInfo->getPropertyValue( OUString("DisplayName") ) >>= aUIName; if ( !aUIName.isEmpty() ) rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY, aUIName ) ); } diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index dc36e110d3d2..2af3322ea944 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -287,11 +287,11 @@ static const SwNumRule* lcl_FindNumRule( SwDoc& rDoc, static sal_uInt16 lcl_FindName(const SwPoolFmtList& rLst, SfxStyleFamily eFam, - const rtl::OUString& rName) + const OUString& rName) { if(!rLst.empty()) { - String sSrch = rtl::OUString(' '); + String sSrch = OUString(' '); switch( eFam ) { case SFX_STYLE_FAMILY_CHAR: sSrch = cCHAR; break; @@ -331,7 +331,7 @@ bool FindPhyStyle( SwDoc& rDoc, const String& rName, SfxStyleFamily eFam ) // Add Strings to the list of templates void SwPoolFmtList::Append( char cChar, const String& rStr ) { - String aStr = rtl::OUString(cChar); + String aStr = OUString(cChar); aStr += rStr; for(std::vector::const_iterator i = begin(); i != end(); ++i) if(*i == aStr) @@ -633,7 +633,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) { IntlWrapper aIntlWrapper( SvtSysLocale().GetLanguageTag() ); - rtl::OUString sPlus(" + "); + OUString sPlus(" + "); if ( SFX_STYLE_FAMILY_PAGE == nFamily ) { if( !pSet ) @@ -683,7 +683,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) String aDesc; const SfxPoolItem* pItem = aIter.FirstItem(); - rtl::OUString sPageNum; + OUString sPageNum; String sModel, sBreak; bool bHasWesternFontPrefix = false; bool bHasCJKFontPrefix = false; @@ -2789,7 +2789,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Next() return 0; } -SfxStyleSheetBase* SwStyleSheetIterator::Find(const rtl::OUString& rName) +SfxStyleSheetBase* SwStyleSheetIterator::Find(const OUString& rName) { // searching if( !bFirstCalled ) diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx index 4ffa8ce72418..7946fd5a127d 100644 --- a/sw/source/ui/app/swdll.cxx +++ b/sw/source/ui/app/swdll.cxx @@ -98,12 +98,12 @@ SwDLL::SwDLL() SwModule* pModule = new SwModule( pWDocFact, pDocFact, pGlobDocFact ); *ppShlPtr = pModule; - pWDocFact->SetDocumentServiceName(rtl::OUString("com.sun.star.text.WebDocument")); + pWDocFact->SetDocumentServiceName(OUString("com.sun.star.text.WebDocument")); if ( aOpt.IsWriter() ) { - pGlobDocFact->SetDocumentServiceName(rtl::OUString("com.sun.star.text.GlobalDocument")); - pDocFact->SetDocumentServiceName(rtl::OUString("com.sun.star.text.TextDocument")); + pGlobDocFact->SetDocumentServiceName(OUString("com.sun.star.text.GlobalDocument")); + pDocFact->SetDocumentServiceName(OUString("com.sun.star.text.TextDocument")); } // register SvDraw-Fields diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index eb485a65ed41..f22fcd7a3cf1 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -61,7 +61,6 @@ #include #include "PostItMgr.hxx" -using ::rtl::OUString; using namespace ::svx; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 3002df016bc3..dc820bb493f7 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -174,7 +174,7 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, pDragDrop( 0 ), pXSelection( 0 ) { - SetName( rtl::OUString("StarWriter") ); + SetName( OUString("StarWriter") ); pSwResMgr = GetResMgr(); SvxErrorHandler::ensure(); pErrorHdl = new SfxErrorHandler( RID_SW_ERRHDL, diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx index 43bae1046cb1..05b32005d61f 100644 --- a/sw/source/ui/cctrl/actctrl.cxx +++ b/sw/source/ui/cctrl/actctrl.cxx @@ -52,13 +52,13 @@ long NumEditAction::Notify( NotifyEvent& rNEvt ) NoSpaceEdit::NoSpaceEdit( Window* pParent, const ResId& rResId) : Edit(pParent, rResId) - , sForbiddenChars(rtl::OUString(" ")) + , sForbiddenChars(OUString(" ")) { } NoSpaceEdit::NoSpaceEdit(Window* pParent) : Edit(pParent, WB_BORDER|WB_TABSTOP) - , sForbiddenChars(rtl::OUString(" ")) + , sForbiddenChars(OUString(" ")) { } @@ -71,7 +71,7 @@ void NoSpaceEdit::KeyInput(const KeyEvent& rEvt) bool bCallParent = true; if(rEvt.GetCharCode()) { - rtl::OUString sKey(rEvt.GetCharCode()); + OUString sKey(rEvt.GetCharCode()); if( STRING_NOTFOUND != sForbiddenChars.Search(sKey)) bCallParent = false; } diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index 8573b7365d03..b5c7359e318f 100644 --- a/sw/source/ui/chrdlg/ccoll.cxx +++ b/sw/source/ui/chrdlg/ccoll.cxx @@ -78,7 +78,7 @@ const char *aCommandContext[COND_COMMAND_COUNT] = "NumberingLevel10" }; -sal_Int16 GetCommandContextIndex( const rtl::OUString &rContextName ) +sal_Int16 GetCommandContextIndex( const OUString &rContextName ) { sal_Int16 nRes = -1; for (sal_Int16 i = 0; nRes == -1 && i < COND_COMMAND_COUNT; ++i) @@ -89,12 +89,12 @@ sal_Int16 GetCommandContextIndex( const rtl::OUString &rContextName ) return nRes; } -rtl::OUString GetCommandContextByIndex( sal_Int16 nIndex ) +OUString GetCommandContextByIndex( sal_Int16 nIndex ) { - rtl::OUString aRes; + OUString aRes; if (0 <= nIndex && nIndex < COND_COMMAND_COUNT) { - aRes = rtl::OUString::createFromAscii( aCommandContext[ nIndex ] ); + aRes = OUString::createFromAscii( aCommandContext[ nIndex ] ); } return aRes; } diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index e7efa9177250..cfa6741b1820 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -235,7 +235,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet) sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) { - ::rtl::OUString sURL = m_pURLED->GetText(); + OUString sURL = m_pURLED->GetText(); if(!sURL.isEmpty()) { sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link(), false ); @@ -243,7 +243,7 @@ sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) static const sal_Char* pFile = "file:"; sal_Int32 nLength = ((sal_Int32)sizeof(pFile)-1); if( sURL.copy(0, nLength ).equalsAsciiL( pFile, nLength )) - sURL = URIHelper::simpleNormalizedMakeRelative(::rtl::OUString(), sURL); + sURL = URIHelper::simpleNormalizedMakeRelative(OUString(), sURL); } SwFmtINetFmt aINetFmt(sURL, m_pTargetFrmLB->GetText()); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index efae40258d38..0c7c0402252e 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -164,7 +164,7 @@ String GetDefaultString(sal_uInt16 nChars) { String aStr; for (sal_uInt16 i = 0; i < nChars; i++) - aStr += rtl::OUString((char) (i + 65)); + aStr += OUString((char) (i + 65)); return aStr; } diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx index 95da3e4c6204..f9c4db5a81fd 100644 --- a/sw/source/ui/config/barcfg.cxx +++ b/sw/source/ui/config/barcfg.cxx @@ -26,7 +26,6 @@ #include using namespace utl; -using rtl::OUString; using namespace com::sun::star::uno; #define SEL_TYPE_TABLE_TEXT 0 @@ -123,6 +122,6 @@ void SwToolbarConfigItem::Commit() PutProperties(aNames, aValues); } -void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx index 44f4b693cf01..951e791228d5 100644 --- a/sw/source/ui/config/caption.cxx +++ b/sw/source/ui/config/caption.cxx @@ -30,7 +30,7 @@ InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleI sNumberSeparator(RTL_CONSTASCII_USTRINGPARAM((". "))), nPos(1), nLevel(0), - sSeparator( rtl::OUString(": ") ), + sSeparator( OUString(": ") ), bIgnoreSeqOpts(false), bCopyAttributes(sal_False) { diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx index b6469980e86a..ac732a81811d 100644 --- a/sw/source/ui/config/dbconfig.cxx +++ b/sw/source/ui/config/dbconfig.cxx @@ -26,7 +26,6 @@ #include using namespace utl; -using rtl::OUString; using namespace com::sun::star::uno; /*-------------------------------------------------------------------- @@ -116,7 +115,7 @@ const SwDBData& SwDBConfig::GetBibliographySource() } void SwDBConfig::Commit() {} -void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx index 22be0e3a00fc..fd36d345633d 100644 --- a/sw/source/ui/config/fontcfg.cxx +++ b/sw/source/ui/config/fontcfg.cxx @@ -30,7 +30,6 @@ #include using namespace utl; -using rtl::OUString; using namespace com::sun::star::uno; static inline LanguageType lcl_LanguageOfType(sal_Int16 nType, sal_Int16 eWestern, sal_Int16 eCJK, sal_Int16 eCTL) @@ -317,6 +316,6 @@ sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType return nRet; } -void SwStdFontConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwStdFontConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 1528670b0ca0..cdd999c71b25 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::mail; using namespace ::com::sun::star::beans; -using ::rtl::OUString; class SwTestAccountSettingsDialog : public SfxModalDialog { @@ -320,7 +319,7 @@ void SwTestAccountSettingsDialog::Test() { uno::Reference xContext = ::comphelper::getProcessComponentContext(); - rtl::OUString sException; + OUString sException; bool bIsLoggedIn = false; bool bIsServer = false; @@ -357,7 +356,7 @@ void SwTestAccountSettingsDialog::Test() new SwConnectionContext( m_pParent->m_pConfigItem->GetInServerName(), m_pParent->m_pConfigItem->GetInServerPort(), - ::rtl::OUString("Insecure")); + OUString("Insecure")); xInMailService->connect(xConnectionContext, xAuthenticator); } if(m_bStop) @@ -419,7 +418,7 @@ void SwTestAccountSettingsDialog::Test() if(!bIsServer || !bIsLoggedIn ) { - rtl::OUStringBuffer aErrorMessage(m_sErrorServer); + OUStringBuffer aErrorMessage(m_sErrorServer); if (!sException.isEmpty()) aErrorMessage.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n--\n")).append(sException); m_eErrorsED.SetText(aErrorMessage.makeStringAndClear()); diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index f9d35bdf9903..aebce5f424b6 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -38,7 +38,6 @@ #include using namespace utl; -using rtl::OUString; using namespace com::sun::star::uno; #define GLOB_NAME_CALC 0 @@ -293,7 +292,7 @@ static sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr) return nRet; } -void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwRevisionConfig::Commit() { @@ -584,9 +583,9 @@ const Sequence& SwInsertConfig::GetPropertyNames() OUString* pWebNames = aWebNames.getArray(); int i; for(i = 0; i < nCount; i++) - pNames[i] = rtl::OUString::createFromAscii(aPropNames[i]); + pNames[i] = OUString::createFromAscii(aPropNames[i]); for(i = 0; i < nWebCount; i++) - pWebNames[i] = rtl::OUString::createFromAscii(aPropNames[i]); + pWebNames[i] = OUString::createFromAscii(aPropNames[i]); } return bIsWeb ? aWebNames : aNames; } @@ -635,12 +634,12 @@ static void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nPro case 5: pValues[nProp] <<= OUString(rOpt.GetSeparator());break;//Delimiter", case 6: pValues[nProp] <<= (sal_Int32)rOpt.GetLevel(); break;//Level", case 7: pValues[nProp] <<= (sal_Int32)rOpt.GetPos(); break;//Position", - case 8: pValues[nProp] <<= (::rtl::OUString&)rOpt.GetCharacterStyle(); break; //CharacterStyle + case 8: pValues[nProp] <<= (OUString&)rOpt.GetCharacterStyle(); break; //CharacterStyle case 9: pValues[nProp] <<= rOpt.CopyAttributes(); break; //ApplyAttributes } } -void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwInsertConfig::Commit() { @@ -873,7 +872,7 @@ static void lcl_ReadOpt(InsCaptionOpt& rOpt, const Any* pValues, sal_Int32 nProp break;//Position", case 8 : //CharacterStyle { - ::rtl::OUString sTemp; pValues[nProp] >>= sTemp; + OUString sTemp; pValues[nProp] >>= sTemp; rOpt.SetCharacterStyle( sTemp ); } break; @@ -1148,7 +1147,7 @@ SwTableConfig::~SwTableConfig() { } -void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwTableConfig::Commit() { @@ -1246,12 +1245,12 @@ const Sequence& SwMiscConfig::GetPropertyNames() }; OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) - pNames[i] = rtl::OUString::createFromAscii(aPropNames[i]); + pNames[i] = OUString::createFromAscii(aPropNames[i]); } return aNames; } -void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwMiscConfig::Commit() { diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 6d562702ecb5..fa3ebd859886 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -171,18 +171,18 @@ SwCompatibilityOptPage::~SwCompatibilityOptPage() void SwCompatibilityOptPage::ReplaceFormatName( String& rEntry ) { - rtl::OUString sFormatName(utl::ConfigManager::getProductName()); - rtl::OUString sFormatVersion; + OUString sFormatName(utl::ConfigManager::getProductName()); + OUString sFormatVersion; bool bOpenOffice = ( sFormatName == "OpenOffice.org" ); if ( bOpenOffice ) - sFormatVersion = rtl::OUString("1.1"); + sFormatVersion = OUString("1.1"); else - sFormatVersion = rtl::OUString("6.0/7"); + sFormatVersion = OUString("6.0/7"); if ( !bOpenOffice && ( sFormatName != "StarSuite" ) ) - sFormatName = rtl::OUString("StarOffice"); + sFormatName = OUString("StarOffice"); - rEntry.SearchAndReplace( rtl::OUString("%FORMATNAME"), sFormatName ); - rEntry.SearchAndReplace( rtl::OUString("%FORMATVERSION"), sFormatVersion ); + rEntry.SearchAndReplace( OUString("%FORMATNAME"), sFormatName ); + rEntry.SearchAndReplace( OUString("%FORMATVERSION"), sFormatVersion ); } sal_uLong convertBools2Ulong_Impl @@ -264,7 +264,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) m_aDefaultPB.Disable(); } String sText = m_aMainFL.GetText(); - sText.SearchAndReplace( rtl::OUString("%DOCNAME"), sDocTitle ); + sText.SearchAndReplace( OUString("%DOCNAME"), sDocTitle ); m_aMainFL.SetText( sText ); // loading file formats diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index d5a1f59dbb81..0b68d0ca5255 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -480,7 +480,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) aLbLevel.InsertEntry(OUString::number(i + 1)); sal_Unicode nLvl = MAXLEVEL; - rtl::OUString sDelim(": "); + OUString sDelim(": "); if (pSh) { @@ -574,9 +574,9 @@ void SwCaptionOptPage::Reset( const SfxItemSet& rSet) SetOptions(nPos++, GRAPHIC_CAP); // get Productname and -version - rtl::OUString sWithoutVersion( utl::ConfigManager::getProductName() ); - rtl::OUString sComplete( - sWithoutVersion + rtl::OUString(" ") + + OUString sWithoutVersion( utl::ConfigManager::getProductName() ); + OUString sComplete( + sWithoutVersion + OUString(" ") + utl::ConfigManager::getProductVersion() ); SvObjectServerList aObjS; diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index e67d58dd2eac..bfe09fee95ca 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -497,7 +497,7 @@ void SwAddPrinterTabPage::PageCreated (SfxAllItemSet aSet) if (pListItem && pListItem->GetValue()) { std::vector aFaxList; - const std::vector& rPrinters = Printer::GetPrinterQueues(); + const std::vector& rPrinters = Printer::GetPrinterQueues(); for (unsigned int i = 0; i < rPrinters.size(); ++i) aFaxList.insert(aFaxList.begin(), rPrinters[i]); SetFax( aFaxList ); @@ -1770,10 +1770,10 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent, aMarkColorLB.SetSelectHdl( aLk ); //solution: set different accessible name of four color box - aInsertColorLB.SetAccessibleName(::rtl::OUString( aInsertFT.GetDisplayText()) + ::rtl::OUString(aInsertColorFT.GetDisplayText())); - aDeletedColorLB.SetAccessibleName(::rtl::OUString( aDeletedFT.GetDisplayText()) + ::rtl::OUString( aDeletedColorFT.GetDisplayText())); - aChangedColorLB.SetAccessibleName(::rtl::OUString( aChangedFT.GetDisplayText()) + ::rtl::OUString( aChangedColorFT.GetDisplayText())); - aMarkColorLB.SetAccessibleName(::rtl::OUString( aMarkPosFT.GetDisplayText()) + ::rtl::OUString( aMarkColorFT.GetDisplayText())); + aInsertColorLB.SetAccessibleName(OUString( aInsertFT.GetDisplayText()) + OUString(aInsertColorFT.GetDisplayText())); + aDeletedColorLB.SetAccessibleName(OUString( aDeletedFT.GetDisplayText()) + OUString( aDeletedColorFT.GetDisplayText())); + aChangedColorLB.SetAccessibleName(OUString( aChangedFT.GetDisplayText()) + OUString( aChangedColorFT.GetDisplayText())); + aMarkColorLB.SetAccessibleName(OUString( aMarkPosFT.GetDisplayText()) + OUString( aMarkColorFT.GetDisplayText())); } SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage() diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx index 01bd2dfe7b8d..ca075300dfbe 100644 --- a/sw/source/ui/config/prtopt.cxx +++ b/sw/source/ui/config/prtopt.cxx @@ -28,7 +28,6 @@ using namespace utl; -using rtl::OUString; using namespace com::sun::star::uno; /*-------------------------------------------------------------------- @@ -132,7 +131,7 @@ SwPrintOptions::~SwPrintOptions() } -void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwPrintOptions::Commit() { diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index b9207bb3cf7f..dc153b8ea5f8 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -160,7 +160,7 @@ int SwBaseNumRules::Load(SvStream &rStream) } SwChapterNumRules::SwChapterNumRules() : - SwBaseNumRules(rtl::OUString(CHAPTER_FILENAME)) + SwBaseNumRules(OUString(CHAPTER_FILENAME)) { } @@ -390,7 +390,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, if( VERSION_53A > nVersion ) { sal_Char cEncoded(aFmt.GetBulletChar()); - aFmt.SetBulletChar(rtl::OUString(&cEncoded, 1, nCharSet).toChar()); + aFmt.SetBulletChar(OUString(&cEncoded, 1, nCharSet).toChar()); } } diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index ee01698dd906..286ca229d6c5 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -37,7 +37,6 @@ using namespace utl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy) @@ -358,7 +357,7 @@ void SwLayoutViewConfig::Load() } } -void SwLayoutViewConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwLayoutViewConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} Sequence SwGridConfig::GetPropertyNames() { @@ -452,7 +451,7 @@ void SwGridConfig::Load() } } -void SwGridConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwGridConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} Sequence SwCursorConfig::GetPropertyNames() { @@ -466,7 +465,7 @@ Sequence SwCursorConfig::GetPropertyNames() Sequence aNames(nCount); OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) - pNames[i] = rtl::OUString::createFromAscii(aPropNames[i]); + pNames[i] = OUString::createFromAscii(aPropNames[i]); return aNames; } @@ -534,7 +533,7 @@ void SwCursorConfig::Load() } } -void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} SwWebColorConfig::SwWebColorConfig(SwMasterUsrPref& rPar) : ConfigItem("Office.WriterWeb/Background", @@ -563,7 +562,7 @@ void SwWebColorConfig::Commit() PutProperties(aPropNames, aValues); } -void SwWebColorConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwWebColorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwWebColorConfig::Load() { diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index b0003d3feee2..a365e47091e5 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -128,7 +128,7 @@ void SwViewOption::DrawRectPrinter( OutputDevice *pOut, sal_uInt16 SwViewOption::GetPostItsWidth( const OutputDevice *pOut ) const { OSL_ENSURE( pOut, "no Outdev" ); - return sal_uInt16(pOut->GetTextWidth( rtl::OUString(aPostItStr ))); + return sal_uInt16(pOut->GetTextWidth( OUString(aPostItStr ))); } void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bool bIsScript ) const diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 2dfe6f5e2bab..35c0b6f07071 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -83,8 +83,8 @@ struct AddressUserData_Impl SharedConnection xConnection; uno::Reference< XColumnsSupplier> xColumnsSupplier; uno::Reference< sdbc::XResultSet> xResultSet; - ::rtl::OUString sFilter; - ::rtl::OUString sURL; // data is editable + OUString sFilter; + OUString sURL; // data is editable sal_Int32 nCommandType; sal_Int32 nTableAndQueryCount; AddressUserData_Impl() : @@ -93,12 +93,12 @@ struct AddressUserData_Impl {} }; -static ::rtl::OUString lcl_getFlatURL( uno::Reference& xSourceProperties ) +static OUString lcl_getFlatURL( uno::Reference& xSourceProperties ) { - ::rtl::OUString sURL; + OUString sURL; if(xSourceProperties.is()) { - rtl::OUString sDBURL; + OUString sDBURL; xSourceProperties->getPropertyValue("URL") >>= sDBURL; if(String(sDBURL).SearchAscii("sdbc:flat:") == 0) { @@ -108,10 +108,10 @@ static ::rtl::OUString lcl_getFlatURL( uno::Reference& xSou xSourceProperties->getPropertyValue("Info") >>= aInfo; if(aFilters.getLength() == 1 && aInfo.getLength() ) { - ::rtl::OUString sFieldDelim; - ::rtl::OUString sStringDelim; - ::rtl::OUString sExtension; - ::rtl::OUString sCharSet; + OUString sFieldDelim; + OUString sStringDelim; + OUString sExtension; + OUString sCharSet; for(sal_Int32 nInfo = 0; nInfo < aInfo.getLength(); ++nInfo) { if(aInfo[nInfo].Name == "FieldDelimiter") @@ -217,9 +217,9 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) : m_aListLB.SelectAll( sal_False ); SwDBConfig aDb; - ::rtl::OUString sBibliography = aDb.GetBibliographySource().sDataSource; - uno::Sequence< ::rtl::OUString> aNames = m_xDBContext->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + OUString sBibliography = aDb.GetBibliographySource().sDataSource; + uno::Sequence< OUString> aNames = m_xDBContext->getElementNames(); + const OUString* pNames = aNames.getConstArray(); for(sal_Int32 nName = 0; nName < aNames.getLength(); ++nName) { if ( pNames[nName] == sBibliography ) @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl) xRowProperties->setPropertyValue("ActiveConnection", makeAny(pUserData->xConnection.getTyped())); xRowSet->execute(); - ::rtl::OUString sQuery; + OUString sQuery; xRowProperties->getPropertyValue("ActiveCommand")>>= sQuery; xComposer->setQuery(sQuery); if(!pUserData->sFilter.isEmpty()) @@ -388,15 +388,15 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) pInfo[1].Name = "StringDelimiter"; pInfo[1].Value <<= OUString('"'); pInfo[2].Name = "Extension"; - pInfo[2].Value <<= ::rtl::OUString(aURL.getExtension());//"csv"; + pInfo[2].Value <<= OUString(aURL.getExtension());//"csv"; pInfo[3].Name = "CharSet"; - pInfo[3].Value <<= rtl::OUString::createFromAscii(cUTF8); + pInfo[3].Value <<= OUString::createFromAscii(cUTF8); aAny <<= aInfo; xDataProperties->setPropertyValue("Info", aAny); uno::Reference xDS(xNewInstance, UNO_QUERY_THROW); uno::Reference xStore(xDS->getDatabaseDocument(), UNO_QUERY_THROW); - String sExt = rtl::OUString(".odb"); + String sExt = OUString(".odb"); String sTmpName; { String sHomePath(SvtPathOptions().GetWorkPath()); @@ -549,8 +549,8 @@ void SwAddressListDialog::DetectTablesAndQueries( if(pUserData->xConnection.is()) { sal_Int32 nTables = 0; - uno::Sequence aTables; - uno::Sequence aQueries; + uno::Sequence aTables; + uno::Sequence aQueries; uno::Reference xTSupplier(pUserData->xConnection, UNO_QUERY); if(xTSupplier.is()) { @@ -687,9 +687,9 @@ uno::Reference< XColumnsSupplier> SwAddressListDialog::GetColumnsSupplier() return xRet; } -::rtl::OUString SwAddressListDialog::GetFilter() +OUString SwAddressListDialog::GetFilter() { - ::rtl::OUString sRet; + OUString sRet; SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index b1956faa741b..0b5c819efaa6 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -104,7 +104,7 @@ public: GetColumnsSupplier(); const SwDBData& GetDBData() const {return m_aDBData;} - ::rtl::OUString GetFilter(); + OUString GetFilter(); }; #endif diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 077a74de83ad..3db7ac0b1625 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; -using ::rtl::OUString; class SwAddressControl_Impl : public Control { @@ -567,10 +566,10 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl) uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker(); String sPath( SvtPathOptions().SubstituteVariable( - rtl::OUString("$(userurl)/database") )); + OUString("$(userurl)/database") )); aDlgHelper.SetDisplayDirectory( sPath ); uno::Reference< XFilterManager > xFltMgr(xFP, uno::UNO_QUERY); - ::rtl::OUString sCSV("*.csv"); + OUString sCSV("*.csv"); xFltMgr->appendFilter( m_sAddressListFilterName, sCSV ); xFltMgr->setCurrentFilter( m_sAddressListFilterName ) ; @@ -578,7 +577,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl) { m_sURL = xFP->getFiles().getConstArray()[0]; INetURLObject aResult( m_sURL ); - aResult.setExtension(rtl::OUString("csv")); + aResult.setExtension(OUString("csv")); m_sURL = aResult.GetMainURL(INetURLObject::NO_DECODE); } } diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index 1759e50da1be..98ad7c954f16 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -33,8 +33,8 @@ class SwMailMergeConfigItem; // container of the created database struct SwCSVData { - ::std::vector< ::rtl::OUString > aDBColumnHeaders; - ::std::vector< ::std::vector< ::rtl::OUString> > aDBData; + ::std::vector< OUString > aDBColumnHeaders; + ::std::vector< ::std::vector< OUString> > aDBData; }; class SwFindEntryDialog; diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 8ab066fb66ae..b4784e42a0ce 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -58,7 +58,7 @@ SwCustomizeAddressListDialog::SwCustomizeAddressListDialog( m_aUpPB.SetClickHdl(aUpDownLk); m_aDownPB.SetClickHdl(aUpDownLk); - ::std::vector< ::rtl::OUString >::iterator aHeaderIter; + ::std::vector< OUString >::iterator aHeaderIter; for(aHeaderIter = m_pNewData->aDBColumnHeaders.begin(); aHeaderIter != m_pNewData->aDBColumnHeaders.end(); ++aHeaderIter) @@ -108,7 +108,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, PushButton*, pButton) m_pNewData->aDBColumnHeaders.insert(m_pNewData->aDBColumnHeaders.begin() + nPos, sNew); //add a new entry into all data arrays String sTemp; - ::std::vector< ::std::vector< ::rtl::OUString > >::iterator aDataIter; + ::std::vector< ::std::vector< OUString > >::iterator aDataIter; for( aDataIter = m_pNewData->aDBData.begin(); aDataIter != m_pNewData->aDBData.end(); ++aDataIter) aDataIter->insert(aDataIter->begin() + nPos, sTemp); @@ -131,7 +131,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl) //remove the column m_pNewData->aDBColumnHeaders.erase(m_pNewData->aDBColumnHeaders.begin() + nPos); //remove the data - ::std::vector< ::std::vector< ::rtl::OUString > >::iterator aDataIter; + ::std::vector< ::std::vector< OUString > >::iterator aDataIter; for( aDataIter = m_pNewData->aDBData.begin(); aDataIter != m_pNewData->aDBData.end(); ++aDataIter) aDataIter->erase(aDataIter->begin() + nPos); @@ -152,13 +152,13 @@ IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, PushButton*, pButton) m_aFieldsLB.InsertEntry(aTemp, nPos); m_aFieldsLB.SelectEntryPos(nPos); //align m_pNewData - ::rtl::OUString sHeader = m_pNewData->aDBColumnHeaders[nOldPos]; + OUString sHeader = m_pNewData->aDBColumnHeaders[nOldPos]; m_pNewData->aDBColumnHeaders.erase(m_pNewData->aDBColumnHeaders.begin() + nOldPos); m_pNewData->aDBColumnHeaders.insert(m_pNewData->aDBColumnHeaders.begin() + nPos, sHeader); - ::std::vector< ::std::vector< ::rtl::OUString > >::iterator aDataIter; + ::std::vector< ::std::vector< OUString > >::iterator aDataIter; for( aDataIter = m_pNewData->aDBData.begin(); aDataIter != m_pNewData->aDBData.end(); ++aDataIter) { - ::rtl::OUString sData = (*aDataIter)[nOldPos]; + OUString sData = (*aDataIter)[nOldPos]; aDataIter->erase(aDataIter->begin() + nOldPos); aDataIter->insert(aDataIter->begin() + nPos, sData); } @@ -183,7 +183,7 @@ SwCSVData* SwCustomizeAddressListDialog::GetNewData() } SwAddRenameEntryDialog::SwAddRenameEntryDialog( - Window* pParent, bool bRename, const ::std::vector< ::rtl::OUString >& rCSVHeader) : + Window* pParent, bool bRename, const ::std::vector< OUString >& rCSVHeader) : SfxModalDialog(pParent, SW_RES(DLG_MM_ADD_RENAME_ENTRY)), #ifdef _MSC_VER #pragma warning (disable : 4355) @@ -213,12 +213,12 @@ SwAddRenameEntryDialog::~SwAddRenameEntryDialog() IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit*, pEdit) { - ::rtl::OUString sEntry = pEdit->GetText(); + OUString sEntry = pEdit->GetText(); sal_Bool bFound = sEntry.isEmpty(); if(!bFound) { - ::std::vector< ::rtl::OUString >::const_iterator aHeaderIter; + ::std::vector< OUString >::const_iterator aHeaderIter; for(aHeaderIter = m_rCSVHeader.begin(); aHeaderIter != m_rCSVHeader.end(); ++aHeaderIter) diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index f4bdab646f44..3eec3fbb4e8e 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -69,11 +69,11 @@ class SwAddRenameEntryDialog : public SfxModalDialog CancelButton m_aCancel; HelpButton m_aHelp; - const ::std::vector< ::rtl::OUString >& m_rCSVHeader; + const ::std::vector< OUString >& m_rCSVHeader; DECL_LINK(ModifyHdl_Impl, Edit*); public: - SwAddRenameEntryDialog(Window* pParent, bool bRename, const ::std::vector< ::rtl::OUString >& aCSVHeader); + SwAddRenameEntryDialog(Window* pParent, bool bRename, const ::std::vector< OUString >& aCSVHeader); ~SwAddRenameEntryDialog(); void SetFieldName(const String& rName) {m_aFieldNameED.SetText(rName);} diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index e475cdf2a163..f8679f4dd170 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -163,7 +163,7 @@ struct _DB_Column struct _DB_ColumnConfigData { SwInsDBColumns aDBColumns; - rtl::OUString sSource, sTable, sEdit, sTblList, sTmplNm, sTAutoFmtNm; + OUString sSource, sTable, sEdit, sTblList, sTmplNm, sTAutoFmtNm; sal_Bool bIsTable : 1, bIsField : 1, bIsHeadlineOn : 1, @@ -269,8 +269,8 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, } } Reference xCols = xColSupp->getColumns(); - Sequence aColNames = xCols->getElementNames(); - const rtl::OUString* pColNames = aColNames.getConstArray(); + Sequence aColNames = xCols->getElementNames(); + const OUString* pColNames = aColNames.getConstArray(); long nCount = aColNames.getLength(); for (long n = 0; n < nCount; n++) { @@ -278,7 +278,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, Any aCol = xCols->getByName(pColNames[n]); Reference xCol; aCol >>= xCol; - Any aType = xCol->getPropertyValue(rtl::OUString("Type")); + Any aType = xCol->getPropertyValue(OUString("Type")); sal_Int32 eDataType = 0; aType >>= eDataType; switch(eDataType) @@ -311,7 +311,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, Reference xNumProps = xNumberFormats->getByKey( nFmt ); Any aFormatVal = xNumProps->getPropertyValue("FormatString"); Any aLocale = xNumProps->getPropertyValue("Locale"); - rtl::OUString sFormat; + OUString sFormat; aFormatVal >>= sFormat; lang::Locale aLoc; aLocale >>= aLoc; @@ -814,7 +814,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox ) if( bEnableFmt ) { - (( sTxt += rtl::OUString(" (" )) += String(aSrch.sColumn) ) += (sal_Unicode)')'; + (( sTxt += OUString(" (" )) += String(aSrch.sColumn) ) += (sal_Unicode)')'; } sal_Bool bIsDBFmt = (*it)->bIsDBFmt; @@ -1139,7 +1139,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence& rSelection, } else { - rtl::OUString sVal = xColumn->getString(); + OUString sVal = xColumn->getString(); if(!xColumn->wasNull()) { rSh.SwEditShell::Insert2( sVal ); @@ -1148,7 +1148,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence& rSelection, } catch (const Exception& rExcept) { - OSL_FAIL(rtl::OUStringToOString(rExcept.Message, osl_getThreadTextEncoding()).getStr()); + OSL_FAIL(OUStringToOString(rExcept.Message, osl_getThreadTextEncoding()).getStr()); (void)rExcept; } } @@ -1239,7 +1239,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence& rSelection, aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang() ).getLocale(); SwDBNextSetField aNxtDBFld( (SwDBNextSetFieldType*)rSh. GetFldType( 0, RES_DBNEXTSETFLD ), - rtl::OUString("1"), aEmptyStr, aDBData ); + OUString("1"), aEmptyStr, aDBData ); bool bSetCrsr = true; @@ -1364,8 +1364,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence& rSelection, GetfnParaCurr(), GetfnParaStart() ); pMark = rSh.SetBookmark( KeyCode(), - ::rtl::OUString(), - ::rtl::OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); + OUString(), + OUString(), IDocumentMarkAccess::UNO_BOOKMARK ); rSh.SwCrsrShell::MovePara( GetfnParaCurr(), GetfnParaEnd() ); bSetCrsr = false; @@ -1466,10 +1466,10 @@ void SwInsertDBColAutoPilot::SetTabSet() _DB_ColumnConfigData::~_DB_ColumnConfigData() {} -static Sequence lcl_createSourceNames(const String& rNodeName) +static Sequence lcl_createSourceNames(const String& rNodeName) { - Sequence aSourceNames(11); - rtl::OUString* pNames = aSourceNames.getArray(); + Sequence aSourceNames(11); + OUString* pNames = aSourceNames.getArray(); String sTmp( rNodeName ); const xub_StrLen nPos = sTmp.Len(); @@ -1498,10 +1498,10 @@ static Sequence lcl_createSourceNames(const String& rNodeName) return aSourceNames; } -static Sequence lcl_CreateSubNames( const String& rSubNodeName ) +static Sequence lcl_CreateSubNames( const String& rSubNodeName ) { - Sequence aSubSourceNames(6); - rtl::OUString* pNames = aSubSourceNames.getArray(); + Sequence aSubSourceNames(6); + OUString* pNames = aSubSourceNames.getArray(); String sTmp( rSubNodeName ); const xub_StrLen nPos = sTmp.Len(); pNames[0] = sTmp.ReplaceAscii( nPos, STRING_MAXLEN, @@ -1519,15 +1519,15 @@ static Sequence lcl_CreateSubNames( const String& rSubNodeName ) return aSubSourceNames; } -static rtl::OUString lcl_CreateUniqueName(const Sequence& aNames) +static OUString lcl_CreateUniqueName(const Sequence& aNames) { sal_Int32 nIdx = aNames.getLength(); - const rtl::OUString* pNames = aNames.getConstArray(); - rtl::OUString sTest("_"); - rtl::OUString sRet; + const OUString* pNames = aNames.getConstArray(); + OUString sTest("_"); + OUString sRet; while(true) { - sRet = sTest; sRet += rtl::OUString::valueOf(nIdx++); + sRet = sTest; sRet += OUString::valueOf(nIdx++); bool bFound = false; for(sal_Int32 i = 0; i < aNames.getLength(); i++) { @@ -1543,64 +1543,64 @@ static rtl::OUString lcl_CreateUniqueName(const Sequence& aNames) return sRet; } -void SwInsertDBColAutoPilot::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwInsertDBColAutoPilot::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwInsertDBColAutoPilot::Commit() { - Sequence aNames = GetNodeNames(rtl::OUString()); - const rtl::OUString* pNames = aNames.getArray(); + Sequence aNames = GetNodeNames(OUString()); + const OUString* pNames = aNames.getArray(); //remove entries that contain this data source + table at first for(sal_Int32 nNode = 0; nNode < aNames.getLength(); nNode++) { - Sequence aSourceNames(2); - rtl::OUString* pSourceNames = aSourceNames.getArray(); + Sequence aSourceNames(2); + OUString* pSourceNames = aSourceNames.getArray(); pSourceNames[0] = pNames[nNode]; pSourceNames[0] += "/DataSource"; pSourceNames[1] = pNames[nNode]; pSourceNames[1] += "/Command"; Sequence aSourceProperties = GetProperties(aSourceNames); const Any* pSourceProps = aSourceProperties.getArray(); - rtl::OUString sSource, sCommand; + OUString sSource, sCommand; pSourceProps[0] >>= sSource; pSourceProps[1] >>= sCommand; if(sSource.equals(aDBData.sDataSource) && sCommand.equals(aDBData.sCommand)) { - Sequence aElements(1); + Sequence aElements(1); aElements.getArray()[0] = pNames[nNode]; - ClearNodeElements(rtl::OUString(), aElements); + ClearNodeElements(OUString(), aElements); } } - aNames = GetNodeNames(rtl::OUString()); - rtl::OUString sNewNode = lcl_CreateUniqueName(aNames); - Sequence aNodeNames = lcl_createSourceNames(sNewNode); + aNames = GetNodeNames(OUString()); + OUString sNewNode = lcl_CreateUniqueName(aNames); + Sequence aNodeNames = lcl_createSourceNames(sNewNode); Sequence aValues(aNodeNames.getLength()); PropertyValue* pValues = aValues.getArray(); - const rtl::OUString* pNodeNames = aNodeNames.getConstArray(); - rtl::OUString sSlash("/"); + const OUString* pNodeNames = aNodeNames.getConstArray(); + OUString sSlash("/"); for(sal_Int32 i = 0; i < aNodeNames.getLength(); i++) { pValues[i].Name = sSlash; pValues[i].Name += pNodeNames[i]; } - pValues[0].Value <<= rtl::OUString(aDBData.sDataSource); - pValues[1].Value <<= rtl::OUString(aDBData.sCommand); + pValues[0].Value <<= OUString(aDBData.sDataSource); + pValues[1].Value <<= OUString(aDBData.sCommand); pValues[2].Value <<= aDBData.nCommandType; - pValues[3].Value <<= rtl::OUString(aEdDbText.GetText()); + pValues[3].Value <<= OUString(aEdDbText.GetText()); String sTmp; for( sal_uInt16 n = 0, nCnt = aLbTableCol.GetEntryCount(); n < nCnt; ++n ) ( sTmp += aLbTableCol.GetEntry( n ) ) += '\x0a'; if( sTmp.Len() ) - pValues[4].Value <<= rtl::OUString(sTmp); + pValues[4].Value <<= OUString(sTmp); if( sNoTmpl != (sTmp = aLbDbParaColl.GetSelectEntry()) ) - pValues[5].Value <<= rtl::OUString(sTmp); + pValues[5].Value <<= OUString(sTmp); if( pTAutoFmt ) - pValues[6].Value <<= rtl::OUString(pTAutoFmt->GetName()); + pValues[6].Value <<= OUString(pTAutoFmt->GetName()); const Type& rBoolType = ::getBooleanCppuType(); sal_Bool bTmp = aRbAsTable.IsChecked(); @@ -1615,18 +1615,18 @@ void SwInsertDBColAutoPilot::Commit() bTmp = aRbHeadlEmpty.IsChecked(); pValues[10].Value.setValue(&bTmp, rBoolType); - SetSetProperties(rtl::OUString(), aValues); + SetSetProperties(OUString(), aValues); sNewNode += "/ColumnSet"; - rtl::OUString sDelim("/__"); + OUString sDelim("/__"); LanguageType ePrevLang = (LanguageType)-1; - rtl::OUString sPrevLang; + OUString sPrevLang; SvNumberFormatter& rNFmtr = *pView->GetWrtShell().GetNumberFormatter(); for(sal_uInt16 nCol = 0; nCol < aDBColumns.size(); nCol++) { - rtl::OUString sColumnNode = sNewNode; + OUString sColumnNode = sNewNode; SwInsDBColumn* pColumn = aDBColumns[nCol]; String sColumnInsertNode(sColumnNode); sColumnInsertNode += sDelim; @@ -1636,10 +1636,10 @@ void SwInsertDBColAutoPilot::Commit() sColumnInsertNode += '0'; sColumnInsertNode += OUString::number( nCol ); - Sequence aSubNodeNames = lcl_CreateSubNames(sColumnInsertNode); + Sequence aSubNodeNames = lcl_CreateSubNames(sColumnInsertNode); Sequence aSubValues(aSubNodeNames.getLength()); PropertyValue* pSubValues = aSubValues.getArray(); - const rtl::OUString* pSubNodeNames = aSubNodeNames.getConstArray(); + const OUString* pSubNodeNames = aSubNodeNames.getConstArray(); sal_Int32 i; for( i = 0; i < aSubNodeNames.getLength(); i++) @@ -1657,12 +1657,12 @@ void SwInsertDBColAutoPilot::Commit() LanguageType eLang; if( pNF ) { - pSubValues[4].Value <<= rtl::OUString(pNF->GetFormatstring()); + pSubValues[4].Value <<= OUString(pNF->GetFormatstring()); eLang = pNF->GetLanguage(); } else { - pSubValues[4].Value <<= rtl::OUString(sTmp); + pSubValues[4].Value <<= OUString(sTmp); eLang = GetAppLanguage(); } @@ -1672,7 +1672,7 @@ void SwInsertDBColAutoPilot::Commit() lang::Locale aLocale( LanguageTag( eLang ).getLocale()); /* umm.. what's this string anyway, "Country-Language" instead of * "Language-Country" ??? */ - (( sPrevLang = aLocale.Country ) += rtl::OUString( '-' )) += aLocale.Language; + (( sPrevLang = aLocale.Country ) += OUString( '-' )) += aLocale.Language; ePrevLang = eLang; } @@ -1683,17 +1683,17 @@ void SwInsertDBColAutoPilot::Commit() void SwInsertDBColAutoPilot::Load() { - Sequence aNames = GetNodeNames(rtl::OUString()); - const rtl::OUString* pNames = aNames.getArray(); + Sequence aNames = GetNodeNames(OUString()); + const OUString* pNames = aNames.getArray(); SvNumberFormatter& rNFmtr = *pView->GetWrtShell().GetNumberFormatter(); for(sal_Int32 nNode = 0; nNode < aNames.getLength(); nNode++) { //search for entries with the appropriate data source and table - Sequence aSourceNames = lcl_createSourceNames(pNames[nNode]); + Sequence aSourceNames = lcl_createSourceNames(pNames[nNode]); Sequence< Any> aDataSourceProps = GetProperties(aSourceNames); const Any* pDataSourceProps = aDataSourceProps.getConstArray(); - rtl::OUString sSource, sCommand; + OUString sSource, sCommand; sal_Int16 nCommandType; pDataSourceProps[0] >>= sSource; pDataSourceProps[1] >>= sCommand; @@ -1717,19 +1717,19 @@ void SwInsertDBColAutoPilot::Load() if(pDataSourceProps[10].hasValue()) pNewData->bIsEmptyHeadln = *(sal_Bool*)pDataSourceProps[10].getValue(); - rtl::OUString sSubNodeName(pNames[nNode]); + OUString sSubNodeName(pNames[nNode]); sSubNodeName += "/ColumnSet/"; - Sequence aSubNames = GetNodeNames(sSubNodeName); - const rtl::OUString* pSubNames = aSubNames.getConstArray(); + Sequence aSubNames = GetNodeNames(sSubNodeName); + const OUString* pSubNames = aSubNames.getConstArray(); for(sal_Int32 nSub = 0; nSub < aSubNames.getLength(); nSub++) { - rtl::OUString sSubSubNodeName(sSubNodeName); + OUString sSubSubNodeName(sSubNodeName); sSubSubNodeName += pSubNames[nSub]; - Sequence aSubNodeNames = lcl_CreateSubNames(sSubSubNodeName); + Sequence aSubNodeNames = lcl_CreateSubNames(sSubSubNodeName); Sequence< Any> aSubProps = GetProperties(aSubNodeNames); const Any* pSubProps = aSubProps.getConstArray(); - rtl::OUString sColumn; + OUString sColumn; pSubProps[0] >>= sColumn; //check for existance of the loaded column name bool bFound = false; @@ -1752,7 +1752,7 @@ void SwInsertDBColAutoPilot::Load() pInsDBColumn->bIsDBFmt = *(sal_Bool*)pSubProps[3].getValue(); pSubProps[4] >>= pInsDBColumn->sUsrNumFmt; - rtl::OUString sNumberFormatLocale; + OUString sNumberFormatLocale; pSubProps[5] >>= sNumberFormatLocale; /* FIXME-BCP47: handle language tags, and cope with the wrong diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index cc63401d0a20..c7ce0395d406 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -276,7 +276,7 @@ static sal_Bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos) } static sal_Bool lcl_GetColumnCnt(SwDSParam* pParam, - const String& rColumnName, long nLanguage, rtl::OUString& rResult, double* pNumber) + const String& rColumnName, long nLanguage, OUString& rResult, double* pNumber) { uno::Reference< XColumnsSupplier > xColsSupp( pParam->xResultSet, UNO_QUERY ); uno::Reference xCols; @@ -565,7 +565,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh) else { // column not found -> show error - rtl::OUStringBuffer sInsert; + OUStringBuffer sInsert; sInsert.append('?').append(sColumn).append('?'); pSh->Insert(sInsert.makeStringAndClear()); } @@ -576,8 +576,8 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh) else { String sStr; - Sequence aColNames = xCols->getElementNames(); - const rtl::OUString* pColNames = aColNames.getConstArray(); + Sequence aColNames = xCols->getElementNames(); + const OUString* pColNames = aColNames.getConstArray(); long nLength = aColNames.getLength(); for(long i = 0; i < nLength; i++) { @@ -609,7 +609,7 @@ sal_Bool SwNewDBMgr::GetTableNames(ListBox* pListBox, const String& rDBName) xConnection = pParam->xConnection; else { - rtl::OUString sDBName(rDBName); + OUString sDBName(rDBName); if ( !sDBName.isEmpty() ) xConnection = RegisterConnection( sDBName ); } @@ -619,8 +619,8 @@ sal_Bool SwNewDBMgr::GetTableNames(ListBox* pListBox, const String& rDBName) if(xTSupplier.is()) { uno::Reference xTbls = xTSupplier->getTables(); - Sequence aTbls = xTbls->getElementNames(); - const rtl::OUString* pTbls = aTbls.getConstArray(); + Sequence aTbls = xTbls->getElementNames(); + const OUString* pTbls = aTbls.getConstArray(); for(long i = 0; i < aTbls.getLength(); i++) { sal_uInt16 nEntry = pListBox->InsertEntry(pTbls[i]); @@ -631,8 +631,8 @@ sal_Bool SwNewDBMgr::GetTableNames(ListBox* pListBox, const String& rDBName) if(xQSupplier.is()) { uno::Reference xQueries = xQSupplier->getQueries(); - Sequence aQueries = xQueries->getElementNames(); - const rtl::OUString* pQueries = aQueries.getConstArray(); + Sequence aQueries = xQueries->getElementNames(); + const OUString* pQueries = aQueries.getConstArray(); for(long i = 0; i < aQueries.getLength(); i++) { sal_uInt16 nEntry = pListBox->InsertEntry(pQueries[i]); @@ -664,15 +664,15 @@ sal_Bool SwNewDBMgr::GetColumnNames(ListBox* pListBox, xConnection = pParam->xConnection; else { - rtl::OUString sDBName(rDBName); + OUString sDBName(rDBName); xConnection = RegisterConnection( sDBName ); } uno::Reference< XColumnsSupplier> xColsSupp = SwNewDBMgr::GetColumnSupplier(xConnection, rTableName); if(xColsSupp.is()) { uno::Reference xCols = xColsSupp->getColumns(); - const Sequence aColNames = xCols->getElementNames(); - const rtl::OUString* pColNames = aColNames.getConstArray(); + const Sequence aColNames = xCols->getElementNames(); + const OUString* pColNames = aColNames.getConstArray(); for(int nCol = 0; nCol < aColNames.getLength(); nCol++) { pListBox->InsertEntry(pColNames[nCol]); @@ -692,8 +692,8 @@ sal_Bool SwNewDBMgr::GetColumnNames(ListBox* pListBox, if(xColsSupp.is()) { uno::Reference xCols = xColsSupp->getColumns(); - const Sequence aColNames = xCols->getElementNames(); - const rtl::OUString* pColNames = aColNames.getConstArray(); + const Sequence aColNames = xCols->getElementNames(); + const OUString* pColNames = aColNames.getConstArray(); for(int nCol = 0; nCol < aColNames.getLength(); nCol++) { pListBox->InsertEntry(pColNames[nCol]); @@ -833,7 +833,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, const bool bAsSingleFile = rMergeDescriptor.nMergeType == DBMGR_MERGE_SINGLE_FILE; ::rtl::Reference< MailDispatcher > xMailDispatcher; - ::rtl::OUString sBodyMimeType; + OUString sBodyMimeType; rtl_TextEncoding eEncoding = ::osl_getThreadTextEncoding(); if(bEMail) @@ -841,15 +841,15 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, xMailDispatcher.set( new MailDispatcher(rMergeDescriptor.xSmtpServer)); if(!rMergeDescriptor.bSendAsAttachment && rMergeDescriptor.bSendAsHTML) { - sBodyMimeType = ::rtl::OUString("text/html; charset="); - sBodyMimeType += ::rtl::OUString::createFromAscii( + sBodyMimeType = OUString("text/html; charset="); + sBodyMimeType += OUString::createFromAscii( rtl_getBestMimeCharsetFromTextEncoding( eEncoding )); SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get(); eEncoding = rHtmlOptions.GetTextEncoding(); } else sBodyMimeType = - ::rtl::OUString("text/plain; charset=UTF-8; format=flowed"); + OUString("text/plain; charset=UTF-8; format=flowed"); } uno::Reference< XPropertySet > xColumnProp; @@ -882,7 +882,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, // if a save_to filter is set then use it - otherwise use the default if( bEMail && !rMergeDescriptor.bSendAsAttachment ) { - rtl::OUString sExtension = rMergeDescriptor.bSendAsHTML ? rtl::OUString("html") : rtl::OUString("txt"); + OUString sExtension = rMergeDescriptor.bSendAsHTML ? OUString("html") : OUString("txt"); pStoreToFilter = pFilterContainer->GetFilter4Extension(sExtension, SFX_FILTER_EXPORT); } else if( rMergeDescriptor.sSaveToFilter.Len()) @@ -1169,7 +1169,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, pMessage->setReplyToAddress(rMergeDescriptor.pMailMergeConfigItem->GetMailReplyTo()); pMessage->addRecipient( sMailAddress ); pMessage->SetSenderAddress( rMergeDescriptor.pMailMergeConfigItem->GetMailAddress() ); - ::rtl::OUString sBody; + OUString sBody; if(rMergeDescriptor.bSendAsAttachment) { sBody = rMergeDescriptor.sMailBody; @@ -1191,12 +1191,12 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, if(pInStream) { pInStream->SetStreamCharSet( eEncoding ); - rtl::OString sLine; + OString sLine; sal_Bool bDone = pInStream->ReadLine( sLine ); while ( bDone ) { - sBody += rtl::OStringToOUString(sLine, eEncoding); - sBody += ::rtl::OUString('\n'); + sBody += OStringToOUString(sLine, eEncoding); + sBody += OUString('\n'); bDone = pInStream->ReadLine( sLine ); } } @@ -1211,13 +1211,13 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, if(rMergeDescriptor.aCopiesTo.getLength()) { - const ::rtl::OUString* pCopies = rMergeDescriptor.aCopiesTo.getConstArray(); + const OUString* pCopies = rMergeDescriptor.aCopiesTo.getConstArray(); for( sal_Int32 nToken = 0; nToken < rMergeDescriptor.aCopiesTo.getLength(); ++nToken) pMessage->addCcRecipient( pCopies[nToken] ); } if(rMergeDescriptor.aBlindCopiesTo.getLength()) { - const ::rtl::OUString* pCopies = rMergeDescriptor.aBlindCopiesTo.getConstArray(); + const OUString* pCopies = rMergeDescriptor.aBlindCopiesTo.getConstArray(); for( sal_Int32 nToken = 0; nToken < rMergeDescriptor.aBlindCopiesTo.getLength(); ++nToken) pMessage->addBccRecipient( pCopies[nToken] ); } @@ -1275,11 +1275,11 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, #if OSL_DEBUG_LEVEL > 1 sal_Bool _bVal; sal_Int16 _nVal; - rtl::OUString _sVal; + OUString _sVal; const beans::PropertyValue* pDbgPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray(); for( sal_Int32 nOption = 0; nOption < rMergeDescriptor.aPrintOptions.getLength(); ++nOption) { - rtl::OUString aName( pDbgPrintOptions[nOption].Name ); + OUString aName( pDbgPrintOptions[nOption].Name ); uno::Any aVal( pDbgPrintOptions[nOption].Value ); aVal >>= _bVal; aVal >>= _nVal; @@ -1291,7 +1291,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, uno::Sequence< beans::PropertyValue > aOptions( rMergeDescriptor.aPrintOptions ); const sal_Int32 nOpts = aOptions.getLength(); aOptions.realloc( nOpts + 1 ); - aOptions[ nOpts ].Name = rtl::OUString("Wait"); + aOptions[ nOpts ].Name = OUString("Wait"); aOptions[ nOpts ].Value <<= sal_True ; // move print options const beans::PropertyValue* pPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray(); @@ -1390,7 +1390,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( const String& rDBName, } else { - rtl::OUString sDBName(rDBName); + OUString sDBName(rDBName); xConnection = RegisterConnection( sDBName ); bDisposeConnection = true; } @@ -1489,7 +1489,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource, uno::Reference xNumProps = xNumberFormats->getByKey( nFmt ); Any aFormatString = xNumProps->getPropertyValue("FormatString"); Any aLocaleVal = xNumProps->getPropertyValue("Locale"); - rtl::OUString sFormat; + OUString sFormat; aFormatString >>= sFormat; lang::Locale aLoc; aLocaleVal >>= aLoc; @@ -1536,7 +1536,7 @@ sal_Int32 SwNewDBMgr::GetColumnType( const String& rDBName, } else { - rtl::OUString sDBName(rDBName); + OUString sDBName(rDBName); xConnection = RegisterConnection( sDBName ); } if( !xColsSupp.is() ) @@ -1552,7 +1552,7 @@ sal_Int32 SwNewDBMgr::GetColumnType( const String& rDBName, Any aCol = xCols->getByName(rColNm); uno::Reference xCol; aCol >>= xCol; - Any aType = xCol->getPropertyValue(rtl::OUString("Type")); + Any aType = xCol->getPropertyValue(OUString("Type")); aType >>= nRet; } if(bDispose) @@ -1606,7 +1606,7 @@ uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Refe Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); Reference xRowSet(xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY); - ::rtl::OUString sDataSource; + OUString sDataSource; Reference xSource = SwNewDBMgr::getDataSourceAsParent(xConnection, sDataSource); Reference xSourceProperties(xSource, UNO_QUERY); if(xSourceProperties.is()) @@ -1616,7 +1616,7 @@ uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Refe Reference xRowProperties(xRowSet, UNO_QUERY); xRowProperties->setPropertyValue("DataSourceName", makeAny(sDataSource)); - xRowProperties->setPropertyValue("Command", makeAny(::rtl::OUString(rTableOrQuery))); + xRowProperties->setPropertyValue("Command", makeAny(OUString(rTableOrQuery))); xRowProperties->setPropertyValue("CommandType", makeAny(nCommandType)); xRowProperties->setPropertyValue("FetchSize", makeAny((sal_Int32)10)); xRowProperties->setPropertyValue("ActiveConnection", makeAny(xConnection)); @@ -1740,7 +1740,7 @@ sal_Bool SwNewDBMgr::IsDataSourceOpen(const String& rDataSource, sal_Bool SwNewDBMgr::GetColumnCnt(const String& rSourceName, const String& rTableName, const String& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage, - rtl::OUString& rResult, double* pNumber) + OUString& rResult, double* pNumber) { sal_Bool bRet = sal_False; SwDSParam* pFound = 0; @@ -1805,11 +1805,11 @@ sal_Bool SwNewDBMgr::GetColumnCnt(const String& rSourceName, const String& rTabl // reads the column data at the current position sal_Bool SwNewDBMgr::GetMergeColumnCnt(const String& rColumnName, sal_uInt16 nLanguage, - rtl::OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/) + OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/) { if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is() || pImpl->pMergeData->bAfterSelection ) { - rResult = rtl::OUString(); + rResult = OUString(); return sal_False; } @@ -1946,7 +1946,7 @@ sal_Bool SwNewDBMgr::OpenDataSource(const String& rDataSource, const String& rTa pFound->xConnection = pParam->xConnection; else if(bCreate) { - rtl::OUString sDataSource(rDataSource); + OUString sDataSource(rDataSource); pFound->xConnection = RegisterConnection( sDataSource ); } if(pFound->xConnection.is()) @@ -1965,8 +1965,8 @@ sal_Bool SwNewDBMgr::OpenDataSource(const String& rDataSource, const String& rTa pFound->bScrollable = sal_True; } pFound->xStatement = pFound->xConnection->createStatement(); - rtl::OUString aQuoteChar = xMetaData->getIdentifierQuoteString(); - rtl::OUString sStatement("SELECT * FROM "); + OUString aQuoteChar = xMetaData->getIdentifierQuoteString(); + OUString sStatement("SELECT * FROM "); sStatement = "SELECT * FROM "; sStatement += aQuoteChar; sStatement += rTableOrQuery; @@ -1989,7 +1989,7 @@ sal_Bool SwNewDBMgr::OpenDataSource(const String& rDataSource, const String& rTa return pFound->xResultSet.is(); } -uno::Reference< XConnection> SwNewDBMgr::RegisterConnection(rtl::OUString& rDataSource) +uno::Reference< XConnection> SwNewDBMgr::RegisterConnection(OUString& rDataSource) { SwDSParam* pFound = SwNewDBMgr::FindDSConnection(rDataSource, sal_True); uno::Reference< XDataSource> xSource; @@ -2123,7 +2123,7 @@ SwDSParam* SwNewDBMgr::FindDSData(const SwDBData& rData, sal_Bool bCreate) return pFound; } -SwDSParam* SwNewDBMgr::FindDSConnection(const rtl::OUString& rDataSource, sal_Bool bCreate) +SwDSParam* SwNewDBMgr::FindDSConnection(const OUString& rDataSource, sal_Bool bCreate) { //prefer merge data if available if(pImpl->pMergeData && rDataSource == pImpl->pMergeData->sDataSource ) @@ -2164,7 +2164,7 @@ const SwDBData& SwNewDBMgr::GetAddressDBName() return SW_MOD()->GetDBConfig()->GetAddressSource(); } -Sequence SwNewDBMgr::GetExistingDatabaseNames() +Sequence SwNewDBMgr::GetExistingDatabaseNames() { Reference xContext( ::comphelper::getProcessComponentContext() ); Reference xDBContext = DatabaseContext::create(xContext); @@ -2230,7 +2230,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource() || sExt.EqualsIgnoreCaseAscii("ods") || sExt.EqualsIgnoreCaseAscii("xls")) { - rtl::OUString sDBURL("sdbc:calc:"); + OUString sDBURL("sdbc:calc:"); sDBURL += aTempURL.GetMainURL(INetURLObject::NO_DECODE); aURLAny <<= sDBURL; } @@ -2238,11 +2238,11 @@ String SwNewDBMgr::LoadAndRegisterDataSource() { aTempURL.removeSegment(); aTempURL.removeFinalSlash(); - rtl::OUString sDBURL("sdbc:dbase:"); + OUString sDBURL("sdbc:dbase:"); sDBURL += aTempURL.GetMainURL(INetURLObject::NO_DECODE); aURLAny <<= sDBURL; //set the filter to the file name without extension - Sequence aFilters(1); + Sequence aFilters(1); aFilters[0] = aURL.getBase(); aTableFilterAny <<= aFilters; } @@ -2250,28 +2250,28 @@ String SwNewDBMgr::LoadAndRegisterDataSource() { aTempURL.removeSegment(); aTempURL.removeFinalSlash(); - rtl::OUString sDBURL("sdbc:flat:"); + OUString sDBURL("sdbc:flat:"); //only the 'path' has to be added sDBURL += aTempURL.GetMainURL(INetURLObject::NO_DECODE); aURLAny <<= sDBURL; bTextConnection = true; //set the filter to the file name without extension - Sequence aFilters(1); + Sequence aFilters(1); aFilters[0] = aURL.getBase(); aTableFilterAny <<= aFilters; } #ifdef WNT else if(sExt.EqualsIgnoreCaseAscii("mdb")) { - rtl::OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE="); + OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE="); sDBURL += aTempURL.PathToFileName(); aURLAny <<= sDBURL; aSuppressVersionsAny <<= makeAny(true); } else if(sExt.EqualsIgnoreCaseAscii("accdb")) { - rtl::OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE="); + OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE="); sDBURL += aTempURL.PathToFileName(); aURLAny <<= sDBURL; aSuppressVersionsAny <<= makeAny(true); @@ -2331,13 +2331,13 @@ String SwNewDBMgr::LoadAndRegisterDataSource() ::comphelper::copyProperties( uno::Reference < beans::XPropertySet >( xSettingsDlg, uno::UNO_QUERY_THROW ), xDSSettings ); - xDSSettings->setPropertyValue( "Extension", uno::makeAny( ::rtl::OUString( sExt ))); + xDSSettings->setPropertyValue( "Extension", uno::makeAny( OUString( sExt ))); } } Reference xDS(xNewInstance, UNO_QUERY_THROW); Reference xStore(xDS->getDatabaseDocument(), UNO_QUERY_THROW); - String sOutputExt = rtl::OUString(".odb"); + String sOutputExt = OUString(".odb"); String sTmpName; { utl::TempFile aTempFile(sNewName , &sOutputExt, &sHomePath); @@ -2365,7 +2365,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, //prevent second call if(pImpl->pMergeDialog) return ; - rtl::OUString sDataSource, sDataTableOrQuery; + OUString sDataSource, sDataTableOrQuery; Sequence aSelection; sal_Int32 nCmdType = CommandType::TABLE; @@ -2417,9 +2417,9 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), xDocShell)); { //copy rSh to aTempFile - ::rtl::OUString sTempURL; + OUString sTempURL; const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( - rtl::OUString(FILTER_XML), + OUString(FILTER_XML), SwDocShell::Factory().GetFilterContainer() ); try { @@ -2427,7 +2427,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, uno::Sequence< beans::PropertyValue > aValues(1); beans::PropertyValue* pValues = aValues.getArray(); pValues[0].Name = "FilterName"; - pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName()); + pValues[0].Value <<= OUString(pSfxFlt->GetFilterName()); uno::Reference< XStorable > xStore( xDocShell->GetModel(), uno::UNO_QUERY); sTempURL = URIHelper::SmartRel2Abs( INetURLObject(), utl::TempFile::CreateTempName() ); xStore->storeToURL( sTempURL, aValues ); @@ -2523,7 +2523,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, void SwNewDBMgr::InsertText(SwWrtShell& rSh, const Sequence< PropertyValue>& rProperties) { - rtl::OUString sDataSource, sDataTableOrQuery; + OUString sDataSource, sDataTableOrQuery; uno::Reference xResSet; Sequence aSelection; sal_Int16 nCmdType = CommandType::TABLE; @@ -2573,7 +2573,7 @@ void SwNewDBMgr::InsertText(SwWrtShell& rSh, OSL_ENSURE(pDlg, "Dialogdiet fail!"); if( RET_OK == pDlg->Execute() ) { - rtl::OUString sDummy; + OUString sDummy; if(!xConnection.is()) xConnection = xSource->getConnection(sDummy, sDummy); try @@ -2604,7 +2604,7 @@ void SwNewDBMgr::RemoveDbtoolsClient() pDbtoolsClient = 0; } -uno::Reference SwNewDBMgr::getDataSourceAsParent(const uno::Reference< XConnection>& _xConnection,const ::rtl::OUString& _sDataSourceName) +uno::Reference SwNewDBMgr::getDataSourceAsParent(const uno::Reference< XConnection>& _xConnection,const OUString& _sDataSourceName) { uno::Reference xSource; try @@ -2622,8 +2622,8 @@ uno::Reference SwNewDBMgr::getDataSourceAsParent(const uno::Referen return xSource; } -uno::Reference SwNewDBMgr::createCursor(const ::rtl::OUString& _sDataSourceName, - const ::rtl::OUString& _sCommand, +uno::Reference SwNewDBMgr::createCursor(const OUString& _sDataSourceName, + const OUString& _sCommand, sal_Int32 _nCommandType, const uno::Reference& _xConnection ) diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index add08275e3ef..8a5193733c80 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -65,7 +65,7 @@ using namespace ::com::sun::star::beans; struct SwConnectionData { - ::rtl::OUString sSourceName; + OUString sSourceName; Reference xConnection; }; @@ -91,7 +91,7 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener > SwWrtShell* GetWrtShell() { return pWrtSh;} void SetWrtShell(SwWrtShell& rSh) { pWrtSh = &rSh;} Reference GetContext() const {return xDBContext;} - Reference GetConnection(const rtl::OUString& rSourceName); + Reference GetConnection(const OUString& rSourceName); }; SwDBTreeList_Impl::~SwDBTreeList_Impl() @@ -117,7 +117,7 @@ void SwDBTreeList_Impl::elementInserted( const ContainerEvent& ) throw (Runtime void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& rEvent ) throw (RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString sSource; + OUString sSource; rEvent.Accessor >>= sSource; for(SwConnectionArr::iterator i = aConnections.begin(); i != aConnections.end(); ++i) { @@ -152,7 +152,7 @@ sal_Bool SwDBTreeList_Impl::HasContext() return xDBContext.is(); } -Reference SwDBTreeList_Impl::GetConnection(const rtl::OUString& rSourceName) +Reference SwDBTreeList_Impl::GetConnection(const OUString& rSourceName) { Reference xRet; for(SwConnectionArr::const_iterator i = aConnections.begin(); i != aConnections.end(); ++i) @@ -233,8 +233,8 @@ void SwDBTreeList::InitTreeList() GetModel()->SetCompareHdl(LINK(this, SwDBTreeList, DBCompare)); - Sequence< ::rtl::OUString > aDBNames = pImpl->GetContext()->getElementNames(); - const ::rtl::OUString* pDBNames = aDBNames.getConstArray(); + Sequence< OUString > aDBNames = pImpl->GetContext()->getElementNames(); + const OUString* pDBNames = aDBNames.getConstArray(); long nCount = aDBNames.getLength(); Image aImg = aImageList.GetImage(IMG_DB); @@ -349,8 +349,8 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) if(xColsSupplier.is()) { Reference xCols = xColsSupplier->getColumns(); - Sequence< ::rtl::OUString> aColNames = xCols->getElementNames(); - const ::rtl::OUString* pColNames = aColNames.getConstArray(); + Sequence< OUString> aColNames = xCols->getElementNames(); + const OUString* pColNames = aColNames.getConstArray(); long nCount = aColNames.getLength(); for (long i = 0; i < nCount; i++) { @@ -377,10 +377,10 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) if(xTSupplier.is()) { Reference xTbls = xTSupplier->getTables(); - Sequence< ::rtl::OUString> aTblNames = xTbls->getElementNames(); + Sequence< OUString> aTblNames = xTbls->getElementNames(); String sTableName; long nCount = aTblNames.getLength(); - const ::rtl::OUString* pTblNames = aTblNames.getConstArray(); + const OUString* pTblNames = aTblNames.getConstArray(); Image aImg = aImageList.GetImage(IMG_DBTABLE); for (long i = 0; i < nCount; i++) { @@ -395,10 +395,10 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) if(xQSupplier.is()) { Reference xQueries = xQSupplier->getQueries(); - Sequence< ::rtl::OUString> aQueryNames = xQueries->getElementNames(); + Sequence< OUString> aQueryNames = xQueries->getElementNames(); String sQueryName; long nCount = aQueryNames.getLength(); - const ::rtl::OUString* pQueryNames = aQueryNames.getConstArray(); + const OUString* pQueryNames = aQueryNames.getConstArray(); Image aImg = aImageList.GetImage(IMG_DBQUERY); for (long i = 0; i < nCount; i++) { @@ -506,7 +506,7 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ ) // drag database field svx::OColumnTransferable aColTransfer( sDBName - ,::rtl::OUString() + ,OUString() , sdb::CommandType::TABLE ,sTableName , sColumnName diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx index b8e27e6f7c68..17c18dabc925 100644 --- a/sw/source/ui/dbui/dbui.cxx +++ b/sw/source/ui/dbui/dbui.cxx @@ -91,15 +91,15 @@ CreateMonitor::CreateMonitor( Window *pParent ) m_aCounting (this, SW_RES( FT_COUNTING )), m_aCancelButton (this, SW_RES( PB_CANCELPRNMON )), m_sCountingPattern(), - m_sVariable_Total( rtl::OUString("%Y") ), - m_sVariable_Position( rtl::OUString("%X") ), + m_sVariable_Total( OUString("%Y") ), + m_sVariable_Position( OUString("%X") ), m_nTotalCount(0), m_nCurrentPosition(0) { FreeResource(); m_sCountingPattern = m_aCounting.GetText(); - m_aCounting.SetText(rtl::OUString("...")); + m_aCounting.SetText(OUString("...")); } void CreateMonitor::UpdateCountingText() diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/ui/dbui/maildispatcher.cxx index 819b82a5407b..2208f1a122be 100644 --- a/sw/source/ui/dbui/maildispatcher.cxx +++ b/sw/source/ui/dbui/maildispatcher.cxx @@ -23,7 +23,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; typedef std::list< ::rtl::Reference > MailDispatcherListenerContainer_t; @@ -75,7 +74,7 @@ namespace /* private */ MailDeliveryErrorNotifier( ::rtl::Reference xMailDispatcher, uno::Reference message, - const ::rtl::OUString& error_message) : + const OUString& error_message) : mail_dispatcher_(xMailDispatcher), message_(message), error_message_(error_message) @@ -87,7 +86,7 @@ namespace /* private */ private: ::rtl::Reference mail_dispatcher_; uno::Reference message_; - ::rtl::OUString error_message_; + OUString error_message_; }; } // namespace private diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 71f243269228..49bcc64d0eba 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -106,7 +106,7 @@ IMPL_LINK_NOARG(SwMailMergeChildWin, BackHdl) void SwMailMergeChildWin::FillInfo(SfxChildWinInfo& rInfo) const { SfxFloatingWindow::FillInfo(rInfo); - rInfo.aWinState = rtl::OString(); + rInfo.aWinState = OString(); rInfo.bVisible = sal_False; } @@ -170,7 +170,7 @@ public: virtual void mailDelivered(::rtl::Reference xMailDispatcher, uno::Reference< mail::XMailMessage> xMailMessage); virtual void mailDeliveryError(::rtl::Reference xMailDispatcher, - uno::Reference< mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage); + uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage); static void DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage ); }; @@ -211,7 +211,7 @@ void SwMailDispatcherListener_Impl::mailDelivered( void SwMailDispatcherListener_Impl::mailDeliveryError( ::rtl::Reference /*xMailDispatcher*/, uno::Reference< mail::XMailMessage> xMailMessage, - const rtl::OUString& sErrorMessage) + const OUString& sErrorMessage) { SolarMutexGuard aGuard; m_pSendMailDialog->DocumentSent( xMailMessage, false, &sErrorMessage ); @@ -229,8 +229,8 @@ void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMa uno::Reference< beans::XPropertySet > xTransferableProperties( aAttachments[nFile].Data, uno::UNO_QUERY_THROW); if( xTransferableProperties.is() ) { - ::rtl::OUString sURL; - xTransferableProperties->getPropertyValue( ::rtl::OUString("URL") ) >>= sURL; + OUString sURL; + xTransferableProperties->getPropertyValue( OUString("URL") ) >>= sURL; if(!sURL.isEmpty()) SWUnoHelper::UCB_DeleteFile( sURL ); } @@ -635,7 +635,7 @@ void SwSendMailDialog::StateChanged( StateChangedType nStateChange ) void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessage, bool bResult, - const ::rtl::OUString* pError ) + const OUString* pError ) { //sending should stop on send errors if(pError && diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index 37070ee914ec..b5d75e07d961 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; -using rtl::OUString; namespace SwMailMergeHelper { @@ -55,7 +54,7 @@ namespace SwMailMergeHelper String CallSaveAsDialog(String& rFilter) { ErrCode nRet; - String sFactory(rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName())); + String sFactory(OUString::createFromAscii(SwDocShell::Factory().GetShortName())); ::sfx2::FileDialogHelper aDialog( ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, 0, sFactory ); @@ -76,7 +75,7 @@ String CallSaveAsDialog(String& rFilter) for at least one '.' after the '@' and for at least to characters before and after the dot */ -bool CheckMailAddress( const ::rtl::OUString& rMailAddress ) +bool CheckMailAddress( const OUString& rMailAddress ) { String sAddress(rMailAddress); if (!(comphelper::string::getTokenCount(sAddress, '@') == 2)) @@ -131,7 +130,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer( new SwConnectionContext( rConfigItem.GetInServerName(), rConfigItem.GetInServerPort(), - ::rtl::OUString("Insecure")); + OUString("Insecure")); xInMailService->connect(xConnectionContext, xAuthenticator); rxInMailService = xInMailService; } @@ -186,7 +185,7 @@ SwBoldFixedInfo::~SwBoldFixedInfo() struct SwAddressPreview_Impl { - ::std::vector< ::rtl::OUString > aAdresses; + ::std::vector< OUString > aAdresses; sal_uInt16 nRows; sal_uInt16 nColumns; sal_uInt16 nSelectedAddress; @@ -226,13 +225,13 @@ IMPL_LINK_NOARG(SwAddressPreview, ScrollHdl) return 0; } -void SwAddressPreview::AddAddress(const ::rtl::OUString& rAddress) +void SwAddressPreview::AddAddress(const OUString& rAddress) { pImpl->aAdresses.push_back(rAddress); UpdateScrollBar(); } -void SwAddressPreview::SetAddress(const ::rtl::OUString& rAddress) +void SwAddressPreview::SetAddress(const OUString& rAddress) { pImpl->aAdresses.clear(); pImpl->aAdresses.push_back(rAddress); @@ -264,7 +263,7 @@ void SwAddressPreview::Clear() UpdateScrollBar(); } -void SwAddressPreview::ReplaceSelectedAddress(const ::rtl::OUString& rNew) +void SwAddressPreview::ReplaceSelectedAddress(const OUString& rNew) { pImpl->aAdresses[pImpl->nSelectedAddress] = rNew; Invalidate(); @@ -341,7 +340,7 @@ void SwAddressPreview::Paint(const Rectangle&) bool bIsSelected = nAddress == pImpl->nSelectedAddress; if((pImpl->nColumns * pImpl->nRows) == 1) bIsSelected = false; - ::rtl::OUString adr(pImpl->aAdresses[nAddress]); + OUString adr(pImpl->aAdresses[nAddress]); DrawText_Impl(adr,aPos,aPartSize,bIsSelected); ++nAddress; } @@ -424,7 +423,7 @@ void SwAddressPreview::StateChanged( StateChangedType nStateChange ) } void SwAddressPreview::DrawText_Impl( - const ::rtl::OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected) + const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected) { SetClipRegion( Region( Rectangle(rTopLeft, rSize)) ); if(bIsSelected) @@ -447,20 +446,20 @@ void SwAddressPreview::DrawText_Impl( } String SwAddressPreview::FillData( - const ::rtl::OUString& rAddress, + const OUString& rAddress, SwMailMergeConfigItem& rConfigItem, - const Sequence< ::rtl::OUString>* pAssignments) + const Sequence< OUString>* pAssignments) { //find the column names in the address string (with name assignment!) and //exchange the placeholder (like ) with the database content //unassigned columns are expanded to Reference< XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), UNO_QUERY); Reference xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0; - Sequence< ::rtl::OUString> aAssignment = pAssignments ? + Sequence< OUString> aAssignment = pAssignments ? *pAssignments : rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); - const ::rtl::OUString* pAssignment = aAssignment.getConstArray(); + const OUString* pAssignment = aAssignment.getConstArray(); const ResStringArray& rDefHeaders = rConfigItem.GetDefaultAddressHeaders(); String sAddress(rAddress); String sNotAssigned(SW_RES(STR_NOTASSIGNED)); @@ -468,13 +467,13 @@ String SwAddressPreview::FillData( sNotAssigned += '>'; sal_Bool bIncludeCountry = rConfigItem.IsIncludeCountry(); - const ::rtl::OUString rExcludeCountry = rConfigItem.GetExcludeCountry(); + const OUString rExcludeCountry = rConfigItem.GetExcludeCountry(); bool bSpecialReplacementForCountry = (!bIncludeCountry || !rExcludeCountry.isEmpty()); String sCountryColumn; if( bSpecialReplacementForCountry ) { sCountryColumn = rDefHeaders.GetString(MM_PART_COUNTRY); - Sequence< ::rtl::OUString> aSpecialAssignment = + Sequence< OUString> aSpecialAssignment = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); if(aSpecialAssignment.getLength() > MM_PART_COUNTRY && aSpecialAssignment[MM_PART_COUNTRY].getLength()) sCountryColumn = aSpecialAssignment[MM_PART_COUNTRY]; @@ -514,7 +513,7 @@ String SwAddressPreview::FillData( { try { - ::rtl::OUString sReplace = xColumn->getString(); + OUString sReplace = xColumn->getString(); if( bSpecialReplacementForCountry && sCountryColumn == sConvertedColumn ) { @@ -619,8 +618,8 @@ OUString SwAuthenticator::getPassword( ) throw (RuntimeException) } SwConnectionContext::SwConnectionContext( - const ::rtl::OUString& rMailServer, sal_Int16 nPort, - const ::rtl::OUString& rConnectionType) : + const OUString& rMailServer, sal_Int16 nPort, + const OUString& rConnectionType) : m_sMailServer(rMailServer), m_nPort(nPort), m_sConnectionType(rConnectionType) @@ -631,7 +630,7 @@ SwConnectionContext::~SwConnectionContext() { } -uno::Any SwConnectionContext::getValueByName( const ::rtl::OUString& rName ) +uno::Any SwConnectionContext::getValueByName( const OUString& rName ) throw (uno::RuntimeException) { uno::Any aRet; @@ -663,7 +662,7 @@ void SwConnectionListener::disposing(const lang::EventObject& /*aEvent*/) { } -SwMailTransferable::SwMailTransferable(const rtl::OUString& rBody, const rtl::OUString& rMimeType) : +SwMailTransferable::SwMailTransferable(const OUString& rBody, const OUString& rMimeType) : cppu::WeakComponentImplHelper2< datatransfer::XTransferable, beans::XPropertySet >(m_aMutex), m_aMimeType( rMimeType ), m_sBody( rBody ), @@ -671,8 +670,8 @@ SwMailTransferable::SwMailTransferable(const rtl::OUString& rBody, const rtl::OU { } -SwMailTransferable::SwMailTransferable(const rtl::OUString& rURL, - const rtl::OUString& rName, const rtl::OUString& rMimeType) : +SwMailTransferable::SwMailTransferable(const OUString& rURL, + const OUString& rName, const OUString& rMimeType) : cppu::WeakComponentImplHelper2< datatransfer::XTransferable, beans::XPropertySet >(m_aMutex), m_aMimeType( rMimeType ), m_aURL(rURL), @@ -691,7 +690,7 @@ uno::Any SwMailTransferable::getTransferData( const datatransfer::DataFlavor& /* { uno::Any aRet; if( m_bIsBody ) - aRet <<= ::rtl::OUString(m_sBody); + aRet <<= OUString(m_sBody); else { Sequence aData; @@ -717,7 +716,7 @@ uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFla aRet[0].MimeType = m_aMimeType; if( m_bIsBody ) { - aRet[0].DataType = getCppuType((::rtl::OUString*)0); + aRet[0].DataType = getCppuType((OUString*)0); } else { @@ -731,7 +730,7 @@ sal_Bool SwMailTransferable::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) throw (uno::RuntimeException) { - return (aFlavor.MimeType == ::rtl::OUString(m_aMimeType)); + return (aFlavor.MimeType == OUString(m_aMimeType)); } uno::Reference< beans::XPropertySetInfo > SwMailTransferable::getPropertySetInfo( ) throw(uno::RuntimeException) @@ -739,13 +738,13 @@ uno::Reference< beans::XPropertySetInfo > SwMailTransferable::getPropertySetInfo return uno::Reference< beans::XPropertySetInfo >(); } -void SwMailTransferable::setPropertyValue( const ::rtl::OUString& , const uno::Any& ) +void SwMailTransferable::setPropertyValue( const OUString& , const uno::Any& ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { } -uno::Any SwMailTransferable::getPropertyValue( const ::rtl::OUString& rPropertyName ) +uno::Any SwMailTransferable::getPropertyValue( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; @@ -755,27 +754,27 @@ uno::Any SwMailTransferable::getPropertyValue( const ::rtl::OUString& rPropertyN } void SwMailTransferable::addPropertyChangeListener( - const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) + const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } void SwMailTransferable::removePropertyChangeListener( - const ::rtl::OUString&, + const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } void SwMailTransferable::addVetoableChangeListener( - const ::rtl::OUString&, + const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { } void SwMailTransferable::removeVetoableChangeListener( - const ::rtl::OUString& , + const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -790,32 +789,32 @@ SwMailMessage::~SwMailMessage() { } -::rtl::OUString SwMailMessage::getSenderName() throw (uno::RuntimeException) +OUString SwMailMessage::getSenderName() throw (uno::RuntimeException) { return m_sSenderName; } -::rtl::OUString SwMailMessage::getSenderAddress() throw (uno::RuntimeException) +OUString SwMailMessage::getSenderAddress() throw (uno::RuntimeException) { return m_sSenderAddress; } -::rtl::OUString SwMailMessage::getReplyToAddress() throw (uno::RuntimeException) +OUString SwMailMessage::getReplyToAddress() throw (uno::RuntimeException) { return m_sReplyToAddress; } -void SwMailMessage::setReplyToAddress( const ::rtl::OUString& _replytoaddress ) throw (uno::RuntimeException) +void SwMailMessage::setReplyToAddress( const OUString& _replytoaddress ) throw (uno::RuntimeException) { m_sReplyToAddress = _replytoaddress; } -::rtl::OUString SwMailMessage::getSubject() throw (uno::RuntimeException) +OUString SwMailMessage::getSubject() throw (uno::RuntimeException) { return m_sSubject; } -void SwMailMessage::setSubject( const ::rtl::OUString& _subject ) throw (uno::RuntimeException) +void SwMailMessage::setSubject( const OUString& _subject ) throw (uno::RuntimeException) { m_sSubject = _subject; } @@ -832,14 +831,14 @@ void SwMailMessage::setBody( m_xBody = rBody; } -void SwMailMessage::addRecipient( const ::rtl::OUString& rRecipientAddress ) +void SwMailMessage::addRecipient( const OUString& rRecipientAddress ) throw (uno::RuntimeException) { m_aRecipients.realloc(m_aRecipients.getLength() + 1); m_aRecipients[m_aRecipients.getLength() - 1] = rRecipientAddress; } -void SwMailMessage::addCcRecipient( const ::rtl::OUString& rRecipientAddress ) +void SwMailMessage::addCcRecipient( const OUString& rRecipientAddress ) throw (uno::RuntimeException) { m_aCcRecipients.realloc(m_aCcRecipients.getLength() + 1); @@ -847,23 +846,23 @@ void SwMailMessage::addCcRecipient( const ::rtl::OUString& rRecipientAddress ) } -void SwMailMessage::addBccRecipient( const ::rtl::OUString& rRecipientAddress ) throw (uno::RuntimeException) +void SwMailMessage::addBccRecipient( const OUString& rRecipientAddress ) throw (uno::RuntimeException) { m_aBccRecipients.realloc(m_aBccRecipients.getLength() + 1); m_aBccRecipients[m_aBccRecipients.getLength() - 1] = rRecipientAddress; } -uno::Sequence< ::rtl::OUString > SwMailMessage::getRecipients( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SwMailMessage::getRecipients( ) throw (uno::RuntimeException) { return m_aRecipients; } -uno::Sequence< ::rtl::OUString > SwMailMessage::getCcRecipients( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SwMailMessage::getCcRecipients( ) throw (uno::RuntimeException) { return m_aCcRecipients; } -uno::Sequence< ::rtl::OUString > SwMailMessage::getBccRecipients( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SwMailMessage::getBccRecipients( ) throw (uno::RuntimeException) { return m_aBccRecipients; } diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index b81a767ce38c..473407084027 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -143,7 +143,7 @@ void SwMailMergeAddressBlockPage::ActivatePage() m_aDocumentIndexFI.SetText(sTemp); m_aSettingsWIN.Clear(); - const uno::Sequence< ::rtl::OUString> aBlocks = + const uno::Sequence< OUString> aBlocks = m_pWizard->GetConfigItem().GetAddressBlocks(); for(sal_Int32 nAddress = 0; nAddress < aBlocks.getLength(); ++nAddress) m_aSettingsWIN.AddAddress(aBlocks[nAddress]); @@ -175,7 +175,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl) xAddrDialog->GetConnection(), xAddrDialog->GetColumnsSupplier(), xAddrDialog->GetDBData()); - ::rtl::OUString sFilter = xAddrDialog->GetFilter(); + OUString sFilter = xAddrDialog->GetFilter(); rConfigItem.SetFilter( sFilter ); InsertDataHdl_Impl(0); GetWizard()->UpdateRoadmap(); @@ -184,7 +184,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl) } catch (const uno::Exception& e) { - OSL_FAIL(rtl::OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr()); + OSL_FAIL(OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr()); ErrorBox(this, WB_OK, e.Message).Execute(); } return 0; @@ -200,7 +200,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton) if(RET_OK == pDlg->Execute()) { //the dialog provides the selected address at the first position! - const uno::Sequence< ::rtl::OUString> aBlocks = + const uno::Sequence< OUString> aBlocks = pDlg->GetAddressBlocks(); rConfig.SetAddressBlocks(aBlocks); m_aSettingsWIN.Clear(); @@ -221,7 +221,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, PushButton*, pButton) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); sal_uInt16 nSel = m_aSettingsWIN.GetSelectedAddress(); - const uno::Sequence< ::rtl::OUString> aBlocks = rConfigItem.GetAddressBlocks(); + const uno::Sequence< OUString> aBlocks = rConfigItem.GetAddressBlocks(); SwAssignFieldsDialog* pDlg = new SwAssignFieldsDialog(pButton, m_pWizard->GetConfigItem(), aBlocks[nSel], true); if(RET_OK == pDlg->Execute()) @@ -265,7 +265,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, CheckBox*, pBox) IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl) { sal_uInt16 nSel = m_aSettingsWIN.GetSelectedAddress(); - const uno::Sequence< ::rtl::OUString> aBlocks = + const uno::Sequence< OUString> aBlocks = m_pWizard->GetConfigItem().GetAddressBlocks(); String sPreview = SwAddressPreview::FillData(aBlocks[nSel], m_pWizard->GetConfigItem()); m_aPreviewWIN.SetAddress(sPreview); @@ -312,7 +312,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton { //Fill data into preview sal_uInt16 nSel = m_aSettingsWIN.GetSelectedAddress(); - const uno::Sequence< ::rtl::OUString> aBlocks = + const uno::Sequence< OUString> aBlocks = m_pWizard->GetConfigItem().GetAddressBlocks(); String sPreview = SwAddressPreview::FillData(aBlocks[nSel], rConfig); m_aPreviewWIN.SetAddress(sPreview); @@ -382,7 +382,7 @@ SwSelectAddressBlockDialog::~SwSelectAddressBlockDialog() { } -void SwSelectAddressBlockDialog::SetAddressBlocks(const uno::Sequence< ::rtl::OUString>& rBlocks, +void SwSelectAddressBlockDialog::SetAddressBlocks(const uno::Sequence< OUString>& rBlocks, sal_uInt16 nSelectedAddress) { m_aAddressBlocks = rBlocks; @@ -392,14 +392,14 @@ void SwSelectAddressBlockDialog::SetAddressBlocks(const uno::Sequence< ::rtl::OU } // return the address blocks and put the selected one to the first position -const uno::Sequence< ::rtl::OUString >& SwSelectAddressBlockDialog::GetAddressBlocks() +const uno::Sequence< OUString >& SwSelectAddressBlockDialog::GetAddressBlocks() { //put the selected block to the first position sal_uInt16 nSelect = m_aPreview.GetSelectedAddress(); if(nSelect) { - uno::Sequence< ::rtl::OUString >aTemp = m_aAddressBlocks; - ::rtl::OUString* pTemp = aTemp.getArray(); + uno::Sequence< OUString >aTemp = m_aAddressBlocks; + OUString* pTemp = aTemp.getArray(); pTemp[0] = m_aAddressBlocks[nSelect]; sal_uInt32 nIndex = 0; const sal_uInt32 nNumBlocks = m_aAddressBlocks.getLength(); @@ -416,7 +416,7 @@ const uno::Sequence< ::rtl::OUString >& SwSelectAddressBlockDialog::GetAddres } void SwSelectAddressBlockDialog::SetSettings( - sal_Bool bIsCountry, ::rtl::OUString rCountry) + sal_Bool bIsCountry, OUString rCountry) { if(bIsCountry) { @@ -428,9 +428,9 @@ void SwSelectAddressBlockDialog::SetSettings( m_aDeletePB.Enable(m_aAddressBlocks.getLength() > 1); } -::rtl::OUString SwSelectAddressBlockDialog::GetCountry() const +OUString SwSelectAddressBlockDialog::GetCountry() const { - ::rtl::OUString sRet; + OUString sRet; if(m_aDependentRB.IsChecked()) sRet = m_aCountryED.GetText(); return sRet; @@ -441,7 +441,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, PushButton*, pButton) if(m_aAddressBlocks.getLength()) { sal_uInt16 nSelected = m_aPreview.GetSelectedAddress(); - ::rtl::OUString* pAddressBlocks = m_aAddressBlocks.getArray(); + OUString* pAddressBlocks = m_aAddressBlocks.getArray(); sal_Int32 nSource = 0; for(sal_Int32 nTarget = 0; nTarget < m_aAddressBlocks.getLength() - 1; nTarget++) { @@ -473,13 +473,13 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*, pButton { if(bCustomize) { - ::rtl::OUString sNew = pDlg->GetAddress(); + OUString sNew = pDlg->GetAddress(); m_aPreview.ReplaceSelectedAddress(sNew); m_aAddressBlocks[m_aPreview.GetSelectedAddress()] = sNew; } else { - ::rtl::OUString sNew = pDlg->GetAddress(); + OUString sNew = pDlg->GetAddress(); m_aPreview.AddAddress(sNew); m_aAddressBlocks.realloc(m_aAddressBlocks.getLength() + 1); sal_uInt16 nSelect = (sal_uInt16)m_aAddressBlocks.getLength() - 1; @@ -507,7 +507,7 @@ void SwRestrictedComboBox::KeyInput(const KeyEvent& rEvt) bool bCallParent = true; if(rEvt.GetCharCode()) { - rtl::OUString sKey(rEvt.GetCharCode()); + OUString sKey(rEvt.GetCharCode()); if( STRING_NOTFOUND != sForbiddenChars.Search(sKey)) bCallParent = false; } @@ -570,7 +570,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( m_rConfigItem(rConfig), m_eType(eType) { - m_aFieldCB.SetForbiddenChars( rtl::OUString("<>")); + m_aFieldCB.SetForbiddenChars( OUString("<>")); m_aDragED.SetStyle(m_aDragED.GetStyle() |WB_NOHIDESELECTION); if( eType >= GREETING_FEMALE ) { @@ -590,7 +590,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( ResStringArray aPunctArr(SW_RES(RA_PUNCTUATION)); for(i = 0; i < aPunctArr.Count(); ++i) m_aPunctuations.push_back(aPunctArr.GetString(i)); - m_aDragED.SetText(rtl::OUString(" ")); + m_aDragED.SetText(OUString(" ")); SetText( String( SW_RES( eType == GREETING_MALE ? ST_TITLE_MALE : ST_TITLE_FEMALE))); m_aAddressElementsFT.SetText(String(SW_RES(ST_SALUTATIONELEMENTS))); m_aInsertFieldIB.SetQuickHelpText(String(SW_RES(ST_INSERTSALUTATIONFIELD))); @@ -610,7 +610,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( aPreviewSize.Height() += nDiff; m_aPreviewWIN.SetSizePixel(aPreviewSize); m_aPreviewWIN.SetPosPixel(m_aFieldCB.GetPosPixel()); - m_aDragED.SetText(rtl::OUString("\n\n\n\n\n")); + m_aDragED.SetText(OUString("\n\n\n\n\n")); } FreeResource(); const ResStringArray& rHeaders = m_rConfigItem.GetDefaultAddressHeaders(); @@ -825,14 +825,14 @@ void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl() (0 < (sal_Int32)(sal_IntPtr)pEntry->GetUserData() || !m_aFieldCB.GetText().isEmpty())); } -void SwCustomizeAddressBlockDialog::SetAddress(const ::rtl::OUString& rAddress) +void SwCustomizeAddressBlockDialog::SetAddress(const OUString& rAddress) { m_aDragED.SetText( rAddress ); UpdateImageButtons_Impl(); m_aDragED.Modify(); } -::rtl::OUString SwCustomizeAddressBlockDialog::GetAddress() +OUString SwCustomizeAddressBlockDialog::GetAddress() { String sAddress(m_aDragED.GetAddress()); //remove placeholders by the actual content @@ -993,15 +993,15 @@ SwAssignFieldsControl::SwAssignFieldsControl( uno::Reference< XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), uno::UNO_QUERY); //get the name of the actual columns uno::Reference xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0; - uno::Sequence< ::rtl::OUString > aFields; + uno::Sequence< OUString > aFields; if(xColAccess.is()) aFields = xColAccess->getElementNames(); - const ::rtl::OUString* pFields = aFields.getConstArray(); + const OUString* pFields = aFields.getConstArray(); //get the current assignment list //each position in this sequence matches the position in the header array rHeaders //if no assignment is available an empty sequence will be returned - uno::Sequence< ::rtl::OUString> aAssignments = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); + uno::Sequence< OUString> aAssignments = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); Link aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl); Link aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_Impl); @@ -1028,7 +1028,7 @@ SwAssignFieldsControl::SwAssignFieldsControl( { const XubString& rHeader = rHeaders.GetString( i ); FixedInfo* pNewText = new FixedInfo(&m_aWindow, ResId( FT_FIELDS, *rResId.GetResMgr())); - String sLabel(rtl::OUString("<>")); + String sLabel(OUString("<>")); sLabel.Insert(rHeader, 1); pNewText->SetText(sLabel); ListBox* pNewLB = new ListBox(&m_aWindow, ResId(LB_FIELDS, *rResId.GetResMgr())); @@ -1182,7 +1182,7 @@ IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox*, pBox) String sColumn = pBox->GetSelectEntry(); uno::Reference< XColumnsSupplier > xColsSupp( m_rConfigItem.GetResultSet(), uno::UNO_QUERY); uno::Reference xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0; - ::rtl::OUString sPreview; + OUString sPreview; if(xColAccess.is() && xColAccess->hasByName(sColumn)) { uno::Any aCol = xColAccess->getByName(sColumn); @@ -1233,7 +1233,7 @@ IMPL_LINK(SwAssignFieldsControl, GotFocusHdl_Impl, ListBox*, pBox) SwAssignFieldsDialog::SwAssignFieldsDialog( Window* pParent, SwMailMergeConfigItem& rConfigItem, - const ::rtl::OUString& rPreview, + const OUString& rPreview, bool bIsAddressBlock) : SfxModalDialog(pParent, SW_RES(DLG_MM_ASSIGNFIELDS)), #ifdef _MSC_VER @@ -1288,11 +1288,11 @@ SwAssignFieldsDialog::~SwAssignFieldsDialog() delete m_pFieldsControl; } -uno::Sequence< ::rtl::OUString > SwAssignFieldsDialog::CreateAssignments() +uno::Sequence< OUString > SwAssignFieldsDialog::CreateAssignments() { - uno::Sequence< ::rtl::OUString > aAssignments( + uno::Sequence< OUString > aAssignments( m_rConfigItem.GetDefaultAddressHeaders().Count()); - ::rtl::OUString* pAssignments = aAssignments.getArray(); + OUString* pAssignments = aAssignments.getArray(); ::std::vector::iterator aLBIter; sal_Int32 nIndex = 0; for(aLBIter = m_pFieldsControl->m_aMatches.begin(); @@ -1303,7 +1303,7 @@ uno::Sequence< ::rtl::OUString > SwAssignFieldsDialog::CreateAssignments() if(m_sNone != sSelect) pAssignments[nIndex] = sSelect; else - pAssignments[nIndex] = ::rtl::OUString(); + pAssignments[nIndex] = OUString(); } return aAssignments; } @@ -1319,7 +1319,7 @@ IMPL_LINK_NOARG(SwAssignFieldsDialog, OkHdl_Impl) IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl) { - uno::Sequence< ::rtl::OUString > aAssignments = CreateAssignments(); + uno::Sequence< OUString > aAssignments = CreateAssignments(); String sPreview = SwAddressPreview::FillData( m_rPreviewString, m_rConfigItem, &aAssignments); m_aPreviewWIN.SetAddress(sPreview); @@ -1439,7 +1439,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr ) if(sPara.Len() && sPara.GetChar(sPara.Len() - 1) != ' ') { TextPaM aPaM(nPara, sPara.Len()); - pTextEngine->ReplaceText(TextSelection( aPaM ), rtl::OUString(' ')); + pTextEngine->ReplaceText(TextSelection( aPaM ), OUString(' ')); } while(true) { @@ -1461,7 +1461,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr ) if(nLastLen) { TextPaM aPaM(nParaCount ? nParaCount - 1 : 0, nLastLen); - pTextEngine->ReplaceText( TextSelection( aPaM ), rtl::OUString("\n \n ")); + pTextEngine->ReplaceText( TextSelection( aPaM ), OUString("\n \n ")); } } } @@ -1583,7 +1583,7 @@ void AddressMultiLineEdit::MoveCurrentItem(sal_uInt16 nMove) { TextPaM aTemp(nPara - 1, pTextEngine->GetTextLen( nPara - 1 )); - pTextEngine->ReplaceText( aTemp, rtl::OUString('\n')); + pTextEngine->ReplaceText( aTemp, OUString('\n')); } InsertNewEntryAtPosition( sCurrentItem, nPara, nIndex ); diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 9c2d76be843b..57e409711159 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -116,7 +116,7 @@ class SwSelectAddressBlockDialog : public SfxModalDialog CancelButton m_aCancel; HelpButton m_aHelp; - com::sun::star::uno::Sequence< ::rtl::OUString> m_aAddressBlocks; + com::sun::star::uno::Sequence< OUString> m_aAddressBlocks; SwMailMergeConfigItem& m_rConfig; DECL_LINK(NewCustomizeHdl_Impl, PushButton*); @@ -129,13 +129,13 @@ public: SwSelectAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig); ~SwSelectAddressBlockDialog(); - void SetAddressBlocks(const com::sun::star::uno::Sequence< ::rtl::OUString>& rBlocks, + void SetAddressBlocks(const com::sun::star::uno::Sequence< OUString>& rBlocks, sal_uInt16 nSelected); - const com::sun::star::uno::Sequence< ::rtl::OUString>& GetAddressBlocks(); + const com::sun::star::uno::Sequence< OUString>& GetAddressBlocks(); - void SetSettings(sal_Bool bIsCountry, ::rtl::OUString sCountry); + void SetSettings(sal_Bool bIsCountry, OUString sCountry); sal_Bool IsIncludeCountry() const {return !m_aNeverRB.IsChecked();} - ::rtl::OUString GetCountry() const; + OUString GetCountry() const; }; class SwCustomizeAddressBlockDialog; @@ -268,8 +268,8 @@ public: SwCustomizeAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig, DialogType); ~SwCustomizeAddressBlockDialog(); - void SetAddress(const ::rtl::OUString& rAddress); - ::rtl::OUString GetAddress(); + void SetAddress(const OUString& rAddress); + OUString GetAddress(); }; class SwAssignFieldsControl; @@ -288,18 +288,18 @@ class SwAssignFieldsDialog : public SfxModalDialog HelpButton m_aHelp; String m_sNone; - ::rtl::OUString m_rPreviewString; + OUString m_rPreviewString; SwMailMergeConfigItem& m_rConfigItem; - ::com::sun::star::uno::Sequence< ::rtl::OUString > CreateAssignments(); + ::com::sun::star::uno::Sequence< OUString > CreateAssignments(); DECL_LINK(OkHdl_Impl, void *); DECL_LINK(AssignmentModifyHdl_Impl, void*); public: SwAssignFieldsDialog(Window* pParent, SwMailMergeConfigItem& rConfigItem, - const ::rtl::OUString& rPreview, + const OUString& rPreview, bool bIsAddressBlock); ~SwAssignFieldsDialog(); }; diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index f47a0597113c..1cc6e6fbddfa 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -46,7 +46,6 @@ #include using namespace utl; -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -68,9 +67,9 @@ const char* cDataCommandType = "DataSource/DataCommandType"; struct DBAddressDataAssignment { SwDBData aDBData; - Sequence< ::rtl::OUString> aDBColumnAssignments; + Sequence< OUString> aDBColumnAssignments; //if loaded the name of the node has to be saved - ::rtl::OUString sConfigNodeName; + OUString sConfigNodeName; //all created or changed assignments need to be stored bool bColumnAssignmentsChanged; @@ -88,47 +87,47 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem Reference< XStatement> xStatement; Reference< XResultSet> xResultSet; SwDBData aDBData; - ::rtl::OUString sFilter; + OUString sFilter; sal_Int32 nResultSetCursorPos; ::std::vector aAddressDataAssignments; - ::std::vector< ::rtl::OUString> aAddressBlocks; + ::std::vector< OUString> aAddressBlocks; sal_Int32 nCurrentAddressBlock; sal_Bool bIsAddressBlock; sal_Bool bIsHideEmptyParagraphs; sal_Bool bIsOutputToLetter; sal_Bool bIncludeCountry; - ::rtl::OUString sExcludeCountry; + OUString sExcludeCountry; sal_Bool bIsGreetingLine; sal_Bool bIsIndividualGreetingLine; - ::std::vector< ::rtl::OUString> aFemaleGreetingLines; + ::std::vector< OUString> aFemaleGreetingLines; sal_Int32 nCurrentFemaleGreeting; - ::std::vector< ::rtl::OUString> aMaleGreetingLines; + ::std::vector< OUString> aMaleGreetingLines; sal_Int32 nCurrentMaleGreeting; - ::std::vector< ::rtl::OUString> aNeutralGreetingLines; + ::std::vector< OUString> aNeutralGreetingLines; sal_Int32 nCurrentNeutralGreeting; - ::rtl::OUString sFemaleGenderValue; - uno::Sequence< ::rtl::OUString> aSavedDocuments; + OUString sFemaleGenderValue; + uno::Sequence< OUString> aSavedDocuments; sal_Bool bIsGreetingLineInMail; sal_Bool bIsIndividualGreetingLineInMail; //mail settings - ::rtl::OUString sMailDisplayName; - ::rtl::OUString sMailAddress; - ::rtl::OUString sMailReplyTo; - ::rtl::OUString sMailServer; - ::rtl::OUString sMailUserName; - ::rtl::OUString sMailPassword; + OUString sMailDisplayName; + OUString sMailAddress; + OUString sMailReplyTo; + OUString sMailServer; + OUString sMailUserName; + OUString sMailPassword; sal_Bool bIsSMPTAfterPOP; - ::rtl::OUString sInServerName; + OUString sInServerName; sal_Int16 nInServerPort; sal_Bool bInServerPOP; - ::rtl::OUString sInServerUserName; - ::rtl::OUString sInServerPassword; + OUString sInServerUserName; + OUString sInServerPassword; sal_Int16 nMailPort; sal_Bool bIsMailReplyTo; @@ -151,24 +150,24 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem sal_Bool bIsGreetingLine_LastUserSetting; - const Sequence< ::rtl::OUString>& GetPropertyNames(); + const Sequence< OUString>& GetPropertyNames(); public: SwMailMergeConfigItem_Impl(); ~SwMailMergeConfigItem_Impl(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - const Sequence< ::rtl::OUString> + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); + const Sequence< OUString> GetAddressBlocks(sal_Bool bConvertToConfig = sal_False) const; void SetAddressBlocks( - const Sequence< ::rtl::OUString>& rBlocks, + const Sequence< OUString>& rBlocks, sal_Bool bConvertFromConfig = sal_False); - const uno::Sequence< ::rtl::OUString> + const uno::Sequence< OUString> GetGreetings(SwMailMergeConfigItem::Gender eType, sal_Bool bConvertToConfig = sal_False) const; void SetGreetings(SwMailMergeConfigItem::Gender eType, - const uno::Sequence< ::rtl::OUString>& rBlocks, + const uno::Sequence< OUString>& rBlocks, sal_Bool bConvertFromConfig = sal_False); void SetCurrentAddressBlockIndex( sal_Int32 nSet ); @@ -223,7 +222,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : case 2: pValues[nProp] >>= sExcludeCountry; break; case 3: { - Sequence< ::rtl::OUString> aBlocks; + Sequence< OUString> aBlocks; pValues[nProp] >>= aBlocks; SetAddressBlocks(aBlocks, sal_True); } @@ -235,7 +234,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : case 8 : case 9 : { - Sequence< ::rtl::OUString> aGreetings; + Sequence< OUString> aGreetings; pValues[nProp] >>= aGreetings; SetGreetings(SwMailMergeConfigItem::Gender( SwMailMergeConfigItem::FEMALE + nProp - 7), aGreetings, sal_True); @@ -288,28 +287,28 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : } } //read the list of data base assignments - Sequence aAssignments = GetNodeNames(rtl::OUString::createFromAscii(cAddressDataAssignments)); + Sequence aAssignments = GetNodeNames(OUString::createFromAscii(cAddressDataAssignments)); if(aAssignments.getLength()) { //create a list of property names to load the URLs of all data bases const OUString* pAssignments = aAssignments.getConstArray(); - Sequence< ::rtl::OUString > aAssignProperties(4 * aAssignments.getLength()); - ::rtl::OUString* pAssignProperties = aAssignProperties.getArray(); + Sequence< OUString > aAssignProperties(4 * aAssignments.getLength()); + OUString* pAssignProperties = aAssignProperties.getArray(); sal_Int32 nAssign; for(nAssign = 0; nAssign < aAssignProperties.getLength(); nAssign += 4) { - String sAssignPath = rtl::OUString::createFromAscii(cAddressDataAssignments); + String sAssignPath = OUString::createFromAscii(cAddressDataAssignments); sAssignPath += '/'; sAssignPath += String(pAssignments[nAssign / 4]); sAssignPath += '/'; pAssignProperties[nAssign] = sAssignPath; - pAssignProperties[nAssign] += rtl::OUString::createFromAscii(cDataSourceName); + pAssignProperties[nAssign] += OUString::createFromAscii(cDataSourceName); pAssignProperties[nAssign + 1] = sAssignPath; - pAssignProperties[nAssign + 1] += rtl::OUString::createFromAscii(cDataTableName); + pAssignProperties[nAssign + 1] += OUString::createFromAscii(cDataTableName); pAssignProperties[nAssign + 2] = sAssignPath; - pAssignProperties[nAssign + 2] += rtl::OUString::createFromAscii(cDataCommandType); + pAssignProperties[nAssign + 2] += OUString::createFromAscii(cDataCommandType); pAssignProperties[nAssign + 3] = sAssignPath; - pAssignProperties[nAssign + 3] += rtl::OUString::createFromAscii(cDBColumnAssignments); + pAssignProperties[nAssign + 3] += OUString::createFromAscii(cDBColumnAssignments); } Sequence aAssignValues = GetProperties(aAssignProperties); const Any* pAssignValues = aAssignValues.getConstArray(); @@ -327,8 +326,8 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : //check if the saved documents still exist if(aSavedDocuments.getLength()) { - uno::Sequence< ::rtl::OUString > aTempDocuments(aSavedDocuments.getLength()); - ::rtl::OUString* pTempDocuments = aTempDocuments.getArray(); + uno::Sequence< OUString > aTempDocuments(aSavedDocuments.getLength()); + OUString* pTempDocuments = aTempDocuments.getArray(); sal_Int32 nIndex = 0; for(sal_Int32 i = 0; i < aSavedDocuments.getLength(); ++i) { @@ -392,7 +391,7 @@ static void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeader { //convert the strings used for UI to numbers used for the configuration String sBlock(rBlock); - sBlock.SearchAndReplaceAllAscii("\n", rtl::OUString("\\n")); + sBlock.SearchAndReplaceAllAscii("\n", OUString("\\n")); for(sal_uInt16 i = 0; i < rHeaders.Count(); ++i) { String sHeader = rHeaders.GetString( i ); @@ -410,7 +409,7 @@ static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHead //convert the numbers used for the configuration to strings used for UI to numbers //doesn't use ReplaceAll to prevent expansion of numbers inside of the headers String sBlock(rBlock); - sBlock.SearchAndReplaceAllAscii("\\n", rtl::OUString('\n')); + sBlock.SearchAndReplaceAllAscii("\\n", OUString('\n')); SwAddressIterator aGreetingIter(sBlock); sBlock.Erase(); while(aGreetingIter.HasMore()) @@ -497,7 +496,7 @@ const Sequence& SwMailMergeConfigItem_Impl::GetPropertyNames() return aNames; } -void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwMailMergeConfigItem_Impl::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwMailMergeConfigItem_Impl::Commit() { @@ -582,7 +581,7 @@ void SwMailMergeConfigItem_Impl::Commit() //store the changed / new assignments //load the existing node names to find new names - Sequence aAssignments = GetNodeNames(rtl::OUString::createFromAscii(cAddressDataAssignments)); + Sequence aAssignments = GetNodeNames(OUString::createFromAscii(cAddressDataAssignments)); ::std::vector::iterator aAssignIter; for(aAssignIter = aAddressDataAssignments.begin(); @@ -595,7 +594,7 @@ void SwMailMergeConfigItem_Impl::Commit() aAssignIter->sConfigNodeName : lcl_CreateNodeName(aAssignments); OUString sSlash = "/"; - OUString sNodePath = rtl::OUString::createFromAscii(cAddressDataAssignments); + OUString sNodePath = OUString::createFromAscii(cAddressDataAssignments); sNodePath += sSlash; sNodePath += sNewNode; sNodePath += sSlash; @@ -603,30 +602,30 @@ void SwMailMergeConfigItem_Impl::Commit() Sequence< PropertyValue > aNewValues(4); PropertyValue* pNewValues = aNewValues.getArray(); pNewValues[0].Name = sNodePath; - pNewValues[0].Name += rtl::OUString::createFromAscii(cDataSourceName); + pNewValues[0].Name += OUString::createFromAscii(cDataSourceName); pNewValues[0].Value <<= aAssignIter->aDBData.sDataSource; pNewValues[1].Name = sNodePath; - pNewValues[1].Name += rtl::OUString::createFromAscii(cDataTableName); + pNewValues[1].Name += OUString::createFromAscii(cDataTableName); pNewValues[1].Value <<= aAssignIter->aDBData.sCommand; pNewValues[2].Name = sNodePath; - pNewValues[2].Name += rtl::OUString::createFromAscii(cDataCommandType); + pNewValues[2].Name += OUString::createFromAscii(cDataCommandType); pNewValues[2].Value <<= aAssignIter->aDBData.nCommandType; pNewValues[3].Name = sNodePath; - pNewValues[3].Name += rtl::OUString::createFromAscii(cDBColumnAssignments); + pNewValues[3].Name += OUString::createFromAscii(cDBColumnAssignments); pNewValues[3].Value <<= aAssignIter->aDBColumnAssignments; - SetSetProperties(rtl::OUString::createFromAscii(cAddressDataAssignments), aNewValues); + SetSetProperties(OUString::createFromAscii(cAddressDataAssignments), aNewValues); } } bUserSettingWereOverwritten = sal_False; } -const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks( +const Sequence< OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks( sal_Bool bConvertToConfig) const { - Sequence< ::rtl::OUString> aRet(aAddressBlocks.size()); - ::rtl::OUString* pRet = aRet.getArray(); + Sequence< OUString> aRet(aAddressBlocks.size()); + OUString* pRet = aRet.getArray(); for(sal_uInt32 nBlock = 0; nBlock < aAddressBlocks.size(); nBlock++) { pRet[nBlock] = aAddressBlocks[nBlock]; @@ -637,7 +636,7 @@ const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks( } void SwMailMergeConfigItem_Impl::SetAddressBlocks( - const Sequence< ::rtl::OUString>& rBlocks, + const Sequence< OUString>& rBlocks, sal_Bool bConvertFromConfig) { aAddressBlocks.clear(); @@ -652,15 +651,15 @@ void SwMailMergeConfigItem_Impl::SetAddressBlocks( SetModified(); } -const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetGreetings( +const Sequence< OUString> SwMailMergeConfigItem_Impl::GetGreetings( SwMailMergeConfigItem::Gender eType, sal_Bool bConvertToConfig) const { - const ::std::vector< ::rtl::OUString>& rGreetings = + const ::std::vector< OUString>& rGreetings = eType == SwMailMergeConfigItem::FEMALE ? aFemaleGreetingLines : eType == SwMailMergeConfigItem::MALE ? aMaleGreetingLines : aNeutralGreetingLines; - Sequence< ::rtl::OUString> aRet(rGreetings.size()); - ::rtl::OUString* pRet = aRet.getArray(); + Sequence< OUString> aRet(rGreetings.size()); + OUString* pRet = aRet.getArray(); for(sal_uInt32 nGreeting = 0; nGreeting < rGreetings.size(); nGreeting++) { pRet[nGreeting] = rGreetings[nGreeting]; @@ -672,10 +671,10 @@ const Sequence< ::rtl::OUString> SwMailMergeConfigItem_Impl::GetGreetings( void SwMailMergeConfigItem_Impl::SetGreetings( SwMailMergeConfigItem::Gender eType, - const Sequence< ::rtl::OUString>& rSetGreetings, + const Sequence< OUString>& rSetGreetings, sal_Bool bConvertFromConfig) { - ::std::vector< ::rtl::OUString>& rGreetings = + ::std::vector< OUString>& rGreetings = eType == SwMailMergeConfigItem::FEMALE ? aFemaleGreetingLines : eType == SwMailMergeConfigItem::MALE ? aMaleGreetingLines : aNeutralGreetingLines; @@ -774,12 +773,12 @@ const ResStringArray& SwMailMergeConfigItem::GetDefaultAddressHeaders() const } void SwMailMergeConfigItem::SetAddressBlocks( - const Sequence< ::rtl::OUString>& rBlocks) + const Sequence< OUString>& rBlocks) { m_pImpl->SetAddressBlocks(rBlocks); } -const Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetAddressBlocks() const +const Sequence< OUString> SwMailMergeConfigItem::GetAddressBlocks() const { return m_pImpl->GetAddressBlocks(); } @@ -818,12 +817,12 @@ sal_Bool SwMailMergeConfigItem::IsIncludeCountry() const return m_pImpl->bIncludeCountry; } -rtl::OUString& SwMailMergeConfigItem::GetExcludeCountry() const +OUString& SwMailMergeConfigItem::GetExcludeCountry() const { return m_pImpl->sExcludeCountry; } -void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const rtl::OUString& rCountry) +void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const OUString& rCountry) { if(m_pImpl->sExcludeCountry != rCountry || m_pImpl->bIncludeCountry != bSet) @@ -941,12 +940,12 @@ void SwMailMergeConfigItem::DisposeResultSet() } } -::rtl::OUString& SwMailMergeConfigItem::GetFilter() const +OUString& SwMailMergeConfigItem::GetFilter() const { return m_pImpl->sFilter; } -void SwMailMergeConfigItem::SetFilter(::rtl::OUString& rFilter) +void SwMailMergeConfigItem::SetFilter(OUString& rFilter) { if(m_pImpl->sFilter != rFilter) { @@ -1098,15 +1097,15 @@ Sequence< Any > SwMailMergeConfigItem::GetSelection() const return aRet; } -const uno::Sequence< ::rtl::OUString>& +const uno::Sequence< OUString>& SwMailMergeConfigItem::GetSavedDocuments() const { return m_pImpl->aSavedDocuments; } -void SwMailMergeConfigItem::AddSavedDocument(::rtl::OUString rName) +void SwMailMergeConfigItem::AddSavedDocument(OUString rName) { - const ::rtl::OUString* pDocs = m_pImpl->aSavedDocuments.getConstArray(); + const OUString* pDocs = m_pImpl->aSavedDocuments.getConstArray(); bool bFound = false; for(sal_Int32 nDoc = 0; nDoc < m_pImpl->aSavedDocuments.getLength(); ++nDoc) { @@ -1191,14 +1190,14 @@ void SwMailMergeConfigItem::SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail } } -const Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetGreetings( +const Sequence< OUString> SwMailMergeConfigItem::GetGreetings( Gender eType ) const { return m_pImpl->GetGreetings(eType); } void SwMailMergeConfigItem::SetGreetings( - Gender eType, const Sequence< ::rtl::OUString>& rSetGreetings) + Gender eType, const Sequence< OUString>& rSetGreetings) { m_pImpl->SetGreetings( eType, rSetGreetings); } @@ -1214,12 +1213,12 @@ void SwMailMergeConfigItem::SetCurrentGreeting(Gender eType, sal_Int32 nIndex) m_pImpl->SetCurrentGreeting(eType, nIndex); } -const ::rtl::OUString& SwMailMergeConfigItem::GetFemaleGenderValue() const +const OUString& SwMailMergeConfigItem::GetFemaleGenderValue() const { return m_pImpl->sFemaleGenderValue; } -void SwMailMergeConfigItem::SetFemaleGenderValue(const ::rtl::OUString rValue) +void SwMailMergeConfigItem::SetFemaleGenderValue(const OUString rValue) { if( m_pImpl->sFemaleGenderValue != rValue ) { @@ -1228,10 +1227,10 @@ void SwMailMergeConfigItem::SetFemaleGenderValue(const ::rtl::OUString rValue) } } -Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment( +Sequence< OUString> SwMailMergeConfigItem::GetColumnAssignment( const SwDBData& rDBData ) const { - Sequence< ::rtl::OUString> aRet; + Sequence< OUString> aRet; ::std::vector::iterator aAssignIter; for(aAssignIter = m_pImpl->aAddressDataAssignments.begin(); aAssignIter != m_pImpl->aAddressDataAssignments.end(); ++aAssignIter) @@ -1247,10 +1246,10 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment( // returns the name that is assigned as e-mail column of the current data base -::rtl::OUString SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const +OUString SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const { - ::rtl::OUString sRet; - Sequence< ::rtl::OUString> aAssignment = GetColumnAssignment( m_pImpl->aDBData ); + OUString sRet; + Sequence< OUString> aAssignment = GetColumnAssignment( m_pImpl->aDBData ); if(aAssignment.getLength() > sal::static_int_cast< sal_Int32, sal_uInt32>(nColumn) && !aAssignment[nColumn].isEmpty()) sRet = aAssignment[nColumn]; else if(nColumn < m_pImpl->m_AddressHeaderSA.Count()) @@ -1259,7 +1258,7 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment( } void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData, - const Sequence< ::rtl::OUString>& rList) + const Sequence< OUString>& rList) { ::std::vector::iterator aAssignIter; bool bFound = false; @@ -1298,10 +1297,10 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const uno::Reference xCols = xColsSupp->getColumns(); const ResStringArray& rHeaders = GetDefaultAddressHeaders(); - Sequence< ::rtl::OUString> aAssignment = + Sequence< OUString> aAssignment = GetColumnAssignment( GetCurrentDBData() ); - const ::rtl::OUString* pAssignment = aAssignment.getConstArray(); - const Sequence< ::rtl::OUString> aBlocks = GetAddressBlocks(); + const OUString* pAssignment = aAssignment.getConstArray(); + const Sequence< OUString> aBlocks = GetAddressBlocks(); if(aBlocks.getLength() <= m_pImpl->GetCurrentAddressBlockIndex()) return false; @@ -1348,21 +1347,21 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const const ResStringArray& rHeaders = GetDefaultAddressHeaders(); uno::Reference xCols = xColsSupp->getColumns(); - Sequence< ::rtl::OUString> aAssignment = + Sequence< OUString> aAssignment = GetColumnAssignment( GetCurrentDBData() ); - const ::rtl::OUString* pAssignment = aAssignment.getConstArray(); + const OUString* pAssignment = aAssignment.getConstArray(); - const Sequence< ::rtl::OUString> rFemaleEntries = GetGreetings(SwMailMergeConfigItem::FEMALE); + const Sequence< OUString> rFemaleEntries = GetGreetings(SwMailMergeConfigItem::FEMALE); sal_Int32 nCurrentFemale = GetCurrentGreeting(SwMailMergeConfigItem::FEMALE); - const Sequence< ::rtl::OUString> rMaleEntries = GetGreetings(SwMailMergeConfigItem::MALE); + const Sequence< OUString> rMaleEntries = GetGreetings(SwMailMergeConfigItem::MALE); sal_Int32 nCurrentMale = GetCurrentGreeting(SwMailMergeConfigItem::MALE); - ::rtl::OUString sMale, sFemale; + OUString sMale, sFemale; if(rFemaleEntries.getLength() > nCurrentFemale) sFemale = rFemaleEntries[nCurrentFemale]; if(rMaleEntries.getLength() > nCurrentMale) sMale = rMaleEntries[nCurrentMale]; - ::rtl::OUString sAddress( sFemale ); + OUString sAddress( sFemale ); sAddress += sMale; SwAddressIterator aIter(sAddress); while(aIter.HasMore()) @@ -1393,12 +1392,12 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const return bResult; } -::rtl::OUString SwMailMergeConfigItem::GetMailDisplayName() const +OUString SwMailMergeConfigItem::GetMailDisplayName() const { return m_pImpl->sMailDisplayName; } -void SwMailMergeConfigItem::SetMailDisplayName(const ::rtl::OUString& rName) +void SwMailMergeConfigItem::SetMailDisplayName(const OUString& rName) { if(m_pImpl->sMailDisplayName != rName) { @@ -1407,12 +1406,12 @@ void SwMailMergeConfigItem::SetMailDisplayName(const ::rtl::OUString& rName) } } -::rtl::OUString SwMailMergeConfigItem::GetMailAddress() const +OUString SwMailMergeConfigItem::GetMailAddress() const { return m_pImpl->sMailAddress; } -void SwMailMergeConfigItem::SetMailAddress(const ::rtl::OUString& rAddress) +void SwMailMergeConfigItem::SetMailAddress(const OUString& rAddress) { if(m_pImpl->sMailAddress != rAddress ) { @@ -1435,12 +1434,12 @@ void SwMailMergeConfigItem::SetMailReplyTo(sal_Bool bSet) } } -::rtl::OUString SwMailMergeConfigItem::GetMailReplyTo() const +OUString SwMailMergeConfigItem::GetMailReplyTo() const { return m_pImpl->sMailReplyTo; } -void SwMailMergeConfigItem::SetMailReplyTo(const ::rtl::OUString& rReplyTo) +void SwMailMergeConfigItem::SetMailReplyTo(const OUString& rReplyTo) { if(m_pImpl->sMailReplyTo != rReplyTo) { @@ -1449,12 +1448,12 @@ void SwMailMergeConfigItem::SetMailReplyTo(const ::rtl::OUString& rReplyTo) } } -::rtl::OUString SwMailMergeConfigItem::GetMailServer() const +OUString SwMailMergeConfigItem::GetMailServer() const { return m_pImpl->sMailServer; } -void SwMailMergeConfigItem::SetMailServer(const ::rtl::OUString& rAddress) +void SwMailMergeConfigItem::SetMailServer(const OUString& rAddress) { if(m_pImpl->sMailServer != rAddress) { @@ -1508,12 +1507,12 @@ void SwMailMergeConfigItem::SetAuthentication(sal_Bool bSet) } } -::rtl::OUString SwMailMergeConfigItem::GetMailUserName() const +OUString SwMailMergeConfigItem::GetMailUserName() const { return m_pImpl->sMailUserName; } -void SwMailMergeConfigItem::SetMailUserName(const ::rtl::OUString& rName) +void SwMailMergeConfigItem::SetMailUserName(const OUString& rName) { if(m_pImpl->sMailUserName != rName) { @@ -1522,12 +1521,12 @@ void SwMailMergeConfigItem::SetMailUserName(const ::rtl::OUString& rName) } } -::rtl::OUString SwMailMergeConfigItem::GetMailPassword() const +OUString SwMailMergeConfigItem::GetMailPassword() const { return m_pImpl->sMailPassword; } -void SwMailMergeConfigItem::SetMailPassword(const ::rtl::OUString& rPassword) +void SwMailMergeConfigItem::SetMailPassword(const OUString& rPassword) { if(m_pImpl->sMailPassword != rPassword) { @@ -1550,12 +1549,12 @@ void SwMailMergeConfigItem::SetSMTPAfterPOP(sal_Bool bSet) } } -::rtl::OUString SwMailMergeConfigItem::GetInServerName() const +OUString SwMailMergeConfigItem::GetInServerName() const { return m_pImpl->sInServerName; } -void SwMailMergeConfigItem::SetInServerName(const ::rtl::OUString& rServer) +void SwMailMergeConfigItem::SetInServerName(const OUString& rServer) { if(m_pImpl->sInServerName != rServer) { @@ -1592,12 +1591,12 @@ void SwMailMergeConfigItem::SetInServerPOP(sal_Bool bSet) } } -::rtl::OUString SwMailMergeConfigItem::GetInServerUserName() const +OUString SwMailMergeConfigItem::GetInServerUserName() const { return m_pImpl->sInServerUserName; } -void SwMailMergeConfigItem::SetInServerUserName(const ::rtl::OUString& rName) +void SwMailMergeConfigItem::SetInServerUserName(const OUString& rName) { if( m_pImpl->sInServerUserName != rName) { @@ -1606,12 +1605,12 @@ void SwMailMergeConfigItem::SetInServerUserName(const ::rtl::OUString& rName) } } -::rtl::OUString SwMailMergeConfigItem::GetInServerPassword() const +OUString SwMailMergeConfigItem::GetInServerPassword() const { return m_pImpl->sInServerPassword; } -void SwMailMergeConfigItem::SetInServerPassword(const ::rtl::OUString& rPassword) +void SwMailMergeConfigItem::SetInServerPassword(const OUString& rPassword) { if(m_pImpl->sInServerPassword != rPassword) { @@ -1625,7 +1624,7 @@ void SwMailMergeConfigItem::DocumentReloaded() m_bMergeDone = false; m_bGreetingInserted = false; m_bAddressInserted = false; - m_rAddressBlockFrame = ::rtl::OUString(); + m_rAddressBlockFrame = OUString(); } bool SwMailMergeConfigItem::IsMailAvailable() const diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 329016c3b86a..c8551a5ef25c 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -80,7 +80,7 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent m_aBrowseDocPB.SetClickHdl(aFileSelectHdl); m_aBrowseTemplatePB.SetClickHdl(aFileSelectHdl); - const uno::Sequence< ::rtl::OUString >& rDocs = + const uno::Sequence< OUString >& rDocs = m_pWizard->GetConfigItem().GetSavedDocuments(); for(sal_Int32 nDoc = 0; nDoc < rDocs.getLength(); ++nDoc) { @@ -134,7 +134,7 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton) xFP->setDisplayDirectory( SvtPathOptions().GetWorkPath() ); SfxObjectFactory &rFact = m_pWizard->GetSwView()->GetDocShell()->GetFactory(); - SfxFilterMatcher aMatcher( rtl::OUString::createFromAscii(rFact.GetShortName()) ); + SfxFilterMatcher aMatcher( OUString::createFromAscii(rFact.GetShortName()) ); SfxFilterMatcherIter aIter( aMatcher ); Reference xFltMgr(xFP, UNO_QUERY); const SfxFilter* pFlt = aIter.First(); @@ -171,7 +171,7 @@ sal_Bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageRea bool bNext = _eReason == ::svt::WizardTypes::eTravelForward; if(bNext || _eReason == ::svt::WizardTypes::eValidate ) { - ::rtl::OUString sReloadDocument; + OUString sReloadDocument; bReturn = m_aCurrentDocRB.IsChecked() || m_aNewDocRB.IsChecked() || (!(sReloadDocument = m_sLoadFileName).isEmpty() && m_aLoadDocRB.IsChecked() )|| diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index bc85f5ffbe47..c1126eb3908a 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -38,7 +38,7 @@ static void lcl_FillGreetingsBox(ListBox& rBox, SwMailMergeConfigItem& rConfig, SwMailMergeConfigItem::Gender eType) { - const Sequence< ::rtl::OUString> rEntries = rConfig.GetGreetings(eType); + const Sequence< OUString> rEntries = rConfig.GetGreetings(eType); for(sal_Int32 nEntry = 0; nEntry < rEntries.getLength(); ++nEntry) rBox.InsertEntry(rEntries[nEntry]); rBox.SelectEntryPos((sal_uInt16)rConfig.GetCurrentGreeting(eType)); @@ -48,7 +48,7 @@ static void lcl_FillGreetingsBox(ComboBox& rBox, SwMailMergeConfigItem& rConfig, SwMailMergeConfigItem::Gender eType) { - const Sequence< ::rtl::OUString> rEntries = rConfig.GetGreetings(eType); + const Sequence< OUString> rEntries = rConfig.GetGreetings(eType); for(sal_Int32 nEntry = 0; nEntry < rEntries.getLength(); ++nEntry) rBox.InsertEntry(rEntries[nEntry]); rBox.SelectEntryPos((sal_uInt16)rConfig.GetCurrentGreeting(eType)); @@ -58,8 +58,8 @@ static void lcl_StoreGreetingsBox(ListBox& rBox, SwMailMergeConfigItem& rConfig, SwMailMergeConfigItem::Gender eType) { - Sequence< ::rtl::OUString> aEntries(rBox.GetEntryCount()); - ::rtl::OUString* pEntries = aEntries.getArray(); + Sequence< OUString> aEntries(rBox.GetEntryCount()); + OUString* pEntries = aEntries.getArray(); for(sal_uInt16 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry) pEntries[nEntry] = rBox.GetEntry(nEntry); rConfig.SetGreetings(eType, aEntries); @@ -70,8 +70,8 @@ static void lcl_StoreGreetingsBox(ComboBox& rBox, SwMailMergeConfigItem& rConfig, SwMailMergeConfigItem::Gender eType) { - Sequence< ::rtl::OUString> aEntries(rBox.GetEntryCount()); - ::rtl::OUString* pEntries = aEntries.getArray(); + Sequence< OUString> aEntries(rBox.GetEntryCount()); + OUString* pEntries = aEntries.getArray(); for(sal_uInt16 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry) pEntries[nEntry] = rBox.GetEntry(nEntry); rConfig.SetGreetings(eType, aEntries); @@ -160,8 +160,8 @@ void SwMailMergeGreetingsPage::UpdatePreview() bool bNoValue = !m_pFemaleColumnLB->IsEnabled(); if( !bNoValue ) { - ::rtl::OUString sFemaleValue = m_aFemaleFieldCB.GetText(); - ::rtl::OUString sFemaleColumn = m_aFemaleColumnLB.GetSelectEntry(); + OUString sFemaleValue = m_aFemaleFieldCB.GetText(); + OUString sFemaleColumn = m_aFemaleColumnLB.GetSelectEntry(); Reference< sdbcx::XColumnsSupplier > xColsSupp( m_pWizard->GetConfigItem().GetResultSet(), UNO_QUERY); Reference < container::XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0; if(!sFemaleValue.isEmpty() && !sFemaleColumn.isEmpty() && @@ -176,19 +176,19 @@ void SwMailMergeGreetingsPage::UpdatePreview() { try { - ::rtl::OUString sFemaleColumnValue = xColumn->getString(); + OUString sFemaleColumnValue = xColumn->getString(); bFemale = sFemaleColumnValue == sFemaleValue; //bNoValue = !sFemaleColumnValue.getLength(); if( !bNoValue ) { //no last name value marks the greeting also als neutral SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem(); - ::rtl::OUString sLastNameColumn = rConfig.GetAssignedColumn(MM_PART_LASTNAME); + OUString sLastNameColumn = rConfig.GetAssignedColumn(MM_PART_LASTNAME); if ( xColAccess->hasByName(sLastNameColumn) ) { aCol = xColAccess->getByName(sLastNameColumn); aCol >>= xColumn; - ::rtl::OUString sLastNameColumnValue = xColumn->getString(); + OUString sLastNameColumnValue = xColumn->getString(); bNoValue = sLastNameColumnValue.isEmpty(); } } @@ -338,12 +338,12 @@ void SwMailMergeGreetingsPage::ActivatePage() if(xColsSupp.is()) { Reference < container::XNameAccess> xColAccess = xColsSupp->getColumns(); - Sequence< ::rtl::OUString > aColumns = xColAccess->getElementNames(); + Sequence< OUString > aColumns = xColAccess->getElementNames(); for(sal_Int32 nName = 0; nName < aColumns.getLength(); ++nName) m_aFemaleColumnLB.InsertEntry(aColumns[nName]); } - ::rtl::OUString sGenderColumn = rConfig.GetAssignedColumn(MM_PART_GENDER); + OUString sGenderColumn = rConfig.GetAssignedColumn(MM_PART_GENDER); m_aFemaleColumnLB.SelectEntry(sGenderColumn); m_aFemaleColumnLB.SaveValue(); @@ -361,7 +361,7 @@ sal_Bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPage if(m_aFemaleColumnLB.GetSelectEntryPos() != m_aFemaleColumnLB.GetSavedValue()) { const SwDBData& rDBData = rConfig.GetCurrentDBData(); - Sequence< ::rtl::OUString> aAssignment = rConfig.GetColumnAssignment( rDBData ); + Sequence< OUString> aAssignment = rConfig.GetColumnAssignment( rDBData ); if(aAssignment.getLength() <= MM_PART_GENDER) aAssignment.realloc(MM_PART_GENDER + 1); aAssignment[MM_PART_GENDER] = m_aFemaleColumnLB.GetSelectEntry(); @@ -516,12 +516,12 @@ SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard) if(xColsSupp.is()) { Reference < container::XNameAccess> xColAccess = xColsSupp->getColumns(); - Sequence< ::rtl::OUString > aColumns = xColAccess->getElementNames(); + Sequence< OUString > aColumns = xColAccess->getElementNames(); for(sal_Int32 nName = 0; nName < aColumns.getLength(); ++nName) m_aFemaleColumnLB.InsertEntry(aColumns[nName]); } - ::rtl::OUString sGenderColumn = rConfig.GetAssignedColumn(MM_PART_GENDER); + OUString sGenderColumn = rConfig.GetAssignedColumn(MM_PART_GENDER); m_aFemaleColumnLB.SelectEntry(sGenderColumn); m_aFemaleColumnLB.SaveValue(); @@ -551,14 +551,14 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl) if(m_aFemaleColumnLB.GetSelectEntryPos() != m_aFemaleColumnLB.GetSavedValue()) { const SwDBData& rDBData = rConfigItem.GetCurrentDBData(); - Sequence< ::rtl::OUString> aAssignment = rConfigItem.GetColumnAssignment( rDBData ); + Sequence< OUString> aAssignment = rConfigItem.GetColumnAssignment( rDBData ); sal_Int32 nPos = m_aFemaleColumnLB.GetSelectEntryPos(); if(aAssignment.getLength() < MM_PART_GENDER) aAssignment.realloc(MM_PART_GENDER); if( nPos > 0 ) aAssignment[MM_PART_GENDER] = m_aFemaleColumnLB.GetSelectEntry(); else - aAssignment[MM_PART_GENDER] = ::rtl::OUString(); + aAssignment[MM_PART_GENDER] = OUString(); rConfigItem.SetColumnAssignment( rDBData, aAssignment ); } if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue()) diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 19a810f53692..f9ccc48d7208 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -108,7 +108,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( - rtl::OUString( FILTER_XML ), + OUString( FILTER_XML ), SwDocShell::Factory().GetFilterContainer() ); //save the current document into a temporary file { @@ -124,7 +124,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : uno::Sequence< beans::PropertyValue > aValues(1); beans::PropertyValue* pValues = aValues.getArray(); pValues[0].Name = "FilterName"; - pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName()); + pValues[0].Value <<= OUString(pSfxFlt->GetFilterName()); uno::Reference< frame::XStorable > xStore( pView->GetDocShell()->GetModel(), uno::UNO_QUERY); xStore->storeToURL( m_sExampleURL, aValues ); @@ -139,9 +139,9 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : m_aLeftMF.SetValue(m_aLeftMF.Normalize(DEFAULT_LEFT_DISTANCE), FUNIT_TWIP); m_aTopMF.SetValue(m_aTopMF.Normalize(DEFAULT_TOP_DISTANCE), FUNIT_TWIP); - m_aZoomLB.InsertEntry(rtl::OUString("50 %"), 1); - m_aZoomLB.InsertEntry(rtl::OUString("75 %"), 2); - m_aZoomLB.InsertEntry(rtl::OUString("100 %"), 3); + m_aZoomLB.InsertEntry(OUString("50 %"), 1); + m_aZoomLB.InsertEntry(OUString("75 %"), 2); + m_aZoomLB.InsertEntry(OUString("100 %"), 3); m_aZoomLB.SelectEntryPos(0); //page size m_aZoomLB.SetSelectHdl(LINK(this, SwMailMergeLayoutPage, ZoomHdl_Impl)); @@ -309,7 +309,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( OSL_ENSURE( pRet, "Fly not inserted" ); rShell.UnSelectFrm(); - const Sequence< ::rtl::OUString> aBlocks = rConfigItem.GetAddressBlocks(); + const Sequence< OUString> aBlocks = rConfigItem.GetAddressBlocks(); if(bExample) { rShell.Insert(aBlocks[0]); @@ -335,14 +335,14 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( sal_Bool bIncludeCountry = rConfigItem.IsIncludeCountry(); sal_Bool bHideEmptyParagraphs = rConfigItem.IsHideEmptyParagraphs(); - const ::rtl::OUString rExcludeCountry = rConfigItem.GetExcludeCountry(); + const OUString rExcludeCountry = rConfigItem.GetExcludeCountry(); bool bSpecialReplacementForCountry = (!bIncludeCountry || !rExcludeCountry.isEmpty()); const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders(); String sCountryColumn = rHeaders.GetString(MM_PART_COUNTRY); - Sequence< ::rtl::OUString> aAssignment = + Sequence< OUString> aAssignment = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); - const ::rtl::OUString* pAssignment = aAssignment.getConstArray(); + const OUString* pAssignment = aAssignment.getConstArray(); if(aAssignment.getLength() > MM_PART_COUNTRY && !aAssignment[MM_PART_COUNTRY].isEmpty()) sCountryColumn = aAssignment[MM_PART_COUNTRY]; // @@ -499,7 +499,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig for(sal_Int8 eGender = SwMailMergeConfigItem::FEMALE; eGender <= SwMailMergeConfigItem::NEUTRAL; ++eGender) { - Sequence< ::rtl::OUString > aEntries = + Sequence< OUString > aEntries = rConfigItem.GetGreetings((SwMailMergeConfigItem::Gender)eGender); sal_Int32 nCurrent = rConfigItem.GetCurrentGreeting((SwMailMergeConfigItem::Gender)eGender); if( nCurrent >= 0 && nCurrent < aEntries.getLength()) @@ -520,7 +520,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig String sGenderColumn = rConfigItem.GetAssignedColumn(MM_PART_GENDER); String sNameColumn = rConfigItem.GetAssignedColumn(MM_PART_LASTNAME); - const ::rtl::OUString& rFemaleGenderValue = rConfigItem.GetFemaleGenderValue(); + const OUString& rFemaleGenderValue = rConfigItem.GetFemaleGenderValue(); sal_Bool bHideEmptyParagraphs = rConfigItem.IsHideEmptyParagraphs(); const SwDBData& rData = rConfigItem.GetCurrentDBData(); String sConditionBase(rData.sDataSource); @@ -554,7 +554,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig for(sal_Int8 eGender = SwMailMergeConfigItem::FEMALE; eGender <= SwMailMergeConfigItem::NEUTRAL; ++eGender) { - Sequence< ::rtl::OUString> aEntries = rConfigItem.GetGreetings((SwMailMergeConfigItem::Gender)eGender); + Sequence< OUString> aEntries = rConfigItem.GetGreetings((SwMailMergeConfigItem::Gender)eGender); sal_Int32 nCurrent = rConfigItem.GetCurrentGreeting((SwMailMergeConfigItem::Gender)eGender); if( nCurrent >= 0 && nCurrent < aEntries.getLength()) { @@ -600,9 +600,9 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig } //now the text has to be inserted const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders(); - Sequence< ::rtl::OUString> aAssignment = + Sequence< OUString> aAssignment = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); - const ::rtl::OUString* pAssignment = aAssignment.getConstArray(); + const OUString* pAssignment = aAssignment.getConstArray(); SwAddressIterator aIter(sGreeting); while(aIter.HasMore()) { @@ -641,7 +641,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig } else { - Sequence< ::rtl::OUString> aEntries = rConfigItem.GetGreetings(SwMailMergeConfigItem::NEUTRAL); + Sequence< OUString> aEntries = rConfigItem.GetGreetings(SwMailMergeConfigItem::NEUTRAL); sal_Int32 nCurrent = rConfigItem.GetCurrentGreeting(SwMailMergeConfigItem::NEUTRAL); if( nCurrent >= 0 && nCurrent < aEntries.getLength()) sGreeting = aEntries[nCurrent]; @@ -693,7 +693,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl) Any aZoom; aZoom <<= (sal_Int16)DocumentZoomType::ENTIRE_PAGE; - m_xViewProperties->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); + m_xViewProperties->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); const SwFmtFrmSize& rPageSize = m_pExampleWrtShell->GetPageDesc( m_pExampleWrtShell->GetCurPageDesc()).GetMaster().GetFrmSize(); @@ -717,9 +717,9 @@ IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox*, pBox) } Any aZoom; aZoom <<= eType; - m_xViewProperties->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); + m_xViewProperties->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); aZoom <<= nZoom; - m_xViewProperties->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); + m_xViewProperties->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); } return 0; diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index 647f2007e975..8864d327015d 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -51,7 +51,7 @@ SwMailMergeMergePage::SwMailMergeMergePage( SwMailMergeWizard* _pParent) : { FreeResource(); String sTemp(m_aEditFI.GetText()); - sTemp.SearchAndReplace(rtl::OUString("%1"), m_aEditPB.GetText()); + sTemp.SearchAndReplace(OUString("%1"), m_aEditPB.GetText()); m_aEditFI.SetText(sTemp); m_aEditPB.SetClickHdl( LINK( this, SwMailMergeMergePage, EditDocumentHdl_Impl)); m_aFindPB.SetClickHdl( LINK( this, SwMailMergeMergePage, FindHdl_Impl )); diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 297e550a5b4f..cf3d9b06b20e 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -73,21 +73,21 @@ using namespace ::com::sun::star::uno; static String lcl_GetExtensionForDocType(sal_uLong nDocType) { - rtl::OUString sExtension; + OUString sExtension; switch( nDocType ) { - case MM_DOCTYPE_OOO : sExtension = rtl::OUString( "odt" ); break; - case MM_DOCTYPE_PDF : sExtension = rtl::OUString( "pdf" ); break; - case MM_DOCTYPE_WORD: sExtension = rtl::OUString( "doc" ); break; - case MM_DOCTYPE_HTML: sExtension = rtl::OUString( "html" ); break; - case MM_DOCTYPE_TEXT: sExtension = rtl::OUString( "txt" ); break; + case MM_DOCTYPE_OOO : sExtension = OUString( "odt" ); break; + case MM_DOCTYPE_PDF : sExtension = OUString( "pdf" ); break; + case MM_DOCTYPE_WORD: sExtension = OUString( "doc" ); break; + case MM_DOCTYPE_HTML: sExtension = OUString( "html" ); break; + case MM_DOCTYPE_TEXT: sExtension = OUString( "txt" ); break; } return sExtension; } -static ::rtl::OUString lcl_GetColumnValueOf(const ::rtl::OUString& rColumn, Reference < container::XNameAccess>& rxColAccess ) +static OUString lcl_GetColumnValueOf(const OUString& rColumn, Reference < container::XNameAccess>& rxColAccess ) { - ::rtl::OUString sRet; + OUString sRet; try { if (rxColAccess->hasByName(rColumn)) @@ -378,7 +378,7 @@ SwMailMergeOutputPage::~SwMailMergeOutputPage() void SwMailMergeOutputPage::ActivatePage() { //fill printer ListBox - const std::vector& rPrinters = Printer::GetPrinterQueues(); + const std::vector& rPrinters = Printer::GetPrinterQueues(); unsigned int nCount = rPrinters.size(); if ( nCount ) { @@ -546,10 +546,10 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) uno::Reference< sdbcx::XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), uno::UNO_QUERY); //get the name of the actual columns uno::Reference < container::XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0; - uno::Sequence< ::rtl::OUString > aFields; + uno::Sequence< OUString > aFields; if(xColAccess.is()) aFields = xColAccess->getElementNames(); - const ::rtl::OUString* pFields = aFields.getConstArray(); + const OUString* pFields = aFields.getConstArray(); for(sal_Int32 nField = 0; nField < aFields.getLength(); ++nField) m_aMailToLB.InsertEntry(pFields[nField]); @@ -557,7 +557,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) // then select the right one - may not be available const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders(); String sEMailColumn = rHeaders.GetString( MM_PART_E_MAIL ); - Sequence< ::rtl::OUString> aAssignment = + Sequence< OUString> aAssignment = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); if(aAssignment.getLength() > MM_PART_E_MAIL && !aAssignment[MM_PART_E_MAIL].isEmpty()) sEMailColumn = aAssignment[MM_PART_E_MAIL]; @@ -669,7 +669,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) uno::Sequence< beans::PropertyValue > aValues(1); beans::PropertyValue* pValues = aValues.getArray(); pValues[0].Name = "FilterName"; - pValues[0].Value <<= ::rtl::OUString(sFilter); + pValues[0].Value <<= OUString(sFilter); uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY); sal_uInt32 nErrorCode = ERRCODE_NONE; @@ -715,13 +715,13 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) INetURLObject(), utl::TempFile::CreateTempName(), URIHelper::GetMaybeFileHdl()); const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( - rtl::OUString( FILTER_XML ), + OUString( FILTER_XML ), SwDocShell::Factory().GetFilterContainer() ); uno::Sequence< beans::PropertyValue > aValues(1); beans::PropertyValue* pValues = aValues.getArray(); pValues[0].Name = "FilterName"; - pValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName()); + pValues[0].Value <<= OUString(pSfxFlt->GetFilterName()); uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY); sal_uInt32 nErrorCode = ERRCODE_NONE; @@ -791,7 +791,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) pTargetView->GetWrtShell().EndAction(); //then save it String sOutPath = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); - String sCounter = rtl::OUString('_'); + String sCounter = OUString('_'); sCounter += OUString::number(nDoc); sOutPath.Insert(sCounter, sOutPath.Len() - sExtension.Len() - 1); @@ -803,7 +803,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) bool bFailed = false; try { - pValues[0].Value <<= ::rtl::OUString(sFilter); + pValues[0].Value <<= OUString(sFilter); uno::Reference< frame::XStorable > xTempStore( xTempDocShell->GetModel(), uno::UNO_QUERY); xTempStore->storeToURL( sOutPath, aValues ); } @@ -906,9 +906,9 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) SwDocMergeInfo& rStartInfo = rConfigItem.GetDocumentMergeInfo(nBegin); SwDocMergeInfo& rEndInfo = rConfigItem.GetDocumentMergeInfo(nEnd - 1); - rtl::OUString sPages(rtl::OUString::valueOf( rStartInfo.nStartPageInTarget )); - sPages += rtl::OUString(" - "); - sPages += rtl::OUString::valueOf( rEndInfo.nEndPageInTarget ); + OUString sPages(OUString::valueOf( rStartInfo.nStartPageInTarget )); + sPages += OUString(" - "); + sPages += OUString::valueOf( rEndInfo.nEndPageInTarget ); SwWrtShell& rSh = pTargetView->GetWrtShell(); pTargetView->SetMailMergeConfigItem(&rConfigItem, 0, sal_False); @@ -928,9 +928,9 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) m_pWizard->enableButtons(WZB_CANCEL, sal_False); uno::Sequence < beans::PropertyValue > aProps( 2 ); - aProps[0]. Name = rtl::OUString("MonitorVisible"); + aProps[0]. Name = OUString("MonitorVisible"); aProps[0].Value <<= sal_True; - aProps[1]. Name = rtl::OUString("Pages"); + aProps[1]. Name = OUString("Pages"); aProps[1]. Value <<= sPages; pTargetView->ExecPrint( aProps, false, true ); @@ -1046,14 +1046,14 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) //Make sure we don't pick e.g. the flat xml filter //for this format pSfxFlt = SwIoSystem::GetFilterOfFormat( - rtl::OUString( FILTER_XML ), + OUString( FILTER_XML ), SwDocShell::Factory().GetFilterContainer() ); } break; case MM_DOCTYPE_PDF: { pSfxFlt = pFilterContainer->GetFilter4FilterName( - ::rtl::OUString("writer_pdf_Export"), + OUString("writer_pdf_Export"), SFX_FILTER_EXPORT); } break; @@ -1096,7 +1096,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) if(!pSfxFlt) return 0; - ::rtl::OUString sMimeType = pSfxFlt->GetMimeType(); + OUString sMimeType = pSfxFlt->GetMimeType(); if(m_aSubjectED.GetText().isEmpty()) { @@ -1154,13 +1154,13 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) INetURLObject(), utl::TempFile::CreateTempName(), URIHelper::GetMaybeFileHdl()); const SfxFilter *pTargetSfxFlt = SwIoSystem::GetFilterOfFormat( - rtl::OUString( FILTER_XML ), + OUString( FILTER_XML ), SwDocShell::Factory().GetFilterContainer() ); uno::Sequence< beans::PropertyValue > aValues(1); beans::PropertyValue* pValues = aValues.getArray(); pValues[0].Name = "FilterName"; - pValues[0].Value <<= ::rtl::OUString(pTargetSfxFlt->GetFilterName()); + pValues[0].Value <<= OUString(pTargetSfxFlt->GetFilterName()); uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY); xStore->storeToURL( sTargetTempURL, aValues ); @@ -1208,11 +1208,11 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) uno::Sequence< beans::PropertyValue > aFilterValues(MM_DOCTYPE_TEXT == nDocType ? 2 : 1); beans::PropertyValue* pFilterValues = aFilterValues.getArray(); pFilterValues[0].Name = "FilterName"; - pFilterValues[0].Value <<= ::rtl::OUString(pSfxFlt->GetFilterName()); + pFilterValues[0].Value <<= OUString(pSfxFlt->GetFilterName()); if(MM_DOCTYPE_TEXT == nDocType) { pFilterValues[1].Name = "FilterOptions"; - pFilterValues[1].Value <<= ::rtl::OUString(sFilterOptions); + pFilterValues[1].Value <<= OUString(sFilterOptions); } uno::Reference< frame::XStorable > xTempStore( pTempView->GetDocShell()->GetModel(), uno::UNO_QUERY); @@ -1224,10 +1224,10 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) OSL_ENSURE( nTarget == rInfo.nDBRow, "row of current document could not be selected"); (void)nTarget; OSL_ENSURE( sEMailColumn.Len(), "No email column selected"); - ::rtl::OUString sEMail = lcl_GetColumnValueOf(sEMailColumn, xColAccess); + OUString sEMail = lcl_GetColumnValueOf(sEMailColumn, xColAccess); SwMailDescriptor aDesc; aDesc.sEMail = sEMail; - rtl::OUString sBody; + OUString sBody; if(bAsBody) { { @@ -1241,12 +1241,12 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) OSL_FAIL("no output file created?"); continue; } - rtl::OString sLine; + OString sLine; sal_Bool bDone = pInStream->ReadLine( sLine ); while ( bDone ) { - sBody += rtl::OStringToOUString(sLine, eEncoding); - sBody += rtl::OUString('\n'); + sBody += OStringToOUString(sLine, eEncoding); + sBody += OUString('\n'); bDone = pInStream->ReadLine( sLine ); } } @@ -1271,14 +1271,14 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) if(rConfigItem.IsGreetingLine(sal_True)) { - ::rtl::OUString sNameColumn = rConfigItem.GetAssignedColumn(MM_PART_LASTNAME); - ::rtl::OUString sName = lcl_GetColumnValueOf(sNameColumn, xColAccess); + OUString sNameColumn = rConfigItem.GetAssignedColumn(MM_PART_LASTNAME); + OUString sName = lcl_GetColumnValueOf(sNameColumn, xColAccess); String sGreeting; if(!sName.isEmpty() && rConfigItem.IsIndividualGreeting(sal_True)) { - ::rtl::OUString sGenderColumn = rConfigItem.GetAssignedColumn(MM_PART_GENDER); - const ::rtl::OUString& sFemaleValue = rConfigItem.GetFemaleGenderValue(); - ::rtl::OUString sGenderValue = lcl_GetColumnValueOf(sGenderColumn, xColAccess); + OUString sGenderColumn = rConfigItem.GetAssignedColumn(MM_PART_GENDER); + const OUString& sFemaleValue = rConfigItem.GetFemaleGenderValue(); + OUString sGenderValue = lcl_GetColumnValueOf(sGenderColumn, xColAccess); SwMailMergeConfigItem::Gender eGenderType = sGenderValue == sFemaleValue ? SwMailMergeConfigItem::FEMALE : SwMailMergeConfigItem::MALE; @@ -1296,7 +1296,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) } sGreeting += '\n'; - ::rtl::OUString sTemp( sGreeting ); + OUString sTemp( sGreeting ); sTemp += sBody; sBody = sTemp; } @@ -1304,13 +1304,13 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) aDesc.sBodyContent = sBody; if(MM_DOCTYPE_HTML == nDocType) { - aDesc.sBodyMimeType = ::rtl::OUString("text/html; charset="); - aDesc.sBodyMimeType += ::rtl::OUString::createFromAscii( + aDesc.sBodyMimeType = OUString("text/html; charset="); + aDesc.sBodyMimeType += OUString::createFromAscii( rtl_getBestMimeCharsetFromTextEncoding( eEncoding )); } else aDesc.sBodyMimeType = - ::rtl::OUString("text/plain; charset=UTF-8; format=flowed"); + OUString("text/plain; charset=UTF-8; format=flowed"); aDesc.sSubject = m_aSubjectED.GetText(); aDesc.sCC = m_sCC; diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index b1ffd57c5f12..1956d2bd9691 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -136,17 +136,17 @@ public: struct SwMailDescriptor { - ::rtl::OUString sEMail; - ::rtl::OUString sAttachmentURL; - ::rtl::OUString sAttachmentName; - ::rtl::OUString sMimeType; - ::rtl::OUString sSubject; - ::rtl::OUString sBodyMimeType; - ::rtl::OUString sBodyContent; + OUString sEMail; + OUString sAttachmentURL; + OUString sAttachmentName; + OUString sMimeType; + OUString sSubject; + OUString sBodyMimeType; + OUString sBodyContent; - ::rtl::OUString sCC; - ::rtl::OUString sBCC; + OUString sCC; + OUString sBCC; }; struct SwSendMailDialog_Impl; class SwMailMergeConfigItem; @@ -217,7 +217,7 @@ public: void DocumentSent( ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage>, bool bResult, - const ::rtl::OUString* pError ); + const OUString* pError ); void AllMailsSent(); }; diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index c2f127542833..2e146ff66c60 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; -using ::rtl::OUString; SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent) : svt::OWizardPage( _pParent, SW_RES(DLG_MM_PREPAREMERGE_PAGE)), diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 833130c65227..aa9003593b03 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -103,8 +103,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, if(xTSupplier.is()) { Reference xTbls = xTSupplier->getTables(); - Sequence aTbls = xTbls->getElementNames(); - const rtl::OUString* pTbls = aTbls.getConstArray(); + Sequence aTbls = xTbls->getElementNames(); + const OUString* pTbls = aTbls.getConstArray(); for(long i = 0; i < aTbls.getLength(); i++) { String sEntry = pTbls[i]; @@ -118,8 +118,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, if(xQSupplier.is()) { Reference xQueries = xQSupplier->getQueries(); - Sequence aQueries = xQueries->getElementNames(); - const rtl::OUString* pQueries = aQueries.getConstArray(); + Sequence aQueries = xQueries->getElementNames(); + const OUString* pQueries = aQueries.getConstArray(); for(long i = 0; i < aQueries.getLength(); i++) { String sEntry = pQueries[i]; @@ -140,10 +140,10 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton) SvTreeListEntry* pEntry = m_aTableLB.FirstSelected(); if(pEntry) { - ::rtl::OUString sTableOrQuery = m_aTableLB.GetEntryText(pEntry, 0); + OUString sTableOrQuery = m_aTableLB.GetEntryText(pEntry, 0); sal_Int32 nCommandType = 0 == pEntry->GetUserData() ? 0 : 1; - ::rtl::OUString sDataSourceName; + OUString sDataSourceName; Reference xChild(m_xConnection, UNO_QUERY); if(xChild.is()) { diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx index 4a9e97b168d0..14cce3b67a91 100644 --- a/sw/source/ui/dbui/swdbtoolsclient.cxx +++ b/sw/source/ui/dbui/swdbtoolsclient.cxx @@ -104,7 +104,7 @@ void SwDbtoolsClient::registerClient() OSL_ENSURE(NULL == getDbToolsClientFactoryFunction(), "SwDbtoolsClient::registerClient: inconsistence: already have a factory function!"); #ifndef DISABLE_DYNLOADING - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("dbtools"))); + const OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("dbtools"))); // load the dbtools library getDbToolsClientModule() = osl_loadModuleRelative( @@ -113,7 +113,7 @@ void SwDbtoolsClient::registerClient() if (NULL != getDbToolsClientModule()) { // get the symbol for the method creating the factory - const ::rtl::OUString sFactoryCreationFunc("createDataAccessToolsFactory"); + const OUString sFactoryCreationFunc("createDataAccessToolsFactory"); // reinterpret_cast removed for gcc permissive getDbToolsClientFactoryFunction() = reinterpret_cast< createDataAccessToolsFactoryFunction >( osl_getFunctionSymbol(getDbToolsClientModule(), sFactoryCreationFunc.pData)); @@ -190,7 +190,7 @@ void SwDbtoolsClient::getFactory() } Reference< XDataSource > SwDbtoolsClient::getDataSource( - const ::rtl::OUString& rRegisteredName, + const OUString& rRegisteredName, const Reference& rxContext ) { @@ -214,7 +214,7 @@ sal_Int32 SwDbtoolsClient::getDefaultNumberFormat( return nRet; } -::rtl::OUString SwDbtoolsClient::getFormattedValue( +OUString SwDbtoolsClient::getFormattedValue( const uno::Reference< beans::XPropertySet>& _rxColumn, const uno::Reference< util::XNumberFormatter>& _rxFormatter, const lang::Locale& _rLocale, @@ -224,7 +224,7 @@ sal_Int32 SwDbtoolsClient::getDefaultNumberFormat( { ::rtl::Reference< ::connectivity::simple::IDataAccessTypeConversion > xConversion = getAccessTypeConversion(); - rtl::OUString sRet; + OUString sRet; if(xConversion.is()) sRet = xConversion->getFormattedValue(_rxColumn, _rxFormatter, _rLocale, _rNullDate); return sRet; diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx index 89f47ff02034..fefcfd0dc043 100644 --- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx @@ -157,7 +157,7 @@ SwSpellDialogChildWindow::SwSpellDialogChildWindow ( _pParent, nId, pBindings, pInfo), m_pSpellState(new SpellState) { - rtl::OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE); + OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE); SvtLinguConfig().GetProperty( aPropName ) >>= m_bIsGrammarCheckingOn; } @@ -493,7 +493,7 @@ void SwSpellDialogChildWindow::SetGrammarChecking(bool bOn) uno::Any aVal; aVal <<= bOn; m_bIsGrammarCheckingOn = bOn; - rtl::OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE); + OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE); SvtLinguConfig().SetProperty( aPropName, aVal ); // set current spell position to the start of the current sentence to // continue with this sentence after grammar checking state has been changed diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 762a22ec6e0b..4dd1c6641003 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -74,7 +74,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, SwAsciiOptions aOpt; { - const rtl::OUString sFindNm = rtl::OUString::createFromAscii( + const OUString sFindNm = OUString::createFromAscii( pStream ? sDialogImpExtraData : sDialogExpExtraData); sal_uInt16 nEnd, nStt = GetExtraData().Search( sFindNm ); @@ -290,7 +290,7 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) rOptions.WriteUserData( sData ); if( sData.Len() ) { - const rtl::OUString sFindNm = rtl::OUString::createFromAscii( + const OUString sFindNm = OUString::createFromAscii( aFontLB.IsVisible() ? sDialogImpExtraData : sDialogExpExtraData); sal_uInt16 nEnd, nStt = GetExtraData().Search( sFindNm ); diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index b2fcd7adc19d..7ede33eece2b 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -158,7 +158,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq) if(aFile.Len() || aSub.Len()) { - String sLinkFileName = rtl::OUString(sfx2::cTokenSeperator); + String sLinkFileName = OUString(sfx2::cTokenSeperator); sLinkFileName += sfx2::cTokenSeperator; sLinkFileName.SetToken(0, sfx2::cTokenSeperator,aFile); diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx index a52850c9e132..5a28bc33a640 100644 --- a/sw/source/ui/dialog/swabstdlg.cxx +++ b/sw/source/ui/dialog/swabstdlg.cxx @@ -41,11 +41,11 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create() #ifndef DISABLE_DYNLOADING SwFuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; - static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True)); + static const OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( SwAbstractDialogFactory* (SAL_CALL*)() ) - aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory")); + aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory")); if ( fp ) return fp(); return 0; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 62e75620bbd9..8f467bd14d97 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -239,12 +239,12 @@ void AbstractSwInsertDBColAutoPilot_Impl::DataToDoc( const uno::Sequence< uno::A pDlg->DataToDoc(rSelection, rxSource, xConnection, xResultSet); } -rtl::OString AbstractDropDownFieldDialog_Impl::GetWindowState( sal_uLong nMask ) const +OString AbstractDropDownFieldDialog_Impl::GetWindowState( sal_uLong nMask ) const { return pDlg->GetWindowState(nMask); } -void AbstractDropDownFieldDialog_Impl::SetWindowState( const rtl::OString& rStr ) +void AbstractDropDownFieldDialog_Impl::SetWindowState( const OString& rStr ) { pDlg->SetWindowState(rStr); } @@ -405,12 +405,12 @@ String AbstractGlossaryDlg_Impl::GetCurrShortName() const return pDlg->GetCurrShortName(); } -void AbstractFldInputDlg_Impl::SetWindowState( const rtl::OString& rStr ) +void AbstractFldInputDlg_Impl::SetWindowState( const OString& rStr ) { pDlg->SetWindowState( rStr ); } -rtl::OString AbstractFldInputDlg_Impl::GetWindowState( sal_uLong nMask ) const +OString AbstractFldInputDlg_Impl::GetWindowState( sal_uLong nMask ) const { return pDlg->GetWindowState( nMask ); } @@ -428,7 +428,7 @@ String AbstractInsFootNoteDlg_Impl::GetStr() { return pDlg->GetStr(); } -void AbstractInsFootNoteDlg_Impl::SetHelpId( const rtl::OString& sHelpId ) +void AbstractInsFootNoteDlg_Impl::SetHelpId( const OString& sHelpId ) { pDlg->SetHelpId( sHelpId ); } @@ -472,7 +472,7 @@ sal_uInt16 AbstractMailMergeDlg_Impl::GetMergeType() return pDlg->GetMergeType(); } -const ::rtl::OUString& AbstractMailMergeDlg_Impl::GetSaveFilter() const +const OUString& AbstractMailMergeDlg_Impl::GetSaveFilter() const { return pDlg->GetSaveFilter(); } diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 836afb6d0e18..17762297fe9b 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -180,8 +180,8 @@ class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPil class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog //add for DropDownFieldDialog { DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, sw::DropDownFieldDialog) - virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow - virtual void SetWindowState( const rtl::OString& rStr );//this method inherit from SystemWindow + virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow + virtual void SetWindowState( const OString& rStr );//this method inherit from SystemWindow }; //add for DropDownFieldDialog end @@ -276,8 +276,8 @@ class AbstractFldInputDlg_Impl : public AbstractFldInputDlg { DECL_ABSTDLG_BASE(AbstractFldInputDlg_Impl,SwFldInputDlg) //from class SalFrame - virtual void SetWindowState( const rtl::OString & rStr ) ; - virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ; + virtual void SetWindowState( const OString & rStr ) ; + virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ; }; //for SwFldInputDlg end @@ -290,7 +290,7 @@ class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg virtual sal_Bool IsEndNote(); virtual String GetStr(); //from class Window - virtual void SetHelpId( const rtl::OString& sHelpId ); + virtual void SetHelpId( const OString& sHelpId ); virtual void SetText( const OUString& rStr ); }; //for SwInsFootNoteDlg end @@ -325,7 +325,7 @@ class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg { DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg) virtual sal_uInt16 GetMergeType() ; - virtual const ::rtl::OUString& GetSaveFilter() const; + virtual const OUString& GetSaveFilter() const; virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; virtual bool IsSaveIndividualDocs() const; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 4e7f724b0e71..cce674b46011 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1081,7 +1081,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, FileSearchHdl) Application::SetDefDialogParent( this ); delete m_pDocInserter; m_pDocInserter = - new ::sfx2::DocumentInserter( rtl::OUString("swriter") ); + new ::sfx2::DocumentInserter( OUString("swriter") ); m_pDocInserter->StartExecuteModal( LINK( this, SwEditRegionDlg, DlgClosedHdl ) ); return 0; } @@ -1422,7 +1422,7 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent ) { //if necessary fill the names bookmarks/sections/tables now - rtl::OUString sFileName = aFileNameED.GetText(); + OUString sFileName = aFileNameED.GetText(); if(!sFileName.isEmpty()) { SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium(); @@ -1831,7 +1831,7 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl) Application::SetDefDialogParent( this ); delete m_pDocInserter; m_pDocInserter = new ::sfx2::DocumentInserter( - rtl::OUString("swriter") ); + OUString("swriter") ); m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) ); return 0; } diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 66b64fa669b5..50035a895a37 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -50,7 +50,7 @@ namespace { void setValue(FixedText *pWidget, sal_uLong nValue) { - rtl::OUString sValue(OUString::number(nValue)); + OUString sValue(OUString::number(nValue)); pWidget->SetText(sValue); } } diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index 39d3ad220ac7..09925ec98238 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -738,7 +738,7 @@ sal_Bool SwGlossaryHdl::ImportGlossaries( const String& rName ) { const SfxFilter* pFilter = 0; SfxMedium* pMed = new SfxMedium( rName, STREAM_READ, 0, 0 ); - SfxFilterMatcher aMatcher( rtl::OUString("swriter") ); + SfxFilterMatcher aMatcher( OUString("swriter") ); pMed->UseInteractionHandler( sal_True ); if( !aMatcher.GuessFilter( *pMed, &pFilter, sal_False ) ) { diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index ecc0928f2ddb..6f65056af733 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -707,7 +707,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream, xWrt->SetShowProgress( sal_False ); #if defined(DEBUGPASTE) - SvFileStream aPasteDebug(rtl::OUString( + SvFileStream aPasteDebug(OUString( "PASTEBUFFER.debug"), STREAM_WRITE|STREAM_TRUNC); SwWriter aDbgWrt( aPasteDebug, *pDoc ); aDbgWrt.Write( xWrt ); @@ -1553,7 +1553,7 @@ int SwTransferable::_PasteFileContent( TransferableDataHelper& rData, SotStorageStreamRef xStrm; SvStream* pStream = 0; SwRead pRead = 0; - rtl::OUString sData; + OUString sData; switch( nFmt ) { case SOT_FORMAT_STRING: @@ -1710,7 +1710,7 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, // temporary storage until the object is inserted uno::Reference< embed::XStorage > xTmpStor; uno::Reference < embed::XEmbeddedObject > xObj; - ::rtl::OUString aName; + OUString aName; comphelper::EmbeddedObjectContainer aCnt; if ( xStrm.is() ) @@ -1734,12 +1734,12 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, { xTmpStor = ::comphelper::OStorageHelper::GetTemporaryStorage(); uno::Reference < embed::XEmbedObjectClipboardCreator > xClipboardCreator( - ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ), + ::comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ), uno::UNO_QUERY_THROW ); embed::InsertedObjectInfo aInfo = xClipboardCreator->createInstanceInitFromClipboard( xTmpStor, - ::rtl::OUString( "DummyName" ), + OUString( "DummyName" ), uno::Sequence< beans::PropertyValue >() ); // TODO/LATER: in future InsertedObjectInfo will be used to get container related information @@ -1776,7 +1776,7 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, // it is important to have an icon, let an empty graphic be used // if no other graphic is provided // TODO/LATER: in future a default bitmap could be used - ::rtl::OUString aMimeType; + OUString aMimeType; MapMode aMapMode( MAP_100TH_MM ); aGraphic.SetPrefSize( Size( 2500, 2500 ) ); aGraphic.SetPrefMapMode( aMapMode ); @@ -1996,7 +1996,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, int nRet = rData.GetGraphic( nFormat, aGrf ); if( nRet ) { - rtl::OUString sLnkTyp("DDE"); + OUString sLnkTyp("DDE"); if ( bReReadGrf ) rWrtShell.ReRead( aCmd, sLnkTyp, &aGrf ); else @@ -3458,8 +3458,8 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh ) ::sw::mark::IMark* pMark = rSh.SetBookmark( KeyCode(), - ::rtl::OUString(), - ::rtl::OUString(), + OUString(), + OUString(), IDocumentMarkAccess::DDE_BOOKMARK); if(pMark) { @@ -3515,11 +3515,11 @@ sal_Bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm ) return sal_False; rtl_TextEncoding eEncoding = DDE_TXT_ENCODING; - const rtl::OString aAppNm(rtl::OUStringToOString( + const OString aAppNm(OUStringToOString( GetpApp()->GetAppName(), eEncoding)); - const rtl::OString aTopic(rtl::OUStringToOString( + const OString aTopic(OUStringToOString( pDocShell->GetTitle(SFX_TITLE_FULLNAME), eEncoding)); - const rtl::OString aName(rtl::OUStringToOString(sName, eEncoding)); + const OString aName(OUStringToOString(sName, eEncoding)); sal_Char* pMem = new sal_Char[ aAppNm.getLength() + aTopic.getLength() + aName.getLength() + 4 ]; @@ -3555,7 +3555,7 @@ sal_Bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm ) aPaM.SetMark(); *aPaM.GetMark() = pMark->GetMarkEnd(); } - ::rtl::OUString sMarkName = pMark->GetName(); + OUString sMarkName = pMark->GetName(); // remove mark pServerObject->SetNoServer(); // this removes the connection between SwServerObject and mark diff --git a/sw/source/ui/docvw/AnnotationMenuButton.cxx b/sw/source/ui/docvw/AnnotationMenuButton.cxx index 74180748345a..7329f8e22678 100644 --- a/sw/source/ui/docvw/AnnotationMenuButton.cxx +++ b/sw/source/ui/docvw/AnnotationMenuButton.cxx @@ -157,7 +157,7 @@ void AnnotationMenuButton::Paint( const Rectangle& /*rRect*/ ) aFont.SetWeight(WEIGHT_MEDIUM); SetFont( aFont ); DrawText( aRect , - rtl::OUString("Edit Note"), + OUString("Edit Note"), TEXT_DRAW_CENTER ); SetFont( aOldFont ); } diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx index ccc836950637..7aaa4e317be8 100644 --- a/sw/source/ui/docvw/AnnotationWin.cxx +++ b/sw/source/ui/docvw/AnnotationWin.cxx @@ -85,7 +85,7 @@ void SwAnnotationWin::SetPostItText() //If the new text is the same as the old text, keep the same insertion //point .e.g. fdo#33599 mpFld = static_cast(mpFmtFld->GetFld()); - rtl::OUString sNewText = mpFld->GetPar2(); + OUString sNewText = mpFld->GetPar2(); bool bTextUnchanged = sNewText.equals(Engine()->GetEditEngine().GetText()); ESelection aOrigSelection(GetOutlinerView()->GetEditView().GetSelection()); @@ -229,9 +229,9 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText) SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, pWin->GetAuthor()); aText = aRewriter.Apply(aText); - aText.Append(String(rtl::OUString(" (") + - String(rLocalData.getDate( pWin->GetDate())) + rtl::OUString(", ") + - String(rLocalData.getTime( pWin->GetTime(),false)) + rtl::OUString("): \""))); + aText.Append(String(OUString(" (") + + String(rLocalData.getDate( pWin->GetDate())) + OUString(", ") + + String(rLocalData.getTime( pWin->GetTime(),false)) + OUString("): \""))); GetOutlinerView()->InsertText(aText,false); // insert old, selected text or "..." @@ -239,8 +239,8 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText) if (pText->GetTextObject().GetText(0).Len()) GetOutlinerView()->GetEditView().InsertText(pText->GetTextObject()); else - GetOutlinerView()->InsertText(rtl::OUString("..."),false); - GetOutlinerView()->InsertText(rtl::OUString("\"\n"),false); + GetOutlinerView()->InsertText(OUString("..."),false); + GetOutlinerView()->InsertText(OUString("\"\n"),false); GetOutlinerView()->SetSelection(ESelection(0x0,0x0,0xFFFF,0xFFFF)); SfxItemSet aAnswerSet( DocView().GetDocShell()->GetPool() ); diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index d10b3b165b35..a438ac0c865d 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -1923,6 +1923,6 @@ void SwPostItMgr::GetAllSidebarWinForFrm( const SwFrm& rFrm, } void SwNoteProps::Commit() {} -void SwNoteProps::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwNoteProps::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index 36effb9dcd9b..efa8fb886a67 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -378,11 +378,11 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt ) } } -rtl::OUString SidebarTxtControl::GetSurroundingText() const +OUString SidebarTxtControl::GetSurroundingText() const { if (GetTextView()) return GetTextView()->GetSurroundingText(); - return rtl::OUString(); + return OUString(); } Selection SidebarTxtControl::GetSurroundingTextSelection() const diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/ui/docvw/SidebarTxtControl.hxx index 7f3ab6658350..157c2120e75b 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.hxx +++ b/sw/source/ui/docvw/SidebarTxtControl.hxx @@ -47,7 +47,7 @@ class SidebarTxtControl : public Control virtual void Command( const CommandEvent& rCEvt ); virtual void LoseFocus(); virtual void RequestHelp(const HelpEvent &rEvt); - virtual rtl::OUString GetSurroundingText() const; + virtual OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; DECL_LINK( Select, Menu* ); diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 45f367d5e4dd..37cb17d517f5 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -78,7 +78,7 @@ namespace sw { namespace sidebarwindows { #define POSTIT_META_HEIGHT (sal_Int32) 30 #define POSTIT_MINIMUMSIZE_WITHOUT_META 50 -#define EMPTYSTRING rtl::OUString() +#define EMPTYSTRING OUString() SwSidebarWin::SwSidebarWin( SwEditWin& rEditWin, WinBits nBits, @@ -409,7 +409,7 @@ void SwSidebarWin::CheckMetaText() } if (GetTime()!=0) { - sMeta = sMeta + rtl::OUString(" ") + rLocalData.getTime( GetTime(),false ); + sMeta = sMeta + OUString(" ") + rLocalData.getTime( GetTime(),false ); } if ( mpMetadataDate->GetText() != sMeta ) { diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index fca328133816..39a946fa3cbc 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -873,8 +873,8 @@ void SwEditWin::FlushInBuffer() sal_Int16 nCheckMode = rCTLOptions.IsCTLSequenceCheckingRestricted() ? i18n::InputSequenceCheckMode::STRICT : i18n::InputSequenceCheckMode::BASIC; - rtl::OUString aOldText( aLeftText ); - rtl::OUString aNewText( aOldText ); + OUString aOldText( aLeftText ); + OUString aNewText( aOldText ); if (rCTLOptions.IsCTLSequenceCheckingTypeAndReplace()) { for (xub_StrLen k = 0; k < m_aInBuffer.Len(); ++k) @@ -916,7 +916,7 @@ void SwEditWin::FlushInBuffer() if (xISC->checkInputSequence( aNewText, nTmpPos - 1, cChar, nCheckMode )) { // character can be inserted: - aNewText += rtl::OUString( (sal_Unicode) cChar ); + aNewText += OUString( (sal_Unicode) cChar ); ++nTmpPos; } } @@ -2343,7 +2343,7 @@ KEYINPUT_CHECKTABLE_INSDEL: else if(!rSh.HasReadonlySel()) { sal_Bool bIsNormalChar = GetAppCharClass().isLetterNumeric( - rtl::OUString( aCh ), 0 ); + OUString( aCh ), 0 ); if( bAppendSpace && bIsNormalChar && (m_aInBuffer.Len() || !rSh.IsSttPara() || !rSh.IsEndPara() )) { @@ -2380,7 +2380,7 @@ KEYINPUT_CHECKTABLE_INSDEL: } else { - rtl::OUStringBuffer aBuf(m_aInBuffer); + OUStringBuffer aBuf(m_aInBuffer); comphelper::string::padToLength(aBuf, m_aInBuffer.Len() + aKeyEvent.GetRepeat() + 1, aCh); m_aInBuffer = aBuf.makeStringAndClear(); @@ -5017,7 +5017,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) aEvent.ExecutePosition.X = aPixPos.X(); aEvent.ExecutePosition.Y = aPixPos.Y(); Menu* pMenu = 0; - ::rtl::OUString sMenuName("private:resource/ReadonlyContextMenu"); + OUString sMenuName("private:resource/ReadonlyContextMenu"); if( GetView().TryContextMenuInterception( *pROPopup, sMenuName, pMenu, aEvent ) ) { if ( pMenu ) @@ -5922,7 +5922,7 @@ void SwEditWin::SetUseInputLanguage( sal_Bool bNew ) m_bUseInputLanguage = bNew; } -rtl::OUString SwEditWin::GetSurroundingText() const +OUString SwEditWin::GetSurroundingText() const { String sReturn; SwWrtShell& rSh = m_rView.GetWrtShell(); diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index 555d8100471f..db7a10e04f9a 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -146,7 +146,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) #ifdef DBG_UTIL case SwContentAtPos::SW_TABLEBOXVALUE: { - sTxt = rtl::OStringToOUString(rtl::OString::valueOf( + sTxt = OStringToOUString(OString::valueOf( ((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue()), osl_getThreadTextEncoding()); } diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx index 542201c287c1..29fd6332a93b 100644 --- a/sw/source/ui/docvw/edtwin3.cxx +++ b/sw/source/ui/docvw/edtwin3.cxx @@ -70,7 +70,7 @@ void SizeNotify(ViewShell* pVwSh, const Size &rSize) // Notify for page number update void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, - const rtl::OUString& rPgStr) + const OUString& rPgStr) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); if ( pSfxVwSh && pSfxVwSh->ISA(SwView) && @@ -121,7 +121,7 @@ void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect ) ((SwPagePreView *)pSfxVwSh)->RepaintCoreRect( rRect ); } -bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark ) +bool JumpToSwMark( ViewShell* pVwSh, const OUString& rMark ) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); if( pSfxVwSh && pSfxVwSh->ISA( SwView ) ) diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index cf1872970ab6..4eefa5ed5897 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -262,9 +262,9 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) : osl::MutexGuard g(mutex_); notifier_ = n; } - css::uno::Sequence< rtl::OUString > s(2); - s[0] = rtl::OUString("FontHeight"); - s[1] = rtl::OUString("FontName"); + css::uno::Sequence< OUString > s(2); + s[0] = OUString("FontHeight"); + s[1] = OUString("FontName"); n->addPropertiesChangeListener(s, listener_.get()); } @@ -548,7 +548,7 @@ void SwSrcEditWindow::InitScrollBars() pVScrollbar->SetThumbPos( pTextView->GetStartDocPos().Y() ); pHScrollbar->SetVisibleSize( aOutSz.Width() ); pHScrollbar->SetPageSize( aOutSz.Width() * 8 / 10 ); - pHScrollbar->SetLineSize( pOutWin->GetTextWidth(rtl::OUString('x')) ); + pHScrollbar->SetLineSize( pOutWin->GetTextWidth(OUString('x')) ); pHScrollbar->SetThumbPos( pTextView->GetStartDocPos().X() ); } @@ -948,9 +948,9 @@ static bool lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLan } void SwSrcEditWindow::SetFont() { - rtl::OUString sFontName( + OUString sFontName( officecfg::Office::Common::Font::SourceViewFont::FontName::get(). - get_value_or(rtl::OUString())); + get_value_or(OUString())); if(sFontName.isEmpty()) { LanguageType aLanguages[5] = diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index d7760d8fc150..3597753d2dc0 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -36,7 +36,7 @@ #include #ifdef WNT -#define NEXTLINE rtl::OUString("\r\n") +#define NEXTLINE OUString("\r\n") #else #define NEXTLINE '\n' #endif @@ -44,7 +44,6 @@ using namespace utl; using namespace ::com::sun::star::uno; -using ::rtl::OUString; TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem ); @@ -269,9 +268,9 @@ void SwEnvCfgItem::Commit() PutProperties(aNames, aValues); } -void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} -Sequence SwEnvCfgItem::GetPropertyNames() +Sequence SwEnvCfgItem::GetPropertyNames() { static const char* aPropNames[] = { diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 9ffa4154c3cf..ab201c2d9750 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -72,7 +72,7 @@ void SwLabDlg::_ReplaceGroup( const String &rMake ) { // Remove old entries pRecs->erase(pRecs->begin() + 1, pRecs->end()); - aLabelsCfg.FillLabels(rtl::OUString(rMake), *pRecs); + aLabelsCfg.FillLabels(OUString(rMake), *pRecs); aLstGroup = rMake; } @@ -153,7 +153,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet, pRecs->insert( pRecs->begin(), pRec ); sal_uInt16 nLstGroup = 0; - const std::vector& rMan = aLabelsCfg.GetManufacturers(); + const std::vector& rMan = aLabelsCfg.GetManufacturers(); for(sal_uInt16 nMan = 0; nMan < rMan.size(); nMan++) { aMakes.push_back(rMan[nMan]); @@ -274,7 +274,7 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : const sal_uInt16 nCount = (sal_uInt16)GetParentSwLabDlg()->Makes().size(); for(size_t i = 0; i < nCount; ++i) { - rtl::OUString& rStr = GetParentSwLabDlg()->Makes()[i]; + OUString& rStr = GetParentSwLabDlg()->Makes()[i]; aMakeBox.InsertEntry( rStr ); if ( rStr == aItem.aLstMake) @@ -489,8 +489,8 @@ void SwLabPage::InitDatabaseBox() if( GetNewDBMgr() ) { aDatabaseLB.Clear(); - ::com::sun::star::uno::Sequence aDataNames = SwNewDBMgr::GetExistingDatabaseNames(); - const rtl::OUString* pDataNames = aDataNames.getConstArray(); + ::com::sun::star::uno::Sequence aDataNames = SwNewDBMgr::GetExistingDatabaseNames(); + const OUString* pDataNames = aDataNames.getConstArray(); for (long i = 0; i < aDataNames.getLength(); i++) aDatabaseLB.InsertEntry(pDataNames[i]); String sDBName = sActDBName.GetToken( 0, DB_DELIM ); @@ -558,7 +558,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet) aAddrBox .Check ( aItem.bAddr ); aWritingEdit.SetText ( aWriting ); - for(std::vector::const_iterator i = GetParentSwLabDlg()->Makes().begin(); i != GetParentSwLabDlg()->Makes().end(); ++i) + for(std::vector::const_iterator i = GetParentSwLabDlg()->Makes().begin(); i != GetParentSwLabDlg()->Makes().end(); ++i) { if(aMakeBox.GetEntryPos(String(*i)) == LISTBOX_ENTRY_NOTFOUND) aMakeBox.InsertEntry(*i); @@ -600,7 +600,7 @@ void SwVisitingCardPage::ClearUserData() } void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt, - const rtl::OUString* pNames, const rtl::OUString* pValues ) + const OUString* pNames, const OUString* pValues ) { for( sal_uInt32 i = 0; i < nCnt; ++i ) { diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index eb7cd6b6ab19..6aaee0be304b 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.cxx @@ -132,8 +132,8 @@ SwLabelConfig::SwLabelConfig() : assert(res == xmlreader::XmlReader::RESULT_DONE); // add to m_aLabels and m_aManufacturers the custom labels - const Sequence& rMan = GetNodeNames( OUString() ); - const rtl::OUString* pMan = rMan.getConstArray(); + const Sequence& rMan = GetNodeNames( OUString() ); + const OUString* pMan = rMan.getConstArray(); for ( sal_Int32 nMan = 0; nMan < rMan.getLength(); nMan++ ) { sManufacturer = pMan[nMan]; @@ -169,7 +169,7 @@ SwLabelConfig::~SwLabelConfig() // the config item is not writable ?: void SwLabelConfig::Commit() {} -void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} static SwLabRec* lcl_CreateSwLabRec(const OUString& rType, const OUString& rMeasure, const OUString& rManufacturer) { @@ -257,7 +257,7 @@ void SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLab rLabArr.push_back( lcl_CreateSwLabRec(it->first, it->second.m_aMeasure, rManufacturer) ); } -sal_Bool SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType) +sal_Bool SwLabelConfig::HasLabel(const OUString& rManufacturer, const OUString& rType) { return ( ( m_aLabels.find(rManufacturer) != m_aLabels.end() ) && ( m_aLabels[rManufacturer].find(rType) != m_aLabels[rManufacturer].end() ) ); @@ -274,8 +274,8 @@ static bool lcl_Exists(const OUString& rNode, const Sequence& rLabels) // label is always saved as a custom label // predefined labels can NOT be overwritten by custom labels with same manufacturer/name -void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer, - const rtl::OUString& rType, const SwLabRec& rRec ) +void SwLabelConfig::SaveLabel( const OUString& rManufacturer, + const OUString& rType, const SwLabRec& rRec ) { OUString sFoundNode; bool bManufacturerNodeFound; diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index f3ae13ffa629..eb8384e89b30 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::uno; using namespace ::comphelper; -using ::rtl::OUString; #ifdef SW_PROP_NAME_STR #undef SW_PROP_NAME_STR @@ -57,7 +56,7 @@ void SwVisitingCardPage::InitFrameControl() uno::Sequence aNames = m_xAutoText->getElementNames(); const OUString* pGroups = aNames.getConstArray(); - OUString uTitleName( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)) ); + OUString uTitleName( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)) ); for(sal_uInt16 i = 0; i < aNames.getLength(); i++) { @@ -184,7 +183,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, static const struct _SwLabItemMap { const char* pName; - rtl::OUString SwLabItem:: *pValue; + OUString SwLabItem:: *pValue; } aArr[] = { { "BC_PRIV_FIRSTNAME" , &SwLabItem::aPrivFirstName }, { "BC_PRIV_NAME" , &SwLabItem::aPrivName }, @@ -223,8 +222,8 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, try { - rtl::OUString sFldName("com.sun.star.text.FieldMaster.User."); - OUString uCntName( rtl::OUString::createFromAscii( SW_PROP_NAME_STR(UNO_NAME_CONTENT ))); + OUString sFldName("com.sun.star.text.FieldMaster.User."); + OUString uCntName( OUString::createFromAscii( SW_PROP_NAME_STR(UNO_NAME_CONTENT ))); for( const _SwLabItemMap* p = aArr; p->pName; ++p ) { String sCurFldName( sFldName ); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 7cfe36022b79..93e71b16c4d1 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -36,7 +36,6 @@ using namespace utl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using ::rtl::OUString; #define ROUND(x) ((sal_uInt16) ((x) + .5)) @@ -83,7 +82,7 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) : lPWidthWidth = GetTextWidth(aPWidthStr); lPHeightWidth = GetTextWidth(aPHeightStr); lXHeight = GetTextHeight(); - lXWidth = GetTextWidth(rtl::OUString('X')); + lXWidth = GetTextWidth(OUString('X')); // Scale factor float fx = (float)(lOutWPix - (2 * (lLeftWidth + 15))) / (float)lOutWPix; @@ -577,7 +576,7 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl) { bModified = false; const std::vector& rMan = GetParentSwLabDlg()->GetLabelsConfig().GetManufacturers(); - std::vector& rMakes(GetParentSwLabDlg()->Makes()); + std::vector& rMakes(GetParentSwLabDlg()->Makes()); if(rMakes.size() < rMan.size()) { rMakes = rMan; @@ -637,8 +636,8 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) } String sTmp(aQueryMB.GetMessText()); String sQuery(sTmp); - sQuery.SearchAndReplace(rtl::OUString("%1"), sMake); - sQuery.SearchAndReplace(rtl::OUString("%2"), sType); + sQuery.SearchAndReplace(OUString("%1"), sMake); + sQuery.SearchAndReplace(OUString("%2"), sType); aQueryMB.SetMessText(sQuery); short eRet = aQueryMB.Execute(); diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index b22159b1d553..2ecf0676c1f7 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -161,7 +161,7 @@ class SwSaveLabelDlg : public ModalDialog public: SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec); - void SetLabel(const rtl::OUString& rMake, const rtl::OUString& rType) + void SetLabel(const OUString& rMake, const OUString& rType) { aMakeCB.SetText(String(rMake)); aTypeED.SetText(String(rType)); diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index 112776b3ceeb..a5b29cd4e752 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -32,7 +32,6 @@ using namespace utl; using namespace ::com::sun::star::uno; -using ::rtl::OUString; SwLabItem::SwLabItem() : @@ -192,7 +191,7 @@ SfxPoolItem* SwLabItem::Clone(SfxItemPool*) const return new SwLabItem(*this); } -Sequence SwLabCfgItem::GetPropertyNames() +Sequence SwLabCfgItem::GetPropertyNames() { static const char* aLabelPropNames[] = { @@ -397,7 +396,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : } } -void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} void SwLabCfgItem::Commit() { diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 810adf4599f7..de6a37ed61d3 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -60,7 +60,7 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) : SvtCommandOptions aCmdOpts; if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, - rtl::OUString( "Print" ) ) ) + OUString( "Print" ) ) ) { aPrinterInfo.Hide(); aPrtSetup.Hide(); diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index c7dba1a214f6..d6c235048c78 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -74,7 +74,6 @@ using namespace ::com::sun::star::form; using namespace ::com::sun::star::view; using namespace ::com::sun::star::ui::dialogs; -using ::rtl::OUString; struct SwMailMergeDlg_Impl { @@ -369,7 +368,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, for(sal_uInt16 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); nEntry++) aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry)); - aAddressFldLB.SelectEntry(rtl::OUString("EMAIL")); + aAddressFldLB.SelectEntry(OUString("EMAIL")); String sPath(pModOpt->GetMailingPath()); if(!sPath.Len()) @@ -385,7 +384,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, if (!bColumn ) { - aColumnLB.SelectEntry(rtl::OUString("NAME")); + aColumnLB.SelectEntry(OUString("NAME")); } else aColumnLB.SelectEntry(pModOpt->GetNameFromColumn()); @@ -416,7 +415,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, sCommand += OUString::number(SFX_FILTER_NOTINFILEDLG); sCommand += ":default_first"; uno::Reference< container::XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand); - const ::rtl::OUString sName("Name"); + const OUString sName("Name"); sal_uInt16 nODT = USHRT_MAX; while(xList->hasMoreElements()) { @@ -426,7 +425,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, uno::Any aProps = xFilterFactory->getByName(sFilter); uno::Sequence< beans::PropertyValue > aFilterProperties; aProps >>= aFilterProperties; - ::rtl::OUString sUIName2; + OUString sUIName2; const beans::PropertyValue* pFilterProperties = aFilterProperties.getConstArray(); for(int nProp = 0; nProp < aFilterProperties.getLength(); nProp++) { @@ -441,7 +440,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, sal_uInt16 nFilter = aFilterLB.InsertEntry( sUIName2 ); if( 0 == sFilter.compareToAscii("writer8") ) nODT = nFilter; - aFilterLB.SetEntryData( nFilter, new ::rtl::OUString( sFilter ) ); + aFilterLB.SetEntryData( nFilter, new OUString( sFilter ) ); } } aFilterLB.SelectEntryPos( nODT ); @@ -463,7 +462,7 @@ SwMailMergeDlg::~SwMailMergeDlg() for( sal_uInt16 nFilter = 0; nFilter < aFilterLB.GetEntryCount(); ++nFilter ) { - ::rtl::OUString* pData = reinterpret_cast< ::rtl::OUString* >( aFilterLB.GetEntryData(nFilter) ); + OUString* pData = reinterpret_cast< OUString* >( aFilterLB.GetEntryData(nFilter) ); delete pData; } delete pImpl; @@ -679,7 +678,7 @@ bool SwMailMergeDlg::ExecQryShell() URIHelper::SmartRel2Abs( aAbs, aPathED.GetText(), URIHelper::GetMaybeFileHdl())); pModOpt->SetMailingPath(sPath); - String sDelim = rtl::OUString(INET_PATH_TOKEN); + String sDelim = OUString(INET_PATH_TOKEN); if (sPath.Len() >= sDelim.Len() && sPath.Copy(sPath.Len()-sDelim.Len()).CompareTo(sDelim) != COMPARE_EQUAL) @@ -692,12 +691,12 @@ bool SwMailMergeDlg::ExecQryShell() pMgr->SetEMailColumn(aColumnLB.GetSelectEntry()); pModOpt->SetNameFromColumn(aColumnLB.GetSelectEntry()); if( aFilterLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) - m_sSaveFilter = *static_cast(aFilterLB.GetEntryData( aFilterLB.GetSelectEntryPos() )); + m_sSaveFilter = *static_cast(aFilterLB.GetEntryData( aFilterLB.GetSelectEntryPos() )); } else { //#i97667# reset column name - otherwise it's remembered from the last run - pMgr->SetEMailColumn(::rtl::OUString()); + pMgr->SetEMailColumn(OUString()); //start save as dialog String sFilter; sPath = SwMailMergeHelper::CallSaveAsDialog(sFilter); diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 7b439450ed15..70fb0c3bc317 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -117,8 +117,8 @@ class SwVisitingCardPage : public SfxTabPage using SfxTabPage::SetUserData; void SetUserData( sal_uInt32 nCnt, - const rtl::OUString* pNames, - const rtl::OUString* pValues ); + const OUString* pNames, + const OUString* pValues ); SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet); ~SwVisitingCardPage(); diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 6c10fb72cbf6..d6834dd3705a 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -70,8 +70,8 @@ sw::DropDownFieldDialog::DropDownFieldDialog( Window *pParent, SwWrtShell &rS, String sTitle = GetText(); sTitle += pDropField->GetPar2(); SetText(sTitle); - uno::Sequence< rtl::OUString > aItems = pDropField->GetItemSequence(); - const rtl::OUString* pArray = aItems.getConstArray(); + uno::Sequence< OUString > aItems = pDropField->GetItemSequence(); + const OUString* pArray = aItems.getConstArray(); for(sal_Int32 i = 0; i < aItems.getLength(); i++) aListItemsLB.InsertEntry(pArray[i]); aListItemsLB.SelectEntry(pDropField->GetSelectedItem()); @@ -92,7 +92,7 @@ void sw::DropDownFieldDialog::Apply() { if(pDropField) { - rtl::OUString sSelect = aListItemsLB.GetSelectEntry(); + OUString sSelect = aListItemsLB.GetSelectEntry(); if(pDropField->GetPar1() != sSelect) { rSh.StartAllAction(); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index b5bd607d31f1..bed40d1b8c6f 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -101,8 +101,8 @@ void SwChangeDBDlg::FillDBPopup() std::vector aAllDBNames; - Sequence< ::rtl::OUString > aDBNames = xDBContext->getElementNames(); - const ::rtl::OUString* pDBNames = aDBNames.getConstArray(); + Sequence< OUString > aDBNames = xDBContext->getElementNames(); + const OUString* pDBNames = aDBNames.getConstArray(); sal_Int32 nDBCount = aDBNames.getLength(); for(sal_Int32 i = 0; i < nDBCount; i++) { diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 1d10f652069d..322a7afe60b0 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -368,7 +368,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) { aValueED.SetText(aEmptyStr); if (bCond) - aConditionED.SetText(rtl::OUString("TRUE")); + aConditionED.SetText(OUString("TRUE")); else aConditionED.SetText(aEmptyStr); } @@ -479,7 +479,7 @@ IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl) void SwFldDBPage::FillUserData() { - String sData(rtl::OUString(USER_DATA_VERSION)); + String sData(OUString(USER_DATA_VERSION)); sData += ';'; sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 0304bc08f947..68cb2a7b3e2c 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -126,7 +126,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) nSelEntryData = static_cast< sal_uInt16 >(sVal.ToInt32()); } - std::vector aLst; + std::vector aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); for(size_t i = 0; i < aLst.size(); ++i) { @@ -146,7 +146,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) for (sal_Int32 n=0; n < rProperties.getLength(); n++) { - rtl::OUString sEntry = rProperties[n].Name; + OUString sEntry = rProperties[n].Name; pEntry = aTypeTLB.InsertEntry(sEntry, pInfo); if(m_sOldCustomFieldName.equals( sEntry )) { @@ -242,7 +242,7 @@ IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl) if( nSubType == DI_CUSTOM ) { //find out which type the custom field has - for a start set to DATE format - ::rtl::OUString sName = aTypeTLB.GetEntryText(pSelEntry); + OUString sName = aTypeTLB.GetEntryText(pSelEntry); try { uno::Any aVal = xCustomPropertySet->getPropertyValue( sName ); @@ -424,7 +424,7 @@ sal_Bool SwFldDokInfPage::FillItemSet(SfxItemSet& ) sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos(); - ::rtl::OUString aName; + OUString aName; if (DI_CUSTOM == nSubType) aName = aTypeTLB.GetEntryText(pSelEntry); @@ -462,7 +462,7 @@ sal_uInt16 SwFldDokInfPage::GetGroup() void SwFldDokInfPage::FillUserData() { - String sData(rtl::OUString(USER_DATA_VERSION)); + String sData(OUString(USER_DATA_VERSION)); sData += ';'; SvTreeListEntry* pEntry = aTypeTLB.FirstSelected(); sal_uInt16 nTypeSel = pEntry ? sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(pEntry->GetUserData())) : USHRT_MAX; diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index a56f996af7f8..71bcfb1849f5 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -50,7 +50,7 @@ class SwFldDokInfPage : public SwFldPage sal_uInt16 nOldSel; sal_uLong nOldFormat; - ::rtl::OUString m_sOldCustomFieldName; + OUString m_sOldCustomFieldName; DECL_LINK(TypeHdl, void * = 0); DECL_LINK(SubTypeHdl, void * = 0); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 6a37ce214f19..fbffd1b754dc 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -201,7 +201,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl) if (nTypeId != USHRT_MAX) { - std::vector aLst; + std::vector aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); if (nTypeId != TYP_AUTHORFLD) @@ -641,7 +641,7 @@ sal_uInt16 SwFldDokPage::GetGroup() void SwFldDokPage::FillUserData() { - String sData(rtl::OUString(USER_DATA_VERSION)); + String sData(OUString(USER_DATA_VERSION)); sData += ';'; sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index a00eaaf0c4eb..41320d4c774e 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -201,7 +201,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) SetTabPage(pTabPage); String sTitle(GetText()); - sTitle.Insert(rtl::OUString(": "), 0); + sTitle.Insert(OUString(": "), 0); sTitle.Insert(SW_RESSTR(STR_FLD_EDIT_DLG), 0); SetText(sTitle); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 86fe43d574ea..f8eec49e6c70 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; -using rtl::OUString; SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage( pParent, SW_RES( TP_FLD_FUNC ), rCoreSet ), @@ -486,7 +485,7 @@ void SwFldFuncPage::UpdateSubType() aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); - std::vector aLst; + std::vector aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); size_t nCount = aLst.size(); @@ -647,7 +646,7 @@ sal_uInt16 SwFldFuncPage::GetGroup() void SwFldFuncPage::FillUserData() { - String sData(rtl::OUString(USER_DATA_VERSION)); + String sData(OUString(USER_DATA_VERSION)); sData += ';'; sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index a3470a023fb3..2dbee73a9670 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -76,7 +76,6 @@ #include #include -using rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::container; using namespace com::sun::star::lang; @@ -490,7 +489,7 @@ sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId) Description: localise subtypes of a field --------------------------------------------------------------------*/ -bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector& rToFill) +bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector& rToFill) { bool bRet = false; SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell(); @@ -1262,7 +1261,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam ) if (nLevel != 0x7f && cSeparator == 0) cSeparator = '.'; - pTyp->SetDelimiter(rtl::OUString(cSeparator)); + pTyp->SetDelimiter(OUString(cSeparator)); SwSetExpField* pExpFld = new SwSetExpField(pTyp, rData.sPar2, nFormatId); bExp = true; pFld = pExpFld; @@ -1485,7 +1484,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, if( SVX_NUM_CHAR_SPECIAL == nFormat ) { ((SwPageNumberField*)pCurFld)->SetUserString( sPar2 ); - sPar2 = rtl::OUString("-1"); + sPar2 = OUString("-1"); } else { @@ -1664,7 +1663,7 @@ sal_Bool SwFldMgr::ChooseMacro(const String&) sal_Bool bRet = sal_False; // choose script dialog - ::rtl::OUString aScriptURL = SfxApplication::ChooseScript(); + OUString aScriptURL = SfxApplication::ChooseScript(); // the script selector dialog returns a valid script URL if ( !aScriptURL.isEmpty() ) diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index 13d3cc2eeaf2..c5a8ee62a938 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -92,9 +92,9 @@ void SwFldPage::Init() { SwDoc* pDoc = pSh->GetDoc(); pSh->InsertFldType( SwSetExpFieldType( pDoc, - rtl::OUString("HTML_ON"), 1)); + OUString("HTML_ON"), 1)); pSh->InsertFldType( SwSetExpFieldType(pDoc, - rtl::OUString("HTML_OFF"), 1)); + OUString("HTML_OFF"), 1)); } } } @@ -171,7 +171,7 @@ sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const Str { aReq.AppendItem(SfxStringItem(FN_INSERT_FIELD, rPar1)); aReq.AppendItem(SfxStringItem - (FN_PARAM_3, rtl::OUString(cSeparator))); + (FN_PARAM_3, OUString(cSeparator))); aReq.AppendItem(SfxUInt16Item(FN_PARAM_FIELD_SUBTYPE, nSubType)); } aReq.AppendItem(SfxUInt16Item(FN_PARAM_FIELD_TYPE , nTypeId)); @@ -242,7 +242,7 @@ sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const Str { SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pTmpFld->GetTyp(); pTyp->SetOutlineLvl( static_cast< sal_uInt8 >(nSubType & 0xff)); - pTyp->SetDelimiter(rtl::OUString(cSeparator)); + pTyp->SetDelimiter(OUString(cSeparator)); nSubType = nsSwGetSetExpType::GSE_SEQ; } diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 62d115466c1b..1f9d3549ad07 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -608,7 +608,7 @@ void SwFldRefPage::UpdateSubType() } else { - std::vector aLst; + std::vector aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); for(size_t i = 0; i < aLst.size(); ++i) aSelectionLB.InsertEntry(aLst[i]); @@ -967,7 +967,7 @@ sal_uInt16 SwFldRefPage::GetGroup() void SwFldRefPage::FillUserData() { - String sData(rtl::OUString(USER_DATA_VERSION)); + String sData(OUString(USER_DATA_VERSION)); sData += ';'; sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 9b841752f12d..237693183894 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -89,14 +89,14 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) utl::OConfigurationTreeRoot aCfgRoot = utl::OConfigurationTreeRoot::createWithComponentContext( ::comphelper::getProcessComponentContext(), - rtl::OUString( + OUString( "/org.openoffice.Office.DataAccess/Policies/Features/Writer" ), -1, utl::OConfigurationTreeRoot::CM_READONLY); sal_Bool bDatabaseFields = sal_True; aCfgRoot.getNodeValue( - rtl::OUString("DatabaseFields")) >>= bDatabaseFields; + OUString("DatabaseFields")) >>= bDatabaseFields; if (bDatabaseFields) AddTabPage(TP_FLD_DB, SwFldDBPage::Create, 0); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index a3242c2b5474..7ef720a8fdea 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -588,7 +588,7 @@ void SwFldVarPage::UpdateSubType() aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); - std::vector aList; + std::vector aList; GetFldMgr().GetSubTypes(nTypeId, aList); size_t nCount = aList.size(); size_t nPos; @@ -1203,7 +1203,7 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& ) else { nSubType--; - OUString sSeparator = rtl::OUString(aSeparatorED.GetText()[0]); + OUString sSeparator = OUString(aSeparatorED.GetText()[0]); cSeparator = !sSeparator.isEmpty() ? sSeparator[0] : ' '; } break; @@ -1274,7 +1274,7 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt ) void SwFldVarPage::FillUserData() { - String sData(rtl::OUString(USER_DATA_VERSION)); + String sData(OUString(USER_DATA_VERSION)); sData += ';'; sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 42fbb50bf59a..1b4dbe07d0a5 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -141,7 +141,7 @@ void SwFldInputDlg::StateChanged( StateChangedType nType ) void SwFldInputDlg::Apply() { - rtl::OUString aTmp(comphelper::string::remove(aEditED.GetText(), '\r')); + OUString aTmp(comphelper::string::remove(aEditED.GetText(), '\r')); rSh.StartAllAction(); bool bModified = false; diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 2dc77ce8880f..4d27dd6636c1 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -254,7 +254,7 @@ IMPL_LINK( SwJavaEditDialog, InsertFileHdl, PushButton *, pBtn ) pFileDlg = new ::sfx2::FileDialogHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, - SFXWB_INSERT, rtl::OUString("swriter") ); + SFXWB_INSERT, OUString("swriter") ); } pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) ); diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx index 1529f2e49903..61624c9f3394 100644 --- a/sw/source/ui/fldui/xfldui.cxx +++ b/sw/source/ui/fldui/xfldui.cxx @@ -62,7 +62,7 @@ sal_Bool SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName SwNewDBMgr* pDBMgr = pWrtShell ? pWrtShell->GetNewDBMgr() : ::GetActiveView()->GetWrtShell().GetNewDBMgr(); - ::rtl::OUString sSource(rDBName); + OUString sSource(rDBName); Reference< XConnection> xConnection = pDBMgr->RegisterConnection(sSource); @@ -125,7 +125,7 @@ sal_Bool SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName Any aCol = xCols->getByName(rFldName); Reference xCol; aCol >>= xCol; - Any aType = xCol->getPropertyValue(rtl::OUString("Type")); + Any aType = xCol->getPropertyValue(OUString("Type")); sal_Int32 eDataType = 0; aType >>= eDataType; switch(eDataType) diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 85093848937b..fa6692ba268d 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -884,7 +884,7 @@ void SwColumnPage::UpdateCols() void SwColumnPage::SetLabels( sal_uInt16 nVis ) { - rtl::OUString sLbl( '~' ); + OUString sLbl( '~' ); String sLbl2( OUString::number( nVis + 1 )); String tmp1(sLbl2); diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index ba236522f5f0..c7b2f0b75d9b 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -84,7 +84,7 @@ public: String GetCharacterStyle() const; }; -String SwCaptionDialog::our_aSepTextSave = rtl::OUString(": "); // Caption separator text +String SwCaptionDialog::our_aSepTextSave = OUString(": "); // Caption separator text SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : SvxStandardDialog( pParent, "InsertCaptionDialog", "modules/swriter/ui/insertcaption.ui" ), @@ -432,7 +432,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV, RES_SETEXPFLD, aFldTypeName ); sal_Unicode nLvl = MAXLEVEL; - rtl::OUString sDelim(": "); + OUString sDelim(": "); if( pFldType ) { sDelim = pFldType->GetDelimiter(); @@ -463,14 +463,14 @@ void SwSequenceOptionDialog::Apply() bool bUpdate = true; if( pFldType ) { - pFldType->SetDelimiter( rtl::OUString(cDelim) ); + pFldType->SetDelimiter( OUString(cDelim) ); pFldType->SetOutlineLvl( nLvl ); } else if( aFldTypeName.Len() && nLvl < MAXLEVEL ) { // then we have to insert that SwSetExpFieldType aFldType( rSh.GetDoc(), aFldTypeName, nsSwGetSetExpType::GSE_SEQ ); - aFldType.SetDelimiter( rtl::OUString(cDelim) ); + aFldType.SetDelimiter( OUString(cDelim) ); aFldType.SetOutlineLvl( nLvl ); rSh.InsertFldType( aFldType ); } @@ -508,7 +508,7 @@ long CategoryBox::PreNotify( NotifyEvent& rNEvt ) if(nTmpCode != KEY_BACKSPACE && nTmpCode != KEY_RETURN && nTmpCode != KEY_TAB && nTmpCode != KEY_ESCAPE) { - rtl::OUString sKey( pEvent->GetCharCode() ); + OUString sKey( pEvent->GetCharCode() ); String sName( GetText() ); Selection aSel( GetSelection() ); aSel.Justify(); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index a387a377cde6..3750852f1157 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -68,7 +68,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; using namespace ::sfx2; #define SwFPos SvxSwFramePosString diff --git a/sw/source/ui/inc/HeaderFooterWin.hxx b/sw/source/ui/inc/HeaderFooterWin.hxx index 04a0a814cba8..14e3ecbee291 100644 --- a/sw/source/ui/inc/HeaderFooterWin.hxx +++ b/sw/source/ui/inc/HeaderFooterWin.hxx @@ -39,7 +39,7 @@ */ class SwHeaderFooterWin : public MenuButton, public SwFrameControl { - rtl::OUString m_sLabel; + OUString m_sLabel; bool m_bIsHeader; PopupMenu* m_pPopupMenu; Window* m_pLine; diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx index f9c077277809..c220de09e4ea 100644 --- a/sw/source/ui/inc/SwXFilterOptions.hxx +++ b/sw/source/ui/inc/SwXFilterOptions.hxx @@ -37,8 +37,8 @@ class SwXFilterOptions : public ::cppu::WeakImplHelper5< ::com::sun::star::document::XExporter, ::com::sun::star::lang::XServiceInfo > { - ::rtl::OUString sFilterName; - ::rtl::OUString sFilterOptions; + OUString sFilterName; + OUString sFilterOptions; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream; @@ -50,8 +50,8 @@ public: SwXFilterOptions(); virtual ~SwXFilterOptions(); - static ::rtl::OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_Static(); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > @@ -65,7 +65,7 @@ public: ::com::sun::star::uno::RuntimeException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException); @@ -82,11 +82,11 @@ public: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index d808d7a8e4b4..223516670c72 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -68,12 +68,12 @@ public: TableNameEdit(Window* pWin, const ResId& rResId) : NoSpaceEdit(pWin, rResId) { - SetForbiddenChars(rtl::OUString(" .<>")); + SetForbiddenChars(OUString(" .<>")); } TableNameEdit(Window* pWin) : NoSpaceEdit(pWin) { - SetForbiddenChars(rtl::OUString(" .<>")); + SetForbiddenChars(OUString(" .<>")); } }; diff --git a/sw/source/ui/inc/barcfg.hxx b/sw/source/ui/inc/barcfg.hxx index 786f3f4ad5e2..75adc8ca0c8d 100644 --- a/sw/source/ui/inc/barcfg.hxx +++ b/sw/source/ui/inc/barcfg.hxx @@ -24,14 +24,14 @@ class SwToolbarConfigItem : public utl::ConfigItem { sal_Int32 aTbxIdArray[5]; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SwToolbarConfigItem( bool bWeb ); ~SwToolbarConfigItem(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId ); }; diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index 345235cdf2d4..3dc05c481c43 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.hxx @@ -32,7 +32,7 @@ private: SvGlobalName aOleId; String sCategory; sal_uInt16 nNumType; - ::rtl::OUString sNumberSeparator; + OUString sNumberSeparator; String sCaption; sal_uInt16 nPos; sal_uInt16 nLevel; @@ -62,8 +62,8 @@ public: inline sal_uInt16 GetNumType() const { return nNumType; } inline void SetNumType(const sal_uInt16 nNT) { nNumType = nNT; } - const ::rtl::OUString& GetNumSeparator() const { return sNumberSeparator; } - void SetNumSeparator(const ::rtl::OUString& rSet) {sNumberSeparator = rSet;} + const OUString& GetNumSeparator() const { return sNumberSeparator; } + void SetNumSeparator(const OUString& rSet) {sNumberSeparator = rSet;} inline const String& GetCaption() const { return sCaption; } inline void SetCaption(const String& rCap) { sCaption = rCap; } diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index 561e6ef04d46..e0a21c16115e 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -135,7 +135,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; - const rtl::OUString &GetFax() const { return sFaxName; } + const OUString &GetFax() const { return sFaxName; } void SetFax( const String& rFax) { sFaxName = rFax; } diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/ui/inc/concustomshape.hxx index 7f91549cc684..39a712e7f147 100644 --- a/sw/source/ui/inc/concustomshape.hxx +++ b/sw/source/ui/inc/concustomshape.hxx @@ -35,7 +35,7 @@ class SfxRequest; class ConstCustomShape : public SwDrawBase { - rtl::OUString aCustomShape; + OUString aCustomShape; void SetAttributes( SdrObject* pObj ); @@ -49,8 +49,8 @@ class ConstCustomShape : public SwDrawBase virtual void Activate(const sal_uInt16 nSlotId); // activate function - rtl::OUString GetShapeType() const; - static rtl::OUString GetShapeTypeFromRequest( SfxRequest& rReq ); + OUString GetShapeType() const; + static OUString GetShapeTypeFromRequest( SfxRequest& rReq ); virtual void CreateDefaultObject(); diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 1ef4253c6fd8..6fe6342adfdf 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -243,7 +243,7 @@ private: static const SfxObjectShell* pShowShell; void InsertRegion( const SwGlblDocContent* _pContent, - const com::sun::star::uno::Sequence< ::rtl::OUString >& _rFiles ); + const com::sun::star::uno::Sequence< OUString >& _rFiles ); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/ui/inc/dbconfig.hxx index 91186e76e6a5..6757ac0b1840 100644 --- a/sw/source/ui/inc/dbconfig.hxx +++ b/sw/source/ui/inc/dbconfig.hxx @@ -26,7 +26,7 @@ struct SwDBData; class SW_DLLPUBLIC SwDBConfig : public utl::ConfigItem { - SW_DLLPRIVATE const com::sun::star::uno::Sequence& GetPropertyNames(); + SW_DLLPRIVATE const com::sun::star::uno::Sequence& GetPropertyNames(); SwDBData* pAdrImpl; SwDBData* pBibImpl; @@ -39,7 +39,7 @@ public: const SwDBData& GetAddressSource(); const SwDBData& GetBibliographySource(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); }; #endif diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 02488d163044..aa1207fc553f 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -56,7 +56,7 @@ typedef boost::ptr_vector<_DB_Column> _DB_Columns; struct SwInsDBColumn { - rtl::OUString sColumn, sUsrNumFmt; + OUString sColumn, sUsrNumFmt; sal_Int32 nDBNumFmt; sal_uInt32 nUsrNumFmt; LanguageType eUsrNumFmtLng; @@ -153,7 +153,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem bool SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, sal_Bool bInsField ); using SfxModalDialog::Notify; - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); void Load(); diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index 7f4084bf5d8a..99cbf594a81f 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -207,7 +207,7 @@ protected: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual rtl::OUString GetSurroundingText() const; + virtual OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; void ShowAutoTextCorrectQuickHelp( const String& rWord, SvxAutoCorrCfg* pACfg, diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx index e7b3fccd0d7d..1c072c799fcd 100644 --- a/sw/source/ui/inc/envimg.hxx +++ b/sw/source/ui/inc/envimg.hxx @@ -42,9 +42,9 @@ class SW_DLLPUBLIC SwEnvItem : public SfxPoolItem { public: - rtl::OUString aAddrText; // text for reciever + OUString aAddrText; // text for reciever sal_Bool bSend; // sender? - rtl::OUString aSendText; // text for sender + OUString aSendText; // text for sender sal_Int32 lAddrFromLeft; // left gap for reciever (twips) sal_Int32 lAddrFromTop; // upper gap for reciever (twips) sal_Int32 lSendFromLeft; // left gap for sender (twips) @@ -75,7 +75,7 @@ class SwEnvCfgItem : public utl::ConfigItem { SwEnvItem aEnvItem; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SwEnvCfgItem(); ~SwEnvCfgItem(); @@ -83,7 +83,7 @@ public: SwEnvItem& GetItem() {return aEnvItem;} virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); }; #endif diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index c42cd34fb221..d745c41484b5 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.hxx @@ -193,7 +193,7 @@ public: static sal_uInt16 GetPos(sal_uInt16 nTypeId); // subtypes to a type - bool GetSubTypes(sal_uInt16 nId, std::vector& rToFill); + bool GetSubTypes(sal_uInt16 nId, std::vector& rToFill); // format to a type sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool bHtmlMode = sal_False) const; diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx index f6b6198b7cb3..f71e124dc449 100644 --- a/sw/source/ui/inc/fontcfg.hxx +++ b/sw/source/ui/inc/fontcfg.hxx @@ -59,7 +59,7 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem String sDefaultFonts[DEF_FONT_COUNT]; sal_Int32 nDefaultFontHeight[DEF_FONT_COUNT]; - SW_DLLPRIVATE com::sun::star::uno::Sequence GetPropertyNames(); + SW_DLLPRIVATE com::sun::star::uno::Sequence GetPropertyNames(); void ChangeString(sal_uInt16 nFontType, const String& rSet) { @@ -77,7 +77,7 @@ public: ~SwStdFontConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); const String& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];} const String& GetFontOutline(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];} diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx index 99673dcbcb38..65a1a08f5b36 100644 --- a/sw/source/ui/inc/glosbib.hxx +++ b/sw/source/ui/inc/glosbib.hxx @@ -82,7 +82,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog PushButton* m_pDelPB; PushButton* m_pRenamePB; - typedef std::vector< ::rtl::OUString> OUVector_t; + typedef std::vector< OUString> OUVector_t; OUVector_t m_RemovedArr; OUVector_t m_InsertedArr; OUVector_t m_RenamedArr; diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx index d721b0f5b841..6ab31ac73c86 100644 --- a/sw/source/ui/inc/glosdoc.hxx +++ b/sw/source/ui/inc/glosdoc.hxx @@ -79,7 +79,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > GetAutoTextGroup( - const ::rtl::OUString& _rGroupName, + const OUString& _rGroupName, bool _bCreate = false ); @@ -100,8 +100,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > GetAutoTextEntry( const String& _rCompleteGroupName, - const ::rtl::OUString& _rGroupName, - const ::rtl::OUString& _rEntryName, + const OUString& _rGroupName, + const OUString& _rEntryName, bool _bCreate = false ); @@ -118,7 +118,7 @@ public: static String GetDefName(); static String GetExtension(); - String GetCompleteGroupName( const ::rtl::OUString& GroupName ); + String GetCompleteGroupName( const OUString& GroupName ); sal_Bool NewGroupDoc(String &rGroupName, const String& rTitle); sal_Bool RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle); diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/ui/inc/imaildsplistener.hxx index 333506a1f731..319a92b4fae3 100644 --- a/sw/source/ui/inc/imaildsplistener.hxx +++ b/sw/source/ui/inc/imaildsplistener.hxx @@ -63,7 +63,7 @@ public: Called for every mail message whose delivery failed. */ - virtual void mailDeliveryError(::rtl::Reference xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage) = 0; + virtual void mailDeliveryError(::rtl::Reference xMailDispatcher, ::com::sun::star::uno::Reference< ::com::sun::star::mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) = 0; }; #endif // INCLUDED_IMAILDISPATCHERLISTENER_HXX diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index a9c7e119472d..d183268de96a 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.hxx @@ -46,8 +46,8 @@ private: PushButton* m_pPrevBtn; PushButton* m_pNextBtn; - rtl::OUString aText; - rtl::OUString aType; + OUString aText; + OUString aType; sal_Bool bNew; sal_Bool bIsUrl; @@ -77,9 +77,9 @@ public: SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh); ~SwJavaEditDialog(); - rtl::OUString GetText() { return aText; } + OUString GetText() { return aText; } - rtl::OUString GetType() { return aType; } + OUString GetType() { return aType; } sal_Bool IsUrl() { return bIsUrl; } sal_Bool IsNew() { return bNew; } diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx index 6ee47ea64cdf..65cd0a4d6e28 100644 --- a/sw/source/ui/inc/label.hxx +++ b/sw/source/ui/inc/label.hxx @@ -38,7 +38,7 @@ class SwLabDlg : public SfxTabDialog SwLabPrtPage* pPrtPage; std::vector aTypeIds; - std::vector aMakes; + std::vector aMakes; SwLabRecs* pRecs; String aLstGroup; @@ -64,8 +64,8 @@ public: std::vector &TypeIds() { return aTypeIds; } const std::vector &TypeIds() const { return aTypeIds; } - std::vector &Makes() { return aMakes; } - const std::vector &Makes() const { return aMakes; } + std::vector &Makes() { return aMakes; } + const std::vector &Makes() const { return aMakes; } Printer *GetPrt(); inline void ReplaceGroup( const String &rMake ); diff --git a/sw/source/ui/inc/labelcfg.hxx b/sw/source/ui/inc/labelcfg.hxx index 216bef4b9ac2..42f357693165 100644 --- a/sw/source/ui/inc/labelcfg.hxx +++ b/sw/source/ui/inc/labelcfg.hxx @@ -36,7 +36,7 @@ struct SwLabelMeasure class SW_DLLPUBLIC SwLabelConfig : public utl::ConfigItem { - std::vector m_aManufacturers; + std::vector m_aManufacturers; std::map< OUString, std::map > m_aLabels; public: @@ -44,15 +44,15 @@ public: virtual ~SwLabelConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - void FillLabels(const rtl::OUString& rManufacturer, SwLabRecs& rLabArr); - const std::vector& GetManufacturers() const {return m_aManufacturers;} + void FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr); + const std::vector& GetManufacturers() const {return m_aManufacturers;} - sal_Bool HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType); - bool IsPredefinedLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType) + sal_Bool HasLabel(const OUString& rManufacturer, const OUString& rType); + bool IsPredefinedLabel(const OUString& rManufacturer, const OUString& rType) { return m_aLabels[rManufacturer][rType].m_bPredefined; }; - void SaveLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType, + void SaveLabel(const OUString& rManufacturer, const OUString& rType, const SwLabRec& rRec); }; diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/ui/inc/labimg.hxx index 2107a07aa3d4..e4c63d52ba8d 100644 --- a/sw/source/ui/inc/labimg.hxx +++ b/sw/source/ui/inc/labimg.hxx @@ -41,14 +41,14 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; - rtl::OUString aLstMake; // remember last selection - rtl::OUString aLstType; - rtl::OUString sDBName; // used database + OUString aLstMake; // remember last selection + OUString aLstType; + OUString sDBName; // used database - rtl::OUString aWriting; // label - rtl::OUString aMake; // label mark - rtl::OUString aType; // label type - rtl::OUString aBin; // printer shaft + OUString aWriting; // label + OUString aMake; // label mark + OUString aType; // label type + OUString aBin; // printer shaft sal_Int32 lHDist; // horizontal distance (user) sal_Int32 lVDist; // vertical distance (user) sal_Int32 lWidth; // width (user) @@ -67,41 +67,41 @@ public: sal_Bool bSynchron;// synchronise all labels //parts of the business card - rtl::OUString aPrivFirstName; - rtl::OUString aPrivName; - rtl::OUString aPrivShortCut; - rtl::OUString aPrivFirstName2; - rtl::OUString aPrivName2; - rtl::OUString aPrivShortCut2; - rtl::OUString aPrivStreet; - rtl::OUString aPrivZip; - rtl::OUString aPrivCity; - rtl::OUString aPrivCountry; - rtl::OUString aPrivState; - rtl::OUString aPrivTitle; - rtl::OUString aPrivProfession; - rtl::OUString aPrivPhone; - rtl::OUString aPrivMobile; - rtl::OUString aPrivFax; - rtl::OUString aPrivWWW; - rtl::OUString aPrivMail; - rtl::OUString aCompCompany; - rtl::OUString aCompCompanyExt; - rtl::OUString aCompSlogan; - rtl::OUString aCompStreet; - rtl::OUString aCompZip; - rtl::OUString aCompCity; - rtl::OUString aCompCountry; - rtl::OUString aCompState; - rtl::OUString aCompPosition; - rtl::OUString aCompPhone; - rtl::OUString aCompMobile; - rtl::OUString aCompFax; - rtl::OUString aCompWWW; - rtl::OUString aCompMail; + OUString aPrivFirstName; + OUString aPrivName; + OUString aPrivShortCut; + OUString aPrivFirstName2; + OUString aPrivName2; + OUString aPrivShortCut2; + OUString aPrivStreet; + OUString aPrivZip; + OUString aPrivCity; + OUString aPrivCountry; + OUString aPrivState; + OUString aPrivTitle; + OUString aPrivProfession; + OUString aPrivPhone; + OUString aPrivMobile; + OUString aPrivFax; + OUString aPrivWWW; + OUString aPrivMail; + OUString aCompCompany; + OUString aCompCompanyExt; + OUString aCompSlogan; + OUString aCompStreet; + OUString aCompZip; + OUString aCompCity; + OUString aCompCountry; + OUString aCompState; + OUString aCompPosition; + OUString aCompPhone; + OUString aCompMobile; + OUString aCompFax; + OUString aCompWWW; + OUString aCompMail; - rtl::OUString sGlossaryGroup; - rtl::OUString sGlossaryBlockName; + OUString sGlossaryGroup; + OUString sGlossaryBlockName; }; // class SwLabCfgItem ------------------------------------------------------- @@ -110,14 +110,14 @@ class SwLabCfgItem : public utl::ConfigItem SwLabItem aItem; sal_Bool bIsLabel; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SwLabCfgItem(sal_Bool bLabel); SwLabItem& GetItem() {return aItem;} virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); }; #endif diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/ui/inc/mailmergehelper.hxx index 29a49ce3dc3f..aa73d7ead564 100644 --- a/sw/source/ui/inc/mailmergehelper.hxx +++ b/sw/source/ui/inc/mailmergehelper.hxx @@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star { namespace mail { namespace SwMailMergeHelper { SW_DLLPUBLIC String CallSaveAsDialog(String& rFilter); - SW_DLLPUBLIC bool CheckMailAddress( const ::rtl::OUString& rMailAddress ); + SW_DLLPUBLIC bool CheckMailAddress( const OUString& rMailAddress ); SW_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::mail::XSmtpService > ConnectToSmtpServer( SwMailMergeConfigItem& rConfigItem, com::sun::star::uno::Reference< com::sun::star::mail::XMailService >& xInMailService, @@ -71,7 +71,7 @@ class SW_DLLPUBLIC SwAddressPreview : public Window SwAddressPreview_Impl* pImpl; Link m_aSelectHdl; - void DrawText_Impl( const ::rtl::OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected); + void DrawText_Impl( const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected); virtual void Paint(const Rectangle&); virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -92,16 +92,16 @@ public: AddAddress appends the new address to the already added ones. Initially the first added address will be selected */ - void AddAddress(const ::rtl::OUString& rAddress); + void AddAddress(const OUString& rAddress); // for preview mode - replaces the currently used address by the given one - void SetAddress(const ::rtl::OUString& rAddress); + void SetAddress(const OUString& rAddress); // removes all addresses void Clear(); // returns the selected address sal_uInt16 GetSelectedAddress() const; void SelectAddress(sal_uInt16 nSelect); - void ReplaceSelectedAddress(const ::rtl::OUString&); + void ReplaceSelectedAddress(const OUString&); void RemoveSelectedAddress(); // set the number of rows and columns of addresses @@ -110,9 +110,9 @@ public: // fill the actual data into a string (address block or greeting) static String FillData( - const ::rtl::OUString& rAddress, + const OUString& rAddress, SwMailMergeConfigItem& rConfigItem, - const ::com::sun::star::uno::Sequence< ::rtl::OUString>* pAssignments = 0); + const ::com::sun::star::uno::Sequence< OUString>* pAssignments = 0); void SetSelectHdl (const Link& rLink) {m_aSelectHdl = rLink;} }; @@ -146,35 +146,35 @@ public: class SW_DLLPUBLIC SwAuthenticator : public cppu::WeakImplHelper1< ::com::sun::star::mail::XAuthenticator> { - ::rtl::OUString m_aUserName; - ::rtl::OUString m_aPassword; + OUString m_aUserName; + OUString m_aPassword; Window* m_pParentWindow; public: SwAuthenticator() : m_pParentWindow(0) {} - SwAuthenticator(const ::rtl::OUString& username, const ::rtl::OUString& password, Window* pParent) : + SwAuthenticator(const OUString& username, const OUString& password, Window* pParent) : m_aUserName(username), m_aPassword(password), m_pParentWindow( pParent ) {} ~SwAuthenticator(); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException); }; class SW_DLLPUBLIC SwConnectionContext : public cppu::WeakImplHelper1< ::com::sun::star::uno::XCurrentContext > { - ::rtl::OUString m_sMailServer; + OUString m_sMailServer; sal_Int16 m_nPort; - ::rtl::OUString m_sConnectionType; + OUString m_sConnectionType; public: - SwConnectionContext(const ::rtl::OUString& rMailServer, sal_Int16 nPort, const ::rtl::OUString& rConnectionType); + SwConnectionContext(const OUString& rMailServer, sal_Int16 nPort, const OUString& rConnectionType); ~SwConnectionContext(); - virtual ::com::sun::star::uno::Any SAL_CALL getValueByName( const ::rtl::OUString& Name ) + virtual ::com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException); }; @@ -214,15 +214,15 @@ class SwMailTransferable : ::com::sun::star::beans::XPropertySet > { - rtl::OUString m_aMimeType; - rtl::OUString m_sBody; - rtl::OUString m_aURL; - rtl::OUString m_aName; + OUString m_aMimeType; + OUString m_sBody; + OUString m_aURL; + OUString m_aName; bool m_bIsBody; public: - SwMailTransferable(const rtl::OUString& rURL, const rtl::OUString& rName, const rtl::OUString& rMimeType); - SwMailTransferable(const rtl::OUString& rBody, const rtl::OUString& rMimeType); + SwMailTransferable(const OUString& rURL, const OUString& rName, const OUString& rMimeType); + SwMailTransferable(const OUString& rBody, const OUString& rMimeType); ~SwMailTransferable(); virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) @@ -236,12 +236,12 @@ class SwMailTransferable : //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; @@ -249,17 +249,17 @@ class SwMailMessage : public SwMutexBase, public cppu::WeakComponentImplHelper1< ::com::sun::star::mail::XMailMessage > { - ::rtl::OUString m_sSenderName; - ::rtl::OUString m_sSenderAddress; - ::rtl::OUString m_sReplyToAddress; - ::rtl::OUString m_sSubject; + OUString m_sSenderName; + OUString m_sSenderAddress; + OUString m_sReplyToAddress; + OUString m_sSubject; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> m_xBody; // ::com::sun::star::mail::MailMessageBody m_aBody; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aRecipients; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aCcRecipients; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aBccRecipients; + ::com::sun::star::uno::Sequence< OUString > m_aRecipients; + ::com::sun::star::uno::Sequence< OUString > m_aCcRecipients; + ::com::sun::star::uno::Sequence< OUString > m_aBccRecipients; // ::com::sun::star::uno::Sequence< ::com::sun::star::mail::MailAttachmentDescriptor > m_aAttachments; ::com::sun::star::uno::Sequence< ::com::sun::star::mail::MailAttachment > m_aAttachments; public: @@ -267,12 +267,12 @@ public: ~SwMailMessage(); // attributes - virtual ::rtl::OUString SAL_CALL getSenderName() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSenderAddress() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getReplyToAddress() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReplyToAddress( const ::rtl::OUString& _replytoaddress ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubject() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSubject( const ::rtl::OUString& _subject ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSenderName() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSenderAddress() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getReplyToAddress() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubject() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSubject( const OUString& _subject ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getBody() @@ -281,22 +281,22 @@ public: throw (::com::sun::star::uno::RuntimeException); // methods - virtual void SAL_CALL addRecipient( const ::rtl::OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addCcRecipient( const ::rtl::OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addBccRecipient( const ::rtl::OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRecipients( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCcRecipients( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getBccRecipients( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addAttachment( const ::com::sun::star::mail::MailAttachment& aMailAttachment ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::mail::MailAttachment > SAL_CALL getAttachments( ) throw (::com::sun::star::uno::RuntimeException); - void SetSenderName(const ::rtl::OUString& rSenderName) + void SetSenderName(const OUString& rSenderName) {m_sSenderName = rSenderName;} - void SetSenderAddress(const ::rtl::OUString& rSenderAddress) + void SetSenderAddress(const OUString& rSenderAddress) {m_sSenderAddress = rSenderAddress;} }; diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index 45b4a1af85b9..e170af00f748 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -113,7 +113,7 @@ class SwMailMergeDlg : public SvxStandardDialog ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; Size m_aDialogSize; - ::rtl::OUString m_sSaveFilter; + OUString m_sSaveFilter; DECL_LINK( ButtonHdl, Button* pBtn ); @@ -144,7 +144,7 @@ public: String GetColumnName() const { return aColumnLB.GetSelectEntry();} String GetPath() const { return aPathED.GetText();} - const ::rtl::OUString& GetSaveFilter() const {return m_sSaveFilter;} + const OUString& GetSaveFilter() const {return m_sSaveFilter;} inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const; diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx index 51b301ae64a4..8011cfe85570 100644 --- a/sw/source/ui/inc/mmconfigitem.hxx +++ b/sw/source/ui/inc/mmconfigitem.hxx @@ -48,20 +48,20 @@ struct SwDocMergeInfo class SW_DLLPUBLIC SwMailMergeConfigItem { -// com::sun::star::uno::Sequence< ::rtl::OUString> m_aSavedDocuments; +// com::sun::star::uno::Sequence< OUString> m_aSavedDocuments; SwMailMergeConfigItem_Impl* m_pImpl; //session information - not stored in configuration bool m_bAddressInserted; bool m_bMergeDone; bool m_bGreetingInserted; sal_Int32 m_nGreetingMoves; - ::rtl::OUString m_rAddressBlockFrame; + OUString m_rAddressBlockFrame; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; sal_uInt16 m_nStartPrint; sal_uInt16 m_nEndPrint; - ::rtl::OUString m_sSelectedPrinter; + OUString m_sSelectedPrinter; SwView* m_pSourceView; SwView* m_pTargetView; @@ -99,8 +99,8 @@ public: void DisposeResultSet(); - ::rtl::OUString& GetFilter() const; - void SetFilter(::rtl::OUString&); + OUString& GetFilter() const; + void SetFilter(OUString&); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> GetSelection()const; @@ -117,9 +117,9 @@ public: bool IsRecordExcluded(sal_Int32 nRecord); void ExcludeRecord(sal_Int32 nRecord, bool bExclude); - const com::sun::star::uno::Sequence< ::rtl::OUString>& + const com::sun::star::uno::Sequence< OUString>& GetSavedDocuments() const; - void AddSavedDocument(::rtl::OUString rName); + void AddSavedDocument(OUString rName); sal_Bool IsOutputToLetter()const; void SetOutputToLetter(sal_Bool bSet); @@ -130,16 +130,16 @@ public: sal_Bool IsHideEmptyParagraphs() const; void SetHideEmptyParagraphs(sal_Bool bSet); - const com::sun::star::uno::Sequence< ::rtl::OUString> + const com::sun::star::uno::Sequence< OUString> GetAddressBlocks() const; - void SetAddressBlocks(const com::sun::star::uno::Sequence< ::rtl::OUString>& rBlocks); + void SetAddressBlocks(const com::sun::star::uno::Sequence< OUString>& rBlocks); void SetCurrentAddressBlockIndex( sal_Int32 nSet ); sal_Int32 GetCurrentAddressBlockIndex() const; sal_Bool IsIncludeCountry() const; - rtl::OUString& GetExcludeCountry() const; - void SetCountrySettings(sal_Bool bSet, const rtl::OUString& sCountry); + OUString& GetExcludeCountry() const; + void SetCountrySettings(sal_Bool bSet, const OUString& sCountry); sal_Bool IsIndividualGreeting(sal_Bool bInEMail) const; void SetIndividualGreeting(sal_Bool bSet, sal_Bool bInEMail); @@ -147,42 +147,42 @@ public: sal_Bool IsGreetingLine(sal_Bool bInEMail) const; void SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail); - const com::sun::star::uno::Sequence< ::rtl::OUString> + const com::sun::star::uno::Sequence< OUString> GetGreetings(Gender eType) const; - void SetGreetings(Gender eType, const com::sun::star::uno::Sequence< ::rtl::OUString>& rBlocks); + void SetGreetings(Gender eType, const com::sun::star::uno::Sequence< OUString>& rBlocks); sal_Int32 GetCurrentGreeting(Gender eType) const; void SetCurrentGreeting(Gender eType, sal_Int32 nIndex); //the content of the gender column that marks it as female - const ::rtl::OUString& GetFemaleGenderValue() const; - void SetFemaleGenderValue(const ::rtl::OUString rValue); + const OUString& GetFemaleGenderValue() const; + void SetFemaleGenderValue(const OUString rValue); //returns the assignment in the order of the default headers (GetDefaultAddressHeaders()) - com::sun::star::uno::Sequence< ::rtl::OUString > + com::sun::star::uno::Sequence< OUString > GetColumnAssignment( const SwDBData& rDBData ) const; void SetColumnAssignment( const SwDBData& rDBData, - const com::sun::star::uno::Sequence< ::rtl::OUString>& ); + const com::sun::star::uno::Sequence< OUString>& ); bool IsAddressFieldsAssigned() const; bool IsGreetingFieldsAssigned() const; //e-Mail settings: - ::rtl::OUString GetMailDisplayName() const; - void SetMailDisplayName(const ::rtl::OUString& rName); + OUString GetMailDisplayName() const; + void SetMailDisplayName(const OUString& rName); - ::rtl::OUString GetMailAddress() const; - void SetMailAddress(const ::rtl::OUString& rAddress); + OUString GetMailAddress() const; + void SetMailAddress(const OUString& rAddress); sal_Bool IsMailReplyTo() const; void SetMailReplyTo(sal_Bool bSet); - ::rtl::OUString GetMailReplyTo() const; - void SetMailReplyTo(const ::rtl::OUString& rReplyTo); + OUString GetMailReplyTo() const; + void SetMailReplyTo(const OUString& rReplyTo); - ::rtl::OUString GetMailServer() const; - void SetMailServer(const ::rtl::OUString& rAddress); + OUString GetMailServer() const; + void SetMailServer(const OUString& rAddress); sal_Int16 GetMailPort() const; void SetMailPort(sal_Int16 nSet); @@ -193,17 +193,17 @@ public: sal_Bool IsAuthentication() const; void SetAuthentication(sal_Bool bSet); - ::rtl::OUString GetMailUserName() const; - void SetMailUserName(const ::rtl::OUString& rName); + OUString GetMailUserName() const; + void SetMailUserName(const OUString& rName); - ::rtl::OUString GetMailPassword() const; - void SetMailPassword(const ::rtl::OUString& rPassword); + OUString GetMailPassword() const; + void SetMailPassword(const OUString& rPassword); sal_Bool IsSMTPAfterPOP() const; void SetSMTPAfterPOP(sal_Bool bSet); - ::rtl::OUString GetInServerName() const; - void SetInServerName(const ::rtl::OUString& rServer); + OUString GetInServerName() const; + void SetInServerName(const OUString& rServer); sal_Int16 GetInServerPort() const; void SetInServerPort(sal_Int16 nSet); @@ -211,15 +211,15 @@ public: sal_Bool IsInServerPOP() const; void SetInServerPOP(sal_Bool bSet); - ::rtl::OUString GetInServerUserName() const; - void SetInServerUserName(const ::rtl::OUString& rName); + OUString GetInServerUserName() const; + void SetInServerUserName(const OUString& rName); - ::rtl::OUString GetInServerPassword() const; - void SetInServerPassword(const ::rtl::OUString& rPassword); + OUString GetInServerPassword() const; + void SetInServerPassword(const OUString& rPassword); //session information bool IsAddressInserted() const { return m_bAddressInserted; } - void SetAddressInserted(const ::rtl::OUString& rFrameName) + void SetAddressInserted(const OUString& rFrameName) { m_bAddressInserted = true; m_rAddressBlockFrame = rFrameName; } @@ -251,8 +251,8 @@ public: sal_uInt16 GetPrintRangeStart() const {return m_nStartPrint;} sal_uInt16 GetPrintRangeEnd() const {return m_nEndPrint;} - const ::rtl::OUString& GetSelectedPrinter() const {return m_sSelectedPrinter;} - void SetSelectedPrinter(const ::rtl::OUString& rSet ) + const OUString& GetSelectedPrinter() const {return m_sSelectedPrinter;} + void SetSelectedPrinter(const OUString& rSet ) {m_sSelectedPrinter = rSet;} @@ -263,7 +263,7 @@ public: void SetSourceView(SwView* pView); //helper methods - ::rtl::OUString GetAssignedColumn(sal_uInt32 nColumn)const; + OUString GetAssignedColumn(sal_uInt32 nColumn)const; }; #endif diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/ui/inc/navicfg.hxx index 1e297cb86fe3..0c1ca4a6c75f 100644 --- a/sw/source/ui/inc/navicfg.hxx +++ b/sw/source/ui/inc/navicfg.hxx @@ -31,14 +31,14 @@ class SwNavigationConfig : public utl::ConfigItem sal_Bool bIsSmall; //ShowListBox sal_Bool bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid? - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SwNavigationConfig(); ~SwNavigationConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); sal_Int32 GetRootType()const {return nRootType;} void SetRootType(sal_Int32 nSet){ diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/ui/inc/numberingtypelistbox.hxx index 15fdb8979d69..260fc05cc06a 100644 --- a/sw/source/ui/inc/numberingtypelistbox.hxx +++ b/sw/source/ui/inc/numberingtypelistbox.hxx @@ -40,7 +40,7 @@ public: SwNumberingTypeListBox( Window* pWin, WinBits nStyle = WB_BORDER ); ~SwNumberingTypeListBox(); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); void Reload(sal_uInt16 nTypeFlags); diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx index 0fa5ddac75ea..2a56b37c1ca4 100644 --- a/sw/source/ui/inc/olmenu.hxx +++ b/sw/source/ui/inc/olmenu.hxx @@ -45,16 +45,16 @@ class SwSpellPopup : public PopupMenu ::com::sun::star::linguistic2::ProofreadingResult xGrammarResult; sal_Int32 nGrammarError; - ::com::sun::star::uno::Sequence< rtl::OUString > aSuggestions; - rtl::OUString sExplanationLink; + ::com::sun::star::uno::Sequence< OUString > aSuggestions; + OUString sExplanationLink; LanguageType nCheckedLanguage; LanguageType nGuessLangWord; LanguageType nGuessLangPara; - std::map< sal_Int16, ::rtl::OUString > aLangTable_Text; - std::map< sal_Int16, ::rtl::OUString > aLangTable_Paragraph; -// std::map< sal_Int16, ::rtl::OUString > aLangTable_Document; + std::map< sal_Int16, OUString > aLangTable_Text; + std::map< sal_Int16, OUString > aLangTable_Paragraph; +// std::map< sal_Int16, OUString > aLangTable_Document; String aDicNameSingle; bool bGrammarResults; // show grammar results? Or show spellcheck results? @@ -62,8 +62,8 @@ class SwSpellPopup : public PopupMenu Image aInfo16; void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart, - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq, SwWrtShell* pWrtSh, - std::map< sal_Int16, ::rtl::OUString > &rLangTable ); + ::com::sun::star::uno::Sequence< OUString > aSeq, SwWrtShell* pWrtSh, + std::map< sal_Int16, OUString > &rLangTable ); using PopupMenu::Execute; @@ -76,7 +76,7 @@ public: SwSpellPopup( SwWrtShell *pWrtSh, const ::com::sun::star::linguistic2::ProofreadingResult &rResult, sal_Int32 nErrorInResult, - const ::com::sun::star::uno::Sequence< rtl::OUString > &rSuggestions, + const ::com::sun::star::uno::Sequence< OUString > &rSuggestions, const String & rParaText ); sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin ); diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/ui/inc/stmenu.hxx index e00cb8293c82..c4032257ecbc 100644 --- a/sw/source/ui/inc/stmenu.hxx +++ b/sw/source/ui/inc/stmenu.hxx @@ -62,7 +62,7 @@ class SwSmartTagPopup : public PopupMenu public: SwSmartTagPopup( SwView* _pSwView, - ::com::sun::star::uno::Sequence< rtl::OUString >& rSmartTagTypes, + ::com::sun::star::uno::Sequence< OUString >& rSmartTagTypes, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > xTextRange ); diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/ui/inc/tablemgr.hxx index c83e9857b720..5ab37a589191 100644 --- a/sw/source/ui/inc/tablemgr.hxx +++ b/sw/source/ui/inc/tablemgr.hxx @@ -73,7 +73,7 @@ public: /// @return the XModel of the newly inserted chart if successful ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, const rtl::OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 ); + InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, const OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 ); }; inline SwTableFUNC::SwTableFUNC(SwFrmFmt &rFmt) : diff --git a/sw/source/ui/inc/unoatxt.hxx b/sw/source/ui/inc/unoatxt.hxx index 8813d430d11c..e04e3d3ec789 100644 --- a/sw/source/ui/inc/unoatxt.hxx +++ b/sw/source/ui/inc/unoatxt.hxx @@ -70,22 +70,22 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XAutoTextContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const rtl::OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeByName(const rtl::OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -101,14 +101,14 @@ class SwXAutoTextGroup : public cppu::WeakImplHelper6 { const SfxItemPropertySet* pPropSet; SwGlossaries* pGlossaries; - rtl::OUString sName; + OUString sName; String m_sGroupName; // prefix m_ to disambiguate from some local vars in the implementation protected: virtual ~SwXAutoTextGroup(); // ref-counted objects are not to be deleted from outside -> protected dtor public: - SwXAutoTextGroup(const rtl::OUString& rName, SwGlossaries* pGloss); + SwXAutoTextGroup(const OUString& rName, SwGlossaries* pGloss); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -117,41 +117,41 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); //XAutoTextGroup - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getTitles(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL renameByName(const rtl::OUString& aElementName, const rtl::OUString& aNewElementName, const rtl::OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const rtl::OUString& aName, const rtl::OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeByName(const rtl::OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException ); //XNamed - virtual rtl::OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setName(const rtl::OUString& Name_) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException ); //XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // void Invalidate(); @@ -213,7 +213,7 @@ public: //XText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const rtl::OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -222,16 +222,16 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException ); //XAutoTextEntry virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException ); @@ -246,7 +246,7 @@ public: /** Implement the XNameAccess for the AutoText events */ class SwAutoTextEventDescriptor : public SvBaseEventDescriptor { - ::rtl::OUString sSwAutoTextEventDescriptor; + OUString sSwAutoTextEventDescriptor; SwXAutoTextEntry& rAutoTextEntry; @@ -258,7 +258,7 @@ public: ~SwAutoTextEventDescriptor(); - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); protected: diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx index d87303037df9..2ee0e010a44d 100644 --- a/sw/source/ui/inc/unodispatch.hxx +++ b/sw/source/ui/inc/unodispatch.hxx @@ -67,7 +67,7 @@ public: ~SwXDispatchProviderInterceptor(); //XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException); //XDispatchProviderInterceptor diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/ui/inc/unomailmerge.hxx index 26481ebff902..28dcf159786c 100644 --- a/sw/source/ui/inc/unomailmerge.hxx +++ b/sw/source/ui/inc/unomailmerge.hxx @@ -106,12 +106,12 @@ class SwXMailMerge : com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > xResultSet; com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > xConnection; com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel; - rtl::OUString aDataSourceName; - rtl::OUString aDataCommand; - rtl::OUString aFilter; - rtl::OUString aDocumentURL; - rtl::OUString aOutputURL; - rtl::OUString aFileNamePrefix; + OUString aDataSourceName; + OUString aDataCommand; + OUString aFilter; + OUString aDocumentURL; + OUString aOutputURL; + OUString aFileNamePrefix; sal_Int32 nDataCommandType; sal_Int16 nOutputType; sal_Bool bEscapeProcessing; @@ -119,23 +119,23 @@ class SwXMailMerge : sal_Bool bFileNameFromColumn; - ::rtl::OUString sInServerPassword; - ::rtl::OUString sOutServerPassword; - ::rtl::OUString sSubject; - ::rtl::OUString sAddressFromColumn; - ::rtl::OUString sMailBody; - ::rtl::OUString sAttachmentName; - ::rtl::OUString sAttachmentFilter; - com::sun::star::uno::Sequence< ::rtl::OUString > aCopiesTo; - com::sun::star::uno::Sequence< ::rtl::OUString > aBlindCopiesTo; + OUString sInServerPassword; + OUString sOutServerPassword; + OUString sSubject; + OUString sAddressFromColumn; + OUString sMailBody; + OUString sAttachmentName; + OUString sAttachmentFilter; + com::sun::star::uno::Sequence< OUString > aCopiesTo; + com::sun::star::uno::Sequence< OUString > aBlindCopiesTo; sal_Bool bSendAsHTML; sal_Bool bSendAsAttachment; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aPrintSettings; sal_Bool bSaveAsSingleFile; - ::rtl::OUString sSaveFilter; - ::rtl::OUString sSaveFilterOptions; + OUString sSaveFilter; + OUString sSaveFilterOptions; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSaveFilterData; @@ -161,12 +161,12 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMailMergeBroadcaster virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); @@ -178,14 +178,14 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; -extern com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); -extern rtl::OUString SAL_CALL SwXMailMerge_getImplementationName() throw(); +extern com::sun::star::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); +extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw(); extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( com::sun::star::uno::Exception ); //////////////////////////////////////////////////////////// diff --git a/sw/source/ui/inc/unomod.hxx b/sw/source/ui/inc/unomod.hxx index e807e22e7805..ef7c511c4370 100644 --- a/sw/source/ui/inc/unomod.hxx +++ b/sw/source/ui/inc/unomod.hxx @@ -63,11 +63,11 @@ public: throw( ::com::sun::star::uno::RuntimeException ); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -107,11 +107,11 @@ public: //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -151,9 +151,9 @@ public: //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); sal_Bool IsValid() const {return bObjectValid;} void Invalidate() {bObjectValid = sal_False;} diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index d49def24ae13..30c5fb17c4a4 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -120,17 +120,17 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); //XTransferableSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException); @@ -200,8 +200,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException ); //XScreenCursor virtual sal_Bool SAL_CALL screenDown(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -221,23 +221,23 @@ public: //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx index 216930f0f283..a18cb1ad28dd 100644 --- a/sw/source/ui/inc/usrpref.hxx +++ b/sw/source/ui/inc/usrpref.hxx @@ -33,13 +33,13 @@ class SwContentViewConfig : public utl::ConfigItem SwMasterUsrPref& rParent; sal_Bool bWeb; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SwContentViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent); ~SwContentViewConfig(); // utl::ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); virtual void Commit(); void Load(); @@ -51,12 +51,12 @@ class SwLayoutViewConfig : public utl::ConfigItem SwMasterUsrPref& rParent; sal_Bool bWeb; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SwLayoutViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent); ~SwLayoutViewConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); void Load(); void SetModified(){ConfigItem::SetModified();} @@ -66,13 +66,13 @@ class SwGridConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SwGridConfig(sal_Bool bWeb, SwMasterUsrPref& rParent); ~SwGridConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -81,13 +81,13 @@ class SwCursorConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; - com::sun::star::uno::Sequence GetPropertyNames(); + com::sun::star::uno::Sequence GetPropertyNames(); public: SwCursorConfig(SwMasterUsrPref& rParent); ~SwCursorConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -95,14 +95,14 @@ class SwCursorConfig : public utl::ConfigItem class SwWebColorConfig : public utl::ConfigItem { SwMasterUsrPref& rParent; - com::sun::star::uno::Sequence aPropNames; + com::sun::star::uno::Sequence aPropNames; public: SwWebColorConfig(SwMasterUsrPref& rParent); ~SwWebColorConfig(); virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); void Load(); void SetModified(){ConfigItem::SetModified();} }; diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 7276016b46bb..89030ce024c9 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -387,9 +387,9 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void MoveCrsr( sal_Bool bWithSelect = sal_False ); // update input fields - sal_Bool StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, rtl::OString* pWindowState = 0); + sal_Bool StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, OString* pWindowState = 0); // update DropDown fields - sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, rtl::OString* pWindowState = 0); + sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, OString* pWindowState = 0); //"Handler" for changes at DrawView - for controls. virtual void DrawSelChanged( ); @@ -397,7 +397,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // jump to bookmark and set the "selctions-flags" correctly again sal_Bool GotoMark( const ::sw::mark::IMark* const pMark ); sal_Bool GotoMark( const ::sw::mark::IMark* const pMark, sal_Bool bSelect, sal_Bool bStart ); - sal_Bool GotoMark( const ::rtl::OUString& rName ); + sal_Bool GotoMark( const OUString& rName ); sal_Bool GoNextBookmark(); // sal_True when there still was one sal_Bool GoPrevBookmark(); diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index a695b02cb2db..33c1d906f2b8 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -62,7 +62,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::uno; using namespace com::sun::star::ui::dialogs; -using ::rtl::OUString; #ifdef SW_PROP_NAME_STR @@ -74,7 +73,7 @@ static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, uno::Reference< XPropertySet > & xProps, const char* pPropName, const String& rValue) { - OUString uPropName(rtl::OUString::createFromAscii(pPropName)); + OUString uPropName(OUString::createFromAscii(pPropName)); if(xInfo->hasPropertyByName(uPropName)) { uno::Any aValue; @@ -94,7 +93,7 @@ static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, uno::Reference< XPropertySet > & xProps, sal_uInt16 nId, sal_Int16 nValue ) { - OUString uPropName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(nId))); + OUString uPropName(OUString::createFromAscii(SW_PROP_NAME_STR(nId))); if(xInfo->hasPropertyByName(uPropName)) { uno::Any aValue; @@ -108,7 +107,7 @@ static void lcl_SetBOOLProp( uno::Reference< beans::XPropertySet > & xProps, sal_uInt16 nId, sal_Bool bValue ) { - OUString uPropName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(nId))); + OUString uPropName(OUString::createFromAscii(SW_PROP_NAME_STR(nId))); if(xInfo->hasPropertyByName(uPropName)) { uno::Any aValue; @@ -136,7 +135,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl) uno::Reference< container::XNameAccess > xSections = xSectionSupplier->getTextSections(); - rtl::OUString sSectionName("IndexSection_"); + OUString sSectionName("IndexSection_"); for(int i = 0; i < 7; ++i ) { String sTmp( sSectionName ); sTmp += OUString::number(i); @@ -207,7 +206,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( uno::Reference< text::XTextRange > xRg(xCrsr, uno::UNO_QUERY); xCrsr->getText()->insertTextContent(xRg, xContent, sal_False); } - OUString uIsVisible(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_VISIBLE))); + OUString uIsVisible(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_VISIBLE))); for(sal_uInt16 i = 0 ; i <= TOX_AUTHORITIES; i++) { uno::Reference< beans::XPropertySet > xSectPr(pxIndexSectionsArr[i]->xContainerSection, uno::UNO_QUERY); @@ -233,10 +232,10 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( //stylenames sal_uInt16 nContentOptions = rDesc.GetContentOptions(); - if(xInfo->hasPropertyByName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES)))) + if(xInfo->hasPropertyByName(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES)))) { sal_Bool bOn = 0!=(nContentOptions&nsSwTOXElement::TOX_TEMPLATE ); - uno::Any aStyleNames(xIdxProps->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES)))); + uno::Any aStyleNames(xIdxProps->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES)))); uno::Reference< container::XIndexReplace > xAcc; aStyleNames >>= xAcc; @@ -309,7 +308,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( nEndLevel = pForm->GetFormMax() - 1; } - if(xInfo->hasPropertyByName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT)))) + if(xInfo->hasPropertyByName(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT)))) { for(sal_uInt16 nCurrLevel = nStartLevel; nCurrLevel <= nEndLevel; nCurrLevel++) { @@ -406,7 +405,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( } aSequPropVals.realloc(nTokenIndex); - uno::Any aFormatAccess = xIdxProps->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT))); + uno::Any aFormatAccess = xIdxProps->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT))); OSL_ENSURE(aFormatAccess.getValueType() == ::getCppuType((uno::Reference*)0), "wrong property type"); @@ -439,11 +438,11 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( } for(sal_uInt16 i = 1; i < nEndLevel; i++) { - String sPropName(rtl::OUString("ParaStyleLevel")); + String sPropName(OUString("ParaStyleLevel")); sPropName += OUString::number( i ); lcl_SetProp(xInfo, xIdxProps, - rtl::OUStringToOString(sPropName, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(sPropName, RTL_TEXTENCODING_ASCII_US).getStr(), pForm->GetTemplate(i + nOffset)); } } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 7d516a3f4fde..73089dae4c53 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -82,14 +82,13 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace com::sun::star::ui::dialogs; -using ::rtl::OUString; using namespace ::sfx2; #include static const sal_Unicode aDeliStart = '['; // for the form static const sal_Unicode aDeliEnd = ']'; // for the form -#define IDX_FILE_EXTENSION rtl::OUString("*.sdi") +#define IDX_FILE_EXTENSION OUString("*.sdi") static String lcl_CreateAutoMarkFileDlg( const String& rURL, const String& rFileString, bool bOpen ) @@ -298,7 +297,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet } else { - pDescArr[nArrayIndex]->SetAuthBrackets(rtl::OUString("[]")); + pDescArr[nArrayIndex]->SetAuthBrackets(OUString("[]")); } } } @@ -439,14 +438,14 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) rSh.GetFldType(RES_AUTHORITY, aEmptyStr); if(pFType) { - String sBrackets = rtl::OUString(pFType->GetPrefix()); + String sBrackets = OUString(pFType->GetPrefix()); sBrackets += pFType->GetSuffix(); pDescArr[nIndex]->SetAuthBrackets(sBrackets); pDescArr[nIndex]->SetAuthSequence(pFType->IsSequence()); } else { - pDescArr[nIndex]->SetAuthBrackets(rtl::OUString("[]")); + pDescArr[nIndex]->SetAuthBrackets(OUString("[]")); } } else if(TOX_INDEX == eType.eType) @@ -491,7 +490,7 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox ) if(!pExampleFrame && !bExampleCreated) { bExampleCreated = sal_True; - String sTemplate(rtl::OUString("internal")); + String sTemplate(OUString("internal")); sTemplate += INET_PATH_TOKEN; sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM("idxexample") ); String sTemplateWithoutExt( sTemplate ); @@ -1963,10 +1962,10 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet aSortDocPosRB.Check(); aFillCharCB.SetMaxTextLen(1); - aFillCharCB.InsertEntry(rtl::OUString(' ')); - aFillCharCB.InsertEntry(rtl::OUString('.')); - aFillCharCB.InsertEntry(rtl::OUString('-')); - aFillCharCB.InsertEntry(rtl::OUString('_')); + aFillCharCB.InsertEntry(OUString(' ')); + aFillCharCB.InsertEntry(OUString('.')); + aFillCharCB.InsertEntry(OUString('-')); + aFillCharCB.InsertEntry(OUString('_')); aButtonPositions[0] = aEntryNoPB.GetPosPixel(); aButtonPositions[1] = aEntryPB.GetPosPixel(); @@ -2347,7 +2346,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton) String sToInsert(aAuthFieldsLB.GetSelectEntry()); SwFormToken aInsert(TOKEN_AUTHORITY); aInsert.nAuthorityField = (sal_uInt16)(sal_uIntPtr)aAuthFieldsLB.GetEntryData(nSelPos); - aTokenWIN.InsertAtSelection(rtl::OUString::createFromAscii( + aTokenWIN.InsertAtSelection(OUString::createFromAscii( SwForm::aFormAuth), aInsert); aAuthFieldsLB.RemoveEntry(sToInsert); aAuthFieldsLB.SelectEntryPos( nSelPos ? nSelPos - 1 : 0); @@ -2579,7 +2578,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken) { aTabPosMF.SetValue(aTabPosMF.Normalize(pToken->nTabStopPosition), FUNIT_TWIP); aAutoRightCB.Check(SVX_TAB_ADJUST_END == pToken->eTabAlign); - aFillCharCB.SetText(rtl::OUString(pToken->cTabFillChar)); + aFillCharCB.SetText(OUString(pToken->cTabFillChar)); aTabPosFT.Enable(!aAutoRightCB.IsChecked()); aTabPosMF.Enable(!aAutoRightCB.IsChecked()); } @@ -2903,8 +2902,8 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) default:; //prevent warning } - InsertItem( pTmp ? rtl::OUString::createFromAscii(pTmp) - : rtl::OUString(), aToken ); + InsertItem( pTmp ? OUString::createFromAscii(pTmp) + : OUString(), aToken ); bLastWasText = false; } @@ -3327,9 +3326,9 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) const long nSpace = aCtrlParentWin.GetSizePixel().Width(); #if OSL_DEBUG_LEVEL > 1 //find all start/end positions and print it - String sMessage(rtl::OUString("Space: ")); + String sMessage(OUString("Space: ")); sMessage += OUString::number(nSpace); - sMessage += rtl::OUString(" | "); + sMessage += OUString(" | "); for (ctrl_const_iterator it = aControlList.begin(); it != aControlList.end(); ++it) { @@ -3339,9 +3338,9 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) long nDebugWidth = pDebugCtrl->GetSizePixel().Width(); sMessage += OUString::number( nDebugXPos ); - sMessage += rtl::OUString(" "); + sMessage += OUString(" "); sMessage += OUString::number(nDebugXPos + nDebugWidth); - sMessage += rtl::OUString(" | "); + sMessage += OUString(" | "); } #endif @@ -4116,7 +4115,7 @@ void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) AutoMarkEntry* pEntry = &aEntryArr[i]; if(pEntry->sComment.Len()) { - String sWrite = rtl::OUString('#'); + String sWrite = OUString('#'); sWrite += pEntry->sComment; rOutStr.WriteByteStringLine( sWrite, eTEnc ); } diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index f0069317db12..c5b5abf7a183 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -74,7 +74,6 @@ using namespace com::sun::star; using namespace com::sun::star::i18n; using namespace com::sun::star::lang; using namespace com::sun::star::util; -using ::rtl::OUString; using namespace ::comphelper; using namespace ::com::sun::star; diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx index 07ba3d950a98..82b5e9fbb38e 100644 --- a/sw/source/ui/lingu/hyp.cxx +++ b/sw/source/ui/lingu/hyp.cxx @@ -38,7 +38,6 @@ #define PSH (&pView->GetWrtShell()) using namespace ::com::sun::star; -using ::rtl::OUString; /*-------------------------------------------------------------------- Description: interactive separation diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 6745622568c1..4cd00b2c73bc 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -94,7 +94,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; extern void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ); @@ -203,7 +202,7 @@ void SwSpellPopup::fillLangPopupMenu( sal_uInt16 nLangItemIdStart, uno::Sequence< OUString > aSeq, SwWrtShell* pWrtSh, - std::map< sal_Int16, ::rtl::OUString > &rLangTable ) + std::map< sal_Int16, OUString > &rLangTable ) { if (!pPopupMenu) return; @@ -527,7 +526,7 @@ SwSpellPopup::SwSpellPopup( aKeyboardLang = aLanguageTable.GetString( nLang ); // get the language that is in use - String aCurrentLang = rtl::OUString("*"); + String aCurrentLang = OUString("*"); nLang = SwLangHelper::GetCurrentLanguage( *pWrtSh ); if (nLang != LANGUAGE_DONTKNOW) aCurrentLang = aLanguageTable.GetString( nLang ); @@ -682,7 +681,7 @@ aInfo16( SW_RES(IMG_INFO_16) ) aKeyboardLang = aLanguageTable.GetString( nLang ); // get the language that is in use - String aCurrentLang = rtl::OUString("*"); + String aCurrentLang = OUString("*"); nLang = SwLangHelper::GetCurrentLanguage( *pWrtSh ); if (nLang != LANGUAGE_DONTKNOW) aCurrentLang = aLanguageTable.GetString( nLang ); @@ -872,16 +871,16 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) { uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) ); - xSystemShellExecute->execute( sExplanationLink, rtl::OUString(), + xSystemShellExecute->execute( sExplanationLink, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); } catch (const uno::Exception&) { uno::Any exc( ::cppu::getCaughtException() ); - rtl::OUString msg( ::comphelper::anyToString( exc ) ); + OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; ErrorBox aErrorBox( NULL, WB_OK, msg ); - aErrorBox.SetText( rtl::OUString::createFromAscii( "Explanations" ) ); + aErrorBox.SetText( OUString::createFromAscii( "Explanations" ) ); aErrorBox.Execute(); } } diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx index a76beb2b5fed..3c55f5d45c2f 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.cxx +++ b/sw/source/ui/lingu/sdrhhcwrap.cxx @@ -43,7 +43,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; ////////////////////////////////////////////////////////////////////// diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 05ccf296c5bb..90a2d41e3d55 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -31,7 +31,7 @@ #include "IMark.hxx" #include "globals.hrc" -const String BookmarkCombo::aForbiddenChars = rtl::OUString("/\\@:*?\";,.#"); +const String BookmarkCombo::aForbiddenChars = OUString("/\\@:*?\";,.#"); IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) { @@ -227,7 +227,7 @@ long BookmarkCombo::PreNotify( NotifyEvent& rNEvt ) if( EVENT_KEYINPUT == rNEvt.GetType() && rNEvt.GetKeyEvent()->GetCharCode() ) { - rtl::OUString sKey( rNEvt.GetKeyEvent()->GetCharCode() ); + OUString sKey( rNEvt.GetKeyEvent()->GetCharCode() ); if(STRING_NOTFOUND != aForbiddenChars.Search(sKey)) nHandled = 1; } diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index c3ef20f16d40..4ecc12e743db 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -156,11 +156,11 @@ void SwGlossaryGroupDlg::Apply() for (OUVector_t::const_iterator it(m_RenamedArr.begin()); it != m_RenamedArr.end(); ++it) { - ::rtl::OUString const sOld( + OUString const sOld( ::comphelper::string::getToken(*it, 0, RENAME_TOKEN_DELIM)); String sNew( ::comphelper::string::getToken(*it, 1, RENAME_TOKEN_DELIM)); - ::rtl::OUString const sTitle( + OUString const sTitle( ::comphelper::string::getToken(*it, 2, RENAME_TOKEN_DELIM)); pGlosHdl->RenameGroup(sOld, sNew, sTitle); if (it == m_RenamedArr.begin()) @@ -239,7 +239,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) return 0; } GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); - ::rtl::OUString const sEntry(pUserData->sGroupName); + OUString const sEntry(pUserData->sGroupName); // if the name to be deleted is among the new ones - get rid of it bool bDelete = true; for (OUVector_t::iterator it(m_InsertedArr.begin()); diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index 46f214c21692..38be8d4c9476 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -78,7 +78,7 @@ static String lcl_CheckFileName( const String& rNewFilePath, { String rSG = SwGlossaries::GetExtension(); //generate generic name - utl::TempFile aTemp(rtl::OUString("group"), + utl::TempFile aTemp(OUString("group"), &rSG, &rNewFilePath ); aTemp.EnableKillingFile(); @@ -93,7 +93,7 @@ static String lcl_CheckFileName( const String& rNewFilePath, ------------------------------------------------------------------------*/ String SwGlossaries::GetDefName() { - return rtl::OUString("standard"); + return OUString("standard"); } @@ -475,7 +475,7 @@ void SwGlossaries::ShowError() String SwGlossaries::GetExtension() { - return rtl::OUString(".bau"); + return OUString(".bau"); } void SwGlossaries::RemoveFileFromList( const String& rGroup ) @@ -487,7 +487,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup ) { if (*it == rGroup) { - rtl::OUString aUName = rGroup; + OUString aUName = rGroup; { // tell the UNO AutoTextGroup object that it's not valid anymore for ( UnoAutoTextGroups::iterator aLoop = m_aGlossaryGroups.begin(); @@ -537,7 +537,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup ) } } -String SwGlossaries::GetCompleteGroupName( const rtl::OUString& GroupName ) +String SwGlossaries::GetCompleteGroupName( const OUString& GroupName ) { sal_uInt16 nCount = GetGroupCnt(); // when the group name was created internally the path is here as well @@ -590,7 +590,7 @@ void SwGlossaries::InvalidateUNOOjects() m_aGlossaryEntries.swap( aTmpe ); } -Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const ::rtl::OUString& _rGroupName, bool _bCreate ) +Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString& _rGroupName, bool _bCreate ) { // first, find the name with path-extension String sCompleteGroupName = GetCompleteGroupName( _rGroupName ); @@ -644,7 +644,7 @@ Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const ::rtl::O return xGroup; } -Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const String& _rCompleteGroupName, const ::rtl::OUString& _rGroupName, const ::rtl::OUString& _rEntryName, +Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const String& _rCompleteGroupName, const OUString& _rGroupName, const OUString& _rEntryName, bool _bCreate ) { //standard must be created diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 02fe69133241..b55516c8c069 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -78,7 +78,6 @@ using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::ui::dialogs; using namespace ::comphelper; using namespace ::ucbhelper; -using ::rtl::OUString; using namespace ::sfx2; static String lcl_GetValidShortCut( const String& rName ) @@ -92,7 +91,7 @@ static String lcl_GetValidShortCut( const String& rName ) while( rName.GetChar( nStart-1 ) == ' ' && nStart < nSz ) nStart++; - String aBuf = rtl::OUString(rName.GetChar(nStart-1)); + String aBuf = OUString(rName.GetChar(nStart-1)); for( ; nStart < nSz; ++nStart ) { @@ -568,7 +567,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) xFP->setDisplayDirectory(aPathOpt.GetWorkPath() ); uno::Reference xFltMgr(xFP, UNO_QUERY); - SfxFilterMatcher aMatcher( rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName()) ); + SfxFilterMatcher aMatcher( OUString::createFromAscii(SwDocShell::Factory().GetShortName()) ); SfxFilterMatcherIter aIter( aMatcher ); const SfxFilter* pFilter = aIter.First(); while ( pFilter ) diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 4a7b87e6d4b5..5aa6859f807a 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -55,17 +55,17 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) get(m_pNumberingOnCB, "shownumbering"); String sIntervalName = m_pDivIntervalFT->GetAccessibleName(); - sIntervalName += rtl::OUString("("); + sIntervalName += OUString("("); sIntervalName += m_pDivRowsFT->GetAccessibleName(); - sIntervalName += rtl::OUString(")"); + sIntervalName += OUString(")"); m_pDivIntervalNF->SetAccessibleName(sIntervalName); Window *pNumIntervalFT = get("interval"); Window *pNumRowsFT = get("intervallines"); sIntervalName = pNumIntervalFT->GetAccessibleName(); - sIntervalName += rtl::OUString("("); + sIntervalName += OUString("("); sIntervalName += pNumRowsFT->GetAccessibleName(); - sIntervalName += rtl::OUString(")"); + sIntervalName += OUString(")"); m_pNumIntervalNF->SetAccessibleName(sIntervalName); // char styles diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 7b0aa290f323..02335fd19f53 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -151,7 +151,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, // insert levels for(sal_uInt16 i = 1; i <= MAXLEVEL; i++) m_pLevelLB->InsertEntry(OUString::number(i)); - String sEntry(rtl::OUString("1 - ")); + String sEntry(OUString("1 - ")); sEntry += OUString::number(MAXLEVEL); m_pLevelLB->InsertEntry(sEntry); m_pLevelLB->SelectEntry(sEntry); diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index 8c2618bc4654..7b837f5a2fea 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star; -using ::rtl::OUString; struct SwNumberingTypeListBox_Impl { @@ -59,7 +58,7 @@ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, WinBits nStyle ) : pImpl->xInfo = uno::Reference(xDefNum, uno::UNO_QUERY); } -bool SwNumberingTypeListBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rValue) { if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("type"))) Reload(rValue.toInt32()); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index f460f79d6923..073b7acd7942 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -874,7 +874,7 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, aFont.SetSize(rSize); aFont.SetTransparent(sal_True); pVDev->SetFont( aFont ); - rtl::OUString aText(rFmt.GetBulletChar()); + OUString aText(rFmt.GetBulletChar()); pVDev->DrawText( Point(nXStart, nYStart), aText ); sal_uInt16 nRet = (sal_uInt16)pVDev->GetTextWidth(aText); @@ -1033,7 +1033,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ ) rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE ) { pVDev->SetFont(aStdFont); - rtl::OUString aText(' '); + OUString aText(' '); pVDev->DrawText( Point(nNumberXPos, nYStart), aText ); nBulletWidth = nBulletWidth + (sal_uInt16)pVDev->GetTextWidth(aText); } @@ -1140,7 +1140,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ ) Point(nXStart + nTextOffset, nYStart), (pOutlineNames == 0 ? utl::ConfigManager::getProductName() - : rtl::OUString(pOutlineNames[nLevel]))); + : OUString(pOutlineNames[nLevel]))); } } } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 4480b58d925c..695205758b2b 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -368,9 +368,9 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet) void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue ) { - String aFieldStr = rtl::OUString("( 1 -"); - aFieldStr += rtl::OUString::valueOf(nValue); - aFieldStr += rtl::OUString(" )"); + String aFieldStr = OUString("( 1 -"); + aFieldStr += OUString::valueOf(nValue); + aFieldStr += OUString(" )"); rField.SetText( aFieldStr ); } diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index 06b13574a0f4..a961620e71ef 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -1058,7 +1058,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) const_cast(rRedline).Broadcast(SwRedlineHint(&rRedline,SWREDLINE_FOCUS)); */ - rtl::OUString sComment = convertLineEnd(rRedline.GetComment(), GetSystemLineEnd()); + OUString sComment = convertLineEnd(rRedline.GetComment(), GetSystemLineEnd()); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); ::DialogGetRanges fnGetRange = pFact->GetDialogGetRangesFunc(); @@ -1154,7 +1154,7 @@ void SwRedlineAcceptDlg::Initialize(const String& rExtraData) { if (rExtraData.Len()) { - sal_uInt16 nPos = rExtraData.Search(rtl::OUString("AcceptChgDat:")); + sal_uInt16 nPos = rExtraData.Search(OUString("AcceptChgDat:")); // try to read the alignment string "ALIGN:(...)"; if none existing, // it's an old version diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 7855c879e11c..aba0a8e62d3a 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -65,7 +65,6 @@ static sal_Unicode cDeli = '\t'; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -using ::rtl::OUString; static void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) { @@ -223,7 +222,7 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) m_pDelimTabRB->Check(cDeli == '\t'); if(!m_pDelimTabRB->IsChecked()) { - m_pDelimEdt->SetText(rtl::OUString(cDeli)); + m_pDelimEdt->SetText(OUString(cDeli)); m_pDelimFreeRB->Check(sal_True); DelimHdl(m_pDelimFreeRB); } @@ -380,7 +379,7 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl) { SFX_ITEMSET_ARG( pMap->GetOutputItemSet(), pItem, SfxInt32Item, SID_ATTR_CHAR, sal_False ); if ( pItem ) - m_pDelimEdt->SetText( rtl::OUString(pItem->GetValue()) ); + m_pDelimEdt->SetText( OUString(pItem->GetValue()) ); } delete pMap; diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx index c125fd63cb30..20e75b067364 100644 --- a/sw/source/ui/ribbar/concustomshape.cxx +++ b/sw/source/ui/ribbar/concustomshape.cxx @@ -56,15 +56,15 @@ ConstCustomShape::ConstCustomShape( SwWrtShell* pWrtShell, SwEditWin* pEditWin, aCustomShape = ConstCustomShape::GetShapeTypeFromRequest( rReq ); } -rtl::OUString ConstCustomShape::GetShapeType() const +OUString ConstCustomShape::GetShapeType() const { return aCustomShape; } //static -rtl::OUString ConstCustomShape::GetShapeTypeFromRequest( SfxRequest& rReq ) +OUString ConstCustomShape::GetShapeTypeFromRequest( SfxRequest& rReq ) { - rtl::OUString aRet; + OUString aRet; const SfxItemSet* pArgs = rReq.GetArgs(); if ( pArgs ) { @@ -142,7 +142,7 @@ void ConstCustomShape::SetAttributes( SdrObject* pObj ) if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - std::vector< rtl::OUString > aObjList; + std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { sal_uInt16 i; diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index 96000789843c..af4b5cf972b9 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -223,7 +223,7 @@ void SwInputWindow::ShowWin() // Formel soll immer mit einem "=" beginnen, hier // also setzen - String sEdit = rtl::OUString('='); + String sEdit = OUString('='); if( pMgr->GetCurFld() && TYP_FORMELFLD == pMgr->GetCurTypeId() ) { sEdit += pMgr->GetCurFldPar2(); @@ -327,7 +327,7 @@ static const char * const aStrArr[] = { sal_uInt16 nId = pMenu->GetCurItemId(); if ( nId <= MN_CALC_ROUND ) { - String aTmp( rtl::OUString::createFromAscii(aStrArr[nId - 1]) ); + String aTmp( OUString::createFromAscii(aStrArr[nId - 1]) ); aTmp += ' '; aEdit.ReplaceSelected( aTmp ); } @@ -467,7 +467,7 @@ IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller ) void SwInputWindow::SetFormula( const String& rFormula, sal_Bool bDelFlag ) { - String sEdit = rtl::OUString('='); + String sEdit = OUString('='); if( rFormula.Len() ) { if( '=' == rFormula.GetChar( 0 ) ) @@ -558,7 +558,7 @@ void InputEdit::UpdateRange(const String& rBoxes, const sal_uInt16 nLen = aActText.Len(); if( !nLen ) { - String aStr = rtl::OUStringBuffer(). + String aStr = OUStringBuffer(). append(cOpen).append(aBoxes).append(cClose). makeStringAndClear(); SetText(aStr); @@ -610,7 +610,7 @@ void InputEdit::UpdateRange(const String& rBoxes, } else { - rtl::OUString aTmp = rtl::OUStringBuffer(). + OUString aTmp = OUStringBuffer(). append(cOpen).append(aBoxes).append(cClose). makeStringAndClear(); nPos = (sal_uInt16)aSelection.Min(); diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index cb8fbe4996e3..39db4ccc7362 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -51,7 +51,6 @@ #error SwScrollNaviPopup-CTOR static Array falsche Size. Wurden neue IDs zugefuegt ?? #endif -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -77,8 +76,8 @@ SwTbxInsertCtrl::~SwTbxInsertCtrl() void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException) { ToolBox& rTbx = GetToolBox(); - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nLastSlotId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nLastSlotId )); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); rTbx.SetItemImage(GetId(), aImage); @@ -103,8 +102,8 @@ void SwTbxInsertCtrl::StateChanged( sal_uInt16 /*nSID*/, if( nLastSlotId ) nId = nLastSlotId; - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nId )); ToolBox& rBox = GetToolBox(); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); rBox.SetItemImage(GetId(), aImage); @@ -296,7 +295,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu) default: pChar = ".uno:InsertFieldCtrl"; } - Dispatch( rtl::OUString::createFromAscii( pChar ),aArgs ); + Dispatch( OUString::createFromAscii( pChar ),aArgs ); } else { @@ -500,11 +499,11 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet) SfxBoolItem aNext(FN_SCROLL_NEXT_PREV, NID_NEXT == nSet); Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ScrollNextPrev" ); + aArgs[0].Name = OUString( "ScrollNextPrev" ); aNext.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ), - rtl::OUString( ".uno:ScrollNextPrev" ), + OUString( ".uno:ScrollNextPrev" ), aArgs ); } return 0; @@ -681,12 +680,12 @@ void SwZoomBox_Impl::Select() { Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "PreviewZoom" ); + aArgs[0].Name = OUString( "PreviewZoom" ); aItem.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( m_xDispatchProvider, - rtl::OUString( ".uno:PreviewZoom" ), + OUString( ".uno:PreviewZoom" ), aArgs ); } diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index c425a66e4d78..8dd405e82ab0 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -340,7 +340,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break; case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break; } - pOLV->InsertText( rtl::OUString(cIns)); + pOLV->InsertText( OUString(cIns)); rReq.Done(); break; } @@ -1128,7 +1128,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog") + OUString("com.sun.star.linguistic2.ChineseTranslationDialog") , xContext), UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) @@ -1138,7 +1138,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) Sequence aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = rtl::OUString("ParentWindow"); + aParam.Name = OUString("ParentWindow"); aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); @@ -1454,7 +1454,7 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet) { if( pUndoManager ) { - rtl::OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const; + OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const; sal_uInt16 nCount; if( SID_GETUNDOSTRINGS == nWhich ) diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index c36def954fff..2f200e0568b9 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -848,7 +848,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) if( SfxRequest::HasMacroRecorder(pViewFrame) ) { SfxRequest aReq( pViewFrame, nSlot); - aReq.AppendItem( SfxStringItem( FN_PARAM_1, rtl::OUString(cDelim) )); + aReq.AppendItem( SfxStringItem( FN_PARAM_1, OUString(cDelim) )); if(bToTable) { if(pTAFmt) @@ -1921,7 +1921,7 @@ SwBaseShell::SwBaseShell(SwView& rVw) : SwWrtShell& rWrtSh = rView.GetWrtShell(); SetPool(&rWrtSh.GetAttrPool()); - SetName(rtl::OUString("Base")); + SetName(OUString("Base")); rWrtSh.SetGrfArrivedLnk( LINK( this, SwBaseShell, GraphicArrivedHdl)); } diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx index d2a17b268524..a5948bd1fec4 100644 --- a/sw/source/ui/shells/beziersh.cxx +++ b/sw/source/ui/shells/beziersh.cxx @@ -53,7 +53,7 @@ TYPEINIT1(SwBezierShell,SwBaseShell) SwBezierShell::SwBezierShell(SwView &_rView): SwBaseShell( _rView ) { - SetName(rtl::OUString("Bezier")); + SetName(OUString("Bezier")); SetHelpId(SW_BEZIERSHELL); SwWrtShell *pSh = &GetShell(); diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index a47eba8ab026..eb402f7a5e95 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -352,7 +352,7 @@ SwDrawShell::SwDrawShell(SwView &_rView) : SwDrawBaseShell(_rView) { SetHelpId(SW_DRAWSHELL); - SetName(rtl::OUString("Draw")); + SetName(OUString("Draw")); } /************************************************************************* diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx index b92a3d74246e..f2c6a79195a1 100644 --- a/sw/source/ui/shells/drformsh.cxx +++ b/sw/source/ui/shells/drformsh.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFORM)) { @@ -122,7 +121,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq) { uno::Any aTmp; // Ja! - ::rtl::OUString sLabel("Label"); + OUString sLabel("Label"); if( xPropInfoSet->hasPropertyByName(sLabel) ) { aTmp <<= OUString(rHLinkItem.GetName()); @@ -252,7 +251,7 @@ SwDrawFormShell::SwDrawFormShell(SwView &_rView) : { SetHelpId(SW_DRAWFORMSHELL); GetShell().NoEdit(true); - SetName(rtl::OUString("DrawForm")); + SetName(OUString("DrawForm")); } SwDrawFormShell::~SwDrawFormShell() diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index d0d6f12e5123..5601cc940b5f 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -129,7 +129,7 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) : Init(); rSh.NoEdit(true); - SetName(rtl::OUString("ObjectText")); + SetName(OUString("ObjectText")); SetHelpId(SW_DRWTXTSHELL); } @@ -328,7 +328,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog") + OUString("com.sun.star.linguistic2.ChineseTranslationDialog") , xContext), UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) @@ -338,7 +338,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq) Sequence aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = rtl::OUString("ParentWindow"); + aParam.Name = OUString("ParentWindow"); aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); @@ -419,7 +419,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq) case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break; case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break; } - pOLV->InsertText( rtl::OUString(cIns)); + pOLV->InsertText( OUString(cIns)); rReq.Done(); } break; @@ -576,7 +576,7 @@ void SwDrawTextShell::StateUndo(SfxItemSet &rSet) ::svl::IUndoManager* pUndoManager = GetUndoManager(); if( pUndoManager ) { - rtl::OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const; + OUString (::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const; sal_uInt16 nCount; if( SID_GETUNDOSTRINGS == nWhich ) diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index f8725d6caec8..ece47193fb01 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -869,7 +869,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) SwFrameShell::SwFrameShell(SwView &_rView) : SwBaseShell( _rView ) { - SetName(rtl::OUString("Frame")); + SetName(OUString("Frame")); SetHelpId(SW_FRAMESHELL); /* #96392# Use this to announce it is the frame shell who creates the diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index f29eb7486221..555cad4a2d51 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -737,7 +737,7 @@ SwGrfShell::SwGrfShell(SwView &_rView) : SwBaseShell(_rView) { - SetName(rtl::OUString("Graphic")); + SetName(OUString("Graphic")); SetHelpId(SW_GRFSHELL); } diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx index 428c91bee035..d00ec0e89a2c 100644 --- a/sw/source/ui/shells/grfshex.cxx +++ b/sw/source/ui/shells/grfshex.cxx @@ -58,11 +58,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ui::dialogs; using namespace ::sfx2; -using ::rtl::OUString; bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) { - ::rtl::OUString aURL; + OUString aURL; const SfxItemSet* pReqArgs = rReq.GetArgs(); Window* pWindow = &GetView().GetViewFrame()->GetWindow(); bool bAPI = false, bRet = false; @@ -123,7 +122,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) else aSize = Size( 2835, 2835 ); - ::rtl::OUString realURL; + OUString realURL; if (bLink) { realURL = aURL; diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index 01c14facd349..b8d503caad29 100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx @@ -82,14 +82,14 @@ namespace SwLangHelper aKeyboardLang = aLangTable.GetString( nLang ); // get the language that is in use - String aCurrentLang = rtl::OUString("*"); + String aCurrentLang = OUString("*"); SfxItemSet aSet(pOLV->GetAttribs()); nLang = SwLangHelper::GetCurrentLanguage( aSet,nScriptType ); if (nLang != LANGUAGE_DONTKNOW) aCurrentLang = aLangTable.GetString( nLang ); // build sequence for status value - uno::Sequence< ::rtl::OUString > aSeq( 4 ); + uno::Sequence< OUString > aSeq( 4 ); aSeq[0] = aCurrentLang; aSeq[1] = aScriptTypesInUse; aSeq[2] = aKeyboardLang; @@ -138,11 +138,11 @@ namespace SwLangHelper // setting the new language... if (aNewLangTxt.Len() > 0) { - const rtl::OUString aSelectionLangPrefix("Current_"); - const rtl::OUString aParagraphLangPrefix("Paragraph_"); - const rtl::OUString aDocumentLangPrefix("Default_"); - const String aStrNone( rtl::OUString("LANGUAGE_NONE") ); - const String aStrResetLangs( rtl::OUString("RESET_LANGUAGES") ); + const OUString aSelectionLangPrefix("Current_"); + const OUString aParagraphLangPrefix("Paragraph_"); + const OUString aDocumentLangPrefix("Default_"); + const String aStrNone( OUString("LANGUAGE_NONE") ); + const String aStrResetLangs( OUString("RESET_LANGUAGES") ); xub_StrLen nPos = 0; bool bForSelection = true; diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index e1d970bd0271..30c2644d8a93 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -269,7 +269,7 @@ void SwListShell::GetState(SfxItemSet &rSet) SwListShell::SwListShell(SwView &_rView) : SwBaseShell(_rView) { - SetName(rtl::OUString("List")); + SetName(OUString("List")); SetHelpId(SW_LISTSHELL); } diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index 85cd1e535f53..5de6dfee7030 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.cxx @@ -190,7 +190,7 @@ SwMediaShell::SwMediaShell(SwView &_rView) : SwBaseShell(_rView) { - SetName(rtl::OUString("Media Playback")); + SetName(OUString("Media Playback")); SetHelpId(SW_MEDIASHELL); } diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx index 3cff898e025e..d6dcfc6dbdc0 100644 --- a/sw/source/ui/shells/navsh.cxx +++ b/sw/source/ui/shells/navsh.cxx @@ -66,7 +66,7 @@ SwNavigationShell::SwNavigationShell(SwView &_rView): SwBaseShell( _rView ) { - SetName(rtl::OUString("Navigation")); + SetName(OUString("Navigation")); SetHelpId(SW_NAVIGATIONSHELL); } diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx index 8b06595c6ec5..b155637d92f5 100644 --- a/sw/source/ui/shells/olesh.cxx +++ b/sw/source/ui/shells/olesh.cxx @@ -49,7 +49,7 @@ SwOleShell::SwOleShell(SwView &_rView) : SwFrameShell(_rView) { - SetName(rtl::OUString("Object")); + SetName(OUString("Object")); SetHelpId(SW_OLESHELL); } diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 5d3360752c1d..43c57935c176 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -1345,7 +1345,7 @@ void SwTableShell::GetState(SfxItemSet &rSet) SwTableShell::SwTableShell(SwView &_rView) : SwBaseShell(_rView) { - SetName(rtl::OUString("Table")); + SetName(OUString("Table")); SetHelpId(SW_TABSHELL); } diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index 231765b699b9..7438965838ec 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -40,7 +40,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, const String& rTxt) { @@ -109,7 +108,7 @@ void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, con { // #105638# OJ aTmp <<= sal_True; - xPropSet->setPropertyValue( rtl::OUString( "DispatchURLInternal" ), aTmp ); + xPropSet->setPropertyValue( OUString( "DispatchURLInternal" ), aTmp ); } } diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 81dc574f5be7..b0997d745bbe 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -402,7 +402,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) if (pRedline) { - rtl::OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd()); + OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd()); sal_Bool bTravel = sal_False; @@ -492,7 +492,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) case FN_JAVAEDIT: { - rtl::OUString aType, aText; + OUString aType, aText; sal_Bool bIsUrl=sal_False; sal_Bool bNew=sal_False; bool bUpdate = false; @@ -801,7 +801,7 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn ) pSh->SwapPam(); pRedline = pSh->GetCurrRedline(); - rtl::OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd()); + OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd()); pDlg->SetNote(sComment); pDlg->ShowLastAuthor( pRedline->GetAuthorString(), @@ -848,7 +848,7 @@ IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog *, pBtn ) pDlg->EnableTravel(sal_True, bEnable); pRedline = pSh->GetCurrRedline(); - rtl::OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd()); + OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd()); pDlg->SetNote(sComment); pDlg->ShowLastAuthor(pRedline->GetAuthorString(), diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index b106ceb1fdea..e41a40b04275 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -102,7 +102,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; #include #include @@ -148,7 +147,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case FN_INSERT_SOFT_HYPHEN: if( CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( sal_True, 0 ) && CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( sal_True, -1 )) - rSh.Insert( rtl::OUString( CHAR_SOFTHYPHEN ) ); + rSh.Insert( OUString( CHAR_SOFTHYPHEN ) ); break; case FN_INSERT_HARDHYPHEN: @@ -165,7 +164,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) ChgToEnEmDash | SetINetAttr | Autocorrect )) rSh.AutoCorrect( *pACorr, cIns ); else - rSh.Insert( rtl::OUString( cIns ) ); + rSh.Insert( OUString( cIns ) ); } break; case SID_INSERT_RLM : @@ -181,7 +180,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case SID_INSERT_ZWSP : cIns = CHAR_ZWSP ; break; case SID_INSERT_ZWNBSP: cIns = CHAR_ZWNBSP; break; } - rSh.Insert( rtl::OUString( cIns ) ); + rSh.Insert( OUString( cIns ) ); } break; case FN_INSERT_BREAK: @@ -226,7 +225,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) if ( pURL->SetURL( aStrURL, INetURLObject::WAS_ENCODED ) ) { - ::rtl::OUString aName; + OUString aName; comphelper::EmbeddedObjectContainer aCnt; svt::EmbeddedObjectRef xObj( aCnt.CreateEmbeddedObject( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence(), aName ), embed::Aspects::MSOLE_CONTENT ); if ( xObj.is() ) @@ -237,8 +236,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString("PluginURL"), - uno::makeAny( ::rtl::OUString( pURL->GetMainURL( INetURLObject::NO_DECODE ) ) ) ); + xSet->setPropertyValue( OUString("PluginURL"), + uno::makeAny( OUString( pURL->GetMainURL( INetURLObject::NO_DECODE ) ) ) ); } } @@ -278,7 +277,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) { comphelper::EmbeddedObjectContainer aCnt; - ::rtl::OUString sName; + OUString sName; xObj.Assign( aCnt.CreateEmbeddedObject( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence(), sName ), embed::Aspects::MSOLE_CONTENT ); svt::EmbeddedObjectRef::TryRunningState( xObj.GetObject() ); @@ -288,9 +287,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) try { if ( sClassLocation.Len() ) - xSet->setPropertyValue( ::rtl::OUString("PluginURL"), + xSet->setPropertyValue( OUString("PluginURL"), uno::makeAny( - ::rtl::OUString( + OUString( URIHelper::SmartRel2Abs( INetURLObject(), sClassLocation, URIHelper::GetMaybeFileHdl()) ) ) ); @@ -298,7 +297,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) if ( aCommandList.size() ) { aCommandList.FillSequence( aSeq ); - xSet->setPropertyValue( ::rtl::OUString("PluginCommands"), uno::makeAny( aSeq ) ); + xSet->setPropertyValue( OUString("PluginCommands"), uno::makeAny( aSeq ) ); } } catch (const uno::Exception&) @@ -330,7 +329,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) if(pURLItem) // URL is a _must_ { comphelper::EmbeddedObjectContainer aCnt; - ::rtl::OUString aName; + OUString aName; xObj.Assign( aCnt.CreateEmbeddedObject( SvGlobalName( SO3_IFRAME_CLASSID ).GetByteSequence(), aName ), embed::Aspects::MSOLE_CONTENT ); svt::EmbeddedObjectRef::TryRunningState( xObj.GetObject() ); @@ -348,27 +347,27 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) aMargin = pMarginItem->GetSize(); if ( pURLItem ) - xSet->setPropertyValue( ::rtl::OUString("FrameURL"), uno::makeAny( ::rtl::OUString( pURLItem->GetValue() ) ) ); + xSet->setPropertyValue( OUString("FrameURL"), uno::makeAny( OUString( pURLItem->GetValue() ) ) ); if ( pNameItem ) - xSet->setPropertyValue( ::rtl::OUString("FrameName"), uno::makeAny( ::rtl::OUString( pNameItem->GetValue() ) ) ); + xSet->setPropertyValue( OUString("FrameName"), uno::makeAny( OUString( pNameItem->GetValue() ) ) ); if ( eScroll == ScrollingAuto ) - xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"), + xSet->setPropertyValue( OUString("FrameIsAutoScroll"), uno::makeAny( sal_True ) ); else - xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"), + xSet->setPropertyValue( OUString("FrameIsScrollingMode"), uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) ); if ( pBorderItem ) - xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"), + xSet->setPropertyValue( OUString("FrameIsBorder"), uno::makeAny( (sal_Bool) pBorderItem->GetValue() ) ); if ( pMarginItem ) { - xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"), + xSet->setPropertyValue( OUString("FrameMarginWidth"), uno::makeAny( sal_Int32( aMargin.Width() ) ) ); - xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"), + xSet->setPropertyValue( OUString("FrameMarginHeight"), uno::makeAny( sal_Int32( aMargin.Height() ) ) ); } } @@ -912,7 +911,7 @@ void SwTextShell::ExecRotateTransliteration( SfxRequest & rReq ) SwTextShell::SwTextShell(SwView &_rView) : SwBaseShell(_rView), pPostItFldMgr( 0 ) { - SetName(rtl::OUString("Text")); + SetName(OUString("Text")); SetHelpId(SW_TEXTSHELL); } diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index e5afbb385a13..f0c07c7476cf 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -318,11 +318,11 @@ void SwTextShell::Execute(SfxRequest &rReq) // setting the new language... if (aNewLangTxt.Len() > 0) { - const rtl::OUString aSelectionLangPrefix("Current_"); - const rtl::OUString aParagraphLangPrefix("Paragraph_"); - const rtl::OUString aDocumentLangPrefix("Default_"); - const String aStrNone( rtl::OUString("LANGUAGE_NONE") ); - const String aStrResetLangs( rtl::OUString("RESET_LANGUAGES") ); + const OUString aSelectionLangPrefix("Current_"); + const OUString aParagraphLangPrefix("Paragraph_"); + const OUString aDocumentLangPrefix("Default_"); + const String aStrNone( OUString("LANGUAGE_NONE") ); + const String aStrResetLangs( OUString("RESET_LANGUAGES") ); SfxItemSet aCoreSet( GetPool(), RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE, @@ -564,7 +564,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { if ( pItem ) { - ::rtl::OUString sName = ((SfxStringItem*)pItem)->GetValue(); + OUString sName = ((SfxStringItem*)pItem)->GetValue(); rWrtSh.SetBookmark( KeyCode(), sName, aEmptyStr ); } else @@ -1321,13 +1321,13 @@ void SwTextShell::GetState( SfxItemSet &rSet ) aKeyboardLang = aLangTable.GetString( nLang ); // get the language that is in use - String aCurrentLang = rtl::OUString("*"); + String aCurrentLang = OUString("*"); nLang = SwLangHelper::GetCurrentLanguage( rSh ); if (nLang != LANGUAGE_DONTKNOW) aCurrentLang = aLangTable.GetString( nLang ); // build sequence for status value - uno::Sequence< ::rtl::OUString > aSeq( 4 ); + uno::Sequence< OUString > aSeq( 4 ); aSeq[0] = aCurrentLang; aSeq[1] = aScriptTypesInUse; aSeq[2] = aKeyboardLang; @@ -1573,7 +1573,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) break; case SID_OPEN_SMARTTAGMENU: { - uno::Sequence< rtl::OUString > aSmartTagTypes; + uno::Sequence< OUString > aSmartTagTypes; uno::Sequence< uno::Reference< container::XStringKeyMap > > aStringKeyMaps; uno::Reference xRange; @@ -1591,8 +1591,8 @@ void SwTextShell::GetState( SfxItemSet &rSet ) uno::Reference xController = GetView().GetController(); const lang::Locale aLocale( SW_BREAKITER()->GetLocale( GetAppLanguageTag() ) ); - const rtl::OUString aApplicationName( rSmartTagMgr.GetApplicationName() ); - const rtl::OUString aRangeText = xRange->getString(); + const OUString aApplicationName( rSmartTagMgr.GetApplicationName() ); + const OUString aRangeText = xRange->getString(); const SvxSmartTagItem aItem( nWhich, aActionComponentsSequence, diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index 46868899508a..8adea0bb43d3 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -87,7 +87,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) const SfxItemSet *pArgs = rReq.GetArgs(); SwNewDBMgr* pNewDBMgr = GetShell().GetNewDBMgr(); sal_uInt16 nSlot = rReq.GetSlot(); - ::rtl::OUString sSourceArg, sCommandArg; + OUString sSourceArg, sCommandArg; sal_Int32 nCommandTypeArg = 0; const SfxPoolItem* pSourceItem = 0; @@ -194,7 +194,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) pArgs->GetItemState(FN_DB_COLUMN_ANY, sal_False, &pColumnItem); pArgs->GetItemState(FN_DB_DATA_COLUMN_NAME_ANY, sal_False, &pColumnNameItem); - ::rtl::OUString sColumnName; + OUString sColumnName; if(pColumnNameItem) ((SfxUsrAnyItem*)pColumnNameItem)->GetValue() >>= sColumnName; String sDBName = sSourceArg; diff --git a/sw/source/ui/smartmenu/stmenu.cxx b/sw/source/ui/smartmenu/stmenu.cxx index cc03f718d448..b77f7b660eca 100644 --- a/sw/source/ui/smartmenu/stmenu.cxx +++ b/sw/source/ui/smartmenu/stmenu.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView, - Sequence< rtl::OUString >& rSmartTagTypes, + Sequence< OUString >& rSmartTagTypes, Sequence< Reference< container::XStringKeyMap > >& rStringKeyMaps, Reference< text::XTextRange > xTextRange ) : PopupMenu( SW_RES(MN_SMARTTAG_POPUP) ), @@ -49,10 +49,10 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView, sal_uInt16 nMenuId = 1; sal_uInt16 nSubMenuId = MN_ST_INSERT_START; - const rtl::OUString aRangeText = mxTextRange->getString(); + const OUString aRangeText = mxTextRange->getString(); SmartTagMgr& rSmartTagMgr = SwSmartTagMgr::Get(); - const rtl::OUString aApplicationName( rSmartTagMgr.GetApplicationName() ); + const OUString aApplicationName( rSmartTagMgr.GetApplicationName() ); Sequence < Sequence< Reference< smarttags::XSmartTagAction > > > aActionComponentsSequence; Sequence < Sequence< sal_Int32 > > aActionIndicesSequence; @@ -81,8 +81,8 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView, continue; const sal_Int32 nSmartTagIndex = rActionIndices[0]; - const rtl::OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex ); - const rtl::OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, aLocale ); + const OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex ); + const OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, aLocale ); // no sub-menus if there's only one smart tag type listed: PopupMenu* pSbMenu = this; @@ -94,7 +94,7 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView, } // sub-menu starts with smart tag caption and separator - const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + ": " + aRangeText; + const OUString aSmartTagCaption2 = aSmartTagCaption + ": " + aRangeText; nSubMenuPos = 0; pSbMenu->InsertItem(nMenuId++, aSmartTagCaption2, MIB_NOSELECT, OString(), nSubMenuPos++); pSbMenu->InsertSeparator(OString(), nSubMenuPos++); @@ -107,12 +107,12 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView, for ( sal_Int32 k = 0; k < xAction->getActionCount( aSmartTagType, xController ); ++k ) { const sal_uInt32 nActionID = xAction->getActionID( aSmartTagType, k, xController ); - rtl::OUString aActionCaption = xAction->getActionCaptionFromID( nActionID, + OUString aActionCaption = xAction->getActionCaptionFromID( nActionID, aApplicationName, aLocale, xSmartTagProperties, aRangeText, - rtl::OUString(), + OUString(), xController, mxTextRange ); @@ -159,7 +159,7 @@ sal_uInt16 SwSmartTagPopup::Execute( const Rectangle& rWordPos, Window* pWin ) mxTextRange, maInvokeActions[ nId ].mxSmartTagProperties, mxTextRange->getString(), - rtl::OUString(), + OUString(), SW_BREAKITER()->GetLocale( GetAppLanguageTag() ) ); } } diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index 81b553853e3d..933a1d85d124 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; @@ -183,7 +182,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) { uno::Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - ::rtl::OUString("com.sun.star.comp.chart2.WizardDialog") + OUString("com.sun.star.comp.chart2.WizardDialog") , xContext), uno::UNO_QUERY); uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY ); if( xInit.is() ) @@ -193,10 +192,10 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) uno::Sequence aSeq(2); uno::Any* pArray = aSeq.getArray(); beans::PropertyValue aParam1; - aParam1.Name = ::rtl::OUString("ParentWindow"); + aParam1.Name = OUString("ParentWindow"); aParam1.Value <<= uno::makeAny(xDialogParentWindow); beans::PropertyValue aParam2; - aParam2.Name = ::rtl::OUString("ChartModel"); + aParam2.Name = OUString("ChartModel"); aParam2.Value <<= uno::makeAny(xChartModel); pArray[0] <<= uno::makeAny(aParam1); pArray[1] <<= uno::makeAny(aParam2); @@ -210,7 +209,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) { //get dialog size: awt::Size aDialogAWTSize; - if( xDialogProps->getPropertyValue( ::rtl::OUString("Size") ) + if( xDialogProps->getPropertyValue( OUString("Size") ) >>= aDialogAWTSize ) { Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height ); @@ -222,7 +221,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings ) aSwRect = pFlyFrmFmt->GetAnchoredObj()->GetObjRectWithSpaces(); Rectangle aRect( aSwRect.SVRect() ); Point aDialogPos = SwGetChartDialogPos( &rWrtShell.GetView().GetEditWin(), aDialogSize, aRect ); - xDialogProps->setPropertyValue( ::rtl::OUString("Position"), + xDialogProps->setPropertyValue( OUString("Position"), uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) ); } } diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index d2ea4ca991dd..b05a588ab92e 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -132,7 +132,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) case 3: mpOtherBtn->Check(); if(uOther) - mpOtherEd->SetText(rtl::OUString(uOther)); + mpOtherEd->SetText(OUString(uOther)); break; } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index bdc45f99268a..bda054f21a85 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -863,7 +863,7 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox ) } for( sal_uInt16 i = 0; (i < nNoOfVisibleCols ) && ( i < MET_FIELDS); i++ ) { - String sEntry = rtl::OUString('~'); + String sEntry = OUString('~'); String sIndex = OUString::number( aValueTbl[i] + 1 ); sEntry += sIndex; m_pTextArr[i]->SetText( sEntry ); diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/ui/table/tablemgr.cxx index bde1c3b4dcd5..9bfe0a932464 100644 --- a/sw/source/ui/table/tablemgr.cxx +++ b/sw/source/ui/table/tablemgr.cxx @@ -200,7 +200,7 @@ void SwTableFUNC::UpdateChart() uno::Reference< frame::XModel > SwTableFUNC::InsertChart( uno::Reference< chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, - const rtl::OUString &rCellRange, + const OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt ) { uno::Reference< frame::XModel > xChartModel; @@ -223,7 +223,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( } // insert chart - ::rtl::OUString aObjName; + OUString aObjName; comphelper::EmbeddedObjectContainer aCnt; uno::Reference < embed::XEmbeddedObject > xObj = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aObjName ); @@ -303,16 +303,16 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString("CellRangeRepresentation"), -1, + OUString("CellRangeRepresentation"), -1, uno::makeAny( rCellRange ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString("HasCategories"), -1, + OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString("FirstCellAsLabel"), -1, + OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString("DataRowSource"), -1, + OUString("DataRowSource"), -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xDataReceiver->setArguments( aArgs ); } diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 6506dfdaac25..de217bc56a49 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1175,7 +1175,7 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): mbResetFormDesignMode( false ), mbFormDesignModeToReset( false ) { - SetName(rtl::OUString("PageView" )); + SetName(OUString("PageView" )); SetWindow( &aViewWin ); SetHelpId(SW_PAGEPREVIEW); _CreateScrollbar( sal_True ); diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 9a345c6458a0..1405cd46d190 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -94,7 +94,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ui::dialogs; using namespace ::sfx2; -using ::rtl::OUString; using ::com::sun::star::util::SearchOptions; @@ -162,7 +161,7 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1 { aFont.SetWeight( WEIGHT_NORMAL ); rOutDev.SetFont( aFont ); - String aPageStr( rtl::OUString(" [") ); + String aPageStr( OUString(" [") ); aPageStr += String( SW_RES( STR_PAGE ) ); aPageStr += ' '; aPageStr += OUString::number( nCurPage ); @@ -204,7 +203,7 @@ static void lcl_ConvertTabsToSpaces( String& rLine ) if ( rLine.GetChar(nPos) == '\t' ) { // Nicht 4 Blanks, sondern an 4er TabPos: - rtl::OUStringBuffer aBlanker; + OUStringBuffer aBlanker; comphelper::string::padToLength(aBlanker, ( 4 - ( nPos % 4 ) ), ' '); rLine.Erase( nPos, 1 ); rLine.Insert(aBlanker.makeStringAndClear(), nPos); @@ -236,7 +235,7 @@ SwSrcView::~SwSrcView() pDocShell->GetModel(), uno::UNO_QUERY_THROW); uno::Reference xDocProps = xDPS->getDocumentProperties(); - ::rtl::OUString url = xDocProps->getAutoloadURL(); + OUString url = xDocProps->getAutoloadURL(); sal_Int32 delay = xDocProps->getAutoloadSecs(); pDocShell->SetAutoLoad(INetURLObject(url), delay, (delay != 0) || !url.isEmpty()); @@ -254,7 +253,7 @@ void SwSrcView::SaveContentTo(SfxMedium& rMed) void SwSrcView::Init() { SetHelpId(SW_SRC_VIEWSHELL); - SetName(rtl::OUString("Source")); + SetName(OUString("Source")); SetWindow( &aEditWin ); SwDocShell* pDocShell = GetDocShell(); // wird das Doc noch geladen, dann muss die DocShell das Load @@ -304,7 +303,7 @@ void SwSrcView::Execute(SfxRequest& rReq) // search for an html filter for export SfxFilterContainer* pFilterCont = GetObjectShell()->GetFactory().GetFilterContainer(); const SfxFilter* pFilter = - pFilterCont->GetFilter4Extension( rtl::OUString("html"), SFX_FILTER_EXPORT ); + pFilterCont->GetFilter4Extension( OUString("html"), SFX_FILTER_EXPORT ); if ( pFilter ) { // filter found -> use its uiname and wildcard @@ -316,8 +315,8 @@ void SwSrcView::Execute(SfxRequest& rReq) else { // filter not found - rtl::OUString sHtml("HTML"); - xFltMgr->appendFilter( sHtml, rtl::OUString("*.html;*.htm") ); + OUString sHtml("HTML"); + xFltMgr->appendFilter( sHtml, OUString("*.html;*.htm") ); xFltMgr->setCurrentFilter( sHtml ) ; } @@ -446,7 +445,7 @@ void SwSrcView::GetState(SfxItemSet& rSet) String aPos( SW_RES(STR_SRCVIEW_ROW) ); TextSelection aSel = pTextView->GetSelection(); aPos += OUString::number( aSel.GetEnd().GetPara()+1 ); - aPos += rtl::OUString(" : "); + aPos += OUString(" : "); aPos += String(SW_RES(STR_SRCVIEW_COL)); aPos += OUString::number( aSel.GetEnd().GetIndex()+1 ); SfxStringItem aItem( nWhich, aPos ); @@ -704,7 +703,7 @@ sal_Int32 SwSrcView::PrintSource( // nLinepPage stimmt nicht, wenn Zeilen umgebrochen werden muessen... sal_uInt16 nLinespPage = (sal_uInt16) (aPaperSz.Height() / nLineHeight); - sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pOutDev->GetTextWidth(rtl::OUString('X'))); + sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pOutDev->GetTextWidth(OUString('X'))); sal_uInt16 nParas = static_cast< sal_uInt16 >( pTextEngine->GetParagraphCount() ); sal_uInt16 nPages = (sal_uInt16) (nParas / nLinespPage + 1 ); diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 13a577824dfb..2b8d883513b2 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -112,8 +112,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::scanner; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; extern bool bNoInterrupt; // in mainwn.cxx @@ -765,7 +763,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) _CreateScrollbar( sal_False ); m_pViewImpl = new SwView_Impl(this); - SetName(rtl::OUString("View")); + SetName(OUString("View")); SetWindow( m_pEditWin ); m_aTimer.SetTimeout( 120 ); @@ -1499,7 +1497,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe beans::PropertyValue *pValue = rSequence.getArray(); sal_uInt16 nViewID( GetViewFrame()->GetCurViewId()); - pValue->Name = rtl::OUString( "ViewId" ); + pValue->Name = OUString( "ViewId" ); OUStringBuffer sBuffer ( OUString( "view" ) ); ::sax::Converter::convertNumber(sBuffer, static_cast(nViewID)); pValue->Value <<= sBuffer.makeStringAndClear(); diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index d43bece4d415..6863ced87f3b 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -69,7 +69,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; #include @@ -498,7 +497,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq) pOpt->SetOnlineSpell(bSet); { uno::Any aVal( &bSet, ::getCppuBooleanType() ); - rtl::OUString aPropName(UPN_IS_SPELL_AUTO); + OUString aPropName(UPN_IS_SPELL_AUTO); SvtLinguConfig aCfg; aCfg.SetProperty( aPropName, aVal ); diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index e65b1427d191..981d7df778cc 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -137,7 +137,6 @@ const char sStatusDelim[] = " : "; const char sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," add by zhaojianwei -using ::rtl::OUString; using namespace sfx2; using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; @@ -227,7 +226,7 @@ int SwView::InsertGraphic( const String &rPath, const String &rFilter, INetURLObject aTemp( pDocSh->HasName() ? pDocSh->GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) : - rtl::OUString()); + OUString()); String sURL = URIHelper::SmartRel2Abs( aTemp, rPath, URIHelper::GetMaybeFileHdl() ); @@ -1256,7 +1255,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) } const sal_uInt32 stringId = selectionStats.nWord? STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION; - rtl::OUString wordCount(SW_RES(stringId)); + OUString wordCount(SW_RES(stringId)); wordCount = wordCount.replaceAll("$1", OUString::number(documentStats.nWord)); wordCount = wordCount.replaceAll("$2", OUString::number(documentStats.nChar)); if (selectionStats.nWord) @@ -1896,7 +1895,7 @@ bool SwView::JumpToSwMark( const String& rMark ) SearchOptions aSearchOpt( SearchAlgorithms_ABSOLUTE, 0, - sName, rtl::OUString(), + sName, OUString(), SvtSysLocale().GetLanguageTag().getLocale(), 0,0,0, TransliterationModules_IGNORE_CASE ); @@ -2030,7 +2029,7 @@ long SwView::InsertDoc( sal_uInt16 nSlotId, const String& rFileName, const Strin } else { - rtl::OUString sFactory = rtl::OUString::createFromAscii( pDocSh->GetFactory().GetShortName() ); + OUString sFactory = OUString::createFromAscii( pDocSh->GetFactory().GetShortName() ); m_pViewImpl->StartDocumentInserter( sFactory, LINK( this, SwView, DialogClosedHdl ) ); return -1; } diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx index 1ab4270abfa7..1f275234b1dd 100644 --- a/sw/source/ui/uiview/viewdraw.cxx +++ b/sw/source/ui/uiview/viewdraw.cxx @@ -220,8 +220,8 @@ void SwView::ExecDraw(SfxRequest& rReq) if( pFuncPtr && pFuncPtr->GetSlotId() == SID_DRAW_CS_ID ) { ConstCustomShape* pConstCustomShape = (ConstCustomShape*)(pFuncPtr); - rtl::OUString aNew = ConstCustomShape::GetShapeTypeFromRequest( rReq ); - rtl::OUString aOld = pConstCustomShape->GetShapeType(); + OUString aNew = ConstCustomShape::GetShapeTypeFromRequest( rReq ); + OUString aOld = pConstCustomShape->GetShapeType(); if( aNew == aOld ) { bDeselect = true; diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index b30175c5311d..b7f2fcfdfaa7 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -87,7 +87,6 @@ #include using namespace sw::mark; -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; @@ -121,7 +120,7 @@ void SwView::ExecLingu(SfxRequest &rReq) { Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog") + OUString("com.sun.star.linguistic2.ChineseTranslationDialog") , xContext), UNO_QUERY); Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) @@ -131,7 +130,7 @@ void SwView::ExecLingu(SfxRequest &rReq) Sequence aSeq(1); Any* pArray = aSeq.getArray(); PropertyValue aParam; - aParam.Name = rtl::OUString("ParentWindow"); + aParam.Name = OUString("ParentWindow"); aParam.Value <<= makeAny(xDialogParentWindow); pArray[0] <<= makeAny(aParam); xInit->initialize( aSeq ); @@ -665,13 +664,13 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) Reference< XSpellAlternatives > xAlt( m_pWrtShell->GetCorrection(&rPt, aToFill) ); ProofreadingResult aGrammarCheckRes; sal_Int32 nErrorInResult = -1; - uno::Sequence< rtl::OUString > aSuggestions; + uno::Sequence< OUString > aSuggestions; bool bCorrectionRes = false; if (!xAlt.is() || xAlt->getAlternatives().getLength() == 0) { sal_Int32 nErrorPosInText = -1; bCorrectionRes = m_pWrtShell->GetGrammarCorrection( aGrammarCheckRes, nErrorPosInText, nErrorInResult, aSuggestions, &rPt, aToFill ); - ::rtl::OUString aMessageText; + OUString aMessageText; if (nErrorInResult >= 0) aMessageText = aGrammarCheckRes.aErrors[ nErrorInResult ].aShortComment; // we like to use the grammar checking context menu if we either get @@ -715,7 +714,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) aEvent.ExecutePosition.Y = aPixPos.Y(); Menu* pMenu = 0; - ::rtl::OUString sMenuName = bUseGrammarContext ? + OUString sMenuName = bUseGrammarContext ? OUString("private:resource/GrammarContextMenu") : OUString("private:resource/SpellContextMenu"); if(TryContextMenuInterception( *pPopup, sMenuName, pMenu, aEvent )) { @@ -748,7 +747,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) aURL.Complete = aCommand; xURLTransformer->parseStrict(aURL); uno::Sequence< beans::PropertyValue > aArgs; - xDispatch = xDispatchProvider->queryDispatch( aURL, rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); if (xDispatch.is()) @@ -796,7 +795,7 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt ) // get word that was clicked on // This data structure maps a smart tag type string to the property bag SwRect aToFill; - Sequence< rtl::OUString > aSmartTagTypes; + Sequence< OUString > aSmartTagTypes; Sequence< Reference< container::XStringKeyMap > > aStringKeyMaps; Reference xRange; @@ -836,13 +835,13 @@ SwFieldDialog::SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ) : { const IFieldmark::parameter_map_t* const pParameters = fieldBM->GetParameters(); - rtl::OUString sListKey = rtl::OUString( ODF_FORMDROPDOWN_LISTENTRY ); + OUString sListKey = OUString( ODF_FORMDROPDOWN_LISTENTRY ); IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find( sListKey ); if(pListEntries != pParameters->end()) { - Sequence< ::rtl::OUString > vListEntries; + Sequence< OUString > vListEntries; pListEntries->second >>= vListEntries; - for( ::rtl::OUString* pCurrent = vListEntries.getArray(); + for( OUString* pCurrent = vListEntries.getArray(); pCurrent != vListEntries.getArray() + vListEntries.getLength(); ++pCurrent) { @@ -851,7 +850,7 @@ SwFieldDialog::SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ) : } // Select the current one - rtl::OUString sResultKey = rtl::OUString( ODF_FORMDROPDOWN_RESULT ); + OUString sResultKey = OUString( ODF_FORMDROPDOWN_RESULT ); IFieldmark::parameter_map_t::const_iterator pResult = pParameters->find( sResultKey ); if ( pResult != pParameters->end() ) { @@ -879,7 +878,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox ) sal_Int32 selection = pBox->GetSelectEntryPos(); if ( selection >= 0 ) { - rtl::OUString sKey = rtl::OUString( ODF_FORMDROPDOWN_RESULT ); + OUString sKey = OUString( ODF_FORMDROPDOWN_RESULT ); (*pFieldmark->GetParameters())[ sKey ] = makeAny(selection); pFieldmark->Invalidate(); SwView& rView = ( ( SwEditWin* )GetParent() )->GetView(); diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index d4aab1855f7d..db07ebb1f92b 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -708,7 +708,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) m_pWrtShell->GetContentAtPos( aPos, aCnt ); if( aCnt.sStr.Len() ) { - sPageStr += rtl::OUString(" - "); + sPageStr += OUString(" - "); sPageStr.Insert( aCnt.sStr, 0, 80 ); sPageStr.SearchAndReplaceAll( '\t', ' ' ); sPageStr.SearchAndReplaceAll( 0x0a, ' ' ); diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index 691431936ea3..ad8c60865d1e 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -181,7 +181,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) InfoBox aInfoBox(&GetEditWin(), SW_RES(MSG_ERR_NO_FAX)); String sMsg = aInfoBox.GetMessText(); sal_uInt16 nResNo = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS; - sMsg.SearchAndReplace(rtl::OUString("%1"), String(SW_RES(nResNo))); + sMsg.SearchAndReplace(OUString("%1"), String(SW_RES(nResNo))); aInfoBox.SetMessText(sMsg); aInfoBox.Execute(); SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE); diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index 7802df1bd0ad..3778429c7235 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -335,7 +335,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) if( !bApi && ULONG_MAX != nFound) { String aText( SW_RES( STR_NB_REPLACED ) ); - const xub_StrLen nPos = aText.Search( rtl::OUString("XX") ); + const xub_StrLen nPos = aText.Search( OUString("XX") ); aText.Erase( nPos, 2 ); aText.Insert( OUString::number( nFound ), nPos ); Window* pParentWindow = GetParentWindow( m_pSrchDlg ); diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index 211b55ffdc4e..a2f3e07c5e1f 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -44,7 +44,6 @@ #include "cfgitems.hxx" #include "prtopt.hxx" -using rtl::OUString; using namespace comphelper; using namespace ::com::sun::star; @@ -309,7 +308,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { if (rInfo.mnAttributes & PropertyAttribute::READONLY) - throw PropertyVetoException ( OUString( "Property is read-only: " ) + rtl::OUString::createFromAscii(rInfo.mpName), static_cast < cppu::OWeakObject * > ( 0 ) ); + throw PropertyVetoException ( OUString( "Property is read-only: " ) + OUString::createFromAscii(rInfo.mpName), static_cast < cppu::OWeakObject * > ( 0 ) ); switch( rInfo.mnHandle ) { @@ -706,13 +705,13 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf uno::Sequence< beans::PropertyValue > aInfo; if ( !( rValue >>= aInfo ) ) throw lang::IllegalArgumentException( - ::rtl::OUString( "Value of type Sequence expected!" ), + OUString( "Value of type Sequence expected!" ), uno::Reference< uno::XInterface >(), 2 ); if ( !mpDocSh->SetModifyPasswordInfo( aInfo ) ) throw beans::PropertyVetoException( - ::rtl::OUString( "The hash is not allowed to be changed now!" ), + OUString( "The hash is not allowed to be changed now!" ), uno::Reference< uno::XInterface >() ); } break; diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/ui/uno/SwXDocumentSettings.hxx index 437fed49c815..9ac7fca529c7 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.hxx +++ b/sw/source/ui/uno/SwXDocumentSettings.hxx @@ -79,11 +79,11 @@ public: throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(com::sun::star::uno::RuntimeException); // XTypeProvider diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx index 13b21897c73d..0f7019ea0d0f 100644 --- a/sw/source/ui/uno/SwXFilterOptions.cxx +++ b/sw/source/ui/uno/SwXFilterOptions.cxx @@ -50,15 +50,15 @@ SwXFilterOptions::~SwXFilterOptions() { } -::rtl::OUString SwXFilterOptions::getImplementationName_Static() +OUString SwXFilterOptions::getImplementationName_Static() { - return ::rtl::OUString(SWFILTEROPTIONSOBJ_IMPLNAME); + return OUString(SWFILTEROPTIONSOBJ_IMPLNAME); } -uno::Sequence< ::rtl::OUString> SwXFilterOptions::getSupportedServiceNames_Static() +uno::Sequence< OUString> SwXFilterOptions::getSupportedServiceNames_Static() { - ::rtl::OUString sService(SWFILTEROPTIONSOBJ_SERVICE); - return uno::Sequence< ::rtl::OUString> (&sService, 1); + OUString sService(SWFILTEROPTIONSOBJ_SERVICE); + return uno::Sequence< OUString> (&sService, 1); } uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() throw (uno::RuntimeException) @@ -66,7 +66,7 @@ uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() thro uno::Sequence aRet(1); beans::PropertyValue* pArray = aRet.getArray(); - pArray[0].Name = rtl::OUString( FILTER_OPTIONS_NAME ); + pArray[0].Name = OUString( FILTER_OPTIONS_NAME ); pArray[0].Value <<= sFilterOptions; return aRet; @@ -81,18 +81,18 @@ void SwXFilterOptions::setPropertyValues( const uno::Sequence>= sFilterName; - else if ( aPropName == ::rtl::OUString(FILTER_OPTIONS_NAME) ) + else if ( aPropName == OUString(FILTER_OPTIONS_NAME) ) rProp.Value >>= sFilterOptions; else if ( aPropName == "InputStream" ) rProp.Value >>= xInputStream; } } -void SwXFilterOptions::setTitle( const ::rtl::OUString& /*rTitle*/ ) +void SwXFilterOptions::setTitle( const OUString& /*rTitle*/ ) throw (uno::RuntimeException) { } @@ -152,18 +152,18 @@ void SwXFilterOptions::setSourceDocument( const uno::Reference& x xModel = xDoc; } -::rtl::OUString SwXFilterOptions::getImplementationName() throw(uno::RuntimeException) +OUString SwXFilterOptions::getImplementationName() throw(uno::RuntimeException) { - return ::rtl::OUString(SWFILTEROPTIONSOBJ_IMPLNAME); + return OUString(SWFILTEROPTIONSOBJ_IMPLNAME); } -sal_Bool SwXFilterOptions::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool SwXFilterOptions::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) { - return rServiceName == ::rtl::OUString(SWFILTEROPTIONSOBJ_SERVICE); + return rServiceName == OUString(SWFILTEROPTIONSOBJ_SERVICE); } -uno::Sequence< ::rtl::OUString > SwXFilterOptions::getSupportedServiceNames() +uno::Sequence< OUString > SwXFilterOptions::getSupportedServiceNames() throw(uno::RuntimeException) { return SwXFilterOptions::getSupportedServiceNames_Static(); diff --git a/sw/source/ui/uno/detreg.cxx b/sw/source/ui/uno/detreg.cxx index 69be10d6e90f..9d6fd6ea451d 100644 --- a/sw/source/ui/uno/detreg.cxx +++ b/sw/source/ui/uno/detreg.cxx @@ -19,7 +19,6 @@ #include "swdetect.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx index 93345da0889f..ac8c54cb87cf 100644 --- a/sw/source/ui/uno/dlelstnr.cxx +++ b/sw/source/ui/uno/dlelstnr.cxx @@ -38,7 +38,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx index 556d799a5ca1..97afbfd88b18 100644 --- a/sw/source/ui/uno/swdet2.cxx +++ b/sw/source/ui/uno/swdet2.cxx @@ -67,10 +67,10 @@ sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** pp else { //Bug 41417: JP 09.07.97: HTML documents should be loaded by WebWriter - SfxFilterContainer aFilterContainer( rtl::OUString("swriter/web") ); + SfxFilterContainer aFilterContainer( OUString("swriter/web") ); if( !pTmp->GetUserData().equals(sHTML) || pTmp->GetServiceName() == "com.sun.star.text.WebDocument" || - 0 == ( (*ppFilter) = SwIoSystem::GetFilterOfFormat( rtl::OUString(sHTML), + 0 == ( (*ppFilter) = SwIoSystem::GetFilterOfFormat( OUString(sHTML), &aFilterContainer ) ) ) *ppFilter = pTmp; } diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx index 039bf0906d50..a6233c761866 100644 --- a/sw/source/ui/uno/swdetect.hxx +++ b/sw/source/ui/uno/swdetect.hxx @@ -68,7 +68,7 @@ public: //---------------------------------------------------------------------------------- // XExtendedFilterDetect //---------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); }; #endif diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index 11e38933c003..301e84da7232 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -52,7 +52,6 @@ SV_IMPL_REF ( SwDocShell ) using namespace ::com::sun::star; -using ::rtl::OUString; uno::Reference< uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance( const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception ) diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx index 21fe1165d414..6af22e9a214e 100644 --- a/sw/source/ui/uno/unodispatch.cxx +++ b/sw/source/ui/uno/unodispatch.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; static const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter"; static const char* cURLInsertContent = ".uno:DataSourceBrowser/InsertContent";//data into fields diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx index 7e33fe6a7999..a190eff2f41f 100644 --- a/sw/source/ui/uno/unodoc.cxx +++ b/sw/source/ui/uno/unodoc.cxx @@ -31,20 +31,20 @@ using namespace ::com::sun::star; //============================================================ // com.sun.star.comp.Writer.TextDocument -uno::Sequence< ::rtl::OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw() { // return only top level services here! All others must be // resolved by rtti! - uno::Sequence< ::rtl::OUString > aRet ( 1 ); - ::rtl::OUString* pArray = aRet.getArray(); - pArray[0] = ::rtl::OUString( "com.sun.star.text.TextDocument" ); + uno::Sequence< OUString > aRet ( 1 ); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString( "com.sun.star.text.TextDocument" ); return aRet; } -::rtl::OUString SAL_CALL SwTextDocument_getImplementationName() throw() +OUString SAL_CALL SwTextDocument_getImplementationName() throw() { - return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" ); + return OUString( "com.sun.star.comp.Writer.TextDocument" ); } uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( @@ -60,20 +60,20 @@ uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( //============================================================ // com.sun.star.comp.Writer.WebDocument -uno::Sequence< ::rtl::OUString > SAL_CALL SwWebDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL SwWebDocument_getSupportedServiceNames() throw() { // return only top level services here! All others must be // resolved by rtti! - uno::Sequence< ::rtl::OUString > aRet ( 1 ); - ::rtl::OUString* pArray = aRet.getArray(); - pArray[0] = ::rtl::OUString( "com.sun.star.text.WebDocument" ); + uno::Sequence< OUString > aRet ( 1 ); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString( "com.sun.star.text.WebDocument" ); return aRet; } -::rtl::OUString SAL_CALL SwWebDocument_getImplementationName() throw() +OUString SAL_CALL SwWebDocument_getImplementationName() throw() { - return ::rtl::OUString( "com.sun.star.comp.Writer.WebDocument" ); + return OUString( "com.sun.star.comp.Writer.WebDocument" ); } uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance( @@ -89,18 +89,18 @@ uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance( //============================================================ // com.sun.star.comp.Writer.GlobalDocument -uno::Sequence< ::rtl::OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNames() throw() +uno::Sequence< OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNames() throw() { - uno::Sequence< ::rtl::OUString > aRet ( 1 ); - ::rtl::OUString* pArray = aRet.getArray(); - pArray[0] = ::rtl::OUString( "com.sun.star.text.GlobalDocument" ); + uno::Sequence< OUString > aRet ( 1 ); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString( "com.sun.star.text.GlobalDocument" ); return aRet; } -::rtl::OUString SAL_CALL SwGlobalDocument_getImplementationName() throw() +OUString SAL_CALL SwGlobalDocument_getImplementationName() throw() { - return ::rtl::OUString( "com.sun.star.comp.Writer.GlobalDocument" ); + return OUString( "com.sun.star.comp.Writer.GlobalDocument" ); } uno::Reference< uno::XInterface > SAL_CALL SwGlobalDocument_createInstance( diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx index 15e49e2abd4d..cda4584fa608 100644 --- a/sw/source/ui/uno/unofreg.cxx +++ b/sw/source/ui/uno/unofreg.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; -using ::rtl::OUString; // module extern uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw(); @@ -127,8 +126,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL LayoutDumpFilter_createInstanc namespace comp_FinalThreadManager { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +com::sun::star::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL _create( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context ); diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 7e6c4140e590..2f3e4ec8efd2 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -80,7 +80,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; -using ::rtl::OUString; using namespace SWUnoHelper; //////////////////////////////////////////////////////////// @@ -728,7 +727,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( aURLObj.SetSmartURL( aCurOutputURL ); String aPath = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); - String aDelim = rtl::OUString(INET_PATH_TOKEN); + String aDelim = OUString(INET_PATH_TOKEN); if (aPath.Len() >= aDelim.Len() && aPath.Copy( aPath.Len()-aDelim.Len() ).CompareTo( aDelim ) != COMPARE_EQUAL) aPath += aDelim; @@ -776,7 +775,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( // save document with temporary filename const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( - rtl::OUString( FILTER_XML ), + OUString( FILTER_XML ), SwDocShell::Factory().GetFilterContainer() ); String aExtension(comphelper::string::stripStart(pSfxFlt->GetDefaultExtension(), '*')); TempFile aTempFile( OUString("SwMM"), &aExtension ); diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index a606d298fdac..d194ccfbe164 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -46,8 +46,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::comphelper; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; enum SwViewSettingsPropertyHandles { @@ -713,7 +711,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c break; default: throw IllegalArgumentException( - ::rtl::OUString( "SwXViewSettings: invalid zoom type"), 0, 0); + OUString( "SwXViewSettings: invalid zoom type"), 0, 0); } mpViewOption->SetZoomType( eZoom ); mbApplyZoom = sal_True; @@ -747,7 +745,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c INetURLObject aHID( sHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) - pView->GetEditWin().SetHelpId( rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); + pView->GetEditWin().SetHelpId( OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); else throw IllegalArgumentException (); } @@ -930,7 +928,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u OUStringBuffer sHelpURL; sHelpURL.appendAscii ( INET_HID_SCHEME ); SwEditWin &rEditWin = pView->GetEditWin(); - sHelpURL.append( rtl::OStringToOUString( rEditWin.GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + sHelpURL.append( OStringToOUString( rEditWin.GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); rValue <<= sHelpURL.makeStringAndClear(); } else diff --git a/sw/source/ui/uno/unomodule.hxx b/sw/source/ui/uno/unomodule.hxx index 63f80f3b8eb1..b5612a2110d1 100644 --- a/sw/source/ui/uno/unomodule.hxx +++ b/sw/source/ui/uno/unomodule.hxx @@ -68,12 +68,12 @@ public: // XDispatchProvider virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException ) ; virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , - const ::rtl::OUString & sTargetFrameName, + const OUString & sTargetFrameName, sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException ) ; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); }; #endif diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 3e4e50ed8864..64ca3060ae97 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -142,7 +142,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; -using ::rtl::OUString; using ::osl::FileBase; #define SW_CREATE_DASH_TABLE 0x01 @@ -2128,7 +2127,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) case WID_DOC_VBA_DOCOBJ: { beans::PropertyValue aProp; - aProp.Name = rtl::OUString("ThisWordDoc"); + aProp.Name = OUString("ThisWordDoc"); aProp.Value <<= pDocShell->GetModel(); aAny <<= aProp; } @@ -2491,7 +2490,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( SolarMutexGuard aGuard; if(!IsValid()) { - throw DisposedException( ::rtl::OUString(), + throw DisposedException( OUString(), static_cast< XTextDocument* >(this) ); } @@ -2664,7 +2663,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( SolarMutexGuard aGuard; if(!IsValid()) { - throw DisposedException( ::rtl::OUString(), + throw DisposedException( OUString(), static_cast< XTextDocument* >(this) ); } @@ -2930,7 +2929,7 @@ void SAL_CALL SwXTextDocument::render( SolarMutexGuard aGuard; if(!IsValid()) { - throw DisposedException( ::rtl::OUString(), + throw DisposedException( OUString(), static_cast< XTextDocument* >(this) ); } @@ -2999,7 +2998,7 @@ void SAL_CALL SwXTextDocument::render( if(pVwSh && pOut && m_pRenderData->HasSwPrtOptions()) { - const rtl::OUString aPageRange = m_pPrintUIOptions->getStringValue( "PageRange", OUString() ); + const OUString aPageRange = m_pPrintUIOptions->getStringValue( "PageRange", OUString() ); const bool bFirstPage = m_pPrintUIOptions->getBoolValue( "IsFirstPage", sal_False ); bool bIsSkipEmptyPages = !m_pPrintUIOptions->IsPrintEmptyPages( bIsPDFExport ); @@ -3086,7 +3085,7 @@ Reference SAL_CALL SwXTextDocument::getXForms() { SolarMutexGuard aGuard; if ( !pDocShell ) - throw DisposedException( ::rtl::OUString(), static_cast< XTextDocument* >( this ) ); + throw DisposedException( OUString(), static_cast< XTextDocument* >( this ) ); SwDoc* pDoc = pDocShell->GetDoc(); return pDoc->getXForms(); } @@ -3158,7 +3157,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( const bool bComplex = 0 != (nScriptTypes & nComplex); if (nScriptTypes < nLatin || nScriptTypes > (nLatin | nAsian | nComplex)) - throw IllegalArgumentException(::rtl::OUString("nScriptTypes ranges from 1 to 7!"), Reference< XInterface >(), 1); + throw IllegalArgumentException(OUString("nScriptTypes ranges from 1 to 7!"), Reference< XInterface >(), 1); if (!pDocShell) throw DisposedException(); SwDoc* pDoc = pDocShell->GetDoc(); @@ -3355,10 +3354,10 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) if(!pxDoc) throw RuntimeException(); String sToCompare(rName); - String sSuffix = rtl::OUString('|'); + String sSuffix = OUString('|'); if(sToCompare == sTables) { - sSuffix += rtl::OUString::createFromAscii(pMarkToTable); + sSuffix += OUString::createFromAscii(pMarkToTable); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getTextTables(), sToCompare, sSuffix ); @@ -3367,7 +3366,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sFrames) { - sSuffix += rtl::OUString::createFromAscii(pMarkToFrame); + sSuffix += OUString::createFromAscii(pMarkToFrame); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getTextFrames(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); @@ -3375,7 +3374,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sSections) { - sSuffix += rtl::OUString::createFromAscii(pMarkToRegion); + sSuffix += OUString::createFromAscii(pMarkToRegion); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getTextSections(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); @@ -3383,7 +3382,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sGraphics) { - sSuffix += rtl::OUString::createFromAscii(pMarkToGraphic); + sSuffix += OUString::createFromAscii(pMarkToGraphic); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getGraphicObjects(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); @@ -3391,7 +3390,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sOLEs) { - sSuffix += rtl::OUString::createFromAscii(pMarkToOLE); + sSuffix += OUString::createFromAscii(pMarkToOLE); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( pxDoc->getEmbeddedObjects(), sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); @@ -3399,7 +3398,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } else if(sToCompare == sOutlines) { - sSuffix += rtl::OUString::createFromAscii(pMarkToOutline); + sSuffix += OUString::createFromAscii(pMarkToOutline); Reference< XNameAccess > xTbls = new SwXLinkNameAccessWrapper( *pxDoc, sToCompare, sSuffix ); Reference< XPropertySet > xRet(xTbls, UNO_QUERY); @@ -3570,8 +3569,8 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames(void) sal_uInt16 nOutlineCount = rOutlineNodes.size(); aRet.realloc(nOutlineCount); OUString* pResArr = aRet.getArray(); - String sSuffix = rtl::OUString('|'); - sSuffix += rtl::OUString::createFromAscii(pMarkToOutline); + String sSuffix = OUString('|'); + sSuffix += OUString::createFromAscii(pMarkToOutline); const SwNumRule* pOutlRule = pDoc->GetOutlineNumRule(); for (sal_uInt16 i = 0; i < nOutlineCount; ++i) { diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 81061b5a7428..cefcc8bc5243 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -85,7 +85,6 @@ using namespace ::com::sun::star::frame; using ::com::sun::star::util::URL; using comphelper::HelperBaseNoState; -using ::rtl::OUString; SwXTextView::SwXTextView(SwView* pSwView) : SfxBaseController(pSwView), @@ -562,16 +561,16 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto pRet[n].realloc(5); PropertyValue* pValues = pRet[n].getArray(); - pValues[0].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_BASE_TEXT)); + pValues[0].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_BASE_TEXT)); pValues[0].Value <<= OUString(rEntryText); - pValues[1].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_TEXT)); + pValues[1].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_TEXT)); pValues[1].Value <<= OUString(rAttr.GetText()); - pValues[2].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_CHAR_STYLE_NAME)); + pValues[2].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_CHAR_STYLE_NAME)); SwStyleNameMapper::FillProgName(rAttr.GetCharFmtName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true ); pValues[2].Value <<= OUString( aString ); - pValues[3].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_ADJUST)); + pValues[3].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_ADJUST)); pValues[3].Value <<= (sal_Int16)rAttr.GetAdjustment(); - pValues[4].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_IS_ABOVE)); + pValues[4].Name = OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_IS_ABOVE)); sal_Bool bVal = !rAttr.GetPosition(); pValues[4].Value.setValue(&bVal, ::getBooleanCppuType()); } @@ -716,7 +715,7 @@ namespace { void SwXTextView::NotifyDBChanged() { URL aURL; - aURL.Complete = rtl::OUString::createFromAscii(SwXDispatch::GetDBChangeURL()); + aURL.Complete = OUString::createFromAscii(SwXDispatch::GetDBChangeURL()); m_SelChangedListeners.forEach( DispatchListener(aURL, Sequence(0))); diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index b2bf48511783..4c2e5d572066 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -1115,7 +1115,7 @@ SfxItemPresentation SwGammaGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { - rtl::OUStringBuffer aText; + OUStringBuffer aText; switch( ePres ) { case SFX_ITEM_PRESENTATION_NAMELESS: diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index f9859f4e2267..4dc9956f91ff 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -23,7 +23,6 @@ #include #include using namespace ::svx; -using ::rtl::OUString; using namespace ::com::sun::star::uno; // STATIC DATA diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 2ba3e048753d..4b71f62d8e49 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -214,7 +214,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) { case CONTENT_TYPE_OUTLINE : { - sTypeToken = rtl::OUString::createFromAscii(pMarkToOutline); + sTypeToken = OUString::createFromAscii(pMarkToOutline); sal_uInt16 nOutlineCount = nMemberCount = static_cast(pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount()); if(nOutlineLevel < MAXLEVEL) @@ -230,7 +230,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) break; case CONTENT_TYPE_TABLE : - sTypeToken = rtl::OUString::createFromAscii(pMarkToTable); + sTypeToken = OUString::createFromAscii(pMarkToTable); nMemberCount = pWrtShell->GetTblFrmFmtCount(true); bEdit = true; break; @@ -240,16 +240,16 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) case CONTENT_TYPE_OLE : { FlyCntType eType = FLYCNTTYPE_FRM; - sTypeToken = rtl::OUString::createFromAscii(pMarkToFrame); + sTypeToken = OUString::createFromAscii(pMarkToFrame); if(nContentType == CONTENT_TYPE_OLE) { eType = FLYCNTTYPE_OLE; - sTypeToken = rtl::OUString::createFromAscii(pMarkToOLE); + sTypeToken = OUString::createFromAscii(pMarkToOLE); } else if(nContentType == CONTENT_TYPE_GRAPHIC) { eType = FLYCNTTYPE_GRF; - sTypeToken = rtl::OUString::createFromAscii(pMarkToGraphic); + sTypeToken = OUString::createFromAscii(pMarkToGraphic); } nMemberCount = pWrtShell->GetFlyCount(eType); bEdit = true; @@ -317,7 +317,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) } } nMemberCount = pMember->size(); - sTypeToken = rtl::OUString::createFromAscii(pMarkToRegion); + sTypeToken = OUString::createFromAscii(pMarkToRegion); bEdit = true; bDelete = false; if(pOldMember) @@ -642,10 +642,10 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged) break; case CONTENT_TYPE_REFERENCE: { - std::vector aRefMarks; + std::vector aRefMarks; nMemberCount = pWrtShell->GetRefMarks( &aRefMarks ); - for(std::vector::const_iterator i = aRefMarks.begin(); i != aRefMarks.end(); ++i) + for(std::vector::const_iterator i = aRefMarks.begin(); i != aRefMarks.end(); ++i) { // References sorted alphabetically SwContent* pCnt = new SwContent(this, *i, 0); @@ -785,7 +785,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged) SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ), - sSpace(rtl::OUString(" ")), + sSpace(OUString(" ")), sRemoveIdx(SW_RES(ST_REMOVE_INDEX)), sUpdateIdx(SW_RES(ST_UPDATE)), @@ -990,9 +990,9 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) if(pHiddenShell) { String sHiddenEntry = pHiddenShell->GetView().GetDocShell()->GetTitle(); - sHiddenEntry += rtl::OUString(" ( "); + sHiddenEntry += OUString(" ( "); sHiddenEntry += aContextStrings[ ST_HIDDEN - ST_CONTEXT_FIRST]; - sHiddenEntry += rtl::OUString(" )"); + sHiddenEntry += OUString(" )"); pSubPop3->InsertItem(nId, sHiddenEntry); } @@ -2465,7 +2465,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) if(((SwContent*)pUserData)->IsInvisible()) { if(sEntry.Len()) - sEntry += rtl::OUString(", "); + sEntry += OUString(", "); sEntry += sInvisible; bRet = true; } @@ -2897,11 +2897,11 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, sal_uInt8 nMode) String sForbiddenChars; if(CONTENT_TYPE_BOOKMARK == nType) { - sForbiddenChars = rtl::OUString("/\\@:*?\";,.#"); + sForbiddenChars = OUString("/\\@:*?\";,.#"); } else if(CONTENT_TYPE_TABLE == nType) { - sForbiddenChars = rtl::OUString(" .<>"); + sForbiddenChars = OUString(" .<>"); } pDlg->SetForbiddenChars(sForbiddenChars); pDlg->Execute(); diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 339b7804af4a..26dd383a071e 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -57,7 +57,6 @@ #include "swabstdlg.hxx" using namespace ::com::sun::star::uno; -using ::rtl::OUString; // Context menu for GlobalTree #define CTX_INSERT_ANY_INDEX 10 @@ -714,7 +713,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pF Application::SetDefDialogParent( this ); delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( - rtl::OUString("swriter"), true ); + OUString("swriter"), true ); pDocInserter->StartExecuteModal( LINK( this, SwGlobalTree, DialogClosedHdl ) ); } else if ( pFileName->Len() ) @@ -1180,7 +1179,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) SfxStringItem aURL(SID_FILE_NAME, sFileName); SfxBoolItem aReadOnly(SID_DOC_READONLY, sal_False); - SfxStringItem aTargetFrameName( SID_TARGETNAME, rtl::OUString("_blank") ); + SfxStringItem aTargetFrameName( SID_TARGETNAME, OUString("_blank") ); SfxStringItem aReferer(SID_REFERER, pActiveShell->GetView().GetDocShell()->GetTitle()); pActiveShell->GetView().GetViewFrame()->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index d0cd0e0cae9a..dda31eb4b604 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -238,14 +238,14 @@ ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( std::vector& rLst ) #ifdef WNT // For Windows, a special treatment is necessary because MS has // forgotten some characters in the dialog font here. - p.SearchAndReplace(rtl::OUString("%1"), rtl::OUString(",,")); - p.SearchAndReplace(rtl::OUString("%2"), rtl::OUString("''")); + p.SearchAndReplace(OUString("%1"), OUString(",,")); + p.SearchAndReplace(OUString("%2"), OUString("''")); #else const SvtSysLocale aSysLocale; const LocaleDataWrapper& rLclD = aSysLocale.GetLocaleData(); // With real operating systems it also works without special handling. - p.SearchAndReplace(rtl::OUString("%1"), rLclD.getDoubleQuotationMarkStart()); - p.SearchAndReplace(rtl::OUString("%2"), rLclD.getDoubleQuotationMarkEnd()); + p.SearchAndReplace(OUString("%1"), rLclD.getDoubleQuotationMarkStart()); + p.SearchAndReplace(OUString("%2"), rLclD.getDoubleQuotationMarkEnd()); #endif } rLst.insert(rLst.begin() + n, p); diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx index 7cfc2c4b93ba..54065a3f29fe 100644 --- a/sw/source/ui/utlui/navicfg.cxx +++ b/sw/source/ui/utlui/navicfg.cxx @@ -114,7 +114,7 @@ void SwNavigationConfig::Commit() PutProperties(aNames, aValues); } -void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SwNavigationConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 89a53b8e0530..a82cb2355379 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -503,7 +503,7 @@ void SwNavigationPI::MakeMark() IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess(); // collect and sort navigator reminder names - ::std::vector< ::rtl::OUString > vNavMarkNames; + ::std::vector< OUString > vNavMarkNames; for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getMarksBegin(); ppMark != pMarkAccess->getMarksEnd(); ++ppMark) @@ -517,7 +517,7 @@ void SwNavigationPI::MakeMark() if(vNavMarkNames.size() == MAX_MARKS) pMarkAccess->deleteMark(pMarkAccess->findMark(vNavMarkNames[nAutoMarkIdx])); - rSh.SetBookmark(KeyCode(), ::rtl::OUString(), ::rtl::OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER); + rSh.SetBookmark(KeyCode(), OUString(), OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER); SwView::SetActMark( nAutoMarkIdx ); if(++nAutoMarkIdx == MAX_MARKS) @@ -1042,7 +1042,7 @@ void SwNavigationPI::UpdateListBox() if ( !pDoc->IsHelpDocument() ) { String sEntry = pDoc->GetTitle(); - sEntry += rtl::OUString(" ("); + sEntry += OUString(" ("); if (pView == pActView) { nAct = nCount; @@ -1068,7 +1068,7 @@ void SwNavigationPI::UpdateListBox() { String sEntry = aContentTree.GetHiddenWrtShell()->GetView(). GetDocShell()->GetTitle(); - sEntry += rtl::OUString(" ("); + sEntry += OUString(" ("); sEntry += aStatusArr[ST_HIDDEN - ST_STATUS_FIRST]; sEntry += ')'; aDocListBox.InsertEntry(sEntry); @@ -1185,7 +1185,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt ) DELETEZ( pxObjectShell); } SfxStringItem aFileItem(SID_FILE_NAME, sFileName ); - SfxStringItem aOptionsItem( SID_OPTIONS, rtl::OUString("HRC") ); + SfxStringItem aOptionsItem( SID_OPTIONS, OUString("HRC") ); SfxLinkItem aLink( SID_DONELINK, LINK( this, SwNavigationPI, DoneLink ) ); GetActiveView()->GetViewFrame()->GetDispatcher()->Execute( diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx index 12d869dcb254..00aa1d71e508 100644 --- a/sw/source/ui/utlui/prcntfld.cxx +++ b/sw/source/ui/utlui/prcntfld.cxx @@ -34,7 +34,7 @@ PercentField::PercentField( Window* pWin, const ResId& rResId ) : nOldSpinSize = GetSpinSize(); nRefValue = DenormalizePercent(MetricField::GetMax(FUNIT_TWIP)); nOldDigits = GetDecimalDigits(); - SetCustomUnitText(rtl::OUString('%')); + SetCustomUnitText(OUString('%')); } PercentFieldWrap::PercentFieldWrap() @@ -53,7 +53,7 @@ void PercentFieldWrap::set(MetricField *pField) nOldSpinSize = m_pField->GetSpinSize(); nRefValue = DenormalizePercent(m_pField->GetMax(FUNIT_TWIP)); nOldDigits = m_pField->GetDecimalDigits(); - m_pField->SetCustomUnitText(rtl::OUString('%')); + m_pField->SetCustomUnitText(OUString('%')); } void PercentField::SetRefValue(sal_Int64 nValue) diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 1b18b30b21ec..31979e3ddf6b 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin, uno::Reference< container::XNamed > & xN, diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 4b029f2b0348..1779833bc2c8 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -779,7 +779,7 @@ bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, sal_uInt16 aURL.Complete = sCommand; uno::Reference < util::XURLTransformer > xTrans( util::URLTransformer::create(::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aURL ); - uno::Reference< frame::XDispatch > xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + uno::Reference< frame::XDispatch > xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if( xDisp.is() ) { uno::Sequence< beans::PropertyValue > aSeq; diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index 2d426e9fe472..a0fd65d2b7c8 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -54,7 +54,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; const sal_Char cFrameControl[] = "com.sun.star.frame.FrameControl"; const sal_Char cFactory[] = "private:factory/swriter"; @@ -94,7 +93,7 @@ void SwOneExampleFrame::CreateErrorMessage(Window* pParent) if(SwOneExampleFrame::bShowServiceNotAvailableMessage) { String sInfo(SW_RES(STR_SERVICE_UNAVAILABLE)); - sInfo += rtl::OUString(cFrameControl); + sInfo += OUString(cFrameControl); InfoBox(pParent, sInfo).Execute(); SwOneExampleFrame::bShowServiceNotAvailableMessage = false; } @@ -130,7 +129,7 @@ void SwOneExampleFrame::CreateControl() uno::Reference< beans::XPropertySet > xPrSet(xInst, uno::UNO_QUERY); uno::Any aURL; // create new doc - rtl::OUString sTempURL(cFactory); + OUString sTempURL(cFactory); if(sArgumentURL.Len()) sTempURL = sArgumentURL; aURL <<= sTempURL; @@ -181,14 +180,14 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > xViewProps, //To reproduce this problem, in edit->autotext and click through //the examples and see if the preview gets a horizontal scrollbar uno::Any aFalseSet(uno::makeAny(sal_False)); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_SCROLL_BAR )), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_SCROLL_BAR )), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_SCROLL_BAR )), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_SCROLL_BAR )), aFalseSet); if (bEnableOnlineMode) { - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), uno::makeAny(sal_True)); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), uno::makeAny(sal_True)); } } @@ -234,32 +233,32 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) if( !bIsInitialized ) { - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_DRAWINGS)), aTrueSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_FIELD_COMMANDS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_GRAPHICS)), aTrueSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_PARAGRAPHS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_TEXT)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PARA_BREAKS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PROTECTED_SPACES)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SOFT_HYPHENS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SPACES)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABLES)), aTrueSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABSTOPS)), aFalseSet); - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_BREAKS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_DRAWINGS)), aTrueSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_FIELD_COMMANDS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_GRAPHICS)), aTrueSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_PARAGRAPHS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HIDDEN_TEXT)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_HORI_RULER)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PARA_BREAKS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_PROTECTED_SPACES)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SOFT_HYPHENS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_SPACES)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABLES)), aTrueSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_TABSTOPS)), aFalseSet); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER)), aFalseSet); if(0 ==(nStyleFlags&EX_SHOW_ONLINE_LAYOUT)) { uno::Any aZoom; aZoom <<= (sal_Int16)view::DocumentZoomType::PAGE_WIDTH_EXACT; - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); } else { uno::Any aZoom; aZoom <<= (sal_Int16)view::DocumentZoomType::BY_VALUE; - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); sal_Int16 nZoomValue = 50; if(EX_SHOW_BUSINESS_CARDS == nStyleFlags) @@ -267,7 +266,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) nZoomValue = 80; } aZoom <<= nZoomValue; - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); } // set onlinelayout property after setting the zoom @@ -334,7 +333,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) uno::Reference< beans::XPropertySet > xCrsrProp(_xCursor, uno::UNO_QUERY); uno::Any aPageStyle = xCrsrProp->getPropertyValue( - rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_PAGE_STYLE_NAME))); + OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_PAGE_STYLE_NAME))); OUString sPageStyle; aPageStyle >>= sPageStyle; @@ -350,17 +349,17 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) uno::Reference< style::XStyle > xPStyle; aPStyle >>= xPStyle; uno::Reference< beans::XPropertySet > xPProp(xPStyle, uno::UNO_QUERY); - uno::Any aSize = xPProp->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE))); + uno::Any aSize = xPProp->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE))); awt::Size aPSize; aSize >>= aPSize; //TODO: set page width to card width aPSize.Width = 10000; aSize.setValue(&aPSize, ::getCppuType((awt::Size*)0)); - xPProp->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE)), aSize); + xPProp->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SIZE)), aSize); uno::Any aZero; aZero <<= (sal_Int32)0; - xPProp->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEFT_MARGIN)), aZero); - xPProp->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RIGHT_MARGIN)), aZero); + xPProp->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEFT_MARGIN)), aZero); + xPProp->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RIGHT_MARGIN)), aZero); } uno::Reference< awt::XWindow > xWin( _xControl, uno::UNO_QUERY ); @@ -466,7 +465,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) uno::Reference< view::XViewSettingsSupplier > xSettings(_xController, uno::UNO_QUERY); uno::Reference< beans::XPropertySet > xViewProps = xSettings->getViewSettings(); - uno::Any aZoom = xViewProps->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE))); + uno::Any aZoom = xViewProps->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE))); sal_Int16 nZoom = 0; aZoom >>= nZoom; @@ -475,7 +474,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) { String sTemp; sTemp = OUString::number(nZoomValues[i]); - sTemp += rtl::OUString(" %"); + sTemp += OUString(" %"); aSubPop1.InsertItem( ITEM_ZOOM + i + 1, sTemp); if(nZoom == nZoomValues[i]) aSubPop1.CheckItem(ITEM_ZOOM + i + 1); @@ -499,9 +498,9 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu ) uno::Any aZoom; aZoom <<= nZoom; - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); aZoom <<= (sal_Int16)view::DocumentZoomType::BY_VALUE; - xViewProps->setPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); + xViewProps->setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); } else if(ITEM_UP == nId || ITEM_DOWN == nId) { diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index c785ba94f58a..6e4fbd3de59f 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -155,7 +155,7 @@ sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt ) aViewLayout.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "ViewLayout" ); + aArgs[0].Name = OUString( "ViewLayout" ); aArgs[0].Value = a; execute( aArgs ); diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx index dbe5f9c05409..f8e03294d9e5 100644 --- a/sw/source/ui/vba/vbaaddin.cxx +++ b/sw/source/ui/vba/vbaaddin.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const rtl::OUString& rFileURL, sal_Bool bAutoload ) throw ( uno::RuntimeException ) : +SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL, sal_Bool bAutoload ) throw ( uno::RuntimeException ) : SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbAutoload( bAutoload ), mbInstalled( bAutoload ) { } @@ -34,21 +34,21 @@ SwVbaAddin::~SwVbaAddin() { } -::rtl::OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException) { - rtl::OUString sName; + OUString sName; INetURLObject aURL( msFileURL ); ::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName ); return sName; } void SAL_CALL -SwVbaAddin::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException ) +SwVbaAddin::setName( const OUString& ) throw ( css::uno::RuntimeException ) { - throw uno::RuntimeException( rtl::OUString(" Fail to set name"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString(" Fail to set name"), uno::Reference< uno::XInterface >() ); } -::rtl::OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException) { INetURLObject aURL( msFileURL ); aURL.CutLastName(); @@ -74,20 +74,20 @@ void SAL_CALL SwVbaAddin::setInstalled( ::sal_Bool _installed ) throw (uno::Runt } } -rtl::OUString +OUString SwVbaAddin::getServiceImplName() { - return rtl::OUString("SwVbaAddin"); + return OUString("SwVbaAddin"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaAddin::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Addin" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Addin" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index b026f4db67f4..30b74ac6154c 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -28,25 +28,25 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XAddin > SwVbaAddin_BASE; class SwVbaAddin : public SwVbaAddin_BASE { private: - rtl::OUString msFileURL; + OUString msFileURL; sal_Bool mbAutoload; sal_Bool mbInstalled; public: - SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const rtl::OUString& rFileURL, sal_Bool bAutoload ) throw ( css::uno::RuntimeException ); + SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL, sal_Bool bAutoload ) throw ( css::uno::RuntimeException ); virtual ~SwVbaAddin(); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException); virtual void SAL_CALL setInstalled( ::sal_Bool _installed ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_ADDIN_HXX */ diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index b72e98837e50..de2de86614dc 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -36,14 +36,14 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u SvtPathOptions aPathOpt; // FIXME: temporary the STARTUP path is located in $OO/basic3.1/program/addin String aAddinPath = aPathOpt.GetAddinPath(); - OSL_TRACE("lcl_getAddinCollection: %s", rtl::OUStringToOString( aAddinPath, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("lcl_getAddinCollection: %s", OUStringToOString( aAddinPath, RTL_TEXTENCODING_UTF8 ).getStr() ); if( xSFA->isFolder( aAddinPath ) ) { - uno::Sequence< rtl::OUString > sEntries = xSFA->getFolderContents( aAddinPath, sal_False ); + uno::Sequence< OUString > sEntries = xSFA->getFolderContents( aAddinPath, sal_False ); sal_Int32 nEntry = sEntries.getLength(); for( sal_Int32 index = 0; index < nEntry; ++index ) { - rtl::OUString sUrl = sEntries[ index ]; + OUString sUrl = sEntries[ index ]; if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) ) { maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, sal_True ) ) ); @@ -79,20 +79,20 @@ SwVbaAddins::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaAddins::getServiceImplName() { - return rtl::OUString("SwVbaAddins"); + return OUString("SwVbaAddins"); } -css::uno::Sequence +css::uno::Sequence SwVbaAddins::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Addins"); + sNames[0] = OUString("ooo.vba.word.Addins"); } return sNames; } diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx index 0f6bfb8bd29a..a036e8cb70ab 100644 --- a/sw/source/ui/vba/vbaaddins.hxx +++ b/sw/source/ui/vba/vbaaddins.hxx @@ -37,8 +37,8 @@ public: // SwVbaAddins_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_ADDINS_HXX */ diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 88cf4786edb0..35e6d6ec60c2 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; -using ::rtl::OUString; SwVbaApplication::SwVbaApplication( uno::Reference& xContext ): SwVbaApplication_BASE( xContext ) { @@ -57,10 +56,10 @@ SfxObjectShell* SwVbaApplication::GetDocShell( const uno::Reference< frame::XMod return static_cast< SfxObjectShell* >( word::getDocShell( xModel ) ); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaApplication::getName() throw (uno::RuntimeException) { - static rtl::OUString appName("Microsoft Word" ); + static OUString appName("Microsoft Word" ); return appName; } @@ -172,20 +171,20 @@ SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException) return getCurrentWordDoc( mxContext ); } -rtl::OUString +OUString SwVbaApplication::getServiceImplName() { - return rtl::OUString("SwVbaApplication"); + return OUString("SwVbaApplication"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaApplication::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Application" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Application" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index c15f6e8c9a63..1009c877dbc5 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -42,7 +42,7 @@ public: virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XApplication - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException); @@ -59,8 +59,8 @@ public: virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException); virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); protected: virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException); }; diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 0d3f165b4985..e46b0c8dd745 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -41,14 +41,14 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R if( pWhere ) { uno::Reference< text::XTextRange > xTextRange = pWhere->getXTextRange(); - xTextRange->setString( rtl::OUString("x") ); // set marker + xTextRange->setString( OUString("x") ); // set marker uno::Reference< text::XTextRange > xEndMarker = xTextRange->getEnd(); - xEndMarker->setString( rtl::OUString("x") ); // set marker + xEndMarker->setString( OUString("x") ); // set marker uno::Reference< text::XText > xText = pWhere->getXText(); mxEntry->applyTo( xEndMarker->getStart() ); uno::Reference< text::XTextCursor > xTC = xText->createTextCursorByRange( xTextRange->getStart() ); xTC->goRight( 1, sal_True ); - xTC->setString( rtl::OUString("") ); // remove marker + xTC->setString( OUString("") ); // remove marker // remove the blank paragraph if it is a rich text sal_Bool bRich = sal_False; _richtext >>= bRich; @@ -63,32 +63,32 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R uno::Reference< text::XTextViewCursor > xTVCursor = word::getXTextViewCursor( xModel ); uno::Reference< text::XTextRange > xCurrentRange( xTC->getEnd(), uno::UNO_QUERY_THROW ); xTVCursor->gotoRange( xCurrentRange, sal_False ); - rtl::OUString url = rtl::OUString( ".uno:Delete"); + OUString url = OUString( ".uno:Delete"); dispatchRequests( xModel,url ); xTVCursor->gotoRange( xEndMarker->getEnd(), sal_False ); } } - xEndMarker->setString( rtl::OUString("") ); // remove marker + xEndMarker->setString( OUString("") ); // remove marker xTC = xText->createTextCursorByRange( xEndMarker->getEnd() ); pWhere->setXTextCursor( xTC ); } return uno::Reference< word::XRange >( pWhere ); } -rtl::OUString +OUString SwVbaAutoTextEntry::getServiceImplName() { - return rtl::OUString("SwVbaAutoTextEntry"); + return OUString("SwVbaAutoTextEntry"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaAutoTextEntry::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.AutoTextEntry" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.AutoTextEntry" ); } return aServiceNames; } @@ -107,7 +107,7 @@ SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException) uno::Reference< container::XEnumeration > SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Any @@ -117,20 +117,20 @@ SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XAutoTextEntry >( new SwVbaAutoTextEntry( this, mxContext, xEntry ) ) ); } -rtl::OUString +OUString SwVbaAutoTextEntries::getServiceImplName() { - return rtl::OUString("SwVbaAutoTextEntries"); + return OUString("SwVbaAutoTextEntries"); } -css::uno::Sequence +css::uno::Sequence SwVbaAutoTextEntries::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.AutoTextEntries"); + sNames[0] = OUString("ooo.vba.word.AutoTextEntries"); } return sNames; } diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index 38349473300a..e286b0f05b05 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -42,8 +42,8 @@ public: virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; @@ -65,8 +65,8 @@ public: // SwVbaAutoTextEntries_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_AUTOTEXTENTRY_HXX */ diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx index 0120130fb669..cafe3bef44c3 100644 --- a/sw/source/ui/vba/vbabookmark.cxx +++ b/sw/source/ui/vba/vbabookmark.cxx @@ -32,7 +32,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; SwVbaBookmark::SwVbaBookmark( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, - const css::uno::Reference< frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ) : + const css::uno::Reference< frame::XModel >& rModel, const OUString& rName ) throw ( css::uno::RuntimeException ) : SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maName( rName ), mbValid( true ) { uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( mxModel, uno::UNO_QUERY_THROW ); @@ -46,7 +46,7 @@ SwVbaBookmark::~SwVbaBookmark() void SwVbaBookmark::checkVality() throw ( uno::RuntimeException ) { if( !mbValid ) - throw uno::RuntimeException( rtl::OUString("The bookmark is not valid" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("The bookmark is not valid" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException ) @@ -64,12 +64,12 @@ void SAL_CALL SwVbaBookmark::Select() throw ( uno::RuntimeException ) xSelectSupp->select( uno::makeAny( mxBookmark ) ); } -rtl::OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException ) +OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException ) { return maName; } -void SAL_CALL SwVbaBookmark::setName( const rtl::OUString& _name ) throw ( uno::RuntimeException ) +void SAL_CALL SwVbaBookmark::setName( const OUString& _name ) throw ( uno::RuntimeException ) { uno::Reference< container::XNamed > xNamed( mxBookmark, uno::UNO_QUERY_THROW ); xNamed->setName( _name ); @@ -83,20 +83,20 @@ uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException ) return uno::makeAny( uno::Reference< word::XRange>( new SwVbaRange( this, mxContext, xTextDocument, xTextRange->getStart(), xTextRange->getEnd(), xTextRange->getText() ) ) ); } -rtl::OUString +OUString SwVbaBookmark::getServiceImplName() { - return rtl::OUString("SwVbaBookmark"); + return OUString("SwVbaBookmark"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaBookmark::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Bookmark" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Bookmark" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index 7343a541096f..a49b292da25b 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -32,7 +32,7 @@ class SwVbaBookmark : public SwVbaBookmark_BASE private: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::text::XTextContent > mxBookmark; - rtl::OUString maName; + OUString maName; bool mbValid; private: @@ -40,19 +40,19 @@ private: public: SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ); + const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rName ) throw ( css::uno::RuntimeException ); virtual ~SwVbaBookmark(); // Methods - virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException ); - virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException ); + virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException ); + virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException ); virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException ); virtual void SAL_CALL Select() throw ( css::uno::RuntimeException ); virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_BOOKMARK_HXX */ diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index aae43bfb1eb5..08515b1f9f8d 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -39,7 +39,7 @@ public: virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( m_xParent, m_xContext, mxModel, aName ) ) ); } @@ -62,17 +62,17 @@ public: virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return mxIndexAccess->getElementType(); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return mxIndexAccess->hasElements(); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return cachePos; } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { return mxNameAccess->getElementNames(); } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { if( mxNameAccess->hasByName( aName ) ) { @@ -84,7 +84,7 @@ public: for( sal_Int32 nIndex = 0; nIndex < mxIndexAccess->getCount(); nIndex++ ) { uno::Reference< container::XNamed > xNamed( mxIndexAccess->getByIndex( nIndex ), uno::UNO_QUERY_THROW ); - rtl::OUString aBookmarkName = xNamed->getName(); + OUString aBookmarkName = xNamed->getName(); if( aName.equalsIgnoreAsciiCase( aBookmarkName ) ) { cachePos <<= xNamed; @@ -127,27 +127,27 @@ uno::Any SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource ) { uno::Reference< container::XNamed > xNamed( aSource, uno::UNO_QUERY_THROW ); - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) ); } -void SwVbaBookmarks::removeBookmarkByName( const rtl::OUString& rName ) throw (uno::RuntimeException) +void SwVbaBookmarks::removeBookmarkByName( const OUString& rName ) throw (uno::RuntimeException) { uno::Reference< text::XTextContent > xBookmark( m_xNameAccess->getByName( rName ), uno::UNO_QUERY_THROW ); word::getXTextViewCursor( mxModel )->getText()->removeTextContent( xBookmark ); } -void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const rtl::OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException) +void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xDocMSF( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance( rtl::OUString("com.sun.star.text.Bookmark") ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance( OUString("com.sun.star.text.Bookmark") ), uno::UNO_QUERY_THROW ); uno::Reference< container::XNamed > xNamed( xBookmark, uno::UNO_QUERY_THROW ); xNamed->setName( rName ); rTextRange->getText()->insertTextContent( rTextRange, xBookmark, sal_False ); } uno::Any SAL_CALL -SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException) +SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException) { uno::Reference< text::XTextRange > xTextRange; uno::Reference< word::XRange > xRange; @@ -164,7 +164,7 @@ SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw } // remove the exist bookmark - rtl::OUString aName = rName; + OUString aName = rName; if( m_xNameAccess->hasByName( aName ) ) removeBookmarkByName( aName ); @@ -198,26 +198,26 @@ SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeEx } sal_Bool SAL_CALL -SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException) +SwVbaBookmarks::Exists( const OUString& rName ) throw (css::uno::RuntimeException) { sal_Bool bExist = m_xNameAccess->hasByName( rName ); return bExist; } -rtl::OUString +OUString SwVbaBookmarks::getServiceImplName() { - return rtl::OUString("SwVbaBookmarks"); + return OUString("SwVbaBookmarks"); } -css::uno::Sequence +css::uno::Sequence SwVbaBookmarks::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Bookmarks"); + sNames[0] = OUString("ooo.vba.word.Bookmarks"); } return sNames; } diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx index d0eb92333ae6..4016233b7707 100644 --- a/sw/source/ui/vba/vbabookmarks.hxx +++ b/sw/source/ui/vba/vbabookmarks.hxx @@ -38,21 +38,21 @@ private: css::uno::Reference< css::text::XText > mxText; private: - void removeBookmarkByName( const rtl::OUString& rName ) throw (css::uno::RuntimeException); + void removeBookmarkByName( const OUString& rName ) throw (css::uno::RuntimeException); public: SwVbaBookmarks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xBookmarks, const css::uno::Reference< css::frame::XModel >& xModel ); virtual ~SwVbaBookmarks() {} - static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const rtl::OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException); + static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // SwVbaBookmarks_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); // XBookmarks virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException); @@ -60,8 +60,8 @@ public: virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException); virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException); }; #endif /* SW_VBA_BOOKMARKS_HXX */ diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 293b56189f20..38825f64f531 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -39,7 +39,7 @@ typedef InheritedHelperInterfaceImpl1 SwVbaBorder_Base; // borders, the enumeration will match the order in this list static const sal_Int16 supportedIndexTable[] = { word::WdBorderType::wdBorderBottom, word::WdBorderType::wdBorderDiagonalDown, word::WdBorderType::wdBorderDiagonalUp, word::WdBorderType::wdBorderHorizontal, word::WdBorderType::wdBorderLeft, word::WdBorderType::wdBorderRight, word::WdBorderType::wdBorderTop, word::WdBorderType::wdBorderVertical }; -const static rtl::OUString sTableBorder("TableBorder"); +const static OUString sTableBorder("TableBorder"); // Equiv widths in in 1/100 mm const static sal_Int32 OOLineThin = 35; @@ -140,18 +140,18 @@ private: } SwVbaBorder(); // no impl protected: - virtual rtl::OUString getServiceImplName() + virtual OUString getServiceImplName() { - return rtl::OUString("SwVbaBorder"); + return OUString("SwVbaBorder"); } - virtual css::uno::Sequence getServiceNames() + virtual css::uno::Sequence getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Border" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Border" ); } return aServiceNames; } @@ -226,12 +226,12 @@ public: break; } default: - throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } }; @@ -351,20 +351,20 @@ void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::Runtim // TODO: } -rtl::OUString +OUString SwVbaBorders::getServiceImplName() { - return rtl::OUString("SwVbaBorders"); + return OUString("SwVbaBorders"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaBorders::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Borders" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Borders" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx index 3e32f3c93d45..61e0679177dc 100644 --- a/sw/source/ui/vba/vbaborders.hxx +++ b/sw/source/ui/vba/vbaborders.hxx @@ -47,8 +47,8 @@ public: virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException); virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SW_VBA_BORDERS_HXX diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx index 4ffbf5d4d232..7756099e6423 100644 --- a/sw/source/ui/vba/vbacell.cxx +++ b/sw/source/ui/vba/vbacell.cxx @@ -88,20 +88,20 @@ void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule ) throw ( setHeight( uno::makeAny( height ) ); } -rtl::OUString +OUString SwVbaCell::getServiceImplName() { - return rtl::OUString("SwVbaCell"); + return OUString("SwVbaCell"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaCell::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Cell" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Cell" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx index 4d116e7da586..40ee0e1d182b 100644 --- a/sw/source/ui/vba/vbacell.hxx +++ b/sw/source/ui/vba/vbacell.hxx @@ -50,8 +50,8 @@ public: virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_CELL_HXX */ diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index d70b9cd9b4d5..37028bfd6a16 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -192,20 +192,20 @@ SwVbaCells::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaCells::getServiceImplName() { - return rtl::OUString("SwVbaCells"); + return OUString("SwVbaCells"); } -uno::Sequence +uno::Sequence SwVbaCells::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Cells"); + sNames[0] = OUString("ooo.vba.word.Cells"); } return sNames; } diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx index 0e3f2a1e4fbb..95dd41f52cf7 100644 --- a/sw/source/ui/vba/vbacells.hxx +++ b/sw/source/ui/vba/vbacells.hxx @@ -55,8 +55,8 @@ public: // SwVbaCells_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_CELLS_HXX */ diff --git a/sw/source/ui/vba/vbacheckbox.cxx b/sw/source/ui/vba/vbacheckbox.cxx index 7eafde40289d..f5d6e9c9ee29 100644 --- a/sw/source/ui/vba/vbacheckbox.cxx +++ b/sw/source/ui/vba/vbacheckbox.cxx @@ -30,10 +30,10 @@ using namespace ::com::sun::star; SwVbaCheckBox::SwVbaCheckBox( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& rModel, const uno::Reference< text::XFormField >& xFormField ) throw ( uno::RuntimeException ) : SwVbaCheckBox_BASE( rParent, rContext ), mxModel( rModel ), mxFormField( xFormField ) { - rtl::OUString sType = mxFormField->getFieldType(); + OUString sType = mxFormField->getFieldType(); if( !sType.equalsIgnoreAsciiCaseAscii( ECMA_FORMCHECKBOX ) ) { - throw uno::RuntimeException( rtl::OUString( + throw uno::RuntimeException( OUString( "It is not a CheckBox"), uno::Reference< uno::XInterface >() ); } } @@ -62,24 +62,24 @@ sal_Bool SAL_CALL SwVbaCheckBox::getValue() throw ( uno::RuntimeException ) void SAL_CALL SwVbaCheckBox::setValue( sal_Bool value ) throw ( uno::RuntimeException ) { - rtl::OUString sValue = value ? rtl::OUString("on") : rtl::OUString("off"); - mxFormField->addParam( rtl::OUString( ECMA_FORMCHECKBOX_CHECKED ), sValue, sal_True ); + OUString sValue = value ? OUString("on") : OUString("off"); + mxFormField->addParam( OUString( ECMA_FORMCHECKBOX_CHECKED ), sValue, sal_True ); } -rtl::OUString +OUString SwVbaCheckBox::getServiceImplName() { - return rtl::OUString("SwVbaCheckBox"); + return OUString("SwVbaCheckBox"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaCheckBox::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.word.CheckBox" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.word.CheckBox" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacheckbox.hxx b/sw/source/ui/vba/vbacheckbox.hxx index d450f11996c6..d305ea26c56f 100644 --- a/sw/source/ui/vba/vbacheckbox.hxx +++ b/sw/source/ui/vba/vbacheckbox.hxx @@ -41,8 +41,8 @@ public: void SAL_CALL setValue( sal_Bool value ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_CHECKBOX_HXX */ diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx index a4a20c3bd597..2093e4b9aae2 100644 --- a/sw/source/ui/vba/vbacolumn.cxx +++ b/sw/source/ui/vba/vbacolumn.cxx @@ -62,35 +62,35 @@ SwVbaColumn::Select( ) throw ( uno::RuntimeException ) void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw ( uno::RuntimeException ) { - rtl::OUStringBuffer aRangeName; - rtl::OUString sStartCol = SwVbaTableHelper::getColumnStr( nStartColumn ); + OUStringBuffer aRangeName; + OUString sStartCol = SwVbaTableHelper::getColumnStr( nStartColumn ); aRangeName.append(sStartCol).append(sal_Int32( 1 ) ); - rtl::OUString sEndCol = SwVbaTableHelper::getColumnStr( nEndColumn ); + OUString sEndCol = SwVbaTableHelper::getColumnStr( nEndColumn ); sal_Int32 nRowCount = xTextTable->getRows()->getCount(); aRangeName.append(':').append( sEndCol ).append( sal_Int32( nRowCount ) ); uno::Reference< table::XCellRange > xCellRange( xTextTable, uno::UNO_QUERY_THROW ); - rtl::OUString sSelRange = aRangeName.makeStringAndClear(); + OUString sSelRange = aRangeName.makeStringAndClear(); uno::Reference< table::XCellRange > xSelRange = xCellRange->getCellRangeByName( sSelRange ); uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); xSelection->select( uno::makeAny( xSelRange ) ); } -rtl::OUString +OUString SwVbaColumn::getServiceImplName() { - return rtl::OUString("SwVbaColumn"); + return OUString("SwVbaColumn"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaColumn::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Column" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Column" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx index 1165069f5a2f..b116b690d798 100644 --- a/sw/source/ui/vba/vbacolumn.hxx +++ b/sw/source/ui/vba/vbacolumn.hxx @@ -47,8 +47,8 @@ public: static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_COLUMN_HXX */ diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index b9a9afb2c195..f41d6a4bcba0 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -104,11 +104,11 @@ uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /* { if( nIndex <= 0 || nIndex > getCount() ) { - throw lang::IndexOutOfBoundsException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw lang::IndexOutOfBoundsException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( uno::Reference< word::XColumn >( new SwVbaColumn( this, mxContext, mxTextTable, nIndex - 1 ) ) ); } - throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -129,20 +129,20 @@ SwVbaColumns::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaColumns::getServiceImplName() { - return rtl::OUString("SwVbaColumns"); + return OUString("SwVbaColumns"); } -uno::Sequence +uno::Sequence SwVbaColumns::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Columns"); + sNames[0] = OUString("ooo.vba.word.Columns"); } return sNames; } diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx index 1c91eab497e9..023e2ab4405c 100644 --- a/sw/source/ui/vba/vbacolumns.hxx +++ b/sw/source/ui/vba/vbacolumns.hxx @@ -57,8 +57,8 @@ public: // SwVbaColumns_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_COLUMNS_HXX */ diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx index 547ba47f8f49..73397041d631 100644 --- a/sw/source/ui/vba/vbadialog.cxx +++ b/sw/source/ui/vba/vbadialog.cxx @@ -37,33 +37,33 @@ static const WordDialogTable aWordDialogTable[] = { 0, 0 } }; -rtl::OUString +OUString SwVbaDialog::mapIndexToName( sal_Int32 nIndex ) { for( const WordDialogTable* pTable = aWordDialogTable; pTable != NULL; pTable++ ) { if( nIndex == pTable->wdDialog ) { - return rtl::OUString::createFromAscii( pTable->ooDialog ); + return OUString::createFromAscii( pTable->ooDialog ); } } - return rtl::OUString(); + return OUString(); } -rtl::OUString +OUString SwVbaDialog::getServiceImplName() { - return rtl::OUString("SwVbaDialog"); + return OUString("SwVbaDialog"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaDialog::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Dialog" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Dialog" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx index 633515df8c7b..2036cea8dc5d 100644 --- a/sw/source/ui/vba/vbadialog.hxx +++ b/sw/source/ui/vba/vbadialog.hxx @@ -33,10 +33,10 @@ public: virtual ~SwVbaDialog() {} // Methods - virtual rtl::OUString mapIndexToName( sal_Int32 nIndex ); + virtual OUString mapIndexToName( sal_Int32 nIndex ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_DIALOG_HXX */ diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx index ac1e5bc5cd87..db1f53019836 100644 --- a/sw/source/ui/vba/vbadialogs.cxx +++ b/sw/source/ui/vba/vbadialogs.cxx @@ -32,20 +32,20 @@ SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) return uno::Any( aDialog ); } -rtl::OUString +OUString SwVbaDialogs::getServiceImplName() { - return rtl::OUString("SwVbaDialogs"); + return OUString("SwVbaDialogs"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaDialogs::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Dialogs" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Dialogs" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx index d4a1187bfb44..f4bf15bd765c 100644 --- a/sw/source/ui/vba/vbadialogs.hxx +++ b/sw/source/ui/vba/vbadialogs.hxx @@ -38,8 +38,8 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_DIALOGS_HXX */ diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index fa2402e0adbe..829d44d51960 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -118,7 +118,7 @@ SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) throw ( uno } catch(const uno::Exception&) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd ) ); @@ -240,10 +240,10 @@ SwVbaDocument::PageSetup( ) throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) ); } -rtl::OUString +OUString SwVbaDocument::getServiceImplName() { - return rtl::OUString("SwVbaDocument"); + return OUString("SwVbaDocument"); } uno::Any SAL_CALL @@ -253,7 +253,7 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException) uno::Reference const xDocPropSupp( getModel(), uno::UNO_QUERY_THROW); uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); - rtl::OUString sTemplateUrl = xDocProps->getTemplateURL(); + OUString sTemplateUrl = xDocProps->getTemplateURL(); xTemplate = new SwVbaTemplate( this, mxContext, getModel(), sTemplateUrl ); return uno::makeAny( xTemplate ); @@ -262,12 +262,12 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException) void SAL_CALL SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException) { - rtl::OUString sTemplate; + OUString sTemplate; if( !( _attachedtemplate >>= sTemplate ) ) { throw uno::RuntimeException(); } - rtl::OUString aURL; + OUString aURL; INetURLObject aObj; aObj.SetURL( sTemplate ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; @@ -326,7 +326,7 @@ void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( ::sal_Bool /*_updatestyleson // check this property only in default paragraph style sal_Bool IsAutoHyphenation = sal_False; uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->getPropertyValue( rtl::OUString("ParaIsHyphenation") ) >>= IsAutoHyphenation; + xParaProps->getPropertyValue( OUString("ParaIsHyphenation") ) >>= IsAutoHyphenation; return IsAutoHyphenation; } @@ -334,7 +334,7 @@ void SAL_CALL SwVbaDocument::setAutoHyphenation( ::sal_Bool _autohyphenation ) t { //TODO uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->setPropertyValue( rtl::OUString("ParaIsHyphenation"), uno::makeAny( _autohyphenation ) ); + xParaProps->setPropertyValue( OUString("ParaIsHyphenation"), uno::makeAny( _autohyphenation ) ); } ::sal_Int32 SAL_CALL SwVbaDocument::getHyphenationZone() throw (uno::RuntimeException) @@ -353,7 +353,7 @@ void SAL_CALL SwVbaDocument::setHyphenationZone( ::sal_Int32 /*_hyphenationzone* //TODO sal_Int16 nHyphensLimit = 0; uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->getPropertyValue( rtl::OUString("ParaHyphenationMaxHyphens") ) >>= nHyphensLimit; + xParaProps->getPropertyValue( OUString("ParaHyphenationMaxHyphens") ) >>= nHyphensLimit; return nHyphensLimit; } @@ -361,7 +361,7 @@ void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit( ::sal_Int32 _consecutiv { sal_Int16 nHyphensLimit = static_cast< sal_Int16 >( _consecutivehyphenslimit ); uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); - xParaProps->setPropertyValue( rtl::OUString("ParaHyphenationMaxHyphens"), uno::makeAny( nHyphensLimit ) ); + xParaProps->setPropertyValue( OUString("ParaHyphenationMaxHyphens"), uno::makeAny( nHyphensLimit ) ); } void SAL_CALL SwVbaDocument::Protect( ::sal_Int32 /*Type*/, const uno::Any& /*NOReset*/, const uno::Any& /*Password*/, const uno::Any& /*UseIRM*/, const uno::Any& /*EnforceStyleLock*/ ) throw (uno::RuntimeException) @@ -377,13 +377,13 @@ void SAL_CALL SwVbaDocument::PrintOut( const uno::Any& /*Background*/, const uno void SAL_CALL SwVbaDocument::PrintPreview( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( ".uno:PrintPreview"); + OUString url = OUString( ".uno:PrintPreview"); dispatchRequests( mxModel,url ); } void SAL_CALL SwVbaDocument::ClosePrintPreview( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( ".uno:ClosePreview"); + OUString url = OUString( ".uno:ClosePreview"); dispatchRequests( mxModel,url ); } @@ -410,7 +410,7 @@ SwVbaDocument::Frames( const uno::Any& index ) throw (uno::RuntimeException) } uno::Any -SwVbaDocument::getControlShape( const ::rtl::OUString& sName ) +SwVbaDocument::getControlShape( const OUString& sName ) { uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW ); @@ -440,38 +440,38 @@ SwVbaDocument::getIntrospection( ) throw (uno::RuntimeException) } uno::Any SAL_CALL -SwVbaDocument::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +SwVbaDocument::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { OSL_TRACE("** SwVbaDocument::invoke( %s ), will barf", - rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); throw uno::RuntimeException(); // unsupported operation } void SAL_CALL -SwVbaDocument::setValue( const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +SwVbaDocument::setValue( const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { throw uno::RuntimeException(); // unsupported operation } uno::Any SAL_CALL -SwVbaDocument::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) +SwVbaDocument::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); uno::Reference xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); return uno::makeAny( xControl ); } ::sal_Bool SAL_CALL -SwVbaDocument::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException) +SwVbaDocument::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException) { return sal_False; } ::sal_Bool SAL_CALL -SwVbaDocument::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException) +SwVbaDocument::hasProperty( const OUString& aName ) throw (uno::RuntimeException) { uno::Reference< container::XNameAccess > xFormControls( getFormControls() ); if ( xFormControls.is() ) @@ -499,14 +499,14 @@ SwVbaDocument::getFormControls() return xFormControls; } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaDocument::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Document" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Document" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx index 3760139840fe..c1f4469dbada 100644 --- a/sw/source/ui/vba/vbadocument.hxx +++ b/sw/source/ui/vba/vbadocument.hxx @@ -32,7 +32,7 @@ private: css::uno::Reference< css::text::XTextDocument > mxTextDocument; void Initialize(); - css::uno::Any getControlShape( const rtl::OUString& sName ); + css::uno::Any getControlShape( const OUString& sName ); css::uno::Reference< css::container::XNameAccess > getFormControls(); public: @@ -79,15 +79,15 @@ public: // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_DOCUMENT_HXX */ diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index db8f40865ce6..9a3701a033c8 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -74,8 +74,8 @@ public: uno::UNO_SET_THROW); } virtual ~PropertGetSetHelper() {} - virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) = 0; - virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue ) = 0; + virtual uno::Any getPropertyValue( const OUString& rPropName ) = 0; + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) = 0; virtual uno::Reference< beans::XPropertySet > getUserDefinedProperties() { return uno::Reference( m_xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW); @@ -89,7 +89,7 @@ public: BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) { } - virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) { if ( rPropName == "EditingDuration" ) { @@ -150,7 +150,7 @@ public: return getUserDefinedProperties()->getPropertyValue(rPropName); } } - virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue ) + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) { if ("EditingDuration" == rPropName) { @@ -270,12 +270,12 @@ public: CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel ) { } - virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) { return getUserDefinedProperties()->getPropertyValue(rPropName); } virtual void setPropertyValue( - const rtl::OUString& rPropName, const uno::Any& rValue) + const OUString& rPropName, const uno::Any& rValue) { return getUserDefinedProperties()->setPropertyValue(rPropName, rValue); } @@ -291,7 +291,7 @@ public: mxModelProps.set( m_xModel, uno::UNO_QUERY_THROW ); mpDocShell = word::getDocShell( xModel ); } - virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) + virtual uno::Any getPropertyValue( const OUString& rPropName ) { try { @@ -336,7 +336,7 @@ public: return aReturn; } - virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue ) + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) { uno::Sequence< beans::NamedValue > stats( m_xDocProps->getDocumentStatistics()); @@ -357,11 +357,11 @@ public: class DocPropInfo { public: - rtl::OUString msMSODesc; - rtl::OUString msOOOPropName; + OUString msMSODesc; + OUString msOOOPropName; boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper; - static DocPropInfo createDocPropInfo( const rtl::OUString& sDesc, const rtl::OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper ) + static DocPropInfo createDocPropInfo( const OUString& sDesc, const OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper ) { DocPropInfo aItem; aItem.msMSODesc = sDesc; @@ -372,7 +372,7 @@ public: static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper ) { - return createDocPropInfo( rtl::OUString::createFromAscii( sDesc ), rtl::OUString::createFromAscii( sPropName ), rHelper ); + return createDocPropInfo( OUString::createFromAscii( sDesc ), OUString::createFromAscii( sPropName ), rHelper ); } uno::Any getValue() { @@ -453,21 +453,21 @@ public: SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ); // XDocumentProperty virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException); virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException); virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException); virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException); - virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException); + virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException); + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException); //XDefaultProperty - virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException) { return rtl::OUString("Value"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException) { return OUString("Value"); } // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual uno::Sequence getServiceNames(); }; class SwVbaCustomDocumentProperty : public SwVbaBuiltInDocumentProperty @@ -479,10 +479,10 @@ public: virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException); - virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException); + virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException); + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException); virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException); }; @@ -504,21 +504,21 @@ SwVbaCustomDocumentProperty::setLinkToContent( sal_Bool /*bLinkContent*/ ) throw { } -rtl::OUString +OUString SwVbaCustomDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException) { // #FIXME we need to store the link content somewhere - return rtl::OUString(); + return OUString(); } void -SwVbaCustomDocumentProperty::setLinkSource( const rtl::OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaCustomDocumentProperty::setLinkSource( const OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // #FIXME we need to store the link source somewhere } void SAL_CALL -SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaCustomDocumentProperty::setName( const OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // setName on existing property ? // #FIXME @@ -551,14 +551,14 @@ SwVbaBuiltInDocumentProperty::Delete( ) throw (script::BasicErrorException, uno throw uno::RuntimeException(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaBuiltInDocumentProperty::getName( ) throw (script::BasicErrorException, uno::RuntimeException) { return mPropInfo.msMSODesc; } void SAL_CALL -SwVbaBuiltInDocumentProperty::setName( const rtl::OUString& ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaBuiltInDocumentProperty::setName( const OUString& ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin throw uno::RuntimeException(); @@ -605,7 +605,7 @@ SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) throw (script::B mPropInfo.setValue( Value ); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaBuiltInDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin @@ -613,26 +613,26 @@ SwVbaBuiltInDocumentProperty::getLinkSource( ) throw (script::BasicErrorExcepti } void SAL_CALL -SwVbaBuiltInDocumentProperty::setLinkSource( const rtl::OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaBuiltInDocumentProperty::setLinkSource( const OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) { // not valid for Builtin throw uno::RuntimeException(); } -rtl::OUString +OUString SwVbaBuiltInDocumentProperty::getServiceImplName() { - return rtl::OUString("SwVbaBuiltinDocumentProperty"); + return OUString("SwVbaBuiltinDocumentProperty"); } -uno::Sequence +uno::Sequence SwVbaBuiltInDocumentProperty::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.DocumentProperty" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.DocumentProperty" ); } return aServiceNames; } @@ -663,7 +663,7 @@ public: } }; -typedef boost::unordered_map< rtl::OUString, uno::Reference< XDocumentProperty >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > DocPropsByName; +typedef boost::unordered_map< OUString, uno::Reference< XDocumentProperty >, OUStringHash, ::std::equal_to< OUString > > DocPropsByName; class BuiltInPropertiesImpl : public PropertiesImpl_BASE { @@ -699,7 +699,7 @@ protected: throw lang::IndexOutOfBoundsException(); return uno::makeAny( it->second ); } - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -707,17 +707,17 @@ protected: return uno::Any( it->second ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > aNames( getCount() ); - rtl::OUString* pName = aNames.getArray(); + uno::Sequence< OUString > aNames( getCount() ); + OUString* pName = aNames.getArray(); DocPropsByName::iterator it_end = mNamedDocProps.end(); for( DocPropsByName::iterator it = mNamedDocProps.begin(); it != it_end; ++it, ++pName ) *pName = it->first; return aNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { DocPropsByName::iterator it = mNamedDocProps.find( aName ); if ( it == mNamedDocProps.end() ) @@ -744,10 +744,10 @@ SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Refer } uno::Reference< XDocumentProperty > SAL_CALL -SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaBuiltinDocumentProperties::Add( const OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException) { throw uno::RuntimeException( - rtl::OUString("not supported for Builtin properties"), uno::Reference< uno::XInterface >() ); + OUString("not supported for Builtin properties"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -773,20 +773,20 @@ SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource } // XHelperInterface -rtl::OUString +OUString SwVbaBuiltinDocumentProperties::getServiceImplName() { - return rtl::OUString("SwVbaBuiltinDocumentProperties"); + return OUString("SwVbaBuiltinDocumentProperties"); } -uno::Sequence +uno::Sequence SwVbaBuiltinDocumentProperties::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.DocumentProperties" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.DocumentProperties" ); } return aServiceNames; } @@ -822,7 +822,7 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -831,21 +831,21 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); - uno::Sequence< rtl::OUString > aNames( aProps.getLength() ); - rtl::OUString* pString = aNames.getArray(); - rtl::OUString* pEnd = ( pString + aNames.getLength() ); + uno::Sequence< OUString > aNames( aProps.getLength() ); + OUString* pString = aNames.getArray(); + OUString* pEnd = ( pString + aNames.getLength() ); beans::Property* pProp = aProps.getArray(); for ( ; pString != pEnd; ++pString, ++pProp ) *pString = pProp->Name; return aNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { - OSL_TRACE("hasByName(%s) returns %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) ); + OSL_TRACE("hasByName(%s) returns %d", OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) ); return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ); } @@ -873,7 +873,7 @@ public: return new DocPropEnumeration( simpleDocPropSnapShot ); } - void addProp( const ::rtl::OUString& Name, ::sal_Int8 /*Type*/, const uno::Any& Value ) + void addProp( const OUString& Name, ::sal_Int8 /*Type*/, const uno::Any& Value ) { sal_Int16 attributes = 128; uno::Reference< beans::XPropertyContainer > xContainer( mxUserDefinedProp, uno::UNO_QUERY_THROW ); @@ -892,13 +892,13 @@ SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Referen } uno::Reference< XDocumentProperty > SAL_CALL -SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException) +SwVbaCustomDocumentProperties::Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException) { CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() ); uno::Reference< XDocumentProperty > xDocProp; if ( pCustomProps ) { - rtl::OUString sLinkSource; + OUString sLinkSource; pCustomProps->addProp( Name, Type, Value ); xDocProp.set( m_xNameAccess->getByName( Name ), uno::UNO_QUERY_THROW ); @@ -911,10 +911,10 @@ SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool Link } // XHelperInterface -rtl::OUString +OUString SwVbaCustomDocumentProperties::getServiceImplName() { - return rtl::OUString("SwVbaCustomDocumentProperties"); + return OUString("SwVbaCustomDocumentProperties"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index 5842039f13b3..cbe1b7b81fd3 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -34,7 +34,7 @@ public: SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); @@ -42,8 +42,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties @@ -51,9 +51,9 @@ class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties public: SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); + virtual OUString getServiceImplName(); }; #endif /* SW_VBA_DOCUMENTPROPERTY_HXX */ diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 5e55df3a67c9..b05bdd1bca90 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -107,7 +107,7 @@ SwVbaDocuments::createCollectionObject( const uno::Any& aSource ) uno::Any SAL_CALL SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, const uno::Any& /*DocumentType*/, const uno::Any& /*Visible*/ ) throw (uno::RuntimeException) { - rtl::OUString sFileName; + OUString sFileName; if( Template.hasValue() && ( Template >>= sFileName ) ) { return Open( sFileName, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any()); @@ -128,10 +128,10 @@ SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*Origin // #TODO# #FIXME# can any of the unused params below be used? uno::Any SAL_CALL -SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException) +SwVbaDocuments::Open( const OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException) { // we need to detect if this is a URL, if not then assume its a file path - rtl::OUString aURL; + OUString aURL; INetURLObject aObj; aObj.SetURL( Filename ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; @@ -150,20 +150,20 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm return aRet; } -rtl::OUString +OUString SwVbaDocuments::getServiceImplName() { - return rtl::OUString("SwVbaDocuments"); + return OUString("SwVbaDocuments"); } -uno::Sequence +uno::Sequence SwVbaDocuments::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Documents"); + sNames[0] = OUString("ooo.vba.word.Documents"); } return sNames; } diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index 69d37d76a0b5..aaf1529995ff 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -41,12 +41,12 @@ public: // SwVbaDocuments_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); // Methods virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException); virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException); }; diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx index c5c9e93add22..2e0e533be8a3 100644 --- a/sw/source/ui/vba/vbaeventshelper.cxx +++ b/sw/source/ui/vba/vbaeventshelper.cxx @@ -75,11 +75,11 @@ void SwVbaEventsHelper::implPostProcessEvent( EventQueue& /*rEventQueue*/, // nothing to do after any event } -::rtl::OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& /*rInfo*/, +OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& /*rInfo*/, const uno::Sequence< uno::Any >& /*rArgs*/ ) const throw (lang::IllegalArgumentException) { // TODO: get actual codename from document - return ::rtl::OUString( "ThisDocument" ); + return OUString( "ThisDocument" ); } // ============================================================================ diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx index 8e405334396c..92f7d62d1c65 100644 --- a/sw/source/ui/vba/vbaeventshelper.hxx +++ b/sw/source/ui/vba/vbaeventshelper.hxx @@ -36,7 +36,7 @@ protected: virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException); virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); }; // ============================================================================ diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 4e5150fa7dd4..df729ad1c553 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -51,20 +51,20 @@ sal_Bool SAL_CALL SwVbaField::Update() throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString +OUString SwVbaField::getServiceImplName() { - return rtl::OUString("SwVbaField"); + return OUString("SwVbaField"); } -uno::Sequence +uno::Sequence SwVbaField::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Field" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Field" ); } return aServiceNames; } @@ -323,7 +323,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, { sal_Int32 nType = word::WdFieldType::wdFieldEmpty; Type >>= nType; - rtl::OUString sText; + OUString sText; Text >>= sText; String sFieldName; @@ -331,7 +331,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, { SwVbaReadFieldParams aReadParam(sText); sFieldName = aReadParam.GetFieldName(); - OSL_TRACE("SwVbaFields::Add, the field name is %s ",rtl::OUStringToOString( sFieldName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("SwVbaFields::Add, the field name is %s ",OUStringToOString( sFieldName, RTL_TEXTENCODING_UTF8 ).getStr() ); } uno::Reference< text::XTextContent > xTextField; @@ -345,7 +345,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, } else { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } SwVbaRange* pVbaRange = dynamic_cast< SwVbaRange* >( Range.get() ); @@ -355,9 +355,9 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, return uno::Reference< word::XField >( new SwVbaField( mxParent, mxContext, uno::Reference< text::XTextDocument >( mxModel, uno::UNO_QUERY_THROW ), uno::Reference< text::XTextField >( xTextField, uno::UNO_QUERY_THROW ) ) ); } -uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl::OUString _text ) throw (uno::RuntimeException) +uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const OUString _text ) throw (uno::RuntimeException) { - uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( rtl::OUString("com.sun.star.text.TextField.FileName") ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( OUString("com.sun.star.text.TextField.FileName") ), uno::UNO_QUERY_THROW ); sal_Int16 nFileFormat = text::FilenameDisplayFormat::NAME_AND_EXT; if( !_text.isEmpty() ) { @@ -375,14 +375,14 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl aReadParam.SkipToNextToken(); break; default: - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); break; } } } uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW ); - xProps->setPropertyValue( rtl::OUString("FileFormat"), uno::makeAny( nFileFormat ) ); + xProps->setPropertyValue( OUString("FileFormat"), uno::makeAny( nFileFormat ) ); return xTextField; } @@ -424,7 +424,7 @@ static const DocPropertyTable aDocPropertyTables[] = { NULL, NULL } }; -uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const rtl::OUString _text ) throw (uno::RuntimeException) +uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const OUString _text ) throw (uno::RuntimeException) { String aDocProperty; SwVbaReadFieldParams aReadParam( _text ); @@ -444,21 +444,21 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const } } aDocProperty = comphelper::string::remove(aDocProperty, '"'); - OSL_TRACE("SwVbaFields::Create_Field_DocProperty, the document property name is %s ",rtl::OUStringToOString( aDocProperty, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("SwVbaFields::Create_Field_DocProperty, the document property name is %s ",OUStringToOString( aDocProperty, RTL_TEXTENCODING_UTF8 ).getStr() ); if( aDocProperty.Len() == 0 ) { throw uno::RuntimeException(); } bool bCustom = true; - rtl::OUString sFieldService; + OUString sFieldService; // find the build in document properties for( const DocPropertyTable* pTable = aDocPropertyTables; pTable->sDocPropertyName != NULL; pTable++ ) { if( aDocProperty.EqualsIgnoreCaseAscii( pTable->sDocPropertyName ) ) { if( pTable->sFieldService != NULL ) - sFieldService = rtl::OUString::createFromAscii(pTable->sFieldService); + sFieldService = OUString::createFromAscii(pTable->sFieldService); bCustom = false; break; } @@ -466,11 +466,11 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const if( bCustom ) { - sFieldService = rtl::OUString( "com.sun.star.text.textfield.docinfo.Custom" ); + sFieldService = OUString( "com.sun.star.text.textfield.docinfo.Custom" ); } else if( sFieldService.isEmpty() ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< text::XTextField > xTextField( mxMSF->createInstance( sFieldService ), uno::UNO_QUERY_THROW ); @@ -478,8 +478,8 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const if( bCustom ) { uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW ); - rtl::OUString sDocPropertyName( aDocProperty ); - xProps->setPropertyValue( rtl::OUString("Name"), uno::makeAny( sDocPropertyName ) ); + OUString sDocPropertyName( aDocProperty ); + xProps->setPropertyValue( OUString("Name"), uno::makeAny( sDocPropertyName ) ); } return xTextField; @@ -517,10 +517,10 @@ sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString +OUString SwVbaFields::getServiceImplName() { - return rtl::OUString("SwVbaFields"); + return OUString("SwVbaFields"); } // XEnumerationAccess @@ -530,14 +530,14 @@ SwVbaFields::getElementType() throw (uno::RuntimeException) return word::XField::static_type(0); } -uno::Sequence +uno::Sequence SwVbaFields::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Fields" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Fields" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 56092a2af856..8bafae282fde 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -36,8 +36,8 @@ public: virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; // *** SwVbaFields *********************************************** @@ -49,8 +49,8 @@ class SwVbaFields : public SwVbaFields_BASE css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF; private: - css::uno::Reference< css::text::XTextField > Create_Field_FileName( const rtl::OUString _text ) throw (css::uno::RuntimeException); - css::uno::Reference< css::text::XTextField > Create_Field_DocProperty( const rtl::OUString _text ) throw (css::uno::RuntimeException); + css::uno::Reference< css::text::XTextField > Create_Field_FileName( const OUString _text ) throw (css::uno::RuntimeException); + css::uno::Reference< css::text::XTextField > Create_Field_DocProperty( const OUString _text ) throw (css::uno::RuntimeException); public: SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); @@ -64,8 +64,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx index 0dce30854922..bc6deacf8680 100644 --- a/sw/source/ui/vba/vbafind.cxx +++ b/sw/source/ui/vba/vbafind.cxx @@ -57,13 +57,13 @@ bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrent return false; } -void SwVbaFind::SetReplaceWith( const rtl::OUString& rText ) throw (uno::RuntimeException) +void SwVbaFind::SetReplaceWith( const OUString& rText ) throw (uno::RuntimeException) { mxPropertyReplace->setReplaceString( rText ); mbReplace = true; } -rtl::OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException) +OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException) { return mxPropertyReplace->getReplaceString(); } @@ -175,12 +175,12 @@ sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException) return result; } -::rtl::OUString SAL_CALL SwVbaFind::getText() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaFind::getText() throw (uno::RuntimeException) { return mxPropertyReplace->getSearchString(); } -void SAL_CALL SwVbaFind::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException) +void SAL_CALL SwVbaFind::setText( const OUString& _text ) throw (uno::RuntimeException) { mxPropertyReplace->setSearchString( _text ); } @@ -192,20 +192,20 @@ uno::Any SAL_CALL SwVbaFind::getReplacement() throw (uno::RuntimeException) void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } ::sal_Bool SAL_CALL SwVbaFind::getForward() throw (uno::RuntimeException) { sal_Bool bBackward = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchBackwards") ) >>= bBackward; + mxPropertyReplace->getPropertyValue( OUString("SearchBackwards") ) >>= bBackward; return !bBackward; } void SAL_CALL SwVbaFind::setForward( ::sal_Bool _forward ) throw (uno::RuntimeException) { sal_Bool bBackward = !_forward; - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchBackwards"), uno::makeAny( bBackward ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchBackwards"), uno::makeAny( bBackward ) ); } ::sal_Int32 SAL_CALL SwVbaFind::getWrap() throw (uno::RuntimeException) @@ -233,76 +233,76 @@ void SAL_CALL SwVbaFind::setFormat( ::sal_Bool _format ) throw (uno::RuntimeExce ::sal_Bool SAL_CALL SwVbaFind::getMatchCase() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchCaseSensitive") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchCaseSensitive") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchCase( ::sal_Bool _matchcase ) throw (uno::RuntimeException) { - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchCaseSensitive"), uno::makeAny( _matchcase ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchCaseSensitive"), uno::makeAny( _matchcase ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchWords") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchWords") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchWholeWord( ::sal_Bool _matchwholeword ) throw (uno::RuntimeException) { - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchWords"), uno::makeAny( _matchwholeword ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchWords"), uno::makeAny( _matchwholeword ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchRegularExpression") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchRegularExpression") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchWildcards( ::sal_Bool _matchwildcards ) throw (uno::RuntimeException) { - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchRegularExpression"), uno::makeAny( _matchwildcards ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchRegularExpression"), uno::makeAny( _matchwildcards ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarity") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchSimilarity") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchSoundsLike( ::sal_Bool _matchsoundslike ) throw (uno::RuntimeException) { // seems not accurate - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarity"), uno::makeAny( _matchsoundslike ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchSimilarity"), uno::makeAny( _matchsoundslike ) ); } ::sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException) { sal_Bool value = sal_False; - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarity") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchSimilarity") ) >>= value; if( value ) - mxPropertyReplace->getPropertyValue( rtl::OUString("SearchSimilarityRelax") ) >>= value; + mxPropertyReplace->getPropertyValue( OUString("SearchSimilarityRelax") ) >>= value; return value; } void SAL_CALL SwVbaFind::setMatchAllWordForms( ::sal_Bool _matchallwordforms ) throw (uno::RuntimeException) { // seems not accurate - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarity"), uno::makeAny( _matchallwordforms ) ); - mxPropertyReplace->setPropertyValue( rtl::OUString("SearchSimilarityRelax"), uno::makeAny( _matchallwordforms ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchSimilarity"), uno::makeAny( _matchallwordforms ) ); + mxPropertyReplace->setPropertyValue( OUString("SearchSimilarityRelax"), uno::makeAny( _matchallwordforms ) ); } uno::Any SAL_CALL SwVbaFind::getStyle() throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } sal_Bool SAL_CALL @@ -311,7 +311,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u sal_Bool result = sal_False; if( FindText.hasValue() ) { - rtl::OUString sText; + OUString sText; FindText >>= sText; setText( sText ); } @@ -368,7 +368,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u if( ReplaceWith.hasValue() ) { - rtl::OUString sValue; + OUString sValue; ReplaceWith >>= sValue; SetReplaceWith( sValue ); } @@ -392,20 +392,20 @@ SwVbaFind::ClearFormatting( ) throw (uno::RuntimeException) mxPropertyReplace->setSearchAttributes( aSearchAttribs ); } -rtl::OUString +OUString SwVbaFind::getServiceImplName() { - return rtl::OUString("SwVbaFind"); + return OUString("SwVbaFind"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaFind::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Find" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Find" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index 219260269e4d..55167b340e41 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -48,8 +48,8 @@ private: bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException ); bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException ); void SetReplace( sal_Int32 type ); - void SetReplaceWith( const rtl::OUString& rText ) throw ( css::uno::RuntimeException ); - rtl::OUString GetReplaceWith() throw ( css::uno::RuntimeException ); + void SetReplaceWith( const OUString& rText ) throw ( css::uno::RuntimeException ); + OUString GetReplaceWith() throw ( css::uno::RuntimeException ); css::uno::Reference< css::text::XTextRange > FindOneElement() throw ( css::uno::RuntimeException ); sal_Bool SearchReplace() throw ( css::uno::RuntimeException ); @@ -58,8 +58,8 @@ public: virtual ~SwVbaFind(); // Attributes - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException); virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException); @@ -86,8 +86,8 @@ public: virtual void SAL_CALL ClearFormatting( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_FIND_HXX */ diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index ac74b19eebad..7866611bed55 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -74,9 +74,9 @@ private: } } public: - static rtl::OUString propName() + static OUString propName() { - static rtl::OUString sPropName("CharUnderline"); + static OUString sPropName("CharUnderline"); return sPropName; } @@ -126,10 +126,10 @@ SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeExcepti } } -rtl::OUString +OUString SwVbaFont::getServiceImplName() { - return rtl::OUString("SwVbaFont"); + return OUString("SwVbaFont"); } void SAL_CALL @@ -220,14 +220,14 @@ SwVbaFont::getShadow() throw (uno::RuntimeException) return aLongAnyFalse; } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaFont::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Font" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Font" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx index 814318ac43d6..b4b3721e681f 100644 --- a/sw/source/ui/vba/vbafont.hxx +++ b/sw/source/ui/vba/vbafont.hxx @@ -44,8 +44,8 @@ public: virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx index 2fdc03fbbb7d..7384dd6a120a 100644 --- a/sw/source/ui/vba/vbaformfield.cxx +++ b/sw/source/ui/vba/vbaformfield.cxx @@ -37,10 +37,10 @@ SwVbaFormField::~SwVbaFormField() { } -rtl::OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException ) +OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException ) { - rtl::OUString sResult; - rtl::OUString sType = mxFormField->getFieldType(); + OUString sResult; + OUString sType = mxFormField->getFieldType(); if( sType.equalsIgnoreAsciiCaseAscii( ECMA_FORMTEXT ) ) { uno::Reference< text::XTextContent > xTextContent( mxFormField, uno::UNO_QUERY_THROW ); @@ -63,18 +63,18 @@ rtl::OUString SAL_CALL SwVbaFormField::getResult() throw ( uno::RuntimeException } } - sResult = rtl::OUString::valueOf( nValue ); + sResult = OUString::valueOf( nValue ); } else { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return sResult; } -void SAL_CALL SwVbaFormField::setResult( const rtl::OUString& result ) throw ( uno::RuntimeException ) +void SAL_CALL SwVbaFormField::setResult( const OUString& result ) throw ( uno::RuntimeException ) { - rtl::OUString sType = mxFormField->getFieldType(); + OUString sType = mxFormField->getFieldType(); if( sType.equalsIgnoreAsciiCaseAscii( ECMA_FORMTEXT ) ) { uno::Reference< text::XTextContent > xTextContent( mxFormField, uno::UNO_QUERY_THROW ); @@ -87,7 +87,7 @@ void SAL_CALL SwVbaFormField::setResult( const rtl::OUString& result ) throw ( u } else { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } @@ -107,20 +107,20 @@ uno::Any SAL_CALL SwVbaFormField::CheckBox() throw ( uno::RuntimeException ) return uno::makeAny( uno::Reference< word::XCheckBox >( new SwVbaCheckBox( this, mxContext, mxModel, mxFormField ) ) ); } -rtl::OUString +OUString SwVbaFormField::getServiceImplName() { - return rtl::OUString("SwVbaFormField"); + return OUString("SwVbaFormField"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaFormField::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.FormField" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.FormField" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaformfield.hxx b/sw/source/ui/vba/vbaformfield.hxx index 2d55d5a463df..d99849b91a19 100644 --- a/sw/source/ui/vba/vbaformfield.hxx +++ b/sw/source/ui/vba/vbaformfield.hxx @@ -37,15 +37,15 @@ public: virtual ~SwVbaFormField(); // Methods - rtl::OUString SAL_CALL getResult() throw ( css::uno::RuntimeException ); - void SAL_CALL setResult( const rtl::OUString& result ) throw ( css::uno::RuntimeException ); + OUString SAL_CALL getResult() throw ( css::uno::RuntimeException ); + void SAL_CALL setResult( const OUString& result ) throw ( css::uno::RuntimeException ); sal_Bool SAL_CALL getEnabled() throw ( css::uno::RuntimeException ); void SAL_CALL setEnabled( sal_Bool enabled ) throw ( css::uno::RuntimeException ); css::uno::Any SAL_CALL CheckBox() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_FORMFIELD_HXX */ diff --git a/sw/source/ui/vba/vbaformfields.cxx b/sw/source/ui/vba/vbaformfields.cxx index a421088d96ea..ba554fb07fd4 100644 --- a/sw/source/ui/vba/vbaformfields.cxx +++ b/sw/source/ui/vba/vbaformfields.cxx @@ -32,16 +32,16 @@ typedef std::vector< uno::Reference< text::XFormField > > XFormFieldVec; typedef ::cppu::WeakImplHelper1< container::XEnumeration > FormFiledEnumeration_BASE; typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > FormFieldCollectionHelper_BASE; -rtl::OUString lcl_getFormFieldName( const uno::Reference< text::XFormField >& xFormField ) +OUString lcl_getFormFieldName( const uno::Reference< text::XFormField >& xFormField ) { - rtl::OUString sName; + OUString sName; sal_Int32 nCount = xFormField->getParamCount(); for( sal_Int32 i = 0; i < nCount; i++ ) { if( xFormField->getParamName(i).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("Name")) ) { sName = xFormField->getParamValue(i); - OSL_TRACE("lcl_getFormFieldName: %s", rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("lcl_getFormFieldName: %s", OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() ); break; } } @@ -101,17 +101,17 @@ public: virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return word::XFormField::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0 ; } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); uno::Reference< text::XFormField > xFormField( *cachePos, uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XFormField >( new SwVbaFormField( mxParent, mxContext, mxModel, xFormField ) ) ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > sNames( mxFormFields.size() ); - rtl::OUString* pString = sNames.getArray(); + uno::Sequence< OUString > sNames( mxFormFields.size() ); + OUString* pString = sNames.getArray(); XFormFieldVec::iterator it = mxFormFields.begin(); XFormFieldVec::iterator it_end = mxFormFields.end(); for ( ; it != it_end; ++it, ++pString ) @@ -121,7 +121,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { cachePos = mxFormFields.begin(); XFormFieldVec::iterator it_end = mxFormFields.end(); @@ -174,20 +174,20 @@ SwVbaFormFields::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaFormFields::getServiceImplName() { - return rtl::OUString("SwVbaFormFields"); + return OUString("SwVbaFormFields"); } -css::uno::Sequence +css::uno::Sequence SwVbaFormFields::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.FormFields"); + sNames[0] = OUString("ooo.vba.word.FormFields"); } return sNames; } diff --git a/sw/source/ui/vba/vbaformfields.hxx b/sw/source/ui/vba/vbaformfields.hxx index 7b81688385b8..8ce86466a04d 100644 --- a/sw/source/ui/vba/vbaformfields.hxx +++ b/sw/source/ui/vba/vbaformfields.hxx @@ -42,8 +42,8 @@ public: // SwVbaFormFields_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_FORMFIELDS_HXX */ diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx index 3dc5bad28821..4b1564dde8f1 100644 --- a/sw/source/ui/vba/vbaframe.cxx +++ b/sw/source/ui/vba/vbaframe.cxx @@ -43,20 +43,20 @@ void SAL_CALL SwVbaFrame::Select() throw ( uno::RuntimeException ) xSelectSupp->select( uno::makeAny( mxTextFrame ) ); } -rtl::OUString +OUString SwVbaFrame::getServiceImplName() { - return rtl::OUString("SwVbaFrame"); + return OUString("SwVbaFrame"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaFrame::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Frame" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Frame" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx index 2fb130f6bf34..7bde2fc94376 100644 --- a/sw/source/ui/vba/vbaframe.hxx +++ b/sw/source/ui/vba/vbaframe.hxx @@ -40,8 +40,8 @@ public: virtual void SAL_CALL Select() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_FRAME_HXX */ diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index 259584f003d7..84863a268cd0 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -78,20 +78,20 @@ SwVbaFrames::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XFrame > ( new SwVbaFrame( this, mxContext, mxModel, xTextFrame ) ) ); } -rtl::OUString +OUString SwVbaFrames::getServiceImplName() { - return rtl::OUString("SwVbaFrames"); + return OUString("SwVbaFrames"); } -css::uno::Sequence +css::uno::Sequence SwVbaFrames::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Frames"); + sNames[0] = OUString("ooo.vba.word.Frames"); } return sNames; } diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx index 363631b720b9..c2df6683df4c 100644 --- a/sw/source/ui/vba/vbaframes.hxx +++ b/sw/source/ui/vba/vbaframes.hxx @@ -42,8 +42,8 @@ public: // SwVbaFrames_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index 3088dd116542..6772cd5384ff 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno; using namespace ::ooo::vba; -rtl::OUString sDocCtxName("WordDocumentContext"); +OUString sDocCtxName("WordDocumentContext"); // ============================================================================= // SwVbaGlobals @@ -41,7 +41,7 @@ SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Refere { OSL_TRACE("SwVbaGlobals::SwVbaGlobals()"); uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); - aInitArgs[ 0 ].Name = rtl::OUString("Application"); + aInitArgs[ 0 ].Name = OUString("Application"); aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); aInitArgs[ 1 ].Name = sDocCtxName; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); @@ -85,7 +85,7 @@ SwVbaGlobals::getActiveWindow() throw (uno::RuntimeException) return getApplication()->getActiveWindow(); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaGlobals::getName() throw (uno::RuntimeException) { return getApplication()->getName(); @@ -138,35 +138,35 @@ float SAL_CALL SwVbaGlobals::CentimetersToPoints( float _Centimeters ) throw (un return getApplication()->CentimetersToPoints( _Centimeters ); } -rtl::OUString +OUString SwVbaGlobals::getServiceImplName() { - return rtl::OUString("SwVbaGlobals"); + return OUString("SwVbaGlobals"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaGlobals::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Globals" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Globals" ); } return aServiceNames; } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) { static bool bInit = false; - static uno::Sequence< rtl::OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() ); + static uno::Sequence< OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() ); if ( !bInit ) { - rtl::OUString names[] = { - ::rtl::OUString( "ooo.vba.word.Document" ), + OUString names[] = { + OUString( "ooo.vba.word.Document" ), // #FIXME #TODO make Application a proper service -// ::rtl::OUString( "ooo.vba.word.Application" ), +// OUString( "ooo.vba.word.Application" ), }; sal_Int32 nWordServices = SAL_N_ELEMENTS( names ); sal_Int32 startIndex = serviceNames.getLength(); diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index ac452f28b028..2b848dc90060 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -51,7 +51,7 @@ public: virtual ~SwVbaGlobals(); // XGlobals - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException); @@ -64,11 +64,11 @@ public: virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException); // XMultiServiceFactory - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_GLOBALS_HXX */ diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx index e13eafda4ce3..9714e7623616 100644 --- a/sw/source/ui/vba/vbaheaderfooter.cxx +++ b/sw/source/ui/vba/vbaheaderfooter.cxx @@ -51,18 +51,18 @@ void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( ::sal_Bool /*_linktoprevious uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno::RuntimeException) { - rtl::OUString sPropsNameText; + OUString sPropsNameText; if( mbHeader ) { - sPropsNameText = rtl::OUString("HeaderText"); + sPropsNameText = OUString("HeaderText"); } else { - sPropsNameText = rtl::OUString("FooterText"); + sPropsNameText = OUString("FooterText"); } if( mnIndex == word::WdHeaderFooterIndex::wdHeaderFooterEvenPages ) { - sPropsNameText = sPropsNameText.concat( rtl::OUString("Left") ); + sPropsNameText = sPropsNameText.concat( OUString("Left") ); } uno::Reference< text::XText > xText( mxPageStyleProps->getPropertyValue( sPropsNameText ), uno::UNO_QUERY_THROW ); @@ -83,20 +83,20 @@ SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException) return uno::makeAny( xCol ); } -rtl::OUString +OUString SwVbaHeaderFooter::getServiceImplName() { - return rtl::OUString("SwVbaHeaderFooter"); + return OUString("SwVbaHeaderFooter"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaHeaderFooter::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Pane" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Pane" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx index 199314d2dd72..2b934a429947 100644 --- a/sw/source/ui/vba/vbaheaderfooter.hxx +++ b/sw/source/ui/vba/vbaheaderfooter.hxx @@ -46,8 +46,8 @@ public: virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_HEADERFOOTER_HXX */ diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx index 15d5e9263c32..23d9551d9a84 100644 --- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx +++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx @@ -42,7 +42,7 @@ sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException) { uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW ); - rtl::OUString aImplName = xServiceInfo->getImplementationName(); + OUString aImplName = xServiceInfo->getImplementationName(); if ( aImplName == "SwXHeadFootText" ) return sal_True; return sal_False; @@ -54,8 +54,8 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM if( !isHeaderFooter( xCurrentText ) ) return sal_False; - rtl::OUString aPropIsShared = rtl::OUString("HeaderIsShared"); - rtl::OUString aPropText = rtl::OUString("HeaderText"); + OUString aPropIsShared = OUString("HeaderIsShared"); + OUString aPropText = OUString("HeaderText"); uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_True; @@ -64,9 +64,9 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); if( 0 == xPageCursor->getPage() % 2 ) - aPropText = rtl::OUString("HeaderTextLeft"); + aPropText = OUString("HeaderTextLeft"); else - aPropText = rtl::OUString("HeaderTextRight"); + aPropText = OUString("HeaderTextRight"); } uno::Reference< text::XText > xHeaderText( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); @@ -104,7 +104,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XMo { uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_False; - xStyleProps->getPropertyValue( rtl::OUString("HeaderIsShared")) >>= isShared; + xStyleProps->getPropertyValue( OUString("HeaderIsShared")) >>= isShared; if( !isShared ) { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); @@ -120,8 +120,8 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM if( !isHeaderFooter( xCurrentText ) ) return sal_False; - rtl::OUString aPropIsShared = rtl::OUString("FooterIsShared"); - rtl::OUString aPropText = rtl::OUString("FooterText"); + OUString aPropIsShared = OUString("FooterIsShared"); + OUString aPropText = OUString("FooterText"); uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_True; @@ -130,9 +130,9 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); if( 0 == xPageCursor->getPage() % 2 ) - aPropText = rtl::OUString("FooterTextLeft"); + aPropText = OUString("FooterTextLeft"); else - aPropText = rtl::OUString("FooterTextRight"); + aPropText = OUString("FooterTextRight"); } uno::Reference< text::XText > xFooterText( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); @@ -169,7 +169,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XMo { uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_False; - xStyleProps->getPropertyValue( rtl::OUString("FooterIsShared")) >>= isShared; + xStyleProps->getPropertyValue( OUString("FooterIsShared")) >>= isShared; if( !isShared ) { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index ec41e33d025f..b85be8af0fc8 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -119,20 +119,20 @@ SwVbaHeadersFooters::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaHeadersFooters::getServiceImplName() { - return rtl::OUString("SwVbaHeadersFooters"); + return OUString("SwVbaHeadersFooters"); } -uno::Sequence +uno::Sequence SwVbaHeadersFooters::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.HeadersFooters"); + sNames[0] = OUString("ooo.vba.word.HeadersFooters"); } return sNames; } diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx index ac1f65c75ba5..c51f7c14be89 100644 --- a/sw/source/ui/vba/vbaheadersfooters.hxx +++ b/sw/source/ui/vba/vbaheadersfooters.hxx @@ -44,8 +44,8 @@ public: // SwVbaHeadersFooters_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_HEADERSFOOTERS_HXX */ diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx index ea7cf40fd5e2..bfb58d413e5c 100644 --- a/sw/source/ui/vba/vbalistformat.cxx +++ b/sw/source/ui/vba/vbalistformat.cxx @@ -68,17 +68,17 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor if( isFirstElement ) { sal_Bool isNumberingRestart = !bContinuePreviousList; - xProps->setPropertyValue( rtl::OUString("ParaIsNumberingRestart"), uno::makeAny( isNumberingRestart ) ); + xProps->setPropertyValue( OUString("ParaIsNumberingRestart"), uno::makeAny( isNumberingRestart ) ); if( isNumberingRestart ) { sal_Int16 nStartValue = 1; - xProps->setPropertyValue( rtl::OUString("NumberingStartValue"), uno::makeAny( nStartValue ) ); + xProps->setPropertyValue( OUString("NumberingStartValue"), uno::makeAny( nStartValue ) ); } isFirstElement = sal_False; } else { - xProps->setPropertyValue( rtl::OUString("ParaIsNumberingRestart"), uno::makeAny( sal_False ) ); + xProps->setPropertyValue( OUString("ParaIsNumberingRestart"), uno::makeAny( sal_False ) ); } pListTemplate->applyListTemplate( xProps ); } @@ -86,23 +86,23 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor void SAL_CALL SwVbaListFormat::ConvertNumbersToText( ) throw (css::uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } -rtl::OUString +OUString SwVbaListFormat::getServiceImplName() { - return rtl::OUString("SwVbaListFormat"); + return OUString("SwVbaListFormat"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaListFormat::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListFormat" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.ListFormat" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index e666f0173b58..b6d940bbba3f 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -43,8 +43,8 @@ public: virtual void SAL_CALL ConvertNumbersToText( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_LISTFORMAT_HXX */ diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index d25cbf0c415f..37ce9015bef2 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -62,7 +62,7 @@ uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::A || nIndex == word::WdListGalleryType::wdOutlineNumberGallery ) return uno::makeAny( uno::Reference< word::XListGallery >( new SwVbaListGallery( this, mxContext, mxTextDocument, nIndex ) ) ); } - throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -84,20 +84,20 @@ SwVbaListGalleries::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaListGalleries::getServiceImplName() { - return rtl::OUString("SwVbaListGalleries"); + return OUString("SwVbaListGalleries"); } -css::uno::Sequence +css::uno::Sequence SwVbaListGalleries::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.ListGalleries"); + sNames[0] = OUString("ooo.vba.word.ListGalleries"); } return sNames; } diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx index 3895b325cd81..bbbb8bf04632 100644 --- a/sw/source/ui/vba/vbalistgalleries.hxx +++ b/sw/source/ui/vba/vbalistgalleries.hxx @@ -43,8 +43,8 @@ public: // SwVbaListGalleries_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_LISTGALLERIES_HXX */ diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx index b7127f994b6d..812e930d73cb 100644 --- a/sw/source/ui/vba/vbalistgallery.cxx +++ b/sw/source/ui/vba/vbalistgallery.cxx @@ -41,20 +41,20 @@ SwVbaListGallery::ListTemplates( const uno::Any& index ) throw (uno::RuntimeExce return uno::makeAny( xCol ); } -rtl::OUString +OUString SwVbaListGallery::getServiceImplName() { - return rtl::OUString("SwVbaListGallery"); + return OUString("SwVbaListGallery"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaListGallery::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListGallery" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.ListGallery" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index 402ccd88c13c..92369b411c51 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -41,8 +41,8 @@ public: virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_LISTGALLERY_HXX */ diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx index c0974226993b..8cd6c854f62e 100644 --- a/sw/source/ui/vba/vbalisthelper.cxx +++ b/sw/source/ui/vba/vbalisthelper.cxx @@ -60,17 +60,17 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException ) { case word::WdListGalleryType::wdBulletGallery: { - msStyleName = rtl::OUString(WORD_BULLET_GALLERY ); + msStyleName = OUString(WORD_BULLET_GALLERY ); break; } case word::WdListGalleryType::wdNumberGallery: { - msStyleName = rtl::OUString(WORD_NUMBER_GALLERY ); + msStyleName = OUString(WORD_NUMBER_GALLERY ); break; } case word::WdListGalleryType::wdOutlineNumberGallery: { - msStyleName = rtl::OUString(WORD_OUTLINE_NUMBER_GALLERY ); + msStyleName = OUString(WORD_OUTLINE_NUMBER_GALLERY ); break; } default: @@ -78,29 +78,29 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException ) throw uno::RuntimeException(); } } - msStyleName += rtl::OUString::valueOf( mnTemplateType ); + msStyleName += OUString::valueOf( mnTemplateType ); // get the numbering style uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW ); - mxStyleFamily.set( xStyleSupplier->getStyleFamilies()->getByName(rtl::OUString( "NumberingStyles" ) ), uno::UNO_QUERY_THROW ); - OSL_TRACE("SwVbaListHelper::Init: numbering style name: %s", rtl::OUStringToOString( msStyleName, RTL_TEXTENCODING_UTF8 ).getStr() ); + mxStyleFamily.set( xStyleSupplier->getStyleFamilies()->getByName(OUString( "NumberingStyles" ) ), uno::UNO_QUERY_THROW ); + OSL_TRACE("SwVbaListHelper::Init: numbering style name: %s", OUStringToOString( msStyleName, RTL_TEXTENCODING_UTF8 ).getStr() ); if( mxStyleFamily->hasByName( msStyleName ) ) { mxStyleProps.set( mxStyleFamily->getByName( msStyleName ), uno::UNO_QUERY_THROW ); - mxNumberingRules.set( mxStyleProps->getPropertyValue( rtl::OUString( "NumberingRules" ) ), uno::UNO_QUERY_THROW ); + mxNumberingRules.set( mxStyleProps->getPropertyValue( OUString( "NumberingRules" ) ), uno::UNO_QUERY_THROW ); } else { // create new numbering style uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument, uno::UNO_QUERY_THROW ); - mxStyleProps.set( xDocMSF->createInstance( rtl::OUString( "com.sun.star.style.NumberingStyle" ) ), uno::UNO_QUERY_THROW ); + mxStyleProps.set( xDocMSF->createInstance( OUString( "com.sun.star.style.NumberingStyle" ) ), uno::UNO_QUERY_THROW ); // insert this style into style family, or the property NumberingRules doesn't exist. mxStyleFamily->insertByName( msStyleName, uno::makeAny( mxStyleProps ) ); - mxStyleProps->getPropertyValue( rtl::OUString( "NumberingRules" ) ) >>= mxNumberingRules; + mxStyleProps->getPropertyValue( OUString( "NumberingRules" ) ) >>= mxNumberingRules; CreateListTemplate(); - mxStyleProps->setPropertyValue( rtl::OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) ); + mxStyleProps->setPropertyValue( OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) ); } } @@ -136,47 +136,47 @@ void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeExcepti sal_Int32 nLevel = 0; uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - rtl::OUString sCharStyleName( "Bullet Symbols" ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) ); + OUString sCharStyleName( "Bullet Symbols" ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) ); sal_Int16 nNumberingType = style::NumberingType::CHAR_SPECIAL; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - rtl::OUString aBulletChar; + OUString aBulletChar; switch( mnTemplateType ) { case 1: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_CLOSED_DOT ) ); + aBulletChar = OUString( sal_Unicode( CHAR_CLOSED_DOT ) ); break; } case 2: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_EMPTY_DOT ) ); + aBulletChar = OUString( sal_Unicode( CHAR_EMPTY_DOT ) ); break; } case 3: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_SQUARE ) ); + aBulletChar = OUString( sal_Unicode( CHAR_SQUARE ) ); break; } case 4: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_STAR_SYMBOL ) ); + aBulletChar = OUString( sal_Unicode( CHAR_STAR_SYMBOL ) ); break; } case 5: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) ); + aBulletChar = OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) ); break; } case 6: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_ARROW ) ); + aBulletChar = OUString( sal_Unicode( CHAR_ARROW ) ); break; } case 7: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_CHECK_MARK ) ); + aBulletChar = OUString( sal_Unicode( CHAR_CHECK_MARK ) ); break; } default: @@ -185,7 +185,7 @@ void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeExcepti throw css::uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -198,49 +198,49 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; sal_Int16 nNumberingType = 0; - rtl::OUString sSuffix; + OUString sSuffix; switch( mnTemplateType ) { case 1: { nNumberingType = style::NumberingType::ARABIC; - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 2: { nNumberingType = style::NumberingType::ARABIC; - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 3: { nNumberingType = style::NumberingType::ROMAN_UPPER; - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 4: { nNumberingType = style::NumberingType::CHARS_UPPER_LETTER; - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 5: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 6: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 7: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } default: @@ -249,8 +249,8 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti throw css::uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -305,8 +305,8 @@ void SwVbaListHelper::CreateOutlineNumberListTemplate() throw( css::uno::Runtime void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeException ) { sal_Int16 nNumberingType = 0; - rtl::OUString sPrefix; - rtl::OUString sSuffix; + OUString sPrefix; + OUString sSuffix; uno::Sequence< beans::PropertyValue > aPropertyValues; for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) @@ -318,57 +318,57 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce case 1: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 2: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 3: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 4: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 5: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 6: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 7: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 8: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } default: @@ -376,9 +376,9 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -387,18 +387,18 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce { sal_Int16 nNumberingType = style::NumberingType::ARABIC; sal_Int16 nParentNumbering = 0; - rtl::OUString sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + OUString sSuffix = OUString::valueOf( sal_Unicode('.') ); uno::Sequence< beans::PropertyValue > aPropertyValues; for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); if( nLevel != 0 ) { nParentNumbering = sal_Int16( nLevel - 1 ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); } mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -407,44 +407,44 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeException ) { sal_Int16 nNumberingType = style::NumberingType::CHAR_SPECIAL; - rtl::OUString sCharStyleName( "Bullet Symbols" ); - rtl::OUString aBulletChar; + OUString sCharStyleName( "Bullet Symbols" ); + OUString aBulletChar; uno::Sequence< beans::PropertyValue > aPropertyValues; for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_CHAR_STYLE_NAME ), uno::makeAny( sCharStyleName ) ); switch( nLevel ) { case 0: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) ); + aBulletChar = OUString( sal_Unicode( CHAR_FOUR_DIAMONDS ) ); break; } case 1: case 5: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_ARROW ) ); + aBulletChar = OUString( sal_Unicode( CHAR_ARROW ) ); break; } case 2: case 6: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_SQUARE ) ); + aBulletChar = OUString( sal_Unicode( CHAR_SQUARE ) ); break; } case 3: case 7: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_CLOSED_DOT ) ); + aBulletChar = OUString( sal_Unicode( CHAR_CLOSED_DOT ) ); break; } case 4: case 8: { - aBulletChar = rtl::OUString( sal_Unicode( CHAR_DIAMOND ) ); + aBulletChar = OUString( sal_Unicode( CHAR_DIAMOND ) ); break; } default: @@ -452,7 +452,7 @@ void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_BULLET_CHAR ), uno::makeAny( aBulletChar ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -460,8 +460,8 @@ void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeExce void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeException ) { sal_Int16 nNumberingType = 0; - rtl::OUString sPrefix; - rtl::OUString sSuffix; + OUString sPrefix; + OUString sSuffix; uno::Sequence< beans::PropertyValue > aPropertyValues; for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) @@ -472,66 +472,66 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce case 0: { nNumberingType = style::NumberingType::ROMAN_UPPER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 1: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); sal_Int16 nParentNumbering = 0; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); break; } case 2: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 3: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 4: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 5: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 6: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 7: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 8: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } default: @@ -539,9 +539,9 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -555,11 +555,11 @@ void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeExce for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); if( nLevel != 0 ) { nParentNumbering = sal_Int16( nLevel - 1 ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); } mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } @@ -568,8 +568,8 @@ void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeExce void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeException ) { sal_Int16 nNumberingType = 0; - rtl::OUString sPrefix; - rtl::OUString sSuffix; + OUString sPrefix; + OUString sSuffix; uno::Sequence< beans::PropertyValue > aPropertyValues; for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) @@ -580,64 +580,64 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce case 0: { nNumberingType = style::NumberingType::ROMAN_UPPER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 1: { nNumberingType = style::NumberingType::CHARS_UPPER_LETTER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 2: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 3: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString(); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString(); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 4: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 5: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 6: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode(')') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode(')') ); break; } case 7: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } case 8: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = rtl::OUString::valueOf( sal_Unicode('(') ); - sSuffix = rtl::OUString::valueOf( sal_Unicode('.') ); + sPrefix = OUString::valueOf( sal_Unicode('(') ); + sSuffix = OUString::valueOf( sal_Unicode('.') ); break; } default: @@ -645,9 +645,9 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce throw uno::RuntimeException(); } } - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_SUFFIX ), uno::makeAny( sSuffix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } @@ -656,31 +656,31 @@ void SwVbaListHelper::CreateOutlineNumberForType7() throw( css::uno::RuntimeExce { sal_Int16 nNumberingType = style::NumberingType::ARABIC; uno::Sequence< beans::PropertyValue > aPropertyValues; - rtl::OUString sPrefix("Chapter "); + OUString sPrefix("Chapter "); for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ ) { mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); - setOrAppendPropertyValue( aPropertyValues, rtl::OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_NUMBERING_TYPE ), uno::makeAny( nNumberingType ) ); + setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PREFIX ), uno::makeAny( sPrefix ) ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } } -uno::Any SwVbaListHelper::getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName ) throw( css::uno::RuntimeException ) +uno::Any SwVbaListHelper::getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) throw( css::uno::RuntimeException ) { uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; return getPropertyValue( aPropertyValues, sName ); } -void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException ) +void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException ) { uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; setOrAppendPropertyValue( aPropertyValues, sName, aValue ); mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); - mxStyleProps->setPropertyValue( rtl::OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) ); + mxStyleProps->setPropertyValue( OUString( "NumberingRules" ) , uno::makeAny( mxNumberingRules ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx index 0e862fa0dd2c..2d755d70e10b 100644 --- a/sw/source/ui/vba/vbalisthelper.hxx +++ b/sw/source/ui/vba/vbalisthelper.hxx @@ -47,7 +47,7 @@ private: css::uno::Reference< css::beans::XPropertySet > mxStyleProps; sal_Int32 mnGalleryType; sal_Int32 mnTemplateType; - rtl::OUString msStyleName; + OUString msStyleName; void Init() throw( css::uno::RuntimeException ); void CreateListTemplate() throw( css::uno::RuntimeException ); @@ -67,8 +67,8 @@ public: sal_Int32 getGalleryType() const { return mnGalleryType; } css::uno::Reference< css::container::XIndexReplace > getNumberingRules() const { return mxNumberingRules; } - css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName ) throw( css::uno::RuntimeException ); - void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException ); + css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) throw( css::uno::RuntimeException ); + void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException ); }; diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx index b18754c0e590..0166b254baa0 100644 --- a/sw/source/ui/vba/vbalistlevel.cxx +++ b/sw/source/ui/vba/vbalistlevel.cxx @@ -39,7 +39,7 @@ SwVbaListLevel::~SwVbaListLevel() ::sal_Int32 SAL_CALL SwVbaListLevel::getAlignment() throw (uno::RuntimeException) { sal_Int16 nAlignment = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("Adjust") ) >>= nAlignment; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("Adjust") ) >>= nAlignment; switch( nAlignment ) { case text::HoriOrientation::LEFT: @@ -90,17 +90,17 @@ void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment ) throw (uno: throw uno::RuntimeException(); } } - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("Adjust"), uno::makeAny( nAlignment ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("Adjust"), uno::makeAny( nAlignment ) ); } uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont() throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::XFont >& /*_font*/ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getIndex() throw (uno::RuntimeException) @@ -108,24 +108,24 @@ void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::X return mnLevel + 1; } -::rtl::OUString SAL_CALL SwVbaListLevel::getLinkedStyle() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaListLevel::getLinkedStyle() throw (uno::RuntimeException) { // TODO: - return rtl::OUString(); + return OUString(); } -void SAL_CALL SwVbaListLevel::setLinkedStyle( const ::rtl::OUString& /*_linkedstyle*/ ) throw (uno::RuntimeException) +void SAL_CALL SwVbaListLevel::setLinkedStyle( const OUString& /*_linkedstyle*/ ) throw (uno::RuntimeException) { // TODO: } -::rtl::OUString SAL_CALL SwVbaListLevel::getNumberFormat() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaListLevel::getNumberFormat() throw (uno::RuntimeException) { // TODO:: - return rtl::OUString(); + return OUString(); } -void SAL_CALL SwVbaListLevel::setNumberFormat( const ::rtl::OUString& /*_numberformat*/ ) throw (uno::RuntimeException) +void SAL_CALL SwVbaListLevel::setNumberFormat( const OUString& /*_numberformat*/ ) throw (uno::RuntimeException) { // TODO:: } @@ -135,8 +135,8 @@ float SAL_CALL SwVbaListLevel::getNumberPosition() throw (uno::RuntimeException) // indentAt + firstlineindent sal_Int32 nIndentAt = 0; sal_Int32 nFirstLineIndent = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent") ) >>= nFirstLineIndent; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent") ) >>= nFirstLineIndent; sal_Int32 nResult = nIndentAt + nFirstLineIndent; @@ -148,16 +148,16 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw ( sal_Int32 nNumberPosition = Millimeter::getInHundredthsOfOneMillimeter( _numberposition ); sal_Int32 nIndentAt = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt; sal_Int32 nFirstLineIndent = nNumberPosition - nIndentAt; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle() throw (uno::RuntimeException) { sal_Int16 nNumberingType = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("NumberingType") ) >>= nNumberingType; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("NumberingType") ) >>= nNumberingType; switch( nNumberingType ) { case style::NumberingType::CHAR_SPECIAL: @@ -212,7 +212,7 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } return nNumberingType; @@ -285,11 +285,11 @@ void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("NumberingType"), uno::makeAny( nNumberingType ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("NumberingType"), uno::makeAny( nNumberingType ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher() throw (uno::RuntimeException) @@ -306,20 +306,20 @@ void SAL_CALL SwVbaListLevel::setResetOnHigher( ::sal_Int32 /*_resetonhigher*/ ) ::sal_Int32 SAL_CALL SwVbaListLevel::getStartAt() throw (uno::RuntimeException) { sal_Int16 nStartWith = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("StartWith") ) >>= nStartWith; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("StartWith") ) >>= nStartWith; return nStartWith; } void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat ) throw (uno::RuntimeException) { sal_Int16 nStartWith = (sal_Int16)_startat; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("StartWith"), uno::makeAny( nStartWith ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("StartWith"), uno::makeAny( nStartWith ) ); } float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException) { sal_Int32 nTabPosition = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("ListtabStopPosition") ) >>= nTabPosition; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("ListtabStopPosition") ) >>= nTabPosition; return static_cast< float >( Millimeter::getInPoints( nTabPosition ) ); } @@ -327,14 +327,14 @@ float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException) void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition ) throw (uno::RuntimeException) { sal_Int32 nTabPosition = Millimeter::getInHundredthsOfOneMillimeter( _tabposition ); - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("ListtabStopPosition"), uno::makeAny( nTabPosition ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("ListtabStopPosition"), uno::makeAny( nTabPosition ) ); } float SAL_CALL SwVbaListLevel::getTextPosition() throw (uno::RuntimeException) { // indentAt sal_Int32 nIndentAt = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt; return static_cast< float >( Millimeter::getInPoints( nIndentAt ) ); } @@ -343,21 +343,21 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno: { sal_Int32 nIndentAt = 0; sal_Int32 nFirstLineIndent = 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt") ) >>= nIndentAt; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent") ) >>= nFirstLineIndent; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt") ) >>= nIndentAt; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent") ) >>= nFirstLineIndent; sal_Int32 nAlignedAt = nIndentAt + nFirstLineIndent; nIndentAt = Millimeter::getInHundredthsOfOneMillimeter( _textposition ); nFirstLineIndent = nAlignedAt - nIndentAt; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("IndentAt"), uno::makeAny( nIndentAt ) ); - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("IndentAt"), uno::makeAny( nIndentAt ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("FirstLineIndent"), uno::makeAny( nFirstLineIndent ) ); } ::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter() throw (uno::RuntimeException) { sal_Int16 nLabelFollowedBy= 0; - pListHelper->getPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("LabelFollowedBy") ) >>= nLabelFollowedBy; + pListHelper->getPropertyValueWithNameAndLevel( mnLevel, OUString("LabelFollowedBy") ) >>= nLabelFollowedBy; return nLabelFollowedBy; } @@ -365,23 +365,23 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno: void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (uno::RuntimeException) { sal_Int16 nLabelFollowedBy = (sal_Int16)_trailingcharacter; - pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString("LabelFollowedBy"), uno::makeAny( nLabelFollowedBy ) ); + pListHelper->setPropertyValueWithNameAndLevel( mnLevel, OUString("LabelFollowedBy"), uno::makeAny( nLabelFollowedBy ) ); } -rtl::OUString +OUString SwVbaListLevel::getServiceImplName() { - return rtl::OUString("SwVbaListLevel"); + return OUString("SwVbaListLevel"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaListLevel::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListLevel" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.ListLevel" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index 3d41ebf599c2..1fd51d1e8049 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -44,10 +44,10 @@ public: virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLinkedStyle( const ::rtl::OUString& _linkedstyle ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException); - virtual void SAL_CALL setNumberFormat( const ::rtl::OUString& _numberformat ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException); + virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException); + virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException); virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException); virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException); @@ -64,8 +64,8 @@ public: virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_LISTLEVEL_HXX */ diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index 470e5763cdb9..81ff8a67c387 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -63,7 +63,7 @@ uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& if( ( Index1 >>= nIndex ) == sal_False ) throw uno::RuntimeException(); if( nIndex <=0 || nIndex > getCount() ) - throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); return uno::makeAny( uno::Reference< word::XListLevel >( new SwVbaListLevel( this, mxContext, pListHelper, nIndex - 1 ) ) ); } @@ -87,20 +87,20 @@ SwVbaListLevels::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaListLevels::getServiceImplName() { - return rtl::OUString("SwVbaListLevels"); + return OUString("SwVbaListLevels"); } -css::uno::Sequence +css::uno::Sequence SwVbaListLevels::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.ListLevels"); + sNames[0] = OUString("ooo.vba.word.ListLevels"); } return sNames; } diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index 1879ea898338..acd8f9ab4ad7 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -44,8 +44,8 @@ public: // SwVbaListLevels_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_LISTLEVELS_HXX */ diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx index 485a5278398b..122ba191a9b0 100644 --- a/sw/source/ui/vba/vbalisttemplate.cxx +++ b/sw/source/ui/vba/vbalisttemplate.cxx @@ -45,23 +45,23 @@ SwVbaListTemplate::ListLevels( const uno::Any& index ) throw (uno::RuntimeExcept void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException) { uno::Reference< container::XIndexReplace > xNumberingRules = pListHelper->getNumberingRules(); - xProps->setPropertyValue( rtl::OUString("NumberingRules") , uno::makeAny( xNumberingRules ) ); + xProps->setPropertyValue( OUString("NumberingRules") , uno::makeAny( xNumberingRules ) ); } -rtl::OUString +OUString SwVbaListTemplate::getServiceImplName() { - return rtl::OUString("SwVbaListTemplate"); + return OUString("SwVbaListTemplate"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaListTemplate::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ListTemplate" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.ListTemplate" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index d46b830d3223..02c574dc3283 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -43,8 +43,8 @@ public: virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_LISTTEMPLATE_HXX */ diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index 01b56c27a33d..b7ba7fe1256b 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -57,7 +57,7 @@ uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::A if( ( Index1 >>= nIndex ) == sal_False ) throw uno::RuntimeException(); if( nIndex <=0 || nIndex > getCount() ) - throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); return uno::makeAny( uno::Reference< word::XListTemplate >( new SwVbaListTemplate( this, mxContext, mxTextDocument, mnGalleryType, nIndex ) ) ); } @@ -81,20 +81,20 @@ SwVbaListTemplates::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaListTemplates::getServiceImplName() { - return rtl::OUString("SwVbaListTemplates"); + return OUString("SwVbaListTemplates"); } -css::uno::Sequence +css::uno::Sequence SwVbaListTemplates::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.ListTemplates"); + sNames[0] = OUString("ooo.vba.word.ListTemplates"); } return sNames; } diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx index 87a76ef9e499..7ad5b7b94c80 100644 --- a/sw/source/ui/vba/vbalisttemplates.hxx +++ b/sw/source/ui/vba/vbalisttemplates.hxx @@ -44,8 +44,8 @@ public: // SwVbaListTemplates_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_LISTTEMPLATES_HXX */ diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx index 898c7939e740..0c21ae0fca93 100644 --- a/sw/source/ui/vba/vbaoptions.cxx +++ b/sw/source/ui/vba/vbaoptions.cxx @@ -45,44 +45,44 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException ) { case word::WdDefaultFilePath::wdDocumentsPath: { - msDefaultFilePath = rtl::OUString("Work"); + msDefaultFilePath = OUString("Work"); break; } case word::WdDefaultFilePath::wdPicturesPath: { - msDefaultFilePath = rtl::OUString("Gallery"); + msDefaultFilePath = OUString("Gallery"); break; } case word::WdDefaultFilePath::wdUserTemplatesPath: case word::WdDefaultFilePath::wdWorkgroupTemplatesPath: { - msDefaultFilePath = rtl::OUString("Template"); + msDefaultFilePath = OUString("Template"); break; } case word::WdDefaultFilePath::wdStartupPath: { - msDefaultFilePath = rtl::OUString("Addin"); + msDefaultFilePath = OUString("Addin"); break; } case word::WdDefaultFilePath::wdUserOptionsPath: { - msDefaultFilePath = rtl::OUString("UserConfig"); + msDefaultFilePath = OUString("UserConfig"); break; } case word::WdDefaultFilePath::wdToolsPath: case word::WdDefaultFilePath::wdProgramPath: { - msDefaultFilePath = rtl::OUString("Module"); + msDefaultFilePath = OUString("Module"); break; } case word::WdDefaultFilePath::wdTempFilePath: { - msDefaultFilePath = rtl::OUString("Temp"); + msDefaultFilePath = OUString("Temp"); break; } default: { - DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() ); break; } } @@ -91,12 +91,12 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException ) void SwVbaOptions::setValueEvent( const uno::Any& value ) { - rtl::OUString sNewPath; + OUString sNewPath; value >>= sNewPath; - rtl::OUString sNewPathUrl; + OUString sNewPathUrl; ::osl::File::getFileURLFromSystemPath( sNewPath, sNewPathUrl ); - uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW ); - rtl::OUString sOldPathUrl; + uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW ); + OUString sOldPathUrl; xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sOldPathUrl; // path could be a multipath, Microsoft doesn't support this feature in Word currently // only the last path is from interest. @@ -110,8 +110,8 @@ void SwVbaOptions::setValueEvent( const uno::Any& value ) uno::Any SwVbaOptions::getValueEvent() { - uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW ); - rtl::OUString sPathUrl; + uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( OUString("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW ); + OUString sPathUrl; xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sPathUrl; // path could be a multipath, Microsoft doesn't support this feature in Word currently // only the last path is from interest. @@ -120,7 +120,7 @@ uno::Any SwVbaOptions::getValueEvent() { sPathUrl = sPathUrl.copy( nIndex + 1 ); } - rtl::OUString sPath; + OUString sPath; ::osl::File::getSystemPathFromFileURL( sPathUrl, sPath ); return uno::makeAny( sPath ); } @@ -255,20 +255,20 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool /*_autof // not support in Writer } -rtl::OUString +OUString SwVbaOptions::getServiceImplName() { - return rtl::OUString("SwVbaOptions"); + return OUString("SwVbaOptions"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaOptions::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Options" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Options" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx index 753d2b6eaba7..dbd89e4aaf23 100644 --- a/sw/source/ui/vba/vbaoptions.hxx +++ b/sw/source/ui/vba/vbaoptions.hxx @@ -31,7 +31,7 @@ class SwVbaOptions : public SwVbaOptions_BASE, public PropListener { private: - rtl::OUString msDefaultFilePath; + OUString msDefaultFilePath; css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory; public: SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext ) throw ( css::uno::RuntimeException ); @@ -73,8 +73,8 @@ public: virtual css::uno::Any getValueEvent(); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_OPTIONS_HXX */ diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index ffa2c69cf1bb..b7d3d140c4b8 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -59,9 +59,9 @@ void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeExc double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException) { sal_Bool isHeaderOn = sal_False; - mxPageProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn; + mxPageProps->getPropertyValue( OUString("HeaderIsOn")) >>= isHeaderOn; if( !isHeaderOn ) - mxPageProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( OUString("HeaderIsOn"), uno::makeAny( sal_True ) ); return VbaPageSetupBase::getHeaderMargin(); } @@ -82,29 +82,29 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw sal_Int32 aktSpacing = 0; sal_Int32 aktHeaderHeight = 0; - mxPageProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn; + mxPageProps->getPropertyValue( OUString("HeaderIsOn")) >>= isHeaderOn; if( !isHeaderOn ) - mxPageProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( OUString("HeaderIsOn"), uno::makeAny( sal_True ) ); - mxPageProps->getPropertyValue( rtl::OUString("TopMargin")) >>= aktTopMargin; - mxPageProps->getPropertyValue( rtl::OUString("HeaderBodyDistance")) >>= aktSpacing; - mxPageProps->getPropertyValue( rtl::OUString("HeaderHeight")) >>= aktHeaderHeight; + mxPageProps->getPropertyValue( OUString("TopMargin")) >>= aktTopMargin; + mxPageProps->getPropertyValue( OUString("HeaderBodyDistance")) >>= aktSpacing; + mxPageProps->getPropertyValue( OUString("HeaderHeight")) >>= aktHeaderHeight; sal_Int32 newSpacing = aktSpacing - ( newHeaderDistance - aktTopMargin ); sal_Int32 height = aktHeaderHeight - aktSpacing; sal_Int32 newHeaderHeight = newSpacing + height; - mxPageProps->setPropertyValue( rtl::OUString("TopMargin"), uno::makeAny( newHeaderDistance ) ); - mxPageProps->setPropertyValue( rtl::OUString("HeaderBodyDistance"), uno::makeAny( newSpacing ) ); - mxPageProps->setPropertyValue( rtl::OUString("HeaderHeight"), uno::makeAny( newHeaderHeight ) ); + mxPageProps->setPropertyValue( OUString("TopMargin"), uno::makeAny( newHeaderDistance ) ); + mxPageProps->setPropertyValue( OUString("HeaderBodyDistance"), uno::makeAny( newSpacing ) ); + mxPageProps->setPropertyValue( OUString("HeaderHeight"), uno::makeAny( newHeaderHeight ) ); } double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException) { sal_Bool isFooterOn = sal_False; - mxPageProps->getPropertyValue( rtl::OUString("FooterIsOn")) >>= isFooterOn; + mxPageProps->getPropertyValue( OUString("FooterIsOn")) >>= isFooterOn; if( !isFooterOn ) - mxPageProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( OUString("FooterIsOn"), uno::makeAny( sal_True ) ); return VbaPageSetupBase::getFooterMargin(); } @@ -116,26 +116,26 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw sal_Int32 aktSpacing = 0; sal_Int32 aktFooterHeight = 0; - mxPageProps->getPropertyValue( rtl::OUString("FooterIsOn")) >>= isFooterOn; + mxPageProps->getPropertyValue( OUString("FooterIsOn")) >>= isFooterOn; if( !isFooterOn ) - mxPageProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue( OUString("FooterIsOn"), uno::makeAny( sal_True ) ); - mxPageProps->getPropertyValue( rtl::OUString("BottomMargin")) >>= aktBottomMargin; - mxPageProps->getPropertyValue( rtl::OUString("FooterBodyDistance")) >>= aktSpacing; - mxPageProps->getPropertyValue( rtl::OUString("FooterHeight")) >>= aktFooterHeight; + mxPageProps->getPropertyValue( OUString("BottomMargin")) >>= aktBottomMargin; + mxPageProps->getPropertyValue( OUString("FooterBodyDistance")) >>= aktSpacing; + mxPageProps->getPropertyValue( OUString("FooterHeight")) >>= aktFooterHeight; sal_Int32 newSpacing = aktSpacing - ( newFooterDistance - aktBottomMargin ); sal_Int32 height = aktFooterHeight - aktSpacing; sal_Int32 newFooterHeight = newSpacing + height; - mxPageProps->setPropertyValue( rtl::OUString("BottomMargin"), uno::makeAny( newFooterDistance ) ); - mxPageProps->setPropertyValue( rtl::OUString("FooterBodyDistance"), uno::makeAny( newSpacing ) ); - mxPageProps->setPropertyValue( rtl::OUString("FooterHeight"), uno::makeAny( newFooterHeight ) ); + mxPageProps->setPropertyValue( OUString("BottomMargin"), uno::makeAny( newFooterDistance ) ); + mxPageProps->setPropertyValue( OUString("FooterBodyDistance"), uno::makeAny( newSpacing ) ); + mxPageProps->setPropertyValue( OUString("FooterHeight"), uno::makeAny( newFooterHeight ) ); } sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno::RuntimeException) { - rtl::OUString pageStyle = getStyleOfFirstPage(); + OUString pageStyle = getStyleOfFirstPage(); if ( pageStyle == "First Page" ) return sal_True; @@ -147,34 +147,34 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status if( status == getDifferentFirstPageHeaderFooter() ) return; - rtl::OUString newStyle; + OUString newStyle; if( status ) - newStyle = rtl::OUString("First Page"); + newStyle = OUString("First Page"); else - newStyle = rtl::OUString("Standard"); + newStyle = OUString("Standard"); uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); sal_Int32 nTopMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString("TopMargin")) >>= nTopMargin; + xStyleProps->getPropertyValue( OUString("TopMargin")) >>= nTopMargin; sal_Int32 nBottomMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString("BottomMargin")) >>= nBottomMargin; + xStyleProps->getPropertyValue( OUString("BottomMargin")) >>= nBottomMargin; sal_Int32 nLeftMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString("LeftMargin")) >>= nLeftMargin; + xStyleProps->getPropertyValue( OUString("LeftMargin")) >>= nLeftMargin; sal_Int32 nRightMargin = 0; - xStyleProps->getPropertyValue( rtl::OUString("RightMargin")) >>= nRightMargin; + xStyleProps->getPropertyValue( OUString("RightMargin")) >>= nRightMargin; sal_Int32 nHeaderHeight = 0; - xStyleProps->getPropertyValue( rtl::OUString("HeaderHeight")) >>= nHeaderHeight; + xStyleProps->getPropertyValue( OUString("HeaderHeight")) >>= nHeaderHeight; sal_Int32 nFooterHeight = 0; - xStyleProps->getPropertyValue( rtl::OUString("FooterHeight")) >>= nFooterHeight; + xStyleProps->getPropertyValue( OUString("FooterHeight")) >>= nFooterHeight; sal_Bool isHeaderOn = sal_False; - xStyleProps->getPropertyValue( rtl::OUString("HeaderIsOn")) >>= isHeaderOn; + xStyleProps->getPropertyValue( OUString("HeaderIsOn")) >>= isHeaderOn; if( isHeaderOn ) { nTopMargin += nHeaderHeight; nBottomMargin += nFooterHeight; - xStyleProps->setPropertyValue( rtl::OUString("HeaderIsOn"), uno::makeAny( sal_False ) ); - xStyleProps->setPropertyValue( rtl::OUString("FooterIsOn"), uno::makeAny( sal_False ) ); + xStyleProps->setPropertyValue( OUString("HeaderIsOn"), uno::makeAny( sal_False ) ); + xStyleProps->setPropertyValue( OUString("FooterIsOn"), uno::makeAny( sal_False ) ); } uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW ); if( xPageCursor->getPage() != 1 ) @@ -183,26 +183,26 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status } uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( OUString("TextTable") ), uno::UNO_QUERY ); if( xTableProps.is() ) { - xTableProps->setPropertyValue( rtl::OUString("PageDescName"), uno::makeAny( newStyle ) ); + xTableProps->setPropertyValue( OUString("PageDescName"), uno::makeAny( newStyle ) ); } else { - xCursorProps->setPropertyValue( rtl::OUString("PageDescName"), uno::makeAny( newStyle ) ); + xCursorProps->setPropertyValue( OUString("PageDescName"), uno::makeAny( newStyle ) ); } uno::Reference< beans::XPropertySet > xFirstPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); - xFirstPageProps->setPropertyValue( rtl::OUString("TopMargin"), uno::makeAny( nTopMargin ) ); - xFirstPageProps->setPropertyValue( rtl::OUString("BottomMargin"), uno::makeAny( nBottomMargin ) ); - xFirstPageProps->setPropertyValue( rtl::OUString("LeftMargin"), uno::makeAny( nLeftMargin ) ); - xFirstPageProps->setPropertyValue( rtl::OUString("RightMargin"), uno::makeAny( nRightMargin ) ); + xFirstPageProps->setPropertyValue( OUString("TopMargin"), uno::makeAny( nTopMargin ) ); + xFirstPageProps->setPropertyValue( OUString("BottomMargin"), uno::makeAny( nBottomMargin ) ); + xFirstPageProps->setPropertyValue( OUString("LeftMargin"), uno::makeAny( nLeftMargin ) ); + xFirstPageProps->setPropertyValue( OUString("RightMargin"), uno::makeAny( nRightMargin ) ); } -rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException) +OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException) { - rtl::OUString styleFirstPage; + OUString styleFirstPage; uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW ); if( xPageCursor->getPage() != 1 ) { @@ -210,14 +210,14 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException } uno::Reference< beans::XPropertySet > xCursorProps( xPageCursor, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xTableProps( xCursorProps->getPropertyValue( OUString("TextTable") ), uno::UNO_QUERY ); if( xTableProps.is() ) { - xTableProps->getPropertyValue( rtl::OUString("PageDescName") ) >>= styleFirstPage; + xTableProps->getPropertyValue( OUString("PageDescName") ) >>= styleFirstPage; } else { - xCursorProps->getPropertyValue( rtl::OUString("PageDescName") ) >>= styleFirstPage; + xCursorProps->getPropertyValue( OUString("PageDescName") ) >>= styleFirstPage; } return styleFirstPage; } @@ -227,7 +227,7 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException // FIXME: sal_Int32 wdSectionStart = word::WdSectionStart::wdSectionNewPage; uno::Reference< container::XNamed > xNamed( mxPageProps, uno::UNO_QUERY_THROW ); - rtl::OUString sStyleName = xNamed->getName(); + OUString sStyleName = xNamed->getName(); if ( sStyleName == "Left Page" ) wdSectionStart = word::WdSectionStart::wdSectionEvenPage; else if ( sStyleName == "Right Page" ) @@ -243,20 +243,20 @@ void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) t // #FIXME: } -rtl::OUString +OUString SwVbaPageSetup::getServiceImplName() { - return rtl::OUString("SwVbaPageSetup"); + return OUString("SwVbaPageSetup"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaPageSetup::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.PageSetup" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.PageSetup" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx index 641479ef7acb..310b5808e238 100644 --- a/sw/source/ui/vba/vbapagesetup.hxx +++ b/sw/source/ui/vba/vbapagesetup.hxx @@ -31,7 +31,7 @@ typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ooo::vba::word::XPageSet class SwVbaPageSetup : public SwVbaPageSetup_BASE { private: - rtl::OUString getStyleOfFirstPage() throw (css::uno::RuntimeException); + OUString getStyleOfFirstPage() throw (css::uno::RuntimeException); public: SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, @@ -53,8 +53,8 @@ public: virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx index f0e8e35bc3b7..40b9e163c485 100644 --- a/sw/source/ui/vba/vbapane.cxx +++ b/sw/source/ui/vba/vbapane.cxx @@ -43,24 +43,24 @@ SwVbaPane::View() throw ( css::uno::RuntimeException ) void SAL_CALL SwVbaPane::Close( ) throw ( css::uno::RuntimeException ) { - rtl::OUString url = rtl::OUString( ".uno:CloseWin"); + OUString url = OUString( ".uno:CloseWin"); dispatchRequests( mxModel,url ); } -rtl::OUString +OUString SwVbaPane::getServiceImplName() { - return rtl::OUString("SwVbaPane"); + return OUString("SwVbaPane"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaPane::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Pane" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Pane" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx index 78f86311bebb..61eed74bb916 100644 --- a/sw/source/ui/vba/vbapane.hxx +++ b/sw/source/ui/vba/vbapane.hxx @@ -40,8 +40,8 @@ public: virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_PANE_HXX */ diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index d3a62629a915..f7971f784260 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -96,20 +96,20 @@ SwVbaPanes::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaPanes::getServiceImplName() { - return rtl::OUString("SwVbaPanes"); + return OUString("SwVbaPanes"); } -css::uno::Sequence +css::uno::Sequence SwVbaPanes::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Panes"); + sNames[0] = OUString("ooo.vba.word.Panes"); } return sNames; } diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx index 257566c1e33a..9f15784adbdc 100644 --- a/sw/source/ui/vba/vbapanes.hxx +++ b/sw/source/ui/vba/vbapanes.hxx @@ -42,8 +42,8 @@ public: // SwVbaPanes_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_PANES_HXX */ diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index 1618a1167555..da478a8ac2f3 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -54,20 +54,20 @@ SwVbaParagraph::setStyle( const uno::Any& style ) throw ( uno::RuntimeException xRange->setStyle( style ); } -rtl::OUString +OUString SwVbaParagraph::getServiceImplName() { - return rtl::OUString("SwVbaParagraph"); + return OUString("SwVbaParagraph"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaParagraph::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Paragraph" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Paragraph" ); } return aServiceNames; } @@ -100,7 +100,7 @@ public: while( xParEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Paragraph") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.text.Paragraph") ) ) { nCount++; } @@ -116,7 +116,7 @@ public: while( xParEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xParEnum->nextElement(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Paragraph") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.text.Paragraph") ) ) { if( Index == nCount ) return uno::makeAny( xServiceInfo ); @@ -157,20 +157,20 @@ SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XParagraph >( new SwVbaParagraph( this, mxContext, mxTextDocument, xTextRange ) ) ); } -rtl::OUString +OUString SwVbaParagraphs::getServiceImplName() { - return rtl::OUString("SwVbaParagraphs"); + return OUString("SwVbaParagraphs"); } -css::uno::Sequence +css::uno::Sequence SwVbaParagraphs::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Paragraphs"); + sNames[0] = OUString("ooo.vba.word.Paragraphs"); } return sNames; } diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index 23465f44d646..8fd5a3637046 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -46,8 +46,8 @@ public: virtual void SAL_CALL setStyle( const css::uno::Any& style ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; @@ -68,8 +68,8 @@ public: // SwVbaParagraphs_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_PARAGRAPH_HXX */ diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 2caa2e64001c..df635ecc8a47 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -48,33 +48,33 @@ SwVbaParagraphFormat::~SwVbaParagraphFormat() sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment() throw (uno::RuntimeException) { style::ParagraphAdjust aParaAdjust = style::ParagraphAdjust_LEFT; - mxParaProps->getPropertyValue( rtl::OUString("ParaAdjust") ) >>= aParaAdjust; + mxParaProps->getPropertyValue( OUString("ParaAdjust") ) >>= aParaAdjust; return getMSWordAlignment( aParaAdjust ); } void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment ) throw (uno::RuntimeException) { style::ParagraphAdjust aParaAdjust = ( style::ParagraphAdjust ) getOOoAlignment( _alignment ); - mxParaProps->setPropertyValue( rtl::OUString("ParaAdjust"), uno::makeAny( aParaAdjust ) ); + mxParaProps->setPropertyValue( OUString("ParaAdjust"), uno::makeAny( aParaAdjust ) ); } float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() throw (uno::RuntimeException) { sal_Int32 indent = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaFirstLineIndent") ) >>= indent; + mxParaProps->getPropertyValue( OUString("ParaFirstLineIndent") ) >>= indent; return (float)( Millimeter::getInPoints( indent ) ); } void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) throw (uno::RuntimeException) { sal_Int32 indent = Millimeter::getInHundredthsOfOneMillimeter( _firstlineindent ); - mxParaProps->setPropertyValue( rtl::OUString("ParaFirstLineIndent"), uno::makeAny( indent ) ); + mxParaProps->setPropertyValue( OUString("ParaFirstLineIndent"), uno::makeAny( indent ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() throw (uno::RuntimeException) { sal_Bool bKeep = sal_False; - mxParaProps->getPropertyValue( rtl::OUString("ParaKeepTogether") ) >>= bKeep; + mxParaProps->getPropertyValue( OUString("ParaKeepTogether") ) >>= bKeep; return uno::makeAny ( bKeep ); } @@ -83,18 +83,18 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth sal_Bool bKeep = sal_False; if( _keeptogether >>= bKeep ) { - mxParaProps->setPropertyValue( rtl::OUString("ParaKeepTogether"), uno::makeAny( bKeep ) ); + mxParaProps->setPropertyValue( OUString("ParaKeepTogether"), uno::makeAny( bKeep ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() throw (uno::RuntimeException) { sal_Bool bKeep = sal_False; - mxParaProps->getPropertyValue( rtl::OUString("ParaSplit") ) >>= bKeep; + mxParaProps->getPropertyValue( OUString("ParaSplit") ) >>= bKeep; return uno::makeAny ( bKeep ); } @@ -103,18 +103,18 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne sal_Bool bKeep = sal_False; if( _keepwithnext >>= bKeep ) { - mxParaProps->setPropertyValue( rtl::OUString("ParaSplit"), uno::makeAny( bKeep ) ); + mxParaProps->setPropertyValue( OUString("ParaSplit"), uno::makeAny( bKeep ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() throw (uno::RuntimeException) { sal_Bool bHypn = sal_False; - mxParaProps->getPropertyValue( rtl::OUString("ParaIsHyphenation") ) >>= bHypn; + mxParaProps->getPropertyValue( OUString("ParaIsHyphenation") ) >>= bHypn; return uno::makeAny ( bHypn ); } @@ -123,46 +123,46 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation sal_Bool bHypn = sal_False; if( _hyphenation >>= bHypn ) { - mxParaProps->setPropertyValue( rtl::OUString("ParaIsHyphenation"), uno::makeAny( bHypn ) ); + mxParaProps->setPropertyValue( OUString("ParaIsHyphenation"), uno::makeAny( bHypn ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } float SAL_CALL SwVbaParagraphFormat::getLineSpacing() throw (uno::RuntimeException) { style::LineSpacing aLineSpacing; - mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing; + mxParaProps->getPropertyValue( OUString("ParaLineSpacing") ) >>= aLineSpacing; return getMSWordLineSpacing( aLineSpacing ); } void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) throw (uno::RuntimeException) { style::LineSpacing aLineSpacing; - mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing; + mxParaProps->getPropertyValue( OUString("ParaLineSpacing") ) >>= aLineSpacing; aLineSpacing = getOOoLineSpacing( _linespacing, aLineSpacing.Mode ); - mxParaProps->setPropertyValue( rtl::OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) ); + mxParaProps->setPropertyValue( OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) ); } sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() throw (uno::RuntimeException) { style::LineSpacing aLineSpacing; - mxParaProps->getPropertyValue( rtl::OUString("ParaLineSpacing") ) >>= aLineSpacing; + mxParaProps->getPropertyValue( OUString("ParaLineSpacing") ) >>= aLineSpacing; return getMSWordLineSpacingRule( aLineSpacing ); } void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule ) throw (uno::RuntimeException) { style::LineSpacing aLineSpacing = getOOoLineSpacingFromRule( _linespacingrule ); - mxParaProps->setPropertyValue( rtl::OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) ); + mxParaProps->setPropertyValue( OUString("ParaLineSpacing"), uno::makeAny( aLineSpacing ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() throw (uno::RuntimeException) { sal_Bool noLineNum = sal_False; - mxParaProps->getPropertyValue( rtl::OUString("ParaLineNumberCount") ) >>= noLineNum; + mxParaProps->getPropertyValue( OUString("ParaLineNumberCount") ) >>= noLineNum; return uno::makeAny ( noLineNum ); } @@ -171,20 +171,20 @@ void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumb sal_Bool noLineNum = sal_False; if( _nolinenumber >>= noLineNum ) { - mxParaProps->setPropertyValue( rtl::OUString("ParaLineNumberCount"), uno::makeAny( noLineNum ) ); + mxParaProps->setPropertyValue( OUString("ParaLineNumberCount"), uno::makeAny( noLineNum ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeException) { sal_Int32 nLevel = word::WdOutlineLevel::wdOutlineLevelBodyText; - rtl::OUString aHeading; - const rtl::OUString HEADING = rtl::OUString("Heading"); - mxParaProps->getPropertyValue( rtl::OUString("ParaStyleName") ) >>= aHeading; + OUString aHeading; + const OUString HEADING = OUString("Heading"); + mxParaProps->getPropertyValue( OUString("ParaStyleName") ) >>= aHeading; if( aHeading.indexOf( HEADING ) == 0 ) { // get the sub string after "Heading" @@ -204,7 +204,7 @@ void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) t uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::RuntimeException) { style::BreakType aBreakType; - mxParaProps->getPropertyValue( rtl::OUString("BreakType") ) >>= aBreakType; + mxParaProps->getPropertyValue( OUString("BreakType") ) >>= aBreakType; sal_Bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH ); return uno::makeAny( bBreakBefore ); } @@ -215,7 +215,7 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe if( _breakbefore >>= bBreakBefore ) { style::BreakType aBreakType; - mxParaProps->getPropertyValue( rtl::OUString("BreakType") ) >>= aBreakType; + mxParaProps->getPropertyValue( OUString("BreakType") ) >>= aBreakType; if( bBreakBefore ) { if( aBreakType == style::BreakType_NONE ) @@ -230,64 +230,64 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe else if ( aBreakType == style::BreakType_PAGE_BEFORE ) aBreakType = style::BreakType_PAGE_AFTER; } - mxParaProps->setPropertyValue( rtl::OUString("BreakType"), uno::makeAny( aBreakType ) ); + mxParaProps->setPropertyValue( OUString("BreakType"), uno::makeAny( aBreakType ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException) { sal_Int32 nSpace = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaTopMargin") ) >>= nSpace; + mxParaProps->getPropertyValue( OUString("ParaTopMargin") ) >>= nSpace; return (float)( Millimeter::getInPoints( nSpace ) ); } void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) throw (uno::RuntimeException) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space ); - mxParaProps->setPropertyValue( rtl::OUString("ParaTopMargin"), uno::makeAny( nSpace ) ); + mxParaProps->setPropertyValue( OUString("ParaTopMargin"), uno::makeAny( nSpace ) ); } float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() throw (uno::RuntimeException) { sal_Int32 nSpace = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaBottomMargin") ) >>= nSpace; + mxParaProps->getPropertyValue( OUString("ParaBottomMargin") ) >>= nSpace; return (float)( Millimeter::getInPoints( nSpace ) ); } void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) throw (uno::RuntimeException) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space ); - mxParaProps->setPropertyValue( rtl::OUString("ParaBottomMargin"), uno::makeAny( nSpace ) ); + mxParaProps->setPropertyValue( OUString("ParaBottomMargin"), uno::makeAny( nSpace ) ); } float SAL_CALL SwVbaParagraphFormat::getLeftIndent() throw (uno::RuntimeException) { sal_Int32 nIndent = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaLeftMargin") ) >>= nIndent; + mxParaProps->getPropertyValue( OUString("ParaLeftMargin") ) >>= nIndent; return (float)( Millimeter::getInPoints( nIndent ) ); } void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) throw (uno::RuntimeException) { sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _leftindent ); - mxParaProps->setPropertyValue( rtl::OUString("ParaLeftMargin"), uno::makeAny( nIndent ) ); + mxParaProps->setPropertyValue( OUString("ParaLeftMargin"), uno::makeAny( nIndent ) ); } float SAL_CALL SwVbaParagraphFormat::getRightIndent() throw (uno::RuntimeException) { sal_Int32 nIndent = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaRightMargin") ) >>= nIndent; + mxParaProps->getPropertyValue( OUString("ParaRightMargin") ) >>= nIndent; return (float)( Millimeter::getInPoints( nIndent ) ); } void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) throw (uno::RuntimeException) { sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _rightindent ); - mxParaProps->setPropertyValue( rtl::OUString("ParaRightMargin"), uno::makeAny( nIndent ) ); + mxParaProps->setPropertyValue( OUString("ParaRightMargin"), uno::makeAny( nIndent ) ); } uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeException) @@ -297,16 +297,16 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeExcepti void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeException) { sal_Bool bWidow = sal_False; sal_Int8 nWidow = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaWidows") ) >>= nWidow; + mxParaProps->getPropertyValue( OUString("ParaWidows") ) >>= nWidow; sal_Int8 nOrphan = 0; - mxParaProps->getPropertyValue( rtl::OUString("ParaOrphans") ) >>= nOrphan; + mxParaProps->getPropertyValue( OUString("ParaOrphans") ) >>= nOrphan; // if the amount of single lines on one page > 1 and the same of start and end of the paragraph, // true is retured. bWidow = ( nWidow > 1 && nOrphan == nWidow ); @@ -321,12 +321,12 @@ void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontr if( _widowcontrol >>= bWidow ) { sal_Int8 nControl = bWidow? 2:1; - mxParaProps->setPropertyValue( rtl::OUString("ParaWidows"), uno::makeAny( nControl ) ); - mxParaProps->setPropertyValue( rtl::OUString("ParaOrphans"), uno::makeAny( nControl ) ); + mxParaProps->setPropertyValue( OUString("ParaWidows"), uno::makeAny( nControl ) ); + mxParaProps->setPropertyValue( OUString("ParaOrphans"), uno::makeAny( nControl ) ); } else { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } @@ -404,7 +404,7 @@ style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacingFromRule( sal_Int32 _l } default: { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); break; } } @@ -469,7 +469,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL } default: { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } return wdLineSpacing; @@ -478,7 +478,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException) { float fCharHeight = 0.0; - mxParaProps->getPropertyValue( rtl::OUString("CharHeight") ) >>= fCharHeight; + mxParaProps->getPropertyValue( OUString("CharHeight") ) >>= fCharHeight; return (sal_Int16)( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) ); } @@ -509,7 +509,7 @@ sal_Int32 SwVbaParagraphFormat::getOOoAlignment( sal_Int32 _alignment ) } default: { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } return nParaAjust; @@ -542,26 +542,26 @@ sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( sal_Int32 _alignment ) } default: { - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } } return wdAlignment; } -rtl::OUString +OUString SwVbaParagraphFormat::getServiceImplName() { - return rtl::OUString("SwVbaParagraphFormat"); + return OUString("SwVbaParagraphFormat"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaParagraphFormat::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.ParagraphFormat" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.ParagraphFormat" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index f80081ddcbcc..b095d670ad7e 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -81,8 +81,8 @@ public: virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_PARAGRAPHFORMAT_HXX */ diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index 9553b343aa36..95f275006680 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -72,7 +72,7 @@ void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, c mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText ); if( !mxTextCursor.is() ) - throw uno::RuntimeException( rtl::OUString("Fails to create text cursor"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Fails to create text cursor"), uno::Reference< uno::XInterface >() ); mxTextCursor->collapseToStart(); if( rEnd.is() ) @@ -93,10 +93,10 @@ SwVbaRange::getXTextRange() throw (uno::RuntimeException) * an issue that the last paragraph in a document does not have a trailing CRLF. * @return */ -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaRange::getText() throw ( uno::RuntimeException ) { - rtl::OUString aText = mxTextCursor->getString(); + OUString aText = mxTextCursor->getString(); sal_Int32 nLen = aText.getLength(); // FIXME: should add a line separator if the range includes the last paragraph @@ -123,11 +123,11 @@ SwVbaRange::getText() throw ( uno::RuntimeException ) } void SAL_CALL -SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException ) +SwVbaRange::setText( const OUString& rText ) throw ( uno::RuntimeException ) { // Emulate the MSWord behavior, Don't delete the bookmark // which contains no text string in current inserting position, - rtl::OUString sName; + OUString sName; uno::Reference< text::XTextRange > xRange( mxTextCursor, uno::UNO_QUERY_THROW ); try { @@ -145,7 +145,7 @@ SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException if( rText.indexOf( '\n' ) != -1 ) { - mxTextCursor->setString( rtl::OUString() ); + mxTextCursor->setString( OUString() ); // process CR in strings SwVbaRangeHelper::insertString( xRange, mxText, rText, sal_True ); } @@ -192,22 +192,22 @@ void SAL_CALL SwVbaRange::InsertBreak( const uno::Any& _breakType ) throw (uno:: case word::WdBreakType::wdSectionBreakNextPage: case word::WdBreakType::wdSectionBreakOddPage: case word::WdBreakType::wdTextWrappingBreak: - DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() ); break; default: - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); } if( eBreakType != style::BreakType_NONE ) { if( !mxTextCursor->isCollapsed() ) { - mxTextCursor->setString( rtl::OUString() ); + mxTextCursor->setString( OUString() ); mxTextCursor->collapseToStart(); } uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue( rtl::OUString("BreakType"), uno::makeAny( eBreakType ) ); + xProp->setPropertyValue( OUString("BreakType"), uno::makeAny( eBreakType ) ); } } @@ -223,7 +223,7 @@ SwVbaRange::Select() throw ( uno::RuntimeException ) void SAL_CALL SwVbaRange::InsertParagraph() throw ( uno::RuntimeException ) { - mxTextCursor->setString( rtl::OUString("") ); + mxTextCursor->setString( OUString("") ); InsertParagraphBefore(); } @@ -252,31 +252,31 @@ SwVbaRange::getParagraphFormat() throw ( uno::RuntimeException ) void SAL_CALL SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& /*rParagraphFormat*/ ) throw ( uno::RuntimeException ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } -void SwVbaRange::GetStyleInfo(rtl::OUString& aStyleName, rtl::OUString& aStyleType ) throw ( uno::RuntimeException ) +void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW ); - if( ( xProp->getPropertyValue( rtl::OUString("CharStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() ) + if( ( xProp->getPropertyValue( OUString("CharStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() ) { - aStyleType = rtl::OUString("CharacterStyles"); + aStyleType = OUString("CharacterStyles"); } - else if( ( xProp->getPropertyValue( rtl::OUString("ParaStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() ) + else if( ( xProp->getPropertyValue( OUString("ParaStyleName") ) >>= aStyleName ) && !aStyleName.isEmpty() ) { - aStyleType = rtl::OUString("ParagraphStyles"); + aStyleType = OUString("ParagraphStyles"); } if( aStyleType.isEmpty() ) { - DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() ); + DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() ); } } uno::Any SAL_CALL SwVbaRange::getStyle() throw ( uno::RuntimeException ) { - rtl::OUString aStyleName; - rtl::OUString aStyleType; + OUString aStyleName; + OUString aStyleType; GetStyleInfo( aStyleName, aStyleType ); uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW ); @@ -322,11 +322,11 @@ SwVbaRange::PageSetup( ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); - rtl::OUString aPageStyleName; - xParaProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; + OUString aPageStyleName; + xParaProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName; uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( OUString("PageStyles") ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPageProps( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, xModel, xPageProps ) ) ); } @@ -407,20 +407,20 @@ SwVbaRange::Fields( const uno::Any& index ) throw (uno::RuntimeException) return uno::makeAny( xCol ); } -rtl::OUString +OUString SwVbaRange::getServiceImplName() { - return rtl::OUString("SwVbaRange"); + return OUString("SwVbaRange"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaRange::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Range" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Range" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx index 804e8d4aed62..6ec5ff644d70 100644 --- a/sw/source/ui/vba/vbarange.hxx +++ b/sw/source/ui/vba/vbarange.hxx @@ -42,7 +42,7 @@ private: private: void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::uno::RuntimeException); - void GetStyleInfo(rtl::OUString& aStyleName, rtl::OUString& aStyleType ) throw ( css::uno::RuntimeException ); + void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( css::uno::RuntimeException ); public: SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException); SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException); @@ -56,8 +56,8 @@ public: void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException); // Attribute - virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException); virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException); @@ -84,8 +84,8 @@ public: virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_RANGE_HXX */ diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx index 0c45260159da..e1326a5fa6f1 100644 --- a/sw/source/ui/vba/vbarangehelper.cxx +++ b/sw/source/ui/vba/vbarangehelper.cxx @@ -61,7 +61,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u } -void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException ) +void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException ) { sal_Int32 nlastIndex = 0; sal_Int32 nIndex = 0; @@ -84,7 +84,7 @@ void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRa { xRange = xRange->getEnd(); - rtl::OUString aWatt = rStr.copy( nlastIndex ); + OUString aWatt = rStr.copy( nlastIndex ); rText->insertString( xRange, aWatt, _bAbsorb ); } } diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx index db199b49f0ef..537acc05722c 100644 --- a/sw/source/ui/vba/vbarangehelper.hxx +++ b/sw/source/ui/vba/vbarangehelper.hxx @@ -29,7 +29,7 @@ class SwVbaRangeHelper { public: static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException ); - static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException ); + static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException ); static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException ); static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw ( css::uno::RuntimeException ); static css::uno::Reference< css::text::XTextContent > findBookmarkByPosition( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException ); diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx index b983613b1bf7..13ace911d77f 100644 --- a/sw/source/ui/vba/vbareplacement.cxx +++ b/sw/source/ui/vba/vbareplacement.cxx @@ -32,12 +32,12 @@ SwVbaReplacement::~SwVbaReplacement() { } -::rtl::OUString SAL_CALL SwVbaReplacement::getText() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaReplacement::getText() throw (uno::RuntimeException) { return mxPropertyReplace->getReplaceString(); } -void SAL_CALL SwVbaReplacement::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException) +void SAL_CALL SwVbaReplacement::setText( const OUString& _text ) throw (uno::RuntimeException) { mxPropertyReplace->setReplaceString( _text ); } @@ -48,20 +48,20 @@ void SAL_CALL SwVbaReplacement::ClearFormatting( ) throw (uno::RuntimeException) mxPropertyReplace->setReplaceAttributes( aPropValues ); } -rtl::OUString +OUString SwVbaReplacement::getServiceImplName() { - return rtl::OUString("SwVbaReplacement"); + return OUString("SwVbaReplacement"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaReplacement::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Replacement" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Replacement" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx index 7c49cc51e07b..9569a6c9d90d 100644 --- a/sw/source/ui/vba/vbareplacement.hxx +++ b/sw/source/ui/vba/vbareplacement.hxx @@ -36,15 +36,15 @@ public: virtual ~SwVbaReplacement(); // Attributes - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); //Methods virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_REPLACEMENT_HXX */ diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx index 05fb97c765f9..ae45f7473408 100644 --- a/sw/source/ui/vba/vbarevision.cxx +++ b/sw/source/ui/vba/vbarevision.cxx @@ -73,20 +73,20 @@ SwVbaRevision::Reject( ) throw ( css::uno::RuntimeException ) pDoc->RejectRedline( GetPosition(), sal_True ); } -rtl::OUString +OUString SwVbaRevision::getServiceImplName() { - return rtl::OUString("SwVbaRevision"); + return OUString("SwVbaRevision"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaRevision::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Revision" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Revision" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx index 52f970220724..5d28fc488453 100644 --- a/sw/source/ui/vba/vbarevision.hxx +++ b/sw/source/ui/vba/vbarevision.hxx @@ -43,8 +43,8 @@ public: virtual void SAL_CALL Reject( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_REVISION_HXX */ diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 5f240b5bb129..8ad58e83468e 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -157,20 +157,20 @@ void SAL_CALL SwVbaRevisions::RejectAll( ) throw (css::uno::RuntimeException) throw uno::RuntimeException(); } -rtl::OUString +OUString SwVbaRevisions::getServiceImplName() { - return rtl::OUString("SwVbaRevisions"); + return OUString("SwVbaRevisions"); } -css::uno::Sequence +css::uno::Sequence SwVbaRevisions::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Revisions"); + sNames[0] = OUString("ooo.vba.word.Revisions"); } return sNames; } diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index f9971f0cd6f2..acf0dc459436 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -48,8 +48,8 @@ public: // SwVbaRevisions_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_PANES_HXX */ diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index 333611dc84de..5d3b0eec555b 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -47,7 +47,7 @@ uno::Any SAL_CALL SwVbaRow::getHeight() throw (css::uno::RuntimeException) return uno::makeAny( sal_Int32( word::WdConstants::wdUndefined ) ); sal_Int32 nHeight = 0; - mxRowProps->getPropertyValue( rtl::OUString("Height") ) >>= nHeight; + mxRowProps->getPropertyValue( OUString("Height") ) >>= nHeight; return uno::makeAny( (float)Millimeter::getInPoints( nHeight ) ); } @@ -57,20 +57,20 @@ void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) throw (css::uno::Ru _height >>= height; sal_Int32 nHeight = Millimeter::getInHundredthsOfOneMillimeter( height ); - mxRowProps->setPropertyValue( rtl::OUString("Height"), uno::makeAny( nHeight ) ); + mxRowProps->setPropertyValue( OUString("Height"), uno::makeAny( nHeight ) ); } ::sal_Int32 SAL_CALL SwVbaRow::getHeightRule() throw (css::uno::RuntimeException) { sal_Bool isAutoHeight = sal_False; - mxRowProps->getPropertyValue( rtl::OUString("IsAutoHeight") ) >>= isAutoHeight; + mxRowProps->getPropertyValue( OUString("IsAutoHeight") ) >>= isAutoHeight; return isAutoHeight ? word::WdRowHeightRule::wdRowHeightAuto : word::WdRowHeightRule::wdRowHeightExactly; } void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException) { sal_Bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto ); - mxRowProps->setPropertyValue( rtl::OUString("IsAutoHeight"), uno::makeAny( isAutoHeight ) ); + mxRowProps->setPropertyValue( OUString("IsAutoHeight"), uno::makeAny( isAutoHeight ) ); } void SAL_CALL @@ -81,17 +81,17 @@ SwVbaRow::Select( ) throw ( uno::RuntimeException ) void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw ( uno::RuntimeException ) { - rtl::OUStringBuffer aRangeName; + OUStringBuffer aRangeName; aRangeName.append('A').append(sal_Int32( nStartRow + 1 ) ); SwVbaTableHelper aTableHelper( xTextTable ); sal_Int32 nColCount = aTableHelper.getTabColumnsCount( nEndRow ); // FIXME: the column count > 26 //sal_Char cCol = 'A' + nColCount - 1; - rtl::OUString sCol = aTableHelper.getColumnStr( nColCount - 1); + OUString sCol = aTableHelper.getColumnStr( nColCount - 1); aRangeName.append(':').append( sCol ).append( sal_Int32( nEndRow + 1 ) ); uno::Reference< table::XCellRange > xCellRange( xTextTable, uno::UNO_QUERY_THROW ); - rtl::OUString sSelRange = aRangeName.makeStringAndClear(); + OUString sSelRange = aRangeName.makeStringAndClear(); uno::Reference< table::XCellRange > xSelRange = xCellRange->getCellRangeByName( sSelRange ); uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -104,20 +104,20 @@ void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule ) throw (c setHeight( uno::makeAny( height ) ); } -rtl::OUString +OUString SwVbaRow::getServiceImplName() { - return rtl::OUString("SwVbaRow"); + return OUString("SwVbaRow"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaRow::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Row" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Row" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx index 7169156db747..5eeb78f1e0fc 100644 --- a/sw/source/ui/vba/vbarow.hxx +++ b/sw/source/ui/vba/vbarow.hxx @@ -52,8 +52,8 @@ public: static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_ROW_HXX */ diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index d479834c9ae4..1d6140f75ab7 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -79,7 +79,7 @@ SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const u { sal_Int16 nAlignment = text::HoriOrientation::LEFT; uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); - xTableProps->getPropertyValue( rtl::OUString("HoriOrient") ) >>= nAlignment; + xTableProps->getPropertyValue( OUString("HoriOrient") ) >>= nAlignment; sal_Int32 nRet = 0; switch( nAlignment ) { @@ -122,7 +122,7 @@ void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) throw (uno::Runt } } uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); - xTableProps->setPropertyValue( rtl::OUString("HoriOrient"), uno::makeAny( nAlignment ) ); + xTableProps->setPropertyValue( OUString("HoriOrient"), uno::makeAny( nAlignment ) ); } uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeException) @@ -133,7 +133,7 @@ uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeExcep { uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); sal_Bool bSplit = sal_False; - xRowProps->getPropertyValue( rtl::OUString("IsSplitAllowed") ) >>= bSplit; + xRowProps->getPropertyValue( OUString("IsSplitAllowed") ) >>= bSplit; if( index == 0 ) { bAllowBreak = bSplit; @@ -155,7 +155,7 @@ void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakac for( sal_Int32 index = mnStartRowIndex; index <= mnEndRowIndex; ++index ) { uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW ); - xRowProps->setPropertyValue( rtl::OUString("IsSplitAllowed"), uno::makeAny( bAllowBreak ) ); + xRowProps->setPropertyValue( OUString("IsSplitAllowed"), uno::makeAny( bAllowBreak ) ); } } @@ -166,8 +166,8 @@ float SAL_CALL SwVbaRows::getSpaceBetweenColumns() throw (uno::RuntimeException) uno::Reference< beans::XPropertySet > xCellProps( xCellRange->getCellByPosition( 0, mnStartRowIndex ), uno::UNO_QUERY_THROW ); sal_Int32 nLeftBorderDistance = 0; sal_Int32 nRightBorderDistance = 0; - xCellProps->getPropertyValue( rtl::OUString("LeftBorderDistance") ) >>= nLeftBorderDistance; - xCellProps->getPropertyValue( rtl::OUString("RightBorderDistance") ) >>= nRightBorderDistance; + xCellProps->getPropertyValue( OUString("LeftBorderDistance") ) >>= nLeftBorderDistance; + xCellProps->getPropertyValue( OUString("RightBorderDistance") ) >>= nRightBorderDistance; return static_cast< float >( Millimeter::getInPoints( nLeftBorderDistance + nRightBorderDistance ) ); } @@ -183,8 +183,8 @@ void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns ) th for( sal_Int32 column = 0; column < nColumns; ++column ) { uno::Reference< beans::XPropertySet > xCellProps( xCellRange->getCellByPosition( column, row ), uno::UNO_QUERY_THROW ); - xCellProps->setPropertyValue( rtl::OUString("LeftBorderDistance"), uno::makeAny( nSpace ) ); - xCellProps->setPropertyValue( rtl::OUString("RightBorderDistance"), uno::makeAny( nSpace ) ); + xCellProps->setPropertyValue( OUString("LeftBorderDistance"), uno::makeAny( nSpace ) ); + xCellProps->setPropertyValue( OUString("RightBorderDistance"), uno::makeAny( nSpace ) ); } } } @@ -222,7 +222,7 @@ void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle } default: { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); } } } @@ -231,9 +231,9 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE { uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); sal_Int32 nMargin = 0; - xTableProps->getPropertyValue( rtl::OUString("LeftMargin") ) >>= nMargin; + xTableProps->getPropertyValue( OUString("LeftMargin") ) >>= nMargin; nMargin += indent; - xTableProps->setPropertyValue( rtl::OUString("LeftMargin"), uno::makeAny( nMargin ) ); + xTableProps->setPropertyValue( OUString("LeftMargin"), uno::makeAny( nMargin ) ); } void SwVbaRows::setIndentWithAdjustFirstColumn( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException) @@ -255,12 +255,12 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // calculate the new width and get the proportion between old and new uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); sal_Int32 nWidth = 0; - xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth; + xTableProps->getPropertyValue( OUString("Width") ) >>= nWidth; sal_Int32 nNewWidth = nWidth - indent; if ((nNewWidth <= 0) || (nWidth <= 0)) { throw uno::RuntimeException( - ::rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "Pb with width, in SwVbaRows::setIndentWithAdjustProportional (nNewWidth <= 0) || (nWidth <= 0)" ) @@ -283,7 +283,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // set the width and position of the table setIndentWithAdjustNone( indent ); - xTableProps->setPropertyValue( rtl::OUString("Width"), uno::makeAny( nNewWidth ) ); + xTableProps->setPropertyValue( OUString("Width"), uno::makeAny( nNewWidth ) ); } void SwVbaRows::setIndentWithAdjustSameWidth( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException) @@ -291,7 +291,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // calculate the new width and get the width of all columns uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); sal_Int32 nWidth = 0; - xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth; + xTableProps->getPropertyValue( OUString("Width") ) >>= nWidth; sal_Int32 nNewWidth = nWidth - indent; // get all columns, calculate and set the new width of the columns @@ -306,7 +306,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE // set the width and position of the table setIndentWithAdjustNone( indent ); - xTableProps->setPropertyValue( rtl::OUString("Width"), uno::makeAny( nNewWidth ) ); + xTableProps->setPropertyValue( OUString("Width"), uno::makeAny( nNewWidth ) ); } void SAL_CALL SwVbaRows::Select( ) throw (uno::RuntimeException) @@ -326,11 +326,11 @@ uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not { if( nIndex <= 0 || nIndex > getCount() ) { - throw lang::IndexOutOfBoundsException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw lang::IndexOutOfBoundsException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( uno::Reference< word::XRow >( new SwVbaRow( this, mxContext, mxTextTable, nIndex - 1 ) ) ); } - throw uno::RuntimeException( ::rtl::OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Index out of bounds"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -351,20 +351,20 @@ SwVbaRows::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaRows::getServiceImplName() { - return rtl::OUString("SwVbaRows"); + return OUString("SwVbaRows"); } -uno::Sequence +uno::Sequence SwVbaRows::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Rows"); + sNames[0] = OUString("ooo.vba.word.Rows"); } return sNames; } diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx index e394f75dac98..61e44d6abcc3 100644 --- a/sw/source/ui/vba/vbarows.hxx +++ b/sw/source/ui/vba/vbarows.hxx @@ -69,8 +69,8 @@ public: // SwVbaRows_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_ROWS_HXX */ diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx index 925472b9d496..5fb2aff82661 100644 --- a/sw/source/ui/vba/vbasection.cxx +++ b/sw/source/ui/vba/vbasection.cxx @@ -65,20 +65,20 @@ SwVbaSection::PageSetup( ) throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) ); } -rtl::OUString +OUString SwVbaSection::getServiceImplName() { - return rtl::OUString("SwVbaSection"); + return OUString("SwVbaSection"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaSection::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Section" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Section" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx index 59d3463914e3..dfd297729279 100644 --- a/sw/source/ui/vba/vbasection.hxx +++ b/sw/source/ui/vba/vbasection.hxx @@ -45,8 +45,8 @@ public: virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_SECTION_HXX */ diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index f996815dc543..2c9823b980d9 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -65,7 +65,7 @@ public: { uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XIndexAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xPageStyles( xSytleFamNames->getByName( OUString("PageStyles") ), uno::UNO_QUERY_THROW ); sal_Int32 nCount = xPageStyles->getCount(); for( sal_Int32 index = 0; index < nCount; ++index ) { @@ -148,7 +148,7 @@ SwVbaSections::PageSetup( ) throw (uno::RuntimeException) uno::Reference< word::XSection > xSection( m_xIndexAccess->getByIndex( 0 ), uno::UNO_QUERY_THROW ); return xSection->PageSetup(); } - throw uno::RuntimeException( rtl::OUString("There is no section"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("There is no section"), uno::Reference< uno::XInterface >() ); } // XEnumerationAccess @@ -171,20 +171,20 @@ SwVbaSections::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaSections::getServiceImplName() { - return rtl::OUString("SwVbaSections"); + return OUString("SwVbaSections"); } -css::uno::Sequence +css::uno::Sequence SwVbaSections::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Sections"); + sNames[0] = OUString("ooo.vba.word.Sections"); } return sNames; } diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx index a2a482d983c7..4ac51e54cda6 100644 --- a/sw/source/ui/vba/vbasections.hxx +++ b/sw/source/ui/vba/vbasections.hxx @@ -46,8 +46,8 @@ public: // SwVbaSections_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_SECTIONS_HXX */ diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index 62ad26645a83..d564c43a0343 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -81,7 +81,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un { uno::Reference< text::XTextRange > xTextRange; uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel->getCurrentSelection(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.TextRanges") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.text.TextRanges") ) ) { uno::Reference< container::XIndexAccess > xTextRanges( xServiceInfo, uno::UNO_QUERY_THROW ); if( xTextRanges->getCount() > 0 ) @@ -92,7 +92,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un } else { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return xTextRange; } @@ -105,20 +105,20 @@ SwVbaSelection::getRange() throw ( uno::RuntimeException ) return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, xDocument, xTextRange->getStart(), xTextRange->getEnd(), mxTextViewCursor->getText() ) ); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaSelection::getText() throw ( uno::RuntimeException ) { return getRange()->getText(); } void SAL_CALL -SwVbaSelection::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException ) +SwVbaSelection::setText( const OUString& rText ) throw ( uno::RuntimeException ) { getRange()->setText( rText ); } void SAL_CALL -SwVbaSelection::TypeText( const rtl::OUString& rText ) throw ( uno::RuntimeException ) +SwVbaSelection::TypeText( const OUString& rText ) throw ( uno::RuntimeException ) { // FIXME: handle the property Options.ReplaceSelection, the default value is sal_True setText( rText ); @@ -154,7 +154,7 @@ SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -189,7 +189,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -215,11 +215,11 @@ SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( } default: { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } - rtl::OUString url = rtl::OUString( ".uno:Delete"); + OUString url = OUString( ".uno:Delete"); dispatchRequests( mxModel,url ); } @@ -248,7 +248,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( nExtend == word::WdMovementType::wdExtend ) { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); return; } NextCell( nCount, eDirection ); @@ -258,7 +258,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_LEFT || eDirection == word::MOVE_RIGHT ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< view::XViewCursor > xViewCursor( mxTextViewCursor, uno::UNO_QUERY_THROW ); if( eDirection == word::MOVE_UP ) @@ -271,7 +271,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_UP || eDirection == word::MOVE_DOWN ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } if( word::gotoSelectedObjectAnchor( mxModel ) ) { @@ -287,7 +287,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; if( xTextTable.is() ) { uno::Reference< text::XTextRange > xRange( xTextTable->getCellByName( xTextTableCursor->getRangeName()), uno::UNO_QUERY_THROW ); @@ -311,7 +311,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: { if( eDirection == word::MOVE_LEFT || eDirection == word::MOVE_RIGHT ) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< text::XParagraphCursor > xParagraphCursor( xTextCursor, uno::UNO_QUERY_THROW ); for( sal_Int32 i=0; i() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } uno::Reference< text::XWordCursor > xWordCursor( xTextCursor, uno::UNO_QUERY_THROW ); for( sal_Int32 i=0; i() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -353,16 +353,16 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, word::E_DIRECTION eDirection ) uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; uno::Reference< table::XCell > xCell; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("Cell") ) >>= xCell; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("Cell") ) >>= xCell; if( !xTextTable.is() || !xCell.is() ) { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); return; } uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW ); - rtl::OUString aCellName; - xCellProps->getPropertyValue( rtl::OUString("CellName") ) >>= aCellName; + OUString aCellName; + xCellProps->getPropertyValue( OUString("CellName") ) >>= aCellName; uno::Reference< text::XTextTableCursor > xTextTableCursor = xTextTable->createCursorByCellName( aCellName ); // move the table cursor switch( eDirection ) @@ -389,7 +389,7 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, word::E_DIRECTION eDirection ) } default: { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); return; } } @@ -548,7 +548,7 @@ SwVbaSelection::getFont() throw ( uno::RuntimeException ) void SAL_CALL SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException ) { - rtl::OUString url = rtl::OUString( ".uno:SwBackspace"); + OUString url = OUString( ".uno:SwBackspace"); dispatchRequests( mxModel,url ); } @@ -556,7 +556,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w { sal_Int32 nWhat = 0; if( ( _what >>= nWhat ) != sal_True ) - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); switch( nWhat ) { case word::WdGoToItem::wdGoToBookmark: @@ -608,7 +608,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w } if( _name.hasValue() ) { - rtl::OUString sName; + OUString sName; _name >>= sName; sal_Int32 nName = sName.toInt32(); if( nName !=0 ) @@ -648,11 +648,11 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w if( nPage != 0 ) xPageCursor->jumpToPage( ( sal_Int16 )( nPage ) ); else - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); break; } default: - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return getRange(); } @@ -691,7 +691,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; if( xTextTable.is() ) result = uno::makeAny( sal_True ); else @@ -734,8 +734,8 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run case word::WdSeekView::wdSeekFirstPageFooter: { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); - rtl::OUString aPageStyleName; - xCursorProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; + OUString aPageStyleName; + xCursorProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName; bool bFirstPage = false; if ( aPageStyleName == "First Page" ) bFirstPage = true; @@ -764,7 +764,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run break; } default: - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } return result; } @@ -792,7 +792,7 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; if( xTextTable.is() ) { uno::Reference< css::text::XTextDocument > xTextDoc( mxModel, uno::UNO_QUERY_THROW ); @@ -901,8 +901,8 @@ void SAL_CALL SwVbaSelection::SelectColumn() throw (uno::RuntimeException) uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) throw (uno::RuntimeException) { - rtl::OUString sTLName; - rtl::OUString sBRName; + OUString sTLName; + OUString sBRName; GetSelectedCellRange( sTLName, sBRName ); sal_Int32 nStartRow = 0; @@ -927,8 +927,8 @@ uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) throw (uno::Runt uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index ) throw (uno::RuntimeException) { - rtl::OUString sTLName; - rtl::OUString sBRName; + OUString sTLName; + OUString sBRName; GetSelectedCellRange( sTLName, sBRName ); sal_Int32 nStartColumn = 0; sal_Int32 nEndColumn = 0; @@ -955,7 +955,7 @@ uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable() throw( uno::R { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; return xTextTable; } @@ -977,11 +977,11 @@ bool SwVbaSelection::HasSelection() throw( uno::RuntimeException ) return true; } -void SwVbaSelection::GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString& sBRName ) throw( uno::RuntimeException ) +void SwVbaSelection::GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw( uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; - xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextTable; + xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextTable; if( !xTextTable.is() ) throw uno::RuntimeException( ); @@ -998,20 +998,20 @@ void SwVbaSelection::GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString if( sTLName.isEmpty() ) { uno::Reference< table::XCell > xCell; - xCursorProps->getPropertyValue( rtl::OUString("Cell") ) >>= xCell; + xCursorProps->getPropertyValue( OUString("Cell") ) >>= xCell; if( !xCell.is() ) { throw uno::RuntimeException( ); } uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW ); - xCellProps->getPropertyValue( rtl::OUString("CellName") ) >>= sTLName; + xCellProps->getPropertyValue( OUString("CellName") ) >>= sTLName; } } uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::RuntimeException) { - rtl::OUString sTLName; - rtl::OUString sBRName; + OUString sTLName; + OUString sBRName; GetSelectedCellRange( sTLName, sBRName ); sal_Int32 nLeft = 0; sal_Int32 nTop = 0; @@ -1041,7 +1041,7 @@ uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::Run void SAL_CALL SwVbaSelection::Copy( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( ".uno:Copy"); + OUString url = OUString( ".uno:Copy"); dispatchRequests( mxModel,url ); } @@ -1053,7 +1053,7 @@ void SAL_CALL SwVbaSelection::CopyAsPicture( ) throw (uno::RuntimeException) void SAL_CALL SwVbaSelection::Paste( ) throw (uno::RuntimeException) { - rtl::OUString url = rtl::OUString( ".uno:Paste"); + OUString url = OUString( ".uno:Paste"); dispatchRequests( mxModel,url ); } @@ -1101,7 +1101,7 @@ void SAL_CALL SwVbaSelection::WholeStory( ) throw (uno::RuntimeException) // insert an empty line uno::Reference< text::XTextRange > xFirstCellRange = word::getFirstObjectPosition( xText ); mxTextViewCursor->gotoRange( xFirstCellRange, sal_False ); - rtl::OUString url = rtl::OUString( ".uno:InsertPara"); + OUString url = OUString( ".uno:InsertPara"); dispatchRequests( mxModel,url ); } } @@ -1162,20 +1162,20 @@ SwVbaSelection::Paragraphs( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return aRet; } -rtl::OUString +OUString SwVbaSelection::getServiceImplName() { - return rtl::OUString("SwVbaSelection"); + return OUString("SwVbaSelection"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaSelection::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Selection" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Selection" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index ca76d9a214fc..6051b15d1300 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -44,7 +44,7 @@ private: void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException); void NextCell( sal_Int32 nCount, ooo::vba::word::E_DIRECTION eDirection ) throw ( css::uno::RuntimeException ); css::uno::Reference< css::text::XTextRange > GetSelectedRange() throw ( css::uno::RuntimeException ); - void GetSelectedCellRange( rtl::OUString& sTLName, rtl::OUString& sBRName ) throw ( css::uno::RuntimeException ); + void GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw ( css::uno::RuntimeException ); css::uno::Reference< css::text::XTextTable > GetXTextTable() throw ( css::uno::RuntimeException ); bool IsInTable() throw ( css::uno::RuntimeException ); bool HasSelection() throw ( css::uno::RuntimeException ); @@ -54,12 +54,12 @@ public: virtual ~SwVbaSelection(); // Attribute - virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException); virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException); virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException); - virtual void SAL_CALL TypeText( const rtl::OUString& rText ) throw (css::uno::RuntimeException); + virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException); virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException); virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException); @@ -104,8 +104,8 @@ public: virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_SELECTION_HXX */ diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 5bd5a109311d..ce5cd906af0f 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -37,12 +37,12 @@ SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const } void SAL_CALL -SwVbaStyle::setName( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +SwVbaStyle::setName( const OUString& Name ) throw (uno::RuntimeException) { mxStyle->setName(Name); } -::rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaStyle::getName() throw (uno::RuntimeException) { return mxStyle->getName(); @@ -51,14 +51,14 @@ SwVbaStyle::getName() throw (uno::RuntimeException) sal_Int32 SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps ) throw (uno::RuntimeException) { lang::Locale aLocale; - xTCProps->getPropertyValue( rtl::OUString("CharLocale") ) >>= aLocale; + xTCProps->getPropertyValue( OUString("CharLocale") ) >>= aLocale; return LanguageTag( aLocale ).getLanguageType( false); } void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (uno::RuntimeException) { lang::Locale aLocale = LanguageTag( static_cast(_languageid) ).getLocale(); - xTCProps->setPropertyValue( rtl::OUString("CharLocale"), uno::makeAny( aLocale ) ) ; + xTCProps->setPropertyValue( OUString("CharLocale"), uno::makeAny( aLocale ) ) ; } ::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() throw (uno::RuntimeException) @@ -75,9 +75,9 @@ void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::R { sal_Int32 nType = word::WdStyleType::wdStyleTypeParagraph; uno::Reference< lang::XServiceInfo > xServiceInfo( mxStyle, uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.style.ParagraphStyle") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.style.ParagraphStyle") ) ) nType = word::WdStyleType::wdStyleTypeParagraph; - else if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.style.CharacterStyle") ) ) + else if( xServiceInfo->supportsService( OUString("com.sun.star.style.CharacterStyle") ) ) nType = word::WdStyleType::wdStyleTypeCharacter; else nType = word::WdStyleType::wdStyleTypeList; @@ -93,7 +93,7 @@ SwVbaStyle::getFont() throw ( uno::RuntimeException ) void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Any& rStyle )throw (uno::RuntimeException) { - rtl::OUString sStyle; + OUString sStyle; uno::Reference< word::XStyle > xStyle; if( rStyle >>= xStyle ) { @@ -106,23 +106,23 @@ void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaPro if( !sStyle.isEmpty() ) { - xParaProps->setPropertyValue( rtl::OUString("ParaStyleName"), uno::makeAny( sStyle ) ); + xParaProps->setPropertyValue( OUString("ParaStyleName"), uno::makeAny( sStyle ) ); return; } throw uno::RuntimeException(); } -::rtl::OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException) +OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException) { - rtl::OUString sNameLocal; - mxStyleProps->getPropertyValue( rtl::OUString("DisplayName") ) >>= sNameLocal; + OUString sNameLocal; + mxStyleProps->getPropertyValue( OUString("DisplayName") ) >>= sNameLocal; return sNameLocal; } -void SAL_CALL SwVbaStyle::setNameLocal( const ::rtl::OUString& _namelocal ) throw (uno::RuntimeException) +void SAL_CALL SwVbaStyle::setNameLocal( const OUString& _namelocal ) throw (uno::RuntimeException) { - mxStyleProps->setPropertyValue( rtl::OUString("DisplayName"), uno::makeAny( _namelocal ) ); + mxStyleProps->setPropertyValue( OUString("DisplayName"), uno::makeAny( _namelocal ) ); } uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat() throw (uno::RuntimeException) @@ -141,20 +141,20 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat ::sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate() throw (uno::RuntimeException) { sal_Bool isAutoUpdate = sal_False; - mxStyleProps->getPropertyValue( rtl::OUString("IsAutoUpdate") ) >>= isAutoUpdate; + mxStyleProps->getPropertyValue( OUString("IsAutoUpdate") ) >>= isAutoUpdate; return isAutoUpdate; } void SAL_CALL SwVbaStyle::setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (uno::RuntimeException) { - mxStyleProps->setPropertyValue( rtl::OUString("IsAutoUpdate"), uno::makeAny( _automaticallyupdate ) ); + mxStyleProps->setPropertyValue( OUString("IsAutoUpdate"), uno::makeAny( _automaticallyupdate ) ); } uno::Any SAL_CALL SwVbaStyle::getBaseStyle() throw (uno::RuntimeException) { // ParentStyle - rtl::OUString sBaseStyle; - mxStyleProps->getPropertyValue( rtl::OUString("ParentStyle") ) >>= sBaseStyle; + OUString sBaseStyle; + mxStyleProps->getPropertyValue( OUString("ParentStyle") ) >>= sBaseStyle; if( !sBaseStyle.isEmpty() ) { uno::Reference< XCollection > xCol( new SwVbaStyles( this, mxContext, mxModel ) ); @@ -172,8 +172,8 @@ void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno: _basestyle >>= xStyle; if( xStyle.is() ) { - rtl::OUString sBaseStyle = xStyle->getName(); - mxStyleProps->setPropertyValue( rtl::OUString("ParentStyle"), uno::makeAny( sBaseStyle ) ); + OUString sBaseStyle = xStyle->getName(); + mxStyleProps->setPropertyValue( OUString("ParentStyle"), uno::makeAny( sBaseStyle ) ); } else { @@ -184,8 +184,8 @@ void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno: uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() throw (uno::RuntimeException) { //FollowStyle - rtl::OUString sFollowStyle; - mxStyleProps->getPropertyValue( rtl::OUString("FollowStyle") ) >>= sFollowStyle; + OUString sFollowStyle; + mxStyleProps->getPropertyValue( OUString("FollowStyle") ) >>= sFollowStyle; if( !sFollowStyle.isEmpty() ) { uno::Reference< XCollection > xCol( new SwVbaStyles( this, mxContext, mxModel ) ); @@ -203,8 +203,8 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs _nextparagraphstyle >>= xStyle; if( xStyle.is() ) { - rtl::OUString sFollowStyle = xStyle->getName(); - mxStyleProps->setPropertyValue( rtl::OUString("FollowStyle"), uno::makeAny( sFollowStyle ) ); + OUString sFollowStyle = xStyle->getName(); + mxStyleProps->setPropertyValue( OUString("FollowStyle"), uno::makeAny( sFollowStyle ) ); } else { @@ -215,24 +215,24 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs ::sal_Int32 SAL_CALL SwVbaStyle::getListLevelNumber() throw (uno::RuntimeException) { sal_Int16 nNumberingLevel = 0; - mxStyleProps->getPropertyValue( rtl::OUString("NumberingLevel") ) >>= nNumberingLevel; + mxStyleProps->getPropertyValue( OUString("NumberingLevel") ) >>= nNumberingLevel; return nNumberingLevel; } -rtl::OUString +OUString SwVbaStyle::getServiceImplName() { - return rtl::OUString("SwVbaStyle"); + return OUString("SwVbaStyle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaStyle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.XStyle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.XStyle" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index a71e0aa09ff1..3e0af4d1f2b4 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -45,14 +45,14 @@ public: static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException); // Attributes - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& Name ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException); virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException); virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); - virtual void SAL_CALL setNameLocal( const ::rtl::OUString& _namelocal ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); + virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException); virtual void SAL_CALL setAutomaticallyUpdate( ::sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException); @@ -63,11 +63,11 @@ public: virtual ::sal_Int32 SAL_CALL getListLevelNumber() throw (css::uno::RuntimeException); //XDefaultProperty - virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return rtl::OUString("Name"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Name"); } // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SW_VBA_AXIS_HXX diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 66d055359635..8c3d66ca1b3c 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -171,23 +171,23 @@ public: // we only concern about the Paragraph styles uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( _xModel, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStyleFamilies = xStyleSupplier->getStyleFamilies(); - mxParaStyles.set( xStyleFamilies->getByName( rtl::OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW ); + mxParaStyles.set( xStyleFamilies->getByName( OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW ); } // XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return style::XStyle::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0; } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return cachePos; } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { return mxParaStyles->getElementNames(); } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { // search in the MSOStyleName table first for( const MSOStyleNameTable* pTable = aMSOStyleNameTable; pTable->pMSOStyleName != NULL; pTable++ ) @@ -195,7 +195,7 @@ public: if( aName.equalsIgnoreAsciiCaseAscii( pTable->pMSOStyleName ) ) { //Found it - rtl::OUString sStyleName = rtl::OUString::createFromAscii( pTable->pOOoStyleName ); + OUString sStyleName = OUString::createFromAscii( pTable->pOOoStyleName ); if( mxParaStyles->hasByName( sStyleName ) ) { cachePos = mxParaStyles->getByName( sStyleName ); @@ -212,10 +212,10 @@ public: } else { - uno::Sequence< rtl::OUString > sElementNames = mxParaStyles->getElementNames(); + uno::Sequence< OUString > sElementNames = mxParaStyles->getElementNames(); for( sal_Int32 j = 0; j < sElementNames.getLength(); j++ ) { - rtl::OUString aStyleName = sElementNames[j]; + OUString aStyleName = sElementNames[j]; if( aStyleName.equalsIgnoreAsciiCase( aName ) ) { cachePos = mxParaStyles->getByName( aStyleName ); @@ -243,7 +243,7 @@ public: // XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException) { - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } }; @@ -301,31 +301,31 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: { if( nIndex == pTable->wdBuiltinStyle ) { - rtl::OUString aStyleName = rtl::OUString::createFromAscii( pTable->pOOoStyleName ); + OUString aStyleName = OUString::createFromAscii( pTable->pOOoStyleName ); if( !aStyleName.isEmpty() ) { - rtl::OUString aStyleType; + OUString aStyleType; switch( pTable->wdStyleType ) { case word::WdStyleType::wdStyleTypeParagraph: case word::WdStyleType::wdStyleTypeTable: { - aStyleType = rtl::OUString("ParagraphStyles"); + aStyleType = OUString("ParagraphStyles"); break; } case word::WdStyleType::wdStyleTypeCharacter: { - aStyleType = rtl::OUString("CharacterStyles"); + aStyleType = OUString("CharacterStyles"); break; } case word::WdStyleType::wdStyleTypeList: { // should use Paragraph style and set the property "NumberingStyleName" - aStyleType = rtl::OUString("ParagraphStyles"); + aStyleType = OUString("ParagraphStyles"); break; } default: - DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() ); + DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() ); } uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxModel, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW ); @@ -333,14 +333,14 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: // set the property "NumberingStyleName" if it is a listbullet if( pTable->wdStyleType == word::WdStyleType::wdStyleTypeList ) { - xStyleProps->setPropertyValue( rtl::OUString("NumberingStyleName"), uno::makeAny( aStyleName ) ); + xStyleProps->setPropertyValue( OUString("NumberingStyleName"), uno::makeAny( aStyleName ) ); } return uno::makeAny( uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, mxModel, xStyleProps ) ) ); } else { OSL_TRACE("SwVbaStyles::Item: the builtin style type is not implemented"); - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } } } @@ -348,20 +348,20 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: return SwVbaStyles_BASE::Item( Index1, Index2 ); } -rtl::OUString +OUString SwVbaStyles::getServiceImplName() { - return rtl::OUString("SwVbaStyles"); + return OUString("SwVbaStyles"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaStyles::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.XStyles" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.XStyles" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx index 321b6dee6e9c..eb7a5bdcd8bc 100644 --- a/sw/source/ui/vba/vbastyles.hxx +++ b/sw/source/ui/vba/vbastyles.hxx @@ -36,8 +36,8 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index dc690fd77d25..6953bfad1743 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -43,19 +43,19 @@ PrivateProfileStringListener::~PrivateProfileStringListener() { } -void PrivateProfileStringListener::Initialize( const rtl::OUString& rFileName, const rtl::OString& rGroupName, const rtl::OString& rKey ) +void PrivateProfileStringListener::Initialize( const OUString& rFileName, const OString& rGroupName, const OString& rKey ) { maFileName = rFileName; maGroupName = rGroupName; maKey = rKey; } #ifdef WNT -void lcl_getRegKeyInfo( const rtl::OString& sKeyInfo, HKEY& hBaseKey, rtl::OString& sSubKey ) +void lcl_getRegKeyInfo( const OString& sKeyInfo, HKEY& hBaseKey, OString& sSubKey ) { sal_Int32 nBaseKeyIndex = sKeyInfo.indexOf('\\'); if( nBaseKeyIndex > 0 ) { - rtl::OString sBaseKey = sKeyInfo.copy( 0, nBaseKeyIndex ); + OString sBaseKey = sKeyInfo.copy( 0, nBaseKeyIndex ); sSubKey = sKeyInfo.copy( nBaseKeyIndex + 1 ); if( sBaseKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HKEY_CURRENT_USER")) ) { @@ -84,20 +84,20 @@ void lcl_getRegKeyInfo( const rtl::OString& sKeyInfo, HKEY& hBaseKey, rtl::OStri uno::Any PrivateProfileStringListener::getValueEvent() { // get the private profile string - rtl::OUString sValue; + OUString sValue; if(!maFileName.isEmpty()) { // get key/value from a file Config aCfg( maFileName ); aCfg.SetGroup( maGroupName ); - sValue = rtl::OStringToOUString(aCfg.ReadKey(maKey), RTL_TEXTENCODING_DONTKNOW); + sValue = OStringToOUString(aCfg.ReadKey(maKey), RTL_TEXTENCODING_DONTKNOW); } else { // get key/value from windows register #ifdef WNT HKEY hBaseKey = NULL; - rtl::OString sSubKey; + OString sSubKey; lcl_getRegKeyInfo( maGroupName, hBaseKey, sSubKey ); if( hBaseKey != NULL ) { @@ -112,13 +112,13 @@ uno::Any PrivateProfileStringListener::getValueEvent() LPCTSTR lpValueName = TEXT(maKey.getStr()); lResult = RegQueryValueEx( hKey, lpValueName, NULL, NULL, (LPBYTE)szBuffer, &cbData ); RegCloseKey( hKey ); - sValue = rtl::OUString::createFromAscii(szBuffer); + sValue = OUString::createFromAscii(szBuffer); } } return uno::makeAny( sValue ); #else - throw uno::RuntimeException( rtl::OUString("Only support on Windows"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Only support on Windows"), uno::Reference< uno::XInterface >() ); #endif } @@ -128,21 +128,21 @@ uno::Any PrivateProfileStringListener::getValueEvent() void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value ) { // set the private profile string - rtl::OUString aValue; + OUString aValue; value >>= aValue; if(!maFileName.isEmpty()) { // set value into a file Config aCfg( maFileName ); aCfg.SetGroup( maGroupName ); - aCfg.WriteKey( maKey, rtl::OUStringToOString(aValue, RTL_TEXTENCODING_DONTKNOW) ); + aCfg.WriteKey( maKey, OUStringToOString(aValue, RTL_TEXTENCODING_DONTKNOW) ); } else { //set value into windows register #ifdef WNT HKEY hBaseKey = NULL; - rtl::OString sSubKey; + OString sSubKey; lcl_getRegKeyInfo( maGroupName, hBaseKey, sSubKey ); if( hBaseKey != NULL ) { @@ -152,7 +152,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value ) lResult = RegCreateKeyEx( hBaseKey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL ); if( ERROR_SUCCESS == lResult ) { - LPCTSTR szValue = TEXT( rtl::OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); + LPCTSTR szValue = TEXT( OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); DWORD cbData = sizeof(TCHAR) * (_tcslen(szValue) + 1); LPCTSTR lpValueName = TEXT(maKey.getStr()); lResult = RegSetValueEx( hKey, lpValueName, 0 /* Reserved */, REG_SZ, (LPBYTE)szValue, cbData ); @@ -161,7 +161,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value ) } return; #else - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); #endif } @@ -229,7 +229,7 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) break; } default: - throw uno::RuntimeException( rtl::OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); // TODO: isn't this a flaw in the API? It should be allowed to throw an // IllegalArgumentException, or so } @@ -241,11 +241,11 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) } uno::Any SAL_CALL -SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( uno::RuntimeException ) +SwVbaSystem::PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( uno::RuntimeException ) { // FIXME: need to detect whether it is a relative file path // we need to detect if this is a URL, if not then assume its a file path - rtl::OUString sFileUrl; + OUString sFileUrl; if( !rFilename.isEmpty() ) { INetURLObject aObj; @@ -257,27 +257,27 @@ SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OU osl::FileBase::getFileURLFromSystemPath( rFilename, sFileUrl); } - rtl::OString aGroupName(rtl::OUStringToOString(rSection, RTL_TEXTENCODING_DONTKNOW)); - rtl::OString aKey(rtl::OUStringToOString(rKey, RTL_TEXTENCODING_DONTKNOW)); + OString aGroupName(OUStringToOString(rSection, RTL_TEXTENCODING_DONTKNOW)); + OString aKey(OUStringToOString(rKey, RTL_TEXTENCODING_DONTKNOW)); maPrivateProfileStringListener.Initialize( sFileUrl, aGroupName, aKey ); return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) ); } -rtl::OUString +OUString SwVbaSystem::getServiceImplName() { - return rtl::OUString("SwVbaSystem"); + return OUString("SwVbaSystem"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaSystem::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.System" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.System" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx index c82c16bd5bcb..f6b376e54855 100644 --- a/sw/source/ui/vba/vbasystem.hxx +++ b/sw/source/ui/vba/vbasystem.hxx @@ -29,13 +29,13 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSystem > SwVbaSystem_BAS class PrivateProfileStringListener : public PropListener { private: - rtl::OUString maFileName; - rtl::OString maGroupName; - rtl::OString maKey; + OUString maFileName; + OString maGroupName; + OString maKey; public: PrivateProfileStringListener(){}; virtual ~PrivateProfileStringListener(); - void Initialize( const rtl::OUString& rFileName, const rtl::OString& rGroupName, const rtl::OString& rKey ); + void Initialize( const OUString& rFileName, const OString& rGroupName, const OString& rKey ); //PropListener virtual void setValueEvent( const css::uno::Any& value ); @@ -54,11 +54,11 @@ public: // XSystem virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException ); virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException ); - virtual css::uno::Any SAL_CALL PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_SYSTEM_HXX */ diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx index f421ffdbbb9b..7b425c67b245 100644 --- a/sw/source/ui/vba/vbatable.cxx +++ b/sw/source/ui/vba/vbatable.cxx @@ -78,7 +78,7 @@ SwVbaTable::ConvertToText( const uno::Any& /*Separator*/, const uno::Any& /*Nest throw uno::RuntimeException(); } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaTable::getName() throw (uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( mxTextTable, uno::UNO_QUERY_THROW ); @@ -117,20 +117,20 @@ SwVbaTable::Columns( const uno::Any& index ) throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString +OUString SwVbaTable::getServiceImplName() { - return rtl::OUString("SwVbaTable"); + return OUString("SwVbaTable"); } -uno::Sequence +uno::Sequence SwVbaTable::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Table" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Table" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index 6b77d8592a0f..79c74aa771ae 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -38,14 +38,14 @@ public: virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getName( ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index 7d7029333fe8..59aaf3707c93 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -72,7 +72,7 @@ sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( ) throw (uno::RuntimeExceptio return nRet; } -sal_Int32 SwVbaTableHelper::getTabRowIndex( const rtl::OUString& CellName ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& CellName ) throw (uno::RuntimeException) { sal_Int32 nRet = 0; String sCellName(CellName); @@ -87,7 +87,7 @@ sal_Int32 SwVbaTableHelper::getTabRowIndex( const rtl::OUString& CellName ) thro return nRet; } -sal_Int32 SwVbaTableHelper::getTabColIndex( const rtl::OUString& CellName ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& CellName ) throw (uno::RuntimeException) { sal_Int32 nRet = 0; String sCellName(CellName); @@ -99,7 +99,7 @@ sal_Int32 SwVbaTableHelper::getTabColIndex( const rtl::OUString& CellName ) thro return nRet; } -rtl::OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol ) +OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol ) { const sal_Int32 coDiff = 52; // 'A'-'Z' 'a' - 'z' sal_Int32 nCalc = 0; @@ -125,14 +125,14 @@ sal_Int32 SwVbaTableHelper::getTableWidth( ) throw (uno::RuntimeException) sal_Int32 nWidth = 0; sal_Bool isWidthRelatvie = sal_False; uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); - xTableProps->getPropertyValue( rtl::OUString("IsWidthRelative") ) >>= isWidthRelatvie; + xTableProps->getPropertyValue( OUString("IsWidthRelative") ) >>= isWidthRelatvie; if( isWidthRelatvie ) { - xTableProps->getPropertyValue( rtl::OUString("RelativeWidth") ) >>= nWidth; + xTableProps->getPropertyValue( OUString("RelativeWidth") ) >>= nWidth; } else { - xTableProps->getPropertyValue( rtl::OUString("Width") ) >>= nWidth; + xTableProps->getPropertyValue( OUString("Width") ) >>= nWidth; } return nWidth; } diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx index 1d60af8922fd..aa0b2787dc75 100644 --- a/sw/source/ui/vba/vbatablehelper.hxx +++ b/sw/source/ui/vba/vbatablehelper.hxx @@ -42,15 +42,15 @@ public: ~SwVbaTableHelper() {} sal_Int32 getTabColumnsCount( sal_Int32 nRowIndex ) throw (css::uno::RuntimeException); sal_Int32 getTabColumnsMaxCount( ) throw (css::uno::RuntimeException); - sal_Int32 getTabRowIndex( const rtl::OUString& sCellName ) throw (css::uno::RuntimeException); - sal_Int32 getTabColIndex( const rtl::OUString& sCellName ) throw (css::uno::RuntimeException); + sal_Int32 getTabRowIndex( const OUString& sCellName ) throw (css::uno::RuntimeException); + sal_Int32 getTabColIndex( const OUString& sCellName ) throw (css::uno::RuntimeException); sal_Int32 getTableWidth( ) throw (css::uno::RuntimeException); sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false ) throw (css::uno::RuntimeException); void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false ) throw (css::uno::RuntimeException); static SwTable* GetSwTable( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException); - static rtl::OUString getColumnStr( sal_Int32 nCol ); + static OUString getColumnStr( sal_Int32 nCol ); }; #endif diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx index 2eb70b88b254..9e34d29f3a0a 100644 --- a/sw/source/ui/vba/vbatableofcontents.cxx +++ b/sw/source/ui/vba/vbatableofcontents.cxx @@ -38,13 +38,13 @@ SwVbaTableOfContents::~SwVbaTableOfContents() ::sal_Int32 SAL_CALL SwVbaTableOfContents::getLowerHeadingLevel() throw (uno::RuntimeException) { sal_Int16 nLevel = 0; - mxTocProps->getPropertyValue(rtl::OUString("Level") ) >>= nLevel; + mxTocProps->getPropertyValue(OUString("Level") ) >>= nLevel; return nLevel; } void SAL_CALL SwVbaTableOfContents::setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (uno::RuntimeException) { - mxTocProps->setPropertyValue( rtl::OUString("Level"), uno::makeAny( sal_Int8( _lowerheadinglevel ) ) ); + mxTocProps->setPropertyValue( OUString("Level"), uno::makeAny( sal_Int8( _lowerheadinglevel ) ) ); } ::sal_Int32 SAL_CALL SwVbaTableOfContents::getTabLeader() throw (uno::RuntimeException) @@ -61,25 +61,25 @@ void SAL_CALL SwVbaTableOfContents::setTabLeader( ::sal_Int32 /*_tableader*/ ) t ::sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields() throw (css::uno::RuntimeException) { sal_Bool bUseFields = sal_False; - mxTocProps->getPropertyValue(rtl::OUString("CreateFromMarks") ) >>= bUseFields; + mxTocProps->getPropertyValue(OUString("CreateFromMarks") ) >>= bUseFields; return bUseFields; } void SAL_CALL SwVbaTableOfContents::setUseFields( ::sal_Bool _useFields ) throw (css::uno::RuntimeException) { - mxTocProps->setPropertyValue( rtl::OUString("CreateFromMarks"), uno::makeAny( _useFields ) ); + mxTocProps->setPropertyValue( OUString("CreateFromMarks"), uno::makeAny( _useFields ) ); } ::sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() throw (css::uno::RuntimeException) { sal_Bool bUseOutlineLevels = sal_False; - mxTocProps->getPropertyValue(rtl::OUString("CreateFromOutline") ) >>= bUseOutlineLevels; + mxTocProps->getPropertyValue(OUString("CreateFromOutline") ) >>= bUseOutlineLevels; return bUseOutlineLevels; } void SAL_CALL SwVbaTableOfContents::setUseOutlineLevels( ::sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException) { - mxTocProps->setPropertyValue( rtl::OUString("CreateFromOutline"), uno::makeAny( _useOutlineLevels ) ); + mxTocProps->setPropertyValue( OUString("CreateFromOutline"), uno::makeAny( _useOutlineLevels ) ); } void SAL_CALL SwVbaTableOfContents::Delete( ) throw (uno::RuntimeException) @@ -93,20 +93,20 @@ void SAL_CALL SwVbaTableOfContents::Update( ) throw (uno::RuntimeException) mxDocumentIndex->update(); } -rtl::OUString +OUString SwVbaTableOfContents::getServiceImplName() { - return rtl::OUString("SwVbaTableOfContents"); + return OUString("SwVbaTableOfContents"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaTableOfContents::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.TableOfContents" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.TableOfContents" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx index d99e353a8826..fa5d42707cdd 100644 --- a/sw/source/ui/vba/vbatableofcontents.hxx +++ b/sw/source/ui/vba/vbatableofcontents.hxx @@ -53,8 +53,8 @@ public: virtual void SAL_CALL Update( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_TABLEOFCONTENTS_HXX */ diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 1448b4bd28e7..e3b4f04d1826 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -53,7 +53,7 @@ static bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTab uno::Reference< text::XTextContent > xTextContent( xTable, uno::UNO_QUERY_THROW ); uno::Reference< text::XText > xText = xTextContent->getAnchor()->getText(); uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW ); - rtl::OUString aImplName = xServiceInfo->getImplementationName(); + OUString aImplName = xServiceInfo->getImplementationName(); if ( aImplName == "SwXHeadFootText" ) return true; return false; @@ -98,17 +98,17 @@ public: virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return text::XTextTable::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return getCount() > 0 ; } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); uno::Reference< text::XTextTable > xTable( *cachePos, uno::UNO_QUERY_THROW ); return uno::makeAny( xTable ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > sNames( mxTables.size() ); - rtl::OUString* pString = sNames.getArray(); + uno::Sequence< OUString > sNames( mxTables.size() ); + OUString* pString = sNames.getArray(); XTextTableVec::iterator it = mxTables.begin(); XTextTableVec::iterator it_end = mxTables.end(); for ( ; it != it_end; ++it, ++pString ) @@ -118,7 +118,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { cachePos = mxTables.begin(); XTextTableVec::iterator it_end = mxTables.end(); @@ -178,7 +178,7 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N uno::Reference< text::XTextRange > xTextRange = pVbaRange->getXTextRange(); uno::Reference< text::XTextTable > xTable; - xTable.set( xMsf->createInstance( rtl::OUString("com.sun.star.text.TextTable") ), uno::UNO_QUERY_THROW ); + xTable.set( xMsf->createInstance( OUString("com.sun.star.text.TextTable") ), uno::UNO_QUERY_THROW ); xTable->initialize( nRows, nCols ); uno::Reference< text::XText > xText = xTextRange->getText(); @@ -209,10 +209,10 @@ SwVbaTables::createCollectionObject( const uno::Any& aSource ) } // XHelperInterface -rtl::OUString +OUString SwVbaTables::getServiceImplName() { - return rtl::OUString("SwVbaTables"); + return OUString("SwVbaTables"); } // XEnumerationAccess @@ -222,14 +222,14 @@ SwVbaTables::getElementType() throw (uno::RuntimeException) return word::XTable::static_type(0); } -uno::Sequence +uno::Sequence SwVbaTables::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Tables" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Tables" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index a232b68c874f..b9cf16fc6260 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -40,8 +40,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index 8be4212c2fdb..656259e6887a 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -112,11 +112,11 @@ uno::Reference< word::XTableOfContents > SAL_CALL SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const uno::Any& /*UseHeadingStyles*/, const uno::Any& /*UpperHeadingLevel*/, const uno::Any& LowerHeadingLevel, const uno::Any& UseFields, const uno::Any& /*TableID*/, const uno::Any& /*RightAlignPageNumbers*/, const uno::Any& /*IncludePageNumbers*/, const uno::Any& /*AddedStyles*/, const uno::Any& /*UseHyperlinks*/, const uno::Any& /*HidePageNumbersInWeb*/, const uno::Any& /*UseOutlineLevels*/ ) throw (uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument, uno::UNO_QUERY_THROW ); - uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance( rtl::OUString("com.sun.star.text.ContentIndex") ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance( OUString("com.sun.star.text.ContentIndex") ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xTocProps( xDocumentIndex, uno::UNO_QUERY_THROW ); sal_Bool isProtected = sal_False; - xTocProps->setPropertyValue( rtl::OUString("IsProtected"), uno::makeAny( isProtected ) ); + xTocProps->setPropertyValue( OUString("IsProtected"), uno::makeAny( isProtected ) ); uno::Reference< word::XTableOfContents > xToc( new SwVbaTableOfContents( this, mxContext, mxTextDocument, xDocumentIndex ) ); @@ -164,20 +164,20 @@ SwVbaTablesOfContents::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaTablesOfContents::getServiceImplName() { - return rtl::OUString("SwVbaTablesOfContents"); + return OUString("SwVbaTablesOfContents"); } -uno::Sequence +uno::Sequence SwVbaTablesOfContents::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.TablesOfContents"); + sNames[0] = OUString("ooo.vba.word.TablesOfContents"); } return sNames; } diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx index 49cd2fc43ec3..02ddb4344aa5 100644 --- a/sw/source/ui/vba/vbatablesofcontents.hxx +++ b/sw/source/ui/vba/vbatablesofcontents.hxx @@ -46,8 +46,8 @@ public: // SwVbaTablesOfContents_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_TABLESOFCONTENTS_HXX */ diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx index 7ff80c3987e8..d780309e6a2c 100644 --- a/sw/source/ui/vba/vbatabstop.cxx +++ b/sw/source/ui/vba/vbatabstop.cxx @@ -31,20 +31,20 @@ SwVbaTabStop::~SwVbaTabStop() { } -rtl::OUString +OUString SwVbaTabStop::getServiceImplName() { - return rtl::OUString("SwVbaTabStop"); + return OUString("SwVbaTabStop"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaTabStop::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.TabStop" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.TabStop" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index a5f4e3697912..441916bb5433 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -37,8 +37,8 @@ public: virtual ~SwVbaTabStop(); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_TABSTOP_HXX */ diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index c6520cf903e2..0af68076fccc 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -28,13 +28,13 @@ using namespace ::com::sun::star; static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< beans::XPropertySet >& xParaProps ) throw (uno::RuntimeException) { uno::Sequence< style::TabStop > aSeq; - xParaProps->getPropertyValue( rtl::OUString("ParaTabStops") ) >>= aSeq; + xParaProps->getPropertyValue( OUString("ParaTabStops") ) >>= aSeq; return aSeq; } static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq ) throw (uno::RuntimeException) { - xParaProps->setPropertyValue( rtl::OUString("ParaTabStops"), uno::makeAny( aSeq ) ); + xParaProps->setPropertyValue( OUString("ParaTabStops"), uno::makeAny( aSeq ) ); } typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > TabStopCollectionHelper_Base; @@ -144,7 +144,7 @@ uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, co case word::WdTabAlignment::wdAlignTabBar: case word::WdTabAlignment::wdAlignTabList: { - DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() ); break; } default: @@ -249,20 +249,20 @@ SwVbaTabStops::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString +OUString SwVbaTabStops::getServiceImplName() { - return rtl::OUString("SwVbaTabStops"); + return OUString("SwVbaTabStops"); } -css::uno::Sequence +css::uno::Sequence SwVbaTabStops::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.TabStops"); + sNames[0] = OUString("ooo.vba.word.TabStops"); } return sNames; } diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx index cc4f646500eb..70e6659a54b8 100644 --- a/sw/source/ui/vba/vbatabstops.hxx +++ b/sw/source/ui/vba/vbatabstops.hxx @@ -47,8 +47,8 @@ public: // SwVbaTabStops_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_TABSTOPS_HXX */ diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index e17a2fc87c9c..9abe53aebcee 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -46,7 +46,7 @@ static String lcl_CheckGroupName( const String& rGroupName ) } -SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rFullUrl ) +SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rFullUrl ) : SwVbaTemplate_BASE( rParent, rContext ), mxModel( rModel ), msFullUrl( rFullUrl ) { } @@ -56,10 +56,10 @@ SwVbaTemplate::~SwVbaTemplate() { } -rtl::OUString +OUString SwVbaTemplate::getName() throw ( css::uno::RuntimeException ) { - rtl::OUString sName; + OUString sName; if( !msFullUrl.isEmpty() ) { INetURLObject aURL( msFullUrl ); @@ -68,14 +68,14 @@ SwVbaTemplate::getName() throw ( css::uno::RuntimeException ) return sName; } -rtl::OUString +OUString SwVbaTemplate::getPath() throw ( css::uno::RuntimeException ) { - rtl::OUString sPath; + OUString sPath; if( !msFullUrl.isEmpty() ) { INetURLObject aURL( msFullUrl ); - rtl::OUString sURL( aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); + OUString sURL( aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) ); sURL = sURL.copy( 0, sURL.getLength() - aURL.GetLastName().getLength() - 1 ); ::osl::File::getSystemPathFromFileURL( sURL, sPath ); } @@ -89,8 +89,8 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep uno::Reference< text::XAutoTextContainer2 > xAutoTextContainer = text::AutoTextContainer::create( xContext ); // the default template is "Normal.dot" in Word. - rtl::OUString sGroup("Normal"); - rtl::OUString sName = getName(); + OUString sGroup("Normal"); + OUString sName = getName(); sal_Int32 nIndex = sName.lastIndexOf( sal_Unicode('.') ); if( nIndex > 0 ) { @@ -105,7 +105,7 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep } else { - throw uno::RuntimeException( rtl::OUString("Auto Text Entry doesn't exist"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Auto Text Entry doesn't exist"), uno::Reference< uno::XInterface >() ); } uno::Reference< XCollection > xCol( new SwVbaAutoTextEntries( this, mxContext, xGroup ) ); @@ -114,20 +114,20 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep return uno::makeAny( xCol ); } -rtl::OUString +OUString SwVbaTemplate::getServiceImplName() { - return rtl::OUString("SwVbaTemplate"); + return OUString("SwVbaTemplate"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaTemplate::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Template" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Template" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index 2d575ad9525c..ff4221d75469 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -28,19 +28,19 @@ class SwVbaTemplate : public SwVbaTemplate_BASE { private: css::uno::Reference< css::frame::XModel > mxModel; - rtl::OUString msFullUrl; + OUString msFullUrl; public: SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& ); + const css::uno::Reference< css::frame::XModel >& rModel, const OUString& ); virtual ~SwVbaTemplate(); // XTemplate - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_TEMPLATE_HXX */ diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx index 3cbed2123c7c..780bb08fadfc 100644 --- a/sw/source/ui/vba/vbavariable.cxx +++ b/sw/source/ui/vba/vbavariable.cxx @@ -26,7 +26,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; SwVbaVariable::SwVbaVariable( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, - const uno::Reference< beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( uno::RuntimeException ) : + const uno::Reference< beans::XPropertyAccess >& rUserDefined, const OUString& rName ) throw ( uno::RuntimeException ) : SwVbaVariable_BASE( rParent, rContext ), mxUserDefined( rUserDefined ), maName( rName ) { } @@ -35,16 +35,16 @@ SwVbaVariable::~SwVbaVariable() { } -rtl::OUString SAL_CALL +OUString SAL_CALL SwVbaVariable::getName() throw ( css::uno::RuntimeException ) { return maName; } void SAL_CALL -SwVbaVariable::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException ) +SwVbaVariable::setName( const OUString& ) throw ( css::uno::RuntimeException ) { - throw uno::RuntimeException( rtl::OUString(" Fail to set name"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString(" Fail to set name"), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL @@ -75,20 +75,20 @@ SwVbaVariable::getIndex() throw ( css::uno::RuntimeException ) return 0; } -rtl::OUString +OUString SwVbaVariable::getServiceImplName() { - return rtl::OUString("SwVbaVariable"); + return OUString("SwVbaVariable"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaVariable::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Variable" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Variable" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx index 8a96490f19aa..128ea1549415 100644 --- a/sw/source/ui/vba/vbavariable.hxx +++ b/sw/source/ui/vba/vbavariable.hxx @@ -30,23 +30,23 @@ class SwVbaVariable : public SwVbaVariable_BASE { private: css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined; - rtl::OUString maName; + OUString maName; public: SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ); + const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const OUString& rName ) throw ( css::uno::RuntimeException ); virtual ~SwVbaVariable(); // XVariable - virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException ); - virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException ); + virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException ); + virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException ); virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException ); virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException ); virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_VARIABLE_HXX */ diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index b74401a882b1..c1a4b2d6deb6 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -61,33 +61,33 @@ SwVbaVariables::createCollectionObject( const css::uno::Any& aSource ) } uno::Any SAL_CALL -SwVbaVariables::Add( const rtl::OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException) +SwVbaVariables::Add( const OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException) { uno::Any aValue; if( rValue.hasValue() ) aValue = rValue; else - aValue <<= rtl::OUString(); + aValue <<= OUString(); uno::Reference< beans::XPropertyContainer > xPropertyContainer( mxUserDefined, uno::UNO_QUERY_THROW ); xPropertyContainer->addProperty( rName, beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::REMOVABLE, aValue ); return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) ); } -rtl::OUString +OUString SwVbaVariables::getServiceImplName() { - return rtl::OUString("SwVbaVariables"); + return OUString("SwVbaVariables"); } -css::uno::Sequence +css::uno::Sequence SwVbaVariables::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.word.Variables"); + sNames[0] = OUString("ooo.vba.word.Variables"); } return sNames; } diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx index 1d13bb5b9e3c..dbd4267f6019 100644 --- a/sw/source/ui/vba/vbavariables.hxx +++ b/sw/source/ui/vba/vbavariables.hxx @@ -43,11 +43,11 @@ public: // SwVbaVariables_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); // XVariables - virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException); }; #endif /* SW_VBA_VARIABLES_HXX */ diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index 5591eaaee297..483254bd9f10 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -71,13 +71,13 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException) uno::Reference< text::XText > xCurrentText = mxViewCursor->getText(); uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextContent > xTextContent; - while( xCursorProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextContent ) + while( xCursorProps->getPropertyValue( OUString("TextTable") ) >>= xTextContent ) { xCurrentText = xTextContent->getAnchor()->getText(); xCursorProps.set( xCurrentText->createTextCursor(), uno::UNO_QUERY_THROW ); } uno::Reference< lang::XServiceInfo > xServiceInfo( xCurrentText, uno::UNO_QUERY_THROW ); - rtl::OUString aImplName = xServiceInfo->getImplementationName(); + OUString aImplName = xServiceInfo->getImplementationName(); if ( aImplName == "SwXBodyText" ) { return word::WdSeekView::wdSeekMainDocument; @@ -105,7 +105,7 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException) } else if ( aImplName == "SwXFootnote" ) { - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.Endnote") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.text.Endnote") ) ) return word::WdSeekView::wdSeekEndnotes; else return word::WdSeekView::wdSeekFootnotes; @@ -148,7 +148,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio } else { - DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() ); + DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, OUString() ); } break; } @@ -163,7 +163,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio } else { - DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() ); + DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, OUString() ); } break; } @@ -193,14 +193,14 @@ SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::Run SwVbaView::getTableGridLines() throw (css::uno::RuntimeException) { sal_Bool bShowTableGridLine = sal_False; - mxViewSettings->getPropertyValue( rtl::OUString("ShowTableBoundaries")) >>= bShowTableGridLine; + mxViewSettings->getPropertyValue( OUString("ShowTableBoundaries")) >>= bShowTableGridLine; return bShowTableGridLine; } void SAL_CALL SwVbaView::setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException) { - mxViewSettings->setPropertyValue( rtl::OUString("ShowTableBoundaries"), uno::makeAny( _tablegridlines ) ); + mxViewSettings->setPropertyValue( OUString("ShowTableBoundaries"), uno::makeAny( _tablegridlines ) ); } ::sal_Int32 SAL_CALL @@ -208,7 +208,7 @@ SwVbaView::getType() throw (css::uno::RuntimeException) { // FIXME: handle wdPrintPreview type sal_Bool bOnlineLayout = sal_False; - mxViewSettings->getPropertyValue( rtl::OUString("ShowOnlineLayout")) >>= bOnlineLayout; + mxViewSettings->getPropertyValue( OUString("ShowOnlineLayout")) >>= bOnlineLayout; return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView; } @@ -221,12 +221,12 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException) case word::WdViewType::wdPrintView: case word::WdViewType::wdNormalView: { - mxViewSettings->setPropertyValue( rtl::OUString("ShowOnlineLayout"), uno::makeAny( sal_False ) ); + mxViewSettings->setPropertyValue( OUString("ShowOnlineLayout"), uno::makeAny( sal_False ) ); break; } case word::WdViewType::wdWebView: { - mxViewSettings->setPropertyValue( rtl::OUString("ShowOnlineLayout"), uno::makeAny( sal_True ) ); + mxViewSettings->setPropertyValue( OUString("ShowOnlineLayout"), uno::makeAny( sal_True ) ); break; } case word::WdViewType::wdPrintPreview: @@ -235,7 +235,7 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException) break; } default: - DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() ); } } @@ -244,10 +244,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) { mxModel->lockControllers(); - rtl::OUString aPropIsOn; - rtl::OUString aPropIsShared; - rtl::OUString aPropBodyDistance; - rtl::OUString aPropText; + OUString aPropIsOn; + OUString aPropIsShared; + OUString aPropBodyDistance; + OUString aPropText; switch( nType ) { @@ -256,10 +256,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) case word::WdSeekView::wdSeekPrimaryFooter: case word::WdSeekView::wdSeekEvenPagesFooter: { - aPropIsOn = rtl::OUString("FooterIsOn"); - aPropIsShared = rtl::OUString("FooterIsShared"); - aPropBodyDistance = rtl::OUString("FooterBodyDistance"); - aPropText = rtl::OUString("FooterText"); + aPropIsOn = OUString("FooterIsOn"); + aPropIsShared = OUString("FooterIsShared"); + aPropBodyDistance = OUString("FooterBodyDistance"); + aPropText = OUString("FooterText"); break; } case word::WdSeekView::wdSeekCurrentPageHeader: @@ -267,10 +267,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) case word::WdSeekView::wdSeekPrimaryHeader: case word::WdSeekView::wdSeekEvenPagesHeader: { - aPropIsOn = rtl::OUString("HeaderIsOn"); - aPropIsShared = rtl::OUString("HeaderIsShared"); - aPropBodyDistance = rtl::OUString("HeaderBodyDistance"); - aPropText = rtl::OUString("HeaderText"); + aPropIsOn = OUString("HeaderIsOn"); + aPropIsShared = OUString("HeaderIsShared"); + aPropBodyDistance = OUString("HeaderBodyDistance"); + aPropText = OUString("HeaderText"); break; } } @@ -302,8 +302,8 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) // not shared and the current style is applied to a page with // an even page number uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW ); - rtl::OUString aPageStyleName; - xCursorProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; + OUString aPageStyleName; + xCursorProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName; if ( aPageStyleName == "First Page" ) { // go to the beginning of where the next style is used @@ -316,7 +316,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) while( hasNextPage && ( xStyle == word::getCurrentPageStyle( mxModel ) ) ); if( !hasNextPage ) - DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_ACTION, OUString() ); } break; } @@ -339,15 +339,15 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) } if( !isShared ) { - rtl::OUString aTempPropText = aPropText; + OUString aTempPropText = aPropText; if( nType == word::WdSeekView::wdSeekEvenPagesFooter || nType == word::WdSeekView::wdSeekEvenPagesHeader ) { - aTempPropText += rtl::OUString("Left"); + aTempPropText += OUString("Left"); } else { - aTempPropText += rtl::OUString("Right"); + aTempPropText += OUString("Right"); } xText.set( xPageProps->getPropertyValue( aTempPropText), uno::UNO_QUERY_THROW ); } @@ -356,7 +356,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) if( nType == word::WdSeekView::wdSeekEvenPagesFooter || nType == word::WdSeekView::wdSeekEvenPagesHeader ) { - DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_ACTION, OUString() ); } xText.set( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW ); } @@ -364,26 +364,26 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) mxModel->unlockControllers(); if( !xText.is() ) { - DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() ); + DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() ); } uno::Reference< text::XTextRange > xTextRange = word::getFirstObjectPosition( xText ); return xTextRange; } -rtl::OUString +OUString SwVbaView::getServiceImplName() { - return rtl::OUString("SwVbaView"); + return OUString("SwVbaView"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaView::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.View" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.View" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx index fd14f25ef06a..14de7ad7fffb 100644 --- a/sw/source/ui/vba/vbaview.hxx +++ b/sw/source/ui/vba/vbaview.hxx @@ -54,8 +54,8 @@ public: virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* SW_VBA_VIEW_HXX */ diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx index b8a22620c08e..611299a19c05 100644 --- a/sw/source/ui/vba/vbawindow.cxx +++ b/sw/source/ui/vba/vbawindow.cxx @@ -108,7 +108,7 @@ SwVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE else if (nwindowState == word::WdWindowState::wdWindowStateNormal) pWork -> Restore(); else - throw uno::RuntimeException( rtl::OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); } } @@ -128,20 +128,20 @@ SwVbaWindow::ActivePane() throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this, mxContext, m_xModel ) ) ); } -rtl::OUString +OUString SwVbaWindow::getServiceImplName() { - return rtl::OUString("SwVbaWindow"); + return OUString("SwVbaWindow"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaWindow::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.Window" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.Window" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx index 31dedaa3b03d..8e7d48202292 100644 --- a/sw/source/ui/vba/vbawindow.hxx +++ b/sw/source/ui/vba/vbawindow.hxx @@ -48,8 +48,8 @@ public: virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SW_VBA_WINDOW_HXX diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index e8573fefca91..efd8c282e861 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -62,29 +62,29 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) case word::WdWrapType::wdWrapSquare: { eTextMode = text::WrapTextMode_PARALLEL; - m_xPropertySet->setPropertyValue( rtl::OUString("SurroundContour"), uno::makeAny( sal_False ) ); + m_xPropertySet->setPropertyValue( OUString("SurroundContour"), uno::makeAny( sal_False ) ); break; } case word::WdWrapType::wdWrapTight: { eTextMode = text::WrapTextMode_PARALLEL; - m_xPropertySet->setPropertyValue( rtl::OUString("SurroundContour"), uno::makeAny( sal_True ) ); + m_xPropertySet->setPropertyValue( OUString("SurroundContour"), uno::makeAny( sal_True ) ); break; } default: { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); } } } - m_xPropertySet->setPropertyValue( rtl::OUString("TextWrap"), uno::makeAny( eTextMode ) ); + m_xPropertySet->setPropertyValue( OUString("TextWrap"), uno::makeAny( eTextMode ) ); } ::sal_Int32 SAL_CALL SwVbaWrapFormat::getType() throw (uno::RuntimeException) { sal_Int32 nType = word::WdWrapType::wdWrapSquare; text::WrapTextMode eTextMode; - m_xPropertySet->getPropertyValue( rtl::OUString("TextWrap")) >>= eTextMode; + m_xPropertySet->getPropertyValue( OUString("TextWrap")) >>= eTextMode; switch( eTextMode ) { case text::WrapTextMode_NONE: @@ -100,7 +100,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) case text::WrapTextMode_PARALLEL: { sal_Bool bContour = sal_False; - m_xPropertySet->getPropertyValue( rtl::OUString("SurroundContour")) >>= bContour; + m_xPropertySet->getPropertyValue( OUString("SurroundContour")) >>= bContour; if( bContour ) nType = word::WdWrapType::wdWrapTight; else @@ -132,7 +132,7 @@ void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) throw (uno::RuntimeE { sal_Int32 nSide = word::WdWrapSideType::wdWrapBoth; text::WrapTextMode eTextMode; - m_xPropertySet->getPropertyValue( rtl::OUString("TextWrap")) >>= eTextMode; + m_xPropertySet->getPropertyValue( OUString("TextWrap")) >>= eTextMode; switch( eTextMode ) { case text::WrapTextMode_LEFT: @@ -159,14 +159,14 @@ void SAL_CALL SwVbaWrapFormat::setSide( ::sal_Int32 _side ) throw (uno::RuntimeE makeWrap(); } -float SwVbaWrapFormat::getDistance( const rtl::OUString& sName ) throw (uno::RuntimeException) +float SwVbaWrapFormat::getDistance( const OUString& sName ) throw (uno::RuntimeException) { sal_Int32 nDistance = 0; m_xPropertySet->getPropertyValue( sName ) >>= nDistance; return static_cast< float >( Millimeter::getInPoints( nDistance ) ); } -void SwVbaWrapFormat::setDistance( const rtl::OUString& sName, float _distance ) throw (uno::RuntimeException) +void SwVbaWrapFormat::setDistance( const OUString& sName, float _distance ) throw (uno::RuntimeException) { sal_Int32 nDistance = Millimeter::getInHundredthsOfOneMillimeter( _distance ); m_xPropertySet->setPropertyValue( sName, uno::makeAny( nDistance ) ); @@ -174,58 +174,58 @@ void SwVbaWrapFormat::setDistance( const rtl::OUString& sName, float _distance ) float SAL_CALL SwVbaWrapFormat::getDistanceTop() throw (uno::RuntimeException) { - return getDistance( rtl::OUString("TopMargin") ); + return getDistance( OUString("TopMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceTop( float _distancetop ) throw (uno::RuntimeException) { - setDistance( rtl::OUString("TopMargin"), _distancetop ); + setDistance( OUString("TopMargin"), _distancetop ); } float SAL_CALL SwVbaWrapFormat::getDistanceBottom() throw (uno::RuntimeException) { - return getDistance( rtl::OUString("BottomMargin") ); + return getDistance( OUString("BottomMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceBottom( float _distancebottom ) throw (uno::RuntimeException) { - setDistance( rtl::OUString("BottomMargin"), _distancebottom ); + setDistance( OUString("BottomMargin"), _distancebottom ); } float SAL_CALL SwVbaWrapFormat::getDistanceLeft() throw (uno::RuntimeException) { - return getDistance( rtl::OUString("LeftMargin") ); + return getDistance( OUString("LeftMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceLeft( float _distanceleft ) throw (uno::RuntimeException) { - setDistance( rtl::OUString("LeftMargin"), _distanceleft ); + setDistance( OUString("LeftMargin"), _distanceleft ); } float SAL_CALL SwVbaWrapFormat::getDistanceRight() throw (uno::RuntimeException) { - return getDistance( rtl::OUString("RightMargin") ); + return getDistance( OUString("RightMargin") ); } void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (uno::RuntimeException) { - setDistance( rtl::OUString("RightMargin"), _distanceright ); + setDistance( OUString("RightMargin"), _distanceright ); } -rtl::OUString +OUString SwVbaWrapFormat::getServiceImplName() { - return rtl::OUString("SwVbaWrapFormat"); + return OUString("SwVbaWrapFormat"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > SwVbaWrapFormat::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.word.WrapFormat" ); + aServiceNames[ 0 ] = OUString("ooo.vba.word.WrapFormat" ); } return aServiceNames; } diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx index bc9c5007e76b..3ebf610ec4b4 100644 --- a/sw/source/ui/vba/vbawrapformat.hxx +++ b/sw/source/ui/vba/vbawrapformat.hxx @@ -35,8 +35,8 @@ private: private: void makeWrap() throw (css::uno::RuntimeException); - float getDistance( const rtl::OUString& sName ) throw (css::uno::RuntimeException); - void setDistance( const rtl::OUString& sName, float _distance ) throw (css::uno::RuntimeException); + float getDistance( const OUString& sName ) throw (css::uno::RuntimeException); + void setDistance( const OUString& sName, float _distance ) throw (css::uno::RuntimeException); public: SwVbaWrapFormat( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); @@ -54,8 +54,8 @@ public: virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException); virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif//SW_VBA_XWRAPFORMAT_HXX diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index fa5cdf7ec75f..28d714b3b079 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -72,11 +72,11 @@ uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException) { - rtl::OUString aPageStyleName; - xProps->getPropertyValue( rtl::OUString("PageStyleName")) >>= aPageStyleName; + OUString aPageStyleName; + xProps->getPropertyValue( OUString("PageStyleName")) >>= aPageStyleName; uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString("PageStyles") ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( OUString("PageStyles") ), uno::UNO_QUERY_THROW ); uno::Reference< style::XStyle > xStyle( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW ); return xStyle; @@ -93,8 +93,8 @@ uno::Reference< style::XStyle > getDefaultParagraphStyle( const uno::Reference< { uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameAccess > xParaStyles( xSytleFamNames->getByName( rtl::OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW ); - uno::Reference< style::XStyle > xStyle( xParaStyles->getByName( rtl::OUString("Standard") ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xParaStyles( xSytleFamNames->getByName( OUString("ParagraphStyles") ), uno::UNO_QUERY_THROW ); + uno::Reference< style::XStyle > xStyle( xParaStyles->getByName( OUString("Standard") ), uno::UNO_QUERY_THROW ); return xStyle; } @@ -108,7 +108,7 @@ uno::Reference< text::XTextRange > getFirstObjectPosition( const uno::Reference< if( xParaEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xParaEnum->nextElement(), uno::UNO_QUERY_THROW ); - if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.text.TextTable") ) ) + if( xServiceInfo->supportsService( OUString("com.sun.star.text.TextTable") ) ) { uno::Reference< table::XCellRange > xCellRange( xServiceInfo, uno::UNO_QUERY_THROW ); uno::Reference< text::XText> xFirstCellText( xCellRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW ); @@ -149,14 +149,14 @@ uno::Reference< text::XText > getCurrentXText( const uno::Reference< frame::XMod //catch exception "no text selection" } uno::Reference< beans::XPropertySet > xVCProps( xTextRange, uno::UNO_QUERY_THROW ); - while( xVCProps->getPropertyValue( rtl::OUString("TextTable") ) >>= xTextContent ) + while( xVCProps->getPropertyValue( OUString("TextTable") ) >>= xTextContent ) { xText = xTextContent->getAnchor()->getText(); xVCProps.set( xText->createTextCursor(), uno::UNO_QUERY_THROW ); } if( !xText.is() ) - throw uno::RuntimeException( rtl::OUString( "no text selection" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "no text selection" ), uno::Reference< uno::XInterface >() ); return xText; } diff --git a/sw/source/ui/web/wgrfsh.cxx b/sw/source/ui/web/wgrfsh.cxx index 4299025c0621..f2bc20d39eac 100644 --- a/sw/source/ui/web/wgrfsh.cxx +++ b/sw/source/ui/web/wgrfsh.cxx @@ -50,7 +50,7 @@ SwWebGrfShell::SwWebGrfShell(SwView &_rView) : SwGrfShell(_rView) { - SetName(rtl::OUString("Graphic")); + SetName(OUString("Graphic")); SetHelpId(SW_GRFSHELL); } diff --git a/sw/source/ui/web/wlistsh.cxx b/sw/source/ui/web/wlistsh.cxx index 570f755b742c..cd850143cac3 100644 --- a/sw/source/ui/web/wlistsh.cxx +++ b/sw/source/ui/web/wlistsh.cxx @@ -44,7 +44,7 @@ TYPEINIT1(SwWebListShell,SwListShell) SwWebListShell::SwWebListShell(SwView &_rView) : SwListShell(_rView) { - SetName(rtl::OUString("List")); + SetName(OUString("List")); SetHelpId(SW_LISTSHELL); } diff --git a/sw/source/ui/web/wolesh.cxx b/sw/source/ui/web/wolesh.cxx index b859462a4633..d45a2444d4b7 100644 --- a/sw/source/ui/web/wolesh.cxx +++ b/sw/source/ui/web/wolesh.cxx @@ -45,7 +45,7 @@ SwWebOleShell::SwWebOleShell(SwView &_rView) : SwOleShell(_rView) { - SetName(rtl::OUString("Object")); + SetName(OUString("Object")); SetHelpId(SW_OLESHELL); } diff --git a/sw/source/ui/web/wtabsh.cxx b/sw/source/ui/web/wtabsh.cxx index ebf189d5078f..cd9eb53d886c 100644 --- a/sw/source/ui/web/wtabsh.cxx +++ b/sw/source/ui/web/wtabsh.cxx @@ -51,7 +51,7 @@ SwWebTableShell::SwWebTableShell(SwView &_rView) : SwTableShell(_rView) { GetShell().UpdateTable(); - SetName(rtl::OUString("Table")); + SetName(OUString("Table")); SetHelpId(SW_TABSHELL); } diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx index fe43439f7b3d..fc03453dceb2 100644 --- a/sw/source/ui/wrtsh/navmgr.cxx +++ b/sw/source/ui/wrtsh/navmgr.cxx @@ -227,12 +227,12 @@ bool SwNavigationMgr::addEntry(const SwPosition& rPos) { if (xPropSet.is()) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (xLayoutManager.is()) { - const ::rtl::OUString sResourceURL( "private:resource/toolbar/navigationobjectbar" ); + const OUString sResourceURL( "private:resource/toolbar/navigationobjectbar" ); css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL); if (!xUIElement.is()) { diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index f414cd2b7088..ac6ef2427dab 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -349,7 +349,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName if ( pName ) { comphelper::EmbeddedObjectContainer aCnt( xStor ); - ::rtl::OUString aName; + OUString aName; // TODO/LATER: get aspect? xObj.Assign( aCnt.CreateEmbeddedObject( pName->GetByteSequence(), aName ), embed::Aspects::MSOLE_CONTENT ); } @@ -371,16 +371,16 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName { SfxSlotPool* pSlotPool = SW_MOD()->GetSlotPool(); const SfxSlot* pSlot = pSlotPool->GetSlot(nSlotId); - rtl::OString aCmd(".uno:"); + OString aCmd(".uno:"); aCmd += pSlot->GetUnoName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractInsertObjectDialog* pDlg = - pFact->CreateInsertObjectDialog( GetWin(), rtl::OStringToOUString( aCmd, RTL_TEXTENCODING_UTF8 ), xStor, &aServerList ); + pFact->CreateInsertObjectDialog( GetWin(), OStringToOUString( aCmd, RTL_TEXTENCODING_UTF8 ), xStor, &aServerList ); if ( pDlg ) { pDlg->Execute(); bDoVerb = pDlg->IsCreateNew(); - ::rtl::OUString aIconMediaType; + OUString aIconMediaType; uno::Reference< io::XInputStream > xIconMetaFile = pDlg->GetIconIfIconified( &aIconMediaType ); xObj.Assign( pDlg->GetObject(), xIconMetaFile.is() ? embed::Aspects::MSOLE_ICON : embed::Aspects::MSOLE_CONTENT ); @@ -480,7 +480,7 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF { try { - xSet->setPropertyValue( ::rtl::OUString("Formula"), uno::makeAny( ::rtl::OUString( aMathData ) ) ); + xSet->setPropertyValue( OUString("Formula"), uno::makeAny( OUString( aMathData ) ) ); bActivate = sal_False; } catch (const uno::Exception&) @@ -533,12 +533,12 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF svt::EmbeddedObjectRef::TryRunningState( xEmbeddedObj ); uno::Reference< beans::XPropertySet > xProps( xEmbeddedObj->getComponent(), uno::UNO_QUERY ); if ( xProps.is() && - ( xProps->getPropertyValue( ::rtl::OUString( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) && + ( xProps->getPropertyValue( OUString( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) && bDisableDataTableDialog ) { - xProps->setPropertyValue( ::rtl::OUString( "DisableDataTableDialog" ), + xProps->setPropertyValue( OUString( "DisableDataTableDialog" ), uno::makeAny( sal_False ) ); - xProps->setPropertyValue( ::rtl::OUString( "DisableComplexChartTypes" ), + xProps->setPropertyValue( OUString( "DisableComplexChartTypes" ), uno::makeAny( sal_False ) ); uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY ); if ( xModifiable.is() ) @@ -900,7 +900,7 @@ void SwWrtShell::InsertLineBreak() if( pACorr ) AutoCorrect( *pACorr, cIns ); else - SwWrtShell::Insert( rtl::OUString( cIns ) ); + SwWrtShell::Insert( OUString( cIns ) ); } } @@ -1185,8 +1185,8 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) aFmt.SetBulletChar( numfunc::GetBulletChar(static_cast(nLevel))); aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); // #i93908# clear suffix for bullet lists - aFmt.SetPrefix(::rtl::OUString()); - aFmt.SetSuffix(::rtl::OUString()); + aFmt.SetPrefix(OUString()); + aFmt.SetSuffix(OUString()); } aNumRule.Set(static_cast(nLevel), aFmt); } @@ -1243,8 +1243,8 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) aFmt.SetBulletChar( numfunc::GetBulletChar(nLvl) ); aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); // #i93908# clear suffix for bullet lists - aFmt.SetPrefix(::rtl::OUString()); - aFmt.SetSuffix(::rtl::OUString()); + aFmt.SetPrefix(OUString()); + aFmt.SetSuffix(OUString()); } // #i95907# diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index baeabb1a6e52..9aa908f31eb2 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -114,7 +114,7 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, sal_Bool bOnlyInSel ) pTmp->PushCrsr(); sal_Bool bCancel = sal_False; - rtl::OString aDlgPos; + OString aDlgPos; for( sal_uInt16 i = 0; i < nCnt && !bCancel; ++i ) { pTmp->GotoFieldPos( i ); @@ -137,7 +137,7 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, sal_Bool bOnlyInSel ) // Start input dialog for a specific field sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton, - Window* pParentWin, rtl::OString* pWindowState ) + Window* pParentWin, OString* pWindowState ) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); @@ -156,7 +156,7 @@ sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton, return bRet; } -sal_Bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, sal_Bool bNextButton, rtl::OString* pWindowState) +sal_Bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, sal_Bool bNextButton, OString* pWindowState) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -358,8 +358,8 @@ bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter ) } -void LoadURL( ViewShell& rVSh, const rtl::OUString& rURL, sal_uInt16 nFilter, - const rtl::OUString& rTargetFrameName ) +void LoadURL( ViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter, + const OUString& rTargetFrameName ) { OSL_ENSURE( !rURL.isEmpty(), "what should be loaded here?" ); if( rURL.isEmpty() ) @@ -374,7 +374,7 @@ void LoadURL( ViewShell& rVSh, const rtl::OUString& rURL, sal_uInt16 nFilter, SwDocShell* pDShell = rSh.GetView().GetDocShell(); OSL_ENSURE( pDShell, "No DocShell?!"); - rtl::OUString sTargetFrame(rTargetFrameName); + OUString sTargetFrame(rTargetFrameName); if (sTargetFrame.isEmpty() && pDShell) { using namespace ::com::sun::star; @@ -399,7 +399,7 @@ void LoadURL( ViewShell& rVSh, const rtl::OUString& rURL, sal_uInt16 nFilter, SfxBoolItem aBrowse( SID_BROWSE, sal_True ); if( nFilter & URLLOAD_NEWVIEW ) - aTargetFrameName.SetValue( rtl::OUString("_blank") ); + aTargetFrameName.SetValue( OUString("_blank") ); const SfxPoolItem* aArr[] = { &aName, diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx index 22e693d1ca23..16e20f4573fe 100644 --- a/sw/source/ui/wrtsh/wrtsh3.cxx +++ b/sw/source/ui/wrtsh/wrtsh3.cxx @@ -37,7 +37,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; extern bool bNoInterrupt; // in mainwn.cxx @@ -123,7 +122,7 @@ void SwWrtShell::DrawSelChanged( ) bNoInterrupt = bOldVal; } -sal_Bool SwWrtShell::GotoMark( const ::rtl::OUString& rName ) +sal_Bool SwWrtShell::GotoMark( const OUString& rName ) { IDocumentMarkAccess::const_iterator_t ppMark = getIDocumentMarkAccess()->findMark( rName ); if(ppMark == getIDocumentMarkAccess()->getMarksEnd()) return false; diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index e01d7df01fa1..e117b03c3b8b 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -96,7 +96,7 @@ void SwWrtShell::Do( DoType eDoType, sal_uInt16 nCnt ) String SwWrtShell::GetDoString( DoType eDoType ) const { - ::rtl::OUString aUndoStr; + OUString aUndoStr; sal_uInt16 nResStr = STR_UNDO; switch( eDoType ) { @@ -141,7 +141,7 @@ sal_uInt16 SwWrtShell::GetDoStrings( DoType eDoType, SfxStringListItem& rStrs ) String SwWrtShell::GetRepeatString() const { - ::rtl::OUString str; + OUString str; GetRepeatInfo(& str); if (str.isEmpty()) diff --git a/test/inc/test/beans/xpropertyset.hxx b/test/inc/test/beans/xpropertyset.hxx index 03839ea91073..d309c7d02bf7 100644 --- a/test/inc/test/beans/xpropertyset.hxx +++ b/test/inc/test/beans/xpropertyset.hxx @@ -57,19 +57,19 @@ public: void testRemoveVetoableChangeListener(); protected: - virtual bool isPropertyValueChangeable(const rtl::OUString& rName); + virtual bool isPropertyValueChangeable(const OUString& rName); private: void fillPropsToTest(const uno::Reference& xPropInfo); static bool getSinglePropertyValue( - const uno::Reference& xPropSet, const rtl::OUString& rName); + const uno::Reference& xPropSet, const OUString& rName); struct OOO_DLLPUBLIC_TEST PropsToTest { - std::vector constrained; - std::vector bound; - std::vector normal; - std::vector readonly; + std::vector constrained; + std::vector bound; + std::vector normal; + std::vector readonly; bool initialized; diff --git a/test/inc/test/container/xnamecontainer.hxx b/test/inc/test/container/xnamecontainer.hxx index 152edca8fa5a..f8261f99d649 100644 --- a/test/inc/test/container/xnamecontainer.hxx +++ b/test/inc/test/container/xnamecontainer.hxx @@ -40,7 +40,7 @@ public: // removes default entry XNameContainer(); // removes given entry - XNameContainer(const rtl::OUString& rName); + XNameContainer(const OUString& rName); virtual uno::Reference< uno::XInterface > init() = 0; @@ -49,7 +49,7 @@ public: virtual ~XNameContainer() {} private: - rtl::OUString maNameToRemove; + OUString maNameToRemove; }; } diff --git a/test/inc/test/container/xnamed.hxx b/test/inc/test/container/xnamed.hxx index d878c311696c..db9609441a00 100644 --- a/test/inc/test/container/xnamed.hxx +++ b/test/inc/test/container/xnamed.hxx @@ -37,7 +37,7 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XNamed { public: - XNamed(const rtl::OUString& rName): maName(rName) {} + XNamed(const OUString& rName): maName(rName) {} virtual ~XNamed(); void testGetName(); @@ -45,7 +45,7 @@ public: virtual uno::Reference< uno::XInterface > init() = 0; private: - rtl::OUString maName; + OUString maName; }; diff --git a/test/inc/test/container/xnamereplace.hxx b/test/inc/test/container/xnamereplace.hxx index 71000c718df3..46f43d25830f 100644 --- a/test/inc/test/container/xnamereplace.hxx +++ b/test/inc/test/container/xnamereplace.hxx @@ -38,7 +38,7 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XNameReplace { public: - XNameReplace(const rtl::OUString& rName): maName(rName) {} + XNameReplace(const OUString& rName): maName(rName) {} virtual uno::Reference< uno::XInterface > init() = 0; @@ -49,7 +49,7 @@ public: virtual ~XNameReplace() {} private: - rtl::OUString maName; + OUString maName; }; diff --git a/test/inc/test/sheet/xdatabaserange.hxx b/test/inc/test/sheet/xdatabaserange.hxx index 0c3263821619..9bb70ea19e49 100644 --- a/test/inc/test/sheet/xdatabaserange.hxx +++ b/test/inc/test/sheet/xdatabaserange.hxx @@ -38,7 +38,7 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XDatabaseRange { public: - virtual uno::Reference< uno::XInterface > init(const rtl::OUString& rDBName) = 0; + virtual uno::Reference< uno::XInterface > init(const OUString& rDBName) = 0; void testDataArea(); void testGetSortDescriptor(); diff --git a/test/inc/test/sheet/xdatapilotdescriptor.hxx b/test/inc/test/sheet/xdatapilotdescriptor.hxx index 16b4e735683e..b84ec1327974 100644 --- a/test/inc/test/sheet/xdatapilotdescriptor.hxx +++ b/test/inc/test/sheet/xdatapilotdescriptor.hxx @@ -61,7 +61,7 @@ private: void testGetDataPilotFields_Impl( uno::Reference< sheet::XDataPilotDescriptor > xDescr ); void checkName( uno::Reference< container::XIndexAccess > xIndex, sal_Int32 nIndex ); - static std::vector maFieldNames; + static std::vector maFieldNames; }; } diff --git a/test/inc/test/sheet/xnamedrange.hxx b/test/inc/test/sheet/xnamedrange.hxx index b21e0c89cf4b..97a6afdf4926 100644 --- a/test/inc/test/sheet/xnamedrange.hxx +++ b/test/inc/test/sheet/xnamedrange.hxx @@ -49,7 +49,7 @@ public: protected: ~XNamedRange() {} - virtual uno::Reference< sheet::XNamedRange> getNamedRange(const rtl::OUString&) = 0; + virtual uno::Reference< sheet::XNamedRange> getNamedRange(const OUString&) = 0; }; diff --git a/test/inc/test/sheet/xnamedranges.hxx b/test/inc/test/sheet/xnamedranges.hxx index b2a60120911f..d0d2eeedb66f 100644 --- a/test/inc/test/sheet/xnamedranges.hxx +++ b/test/inc/test/sheet/xnamedranges.hxx @@ -41,7 +41,7 @@ public: // remove default entry XNamedRanges(); // removes given entry - XNamedRanges(const rtl::OUString& rNameToRemove); + XNamedRanges(const OUString& rNameToRemove); virtual ~XNamedRanges(); @@ -57,7 +57,7 @@ protected: uno::Reference< sheet::XSpreadsheet > xSheet; private: - rtl::OUString maNameToRemove; + OUString maNameToRemove; }; } diff --git a/test/inc/test/sheet/xspreadsheets2.hxx b/test/inc/test/sheet/xspreadsheets2.hxx index dc9da86b5bed..83b9eddd15e7 100644 --- a/test/inc/test/sheet/xspreadsheets2.hxx +++ b/test/inc/test/sheet/xspreadsheets2.hxx @@ -59,24 +59,24 @@ public: virtual uno::Reference< lang::XComponent > getComponent() = 0; virtual uno::Reference< uno::XInterface > init() = 0; - virtual uno::Reference< lang::XComponent > loadFromDesktop(const rtl::OUString&) = 0; - virtual void createFileURL(const rtl::OUString&, rtl::OUString&) = 0; + virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString&) = 0; + virtual void createFileURL(const OUString&, OUString&) = 0; protected: uno::Reference< sheet::XSpreadsheetDocument> xDocument; private: - uno::Reference< sheet::XSpreadsheetDocument> getDoc(const rtl::OUString&, uno::Reference< lang::XComponent >&); + uno::Reference< sheet::XSpreadsheetDocument> getDoc(const OUString&, uno::Reference< lang::XComponent >&); uno::Reference< sheet::XNamedRanges> getNamedRanges(uno::Reference< sheet::XSpreadsheetDocument >); void importSheetToCopy(); - bool isExternalReference(const rtl::OUString& aDestContent, const rtl::OUString& aSrcContent ); + bool isExternalReference(const OUString& aDestContent, const OUString& aSrcContent ); uno::Reference< sheet::XSpreadsheetDocument> xDestDoc; uno::Reference< sheet::XSpreadsheet > xDestSheet; uno::Reference< sheet::XSpreadsheet > xSrcSheet; - rtl::OUString aSrcSheetName; - rtl::OUString aSrcFileName; - rtl::OUString aDestFileBase; + OUString aSrcSheetName; + OUString aSrcFileName; + OUString aDestFileBase; }; } diff --git a/test/inc/test/unoapi_test.hxx b/test/inc/test/unoapi_test.hxx index b2ebb37f88f3..78f7f81e7a7a 100644 --- a/test/inc/test/unoapi_test.hxx +++ b/test/inc/test/unoapi_test.hxx @@ -43,7 +43,7 @@ class OOO_DLLPUBLIC_TEST UnoApiTest : public test::BootstrapFixture, public unot public: UnoApiTest(const OUString& path); - void createFileURL(const rtl::OUString& aFileBase, rtl::OUString& rFilePath); + void createFileURL(const OUString& aFileBase, OUString& rFilePath); virtual void setUp(); virtual void tearDown(); @@ -54,7 +54,7 @@ protected: private: uno::Reference m_xCalcComponent; - rtl::OUString m_aBaseString; + OUString m_aBaseString; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/util/xreplaceable.hxx b/test/inc/test/util/xreplaceable.hxx index 53dc1507678f..05babaa63dad 100644 --- a/test/inc/test/util/xreplaceable.hxx +++ b/test/inc/test/util/xreplaceable.hxx @@ -37,8 +37,8 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XReplaceable { public: - XReplaceable( const rtl::OUString& rSearchString, const rtl::OUString& rReplaceString): - maSearchString(rSearchString), maReplaceString(rReplaceString) {} + XReplaceable( const OUString& rSearchString, const OUString& rReplaceString): + maSearchString(rSearchString), maReplaceString(rReplaceString) {} virtual uno::Reference< uno::XInterface > init() = 0; void testCreateReplaceDescriptor(); @@ -48,8 +48,8 @@ protected: ~XReplaceable() {} private: - rtl::OUString maSearchString; - rtl::OUString maReplaceString; + OUString maSearchString; + OUString maReplaceString; }; } diff --git a/test/inc/test/util/xsearchable.hxx b/test/inc/test/util/xsearchable.hxx index 673ce44f9b13..c894e535e5a8 100644 --- a/test/inc/test/util/xsearchable.hxx +++ b/test/inc/test/util/xsearchable.hxx @@ -36,7 +36,7 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XSearchable { public: - XSearchable(const rtl::OUString& rString, sal_Int32 nCount) : maSearchString(rString), mnCount(nCount) {} + XSearchable(const OUString& rString, sal_Int32 nCount) : maSearchString(rString), mnCount(nCount) {} XSearchable() : maSearchString(RTL_CONSTASCII_USTRINGPARAM("SearchString")), mnCount(1) {} virtual ~XSearchable(); @@ -47,7 +47,7 @@ public: virtual uno::Reference< uno::XInterface > init() = 0; private: - rtl::OUString maSearchString; + OUString maSearchString; sal_Int32 mnCount; }; diff --git a/test/source/beans/xpropertyset.cxx b/test/source/beans/xpropertyset.cxx index 387710226c9d..f7bd4e1d7849 100644 --- a/test/source/beans/xpropertyset.cxx +++ b/test/source/beans/xpropertyset.cxx @@ -108,7 +108,7 @@ void XPropertySet::testRemoveVetoableChangeListener() // TODO: implement this. } -bool XPropertySet::isPropertyValueChangeable(const rtl::OUString& rName) +bool XPropertySet::isPropertyValueChangeable(const OUString& rName) { uno::Reference xPropSet(init(), UNO_QUERY_THROW); try @@ -163,11 +163,11 @@ bool XPropertySet::isPropertyValueChangeable(const rtl::OUString& rName) double fNew = fOld + 1.3; xPropSet->setPropertyValue(rName, makeAny(fNew)); } - else if (type == getCppuType()) + else if (type == getCppuType()) { // string type - rtl::OUString aOld = any.get(); - rtl::OUString aNew = aOld + rtl::OUString("foo"); + OUString aOld = any.get(); + OUString aNew = aOld + OUString("foo"); xPropSet->setPropertyValue(rName, makeAny(aNew)); } else if (type == getCppuType()) @@ -203,7 +203,7 @@ void XPropertySet::fillPropsToTest(const uno::Reference // some properties should not be changed in a unspecific way. // TODO: Maybe we should mark these properties read-only, instead of // giving them a special treatment here? - std::set aSkip; + std::set aSkip; aSkip.insert("PrinterName"); aSkip.insert("CharRelief"); aSkip.insert("IsLayerMode"); @@ -241,7 +241,7 @@ void XPropertySet::fillPropsToTest(const uno::Reference } bool XPropertySet::getSinglePropertyValue( - const uno::Reference& xPropSet, const rtl::OUString& rName) + const uno::Reference& xPropSet, const OUString& rName) { try { diff --git a/test/source/container/xnamecontainer.cxx b/test/source/container/xnamecontainer.cxx index 17f8f0eee2c8..8786ff4c236a 100644 --- a/test/source/container/xnamecontainer.cxx +++ b/test/source/container/xnamecontainer.cxx @@ -41,7 +41,7 @@ XNameContainer::XNameContainer(): maNameToRemove(RTL_CONSTASCII_USTRINGPARAM("XN { } -XNameContainer::XNameContainer(const rtl::OUString& rNameToRemove): +XNameContainer::XNameContainer(const OUString& rNameToRemove): maNameToRemove(rNameToRemove) { } diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx index fd6eef008d4a..3b69004cb255 100644 --- a/test/source/container/xnamed.cxx +++ b/test/source/container/xnamed.cxx @@ -43,7 +43,7 @@ void XNamed::testGetName() void XNamed::testSetName() { uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); - rtl::OUString aName("NewName"); + OUString aName("NewName"); xNamed->setName(aName); CPPUNIT_ASSERT( aName == xNamed->getName() ); diff --git a/test/source/sheet/cellproperties.cxx b/test/source/sheet/cellproperties.cxx index ae569a9b908f..01cd59a3c302 100644 --- a/test/source/sheet/cellproperties.cxx +++ b/test/source/sheet/cellproperties.cxx @@ -41,7 +41,7 @@ namespace apitest { void CellProperties::testVertJustify() { uno::Reference< beans::XPropertySet > xCellRangeBase(init(),UNO_QUERY_THROW); - rtl::OUString aVertJustify("VertJustify"); + OUString aVertJustify("VertJustify"); uno::Any aOldVertJustify = xCellRangeBase->getPropertyValue(aVertJustify); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldVertJustify >>= aValue); @@ -59,7 +59,7 @@ void CellProperties::testVertJustify() void CellProperties::testRotateReference() { uno::Reference< beans::XPropertySet > xCellRangeBase(init(),UNO_QUERY_THROW); - rtl::OUString aRotateReference("RotateReference"); + OUString aRotateReference("RotateReference"); uno::Any aOldRotateReference = xCellRangeBase->getPropertyValue(aRotateReference); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldRotateReference >>= aValue); diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx index 270ad590675d..571b7471d16d 100644 --- a/test/source/sheet/datapilotfield.cxx +++ b/test/source/sheet/datapilotfield.cxx @@ -53,8 +53,8 @@ void DataPilotField::testSortInfo() { uno::Reference< beans::XPropertySet> xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldSortInfo aSortInfoValue; - rtl::OUString aSortInfo("SortInfo"); - aSortInfoValue.Field = rtl::OUString("Col1"); + OUString aSortInfo("SortInfo"); + aSortInfoValue.Field = OUString("Col1"); aSortInfoValue.IsAscending = false; aSortInfoValue.Mode = sheet::DataPilotFieldSortMode::MANUAL; uno::Any xValue; @@ -69,7 +69,7 @@ void DataPilotField::testSortInfo() //setting HasSortInfo only makes sense for false, for true the uno implementation does nothing sal_Bool bHasSortInfo; - rtl::OUString aHasSortInfo("HasSortInfo"); + OUString aHasSortInfo("HasSortInfo"); xValue = xPropSet->getPropertyValue(aHasSortInfo); CPPUNIT_ASSERT( xValue >>= bHasSortInfo ); CPPUNIT_ASSERT_MESSAGE("should have sort info", bHasSortInfo); @@ -87,7 +87,7 @@ void DataPilotField::testLayoutInfo() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldLayoutInfo aLayoutInfoValue; - rtl::OUString aLayoutInfo("LayoutInfo"); + OUString aLayoutInfo("LayoutInfo"); aLayoutInfoValue.AddEmptyLines = false; aLayoutInfoValue.LayoutMode = sheet::DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_BOTTOM; uno::Any xValue; @@ -102,7 +102,7 @@ void DataPilotField::testLayoutInfo() //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing sal_Bool bHasLayoutInfo; - rtl::OUString aHasLayoutInfo("HasLayoutInfo"); + OUString aHasLayoutInfo("HasLayoutInfo"); xValue = xPropSet->getPropertyValue(aHasLayoutInfo); CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo ); CPPUNIT_ASSERT_MESSAGE("should have layout information", bHasLayoutInfo); @@ -120,9 +120,9 @@ void DataPilotField::testAutoShowInfo() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldAutoShowInfo aAutoShowInfoValue; - aAutoShowInfoValue.DataField = rtl::OUString("Col1"); + aAutoShowInfoValue.DataField = OUString("Col1"); aAutoShowInfoValue.IsEnabled = true; - rtl::OUString aAutoShowInfo("AutoShowInfo"); + OUString aAutoShowInfo("AutoShowInfo"); uno::Any xValue; xValue <<= aAutoShowInfoValue; xPropSet->setPropertyValue(aAutoShowInfo, xValue); @@ -135,7 +135,7 @@ void DataPilotField::testAutoShowInfo() //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing sal_Bool bHasAutoShowInfo; - rtl::OUString aHasAutoShowInfo("HasAutoShowInfo"); + OUString aHasAutoShowInfo("HasAutoShowInfo"); xValue = xPropSet->getPropertyValue(aHasAutoShowInfo); CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo ); CPPUNIT_ASSERT_MESSAGE("should have AutoShow information", bHasAutoShowInfo); @@ -153,9 +153,9 @@ void DataPilotField::testReference() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldReference aReferenceValue; - aReferenceValue.ReferenceField = rtl::OUString("Col1"); + aReferenceValue.ReferenceField = OUString("Col1"); aReferenceValue.ReferenceItemType = sheet::DataPilotFieldReferenceItemType::NAMED; - rtl::OUString aReference("Reference"); + OUString aReference("Reference"); uno::Any xValue; xValue <<= aReferenceValue; xPropSet->setPropertyValue(aReference, xValue); @@ -168,7 +168,7 @@ void DataPilotField::testReference() //setting HasReference only makes sense for false, tor true the uno implementation does nothing sal_Bool bHasReference; - rtl::OUString aHasReference("HasReference"); + OUString aHasReference("HasReference"); xValue = xPropSet->getPropertyValue(aHasReference); CPPUNIT_ASSERT( xValue >>= bHasReference ); CPPUNIT_ASSERT_MESSAGE("should have Reference information", bHasReference); @@ -186,7 +186,7 @@ void DataPilotField::testIsGroupField() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); uno::Any xValue; - rtl::OUString aIsGroupField("IsGroupField"); + OUString aIsGroupField("IsGroupField"); sal_Bool bIsGroupField; xValue = xPropSet->getPropertyValue(aIsGroupField); diff --git a/test/source/sheet/tableautoformatfield.cxx b/test/source/sheet/tableautoformatfield.cxx index 846ae009de2c..54ff2783722b 100644 --- a/test/source/sheet/tableautoformatfield.cxx +++ b/test/source/sheet/tableautoformatfield.cxx @@ -37,7 +37,7 @@ namespace apitest { uno::Reference< beans::XPropertySet > TableAutoFormatField::initTest() { - uno::Reference< container::XIndexAccess > xAutoFormatFields( getServiceFactory()->createInstance(rtl::OUString("com.sun.star.sheet.TableAutoFormats")), UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xAutoFormatFields( getServiceFactory()->createInstance(OUString("com.sun.star.sheet.TableAutoFormats")), UNO_QUERY_THROW ); CPPUNIT_ASSERT(xAutoFormatFields.is()); uno::Reference< container::XIndexAccess > xIndex( xAutoFormatFields->getByIndex(0), UNO_QUERY_THROW ); CPPUNIT_ASSERT(xIndex.is()); @@ -49,7 +49,7 @@ uno::Reference< beans::XPropertySet > TableAutoFormatField::initTest() void TableAutoFormatField::testRotateReference() { uno::Reference< beans::XPropertySet > xTableAutoFormatField = initTest(); - rtl::OUString aRotateReference("RotateReference"); + OUString aRotateReference("RotateReference"); uno::Any aOldRotateReference = xTableAutoFormatField->getPropertyValue(aRotateReference); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldRotateReference >>= aValue); @@ -67,7 +67,7 @@ void TableAutoFormatField::testRotateReference() void TableAutoFormatField::testVertJustify() { uno::Reference< beans::XPropertySet > xTableAutoFormatField = initTest(); - rtl::OUString aVertJustify("VertJustify"); + OUString aVertJustify("VertJustify"); uno::Any aOldVertJustify = xTableAutoFormatField->getPropertyValue(aVertJustify); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldVertJustify >>= aValue); diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx index cd6b0c1b548f..36b283ce3061 100644 --- a/test/source/sheet/xdatabaserange.cxx +++ b/test/source/sheet/xdatabaserange.cxx @@ -55,7 +55,7 @@ namespace apitest { */ void XDatabaseRange::testDataArea() { - uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString("DataArea")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange(init(OUString("DataArea")), UNO_QUERY_THROW); table::CellRangeAddress aCellAddress; aCellAddress.Sheet = 0; @@ -75,67 +75,67 @@ void XDatabaseRange::testDataArea() void XDatabaseRange::testGetSubtotalDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString("SubtotalDescriptor")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange(init(OUString("SubtotalDescriptor")), UNO_QUERY_THROW); uno::Reference< sheet::XSubTotalDescriptor> xSubtotalDescr = xDBRange->getSubTotalDescriptor(); CPPUNIT_ASSERT(xSubtotalDescr.is()); } void XDatabaseRange::testGetSortDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString("SortDescriptor")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange(init(OUString("SortDescriptor")), UNO_QUERY_THROW); uno::Sequence< beans::PropertyValue > xSortDescr = xDBRange->getSortDescriptor(); for (sal_Int32 i = 0; i < xSortDescr.getLength(); ++i) { beans::PropertyValue xProp = xSortDescr[i]; - //std::cout << "Prop " << i << " Name: " << rtl::OUString(xProp.Name) << std::endl; + //std::cout << "Prop " << i << " Name: " << OUString(xProp.Name) << std::endl; - if (xProp.Name == rtl::OUString("IsSortColumns")) + if (xProp.Name == OUString("IsSortColumns")) { sal_Bool bIsSortColumns = sal_True; xProp.Value >>= bIsSortColumns; CPPUNIT_ASSERT(bIsSortColumns == sal_True); } - else if (xProp.Name == rtl::OUString("ContainsHeader")) + else if (xProp.Name == OUString("ContainsHeader")) { sal_Bool bContainsHeader = sal_True; xProp.Value >>= bContainsHeader; CPPUNIT_ASSERT(bContainsHeader == sal_True); } - else if (xProp.Name == rtl::OUString("MaxFieldCount")) + else if (xProp.Name == OUString("MaxFieldCount")) { sal_Int32 nMaxFieldCount = 0; xProp.Value >>= nMaxFieldCount; std::cout << "Value: " << nMaxFieldCount << std::endl; } - else if (xProp.Name == rtl::OUString("SortFields")) + else if (xProp.Name == OUString("SortFields")) { } - else if (xProp.Name == rtl::OUString("BindFormatsToContent")) + else if (xProp.Name == OUString("BindFormatsToContent")) { sal_Bool bBindFormatsToContent = sal_False; xProp.Value >>= bBindFormatsToContent; CPPUNIT_ASSERT(bBindFormatsToContent == sal_True); } - else if (xProp.Name == rtl::OUString("CopyOutputData")) + else if (xProp.Name == OUString("CopyOutputData")) { sal_Bool bCopyOutputData = sal_True; xProp.Value >>= bCopyOutputData; CPPUNIT_ASSERT(bCopyOutputData == sal_False); } - else if (xProp.Name == rtl::OUString("OutputPosition")) + else if (xProp.Name == OUString("OutputPosition")) { } - else if (xProp.Name == rtl::OUString("IsUserListEnabled")) + else if (xProp.Name == OUString("IsUserListEnabled")) { sal_Bool bIsUserListEnabled = sal_True; xProp.Value >>= bIsUserListEnabled; CPPUNIT_ASSERT(bIsUserListEnabled == sal_False); } - else if (xProp.Name == rtl::OUString("UserListIndex")) + else if (xProp.Name == OUString("UserListIndex")) { sal_Int32 nUserListIndex = 1; xProp.Value >>= nUserListIndex; @@ -146,23 +146,23 @@ void XDatabaseRange::testGetSortDescriptor() void XDatabaseRange::testGetFilterDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("FilterDescriptor")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange( init(OUString("FilterDescriptor")), UNO_QUERY_THROW); uno::Reference< uno::XInterface > xFilterDescr( xDBRange->getFilterDescriptor(), UNO_QUERY_THROW); CPPUNIT_ASSERT(xFilterDescr.is()); } void XDatabaseRange::testGetImportDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("ImportDescriptor")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange( init(OUString("ImportDescriptor")), UNO_QUERY_THROW); uno::Sequence< beans::PropertyValue > xImportDescr = xDBRange->getImportDescriptor(); } void XDatabaseRange::testRefresh() { - uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("Refresh")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange( init(OUString("Refresh")), UNO_QUERY_THROW); const sal_Int32 nCol = 0; - rtl::OUString aHidden("IsVisible"); + OUString aHidden("IsVisible"); uno::Reference< sheet::XCellRangeReferrer > xCellRangeReferrer(xDBRange, UNO_QUERY_THROW); uno::Reference< table::XCellRange > xCellRange = xCellRangeReferrer->getReferredCells(); diff --git a/test/source/sheet/xdatapilotdescriptor.cxx b/test/source/sheet/xdatapilotdescriptor.cxx index 5a3324eda737..f5e692dd31a7 100644 --- a/test/source/sheet/xdatapilotdescriptor.cxx +++ b/test/source/sheet/xdatapilotdescriptor.cxx @@ -41,14 +41,14 @@ using namespace com::sun::star::uno; namespace apitest { -std::vector< rtl::OUString > XDataPilotDescriptor::maFieldNames; +std::vector< OUString > XDataPilotDescriptor::maFieldNames; void XDataPilotDescriptor::testTag() { - rtl::OUString aTag("DataPilotDescriptor_Tag"); + OUString aTag("DataPilotDescriptor_Tag"); uno::Reference< sheet::XDataPilotDescriptor > xDescr(init(), UNO_QUERY_THROW); xDescr->setTag(aTag); - rtl::OUString aNewTag = xDescr->getTag(); + OUString aNewTag = xDescr->getTag(); CPPUNIT_ASSERT( aTag == aNewTag ); } @@ -99,12 +99,12 @@ void XDataPilotDescriptor::testGetDataPilotFields_Impl( uno::Reference< sheet::X sal_Int32 nCount = xIndex->getCount(); - rtl::OUString aOrientation("Orientation"); + OUString aOrientation("Orientation"); for (sal_Int32 i = 0; i < nCount && i < 5; ++i) { uno::Reference< container::XNamed > xNamed( xIndex->getByIndex( i ), UNO_QUERY_THROW); CPPUNIT_ASSERT(xNamed.is()); - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); maFieldNames.push_back(aName); CPPUNIT_ASSERT( aName != "Data" ); diff --git a/test/source/sheet/xdatapilotfieldgrouping.cxx b/test/source/sheet/xdatapilotfieldgrouping.cxx index 942addc2a25c..6b355aa8a136 100644 --- a/test/source/sheet/xdatapilotfieldgrouping.cxx +++ b/test/source/sheet/xdatapilotfieldgrouping.cxx @@ -44,7 +44,7 @@ void XDataPilotFieldGrouping::testCreateNameGroup() uno::Reference< container::XNameAccess > xNameAccess( xDataPilotField->getItems(), UNO_QUERY_THROW ); CPPUNIT_ASSERT(xNameAccess->hasElements()); - uno::Sequence< rtl::OUString > aElements = xNameAccess->getElementNames(); + uno::Sequence< OUString > aElements = xNameAccess->getElementNames(); xDataPilotFieldGrouping->createNameGroup( aElements ); } diff --git a/test/source/sheet/xdatapilottable2.cxx b/test/source/sheet/xdatapilottable2.cxx index 7d9e8ac97335..392df5aec7d7 100644 --- a/test/source/sheet/xdatapilottable2.cxx +++ b/test/source/sheet/xdatapilottable2.cxx @@ -185,7 +185,7 @@ void XDataPilotTable2::testInsertDrillDownSheet() checkDrillDownSheetContent(xSheet, aData); uno::Reference< container::XNamed > xNamed(xSheet, UNO_QUERY_THROW); - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); xSheets->removeByName(aName); } else if (nNewSheetCount == nSheetCount) @@ -242,7 +242,7 @@ void XDataPilotTable2::buildDataFields( uno::Reference< sheet::XDataPilotTable2 for( sal_Int32 i = 0; i < nFieldCount; ++i) { uno::Reference< beans::XPropertySet > xPropSet(xIndex->getByIndex(i), UNO_QUERY_THROW); - Any aAny = xPropSet->getPropertyValue(rtl::OUString("Orientation")); + Any aAny = xPropSet->getPropertyValue(OUString("Orientation")); sheet::DataPilotFieldOrientation aOrientation; CPPUNIT_ASSERT( aAny >>= aOrientation ); diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx index 6adeb8bb28c5..0f431dd736da 100644 --- a/test/source/sheet/xnamedrange.cxx +++ b/test/source/sheet/xnamedrange.cxx @@ -53,48 +53,48 @@ namespace apitest { void XNamedRange::testGetContent() { - rtl::OUString aTestedNamedRangeString("initial1"); + OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); - rtl::OUString aExpectedContent("$Sheet1.$B$1"); + OUString aExpectedContent("$Sheet1.$B$1"); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 on GetContent", xNamedRange->getContent().equals(aExpectedContent)); } void XNamedRange::testSetContent() { - rtl::OUString aTestedNamedRangeString("initial1"); + OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); - rtl::OUString aExpectedContent; + OUString aExpectedContent; // test a cell - aExpectedContent = rtl::OUString("D1"); + aExpectedContent = OUString("D1"); xNamedRange->setContent(aExpectedContent); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a cell", xNamedRange->getContent().equals(aExpectedContent)); // test a cellrange - aExpectedContent = rtl::OUString("D1:D10"); + aExpectedContent = OUString("D1:D10"); xNamedRange->setContent(aExpectedContent); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a cellrange", xNamedRange->getContent().equals(aExpectedContent)); // test a formula - aExpectedContent = rtl::OUString("=D10"); + aExpectedContent = OUString("=D10"); xNamedRange->setContent(aExpectedContent); - aExpectedContent = rtl::OUString("D10"); + aExpectedContent = OUString("D10"); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a formula", xNamedRange->getContent().equals(aExpectedContent)); } void XNamedRange::testGetType() { - rtl::OUString aTestedNamedRangeString("initial1"); + OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); CPPUNIT_ASSERT_MESSAGE("Wrong expected Type", xNamedRange->getType() == 0); } void XNamedRange::testSetType() { - rtl::OUString aTestedNamedRangeString("initial1"); + OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); sal_Int32 nType = ::sheet::NamedRangeFlag::ROW_HEADER;; @@ -120,7 +120,7 @@ void XNamedRange::testSetType() void XNamedRange::testGetReferencePosition() { - rtl::OUString aTestedNamedRangeString("initial2"); + OUString aTestedNamedRangeString("initial2"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); table::CellAddress xCellAddress = xNamedRange->getReferencePosition(); @@ -132,7 +132,7 @@ void XNamedRange::testGetReferencePosition() void XNamedRange::testSetReferencePosition() { - rtl::OUString aTestedNamedRangeString("initial1"); + OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); table::CellAddress aBaseAddress = table::CellAddress(1,2,3); diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx index 33dbf2c4bc54..cf91ef5647a6 100644 --- a/test/source/sheet/xnamedranges.cxx +++ b/test/source/sheet/xnamedranges.cxx @@ -59,7 +59,7 @@ XNamedRanges::XNamedRanges(): } -XNamedRanges::XNamedRanges(const rtl::OUString& rNameToRemove): +XNamedRanges::XNamedRanges(const OUString& rNameToRemove): maNameToRemove(rNameToRemove) { @@ -77,32 +77,32 @@ void XNamedRanges::testAddNewByName() table::CellAddress aBaseAddress = table::CellAddress(0,0,0); sal_Int32 nType = 0; - rtl::OUString aContent1("D1"); - rtl::OUString aName1("type_0"); + OUString aContent1("D1"); + OUString aName1("type_0"); xNamedRanges->addNewByName(aName1, aContent1, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type 0 - Normal case", xNamedRanges->hasByName(aName1)); nType = ::sheet::NamedRangeFlag::COLUMN_HEADER; - rtl::OUString aContent2("D2"); - rtl::OUString aName2("type_COLUMN_HEADER"); + OUString aContent2("D2"); + OUString aName2("type_COLUMN_HEADER"); xNamedRanges->addNewByName(aName2, aContent2, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type COLUMN_HEADER", xNamedRanges->hasByName(aName2)); nType = ::sheet::NamedRangeFlag::FILTER_CRITERIA; - rtl::OUString aContent3("D3"); - rtl::OUString aName3("type_FILTER_CRITERIA"); + OUString aContent3("D3"); + OUString aName3("type_FILTER_CRITERIA"); xNamedRanges->addNewByName(aName3, aContent3, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type FILTER_CRITERIA", xNamedRanges->hasByName(aName3)); nType = ::sheet::NamedRangeFlag::PRINT_AREA; - rtl::OUString aContent4("D4"); - rtl::OUString aName4("type_PRINT_AREA"); + OUString aContent4("D4"); + OUString aName4("type_PRINT_AREA"); xNamedRanges->addNewByName(aName4, aContent4, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type PRINT_AREA", xNamedRanges->hasByName(aName4)); nType = ::sheet::NamedRangeFlag::ROW_HEADER; - rtl::OUString aContent5("D5"); - rtl::OUString aName5("type_ROW_HEADER"); + OUString aContent5("D5"); + OUString aName5("type_ROW_HEADER"); xNamedRanges->addNewByName(aName5, aContent5, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type ROW_HEADER", xNamedRanges->hasByName(aName5)); @@ -116,7 +116,7 @@ void XNamedRanges::testAddNewFromTitles() table::CellRangeAddress aCellRangeAddress = table::CellRangeAddress(1,0,0,3,3); - rtl::OUString aString; + OUString aString; uno::Reference< table::XCell > xCell; xNamedRanges->addNewFromTitles(aCellRangeAddress, sheet::Border_TOP); @@ -187,7 +187,7 @@ void XNamedRanges::testRemoveByName() CPPUNIT_ASSERT_EQUAL_MESSAGE("NamedRange initial1 not removed", nNewCount, nInitialCount - 1); CPPUNIT_ASSERT_MESSAGE("Wrong NamedRange removed, initial1 still present", !xNamedRanges->hasByName(maNameToRemove)); // try to remove non existing - rtl::OUString aNr2("dummyNonExistingNamedRange"); + OUString aNr2("dummyNonExistingNamedRange"); xNamedRanges->removeByName(aNr2);// an exception should be raised here } } @@ -201,7 +201,7 @@ void XNamedRanges::testOutputList() xNamedRanges->outputList(xCellAddress); - rtl::OUString aString; + OUString aString; uno::Reference< table::XCell > xCell; for (sal_Int32 i = 0; i < nElementsCount; i++) diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx index ec7680475360..1475798558fd 100644 --- a/test/source/sheet/xsheetannotation.cxx +++ b/test/source/sheet/xsheetannotation.cxx @@ -56,14 +56,14 @@ void XSheetAnnotation::testGetPosition() void XSheetAnnotation::testGetAuthor() { uno::Reference< sheet::XSheetAnnotation > aSheetAnnotation (init(), UNO_QUERY_THROW); - rtl::OUString aAuthor = aSheetAnnotation->getAuthor(); + OUString aAuthor = aSheetAnnotation->getAuthor(); CPPUNIT_ASSERT_MESSAGE("Wrong author", aAuthor.equals("LG")); } void XSheetAnnotation::testGetDate() { uno::Reference< sheet::XSheetAnnotation > aSheetAnnotation (init(), UNO_QUERY_THROW); - rtl::OUString aDate = aSheetAnnotation->getDate(); + OUString aDate = aSheetAnnotation->getDate(); CPPUNIT_ASSERT_MESSAGE("Wrong date", aDate.equals("01/17/2013")); } diff --git a/test/source/sheet/xsheetannotations.cxx b/test/source/sheet/xsheetannotations.cxx index 7f2d63862afb..637e88838220 100644 --- a/test/source/sheet/xsheetannotations.cxx +++ b/test/source/sheet/xsheetannotations.cxx @@ -68,7 +68,7 @@ void XSheetAnnotations::testInsertNew() // is the string ok ? uno::Reference< text::XTextRange > aTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW); - rtl::OUString aString = aTextSheetAnnotation->getString(); + OUString aString = aTextSheetAnnotation->getString(); CPPUNIT_ASSERT_MESSAGE("Insert Annotation - Wrong string", aString == "an inserted annotation"); @@ -107,7 +107,7 @@ void XSheetAnnotations::testRemoveByIndex() // is the string ok ? uno::Reference< text::XTextRange > aLastTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW); - rtl::OUString aLastString = aLastTextSheetAnnotation->getString(); + OUString aLastString = aLastTextSheetAnnotation->getString(); CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong string", aLastString == "an inserted annotation 3"); @@ -121,7 +121,7 @@ void XSheetAnnotations::testRemoveByIndex() // is the string ok ? uno::Reference< text::XTextRange > aPreviousTextSheetAnnotation(aPreviousSheetAnnotation, UNO_QUERY_THROW); - rtl::OUString aPreviousString = aPreviousTextSheetAnnotation->getString(); + OUString aPreviousString = aPreviousTextSheetAnnotation->getString(); CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong string", aPreviousString == "an inserted annotation 1"); diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx index f72e7ae5c667..b4d734072119 100644 --- a/test/source/sheet/xspreadsheets2.cxx +++ b/test/source/sheet/xspreadsheets2.cxx @@ -90,11 +90,11 @@ void XSpreadsheets2::testImportString() uno::Reference< table::XCell > xSrcCell = xSrcSheet->getCellByPosition(0,0); uno::Reference< text::XTextRange > xSrcTextRange(xSrcCell, UNO_QUERY_THROW); - rtl::OUString aSrcString = xSrcTextRange->getString(); + OUString aSrcString = xSrcTextRange->getString(); uno::Reference< table::XCell > xDestCell = xDestSheet->getCellByPosition(0,0); uno::Reference< text::XTextRange > xDestTextRange(xDestCell, UNO_QUERY_THROW); - rtl::OUString aDestString = xDestTextRange->getString(); + OUString aDestString = xDestTextRange->getString(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong string imported", aDestString, aSrcString); } @@ -123,10 +123,10 @@ void XSpreadsheets2::testImportFormulaBasicMath() importSheetToCopy(); uno::Reference< table::XCell > xSrcCell = xSrcSheet->getCellByPosition(2,0); - rtl::OUString aSrcFormula = xSrcCell->getFormula(); + OUString aSrcFormula = xSrcCell->getFormula(); uno::Reference< table::XCell > xDestCell = xDestSheet->getCellByPosition(2,0); - rtl::OUString aDestFormula = xDestCell->getFormula(); + OUString aDestFormula = xDestCell->getFormula(); // potential problem later: formulas might be adjusted // add some tests that the formulas are correctly adjusted @@ -141,10 +141,10 @@ void XSpreadsheets2::testImportFormulaWithNamedRange() importSheetToCopy(); uno::Reference< table::XCell > xSrcCell = xSrcSheet->getCellByPosition(3,0); - rtl::OUString aSrcFormula = xSrcCell->getFormula(); + OUString aSrcFormula = xSrcCell->getFormula(); uno::Reference< table::XCell > xDestCell = xDestSheet->getCellByPosition(3,0); - rtl::OUString aDestFormula = xDestCell->getFormula(); + OUString aDestFormula = xDestCell->getFormula(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong Namedrange formula imported", aDestFormula, aSrcFormula); } @@ -160,14 +160,14 @@ void XSpreadsheets2::testImportOverExistingNamedRange() */ importSheetToCopy(); - rtl::OUString aNamedRangeString("initial1"); + OUString aNamedRangeString("initial1"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); uno::Any aNr = xDestNamedRangesNameAccess->getByName(aNamedRangeString); uno::Reference< sheet::XNamedRange > xDestNamedRange(aNr, UNO_QUERY_THROW); - rtl::OUString aNrDestContent = xDestNamedRange->getContent(); + OUString aNrDestContent = xDestNamedRange->getContent(); - rtl::OUString aExpectedContent("$Sheet1.$B$1"); + OUString aExpectedContent("$Sheet1.$B$1"); std::cout << "testImportSheet : initial1 aNrDestContent " << aNrDestContent << std::endl; CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong address for initial1", aNrDestContent, aExpectedContent); @@ -184,14 +184,14 @@ void XSpreadsheets2::testImportNamedRangeDefinedInSource() importSheetToCopy(); // New range name defined in imported sheet $SheetToCopy.$A$7 - rtl::OUString aNewInSheetNamedRangeString("InSheetRangeName"); + OUString aNewInSheetNamedRangeString("InSheetRangeName"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("InSheetRangeName", xDestNamedRangesNameAccess->hasByName(aNewInSheetNamedRangeString)); uno::Any aNewInSheetNr = xDestNamedRangesNameAccess->getByName(aNewInSheetNamedRangeString); uno::Reference< sheet::XNamedRange > xDestNewInSheetNamedRange(aNewInSheetNr, UNO_QUERY_THROW); - rtl::OUString aNewInSheetNrDestContent = xDestNewInSheetNamedRange->getContent(); - rtl::OUString aNewInSheetExpectedContent("$SheetToCopy.$A$7"); + OUString aNewInSheetNrDestContent = xDestNewInSheetNamedRange->getContent(); + OUString aNewInSheetExpectedContent("$SheetToCopy.$A$7"); std::cout << "testImportSheet : InSheetRangeName content " << aNewInSheetNrDestContent << std::endl; std::cout << "testImportSheet : InSheetRangeName expected " << aNewInSheetExpectedContent << std::endl; @@ -208,14 +208,14 @@ void XSpreadsheets2::testImportNamedRangeRedefinedInSource() importSheetToCopy(); // the source file redefines an existing named range in the imported sheet --> the target should not be changed - rtl::OUString aRedefinedInSheetNamedRangeString("initial2"); + OUString aRedefinedInSheetNamedRangeString("initial2"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("aRedefinedInSheetNamedRangeString", xDestNamedRangesNameAccess->hasByName(aRedefinedInSheetNamedRangeString)); uno::Any aRedefinedInSheetNr = xDestNamedRangesNameAccess->getByName(aRedefinedInSheetNamedRangeString); uno::Reference< sheet::XNamedRange > xDestRedefinedInSheetNamedRange(aRedefinedInSheetNr, UNO_QUERY_THROW); - rtl::OUString aRedefinedInSheetNrDestContent = xDestRedefinedInSheetNamedRange->getContent(); - rtl::OUString aRedefinedInSheetExpectedContent("$Sheet1.$B$2"); + OUString aRedefinedInSheetNrDestContent = xDestRedefinedInSheetNamedRange->getContent(); + OUString aRedefinedInSheetExpectedContent("$Sheet1.$B$2"); std::cout << "testImportSheet : initial2 content " << aRedefinedInSheetNrDestContent << std::endl; CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong address for Redefined InSheet named range", aRedefinedInSheetNrDestContent, aRedefinedInSheetExpectedContent); } @@ -230,7 +230,7 @@ void XSpreadsheets2::testImportNewNamedRange() importSheetToCopy(); //formula with a non-existant named range in dest - new_rangename - rtl::OUString aNewNamedRangeString("new_rangename"); + OUString aNewNamedRangeString("new_rangename"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("New NamedRange not created", xDestNamedRangesNameAccess->hasByName(aNewNamedRangeString)); @@ -238,9 +238,9 @@ void XSpreadsheets2::testImportNewNamedRange() uno::Any aNewNr = xDestNamedRangesNameAccess->getByName(aNewNamedRangeString); uno::Reference< sheet::XNamedRange > xDestNewNamedRange(aNewNr, UNO_QUERY_THROW); - rtl::OUString aNewNrDestContent = xDestNewNamedRange->getContent(); + OUString aNewNrDestContent = xDestNewNamedRange->getContent(); - rtl::OUString aNewExpectedContent("$Sheet1.$B$1"); + OUString aNewExpectedContent("$Sheet1.$B$1"); std::cout << "testImportSheet : new_rangename aNewExpectedContent " << aNewExpectedContent << std::endl; std::cout << "testImportSheet : new_rangename aNewNrDestContent " << aNewNrDestContent << std::endl; @@ -263,19 +263,19 @@ void XSpreadsheets2::testImportCellStyle() //new style created in dest uno::Reference< beans::XPropertySet > xSrcCellPropSet (xSrcCell, UNO_QUERY_THROW); - const rtl::OUString aCellProperty("CellStyle"); - rtl::OUString aSrcStyleName; + const OUString aCellProperty("CellStyle"); + OUString aSrcStyleName; CPPUNIT_ASSERT(xSrcCellPropSet->getPropertyValue(aCellProperty) >>= aSrcStyleName); uno::Reference< beans::XPropertySet > xDestCellPropSet (xSrcCell, UNO_QUERY_THROW); - rtl::OUString aDestStyleName; + OUString aDestStyleName; CPPUNIT_ASSERT(xDestCellPropSet->getPropertyValue(aCellProperty) >>= aDestStyleName); CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong imported Cell Style", aDestStyleName, aSrcStyleName); uno::Reference< style::XStyleFamiliesSupplier > xFamiliesSupplier (xDestDoc, UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xFamiliesNameAccess (xFamiliesSupplier->getStyleFamilies(), UNO_QUERY_THROW); - rtl::OUString aCellFamilyName("CellStyles"); + OUString aCellFamilyName("CellStyles"); uno::Any xCellStylesFamily = xFamiliesNameAccess->getByName(aCellFamilyName); uno::Reference< container::XNameContainer > xCellStylesFamilyNameAccess (xCellStylesFamily, UNO_QUERY_THROW); @@ -283,16 +283,16 @@ void XSpreadsheets2::testImportCellStyle() uno::Any aCellStyle = xCellStylesFamilyNameAccess->getByName(aDestStyleName); uno::Reference< beans::XPropertySet > xCellStyleProp (aCellStyle, UNO_QUERY_THROW); - rtl::OUString aProperty("VertJustify"); + OUString aProperty("VertJustify"); sal_Int32 aVertJustify = 0; CPPUNIT_ASSERT(xCellStyleProp->getPropertyValue(aProperty) >>= aVertJustify); CPPUNIT_ASSERT_MESSAGE("New style: VertJustify not set", aVertJustify == table::CellVertJustify_CENTER); } -uno::Reference< sheet::XSpreadsheetDocument> XSpreadsheets2::getDoc(const rtl::OUString& aFileBase, uno::Reference< lang::XComponent >& xComp) +uno::Reference< sheet::XSpreadsheetDocument> XSpreadsheets2::getDoc(const OUString& aFileBase, uno::Reference< lang::XComponent >& xComp) { - rtl::OUString aFileURL; + OUString aFileURL; createFileURL(aFileBase, aFileURL); if (!xComp.is()) @@ -308,7 +308,7 @@ uno::Reference< sheet::XSpreadsheetDocument> XSpreadsheets2::getDoc(const rtl::O uno::Reference< sheet::XNamedRanges> XSpreadsheets2::getNamedRanges(uno::Reference< sheet::XSpreadsheetDocument> xDoc) { uno::Reference< beans::XPropertySet > xPropSet (xDoc, UNO_QUERY_THROW); - rtl::OUString NamedRangesPropertyString("NamedRanges"); + OUString NamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(NamedRangesPropertyString), UNO_QUERY_THROW); CPPUNIT_ASSERT(xNamedRanges.is()); @@ -341,10 +341,10 @@ void XSpreadsheets2::importSheetToCopy() xDestSheet = uno::Reference< sheet::XSpreadsheet > ( xDestSheetNameAccess->getByName(aSrcSheetName), UNO_QUERY_THROW); } -bool XSpreadsheets2::isExternalReference(const rtl::OUString& aDestContent, const rtl::OUString& aSrcContent ) +bool XSpreadsheets2::isExternalReference(const OUString& aDestContent, const OUString& aSrcContent ) { - rtl::OUString aStart("'file://"); - const sal_Char* sSrcContent = rtl::OUStringToOString( aSrcContent, RTL_TEXTENCODING_UTF8 ).getStr(); + OUString aStart("'file://"); + const sal_Char* sSrcContent = OUStringToOString( aSrcContent, RTL_TEXTENCODING_UTF8 ).getStr(); return (aDestContent.endsWithIgnoreAsciiCaseAsciiL(sSrcContent, aSrcContent.getLength()) // same cell address && aDestContent.indexOf(aStart)==0 // starts with 'file:// diff --git a/test/source/text/xtextfield.cxx b/test/source/text/xtextfield.cxx index f13080aac3d9..5ccb1dad1cf5 100644 --- a/test/source/text/xtextfield.cxx +++ b/test/source/text/xtextfield.cxx @@ -39,7 +39,7 @@ namespace apitest void XTextField::testGetPresentation() { uno::Reference< text::XTextField > xTextField(init(), UNO_QUERY_THROW); - rtl::OUString aString = xTextField->getPresentation(true); + OUString aString = xTextField->getPresentation(true); CPPUNIT_ASSERT(!aString.isEmpty()); aString = xTextField->getPresentation(false); CPPUNIT_ASSERT(!aString.isEmpty()); diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx index 702cc1f8122c..77ff4bc310a9 100644 --- a/test/source/unoapi_test.cxx +++ b/test/source/unoapi_test.cxx @@ -44,7 +44,7 @@ void UnoApiTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); } @@ -55,7 +55,7 @@ void UnoApiTest::tearDown() test::BootstrapFixture::tearDown(); } -void UnoApiTest::createFileURL(const rtl::OUString& aFileBase, rtl::OUString& rFilePath) +void UnoApiTest::createFileURL(const OUString& aFileBase, OUString& rFilePath) { rFilePath = getSrcRootURL() + m_aBaseString + "/" + aFileBase; } diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 4f268434d321..0ba8b42ac793 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -59,9 +59,6 @@ using namespace com::sun::star::registry; using namespace com::sun::star::bridge; using namespace test::testtools::bridgetest; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; #define SERVICENAME "com.sun.star.test.bridge.BridgeTest" #define IMPLNAME "com.sun.star.comp.bridge.BridgeTest" @@ -89,12 +86,12 @@ static bool check( bool b , char const * message ) namespace { -bool checkEmpty(rtl::OUString const & string, char const * message) { +bool checkEmpty(OUString const & string, char const * message) { bool ok = string.isEmpty(); if (!ok) { fprintf( stderr, "%s failed: %s\n", message, - rtl::OUStringToOString(string, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(string, RTL_TEXTENCODING_UTF8).getStr()); } return ok; } @@ -190,7 +187,7 @@ static void assign( TestElement & rData, sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, - TestEnum eEnum, const ::rtl::OUString& rStr, + TestEnum eEnum, const OUString& rStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, const ::com::sun::star::uno::Any& rAny ) { @@ -570,7 +567,7 @@ static sal_Bool performTest( bRet &= check(tps1.member == 12345, "transportPolyHyper"); Sequence< Any > seq(2); seq[0] <<= static_cast< sal_uInt32 >(33); - seq[1] <<= rtl::OUString("ABC"); + seq[1] <<= OUString("ABC"); TestPolyStruct< Sequence< Any > > tps2(seq); TestPolyStruct< Sequence< Any > > tps3; xLBT->transportPolySequence(tps2, tps3); @@ -580,7 +577,7 @@ static sal_Bool performTest( sal_uInt32 v0 = sal_uInt32(); tps3.member[0] >>= v0; bRet &= check(v0 == 33, "transportPolySequence, element 0"); - rtl::OUString v1; + OUString v1; tps3.member[1] >>= v1; bRet &= check( v1 == "ABC", "transportPolySequence, element 1" ); bRet &= check( @@ -594,7 +591,7 @@ static sal_Bool performTest( Any nullAny(xLBT->getNullPolyAny().member); bRet &= check( (((nullAny.getValueTypeName() == - rtl::OUString( + OUString( "com.sun.star.uno.XInterface")) && !static_cast< Reference< XInterface > const * >( nullAny.getValue())->is()) diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 8627e2932a6e..c1d72d3e2720 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -78,7 +78,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments) ::sal_uInt64 arg7 = sal_uInt64(); float arg8 = float(); double arg9 = double(); - ::rtl::OUString arg11; + OUString arg11; css::uno::Type arg12; ::sal_Bool arg13 = sal_Bool(); css::uno::Sequence< ::sal_Bool > arg14; @@ -91,7 +91,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments) css::uno::Sequence< ::sal_uInt64 > arg21; css::uno::Sequence< float > arg22; css::uno::Sequence< double > arg23; - css::uno::Sequence< ::rtl::OUString > arg25; + css::uno::Sequence< OUString > arg25; css::uno::Sequence< css::uno::Type > arg26; css::uno::Sequence< css::uno::Any > arg27; ::sal_Bool arg27b = sal_Bool(); @@ -221,7 +221,7 @@ private: throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL fn11( ::sal_Int32 arg ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL fn12( const ::rtl::OUString& arg ) + virtual OUString SAL_CALL fn12( const OUString& arg ) throw (::com::sun::star::uno::RuntimeException); @@ -240,7 +240,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) ttb::TestPolyStruct< ::sal_Int32 > arg5; ttb::TestPolyStruct< ::sal_Int64 > arg6; ttb::TestPolyStruct< ::sal_Unicode > arg7; - ttb::TestPolyStruct< ::rtl::OUString > arg8; + ttb::TestPolyStruct< OUString > arg8; ttb::TestPolyStruct< float > arg9; ttb::TestPolyStruct< double > arg10; ttb::TestPolyStruct > arg11; @@ -250,8 +250,8 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) ttb::TestPolyStruct2 > arg14; ttb::TestPolyStruct< ttb::TestPolyStruct2 < ttb::TestPolyStruct2< sal_Unicode, css::uno::Any >, - ::rtl::OUString > > arg15; - ttb::TestPolyStruct2< ::rtl::OUString,ttb::TestPolyStruct2 < + OUString > > arg15; + ttb::TestPolyStruct2< OUString,ttb::TestPolyStruct2 < ::sal_Unicode, ttb::TestPolyStruct < css::uno::Any > > > arg16; ttb::TestPolyStruct2< ttb::TestPolyStruct2, ttb::TestPolyStruct > arg17; @@ -263,7 +263,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) ttb::TestPolyStruct > arg23; ttb::TestPolyStruct > arg24; // ttb::TestPolyStruct > arg25; - ttb::TestPolyStruct > arg26; + ttb::TestPolyStruct > arg26; ttb::TestPolyStruct > arg27; ttb::TestPolyStruct > arg28; ttb::TestPolyStruct > > arg29; @@ -278,17 +278,17 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments) css::uno::Sequence > arg35; css::uno::Sequence > > arg36; css::uno::Sequence, ::rtl::OUString> > > arg37; - css::uno::Sequence, OUString> > > arg37; + css::uno::Sequence > > > arg38; css::uno::Sequence, ttb::TestPolyStruct< ::sal_Unicode> > > arg39; css::uno::Sequence > > arg40; css::uno::Sequence > > >arg41; css::uno::Sequence, ::rtl::OUString> > > > arg42; + ttb::TestPolyStruct2, OUString> > > > arg42; css::uno::Sequence > > > > arg43; + OUString, ttb::TestPolyStruct2< ::sal_Unicode, ttb::TestPolyStruct > > > > arg43; css::uno::Sequence, ttb::TestPolyStruct< ::sal_Unicode> > > > arg44; @@ -431,10 +431,10 @@ void Impl2::setatt1( double _att1 )throw (::com::sun::star::uno::RuntimeExceptio return 11 * arg; } -::rtl::OUString Impl2::fn12( const ::rtl::OUString& arg ) +OUString Impl2::fn12( const OUString& arg ) throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("12") + arg; + return OUString("12") + arg; } css::uno::Reference< css::uno::XInterface > SAL_CALL create( @@ -445,8 +445,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( return static_cast< ::cppu::OWeakObject * >(new Impl); } -::rtl::OUString SAL_CALL getImplementationName() { - return ::rtl::OUString( +OUString SAL_CALL getImplementationName() { + return OUString( "comp.test.testtools.bridgetest.Constructors"); } @@ -464,8 +464,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create2( return static_cast< ::cppu::OWeakObject * >(new Impl2); } -::rtl::OUString SAL_CALL getImplementationName2() { - return ::rtl::OUString( +OUString SAL_CALL getImplementationName2() { + return OUString( "comp.test.testtools.bridgetest.Constructors2"); } diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 9a0c0d7a6bfc..9d6d2517ceed 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -53,8 +53,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace test::testtools::bridgetest; -using ::rtl::OUString; -using ::rtl::OUStringToOString; #define SERVICENAME "com.sun.star.test.bridge.CppTestObject" #define IMPLNAME "com.sun.star.comp.bridge.CppTestObject" @@ -76,7 +74,7 @@ static void assign( TestElement & rData, sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, - TestEnum eEnum, const ::rtl::OUString& rStr, + TestEnum eEnum, const OUString& rStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, const ::com::sun::star::uno::Any& rAny ) { @@ -103,7 +101,7 @@ static void assign( TestData & rData, sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, - TestEnum eEnum, const ::rtl::OUString& rStr, + TestEnum eEnum, const OUString& rStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, const ::com::sun::star::uno::Any& rAny, const com::sun::star::uno::Sequence< TestElement >& rSequence ) @@ -174,7 +172,7 @@ public: sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, - TestEnum eEnum, const ::rtl::OUString& rStr, + TestEnum eEnum, const OUString& rStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Sequence& rSequence, @@ -186,7 +184,7 @@ public: sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, - TestEnum& eEnum, rtl::OUString& rStr, + TestEnum& eEnum, OUString& rStr, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, ::com::sun::star::uno::Any& rAny, ::com::sun::star::uno::Sequence& rSequence, @@ -198,7 +196,7 @@ public: sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, - TestEnum& eEnum, rtl::OUString& rStr, + TestEnum& eEnum, OUString& rStr, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, ::com::sun::star::uno::Any& rAny, ::com::sun::star::uno::Sequence< TestElement >& rSequence, @@ -247,7 +245,7 @@ public: { return _aData.Double; } virtual TestEnum SAL_CALL getEnum() throw(com::sun::star::uno::RuntimeException) { return _aData.Enum; } - virtual rtl::OUString SAL_CALL getString() throw(com::sun::star::uno::RuntimeException) + virtual OUString SAL_CALL getString() throw(com::sun::star::uno::RuntimeException) { return _aData.String; } virtual com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getInterface( ) throw(com::sun::star::uno::RuntimeException) { return _aData.Interface; } @@ -282,7 +280,7 @@ public: { _aData.Double = _double; } virtual void SAL_CALL setEnum( TestEnum _enum ) throw(::com::sun::star::uno::RuntimeException) { _aData.Enum = _enum; } - virtual void SAL_CALL setString( const ::rtl::OUString& _string ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setString( const OUString& _string ) throw(::com::sun::star::uno::RuntimeException) { _aData.String = _string; } virtual void SAL_CALL setInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _interface ) throw(::com::sun::star::uno::RuntimeException) { _aData.Interface = _interface; } @@ -320,9 +318,9 @@ public: throw (RuntimeException) { return TestPolyStruct< sal_Int32 >(0); /* work around MS compiler bug */ } - virtual TestPolyStruct< rtl::OUString > SAL_CALL getNullPolyString() + virtual TestPolyStruct< OUString > SAL_CALL getNullPolyString() throw (RuntimeException) - { return TestPolyStruct< rtl::OUString >(); } + { return TestPolyStruct< OUString >(); } virtual TestPolyStruct< Type > SAL_CALL getNullPolyType() throw (RuntimeException) @@ -372,7 +370,7 @@ public: virtual Reference< XMulti > SAL_CALL getMulti() throw (RuntimeException); - virtual rtl::OUString SAL_CALL testMulti(Reference< XMulti > const & multi) + virtual OUString SAL_CALL testMulti(Reference< XMulti > const & multi) throw (RuntimeException); public: // XBridgeTest @@ -380,7 +378,7 @@ public: // XBridgeTest throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL raiseRuntimeExceptionOneway( - const ::rtl::OUString& Message, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context ) + const OUString& Message, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException); @@ -559,7 +557,7 @@ Reference< XMulti > Test_Impl::getMulti() throw (RuntimeException) { return new testtools::bridgetest::Multi; } -rtl::OUString Test_Impl::testMulti(Reference< XMulti > const & multi) +OUString Test_Impl::testMulti(Reference< XMulti > const & multi) throw (RuntimeException) { return testtools::bridgetest::testMulti(multi); @@ -571,7 +569,7 @@ void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int32 nLong, sal_uInt32 nULong, sal_Int64 nHyper, sal_uInt64 nUHyper, float fFloat, double fDouble, - TestEnum eEnum, const ::rtl::OUString& rStr, + TestEnum eEnum, const OUString& rStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Sequence& rSequence, @@ -589,7 +587,7 @@ TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& n sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, - TestEnum& eEnum, rtl::OUString& rStr, + TestEnum& eEnum, OUString& rStr, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, ::com::sun::star::uno::Any& rAny, ::com::sun::star::uno::Sequence& rSequence, @@ -613,7 +611,7 @@ TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nB sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, - TestEnum& eEnum, rtl::OUString& rStr, + TestEnum& eEnum, OUString& rStr, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest, ::com::sun::star::uno::Any& rAny, ::com::sun::star::uno::Sequence& rSequence, diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx index e86b4a731341..2f3c77b34411 100644 --- a/testtools/source/bridgetest/currentcontextchecker.cxx +++ b/testtools/source/bridgetest/currentcontextchecker.cxx @@ -50,7 +50,7 @@ public: virtual ~CurrentContext(); - virtual css::uno::Any SAL_CALL getValueByName(::rtl::OUString const & Name) + virtual css::uno::Any SAL_CALL getValueByName(OUString const & Name) throw (css::uno::RuntimeException); private: @@ -62,11 +62,11 @@ CurrentContext::CurrentContext() {} CurrentContext::~CurrentContext() {} -css::uno::Any CurrentContext::getValueByName(::rtl::OUString const & Name) +css::uno::Any CurrentContext::getValueByName(OUString const & Name) throw (css::uno::RuntimeException) { return Name == KEY - ? css::uno::makeAny(::rtl::OUString::createFromAscii(VALUE)) + ? css::uno::makeAny(OUString::createFromAscii(VALUE)) : css::uno::Any(); } @@ -103,11 +103,11 @@ bool testtools::bridgetest::CurrentContextChecker::performCheck( return false; } css::uno::Any a( - context->getValueByName(::rtl::OUString::createFromAscii(KEY))); - if (a.getValueType() != ::cppu::UnoType< ::rtl::OUString >::get()) { + context->getValueByName(OUString::createFromAscii(KEY))); + if (a.getValueType() != ::cppu::UnoType< OUString >::get()) { return false; } - ::rtl::OUString s; + OUString s; OSL_VERIFY(a >>= s); return s == VALUE; } else { diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx index 39a4f7354c40..0c20128345a0 100644 --- a/testtools/source/bridgetest/multi.cxx +++ b/testtools/source/bridgetest/multi.cxx @@ -31,15 +31,15 @@ namespace { struct CheckFailed { - explicit CheckFailed(rtl::OUString const & theMessage): message(theMessage) + explicit CheckFailed(OUString const & theMessage): message(theMessage) {} - rtl::OUString message; + OUString message; }; -::std::ostream& operator<< (::std::ostream& os, const ::rtl::OUString& str) +::std::ostream& operator<< (::std::ostream& os, const OUString& str) { - return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); + return os << OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr(); } template< typename T > void checkEqual(T const & value, T const & argument) { @@ -47,8 +47,8 @@ template< typename T > void checkEqual(T const & value, T const & argument) { std::ostringstream s; s << value << " != " << argument; throw CheckFailed( - rtl::OStringToOUString( - rtl::OString(s.str().c_str()), RTL_TEXTENCODING_UTF8)); + OStringToOUString( + OString(s.str().c_str()), RTL_TEXTENCODING_UTF8)); } } @@ -56,7 +56,7 @@ template< typename T > void checkEqual(T const & value, T const & argument) { namespace testtools { namespace bridgetest { -rtl::OUString testMulti( +OUString testMulti( com::sun::star::uno::Reference< test::testtools::bridgetest::XMulti > const & multi) { @@ -124,32 +124,32 @@ rtl::OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >( multi, css::uno::UNO_QUERY_THROW)->fn11(5)); checkEqual( - rtl::OUString("12" "abc"), + OUString("12" "abc"), css::uno::Reference< test::testtools::bridgetest::XMultiBase1 >( multi, css::uno::UNO_QUERY_THROW)->fn12( - rtl::OUString("abc"))); + OUString("abc"))); checkEqual( - rtl::OUString("12" "abc-2"), + OUString("12" "abc-2"), static_cast< test::testtools::bridgetest::XMultiBase2 * >( - multi.get())->fn12(rtl::OUString("abc-2"))); + multi.get())->fn12(OUString("abc-2"))); checkEqual( - rtl::OUString("12" "abc-2"), + OUString("12" "abc-2"), css::uno::Reference< test::testtools::bridgetest::XMultiBase2 >( multi, css::uno::UNO_QUERY_THROW)->fn12( - rtl::OUString("abc-2"))); + OUString("abc-2"))); checkEqual( - rtl::OUString("12" "abc-5"), + OUString("12" "abc-5"), static_cast< test::testtools::bridgetest::XMultiBase5 * >( - multi.get())->fn12(rtl::OUString("abc-5"))); + multi.get())->fn12(OUString("abc-5"))); checkEqual( - rtl::OUString("12" "abc-5"), + OUString("12" "abc-5"), css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >( multi, css::uno::UNO_QUERY_THROW)->fn12( - rtl::OUString("abc-5"))); + OUString("abc-5"))); checkEqual< sal_Int32 >(21 * 2, multi->fn21(2)); checkEqual( - rtl::OUString("22" "de"), - multi->fn22(rtl::OUString("de"))); + OUString("22" "de"), + multi->fn22(OUString("de"))); checkEqual< sal_Int32 >( 31 * 3, css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >( @@ -189,19 +189,19 @@ rtl::OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >( multi, css::uno::UNO_QUERY_THROW)->getatt3()); checkEqual( - rtl::OUString("32" "f"), + OUString("32" "f"), css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >( multi, css::uno::UNO_QUERY_THROW)->fn32( - rtl::OUString("f"))); + OUString("f"))); checkEqual( - rtl::OUString("32" "f-5"), + OUString("32" "f-5"), static_cast< test::testtools::bridgetest::XMultiBase5 * >( - multi.get())->fn32(rtl::OUString("f-5"))); + multi.get())->fn32(OUString("f-5"))); checkEqual( - rtl::OUString("32" "f-5"), + OUString("32" "f-5"), css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >( multi, css::uno::UNO_QUERY_THROW)->fn32( - rtl::OUString("f-5"))); + OUString("f-5"))); checkEqual< sal_Int32 >( 33, css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >( @@ -217,17 +217,17 @@ rtl::OUString testMulti( checkEqual< sal_Int32 >(41 * 4, multi->fn41(4)); checkEqual< sal_Int32 >(61 * 6, multi->fn61(6)); checkEqual( - rtl::OUString("62" ""), - multi->fn62(rtl::OUString())); + OUString("62" ""), + multi->fn62(OUString())); checkEqual< sal_Int32 >(71 * 7, multi->fn71(7)); checkEqual( - rtl::OUString("72" "g"), - multi->fn72(rtl::OUString("g"))); + OUString("72" "g"), + multi->fn72(OUString("g"))); checkEqual< sal_Int32 >(73, multi->fn73()); } catch (CheckFailed const & f) { return f.message; } - return rtl::OUString(); + return OUString(); } } } diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx index 81f82af25fd5..eee17fdb4825 100644 --- a/testtools/source/bridgetest/multi.hxx +++ b/testtools/source/bridgetest/multi.hxx @@ -48,17 +48,17 @@ public: throw (com::sun::star::uno::RuntimeException) { return 11 * arg; } - virtual rtl::OUString SAL_CALL fn12(rtl::OUString const & arg) + virtual OUString SAL_CALL fn12(OUString const & arg) throw (com::sun::star::uno::RuntimeException) - { return rtl::OUString("12") + arg; } + { return OUString("12") + arg; } virtual sal_Int32 SAL_CALL fn21(sal_Int32 arg) throw (com::sun::star::uno::RuntimeException) { return 21 * arg; } - virtual rtl::OUString SAL_CALL fn22(rtl::OUString const & arg) + virtual OUString SAL_CALL fn22(OUString const & arg) throw (com::sun::star::uno::RuntimeException) - { return rtl::OUString("22") + arg; } + { return OUString("22") + arg; } virtual double SAL_CALL getatt3() throw (com::sun::star::uno::RuntimeException) @@ -72,9 +72,9 @@ public: throw (com::sun::star::uno::RuntimeException) { return 31 * arg; } - virtual rtl::OUString SAL_CALL fn32(rtl::OUString const & arg) + virtual OUString SAL_CALL fn32(OUString const & arg) throw (com::sun::star::uno::RuntimeException) - { return rtl::OUString("32") + arg; } + { return OUString("32") + arg; } virtual sal_Int32 SAL_CALL fn33() throw (com::sun::star::uno::RuntimeException) @@ -88,17 +88,17 @@ public: throw (com::sun::star::uno::RuntimeException) { return 61 * arg; } - virtual rtl::OUString SAL_CALL fn62(rtl::OUString const & arg) + virtual OUString SAL_CALL fn62(OUString const & arg) throw (com::sun::star::uno::RuntimeException) - { return rtl::OUString("62") + arg; } + { return OUString("62") + arg; } virtual sal_Int32 SAL_CALL fn71(sal_Int32 arg) throw (com::sun::star::uno::RuntimeException) { return 71 * arg; } - virtual rtl::OUString SAL_CALL fn72(rtl::OUString const & arg) + virtual OUString SAL_CALL fn72(OUString const & arg) throw (com::sun::star::uno::RuntimeException) - { return rtl::OUString("72") + arg; } + { return OUString("72") + arg; } virtual sal_Int32 SAL_CALL fn73() throw (com::sun::star::uno::RuntimeException) @@ -109,7 +109,7 @@ private: double m_attribute3; }; -rtl::OUString testMulti( +OUString testMulti( com::sun::star::uno::Reference< test::testtools::bridgetest::XMulti > const & multi); diff --git a/testtools/source/performance/pseudo.cxx b/testtools/source/performance/pseudo.cxx index c107f2aa7b44..3c5d35ccbf67 100644 --- a/testtools/source/performance/pseudo.cxx +++ b/testtools/source/performance/pseudo.cxx @@ -26,7 +26,6 @@ #include #include -using ::rtl::OUString; namespace pseudo_uno { diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx index 67ae10181137..6e904ccf2939 100644 --- a/testtools/source/performance/ubobject.cxx +++ b/testtools/source/performance/ubobject.cxx @@ -36,7 +36,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace com::sun::star::test::performance; -using ::rtl::OUString; #define SERVICENAME "com.sun.star.test.performance.PerformanceTestObject" #define IMPLNAME "com.sun.star.comp.performance.PerformanceTestObject" @@ -123,7 +122,7 @@ public: {} virtual OUString SAL_CALL getString_attr() throw(::com::sun::star::uno::RuntimeException) { return _aDummyString; } - virtual void SAL_CALL setString_attr( const ::rtl::OUString& _attributestring ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setString_attr( const OUString& _attributestring ) throw(::com::sun::star::uno::RuntimeException) {} virtual Reference< XInterface > SAL_CALL getInterface_attr() throw(::com::sun::star::uno::RuntimeException) { return Reference< XInterface >(); } @@ -161,7 +160,7 @@ public: {} virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException) { return _aDummyString; } - virtual void SAL_CALL setString( const ::rtl::OUString& _string ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setString( const OUString& _string ) throw(::com::sun::star::uno::RuntimeException) {} virtual Reference< XInterface > SAL_CALL getInterface() throw(::com::sun::star::uno::RuntimeException) { return Reference< XInterface >(); } diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index 5d02eeee0d60..9c1413f5bdb9 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -71,9 +71,6 @@ using namespace com::sun::star::bridge; using namespace com::sun::star::container; using namespace com::sun::star::test::performance; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; #define SERVICENAME "com.sun.star.test.performance.PerformanceTest" #define IMPLNAME "com.sun.star.comp.performance.PerformanceTest" diff --git a/toolkit/inc/toolkit/awt/animatedimagespeer.hxx b/toolkit/inc/toolkit/awt/animatedimagespeer.hxx index 8606c1293508..9e22d41a948b 100644 --- a/toolkit/inc/toolkit/awt/animatedimagespeer.hxx +++ b/toolkit/inc/toolkit/awt/animatedimagespeer.hxx @@ -61,8 +61,8 @@ namespace toolkit virtual ::sal_Bool SAL_CALL isAnimationRunning( ) throw (::com::sun::star::uno::RuntimeException); // VclWindowPeer - virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // XContainerListener virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx index 7d5f10e81093..379dbb5b7c8a 100644 --- a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx @@ -93,9 +93,9 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::accessibility::XAccessibleContext sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); @@ -103,8 +103,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -118,8 +118,8 @@ public: // ::com::sun::star::accessibility::XAccessibleExtendedComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); protected: // base class overridables diff --git a/toolkit/inc/toolkit/awt/vclxcontainer.hxx b/toolkit/inc/toolkit/awt/vclxcontainer.hxx index eda253106282..0b4b0be97127 100644 --- a/toolkit/inc/toolkit/awt/vclxcontainer.hxx +++ b/toolkit/inc/toolkit/awt/vclxcontainer.hxx @@ -62,7 +62,7 @@ public: void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Windows ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } diff --git a/toolkit/inc/toolkit/awt/vclxfont.hxx b/toolkit/inc/toolkit/awt/vclxfont.hxx index e1815593773c..bb385f223ef6 100644 --- a/toolkit/inc/toolkit/awt/vclxfont.hxx +++ b/toolkit/inc/toolkit/awt/vclxfont.hxx @@ -74,12 +74,12 @@ public: ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric( ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getStringWidth( const ::rtl::OUString& str ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getStringWidthArray( const ::rtl::OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL getStringWidth( const OUString& str ) throw(::com::sun::star::uno::RuntimeException); + sal_Int32 SAL_CALL getStringWidthArray( const OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars1, ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars2, ::com::sun::star::uno::Sequence< sal_Int16 >& rnKerns ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XFont2 - sal_Bool SAL_CALL hasGlyphs( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); + sal_Bool SAL_CALL hasGlyphs( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/toolkit/awt/vclxgraphics.hxx index 2db78ef9f624..a99e19fcd940 100644 --- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx +++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx @@ -118,8 +118,8 @@ public: void SAL_CALL drawPie( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int32 X1, sal_Int32 Y1, sal_Int32 X2, sal_Int32 Y2 ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL drawChord( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL drawGradient( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 Height, const ::com::sun::star::awt::Gradient& aGradient ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawText( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL drawTextArray( sal_Int32 X, sal_Int32 Y, const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< sal_Int32 >& Longs ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawText( sal_Int32 X, sal_Int32 Y, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL drawTextArray( sal_Int32 X, sal_Int32 Y, const OUString& Text, const ::com::sun::star::uno::Sequence< sal_Int32 >& Longs ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx index ba8e1764c261..495e8982ba94 100644 --- a/toolkit/inc/toolkit/awt/vclxmenu.hxx +++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx @@ -93,15 +93,15 @@ public: // ::com::sun::star::awt::XMenu void SAL_CALL addMenuListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeMenuListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL insertItem( sal_Int16 nItemId, const ::rtl::OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL insertItem( sal_Int16 nItemId, const OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeItem( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getItemId( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getItemPos( sal_Int16 nId ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL enableItem( sal_Int16 nItemId, sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isItemEnabled( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setItemText( sal_Int16 nItemId, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getItemText( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setItemText( sal_Int16 nItemId, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getItemText( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& aPopupMenu ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > SAL_CALL getPopupMenu( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException); @@ -116,10 +116,10 @@ public: // ::com::sun::star::awt::XMenuBar // ::com::sun::star::awt::XMenuExtended - virtual void SAL_CALL setCommand( sal_Int16 nItemId, const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpCommand( sal_Int16 nItemId, const ::rtl::OUString& aHelp ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getHelpCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCommand( sal_Int16 nItemId, const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpCommand( sal_Int16 nItemId, const OUString& aHelp ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHelpCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException); // ======================================================================== // ======================================================================== @@ -141,10 +141,10 @@ public: virtual void SAL_CALL enableAutoMnemonics( ::sal_Bool bEnable ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const ::com::sun::star::awt::KeyEvent& aKeyEvent ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::KeyEvent SAL_CALL getAcceleratorKeyEvent( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sHelpText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sTipHelpText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const OUString& sHelpText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const OUString& sTipHelpText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setItemImage( ::sal_Int16 nItemId, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic, ::sal_Bool bScale ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getItemImage( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setItemImageAngle( ::sal_Int16 nItemId, ::sal_Int32 nAngle ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -153,9 +153,9 @@ public: virtual ::sal_Bool SAL_CALL isItemImageInMirrorMode( ::sal_Int16 nItemId ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/toolkit/inc/toolkit/awt/vclxprinter.hxx b/toolkit/inc/toolkit/awt/vclxprinter.hxx index 87b5bc7532bf..ca14b2d35f67 100644 --- a/toolkit/inc/toolkit/awt/vclxprinter.hxx +++ b/toolkit/inc/toolkit/awt/vclxprinter.hxx @@ -74,12 +74,12 @@ public: // ::com::sun::star::beans::XPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); } - ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return OPropertySetHelper::getPropertyValue( rPropertyName ); } - void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); } + ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return OPropertySetHelper::getPropertyValue( rPropertyName ); } + void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); } // ::cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -90,8 +90,8 @@ public: // ::com::sun::star::awt::XPrinterPropertySet void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL selectForm( const ::rtl::OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); }; @@ -122,22 +122,22 @@ public: // ::com::sun::star::beans::XPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertySetInfo(); } - void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } - ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } - void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } + ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } + void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } // ::com::sun::star::awt::XPrinterPropertySet void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getFormDescriptions(); } - void SAL_CALL selectForm( const ::rtl::OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::selectForm( aFormDescription ); } + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getFormDescriptions(); } + void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::selectForm( aFormDescription ); } ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getBinarySetup(); } void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setBinarySetup( data ); } // ::com::sun::star::awt::XPrinter - sal_Bool SAL_CALL start( const ::rtl::OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + sal_Bool SAL_CALL start( const OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); void SAL_CALL end( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException); void SAL_CALL terminate( ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL startPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException); @@ -168,17 +168,17 @@ public: // ::com::sun::star::beans::XPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertySetInfo(); } - void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } - ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } - void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } - void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } - void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } + ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } + void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } + void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } + void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } // ::com::sun::star::awt::XPrinterPropertySet void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getFormDescriptions(); } - void SAL_CALL selectForm( const ::rtl::OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::selectForm( aFormDescription ); } + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getFormDescriptions(); } + void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::selectForm( aFormDescription ); } ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getBinarySetup(); } void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setBinarySetup( data ); } @@ -206,9 +206,9 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XPrinterServer - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > SAL_CALL createPrinter( const ::rtl::OUString& printerName ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const ::rtl::OUString& printerName ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > SAL_CALL createPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/toolkit/inc/toolkit/awt/vclxspinbutton.hxx b/toolkit/inc/toolkit/awt/vclxspinbutton.hxx index d37348b0a15a..f1abf21f77f2 100644 --- a/toolkit/inc/toolkit/awt/vclxspinbutton.hxx +++ b/toolkit/inc/toolkit/awt/vclxspinbutton.hxx @@ -73,8 +73,8 @@ namespace toolkit virtual sal_Int32 SAL_CALL getOrientation( ) throw (::com::sun::star::uno::RuntimeException); // VclWindowPeer - virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // VCLXWindow void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ); diff --git a/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx b/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx index 37438abbd235..af55ed3d6ab4 100644 --- a/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx +++ b/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx @@ -69,7 +69,7 @@ public: virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); protected: virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); private: diff --git a/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx b/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx index 2e202ed2b5c8..091c5592a765 100644 --- a/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx +++ b/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx @@ -53,18 +53,18 @@ public: // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::tab::XTabPageModel virtual ::sal_Int16 SAL_CALL getTabPageID() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getEnabled() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setImageURL( const ::rtl::OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTip() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setToolTip( const ::rtl::OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getToolTip() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException); protected: ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); }; diff --git a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx index 7b00b6e283bc..00045968ac27 100644 --- a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx +++ b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx @@ -126,18 +126,18 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL createSystemChild( const ::com::sun::star::uno::Any& Parent, const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XMessageBoxFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL createMessageBox( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, const ::com::sun::star::awt::Rectangle& aPosSize, const ::rtl::OUString& aType, ::sal_Int32 aButtons, const ::rtl::OUString& aTitle, const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL createMessageBox( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, const ::com::sun::star::awt::Rectangle& aPosSize, const OUString& aType, ::sal_Int32 aButtons, const OUString& aTitle, const OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XDataTransfer ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL getDragGestureRecognizer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > SAL_CALL getDragSource( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > SAL_CALL getDropTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const ::rtl::OUString& clipboardName ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& clipboardName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XExtendedToolkit: diff --git a/toolkit/inc/toolkit/awt/vclxwindow.hxx b/toolkit/inc/toolkit/awt/vclxwindow.hxx index 390c06acf247..7e415f21a8fd 100644 --- a/toolkit/inc/toolkit/awt/vclxwindow.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindow.hxx @@ -183,8 +183,8 @@ public: void SAL_CALL setForeground( sal_Int32 Color ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setControlFont( const ::com::sun::star::awt::FontDescriptor& aFont ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XLayoutConstrains ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException); @@ -223,8 +223,8 @@ public: // ::com::sun::star::beans::XPropertySetInfo ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException); // XStyleSettingsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index 5871700350bc..f822b0cc0e33 100644 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx @@ -121,8 +121,8 @@ protected: void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); protected: /** forward our bitmap to our window @@ -150,7 +150,7 @@ typedef ::cppu::ImplInheritanceHelper2 < VCLXGraphicControl class VCLXButton :public VCLXButton_Base { private: - ::rtl::OUString maActionCommand; + OUString maActionCommand; ActionListenerMultiplexer maActionListeners; ItemListenerMultiplexer maItemListeners; @@ -168,8 +168,8 @@ public: // ::com::sun::star::awt::XButton void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setLabel( const ::rtl::OUString& Label ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setActionCommand( const ::rtl::OUString& Command ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XToggleButton // ::com::sun::star::awt::XItemEventBroadcaster @@ -182,8 +182,8 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -204,8 +204,8 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -223,7 +223,7 @@ class VCLXCheckBox : public ::com::sun::star::awt::XCheckBox, { private: ActionListenerMultiplexer maActionListeners; - ::rtl::OUString maActionCommand; + OUString maActionCommand; ItemListenerMultiplexer maItemListeners; protected: @@ -251,13 +251,13 @@ public: void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setState( sal_Int16 n ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setLabel( const ::rtl::OUString& Label ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XButton: void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setActionCommand( const ::rtl::OUString& Command ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XLayoutConstrains ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException); @@ -265,8 +265,8 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -282,7 +282,7 @@ class VCLXRadioButton : public ::com::sun::star::awt::XRadioButton, private: ItemListenerMultiplexer maItemListeners; ActionListenerMultiplexer maActionListeners; - ::rtl::OUString maActionCommand; + OUString maActionCommand; protected: void ImplClickedOrToggled( sal_Bool bToggled ); @@ -309,12 +309,12 @@ public: void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setLabel( const ::rtl::OUString& Label ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XButton: void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setActionCommand( const ::rtl::OUString& Command ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XLayoutConstrains ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException); @@ -322,8 +322,8 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -351,10 +351,10 @@ public: // ::com::sun::star::awt::XMessageBox - void SAL_CALL setCaptionText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getCaptionText( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setMessageText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getMessageText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setCaptionText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getCaptionText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setMessageText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getMessageText( ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XLayoutConstrains @@ -392,7 +392,7 @@ public: ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -421,11 +421,11 @@ public: // ::com::sun::star::awt::XDialog2 virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpId( const rtl::OUString& Id ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpId( const OUString& Id ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XDialog - void SAL_CALL setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getTitle( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setTitle( const OUString& Title ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getTitle( ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL endExecute( ) throw(::com::sun::star::uno::RuntimeException); @@ -439,7 +439,7 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); }; @@ -468,7 +468,7 @@ public: ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); TabPage* getTabPage() const throw ( ::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); @@ -504,8 +504,8 @@ public: ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // XSimpleTabController virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -520,7 +520,7 @@ public: virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); // C++ TabControl* getTabControl() const throw ( ::com::sun::star::uno::RuntimeException); - sal_uInt16 insertTab( TabPage*, rtl::OUString& sTitle ); + sal_uInt16 insertTab( TabPage*, OUString& sTitle ); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; @@ -558,10 +558,10 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XFixedHyperlink - void SAL_CALL setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setURL( const ::rtl::OUString& URL ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getURL( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -573,8 +573,8 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -603,8 +603,8 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XFixedText - void SAL_CALL setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException); @@ -667,8 +667,8 @@ public: sal_Int32 SAL_CALL getMinimum( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XLayoutConstrains ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException); @@ -715,10 +715,10 @@ public: // ::com::sun::star::awt::XTextComponent void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException); @@ -739,8 +739,8 @@ public: void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -777,19 +777,19 @@ public: void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getSelectedItemPos( ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getSelectedItem( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedItems( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getSelectedItem( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL selectItem( const ::rtl::OUString& aItem, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isMutipleMode( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException); @@ -806,8 +806,8 @@ public: void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // XItemListListener virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException); @@ -852,12 +852,12 @@ public: void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException); @@ -871,8 +871,8 @@ public: void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); // XItemListListener virtual void SAL_CALL listItemInserted( const ::com::sun::star::awt::ItemListEvent& Event ) throw (::com::sun::star::uno::RuntimeException); @@ -946,8 +946,8 @@ public: sal_Bool isStrictFormat(); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -992,8 +992,8 @@ public: sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -1035,8 +1035,8 @@ public: sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -1080,8 +1080,8 @@ public: sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -1132,8 +1132,8 @@ public: virtual ::sal_Bool SAL_CALL isStrictFormat( ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -1178,8 +1178,8 @@ public: sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -1206,16 +1206,16 @@ public: // ::com::sun::star::awt::XPatternField - void SAL_CALL setMasks( const ::rtl::OUString& EditMask, const ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL getMasks( ::rtl::OUString& EditMask, ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setString( const ::rtl::OUString& Str ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getString( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getString( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::VclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } diff --git a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx b/toolkit/inc/toolkit/awt/xsimpleanimation.hxx index c6424695f7ec..3ab8499d63fc 100644 --- a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx +++ b/toolkit/inc/toolkit/awt/xsimpleanimation.hxx @@ -53,8 +53,8 @@ namespace toolkit virtual void SAL_CALL setImageList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& ImageList ) throw (::com::sun::star::uno::RuntimeException); // VclWindowPeer - virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); private: XSimpleAnimation( const XSimpleAnimation& ); // never implemented diff --git a/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx b/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx index 22ceb0edeb73..dedc5bcd842d 100644 --- a/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx +++ b/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx @@ -92,8 +92,8 @@ namespace toolkit virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); @@ -110,7 +110,7 @@ namespace toolkit private: // retrieves the value of a string property from the model, if the property is present - ::rtl::OUString getModelStringProperty( const sal_Char* _pPropertyName ) SAL_THROW( ( ) ); + OUString getModelStringProperty( const sal_Char* _pPropertyName ) SAL_THROW( ( ) ); // starts listening at the control model (currently for disposal only) void startModelListening( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); diff --git a/toolkit/inc/toolkit/controls/animatedimages.hxx b/toolkit/inc/toolkit/controls/animatedimages.hxx index 1ae4718ab3e5..dd0757a3e5a1 100644 --- a/toolkit/inc/toolkit/controls/animatedimages.hxx +++ b/toolkit/inc/toolkit/controls/animatedimages.hxx @@ -50,7 +50,7 @@ namespace toolkit { public: AnimatedImagesControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // XAnimation virtual void SAL_CALL startAnimation( ) throw (::com::sun::star::uno::RuntimeException); @@ -58,8 +58,8 @@ namespace toolkit virtual ::sal_Bool SAL_CALL isAnimationRunning( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XControl sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& i_rModel ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -94,11 +94,11 @@ namespace toolkit ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XAnimatedImages virtual ::sal_Int32 SAL_CALL getStepTime() throw (::com::sun::star::uno::RuntimeException); @@ -108,9 +108,9 @@ namespace toolkit virtual ::sal_Int16 SAL_CALL getScaleMode() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getImageSetCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getImageSet( ::sal_Int32 i_index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertImageSet( ::sal_Int32 i_index, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& i_imageURLs ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL replaceImageSet( ::sal_Int32 i_index, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& i_imageURLs ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getImageSet( ::sal_Int32 i_index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertImageSet( ::sal_Int32 i_index, const ::com::sun::star::uno::Sequence< OUString >& i_imageURLs ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceImageSet( ::sal_Int32 i_index, const ::com::sun::star::uno::Sequence< OUString >& i_imageURLs ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeImageSet( ::sal_Int32 i_index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XAnimatedImages::XContainer diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx index 84063b71245c..e84ddd1f0380 100644 --- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx +++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx @@ -61,7 +61,7 @@ public: enum ChildOperation { Insert = 0, Remove }; // would like to make this typedef private, too, but the Forte 7 compiler does have // problems with this ..... - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >, ::rtl::OUString > + typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >, OUString > UnoControlModelHolder; private: typedef ::std::list< UnoControlModelHolder > UnoControlModelHolderList; @@ -85,9 +85,9 @@ protected: sal_Bool mbGroupsUpToDate; bool m_bEnabled; - ::rtl::OUString m_sTitle; - ::rtl::OUString m_sImageURL; - ::rtl::OUString m_sTooltip; + OUString m_sTitle; + OUString m_sImageURL; + OUString m_sTooltip; sal_Int16 m_nTabPageId; void Clone_Impl(ControlModelContainerBase& _rClone) const; @@ -95,9 +95,9 @@ protected: ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - UnoControlModelHolderList::iterator ImplFindElement( const ::rtl::OUString& rName ); + UnoControlModelHolderList::iterator ImplFindElement( const OUString& rName ); - void updateUserFormChildren( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAllChildren, const rtl::OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void updateUserFormChildren( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: ControlModelContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ControlModelContainerBase( const ControlModelContainerBase& rModel ); @@ -114,20 +114,20 @@ public: sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess - void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XMultiServiceFactory - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -137,10 +137,10 @@ public: virtual void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const ::rtl::OUString& GroupName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getGroupCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL getGroupByName( const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, OUString& Name ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL getGroupByName( const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw (::com::sun::star::uno::RuntimeException); // XChangesNotifier virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -164,18 +164,18 @@ public: virtual ::sal_Int16 SAL_CALL getTabPageID() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getEnabled() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setImageURL( const ::rtl::OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTip() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setToolTip( const ::rtl::OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImageURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getToolTip() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException); protected: void startControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel ); void stopControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel ); - void implNotifyTabModelChange( const ::rtl::OUString& _rAccessor ); + void implNotifyTabModelChange( const OUString& _rAccessor ); void implUpdateGroupStructure(); }; @@ -224,7 +224,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > mxTabController; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxListener; - void ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const ::rtl::OUString& rName ); + void ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const OUString& rName ); void ImplRemoveControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel ); virtual void ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl ); void ImplUpdateResourceResolver(); diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx index b9861b50dbf6..e8b95647c80f 100644 --- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx +++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx @@ -55,7 +55,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlDialogModel, ControlModelContainerBase, szServiceName2_UnoControlDialogModel ) @@ -78,7 +78,7 @@ public: UnoDialogControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ~UnoDialogControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); @@ -99,11 +99,11 @@ public: // ::com::sun::star::awt::XDialog2 virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpId( const rtl::OUString& Id ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpId( const OUString& Id ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XDialog - void SAL_CALL setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getTitle() throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setTitle( const OUString& Title ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getTitle() throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL execute() throw(::com::sun::star::uno::RuntimeException); void SAL_CALL endExecute() throw(::com::sun::star::uno::RuntimeException); @@ -133,10 +133,10 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, ControlModelContainerBase, szServiceName_UnoMultiPageModel ) - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException); // XNamedContainer - void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // Override the method of parent Class virtual sal_Bool SAL_CALL getGroupControl( ) throw (::com::sun::star::uno::RuntimeException); @@ -155,7 +155,7 @@ class UnoMultiPageControl : public ControlContainerBase public: UnoMultiPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ~UnoMultiPageControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, ControlContainerBase, szServiceName_UnoMultiPageControl ) @@ -208,7 +208,7 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, ControlModelContainerBase, szServiceName_UnoPageModel ) - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException); // Override the method of parent Class @@ -224,7 +224,7 @@ class UnoPageControl : public ControlContainerBase public: UnoPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ~UnoPageControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // ::com::sun::star::lang::XServiceInfo @@ -242,7 +242,7 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, ControlModelContainerBase, szServiceName_UnoFrameModel ) - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException); protected: @@ -257,7 +257,7 @@ protected: public: UnoFrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ~UnoFrameControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, szServiceName_UnoPageControl ) diff --git a/toolkit/inc/toolkit/controls/eventcontainer.hxx b/toolkit/inc/toolkit/controls/eventcontainer.hxx index 24684fba4f1d..800ccdf35646 100644 --- a/toolkit/inc/toolkit/controls/eventcontainer.hxx +++ b/toolkit/inc/toolkit/controls/eventcontainer.hxx @@ -36,7 +36,7 @@ namespace toolkit // Hashtable to optimize struct hashName_Impl { - size_t operator()(const ::rtl::OUString Str) const + size_t operator()(const OUString Str) const { return (size_t)Str.hashCode(); } @@ -44,7 +44,7 @@ struct hashName_Impl struct eqName_Impl { - sal_Bool operator()(const ::rtl::OUString Str1, const ::rtl::OUString Str2) const + sal_Bool operator()(const OUString Str1, const OUString Str2) const { return ( Str1 == Str2 ); } @@ -52,7 +52,7 @@ struct eqName_Impl typedef boost::unordered_map < - ::rtl::OUString, + OUString, sal_Int32, hashName_Impl, eqName_Impl @@ -63,7 +63,7 @@ NameContainerNameMap; class NameContainer_Impl : public NameContainerHelper { NameContainerNameMap mHashMap; - ::com::sun::star::uno::Sequence< ::rtl::OUString > mNames; + ::com::sun::star::uno::Sequence< OUString > mNames; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > mValues; sal_Int32 mnElementCount; ::com::sun::star::uno::Type mType; @@ -85,29 +85,29 @@ public: throw(::com::sun::star::uno::RuntimeException); // Methods XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // Methods XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // Methods XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/formattedcontrol.hxx b/toolkit/inc/toolkit/controls/formattedcontrol.hxx index 53a6230b0f87..ff5c5de51618 100644 --- a/toolkit/inc/toolkit/controls/formattedcontrol.hxx +++ b/toolkit/inc/toolkit/controls/formattedcontrol.hxx @@ -68,7 +68,7 @@ namespace toolkit UnoControlModel* Clone() const { return new UnoControlFormattedFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -84,7 +84,7 @@ namespace toolkit void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet - void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // UnoControlModel virtual void ImplNormalizePropertySequence( @@ -106,7 +106,7 @@ namespace toolkit { public: UnoFormattedFieldControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // ::com::sun::star::awt::XTextListener void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx index 94701773d42b..2ed98907f796 100644 --- a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx @@ -71,10 +71,10 @@ namespace com { namespace sun { namespace star { sal_Int32 m_nPosY; sal_Int32 m_nWidth; sal_Int32 m_nHeight; - ::rtl::OUString m_aName; + OUString m_aName; sal_Int16 m_nTabIndex; sal_Int32 m_nStep; - ::rtl::OUString m_aTag; + OUString m_aTag; ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > m_xStrResolver; // @@ -217,7 +217,7 @@ namespace com { namespace sun { namespace star { ,public ::comphelper::OIdPropertyArrayUsageHelper< OCommonGeometryControlModel > { private: - ::rtl::OUString m_sServiceSpecifier; // the service specifier of our aggregate + OUString m_sServiceSpecifier; // the service specifier of our aggregate sal_Int32 m_nPropertyMapId; // our unique property info id, used to look up in s_aAggregateProperties public: @@ -229,7 +229,7 @@ namespace com { namespace sun { namespace star { */ OCommonGeometryControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAgg, - const ::rtl::OUString& _rxServiceSpecifier + const OUString& _rxServiceSpecifier ); // OIdPropertyArrayUsageHelper overridables diff --git a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx index ca55be0c256a..1149f00e3056 100644 --- a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx +++ b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx @@ -115,7 +115,7 @@ namespace toolkit // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, szServiceName2_UnoControlRoadmapModel ) @@ -160,7 +160,7 @@ namespace toolkit ItemListenerMultiplexer maItemListeners; public: UnoRoadmapControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); } diff --git a/toolkit/inc/toolkit/controls/roadmapentry.hxx b/toolkit/inc/toolkit/controls/roadmapentry.hxx index e0f6a99dc0fa..d6a7a25be877 100644 --- a/toolkit/inc/toolkit/controls/roadmapentry.hxx +++ b/toolkit/inc/toolkit/controls/roadmapentry.hxx @@ -59,9 +59,9 @@ protected: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // other stuff @@ -70,7 +70,7 @@ protected: protected: // - ::rtl::OUString m_sLabel; + OUString m_sLabel; sal_Int32 m_nID; sal_Bool m_bEnabled; sal_Bool m_bInteractive; diff --git a/toolkit/inc/toolkit/controls/spinningprogress.hxx b/toolkit/inc/toolkit/controls/spinningprogress.hxx index 7db479852406..819749e0f28e 100644 --- a/toolkit/inc/toolkit/controls/spinningprogress.hxx +++ b/toolkit/inc/toolkit/controls/spinningprogress.hxx @@ -43,11 +43,11 @@ namespace toolkit ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); protected: ~SpinningProgressControlModel(); diff --git a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx index 7a7770b3b30f..06134170e556 100644 --- a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx +++ b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx @@ -42,14 +42,14 @@ class UnoControlModelEntryList { private: UnoControlModelEntryListBase maList; - ::rtl::OUString maGroupName; + OUString maGroupName; public: UnoControlModelEntryList(); ~UnoControlModelEntryList(); - const ::rtl::OUString& GetName() const { return maGroupName; } - void SetName( const ::rtl::OUString& rName ) { maGroupName = rName; } + const OUString& GetName() const { return maGroupName; } + void SetName( const OUString& rName ) { maGroupName = rName; } void Reset(); void DestroyEntry( size_t nEntry ); @@ -117,13 +117,13 @@ public: void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const ::rtl::OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException); sal_Int32 SAL_CALL getGroupCount( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, ::rtl::OUString& Name ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL getGroupByName( const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, OUString& Name ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL getGroupByName( const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx index 50288a083f35..622da638f851 100644 --- a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx +++ b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx @@ -62,14 +62,14 @@ public: UnoControlModel* Clone() const { return new UnoControlTabPageContainerModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainerModel, UnoControlModel, szServiceName_UnoControlTabPageContainerModel ) // XTabPageContainerModel virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > SAL_CALL createTabPage( ::sal_Int16 TabPageID ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > SAL_CALL loadTabPage( ::sal_Int16 TabPageID, const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageModel > SAL_CALL loadTabPage( ::sal_Int16 TabPageID, const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException); // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) @@ -105,7 +105,7 @@ class UnoControlTabPageContainer : public UnoControlTabPageContainer_Base { public: UnoControlTabPageContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -123,7 +123,7 @@ public: virtual void SAL_CALL addTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeTabPageContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addControl( const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addControl( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainer, UnoControlBase, szServiceName_UnoControlTabPageContainer ) diff --git a/toolkit/inc/toolkit/controls/tabpagemodel.hxx b/toolkit/inc/toolkit/controls/tabpagemodel.hxx index 73cd566e3985..63684751fe4d 100644 --- a/toolkit/inc/toolkit/controls/tabpagemodel.hxx +++ b/toolkit/inc/toolkit/controls/tabpagemodel.hxx @@ -41,7 +41,7 @@ public: UnoControlTabPageModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_factory); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -69,7 +69,7 @@ public: UnoControlTabPage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); ~UnoControlTabPage(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/tkscrollbar.hxx b/toolkit/inc/toolkit/controls/tkscrollbar.hxx index 3ed68ff86af1..b6e59119b2f1 100644 --- a/toolkit/inc/toolkit/controls/tkscrollbar.hxx +++ b/toolkit/inc/toolkit/controls/tkscrollbar.hxx @@ -51,7 +51,7 @@ namespace toolkit ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlScrollBarModel, UnoControlModel, szServiceName2_UnoControlScrollBarModel ) @@ -69,7 +69,7 @@ namespace toolkit public: UnoScrollBarControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); } ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx index 368922e780ca..8604097567c3 100644 --- a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx +++ b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx @@ -52,11 +52,11 @@ namespace toolkit ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; //==================================================================== @@ -73,7 +73,7 @@ namespace toolkit public: UnoSimpleAnimationControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // XSimpleAnimation virtual void SAL_CALL start() throw (::com::sun::star::uno::RuntimeException); @@ -82,8 +82,8 @@ namespace toolkit throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; //........................................................................ diff --git a/toolkit/inc/toolkit/controls/tkspinbutton.hxx b/toolkit/inc/toolkit/controls/tkspinbutton.hxx index 44da1f76fd4a..ff134d292a98 100644 --- a/toolkit/inc/toolkit/controls/tkspinbutton.hxx +++ b/toolkit/inc/toolkit/controls/tkspinbutton.hxx @@ -52,11 +52,11 @@ namespace toolkit ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; //==================================================================== @@ -75,7 +75,7 @@ namespace toolkit public: UnoSpinButtonControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); DECLARE_UNO3_AGG_DEFAULTS( UnoSpinButtonControl, UnoControlBase ); ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -106,8 +106,8 @@ namespace toolkit virtual sal_Int32 SAL_CALL getOrientation( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/toolkit/inc/toolkit/controls/tkthrobber.hxx b/toolkit/inc/toolkit/controls/tkthrobber.hxx index 379e3b459674..24868600aaaf 100644 --- a/toolkit/inc/toolkit/controls/tkthrobber.hxx +++ b/toolkit/inc/toolkit/controls/tkthrobber.hxx @@ -52,11 +52,11 @@ namespace toolkit ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; //==================================================================== @@ -73,7 +73,7 @@ namespace toolkit public: UnoThrobberControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); DECLARE_UNO3_AGG_DEFAULTS( UnoThrobberControl, UnoControlBase ); ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -90,8 +90,8 @@ namespace toolkit virtual void SAL_CALL stop() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; //........................................................................ diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx index fae1c005853b..df5806be7e49 100644 --- a/toolkit/inc/toolkit/controls/unocontrol.hxx +++ b/toolkit/inc/toolkit/controls/unocontrol.hxx @@ -116,14 +116,14 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParentPeer() const; virtual void updateFromModel(); void peerCreated(); - bool ImplCheckLocalize( ::rtl::OUString& _rPossiblyLocalizable ); + bool ImplCheckLocalize( OUString& _rPossiblyLocalizable ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer ); - virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ); virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ); - void ImplLockPropertyChangeNotification( const ::rtl::OUString& rPropertyName, bool bLock ); - void ImplLockPropertyChangeNotifications( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames, bool bLock ); + void ImplLockPropertyChangeNotification( const OUString& rPropertyName, bool bLock ); + void ImplLockPropertyChangeNotifications( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, bool bLock ); void disposeAccessibleContext(); @@ -133,7 +133,7 @@ protected: mxVclWindowPeer = ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >(mxPeer,::com::sun::star::uno::UNO_QUERY); // just to avoid the query_interface thing } - virtual sal_Bool requiresNewPeer( const ::rtl::OUString& _rPropertyName ) const; + virtual sal_Bool requiresNewPeer( const OUString& _rPropertyName ) const; public: UnoControl(); @@ -142,7 +142,7 @@ public: UnoControlComponentInfos& GetComponentInfos() { return maComponentInfos; } - virtual ::rtl::OUString GetComponentServiceName(); + virtual OUString GetComponentServiceName(); // ::com::sun::star::lang::XTypeProvider ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); @@ -202,9 +202,9 @@ public: sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx b/toolkit/inc/toolkit/controls/unocontrolbase.hxx index bf539ed7384b..30f1bf664206 100644 --- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolbase.hxx @@ -34,16 +34,16 @@ protected: UnoControlBase() :UnoControl() {} sal_Bool ImplHasProperty( sal_uInt16 nProp ); - sal_Bool ImplHasProperty( const ::rtl::OUString& aPropertyName ); - void ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis ); - void ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis ); - ::com::sun::star::uno::Any ImplGetPropertyValue( const ::rtl::OUString& aPropertyName ); + sal_Bool ImplHasProperty( const OUString& aPropertyName ); + void ImplSetPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis ); + void ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis ); + ::com::sun::star::uno::Any ImplGetPropertyValue( const OUString& aPropertyName ); sal_Bool ImplGetPropertyValue_BOOL( sal_uInt16 nProp ); sal_Int16 ImplGetPropertyValue_INT16( sal_uInt16 nProp ); sal_Int32 ImplGetPropertyValue_INT32( sal_uInt16 nProp ); double ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp ); - ::rtl::OUString ImplGetPropertyValue_UString( sal_uInt16 nProp ); + OUString ImplGetPropertyValue_UString( sal_uInt16 nProp ); // XLayoutConstrains (nur wenn das Control es unterstuetzt!) ::com::sun::star::awt::Size Impl_getMinimumSize(); diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx index ac621817f75c..d4595459dfaf 100644 --- a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx @@ -87,10 +87,10 @@ public: virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XControlContainer - void SAL_CALL setStatusText( const ::rtl::OUString& StatusText ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setStatusText( const OUString& StatusText ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL addControl( const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL addControl( const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& Control ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XUnoControlContainer @@ -132,7 +132,7 @@ private: */ sal_Int32 impl_addControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, - const ::rtl::OUString* _pName = NULL + const OUString* _pName = NULL ); /** removes the given control from the container, including necessary notifications and the like @@ -148,7 +148,7 @@ private: void impl_removeControl( sal_Int32 _nId, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, - const ::rtl::OUString* _pNameAccessor + const OUString* _pNameAccessor ); }; diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx index b8f8bd222c0f..bd5802c3993b 100644 --- a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx @@ -46,7 +46,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlContainerModel, UnoControlModel, szServiceName2_UnoControlContainerModel ) diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx index 334a4ef36196..397a4df497c4 100644 --- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx @@ -142,20 +142,20 @@ public: void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertyState - ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // ::cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() = 0; @@ -166,12 +166,12 @@ public: // setValue-Methoden ueberladen, um die Einzelproperties des FontDescriptors abzufangen // ::com::sun::star::beans::XPropertySet - void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XFastPropertySet void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; #define UNO_CONTROL_MODEL_REGISTER_PROPERTIES(a) \ diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx index 08eb00cedeb9..0d3119fd8025 100644 --- a/toolkit/inc/toolkit/controls/unocontrols.hxx +++ b/toolkit/inc/toolkit/controls/unocontrols.hxx @@ -71,8 +71,8 @@ public: // associated XGraphicObject ( if url is valid for that ) and is set // appropriately ( e.g. NULL if non GraphicObject scheme ) or a valid // object if the rURL points to a valid object - static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicAndGraphicObjectFromURL_nothrow( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject >& xOutGraphicObject, const ::rtl::OUString& _rURL ); - static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ); + static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicAndGraphicObjectFromURL_nothrow( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject >& xOutGraphicObject, const OUString& _rURL ); + static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const OUString& _rURL ); }; @@ -92,7 +92,7 @@ public: UnoControlModel* Clone() const { return new UnoControlEditModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -119,7 +119,7 @@ private: // Not all fields derived from UnoEditCOntrol have the property "Text" // They only support XTextComponent, so keep the text // here, maybe there is no Peer when calling setText()... - ::rtl::OUString maText; + OUString maText; sal_uInt16 mnMaxTextLen; sal_Bool mbSetTextInPeer; @@ -129,10 +129,10 @@ private: public: UnoEditControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); TextListenerMultiplexer& GetTextListeners() { return maTextListeners; } - void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); } @@ -153,10 +153,10 @@ public: // XTextComponent void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL insertText( const ::com::sun::star::awt::Selection& Sel, const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getSelectedText( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::awt::Selection SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isEditable( ) throw(::com::sun::star::uno::RuntimeException); @@ -174,8 +174,8 @@ public: void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException ); }; @@ -196,7 +196,7 @@ public: UnoControlModel* Clone() const { return new UnoControlFileControlModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -212,7 +212,7 @@ class UnoFileControl : public UnoEditControl { public: UnoFileControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoFileControl, UnoEditControl, szServiceName2_UnoControlFileControl ) @@ -267,7 +267,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlButtonModel, GraphicControlModel, szServiceName2_UnoControlButtonModel ) @@ -287,12 +287,12 @@ class UnoButtonControl : public UnoButtonControl_Base private: ActionListenerMultiplexer maActionListeners; ItemListenerMultiplexer maItemListeners; - ::rtl::OUString maActionCommand; + OUString maActionCommand; public: UnoButtonControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -300,8 +300,8 @@ public: // ::com::sun::star::awt::XButton void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setLabel( const ::rtl::OUString& Label ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setActionCommand( const ::rtl::OUString& Command ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XToggleButton // ::com::sun::star::awt::XItemEventBroadcaster @@ -345,7 +345,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlImageControlModel, GraphicControlModel, szServiceName2_UnoControlImageControlModel ) @@ -364,12 +364,12 @@ class UnoImageControlControl : public UnoImageControlControl_Base { private: ActionListenerMultiplexer maActionListeners; - ::rtl::OUString maActionCommand; + OUString maActionCommand; public: UnoImageControlControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -402,7 +402,7 @@ public: UnoControlModel* Clone() const { return new UnoControlRadioButtonModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -426,12 +426,12 @@ class UnoRadioButtonControl : public UnoRadioButtonControl_Base private: ItemListenerMultiplexer maItemListeners; ActionListenerMultiplexer maActionListeners; - ::rtl::OUString maActionCommand; + OUString maActionCommand; public: UnoRadioButtonControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -443,14 +443,14 @@ public: // ::com::sun::star::awt::XButton void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setActionCommand( const ::rtl::OUString& Command ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XRadioButton void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setLabel( const ::rtl::OUString& Label ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XItemListener void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); @@ -481,7 +481,7 @@ public: UnoControlModel* Clone() const { return new UnoControlCheckBoxModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -504,13 +504,13 @@ class UnoCheckBoxControl : public UnoCheckBoxControl_Base private: ItemListenerMultiplexer maItemListeners; ActionListenerMultiplexer maActionListeners; - ::rtl::OUString maActionCommand; + OUString maActionCommand; public: UnoCheckBoxControl(); ~UnoCheckBoxControl(){;} - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -522,7 +522,7 @@ public: // ::com::sun::star::awt::XButton void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setActionCommand( const ::rtl::OUString& Command ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setActionCommand( const OUString& Command ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException); @@ -530,7 +530,7 @@ public: sal_Int16 SAL_CALL getState( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setState( sal_Int16 n ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setLabel( const ::rtl::OUString& Label ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setLabel( const OUString& Label ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XItemListener @@ -562,7 +562,7 @@ public: UnoControlModel* Clone() const { return new UnoControlFixedHyperlinkModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -584,7 +584,7 @@ private: public: UnoFixedHyperlinkControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); } ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -602,10 +602,10 @@ public: sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XFixedHyperlink - void SAL_CALL setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setURL( const ::rtl::OUString& URL ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getURL( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -636,7 +636,7 @@ public: UnoControlModel* Clone() const { return new UnoControlFixedTextModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -655,7 +655,7 @@ class UnoFixedTextControl : public UnoControlBase, { public: UnoFixedTextControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); } ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -670,8 +670,8 @@ public: sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XFixedText - void SAL_CALL setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getAlignment( ) throw(::com::sun::star::uno::RuntimeException); @@ -701,7 +701,7 @@ public: UnoControlModel* Clone() const { return new UnoControlGroupBoxModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -718,7 +718,7 @@ class UnoGroupBoxControl : public UnoControlBase { public: UnoGroupBoxControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); @@ -764,28 +764,28 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XItemList virtual ::sal_Int32 SAL_CALL getItemCount() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertItem( ::sal_Int32 Position, const ::rtl::OUString& ItemText, const ::rtl::OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertItemText( ::sal_Int32 Position, const ::rtl::OUString& ItemText ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertItemImage( ::sal_Int32 Position, const ::rtl::OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertItem( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeItem( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeAllItems( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setItemText( ::sal_Int32 Position, const ::rtl::OUString& ItemText ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setItemImage( ::sal_Int32 Position, const ::rtl::OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setItemTextAndImage( ::sal_Int32 Position, const ::rtl::OUString& ItemText, const ::rtl::OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setItemTextAndImage( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setItemData( ::sal_Int32 Position, const ::com::sun::star::uno::Any& DataValue ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getItemText( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getItemImage( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Pair< ::rtl::OUString, ::rtl::OUString > SAL_CALL getItemTextAndImage( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getItemText( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getItemImage( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::Pair< OUString, OUString > SAL_CALL getItemTextAndImage( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getItemData( ::sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Pair< ::rtl::OUString, ::rtl::OUString > > SAL_CALL getAllItems( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Pair< OUString, OUString > > SAL_CALL getAllItems( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addItemListListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeItemListListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); @@ -799,15 +799,15 @@ protected: private: void impl_notifyItemListEvent_nolck( const sal_Int32 i_nItemPosition, - const ::boost::optional< ::rtl::OUString >& i_rItemText, - const ::boost::optional< ::rtl::OUString >& i_rItemImageURL, + const ::boost::optional< OUString >& i_rItemText, + const ::boost::optional< OUString >& i_rItemImageURL, void ( SAL_CALL ::com::sun::star::awt::XItemListListener::*NotificationMethod )( const ::com::sun::star::awt::ItemListEvent& ) ); void impl_handleInsert( const sal_Int32 i_nItemPosition, - const ::boost::optional< ::rtl::OUString >& i_rItemText, - const ::boost::optional< ::rtl::OUString >& i_rItemImageURL, + const ::boost::optional< OUString >& i_rItemText, + const ::boost::optional< OUString >& i_rItemImageURL, ::osl::ClearableMutexGuard& i_rClearBeforeNotify ); @@ -818,13 +818,13 @@ private: void impl_handleModify( const sal_Int32 i_nItemPosition, - const ::boost::optional< ::rtl::OUString >& i_rItemText, - const ::boost::optional< ::rtl::OUString >& i_rItemImageURL, + const ::boost::optional< OUString >& i_rItemText, + const ::boost::optional< OUString >& i_rItemImageURL, ::osl::ClearableMutexGuard& i_rClearBeforeNotify ); - void impl_getStringItemList( ::std::vector< ::rtl::OUString >& o_rStringItems ) const; - void impl_setStringItemList_nolck( const ::std::vector< ::rtl::OUString >& i_rStringItems ); + void impl_getStringItemList( ::std::vector< OUString >& o_rStringItems ) const; + void impl_setStringItemList_nolck( const ::std::vector< OUString >& i_rStringItems ); protected: ::boost::scoped_ptr< UnoControlListBoxModel_Data > m_pData; @@ -845,7 +845,7 @@ class TOOLKIT_DLLPUBLIC UnoListBoxControl : public UnoListBoxControl_Base { public: UnoListBoxControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -856,19 +856,19 @@ public: void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getSelectedItemPos( ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getSelectedItem( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedItems( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getSelectedItem( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL selectItem( const ::rtl::OUString& aItem, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isMutipleMode( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException); @@ -898,12 +898,12 @@ public: virtual void SAL_CALL itemListChanged( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); protected: void ImplUpdateSelectedItemsProperty(); - virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); virtual void updateFromModel(); private: @@ -927,7 +927,7 @@ public: UnoControlModel* Clone() const { return new UnoControlComboBoxModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -935,8 +935,8 @@ public: void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); // ::com::sun::star::lang::XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; @@ -955,7 +955,7 @@ private: public: UnoComboBoxControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoEditControl::disposing( Source ); } @@ -976,12 +976,12 @@ public: void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getItemCount( ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw(::com::sun::star::uno::RuntimeException); sal_Int16 SAL_CALL getDropDownLineCount( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException); @@ -999,10 +999,10 @@ public: virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); protected: - virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); virtual void updateFromModel(); ActionListenerMultiplexer& getActionListeners(); ItemListenerMultiplexer& getItemListeners(); @@ -1064,7 +1064,7 @@ public: UnoControlModel* Clone() const { return new UnoControlDateFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -1086,7 +1086,7 @@ private: sal_Bool mbLongFormat; public: UnoDateFieldControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -1140,7 +1140,7 @@ public: UnoControlModel* Clone() const { return new UnoControlTimeFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -1162,7 +1162,7 @@ private: public: UnoTimeFieldControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -1215,7 +1215,7 @@ public: UnoControlModel* Clone() const { return new UnoControlNumericFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -1237,7 +1237,7 @@ private: public: UnoNumericFieldControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -1292,7 +1292,7 @@ public: UnoControlModel* Clone() const { return new UnoControlCurrencyFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -1314,7 +1314,7 @@ private: public: UnoCurrencyFieldControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -1368,7 +1368,7 @@ public: UnoControlModel* Clone() const { return new UnoControlPatternFieldModel( *this ); } // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -1385,11 +1385,11 @@ class UnoPatternFieldControl : public UnoSpinFieldControl, public ::com::sun::star::awt::XPatternField { protected: - void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); public: UnoPatternFieldControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); } ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -1401,10 +1401,10 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XPatternField - void SAL_CALL setMasks( const ::rtl::OUString& EditMask, const ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL getMasks( ::rtl::OUString& EditMask, ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setString( const ::rtl::OUString& Str ) throw(::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getString( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getString( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException); @@ -1432,7 +1432,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlProgressBarModel, UnoControlModel, szServiceName2_UnoControlProgressBarModel ) @@ -1446,7 +1446,7 @@ class UnoProgressBarControl : public UnoControlBase, { public: UnoProgressBarControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); } ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -1488,7 +1488,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedLineModel, UnoControlModel, szServiceName2_UnoControlFixedLineModel ) @@ -1502,7 +1502,7 @@ class UnoFixedLineControl : public UnoControlBase { public: UnoFixedLineControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx index afb0317ce636..dc0626893e37 100644 --- a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx +++ b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx @@ -246,7 +246,7 @@ DECL_LISTENERMULTIPLEXER_END // ---------------------------------------------------- DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeEditListenerMultiplexer, ::com::sun::star::awt::tree::XTreeEditListener ) virtual void SAL_CALL nodeEditing( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException,::com::sun::star::util::VetoException); - virtual void SAL_CALL nodeEdited( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node, const ::rtl::OUString& NewText ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL nodeEdited( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node, const OUString& NewText ) throw (::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END // ---------------------------------------------------- diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx index 184678ebdf80..7d2eaea67403 100644 --- a/toolkit/inc/toolkit/helper/macros.hxx +++ b/toolkit/inc/toolkit/helper/macros.hxx @@ -165,8 +165,8 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(:: #if OSL_DEBUG_LEVEL > 0 #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ - ::rtl::OString sMessage( #ClassName "::" #MethodName ": caught an exception!\n" ); \ - sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); \ + OString sMessage( #ClassName "::" #MethodName ": caught an exception!\n" ); \ + sMessage += OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); \ OSL_FAIL( sMessage.getStr() ); #else #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) (void)e; @@ -260,11 +260,11 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa // ------------------------------------------------------------------------------------- #define DECLIMPL_SUPPORTS_SERVICE( ) \ - sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ + sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); \ - const ::rtl::OUString* pSupported = aServiceNames.getConstArray(); \ - const ::rtl::OUString* pSupportedEnd = pSupported + aServiceNames.getLength(); \ + ::com::sun::star::uno::Sequence< OUString > aServiceNames( getSupportedServiceNames() ); \ + const OUString* pSupported = aServiceNames.getConstArray(); \ + const OUString* pSupportedEnd = pSupported + aServiceNames.getLength(); \ for ( ; pSupported != pSupportedEnd; ++pSupported ) \ if ( *pSupported == rServiceName ) \ return sal_True; \ @@ -277,7 +277,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return OUString("stardiv.Toolkit." #ImplName ); } \ ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = BaseClass::getSupportedServiceNames( ); \ + ::com::sun::star::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \ aNames.realloc( aNames.getLength() + 1 ); \ aNames[ aNames.getLength() - 1 ] = OUString::createFromAscii( ServiceName ); \ return aNames; \ @@ -287,9 +287,9 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa #define DECLIMPL_SERVICEINFO( ImplName, ServiceName ) \ OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return OUString("stardiv.Toolkit." #ImplName ); } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames( 1 ); \ + ::com::sun::star::uno::Sequence< OUString > aNames( 1 ); \ aNames[ 0 ] = OUString::createFromAscii( ServiceName ); \ return aNames; \ } \ diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx index 74fa56398ad3..fa1fbbf2a125 100644 --- a/toolkit/inc/toolkit/helper/property.hxx +++ b/toolkit/inc/toolkit/helper/property.hxx @@ -23,6 +23,7 @@ #include #include +#include namespace com { namespace sun { @@ -32,14 +33,10 @@ namespace uno { class Any; } } } } -namespace rtl { - class OUString; -} - #define BASEPROPERTY_NOTFOUND 0 -#define BASEPROPERTY_TEXT 1 // ::rtl::OUString +#define BASEPROPERTY_TEXT 1 // OUString #define BASEPROPERTY_BACKGROUNDCOLOR 2 // sal_Int32 #define BASEPROPERTY_FILLCOLOR 3 // sal_Int32 #define BASEPROPERTY_TEXTCOLOR 4 // sal_Int32 @@ -57,14 +54,14 @@ namespace rtl { #define BASEPROPERTY_FONT_TYPE 16 // OLD: Font_Type #define BASEPROPERTY_FONT_SIZE 17 // OLD: Font_Size #define BASEPROPERTY_FONT_ATTRIBS 18 // OLD: Font_Attribs -#define BASEPROPERTY_DEFAULTCONTROL 19 // ::rtl::OUString (ServiceName) -#define BASEPROPERTY_LABEL 20 // ::rtl::OUString +#define BASEPROPERTY_DEFAULTCONTROL 19 // OUString (ServiceName) +#define BASEPROPERTY_LABEL 20 // OUString #define BASEPROPERTY_LINECOUNT 21 // sal_Int16 #define BASEPROPERTY_EXTDATEFORMAT 22 // sal_Int16 #define BASEPROPERTY_DATESHOWCENTURY 23 // sal_Bool #define BASEPROPERTY_EXTTIMEFORMAT 24 // sal_Int16 #define BASEPROPERTY_NUMSHOWTHOUSANDSEP 25 // sal_Bool -#define BASEPROPERTY_CURRENCYSYMBOL 26 // ::rtl::OUString +#define BASEPROPERTY_CURRENCYSYMBOL 26 // OUString #define BASEPROPERTY_SPIN 27 // sal_Bool #define BASEPROPERTY_STRICTFORMAT 28 // sal_Bool #define BASEPROPERTY_DECIMALACCURACY 29 // sal_Int16 @@ -78,9 +75,9 @@ namespace rtl { #define BASEPROPERTY_VALUEMIN_INT32 37 // sal_Int32 #define BASEPROPERTY_VALUEMAX_INT32 38 // sal_Int32 #define BASEPROPERTY_VALUESTEP_INT32 39 // sal_Int32 -#define BASEPROPERTY_EDITMASK 40 // ::rtl::OUString -#define BASEPROPERTY_LITERALMASK 41 // ::rtl::OUString -#define BASEPROPERTY_IMAGEURL 42 // ::rtl::OUString +#define BASEPROPERTY_EDITMASK 40 // OUString +#define BASEPROPERTY_LITERALMASK 41 // OUString +#define BASEPROPERTY_IMAGEURL 42 // OUString #define BASEPROPERTY_READONLY 43 // sal_Bool #define BASEPROPERTY_ENABLED 44 // sal_Bool #define BASEPROPERTY_PRINTABLE 45 // sal_Bool @@ -96,7 +93,7 @@ namespace rtl { #define BASEPROPERTY_VALUESTEP_DOUBLE 55 // DOUBLE #define BASEPROPERTY_TRISTATE 56 // sal_Bool #define BASEPROPERTY_DEFAULTBUTTON 57 // sal_Bool -#define BASEPROPERTY_HELPURL 58 // ::rtl::OUString +#define BASEPROPERTY_HELPURL 58 // OUString #define BASEPROPERTY_AUTOTOGGLE 59 // sal_Bool //#define BASEPROPERTY_FOCUSSELECTIONHIDE 60 // sal_Bool #define BASEPROPERTY_FORMATKEY 61 // sal_Bool @@ -107,11 +104,11 @@ namespace rtl { #define BASEPROPERTY_EFFECTIVE_MIN 66 // Double #define BASEPROPERTY_EFFECTIVE_MAX 67 // Double #define BASEPROPERTY_CURSYM_POSITION 68 // sal_Bool -#define BASEPROPERTY_TITLE 69 // ::rtl::OUString +#define BASEPROPERTY_TITLE 69 // OUString #define BASEPROPERTY_MOVEABLE 70 // sal_Bool #define BASEPROPERTY_CLOSEABLE 71 // sal_Bool #define BASEPROPERTY_SIZEABLE 72 // sal_Bool -#define BASEPROPERTY_HELPTEXT 73 // ::rtl::OUString +#define BASEPROPERTY_HELPTEXT 73 // OUString #define BASEPROPERTY_PROGRESSVALUE 74 // sal_Int32 #define BASEPROPERTY_PROGRESSVALUE_MIN 75 // sal_Int32 #define BASEPROPERTY_PROGRESSVALUE_MAX 76 // sal_Int32 @@ -130,7 +127,7 @@ namespace rtl { #define BASEPROPERTY_DISPLAYBACKGROUNDCOLOR 89 // sal_Int32 #define BASEPROPERTY_AUTOMNEMONICS 90 // sal_Bool #define BASEPROPERTY_MOUSETRANSPARENT 91 // sal_Bool -#define BASEPROPERTY_ACCESSIBLENAME 92 // ::rtl::OUString +#define BASEPROPERTY_ACCESSIBLENAME 92 // OUString #define BASEPROPERTY_PLUGINPARENT 93 // sal_Int64 #define BASEPROPERTY_SCROLLVALUE_MIN 94 // sal_Int32 #define BASEPROPERTY_REPEAT_DELAY 95 // sal_Int32 @@ -173,10 +170,10 @@ namespace rtl { #define BASEPROPERTY_TREE_INVOKESSTOPNODEEDITING 131 #define BASEPROPERTY_TREE_END 131 #define BASEPROPERTY_DIALOGSOURCEURL 132 -#define BASEPROPERTY_NOLABEL 133 // ::rtl::OUString added for issue79712 -#define BASEPROPERTY_URL 134 // ::rtl::OUString +#define BASEPROPERTY_NOLABEL 133 // OUString added for issue79712 +#define BASEPROPERTY_URL 134 // OUString #define BASEPROPERTY_UNIT 135 // ::awt::FieldUnit -#define BASEPROPERTY_CUSTOMUNITTEXT 136 // ::rtl::OUString +#define BASEPROPERTY_CUSTOMUNITTEXT 136 // OUString #define BASEPROPERTY_IMAGE_SCALE_MODE 137 #define BASEPROPERTY_WRITING_MODE 138 #define BASEPROPERTY_CONTEXT_WRITING_MODE 139 @@ -195,7 +192,7 @@ namespace rtl { #define BASEPROPERTY_GRID_LINE_COLOR 151 #define BASEPROPERTY_MULTISELECTION_SIMPLEMODE 152 #define BASEPROPERTY_ITEM_SEPARATOR_POS 153 -#define BASEPROPERTY_GROUPNAME 154 // ::rtl::OUString +#define BASEPROPERTY_GROUPNAME 154 // OUString #define BASEPROPERTY_MULTIPAGEVALUE 155 // sal_Int32 #define BASEPROPERTY_USERFORMCONTAINEES 156 // css::container::XNameContainer #define BASEPROPERTY_AUTO_REPEAT 157 @@ -214,8 +211,8 @@ namespace rtl { // These properties are not bound, they are always extracted from the BASEPROPERTY_FONTDESCRIPTOR property #define BASEPROPERTY_FONTDESCRIPTORPART_START 1000 -#define BASEPROPERTY_FONTDESCRIPTORPART_NAME 1000 // ::rtl::OUString, not bound -#define BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME 1001 // ::rtl::OUString, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_NAME 1000 // OUString, not bound +#define BASEPROPERTY_FONTDESCRIPTORPART_STYLENAME 1001 // OUString, not bound #define BASEPROPERTY_FONTDESCRIPTORPART_FAMILY 1002 // sal_Int16, not bound #define BASEPROPERTY_FONTDESCRIPTORPART_CHARSET 1003 // sal_Int16, not bound #define BASEPROPERTY_FONTDESCRIPTORPART_HEIGHT 1004 // sal_Int16, not bound @@ -240,9 +237,9 @@ namespace rtl { #define PROPERTY_STATE_ON 1 #define PROPERTY_STATE_DONTCARE 2 -TOOLKIT_DLLPUBLIC sal_uInt16 GetPropertyId( const ::rtl::OUString& rPropertyName ); +TOOLKIT_DLLPUBLIC sal_uInt16 GetPropertyId( const OUString& rPropertyName ); const ::com::sun::star::uno::Type* GetPropertyType( sal_uInt16 nPropertyId ); -TOOLKIT_DLLPUBLIC const ::rtl::OUString& GetPropertyName( sal_uInt16 nPropertyId ); +TOOLKIT_DLLPUBLIC const OUString& GetPropertyName( sal_uInt16 nPropertyId ); sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId ); sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId ); sal_Bool DoesDependOnOthers( sal_uInt16 nPropertyId ); diff --git a/toolkit/inc/toolkit/helper/tkresmgr.hxx b/toolkit/inc/toolkit/helper/tkresmgr.hxx index ee236546ec1b..362220aa0393 100644 --- a/toolkit/inc/toolkit/helper/tkresmgr.hxx +++ b/toolkit/inc/toolkit/helper/tkresmgr.hxx @@ -58,11 +58,11 @@ protected: public: // loads the string with the specified resource id - static ::rtl::OUString loadString( sal_uInt16 nResId ); + static OUString loadString( sal_uInt16 nResId ); // loads the image with the specified resource id static Image loadImage( sal_uInt16 nResId ); - static Image getImageFromURL( const ::rtl::OUString& i_rImageURL ); + static Image getImageFromURL( const OUString& i_rImageURL ); }; diff --git a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx index 5b6ba3b5c956..b46dcfe9bc99 100644 --- a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx @@ -43,12 +43,12 @@ public: UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs ); // ::cppu::IPropertyArrayHelper - sal_Bool SAL_CALL fillPropertyMembersByHandle( ::rtl::OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ); + sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(); - ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const ::rtl::OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException); - sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& rPropertyName); - sal_Int32 SAL_CALL getHandleByName( const ::rtl::OUString & rPropertyName ); - sal_Int32 SAL_CALL fillHandles( sal_Int32* pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPropNames ); + ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException); + sal_Bool SAL_CALL hasPropertyByName(const OUString& rPropertyName); + sal_Int32 SAL_CALL getHandleByName( const OUString & rPropertyName ); + sal_Int32 SAL_CALL fillHandles( sal_Int32* pHandles, const ::com::sun::star::uno::Sequence< OUString > & rPropNames ); }; diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index 00e7d127b338..49f944948cca 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -73,7 +73,7 @@ namespace toolkit //================================================================================================================== struct CachedImage { - ::rtl::OUString sImageURL; + OUString sImageURL; mutable Reference< XGraphic > xGraphic; CachedImage() @@ -82,7 +82,7 @@ namespace toolkit { } - CachedImage( ::rtl::OUString const& i_imageURL ) + CachedImage( OUString const& i_imageURL ) :sImageURL( i_imageURL ) ,xGraphic() { @@ -107,7 +107,7 @@ namespace toolkit namespace { //-------------------------------------------------------------------------------------------------------------- - ::rtl::OUString lcl_getHighContrastURL( ::rtl::OUString const& i_imageURL ) + OUString lcl_getHighContrastURL( OUString const& i_imageURL ) { INetURLObject aURL( i_imageURL ); if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE ) @@ -120,7 +120,7 @@ namespace toolkit const sal_Int32 separatorPos = i_imageURL.indexOf( '/' ); ENSURE_OR_RETURN( separatorPos != -1, "lcl_getHighContrastURL: unsipported URL scheme - cannot automatically determine HC version!", i_imageURL ); - ::rtl::OUStringBuffer composer; + OUStringBuffer composer; composer.append( i_imageURL.copy( 0, separatorPos ) ); composer.appendAscii( "/hicontrast" ); composer.append( i_imageURL.copy( separatorPos ) ); @@ -168,7 +168,7 @@ namespace toolkit } //-------------------------------------------------------------------------------------------------------------- - void lcl_init( Sequence< ::rtl::OUString > const& i_imageURLs, ::std::vector< CachedImage >& o_images ) + void lcl_init( Sequence< OUString > const& i_imageURLs, ::std::vector< CachedImage >& o_images ) { o_images.resize(0); size_t count = size_t( i_imageURLs.getLength() ); @@ -277,7 +277,7 @@ namespace toolkit i_data.aCachedImageSets.resize(0); for ( sal_Int32 set = 0; set < nImageSetCount; ++set ) { - const Sequence< ::rtl::OUString > aImageURLs( i_images->getImageSet( set ) ); + const Sequence< OUString > aImageURLs( i_images->getImageSet( set ) ); ::std::vector< CachedImage > aImages; lcl_init( aImageURLs, aImages ); i_data.aCachedImageSets.push_back( aImages ); @@ -336,7 +336,7 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL AnimatedImagesPeer::setProperty( const ::rtl::OUString& i_propertyName, const Any& i_value ) throw(RuntimeException) + void SAL_CALL AnimatedImagesPeer::setProperty( const OUString& i_propertyName, const Any& i_value ) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -383,7 +383,7 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - Any SAL_CALL AnimatedImagesPeer::getProperty( const ::rtl::OUString& i_propertyName ) throw(RuntimeException) + Any SAL_CALL AnimatedImagesPeer::getProperty( const OUString& i_propertyName ) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -455,7 +455,7 @@ namespace toolkit lcl_updateImageList_nothrow( *m_pData, xAnimatedImages ); } - Sequence< ::rtl::OUString > aImageURLs; + Sequence< OUString > aImageURLs; OSL_VERIFY( i_event.Element >>= aImageURLs ); ::std::vector< CachedImage > aImages; lcl_init( aImageURLs, aImages ); @@ -497,7 +497,7 @@ namespace toolkit lcl_updateImageList_nothrow( *m_pData, xAnimatedImages ); } - Sequence< ::rtl::OUString > aImageURLs; + Sequence< OUString > aImageURLs; OSL_VERIFY( i_event.Element >>= aImageURLs ); ::std::vector< CachedImage > aImages; lcl_init( aImageURLs, aImages ); diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index 939757ff7373..1f30e8fd598a 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -32,8 +32,8 @@ namespace comp_AsyncCallback { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace @@ -52,9 +52,9 @@ public: explicit AsyncCallback(css::uno::Reference< css::uno::XComponentContext > const & context); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); // ::com::sun::star::awt::XRequestCallback: virtual void SAL_CALL addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const ::com::sun::star::uno::Any & aData) throw (css::uno::RuntimeException); @@ -85,14 +85,14 @@ AsyncCallback::AsyncCallback(css::uno::Reference< css::uno::XComponentContext > {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL AsyncCallback::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL AsyncCallback::getImplementationName() throw (css::uno::RuntimeException) { return comp_AsyncCallback::_getImplementationName(); } -::sal_Bool SAL_CALL AsyncCallback::supportsService(::rtl::OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL AsyncCallback::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - const css::uno::Sequence< ::rtl::OUString > serviceNames = comp_AsyncCallback::_getSupportedServiceNames(); + const css::uno::Sequence< OUString > serviceNames = comp_AsyncCallback::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) return sal_True; @@ -100,7 +100,7 @@ AsyncCallback::AsyncCallback(css::uno::Reference< css::uno::XComponentContext > return sal_False; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL AsyncCallback::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL AsyncCallback::getSupportedServiceNames() throw (css::uno::RuntimeException) { return comp_AsyncCallback::_getSupportedServiceNames(); } diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 325b15110eda..1edab68f08b7 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -95,26 +95,26 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent() IMPLEMENT_FORWARD_XINTERFACE3( VCLXAccessibleComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE ) IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE ) -::rtl::OUString VCLXAccessibleComponent::getImplementationName() throw (uno::RuntimeException) +OUString VCLXAccessibleComponent::getImplementationName() throw (uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.toolkit.AccessibleWindow"); + return OUString("com.sun.star.comp.toolkit.AccessibleWindow"); } -sal_Bool VCLXAccessibleComponent::supportsService( const ::rtl::OUString& rServiceName ) throw (uno::RuntimeException) +sal_Bool VCLXAccessibleComponent::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() ); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pNames + aNames.getLength(); + uno::Sequence< OUString > aNames( getSupportedServiceNames() ); + const OUString* pNames = aNames.getConstArray(); + const OUString* pEnd = pNames + aNames.getLength(); for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) ; return pNames != pEnd; } -uno::Sequence< ::rtl::OUString > VCLXAccessibleComponent::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString("com.sun.star.awt.AccessibleWindow"); + uno::Sequence< OUString > aNames(1); + aNames[0] = OUString("com.sun.star.awt.AccessibleWindow"); return aNames; } @@ -332,8 +332,8 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind break; case VCLEVENT_WINDOW_FRAMETITLECHANGED: { - ::rtl::OUString aOldName( *((::rtl::OUString*) rVclWindowEvent.GetData()) ); - ::rtl::OUString aNewName( getAccessibleName() ); + OUString aOldName( *((OUString*) rVclWindowEvent.GetData()) ); + OUString aNewName( getAccessibleName() ); aOldValue <<= aOldName; aNewValue <<= aNewName; NotifyAccessibleEvent( accessibility::AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue ); @@ -668,11 +668,11 @@ sal_Int16 VCLXAccessibleComponent::getAccessibleRole( ) throw (uno::RuntimeExce return nRole; } -::rtl::OUString VCLXAccessibleComponent::getAccessibleDescription( ) throw (uno::RuntimeException) +OUString VCLXAccessibleComponent::getAccessibleDescription( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString aDescription; + OUString aDescription; if ( GetWindow() ) aDescription = GetWindow()->GetAccessibleDescription(); @@ -680,18 +680,18 @@ sal_Int16 VCLXAccessibleComponent::getAccessibleRole( ) throw (uno::RuntimeExce return aDescription; } -::rtl::OUString VCLXAccessibleComponent::getAccessibleName( ) throw (uno::RuntimeException) +OUString VCLXAccessibleComponent::getAccessibleName( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString aName; + OUString aName; if ( GetWindow() ) { aName = GetWindow()->GetAccessibleName(); #if OSL_DEBUG_LEVEL > 1 - aName += rtl::OUString(" (Type = "); - aName += rtl::OUString::valueOf(static_cast(GetWindow()->GetType())); - aName += rtl::OUString( ")"); + aName += OUString(" (Type = "); + aName += OUString::valueOf(static_cast(GetWindow()->GetType())); + aName += OUString( ")"); #endif } return aName; @@ -896,22 +896,22 @@ uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont( ) throw return xFont; } -::rtl::OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText( ) throw (uno::RuntimeException) +OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sRet; + OUString sRet; if ( GetWindow() ) sRet = GetWindow()->GetText(); return sRet; } -::rtl::OUString SAL_CALL VCLXAccessibleComponent::getToolTipText( ) throw (uno::RuntimeException) +OUString SAL_CALL VCLXAccessibleComponent::getToolTipText( ) throw (uno::RuntimeException) { OExternalLockGuard aGuard( this ); - ::rtl::OUString sRet; + OUString sRet; if ( GetWindow() ) sRet = GetWindow()->GetQuickHelpText(); diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index ead5d8602594..d82381b6acaa 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -225,7 +225,7 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun: } void SAL_CALL VCLXContainer::setProperty( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index 108d4cbd8151..01ef619fdd11 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -118,7 +118,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R pOutDev->SetFont( maFont ); nRet = sal::static_int_cast< sal_Int16 >( - pOutDev->GetTextWidth( rtl::OUString(c) )); + pOutDev->GetTextWidth( OUString(c) )); pOutDev->SetFont( aOldFont ); } @@ -142,7 +142,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R { aSeq.getArray()[n] = sal::static_int_cast< sal_Int16 >( pOutDev->GetTextWidth( - rtl::OUString(static_cast< sal_Unicode >(nFirst+n)) )); + OUString(static_cast< sal_Unicode >(nFirst+n)) )); } pOutDev->SetFont( aOldFont ); @@ -150,7 +150,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R return aSeq; } -sal_Int32 VCLXFont::getStringWidth( const ::rtl::OUString& str ) throw(::com::sun::star::uno::RuntimeException) +sal_Int32 VCLXFont::getStringWidth( const OUString& str ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -166,7 +166,7 @@ sal_Int32 VCLXFont::getStringWidth( const ::rtl::OUString& str ) throw(::com::su return nRet; } -sal_Int32 VCLXFont::getStringWidthArray( const ::rtl::OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException) +sal_Int32 VCLXFont::getStringWidthArray( const OUString& str, ::com::sun::star::uno::Sequence< sal_Int32 >& rDXArray ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -189,7 +189,7 @@ void VCLXFont::getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& /*r } // ::com::sun::star::awt::XFont2 -sal_Bool VCLXFont::hasGlyphs( const ::rtl::OUString& aText ) +sal_Bool VCLXFont::hasGlyphs( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index ae8e9b62d336..92e0ff3815bf 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -448,7 +448,7 @@ void VCLXGraphics::drawGradient( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_ } } -void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const OUString& rText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -459,7 +459,7 @@ void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rT } } -void VCLXGraphics::drawTextArray( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rLongs ) throw(::com::sun::star::uno::RuntimeException) +void VCLXGraphics::drawTextArray( sal_Int32 x, sal_Int32 y, const OUString& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rLongs ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 3e5df7f09371..7157af61d0c1 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -220,27 +220,27 @@ throw (::com::sun::star::uno::RuntimeException) } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL VCLXMenu::getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL VCLXMenu::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) { ::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() ); const sal_Bool bIsPopupMenu = IsPopupMenu(); aGuard.clear(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames( 1 ); + ::com::sun::star::uno::Sequence< OUString > aNames( 1 ); if ( bIsPopupMenu ) - aNames[ 0 ] = ::rtl::OUString::createFromAscii( szServiceName2_PopupMenu ); + aNames[ 0 ] = OUString::createFromAscii( szServiceName2_PopupMenu ); else - aNames[ 0 ] = ::rtl::OUString::createFromAscii( szServiceName2_MenuBar ); + aNames[ 0 ] = OUString::createFromAscii( szServiceName2_MenuBar ); return aNames; } -::sal_Bool SAL_CALL VCLXMenu::supportsService( const ::rtl::OUString& rServiceName ) +::sal_Bool SAL_CALL VCLXMenu::supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); + ::com::sun::star::uno::Sequence< OUString > aServiceNames( getSupportedServiceNames() ); if ( aServiceNames[ 0 ] == rServiceName ) return sal_True; @@ -401,7 +401,7 @@ void VCLXMenu::removeMenuListener( const ::com::sun::star::uno::Reference< ::com maMenuListeners.removeInterface( rxListener ); } -void VCLXMenu::insertItem( sal_Int16 nItemId, const ::rtl::OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) +void VCLXMenu::insertItem( sal_Int16 nItemId, const OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -466,7 +466,7 @@ sal_Bool VCLXMenu::isItemEnabled( sal_Int16 nItemId ) throw(::com::sun::star::un return mpMenu ? mpMenu->IsItemEnabled( nItemId ) : sal_False; } -void VCLXMenu::setItemText( sal_Int16 nItemId, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXMenu::setItemText( sal_Int16 nItemId, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -475,12 +475,12 @@ void VCLXMenu::setItemText( sal_Int16 nItemId, const ::rtl::OUString& aText ) th mpMenu->SetItemText( nItemId, aText ); } -::rtl::OUString VCLXMenu::getItemText( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException) +OUString VCLXMenu::getItemText( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::rtl::OUString aItemText; + OUString aItemText; if ( mpMenu ) aItemText = mpMenu->GetItemText( nItemId ); return aItemText; @@ -590,7 +590,7 @@ sal_Int16 VCLXMenu::execute( const ::com::sun::star::uno::Reference< ::com::sun: } -void SAL_CALL VCLXMenu::setCommand( sal_Int16 nItemId, const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL VCLXMenu::setCommand( sal_Int16 nItemId, const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -599,18 +599,18 @@ void SAL_CALL VCLXMenu::setCommand( sal_Int16 nItemId, const ::rtl::OUString& aC mpMenu->SetItemCommand( nItemId, aCommand ); } -::rtl::OUString SAL_CALL VCLXMenu::getCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL VCLXMenu::getCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::rtl::OUString aItemCommand; + OUString aItemCommand; if ( mpMenu ) aItemCommand = mpMenu->GetItemCommand( nItemId ); return aItemCommand; } -void SAL_CALL VCLXMenu::setHelpCommand( sal_Int16 nItemId, const ::rtl::OUString& aHelp ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL VCLXMenu::setHelpCommand( sal_Int16 nItemId, const OUString& aHelp ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -619,12 +619,12 @@ void SAL_CALL VCLXMenu::setHelpCommand( sal_Int16 nItemId, const ::rtl::OUString mpMenu->SetHelpCommand( nItemId, aHelp ); } -::rtl::OUString SAL_CALL VCLXMenu::getHelpCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL VCLXMenu::getHelpCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::rtl::OUString aHelpCommand; + OUString aHelpCommand; if ( mpMenu ) aHelpCommand = mpMenu->GetHelpCommand( nItemId ); return aHelpCommand; @@ -895,7 +895,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, } -void SAL_CALL VCLXMenu::setHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sHelpText ) +void SAL_CALL VCLXMenu::setHelpText( ::sal_Int16 nItemId, const OUString& sHelpText ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) { @@ -910,14 +910,14 @@ throw ( ::com::sun::star::container::NoSuchElementException, } -::rtl::OUString SAL_CALL VCLXMenu::getHelpText( ::sal_Int16 nItemId ) +OUString SAL_CALL VCLXMenu::getHelpText( ::sal_Int16 nItemId ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - rtl::OUString sHelpText; + OUString sHelpText; if ( mpMenu && IsPopupMenu() ) { THROW_MENUITEM_NOT_FOUND( "VCLXMenu::getHelpText()", nItemId ) @@ -928,7 +928,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, } -void SAL_CALL VCLXMenu::setTipHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sTipHelpText ) +void SAL_CALL VCLXMenu::setTipHelpText( ::sal_Int16 nItemId, const OUString& sTipHelpText ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) { @@ -943,14 +943,14 @@ throw ( ::com::sun::star::container::NoSuchElementException, } -::rtl::OUString SAL_CALL VCLXMenu::getTipHelpText( ::sal_Int16 nItemId ) +OUString SAL_CALL VCLXMenu::getTipHelpText( ::sal_Int16 nItemId ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - rtl::OUString sTipHelpText; + OUString sTipHelpText; if ( mpMenu && IsPopupMenu() ) { THROW_MENUITEM_NOT_FOUND( "VCLXMenu::getTipHelpText()", nItemId ) diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index af673d433987..a682157477e4 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -49,8 +49,8 @@ { static ::com::sun::star::beans::Property aPropTable[] = { - ::com::sun::star::beans::Property( ::rtl::OUString("Orientation"), PROPERTY_Orientation, ::getCppuType((const sal_Int16*)0), 0 ), - ::com::sun::star::beans::Property( ::rtl::OUString("Horizontal"), PROPERTY_Horizontal, ::getBooleanCppuType(), 0 ) + ::com::sun::star::beans::Property( OUString("Orientation"), PROPERTY_Orientation, ::getCppuType((const sal_Int16*)0), 0 ), + ::com::sun::star::beans::Property( OUString("Horizontal"), PROPERTY_Horizontal, ::getBooleanCppuType(), 0 ) }; pProperties = aPropTable; nElements = sizeof( aPropTable ) / sizeof( ::com::sun::star::beans::Property ); @@ -242,7 +242,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com:: return aDescriptions; } -void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( Mutex ); @@ -309,7 +309,7 @@ IMPL_XTYPEPROVIDER_START( VCLXPrinter ) VCLXPrinterPropertySet::getTypes() IMPL_XTYPEPROVIDER_END -sal_Bool VCLXPrinter::start( const ::rtl::OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( Mutex ); @@ -420,26 +420,26 @@ IMPL_XTYPEPROVIDER_START( VCLXPrinterServer ) IMPL_XTYPEPROVIDER_END // ::com::sun::star::awt::XPrinterServer -::com::sun::star::uno::Sequence< ::rtl::OUString > VCLXPrinterServer::getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException) { - const std::vector& rQueues = Printer::GetPrinterQueues(); + const std::vector& rQueues = Printer::GetPrinterQueues(); sal_uInt32 nPrinters = rQueues.size(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames( nPrinters ); + ::com::sun::star::uno::Sequence< OUString > aNames( nPrinters ); for ( sal_uInt32 n = 0; n < nPrinters; n++ ) aNames.getArray()[n] = rQueues[n]; return aNames; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > VCLXPrinterServer::createPrinter( const ::rtl::OUString& rPrinterName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > VCLXPrinterServer::createPrinter( const OUString& rPrinterName ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > xP; xP = new VCLXPrinter( rPrinterName ); return xP; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > VCLXPrinterServer::createInfoPrinter( const ::rtl::OUString& rPrinterName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > VCLXPrinterServer::createInfoPrinter( const OUString& rPrinterName ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > xP; xP = new VCLXInfoPrinter( rPrinterName ); diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx index f3384dee5145..a34b8f4a3614 100644 --- a/toolkit/source/awt/vclxspinbutton.cxx +++ b/toolkit/source/awt/vclxspinbutton.cxx @@ -242,7 +242,7 @@ namespace toolkit } //-------------------------------------------------------------------- - void SAL_CALL VCLXSpinButton::setProperty( const ::rtl::OUString& PropertyName, const Any& Value ) throw(RuntimeException) + void SAL_CALL VCLXSpinButton::setProperty( const OUString& PropertyName, const Any& Value ) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -292,7 +292,7 @@ namespace toolkit } //-------------------------------------------------------------------- - Any SAL_CALL VCLXSpinButton::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) + Any SAL_CALL VCLXSpinButton::getProperty( const OUString& PropertyName ) throw(RuntimeException) { SolarMutexGuard aGuard; diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 91c8708c82a6..928b4bd3d63d 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -28,7 +28,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -84,7 +83,7 @@ void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, sal_Int32 nY ) throw(Run return aInfo; } -void SAL_CALL VCLXTabPageContainer::setProperty(const ::rtl::OUString& PropertyName, const Any& Value ) throw(RuntimeException) +void SAL_CALL VCLXTabPageContainer::setProperty(const OUString& PropertyName, const Any& Value ) throw(RuntimeException) { SolarMutexGuard aGuard; diff --git a/toolkit/source/awt/vclxtabpagemodel.cxx b/toolkit/source/awt/vclxtabpagemodel.cxx index 9f4744dacda7..3f0e0d241f61 100644 --- a/toolkit/source/awt/vclxtabpagemodel.cxx +++ b/toolkit/source/awt/vclxtabpagemodel.cxx @@ -65,7 +65,7 @@ void SAL_CALL VCLXTabPageModel::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com:: void SAL_CALL VCLXTabPageModel::setProperty( - const ::rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const ::com::sun::star::uno::Any& /*Value*/ ) throw(::com::sun::star::uno::RuntimeException) { @@ -92,35 +92,35 @@ void SAL_CALL VCLXTabPageModel::setEnabled( ::sal_Bool _enabled ) throw (::com:: //if ( pTabControl ) // pTabControl->EnablePage(0, true); } -::rtl::OUString SAL_CALL VCLXTabPageModel::getTitle() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL VCLXTabPageModel::getTitle() throw (::com::sun::star::uno::RuntimeException) { //TabControl* pTabControl = (TabControl*)GetWindow(); //if ( pTabControl ) // return pTabControl->GetPageText(0); //else - return ::rtl::OUString(); + return OUString(); } -void SAL_CALL VCLXTabPageModel::setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL VCLXTabPageModel::setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException) { //TabControl* pTabControl = (TabControl*)GetWindow(); //if ( pTabControl ) // pTabControl->SetPageText(0, _title); } -::rtl::OUString SAL_CALL VCLXTabPageModel::getImageURL() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL VCLXTabPageModel::getImageURL() throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(); + return OUString(); } -void SAL_CALL VCLXTabPageModel::setImageURL( const ::rtl::OUString& /*_imageurl*/ ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL VCLXTabPageModel::setImageURL( const OUString& /*_imageurl*/ ) throw (::com::sun::star::uno::RuntimeException) { //m_sImageURL = _imageurl; } -::rtl::OUString SAL_CALL VCLXTabPageModel::getToolTip() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL VCLXTabPageModel::getToolTip() throw (::com::sun::star::uno::RuntimeException) { //return m_sTooltip; - return ::rtl::OUString(); + return OUString(); } -void SAL_CALL VCLXTabPageModel::setToolTip( const ::rtl::OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL VCLXTabPageModel::setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException) { (void)_tooltip; } diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 8e1e4ebb6a6a..271ec312da14 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -354,7 +354,7 @@ sal_uInt16 ImplGetComponentType( const String& rServiceName ) ComponentInfo aSearch; - rtl::OString aServiceName(rtl::OUStringToOString(rServiceName, osl_getThreadTextEncoding()).toAsciiLowerCase()); + OString aServiceName(OUStringToOString(rServiceName, osl_getThreadTextEncoding()).toAsciiLowerCase()); if ( !aServiceName.isEmpty() ) aSearch.pName = aServiceName.getStr(); else @@ -1059,7 +1059,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( ) { #ifndef DISABLE_DYNLOADING - ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( + OUString aLibName = ::vcl::unohelper::CreateLibraryName( #ifdef LIBO_MERGELIBS "merged", #else @@ -1070,7 +1070,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT ); if ( hSvToolsLib ) { - ::rtl::OUString aFunctionName( "CreateWindow" ); + OUString aFunctionName( "CreateWindow" ); fnSvtCreateWindow = (FN_SvtCreateWindow)osl_getFunctionSymbol( hSvToolsLib, aFunctionName.pData ); } #else @@ -1205,7 +1205,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( // system child window could not be created OSL_TRACE( "VCLXToolkit::createSystemChild: caught %s\n", - ::rtl::OUStringToOString( + OUStringToOString( rEx.Message, RTL_TEXTENCODING_UTF8).getStr()); pChildWindow = NULL; } @@ -1233,10 +1233,10 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMessageBox > SAL_CALL VCLXToolkit::createMessageBox( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& aParent, const ::com::sun::star::awt::Rectangle& aPosSize, - const ::rtl::OUString& aType, + const OUString& aType, ::sal_Int32 aButtons, - const ::rtl::OUString& aTitle, - const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException) + const OUString& aTitle, + const OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException) { ::com::sun::star::awt::WindowDescriptor aDescriptor; @@ -1327,7 +1327,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( return ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >(); } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL VCLXToolkit::getClipboard( const ::rtl::OUString& clipboardName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL VCLXToolkit::getClipboard( const OUString& clipboardName ) throw(::com::sun::star::uno::RuntimeException) { if( clipboardName.isEmpty() ) { @@ -1351,18 +1351,18 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( } // XServiceInfo -::rtl::OUString VCLXToolkit::getImplementationName() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXToolkit::getImplementationName() throw(::com::sun::star::uno::RuntimeException) { - return rtl::OUString("stardiv.Toolkit.VCLXToolkit"); + return OUString("stardiv.Toolkit.VCLXToolkit"); } -sal_Bool VCLXToolkit::supportsService( const ::rtl::OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool VCLXToolkit::supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString* pArray = aSNL.getConstArray(); - const ::rtl::OUString* pArrayEnd = aSNL.getConstArray(); + ::com::sun::star::uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString* pArray = aSNL.getConstArray(); + const OUString* pArrayEnd = aSNL.getConstArray(); for (; pArray != pArrayEnd; ++pArray ) if( *pArray == rServiceName ) break; @@ -1370,10 +1370,10 @@ sal_Bool VCLXToolkit::supportsService( const ::rtl::OUString& rServiceName ) thr return pArray != pArrayEnd; } -::com::sun::star::uno::Sequence< ::rtl::OUString > VCLXToolkit::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > VCLXToolkit::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( szServiceName2_Toolkit ) ); - return ::com::sun::star::uno::Sequence< ::rtl::OUString >( &aServiceName, 1); + OUString aServiceName( OUString::createFromAscii( szServiceName2_Toolkit ) ); + return ::com::sun::star::uno::Sequence< OUString >( &aServiceName, 1); } // css::awt::XExtendedToolkit: @@ -1615,7 +1615,7 @@ void VCLXToolkit::callTopWindowListeners( { OSL_TRACE( "VCLXToolkit::callTopWindowListeners: caught %s\n", - ::rtl::OUStringToOString( + OUStringToOString( rEx.Message, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -1663,7 +1663,7 @@ long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent, { OSL_TRACE( "VCLXToolkit::callKeyHandlers: caught %s\n", - ::rtl::OUStringToOString( + OUStringToOString( rEx.Message, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -1711,7 +1711,7 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent, { OSL_TRACE( "VCLXToolkit::callFocusListeners: caught %s\n", - ::rtl::OUStringToOString( + OUStringToOString( rEx.Message, RTL_TEXTENCODING_UTF8).getStr()); } } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index f7912f6acf42..0f1bf33130cf 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -329,7 +329,7 @@ Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() { SolarMutexGuard aGuard; if ( mbDisposed ) - throw DisposedException( ::rtl::OUString(), mrAntiImpl ); + throw DisposedException( OUString(), mrAntiImpl ); if ( !mxWindowStyleSettings.is() ) mxWindowStyleSettings = new ::toolkit::WindowStyleSettings( maListenerContainerMutex, mrAntiImpl ); return mxWindowStyleSettings; @@ -1406,7 +1406,7 @@ namespace } } -void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) +void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1512,7 +1512,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: case BASEPROPERTY_LABEL: case BASEPROPERTY_TITLE: { - ::rtl::OUString aText; + OUString aText; if ( Value >>= aText ) { switch (eWinType) @@ -1534,27 +1534,27 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: break; case BASEPROPERTY_ACCESSIBLENAME: { - ::rtl::OUString aText; + OUString aText; if ( Value >>= aText ) pWindow->SetAccessibleName( aText ); } break; case BASEPROPERTY_HELPURL: { - ::rtl::OUString aURL; + OUString aURL; if ( Value >>= aURL ) { INetURLObject aHelpURL( aURL ); if ( aHelpURL.GetProtocol() == INET_PROT_HID ) - pWindow->SetHelpId( rtl::OUStringToOString( aHelpURL.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); + pWindow->SetHelpId( OUStringToOString( aHelpURL.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); else - pWindow->SetHelpId( rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ) ); + pWindow->SetHelpId( OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ) ); } } break; case BASEPROPERTY_HELPTEXT: { - ::rtl::OUString aHelpText; + OUString aHelpText; if ( Value >>= aHelpText ) { pWindow->SetQuickHelpText( aHelpText ); @@ -1926,14 +1926,14 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: break; case BASEPROPERTY_DEFAULTCONTROL: { - rtl::OUString aName; + OUString aName; Value >>= aName; break; } } } -::com::sun::star::uno::Any VCLXWindow::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXWindow::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2001,26 +2001,26 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: case BASEPROPERTY_LABEL: case BASEPROPERTY_TITLE: { - ::rtl::OUString aText = GetWindow()->GetText(); + OUString aText = GetWindow()->GetText(); aProp <<= aText; } break; case BASEPROPERTY_ACCESSIBLENAME: { - ::rtl::OUString aText = GetWindow()->GetAccessibleName(); + OUString aText = GetWindow()->GetAccessibleName(); aProp <<= aText; } break; case BASEPROPERTY_HELPTEXT: { - ::rtl::OUString aText = GetWindow()->GetQuickHelpText(); + OUString aText = GetWindow()->GetQuickHelpText(); aProp <<= aText; } break; case BASEPROPERTY_HELPURL: { - rtl::OUString aHelpId( rtl::OStringToOUString( GetWindow()->GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); - aProp <<= ::rtl::OUString( aHelpId ); + OUString aHelpId( OStringToOUString( GetWindow()->GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + aProp <<= OUString( aHelpId ); } break; case BASEPROPERTY_FONTDESCRIPTOR: @@ -2582,13 +2582,13 @@ VCLXWindow::getProperties() throw (::com::sun::star::uno::RuntimeException) return GetPropHelper()->getProperties(); } ::com::sun::star::beans::Property SAL_CALL -VCLXWindow::getPropertyByName( const ::rtl::OUString& rName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +VCLXWindow::getPropertyByName( const OUString& rName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { return GetPropHelper()->getPropertyByName( rName ); } ::sal_Bool SAL_CALL -VCLXWindow::hasPropertyByName( const ::rtl::OUString& rName ) throw (::com::sun::star::uno::RuntimeException) +VCLXWindow::hasPropertyByName( const OUString& rName ) throw (::com::sun::star::uno::RuntimeException) { return GetPropHelper()->hasPropertyByName( rName ); } diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 32baeb72ff30..30740d99bf1a 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -44,7 +44,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) { ::com::sun::star::uno::Exception *pException = new ::com::sun::star::uno::RuntimeException; - pException->Message = ::rtl::OUString("not a work window"); + pException->Message = OUString("not a work window"); throw pException; } @@ -75,7 +75,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) { ::com::sun::star::uno::Exception *pException = new ::com::sun::star::uno::RuntimeException; - pException->Message = ::rtl::OUString("incorrect window handle type"); + pException->Message = OUString("incorrect window handle type"); throw pException; } // create system parent data diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index bba1abeb06c5..9e4c5d833578 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -228,7 +228,7 @@ void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, } } -void VCLXGraphicControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXGraphicControl::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -281,7 +281,7 @@ void VCLXGraphicControl::setProperty( const ::rtl::OUString& PropertyName, const } } -::com::sun::star::uno::Any VCLXGraphicControl::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXGraphicControl::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -416,7 +416,7 @@ void VCLXButton::removeItemListener( const ::com::sun::star::uno::Reference< ::c maItemListeners.removeInterface( l ); } -void VCLXButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException) +void VCLXButton::setLabel( const OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -425,7 +425,7 @@ void VCLXButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::sta pWindow->SetText( rLabel ); } -void VCLXButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException) +void VCLXButton::setActionCommand( const OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -479,7 +479,7 @@ void VCLXButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com return AWTSize(aSz); } -void VCLXButton::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXButton::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -524,7 +524,7 @@ void VCLXButton::setProperty( const ::rtl::OUString& PropertyName, const ::com:: } } -::com::sun::star::uno::Any VCLXButton::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXButton::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -683,7 +683,7 @@ void VCLXImageControl::ImplSetNewImage() return aSz; } -void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXImageControl::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -719,7 +719,7 @@ void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const : } } -::com::sun::star::uno::Any VCLXImageControl::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXImageControl::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -837,13 +837,13 @@ void VCLXCheckBox::removeActionListener( const ::com::sun::star::uno::Reference< maActionListeners.removeInterface( l ); } -void VCLXCheckBox::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException) +void VCLXCheckBox::setActionCommand( const OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; maActionCommand = rCommand; } -void VCLXCheckBox::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException) +void VCLXCheckBox::setLabel( const OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -942,7 +942,7 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::Run return AWTSize(aSz); } -void VCLXCheckBox::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXCheckBox::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -978,7 +978,7 @@ void VCLXCheckBox::setProperty( const ::rtl::OUString& PropertyName, const ::com } } -::com::sun::star::uno::Any VCLXCheckBox::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXCheckBox::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1114,7 +1114,7 @@ void VCLXRadioButton::dispose() throw(::com::sun::star::uno::RuntimeException) VCLXGraphicControl::dispose(); } -void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXRadioButton::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1156,7 +1156,7 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const :: } } -::com::sun::star::uno::Any VCLXRadioButton::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXRadioButton::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1209,7 +1209,7 @@ void VCLXRadioButton::removeActionListener( const ::com::sun::star::uno::Referen maActionListeners.removeInterface( l ); } -void VCLXRadioButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException) +void VCLXRadioButton::setLabel( const OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1218,7 +1218,7 @@ void VCLXRadioButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun pWindow->SetText( rLabel ); } -void VCLXRadioButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException) +void VCLXRadioButton::setActionCommand( const OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; maActionCommand = rCommand; @@ -1539,7 +1539,7 @@ void VCLXListBox::removeActionListener( const ::com::sun::star::uno::Reference< maActionListeners.removeInterface( l ); } -void VCLXListBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) +void VCLXListBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1548,7 +1548,7 @@ void VCLXListBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw( pBox->InsertEntry( aItem, nPos ); } -void VCLXListBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString>& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) +void VCLXListBox::addItems( const ::com::sun::star::uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1556,8 +1556,8 @@ void VCLXListBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUStri if ( pBox ) { sal_uInt16 nP = nPos; - const ::rtl::OUString* pItems = aItems.getConstArray(); - const ::rtl::OUString* pItemsEnd = aItems.getConstArray() + aItems.getLength(); + const OUString* pItems = aItems.getConstArray(); + const OUString* pItemsEnd = aItems.getConstArray() + aItems.getLength(); while ( pItems != pItemsEnd ) { if ( (sal_uInt16)nP == 0xFFFF ) @@ -1592,7 +1592,7 @@ sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcept return pBox ? pBox->GetEntryCount() : 0; } -::rtl::OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) +OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1603,20 +1603,20 @@ sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcept return aItem; } -::com::sun::star::uno::Sequence< ::rtl::OUString> VCLXListBox::getItems() throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString> VCLXListBox::getItems() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq; + ::com::sun::star::uno::Sequence< OUString> aSeq; ListBox* pBox = (ListBox*) GetWindow(); if ( pBox ) { sal_uInt16 nEntries = pBox->GetEntryCount(); - aSeq = ::com::sun::star::uno::Sequence< ::rtl::OUString>( nEntries ); + aSeq = ::com::sun::star::uno::Sequence< OUString>( nEntries ); for ( sal_uInt16 n = nEntries; n; ) { --n; - aSeq.getArray()[n] = ::rtl::OUString( pBox->GetEntry( n ) ); + aSeq.getArray()[n] = OUString( pBox->GetEntry( n ) ); } } return aSeq; @@ -1646,7 +1646,7 @@ sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::Runtime return aSeq; } -::rtl::OUString VCLXListBox::getSelectedItem() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXListBox::getSelectedItem() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1657,18 +1657,18 @@ sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::Runtime return aItem; } -::com::sun::star::uno::Sequence< ::rtl::OUString> VCLXListBox::getSelectedItems() throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString> VCLXListBox::getSelectedItems() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq; + ::com::sun::star::uno::Sequence< OUString> aSeq; ListBox* pBox = (ListBox*) GetWindow(); if ( pBox ) { sal_uInt16 nSelEntries = pBox->GetSelectEntryCount(); - aSeq = ::com::sun::star::uno::Sequence< ::rtl::OUString>( nSelEntries ); + aSeq = ::com::sun::star::uno::Sequence< OUString>( nSelEntries ); for ( sal_uInt16 n = 0; n < nSelEntries; n++ ) - aSeq.getArray()[n] = ::rtl::OUString( pBox->GetSelectEntry( n ) ); + aSeq.getArray()[n] = OUString( pBox->GetSelectEntry( n ) ); } return aSeq; } @@ -1723,7 +1723,7 @@ void VCLXListBox::selectItemsPos( const ::com::sun::star::uno::Sequence aItems; + ::com::sun::star::uno::Sequence< OUString> aItems; if ( Value >>= aItems ) { pListBox->Clear(); @@ -1918,7 +1918,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com: } } -::com::sun::star::uno::Any VCLXListBox::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXListBox::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1955,8 +1955,8 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com: case BASEPROPERTY_STRINGITEMLIST: { sal_uInt16 nItems = pListBox->GetEntryCount(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq( nItems ); - ::rtl::OUString* pStrings = aSeq.getArray(); + ::com::sun::star::uno::Sequence< OUString> aSeq( nItems ); + OUString* pStrings = aSeq.getArray(); for ( sal_uInt16 n = 0; n < nItems; n++ ) pStrings[n] = pListBox->GetEntry( n ); aProp <<= aSeq; @@ -2052,7 +2052,7 @@ void VCLXListBox::ImplCallItemListeners() } namespace { - Image lcl_getImageFromURL( const ::rtl::OUString& i_rImageURL ) + Image lcl_getImageFromURL( const OUString& i_rImageURL ) { if ( i_rImageURL.isEmpty() ) return Image(); @@ -2083,7 +2083,7 @@ void SAL_CALL VCLXListBox::listItemInserted( const ItemListEvent& i_rEvent ) thr ENSURE_OR_RETURN_VOID( ( i_rEvent.ItemPosition >= 0 ) && ( i_rEvent.ItemPosition <= sal_Int32( pListBox->GetEntryCount() ) ), "VCLXListBox::listItemInserted: illegal (inconsistent) item position!" ); pListBox->InsertEntry( - i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : ::rtl::OUString(), + i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : OUString(), i_rEvent.ItemImageURL.IsPresent ? TkResMgr::getImageFromURL( i_rEvent.ItemImageURL.Value ) : Image(), i_rEvent.ItemPosition ); } @@ -2113,7 +2113,7 @@ void SAL_CALL VCLXListBox::listItemModified( const ItemListEvent& i_rEvent ) thr // VCL's ListBox does not support changing an entry's text or image, so remove and re-insert - const ::rtl::OUString sNewText = i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : ::rtl::OUString( pListBox->GetEntry( i_rEvent.ItemPosition ) ); + const OUString sNewText = i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : OUString( pListBox->GetEntry( i_rEvent.ItemPosition ) ); const Image aNewImage( i_rEvent.ItemImageURL.IsPresent ? TkResMgr::getImageFromURL( i_rEvent.ItemImageURL.Value ) : pListBox->GetEntryImage( i_rEvent.ItemPosition ) ); pListBox->RemoveEntry( i_rEvent.ItemPosition ); @@ -2144,20 +2144,20 @@ void SAL_CALL VCLXListBox::itemListChanged( const EventObject& i_rEvent ) throw uno::Reference< beans::XPropertySet > xPropSet( i_rEvent.Source, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW ); uno::Reference< resource::XStringResourceResolver > xStringResourceResolver; - if ( xPSI->hasPropertyByName( ::rtl::OUString( "ResourceResolver" ) ) ) + if ( xPSI->hasPropertyByName( OUString( "ResourceResolver" ) ) ) { xStringResourceResolver.set( - xPropSet->getPropertyValue( ::rtl::OUString( "ResourceResolver" ) ), + xPropSet->getPropertyValue( OUString( "ResourceResolver" ) ), uno::UNO_QUERY ); } Reference< XItemList > xItemList( i_rEvent.Source, uno::UNO_QUERY_THROW ); - uno::Sequence< beans::Pair< ::rtl::OUString, ::rtl::OUString > > aItems = xItemList->getAllItems(); + uno::Sequence< beans::Pair< OUString, OUString > > aItems = xItemList->getAllItems(); for ( sal_Int32 i=0; iresolveString(aLocalizationKey.copy( 1 )); @@ -2203,7 +2203,7 @@ IMPL_XTYPEPROVIDER_START( VCLXMessageBox ) VCLXTopWindow::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXMessageBox::setCaptionText( const ::rtl::OUString& rText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXMessageBox::setCaptionText( const OUString& rText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2212,7 +2212,7 @@ void VCLXMessageBox::setCaptionText( const ::rtl::OUString& rText ) throw(::com: pWindow->SetText( rText ); } -::rtl::OUString VCLXMessageBox::getCaptionText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXMessageBox::getCaptionText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2223,7 +2223,7 @@ void VCLXMessageBox::setCaptionText( const ::rtl::OUString& rText ) throw(::com: return aText; } -void VCLXMessageBox::setMessageText( const ::rtl::OUString& rText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXMessageBox::setMessageText( const OUString& rText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2232,11 +2232,11 @@ void VCLXMessageBox::setMessageText( const ::rtl::OUString& rText ) throw(::com: pBox->SetMessText( rText ); } -::rtl::OUString VCLXMessageBox::getMessageText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXMessageBox::getMessageText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; MessBox* pBox = (MessBox*)GetWindow(); if ( pBox ) aText = pBox->GetMessText(); @@ -2302,16 +2302,16 @@ void SAL_CALL VCLXDialog::endDialog( ::sal_Int32 i_result ) throw (RuntimeExcept pDialog->EndDialog( i_result ); } -void SAL_CALL VCLXDialog::setHelpId( const ::rtl::OUString& rId ) throw (RuntimeException) +void SAL_CALL VCLXDialog::setHelpId( const OUString& rId ) throw (RuntimeException) { SolarMutexGuard aGuard; Window* pWindow = GetWindow(); if ( pWindow ) - pWindow->SetHelpId( rtl::OUStringToOString( rId, RTL_TEXTENCODING_UTF8 ) ); + pWindow->SetHelpId( OUStringToOString( rId, RTL_TEXTENCODING_UTF8 ) ); } -void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException) +void VCLXDialog::setTitle( const OUString& Title ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2320,11 +2320,11 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star pWindow->SetText( Title ); } -::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aTitle; + OUString aTitle; Window* pWindow = GetWindow(); if ( pWindow ) aTitle = pWindow->GetText(); @@ -2399,7 +2399,7 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::s } void SAL_CALL VCLXDialog::setProperty( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { @@ -2528,11 +2528,11 @@ throw(::com::sun::star::uno::RuntimeException) return aInfo; } -uno::Any SAL_CALL VCLXMultiPage::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +uno::Any SAL_CALL VCLXMultiPage::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; OSL_TRACE(" **** VCLXMultiPage::getProperty( %s )", - rtl::OUStringToOString( PropertyName, + OUStringToOString( PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() ); ::com::sun::star::uno::Any aProp; sal_uInt16 nPropType = GetPropertyId( PropertyName ); @@ -2551,12 +2551,12 @@ uno::Any SAL_CALL VCLXMultiPage::getProperty( const ::rtl::OUString& PropertyNam } void SAL_CALL VCLXMultiPage::setProperty( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - OSL_TRACE(" **** VCLXMultiPage::setProperty( %s )", rtl::OUStringToOString( PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE(" **** VCLXMultiPage::setProperty( %s )", OUStringToOString( PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() ); TabControl* pTabControl = (TabControl*)GetWindow(); if ( pTabControl ) @@ -2618,11 +2618,11 @@ sal_Int32 SAL_CALL VCLXMultiPage::insertTab() throw (uno::RuntimeException) { TabControl *pTabControl = getTabControl(); TabPage* pTab = new TabPage( pTabControl ); - rtl::OUString title (""); + OUString title (""); return static_cast< sal_Int32 >( insertTab( pTab, title ) ); } -sal_uInt16 VCLXMultiPage::insertTab( TabPage* pPage, rtl::OUString& sTitle ) +sal_uInt16 VCLXMultiPage::insertTab( TabPage* pPage, OUString& sTitle ) { TabControl *pTabControl = getTabControl(); sal_uInt16 id = sal::static_int_cast< sal_uInt16 >( mTabId++ ); @@ -2674,12 +2674,12 @@ void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< bea for (sal_Int32 i = 0; i < Properties.getLength(); ++i) { - const rtl::OUString &name = Properties[i].Name; + const OUString &name = Properties[i].Name; const uno::Any &value = Properties[i].Value; if (name == "Title") { - rtl::OUString title = value.get(); + OUString title = value.get(); pTabControl->SetPageText( sal::static_int_cast< sal_uInt16 >( ID ), title ); } } @@ -2695,13 +2695,13 @@ uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int3 #define ADD_PROP( seq, i, name, val ) { \ beans::NamedValue value; \ - value.Name = rtl::OUString( name ); \ + value.Name = OUString( name ); \ value.Value = uno::makeAny( val ); \ seq[i] = value; \ } uno::Sequence< beans::NamedValue > props( 2 ); - ADD_PROP( props, 0, "Title", rtl::OUString( pTabControl->GetPageText( sal::static_int_cast< sal_uInt16 >( ID ) ) ) ); + ADD_PROP( props, 0, "Title", OUString( pTabControl->GetPageText( sal::static_int_cast< sal_uInt16 >( ID ) ) ) ); ADD_PROP( props, 1, "Position", pTabControl->GetPagePos( sal::static_int_cast< sal_uInt16 >( ID ) ) ); #undef ADD_PROP return props; @@ -2802,7 +2802,7 @@ throw(::com::sun::star::uno::RuntimeException) } void SAL_CALL VCLXTabPage::setProperty( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { @@ -2840,7 +2840,7 @@ throw(::com::sun::star::uno::RuntimeException) break; case BASEPROPERTY_TITLE: { - ::rtl::OUString sTitle; + OUString sTitle; if ( Value >>= sTitle ) { pTabPage->SetText(sTitle); @@ -2918,7 +2918,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve else { // open the URL - ::rtl::OUString sURL; + OUString sURL; FixedHyperlink* pBase = (FixedHyperlink*)GetWindow(); if ( pBase ) sURL = pBase->GetURL(); @@ -2930,7 +2930,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve { // start browser xSystemShellExecute->execute( - sURL, ::rtl::OUString(), ::com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + sURL, OUString(), ::com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); } catch( uno::Exception& ) { @@ -2950,7 +2950,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve return getAccessibleFactory().createAccessibleContext( this ); } -void VCLXFixedHyperlink::setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException) +void VCLXFixedHyperlink::setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2959,18 +2959,18 @@ void VCLXFixedHyperlink::setText( const ::rtl::OUString& Text ) throw(::com::sun pBase->SetText(Text); } -::rtl::OUString VCLXFixedHyperlink::getText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXFixedHyperlink::getText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); return aText; } -void VCLXFixedHyperlink::setURL( const ::rtl::OUString& URL ) throw(::com::sun::star::uno::RuntimeException) +void VCLXFixedHyperlink::setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -2979,11 +2979,11 @@ void VCLXFixedHyperlink::setURL( const ::rtl::OUString& URL ) throw(::com::sun:: pBase->SetURL( URL ); } -::rtl::OUString VCLXFixedHyperlink::getURL( ) throw(::com::sun::star::uno::RuntimeException) +OUString VCLXFixedHyperlink::getURL( ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; FixedHyperlink* pBase = (FixedHyperlink*)GetWindow(); if ( pBase ) aText = pBase->GetURL(); @@ -3070,7 +3070,7 @@ void VCLXFixedHyperlink::removeActionListener( const ::com::sun::star::uno::Refe return aSz; } -void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXFixedHyperlink::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3082,7 +3082,7 @@ void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const { case BASEPROPERTY_LABEL: { - ::rtl::OUString sNewLabel; + OUString sNewLabel; if ( Value >>= sNewLabel ) pBase->SetText(sNewLabel); break; @@ -3090,7 +3090,7 @@ void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const case BASEPROPERTY_URL: { - ::rtl::OUString sNewURL; + OUString sNewURL; if ( Value >>= sNewURL ) pBase->SetURL( sNewURL ); break; @@ -3104,7 +3104,7 @@ void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const } } -::com::sun::star::uno::Any VCLXFixedHyperlink::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXFixedHyperlink::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3117,7 +3117,7 @@ void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const { case BASEPROPERTY_URL: { - aProp = makeAny( ::rtl::OUString( pBase->GetURL() ) ); + aProp = makeAny( OUString( pBase->GetURL() ) ); break; } @@ -3212,7 +3212,7 @@ IMPL_XTYPEPROVIDER_END return getAccessibleFactory().createAccessibleContext( this ); } -void VCLXFixedText::setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException) +void VCLXFixedText::setText( const OUString& Text ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3221,11 +3221,11 @@ void VCLXFixedText::setText( const ::rtl::OUString& Text ) throw(::com::sun::sta pWindow->SetText( Text ); } -::rtl::OUString VCLXFixedText::getText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXFixedText::getText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); @@ -3531,7 +3531,7 @@ sal_Int32 VCLXScrollBar::getOrientation() throw(::com::sun::star::uno::RuntimeEx } // ::com::sun::star::awt::VclWindowPeer -void VCLXScrollBar::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXScrollBar::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3646,7 +3646,7 @@ void VCLXScrollBar::setProperty( const ::rtl::OUString& PropertyName, const ::co } } -::com::sun::star::uno::Any VCLXScrollBar::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXScrollBar::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3864,7 +3864,7 @@ void VCLXEdit::removeTextListener( const ::com::sun::star::uno::Reference< ::com GetTextListeners().removeInterface( l ); } -void VCLXEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXEdit::setText( const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3881,7 +3881,7 @@ void VCLXEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::u } } -void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) +void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -3899,22 +3899,22 @@ void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const : } } -::rtl::OUString VCLXEdit::getText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXEdit::getText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); return aText; } -::rtl::OUString VCLXEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aText; + OUString aText; Edit* pEdit = (Edit*) GetWindow(); if ( pEdit) aText = pEdit->GetSelected(); @@ -3986,7 +3986,7 @@ void VCLXEdit::setEchoChar( sal_Unicode cEcho ) throw(::com::sun::star::uno::Run pEdit->SetEchoChar( cEcho ); } -void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXEdit::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4031,7 +4031,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su } } -::com::sun::star::uno::Any VCLXEdit::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXEdit::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4246,7 +4246,7 @@ void VCLXComboBox::removeActionListener( const ::com::sun::star::uno::Reference< maActionListeners.removeInterface( l ); } -void VCLXComboBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) +void VCLXComboBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4255,7 +4255,7 @@ void VCLXComboBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw pBox->InsertEntry( aItem, nPos ); } -void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString>& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) +void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4296,27 +4296,27 @@ sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcep return pBox ? pBox->GetEntryCount() : 0; } -::rtl::OUString VCLXComboBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) +OUString VCLXComboBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aItem; + OUString aItem; ComboBox* pBox = (ComboBox*) GetWindow(); if ( pBox ) aItem = pBox->GetEntry( nPos ); return aItem; } -::com::sun::star::uno::Sequence< ::rtl::OUString> VCLXComboBox::getItems() throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString> VCLXComboBox::getItems() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq; + ::com::sun::star::uno::Sequence< OUString> aSeq; ComboBox* pBox = (ComboBox*) GetWindow(); if ( pBox ) { sal_uInt16 nEntries = pBox->GetEntryCount(); - aSeq = ::com::sun::star::uno::Sequence< ::rtl::OUString>( nEntries ); + aSeq = ::com::sun::star::uno::Sequence< OUString>( nEntries ); for ( sal_uInt16 n = nEntries; n; ) { --n; @@ -4346,7 +4346,7 @@ sal_Int16 VCLXComboBox::getDropDownLineCount() throw(::com::sun::star::uno::Runt return nLines; } -void VCLXComboBox::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXComboBox::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4372,7 +4372,7 @@ void VCLXComboBox::setProperty( const ::rtl::OUString& PropertyName, const ::com break; case BASEPROPERTY_STRINGITEMLIST: { - ::com::sun::star::uno::Sequence< ::rtl::OUString> aItems; + ::com::sun::star::uno::Sequence< OUString> aItems; if ( Value >>= aItems ) { pComboBox->Clear(); @@ -4396,7 +4396,7 @@ void VCLXComboBox::setProperty( const ::rtl::OUString& PropertyName, const ::com } } -::com::sun::star::uno::Any VCLXComboBox::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXComboBox::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4420,8 +4420,8 @@ void VCLXComboBox::setProperty( const ::rtl::OUString& PropertyName, const ::com case BASEPROPERTY_STRINGITEMLIST: { sal_uInt16 nItems = pComboBox->GetEntryCount(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq( nItems ); - ::rtl::OUString* pStrings = aSeq.getArray(); + ::com::sun::star::uno::Sequence< OUString> aSeq( nItems ); + OUString* pStrings = aSeq.getArray(); for ( sal_uInt16 n = 0; n < nItems; n++ ) pStrings[n] = pComboBox->GetEntry( n ); aProp <<= aSeq; @@ -4555,7 +4555,7 @@ void SAL_CALL VCLXComboBox::listItemInserted( const ItemListEvent& i_rEvent ) th ENSURE_OR_RETURN_VOID( ( i_rEvent.ItemPosition >= 0 ) && ( i_rEvent.ItemPosition <= sal_Int32( pComboBox->GetEntryCount() ) ), "VCLXComboBox::listItemInserted: illegal (inconsistent) item position!" ); pComboBox->InsertEntry( - i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : ::rtl::OUString(), + i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : OUString(), i_rEvent.ItemImageURL.IsPresent ? lcl_getImageFromURL( i_rEvent.ItemImageURL.Value ) : Image(), i_rEvent.ItemPosition ); } @@ -4585,7 +4585,7 @@ void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent ) th // VCL's ComboBox does not support changing an entry's text or image, so remove and re-insert - const ::rtl::OUString sNewText = i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : ::rtl::OUString( pComboBox->GetEntry( i_rEvent.ItemPosition ) ); + const OUString sNewText = i_rEvent.ItemText.IsPresent ? i_rEvent.ItemText.Value : OUString( pComboBox->GetEntry( i_rEvent.ItemPosition ) ); const Image aNewImage( i_rEvent.ItemImageURL.IsPresent ? lcl_getImageFromURL( i_rEvent.ItemImageURL.Value ) : pComboBox->GetEntryImage( i_rEvent.ItemPosition ) ); pComboBox->RemoveEntry( i_rEvent.ItemPosition ); @@ -4615,22 +4615,22 @@ void SAL_CALL VCLXComboBox::itemListChanged( const EventObject& i_rEvent ) throw uno::Reference< beans::XPropertySet > xPropSet( i_rEvent.Source, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW ); - // bool localize = xPSI->hasPropertyByName( ::rtl::OUString( "ResourceResolver" ) ); + // bool localize = xPSI->hasPropertyByName( OUString( "ResourceResolver" ) ); uno::Reference< resource::XStringResourceResolver > xStringResourceResolver; - if ( xPSI->hasPropertyByName( ::rtl::OUString( "ResourceResolver" ) ) ) + if ( xPSI->hasPropertyByName( OUString( "ResourceResolver" ) ) ) { xStringResourceResolver.set( - xPropSet->getPropertyValue( ::rtl::OUString( "ResourceResolver" ) ), + xPropSet->getPropertyValue( OUString( "ResourceResolver" ) ), uno::UNO_QUERY ); } Reference< XItemList > xItemList( i_rEvent.Source, uno::UNO_QUERY_THROW ); - uno::Sequence< beans::Pair< ::rtl::OUString, ::rtl::OUString > > aItems = xItemList->getAllItems(); + uno::Sequence< beans::Pair< OUString, OUString > > aItems = xItemList->getAllItems(); for ( sal_Int32 i=0; iresolveString(aLocalizationKey.copy( 1 )); @@ -4679,7 +4679,7 @@ sal_Bool VCLXFormattedSpinField::isStrictFormat() } -void VCLXFormattedSpinField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4718,7 +4718,7 @@ void VCLXFormattedSpinField::setProperty( const ::rtl::OUString& PropertyName, c } } -::com::sun::star::uno::Any VCLXFormattedSpinField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXFormattedSpinField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4812,7 +4812,7 @@ IMPL_XTYPEPROVIDER_START( VCLXDateField ) VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXDateField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXDateField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -4881,7 +4881,7 @@ void VCLXDateField::setProperty( const ::rtl::OUString& PropertyName, const ::co } } -::com::sun::star::uno::Any VCLXDateField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXDateField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5295,7 +5295,7 @@ sal_Bool VCLXTimeField::isStrictFormat() throw(::com::sun::star::uno::RuntimeExc } -void VCLXTimeField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5357,7 +5357,7 @@ void VCLXTimeField::setProperty( const ::rtl::OUString& PropertyName, const ::co } } -::com::sun::star::uno::Any VCLXTimeField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXTimeField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5625,7 +5625,7 @@ sal_Int16 VCLXNumericField::getDecimalDigits() throw(::com::sun::star::uno::Runt return pNumericFormatter ? pNumericFormatter->GetDecimalDigits() : 0; } -void VCLXNumericField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXNumericField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5694,7 +5694,7 @@ void VCLXNumericField::setProperty( const ::rtl::OUString& PropertyName, const : } } -::com::sun::star::uno::Any VCLXNumericField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXNumericField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5913,7 +5913,7 @@ sal_Int16 VCLXMetricField::getDecimalDigits() throw(::com::sun::star::uno::Runti return pNumericFormatter ? pNumericFormatter->GetDecimalDigits() : 0; } -void VCLXMetricField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXMetricField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5945,7 +5945,7 @@ void VCLXMetricField::setProperty( const ::rtl::OUString& PropertyName, const :: } case BASEPROPERTY_CUSTOMUNITTEXT: { - rtl::OUString aStr; + OUString aStr; if ( Value >>= aStr ) ((MetricField*)GetWindow())->SetCustomUnitText( aStr ); break; @@ -5959,7 +5959,7 @@ void VCLXMetricField::setProperty( const ::rtl::OUString& PropertyName, const :: } } -::com::sun::star::uno::Any VCLXMetricField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -5977,7 +5977,7 @@ void VCLXMetricField::setProperty( const ::rtl::OUString& PropertyName, const :: aProp <<= (sal_uInt16) ((MetricField*)GetWindow())->GetUnit(); break; case BASEPROPERTY_CUSTOMUNITTEXT: - aProp <<= rtl::OUString (((MetricField*)GetWindow())->GetCustomUnitText()); + aProp <<= OUString (((MetricField*)GetWindow())->GetCustomUnitText()); break; default: { @@ -6221,7 +6221,7 @@ sal_Int16 VCLXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::Run return pCurrencyFormatter ? pCurrencyFormatter->GetDecimalDigits() : 0; } -void VCLXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -6277,7 +6277,7 @@ void VCLXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const break; case BASEPROPERTY_CURRENCYSYMBOL: { - ::rtl::OUString aString; + OUString aString; if ( Value >>= aString ) ((LongCurrencyField*)GetWindow())->SetCurrencySymbol( aString ); } @@ -6297,7 +6297,7 @@ void VCLXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const } } -::com::sun::star::uno::Any VCLXCurrencyField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXCurrencyField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -6330,7 +6330,7 @@ void VCLXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const break; case BASEPROPERTY_CURRENCYSYMBOL: { - aProp <<= ::rtl::OUString( ((LongCurrencyField*)GetWindow())->GetCurrencySymbol() ); + aProp <<= OUString( ((LongCurrencyField*)GetWindow())->GetCurrencySymbol() ); } break; case BASEPROPERTY_NUMSHOWTHOUSANDSEP: @@ -6403,30 +6403,30 @@ IMPL_XTYPEPROVIDER_START( VCLXPatternField ) VCLXFormattedSpinField::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXPatternField::setMasks( const ::rtl::OUString& EditMask, const ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException) +void VCLXPatternField::setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; PatternField* pPatternField = (PatternField*) GetWindow(); if ( pPatternField ) { - pPatternField->SetMask( rtl::OUStringToOString(EditMask, RTL_TEXTENCODING_ASCII_US), LiteralMask ); + pPatternField->SetMask( OUStringToOString(EditMask, RTL_TEXTENCODING_ASCII_US), LiteralMask ); } } -void VCLXPatternField::getMasks( ::rtl::OUString& EditMask, ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException) +void VCLXPatternField::getMasks( OUString& EditMask, OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; PatternField* pPatternField = (PatternField*) GetWindow(); if ( pPatternField ) { - EditMask = rtl::OStringToOUString(pPatternField->GetEditMask(), RTL_TEXTENCODING_ASCII_US); + EditMask = OStringToOUString(pPatternField->GetEditMask(), RTL_TEXTENCODING_ASCII_US); LiteralMask = pPatternField->GetLiteralMask(); } } -void VCLXPatternField::setString( const ::rtl::OUString& Str ) throw(::com::sun::star::uno::RuntimeException) +void VCLXPatternField::setString( const OUString& Str ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -6437,11 +6437,11 @@ void VCLXPatternField::setString( const ::rtl::OUString& Str ) throw(::com::sun: } } -::rtl::OUString VCLXPatternField::getString() throw(::com::sun::star::uno::RuntimeException) +OUString VCLXPatternField::getString() throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aString; + OUString aString; PatternField* pPatternField = (PatternField*) GetWindow(); if ( pPatternField ) aString = pPatternField->GetString(); @@ -6458,7 +6458,7 @@ sal_Bool VCLXPatternField::isStrictFormat() throw(::com::sun::star::uno::Runtime return VCLXFormattedSpinField::isStrictFormat(); } -void VCLXPatternField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXPatternField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -6470,10 +6470,10 @@ void VCLXPatternField::setProperty( const ::rtl::OUString& PropertyName, const : case BASEPROPERTY_EDITMASK: case BASEPROPERTY_LITERALMASK: { - ::rtl::OUString aString; + OUString aString; if ( Value >>= aString ) { - ::rtl::OUString aEditMask, aLiteralMask; + OUString aEditMask, aLiteralMask; getMasks( aEditMask, aLiteralMask ); if ( nPropType == BASEPROPERTY_EDITMASK ) aEditMask = aString; @@ -6491,7 +6491,7 @@ void VCLXPatternField::setProperty( const ::rtl::OUString& PropertyName, const : } } -::com::sun::star::uno::Any VCLXPatternField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXPatternField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -6504,7 +6504,7 @@ void VCLXPatternField::setProperty( const ::rtl::OUString& PropertyName, const : case BASEPROPERTY_EDITMASK: case BASEPROPERTY_LITERALMASK: { - ::rtl::OUString aEditMask, aLiteralMask; + OUString aEditMask, aLiteralMask; getMasks( aEditMask, aLiteralMask ); if ( nPropType == BASEPROPERTY_EDITMASK ) aProp <<= aEditMask; @@ -6605,7 +6605,7 @@ throw(::com::sun::star::uno::RuntimeException) } void SAL_CALL VCLXFrame::setProperty( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { diff --git a/toolkit/source/awt/xsimpleanimation.cxx b/toolkit/source/awt/xsimpleanimation.cxx index fb170c1bf73e..0e3d857f225a 100644 --- a/toolkit/source/awt/xsimpleanimation.cxx +++ b/toolkit/source/awt/xsimpleanimation.cxx @@ -76,7 +76,7 @@ namespace toolkit } //-------------------------------------------------------------------- - void SAL_CALL XSimpleAnimation::setProperty( const ::rtl::OUString& PropertyName, const uno::Any& Value ) + void SAL_CALL XSimpleAnimation::setProperty( const OUString& PropertyName, const uno::Any& Value ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -110,7 +110,7 @@ namespace toolkit } //-------------------------------------------------------------------- - uno::Any SAL_CALL XSimpleAnimation::getProperty( const ::rtl::OUString& PropertyName ) + uno::Any SAL_CALL XSimpleAnimation::getProperty( const OUString& PropertyName ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 2edc94a49d6f..7be5732e1799 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -147,14 +147,14 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription( ) throw (RuntimeException) { OContextEntryGuard aGuard( this ); return getModelStringProperty( "HelpText" ); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAccessibleControlContext::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL OAccessibleControlContext::getAccessibleName( ) throw (RuntimeException) { OContextEntryGuard aGuard( this ); return getModelStringProperty( "Name" ); @@ -204,15 +204,15 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName ) + OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName ) { - ::rtl::OUString sReturn; + OUString sReturn; try { if ( !m_xModelPropsInfo.is() && m_xControlModel.is() ) m_xModelPropsInfo = m_xControlModel->getPropertySetInfo(); - ::rtl::OUString sPropertyName( ::rtl::OUString::createFromAscii( _pPropertyName ) ); + OUString sPropertyName( OUString::createFromAscii( _pPropertyName ) ); if ( m_xModelPropsInfo.is() && m_xModelPropsInfo->hasPropertyByName( sPropertyName ) ) m_xControlModel->getPropertyValue( sPropertyName ) >>= sReturn; } diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index c91b0b71e4a3..e2cd1d9359d9 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -71,9 +71,9 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString AnimatedImagesControl::GetComponentServiceName() + OUString AnimatedImagesControl::GetComponentServiceName() { - return ::rtl::OUString( "AnimatedImages" ); + return OUString( "AnimatedImages" ); } //------------------------------------------------------------------------------------------------------------------ @@ -102,17 +102,17 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL AnimatedImagesControl::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL AnimatedImagesControl::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.toolkit.AnimatedImagesControl" ); + return OUString( "org.openoffice.comp.toolkit.AnimatedImagesControl" ); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL AnimatedImagesControl::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL AnimatedImagesControl::getSupportedServiceNames() throw(RuntimeException) { - Sequence< ::rtl::OUString > aServices( AnimatedImagesControl_Base::getSupportedServiceNames() ); + Sequence< OUString > aServices( AnimatedImagesControl_Base::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 1 ); - aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName_AnimatedImagesControl ); + aServices[ aServices.getLength() - 1 ] = OUString::createFromAscii( szServiceName_AnimatedImagesControl ); return aServices; } @@ -194,7 +194,7 @@ namespace toolkit //================================================================================================================== struct AnimatedImagesControlModel_Data { - ::std::vector< Sequence< ::rtl::OUString > > aImageSets; + ::std::vector< Sequence< OUString > > aImageSets; }; namespace @@ -203,12 +203,12 @@ namespace toolkit const bool i_forInsert = false ) { if ( ( i_index < 0 ) || ( size_t( i_index ) > i_data.aImageSets.size() + ( i_forInsert ? 1 : 0 ) ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), i_context ); + throw IndexOutOfBoundsException( OUString(), i_context ); } void lcl_notify( ::osl::ClearableMutexGuard& i_guard, ::cppu::OBroadcastHelper& i_broadcaseHelper, void ( SAL_CALL XContainerListener::*i_notificationMethod )( const ContainerEvent& ), - const sal_Int32 i_accessor, const Sequence< ::rtl::OUString >& i_imageURLs, const Reference< XInterface >& i_context ) + const sal_Int32 i_accessor, const Sequence< OUString >& i_imageURLs, const Reference< XInterface >& i_context ) { ::cppu::OInterfaceContainerHelper* pContainerListeners = i_broadcaseHelper.getContainer( XContainerListener::static_type() ); if ( pContainerListeners == NULL ) @@ -270,22 +270,22 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL AnimatedImagesControlModel::getServiceName() throw(RuntimeException) + OUString SAL_CALL AnimatedImagesControlModel::getServiceName() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_AnimatedImagesControlModel ); + return OUString::createFromAscii( szServiceName_AnimatedImagesControlModel ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.toolkit.AnimatedImagesControlModel"); + return OUString("org.openoffice.comp.toolkit.AnimatedImagesControlModel"); } //------------------------------------------------------------------------------------------------------------------ Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getSupportedServiceNames() throw(RuntimeException) { Sequence< OUString > aServiceNames(2); - aServiceNames[0] = ::rtl::OUString::createFromAscii( szServiceName_AnimatedImagesControlModel ); + aServiceNames[0] = OUString::createFromAscii( szServiceName_AnimatedImagesControlModel ); aServiceNames[1] = "com.sun.star.awt.UnoControlModel"; return aServiceNames; } @@ -303,7 +303,7 @@ namespace toolkit && ( nImageScaleMode != ImageScaleMode::Isotropic ) && ( nImageScaleMode != ImageScaleMode::Anisotropic ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); } break; } @@ -317,7 +317,7 @@ namespace toolkit switch ( i_propertyId ) { case BASEPROPERTY_DEFAULTCONTROL: - return makeAny( ::rtl::OUString::createFromAscii( szServiceName_AnimatedImagesControl ) ); + return makeAny( OUString::createFromAscii( szServiceName_AnimatedImagesControl ) ); case BASEPROPERTY_BORDER: return makeAny( VisualEffect::NONE ); @@ -401,7 +401,7 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL AnimatedImagesControlModel::getImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException) + Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( GetBroadcastHelper().bDisposed || GetBroadcastHelper().bInDispose ) @@ -413,7 +413,7 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL AnimatedImagesControlModel::insertImageSet( ::sal_Int32 i_index, const Sequence< ::rtl::OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AnimatedImagesControlModel::insertImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // sanity checks @@ -430,7 +430,7 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL AnimatedImagesControlModel::replaceImageSet( ::sal_Int32 i_index, const Sequence< ::rtl::OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AnimatedImagesControlModel::replaceImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // sanity checks @@ -457,8 +457,8 @@ namespace toolkit lcl_checkIndex( *m_pData, i_index, *this ); // actual removal - ::std::vector< Sequence< ::rtl::OUString > >::iterator removalPos = m_pData->aImageSets.begin() + i_index; - Sequence< ::rtl::OUString > aRemovedElement( *removalPos ); + ::std::vector< Sequence< OUString > >::iterator removalPos = m_pData->aImageSets.begin() + i_index; + Sequence< OUString > aRemovedElement( *removalPos ); m_pData->aImageSets.erase( removalPos ); // listener notification diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 1f087e9d2ee4..52f290fdd3d8 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -76,7 +76,7 @@ using namespace toolkit; #define PROPERTY_RESOURCERESOLVER OUString( "ResourceResolver" ) //HELPER -::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); +OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); struct LanguageDependentProp { @@ -127,10 +127,10 @@ struct DisposeControlModel : public ::std::unary_function< Reference< XControlMo struct FindControlModel : public ::std::unary_function< ControlModelContainerBase::UnoControlModelHolder, bool > { private: - const ::rtl::OUString& m_rName; + const OUString& m_rName; public: - FindControlModel( const ::rtl::OUString& _rName ) : m_rName( _rName ) { } + FindControlModel( const OUString& _rName ) : m_rName( _rName ) { } bool operator()( const ControlModelContainerBase::UnoControlModelHolder& _rCompare ) { @@ -195,16 +195,16 @@ static void lcl_throwElementExistException( ) } // ---------------------------------------------------------------------------- -static const ::rtl::OUString& getTabIndexPropertyName( ) +static const OUString& getTabIndexPropertyName( ) { - static const ::rtl::OUString s_sTabIndexProperty( "TabIndex" ); + static const OUString s_sTabIndexProperty( "TabIndex" ); return s_sTabIndexProperty; } // ---------------------------------------------------------------------------- -static const ::rtl::OUString& getStepPropertyName( ) +static const OUString& getStepPropertyName( ) { - static const ::rtl::OUString s_sStepProperty( "Step" ); + static const OUString s_sStepProperty( "Step" ); return s_sStepProperty; } @@ -240,7 +240,7 @@ Any ControlModelContainerBase::ImplGetDefaultValue( sal_uInt16 nPropId ) const switch ( nPropId ) { case BASEPROPERTY_DEFAULTCONTROL: - aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlDialog ); + aAny <<= OUString::createFromAscii( szServiceName_UnoControlDialog ); break; default: aAny = UnoControlModel::ImplGetDefaultValue( nPropId ); @@ -319,13 +319,13 @@ UnoControlModel* ControlModelContainerBase::Clone() const return pClone; } -ControlModelContainerBase::UnoControlModelHolderList::iterator ControlModelContainerBase::ImplFindElement( const ::rtl::OUString& rName ) +ControlModelContainerBase::UnoControlModelHolderList::iterator ControlModelContainerBase::ImplFindElement( const OUString& rName ) { return ::std::find_if( maModels.begin(), maModels.end(), FindControlModel( rName ) ); } // ::XMultiServiceFactory -Reference< XInterface > ControlModelContainerBase::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(Exception, RuntimeException) +Reference< XInterface > ControlModelContainerBase::createInstance( const OUString& aServiceSpecifier ) throw(Exception, RuntimeException) { SolarMutexGuard aGuard; @@ -412,7 +412,7 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const ::rtl:: return xNewModel; } -Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const Sequence< Any >& i_arguments ) throw(Exception, RuntimeException) +Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& i_arguments ) throw(Exception, RuntimeException) { const Reference< XInterface > xInstance( createInstance( ServiceSpecifier ) ); const Reference< XInitialization > xInstanceInit( xInstance, UNO_QUERY ); @@ -421,39 +421,39 @@ Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( return xInstance; } -Sequence< ::rtl::OUString > ControlModelContainerBase::getAvailableServiceNames() throw(RuntimeException) +Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() throw(RuntimeException) { - static Sequence< ::rtl::OUString >* pNamesSeq = NULL; + static Sequence< OUString >* pNamesSeq = NULL; if ( !pNamesSeq ) { - pNamesSeq = new Sequence< ::rtl::OUString >( 26 ); - ::rtl::OUString* pNames = pNamesSeq->getArray(); - pNames[0] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlEditModel ); - pNames[1] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFormattedFieldModel ); - pNames[2] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFileControlModel ); - pNames[3] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlButtonModel ); - pNames[4] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlImageControlModel ); - pNames[5] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlRadioButtonModel ); - pNames[6] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlCheckBoxModel ); - pNames[7] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFixedTextModel ); - pNames[8] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlGroupBoxModel ); - pNames[9] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlListBoxModel ); - pNames[10] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlComboBoxModel ); - pNames[11] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlDateFieldModel ); - pNames[12] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlTimeFieldModel ); - pNames[13] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlNumericFieldModel ); - pNames[14] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlCurrencyFieldModel ); - pNames[15] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlPatternFieldModel ); - pNames[16] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlProgressBarModel ); - pNames[17] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlScrollBarModel ); - pNames[18] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFixedLineModel ); - pNames[19] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlRoadmapModel ); - pNames[20] = ::rtl::OUString::createFromAscii( szServiceName_TreeControlModel ); - pNames[21] = ::rtl::OUString::createFromAscii( szServiceName_GridControlModel ); - pNames[22] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel ); - pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageModel ); - pNames[24] = ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel ); - pNames[25] = ::rtl::OUString::createFromAscii( szServiceName_UnoFrameModel ); + pNamesSeq = new Sequence< OUString >( 26 ); + OUString* pNames = pNamesSeq->getArray(); + pNames[0] = OUString::createFromAscii( szServiceName2_UnoControlEditModel ); + pNames[1] = OUString::createFromAscii( szServiceName2_UnoControlFormattedFieldModel ); + pNames[2] = OUString::createFromAscii( szServiceName2_UnoControlFileControlModel ); + pNames[3] = OUString::createFromAscii( szServiceName2_UnoControlButtonModel ); + pNames[4] = OUString::createFromAscii( szServiceName2_UnoControlImageControlModel ); + pNames[5] = OUString::createFromAscii( szServiceName2_UnoControlRadioButtonModel ); + pNames[6] = OUString::createFromAscii( szServiceName2_UnoControlCheckBoxModel ); + pNames[7] = OUString::createFromAscii( szServiceName2_UnoControlFixedTextModel ); + pNames[8] = OUString::createFromAscii( szServiceName2_UnoControlGroupBoxModel ); + pNames[9] = OUString::createFromAscii( szServiceName2_UnoControlListBoxModel ); + pNames[10] = OUString::createFromAscii( szServiceName2_UnoControlComboBoxModel ); + pNames[11] = OUString::createFromAscii( szServiceName2_UnoControlDateFieldModel ); + pNames[12] = OUString::createFromAscii( szServiceName2_UnoControlTimeFieldModel ); + pNames[13] = OUString::createFromAscii( szServiceName2_UnoControlNumericFieldModel ); + pNames[14] = OUString::createFromAscii( szServiceName2_UnoControlCurrencyFieldModel ); + pNames[15] = OUString::createFromAscii( szServiceName2_UnoControlPatternFieldModel ); + pNames[16] = OUString::createFromAscii( szServiceName2_UnoControlProgressBarModel ); + pNames[17] = OUString::createFromAscii( szServiceName2_UnoControlScrollBarModel ); + pNames[18] = OUString::createFromAscii( szServiceName2_UnoControlFixedLineModel ); + pNames[19] = OUString::createFromAscii( szServiceName2_UnoControlRoadmapModel ); + pNames[20] = OUString::createFromAscii( szServiceName_TreeControlModel ); + pNames[21] = OUString::createFromAscii( szServiceName_GridControlModel ); + pNames[22] = OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel ); + pNames[23] = OUString::createFromAscii( szServiceName_UnoControlTabPageModel ); + pNames[24] = OUString::createFromAscii( szServiceName_UnoMultiPageModel ); + pNames[25] = OUString::createFromAscii( szServiceName_UnoFrameModel ); } return *pNamesSeq; } @@ -482,7 +482,7 @@ sal_Bool ControlModelContainerBase::hasElements() throw(RuntimeException) } // XNameContainer, XNameReplace, XNameAccess -void ControlModelContainerBase::replaceByName( const ::rtl::OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) +void ControlModelContainerBase::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { SolarMutexGuard aGuard; @@ -528,7 +528,7 @@ void ControlModelContainerBase::replaceByName( const ::rtl::OUString& aName, con implNotifyTabModelChange( aName ); } -Any ControlModelContainerBase::getByName( const ::rtl::OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any ControlModelContainerBase::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { UnoControlModelHolderList::iterator aElementPos = ImplFindElement( aName ); if ( maModels.end() == aElementPos ) @@ -537,9 +537,9 @@ Any ControlModelContainerBase::getByName( const ::rtl::OUString& aName ) throw(N return makeAny( aElementPos->first ); } -Sequence< ::rtl::OUString > ControlModelContainerBase::getElementNames() throw(RuntimeException) +Sequence< OUString > ControlModelContainerBase::getElementNames() throw(RuntimeException) { - Sequence< ::rtl::OUString > aNames( maModels.size() ); + Sequence< OUString > aNames( maModels.size() ); ::std::transform( maModels.begin(), maModels.end(), // source range @@ -550,12 +550,12 @@ Sequence< ::rtl::OUString > ControlModelContainerBase::getElementNames() throw(R return aNames; } -sal_Bool ControlModelContainerBase::hasByName( const ::rtl::OUString& aName ) throw(RuntimeException) +sal_Bool ControlModelContainerBase::hasByName( const OUString& aName ) throw(RuntimeException) { return maModels.end() != ImplFindElement( aName ); } -void ControlModelContainerBase::insertByName( const ::rtl::OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +void ControlModelContainerBase::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { SolarMutexGuard aGuard; @@ -570,12 +570,12 @@ void ControlModelContainerBase::insertByName( const ::rtl::OUString& aName, cons Reference< beans::XPropertySetInfo > xPropInfo = xProps.get()->getPropertySetInfo(); - ::rtl::OUString sImageSourceProperty = GetPropertyName( BASEPROPERTY_IMAGEURL ); + OUString sImageSourceProperty = GetPropertyName( BASEPROPERTY_IMAGEURL ); if ( xPropInfo.get()->hasPropertyByName( sImageSourceProperty ) && ImplHasProperty(BASEPROPERTY_DIALOGSOURCEURL) ) { Any aUrl = xProps.get()->getPropertyValue( sImageSourceProperty ); - ::rtl::OUString absoluteUrl = + OUString absoluteUrl = getPhysicalLocation( getPropertyValue( GetPropertyName( BASEPROPERTY_DIALOGSOURCEURL ) ), aUrl ); aUrl <<= absoluteUrl; @@ -619,7 +619,7 @@ void ControlModelContainerBase::insertByName( const ::rtl::OUString& aName, cons implNotifyTabModelChange( aName ); } -void ControlModelContainerBase::removeByName( const ::rtl::OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { SolarMutexGuard aGuard; @@ -761,7 +761,7 @@ Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getCo } // ---------------------------------------------------------------------------- -void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XControlModel > >&, const ::rtl::OUString& ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XControlModel > >&, const OUString& ) throw (RuntimeException) { // not supported. We have only implicit grouping: // We only have a sequence of control models, and we _know_ (yes, that's a HACK relying on @@ -795,34 +795,34 @@ void SAL_CALL ControlModelContainerBase::setEnabled( ::sal_Bool _enabled ) throw { m_bEnabled = _enabled; } -::rtl::OUString SAL_CALL ControlModelContainerBase::getTitle() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ControlModelContainerBase::getTitle() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; Reference xThis(*this,UNO_QUERY); - ::rtl::OUString sTitle; + OUString sTitle; xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle; return sTitle; //return m_sTitle; } -void SAL_CALL ControlModelContainerBase::setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; Reference xThis(*this,UNO_QUERY); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),makeAny(_title)); } -::rtl::OUString SAL_CALL ControlModelContainerBase::getImageURL() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ControlModelContainerBase::getImageURL() throw (::com::sun::star::uno::RuntimeException) { return m_sImageURL; } -void SAL_CALL ControlModelContainerBase::setImageURL( const ::rtl::OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException) { m_sImageURL = _imageurl; } -::rtl::OUString SAL_CALL ControlModelContainerBase::getToolTip() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ControlModelContainerBase::getToolTip() throw (::com::sun::star::uno::RuntimeException) { return m_sTooltip; } -void SAL_CALL ControlModelContainerBase::setToolTip( const ::rtl::OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException) { m_sTooltip = _tooltip; } @@ -864,7 +864,7 @@ sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount( ) throw (RuntimeEx } // ---------------------------------------------------------------------------- -void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< Reference< XControlModel > >& _rGroup, ::rtl::OUString& _rName ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< Reference< XControlModel > >& _rGroup, OUString& _rName ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -874,7 +874,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< { OSL_TRACE( "UnoControlDialogModel::getGroup: invalid argument and I am not allowed to throw an exception!" ); _rGroup.realloc( 0 ); - _rName = ::rtl::OUString(); + _rName = OUString(); } else { @@ -883,16 +883,16 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< // copy the models ::std::copy( aGroupPos->begin(), aGroupPos->end(), _rGroup.getArray() ); // give the group a name - _rName = ::rtl::OUString::valueOf( _nGroup ); + _rName = OUString::valueOf( _nGroup ); } } // ---------------------------------------------------------------------------- -void SAL_CALL ControlModelContainerBase::getGroupByName( const ::rtl::OUString& _rName, Sequence< Reference< XControlModel > >& _rGroup ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, Sequence< Reference< XControlModel > >& _rGroup ) throw (RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString sDummyName; + OUString sDummyName; getGroup( _rName.toInt32( ), _rGroup, sDummyName ); } @@ -909,7 +909,7 @@ void SAL_CALL ControlModelContainerBase::removeChangesListener( const Reference< } // ---------------------------------------------------------------------------- -void ControlModelContainerBase::implNotifyTabModelChange( const ::rtl::OUString& _rAccessor ) +void ControlModelContainerBase::implNotifyTabModelChange( const OUString& _rAccessor ) { // multiplex to our change listeners: // the changes event @@ -959,14 +959,14 @@ void ControlModelContainerBase::implUpdateGroupStructure() sal_Bool bIsRadioButton; // is it a radio button? #if OSL_DEBUG_LEVEL > 1 - ::std::vector< ::rtl::OUString > aCurrentGroupLabels; + ::std::vector< OUString > aCurrentGroupLabels; #endif for ( ; pControlModels != pControlModelsEnd; ++pControlModels ) { // we'll need this in every state xModelSI = xModelSI.query( *pControlModels ); - bIsRadioButton = xModelSI.is() && xModelSI->supportsService( ::rtl::OUString::createFromAscii( szServiceName2_UnoControlRadioButtonModel ) ); + bIsRadioButton = xModelSI.is() && xModelSI->supportsService( OUString::createFromAscii( szServiceName2_UnoControlRadioButtonModel ) ); switch ( eState ) { @@ -991,9 +991,9 @@ void ControlModelContainerBase::implUpdateGroupStructure() #if OSL_DEBUG_LEVEL > 1 Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY ); - ::rtl::OUString sLabel; - if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString("Label") ) ) - xModelProps->getPropertyValue( ::rtl::OUString("Label") ) >>= sLabel; + OUString sLabel; + if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( OUString("Label") ) ) + xModelProps->getPropertyValue( OUString("Label") ) >>= sLabel; aCurrentGroupLabels.push_back( sLabel ); #endif } @@ -1024,9 +1024,9 @@ void ControlModelContainerBase::implUpdateGroupStructure() #if OSL_DEBUG_LEVEL > 1 Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY ); - ::rtl::OUString sLabel; - if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString("Label") ) ) - xModelProps->getPropertyValue( ::rtl::OUString("Label") ) >>= sLabel; + OUString sLabel; + if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( OUString("Label") ) ) + xModelProps->getPropertyValue( OUString("Label") ) >>= sLabel; aCurrentGroupLabels.push_back( sLabel ); #endif continue; @@ -1054,9 +1054,9 @@ void ControlModelContainerBase::implUpdateGroupStructure() eState = eExpandingGroup; #if OSL_DEBUG_LEVEL > 1 Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY ); - ::rtl::OUString sLabel; - if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString("Label") ) ) - xModelProps->getPropertyValue( ::rtl::OUString("Label") ) >>= sLabel; + OUString sLabel; + if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( OUString("Label") ) ) + xModelProps->getPropertyValue( OUString("Label") ) >>= sLabel; aCurrentGroupLabels.push_back( sLabel ); #endif } @@ -1076,7 +1076,7 @@ void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEve "UnoControlDialogModel::propertyChange: not listening for this property!" ); // the accessor for the changed element - ::rtl::OUString sAccessor; + OUString sAccessor; UnoControlModelHolderList::const_iterator aPos = ::std::find_if( maModels.begin(), maModels.end(), @@ -1375,11 +1375,11 @@ void ControlContainerBase::createPeer( const Reference< XToolkit > & rxToolkit, UnoControlContainer::createPeer( rxToolkit, rParentPeer ); } -void ControlContainerBase::ImplInsertControl( Reference< XControlModel >& rxModel, const ::rtl::OUString& rName ) +void ControlContainerBase::ImplInsertControl( Reference< XControlModel >& rxModel, const OUString& rName ) { Reference< XPropertySet > xP( rxModel, UNO_QUERY ); - ::rtl::OUString aDefCtrl; + OUString aDefCtrl; xP->getPropertyValue( GetPropertyName( BASEPROPERTY_DEFAULTCONTROL ) ) >>= aDefCtrl; Reference < XControl > xCtrl( m_xContext->getServiceManager()->createInstanceWithContext(aDefCtrl, m_xContext), UNO_QUERY ); @@ -1420,10 +1420,10 @@ void ControlContainerBase::ImplSetPosSize( Reference< XControl >& rxCtrl ) Reference< XPropertySet > xP( rxCtrl->getModel(), UNO_QUERY ); sal_Int32 nX = 0, nY = 0, nWidth = 0, nHeight = 0; - xP->getPropertyValue( ::rtl::OUString( "PositionX" ) ) >>= nX; - xP->getPropertyValue( ::rtl::OUString( "PositionY" ) ) >>= nY; - xP->getPropertyValue( ::rtl::OUString( "Width" ) ) >>= nWidth; - xP->getPropertyValue( ::rtl::OUString( "Height" ) ) >>= nHeight; + xP->getPropertyValue( OUString( "PositionX" ) ) >>= nX; + xP->getPropertyValue( OUString( "PositionY" ) ) >>= nY; + xP->getPropertyValue( OUString( "Width" ) ) >>= nWidth; + xP->getPropertyValue( OUString( "Height" ) ) >>= nHeight; MapMode aMode( MAP_APPFONT ); OutputDevice*pOutDev = Application::GetDefaultDevice(); if ( pOutDev ) @@ -1539,8 +1539,8 @@ sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxMod Reference< XNameAccess > xNA( getModel(), UNO_QUERY ); if ( xNA.is() ) { - Sequence< ::rtl::OUString > aNames = xNA->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + Sequence< OUString > aNames = xNA->getElementNames(); + const OUString* pNames = aNames.getConstArray(); sal_uInt32 nCtrls = aNames.getLength(); Reference< XControlModel > xCtrlModel; @@ -1595,7 +1595,7 @@ void ControlContainerBase::elementInserted( const ContainerEvent& Event ) throw( SolarMutexGuard aGuard; Reference< XControlModel > xModel; - ::rtl::OUString aName; + OUString aName; Event.Accessor >>= aName; Event.Element >>= xModel; @@ -1656,7 +1656,7 @@ void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) throw( DBG_UNHANDLED_EXCEPTION(); } - ::rtl::OUString aName; + OUString aName; Event.Accessor >>= aName; Event.Element >>= xModel; ENSURE_OR_RETURN_VOID( xModel.is(), "ControlContainerBase::elementReplaced: invalid new element!" ); @@ -1679,10 +1679,10 @@ void ControlContainerBase::ImplModelPropertiesChanged( const Sequence< PropertyC { if( !isDesignMode() && !mbCreatingCompatiblePeer ) { - ::rtl::OUString s1( "PositionX" ); - ::rtl::OUString s2( "PositionY" ); - ::rtl::OUString s3( "Width" ); - ::rtl::OUString s4( "Height" ); + OUString s1( "PositionX" ); + OUString s2( "PositionY" ); + OUString s3( "Width" ); + OUString s4( "Height" ); sal_Int32 nLen = rEvents.getLength(); for( sal_Int32 i = 0; i < nLen; i++ ) @@ -1728,8 +1728,8 @@ void ControlContainerBase::addingControl( const Reference< XControl >& _rxContro Reference< XMultiPropertySet > xProps( _rxControl->getModel(), UNO_QUERY ); if ( xProps.is() ) { - Sequence< ::rtl::OUString > aNames( 4 ); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames( 4 ); + OUString* pNames = aNames.getArray(); *pNames++ = "PositionX"; *pNames++ = "PositionY"; *pNames++ = "Width"; @@ -1766,11 +1766,11 @@ void SAL_CALL ControlContainerBase::changesOccurred( const ChangesEvent& ) throw } static void lcl_ApplyResolverToNestedContainees( const Reference< resource::XStringResourceResolver >& xStringResourceResolver, const Reference< XControlContainer >& xContainer ) { - rtl::OUString aPropName( PROPERTY_RESOURCERESOLVER ); + OUString aPropName( PROPERTY_RESOURCERESOLVER ); Any xNewStringResourceResolver; xNewStringResourceResolver <<= xStringResourceResolver; - Sequence< rtl::OUString > aPropNames(1); + Sequence< OUString > aPropNames(1); aPropNames[0] = aPropName; const Sequence< Reference< awt::XControl > > aSeq = xContainer->getControls(); @@ -1829,7 +1829,7 @@ void ControlContainerBase::ImplStartListingForResourceEvents() void ControlContainerBase::ImplUpdateResourceResolver() { - rtl::OUString aPropName( PROPERTY_RESOURCERESOLVER ); + OUString aPropName( PROPERTY_RESOURCERESOLVER ); Reference< resource::XStringResourceResolver > xStringResourceResolver; ImplGetPropertyValue( aPropName ) >>= xStringResourceResolver; @@ -1852,16 +1852,16 @@ void ControlContainerBase::ImplUpdateResourceResolver() //// Helper Method to convert relative url to physical location //// ---------------------------------------------------- -::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ) +OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ) { - ::rtl::OUString baseLocation; - ::rtl::OUString url; + OUString baseLocation; + OUString url; rbase >>= baseLocation; rUrl >>= url; - ::rtl::OUString absoluteURL( url ); + OUString absoluteURL( url ); if ( !url.isEmpty() ) { INetURLObject urlObj(baseLocation); @@ -1872,7 +1872,7 @@ void ControlContainerBase::ImplUpdateResourceResolver() const INetProtocol protocol = protocolCheck.GetProtocol(); if ( protocol == INET_PROT_NOT_VALID ) { - ::rtl::OUString testAbsoluteURL; + OUString testAbsoluteURL; if ( ::osl::FileBase::E_None == ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, testAbsoluteURL ) ) absoluteURL = testAbsoluteURL; } @@ -1882,7 +1882,7 @@ void ControlContainerBase::ImplUpdateResourceResolver() } void -ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContainer >& xAllChildren, const rtl::OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { if ( Operation < Insert || Operation > Remove ) throw IllegalArgumentException(); @@ -1902,7 +1902,7 @@ ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContain // global list of containees if ( xProps.is() ) xProps->setPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ), uno::makeAny( uno::Reference< XNameContainer >() ) ); - Sequence< rtl::OUString > aChildNames = xChildContainer->getElementNames(); + Sequence< OUString > aChildNames = xChildContainer->getElementNames(); for ( sal_Int32 index=0; index< aChildNames.getLength(); ++index ) updateUserFormChildren( xAllChildren, aChildNames[ index ], Operation, Reference< XControlModel > () ); } @@ -1918,7 +1918,7 @@ ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContain Reference< XPropertySet > xProps( xChildContainer, UNO_QUERY ); if ( xProps.is() ) xProps->setPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ), uno::makeAny( xAllChildren ) ); - Sequence< rtl::OUString > aChildNames = xChildContainer->getElementNames(); + Sequence< OUString > aChildNames = xChildContainer->getElementNames(); for ( sal_Int32 index=0; index< aChildNames.getLength(); ++index ) { Reference< XControlModel > xChildTarget( xChildContainer->getByName( aChildNames[ index ] ), UNO_QUERY ); diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 4dc26286e818..096d07c0d848 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -59,9 +59,9 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; -#define PROPERTY_DIALOGSOURCEURL ::rtl::OUString( "DialogSourceURL" ) -#define PROPERTY_IMAGEURL ::rtl::OUString( "ImageURL" ) -#define PROPERTY_GRAPHIC ::rtl::OUString( "Graphic" ) +#define PROPERTY_DIALOGSOURCEURL OUString( "DialogSourceURL" ) +#define PROPERTY_IMAGEURL OUString( "ImageURL" ) +#define PROPERTY_GRAPHIC OUString( "Graphic" ) // // we probably will need both a hash of control models and hash of controls @@ -72,13 +72,13 @@ typedef ::cppu::WeakImplHelper1< container::XNameContainer > SimpleNameContainer template< typename T > class SimpleNamedThingContainer : public SimpleNameContainer_BASE { - typedef boost::unordered_map< rtl::OUString, Reference< T >, ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > NamedThingsHash; + typedef boost::unordered_map< OUString, Reference< T >, OUStringHash, + ::std::equal_to< OUString > > NamedThingsHash; NamedThingsHash things; ::osl::Mutex m_aMutex; public: // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) @@ -88,30 +88,30 @@ public: throw IllegalArgumentException(); things[ aName ] = xElement; } - virtual Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) + virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw NoSuchElementException(); return uno::makeAny( things[ aName ] ); } - virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(RuntimeException) + virtual Sequence< OUString > SAL_CALL getElementNames( ) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - Sequence< ::rtl::OUString > aResult( things.size() ); + Sequence< OUString > aResult( things.size() ); typename NamedThingsHash::iterator it = things.begin(); typename NamedThingsHash::iterator it_end = things.end(); - rtl::OUString* pName = aResult.getArray(); + OUString* pName = aResult.getArray(); for (; it != it_end; ++it, ++pName ) *pName = it->first; return aResult; } - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(RuntimeException) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return ( things.find( aName ) != things.end() ); } - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -121,7 +121,7 @@ public: throw IllegalArgumentException(); things[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) @@ -140,7 +140,7 @@ public: }; ////HELPER -::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); +OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); // ---------------------------------------------------- // class UnoControlDialogModel @@ -186,9 +186,9 @@ UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rMode Reference< XNameContainer > xSrcNameCont( const_cast< UnoControlDialogModel& >(rModel).getPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ) ), UNO_QUERY ); Reference xNameCont( new SimpleNamedThingContainer< XControlModel >() ); - uno::Sequence< rtl::OUString > sNames = xSrcNameCont->getElementNames(); - rtl::OUString* pName = sNames.getArray(); - rtl::OUString* pNamesEnd = pName + sNames.getLength(); + uno::Sequence< OUString > sNames = xSrcNameCont->getElementNames(); + OUString* pName = sNames.getArray(); + OUString* pNamesEnd = pName + sNames.getLength(); for ( ; pName != pNamesEnd; ++pName ) { if ( xSrcNameCont->hasByName( *pName ) ) @@ -212,9 +212,9 @@ UnoControlModel* UnoControlDialogModel::Clone() const } -::rtl::OUString UnoControlDialogModel::getServiceName( ) throw(RuntimeException) +OUString UnoControlDialogModel::getServiceName( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoControlDialogModel ); + return OUString::createFromAscii( szServiceName_UnoControlDialogModel ); } Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const @@ -224,7 +224,7 @@ Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const switch ( nPropId ) { case BASEPROPERTY_DEFAULTCONTROL: - aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlDialog ); + aAny <<= OUString::createFromAscii( szServiceName_UnoControlDialog ); break; case BASEPROPERTY_SCROLLWIDTH: case BASEPROPERTY_SCROLLHEIGHT: @@ -264,7 +264,7 @@ void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 { if ( nHandle == BASEPROPERTY_IMAGEURL && ImplHasProperty( BASEPROPERTY_GRAPHIC ) ) { - ::rtl::OUString sImageURL; + OUString sImageURL; OSL_VERIFY( rValue >>= sImageURL ); setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( mxGrfObj, sImageURL ) ) ); } @@ -291,15 +291,15 @@ UnoDialogControl::~UnoDialogControl() { } -::rtl::OUString UnoDialogControl::GetComponentServiceName() +OUString UnoDialogControl::GetComponentServiceName() { sal_Bool bDecoration( sal_True ); ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration; if ( bDecoration ) - return ::rtl::OUString("Dialog"); + return OUString("Dialog"); else - return ::rtl::OUString("TabPage"); + return OUString("TabPage"); } void UnoDialogControl::dispose() throw(RuntimeException) @@ -373,12 +373,12 @@ void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDes // into the peer via propertiesChangeEvents. As the order of // can lead to overwrites we have to set the graphic property // before the propertiesChangeEvents are sent! - ::rtl::OUString aImageURL; + OUString aImageURL; Reference< graphic::XGraphic > xGraphic; if (( ImplGetPropertyValue( PROPERTY_IMAGEURL ) >>= aImageURL ) && ( !aImageURL.isEmpty() )) { - ::rtl::OUString absoluteUrl = aImageURL; + OUString absoluteUrl = aImageURL; if ( !aImageURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) absoluteUrl = getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ), uno::makeAny( aImageURL ) ); @@ -475,11 +475,11 @@ throw (::com::sun::star::uno::RuntimeException) // Remember that changes have been done by listener. No need to // update the position because of property change event. mbSizeModified = true; - Sequence< rtl::OUString > aProps( 2 ); + Sequence< OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); // Properties in a sequence must be sorted! - aProps[0] = rtl::OUString( "Height" ); - aProps[1] = rtl::OUString( "Width" ); + aProps[0] = OUString( "Height" ); + aProps[1] = OUString( "Width" ); aValues[0] <<= aAppFontSize.Height(); aValues[1] <<= aAppFontSize.Width(); @@ -503,10 +503,10 @@ throw (::com::sun::star::uno::RuntimeException) // Remember that changes have been done by listener. No need to // update the position because of property change event. mbPosModified = true; - Sequence< rtl::OUString > aProps( 2 ); + Sequence< OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); - aProps[0] = rtl::OUString( "PositionX" ); - aProps[1] = rtl::OUString( "PositionY" ); + aProps[0] = OUString( "PositionX" ); + aProps[1] = OUString( "PositionY" ); aValues[0] <<= aTmp.Width(); aValues[1] <<= aTmp.Height(); @@ -532,14 +532,14 @@ void SAL_CALL UnoDialogControl::endDialog( ::sal_Int32 i_result ) throw (Runtime xPeerDialog->endDialog( i_result ); } -void SAL_CALL UnoDialogControl::setHelpId( const rtl::OUString& i_id ) throw (RuntimeException) +void SAL_CALL UnoDialogControl::setHelpId( const OUString& i_id ) throw (RuntimeException) { Reference< XDialog2 > xPeerDialog( getPeer(), UNO_QUERY ); if ( xPeerDialog.is() ) xPeerDialog->setHelpId( i_id ); } -void UnoDialogControl::setTitle( const ::rtl::OUString& Title ) throw(RuntimeException) +void UnoDialogControl::setTitle( const OUString& Title ) throw(RuntimeException) { SolarMutexGuard aGuard; Any aAny; @@ -547,7 +547,7 @@ void UnoDialogControl::setTitle( const ::rtl::OUString& Title ) throw(RuntimeExc ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TITLE ), aAny, sal_True ); } -::rtl::OUString UnoDialogControl::getTitle() throw(RuntimeException) +OUString UnoDialogControl::getTitle() throw(RuntimeException) { SolarMutexGuard aGuard; return ImplGetPropertyValue_UString( BASEPROPERTY_TITLE ); @@ -602,12 +602,12 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang sal_Bool bOwnModel = (XControlModel*)xModel.get() == (XControlModel*)getModel().get(); if ( bOwnModel && rEvt.PropertyName.equalsAsciiL( "ImageURL", 8 )) { - ::rtl::OUString aImageURL; + OUString aImageURL; Reference< graphic::XGraphic > xGraphic; if (( ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEURL ) ) >>= aImageURL ) && ( !aImageURL.isEmpty() )) { - ::rtl::OUString absoluteUrl = aImageURL; + OUString absoluteUrl = aImageURL; if ( !aImageURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) absoluteUrl = getPhysicalLocation( ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DIALOGSOURCEURL )), @@ -749,14 +749,14 @@ uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) throw( return (aRet.hasValue() ? aRet : ControlContainerBase::queryAggregation( rType )); } -::rtl::OUString UnoMultiPageControl::GetComponentServiceName() +OUString UnoMultiPageControl::GetComponentServiceName() { sal_Bool bDecoration( sal_True ); ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration; if ( bDecoration ) - return ::rtl::OUString("tabcontrol"); + return OUString("tabcontrol"); // Hopefully we can tweak the tabcontrol to display without tabs - return ::rtl::OUString("tabcontrolnotabs"); + return OUString("tabcontrolnotabs"); } void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxControl ) @@ -772,7 +772,7 @@ void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxCo VCLXMultiPage* pXTab = dynamic_cast< VCLXMultiPage* >( xTabCntrl.get() ); if ( pXTab ) { - rtl::OUString sTitle; + OUString sTitle; xProps->getPropertyValue( GetPropertyName( BASEPROPERTY_TITLE ) ) >>= sTitle; pXTab->insertTab( pPage, sTitle); } @@ -870,9 +870,9 @@ UnoMultiPageModel::Clone() const return pClone; } -::rtl::OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel ); + return OUString::createFromAscii( szServiceName_UnoMultiPageModel ); } uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const @@ -880,7 +880,7 @@ uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const if ( nPropId == BASEPROPERTY_DEFAULTCONTROL ) { uno::Any aAny; - aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageControl ); + aAny <<= OUString::createFromAscii( szServiceName_UnoMultiPageControl ); return aAny; } return ControlModelContainerBase::ImplGetDefaultValue( nPropId ); @@ -904,7 +904,7 @@ uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo( return xInfo; } -void UnoMultiPageModel::insertByName( const ::rtl::OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { Reference< XServiceInfo > xInfo; aElement >>= xInfo; @@ -913,7 +913,7 @@ void UnoMultiPageModel::insertByName( const ::rtl::OUString& aName, const Any& a throw IllegalArgumentException(); // Only a Page model can be inserted into the multipage - if ( !xInfo->supportsService( rtl::OUString::createFromAscii( szServiceName_UnoPageModel ) ) ) + if ( !xInfo->supportsService( OUString::createFromAscii( szServiceName_UnoPageModel ) ) ) throw IllegalArgumentException(); return ControlModelContainerBase::insertByName( aName, aElement ); @@ -938,9 +938,9 @@ UnoPageControl::~UnoPageControl() { } -::rtl::OUString UnoPageControl::GetComponentServiceName() +OUString UnoPageControl::GetComponentServiceName() { - return ::rtl::OUString("tabpage"); + return OUString("tabpage"); } @@ -990,9 +990,9 @@ UnoPageModel::Clone() const return pClone; } -::rtl::OUString UnoPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoPageModel ); + return OUString::createFromAscii( szServiceName_UnoPageModel ); } uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const @@ -1000,7 +1000,7 @@ uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const if ( nPropId == BASEPROPERTY_DEFAULTCONTROL ) { uno::Any aAny; - aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoPageControl ); + aAny <<= OUString::createFromAscii( szServiceName_UnoPageControl ); return aAny; } return ControlModelContainerBase::ImplGetDefaultValue( nPropId ); @@ -1045,15 +1045,15 @@ UnoFrameControl::~UnoFrameControl() { } -::rtl::OUString UnoFrameControl::GetComponentServiceName() +OUString UnoFrameControl::GetComponentServiceName() { - return ::rtl::OUString("frame"); + return OUString("frame"); } void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl ) { bool bOwnCtrl = false; - rtl::OUString sTitle; + OUString sTitle; if ( rxCtrl.get() == Reference( this ).get() ) bOwnCtrl = true; Reference< XPropertySet > xProps( getModel(), UNO_QUERY ); @@ -1155,9 +1155,9 @@ UnoFrameModel::Clone() const return pClone; } -::rtl::OUString UnoFrameModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoFrameModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoFrameModel ); + return OUString::createFromAscii( szServiceName_UnoFrameModel ); } uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const @@ -1167,7 +1167,7 @@ uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { case BASEPROPERTY_DEFAULTCONTROL: { - aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoFrameControl ); + aAny <<= OUString::createFromAscii( szServiceName_UnoFrameControl ); return aAny; } case BASEPROPERTY_SCROLLWIDTH: diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index b141b85dffac..35999d38240c 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -36,7 +36,6 @@ using namespace cppu; using namespace osl; using namespace std; -using ::rtl::OUString; namespace toolkit { diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 1ed4fd4b5848..9aa143b54560 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -163,9 +163,9 @@ namespace toolkit } // ------------------------------------------------------------------- - ::rtl::OUString UnoControlFormattedFieldModel::getServiceName() throw(RuntimeException) + OUString UnoControlFormattedFieldModel::getServiceName() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoControlFormattedFieldModel ); + return OUString::createFromAscii( szServiceName_UnoControlFormattedFieldModel ); } // ------------------------------------------------------------------- @@ -203,7 +203,7 @@ namespace toolkit Any aEffectiveValue; getFastPropertyValue( aEffectiveValue, BASEPROPERTY_EFFECTIVE_VALUE ); - ::rtl::OUString sStringValue; + OUString sStringValue; if ( !( aEffectiveValue >>= sStringValue ) ) { double nDoubleValue(0); @@ -302,11 +302,11 @@ namespace toolkit } // ------------------------------------------------------------------- - void SAL_CALL UnoControlFormattedFieldModel::setPropertyValues( const Sequence< ::rtl::OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL UnoControlFormattedFieldModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { bool bSettingValue = false; bool bSettingText = false; - for ( const ::rtl::OUString* pPropertyNames = _rPropertyNames.getConstArray(); + for ( const OUString* pPropertyNames = _rPropertyNames.getConstArray(); pPropertyNames != _rPropertyNames.getConstArray() + _rPropertyNames.getLength(); ++pPropertyNames ) @@ -331,7 +331,7 @@ namespace toolkit if ( BASEPROPERTY_EFFECTIVE_DEFAULT == nPropId && rValue.hasValue() ) { double dVal = 0; - ::rtl::OUString sVal; + OUString sVal; sal_Bool bStreamed = (rValue >>= dVal); if ( bStreamed ) { @@ -378,7 +378,7 @@ namespace toolkit Any aReturn; switch (nPropId) { - case BASEPROPERTY_DEFAULTCONTROL: aReturn <<= ::rtl::OUString( ::rtl::OUString::createFromAscii( szServiceName_UnoControlFormattedField ) ); break; + case BASEPROPERTY_DEFAULTCONTROL: aReturn <<= OUString( OUString::createFromAscii( szServiceName_UnoControlFormattedField ) ); break; case BASEPROPERTY_TREATASNUMBER: aReturn <<= (sal_Bool)sal_True; break; @@ -438,7 +438,7 @@ namespace toolkit Reference< XVclWindowPeer > xPeer(getPeer(), UNO_QUERY); OSL_ENSURE(xPeer.is(), "UnoFormattedFieldControl::textChanged : what kind of peer do I have ?"); - Sequence< ::rtl::OUString > aNames( 2 ); + Sequence< OUString > aNames( 2 ); aNames[0] = GetPropertyName( BASEPROPERTY_EFFECTIVE_VALUE ); aNames[1] = GetPropertyName( BASEPROPERTY_TEXT ); diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 98ae06f40a27..b512ffe587d5 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -40,15 +40,15 @@ #define GCM_PROPERTY_ID_TAG 8 #define GCM_PROPERTY_ID_RESOURCERESOLVER 9 -#define GCM_PROPERTY_POS_X ::rtl::OUString("PositionX") -#define GCM_PROPERTY_POS_Y ::rtl::OUString("PositionY") -#define GCM_PROPERTY_WIDTH ::rtl::OUString("Width") -#define GCM_PROPERTY_HEIGHT ::rtl::OUString("Height") -#define GCM_PROPERTY_NAME ::rtl::OUString("Name") -#define GCM_PROPERTY_TABINDEX ::rtl::OUString("TabIndex") -#define GCM_PROPERTY_STEP ::rtl::OUString("Step") -#define GCM_PROPERTY_TAG ::rtl::OUString("Tag") -#define GCM_PROPERTY_RESOURCERESOLVER ::rtl::OUString("ResourceResolver") +#define GCM_PROPERTY_POS_X OUString("PositionX") +#define GCM_PROPERTY_POS_Y OUString("PositionY") +#define GCM_PROPERTY_WIDTH OUString("Width") +#define GCM_PROPERTY_HEIGHT OUString("Height") +#define GCM_PROPERTY_NAME OUString("Name") +#define GCM_PROPERTY_TABINDEX OUString("TabIndex") +#define GCM_PROPERTY_STEP OUString("Step") +#define GCM_PROPERTY_TAG OUString("Tag") +#define GCM_PROPERTY_RESOURCERESOLVER OUString("ResourceResolver") #define DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT @@ -192,10 +192,10 @@ case GCM_PROPERTY_ID_POS_Y: aDefault <<= (sal_Int32) 0; break; case GCM_PROPERTY_ID_WIDTH: aDefault <<= (sal_Int32) 0; break; case GCM_PROPERTY_ID_HEIGHT: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_NAME: aDefault <<= ::rtl::OUString(); break; + case GCM_PROPERTY_ID_NAME: aDefault <<= OUString(); break; case GCM_PROPERTY_ID_TABINDEX: aDefault <<= (sal_Int16) -1; break; case GCM_PROPERTY_ID_STEP: aDefault <<= (sal_Int32) 0; break; - case GCM_PROPERTY_ID_TAG: aDefault <<= ::rtl::OUString(); break; + case GCM_PROPERTY_ID_TAG: aDefault <<= OUString(); break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aDefault <<= Reference< resource::XStringResourceResolver >(); break; default: OSL_FAIL( "ImplGetDefaultValueByHandle - unknown Property" ); } @@ -318,7 +318,7 @@ void SAL_CALL OGeometryControlModel_Base::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const { OPropertyArrayAggregationHelper& rPH = static_cast(const_cast(this)->getInfoHelper()); - ::rtl::OUString sPropName; + OUString sPropName; sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&sPropName, &nOriginalHandle, _nHandle)) @@ -400,14 +400,14 @@ Reference< XNameContainer > xEventCont = xEventsSupplier->getEvents(); Reference< XNameContainer > xCloneEventCont = xCloneEventsSupplier->getEvents(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = + ::com::sun::star::uno::Sequence< OUString > aNames = xEventCont->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + const OUString* pNames = aNames.getConstArray(); sal_Int32 i, nNameCount = aNames.getLength(); for( i = 0 ; i < nNameCount ; i++ ) { - ::rtl::OUString aName = pNames[ i ]; + OUString aName = pNames[ i ]; ::com::sun::star::uno::Any aElement = xEventCont->getByName( aName ); xCloneEventCont->insertByName( aName, aElement ); } @@ -440,7 +440,7 @@ //==================================================================== //-------------------------------------------------------------------- - typedef ::boost::unordered_map< ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > HashMapString2Int; + typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int; typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; typedef ::std::vector< ::std::vector< sal_Int32 > > IntArrayArray; @@ -464,7 +464,7 @@ //-------------------------------------------------------------------- - OCommonGeometryControlModel::OCommonGeometryControlModel( Reference< XCloneable >& _rxAgg, const ::rtl::OUString& _rServiceSpecifier ) + OCommonGeometryControlModel::OCommonGeometryControlModel( Reference< XCloneable >& _rxAgg, const OUString& _rServiceSpecifier ) :OGeometryControlModel_Base( _rxAgg ) ,m_sServiceSpecifier( _rServiceSpecifier ) ,m_nPropertyMapId( 0 ) @@ -505,8 +505,8 @@ //-------------------------------------------------------------------- struct PropertyNameEqual : public ::std::unary_function< Property, bool > { - const ::rtl::OUString& m_rCompare; - PropertyNameEqual( const ::rtl::OUString& _rCompare ) : m_rCompare( _rCompare ) { } + const OUString& m_rCompare; + PropertyNameEqual( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } bool operator()( const Property& _rLHS ) { @@ -621,7 +621,7 @@ if ( rDuplicateIds.end() != aPos ) { // yes, it is such a property - ::rtl::OUString sPropName; + OUString sPropName; sal_Int16 nAttributes(0); static_cast< OPropertyArrayAggregationHelper* >( getArrayHelper( m_nPropertyMapId ) )->fillPropertyMembersByHandle( &sPropName, &nAttributes, _nHandle ); diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index d114fb5a4c0e..37e8b8fb6a0e 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -152,7 +152,7 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_columnIndex < 0 ) || ( size_t( i_columnIndex ) >= m_aColumns.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); Columns::iterator const pos = m_aColumns.begin() + i_columnIndex; Reference< XGridColumn > const xColumn( *pos ); @@ -242,7 +242,7 @@ namespace toolkit { ::rtl::Reference< GridColumn > const pGridColumn = new GridColumn(); Reference< XGridColumn > const xColumn( pGridColumn.get() ); - ::rtl::OUStringBuffer colTitle; + OUStringBuffer colTitle; colTitle.appendAscii( "Column " ); colTitle.append( i + 1 ); pGridColumn->setTitle( colTitle.makeStringAndClear() ); @@ -299,15 +299,15 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DefaultGridColumnModel::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL DefaultGridColumnModel::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.toolkit.DefaultGridColumnModel" ); + return OUString( "org.openoffice.comp.toolkit.DefaultGridColumnModel" ); } //------------------------------------------------------------------------------------------------------------------ - sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const ::rtl::OUString& i_serviceName ) throw (RuntimeException) + sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); for ( sal_Int32 i=0; i SAL_CALL DefaultGridColumnModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames( ) throw (RuntimeException) { - const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( szServiceName_DefaultGridColumnModel ) ); - const Sequence< ::rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( OUString::createFromAscii( szServiceName_DefaultGridColumnModel ) ); + const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx index 83b4f1ed75e8..859235e3f8d3 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx @@ -55,9 +55,9 @@ public: virtual void SAL_CALL setDefaultColumns(sal_Int32 rowElements) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index b486d6c7eab3..e59078e6374c 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -106,7 +106,7 @@ namespace toolkit if ( ( i_row < 0 ) || ( size_t( i_row ) > m_aData.size() ) || ( i_column < 0 ) || ( i_column > m_nColumnCount ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *const_cast< DefaultGridDataModel* >( this ) ); + throw IndexOutOfBoundsException( OUString(), *const_cast< DefaultGridDataModel* >( this ) ); RowData const & rRow( m_aData[ i_row ] ); if ( size_t( i_column ) < rRow.size() ) @@ -121,7 +121,7 @@ namespace toolkit { OSL_ENSURE( i_requiredColumnCount <= size_t( m_nColumnCount ), "DefaultGridDataModel::impl_getRowDataAccess_throw: invalid column count!" ); if ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aData.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); RowData& rRowData( m_aData[ i_rowIndex ] ); if ( rRowData.size() < i_requiredColumnCount ) @@ -133,7 +133,7 @@ namespace toolkit DefaultGridDataModel::CellData& DefaultGridDataModel::impl_getCellDataAccess_throw( sal_Int32 const i_columnIndex, sal_Int32 const i_rowIndex ) { if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= m_nColumnCount ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); RowData& rRowData( impl_getRowDataAccess_throw( i_rowIndex, size_t( i_columnIndex + 1 ) ) ); return rRowData[ i_columnIndex ]; @@ -159,7 +159,7 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_row < 0 ) || ( size_t( i_row ) >= m_aRowHeaders.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); return m_aRowHeaders[ i_row ]; } @@ -214,7 +214,7 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_index < 0 ) || ( i_index > impl_getRowCount_nolck() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); // actually insert the row impl_insertRow( i_index, i_heading, i_data ); @@ -235,12 +235,12 @@ namespace toolkit void SAL_CALL DefaultGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException) { if ( i_headings.getLength() != i_data.getLength() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, -1 ); + throw IllegalArgumentException( OUString(), *this, -1 ); ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_index < 0 ) || ( i_index > impl_getRowCount_nolck() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); sal_Int32 const rowCount = i_headings.getLength(); if ( rowCount == 0 ) @@ -276,7 +276,7 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aData.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); m_aRowHeaders.erase( m_aRowHeaders.begin() + i_rowIndex ); m_aData.erase( m_aData.begin() + i_rowIndex ); @@ -323,10 +323,10 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aData.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); if ( i_columnIndexes.getLength() != i_values.getLength() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); sal_Int32 const columnCount = i_columnIndexes.getLength(); if ( columnCount == 0 ) @@ -335,7 +335,7 @@ namespace toolkit for ( sal_Int32 col = 0; col < columnCount; ++col ) { if ( ( i_columnIndexes[col] < 0 ) || ( i_columnIndexes[col] > m_nColumnCount ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); } RowData& rDataRow = m_aData[ i_rowIndex ]; @@ -363,7 +363,7 @@ namespace toolkit ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aRowHeaders.size() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); m_aRowHeaders[ i_rowIndex ] = i_heading; @@ -421,23 +421,23 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DefaultGridDataModel::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL DefaultGridDataModel::getImplementationName( ) throw (RuntimeException) { - static const ::rtl::OUString aImplName( "toolkit.DefaultGridDataModel" ); + static const OUString aImplName( "toolkit.DefaultGridDataModel" ); return aImplName; } //------------------------------------------------------------------------------------------------------------------ - sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString& ServiceName ) throw (RuntimeException) { return ServiceName.equalsAscii( szServiceName_DefaultGridDataModel ); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames( ) throw (RuntimeException) { - static const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( szServiceName_DefaultGridDataModel ) ); - static const Sequence< ::rtl::OUString > aSeq( &aServiceName, 1 ); + static const OUString aServiceName( OUString::createFromAscii( szServiceName_DefaultGridDataModel ) ); + static const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.hxx b/toolkit/source/controls/grid/defaultgriddatamodel.hxx index 82fd47021e9a..e58c81dbd8cc 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.hxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.hxx @@ -84,9 +84,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); private: typedef ::std::pair< Any, Any > CellData; diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index a0b26c96c09f..10c796b5f495 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -80,7 +80,7 @@ namespace toolkit { Reference< XInterface > const xSource( static_cast< ::cppu::OWeakObject* >( this ) ); GridColumnEvent const aEvent( - xSource, ::rtl::OUString::createFromAscii( i_asciiAttributeName ), + xSource, OUString::createFromAscii( i_asciiAttributeName ), i_oldValue, i_newValue, m_nIndex ); @@ -145,27 +145,27 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sTitle; } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL GridColumn::setTitle(const ::rtl::OUString & value) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL GridColumn::setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException) { impl_set( m_sTitle, value, "Title" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException) + OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sHelpText; } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL GridColumn::setHelpText( const ::rtl::OUString & value ) throw (RuntimeException) + void SAL_CALL GridColumn::setHelpText( const OUString & value ) throw (RuntimeException) { impl_set( m_sHelpText, value, "HelpText" ); } @@ -194,7 +194,7 @@ namespace toolkit void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value ) throw (IllegalArgumentException, RuntimeException) { if ( i_value < 0 ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); impl_set( m_nFlexibility, i_value, "Flexibility" ); } @@ -228,7 +228,7 @@ namespace toolkit { ::osl::MutexGuard aGuard( m_aMutex ); m_aIdentifier.clear(); - m_sTitle = m_sHelpText = ::rtl::OUString(); + m_sTitle = m_sHelpText = OUString(); } //------------------------------------------------------------------------------------------------------------------ @@ -259,15 +259,15 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL GridColumn::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL GridColumn::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.toolkit.GridColumn" ); + return OUString( "org.openoffice.comp.toolkit.GridColumn" ); } //------------------------------------------------------------------------------------------------------------------ - sal_Bool SAL_CALL GridColumn::supportsService( const ::rtl::OUString& i_serviceName ) throw (RuntimeException) + sal_Bool SAL_CALL GridColumn::supportsService( const OUString& i_serviceName ) throw (RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); for ( sal_Int32 i=0; i SAL_CALL GridColumn::getSupportedServiceNames( ) throw (RuntimeException) + ::com::sun::star::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames( ) throw (RuntimeException) { - const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( szServiceName_GridColumn ) ); - const Sequence< ::rtl::OUString > aSeq( &aServiceName, 1 ); + const OUString aServiceName( OUString::createFromAscii( szServiceName_GridColumn ) ); + const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx index cd4d1e038ad7..8a287608a389 100644 --- a/toolkit/source/controls/grid/gridcolumn.hxx +++ b/toolkit/source/controls/grid/gridcolumn.hxx @@ -60,10 +60,10 @@ public: virtual void SAL_CALL setResizeable(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getFlexibility() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle(const ::rtl::OUString & value) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getHelpText() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpText(const ::rtl::OUString & value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHelpText() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpText(const OUString & value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getIndex() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getDataColumnIndex() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(::com::sun::star::uno::RuntimeException); @@ -79,9 +79,9 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XUnoTunnel and friends virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& i_identifier ) throw(::com::sun::star::uno::RuntimeException); @@ -119,8 +119,8 @@ private: sal_Int32 m_nMinWidth; sal_Int32 m_nFlexibility; sal_Bool m_bResizeable; - ::rtl::OUString m_sTitle; - ::rtl::OUString m_sHelpText; + OUString m_sTitle; + OUString m_sHelpText; ::com::sun::star::style::HorizontalAlignment m_eHorizontalAlign; }; diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index bf169595abaf..e7de2d50facf 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -35,7 +35,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -219,7 +218,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const switch( nPropId ) { case BASEPROPERTY_DEFAULTCONTROL: - return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_GridControl ) ); + return uno::makeAny( OUString::createFromAscii( szServiceName_GridControl ) ); case BASEPROPERTY_GRID_SELECTIONMODE: return uno::makeAny( SelectionType(1) ); case BASEPROPERTY_GRID_SHOWROWHEADER: @@ -319,7 +318,7 @@ namespace try { Reference< XContainer > const xColModel( - xModelProps->getPropertyValue( ::rtl::OUString( "ColumnModel" ) ), + xModelProps->getPropertyValue( OUString( "ColumnModel" ) ), UNO_QUERY_THROW ); if ( i_add ) xColModel->addContainerListener( i_listener.get() ); @@ -327,7 +326,7 @@ namespace xColModel->removeContainerListener( i_listener.get() ); Reference< XGridDataModel > const xDataModel( - xModelProps->getPropertyValue( ::rtl::OUString( "GridDataModel" ) ), + xModelProps->getPropertyValue( OUString( "GridDataModel" ) ), UNO_QUERY_THROW ); Reference< XMutableGridDataModel > const xMutableDataModel( xDataModel, UNO_QUERY ); diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index 607d4552fe98..3bc402bdfcb8 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -59,7 +59,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // OPropertySetHelper void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); @@ -80,7 +80,7 @@ class UnoGridControl : public UnoGridControl_Base { public: UnoGridControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/controls/grid/initguard.hxx b/toolkit/source/controls/grid/initguard.hxx index f4c96cb719d0..176229ac32f8 100644 --- a/toolkit/source/controls/grid/initguard.hxx +++ b/toolkit/source/controls/grid/initguard.hxx @@ -40,7 +40,7 @@ namespace toolkit :comphelper::ComponentGuard( i_component, i_broadcastHelper ) { if ( !i_component.isInitialized() ) - throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), *&i_component ); + throw ::com::sun::star::lang::NotInitializedException( OUString(), *&i_component ); } ~InitGuard() diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 870c8e6aa4a8..d4a218c80172 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -228,7 +228,7 @@ namespace toolkit DBG_CHECK_ME(); if ( m_delegator.is() ) - throw AlreadyInitializedException( ::rtl::OUString(), *this ); + throw AlreadyInitializedException( OUString(), *this ); Reference< XMutableGridDataModel > xDelegator; Reference< XCollator > xCollator; @@ -243,11 +243,11 @@ namespace toolkit xDelegator.set( i_arguments[0], UNO_QUERY ); xCollator.set( i_arguments[1], UNO_QUERY ); if ( !xCollator.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 2 ); + throw IllegalArgumentException( OUString(), *this, 2 ); break; } if ( !xDelegator.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); m_delegator = xDelegator; m_collator = xCollator; @@ -521,7 +521,7 @@ namespace toolkit DBG_CHECK_ME(); if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= getColumnCount() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *this ); + throw IndexOutOfBoundsException( OUString(), *this ); if ( !impl_reIndex_nothrow( i_columnIndex, i_sortAscending ) ) return; @@ -834,9 +834,9 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::sal_Bool SAL_CALL SortableGridDataModel::supportsService( const ::rtl::OUString& i_serviceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > const aServiceNames( getSupportedServiceNames() ); + Sequence< OUString > const aServiceNames( getSupportedServiceNames() ); for ( sal_Int32 i=0; i SAL_CALL SortableGridDataModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SortableGridDataModel::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString::createFromAscii( szServiceName_SortableGridDataModel ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString::createFromAscii( szServiceName_SortableGridDataModel ); return aServiceNames; } @@ -855,7 +855,7 @@ namespace toolkit ::sal_Int32 SortableGridDataModel::impl_getPrivateRowIndex_throw( ::sal_Int32 const i_publicRowIndex ) const { if ( ( i_publicRowIndex < 0 ) || ( i_publicRowIndex >= m_delegator->getRowCount() ) ) - throw IndexOutOfBoundsException( ::rtl::OUString(), *const_cast< SortableGridDataModel* >( this ) ); + throw IndexOutOfBoundsException( OUString(), *const_cast< SortableGridDataModel* >( this ) ); if ( !impl_isSorted_nothrow() ) // no need to translate anything diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.hxx b/toolkit/source/controls/grid/sortablegriddatamodel.hxx index 85c5abd56c19..b9cdfb5a00ca 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.hxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.hxx @@ -103,9 +103,9 @@ namespace toolkit virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 04049a06856b..d5ffa5b9a3be 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -76,9 +76,9 @@ static void lcl_throwIndexOutOfBoundsException( ) } // ------------------------------------------------------------------- - ::rtl::OUString UnoControlRoadmapModel::getServiceName() throw(RuntimeException) + OUString UnoControlRoadmapModel::getServiceName() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoControlRoadmapModel ); + return OUString::createFromAscii( szServiceName_UnoControlRoadmapModel ); } @@ -103,7 +103,7 @@ static void lcl_throwIndexOutOfBoundsException( ) aReturn <<= (sal_Int16) 2; // No Border break; case BASEPROPERTY_DEFAULTCONTROL: - aReturn <<= ::rtl::OUString( ::rtl::OUString::createFromAscii( szServiceName_UnoControlRoadmap ) ); + aReturn <<= OUString( OUString::createFromAscii( szServiceName_UnoControlRoadmap ) ); break; default : aReturn = UnoControlRoadmapModel_Base::ImplGetDefaultValue( nPropId ); break; } @@ -187,7 +187,7 @@ static void lcl_throwIndexOutOfBoundsException( ) if ( !xRoadmapItem.is() ) lcl_throwIllegalArgumentException(); Reference< XServiceInfo > xServiceInfo( xRoadmapItem, UNO_QUERY ); - sal_Bool bIsRoadmapItem = xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.awt.RoadmapItem") ); + sal_Bool bIsRoadmapItem = xServiceInfo->supportsService( OUString("com.sun.star.awt.RoadmapItem") ); if ( !bIsRoadmapItem ) lcl_throwIllegalArgumentException(); } @@ -201,12 +201,12 @@ static void lcl_throwIndexOutOfBoundsException( ) if ( xProps.is() ) { sal_Int32 LocID = 0; - Any aValue = xPropertySet->getPropertyValue( ::rtl::OUString("ID") ); + Any aValue = xPropertySet->getPropertyValue( OUString("ID") ); aValue >>= LocID; if (LocID < 0) // index may not be smaller than zero { aAny <<= GetUniqueID(); - xPropertySet->setPropertyValue( ::rtl::OUString("ID"), aAny ); + xPropertySet->setPropertyValue( OUString("ID"), aAny ); } } } @@ -229,7 +229,7 @@ static void lcl_throwIndexOutOfBoundsException( ) { CurRoadmapItem = *i; Reference< XPropertySet > xPropertySet( CurRoadmapItem, UNO_QUERY ); - aAny = xPropertySet->getPropertyValue( ::rtl::OUString("ID") ); + aAny = xPropertySet->getPropertyValue( OUString("ID") ); aAny >>= n_CurItemID; if (n_CurItemID == CurID) { @@ -387,9 +387,9 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& // ------------------------------------------------------------------- - ::rtl::OUString UnoRoadmapControl::GetComponentServiceName() + OUString UnoRoadmapControl::GetComponentServiceName() { - return ::rtl::OUString("Roadmap"); + return OUString("Roadmap"); } @@ -410,7 +410,7 @@ void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(Run rEvent.Element >>= xRoadmapItem; Reference< XPropertySet > xRoadmapPropertySet( xRoadmapItem, UNO_QUERY ); if ( xRoadmapPropertySet.is() ) - xRoadmapPropertySet->addPropertyChangeListener( rtl::OUString(), this ); + xRoadmapPropertySet->addPropertyChangeListener( OUString(), this ); Reference< XContainerListener > xPeer(getPeer(), UNO_QUERY); if ( xPeer.is() ) @@ -418,7 +418,7 @@ void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(Run xPeer->elementInserted( rEvent ); Reference < XPropertySet > xPropertySet( xPeer, UNO_QUERY ); if ( xPropertySet.is() ) - xPropertySet->addPropertyChangeListener( rtl::OUString(), this ); + xPropertySet->addPropertyChangeListener( OUString(), this ); } } @@ -432,7 +432,7 @@ void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )throw(Runt rEvent.Element >>= xRoadmapItem; Reference< XPropertySet > xPropertySet( xRoadmapItem, UNO_QUERY ); if ( xPropertySet.is() ) - xPropertySet->removePropertyChangeListener( rtl::OUString(), this ); + xPropertySet->removePropertyChangeListener( OUString(), this ); } diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index e2a8344ba6f3..4bf6a48272b0 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -29,22 +29,22 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( ) { // registerProperty or registerMayBeVoidProperty or registerPropertyNoMember - registerProperty( ::rtl::OUString("Label"), RM_PROPERTY_ID_LABEL, + registerProperty( OUString("Label"), RM_PROPERTY_ID_LABEL, ::com::sun::star::beans::PropertyAttribute::BOUND | ::com::sun::star::beans::PropertyAttribute::CONSTRAINED, & m_sLabel, ::getCppuType( &m_sLabel ) ); m_nID = -1; - registerProperty( ::rtl::OUString("ID"), RM_PROPERTY_ID_ID, + registerProperty( OUString("ID"), RM_PROPERTY_ID_ID, ::com::sun::star::beans::PropertyAttribute::BOUND | ::com::sun::star::beans::PropertyAttribute::CONSTRAINED, & m_nID, ::getCppuType( &m_nID ) ); m_bEnabled = sal_True; - registerProperty( ::rtl::OUString("Enabled"), RM_PROPERTY_ID_ENABLED, + registerProperty( OUString("Enabled"), RM_PROPERTY_ID_ENABLED, ::com::sun::star::beans::PropertyAttribute::BOUND | ::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT, & m_bEnabled, ::getCppuType( &m_bEnabled ) ); - registerProperty( ::rtl::OUString("Interactive"), RM_PROPERTY_ID_INTERACTIVE, + registerProperty( OUString("Interactive"), RM_PROPERTY_ID_INTERACTIVE, ::com::sun::star::beans::PropertyAttribute::BOUND | ::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT, & m_bInteractive, ::getCppuType( &m_bInteractive ) ); @@ -78,22 +78,22 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe createPropertySetInfo( getInfoHelper() ) ); } -::rtl::OUString SAL_CALL ORoadmapEntry::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ORoadmapEntry::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { - ::rtl::OUString aStr("com.sun.star.comp.toolkit.RoadmapItem"); + OUString aStr("com.sun.star.comp.toolkit.RoadmapItem"); return aStr; } -sal_Bool SAL_CALL ORoadmapEntry::supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) { return ServiceName == "com.sun.star.awt.RoadmapItem"; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); - ::rtl::OUString* pArray = aRet.getArray(); - pArray[0] = ::rtl::OUString("com.sun.star.awt.RoadmapItem"); + ::com::sun::star::uno::Sequence< OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString("com.sun.star.awt.RoadmapItem"); return aRet; } //-------------------------------------------------------------------------- diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index 6fa34e09e01a..a4d402f9b682 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -64,8 +64,8 @@ namespace toolkit }; for ( size_t i=0; i < sizeof( aImageSets ) / sizeof( aImageSets[0] ); ++i ) { - const ::std::vector< ::rtl::OUString > aDefaultURLs( Throbber::getDefaultImageURLs( aImageSets[i] ) ); - const Sequence< ::rtl::OUString > aImageURLs( &aDefaultURLs[0], aDefaultURLs.size() ); + const ::std::vector< OUString > aDefaultURLs( Throbber::getDefaultImageURLs( aImageSets[i] ) ); + const Sequence< OUString > aImageURLs( &aDefaultURLs[0], aDefaultURLs.size() ); insertImageSet( i, aImageURLs ); } } @@ -102,9 +102,9 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL SpinningProgressControlModel::getServiceName() throw(RuntimeException) + OUString SAL_CALL SpinningProgressControlModel::getServiceName() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_SpinningProgressControlModel ); + return OUString::createFromAscii( szServiceName_SpinningProgressControlModel ); } //------------------------------------------------------------------------------------------------------------------ @@ -114,11 +114,11 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames() throw(RuntimeException) { Sequence< OUString > aServiceNames(3); - aServiceNames[0] = ::rtl::OUString::createFromAscii( szServiceName_SpinningProgressControlModel ); - aServiceNames[1] = ::rtl::OUString::createFromAscii( szServiceName_AnimatedImagesControlModel ); + aServiceNames[0] = OUString::createFromAscii( szServiceName_SpinningProgressControlModel ); + aServiceNames[1] = OUString::createFromAscii( szServiceName_AnimatedImagesControlModel ); aServiceNames[2] = "com.sun.star.awt.UnoControlModel"; return aServiceNames; } diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 08969cf70f11..2ffdea5ef272 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -110,7 +110,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence( if ( pTabs ) { // opt: Constant String for TabStop name - static const ::rtl::OUString aTabStopName( "Tabstop" ); + static const OUString aTabStopName( "Tabstop" ); Reference< XPropertySet > xPSet( xCtrl->getModel(), UNO_QUERY ); Reference< XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); @@ -325,7 +325,7 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) xVclContainerPeer->setTabOrder( aCompSeq, aTabSeq, mxModel->getGroupControl() ); - ::rtl::OUString aName; + OUString aName; Sequence< Reference< XControlModel > > aThisGroupModels; Sequence< Reference< XWindow > > aControlComponents; diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index b857bf05bc72..6857ae317bd5 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -260,7 +260,7 @@ void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Seque return aSeq; } -void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const ::rtl::OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException) +void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -316,7 +316,7 @@ sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno:: return nGroups; } -void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup, ::rtl::OUString& rName ) throw(::com::sun::star::uno::RuntimeException) +void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup, OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -343,7 +343,7 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::S rGroup = aSeq; } -void StdTabControllerModel::getGroupByName( const ::rtl::OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup ) throw(::com::sun::star::uno::RuntimeException) +void StdTabControllerModel::getGroupByName( const OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -356,7 +356,7 @@ void StdTabControllerModel::getGroupByName( const ::rtl::OUString& rName, ::com: { if ( pEntry->pGroup->GetName() == rName ) { - ::rtl::OUString Dummy; + OUString Dummy; getGroup( nGroup, rGroup, Dummy ); break; } @@ -367,9 +367,9 @@ void StdTabControllerModel::getGroupByName( const ::rtl::OUString& rName, ::com: // ::com::sun::star::io::XPersistObject -::rtl::OUString StdTabControllerModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString StdTabControllerModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_TabControllerModel ); + return OUString::createFromAscii( szServiceName_TabControllerModel ); } void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) @@ -389,7 +389,7 @@ void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com for ( sal_uInt32 n = 0; n < nGroups; n++ ) { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aGroupCtrls; - ::rtl::OUString aGroupName; + OUString aGroupName; getGroup( n, aGroupCtrls, aGroupName ); OutStream->writeUTF( aGroupName ); ImplWriteControls( OutStream, aGroupCtrls ); @@ -406,7 +406,7 @@ void StdTabControllerModel::read( const ::com::sun::star::uno::Reference< ::com: sal_uInt32 nGroups = InStream->readLong(); for ( sal_uInt32 n = 0; n < nGroups; n++ ) { - ::rtl::OUString aGroupName = InStream->readUTF(); + OUString aGroupName = InStream->readUTF(); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > aCtrlSeq = ImplReadControls( InStream ); setGroup( aCtrlSeq, aGroupName ); } diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 44d1defb8180..efbac8b28b54 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -33,7 +33,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -61,9 +60,9 @@ UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Referenc ImplRegisterProperty( BASEPROPERTY_TEXT ); } -::rtl::OUString UnoControlTabPageContainerModel::getServiceName() throw(RuntimeException) +OUString UnoControlTabPageContainerModel::getServiceName() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel ); + return OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel ); } uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const @@ -71,7 +70,7 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI switch(nPropId) { case BASEPROPERTY_DEFAULTCONTROL: - return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainer ) ); + return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlTabPageContainer ) ); case BASEPROPERTY_BORDER: return uno::makeAny((sal_Int16) 0); // No Border default: @@ -137,7 +136,7 @@ Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::createTabPa return lcl_createTabPageModel( m_xContext, aInitArgs, this ); } -Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage( ::sal_Int16 i_tabPageID, const ::rtl::OUString& i_resourceURL ) throw (RuntimeException) +Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage( ::sal_Int16 i_tabPageID, const OUString& i_resourceURL ) throw (RuntimeException) { Sequence< Any > aInitArgs(2); aInitArgs[0] <<= i_tabPageID; @@ -160,11 +159,11 @@ void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex m_aTabPageVector.insert( aIter, xTabPageModel ); } else - throw IndexOutOfBoundsException( ::rtl::OUString(), (OWeakObject *)this ); + throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); ContainerEvent aEvent; aEvent.Source = *this; aEvent.Element <<= aElement; - aEvent.Accessor <<= ::rtl::OUString::valueOf(nIndex); + aEvent.Accessor <<= OUString::valueOf(nIndex); maContainerListeners.elementInserted( aEvent ); } else @@ -324,7 +323,7 @@ void UnoControlTabPageContainer::updateFromModel() xContainerListener->elementInserted( aEvent ); } } -void SAL_CALL UnoControlTabPageContainer::addControl( const ::rtl::OUString& Name, const Reference< ::com::sun::star::awt::XControl >& Control ) throw (RuntimeException) +void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, const Reference< ::com::sun::star::awt::XControl >& Control ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; ControlContainerBase::addControl(Name,Control); diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 7ba7f420b055..f06f7e76699d 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; ////HELPER -::rtl::OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); +OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::com::sun::star::uno::Any& rUrl ); // ---------------------------------------------------- // class UnoControlTabPageModel @@ -74,9 +74,9 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > c ImplRegisterProperty( BASEPROPERTY_ENABLED ); } -::rtl::OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException) +OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageModel ); + return OUString::createFromAscii( szServiceName_UnoControlTabPageModel ); } Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const @@ -86,7 +86,7 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const switch ( nPropId ) { case BASEPROPERTY_DEFAULTCONTROL: - aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPage ); + aAny <<= OUString::createFromAscii( szServiceName_UnoControlTabPage ); break; default: aAny = UnoControlModel::ImplGetDefaultValue( nPropId ); @@ -127,15 +127,15 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence& rArgument if ( !( rArguments[ 0 ] >>= nPageId )) throw lang::IllegalArgumentException(); m_nTabPageId = nPageId; - ::rtl::OUString sURL; + OUString sURL; if ( !( rArguments[ 1 ] >>= sURL )) throw lang::IllegalArgumentException(); Reference xDialogModel = awt::UnoControlDialogModelProvider::create( m_xContext, sURL ); if ( xDialogModel.is() ) { - Sequence< ::rtl::OUString> aNames = xDialogModel->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xDialogModel->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { try @@ -152,7 +152,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence& rArgument Reference xDialogProp(xDialogModel,UNO_QUERY); if ( xDialogProp.is() ) { - static const ::rtl::OUString s_sResourceResolver("ResourceResolver"); + static const OUString s_sResourceResolver("ResourceResolver"); Reference xThis(*this,UNO_QUERY); xThis->setPropertyValue(s_sResourceResolver,xDialogProp->getPropertyValue(s_sResourceResolver)); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE))); @@ -167,16 +167,16 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence& rArgument m_nTabPageId = -1; } //===== Service =============================================================== -::rtl::OUString UnoControlTabPageModel_getImplementationName (void) throw(RuntimeException) +OUString UnoControlTabPageModel_getImplementationName (void) throw(RuntimeException) { - return rtl::OUString("com.sun.star.awt.tab.UnoControlTabPageModel"); + return OUString("com.sun.star.awt.tab.UnoControlTabPageModel"); } -Sequence SAL_CALL UnoControlTabPageModel_getSupportedServiceNames (void) +Sequence SAL_CALL UnoControlTabPageModel_getSupportedServiceNames (void) throw (RuntimeException) { - const ::rtl::OUString sServiceName("com.sun.star.awt.tab.UnoControlTabPageModel"); - return Sequence(&sServiceName, 1); + const OUString sServiceName("com.sun.star.awt.tab.UnoControlTabPageModel"); + return Sequence(&sServiceName, 1); } //============================================================================= // = class UnoControlTabPage @@ -193,9 +193,9 @@ UnoControlTabPage::~UnoControlTabPage() { } -::rtl::OUString UnoControlTabPage::GetComponentServiceName() +OUString UnoControlTabPage::GetComponentServiceName() { - return ::rtl::OUString("TabPageModel"); + return OUString("TabPageModel"); } void UnoControlTabPage::dispose() throw(RuntimeException) @@ -262,11 +262,11 @@ throw (::com::sun::star::uno::RuntimeException) // Remember that changes have been done by listener. No need to // update the position because of property change event. mbSizeModified = true; - Sequence< rtl::OUString > aProps( 2 ); + Sequence< OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); // Properties in a sequence must be sorted! - aProps[0] = rtl::OUString( "Height" ); - aProps[1] = rtl::OUString( "Width" ); + aProps[0] = OUString( "Height" ); + aProps[1] = OUString( "Width" ); aValues[0] <<= aAppFontSize.Height(); aValues[1] <<= aAppFontSize.Width(); @@ -290,10 +290,10 @@ throw (::com::sun::star::uno::RuntimeException) // Remember that changes have been done by listener. No need to // update the position because of property change event. mbPosModified = true; - Sequence< rtl::OUString > aProps( 2 ); + Sequence< OUString > aProps( 2 ); Sequence< Any > aValues( 2 ); - aProps[0] = rtl::OUString( "PositionX" ); - aProps[1] = rtl::OUString( "PositionY" ); + aProps[0] = OUString( "PositionX" ); + aProps[1] = OUString( "PositionY" ); aValues[0] <<= aTmp.Width(); aValues[1] <<= aTmp.Height(); diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index f2293bc6edec..2f7f0dd43ddf 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -43,9 +43,9 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString UnoControlScrollBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) + OUString UnoControlScrollBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoControlScrollBarModel ); + return OUString::createFromAscii( szServiceName_UnoControlScrollBarModel ); } //-------------------------------------------------------------------- @@ -56,7 +56,7 @@ namespace toolkit case BASEPROPERTY_LIVE_SCROLL: return uno::makeAny( (sal_Bool)sal_False ); case BASEPROPERTY_DEFAULTCONTROL: - return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoControlScrollBar ) ); + return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlScrollBar ) ); default: return UnoControlModel::ImplGetDefaultValue( nPropId ); @@ -92,9 +92,9 @@ namespace toolkit { } - ::rtl::OUString UnoScrollBarControl::GetComponentServiceName() + OUString UnoScrollBarControl::GetComponentServiceName() { - return ::rtl::OUString("ScrollBar"); + return OUString("ScrollBar"); } // ::com::sun::star::uno::XInterface diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx index 1b893b19805b..e581b8ce1141 100644 --- a/toolkit/source/controls/tksimpleanimation.cxx +++ b/toolkit/source/controls/tksimpleanimation.cxx @@ -42,10 +42,10 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString UnoSimpleAnimationControlModel::getServiceName() + OUString UnoSimpleAnimationControlModel::getServiceName() throw( uno::RuntimeException ) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel ); + return OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel ); } //-------------------------------------------------------------------- @@ -54,7 +54,7 @@ namespace toolkit switch ( nPropId ) { case BASEPROPERTY_DEFAULTCONTROL: - return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoSimpleAnimationControl ) ); + return uno::makeAny( OUString::createFromAscii( szServiceName_UnoSimpleAnimationControl ) ); case BASEPROPERTY_STEP_TIME: return uno::makeAny( (sal_Int32) 100 ); @@ -88,22 +88,22 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL UnoSimpleAnimationControlModel::getImplementationName() + OUString SAL_CALL UnoSimpleAnimationControlModel::getImplementationName() throw( uno::RuntimeException ) { - return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel" ); + return OUString( "com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel" ); } //-------------------------------------------------------------------- - uno::Sequence< ::rtl::OUString > SAL_CALL UnoSimpleAnimationControlModel::getSupportedServiceNames() + uno::Sequence< OUString > SAL_CALL UnoSimpleAnimationControlModel::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aServices( UnoControlModel::getSupportedServiceNames() ); + uno::Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 2 ); aServices[sal::static_int_cast(aServices.getLength()) - 2] - = ::rtl::OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel ); + = OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel ); aServices[sal::static_int_cast(aServices.getLength()) - 1] - = ::rtl::OUString::createFromAscii( szServiceName2_UnoSimpleAnimationControlModel ); + = OUString::createFromAscii( szServiceName2_UnoSimpleAnimationControlModel ); return aServices; } @@ -117,25 +117,25 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString UnoSimpleAnimationControl::GetComponentServiceName() + OUString UnoSimpleAnimationControl::GetComponentServiceName() { - return ::rtl::OUString("SimpleAnimation"); + return OUString("SimpleAnimation"); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL UnoSimpleAnimationControl::getImplementationName() + OUString SAL_CALL UnoSimpleAnimationControl::getImplementationName() throw( uno::RuntimeException ) { - return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoSimpleAnimationControl" ); + return OUString( "com.sun.star.comp.toolkit.UnoSimpleAnimationControl" ); } //-------------------------------------------------------------------- - uno::Sequence< ::rtl::OUString > SAL_CALL UnoSimpleAnimationControl::getSupportedServiceNames() + uno::Sequence< OUString > SAL_CALL UnoSimpleAnimationControl::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aServices( UnoSimpleAnimationControl_Base::getSupportedServiceNames() ); + uno::Sequence< OUString > aServices( UnoSimpleAnimationControl_Base::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 1 ); - aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName_UnoSimpleAnimationControl ); + aServices[ aServices.getLength() - 1 ] = OUString::createFromAscii( szServiceName_UnoSimpleAnimationControl ); return aServices; } diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index ef5a9665c993..ad20b0ff22ba 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -65,9 +65,9 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString UnoSpinButtonModel::getServiceName( ) throw (RuntimeException) + OUString UnoSpinButtonModel::getServiceName( ) throw (RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoSpinButtonModel ); + return OUString::createFromAscii( szServiceName_UnoSpinButtonModel ); } //-------------------------------------------------------------------- @@ -76,7 +76,7 @@ namespace toolkit switch ( nPropId ) { case BASEPROPERTY_DEFAULTCONTROL: - return makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoSpinButtonControl ) ); + return makeAny( OUString::createFromAscii( szServiceName_UnoSpinButtonControl ) ); case BASEPROPERTY_BORDER: return makeAny( (sal_Int16) 0 ); @@ -109,17 +109,17 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL UnoSpinButtonModel::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL UnoSpinButtonModel::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoSpinButtonModel" ); + return OUString( "com.sun.star.comp.toolkit.UnoSpinButtonModel" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames() throw(RuntimeException) { - Sequence< ::rtl::OUString > aServices( UnoControlModel::getSupportedServiceNames() ); + Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 1 ); - aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName_UnoSpinButtonModel ); + aServices[ aServices.getLength() - 1 ] = OUString::createFromAscii( szServiceName_UnoSpinButtonModel ); return aServices; } @@ -134,9 +134,9 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString UnoSpinButtonControl::GetComponentServiceName() + OUString UnoSpinButtonControl::GetComponentServiceName() { - return ::rtl::OUString("SpinButton"); + return OUString("SpinButton"); } //-------------------------------------------------------------------- @@ -172,17 +172,17 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL UnoSpinButtonControl::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL UnoSpinButtonControl::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoSpinButtonControl" ); + return OUString( "com.sun.star.comp.toolkit.UnoSpinButtonControl" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames() throw(RuntimeException) { - Sequence< ::rtl::OUString > aServices( UnoControlBase::getSupportedServiceNames() ); + Sequence< OUString > aServices( UnoControlBase::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 1 ); - aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName_UnoSpinButtonControl ); + aServices[ aServices.getLength() - 1 ] = OUString::createFromAscii( szServiceName_UnoSpinButtonControl ); return aServices; } diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx index 7eff4193f3c9..30fe9793b2c7 100644 --- a/toolkit/source/controls/tkthrobber.cxx +++ b/toolkit/source/controls/tkthrobber.cxx @@ -46,9 +46,9 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString UnoThrobberControlModel::getServiceName( ) throw ( uno::RuntimeException ) + OUString UnoThrobberControlModel::getServiceName( ) throw ( uno::RuntimeException ) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoThrobberControlModel ); + return OUString::createFromAscii( szServiceName_UnoThrobberControlModel ); } //-------------------------------------------------------------------- @@ -57,7 +57,7 @@ namespace toolkit switch ( nPropId ) { case BASEPROPERTY_DEFAULTCONTROL: - return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoThrobberControl ) ); + return uno::makeAny( OUString::createFromAscii( szServiceName_UnoThrobberControl ) ); case BASEPROPERTY_BORDER: return uno::makeAny( (sal_Int16) 0 ); default: @@ -86,22 +86,22 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL UnoThrobberControlModel::getImplementationName() + OUString SAL_CALL UnoThrobberControlModel::getImplementationName() throw( uno::RuntimeException ) { - return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoThrobberControlModel" ); + return OUString( "com.sun.star.comp.toolkit.UnoThrobberControlModel" ); } //-------------------------------------------------------------------- - uno::Sequence< ::rtl::OUString > SAL_CALL UnoThrobberControlModel::getSupportedServiceNames() + uno::Sequence< OUString > SAL_CALL UnoThrobberControlModel::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aServices( UnoControlModel::getSupportedServiceNames() ); + uno::Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 2 ); aServices[sal::static_int_cast(aServices.getLength()) - 2] = - ::rtl::OUString::createFromAscii(szServiceName_UnoThrobberControlModel); + OUString::createFromAscii(szServiceName_UnoThrobberControlModel); aServices[sal::static_int_cast(aServices.getLength()) - 1] = - ::rtl::OUString::createFromAscii(szServiceName2_UnoThrobberControlModel); + OUString::createFromAscii(szServiceName2_UnoThrobberControlModel); return aServices; } @@ -115,9 +115,9 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString UnoThrobberControl::GetComponentServiceName() + OUString UnoThrobberControl::GetComponentServiceName() { - return ::rtl::OUString("Throbber"); + return OUString("Throbber"); } //-------------------------------------------------------------------- @@ -141,22 +141,22 @@ namespace toolkit } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL UnoThrobberControl::getImplementationName() + OUString SAL_CALL UnoThrobberControl::getImplementationName() throw( uno::RuntimeException ) { - return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoThrobberControl" ); + return OUString( "com.sun.star.comp.toolkit.UnoThrobberControl" ); } //-------------------------------------------------------------------- - uno::Sequence< ::rtl::OUString > SAL_CALL UnoThrobberControl::getSupportedServiceNames() + uno::Sequence< OUString > SAL_CALL UnoThrobberControl::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aServices( UnoControlBase::getSupportedServiceNames() ); + uno::Sequence< OUString > aServices( UnoControlBase::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 2 ); aServices[sal::static_int_cast(aServices.getLength()) - 2] = - ::rtl::OUString::createFromAscii(szServiceName_UnoThrobberControl); + OUString::createFromAscii(szServiceName_UnoThrobberControl); aServices[sal::static_int_cast(aServices.getLength()) - 1] = - ::rtl::OUString::createFromAscii(szServiceName2_UnoThrobberControl); + OUString::createFromAscii(szServiceName2_UnoThrobberControl); return aServices; } diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 69e88eb9d522..a3fc00d27c8a 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -29,7 +29,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt::tree; @@ -101,7 +100,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const case BASEPROPERTY_TREE_SHOWSHANDLES: return Any( sal_True ); case BASEPROPERTY_DEFAULTCONTROL: - return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_TreeControl ) ); + return uno::makeAny( OUString::createFromAscii( szServiceName_TreeControl ) ); default: return UnoControlModel::ImplGetDefaultValue( nPropId ); } diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx index a36d242f637a..208b066307da 100644 --- a/toolkit/source/controls/tree/treecontrol.hxx +++ b/toolkit/source/controls/tree/treecontrol.hxx @@ -55,7 +55,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::io::XPersistObject - ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoTreeModel, UnoControlModel, szServiceName_TreeControlModel ) @@ -70,7 +70,7 @@ class UnoTreeControl : public UnoTreeControl_Base { public: UnoTreeControl(); - ::rtl::OUString GetComponentServiceName(); + OUString GetComponentServiceName(); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); @@ -93,10 +93,10 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration( ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTreeControl - virtual ::rtl::OUString SAL_CALL getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultExpandedGraphicURL( const ::rtl::OUString& _defaultexpandedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultCollapsedGraphicURL( const ::rtl::OUString& _defaultcollapsedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isNodeExpanded( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isNodeCollapsed( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL makeNodeVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::awt::tree::ExpandVetoException, ::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 90fe37d6d844..891525d9d913 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -26,7 +26,6 @@ #include #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -103,9 +102,9 @@ public: virtual void SAL_CALL removeChildByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setHasChildrenOnDemand( ::sal_Bool ChildrenOnDemand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDisplayValue( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setNodeGraphicURL( const ::rtl::OUString& URL ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setExpandedGraphicURL( const ::rtl::OUString& URL ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCollapsedGraphicURL( const ::rtl::OUString& URL ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setNodeGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setExpandedGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCollapsedGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException); // XTreeNode virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getChildAt( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -114,9 +113,9 @@ public: virtual ::sal_Int32 SAL_CALL getIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL hasChildrenOnDemand( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getDisplayValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNodeGraphicURL( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExpandedGraphicURL( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCollapsedGraphicURL( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNodeGraphicURL( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExpandedGraphicURL( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCollapsedGraphicURL( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index cbf541d9fe9f..499d331f464d 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -72,17 +72,17 @@ static const LanguageDependentProp aLanguageDependentProp[] = { 0, 0 } }; -static Sequence< ::rtl::OUString> lcl_ImplGetPropertyNames( const Reference< XMultiPropertySet > & rxModel ) +static Sequence< OUString> lcl_ImplGetPropertyNames( const Reference< XMultiPropertySet > & rxModel ) { - Sequence< ::rtl::OUString> aNames; + Sequence< OUString> aNames; Reference< XPropertySetInfo > xPSInf = rxModel->getPropertySetInfo(); DBG_ASSERT( xPSInf.is(), "UpdateFromModel: No PropertySetInfo!" ); if ( xPSInf.is() ) { Sequence< Property> aProps = xPSInf->getProperties(); sal_Int32 nLen = aProps.getLength(); - aNames = Sequence< ::rtl::OUString>( nLen ); - ::rtl::OUString* pNames = aNames.getArray(); + aNames = Sequence< OUString>( nLen ); + OUString* pNames = aNames.getArray(); const Property* pProps = aProps.getConstArray(); for ( sal_Int32 n = 0; n < nLen; ++n, ++pProps, ++pNames) *pNames = pProps->Name; @@ -115,7 +115,7 @@ private: VclListenerLock& operator=( const VclListenerLock& ); // never implemented }; -typedef ::std::map< ::rtl::OUString, sal_Int32 > MapString2Int; +typedef ::std::map< OUString, sal_Int32 > MapString2Int; struct UnoControl_Data { MapString2Int aSuspendedPropertyNotifications; @@ -158,9 +158,9 @@ UnoControl::~UnoControl() DBG_DTOR( UnoControl, NULL ); } -::rtl::OUString UnoControl::GetComponentServiceName() +OUString UnoControl::GetComponentServiceName() { - return ::rtl::OUString(); + return OUString(); } Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer ) @@ -222,7 +222,7 @@ Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE return xCompatiblePeer; } -bool UnoControl::ImplCheckLocalize( ::rtl::OUString& _rPossiblyLocalizable ) +bool UnoControl::ImplCheckLocalize( OUString& _rPossiblyLocalizable ) { if ( !mpData->bLocalizationSupport || ( _rPossiblyLocalizable.isEmpty() ) @@ -236,12 +236,12 @@ bool UnoControl::ImplCheckLocalize( ::rtl::OUString& _rPossiblyLocalizable ) { Reference< XPropertySet > xPropSet( mxModel, UNO_QUERY_THROW ); Reference< resource::XStringResourceResolver > xStringResourceResolver( - xPropSet->getPropertyValue( ::rtl::OUString( "ResourceResolver" ) ), + xPropSet->getPropertyValue( OUString( "ResourceResolver" ) ), UNO_QUERY ); if ( xStringResourceResolver.is() ) { - ::rtl::OUString aLocalizationKey( _rPossiblyLocalizable.copy( 1 ) ); + OUString aLocalizationKey( _rPossiblyLocalizable.copy( 1 ) ); _rPossiblyLocalizable = xStringResourceResolver->resolveString( aLocalizationKey ); return true; } @@ -253,7 +253,7 @@ bool UnoControl::ImplCheckLocalize( ::rtl::OUString& _rPossiblyLocalizable ) return false; } -void UnoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const Any& rVal ) +void UnoControl::ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ) { // since a change made in propertiesChange, we can't be sure that this is called with an valid getPeer(), // this assumption may be false in some (seldom) multi-threading scenarios (cause propertiesChange @@ -275,8 +275,8 @@ void UnoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const An ( rPropName.equalsAsciiL( "CurrencySymbol", 14 )) || ( rPropName.equalsAsciiL( "StringItemList", 14 )) ) { - ::rtl::OUString aValue; - uno::Sequence< rtl::OUString > aSeqValue; + OUString aValue; + uno::Sequence< OUString > aSeqValue; if ( aConvertedValue >>= aValue ) { if ( ImplCheckLocalize( aValue ) ) @@ -323,7 +323,7 @@ void UnoControl::updateFromModel() Reference< XMultiPropertySet > xPropSet( mxModel, UNO_QUERY ); if( xPropSet.is() ) { - Sequence< ::rtl::OUString> aNames = lcl_ImplGetPropertyNames( xPropSet ); + Sequence< OUString> aNames = lcl_ImplGetPropertyNames( xPropSet ); xPropSet->firePropertiesChangeEvent( aNames, this ); } } @@ -401,7 +401,7 @@ void UnoControl::removeEventListener( const Reference< XEventListener >& rxListe maDisposeListeners.removeInterface( rxListener ); } -sal_Bool UnoControl::requiresNewPeer( const ::rtl::OUString& /* _rPropertyName */ ) const +sal_Bool UnoControl::requiresNewPeer( const OUString& /* _rPropertyName */ ) const { return sal_False; } @@ -437,7 +437,7 @@ void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvent ImplModelPropertiesChanged( aEvents ); } -void UnoControl::ImplLockPropertyChangeNotification( const ::rtl::OUString& rPropertyName, bool bLock ) +void UnoControl::ImplLockPropertyChangeNotification( const OUString& rPropertyName, bool bLock ) { MapString2Int::iterator pos = mpData->aSuspendedPropertyNotifications.find( rPropertyName ); if ( bLock ) @@ -458,9 +458,9 @@ void UnoControl::ImplLockPropertyChangeNotification( const ::rtl::OUString& rPro } } -void UnoControl::ImplLockPropertyChangeNotifications( const Sequence< ::rtl::OUString >& rPropertyNames, bool bLock ) +void UnoControl::ImplLockPropertyChangeNotifications( const Sequence< OUString >& rPropertyNames, bool bLock ) { - for ( const ::rtl::OUString* pPropertyName = rPropertyNames.getConstArray(); + for ( const OUString* pPropertyName = rPropertyNames.getConstArray(); pPropertyName != rPropertyNames.getConstArray() + rPropertyNames.getLength(); ++pPropertyName ) @@ -606,7 +606,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent if ( bMustBeInserted ) { // Add language dependent props at the end - ::rtl::OUString aPropName( ::rtl::OUString::createFromAscii( pLangDepProp->pPropName )); + OUString aPropName( OUString::createFromAscii( pLangDepProp->pPropName )); if ( xPSI.is() && xPSI->hasPropertyByName( aPropName ) ) { aPeerPropertiesToSet.push_back( @@ -1087,7 +1087,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer if ( !mxModel.is() ) { RuntimeException aException; - aException.Message = ::rtl::OUString("createPeer: no model!"); + aException.Message = OUString("createPeer: no model!"); aException.Context = (XAggregation*)(::cppu::OWeakAggObject*)this; throw( aException ); } @@ -1139,7 +1139,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer Reference< XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); Any aVal; - ::rtl::OUString aPropName = GetPropertyName( BASEPROPERTY_BORDER ); + OUString aPropName = GetPropertyName( BASEPROPERTY_BORDER ); if ( xInfo->hasPropertyByName( aPropName ) ) { aVal = xPSet->getPropertyValue( aPropName ); @@ -1352,10 +1352,10 @@ sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw xPropSet.set( mxModel, UNO_QUERY_THROW ); Reference< XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), UNO_SET_THROW ); - Sequence< ::rtl::OUString> aNames = lcl_ImplGetPropertyNames( xPropSet ); + Sequence< OUString> aNames = lcl_ImplGetPropertyNames( xPropSet ); xPropSet->addPropertiesChangeListener( aNames, xListener ); - mpData->bLocalizationSupport = xPSI->hasPropertyByName( ::rtl::OUString( "ResourceResolver" ) ); + mpData->bLocalizationSupport = xPSI->hasPropertyByName( OUString( "ResourceResolver" ) ); } catch( const Exception& ) { @@ -1396,7 +1396,7 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException) disposeAccessibleContext(); aModeChangeEvent.Source = *this; - aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString("design") : ::rtl::OUString("alive" ); + aModeChangeEvent.NewMode = mbDesignMode ? OUString("design") : OUString("alive" ); } // ajust the visibility of our window @@ -1418,19 +1418,19 @@ sal_Bool UnoControl::isTransparent( ) throw(RuntimeException) } // XServiceInfo -::rtl::OUString UnoControl::getImplementationName( ) throw(RuntimeException) +OUString UnoControl::getImplementationName( ) throw(RuntimeException) { OSL_FAIL( "This method should be overloaded!" ); - return ::rtl::OUString(); + return OUString(); } -sal_Bool UnoControl::supportsService( const ::rtl::OUString& rServiceName ) throw(RuntimeException) +sal_Bool UnoControl::supportsService( const OUString& rServiceName ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); - Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString* pArray = aSNL.getConstArray(); - const ::rtl::OUString* pArrayEnd = aSNL.getConstArray() + aSNL.getLength(); + Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString* pArray = aSNL.getConstArray(); + const OUString* pArrayEnd = aSNL.getConstArray() + aSNL.getLength(); for (; pArray != pArrayEnd; ++pArray ) if( *pArray == rServiceName ) break; @@ -1438,10 +1438,10 @@ sal_Bool UnoControl::supportsService( const ::rtl::OUString& rServiceName ) thro return pArray != pArrayEnd; } -Sequence< ::rtl::OUString > UnoControl::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > UnoControl::getSupportedServiceNames( ) throw(RuntimeException) { - ::rtl::OUString sName( "com.sun.star.awt.UnoControl" ); - return Sequence< ::rtl::OUString >( &sName, 1 ); + OUString sName( "com.sun.star.awt.UnoControl" ); + return Sequence< OUString >( &sName, 1 ); } // ------------------------------------------------------------------------ diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index 961f6e0ac3ee..566d11bb3653 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -32,11 +32,11 @@ sal_Bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId ) { - ::rtl::OUString aPropName( GetPropertyName( nPropId ) ); + OUString aPropName( GetPropertyName( nPropId ) ); return ImplHasProperty( aPropName ); } -sal_Bool UnoControlBase::ImplHasProperty( const ::rtl::OUString& aPropertyName ) +sal_Bool UnoControlBase::ImplHasProperty( const OUString& aPropertyName ) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet( mxModel, ::com::sun::star::uno::UNO_QUERY ); if ( !xPSet.is() ) @@ -48,7 +48,7 @@ sal_Bool UnoControlBase::ImplHasProperty( const ::rtl::OUString& aPropertyName ) return xInfo->hasPropertyByName( aPropertyName ); } -void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis ) +void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis ) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > xMPS( mxModel, ::com::sun::star::uno::UNO_QUERY ); if ( !mxModel.is() ) @@ -79,7 +79,7 @@ void UnoControlBase::ImplSetPropertyValues( const ::com::sun::star::uno::Sequenc } } -void UnoControlBase::ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis ) +void UnoControlBase::ImplSetPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis ) { // Model might be logged off already but an event still fires if ( mxModel.is() ) @@ -103,7 +103,7 @@ void UnoControlBase::ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, } } -::com::sun::star::uno::Any UnoControlBase::ImplGetPropertyValue( const ::rtl::OUString& aPropertyName ) +::com::sun::star::uno::Any UnoControlBase::ImplGetPropertyValue( const OUString& aPropertyName ) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPSet( mxModel, ::com::sun::star::uno::UNO_QUERY ); if ( xPSet.is() ) @@ -156,9 +156,9 @@ double UnoControlBase::ImplGetPropertyValue_DOUBLE( sal_uInt16 nProp ) return n; } -::rtl::OUString UnoControlBase::ImplGetPropertyValue_UString( sal_uInt16 nProp ) +OUString UnoControlBase::ImplGetPropertyValue_UString( sal_uInt16 nProp ) { - ::rtl::OUString aStr; + OUString aStr; if ( mxModel.is() ) { ::com::sun::star::uno::Any aVal = ImplGetPropertyValue( GetPropertyName( nProp ) ); diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 97fe8dce2380..015dd1b37069 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -46,16 +46,16 @@ using namespace ::com::sun::star; struct UnoControlHolder { uno::Reference< awt::XControl > mxControl; - ::rtl::OUString msName; + OUString msName; public: - UnoControlHolder( const ::rtl::OUString& rName, const uno::Reference< awt::XControl > & rControl ) + UnoControlHolder( const OUString& rName, const uno::Reference< awt::XControl > & rControl ) : mxControl( rControl ), msName( rName ) { } - inline const ::rtl::OUString& getName() const { return msName; } + inline const OUString& getName() const { return msName; } inline const uno::Reference< awt::XControl >& getControl() const { return mxControl; } }; @@ -82,7 +82,7 @@ public: @return the identifier of the newly added control */ - ControlIdentifier addControl( const uno::Reference< awt::XControl >& _rxControl, const ::rtl::OUString* _pName ); + ControlIdentifier addControl( const uno::Reference< awt::XControl >& _rxControl, const OUString* _pName ); /** returns the number of controls in the list */ @@ -107,7 +107,7 @@ public: /** returns the first control which is registered under the given name */ uno::Reference< awt::XControl > - getControlForName( const ::rtl::OUString& _rName ) const; + getControlForName( const OUString& _rName ) const; /** returns the identifier which a control is registered for, or -1 if the control isn't registered @@ -150,7 +150,7 @@ private: */ ControlIdentifier impl_addControl( const uno::Reference< awt::XControl >& _rxControl, - const ::rtl::OUString* _pName + const OUString* _pName ); /** finds a free identifier @@ -163,7 +163,7 @@ private: @throw uno::RuntimeException if no free name can be found */ - ::rtl::OUString impl_getFreeName_throw(); + OUString impl_getFreeName_throw(); }; //------------------------------------------------------------------------ @@ -177,7 +177,7 @@ UnoControlHolderList::~UnoControlHolderList() } //------------------------------------------------------------------------ -UnoControlHolderList::ControlIdentifier UnoControlHolderList::addControl( const uno::Reference< awt::XControl >& _rxControl, const ::rtl::OUString* _pName ) +UnoControlHolderList::ControlIdentifier UnoControlHolderList::addControl( const uno::Reference< awt::XControl >& _rxControl, const OUString* _pName ) { return impl_addControl( _rxControl, _pName ); } @@ -209,7 +209,7 @@ size_t UnoControlHolderList::getIdentifiers( uno::Sequence< sal_Int32 >& _out_rI } //------------------------------------------------------------------------ -uno::Reference< awt::XControl > UnoControlHolderList::getControlForName( const ::rtl::OUString& _rName ) const +uno::Reference< awt::XControl > UnoControlHolderList::getControlForName( const OUString& _rName ) const { for ( ControlMap::const_iterator loop = maControls.begin(); loop != maControls.end(); @@ -269,11 +269,11 @@ void UnoControlHolderList::replaceControlById( ControlIdentifier _nId, const uno } //------------------------------------------------------------------------ -UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_addControl( const uno::Reference< awt::XControl >& _rxControl, const ::rtl::OUString* _pName ) +UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_addControl( const uno::Reference< awt::XControl >& _rxControl, const OUString* _pName ) { DBG_ASSERT( _rxControl.is(), "UnoControlHolderList::impl_addControl: invalid control!" ); - ::rtl::OUString sName = _pName ? *_pName : impl_getFreeName_throw(); + OUString sName = _pName ? *_pName : impl_getFreeName_throw(); sal_Int32 nId = impl_getFreeIdentifier_throw(); maControls[ nId ] = ControlInfo( new UnoControlHolder( sName, _rxControl ) ); @@ -289,16 +289,16 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdenti if ( existent == maControls.end() ) return candidateId; } - throw uno::RuntimeException( ::rtl::OUString( "out of identifiers" ), NULL ); + throw uno::RuntimeException( OUString( "out of identifiers" ), NULL ); } //------------------------------------------------------------------------ -::rtl::OUString UnoControlHolderList::impl_getFreeName_throw() +OUString UnoControlHolderList::impl_getFreeName_throw() { - ::rtl::OUString name( "control_" ); + OUString name( "control_" ); for ( ControlIdentifier candidateId = 0; candidateId < ::std::numeric_limits< ControlIdentifier >::max(); ++candidateId ) { - ::rtl::OUString candidateName( name + ::rtl::OUString::valueOf( candidateId ) ); + OUString candidateName( name + OUString::valueOf( candidateId ) ); ControlMap::const_iterator loop = maControls.begin(); for ( ; loop != maControls.end(); ++loop ) { @@ -308,7 +308,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdenti if ( loop == maControls.end() ) return candidateName; } - throw uno::RuntimeException( ::rtl::OUString( "out of identifiers" ), NULL ); + throw uno::RuntimeException( OUString( "out of identifiers" ), NULL ); } // ---------------------------------------------------- // Function to set the controls' visibility according @@ -337,7 +337,7 @@ void implUpdateVisibility ( xModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); - ::rtl::OUString aPropName( "Step" ); + OUString aPropName( "Step" ); sal_Int32 nControlStep = 0; if ( xInfo->hasPropertyByName( aPropName ) ) { @@ -494,7 +494,7 @@ void UnoControlContainer::removeContainerListener( const uno::Reference< contain uno::Reference< awt::XControl > xControl; if ( !( _rElement >>= xControl ) || !xControl.is() ) throw lang::IllegalArgumentException( - ::rtl::OUString( "Elements must support the XControl interface." ), + OUString( "Elements must support the XControl interface." ), *this, 1 ); @@ -509,7 +509,7 @@ void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier uno::Reference< awt::XControl > xControl; if ( !mpControls->getControlForIdentifier( _nIdentifier, xControl ) ) throw container::NoSuchElementException( - ::rtl::OUString( "There is no element with the given identifier." ), + OUString( "There is no element with the given identifier." ), *this ); @@ -523,14 +523,14 @@ void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, uno::Reference< awt::XControl > xExistentControl; if ( !mpControls->getControlForIdentifier( _nIdentifier, xExistentControl ) ) throw container::NoSuchElementException( - ::rtl::OUString( "There is no element with the given identifier." ), + OUString( "There is no element with the given identifier." ), *this ); uno::Reference< awt::XControl > xNewControl; if ( !( _rElement >>= xNewControl ) ) throw lang::IllegalArgumentException( - ::rtl::OUString( "Elements must support the XControl interface." ), + OUString( "Elements must support the XControl interface." ), *this, 1 ); @@ -586,7 +586,7 @@ uno::Type SAL_CALL UnoControlContainer::getElementType( ) throw (uno::RuntimeEx } // awt::XControlContainer -void UnoControlContainer::setStatusText( const ::rtl::OUString& rStatusText ) throw(uno::RuntimeException) +void UnoControlContainer::setStatusText( const OUString& rStatusText ) throw(uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -604,7 +604,7 @@ uno::Sequence< uno::Reference< awt::XControl > > UnoControlContainer::getControl return aControls; } -uno::Reference< awt::XControl > UnoControlContainer::getControl( const ::rtl::OUString& rName ) throw(uno::RuntimeException) +uno::Reference< awt::XControl > UnoControlContainer::getControl( const OUString& rName ) throw(uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mpControls->getControlForName( rName ); @@ -637,7 +637,7 @@ void UnoControlContainer::impl_createControlPeerIfNecessary( const uno::Referenc } -sal_Int32 UnoControlContainer::impl_addControl( const uno::Reference< awt::XControl >& _rxControl, const ::rtl::OUString* _pName ) +sal_Int32 UnoControlContainer::impl_addControl( const uno::Reference< awt::XControl >& _rxControl, const OUString* _pName ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); UnoControlHolderList::ControlIdentifier id = mpControls->addControl( _rxControl, _pName ); @@ -658,7 +658,7 @@ sal_Int32 UnoControlContainer::impl_addControl( const uno::Reference< awt::XCont return id; } -void UnoControlContainer::addControl( const ::rtl::OUString& rName, const uno::Reference< awt::XControl >& rControl ) throw(uno::RuntimeException) +void UnoControlContainer::addControl( const OUString& rName, const uno::Reference< awt::XControl >& rControl ) throw(uno::RuntimeException) { if ( rControl.is() ) impl_addControl( rControl, &rName ); @@ -673,7 +673,7 @@ void UnoControlContainer::removingControl( const uno::Reference< awt::XControl > } } -void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Reference< awt::XControl >& _rxControl, const ::rtl::OUString* _pNameAccessor ) +void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Reference< awt::XControl >& _rxControl, const OUString* _pNameAccessor ) { #ifdef DBG_UTIL { @@ -776,7 +776,7 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT ( xModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPSet->getPropertySetInfo(); - ::rtl::OUString aPropName( "Step" ); + OUString aPropName( "Step" ); if ( xInfo->hasPropertyByName( aPropName ) ) { ::com::sun::star::uno::Any aVal = xPSet->getPropertyValue( aPropName ); diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index 4af12d9c7226..316d4980ab7d 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -40,9 +40,9 @@ UnoControlContainerModel::UnoControlContainerModel( const ::com::sun::star::uno: ImplRegisterProperty( BASEPROPERTY_TEXT ); } -::rtl::OUString UnoControlContainerModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlContainerModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii( szServiceName_UnoControlContainerModel ); + return OUString::createFromAscii( szServiceName_UnoControlContainerModel ); } ::com::sun::star::uno::Any UnoControlContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 2def6aef5d80..be3aa3bfa611 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -294,7 +294,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_LITERALMASK: case BASEPROPERTY_LABEL: case BASEPROPERTY_TITLE: - case BASEPROPERTY_TEXT: aDefault <<= ::rtl::OUString(); break; + case BASEPROPERTY_TEXT: aDefault <<= OUString(); break; case BASEPROPERTY_WRITING_MODE: case BASEPROPERTY_CONTEXT_WRITING_MODE: @@ -303,7 +303,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_STRINGITEMLIST: { - ::com::sun::star::uno::Sequence< ::rtl::OUString> aStringSeq; + ::com::sun::star::uno::Sequence< OUString> aStringSeq; aDefault <<= aStringSeq; } @@ -316,12 +316,12 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const break; case BASEPROPERTY_CURRENCYSYMBOL: { - rtl::OUString sDefaultCurrency( + OUString sDefaultCurrency( utl::ConfigManager::getDefaultCurrency() ); // extract the bank symbol sal_Int32 nSepPos = sDefaultCurrency.indexOf( '-' ); - ::rtl::OUString sBankSymbol; + OUString sBankSymbol; if ( nSepPos >= 0 ) { sBankSymbol = sDefaultCurrency.copy( 0, nSepPos ); @@ -339,7 +339,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const const Currency2* pAllCurrencies = aAllCurrencies.getConstArray(); const Currency2* pAllCurrenciesEnd = pAllCurrencies + aAllCurrencies.getLength(); - ::rtl::OUString sCurrencySymbol = aLocaleInfo.getCurrSymbol(); + OUString sCurrencySymbol = aLocaleInfo.getCurrSymbol(); if ( sBankSymbol.isEmpty() ) { DBG_ASSERT( pAllCurrencies != pAllCurrenciesEnd, "UnoControlModel::ImplGetDefaultValue: no currencies at all!" ); @@ -466,7 +466,7 @@ void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Referenc // ::com::sun::star::beans::XPropertyState -::com::sun::star::beans::PropertyState UnoControlModel::getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::beans::PropertyState UnoControlModel::getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -478,12 +478,12 @@ void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Referenc return CompareProperties( aValue, aDefault ) ? ::com::sun::star::beans::PropertyState_DEFAULT_VALUE : ::com::sun::star::beans::PropertyState_DIRECT_VALUE; } -::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > UnoControlModel::getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > UnoControlModel::getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); sal_uInt32 nNames = PropertyNames.getLength(); - const ::rtl::OUString* pNames = PropertyNames.getConstArray(); + const OUString* pNames = PropertyNames.getConstArray(); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > aStates( nNames ); ::com::sun::star::beans::PropertyState* pStates = aStates.getArray(); @@ -494,7 +494,7 @@ void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Referenc return aStates; } -void UnoControlModel::setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { Any aDefaultValue; { @@ -504,7 +504,7 @@ void UnoControlModel::setPropertyToDefault( const ::rtl::OUString& PropertyName setPropertyValue( PropertyName, aDefaultValue ); } -::com::sun::star::uno::Any UnoControlModel::getPropertyDefault( const ::rtl::OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -513,12 +513,12 @@ void UnoControlModel::setPropertyToDefault( const ::rtl::OUString& PropertyName // ::com::sun::star::io::XPersistObjec -::rtl::OUString UnoControlModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); OSL_FAIL( "ServiceName von UnoControlModel ?!" ); - return ::rtl::OUString(); + return OUString(); } void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) @@ -569,9 +569,9 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: rValue >>= b; OutStream->writeBoolean( b ); } - else if ( rType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( rType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString aUString; + OUString aUString; rValue >>= aUString; OutStream->writeUTF( aUString ); } @@ -627,9 +627,9 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: OutStream->writeBoolean( aFD.WordLineMode ); OutStream->writeShort( aFD.Type ); } - else if ( rType == ::getCppuType((const ::com::sun::star::uno::Sequence< ::rtl::OUString>*)0 ) ) + else if ( rType == ::getCppuType((const ::com::sun::star::uno::Sequence< OUString>*)0 ) ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq; + ::com::sun::star::uno::Sequence< OUString> aSeq; rValue >>= aSeq; long nEntries = aSeq.getLength(); OutStream->writeLong( nEntries ); @@ -663,12 +663,12 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sMessage( "UnoControlModel::write: don't know how to handle a property of type '" ); - ::rtl::OUString sTypeName( rType.getTypeName() ); - sMessage += ::rtl::OString( sTypeName.getStr(), sTypeName.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString sMessage( "UnoControlModel::write: don't know how to handle a property of type '" ); + OUString sTypeName( rType.getTypeName() ); + sMessage += OString( sTypeName.getStr(), sTypeName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += "'.\n(Currently handling property '"; - ::rtl::OUString sPropertyName( GetPropertyName( *it ) ); - sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), osl_getThreadTextEncoding() ); + OUString sPropertyName( GetPropertyName( *it ) ); + sMessage += OString( sPropertyName.getStr(), sPropertyName.getLength(), osl_getThreadTextEncoding() ); sMessage += "'.)"; OSL_FAIL( sMessage.getStr() ); } @@ -748,7 +748,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: short nVersion = InStream->readShort(); sal_uInt32 nProps = (sal_uInt32)InStream->readLong(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> aProps( nProps ); + ::com::sun::star::uno::Sequence< OUString> aProps( nProps ); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> aValues( nProps ); sal_Bool bInvalidEntries = sal_False; @@ -778,9 +778,9 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: sal_Bool b = InStream->readBoolean(); aValue <<= b; } - else if ( *pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( *pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString aUTF = InStream->readUTF(); + OUString aUTF = InStream->readUTF(); aValue <<= aUTF; } else if ( *pType == ::getCppuType((const sal_uInt16*)0) ) @@ -829,10 +829,10 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: aFD.Type = InStream->readShort(); aValue <<= aFD; } - else if ( *pType == ::getCppuType((const ::com::sun::star::uno::Sequence< ::rtl::OUString>*)0 ) ) + else if ( *pType == ::getCppuType((const ::com::sun::star::uno::Sequence< OUString>*)0 ) ) { long nEntries = InStream->readLong(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq( nEntries ); + ::com::sun::star::uno::Sequence< OUString> aSeq( nEntries ); for ( long n = 0; n < nEntries; n++ ) aSeq.getArray()[n] = InStream->readUTF(); aValue <<= aSeq; @@ -862,12 +862,12 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } else { - ::rtl::OString sMessage( "UnoControlModel::read: don't know how to handle a property of type '" ); - ::rtl::OUString sTypeName( pType->getTypeName() ); - sMessage += ::rtl::OString( sTypeName.getStr(), sTypeName.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString sMessage( "UnoControlModel::read: don't know how to handle a property of type '" ); + OUString sTypeName( pType->getTypeName() ); + sMessage += OString( sTypeName.getStr(), sTypeName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += "'.\n(Currently handling property '"; - ::rtl::OUString sPropertyName( GetPropertyName( nPropId ) ); - sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), osl_getThreadTextEncoding() ); + OUString sPropertyName( GetPropertyName( nPropId ) ); + sMessage += OString( sPropertyName.getStr(), sPropertyName.getLength(), osl_getThreadTextEncoding() ); sMessage += "'.)"; OSL_FAIL( sMessage.getStr() ); } @@ -993,29 +993,29 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: // ::com::sun::star::lang::XServiceInfo -::rtl::OUString UnoControlModel::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlModel::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { OSL_FAIL( "This method should be overloaded!" ); - return ::rtl::OUString(); + return OUString(); } -sal_Bool UnoControlModel::supportsService( const ::rtl::OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + ::com::sun::star::uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == rServiceName ) return sal_True; return sal_False; } -::com::sun::star::uno::Sequence< ::rtl::OUString > UnoControlModel::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sName( "com.sun.star.awt.UnoControlModel" ); - return Sequence< ::rtl::OUString >( &sName, 1 ); + OUString sName( "com.sun.star.awt.UnoControlModel" ); + return Sequence< OUString >( &sName, 1 ); } // ------------------------------------------------------------------ @@ -1134,7 +1134,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & if (!bConverted) { - ::rtl::OUStringBuffer aErrorMessage; + OUStringBuffer aErrorMessage; aErrorMessage.appendAscii( "Unable to convert the given value for the property " ); aErrorMessage.append ( GetPropertyName( (sal_uInt16)nPropId ) ); aErrorMessage.appendAscii( ".\n" ); @@ -1227,7 +1227,7 @@ void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, } // ::com::sun::star::beans::XPropertySet -void UnoControlModel::setPropertyValue( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { sal_Int32 nPropId = 0; { @@ -1283,7 +1283,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun: return ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >(); } -void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 92d49df671d8..669a8b305da4 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -84,7 +84,7 @@ ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic: if ( _rURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) { // graphic manager uniqueid - rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ); + OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ); xOutGraphicObj = graphic::GraphicObject::createWithId( ::comphelper::getProcessComponentContext(), sID ); } else // linked @@ -2616,8 +2616,8 @@ void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(u #if OSL_DEBUG_LEVEL == 0 (void) e; // suppress warning #else - ::rtl::OString sMessage( "UnoListBoxControl::itemStateChanged: caught an exception:\n" ); - sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString sMessage( "UnoListBoxControl::itemStateChanged: caught an exception:\n" ); + sMessage += OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); OSL_FAIL( sMessage.getStr() ); #endif } @@ -2919,8 +2919,8 @@ void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw( #if OSL_DEBUG_LEVEL == 0 (void) e; // suppress warning #else - ::rtl::OString sMessage( "UnoComboBoxControl::itemStateChanged: caught an exception:\n" ); - sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString sMessage( "UnoComboBoxControl::itemStateChanged: caught an exception:\n" ); + sMessage += OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); OSL_FAIL( sMessage.getStr() ); #endif } diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index 3119ba6e3dc9..9ab29d0a4e75 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -201,12 +201,12 @@ namespace toolkit if ( !s_pFactory.get() ) { #ifndef DISABLE_DYNLOADING - const ::rtl::OUString sModuleName( SVLIBRARY( "acc" ) ); + const OUString sModuleName( SVLIBRARY( "acc" ) ); s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); if ( s_hAccessibleImplementationModule != NULL ) { - const ::rtl::OUString sFactoryCreationFunc = - ::rtl::OUString("getStandardAccessibleFactory"); + const OUString sFactoryCreationFunc = + OUString("getStandardAccessibleFactory"); s_pAccessibleFactoryFunc = (GetStandardAccComponentFactory) osl_getFunctionSymbol( s_hAccessibleImplementationModule, sFactoryCreationFunc.pData ); diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 98b509be625f..6d4824acf30e 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -63,7 +63,7 @@ namespace toolkitform */ sal_Int16 classifyFormControl( const Reference< XPropertySet >& _rxModel ) SAL_THROW(( Exception )) { - static const ::rtl::OUString FM_PROP_CLASSID("ClassId"); + static const OUString FM_PROP_CLASSID("ClassId"); sal_Int16 nControlType = FormComponentType::CONTROL; Reference< XPropertySetInfo > xPSI; @@ -154,8 +154,8 @@ namespace toolkitform ::std::vector< sal_Int32 > aPath; Reference< XInterface > xNormalizedLookup( _rxRadioModel, UNO_QUERY ); - ::rtl::OUString sRadioGroupName; - OSL_VERIFY( _rxRadioModel->getPropertyValue( rtl::OUString(FM_PROP_NAME) ) >>= sRadioGroupName ); + OUString sRadioGroupName; + OSL_VERIFY( _rxRadioModel->getPropertyValue( OUString(FM_PROP_NAME) ) >>= sRadioGroupName ); Reference< XIndexAccess > xCurrentContainer( xRoot ); sal_Int32 nStartWithChild = 0; @@ -203,9 +203,9 @@ namespace toolkitform if ( xElement.get() == xNormalizedLookup.get() ) { // look up the name of the radio group in the list of all element names - Sequence< ::rtl::OUString > aElementNames( xElementNameAccess->getElementNames() ); - const ::rtl::OUString* pElementNames = aElementNames.getConstArray(); - const ::rtl::OUString* pElementNamesEnd = pElementNames + aElementNames.getLength(); + Sequence< OUString > aElementNames( xElementNameAccess->getElementNames() ); + const OUString* pElementNames = aElementNames.getConstArray(); + const OUString* pElementNamesEnd = pElementNames + aElementNames.getLength(); while ( pElementNames != pElementNamesEnd ) { if ( *pElementNames == sRadioGroupName ) @@ -241,13 +241,13 @@ namespace toolkitform //-------------------------------------------------------------------- /** copies a StringItemList to a PDF widget's list */ - void getStringItemVector( const Reference< XPropertySet >& _rxModel, ::std::vector< ::rtl::OUString >& _rVector ) + void getStringItemVector( const Reference< XPropertySet >& _rxModel, ::std::vector< OUString >& _rVector ) { - static const ::rtl::OUString FM_PROP_STRINGITEMLIST("StringItemList"); - Sequence< ::rtl::OUString > aListEntries; + static const OUString FM_PROP_STRINGITEMLIST("StringItemList"); + Sequence< OUString > aListEntries; OSL_VERIFY( _rxModel->getPropertyValue( FM_PROP_STRINGITEMLIST ) >>= aListEntries ); ::std::copy( aListEntries.getConstArray(), aListEntries.getConstArray() + aListEntries.getLength(), - ::std::back_insert_iterator< ::std::vector< ::rtl::OUString > >( _rVector ) ); + ::std::back_insert_iterator< ::std::vector< OUString > >( _rVector ) ); } } @@ -282,12 +282,12 @@ namespace toolkitform // -------------------------------- // Name, Description, Text - OSL_VERIFY( xModelProps->getPropertyValue( rtl::OUString(FM_PROP_NAME) ) >>= _rpDescriptor->Name ); - static const ::rtl::OUString FM_PROP_HELPTEXT("HelpText"); + OSL_VERIFY( xModelProps->getPropertyValue( OUString(FM_PROP_NAME) ) >>= _rpDescriptor->Name ); + static const OUString FM_PROP_HELPTEXT("HelpText"); OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_HELPTEXT ) >>= _rpDescriptor->Description ); Any aText; - static const ::rtl::OUString FM_PROP_TEXT("Text"); - static const ::rtl::OUString FM_PROP_LABEL("Label"); + static const OUString FM_PROP_TEXT("Text"); + static const OUString FM_PROP_LABEL("Label"); if ( xPSI->hasPropertyByName( FM_PROP_TEXT ) ) aText = xModelProps->getPropertyValue( FM_PROP_TEXT ); else if ( xPSI->hasPropertyByName( FM_PROP_LABEL ) ) @@ -297,21 +297,21 @@ namespace toolkitform // -------------------------------- // readonly - static const ::rtl::OUString FM_PROP_READONLY("ReadOnly"); + static const OUString FM_PROP_READONLY("ReadOnly"); if ( xPSI->hasPropertyByName( FM_PROP_READONLY ) ) OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_READONLY ) >>= _rpDescriptor->ReadOnly ); // -------------------------------- // border { - static const ::rtl::OUString FM_PROP_BORDER("Border"); + static const OUString FM_PROP_BORDER("Border"); if ( xPSI->hasPropertyByName( FM_PROP_BORDER ) ) { sal_Int16 nBorderType = 0; OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_BORDER ) >>= nBorderType ); _rpDescriptor->Border = ( nBorderType != 0 ); - ::rtl::OUString sBorderColorPropertyName( "BorderColor" ); + OUString sBorderColorPropertyName( "BorderColor" ); if ( xPSI->hasPropertyByName( sBorderColorPropertyName ) ) { sal_Int32 nBoderColor = COL_TRANSPARENT; @@ -325,7 +325,7 @@ namespace toolkitform // -------------------------------- // background color - static const ::rtl::OUString FM_PROP_BACKGROUNDCOLOR("BackgroundColor"); + static const OUString FM_PROP_BACKGROUNDCOLOR("BackgroundColor"); if ( xPSI->hasPropertyByName( FM_PROP_BACKGROUNDCOLOR ) ) { sal_Int32 nBackColor = COL_TRANSPARENT; @@ -336,7 +336,7 @@ namespace toolkitform // -------------------------------- // text color - static const ::rtl::OUString FM_PROP_TEXTCOLOR("TextColor"); + static const OUString FM_PROP_TEXTCOLOR("TextColor"); if ( xPSI->hasPropertyByName( FM_PROP_TEXTCOLOR ) ) { sal_Int32 nTextColor = COL_TRANSPARENT; @@ -351,7 +351,7 @@ namespace toolkitform // multi line and word break // The MultiLine property of the control is mapped to both the "MULTILINE" and // "WORDBREAK" style flags - static const ::rtl::OUString FM_PROP_MULTILINE("MultiLine"); + static const OUString FM_PROP_MULTILINE("MultiLine"); if ( xPSI->hasPropertyByName( FM_PROP_MULTILINE ) ) { sal_Bool bMultiLine = sal_False; @@ -361,7 +361,7 @@ namespace toolkitform } // ............................ // horizontal alignment - static const ::rtl::OUString FM_PROP_ALIGN("Align"); + static const OUString FM_PROP_ALIGN("Align"); if ( xPSI->hasPropertyByName( FM_PROP_ALIGN ) ) { sal_Int16 nAlign = awt::TextAlign::LEFT; @@ -380,7 +380,7 @@ namespace toolkitform // ............................ // vertical alignment { - ::rtl::OUString sVertAlignPropertyName( "VerticalAlign" ); + OUString sVertAlignPropertyName( "VerticalAlign" ); if ( xPSI->hasPropertyByName( sVertAlignPropertyName ) ) { sal_Int16 nAlign = VerticalAlignment_MIDDLE; @@ -397,7 +397,7 @@ namespace toolkitform } // font - static const ::rtl::OUString FM_PROP_FONT("FontDescriptor"); + static const OUString FM_PROP_FONT("FontDescriptor"); if ( xPSI->hasPropertyByName( FM_PROP_FONT ) ) { FontDescriptor aUNOFont; @@ -406,7 +406,7 @@ namespace toolkitform } // tab order - rtl::OUString aTabIndexString( "TabIndex" ); + OUString aTabIndexString( "TabIndex" ); if ( xPSI->hasPropertyByName( aTabIndexString ) ) { sal_Int16 nIndex = -1; @@ -426,7 +426,7 @@ namespace toolkitform pEditWidget->MultiLine = ( _rpDescriptor->TextStyle & TEXT_DRAW_MULTILINE ) != 0; // ............................ // password input - ::rtl::OUString sEchoCharPropName( "EchoChar" ); + OUString sEchoCharPropName( "EchoChar" ); if ( xPSI->hasPropertyByName( sEchoCharPropName ) ) { sal_Int16 nEchoChar = 0; @@ -435,12 +435,12 @@ namespace toolkitform } // ............................ // file select - static const ::rtl::OUString FM_SUN_COMPONENT_FILECONTROL("com.sun.star.form.component.FileControl"); + static const OUString FM_SUN_COMPONENT_FILECONTROL("com.sun.star.form.component.FileControl"); if ( xSI->supportsService( FM_SUN_COMPONENT_FILECONTROL ) ) pEditWidget->FileSelect = true; // ............................ // maximum text length - static const ::rtl::OUString FM_PROP_MAXTEXTLEN("MaxTextLen"); + static const OUString FM_PROP_MAXTEXTLEN("MaxTextLen"); if ( xPSI->hasPropertyByName( FM_PROP_MAXTEXTLEN ) ) { sal_Int16 nMaxTextLength = 0; @@ -458,8 +458,8 @@ namespace toolkitform { ::vcl::PDFWriter::PushButtonWidget* pButtonWidget = static_cast< ::vcl::PDFWriter::PushButtonWidget* >( _rpDescriptor.get() ); FormButtonType eButtonType = FormButtonType_PUSH; - OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( "ButtonType" ) ) >>= eButtonType ); - static const ::rtl::OUString FM_PROP_TARGET_URL("TargetURL"); + OSL_VERIFY( xModelProps->getPropertyValue( OUString( "ButtonType" ) ) >>= eButtonType ); + static const OUString FM_PROP_TARGET_URL("TargetURL"); if ( eButtonType == FormButtonType_SUBMIT ) { // if a button is a submit button, then it uses the URL at it's parent form @@ -470,19 +470,19 @@ namespace toolkitform if ( xParentProps.is() ) { Reference< XServiceInfo > xParentSI( xParentProps, UNO_QUERY ); - if ( xParentSI.is() && xParentSI->supportsService( ::rtl::OUString( "com.sun.star.form.component.HTMLForm" ) ) ) + if ( xParentSI.is() && xParentSI->supportsService( OUString( "com.sun.star.form.component.HTMLForm" ) ) ) { OSL_VERIFY( xParentProps->getPropertyValue( FM_PROP_TARGET_URL ) >>= pButtonWidget->URL ); pButtonWidget->Submit = true; FormSubmitMethod eMethod = FormSubmitMethod_POST; - OSL_VERIFY( xParentProps->getPropertyValue( rtl::OUString( "SubmitMethod" ) ) >>= eMethod ); + OSL_VERIFY( xParentProps->getPropertyValue( OUString( "SubmitMethod" ) ) >>= eMethod ); pButtonWidget->SubmitGet = (eMethod == FormSubmitMethod_GET); } } } else if ( eButtonType == FormButtonType_URL ) { - ::rtl::OUString sURL; + OUString sURL; OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_TARGET_URL ) >>= sURL ); const bool bDocumentLocalTarget = !sURL.isEmpty() && ( sURL.getStr()[0] == '#' ); if ( bDocumentLocalTarget ) @@ -518,7 +518,7 @@ namespace toolkitform // -------------------------------- // check boxes - static const ::rtl::OUString FM_PROP_STATE("State"); + static const OUString FM_PROP_STATE("State"); if ( _rpDescriptor->getType() == ::vcl::PDFWriter::CheckBox ) { ::vcl::PDFWriter::CheckBoxWidget* pCheckBoxWidget = static_cast< ::vcl::PDFWriter::CheckBoxWidget* >( _rpDescriptor.get() ); @@ -538,12 +538,12 @@ namespace toolkitform pRadioWidget->RadioGroup = determineRadioGroupId( xModelProps ); try { - static const ::rtl::OUString FM_PROP_REFVALUE("RefValue"); + static const OUString FM_PROP_REFVALUE("RefValue"); xModelProps->getPropertyValue( FM_PROP_REFVALUE ) >>= pRadioWidget->OnValue; } catch(...) { - pRadioWidget->OnValue = rtl::OUString( "On" ); + pRadioWidget->OnValue = OUString( "On" ); } } @@ -554,11 +554,11 @@ namespace toolkitform ::vcl::PDFWriter::ListBoxWidget* pListWidget = static_cast< ::vcl::PDFWriter::ListBoxWidget* >( _rpDescriptor.get() ); // ............................ // drop down - static const ::rtl::OUString FM_PROP_DROPDOWN("Dropdown"); + static const OUString FM_PROP_DROPDOWN("Dropdown"); OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_DROPDOWN ) >>= pListWidget->DropDown ); // ............................ // multi selection - OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( "MultiSelection" ) ) >>= pListWidget->MultiSelect ); + OSL_VERIFY( xModelProps->getPropertyValue( OUString( "MultiSelection" ) ) >>= pListWidget->MultiSelect ); // ............................ // entries getStringItemVector( xModelProps, pListWidget->Entries ); @@ -568,7 +568,7 @@ namespace toolkitform // get selected items Sequence< sal_Int16 > aSelectIndices; - OSL_VERIFY( xModelProps->getPropertyValue( rtl::OUString( "SelectedItems" ) ) >>= aSelectIndices ); + OSL_VERIFY( xModelProps->getPropertyValue( OUString( "SelectedItems" ) ) >>= aSelectIndices ); if( aSelectIndices.getLength() > 0 ) { pListWidget->SelectedEntries.resize( 0 ); diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index ba26d0225f3b..451d048f7cd7 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -57,7 +57,7 @@ using ::com::sun::star::graphic::XGraphic; struct ImplPropertyInfo { - ::rtl::OUString aName; + OUString aName; sal_uInt16 nPropId; ::com::sun::star::uno::Type aType; sal_Int16 nAttribs; @@ -70,7 +70,7 @@ struct ImplPropertyInfo bDependsOnOthers = sal_False; } - ImplPropertyInfo( rtl::OUString const & theName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType, + ImplPropertyInfo( OUString const & theName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType, sal_Int16 nAttrs, sal_Bool bDepends = sal_False ) : aName( theName ) { @@ -83,16 +83,16 @@ struct ImplPropertyInfo }; #define DECL_PROP_1( asciiname, id, type, attrib1 ) \ - ImplPropertyInfo( ::rtl::OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 ) + ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 ) #define DECL_PROP_2( asciiname, id, type, attrib1, attrib2 ) \ - ImplPropertyInfo( ::rtl::OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 ) + ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 ) #define DECL_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \ - ImplPropertyInfo( ::rtl::OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 ) + ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 ) #define DECL_DEP_PROP_2( asciiname, id, type, attrib1, attrib2 ) \ - ImplPropertyInfo( ::rtl::OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, sal_True ) + ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, sal_True ) #define DECL_DEP_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \ - ImplPropertyInfo( ::rtl::OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, sal_True ) + ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, sal_True ) ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) { @@ -105,7 +105,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) { static ImplPropertyInfo aImplPropertyInfos [] = { - DECL_PROP_2 ( "AccessibleName", ACCESSIBLENAME, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "AccessibleName", ACCESSIBLENAME, OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "Align", ALIGN, sal_Int16, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "Autocomplete", AUTOCOMPLETE, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "AutoHScroll", AUTOHSCROLL, bool, BOUND, MAYBEDEFAULT ), @@ -117,8 +117,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_3 ( "Border", BORDER, sal_Int16, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_DEP_PROP_3 ( "BorderColor", BORDERCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "Closeable", CLOSEABLE, bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "CurrencySymbol", CURRENCYSYMBOL, ::rtl::OUString, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "CustomUnitText", CUSTOMUNITTEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "CurrencySymbol", CURRENCYSYMBOL, OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "CustomUnitText", CUSTOMUNITTEXT, OUString, BOUND, MAYBEDEFAULT ), DECL_DEP_PROP_3 ( "Date", DATE, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "DateFormat", EXTDATEFORMAT, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "DateMax", DATEMAX, sal_Int32, BOUND, MAYBEDEFAULT ), @@ -126,12 +126,12 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_3 ( "DateShowCentury", DATESHOWCENTURY, bool, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "DecimalAccuracy", DECIMALACCURACY, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "DefaultButton", DEFAULTBUTTON, bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "DefaultControl", DEFAULTCONTROL, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "DefaultControl", DEFAULTCONTROL, OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "DesktopAsParent", DESKTOP_AS_PARENT, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "DisplayBackgroundColor", DISPLAYBACKGROUNDCOLOR, sal_Int32, BOUND, MAYBEVOID ), DECL_PROP_2 ( "Dropdown", DROPDOWN, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "EchoChar", ECHOCHAR, sal_Int16, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "EditMask", EDITMASK, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "EditMask", EDITMASK, OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "EffectiveDefault", EFFECTIVE_DEFAULT, Any, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "EffectiveMax", EFFECTIVE_MAX, double, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "EffectiveMin", EFFECTIVE_MIN, double, BOUND, MAYBEDEFAULT, MAYBEVOID ), @@ -145,8 +145,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_2 ( "FontDescriptor", FONTDESCRIPTOR, FontDescriptor, BOUND, MAYBEDEFAULT ), // Teile des ::com::sun::star::awt::FontDescriptor - DECL_PROP_2 ( "FontName", FONTDESCRIPTORPART_NAME, ::rtl::OUString,BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "FontStyleName", FONTDESCRIPTORPART_STYLENAME, ::rtl::OUString,BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "FontName", FONTDESCRIPTORPART_NAME, OUString,BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "FontStyleName", FONTDESCRIPTORPART_STYLENAME, OUString,BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "FontFamily", FONTDESCRIPTORPART_FAMILY, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "FontCharset", FONTDESCRIPTORPART_CHARSET, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "FontHeight", FONTDESCRIPTORPART_HEIGHT, float, BOUND, MAYBEDEFAULT ), @@ -166,23 +166,23 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_3 ( "FormatsSupplier", FORMATSSUPPLIER, Reference< ::com::sun::star::util::XNumberFormatsSupplier >, BOUND, MAYBEVOID, TRANSIENT ), DECL_PROP_2 ( "Graphic", GRAPHIC, Reference< XGraphic >, BOUND, TRANSIENT ), - DECL_PROP_2 ( "GroupName", GROUPNAME, ::rtl::OUString, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "HelpText", HELPTEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "HelpURL", HELPURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "GroupName", GROUPNAME, OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "HelpText", HELPTEXT, OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "HelpURL", HELPURL, OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "HideInactiveSelection", HIDEINACTIVESELECTION, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "HighContrastMode", HIGHCONTRASTMODE, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "HScroll", HSCROLL, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "HardLineBreaks", HARDLINEBREAKS, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "ImageAlign", IMAGEALIGN, sal_Int16, BOUND, MAYBEDEFAULT), DECL_PROP_2 ( "ImagePosition", IMAGEPOSITION, sal_Int16, BOUND, MAYBEDEFAULT), - DECL_PROP_2 ( "ImageURL", IMAGEURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "ImageURL", IMAGEURL, OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "ItemSeparatorPos", ITEM_SEPARATOR_POS, sal_Int16, BOUND, MAYBEDEFAULT, MAYBEVOID ), - DECL_PROP_2 ( "Label", LABEL, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "Label", LABEL, OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "LineColor", LINECOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "LineCount", LINECOUNT, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "LineEndFormat", LINE_END_FORMAT, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_DEP_PROP_2 ( "LineIncrement", LINEINCREMENT, sal_Int32, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "LiteralMask", LITERALMASK, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "LiteralMask", LITERALMASK, OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "LiveScroll", LIVE_SCROLL, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "MaxTextLen", MAXTEXTLEN, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "Moveable", MOVEABLE, bool, BOUND, MAYBEDEFAULT ), @@ -224,18 +224,18 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_2 ( "SpinValueMin", SPINVALUE_MIN, sal_Int32, BOUND, MAYBEDEFAULT ), DECL_DEP_PROP_2 ( "State", STATE, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "StrictFormat", STRICTFORMAT, bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "StringItemList", STRINGITEMLIST, Sequence< ::rtl::OUString >, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "StringItemList", STRINGITEMLIST, Sequence< OUString >, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "VisualEffect", VISUALEFFECT, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "SymbolColor", SYMBOL_COLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "Tabstop", TABSTOP, bool, BOUND, MAYBEDEFAULT, MAYBEVOID ), - DECL_PROP_2 ( "Text", TEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "Text", TEXT, OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "TextColor", TEXTCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "TextLineColor", TEXTLINECOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_DEP_PROP_3 ( "Time", TIME, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "TimeFormat", EXTTIMEFORMAT, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "TimeMax", TIMEMAX, sal_Int32, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "TimeMin", TIMEMIN, sal_Int32, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "Title", TITLE, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "Title", TITLE, OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "Toggle", TOGGLE, bool, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "TreatAsNumber", TREATASNUMBER, bool, BOUND, MAYBEDEFAULT,TRANSIENT ), DECL_PROP_2 ( "TriState", TRISTATE, bool, BOUND, MAYBEDEFAULT ), @@ -263,8 +263,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_2 ( "ShowsRootHandles", TREE_SHOWSROOTHANDLES, sal_Bool, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "RowHeight", ROW_HEIGHT, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "InvokesStopNodeEditing", TREE_INVOKESSTOPNODEEDITING, sal_Bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "DialogSourceURL", DIALOGSOURCEURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "URL", URL, ::rtl::OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "DialogSourceURL", DIALOGSOURCEURL, OUString, BOUND, MAYBEDEFAULT ), + DECL_PROP_2 ( "URL", URL, OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "WritingMode", WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_PROP_3 ( "ContextWritingMode", CONTEXT_WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT ), DECL_PROP_2 ( "ShowRowHeader", GRID_SHOWROWHEADER, sal_Bool, BOUND, MAYBEDEFAULT ), @@ -297,17 +297,17 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) } -struct ImplPropertyInfoCompareFunctor : ::std::binary_function +struct ImplPropertyInfoCompareFunctor : ::std::binary_function { inline bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs) const { return lhs.aName.compareTo(rhs.aName) < 0; } - inline bool operator()(const ImplPropertyInfo& lhs,const ::rtl::OUString& rhs) const + inline bool operator()(const ImplPropertyInfo& lhs,const OUString& rhs) const { return lhs.aName.compareTo(rhs) < 0; } - inline bool operator()(const ::rtl::OUString& lhs,const ImplPropertyInfo& rhs) const + inline bool operator()(const OUString& lhs,const ImplPropertyInfo& rhs) const { return lhs.compareTo(rhs.aName) < 0; } @@ -325,7 +325,7 @@ void ImplAssertValidPropertyArray() } } -sal_uInt16 GetPropertyId( const ::rtl::OUString& rPropertyName ) +sal_uInt16 GetPropertyId( const OUString& rPropertyName ) { ImplAssertValidPropertyArray(); @@ -367,7 +367,7 @@ sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId ) return 0xFFFF; } -const ::rtl::OUString& GetPropertyName( sal_uInt16 nPropertyId ) +const OUString& GetPropertyName( sal_uInt16 nPropertyId ) { const ImplPropertyInfo* pImplPropertyInfo = ImplGetImplPropertyInfo( nPropertyId ); DBG_ASSERT( pImplPropertyInfo, "Invalid PropertyId!" ); diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx index 4cecef1ad62b..f4e2bd242c07 100644 --- a/toolkit/source/helper/registerservices.cxx +++ b/toolkit/source/helper/registerservices.cxx @@ -66,12 +66,12 @@ namespace toolkit if ( rtl_str_compare( _pRequiredImplName, _pComponentImplName ) == 0 ) { - Sequence< ::rtl::OUString > aServiceNames( _pAsciiServiceName2 ? 2 : 1 ); - aServiceNames.getArray()[ 0 ] = ::rtl::OUString::createFromAscii( _pAsciiServiceName1 ); + Sequence< OUString > aServiceNames( _pAsciiServiceName2 ? 2 : 1 ); + aServiceNames.getArray()[ 0 ] = OUString::createFromAscii( _pAsciiServiceName1 ); if ( _pAsciiServiceName2 ) - aServiceNames.getArray()[ 1 ] = ::rtl::OUString::createFromAscii( _pAsciiServiceName2 ); + aServiceNames.getArray()[ 1 ] = OUString::createFromAscii( _pAsciiServiceName2 ); Reference< XSingleServiceFactory > xFactory( ::cppu::createSingleFactory( - _rxServiceFactory, ::rtl::OUString::createFromAscii( _pComponentImplName ), + _rxServiceFactory, OUString::createFromAscii( _pComponentImplName ), _pInstantiation, aServiceNames ) ); if ( xFactory.is() ) diff --git a/toolkit/source/helper/tkresmgr.cxx b/toolkit/source/helper/tkresmgr.cxx index 376cc51c501a..1d788efe5c64 100644 --- a/toolkit/source/helper/tkresmgr.cxx +++ b/toolkit/source/helper/tkresmgr.cxx @@ -66,9 +66,9 @@ void TkResMgr::ensureImplExists() } // ----------------------------------------------------------------------------- -::rtl::OUString TkResMgr::loadString( sal_uInt16 nResId ) +OUString TkResMgr::loadString( sal_uInt16 nResId ) { - ::rtl::OUString sReturn; + OUString sReturn; ensureImplExists(); if ( m_pSimpleResMgr ) @@ -90,7 +90,7 @@ Image TkResMgr::loadImage( sal_uInt16 nResId ) } // ----------------------------------------------------------------------------- -Image TkResMgr::getImageFromURL( const ::rtl::OUString& i_rImageURL ) +Image TkResMgr::getImageFromURL( const OUString& i_rImageURL ) { if ( i_rImageURL.isEmpty() ) return Image(); diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index aec93eaf7f53..ccad3c9a7a88 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -50,7 +50,7 @@ sal_Bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const } // ::cppu::IPropertyArrayHelper -sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nPropId ) +sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nPropId ) { sal_uInt16 id = sal::static_int_cast< sal_uInt16 >(nPropId); sal_Bool bValid = ImplHasProperty( id ); @@ -99,7 +99,7 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString * return aProps; } -::com::sun::star::beans::Property UnoPropertyArrayHelper::getPropertyByName(const ::rtl::OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException) +::com::sun::star::beans::Property UnoPropertyArrayHelper::getPropertyByName(const OUString& rPropertyName) throw (::com::sun::star::beans::UnknownPropertyException) { ::com::sun::star::beans::Property aProp; sal_uInt16 nId = GetPropertyId( rPropertyName ); @@ -114,20 +114,20 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString * return aProp; } -sal_Bool UnoPropertyArrayHelper::hasPropertyByName(const ::rtl::OUString& rPropertyName) +sal_Bool UnoPropertyArrayHelper::hasPropertyByName(const OUString& rPropertyName) { return ImplHasProperty( GetPropertyId( rPropertyName ) ); } -sal_Int32 UnoPropertyArrayHelper::getHandleByName( const ::rtl::OUString & rPropertyName ) +sal_Int32 UnoPropertyArrayHelper::getHandleByName( const OUString & rPropertyName ) { sal_Int32 nId = (sal_Int32 ) GetPropertyId( rPropertyName ); return nId ? nId : (-1); } -sal_Int32 UnoPropertyArrayHelper::fillHandles( sal_Int32* pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPropNames ) +sal_Int32 UnoPropertyArrayHelper::fillHandles( sal_Int32* pHandles, const ::com::sun::star::uno::Sequence< OUString > & rPropNames ) { - const ::rtl::OUString* pNames = rPropNames.getConstArray(); + const OUString* pNames = rPropNames.getConstArray(); sal_Int32 nValues = rPropNames.getLength(); sal_Int32 nValidHandles = 0; diff --git a/tools/inc/tools/StringListResource.hxx b/tools/inc/tools/StringListResource.hxx index 3497d07f29e4..52f22e48a8ef 100644 --- a/tools/inc/tools/StringListResource.hxx +++ b/tools/inc/tools/StringListResource.hxx @@ -29,7 +29,7 @@ namespace tools class StringListResource : public Resource { public: - StringListResource(const ResId& _aResId,::std::vector< ::rtl::OUString>& _rToFill ) : Resource(_aResId) + StringListResource(const ResId& _aResId,::std::vector< OUString>& _rToFill ) : Resource(_aResId) { sal_uInt16 i = 1; while( IsAvailableRes(ResId(i,*m_pResMgr).SetRT(RSC_STRING)) ) diff --git a/tools/inc/tools/appendunixshellword.hxx b/tools/inc/tools/appendunixshellword.hxx index 6461fdb020f4..e5099bdc20c8 100644 --- a/tools/inc/tools/appendunixshellword.hxx +++ b/tools/inc/tools/appendunixshellword.hxx @@ -41,7 +41,7 @@ namespace tools { the text to add */ TOOLS_DLLPUBLIC void appendUnixShellWord( - rtl::OStringBuffer * accumulator, rtl::OString const & text); + OStringBuffer * accumulator, OString const & text); } #endif diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx index ffbc542cd172..d3a2c2f2cff5 100644 --- a/tools/inc/tools/bigint.hxx +++ b/tools/inc/tools/bigint.hxx @@ -66,7 +66,7 @@ public: BigInt( sal_uInt16 nVal ); BigInt( sal_uInt32 nVal ); BigInt( const BigInt& rBigInt ); - BigInt( const rtl::OUString& rString ); + BigInt( const OUString& rString ); #ifdef _TLBIGINT_INT64 BigInt( const SbxINT64 &r ); BigInt( const SbxUINT64 &r ); @@ -80,7 +80,7 @@ public: operator sal_uIntPtr() const; void Set( sal_Bool bSet ) { bIsSet = bSet; } - rtl::OUString GetString() const; + OUString GetString() const; sal_Bool IsSet() const { return bIsSet; } sal_Bool IsNeg() const; diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx index 5c64f49b3d46..1e73d32b5a33 100644 --- a/tools/inc/tools/config.hxx +++ b/tools/inc/tools/config.hxx @@ -28,8 +28,8 @@ struct ImplGroupData; class TOOLS_DLLPUBLIC Config { private: - rtl::OUString maFileName; - rtl::OString maGroupName; + OUString maFileName; + OString maGroupName; ImplConfigData* mpData; ImplGroupData* mpActGroup; sal_uIntPtr mnDataUpdateId; @@ -43,25 +43,25 @@ private: #endif public: - Config( const rtl::OUString& rFileName ); + Config( const OUString& rFileName ); ~Config(); - const rtl::OUString& GetPathName() const { return maFileName; } + const OUString& GetPathName() const { return maFileName; } - void SetGroup(const rtl::OString& rGroup); - const rtl::OString& GetGroup() const { return maGroupName; } - void DeleteGroup(const rtl::OString& rGroup); - rtl::OString GetGroupName(sal_uInt16 nGroup) const; + void SetGroup(const OString& rGroup); + const OString& GetGroup() const { return maGroupName; } + void DeleteGroup(const OString& rGroup); + OString GetGroupName(sal_uInt16 nGroup) const; sal_uInt16 GetGroupCount() const; - sal_Bool HasGroup(const rtl::OString& rGroup) const; + sal_Bool HasGroup(const OString& rGroup) const; - rtl::OString ReadKey(const rtl::OString& rKey) const; - rtl::OUString ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const; - rtl::OString ReadKey(const rtl::OString& rKey, const rtl::OString& rDefault) const; - void WriteKey(const rtl::OString& rKey, const rtl::OString& rValue); - void DeleteKey(const rtl::OString& rKey); - rtl::OString GetKeyName(sal_uInt16 nKey) const; - rtl::OString ReadKey(sal_uInt16 nKey) const; + OString ReadKey(const OString& rKey) const; + OUString ReadKey(const OString& rKey, rtl_TextEncoding eEncoding) const; + OString ReadKey(const OString& rKey, const OString& rDefault) const; + void WriteKey(const OString& rKey, const OString& rValue); + void DeleteKey(const OString& rKey); + OString GetKeyName(sal_uInt16 nKey) const; + OString ReadKey(sal_uInt16 nKey) const; sal_uInt16 GetKeyCount() const; sal_Bool IsLocked() const { return (mnLockCount != 0); } diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h index 84afc7bf3fe6..261c0aecaf6d 100644 --- a/tools/inc/tools/diagnose_ex.h +++ b/tools/inc/tools/diagnose_ex.h @@ -46,17 +46,17 @@ */ #define DBG_UNHANDLED_EXCEPTION() \ ::com::sun::star::uno::Any caught( ::cppu::getCaughtException() ); \ - ::rtl::OString sMessage( "caught an exception!" ); \ + OString sMessage( "caught an exception!" ); \ sMessage += "\nin function:"; \ sMessage += BOOST_CURRENT_FUNCTION; \ sMessage += "\ntype: "; \ - sMessage += ::rtl::OUStringToOString( caught.getValueTypeName(), osl_getThreadTextEncoding() ); \ + sMessage += OUStringToOString( caught.getValueTypeName(), osl_getThreadTextEncoding() ); \ ::com::sun::star::uno::Exception exception; \ caught >>= exception; \ if ( !exception.Message.isEmpty() ) \ { \ sMessage += "\nmessage: "; \ - sMessage += ::rtl::OUStringToOString( exception.Message, osl_getThreadTextEncoding() ); \ + sMessage += OUStringToOString( exception.Message, osl_getThreadTextEncoding() ); \ } \ if ( exception.Context.is() ) \ { \ @@ -70,7 +70,7 @@ if ( caught >>= specialized ) \ { \ sMessage += "\ndetails: "; \ - sMessage += ::rtl::OUStringToOString( \ + sMessage += OUStringToOString( \ specialized.Details, osl_getThreadTextEncoding() ); \ } \ } \ @@ -79,7 +79,7 @@ if ( caught >>= specialized ) \ { \ sMessage += "\ndetails: "; \ - sMessage += ::rtl::OString::valueOf( specialized.ErrCode ); \ + sMessage += OString::valueOf( specialized.ErrCode ); \ } \ } \ sMessage += "\n"; \ diff --git a/tools/inc/tools/getprocessworkingdir.hxx b/tools/inc/tools/getprocessworkingdir.hxx index 16eedfe1b8cd..af529b8edda2 100644 --- a/tools/inc/tools/getprocessworkingdir.hxx +++ b/tools/inc/tools/getprocessworkingdir.hxx @@ -32,7 +32,7 @@ namespace tools { // @param rUrl // Receives the directory URL (with or without a final slash) upon successful // return, and the empty string upon unsuccessful return -TOOLS_DLLPUBLIC bool getProcessWorkingDir(rtl::OUString& rUrl); +TOOLS_DLLPUBLIC bool getProcessWorkingDir(OUString& rUrl); } diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx index 53f097f60c6e..ad04f9e12445 100644 --- a/tools/inc/tools/inetmime.hxx +++ b/tools/inc/tools/inetmime.hxx @@ -488,7 +488,7 @@ public: static void writeHeaderFieldBody(INetMIMEOutputSink & rSink, HeaderFieldType eType, - const rtl::OUString& rBody, + const OUString& rBody, rtl_TextEncoding ePreferredEncoding, bool bInitialSpace = true); @@ -497,8 +497,8 @@ public: rtl_TextEncoding eEncoding, sal_uInt32 & rCharacter); - static rtl::OUString decodeHeaderFieldBody(HeaderFieldType eType, - const rtl::OString& rBody); + static OUString decodeHeaderFieldBody(HeaderFieldType eType, + const OString& rBody); // #i70651#: Prevent warnings on Mac OS X. #ifdef MACOSX @@ -926,13 +926,13 @@ public: /** Write a sequence of octets. - @param rOctets A rtl::OString, interpreted as a sequence of octets. + @param rOctets A OString, interpreted as a sequence of octets. @param nBegin The offset of the first character to write. @param nEnd The offset past the last character to write. */ - void write(const rtl::OString& rOctets, xub_StrLen nBegin, + void write(const OString& rOctets, xub_StrLen nBegin, xub_StrLen nEnd) { writeSequence(rOctets.getStr() + nBegin, rOctets.getStr() + nEnd); @@ -959,11 +959,11 @@ public: /** Write a sequence of octets. - @param rOctets A rtl::OString, interpreted as a sequence of octets. + @param rOctets A OString, interpreted as a sequence of octets. @return This instance. */ - INetMIMEOutputSink & operator <<(const rtl::OString& rOctets) + INetMIMEOutputSink & operator <<(const OString& rOctets) { writeSequence(rOctets.getStr(), rOctets.getStr() + rOctets.getLength()); m_nColumn += rOctets.getLength(); @@ -1047,7 +1047,7 @@ inline void INetMIME::writeEscapeSequence(INetMIMEOutputSink & rSink, class INetMIMEStringOutputSink: public INetMIMEOutputSink { - rtl::OStringBuffer m_aBuffer; + OStringBuffer m_aBuffer; using INetMIMEOutputSink::writeSequence; @@ -1062,7 +1062,7 @@ public: virtual ErrCode getError() const; - rtl::OString takeBuffer() + OString takeBuffer() { return m_aBuffer.makeStringAndClear(); } @@ -1178,17 +1178,17 @@ struct INetContentTypeParameter will only be one item for the complete parameter, with the attribute name lacking any section suffix. */ - const rtl::OString m_sAttribute; + const OString m_sAttribute; /** The optional character set specification (see RFC 2231), in US-ASCII encoding and converted to lower case. */ - const rtl::OString m_sCharset; + const OString m_sCharset; /** The optional language specification (see RFC 2231), in US-ASCII encoding and converted to lower case. */ - const rtl::OString m_sLanguage; + const OString m_sLanguage; /** The attribute value. If the value is a quoted-string, it is 'unpacked.' If a character set is specified, and the value can be @@ -1207,7 +1207,7 @@ struct INetContentTypeParameter within Unicode's Private Use Area (effectively adding 0xF800 to the character's numeric value). */ - const rtl::OUString m_sValue; + const OUString m_sValue; /** This is true if the value is successfuly converted to Unicode, and false if the value is a special mixture of ISO-LATIN-1 characters and @@ -1215,9 +1215,9 @@ struct INetContentTypeParameter */ const bool m_bConverted; - INetContentTypeParameter(const rtl::OString& rTheAttribute, - const rtl::OString& rTheCharset, const rtl::OString& rTheLanguage, - const rtl::OUString& rTheValue, bool bTheConverted) + INetContentTypeParameter(const OString& rTheAttribute, + const OString& rTheCharset, const OString& rTheLanguage, + const OUString& rTheValue, bool bTheConverted) : m_sAttribute(rTheAttribute) , m_sCharset(rTheCharset) , m_sLanguage(rTheLanguage) @@ -1248,7 +1248,7 @@ public: return &(maEntries[nIndex]); } - const INetContentTypeParameter * find(const rtl::OString& rAttribute) const; + const INetContentTypeParameter * find(const OString& rAttribute) const; private: diff --git a/tools/inc/tools/lineend.hxx b/tools/inc/tools/lineend.hxx index b9ee807ffa30..d4c75af92049 100644 --- a/tools/inc/tools/lineend.hxx +++ b/tools/inc/tools/lineend.hxx @@ -45,8 +45,8 @@ inline LineEnd GetSystemLineEnd() #endif } -TOOLS_DLLPUBLIC rtl::OString convertLineEnd(const rtl::OString &rIn, LineEnd eLineEnd); -TOOLS_DLLPUBLIC rtl::OUString convertLineEnd(const rtl::OUString &rIn, LineEnd eLineEnd); +TOOLS_DLLPUBLIC OString convertLineEnd(const OString &rIn, LineEnd eLineEnd); +TOOLS_DLLPUBLIC OUString convertLineEnd(const OUString &rIn, LineEnd eLineEnd); #endif diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx index b0ae1e3fcdac..678fc94a998a 100644 --- a/tools/inc/tools/multisel.hxx +++ b/tools/inc/tools/multisel.hxx @@ -104,7 +104,7 @@ class TOOLS_DLLPUBLIC StringRangeEnumerator sal_Int32 mnOffset; bool mbValidInput; - bool setRange( const rtl::OUString& i_rNewRange, bool i_bStrict = false ); + bool setRange( const OUString& i_rNewRange, bool i_bStrict = false ); bool insertRange( sal_Int32 nFirst, sal_Int32 nLast, bool bSequence, bool bMayAdjust ); bool insertJoinedRanges( const std::vector< sal_Int32 >& rNumbers, bool i_bStrict ); bool checkValue( sal_Int32, const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const; @@ -135,7 +135,7 @@ public: friend class StringRangeEnumerator::Iterator; - StringRangeEnumerator( const rtl::OUString& i_rInput, + StringRangeEnumerator( const OUString& i_rInput, sal_Int32 i_nMinNumber, sal_Int32 i_nMaxNumber, sal_Int32 i_nLogicalOffset = -1 @@ -172,7 +172,7 @@ public: - single number that doesn't fit in [i_nMinNumber,i_nMaxNumber] will be ignored - range that doesn't fit in [i_nMinNumber,i_nMaxNumber] will be adjusted */ - static bool getRangesFromString( const rtl::OUString& i_rPageRange, + static bool getRangesFromString( const OUString& i_rPageRange, std::vector< sal_Int32 >& o_rPageVector, sal_Int32 i_nMinNumber, sal_Int32 i_nMaxNumber, diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx index 8ee386474214..a043db47d4d5 100644 --- a/tools/inc/tools/rc.hxx +++ b/tools/inc/tools/rc.hxx @@ -69,10 +69,10 @@ protected: sal_Int16 ReadShortRes() { return m_pResMgr->ReadShort(); } // read a string from resource data and increment pointer - rtl::OUString ReadStringRes() + OUString ReadStringRes() { return m_pResMgr->ReadString(); } // read a byte string from resource data and increment pointer - rtl::OString ReadByteStringRes() + OString ReadByteStringRes() { return m_pResMgr->ReadByteString(); } // free the resource from m_pResMgr's stack (pass this ptr for validation) diff --git a/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx index df40eb9df236..515dd779120b 100644 --- a/tools/inc/tools/resary.hxx +++ b/tools/inc/tools/resary.hxx @@ -32,10 +32,10 @@ class TOOLS_DLLPUBLIC ResStringArray : private boost::noncopyable private: struct ImplResStringItem { - rtl::OUString m_aStr; + OUString m_aStr; long m_nValue; - ImplResStringItem( const rtl::OUString& rStr, long nValue = 0 ) : + ImplResStringItem( const OUString& rStr, long nValue = 0 ) : m_aStr( rStr ), m_nValue( nValue ) {} @@ -47,8 +47,8 @@ public: ResStringArray( const ResId& rResId ); ~ResStringArray(); - const rtl::OUString GetString( sal_uInt32 nIndex ) const - { return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].m_aStr : rtl::OUString(); } + const OUString GetString( sal_uInt32 nIndex ) const + { return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].m_aStr : OUString(); } long GetValue( sal_uInt32 nIndex ) const { return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].m_nValue : -1; } sal_uInt32 Count() const { return sal_uInt32(m_aStrings.size()); } diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx index 1319bfed523e..14c0a11915f7 100644 --- a/tools/inc/tools/resid.hxx +++ b/tools/inc/tools/resid.hxx @@ -147,8 +147,8 @@ public: sal_uInt32 GetId() const { return m_nResId & ~RSC_DONTRELEASE; } RSHEADER_TYPE* GetpResource() const { return m_pResource; } - TOOLS_DLLPUBLIC rtl::OUString toString() const; - TOOLS_DLLPUBLIC operator rtl::OUString() const { return toString(); } + TOOLS_DLLPUBLIC OUString toString() const; + TOOLS_DLLPUBLIC operator OUString() const { return toString(); } }; #endif diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx index 3b500b9163ed..603a2c7a2eb5 100644 --- a/tools/inc/tools/resmgr.hxx +++ b/tools/inc/tools/resmgr.hxx @@ -45,7 +45,7 @@ public: inline sal_uInt32 GetLocalOff(); ///< Local offset }; -typedef rtl::OUString (*ResHookProc)( const rtl::OUString& rStr ); +typedef OUString (*ResHookProc)( const OUString& rStr ); // Initialization #define RC_NOTYPE 0x00 @@ -92,7 +92,7 @@ private: { return (((int)nOff >= nCurStack) ? NULL : &aStack[nCurStack-nOff]); } - TOOLS_DLLPRIVATE void Init( const rtl::OUString& rFileName ); + TOOLS_DLLPRIVATE void Init( const OUString& rFileName ); TOOLS_DLLPRIVATE ResMgr( InternalResMgr * pImp ); @@ -162,7 +162,7 @@ public: /// Return a string and its length out of the resource static sal_uInt32 GetString( OUString& rStr, const sal_uInt8* pStr ); /// Return a byte string and its length out of the resource - static sal_uInt32 GetByteString( rtl::OString& rStr, const sal_uInt8* pStr ); + static sal_uInt32 GetByteString( OString& rStr, const sal_uInt8* pStr ); /// Return the size of a string in the resource static sal_uInt32 GetStringSize( sal_uInt32 nLen ) @@ -183,15 +183,15 @@ public: sal_uInt32 GetRemainSize(); - const rtl::OUString& GetFileName() const; + const OUString& GetFileName() const; sal_Int16 ReadShort(); sal_Int32 ReadLong(); OUString ReadString(); - rtl::OString ReadByteString(); + OString ReadByteString(); /// Generate auto help ID for current resource stack - rtl::OString GetAutoHelpId(); + OString GetAutoHelpId(); static void SetReadStringHook( ResHookProc pProc ); static ResHookProc GetReadStringHook(); diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx index 78021bf92dcc..667454c6150c 100644 --- a/tools/inc/tools/simplerm.hxx +++ b/tools/inc/tools/simplerm.hxx @@ -64,7 +64,7 @@ public: an existent string @seealso IsAvailable */ - rtl::OUString ReadString( sal_uInt32 nId ); + OUString ReadString( sal_uInt32 nId ); /** checks whether a certain resource is availble @param _resourceType diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index bad7f6fe0421..78a0bc3df96f 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -234,7 +234,7 @@ private: CharSet eStreamCharSet; // Encryption - rtl::OString m_aCryptMaskKey;// aCryptMaskKey.getLength != 0 -> Encryption used + OString m_aCryptMaskKey;// aCryptMaskKey.getLength != 0 -> Encryption used unsigned char nCryptMask; // Userdata @@ -291,8 +291,8 @@ public: { nCompressMode = nNewMode; } sal_uInt16 GetCompressMode() const { return nCompressMode; } - void SetCryptMaskKey(const rtl::OString& rCryptMaskKey); - const rtl::OString& GetCryptMaskKey() const { return m_aCryptMaskKey; } + void SetCryptMaskKey(const OString& rCryptMaskKey); + const OString& GetCryptMaskKey() const { return m_aCryptMaskKey; } void SetStreamCharSet( CharSet eCharSet ) { eStreamCharSet = eCharSet; } @@ -363,8 +363,8 @@ public: @endcode causing endless loops ... */ - sal_Bool ReadLine( rtl::OString& rStr, sal_Int32 nMaxBytesToRead = 0xFFFE ); - sal_Bool WriteLine( const rtl::OString& rStr ); + sal_Bool ReadLine( OString& rStr, sal_Int32 nMaxBytesToRead = 0xFFFE ); + sal_Bool WriteLine( const OString& rStr ); /** Read a line of bytes. @@ -380,7 +380,7 @@ public: @endcode causing endless loops ... */ - sal_Bool ReadByteStringLine( rtl::OUString& rStr, rtl_TextEncoding eSrcCharSet, + sal_Bool ReadByteStringLine( OUString& rStr, rtl_TextEncoding eSrcCharSet, sal_Int32 nMaxBytesToRead = 0xFFFE ); sal_Bool ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet ); sal_Bool WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet ); @@ -413,15 +413,15 @@ public: @endcode causing endless loops ... */ - sal_Bool ReadUniStringLine( rtl::OUString& rStr, sal_Int32 nMaxCodepointsToRead = 0xFFFE ); + sal_Bool ReadUniStringLine( OUString& rStr, sal_Int32 nMaxCodepointsToRead = 0xFFFE ); /** Read a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, otherwise read a 16bit length prefixed sequence of bytes and convert from eSrcCharSet */ - rtl::OUString ReadUniOrByteString(rtl_TextEncoding eSrcCharSet); + OUString ReadUniOrByteString(rtl_TextEncoding eSrcCharSet); /** Write a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, otherwise convert to eSrcCharSet and write a 16bit length prefixed sequence of bytes */ - SvStream& WriteUniOrByteString( const rtl::OUString& rStr, rtl_TextEncoding eDestCharSet ); + SvStream& WriteUniOrByteString( const OUString& rStr, rtl_TextEncoding eDestCharSet ); /** Read a line of Unicode if eSrcCharSet==RTL_TEXTENCODING_UNICODE, otherwise read a line of Bytecode and convert from eSrcCharSet @@ -438,7 +438,7 @@ public: @endcode causing endless loops ... */ - sal_Bool ReadUniOrByteStringLine( rtl::OUString& rStr, rtl_TextEncoding eSrcCharSet, + sal_Bool ReadUniOrByteStringLine( OUString& rStr, rtl_TextEncoding eSrcCharSet, sal_Int32 nMaxCodepointsToRead = 0xFFFE ); /** Write a sequence of Unicode characters if eDestCharSet==RTL_TEXTENCODING_UNICODE, otherwise write a sequence of @@ -514,28 +514,28 @@ TOOLS_DLLPUBLIC SvStream& endlu( SvStream& rStr ); /// call endlu() if eStreamCharSet==RTL_TEXTECODING_UNICODE otherwise endl() TOOLS_DLLPUBLIC SvStream& endlub( SvStream& rStr ); -/// Attempt to read nUnits 8bit units to an OString, returned rtl::OString's +/// Attempt to read nUnits 8bit units to an OString, returned OString's /// length is number of units successfully read -TOOLS_DLLPUBLIC rtl::OString read_uInt8s_ToOString(SvStream& rStrm, +TOOLS_DLLPUBLIC OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nUnits); /// Attempt to read nUnits 8bit units to an OUString -TOOLS_DLLPUBLIC inline rtl::OUString read_uInt8s_ToOUString(SvStream& rStrm, +TOOLS_DLLPUBLIC inline OUString read_uInt8s_ToOUString(SvStream& rStrm, sal_Size nUnits, rtl_TextEncoding eEnc) { - return rtl::OStringToOUString(read_uInt8s_ToOString(rStrm, nUnits), eEnc); + return OStringToOUString(read_uInt8s_ToOString(rStrm, nUnits), eEnc); } /// Attempt to read nUnits 16bit units to an OUString, returned -/// rtl::OUString's length is number of units successfully read -TOOLS_DLLPUBLIC rtl::OUString read_uInt16s_ToOUString(SvStream& rStrm, +/// OUString's length is number of units successfully read +TOOLS_DLLPUBLIC OUString read_uInt16s_ToOUString(SvStream& rStrm, sal_Size nUnits); /// Attempt to read a pascal-style length (of type prefix) prefixed sequence of -/// 16bit units to an OUString, returned rtl::OString's length is number of +/// 16bit units to an OUString, returned OString's length is number of /// units successfully read. template -rtl::OUString read_lenPrefixed_uInt16s_ToOUString(SvStream& rStrm) +OUString read_lenPrefixed_uInt16s_ToOUString(SvStream& rStrm) { prefix nUnits = 0; rStrm >> nUnits; @@ -545,10 +545,10 @@ rtl::OUString read_lenPrefixed_uInt16s_ToOUString(SvStream& rStrm) /// Attempt to write a prefixed sequence of nUnits 16bit units from an OUString, /// returned value is number of bytes written TOOLS_DLLPUBLIC sal_Size write_uInt16s_FromOUString(SvStream& rStrm, - const rtl::OUString& rStr, sal_Size nUnits); + const OUString& rStr, sal_Size nUnits); TOOLS_DLLPUBLIC inline sal_Size write_uInt16s_FromOUString(SvStream& rStrm, - const rtl::OUString& rStr) + const OUString& rStr) { return write_uInt16s_FromOUString(rStrm, rStr, rStr.getLength()); } @@ -580,27 +580,27 @@ namespace streamdetail /// of 16bit units from an OUString, returned value is number of bytes written /// (including byte-count of prefix) template sal_Size write_lenPrefixed_uInt16s_FromOUString(SvStream& rStrm, - const rtl::OUString &rStr) + const OUString &rStr) { - return streamdetail::write_lenPrefixed_seq_From_str(rStrm, rStr); + return streamdetail::write_lenPrefixed_seq_From_str(rStrm, rStr); } /// Attempt to read 8bit units to an OString until a zero terminator is -/// encountered, returned rtl::OString's length is number of units *definitely* +/// encountered, returned OString's length is number of units *definitely* /// successfully read, check SvStream::good() to see if null terminator was /// successfully read -TOOLS_DLLPUBLIC rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm); +TOOLS_DLLPUBLIC OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm); /// Attempt to read 8bit units assuming source encoding eEnc to an OUString /// until a zero terminator is encountered. Check SvStream::good() to see if /// null terminator was successfully read -TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc); +TOOLS_DLLPUBLIC OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc); /// Attempt to read a pascal-style length (of type prefix) prefixed sequence of -/// 8bit units to an OString, returned rtl::OString's length is number of units +/// 8bit units to an OString, returned OString's length is number of units /// successfully read. template -rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) +OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) { prefix nUnits = 0; rStrm >> nUnits; @@ -610,21 +610,21 @@ rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) /// Attempt to read a pascal-style length (of type prefix) prefixed sequence of /// 8bit units to an OUString template -rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm, +OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc) { - return rtl::OStringToOUString(read_lenPrefixed_uInt8s_ToOString(rStrm), eEnc); + return OStringToOUString(read_lenPrefixed_uInt8s_ToOString(rStrm), eEnc); } /// Attempt to write a prefixed sequence of nUnits 8bit units from an OString, /// returned value is number of bytes written -TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const rtl::OString& rStr, +TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const OString& rStr, sal_Size nUnits) { return rStrm.Write(rStr.getStr(), nUnits); } -TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const rtl::OString& rStr) +TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const OString& rStr) { return write_uInt8s_FromOString(rStrm, rStr, rStr.getLength()); } @@ -633,18 +633,18 @@ TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const /// of 8bit units from an OString, returned value is number of bytes written /// (including byte-count of prefix) template sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm, - const rtl::OString &rStr) + const OString &rStr) { - return streamdetail::write_lenPrefixed_seq_From_str(rStrm, rStr); + return streamdetail::write_lenPrefixed_seq_From_str(rStrm, rStr); } /// Attempt to write a pascal-style length (of type prefix) prefixed sequence /// of 8bit units from an OUString, returned value is number of bytes written /// (including byte-count of prefix) template sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm, - const rtl::OUString &rStr, rtl_TextEncoding eEnc) + const OUString &rStr, rtl_TextEncoding eEnc) { - return write_lenPrefixed_uInt8s_FromOString(rStrm, rtl::OUStringToOString(rStr, eEnc)); + return write_lenPrefixed_uInt8s_FromOString(rStrm, OUStringToOString(rStr, eEnc)); } // FileStream diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index 1c73fe4fb230..5efcd3e3d933 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -121,12 +121,12 @@ private: TOOLS_DLLPRIVATE UniString( const sal_Char*, sal_Int32 ); //detect and reject wrong way to attempt to create a UniString from a substring of - //a rtl::OString - TOOLS_DLLPRIVATE UniString(const rtl::OString& rByteStr, xub_StrLen nPos, xub_StrLen nLen, + //a OString + TOOLS_DLLPRIVATE UniString(const OString& rByteStr, xub_StrLen nPos, xub_StrLen nLen, sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS); //no longer implemented - TOOLS_DLLPRIVATE UniString( const rtl::OString& rByteStr, + TOOLS_DLLPRIVATE UniString( const OString& rByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr ); @@ -139,7 +139,7 @@ public: UniString( const ResId& rResId ); UniString( const UniString& rStr ); UniString( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen ); - UniString( const rtl::OUString& rStr ); + UniString( const OUString& rStr ); UniString(char c); // ...but allow "UniString('a')" UniString( const sal_Char* pByteStr, rtl_TextEncoding eTextEncoding, @@ -149,19 +149,19 @@ public: sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); ~UniString(); - operator rtl::OUString () const + operator OUString () const { - return rtl::OUString( rtl_uStringBuffer_refReturn( + return OUString( rtl_uStringBuffer_refReturn( reinterpret_cast(mpData)), SAL_NO_ACQUIRE ); } #ifdef RTL_FAST_STRING template< typename T1, typename T2 > UniString( const rtl::OUStringConcat< T1, T2 >& concat ) - : mpData(NULL) { Assign( rtl::OUString( concat )); } + : mpData(NULL) { Assign( OUString( concat )); } template< typename T1, typename T2 > UniString& operator =( const rtl::OUStringConcat< T1, T2 >& concat ) - { return Assign( rtl::OUString( concat )); } + { return Assign( OUString( concat )); } template< typename T1, typename T2 > UniString& operator +=( const rtl::OUStringConcat< T1, T2 >& concat ) { return Append( UniString( concat ) ); } @@ -172,7 +172,7 @@ public: sal_Int64 ToInt64() const; UniString& Assign( const UniString& rStr ); - UniString& Assign( const rtl::OUString& rStr ); + UniString& Assign( const OUString& rStr ); UniString& Assign( const sal_Unicode* pCharStr ); UniString& Assign( sal_Unicode c ); inline UniString & Assign(char c) // ...but allow "Assign('a')" @@ -181,7 +181,7 @@ public: UniString& AssignAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ); UniString& operator =( const UniString& rStr ) { return Assign( rStr ); } - UniString& operator =( const rtl::OUString& rStr ) + UniString& operator =( const OUString& rStr ) { return Assign( rStr ); } UniString& operator =( const sal_Unicode* pCharStr ) { return Assign( pCharStr ); } @@ -200,7 +200,7 @@ public: UniString& AppendAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ); UniString& operator +=( const UniString& rStr ) { return Append( rStr ); } - UniString& operator +=( const rtl::OUString& rStr ) + UniString& operator +=( const OUString& rStr ) { return Append( UniString(rStr) ); } UniString& operator +=( const sal_Unicode* pCharStr ) { return Append( pCharStr ); } @@ -312,7 +312,7 @@ operator <<( std::basic_ostream & stream, UniString const & string) { return stream << - rtl::OUStringToOString(string, RTL_TEXTENCODING_UTF8).getStr(); + OUStringToOString(string, RTL_TEXTENCODING_UTF8).getStr(); // best effort; potentially loses data due to conversion failures // (stray surrogate halves) and embedded null characters } @@ -334,24 +334,24 @@ struct ToStringHelper< UniString > // some compare operators, so that conversions from String to OUString don't // have to insert conversions all over the place -inline bool operator==(UniString const& rLeft, ::rtl::OUString const& rRight) +inline bool operator==(UniString const& rLeft, OUString const& rRight) { - return ::rtl::OUString(rLeft) == rRight; + return OUString(rLeft) == rRight; } -inline bool operator==(::rtl::OUString const& rLeft, UniString const& rRight) +inline bool operator==(OUString const& rLeft, UniString const& rRight) { - return rLeft == ::rtl::OUString(rRight); + return rLeft == OUString(rRight); } -inline bool operator!=(UniString const& rLeft, ::rtl::OUString const& rRight) +inline bool operator!=(UniString const& rLeft, OUString const& rRight) { - return ::rtl::OUString(rLeft) != rRight; + return OUString(rLeft) != rRight; } -inline bool operator!=(::rtl::OUString const& rLeft, UniString const& rRight) +inline bool operator!=(OUString const& rLeft, UniString const& rRight) { - return rLeft != ::rtl::OUString(rRight); + return rLeft != OUString(rRight); } #ifdef RTL_FAST_STRING diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx index 2f4319968042..fef9f469c359 100644 --- a/tools/inc/tools/urlobj.hxx +++ b/tools/inc/tools/urlobj.hxx @@ -113,9 +113,9 @@ public: /** The way input strings that represent (parts of) URIs are interpreted in set-methods. - @descr Most set-methods accept either a rtl::OString or a rtl::OUString - as input. Using a rtl::OString, octets in the range 0x80--0xFF are - replaced by single escape sequences. Using a rtl::OUString , UTF-32 + @descr Most set-methods accept either a OString or a OUString + as input. Using a OString, octets in the range 0x80--0xFF are + replaced by single escape sequences. Using a OUString , UTF-32 characters in the range 0x80--0x10FFFF are replaced by sequences of escape sequences, representing the UTF-8 coded characters. @@ -191,20 +191,20 @@ public: inline bool HasError() const { return m_eScheme == INET_PROT_NOT_VALID; } - inline rtl::OUString GetMainURL(DecodeMechanism eMechanism, + inline OUString GetMainURL(DecodeMechanism eMechanism, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aAbsURIRef, getEscapePrefix(), eMechanism, eCharset); } - rtl::OUString GetURLNoPass(DecodeMechanism eMechanism = DECODE_TO_IURI, + OUString GetURLNoPass(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const; - rtl::OUString GetURLNoMark(DecodeMechanism eMechanism = DECODE_TO_IURI, + OUString GetURLNoMark(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const; - rtl::OUString + OUString getAbbreviated(com::sun::star::uno::Reference< com::sun::star::util::XStringWidth > const & rStringWidth, @@ -225,26 +225,26 @@ public: // Strict Parsing: - inline INetURLObject(const rtl::OString& rTheAbsURIRef, + inline INetURLObject(const OString& rTheAbsURIRef, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline INetURLObject(rtl::OUString const & rTheAbsURIRef, + inline INetURLObject(OUString const & rTheAbsURIRef, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline bool SetURL(const rtl::OString& rTheAbsURIRef, + inline bool SetURL(const OString& rTheAbsURIRef, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline bool SetURL(rtl::OUString const & rTheAbsURIRef, + inline bool SetURL(OUString const & rTheAbsURIRef, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - bool ConcatData(INetProtocol eTheScheme, rtl::OUString const & rTheUser, - rtl::OUString const & rThePassword, - rtl::OUString const & rTheHost, sal_uInt32 nThePort, - rtl::OUString const & rThePath, + bool ConcatData(INetProtocol eTheScheme, OUString const & rTheUser, + OUString const & rThePassword, + OUString const & rTheHost, sal_uInt32 nThePort, + OUString const & rThePath, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); @@ -347,7 +347,7 @@ public: FSYS_DETECT = FSYS_VOS | FSYS_UNX | FSYS_DOS }; - inline INetURLObject(rtl::OUString const & rTheAbsURIRef, + inline INetURLObject(OUString const & rTheAbsURIRef, INetProtocol eTheSmartScheme, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, @@ -357,19 +357,19 @@ public: { m_eSmartScheme = eTheSmartScheme; } inline bool - SetSmartURL(const rtl::OString& rTheAbsURIRef, + SetSmartURL(const OString& rTheAbsURIRef, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, FSysStyle eStyle = FSYS_DETECT); inline bool - SetSmartURL(rtl::OUString const & rTheAbsURIRef, + SetSmartURL(OUString const & rTheAbsURIRef, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, FSysStyle eStyle = FSYS_DETECT); inline INetURLObject - smartRel2Abs(const rtl::OString& rTheRelURIRef, + smartRel2Abs(const OString& rTheRelURIRef, bool & rWasAbsolute, bool bIgnoreFragment = false, EncodeMechanism eMechanism = WAS_ENCODED, @@ -378,7 +378,7 @@ public: FSysStyle eStyle = FSYS_DETECT) const; inline INetURLObject - smartRel2Abs(rtl::OUString const & rTheRelURIRef, + smartRel2Abs(OUString const & rTheRelURIRef, bool & rWasAbsolute, bool bIgnoreFragment = false, EncodeMechanism eMechanism = WAS_ENCODED, @@ -389,7 +389,7 @@ public: // Relative URLs: inline bool - GetNewAbsURL(const rtl::OString& rTheRelURIRef, + GetNewAbsURL(const OString& rTheRelURIRef, INetURLObject * pTheAbsURIRef, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, @@ -397,7 +397,7 @@ public: const; inline bool - GetNewAbsURL(rtl::OUString const & rTheRelURIRef, + GetNewAbsURL(OUString const & rTheRelURIRef, INetURLObject * pTheAbsURIRef, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, @@ -411,26 +411,26 @@ public: then rTheRelURIRef is returned unmodified; otherwise, an empty string is returned. */ - static rtl::OUString - GetAbsURL(rtl::OUString const & rTheBaseURIRef, - rtl::OUString const & rTheRelURIRef, + static OUString + GetAbsURL(OUString const & rTheBaseURIRef, + OUString const & rTheRelURIRef, bool bIgnoreFragment = false, EncodeMechanism eEncodeMechanism = WAS_ENCODED, DecodeMechanism eDecodeMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, FSysStyle eStyle = FSYS_DETECT); - static inline rtl::OUString - GetRelURL(const rtl::OString& rTheBaseURIRef, - const rtl::OString& rTheAbsURIRef, + static inline OUString + GetRelURL(const OString& rTheBaseURIRef, + const OString& rTheAbsURIRef, EncodeMechanism eEncodeMechanism = WAS_ENCODED, DecodeMechanism eDecodeMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, FSysStyle eStyle = FSYS_DETECT); - static inline rtl::OUString - GetRelURL(rtl::OUString const & rTheBaseURIRef, - rtl::OUString const & rTheAbsURIRef, + static inline OUString + GetRelURL(OUString const & rTheBaseURIRef, + OUString const & rTheAbsURIRef, EncodeMechanism eEncodeMechanism = WAS_ENCODED, DecodeMechanism eDecodeMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, @@ -438,33 +438,33 @@ public: // External URLs: - rtl::OUString getExternalURL(DecodeMechanism eMechanism = DECODE_TO_IURI, + OUString getExternalURL(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const; - static inline bool translateToExternal(const rtl::OString& rTheIntURIRef, - rtl::OUString & rTheExtURIRef, + static inline bool translateToExternal(const OString& rTheIntURIRef, + OUString & rTheExtURIRef, DecodeMechanism eDecodeMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - static inline bool translateToExternal(rtl::OUString const & rTheIntURIRef, - rtl::OUString & rTheExtURIRef, + static inline bool translateToExternal(OUString const & rTheIntURIRef, + OUString & rTheExtURIRef, DecodeMechanism eDecodeMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - static inline bool translateToInternal(const rtl::OString& rTheExtURIRef, - rtl::OUString & rTheIntURIRef, + static inline bool translateToInternal(const OString& rTheExtURIRef, + OUString & rTheIntURIRef, DecodeMechanism eDecodeMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - static inline bool translateToInternal(rtl::OUString const & rTheExtURIRef, - rtl::OUString & rTheIntURIRef, + static inline bool translateToInternal(OUString const & rTheExtURIRef, + OUString & rTheIntURIRef, DecodeMechanism eDecodeMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset @@ -482,13 +482,13 @@ public: @return The 'prefix' of URLs of the given scheme. */ - static rtl::OUString GetScheme(INetProtocol eTheScheme); + static OUString GetScheme(INetProtocol eTheScheme); - static inline INetProtocol CompareProtocolScheme(const rtl::OString& + static inline INetProtocol CompareProtocolScheme(const OString& rTheAbsURIRef) { return CompareProtocolScheme(extend(rTheAbsURIRef)); } - static INetProtocol CompareProtocolScheme(rtl::OUString const & + static INetProtocol CompareProtocolScheme(OUString const & rTheAbsURIRef); // User Info: @@ -498,42 +498,42 @@ public: inline bool IsEmptyUser() const { return m_aUser.isPresent() && m_aUser.isEmpty(); } - inline rtl::OUString GetUser(DecodeMechanism eMechanism = DECODE_TO_IURI, + inline OUString GetUser(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aUser, getEscapePrefix(), eMechanism, eCharset); } - inline rtl::OUString GetPass(DecodeMechanism eMechanism = DECODE_TO_IURI, + inline OUString GetPass(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aAuth, getEscapePrefix(), eMechanism, eCharset); } - inline bool SetUser(const rtl::OString& rTheUser, + inline bool SetUser(const OString& rTheUser, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) { return setUser(extend(rTheUser), true, eMechanism, eCharset); } - inline bool SetUser(rtl::OUString const & rTheUser, + inline bool SetUser(OUString const & rTheUser, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) { return setUser(rTheUser, false, eMechanism, eCharset); } - inline bool SetPass(const rtl::OString& rThePassword, + inline bool SetPass(const OString& rThePassword, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline bool SetPass(rtl::OUString const & rThePassword, + inline bool SetPass(OUString const & rThePassword, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline bool SetUserAndPass(const rtl::OString& rTheUser, - const rtl::OString& rThePassword, + inline bool SetUserAndPass(const OString& rTheUser, + const OString& rThePassword, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline bool SetUserAndPass(rtl::OUString const & rTheUser, - rtl::OUString const & rThePassword, + inline bool SetUserAndPass(OUString const & rTheUser, + OUString const & rThePassword, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); @@ -542,22 +542,22 @@ public: inline bool HasPort() const { return m_aPort.isPresent(); } - inline rtl::OUString GetHost(DecodeMechanism eMechanism = DECODE_TO_IURI, + inline OUString GetHost(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aHost, getEscapePrefix(), eMechanism, eCharset); } - rtl::OUString GetHostPort(DecodeMechanism eMechanism = DECODE_TO_IURI, + OUString GetHostPort(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); sal_uInt32 GetPort() const; - inline bool SetHost(const rtl::OString& rTheHost, + inline bool SetHost(const OString& rTheHost, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) { return setHost(extend(rTheHost), true, eMechanism, eCharset); } - inline bool SetHost(rtl::OUString const & rTheHost, + inline bool SetHost(OUString const & rTheHost, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) { return setHost(rTheHost, false, eMechanism, eCharset); } @@ -568,17 +568,17 @@ public: inline bool HasURLPath() const { return !m_aPath.isEmpty(); } - inline rtl::OUString GetURLPath(DecodeMechanism eMechanism = DECODE_TO_IURI, + inline OUString GetURLPath(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aPath, getEscapePrefix(), eMechanism, eCharset); } - inline bool SetURLPath(const rtl::OString& rThePath, + inline bool SetURLPath(const OString& rThePath, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) { return setPath(extend(rThePath), true, eMechanism, eCharset); } - inline bool SetURLPath(rtl::OUString const & rThePath, + inline bool SetURLPath(OUString const & rThePath, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) { return setPath(rThePath, false, eMechanism, eCharset); } @@ -661,7 +661,7 @@ public: the specified place to insert the new segment does not exist, false is returned. If false is returned, the object is not modified. */ - inline bool insertName(rtl::OUString const & rTheName, + inline bool insertName(OUString const & rTheName, bool bAppendFinalSlash = false, sal_Int32 nIndex = LAST_SEGMENT, bool bIgnoreFinalSlash = true, @@ -684,7 +684,7 @@ public: hierarchical, or the specified segment does not exits, an empty string is returned. */ - rtl::OUString getName(sal_Int32 nIndex = LAST_SEGMENT, + OUString getName(sal_Int32 nIndex = LAST_SEGMENT, bool bIgnoreFinalSlash = true, DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) @@ -710,7 +710,7 @@ public: the specified segment does not exist, false is returned. If false is returned, the object is not modified. */ - bool setName(rtl::OUString const & rTheName, + bool setName(OUString const & rTheName, sal_Int32 nIndex = LAST_SEGMENT, bool bIgnoreFinalSlash = true, EncodeMechanism eMechanism = WAS_ENCODED, @@ -732,7 +732,7 @@ public: not hierarchical, or the specified segment does not exits, an empty string is returned. */ - rtl::OUString getBase(sal_Int32 nIndex = LAST_SEGMENT, + OUString getBase(sal_Int32 nIndex = LAST_SEGMENT, bool bIgnoreFinalSlash = true, DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) @@ -757,7 +757,7 @@ public: the specified segment does not exist, false is returned. If false is returned, the object is not modified. */ - bool setBase(rtl::OUString const & rTheBase, + bool setBase(OUString const & rTheBase, sal_Int32 nIndex = LAST_SEGMENT, bool bIgnoreFinalSlash = true, EncodeMechanism eMechanism = WAS_ENCODED, @@ -794,7 +794,7 @@ public: not hierarchical, or the specified segment does not exits, an empty string is returned. */ - rtl::OUString getExtension(sal_Int32 nIndex = LAST_SEGMENT, + OUString getExtension(sal_Int32 nIndex = LAST_SEGMENT, bool bIgnoreFinalSlash = true, DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) @@ -820,7 +820,7 @@ public: the specified segment does not exist, false is returned. If false is returned, the object is not modified. */ - bool setExtension(rtl::OUString const & rTheExtension, + bool setExtension(OUString const & rTheExtension, sal_Int32 nIndex = LAST_SEGMENT, bool bIgnoreFinalSlash = true, EncodeMechanism eMechanism = WAS_ENCODED, @@ -873,16 +873,16 @@ public: inline bool HasParam() const { return m_aQuery.isPresent(); } - inline rtl::OUString GetParam(DecodeMechanism eMechanism = DECODE_TO_IURI, + inline OUString GetParam(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aQuery, getEscapePrefix(), eMechanism, eCharset); } - inline bool SetParam(const rtl::OString& rTheQuery, + inline bool SetParam(const OString& rTheQuery, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline bool SetParam(rtl::OUString const & rTheQuery, + inline bool SetParam(OUString const & rTheQuery, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); @@ -890,16 +890,16 @@ public: inline bool HasMark() const { return m_aFragment.isPresent(); } - inline rtl::OUString GetMark(DecodeMechanism eMechanism = DECODE_TO_IURI, + inline OUString GetMark(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aFragment, getEscapePrefix(), eMechanism, eCharset); } - inline bool SetMark(const rtl::OString& rTheFragment, + inline bool SetMark(const OString& rTheFragment, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline bool SetMark(rtl::OUString const & rTheFragment, + inline bool SetMark(OUString const & rTheFragment, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); @@ -911,7 +911,7 @@ public: @param eStyle The notation of rFSysPath. */ - inline INetURLObject(rtl::OUString const & rFSysPath, FSysStyle eStyle); + inline INetURLObject(OUString const & rFSysPath, FSysStyle eStyle); /** Set this INetURLObject to a file URL constructed from a file system path. @@ -923,7 +923,7 @@ public: @return True if this INetURLObject has successfully been changed. If false is returned, this INetURLObject has not been modified. */ - bool setFSysPath(rtl::OUString const & rFSysPath, FSysStyle eStyle); + bool setFSysPath(OUString const & rFSysPath, FSysStyle eStyle); /** Return the file system path represented by a file URL (ignoring any fragment part). @@ -942,12 +942,12 @@ public: specified notation, or if this is not a file URL at all, an empty string is returned. */ - rtl::OUString getFSysPath(FSysStyle eStyle, sal_Unicode * pDelimiter = 0) + OUString getFSysPath(FSysStyle eStyle, sal_Unicode * pDelimiter = 0) const; // POP3 and URLs: - rtl::OUString GetMsgId(DecodeMechanism eMechanism = DECODE_TO_IURI, + OUString GetMsgId(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const; @@ -1014,7 +1014,7 @@ public: @return The encoded representation of the text ('forbidden' characters replaced by escape sequences). */ - static inline rtl::OUString encode(const rtl::OString& rText, Part ePart, + static inline OUString encode(const OString& rText, Part ePart, sal_Char cEscapePrefix, EncodeMechanism eMechanism, rtl_TextEncoding eCharset @@ -1039,7 +1039,7 @@ public: @return The text, encoded according to the given mechanism and charset ('forbidden' characters replaced by escape sequences). */ - static inline rtl::OUString encode(rtl::OUString const & rText, Part ePart, + static inline OUString encode(OUString const & rText, Part ePart, sal_Char cEscapePrefix, EncodeMechanism eMechanism, rtl_TextEncoding eCharset @@ -1059,23 +1059,23 @@ public: @return The text, decoded according to the given mechanism and charset (escape sequences replaced by 'raw' characters). */ - static inline rtl::OUString decode(rtl::OUString const & rText, + static inline OUString decode(OUString const & rText, sal_Char cEscapePrefix, DecodeMechanism eMechanism, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - static inline rtl::OUString decode(rtl::OUStringBuffer const & rText, + static inline OUString decode(OUStringBuffer const & rText, sal_Char cEscapePrefix, DecodeMechanism eMechanism, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - static void appendUCS4Escape(rtl::OUStringBuffer & rTheText, + static void appendUCS4Escape(OUStringBuffer & rTheText, sal_Char cEscapePrefix, sal_uInt32 nUCS4); - static void appendUCS4(rtl::OUStringBuffer & rTheText, sal_uInt32 nUCS4, + static void appendUCS4(OUStringBuffer & rTheText, sal_uInt32 nUCS4, EscapeType eEscapeType, bool bOctets, Part ePart, sal_Char cEscapePrefix, rtl_TextEncoding eCharset, bool bKeepVisibleEscapes); @@ -1095,7 +1095,7 @@ public: // OBSOLETE Hierarchical Path: - rtl::OUString GetPartBeforeLastName(DecodeMechanism eMechanism + OUString GetPartBeforeLastName(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const; @@ -1110,7 +1110,7 @@ public: the last unencoded '/'). Not that this last segment may be empty. If the URL is not hierarchical, an empty string is returned. */ - rtl::OUString GetLastName(DecodeMechanism eMechanism = DECODE_TO_IURI, + OUString GetLastName(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const; @@ -1125,16 +1125,16 @@ public: be empty. If the URL is not hierarchical, or if the last segment does not contain an unencoded '.', an empty string is returned. */ - rtl::OUString GetFileExtension(DecodeMechanism eMechanism = DECODE_TO_IURI, + OUString GetFileExtension(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const; - inline bool Append(const rtl::OString& rTheSegment, + inline bool Append(const OString& rTheSegment, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) { return appendSegment(extend(rTheSegment), true, eMechanism, eCharset); } - inline bool Append(rtl::OUString const & rTheSegment, + inline bool Append(OUString const & rTheSegment, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) { return appendSegment(rTheSegment, false, eMechanism, eCharset); } @@ -1143,36 +1143,36 @@ public: // OBSOLETE File URLs: - rtl::OUString PathToFileName() const; + OUString PathToFileName() const; - rtl::OUString GetFull() const; + OUString GetFull() const; - rtl::OUString GetPath() const; + OUString GetPath() const; - void SetBase(rtl::OUString const & rTheBase); + void SetBase(OUString const & rTheBase); - rtl::OUString GetBase() const; + OUString GetBase() const; - void SetName(rtl::OUString const & rTheName, + void SetName(OUString const & rTheName, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline rtl::OUString GetName(DecodeMechanism eMechanism = DECODE_TO_IURI, + inline OUString GetName(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return GetLastName(eMechanism, eCharset); } - void SetExtension(rtl::OUString const & rTheExtension, + void SetExtension(OUString const & rTheExtension, EncodeMechanism eMechanism = WAS_ENCODED, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline rtl::OUString GetExtension( + inline OUString GetExtension( DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return GetFileExtension(eMechanism, eCharset); } - rtl::OUString CutExtension(DecodeMechanism eMechanism = DECODE_TO_IURI, + OUString CutExtension(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); bool IsCaseSensitive() const; @@ -1203,24 +1203,24 @@ private: inline sal_Int32 clear(); - inline sal_Int32 set(rtl::OUStringBuffer & rString, - rtl::OUString const & rSubString, + inline sal_Int32 set(OUStringBuffer & rString, + OUString const & rSubString, sal_Int32 nTheBegin); - inline sal_Int32 set(rtl::OUString & rString, - rtl::OUString const & rSubString); + inline sal_Int32 set(OUString & rString, + OUString const & rSubString); - inline sal_Int32 set(rtl::OUStringBuffer & rString, - rtl::OUString const & rSubString); + inline sal_Int32 set(OUStringBuffer & rString, + OUString const & rSubString); inline void operator +=(sal_Int32 nDelta); int compare(SubString const & rOther, - rtl::OUStringBuffer const & rThisString, - rtl::OUStringBuffer const & rOtherString) const; + OUStringBuffer const & rThisString, + OUStringBuffer const & rOtherString) const; }; - rtl::OUStringBuffer m_aAbsURIRef; + OUStringBuffer m_aAbsURIRef; SubString m_aScheme; SubString m_aUser; SubString m_aAuth; @@ -1235,35 +1235,35 @@ private: TOOLS_DLLPRIVATE void setInvalid(); bool setAbsURIRef( - rtl::OUString const & rTheAbsURIRef, bool bOctets, + OUString const & rTheAbsURIRef, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bSmart, FSysStyle eStyle); // Relative URLs: bool convertRelToAbs( - rtl::OUString const & rTheRelURIRef, bool bOctets, + OUString const & rTheRelURIRef, bool bOctets, INetURLObject & rTheAbsURIRef, bool & rWasAbsolute, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bIgnoreFragment, bool bSmart, bool bRelativeNonURIs, FSysStyle eStyle) const; bool convertAbsToRel( - rtl::OUString const & rTheAbsURIRef, bool bOctets, - rtl::OUString & rTheRelURIRef, EncodeMechanism eEncodeMechanism, + OUString const & rTheAbsURIRef, bool bOctets, + OUString & rTheRelURIRef, EncodeMechanism eEncodeMechanism, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset, FSysStyle eStyle) const; // External URLs: static bool convertIntToExt( - rtl::OUString const & rTheIntURIRef, bool bOctets, - rtl::OUString & rTheExtURIRef, DecodeMechanism eDecodeMechanism, + OUString const & rTheIntURIRef, bool bOctets, + OUString & rTheExtURIRef, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset); static bool convertExtToInt( - rtl::OUString const & rTheExtURIRef, bool bOctets, - rtl::OUString & rTheIntURIRef, DecodeMechanism eDecodeMechanism, + OUString const & rTheExtURIRef, bool bOctets, + OUString & rTheIntURIRef, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset); // Scheme: @@ -1287,28 +1287,28 @@ private: // User Info: bool setUser( - rtl::OUString const & rTheUser, bool bOctets, + OUString const & rTheUser, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset); bool clearPassword(); bool setPassword( - rtl::OUString const & rThePassword, bool bOctets, + OUString const & rThePassword, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset); // Host and Port: TOOLS_DLLPRIVATE static bool parseHost( sal_Unicode const *& rBegin, sal_Unicode const * pEnd, - rtl::OUString & rCanonic); + OUString & rCanonic); TOOLS_DLLPRIVATE static bool parseHostOrNetBiosName( sal_Unicode const * pBegin, sal_Unicode const * pEnd, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, - bool bNetBiosName, rtl::OUStringBuffer* pCanonic); + bool bNetBiosName, OUStringBuffer* pCanonic); bool setHost( - rtl::OUString const & rTheHost, bool bOctets, + OUString const & rTheHost, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset); // Path: @@ -1319,10 +1319,10 @@ private: rtl_TextEncoding eCharset, bool bSkippedInitialSlash, sal_uInt32 nSegmentDelimiter, sal_uInt32 nAltSegmentDelimiter, sal_uInt32 nQueryDelimiter, sal_uInt32 nFragmentDelimiter, - rtl::OUStringBuffer &rSynPath); + OUStringBuffer &rSynPath); bool setPath( - rtl::OUString const & rThePath, bool bOctets, + OUString const & rThePath, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset); // Hierarchical Path: @@ -1330,14 +1330,14 @@ private: TOOLS_DLLPRIVATE bool checkHierarchical() const; bool appendSegment( - rtl::OUString const & rTheSegment, bool bOctets, + OUString const & rTheSegment, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset); TOOLS_DLLPRIVATE SubString getSegment( sal_Int32 nIndex, bool bIgnoreFinalSlash) const; bool insertName( - rtl::OUString const & rTheName, bool bOctets, bool bAppendFinalSlash, + OUString const & rTheName, bool bOctets, bool bAppendFinalSlash, sal_Int32 nIndex, bool bIgnoreFinalSlash, EncodeMechanism eMechanism, rtl_TextEncoding eCharset); @@ -1346,7 +1346,7 @@ private: bool clearQuery(); bool setQuery( - rtl::OUString const & rTheQuery, bool bOctets, + OUString const & rTheQuery, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset); // Fragment: @@ -1354,7 +1354,7 @@ private: bool clearFragment(); bool setFragment( - rtl::OUString const & rTheMark, bool bOctets, + OUString const & rTheMark, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset); // FILE URLs: @@ -1363,9 +1363,9 @@ private: // Coding: - static inline rtl::OUString extend(const rtl::OString& rOctets) + static inline OUString extend(const OString& rOctets) { - return rtl::OStringToOUString(rOctets, RTL_TEXTENCODING_ISO_8859_1); + return OStringToOUString(rOctets, RTL_TEXTENCODING_ISO_8859_1); } static inline sal_Char getEscapePrefix(INetProtocol eTheScheme) @@ -1375,24 +1375,24 @@ private: { return getEscapePrefix(m_eScheme); } TOOLS_DLLPRIVATE static inline void appendEscape( - rtl::OUStringBuffer & rTheText, sal_Char cEscapePrefix, + OUStringBuffer & rTheText, sal_Char cEscapePrefix, sal_uInt32 nOctet); - static rtl::OUString encodeText( + static OUString encodeText( sal_Unicode const * pBegin, sal_Unicode const * pEnd, bool bOctets, Part ePart, sal_Char cEscapePrefix, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bKeepVisibleEscapes); - static inline rtl::OUString encodeText( - rtl::OUString const & rTheText, bool bOctets, Part ePart, + static inline OUString encodeText( + OUString const & rTheText, bool bOctets, Part ePart, sal_Char cEscapePrefix, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bKeepVisibleEscapes); - static rtl::OUString decode( + static OUString decode( sal_Unicode const * pBegin, sal_Unicode const * pEnd, sal_Char cEscapePrefix, DecodeMechanism, rtl_TextEncoding eCharset); - inline rtl::OUString decode( + inline OUString decode( SubString const & rSubString, sal_Char cEscapePrefix, DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const; @@ -1406,7 +1406,7 @@ private: }; // static -inline rtl::OUString INetURLObject::encodeText(rtl::OUString const & rTheText, +inline OUString INetURLObject::encodeText(OUString const & rTheText, bool bOctets, Part ePart, sal_Char cEscapePrefix, EncodeMechanism eMechanism, @@ -1419,7 +1419,7 @@ inline rtl::OUString INetURLObject::encodeText(rtl::OUString const & rTheText, bKeepVisibleEscapes); } -inline rtl::OUString INetURLObject::decode(SubString const & rSubString, +inline OUString INetURLObject::decode(SubString const & rSubString, sal_Char cEscapePrefix, DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const @@ -1428,10 +1428,10 @@ inline rtl::OUString INetURLObject::decode(SubString const & rSubString, decode(m_aAbsURIRef.getStr() + rSubString.getBegin(), m_aAbsURIRef.getStr() + rSubString.getEnd(), cEscapePrefix, eMechanism, eCharset) : - rtl::OUString(); + OUString(); } -inline INetURLObject::INetURLObject(const rtl::OString& rTheAbsURIRef, +inline INetURLObject::INetURLObject(const OString& rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset): m_eScheme(INET_PROT_NOT_VALID), m_eSmartScheme(INET_PROT_HTTP) @@ -1440,7 +1440,7 @@ inline INetURLObject::INetURLObject(const rtl::OString& rTheAbsURIRef, FSysStyle(0)); } -inline INetURLObject::INetURLObject(rtl::OUString const & rTheAbsURIRef, +inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset): m_eScheme(INET_PROT_NOT_VALID), m_eSmartScheme(INET_PROT_HTTP) @@ -1449,7 +1449,7 @@ inline INetURLObject::INetURLObject(rtl::OUString const & rTheAbsURIRef, FSysStyle(0)); } -inline bool INetURLObject::SetURL(const rtl::OString& rTheAbsURIRef, +inline bool INetURLObject::SetURL(const OString& rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1457,7 +1457,7 @@ inline bool INetURLObject::SetURL(const rtl::OString& rTheAbsURIRef, false, FSysStyle(0)); } -inline bool INetURLObject::SetURL(rtl::OUString const & rTheAbsURIRef, +inline bool INetURLObject::SetURL(OUString const & rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1465,7 +1465,7 @@ inline bool INetURLObject::SetURL(rtl::OUString const & rTheAbsURIRef, FSysStyle(0)); } -inline INetURLObject::INetURLObject(rtl::OUString const & rTheAbsURIRef, +inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef, INetProtocol eTheSmartScheme, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, @@ -1475,7 +1475,7 @@ inline INetURLObject::INetURLObject(rtl::OUString const & rTheAbsURIRef, setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, true, eStyle); } -inline bool INetURLObject::SetSmartURL(const rtl::OString& rTheAbsURIRef, +inline bool INetURLObject::SetSmartURL(const OString& rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, FSysStyle eStyle) @@ -1484,7 +1484,7 @@ inline bool INetURLObject::SetSmartURL(const rtl::OString& rTheAbsURIRef, true, eStyle); } -inline bool INetURLObject::SetSmartURL(rtl::OUString const & rTheAbsURIRef, +inline bool INetURLObject::SetSmartURL(OUString const & rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, FSysStyle eStyle) @@ -1494,7 +1494,7 @@ inline bool INetURLObject::SetSmartURL(rtl::OUString const & rTheAbsURIRef, } inline INetURLObject -INetURLObject::smartRel2Abs(const rtl::OString& rTheRelURIRef, +INetURLObject::smartRel2Abs(const OString& rTheRelURIRef, bool & rWasAbsolute, bool bIgnoreFragment, EncodeMechanism eMechanism, @@ -1510,7 +1510,7 @@ INetURLObject::smartRel2Abs(const rtl::OString& rTheRelURIRef, } inline INetURLObject -INetURLObject::smartRel2Abs(rtl::OUString const & rTheRelURIRef, +INetURLObject::smartRel2Abs(OUString const & rTheRelURIRef, bool & rWasAbsolute, bool bIgnoreFragment, EncodeMechanism eMechanism, @@ -1525,7 +1525,7 @@ INetURLObject::smartRel2Abs(rtl::OUString const & rTheRelURIRef, return aTheAbsURIRef; } -inline bool INetURLObject::GetNewAbsURL(const rtl::OString& rTheRelURIRef, +inline bool INetURLObject::GetNewAbsURL(const OString& rTheRelURIRef, INetURLObject * pTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, @@ -1543,7 +1543,7 @@ inline bool INetURLObject::GetNewAbsURL(const rtl::OString& rTheRelURIRef, return true; } -inline bool INetURLObject::GetNewAbsURL(rtl::OUString const & rTheRelURIRef, +inline bool INetURLObject::GetNewAbsURL(OUString const & rTheRelURIRef, INetURLObject * pTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, @@ -1562,14 +1562,14 @@ inline bool INetURLObject::GetNewAbsURL(rtl::OUString const & rTheRelURIRef, } // static -inline rtl::OUString INetURLObject::GetRelURL(const rtl::OString& rTheBaseURIRef, - const rtl::OString& rTheAbsURIRef, +inline OUString INetURLObject::GetRelURL(const OString& rTheBaseURIRef, + const OString& rTheAbsURIRef, EncodeMechanism eEncodeMechanism, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset, FSysStyle eStyle) { - rtl::OUString aTheRelURIRef; + OUString aTheRelURIRef; INetURLObject(rTheBaseURIRef, eEncodeMechanism, eCharset). convertAbsToRel(extend(rTheAbsURIRef), true, aTheRelURIRef, eEncodeMechanism, eDecodeMechanism, eCharset, eStyle); @@ -1577,14 +1577,14 @@ inline rtl::OUString INetURLObject::GetRelURL(const rtl::OString& rTheBaseURIRef } // static -inline rtl::OUString INetURLObject::GetRelURL(rtl::OUString const & rTheBaseURIRef, - rtl::OUString const & rTheAbsURIRef, +inline OUString INetURLObject::GetRelURL(OUString const & rTheBaseURIRef, + OUString const & rTheAbsURIRef, EncodeMechanism eEncodeMechanism, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset, FSysStyle eStyle) { - rtl::OUString aTheRelURIRef; + OUString aTheRelURIRef; INetURLObject(rTheBaseURIRef, eEncodeMechanism, eCharset). convertAbsToRel(rTheAbsURIRef, false, aTheRelURIRef, eEncodeMechanism, eDecodeMechanism, eCharset, eStyle); @@ -1592,13 +1592,13 @@ inline rtl::OUString INetURLObject::GetRelURL(rtl::OUString const & rTheBaseURIR } // static -inline bool INetURLObject::translateToExternal(const rtl::OString& rTheIntURIRef, - rtl::OUString & rTheExtURIRef, +inline bool INetURLObject::translateToExternal(const OString& rTheIntURIRef, + OUString & rTheExtURIRef, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset) { - rtl::OUString aTheExtURIRef; + OUString aTheExtURIRef; bool bRet = convertIntToExt(extend(rTheIntURIRef), true, aTheExtURIRef, eDecodeMechanism, eCharset); rTheExtURIRef = aTheExtURIRef; @@ -1606,9 +1606,9 @@ inline bool INetURLObject::translateToExternal(const rtl::OString& rTheIntURIRef } // static -inline bool INetURLObject::translateToExternal(rtl::OUString const & +inline bool INetURLObject::translateToExternal(OUString const & rTheIntURIRef, - rtl::OUString & rTheExtURIRef, + OUString & rTheExtURIRef, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset) @@ -1618,14 +1618,14 @@ inline bool INetURLObject::translateToExternal(rtl::OUString const & } // static -inline bool INetURLObject::translateToInternal(const rtl::OString& +inline bool INetURLObject::translateToInternal(const OString& rTheExtURIRef, - rtl::OUString & rTheIntURIRef, + OUString & rTheIntURIRef, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset) { - rtl::OUString aTheIntURIRef; + OUString aTheIntURIRef; bool bRet = convertExtToInt(extend(rTheExtURIRef), true, aTheIntURIRef, eDecodeMechanism, eCharset); rTheIntURIRef = aTheIntURIRef; @@ -1633,9 +1633,9 @@ inline bool INetURLObject::translateToInternal(const rtl::OString& } // static -inline bool INetURLObject::translateToInternal(rtl::OUString const & +inline bool INetURLObject::translateToInternal(OUString const & rTheExtURIRef, - rtl::OUString & rTheIntURIRef, + OUString & rTheIntURIRef, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset) @@ -1644,7 +1644,7 @@ inline bool INetURLObject::translateToInternal(rtl::OUString const & eDecodeMechanism, eCharset); } -inline bool INetURLObject::SetPass(const rtl::OString& rThePassword, +inline bool INetURLObject::SetPass(const OString& rThePassword, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1653,7 +1653,7 @@ inline bool INetURLObject::SetPass(const rtl::OString& rThePassword, setPassword(extend(rThePassword), true, eMechanism, eCharset); } -inline bool INetURLObject::SetPass(rtl::OUString const & rThePassword, +inline bool INetURLObject::SetPass(OUString const & rThePassword, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1662,8 +1662,8 @@ inline bool INetURLObject::SetPass(rtl::OUString const & rThePassword, setPassword(rThePassword, false, eMechanism, eCharset); } -inline bool INetURLObject::SetUserAndPass(const rtl::OString& rTheUser, - const rtl::OString& rThePassword, +inline bool INetURLObject::SetUserAndPass(const OString& rTheUser, + const OString& rThePassword, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1674,8 +1674,8 @@ inline bool INetURLObject::SetUserAndPass(const rtl::OString& rTheUser, eCharset)); } -inline bool INetURLObject::SetUserAndPass(rtl::OUString const & rTheUser, - rtl::OUString const & rThePassword, +inline bool INetURLObject::SetUserAndPass(OUString const & rTheUser, + OUString const & rThePassword, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1685,7 +1685,7 @@ inline bool INetURLObject::SetUserAndPass(rtl::OUString const & rTheUser, setPassword(rThePassword, false, eMechanism, eCharset)); } -inline bool INetURLObject::insertName(rtl::OUString const & rTheName, +inline bool INetURLObject::insertName(OUString const & rTheName, bool bAppendFinalSlash, sal_Int32 nIndex, bool bIgnoreFinalSlash, @@ -1696,7 +1696,7 @@ inline bool INetURLObject::insertName(rtl::OUString const & rTheName, bIgnoreFinalSlash, eMechanism, eCharset); } -inline bool INetURLObject::SetParam(const rtl::OString& rTheQuery, +inline bool INetURLObject::SetParam(const OString& rTheQuery, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1705,7 +1705,7 @@ inline bool INetURLObject::SetParam(const rtl::OString& rTheQuery, setQuery(extend(rTheQuery), true, eMechanism, eCharset); } -inline bool INetURLObject::SetParam(rtl::OUString const & rTheQuery, +inline bool INetURLObject::SetParam(OUString const & rTheQuery, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1714,7 +1714,7 @@ inline bool INetURLObject::SetParam(rtl::OUString const & rTheQuery, setQuery(rTheQuery, false, eMechanism, eCharset); } -inline bool INetURLObject::SetMark(const rtl::OString& rTheFragment, +inline bool INetURLObject::SetMark(const OString& rTheFragment, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1723,7 +1723,7 @@ inline bool INetURLObject::SetMark(const rtl::OString& rTheFragment, setFragment(extend(rTheFragment), true, eMechanism, eCharset); } -inline bool INetURLObject::SetMark(rtl::OUString const & rTheFragment, +inline bool INetURLObject::SetMark(OUString const & rTheFragment, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1732,7 +1732,7 @@ inline bool INetURLObject::SetMark(rtl::OUString const & rTheFragment, setFragment(rTheFragment, false, eMechanism, eCharset); } -inline INetURLObject::INetURLObject(rtl::OUString const & rFSysPath, +inline INetURLObject::INetURLObject(OUString const & rFSysPath, FSysStyle eStyle): m_eScheme(INET_PROT_NOT_VALID), m_eSmartScheme(INET_PROT_HTTP) { @@ -1740,7 +1740,7 @@ inline INetURLObject::INetURLObject(rtl::OUString const & rFSysPath, } // static -inline rtl::OUString INetURLObject::encode(const rtl::OString& rText, Part ePart, +inline OUString INetURLObject::encode(const OString& rText, Part ePart, sal_Char cEscapePrefix, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) @@ -1750,7 +1750,7 @@ inline rtl::OUString INetURLObject::encode(const rtl::OString& rText, Part ePart } // static -inline rtl::OUString INetURLObject::encode(rtl::OUString const & rText, Part ePart, +inline OUString INetURLObject::encode(OUString const & rText, Part ePart, sal_Char cEscapePrefix, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) @@ -1760,7 +1760,7 @@ inline rtl::OUString INetURLObject::encode(rtl::OUString const & rText, Part ePa } // static -inline rtl::OUString INetURLObject::decode(rtl::OUString const & rText, +inline OUString INetURLObject::decode(OUString const & rText, sal_Char cEscapePrefix, DecodeMechanism eMechanism, rtl_TextEncoding eCharset) @@ -1769,7 +1769,7 @@ inline rtl::OUString INetURLObject::decode(rtl::OUString const & rText, cEscapePrefix, eMechanism, eCharset); } -inline rtl::OUString INetURLObject::decode(rtl::OUStringBuffer const & rText, +inline OUString INetURLObject::decode(OUStringBuffer const & rText, sal_Char cEscapePrefix, DecodeMechanism eMechanism, rtl_TextEncoding eCharset) diff --git a/tools/inc/tools/wldcrd.hxx b/tools/inc/tools/wldcrd.hxx index cf82984cfa52..8991b8882474 100644 --- a/tools/inc/tools/wldcrd.hxx +++ b/tools/inc/tools/wldcrd.hxx @@ -26,7 +26,7 @@ class TOOLS_DLLPUBLIC WildCard { private: - rtl::OString aWildString; + OString aWildString; char cSepSymbol; sal_uInt16 ImpMatch( const char *pWild, const char *pStr ) const; @@ -38,20 +38,20 @@ public: { } - WildCard(const rtl::OUString& rWildCard, const char cSeparator = '\0') - : aWildString(rtl::OUStringToOString(rWildCard, osl_getThreadTextEncoding())) + WildCard(const OUString& rWildCard, const char cSeparator = '\0') + : aWildString(OUStringToOString(rWildCard, osl_getThreadTextEncoding())) , cSepSymbol(cSeparator) { } - const rtl::OUString getGlob() const + const OUString getGlob() const { - return rtl::OStringToOUString(aWildString, osl_getThreadTextEncoding()); + return OStringToOUString(aWildString, osl_getThreadTextEncoding()); } - void setGlob(const rtl::OUString& rString) + void setGlob(const OUString& rString) { - aWildString = rtl::OUStringToOString(rString, osl_getThreadTextEncoding()); + aWildString = OUStringToOString(rString, osl_getThreadTextEncoding()); } sal_Bool Matches( const String& rStr ) const; diff --git a/tools/qa/cppunit/test_inetmime.cxx b/tools/qa/cppunit/test_inetmime.cxx index 06d8d4952f08..5770ff31ba15 100644 --- a/tools/qa/cppunit/test_inetmime.cxx +++ b/tools/qa/cppunit/test_inetmime.cxx @@ -41,7 +41,7 @@ namespace bool Test::testDecode(char const * input, char const * expected) { - rtl::OUString result = INetMIME::decodeHeaderFieldBody( + OUString result = INetMIME::decodeHeaderFieldBody( INetMIME::HEADER_FIELD_TEXT, input); return result.equalsAscii(expected); } diff --git a/tools/qa/cppunit/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx index af232c0bcb1e..f20ffb32c7a8 100644 --- a/tools/qa/cppunit/test_reversemap.cxx +++ b/tools/qa/cppunit/test_reversemap.cxx @@ -80,14 +80,14 @@ namespace //Some slots are unused, so don't map to private, just set them to 'X' sal_uInt32 convertFlags = OUSTRING_TO_OSTRING_CVTFLAGS ^ RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE; - rtl::OUString sOrigText(&aAllChars[0], aAllChars.size(), eEncoding, convertFlags); + OUString sOrigText(&aAllChars[0], aAllChars.size(), eEncoding, convertFlags); sOrigText = sOrigText.replace( 0xfffd, 'X' ); //Should clearly be equal sal_Int32 nLength = aAllChars.size(); CPPUNIT_ASSERT_EQUAL(sOrigText.getLength(), nLength); - rtl::OUString sFinalText; + OUString sFinalText; //Split up in chunks of the same encoding returned by //getBestMSEncodingByChar, convert to it, and back @@ -99,16 +99,16 @@ namespace rtl_TextEncoding eCurrEncoding = getBestMSEncodingByChar(pStr[i]); if (eCurrEncoding != ePrevEncoding) { - rtl::OString aChunk(pStr+nChunkStart, i-nChunkStart, ePrevEncoding); - sFinalText += rtl::OStringToOUString(aChunk, ePrevEncoding); + OString aChunk(pStr+nChunkStart, i-nChunkStart, ePrevEncoding); + sFinalText += OStringToOUString(aChunk, ePrevEncoding); nChunkStart = i; } ePrevEncoding = eCurrEncoding; } if (nChunkStart < 255) { - rtl::OString aChunk(pStr+nChunkStart, 255-nChunkStart, ePrevEncoding); - sFinalText += rtl::OStringToOUString(aChunk, ePrevEncoding); + OString aChunk(pStr+nChunkStart, 255-nChunkStart, ePrevEncoding); + sFinalText += OStringToOUString(aChunk, ePrevEncoding); } //Final text should be the same as original diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx index a65b6be290cb..d1029ca82e63 100644 --- a/tools/qa/cppunit/test_stream.cxx +++ b/tools/qa/cppunit/test_stream.cxx @@ -154,18 +154,18 @@ namespace char foo[] = "foobar"; SvMemoryStream aMemStream(foo, SAL_N_ELEMENTS(foo)-1, STREAM_READ); - rtl::OString aOne = read_uInt8s_ToOString(aMemStream, 3); + OString aOne = read_uInt8s_ToOString(aMemStream, 3); CPPUNIT_ASSERT(aOne == "foo"); - rtl::OString aTwo = read_uInt8s_ToOString(aMemStream, 3); + OString aTwo = read_uInt8s_ToOString(aMemStream, 3); CPPUNIT_ASSERT(aTwo == "bar"); - rtl::OString aThree = read_uInt8s_ToOString(aMemStream, 3); + OString aThree = read_uInt8s_ToOString(aMemStream, 3); CPPUNIT_ASSERT(aThree.isEmpty()); aMemStream.Seek(0); - rtl::OString aFour = read_uInt8s_ToOString(aMemStream, 100); + OString aFour = read_uInt8s_ToOString(aMemStream, 100); CPPUNIT_ASSERT(aFour == foo); } @@ -174,7 +174,7 @@ namespace char foo[] = "foobar"; SvMemoryStream aMemStream(foo, SAL_N_ELEMENTS(foo)-1, STREAM_READ); - rtl::OString aOne = read_zeroTerminated_uInt8s_ToOString(aMemStream); + OString aOne = read_zeroTerminated_uInt8s_ToOString(aMemStream); CPPUNIT_ASSERT(aOne == "foobar"); CPPUNIT_ASSERT(!aMemStream.good()); CPPUNIT_ASSERT(!aMemStream.bad()); @@ -182,7 +182,7 @@ namespace aMemStream.Seek(0); foo[3] = 0; - rtl::OString aTwo = read_zeroTerminated_uInt8s_ToOString(aMemStream); + OString aTwo = read_zeroTerminated_uInt8s_ToOString(aMemStream); CPPUNIT_ASSERT(aTwo == "foo"); CPPUNIT_ASSERT(aMemStream.good()); } @@ -192,7 +192,7 @@ namespace char foo[] = "\3foobar"; SvMemoryStream aMemStream(foo, SAL_N_ELEMENTS(foo)-1, STREAM_READ); - rtl::OString aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); + OString aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); CPPUNIT_ASSERT(aFoo == "foo"); CPPUNIT_ASSERT(aMemStream.good()); CPPUNIT_ASSERT(!aMemStream.bad()); @@ -234,7 +234,7 @@ namespace char foo[] = "foo\nbar\n\n"; SvMemoryStream aMemStream(foo, SAL_N_ELEMENTS(foo)-1, STREAM_READ); - rtl::OString aFoo; + OString aFoo; sal_Bool bRet; bRet = aMemStream.ReadLine(aFoo); diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index c53f2b18fdb7..ded7f6e5eeb8 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -33,7 +33,7 @@ #include #include "tools/urlobj.hxx" -#define OUSTR_TO_STDSTR( oustr ) std::string( rtl::OUStringToOString( oustr, RTL_TEXTENCODING_ASCII_US ).getStr() ) +#define OUSTR_TO_STDSTR( oustr ) std::string( OUStringToOString( oustr, RTL_TEXTENCODING_ASCII_US ).getStr() ) CPPUNIT_NS_BEGIN diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx index 46f1bedd53bf..1aaac1863681 100644 --- a/tools/source/fsys/tempfile.cxx +++ b/tools/source/fsys/tempfile.cxx @@ -30,7 +30,7 @@ using namespace osl; -namespace { struct TempNameBase_Impl : public rtl::Static< ::rtl::OUString, TempNameBase_Impl > {}; } +namespace { struct TempNameBase_Impl : public rtl::Static< OUString, TempNameBase_Impl > {}; } struct TempFile_Impl { @@ -40,7 +40,7 @@ struct TempFile_Impl OUString ConstructTempDir_Impl() { // use system directory - ::rtl::OUString& rTempNameBase_Impl = TempNameBase_Impl::get(); + OUString& rTempNameBase_Impl = TempNameBase_Impl::get(); if ( rTempNameBase_Impl.isEmpty() ) osl::FileBase::getTempDirURL( rTempNameBase_Impl ); OUString aName = rTempNameBase_Impl; @@ -59,14 +59,14 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru // ER 13.07.00 why not radix 36 [0-9A-Z] ?!? const unsigned nRadix = 26; String aName( rName ); - aName += rtl::OUString("sv"); + aName += OUString("sv"); rName.Erase(); static unsigned long u = Time::GetSystemTicks(); for ( unsigned long nOld = u; ++u != nOld; ) { u %= (nRadix*nRadix*nRadix); - rtl::OUString aTmp = rtl::OUStringBuffer(aName). + OUString aTmp = OUStringBuffer(aName). append((sal_Int32)(unsigned)u, nRadix). append(".tmp"). makeStringAndClear(); @@ -140,13 +140,13 @@ TempFile::TempFile( const String& rLeadingChars, const String* pExtension ) aName += rLeadingChars; for ( sal_Int32 i=0;; i++ ) { - rtl::OUStringBuffer aTmpBuffer(aName); + OUStringBuffer aTmpBuffer(aName); aTmpBuffer.append(i); if ( pExtension ) aTmpBuffer.append(*pExtension); else aTmpBuffer.append(".tmp"); - rtl::OUString aTmp = aTmpBuffer.makeStringAndClear(); + OUString aTmp = aTmpBuffer.makeStringAndClear(); File aFile( aTmp ); FileBase::RC err = aFile.open(osl_File_OpenFlag_Create); @@ -174,7 +174,7 @@ TempFile::~TempFile() String TempFile::GetName() const { - rtl::OUString aTmp; + OUString aTmp; aTmp = pImp->aName; return aTmp; } diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index b839e6deb515..93d4febe4bab 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -252,17 +252,17 @@ inline sal_Int32 INetURLObject::SubString::clear() return nDelta; } -inline sal_Int32 INetURLObject::SubString::set(rtl::OUStringBuffer & rString, - rtl::OUString const & rSubString) +inline sal_Int32 INetURLObject::SubString::set(OUStringBuffer & rString, + OUString const & rSubString) { - rtl::OUString sTemp(rString.makeStringAndClear()); + OUString sTemp(rString.makeStringAndClear()); sal_Int32 nDelta = set(sTemp, rSubString); rString.append(sTemp); return nDelta; } -inline sal_Int32 INetURLObject::SubString::set(rtl::OUString & rString, - rtl::OUString const & rSubString) +inline sal_Int32 INetURLObject::SubString::set(OUString & rString, + OUString const & rSubString) { sal_Int32 nDelta = rSubString.getLength() - m_nLength; @@ -272,8 +272,8 @@ inline sal_Int32 INetURLObject::SubString::set(rtl::OUString & rString, return nDelta; } -inline sal_Int32 INetURLObject::SubString::set(rtl::OUStringBuffer & rString, - rtl::OUString const & rSubString, +inline sal_Int32 INetURLObject::SubString::set(OUStringBuffer & rString, + OUString const & rSubString, sal_Int32 nTheBegin) { m_nBegin = nTheBegin; @@ -287,8 +287,8 @@ inline void INetURLObject::SubString::operator +=(sal_Int32 nDelta) } int INetURLObject::SubString::compare(SubString const & rOther, - rtl::OUStringBuffer const & rThisString, - rtl::OUStringBuffer const & rOtherString) const + OUStringBuffer const & rThisString, + OUStringBuffer const & rOtherString) const { sal_Int32 len = std::min(m_nLength, rOther.m_nLength); sal_Unicode const * p1 = rThisString.getStr() + m_nBegin; @@ -416,7 +416,7 @@ inline INetURLObject::SchemeInfo const & INetURLObject::getSchemeInfo() const } // static -inline void INetURLObject::appendEscape(rtl::OUStringBuffer & rTheText, +inline void INetURLObject::appendEscape(OUStringBuffer & rTheText, sal_Char cEscapePrefix, sal_uInt32 nOctet) { @@ -625,7 +625,7 @@ INetURLObject::FSysStyle guessFSysStyleByCounting(sal_Unicode const * pBegin, INetURLObject::FSYS_DOS : INetURLObject::FSYS_MAC; } -rtl::OUString parseScheme( +OUString parseScheme( sal_Unicode const ** begin, sal_Unicode const * end, sal_uInt32 fragmentDelimiter) { @@ -641,18 +641,18 @@ rtl::OUString parseScheme( if (end - p > 1 && p[0] == ':' && p[1] != fragmentDelimiter && p - *begin >= 2) { - rtl::OUString scheme( - rtl::OUString(*begin, p - *begin).toAsciiLowerCase()); + OUString scheme( + OUString(*begin, p - *begin).toAsciiLowerCase()); *begin = p + 1; return scheme; } } - return rtl::OUString(); + return OUString(); } } -bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, +bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, @@ -666,7 +666,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, sal_uInt32 nFragmentDelimiter = '#'; - rtl::OUStringBuffer aSynAbsURIRef; + OUStringBuffer aSynAbsURIRef; // Parse : sal_Unicode const * p = pPos; @@ -676,7 +676,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, pPos = p; m_eScheme = pPrefix->m_eScheme; - rtl::OUString sTemp(rtl::OUString::createFromAscii(pPrefix->m_eKind + OUString sTemp(OUString::createFromAscii(pPrefix->m_eKind >= PrefixInfo::EXTERNAL ? pPrefix->m_pTranslatedPrefix : pPrefix->m_pPrefix)); @@ -795,7 +795,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, } } - rtl::OUString aSynScheme; + OUString aSynScheme; if (m_eScheme == INET_PROT_NOT_VALID) { sal_Unicode const * p1 = pPos; aSynScheme = parseScheme(&p1, pEnd, nFragmentDelimiter); @@ -819,7 +819,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, } if (m_eScheme != INET_PROT_GENERIC) { - aSynScheme = rtl::OUString::createFromAscii(getSchemeInfo().m_pScheme); + aSynScheme = OUString::createFromAscii(getSchemeInfo().m_pScheme); } m_aScheme.set(aSynAbsURIRef, aSynScheme, aSynAbsURIRef.getLength()); aSynAbsURIRef.append(sal_Unicode(':')); @@ -850,7 +850,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, return false; } aSynAbsURIRef.append("//"); - rtl::OUStringBuffer aSynAuthority; + OUStringBuffer aSynAuthority; while (pPos < pEnd && *pPos != '/' && *pPos != '?' && *pPos != nFragmentDelimiter) @@ -876,7 +876,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, { pPos += 2; aSynAbsURIRef.append("//"); - rtl::OUStringBuffer aSynAuthority; + OUStringBuffer aSynAuthority; while (pPos < pEnd && *pPos != '/' && *pPos != '?' && *pPos != nFragmentDelimiter) @@ -920,7 +920,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, return false; } aSynAbsURIRef.append("//"); - rtl::OUStringBuffer aSynUser; + OUStringBuffer aSynUser; bool bHasUser = false; while (pPos < pEnd && *pPos != '@' @@ -938,7 +938,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, bHasUser = *pPos == '@'; } - rtl::OUStringBuffer aSynAuthority; + OUStringBuffer aSynAuthority; if ( !bHasUser ) { aSynAuthority = aSynUser; @@ -1232,7 +1232,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, bool bSupportsAuth = !bSupportsPassword && getSchemeInfo().m_bAuth; bool bHasAuth = false; - rtl::OUStringBuffer aSynUser; + OUStringBuffer aSynUser; sal_Unicode const * p1 = pUserInfoBegin; while (p1 < pUserInfoEnd) { @@ -1270,7 +1270,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, if (bSupportsPassword) { aSynAbsURIRef.append(sal_Unicode(':')); - rtl::OUStringBuffer aSynAuth; + OUStringBuffer aSynAuth; while (p1 < pUserInfoEnd) { EscapeType eEscapeType; @@ -1287,7 +1287,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, else { aSynAbsURIRef.append(";AUTH="); - rtl::OUStringBuffer aSynAuth; + OUStringBuffer aSynAuth; while (p1 < pUserInfoEnd) { EscapeType eEscapeType; @@ -1350,7 +1350,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, } break; } - rtl::OUStringBuffer aSynHost; + OUStringBuffer aSynHost; if (!parseHostOrNetBiosName( pHostPortBegin, pPort, bOctets, eMechanism, eCharset, bNetBiosName, &aSynHost)) @@ -1364,14 +1364,14 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, { aSynAbsURIRef.append(sal_Unicode(':')); m_aPort.set(aSynAbsURIRef, - rtl::OUString(pPort + 1, pHostPortEnd - (pPort + 1)), + OUString(pPort + 1, pHostPortEnd - (pPort + 1)), aSynAbsURIRef.getLength()); } } } // Parse - rtl::OUStringBuffer aSynPath; + OUStringBuffer aSynPath; if (!parsePath(m_eScheme, &pPos, pEnd, bOctets, eMechanism, eCharset, bSkippedInitialSlash, nSegmentDelimiter, nAltSegmentDelimiter, @@ -1388,7 +1388,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, if (getSchemeInfo().m_bQuery && pPos < pEnd && *pPos == '?') { aSynAbsURIRef.append(sal_Unicode('?')); - rtl::OUStringBuffer aSynQuery; + OUStringBuffer aSynQuery; for (++pPos; pPos < pEnd && *pPos != nFragmentDelimiter;) { EscapeType eEscapeType; @@ -1405,7 +1405,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, if (pPos < pEnd && *pPos == nFragmentDelimiter) { aSynAbsURIRef.append(sal_Unicode(nFragmentDelimiter)); - rtl::OUStringBuffer aSynFragment; + OUStringBuffer aSynFragment; for (++pPos; pPos < pEnd;) { EscapeType eEscapeType; @@ -1450,7 +1450,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, } void INetURLObject::changeScheme(INetProtocol eTargetScheme) { - ::rtl::OUString aTmpStr=m_aAbsURIRef.makeStringAndClear(); + OUString aTmpStr=m_aAbsURIRef.makeStringAndClear(); int oldSchemeLen=strlen(getSchemeInfo().m_pScheme); m_eScheme=eTargetScheme; int newSchemeLen=strlen(getSchemeInfo().m_pScheme); @@ -1466,7 +1466,7 @@ void INetURLObject::changeScheme(INetProtocol eTargetScheme) { m_aFragment+=delta; } -bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, +bool INetURLObject::convertRelToAbs(OUString const & rTheRelURIRef, bool bOctets, INetURLObject & rTheAbsURIRef, bool & rWasAbsolute, @@ -1616,7 +1616,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, enum State { STATE_AUTH, STATE_ABS_PATH, STATE_REL_PATH, STATE_FRAGMENT, STATE_DONE }; - rtl::OUStringBuffer aSynAbsURIRef; + OUStringBuffer aSynAbsURIRef; // make sure that the scheme is copied for generic schemes: getSchemeInfo().m_pScheme // is empty ("") in that case, so take the scheme from m_aAbsURIRef if (m_eScheme != INET_PROT_GENERIC) @@ -1867,8 +1867,8 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, return true; } -bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef, - bool bOctets, rtl::OUString & rTheRelURIRef, +bool INetURLObject::convertAbsToRel(OUString const & rTheAbsURIRef, + bool bOctets, OUString & rTheRelURIRef, EncodeMechanism eEncodeMechanism, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset, @@ -1973,7 +1973,7 @@ bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef, // only "/"---but see handling of file URLs above---, the complete subject // path could go into the new relative URL instead, but some people don't // like that): - rtl::OUStringBuffer aSynRelURIRef; + OUStringBuffer aSynRelURIRef; for (sal_Unicode const * p = pBasePathBegin + nMatch; p != pBasePathEnd; ++p) { @@ -2034,14 +2034,14 @@ bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef, } // static -bool INetURLObject::convertIntToExt(rtl::OUString const & rTheIntURIRef, - bool bOctets, rtl::OUString & rTheExtURIRef, +bool INetURLObject::convertIntToExt(OUString const & rTheIntURIRef, + bool bOctets, OUString & rTheExtURIRef, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset) { sal_Char cEscapePrefix = getEscapePrefix(CompareProtocolScheme(rTheIntURIRef)); - rtl::OUString aSynExtURIRef(encodeText(rTheIntURIRef, bOctets, PART_VISIBLE, + OUString aSynExtURIRef(encodeText(rTheIntURIRef, bOctets, PART_VISIBLE, cEscapePrefix, NOT_CANONIC, eCharset, true)); sal_Unicode const * pBegin = aSynExtURIRef.getStr(); @@ -2053,7 +2053,7 @@ bool INetURLObject::convertIntToExt(rtl::OUString const & rTheIntURIRef, { aSynExtURIRef = aSynExtURIRef.replaceAt(0, p - pBegin, - rtl::OUString::createFromAscii(pPrefix->m_pTranslatedPrefix)); + OUString::createFromAscii(pPrefix->m_pTranslatedPrefix)); } rTheExtURIRef = decode(aSynExtURIRef, cEscapePrefix, eDecodeMechanism, eCharset); @@ -2061,14 +2061,14 @@ bool INetURLObject::convertIntToExt(rtl::OUString const & rTheIntURIRef, } // static -bool INetURLObject::convertExtToInt(rtl::OUString const & rTheExtURIRef, - bool bOctets, rtl::OUString & rTheIntURIRef, +bool INetURLObject::convertExtToInt(OUString const & rTheExtURIRef, + bool bOctets, OUString & rTheIntURIRef, DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset) { sal_Char cEscapePrefix = getEscapePrefix(CompareProtocolScheme(rTheExtURIRef)); - rtl::OUString aSynIntURIRef(encodeText(rTheExtURIRef, bOctets, PART_VISIBLE, + OUString aSynIntURIRef(encodeText(rTheExtURIRef, bOctets, PART_VISIBLE, cEscapePrefix, NOT_CANONIC, eCharset, true)); sal_Unicode const * pBegin = aSynIntURIRef.getStr(); @@ -2080,7 +2080,7 @@ bool INetURLObject::convertExtToInt(rtl::OUString const & rTheExtURIRef, { aSynIntURIRef = aSynIntURIRef.replaceAt(0, p - pBegin, - rtl::OUString::createFromAscii(pPrefix->m_pTranslatedPrefix)); + OUString::createFromAscii(pPrefix->m_pTranslatedPrefix)); } rTheIntURIRef = decode(aSynIntURIRef, cEscapePrefix, eDecodeMechanism, eCharset); @@ -2254,7 +2254,7 @@ INetURLObject::SubString INetURLObject::getAuthority() const return SubString(nBegin, nEnd - nBegin); } -bool INetURLObject::setUser(rtl::OUString const & rTheUser, +bool INetURLObject::setUser(OUString const & rTheUser, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -2266,7 +2266,7 @@ bool INetURLObject::setUser(rtl::OUString const & rTheUser, return false; } - rtl::OUString aNewUser(encodeText(rTheUser, bOctets, + OUString aNewUser(encodeText(rTheUser, bOctets, m_eScheme == INET_PROT_IMAP ? PART_IMAP_ACHAR : m_eScheme == INET_PROT_VIM ? @@ -2297,10 +2297,10 @@ bool INetURLObject::setUser(rtl::OUString const & rTheUser, namespace { - void lcl_Erase(rtl::OUStringBuffer &rBuf, sal_Int32 index, sal_Int32 count) + void lcl_Erase(OUStringBuffer &rBuf, sal_Int32 index, sal_Int32 count) { - rtl::OUString sTemp(rBuf.makeStringAndClear()); - rBuf.append(sTemp.replaceAt(index, count, rtl::OUString())); + OUString sTemp(rBuf.makeStringAndClear()); + rBuf.append(sTemp.replaceAt(index, count, OUString())); } } @@ -2322,13 +2322,13 @@ bool INetURLObject::clearPassword() return true; } -bool INetURLObject::setPassword(rtl::OUString const & rThePassword, +bool INetURLObject::setPassword(OUString const & rThePassword, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { if (!getSchemeInfo().m_bPassword) return false; - rtl::OUString aNewAuth(encodeText(rThePassword, bOctets, + OUString aNewAuth(encodeText(rThePassword, bOctets, m_eScheme == INET_PROT_VIM ? PART_VIM : PART_USER_PASSWORD, getEscapePrefix(), eMechanism, eCharset, @@ -2345,8 +2345,8 @@ bool INetURLObject::setPassword(rtl::OUString const & rThePassword, else if (m_aHost.isPresent()) { m_aAbsURIRef.insert(m_aHost.getBegin(), - rtl::OUString( ":@" )); - m_aUser.set(m_aAbsURIRef, rtl::OUString(), m_aHost.getBegin()); + OUString( ":@" )); + m_aUser.set(m_aAbsURIRef, OUString(), m_aHost.getBegin()); nDelta = m_aAuth.set(m_aAbsURIRef, aNewAuth, m_aHost.getBegin() + 1) + 2; } @@ -2355,7 +2355,7 @@ bool INetURLObject::setPassword(rtl::OUString const & rThePassword, else { m_aAbsURIRef.insert(m_aPath.getBegin(), sal_Unicode(':')); - m_aUser.set(m_aAbsURIRef, rtl::OUString(), m_aPath.getBegin()); + m_aUser.set(m_aAbsURIRef, OUString(), m_aPath.getBegin()); nDelta = m_aAuth.set(m_aAbsURIRef, aNewAuth, m_aPath.getBegin() + 1) + 1; } @@ -2369,7 +2369,7 @@ bool INetURLObject::setPassword(rtl::OUString const & rThePassword, // static bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * pEnd, - rtl::OUString & rCanonic) + OUString & rCanonic) { // RFC 2373 is inconsistent about how to write an IPv6 address in which an // IPv4 address directly follows the abbreviating "::". The ABNF in @@ -2383,7 +2383,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p STATE_IP6_HEXSEQ1_MAYBE_IP4, STATE_IP6_HEXSEQ2, STATE_IP6_HEXSEQ2_COLON, STATE_IP6_HEXSEQ2_MAYBE_IP4, STATE_IP6_IP4, STATE_IP6_IP4_DOT, STATE_IP6_DONE }; - rtl::OUStringBuffer aTheCanonic; + OUStringBuffer aTheCanonic; sal_uInt32 nNumber = 0; int nDigits = 0; int nOctets = 0; @@ -2466,7 +2466,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p if (nOctets < 4) { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber))); + OUString::valueOf(sal_Int32(nNumber))); aTheCanonic.append(sal_Unicode('.')); ++nOctets; eState = STATE_IP4_DOT; @@ -2565,13 +2565,13 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p if (*p == ']') { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber), 16)); + OUString::valueOf(sal_Int32(nNumber), 16)); eState = STATE_IP6_DONE; } else if (*p == ':') { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber), 16)); + OUString::valueOf(sal_Int32(nNumber), 16)); aTheCanonic.append(sal_Unicode(':')); eState = STATE_IP6_HEXSEQ1_COLON; } @@ -2610,13 +2610,13 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p if (*p == ']') { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber), 16)); + OUString::valueOf(sal_Int32(nNumber), 16)); eState = STATE_IP6_DONE; } else if (*p == ':') { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber), 16)); + OUString::valueOf(sal_Int32(nNumber), 16)); aTheCanonic.append(sal_Unicode(':')); eState = STATE_IP6_HEXSEQ1_COLON; } @@ -2625,7 +2625,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p nNumber = 100 * (nNumber >> 8) + 10 * (nNumber >> 4 & 15) + (nNumber & 15); aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber))); + OUString::valueOf(sal_Int32(nNumber))); aTheCanonic.append(sal_Unicode('.')); nOctets = 2; eState = STATE_IP6_IP4_DOT; @@ -2649,13 +2649,13 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p if (*p == ']') { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber), 16)); + OUString::valueOf(sal_Int32(nNumber), 16)); eState = STATE_IP6_DONE; } else if (*p == ':') { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber), 16)); + OUString::valueOf(sal_Int32(nNumber), 16)); aTheCanonic.append(sal_Unicode(':')); eState = STATE_IP6_HEXSEQ2_COLON; } @@ -2689,13 +2689,13 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p if (*p == ']') { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber), 16)); + OUString::valueOf(sal_Int32(nNumber), 16)); eState = STATE_IP6_DONE; } else if (*p == ':') { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber), 16)); + OUString::valueOf(sal_Int32(nNumber), 16)); aTheCanonic.append(sal_Unicode(':')); eState = STATE_IP6_HEXSEQ2_COLON; } @@ -2704,7 +2704,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p nNumber = 100 * (nNumber >> 8) + 10 * (nNumber >> 4 & 15) + (nNumber & 15); aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber))); + OUString::valueOf(sal_Int32(nNumber))); aTheCanonic.append(sal_Unicode('.')); nOctets = 2; eState = STATE_IP6_IP4_DOT; @@ -2729,7 +2729,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p if (nOctets == 4) { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber))); + OUString::valueOf(sal_Int32(nNumber))); eState = STATE_IP6_DONE; } else @@ -2738,7 +2738,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p if (nOctets < 4) { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber))); + OUString::valueOf(sal_Int32(nNumber))); aTheCanonic.append(sal_Unicode('.')); ++nOctets; eState = STATE_IP6_IP4_DOT; @@ -2784,7 +2784,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p if (nOctets == 4) { aTheCanonic.append( - rtl::OUString::valueOf(sal_Int32(nNumber))); + OUString::valueOf(sal_Int32(nNumber))); rBegin = p; rCanonic = aTheCanonic.makeStringAndClear(); return true; @@ -2806,9 +2806,9 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p bool INetURLObject::parseHostOrNetBiosName( sal_Unicode const * pBegin, sal_Unicode const * pEnd, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bNetBiosName, - rtl::OUStringBuffer* pCanonic) + OUStringBuffer* pCanonic) { - rtl::OUString aTheCanonic; + OUString aTheCanonic; if (pBegin < pEnd) { sal_Unicode const * p = pBegin; @@ -2816,7 +2816,7 @@ bool INetURLObject::parseHostOrNetBiosName( { if (bNetBiosName) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; while (pBegin < pEnd) { EscapeType eEscapeType; @@ -2864,19 +2864,19 @@ bool INetURLObject::parseHostOrNetBiosName( return true; } -bool INetURLObject::setHost(rtl::OUString const & rTheHost, bool bOctets, +bool INetURLObject::setHost(OUString const & rTheHost, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { if (!getSchemeInfo().m_bHost) return false; - rtl::OUStringBuffer aSynHost(rTheHost); + OUStringBuffer aSynHost(rTheHost); bool bNetBiosName = false; switch (m_eScheme) { case INET_PROT_FILE: { - rtl::OUString sTemp(aSynHost.toString()); + OUString sTemp(aSynHost.toString()); if (sTemp.equalsIgnoreAsciiCase("localhost")) { aSynHost.setLength(0); @@ -2918,12 +2918,12 @@ bool INetURLObject::parsePath(INetProtocol eScheme, sal_uInt32 nAltSegmentDelimiter, sal_uInt32 nQueryDelimiter, sal_uInt32 nFragmentDelimiter, - rtl::OUStringBuffer &rSynPath) + OUStringBuffer &rSynPath) { DBG_ASSERT(pBegin, "INetURLObject::parsePath(): Null output param"); sal_Unicode const * pPos = *pBegin; - rtl::OUStringBuffer aTheSynPath; + OUStringBuffer aTheSynPath; switch (eScheme) { @@ -3084,7 +3084,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme, while (p < pEnd && *pPos != nQueryDelimiter && *pPos != nFragmentDelimiter) ++p; - rtl::OUString aCanonic; + OUString aCanonic; if (!parseHost(pPos, p, aCanonic)) return false; aTheSynPath.append(aCanonic); @@ -3225,7 +3225,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme, eCharset, false); } bool bInbox; - rtl::OUString sCompare(aTheSynPath.toString()); + OUString sCompare(aTheSynPath.toString()); if ( sCompare == "/inbox" ) bInbox = true; else if ( sCompare == "/newsgroups" ) @@ -3374,11 +3374,11 @@ bool INetURLObject::parsePath(INetProtocol eScheme, return true; } -bool INetURLObject::setPath(rtl::OUString const & rThePath, bool bOctets, +bool INetURLObject::setPath(OUString const & rThePath, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { - rtl::OUStringBuffer aSynPath; + OUStringBuffer aSynPath; sal_Unicode const * p = rThePath.getStr(); sal_Unicode const * pEnd = p + rThePath.getLength(); if (!parsePath(m_eScheme, &p, pEnd, bOctets, eMechanism, eCharset, false, @@ -3401,7 +3401,7 @@ bool INetURLObject::checkHierarchical() const { } } -bool INetURLObject::appendSegment(rtl::OUString const & rTheSegment, +bool INetURLObject::appendSegment(OUString const & rTheSegment, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -3455,7 +3455,7 @@ INetURLObject::SubString INetURLObject::getSegment(sal_Int32 nIndex, pSegEnd - pSegBegin); } -bool INetURLObject::insertName(rtl::OUString const & rTheName, bool bOctets, +bool INetURLObject::insertName(OUString const & rTheName, bool bOctets, bool bAppendFinalSlash, sal_Int32 nIndex, bool bIgnoreFinalSlash, EncodeMechanism eMechanism, @@ -3528,7 +3528,7 @@ bool INetURLObject::insertName(rtl::OUString const & rTheName, bool bOctets, } } - rtl::OUStringBuffer aNewPath; + OUStringBuffer aNewPath; aNewPath.append(pPathBegin, pPrefixEnd - pPathBegin); aNewPath.append(sal_Unicode('/')); aNewPath.append(encodeText(rTheName, bOctets, PART_PCHAR, getEscapePrefix(), @@ -3555,13 +3555,13 @@ bool INetURLObject::clearQuery() return false; } -bool INetURLObject::setQuery(rtl::OUString const & rTheQuery, bool bOctets, +bool INetURLObject::setQuery(OUString const & rTheQuery, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { if (!getSchemeInfo().m_bQuery) return false; - rtl::OUString aNewQuery(encodeText(rTheQuery, bOctets, PART_URIC, + OUString aNewQuery(encodeText(rTheQuery, bOctets, PART_URIC, getEscapePrefix(), eMechanism, eCharset, true)); sal_Int32 nDelta; @@ -3589,13 +3589,13 @@ bool INetURLObject::clearFragment() return true; } -bool INetURLObject::setFragment(rtl::OUString const & rTheFragment, +bool INetURLObject::setFragment(OUString const & rTheFragment, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { if (HasError()) return false; - rtl::OUString aNewFragment(encodeText(rTheFragment, bOctets, PART_URIC, + OUString aNewFragment(encodeText(rTheFragment, bOctets, PART_URIC, getEscapePrefix(), eMechanism, eCharset, true)); if (m_aFragment.isPresent()) @@ -3620,14 +3620,14 @@ bool INetURLObject::hasDosVolume(FSysStyle eStyle) const } // static -rtl::OUString INetURLObject::encodeText(sal_Unicode const * pBegin, +OUString INetURLObject::encodeText(sal_Unicode const * pBegin, sal_Unicode const * pEnd, bool bOctets, Part ePart, sal_Char cEscapePrefix, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bKeepVisibleEscapes) { - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; while (pBegin < pEnd) { EscapeType eEscapeType; @@ -3640,7 +3640,7 @@ rtl::OUString INetURLObject::encodeText(sal_Unicode const * pBegin, } // static -rtl::OUString INetURLObject::decode(sal_Unicode const * pBegin, +OUString INetURLObject::decode(sal_Unicode const * pBegin, sal_Unicode const * pEnd, sal_Char cEscapePrefix, DecodeMechanism eMechanism, @@ -3649,7 +3649,7 @@ rtl::OUString INetURLObject::decode(sal_Unicode const * pBegin, switch (eMechanism) { case NO_DECODE: - return rtl::OUString(pBegin, pEnd - pBegin); + return OUString(pBegin, pEnd - pBegin); case DECODE_TO_IURI: eCharset = RTL_TEXTENCODING_UTF8; @@ -3658,7 +3658,7 @@ rtl::OUString INetURLObject::decode(sal_Unicode const * pBegin, default: break; } - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; while (pBegin < pEnd) { EscapeType eEscapeType; @@ -3696,7 +3696,7 @@ rtl::OUString INetURLObject::decode(sal_Unicode const * pBegin, return aResult.makeStringAndClear(); } -rtl::OUString INetURLObject::GetURLNoPass(DecodeMechanism eMechanism, +OUString INetURLObject::GetURLNoPass(DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const { INetURLObject aTemp(*this); @@ -3704,7 +3704,7 @@ rtl::OUString INetURLObject::GetURLNoPass(DecodeMechanism eMechanism, return aTemp.GetMainURL(eMechanism, eCharset); } -rtl::OUString INetURLObject::GetURLNoMark(DecodeMechanism eMechanism, +OUString INetURLObject::GetURLNoMark(DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const { INetURLObject aTemp(*this); @@ -3712,7 +3712,7 @@ rtl::OUString INetURLObject::GetURLNoMark(DecodeMechanism eMechanism, return aTemp.GetMainURL(eMechanism, eCharset); } -rtl::OUString +OUString INetURLObject::getAbbreviated( star::uno::Reference< star::util::XStringWidth > const & rStringWidth, sal_Int32 nWidth, @@ -3722,7 +3722,7 @@ INetURLObject::getAbbreviated( { OSL_ENSURE(rStringWidth.is(), "specification violation"); sal_Char cEscapePrefix = getEscapePrefix(); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; // make sure that the scheme is copied for generic schemes: getSchemeInfo().m_pScheme // is empty ("") in that case, so take the scheme from m_aAbsURIRef if (m_eScheme != INET_PROT_GENERIC) @@ -3754,12 +3754,12 @@ INetURLObject::getAbbreviated( bool bSegment = false; if (getSchemeInfo().m_bHierarchical) { - rtl::OUString aRest; + OUString aRest; if (m_aQuery.isPresent()) aRest = "?..."; else if (m_aFragment.isPresent()) aRest = "#..."; - rtl::OUStringBuffer aTrailer; + OUStringBuffer aTrailer; sal_Unicode const * pBegin = pCoreBegin; sal_Unicode const * pEnd = pCoreEnd; sal_Unicode const * pPrefixBegin = pBegin; @@ -3777,7 +3777,7 @@ INetURLObject::getAbbreviated( --p; if (bAuthority && p == pCoreBegin + 1) --p; - rtl::OUString + OUString aSegment(decode(p + (p == pBegin && pBegin != pCoreBegin ? 1 : 0), pSuffixEnd, @@ -3785,7 +3785,7 @@ INetURLObject::getAbbreviated( eMechanism, eCharset)); pSuffixEnd = p; - rtl::OUStringBuffer aResult(aBuffer); + OUStringBuffer aResult(aBuffer); if (pSuffixEnd != pBegin) aResult.append("..."); aResult.append(aSegment); @@ -3817,7 +3817,7 @@ INetURLObject::getAbbreviated( ++p; if (p == pCoreEnd - 1 && *p == '/') ++p; - rtl::OUString + OUString aSegment(decode(pPrefixBegin + (pPrefixBegin == pCoreBegin ? 0 : 1), @@ -3826,7 +3826,7 @@ INetURLObject::getAbbreviated( eMechanism, eCharset)); pPrefixBegin = p; - rtl::OUStringBuffer aResult(aBuffer); + OUStringBuffer aResult(aBuffer); aResult.append(aSegment); if (pPrefixBegin != pEnd) aResult.append("..."); @@ -3875,7 +3875,7 @@ INetURLObject::getAbbreviated( } if (aBuffer.getLength() != 0) { - rtl::OUStringBuffer aResult(aBuffer); + OUStringBuffer aResult(aBuffer); if (rStringWidth->queryStringWidth(aResult.makeStringAndClear()) > nWidth) for (sal_Int32 i = aBuffer.getLength();;) @@ -3919,8 +3919,8 @@ bool INetURLObject::operator ==(INetURLObject const & rObject) const || GetParam(NO_DECODE) != rObject.GetParam(NO_DECODE) || GetMsgId(NO_DECODE) != rObject.GetMsgId(NO_DECODE)) return false; - rtl::OUString aPath1(GetURLPath(NO_DECODE)); - rtl::OUString aPath2(rObject.GetURLPath(NO_DECODE)); + OUString aPath1(GetURLPath(NO_DECODE)); + OUString aPath2(rObject.GetURLPath(NO_DECODE)); switch (m_eScheme) { case INET_PROT_FILE: @@ -3985,8 +3985,8 @@ bool INetURLObject::operator <(INetURLObject const & rObject) const return true; else if (nCompare > 0) return false; - const rtl::OUString &rPath1(GetURLPath(NO_DECODE)); - const rtl::OUString &rPath2(rObject.GetURLPath(NO_DECODE)); + const OUString &rPath1(GetURLPath(NO_DECODE)); + const OUString &rPath2(rObject.GetURLPath(NO_DECODE)); nCompare = rPath1.compareTo(rPath2); if (nCompare < 0) return true; @@ -4001,11 +4001,11 @@ bool INetURLObject::operator <(INetURLObject const & rObject) const } bool INetURLObject::ConcatData(INetProtocol eTheScheme, - rtl::OUString const & rTheUser, - rtl::OUString const & rThePassword, - rtl::OUString const & rTheHost, + OUString const & rTheUser, + OUString const & rThePassword, + OUString const & rTheHost, sal_uInt32 nThePort, - rtl::OUString const & rThePath, + OUString const & rThePath, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -4071,13 +4071,13 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, m_aAbsURIRef.append(sal_Unicode('@')); if (getSchemeInfo().m_bHost) { - rtl::OUStringBuffer aSynHost(rTheHost); + OUStringBuffer aSynHost(rTheHost); bool bNetBiosName = false; switch (m_eScheme) { case INET_PROT_FILE: { - rtl::OUString sTemp(aSynHost.toString()); + OUString sTemp(aSynHost.toString()); if (sTemp.equalsIgnoreAsciiCase( "localhost" )) { aSynHost.setLength(0); @@ -4117,7 +4117,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, { m_aAbsURIRef.append(sal_Unicode(':')); m_aPort.set(m_aAbsURIRef, - rtl::OUString::valueOf(sal_Int64(nThePort)), + OUString::valueOf(sal_Int64(nThePort)), m_aAbsURIRef.getLength()); } else @@ -4133,7 +4133,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, return false; } } - rtl::OUStringBuffer aSynPath; + OUStringBuffer aSynPath; sal_Unicode const * p = rThePath.getStr(); sal_Unicode const * pEnd = p + rThePath.getLength(); if (!parsePath(m_eScheme, &p, pEnd, false, eMechanism, eCharset, false, '/', @@ -4149,8 +4149,8 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, } // static -rtl::OUString INetURLObject::GetAbsURL(rtl::OUString const & rTheBaseURIRef, - rtl::OUString const & rTheRelURIRef, +OUString INetURLObject::GetAbsURL(OUString const & rTheBaseURIRef, + OUString const & rTheRelURIRef, bool bIgnoreFragment, EncodeMechanism eEncodeMechanism, DecodeMechanism eDecodeMechanism, @@ -4175,23 +4175,23 @@ rtl::OUString INetURLObject::GetAbsURL(rtl::OUString const & rTheBaseURIRef, rTheRelURIRef; } -rtl::OUString INetURLObject::getExternalURL(DecodeMechanism eMechanism, +OUString INetURLObject::getExternalURL(DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const { - rtl::OUString aTheExtURIRef; + OUString aTheExtURIRef; translateToExternal( m_aAbsURIRef.toString(), aTheExtURIRef, eMechanism, eCharset); return aTheExtURIRef; } // static -rtl::OUString INetURLObject::GetScheme(INetProtocol eTheScheme) +OUString INetURLObject::GetScheme(INetProtocol eTheScheme) { - return rtl::OUString::createFromAscii(getSchemeInfo(eTheScheme).m_pPrefix); + return OUString::createFromAscii(getSchemeInfo(eTheScheme).m_pPrefix); } // static -INetProtocol INetURLObject::CompareProtocolScheme(rtl::OUString const & +INetProtocol INetURLObject::CompareProtocolScheme(OUString const & rTheAbsURIRef) { sal_Unicode const * p = rTheAbsURIRef.getStr(); @@ -4199,14 +4199,14 @@ INetProtocol INetURLObject::CompareProtocolScheme(rtl::OUString const & return pPrefix ? pPrefix->m_eScheme : INET_PROT_NOT_VALID; } -rtl::OUString INetURLObject::GetHostPort(DecodeMechanism eMechanism, +OUString INetURLObject::GetHostPort(DecodeMechanism eMechanism, rtl_TextEncoding eCharset) { // Check because PROT_VND_SUN_STAR_HELP, PROT_VND_SUN_STAR_HIER, and // PROT_VND_SUN_STAR_PKG misuse m_aHost: if (!getSchemeInfo().m_bHost) - return rtl::OUString(); - rtl::OUStringBuffer aHostPort(decode(m_aHost, getEscapePrefix(), + return OUString(); + OUStringBuffer aHostPort(decode(m_aHost, getEscapePrefix(), eMechanism, eCharset)); if (m_aPort.isPresent()) { @@ -4234,7 +4234,7 @@ bool INetURLObject::SetPort(sal_uInt32 nThePort) { if (getSchemeInfo().m_bPort && m_aHost.isPresent()) { - rtl::OUString aNewPort(rtl::OUString::valueOf(sal_Int64(nThePort))); + OUString aNewPort(OUString::valueOf(sal_Int64(nThePort))); sal_Int32 nDelta; if (m_aPort.isPresent()) nDelta = m_aPort.set(m_aAbsURIRef, aNewPort); @@ -4274,7 +4274,7 @@ bool INetURLObject::removeSegment(sal_Int32 nIndex, bool bIgnoreFinalSlash) if (!aSegment.isPresent()) return false; - rtl::OUStringBuffer aNewPath; + OUStringBuffer aNewPath; aNewPath.append(m_aAbsURIRef.getStr() + m_aPath.getBegin(), aSegment.getBegin() - m_aPath.getBegin()); if (bIgnoreFinalSlash && aSegment.getEnd() == m_aPath.getEnd()) @@ -4292,13 +4292,13 @@ bool INetURLObject::removeSegment(sal_Int32 nIndex, bool bIgnoreFinalSlash) RTL_TEXTENCODING_UTF8); } -rtl::OUString INetURLObject::getName(sal_Int32 nIndex, bool bIgnoreFinalSlash, +OUString INetURLObject::getName(sal_Int32 nIndex, bool bIgnoreFinalSlash, DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const { SubString aSegment(getSegment(nIndex, bIgnoreFinalSlash)); if (!aSegment.isPresent()) - return rtl::OUString(); + return OUString(); sal_Unicode const * pSegBegin = m_aAbsURIRef.getStr() + aSegment.getBegin(); @@ -4313,7 +4313,7 @@ rtl::OUString INetURLObject::getName(sal_Int32 nIndex, bool bIgnoreFinalSlash, return decode(pSegBegin, p, getEscapePrefix(), eMechanism, eCharset); } -bool INetURLObject::setName(rtl::OUString const & rTheName, sal_Int32 nIndex, +bool INetURLObject::setName(OUString const & rTheName, sal_Int32 nIndex, bool bIgnoreFinalSlash, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) @@ -4335,7 +4335,7 @@ bool INetURLObject::setName(rtl::OUString const & rTheName, sal_Int32 nIndex, while (p != pSegEnd && *p != ';') ++p; - rtl::OUStringBuffer aNewPath; + OUStringBuffer aNewPath; aNewPath.append(pPathBegin, pSegBegin - pPathBegin); aNewPath.append(encodeText(rTheName, false, PART_PCHAR, getEscapePrefix(), eMechanism, eCharset, true)); @@ -4364,13 +4364,13 @@ bool INetURLObject::hasExtension(sal_Int32 nIndex, bool bIgnoreFinalSlash) return false; } -rtl::OUString INetURLObject::getBase(sal_Int32 nIndex, bool bIgnoreFinalSlash, +OUString INetURLObject::getBase(sal_Int32 nIndex, bool bIgnoreFinalSlash, DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const { SubString aSegment(getSegment(nIndex, bIgnoreFinalSlash)); if (!aSegment.isPresent()) - return rtl::OUString(); + return OUString(); sal_Unicode const * pSegBegin = m_aAbsURIRef.getStr() + aSegment.getBegin(); @@ -4390,7 +4390,7 @@ rtl::OUString INetURLObject::getBase(sal_Int32 nIndex, bool bIgnoreFinalSlash, eCharset); } -bool INetURLObject::setBase(rtl::OUString const & rTheBase, sal_Int32 nIndex, +bool INetURLObject::setBase(OUString const & rTheBase, sal_Int32 nIndex, bool bIgnoreFinalSlash, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) @@ -4416,7 +4416,7 @@ bool INetURLObject::setBase(rtl::OUString const & rTheBase, sal_Int32 nIndex, if (!pExtension) pExtension = p; - rtl::OUStringBuffer aNewPath; + OUStringBuffer aNewPath; aNewPath.append(pPathBegin, pSegBegin - pPathBegin); aNewPath.append(encodeText(rTheBase, false, PART_PCHAR, getEscapePrefix(), eMechanism, eCharset, true)); @@ -4426,14 +4426,14 @@ bool INetURLObject::setBase(rtl::OUString const & rTheBase, sal_Int32 nIndex, RTL_TEXTENCODING_UTF8); } -rtl::OUString INetURLObject::getExtension(sal_Int32 nIndex, +OUString INetURLObject::getExtension(sal_Int32 nIndex, bool bIgnoreFinalSlash, DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const { SubString aSegment(getSegment(nIndex, bIgnoreFinalSlash)); if (!aSegment.isPresent()) - return rtl::OUString(); + return OUString(); sal_Unicode const * pSegBegin = m_aAbsURIRef.getStr() + aSegment.getBegin(); @@ -4448,12 +4448,12 @@ rtl::OUString INetURLObject::getExtension(sal_Int32 nIndex, pExtension = p; if (!pExtension) - return rtl::OUString(); + return OUString(); return decode(pExtension + 1, p, getEscapePrefix(), eMechanism, eCharset); } -bool INetURLObject::setExtension(rtl::OUString const & rTheExtension, +bool INetURLObject::setExtension(OUString const & rTheExtension, sal_Int32 nIndex, bool bIgnoreFinalSlash, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) @@ -4479,7 +4479,7 @@ bool INetURLObject::setExtension(rtl::OUString const & rTheExtension, if (!pExtension) pExtension = p; - rtl::OUStringBuffer aNewPath; + OUStringBuffer aNewPath; aNewPath.append(pPathBegin, pExtension - pPathBegin); aNewPath.append(sal_Unicode('.')); aNewPath.append(encodeText(rTheExtension, false, PART_PCHAR, @@ -4513,7 +4513,7 @@ bool INetURLObject::removeExtension(sal_Int32 nIndex, bool bIgnoreFinalSlash) if (!pExtension) return true; - rtl::OUStringBuffer aNewPath; + OUStringBuffer aNewPath; aNewPath.append(pPathBegin, pExtension - pPathBegin); aNewPath.append(p, pPathEnd - p); @@ -4543,7 +4543,7 @@ bool INetURLObject::setFinalSlash() if (pPathEnd > pPathBegin && pPathEnd[-1] == '/') return true; - rtl::OUStringBuffer aNewPath; + OUStringBuffer aNewPath; aNewPath.append(pPathBegin, pPathEnd - pPathBegin); aNewPath.append(sal_Unicode('/')); @@ -4565,12 +4565,12 @@ bool INetURLObject::removeFinalSlash() --pPathEnd; if (pPathEnd == pPathBegin && *pPathBegin == '/') return false; - rtl::OUString aNewPath(pPathBegin, pPathEnd - pPathBegin); + OUString aNewPath(pPathBegin, pPathEnd - pPathBegin); return setPath(aNewPath, false, NOT_CANONIC, RTL_TEXTENCODING_UTF8); } -bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath, +bool INetURLObject::setFSysPath(OUString const & rFSysPath, FSysStyle eStyle) { sal_Unicode const * pFSysBegin = rFSysPath.getStr(); @@ -4602,7 +4602,7 @@ bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath, } sal_Unicode const * p = pFSysBegin + 2; - rtl::OUString aHost; + OUString aHost; if (parseHost(p, pFSysEnd, aHost) && (p == pFSysEnd || *p == '/')) { @@ -4617,7 +4617,7 @@ bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath, && pFSysBegin[1] == '\\') { sal_Unicode const * p = pFSysBegin + 2; - rtl::OUString aHost; + OUString aHost; if (parseHost(p, pFSysEnd, aHost) && (p == pFSysEnd || *p == '\\')) { @@ -4646,7 +4646,7 @@ bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath, break; } - rtl::OUStringBuffer aSynAbsURIRef(rtl::OUString("file://")); + OUStringBuffer aSynAbsURIRef(OUString("file://")); switch (eStyle) { @@ -4766,11 +4766,11 @@ bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath, return true; } -rtl::OUString INetURLObject::getFSysPath(FSysStyle eStyle, +OUString INetURLObject::getFSysPath(FSysStyle eStyle, sal_Unicode * pDelimiter) const { if (m_eScheme != INET_PROT_FILE) - return rtl::OUString(); + return OUString(); if ((eStyle & FSYS_VOS ? 1 : 0) + (eStyle & FSYS_UNX ? 1 : 0) @@ -4800,7 +4800,7 @@ rtl::OUString INetURLObject::getFSysPath(FSysStyle eStyle, if (pDelimiter) *pDelimiter = '/'; - rtl::OUStringBuffer aSynFSysPath; + OUStringBuffer aSynFSysPath; aSynFSysPath.append("//"); if (m_aHost.isPresent() && m_aHost.getLength() > 0) aSynFSysPath.append(decode(m_aHost, '%', DECODE_WITH_CHARSET, @@ -4815,7 +4815,7 @@ rtl::OUString INetURLObject::getFSysPath(FSysStyle eStyle, case FSYS_UNX: { if (m_aHost.isPresent() && m_aHost.getLength() > 0) - return rtl::OUString(); + return OUString(); if (pDelimiter) *pDelimiter = '/'; @@ -4829,7 +4829,7 @@ rtl::OUString INetURLObject::getFSysPath(FSysStyle eStyle, if (pDelimiter) *pDelimiter = '\\'; - rtl::OUStringBuffer aSynFSysPath; + OUStringBuffer aSynFSysPath; if (m_aHost.isPresent() && m_aHost.getLength() > 0) { aSynFSysPath.append("\\\\"); @@ -4860,12 +4860,12 @@ rtl::OUString INetURLObject::getFSysPath(FSysStyle eStyle, case FSYS_MAC: { if (m_aHost.isPresent() && m_aHost.getLength() > 0) - return rtl::OUString(); + return OUString(); if (pDelimiter) *pDelimiter = ':'; - rtl::OUStringBuffer aSynFSysPath; + OUStringBuffer aSynFSysPath; sal_Unicode const * p = m_aAbsURIRef.getStr() + m_aPath.getBegin(); sal_Unicode const * pEnd = p + m_aPath.getLength(); @@ -4887,25 +4887,25 @@ rtl::OUString INetURLObject::getFSysPath(FSysStyle eStyle, } default: - return rtl::OUString(); + return OUString(); } } -rtl::OUString INetURLObject::GetMsgId(DecodeMechanism eMechanism, +OUString INetURLObject::GetMsgId(DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const { if (m_eScheme != INET_PROT_POP3) - return rtl::OUString(); + return OUString(); sal_Unicode const * p = m_aAbsURIRef.getStr() + m_aPath.getBegin(); sal_Unicode const * pEnd = p + m_aPath.getLength(); for (; p < pEnd; ++p) if (*p == '<') return decode(p, pEnd, getEscapePrefix(), eMechanism, eCharset); - return rtl::OUString(); + return OUString(); } // static -void INetURLObject::appendUCS4Escape(rtl::OUStringBuffer & rTheText, +void INetURLObject::appendUCS4Escape(OUStringBuffer & rTheText, sal_Char cEscapePrefix, sal_uInt32 nUCS4) { DBG_ASSERT(nUCS4 < 0x80000000, @@ -4950,7 +4950,7 @@ void INetURLObject::appendUCS4Escape(rtl::OUStringBuffer & rTheText, } // static -void INetURLObject::appendUCS4(rtl::OUStringBuffer& rTheText, sal_uInt32 nUCS4, +void INetURLObject::appendUCS4(OUStringBuffer& rTheText, sal_uInt32 nUCS4, EscapeType eEscapeType, bool bOctets, Part ePart, sal_Char cEscapePrefix, rtl_TextEncoding eCharset, @@ -5230,12 +5230,12 @@ bool INetURLObject::scanIPv6reference(sal_Unicode const *& rBegin, return false; } -rtl::OUString INetURLObject::GetPartBeforeLastName(DecodeMechanism eMechanism, +OUString INetURLObject::GetPartBeforeLastName(DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const { if (!checkHierarchical()) - return rtl::OUString(); + return OUString(); INetURLObject aTemp(*this); aTemp.clearFragment(); aTemp.clearQuery(); @@ -5244,13 +5244,13 @@ rtl::OUString INetURLObject::GetPartBeforeLastName(DecodeMechanism eMechanism, return aTemp.GetMainURL(eMechanism, eCharset); } -rtl::OUString INetURLObject::GetLastName(DecodeMechanism eMechanism, +OUString INetURLObject::GetLastName(DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const { return getName(LAST_SEGMENT, true, eMechanism, eCharset); } -rtl::OUString INetURLObject::GetFileExtension(DecodeMechanism eMechanism, +OUString INetURLObject::GetFileExtension(DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const { return getExtension(LAST_SEGMENT, false, eMechanism, eCharset); @@ -5267,29 +5267,29 @@ bool INetURLObject::CutLastName() return true; } -rtl::OUString INetURLObject::PathToFileName() const +OUString INetURLObject::PathToFileName() const { if (m_eScheme != INET_PROT_FILE) - return rtl::OUString(); - rtl::OUString aSystemPath; + return OUString(); + OUString aSystemPath; if (osl::FileBase::getSystemPathFromFileURL( decode(m_aAbsURIRef.getStr(), m_aAbsURIRef.getStr() + m_aPath.getEnd(), getEscapePrefix(), NO_DECODE, RTL_TEXTENCODING_UTF8), aSystemPath) != osl::FileBase::E_None) - return rtl::OUString(); + return OUString(); return aSystemPath; } -rtl::OUString INetURLObject::GetFull() const +OUString INetURLObject::GetFull() const { INetURLObject aTemp(*this); aTemp.removeFinalSlash(); return aTemp.PathToFileName(); } -rtl::OUString INetURLObject::GetPath() const +OUString INetURLObject::GetPath() const { INetURLObject aTemp(*this); aTemp.removeSegment(LAST_SEGMENT, true); @@ -5297,17 +5297,17 @@ rtl::OUString INetURLObject::GetPath() const return aTemp.PathToFileName(); } -void INetURLObject::SetBase(rtl::OUString const & rTheBase) +void INetURLObject::SetBase(OUString const & rTheBase) { setBase(rTheBase, LAST_SEGMENT, true, ENCODE_ALL); } -rtl::OUString INetURLObject::GetBase() const +OUString INetURLObject::GetBase() const { return getBase(LAST_SEGMENT, true, DECODE_WITH_CHARSET); } -void INetURLObject::SetName(rtl::OUString const & rTheName, +void INetURLObject::SetName(OUString const & rTheName, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -5318,20 +5318,20 @@ void INetURLObject::SetName(rtl::OUString const & rTheName, *this = aTemp; } -void INetURLObject::SetExtension(rtl::OUString const & rTheExtension, +void INetURLObject::SetExtension(OUString const & rTheExtension, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { setExtension(rTheExtension, LAST_SEGMENT, false, eMechanism, eCharset); } -rtl::OUString INetURLObject::CutExtension(DecodeMechanism eMechanism, +OUString INetURLObject::CutExtension(DecodeMechanism eMechanism, rtl_TextEncoding eCharset) { - rtl::OUString aTheExtension(getExtension(LAST_SEGMENT, false, eMechanism, + OUString aTheExtension(getExtension(LAST_SEGMENT, false, eMechanism, eCharset)); return removeExtension(LAST_SEGMENT, false) - ? aTheExtension : rtl::OUString(); + ? aTheExtension : OUString(); } bool INetURLObject::IsCaseSensitive() const diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx index 303b59cfbc11..a38c66eda085 100644 --- a/tools/source/fsys/wldcrd.cxx +++ b/tools/source/fsys/wldcrd.cxx @@ -88,8 +88,8 @@ sal_uInt16 WildCard::ImpMatch( const char *pWild, const char *pStr ) const sal_Bool WildCard::Matches( const String& rString ) const { - rtl::OString aTmpWild = aWildString; - rtl::OString aString(rtl::OUStringToOString(rString, osl_getThreadTextEncoding())); + OString aTmpWild = aWildString; + OString aString(OUStringToOString(rString, osl_getThreadTextEncoding())); sal_Int32 nSepPos; diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx index 49341cfb5d47..7104fe2e8657 100644 --- a/tools/source/generic/bigint.cxx +++ b/tools/source/generic/bigint.cxx @@ -483,7 +483,7 @@ BigInt::BigInt( const BigInt& rBigInt ) } } -BigInt::BigInt( const rtl::OUString& rString ) +BigInt::BigInt( const OUString& rString ) { bIsSet = sal_True; bIsNeg = sal_False; @@ -606,7 +606,7 @@ BigInt::operator double() const } } -rtl::OUString BigInt::GetString() const +OUString BigInt::GetString() const { String aString; diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index dac13f01b863..64c0fdf23f06 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -38,8 +38,8 @@ struct ImplKeyData { ImplKeyData* mpNext; - rtl::OString maKey; - rtl::OString maValue; + OString maKey; + OString maValue; sal_Bool mbIsComment; }; @@ -47,14 +47,14 @@ struct ImplGroupData { ImplGroupData* mpNext; ImplKeyData* mpFirstKey; - rtl::OString maGroupName; + OString maGroupName; sal_uInt16 mnEmptyLines; }; struct ImplConfigData { ImplGroupData* mpFirstGroup; - rtl::OUString maFileName; + OUString maFileName; sal_uIntPtr mnDataUpdateId; sal_uIntPtr mnTimeStamp; LineEnd meLineEnd; @@ -66,7 +66,7 @@ struct ImplConfigData static String toUncPath( const String& rPath ) { - ::rtl::OUString aFileURL; + OUString aFileURL; // check if rFileName is already a URL; if not make it so if( rPath.CompareToAscii( "file://", 7 ) == COMPARE_EQUAL ) @@ -77,7 +77,7 @@ static String toUncPath( const String& rPath ) return aFileURL; } -static sal_uIntPtr ImplSysGetConfigTimeStamp( const rtl::OUString& rFileName ) +static sal_uIntPtr ImplSysGetConfigTimeStamp( const OUString& rFileName ) { sal_uIntPtr nTimeStamp = 0; ::osl::DirectoryItem aItem; @@ -92,7 +92,7 @@ static sal_uIntPtr ImplSysGetConfigTimeStamp( const rtl::OUString& rFileName ) return nTimeStamp; } -static sal_uInt8* ImplSysReadConfig( const rtl::OUString& rFileName, +static sal_uInt8* ImplSysReadConfig( const OUString& rFileName, sal_uInt64& rRead, sal_Bool& rbRead, sal_Bool& rbIsUTF8BOM, sal_uIntPtr& rTimeStamp ) { sal_uInt8* pBuf = NULL; @@ -136,7 +136,7 @@ static sal_uInt8* ImplSysReadConfig( const rtl::OUString& rFileName, return pBuf; } -static sal_Bool ImplSysWriteConfig( const rtl::OUString& rFileName, +static sal_Bool ImplSysWriteConfig( const OUString& rFileName, const sal_uInt8* pBuf, sal_uIntPtr nBufLen, sal_Bool rbIsUTF8BOM, sal_uIntPtr& rTimeStamp ) { sal_Bool bSuccess = sal_False; @@ -177,7 +177,7 @@ static sal_Bool ImplSysWriteConfig( const rtl::OUString& rFileName, } namespace { -rtl::OString makeOString(const sal_uInt8* p, sal_uInt64 n) +OString makeOString(const sal_uInt8* p, sal_uInt64 n) { if (n > SAL_MAX_INT32) { @@ -187,7 +187,7 @@ rtl::OString makeOString(const sal_uInt8* p, sal_uInt64 n) ::std::abort(); //TODO: handle this gracefully #endif } - return rtl::OString( + return OString( reinterpret_cast< char const * >(p), sal::static_int_cast< sal_Int32 >(n)); } @@ -580,7 +580,7 @@ static void ImplDeleteConfigData( ImplConfigData* pData ) pData->mpFirstGroup = NULL; } -static ImplConfigData* ImplGetConfigData( const rtl::OUString& rFileName ) +static ImplConfigData* ImplGetConfigData( const OUString& rFileName ) { ImplConfigData* pData; @@ -654,7 +654,7 @@ ImplGroupData* Config::ImplGetGroup() const return mpActGroup; } -Config::Config( const rtl::OUString& rFileName ) +Config::Config( const OUString& rFileName ) { // Initialize config data maFileName = toUncPath( rFileName ); @@ -665,8 +665,8 @@ Config::Config( const rtl::OUString& rFileName ) mbPersistence = sal_True; #ifdef DBG_UTIL - rtl::OStringBuffer aTraceStr("Config::Config( "); - aTraceStr.append(rtl::OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)); + OStringBuffer aTraceStr("Config::Config( "); + aTraceStr.append(OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)); aTraceStr.append(" )"); OSL_TRACE("%s", aTraceStr.getStr()); #endif @@ -682,7 +682,7 @@ Config::~Config() ImplFreeConfigData( mpData ); } -void Config::SetGroup(const rtl::OString& rGroup) +void Config::SetGroup(const OString& rGroup) { // If group is to be reset, it needs to be updated on next call if ( maGroupName != rGroup ) @@ -692,7 +692,7 @@ void Config::SetGroup(const rtl::OString& rGroup) } } -void Config::DeleteGroup(const rtl::OString& rGroup) +void Config::DeleteGroup(const OString& rGroup) { // Update config data if necessary if ( !mnLockCount || !mpData->mbRead ) @@ -744,7 +744,7 @@ void Config::DeleteGroup(const rtl::OString& rGroup) } } -rtl::OString Config::GetGroupName(sal_uInt16 nGroup) const +OString Config::GetGroupName(sal_uInt16 nGroup) const { // Update config data if necessary if ( !mnLockCount ) @@ -752,7 +752,7 @@ rtl::OString Config::GetGroupName(sal_uInt16 nGroup) const ImplGroupData* pGroup = mpData->mpFirstGroup; sal_uInt16 nGroupCount = 0; - rtl::OString aGroupName; + OString aGroupName; while ( pGroup ) { if ( nGroup == nGroupCount ) @@ -785,7 +785,7 @@ sal_uInt16 Config::GetGroupCount() const return nGroupCount; } -sal_Bool Config::HasGroup(const rtl::OString& rGroup) const +sal_Bool Config::HasGroup(const OString& rGroup) const { // Update config data if necessary if ( !mnLockCount ) @@ -808,27 +808,27 @@ sal_Bool Config::HasGroup(const rtl::OString& rGroup) const return bRet; } -rtl::OString Config::ReadKey(const rtl::OString& rKey) const +OString Config::ReadKey(const OString& rKey) const { - return ReadKey(rKey, rtl::OString()); + return ReadKey(rKey, OString()); } -rtl::OUString Config::ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const +OUString Config::ReadKey(const OString& rKey, rtl_TextEncoding eEncoding) const { if ( mpData->mbIsUTF8BOM ) eEncoding = RTL_TEXTENCODING_UTF8; - return rtl::OStringToOUString(ReadKey(rKey), eEncoding); + return OStringToOUString(ReadKey(rKey), eEncoding); } -rtl::OString Config::ReadKey(const rtl::OString& rKey, const rtl::OString& rDefault) const +OString Config::ReadKey(const OString& rKey, const OString& rDefault) const { #ifdef DBG_UTIL - rtl::OStringBuffer aTraceStr("Config::ReadKey( "); + OStringBuffer aTraceStr("Config::ReadKey( "); aTraceStr.append(rKey); aTraceStr.append(" ) from "); aTraceStr.append(GetGroup()); aTraceStr.append(" in "); - aTraceStr.append(rtl::OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)); + aTraceStr.append(OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)); OSL_TRACE("%s", aTraceStr.getStr()); #endif @@ -853,17 +853,17 @@ rtl::OString Config::ReadKey(const rtl::OString& rKey, const rtl::OString& rDefa return rDefault; } -void Config::WriteKey(const rtl::OString& rKey, const rtl::OString& rStr) +void Config::WriteKey(const OString& rKey, const OString& rStr) { #ifdef DBG_UTIL - rtl::OStringBuffer aTraceStr("Config::WriteKey( "); + OStringBuffer aTraceStr("Config::WriteKey( "); aTraceStr.append(rKey); aTraceStr.append(", "); aTraceStr.append(rStr); aTraceStr.append(" ) to "); aTraceStr.append(GetGroup()); aTraceStr.append(" in "); - aTraceStr.append(rtl::OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)); + aTraceStr.append(OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)); OSL_TRACE("%s", aTraceStr.getStr()); #endif @@ -919,7 +919,7 @@ void Config::WriteKey(const rtl::OString& rKey, const rtl::OString& rStr) } } -void Config::DeleteKey(const rtl::OString& rKey) +void Config::DeleteKey(const OString& rKey) { // Update config data if necessary if ( !mnLockCount || !mpData->mbRead ) @@ -966,11 +966,11 @@ void Config::DeleteKey(const rtl::OString& rKey) sal_uInt16 Config::GetKeyCount() const { #ifdef DBG_UTIL - rtl::OStringBuffer aTraceStr("Config::GetKeyCount()"); + OStringBuffer aTraceStr("Config::GetKeyCount()"); aTraceStr.append(" from "); aTraceStr.append(GetGroup()); aTraceStr.append(" in "); - aTraceStr.append(rtl::OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)); + aTraceStr.append(OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)); OSL_TRACE("%s", aTraceStr.getStr()); #endif @@ -996,15 +996,15 @@ sal_uInt16 Config::GetKeyCount() const return nCount; } -rtl::OString Config::GetKeyName(sal_uInt16 nKey) const +OString Config::GetKeyName(sal_uInt16 nKey) const { #ifdef DBG_UTIL - rtl::OStringBuffer aTraceStr("Config::GetKeyName( "); + OStringBuffer aTraceStr("Config::GetKeyName( "); aTraceStr.append(static_cast(nKey)); aTraceStr.append(" ) from "); aTraceStr.append(GetGroup()); aTraceStr.append(" in "); - aTraceStr.append(rtl::OUStringToOString( + aTraceStr.append(OUStringToOString( maFileName, RTL_TEXTENCODING_UTF8)); OSL_TRACE("%s", aTraceStr.getStr()); #endif @@ -1027,18 +1027,18 @@ rtl::OString Config::GetKeyName(sal_uInt16 nKey) const } } - return rtl::OString(); + return OString(); } -rtl::OString Config::ReadKey(sal_uInt16 nKey) const +OString Config::ReadKey(sal_uInt16 nKey) const { #ifdef DBG_UTIL - rtl::OStringBuffer aTraceStr("Config::ReadKey( "); + OStringBuffer aTraceStr("Config::ReadKey( "); aTraceStr.append(static_cast(nKey)); aTraceStr.append(" ) from "); aTraceStr.append(GetGroup()); aTraceStr.append(" in "); - aTraceStr.append(rtl::OUStringToOString(maFileName, + aTraceStr.append(OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8)); OSL_TRACE("%s", aTraceStr.getStr()); #endif @@ -1061,7 +1061,7 @@ rtl::OString Config::ReadKey(sal_uInt16 nKey) const } } - return rtl::OString(); + return OString(); } void Config::Flush() diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 423f32f448e1..30bdf43f9a1e 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -100,25 +100,25 @@ namespace unnamed_tools_inetmime { struct Parameter { Parameter * m_pNext; - rtl::OString m_aAttribute; - rtl::OString m_aCharset; - rtl::OString m_aLanguage; - rtl::OString m_aValue; + OString m_aAttribute; + OString m_aCharset; + OString m_aLanguage; + OString m_aValue; sal_uInt32 m_nSection; bool m_bExtended; - inline Parameter(Parameter * pTheNext, const rtl::OString& rTheAttribute, - const rtl::OString& rTheCharset, - const rtl::OString& rTheLanguage, - const rtl::OString& rTheValue, sal_uInt32 nTheSection, + inline Parameter(Parameter * pTheNext, const OString& rTheAttribute, + const OString& rTheCharset, + const OString& rTheLanguage, + const OString& rTheValue, sal_uInt32 nTheSection, bool bTheExtended); }; inline Parameter::Parameter(Parameter * pTheNext, - const rtl::OString& rTheAttribute, - const rtl::OString& rTheCharset, - const rtl::OString& rTheLanguage, - const rtl::OString& rTheValue, + const OString& rTheAttribute, + const OString& rTheCharset, + const OString& rTheLanguage, + const OString& rTheValue, sal_uInt32 nTheSection, bool bTheExtended): m_pNext(pTheNext), m_aAttribute(rTheAttribute), @@ -137,7 +137,7 @@ struct ParameterList inline ~ParameterList(); - Parameter ** find(const rtl::OString& rAttribute, sal_uInt32 nSection, + Parameter ** find(const OString& rAttribute, sal_uInt32 nSection, bool & rPresent); }; @@ -222,7 +222,7 @@ void INetMIMECharsetList_Impl::reset() // ParameterList -Parameter ** ParameterList::find(const rtl::OString& rAttribute, +Parameter ** ParameterList::find(const OString& rAttribute, sal_uInt32 nSection, bool & rPresent) { Parameter ** p = &m_pList; @@ -304,7 +304,7 @@ bool parseParameters(ParameterList const & rInput, bBadEncoding = true; break; } - aValue += rtl::OUString(pUnicode, static_cast(nSize)); + aValue += OUString(pUnicode, static_cast(nSize)); delete[] pUnicode; pNext = pNext->m_pNext; } @@ -759,7 +759,7 @@ sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin, } if (p == pAttributeBegin) break; - rtl::OString aAttribute = rtl::OString( + OString aAttribute = OString( pAttributeBegin, p - pAttributeBegin, RTL_TEXTENCODING_ASCII_US); if (bDowncaseAttribute) @@ -793,9 +793,9 @@ sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin, p = skipLinearWhiteSpaceComment(p + 1, pEnd); - rtl::OString aCharset; - rtl::OString aLanguage; - rtl::OString aValue; + OString aCharset; + OString aLanguage; + OString aValue; if (bExtended) { if (nSection == 0) @@ -811,7 +811,7 @@ sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin, break; if (pParameters) { - aCharset = rtl::OString( + aCharset = OString( pCharsetBegin, p - pCharsetBegin, RTL_TEXTENCODING_ASCII_US); @@ -846,7 +846,7 @@ sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin, break; if (pParameters) { - aLanguage = rtl::OString( + aLanguage = OString( pLanguageBegin, p - pLanguageBegin, RTL_TEXTENCODING_ASCII_US); @@ -942,7 +942,7 @@ sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin, if (p == pTokenBegin) break; if (pParameters) - aValue = rtl::OString( + aValue = OString( pTokenBegin, p - pTokenBegin, RTL_TEXTENCODING_UTF8); } @@ -1579,7 +1579,7 @@ void INetMIME::writeUTF8(INetMIMEOutputSink & rSink, sal_uInt32 nChar) // static void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink, HeaderFieldType eType, - const rtl::OUString& rBody, + const OUString& rBody, rtl_TextEncoding ePreferredEncoding, bool bInitialSpace) { @@ -2387,8 +2387,8 @@ bool INetMIME::translateUTF8Char(const sal_Char *& rBegin, } // static -rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, - const rtl::OString& rBody) +OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, + const OString& rBody) { // Due to a bug in INetCoreRFC822MessageStream::ConvertTo7Bit(), old // versions of StarOffice send mails with header fields where encoded @@ -2423,7 +2423,7 @@ rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, for (const sal_Char * p = pBegin; p != pEnd;) { - rtl::OUString sEncodedText; + OUString sEncodedText; if (p != pEnd && *p == '=' /* && bStartEncodedWord */) { const sal_Char * q = p + 1; @@ -2517,7 +2517,7 @@ rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, bEncodedWord = bEncodedWord && q != pEnd && *q++ == '?'; - rtl::OStringBuffer sText; + OStringBuffer sText; if (bEncodedWord) { if (bEncodingB) @@ -2671,7 +2671,7 @@ rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, static_cast< xub_StrLen >(nUnicodeSize)); else if (nCommentLevel == 0) { - sEncodedText = rtl::OUString(pUnicodeBuffer, nUnicodeSize); + sEncodedText = OUString(pUnicodeBuffer, nUnicodeSize); if (!bQuotedEncodedText) { const sal_Unicode * pTextPtr = pUnicodeBuffer; @@ -3732,7 +3732,7 @@ void INetContentTypeParameterList::Clear() } const INetContentTypeParameter * -INetContentTypeParameterList::find(const rtl::OString& rAttribute) const +INetContentTypeParameterList::find(const OString& rAttribute) const { boost::ptr_vector::const_iterator iter; for (iter = maEntries.begin(); iter != maEntries.end(); ++iter) diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index 544f23de15b3..9bef89cb1ddc 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -414,13 +414,13 @@ int INetMessageOStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize) // Check for header or body. if (!IsHeaderParsed()) { - rtl::OString aField(pData); + OString aField(pData); sal_Int32 nPos = aField.indexOf(':'); if (nPos != -1) { - rtl::OString aName( + OString aName( aField.copy(0, nPos)); - rtl::OString aValue( + OString aValue( aField.copy(nPos + 1, aField.getLength() - nPos + 1)); aValue = comphelper::string::stripStart(aValue, ' '); @@ -1272,7 +1272,7 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize) if (pMsg->IsMultipart()) { // Insert multipart delimiter. - rtl::OStringBuffer aDelim("--"); + OStringBuffer aDelim("--"); aDelim.append(pMsg->GetMultipartBoundary()); aDelim.append("\r\n"); @@ -1290,7 +1290,7 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize) if (pMsg->IsMultipart()) { // Insert close delimiter. - rtl::OStringBuffer aDelim("--"); + OStringBuffer aDelim("--"); aDelim.append(pMsg->GetMultipartBoundary()); aDelim.append("--\r\n"); @@ -1437,12 +1437,12 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize) if (pMsg->GetMultipartBoundary().getLength() == 0) { // Determine boundary. - rtl::OString aType(rtl::OUStringToOString( + OString aType(OUStringToOString( pMsg->GetContentType(), RTL_TEXTENCODING_ASCII_US)); - rtl::OString aLowerType(aType.toAsciiLowerCase()); + OString aLowerType(aType.toAsciiLowerCase()); sal_Int32 nPos = aLowerType.indexOf("boundary="); - rtl::OString aBoundary(aType.copy(nPos + 9)); + OString aBoundary(aType.copy(nPos + 9)); aBoundary = comphelper::string::strip(aBoundary, ' '); aBoundary = comphelper::string::strip(aBoundary, '"'); @@ -1451,15 +1451,15 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize) pMsg->SetMultipartBoundary (aBoundary); } - rtl::OString aPlainDelim (pMsg->GetMultipartBoundary()); - rtl::OString aDelim = rtl::OStringBuffer("--"). + OString aPlainDelim (pMsg->GetMultipartBoundary()); + OString aDelim = OStringBuffer("--"). append(aPlainDelim). makeStringAndClear(); - rtl::OString aPlainClose = rtl::OStringBuffer( + OString aPlainClose = OStringBuffer( aPlainDelim). append("--"). makeStringAndClear(); - rtl::OString aClose = rtl::OStringBuffer( + OString aClose = OStringBuffer( aDelim). append("--"). makeStringAndClear(); diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx index b079e1750f69..1219dd5da3a7 100644 --- a/tools/source/memtools/multisel.cxx +++ b/tools/source/memtools/multisel.cxx @@ -34,7 +34,6 @@ #define DBG(x) #endif -using ::rtl::OUString; #ifdef MI_DEBUG static void Print( const MultiSelection* pSel ) @@ -606,7 +605,7 @@ void MultiSelection::SetTotalRange( const Range& rTotRange ) // StringRangeEnumerator -StringRangeEnumerator::StringRangeEnumerator( const rtl::OUString& i_rInput, +StringRangeEnumerator::StringRangeEnumerator( const OUString& i_rInput, sal_Int32 i_nMinNumber, sal_Int32 i_nMaxNumber, sal_Int32 i_nLogicalOffset @@ -703,13 +702,13 @@ bool StringRangeEnumerator::insertJoinedRanges( return true; } -bool StringRangeEnumerator::setRange( const rtl::OUString& i_rNewRange, bool i_bStrict ) +bool StringRangeEnumerator::setRange( const OUString& i_rNewRange, bool i_bStrict ) { mnCount = 0; maSequence.clear(); const sal_Unicode* pInput = i_rNewRange.getStr(); - rtl::OUStringBuffer aNumberBuf( 16 ); + OUStringBuffer aNumberBuf( 16 ); std::vector< sal_Int32 > aNumbers; bool bSequence = false; while( *pInput ) diff --git a/tools/source/misc/appendunixshellword.cxx b/tools/source/misc/appendunixshellword.cxx index 6a15a1f5163c..96e9b65846b2 100644 --- a/tools/source/misc/appendunixshellword.cxx +++ b/tools/source/misc/appendunixshellword.cxx @@ -33,7 +33,7 @@ namespace tools { void appendUnixShellWord( - rtl::OStringBuffer * accumulator, rtl::OString const & text) + OStringBuffer * accumulator, OString const & text) { OSL_ASSERT(accumulator != NULL); if (text.isEmpty()) { diff --git a/tools/source/misc/extendapplicationenvironment.cxx b/tools/source/misc/extendapplicationenvironment.cxx index 68181ade22d2..e8b3ff8686b9 100644 --- a/tools/source/misc/extendapplicationenvironment.cxx +++ b/tools/source/misc/extendapplicationenvironment.cxx @@ -51,9 +51,9 @@ void extendApplicationEnvironment() { #endif // Make sure URE_BOOTSTRAP environment variable is set (failure is fatal): - rtl::OUStringBuffer env; - rtl::OUString envVar("URE_BOOTSTRAP"); - rtl::OUString uri; + OUStringBuffer env; + OUString envVar("URE_BOOTSTRAP"); + OUString uri; if (rtl::Bootstrap::get(envVar, uri)) { if (!uri.matchIgnoreAsciiCase("vnd.sun.star.pathname:")) @@ -72,7 +72,7 @@ void extendApplicationEnvironment() { env.append(rtl::Bootstrap::encode(uri)); env.append(SAL_CONFIGFILE("fundamental")); } - rtl::OUString envValue(env.makeStringAndClear()); + OUString envValue(env.makeStringAndClear()); if (osl_setEnvironment(envVar.pData, envValue.pData) != osl_Process_E_None) { abort(); } diff --git a/tools/source/misc/getprocessworkingdir.cxx b/tools/source/misc/getprocessworkingdir.cxx index 115e5c86aa2b..f3bcf8cd1c97 100644 --- a/tools/source/misc/getprocessworkingdir.cxx +++ b/tools/source/misc/getprocessworkingdir.cxx @@ -31,10 +31,10 @@ namespace tools { -bool getProcessWorkingDir(rtl::OUString &rUrl) +bool getProcessWorkingDir(OUString &rUrl) { - rUrl = rtl::OUString(); - rtl::OUString s("$OOO_CWD"); + rUrl = OUString(); + OUString s("$OOO_CWD"); rtl::Bootstrap::expandMacros(s); if (s.isEmpty()) { diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 7ad7092d800e..519dcea67eeb 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -51,10 +51,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringHash; using namespace osl; @@ -183,7 +179,7 @@ void ResMgrContainer::init() assert( m_aResFiles.empty() ); // get resource path - rtl::OUString uri("$BRAND_BASE_DIR/program/resource/"); + OUString uri("$BRAND_BASE_DIR/program/resource/"); rtl::Bootstrap::expandMacros(uri); //TODO: detect failure // collect all possible resource files @@ -450,8 +446,8 @@ InternalResMgr::~InternalResMgr() { SvFileStream aStm( OUString::createFromAscii( pLogFile ), STREAM_WRITE ); aStm.Seek( STREAM_SEEK_TO_END ); - rtl::OStringBuffer aLine("FileName: "); - aLine.append(rtl::OUStringToOString(aFileName, + OStringBuffer aLine("FileName: "); + aLine.append(OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8)); aStm.WriteLine(aLine.makeStringAndClear()); @@ -629,7 +625,7 @@ OUString GetTypeRes_Impl( const ResId& rTypeId ) { // Return on resource errors static int bInUse = sal_False; - rtl::OUString aTypStr(OUString::number(rTypeId.GetId())); + OUString aTypStr(OUString::number(rTypeId.GetId())); if ( !bInUse ) { @@ -667,14 +663,14 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr, ResMgr* pNewResMgr = new ResMgr( pImp ); - rtl::OStringBuffer aStr(rtl::OUStringToOString(pResMgr->GetFileName(), + OStringBuffer aStr(OUStringToOString(pResMgr->GetFileName(), RTL_TEXTENCODING_UTF8)); if (aStr.getLength()) aStr.append('\n'); aStr.append("Class: "); - aStr.append(rtl::OUStringToOString(GetTypeRes_Impl(ResId(nRT, *pNewResMgr)), + aStr.append(OUStringToOString(GetTypeRes_Impl(ResId(nRT, *pNewResMgr)), RTL_TEXTENCODING_UTF8)); aStr.append(", Id: "); aStr.append(static_cast(nId)); @@ -685,7 +681,7 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr, while( nDepth > 0 ) { aStr.append("Class: "); - aStr.append(rtl::OUStringToOString(GetTypeRes_Impl( + aStr.append(OUStringToOString(GetTypeRes_Impl( ResId(rResStack[nDepth].pResource->GetRT(), *pNewResMgr)), RTL_TEXTENCODING_UTF8)); aStr.append(", Id: "); @@ -802,7 +798,7 @@ void ResMgr::Init( const OUString& rFileName ) if ( !pImpRes ) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr("Resourcefile not found:\n"); + OStringBuffer aStr("Resourcefile not found:\n"); aStr.append(OUStringToOString(rFileName, RTL_TEXTENCODING_UTF8)); OSL_FAIL(aStr.getStr()); #endif @@ -1049,10 +1045,10 @@ sal_Bool ResMgr::GetResource( const ResId& rId, const Resource* pResObj ) { pTop->Flags |= RC_FALLBACK_DOWN; #ifdef DBG_UTIL - rtl::OStringBuffer aMess("found resource "); + OStringBuffer aMess("found resource "); aMess.append(static_cast(nId)); aMess.append(" in fallback "); - aMess.append(rtl::OUStringToOString( + aMess.append(OUStringToOString( pFallbackResMgr->GetFileName(), osl_getThreadTextEncoding())); aMess.append('\n'); @@ -1217,11 +1213,11 @@ sal_uInt32 ResMgr::GetString( OUString& rStr, const sal_uInt8* pStr ) return nRet; } -sal_uInt32 ResMgr::GetByteString( rtl::OString& rStr, const sal_uInt8* pStr ) +sal_uInt32 ResMgr::GetByteString( OString& rStr, const sal_uInt8* pStr ) { sal_uInt32 nLen=0; sal_uInt32 nRet = GetStringSize( pStr, nLen ); - rStr = rtl::OString( (const sal_Char*)pStr, nLen ); + rStr = OString( (const sal_Char*)pStr, nLen ); return nRet; } @@ -1596,14 +1592,14 @@ OUString ResMgr::ReadString() return aRet; } -rtl::OString ResMgr::ReadByteString() +OString ResMgr::ReadByteString() { osl::Guard aGuard( getResMgrMutex() ); if( pFallbackResMgr ) return pFallbackResMgr->ReadByteString(); - rtl::OString aRet; + OString aRet; const ImpRCStack& rTop = aStack[nCurStack]; if( (rTop.Flags & RC_NOTFOUND) ) @@ -1618,7 +1614,7 @@ rtl::OString ResMgr::ReadByteString() return aRet; } -rtl::OString ResMgr::GetAutoHelpId() +OString ResMgr::GetAutoHelpId() { osl::Guard aGuard( getResMgrMutex() ); @@ -1627,11 +1623,11 @@ rtl::OString ResMgr::GetAutoHelpId() OSL_ENSURE( nCurStack, "resource stack empty in Auto help id generation" ); if( nCurStack < 1 || nCurStack > 2 ) - return rtl::OString(); + return OString(); // prepare HID, start with resource prefix - rtl::OStringBuffer aHID( 32 ); - aHID.append( rtl::OUStringToOString( pImpRes->aPrefix, RTL_TEXTENCODING_UTF8 ) ); + OStringBuffer aHID( 32 ); + aHID.append( OUStringToOString( pImpRes->aPrefix, RTL_TEXTENCODING_UTF8 ) ); aHID.append( '.' ); // append type @@ -1648,7 +1644,7 @@ rtl::OString ResMgr::GetAutoHelpId() case RSC_FLOATINGWINDOW: aHID.append( "FloatingWindow" ); break; case RSC_MODALDIALOG: aHID.append( "ModalDialog" ); break; case RSC_TABPAGE: aHID.append( "TabPage" ); break; - default: return rtl::OString(); + default: return OString(); } } else @@ -1693,11 +1689,11 @@ rtl::OString ResMgr::GetAutoHelpId() case RSC_MOREBUTTON: aHID.append( "MoreButton" ); break; default: // no type, no auto HID - return rtl::OString(); + return OString(); } break; default: - return rtl::OString(); + return OString(); } } @@ -1772,7 +1768,7 @@ bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourc return m_pResImpl->IsGlobalAvailable( _resourceType, _resourceId ); } -rtl::OUString SimpleResMgr::ReadString( sal_uInt32 nId ) +OUString SimpleResMgr::ReadString( sal_uInt32 nId ) { osl::MutexGuard aGuard(m_aAccessSafety); diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 5631d4627fa1..0ac0de87a9ac 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -177,10 +177,10 @@ public: static void aDspFunc(const OUString &rErr, const OUString &rAction) { - rtl::OStringBuffer aErr("Aktion: "); - aErr.append(rtl::OUStringToOString(rAction, RTL_TEXTENCODING_ASCII_US)); + OStringBuffer aErr("Aktion: "); + aErr.append(OUStringToOString(rAction, RTL_TEXTENCODING_ASCII_US)); aErr.append(" Fehler: "); - aErr.append(rtl::OUStringToOString(rErr, RTL_TEXTENCODING_ASCII_US)); + aErr.append(OUStringToOString(rErr, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aErr.getStr()); } @@ -307,10 +307,10 @@ sal_uInt16 ErrorHandler::HandleError_Impl( { if(!pData->pDsp) { - rtl::OStringBuffer aStr("Action: "); - aStr.append(rtl::OUStringToOString(aAction, RTL_TEXTENCODING_ASCII_US)); + OStringBuffer aStr("Action: "); + aStr.append(OUStringToOString(aAction, RTL_TEXTENCODING_ASCII_US)); aStr.append("\nFehler: "); - aStr.append(rtl::OUStringToOString(aErr, RTL_TEXTENCODING_ASCII_US)); + aStr.append(OUStringToOString(aErr, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aStr.getStr()); } else @@ -377,7 +377,7 @@ sal_Bool SimpleErrorHandler::CreateString( const ErrorInfo *pInfo, OUString &rStr, sal_uInt16 &) const { sal_uIntPtr nId = pInfo->GetErrorCode(); - rtl::OStringBuffer aStr("Id "); + OStringBuffer aStr("Id "); aStr.append(static_cast(nId)); aStr.append(" only handled by SimpleErrorHandler"); aStr.append("\nErrorCode: "); @@ -395,7 +395,7 @@ sal_Bool SimpleErrorHandler::CreateString( aStr.append("\nDId "); aStr.append(static_cast(*pDyn)); } - rStr = rtl::OStringToOUString(aStr.makeStringAndClear(), + rStr = OStringToOUString(aStr.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); return sal_True; } diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx index 503cf70ecf2b..1ed7b0e12e1b 100644 --- a/tools/source/ref/globname.cxx +++ b/tools/source/ref/globname.cxx @@ -222,7 +222,7 @@ void SvGlobalName::MakeFromMemory( void * pData ) sal_Bool SvGlobalName::MakeId( const String & rIdStr ) { - rtl::OString aStr(rtl::OUStringToOString(rIdStr, + OString aStr(OUStringToOString(rIdStr, RTL_TEXTENCODING_ASCII_US)); const sal_Char *pStr = aStr.getStr(); if( rIdStr.Len() == 36 @@ -300,7 +300,7 @@ sal_Bool SvGlobalName::MakeId( const String & rIdStr ) String SvGlobalName::GetHexName() const { - rtl::OStringBuffer aHexBuffer; + OStringBuffer aHexBuffer; sal_Char buf[ 10 ]; sal_uInt32 Data1; @@ -328,7 +328,7 @@ String SvGlobalName::GetHexName() const sprintf( buf, "%2.2x", pImp->szData[ i ] ); aHexBuffer.append(buf); } - return rtl::OStringToOUString(aHexBuffer.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); + return OStringToOUString(aHexBuffer.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); } com::sun::star::uno::Sequence < sal_Int8 > SvGlobalName::GetByteSequence() const diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index ffe8d348176c..66e4a28909c7 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -110,7 +110,7 @@ void TOOLS_DLLPUBLIC ReadObjects( SvPersistListReadable& rLst, SvPersistStream & #ifdef DBG_UTIL if( nObjLen + nObjPos != rStm.Tell() ) { - rtl::OStringBuffer aStr("false list len: read = "); + OStringBuffer aStr("false list len: read = "); aStr.append(static_cast(rStm.Tell() - nObjPos)); aStr.append(", should = "); aStr.append(static_cast(nObjLen)); @@ -586,7 +586,7 @@ sal_uInt32 SvPersistStream::ReadObj if( !pFunc ) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr("no class with id: " ); + OStringBuffer aStr("no class with id: " ); aStr.append(static_cast(nClassId)); aStr.append(" registered"); DBG_WARNING(aStr.getStr()); @@ -613,7 +613,7 @@ sal_uInt32 SvPersistStream::ReadObj #ifdef DBG_UTIL if( nObjLen + nObjPos != Tell() ) { - rtl::OStringBuffer aStr("false object len: read = "); + OStringBuffer aStr("false object len: read = "); aStr.append(static_cast((long)(Tell() - nObjPos))); aStr.append(", should = "); aStr.append(static_cast(nObjLen)); diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index d9fc89a80cef..18ff853f678e 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -519,24 +519,24 @@ void SvStream::ResetError() ClearError(); } -sal_Bool SvStream::ReadByteStringLine( rtl::OUString& rStr, rtl_TextEncoding eSrcCharSet, +sal_Bool SvStream::ReadByteStringLine( OUString& rStr, rtl_TextEncoding eSrcCharSet, sal_Int32 nMaxBytesToRead ) { - rtl::OString aStr; + OString aStr; sal_Bool bRet = ReadLine( aStr, nMaxBytesToRead); - rStr = rtl::OStringToOUString(aStr, eSrcCharSet); + rStr = OStringToOUString(aStr, eSrcCharSet); return bRet; } sal_Bool SvStream::ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet ) { - rtl::OString aStr; + OString aStr; sal_Bool bRet = ReadLine(aStr); - rStr = rtl::OStringToOUString(aStr, eSrcCharSet); + rStr = OStringToOUString(aStr, eSrcCharSet); return bRet; } -sal_Bool SvStream::ReadLine( rtl::OString& rStr, sal_Int32 nMaxBytesToRead ) +sal_Bool SvStream::ReadLine( OString& rStr, sal_Int32 nMaxBytesToRead ) { sal_Char buf[256+1]; sal_Bool bEnd = sal_False; @@ -544,7 +544,7 @@ sal_Bool SvStream::ReadLine( rtl::OString& rStr, sal_Int32 nMaxBytesToRead ) sal_Char c = 0; sal_Size nTotalLen = 0; - rtl::OStringBuffer aBuf(4096); + OStringBuffer aBuf(4096); while( !bEnd && !GetError() ) // Don't test for EOF as we // are reading block-wise! { @@ -555,7 +555,7 @@ sal_Bool SvStream::ReadLine( rtl::OString& rStr, sal_Int32 nMaxBytesToRead ) { // Exit on first block-read error bIsEof = sal_True; - rStr = rtl::OString(); + rStr = OString(); return sal_False; } else @@ -610,7 +610,7 @@ sal_Bool SvStream::ReadLine( rtl::OString& rStr, sal_Int32 nMaxBytesToRead ) return bEnd; } -sal_Bool SvStream::ReadUniStringLine( rtl::OUString& rStr, sal_Int32 nMaxCodepointsToRead ) +sal_Bool SvStream::ReadUniStringLine( OUString& rStr, sal_Int32 nMaxCodepointsToRead ) { sal_Unicode buf[256+1]; sal_Bool bEnd = sal_False; @@ -620,7 +620,7 @@ sal_Bool SvStream::ReadUniStringLine( rtl::OUString& rStr, sal_Int32 nMaxCodepoi DBG_ASSERT( sizeof(sal_Unicode) == sizeof(sal_uInt16), "ReadUniStringLine: swapping sizeof(sal_Unicode) not implemented" ); - rtl::OUStringBuffer aBuf(4096); + OUStringBuffer aBuf(4096); while( !bEnd && !GetError() ) // Don't test for EOF as we // are reading block-wise! { @@ -632,7 +632,7 @@ sal_Bool SvStream::ReadUniStringLine( rtl::OUString& rStr, sal_Int32 nMaxCodepoi { // exit on first BlockRead error bIsEof = sal_True; - rStr = rtl::OUString(); + rStr = OUString(); return sal_False; } else @@ -696,7 +696,7 @@ sal_Bool SvStream::ReadUniStringLine( rtl::OUString& rStr, sal_Int32 nMaxCodepoi return bEnd; } -sal_Bool SvStream::ReadUniOrByteStringLine( rtl::OUString& rStr, rtl_TextEncoding eSrcCharSet, +sal_Bool SvStream::ReadUniOrByteStringLine( OUString& rStr, rtl_TextEncoding eSrcCharSet, sal_Int32 nMaxCodepointsToRead ) { if ( eSrcCharSet == RTL_TEXTENCODING_UNICODE ) @@ -705,9 +705,9 @@ sal_Bool SvStream::ReadUniOrByteStringLine( rtl::OUString& rStr, rtl_TextEncodin return ReadByteStringLine( rStr, eSrcCharSet, nMaxCodepointsToRead ); } -rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream) +OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream) { - rtl::OStringBuffer aOutput(256); + OStringBuffer aOutput(256); sal_Char buf[ 256 + 1 ]; sal_Bool bEnd = sal_False; @@ -738,15 +738,15 @@ rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream) return aOutput.makeStringAndClear(); } -rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStream, rtl_TextEncoding eEnc) +OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStream, rtl_TextEncoding eEnc) { - return rtl::OStringToOUString( + return OStringToOUString( read_zeroTerminated_uInt8s_ToOString(rStream), eEnc); } /** Attempt to write a prefixed sequence of nUnits 16bit units from an OUString, returned value is number of bytes written */ -sal_Size write_uInt16s_FromOUString(SvStream& rStrm, const rtl::OUString& rStr, +sal_Size write_uInt16s_FromOUString(SvStream& rStrm, const OUString& rStr, sal_Size nUnits) { DBG_ASSERT( sizeof(sal_Unicode) == sizeof(sal_uInt16), "write_uInt16s_FromOUString: swapping sizeof(sal_Unicode) not implemented" ); @@ -782,7 +782,7 @@ sal_Bool SvStream::WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding } else { - rtl::OString aStr(rtl::OUStringToOString(rStr, eDestCharSet)); + OString aStr(OUStringToOString(rStr, eDestCharSet)); write_uInt8s_FromOString(*this, aStr, aStr.getLength()); return nError == SVSTREAM_OK; } @@ -790,10 +790,10 @@ sal_Bool SvStream::WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding sal_Bool SvStream::WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet ) { - return WriteLine(rtl::OUStringToOString(rStr, eDestCharSet)); + return WriteLine(OUStringToOString(rStr, eDestCharSet)); } -sal_Bool SvStream::WriteLine(const rtl::OString& rStr) +sal_Bool SvStream::WriteLine(const OString& rStr) { Write(rStr.getStr(), rStr.getLength()); endl(*this); @@ -806,7 +806,7 @@ sal_Bool SvStream::WriteUniOrByteChar( sal_Unicode ch, rtl_TextEncoding eDestCha *this << ch; else { - rtl::OString aStr(&ch, 1, eDestCharSet); + OString aStr(&ch, 1, eDestCharSet); Write(aStr.getStr(), aStr.getLength()); } return nError == SVSTREAM_OK; @@ -1228,7 +1228,7 @@ SvStream& SvStream::operator<< ( SvStream& rStream ) return *this; } -rtl::OUString SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet ) +OUString SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet ) { // read UTF-16 string directly from stream ? if (eSrcCharSet == RTL_TEXTENCODING_UNICODE) @@ -1236,7 +1236,7 @@ rtl::OUString SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet ) return read_lenPrefixed_uInt8s_ToOUString(*this, eSrcCharSet); } -SvStream& SvStream::WriteUniOrByteString( const rtl::OUString& rStr, rtl_TextEncoding eDestCharSet ) +SvStream& SvStream::WriteUniOrByteString( const OUString& rStr, rtl_TextEncoding eDestCharSet ) { // write UTF-16 string directly into stream ? if (eDestCharSet == RTL_TEXTENCODING_UNICODE) @@ -1605,7 +1605,7 @@ unsigned char implGetCryptMask(const sal_Char* pStr, sal_Int32 nLen, long nVersi return nCryptMask; } -void SvStream::SetCryptMaskKey(const rtl::OString& rCryptMaskKey) +void SvStream::SetCryptMaskKey(const OString& rCryptMaskKey) { m_aCryptMaskKey = rCryptMaskKey; nCryptMask = implGetCryptMask(m_aCryptMaskKey.getStr(), @@ -1967,7 +1967,7 @@ void SvDataCopyStream::Assign( const SvDataCopyStream& ) } //Create a OString of nLen bytes from rStream -rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen) +OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen) { rtl_String *pStr = NULL; if (nLen) @@ -1988,11 +1988,11 @@ rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen) } //take ownership of buffer and return, otherwise return empty string - return pStr ? rtl::OString(pStr, SAL_NO_ACQUIRE) : rtl::OString(); + return pStr ? OString(pStr, SAL_NO_ACQUIRE) : OString(); } //Create a OUString of nLen sal_Unicodes from rStream -rtl::OUString read_uInt16s_ToOUString(SvStream& rStrm, sal_Size nLen) +OUString read_uInt16s_ToOUString(SvStream& rStrm, sal_Size nLen) { rtl_uString *pStr = NULL; if (nLen) @@ -2018,7 +2018,7 @@ rtl::OUString read_uInt16s_ToOUString(SvStream& rStrm, sal_Size nLen) } //take ownership of buffer and return, otherwise return empty string - return pStr ? rtl::OUString(pStr, SAL_NO_ACQUIRE) : rtl::OUString(); + return pStr ? OUString(pStr, SAL_NO_ACQUIRE) : OUString(); } namespace @@ -2102,14 +2102,14 @@ namespace } } -rtl::OString convertLineEnd(const rtl::OString &rIn, LineEnd eLineEnd) +OString convertLineEnd(const OString &rIn, LineEnd eLineEnd) { - return tmpl_convertLineEnd(rIn, eLineEnd); + return tmpl_convertLineEnd(rIn, eLineEnd); } -rtl::OUString convertLineEnd(const rtl::OUString &rIn, LineEnd eLineEnd) +OUString convertLineEnd(const OUString &rIn, LineEnd eLineEnd) { - return tmpl_convertLineEnd(rIn, eLineEnd); + return tmpl_convertLineEnd(rIn, eLineEnd); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 08ac00634e5c..65b051a253f7 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -73,7 +73,7 @@ InternalStreamLock::InternalStreamLock( osl::DirectoryItem::get( m_pStream->GetFileName(), m_aItem ); LockList::get().push_back( this ); #if OSL_DEBUG_LEVEL > 1 - rtl::OString aFileName(rtl::OUStringToOString(m_pStream->GetFileName(), + OString aFileName(OUStringToOString(m_pStream->GetFileName(), osl_getThreadTextEncoding())); fprintf( stderr, "locked %s", aFileName.getStr() ); if( m_nStartPos || m_nEndPos ) @@ -94,7 +94,7 @@ InternalStreamLock::~InternalStreamLock() } } #if OSL_DEBUG_LEVEL > 1 - rtl::OString aFileName(rtl::OUStringToOString(m_pStream->GetFileName(), + OString aFileName(OUStringToOString(m_pStream->GetFileName(), osl_getThreadTextEncoding())); fprintf( stderr, "unlocked %s", aFileName.getStr() ); if( m_nStartPos || m_nEndPos ) @@ -303,7 +303,7 @@ SvFileStream::SvFileStream( const String& rFileName, StreamMode nOpenMode ) SetBufferSize( 1024 ); // convert URL to SystemPath, if necessary - ::rtl::OUString aSystemFileName; + OUString aSystemFileName; if( FileBase::getSystemPathFromFileURL( rFileName , aSystemFileName ) != FileBase::E_None ) { @@ -348,10 +348,10 @@ sal_uInt16 SvFileStream::IsA() const sal_Size SvFileStream::GetData( void* pData, sal_Size nSize ) { #ifdef DBG_UTIL - rtl::OStringBuffer aTraceStr("SvFileStream::GetData(): "); + OStringBuffer aTraceStr("SvFileStream::GetData(): "); aTraceStr.append(static_cast(nSize)); aTraceStr.append(" Bytes from "); - aTraceStr.append(rtl::OUStringToOString(aFilename, + aTraceStr.append(OUStringToOString(aFilename, osl_getThreadTextEncoding())); OSL_TRACE("%s", aTraceStr.getStr()); #endif @@ -372,10 +372,10 @@ sal_Size SvFileStream::GetData( void* pData, sal_Size nSize ) sal_Size SvFileStream::PutData( const void* pData, sal_Size nSize ) { #ifdef DBG_UTIL - rtl::OStringBuffer aTraceStr("SvFileStream::PutData(): "); + OStringBuffer aTraceStr("SvFileStream::PutData(): "); aTraceStr.append(static_cast(nSize)); aTraceStr.append(" Bytes to "); - aTraceStr.append(rtl::OUStringToOString(aFilename, + aTraceStr.append(OUStringToOString(aFilename, osl_getThreadTextEncoding())); OSL_TRACE("%s", aTraceStr.getStr()); #endif @@ -464,7 +464,7 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes ) { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "InternalLock on %s [ %ld ... %ld ] failed\n", - rtl::OUStringToOString(aFilename, osl_getThreadTextEncoding()).getStr(), nByteOffset, nByteOffset+nBytes ); + OUStringToOString(aFilename, osl_getThreadTextEncoding()).getStr(), nByteOffset, nByteOffset+nBytes ); #endif return sal_False; } @@ -503,15 +503,15 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) eStreamMode &= ~STREAM_TRUNC; // don't truncat on reopen aFilename = rFilename; - rtl::OString aLocalFilename(rtl::OUStringToOString(aFilename, osl_getThreadTextEncoding())); + OString aLocalFilename(OUStringToOString(aFilename, osl_getThreadTextEncoding())); #ifdef DBG_UTIL - rtl::OStringBuffer aTraceStr("SvFileStream::Open(): "); + OStringBuffer aTraceStr("SvFileStream::Open(): "); aTraceStr.append(aLocalFilename); OSL_TRACE( "%s", aTraceStr.getStr() ); #endif - rtl::OUString aFileURL; + OUString aFileURL; osl::DirectoryItem aItem; osl::FileStatus aStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_LinkTargetURL ); @@ -558,9 +558,9 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) #if OSL_DEBUG_LEVEL > 0 fprintf( stderr, "Removing link and replacing with file contents (%s) -> (%s).\n", - rtl::OUStringToOString( aStatus.getLinkTargetURL(), + OUStringToOString( aStatus.getLinkTargetURL(), RTL_TEXTENCODING_UTF8).getStr(), - rtl::OUStringToOString( aFileURL, + OUStringToOString( aFileURL, RTL_TEXTENCODING_UTF8).getStr() ); #endif } @@ -604,8 +604,8 @@ void SvFileStream::Close() if ( IsOpen() ) { #ifdef DBG_UTIL - rtl::OStringBuffer aTraceStr("SvFileStream::Close(): "); - aTraceStr.append(rtl::OUStringToOString(aFilename, + OStringBuffer aTraceStr("SvFileStream::Close(): "); + aTraceStr.append(OUStringToOString(aFilename, osl_getThreadTextEncoding())); OSL_TRACE("%s", aTraceStr.getStr()); #endif diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index 847b7a916eda..13d1ea118782 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -108,7 +108,7 @@ SvFileStream::SvFileStream( const String& rFileName, StreamMode nMode ) SetBufferSize( 8192 ); // convert URL to SystemPath, if necessary - ::rtl::OUString aFileName, aNormPath; + OUString aFileName, aNormPath; if ( FileBase::getSystemPathFromFileURL( rFileName, aFileName ) != FileBase::E_None ) aFileName = rFileName; @@ -280,7 +280,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode ) eStreamMode &= ~STREAM_TRUNC; // don't truncate on reopen aFilename = aParsedFilename; - rtl::OString aFileNameA(rtl::OUStringToOString(aFilename, osl_getThreadTextEncoding())); + OString aFileNameA(OUStringToOString(aFilename, osl_getThreadTextEncoding())); SetLastError( ERROR_SUCCESS ); // might be changed by Redirector DWORD nOpenAction; diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx index e77174041ce2..29041ddc0e41 100644 --- a/tools/source/string/strucvt.cxx +++ b/tools/source/string/strucvt.cxx @@ -44,18 +44,18 @@ UniString::UniString( const char* pByteStr, xub_StrLen nLen, eTextEncoding, nCvtFlags ); } -UniString::UniString( const rtl::OUString& rStr ) +UniString::UniString( const OUString& rStr ) : mpData(NULL) { DBG_CTOR( UniString, DbgCheckUniString ); OSL_ENSURE(rStr.pData->length < STRING_MAXLEN, - "Overflowing rtl::OUString -> UniString cut to zero length"); + "Overflowing OUString -> UniString cut to zero length"); if (rStr.pData->length < STRING_MAXLEN) { - mpData = reinterpret_cast< UniStringData * >(const_cast< rtl::OUString & >(rStr).pData); + mpData = reinterpret_cast< UniStringData * >(const_cast< OUString & >(rStr).pData); STRING_ACQUIRE((STRING_TYPE *)mpData); } else @@ -64,18 +64,18 @@ UniString::UniString( const rtl::OUString& rStr ) } } -UniString& UniString::Assign( const rtl::OUString& rStr ) +UniString& UniString::Assign( const OUString& rStr ) { DBG_CHKTHIS( UniString, DbgCheckUniString ); OSL_ENSURE(rStr.pData->length < STRING_MAXLEN, - "Overflowing rtl::OUString -> UniString cut to zero length"); + "Overflowing OUString -> UniString cut to zero length"); if (rStr.pData->length < STRING_MAXLEN) { if( mpData != NULL ) STRING_RELEASE((STRING_TYPE *)mpData); - mpData = reinterpret_cast< UniStringData * >(const_cast< rtl::OUString & >(rStr).pData); + mpData = reinterpret_cast< UniStringData * >(const_cast< OUString & >(rStr).pData); STRING_ACQUIRE((STRING_TYPE *)mpData); } else @@ -93,12 +93,12 @@ UniString& UniString::Assign( const rtl::OUString& rStr ) UniString::UniString( const ResId& rResId ) : mpData(NULL) { - rtl::OUString sStr(rResId.toString()); + OUString sStr(rResId.toString()); DBG_CTOR( UniString, DbgCheckUniString ); OSL_ENSURE(sStr.pData->length < STRING_MAXLEN, - "Overflowing rtl::OUString -> UniString cut to zero length"); + "Overflowing OUString -> UniString cut to zero length"); if (sStr.pData->length < STRING_MAXLEN) { @@ -111,17 +111,17 @@ UniString::UniString( const ResId& rResId ) } } -rtl::OUString ResId::toString() const +OUString ResId::toString() const { SetRT( RSC_STRING ); ResMgr* pResMgr = GetResMgr(); if ( !pResMgr || !pResMgr->GetResource( *this ) ) { - rtl::OUString sRet; + OUString sRet; #if OSL_DEBUG_LEVEL > 0 - sRet = rtl::OUStringBuffer(). + sRet = OUStringBuffer(). append("(GetId())). append(" not found>"). @@ -138,7 +138,7 @@ rtl::OUString ResId::toString() const RSHEADER_TYPE * pResHdr = (RSHEADER_TYPE*)pResMgr->GetClass(); sal_Int32 nStringLen = rtl_str_getLength( (char*)(pResHdr+1) ); - rtl::OUString sRet((const char*)(pResHdr+1), nStringLen, RTL_TEXTENCODING_UTF8); + OUString sRet((const char*)(pResHdr+1), nStringLen, RTL_TEXTENCODING_UTF8); sal_uInt32 nSize = sizeof( RSHEADER_TYPE ) + sal::static_int_cast< sal_uInt32 >(nStringLen) + 1; diff --git a/touch/source/uno/Document.cxx b/touch/source/uno/Document.cxx index 662771c46a1f..a81c1117b447 100644 --- a/touch/source/uno/Document.cxx +++ b/touch/source/uno/Document.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::osl::MutexGuard; namespace org { namespace libreoffice { namespace touch diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 6a73cd54149a..53a4b8e9896c 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -105,8 +105,8 @@ public: ignored, hopefully resulting in a local DBus tube. */ static TeleConference* startGroupSession( TpAccount *pAccount, - const rtl::OUString& rConferenceRoom, - const rtl::OUString& rConferenceServer ); + const OUString& rConferenceRoom, + const OUString& rConferenceServer ); /** Start a session with a buddy. @@ -135,7 +135,7 @@ public: // Only for callbacks. static void addConference( TeleConference* pConference ); - static rtl::OString createUuid(); + static OString createUuid(); /** @param rUuid is stored so that accepted conference with this UUID could be then retrieved by getConference() when loading new document @@ -143,13 +143,13 @@ public: static void setCurrentUuid( const OString& rUuid ); /// "LibreOfficeWhatEver" - static rtl::OString getFullClientName(); + static OString getFullClientName(); /// "org.libreoffice.calcWhatEver" - static rtl::OString getFullServiceName(); + static OString getFullServiceName(); /// "/org/libreoffice/calcWhatEver" - static rtl::OString getFullObjectPath(); + static OString getFullObjectPath(); /** Add a suffix to the client name and DBus tube names, e.g. "WhatEver" diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx index 5e2ccf7fc5c8..e7a2b1f64f94 100644 --- a/tubes/qa/test_manager.cxx +++ b/tubes/qa/test_manager.cxx @@ -99,12 +99,12 @@ void TestTeleTubes::setUp() TeleManager::addSuffixToNames( "TeleTest"); - rtl::OUString aOffererIdentifier; + OUString aOffererIdentifier; CPPUNIT_ASSERT_MESSAGE( "See README for how to set up test-config.ini", aTestConfig.getFrom("offerer", aOffererIdentifier)); maOffererIdentifier = OUStringToOString( aOffererIdentifier, RTL_TEXTENCODING_UTF8); - rtl::OUString aAccepterIdentifier; + OUString aAccepterIdentifier; CPPUNIT_ASSERT_MESSAGE( "See README for how to set up test-config.ini", aTestConfig.getFrom("accepter", aAccepterIdentifier)); maAccepterIdentifier = OUStringToOString( aAccepterIdentifier, RTL_TEXTENCODING_UTF8); diff --git a/tubes/source/contacts.cxx b/tubes/source/contacts.cxx index a6badfb21cf3..0cc58dfe332c 100644 --- a/tubes/source/contacts.cxx +++ b/tubes/source/contacts.cxx @@ -114,7 +114,7 @@ class TubeContacts : public ModelessDialog TpAccount* pAccount = maACs[i].first; SAL_INFO( "tubes", "picked " << tp_account_get_display_name( pAccount ) ); TeleConference* pConference = TeleManager::startGroupSession( pAccount, - rtl::OUString("liboroom"), rtl::OUString("conference.jabber.org") ); + OUString("liboroom"), OUString("conference.jabber.org") ); if (!pConference) SAL_WARN( "tubes", "Could not start group session." ); else @@ -145,9 +145,9 @@ public: { } - static rtl::OUString fromUTF8( const char *pStr ) + static OUString fromUTF8( const char *pStr ) { - return rtl::OStringToOUString( rtl::OString( pStr, strlen( pStr ) ), + return OStringToOUString( OString( pStr, strlen( pStr ) ), RTL_TEXTENCODING_UTF8 ); } @@ -168,9 +168,9 @@ public: GFile *pAvatarFile = tp_contact_get_avatar_file( it->second ); if( pAvatarFile ) { - const rtl::OUString sAvatarFileUrl = fromUTF8( g_file_get_path ( pAvatarFile ) ); + const OUString sAvatarFileUrl = fromUTF8( g_file_get_path ( pAvatarFile ) ); Graphic aGraphic; - if( GRFILTER_OK == GraphicFilter::LoadGraphic( sAvatarFileUrl, rtl::OUString(""), aGraphic ) ) + if( GRFILTER_OK == GraphicFilter::LoadGraphic( sAvatarFileUrl, OUString(""), aGraphic ) ) { BitmapEx aBitmap = aGraphic.GetBitmapEx(); double fScale = 30.0 / aBitmap.GetSizePixel().Height(); @@ -178,7 +178,7 @@ public: aImage = Image( aBitmap ); } } - rtl::OUStringBuffer aEntry( 128 ); + OUStringBuffer aEntry( 128 ); aEntry.append( " " ); aEntry.append( fromUTF8 ( tp_contact_get_alias( it->second ) ) ); aEntry.append( " - " ); diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index f8070ad1064e..70d9e44b87a0 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -289,7 +289,7 @@ static void TeleManager_TransferDone( EmpathyFTHandler *handler, TpFileTransferC SAL_INFO( "tubes", "TeleManager_TransferDone: hooray!"); GFile *gfile = empathy_ft_handler_get_gfile( handler); char *uri = g_file_get_uri( gfile); - rtl::OUString aUri( OUString::createFromAscii( uri ) ); + OUString aUri( OUString::createFromAscii( uri ) ); g_free( uri); TeleManager_fileReceived( aUri, empathy_ft_handler_get_description( handler ) ); @@ -609,8 +609,8 @@ TeleConference* TeleManager::startDemoSession() /* TODO: factor out common code with startBuddySession() */ TeleConference* TeleManager::startGroupSession( TpAccount *pAccount, - const rtl::OUString& rUConferenceRoom, - const rtl::OUString& rUConferenceServer ) + const OUString& rUConferenceRoom, + const OUString& rUConferenceServer ) { INFO_LOGGER_F( "TeleManager::startGroupSession"); @@ -824,21 +824,21 @@ AccountContactPairV TeleManager::getContacts() return pairs; } -rtl::OString TeleManager::getFullClientName() +OString TeleManager::getFullClientName() { OStringBuffer aBuf(64); aBuf.append( LIBO_CLIENT_SUFFIX ).append( pImpl->msNameSuffix); return aBuf.makeStringAndClear(); } -rtl::OString TeleManager::getFullServiceName() +OString TeleManager::getFullServiceName() { OStringBuffer aBuf(64); aBuf.append( LIBO_DTUBE_SERVICE ).append( pImpl->msNameSuffix); return aBuf.makeStringAndClear(); } -rtl::OString TeleManager::getFullObjectPath() +OString TeleManager::getFullObjectPath() { OStringBuffer aBuf(64); aBuf.append( '/').append( LIBO_DTUBE_SERVICE ).append( pImpl->msNameSuffix); @@ -846,7 +846,7 @@ rtl::OString TeleManager::getFullObjectPath() return aStr; } -rtl::OString TeleManager::createUuid() +OString TeleManager::createUuid() { sal_uInt8 nId[16]; rtl_createUuid( nId, 0, sal_True); @@ -856,7 +856,7 @@ rtl::OString TeleManager::createUuid() snprintf( aBuf+2*i, 3, "%02x", (unsigned char)nId[i]); } aBuf[32] = 0; - return rtl::OString( aBuf); + return OString( aBuf); } Mutex& TeleManager::GetMutex() diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index a9fcddba56f5..52e7d2f9dd55 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -38,7 +38,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using ::rtl::OUString; #define COMSUNSTARUCBCCRS_DEFAULT_FETCH_SIZE 256 #define COMSUNSTARUCBCCRS_DEFAULT_FETCH_DIRECTION FetchDirection::FORWARD diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index 1f15bc5017a7..3d3df4b78aee 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -96,7 +96,7 @@ class CachedContentResultSet throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - const rtl::OUString& SAL_CALL + const OUString& SAL_CALL getContentIdentifierString( sal_Int32 nRow ) throw( com::sun::star::uno::RuntimeException ); @@ -216,7 +216,7 @@ public: //----------------------------------------------------------------- virtual void SAL_CALL - setPropertyValue( const rtl::OUString& aPropertyName, + setPropertyValue( const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -225,7 +225,7 @@ public: com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Any SAL_CALL - getPropertyValue( const rtl::OUString& PropertyName ) + getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); @@ -249,7 +249,7 @@ public: //----------------------------------------------------------------- // XContentAccess inherited //----------------------------------------------------------------- - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString() throw( com::sun::star::uno::RuntimeException ); @@ -348,7 +348,7 @@ public: throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 4069056c0d44..23b986353e52 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using ::rtl::OUString; CachedContentResultSetStub::CachedContentResultSetStub( Reference< XResultSet > xOrigin ) : ContentResultSetWrapper( xOrigin ) diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index 8c6f61f1b5d5..5ab38ff3cea6 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -48,8 +48,8 @@ private: sal_Bool m_bFirstFetchSizePropagationDone; sal_Int32 m_nLastFetchSize; sal_Bool m_bLastFetchDirection; - const rtl::OUString m_aPropertyNameForFetchSize; - const rtl::OUString m_aPropertyNameForFetchDirection; + const OUString m_aPropertyNameForFetchSize; + const OUString m_aPropertyNameForFetchDirection; void SAL_CALL diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index fef33a44e682..8b9f1a9a6959 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using ::rtl::OUString; CachedDynamicResultSet::CachedDynamicResultSet( Reference< XDynamicResultSet > xOrigin diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index 4581c6838a98..c370a59cdc37 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using ::rtl::OUString; CachedDynamicResultSetStub::CachedDynamicResultSetStub( Reference< XDynamicResultSet > xOrigin diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index 79cc52af4f04..3fc37fdb0fa8 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -using ::rtl::OUString; //========================================================================= extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory( diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 6d072994e7d1..14fa320cc8d9 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using ::rtl::OUString; //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index d04463e93cc6..7d1b3bf65740 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -54,7 +54,7 @@ protected: struct equalStr_Impl { - bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const + bool operator()( const OUString& s1, const OUString& s2 ) const { return !!( s1 == s2 ); } @@ -62,14 +62,14 @@ protected: struct hashStr_Impl { - size_t operator()( const rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } }; typedef cppu::OMultiTypeInterfaceContainerHelperVar - < rtl::OUString , hashStr_Impl , equalStr_Impl > + < OUString , hashStr_Impl , equalStr_Impl > PropertyChangeListenerContainer_Impl; //-------------------------------------------------------------------------- // class ReacquireableGuard @@ -260,7 +260,7 @@ public: throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setPropertyValue( const rtl::OUString& aPropertyName, + setPropertyValue( const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -269,13 +269,13 @@ public: com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Any SAL_CALL - getPropertyValue( const rtl::OUString& PropertyName ) + getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - addPropertyChangeListener( const rtl::OUString& aPropertyName, + addPropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -283,7 +283,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removePropertyChangeListener( const rtl::OUString& aPropertyName, + removePropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -291,7 +291,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - addVetoableChangeListener( const rtl::OUString& PropertyName, + addVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -299,7 +299,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeVetoableChangeListener( const rtl::OUString& PropertyName, + removeVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -325,7 +325,7 @@ public: //----------------------------------------------------------------- // XContentAccess //----------------------------------------------------------------- - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString() throw( com::sun::star::uno::RuntimeException ); @@ -424,7 +424,7 @@ public: throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index 30a2b1f8ff79..3faca33ec7aa 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace cppu; -using ::rtl::OUString; //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index 43799dbd1303..ce3b9d6d346c 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -76,7 +76,7 @@ void SAL_CALL UcbCommandEnvironment::initialize( //========================================================================= // virtual -::rtl::OUString SAL_CALL UcbCommandEnvironment::getImplementationName() +OUString SAL_CALL UcbCommandEnvironment::getImplementationName() throw ( uno::RuntimeException ) { return getImplementationName_Static(); @@ -85,11 +85,11 @@ void SAL_CALL UcbCommandEnvironment::initialize( //========================================================================= // virtual sal_Bool SAL_CALL -UcbCommandEnvironment::supportsService( const ::rtl::OUString& ServiceName ) +UcbCommandEnvironment::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString * pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for ( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) { if ( pArray[ i ] == ServiceName ) @@ -100,7 +100,7 @@ UcbCommandEnvironment::supportsService( const ::rtl::OUString& ServiceName ) //========================================================================= // virtual -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UcbCommandEnvironment::getSupportedServiceNames() throw ( uno::RuntimeException ) { @@ -109,17 +109,17 @@ UcbCommandEnvironment::getSupportedServiceNames() //========================================================================= // static -rtl::OUString UcbCommandEnvironment::getImplementationName_Static() +OUString UcbCommandEnvironment::getImplementationName_Static() { - return rtl::OUString( "com.sun.star.comp.ucb.CommandEnvironment" ); + return OUString( "com.sun.star.comp.ucb.CommandEnvironment" ); } //========================================================================= // static -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > UcbCommandEnvironment::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = "com.sun.star.ucb.CommandEnvironment"; return aSNS; } diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx index c8b33310f66c..4ba7c7c3bf6d 100644 --- a/ucb/source/core/cmdenv.hxx +++ b/ucb/source/core/cmdenv.hxx @@ -53,14 +53,14 @@ public: com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( com::sun::star::uno::RuntimeException ); @@ -75,9 +75,9 @@ public: throw ( com::sun::star::uno::RuntimeException ); // Non-UNO interfaces - static rtl::OUString + static OUString getImplementationName_Static(); - static com::sun::star::uno::Sequence< rtl::OUString > + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); static com::sun::star::uno::Reference< diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx index e9e7d953ace1..209aeeda0c44 100644 --- a/ucb/source/core/identify.cxx +++ b/ucb/source/core/identify.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ucb; -using ::rtl::OUString; //========================================================================= // diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx index e512463b425c..8c504f7a5e75 100644 --- a/ucb/source/core/identify.hxx +++ b/ucb/source/core/identify.hxx @@ -36,7 +36,7 @@ class ContentIdentifier : { public: ContentIdentifier( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const rtl::OUString& ContentId ); + const OUString& ContentId ); virtual ~ContentIdentifier(); // XInterface @@ -46,15 +46,15 @@ public: XTYPEPROVIDER_DECL() // XContentIdentifier - virtual rtl::OUString SAL_CALL getContentIdentifier() + virtual OUString SAL_CALL getContentIdentifier() throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getContentProviderScheme() + virtual OUString SAL_CALL getContentProviderScheme() throw( com::sun::star::uno::RuntimeException ); private: com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; - rtl::OUString m_aContentId; - rtl::OUString m_aProviderScheme; + OUString m_aContentId; + OUString m_aProviderScheme; }; #endif /* !_IDENTIFY_HXX */ diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index a9bb3a4f4165..4447cc88df09 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -27,7 +27,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using ::rtl::OUString; //========================================================================= //========================================================================= @@ -382,7 +381,7 @@ UcbContentProviderProxy::getContentProvider() } OSL_ENSURE( m_xProvider.is(), - rtl::OStringBuffer("UcbContentProviderProxy::getContentProvider - No provider for '").append(rtl::OUStringToOString(m_aService, osl_getThreadTextEncoding())).append(".").getStr() ); + OStringBuffer("UcbContentProviderProxy::getContentProvider - No provider for '").append(OUStringToOString(m_aService, osl_getThreadTextEncoding())).append(".").getStr() ); return m_xTargetProvider; } diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx index b2dbb215929d..fd40d0ca733c 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -71,7 +71,7 @@ public: // XContentProviderFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL - createContentProvider( const ::rtl::OUString& Service ) + createContentProvider( const OUString& Service ) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -90,9 +90,9 @@ class UcbContentProviderProxy : public com::sun::star::ucb::XParameterizedContentProvider { ::osl::Mutex m_aMutex; - ::rtl::OUString m_aService; - ::rtl::OUString m_aTemplate; - ::rtl::OUString m_aArguments; + OUString m_aService; + OUString m_aTemplate; + OUString m_aArguments; sal_Bool m_bReplace; sal_Bool m_bRegister; @@ -107,7 +107,7 @@ public: UcbContentProviderProxy( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const ::rtl::OUString& Service ); + const OUString& Service ); virtual ~UcbContentProviderProxy(); // XInterface @@ -142,15 +142,15 @@ public: // XParameterizedContentProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL - registerInstance( const ::rtl::OUString& Template, - const ::rtl::OUString& Arguments, + registerInstance( const OUString& Template, + const OUString& Arguments, sal_Bool ReplaceExisting ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL - deregisterInstance( const ::rtl::OUString& Template, - const ::rtl::OUString& Arguments ) + deregisterInstance( const OUString& Template, + const OUString& Arguments ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); }; diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 8a30605561b1..324641dc6ce2 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -58,8 +58,6 @@ using namespace ucb_impl; using namespace com::sun::star; using namespace ucbhelper; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define CONFIG_CONTENTPROVIDERS_KEY \ "/org.openoffice.ucb.Configuration/ContentProviders" diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx index 1f11b330c6af..50d5d699cc16 100644 --- a/ucb/source/core/ucb.hxx +++ b/ucb/source/core/ucb.hxx @@ -100,7 +100,7 @@ public: registerContentProvider( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& Provider, - const rtl::OUString& Scheme, + const OUString& Scheme, sal_Bool ReplaceExisting ) throw( com::sun::star::ucb::DuplicateProviderException, com::sun::star::uno::RuntimeException ); @@ -108,7 +108,7 @@ public: deregisterContentProvider( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& Provider, - const rtl::OUString& Scheme ) + const OUString& Scheme ) throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentProviderInfo > SAL_CALL @@ -116,7 +116,7 @@ public: throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > SAL_CALL - queryContentProvider( const rtl::OUString& Identifier ) + queryContentProvider( const OUString& Identifier ) throw( com::sun::star::uno::RuntimeException ); // XContentProvider @@ -136,7 +136,7 @@ public: // XContentIdentifierFactory virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL - createContentIdentifier( const rtl::OUString& ContentId ) + createContentIdentifier( const OUString& ContentId ) throw( com::sun::star::uno::RuntimeException ); // XCommandProcessor @@ -169,7 +169,7 @@ public: private: com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > - queryContentProvider( const rtl::OUString& Identifier, + queryContentProvider( const OUString& Identifier, sal_Bool bResolved ); com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo > @@ -191,8 +191,8 @@ private: throw ( com::sun::star::uno::RuntimeException); bool getContentProviderData( - const rtl::OUString & rKey1, - const rtl::OUString & rKey2, + const OUString & rKey1, + const OUString & rKey2, ucbhelper::ContentProviderDataList & rListToFill); void prepareAndRegister( const ucbhelper::ContentProviderDataList& rData); diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 043ceefbef8d..3c4fdd71fe02 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -221,12 +221,12 @@ public: virtual uno::Sequence< ucb::CommandInfo > SAL_CALL getCommands() throw( uno::RuntimeException ); virtual ucb::CommandInfo SAL_CALL - getCommandInfoByName( const rtl::OUString& Name ) + getCommandInfoByName( const OUString& Name ) throw( ucb::UnsupportedCommandException, uno::RuntimeException ); virtual ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) throw( ucb::UnsupportedCommandException, uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasCommandByName( const rtl::OUString& Name ) + virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) throw( uno::RuntimeException ); virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) throw( uno::RuntimeException ); @@ -239,19 +239,19 @@ CommandProcessorInfo::CommandProcessorInfo() (*m_pInfo)[ 0 ] = ucb::CommandInfo( - rtl::OUString( GETCOMMANDINFO_NAME ), // Name + OUString( GETCOMMANDINFO_NAME ), // Name GETCOMMANDINFO_HANDLE, // Handle getCppuVoidType() ); // ArgType (*m_pInfo)[ 1 ] = ucb::CommandInfo( - rtl::OUString( GLOBALTRANSFER_NAME ), // Name + OUString( GLOBALTRANSFER_NAME ), // Name GLOBALTRANSFER_HANDLE, // Handle getCppuType( static_cast< ucb::GlobalTransferCommandArgument * >( 0 ) ) ); // ArgType (*m_pInfo)[ 2 ] = ucb::CommandInfo( - rtl::OUString( CHECKIN_NAME ), // Name + OUString( CHECKIN_NAME ), // Name CHECKIN_HANDLE, // Handle getCppuType( static_cast< @@ -277,7 +277,7 @@ CommandProcessorInfo::getCommands() //========================================================================= // virtual ucb::CommandInfo SAL_CALL -CommandProcessorInfo::getCommandInfoByName( const rtl::OUString& Name ) +CommandProcessorInfo::getCommandInfoByName( const OUString& Name ) throw( ucb::UnsupportedCommandException, uno::RuntimeException ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) @@ -307,7 +307,7 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) //========================================================================= // virtual sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( - const rtl::OUString& Name ) + const OUString& Name ) throw( uno::RuntimeException ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) @@ -337,10 +337,10 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle ) //========================================================================= //========================================================================= -rtl::OUString createDesiredName( - const rtl::OUString & rSourceURL, const rtl::OUString & rNewTitle ) +OUString createDesiredName( + const OUString & rSourceURL, const OUString & rNewTitle ) { - rtl::OUString aName( rNewTitle ); + OUString aName( rNewTitle ); if ( aName.isEmpty() ) { // calculate name using source URL @@ -383,16 +383,16 @@ rtl::OUString createDesiredName( if ( nPos != -1 ) aName = aName.copy( 0, nPos ); } - return rtl::OUString( aName ); + return OUString( aName ); } -rtl::OUString createDesiredName( +OUString createDesiredName( const ucb::GlobalTransferCommandArgument & rArg ) { return createDesiredName( rArg.SourceURL, rArg.NewTitle ); } -rtl::OUString createDesiredName( +OUString createDesiredName( const ucb::TransferInfo & rArg ) { return createDesiredName( rArg.SourceURL, rArg.NewTitle ); @@ -403,16 +403,16 @@ enum NameClashContinuation { NOT_HANDLED, ABORT, OVERWRITE, NEW_NAME, UNKNOWN }; NameClashContinuation interactiveNameClashResolve( const uno::Reference< ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rTargetURL, - const rtl::OUString & rClashingName, + const OUString & rTargetURL, + const OUString & rClashingName, /* [out] */ uno::Any & rException, - /* [out] */ rtl::OUString & rNewName ) + /* [out] */ OUString & rNewName ) { rtl::Reference< ucbhelper::SimpleNameClashResolveRequest > xRequest( new ucbhelper::SimpleNameClashResolveRequest( rTargetURL, // target folder URL rClashingName, // clashing name - rtl::OUString(), // no proposal for new name + OUString(), // no proposal for new name sal_True /* bSupportsOverwriteData */ ) ); rException = xRequest->getRequest(); @@ -478,19 +478,19 @@ NameClashContinuation interactiveNameClashResolve( bool setTitle( const uno::Reference< ucb::XCommandProcessor > & xCommandProcessor, const uno::Reference< ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rNewTitle ) + const OUString & rNewTitle ) throw( uno::RuntimeException ) { try { uno::Sequence< beans::PropertyValue > aPropValues( 1 ); aPropValues[ 0 ].Name - = rtl::OUString( "Title" ); + = OUString( "Title" ); aPropValues[ 0 ].Handle = -1; aPropValues[ 0 ].Value = uno::makeAny( rNewTitle ); ucb::Command aSetPropsCommand( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, uno::makeAny( aPropValues ) ); @@ -546,7 +546,7 @@ uno::Reference< ucb::XContent > createNew( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -554,19 +554,19 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString("Target is no XCommandProcessor!"), + OUString("Target is no XCommandProcessor!"), rContext.xProcessor ); // Unreachable } uno::Sequence< beans::Property > aPropsToObtain( 1 ); aPropsToObtain[ 0 ].Name - = rtl::OUString("CreatableContentsInfo"); + = OUString("CreatableContentsInfo"); aPropsToObtain[ 0 ].Handle = -1; ucb::Command aGetPropsCommand( - rtl::OUString("getPropertyValues"), + OUString("getPropertyValues"), -1, uno::makeAny( aPropsToObtain ) ); @@ -599,7 +599,7 @@ uno::Reference< ucb::XContent > createNew( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -607,7 +607,7 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString("Target is no XContentCreator!"), + OUString("Target is no XContentCreator!"), rContext.xProcessor ); // Unreachable } @@ -620,7 +620,7 @@ uno::Reference< ucb::XContent > createNew( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString("Folder"), + OUString("Folder"), -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -628,7 +628,7 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString("No types creatable!"), + OUString("No types creatable!"), rContext.xProcessor ); // Unreachable } @@ -694,7 +694,7 @@ uno::Reference< ucb::XContent > createNew( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Unknown transfer operation!" ), + OUString( "Unknown transfer operation!" ), rContext.xProcessor, -1 ) ), rContext.xOrigEnv ); @@ -714,7 +714,7 @@ uno::Reference< ucb::XContent > createNew( // First, try it using "CreatabeleContentsInfo" property and // "createNewContent" command -> the "new" way. ucb::Command aCreateNewCommand( - rtl::OUString("createNewContent"), + OUString("createNewContent"), -1, uno::makeAny( aTypesInfo[ n ] ) ); @@ -734,7 +734,7 @@ uno::Reference< ucb::XContent > createNew( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -742,7 +742,7 @@ uno::Reference< ucb::XContent > createNew( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "createNewContent failed!" ), + OUString( "createNewContent failed!" ), rContext.xProcessor ); // Unreachable } @@ -761,7 +761,7 @@ void transferProperties( throw( uno::Exception ) { ucb::Command aGetPropertySetInfoCommand( - rtl::OUString("getPropertySetInfo"), + OUString("getPropertySetInfo"), -1, uno::Any() ); @@ -773,7 +773,7 @@ void transferProperties( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -781,7 +781,7 @@ void transferProperties( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "Unable to get propertyset info from source object!" ), + OUString( "Unable to get propertyset info from source object!" ), rContext.xProcessor ); // Unreachable } @@ -789,7 +789,7 @@ void transferProperties( uno::Sequence< beans::Property > aAllProps = xInfo->getProperties(); ucb::Command aGetPropsCommand1( - rtl::OUString("getPropertyValues"), + OUString("getPropertyValues"), -1, uno::makeAny( aAllProps ) ); @@ -801,7 +801,7 @@ void transferProperties( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -809,7 +809,7 @@ void transferProperties( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "Unable to get properties from source object!" ), + OUString( "Unable to get properties from source object!" ), rContext.xProcessor ); // Unreachable } @@ -880,7 +880,7 @@ void transferProperties( if ( !bHasTitle && !rContext.aArg.NewTitle.isEmpty() ) { aPropValues[ nWritePos ].Name - = rtl::OUString("Title"); + = OUString("Title"); aPropValues[ nWritePos ].Handle = -1; aPropValues[ nWritePos ].Value <<= rContext.aArg.NewTitle; @@ -892,7 +892,7 @@ void transferProperties( == ucb::TransferCommandOperation_LINK ) ) { aPropValues[ nWritePos ].Name - = rtl::OUString("TargetURL"); + = OUString("TargetURL"); aPropValues[ nWritePos ].Handle = -1; aPropValues[ nWritePos ].Value <<= rContext.aArg.SourceURL; @@ -904,7 +904,7 @@ void transferProperties( // Set properties at new object. ucb::Command aSetPropsCommand( - rtl::OUString("setPropertyValues"), + OUString("setPropertyValues"), -1, uno::makeAny( aPropValues ) ); @@ -939,7 +939,7 @@ uno::Reference< io::XInputStream > getInputStream( aArg.Properties = uno::Sequence< beans::Property >( 0 ); // unused ucb::Command aOpenCommand( - rtl::OUString("open"), + OUString("open"), -1, uno::makeAny( aArg ) ); @@ -974,7 +974,7 @@ uno::Reference< io::XInputStream > getInputStream( aArg.Properties = uno::Sequence< beans::Property >( 0 ); ucb::Command aOpenCommand( - rtl::OUString("open"), + OUString("open"), -1, uno::makeAny( aArg ) ); @@ -1006,11 +1006,11 @@ uno::Reference< sdbc::XResultSet > getResultSet( uno::Sequence< beans::Property > aProps( 3 ); - aProps[ 0 ].Name = rtl::OUString("IsFolder"); + aProps[ 0 ].Name = OUString("IsFolder"); aProps[ 0 ].Handle = -1; /* unknown */ - aProps[ 1 ].Name = rtl::OUString("IsDocument"); + aProps[ 1 ].Name = OUString("IsDocument"); aProps[ 1 ].Handle = -1; /* unknown */ - aProps[ 2 ].Name = rtl::OUString("TargetURL"); + aProps[ 2 ].Name = OUString("TargetURL"); aProps[ 2 ].Handle = -1; /* unknown */ ucb::OpenCommandArgument2 aArg; @@ -1019,7 +1019,7 @@ uno::Reference< sdbc::XResultSet > getResultSet( aArg.Sink = 0; aArg.Properties = aProps; - ucb::Command aOpenCommand( rtl::OUString("open"), + ucb::Command aOpenCommand( OUString("open"), -1, uno::makeAny( aArg ) ); try @@ -1057,11 +1057,11 @@ void handleNameClashRename( // Obtain old title. uno::Sequence< beans::Property > aProps( 1 ); - aProps[ 0 ].Name = rtl::OUString("Title"); + aProps[ 0 ].Name = OUString("Title"); aProps[ 0 ].Handle = -1; ucb::Command aGetPropsCommand( - rtl::OUString("getPropertyValues"), + OUString("getPropertyValues"), -1, uno::makeAny( aProps ) ); @@ -1073,7 +1073,7 @@ void handleNameClashRename( uno::Any aProps2 = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri" ), + OUString( "Uri" ), -1, uno::makeAny( xNew->getIdentifier()->getContentIdentifier() ), @@ -1082,25 +1082,25 @@ void handleNameClashRename( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >( &aProps2, 1 ), rContext.xOrigEnv, - rtl::OUString( "Unable to get properties from new object!" ), + OUString( "Unable to get properties from new object!" ), rContext.xProcessor ); // Unreachable } - rtl::OUString aOldTitle = xRow->getString( 1 ); + OUString aOldTitle = xRow->getString( 1 ); if ( aOldTitle.isEmpty() ) { ucbhelper::cancelCommandExecution( uno::makeAny( beans::UnknownPropertyException( - rtl::OUString( "Unable to get property 'Title' from new object!" ), + OUString( "Unable to get property 'Title' from new object!" ), rContext.xProcessor ) ), rContext.xOrigEnv ); // Unreachable } // Some pseudo-intelligence for not destroying file extensions. - rtl::OUString aOldTitlePre; - rtl::OUString aOldTitlePost; + OUString aOldTitlePre; + OUString aOldTitlePost; sal_Int32 nPos = aOldTitle.lastIndexOf( '.' ); if ( nPos != -1 ) { @@ -1111,15 +1111,15 @@ void handleNameClashRename( aOldTitlePre = aOldTitle; if ( nPos > 0 ) - aOldTitlePre += rtl::OUString("_"); + aOldTitlePre += OUString("_"); sal_Bool bContinue = sal_True; do { nTry++; - rtl::OUString aNewTitle = aOldTitlePre; - aNewTitle += rtl::OUString::valueOf( nTry ); + OUString aNewTitle = aOldTitlePre; + aNewTitle += OUString::valueOf( nTry ); aNewTitle += aOldTitlePost; // Set new title @@ -1161,7 +1161,7 @@ void handleNameClashRename( uno::Any aProps2 = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri" ), + OUString( "Uri" ), -1, uno::makeAny( xNew->getIdentifier()-> @@ -1171,7 +1171,7 @@ void handleNameClashRename( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >( &aProps2, 1 ), rContext.xOrigEnv, - rtl::OUString( "Got no data stream from source!" ), + OUString( "Got no data stream from source!" ), rContext.xProcessor ); // Unreachable } @@ -1183,7 +1183,7 @@ void handleNameClashRename( aArg.ReplaceExisting = sal_False; ucb::Command aInsertCommand( - rtl::OUString("insert"), + OUString("insert"), -1, uno::makeAny( aArg ) ); @@ -1207,7 +1207,7 @@ void handleNameClashRename( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString( "Unable to resolve name clash!" ), + OUString( "Unable to resolve name clash!" ), rContext.xProcessor, ucb::NameClash::RENAME ) ), rContext.xOrigEnv ); @@ -1229,7 +1229,7 @@ void globalTransfer_( { ucbhelper::cancelCommandExecution( uno::makeAny( beans::UnknownPropertyException( - rtl::OUString( "Unable to get property 'IsFolder' " + OUString( "Unable to get property 'IsFolder' " "from source object!" ), rContext.xProcessor ) ), rContext.xOrigEnv ); @@ -1242,7 +1242,7 @@ void globalTransfer_( { ucbhelper::cancelCommandExecution( uno::makeAny( beans::UnknownPropertyException( - rtl::OUString( "Unable to get property 'IsDocument' " + OUString( "Unable to get property 'IsDocument' " "from source object!" ), rContext.xProcessor ) ), rContext.xOrigEnv ); @@ -1268,7 +1268,7 @@ void globalTransfer_( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(rContext.aArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -1276,7 +1276,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "No matching content type at target!" ), + OUString( "No matching content type at target!" ), rContext.xProcessor ); // Unreachable } @@ -1293,7 +1293,7 @@ void globalTransfer_( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( xNew->getIdentifier()-> @@ -1303,7 +1303,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "New content is not a XCommandProcessor!" ), + OUString( "New content is not a XCommandProcessor!" ), rContext.xProcessor ); // Unreachable } @@ -1316,7 +1316,7 @@ void globalTransfer_( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1324,7 +1324,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "Source content is not a XCommandProcessor!" ), + OUString( "Source content is not a XCommandProcessor!" ), rContext.xProcessor ); // Unreachable } @@ -1384,7 +1384,7 @@ void globalTransfer_( break; } - rtl::OUString aDesiredName = createDesiredName( rContext.aArg ); + OUString aDesiredName = createDesiredName( rContext.aArg ); bool bRetry; do @@ -1394,7 +1394,7 @@ void globalTransfer_( try { ucb::Command aInsertCommand( - rtl::OUString("insert"), + OUString("insert"), -1, uno::makeAny( aArg ) ); @@ -1412,7 +1412,7 @@ void globalTransfer_( // No chance to solve name clashes, because I'm not able to detect // whether there is one. throw ucb::UnsupportedNameClashException( - rtl::OUString( + OUString( "Unable to resolve name clashes, no chance to detect " "that there is one!" ), rContext.xProcessor, @@ -1440,7 +1440,7 @@ void globalTransfer_( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString( + OUString( "BUG: insert + replace == true MUST NOT " "throw NameClashException." ), rContext.xProcessor, @@ -1466,7 +1466,7 @@ void globalTransfer_( case ucb::NameClash::ASK: { uno::Any aExc; - rtl::OUString aNewTitle; + OUString aNewTitle; NameClashContinuation eCont = interactiveNameClashResolve( rContext.xOrigEnv, // always use original environment! @@ -1488,7 +1488,7 @@ void globalTransfer_( case ABORT: throw ucb::CommandFailedException( - rtl::OUString( + OUString( "abort requested via interaction " "handler" ), uno::Reference< uno::XInterface >(), @@ -1520,7 +1520,7 @@ void globalTransfer_( { // error setting title. Abort. throw ucb::CommandFailedException( - rtl::OUString( "error setting Title property!" ), + OUString( "error setting Title property!" ), uno::Reference< uno::XInterface >(), aExc ); } @@ -1538,7 +1538,7 @@ void globalTransfer_( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString( + OUString( "default action, don't know how to " "handle name clash" ), rContext.xProcessor, @@ -1571,7 +1571,7 @@ void globalTransfer_( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1579,7 +1579,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "Unable to get properties from children of source!" ), + OUString( "Unable to get properties from children of source!" ), rContext.xProcessor ); // Unreachable } @@ -1592,7 +1592,7 @@ void globalTransfer_( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rContext.aArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1600,7 +1600,7 @@ void globalTransfer_( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), rContext.xOrigEnv, - rtl::OUString( "Unable to get children of source!" ), + OUString( "Unable to get children of source!" ), rContext.xProcessor ); // Unreachable } @@ -1609,10 +1609,10 @@ void globalTransfer_( { ucb::GlobalTransferCommandArgument2 aTransArg( rContext.aArg.Operation, - rtl::OUString(), // SourceURL; filled later + OUString(), // SourceURL; filled later xNew->getIdentifier() ->getContentIdentifier(), // TargetURL - rtl::OUString(), // NewTitle; + OUString(), // NewTitle; rContext.aArg.NameClash, rContext.aArg.MimeType ); @@ -1657,13 +1657,13 @@ void globalTransfer_( aAny = xcp->execute( ucb::Command( - rtl::OUString("getCommandInfo"), + OUString("getCommandInfo"), -1, uno::Any()), 0, rContext.xEnv ); - const rtl::OUString cmdName("flush"); + const OUString cmdName("flush"); if((aAny >>= xci) && xci->hasCommandByName(cmdName)) xcp->execute( ucb::Command( @@ -1737,7 +1737,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -1745,7 +1745,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Can't instanciate target object!" ), + OUString( "Can't instanciate target object!" ), this ); // Unreachable } @@ -1760,7 +1760,7 @@ void UniversalContentBroker::globalTransfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rArg.TargetURL), beans::PropertyState_DIRECT_VALUE)); @@ -1768,7 +1768,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Target content is not a XCommandProcessor!" ), + OUString( "Target content is not a XCommandProcessor!" ), this ); // Unreachable } @@ -1789,7 +1789,7 @@ void UniversalContentBroker::globalTransfer( try { ucb::Command aCommand( - rtl::OUString( "transfer" ), // Name + OUString( "transfer" ), // Name -1, // Handle uno::makeAny( aTransferArg ) ); // Argument @@ -1826,7 +1826,7 @@ void UniversalContentBroker::globalTransfer( aTransferArg.MimeType ); ucb::Command aCommand1( - rtl::OUString("transfer"), + OUString("transfer"), -1, uno::makeAny( aTransferArg1 ) ); @@ -1846,7 +1846,7 @@ void UniversalContentBroker::globalTransfer( // There's a clash. Use interaction handler to solve it. uno::Any aExc; - rtl::OUString aNewTitle; + OUString aNewTitle; NameClashContinuation eCont = interactiveNameClashResolve( xEnv, // always use original environment! @@ -1869,7 +1869,7 @@ void UniversalContentBroker::globalTransfer( case ABORT: throw ucb::CommandFailedException( - rtl::OUString( + OUString( "abort requested via interaction " "handler" ), uno::Reference< uno::XInterface >(), @@ -1923,7 +1923,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1931,7 +1931,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Can't instanciate source object!" ), + OUString( "Can't instanciate source object!" ), this ); // Unreachable } @@ -1942,7 +1942,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1950,7 +1950,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Source content is not a XCommandProcessor!" ), + OUString( "Source content is not a XCommandProcessor!" ), this ); // Unreachable } @@ -1959,17 +1959,17 @@ void UniversalContentBroker::globalTransfer( uno::Sequence< beans::Property > aProps( 4 ); - aProps[ 0 ].Name = rtl::OUString("IsFolder"); + aProps[ 0 ].Name = OUString("IsFolder"); aProps[ 0 ].Handle = -1; /* unknown */ - aProps[ 1 ].Name = rtl::OUString("IsDocument"); + aProps[ 1 ].Name = OUString("IsDocument"); aProps[ 1 ].Handle = -1; /* unknown */ - aProps[ 2 ].Name = rtl::OUString("TargetURL"); + aProps[ 2 ].Name = OUString("TargetURL"); aProps[ 2 ].Handle = -1; /* unknown */ - aProps[ 3 ].Name = rtl::OUString("BaseURI"); + aProps[ 3 ].Name = OUString("BaseURI"); aProps[ 3 ].Handle = -1; /* unknown */ ucb::Command aGetPropsCommand( - rtl::OUString("getPropertyValues"), + OUString("getPropertyValues"), -1, uno::makeAny( aProps ) ); @@ -1980,7 +1980,7 @@ void UniversalContentBroker::globalTransfer( { uno::Any aProps2 = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rArg.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1988,7 +1988,7 @@ void UniversalContentBroker::globalTransfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps2, 1), xEnv, - rtl::OUString( "Unable to get properties from source object!" ), + OUString( "Unable to get properties from source object!" ), this ); // Unreachable } @@ -1999,11 +1999,11 @@ void UniversalContentBroker::globalTransfer( if ( rArg.NewTitle.isEmpty() ) { // BaseURI: property is optional. - rtl::OUString aBaseURI( xRow->getString( 4 ) ); + OUString aBaseURI( xRow->getString( 4 ) ); if ( !aBaseURI.isEmpty() ) { aTransferCtx.aArg.NewTitle - = createDesiredName( aBaseURI, rtl::OUString() ); + = createDesiredName( aBaseURI, OUString() ); } } @@ -2021,7 +2021,7 @@ void UniversalContentBroker::globalTransfer( try { ucb::Command aCommand( - rtl::OUString("delete"), // Name + OUString("delete"), // Name -1, // Handle uno::makeAny( sal_Bool( sal_True ) ) ); // Argument @@ -2072,14 +2072,14 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri" ), -1, + OUString( "Uri" ), -1, uno::makeAny( rArg.TargetURL ), beans::PropertyState_DIRECT_VALUE ) ); ucbhelper::cancelCommandExecution( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >( &aProps, 1 ), xEnv, - rtl::OUString( "Can't instanciate target object!" ), + OUString( "Can't instanciate target object!" ), this ); // Unreachable } @@ -2091,14 +2091,14 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri" ), -1, + OUString( "Uri" ), -1, uno::makeAny( rArg.TargetURL ), beans::PropertyState_DIRECT_VALUE ) ); ucbhelper::cancelCommandExecution( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >( &aProps, 1 ), xEnv, - rtl::OUString( "Target content is not a XCommandProcessor!" ), + OUString( "Target content is not a XCommandProcessor!" ), this ); // Unreachable } @@ -2106,7 +2106,7 @@ uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, try { ucb::Command aCommand( - rtl::OUString( "checkin" ), -1, + OUString( "checkin" ), -1, uno::makeAny( rArg ) ); aRet = xCommandProcessor->execute( aCommand, 0, xLocalEnv ); diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index 3c14a2048dd2..5d0c9dc6660a 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -38,7 +38,6 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace com::sun::star::util; -using ::rtl::OUString; //========================================================================= // @@ -62,7 +61,7 @@ struct PropertyTableEntry static const com::sun::star::uno::Type& OUString_getCppuType() { - return getCppuType( static_cast< const rtl::OUString * >( 0 ) ); + return getCppuType( static_cast< const OUString * >( 0 ) ); } static const com::sun::star::uno::Type& sal_uInt16_getCppuType() diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx index 51e28e235b28..c63c03a8b4cf 100644 --- a/ucb/source/core/ucbprops.hxx +++ b/ucb/source/core/ucbprops.hxx @@ -49,7 +49,7 @@ class UcbPropertiesManager : osl::Mutex m_aMutex; private: - sal_Bool queryProperty( const rtl::OUString& rName, + sal_Bool queryProperty( const OUString& rName, com::sun::star::beans::Property& rProp ); public: @@ -73,11 +73,11 @@ public: getProperties() throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::beans::Property SAL_CALL - getPropertyByName( const rtl::OUString& aName ) + getPropertyByName( const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasPropertyByName( const rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw( com::sun::star::uno::RuntimeException ); }; diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index ae327989dbe3..9c1379592758 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -27,7 +27,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; //========================================================================= diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 4e7b9ef98085..319a9457a48b 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -48,8 +48,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; //========================================================================= OUString makeHierarchalNameSegment( const OUString & rIn ) diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx index 2963f1829860..8364bd23dabb 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -75,7 +75,7 @@ public: // XPropertySetRegistryFactory virtual com::sun::star::uno::Reference< com::sun::star::ucb::XPropertySetRegistry > SAL_CALL - createPropertySetRegistry( const rtl::OUString& URL ) + createPropertySetRegistry( const OUString& URL ) throw( com::sun::star::uno::RuntimeException ); // XInitialization @@ -114,8 +114,8 @@ private: void add ( PersistentPropertySet* pSet ); void remove( PersistentPropertySet* pSet ); - void renamePropertySet( const rtl::OUString& rOldKey, - const rtl::OUString& rNewKey ); + void renamePropertySet( const OUString& rOldKey, + const OUString& rNewKey ); public: PropertySetRegistry( @@ -137,10 +137,10 @@ public: // XPropertySetRegistry virtual com::sun::star::uno::Reference< com::sun::star::ucb::XPersistentPropertySet > SAL_CALL - openPropertySet( const rtl::OUString& key, sal_Bool create ) + openPropertySet( const OUString& key, sal_Bool create ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removePropertySet( const rtl::OUString& key ) + removePropertySet( const OUString& key ) throw( com::sun::star::uno::RuntimeException ); // XElementAccess ( XNameAccess is derived from it ) @@ -153,22 +153,22 @@ public: // XNameAccess virtual com::sun::star::uno::Any SAL_CALL - getByName( const rtl::OUString& aName ) + getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByName( const rtl::OUString& aName ) + hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); // Non-interface methods com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getRootConfigReadAccess(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > - getConfigWriteAccess( const rtl::OUString& rPath ); + getConfigWriteAccess( const OUString& rPath ); }; //========================================================================= @@ -201,7 +201,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rXSMgr, PropertySetRegistry& rCreator, - const rtl::OUString& rKey ); + const OUString& rKey ); virtual ~PersistentPropertySet(); // XInterface @@ -232,7 +232,7 @@ public: getPropertySetInfo() throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setPropertyValue( const rtl::OUString& aPropertyName, + setPropertyValue( const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -240,33 +240,33 @@ public: com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Any SAL_CALL - getPropertyValue( const rtl::OUString& PropertyName ) + getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - addPropertyChangeListener( const rtl::OUString& aPropertyName, + addPropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removePropertyChangeListener( const rtl::OUString& aPropertyName, + removePropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - addVetoableChangeListener( const rtl::OUString& PropertyName, + addVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeVetoableChangeListener( const rtl::OUString& PropertyName, + removeVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -278,21 +278,21 @@ public: com::sun::star::ucb::XPropertySetRegistry > SAL_CALL getRegistry() throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getKey() throw( com::sun::star::uno::RuntimeException ); // XNamed - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setName( const ::rtl::OUString& aName ) + setName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException ); // XPropertyContainer virtual void SAL_CALL - addProperty( const rtl::OUString& Name, + addProperty( const OUString& Name, sal_Int16 Attributes, const com::sun::star::uno::Any& DefaultValue ) throw( com::sun::star::beans::PropertyExistException, @@ -300,7 +300,7 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeProperty( const rtl::OUString& Name ) + removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException ); @@ -331,7 +331,7 @@ public: // Non-interface methods. PropertySetRegistry& getPropertySetRegistry(); - const rtl::OUString& getFullKey(); + const OUString& getFullKey(); }; #endif /* !_UCBSTORE_HXX */ diff --git a/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx index b59b7187bd0c..ddee7c11314d 100644 --- a/ucb/source/inc/regexp.hxx +++ b/ucb/source/inc/regexp.hxx @@ -42,25 +42,25 @@ public: inline Kind getKind() const { return m_eKind; } - bool matches(rtl::OUString const & rString, rtl::OUString * pTranslation, + bool matches(OUString const & rString, OUString * pTranslation, bool * pTranslated) const; - rtl::OUString getRegexp(bool bReverse) const; + OUString getRegexp(bool bReverse) const; - static Regexp parse(rtl::OUString const & rRegexp); + static Regexp parse(OUString const & rRegexp); private: Kind m_eKind; - rtl::OUString m_aPrefix; - rtl::OUString m_aInfix; - rtl::OUString m_aReversePrefix; + OUString m_aPrefix; + OUString m_aInfix; + OUString m_aReversePrefix; bool m_bEmptyDomain; bool m_bTranslation; - inline Regexp(Kind eTheKind, rtl::OUString const & rThePrefix, - bool bTheEmptyDomain, rtl::OUString const & rTheInfix, + inline Regexp(Kind eTheKind, OUString const & rThePrefix, + bool bTheEmptyDomain, OUString const & rTheInfix, bool bTheTranslation, - rtl::OUString const & rTheReversePrefix); + OUString const & rTheReversePrefix); }; inline bool Regexp::operator ==(Regexp const & rOther) const diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index fc4b218f16ce..3e960d1bd93b 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -33,18 +33,18 @@ template< typename Val > class RegexpMapEntry { public: - inline RegexpMapEntry(rtl::OUString const & rTheRegexp, + inline RegexpMapEntry(OUString const & rTheRegexp, Val * pTheValue): m_aRegexp(rTheRegexp), m_pValue(pTheValue) {} - rtl::OUString getRegexp() const { return m_aRegexp; } + OUString getRegexp() const { return m_aRegexp; } Val const & getValue() const { return *m_pValue; } Val & getValue() { return *m_pValue; } private: - rtl::OUString m_aRegexp; + OUString m_aRegexp; Val * m_pValue; }; @@ -130,11 +130,11 @@ public: RegexpMap & operator =(RegexpMap const & rOther); - bool add(rtl::OUString const & rKey, Val const & rValue, bool bOverwrite, - rtl::OUString * pReverse = 0); + bool add(OUString const & rKey, Val const & rValue, bool bOverwrite, + OUString * pReverse = 0); // throws com::sun::star::lang::IllegalArgumentException - iterator find(rtl::OUString const & rKey, rtl::OUString * pReverse = 0); + iterator find(OUString const & rKey, OUString * pReverse = 0); // throws com::sun::star::lang::IllegalArgumentException void erase(iterator const & rPos); @@ -151,8 +151,8 @@ public: size_type size() const; - Val const * map(rtl::OUString const & rString, - rtl::OUString * pTranslation = 0, bool * pTranslated = 0) + Val const * map(OUString const & rString, + OUString * pTranslation = 0, bool * pTranslated = 0) const; private: diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index ffa318caac45..280c8604af28 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -39,10 +39,10 @@ using namespace ucb_impl; // //============================================================================ -inline Regexp::Regexp(Kind eTheKind, rtl::OUString const & rThePrefix, - bool bTheEmptyDomain, rtl::OUString const & rTheInfix, +inline Regexp::Regexp(Kind eTheKind, OUString const & rThePrefix, + bool bTheEmptyDomain, OUString const & rTheInfix, bool bTheTranslation, - rtl::OUString const & rTheReversePrefix): + OUString const & rTheReversePrefix): m_eKind(eTheKind), m_aPrefix(rThePrefix), m_aInfix(rTheInfix), @@ -60,7 +60,7 @@ namespace unnamed_ucb_regexp { bool matchStringIgnoreCase(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, - rtl::OUString const & rString) + OUString const & rString) { sal_Unicode const * p = *pBegin; @@ -88,8 +88,8 @@ bool matchStringIgnoreCase(sal_Unicode const ** pBegin, } -bool Regexp::matches(rtl::OUString const & rString, - rtl::OUString * pTranslation, bool * pTranslated) const +bool Regexp::matches(OUString const & rString, + OUString * pTranslation, bool * pTranslated) const { sal_Unicode const * pBegin = rString.getStr(); sal_Unicode const * pEnd = pBegin + rString.getLength(); @@ -151,7 +151,7 @@ bool Regexp::matches(rtl::OUString const & rString, { if (pTranslation) { - rtl::OUStringBuffer aBuffer(m_aReversePrefix); + OUStringBuffer aBuffer(m_aReversePrefix); aBuffer.append(pBlock1Begin, pBlock1End - pBlock1Begin); aBuffer.append(m_aInfix); aBuffer.append(pBlock2Begin, pBlock2End - pBlock2Begin); @@ -176,7 +176,7 @@ bool Regexp::matches(rtl::OUString const & rString, //============================================================================ namespace unnamed_ucb_regexp { -bool isScheme(rtl::OUString const & rString, bool bColon) +bool isScheme(OUString const & rString, bool bColon) { using comphelper::string::isalphaAscii; using comphelper::string::isdigitAscii; @@ -197,8 +197,8 @@ bool isScheme(rtl::OUString const & rString, bool bColon) return false; } -void appendStringLiteral(rtl::OUStringBuffer * pBuffer, - rtl::OUString const & rString) +void appendStringLiteral(OUStringBuffer * pBuffer, + OUString const & rString) { OSL_ASSERT(pBuffer); @@ -217,11 +217,11 @@ void appendStringLiteral(rtl::OUStringBuffer * pBuffer, } -rtl::OUString Regexp::getRegexp(bool bReverse) const +OUString Regexp::getRegexp(bool bReverse) const { if (m_bTranslation) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if (bReverse) { if (!m_aReversePrefix.isEmpty()) @@ -268,7 +268,7 @@ rtl::OUString Regexp::getRegexp(bool bReverse) const return m_aPrefix.copy(0, m_aPrefix.getLength() - 1); else { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if (!m_aPrefix.isEmpty()) appendStringLiteral(&aBuffer, m_aPrefix); switch (m_eKind) @@ -320,14 +320,14 @@ bool matchString(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, } bool scanStringLiteral(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, - rtl::OUString * pString) + OUString * pString) { sal_Unicode const * p = *pBegin; if (p == pEnd || *p++ != '"') return false; - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; for (;;) { if (p == pEnd) @@ -353,7 +353,7 @@ bool scanStringLiteral(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, } -Regexp Regexp::parse(rtl::OUString const & rRegexp) +Regexp Regexp::parse(OUString const & rRegexp) { // Detect an input of '' as an abbreviation of '":".*' // where is as defined in RFC 2396: @@ -361,14 +361,14 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp) return Regexp(Regexp::KIND_PREFIX, rRegexp + ":", false, - rtl::OUString(), + OUString(), false, - rtl::OUString()); + OUString()); sal_Unicode const * p = rRegexp.getStr(); sal_Unicode const * pEnd = p + rRegexp.getLength(); - rtl::OUString aPrefix; + OUString aPrefix; scanStringLiteral(&p, pEnd, &aPrefix); if (p == pEnd) @@ -382,19 +382,19 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp) if (p != pEnd) throw lang::IllegalArgumentException(); - return Regexp(Regexp::KIND_PREFIX, aPrefix, false, rtl::OUString(), - false, rtl::OUString()); + return Regexp(Regexp::KIND_PREFIX, aPrefix, false, OUString(), + false, OUString()); } else if (matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("(.*)->"))) { - rtl::OUString aReversePrefix; + OUString aReversePrefix; scanStringLiteral(&p, pEnd, &aReversePrefix); if (!matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("\\1")) || p != pEnd) throw lang::IllegalArgumentException(); - return Regexp(Regexp::KIND_PREFIX, aPrefix, false, rtl::OUString(), + return Regexp(Regexp::KIND_PREFIX, aPrefix, false, OUString(), true, aReversePrefix); } else if (matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("([/?#].*)?"))) @@ -402,19 +402,19 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp) if (p != pEnd) throw lang::IllegalArgumentException(); - return Regexp(Regexp::KIND_AUTHORITY, aPrefix, false, rtl::OUString(), - false, rtl::OUString()); + return Regexp(Regexp::KIND_AUTHORITY, aPrefix, false, OUString(), + false, OUString()); } else if (matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("(([/?#].*)?)->"))) { - rtl::OUString aReversePrefix; + OUString aReversePrefix; if (!(scanStringLiteral(&p, pEnd, &aReversePrefix) && matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("\\1")) && p == pEnd)) throw lang::IllegalArgumentException(); - return Regexp(Regexp::KIND_AUTHORITY, aPrefix, false, rtl::OUString(), + return Regexp(Regexp::KIND_AUTHORITY, aPrefix, false, OUString(), true, aReversePrefix); } else @@ -433,13 +433,13 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp) throw lang::IllegalArgumentException(); bool bEmptyDomain = *p++ == '*'; - rtl::OUString aInfix; + OUString aInfix; scanStringLiteral(&p, pEnd, &aInfix); if (!matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("([/?#].*)?"))) throw lang::IllegalArgumentException(); - rtl::OUString aReversePrefix; + OUString aReversePrefix; if (bOpen && !(matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM(")->")) && scanStringLiteral(&p, pEnd, &aReversePrefix) diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index a3bc61e7240c..d73f9b26356f 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace cppu; -using ::rtl::OUString; //========================================================================= diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index 603105507efd..beeb485b4dd7 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -23,7 +23,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; //========================================================================= diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index 83c323074683..089946a4f7de 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using ::rtl::OUString; //========================================================================= diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx index 73b2ede3394c..c709da33b628 100644 --- a/ucb/source/sorter/sortresult.hxx +++ b/ucb/source/sorter/sortresult.hxx @@ -213,7 +213,7 @@ public: throw( css::uno::RuntimeException ); // XContentAccess - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString() throw( css::uno::RuntimeException ); virtual css::uno::Reference< @@ -286,7 +286,7 @@ public: virtual sal_Bool SAL_CALL wasNull() throw( css::sdbc::SQLException, css::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( css::sdbc::SQLException, css::uno::RuntimeException ); @@ -384,7 +384,7 @@ public: throw( css::uno::RuntimeException ); virtual void SAL_CALL - setPropertyValue( const rtl::OUString& PropertyName, + setPropertyValue( const OUString& PropertyName, const css::uno::Any& Value ) throw( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -393,13 +393,13 @@ public: css::uno::RuntimeException ); virtual css::uno::Any SAL_CALL - getPropertyValue( const rtl::OUString& PropertyName ) + getPropertyValue( const OUString& PropertyName ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException ); virtual void SAL_CALL - addPropertyChangeListener( const rtl::OUString& PropertyName, + addPropertyChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, @@ -407,7 +407,7 @@ public: css::uno::RuntimeException ); virtual void SAL_CALL - removePropertyChangeListener( const rtl::OUString& PropertyName, + removePropertyChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, @@ -415,7 +415,7 @@ public: css::uno::RuntimeException ); virtual void SAL_CALL - addVetoableChangeListener( const rtl::OUString& PropertyName, + addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, @@ -423,7 +423,7 @@ public: css::uno::RuntimeException ); virtual void SAL_CALL - removeVetoableChangeListener( const rtl::OUString& PropertyName, + removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw( css::beans::UnknownPropertyException, diff --git a/ucb/source/ucp/cmis/auth_provider.cxx b/ucb/source/ucp/cmis/auth_provider.cxx index a641a442075d..1c7c9494c37a 100644 --- a/ucb/source/ucp/cmis/auth_provider.cxx +++ b/ucb/source/ucp/cmis/auth_provider.cxx @@ -26,8 +26,8 @@ * instead of those above. */ -#define OUSTR_TO_STDSTR(s) string( rtl::OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() ) -#define STD_TO_OUSTR( str ) rtl::OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 ) +#define OUSTR_TO_STDSTR(s) string( OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() ) +#define STD_TO_OUSTR( str ) OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 ) #include @@ -51,10 +51,10 @@ namespace cmis { rtl::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest = new ucbhelper::SimpleAuthenticationRequest( - m_sUrl, m_sBindingUrl, ::rtl::OUString(), + m_sUrl, m_sBindingUrl, OUString(), STD_TO_OUSTR( username ), STD_TO_OUSTR( password ), - ::rtl::OUString(), true, false ); + OUString(), true, false ); xIH->handle( xRequest.get() ); rtl::Reference< ucbhelper::InteractionContinuation > xSelection diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx index 7d3767e155b8..dd76a060b6e8 100644 --- a/ucb/source/ucp/cmis/auth_provider.hxx +++ b/ucb/source/ucp/cmis/auth_provider.hxx @@ -37,14 +37,14 @@ namespace cmis class AuthProvider : public libcmis::AuthProvider { const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& m_xEnv; - rtl::OUString m_sUrl; - rtl::OUString m_sBindingUrl; + OUString m_sUrl; + OUString m_sBindingUrl; public: AuthProvider ( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& xEnv, - rtl::OUString sUrl, - rtl::OUString sBindingUrl ): + OUString sUrl, + OUString sBindingUrl ): m_xEnv( xEnv ), m_sUrl( sUrl ), m_sBindingUrl( sBindingUrl ) { } bool authenticationQuery( std::string& username, std::string& password ); diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 8791e3670e48..a32fdbbb11d3 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -67,8 +67,8 @@ #include "cmis_provider.hxx" #include "cmis_resultset.hxx" -#define OUSTR_TO_STDSTR(s) string( rtl::OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() ) -#define STD_TO_OUSTR( str ) rtl::OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 ) +#define OUSTR_TO_STDSTR(s) string( OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() ) +#define STD_TO_OUSTR( str ) OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 ) using namespace com::sun::star; using namespace std; @@ -106,8 +106,8 @@ namespace vector< string > aCmisStrings = pProperty->getStrings( ); if ( bMultiValued ) { - uno::Sequence< rtl::OUString > aStrings( aCmisStrings.size( ) ); - rtl::OUString* aStringsArr = aStrings.getArray( ); + uno::Sequence< OUString > aStrings( aCmisStrings.size( ) ); + OUString* aStringsArr = aStrings.getArray( ); sal_Int32 i = 0; for ( vector< string >::iterator it = aCmisStrings.begin( ); it != aCmisStrings.end( ); ++it, ++i ) @@ -262,13 +262,13 @@ namespace cmis INetURLObject aBindingUrl( m_aURL.getBindingUrl( ) ); const ucbhelper::InternetProxyServer& rProxy = aProxyDecider.getProxy( INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() ); - rtl::OUString sProxy = rProxy.aName; + OUString sProxy = rProxy.aName; if ( rProxy.nPort > 0 ) - sProxy += ":" + rtl::OUString::valueOf( rProxy.nPort ); + sProxy += ":" + OUString::valueOf( rProxy.nPort ); libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() ); // Look for a cached session, key is binding url + repo id - rtl::OUString sSessionId = m_aURL.getBindingUrl( ) + m_aURL.getRepositoryId( ); + OUString sSessionId = m_aURL.getBindingUrl( ) + m_aURL.getRepositoryId( ); if ( NULL == m_pSession ) m_pSession = m_pProvider->getSession( sSessionId ); @@ -290,7 +290,7 @@ namespace cmis ucb::IOErrorCode_INVALID_DEVICE, uno::Sequence< uno::Any >( 0 ), xEnv, - rtl::OUString( ) ); + OUString( ) ); m_pProvider->registerSession( sSessionId, m_pSession ); } else @@ -371,7 +371,7 @@ namespace cmis INetURLObject aParentUrl( m_sURL ); string sName = OUSTR_TO_STDSTR( aParentUrl.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ) ); aParentUrl.removeSegment( ); - rtl::OUString sParentUrl = aParentUrl.GetMainURL( INetURLObject::NO_DECODE ); + OUString sParentUrl = aParentUrl.GetMainURL( INetURLObject::NO_DECODE ); Content aParent( m_xContext, m_pProvider, new ucbhelper::ContentIdentifier( sParentUrl ) ); libcmis::FolderPtr pParentFolder = boost::dynamic_pointer_cast< libcmis::Folder >( aParent.getObject( xEnv ) ); @@ -396,7 +396,7 @@ namespace cmis { m_pObject = getSession( xEnv )->getRootFolder( ); m_sObjectPath = "/"; - m_sObjectId = rtl::OUString( ); + m_sObjectId = OUString( ); } } @@ -417,7 +417,7 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - rtl::OUString::createFromAscii( e.what( ) ) ); + OUString::createFromAscii( e.what( ) ) ); } return bIsFolder; } @@ -425,7 +425,7 @@ namespace cmis uno::Any Content::getBadArgExcept() { return uno::makeAny( lang::IllegalArgumentException( - rtl::OUString("Wrong argument type!"), + OUString("Wrong argument type!"), static_cast< cppu::OWeakObject * >( this ), -1) ); } @@ -477,7 +477,7 @@ namespace cmis } else if ( rProp.Name == "Title" ) { - rtl::OUString sTitle; + OUString sTitle; try { sTitle = STD_TO_OUSTR( getObject( xEnv )->getName() ); @@ -499,7 +499,7 @@ namespace cmis // Nothing worked... get it from the path if ( sTitle.isEmpty( ) ) { - rtl::OUString sPath = m_sObjectPath; + OUString sPath = m_sObjectPath; // Get rid of the trailing slash problem if ( sPath[ sPath.getLength( ) - 1 ] == '/' ) @@ -726,7 +726,7 @@ namespace cmis uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= m_xIdentifier->getContentIdentifier(); uno::Any aErr = uno::makeAny( - ucb::InteractiveAugmentedIOException(rtl::OUString(), static_cast< cppu::OWeakObject * >( this ), + ucb::InteractiveAugmentedIOException(OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, bIsFolder ? ucb::IOErrorCode_NOT_EXISTING_PATH : ucb::IOErrorCode_NOT_EXISTING, aArgs) ); @@ -757,7 +757,7 @@ namespace cmis { ucbhelper::cancelCommandExecution( uno::makeAny ( ucb::UnsupportedOpenModeException - ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rOpenCommand.Mode ) ) ), xEnv ); } @@ -771,7 +771,7 @@ namespace cmis ucbhelper::cancelCommandExecution( uno::makeAny (ucb::UnsupportedDataSinkException - ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), rOpenCommand.Sink ) ), xEnv ); } @@ -782,7 +782,7 @@ namespace cmis return aRet; } - rtl::OUString Content::checkIn( const ucb::CheckinArgument& rArg, + OUString Content::checkIn( const ucb::CheckinArgument& rArg, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( uno::Exception ) { @@ -834,10 +834,10 @@ namespace cmis return aCmisUrl.asString( ); } - rtl::OUString Content::checkOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) + OUString Content::checkOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( uno::Exception ) { - rtl::OUString aRet; + OUString aRet; try { // Checkout the document if possible @@ -876,15 +876,15 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - rtl::OUString::createFromAscii( e.what() ) ); + OUString::createFromAscii( e.what() ) ); } return aRet; } - rtl::OUString Content::cancelCheckOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) + OUString Content::cancelCheckOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( uno::Exception ) { - rtl::OUString aRet; + OUString aRet; try { libcmis::DocumentPtr pPwc = boost::dynamic_pointer_cast< libcmis::Document >( getObject( xEnv ) ); @@ -942,7 +942,7 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - rtl::OUString::createFromAscii( e.what() ) ); + OUString::createFromAscii( e.what() ) ); } return aRet; } @@ -955,13 +955,13 @@ namespace cmis INetURLObject aSourceUrl( rTransferInfo.SourceURL ); if ( aSourceUrl.GetProtocol() != INET_PROT_CMIS ) { - rtl::OUString sSrcBindingUrl = URL( rTransferInfo.SourceURL ).getBindingUrl( ); + OUString sSrcBindingUrl = URL( rTransferInfo.SourceURL ).getBindingUrl( ); if ( sSrcBindingUrl != m_aURL.getBindingUrl( ) ) { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString("Unsupported URL scheme!"), + OUString("Unsupported URL scheme!"), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -971,7 +971,7 @@ namespace cmis } void Content::insert( const uno::Reference< io::XInputStream > & xInputStream, - sal_Bool bReplaceExisting, const rtl::OUString& rMimeType, + sal_Bool bReplaceExisting, const OUString& rMimeType, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( uno::Exception ) { @@ -979,14 +979,14 @@ namespace cmis { ucbhelper::cancelCommandExecution( uno::makeAny ( ucb::MissingInputStreamException - ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), + ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } // For transient content, the URL is the one of the parent if ( m_bTransient ) { - rtl::OUString sNewPath; + OUString sNewPath; // Try to get the object from the server if there is any libcmis::Folder* pFolder = NULL; @@ -1149,7 +1149,7 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - rtl::OUString::createFromAscii( e.what() ) ); + OUString::createFromAscii( e.what() ) ); } sal_Int32 nCount = rValues.getLength(); @@ -1167,17 +1167,17 @@ namespace cmis rValue.Name == "Size" || rValue.Name == "CreatableContentsInfo" ) { - lang::IllegalAccessException e ( rtl::OUString("Property is read-only!"), + lang::IllegalAccessException e ( OUString("Property is read-only!"), static_cast< cppu::OWeakObject* >( this ) ); aRet[ n ] <<= e; } else if ( rValue.Name == "Title" ) { - rtl::OUString aNewTitle; + OUString aNewTitle; if (!( rValue.Value >>= aNewTitle )) { aRet[ n ] <<= beans::IllegalTypeException - ( rtl::OUString("Property value has wrong type!"), + ( OUString("Property value has wrong type!"), static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1185,7 +1185,7 @@ namespace cmis if ( aNewTitle.getLength() <= 0 ) { aRet[ n ] <<= lang::IllegalArgumentException - ( rtl::OUString("Empty title not allowed!"), + ( OUString("Empty title not allowed!"), static_cast< cppu::OWeakObject * >( this ), -1 ); continue; @@ -1197,7 +1197,7 @@ namespace cmis else { SAL_INFO( "cmisucp", "Couln't set property: " << rValue.Name ); - lang::IllegalAccessException e ( rtl::OUString("Property is read-only!"), + lang::IllegalAccessException e ( OUString("Property is read-only!"), static_cast< cppu::OWeakObject* >( this ) ); aRet[ n ] <<= e; } @@ -1217,7 +1217,7 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - rtl::OUString::createFromAscii( e.what() ) ); + OUString::createFromAscii( e.what() ) ); } return aRet; @@ -1260,7 +1260,7 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - rtl::OUString::createFromAscii( e.what() ) ); + OUString::createFromAscii( e.what() ) ); } return sal_True; @@ -1271,52 +1271,52 @@ namespace cmis { static const beans::Property aGenericProperties[] = { - beans::Property( rtl::OUString( "IsDocument" ), + beans::Property( OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsFolder" ), + beans::Property( OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "Title" ), - -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::Property( OUString( "Title" ), + -1, getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( "TitleOnServer" ), - -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::Property( OUString( "TitleOnServer" ), + -1, getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( "IsReadOnly" ), + beans::Property( OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "DateCreated" ), + beans::Property( OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "DateModified" ), + beans::Property( OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "Size" ), + beans::Property( OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "CreatableContentsInfo" ), + beans::Property( OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "MediaType" ), - -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::Property( OUString( "MediaType" ), + -1, getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( "CmisPropertiesValues" ), + beans::Property( OUString( "CmisPropertiesValues" ), -1, getCppuType( static_cast< const beans::PropertyValues * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( "CmisPropertiesDisplayNames" ), + beans::Property( OUString( "CmisPropertiesDisplayNames" ), -1, getCppuType( static_cast< const beans::PropertyValues * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( "IsVersionable" ), + beans::Property( OUString( "IsVersionable" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "CanCheckOut" ), + beans::Property( OUString( "CanCheckOut" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "CanCancelCheckOut" ), + beans::Property( OUString( "CanCancelCheckOut" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "CanCheckIn" ), + beans::Property( OUString( "CanCheckIn" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), }; @@ -1332,41 +1332,41 @@ namespace cmis { // Required commands ucb::CommandInfo - ( rtl::OUString( "getCommandInfo" ), + ( OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo - ( rtl::OUString( "getPropertySetInfo" ), + ( OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo - ( rtl::OUString( "getPropertyValues" ), + ( OUString( "getPropertyValues" ), -1, getCppuType( static_cast * >( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "setPropertyValues" ), + ( OUString( "setPropertyValues" ), -1, getCppuType( static_cast * >( 0 ) ) ), // Optional standard commands ucb::CommandInfo - ( rtl::OUString( "delete" ), + ( OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo - ( rtl::OUString( "insert" ), + ( OUString( "insert" ), -1, getCppuType( static_cast( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "open" ), + ( OUString( "open" ), -1, getCppuType( static_cast( 0 ) ) ), // Mandatory CMIS-only commands - ucb::CommandInfo ( rtl::OUString( "checkout" ), -1, getCppuVoidType() ), - ucb::CommandInfo ( rtl::OUString( "cancelCheckout" ), -1, getCppuVoidType() ), - ucb::CommandInfo ( rtl::OUString( "checkIn" ), -1, + ucb::CommandInfo ( OUString( "checkout" ), -1, getCppuVoidType() ), + ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, getCppuVoidType() ), + ucb::CommandInfo ( OUString( "checkIn" ), -1, getCppuType( static_cast( 0 ) ) ), // Folder Only, omitted if not a folder ucb::CommandInfo - ( rtl::OUString( "transfer" ), + ( OUString( "transfer" ), -1, getCppuType( static_cast( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "createNewContent" ), + ( OUString( "createNewContent" ), -1, getCppuType( static_cast( 0 ) ) ) }; @@ -1374,9 +1374,9 @@ namespace cmis return uno::Sequence< ucb::CommandInfo >(aCommandInfoTable, isFolder( xEnv ) ? nProps : nProps - 2); } - ::rtl::OUString Content::getParentURL( ) + OUString Content::getParentURL( ) { - rtl::OUString sRet; + OUString sRet; SAL_INFO( "cmisucp", "Content::getParentURL()" ); @@ -1443,24 +1443,24 @@ namespace cmis return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface(rType); } - rtl::OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString("com.sun.star.comp.CmisContent"); + return OUString("com.sun.star.comp.CmisContent"); } - uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() + uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = "com.sun.star.ucb.CmisContent"; return aSNS; } - rtl::OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) + OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { return isFolder( uno::Reference< ucb::XCommandEnvironment >() ) - ? rtl::OUString(CMIS_FOLDER_TYPE) - : rtl::OUString(CMIS_FILE_TYPE); + ? OUString(CMIS_FOLDER_TYPE) + : OUString(CMIS_FILE_TYPE); } uno::Any SAL_CALL Content::execute( @@ -1547,7 +1547,7 @@ namespace cmis ucb::IOErrorCode_GENERAL, uno::Sequence< uno::Any >( 0 ), xEnv, - rtl::OUString::createFromAscii( e.what() ) ); + OUString::createFromAscii( e.what() ) ); } } else if ( aCommand.Name == "checkout" ) @@ -1573,7 +1573,7 @@ namespace cmis ucbhelper::cancelCommandExecution ( uno::makeAny( ucb::UnsupportedCommandException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -1608,7 +1608,7 @@ namespace cmis return uno::Reference< ucb::XContent >(); } - rtl::OUString sParentURL = m_xIdentifier->getContentIdentifier(); + OUString sParentURL = m_xIdentifier->getContentIdentifier(); URL aParentURL( sParentURL ); // Set the parent URL for the transient objects @@ -1672,19 +1672,19 @@ namespace cmis // Minimum set of props we really need uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND ); // file - seq[0].Type = rtl::OUString(CMIS_FILE_TYPE); + seq[0].Type = OUString(CMIS_FILE_TYPE); seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT ); seq[0].Properties = props; // folder - seq[1].Type = rtl::OUString(CMIS_FOLDER_TYPE); + seq[1].Type = OUString(CMIS_FOLDER_TYPE); seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; seq[1].Properties = props; @@ -1716,7 +1716,7 @@ namespace cmis // TODO Cache the objects URL aUrl( m_sURL ); - rtl::OUString sPath( m_sObjectPath ); + OUString sPath( m_sObjectPath ); if ( sPath[sPath.getLength( ) - 1] != '/' ) sPath += "/"; sPath += STD_TO_OUSTR( ( *it )->getName( ) ); diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 7260cb38517a..566f5156927e 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -74,9 +74,9 @@ private: ContentProvider* m_pProvider; libcmis::Session* m_pSession; libcmis::ObjectPtr m_pObject; - rtl::OUString m_sObjectPath; - rtl::OUString m_sObjectId; - rtl::OUString m_sURL; + OUString m_sObjectPath; + OUString m_sObjectId; + OUString m_sURL; cmis::URL m_aURL; // Members to be set for non-persistent content @@ -112,18 +112,18 @@ private: throw( com::sun::star::uno::Exception ); void insert( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & xInputStream, - sal_Bool bReplaceExisting, const ::rtl::OUString & rMimeType, + sal_Bool bReplaceExisting, const OUString & rMimeType, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) throw( com::sun::star::uno::Exception ); - rtl::OUString checkIn( const com::sun::star::ucb::CheckinArgument& rArg, + OUString checkIn( const com::sun::star::ucb::CheckinArgument& rArg, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) throw( com::sun::star::uno::Exception ); - rtl::OUString checkOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) + OUString checkOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) throw( com::sun::star::uno::Exception ); - rtl::OUString cancelCheckOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) + OUString cancelCheckOut( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) throw( com::sun::star::uno::Exception ); void destroy( ) throw( com::sun::star::uno::Exception ); @@ -163,21 +163,21 @@ public: getCommands( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); XINTERFACE_DECL() XTYPEPROVIDER_DECL() - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx index 04a44d1ef6d9..f404d39b156a 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx @@ -42,7 +42,7 @@ namespace cmis for ( list< uno::Reference< ucb::XContent > >::iterator it = aChildren.begin(); it != aChildren.end(); ++it ) { - rtl::OUString sContentType = ( *it )->getContentType( ); + OUString sContentType = ( *it )->getContentType( ); bool bIsFolder = sContentType != CMIS_FILE_TYPE; if ( ( mnOpenMode == ucb::OpenMode::FOLDERS && bIsFolder ) || ( mnOpenMode == ucb::OpenMode::DOCUMENTS && !bIsFolder ) || @@ -66,7 +66,7 @@ namespace cmis } } - ::rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) + OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { return queryContentIdentifier( nIndex )->getContentIdentifier( ); } @@ -134,7 +134,7 @@ namespace cmis xContent, uno::UNO_QUERY_THROW ); sal_Int32 nCmdId( xCmdProc->createCommandIdentifier() ); ucb::Command aCmd; - aCmd.Name = rtl::OUString("getPropertyValues"); + aCmd.Name = OUString("getPropertyValues"); aCmd.Handle = -1; aCmd.Argument <<= getResultSet()->getProperties(); uno::Any aResult( xCmdProc->execute( diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx index a2d4db58a324..88b1a9f848b6 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx @@ -51,7 +51,7 @@ namespace cmis virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 012e6c756806..18a21ee9e53c 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -80,10 +80,10 @@ ContentProvider::queryContent( return xContent; } -libcmis::Session* ContentProvider::getSession( const rtl::OUString& sBindingUrl ) +libcmis::Session* ContentProvider::getSession( const OUString& sBindingUrl ) { libcmis::Session* pSession = NULL; - std::map< rtl::OUString, libcmis::Session* >::iterator it = m_aSessionCache.find( sBindingUrl ); + std::map< OUString, libcmis::Session* >::iterator it = m_aSessionCache.find( sBindingUrl ); if ( it != m_aSessionCache.end( ) ) { pSession = it->second; @@ -91,9 +91,9 @@ libcmis::Session* ContentProvider::getSession( const rtl::OUString& sBindingUrl return pSession; } -void ContentProvider::registerSession( const rtl::OUString& sBindingUrl, libcmis::Session* pSession ) +void ContentProvider::registerSession( const OUString& sBindingUrl, libcmis::Session* pSession ) { - m_aSessionCache.insert( std::pair< rtl::OUString, libcmis::Session* >( sBindingUrl, pSession ) ); + m_aSessionCache.insert( std::pair< OUString, libcmis::Session* >( sBindingUrl, pSession ) ); } ContentProvider::ContentProvider( @@ -117,8 +117,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, com::sun::star::ucb::XContentProvider ); XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString("com.sun.star.comp.CmisContentProvider"), - rtl::OUString("com.sun.star.ucb.CmisContentProvider") ); + OUString("com.sun.star.comp.CmisContentProvider"), + OUString("com.sun.star.ucb.CmisContentProvider") ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx index 75d7de7e1d53..fb8fa91190c3 100644 --- a/ucb/source/ucp/cmis/cmis_provider.hxx +++ b/ucb/source/ucp/cmis/cmis_provider.hxx @@ -39,7 +39,7 @@ namespace cmis class ContentProvider : public ::ucbhelper::ContentProviderImplHelper { private: - std::map< rtl::OUString, libcmis::Session* > m_aSessionCache; + std::map< OUString, libcmis::Session* > m_aSessionCache; public: ContentProvider( const ::com::sun::star::uno::Reference< @@ -63,8 +63,8 @@ public: throw( ::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException ); - libcmis::Session* getSession( const rtl::OUString& sBindingUrl ); - void registerSession( const rtl::OUString& sBindingUrl, libcmis::Session* pSession ); + libcmis::Session* getSession( const OUString& sBindingUrl ); + void registerSession( const OUString& sBindingUrl, libcmis::Session* pSession ); }; } diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 18877c8a53e6..8f0c5bb235af 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -49,8 +49,8 @@ #include "cmis_repo_content.hxx" #include "cmis_resultset.hxx" -#define OUSTR_TO_STDSTR(s) string( rtl::OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() ) -#define STD_TO_OUSTR( str ) rtl::OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 ) +#define OUSTR_TO_STDSTR(s) string( OUStringToOString( s, RTL_TEXTENCODING_UTF8 ).getStr() ) +#define STD_TO_OUSTR( str ) OUString( str.c_str(), str.length( ), RTL_TEXTENCODING_UTF8 ) using namespace com::sun::star; using namespace std; @@ -68,7 +68,7 @@ namespace cmis m_aRepositories( aRepos ) { // Split the URL into bits - rtl::OUString sURL = m_xIdentifier->getContentIdentifier( ); + OUString sURL = m_xIdentifier->getContentIdentifier( ); SAL_INFO( "cmisucp", "RepoContent::RepoContent() " << sURL ); m_sRepositoryId = m_aURL.getObjectPath( ); @@ -84,7 +84,7 @@ namespace cmis uno::Any RepoContent::getBadArgExcept() { return uno::makeAny( lang::IllegalArgumentException( - rtl::OUString("Wrong argument type!"), + OUString("Wrong argument type!"), static_cast< cppu::OWeakObject * >( this ), -1) ); } @@ -144,9 +144,9 @@ namespace cmis INetURLObject aBindingUrl( m_aURL.getBindingUrl( ) ); const ucbhelper::InternetProxyServer& rProxy = aProxyDecider.getProxy( INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() ); - rtl::OUString sProxy = rProxy.aName; + OUString sProxy = rProxy.aName; if ( rProxy.nPort > 0 ) - sProxy += ":" + rtl::OUString::valueOf( rProxy.nPort ); + sProxy += ":" + OUString::valueOf( rProxy.nPort ); libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() ); if ( m_aRepositories.empty() ) @@ -174,7 +174,7 @@ namespace cmis ucb::IOErrorCode_ABORT, uno::Sequence< uno::Any >( 0 ), xEnv, - rtl::OUString::createFromAscii( "Authentication cancelled" ) ); + OUString::createFromAscii( "Authentication cancelled" ) ); } } } @@ -203,16 +203,16 @@ namespace cmis { static const beans::Property aGenericProperties[] = { - beans::Property( rtl::OUString( "IsDocument" ), + beans::Property( OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsFolder" ), + beans::Property( OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "Title" ), - -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::Property( OUString( "Title" ), + -1, getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( "IsReadOnly" ), + beans::Property( OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), }; @@ -228,21 +228,21 @@ namespace cmis { // Required commands ucb::CommandInfo - ( rtl::OUString( "getCommandInfo" ), + ( OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo - ( rtl::OUString( "getPropertySetInfo" ), + ( OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo - ( rtl::OUString( "getPropertyValues" ), + ( OUString( "getPropertyValues" ), -1, getCppuType( static_cast * >( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "setPropertyValues" ), + ( OUString( "setPropertyValues" ), -1, getCppuType( static_cast * >( 0 ) ) ), // Optional standard commands ucb::CommandInfo - ( rtl::OUString( "open" ), + ( OUString( "open" ), -1, getCppuType( static_cast( 0 ) ) ), }; @@ -250,9 +250,9 @@ namespace cmis return uno::Sequence< ucb::CommandInfo >(aCommandInfoTable, nProps ); } - ::rtl::OUString RepoContent::getParentURL( ) + OUString RepoContent::getParentURL( ) { - rtl::OUString sRet; + OUString sRet; SAL_INFO( "cmisucp", "RepoContent::getParentURL()" ); @@ -278,22 +278,22 @@ namespace cmis return ContentImplHelper::queryInterface(rType); } - rtl::OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString("com.sun.star.comp.CmisRepoContent"); + return OUString("com.sun.star.comp.CmisRepoContent"); } - uno::Sequence< rtl::OUString > SAL_CALL RepoContent::getSupportedServiceNames() + uno::Sequence< OUString > SAL_CALL RepoContent::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = "com.sun.star.ucb.Content"; return aSNS; } - rtl::OUString SAL_CALL RepoContent::getContentType() throw( uno::RuntimeException ) + OUString SAL_CALL RepoContent::getContentType() throw( uno::RuntimeException ) { - return rtl::OUString( CMIS_REPO_TYPE ); + return OUString( CMIS_REPO_TYPE ); } uno::Any SAL_CALL RepoContent::execute( @@ -383,8 +383,8 @@ namespace cmis else { // Return the repository root as child - rtl::OUString sUrl; - rtl::OUString sEncodedBinding = rtl::Uri::encode( + OUString sUrl; + OUString sEncodedBinding = rtl::Uri::encode( m_aURL.getBindingUrl( ) + "#" + m_sRepositoryId, rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx index 176df1b5f6cf..30dc12ceb76e 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.hxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx @@ -69,7 +69,7 @@ class RepoContent : public ::ucbhelper::ContentImplHelper, private: ContentProvider* m_pProvider; URL m_aURL; - rtl::OUString m_sRepositoryId; + OUString m_sRepositoryId; std::list< libcmis::RepositoryPtr > m_aRepositories; @@ -108,21 +108,21 @@ public: getCommands( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); XINTERFACE_DECL() XTYPEPROVIDER_DECL() - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index 565962144d8b..47c8a83fb91d 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -36,12 +36,12 @@ using namespace std; namespace cmis { - URL::URL( rtl::OUString const & urlStr ) + URL::URL( OUString const & urlStr ) { INetURLObject aUrl( urlStr ); // Decode the authority to get the binding URL and repository id - rtl::OUString sDecodedHost = aUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET ); + OUString sDecodedHost = aUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET ); INetURLObject aHostUrl( sDecodedHost ); m_sBindingUrl = aHostUrl.GetURLNoMark( ); m_sRepositoryId = aHostUrl.GetMark( ); @@ -54,45 +54,45 @@ namespace cmis m_sId = aUrl.GetMark( INetURLObject::DECODE_WITH_CHARSET ); if ( !m_sId.isEmpty( ) ) - m_sPath = rtl::OUString( ); + m_sPath = OUString( ); } - rtl::OUString& URL::getObjectPath( ) + OUString& URL::getObjectPath( ) { return m_sPath; } - rtl::OUString& URL::getObjectId( ) + OUString& URL::getObjectId( ) { return m_sId; } - rtl::OUString& URL::getBindingUrl( ) + OUString& URL::getBindingUrl( ) { return m_sBindingUrl; } - rtl::OUString& URL::getRepositoryId( ) + OUString& URL::getRepositoryId( ) { return m_sRepositoryId; } - void URL::setObjectPath( rtl::OUString sPath ) + void URL::setObjectPath( OUString sPath ) { m_sPath = sPath; - m_sId = rtl::OUString( ); + m_sId = OUString( ); } - void URL::setObjectId( rtl::OUString sId ) + void URL::setObjectId( OUString sId ) { - m_sPath = rtl::OUString( ); + m_sPath = OUString( ); m_sId = sId; } - rtl::OUString URL::asString( ) + OUString URL::asString( ) { - rtl::OUString sUrl; - rtl::OUString sEncodedBinding = rtl::Uri::encode( + OUString sUrl; + OUString sEncodedBinding = rtl::Uri::encode( m_sBindingUrl + "#" + m_sRepositoryId, rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, @@ -102,7 +102,7 @@ namespace cmis if ( !m_sPath.isEmpty( ) ) { sal_Int32 nPos = -1; - rtl::OUString sEncodedPath; + OUString sEncodedPath; do { sal_Int32 nStartPos = nPos + 1; @@ -110,7 +110,7 @@ namespace cmis sal_Int32 nLen = nPos - nStartPos; if ( nPos == -1 ) nLen = m_sPath.getLength( ) - nStartPos; - rtl::OUString sSegment = m_sPath.copy( nStartPos, nLen ); + OUString sSegment = m_sPath.copy( nStartPos, nLen ); if ( !sSegment.isEmpty( ) ) { diff --git a/ucb/source/ucp/cmis/cmis_url.hxx b/ucb/source/ucp/cmis/cmis_url.hxx index e2912d4bb494..191ce68d236a 100644 --- a/ucb/source/ucp/cmis/cmis_url.hxx +++ b/ucb/source/ucp/cmis/cmis_url.hxx @@ -39,26 +39,26 @@ namespace cmis class URL { private: - rtl::OUString m_sBindingUrl; - rtl::OUString m_sRepositoryId; - rtl::OUString m_sPath; - rtl::OUString m_sId; - rtl::OUString m_sUser; - rtl::OUString m_sPass; + OUString m_sBindingUrl; + OUString m_sRepositoryId; + OUString m_sPath; + OUString m_sId; + OUString m_sUser; + OUString m_sPass; public: - URL( rtl::OUString const & urlStr ); + URL( OUString const & urlStr ); - rtl::OUString& getObjectPath( ); - rtl::OUString& getObjectId( ); - rtl::OUString& getBindingUrl( ); - rtl::OUString& getRepositoryId( ); - rtl::OUString& getUsername( ) { return m_sUser; } - rtl::OUString& getPassword( ) { return m_sPass; } - void setObjectPath( rtl::OUString sPath ); - void setObjectId( rtl::OUString sId ); + OUString& getObjectPath( ); + OUString& getObjectId( ); + OUString& getBindingUrl( ); + OUString& getRepositoryId( ); + OUString& getUsername( ) { return m_sUser; } + OUString& getPassword( ) { return m_sPass; } + void setObjectPath( OUString sPath ); + void setObjectId( OUString sId ); - rtl::OUString asString( ); + OUString asString( ); }; } diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index b823a2d91470..5648f8bb7942 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; namespace { @@ -232,7 +231,7 @@ sal_Int32 ExpandContentProviderImpl::compareContentIds( { (void) exc; // unused OSL_FAIL( - ::rtl::OUStringToOString( + OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); return -1; } diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index c40b932273a6..fce8befeb400 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -102,11 +102,11 @@ namespace ucb { namespace ucp { namespace ext namespace { //-------------------------------------------------------------------------------------------------------------- - ::rtl::OUString lcl_compose( const ::rtl::OUString& i_rBaseURL, const ::rtl::OUString& i_rRelativeURL ) + OUString lcl_compose( const OUString& i_rBaseURL, const OUString& i_rRelativeURL ) { ENSURE_OR_RETURN( !i_rBaseURL.isEmpty(), "illegal base URL", i_rRelativeURL ); - ::rtl::OUStringBuffer aComposer( i_rBaseURL ); + OUStringBuffer aComposer( i_rBaseURL ); if ( i_rBaseURL.getStr()[ i_rBaseURL.getLength() - 1 ] != '/' ) aComposer.append( sal_Unicode( '/' ) ); aComposer.append( i_rRelativeURL ); @@ -114,9 +114,9 @@ namespace ucb { namespace ucp { namespace ext } //-------------------------------------------------------------------------------------------------------------- - struct SelectPropertyName : public ::std::unary_function< Property, ::rtl::OUString > + struct SelectPropertyName : public ::std::unary_function< Property, OUString > { - const ::rtl::OUString& operator()( const Property& i_rProperty ) const + const OUString& operator()( const Property& i_rProperty ) const { return i_rProperty.Name; } @@ -136,14 +136,14 @@ namespace ucb { namespace ucp { namespace ext ,m_sExtensionId() ,m_sPathIntoExtension() { - const ::rtl::OUString sURL( getIdentifier()->getContentIdentifier() ); + const OUString sURL( getIdentifier()->getContentIdentifier() ); if ( denotesRootContent( sURL ) ) { m_eExtContentType = E_ROOT; } else { - const ::rtl::OUString sRelativeURL( sURL.copy( ContentProvider::getRootURL().getLength() ) ); + const OUString sRelativeURL( sURL.copy( ContentProvider::getRootURL().getLength() ) ); const sal_Int32 nSepPos = sRelativeURL.indexOf( '/' ); if ( ( nSepPos == -1 ) || ( nSepPos == sRelativeURL.getLength() - 1 ) ) { @@ -157,7 +157,7 @@ namespace ucb { namespace ucp { namespace ext if ( m_eExtContentType != E_ROOT ) { - const ::rtl::OUString sRootURL = ContentProvider::getRootURL(); + const OUString sRootURL = ContentProvider::getRootURL(); m_sExtensionId = sURL.copy( sRootURL.getLength() ); const sal_Int32 nNextSep = m_sExtensionId.indexOf( '/' ); @@ -176,22 +176,22 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL Content::getImplementationName() throw( RuntimeException ) + OUString SAL_CALL Content::getImplementationName() throw( RuntimeException ) { - return ::rtl::OUString( "org.openoffice.comp.ucp.ext.Content" ); + return OUString( "org.openoffice.comp.ucp.ext.Content" ); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException ) + Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aServiceNames(2); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.ucb.Content" ); - aServiceNames[1] = ::rtl::OUString( "com.sun.star.ucb.ExtensionContent" ); + Sequence< OUString > aServiceNames(2); + aServiceNames[0] = OUString( "com.sun.star.ucb.Content" ); + aServiceNames[1] = OUString( "com.sun.star.ucb.ExtensionContent" ); return aServiceNames; } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL Content::getContentType() throw( RuntimeException ) + OUString SAL_CALL Content::getContentType() throw( RuntimeException ) { impl_determineContentType(); return *m_aContentType; @@ -209,7 +209,7 @@ namespace ucb { namespace ucp { namespace ext if ( !( aCommand.Argument >>= Properties ) ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -222,7 +222,7 @@ namespace ucb { namespace ucp { namespace ext if ( !( aCommand.Argument >>= aProperties ) ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -230,7 +230,7 @@ namespace ucb { namespace ucp { namespace ext if ( !aProperties.getLength() ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -253,7 +253,7 @@ namespace ucb { namespace ucp { namespace ext if ( !( aCommand.Argument >>= aOpenCommand ) ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -272,16 +272,16 @@ namespace ucb { namespace ucp { namespace ext if ( aOpenCommand.Sink.is() ) { - const ::rtl::OUString sPhysicalContentURL( getPhysicalURL() ); + const OUString sPhysicalContentURL( getPhysicalURL() ); ::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEvironment, m_xContext ); - aRet = aRequestedContent.executeCommand( ::rtl::OUString( "open" ), makeAny( aOpenCommand ) ); + aRet = aRequestedContent.executeCommand( OUString( "open" ), makeAny( aOpenCommand ) ); } } else { ::ucbhelper::cancelCommandExecution( makeAny( UnsupportedCommandException( - ::rtl::OUString(), *this ) ), + OUString(), *this ) ), i_rEvironment ); // unreachable } @@ -295,22 +295,22 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::encodeIdentifier( const ::rtl::OUString& i_rIdentifier ) + OUString Content::encodeIdentifier( const OUString& i_rIdentifier ) { return ::rtl::Uri::encode( i_rIdentifier, rtl_UriCharClassRegName, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::decodeIdentifier( const ::rtl::OUString& i_rIdentifier ) + OUString Content::decodeIdentifier( const OUString& i_rIdentifier ) { return ::rtl::Uri::decode( i_rIdentifier, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------------------------------------------ - bool Content::denotesRootContent( const ::rtl::OUString& i_rContentIdentifier ) + bool Content::denotesRootContent( const OUString& i_rContentIdentifier ) { - const ::rtl::OUString sRootURL( ContentProvider::getRootURL() ); + const OUString sRootURL( ContentProvider::getRootURL() ); if ( i_rContentIdentifier == sRootURL ) return true; @@ -325,9 +325,9 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::getParentURL() + OUString Content::getParentURL() { - const ::rtl::OUString sRootURL( ContentProvider::getRootURL() ); + const OUString sRootURL( ContentProvider::getRootURL() ); switch ( m_eExtContentType ) { @@ -341,7 +341,7 @@ namespace ucb { namespace ucp { namespace ext case E_EXTENSION_CONTENT: { - const ::rtl::OUString sURL = m_xIdentifier->getContentIdentifier(); + const OUString sURL = m_xIdentifier->getContentIdentifier(); // cut the root URL if ( !sURL.match( sRootURL, 0 ) ) @@ -350,10 +350,10 @@ namespace ucb { namespace ucp { namespace ext break; } - ::rtl::OUString sRelativeURL( sURL.copy( sRootURL.getLength() ) ); + OUString sRelativeURL( sURL.copy( sRootURL.getLength() ) ); // cut the extension ID - const ::rtl::OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + ::rtl::OUString( sal_Unicode( '/' ) ) ); + const OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + OUString( sal_Unicode( '/' ) ) ); if ( !sRelativeURL.match( sSeparatedExtensionId ) ) { SAL_INFO( "ucb.ucp", "illegal URL structure - no extension ID" ); @@ -376,7 +376,7 @@ namespace ucb { namespace ucp { namespace ext const sal_Int32 nLastSep = sRelativeURL.lastIndexOf( '/' ); sRelativeURL = sRelativeURL.copy( 0, nLastSep != -1 ? nLastSep : 0 ); - ::rtl::OUStringBuffer aComposer; + OUStringBuffer aComposer; aComposer.append( sRootURL ); aComposer.append( sSeparatedExtensionId ); aComposer.append( sRelativeURL ); @@ -387,12 +387,12 @@ namespace ucb { namespace ucp { namespace ext OSL_FAIL( "Content::getParentURL: unhandled case!" ); break; } - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ Reference< XRow > Content::getArtificialNodePropertyValues( const Reference< XComponentContext >& rxContext, - const Sequence< Property >& i_rProperties, const ::rtl::OUString& i_rTitle ) + const Sequence< Property >& i_rProperties, const OUString& i_rTitle ) { // note: empty sequence means "get values of all supported properties". ::rtl::Reference< ::ucbhelper::PropertyValueSet > xRow = new ::ucbhelper::PropertyValueSet( rxContext ); @@ -434,22 +434,22 @@ namespace ucb { namespace ucp { namespace ext else { // Append all Core Properties. - xRow->appendString ( Property( ::rtl::OUString("ContentType"), + xRow->appendString ( Property( OUString("ContentType"), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), ContentProvider::getArtificialNodeContentType() ); - xRow->appendString ( Property( ::rtl::OUString("Title"), + xRow->appendString ( Property( OUString("Title"), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), i_rTitle ); - xRow->appendBoolean( Property( ::rtl::OUString("IsDocument"), + xRow->appendBoolean( Property( OUString("IsDocument"), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), sal_False ); - xRow->appendBoolean( Property( ::rtl::OUString("IsFolder"), + xRow->appendBoolean( Property( OUString("IsFolder"), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), @@ -460,13 +460,13 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::getPhysicalURL() const + OUString Content::getPhysicalURL() const { - ENSURE_OR_RETURN( m_eExtContentType != E_ROOT, "illegal call", ::rtl::OUString() ); + ENSURE_OR_RETURN( m_eExtContentType != E_ROOT, "illegal call", OUString() ); // create an ucb::XContent for the physical file within the deployed extension const Reference< XPackageInformationProvider > xPackageInfo = PackageInformationProvider::get(m_xContext); - const ::rtl::OUString sPackageLocation( xPackageInfo->getPackageLocation( m_sExtensionId ) ); + const OUString sPackageLocation( xPackageInfo->getPackageLocation( m_sExtensionId ) ); if ( m_sPathIntoExtension.isEmpty() ) return sPackageLocation; @@ -486,11 +486,11 @@ namespace ucb { namespace ucp { namespace ext return getArtificialNodePropertyValues( m_xContext, i_rProperties, m_sExtensionId ); case E_EXTENSION_CONTENT: { - const ::rtl::OUString sPhysicalContentURL( getPhysicalURL() ); + const OUString sPhysicalContentURL( getPhysicalURL() ); ::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEnv, m_xContext ); // translate the property request - Sequence< ::rtl::OUString > aPropertyNames( i_rProperties.getLength() ); + Sequence< OUString > aPropertyNames( i_rProperties.getLength() ); ::std::transform( i_rProperties.getConstArray(), i_rProperties.getConstArray() + i_rProperties.getLength(), @@ -538,7 +538,7 @@ namespace ucb { namespace ucp { namespace ext for ( sal_Int32 n = 0; n < nCount; ++n, ++pValues ) { // all our properties are read-only ... - aRet[ n ] <<= IllegalAccessException( ::rtl::OUString("property is read-only."), *this ); + aRet[ n ] <<= IllegalAccessException( OUString("property is read-only."), *this ); } return aRet; @@ -554,23 +554,23 @@ namespace ucb { namespace ucp { namespace ext // Mandatory commands /////////////////////////////////////////////////////////////// CommandInfo( - ::rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), CommandInfo( - ::rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), CommandInfo( - ::rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< Sequence< Property > * >( 0 ) ) ), CommandInfo( - ::rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< Sequence< PropertyValue > * >( 0 ) ) @@ -579,7 +579,7 @@ namespace ucb { namespace ucp { namespace ext // Optional standard commands /////////////////////////////////////////////////////////////// , CommandInfo( - ::rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< OpenCommandArgument2 * >( 0 ) ) ) @@ -594,27 +594,27 @@ namespace ucb { namespace ucp { namespace ext static Property aProperties[] = { Property( - ::rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - ::rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - ::rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - ::rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ) }; @@ -631,7 +631,7 @@ namespace ucb { namespace ucp { namespace ext try { Sequence< Property > aProps(1); - aProps[0].Name = ::rtl::OUString( "IsFolder" ); + aProps[0].Name = OUString( "IsFolder" ); Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW ); bIsFolder = xRow->getBoolean(1); } @@ -655,7 +655,7 @@ namespace ucb { namespace ucp { namespace ext try { Sequence< Property > aProps(1); - aProps[0].Name = ::rtl::OUString( "ContentType" ); + aProps[0].Name = OUString( "ContentType" ); Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW ); m_aContentType.reset( xRow->getString(1) ); } diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index ee29fd9778a0..f28fa7f4097b 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -63,7 +63,7 @@ namespace ucb { namespace ucp { namespace ext getArtificialNodePropertyValues( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties, - const ::rtl::OUString& rTitle + const OUString& rTitle ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > @@ -72,29 +72,29 @@ namespace ucb { namespace ucp { namespace ext const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ); - static ::rtl::OUString - encodeIdentifier( const ::rtl::OUString& i_rIdentifier ); - static ::rtl::OUString - decodeIdentifier( const ::rtl::OUString& i_rIdentifier ); + static OUString + encodeIdentifier( const OUString& i_rIdentifier ); + static OUString + decodeIdentifier( const OUString& i_rIdentifier ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); ExtensionContentType getExtensionContentType() const { return m_eExtContentType; } /** retrieves the URL of the underlying physical content. Not to be called when getExtensionContentType() returns E_ROOT. */ - ::rtl::OUString getPhysicalURL() const; + OUString getPhysicalURL() const; protected: virtual ~Content(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XContent - virtual rtl::OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -125,7 +125,7 @@ namespace ucb { namespace ucp { namespace ext const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ); - static bool denotesRootContent( const ::rtl::OUString& i_rContentIdentifier ); + static bool denotesRootContent( const OUString& i_rContentIdentifier ); bool impl_isFolder(); void impl_determineContentType(); @@ -133,9 +133,9 @@ namespace ucb { namespace ucp { namespace ext private: ExtensionContentType m_eExtContentType; ::boost::optional< bool > m_aIsFolder; - ::boost::optional< ::rtl::OUString > m_aContentType; - ::rtl::OUString m_sExtensionId; - ::rtl::OUString m_sPathIntoExtension; + ::boost::optional< OUString > m_aContentType; + OUString m_sExtensionId; + OUString m_sPathIntoExtension; }; //...................................................................................................................... diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index ff93dc977b74..6f86da239e2e 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -70,7 +70,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== struct ResultListEntry { - ::rtl::OUString sId; + OUString sId; Reference< XContentIdentifier > xId; ::rtl::Reference< Content > pContent; Reference< XRow > xRow; @@ -109,11 +109,11 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== namespace { - ::rtl::OUString lcl_compose( const ::rtl::OUString& i_rBaseURL, const ::rtl::OUString& i_rRelativeURL ) + OUString lcl_compose( const OUString& i_rBaseURL, const OUString& i_rRelativeURL ) { ENSURE_OR_RETURN( !i_rBaseURL.isEmpty(), "illegal base URL", i_rRelativeURL ); - ::rtl::OUStringBuffer aComposer( i_rBaseURL ); + OUStringBuffer aComposer( i_rBaseURL ); if ( i_rBaseURL.getStr()[ i_rBaseURL.getLength() - 1 ] != '/' ) aComposer.append( sal_Unicode( '/' ) ); aComposer.append( i_rRelativeURL ); @@ -140,14 +140,14 @@ namespace ucb { namespace ucp { namespace ext { const Reference< XPackageInformationProvider > xPackageInfo = PackageInformationProvider::get( m_pImpl->m_xContext ); - const ::rtl::OUString sContentIdentifier( m_pImpl->m_xContent->getIdentifier()->getContentIdentifier() ); + const OUString sContentIdentifier( m_pImpl->m_xContent->getIdentifier()->getContentIdentifier() ); switch ( m_pImpl->m_xContent->getExtensionContentType() ) { case E_ROOT: { - Sequence< Sequence< ::rtl::OUString > > aExtensionInfo( xPackageInfo->getExtensionList() ); - for ( const Sequence< ::rtl::OUString >* pExtInfo = aExtensionInfo.getConstArray(); + Sequence< Sequence< OUString > > aExtensionInfo( xPackageInfo->getExtensionList() ); + for ( const Sequence< OUString >* pExtInfo = aExtensionInfo.getConstArray(); pExtInfo != aExtensionInfo.getConstArray() + aExtensionInfo.getLength(); ++pExtInfo ) @@ -158,9 +158,9 @@ namespace ucb { namespace ucp { namespace ext continue; } - const ::rtl::OUString& rLocalId = (*pExtInfo)[0]; + const OUString& rLocalId = (*pExtInfo)[0]; ResultListEntry aEntry; - aEntry.sId = ContentProvider::getRootURL() + Content::encodeIdentifier( rLocalId ) + ::rtl::OUString( sal_Unicode( '/' ) ); + aEntry.sId = ContentProvider::getRootURL() + Content::encodeIdentifier( rLocalId ) + OUString( sal_Unicode( '/' ) ); m_pImpl->m_aResults.push_back( aEntry ); } } @@ -168,12 +168,12 @@ namespace ucb { namespace ucp { namespace ext case E_EXTENSION_ROOT: case E_EXTENSION_CONTENT: { - const ::rtl::OUString sPackageLocation( m_pImpl->m_xContent->getPhysicalURL() ); + const OUString sPackageLocation( m_pImpl->m_xContent->getPhysicalURL() ); ::ucbhelper::Content aWrappedContent( sPackageLocation, getResultSet()->getEnvironment(), m_pImpl->m_xContext ); // obtain the properties which our result set is set up for from the wrapped content - Sequence< ::rtl::OUString > aPropertyNames(1); - aPropertyNames[0] = ::rtl::OUString( "Title" ); + Sequence< OUString > aPropertyNames(1); + aPropertyNames[0] = OUString( "Title" ); const Reference< XResultSet > xFolderContent( aWrappedContent.createCursor( aPropertyNames ), UNO_SET_THROW ); const Reference< XRow > xContentRow( xFolderContent, UNO_QUERY_THROW ); @@ -202,19 +202,19 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 i_nIndex ) + OUString DataSupplier::queryContentIdentifierString( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( i_nIndex < m_pImpl->m_aResults.size() ) { - const ::rtl::OUString sId = m_pImpl->m_aResults[ i_nIndex ].sId; + const OUString sId = m_pImpl->m_aResults[ i_nIndex ].sId; if ( !sId.isEmpty() ) return sId; } OSL_FAIL( "DataSupplier::queryContentIdentifierString: illegal index, or illegal result entry id!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ @@ -229,7 +229,7 @@ namespace ucb { namespace ucp { namespace ext return xId; } - ::rtl::OUString sId = queryContentIdentifierString( i_nIndex ); + OUString sId = queryContentIdentifierString( i_nIndex ); if ( !sId.isEmpty() ) { Reference< XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( sId ); @@ -319,9 +319,9 @@ namespace ucb { namespace ucp { namespace ext { case E_ROOT: { - const ::rtl::OUString& rId( m_pImpl->m_aResults[ i_nIndex ].sId ); - const ::rtl::OUString sRootURL( ContentProvider::getRootURL() ); - ::rtl::OUString sTitle = Content::decodeIdentifier( rId.copy( sRootURL.getLength() ) ); + const OUString& rId( m_pImpl->m_aResults[ i_nIndex ].sId ); + const OUString sRootURL( ContentProvider::getRootURL() ); + OUString sTitle = Content::decodeIdentifier( rId.copy( sRootURL.getLength() ) ); if ( !sTitle.isEmpty() && ( sTitle[ sTitle.getLength() - 1 ] == '/' ) ) sTitle = sTitle.copy( 0, sTitle.getLength() - 1 ); xRow = Content::getArtificialNodePropertyValues( m_pImpl->m_xContext, getResultSet()->getProperties(), sTitle ); diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index 291b3a17c716..cfa5e04be074 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -51,7 +51,7 @@ namespace ucb { namespace ucp { namespace ext protected: virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > queryContent( sal_uInt32 nIndex ); diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 4115f52a4b96..37c384d8effb 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -63,28 +63,28 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException) + OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); + return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException) + OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames(2); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.ucb.ContentProvider" ); - aServiceNames[1] = ::rtl::OUString( "com.sun.star.ucb.ExtensionContentProvider" ); + Sequence< OUString > aServiceNames(2); + aServiceNames[0] = OUString( "com.sun.star.ucb.ContentProvider" ); + aServiceNames[1] = OUString( "com.sun.star.ucb.ExtensionContentProvider" ); return aServiceNames; } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } @@ -96,21 +96,21 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ContentProvider::getRootURL() + OUString ContentProvider::getRootURL() { - return ::rtl::OUString( "vnd.sun.star.extension://" ); + return OUString( "vnd.sun.star.extension://" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ContentProvider::getArtificialNodeContentType() + OUString ContentProvider::getArtificialNodeContentType() { - return ::rtl::OUString( "application/vnd.sun.star.extension-content" ); + return OUString( "application/vnd.sun.star.extension-content" ); } //------------------------------------------------------------------------------------------------------------------ namespace { - void lcl_ensureAndTransfer( ::rtl::OUString& io_rIdentifierFragment, ::rtl::OUStringBuffer& o_rNormalization, const sal_Unicode i_nLeadingChar ) + void lcl_ensureAndTransfer( OUString& io_rIdentifierFragment, OUStringBuffer& o_rNormalization, const sal_Unicode i_nLeadingChar ) { if ( ( io_rIdentifierFragment.isEmpty() ) || ( io_rIdentifierFragment[0] != i_nLeadingChar ) ) throw IllegalIdentifierException(); @@ -124,19 +124,19 @@ namespace ucb { namespace ucp { namespace ext throw( IllegalIdentifierException, RuntimeException ) { // Check URL scheme... - const ::rtl::OUString sScheme( "vnd.sun.star.extension" ); + const OUString sScheme( "vnd.sun.star.extension" ); if ( !i_rIdentifier->getContentProviderScheme().equalsIgnoreAsciiCase( sScheme ) ) throw IllegalIdentifierException(); // normalize the identifier - const ::rtl::OUString sIdentifier( i_rIdentifier->getContentIdentifier() ); + const OUString sIdentifier( i_rIdentifier->getContentIdentifier() ); // the scheme needs to be lower-case - ::rtl::OUStringBuffer aComposer; + OUStringBuffer aComposer; aComposer.append( sIdentifier.copy( 0, sScheme.getLength() ).toAsciiLowerCase() ); // one : is required after the scheme - ::rtl::OUString sRemaining( sIdentifier.copy( sScheme.getLength() ) ); + OUString sRemaining( sIdentifier.copy( sScheme.getLength() ) ); lcl_ensureAndTransfer( sRemaining, aComposer, ':' ); // and at least one / diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index 88c7f58325fa..55ddc498553f 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -38,20 +38,20 @@ namespace ucb { namespace ucp { namespace ext virtual ~ContentProvider(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static() throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); // XContentProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException); public: - static ::rtl::OUString getRootURL(); - static ::rtl::OUString getArtificialNodeContentType(); + static OUString getRootURL(); + static OUString getArtificialNodeContentType(); }; //...................................................................................................................... diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 18fa9f32cbeb..2959d5dea872 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -51,7 +51,7 @@ using namespace com::sun::star::ucb; // PropertyListeners -typedef cppu::OMultiTypeInterfaceContainerHelperVar< rtl::OUString,hashOUString,equalOUString > +typedef cppu::OMultiTypeInterfaceContainerHelperVar< OUString,hashOUString,equalOUString > PropertyListeners_impl; class fileaccess::PropertyListeners @@ -75,7 +75,7 @@ public: // Private Constructor for just inserted Contents BaseContent::BaseContent( shell* pMyShell, - const rtl::OUString& parentName, + const OUString& parentName, sal_Bool bFolder ) : m_pMyShell( pMyShell ), m_xContentIdentifier( 0 ), @@ -97,7 +97,7 @@ BaseContent::BaseContent( shell* pMyShell, BaseContent::BaseContent( shell* pMyShell, const Reference< XContentIdentifier >& xContentIdentifier, - const rtl::OUString& aUncPath ) + const OUString& aUncPath ) : m_pMyShell( pMyShell ), m_xContentIdentifier( xContentIdentifier ), m_aUncPath( aUncPath ), @@ -252,17 +252,17 @@ BaseContent::dispose() // XServiceInfo ////////////////////////////////////////////////////////////////////////////////////////// -rtl::OUString SAL_CALL +OUString SAL_CALL BaseContent::getImplementationName() throw( RuntimeException) { - return rtl::OUString("com.sun.star.comp.ucb.FileContent"); + return OUString("com.sun.star.comp.ucb.FileContent"); } sal_Bool SAL_CALL -BaseContent::supportsService( const rtl::OUString& ServiceName ) +BaseContent::supportsService( const OUString& ServiceName ) throw( RuntimeException) { if ( ServiceName == "com.sun.star.ucb.FileContent" ) @@ -273,12 +273,12 @@ BaseContent::supportsService( const rtl::OUString& ServiceName ) -Sequence< rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL BaseContent::getSupportedServiceNames() throw( RuntimeException ) { - Sequence< rtl::OUString > ret( 1 ); - ret[0] = rtl::OUString("com.sun.star.ucb.FileContent"); + Sequence< OUString > ret( 1 ); + ret[0] = OUString("com.sun.star.ucb.FileContent"); return ret; } @@ -410,12 +410,12 @@ BaseContent::execute( const Command& aCommand, { Sequence< beans::Property > seq(1); seq[0] = beans::Property( - rtl::OUString("CasePreservingURL"), + OUString("CasePreservingURL"), -1, getCppuType( static_cast< sal_Bool* >(0) ), 0 ); Reference< sdbc::XRow > xRow = getPropertyValues( CommandId,seq ); - rtl::OUString CasePreservingURL = xRow->getString(1); + OUString CasePreservingURL = xRow->getString(1); if(!xRow->wasNull()) aAny <<= CasePreservingURL; } @@ -443,7 +443,7 @@ BaseContent::execute( const Command& aCommand, void SAL_CALL BaseContent::addPropertiesChangeListener( - const Sequence< rtl::OUString >& PropertyNames, + const Sequence< OUString >& PropertyNames, const Reference< beans::XPropertiesChangeListener >& Listener ) throw( RuntimeException ) { @@ -457,7 +457,7 @@ BaseContent::addPropertiesChangeListener( if( PropertyNames.getLength() == 0 ) - m_pPropertyListener->addInterface( rtl::OUString(),Listener ); + m_pPropertyListener->addInterface( OUString(),Listener ); else { Reference< beans::XPropertySetInfo > xProp = m_pMyShell->info_p( m_aUncPath ); @@ -469,7 +469,7 @@ BaseContent::addPropertiesChangeListener( void SAL_CALL -BaseContent::removePropertiesChangeListener( const Sequence< rtl::OUString >& PropertyNames, +BaseContent::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< beans::XPropertiesChangeListener >& Listener ) throw( RuntimeException ) { @@ -484,7 +484,7 @@ BaseContent::removePropertiesChangeListener( const Sequence< rtl::OUString >& Pr for( sal_Int32 i = 0; i < PropertyNames.getLength(); ++i ) m_pPropertyListener->removeInterface( PropertyNames[i],Listener ); - m_pPropertyListener->removeInterface( rtl::OUString(), Listener ); + m_pPropertyListener->removeInterface( OUString(), Listener ); } @@ -500,7 +500,7 @@ BaseContent::getIdentifier() } -rtl::OUString SAL_CALL +OUString SAL_CALL BaseContent::getContentType() throw( RuntimeException ) { @@ -519,7 +519,7 @@ BaseContent::getContentType() { // Who am I ? Sequence< beans::Property > seq(1); - seq[0] = beans::Property( rtl::OUString("IsDocument"), + seq[0] = beans::Property( OUString("IsDocument"), -1, getCppuType( static_cast< sal_Bool* >(0) ), 0 ); @@ -545,7 +545,7 @@ BaseContent::getContentType() } } - return rtl::OUString(); + return OUString(); } @@ -586,7 +586,7 @@ BaseContent::removeContentEventListener( void SAL_CALL BaseContent::addProperty( - const rtl::OUString& Name, + const OUString& Name, sal_Int16 Attributes, const Any& DefaultValue ) throw( beans::PropertyExistException, @@ -596,7 +596,7 @@ BaseContent::addProperty( { if( ( m_nState & JustInserted ) || ( m_nState & Deleted ) || Name.isEmpty() ) { - throw lang::IllegalArgumentException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); + throw lang::IllegalArgumentException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); } m_pMyShell->associate( m_aUncPath,Name,DefaultValue,Attributes ); @@ -605,14 +605,14 @@ BaseContent::addProperty( void SAL_CALL BaseContent::removeProperty( - const rtl::OUString& Name ) + const OUString& Name ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, RuntimeException) { if( m_nState & Deleted ) - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); m_pMyShell->deassociate( m_aUncPath, Name ); } @@ -656,7 +656,7 @@ BaseContent::createNewContent( try { Sequence< beans::Property > seq(1); - seq[0] = beans::Property( rtl::OUString("IsDocument"), + seq[0] = beans::Property( OUString("IsDocument"), -1, getCppuType( static_cast< sal_Bool* >(0) ), 0 ); @@ -676,7 +676,7 @@ BaseContent::createNewContent( return Reference< XContent >(); } - rtl::OUString dstUncPath; + OUString dstUncPath; if( IsDocument ) { @@ -730,8 +730,8 @@ BaseContent::getParent( void ) throw( RuntimeException ) { - rtl::OUString ParentUnq = getParentName( m_aUncPath ); - rtl::OUString ParentUrl; + OUString ParentUnq = getParentName( m_aUncPath ); + OUString ParentUrl; sal_Bool err = m_pMyShell->getUrlFromUnq( ParentUnq, ParentUrl ); @@ -759,7 +759,7 @@ BaseContent::setParent( throw( lang::NoSupportException, RuntimeException) { - throw lang::NoSupportException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw lang::NoSupportException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } @@ -857,7 +857,7 @@ BaseContent::setPropertyValues( return Sequence< Any >( Values.getLength() ); } - const rtl::OUString Title("Title"); + const OUString Title("Title"); // Special handling for files which have to be inserted if( m_nState & JustInserted ) @@ -866,7 +866,7 @@ BaseContent::setPropertyValues( { if( Values[i].Name == Title ) { - rtl::OUString NewTitle; + OUString NewTitle; if( Values[i].Value >>= NewTitle ) { if ( m_nState & NameForInsertionSet ) @@ -887,7 +887,7 @@ BaseContent::setPropertyValues( "BaseContent::setPropertyValues: " "Invalid URL!" ); - rtl::OUStringBuffer aBuf( + OUStringBuffer aBuf( m_aUncPath.copy( 0, nLastSlash + 1 ) ); if ( !NewTitle.isEmpty() ) @@ -911,7 +911,7 @@ BaseContent::setPropertyValues( // m_aUncPath contains parent's URI. if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 ) - m_aUncPath += rtl::OUString("/"); + m_aUncPath += OUString("/"); m_aUncPath += rtl::Uri::encode( NewTitle, rtl_UriCharClassPchar, @@ -937,22 +937,22 @@ BaseContent::setPropertyValues( if( Values[i].Name != Title ) continue; // handled by setv - rtl::OUString NewTitle; + OUString NewTitle; if( !( Values[i].Value >>= NewTitle ) ) { - ret[i] <<= beans::IllegalTypeException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + ret[i] <<= beans::IllegalTypeException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); break; } else if( NewTitle.isEmpty() ) { - ret[i] <<= lang::IllegalArgumentException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); + ret[i] <<= lang::IllegalArgumentException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); break; } - rtl::OUString aDstName = getParentName( m_aUncPath ); + OUString aDstName = getParentName( m_aUncPath ); if( aDstName.lastIndexOf( sal_Unicode('/') ) != aDstName.getLength() - 1 ) - aDstName += rtl::OUString("/"); + aDstName += OUString("/"); aDstName += rtl::Uri::encode( NewTitle, rtl_UriCharClassPchar, @@ -1092,7 +1092,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, return; } - rtl::OUString srcUnc; + OUString srcUnc; if( m_pMyShell->getUnqFromUrl( aTransferInfo.SourceURL,srcUnc ) ) { m_pMyShell->installError( nMyCommandIdentifier, @@ -1100,10 +1100,10 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, return; } - rtl::OUString srcUncPath = srcUnc; + OUString srcUncPath = srcUnc; // Determine the new title ! - rtl::OUString NewTitle; + OUString NewTitle; if( !aTransferInfo.NewTitle.isEmpty() ) NewTitle = rtl::Uri::encode( aTransferInfo.NewTitle, rtl_UriCharClassPchar, @@ -1114,7 +1114,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, // Is destination a document or a folder ? Sequence< beans::Property > seq(1); - seq[0] = beans::Property( rtl::OUString("IsDocument"), + seq[0] = beans::Property( OUString("IsDocument"), -1, getCppuType( static_cast< sal_Bool* >(0) ), 0 ); @@ -1127,7 +1127,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, return; } - rtl::OUString dstUncPath; + OUString dstUncPath; if( IsDocument ) { // as sibling sal_Int32 lastSlash = m_aUncPath.lastIndexOf( sal_Unicode('/') ); @@ -1137,7 +1137,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, // as child dstUncPath = m_aUncPath; - dstUncPath += ( rtl::OUString("/") + NewTitle ); + dstUncPath += ( OUString("/") + NewTitle ); sal_Int32 NameClash = aTransferInfo.NameClash; @@ -1183,7 +1183,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, sal_Bool bDocument = false; Sequence< beans::Property > seq(1); - seq[0] = beans::Property( rtl::OUString("IsDocument"), + seq[0] = beans::Property( OUString("IsDocument"), -1, getCppuType( static_cast< sal_Bool* >(0) ), 0 ); @@ -1248,7 +1248,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, m_pMyShell->clearError( nMyCommandIdentifier ); m_aUncPath = getParentName( m_aUncPath ); if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 ) - m_aUncPath += rtl::OUString("/"); + m_aUncPath += OUString("/"); m_aUncPath += rtl::Uri::encode( aRequestImpl->newName(), rtl_UriCharClassPchar, @@ -1301,7 +1301,7 @@ BaseContent::cDEL( void ) ContentEventNotifier* -BaseContent::cEXC( const rtl::OUString aNewName ) +BaseContent::cEXC( const OUString aNewName ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1356,7 +1356,7 @@ BaseContent::cPCL( void ) { osl::MutexGuard aGuard( m_aMutex ); - Sequence< rtl::OUString > seqNames; + Sequence< OUString > seqNames; if( m_pPropertyListener ) seqNames = m_pPropertyListener->getContainedTypes(); @@ -1382,7 +1382,7 @@ BaseContent::cPCL( void ) } -rtl::OUString BaseContent::getKey( void ) +OUString BaseContent::getKey( void ) { return m_aUncPath; } diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index 76eb79c3d7fe..73aa5cdb278d 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -75,14 +75,14 @@ namespace fileaccess { // A special creator for inserted contents; Creates an ugly object BaseContent( shell* pMyShell, - const rtl::OUString& parentName, + const OUString& parentName, sal_Bool bFolder ); public: BaseContent( shell* pMyShell, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xContentIdentifier, - const rtl::OUString& aUnqPath ); + const OUString& aUnqPath ); virtual ~BaseContent(); @@ -125,15 +125,15 @@ namespace fileaccess { // XServiceInfo - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - supportsService( const rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) throw( com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); @@ -165,7 +165,7 @@ namespace fileaccess { void ) throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType( void ) throw( com::sun::star::uno::RuntimeException ); @@ -184,13 +184,13 @@ namespace fileaccess { virtual void SAL_CALL addPropertiesChangeListener( - const com::sun::star::uno::Sequence< rtl::OUString >& PropertyNames, + const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removePropertiesChangeListener( const com::sun::star::uno::Sequence< rtl::OUString >& PropertyNames, + removePropertiesChangeListener( const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw( com::sun::star::uno::RuntimeException ); @@ -199,7 +199,7 @@ namespace fileaccess { virtual void SAL_CALL addProperty( - const rtl::OUString& Name, + const OUString& Name, sal_Int16 Attributes, const com::sun::star::uno::Any& DefaultValue ) throw( com::sun::star::beans::PropertyExistException, @@ -209,7 +209,7 @@ namespace fileaccess { virtual void SAL_CALL removeProperty( - const rtl::OUString& Name ) + const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException ); @@ -257,17 +257,17 @@ namespace fileaccess { // Notifier ContentEventNotifier* cDEL( void ); - ContentEventNotifier* cEXC( const rtl::OUString aNewName ); + ContentEventNotifier* cEXC( const OUString aNewName ); ContentEventNotifier* cCEL( void ); PropertySetInfoChangeNotifier* cPSL( void ); PropertyChangeNotifier* cPCL( void ); - rtl::OUString getKey( void ); + OUString getKey( void ); private: // Data members shell* m_pMyShell; com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xContentIdentifier; - rtl::OUString m_aUncPath; + OUString m_aUncPath; enum state { NameForInsertionSet = 1, JustInserted = 2, diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index c0017176b780..2d96f2de05aa 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -79,7 +79,7 @@ XCommandInfo_impl::getCommands( CommandInfo SAL_CALL XCommandInfo_impl::getCommandInfoByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( UnsupportedCommandException, uno::RuntimeException) { @@ -107,7 +107,7 @@ XCommandInfo_impl::getCommandInfoByHandle( sal_Bool SAL_CALL XCommandInfo_impl::hasCommandByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( uno::RuntimeException ) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i ) diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx index e06ea9c3c10f..52df9ab8b7c9 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -68,7 +68,7 @@ namespace fileaccess { virtual com::sun::star::ucb::CommandInfo SAL_CALL getCommandInfoByName( - const rtl::OUString& Name ) + const OUString& Name ) throw( com::sun::star::ucb::UnsupportedCommandException, com::sun::star::uno::RuntimeException); @@ -80,7 +80,7 @@ namespace fileaccess { virtual sal_Bool SAL_CALL hasCommandByName( - const rtl::OUString& Name ) + const OUString& Name ) throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index acf69f2f6857..c3f22b6a2f01 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -58,10 +58,10 @@ using namespace com::sun::star::ucb; namespace { Sequence< Any > generateErrorArguments( - rtl::OUString const & rPhysicalUrl) + OUString const & rPhysicalUrl) { - rtl::OUString aResourceName; - rtl::OUString aResourceType; + OUString aResourceName; + OUString aResourceType; sal_Bool bRemovable; bool bResourceName = false; bool bResourceType = false; @@ -85,13 +85,13 @@ namespace { switch (aStatus.getFileType()) { case osl::FileStatus::Directory: - aResourceType = rtl::OUString( "folder"); + aResourceType = OUString( "folder"); bResourceType = true; break; case osl::FileStatus::Volume: { - aResourceType = rtl::OUString( "volume"); + aResourceType = OUString( "volume"); bResourceType = true; osl::VolumeInfo aVolumeInfo( osl_VolumeInfo_Mask_Attributes ); @@ -121,25 +121,25 @@ namespace { (bRemoveProperty ? 1 : 0) ); sal_Int32 i = 0; aArguments[i++] - <<= PropertyValue(rtl::OUString( "Uri"), + <<= PropertyValue(OUString( "Uri"), -1, makeAny(rPhysicalUrl), PropertyState_DIRECT_VALUE); if (bResourceName) aArguments[i++] - <<= PropertyValue(rtl::OUString( "ResourceName"), + <<= PropertyValue(OUString( "ResourceName"), -1, makeAny(aResourceName), PropertyState_DIRECT_VALUE); if (bResourceType) aArguments[i++] - <<= PropertyValue(rtl::OUString( "ResourceType"), + <<= PropertyValue(OUString( "ResourceType"), -1, makeAny(aResourceType), PropertyState_DIRECT_VALUE); if (bRemoveProperty) aArguments[i++] - <<= PropertyValue(rtl::OUString( "Removable"), + <<= PropertyValue(OUString( "Removable"), -1, makeAny(bRemovable), PropertyState_DIRECT_VALUE); @@ -153,8 +153,8 @@ namespace { namespace fileaccess { - sal_Bool isChild( const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath ) + sal_Bool isChild( const OUString& srcUnqPath, + const OUString& dstUnqPath ) { static sal_Unicode slash = '/'; // Simple lexical comparison @@ -173,20 +173,20 @@ namespace fileaccess { } - rtl::OUString newName( - const rtl::OUString& aNewPrefix, - const rtl::OUString& aOldPrefix, - const rtl::OUString& old_Name ) + OUString newName( + const OUString& aNewPrefix, + const OUString& aOldPrefix, + const OUString& old_Name ) { sal_Int32 srcL = aOldPrefix.getLength(); - rtl::OUString new_Name = old_Name.copy( srcL ); + OUString new_Name = old_Name.copy( srcL ); new_Name = ( aNewPrefix + new_Name ); return new_Name; } - rtl::OUString getTitle( const rtl::OUString& aPath ) + OUString getTitle( const OUString& aPath ) { sal_Unicode slash = '/'; sal_Int32 lastIndex = aPath.lastIndexOf( slash ); @@ -194,23 +194,23 @@ namespace fileaccess { } - rtl::OUString getParentName( const rtl::OUString& aFileName ) + OUString getParentName( const OUString& aFileName ) { sal_Int32 lastIndex = aFileName.lastIndexOf( sal_Unicode('/') ); - rtl::OUString aParent = aFileName.copy( 0,lastIndex ); + OUString aParent = aFileName.copy( 0,lastIndex ); if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 ) - aParent += rtl::OUString("/"); + aParent += OUString("/"); if ( aParent == "file://" ) - aParent = rtl::OUString("file:///"); + aParent = OUString("file:///"); return aParent; } - osl::FileBase::RC osl_File_copy( const rtl::OUString& strPath, - const rtl::OUString& strDestPath, + osl::FileBase::RC osl_File_copy( const OUString& strPath, + const OUString& strDestPath, sal_Bool test ) { if( test ) @@ -224,8 +224,8 @@ namespace fileaccess { } - osl::FileBase::RC osl_File_move( const rtl::OUString& strPath, - const rtl::OUString& strDestPath, + osl::FileBase::RC osl_File_move( const OUString& strPath, + const OUString& strDestPath, sal_Bool test ) { if( test ) @@ -242,7 +242,7 @@ namespace fileaccess { sal_Int32 errorCode, sal_Int32 minorCode, const Reference< XCommandEnvironment >& xEnv, - const rtl::OUString& aUncPath, + const OUString& aUncPath, BaseContent* pContent, bool isHandled ) { @@ -252,7 +252,7 @@ namespace fileaccess { if( errorCode == TASKHANDLER_UNSUPPORTED_COMMAND ) { - aAny <<= UnsupportedCommandException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + aAny <<= UnsupportedCommandException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); cancelCommandExecution( aAny,xEnv ); } else if( errorCode == TASKHANDLING_WRONG_SETPROPERTYVALUES_ARGUMENT || @@ -368,7 +368,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "an error occurred during file opening"), + OUString( "an error occurred during file opening"), xComProc); } else if( errorCode == TASKHANDLING_OPEN_FOR_DIRECTORYLISTING || @@ -421,7 +421,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "an error occurred during opening a directory"), + OUString( "an error occurred during opening a directory"), xComProc); } else if( errorCode == TASKHANDLING_NOTCONNECTED_FOR_WRITE || @@ -436,7 +436,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "an error occurred writing or reading from a file"), + OUString( "an error occurred writing or reading from a file"), xComProc ); } else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_NO_SPACE ) @@ -446,7 +446,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "device full"), + OUString( "device full"), xComProc); } else if( errorCode == TASKHANDLING_FILEIOERROR_FOR_WRITE || @@ -498,20 +498,20 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "an error occurred during opening a file"), + OUString( "an error occurred during opening a file"), xComProc); } else if( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND || errorCode == TASKHANDLING_NOCONTENTTYPE_INSERT_COMMAND ) { - Sequence< ::rtl::OUString > aSeq( 1 ); + Sequence< OUString > aSeq( 1 ); aSeq[0] = ( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND ) ? - rtl::OUString("Title") : - rtl::OUString("ContentType"); + OUString("Title") : + OUString("ContentType"); aAny <<= MissingPropertiesException( - rtl::OUString( "a property is missing necessary" + OUString( "a property is missing necessary" "to create a content"), xComProc, aSeq); @@ -536,7 +536,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "there were problems with the filesize"), + OUString( "there were problems with the filesize"), xComProc); } else if(errorCode == TASKHANDLING_INPUTSTREAM_FOR_WRITE) @@ -544,7 +544,7 @@ namespace fileaccess { Reference xContext(xComProc,UNO_QUERY); aAny <<= MissingInputStreamException( - rtl::OUString( "the inputstream is missing necessary" + OUString( "the inputstream is missing necessary" "to create a content"), xContext); cancelCommandExecution(aAny,xEnv); @@ -557,7 +557,7 @@ namespace fileaccess { excep.Classification = InteractionClassification_ERROR; Reference xContext(xComProc,UNO_QUERY); excep.Context = xContext; - excep.Message = rtl::OUString( "file exists and overwrite forbidden"); + excep.Message = OUString( "file exists and overwrite forbidden"); aAny <<= excep; cancelCommandExecution( aAny,xEnv ); } @@ -566,9 +566,9 @@ namespace fileaccess { InteractiveAugmentedIOException excep; excep.Code = IOErrorCode_INVALID_CHARACTER; PropertyValue prop; - prop.Name = rtl::OUString("ResourceName"); + prop.Name = OUString("ResourceName"); prop.Handle = -1; - rtl::OUString m_aClashingName( + OUString m_aClashingName( rtl::Uri::decode( getTitle(aUncPath), rtl_UriDecodeWithCharset, @@ -580,7 +580,7 @@ namespace fileaccess { excep.Classification = InteractionClassification_ERROR; Reference xContext(xComProc,UNO_QUERY); excep.Context = xContext; - excep.Message = rtl::OUString( "the name contained invalid characters"); + excep.Message = OUString( "the name contained invalid characters"); if(isHandled) throw excep; else { @@ -592,7 +592,7 @@ namespace fileaccess { // ioErrorCode, // generateErrorArguments(aUncPath), // xEnv, -// rtl::OUString( "the name contained invalid characters"), +// OUString( "the name contained invalid characters"), // xComProc ); } else if( errorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR ) @@ -602,7 +602,7 @@ namespace fileaccess { excep.Classification = InteractionClassification_ERROR; Reference xContext(xComProc,UNO_QUERY); excep.Context = xContext; - excep.Message = rtl::OUString( "folder exists and overwrite forbidden"); + excep.Message = OUString( "folder exists and overwrite forbidden"); if(isHandled) throw excep; else { @@ -614,7 +614,7 @@ namespace fileaccess { // ioErrorCode, // generateErrorArguments(aUncPath), // xEnv, -// rtl::OUString( "the folder exists"), +// OUString( "the folder exists"), // xComProc ); } else if( errorCode == TASKHANDLING_ENSUREDIR_FOR_WRITE || @@ -640,7 +640,7 @@ namespace fileaccess { generateErrorArguments(getParentName(aUncPath)), //TODO! ok to supply physical URL to getParentName()? xEnv, - rtl::OUString( "a folder could not be created"), + OUString( "a folder could not be created"), xComProc ); } else if( errorCode == TASKHANDLING_VALIDFILESTATUSWHILE_FOR_REMOVE || @@ -691,7 +691,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "a file status object could not be filled"), + OUString( "a file status object could not be filled"), xComProc ); } else if( errorCode == TASKHANDLING_DELETEFILE_FOR_REMOVE || @@ -738,7 +738,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "a file or directory could not be deleted"), + OUString( "a file or directory could not be deleted"), xComProc ); } else if( errorCode == TASKHANDLING_TRANSFER_BY_COPY_SOURCE || @@ -750,7 +750,7 @@ namespace fileaccess { errorCode == TASKHANDLING_DIRECTORYEXHAUSTED_FOR_REMOVE || errorCode == TASKHANDLING_TRANSFER_INVALIDURL ) { - rtl::OUString aMsg; + OUString aMsg; switch( minorCode ) { case FileBase::E_NOENT: // No such file or directory @@ -760,18 +760,18 @@ namespace fileaccess { errorCode == TASKHANDLING_TRANSFER_BY_MOVE_SOURCESTAT ) { ioErrorCode = IOErrorCode_NOT_EXISTING; - aMsg = rtl::OUString( "source file/folder does not exist"); + aMsg = OUString( "source file/folder does not exist"); break; } else { ioErrorCode = IOErrorCode_GENERAL; - aMsg = rtl::OUString( "a general error during transfer command"); + aMsg = OUString( "a general error during transfer command"); break; } default: ioErrorCode = IOErrorCode_GENERAL; - aMsg = rtl::OUString( "a general error during transfer command"); + aMsg = OUString( "a general error during transfer command"); break; } cancelCommandExecution( @@ -788,7 +788,7 @@ namespace fileaccess { ioErrorCode, generateErrorArguments(aUncPath), xEnv, - rtl::OUString( "accessing the root during transfer"), + OUString( "accessing the root during transfer"), xComProc ); } else if( errorCode == TASKHANDLING_TRANSFER_INVALIDSCHEME ) @@ -797,7 +797,7 @@ namespace fileaccess { aAny <<= InteractiveBadTransferURLException( - rtl::OUString( "bad tranfer url"), + OUString( "bad tranfer url"), xContext); cancelCommandExecution( aAny,xEnv ); } @@ -812,7 +812,7 @@ namespace fileaccess { errorCode == TASKHANDLING_RENAMEMOVE_FOR_MOVE || errorCode == TASKHANDLING_RENAMEMOVE_FOR_COPY ) { - rtl::OUString aMsg( + OUString aMsg( "general error during transfer"); switch( minorCode ) @@ -837,7 +837,7 @@ namespace fileaccess { break; case FileBase::E_NOENT: // No such file or directory ioErrorCode = IOErrorCode_NOT_EXISTING; - aMsg = rtl::OUString( "file/folder does not exist"); + aMsg = OUString( "file/folder does not exist"); break; case FileBase::E_ROFS: // Read-only file system

      ioErrorCode = IOErrorCode_NOT_EXISTING; @@ -861,7 +861,7 @@ namespace fileaccess { excep.Classification = InteractionClassification_ERROR; Reference xContext(xComProc,UNO_QUERY); excep.Context = xContext; - excep.Message = rtl::OUString( "name clash during copy or move"); + excep.Message = OUString( "name clash during copy or move"); aAny <<= excep; cancelCommandExecution(aAny,xEnv); @@ -874,7 +874,7 @@ namespace fileaccess { UnsupportedNameClashException excep; excep.NameClash = minorCode; excep.Context = xContext; - excep.Message = rtl::OUString( "name clash value not supported during copy or move"); + excep.Message = OUString( "name clash value not supported during copy or move"); aAny <<= excep; cancelCommandExecution(aAny,xEnv); diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx index 1ca87b410f9a..fbb6d8b266e3 100644 --- a/ucb/source/ucp/file/filglob.hxx +++ b/ucb/source/ucp/file/filglob.hxx @@ -30,7 +30,7 @@ namespace fileaccess { struct equalOUString { - bool operator()( const rtl::OUString& rKey1, const rtl::OUString& rKey2 ) const + bool operator()( const OUString& rKey1, const OUString& rKey2 ) const { return !!( rKey1 == rKey2 ); } @@ -39,7 +39,7 @@ namespace fileaccess { struct hashOUString { - size_t operator()( const rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } @@ -55,22 +55,22 @@ namespace fileaccess { // Returns true if dstUnqPath is a child from srcUnqPath or both are equal - extern sal_Bool isChild( const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath ); + extern sal_Bool isChild( const OUString& srcUnqPath, + const OUString& dstUnqPath ); // Changes the prefix in name - extern rtl::OUString newName( const rtl::OUString& aNewPrefix, - const rtl::OUString& aOldPrefix, - const rtl::OUString& old_Name ); + extern OUString newName( const OUString& aNewPrefix, + const OUString& aOldPrefix, + const OUString& old_Name ); // returns the last part of the given url as title - extern rtl::OUString getTitle( const rtl::OUString& aPath ); + extern OUString getTitle( const OUString& aPath ); // returns the url without last part as parentname // In case aFileName is root ( file:/// ) root is returned - extern rtl::OUString getParentName( const rtl::OUString& aFileName ); + extern OUString getParentName( const OUString& aFileName ); /** * special copy: @@ -79,8 +79,8 @@ namespace fileaccess { * osl::File::copy copies unchecked. */ - extern osl::FileBase::RC osl_File_copy( const rtl::OUString& strPath, - const rtl::OUString& strDestPath, + extern osl::FileBase::RC osl_File_copy( const OUString& strPath, + const OUString& strDestPath, sal_Bool test = false ); /** @@ -90,8 +90,8 @@ namespace fileaccess { * osl::File::move moves unchecked */ - extern osl::FileBase::RC osl_File_move( const rtl::OUString& strPath, - const rtl::OUString& strDestPath, + extern osl::FileBase::RC osl_File_move( const OUString& strPath, + const OUString& strDestPath, sal_Bool test = false ); // This function implements the global exception handler of the file_ucp; @@ -101,7 +101,7 @@ namespace fileaccess { sal_Int32 minorCode, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv, - const rtl::OUString& aUncPath, + const OUString& aUncPath, BaseContent* pContent, bool isHandled = false); // the physical URL of the object diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx index 0f234ca5899e..0fc415babb04 100644 --- a/ucb/source/ucp/file/filid.cxx +++ b/ucb/source/ucp/file/filid.cxx @@ -27,7 +27,7 @@ using namespace com::sun::star::ucb; FileContentIdentifier::FileContentIdentifier( shell* pMyShell, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool IsNormalized ) : m_pMyShell( pMyShell ) { @@ -118,7 +118,7 @@ FileContentIdentifier::getTypes( } -rtl::OUString +OUString SAL_CALL FileContentIdentifier::getContentIdentifier( void ) @@ -128,7 +128,7 @@ FileContentIdentifier::getContentIdentifier( } -rtl::OUString SAL_CALL +OUString SAL_CALL FileContentIdentifier::getContentProviderScheme( void ) throw( uno::RuntimeException ) diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx index d884c4f9a9b9..febe3e61a609 100644 --- a/ucb/source/ucp/file/filid.hxx +++ b/ucb/source/ucp/file/filid.hxx @@ -37,7 +37,7 @@ namespace fileaccess { // This implementation has to be reworked public: FileContentIdentifier( shell* pMyShell, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool IsNormalized = true ); virtual ~FileContentIdentifier(); @@ -70,21 +70,21 @@ namespace fileaccess { throw( com::sun::star::uno::RuntimeException ); // XContentIdentifier - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentIdentifier( void ) throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentProviderScheme( void ) throw( com::sun::star::uno::RuntimeException ); private: shell* m_pMyShell; - rtl::OUString m_aContentId; // The URL string - rtl::OUString m_aNormalizedId; // The somehow normalized string - rtl::OUString m_aProviderScheme; + OUString m_aContentId; // The URL string + OUString m_aNormalizedId; // The somehow normalized string + OUString m_aProviderScheme; }; } // end namespace fileaccess diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 94172d776caf..bc48d8a567d7 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star::ucb; -XInputStream_impl::XInputStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_Bool bLock ) +XInputStream_impl::XInputStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock ) : m_xProvider( pMyShell->m_pProvider ), m_aFile( aUncPath ), m_nErrorCode( TASKHANDLER_NO_ERROR ), diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index 62ceaf06e12e..55514b68c8fb 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -45,7 +45,7 @@ namespace fileaccess { { public: - XInputStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_Bool bLock ); + XInputStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock ); virtual ~XInputStream_impl(); diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index ef2e2cafc5aa..c9629d45ab01 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -117,7 +117,7 @@ XTYPEPROVIDER_IMPL_2( XInteractionAbortImpl, XInteractionRequestImpl::XInteractionRequestImpl( - const rtl::OUString& aClashingName, + const OUString& aClashingName, const Reference& xOrigin, shell *pShell,sal_Int32 CommandId) : p1( new XInteractionSupplyNameImpl ), @@ -186,7 +186,7 @@ XInteractionRequestImpl::getRequest() excep.Name = m_aClashingName; excep.Classification = InteractionClassification_ERROR; excep.Context = m_xOrigin; - excep.Message = rtl::OUString( "folder exists and overwritte forbidden"); + excep.Message = OUString( "folder exists and overwritte forbidden"); aAny <<= excep; } else if(m_nErrorCode == TASKHANDLING_INVALID_NAME_MKDIR) @@ -194,7 +194,7 @@ XInteractionRequestImpl::getRequest() InteractiveAugmentedIOException excep; excep.Code = IOErrorCode_INVALID_CHARACTER; PropertyValue prop; - prop.Name = rtl::OUString("ResourceName"); + prop.Name = OUString("ResourceName"); prop.Handle = -1; prop.Value <<= m_aClashingName; Sequence seq(1); @@ -202,7 +202,7 @@ XInteractionRequestImpl::getRequest() excep.Arguments = seq; excep.Classification = InteractionClassification_ERROR; excep.Context = m_xOrigin; - excep.Message = rtl::OUString( "the name contained invalid characters"); + excep.Message = OUString( "the name contained invalid characters"); aAny <<= excep; } diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index d73d59b84842..fb00e5ff22ec 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -76,13 +76,13 @@ namespace fileaccess { m_bSelected = true; } - void SAL_CALL setName(const ::rtl::OUString& Name) + void SAL_CALL setName(const OUString& Name) throw(::com::sun::star::uno::RuntimeException) { m_aNewName = Name; } - rtl::OUString getName() const + OUString getName() const { return m_aNewName; } @@ -95,7 +95,7 @@ namespace fileaccess { private: bool m_bSelected; - rtl::OUString m_aNewName; + OUString m_aNewName; }; @@ -160,7 +160,7 @@ namespace fileaccess { public: XInteractionRequestImpl( - const rtl::OUString& aClashingName, + const OUString& aClashingName, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xOrigin, shell* pShell, @@ -203,12 +203,12 @@ namespace fileaccess { return p2->isSelected(); } - rtl::OUString newName() const + OUString newName() const { if( p1->isSelected() ) return p1->getName(); else - return rtl::OUString(); + return OUString(); } private: @@ -221,7 +221,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > m_aSeq; - rtl::OUString m_aClashingName; + OUString m_aClashingName; com::sun::star::uno::Reference< com::sun::star::uno::XInterface> m_xOrigin; }; diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index 7fe9456133bd..1f38d42cfb7b 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -59,7 +59,7 @@ ContentEventNotifier::ContentEventNotifier( shell* pMyShell, -void ContentEventNotifier::notifyChildInserted( const rtl::OUString& aChildName ) +void ContentEventNotifier::notifyChildInserted( const OUString& aChildName ) { FileContentIdentifier* p = new FileContentIdentifier( m_pMyShell,aChildName ); uno::Reference< XContentIdentifier > xChildId( p ); @@ -98,7 +98,7 @@ void ContentEventNotifier::notifyDeleted( void ) -void ContentEventNotifier::notifyRemoved( const rtl::OUString& aChildName ) +void ContentEventNotifier::notifyRemoved( const OUString& aChildName ) { FileContentIdentifier* p = new FileContentIdentifier( m_pMyShell,aChildName ); uno::Reference< XContentIdentifier > xChildId( p ); @@ -160,7 +160,7 @@ PropertySetInfoChangeNotifier::PropertySetInfoChangeNotifier( void SAL_CALL -PropertySetInfoChangeNotifier::notifyPropertyAdded( const rtl::OUString & aPropertyName ) +PropertySetInfoChangeNotifier::notifyPropertyAdded( const OUString & aPropertyName ) { beans::PropertySetInfoChangeEvent aEvt( m_xCreatorContent, aPropertyName, @@ -177,7 +177,7 @@ PropertySetInfoChangeNotifier::notifyPropertyAdded( const rtl::OUString & aPrope void SAL_CALL -PropertySetInfoChangeNotifier::notifyPropertyRemoved( const rtl::OUString & aPropertyName ) +PropertySetInfoChangeNotifier::notifyPropertyRemoved( const OUString & aPropertyName ) { beans::PropertySetInfoChangeEvent aEvt( m_xCreatorContent, aPropertyName, @@ -227,7 +227,7 @@ void PropertyChangeNotifier::notifyPropertyChanged( // notify listeners for all Events - uno::Sequence< uno::Reference< uno::XInterface > > seqList = (*m_pListeners)[ rtl::OUString() ]; + uno::Sequence< uno::Reference< uno::XInterface > > seqList = (*m_pListeners)[ OUString() ]; for( j = 0; j < seqList.getLength(); ++j ) { uno::Reference< beans::XPropertiesChangeListener > aListener( seqList[j],uno::UNO_QUERY ); diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index ee6a2467b5ee..8bb76d1536a9 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -56,9 +56,9 @@ namespace fileaccess { const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); - void notifyChildInserted( const rtl::OUString& aChildName ); + void notifyChildInserted( const OUString& aChildName ); void notifyDeleted( void ); - void notifyRemoved( const rtl::OUString& aChildName ); + void notifyRemoved( const OUString& aChildName ); void notifyExchanged( ); }; @@ -76,12 +76,12 @@ namespace fileaccess { const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); - void SAL_CALL notifyPropertyAdded( const rtl::OUString & aPropertyName ); - void SAL_CALL notifyPropertyRemoved( const rtl::OUString & aPropertyName ); + void SAL_CALL notifyPropertyAdded( const OUString & aPropertyName ); + void SAL_CALL notifyPropertyRemoved( const OUString & aPropertyName ); }; - typedef boost::unordered_map< rtl::OUString, + typedef boost::unordered_map< OUString, com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >, hashOUString, equalOUString > ListenerMap; @@ -109,13 +109,13 @@ namespace fileaccess { { public: // Side effect of this function is the change of the name - virtual ContentEventNotifier* cEXC( const rtl::OUString aNewName ) = 0; + virtual ContentEventNotifier* cEXC( const OUString aNewName ) = 0; // Side effect is the change of the state of the object to "deleted". virtual ContentEventNotifier* cDEL( void ) = 0; virtual ContentEventNotifier* cCEL( void ) = 0; virtual PropertySetInfoChangeNotifier* cPSL( void ) = 0; virtual PropertyChangeNotifier* cPCL( void ) = 0; - virtual rtl::OUString getKey( void ) = 0; + virtual OUString getKey( void ) = 0; protected: ~Notifier() {} diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index f107b83bf409..5b79d5a8b112 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::ucb; #include "filinl.hxx" -XPropertySetInfo_impl::XPropertySetInfo_impl( shell* pMyShell,const rtl::OUString& aUnqPath ) +XPropertySetInfo_impl::XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath ) : m_pMyShell( pMyShell ), m_xProvider( pMyShell->m_pProvider ), m_count( 0 ), @@ -109,7 +109,7 @@ XPropertySetInfo_impl::queryInterface( beans::Property SAL_CALL XPropertySetInfo_impl::getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( beans::UnknownPropertyException, RuntimeException) { @@ -132,7 +132,7 @@ XPropertySetInfo_impl::getProperties( sal_Bool SAL_CALL XPropertySetInfo_impl::hasPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( RuntimeException ) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index 44e7c5f674cc..fca4ce9a5921 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -36,7 +36,7 @@ namespace fileaccess { public com::sun::star::beans::XPropertySetInfo { public: - XPropertySetInfo_impl( shell* pMyShell,const rtl::OUString& aUnqPath ); + XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath ); XPropertySetInfo_impl( shell* pMyShell,const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq ); virtual ~XPropertySetInfo_impl(); @@ -69,12 +69,12 @@ namespace fileaccess { virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - hasPropertyByName( const rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw( com::sun::star::uno::RuntimeException ); private: diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx index 53cd3a34ee5d..5a565c13cb41 100644 --- a/ucb/source/ucp/file/filrec.hxx +++ b/ucb/source/ucp/file/filrec.hxx @@ -39,7 +39,7 @@ class ReconnectingFile public: - ReconnectingFile( const ::rtl::OUString& aFileURL ) + ReconnectingFile( const OUString& aFileURL ) : m_aFile( aFileURL ) , m_nFlags( 0 ) , m_bFlagsSet( sal_False ) diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index 8342985c45cb..282b7685558b 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -127,17 +127,17 @@ XRow_impl::wasNull( } -rtl::OUString SAL_CALL +OUString SAL_CALL XRow_impl::getString( sal_Int32 columnIndex ) throw( sdbc::SQLException, uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); - rtl::OUString Value; + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); + OUString Value; osl::MutexGuard aGuard( m_aMutex ); - m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); + m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); return Value; } @@ -148,7 +148,7 @@ XRow_impl::getBoolean( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); sal_Bool Value( false ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -163,7 +163,7 @@ XRow_impl::getByte( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); sal_Int8 Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -177,7 +177,7 @@ XRow_impl::getShort( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); sal_Int16 Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -192,7 +192,7 @@ XRow_impl::getInt( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); sal_Int32 Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -206,7 +206,7 @@ XRow_impl::getLong( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); sal_Int64 Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -220,7 +220,7 @@ XRow_impl::getFloat( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); float Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -234,7 +234,7 @@ XRow_impl::getDouble( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); double Value( 0 ); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -248,7 +248,7 @@ XRow_impl::getBytes( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Sequence< sal_Int8 > Value(0); osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert >( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -262,7 +262,7 @@ XRow_impl::getDate( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); util::Date Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -276,7 +276,7 @@ XRow_impl::getTime( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); util::Time Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -290,7 +290,7 @@ XRow_impl::getTimestamp( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); util::DateTime Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -305,7 +305,7 @@ XRow_impl::getBinaryStream( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< io::XInputStream > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert >( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -320,7 +320,7 @@ XRow_impl::getCharacterStream( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< io::XInputStream > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert< uno::Reference< io::XInputStream> >( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -336,7 +336,7 @@ XRow_impl::getObject( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Any Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert( m_pMyShell,m_xTypeConverter,m_aValueMap[ --columnIndex ],Value ); @@ -350,7 +350,7 @@ XRow_impl::getRef( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< sdbc::XRef > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert >( m_pMyShell, @@ -367,7 +367,7 @@ XRow_impl::getBlob( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< sdbc::XBlob > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert >( m_pMyShell, @@ -384,7 +384,7 @@ XRow_impl::getClob( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< sdbc::XClob > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert >( m_pMyShell, @@ -402,7 +402,7 @@ XRow_impl::getArray( uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); uno::Reference< sdbc::XArray > Value; osl::MutexGuard aGuard( m_aMutex ); m_nWasNull = ::convert >( m_pMyShell, diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index 9c160110c4ef..d5b4ba093f37 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -66,7 +66,7 @@ namespace fileaccess { throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 124e58b85b27..315fe9c3e4ea 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star; XResultSet_impl::XResultSet_impl( shell* pMyShell, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Int32 OpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< ucb::NumberedSortingInfo >& seqSort ) @@ -226,7 +226,7 @@ void XResultSet_impl::rowCountChanged() aOldValue = aNewValue-1; } beans::PropertyChangeEvent aEv; - aEv.PropertyName = rtl::OUString("RowCount"); + aEv.PropertyName = OUString("RowCount"); aEv.Further = false; aEv.PropertyHandle = -1; aEv.OldValue <<= aOldValue; @@ -251,7 +251,7 @@ void XResultSet_impl::isFinalChanged() m_bRowCountFinal = true; } beans::PropertyChangeEvent aEv; - aEv.PropertyName = rtl::OUString("IsRowCountFinal"); + aEv.PropertyName = OUString("IsRowCountFinal"); aEv.Further = false; aEv.PropertyHandle = -1; sal_Bool fval = false; @@ -279,7 +279,7 @@ XResultSet_impl::OneMore( osl::FileBase::RC err; sal_Bool IsRegular; - rtl::OUString aUnqPath; + OUString aUnqPath; osl::DirectoryItem m_aDirIte; uno::Reference< sdbc::XRow > aRow; @@ -340,7 +340,7 @@ XResultSet_impl::OneMore( } else // error fetching anything { - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); } } } @@ -498,7 +498,7 @@ XResultSet_impl::relative( uno::RuntimeException) { if( isAfterLast() || isBeforeFirst() ) - throw sdbc::SQLException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), ::rtl::OUString(), 0, uno::Any() ); + throw sdbc::SQLException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); if( row > 0 ) while( row-- ) next(); else if( row < 0 ) @@ -591,7 +591,7 @@ XResultSet_impl::close( -rtl::OUString SAL_CALL +OUString SAL_CALL XResultSet_impl::queryContentIdentifierString( void ) throw( uno::RuntimeException ) @@ -602,7 +602,7 @@ XResultSet_impl::queryContentIdentifierString( if( xContentId.is() ) return xContentId->getContentIdentifier(); else - return rtl::OUString(); + return OUString(); } @@ -650,7 +650,7 @@ XResultSet_impl::getStaticResultSet() osl::MutexGuard aGuard( m_aMutex ); if ( m_xListener.is() ) - throw ucb::ListenerAlreadySetException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw ucb::ListenerAlreadySetException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); return uno::Reference< sdbc::XResultSet >( this ); } @@ -666,7 +666,7 @@ XResultSet_impl::setListener( osl::ClearableMutexGuard aGuard( m_aMutex ); if ( m_xListener.is() ) - throw ucb::ListenerAlreadySetException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw ucb::ListenerAlreadySetException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); m_xListener = Listener; @@ -706,9 +706,9 @@ XResultSet_impl::connectToCache( uno::RuntimeException ) { if( m_xListener.is() ) - throw ucb::ListenerAlreadySetException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw ucb::ListenerAlreadySetException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); if( m_bStatic ) - throw ucb::ListenerAlreadySetException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw ucb::ListenerAlreadySetException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); uno::Reference< ucb::XSourceInitialization > xTarget( xCache, uno::UNO_QUERY ); @@ -732,7 +732,7 @@ XResultSet_impl::connectToCache( return; } } - throw ucb::ServiceNotFoundException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw ucb::ServiceNotFoundException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } //========================================================================= @@ -788,12 +788,12 @@ XResultSet_impl::getPropertySetInfo() { uno::Sequence< beans::Property > seq(2); - seq[0].Name = rtl::OUString("RowCount"); + seq[0].Name = OUString("RowCount"); seq[0].Handle = -1; seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) ); seq[0].Attributes = beans::PropertyAttribute::READONLY; - seq[0].Name = rtl::OUString("IsRowCountFinal"); + seq[0].Name = OUString("IsRowCountFinal"); seq[0].Handle = -1; seq[0].Type = getCppuType( static_cast< sal_Bool* >(0) ); seq[0].Attributes = beans::PropertyAttribute::READONLY; @@ -806,33 +806,33 @@ XResultSet_impl::getPropertySetInfo() void SAL_CALL XResultSet_impl::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& ) + const OUString& aPropertyName, const uno::Any& ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") || - aPropertyName == rtl::OUString("RowCount") ) + if( aPropertyName == OUString("IsRowCountFinal") || + aPropertyName == OUString("RowCount") ) return; - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL XResultSet_impl::getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( PropertyName == rtl::OUString("IsRowCountFinal") ) + if( PropertyName == OUString("IsRowCountFinal") ) { uno::Any aAny; aAny <<= m_bRowCountFinal; return aAny; } - else if ( PropertyName == rtl::OUString("RowCount") ) + else if ( PropertyName == OUString("RowCount") ) { uno::Any aAny; sal_Int32 count = sal::static_int_cast(m_aItems.size()); @@ -840,18 +840,18 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue( return aAny; } else - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } void SAL_CALL XResultSet_impl::addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") ) + if( aPropertyName == OUString("IsRowCountFinal") ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) @@ -860,7 +860,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( m_pIsFinalListeners->addInterface( xListener ); } - else if ( aPropertyName == rtl::OUString("RowCount") ) + else if ( aPropertyName == OUString("RowCount") ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) @@ -869,24 +869,24 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( m_pRowCountListeners->addInterface( xListener ); } else - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } void SAL_CALL XResultSet_impl::removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") && + if( aPropertyName == OUString("IsRowCountFinal") && m_pIsFinalListeners ) { osl::MutexGuard aGuard( m_aMutex ); m_pIsFinalListeners->removeInterface( aListener ); } - else if ( aPropertyName == rtl::OUString("RowCount") && + else if ( aPropertyName == OUString("RowCount") && m_pRowCountListeners ) { osl::MutexGuard aGuard( m_aMutex ); @@ -894,11 +894,11 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener( m_pRowCountListeners->removeInterface( aListener ); } else - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } void SAL_CALL XResultSet_impl::addVetoableChangeListener( - const rtl::OUString&, + const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -908,7 +908,7 @@ void SAL_CALL XResultSet_impl::addVetoableChangeListener( void SAL_CALL XResultSet_impl::removeVetoableChangeListener( - const rtl::OUString&, + const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index a15600c1b2ae..67519c0ce666 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -62,7 +62,7 @@ namespace fileaccess { public: XResultSet_impl( shell* pMyShell, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Int32 OpenMode, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort ); @@ -74,7 +74,7 @@ namespace fileaccess { return 0; } - virtual ContentEventNotifier* cEXC( const rtl::OUString ) + virtual ContentEventNotifier* cEXC( const OUString ) { return 0; } @@ -94,7 +94,7 @@ namespace fileaccess { return 0; } - virtual rtl::OUString getKey( void ) + virtual OUString getKey( void ) { return m_aBaseDirectory; } @@ -160,7 +160,7 @@ namespace fileaccess { return m_nWasNull; } - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, @@ -169,7 +169,7 @@ namespace fileaccess { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getString( columnIndex ); else - return rtl::OUString(); + return OUString(); } virtual sal_Bool SAL_CALL @@ -540,7 +540,7 @@ namespace fileaccess { // XContentAccess - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString( void ) throw( com::sun::star::uno::RuntimeException ); @@ -569,7 +569,7 @@ namespace fileaccess { throw( com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -579,14 +579,14 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -594,7 +594,7 @@ namespace fileaccess { virtual void SAL_CALL removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -602,14 +602,14 @@ namespace fileaccess { virtual void SAL_CALL addVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -631,12 +631,12 @@ namespace fileaccess { typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet; typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > > ItemSet; - typedef std::vector< rtl::OUString > UnqPathSet; + typedef std::vector< OUString > UnqPathSet; IdentSet m_aIdents; ItemSet m_aItems; UnqPathSet m_aUnqPath; - const rtl::OUString m_aBaseDirectory; + const OUString m_aBaseDirectory; osl::Directory m_aFolder; com::sun::star::uno::Sequence< com::sun::star::beans::Property > m_sProperty; diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index e9d0553f249e..42f654bb6d78 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -89,7 +89,7 @@ XTYPEPROVIDER_IMPL_7( XStream_impl, -XStream_impl::XStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_Bool bLock ) +XStream_impl::XStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock ) : m_bInputStreamCalled( false ), m_bOutputStreamCalled( false ), m_pMyShell( pMyShell ), @@ -175,10 +175,10 @@ void SAL_CALL XStream_impl::truncate(void) throw( io::IOException, uno::RuntimeException ) { if (osl::FileBase::E_None != m_aFile.setSize(0)) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); if (osl::FileBase::E_None != m_aFile.setPos(osl_Pos_Absolut,sal_uInt64(0))) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } @@ -197,7 +197,7 @@ XStream_impl::readBytes( uno::RuntimeException) { if( ! m_nIsOpen ) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); sal_Int8 * buffer; try @@ -207,7 +207,7 @@ XStream_impl::readBytes( catch (const std::bad_alloc&) { if( m_nIsOpen ) m_aFile.close(); - throw io::BufferSizeExceededException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::BufferSizeExceededException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } sal_uInt64 nrc(0); @@ -215,7 +215,7 @@ XStream_impl::readBytes( != osl::FileBase::E_None) { delete[] buffer; - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } aData = uno::Sequence< sal_Int8 > ( buffer, (sal_uInt32)nrc ); delete[] buffer; @@ -273,7 +273,7 @@ XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData ) const sal_Int8* p = aData.getConstArray(); if(osl::FileBase::E_None != m_aFile.write(((void*)(p)),sal_uInt64(length),nWrittenBytes) || nWrittenBytes != length ) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } } @@ -291,7 +291,7 @@ XStream_impl::closeStream( if( err != osl::FileBase::E_None ) { io::IOException ex; - ex.Message = rtl::OUString( "could not close file"); + ex.Message = OUString( "could not close file"); throw ex; } @@ -337,9 +337,9 @@ XStream_impl::seek( uno::RuntimeException ) { if( location < 0 ) - throw lang::IllegalArgumentException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); + throw lang::IllegalArgumentException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 ); if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) ) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } @@ -351,7 +351,7 @@ XStream_impl::getPosition( { sal_uInt64 uPos; if( osl::FileBase::E_None != m_aFile.getPos( uPos ) ) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); return sal_Int64( uPos ); } @@ -363,7 +363,7 @@ XStream_impl::getLength( { sal_uInt64 uEndPos; if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None ) - throw io::IOException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw io::IOException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); else return sal_Int64( uEndPos ); } @@ -384,7 +384,7 @@ void XStream_impl::waitForCompletion() // afterwards, there appears to be no cheaper way than to call fsync: if (m_nIsOpen && m_aFile.sync() != osl::FileBase::E_None) { throw io::IOException( - rtl::OUString( "could not synchronize file to disc"), + OUString( "could not synchronize file to disc"), static_cast< OWeakObject * >(this)); } } diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index b44769c38998..78fc1530cbdb 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -53,7 +53,7 @@ namespace fileaccess { public: - XStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_Bool bLock ); + XStream_impl( shell* pMyShell,const OUString& aUncPath, sal_Bool bLock ); /** * Returns an error code as given by filerror.hxx diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 3650cc1c4f0f..97a690484b7e 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -68,7 +68,7 @@ TaskManager::startTask( void SAL_CALL TaskManager::endTask( sal_Int32 CommandId, - const rtl::OUString& aUncPath, + const OUString& aUncPath, BaseContent* pContent) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 4053583a01a9..f68a276a80de 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -185,7 +185,7 @@ namespace fileaccess void SAL_CALL endTask( sal_Int32 CommandId, // the physical URL of the object - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, BaseContent* pContent); diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 4e4b6cf832e0..ee414b9bb960 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -150,7 +150,7 @@ FileProvider::initialize( throw (Exception, RuntimeException) { if( ! m_pMyShell ) { - rtl::OUString config; + OUString config; if( aArguments.getLength() > 0 && (aArguments[0] >>= config) && config.compareToAscii("NoConfig") == 0 ) @@ -179,7 +179,7 @@ XTYPEPROVIDER_IMPL_7( FileProvider, //////////////////////////////////////////////////////////////////////////////// // XServiceInfo methods. -rtl::OUString SAL_CALL +OUString SAL_CALL FileProvider::getImplementationName() throw( RuntimeException ) { @@ -189,14 +189,14 @@ FileProvider::getImplementationName() sal_Bool SAL_CALL FileProvider::supportsService( - const rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw( RuntimeException ) { - return ServiceName == rtl::OUString("com.sun.star.ucb.FileContentProvider"); + return ServiceName == OUString("com.sun.star.ucb.FileContentProvider"); } -Sequence< rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL FileProvider::getSupportedServiceNames( void ) throw( RuntimeException ) @@ -227,10 +227,10 @@ FileProvider::createServiceFactory( * Reference< ::com::sun::star::XSingleServiceFactory > createSingleFactory * ( * const ::com::sun::star::Reference< ::com::sun::star::XMultiServiceFactory > & rServiceManager, - * const ::rtl::OUString & rImplementationName, + * const OUString & rImplementationName, * ComponentInstantiation pCreateFunction, - * const ::com::sun::star::Sequence< ::rtl::OUString > & rServiceNames + * const ::com::sun::star::Sequence< OUString > & rServiceNames * ); */ @@ -263,12 +263,12 @@ FileProvider::queryContent( RuntimeException) { init(); - rtl::OUString aUnc; + OUString aUnc; sal_Bool err = m_pMyShell->getUnqFromUrl( xIdentifier->getContentIdentifier(), aUnc ); if( err ) - throw IllegalIdentifierException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw IllegalIdentifierException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); return Reference< XContent >( new BaseContent( m_pMyShell,xIdentifier,aUnc ) ); } @@ -282,14 +282,14 @@ FileProvider::compareContentIds( throw( RuntimeException ) { init(); - rtl::OUString aUrl1 = Id1->getContentIdentifier(); - rtl::OUString aUrl2 = Id2->getContentIdentifier(); + OUString aUrl1 = Id1->getContentIdentifier(); + OUString aUrl2 = Id2->getContentIdentifier(); sal_Int32 iComp = aUrl1.compareTo( aUrl2 ); if ( 0 != iComp ) { - rtl::OUString aPath1, aPath2; + OUString aPath1, aPath2; m_pMyShell->getUnqFromUrl( aUrl1, aPath1 ); m_pMyShell->getUnqFromUrl( aUrl2, aPath2 ); @@ -336,7 +336,7 @@ FileProvider::compareContentIds( Reference< XContentIdentifier > SAL_CALL FileProvider::createContentIdentifier( - const rtl::OUString& ContentId ) + const OUString& ContentId ) throw( RuntimeException ) { init(); @@ -380,12 +380,12 @@ public: virtual Property SAL_CALL getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( UnknownPropertyException, RuntimeException); virtual sal_Bool SAL_CALL - hasPropertyByName( const rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw( RuntimeException ); @@ -397,17 +397,17 @@ private: XPropertySetInfoImpl2::XPropertySetInfoImpl2() : m_seq( 3 ) { - m_seq[0] = Property( rtl::OUString("HostName"), + m_seq[0] = Property( OUString("HostName"), -1, - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), PropertyAttribute::READONLY ); - m_seq[1] = Property( rtl::OUString("HomeDirectory"), + m_seq[1] = Property( OUString("HomeDirectory"), -1, - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), PropertyAttribute::READONLY ); - m_seq[2] = Property( rtl::OUString("FileSystemNotation"), + m_seq[2] = Property( OUString("FileSystemNotation"), -1, getCppuType( static_cast< sal_Int32* >( 0 ) ), PropertyAttribute::READONLY ); @@ -451,7 +451,7 @@ XPropertySetInfoImpl2::queryInterface( Property SAL_CALL XPropertySetInfoImpl2::getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( UnknownPropertyException, RuntimeException) { @@ -459,7 +459,7 @@ XPropertySetInfoImpl2::getPropertyByName( if( m_seq[i].Name == aName ) return m_seq[i]; - throw UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } @@ -475,7 +475,7 @@ XPropertySetInfoImpl2::getProperties( sal_Bool SAL_CALL XPropertySetInfoImpl2::hasPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( RuntimeException ) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) @@ -528,7 +528,7 @@ FileProvider::getPropertySetInfo( ) void SAL_CALL -FileProvider::setPropertyValue( const rtl::OUString& aPropertyName, +FileProvider::setPropertyValue( const OUString& aPropertyName, const Any& ) throw( UnknownPropertyException, PropertyVetoException, @@ -541,14 +541,14 @@ FileProvider::setPropertyValue( const rtl::OUString& aPropertyName, aPropertyName.compareToAscii( "HostName" ) == 0 ) return; else - throw UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } Any SAL_CALL FileProvider::getPropertyValue( - const rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) @@ -573,13 +573,13 @@ FileProvider::getPropertyValue( return aAny; } else - throw UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } void SAL_CALL FileProvider::addPropertyChangeListener( - const rtl::OUString&, + const OUString&, const Reference< XPropertyChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, @@ -591,7 +591,7 @@ FileProvider::addPropertyChangeListener( void SAL_CALL FileProvider::removePropertyChangeListener( - const rtl::OUString&, + const OUString&, const Reference< XPropertyChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, @@ -602,7 +602,7 @@ FileProvider::removePropertyChangeListener( void SAL_CALL FileProvider::addVetoableChangeListener( - const rtl::OUString&, + const OUString&, const Reference< XVetoableChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, @@ -614,7 +614,7 @@ FileProvider::addVetoableChangeListener( void SAL_CALL FileProvider::removeVetoableChangeListener( - const rtl::OUString&, + const OUString&, const Reference< XVetoableChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, @@ -628,7 +628,7 @@ FileProvider::removeVetoableChangeListener( // XFileIdentifierConverter sal_Int32 SAL_CALL -FileProvider::getFileProviderLocality( const rtl::OUString& BaseURL ) +FileProvider::getFileProviderLocality( const OUString& BaseURL ) throw( RuntimeException ) { // If the base URL is a 'file' URL, return 10 (very 'local'), otherwise @@ -643,23 +643,23 @@ FileProvider::getFileProviderLocality( const rtl::OUString& BaseURL ) 10 : -1; } -rtl::OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const rtl::OUString&, - const rtl::OUString& SystemPath ) +OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const OUString&, + const OUString& SystemPath ) throw( RuntimeException ) { - rtl::OUString aNormalizedPath; + OUString aNormalizedPath; if ( osl::FileBase::getFileURLFromSystemPath( SystemPath,aNormalizedPath ) != osl::FileBase::E_None ) - return rtl::OUString(); + return OUString(); return aNormalizedPath; } -rtl::OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const rtl::OUString& URL ) +OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const OUString& URL ) throw( RuntimeException ) { - rtl::OUString aSystemPath; + OUString aSystemPath; if (osl::FileBase::getSystemPathFromFileURL( URL,aSystemPath ) != osl::FileBase::E_None ) - return rtl::OUString(); + return OUString(); return aSystemPath; } diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index c6336e735918..6f2a63fdd321 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -80,17 +80,17 @@ namespace fileaccess { throw(); // XServiceInfo - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( void ) throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL supportsService( - const rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw(com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( void ) throw( com::sun::star::uno::RuntimeException ); @@ -126,7 +126,7 @@ namespace fileaccess { virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( - const rtl::OUString& ContentId ) + const OUString& ContentId ) throw( com::sun::star::uno::RuntimeException ); @@ -144,7 +144,7 @@ namespace fileaccess { virtual void SAL_CALL setPropertyValue( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -154,14 +154,14 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -169,7 +169,7 @@ namespace fileaccess { virtual void SAL_CALL removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -177,7 +177,7 @@ namespace fileaccess { virtual void SAL_CALL addVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -185,7 +185,7 @@ namespace fileaccess { virtual void SAL_CALL removeVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, @@ -195,14 +195,14 @@ namespace fileaccess { // XFileIdentifierConverter virtual sal_Int32 SAL_CALL - getFileProviderLocality( const rtl::OUString& BaseURL ) + getFileProviderLocality( const OUString& BaseURL ) throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getFileURLFromSystemPath( const rtl::OUString& BaseURL, - const rtl::OUString& SystemPath ) + virtual OUString SAL_CALL getFileURLFromSystemPath( const OUString& BaseURL, + const OUString& SystemPath ) throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getSystemPathFromFileURL( const rtl::OUString& URL ) + virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) throw( com::sun::star::uno::RuntimeException ); @@ -215,8 +215,8 @@ namespace fileaccess { void SAL_CALL initProperties( void ); osl::Mutex m_aMutex; - rtl::OUString m_HostName; - rtl::OUString m_HomeDirectory; + OUString m_HostName; + OUString m_HomeDirectory; sal_Int32 m_FileSystemNotation; com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > m_xPropertySetInfo; diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 8054bbadfe46..23221fcb3968 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -113,7 +113,7 @@ shell::UnqPathData::~UnqPathData() -shell::MyProperty::MyProperty( const rtl::OUString& __PropertyName ) +shell::MyProperty::MyProperty( const OUString& __PropertyName ) : PropertyName( __PropertyName ) { // empty @@ -121,7 +121,7 @@ shell::MyProperty::MyProperty( const rtl::OUString& __Pr shell::MyProperty::MyProperty( const sal_Bool& __isNative, - const rtl::OUString& __PropertyName, + const OUString& __PropertyName, const sal_Int32& __Handle, const com::sun::star::uno::Type& __Typ, const com::sun::star::uno::Any& __Value, @@ -176,7 +176,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext, m_aDefaultProperties.insert( MyProperty( true, Title, -1 , - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), uno::Any(), beans::PropertyState_DEFAULT_VALUE, beans::PropertyAttribute::MAYBEVOID @@ -187,7 +187,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext, MyProperty( true, CasePreservingURL, -1 , - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), uno::Any(), beans::PropertyState_DEFAULT_VALUE, beans::PropertyAttribute::MAYBEVOID @@ -294,11 +294,11 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext, // ContentType uno::Any aAny; - aAny <<= rtl::OUString(); + aAny <<= OUString(); m_aDefaultProperties.insert( MyProperty( false, ContentType, -1 , - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), aAny, beans::PropertyState_DEFAULT_VALUE, beans::PropertyAttribute::MAYBEVOID @@ -349,39 +349,39 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext, | beans::PropertyAttribute::READONLY ) ); // Commands - m_sCommandInfo[0].Name = rtl::OUString("getCommandInfo"); + m_sCommandInfo[0].Name = OUString("getCommandInfo"); m_sCommandInfo[0].Handle = -1; m_sCommandInfo[0].ArgType = getCppuVoidType(); - m_sCommandInfo[1].Name = rtl::OUString("getPropertySetInfo"); + m_sCommandInfo[1].Name = OUString("getPropertySetInfo"); m_sCommandInfo[1].Handle = -1; m_sCommandInfo[1].ArgType = getCppuVoidType(); - m_sCommandInfo[2].Name = rtl::OUString("getPropertyValues"); + m_sCommandInfo[2].Name = OUString("getPropertyValues"); m_sCommandInfo[2].Handle = -1; m_sCommandInfo[2].ArgType = getCppuType( static_cast< uno::Sequence< beans::Property >* >( 0 ) ); - m_sCommandInfo[3].Name = rtl::OUString("setPropertyValues"); + m_sCommandInfo[3].Name = OUString("setPropertyValues"); m_sCommandInfo[3].Handle = -1; m_sCommandInfo[3].ArgType = getCppuType( static_cast< uno::Sequence< beans::PropertyValue >* >( 0 ) ); - m_sCommandInfo[4].Name = rtl::OUString("open"); + m_sCommandInfo[4].Name = OUString("open"); m_sCommandInfo[4].Handle = -1; m_sCommandInfo[4].ArgType = getCppuType( static_cast< OpenCommandArgument* >( 0 ) ); - m_sCommandInfo[5].Name = rtl::OUString("transfer"); + m_sCommandInfo[5].Name = OUString("transfer"); m_sCommandInfo[5].Handle = -1; m_sCommandInfo[5].ArgType = getCppuType( static_cast< TransferInfo* >( 0 ) ); - m_sCommandInfo[6].Name = rtl::OUString("delete"); + m_sCommandInfo[6].Name = OUString("delete"); m_sCommandInfo[6].Handle = -1; m_sCommandInfo[6].ArgType = getCppuType( static_cast< sal_Bool* >( 0 ) ); - m_sCommandInfo[7].Name = rtl::OUString("insert"); + m_sCommandInfo[7].Name = OUString("insert"); m_sCommandInfo[7].Handle = -1; m_sCommandInfo[7].ArgType = getCppuType( static_cast< InsertCommandArgument* > ( 0 ) ); - m_sCommandInfo[7].Name = rtl::OUString("createNewContent"); + m_sCommandInfo[7].Name = OUString("createNewContent"); m_sCommandInfo[7].Handle = -1; m_sCommandInfo[7].ArgType = getCppuType( static_cast< ucb::ContentInfo * > ( 0 ) ); @@ -389,7 +389,7 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext, { uno::Reference< XPropertySetRegistryFactory > xRegFac = ucb::Store::create( m_xContext ); // Open/create a registry - m_xFileRegistry = xRegFac->createPropertySetRegistry( rtl::OUString() ); + m_xFileRegistry = xRegFac->createPropertySetRegistry( OUString() ); } } @@ -411,7 +411,7 @@ shell::~shell() // void SAL_CALL -shell::registerNotifier( const rtl::OUString& aUnqPath, Notifier* pNotifier ) +shell::registerNotifier( const OUString& aUnqPath, Notifier* pNotifier ) { osl::MutexGuard aGuard( m_aMutex ); @@ -435,7 +435,7 @@ shell::registerNotifier( const rtl::OUString& aUnqPath, Notifier* pNotifier ) void SAL_CALL -shell::deregisterNotifier( const rtl::OUString& aUnqPath,Notifier* pNotifier ) +shell::deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ) { osl::MutexGuard aGuard( m_aMutex ); @@ -463,8 +463,8 @@ shell::deregisterNotifier( const rtl::OUString& aUnqPath,Notifier* pNotifier ) // void SAL_CALL -shell::associate( const rtl::OUString& aUnqPath, - const rtl::OUString& PropertyName, +shell::associate( const OUString& aUnqPath, + const OUString& PropertyName, const uno::Any& DefaultValue, const sal_Int16 Attributes ) throw( beans::PropertyExistException, @@ -481,7 +481,7 @@ shell::associate( const rtl::OUString& aUnqPath, shell::PropertySet::iterator it1 = m_aDefaultProperties.find( newProperty ); if( it1 != m_aDefaultProperties.end() ) - throw beans::PropertyExistException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::PropertyExistException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); { osl::MutexGuard aGuard( m_aMutex ); @@ -494,7 +494,7 @@ shell::associate( const rtl::OUString& aUnqPath, PropertySet& properties = *(it->second.properties); it1 = properties.find( newProperty ); if( it1 != properties.end() ) - throw beans::PropertyExistException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::PropertyExistException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); // Property does not exist properties.insert( newProperty ); @@ -507,8 +507,8 @@ shell::associate( const rtl::OUString& aUnqPath, void SAL_CALL -shell::deassociate( const rtl::OUString& aUnqPath, - const rtl::OUString& PropertyName ) +shell::deassociate( const OUString& aUnqPath, + const OUString& PropertyName ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, uno::RuntimeException ) @@ -517,7 +517,7 @@ shell::deassociate( const rtl::OUString& aUnqPath, shell::PropertySet::iterator it1 = m_aDefaultProperties.find( oldProperty ); if( it1 != m_aDefaultProperties.end() ) - throw beans::NotRemoveableException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::NotRemoveableException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); osl::MutexGuard aGuard( m_aMutex ); @@ -529,7 +529,7 @@ shell::deassociate( const rtl::OUString& aUnqPath, it1 = properties.find( oldProperty ); if( it1 == properties.end() ) - throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + throw beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); properties.erase( it1 ); @@ -567,7 +567,7 @@ shell::deassociate( const rtl::OUString& aUnqPath, void SAL_CALL shell::page( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const uno::Reference< io::XOutputStream >& xOutputStream ) throw() { @@ -658,7 +658,7 @@ void SAL_CALL shell::page( sal_Int32 CommandId, uno::Reference< io::XInputStream > SAL_CALL shell::open( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool bLock ) throw() { @@ -695,7 +695,7 @@ shell::open( sal_Int32 CommandId, uno::Reference< io::XStream > SAL_CALL shell::open_rw( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool bLock ) throw() { @@ -730,7 +730,7 @@ shell::open_rw( sal_Int32 CommandId, uno::Reference< XDynamicResultSet > SAL_CALL shell::ls( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const sal_Int32 OpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< NumberedSortingInfo >& seqSort ) @@ -782,7 +782,7 @@ shell::info_c() // Info for the properties uno::Reference< beans::XPropertySetInfo > SAL_CALL -shell::info_p( const rtl::OUString& aUnqPath ) +shell::info_p( const OUString& aUnqPath ) throw() { osl::MutexGuard aGuard( m_aMutex ); @@ -804,7 +804,7 @@ shell::info_p( const rtl::OUString& aUnqPath ) uno::Sequence< uno::Any > SAL_CALL -shell::setv( const rtl::OUString& aUnqPath, +shell::setv( const OUString& aUnqPath, const uno::Sequence< beans::PropertyValue >& values ) throw() { @@ -825,7 +825,7 @@ shell::setv( const rtl::OUString& aUnqPath, it1 = properties.find( toset ); if( it1 == properties.end() ) { - ret[i] <<= beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + ret[i] <<= beans::UnknownPropertyException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); continue; } @@ -835,7 +835,7 @@ shell::setv( const rtl::OUString& aUnqPath, if( it1->getAttributes() & beans::PropertyAttribute::READONLY ) { - ret[i] <<= lang::IllegalAccessException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + ret[i] <<= lang::IllegalAccessException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); continue; } @@ -893,12 +893,12 @@ shell::setv( const rtl::OUString& aUnqPath, --propChanged; // unsuccessful setting uno::Sequence< uno::Any > names( 1 ); ret[0] <<= beans::PropertyValue( - rtl::OUString("Uri"), -1, + OUString("Uri"), -1, uno::makeAny(aUnqPath), beans::PropertyState_DIRECT_VALUE); IOErrorCode ioError(IOErrorCode_GENERAL); ret[i] <<= InteractiveAugmentedIOException( - rtl::OUString(), + OUString(), 0, task::InteractionClassification_ERROR, ioError, @@ -906,7 +906,7 @@ shell::setv( const rtl::OUString& aUnqPath, } } else - ret[i] <<= beans::IllegalTypeException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + ret[i] <<= beans::IllegalTypeException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } else if(values[i].Name == IsReadOnly || values[i].Name == IsHidden) @@ -957,7 +957,7 @@ shell::setv( const rtl::OUString& aUnqPath, --propChanged; // unsuccessful setting uno::Sequence< uno::Any > names( 1 ); names[0] <<= beans::PropertyValue( - rtl::OUString("Uri"), -1, + OUString("Uri"), -1, uno::makeAny(aUnqPath), beans::PropertyState_DIRECT_VALUE); IOErrorCode ioError; @@ -1006,7 +1006,7 @@ shell::setv( const rtl::OUString& aUnqPath, break; } ret[i] <<= InteractiveAugmentedIOException( - rtl::OUString(), + OUString(), 0, task::InteractionClassification_ERROR, ioError, @@ -1014,7 +1014,7 @@ shell::setv( const rtl::OUString& aUnqPath, } } else - ret[i] <<= beans::IllegalTypeException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); + ret[i] <<= beans::IllegalTypeException( OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() ); } } } // end for @@ -1041,7 +1041,7 @@ shell::setv( const rtl::OUString& aUnqPath, uno::Reference< sdbc::XRow > SAL_CALL shell::getv( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const uno::Sequence< beans::Property >& properties ) throw() { @@ -1108,8 +1108,8 @@ shell::getv( sal_Int32 CommandId, void SAL_CALL shell::move( sal_Int32 CommandId, - const rtl::OUString srcUnqPath, - const rtl::OUString dstUnqPathIn, + const OUString srcUnqPath, + const OUString dstUnqPathIn, const sal_Int32 NameClash ) throw() { @@ -1119,7 +1119,7 @@ shell::move( sal_Int32 CommandId, return; // osl::FileBase::RC nError; - rtl::OUString dstUnqPath( dstUnqPathIn ); + OUString dstUnqPath( dstUnqPathIn ); switch( NameClash ) { @@ -1138,7 +1138,7 @@ shell::move( sal_Int32 CommandId, case NameClash::OVERWRITE: { // stat to determine whether we have a symlink - rtl::OUString targetPath(dstUnqPath); + OUString targetPath(dstUnqPath); osl::FileStatus aStatus(osl_FileStatus_Mask_Type|osl_FileStatus_Mask_LinkTargetURL); osl::DirectoryItem aItem; @@ -1165,7 +1165,7 @@ shell::move( sal_Int32 CommandId, } case NameClash::RENAME: { - rtl::OUString newDstUnqPath; + OUString newDstUnqPath; nError = osl_File_move( srcUnqPath,dstUnqPath,true ); if( nError == osl::FileBase::E_EXIST ) { @@ -1186,8 +1186,8 @@ shell::move( sal_Int32 CommandId, { newDstUnqPath = dstUnqPath; - rtl::OUString aPostFix( "_" ); - aPostFix += rtl::OUString::valueOf( ++nTry ); + OUString aPostFix( "_" ); + aPostFix += OUString::valueOf( ++nTry ); newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix ); @@ -1271,8 +1271,8 @@ shell::move( sal_Int32 CommandId, copyPersistentSet( srcUnqPath,dstUnqPath,!isDocument ); - rtl::OUString aDstParent = getParentName( dstUnqPath ); - rtl::OUString aSrcParent = getParentName( srcUnqPath ); + OUString aDstParent = getParentName( dstUnqPath ); + OUString aSrcParent = getParentName( srcUnqPath ); notifyInsert( getContentEventListeners( aDstParent ),dstUnqPath ); if( aDstParent != aSrcParent ) @@ -1296,7 +1296,7 @@ shell::move( sal_Int32 CommandId, namespace { bool getType( - TaskManager & task, sal_Int32 id, rtl::OUString const & fileUrl, + TaskManager & task, sal_Int32 id, OUString const & fileUrl, osl::DirectoryItem * item, osl::FileStatus::Type * type) { OSL_ASSERT(item != 0 && type != 0); @@ -1320,13 +1320,13 @@ bool getType( void SAL_CALL shell::copy( sal_Int32 CommandId, - const rtl::OUString srcUnqPath, - const rtl::OUString dstUnqPathIn, + const OUString srcUnqPath, + const OUString dstUnqPathIn, sal_Int32 NameClash ) throw() { osl::FileBase::RC nError; - rtl::OUString dstUnqPath( dstUnqPathIn ); + OUString dstUnqPath( dstUnqPathIn ); // Resolve symbolic links within the source path. If srcUnqPath denotes a // symbolic link (targeting either a file or a folder), the contents of the @@ -1338,7 +1338,7 @@ shell::copy( if (!getType(*this, CommandId, srcUnqPath, &item, &type)) { return; } - rtl::OUString rslvdSrcUnqPath; + OUString rslvdSrcUnqPath; if (type == osl::FileStatus::Link) { osl::FileStatus stat(osl_FileStatus_Mask_LinkTargetURL); nError = item.getFileStatus(stat); @@ -1391,7 +1391,7 @@ shell::copy( } case NameClash::RENAME: { - rtl::OUString newDstUnqPath; + OUString newDstUnqPath; nError = copy_recursive( rslvdSrcUnqPath,dstUnqPath,IsWhat,true ); if( nError == osl::FileBase::E_EXIST ) @@ -1413,8 +1413,8 @@ shell::copy( { newDstUnqPath = dstUnqPath; - rtl::OUString aPostFix( "_" ); - aPostFix += rtl::OUString::valueOf( ++nTry ); + OUString aPostFix( "_" ); + aPostFix += OUString::valueOf( ++nTry ); newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix ); @@ -1495,7 +1495,7 @@ shell::copy( sal_Bool SAL_CALL shell::remove( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Int32 IsWhat, sal_Bool MustExist ) throw() @@ -1575,7 +1575,7 @@ shell::remove( sal_Int32 CommandId, sal_Bool whileSuccess = sal_True; sal_Int32 recurse = 0; - rtl::OUString name; + OUString name; nError = aDirectory.getNextItem( aItem ); while( nError == osl::FileBase::E_None ) @@ -1659,11 +1659,11 @@ shell::remove( sal_Int32 CommandId, sal_Bool SAL_CALL shell::mkdir( sal_Int32 CommandId, - const rtl::OUString& rUnqPath, + const OUString& rUnqPath, sal_Bool OverWrite ) throw() { - rtl::OUString aUnqPath; + OUString aUnqPath; // remove trailing slash if ( rUnqPath[ rUnqPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -1694,7 +1694,7 @@ shell::mkdir( sal_Int32 CommandId, } case osl::FileBase::E_None: { - rtl::OUString aPrtPath = getParentName( aUnqPath ); + OUString aPrtPath = getParentName( aUnqPath ); notifyInsert( getContentEventListeners( aPrtPath ),aUnqPath ); return sal_True; } @@ -1720,7 +1720,7 @@ shell::mkdir( sal_Int32 CommandId, sal_Bool SAL_CALL shell::mkfil( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool Overwrite, const uno::Reference< io::XInputStream >& aInputStream ) throw() @@ -1732,7 +1732,7 @@ shell::mkfil( sal_Int32 CommandId, aInputStream ); if ( bSuccess ) { - rtl::OUString aPrtPath = getParentName( aUnqPath ); + OUString aPrtPath = getParentName( aUnqPath ); notifyInsert( getContentEventListeners( aPrtPath ),aUnqPath ); } return bSuccess; @@ -1752,7 +1752,7 @@ shell::mkfil( sal_Int32 CommandId, sal_Bool SAL_CALL shell::write( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool OverWrite, const uno::Reference< io::XInputStream >& aInputStream ) throw() @@ -1912,7 +1912,7 @@ shell::write( sal_Int32 CommandId, /*********************************************************************************/ -void SAL_CALL shell::insertDefaultProperties( const rtl::OUString& aUnqPath ) +void SAL_CALL shell::insertDefaultProperties( const OUString& aUnqPath ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1950,11 +1950,11 @@ void SAL_CALL shell::insertDefaultProperties( const rtl::OUString& aUnqPath ) /******************************************************************************/ -sal_Bool SAL_CALL shell::getUnqFromUrl( const rtl::OUString& Url,rtl::OUString& Unq ) +sal_Bool SAL_CALL shell::getUnqFromUrl( const OUString& Url,OUString& Unq ) { if ( Url == "file:///" || Url == "file://localhost/" || Url == "file://127.0.0.1/" ) { - Unq = rtl::OUString("file:///"); + Unq = OUString("file:///"); return false; } @@ -1972,7 +1972,7 @@ sal_Bool SAL_CALL shell::getUnqFromUrl( const rtl::OUString& Url,rtl::OUString& -sal_Bool SAL_CALL shell::getUrlFromUnq( const rtl::OUString& Unq,rtl::OUString& Url ) +sal_Bool SAL_CALL shell::getUrlFromUnq( const OUString& Unq,OUString& Url ) { sal_Bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Unq,Url ); @@ -1986,8 +1986,8 @@ sal_Bool SAL_CALL shell::getUrlFromUnq( const rtl::OUString& Unq,rtl::OUString& // Helper function for public copy osl::FileBase::RC SAL_CALL -shell::copy_recursive( const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath, +shell::copy_recursive( const OUString& srcUnqPath, + const OUString& dstUnqPath, sal_Int32 TypeToCopy, sal_Bool testExistBeforeCopy ) throw() @@ -2022,12 +2022,12 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, // Getting the information for the next recursive copy sal_Int32 newTypeToCopy = IsDoc ? -1 : +1; - rtl::OUString newSrcUnqPath; + OUString newSrcUnqPath; if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) ) newSrcUnqPath = aFileStatus.getFileURL(); - rtl::OUString newDstUnqPath = dstUnqPath; - rtl::OUString tit; + OUString newDstUnqPath = dstUnqPath; + OUString tit; if( aFileStatus.isValid( osl_FileStatus_Mask_FileName ) ) tit = rtl::Uri::encode( aFileStatus.getFileName(), rtl_UriCharClassPchar, @@ -2035,7 +2035,7 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, RTL_TEXTENCODING_UTF8 ); if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 ) - newDstUnqPath += rtl::OUString("/"); + newDstUnqPath += OUString("/"); newDstUnqPath += tit; @@ -2060,11 +2060,11 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, sal_Bool SAL_CALL shell::ensuredir( sal_Int32 CommandId, - const rtl::OUString& rUnqPath, + const OUString& rUnqPath, sal_Int32 errorCode ) throw() { - rtl::OUString aPath; + OUString aPath; if ( rUnqPath.isEmpty() ) return sal_False; @@ -2093,7 +2093,7 @@ sal_Bool SAL_CALL shell::ensuredir( sal_Int32 CommandId, if( ! bSuccess ) { - rtl::OUString aParentDir = getParentName( aPath ); + OUString aParentDir = getParentName( aPath ); if ( aParentDir != aPath ) { // Create first the parent directory @@ -2247,7 +2247,7 @@ shell::commit( const shell::ContentMap::iterator& it, if( it->second.properties == 0 ) { - rtl::OUString aPath = it->first; + OUString aPath = it->first; insertDefaultProperties( aPath ); } @@ -2460,7 +2460,7 @@ shell::getv( Notifier* pNotifier, const uno::Sequence< beans::Property >& properties, osl::DirectoryItem& aDirItem, - rtl::OUString& aUnqPath, + OUString& aUnqPath, sal_Bool& aIsRegular ) { uno::Sequence< uno::Any > seq( properties.getLength() ); @@ -2537,7 +2537,7 @@ shell::getv( std::list< ContentEventNotifier* >* SAL_CALL -shell::getContentEventListeners( const rtl::OUString& aName ) +shell::getContentEventListeners( const OUString& aName ) { std::list< ContentEventNotifier* >* p = new std::list< ContentEventNotifier* >; std::list< ContentEventNotifier* >& listeners = *p; @@ -2564,7 +2564,7 @@ shell::getContentEventListeners( const rtl::OUString& aName ) std::list< ContentEventNotifier* >* SAL_CALL -shell::getContentDeletedEventListeners( const rtl::OUString& aName ) +shell::getContentDeletedEventListeners( const OUString& aName ) { std::list< ContentEventNotifier* >* p = new std::list< ContentEventNotifier* >; std::list< ContentEventNotifier* >& listeners = *p; @@ -2590,7 +2590,7 @@ shell::getContentDeletedEventListeners( const rtl::OUString& aName ) void SAL_CALL -shell::notifyInsert( std::list< ContentEventNotifier* >* listeners,const rtl::OUString& aChildName ) +shell::notifyInsert( std::list< ContentEventNotifier* >* listeners,const OUString& aChildName ) { std::list< ContentEventNotifier* >::iterator it = listeners->begin(); while( it != listeners->end() ) @@ -2619,7 +2619,7 @@ shell::notifyContentDeleted( std::list< ContentEventNotifier* >* listeners ) void SAL_CALL shell::notifyContentRemoved( std::list< ContentEventNotifier* >* listeners, - const rtl::OUString& aChildName ) + const OUString& aChildName ) { std::list< ContentEventNotifier* >::iterator it = listeners->begin(); while( it != listeners->end() ) @@ -2635,7 +2635,7 @@ shell::notifyContentRemoved( std::list< ContentEventNotifier* >* listeners, std::list< PropertySetInfoChangeNotifier* >* SAL_CALL -shell::getPropertySetListeners( const rtl::OUString& aName ) +shell::getPropertySetListeners( const OUString& aName ) { std::list< PropertySetInfoChangeNotifier* >* p = new std::list< PropertySetInfoChangeNotifier* >; std::list< PropertySetInfoChangeNotifier* >& listeners = *p; @@ -2662,7 +2662,7 @@ shell::getPropertySetListeners( const rtl::OUString& aName ) void SAL_CALL shell::notifyPropertyAdded( std::list< PropertySetInfoChangeNotifier* >* listeners, - const rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) { std::list< PropertySetInfoChangeNotifier* >::iterator it = listeners->begin(); while( it != listeners->end() ) @@ -2677,7 +2677,7 @@ shell::notifyPropertyAdded( std::list< PropertySetInfoChangeNotifier* >* listene void SAL_CALL shell::notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* listeners, - const rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) { std::list< PropertySetInfoChangeNotifier* >::iterator it = listeners->begin(); while( it != listeners->end() ) @@ -2692,8 +2692,8 @@ shell::notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* liste std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL -shell::getContentExchangedEventListeners( const rtl::OUString aOldPrefix, - const rtl::OUString aNewPrefix, +shell::getContentExchangedEventListeners( const OUString aOldPrefix, + const OUString aNewPrefix, sal_Bool withChildren ) { @@ -2702,9 +2702,9 @@ shell::getContentExchangedEventListeners( const rtl::OUString aOldPrefix, std::vector< std::list< ContentEventNotifier* >* >& aVector = *aVectorOnHeap; sal_Int32 count; - rtl::OUString aOldName; - rtl::OUString aNewName; - std::vector< rtl::OUString > oldChildList; + OUString aOldName; + OUString aNewName; + std::vector< OUString > oldChildList; { osl::MutexGuard aGuard( m_aMutex ); @@ -2817,7 +2817,7 @@ shell::notifyContentExchanged( std::vector< std::list< ContentEventNotifier* >* std::list< PropertyChangeNotifier* >* SAL_CALL -shell::getPropertyChangeNotifier( const rtl::OUString& aName ) +shell::getPropertyChangeNotifier( const OUString& aName ) { std::list< PropertyChangeNotifier* >* p = new std::list< PropertyChangeNotifier* >; std::list< PropertyChangeNotifier* >& listeners = *p; @@ -2863,7 +2863,7 @@ void SAL_CALL shell::notifyPropertyChanges( std::list< PropertyChangeNotifier* > /********************************************************************************/ void SAL_CALL -shell::erasePersistentSet( const rtl::OUString& aUnqPath, +shell::erasePersistentSet( const OUString& aUnqPath, sal_Bool withChildren ) { if( ! m_xFileRegistry.is() ) @@ -2872,7 +2872,7 @@ shell::erasePersistentSet( const rtl::OUString& aUnqPath, return; } - uno::Sequence< rtl::OUString > seqNames; + uno::Sequence< OUString > seqNames; if( withChildren ) { @@ -2882,7 +2882,7 @@ shell::erasePersistentSet( const rtl::OUString& aUnqPath, sal_Int32 count = withChildren ? seqNames.getLength() : 1; - rtl::OUString + OUString old_Name = aUnqPath; for( sal_Int32 j = 0; j < count; ++j ) @@ -2925,8 +2925,8 @@ shell::erasePersistentSet( const rtl::OUString& aUnqPath, void SAL_CALL -shell::copyPersistentSet( const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath, +shell::copyPersistentSet( const OUString& srcUnqPath, + const OUString& dstUnqPath, sal_Bool withChildren ) { if( ! m_xFileRegistry.is() ) @@ -2935,7 +2935,7 @@ shell::copyPersistentSet( const rtl::OUString& srcUnqPath, return; } - uno::Sequence< rtl::OUString > seqNames; + uno::Sequence< OUString > seqNames; if( withChildren ) { @@ -2945,7 +2945,7 @@ shell::copyPersistentSet( const rtl::OUString& srcUnqPath, sal_Int32 count = withChildren ? seqNames.getLength() : 1; - rtl::OUString + OUString old_Name = srcUnqPath, new_Name = dstUnqPath; @@ -3002,9 +3002,9 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo() uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND ); seq[0].Properties = props; @@ -3023,23 +3023,23 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo() /*******************************************************************************/ void SAL_CALL -shell::getScheme( rtl::OUString& Scheme ) +shell::getScheme( OUString& Scheme ) { - Scheme = rtl::OUString("file"); + Scheme = OUString("file"); } -rtl::OUString SAL_CALL +OUString SAL_CALL shell::getImplementationName_static( void ) { - return rtl::OUString("com.sun.star.comp.ucb.FileProvider"); + return OUString("com.sun.star.comp.ucb.FileProvider"); } -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL shell::getSupportedServiceNames_static( void ) { - rtl::OUString Supported("com.sun.star.ucb.FileContentProvider"); - com::sun::star::uno::Sequence< rtl::OUString > Seq( &Supported,1 ); + OUString Supported("com.sun.star.ucb.FileContentProvider"); + com::sun::star::uno::Sequence< OUString > Seq( &Supported,1 ); return Seq; } diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 6301b57ce9b4..12a7b7edd773 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -76,14 +76,14 @@ namespace fileaccess { public: // Type definitions - typedef rtl::OUString UniquePath; + typedef OUString UniquePath; typedef equalOUString eUniquePath; typedef hashOUString hUniquePath; class MyProperty { private: - rtl::OUString PropertyName; + OUString PropertyName; sal_Int32 Handle; sal_Bool isNative; com::sun::star::uno::Type Typ; // Duplicates information in Value @@ -92,9 +92,9 @@ namespace fileaccess { sal_Int16 Attributes; public: MyProperty(); - MyProperty( const rtl::OUString& __PropertyName ); + MyProperty( const OUString& __PropertyName ); MyProperty( const sal_Bool& __isNative, - const rtl::OUString& __PropertyName, + const OUString& __PropertyName, const sal_Int32& __Handle, const com::sun::star::uno::Type& __Typ, const com::sun::star::uno::Any& __Value, @@ -103,7 +103,7 @@ namespace fileaccess { ~MyProperty(); inline const sal_Bool& SAL_CALL IsNative() const; - inline const rtl::OUString& SAL_CALL getPropertyName() const { return PropertyName; } + inline const OUString& SAL_CALL getPropertyName() const { return PropertyName; } inline const sal_Int32& SAL_CALL getHandle() const; inline const com::sun::star::uno::Type& SAL_CALL getType() const; inline const com::sun::star::uno::Any& SAL_CALL getValue() const; @@ -172,9 +172,9 @@ namespace fileaccess { * to URL aUnqPath */ - void SAL_CALL registerNotifier( const rtl::OUString& aUnqPath,Notifier* pNotifier ); + void SAL_CALL registerNotifier( const OUString& aUnqPath,Notifier* pNotifier ); - void SAL_CALL deregisterNotifier( const rtl::OUString& aUnqPath,Notifier* pNotifier ); + void SAL_CALL deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ); @@ -184,8 +184,8 @@ namespace fileaccess { * The default value and the attributes are input */ - void SAL_CALL associate( const rtl::OUString& UnqPath, - const rtl::OUString& PropertyName, + void SAL_CALL associate( const OUString& UnqPath, + const OUString& PropertyName, const com::sun::star::uno::Any& DefaultValue, const sal_Int16 Attributes ) throw( com::sun::star::beans::PropertyExistException, @@ -193,8 +193,8 @@ namespace fileaccess { com::sun::star::uno::RuntimeException); - void SAL_CALL deassociate( const rtl::OUString& UnqPath, - const rtl::OUString& PropertyName ) + void SAL_CALL deassociate( const OUString& UnqPath, + const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException); @@ -213,7 +213,7 @@ namespace fileaccess { */ void SAL_CALL page( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream ) throw(); @@ -224,7 +224,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL open( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool bLock ) throw(); @@ -236,7 +236,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL open_rw( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool bLock ) throw(); @@ -248,7 +248,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > SAL_CALL ls( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const sal_Int32 OpenMode, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& sProperty, const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo > & sSortingInfo ) @@ -266,7 +266,7 @@ namespace fileaccess { // Info for the properties com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL - info_p( const rtl::OUString& aUnqPath ) + info_p( const OUString& aUnqPath ) throw(); @@ -275,7 +275,7 @@ namespace fileaccess { */ com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL - setv( const rtl::OUString& aUnqPath, + setv( const OUString& aUnqPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& values ) throw(); @@ -287,7 +287,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > SAL_CALL getv( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& properties ) throw(); @@ -302,8 +302,8 @@ namespace fileaccess { void SAL_CALL move( sal_Int32 CommandId, - const rtl::OUString srcUnqPath, // Full file(folder)-path - const rtl::OUString dstUnqPath, // Path to the destination-directory + const OUString srcUnqPath, // Full file(folder)-path + const OUString dstUnqPath, // Path to the destination-directory const sal_Int32 NameClash ) throw(); @@ -313,8 +313,8 @@ namespace fileaccess { void SAL_CALL copy( sal_Int32 CommandId, // See "move" - const rtl::OUString srcUnqPath, - const rtl::OUString dstUnqPath, + const OUString srcUnqPath, + const OUString dstUnqPath, sal_Int32 NameClash ) throw(); @@ -328,7 +328,7 @@ namespace fileaccess { sal_Bool SAL_CALL remove( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Int32 TypeToMove = RemoveUnknown, sal_Bool MustExist = sal_True ) throw(); @@ -349,7 +349,7 @@ namespace fileaccess { sal_Bool SAL_CALL mkdir( sal_Int32 CommandId, - const rtl::OUString& aDirectoryName, + const OUString& aDirectoryName, sal_Bool OverWrite ) throw(); @@ -362,7 +362,7 @@ namespace fileaccess { sal_Bool SAL_CALL mkfil( sal_Int32 CommandId, - const rtl::OUString& aFileName, + const OUString& aFileName, sal_Bool OverWrite, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) throw(); @@ -375,14 +375,14 @@ namespace fileaccess { */ sal_Bool SAL_CALL write( sal_Int32 CommandId, - const rtl::OUString& aUnqPath, + const OUString& aUnqPath, sal_Bool OverWrite, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) throw(); - void SAL_CALL insertDefaultProperties( const rtl::OUString& aUnqPath ); + void SAL_CALL insertDefaultProperties( const OUString& aUnqPath ); com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > queryCreatableContentsInfo(); @@ -395,9 +395,9 @@ namespace fileaccess { /* */ /******************************************************************************/ - sal_Bool SAL_CALL getUnqFromUrl( const rtl::OUString& Url, rtl::OUString& Unq ); + sal_Bool SAL_CALL getUnqFromUrl( const OUString& Url, OUString& Unq ); - sal_Bool SAL_CALL getUrlFromUnq( const rtl::OUString& Unq, rtl::OUString& Url ); + sal_Bool SAL_CALL getUrlFromUnq( const OUString& Unq, OUString& Url ); sal_Bool m_bWithConfig; @@ -412,21 +412,21 @@ namespace fileaccess { /********************************************************************************/ std::list< ContentEventNotifier* >* SAL_CALL - getContentEventListeners( const rtl::OUString& aName ); + getContentEventListeners( const OUString& aName ); std::list< ContentEventNotifier* >* SAL_CALL - getContentDeletedEventListeners( const rtl::OUString& aName ); + getContentDeletedEventListeners( const OUString& aName ); std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL - getContentExchangedEventListeners( const rtl::OUString aOldPrefix, - const rtl::OUString aNewPrefix, + getContentExchangedEventListeners( const OUString aOldPrefix, + const OUString aNewPrefix, sal_Bool withChildren ); std::list< PropertyChangeNotifier* >* SAL_CALL - getPropertyChangeNotifier( const rtl::OUString& aName ); + getPropertyChangeNotifier( const OUString& aName ); std::list< PropertySetInfoChangeNotifier* >* SAL_CALL - getPropertySetListeners( const rtl::OUString& aName ); + getPropertySetListeners( const OUString& aName ); /********************************************************************************/ @@ -441,29 +441,29 @@ namespace fileaccess { std::vector< std::list< ContentEventNotifier* >* >* listeners_vec ); void SAL_CALL notifyInsert( - std::list< ContentEventNotifier* >* listeners,const rtl::OUString& aChildName ); + std::list< ContentEventNotifier* >* listeners,const OUString& aChildName ); void SAL_CALL notifyContentDeleted( std::list< ContentEventNotifier* >* listeners ); void SAL_CALL notifyContentRemoved( std::list< ContentEventNotifier* >* listeners, - const rtl::OUString& aChildName ); + const OUString& aChildName ); void SAL_CALL notifyPropertyAdded( std::list< PropertySetInfoChangeNotifier* >* listeners, - const rtl::OUString& aPropertyName ); + const OUString& aPropertyName ); void SAL_CALL notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* listeners, - const rtl::OUString& aPropertyName ); + const OUString& aPropertyName ); /********************************************************************************/ /* remove persistent propertyset */ /********************************************************************************/ - void SAL_CALL erasePersistentSet( const rtl::OUString& aUnqPath, + void SAL_CALL erasePersistentSet( const OUString& aUnqPath, sal_Bool withChildren = false ); /********************************************************************************/ @@ -471,8 +471,8 @@ namespace fileaccess { /* from srcUnqPath to dstUnqPath */ /********************************************************************************/ - void SAL_CALL copyPersistentSet( const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath, + void SAL_CALL copyPersistentSet( const OUString& srcUnqPath, + const OUString& dstUnqPath, sal_Bool withChildren = false ); @@ -483,7 +483,7 @@ namespace fileaccess { getv( Notifier* pNotifier, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& properties, osl::DirectoryItem& DirItem, - rtl::OUString& aUnqPath, + OUString& aUnqPath, sal_Bool& bIsRegular ); @@ -529,8 +529,8 @@ namespace fileaccess { osl::FileBase::RC SAL_CALL copy_recursive( - const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath, + const OUString& srcUnqPath, + const OUString& dstUnqPath, sal_Int32 TypeToCopy, sal_Bool testExistence ) throw(); @@ -544,7 +544,7 @@ namespace fileaccess { sal_Bool SAL_CALL ensuredir( sal_Int32 CommandId, - const rtl::OUString& aDirectoryName, + const OUString& aDirectoryName, sal_Int32 errorCode ) throw(); @@ -554,26 +554,26 @@ namespace fileaccess { // Default properties - const rtl::OUString Title; - const rtl::OUString CasePreservingURL; - const rtl::OUString IsDocument; - const rtl::OUString IsFolder; - const rtl::OUString DateModified; - const rtl::OUString Size; - const rtl::OUString IsVolume; - const rtl::OUString IsRemoveable; - const rtl::OUString IsRemote; - const rtl::OUString IsCompactDisc; - const rtl::OUString IsFloppy; - const rtl::OUString IsHidden; - const rtl::OUString ContentType; - const rtl::OUString IsReadOnly; - const rtl::OUString CreatableContentsInfo; + const OUString Title; + const OUString CasePreservingURL; + const OUString IsDocument; + const OUString IsFolder; + const OUString DateModified; + const OUString Size; + const OUString IsVolume; + const OUString IsRemoveable; + const OUString IsRemote; + const OUString IsCompactDisc; + const OUString IsFloppy; + const OUString IsHidden; + const OUString ContentType; + const OUString IsReadOnly; + const OUString CreatableContentsInfo; public: - const rtl::OUString FolderContentType; - const rtl::OUString FileContentType; + const OUString FolderContentType; + const OUString FileContentType; private: @@ -585,11 +585,11 @@ namespace fileaccess { // Misceancellous: // Methods for "writeComponentInfo" and "createComponentFactory" - static void SAL_CALL getScheme( rtl::OUString& Scheme ); + static void SAL_CALL getScheme( OUString& Scheme ); - static rtl::OUString SAL_CALL getImplementationName_static( void ); + static OUString SAL_CALL getImplementationName_static( void ); - static com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames_static( void ); + static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( void ); }; // end class shell diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index f93626e35f11..3e145ad18766 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -165,8 +165,8 @@ XTYPEPROVIDER_IMPL_6( FTPContent, #define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) XSERVICEINFO_IMPL_1( FTPContent, - rtl::OUString( "com.sun.star.comp.FTPContent"), - rtl::OUString( "com.sun.star.ucb.FTPContent")); + OUString( "com.sun.star.comp.FTPContent"), + OUString( "com.sun.star.ucb.FTPContent")); @@ -177,10 +177,10 @@ XSERVICEINFO_IMPL_1( FTPContent, //========================================================================= // virtual -rtl::OUString SAL_CALL FTPContent::getContentType() +OUString SAL_CALL FTPContent::getContentType() throw( RuntimeException ) { - return rtl::OUString(FTP_CONTENT_TYPE); + return OUString(FTP_CONTENT_TYPE); } @@ -284,7 +284,7 @@ Any SAL_CALL FTPContent::execute( try { if(action == THROWAUTHENTICATIONREQUEST) { // try to get a continuation first - rtl::OUString aRealm,aPassword,aAccount; + OUString aRealm,aPassword,aAccount; m_pFCP->forHost(m_aFTPURL.host(), m_aFTPURL.port(), m_aFTPURL.username(), @@ -361,7 +361,7 @@ Any SAL_CALL FTPContent::execute( { Sequence seq(1); PropertyValue value; - value.Name = rtl::OUString("Uri"); + value.Name = OUString("Uri"); value.Handle = -1; value.Value <<= m_aFTPURL.ident(false,false); value.State = PropertyState_DIRECT_VALUE; @@ -396,7 +396,7 @@ Any SAL_CALL FTPContent::execute( { Sequence seq(1); PropertyValue value; - value.Name = rtl::OUString("Uri"); + value.Name = OUString("Uri"); value.Handle = -1; value.Value <<= m_aFTPURL.ident(false,false); value.State = PropertyState_DIRECT_VALUE; @@ -421,7 +421,7 @@ Any SAL_CALL FTPContent::execute( if(!(aCommand.Argument >>= Properties)) { aRet <<= IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >(this), -1); ucbhelper::cancelCommandExecution(aRet,Environment); @@ -435,7 +435,7 @@ Any SAL_CALL FTPContent::execute( if( ! ( aCommand.Argument >>= propertyValues ) ) { aRet <<= IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >(this), -1); ucbhelper::cancelCommandExecution(aRet,Environment); @@ -456,7 +456,7 @@ Any SAL_CALL FTPContent::execute( InsertCommandArgument aInsertArgument; if ( ! ( aCommand.Argument >>= aInsertArgument ) ) { aRet <<= IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >(this), -1); ucbhelper::cancelCommandExecution(aRet,Environment); @@ -471,7 +471,7 @@ Any SAL_CALL FTPContent::execute( OpenCommandArgument2 aOpenCommand; if ( !( aCommand.Argument >>= aOpenCommand ) ) { aRet <<= IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >(this), -1); @@ -514,7 +514,7 @@ Any SAL_CALL FTPContent::execute( if(n) { Sequence seq(1); PropertyValue value; - value.Name = rtl::OUString("Uri"); + value.Name = OUString("Uri"); value.Handle = -1; value.Value <<= m_aFTPURL.ident(false,false); value.State = PropertyState_DIRECT_VALUE; @@ -527,7 +527,7 @@ Any SAL_CALL FTPContent::execute( } else { aRet <<= UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >(this), aOpenCommand.Sink); ucbhelper::cancelCommandExecution(aRet,Environment); @@ -558,14 +558,14 @@ Any SAL_CALL FTPContent::execute( OpenMode::DOCUMENT_SHARE_DENY_WRITE) { // Unsupported OpenMode aRet <<= UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >(this), static_cast< sal_Int16 >(aOpenCommand.Mode)); ucbhelper::cancelCommandExecution(aRet,Environment); } else { aRet <<= IllegalArgumentException( - rtl::OUString( "Unexpected OpenMode!" ), + OUString( "Unexpected OpenMode!" ), static_cast< cppu::OWeakObject * >(this), -1); @@ -577,7 +577,7 @@ Any SAL_CALL FTPContent::execute( ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >(this), -1)), Environment); @@ -614,9 +614,9 @@ Any SAL_CALL FTPContent::execute( } } -#define FTP_FILE rtl::OUString( "application/vnd.sun.staroffice.ftp-file") +#define FTP_FILE OUString( "application/vnd.sun.staroffice.ftp-file") -#define FTP_FOLDER rtl::OUString( "application/vnd.sun.staroffice.ftp-folder") +#define FTP_FOLDER OUString( "application/vnd.sun.staroffice.ftp-folder") Sequence SAL_CALL FTPContent::queryCreatableContentsInfo( ) @@ -637,9 +637,9 @@ FTPContent::queryCreatableContentsInfo_Static( ) | ContentInfoAttribute::KIND_DOCUMENT; Sequence< Property > props( 1 ); props[0] = Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), PropertyAttribute::MAYBEVOID | PropertyAttribute::BOUND ); seq[0].Properties = props; @@ -688,7 +688,7 @@ FTPContent::setParent(const Reference& /*Parent*/ ) -rtl::OUString FTPContent::getParentURL() +OUString FTPContent::getParentURL() { return m_aFTPURL.parent(); } @@ -734,7 +734,7 @@ void FTPContent::insert(const InsertCommandArgument& aInsertCommand, if(m_bInserted && !m_bTitleSet) { MissingPropertiesException excep; excep.Properties.realloc(1); - excep.Properties[0] = rtl::OUString("Title"); + excep.Properties[0] = OUString("Title"); Any aAny; aAny <<= excep; ucbhelper::cancelCommandExecution(aAny,Env); } @@ -816,7 +816,7 @@ Reference< XRow > FTPContent::getPropertyValues( FTPDirentry aDirEntry = m_aFTPURL.direntry(); for(sal_Int32 i = 0; i < seqProp.getLength(); ++i) { - const rtl::OUString& Name = seqProp[i].Name; + const OUString& Name = seqProp[i].Name; if(Name.compareToAscii("Title") == 0) xRow->appendString(seqProp[i],aDirEntry.m_aName); else if(Name.compareToAscii("CreatableContentsInfo") == 0) @@ -868,7 +868,7 @@ Sequence FTPContent::setPropertyValues( osl::MutexGuard aGuard(m_aMutex); for(sal_Int32 i = 0; i < ret.getLength(); ++i) { if ( seqPropVal[i].Name == "Title" ) { - rtl::OUString Title; + OUString Title; if(!(seqPropVal[i].Value >>= Title)) { ret[i] <<= IllegalTypeException(); continue; @@ -884,10 +884,10 @@ Sequence FTPContent::setPropertyValues( m_bTitleSet = true; } else try { - rtl::OUString OldTitle = m_aFTPURL.ren(Title); + OUString OldTitle = m_aFTPURL.ren(Title); evt.realloc(1); evt[0].PropertyName = - rtl::OUString("Title"); + OUString("Title"); evt[0].Further = false; evt[0].PropertyHandle = -1; evt[0].OldValue <<= OldTitle; @@ -908,7 +908,7 @@ Sequence FTPContent::setPropertyValues( for(sal_Int32 j = 0; j < props.getLength(); ++j) if(props[j].Name == seqPropVal[i].Name) { ret[i] <<= IllegalAccessException( - rtl::OUString( "Property is read-only!"), + OUString( "Property is read-only!"), //props[j].Attributes & PropertyAttribute::READONLY // ? "Property is read-only!" // : "Access denied!"), diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx index c4618ba3af7e..4573c41b5779 100644 --- a/ucb/source/ucp/ftp/ftpcontent.hxx +++ b/ucb/source/ucp/ftp/ftpcontent.hxx @@ -78,7 +78,7 @@ namespace ftp XSERVICEINFO_DECL() // XContent - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); @@ -145,7 +145,7 @@ namespace ftp com::sun::star::ucb::XCommandEnvironment > & xEnv); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); com::sun::star::uno::Reference getPropertyValues( diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx index 9005de240c48..eb33079a6179 100644 --- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx +++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx @@ -41,56 +41,56 @@ uno::Sequence< beans::Property > FTPContent::getProperties( static const beans::Property aPropsInfoTable[] = { beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND // | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Size" ), + OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "DateCreated" ), + OUString( "DateCreated" ), -1, getCppuType( static_cast< util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsReadOnly" ), + OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( @@ -124,46 +124,46 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands( // Required commands /////////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "createNewContent" ), + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 485647775af9..4da4819c3fdc 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star::lang; FTPContentIdentifier::FTPContentIdentifier( - const rtl::OUString& ident + const OUString& ident ) : m_ident(ident) { @@ -112,7 +112,7 @@ FTPContentIdentifier::getTypes( } -rtl::OUString SAL_CALL +OUString SAL_CALL FTPContentIdentifier::getContentIdentifier( ) throw ( @@ -123,14 +123,14 @@ FTPContentIdentifier::getContentIdentifier( } -rtl::OUString SAL_CALL +OUString SAL_CALL FTPContentIdentifier::getContentProviderScheme( ) throw ( com::sun::star::uno::RuntimeException ) { - return rtl::OUString("ftp"); + return OUString("ftp"); } diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx index 7ea7ed5b22bb..f4d1c443b128 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx @@ -46,7 +46,7 @@ namespace ftp { { public: - FTPContentIdentifier(const rtl::OUString& ident); + FTPContentIdentifier(const OUString& ident); ~FTPContentIdentifier(); @@ -80,14 +80,14 @@ namespace ftp { // XContentIdentifier - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentIdentifier( ) throw ( com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentProviderScheme( ) throw ( @@ -97,7 +97,7 @@ namespace ftp { private: - rtl::OUString m_ident; + OUString m_ident; }; } diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index 0f28bcb3bc4e..c31482409edc 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -95,8 +95,8 @@ XTYPEPROVIDER_IMPL_3(FTPContentProvider, XSERVICEINFO_IMPL_1_CTX( FTPContentProvider, - rtl::OUString("com.sun.star.comp.FTPContentProvider"), - rtl::OUString(FTP_CONTENT_PROVIDER_SERVICE_NAME)); + OUString("com.sun.star.comp.FTPContentProvider"), + OUString(FTP_CONTENT_PROVIDER_SERVICE_NAME)); //========================================================================= // @@ -150,7 +150,7 @@ FTPContentProvider::queryContent( this); if(!m_pProxyDecider->shouldUseProxy( - rtl::OUString("ftp"), + OUString("ftp"), aURL.host(), aURL.port().toInt32())) { @@ -190,11 +190,11 @@ CURL* FTPContentProvider::handle() { bool FTPContentProvider::forHost( - const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - rtl::OUString& password, - rtl::OUString& account) + const OUString& host, + const OUString& port, + const OUString& username, + OUString& password, + OUString& account) { osl::MutexGuard aGuard(m_aMutex); for(unsigned int i = 0; i < m_ServerInfo.size(); ++i) @@ -212,11 +212,11 @@ bool FTPContentProvider::forHost( bool FTPContentProvider::setHost( - const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - const rtl::OUString& password, - const rtl::OUString& account) + const OUString& host, + const OUString& port, + const OUString& username, + const OUString& password, + const OUString& account) { ServerInfo inf; inf.host = host; diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx index 5f47640a146b..3ec371cd3998 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx @@ -79,25 +79,25 @@ namespace ftp { virtual CURL* handle(); - virtual bool forHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - rtl::OUString& password, - rtl::OUString& account); + virtual bool forHost(const OUString& host, + const OUString& port, + const OUString& username, + OUString& password, + OUString& account); - virtual bool setHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - const rtl::OUString& password, - const rtl::OUString& account); + virtual bool setHost(const OUString& host, + const OUString& port, + const OUString& username, + const OUString& password, + const OUString& account); struct ServerInfo { - rtl::OUString host; - rtl::OUString port; - rtl::OUString username; - rtl::OUString password; - rtl::OUString account; + OUString host; + OUString port; + OUString username; + OUString password; + OUString account; }; private: diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx index 3f98ca13ef19..2e6bece679a9 100644 --- a/ucb/source/ucp/ftp/ftpdirp.cxx +++ b/ucb/source/ucp/ftp/ftpdirp.cxx @@ -29,7 +29,6 @@ using namespace ftp; -using ::rtl::OUString; typedef sal_uInt32 ULONG; diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx index d371d889b2fe..68dc11879c0b 100644 --- a/ucb/source/ucp/ftp/ftpdirp.hxx +++ b/ucb/source/ucp/ftp/ftpdirp.hxx @@ -85,8 +85,8 @@ namespace ftp { struct FTPDirentry { - rtl::OUString m_aURL; - rtl::OUString m_aName; + OUString m_aURL; + OUString m_aName; DateTime m_aDate; sal_uInt32 m_nMode; sal_uInt32 m_nSize; @@ -97,7 +97,7 @@ namespace ftp { m_nSize((sal_uInt32)(-1)) { } void clear() { - m_aURL = m_aName = rtl::OUString(); + m_aURL = m_aName = OUString(); m_aDate = DateTime(0,0,0,0,0,0,0); m_nMode = INETCOREFTP_FILEMODE_UNKNOWN; m_nSize = sal_uInt32(-1); @@ -169,7 +169,7 @@ namespace ftp { sal_uInt16 nYear); static sal_Bool setPath ( - rtl::OUString& rPath, + OUString& rPath, const sal_Char *value, sal_Int32 length = -1); }; diff --git a/ucb/source/ucp/ftp/ftphandleprovider.hxx b/ucb/source/ucp/ftp/ftphandleprovider.hxx index 5fccaf2198c2..380dc76e38cd 100644 --- a/ucb/source/ucp/ftp/ftphandleprovider.hxx +++ b/ucb/source/ucp/ftp/ftphandleprovider.hxx @@ -31,17 +31,17 @@ namespace ftp { /** host is in the form host:port. */ - virtual bool forHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - rtl::OUString& password, - rtl::OUString& account) = 0; + virtual bool forHost(const OUString& host, + const OUString& port, + const OUString& username, + OUString& password, + OUString& account) = 0; - virtual bool setHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - const rtl::OUString& password, - const rtl::OUString& account) = 0; + virtual bool setHost(const OUString& host, + const OUString& port, + const OUString& username, + const OUString& password, + const OUString& account) = 0; protected: ~FTPHandleProvider() {} diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index 966e332a146a..ec88b897c532 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -144,7 +144,7 @@ void SAL_CALL XInteractionDisapproveImpl::select() // XInteractionRequestImpl -XInteractionRequestImpl::XInteractionRequestImpl(const rtl::OUString& aName) +XInteractionRequestImpl::XInteractionRequestImpl(const OUString& aName) : p1( new XInteractionApproveImpl ), p2( new XInteractionDisapproveImpl ), m_aName(aName), diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index 95704b666a7d..00fbc5d7c9d9 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -121,7 +121,7 @@ namespace ftp { { public: - XInteractionRequestImpl(const rtl::OUString& aName); + XInteractionRequestImpl(const OUString& aName); virtual com::sun::star::uno::Any SAL_CALL queryInterface( @@ -160,7 +160,7 @@ namespace ftp { XInteractionApproveImpl* p1; XInteractionDisapproveImpl* p2; - rtl::OUString m_aName; + OUString m_aName; com::sun::star::uno::Sequence< com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx index e812fc139521..3bac7bb066e4 100644 --- a/ucb/source/ucp/ftp/ftpresultsetI.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx @@ -59,10 +59,10 @@ ResultSetI::ResultSetI(const Reference& rxContext, new ucbhelper::PropertyValueSet(rxContext); for( int i = 0; i < seqProp.getLength(); ++i) { - const rtl::OUString& Name = seqProp[i].Name; + const OUString& Name = seqProp[i].Name; if(Name.compareToAscii("ContentType") == 0 ) xRow->appendString(seqProp[i], - rtl::OUString( "application/ftp" )); + OUString( "application/ftp" )); else if(Name.compareToAscii("Title") == 0) xRow->appendString(seqProp[i],dirvec[n].m_aName); else if(Name.compareToAscii("IsReadOnly") == 0) diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 3323f30f71b2..589f7aabe285 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -382,7 +382,7 @@ ResultSetBase::close( } -rtl::OUString SAL_CALL +OUString SAL_CALL ResultSetBase::queryContentIdentifierString( void ) throw( uno::RuntimeException ) @@ -390,7 +390,7 @@ ResultSetBase::queryContentIdentifierString( if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aPath[m_nRow]; else - return rtl::OUString(); + return OUString(); } @@ -405,7 +405,7 @@ ResultSetBase::queryContentIdentifier( if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) { if(!m_aIdents[m_nRow].is()) { - rtl::OUString url = queryContentIdentifierString(); + OUString url = queryContentIdentifierString(); if(!url.isEmpty() ) m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >( @@ -470,7 +470,7 @@ public: return m_aSeq; } - beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) + beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw( beans::UnknownPropertyException, uno::RuntimeException) { @@ -480,7 +480,7 @@ public: throw beans::UnknownPropertyException(); } - sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) + sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw( uno::RuntimeException ) { for( int i = 0; i < m_aSeq.getLength(); ++i ) @@ -502,12 +502,12 @@ ResultSetBase::getPropertySetInfo() throw( uno::RuntimeException) { uno::Sequence< beans::Property > seq(2); - seq[0].Name = rtl::OUString("RowCount"); + seq[0].Name = OUString("RowCount"); seq[0].Handle = -1; seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) ); seq[0].Attributes = beans::PropertyAttribute::READONLY; - seq[1].Name = rtl::OUString("IsRowCountFinal"); + seq[1].Name = OUString("IsRowCountFinal"); seq[1].Handle = -1; seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) ); seq[1].Attributes = beans::PropertyAttribute::READONLY; @@ -520,15 +520,15 @@ ResultSetBase::getPropertySetInfo() void SAL_CALL ResultSetBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& /*aValue*/ ) + const OUString& aPropertyName, const uno::Any& /*aValue*/ ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") || - aPropertyName == rtl::OUString("RowCount") ) + if( aPropertyName == OUString("IsRowCountFinal") || + aPropertyName == OUString("RowCount") ) return; throw beans::UnknownPropertyException(); @@ -536,18 +536,18 @@ void SAL_CALL ResultSetBase::setPropertyValue( uno::Any SAL_CALL ResultSetBase::getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( PropertyName == rtl::OUString("IsRowCountFinal") ) + if( PropertyName == OUString("IsRowCountFinal") ) { uno::Any aAny; aAny <<= m_bRowCountFinal; return aAny; } - else if ( PropertyName == rtl::OUString("RowCount") ) + else if ( PropertyName == OUString("RowCount") ) { uno::Any aAny; sal_Int32 count = m_aItems.size(); @@ -560,13 +560,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue( void SAL_CALL ResultSetBase::addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") ) + if( aPropertyName == OUString("IsRowCountFinal") ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) @@ -575,7 +575,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( m_pIsFinalListeners->addInterface( xListener ); } - else if ( aPropertyName == rtl::OUString("RowCount") ) + else if ( aPropertyName == OUString("RowCount") ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) @@ -589,19 +589,19 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( void SAL_CALL ResultSetBase::removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString("IsRowCountFinal") && + if( aPropertyName == OUString("IsRowCountFinal") && m_pIsFinalListeners ) { osl::MutexGuard aGuard( m_aMutex ); m_pIsFinalListeners->removeInterface( aListener ); } - else if ( aPropertyName == rtl::OUString("RowCount") && + else if ( aPropertyName == OUString("RowCount") && m_pRowCountListeners ) { osl::MutexGuard aGuard( m_aMutex ); @@ -613,7 +613,7 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener( void SAL_CALL ResultSetBase::addVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -623,7 +623,7 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener( void SAL_CALL ResultSetBase::removeVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, + const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index 805cbf474b53..0c9803148110 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -110,13 +110,13 @@ namespace ftp { return m_nWasNull; } - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException) { - rtl::OUString ret; + OUString ret; if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) ret = m_aItems[m_nRow]->getString( columnIndex ); @@ -476,7 +476,7 @@ namespace ftp { // XContentAccess - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString( void ) throw( com::sun::star::uno::RuntimeException ); @@ -509,7 +509,7 @@ namespace ftp { throw( com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -519,14 +519,14 @@ namespace ftp { virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -535,7 +535,7 @@ namespace ftp { virtual void SAL_CALL removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -544,7 +544,7 @@ namespace ftp { virtual void SAL_CALL addVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -552,7 +552,7 @@ namespace ftp { com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -574,7 +574,7 @@ namespace ftp { com::sun::star::ucb::XContentIdentifier > > IdentSet; typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > > ItemSet; - typedef std::vector< rtl::OUString > + typedef std::vector< OUString > PathSet; IdentSet m_aIdents; diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index b832b69d9f47..ecee9edbcffe 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -42,13 +42,13 @@ using namespace com::sun::star::io; namespace { -rtl::OUString encodePathSegment(rtl::OUString const & decoded) { +OUString encodePathSegment(OUString const & decoded) { return rtl::Uri::encode( decoded, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8); } -rtl::OUString decodePathSegment(rtl::OUString const & encoded) { +OUString decodePathSegment(OUString const & encoded) { return rtl::Uri::decode( encoded, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8); } @@ -121,7 +121,7 @@ FTPURL::FTPURL(const FTPURL& r) } -FTPURL::FTPURL(const rtl::OUString& url, +FTPURL::FTPURL(const OUString& url, FTPHandleProvider* pFCP) throw( malformed_exception @@ -140,17 +140,17 @@ FTPURL::~FTPURL() } -void FTPURL::parse(const rtl::OUString& url) +void FTPURL::parse(const OUString& url) throw( malformed_exception ) { - rtl::OUString aPassword,aAccount; - rtl::OString aIdent(url.getStr(), + OUString aPassword,aAccount; + OString aIdent(url.getStr(), url.getLength(), RTL_TEXTENCODING_UTF8); - rtl::OString lower = aIdent.toAsciiLowerCase(); + OString lower = aIdent.toAsciiLowerCase(); if(lower.getLength() < 6 || strncmp("ftp://",lower.getStr(),6)) throw malformed_exception(); @@ -165,7 +165,7 @@ void FTPURL::parse(const rtl::OUString& url) *p1++ = ch; *p1 = 0; - rtl::OUString aExpr(rtl::OUString(buffer,strlen(buffer), + OUString aExpr(OUString(buffer,strlen(buffer), RTL_TEXTENCODING_UTF8)); sal_Int32 l = aExpr.indexOf(sal_Unicode('@')); @@ -213,7 +213,7 @@ void FTPURL::parse(const rtl::OUString& url) else // This is a legal name. m_aPathSegmentVec.push_back( - rtl::OUString(buffer, + OUString(buffer, strlen(buffer), RTL_TEXTENCODING_UTF8)); } @@ -237,19 +237,19 @@ void FTPURL::parse(const rtl::OUString& url) } -rtl::OUString FTPURL::ident(bool withslash,bool internal) const +OUString FTPURL::ident(bool withslash,bool internal) const { // rebuild the url as one without ellipses, // and more important, as one without username and // password. ( These are set together with the command. ) - rtl::OUStringBuffer bff; + OUStringBuffer bff; bff.appendAscii("ftp://"); if( m_aUsername != "anonymous" ) { bff.append(m_aUsername); - rtl::OUString aPassword,aAccount; + OUString aPassword,aAccount; m_pFCP->forHost(m_aHost, m_aPort, m_aUsername, @@ -286,16 +286,16 @@ rtl::OUString FTPURL::ident(bool withslash,bool internal) const } -rtl::OUString FTPURL::parent(bool internal) const +OUString FTPURL::parent(bool internal) const { - rtl::OUStringBuffer bff; + OUStringBuffer bff; bff.appendAscii("ftp://"); if( m_aUsername != "anonymous" ) { bff.append(m_aUsername); - rtl::OUString aPassword,aAccount; + OUString aPassword,aAccount; m_pFCP->forHost(m_aHost, m_aPort, m_aUsername, @@ -318,7 +318,7 @@ rtl::OUString FTPURL::parent(bool internal) const else bff.append(sal_Unicode('/')); - rtl::OUString last; + OUString last; for(unsigned int i = 0; i < m_aPathSegmentVec.size(); ++i) if(1+i == m_aPathSegmentVec.size()) @@ -338,17 +338,17 @@ rtl::OUString FTPURL::parent(bool internal) const } -void FTPURL::child(const rtl::OUString& title) +void FTPURL::child(const OUString& title) { m_aPathSegmentVec.push_back(encodePathSegment(title)); } -rtl::OUString FTPURL::child() const +OUString FTPURL::child() const { return m_aPathSegmentVec.size() ? - decodePathSegment(m_aPathSegmentVec.back()) : rtl::OUString(); + decodePathSegment(m_aPathSegmentVec.back()) : OUString(); } @@ -382,7 +382,7 @@ namespace ftp { curl_easy_setopt(curl,CURLOPT_WRITEDATA,&data) #define SET_URL(url) \ - rtl::OString urlParAscii(url.getStr(), \ + OString urlParAscii(url.getStr(), \ url.getLength(), \ RTL_TEXTENCODING_UTF8); \ curl_easy_setopt(curl, \ @@ -398,7 +398,7 @@ FILE* FTPURL::open() CURL *curl = m_pFCP->handle(); SET_CONTROL_CONTAINER; - rtl::OUString url(ident(false,true)); + OUString url(ident(false,true)); SET_URL(url); FILE *res = tmpfile(); curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,file_write); @@ -429,7 +429,7 @@ std::vector FTPURL::list( SET_CONTROL_CONTAINER; SET_DATA_CONTAINER; - rtl::OUString url(ident(true,true)); + OUString url(ident(true,true)); SET_URL(url); curl_easy_setopt(curl,CURLOPT_POSTQUOTE,0); @@ -448,7 +448,7 @@ std::vector FTPURL::list( std::vector resvec; FTPDirentry aDirEntry; // ensure slash at the end - rtl::OUString viewurl(ident(true,false)); + OUString viewurl(ident(true,false)); while(true) { while(p2-fwd < int(len) && *p2 != '\n') ++p2; @@ -504,7 +504,7 @@ std::vector FTPURL::list( } -rtl::OUString FTPURL::net_title() const +OUString FTPURL::net_title() const throw(curl_exception) { CURL *curl = m_pFCP->handle(); @@ -518,14 +518,14 @@ rtl::OUString FTPURL::net_title() const bool try_more(true); CURLcode err; - rtl::OUString aNetTitle; + OUString aNetTitle; while(true) { - rtl::OUString url(ident(false,true)); + OUString url(ident(false,true)); if(try_more && 1+url.lastIndexOf(sal_Unicode('/')) != url.getLength()) - url += rtl::OUString("/"); // add end-slash + url += OUString("/"); // add end-slash else if(!try_more && 1+url.lastIndexOf(sal_Unicode('/')) == url.getLength()) url = url.copy(0,url.getLength()-1); // remove end-slash @@ -537,13 +537,13 @@ rtl::OUString FTPURL::net_title() const char* fwd = (char*) control.m_pBuffer; sal_uInt32 len = (sal_uInt32) control.m_nWritePos; - aNetTitle = rtl::OUString(fwd,len,RTL_TEXTENCODING_UTF8); + aNetTitle = OUString(fwd,len,RTL_TEXTENCODING_UTF8); // the buffer now contains the name of the file; // analyze the output: // Format of current working directory: // 257 "/bla/bla" is current directory sal_Int32 index1 = aNetTitle.lastIndexOf( - rtl::OUString("257")); + OUString("257")); index1 = 1+aNetTitle.indexOf(sal_Unicode('"'),index1); sal_Int32 index2 = aNetTitle.indexOf(sal_Unicode('"'),index1); aNetTitle = aNetTitle.copy(index1,index2-index1); @@ -571,7 +571,7 @@ rtl::OUString FTPURL::net_title() const aNetTitle = decodePathSegment(m_aPathSegmentVec.back()); else // must be root - aNetTitle = rtl::OUString("/"); + aNetTitle = OUString("/"); try_more = false; } @@ -589,7 +589,7 @@ rtl::OUString FTPURL::net_title() const FTPDirentry FTPURL::direntry() const throw(curl_exception) { - rtl::OUString nettitle = net_title(); + OUString nettitle = net_title(); FTPDirentry aDirentry; aDirentry.m_aName = nettitle; // init aDirentry @@ -653,7 +653,7 @@ void FTPURL::insert(bool replaceExisting,void* stream) const curl_easy_setopt(curl,CURLOPT_READDATA,stream); curl_easy_setopt(curl, CURLOPT_UPLOAD,1); - rtl::OUString url(ident(false,true)); + OUString url(ident(false,true)); SET_URL(url); CURLcode err = curl_easy_perform(curl); @@ -668,20 +668,20 @@ void FTPURL::insert(bool replaceExisting,void* stream) const void FTPURL::mkdir(bool ReplaceExisting) const throw(curl_exception) { - rtl::OString title; + OString title; if(!m_aPathSegmentVec.empty()) { - rtl::OUString titleOU = m_aPathSegmentVec.back(); + OUString titleOU = m_aPathSegmentVec.back(); titleOU = decodePathSegment(titleOU); - title = rtl::OString(titleOU.getStr(), + title = OString(titleOU.getStr(), titleOU.getLength(), RTL_TEXTENCODING_UTF8); } else // will give an error - title = rtl::OString("/"); + title = OString("/"); - rtl::OString aDel("del "); aDel += title; - rtl::OString mkd("mkd "); mkd += title; + OString aDel("del "); aDel += title; + OString mkd("mkd "); mkd += title; struct curl_slist *slist = 0; @@ -703,9 +703,9 @@ void FTPURL::mkdir(bool ReplaceExisting) const // post request curl_easy_setopt(curl,CURLOPT_POSTQUOTE,slist); - rtl::OUString url(parent(true)); + OUString url(parent(true)); if(1+url.lastIndexOf(sal_Unicode('/')) != url.getLength()) - url += rtl::OUString("/"); + url += OUString("/"); SET_URL(url); CURLcode err = curl_easy_perform(curl); @@ -715,22 +715,22 @@ void FTPURL::mkdir(bool ReplaceExisting) const } -rtl::OUString FTPURL::ren(const rtl::OUString& NewTitle) +OUString FTPURL::ren(const OUString& NewTitle) throw(curl_exception) { CURL *curl = m_pFCP->handle(); // post request - rtl::OString renamefrom("RNFR "); - rtl::OUString OldTitle = net_title(); + OString renamefrom("RNFR "); + OUString OldTitle = net_title(); renamefrom += - rtl::OString(OldTitle.getStr(), + OString(OldTitle.getStr(), OldTitle.getLength(), RTL_TEXTENCODING_UTF8); - rtl::OString renameto("RNTO "); + OString renameto("RNTO "); renameto += - rtl::OString(NewTitle.getStr(), + OString(NewTitle.getStr(), NewTitle.getLength(), RTL_TEXTENCODING_UTF8); @@ -743,9 +743,9 @@ rtl::OUString FTPURL::ren(const rtl::OUString& NewTitle) curl_easy_setopt(curl,CURLOPT_NOBODY,true); // no data => no transfer curl_easy_setopt(curl,CURLOPT_QUOTE,0); - rtl::OUString url(parent(true)); + OUString url(parent(true)); if(1+url.lastIndexOf(sal_Unicode('/')) != url.getLength()) - url += rtl::OUString("/"); + url += OUString("/"); SET_URL(url); CURLcode err = curl_easy_perform(curl); @@ -764,7 +764,7 @@ void FTPURL::del() const { FTPDirentry aDirentry(direntry()); - rtl::OString dele(aDirentry.m_aName.getStr(), + OString dele(aDirentry.m_aName.getStr(), aDirentry.m_aName.getLength(), RTL_TEXTENCODING_UTF8); @@ -776,10 +776,10 @@ void FTPURL::del() const url.del(); } catch(const curl_exception&) { } - dele = rtl::OString("RMD ") + dele; + dele = OString("RMD ") + dele; } else if(aDirentry.m_nMode != INETCOREFTP_FILEMODE_UNKNOWN) - dele = rtl::OString("DELE ") + dele; + dele = OString("DELE ") + dele; else return; @@ -793,9 +793,9 @@ void FTPURL::del() const curl_easy_setopt(curl,CURLOPT_NOBODY,true); // no data => no transfer curl_easy_setopt(curl,CURLOPT_QUOTE,0); - rtl::OUString url(parent(true)); + OUString url(parent(true)); if(1+url.lastIndexOf(sal_Unicode('/')) != url.getLength()) - url += rtl::OUString("/"); + url += OUString("/"); SET_URL(url); CURLcode err = curl_easy_perform(curl); diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx index b1d8b1375934..76603d2d9d82 100644 --- a/ucb/source/ucp/ftp/ftpurl.hxx +++ b/ucb/source/ucp/ftp/ftpurl.hxx @@ -85,7 +85,7 @@ namespace ftp { public: FTPURL( - const rtl::OUString& aIdent, + const OUString& aIdent, FTPHandleProvider* pFCP = 0 ) throw( @@ -96,28 +96,28 @@ namespace ftp { ~FTPURL(); - rtl::OUString host() const { return m_aHost; } + OUString host() const { return m_aHost; } - rtl::OUString port() const { return m_aPort; } + OUString port() const { return m_aPort; } - rtl::OUString username() const { return m_aUsername; } + OUString username() const { return m_aUsername; } /** This returns the URL, but cleaned from * unnessary ellipses. */ - rtl::OUString ident(bool withslash,bool internal) const; + OUString ident(bool withslash,bool internal) const; /** returns the parent url. */ - rtl::OUString parent(bool internal = false) const; + OUString parent(bool internal = false) const; /** sets the unencoded title */ - void child(const rtl::OUString& title); + void child(const OUString& title); /** returns the unencoded title */ - rtl::OUString child(void) const; + OUString child(void) const; std::vector list(sal_Int16 nMode) const throw(curl_exception); @@ -134,7 +134,7 @@ namespace ftp { void mkdir(bool ReplaceExisting) const throw(curl_exception); - rtl::OUString ren(const rtl::OUString& NewTitle) + OUString ren(const OUString& NewTitle) throw(curl_exception); void del() const @@ -147,22 +147,22 @@ namespace ftp { FTPHandleProvider *m_pFCP; - mutable rtl::OUString m_aUsername; + mutable OUString m_aUsername; bool m_bShowPassword; - mutable rtl::OUString m_aHost; - mutable rtl::OUString m_aPort; - mutable rtl::OUString m_aType; + mutable OUString m_aHost; + mutable OUString m_aPort; + mutable OUString m_aType; /** Contains the encoded pathsegments of the url. */ - std::vector m_aPathSegmentVec; + std::vector m_aPathSegmentVec; - void parse(const rtl::OUString& url) + void parse(const OUString& url) throw( malformed_exception ); - rtl::OUString net_title() const throw(curl_exception); + OUString net_title() const throw(curl_exception); }; } diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx index d37ce9069386..bbc99cae9849 100644 --- a/ucb/source/ucp/ftp/test_ftpurl.cxx +++ b/ucb/source/ucp/ftp/test_ftpurl.cxx @@ -26,11 +26,11 @@ #include struct ServerInfo { - rtl::OUString host; - rtl::OUString port; - rtl::OUString username; - rtl::OUString password; - rtl::OUString account; + OUString host; + OUString port; + OUString username; + OUString password; + OUString account; }; @@ -51,11 +51,11 @@ public: return p->handle(); } - bool forHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - rtl::OUString& password, - rtl::OUString& account) + bool forHost(const OUString& host, + const OUString& port, + const OUString& username, + OUString& password, + OUString& account) { for(unsigned int i = 0; i < m_ServerInfo.size(); ++i) if(host == m_ServerInfo[i].host && @@ -69,11 +69,11 @@ public: return false; } - virtual bool setHost(const rtl::OUString& host, - const rtl::OUString& port, - const rtl::OUString& username, - const rtl::OUString& password, - const rtl::OUString& account) + virtual bool setHost(const OUString& host, + const OUString& port, + const OUString& username, + const OUString& password, + const OUString& account) { ServerInfo inf; inf.host = host; @@ -110,7 +110,7 @@ private: #define TESTURL \ { \ -ftp::FTPURL url(rtl::OUString::createFromAscii(ascii),&prov); \ +ftp::FTPURL url(OUString::createFromAscii(ascii),&prov); \ if(!url.username().equalsAscii(n)) {\ ++number_of_errors; \ err_msg("wrong username: ",url.username()); \ @@ -147,7 +147,7 @@ int test_ftplist(void) { FTPHandleProviderI provider; ftp::FTPURL url( - rtl::OUString( "ftp://abi:psswd@abi-1/dir"), + OUString( "ftp://abi:psswd@abi-1/dir"), &provider); std::vector vec = @@ -169,7 +169,7 @@ int test_ftplist(void) { #define TESTPARENT \ { \ - ftp::FTPURL url(rtl::OUString::createFromAscii(ascii),&prov); \ + ftp::FTPURL url(OUString::createFromAscii(ascii),&prov); \ urlStr = url.parent(); \ if(!urlStr.equalsAscii(expect)) \ ++number_of_errors; \ @@ -181,7 +181,7 @@ int test_ftpparent(void) { const char* name = "test_ftpparent"; FTPHandleProviderI prov; - rtl::OUString urlStr; + OUString urlStr; char *ascii,*expect; ascii = "ftp://abi:psswd@abi-1/file"; @@ -217,7 +217,7 @@ int test_ftpproperties(void) { FTPHandleProviderI provider; ftp::FTPURL url( - rtl::OUString( "ftp://abi:psswd@abi-1/file"), + OUString( "ftp://abi:psswd@abi-1/file"), &provider); ftp::FTPDirentry ade(url.direntry()); @@ -240,7 +240,7 @@ int test_ftpopen(void) FTPHandleProviderI provider; ftp::FTPURL url( - rtl::OUString( "ftp://abi:psswd@abi-1/file"), + OUString( "ftp://abi:psswd@abi-1/file"), &provider); FILE* file = url.open(); diff --git a/ucb/source/ucp/ftp/test_multiservicefac.cxx b/ucb/source/ucp/ftp/test_multiservicefac.cxx index 83dc96aefd08..d7b42bd5a8ff 100644 --- a/ucb/source/ucp/ftp/test_multiservicefac.cxx +++ b/ucb/source/ucp/ftp/test_multiservicefac.cxx @@ -62,7 +62,7 @@ void SAL_CALL Test_MultiServiceFactory::release( void ) throw() Reference< XInterface > SAL_CALL Test_MultiServiceFactory::createInstance( - const ::rtl::OUString& aServiceSpecifier + const OUString& aServiceSpecifier ) throw ( Exception, @@ -77,7 +77,7 @@ Test_MultiServiceFactory::createInstance( Reference< XInterface > SAL_CALL Test_MultiServiceFactory::createInstanceWithArguments( - const ::rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const Sequence < Any >& Arguments ) @@ -90,14 +90,14 @@ Test_MultiServiceFactory::createInstanceWithArguments( XInterface >(0); } -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL Test_MultiServiceFactory::getAvailableServiceNames( ) throw ( RuntimeException ) { - return Sequence< ::rtl::OUString >(0); + return Sequence< OUString >(0); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/ftp/test_multiservicefac.hxx b/ucb/source/ucp/ftp/test_multiservicefac.hxx index eb21b626e232..c767ba824a1d 100644 --- a/ucb/source/ucp/ftp/test_multiservicefac.hxx +++ b/ucb/source/ucp/ftp/test_multiservicefac.hxx @@ -54,7 +54,7 @@ namespace test_ftp { virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( - const ::rtl::OUString& aServiceSpecifier + const OUString& aServiceSpecifier ) throw ( ::com::sun::star::uno::Exception, @@ -65,7 +65,7 @@ namespace test_ftp { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( - const ::rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence < ::com::sun::star::uno::Any >& Arguments ) @@ -74,7 +74,7 @@ namespace test_ftp { ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw ( diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 4b7c3042646a..06e3920d10c8 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -88,7 +88,7 @@ Content::Content( m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(false) { #if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "New Content ('%s')\n", rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "New Content ('%s')\n", OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); #endif } @@ -102,7 +102,7 @@ Content::Content( m_pProvider( pProvider ), mpFile (NULL), mpInfo( NULL ), mbTransient(true) { #if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "Create Content ('%s')\n", rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "Create Content ('%s')\n", OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); #endif mpInfo = g_file_info_new(); g_file_info_set_file_type(mpInfo, bIsFolder ? G_FILE_TYPE_DIRECTORY : G_FILE_TYPE_REGULAR); @@ -114,14 +114,14 @@ Content::~Content() if (mpFile) g_object_unref(mpFile); } -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { - rtl::OUString sURL; + OUString sURL; if (GFile* pFile = g_file_get_parent(getGFile())) { char* pPath = g_file_get_uri(pFile); g_object_unref(pFile); - sURL = rtl::OUString::createFromAscii(pPath); + sURL = OUString::createFromAscii(pPath); g_free(pPath); } return sURL; @@ -135,11 +135,11 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) //it throughout the g_file_* calls } -rtl::OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { return isFolder(uno::Reference< ucb::XCommandEnvironment >()) - ? rtl::OUString( GIO_FOLDER_TYPE ) - : rtl::OUString( GIO_FILE_TYPE ); + ? OUString( GIO_FOLDER_TYPE ) + : OUString( GIO_FILE_TYPE ); } #define EXCEPT(aExcept) \ @@ -153,11 +153,11 @@ uno::Any convertToException(GError *pError, const uno::Reference< uno::XInterfac uno::Any aRet; gint eCode = pError->code; - rtl::OUString sMessage(pError->message, strlen(pError->message), RTL_TEXTENCODING_UTF8); + OUString sMessage(pError->message, strlen(pError->message), RTL_TEXTENCODING_UTF8); g_error_free(pError); - rtl::OUString sName; - rtl::OUString sHost; + OUString sName; + OUString sHost; uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= sName; @@ -293,7 +293,7 @@ uno::Any Content::mapGIOError( GError *pError ) uno::Any Content::getBadArgExcept() { return uno::makeAny( lang::IllegalArgumentException( - rtl::OUString("Wrong argument type!"), + OUString("Wrong argument type!"), static_cast< cppu::OWeakObject * >( this ), -1) ); } @@ -362,7 +362,7 @@ GFileInfo* Content::getGFileInfo(const uno::Reference< ucb::XCommandEnvironment GFile* Content::getGFile() { if (!mpFile) - mpFile = g_file_new_for_uri(rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); + mpFile = g_file_new_for_uri(OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); return mpFile; } @@ -423,7 +423,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo * if (pInfo != 0 && g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME)) { const char *pName = g_file_info_get_display_name(pInfo); - xRow->appendString( rProp, rtl::OUString(pName, strlen(pName), RTL_TEXTENCODING_UTF8) ); + xRow->appendString( rProp, OUString(pName, strlen(pName), RTL_TEXTENCODING_UTF8) ); } else xRow->appendVoid(rProp); @@ -512,7 +512,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( static lang::IllegalAccessException getReadOnlyException( const uno::Reference< uno::XInterface >& rContext ) { - return lang::IllegalAccessException ( rtl::OUString("Property is read-only!"), rContext ); + return lang::IllegalAccessException ( OUString("Property is read-only!"), rContext ); } void Content::queryChildren( ContentRefList& rChildren ) @@ -524,11 +524,11 @@ void Content::queryChildren( ContentRefList& rChildren ) ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); sal_Int32 nLen = aURL.getLength(); @@ -538,7 +538,7 @@ void Content::queryChildren( ContentRefList& rChildren ) while ( it != end ) { ucbhelper::ContentImplHelperRef xChild = (*it); - rtl::OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); + OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? if ( ( aChildURL.getLength() > nLen ) && ( aChildURL.compareTo( aURL, nLen ) == 0 ) ) @@ -569,7 +569,7 @@ sal_Bool Content::exchangeIdentity( const uno::Reference< ucb::XContentIdentifie return sal_False; } - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); // Exchange own identitity. if ( exchange( xNewId ) ) @@ -587,8 +587,8 @@ sal_Bool Content::exchangeIdentity( const uno::Reference< ucb::XContentIdentifie // Create new content identifier for the child... uno::Reference< ucb::XContentIdentifier > xOldChildId = xChild->getIdentifier(); - rtl::OUString aOldChildURL = xOldChildId->getContentIdentifier(); - rtl::OUString aNewChildURL = aOldChildURL.replaceAt( + OUString aOldChildURL = xOldChildId->getContentIdentifier(); + OUString aNewChildURL = aOldChildURL.replaceAt( 0, aOldURL.getLength(), xNewId->getContentIdentifier() ); uno::Reference< ucb::XContentIdentifier > xNewChildId @@ -643,7 +643,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { const beans::PropertyValue& rValue = pValues[ n ]; #if OSL_DEBUG_LEVEL > 1 - g_warning("Set prop '%s'", rtl::OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr()); + g_warning("Set prop '%s'", OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr()); #endif if ( rValue.Name == "ContentType" || rValue.Name == "MediaType" || @@ -656,11 +656,11 @@ uno::Sequence< uno::Any > Content::setPropertyValues( } else if ( rValue.Name == "Title" ) { - rtl::OUString aNewTitle; + OUString aNewTitle; if (!( rValue.Value >>= aNewTitle )) { aRet[ n ] <<= beans::IllegalTypeException - ( rtl::OUString("Property value has wrong type!"), + ( OUString("Property value has wrong type!"), static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -668,13 +668,13 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( aNewTitle.getLength() <= 0 ) { aRet[ n ] <<= lang::IllegalArgumentException - ( rtl::OUString("Empty title not allowed!"), + ( OUString("Empty title not allowed!"), static_cast< cppu::OWeakObject * >( this ), -1 ); continue; } - rtl::OString sNewTitle = OUStringToOString(aNewTitle, RTL_TEXTENCODING_UTF8); + OString sNewTitle = OUStringToOString(aNewTitle, RTL_TEXTENCODING_UTF8); newName = sNewTitle.getStr(); const char *oldName = g_file_info_get_name( pInfo); @@ -684,9 +684,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues( g_warning ("Set new name to '%s'", newName); #endif - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); if (oldName) - aEvent.OldValue = uno::makeAny(rtl::OUString(oldName, strlen(oldName), RTL_TEXTENCODING_UTF8)); + aEvent.OldValue = uno::makeAny(OUString(oldName, strlen(oldName), RTL_TEXTENCODING_UTF8)); aEvent.NewValue = uno::makeAny(aNewTitle); aChanges.getArray()[ nChanged ] = aEvent; nTitlePos = nChanged++; @@ -697,7 +697,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { #ifdef DEBUG - fprintf(stderr, "Unknown property %s\n", rtl::OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "Unknown property %s\n", OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr()); #endif aRet[ n ] <<= getReadOnlyException( static_cast< cppu::OWeakObject * >(this) ); //TODO @@ -720,15 +720,15 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { if (nTitlePos > -1) { - rtl::OUString aNewURL = getParentURL(); - aNewURL += rtl::OUString( newName, strlen(newName), RTL_TEXTENCODING_UTF8 ); + OUString aNewURL = getParentURL(); + aNewURL += OUString( newName, strlen(newName), RTL_TEXTENCODING_UTF8 ); uno::Reference< ucb::XContentIdentifier > xNewId = new ::ucbhelper::ContentIdentifier( aNewURL ); if (!exchangeIdentity( xNewId ) ) { aRet[ nTitlePos ] <<= uno::Exception - ( rtl::OUString("Exchange failed!"), + ( OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -828,7 +828,7 @@ uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand, uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= m_xIdentifier->getContentIdentifier(); uno::Any aErr = uno::makeAny( - ucb::InteractiveAugmentedIOException(rtl::OUString(), static_cast< cppu::OWeakObject * >( this ), + ucb::InteractiveAugmentedIOException(OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, bIsFolder ? ucb::IOErrorCode_NOT_EXISTING_PATH : ucb::IOErrorCode_NOT_EXISTING, aArgs) ); @@ -859,7 +859,7 @@ uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand, { ucbhelper::cancelCommandExecution( uno::makeAny ( ucb::UnsupportedOpenModeException - ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rOpenCommand.Mode ) ) ), xEnv ); } @@ -871,12 +871,12 @@ uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand, // sink is optional... #ifdef DEBUG g_warning ("Failed to load data from '%s'", - rtl::OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_xIdentifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); #endif ucbhelper::cancelCommandExecution( uno::makeAny (ucb::UnsupportedDataSinkException - ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), rOpenCommand.Sink ) ), xEnv ); } @@ -895,7 +895,7 @@ uno::Any SAL_CALL Content::execute( uno::RuntimeException ) { #if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, "Content::execute %s\n", rtl::OUStringToOString(aCommand.Name, RTL_TEXTENCODING_UTF8).getStr()); + fprintf(stderr, "Content::execute %s\n", OUStringToOString(aCommand.Name, RTL_TEXTENCODING_UTF8).getStr()); #endif uno::Any aRet; @@ -974,7 +974,7 @@ uno::Any SAL_CALL Content::execute( ucbhelper::cancelCommandExecution ( uno::makeAny( ucb::UnsupportedCommandException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -1025,7 +1025,7 @@ void Content::insert(const uno::Reference< io::XInputStream > &xInputStream, { ucbhelper::cancelCommandExecution( uno::makeAny ( ucb::MissingInputStreamException - ( rtl::OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), + ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -1057,17 +1057,17 @@ const GFileCopyFlags DEFAULT_COPYDATA_FLAGS = void Content::transfer( const ucb::TransferInfo& aTransferInfo, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( uno::Exception ) { - rtl::OUString sDest = m_xIdentifier->getContentIdentifier(); + OUString sDest = m_xIdentifier->getContentIdentifier(); if (!sDest.endsWith("/")) { sDest += "/"; } if (aTransferInfo.NewTitle.getLength()) sDest += aTransferInfo.NewTitle; else - sDest += rtl::OUString::createFromAscii(g_file_get_basename(getGFile())); + sDest += OUString::createFromAscii(g_file_get_basename(getGFile())); - GFile *pDest = g_file_new_for_uri(rtl::OUStringToOString(sDest, RTL_TEXTENCODING_UTF8).getStr()); - GFile *pSource = g_file_new_for_uri(rtl::OUStringToOString(aTransferInfo.SourceURL, RTL_TEXTENCODING_UTF8).getStr()); + GFile *pDest = g_file_new_for_uri(OUStringToOString(sDest, RTL_TEXTENCODING_UTF8).getStr()); + GFile *pSource = g_file_new_for_uri(OUStringToOString(aTransferInfo.SourceURL, RTL_TEXTENCODING_UTF8).getStr()); gboolean bSuccess = false; GError *pError = NULL; @@ -1092,19 +1092,19 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( // Minimum set of props we really need uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND ); // file - seq[0].Type = rtl::OUString( GIO_FILE_TYPE ); + seq[0].Type = OUString( GIO_FILE_TYPE ); seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT ); seq[0].Properties = props; // folder - seq[1].Type = rtl::OUString( GIO_FOLDER_TYPE ); + seq[1].Type = OUString( GIO_FOLDER_TYPE ); seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; seq[1].Properties = props; @@ -1136,7 +1136,7 @@ uno::Reference< ucb::XContent > else { #ifdef DEBUG - g_warning( "Failed to create new content '%s'", rtl::OUStringToOString(Info.Type, + g_warning( "Failed to create new content '%s'", OUStringToOString(Info.Type, RTL_TEXTENCODING_UTF8).getStr() ); #endif return uno::Reference< ucb::XContent >(); @@ -1146,13 +1146,13 @@ uno::Reference< ucb::XContent > g_warning( "createNewContent (%d)", (int) create_document ); #endif - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); name = create_document ? "[New_Content]" : "[New_Collection]"; - aURL += rtl::OUString::createFromAscii( name ); + aURL += OUString::createFromAscii( name ); uno::Reference< ucb::XContentIdentifier > xId(new ::ucbhelper::ContentIdentifier(aURL)); @@ -1207,40 +1207,40 @@ uno::Sequence< beans::Property > Content::getProperties( { static const beans::Property aGenericProperties[] = { - beans::Property( rtl::OUString( "IsDocument" ), + beans::Property( OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsFolder" ), + beans::Property( OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "Title" ), - -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::Property( OUString( "Title" ), + -1, getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), - beans::Property( rtl::OUString( "IsReadOnly" ), + beans::Property( OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "DateCreated" ), + beans::Property( OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "DateModified" ), + beans::Property( OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "Size" ), + beans::Property( OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsVolume" ), + beans::Property( OUString( "IsVolume" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsCompactDisc" ), + beans::Property( OUString( "IsCompactDisc" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsRemoveable" ), + beans::Property( OUString( "IsRemoveable" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsHidden" ), + beans::Property( OUString( "IsHidden" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "CreatableContentsInfo" ), + beans::Property( OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) }; @@ -1255,35 +1255,35 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( const uno::Reference< uc { // Required commands ucb::CommandInfo - ( rtl::OUString( "getCommandInfo" ), + ( OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo - ( rtl::OUString( "getPropertySetInfo" ), + ( OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo - ( rtl::OUString( "getPropertyValues" ), + ( OUString( "getPropertyValues" ), -1, getCppuType( static_cast * >( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "setPropertyValues" ), + ( OUString( "setPropertyValues" ), -1, getCppuType( static_cast * >( 0 ) ) ), // Optional standard commands ucb::CommandInfo - ( rtl::OUString( "delete" ), + ( OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo - ( rtl::OUString( "insert" ), + ( OUString( "insert" ), -1, getCppuType( static_cast( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "open" ), + ( OUString( "open" ), -1, getCppuType( static_cast( 0 ) ) ), // Folder Only, omitted if not a folder ucb::CommandInfo - ( rtl::OUString( "transfer" ), + ( OUString( "transfer" ), -1, getCppuType( static_cast( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "createNewContent" ), + ( OUString( "createNewContent" ), -1, getCppuType( static_cast( 0 ) ) ) }; @@ -1309,16 +1309,16 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface(rType); } -rtl::OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) +OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString("com.sun.star.comp.GIOContent"); + return OUString("com.sun.star.comp.GIOContent"); } -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = rtl::OUString("com.sun.star.ucb.GIOContent"); + uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[ 0 ] = OUString("com.sun.star.ucb.GIOContent"); return aSNS; } diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx index b1cfe0a56996..bda3c6255a2a 100644 --- a/ucb/source/ucp/gio/gio_content.hxx +++ b/ucb/source/ucp/gio/gio_content.hxx @@ -144,21 +144,21 @@ public: getCommands( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); XINTERFACE_DECL() XTYPEPROVIDER_DECL() - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index 0c6e40657c9d..e6824e25631b 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -98,11 +98,11 @@ DataSupplier::~DataSupplier() } } -::rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { if ( nIndex < maResults.size() ) { - ::rtl::OUString aId = maResults[ nIndex ]->aId; + OUString aId = maResults[ nIndex ]->aId; if ( aId.getLength() ) { // Already cached. @@ -114,16 +114,16 @@ DataSupplier::~DataSupplier() { GFile *pFile = mxContent->getGFile(); char* parent = g_file_get_uri(pFile); - rtl::OUString aId = rtl::OUString::createFromAscii( parent ); + OUString aId = OUString::createFromAscii( parent ); g_free(parent); char *escaped_name = g_uri_escape_string( g_file_info_get_name(maResults[ nIndex ]->pInfo) , NULL, false); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString("/"); + aId += OUString("/"); - aId += rtl::OUString::createFromAscii( escaped_name ); + aId += OUString::createFromAscii( escaped_name ); g_free( escaped_name ); @@ -131,7 +131,7 @@ DataSupplier::~DataSupplier() return aId; } - return ::rtl::OUString(); + return OUString(); } uno::Reference< ucb::XContentIdentifier > DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) @@ -146,7 +146,7 @@ uno::Reference< ucb::XContentIdentifier > DataSupplier::queryContentIdentifier( } } - ::rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( aId.getLength() ) { uno::Reference< ucb::XContentIdentifier > xId = new ucbhelper::ContentIdentifier( aId ); @@ -235,7 +235,7 @@ uno::Reference< sdbc::XRow > DataSupplier::queryPropertyValues( sal_uInt32 nInde xContent, uno::UNO_QUERY_THROW ); sal_Int32 nCmdId( xCmdProc->createCommandIdentifier() ); ucb::Command aCmd; - aCmd.Name = rtl::OUString("getPropertyValues"); + aCmd.Name = OUString("getPropertyValues"); aCmd.Handle = -1; aCmd.Argument <<= getResultSet()->getProperties(); uno::Any aResult( xCmdProc->execute( diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx index 34cd04613fbc..3a119a62360c 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.hxx +++ b/ucb/source/ucp/gio/gio_datasupplier.hxx @@ -31,7 +31,7 @@ class Content; struct ResultListEntry { - ::rtl::OUString aId; + OUString aId; com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > xId; com::sun::star::uno::Reference< com::sun::star::ucb::XContent > xContent; com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > xRow; @@ -64,7 +64,7 @@ public: const com::sun::star::uno::Reference< Content >& rContent, sal_Int32 nOpenMode ); virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx index 638c2ff5820b..b454a6840f3a 100644 --- a/ucb/source/ucp/gio/gio_inputstream.cxx +++ b/ucb/source/ucp/gio/gio_inputstream.cxx @@ -61,7 +61,7 @@ void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw io::NotConnectedException(); if (!g_seekable_can_seek(G_SEEKABLE(mpStream))) - throw io::IOException(rtl::OUString("Seek unsupported"), + throw io::IOException(OUString("Seek unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx index bd9d2012a258..30c97e29795f 100644 --- a/ucb/source/ucp/gio/gio_mount.cxx +++ b/ucb/source/ucp/gio/gio_mount.cxx @@ -75,7 +75,7 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, return; } - ::rtl::OUString aHostName, aDomain, aUserName, aPassword; + OUString aHostName, aDomain, aUserName, aPassword; ucbhelper::SimpleAuthenticationRequest::EntityType eUserName = (flags & G_ASK_PASSWORD_NEED_USERNAME) @@ -83,18 +83,18 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, : ucbhelper::SimpleAuthenticationRequest::ENTITY_NA; if (default_user) - aUserName = rtl::OUString(default_user, strlen(default_user), RTL_TEXTENCODING_UTF8); + aUserName = OUString(default_user, strlen(default_user), RTL_TEXTENCODING_UTF8); ucbhelper::SimpleAuthenticationRequest::EntityType ePassword = (flags & G_ASK_PASSWORD_NEED_PASSWORD) ? ucbhelper::SimpleAuthenticationRequest::ENTITY_MODIFY : ucbhelper::SimpleAuthenticationRequest::ENTITY_NA; - rtl::OUString aPrevPassword, aPrevUsername; + OUString aPrevPassword, aPrevUsername; if (pThis->m_pPrevUsername) - aPrevUsername = rtl::OUString(pThis->m_pPrevUsername, strlen(pThis->m_pPrevUsername), RTL_TEXTENCODING_UTF8); + aPrevUsername = OUString(pThis->m_pPrevUsername, strlen(pThis->m_pPrevUsername), RTL_TEXTENCODING_UTF8); if (pThis->m_pPrevPassword) - aPrevPassword = rtl::OUString(pThis->m_pPrevPassword, strlen(pThis->m_pPrevPassword), RTL_TEXTENCODING_UTF8); + aPrevPassword = OUString(pThis->m_pPrevPassword, strlen(pThis->m_pPrevPassword), RTL_TEXTENCODING_UTF8); //The damn dialog is stupidly broken, so do like webdav, i.e. "#102871#" if ( aUserName.isEmpty() ) @@ -109,10 +109,10 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, : ucbhelper::SimpleAuthenticationRequest::ENTITY_NA; if (default_domain) - aDomain = rtl::OUString(default_domain, strlen(default_domain), RTL_TEXTENCODING_UTF8); + aDomain = OUString(default_domain, strlen(default_domain), RTL_TEXTENCODING_UTF8); uno::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest - = new ucbhelper::SimpleAuthenticationRequest (rtl::OUString() /* FIXME: provide URL here */, aHostName, eDomain, aDomain, eUserName, aUserName, ePassword, aPassword); + = new ucbhelper::SimpleAuthenticationRequest (OUString() /* FIXME: provide URL here */, aHostName, eDomain, aDomain, eUserName, aUserName, ePassword, aPassword); xIH->handle( xRequest.get() ); @@ -136,13 +136,13 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, aPassword = xSupp->getPassword(); if (flags & G_ASK_PASSWORD_NEED_USERNAME) - g_mount_operation_set_username(op, rtl::OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8).getStr()); + g_mount_operation_set_username(op, OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8).getStr()); if (flags & G_ASK_PASSWORD_NEED_PASSWORD) - g_mount_operation_set_password(op, rtl::OUStringToOString(aPassword, RTL_TEXTENCODING_UTF8).getStr()); + g_mount_operation_set_password(op, OUStringToOString(aPassword, RTL_TEXTENCODING_UTF8).getStr()); if (flags & G_ASK_PASSWORD_NEED_DOMAIN) - g_mount_operation_set_domain(op, rtl::OUStringToOString(xSupp->getRealm(), RTL_TEXTENCODING_UTF8).getStr()); + g_mount_operation_set_domain(op, OUStringToOString(xSupp->getRealm(), RTL_TEXTENCODING_UTF8).getStr()); switch (xSupp->getRememberPasswordMode()) { @@ -160,10 +160,10 @@ static void ooo_mount_operation_ask_password (GMountOperation *op, if (pThis->m_pPrevPassword) free(pThis->m_pPrevPassword); - pThis->m_pPrevPassword = strdup(rtl::OUStringToOString(aPassword, RTL_TEXTENCODING_UTF8).getStr()); + pThis->m_pPrevPassword = strdup(OUStringToOString(aPassword, RTL_TEXTENCODING_UTF8).getStr()); if (pThis->m_pPrevUsername) free(pThis->m_pPrevUsername); - pThis->m_pPrevUsername = strdup(rtl::OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8).getStr()); + pThis->m_pPrevUsername = strdup(OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8).getStr()); g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED); } diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 93ec2d4d6704..aad78b37afcc 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -38,7 +38,7 @@ ContentProvider::queryContent( { #if OSL_DEBUG_LEVEL > 1 fprintf(stderr, "QueryContent: '%s'", - rtl::OUStringToOString + OUStringToOString (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr()); #endif @@ -85,8 +85,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, com::sun::star::ucb::XContentProvider ); XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString( "com.sun.star.comp.GIOContentProvider" ), - rtl::OUString( "com.sun.star.ucb.GIOContentProvider" ) ); + OUString( "com.sun.star.comp.GIOContentProvider" ), + OUString( "com.sun.star.ucb.GIOContentProvider" ) ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index b3777144b463..70cc2e1abe82 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -46,7 +46,7 @@ void SAL_CALL Seekable::truncate( void ) throw io::NotConnectedException(); if (!g_seekable_can_truncate(mpStream)) - throw io::IOException(rtl::OUString("Truncate unsupported"), + throw io::IOException(OUString("Truncate unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; @@ -61,7 +61,7 @@ void SAL_CALL Seekable::seek( sal_Int64 location ) throw io::NotConnectedException(); if (!g_seekable_can_seek(mpStream)) - throw io::IOException(rtl::OUString("Seek unsupported"), + throw io::IOException(OUString("Seek unsupported"), static_cast< cppu::OWeakObject * >(this)); GError *pError=NULL; @@ -111,7 +111,7 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeExc } if (!bOk) - throw io::IOException(rtl::OUString("Getting size unsupported"), + throw io::IOException(OUString("Getting size unsupported"), static_cast< cppu::OWeakObject * >(this)); return nSize; diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index 8e7778b3884d..22c9d1aef1e2 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -90,19 +90,19 @@ using namespace com::sun::star; static char * -OUStringToGnome( const rtl::OUString &str ) +OUStringToGnome( const OUString &str ) { - rtl::OString aTempStr = rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ); + OString aTempStr = OUStringToOString( str, RTL_TEXTENCODING_UTF8 ); return g_strdup( aTempStr.getStr() ); } -static rtl::OUString +static OUString GnomeToOUString( const char *utf8_str) { if (!utf8_str) - return rtl::OUString(); + return OUString(); else - return rtl::OUString( utf8_str, strlen( utf8_str ), RTL_TEXTENCODING_UTF8 ); + return OUString( utf8_str, strlen( utf8_str ), RTL_TEXTENCODING_UTF8 ); } @@ -235,17 +235,17 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // XServiceInfo methods. // -rtl::OUString SAL_CALL Content::getImplementationName() +OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString("com.sun.star.comp.GnomeVFSContent"); + return OUString("com.sun.star.comp.GnomeVFSContent"); } -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = rtl::OUString( "com.sun.star.ucb.GnomeVFSContent" ); + uno::Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[ 0 ] = OUString( "com.sun.star.ucb.GnomeVFSContent" ); return aSNS; } @@ -253,13 +253,13 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() // XContent methods. // -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { if ( isFolder( uno::Reference< ucb::XCommandEnvironment >() ) ) - return rtl::OUString( GVFS_FOLDER_TYPE ); + return OUString( GVFS_FOLDER_TYPE ); else - return rtl::OUString( GVFS_FILE_TYPE ); + return OUString( GVFS_FILE_TYPE ); } // @@ -269,7 +269,7 @@ rtl::OUString SAL_CALL Content::getContentType() uno::Any Content::getBadArgExcept() { return uno::makeAny( lang::IllegalArgumentException - ( rtl::OUString("Wrong argument type!"), + ( OUString("Wrong argument type!"), static_cast< cppu::OWeakObject * >( this ), -1 ) ); } @@ -346,7 +346,7 @@ uno::Any SAL_CALL Content::execute( == ucb::OpenMode::DOCUMENT_SHARE_DENY_WRITE ) ) { ucbhelper::cancelCommandExecution ( uno::makeAny ( ucb::UnsupportedOpenModeException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( aOpenCommand.Mode ) ) ), xEnv ); @@ -360,7 +360,7 @@ uno::Any SAL_CALL Content::execute( #endif ucbhelper::cancelCommandExecution ( uno::makeAny (ucb::UnsupportedDataSinkException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), aOpenCommand.Sink ) ), xEnv ); @@ -390,7 +390,7 @@ uno::Any SAL_CALL Content::execute( sal_Bool bDeletePhysical = sal_False; aCommand.Argument >>= bDeletePhysical; - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); GnomeVFSResult result = gnome_vfs_unlink (aURI.getStr()); if (result != GNOME_VFS_OK) @@ -413,7 +413,7 @@ uno::Any SAL_CALL Content::execute( #endif ucbhelper::cancelCommandExecution ( uno::makeAny( ucb::UnsupportedCommandException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -443,19 +443,19 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( // Minimum set of props we really need uno::Sequence< beans::Property > props( 1 ); props[0] = beans::Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< rtl::OUString* >( 0 ) ), + getCppuType( static_cast< OUString* >( 0 ) ), beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND ); // file - seq[0].Type = rtl::OUString( GVFS_FILE_TYPE ); + seq[0].Type = OUString( GVFS_FILE_TYPE ); seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT ); seq[0].Properties = props; // folder - seq[1].Type = rtl::OUString( GVFS_FOLDER_TYPE ); + seq[1].Type = OUString( GVFS_FOLDER_TYPE ); seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; seq[1].Properties = props; @@ -496,14 +496,14 @@ Content::createNewContent( const ucb::ContentInfo& Info ) g_warning( "createNewContent (%d)", (int) create_document ); #endif - rtl::OUString aURL = getOUURI(); + OUString aURL = getOUURI(); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); name = create_document ? "[New_Content]" : "[New_Collection]"; // This looks problematic to me cf. webdav - aURL += rtl::OUString::createFromAscii( name ); + aURL += OUString::createFromAscii( name ); uno::Reference< ucb::XContentIdentifier > xId ( new ::ucbhelper::ContentIdentifier( aURL ) ); @@ -515,9 +515,9 @@ Content::createNewContent( const ucb::ContentInfo& Info ) } } -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { - rtl::OUString aParentURL; + OUString aParentURL; // :// -> "" // ://foo -> "" // ://foo/ -> "" @@ -525,7 +525,7 @@ rtl::OUString Content::getParentURL() // ://foo/bar/ -> ://foo/ // ://foo/bar/abc -> ://foo/bar/ - rtl::OUString aURL = getOUURI(); + OUString aURL = getOUURI(); sal_Int32 nPos = aURL.lastIndexOf( '/' ); if ( nPos == ( aURL.getLength() - 1 ) ) { @@ -538,11 +538,11 @@ rtl::OUString Content::getParentURL() nPos1 = aURL.lastIndexOf( '/', nPos1 ); if ( nPos1 != -1 ) - aParentURL = rtl::OUString( aURL.copy( 0, nPos + 1 ) ); + aParentURL = OUString( aURL.copy( 0, nPos + 1 ) ); #if OSL_DEBUG_LEVEL > 1 g_warning ("getParentURL '%s' -> '%s'", - getURI(), rtl::OUStringToOString + getURI(), OUStringToOString ( aParentURL, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif @@ -621,7 +621,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( GnomeVFSFileInfo* fileInfo = gnome_vfs_file_info_new (); - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); gnome_vfs_get_file_info ( aURI.getStr(), fileInfo, GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS ); @@ -691,16 +691,16 @@ static lang::IllegalAccessException getReadOnlyException( Content *ctnt ) { return lang::IllegalAccessException - ( rtl::OUString("Property is read-only!"), + ( OUString("Property is read-only!"), static_cast< cppu::OWeakObject * >( ctnt ) ); } -rtl::OUString +OUString Content::makeNewURL( const char */*newName*/ ) { - rtl::OUString aNewURL = getParentURL(); + OUString aNewURL = getParentURL(); if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) ) - aNewURL += rtl::OUString("/"); + aNewURL += OUString("/"); char *name = gnome_vfs_escape_string( m_info.name ); aNewURL += GnomeToOUString( name ); @@ -719,7 +719,7 @@ Content::doSetFileInfo( const GnomeVFSFileInfo *newInfo, g_assert (!m_bTransient); - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -750,7 +750,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( const uno::Sequence< beans::PropertyValue >& rValues, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) { - rtl::OUString aNewTitle; + OUString aNewTitle; GnomeVFSFileInfo newInfo; int setMask = GNOME_VFS_SET_FILE_INFO_NONE; @@ -795,7 +795,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( rValue.Value >>= aNewTitle ) { if ( aNewTitle.isEmpty() ) aRet[ n ] <<= lang::IllegalArgumentException - ( rtl::OUString("Empty title not allowed!"), + ( OUString("Empty title not allowed!"), static_cast< cppu::OWeakObject * >( this ), -1 ); else { char *newName = OUStringToGnome( aNewTitle ); @@ -805,7 +805,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( g_warning ("Set new name to '%s'", newName); #endif - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); aEvent.OldValue = uno::makeAny( GnomeToOUString( newInfo.name ) ); aEvent.NewValue = uno::makeAny( aNewTitle ); aChanges.getArray()[ nChanged ] = aEvent; @@ -818,7 +818,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( } } else aRet[ n ] <<= beans::IllegalTypeException - ( rtl::OUString("Property value has wrong type!"), + ( OUString("Property value has wrong type!"), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "DateCreated" || rValue.Name == "DateModified" ) { @@ -853,7 +853,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( aGuard.clear(); if (!exchangeIdentity( xNewId ) ) aRet[ nTitlePos ] <<= uno::Exception - ( rtl::OUString("Exchange failed!"), + ( OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -878,11 +878,11 @@ void Content::queryChildren( ContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = getOUURI(); + OUString aURL = getOUURI(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); sal_Int32 nLen = aURL.getLength(); @@ -891,7 +891,7 @@ void Content::queryChildren( ContentRefList& rChildren ) while ( it != end ) { ::ucbhelper::ContentImplHelperRef xChild = (*it); - rtl::OUString aChildURL + OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? @@ -937,7 +937,7 @@ void Content::insert( if ( m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE && m_info.type == GNOME_VFS_FILE_TYPE_DIRECTORY ) { - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); int perm; perm = ( GNOME_VFS_PERM_USER_ALL | @@ -960,13 +960,13 @@ void Content::insert( ucbhelper::cancelCommandExecution ( uno::makeAny ( ucb::MissingInputStreamException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } GnomeVFSHandle *handle = NULL; - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); result = GNOME_VFS_ERROR_GENERIC; if ( bReplaceExisting ) { @@ -1016,7 +1016,7 @@ void Content::transfer(const ucb::TransferInfo & /*rArgs*/, ucbhelper::cancelCommandExecution ( uno::makeAny ( ucb::InteractiveBadTransferURLException - ( rtl::OUString("Unsupported URL scheme!"), + ( OUString("Unsupported URL scheme!"), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); } @@ -1067,7 +1067,7 @@ sal_Bool Content::exchangeIdentity( return sal_False; } - rtl::OUString aOldURL = getOUURI(); + OUString aOldURL = getOUURI(); // Exchange own identitity. if ( exchange( xNewId ) ) { @@ -1085,9 +1085,9 @@ sal_Bool Content::exchangeIdentity( // Create new content identifier for the child... uno::Reference< ucb::XContentIdentifier > xOldChildId = xChild->getIdentifier(); - rtl::OUString aOldChildURL + OUString aOldChildURL = xOldChildId->getContentIdentifier(); - rtl::OUString aNewChildURL + OUString aNewChildURL = aOldChildURL.replaceAt( 0, aOldURL.getLength(), @@ -1117,7 +1117,7 @@ Content::getInfo( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) result = GNOME_VFS_OK; else if ( !m_info.valid_fields ) { - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); Authentication aAuth( xEnv ); result = gnome_vfs_get_file_info ( aURI.getStr(), &m_info, GNOME_VFS_FILE_INFO_DEFAULT ); @@ -1146,7 +1146,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite { uno::Any aException; const char *gvfs_message; - rtl::OUString message; + OUString message; uno::Sequence< uno::Any > aArgs( 1 ); #if OSL_DEBUG_LEVEL > 1 @@ -1168,7 +1168,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite aArgs[ 0 ] <<= m_xIdentifier->getContentIdentifier(); aException <<= ucb::InteractiveAugmentedIOException - ( rtl::OUString("Not found!"), + ( OUString("Not found!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -1177,7 +1177,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite case GNOME_VFS_ERROR_BAD_PARAMETERS: aException <<= lang::IllegalArgumentException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ); break; @@ -1193,14 +1193,14 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite if ( bWrite ) aException <<= ucb::InteractiveNetworkWriteException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, message ); else aException <<= ucb::InteractiveNetworkReadException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, message ); @@ -1209,7 +1209,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite case GNOME_VFS_ERROR_INVALID_HOST_NAME: aException <<= ucb::InteractiveNetworkResolveNameException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, message ); @@ -1220,7 +1220,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite case GNOME_VFS_ERROR_NO_MASTER_BROWSER: aException <<= ucb::InteractiveNetworkConnectException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, message ); @@ -1228,7 +1228,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite case GNOME_VFS_ERROR_FILE_EXISTS: aException <<= ucb::NameClashException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, message ); @@ -1270,7 +1270,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite #endif default: aException <<= ucb::InteractiveNetworkGeneralException - ( rtl::OUString(), + ( OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR ); break; @@ -1293,45 +1293,45 @@ uno::Sequence< beans::Property > Content::getProperties( const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) { static const beans::Property aGenericProperties[] = { - beans::Property( rtl::OUString( "ContentType" ), - -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::Property( OUString( "ContentType" ), + -1, getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsDocument" ), + beans::Property( OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsFolder" ), + beans::Property( OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "Title" ), - -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + beans::Property( OUString( "Title" ), + -1, getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), // Optional ... - beans::Property( rtl::OUString( "DateCreated" ), + beans::Property( OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "DateModified" ), + beans::Property( OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), // FIXME: Too expensive for now (?) -// beans::Property( rtl::OUString( "MediaType" ), -// -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), +// beans::Property( OUString( "MediaType" ), +// -1, getCppuType( static_cast< const OUString * >( 0 ) ), // beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "Size" ), + beans::Property( OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsReadOnly" ), + beans::Property( OUString( "IsReadOnly" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsVolume" ), + beans::Property( OUString( "IsVolume" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsCompactDisk" ), + beans::Property( OUString( "IsCompactDisk" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "IsHidden" ), + beans::Property( OUString( "IsHidden" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), - beans::Property( rtl::OUString( "CreatableContentsInfo" ), + beans::Property( OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) }; @@ -1348,35 +1348,35 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( static ucb::CommandInfo aCommandInfoTable[] = { // Required commands ucb::CommandInfo - ( rtl::OUString( "getCommandInfo" ), + ( OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo - ( rtl::OUString( "getPropertySetInfo" ), + ( OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo - ( rtl::OUString( "getPropertyValues" ), + ( OUString( "getPropertyValues" ), -1, getCppuType( static_cast * >( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "setPropertyValues" ), + ( OUString( "setPropertyValues" ), -1, getCppuType( static_cast * >( 0 ) ) ), // Optional standard commands ucb::CommandInfo - ( rtl::OUString( "delete" ), + ( OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo - ( rtl::OUString( "insert" ), + ( OUString( "insert" ), -1, getCppuType( static_cast( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "open" ), + ( OUString( "open" ), -1, getCppuType( static_cast( 0 ) ) ), // Folder Only, omitted if not a folder ucb::CommandInfo - ( rtl::OUString( "transfer" ), + ( OUString( "transfer" ), -1, getCppuType( static_cast( 0 ) ) ), ucb::CommandInfo - ( rtl::OUString( "createNewContent" ), + ( OUString( "createNewContent" ), -1, getCppuType( static_cast( 0 ) ) ) }; @@ -1386,17 +1386,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCommandInfoTable, isFolder( xEnv ) ? nProps : nProps - 2 ); } -rtl::OUString +OUString Content::getOUURI () { osl::Guard< osl::Mutex > aGuard( m_aMutex ); return m_xIdentifier->getContentIdentifier(); } -rtl::OString +OString Content::getOURI () { - return rtl::OUStringToOString( getOUURI(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( getOUURI(), RTL_TEXTENCODING_UTF8 ); } char * @@ -1427,7 +1427,7 @@ Content::createTempStream( { GnomeVFSResult result; GnomeVFSHandle *handle = NULL; - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); // Something badly wrong happened - can't seek => stream to a temporary file @@ -1462,7 +1462,7 @@ Content::createInputStream( osl::Guard< osl::Mutex > aGuard( m_aMutex ); getInfo( xEnv ); - ::rtl::OString aURI = getOURI(); + OString aURI = getOURI(); if ( !(m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) ) return createTempStream( xEnv ); @@ -1567,7 +1567,7 @@ extern "C" { ucbhelper::SimpleAuthenticationRequest::EntityType eDomain, eUserName, ePassword; - ::rtl::OUString aHostName, aDomain, aUserName, aPassword; + OUString aHostName, aDomain, aUserName, aPassword; aHostName = GnomeToOUString( in->server ); @@ -1599,7 +1599,7 @@ extern "C" { // the same user/password as was entered last time if // we failed to authenticate - infinite looping / flickering // madness etc. [ nice infrastructure ! ] - static rtl::OUString aLastUserName, aLastPassword; + static OUString aLastUserName, aLastPassword; if (in->flags & GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_PREVIOUS_ATTEMPT_FAILED) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); @@ -1626,7 +1626,7 @@ extern "C" { ucbhelper::InteractionSupplyAuthentication > & xSupp = xRequest->getAuthenticationSupplier(); - ::rtl::OUString aNewDomain, aNewUserName, aNewPassword; + OUString aNewDomain, aNewUserName, aNewPassword; aNewUserName = xSupp->getUserName(); if ( !aNewUserName.isEmpty() ) diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx index 0357987eb4fd..048ea8443636 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.hxx +++ b/ucb/source/ucp/gvfs/gvfs_content.hxx @@ -94,11 +94,11 @@ private: GnomeVFSSetFileInfoMask setMask, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ); - ::rtl::OUString makeNewURL ( const char *newName ); + OUString makeNewURL ( const char *newName ); // End Internal helpers // For ucbhelper - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); // For ucbhelper virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< @@ -176,8 +176,8 @@ private: public: // Non-interface bits char *getURI (); - rtl::OString getOURI (); - rtl::OUString getOUURI (); + OString getOURI (); + OUString getOUURI (); //========================================================================= // Externals @@ -206,14 +206,14 @@ public: XTYPEPROVIDER_DECL() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XContent - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx index 9ca0c2382e44..fb02b50ed9f9 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.cxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx @@ -72,7 +72,7 @@ void DynamicResultSet::initDynamic() struct ResultListEntry { - rtl::OUString aId; + OUString aId; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; @@ -144,26 +144,26 @@ DataSupplier::~DataSupplier() } // virtual -rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( nIndex < m_pImpl->m_aResults.size() ) { - rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; if ( !aId.isEmpty() ) // cached return aId; } if ( getResult( nIndex ) ) { - rtl::OUString aId = m_pImpl->m_xContent->getOUURI(); + OUString aId = m_pImpl->m_xContent->getOUURI(); char *escaped_name; escaped_name = gnome_vfs_escape_string( m_pImpl->m_aResults[ nIndex ]->aInfo.name ); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString("/"); + aId += OUString("/"); - aId += rtl::OUString::createFromAscii( escaped_name ); + aId += OUString::createFromAscii( escaped_name ); g_free( escaped_name ); @@ -171,7 +171,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) return aId; } - return rtl::OUString(); + return OUString(); } // virtual @@ -187,7 +187,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) return xId; } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { uno::Reference< ucb::XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( aId ); diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx index e1847b3a470b..37d6aa0c07e4 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.hxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx @@ -59,7 +59,7 @@ public: virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index c849b0b17fc8..ec15ae0abee0 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -76,8 +76,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString( "com.sun.star.comp.GnomeVFSContentProvider" ), - rtl::OUString( "com.sun.star.ucb.GnomeVFSContentProvider" ) ); + OUString( "com.sun.star.comp.GnomeVFSContentProvider" ), + OUString( "com.sun.star.ucb.GnomeVFSContentProvider" ) ); //========================================================================= // // Service factory implementation. @@ -101,7 +101,7 @@ ContentProvider::queryContent( { #if OSL_DEBUG_LEVEL > 1 g_warning ("QueryContent: '%s'", - rtl::OUStringToOString (Identifier->getContentIdentifier(), + OUStringToOString (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr() ); #endif diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx index 462fde93d9ac..080d484dfb47 100644 --- a/ucb/source/ucp/gvfs/gvfs_stream.cxx +++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx @@ -28,7 +28,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::ucb; using namespace gvfs; -using ::rtl::OUString; Stream::Stream( GnomeVFSHandle *handle, const GnomeVFSFileInfo *aInfo ) : @@ -322,7 +321,7 @@ void Stream::throwOnError( GnomeVFSResult result ) RuntimeException ) { if( result != GNOME_VFS_OK ) { - ::rtl::OUString aMsg = ::rtl::OUString::createFromAscii + OUString aMsg = OUString::createFromAscii ( gnome_vfs_result_to_string( result ) ); g_warning( "Input Stream exceptional result '%s' (%d)", diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 92313ca5c078..c71de2339420 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -285,26 +285,26 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() //========================================================================= // virtual -rtl::OUString SAL_CALL HierarchyContent::getImplementationName() +OUString SAL_CALL HierarchyContent::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( "com.sun.star.comp.ucb.HierarchyContent" ); + return OUString( "com.sun.star.comp.ucb.HierarchyContent" ); } //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL HierarchyContent::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); if ( m_eKind == LINK ) - aSNS.getArray()[ 0 ] = rtl::OUString( HIERARCHY_LINK_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( HIERARCHY_LINK_CONTENT_SERVICE_NAME ); else if ( m_eKind == FOLDER ) - aSNS.getArray()[ 0 ] = rtl::OUString( HIERARCHY_FOLDER_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( HIERARCHY_FOLDER_CONTENT_SERVICE_NAME ); else - aSNS.getArray()[ 0 ] = rtl::OUString( HIERARCHY_ROOT_FOLDER_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( HIERARCHY_ROOT_FOLDER_CONTENT_SERVICE_NAME ); return aSNS; } @@ -316,7 +316,7 @@ HierarchyContent::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL HierarchyContent::getContentType() +OUString SAL_CALL HierarchyContent::getContentType() throw( uno::RuntimeException ) { return m_aProps.getContentType(); @@ -366,7 +366,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -386,7 +386,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -397,7 +397,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "No properties!" ), + OUString( "No properties!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -433,7 +433,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -456,7 +456,7 @@ uno::Any SAL_CALL HierarchyContent::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -485,7 +485,7 @@ uno::Any SAL_CALL HierarchyContent::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -494,7 +494,7 @@ uno::Any SAL_CALL HierarchyContent::execute( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), Environment, - rtl::OUString( "Cannot remove persistent data!" ), + OUString( "Cannot remove persistent data!" ), this ); // Unreachable } @@ -515,7 +515,7 @@ uno::Any SAL_CALL HierarchyContent::execute( OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -537,7 +537,7 @@ uno::Any SAL_CALL HierarchyContent::execute( OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -554,7 +554,7 @@ uno::Any SAL_CALL HierarchyContent::execute( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -603,18 +603,18 @@ HierarchyContent::createNewContent( const ucb::ContentInfo& Info ) if ( !bCreateFolder && Info.Type != HIERARCHY_LINK_CONTENT_TYPE ) return uno::Reference< ucb::XContent >(); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); OSL_ENSURE( !aURL.isEmpty(), "HierarchyContent::createNewContent - empty identifier!" ); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); if ( bCreateFolder ) - aURL += rtl::OUString("New_Folder"); + aURL += OUString("New_Folder"); else - aURL += rtl::OUString("New_Link"); + aURL += OUString("New_Link"); uno::Reference< ucb::XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( aURL ); @@ -630,7 +630,7 @@ HierarchyContent::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString HierarchyContent::getParentURL() +OUString HierarchyContent::getParentURL() { HierarchyUri aUri( m_xIdentifier->getContentIdentifier() ); return aUri.getParentUri(); @@ -643,7 +643,7 @@ sal_Bool HierarchyContent::hasData( HierarchyContentProvider* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier ) { - rtl::OUString aURL = Identifier->getContentIdentifier(); + OUString aURL = Identifier->getContentIdentifier(); // Am I a root folder? HierarchyUri aUri( aURL ); @@ -665,7 +665,7 @@ sal_Bool HierarchyContent::loadData( const uno::Reference< ucb::XContentIdentifier >& Identifier, HierarchyContentProperties& rProps ) { - rtl::OUString aURL = Identifier->getContentIdentifier(); + OUString aURL = Identifier->getContentIdentifier(); // Am I a root folder? HierarchyUri aUri( aURL ); @@ -745,7 +745,7 @@ bool HierarchyContent::isReadOnly() = m_pProvider->getConfigProvider( aUri.getService() ); if ( xConfigProv.is() ) { - uno::Sequence< rtl::OUString > aNames + uno::Sequence< OUString > aNames = xConfigProv->getAvailableServiceNames(); sal_Int32 nCount = aNames.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -765,14 +765,14 @@ bool HierarchyContent::isReadOnly() //========================================================================= uno::Reference< ucb::XContentIdentifier > -HierarchyContent::makeNewIdentifier( const rtl::OUString& rTitle ) +HierarchyContent::makeNewIdentifier( const OUString& rTitle ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); // Assemble new content identifier... HierarchyUri aUri( m_xIdentifier->getContentIdentifier() ); - rtl::OUString aNewURL = aUri.getParentUri(); - aNewURL += rtl::OUString("/"); + OUString aNewURL = aUri.getParentUri(); + aNewURL += OUString("/"); aNewURL += ::ucb_impl::urihelper::encodeSegment( rTitle ); return uno::Reference< ucb::XContentIdentifier >( @@ -792,13 +792,13 @@ void HierarchyContent::queryChildren( HierarchyContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += rtl::OUString("/"); + aURL += OUString("/"); } sal_Int32 nLen = aURL.getLength(); @@ -809,7 +809,7 @@ void HierarchyContent::queryChildren( HierarchyContentRefList& rChildren ) while ( it != end ) { ::ucbhelper::ContentImplHelperRef xChild = (*it); - rtl::OUString aChildURL + OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? @@ -863,7 +863,7 @@ sal_Bool HierarchyContent::exchangeIdentity( // Fail, if a content with given id already exists. if ( !hasData( xNewId ) ) { - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); aGuard.clear(); if ( exchange( xNewId ) ) @@ -885,9 +885,9 @@ sal_Bool HierarchyContent::exchangeIdentity( // Create new content identifier for the child... uno::Reference< ucb::XContentIdentifier > xOldChildId = xChild->getIdentifier(); - rtl::OUString aOldChildURL + OUString aOldChildURL = xOldChildId->getContentIdentifier(); - rtl::OUString aNewChildURL + OUString aNewChildURL = aOldChildURL.replaceAt( 0, aOldURL.getLength(), @@ -917,7 +917,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, const HierarchyContentProperties& rData, HierarchyContentProvider* pProvider, - const rtl::OUString& rContentId ) + const OUString& rContentId ) { // Note: Empty sequence means "get values of all supported properties". @@ -1003,28 +1003,28 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( rtl::OUString("ContentType"), + beans::Property( OUString("ContentType"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getContentType() ); xRow->appendString ( - beans::Property( rtl::OUString("Title"), + beans::Property( OUString("Title"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), // @@@ Might actually be read-only! beans::PropertyAttribute::BOUND ), rData.getTitle() ); xRow->appendBoolean( - beans::Property( rtl::OUString("IsDocument"), + beans::Property( OUString("IsDocument"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getIsDocument() ); xRow->appendBoolean( - beans::Property( rtl::OUString("IsFolder"), + beans::Property( OUString("IsFolder"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -1033,16 +1033,16 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( if ( rData.getIsDocument() ) xRow->appendString( - beans::Property( rtl::OUString("TargetURL"), + beans::Property( OUString("TargetURL"), -1, getCppuType( - static_cast< const rtl::OUString * >( 0 ) ), + static_cast< const OUString * >( 0 ) ), // @@@ Might actually be read-only! beans::PropertyAttribute::BOUND ), rData.getTargetURL() ); xRow->appendObject( beans::Property( - rtl::OUString("CreatableContentsInfo"), + OUString("CreatableContentsInfo"), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -1100,8 +1100,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( sal_Bool bTriedToGetAdditonalPropSet = sal_False; sal_Bool bExchange = sal_False; - rtl::OUString aOldTitle; - rtl::OUString aOldName; + OUString aOldTitle; + OUString aOldName; sal_Int32 nTitlePos = -1; for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -1112,28 +1112,28 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "Title" ) @@ -1141,12 +1141,12 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( if ( isReadOnly() ) { aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty titles! @@ -1176,7 +1176,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Empty title not allowed!" ), + OUString( "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1184,7 +1184,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( "Property value has wrong type!" ), + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1194,7 +1194,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( if ( isReadOnly() ) { aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else @@ -1203,7 +1203,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( if ( m_eKind == LINK ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty target URL's! @@ -1226,7 +1226,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Empty target URL not allowed!" ), + OUString( "Empty target URL not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1234,14 +1234,14 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( "Property value has wrong type!" ), + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( "TargetURL only supported by links!" ), + OUString( "TargetURL only supported by links!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1295,7 +1295,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString( "No property set for storing the value!" ), + OUString( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1325,18 +1325,18 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( m_aProps.setTitle( aOldTitle ); m_aProps.setName ( aOldName ); - aOldTitle = aOldName = rtl::OUString(); + aOldTitle = aOldName = OUString(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString("Exchange failed!"), + OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } if ( !aOldTitle.isEmpty() ) { - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( m_aProps.getTitle() ); @@ -1354,7 +1354,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1363,7 +1363,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot store persistent data!" ), + OUString( "Cannot store persistent data!" ), this ); // Unreachable } @@ -1391,7 +1391,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not supported by root folder!" ), + OUString( "Not supported by root folder!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1400,11 +1400,11 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, // Check, if all required properties were set. if ( m_aProps.getTitle().isEmpty() ) { - uno::Sequence< rtl::OUString > aProps( 1 ); - aProps[ 0 ] = rtl::OUString("Title"); + uno::Sequence< OUString > aProps( 1 ); + aProps[ 0 ] = OUString("Title"); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), xEnv ); @@ -1427,7 +1427,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, m_aProps.getTitle() ) ), @@ -1448,9 +1448,9 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, do { - rtl::OUString aNewId = xId->getContentIdentifier(); - aNewId += rtl::OUString("_"); - aNewId += rtl::OUString::valueOf( ++nTry ); + OUString aNewId = xId->getContentIdentifier(); + aNewId += OUString("_"); + aNewId += OUString::valueOf( ++nTry ); xId = new ::ucbhelper::ContentIdentifier( aNewId ); } while ( hasData( xId ) && ( nTry < 1000 ) ); @@ -1460,7 +1460,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString( "Unable to resolve name clash!" ), + OUString( "Unable to resolve name clash!" ), static_cast< cppu::OWeakObject * >( this ), nNameClashResolve ) ), xEnv ); @@ -1468,9 +1468,9 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, } else { - rtl::OUString aNewTitle( m_aProps.getTitle() ); - aNewTitle += rtl::OUString("_"); - aNewTitle += rtl::OUString::valueOf( nTry ); + OUString aNewTitle( m_aProps.getTitle() ); + aNewTitle += OUString("_"); + aNewTitle += OUString::valueOf( nTry ); m_aProps.setTitle( aNewTitle ); } } @@ -1484,7 +1484,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), nNameClashResolve ) ), xEnv ); @@ -1502,7 +1502,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1511,7 +1511,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString("Cannot store persistent data!"), + OUString("Cannot store persistent data!"), this ); // Unreachable } @@ -1542,7 +1542,7 @@ void HierarchyContent::destroy( sal_Bool bDeletePhysical, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not persistent!" ), + OUString( "Not persistent!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1553,7 +1553,7 @@ void HierarchyContent::destroy( sal_Bool bDeletePhysical, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not supported by root folder!" ), + OUString( "Not supported by root folder!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1595,7 +1595,7 @@ void HierarchyContent::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not persistent!" ), + OUString( "Not persistent!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1606,19 +1606,19 @@ void HierarchyContent::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable } // Is source not a parent of me / not me? - rtl::OUString aId = m_xIdentifier->getContentIdentifier(); + OUString aId = m_xIdentifier->getContentIdentifier(); sal_Int32 nPos = aId.lastIndexOf( '/' ); if ( nPos != ( aId.getLength() - 1 ) ) { // No trailing slash found. Append. - aId += rtl::OUString("/"); + aId += OUString("/"); } if ( rInfo.SourceURL.getLength() <= aId.getLength() ) @@ -1628,7 +1628,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rInfo.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1636,7 +1636,7 @@ void HierarchyContent::transfer( ucb::IOErrorCode_RECURSIVE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Target is equal to or is a child of source!" ), + OUString( "Target is equal to or is a child of source!" ), this ); // Unreachable } @@ -1667,7 +1667,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(xId->getContentIdentifier()), beans::PropertyState_DIRECT_VALUE)); @@ -1675,7 +1675,7 @@ void HierarchyContent::transfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot instanciate source object!" ), + OUString( "Cannot instanciate source object!" ), this ); // Unreachable } @@ -1684,9 +1684,9 @@ void HierarchyContent::transfer( // 1) Create new child content. ////////////////////////////////////////////////////////////////////// - rtl::OUString aType = xSource->isFolder() - ? rtl::OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) - : rtl::OUString( HIERARCHY_LINK_CONTENT_TYPE ); + OUString aType = xSource->isFolder() + ? OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) + : OUString( HIERARCHY_LINK_CONTENT_TYPE ); ucb::ContentInfo aContentInfo; aContentInfo.Type = aType; aContentInfo.Attributes = 0; @@ -1700,7 +1700,7 @@ void HierarchyContent::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(aId), beans::PropertyState_DIRECT_VALUE)); @@ -1708,7 +1708,7 @@ void HierarchyContent::transfer( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "XContentCreator::createNewContent failed!" ), + OUString( "XContentCreator::createNewContent failed!" ), this ); // Unreachable } @@ -1799,15 +1799,15 @@ void HierarchyContent::transfer( { const HierarchyEntryData& rResult = *it; - rtl::OUString aChildId = xId->getContentIdentifier(); + OUString aChildId = xId->getContentIdentifier(); if ( ( aChildId.lastIndexOf( '/' ) + 1 ) != aChildId.getLength() ) - aChildId += rtl::OUString("/"); + aChildId += OUString("/"); aChildId += rResult.getName(); ucb::TransferInfo aInfo; aInfo.MoveData = sal_False; - aInfo.NewTitle = rtl::OUString(); + aInfo.NewTitle = OUString(); aInfo.SourceURL = aChildId; aInfo.NameClash = rInfo.NameClash; @@ -1830,7 +1830,7 @@ void HierarchyContent::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( xSource->m_xIdentifier-> @@ -1840,7 +1840,7 @@ void HierarchyContent::transfer( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot remove persistent data of source object!" ), + OUString( "Cannot remove persistent data of source object!" ), this ); // Unreachable } @@ -1867,34 +1867,34 @@ HierarchyContentProperties::getCreatableContentsInfo() const // Folder. aSeq.getArray()[ 0 ].Type - = rtl::OUString( HIERARCHY_FOLDER_CONTENT_TYPE ); + = OUString( HIERARCHY_FOLDER_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; uno::Sequence< beans::Property > aFolderProps( 1 ); aFolderProps.getArray()[ 0 ] = beans::Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); aSeq.getArray()[ 0 ].Properties = aFolderProps; // Link. aSeq.getArray()[ 1 ].Type - = rtl::OUString( HIERARCHY_LINK_CONTENT_TYPE ); + = OUString( HIERARCHY_LINK_CONTENT_TYPE ); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::KIND_LINK; uno::Sequence< beans::Property > aLinkProps( 2 ); aLinkProps.getArray()[ 0 ] = beans::Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); aLinkProps.getArray()[ 1 ] = beans::Property( - rtl::OUString("TargetURL"), + OUString("TargetURL"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); aSeq.getArray()[ 1 ].Properties = aLinkProps; diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index eb333ee7c98c..92091332a9cc 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -62,28 +62,28 @@ public: HierarchyContentProperties( const HierarchyEntryData::Type & rType ) : m_aData( rType ), m_aContentType( rType == HierarchyEntryData::FOLDER - ? rtl::OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) - : rtl::OUString( HIERARCHY_LINK_CONTENT_TYPE ) ) {} + ? OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) + : OUString( HIERARCHY_LINK_CONTENT_TYPE ) ) {} HierarchyContentProperties( const HierarchyEntryData & rData ) : m_aData( rData ), m_aContentType( rData.getType() == HierarchyEntryData::FOLDER - ? rtl::OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) - : rtl::OUString( HIERARCHY_LINK_CONTENT_TYPE ) ) {} + ? OUString( HIERARCHY_FOLDER_CONTENT_TYPE ) + : OUString( HIERARCHY_LINK_CONTENT_TYPE ) ) {} - const rtl::OUString & getName() const { return m_aData.getName(); } - void setName( const rtl::OUString & rName ) { m_aData.setName( rName ); }; + const OUString & getName() const { return m_aData.getName(); } + void setName( const OUString & rName ) { m_aData.setName( rName ); }; - const rtl::OUString & getTitle() const { return m_aData.getTitle(); } - void setTitle( const rtl::OUString & rTitle ) + const OUString & getTitle() const { return m_aData.getTitle(); } + void setTitle( const OUString & rTitle ) { m_aData.setTitle( rTitle ); }; - const rtl::OUString & getTargetURL() const + const OUString & getTargetURL() const { return m_aData.getTargetURL(); } - void setTargetURL( const rtl::OUString & rURL ) + void setTargetURL( const OUString & rURL ) { m_aData.setTargetURL( rURL ); }; - const rtl::OUString & getContentType() const { return m_aContentType; } + const OUString & getContentType() const { return m_aContentType; } sal_Bool getIsFolder() const { return m_aData.getType() == HierarchyEntryData::FOLDER; } @@ -97,7 +97,7 @@ public: private: HierarchyEntryData m_aData; - rtl::OUString m_aContentType; + OUString m_aContentType; }; //========================================================================= @@ -143,7 +143,7 @@ private: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); static sal_Bool hasData( const com::sun::star::uno::Reference< @@ -178,7 +178,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > - makeNewIdentifier( const rtl::OUString& rTitle ); + makeNewIdentifier( const OUString& rTitle ); typedef rtl::Reference< HierarchyContent > HierarchyContentRef; typedef std::list< HierarchyContentRef > HierarchyContentRefList; @@ -241,15 +241,15 @@ public: XTYPEPROVIDER_DECL() // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XContent - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< @@ -295,7 +295,7 @@ public: ::com::sun::star::beans::Property >& rProperties, const HierarchyContentProperties& rData, HierarchyContentProvider* pProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); }; } // namespace hierarchy_ucp diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx index 96aa7dad4faf..f440f6ba0b9a 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx @@ -102,30 +102,30 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), @@ -133,14 +133,14 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "TargetURL" ), + OUString( "TargetURL" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -161,43 +161,43 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), /////////////////////////////////////////////////////////// // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "TargetURL" ), + OUString( "TargetURL" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -227,30 +227,30 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), @@ -258,7 +258,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -279,37 +279,37 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), /////////////////////////////////////////////////////////// // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -340,30 +340,30 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), @@ -371,7 +371,7 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -409,23 +409,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -449,23 +449,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -475,12 +475,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuVoidType() ) @@ -507,23 +507,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -533,7 +533,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -552,23 +552,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -578,28 +578,28 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "createNewContent" ), + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) @@ -626,23 +626,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -652,7 +652,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -671,23 +671,23 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -697,18 +697,18 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "createNewContent" ), + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index bac029246a21..05eb221b2ccb 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -51,14 +51,14 @@ struct HierarchyEntry::iterator_Impl HierarchyEntryData entry; uno::Reference< container::XHierarchicalNameAccess > dir; uno::Reference< util::XOfficeInstallationDirectories > officeDirs; - uno::Sequence< rtl::OUString> names; + uno::Sequence< OUString> names; sal_Int32 pos; iterator_Impl() : officeDirs( 0 ), pos( -1 /* before first */ ) {}; }; //========================================================================= -void makeXMLName( const rtl::OUString & rIn, rtl::OUStringBuffer & rBuffer ) +void makeXMLName( const OUString & rIn, OUStringBuffer & rBuffer ) { sal_Int32 nCount = rIn.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -111,7 +111,7 @@ void makeXMLName( const rtl::OUString & rIn, rtl::OUStringBuffer & rBuffer ) HierarchyEntry::HierarchyEntry( const uno::Reference< uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, - const rtl::OUString& rURL ) + const OUString& rURL ) : m_xContext( rxContext ), m_xOfficeInstDirs( pProvider->getOfficeInstallationDirectories() ), m_bTriedToGetRootReadAccess( sal_False ) @@ -169,8 +169,8 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) if ( xRootReadAccess.is() ) { - rtl::OUString aTitlePath = m_aPath; - aTitlePath += rtl::OUString("/Title"); + OUString aTitlePath = m_aPath; + aTitlePath += OUString("/Title"); // Note: Avoid NoSuchElementExceptions, because exceptions are // relatively 'expensive'. Checking for availability of @@ -179,7 +179,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) if ( !xRootReadAccess->hasByHierarchicalName( aTitlePath ) ) return sal_False; - rtl::OUString aValue; + OUString aValue; // Get Title value. if ( !( xRootReadAccess->getByHierarchicalName( aTitlePath ) @@ -193,8 +193,8 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) rData.setTitle( aValue ); // Get TargetURL value. - rtl::OUString aTargetURLPath = m_aPath; - aTargetURLPath += rtl::OUString("/TargetURL"); + OUString aTargetURLPath = m_aPath; + aTargetURLPath += OUString("/TargetURL"); if ( !( xRootReadAccess->getByHierarchicalName( aTargetURLPath ) >>= aValue ) ) { @@ -212,8 +212,8 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData ) aValue = m_xOfficeInstDirs->makeAbsoluteURL( aValue ); rData.setTargetURL( aValue ); - rtl::OUString aTypePath = m_aPath; - aTypePath += rtl::OUString("/Type"); + OUString aTypePath = m_aPath; + aTypePath += OUString("/Type"); if ( xRootReadAccess->hasByHierarchicalName( aTypePath ) ) { // Might not be present since it was introduced long after @@ -276,7 +276,7 @@ sal_Bool HierarchyEntry::setData( { // Create parent's key. It must exist! - rtl::OUString aParentPath; + OUString aParentPath; sal_Bool bRoot = sal_True; sal_Int32 nPos = m_aPath.lastIndexOf( '/' ); @@ -295,13 +295,13 @@ sal_Bool HierarchyEntry::setData( uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = rtl::OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); aProperty.Value <<= aParentPath; aArguments[ 0 ] <<= aProperty; uno::Reference< util::XChangesBatch > xBatch( m_xConfigProvider->createInstanceWithArguments( - rtl::OUString( READWRITE_SERVICE_NAME ), + OUString( READWRITE_SERVICE_NAME ), aArguments ), uno::UNO_QUERY ); @@ -332,7 +332,7 @@ sal_Bool HierarchyEntry::setData( else { xParentNameAccess->getByName( - rtl::OUString("Children") ) + OUString("Children") ) >>= xNameAccess; } @@ -380,7 +380,7 @@ sal_Bool HierarchyEntry::setData( // Append new entry to parents child list, // which is a set of entries. xParentNameAccess->getByName( - rtl::OUString( "Children" ) ) >>= xFac; + OUString( "Children" ) ) >>= xFac; } OSL_ENSURE( xFac.is(), @@ -411,7 +411,7 @@ sal_Bool HierarchyEntry::setData( { // Set Title value. xNameReplace->replaceByName( - rtl::OUString("Title"), + OUString("Title"), uno::makeAny( rData.getTitle() ) ); // Set TargetURL value. @@ -421,20 +421,20 @@ sal_Bool HierarchyEntry::setData( // installation, the path to the office installtion // directory must never be stored directly. Use a // placeholder instead. - rtl::OUString aValue( rData.getTargetURL() ); + OUString aValue( rData.getTargetURL() ); if ( m_xOfficeInstDirs.is() && !aValue.isEmpty() ) aValue = m_xOfficeInstDirs->makeRelocatableURL( aValue ); xNameReplace->replaceByName( - rtl::OUString("TargetURL"), + OUString("TargetURL"), uno::makeAny( aValue ) ); // Set Type value. sal_Int32 nType = rData.getType() == HierarchyEntryData::LINK ? 0 : 1; xNameReplace->replaceByName( - rtl::OUString("Type"), + OUString("Type"), uno::makeAny( nType ) ); if ( xContainer.is() ) @@ -493,11 +493,11 @@ sal_Bool HierarchyEntry::setData( //========================================================================= sal_Bool HierarchyEntry::move( - const rtl::OUString& rNewURL, const HierarchyEntryData& rData ) + const OUString& rNewURL, const HierarchyEntryData& rData ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - rtl::OUString aNewPath = createPathFromHierarchyURL( rNewURL ); + OUString aNewPath = createPathFromHierarchyURL( rNewURL ); if ( aNewPath == m_aPath ) return sal_True; @@ -505,7 +505,7 @@ sal_Bool HierarchyEntry::move( sal_Bool bOldRoot = sal_True; uno::Reference< util::XChangesBatch > xOldParentBatch; - rtl::OUString aNewKey; + OUString aNewKey; sal_Int32 nURLPos = rNewURL.lastIndexOf( '/' ); if ( nURLPos > HIERARCHY_URL_SCHEME_LENGTH ) aNewKey = rNewURL.copy( nURLPos + 1 ); @@ -530,7 +530,7 @@ sal_Bool HierarchyEntry::move( if ( !m_xConfigProvider.is() ) return sal_False; - rtl::OUString aOldParentPath; + OUString aOldParentPath; sal_Int32 nPos = m_aPath.lastIndexOf( '/' ); if ( nPos != -1 ) { @@ -543,7 +543,7 @@ sal_Bool HierarchyEntry::move( bOldRoot = sal_False; } - rtl::OUString aNewParentPath; + OUString aNewParentPath; nPos = aNewPath.lastIndexOf( '/' ); if ( nPos != -1 ) { @@ -559,13 +559,13 @@ sal_Bool HierarchyEntry::move( uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = rtl::OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); aProperty.Value <<= aOldParentPath; aArguments[ 0 ] <<= aProperty; xOldParentBatch = uno::Reference< util::XChangesBatch >( m_xConfigProvider->createInstanceWithArguments( - rtl::OUString( READWRITE_SERVICE_NAME ), + OUString( READWRITE_SERVICE_NAME ), aArguments ), uno::UNO_QUERY ); @@ -583,13 +583,13 @@ sal_Bool HierarchyEntry::move( { bDifferentParents = sal_True; - aProperty.Name = rtl::OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); aProperty.Value <<= aNewParentPath; aArguments[ 0 ] <<= aProperty; xNewParentBatch = uno::Reference< util::XChangesBatch >( m_xConfigProvider->createInstanceWithArguments( - rtl::OUString( READWRITE_SERVICE_NAME ), + OUString( READWRITE_SERVICE_NAME ), aArguments ), uno::UNO_QUERY ); @@ -640,7 +640,7 @@ sal_Bool HierarchyEntry::move( else { xOldParentNameAccess->getByName( - rtl::OUString("Children") ) + OUString("Children") ) >>= xOldNameContainer; } @@ -719,7 +719,7 @@ sal_Bool HierarchyEntry::move( else { xNewParentNameAccess->getByName( - rtl::OUString("Children") ) + OUString("Children") ) >>= xNewNameContainer; } } @@ -730,7 +730,7 @@ sal_Bool HierarchyEntry::move( return sal_False; xNewNameReplace->replaceByName( - rtl::OUString("Title"), + OUString("Title"), uno::makeAny( rData.getTitle() ) ); // TargetURL property may contain a reference to the Office @@ -738,15 +738,15 @@ sal_Bool HierarchyEntry::move( // installation, the path to the office installtion // directory must never be stored directly. Use a placeholder // instead. - rtl::OUString aValue( rData.getTargetURL() ); + OUString aValue( rData.getTargetURL() ); if ( m_xOfficeInstDirs.is() && !aValue.isEmpty() ) aValue = m_xOfficeInstDirs->makeRelocatableURL( aValue ); xNewNameReplace->replaceByName( - rtl::OUString("TargetURL"), + OUString("TargetURL"), uno::makeAny( aValue ) ); sal_Int32 nType = rData.getType() == HierarchyEntryData::LINK ? 0 : 1; xNewNameReplace->replaceByName( - rtl::OUString("Type"), + OUString("Type"), uno::makeAny( nType ) ); xNewNameContainer->insertByName( aNewKey, aEntry ); @@ -801,7 +801,7 @@ sal_Bool HierarchyEntry::remove() { // Create parent's key. It must exist! - rtl::OUString aParentPath; + OUString aParentPath; sal_Bool bRoot = sal_True; sal_Int32 nPos = m_aPath.lastIndexOf( '/' ); @@ -820,13 +820,13 @@ sal_Bool HierarchyEntry::remove() uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = rtl::OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); aProperty.Value <<= aParentPath; aArguments[ 0 ] <<= aProperty; uno::Reference< util::XChangesBatch > xBatch( m_xConfigProvider->createInstanceWithArguments( - rtl::OUString( READWRITE_SERVICE_NAME ), + OUString( READWRITE_SERVICE_NAME ), aArguments ), uno::UNO_QUERY ); @@ -856,7 +856,7 @@ sal_Bool HierarchyEntry::remove() // Append new entry to parents child list, // which is a set of entries. xParentNameAccess->getByName( - rtl::OUString("Children") ) + OUString("Children") ) >>= xContainer; } @@ -920,8 +920,8 @@ sal_Bool HierarchyEntry::first( iterator& it ) if ( !m_aPath.isEmpty() ) { - rtl::OUString aPath = m_aPath; - aPath += rtl::OUString("/Children"); + OUString aPath = m_aPath; + aPath += OUString("/Children"); xRootHierNameAccess->getByHierarchicalName( aPath ) >>= xNameAccess; @@ -986,19 +986,19 @@ sal_Bool HierarchyEntry::next( iterator& it ) } //========================================================================= -rtl::OUString HierarchyEntry::createPathFromHierarchyURL( +OUString HierarchyEntry::createPathFromHierarchyURL( const HierarchyUri& rURI ) { // Transform path.... // folder/subfolder/subsubfolder // --> ['folder']/Children/['subfolder']/Children/['subsubfolder'] - const rtl::OUString aPath = rURI.getPath().copy( 1 ); // skip leading slash. + const OUString aPath = rURI.getPath().copy( 1 ); // skip leading slash. sal_Int32 nLen = aPath.getLength(); if ( nLen ) { - rtl::OUStringBuffer aNewPath; + OUStringBuffer aNewPath; aNewPath.appendAscii( "['" ); sal_Int32 nStart = 0; @@ -1009,7 +1009,7 @@ rtl::OUString HierarchyEntry::createPathFromHierarchyURL( if ( nEnd == -1 ) nEnd = nLen; - rtl::OUString aToken = aPath.copy( nStart, nEnd - nStart ); + OUString aToken = aPath.copy( nStart, nEnd - nStart ); makeXMLName( aToken, aNewPath ); if ( nEnd != nLen ) @@ -1059,9 +1059,9 @@ HierarchyEntry::getRootReadAccess() uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = rtl::OUString( + aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); - aProperty.Value <<= rtl::OUString(); // root path + aProperty.Value <<= OUString(); // root path aArguments[ 0 ] <<= aProperty; m_bTriedToGetRootReadAccess = sal_True; @@ -1069,7 +1069,7 @@ HierarchyEntry::getRootReadAccess() m_xRootReadAccess = uno::Reference< container::XHierarchicalNameAccess >( m_xConfigProvider->createInstanceWithArguments( - rtl::OUString( READ_SERVICE_NAME ), + OUString( READ_SERVICE_NAME ), aArguments ), uno::UNO_QUERY ); } @@ -1118,20 +1118,20 @@ const HierarchyEntryData& HierarchyEntry::iterator::operator*() const { try { - rtl::OUStringBuffer aKey; + OUStringBuffer aKey; aKey.appendAscii( "['" ); makeXMLName( m_pImpl->names.getConstArray()[ m_pImpl->pos ], aKey ); aKey.appendAscii( "']" ); - rtl::OUString aTitle = aKey.makeStringAndClear(); - rtl::OUString aTargetURL = aTitle; - rtl::OUString aType = aTitle; + OUString aTitle = aKey.makeStringAndClear(); + OUString aTargetURL = aTitle; + OUString aType = aTitle; - aTitle += rtl::OUString("/Title"); - aTargetURL += rtl::OUString("/TargetURL"); - aType += rtl::OUString("/Type"); + aTitle += OUString("/Title"); + aTargetURL += OUString("/TargetURL"); + aType += OUString("/Type"); - rtl::OUString aValue; + OUString aValue; m_pImpl->dir->getByHierarchicalName( aTitle ) >>= aValue; m_pImpl->entry.setTitle( aValue ); diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx index 9c93957fb102..e494c08a7b77 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx @@ -47,14 +47,14 @@ public: HierarchyEntryData() : m_aType( NONE ) {} HierarchyEntryData( const Type & rType ) : m_aType( rType ) {} - const rtl::OUString & getName() const { return m_aName; } - void setName( const rtl::OUString & rName ) { m_aName = rName; } + const OUString & getName() const { return m_aName; } + void setName( const OUString & rName ) { m_aName = rName; } - const rtl::OUString & getTitle() const { return m_aTitle; } - void setTitle( const rtl::OUString & rTitle ) { m_aTitle = rTitle; } + const OUString & getTitle() const { return m_aTitle; } + void setTitle( const OUString & rTitle ) { m_aTitle = rTitle; } - const rtl::OUString & getTargetURL() const { return m_aTargetURL; } - void setTargetURL( const rtl::OUString & rURL ) { m_aTargetURL = rURL; } + const OUString & getTargetURL() const { return m_aTargetURL; } + void setTargetURL( const OUString & rURL ) { m_aTargetURL = rURL; } Type getType() const { return ( m_aType != NONE ) ? m_aType @@ -64,9 +64,9 @@ public: void setType( const Type & rType ) { m_aType = rType; } private: - rtl::OUString m_aName; // Name (language independent) - rtl::OUString m_aTitle; // Title (language dependent) - rtl::OUString m_aTargetURL; // Target URL ( links only ) + OUString m_aName; // Name (language independent) + OUString m_aTitle; // Title (language dependent) + OUString m_aTargetURL; // Target URL ( links only ) Type m_aType; // Type }; @@ -77,9 +77,9 @@ class HierarchyUri; class HierarchyEntry { - ::rtl::OUString m_aServiceSpecifier; - ::rtl::OUString m_aName; - ::rtl::OUString m_aPath; + OUString m_aServiceSpecifier; + OUString m_aName; + OUString m_aPath; ::osl::Mutex m_aMutex; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; @@ -94,7 +94,7 @@ class HierarchyEntry sal_Bool m_bTriedToGetRootReadAccess; // #82494# private: - ::rtl::OUString createPathFromHierarchyURL( const HierarchyUri & rURI ); + OUString createPathFromHierarchyURL( const HierarchyUri & rURI ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > getRootReadAccess(); @@ -103,7 +103,7 @@ public: HierarchyEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, HierarchyContentProvider* pProvider, - const ::rtl::OUString& rURL ); + const OUString& rURL ); sal_Bool hasData(); @@ -111,7 +111,7 @@ public: sal_Bool setData( const HierarchyEntryData& rData, sal_Bool bCreate ); - sal_Bool move( const ::rtl::OUString& rNewURL, + sal_Bool move( const OUString& rNewURL, const HierarchyEntryData& rData ); sal_Bool remove(); diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index a6fd1d376ca1..2f10717cc9ce 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -130,28 +130,28 @@ public: // XHierarchicalNameAccess virtual uno::Any SAL_CALL - getByHierarchicalName( const rtl::OUString & aName ) + getByHierarchicalName( const OUString & aName ) throw ( container::NoSuchElementException, uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByHierarchicalName( const rtl::OUString & aName ) + hasByHierarchicalName( const OUString & aName ) throw ( uno::RuntimeException ); // XNameContainer virtual void SAL_CALL - insertByName( const rtl::OUString & aName, const uno::Any & aElement ) + insertByName( const OUString & aName, const uno::Any & aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException ); virtual void SAL_CALL - removeByName( const rtl::OUString & Name ) + removeByName( const OUString & Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ); // XNameReplace ( base of XNameContainer ) virtual void SAL_CALL - replaceByName( const rtl::OUString & aName, const uno::Any & aElement ) + replaceByName( const OUString & aName, const uno::Any & aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, @@ -159,15 +159,15 @@ public: // XNameAccess ( base of XNameReplace ) virtual uno::Any SAL_CALL - getByName( const rtl::OUString & aName ) + getByName( const OUString & aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ); - virtual uno::Sequence< rtl::OUString > SAL_CALL + virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw ( uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByName( const rtl::OUString & aName ) + hasByName( const OUString & aName ) throw ( uno::RuntimeException ); // XElementAccess ( base of XNameAccess ) @@ -257,11 +257,11 @@ XTYPEPROVIDER_IMPL_4( HierarchyDataSource, //========================================================================= XSERVICEINFO_IMPL_0_CTX( HierarchyDataSource, - rtl::OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) ) + OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) ) { - uno::Sequence< rtl::OUString > aSNS( 2 ); - aSNS[ 0 ] = rtl::OUString( "com.sun.star.ucb.DefaultHierarchyDataSource" ); - aSNS[ 1 ] = rtl::OUString( "com.sun.star.ucb.HierarchyDataSource" ); + uno::Sequence< OUString > aSNS( 2 ); + aSNS[ 0 ] = OUString( "com.sun.star.ucb.DefaultHierarchyDataSource" ); + aSNS[ 1 ] = OUString( "com.sun.star.ucb.HierarchyDataSource" ); return aSNS; } @@ -322,14 +322,14 @@ void SAL_CALL HierarchyDataSource::removeEventListener( // virtual uno::Reference< uno::XInterface > SAL_CALL -HierarchyDataSource::createInstance( const rtl::OUString & aServiceSpecifier ) +HierarchyDataSource::createInstance( const OUString & aServiceSpecifier ) throw ( uno::Exception, uno::RuntimeException ) { // Create view to root node. beans::PropertyValue aProp; - aProp.Name = rtl::OUString( CFGPROPERTY_NODEPATH ); - aProp.Value <<= rtl::OUString( CONFIG_DATA_ROOT_KEY ); + aProp.Name = OUString( CFGPROPERTY_NODEPATH ); + aProp.Value <<= OUString( CONFIG_DATA_ROOT_KEY ); uno::Sequence< uno::Any > aArguments( 1 ); aArguments[ 0 ] <<= aProp; @@ -341,7 +341,7 @@ HierarchyDataSource::createInstance( const rtl::OUString & aServiceSpecifier ) // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstanceWithArguments( - const rtl::OUString & ServiceSpecifier, + const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments ) throw ( uno::Exception, uno::RuntimeException ) { @@ -350,13 +350,13 @@ HierarchyDataSource::createInstanceWithArguments( //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL HierarchyDataSource::getAvailableServiceNames() throw ( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aNames( 2 ); - aNames[ 0 ] = rtl::OUString( READ_SERVICE_NAME ); - aNames[ 1 ] = rtl::OUString( READWRITE_SERVICE_NAME ); + uno::Sequence< OUString > aNames( 2 ); + aNames[ 0 ] = OUString( READ_SERVICE_NAME ); + aNames[ 1 ] = OUString( READWRITE_SERVICE_NAME ); return aNames; } @@ -368,7 +368,7 @@ HierarchyDataSource::getAvailableServiceNames() uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstanceWithArguments( - const rtl::OUString & ServiceSpecifier, + const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments, bool bCheckArgs ) throw ( uno::Exception, uno::RuntimeException ) @@ -402,13 +402,13 @@ HierarchyDataSource::createInstanceWithArguments( { if ( aProp.Name == CFGPROPERTY_NODEPATH ) { - rtl::OUString aPath; + OUString aPath; if ( aProp.Value >>= aPath ) { bHasNodePath = true; // Create path to data inside the configuration. - rtl::OUString aConfigPath; + OUString aConfigPath; if ( !createConfigPath( aPath, aConfigPath ) ) { OSL_FAIL( "HierarchyDataSource::" @@ -471,7 +471,7 @@ HierarchyDataSource::createInstanceWithArguments( { // Create configuration read-only access object. xConfigAccess = xProv->createInstanceWithArguments( - rtl::OUString( CONFIG_READ_SERVICE_NAME ), + OUString( CONFIG_READ_SERVICE_NAME ), aNewArgs ); } else @@ -483,14 +483,14 @@ HierarchyDataSource::createInstanceWithArguments( aNewArgs.realloc( nLen + 1 ); beans::PropertyValue aProp; - aProp.Name = rtl::OUString( CFGPROPERTY_LAZYWRITE ); + aProp.Name = OUString( CFGPROPERTY_LAZYWRITE ); aProp.Value <<= sal_True; aNewArgs[ nLen ] <<= aProp; } // Create configuration read-write access object. xConfigAccess = xProv->createInstanceWithArguments( - rtl::OUString( CONFIG_READWRITE_SERVICE_NAME ), + OUString( CONFIG_READWRITE_SERVICE_NAME ), aNewArgs ); } } @@ -539,7 +539,7 @@ HierarchyDataSource::getConfigProvider() //========================================================================= bool HierarchyDataSource::createConfigPath( - const rtl::OUString & rInPath, rtl::OUString & rOutPath ) + const OUString & rInPath, OUString & rOutPath ) { if ( !rInPath.isEmpty() ) { @@ -557,14 +557,14 @@ bool HierarchyDataSource::createConfigPath( return false; } - rtl::OUString aOutPath( + OUString aOutPath( CONFIG_DATA_ROOT_KEY "/" ); aOutPath += rInPath; rOutPath = aOutPath; } else { - rOutPath = rtl::OUString( CONFIG_DATA_ROOT_KEY ); + rOutPath = OUString( CONFIG_DATA_ROOT_KEY ); } return true; @@ -726,11 +726,11 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() XSERVICEINFO_NOFACTORY_IMPL_0( HierarchyDataAccess, - rtl::OUString( "com.sun.star.comp.ucb.HierarchyDataAccess" ) ) + OUString( "com.sun.star.comp.ucb.HierarchyDataAccess" ) ) { - uno::Sequence< rtl::OUString > aSNS( 2 ); - aSNS[ 0 ] = rtl::OUString( READ_SERVICE_NAME ); - aSNS[ 1 ] = rtl::OUString( READWRITE_SERVICE_NAME ); + uno::Sequence< OUString > aSNS( 2 ); + aSNS[ 0 ] = OUString( READ_SERVICE_NAME ); + aSNS[ 1 ] = OUString( READWRITE_SERVICE_NAME ); return aSNS; } @@ -788,7 +788,7 @@ void SAL_CALL HierarchyDataAccess::removeEventListener( // virtual uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( - const rtl::OUString & aName ) + const OUString & aName ) throw ( container::NoSuchElementException, uno::RuntimeException ) { uno::Reference< container::XHierarchicalNameAccess > xOrig @@ -803,7 +803,7 @@ uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( //========================================================================= // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( - const rtl::OUString & aName ) + const OUString & aName ) throw ( uno::RuntimeException ) { uno::Reference< container::XHierarchicalNameAccess > xOrig @@ -822,7 +822,7 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( //========================================================================= // virtual -uno::Any SAL_CALL HierarchyDataAccess::getByName( const rtl::OUString & aName ) +uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -837,7 +837,7 @@ uno::Any SAL_CALL HierarchyDataAccess::getByName( const rtl::OUString & aName ) //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL HierarchyDataAccess::getElementNames() +uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames() throw ( uno::RuntimeException ) { uno::Reference< container::XNameAccess > xOrig @@ -850,7 +850,7 @@ uno::Sequence< rtl::OUString > SAL_CALL HierarchyDataAccess::getElementNames() //========================================================================= // virtual -sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const rtl::OUString & aName ) +sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) throw ( uno::RuntimeException ) { uno::Reference< container::XNameAccess > xOrig @@ -966,7 +966,7 @@ HierarchyDataAccess::createInstanceWithArguments( // virtual void SAL_CALL -HierarchyDataAccess::insertByName( const rtl::OUString & aName, +HierarchyDataAccess::insertByName( const OUString & aName, const uno::Any & aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, @@ -984,7 +984,7 @@ HierarchyDataAccess::insertByName( const rtl::OUString & aName, //========================================================================= // virtual void SAL_CALL -HierarchyDataAccess::removeByName( const rtl::OUString & Name ) +HierarchyDataAccess::removeByName( const OUString & Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1004,7 +1004,7 @@ HierarchyDataAccess::removeByName( const rtl::OUString & Name ) //========================================================================= // virtual -void SAL_CALL HierarchyDataAccess::replaceByName( const rtl::OUString & aName, +void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, const uno::Any & aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index 65b00d3d6ea4..752e8a659aa0 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -79,17 +79,17 @@ public: // XMultiServiceFactory virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL - createInstance( const rtl::OUString & aServiceSpecifier ) + createInstance( const OUString & aServiceSpecifier ) throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL - createInstanceWithArguments( const rtl::OUString & ServiceSpecifier, + createInstanceWithArguments( const OUString & ServiceSpecifier, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & Arguments ) throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw ( com::sun::star::uno::RuntimeException ); @@ -98,7 +98,7 @@ public: private: com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL - createInstanceWithArguments( const rtl::OUString & ServiceSpecifier, + createInstanceWithArguments( const OUString & ServiceSpecifier, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & Arguments, bool bCheckArgs ) @@ -110,7 +110,7 @@ private: getConfigProvider(); bool - createConfigPath( const rtl::OUString & rInPath, rtl::OUString & rOutPath ); + createConfigPath( const OUString & rInPath, OUString & rOutPath ); }; } // namespace hierarchy_ucp diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx index f0dd1699ee6c..dcb300bdb479 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx @@ -44,7 +44,7 @@ namespace hierarchy_ucp struct ResultListEntry { - rtl::OUString aId; + OUString aId; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; @@ -131,14 +131,14 @@ HierarchyResultSetDataSupplier::~HierarchyResultSetDataSupplier() //========================================================================= // virtual -rtl::OUString HierarchyResultSetDataSupplier::queryContentIdentifierString( +OUString HierarchyResultSetDataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( nIndex < m_pImpl->m_aResults.size() ) { - rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; if ( !aId.isEmpty() ) { // Already cached. @@ -148,18 +148,18 @@ rtl::OUString HierarchyResultSetDataSupplier::queryContentIdentifierString( if ( getResult( nIndex ) ) { - rtl::OUString aId + OUString aId = m_pImpl->m_xContent->getIdentifier()->getContentIdentifier(); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString("/"); + aId += OUString("/"); aId += m_pImpl->m_aResults[ nIndex ]->aData.getName(); m_pImpl->m_aResults[ nIndex ]->aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -180,7 +180,7 @@ HierarchyResultSetDataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { uno::Reference< ucb::XContentIdentifier > xId diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx index 28c1a5061c46..2b1a5c3f2f76 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx @@ -46,7 +46,7 @@ public: sal_Int32 nOpenMode = com::sun::star::ucb::OpenMode::ALL ); virtual ~HierarchyResultSetDataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 2920d4461dd2..9865d708aab1 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -91,8 +91,8 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, //========================================================================= XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider, - rtl::OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ), - rtl::OUString( HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) ); + OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ), + OUString( HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) ); //========================================================================= // @@ -162,7 +162,7 @@ void SAL_CALL HierarchyContentProvider::initialize( uno::Reference< lang::XMultiServiceFactory > HierarchyContentProvider::getConfigProvider( - const rtl::OUString & rServiceSpecifier ) + const OUString & rServiceSpecifier ) { osl::MutexGuard aGuard( m_aMutex ); ConfigProviderMap::iterator it = m_aConfigProviderMap.find( @@ -201,7 +201,7 @@ HierarchyContentProvider::getConfigProvider( //========================================================================= uno::Reference< container::XHierarchicalNameAccess > HierarchyContentProvider::getRootConfigReadNameAccess( - const rtl::OUString & rServiceSpecifier ) + const OUString & rServiceSpecifier ) { osl::MutexGuard aGuard( m_aMutex ); ConfigProviderMap::iterator it = m_aConfigProviderMap.find( @@ -226,8 +226,8 @@ HierarchyContentProvider::getRootConfigReadNameAccess( { uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = rtl::OUString( "nodepath" ); - aProperty.Value <<= rtl::OUString(); // root path + aProperty.Name = OUString( "nodepath" ); + aProperty.Value <<= OUString(); // root path aArguments[ 0 ] <<= aProperty; (*it).second.bTriedToGetRootReadAccess = true; @@ -235,7 +235,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess( (*it).second.xRootReadAccess = uno::Reference< container::XHierarchicalNameAccess >( xConfigProv->createInstanceWithArguments( - rtl::OUString( "com.sun.star.ucb.HierarchyDataReadAccess" ), + OUString( "com.sun.star.ucb.HierarchyDataReadAccess" ), aArguments ), uno::UNO_QUERY ); } diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index e8e2a5d8f4ab..153651179de6 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -66,7 +66,7 @@ struct ConfigProviderMapEntry struct equalString { bool operator()( - const rtl::OUString& rKey1, const rtl::OUString& rKey2 ) const + const OUString& rKey1, const OUString& rKey2 ) const { return !!( rKey1 == rKey2 ); } @@ -74,7 +74,7 @@ struct equalString struct hashString { - size_t operator()( const rtl::OUString & rName ) const + size_t operator()( const OUString & rName ) const { return rName.hashCode(); } @@ -82,7 +82,7 @@ struct hashString typedef boost::unordered_map < - rtl::OUString, // servcie specifier + OUString, // servcie specifier ConfigProviderMapEntry, hashString, equalString @@ -131,10 +131,10 @@ public: // Non-Interface methods com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > - getConfigProvider( const rtl::OUString & rServiceSpecifier ); + getConfigProvider( const OUString & rServiceSpecifier ); com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > - getRootConfigReadNameAccess( const rtl::OUString & rServiceSpecifier ); + getRootConfigReadNameAccess( const OUString & rServiceSpecifier ); // Note: may retrun an empty reference. com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index f4cbd0ab37ca..23e5d0d316d8 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -50,18 +50,18 @@ void HierarchyUri::init() const if ( !m_aUri.isEmpty() && m_aPath.isEmpty() ) { // Note: Maybe it's a re-init, setUri only resets m_aPath! - m_aService = m_aParentUri = m_aName = rtl::OUString(); + m_aService = m_aParentUri = m_aName = OUString(); // URI must match at least: : if ( ( m_aUri.getLength() < HIERARCHY_URL_SCHEME_LENGTH + 1 ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString("/"); + m_aPath = OUString("/"); return; } // Scheme is case insensitive. - rtl::OUString aScheme + OUString aScheme = m_aUri.copy( 0, HIERARCHY_URL_SCHEME_LENGTH ).toAsciiLowerCase(); if ( aScheme == HIERARCHY_URL_SCHEME ) { @@ -75,8 +75,8 @@ void HierarchyUri::init() const if ( m_aUri.getLength() == HIERARCHY_URL_SCHEME_LENGTH + 1 ) { // root folder URI without path and service specifier. - m_aUri += rtl::OUString( "//" DEFAULT_DATA_SOURCE_SERVICE "/" ); - m_aService = rtl::OUString( DEFAULT_DATA_SOURCE_SERVICE ); + m_aUri += OUString( "//" DEFAULT_DATA_SOURCE_SERVICE "/" ); + m_aService = OUString( DEFAULT_DATA_SOURCE_SERVICE ); nPos = m_aUri.getLength() - 1; } @@ -86,8 +86,8 @@ void HierarchyUri::init() const == sal_Unicode( '/' ) ) ) { // root folder URI without service specifier. - m_aUri += rtl::OUString( "/" DEFAULT_DATA_SOURCE_SERVICE "/" ); - m_aService = rtl::OUString( DEFAULT_DATA_SOURCE_SERVICE ); + m_aUri += OUString( "/" DEFAULT_DATA_SOURCE_SERVICE "/" ); + m_aService = OUString( DEFAULT_DATA_SOURCE_SERVICE ); nPos = m_aUri.getLength() - 1; } @@ -100,8 +100,8 @@ void HierarchyUri::init() const m_aUri = m_aUri.replaceAt( HIERARCHY_URL_SCHEME_LENGTH + 2, 0, - rtl::OUString( "/" DEFAULT_DATA_SOURCE_SERVICE "/" ) ); - m_aService = rtl::OUString( DEFAULT_DATA_SOURCE_SERVICE ); + OUString( "/" DEFAULT_DATA_SOURCE_SERVICE "/" ) ); + m_aService = OUString( DEFAULT_DATA_SOURCE_SERVICE ); nPos = HIERARCHY_URL_SCHEME_LENGTH + 3 + m_aService.getLength(); @@ -118,17 +118,17 @@ void HierarchyUri::init() const if ( nStart == m_aUri.getLength() ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString("/"); + m_aPath = OUString("/"); return; } // Empty path segments? if ( m_aUri.indexOf( - rtl::OUString("//"), + OUString("//"), nStart ) != -1 ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString("/"); + m_aPath = OUString("/"); return; } @@ -138,7 +138,7 @@ void HierarchyUri::init() const if ( nEnd == nStart ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString("/"); + m_aPath = OUString("/"); return; } @@ -146,7 +146,7 @@ void HierarchyUri::init() const { // Trailing slash missing. nEnd = m_aUri.getLength(); - m_aUri += rtl::OUString("/"); + m_aUri += OUString("/"); } m_aService = m_aUri.copy( nStart, nEnd - nStart ); @@ -182,7 +182,7 @@ void HierarchyUri::init() const else { // error, but remember that we did a init(). - m_aPath = rtl::OUString("/"); + m_aPath = OUString("/"); } } } diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx index 8f51ef6d1962..d07432c110b6 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx @@ -33,11 +33,11 @@ namespace hierarchy_ucp { class HierarchyUri { - mutable ::rtl::OUString m_aUri; - mutable ::rtl::OUString m_aParentUri; - mutable ::rtl::OUString m_aService; - mutable ::rtl::OUString m_aPath; - mutable ::rtl::OUString m_aName; + mutable OUString m_aUri; + mutable OUString m_aParentUri; + mutable OUString m_aService; + mutable OUString m_aPath; + mutable OUString m_aName; mutable bool m_bValid; private: @@ -45,28 +45,28 @@ private: public: HierarchyUri() : m_bValid( false ) {} - HierarchyUri( const ::rtl::OUString & rUri ) + HierarchyUri( const OUString & rUri ) : m_aUri( rUri ), m_bValid( false ) {} sal_Bool isValid() const { init(); return m_bValid; } - const ::rtl::OUString & getUri() const + const OUString & getUri() const { init(); return m_aUri; } - void setUri( const ::rtl::OUString & rUri ) - { m_aPath = ::rtl::OUString(); m_aUri = rUri; m_bValid = false; } + void setUri( const OUString & rUri ) + { m_aPath = OUString(); m_aUri = rUri; m_bValid = false; } - const ::rtl::OUString & getParentUri() const + const OUString & getParentUri() const { init(); return m_aParentUri; } - const ::rtl::OUString & getService() const + const OUString & getService() const { init(); return m_aService; } - const ::rtl::OUString & getPath() const + const OUString & getPath() const { init(); return m_aPath; } - const ::rtl::OUString & getName() const + const OUString & getName() const { init(); return m_aName; } inline sal_Bool isRootFolder() const; diff --git a/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx index b39d9ed676e4..1bbe511be5f2 100644 --- a/ucb/source/ucp/inc/urihelper.hxx +++ b/ucb/source/ucp/inc/urihelper.hxx @@ -28,7 +28,7 @@ namespace ucb_impl { namespace urihelper { - inline ::rtl::OUString encodeSegment( const ::rtl::OUString & rSegment ) + inline OUString encodeSegment( const OUString & rSegment ) { return rtl::Uri::encode( rSegment, rtl_UriCharClassPchar, @@ -36,18 +36,18 @@ namespace ucb_impl { namespace urihelper { RTL_TEXTENCODING_UTF8 ); } - inline ::rtl::OUString decodeSegment( const rtl::OUString& rSegment ) + inline OUString decodeSegment( const OUString& rSegment ) { return rtl::Uri::decode( rSegment, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); } - inline ::rtl::OUString encodeURI( const ::rtl::OUString & rURI ) + inline OUString encodeURI( const OUString & rURI ) { - rtl::OUString aFragment; - rtl::OUString aParams; - rtl::OUString aURI; + OUString aFragment; + OUString aParams; + OUString aURI; sal_Int32 nFragment = rURI.lastIndexOf( sal_Unicode( '#' ) ); if ( nFragment != -1 ) @@ -81,7 +81,7 @@ namespace ucb_impl { namespace urihelper { rtl_UriEncodeKeepEscapes, /* #i81690# */ RTL_TEXTENCODING_UTF8 ); - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; sal_Int32 nIndex = 0; do { diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 5453c195b328..d19cccb956e1 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -84,7 +84,7 @@ using namespace package_ucp; //========================================================================= //========================================================================= -ContentProperties::ContentProperties( const rtl::OUString& rContentType ) +ContentProperties::ContentProperties( const OUString& rContentType ) : aContentType( rContentType ), nSize( 0 ), bCompressed( sal_True ), @@ -107,9 +107,9 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const { uno::Sequence< beans::Property > aProps( 1 ); aProps.getArray()[ 0 ] = beans::Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); uno::Sequence< ucb::ContentInfo > aSeq( 2 ); @@ -151,7 +151,7 @@ Content* Content::create( ContentProvider* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier ) { - rtl::OUString aURL = Identifier->getContentIdentifier(); + OUString aURL = Identifier->getContentIdentifier(); PackageUri aURI( aURL ); ContentProperties aProps; uno::Reference< container::XHierarchicalNameAccess > xPackage; @@ -226,14 +226,14 @@ Content* Content::create( //========================================================================= // static -::rtl::OUString Content::getContentType( - const ::rtl::OUString& aScheme, sal_Bool bFolder ) +OUString Content::getContentType( + const OUString& aScheme, sal_Bool bFolder ) { - return ( rtl::OUString("application/") + return ( OUString("application/") + aScheme + ( bFolder - ? rtl::OUString("-folder") - : rtl::OUString("-stream") ) ); + ? OUString("-folder") + : OUString("-stream") ) ); } //========================================================================= @@ -404,22 +404,22 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getImplementationName() +OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( "com.sun.star.comp.ucb.PackageContent" ); + return OUString( "com.sun.star.comp.ucb.PackageContent" ); } //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); if ( isFolder() ) - aSNS.getArray()[ 0 ] = rtl::OUString( PACKAGE_FOLDER_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( PACKAGE_FOLDER_CONTENT_SERVICE_NAME ); else - aSNS.getArray()[ 0 ] = rtl::OUString( PACKAGE_STREAM_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( PACKAGE_STREAM_CONTENT_SERVICE_NAME ); return aSNS; } @@ -431,7 +431,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { return m_aProps.aContentType; @@ -465,7 +465,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -485,7 +485,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -496,7 +496,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "No properties!" ), + OUString( "No properties!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -534,7 +534,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -554,7 +554,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -582,7 +582,7 @@ uno::Any SAL_CALL Content::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -591,7 +591,7 @@ uno::Any SAL_CALL Content::execute( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), Environment, - rtl::OUString( "Cannot remove persistent data!" ), + OUString( "Cannot remove persistent data!" ), this ); // Unreachable } @@ -611,7 +611,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -633,7 +633,7 @@ uno::Any SAL_CALL Content::execute( OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -654,7 +654,7 @@ uno::Any SAL_CALL Content::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -663,7 +663,7 @@ uno::Any SAL_CALL Content::execute( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), Environment, - rtl::OUString( "Cannot write file to disk!" ), + OUString( "Cannot write file to disk!" ), this ); // Unreachable } @@ -676,7 +676,7 @@ uno::Any SAL_CALL Content::execute( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -727,14 +727,14 @@ Content::createNewContent( const ucb::ContentInfo& Info ) getContentType( m_aUri.getScheme(), sal_False ) ) ) return uno::Reference< ucb::XContent >(); - rtl::OUString aURL = m_aUri.getUri(); - aURL += rtl::OUString("/"); + OUString aURL = m_aUri.getUri(); + aURL += OUString("/"); if ( Info.Type.equalsIgnoreAsciiCase( getContentType( m_aUri.getScheme(), sal_True ) ) ) - aURL += rtl::OUString("New_Folder"); + aURL += OUString("New_Folder"); else - aURL += rtl::OUString("New_Stream"); + aURL += OUString("New_Stream"); uno::Reference< ucb::XContentIdentifier > xId( new ::ucbhelper::ContentIdentifier( aURL ) ); @@ -755,7 +755,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { return m_aUri.getParentUri(); } @@ -766,7 +766,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Sequence< beans::Property >& rProperties, ContentProvider* pProvider, - const rtl::OUString& rContentId ) + const OUString& rContentId ) { ContentProperties aData; uno::Reference< container::XHierarchicalNameAccess > xPackage; @@ -805,7 +805,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const ContentProperties& rData, const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, - const rtl::OUString& rContentId ) + const OUString& rContentId ) { // Note: Empty sequence means "get values of all supported properties". @@ -922,22 +922,22 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Append all Core Properties. xRow->appendString ( beans::Property( - rtl::OUString("ContentType"), + OUString("ContentType"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.aContentType ); xRow->appendString( beans::Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), rData.aTitle ); xRow->appendBoolean( beans::Property( - rtl::OUString("IsDocument"), + OUString("IsDocument"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -945,7 +945,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsDocument ); xRow->appendBoolean( beans::Property( - rtl::OUString("IsFolder"), + OUString("IsFolder"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -953,7 +953,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.bIsFolder ); xRow->appendObject( beans::Property( - rtl::OUString("CreatableContentsInfo"), + OUString("CreatableContentsInfo"), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -963,9 +963,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getCreatableContentsInfo( PackageUri( rContentId ) ) ) ); xRow->appendString( beans::Property( - rtl::OUString("MediaType"), + OUString("MediaType"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), rData.aMediaType ); @@ -974,7 +974,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendLong( beans::Property( - rtl::OUString("Size"), + OUString("Size"), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -983,7 +983,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - rtl::OUString("Compressed"), + OUString("Compressed"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND ), @@ -991,7 +991,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xRow->appendBoolean( beans::Property( - rtl::OUString("Encrypted"), + OUString("Encrypted"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND ), @@ -1004,7 +1004,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xRow->appendBoolean( beans::Property( - rtl::OUString("HasEncryptedEntries"), + OUString("HasEncryptedEntries"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -1064,7 +1064,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( sal_Bool bTriedToGetAdditonalPropSet = sal_False; sal_Bool bExchange = sal_False; sal_Bool bStore = sal_False; - rtl::OUString aNewTitle; + OUString aNewTitle; sal_Int32 nTitlePos = -1; for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -1075,7 +1075,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1083,7 +1083,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1091,7 +1091,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1099,7 +1099,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1109,13 +1109,13 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty titles! @@ -1139,7 +1139,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( + OUString( "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); @@ -1149,7 +1149,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1157,7 +1157,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( } else if ( rValue.Name == "MediaType" ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { if ( aNewValue != m_aProps.aMediaType ) @@ -1175,7 +1175,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1184,7 +1184,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1211,7 +1211,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1219,7 +1219,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( + OUString( "Compressed only supported by streams!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1247,7 +1247,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1255,7 +1255,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( + OUString( "Encrypted only supported by streams!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1264,7 +1264,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1296,7 +1296,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1304,7 +1304,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( + OUString( "EncryptionKey not supported by non-root folder!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1358,7 +1358,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString( + OUString( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1370,8 +1370,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Reference< ucb::XContentIdentifier > xOldId = m_xIdentifier; // Assemble new content identifier... - rtl::OUString aNewURL = m_aUri.getParentUri(); - aNewURL += rtl::OUString("/"); + OUString aNewURL = m_aUri.getParentUri(); + aNewURL += OUString("/"); aNewURL += ::ucb_impl::urihelper::encodeSegment( aNewTitle ); uno::Reference< ucb::XContentIdentifier > xNewId = new ::ucbhelper::ContentIdentifier( aNewURL ); @@ -1390,18 +1390,18 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { // Do not set new title! - aNewTitle = rtl::OUString(); + aNewTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString("Exchange failed!"), + OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } if ( !aNewTitle.isEmpty() ) { - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); aEvent.OldValue = uno::makeAny( m_aProps.aTitle ); aEvent.NewValue = uno::makeAny( aNewTitle ); @@ -1422,7 +1422,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> @@ -1432,7 +1432,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( + OUString( "Cannot store persistent data!" ), this ); // Unreachable @@ -1477,7 +1477,7 @@ uno::Any Content::open( // Currently(?) unsupported. ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rArg.Mode ) ) ), xEnv ); @@ -1496,7 +1496,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> @@ -1508,7 +1508,7 @@ uno::Any Content::open( m_eState == PERSISTENT ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - rtl::OUString("Got no data stream!"), + OUString("Got no data stream!"), this ); // Unreachable } @@ -1556,7 +1556,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1568,7 +1568,7 @@ uno::Any Content::open( ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - rtl::OUString( "Got no data stream!" ), + OUString( "Got no data stream!" ), this ); // Unreachable } @@ -1584,7 +1584,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -1621,7 +1621,7 @@ void Content::insert( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingInputStreamException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1633,9 +1633,9 @@ void Content::insert( m_aProps.aTitle = m_aUri.getName(); } - rtl::OUString aNewURL = m_aUri.getParentUri(); + OUString aNewURL = m_aUri.getParentUri(); if (1 + aNewURL.lastIndexOf('/') != aNewURL.getLength()) - aNewURL += rtl::OUString("/"); + aNewURL += OUString("/"); aNewURL += ::ucb_impl::urihelper::encodeSegment( m_aProps.aTitle ); PackageUri aNewUri( aNewURL ); @@ -1648,7 +1648,7 @@ void Content::insert( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, m_aProps.aTitle ) ), @@ -1669,9 +1669,9 @@ void Content::insert( do { - rtl::OUString aNew = aNewUri.getUri(); - aNew += rtl::OUString("_"); - aNew += rtl::OUString::valueOf( ++nTry ); + OUString aNew = aNewUri.getUri(); + aNew += OUString("_"); + aNew += OUString::valueOf( ++nTry ); aNewUri.setUri( aNew ); } while ( hasData( aNewUri ) && ( nTry < 1000 ) ); @@ -1681,7 +1681,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString( "Unable to resolve name clash!" ), + OUString( "Unable to resolve name clash!" ), static_cast< cppu::OWeakObject * >( this ), nNameClashResolve ) ), xEnv ); @@ -1689,8 +1689,8 @@ void Content::insert( } else { - m_aProps.aTitle += rtl::OUString("_"); - m_aProps.aTitle += rtl::OUString::valueOf( nTry ); + m_aProps.aTitle += OUString("_"); + m_aProps.aTitle += OUString::valueOf( nTry ); } } break; @@ -1703,7 +1703,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), nNameClashResolve ) ), xEnv ); @@ -1725,7 +1725,7 @@ void Content::insert( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1734,7 +1734,7 @@ void Content::insert( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString("Cannot store persistent data!"), + OUString("Cannot store persistent data!"), this ); // Unreachable } @@ -1772,7 +1772,7 @@ void Content::destroy( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not persistent!" ), + OUString( "Not persistent!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1814,7 +1814,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not persistent!" ), + OUString( "Not persistent!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1827,15 +1827,15 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable } // Is source not a parent of me / not me? - rtl::OUString aId = m_aUri.getParentUri(); - aId += rtl::OUString("/"); + OUString aId = m_aUri.getParentUri(); + aId += OUString("/"); if ( rInfo.SourceURL.getLength() <= aId.getLength() ) { @@ -1844,7 +1844,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(rInfo.SourceURL), beans::PropertyState_DIRECT_VALUE)); @@ -1852,7 +1852,7 @@ void Content::transfer( ucb::IOErrorCode_RECURSIVE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Target is equal to or is a child of source!" ), + OUString( "Target is equal to or is a child of source!" ), this ); // Unreachable } @@ -1883,7 +1883,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(xId->getContentIdentifier()), beans::PropertyState_DIRECT_VALUE)); @@ -1891,7 +1891,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot instanciate source object!" ), + OUString( "Cannot instanciate source object!" ), this ); // Unreachable } @@ -1900,7 +1900,7 @@ void Content::transfer( // 1) Create new child content. ////////////////////////////////////////////////////////////////////// - rtl::OUString aType = xSource->isFolder() + OUString aType = xSource->isFolder() ? getContentType( m_aUri.getScheme(), sal_True ) : getContentType( m_aUri.getScheme(), sal_False ); ucb::ContentInfo aContentInfo; @@ -1915,7 +1915,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Folder"), + OUString( "Folder"), -1, uno::makeAny(aId), beans::PropertyState_DIRECT_VALUE)); @@ -1923,7 +1923,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_CREATE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "XContentCreator::createNewContent failed!" ), + OUString( "XContentCreator::createNewContent failed!" ), this ); // Unreachable } @@ -2024,7 +2024,7 @@ void Content::transfer( break; } - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); if ( aName.isEmpty() ) { @@ -2032,16 +2032,16 @@ void Content::transfer( break; } - rtl::OUString aChildId = xId->getContentIdentifier(); + OUString aChildId = xId->getContentIdentifier(); if ( ( aChildId.lastIndexOf( '/' ) + 1 ) != aChildId.getLength() ) - aChildId += rtl::OUString("/"); + aChildId += OUString("/"); aChildId += ::ucb_impl::urihelper::encodeSegment( aName ); ucb::TransferInfo aInfo; aInfo.MoveData = sal_False; - aInfo.NewTitle = rtl::OUString(); + aInfo.NewTitle = OUString(); aInfo.SourceURL = aChildId; aInfo.NameClash = rInfo.NameClash; @@ -2072,7 +2072,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( xSource->m_xIdentifier-> @@ -2082,7 +2082,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot remove persistent data of source object!" ), + OUString( "Cannot remove persistent data of source object!" ), this ); // Unreachable } @@ -2116,7 +2116,7 @@ sal_Bool Content::exchangeIdentity( PackageUri aNewUri( xNewId->getContentIdentifier() ); if ( !hasData( aNewUri ) ) { - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); aGuard.clear(); if ( exchange( xNewId ) ) @@ -2139,9 +2139,9 @@ sal_Bool Content::exchangeIdentity( // Create new content identifier for the child... uno::Reference< ucb::XContentIdentifier > xOldChildId = xChild->getIdentifier(); - rtl::OUString aOldChildURL + OUString aOldChildURL = xOldChildId->getContentIdentifier(); - rtl::OUString aNewChildURL + OUString aNewChildURL = aOldChildURL.replaceAt( 0, aOldURL.getLength(), @@ -2173,12 +2173,12 @@ void Content::queryChildren( ContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); OSL_ENSURE( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ), "Content::queryChildren - Invalid URL!" ); - aURL += rtl::OUString("/"); + aURL += OUString("/"); sal_Int32 nLen = aURL.getLength(); @@ -2188,7 +2188,7 @@ void Content::queryChildren( ContentRefList& rChildren ) while ( it != end ) { ::ucbhelper::ContentImplHelperRef xChild = (*it); - rtl::OUString aChildURL + OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? @@ -2292,7 +2292,7 @@ sal_Bool Content::loadData( { uno::Any aHasEncryptedEntries = xPackagePropSet->getPropertyValue( - rtl::OUString( "HasEncryptedEntries" ) ); + OUString( "HasEncryptedEntries" ) ); if ( !( aHasEncryptedEntries >>= rProps.bHasEncryptedEntries ) ) { OSL_FAIL( "Content::loadData - " @@ -2340,7 +2340,7 @@ sal_Bool Content::loadData( { uno::Any aMediaType = xPropSet->getPropertyValue( - rtl::OUString("MediaType") ); + OUString("MediaType") ); if ( !( aMediaType >>= rProps.aMediaType ) ) { OSL_FAIL( "Content::loadData - Got no MediaType value!" ); @@ -2384,7 +2384,7 @@ sal_Bool Content::loadData( { uno::Any aSize = xPropSet->getPropertyValue( - rtl::OUString("Size") ); + OUString("Size") ); if ( !( aSize >>= rProps.nSize ) ) { OSL_FAIL( "Content::loadData - Got no Size value!" ); @@ -2407,7 +2407,7 @@ sal_Bool Content::loadData( { uno::Any aCompressed = xPropSet->getPropertyValue( - rtl::OUString("Compressed") ); + OUString("Compressed") ); if ( !( aCompressed >>= rProps.bCompressed ) ) { OSL_FAIL( "Content::loadData - Got no Compressed value!" ); @@ -2430,7 +2430,7 @@ sal_Bool Content::loadData( { uno::Any aEncrypted = xPropSet->getPropertyValue( - rtl::OUString("Encrypted") ); + OUString("Encrypted") ); if ( !( aEncrypted >>= rProps.bEncrypted ) ) { OSL_FAIL( "Content::loadData - Got no Encrypted value!" ); @@ -2528,7 +2528,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) try { xPackagePropSet->setPropertyValue( - rtl::OUString("EncryptionKey"), + OUString("EncryptionKey"), uno::makeAny( m_aProps.aEncryptionKey ) ); m_nModifiedProps &= ~ENCRYPTIONKEY_MODIFIED; } @@ -2653,7 +2653,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) if ( m_nModifiedProps & MEDIATYPE_MODIFIED ) { xPropSet->setPropertyValue( - rtl::OUString("MediaType"), + OUString("MediaType"), uno::makeAny( m_aProps.aMediaType ) ); m_nModifiedProps &= ~MEDIATYPE_MODIFIED; } @@ -2662,7 +2662,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) { if ( !isFolder() ) xPropSet->setPropertyValue( - rtl::OUString("Compressed"), + OUString("Compressed"), uno::makeAny( m_aProps.bCompressed ) ); m_nModifiedProps &= ~COMPRESSED_MODIFIED; @@ -2672,7 +2672,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) { if ( !isFolder() ) xPropSet->setPropertyValue( - rtl::OUString("Encrypted"), + OUString("Encrypted"), uno::makeAny( m_aProps.bEncrypted ) ); m_nModifiedProps &= ~ENCRYPTED_MODIFIED; @@ -2682,7 +2682,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) { if ( !isFolder() ) xPropSet->setPropertyValue( - rtl::OUString("EncryptionKey"), + OUString("EncryptionKey"), uno::makeAny( m_aProps.aEncryptionKey ) ); m_nModifiedProps &= ~ENCRYPTIONKEY_MODIFIED; diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx index 1d5db315f9a7..1d10ae216588 100644 --- a/ucb/source/ucp/package/pkgcontent.hxx +++ b/ucb/source/ucp/package/pkgcontent.hxx @@ -69,11 +69,11 @@ namespace package_ucp struct ContentProperties { - ::rtl::OUString aTitle; // Title - ::rtl::OUString aContentType; // ContentType + OUString aTitle; // Title + OUString aContentType; // ContentType sal_Bool bIsDocument; // IsDocument sal_Bool bIsFolder; // IsFolder - ::rtl::OUString aMediaType; // MediaType + OUString aMediaType; // MediaType com::sun::star::uno::Sequence < sal_Int8 > aEncryptionKey; // EncryptionKey sal_Int64 nSize; // Size @@ -86,7 +86,7 @@ struct ContentProperties bCompressed( sal_True ), bEncrypted( sal_False ), bHasEncryptedEntries( sal_False ) {} - ContentProperties( const ::rtl::OUString& rContentType ); + ContentProperties( const OUString& rContentType ); com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > getCreatableContentsInfo( PackageUri const & rUri ) const; @@ -139,7 +139,7 @@ private: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > getPropertyValues( const ::com::sun::star::uno::Reference< @@ -149,7 +149,7 @@ private: const ContentProperties& rData, const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > getPropertyValues( const ::com::sun::star::uno::Sequence< @@ -261,15 +261,15 @@ public: XTYPEPROVIDER_DECL() // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XContent - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); @@ -311,15 +311,15 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties, ContentProvider* pProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); // Called from resultset data supplier. ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > getIterator(); - static ::rtl::OUString - getContentType( const ::rtl::OUString& aScheme, sal_Bool bFolder ); + static OUString + getContentType( const OUString& aScheme, sal_Bool bFolder ); }; } diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx index a1261eb565ba..25ed29e6c2d8 100644 --- a/ucb/source/ucp/package/pkgcontentcaps.cxx +++ b/ucb/source/ucp/package/pkgcontentcaps.cxx @@ -103,30 +103,30 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), @@ -134,13 +134,13 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "MediaType" ), + OUString( "MediaType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -152,7 +152,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "HasEncryptedEntries" ), + OUString( "HasEncryptedEntries" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -175,43 +175,43 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), /////////////////////////////////////////////////////////////// // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "MediaType" ), + OUString( "MediaType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -240,50 +240,50 @@ uno::Sequence< beans::Property > Content::getProperties( // Required properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), /////////////////////////////////////////////////////////////// // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "MediaType" ), + OUString( "MediaType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( "Size" ), + OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -295,13 +295,13 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "Compressed" ), + OUString( "Compressed" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND ), beans::Property( - rtl::OUString( "Encrypted" ), + OUString( "Encrypted" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -334,24 +334,24 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -361,19 +361,19 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "createNewContent" ), + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ), @@ -381,7 +381,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "flush" ), + OUString( "flush" ), -1, getCppuVoidType() ) @@ -403,24 +403,24 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -430,29 +430,29 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "createNewContent" ), + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ), @@ -460,7 +460,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // New commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "flush" ), + OUString( "flush" ), -1, getCppuVoidType() ) @@ -483,23 +483,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Required commands /////////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -509,17 +509,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index 74fbaa9f434a..f0e9b8d2f995 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -50,12 +50,12 @@ namespace package_ucp struct ResultListEntry { - rtl::OUString aURL; + OUString aURL; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; - ResultListEntry( const rtl::OUString& rURL ) : aURL( rURL ) {} + ResultListEntry( const OUString& rURL ) : aURL( rURL ) {} }; //========================================================================= @@ -134,13 +134,13 @@ DataSupplier::~DataSupplier() //========================================================================= // virtual -rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( nIndex < m_pImpl->m_aResults.size() ) { - rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aURL; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aURL; if ( !aId.isEmpty() ) { // Already cached. @@ -153,7 +153,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) // Note: getResult fills m_pImpl->m_aResults[ nIndex ]->aURL. return m_pImpl->m_aResults[ nIndex ]->aURL; } - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -174,7 +174,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { uno::Reference< ucb::XContentIdentifier > xId @@ -258,7 +258,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) break; } - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); if ( aName.isEmpty() ) { @@ -267,7 +267,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) } // Assemble URL for child. - rtl::OUString aURL = assembleChildURL( aName ); + OUString aURL = assembleChildURL( aName ); m_pImpl->m_aResults.push_back( new ResultListEntry( aURL ) ); @@ -336,7 +336,7 @@ sal_uInt32 DataSupplier::totalCount() break; } - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); if ( aName.isEmpty() ) { @@ -345,7 +345,7 @@ sal_uInt32 DataSupplier::totalCount() } // Assemble URL for child. - rtl::OUString aURL = assembleChildURL( aName ); + OUString aURL = assembleChildURL( aName ); m_pImpl->m_aResults.push_back( new ResultListEntry( aURL ) ); } @@ -451,10 +451,10 @@ void DataSupplier::validate() } //========================================================================= -::rtl::OUString DataSupplier::assembleChildURL( const ::rtl::OUString& aName ) +OUString DataSupplier::assembleChildURL( const OUString& aName ) { - rtl::OUString aURL; - rtl::OUString aContURL + OUString aURL; + OUString aContURL = m_pImpl->m_xContent->getIdentifier()->getContentIdentifier(); sal_Int32 nParam = aContURL.indexOf( '?' ); if ( nParam >= 0 ) @@ -463,7 +463,7 @@ void DataSupplier::validate() sal_Int32 nPackageUrlEnd = aURL.lastIndexOf( '/' ); if ( nPackageUrlEnd != aURL.getLength() - 1 ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); aURL += ::ucb_impl::urihelper::encodeSegment( aName ); aURL += aContURL.copy( nParam ); @@ -474,7 +474,7 @@ void DataSupplier::validate() sal_Int32 nPackageUrlEnd = aURL.lastIndexOf( '/' ); if ( nPackageUrlEnd != aURL.getLength() - 1 ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); aURL += ::ucb_impl::urihelper::encodeSegment( aName ); } diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx index 871ca6e4cdc7..e8f7ab947d3a 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.hxx +++ b/ucb/source/ucp/package/pkgdatasupplier.hxx @@ -39,7 +39,7 @@ public: sal_Int32 nOpenMode ); virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); @@ -61,7 +61,7 @@ public: virtual void validate() throw( com::sun::star::ucb::ResultSetException ); - ::rtl::OUString assembleChildURL( const ::rtl::OUString& aName ); + OUString assembleChildURL( const OUString& aName ); }; } diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 605851a25869..c27e3f27633d 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -50,12 +50,12 @@ class Package : public cppu::OWeakObject, { friend class ContentProvider; - rtl::OUString m_aName; + OUString m_aName; uno::Reference< container::XHierarchicalNameAccess > m_xNA; ContentProvider* m_pOwner; public: - Package( const rtl::OUString& rName, + Package( const OUString& rName, const uno::Reference< container::XHierarchicalNameAccess > & xNA, ContentProvider* pOwner ) : m_aName( rName ), m_xNA( xNA ), m_pOwner( pOwner ) {} @@ -75,11 +75,11 @@ public: // XHierarchicalNameAccess virtual uno::Any SAL_CALL - getByHierarchicalName( const rtl::OUString& aName ) + getByHierarchicalName( const OUString& aName ) throw( container::NoSuchElementException, uno::RuntimeException ) { return m_xNA->getByHierarchicalName( aName ); } virtual sal_Bool SAL_CALL - hasByHierarchicalName( const rtl::OUString& aName ) + hasByHierarchicalName( const OUString& aName ) throw( uno::RuntimeException ) { return m_xNA->hasByHierarchicalName( aName ); } }; @@ -93,7 +93,7 @@ public: struct equalString { bool operator()( - const rtl::OUString& rKey1, const rtl::OUString& rKey2 ) const + const OUString& rKey1, const OUString& rKey2 ) const { return !!( rKey1 == rKey2 ); } @@ -101,7 +101,7 @@ struct equalString struct hashString { - size_t operator()( const rtl::OUString & rName ) const + size_t operator()( const OUString & rName ) const { return rName.hashCode(); } @@ -109,7 +109,7 @@ struct hashString typedef boost::unordered_map < - rtl::OUString, + OUString, Package*, hashString, equalString @@ -173,8 +173,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString( "com.sun.star.comp.ucb.PackageContentProvider" ), - rtl::OUString( PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) ); + OUString( "com.sun.star.comp.ucb.PackageContentProvider" ), + OUString( PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) ); //========================================================================= // @@ -232,7 +232,7 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( //========================================================================= uno::Reference< container::XHierarchicalNameAccess > -ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString & rParam ) +ContentProvider::createPackage( const OUString & rName, const OUString & rParam ) { osl::MutexGuard aGuard( m_aMutex ); @@ -242,7 +242,7 @@ ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString return uno::Reference< container::XHierarchicalNameAccess >(); } - rtl::OUString rURL = rName + rParam; + OUString rURL = rName + rParam; if ( m_pPackages ) { @@ -297,7 +297,7 @@ ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString } //========================================================================= -sal_Bool ContentProvider::removePackage( const rtl::OUString & rName ) +sal_Bool ContentProvider::removePackage( const OUString & rName ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx index 2f19adfbda09..a2d671f0d142 100644 --- a/ucb/source/ucp/package/pkgprovider.hxx +++ b/ucb/source/ucp/package/pkgprovider.hxx @@ -87,9 +87,9 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > - createPackage( const rtl::OUString & rName, const rtl::OUString & rParam ); + createPackage( const OUString & rName, const OUString & rParam ); sal_Bool - removePackage( const rtl::OUString & rName ); + removePackage( const OUString & rName ); }; } diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index cfa46a17a9db..29e9cd61c404 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -34,7 +34,6 @@ using namespace package_ucp; -using ::rtl::OUString; //========================================================================= //========================================================================= @@ -77,7 +76,7 @@ void PackageUri::init() const if ( ( m_aUri.getLength() < PACKAGE_URL_SCHEME_LENGTH + 4 ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString( "/" ); + m_aPath = OUString( "/" ); return; } @@ -92,11 +91,11 @@ void PackageUri::init() const != sal_Unicode( '/' ) ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString( "/" ); + m_aPath = OUString( "/" ); return; } - rtl::OUString aPureUri; + OUString aPureUri; sal_Int32 nParam = m_aUri.indexOf( '?' ); if( nParam >= 0 ) { @@ -116,8 +115,8 @@ void PackageUri::init() const { m_aParam += ( !m_aParam.isEmpty() - ? ::rtl::OUString( "&purezip" ) - : ::rtl::OUString( "?purezip" ) ); + ? OUString( "&purezip" ) + : OUString( "?purezip" ) ); } aPureUri = aPureUri.replaceAt( 0, @@ -131,7 +130,7 @@ void PackageUri::init() const // Only :/// - Empty authority // error, but remember that we did a init(). - m_aPath = rtl::OUString( "/" ); + m_aPath = OUString( "/" ); return; } else if ( nEnd == ( aPureUri.getLength() - 1 ) ) @@ -142,7 +141,7 @@ void PackageUri::init() const // Only ://// or ://// // error, but remember that we did a init(). - m_aPath = rtl::OUString( "/" ); + m_aPath = OUString( "/" ); return; } @@ -163,7 +162,7 @@ void PackageUri::init() const nStart, aPureUri.getLength() - nStart, aNormPackage ); m_aPackage = ::ucb_impl::urihelper::decodeSegment( aNormPackage ); - m_aPath = rtl::OUString( "/" ); + m_aPath = OUString( "/" ); m_aUri = m_aUri.replaceAt( 0, ( nParam >= 0 ) ? nParam @@ -189,11 +188,11 @@ void PackageUri::init() const if ( m_aPath.indexOf( "//" ) != -1 || m_aPath.indexOf( "%2F" ) != -1 || m_aPath.indexOf( "%2f" ) != -1 - || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( ".." ) ) - || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( "." ) ) ) + || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, OUString( ".." ) ) + || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, OUString( "." ) ) ) { // error, but remember that we did a init(). - m_aPath = rtl::OUString( "/" ); + m_aPath = OUString( "/" ); return; } @@ -230,7 +229,7 @@ void PackageUri::init() const else { // error, but remember that we did a init(). - m_aPath = rtl::OUString( "/" ); + m_aPath = OUString( "/" ); } } } diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx index bbf861338a74..1b5506ab2b77 100644 --- a/ucb/source/ucp/package/pkguri.hxx +++ b/ucb/source/ucp/package/pkguri.hxx @@ -34,13 +34,13 @@ namespace package_ucp { class PackageUri { - mutable ::rtl::OUString m_aUri; - mutable ::rtl::OUString m_aParentUri; - mutable ::rtl::OUString m_aPackage; - mutable ::rtl::OUString m_aPath; - mutable ::rtl::OUString m_aName; - mutable ::rtl::OUString m_aParam; - mutable ::rtl::OUString m_aScheme; + mutable OUString m_aUri; + mutable OUString m_aParentUri; + mutable OUString m_aPackage; + mutable OUString m_aPath; + mutable OUString m_aName; + mutable OUString m_aParam; + mutable OUString m_aScheme; mutable bool m_bValid; private: @@ -48,34 +48,34 @@ private: public: PackageUri() : m_bValid( false ) {} - PackageUri( const ::rtl::OUString & rPackageUri ) + PackageUri( const OUString & rPackageUri ) : m_aUri( rPackageUri ), m_bValid( false ) {} sal_Bool isValid() const { init(); return m_bValid; } - const ::rtl::OUString & getUri() const + const OUString & getUri() const { init(); return m_aUri; } - void setUri( const ::rtl::OUString & rPackageUri ) - { m_aPath = ::rtl::OUString(); m_aUri = rPackageUri; m_bValid = false; } + void setUri( const OUString & rPackageUri ) + { m_aPath = OUString(); m_aUri = rPackageUri; m_bValid = false; } - const ::rtl::OUString & getParentUri() const + const OUString & getParentUri() const { init(); return m_aParentUri; } - const ::rtl::OUString & getPackage() const + const OUString & getPackage() const { init(); return m_aPackage; } - const ::rtl::OUString & getPath() const + const OUString & getPath() const { init(); return m_aPath; } - const ::rtl::OUString & getName() const + const OUString & getName() const { init(); return m_aName; } - const ::rtl::OUString & getParam() const + const OUString & getParam() const { init(); return m_aParam; } - const ::rtl::OUString & getScheme() const + const OUString & getScheme() const { init(); return m_aScheme; } inline sal_Bool isRootFolder() const; diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 025bdd3a05d7..c08faf683959 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -71,7 +71,7 @@ using namespace com::sun::star; using namespace tdoc_ucp; //========================================================================= -static ContentType lcl_getContentType( const rtl::OUString & rType ) +static ContentType lcl_getContentType( const OUString & rType ) { if ( rType == TDOC_ROOT_CONTENT_TYPE ) return ROOT; @@ -153,7 +153,7 @@ Content::Content( const uno::Reference< ucb::XContentIdentifier >& Identifier, const ucb::ContentInfo& Info ) : ContentImplHelper( rxContext, pProvider, Identifier ), - m_aProps( lcl_getContentType( Info.Type ), rtl::OUString() ), // no Title (yet) + m_aProps( lcl_getContentType( Info.Type ), OUString() ), // no Title (yet) m_eState( TRANSIENT ), m_pProvider( pProvider ) { @@ -298,29 +298,29 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getImplementationName() +OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( "com.sun.star.comp.ucb.TransientDocumentsContent" ); + return OUString( "com.sun.star.comp.ucb.TransientDocumentsContent" ); } //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); if ( m_aProps.getType() == STREAM ) - aSNS.getArray()[ 0 ] = rtl::OUString( TDOC_STREAM_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( TDOC_STREAM_CONTENT_SERVICE_NAME ); else if ( m_aProps.getType() == FOLDER ) - aSNS.getArray()[ 0 ] = rtl::OUString( TDOC_FOLDER_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( TDOC_FOLDER_CONTENT_SERVICE_NAME ); else if ( m_aProps.getType() == DOCUMENT ) - aSNS.getArray()[ 0 ] = rtl::OUString( TDOC_DOCUMENT_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( TDOC_DOCUMENT_CONTENT_SERVICE_NAME ); else - aSNS.getArray()[ 0 ] = rtl::OUString( TDOC_ROOT_CONTENT_SERVICE_NAME ); + aSNS.getArray()[ 0 ] = OUString( TDOC_ROOT_CONTENT_SERVICE_NAME ); return aSNS; } @@ -332,7 +332,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -386,7 +386,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -406,7 +406,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -417,7 +417,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "No properties!" ), + OUString( "No properties!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -453,7 +453,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -473,7 +473,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "insert command only supported by " + OUString( "insert command only supported by " "folders and streams!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); @@ -489,7 +489,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "insert command not supported by " + OUString( "insert command not supported by " "streams that are direct children " "of document root!" ), static_cast< cppu::OWeakObject * >( @@ -504,7 +504,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -530,7 +530,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "delete command only supported by " + OUString( "delete command only supported by " "folders and streams!" ), static_cast< cppu::OWeakObject * >( this ) ) ), @@ -549,7 +549,7 @@ uno::Any SAL_CALL Content::execute( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -558,7 +558,7 @@ uno::Any SAL_CALL Content::execute( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), Environment, - rtl::OUString( "Cannot remove persistent data!" ), + OUString( "Cannot remove persistent data!" ), this ); // Unreachable } @@ -580,7 +580,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "transfer command only supported " + OUString( "transfer command only supported " "by folders and documents!" ), static_cast< cppu::OWeakObject * >( this ) ) ), @@ -595,7 +595,7 @@ uno::Any SAL_CALL Content::execute( OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -618,7 +618,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "createNewContent command only " + OUString( "createNewContent command only " "supported by folders and " "documents!" ), static_cast< cppu::OWeakObject * >( @@ -634,7 +634,7 @@ uno::Any SAL_CALL Content::execute( OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -651,7 +651,7 @@ uno::Any SAL_CALL Content::execute( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -711,18 +711,18 @@ Content::createNewContent( const ucb::ContentInfo& Info ) return uno::Reference< ucb::XContent >(); } - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); OSL_ENSURE( !aURL.isEmpty(), "Content::createNewContent - empty identifier!" ); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); if ( bCreateFolder ) - aURL += rtl::OUString("New_Folder"); + aURL += OUString("New_Folder"); else - aURL += rtl::OUString("New_Stream"); + aURL += OUString("New_Stream"); uno::Reference< ucb::XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( aURL ); @@ -738,7 +738,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); Uri aUri( m_xIdentifier->getContentIdentifier() ); @@ -747,13 +747,13 @@ rtl::OUString Content::getParentURL() //========================================================================= uno::Reference< ucb::XContentIdentifier > -Content::makeNewIdentifier( const rtl::OUString& rTitle ) +Content::makeNewIdentifier( const OUString& rTitle ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); // Assemble new content identifier... Uri aUri( m_xIdentifier->getContentIdentifier() ); - rtl::OUStringBuffer aNewURL = aUri.getParentUri(); + OUStringBuffer aNewURL = aUri.getParentUri(); aNewURL.append( ::ucb_impl::urihelper::encodeSegment( rTitle ) ); return @@ -777,13 +777,13 @@ void Content::queryChildren( ContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += rtl::OUString("/"); + aURL += OUString("/"); } sal_Int32 nLen = aURL.getLength(); @@ -794,7 +794,7 @@ void Content::queryChildren( ContentRefList& rChildren ) while ( it != end ) { ::ucbhelper::ContentImplHelperRef xChild = (*it); - rtl::OUString aChildURL + OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? @@ -849,7 +849,7 @@ sal_Bool Content::exchangeIdentity( // Fail, if a content with given id already exists. if ( !hasData( Uri( xNewId->getContentIdentifier() ) ) ) { - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); aGuard.clear(); if ( exchange( xNewId ) ) @@ -871,9 +871,9 @@ sal_Bool Content::exchangeIdentity( // Create new content identifier for the child... uno::Reference< ucb::XContentIdentifier > xOldChildId = xChild->getIdentifier(); - rtl::OUString aOldChildURL + OUString aOldChildURL = xOldChildId->getContentIdentifier(); - rtl::OUString aNewChildURL + OUString aNewChildURL = aOldChildURL.replaceAt( 0, aOldURL.getLength(), @@ -902,7 +902,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Sequence< beans::Property >& rProperties, ContentProvider* pProvider, - const rtl::OUString& rContentId ) + const OUString& rContentId ) { ContentProperties aData; if ( loadData( pProvider, rContentId, aData ) ) @@ -934,7 +934,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, const ContentProperties& rData, ContentProvider* pProvider, - const rtl::OUString& rContentId ) + const OUString& rContentId ) { // Note: Empty sequence means "get values of all supported properties". @@ -1035,9 +1035,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Append all Core Properties. xRow->appendString ( - beans::Property( rtl::OUString("ContentType"), + beans::Property( OUString("ContentType"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getContentType() ); @@ -1045,9 +1045,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ContentType eType = rData.getType(); xRow->appendString ( - beans::Property( rtl::OUString("Title"), + beans::Property( OUString("Title"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), // Title is read-only for root and documents. beans::PropertyAttribute::BOUND || ( ( eType == ROOT ) || ( eType == DOCUMENT ) ) @@ -1055,14 +1055,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( : 0 ), rData.getTitle() ); xRow->appendBoolean( - beans::Property( rtl::OUString("IsDocument"), + beans::Property( OUString("IsDocument"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), rData.getIsDocument() ); xRow->appendBoolean( - beans::Property( rtl::OUString("IsFolder"), + beans::Property( OUString("IsFolder"), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -1070,7 +1070,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( rData.getIsFolder() ); xRow->appendObject( beans::Property( - rtl::OUString("CreatableContentsInfo"), + OUString("CreatableContentsInfo"), -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ), @@ -1081,7 +1081,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Storage is only supported by folders. if ( eType == FOLDER ) xRow->appendObject( - beans::Property( rtl::OUString("Storage"), + beans::Property( OUString("Storage"), -1, getCppuType( static_cast< @@ -1093,7 +1093,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // DocumentModel is only supported by documents. if ( eType == DOCUMENT ) xRow->appendObject( - beans::Property( rtl::OUString("DocumentModel"), + beans::Property( OUString("DocumentModel"), -1, getCppuType( static_cast< @@ -1153,7 +1153,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( sal_Bool bTriedToGetAdditonalPropSet = sal_False; sal_Bool bExchange = sal_False; - rtl::OUString aOldTitle; + OUString aOldTitle; sal_Int32 nTitlePos = -1; for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -1164,28 +1164,28 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name == "Title" ) @@ -1195,12 +1195,12 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( ( eType == ROOT ) || ( eType == DOCUMENT ) ) { aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty titles! @@ -1225,7 +1225,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Empty Title not allowed!" ), + OUString( "Empty Title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1233,7 +1233,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( "Title Property value has wrong type!" ), + OUString( "Title Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1244,14 +1244,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( eType == FOLDER ) { aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else { // Storage is only supported by folders. aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( "Storage property only supported by folders" ), + OUString( "Storage property only supported by folders" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1261,14 +1261,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( if ( eType == DOCUMENT ) { aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else { // Storage is only supported by folders. aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( "DocumentModel property only supported by " + OUString( "DocumentModel property only supported by " "documents" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1322,7 +1322,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString( "No property set for storing the value!" ), + OUString( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1350,18 +1350,18 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Roll-back. m_aProps.setTitle( aOldTitle ); - aOldTitle = rtl::OUString(); + aOldTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString("Exchange failed!"), + OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } if ( !aOldTitle.isEmpty() ) { - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( m_aProps.getTitle() ); @@ -1379,7 +1379,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1388,7 +1388,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot store persistent data!" ), + OUString( "Cannot store persistent data!" ), this ); // Unreachable } @@ -1433,7 +1433,7 @@ uno::Any Content::open( // Currently(?) unsupported. ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rArg.Mode ) ) ), xEnv ); @@ -1454,7 +1454,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1465,7 +1465,7 @@ uno::Any Content::open( m_eState == PERSISTENT ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - rtl::OUString( "Got no data stream!" ), + OUString( "Got no data stream!" ), this ); // Unreachable } @@ -1488,7 +1488,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1499,7 +1499,7 @@ uno::Any Content::open( m_eState == PERSISTENT ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - rtl::OUString("Got no data stream!"), + OUString("Got no data stream!"), this ); // Unreachable } @@ -1548,7 +1548,7 @@ uno::Any Content::open( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1560,7 +1560,7 @@ uno::Any Content::open( ? xEnv : uno::Reference< ucb::XCommandEnvironment >(), - rtl::OUString( "Got no data stream!" ), + OUString( "Got no data stream!" ), this ); // Unreachable } @@ -1573,7 +1573,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -1630,7 +1630,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingInputStreamException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1642,7 +1642,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, m_aProps.setTitle( aUri.getDecodedName() ); } - rtl::OUStringBuffer aNewURL = aUri.getParentUri(); + OUStringBuffer aNewURL = aUri.getParentUri(); aNewURL.append( m_aProps.getTitle() ); Uri aNewUri( aNewURL.makeStringAndClear() ); @@ -1655,7 +1655,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, m_aProps.getTitle() ) ), @@ -1676,9 +1676,9 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, do { - rtl::OUStringBuffer aNew = aNewUri.getUri(); + OUStringBuffer aNew = aNewUri.getUri(); aNew.appendAscii( "_" ); - aNew.append( rtl::OUString::valueOf( ++nTry ) ); + aNew.append( OUString::valueOf( ++nTry ) ); aNewUri.setUri( aNew.makeStringAndClear() ); } while ( hasData( aNewUri ) && ( nTry < 1000 ) ); @@ -1688,7 +1688,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString( "Unable to resolve name clash!" ), + OUString( "Unable to resolve name clash!" ), static_cast< cppu::OWeakObject * >( this ), nNameClashResolve ) ), xEnv ); @@ -1696,9 +1696,9 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, } else { - rtl::OUStringBuffer aNewTitle = m_aProps.getTitle(); + OUStringBuffer aNewTitle = m_aProps.getTitle(); aNewTitle.appendAscii( "_" ); - aNewTitle.append( rtl::OUString::valueOf( ++nTry ) ); + aNewTitle.append( OUString::valueOf( ++nTry ) ); m_aProps.setTitle( aNewTitle.makeStringAndClear() ); } } @@ -1712,7 +1712,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), nNameClashResolve ) ), xEnv ); @@ -1734,7 +1734,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny(m_xIdentifier-> getContentIdentifier()), @@ -1743,7 +1743,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString("Cannot store persistent data!"), + OUString("Cannot store persistent data!"), this ); // Unreachable } @@ -1781,7 +1781,7 @@ void Content::destroy( sal_Bool bDeletePhysical, { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not persistent!" ), + OUString( "Not persistent!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1829,12 +1829,12 @@ void Content::notifyDocumentClosed() //========================================================================= uno::Reference< ucb::XContent > -Content::queryChildContent( const rtl::OUString & rRelativeChildUri ) +Content::queryChildContent( const OUString & rRelativeChildUri ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - const rtl::OUString aMyId = getIdentifier()->getContentIdentifier(); - rtl::OUStringBuffer aBuf( aMyId ); + const OUString aMyId = getIdentifier()->getContentIdentifier(); + OUStringBuffer aBuf( aMyId ); if ( aMyId.getStr()[ aMyId.getLength() - 1 ] != sal_Unicode( '/' ) ) aBuf.appendAscii( "/" ); if ( rRelativeChildUri.getStr()[ 0 ] != sal_Unicode( '/' ) ) @@ -1861,7 +1861,7 @@ Content::queryChildContent( const rtl::OUString & rRelativeChildUri ) } //========================================================================= -void Content::notifyChildRemoved( const rtl::OUString & rRelativeChildUri ) +void Content::notifyChildRemoved( const OUString & rRelativeChildUri ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1885,7 +1885,7 @@ void Content::notifyChildRemoved( const rtl::OUString & rRelativeChildUri ) } //========================================================================= -void Content::notifyChildInserted( const rtl::OUString & rRelativeChildUri ) +void Content::notifyChildInserted( const OUString & rRelativeChildUri ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1921,7 +1921,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedCommandException( - rtl::OUString( "Not persistent!" ), + OUString( "Not persistent!" ), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1934,13 +1934,13 @@ void Content::transfer( // Invaild length (to short). ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable } - rtl::OUString aScheme + OUString aScheme = rInfo.SourceURL.copy( 0, TDOC_URL_SCHEME_LENGTH + 2 ) .toAsciiLowerCase(); if ( aScheme != TDOC_URL_SCHEME ":/" ) @@ -1948,7 +1948,7 @@ void Content::transfer( // Invalid scheme. ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), xEnv ); // Unreachable @@ -1960,7 +1960,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Invalid source URI! Syntax!" ), + OUString( "Invalid source URI! Syntax!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), xEnv ); @@ -1971,7 +1971,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Invalid source URI! " + OUString( "Invalid source URI! " "Must describe a folder or stream!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -1980,12 +1980,12 @@ void Content::transfer( } // Is source not a parent of me / not me? - rtl::OUString aId = m_xIdentifier->getContentIdentifier(); + OUString aId = m_xIdentifier->getContentIdentifier(); sal_Int32 nPos = aId.lastIndexOf( '/' ); if ( nPos != ( aId.getLength() - 1 ) ) { // No trailing slash found. Append. - aId += rtl::OUString("/"); + aId += OUString("/"); } if ( rInfo.SourceURL.getLength() <= aId.getLength() ) @@ -1995,7 +1995,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2003,7 +2003,7 @@ void Content::transfer( ucb::IOErrorCode_RECURSIVE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Target is equal to or is a child of source!" ), + OUString( "Target is equal to or is a child of source!" ), this ); // Unreachable } @@ -2025,7 +2025,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Invalid source URI! " + OUString( "Invalid source URI! " "Streams cannot be created as " "children of document root!" ), static_cast< cppu::OWeakObject * >( @@ -2054,7 +2054,7 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Invalid source URI! " + OUString( "Invalid source URI! " "Unabale to determine source type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -2068,7 +2068,7 @@ void Content::transfer( // Copy data. ///////////////////////////////////////////////////////////////////////// - rtl::OUString aNewName( !rInfo.NewTitle.isEmpty() + OUString aNewName( !rInfo.NewTitle.isEmpty() ? rInfo.NewTitle : aSourceUri.getDecodedName() ); @@ -2077,7 +2077,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2085,7 +2085,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot copy data!" ), + OUString( "Cannot copy data!" ), this ); // Unreachable } @@ -2094,9 +2094,9 @@ void Content::transfer( // Copy own and all children's Additional Core Properties. ///////////////////////////////////////////////////////////////////////// - rtl::OUString aTargetUri = m_xIdentifier->getContentIdentifier(); + OUString aTargetUri = m_xIdentifier->getContentIdentifier(); if ( ( aTargetUri.lastIndexOf( '/' ) + 1 ) != aTargetUri.getLength() ) - aTargetUri += rtl::OUString("/"); + aTargetUri += OUString("/"); if ( !rInfo.NewTitle.isEmpty() ) aTargetUri += ::ucb_impl::urihelper::encodeSegment( rInfo.NewTitle ); @@ -2109,7 +2109,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2117,7 +2117,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot copy additional properties!" ), + OUString( "Cannot copy additional properties!" ), this ); // Unreachable } @@ -2147,7 +2147,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( aTargetUri ), beans::PropertyState_DIRECT_VALUE)); @@ -2155,7 +2155,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot instanciate target object!" ), + OUString( "Cannot instanciate target object!" ), this ); // Unreachable } @@ -2189,7 +2189,7 @@ void Content::transfer( { uno::Any aProps = uno::makeAny(beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2197,7 +2197,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_READ, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot instanciate target object!" ), + OUString( "Cannot instanciate target object!" ), this ); // Unreachable } @@ -2211,7 +2211,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2219,7 +2219,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot remove persistent data of source object!" ), + OUString( "Cannot remove persistent data of source object!" ), this ); // Unreachable } @@ -2230,7 +2230,7 @@ void Content::transfer( uno::Any aProps = uno::makeAny( beans::PropertyValue( - rtl::OUString( "Uri"), + OUString( "Uri"), -1, uno::makeAny( rInfo.SourceURL ), beans::PropertyState_DIRECT_VALUE)); @@ -2238,7 +2238,7 @@ void Content::transfer( ucb::IOErrorCode_CANT_WRITE, uno::Sequence< uno::Any >(&aProps, 1), xEnv, - rtl::OUString( "Cannot remove additional properties of source object!" ), + OUString( "Cannot remove additional properties of source object!" ), this ); // Unreachable } @@ -2388,9 +2388,9 @@ bool Content::storeData( const uno::Reference< io::XInputStream >& xData, // According to MBA, if no mediatype is set, folder and all // its contents will be lost on save of the document!!! xPropSet->setPropertyValue( - rtl::OUString( "MediaType" ), + OUString( "MediaType" ), uno::makeAny( - rtl::OUString( // @@@ better mediatype + OUString( // @@@ better mediatype "application/binary" ) ) ); } catch ( beans::UnknownPropertyException const & ) @@ -2620,7 +2620,7 @@ bool Content::removeData() } //========================================================================= -bool Content::copyData( const Uri & rSourceUri, const rtl::OUString & rNewName ) +bool Content::copyData( const Uri & rSourceUri, const OUString & rNewName ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -2746,8 +2746,8 @@ bool Content::closeOutputStream( } //========================================================================= -static rtl::OUString obtainPassword( - const rtl::OUString & rName, +static OUString obtainPassword( + const OUString & rName, task::PasswordRequestMode eMode, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw ( ucb::CommandFailedException, @@ -2775,7 +2775,7 @@ static rtl::OUString obtainPassword( if ( xAbort.is() ) { throw ucb::CommandFailedException( - rtl::OUString( "Abort requested by Interaction Handler." ), + OUString( "Abort requested by Interaction Handler." ), uno::Reference< uno::XInterface >(), xRequest->getRequest() ); } @@ -2789,7 +2789,7 @@ static rtl::OUString obtainPassword( // Unknown selection. Should never happen. throw ucb::CommandFailedException( - rtl::OUString( "Interaction Handler selected unknown continuation!" ), + OUString( "Interaction Handler selected unknown continuation!" ), uno::Reference< uno::XInterface >(), xRequest->getRequest() ); } @@ -2808,8 +2808,8 @@ uno::Reference< io::XInputStream > Content::getInputStream( throw ( ucb::CommandFailedException, task::DocumentPasswordRequest ) { - rtl::OUString aUri; - rtl::OUString aPassword; + OUString aUri; + OUString aPassword; bool bPasswordRequested = false; { @@ -2845,13 +2845,13 @@ uno::Reference< io::XInputStream > Content::getInputStream( //========================================================================= static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream( - const rtl::OUString & rUri, + const OUString & rUri, ContentProvider * pProvider, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw ( ucb::CommandFailedException, task::DocumentPasswordRequest ) { - rtl::OUString aPassword; + OUString aPassword; bool bPasswordRequested = false; for ( ;; ) { @@ -2901,8 +2901,8 @@ uno::Reference< io::XStream > Content::getStream( OSL_ENSURE( m_aProps.getType() == STREAM, "Content::getStream - content is no stream!" ); - rtl::OUString aUri( Uri( m_xIdentifier->getContentIdentifier() ).getUri() ); - rtl::OUString aPassword; + OUString aUri( Uri( m_xIdentifier->getContentIdentifier() ).getUri() ); + OUString aPassword; bool bPasswordRequested = false; for ( ;; ) { @@ -2941,9 +2941,9 @@ ContentProperties::getCreatableContentsInfo() const { uno::Sequence< beans::Property > aProps( 1 ); aProps.getArray()[ 0 ] = beans::Property( - rtl::OUString("Title"), + OUString("Title"), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); #ifdef NO_STREAM_CREATION_WITHIN_DOCUMENT_ROOT @@ -2954,7 +2954,7 @@ ContentProperties::getCreatableContentsInfo() const // Folder. aSeq.getArray()[ 0 ].Type - = rtl::OUString( TDOC_FOLDER_CONTENT_TYPE ); + = OUString( TDOC_FOLDER_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; aSeq.getArray()[ 0 ].Properties = aProps; @@ -2968,14 +2968,14 @@ ContentProperties::getCreatableContentsInfo() const // Folder. aSeq.getArray()[ 0 ].Type - = rtl::OUString( TDOC_FOLDER_CONTENT_TYPE ); + = OUString( TDOC_FOLDER_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; aSeq.getArray()[ 0 ].Properties = aProps; // Stream. aSeq.getArray()[ 1 ].Type - = rtl::OUString( TDOC_STREAM_CONTENT_TYPE ); + = OUString( TDOC_STREAM_CONTENT_TYPE ); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT; diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index a1b25abb043a..640a9f4052cd 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -61,15 +61,15 @@ public: : m_eType( STREAM ) {} - ContentProperties( const ContentType & rType, const rtl::OUString & rTitle ) + ContentProperties( const ContentType & rType, const OUString & rTitle ) : m_eType( rType ), m_aContentType( rType == STREAM - ? rtl::OUString( TDOC_STREAM_CONTENT_TYPE ) + ? OUString( TDOC_STREAM_CONTENT_TYPE ) : rType == FOLDER - ? rtl::OUString( TDOC_FOLDER_CONTENT_TYPE ) + ? OUString( TDOC_FOLDER_CONTENT_TYPE ) : rType == DOCUMENT - ? rtl::OUString( TDOC_DOCUMENT_CONTENT_TYPE ) - : rtl::OUString( TDOC_ROOT_CONTENT_TYPE ) ), + ? OUString( TDOC_DOCUMENT_CONTENT_TYPE ) + : OUString( TDOC_ROOT_CONTENT_TYPE ) ), m_aTitle( rTitle ) {} @@ -77,13 +77,13 @@ public: // Properties - const rtl::OUString & getContentType() const { return m_aContentType; } + const OUString & getContentType() const { return m_aContentType; } bool getIsFolder() const { return m_eType > STREAM; } bool getIsDocument() const { return !getIsFolder(); } - const rtl::OUString & getTitle() const { return m_aTitle; } - void setTitle( const rtl::OUString & rTitle ) { m_aTitle = rTitle; } + const OUString & getTitle() const { return m_aTitle; } + void setTitle( const OUString & rTitle ) { m_aTitle = rTitle; } com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > getCreatableContentsInfo() const; @@ -92,8 +92,8 @@ public: private: ContentType m_eType; - rtl::OUString m_aContentType; - rtl::OUString m_aTitle; + OUString m_aContentType; + OUString m_aTitle; }; //========================================================================= @@ -131,7 +131,7 @@ private: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); static bool hasData( ContentProvider* pProvider, const Uri & rUri ); bool hasData( const Uri & rUri ) { return hasData( m_pProvider, rUri ); } @@ -151,11 +151,11 @@ private: com::sun::star::ucb::XContentIdentifier >& xNewId ); bool removeData(); - bool copyData( const Uri & rSourceUri, const rtl::OUString & rNewName ); + bool copyData( const Uri & rSourceUri, const OUString & rNewName ); ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > - makeNewIdentifier( const rtl::OUString& rTitle ); + makeNewIdentifier( const OUString& rTitle ); typedef rtl::Reference< Content > ContentRef; typedef std::list< ContentRef > ContentRefList; @@ -206,7 +206,7 @@ private: ::com::sun::star::beans::Property >& rProperties, const ContentProperties& rData, ContentProvider* pProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); static bool commitStorage( @@ -232,7 +232,7 @@ private: ::com::sun::star::task::DocumentPasswordRequest ); ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > - queryChildContent( const rtl::OUString & rRelativeChildUri ); + queryChildContent( const OUString & rRelativeChildUri ); ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > getStream( const ::com::sun::star::uno::Reference< @@ -267,15 +267,15 @@ public: XTYPEPROVIDER_DECL() // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XContent - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< @@ -320,11 +320,11 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties, ContentProvider* pProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); void notifyDocumentClosed(); - void notifyChildRemoved( const rtl::OUString & rRelativeChildUri ); - void notifyChildInserted( const rtl::OUString & rRelativeChildUri ); + void notifyChildRemoved( const OUString & rRelativeChildUri ); + void notifyChildInserted( const OUString & rRelativeChildUri ); rtl::Reference< ContentProvider > getContentProvider() const { return rtl::Reference< ContentProvider >( m_pProvider ); } diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 0ebf3729b26a..c361a1cb11cd 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -110,37 +110,37 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), /////////////////////////////////////////////////////////// // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -168,37 +168,37 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ), /////////////////////////////////////////////////////////// // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -210,7 +210,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "Storage" ), + OUString( "Storage" ), -1, getCppuType( static_cast< const uno::Reference< embed::XStorage > * >( 0 ) ), @@ -234,30 +234,30 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), @@ -265,7 +265,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -277,7 +277,7 @@ uno::Sequence< beans::Property > Content::getProperties( // New properties /////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "DocumentModel" ), + OUString( "DocumentModel" ), -1, getCppuType( static_cast< const uno::Reference< frame::XModel > * >( 0 ) ), @@ -303,30 +303,30 @@ uno::Sequence< beans::Property > Content::getProperties( // Mandatory properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), @@ -334,7 +334,7 @@ uno::Sequence< beans::Property > Content::getProperties( // Optional standard properties /////////////////////////////////////////////////////////////// beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -377,23 +377,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -403,12 +403,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -432,23 +432,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -458,17 +458,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) @@ -493,23 +493,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -519,28 +519,28 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ), ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "createNewContent" ), + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) @@ -564,23 +564,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -590,18 +590,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "createNewContent" ), + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ) @@ -627,23 +627,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Mandatory commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< @@ -653,7 +653,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////// ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index f356e9927a82..6f7a55fcb279 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -46,12 +46,12 @@ namespace tdoc_ucp struct ResultListEntry { - rtl::OUString aURL; + OUString aURL; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; - ResultListEntry( const rtl::OUString& rURL ) : aURL( rURL ) {} + ResultListEntry( const OUString& rURL ) : aURL( rURL ) {} }; //========================================================================= @@ -74,7 +74,7 @@ struct DataSupplier_Impl ResultList m_aResults; rtl::Reference< Content > m_xContent; uno::Reference< uno::XComponentContext > m_xContext; - uno::Sequence< rtl::OUString > * m_pNamesOfChildren; + uno::Sequence< OUString > * m_pNamesOfChildren; sal_Int32 m_nOpenMode; bool m_bCountFinal; bool m_bThrowException; @@ -123,14 +123,14 @@ ResultSetDataSupplier::~ResultSetDataSupplier() } // virtual -rtl::OUString +OUString ResultSetDataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( nIndex < m_pImpl->m_aResults.size() ) { - rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aURL; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aURL; if ( !aId.isEmpty() ) { // Already cached. @@ -143,7 +143,7 @@ ResultSetDataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) // Note: getResult fills m_pImpl->m_aResults[ nIndex ]->aURL. return m_pImpl->m_aResults[ nIndex ]->aURL; } - return rtl::OUString(); + return OUString(); } // virtual @@ -163,7 +163,7 @@ ResultSetDataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { uno::Reference< ucb::XContentIdentifier > xId @@ -238,7 +238,7 @@ sal_Bool ResultSetDataSupplier::getResult( sal_uInt32 nIndex ) m_pImpl->m_pNamesOfChildren->getLength()); ++n ) { - const rtl::OUString & rName + const OUString & rName = m_pImpl->m_pNamesOfChildren->getConstArray()[ n ]; if ( rName.isEmpty() ) @@ -248,7 +248,7 @@ sal_Bool ResultSetDataSupplier::getResult( sal_uInt32 nIndex ) } // Assemble URL for child. - rtl::OUString aURL = assembleChildURL( rName ); + OUString aURL = assembleChildURL( rName ); m_pImpl->m_aResults.push_back( new ResultListEntry( aURL ) ); @@ -297,7 +297,7 @@ sal_uInt32 ResultSetDataSupplier::totalCount() m_pImpl->m_pNamesOfChildren->getLength()); ++n ) { - const rtl::OUString & rName + const OUString & rName = m_pImpl->m_pNamesOfChildren->getConstArray()[ n ]; if ( rName.isEmpty() ) @@ -307,7 +307,7 @@ sal_uInt32 ResultSetDataSupplier::totalCount() } // Assemble URL for child. - rtl::OUString aURL = assembleChildURL( rName ); + OUString aURL = assembleChildURL( rName ); m_pImpl->m_aResults.push_back( new ResultListEntry( aURL ) ); } @@ -400,8 +400,8 @@ bool ResultSetDataSupplier::queryNamesOfChildren() if ( m_pImpl->m_pNamesOfChildren == 0 ) { - uno::Sequence< rtl::OUString > * pNamesOfChildren - = new uno::Sequence< rtl::OUString >(); + uno::Sequence< OUString > * pNamesOfChildren + = new uno::Sequence< OUString >(); if ( !m_pImpl->m_xContent->getContentProvider()->queryNamesOfChildren( m_pImpl->m_xContent->getIdentifier()->getContentIdentifier(), @@ -420,16 +420,16 @@ bool ResultSetDataSupplier::queryNamesOfChildren() return true; } -::rtl::OUString -ResultSetDataSupplier::assembleChildURL( const ::rtl::OUString& aName ) +OUString +ResultSetDataSupplier::assembleChildURL( const OUString& aName ) { - rtl::OUString aContURL + OUString aContURL = m_pImpl->m_xContent->getIdentifier()->getContentIdentifier(); - rtl::OUString aURL( aContURL ); + OUString aURL( aContURL ); sal_Int32 nUrlEnd = aURL.lastIndexOf( '/' ); if ( nUrlEnd != aURL.getLength() - 1 ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); aURL += aName; return aURL; diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx index 93a3f8c52eef..aff926a57cbf 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx @@ -35,7 +35,7 @@ class ResultSetDataSupplier : public ::ucbhelper::ResultSetDataSupplier private: bool queryNamesOfChildren(); - ::rtl::OUString assembleChildURL( const ::rtl::OUString& aName ); + OUString assembleChildURL( const OUString& aName ); public: ResultSetDataSupplier( @@ -45,7 +45,7 @@ public: sal_Int32 nOpenMode = com::sun::star::ucb::OpenMode::ALL ); virtual ~ResultSetDataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 26704485b7d1..621e34f2c1bc 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -76,7 +76,7 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin { document::EventObject aDocEvent; aDocEvent.Source = Source.Source; - aDocEvent.EventName = rtl::OUString( "OfficeDocumentsListener::notifyClosing" ); + aDocEvent.EventName = OUString( "OfficeDocumentsListener::notifyClosing" ); m_pManager->notifyEvent( aDocEvent ); } @@ -134,10 +134,10 @@ void OfficeDocumentsManager::destroy() } //========================================================================= -static rtl::OUString +static OUString getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) { - rtl::OUString aId; + OUString aId; // Try to get the UID directly from the document. uno::Reference< beans::XPropertySet > xPropSet( xDoc, uno::UNO_QUERY ); @@ -146,7 +146,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) try { uno::Any aValue = xPropSet->getPropertyValue( - rtl::OUString( "RuntimeUID" ) ); + OUString( "RuntimeUID" ) ); aValue >>= aId; } catch ( beans::UnknownPropertyException const & ) @@ -167,7 +167,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) // different IDs uno::Reference< uno::XInterface > xNormalizedIFace( xDoc, uno::UNO_QUERY ); sal_Int64 nId = reinterpret_cast< sal_Int64 >( xNormalizedIFace.get() ); - aId = rtl::OUString::valueOf( nId ); + aId = OUString::valueOf( nId ); } OSL_ENSURE( !aId.isEmpty(), "getDocumentId - Empty id!" ); @@ -275,7 +275,7 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent( if ( m_pDocEventListener ) { - rtl::OUString aDocId( (*it).first ); + OUString aDocId( (*it).first ); m_pDocEventListener->notifyDocumentClosed( aDocId ); } break; @@ -480,8 +480,8 @@ void OfficeDocumentsManager::buildDocumentsList() if ( it == m_aDocs.end() ) { // new document - rtl::OUString aDocId = getDocumentId( xModel ); - rtl::OUString aTitle = DocumentInfo::getDocumentTitle( xModel ); + OUString aDocId = getDocumentId( xModel ); + OUString aTitle = DocumentInfo::getDocumentTitle( xModel ); uno::Reference< document::XStorageBasedDocument > xDoc( xModel, uno::UNO_QUERY ); @@ -516,7 +516,7 @@ void OfficeDocumentsManager::buildDocumentsList() //========================================================================= uno::Reference< embed::XStorage > -OfficeDocumentsManager::queryStorage( const rtl::OUString & rDocId ) +OfficeDocumentsManager::queryStorage( const OUString & rDocId ) { osl::MutexGuard aGuard( m_aMtx ); @@ -528,7 +528,7 @@ OfficeDocumentsManager::queryStorage( const rtl::OUString & rDocId ) } //========================================================================= -rtl::OUString OfficeDocumentsManager::queryDocumentId( +OUString OfficeDocumentsManager::queryDocumentId( const uno::Reference< frame::XModel > & xModel ) { return getDocumentId( xModel ); @@ -536,7 +536,7 @@ rtl::OUString OfficeDocumentsManager::queryDocumentId( //========================================================================= uno::Reference< frame::XModel > -OfficeDocumentsManager::queryDocumentModel( const rtl::OUString & rDocId ) +OfficeDocumentsManager::queryDocumentModel( const OUString & rDocId ) { osl::MutexGuard aGuard( m_aMtx ); @@ -548,11 +548,11 @@ OfficeDocumentsManager::queryDocumentModel( const rtl::OUString & rDocId ) } //========================================================================= -uno::Sequence< rtl::OUString > OfficeDocumentsManager::queryDocuments() +uno::Sequence< OUString > OfficeDocumentsManager::queryDocuments() { osl::MutexGuard aGuard( m_aMtx ); - uno::Sequence< rtl::OUString > aRet( m_aDocs.size() ); + uno::Sequence< OUString > aRet( m_aDocs.size() ); sal_Int32 nPos = 0; DocumentList::const_iterator it = m_aDocs.begin(); @@ -566,14 +566,14 @@ uno::Sequence< rtl::OUString > OfficeDocumentsManager::queryDocuments() } //========================================================================= -rtl::OUString -OfficeDocumentsManager::queryStorageTitle( const rtl::OUString & rDocId ) +OUString +OfficeDocumentsManager::queryStorageTitle( const OUString & rDocId ) { osl::MutexGuard aGuard( m_aMtx ); DocumentList::const_iterator it = m_aDocs.find( rDocId ); if ( it == m_aDocs.end() ) - return rtl::OUString(); + return OUString(); return (*it).second.aTitle; } @@ -598,7 +598,7 @@ bool OfficeDocumentsManager::isHelpDocument( if ( !xModel.is() ) return false; - ::rtl::OUString sURL( xModel->getURL() ); + OUString sURL( xModel->getURL() ); if ( sURL.match( "vnd.sun.star.help://" ) ) return true; @@ -657,7 +657,7 @@ bool OfficeDocumentsManager::isBasicIDE( if ( m_xModuleMgr.is() ) { - rtl::OUString aModule; + OUString aModule; try { aModule = m_xModuleMgr->identify( xModel ); diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 02046341f1c9..102f0984da68 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -38,8 +38,8 @@ namespace tdoc_ucp { class OfficeDocumentsEventListener { public: - virtual void notifyDocumentOpened( const rtl::OUString & rDocId ) = 0; - virtual void notifyDocumentClosed( const rtl::OUString & rDocId ) = 0; + virtual void notifyDocumentOpened( const OUString & rDocId ) = 0; + virtual void notifyDocumentClosed( const OUString & rDocId ) = 0; protected: ~OfficeDocumentsEventListener() {} @@ -49,7 +49,7 @@ namespace tdoc_ucp { struct StorageInfo { - rtl::OUString aTitle; + OUString aTitle; com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; com::sun::star::uno::Reference< @@ -58,7 +58,7 @@ namespace tdoc_ucp { StorageInfo() {}; // needed for STL map only. StorageInfo( - const rtl::OUString & rTitle, + const OUString & rTitle, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & rxStorage, const com::sun::star::uno::Reference< @@ -71,13 +71,13 @@ namespace tdoc_ucp { struct ltref { bool operator()( - const rtl::OUString & r1, const rtl::OUString & r2 ) const + const OUString & r1, const OUString & r2 ) const { return r1 < r2; } }; - typedef std::map< rtl::OUString, StorageInfo, ltref > DocumentList; + typedef std::map< OUString, StorageInfo, ltref > DocumentList; //======================================================================= @@ -132,21 +132,21 @@ namespace tdoc_ucp { // Non-interface com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - queryStorage( const rtl::OUString & rDocId ); + queryStorage( const OUString & rDocId ); - rtl::OUString + OUString queryDocumentId( const com::sun::star::uno::Reference< com::sun::star::frame::XModel > & xModel ); com::sun::star::uno::Reference< com::sun::star::frame::XModel > - queryDocumentModel( const rtl::OUString & rDocId ); + queryDocumentModel( const OUString & rDocId ); - com::sun::star::uno::Sequence< rtl::OUString > + com::sun::star::uno::Sequence< OUString > queryDocuments(); - rtl::OUString - queryStorageTitle( const rtl::OUString & rDocId ); + OUString + queryStorageTitle( const OUString & rDocId ); private: void buildDocumentsList(); diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index dca9415f4bd8..cc64ec27a27e 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -58,7 +58,7 @@ DocumentContentFactory::~DocumentContentFactory() //========================================================================= // virtual -::rtl::OUString SAL_CALL DocumentContentFactory::getImplementationName() +OUString SAL_CALL DocumentContentFactory::getImplementationName() throw ( uno::RuntimeException ) { return getImplementationName_Static(); @@ -67,11 +67,11 @@ DocumentContentFactory::~DocumentContentFactory() //========================================================================= // virtual sal_Bool SAL_CALL -DocumentContentFactory::supportsService( const ::rtl::OUString& ServiceName ) +DocumentContentFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString * pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for ( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) { if ( pArray[ i ] == ServiceName ) @@ -82,7 +82,7 @@ DocumentContentFactory::supportsService( const ::rtl::OUString& ServiceName ) //========================================================================= // virtual -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL DocumentContentFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { @@ -91,20 +91,20 @@ DocumentContentFactory::getSupportedServiceNames() //========================================================================= // static -rtl::OUString DocumentContentFactory::getImplementationName_Static() +OUString DocumentContentFactory::getImplementationName_Static() { - return rtl::OUString( + return OUString( "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory" ); } //========================================================================= // static -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > DocumentContentFactory::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = rtl::OUString( + = OUString( "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ); return aSNS; } @@ -127,7 +127,7 @@ DocumentContentFactory::createDocumentContent( xDocFac = uno::Reference< frame::XTransientDocumentsDocumentContentFactory >( m_xSMgr->createInstance( - rtl::OUString( + OUString( "com.sun.star.ucb.TransientDocumentsContentProvider" ) ), uno::UNO_QUERY ); @@ -141,7 +141,7 @@ DocumentContentFactory::createDocumentContent( return xDocFac->createDocumentContent( Model ); throw uno::RuntimeException( - rtl::OUString( + OUString( "Unable to obtain document content factory!" ), static_cast< cppu::OWeakObject * >( this ) ); } diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx index 602b8688682f..6551c7fe46d7 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx @@ -39,14 +39,14 @@ public: virtual ~DocumentContentFactory(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( com::sun::star::uno::RuntimeException ); @@ -59,9 +59,9 @@ public: com::sun::star::uno::RuntimeException ); // Non-UNO interfaces - static rtl::OUString + static OUString getImplementationName_Static(); - static com::sun::star::uno::Sequence< rtl::OUString > + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); static com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx index b0825d15a956..6c7e4a64af83 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx @@ -61,14 +61,14 @@ namespace tdoc_ucp throw ( uno::RuntimeException ); // XInteractionPassword - virtual void SAL_CALL setPassword( const rtl::OUString & aPasswd ) + virtual void SAL_CALL setPassword( const OUString & aPasswd ) throw ( uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getPassword() + virtual OUString SAL_CALL getPassword() throw ( uno::RuntimeException ); private: osl::Mutex m_aMutex; - rtl::OUString m_aPassword; + OUString m_aPassword; }; } // namespace tdoc_ucp @@ -183,7 +183,7 @@ void SAL_CALL InteractionSupplyPassword::select() // virtual void SAL_CALL -InteractionSupplyPassword::setPassword( const ::rtl::OUString& aPasswd ) +InteractionSupplyPassword::setPassword( const OUString& aPasswd ) throw ( uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -191,7 +191,7 @@ InteractionSupplyPassword::setPassword( const ::rtl::OUString& aPasswd ) } // virtual -rtl::OUString SAL_CALL InteractionSupplyPassword::getPassword() +OUString SAL_CALL InteractionSupplyPassword::getPassword() throw ( uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -208,7 +208,7 @@ rtl::OUString SAL_CALL InteractionSupplyPassword::getPassword() DocumentPasswordRequest::DocumentPasswordRequest( task::PasswordRequestMode eMode, - const rtl::OUString & rDocumentName ) + const OUString & rDocumentName ) { // Fill request... task::DocumentPasswordRequest aRequest; diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx index 3d7445e26572..1757a72fdef1 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx @@ -68,7 +68,7 @@ namespace tdoc_ucp { xSelection.get(), uno::UNO_QUERY ); if ( xPassword.is() ) { - rtl::OUString aPassword = xPassword->getPassword(); + OUString aPassword = xPassword->getPassword(); // @@@ } @@ -83,7 +83,7 @@ namespace tdoc_ucp { public: DocumentPasswordRequest( com::sun::star::task::PasswordRequestMode eMode, - const rtl::OUString & rDocumentName ); + const OUString & rDocumentName ); }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 329426fa2f8d..336d9beef6a7 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -123,7 +123,7 @@ ContentProvider::queryContent( Uri aUri( Identifier->getContentIdentifier() ); if ( !aUri.isValid() ) throw ucb::IllegalIdentifierException( - rtl::OUString( "Invalid URL!" ), + OUString( "Invalid URL!" ), Identifier ); // Normalize URI. @@ -161,10 +161,10 @@ ContentProvider::createDocumentContent( // model -> id -> content identifier -> queryContent if ( m_xDocsMgr.is() ) { - rtl::OUString aDocId = m_xDocsMgr->queryDocumentId( Model ); + OUString aDocId = m_xDocsMgr->queryDocumentId( Model ); if ( !aDocId.isEmpty() ) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( TDOC_URL_SCHEME ":/" ); aBuffer.append( aDocId ); @@ -188,7 +188,7 @@ ContentProvider::createDocumentContent( // no content. throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Illegal Content Identifier!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); @@ -196,7 +196,7 @@ ContentProvider::createDocumentContent( else { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Unable to obtain document id from model!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); @@ -205,7 +205,7 @@ ContentProvider::createDocumentContent( else { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "No Document Manager!" ), static_cast< cppu::OWeakObject * >( this ), 1 ); @@ -219,7 +219,7 @@ ContentProvider::createDocumentContent( //========================================================================= // virtual -void ContentProvider::notifyDocumentClosed( const rtl::OUString & rDocId ) +void ContentProvider::notifyDocumentClosed( const OUString & rDocId ) { osl::MutexGuard aGuard( getContentListMutex() ); @@ -282,7 +282,7 @@ void ContentProvider::notifyDocumentClosed( const rtl::OUString & rDocId ) //========================================================================= // virtual -void ContentProvider::notifyDocumentOpened( const rtl::OUString & rDocId ) +void ContentProvider::notifyDocumentOpened( const OUString & rDocId ) { osl::MutexGuard aGuard( getContentListMutex() ); @@ -321,7 +321,7 @@ void ContentProvider::notifyDocumentOpened( const rtl::OUString & rDocId ) //========================================================================= uno::Reference< embed::XStorage > -ContentProvider::queryStorage( const rtl::OUString & rUri, +ContentProvider::queryStorage( const OUString & rUri, StorageAccessMode eMode ) const { if ( m_xStgElemFac.is() ) @@ -353,7 +353,7 @@ ContentProvider::queryStorage( const rtl::OUString & rUri, //========================================================================= uno::Reference< embed::XStorage > -ContentProvider::queryStorageClone( const rtl::OUString & rUri ) const +ContentProvider::queryStorageClone( const OUString & rUri ) const { if ( m_xStgElemFac.is() ) { @@ -393,8 +393,8 @@ ContentProvider::queryStorageClone( const rtl::OUString & rUri ) const //========================================================================= uno::Reference< io::XInputStream > -ContentProvider::queryInputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword ) const +ContentProvider::queryInputStream( const OUString & rUri, + const OUString & rPassword ) const throw ( packages::WrongPasswordException ) { if ( m_xStgElemFac.is() ) @@ -430,8 +430,8 @@ ContentProvider::queryInputStream( const rtl::OUString & rUri, //========================================================================= uno::Reference< io::XOutputStream > -ContentProvider::queryOutputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, +ContentProvider::queryOutputStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) const throw ( packages::WrongPasswordException ) { @@ -470,8 +470,8 @@ ContentProvider::queryOutputStream( const rtl::OUString & rUri, //========================================================================= uno::Reference< io::XStream > -ContentProvider::queryStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, +ContentProvider::queryStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) const throw ( packages::WrongPasswordException ) { @@ -509,7 +509,7 @@ ContentProvider::queryStream( const rtl::OUString & rUri, //========================================================================= bool ContentProvider::queryNamesOfChildren( - const rtl::OUString & rUri, uno::Sequence< rtl::OUString > & rNames ) const + const OUString & rUri, uno::Sequence< OUString > & rNames ) const { Uri aUri( rUri ); if ( aUri.isRoot() ) @@ -568,16 +568,16 @@ bool ContentProvider::queryNamesOfChildren( } //========================================================================= -rtl::OUString -ContentProvider::queryStorageTitle( const rtl::OUString & rUri ) const +OUString +ContentProvider::queryStorageTitle( const OUString & rUri ) const { - rtl::OUString aTitle; + OUString aTitle; Uri aUri( rUri ); if ( aUri.isRoot() ) { // always empty. - aTitle = rtl::OUString(); + aTitle = OUString(); } else if ( aUri.isDocument() ) { @@ -599,7 +599,7 @@ ContentProvider::queryStorageTitle( const rtl::OUString & rUri ) const //========================================================================= uno::Reference< frame::XModel > -ContentProvider::queryDocumentModel( const rtl::OUString & rUri ) const +ContentProvider::queryDocumentModel( const OUString & rUri ) const { uno::Reference< frame::XModel > xModel; diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx index 69bc2b2fed3f..1d656527e937 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.hxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx @@ -94,41 +94,41 @@ public: // Non-UNO interfaces com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - queryStorage( const rtl::OUString & rUri, StorageAccessMode eMode ) const; + queryStorage( const OUString & rUri, StorageAccessMode eMode ) const; com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - queryStorageClone( const rtl::OUString & rUri ) const; + queryStorageClone( const OUString & rUri ) const; com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - queryInputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword ) const + queryInputStream( const OUString & rUri, + const OUString & rPassword ) const throw ( com::sun::star::packages::WrongPasswordException ); com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > - queryOutputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, + queryOutputStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) const throw ( com::sun::star::packages::WrongPasswordException ); com::sun::star::uno::Reference< com::sun::star::io::XStream > - queryStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, + queryStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) const throw ( com::sun::star::packages::WrongPasswordException ); bool queryNamesOfChildren( - const rtl::OUString & rUri, - com::sun::star::uno::Sequence< rtl::OUString > & rNames ) const; + const OUString & rUri, + com::sun::star::uno::Sequence< OUString > & rNames ) const; // storage properties - rtl::OUString queryStorageTitle( const rtl::OUString & rUri ) const; + OUString queryStorageTitle( const OUString & rUri ) const; com::sun::star::uno::Reference< com::sun::star::frame::XModel > - queryDocumentModel( const rtl::OUString & rUri ) const; + queryDocumentModel( const OUString & rUri ) const; // interface OfficeDocumentsEventListener - virtual void notifyDocumentOpened( const rtl::OUString & rDocId ); - virtual void notifyDocumentClosed( const rtl::OUString & rDocId ); + virtual void notifyDocumentOpened( const OUString & rDocId ); + virtual void notifyDocumentClosed( const OUString & rDocId ); private: rtl::Reference< OfficeDocumentsManager > m_xDocsMgr; diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index ea6d12d1ac5d..6c32899b3447 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -46,7 +46,7 @@ using namespace tdoc_ucp; ParentStorageHolder::ParentStorageHolder( const uno::Reference< embed::XStorage > & xParentStorage, - const rtl::OUString & rUri ) + const OUString & rUri ) : m_xParentStorage( xParentStorage ), m_bParentIsRootStorage( false ) { @@ -65,7 +65,7 @@ ParentStorageHolder::ParentStorageHolder( Storage::Storage( const uno::Reference< uno::XComponentContext > & rxContext, const rtl::Reference< StorageElementFactory > & xFactory, - const rtl::OUString & rUri, + const OUString & rUri, const uno::Reference< embed::XStorage > & xParentStorage, const uno::Reference< embed::XStorage > & xStorageToWrap ) : ParentStorageHolder( xParentStorage, Uri( rUri ).getParentUri() ), @@ -264,7 +264,7 @@ uno::Type SAL_CALL Storage::getElementType() //========================================================================= // virtual -uno::Any SAL_CALL Storage::getByName( const ::rtl::OUString& aName ) +uno::Any SAL_CALL Storage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) @@ -274,7 +274,7 @@ uno::Any SAL_CALL Storage::getByName( const ::rtl::OUString& aName ) //========================================================================= // virtual -uno::Sequence< ::rtl::OUString > SAL_CALL Storage::getElementNames() +uno::Sequence< OUString > SAL_CALL Storage::getElementNames() throw ( uno::RuntimeException ) { return m_xWrappedStorage->getElementNames(); @@ -282,7 +282,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Storage::getElementNames() //========================================================================= // virtual -::sal_Bool SAL_CALL Storage::hasByName( const ::rtl::OUString& aName ) +::sal_Bool SAL_CALL Storage::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) { return m_xWrappedStorage->hasByName( aName ); @@ -309,7 +309,7 @@ void SAL_CALL Storage::copyToStorage( //========================================================================= // virtual uno::Reference< io::XStream > SAL_CALL Storage::openStreamElement( - const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode ) + const OUString& aStreamName, sal_Int32 nOpenMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::WrongPasswordException, @@ -323,9 +323,9 @@ uno::Reference< io::XStream > SAL_CALL Storage::openStreamElement( //========================================================================= // virtual uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement( - const ::rtl::OUString& aStreamName, + const OUString& aStreamName, sal_Int32 nOpenMode, - const ::rtl::OUString& aPassword ) + const OUString& aPassword ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::NoEncryptionException, @@ -341,7 +341,7 @@ uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement( //========================================================================= // virtual uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement( - const ::rtl::OUString& aStorName, sal_Int32 nOpenMode ) + const OUString& aStorName, sal_Int32 nOpenMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, io::IOException, @@ -354,7 +354,7 @@ uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement( //========================================================================= // virtual uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement( - const ::rtl::OUString& aStreamName ) + const OUString& aStreamName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::WrongPasswordException, @@ -368,8 +368,8 @@ uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement( //========================================================================= // virtual uno::Reference< io::XStream > SAL_CALL Storage::cloneEncryptedStreamElement( - const ::rtl::OUString& aStreamName, - const ::rtl::OUString& aPassword ) + const OUString& aStreamName, + const OUString& aPassword ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, packages::NoEncryptionException, @@ -398,7 +398,7 @@ void SAL_CALL Storage::copyLastCommitTo( //========================================================================= // virtual void SAL_CALL Storage::copyStorageElementLastCommitTo( - const ::rtl::OUString& aStorName, + const OUString& aStorName, const uno::Reference< embed::XStorage >& xTargetStorage ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -412,7 +412,7 @@ void SAL_CALL Storage::copyStorageElementLastCommitTo( //========================================================================= // virtual sal_Bool SAL_CALL Storage::isStreamElement( - const ::rtl::OUString& aElementName ) + const OUString& aElementName ) throw ( container::NoSuchElementException, lang::IllegalArgumentException, embed::InvalidStorageException, @@ -424,7 +424,7 @@ sal_Bool SAL_CALL Storage::isStreamElement( //========================================================================= // virtual sal_Bool SAL_CALL Storage::isStorageElement( - const ::rtl::OUString& aElementName ) + const OUString& aElementName ) throw ( container::NoSuchElementException, lang::IllegalArgumentException, embed::InvalidStorageException, @@ -435,7 +435,7 @@ sal_Bool SAL_CALL Storage::isStorageElement( //========================================================================= // virtual -void SAL_CALL Storage::removeElement( const ::rtl::OUString& aElementName ) +void SAL_CALL Storage::removeElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -448,8 +448,8 @@ void SAL_CALL Storage::removeElement( const ::rtl::OUString& aElementName ) //========================================================================= // virtual -void SAL_CALL Storage::renameElement( const ::rtl::OUString& aEleName, - const ::rtl::OUString& aNewName ) +void SAL_CALL Storage::renameElement( const OUString& aEleName, + const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -464,9 +464,9 @@ void SAL_CALL Storage::renameElement( const ::rtl::OUString& aEleName, //========================================================================= // virtual void SAL_CALL Storage::copyElementTo( - const ::rtl::OUString& aElementName, + const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -481,9 +481,9 @@ void SAL_CALL Storage::copyElementTo( //========================================================================= // virtual void SAL_CALL Storage::moveElementTo( - const ::rtl::OUString& aElementName, + const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, - const ::rtl::OUString& rNewName ) + const OUString& rNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, @@ -571,7 +571,7 @@ void SAL_CALL Storage::revert() OutputStream::OutputStream( const uno::Reference< uno::XComponentContext > & rxContext, - const rtl::OUString & rUri, + const OUString & rUri, const uno::Reference< embed::XStorage > & xParentStorage, const uno::Reference< io::XOutputStream > & xStreamToWrap ) : ParentStorageHolder( xParentStorage, Uri( rUri ).getParentUri() ), @@ -763,7 +763,7 @@ OutputStream::removeEventListener( Stream::Stream( const uno::Reference< uno::XComponentContext > & rxContext, - const rtl::OUString & rUri, + const OUString & rUri, const uno::Reference< embed::XStorage > & xParentStorage, const uno::Reference< io::XStream > & xStreamToWrap ) : ParentStorageHolder( xParentStorage, Uri( rUri ).getParentUri() ), diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx index 2d4d23de7420..7ccd6445b195 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx @@ -52,7 +52,7 @@ public: ParentStorageHolder( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, - const rtl::OUString & rUri ); + const OUString & rUri ); bool isParentARootStorage() const { return m_bParentIsRootStorage; } @@ -83,7 +83,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext, const rtl::Reference< StorageElementFactory > & xFactory, - const rtl::OUString & rUri, + const OUString & rUri, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, const com::sun::star::uno::Reference< @@ -125,15 +125,15 @@ public: // XNameAccess ( one of XStorage bases ) virtual com::sun::star::uno::Any SAL_CALL - getByName( const rtl::OUString& aName ) + getByName( const OUString& aName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByName( const rtl::OUString& aName ) + hasByName( const OUString& aName ) throw ( com::sun::star::uno::RuntimeException ); // XElementAccess (base of XNameAccess) @@ -154,7 +154,7 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL - openStreamElement( const ::rtl::OUString& aStreamName, + openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -163,9 +163,9 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL - openEncryptedStreamElement( const ::rtl::OUString& aStreamName, + openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, - const ::rtl::OUString& aPassword ) + const OUString& aPassword ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::packages::NoEncryptionException, @@ -174,7 +174,7 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::embed::XStorage > SAL_CALL - openStorageElement( const ::rtl::OUString& aStorName, + openStorageElement( const OUString& aStorName, sal_Int32 nOpenMode ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -182,7 +182,7 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL - cloneStreamElement( const ::rtl::OUString& aStreamName ) + cloneStreamElement( const OUString& aStreamName ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::packages::WrongPasswordException, @@ -190,8 +190,8 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL - cloneEncryptedStreamElement( const ::rtl::OUString& aStreamName, - const ::rtl::OUString& aPassword ) + cloneEncryptedStreamElement( const OUString& aStreamName, + const OUString& aPassword ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::packages::NoEncryptionException, @@ -208,7 +208,7 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - copyStorageElementLastCommitTo( const ::rtl::OUString& aStorName, + copyStorageElementLastCommitTo( const OUString& aStorName, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xTargetStorage ) @@ -218,19 +218,19 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - isStreamElement( const ::rtl::OUString& aElementName ) + isStreamElement( const OUString& aElementName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::embed::InvalidStorageException, com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - isStorageElement( const ::rtl::OUString& aElementName ) + isStorageElement( const OUString& aElementName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::embed::InvalidStorageException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeElement( const ::rtl::OUString& aElementName ) + removeElement( const OUString& aElementName ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, @@ -238,8 +238,8 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - renameElement( const ::rtl::OUString& aEleName, - const ::rtl::OUString& aNewName ) + renameElement( const OUString& aEleName, + const OUString& aNewName ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, @@ -248,10 +248,10 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - copyElementTo( const ::rtl::OUString& aElementName, + copyElementTo( const OUString& aElementName, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xDest, - const ::rtl::OUString& aNewName ) + const OUString& aNewName ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, @@ -260,10 +260,10 @@ public: com::sun::star::embed::StorageWrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - moveElementTo( const ::rtl::OUString& aElementName, + moveElementTo( const OUString& aElementName, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xDest, - const ::rtl::OUString& rNewName ) + const OUString& rNewName ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, @@ -317,7 +317,7 @@ public: OutputStream( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext, - const rtl::OUString & rUri, + const OUString & rUri, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, const com::sun::star::uno::Reference< @@ -399,7 +399,7 @@ public: Stream( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext, - const rtl::OUString & rUri, + const OUString & rUri, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, const com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index 5b8abeff2db9..7f250371e59a 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -84,7 +84,7 @@ StorageElementFactory::createTemporaryStorage() //========================================================================= uno::Reference< embed::XStorage > -StorageElementFactory::createStorage( const rtl::OUString & rUri, +StorageElementFactory::createStorage( const OUString & rUri, StorageAccessMode eMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -98,7 +98,7 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, ( eMode != READ_WRITE_NOCREATE ) && ( eMode != READ_WRITE_CREATE ) ) throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Invalid open mode!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -107,13 +107,13 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, if ( aUri.isRoot() ) { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Root never has a storage!" ), uno::Reference< uno::XInterface >(), sal_Int16( 1 ) ); } - rtl::OUString aUriKey + OUString aUriKey ( ( rUri.getStr()[ rUri.getLength() - 1 ] == sal_Unicode( '/' ) ) ? rUri.copy( 0, rUri.getLength() - 1 ) : rUri ); @@ -185,7 +185,7 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, aIt = m_aMap.insert( StorageMap::value_type( - std::pair< rtl::OUString, bool >( aUriKey, bWritable ), + std::pair< OUString, bool >( aUriKey, bWritable ), xElement.get() ) ).first; aIt->second->m_aContainerIt = aIt; @@ -238,8 +238,8 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri, //========================================================================= uno::Reference< io::XInputStream > -StorageElementFactory::createInputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword ) +StorageElementFactory::createInputStream( const OUString & rUri, + const OUString & rPassword ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, io::IOException, @@ -267,8 +267,8 @@ StorageElementFactory::createInputStream( const rtl::OUString & rUri, //========================================================================= uno::Reference< io::XOutputStream > -StorageElementFactory::createOutputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, +StorageElementFactory::createOutputStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -312,8 +312,8 @@ StorageElementFactory::createOutputStream( const rtl::OUString & rUri, //========================================================================= uno::Reference< io::XStream > -StorageElementFactory::createStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, +StorageElementFactory::createStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -366,7 +366,7 @@ void StorageElementFactory::releaseElement( Storage * pElement ) SAL_THROW(()) //========================================================================= uno::Reference< embed::XStorage > StorageElementFactory::queryParentStorage( - const rtl::OUString & rUri, StorageAccessMode eMode ) + const OUString & rUri, StorageAccessMode eMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, io::IOException, @@ -391,7 +391,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryParentStorage( //========================================================================= uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( const uno::Reference< embed::XStorage > & xParentStorage, - const rtl::OUString & rUri, + const OUString & rUri, StorageAccessMode eMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -413,14 +413,14 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { if ( eMode == READ_WRITE_CREATE ) throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Invalid open mode: document storages cannot be " "created!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); else throw embed::InvalidStorageException( - rtl::OUString( "Invalid document id!" ), + OUString( "Invalid document id!" ), uno::Reference< uno::XInterface >() ); } @@ -434,7 +434,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( try { uno::Any aPropValue = xPropSet->getPropertyValue( - rtl::OUString( "OpenMode" ) ); + OUString( "OpenMode" ) ); sal_Int32 nOpenMode = 0; if ( aPropValue >>= nOpenMode ) @@ -446,7 +446,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // document opened, but not readable. throw embed::InvalidStorageException( - rtl::OUString( + OUString( "Storage is open, but not readable!" ), uno::Reference< uno::XInterface >() ); } @@ -459,7 +459,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // document opened, but not writable. throw embed::InvalidStorageException( - rtl::OUString( + OUString( "Storage is open, but not writable!" ), uno::Reference< uno::XInterface >() ); } @@ -473,7 +473,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( "Bug! Value of property OpenMode has wrong type!" ); throw uno::RuntimeException( - rtl::OUString( + OUString( "Bug! Value of property OpenMode has wrong type!" ), uno::Reference< uno::XInterface >() ); } @@ -483,7 +483,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( OSL_FAIL( "Property OpenMode not supported!" ); throw embed::StorageWrappedTargetException( - rtl::OUString( + OUString( "Bug! Value of property OpenMode has wrong type!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); @@ -493,7 +493,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( OSL_FAIL( "Caught WrappedTargetException!" ); throw embed::StorageWrappedTargetException( - rtl::OUString( + OUString( "WrappedTargetException during getPropertyValue!" ), uno::Reference< uno::XInterface >(), uno::makeAny( e ) ); @@ -503,7 +503,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( { // sub storage - const rtl::OUString & rName = aUri.getDecodedName(); + const OUString & rName = aUri.getDecodedName(); if ( eMode == READ ) { @@ -541,8 +541,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( uno::Reference< io::XStream > StorageElementFactory::queryStream( const uno::Reference< embed::XStorage > & xParentStorage, - const rtl::OUString & rUri, - const rtl::OUString & rPassword, + const OUString & rUri, + const OUString & rPassword, StorageAccessMode eMode, bool bTruncate ) throw ( embed::InvalidStorageException, @@ -557,7 +557,7 @@ StorageElementFactory::queryStream( if ( !xParentStorage.is() ) { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "No parent storage!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -567,7 +567,7 @@ StorageElementFactory::queryStream( if ( aUri.isRoot() ) { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "Root never is a stream!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -575,7 +575,7 @@ StorageElementFactory::queryStream( else if ( aUri.isDocument() ) { throw lang::IllegalArgumentException( - rtl::OUString( + OUString( "A document never is a stream!" ), uno::Reference< uno::XInterface >(), sal_Int16( 2 ) ); @@ -613,7 +613,7 @@ StorageElementFactory::queryStream( OSL_FAIL( "StorageElementFactory::queryStream : Unknown open mode!" ); throw embed::InvalidStorageException( - rtl::OUString( + OUString( "Unknown open mode!" ), uno::Reference< uno::XInterface >() ); } @@ -670,7 +670,7 @@ StorageElementFactory::queryStream( if ( !xStream.is() ) { throw embed::InvalidStorageException( - rtl::OUString( + OUString( "No stream!" ), uno::Reference< uno::XInterface >() ); } diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx index 9904ab9d62ba..f8ab7b5c68d5 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.hxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx @@ -55,7 +55,7 @@ namespace tdoc_ucp { com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - createStorage( const rtl::OUString & rUri, StorageAccessMode eMode ) + createStorage( const OUString & rUri, StorageAccessMode eMode ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, @@ -63,8 +63,8 @@ namespace tdoc_ucp { com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - createInputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword ) + createInputStream( const OUString & rUri, + const OUString & rPassword ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, @@ -73,8 +73,8 @@ namespace tdoc_ucp { com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > - createOutputStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, + createOutputStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -84,8 +84,8 @@ namespace tdoc_ucp { com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::io::XStream > - createStream( const rtl::OUString & rUri, - const rtl::OUString & rPassword, + createStream( const OUString & rUri, + const OUString & rPassword, bool bTruncate ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -100,7 +100,7 @@ namespace tdoc_ucp { void releaseElement( Storage * pElement ) SAL_THROW(()); com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - queryParentStorage( const rtl::OUString & rUri, + queryParentStorage( const OUString & rUri, StorageAccessMode eMode ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -111,7 +111,7 @@ namespace tdoc_ucp { com::sun::star::uno::Reference< com::sun::star::embed::XStorage > queryStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, - const rtl::OUString & rUri, + const OUString & rUri, StorageAccessMode eMode ) throw ( com::sun::star::embed::InvalidStorageException, com::sun::star::lang::IllegalArgumentException, @@ -122,8 +122,8 @@ namespace tdoc_ucp { com::sun::star::uno::Reference< com::sun::star::io::XStream > queryStream( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > & xParentStorage, - const rtl::OUString & rPassword, - const rtl::OUString & rUri, + const OUString & rPassword, + const OUString & rUri, StorageAccessMode eMode, bool bTruncate /* ignored for read-only streams */ ) throw ( com::sun::star::embed::InvalidStorageException, @@ -136,8 +136,8 @@ namespace tdoc_ucp { struct ltstrbool { bool operator()( - const std::pair< rtl::OUString, bool > & s1, - const std::pair< rtl::OUString, bool > & s2 ) const + const std::pair< OUString, bool > & s1, + const std::pair< OUString, bool > & s2 ) const { if ( s1.first < s2.first ) return true; @@ -150,7 +150,7 @@ namespace tdoc_ucp { // key: pair< storageuri, iswritable > typedef std::map< - std::pair< rtl::OUString, bool >, Storage *, ltstrbool > StorageMap; + std::pair< OUString, bool >, Storage *, ltstrbool > StorageMap; StorageMap m_aMap; osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx index 8d5584df2d14..037d4d937cb2 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.cxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx @@ -54,7 +54,7 @@ void Uri::init() const } // Check for proper scheme. (Scheme is case insensitive.) - rtl::OUString aScheme + OUString aScheme = m_aUri.copy( 0, TDOC_URL_SCHEME_LENGTH ).toAsciiLowerCase(); if ( aScheme != TDOC_URL_SCHEME ) { @@ -116,7 +116,7 @@ void Uri::init() const if ( nSlash != - 1 ) m_aInternalPath = m_aPath.copy( nSlash ); else - m_aInternalPath = rtl::OUString("/"); + m_aInternalPath = OUString("/"); } m_eState = VALID; diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx index bf6d19baf034..4da9166e17dc 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.hxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx @@ -35,13 +35,13 @@ class Uri { enum State { UNKNOWN, INVALID, VALID }; - mutable ::rtl::OUString m_aUri; - mutable ::rtl::OUString m_aParentUri; - mutable ::rtl::OUString m_aPath; - mutable ::rtl::OUString m_aDocId; - mutable ::rtl::OUString m_aInternalPath; - mutable ::rtl::OUString m_aName; - mutable ::rtl::OUString m_aDecodedName; + mutable OUString m_aUri; + mutable OUString m_aParentUri; + mutable OUString m_aPath; + mutable OUString m_aDocId; + mutable OUString m_aInternalPath; + mutable OUString m_aName; + mutable OUString m_aDecodedName; mutable State m_eState; private: @@ -49,7 +49,7 @@ private: public: Uri() : m_eState( UNKNOWN ) {} - Uri( const ::rtl::OUString & rUri ) + Uri( const OUString & rUri ) : m_aUri( rUri ), m_eState( UNKNOWN ) {} bool operator== ( const Uri & rOther ) const @@ -61,27 +61,27 @@ public: sal_Bool isValid() const { init(); return m_eState == VALID; } - const ::rtl::OUString & getUri() const + const OUString & getUri() const { init(); return m_aUri; } - inline void setUri( const ::rtl::OUString & rUri ); + inline void setUri( const OUString & rUri ); - const ::rtl::OUString & getParentUri() const + const OUString & getParentUri() const { init(); return m_aParentUri; } - const ::rtl::OUString & getPath() const + const OUString & getPath() const { init(); return m_aPath; } - const ::rtl::OUString & getDocumentId() const + const OUString & getDocumentId() const { init(); return m_aDocId; } - const ::rtl::OUString & getInternalPath() const + const OUString & getInternalPath() const { init(); return m_aInternalPath; } - const ::rtl::OUString & getName() const + const OUString & getName() const { init(); return m_aName; } - const ::rtl::OUString & getDecodedName() const + const OUString & getDecodedName() const { init(); return m_aDecodedName; } inline sal_Bool isRoot() const; @@ -91,12 +91,12 @@ public: inline sal_Bool isFolder() const; }; -inline void Uri::setUri( const ::rtl::OUString & rUri ) +inline void Uri::setUri( const OUString & rUri ) { m_eState = UNKNOWN; m_aUri = rUri; m_aParentUri = m_aDocId = m_aInternalPath = m_aPath = m_aName - = m_aDecodedName = rtl::OUString(); + = m_aDecodedName = OUString(); } inline sal_Bool Uri::isRoot() const diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx index d2f5437abc4d..fcc3c90d2f40 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx @@ -103,16 +103,16 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) NeonUri aURI( rResource.uri ); m_aEscapedTitle = aURI.GetPathBaseName(); - (*m_xProps)[ rtl::OUString("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( aURI.GetPathBaseNameUnescaped() ), true ); } catch ( DAVException const & ) { - (*m_xProps)[ rtl::OUString("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( - rtl::OUString( + OUString( "*** unknown ***" ) ), true ); } @@ -135,24 +135,24 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) //========================================================================= ContentProperties::ContentProperties( - const rtl::OUString & rTitle, sal_Bool bFolder ) + const OUString & rTitle, sal_Bool bFolder ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( sal_False ) { - (*m_xProps)[ rtl::OUString("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( rTitle ), true ); - (*m_xProps)[ rtl::OUString("IsFolder") ] + (*m_xProps)[ OUString("IsFolder") ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString("IsDocument") ] + (*m_xProps)[ OUString("IsDocument") ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); } //========================================================================= -ContentProperties::ContentProperties( const rtl::OUString & rTitle ) +ContentProperties::ContentProperties( const OUString & rTitle ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( sal_False ) { - (*m_xProps)[ rtl::OUString("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( rTitle ), true ); } @@ -174,7 +174,7 @@ ContentProperties::ContentProperties( const ContentProperties & rOther ) } //========================================================================= -bool ContentProperties::contains( const rtl::OUString & rName ) const +bool ContentProperties::contains( const OUString & rName ) const { if ( get( rName ) ) return true; @@ -184,7 +184,7 @@ bool ContentProperties::contains( const rtl::OUString & rName ) const //========================================================================= const uno::Any & ContentProperties::getValue( - const rtl::OUString & rName ) const + const OUString & rName ) const { const PropertyValue * pProp = get( rName ); if ( pProp ) @@ -195,7 +195,7 @@ const uno::Any & ContentProperties::getValue( //========================================================================= const PropertyValue * ContentProperties::get( - const rtl::OUString & rName ) const + const OUString & rName ) const { PropertyValueMap::const_iterator it = m_xProps->find( rName ); const PropertyValueMap::const_iterator end = m_xProps->end(); @@ -220,7 +220,7 @@ const PropertyValue * ContentProperties::get( // static void ContentProperties::UCBNamesToDAVNames( const uno::Sequence< beans::Property > & rProps, - std::vector< rtl::OUString > & propertyNames, + std::vector< OUString > & propertyNames, bool bIncludeUnmatched /* = true */ ) { ////////////////////////////////////////////////////////////// @@ -307,7 +307,7 @@ void ContentProperties::UCBNamesToDAVNames( // static void ContentProperties::UCBNamesToHTTPNames( const uno::Sequence< beans::Property > & rProps, - std::vector< rtl::OUString > & propertyNames, + std::vector< OUString > & propertyNames, bool bIncludeUnmatched /* = true */ ) { ////////////////////////////////////////////////////////////// @@ -328,17 +328,17 @@ void ContentProperties::UCBNamesToHTTPNames( if ( rProp.Name == "DateModified" ) { propertyNames.push_back( - rtl::OUString("Last-Modified") ); + OUString("Last-Modified") ); } else if ( rProp.Name == "MediaType" ) { propertyNames.push_back( - rtl::OUString("Content-Type") ); + OUString("Content-Type") ); } else if ( rProp.Name == "Size" ) { propertyNames.push_back( - rtl::OUString("Content-Length") ); + OUString("Content-Length") ); } else { @@ -351,14 +351,14 @@ void ContentProperties::UCBNamesToHTTPNames( //========================================================================= bool ContentProperties::containsAllNames( const uno::Sequence< beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const + std::vector< OUString > & rNamesNotContained ) const { rNamesNotContained.clear(); sal_Int32 nCount = rProps.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString & rName = rProps[ n ].Name; + const OUString & rName = rProps[ n ].Name; if ( !contains( rName ) ) { // Not found. @@ -371,15 +371,15 @@ bool ContentProperties::containsAllNames( //========================================================================= void ContentProperties::addProperties( - const std::vector< rtl::OUString > & rProps, + const std::vector< OUString > & rProps, const ContentProperties & rContentProps ) { - std::vector< rtl::OUString >::const_iterator it = rProps.begin(); - std::vector< rtl::OUString >::const_iterator end = rProps.end(); + std::vector< OUString >::const_iterator it = rProps.begin(); + std::vector< OUString >::const_iterator end = rProps.end(); while ( it != end ) { - const rtl::OUString & rName = (*it); + const OUString & rName = (*it); if ( !contains( rName ) ) // ignore duplicates { @@ -405,19 +405,19 @@ void ContentProperties::addProperty( const DAVPropertyValue & rProp ) } //========================================================================= -void ContentProperties::addProperty( const rtl::OUString & rName, +void ContentProperties::addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ) { if ( rName.equals( DAVProperties::CREATIONDATE ) ) { // Map DAV:creationdate to UCP:DateCreated - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString("DateCreated") ] + (*m_xProps)[ OUString("DateCreated") ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::DISPLAYNAME ) ) @@ -429,10 +429,10 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName.equals( DAVProperties::GETCONTENTLENGTH ) ) { // Map DAV:getcontentlength to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString("Size") ] + (*m_xProps)[ OUString("Size") ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName == "Content-Length" ) @@ -441,16 +441,16 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map Content-Length entity header to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString("Size") ] + (*m_xProps)[ OUString("Size") ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName.equals( DAVProperties::GETCONTENTTYPE ) ) { // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString("MediaType") ] + (*m_xProps)[ OUString("MediaType") ] = PropertyValue( rValue, true ); } else if ( rName == "Content-Type" ) @@ -459,7 +459,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString("MediaType") ] + (*m_xProps)[ OUString("MediaType") ] = PropertyValue( rValue, true ); } // else if ( rName.equals( DAVProperties::GETETAG ) ) @@ -468,12 +468,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName.equals( DAVProperties::GETLASTMODIFIED ) ) { // Map the DAV:getlastmodified entity header to UCP:DateModified - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString("DateModified") ] + (*m_xProps)[ OUString("DateModified") ] = PropertyValue( uno::makeAny( aDate ), true ); } else if ( rName == "Last-Modified" ) @@ -482,12 +482,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map the Last-Modified entity header to UCP:DateModified - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString("DateModified") ] + (*m_xProps)[ OUString("DateModified") ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) ) @@ -495,20 +495,20 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // } else if ( rName.equals( DAVProperties::RESOURCETYPE ) ) { - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType sal_Bool bFolder = aValue.equalsIgnoreAsciiCase( "collection" ); - (*m_xProps)[ rtl::OUString("IsFolder") ] + (*m_xProps)[ OUString("IsFolder") ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString("IsDocument") ] + (*m_xProps)[ OUString("IsDocument") ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); - (*m_xProps)[ rtl::OUString("ContentType") ] + (*m_xProps)[ OUString("ContentType") ] = PropertyValue( uno::makeAny( bFolder - ? rtl::OUString( WEBDAV_COLLECTION_TYPE ) - : rtl::OUString( WEBDAV_CONTENT_TYPE ) ), true ); + ? OUString( WEBDAV_COLLECTION_TYPE ) + : OUString( WEBDAV_CONTENT_TYPE ) ), true ); } // else if ( rName.equals( DAVProperties::SOURCE ) ) // { @@ -531,25 +531,25 @@ void ContentProperties::addProperty( const rtl::OUString & rName, namespace { - bool isCachable( rtl::OUString const & rName, + bool isCachable( OUString const & rName, bool isCaseSensitive ) { - static rtl::OUString aNonCachableProps [] = + static OUString aNonCachableProps [] = { DAVProperties::LOCKDISCOVERY, DAVProperties::GETETAG, - rtl::OUString( "ETag" ), + OUString( "ETag" ), - rtl::OUString( "DateModified" ), - rtl::OUString( "Last-Modified" ), + OUString( "DateModified" ), + OUString( "Last-Modified" ), DAVProperties::GETLASTMODIFIED, - rtl::OUString( "Size" ), - rtl::OUString( "Content-Length" ), + OUString( "Size" ), + OUString( "Content-Length" ), DAVProperties::GETCONTENTLENGTH, - rtl::OUString( "Date" ) + OUString( "Date" ) }; for ( sal_uInt32 n = 0; diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx index 4f64c016823a..6022439364af 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx @@ -49,7 +49,7 @@ struct DAVResource; struct equalString { - bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const + bool operator()( const OUString& s1, const OUString& s2 ) const { return !!( s1 == s2 ); } @@ -57,7 +57,7 @@ struct equalString struct hashString { - size_t operator()( const rtl::OUString & rName ) const + size_t operator()( const OUString & rName ) const { return rName.hashCode(); } @@ -91,7 +91,7 @@ public: typedef boost::unordered_map < - rtl::OUString, + OUString, PropertyValue, hashString, equalString @@ -108,17 +108,17 @@ public: ContentProperties( const DAVResource& rResource ); // Mini props for transient contents. - ContentProperties( const rtl::OUString & rTitle, sal_Bool bFolder ); + ContentProperties( const OUString & rTitle, sal_Bool bFolder ); // Micro props for non-existing contents. - ContentProperties( const rtl::OUString & rTitle ); + ContentProperties( const OUString & rTitle ); ContentProperties( const ContentProperties & rOther ); - bool contains( const rtl::OUString & rName ) const; + bool contains( const OUString & rName ) const; const com::sun::star::uno::Any & - getValue( const rtl::OUString & rName ) const; + getValue( const OUString & rName ) const; // Maps the UCB property names contained in rProps with their DAV property // counterparts, if possible. All unmappable properties will be included @@ -130,7 +130,7 @@ public: static void UCBNamesToDAVNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property > & rProps, - std::vector< rtl::OUString > & resources, + std::vector< OUString > & resources, bool bIncludeUnmatched = true ); // Maps the UCB property names contained in rProps with their HTTP header @@ -143,7 +143,7 @@ public: static void UCBNamesToHTTPNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property > & rProps, - std::vector< rtl::OUString > & resources, + std::vector< OUString > & resources, bool bIncludeUnmatched = true ); // return true, if all properties contained in rProps are contained in @@ -152,16 +152,16 @@ public: bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const; + std::vector< OUString > & rNamesNotContained ) const; // adds all properties described by rProps that are actually contained in // rContentProps to this instance. In case of duplicates the value // already contained in this will left unchanged. - void addProperties( const std::vector< rtl::OUString > & rProps, + void addProperties( const std::vector< OUString > & rProps, const ContentProperties & rContentProps ); // overwrites probably existing entry. - void addProperty( const rtl::OUString & rName, + void addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ); @@ -170,7 +170,7 @@ public: bool isTrailingSlash() const { return m_bTrailingSlash; } - const rtl::OUString & getEscapedTitle() const { return m_aEscapedTitle; } + const OUString & getEscapedTitle() const { return m_aEscapedTitle; } // Not good to expose implementation details, but this is actually an // internal class. @@ -178,7 +178,7 @@ public: { return m_xProps; } private: - ::rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; std::auto_ptr< PropertyValueMap > m_xProps; bool m_bTrailingSlash; @@ -186,7 +186,7 @@ private: ContentProperties & operator=( const ContentProperties & ); // n.i. - const PropertyValue * get( const rtl::OUString & rName ) const; + const PropertyValue * get( const OUString & rName ) const; }; class CachableContentProperties @@ -207,11 +207,11 @@ public: bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const + std::vector< OUString > & rNamesNotContained ) const { return m_aProps.containsAllNames( rProps, rNamesNotContained ); } const com::sun::star::uno::Any & - getValue( const rtl::OUString & rName ) const + getValue( const OUString & rName ) const { return m_aProps.getValue( rName ); } operator const ContentProperties & () const { return m_aProps; } diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx index 7e4a34b56564..1d9e665280a0 100644 --- a/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx +++ b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx @@ -41,10 +41,10 @@ class DAVAuthListener : public salhelper::SimpleReferenceObject { public: virtual int authenticate( - const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials ) = 0; }; diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx index db5f44655659..7428c358ebd5 100644 --- a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx @@ -53,24 +53,24 @@ namespace webdav_ucp DAVAuthListener_Impl( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& xEnv, - const ::rtl::OUString & inURL ) + const OUString & inURL ) : m_xEnv( xEnv ), m_aURL( inURL ) { } - virtual int authenticate( const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + virtual int authenticate( const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials ); private: const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; - const rtl::OUString m_aURL; + const OUString m_aURL; - rtl::OUString m_aPrevPassword; - rtl::OUString m_aPrevUsername; + OUString m_aPrevPassword; + OUString m_aPrevUsername; }; } diff --git a/ucb/source/ucp/webdav-neon/DAVException.hxx b/ucb/source/ucp/webdav-neon/DAVException.hxx index 376f7ff337ed..4c3ab54bc930 100644 --- a/ucb/source/ucp/webdav-neon/DAVException.hxx +++ b/ucb/source/ucp/webdav-neon/DAVException.hxx @@ -140,25 +140,25 @@ class DAVException private: ExceptionCode mExceptionCode; - rtl::OUString mData; + OUString mData; sal_uInt16 mStatusCode; public: DAVException( ExceptionCode inExceptionCode ) : mExceptionCode( inExceptionCode ), mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const rtl::OUString & rData ) : + const OUString & rData ) : mExceptionCode( inExceptionCode ), mData( rData ), mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const rtl::OUString & rData, + const OUString & rData, sal_uInt16 nStatusCode ) : mExceptionCode( inExceptionCode ), mData( rData ), mStatusCode( nStatusCode ) {}; ~DAVException( ) {}; const ExceptionCode & getError() const { return mExceptionCode; } - const rtl::OUString & getData() const { return mData; } + const OUString & getData() const { return mData; } sal_uInt16 getStatus() const { return mStatusCode; } }; diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.cxx b/ucb/source/ucp/webdav-neon/DAVProperties.cxx index 29e972f231a5..a95aea3482f4 100644 --- a/ucb/source/ucp/webdav-neon/DAVProperties.cxx +++ b/ucb/source/ucp/webdav-neon/DAVProperties.cxx @@ -32,28 +32,28 @@ using namespace webdav_ucp; -const ::rtl::OUString DAVProperties::CREATIONDATE("DAV:creationdate"); -const ::rtl::OUString DAVProperties::DISPLAYNAME("DAV:displayname"); -const ::rtl::OUString DAVProperties::GETCONTENTLANGUAGE("DAV:getcontentlanguage"); -const ::rtl::OUString DAVProperties::GETCONTENTLENGTH("DAV:getcontentlength"); -const ::rtl::OUString DAVProperties::GETCONTENTTYPE("DAV:getcontenttype"); -const ::rtl::OUString DAVProperties::GETETAG("DAV:getetag"); -const ::rtl::OUString DAVProperties::GETLASTMODIFIED("DAV:getlastmodified"); -const ::rtl::OUString DAVProperties::LOCKDISCOVERY("DAV:lockdiscovery"); -const ::rtl::OUString DAVProperties::RESOURCETYPE("DAV:resourcetype"); -const ::rtl::OUString DAVProperties::SOURCE("DAV:source"); -const ::rtl::OUString DAVProperties::SUPPORTEDLOCK("DAV:supportedlock"); +const OUString DAVProperties::CREATIONDATE("DAV:creationdate"); +const OUString DAVProperties::DISPLAYNAME("DAV:displayname"); +const OUString DAVProperties::GETCONTENTLANGUAGE("DAV:getcontentlanguage"); +const OUString DAVProperties::GETCONTENTLENGTH("DAV:getcontentlength"); +const OUString DAVProperties::GETCONTENTTYPE("DAV:getcontenttype"); +const OUString DAVProperties::GETETAG("DAV:getetag"); +const OUString DAVProperties::GETLASTMODIFIED("DAV:getlastmodified"); +const OUString DAVProperties::LOCKDISCOVERY("DAV:lockdiscovery"); +const OUString DAVProperties::RESOURCETYPE("DAV:resourcetype"); +const OUString DAVProperties::SOURCE("DAV:source"); +const OUString DAVProperties::SUPPORTEDLOCK("DAV:supportedlock"); -const ::rtl::OUString DAVProperties::EXECUTABLE("http://apache.org/dav/props/executable"); +const OUString DAVProperties::EXECUTABLE("http://apache.org/dav/props/executable"); -void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, +void DAVProperties::createNeonPropName( const OUString & rFullName, NeonPropName & rName ) { if ( rFullName.startsWith( "DAV:" ) ) { rName.nspace = "DAV:"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "DAV:" ) ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -61,7 +61,7 @@ void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, { rName.nspace = "http://apache.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://apache.org/dav/props/" ) ), @@ -71,7 +71,7 @@ void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, { rName.nspace = "http://ucb.openoffice.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://ucb.openoffice.org/dav/props/" ) ), @@ -81,8 +81,8 @@ void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, { // Support for 3rd party namespaces/props - rtl::OString aFullName - = rtl::OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ); + OString aFullName + = OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ); // Format: @@ -99,19 +99,19 @@ void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, // Add our namespace to our own properties. rName.nspace = "http://ucb.openoffice.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( rFullName, + = strdup( OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ).getStr() ); } } void DAVProperties::createUCBPropName( const char * nspace, const char * name, - rtl::OUString & rFullName ) + OUString & rFullName ) { - rtl::OUString aNameSpace - = rtl::OStringToOUString( nspace, RTL_TEXTENCODING_UTF8 ); - rtl::OUString aName - = rtl::OStringToOUString( name, RTL_TEXTENCODING_UTF8 ); + OUString aNameSpace + = OStringToOUString( nspace, RTL_TEXTENCODING_UTF8 ); + OUString aName + = OStringToOUString( name, RTL_TEXTENCODING_UTF8 ); if ( aNameSpace.isEmpty() ) { @@ -130,7 +130,7 @@ void DAVProperties::createUCBPropName( const char * nspace, DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::SOURCE.matchIgnoreAsciiCase( aName, 4 ) ) - aNameSpace = rtl::OUString( "DAV:" ); + aNameSpace = OUString( "DAV:" ); } // Note: Concatenating strings BEFORE comparing against known namespaces @@ -156,11 +156,11 @@ void DAVProperties::createUCBPropName( const char * nspace, else { // Create property name that encodes, namespace and name ( XML ). - rFullName = rtl::OUString("" ); + rFullName += OUString( "\">" ); } } diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.hxx b/ucb/source/ucp/webdav-neon/DAVProperties.hxx index 2cf049ffa672..dbd967feaf4d 100644 --- a/ucb/source/ucp/webdav-neon/DAVProperties.hxx +++ b/ucb/source/ucp/webdav-neon/DAVProperties.hxx @@ -36,24 +36,24 @@ namespace webdav_ucp struct DAVProperties { - static const ::rtl::OUString CREATIONDATE; - static const ::rtl::OUString DISPLAYNAME; - static const ::rtl::OUString GETCONTENTLANGUAGE; - static const ::rtl::OUString GETCONTENTLENGTH; - static const ::rtl::OUString GETCONTENTTYPE; - static const ::rtl::OUString GETETAG; - static const ::rtl::OUString GETLASTMODIFIED; - static const ::rtl::OUString LOCKDISCOVERY; - static const ::rtl::OUString RESOURCETYPE; - static const ::rtl::OUString SOURCE; - static const ::rtl::OUString SUPPORTEDLOCK; - static const ::rtl::OUString EXECUTABLE; + static const OUString CREATIONDATE; + static const OUString DISPLAYNAME; + static const OUString GETCONTENTLANGUAGE; + static const OUString GETCONTENTLENGTH; + static const OUString GETCONTENTTYPE; + static const OUString GETETAG; + static const OUString GETLASTMODIFIED; + static const OUString LOCKDISCOVERY; + static const OUString RESOURCETYPE; + static const OUString SOURCE; + static const OUString SUPPORTEDLOCK; + static const OUString EXECUTABLE; - static void createNeonPropName( const rtl::OUString & rFullName, + static void createNeonPropName( const OUString & rFullName, NeonPropName & rName ); static void createUCBPropName ( const char * nspace, const char * name, - rtl::OUString & rFullName ); + OUString & rFullName ); static bool isUCBDeadProperty( const NeonPropName & rName ); }; diff --git a/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx index 6f3862d376fa..3c435bab51c9 100644 --- a/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx +++ b/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx @@ -34,19 +34,19 @@ namespace webdav_ucp { - typedef std::pair< rtl::OUString, rtl::OUString > DAVRequestHeader; + typedef std::pair< OUString, OUString > DAVRequestHeader; typedef std::vector< DAVRequestHeader > DAVRequestHeaders; struct DAVRequestEnvironment { - rtl::OUString m_aRequestURI; + OUString m_aRequestURI; rtl::Reference< DAVAuthListener > m_xAuthListener; // rtl::Reference< DAVStatusListener > m_xStatusListener; // rtl::Reference< DAVProgressListener > m_xStatusListener; DAVRequestHeaders m_aRequestHeaders; uno::Reference< ucb::XCommandEnvironment > m_xEnv; -DAVRequestEnvironment( const rtl::OUString & rRequestURI, +DAVRequestEnvironment( const OUString & rRequestURI, const rtl::Reference< DAVAuthListener > & xListener, const DAVRequestHeaders & rRequestHeaders, const uno::Reference< ucb::XCommandEnvironment > & xEnv) diff --git a/ucb/source/ucp/webdav-neon/DAVResource.hxx b/ucb/source/ucp/webdav-neon/DAVResource.hxx index d12e08e5cca7..eeba4efa5dce 100644 --- a/ucb/source/ucp/webdav-neon/DAVResource.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResource.hxx @@ -39,7 +39,7 @@ namespace webdav_ucp struct DAVPropertyValue { - rtl::OUString Name; + OUString Name; com::sun::star::uno::Any Value; bool IsCaseSensitive; @@ -48,19 +48,19 @@ struct DAVPropertyValue struct DAVResource { - ::rtl::OUString uri; + OUString uri; std::vector< DAVPropertyValue > properties; DAVResource() {} - DAVResource( const ::rtl::OUString & inUri ) : uri( inUri ) {} + DAVResource( const OUString & inUri ) : uri( inUri ) {} }; struct DAVResourceInfo { - ::rtl::OUString uri; - std::vector < ::rtl::OUString > properties; + OUString uri; + std::vector < OUString > properties; - DAVResourceInfo( const ::rtl::OUString & inUri ) : uri( inUri ) {} + DAVResourceInfo( const OUString & inUri ) : uri( inUri ) {} }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx index 61f4969308d0..a3976b92b871 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx @@ -53,10 +53,10 @@ using namespace com::sun::star; //========================================================================= // virtual int DAVAuthListener_Impl::authenticate( - const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials ) { if ( m_xEnv.is() ) @@ -77,7 +77,7 @@ int DAVAuthListener_Impl::authenticate( rtl::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest = new ucbhelper::SimpleAuthenticationRequest( m_aURL, inHostName, inRealm, inoutUserName, - outPassWord, ::rtl::OUString(), + outPassWord, OUString(), true /*bAllowPersistentStoring*/, bCanUseSystemCredentials ); xIH->handle( xRequest.get() ); @@ -106,8 +106,8 @@ int DAVAuthListener_Impl::authenticate( { // This is the (strange) way to tell neon to use // system credentials. - inoutUserName = rtl::OUString(); - outPassWord = rtl::OUString(); + inoutUserName = OUString(); + outPassWord = OUString(); } else { @@ -141,7 +141,7 @@ int DAVAuthListener_Impl::authenticate( DAVResourceAccess::DAVResourceAccess( const uno::Reference< uno::XComponentContext > & rxContext, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ) + const OUString & rURL ) : m_aURL( rURL ), m_xSessionFactory( rSessionFactory ), m_xContext( rxContext ) @@ -194,7 +194,7 @@ void DAVResourceAccess::OPTIONS( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "OPTIONS" ), + OUString( "OPTIONS" ), aHeaders ); m_xSession->OPTIONS( getRequestURI(), @@ -219,7 +219,7 @@ void DAVResourceAccess::OPTIONS( //========================================================================= void DAVResourceAccess::PROPFIND( const Depth nDepth, - const std::vector< rtl::OUString > & rPropertyNames, + const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -237,7 +237,7 @@ void DAVResourceAccess::PROPFIND( getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "PROPFIND" ), + OUString( "PROPFIND" ), aHeaders ); m_xSession->PROPFIND( getRequestURI(), @@ -279,7 +279,7 @@ void DAVResourceAccess::PROPFIND( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "PROPFIND" ), + OUString( "PROPFIND" ), aHeaders ); m_xSession->PROPFIND( getRequestURI(), @@ -319,7 +319,7 @@ void DAVResourceAccess::PROPPATCH( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "PROPPATCH" ), + OUString( "PROPPATCH" ), aHeaders ); m_xSession->PROPPATCH( getRequestURI(), @@ -342,7 +342,7 @@ void DAVResourceAccess::PROPPATCH( //========================================================================= void DAVResourceAccess::HEAD( - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( DAVException ) @@ -359,7 +359,7 @@ void DAVResourceAccess::HEAD( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("HEAD"), + OUString("HEAD"), aHeaders ); m_xSession->HEAD( getRequestURI(), @@ -399,7 +399,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -440,7 +440,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); m_xSession->GET( getRequestURI(), @@ -463,7 +463,7 @@ void DAVResourceAccess::GET( //========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::GET( - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -481,7 +481,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -509,7 +509,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( //========================================================================= void DAVResourceAccess::GET( uno::Reference< io::XOutputStream > & rStream, - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -526,7 +526,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); m_xSession->GET( getRequestURI(), @@ -611,7 +611,7 @@ void DAVResourceAccess::PUT( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("PUT"), + OUString("PUT"), aHeaders ); m_xSession->PUT( getRequestURI(), @@ -634,8 +634,8 @@ void DAVResourceAccess::PUT( //========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ) @@ -663,7 +663,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("POST"), + OUString("POST"), aHeaders ); xStream = m_xSession->POST( getRequestURI(), @@ -697,8 +697,8 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( //========================================================================= void DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, uno::Reference< io::XOutputStream > & rOutputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) @@ -726,7 +726,7 @@ void DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("POST"), + OUString("POST"), aHeaders ); m_xSession->POST( getRequestURI(), @@ -774,7 +774,7 @@ void DAVResourceAccess::MKCOL( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("MKCOL"), + OUString("MKCOL"), aHeaders ); m_xSession->MKCOL( getRequestURI(), @@ -796,8 +796,8 @@ void DAVResourceAccess::MKCOL( //========================================================================= void DAVResourceAccess::COPY( - const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -814,7 +814,7 @@ void DAVResourceAccess::COPY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("COPY"), + OUString("COPY"), aHeaders ); m_xSession->COPY( rSourcePath, @@ -838,8 +838,8 @@ void DAVResourceAccess::COPY( //========================================================================= void DAVResourceAccess::MOVE( - const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -856,7 +856,7 @@ void DAVResourceAccess::MOVE( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("MOVE"), + OUString("MOVE"), aHeaders ); m_xSession->MOVE( rSourcePath, @@ -895,7 +895,7 @@ void DAVResourceAccess::DESTROY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "DESTROY" ), + OUString( "DESTROY" ), aHeaders ); m_xSession->DESTROY( getRequestURI(), @@ -934,7 +934,7 @@ void DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("LOCK"), + OUString("LOCK"), aHeaders ); m_xSession->LOCK( getRequestURI(), @@ -976,7 +976,7 @@ sal_Int64 DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("LOCK"), + OUString("LOCK"), aHeaders ); nNewTimeout = m_xSession->LOCK( getRequestURI(), @@ -1018,7 +1018,7 @@ void DAVResourceAccess::UNLOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("UNLOCK"), + OUString("UNLOCK"), aHeaders ); m_xSession->UNLOCK( getRequestURI(), @@ -1047,12 +1047,12 @@ void DAVResourceAccess::setFlags( const uno::Sequence< beans::NamedValue >& rFla } //========================================================================= -void DAVResourceAccess::setURL( const rtl::OUString & rNewURL ) +void DAVResourceAccess::setURL( const OUString & rNewURL ) throw( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); m_aURL = rNewURL; - m_aPath = rtl::OUString(); // Next initialize() will create new session. + m_aPath = OUString(); // Next initialize() will create new session. } //========================================================================= @@ -1064,7 +1064,7 @@ void DAVResourceAccess::initialize() if ( m_aPath.isEmpty() ) { NeonUri aURI( m_aURL ); - rtl::OUString aPath( aURI.GetPath() ); + OUString aPath( aURI.GetPath() ); /* #134089# - Check URI */ if ( aPath.isEmpty() ) @@ -1098,7 +1098,7 @@ void DAVResourceAccess::initialize() } //========================================================================= -const rtl::OUString & DAVResourceAccess::getRequestURI() const +const OUString & DAVResourceAccess::getRequestURI() const { OSL_ENSURE( m_xSession.is(), "DAVResourceAccess::getRequestURI - Not initialized!" ); @@ -1114,8 +1114,8 @@ const rtl::OUString & DAVResourceAccess::getRequestURI() const // static void DAVResourceAccess::getUserRequestHeaders( const uno::Reference< ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rURI, - const rtl::OUString & rMethod, + const OUString & rURI, + const OUString & rMethod, DAVRequestHeaders & rRequestHeaders ) { if ( xEnv.is() ) @@ -1130,7 +1130,7 @@ void DAVResourceAccess::getUserRequestHeaders( for ( sal_Int32 n = 0; n < aRequestHeaders.getLength(); ++n ) { - rtl::OUString aValue; + OUString aValue; sal_Bool isString = aRequestHeaders[ n ].Value >>= aValue; if ( !isString ) @@ -1164,7 +1164,7 @@ void DAVResourceAccess::getUserRequestHeaders( //========================================================================= sal_Bool DAVResourceAccess::detectRedirectCycle( - const rtl::OUString& rRedirectURL ) + const OUString& rRedirectURL ) throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx index 99446236bf69..b4bf18ef53e2 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx @@ -53,8 +53,8 @@ class DAVSessionFactory; class DAVResourceAccess { osl::Mutex m_aMutex; - rtl::OUString m_aURL; - rtl::OUString m_aPath; + OUString m_aURL; + OUString m_aPath; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; @@ -68,7 +68,7 @@ public: com::sun::star::uno::XComponentContext > & rxContext, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ); + const OUString & rURL ); DAVResourceAccess( const DAVResourceAccess & rOther ); DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); @@ -76,12 +76,12 @@ public: void setFlags( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) throw ( DAVException ); - void setURL( const rtl::OUString & rNewURL ) + void setURL( const OUString & rNewURL ) throw ( DAVException ); void resetUri(); - const rtl::OUString & getURL() const { return m_aURL; } + const OUString & getURL() const { return m_aURL; } rtl::Reference< DAVSessionFactory > getSessionFactory() const { return m_xSessionFactory; } @@ -100,7 +100,7 @@ public: // allprop & named void PROPFIND( const Depth nDepth, - const std::vector< rtl::OUString > & rPropertyNames, + const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -121,7 +121,7 @@ public: throw ( DAVException ); void - HEAD( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -140,7 +140,7 @@ public: throw ( DAVException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + GET( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -149,7 +149,7 @@ public: void GET( com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & rStream, - const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -163,8 +163,8 @@ public: throw ( DAVException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & rInputStream, const com::sun::star::uno::Reference< @@ -172,8 +172,8 @@ public: throw ( DAVException ); void - POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & rInputStream, com::sun::star::uno::Reference< @@ -188,16 +188,16 @@ public: throw ( DAVException ); void - COPY( const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + COPY( const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - MOVE( const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + MOVE( const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -238,13 +238,13 @@ public: getUserRequestHeaders( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rURI, - const rtl::OUString & rMethod, + const OUString & rURI, + const OUString & rMethod, DAVRequestHeaders & rRequestHeaders ); private: - const rtl::OUString & getRequestURI() const; - sal_Bool detectRedirectCycle( const rtl::OUString& rRedirectURL ) + const OUString & getRequestURI() const; + sal_Bool detectRedirectCycle( const OUString& rRedirectURL ) throw ( DAVException ); sal_Bool handleException( const DAVException & e, int errorCount ) throw ( DAVException ); diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx index 120879d91bf8..b5dad245b356 100644 --- a/ucb/source/ucp/webdav-neon/DAVSession.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx @@ -68,7 +68,7 @@ public: } } - virtual sal_Bool CanUse( const ::rtl::OUString & inPath, + virtual sal_Bool CanUse( const OUString & inPath, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) = 0; virtual sal_Bool UsesProxy() = 0; @@ -76,81 +76,81 @@ public: // DAV methods // - virtual void OPTIONS( const ::rtl::OUString & inPath, + virtual void OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // allprop & named - virtual void PROPFIND( const ::rtl::OUString & inPath, + virtual void PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropertyNames, + const std::vector< OUString > & inPropertyNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // propnames - virtual void PROPFIND( const ::rtl::OUString & inPath, + virtual void PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void PROPPATCH( const ::rtl::OUString & inPath, + virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + virtual void HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void GET( const ::rtl::OUString & inPath, + virtual void GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void PUT( const ::rtl::OUString & inPath, + virtual void PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& s, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + virtual void POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, com::sun::star::uno::Reference< @@ -158,39 +158,39 @@ public: const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void MKCOL( const ::rtl::OUString & inPath, + virtual void MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void COPY( const ::rtl::OUString & inSource, - const ::rtl::OUString & inDestination, + virtual void COPY( const OUString & inSource, + const OUString & inDestination, const DAVRequestEnvironment & rEnv, sal_Bool inOverwrite = false ) throw( DAVException ) = 0; - virtual void MOVE( const ::rtl::OUString & inSource, - const ::rtl::OUString & inDestination, + virtual void MOVE( const OUString & inSource, + const OUString & inDestination, const DAVRequestEnvironment & rEnv, sal_Bool inOverwrite = false ) throw( DAVException ) = 0; - virtual void DESTROY( const ::rtl::OUString & inPath, + virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // set new lock. - virtual void LOCK( const ::rtl::OUString & inPath, + virtual void LOCK( const OUString & inPath, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; // refresh existing lock. - virtual sal_Int64 LOCK( const ::rtl::OUString & inPath, + virtual sal_Int64 LOCK( const OUString & inPath, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void UNLOCK( const ::rtl::OUString & inPath, + virtual void UNLOCK( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx index 2534af78f628..2f595557bdd0 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx @@ -39,7 +39,7 @@ DAVSessionFactory::~DAVSessionFactory() } rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( - const ::rtl::OUString & inUri, + const OUString & inUri, const uno::Sequence< beans::NamedValue >& rFlags, const uno::Reference< uno::XComponentContext > & rxContext ) throw( DAVException ) diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx index c29ec718e86f..b45ce9ffcde3 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx @@ -61,14 +61,14 @@ public: ~DAVSessionFactory() SAL_THROW(()); rtl::Reference< DAVSession > - createDAVSession( const ::rtl::OUString & inUri, + createDAVSession( const OUString & inUri, const ::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags, const ::uno::Reference< ::uno::XComponentContext >& rxContext ) throw( DAVException ); ::uno::Reference< ::uno::XComponentContext > getComponentContext() { return m_xContext; } private: - typedef std::map< rtl::OUString, DAVSession * > Map; + typedef std::map< OUString, DAVSession * > Map; Map m_aMap; osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx index fcdfc2cda72c..b3da92c0a533 100644 --- a/ucb/source/ucp/webdav-neon/DAVTypes.hxx +++ b/ucb/source/ucp/webdav-neon/DAVTypes.hxx @@ -72,11 +72,11 @@ enum ProppatchOperation { PROPSET = 0, PROPREMOVE = 1 }; struct ProppatchValue { ProppatchOperation operation; - rtl::OUString name; + OUString name; com::sun::star::uno::Any value; ProppatchValue( const ProppatchOperation o, - const rtl::OUString & n, + const OUString & n, const com::sun::star::uno::Any & v ) : operation( o ), name( n ), value( v ) {} }; diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx index f47e29714880..4bf2ea8f0291 100644 --- a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx @@ -36,8 +36,6 @@ using namespace com::sun::star::util; using namespace webdav_ucp; -using ::rtl::OUString; -using ::rtl::OString; bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s, DateTime& dateTime) diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx index 6964bc620a18..b3166c2ca00c 100644 --- a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx @@ -45,16 +45,16 @@ namespace webdav_ucp class DateTimeHelper { private: - static sal_Int32 convertMonthToInt (const ::rtl::OUString& ); + static sal_Int32 convertMonthToInt (const OUString& ); - static bool ISO8601_To_DateTime (const ::rtl::OUString&, + static bool ISO8601_To_DateTime (const OUString&, ::com::sun::star::util::DateTime& ); - static bool RFC2068_To_DateTime (const ::rtl::OUString&, + static bool RFC2068_To_DateTime (const OUString&, ::com::sun::star::util::DateTime& ); public: - static bool convert (const ::rtl::OUString&, + static bool convert (const OUString&, ::com::sun::star::util::DateTime& ); }; diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.cxx b/ucb/source/ucp/webdav-neon/LinkSequence.cxx index 26c5673eeab8..32fafb4bc7b9 100644 --- a/ucb/source/ucp/webdav-neon/LinkSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LinkSequence.cxx @@ -98,13 +98,13 @@ extern "C" int LinkSequence_chardata_callback( { case STATE_DST: pCtx->pLink->Destination - = rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->hasDestination = true; break; case STATE_SRC: pCtx->pLink->Source - = rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->hasSource = true; break; } @@ -135,7 +135,7 @@ extern "C" int LinkSequence_endelement_callback( ////////////////////////////////////////////////////////////////////////// // static -bool LinkSequence::createFromXML( const rtl::OString & rInData, +bool LinkSequence::createFromXML( const OString & rInData, uno::Sequence< ucb::Link > & rOutData ) { const sal_Int32 TOKEN_LENGTH = 7; // @@ -191,16 +191,16 @@ bool LinkSequence::createFromXML( const rtl::OString & rInData, ////////////////////////////////////////////////////////////////////////// // static bool LinkSequence::toXML( const uno::Sequence< ucb::Link > & rInData, - rtl::OUString & rOutData ) + OUString & rOutData ) { // valuevalue.... sal_Int32 nCount = rInData.getLength(); if ( nCount ) { - rtl::OUString aPre( "" ); - rtl::OUString aMid( "" ); - rtl::OUString aEnd( "" ); + OUString aPre( "" ); + OUString aMid( "" ); + OUString aEnd( "" ); for ( sal_Int32 n = 0; n < nCount; ++n ) { diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.hxx b/ucb/source/ucp/webdav-neon/LinkSequence.hxx index 109ea8de33dd..ceec0f347e13 100644 --- a/ucb/source/ucp/webdav-neon/LinkSequence.hxx +++ b/ucb/source/ucp/webdav-neon/LinkSequence.hxx @@ -39,12 +39,12 @@ namespace webdav_ucp class LinkSequence { public: - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Sequence< com::sun::star::ucb::Link > & rOutData ); static bool toXML( const com::sun::star::uno::Sequence< com::sun::star::ucb::Link > & rInData, - rtl::OUString & rOutData ); + OUString & rOutData ); }; } diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx index 075af0132ee8..746ca58bd8f2 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx @@ -183,7 +183,7 @@ extern "C" int LockEntrySequence_endelement_callback( ////////////////////////////////////////////////////////////////////////// // static -bool LockEntrySequence::createFromXML( const rtl::OString & rInData, +bool LockEntrySequence::createFromXML( const OString & rInData, uno::Sequence< ucb::LockEntry > & rOutData ) { diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx index 7c91f4e6cf23..62556e11c01b 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx @@ -39,7 +39,7 @@ namespace webdav_ucp class LockEntrySequence { public: - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Sequence< com::sun::star::ucb::LockEntry > & rOutData ); }; diff --git a/ucb/source/ucp/webdav-neon/LockSequence.cxx b/ucb/source/ucp/webdav-neon/LockSequence.cxx index 3b31b1f9fa11..06d501fb0c38 100644 --- a/ucb/source/ucp/webdav-neon/LockSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockSequence.cxx @@ -178,9 +178,9 @@ extern "C" int LockSequence_chardata_callback( case STATE_OWNER: { // collect raw XML data... (owner contains ANY) - rtl::OUString aValue; + OUString aValue; pCtx->pLock->Owner >>= aValue; - aValue += rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + aValue += OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->pLock->Owner <<= aValue; break; } @@ -207,7 +207,7 @@ extern "C" int LockSequence_chardata_callback( buf, len, "Second-", 7, 7 ) == 0 ) { pCtx->pLock->Timeout - = rtl::OString( buf + 7, len - 7 ).toInt64(); + = OString( buf + 7, len - 7 ).toInt64(); pCtx->hasTimeout = true; } // else if ( rtl_str_shortenedCompareIgnoreCase_WithLength( @@ -229,7 +229,7 @@ extern "C" int LockSequence_chardata_callback( sal_Int32 nPos = pCtx->pLock->LockTokens.getLength(); pCtx->pLock->LockTokens.realloc( nPos + 1 ); pCtx->pLock->LockTokens[ nPos ] - = rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->hasHREF = true; break; } @@ -310,7 +310,7 @@ extern "C" int LockSequence_endelement_callback( ////////////////////////////////////////////////////////////////////////// // static -bool LockSequence::createFromXML( const rtl::OString & rInData, +bool LockSequence::createFromXML( const OString & rInData, uno::Sequence< ucb::Lock > & rOutData ) { const sal_Int32 TOKEN_LENGTH = 13; // diff --git a/ucb/source/ucp/webdav-neon/LockSequence.hxx b/ucb/source/ucp/webdav-neon/LockSequence.hxx index 746d72176c73..fc9db6679c9f 100644 --- a/ucb/source/ucp/webdav-neon/LockSequence.hxx +++ b/ucb/source/ucp/webdav-neon/LockSequence.hxx @@ -39,7 +39,7 @@ namespace webdav_ucp class LockSequence { public: - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Sequence< com::sun::star::ucb::Lock > & rOutData ); }; diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx index 8763a9b5c32e..5040b690943e 100644 --- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx @@ -38,15 +38,15 @@ namespace { void process_headers( ne_request * req, DAVResource & rResource, - const std::vector< ::rtl::OUString > & rHeaderNames ) + const std::vector< OUString > & rHeaderNames ) { void * cursor = NULL; const char * name, *value; while ( ( cursor = ne_response_header_iterate( req, cursor, &name, &value ) ) != NULL ) { - rtl::OUString aHeaderName( rtl::OUString::createFromAscii( name ) ); - rtl::OUString aHeaderValue( rtl::OUString::createFromAscii( value ) ); + OUString aHeaderName( OUString::createFromAscii( name ) ); + OUString aHeaderValue( OUString::createFromAscii( value ) ); // Note: Empty vector means that all headers are requested. bool bIncludeIt = ( rHeaderNames.empty() ); @@ -54,9 +54,9 @@ void process_headers( ne_request * req, if ( !bIncludeIt ) { // Check whether this header was requested. - std::vector< ::rtl::OUString >::const_iterator it( + std::vector< OUString >::const_iterator it( rHeaderNames.begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( + const std::vector< OUString >::const_iterator end( rHeaderNames.end() ); while ( it != end ) @@ -90,8 +90,8 @@ void process_headers( ne_request * req, extern osl::Mutex aGlobalNeonMutex; NeonHeadRequest::NeonHeadRequest( HttpSession * inSession, - const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & + const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, int & nError ) @@ -103,7 +103,7 @@ NeonHeadRequest::NeonHeadRequest( HttpSession * inSession, // header fields. ne_request * req = ne_request_create( inSession, "HEAD", - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx index b0a9fea47c53..a328418d4db5 100644 --- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx +++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx @@ -41,8 +41,8 @@ class NeonHeadRequest public: // named / allprop NeonHeadRequest( HttpSession* inSession, - const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, int & nError ); ~NeonHeadRequest(); diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index 951601fc1e11..04608a63f725 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -145,12 +145,12 @@ void NeonLockStore::registerSession( HttpSession * pHttpSession ) ne_lockstore_register( m_pNeonLockStore, pHttpSession ); } -NeonLock * NeonLockStore::findByUri( rtl::OUString const & rUri ) +NeonLock * NeonLockStore::findByUri( OUString const & rUri ) { osl::MutexGuard aGuard( m_aMutex ); ne_uri aUri; - ne_uri_parse( rtl::OUStringToOString( + ne_uri_parse( OUStringToOString( rUri, RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); return ne_lockstore_findbyuri( m_pNeonLockStore, &aUri ); } diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx index c8f0f0fcba99..c6bd4f5e48a4 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx @@ -78,7 +78,7 @@ public: void registerSession( HttpSession * pHttpSession ); - NeonLock * findByUri( rtl::OUString const & rUri ); + NeonLock * findByUri( OUString const & rUri ); void addLock( NeonLock * pLock, rtl::Reference< NeonSession > const & xSession, diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx index 6f05906e8b64..0f10513d5b34 100644 --- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx @@ -43,19 +43,16 @@ using namespace com::sun::star::ucb; using namespace std; using namespace webdav_ucp; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; namespace { // strip "DAV:" namespace from XML snippets to avoid // parser error (undeclared namespace) later on. - rtl::OString stripDavNamespace( const rtl::OString & in ) + OString stripDavNamespace( const OString & in ) { - const rtl::OString inXML( in.toAsciiLowerCase() ); + const OString inXML( in.toAsciiLowerCase() ); - rtl::OStringBuffer buf; + OStringBuffer buf; sal_Int32 start = 0; sal_Int32 end = inXML.indexOf( "dav:" ); while ( end != -1 ) @@ -76,7 +73,7 @@ namespace } buf.append( inXML.copy( start ) ); - return rtl::OString( buf.makeStringAndClear() ); + return OString( buf.makeStringAndClear() ); } } diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx index 9febb56faf0c..fd714246c9db 100644 --- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx +++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx @@ -45,7 +45,7 @@ public: NeonPropFindRequest( HttpSession* inSession, const char* inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, int & nError ); // propnames diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 5dcafe634d18..34a193732d5e 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -82,12 +82,12 @@ using namespace webdav_ucp; struct RequestData { // POST - rtl::OUString aContentType; - rtl::OUString aReferer; + OUString aContentType; + OUString aReferer; RequestData() {} - RequestData( const rtl::OUString & rContentType, - const rtl::OUString & rReferer ) + RequestData( const OUString & rContentType, + const OUString & rReferer ) : aContentType( rContentType ), aReferer( rReferer ) {} }; @@ -116,7 +116,7 @@ typedef boost::unordered_map > RequestDataMap; -static sal_uInt16 makeStatusCode( const rtl::OUString & rStatusText ) +static sal_uInt16 makeStatusCode( const OUString & rStatusText ) { // Extract status code from session error string. Unfortunately // neon provides no direct access to the status code... @@ -150,7 +150,7 @@ static bool noKeepAlive( const uno::Sequence< beans::NamedValue >& rFlags ) std::find_if(pAry,pAry+nLen, boost::bind(comphelper::TNamedValueEqualFunctor(), _1, - rtl::OUString("KeepAlive")))); + OUString("KeepAlive")))); if ( pValue != pAry+nLen && !pValue->Value.get() ) return true; @@ -161,7 +161,7 @@ struct NeonRequestContext { uno::Reference< io::XOutputStream > xOutputStream; rtl::Reference< NeonInputStream > xInputStream; - const std::vector< ::rtl::OUString > * pHeaderNames; + const std::vector< OUString > * pHeaderNames; DAVResource * pResource; NeonRequestContext( uno::Reference< io::XOutputStream > & xOutStrm ) @@ -173,13 +173,13 @@ struct NeonRequestContext pHeaderNames( 0 ), pResource( 0 ) {} NeonRequestContext( uno::Reference< io::XOutputStream > & xOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : xOutputStream( xOutStrm ), xInputStream( 0 ), pHeaderNames( &inHeaderNames ), pResource( &ioResource ) {} NeonRequestContext( const rtl::Reference< NeonInputStream > & xInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : xOutputStream( 0 ), xInputStream( xInStrm ), pHeaderNames( &inHeaderNames ), pResource( &ioResource ) {} @@ -255,8 +255,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, // abort return -1; } - rtl::OUString theUserName; - rtl::OUString thePassWord; + OUString theUserName; + OUString thePassWord; if ( attempt == 0 ) { @@ -266,7 +266,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, try { NeonUri uri( theSession->getRequestEnvironment().m_aRequestURI ); - rtl::OUString aUserInfo( uri.GetUserInfo() ); + OUString aUserInfo( uri.GetUserInfo() ); if ( !aUserInfo.isEmpty() ) { sal_Int32 nPos = aUserInfo.indexOf( '@' ); @@ -290,9 +290,9 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, else { // username buffer is prefilled with user name from last attempt. - theUserName = rtl::OUString::createFromAscii( inoutUserName ); + theUserName = OUString::createFromAscii( inoutUserName ); // @@@ Neon does not initialize password buffer (last checked: 0.22.0). - //thePassWord = rtl::OUString::createFromAscii( inoutPassWord ); + //thePassWord = OUString::createFromAscii( inoutPassWord ); } bool bCanUseSystemCreds = false; @@ -306,14 +306,14 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, #endif int theRetVal = pListener->authenticate( - rtl::OUString::createFromAscii( inRealm ), + OUString::createFromAscii( inRealm ), theSession->getHostName(), theUserName, thePassWord, bCanUseSystemCreds); - rtl::OString aUser( - rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); + OString aUser( + OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); if ( aUser.getLength() > ( NE_ABUFSIZ - 1 ) ) { OSL_FAIL( @@ -321,8 +321,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, return -1; } - rtl::OString aPass( - rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); + OString aPass( + OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); if ( aPass.getLength() > ( NE_ABUFSIZ - 1 ) ) { OSL_FAIL( @@ -331,19 +331,19 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, } strcpy( inoutUserName, // #100211# - checked - rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ).getStr() ); strcpy( inoutPassWord, // #100211# - checked - rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ).getStr() ); return theRetVal; } namespace { - ::rtl::OUString GetHostnamePart( const ::rtl::OUString& _rRawString ) + OUString GetHostnamePart( const OUString& _rRawString ) { - ::rtl::OUString sPart; - ::rtl::OUString sPartId("CN="); + OUString sPart; + OUString sPartId("CN="); sal_Int32 nContStart = _rRawString.indexOf( sPartId ); if ( nContStart != -1 ) { @@ -378,7 +378,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, failures = 0; char * dn = ne_ssl_readable_dname( ne_ssl_cert_subject( cert ) ); - rtl::OUString cert_subject( dn, strlen( dn ), RTL_TEXTENCODING_UTF8, 0 ); + OUString cert_subject( dn, strlen( dn ), RTL_TEXTENCODING_UTF8, 0 ); ne_free( dn ); @@ -405,7 +405,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, return 1; uno::Reference< xml::crypto::XXMLSecurityContext > xSecurityContext( - xSEInitializer->createSecurityContext( rtl::OUString() ) ); + xSEInitializer->createSecurityContext( OUString() ) ); uno::Reference< xml::crypto::XSecurityEnvironment > xSecurityEnv( xSecurityContext->getSecurityEnvironment() ); @@ -413,11 +413,11 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, //The end entity certificate char * eeCertB64 = ne_ssl_cert_export( cert ); - rtl::OString sEECertB64( eeCertB64 ); + OString sEECertB64( eeCertB64 ); uno::Reference< security::XCertificate > xEECert( xSecurityEnv->createCertificateFromAscii( - rtl::OStringToOUString( sEECertB64, RTL_TEXTENCODING_ASCII_US ) ) ); + OStringToOUString( sEECertB64, RTL_TEXTENCODING_ASCII_US ) ) ); ne_free( eeCertB64 ); eeCertB64 = 0; @@ -434,12 +434,12 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, break; char * imCertB64 = ne_ssl_cert_export( issuerCert ); - rtl::OString sInterMediateCertB64( imCertB64 ); + OString sInterMediateCertB64( imCertB64 ); ne_free( imCertB64 ); uno::Reference< security::XCertificate> xImCert( xSecurityEnv->createCertificateFromAscii( - rtl::OStringToOUString( sInterMediateCertB64, RTL_TEXTENCODING_ASCII_US ) ) ); + OStringToOUString( sInterMediateCertB64, RTL_TEXTENCODING_ASCII_US ) ) ); if ( xImCert.is() ) vecCerts.push_back( xImCert ); } @@ -532,8 +532,8 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req, char * pData = headers->data; if ( strstr( pData, "Content-Type:" ) == NULL ) { - rtl::OString aType - = rtl::OUStringToOString( (*it).second.aContentType, + OString aType + = OUStringToOString( (*it).second.aContentType, RTL_TEXTENCODING_UTF8 ); ne_buffer_concat( headers, "Content-Type: ", aType.getStr(), EOL, NULL ); @@ -545,8 +545,8 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req, char * pData = headers->data; if ( strstr( pData, "Referer:" ) == NULL ) { - rtl::OString aReferer - = rtl::OUStringToOString( (*it).second.aReferer, + OString aReferer + = OUStringToOString( (*it).second.aReferer, RTL_TEXTENCODING_UTF8 ); ne_buffer_concat( headers, "Referer: ", aReferer.getStr(), EOL, NULL ); @@ -562,11 +562,11 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req, while ( it1 != end1 ) { - rtl::OString aHeader - = rtl::OUStringToOString( (*it1).first, + OString aHeader + = OUStringToOString( (*it1).first, RTL_TEXTENCODING_UTF8 ); - rtl::OString aValue - = rtl::OUStringToOString( (*it1).second, + OString aValue + = OUStringToOString( (*it1).second, RTL_TEXTENCODING_UTF8 ); ne_buffer_concat( headers, aHeader.getStr(), ": ", aValue.getStr(), EOL, NULL ); @@ -588,7 +588,7 @@ NeonLockStore NeonSession::m_aNeonLockStore; NeonSession::NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const uno::Sequence< beans::NamedValue >& rFlags, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ) @@ -704,10 +704,10 @@ void NeonSession::Init() { osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex ); m_pHttpSession = ne_session_create( - rtl::OUStringToOString( m_aScheme, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( m_aScheme, RTL_TEXTENCODING_UTF8 ).getStr(), /* theUri.GetUserInfo(), @@@ for FTP via HTTP proxy, but not supported by Neon */ - rtl::OUStringToOString( m_aHostName, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( m_aHostName, RTL_TEXTENCODING_UTF8 ).getStr(), m_nPort ); } @@ -720,7 +720,7 @@ void NeonSession::Init() m_aNeonLockStore.registerSession( m_pHttpSession ); if ( m_aScheme.equalsIgnoreAsciiCase( - rtl::OUString( "https" ) ) ) + OUString( "https" ) ) ) { // Set a failure callback for certificate check ne_ssl_set_verify( @@ -775,7 +775,7 @@ void NeonSession::Init() if ( !m_aProxyName.isEmpty() ) { ne_session_proxy( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ).getStr(), m_nProxyPort ); @@ -799,7 +799,7 @@ void NeonSession::Init() } } -sal_Bool NeonSession::CanUse( const rtl::OUString & inUri, +sal_Bool NeonSession::CanUse( const OUString & inUri, const uno::Sequence< beans::NamedValue >& rFlags ) { try @@ -824,7 +824,7 @@ sal_Bool NeonSession::UsesProxy() return !m_aProxyName.isEmpty() ; } -void NeonSession::OPTIONS( const rtl::OUString & inPath, +void NeonSession::OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -837,7 +837,7 @@ void NeonSession::OPTIONS( const rtl::OUString & inPath, memset( &servercaps, 0, sizeof( servercaps ) ); int theRetVal = ne_options( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), &servercaps ); @@ -848,9 +848,9 @@ void NeonSession::OPTIONS( const rtl::OUString & inPath, outCapabilities.executable = !!servercaps.dav_executable; } -void NeonSession::PROPFIND( const rtl::OUString & inPath, +void NeonSession::PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -861,7 +861,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, int theRetVal = NE_OK; NeonPropFindRequest theRequest( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), inDepth, inPropNames, @@ -871,7 +871,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::PROPFIND( const rtl::OUString & inPath, +void NeonSession::PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) @@ -883,7 +883,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, int theRetVal = NE_OK; NeonPropFindRequest theRequest( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), inDepth, ioResInfo, @@ -892,7 +892,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::PROPPATCH( const rtl::OUString & inPath, +void NeonSession::PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -940,7 +940,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, { pItems[ n ].type = ne_propset; - rtl::OUString aStringValue; + OUString aStringValue; if ( DAVProperties::isUCBDeadProperty( *pName ) ) { // DAV dead property added by WebDAV UCP? @@ -984,7 +984,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, } } pItems[ n ].value - = strdup( rtl::OUStringToOString( aStringValue, + = strdup( OUStringToOString( aStringValue, RTL_TEXTENCODING_UTF8 ).getStr() ); } else @@ -1003,7 +1003,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, pItems[ n ].name = 0; theRetVal = ne_proppatch( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), pItems ); } @@ -1020,8 +1020,8 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +void NeonSession::HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -1041,7 +1041,7 @@ void NeonSession::HEAD( const ::rtl::OUString & inPath, } uno::Reference< io::XInputStream > -NeonSession::GET( const rtl::OUString & inPath, +NeonSession::GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1052,7 +1052,7 @@ NeonSession::GET( const rtl::OUString & inPath, rtl::Reference< NeonInputStream > xInputStream( new NeonInputStream ); NeonRequestContext aCtx( xInputStream ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockReader, false, @@ -1063,7 +1063,7 @@ NeonSession::GET( const rtl::OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -void NeonSession::GET( const rtl::OUString & inPath, +void NeonSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1074,7 +1074,7 @@ void NeonSession::GET( const rtl::OUString & inPath, NeonRequestContext aCtx( ioOutputStream ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockWriter, false, @@ -1084,8 +1084,8 @@ void NeonSession::GET( const rtl::OUString & inPath, } uno::Reference< io::XInputStream > -NeonSession::GET( const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +NeonSession::GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1100,7 +1100,7 @@ NeonSession::GET( const rtl::OUString & inPath, rtl::Reference< NeonInputStream > xInputStream( new NeonInputStream ); NeonRequestContext aCtx( xInputStream, inHeaderNames, ioResource ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockReader, true, @@ -1111,9 +1111,9 @@ NeonSession::GET( const rtl::OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -void NeonSession::GET( const rtl::OUString & inPath, +void NeonSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1127,7 +1127,7 @@ void NeonSession::GET( const rtl::OUString & inPath, NeonRequestContext aCtx( ioOutputStream, inHeaderNames, ioResource ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockWriter, true, @@ -1136,7 +1136,7 @@ void NeonSession::GET( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::PUT( const rtl::OUString & inPath, +void NeonSession::PUT( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1150,7 +1150,7 @@ void NeonSession::PUT( const rtl::OUString & inPath, Init( rEnv ); int theRetVal = PUT( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), reinterpret_cast< const char * >( aDataToSend.getConstArray() ), @@ -1160,9 +1160,9 @@ void NeonSession::PUT( const rtl::OUString & inPath, } uno::Reference< io::XInputStream > -NeonSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +NeonSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1178,7 +1178,7 @@ NeonSession::POST( const rtl::OUString & inPath, rtl::Reference< NeonInputStream > xInputStream( new NeonInputStream ); NeonRequestContext aCtx( xInputStream ); int theRetVal = POST( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), reinterpret_cast< const char * >( aDataToSend.getConstArray() ), @@ -1192,9 +1192,9 @@ NeonSession::POST( const rtl::OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -void NeonSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +void NeonSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, uno::Reference< io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) @@ -1210,7 +1210,7 @@ void NeonSession::POST( const rtl::OUString & inPath, NeonRequestContext aCtx( oOutputStream ); int theRetVal = POST( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), reinterpret_cast< const char * >( aDataToSend.getConstArray() ), @@ -1222,7 +1222,7 @@ void NeonSession::POST( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::MKCOL( const rtl::OUString & inPath, +void NeonSession::MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1231,14 +1231,14 @@ void NeonSession::MKCOL( const rtl::OUString & inPath, Init( rEnv ); int theRetVal = ne_mkcol( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::COPY( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void NeonSession::COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -1253,18 +1253,18 @@ void NeonSession::COPY( const rtl::OUString & inSourceURL, int theRetVal = ne_copy( m_pHttpSession, inOverWrite ? 1 : 0, NE_DEPTH_INFINITE, - rtl::OUStringToOString( + OUStringToOString( theSourceUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( + OUStringToOString( theDestinationUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inSourceURL, rEnv ); } -void NeonSession::MOVE( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void NeonSession::MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -1277,17 +1277,17 @@ void NeonSession::MOVE( const rtl::OUString & inSourceURL, NeonUri theDestinationUri( inDestinationURL ); int theRetVal = ne_move( m_pHttpSession, inOverWrite ? 1 : 0, - rtl::OUStringToOString( + OUStringToOString( theSourceUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( + OUStringToOString( theDestinationUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inSourceURL, rEnv ); } -void NeonSession::DESTROY( const rtl::OUString & inPath, +void NeonSession::DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1296,7 +1296,7 @@ void NeonSession::DESTROY( const rtl::OUString & inPath, Init( rEnv ); int theRetVal = ne_delete( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inPath, rEnv ); @@ -1332,7 +1332,7 @@ namespace } // namespace // Set new lock -void NeonSession::LOCK( const ::rtl::OUString & inPath, +void NeonSession::LOCK( const OUString & inPath, ucb::Lock & rLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1348,7 +1348,7 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, // Set the lock uri ne_uri aUri; - ne_uri_parse( rtl::OUStringToOString( makeAbsoluteURL( inPath ), + ne_uri_parse( OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); theLock->uri = aUri; @@ -1386,10 +1386,10 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, theLock->timeout = (long)rLock.Timeout; // Set the lock owner - rtl::OUString aValue; + OUString aValue; rLock.Owner >>= aValue; theLock->owner = - ne_strdup( rtl::OUStringToOString( aValue, + ne_strdup( OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); TimeValue startCall; osl_getSystemTime( &startCall ); @@ -1403,12 +1403,12 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, lastChanceToSendRefreshRequest( startCall, theLock->timeout ) ); - uno::Sequence< rtl::OUString > aTokens( 1 ); - aTokens[ 0 ] = rtl::OUString::createFromAscii( theLock->token ); + uno::Sequence< OUString > aTokens( 1 ); + aTokens[ 0 ] = OUString::createFromAscii( theLock->token ); rLock.LockTokens = aTokens; OSL_TRACE( "NeonSession::LOCK: created lock for %s. token: %s", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); } @@ -1417,7 +1417,7 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, ne_lock_destroy( theLock ); OSL_TRACE( "NeonSession::LOCK: obtaining lock for %s failed!", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1425,7 +1425,7 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, } // Refresh existing lock -sal_Int64 NeonSession::LOCK( const ::rtl::OUString & inPath, +sal_Int64 NeonSession::LOCK( const OUString & inPath, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1492,7 +1492,7 @@ bool NeonSession::LOCK( NeonLock * pLock, } } -void NeonSession::UNLOCK( const ::rtl::OUString & inPath, +void NeonSession::UNLOCK( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1516,7 +1516,7 @@ void NeonSession::UNLOCK( const ::rtl::OUString & inPath, else { OSL_TRACE( "NeonSession::UNLOCK: unlocking of %s failed.", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1562,7 +1562,7 @@ const ucbhelper::InternetProxyServer & NeonSession::getProxySettings() const else { return m_rProxyDecider.getProxy( m_aScheme, - rtl::OUString() /* not used */, + OUString() /* not used */, -1 /* not used */ ); } } @@ -1574,7 +1574,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, { for ( sal_Int32 n = 0; n < rLocks.getLength(); ++n ) { - const uno::Sequence< rtl::OUString > & rTokens + const uno::Sequence< OUString > & rTokens = rLocks[ n ].LockTokens; for ( sal_Int32 m = 0; m < rTokens.getLength(); ++m ) { @@ -1587,7 +1587,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, } // namespace -bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, +bool NeonSession::removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ) { NeonLock * theLock = m_aNeonLockStore.findByUri( inURL ); @@ -1600,7 +1600,7 @@ bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, // @@@ Alternative: use ne_lock_discover() => less overhead std::vector< DAVResource > aResources; - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; aPropNames.push_back( DAVProperties::LOCKDISCOVERY ); PROPFIND( rEnv.m_aRequestURI, DAVZERO, aPropNames, aResources, rEnv ); @@ -1637,7 +1637,7 @@ bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, // in propfind result -> not locked OSL_TRACE( "NeonSession::removeExpiredLocktoken: Removing " " expired lock token for %s. token: %s", - rtl::OUStringToOString( inURL, + OUStringToOString( inURL, RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); @@ -1653,7 +1653,7 @@ bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, // Common error handler void NeonSession::HandleError( int nError, - const rtl::OUString & inPath, + const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1667,7 +1667,7 @@ void NeonSession::HandleError( int nError, case NE_ERROR: // Generic error { - rtl::OUString aText = rtl::OUString::createFromAscii( + OUString aText = OUString::createFromAscii( ne_get_error( m_pHttpSession ) ); sal_uInt16 code = makeStatusCode( aText ); @@ -1744,7 +1744,7 @@ void NeonSession::HandleError( int nError, { OSL_TRACE( "NeonSession::HandleError : Unknown Neon error code!" ); throw DAVException( DAVException::DAV_HTTP_ERROR, - rtl::OUString::createFromAscii( + OUString::createFromAscii( ne_get_error( m_pHttpSession ) ) ); } } @@ -1755,12 +1755,12 @@ namespace { void runResponseHeaderHandler( void * userdata, const char * value ) { - rtl::OUString aHeader( rtl::OUString::createFromAscii( value ) ); + OUString aHeader( OUString::createFromAscii( value ) ); sal_Int32 nPos = aHeader.indexOf( ':' ); if ( nPos != -1 ) { - rtl::OUString aHeaderName( aHeader.copy( 0, nPos ) ); + OUString aHeaderName( aHeader.copy( 0, nPos ) ); NeonRequestContext * pCtx = static_cast< NeonRequestContext * >( userdata ); @@ -1771,9 +1771,9 @@ void runResponseHeaderHandler( void * userdata, if ( !bIncludeIt ) { // Check whether this header was requested. - std::vector< ::rtl::OUString >::const_iterator it( + std::vector< OUString >::const_iterator it( pCtx->pHeaderNames->begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( + const std::vector< OUString >::const_iterator end( pCtx->pHeaderNames->end() ); while ( it != end ) @@ -1881,8 +1881,8 @@ int NeonSession::POST( ne_session * sess, const char * buffer, ne_block_reader reader, void * userdata, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer ) + const OUString & rContentType, + const OUString & rReferer ) { ne_request * req = ne_request_create( sess, "POST", uri ); //struct get_context ctx; @@ -2024,9 +2024,9 @@ NeonSession::getDataFromInputStream( } sal_Bool -NeonSession::isDomainMatch( rtl::OUString certHostName ) +NeonSession::isDomainMatch( OUString certHostName ) { - rtl::OUString hostName = getHostName(); + OUString hostName = getHostName(); if (hostName.equalsIgnoreAsciiCase( certHostName ) ) return sal_True; @@ -2034,7 +2034,7 @@ NeonSession::isDomainMatch( rtl::OUString certHostName ) if ( 0 == certHostName.indexOf( '*' ) && hostName.getLength() >= certHostName.getLength() ) { - rtl::OUString cmpStr = certHostName.copy( 1 ); + OUString cmpStr = certHostName.copy( 1 ); if ( hostName.matchIgnoreAsciiCase( cmpStr, hostName.getLength() - cmpStr.getLength() ) ) @@ -2043,7 +2043,7 @@ NeonSession::isDomainMatch( rtl::OUString certHostName ) return sal_False; } -rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const +OUString NeonSession::makeAbsoluteURL( OUString const & rURL ) const { try { @@ -2051,7 +2051,7 @@ rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const if ( rURL[ 0 ] != sal_Unicode( '/' ) ) { // absolute. - return rtl::OUString( rURL ); + return OUString( rURL ); } else { @@ -2060,7 +2060,7 @@ rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const ne_fill_server_uri( m_pHttpSession, &aUri ); aUri.path - = ne_strdup( rtl::OUStringToOString( + = ne_strdup( OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); NeonUri aNeonUri( &aUri ); ne_uri_free( &aUri ); @@ -2071,7 +2071,7 @@ rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const { } // error. - return rtl::OUString(); + return OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx index 7bad5029cda4..b01ab990711f 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.hxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx @@ -46,9 +46,9 @@ class NeonSession : public DAVSession { private: osl::Mutex m_aMutex; - rtl::OUString m_aScheme; - rtl::OUString m_aHostName; - rtl::OUString m_aProxyName; + OUString m_aScheme; + OUString m_aHostName; + OUString m_aProxyName; sal_Int32 m_nPort; sal_Int32 m_nProxyPort; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; @@ -71,13 +71,13 @@ protected: public: NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ); // DAVSession methods - virtual sal_Bool CanUse( const ::rtl::OUString & inPath, + virtual sal_Bool CanUse( const OUString & inPath, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ); virtual sal_Bool UsesProxy(); @@ -86,89 +86,89 @@ public: { return m_aEnv; } virtual void - OPTIONS( const ::rtl::OUString & inPath, + OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // allprop & named virtual void - PROPFIND( const ::rtl::OUString & inPath, + PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // propnames virtual void - PROPFIND( const ::rtl::OUString & inPath, + PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo >& ioResInfo, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - PROPPATCH( const ::rtl::OUString & inPath, + PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - PUT( const ::rtl::OUString & inPath, + PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, com::sun::star::uno::Reference< @@ -177,41 +177,41 @@ public: throw ( DAVException ); virtual void - MKCOL( const ::rtl::OUString & inPath, + MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - COPY( const ::rtl::OUString & inSourceURL, - const ::rtl::OUString & inDestinationURL, + COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ); virtual void - MOVE( const ::rtl::OUString & inSourceURL, - const ::rtl::OUString & inDestinationURL, + MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ); - virtual void DESTROY( const ::rtl::OUString & inPath, + virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // set new lock. - virtual void LOCK( const ::rtl::OUString & inURL, + virtual void LOCK( const OUString & inURL, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // refresh existing lock. - virtual sal_Int64 LOCK( const ::rtl::OUString & inURL, + virtual sal_Int64 LOCK( const OUString & inURL, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); - virtual void UNLOCK( const ::rtl::OUString & inURL, + virtual void UNLOCK( const OUString & inURL, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); @@ -219,14 +219,14 @@ public: virtual void abort() throw ( DAVException ); - const rtl::OUString & getHostName() const { return m_aHostName; } + const OUString & getHostName() const { return m_aHostName; } const ::uno::Reference< ::uno::XComponentContext > getComponentContext() { return m_xFactory->getComponentContext(); } const void * getRequestData() const { return m_pRequestData; } - sal_Bool isDomainMatch( rtl::OUString certHostName ); + sal_Bool isDomainMatch( OUString certHostName ); private: friend class NeonLockStore; @@ -239,13 +239,13 @@ private: // ret: true => retry request. void HandleError( int nError, - const rtl::OUString & inPath, + const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); const ucbhelper::InternetProxyServer & getProxySettings() const; - bool removeExpiredLocktoken( const rtl::OUString & inURL, + bool removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ); // refresh lock, called by NeonLockStore::refreshLocks @@ -276,8 +276,8 @@ private: const char * buffer, ne_block_reader reader, void * userdata, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer ); + const OUString & rContentType, + const OUString & rReferer ); // Helper: XInputStream -> Sequence< sal_Int8 > static bool getDataFromInputStream( @@ -286,7 +286,7 @@ private: com::sun::star::uno::Sequence< sal_Int8 > & rData, bool bAppendTrailingZeroByte ); - rtl::OUString makeAbsoluteURL( rtl::OUString const & rURL ) const; + OUString makeAbsoluteURL( OUString const & rURL ) const; }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index bd2fa89c1db4..5dba6a2fd7fb 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -90,22 +90,22 @@ NeonUri::NeonUri( const ne_uri * inUri ) if ( uri == 0 ) throw DAVException( DAVException::DAV_INVALID_ARG ); - init( rtl::OString( uri ), inUri ); + init( OString( uri ), inUri ); ne_free( uri ); calculateURI(); } -NeonUri::NeonUri( const rtl::OUString & inUri ) +NeonUri::NeonUri( const OUString & inUri ) throw ( DAVException ) { if ( inUri.isEmpty() ) throw DAVException( DAVException::DAV_INVALID_ARG ); // #i77023# - rtl::OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); + OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); - rtl::OString theInputUri( + OString theInputUri( aEscapedUri.getStr(), aEscapedUri.getLength(), RTL_TEXTENCODING_UTF8 ); ne_uri theUri; @@ -121,7 +121,7 @@ NeonUri::NeonUri( const rtl::OUString & inUri ) calculateURI(); } -void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri ) +void NeonUri::init( const OString & rUri, const ne_uri * pUri ) { // Complete URI. const ne_uri * pUriDefs @@ -131,31 +131,31 @@ void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri ) &g_sUriDefaultsHTTPS : &g_sUriDefaultsHTTP; - mScheme = rtl::OStringToOUString( + mScheme = OStringToOUString( pUri->scheme ? pUri->scheme : pUriDefs->scheme, RTL_TEXTENCODING_UTF8 ); - mUserInfo = rtl::OStringToOUString( + mUserInfo = OStringToOUString( pUri->userinfo ? pUri->userinfo : pUriDefs->userinfo, RTL_TEXTENCODING_UTF8 ); - mHostName = rtl::OStringToOUString( + mHostName = OStringToOUString( pUri->host ? pUri->host : pUriDefs->host, RTL_TEXTENCODING_UTF8 ); mPort = pUri->port > 0 ? pUri->port : pUriDefs->port; - mPath = rtl::OStringToOUString( + mPath = OStringToOUString( pUri->path ? pUri->path : pUriDefs->path, RTL_TEXTENCODING_UTF8 ); if ( pUri->query ) { - mPath += rtl::OUString("?"); - mPath += rtl::OStringToOUString( + mPath += OUString("?"); + mPath += OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 ); } if ( pUri->fragment ) { - mPath += rtl::OUString("#"); - mPath += rtl::OStringToOUString( + mPath += OUString("#"); + mPath += OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 ); } } @@ -166,7 +166,7 @@ NeonUri::~NeonUri( ) void NeonUri::calculateURI () { - rtl::OUStringBuffer aBuf( mScheme ); + OUStringBuffer aBuf( mScheme ); aBuf.appendAscii( "://" ); if ( !mUserInfo.isEmpty() ) { @@ -206,14 +206,14 @@ void NeonUri::calculateURI () if ( bAppendPort ) { aBuf.appendAscii( ":" ); - aBuf.append( rtl::OUString::valueOf( mPort ) ); + aBuf.append( OUString::valueOf( mPort ) ); } aBuf.append( mPath ); mURI = aBuf.makeStringAndClear(); } -::rtl::OUString NeonUri::GetPathBaseName () const +OUString NeonUri::GetPathBaseName () const { sal_Int32 nPos = mPath.lastIndexOf ('/'); sal_Int32 nTrail = 0; @@ -225,7 +225,7 @@ void NeonUri::calculateURI () } if (nPos != -1) { - rtl::OUString aTemp( + OUString aTemp( mPath.copy (nPos + 1, mPath.getLength () - nPos - 1 - nTrail) ); // query, fragment present? @@ -239,7 +239,7 @@ void NeonUri::calculateURI () return aTemp; } else - return rtl::OUString("/"); + return OUString("/"); } bool NeonUri::operator== ( const NeonUri & rOther ) const @@ -247,22 +247,22 @@ bool NeonUri::operator== ( const NeonUri & rOther ) const return ( mURI == rOther.mURI ); } -::rtl::OUString NeonUri::GetPathBaseNameUnescaped () const +OUString NeonUri::GetPathBaseNameUnescaped () const { return unescape( GetPathBaseName() ); } -void NeonUri::AppendPath (const rtl::OUString& rPath) +void NeonUri::AppendPath (const OUString& rPath) { if (mPath.lastIndexOf ('/') != mPath.getLength () - 1) - mPath += rtl::OUString("/"); + mPath += OUString("/"); mPath += rPath; calculateURI (); }; // static -rtl::OUString NeonUri::escapeSegment( const rtl::OUString& segment ) +OUString NeonUri::escapeSegment( const OUString& segment ) { return rtl::Uri::encode( segment, rtl_UriCharClassPchar, @@ -271,7 +271,7 @@ rtl::OUString NeonUri::escapeSegment( const rtl::OUString& segment ) } // static -rtl::OUString NeonUri::unescape( const rtl::OUString& segment ) +OUString NeonUri::unescape( const OUString& segment ) { return rtl::Uri::decode( segment, rtl_UriDecodeWithCharset, @@ -279,10 +279,10 @@ rtl::OUString NeonUri::unescape( const rtl::OUString& segment ) } // static -rtl::OUString NeonUri::makeConnectionEndPointString( - const rtl::OUString & rHostName, int nPort ) +OUString NeonUri::makeConnectionEndPointString( + const OUString & rHostName, int nPort ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; // Is host a numeric IPv6 address? if ( ( rHostName.indexOf( ':' ) != -1 ) && @@ -300,7 +300,7 @@ rtl::OUString NeonUri::makeConnectionEndPointString( if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) ) { aBuf.appendAscii( ":" ); - aBuf.append( rtl::OUString::valueOf( sal_Int32( nPort ) ) ); + aBuf.append( OUString::valueOf( sal_Int32( nPort ) ) ); } return aBuf.makeStringAndClear(); } diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx index 6bf446a7ea47..0650a70e45e5 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.hxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx @@ -43,18 +43,18 @@ namespace webdav_ucp class NeonUri { private: - ::rtl::OUString mURI; - ::rtl::OUString mScheme; - ::rtl::OUString mUserInfo; - ::rtl::OUString mHostName; + OUString mURI; + OUString mScheme; + OUString mUserInfo; + OUString mHostName; sal_Int32 mPort; - ::rtl::OUString mPath; + OUString mPath; - void init( const rtl::OString & rUri, const ne_uri * pUri ); + void init( const OString & rUri, const ne_uri * pUri ); void calculateURI (); public: - NeonUri( const ::rtl::OUString & inUri ) throw ( DAVException ); + NeonUri( const OUString & inUri ) throw ( DAVException ); NeonUri( const ne_uri * inUri ) throw ( DAVException ); ~NeonUri( ); @@ -62,36 +62,36 @@ class NeonUri bool operator!= ( const NeonUri & rOther ) const { return !operator==( rOther ); } - const ::rtl::OUString & GetURI( void ) const + const OUString & GetURI( void ) const { return mURI; }; - const ::rtl::OUString & GetScheme( void ) const + const OUString & GetScheme( void ) const { return mScheme; }; - const ::rtl::OUString & GetUserInfo( void ) const + const OUString & GetUserInfo( void ) const { return mUserInfo; }; - const ::rtl::OUString & GetHost( void ) const + const OUString & GetHost( void ) const { return mHostName; }; sal_Int32 GetPort( void ) const { return mPort; }; - const ::rtl::OUString & GetPath( void ) const + const OUString & GetPath( void ) const { return mPath; }; - ::rtl::OUString GetPathBaseName ( void ) const; + OUString GetPathBaseName ( void ) const; - ::rtl::OUString GetPathBaseNameUnescaped ( void ) const; + OUString GetPathBaseNameUnescaped ( void ) const; - void SetScheme (const ::rtl::OUString& scheme) + void SetScheme (const OUString& scheme) { mScheme = scheme; calculateURI (); }; - void AppendPath (const ::rtl::OUString& rPath); + void AppendPath (const OUString& rPath); - static ::rtl::OUString escapeSegment( const ::rtl::OUString& segment ); - static ::rtl::OUString unescape( const ::rtl::OUString& string ); + static OUString escapeSegment( const OUString& segment ); + static OUString unescape( const OUString& string ); // "host:port", omit ":port" for port 80 and 443 - static rtl::OUString makeConnectionEndPointString( - const rtl::OUString & rHostName, + static OUString makeConnectionEndPointString( + const OUString & rHostName, int nPort ); - rtl::OUString makeConnectionEndPointString() const + OUString makeConnectionEndPointString() const { return makeConnectionEndPointString( GetHost(), GetPort() ); } }; diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx index 780e45f35461..8a7cdec14cc7 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx @@ -40,28 +40,28 @@ using namespace com::sun::star; struct UCBDeadPropertyValueParseContext { - rtl::OUString * pType; - rtl::OUString * pValue; + OUString * pType; + OUString * pValue; UCBDeadPropertyValueParseContext() : pType( 0 ), pValue( 0 ) {} ~UCBDeadPropertyValueParseContext() { delete pType; delete pValue; } }; // static -const rtl::OUString UCBDeadPropertyValue::aTypeString("string"); -const rtl::OUString UCBDeadPropertyValue::aTypeLong("long"); -const rtl::OUString UCBDeadPropertyValue::aTypeShort("short"); -const rtl::OUString UCBDeadPropertyValue::aTypeBoolean("boolean"); -const rtl::OUString UCBDeadPropertyValue::aTypeChar("char"); -const rtl::OUString UCBDeadPropertyValue::aTypeByte("byte"); -const rtl::OUString UCBDeadPropertyValue::aTypeHyper("hyper"); -const rtl::OUString UCBDeadPropertyValue::aTypeFloat("float"); -const rtl::OUString UCBDeadPropertyValue::aTypeDouble("double"); +const OUString UCBDeadPropertyValue::aTypeString("string"); +const OUString UCBDeadPropertyValue::aTypeLong("long"); +const OUString UCBDeadPropertyValue::aTypeShort("short"); +const OUString UCBDeadPropertyValue::aTypeBoolean("boolean"); +const OUString UCBDeadPropertyValue::aTypeChar("char"); +const OUString UCBDeadPropertyValue::aTypeByte("byte"); +const OUString UCBDeadPropertyValue::aTypeHyper("hyper"); +const OUString UCBDeadPropertyValue::aTypeFloat("float"); +const OUString UCBDeadPropertyValue::aTypeDouble("double"); // static -const rtl::OUString UCBDeadPropertyValue::aXMLPre(""); -const rtl::OUString UCBDeadPropertyValue::aXMLMid(""); -const rtl::OUString UCBDeadPropertyValue::aXMLEnd(""); +const OUString UCBDeadPropertyValue::aXMLPre(""); +const OUString UCBDeadPropertyValue::aXMLMid(""); +const OUString UCBDeadPropertyValue::aXMLEnd(""); #define STATE_TOP (1) @@ -114,7 +114,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( "UCBDeadPropertyValue_endelement_callback - " "Type already set!" ); pCtx->pType - = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = new OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); break; case STATE_VALUE: @@ -122,7 +122,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( "UCBDeadPropertyValue_endelement_callback - " "Value already set!" ); pCtx->pValue - = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = new OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); break; } return 0; // zero to continue, non-zero to abort parsing @@ -159,7 +159,7 @@ extern "C" int UCBDeadPropertyValue_endelement_callback( } ////////////////////////////////////////////////////////////////////////// -static rtl::OUString encodeValue( const rtl::OUString & rValue ) +static OUString encodeValue( const OUString & rValue ) { // Note: I do not use the usual & + < + > encoding, because // I want to prevent any XML parser from trying to 'understand' @@ -174,7 +174,7 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) // PROPFIND: // - parser replaces < by > ==> error (not well formed) - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; const sal_Unicode * pValue = rValue.getStr(); sal_Int32 nCount = rValue.getLength(); @@ -195,9 +195,9 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) } ////////////////////////////////////////////////////////////////////////// -static rtl::OUString decodeValue( const rtl::OUString & rValue ) +static OUString decodeValue( const OUString & rValue ) { - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; const sal_Unicode * pValue = rValue.getStr(); sal_Int32 nPos = 0; @@ -214,7 +214,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos == nEnd ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } c = pValue[ nPos ]; @@ -226,7 +226,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 4 ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 'e' == pValue[ nPos + 1 ] ) @@ -241,7 +241,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'l' == c ) @@ -251,7 +251,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 3 ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -264,7 +264,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'g' == c ) @@ -274,7 +274,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 3 ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -287,13 +287,13 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else @@ -309,7 +309,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) // static bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) { - if ( ( rType != getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( ( rType != getCppuType( static_cast< const OUString * >( 0 ) ) ) && ( rType != getCppuType( static_cast< const sal_Int32 * >( 0 ) ) ) && @@ -335,7 +335,7 @@ bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) ////////////////////////////////////////////////////////////////////////// // static -bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData, +bool UCBDeadPropertyValue::createFromXML( const OString & rInData, uno::Any & rOutData ) { bool success = false; @@ -361,7 +361,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData, if ( aCtx.pType && aCtx.pValue ) { // Decode aCtx.pValue! It may contain XML reserved chars. - rtl::OUString aStringValue = decodeValue( *aCtx.pValue ); + OUString aStringValue = decodeValue( *aCtx.pValue ); if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeString ) ) { rOutData <<= aStringValue; @@ -377,7 +377,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData, else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeBoolean ) ) { if ( aStringValue.equalsIgnoreAsciiCase( - rtl::OUString("true") ) ) + OUString("true") ) ) rOutData <<= sal_Bool( sal_True ); else rOutData <<= sal_Bool( sal_False ); @@ -420,17 +420,17 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData, ////////////////////////////////////////////////////////////////////////// // static bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, - rtl::OUString & rOutData ) + OUString & rOutData ) { // the_typethe_value // Check property type. Extract type and value as string. const uno::Type& rType = rInData.getValueType(); - rtl::OUString aStringValue; - rtl::OUString aStringType; + OUString aStringValue; + OUString aStringType; - if ( rType == getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) ) { // string rInData >>= aStringValue; @@ -441,7 +441,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // long sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeLong; } else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) ) @@ -449,7 +449,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // short sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeShort; } else if ( rType == getCppuBooleanType() ) @@ -457,7 +457,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // boolean sal_Bool bValue = false; rInData >>= bValue; - aStringValue = rtl::OUString::valueOf( bValue ); + aStringValue = OUString::valueOf( bValue ); aStringType = aTypeBoolean; } else if ( rType == getCppuCharType() ) @@ -465,7 +465,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // char sal_Unicode cValue = 0; rInData >>= cValue; - aStringValue = rtl::OUString::valueOf( cValue ); + aStringValue = OUString::valueOf( cValue ); aStringType = aTypeChar; } else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) ) @@ -473,7 +473,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // byte sal_Int8 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( sal_Unicode( nValue ) ); + aStringValue = OUString::valueOf( sal_Unicode( nValue ) ); aStringType = aTypeByte; } else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) ) @@ -481,7 +481,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // hyper sal_Int64 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeHyper; } else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) ) @@ -489,7 +489,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // float float nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeFloat; } else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) ) @@ -497,7 +497,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // double double nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeDouble; } else diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx index c56a3f93b270..98a36a48471c 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx @@ -38,27 +38,27 @@ namespace webdav_ucp class UCBDeadPropertyValue { private: - static const rtl::OUString aTypeString; - static const rtl::OUString aTypeLong; - static const rtl::OUString aTypeShort; - static const rtl::OUString aTypeBoolean; - static const rtl::OUString aTypeChar; - static const rtl::OUString aTypeByte; - static const rtl::OUString aTypeHyper; - static const rtl::OUString aTypeFloat; - static const rtl::OUString aTypeDouble; + static const OUString aTypeString; + static const OUString aTypeLong; + static const OUString aTypeShort; + static const OUString aTypeBoolean; + static const OUString aTypeChar; + static const OUString aTypeByte; + static const OUString aTypeHyper; + static const OUString aTypeFloat; + static const OUString aTypeDouble; - static const rtl::OUString aXMLPre; - static const rtl::OUString aXMLMid; - static const rtl::OUString aXMLEnd; + static const OUString aXMLPre; + static const OUString aXMLMid; + static const OUString aXMLEnd; public: static bool supportsType( const com::sun::star::uno::Type & rType ); - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Any & rOutData ); static bool toXML( const com::sun::star::uno::Any & rInData, - rtl::OUString & rOutData ); + OUString & rOutData ); }; } diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 6a3cb7b2d6cc..4ad76c4727e2 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -332,20 +332,20 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getImplementationName() +OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( "com.sun.star.comp.ucb.WebDAVContent" ); + return OUString( "com.sun.star.comp.ucb.WebDAVContent" ); } //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = rtl::OUString( WEBDAV_CONTENT_SERVICE_NAME ); + = OUString( WEBDAV_CONTENT_SERVICE_NAME ); return aSNS; } @@ -356,7 +356,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { sal_Bool bFolder = sal_False; @@ -374,9 +374,9 @@ rtl::OUString SAL_CALL Content::getContentType() } if ( bFolder ) - return rtl::OUString( WEBDAV_COLLECTION_TYPE ); + return OUString( WEBDAV_COLLECTION_TYPE ); - return rtl::OUString( WEBDAV_CONTENT_TYPE ); + return OUString( WEBDAV_CONTENT_TYPE ); } //========================================================================= @@ -411,7 +411,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -431,7 +431,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -442,7 +442,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "No properties!" ), + OUString( "No properties!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -482,7 +482,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -516,7 +516,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -579,7 +579,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -599,7 +599,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -635,7 +635,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -659,7 +659,7 @@ uno::Any SAL_CALL Content::execute( } OSL_TRACE( "<<<<< Content::execute: end: command: %s", - rtl::OUStringToOString( aCommand.Name, + OUStringToOString( aCommand.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); return aRet; @@ -698,7 +698,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) //========================================================================= // virtual -void SAL_CALL Content::addProperty( const rtl::OUString& Name, +void SAL_CALL Content::addProperty( const OUString& Name, sal_Int16 Attributes, const uno::Any& DefaultValue ) throw( beans::PropertyExistException, @@ -824,7 +824,7 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name, //========================================================================= // virtual -void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) +void SAL_CALL Content::removeProperty( const OUString& Name ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, uno::RuntimeException ) @@ -933,14 +933,14 @@ Content::queryCreatableContentsInfo() // document. aSeq.getArray()[ 0 ].Type - = rtl::OUString( WEBDAV_CONTENT_TYPE ); + = OUString( WEBDAV_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT; beans::Property aProp; m_pProvider->getProperty( - rtl::OUString( "Title" ), aProp ); + OUString( "Title" ), aProp ); uno::Sequence< beans::Property > aDocProps( 1 ); aDocProps.getArray()[ 0 ] = aProp; @@ -948,7 +948,7 @@ Content::queryCreatableContentsInfo() // folder. aSeq.getArray()[ 1 ].Type - = rtl::OUString( WEBDAV_COLLECTION_TYPE ); + = OUString( WEBDAV_COLLECTION_TYPE ); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; @@ -972,23 +972,23 @@ Content::createNewContent( const ucb::ContentInfo& Info ) if ( ( Info.Type != WEBDAV_COLLECTION_TYPE ) && ( Info.Type != WEBDAV_CONTENT_TYPE ) ) return uno::Reference< ucb::XContent >(); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); OSL_ENSURE( !aURL.isEmpty(), "WebdavContent::createNewContent - empty identifier!" ); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); sal_Bool isCollection; if ( Info.Type == WEBDAV_COLLECTION_TYPE ) { - aURL += rtl::OUString("New_Collection"); + aURL += OUString("New_Collection"); isCollection = sal_True; } else { - aURL += rtl::OUString("New_Content"); + aURL += OUString("New_Content"); isCollection = sal_False; } @@ -1012,7 +1012,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { // :// -> "" // ://foo -> "" @@ -1021,7 +1021,7 @@ rtl::OUString Content::getParentURL() // ://foo/bar/ -> ://foo/ // ://foo/bar/abc -> ://foo/bar/ - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nPos = aURL.lastIndexOf( '/' ); if ( nPos == ( aURL.getLength() - 1 ) ) @@ -1035,9 +1035,9 @@ rtl::OUString Content::getParentURL() nPos1 = aURL.lastIndexOf( '/', nPos1 ); if ( nPos1 == -1 ) - return rtl::OUString(); + return OUString(); - return rtl::OUString( aURL.copy( 0, nPos + 1 ) ); + return OUString( aURL.copy( 0, nPos + 1 ) ); } //========================================================================= @@ -1052,7 +1052,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, const ContentProperties& rData, const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, - const rtl::OUString& rContentId ) + const OUString& rContentId ) { // Note: Empty sequence means "get values of all supported properties". @@ -1142,7 +1142,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( std::auto_ptr< ContentProperties > xCachedProps; std::auto_ptr< DAVResourceAccess > xResAccess; SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OUString aUnescapedTitle; + OUString aUnescapedTitle; bool bHasAll = false; uno::Reference< ucb::XContentIdentifier > xIdentifier; rtl::Reference< ::ucbhelper::ContentProviderImplHelper > xProvider; @@ -1160,7 +1160,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) { // All properties are already in cache! No server access needed. @@ -1192,7 +1192,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) { @@ -1208,7 +1208,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( !bHasAll ) { // Only DAV resources support PROPFIND - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; uno::Sequence< beans::Property > aProperties( rProperties.getLength() ); @@ -1219,11 +1219,11 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( sal_Int32 nCount = rProperties.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString & rName = rProperties[ n ].Name; + const OUString & rName = rProperties[ n ].Name; - std::vector< rtl::OUString >::const_iterator it + std::vector< OUString >::const_iterator it = m_aFailedPropNames.begin(); - std::vector< rtl::OUString >::const_iterator end + std::vector< OUString >::const_iterator end = m_aFailedPropNames.end(); while ( it != end ) @@ -1289,7 +1289,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( bNetworkAccessAllowed ) { // All properties obtained already? - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( !( xProps.get() && xProps->containsAllNames( rProperties, aMissingProps ) ) @@ -1298,7 +1298,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Possibly the missing props can be obtained using a HEAD // request. - std::vector< rtl::OUString > aHeaderNames; + std::vector< OUString > aHeaderNames; ContentProperties::UCBNamesToHTTPNames( rProperties, aHeaderNames, @@ -1358,7 +1358,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( //xProps.reset( // new ContentProperties( aUnescapedTitle ) ); xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); } @@ -1368,16 +1368,16 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xProps.reset( new ContentProperties( aUnescapedTitle, false ) ); else xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); xProps->addProperty( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), uno::makeAny( false ), true ); xProps->addProperty( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), uno::makeAny( true ), true ); } @@ -1394,12 +1394,12 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( sal_Int32 nCount = rProperties.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString rName = rProperties[ n ].Name; + const OUString rName = rProperties[ n ].Name; if ( rName == "BaseURI" ) { // Add BaseURI property, if requested. xProps->addProperty( - rtl::OUString( "BaseURI" ), + OUString( "BaseURI" ), uno::makeAny( getBaseURI( xResAccess ) ), true ); } @@ -1408,10 +1408,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Add CreatableContentsInfo property, if requested. sal_Bool bFolder = sal_False; xProps->getValue( - rtl::OUString( "IsFolder" ) ) + OUString( "IsFolder" ) ) >>= bFolder; xProps->addProperty( - rtl::OUString( "CreatableContentsInfo" ), + OUString( "CreatableContentsInfo" ), uno::makeAny( bFolder ? queryCreatableContentsInfo() : uno::Sequence< ucb::ContentInfo >() ), @@ -1482,8 +1482,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( sal_Bool bTriedToGetAdditonalPropSet = sal_False; sal_Bool bExchange = sal_False; - rtl::OUString aNewTitle; - rtl::OUString aOldTitle; + OUString aNewTitle; + OUString aOldTitle; sal_Int32 nTitlePos = -1; uno::Reference< beans::XPropertySetInfo > xInfo; @@ -1493,7 +1493,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( for ( sal_Int32 n = 0; n < nCount; ++n ) { const beans::PropertyValue& rValue = pValues[ n ]; - const rtl::OUString & rName = rValue.Name; + const OUString & rName = rValue.Name; beans::Property aTmpProp; xProvider->getProperty( rName, aTmpProp ); @@ -1502,7 +1502,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1515,26 +1515,26 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "Title" ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty titles! @@ -1562,7 +1562,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( catch ( DAVException const & ) { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Invalid content identifier!" ), + OUString( "Invalid content identifier!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1570,7 +1570,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Empty title not allowed!" ), + OUString( "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1578,7 +1578,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( "Property value has wrong type!" ), + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1598,7 +1598,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // PROPPATCH::set would add the property automatically, which // is not allowed for "setPropertyValues" command! aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString( "Property is unknown!" ), + OUString( "Property is unknown!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1607,21 +1607,21 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "DateCreated" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "DateModified" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "MediaType" ) @@ -1629,14 +1629,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Read-only property! // (but could be writable, if 'getcontenttype' would be) aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } if ( rName == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else @@ -1701,7 +1701,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString( "No property set for storing the value!" ), + OUString( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1746,9 +1746,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Assemble new content identifier... - rtl::OUString aNewURL = getParentURL(); + OUString aNewURL = getParentURL(); if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) ) - aNewURL += rtl::OUString("/"); + aNewURL += OUString("/"); aNewURL += NeonUri::escapeSegment( aNewTitle ); @@ -1787,18 +1787,18 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { // Do not set new title! - aNewTitle = rtl::OUString(); + aNewTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString("Exchange failed!"), + OUString("Exchange failed!"), static_cast< cppu::OWeakObject * >( this ) ); } } catch ( DAVException const & e ) { // Do not set new title! - aNewTitle = rtl::OUString(); + aNewTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= MapDAVException( e, sal_True ); @@ -1809,7 +1809,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( aNewTitle ); @@ -1858,7 +1858,7 @@ uno::Any Content::open( { // Error: Not a folder! - rtl::OUStringBuffer aMsg; + OUStringBuffer aMsg; if ( getResourceType( xEnv ) == FTP ) { // #114653# @@ -1893,7 +1893,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rArg.Mode ) ) ), xEnv ); @@ -1920,7 +1920,7 @@ uno::Any Content::open( xResAccess->setFlags( rArg.OpeningFlags ); DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; xResAccess->GET( xOut, aHeaders, aResource, xEnv ); m_bDidGetOrHead = true; @@ -1969,7 +1969,7 @@ uno::Any Content::open( // fill inputsream sync; return if all data present DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; uno::Reference< io::XInputStream > xIn = xResAccess->GET( aHeaders, aResource, xEnv ); @@ -2006,7 +2006,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2097,7 +2097,7 @@ void Content::post( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2116,13 +2116,13 @@ void Content::queryChildren( ContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += rtl::OUString("/"); + aURL += OUString("/"); } sal_Int32 nLen = aURL.getLength(); @@ -2133,7 +2133,7 @@ void Content::queryChildren( ContentRefList& rChildren ) while ( it != end ) { ::ucbhelper::ContentImplHelperRef xChild = (*it); - rtl::OUString aChildURL + OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? @@ -2165,7 +2165,7 @@ void Content::insert( throw( uno::Exception ) { sal_Bool bTransient, bCollection; - rtl::OUString aEscapedTitle; + OUString aEscapedTitle; SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< DAVResourceAccess > xResAccess; SAL_WNODEPRECATED_DECLARATIONS_POP @@ -2185,11 +2185,11 @@ void Content::insert( { OSL_FAIL( "Content::insert - Title missing!" ); - uno::Sequence< rtl::OUString > aProps( 1 ); - aProps[ 0 ] = rtl::OUString("Title"); + uno::Sequence< OUString > aProps( 1 ); + aProps[ 0 ] = OUString("Title"); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), Environment ); @@ -2217,7 +2217,7 @@ void Content::insert( if ( !bTransient || ( bTransient && !bCollection ) ) { ucb::UnsupportedNameClashException aEx( - rtl::OUString( "Unable to write without overwrite!" ), + OUString( "Unable to write without overwrite!" ), static_cast< cppu::OWeakObject * >( this ), ucb::NameClash::ERROR ); @@ -2254,7 +2254,7 @@ void Content::insert( case ucbhelper::CONTINUATION_DISAPPROVE: // Abort. throw ucb::CommandFailedException( - rtl::OUString(), + OUString(), uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2263,7 +2263,7 @@ void Content::insert( OSL_FAIL( "Content::insert - " "Unknown interaction selection!" ); throw ucb::CommandFailedException( - rtl::OUString( "Unknown interaction selection!" ), + OUString( "Unknown interaction selection!" ), uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2280,9 +2280,9 @@ void Content::insert( if ( bTransient ) { // Assemble new content identifier... - rtl::OUString aURL = getParentURL(); + OUString aURL = getParentURL(); if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString("/"); + aURL += OUString("/"); aURL += aEscapedTitle; @@ -2332,7 +2332,7 @@ void Content::insert( } else { - rtl::OUString aTitle; + OUString aTitle; try { NeonUri aURI( aURL ); @@ -2345,7 +2345,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTitle ) ), @@ -2378,7 +2378,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingInputStreamException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2421,7 +2421,7 @@ void Content::transfer( xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); } - rtl::OUString aTargetURI; + OUString aTargetURI; try { NeonUri sourceURI( rArgs.SourceURL ); @@ -2430,21 +2430,21 @@ void Content::transfer( // Check source's and target's URL scheme // - const rtl::OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); + const OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); if ( aScheme == WEBDAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAVS_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString( HTTPS_URL_SCHEME ) ); + OUString( HTTPS_URL_SCHEME ) ); } else { @@ -2453,7 +2453,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString( "Unsupported URL scheme!" ), + OUString( "Unsupported URL scheme!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2462,10 +2462,10 @@ void Content::transfer( if ( targetURI.GetScheme().toAsciiLowerCase() == WEBDAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); else if ( targetURI.GetScheme().toAsciiLowerCase() == DAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); // @@@ This implementation of 'transfer' only works // if the source and target are located at same host. @@ -2478,13 +2478,13 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString( "Different hosts!" ), + OUString( "Different hosts!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable } - rtl::OUString aTitle = rArgs.NewTitle; + OUString aTitle = rArgs.NewTitle; if ( aTitle.isEmpty() ) aTitle = sourceURI.GetPathBaseNameUnescaped(); @@ -2492,15 +2492,15 @@ void Content::transfer( if ( aTitle == "/" ) { // kso: ??? - aTitle = rtl::OUString(); + aTitle = OUString(); } targetURI.AppendPath( aTitle ); - rtl::OUString aTargetURL = xIdentifier->getContentIdentifier(); + OUString aTargetURL = xIdentifier->getContentIdentifier(); if ( ( aTargetURL.lastIndexOf( '/' ) + 1 ) != aTargetURL.getLength() ) - aTargetURL += rtl::OUString("/"); + aTargetURL += OUString("/"); aTargetURL += aTitle; @@ -2599,7 +2599,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTargetURI ) ), @@ -2618,7 +2618,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArgs.NameClash ) ), Environment ); @@ -2706,7 +2706,7 @@ void Content::lock( uno::Any aOwnerAny; aOwnerAny - <<= rtl::OUString("http://ucb.openoffice.org"); + <<= OUString("http://ucb.openoffice.org"); ucb::Lock aLock( ucb::LockScope_EXCLUSIVE, @@ -2715,7 +2715,7 @@ void Content::lock( aOwnerAny, 180, // lock timeout in secs //-1, // infinite lock - uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString >() ); xResAccess->LOCK( aLock, Environment ); @@ -2783,7 +2783,7 @@ sal_Bool Content::exchangeIdentity( // Fail, if a content with given id already exists. // if ( !hasData( xNewId ) ) { - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); aGuard.clear(); if ( exchange( xNewId ) ) @@ -2803,9 +2803,9 @@ sal_Bool Content::exchangeIdentity( // Create new content identifier for the child... uno::Reference< ucb::XContentIdentifier > xOldChildId = xChild->getIdentifier(); - rtl::OUString aOldChildURL + OUString aOldChildURL = xOldChildId->getContentIdentifier(); - rtl::OUString aNewChildURL + OUString aNewChildURL = aOldChildURL.replaceAt( 0, aOldURL.getLength(), @@ -2840,7 +2840,7 @@ sal_Bool Content::isFolder( } uno::Sequence< beans::Property > aProperties( 1 ); - aProperties[ 0 ].Name = rtl::OUString("IsFolder"); + aProperties[ 0 ].Name = OUString("IsFolder"); aProperties[ 0 ].Handle = -1; uno::Reference< sdbc::XRow > xRow( getPropertyValues( aProperties, xEnv ) ); if ( xRow.is() ) @@ -2863,12 +2863,12 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) // Map DAVException... uno::Any aException; - rtl::OUString aURL; + OUString aURL; if ( m_bTransient ) { aURL = getParentURL(); if ( aURL.lastIndexOf('/') != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString(static_cast('/')); + aURL += OUString(static_cast('/')); aURL += m_aEscapedTitle; } @@ -2883,13 +2883,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString("Uri"), -1, + OUString("Uri"), -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString("Not found!"), + OUString("Not found!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -2924,7 +2924,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_HTTP_LOOKUP: aException <<= ucb::InteractiveNetworkResolveNameException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, e.getData() ); @@ -2941,7 +2941,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_HTTP_CONNECT: aException <<= ucb::InteractiveNetworkConnectException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, e.getData() ); @@ -2962,7 +2962,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_INVALID_ARG: aException <<= lang::IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ); break; @@ -2970,7 +2970,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCKED: aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString("Locked!"), + OUString("Locked!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -2980,7 +2980,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCKED_SELF: aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString("Locked (self!)"), + OUString("Locked (self!)"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -2990,7 +2990,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_NOT_LOCKED: aException <<= ucb::InteractiveLockingNotLockedException( - rtl::OUString("Not locked!"), + OUString("Not locked!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -2999,7 +2999,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCK_EXPIRED: aException <<= ucb::InteractiveLockingLockExpiredException( - rtl::OUString("Lock expired!"), + OUString("Lock expired!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3008,7 +3008,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) default: aException <<= ucb::InteractiveNetworkGeneralException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR ); break; @@ -3044,7 +3044,7 @@ void Content::cancelCommandExecution( //========================================================================= SAL_WNODEPRECATED_DECLARATIONS_PUSH -const rtl::OUString +const OUString Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -3052,8 +3052,8 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) // First, try to obtain value of response header "Content-Location". if ( m_xCachedProps.get() ) { - rtl::OUString aLocation; - m_xCachedProps->getValue( rtl::OUString( "Content-Location" ) ) >>= aLocation; + OUString aLocation; + m_xCachedProps->getValue( OUString( "Content-Location" ) ) >>= aLocation; if ( !aLocation.isEmpty() ) { try @@ -3070,7 +3070,7 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) } } - return rtl::OUString( rResAccess->getURL() ); + return OUString( rResAccess->getURL() ); } //========================================================================= @@ -3089,8 +3089,8 @@ Content::ResourceType Content::getResourceType( ResourceType eResourceType = UNKNOWN; - const rtl::OUString & rURL = rResAccess->getURL(); - const rtl::OUString aScheme( + const OUString & rURL = rResAccess->getURL(); + const OUString aScheme( rURL.copy( 0, rURL.indexOf( ':' ) ).toAsciiLowerCase() ); if ( aScheme == FTP_URL_SCHEME ) @@ -3105,12 +3105,12 @@ Content::ResourceType Content::getResourceType( // used when loading documents... along with identifying whether // this is a DAV resource. std::vector< DAVResource > resources; - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; uno::Sequence< beans::Property > aProperties( 5 ); - aProperties[ 0 ].Name = rtl::OUString("IsFolder"); - aProperties[ 1 ].Name = rtl::OUString("IsDocument"); - aProperties[ 2 ].Name = rtl::OUString("IsReadOnly"); - aProperties[ 3 ].Name = rtl::OUString("MediaType"); + aProperties[ 0 ].Name = OUString("IsFolder"); + aProperties[ 1 ].Name = OUString("IsDocument"); + aProperties[ 2 ].Name = OUString("IsReadOnly"); + aProperties[ 3 ].Name = OUString("MediaType"); aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK; ContentProperties::UCBNamesToDAVNames( aProperties, aPropNames ); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx index 83afb3f8f5c2..ca97b6d01cbe 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx @@ -85,13 +85,13 @@ class Content : public ::ucbhelper::ContentImplHelper, std::auto_ptr< DAVResourceAccess > m_xResAccess; std::auto_ptr< CachableContentProperties > m_xCachedProps; // locally cached props - rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; ResourceType m_eResourceType; ContentProvider* m_pProvider; // No need for a ref, base class holds object bool m_bTransient; bool m_bCollection; bool m_bDidGetOrHead; - std::vector< rtl::OUString > m_aFailedPropNames; + std::vector< OUString > m_aFailedPropNames; private: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > @@ -100,7 +100,7 @@ private: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); sal_Bool isFolder( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -129,7 +129,7 @@ private: ::com::sun::star::ucb::XContentIdentifier >& xNewId ); SAL_WNODEPRECATED_DECLARATIONS_PUSH - const rtl::OUString + const OUString getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -228,16 +228,16 @@ public: XTYPEPROVIDER_DECL() // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XContent - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); @@ -256,7 +256,7 @@ public: // XPropertyContainer virtual void SAL_CALL - addProperty( const rtl::OUString& Name, + addProperty( const OUString& Name, sal_Int16 Attributes, const com::sun::star::uno::Any& DefaultValue ) throw( com::sun::star::beans::PropertyExistException, @@ -265,7 +265,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeProperty( const rtl::OUString& Name ) + removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException ); @@ -299,7 +299,7 @@ public: const ContentProperties& rData, const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); }; } diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index 0c3cd9ac6456..92a5721371ee 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -62,7 +62,7 @@ using namespace webdav_ucp; //========================================================================= bool ContentProvider::getProperty( - const rtl::OUString & rPropName, beans::Property & rProp, bool bStrict ) + const OUString & rPropName, beans::Property & rProp, bool bStrict ) { if ( !m_pProps ) { @@ -78,15 +78,15 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -94,7 +94,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -102,16 +102,16 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); // Optional UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( "DateCreated" ), + OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -119,7 +119,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "DateModified" ), + OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -127,15 +127,15 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "MediaType" ), + OUString( "MediaType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( "Size" ), + OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -143,15 +143,15 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "BaseURI" ), + OUString( "BaseURI" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -165,7 +165,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::CREATIONDATE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -173,14 +173,14 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::DISPLAYNAME, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); m_pProps->insert( beans::Property( DAVProperties::GETCONTENTLANGUAGE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -188,7 +188,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETCONTENTLENGTH, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -196,7 +196,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETCONTENTTYPE , -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -204,7 +204,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETETAG, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -212,7 +212,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETLASTMODIFIED, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -229,7 +229,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::RESOURCETYPE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -255,7 +255,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::EXECUTABLE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); } } @@ -280,7 +280,7 @@ bool ContentProvider::getProperty( rProp = beans::Property( rPropName, - 1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); } @@ -315,7 +315,7 @@ uno::Sequence< beans::Property > Content::getProperties( xProvider.set( m_pProvider ); } - typedef std::set< rtl::OUString > StringSet; + typedef std::set< OUString > StringSet; StringSet aPropSet; // No server access for just created (not yet committed) objects. @@ -356,8 +356,8 @@ uno::Sequence< beans::Property > Content::getProperties( sal_Bool bHasCreatableInfos = sal_False; { - std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); - std::set< rtl::OUString >::const_iterator end = aPropSet.end(); + std::set< OUString >::const_iterator it = aPropSet.begin(); + std::set< OUString >::const_iterator end = aPropSet.end(); while ( it != end ) { if ( !bHasCreationDate && @@ -427,21 +427,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Add mandatory properties. if ( !bHasContentType ) aPropSet.insert( - rtl::OUString( "ContentType" ) ); + OUString( "ContentType" ) ); if ( !bHasIsDocument ) aPropSet.insert( - rtl::OUString( "IsDocument" ) ); + OUString( "IsDocument" ) ); if ( !bHasIsFolder ) aPropSet.insert( - rtl::OUString( "IsFolder" ) ); + OUString( "IsFolder" ) ); if ( !bHasTitle ) { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( "Title" ) ); + OUString( "Title" ) ); } // Add optional properties. @@ -450,34 +450,34 @@ uno::Sequence< beans::Property > Content::getProperties( { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( "BaseURI" ) ); + OUString( "BaseURI" ) ); } if ( !bHasDateCreated && bHasCreationDate ) aPropSet.insert( - rtl::OUString( "DateCreated" ) ); + OUString( "DateCreated" ) ); if ( !bHasDateModified && bHasGetLastModified ) aPropSet.insert( - rtl::OUString( "DateModified" ) ); + OUString( "DateModified" ) ); if ( !bHasMediaType && bHasGetContentType ) aPropSet.insert( - rtl::OUString( "MediaType" ) ); + OUString( "MediaType" ) ); if ( !bHasSize && bHasGetContentLength ) aPropSet.insert( - rtl::OUString( "Size" ) ); + OUString( "Size" ) ); if ( !bHasCreatableInfos ) aPropSet.insert( - rtl::OUString( + OUString( "CreatableContentsInfo" ) ); // Add cached properties, if present and still missing. if ( xCachedProps.get() ) { - const std::set< rtl::OUString >::const_iterator set_end + const std::set< OUString >::const_iterator set_end = aPropSet.end(); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -501,7 +501,7 @@ uno::Sequence< beans::Property > Content::getProperties( sal_Int32 nCount = aPropSet.size(); uno::Sequence< beans::Property > aProperties( nCount ); - std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); + std::set< OUString >::const_iterator it = aPropSet.begin(); beans::Property aProp; for ( sal_Int32 n = 0; n < nCount; ++n, ++it ) @@ -528,23 +528,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ); aCmdInfo[ 3 ] = ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ); @@ -555,18 +555,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ); aCmdInfo[ 6 ] = ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ); @@ -577,7 +577,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - rtl::OUString( "post" ), + OUString( "post" ), -1, getCppuType( static_cast< ucb::PostCommandArgument2 * >( 0 ) ) ); @@ -610,13 +610,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ); @@ -631,13 +631,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "lock" ), + OUString( "lock" ), -1, getCppuVoidType() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "unlock" ), + OUString( "unlock" ), -1, getCppuVoidType() ); nPos++; diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index c33be5174602..e84faf900146 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -58,7 +58,7 @@ namespace webdav_ucp struct ResultListEntry { - rtl::OUString aId; + OUString aId; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; @@ -127,13 +127,13 @@ DataSupplier::~DataSupplier() //========================================================================= // virtual -rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( nIndex < m_pImpl->m_aResults.size() ) { - rtl::OUString aId = m_pImpl->m_aResults[ nIndex ].aId; + OUString aId = m_pImpl->m_aResults[ nIndex ].aId; if ( !aId.isEmpty() ) { // Already cached. @@ -143,23 +143,23 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) if ( getResult( nIndex ) ) { - rtl::OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); + OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); const ContentProperties& props = *( m_pImpl->m_aResults[ nIndex ].pData ); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString("/"); + aId += OUString("/"); aId += props.getEscapedTitle(); if ( props.isTrailingSlash() ) - aId += rtl::OUString("/"); + aId += OUString("/"); m_pImpl->m_aResults[ nIndex ].aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -180,7 +180,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { uno::Reference< ucb::XContentIdentifier > xId @@ -343,7 +343,7 @@ sal_Bool DataSupplier::getData() if ( !m_pImpl->m_bCountFinal ) { - std::vector< rtl::OUString > propertyNames; + std::vector< OUString > propertyNames; ContentProperties::UCBNamesToDAVNames( getResultSet()->getProperties(), propertyNames ); @@ -351,9 +351,9 @@ sal_Bool DataSupplier::getData() // needed to get a valid ContentProperties::pIsFolder value, which // is needed for OpenMode handling. - std::vector< rtl::OUString >::const_iterator it + std::vector< OUString >::const_iterator it = propertyNames.begin(); - std::vector< rtl::OUString >::const_iterator end + std::vector< OUString >::const_iterator end = propertyNames.end(); while ( it != end ) @@ -390,7 +390,7 @@ sal_Bool DataSupplier::getData() { NeonUri aURI( m_pImpl->m_xContent->getResourceAccess().getURL() ); - rtl::OUString aPath = aURI.GetPath(); + OUString aPath = aURI.GetPath(); if ( aPath.getStr()[ aPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -410,7 +410,7 @@ sal_Bool DataSupplier::getData() try { NeonUri aCurrURI( rRes.uri ); - rtl::OUString aCurrPath = aCurrURI.GetPath(); + OUString aCurrPath = aCurrURI.GetPath(); if ( aCurrPath.getStr()[ aCurrPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -444,7 +444,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( "IsFolder" ) ); + OUString( "IsFolder" ) ); rValue >>= bFolder; if ( !bFolder ) @@ -459,7 +459,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( "IsDocument" ) ); + OUString( "IsDocument" ) ); rValue >>= bDocument; if ( !bDocument ) diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx index 5e97a71f03ec..6d9be6b8056b 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx @@ -54,7 +54,7 @@ public: virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index 01b919cc71f0..389b0c5d466f 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -94,8 +94,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString( "com.sun.star.comp.WebDAVContentProvider" ), - rtl::OUString( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); + OUString( "com.sun.star.comp.WebDAVContentProvider" ), + OUString( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); //========================================================================= // @@ -121,14 +121,14 @@ ContentProvider::queryContent( { // Check URL scheme... - const rtl::OUString aScheme + const OUString aScheme = Identifier->getContentProviderScheme().toAsciiLowerCase(); if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME && aScheme != WEBDAV_URL_SCHEME && aScheme != DAV_URL_SCHEME && aScheme != DAVS_URL_SCHEME && aScheme != FTP_URL_SCHEME ) throw ucb::IllegalIdentifierException(); // Normalize URL and create new Id, if nessacary. - rtl::OUString aURL = Identifier->getContentIdentifier(); + OUString aURL = Identifier->getContentIdentifier(); // At least: + "://" if ( aURL.getLength() < ( aScheme.getLength() + 3 ) ) @@ -146,21 +146,21 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, WEBDAV_URL_SCHEME_LENGTH, - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); bNewId = true; } else if ( aScheme == DAV_URL_SCHEME ) { aURL = aURL.replaceAt( 0, DAV_URL_SCHEME_LENGTH, - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); bNewId = true; } else if ( aScheme == DAVS_URL_SCHEME ) { aURL = aURL.replaceAt( 0, DAVS_URL_SCHEME_LENGTH, - rtl::OUString( HTTPS_URL_SCHEME ) ); + OUString( HTTPS_URL_SCHEME ) ); bNewId = true; } @@ -175,7 +175,7 @@ ContentProvider::queryContent( nPos = aURL.indexOf( '/', nPos + 1 ); if ( nPos == -1 ) { - aURL += rtl::OUString("/"); + aURL += OUString("/"); bNewId = true; } } diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index 3793868d2b45..1e4b273c8770 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -115,7 +115,7 @@ public: rtl::Reference< DAVSessionFactory > getDAVSessionFactory() { return m_xDAVSessionFactory; } - bool getProperty( const ::rtl::OUString & rPropName, + bool getProperty( const OUString & rPropName, ::com::sun::star::beans::Property & rProp, bool bStrict = false ); }; diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 4c6e217ac39f..0ca32557aeec 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -88,16 +88,16 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) SerfUri aURI( rResource.uri ); m_aEscapedTitle = aURI.GetPathBaseName(); - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( aURI.GetPathBaseNameUnescaped() ), true ); } catch ( DAVException const & ) { - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( - rtl::OUString( "*** unknown ***" ) ), + OUString( "*** unknown ***" ) ), true ); } @@ -119,24 +119,24 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) //========================================================================= ContentProperties::ContentProperties( - const rtl::OUString & rTitle, sal_Bool bFolder ) + const OUString & rTitle, sal_Bool bFolder ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( sal_False ) { - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( rTitle ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsFolder" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsFolder" ) ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsDocument" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsDocument" ) ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); } //========================================================================= -ContentProperties::ContentProperties( const rtl::OUString & rTitle ) +ContentProperties::ContentProperties( const OUString & rTitle ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( sal_False ) { - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( rTitle ), true ); } @@ -158,7 +158,7 @@ ContentProperties::ContentProperties( const ContentProperties & rOther ) } //========================================================================= -bool ContentProperties::contains( const rtl::OUString & rName ) const +bool ContentProperties::contains( const OUString & rName ) const { if ( get( rName ) ) return true; @@ -168,7 +168,7 @@ bool ContentProperties::contains( const rtl::OUString & rName ) const //========================================================================= const uno::Any & ContentProperties::getValue( - const rtl::OUString & rName ) const + const OUString & rName ) const { const PropertyValue * pProp = get( rName ); if ( pProp ) @@ -179,7 +179,7 @@ const uno::Any & ContentProperties::getValue( //========================================================================= const PropertyValue * ContentProperties::get( - const rtl::OUString & rName ) const + const OUString & rName ) const { PropertyValueMap::const_iterator it = m_xProps->find( rName ); const PropertyValueMap::const_iterator end = m_xProps->end(); @@ -204,7 +204,7 @@ const PropertyValue * ContentProperties::get( // static void ContentProperties::UCBNamesToDAVNames( const uno::Sequence< beans::Property > & rProps, - std::vector< rtl::OUString > & propertyNames, + std::vector< OUString > & propertyNames, bool bIncludeUnmatched /* = true */ ) { ////////////////////////////////////////////////////////////// @@ -298,7 +298,7 @@ void ContentProperties::UCBNamesToDAVNames( // static void ContentProperties::UCBNamesToHTTPNames( const uno::Sequence< beans::Property > & rProps, - std::vector< rtl::OUString > & propertyNames, + std::vector< OUString > & propertyNames, bool bIncludeUnmatched /* = true */ ) { ////////////////////////////////////////////////////////////// @@ -319,17 +319,17 @@ void ContentProperties::UCBNamesToHTTPNames( if ( rProp.Name == "DateModified" ) { propertyNames.push_back( - rtl::OUString::createFromAscii( "Last-Modified" ) ); + OUString::createFromAscii( "Last-Modified" ) ); } else if ( rProp.Name == "MediaType" ) { propertyNames.push_back( - rtl::OUString::createFromAscii( "Content-Type" ) ); + OUString::createFromAscii( "Content-Type" ) ); } else if ( rProp.Name == "Size" ) { propertyNames.push_back( - rtl::OUString::createFromAscii( "Content-Length" ) ); + OUString::createFromAscii( "Content-Length" ) ); } else { @@ -342,14 +342,14 @@ void ContentProperties::UCBNamesToHTTPNames( //========================================================================= bool ContentProperties::containsAllNames( const uno::Sequence< beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const + std::vector< OUString > & rNamesNotContained ) const { rNamesNotContained.clear(); sal_Int32 nCount = rProps.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString & rName = rProps[ n ].Name; + const OUString & rName = rProps[ n ].Name; if ( !contains( rName ) ) { // Not found. @@ -362,15 +362,15 @@ bool ContentProperties::containsAllNames( //========================================================================= void ContentProperties::addProperties( - const std::vector< rtl::OUString > & rProps, + const std::vector< OUString > & rProps, const ContentProperties & rContentProps ) { - std::vector< rtl::OUString >::const_iterator it = rProps.begin(); - std::vector< rtl::OUString >::const_iterator end = rProps.end(); + std::vector< OUString >::const_iterator it = rProps.begin(); + std::vector< OUString >::const_iterator end = rProps.end(); while ( it != end ) { - const rtl::OUString & rName = (*it); + const OUString & rName = (*it); if ( !contains( rName ) ) // ignore duplicates { @@ -424,19 +424,19 @@ void ContentProperties::addProperty( const DAVPropertyValue & rProp ) } //========================================================================= -void ContentProperties::addProperty( const rtl::OUString & rName, +void ContentProperties::addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ) { if ( rName == DAVProperties::CREATIONDATE ) ) { // Map DAV:creationdate to UCP:DateCreated - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString::createFromAscii( "DateCreated" ) ] + (*m_xProps)[ OUString::createFromAscii( "DateCreated" ) ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::DISPLAYNAME ) ) @@ -448,10 +448,10 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName == DAVProperties::GETCONTENTLENGTH ) ) { // Map DAV:getcontentlength to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString::createFromAscii( "Size" ) ] + (*m_xProps)[ OUString::createFromAscii( "Size" ) ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName == "Content-Length" ) @@ -460,16 +460,16 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map Content-Length entity header to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString::createFromAscii( "Size" ) ] + (*m_xProps)[ OUString::createFromAscii( "Size" ) ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName == DAVProperties::GETCONTENTTYPE ) ) { // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString::createFromAscii( "MediaType" ) ] + (*m_xProps)[ OUString::createFromAscii( "MediaType" ) ] = PropertyValue( rValue, true ); } else if ( rName == "Content-Type" ) @@ -478,7 +478,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString::createFromAscii( "MediaType" ) ] + (*m_xProps)[ OUString::createFromAscii( "MediaType" ) ] = PropertyValue( rValue, true ); } // else if ( rName.equals( DAVProperties::GETETAG ) ) @@ -487,12 +487,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName == DAVProperties::GETLASTMODIFIED ) { // Map the DAV:getlastmodified entity header to UCP:DateModified - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString::createFromAscii( "DateModified" ) ] + (*m_xProps)[ OUString::createFromAscii( "DateModified" ) ] = PropertyValue( uno::makeAny( aDate ), true ); } else if ( rName == "Last-Modified" ) @@ -501,12 +501,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map the Last-Modified entity header to UCP:DateModified - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString::createFromAscii( "DateModified" ) ] + (*m_xProps)[ OUString::createFromAscii( "DateModified" ) ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) ) @@ -514,21 +514,21 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // } else if ( rName == DAVProperties::RESOURCETYPE ) ) { - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType sal_Bool bFolder = aValue.equalsIgnoreAsciiCase( "collection" ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsFolder" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsFolder" ) ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsDocument" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsDocument" ) ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "ContentType" ) ] + (*m_xProps)[ OUString::createFromAscii( "ContentType" ) ] = PropertyValue( uno::makeAny( bFolder - ? rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ) - : rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ) ), true ); + ? OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ) + : OUString::createFromAscii( WEBDAV_CONTENT_TYPE ) ), true ); } // else if ( rName.equals( DAVProperties::SUPPORTEDLOCK ) ) // { @@ -548,25 +548,25 @@ void ContentProperties::addProperty( const rtl::OUString & rName, namespace { - bool isCachable( rtl::OUString const & rName, + bool isCachable( OUString const & rName, bool isCaseSensitive ) { - static rtl::OUString aNonCachableProps [] = + static OUString aNonCachableProps [] = { DAVProperties::LOCKDISCOVERY, DAVProperties::GETETAG, - rtl::OUString( "ETag" ), + OUString( "ETag" ), - rtl::OUString( "DateModified" ), - rtl::OUString( "Last-Modified" ), + OUString( "DateModified" ), + OUString( "Last-Modified" ), DAVProperties::GETLASTMODIFIED, - rtl::OUString( "Size" ), - rtl::OUString( "Content-Length" ), + OUString( "Size" ), + OUString( "Content-Length" ), DAVProperties::GETCONTENTLENGTH, - rtl::OUString( "Date" ) + OUString( "Date" ) }; for ( sal_uInt32 n = 0; diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index 6105879f1dda..b9e075c1854b 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -42,7 +42,7 @@ struct DAVResource; struct equalString { - bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const + bool operator()( const OUString& s1, const OUString& s2 ) const { return !!( s1 == s2 ); } @@ -50,7 +50,7 @@ struct equalString struct hashString { - size_t operator()( const rtl::OUString & rName ) const + size_t operator()( const OUString & rName ) const { return rName.hashCode(); } @@ -84,7 +84,7 @@ public: typedef std::hash_map < - rtl::OUString, + OUString, PropertyValue, hashString, equalString @@ -101,17 +101,17 @@ public: ContentProperties( const DAVResource& rResource ); // Mini props for transient contents. - ContentProperties( const rtl::OUString & rTitle, sal_Bool bFolder ); + ContentProperties( const OUString & rTitle, sal_Bool bFolder ); // Micro props for non-existing contents. - ContentProperties( const rtl::OUString & rTitle ); + ContentProperties( const OUString & rTitle ); ContentProperties( const ContentProperties & rOther ); - bool contains( const rtl::OUString & rName ) const; + bool contains( const OUString & rName ) const; const com::sun::star::uno::Any & - getValue( const rtl::OUString & rName ) const; + getValue( const OUString & rName ) const; // Maps the UCB property names contained in rProps with their DAV property // counterparts, if possible. All unmappable properties will be included @@ -123,7 +123,7 @@ public: static void UCBNamesToDAVNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property > & rProps, - std::vector< rtl::OUString > & resources, + std::vector< OUString > & resources, bool bIncludeUnmatched = true ); // Maps the UCB property names contained in rProps with their HTTP header @@ -136,7 +136,7 @@ public: static void UCBNamesToHTTPNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property > & rProps, - std::vector< rtl::OUString > & resources, + std::vector< OUString > & resources, bool bIncludeUnmatched = true ); // return true, if all properties contained in rProps are contained in @@ -145,12 +145,12 @@ public: bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const; + std::vector< OUString > & rNamesNotContained ) const; // adds all properties described by rProps that are actually contained in // rContentProps to this instance. In case of duplicates the value // already contained in this will left unchanged. - void addProperties( const std::vector< rtl::OUString > & rProps, + void addProperties( const std::vector< OUString > & rProps, const ContentProperties & rContentProps ); // overwrites probably existing entries. @@ -160,7 +160,7 @@ public: void addProperties( const std::vector< DAVPropertyValue > & rProps ); // overwrites probably existing entry. - void addProperty( const rtl::OUString & rName, + void addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ); @@ -169,7 +169,7 @@ public: bool isTrailingSlash() const { return m_bTrailingSlash; } - const rtl::OUString & getEscapedTitle() const { return m_aEscapedTitle; } + const OUString & getEscapedTitle() const { return m_aEscapedTitle; } // Not good to expose implementation details, but this is actually an // internal class. @@ -177,7 +177,7 @@ public: { return m_xProps; } private: - ::rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; std::auto_ptr< PropertyValueMap > m_xProps; bool m_bTrailingSlash; @@ -185,7 +185,7 @@ private: ContentProperties & operator=( const ContentProperties & ); // n.i. - const PropertyValue * get( const rtl::OUString & rName ) const; + const PropertyValue * get( const OUString & rName ) const; }; class CachableContentProperties @@ -206,11 +206,11 @@ public: bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const + std::vector< OUString > & rNamesNotContained ) const { return m_aProps.containsAllNames( rProps, rNamesNotContained ); } const com::sun::star::uno::Any & - getValue( const rtl::OUString & rName ) const + getValue( const OUString & rName ) const { return m_aProps.getValue( rName ); } operator const ContentProperties & () const { return m_aProps; } diff --git a/ucb/source/ucp/webdav/DAVAuthListener.hxx b/ucb/source/ucp/webdav/DAVAuthListener.hxx index baa27bdc19ba..005079b26de5 100644 --- a/ucb/source/ucp/webdav/DAVAuthListener.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListener.hxx @@ -34,10 +34,10 @@ class DAVAuthListener : public salhelper::SimpleReferenceObject { public: virtual int authenticate( - const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials, sal_Bool bUsePreviousCredentials = sal_True ) = 0; }; diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx index 9ffe92255ef7..82822239da40 100644 --- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx @@ -46,25 +46,25 @@ namespace http_dav_ucp DAVAuthListener_Impl( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& xEnv, - const ::rtl::OUString & inURL ) + const OUString & inURL ) : m_xEnv( xEnv ), m_aURL( inURL ) { } - virtual int authenticate( const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + virtual int authenticate( const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials, sal_Bool bUsePreviousCredentials = sal_True ); private: const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; - const rtl::OUString m_aURL; + const OUString m_aURL; - rtl::OUString m_aPrevPassword; - rtl::OUString m_aPrevUsername; + OUString m_aPrevPassword; + OUString m_aPrevUsername; }; } diff --git a/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav/DAVException.hxx index dc0dc2fd57f2..54b85003c82e 100644 --- a/ucb/source/ucp/webdav/DAVException.hxx +++ b/ucb/source/ucp/webdav/DAVException.hxx @@ -135,7 +135,7 @@ class DAVException private: ExceptionCode mExceptionCode; - rtl::OUString mData; + OUString mData; sal_uInt16 mStatusCode; public: @@ -145,13 +145,13 @@ class DAVException , mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const rtl::OUString & rData ) + const OUString & rData ) : mExceptionCode( inExceptionCode ) , mData( rData ) , mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const rtl::OUString & rData, + const OUString & rData, sal_uInt16 nStatusCode ) : mExceptionCode( inExceptionCode ) , mData( rData ) @@ -160,7 +160,7 @@ class DAVException ~DAVException( ) {}; const ExceptionCode & getError() const { return mExceptionCode; } - const rtl::OUString & getData() const { return mData; } + const OUString & getData() const { return mData; } sal_uInt16 getStatus() const { return mStatusCode; } }; diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx index 5b018b6e6344..7340dbe6a35c 100644 --- a/ucb/source/ucp/webdav/DAVProperties.cxx +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -22,41 +22,41 @@ using namespace http_dav_ucp; -const ::rtl::OUString DAVProperties::CREATIONDATE = - ::rtl::OUString::createFromAscii( "DAV:creationdate" ); -const ::rtl::OUString DAVProperties::DISPLAYNAME = - ::rtl::OUString::createFromAscii( "DAV:displayname" ); -const ::rtl::OUString DAVProperties::GETCONTENTLANGUAGE = - ::rtl::OUString::createFromAscii( "DAV:getcontentlanguage" ); -const ::rtl::OUString DAVProperties::GETCONTENTLENGTH = - ::rtl::OUString::createFromAscii( "DAV:getcontentlength" ); -const ::rtl::OUString DAVProperties::GETCONTENTTYPE = - ::rtl::OUString::createFromAscii( "DAV:getcontenttype" ); -const ::rtl::OUString DAVProperties::GETETAG = - ::rtl::OUString::createFromAscii( "DAV:getetag" ); -const ::rtl::OUString DAVProperties::GETLASTMODIFIED = - ::rtl::OUString::createFromAscii( "DAV:getlastmodified" ); -const ::rtl::OUString DAVProperties::LOCKDISCOVERY = - ::rtl::OUString::createFromAscii( "DAV:lockdiscovery" ); -const ::rtl::OUString DAVProperties::RESOURCETYPE = - ::rtl::OUString::createFromAscii( "DAV:resourcetype" ); -const ::rtl::OUString DAVProperties::SUPPORTEDLOCK = - ::rtl::OUString::createFromAscii( "DAV:supportedlock" ); +const OUString DAVProperties::CREATIONDATE = + OUString::createFromAscii( "DAV:creationdate" ); +const OUString DAVProperties::DISPLAYNAME = + OUString::createFromAscii( "DAV:displayname" ); +const OUString DAVProperties::GETCONTENTLANGUAGE = + OUString::createFromAscii( "DAV:getcontentlanguage" ); +const OUString DAVProperties::GETCONTENTLENGTH = + OUString::createFromAscii( "DAV:getcontentlength" ); +const OUString DAVProperties::GETCONTENTTYPE = + OUString::createFromAscii( "DAV:getcontenttype" ); +const OUString DAVProperties::GETETAG = + OUString::createFromAscii( "DAV:getetag" ); +const OUString DAVProperties::GETLASTMODIFIED = + OUString::createFromAscii( "DAV:getlastmodified" ); +const OUString DAVProperties::LOCKDISCOVERY = + OUString::createFromAscii( "DAV:lockdiscovery" ); +const OUString DAVProperties::RESOURCETYPE = + OUString::createFromAscii( "DAV:resourcetype" ); +const OUString DAVProperties::SUPPORTEDLOCK = + OUString::createFromAscii( "DAV:supportedlock" ); -const ::rtl::OUString DAVProperties::EXECUTABLE = - ::rtl::OUString::createFromAscii( +const OUString DAVProperties::EXECUTABLE = + OUString::createFromAscii( "http://apache.org/dav/props/executable" ); // ------------------------------------------------------------------- // static -void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, +void DAVProperties::createSerfPropName( const OUString & rFullName, SerfPropName & rName ) { if ( rFullName.startsWith( "DAV:" ) ) { rName.nspace = "DAV:"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "DAV:" ) ), RTL_TEXTENCODING_UTF8 ) ); } @@ -64,7 +64,7 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, { rName.nspace = "http://apache.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://apache.org/dav/props/" ) ), @@ -74,7 +74,7 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, { rName.nspace = "http://ucb.openoffice.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://ucb.openoffice.org/dav/props/" ) ), @@ -84,8 +84,8 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, { // Support for 3rd party namespaces/props - rtl::OString aFullName - = rtl::OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ); + OString aFullName + = OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ); // Format: @@ -102,7 +102,7 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, // Add our namespace to our own properties. rName.nspace = "http://ucb.openoffice.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( rFullName, + = strdup( OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ) ); } } @@ -111,12 +111,12 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, // static void DAVProperties::createUCBPropName( const char * nspace, const char * name, - rtl::OUString & rFullName ) + OUString & rFullName ) { - rtl::OUString aNameSpace - = rtl::OStringToOUString( nspace, RTL_TEXTENCODING_UTF8 ); - rtl::OUString aName - = rtl::OStringToOUString( name, RTL_TEXTENCODING_UTF8 ); + OUString aNameSpace + = OStringToOUString( nspace, RTL_TEXTENCODING_UTF8 ); + OUString aName + = OStringToOUString( name, RTL_TEXTENCODING_UTF8 ); if ( !aNameSpace.getLength() ) { @@ -135,7 +135,7 @@ void DAVProperties::createUCBPropName( const char * nspace, DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) ) { - aNameSpace = rtl::OUString( "DAV:" ); + aNameSpace = OUString( "DAV:" ); } } @@ -162,11 +162,11 @@ void DAVProperties::createUCBPropName( const char * nspace, else { // Create property name that encodes, namespace and name ( XML ). - rFullName = rtl::OUString::createFromAscii( "" ); + rFullName += OUString::createFromAscii( "\">" ); } } diff --git a/ucb/source/ucp/webdav/DAVProperties.hxx b/ucb/source/ucp/webdav/DAVProperties.hxx index 0434ef3cc7e5..1906c7fb264d 100644 --- a/ucb/source/ucp/webdav/DAVProperties.hxx +++ b/ucb/source/ucp/webdav/DAVProperties.hxx @@ -29,23 +29,23 @@ namespace http_dav_ucp struct DAVProperties { - static const ::rtl::OUString CREATIONDATE; - static const ::rtl::OUString DISPLAYNAME; - static const ::rtl::OUString GETCONTENTLANGUAGE; - static const ::rtl::OUString GETCONTENTLENGTH; - static const ::rtl::OUString GETCONTENTTYPE; - static const ::rtl::OUString GETETAG; - static const ::rtl::OUString GETLASTMODIFIED; - static const ::rtl::OUString LOCKDISCOVERY; - static const ::rtl::OUString RESOURCETYPE; - static const ::rtl::OUString SUPPORTEDLOCK; - static const ::rtl::OUString EXECUTABLE; + static const OUString CREATIONDATE; + static const OUString DISPLAYNAME; + static const OUString GETCONTENTLANGUAGE; + static const OUString GETCONTENTLENGTH; + static const OUString GETCONTENTTYPE; + static const OUString GETETAG; + static const OUString GETLASTMODIFIED; + static const OUString LOCKDISCOVERY; + static const OUString RESOURCETYPE; + static const OUString SUPPORTEDLOCK; + static const OUString EXECUTABLE; - static void createSerfPropName( const rtl::OUString & rFullName, + static void createSerfPropName( const OUString & rFullName, SerfPropName & rName ); static void createUCBPropName ( const char * nspace, const char * name, - rtl::OUString & rFullName ); + OUString & rFullName ); static bool isUCBDeadProperty( const SerfPropName & rName ); }; diff --git a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx index e609273968f5..ea63b9efe514 100644 --- a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx +++ b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx @@ -27,19 +27,19 @@ namespace http_dav_ucp { - typedef std::pair< rtl::OUString, rtl::OUString > DAVRequestHeader; + typedef std::pair< OUString, OUString > DAVRequestHeader; typedef std::vector< DAVRequestHeader > DAVRequestHeaders; struct DAVRequestEnvironment { - rtl::OUString m_aRequestURI; + OUString m_aRequestURI; rtl::Reference< DAVAuthListener > m_xAuthListener; // rtl::Reference< DAVStatusListener > m_xStatusListener; // rtl::Reference< DAVProgressListener > m_xStatusListener; DAVRequestHeaders m_aRequestHeaders; com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; -DAVRequestEnvironment( const rtl::OUString & rRequestURI, +DAVRequestEnvironment( const OUString & rRequestURI, const rtl::Reference< DAVAuthListener > & xListener, const DAVRequestHeaders & rRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv) diff --git a/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav/DAVResource.hxx index 6e9fa1b259e5..9e43a135973c 100644 --- a/ucb/source/ucp/webdav/DAVResource.hxx +++ b/ucb/source/ucp/webdav/DAVResource.hxx @@ -32,7 +32,7 @@ namespace http_dav_ucp struct DAVPropertyValue { - rtl::OUString Name; + OUString Name; com::sun::star::uno::Any Value; bool IsCaseSensitive; @@ -41,19 +41,19 @@ struct DAVPropertyValue struct DAVResource { - ::rtl::OUString uri; + OUString uri; std::vector< DAVPropertyValue > properties; DAVResource() {} - DAVResource( const ::rtl::OUString & inUri ) : uri( inUri ) {} + DAVResource( const OUString & inUri ) : uri( inUri ) {} }; struct DAVResourceInfo { - ::rtl::OUString uri; - std::vector < ::rtl::OUString > properties; + OUString uri; + std::vector < OUString > properties; - DAVResourceInfo( const ::rtl::OUString & inUri ) : uri( inUri ) {} + DAVResourceInfo( const OUString & inUri ) : uri( inUri ) {} }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 8c495610a8d7..ee713eae1183 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -42,10 +42,10 @@ using namespace com::sun::star; //========================================================================= // virtual int DAVAuthListener_Impl::authenticate( - const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials, sal_Bool bUsePreviousCredentials ) { @@ -69,7 +69,7 @@ int DAVAuthListener_Impl::authenticate( rtl::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest = new ucbhelper::SimpleAuthenticationRequest( m_aURL, inHostName, inRealm, inoutUserName, - outPassWord, ::rtl::OUString(), + outPassWord, OUString(), true /*bAllowPersistentStoring*/, bCanUseSystemCredentials ); xIH->handle( xRequest.get() ); @@ -98,8 +98,8 @@ int DAVAuthListener_Impl::authenticate( { // This is the (strange) way to tell neon to use // system credentials. - inoutUserName = rtl::OUString(); - outPassWord = rtl::OUString(); + inoutUserName = OUString(); + outPassWord = OUString(); } else { @@ -133,7 +133,7 @@ int DAVAuthListener_Impl::authenticate( DAVResourceAccess::DAVResourceAccess( const uno::Reference< lang::XMultiServiceFactory > & rSMgr, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ) + const OUString & rURL ) : m_aURL( rURL ), m_xSessionFactory( rSessionFactory ), m_xSMgr( rSMgr ) @@ -168,7 +168,7 @@ DAVResourceAccess & DAVResourceAccess::operator=( //========================================================================= void DAVResourceAccess::PROPFIND( const Depth nDepth, - const std::vector< rtl::OUString > & rPropertyNames, + const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -186,7 +186,7 @@ void DAVResourceAccess::PROPFIND( getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "PROPFIND" ), aHeaders ); @@ -229,7 +229,7 @@ void DAVResourceAccess::PROPFIND( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "PROPFIND" ), aHeaders ); @@ -270,7 +270,7 @@ void DAVResourceAccess::PROPPATCH( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "PROPPATCH" ), aHeaders ); @@ -294,7 +294,7 @@ void DAVResourceAccess::PROPPATCH( //========================================================================= void DAVResourceAccess::HEAD( - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( DAVException ) @@ -311,7 +311,7 @@ void DAVResourceAccess::HEAD( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "HEAD" ), + OUString::createFromAscii( "HEAD" ), aHeaders ); m_xSession->HEAD( getRequestURI(), @@ -351,7 +351,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -392,7 +392,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); m_xSession->GET( getRequestURI(), @@ -415,7 +415,7 @@ void DAVResourceAccess::GET( //========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::GET( - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -433,7 +433,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -461,7 +461,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( //========================================================================= void DAVResourceAccess::GET( uno::Reference< io::XOutputStream > & rStream, - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -478,7 +478,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); m_xSession->GET( getRequestURI(), @@ -565,7 +565,7 @@ void DAVResourceAccess::PUT( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "PUT" ), + OUString::createFromAscii( "PUT" ), aHeaders ); m_xSession->PUT( getRequestURI(), @@ -588,8 +588,8 @@ void DAVResourceAccess::PUT( //========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ) @@ -617,7 +617,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "POST" ), + OUString::createFromAscii( "POST" ), aHeaders ); xStream = m_xSession->POST( getRequestURI(), @@ -651,8 +651,8 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( //========================================================================= void DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, uno::Reference< io::XOutputStream > & rOutputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) @@ -680,7 +680,7 @@ void DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "POST" ), + OUString::createFromAscii( "POST" ), aHeaders ); m_xSession->POST( getRequestURI(), @@ -728,7 +728,7 @@ void DAVResourceAccess::MKCOL( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "MKCOL" ), + OUString::createFromAscii( "MKCOL" ), aHeaders ); m_xSession->MKCOL( getRequestURI(), @@ -750,8 +750,8 @@ void DAVResourceAccess::MKCOL( //========================================================================= void DAVResourceAccess::COPY( - const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -768,7 +768,7 @@ void DAVResourceAccess::COPY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "COPY" ), + OUString::createFromAscii( "COPY" ), aHeaders ); m_xSession->COPY( rSourcePath, @@ -792,8 +792,8 @@ void DAVResourceAccess::COPY( //========================================================================= void DAVResourceAccess::MOVE( - const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -810,7 +810,7 @@ void DAVResourceAccess::MOVE( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "MOVE" ), + OUString::createFromAscii( "MOVE" ), aHeaders ); m_xSession->MOVE( rSourcePath, @@ -849,7 +849,7 @@ void DAVResourceAccess::DESTROY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "DESTROY" ), aHeaders ); @@ -889,7 +889,7 @@ void DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "LOCK" ), + OUString::createFromAscii( "LOCK" ), aHeaders ); m_xSession->LOCK( getRequestURI(), @@ -931,7 +931,7 @@ sal_Int64 DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "LOCK" ), + OUString::createFromAscii( "LOCK" ), aHeaders ); nNewTimeout = m_xSession->LOCK( getRequestURI(), @@ -973,7 +973,7 @@ void DAVResourceAccess::UNLOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "UNLOCK" ), + OUString::createFromAscii( "UNLOCK" ), aHeaders ); m_xSession->UNLOCK( getRequestURI(), @@ -994,12 +994,12 @@ void DAVResourceAccess::UNLOCK( } //========================================================================= -void DAVResourceAccess::setURL( const rtl::OUString & rNewURL ) +void DAVResourceAccess::setURL( const OUString & rNewURL ) throw( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); m_aURL = rNewURL; - m_aPath = rtl::OUString(); // Next initialize() will create new session. + m_aPath = OUString(); // Next initialize() will create new session. } //========================================================================= @@ -1011,7 +1011,7 @@ void DAVResourceAccess::initialize() if ( m_aPath.isEmpty() ) { SerfUri aURI( m_aURL ); - rtl::OUString aPath( aURI.GetPath() ); + OUString aPath( aURI.GetPath() ); /* #134089# - Check URI */ if ( aPath.isEmpty() ) @@ -1045,7 +1045,7 @@ void DAVResourceAccess::initialize() } //========================================================================= -const rtl::OUString & DAVResourceAccess::getRequestURI() const +const OUString & DAVResourceAccess::getRequestURI() const { OSL_ENSURE( m_xSession.is(), "DAVResourceAccess::getRequestURI - Not initialized!" ); @@ -1061,8 +1061,8 @@ const rtl::OUString & DAVResourceAccess::getRequestURI() const // static void DAVResourceAccess::getUserRequestHeaders( const uno::Reference< ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rURI, - const rtl::OUString & rMethod, + const OUString & rURI, + const OUString & rMethod, DAVRequestHeaders & rRequestHeaders ) { if ( xEnv.is() ) @@ -1077,7 +1077,7 @@ void DAVResourceAccess::getUserRequestHeaders( for ( sal_Int32 n = 0; n < aRequestHeaders.getLength(); ++n ) { - rtl::OUString aValue; + OUString aValue; sal_Bool isString = aRequestHeaders[ n ].Value >>= aValue; if ( !isString ) @@ -1096,7 +1096,7 @@ void DAVResourceAccess::getUserRequestHeaders( //========================================================================= sal_Bool DAVResourceAccess::detectRedirectCycle( - const rtl::OUString& rRedirectURL ) + const OUString& rRedirectURL ) throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx index 792a85a354e0..a6d562321e75 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -45,8 +45,8 @@ class DAVSessionFactory; class DAVResourceAccess { osl::Mutex m_aMutex; - rtl::OUString m_aURL; - rtl::OUString m_aPath; + OUString m_aURL; + OUString m_aPath; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; com::sun::star::uno::Reference< @@ -59,17 +59,17 @@ public: com::sun::star::lang::XMultiServiceFactory > & rSMgr, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ); + const OUString & rURL ); DAVResourceAccess( const DAVResourceAccess & rOther ); DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); - void setURL( const rtl::OUString & rNewURL ) + void setURL( const OUString & rNewURL ) throw ( DAVException ); void resetUri(); - const rtl::OUString & getURL() const { return m_aURL; } + const OUString & getURL() const { return m_aURL; } rtl::Reference< DAVSessionFactory > getSessionFactory() const { return m_xSessionFactory; } @@ -80,7 +80,7 @@ public: // allprop & named void PROPFIND( const Depth nDepth, - const std::vector< rtl::OUString > & rPropertyNames, + const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -101,7 +101,7 @@ public: throw ( DAVException ); void - HEAD( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -120,7 +120,7 @@ public: throw ( DAVException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + GET( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -129,7 +129,7 @@ public: void GET( com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & rStream, - const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -143,8 +143,8 @@ public: throw ( DAVException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & rInputStream, const com::sun::star::uno::Reference< @@ -152,8 +152,8 @@ public: throw ( DAVException ); void - POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & rInputStream, com::sun::star::uno::Reference< @@ -168,16 +168,16 @@ public: throw ( DAVException ); void - COPY( const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + COPY( const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - MOVE( const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + MOVE( const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -218,13 +218,13 @@ public: getUserRequestHeaders( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rURI, - const rtl::OUString & rMethod, + const OUString & rURI, + const OUString & rMethod, DAVRequestHeaders & rRequestHeaders ); private: - const rtl::OUString & getRequestURI() const; - sal_Bool detectRedirectCycle( const rtl::OUString& rRedirectURL ) + const OUString & getRequestURI() const; + sal_Bool detectRedirectCycle( const OUString& rRedirectURL ) throw ( DAVException ); sal_Bool handleException( DAVException & e, int errorCount ) throw ( DAVException ); diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index ebb7fd2162e2..e02ff46a1e77 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -59,7 +59,7 @@ public: } } - virtual sal_Bool CanUse( const ::rtl::OUString & inPath ) = 0; + virtual sal_Bool CanUse( const OUString & inPath ) = 0; virtual sal_Bool UsesProxy() = 0; @@ -68,82 +68,82 @@ public: // NOT USED /* - virtual void OPTIONS( const ::rtl::OUString & inPath, + virtual void OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; */ // allprop & named - virtual void PROPFIND( const ::rtl::OUString & inPath, + virtual void PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropertyNames, + const std::vector< OUString > & inPropertyNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // propnames - virtual void PROPFIND( const ::rtl::OUString & inPath, + virtual void PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void PROPPATCH( const ::rtl::OUString & inPath, + virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + virtual void HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void GET( const ::rtl::OUString & inPath, + virtual void GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void PUT( const ::rtl::OUString & inPath, + virtual void PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& s, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + virtual void POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, com::sun::star::uno::Reference< @@ -151,39 +151,39 @@ public: const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void MKCOL( const ::rtl::OUString & inPath, + virtual void MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void COPY( const ::rtl::OUString & inSource, - const ::rtl::OUString & inDestination, + virtual void COPY( const OUString & inSource, + const OUString & inDestination, const DAVRequestEnvironment & rEnv, sal_Bool inOverwrite = false ) throw( DAVException ) = 0; - virtual void MOVE( const ::rtl::OUString & inSource, - const ::rtl::OUString & inDestination, + virtual void MOVE( const OUString & inSource, + const OUString & inDestination, const DAVRequestEnvironment & rEnv, sal_Bool inOverwrite = false ) throw( DAVException ) = 0; - virtual void DESTROY( const ::rtl::OUString & inPath, + virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // set new lock. - virtual void LOCK( const ::rtl::OUString & inPath, + virtual void LOCK( const OUString & inPath, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; // refresh existing lock. - virtual sal_Int64 LOCK( const ::rtl::OUString & inPath, + virtual sal_Int64 LOCK( const OUString & inPath, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void UNLOCK( const ::rtl::OUString & inPath, + virtual void UNLOCK( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx index 231a7fe6c10f..77bb317fdb01 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx @@ -30,7 +30,7 @@ DAVSessionFactory::~DAVSessionFactory() } rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( - const ::rtl::OUString & inUri, + const OUString & inUri, const uno::Reference< lang::XMultiServiceFactory > & rxSMgr ) throw( DAVException ) { diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx index 403a70fff10e..27f58ef72731 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx @@ -50,7 +50,7 @@ public: ~DAVSessionFactory() SAL_THROW(()); rtl::Reference< DAVSession > - createDAVSession( const ::rtl::OUString & inUri, + createDAVSession( const OUString & inUri, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr ) @@ -58,7 +58,7 @@ public: ::uno::Reference< ::lang::XMultiServiceFactory > getServiceFactory() { return m_xMSF; } private: - typedef std::map< rtl::OUString, DAVSession * > Map; + typedef std::map< OUString, DAVSession * > Map; Map m_aMap; osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx index a32aee65e697..85255d4dbd67 100644 --- a/ucb/source/ucp/webdav/DAVTypes.hxx +++ b/ucb/source/ucp/webdav/DAVTypes.hxx @@ -65,11 +65,11 @@ enum ProppatchOperation { PROPSET = 0, PROPREMOVE = 1 }; struct ProppatchValue { ProppatchOperation operation; - rtl::OUString name; + OUString name; com::sun::star::uno::Any value; ProppatchValue( const ProppatchOperation o, - const rtl::OUString & n, + const OUString & n, const com::sun::star::uno::Any & v ) : operation( o ), name( n ), value( v ) {} }; diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx index ba2be763eb74..25425a289231 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx @@ -38,16 +38,16 @@ namespace http_dav_ucp class DateTimeHelper { private: - static sal_Int32 convertMonthToInt (const ::rtl::OUString& ); + static sal_Int32 convertMonthToInt (const OUString& ); - static bool ISO8601_To_DateTime (const ::rtl::OUString&, + static bool ISO8601_To_DateTime (const OUString&, ::com::sun::star::util::DateTime& ); - static bool RFC2068_To_DateTime (const ::rtl::OUString&, + static bool RFC2068_To_DateTime (const OUString&, ::com::sun::star::util::DateTime& ); public: - static bool convert (const ::rtl::OUString&, + static bool convert (const OUString&, ::com::sun::star::util::DateTime& ); }; diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx index b5791a3c1fb4..3632853c542f 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx @@ -38,7 +38,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , xInputStream( xioInStrm ) @@ -62,7 +62,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , xInputStream() @@ -139,7 +139,7 @@ void SerfGetReqProcImpl::handleEndOfResponseData( serf_bucket_t * inSerfResponse void SerfGetReqProcImpl::processSingleResponseHeader( const char* inHeaderName, const char* inHeaderValue ) { - rtl::OUString aHeaderName( rtl::OUString::createFromAscii( inHeaderName ) ); + OUString aHeaderName( OUString::createFromAscii( inHeaderName ) ); bool bStoreHeaderField = false; @@ -151,8 +151,8 @@ void SerfGetReqProcImpl::processSingleResponseHeader( const char* inHeaderName, else { // store only header fields which are requested - std::vector< ::rtl::OUString >::const_iterator it( mpHeaderNames->begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( mpHeaderNames->end() ); + std::vector< OUString >::const_iterator it( mpHeaderNames->begin() ); + const std::vector< OUString >::const_iterator end( mpHeaderNames->end() ); while ( it != end ) { @@ -174,7 +174,7 @@ void SerfGetReqProcImpl::processSingleResponseHeader( const char* inHeaderName, DAVPropertyValue thePropertyValue; thePropertyValue.IsCaseSensitive = false; thePropertyValue.Name = aHeaderName; - thePropertyValue.Value <<= rtl::OUString::createFromAscii( inHeaderValue ); + thePropertyValue.Value <<= OUString::createFromAscii( inHeaderValue ); mpResource->properties.push_back( thePropertyValue ); } } diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx index 6497ecba2715..dd02be1639c4 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx @@ -42,7 +42,7 @@ public: SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); SerfGetReqProcImpl( const char* inPath, @@ -52,7 +52,7 @@ public: SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); virtual ~SerfGetReqProcImpl(); @@ -73,7 +73,7 @@ protected: private: com::sun::star::uno::Reference< SerfInputStream > xInputStream; com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutputStream; - const std::vector< ::rtl::OUString > * mpHeaderNames; + const std::vector< OUString > * mpHeaderNames; DAVResource* mpResource; }; diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx index fe4171164241..e48a1a0b04e2 100644 --- a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx @@ -26,7 +26,7 @@ namespace http_dav_ucp SerfHeadReqProcImpl::SerfHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mpHeaderNames( &inHeaderNames ) @@ -93,7 +93,7 @@ void SerfHeadReqProcImpl::handleEndOfResponseData( serf_bucket_t * inSerfRespons void SerfHeadReqProcImpl::processSingleResponseHeader( const char* inHeaderName, const char* inHeaderValue ) { - rtl::OUString aHeaderName( rtl::OUString::createFromAscii( inHeaderName ) ); + OUString aHeaderName( OUString::createFromAscii( inHeaderName ) ); bool bStoreHeaderField = false; @@ -105,8 +105,8 @@ void SerfHeadReqProcImpl::processSingleResponseHeader( const char* inHeaderName, else { // store only header fields which are requested - std::vector< ::rtl::OUString >::const_iterator it( mpHeaderNames->begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( mpHeaderNames->end() ); + std::vector< OUString >::const_iterator it( mpHeaderNames->begin() ); + const std::vector< OUString >::const_iterator end( mpHeaderNames->end() ); while ( it != end ) { @@ -128,7 +128,7 @@ void SerfHeadReqProcImpl::processSingleResponseHeader( const char* inHeaderName, DAVPropertyValue thePropertyValue; thePropertyValue.IsCaseSensitive = false; thePropertyValue.Name = aHeaderName; - thePropertyValue.Value <<= rtl::OUString::createFromAscii( inHeaderValue ); + thePropertyValue.Value <<= OUString::createFromAscii( inHeaderValue ); mpResource->properties.push_back( thePropertyValue ); } } diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx index 46039f130b49..404175617631 100644 --- a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx @@ -37,7 +37,7 @@ class SerfHeadReqProcImpl : public SerfRequestProcessorImpl public: SerfHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); virtual ~SerfHeadReqProcImpl(); @@ -56,7 +56,7 @@ protected: void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); private: - const std::vector< ::rtl::OUString > * mpHeaderNames; + const std::vector< OUString > * mpHeaderNames; DAVResource* mpResource; }; diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx index ec53fc57f6b2..27ed897bb8f8 100644 --- a/ucb/source/ucp/webdav/SerfLockStore.cxx +++ b/ucb/source/ucp/webdav/SerfLockStore.cxx @@ -142,12 +142,12 @@ void SerfLockStore::registerSession( HttpSession * pHttpSession ) } // ------------------------------------------------------------------- -SerfLock * SerfLockStore::findByUri( rtl::OUString const & rUri ) +SerfLock * SerfLockStore::findByUri( OUString const & rUri ) { osl::MutexGuard aGuard( m_aMutex ); ne_uri aUri; - ne_uri_parse( rtl::OUStringToOString( + ne_uri_parse( OUStringToOString( rUri, RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); return ne_lockstore_findbyuri( m_pSerfLockStore, &aUri ); } diff --git a/ucb/source/ucp/webdav/SerfLockStore.hxx b/ucb/source/ucp/webdav/SerfLockStore.hxx index cc11af5e4011..ac3e951a79f6 100644 --- a/ucb/source/ucp/webdav/SerfLockStore.hxx +++ b/ucb/source/ucp/webdav/SerfLockStore.hxx @@ -70,7 +70,7 @@ public: void registerSession( HttpSession * pHttpSession ); - SerfLock * findByUri( rtl::OUString const & rUri ); + SerfLock * findByUri( OUString const & rUri ); void addLock( SerfLock * pLock, rtl::Reference< SerfSession > const & xSession, diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx index 725f91d01ec5..50accc4252f0 100644 --- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx @@ -99,7 +99,7 @@ serf_bucket_t * SerfPostReqProcImpl::createSerfRequestBucket( serf_request_t * i serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked"); } serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( (sal_Int32)mnPostDataLen ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( (sal_Int32)mnPostDataLen ), RTL_TEXTENCODING_UTF8 ) ); } if ( mpContentType != 0 ) { diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx index 4dca188f32c1..5fb7680fc55b 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx @@ -32,7 +32,7 @@ namespace http_dav_ucp SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mDepthStr( 0 ) @@ -89,7 +89,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t // body bucket - certain properties OR all properties OR only property names serf_bucket_t* body_bkt = 0; - rtl::OUString aBodyText; + OUString aBodyText; { // create and fill body bucket with requested properties const int nPropCount = ( !mbOnlyPropertyNames && mpPropNames ) @@ -105,33 +105,33 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t thePropName ); /* <*propname* xmlns="*propns*" /> */ - aBodyText += rtl::OUString::createFromAscii( "<" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.name ); - aBodyText += rtl::OUString::createFromAscii( " xmlnx=\"" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.nspace ); - aBodyText += rtl::OUString::createFromAscii( "\"/>" ); + aBodyText += OUString::createFromAscii( "<" ); + aBodyText += OUString::createFromAscii( thePropName.name ); + aBodyText += OUString::createFromAscii( " xmlnx=\"" ); + aBodyText += OUString::createFromAscii( thePropName.nspace ); + aBodyText += OUString::createFromAscii( "\"/>" ); } - aBodyText = rtl::OUString::createFromAscii( "" ) + + aBodyText = OUString::createFromAscii( "" ) + aBodyText + - rtl::OUString::createFromAscii( "" ); + OUString::createFromAscii( "" ); } else { if ( mbOnlyPropertyNames ) { - aBodyText = rtl::OUString::createFromAscii( "" ); + aBodyText = OUString::createFromAscii( "" ); } else { - aBodyText = rtl::OUString::createFromAscii( "" ); + aBodyText = OUString::createFromAscii( "" ); } } - aBodyText = rtl::OUString::createFromAscii( PROPFIND_HEADER ) + + aBodyText = OUString::createFromAscii( PROPFIND_HEADER ) + aBodyText + - rtl::OUString::createFromAscii( PROPFIND_TRAILER ); - body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), + OUString::createFromAscii( PROPFIND_TRAILER ); + body_bkt = SERF_BUCKET_SIMPLE_STRING( OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), pSerfBucketAlloc ); if ( useChunkedEncoding() ) { @@ -161,7 +161,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t } serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" ); serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); } return req_bkt; diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx index 92ea5a7fed91..35503ba0f812 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx @@ -38,7 +38,7 @@ public: SerfPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ); SerfPropFindReqProcImpl( const char* inPath, @@ -62,7 +62,7 @@ private: void init( const Depth inDepth ); const char* mDepthStr; - const std::vector< ::rtl::OUString > * mpPropNames; + const std::vector< OUString > * mpPropNames; std::vector< DAVResource > * mpResources; std::vector< DAVResourceInfo > * mpResInfo; diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx index 39f1c8d637d7..9b2583a53f6f 100644 --- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx @@ -48,7 +48,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ // body bucket serf_bucket_t* body_bkt = 0; - rtl::OUString aBodyText; + OUString aBodyText; { // create and fill body bucket with properties to be set or removed static const char* OpCodes[2] = { "set", "remove" }; @@ -59,9 +59,9 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ { // <*operation code*> ProppatchOperation lastOp = (*mpProperties)[ 0 ].operation; - aBodyText += rtl::OUString::createFromAscii( "<" ); - aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] ); - aBodyText += rtl::OUString::createFromAscii( ">" ); + aBodyText += OUString::createFromAscii( "<" ); + aBodyText += OUString::createFromAscii( OpCodes[lastOp] ); + aBodyText += OUString::createFromAscii( ">" ); SerfPropName thePropName; for ( int n = 0; n < nPropCount; ++n ) @@ -74,26 +74,26 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ if ( rProperty.operation != lastOp ) { // <*operation code> - aBodyText += rtl::OUString::createFromAscii( "<" ); - aBodyText += rtl::OUString::createFromAscii( OpCodes[rProperty.operation] ); - aBodyText += rtl::OUString::createFromAscii( ">" ); + aBodyText += OUString::createFromAscii( "<" ); + aBodyText += OUString::createFromAscii( OpCodes[rProperty.operation] ); + aBodyText += OUString::createFromAscii( ">" ); } // <*propname* xmlns="*propns*" - aBodyText += rtl::OUString::createFromAscii( "<" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.name ); - aBodyText += rtl::OUString::createFromAscii( " xmlns=\"" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.nspace ); - aBodyText += rtl::OUString::createFromAscii( "\"" ); + aBodyText += OUString::createFromAscii( "<" ); + aBodyText += OUString::createFromAscii( thePropName.name ); + aBodyText += OUString::createFromAscii( " xmlns=\"" ); + aBodyText += OUString::createFromAscii( thePropName.nspace ); + aBodyText += OUString::createFromAscii( "\"" ); if ( rProperty.operation == PROPSET ) { // >*property value* - aBodyText += rtl::OUString::createFromAscii( ">" ); + aBodyText += OUString::createFromAscii( ">" ); - rtl::OUString aStringValue; + OUString aStringValue; if ( DAVProperties::isUCBDeadProperty( thePropName ) ) { UCBDeadPropertyValue::toXML( rProperty.value, @@ -104,31 +104,31 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ rProperty.value >>= aStringValue; } aBodyText += aStringValue; - aBodyText += rtl::OUString::createFromAscii( "" ); + aBodyText += OUString::createFromAscii( "" ); } else { // /> - aBodyText += rtl::OUString::createFromAscii( "/>" ); + aBodyText += OUString::createFromAscii( "/>" ); } lastOp = rProperty.operation; } // - aBodyText += rtl::OUString::createFromAscii( "" ); + aBodyText += OUString::createFromAscii( "" ); // add PropPatch xml header in front - aBodyText = rtl::OUString::createFromAscii( PROPPATCH_HEADER ) + aBodyText; + aBodyText = OUString::createFromAscii( PROPPATCH_HEADER ) + aBodyText; // add PropPatch xml trailer at end - aBodyText += rtl::OUString::createFromAscii( PROPPATCH_TRAILER ); + aBodyText += OUString::createFromAscii( PROPPATCH_TRAILER ); - body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), + body_bkt = SERF_BUCKET_SIMPLE_STRING( OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), pSerfBucketAlloc ); if ( useChunkedEncoding() ) { @@ -158,7 +158,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ } serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" ); serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); } return req_bkt; diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx index 56519e99de66..2b83dcf21147 100644 --- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx @@ -75,7 +75,7 @@ serf_bucket_t * SerfPutReqProcImpl::createSerfRequestBucket( serf_request_t * in serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked"); } serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( (sal_Int32)mnDataLen ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( (sal_Int32)mnDataLen ), RTL_TEXTENCODING_UTF8 ) ); } diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx index f73766f6df0b..db4c5ac4ec3c 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx @@ -29,7 +29,7 @@ namespace http_dav_ucp { SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession, - const rtl::OUString & inPath, + const OUString & inPath, const bool bUseChunkedEncoding ) : mrSerfSession( rSerfSession ) , mPathStr( 0 ) @@ -50,7 +50,7 @@ SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession, , mbHandleSerfResponseCalled( false ) { mPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ) ); } SerfRequestProcessor::~SerfRequestProcessor() @@ -64,8 +64,8 @@ void SerfRequestProcessor::prepareProcessor() delete mpDAVException; mpDAVException = 0; mnHTTPStatusCode = SC_NONE; - mHTTPStatusCodeText = rtl::OUString(); - mRedirectLocation = rtl::OUString(); + mHTTPStatusCodeText = OUString(); + mRedirectLocation = OUString(); mnSuccessfulCredentialAttempts = 0; mbInputOfCredentialsAborted = false; @@ -76,7 +76,7 @@ void SerfRequestProcessor::prepareProcessor() // PROPFIND - allprop & named bool SerfRequestProcessor::processPropFind( const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, apr_status_t& outSerfStatus ) { @@ -130,7 +130,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser // GET inclusive header fields bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) { @@ -158,7 +158,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com // GET inclusive header fields bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) { @@ -173,7 +173,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com } // HEAD -bool SerfRequestProcessor::processHead( const std::vector< ::rtl::OUString > & inHeaderNames, +bool SerfRequestProcessor::processHead( const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) { @@ -203,15 +203,15 @@ bool SerfRequestProcessor::processPut( const char* inData, // POST bool SerfRequestProcessor::processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); mReferer = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createPostReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, inData, @@ -227,15 +227,15 @@ bool SerfRequestProcessor::processPost( const char* inData, // POST bool SerfRequestProcessor::processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); mReferer = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createPostReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, inData, @@ -269,12 +269,12 @@ bool SerfRequestProcessor::processMkCol( apr_status_t& outSerfStatus ) } // COPY -bool SerfRequestProcessor::processCopy( const rtl::OUString & inDestinationPath, +bool SerfRequestProcessor::processCopy( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ) { mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createCopyReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mDestPathStr, @@ -285,12 +285,12 @@ bool SerfRequestProcessor::processCopy( const rtl::OUString & inDestinationPath, } // MOVE -bool SerfRequestProcessor::processMove( const rtl::OUString & inDestinationPath, +bool SerfRequestProcessor::processMove( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ) { mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createMoveReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mDestPathStr, @@ -501,7 +501,7 @@ apr_status_t SerfRequestProcessor::handleSerfResponse( serf_request_t * inSerfRe : SC_NONE; if ( sl.reason ) { - mHTTPStatusCodeText = ::rtl::OUString::createFromAscii( sl.reason ); + mHTTPStatusCodeText = OUString::createFromAscii( sl.reason ); } if ( ( sl.version == 0 || sl.code < 0 ) || mnHTTPStatusCode >= 300 ) @@ -516,7 +516,7 @@ apr_status_t SerfRequestProcessor::handleSerfResponse( serf_request_t * inSerfRe const char* location = serf_bucket_headers_get( headers, "Location" ); if ( location ) { - mRedirectLocation = rtl::OUString::createFromAscii( location ); + mRedirectLocation = OUString::createFromAscii( location ); } mbProcessingDone = true; return APR_EGENERAL; diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx index 8b7fcaded928..734cd07bb601 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx @@ -43,13 +43,13 @@ class SerfRequestProcessor { public: SerfRequestProcessor( SerfSession& rSerfSession, - const rtl::OUString & inPath, + const OUString & inPath, const bool bUseChunkedEncoding ); ~SerfRequestProcessor(); // PROPFIND - allprop & named bool processPropFind( const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, apr_status_t& outSerfStatus ); @@ -68,7 +68,7 @@ public: // GET inclusive header fields bool processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); @@ -78,12 +78,12 @@ public: // GET inclusive header fields bool processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); // HEAD - bool processHead( const std::vector< ::rtl::OUString > & inHeaderNames, + bool processHead( const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); @@ -95,16 +95,16 @@ public: // POST bool processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ); // POST bool processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ); @@ -115,12 +115,12 @@ public: bool processMkCol( apr_status_t& outSerfStatus ); // COPY - bool processCopy( const rtl::OUString & inDestinationPath, + bool processCopy( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ); // MOVE - bool processMove( const rtl::OUString & inDestinationPath, + bool processMove( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ); @@ -165,8 +165,8 @@ public: DAVException* mpDAVException; sal_uInt16 mnHTTPStatusCode; - rtl::OUString mHTTPStatusCodeText; - rtl::OUString mRedirectLocation; + OUString mHTTPStatusCodeText; + OUString mRedirectLocation; sal_uInt8 mnSuccessfulCredentialAttempts; bool mbInputOfCredentialsAborted; diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx index d27064c60ab7..7637684f3425 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx @@ -56,9 +56,9 @@ void SerfRequestProcessorImpl::setRequestHeaders( serf_bucket_t* inoutSerfHeader while ( aHeaderIter != aEnd ) { - const rtl::OString aHeader = rtl::OUStringToOString( (*aHeaderIter).first, + const OString aHeader = OUStringToOString( (*aHeaderIter).first, RTL_TEXTENCODING_UTF8 ); - const rtl::OString aValue = rtl::OUStringToOString( (*aHeaderIter).second, + const OString aValue = OUStringToOString( (*aHeaderIter).second, RTL_TEXTENCODING_UTF8 ); serf_bucket_headers_set( inoutSerfHeaderBucket, diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx index 33e79223845e..3abf5a7ec37b 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx @@ -34,7 +34,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfPropFindReqProcImpl( inPath, @@ -80,7 +80,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfGetReqProcImpl( inPath, @@ -104,7 +104,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfGetReqProcImpl( inPath, @@ -117,7 +117,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfHeadReqProcImpl( inPath, diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx index ee6d5b540953..083287ed7c13 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx @@ -34,7 +34,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ); SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, @@ -53,7 +53,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ); SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, @@ -63,12 +63,12 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ); SerfRequestProcessorImpl* createHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ); SerfRequestProcessorImpl* createPutReqProcImpl( const char* inPath, diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 40641676df02..33c54281fb10 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -59,7 +59,7 @@ using namespace http_dav_ucp; // ------------------------------------------------------------------- SerfSession::SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ) : DAVSession( rSessionFactory ) @@ -159,7 +159,7 @@ void SerfSession::Init() { apr_sockaddr_t *proxy_address = NULL; const apr_status_t status = apr_sockaddr_info_get( &proxy_address, - rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), + OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), APR_UNSPEC, static_cast(m_nProxyPort), 0, getAprPool() ); @@ -207,7 +207,7 @@ bool SerfSession::isHeadRequestInProgress() bool SerfSession::isSSLNeeded() { - return m_aUri.GetScheme().equalsIgnoreAsciiCase( rtl::OUString( "https" ) ); + return m_aUri.GetScheme().equalsIgnoreAsciiCase( OUString( "https" ) ); } char* SerfSession::getHostinfo() @@ -218,7 +218,7 @@ char* SerfSession::getHostinfo() // ------------------------------------------------------------------- // virtual -sal_Bool SerfSession::CanUse( const rtl::OUString & inUri ) +sal_Bool SerfSession::CanUse( const OUString & inUri ) { try { @@ -296,12 +296,12 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA return SERF_ERROR_AUTHN_FAILED; } - rtl::OUString theUserName; - rtl::OUString thePassWord; + OUString theUserName; + OUString thePassWord; try { SerfUri uri( getRequestEnvironment().m_aRequestURI ); - rtl::OUString aUserInfo( uri.GetUserInfo() ); + OUString aUserInfo( uri.GetUserInfo() ); if ( aUserInfo.getLength() ) { sal_Int32 nPos = aUserInfo.indexOf( '@' ); @@ -325,7 +325,7 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA const bool bCanUseSystemCreds = ( ( strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) || ( strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) ); - int theRetVal = pListener->authenticate( rtl::OUString::createFromAscii( inRealm ), + int theRetVal = pListener->authenticate( OUString::createFromAscii( inRealm ), getHostName(), theUserName, thePassWord, @@ -334,8 +334,8 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA if ( theRetVal == 0 ) { - *outUsername = apr_pstrdup( inAprPool, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); - *outPassword = apr_pstrdup( inAprPool, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); + *outUsername = apr_pstrdup( inAprPool, OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); + *outPassword = apr_pstrdup( inAprPool, OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); } return theRetVal != 0 ? SERF_ERROR_AUTHN_FAILED : APR_SUCCESS; @@ -344,10 +344,10 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA namespace { // ------------------------------------------------------------------- // Helper function - ::rtl::OUString GetHostnamePart( const ::rtl::OUString& _rRawString ) + OUString GetHostnamePart( const OUString& _rRawString ) { - ::rtl::OUString sPart; - ::rtl::OUString sPartId = ::rtl::OUString::createFromAscii( "CN=" ); + OUString sPart; + OUString sPartId = OUString::createFromAscii( "CN=" ); sal_Int32 nContStart = _rRawString.indexOf( sPartId ); if ( nContStart != -1 ) { @@ -387,10 +387,10 @@ apr_status_t SerfSession::verifySerfCertificateChain ( xSEInitializer = uno::Reference< xml::crypto::XSEInitializer >( getMSF()->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.xml.crypto.SEInitializer" ) ), + OUString::createFromAscii( "com.sun.star.xml.crypto.SEInitializer" ) ), uno::UNO_QUERY_THROW); - xSecurityContext = xSEInitializer->createSecurityContext( rtl::OUString() ); + xSecurityContext = xSEInitializer->createSecurityContext( OUString() ); if (xSecurityContext.is()) xSecurityEnv = xSecurityContext->getSecurityEnvironment(); @@ -408,16 +408,16 @@ apr_status_t SerfSession::verifySerfCertificateChain ( // Decode the server certificate. uno::Reference< security::XCertificate > xServerCertificate( xSecurityEnv->createCertificateFromAscii( - rtl::OUString::createFromAscii(pCertificateChainBase64Encoded[0]))); + OUString::createFromAscii(pCertificateChainBase64Encoded[0]))); if ( ! xServerCertificate.is()) return SERF_SSL_CERT_UNKNOWN_FAILURE; // Get the subject from the server certificate. - ::rtl::OUString sServerCertificateSubject (xServerCertificate->getSubjectName()); + OUString sServerCertificateSubject (xServerCertificate->getSubjectName()); sal_Int32 nIndex = 0; while (nIndex >= 0) { - const ::rtl::OUString sToken (sServerCertificateSubject.getToken(0, ',', nIndex)); + const OUString sToken (sServerCertificateSubject.getToken(0, ',', nIndex)); if (sToken.startsWith("CN=")) { sServerCertificateSubject = sToken.copy(3); @@ -451,7 +451,7 @@ apr_status_t SerfSession::verifySerfCertificateChain ( { uno::Reference< security::XCertificate > xCertificate( xSecurityEnv->createCertificateFromAscii( - rtl::OUString::createFromAscii(pCertificateChainBase64Encoded[nIndex]))); + OUString::createFromAscii(pCertificateChainBase64Encoded[nIndex]))); if ( ! xCertificate.is()) return SERF_SSL_CERT_UNKNOWN_FAILURE; aChain.push_back(xCertificate); @@ -559,7 +559,7 @@ serf_bucket_t* SerfSession::acceptSerfResponse( serf_request_t * inSerfRequest, return responseBkt; } -SerfRequestProcessor* SerfSession::createReqProc( const rtl::OUString & inPath ) +SerfRequestProcessor* SerfSession::createReqProc( const OUString & inPath ) { return new SerfRequestProcessor( *this, inPath, @@ -569,9 +569,9 @@ SerfRequestProcessor* SerfSession::createReqProc( const rtl::OUString & inPath ) // ------------------------------------------------------------------- // PROPFIND - allprop & named // ------------------------------------------------------------------- -void SerfSession::PROPFIND( const rtl::OUString & inPath, +void SerfSession::PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -600,7 +600,7 @@ void SerfSession::PROPFIND( const rtl::OUString & inPath, // ------------------------------------------------------------------- // PROPFIND - propnames // ------------------------------------------------------------------- -void SerfSession::PROPFIND( const rtl::OUString & inPath, +void SerfSession::PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) @@ -629,7 +629,7 @@ void SerfSession::PROPFIND( const rtl::OUString & inPath, // ------------------------------------------------------------------- // PROPPATCH // ------------------------------------------------------------------- -void SerfSession::PROPPATCH( const rtl::OUString & inPath, +void SerfSession::PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -649,8 +649,8 @@ void SerfSession::PROPPATCH( const rtl::OUString & inPath, // ------------------------------------------------------------------- // HEAD // ------------------------------------------------------------------- -void SerfSession::HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +void SerfSession::HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -678,7 +678,7 @@ void SerfSession::HEAD( const ::rtl::OUString & inPath, // GET // ------------------------------------------------------------------- uno::Reference< io::XInputStream > -SerfSession::GET( const rtl::OUString & inPath, +SerfSession::GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -700,7 +700,7 @@ SerfSession::GET( const rtl::OUString & inPath, // ------------------------------------------------------------------- // GET // ------------------------------------------------------------------- -void SerfSession::GET( const rtl::OUString & inPath, +void SerfSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -721,8 +721,8 @@ void SerfSession::GET( const rtl::OUString & inPath, // GET // ------------------------------------------------------------------- uno::Reference< io::XInputStream > -SerfSession::GET( const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +SerfSession::GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -750,9 +750,9 @@ SerfSession::GET( const rtl::OUString & inPath, // ------------------------------------------------------------------- // GET // ------------------------------------------------------------------- -void SerfSession::GET( const rtl::OUString & inPath, +void SerfSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -776,7 +776,7 @@ void SerfSession::GET( const rtl::OUString & inPath, // ------------------------------------------------------------------- // PUT // ------------------------------------------------------------------- -void SerfSession::PUT( const rtl::OUString & inPath, +void SerfSession::PUT( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -801,9 +801,9 @@ void SerfSession::PUT( const rtl::OUString & inPath, // POST // ------------------------------------------------------------------- uno::Reference< io::XInputStream > -SerfSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +SerfSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -835,9 +835,9 @@ SerfSession::POST( const rtl::OUString & inPath, // ------------------------------------------------------------------- // POST // ------------------------------------------------------------------- -void SerfSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +void SerfSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, uno::Reference< io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) @@ -868,7 +868,7 @@ void SerfSession::POST( const rtl::OUString & inPath, // ------------------------------------------------------------------- // MKCOL // ------------------------------------------------------------------- -void SerfSession::MKCOL( const rtl::OUString & inPath, +void SerfSession::MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -886,8 +886,8 @@ void SerfSession::MKCOL( const rtl::OUString & inPath, // ------------------------------------------------------------------- // COPY // ------------------------------------------------------------------- -void SerfSession::COPY( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void SerfSession::COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -909,8 +909,8 @@ void SerfSession::COPY( const rtl::OUString & inSourceURL, // ------------------------------------------------------------------- // MOVE // ------------------------------------------------------------------- -void SerfSession::MOVE( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void SerfSession::MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -932,7 +932,7 @@ void SerfSession::MOVE( const rtl::OUString & inSourceURL, // ------------------------------------------------------------------- // DESTROY // ------------------------------------------------------------------- -void SerfSession::DESTROY( const rtl::OUString & inPath, +void SerfSession::DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -981,7 +981,7 @@ namespace // ------------------------------------------------------------------- // LOCK (set new lock) // ------------------------------------------------------------------- -void SerfSession::LOCK( const ::rtl::OUString & inPath, +void SerfSession::LOCK( const OUString & inPath, ucb::Lock & /*rLock*/, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1000,7 +1000,7 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, // Set the lock uri ne_uri aUri; - ne_uri_parse( rtl::OUStringToOString( makeAbsoluteURL( inPath ), + ne_uri_parse( OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); theLock->uri = aUri; @@ -1038,10 +1038,10 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, theLock->timeout = (long)rLock.Timeout; // Set the lock owner - rtl::OUString aValue; + OUString aValue; rLock.Owner >>= aValue; theLock->owner = - ne_strdup( rtl::OUStringToOString( aValue, + ne_strdup( OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); TimeValue startCall; osl_getSystemTime( &startCall ); @@ -1055,12 +1055,12 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, lastChanceToSendRefreshRequest( startCall, theLock->timeout ) ); - uno::Sequence< rtl::OUString > aTokens( 1 ); - aTokens[ 0 ] = rtl::OUString::createFromAscii( theLock->token ); + uno::Sequence< OUString > aTokens( 1 ); + aTokens[ 0 ] = OUString::createFromAscii( theLock->token ); rLock.LockTokens = aTokens; OSL_TRACE( "SerfSession::LOCK: created lock for %s. token: %s", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); } @@ -1069,7 +1069,7 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, ne_lock_destroy( theLock ); OSL_TRACE( "SerfSession::LOCK: obtaining lock for %s failed!", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1080,7 +1080,7 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, // ------------------------------------------------------------------- // LOCK (refresh existing lock) // ------------------------------------------------------------------- -sal_Int64 SerfSession::LOCK( const ::rtl::OUString & /*inPath*/, +sal_Int64 SerfSession::LOCK( const OUString & /*inPath*/, sal_Int64 nTimeout, const DAVRequestEnvironment & /*rEnv*/ ) throw ( DAVException ) @@ -1152,7 +1152,7 @@ bool SerfSession::LOCK( SerfLock * /*pLock*/, // ------------------------------------------------------------------- // UNLOCK // ------------------------------------------------------------------- -void SerfSession::UNLOCK( const ::rtl::OUString & /*inPath*/, +void SerfSession::UNLOCK( const OUString & /*inPath*/, const DAVRequestEnvironment & /*rEnv*/ ) throw ( DAVException ) { @@ -1177,7 +1177,7 @@ void SerfSession::UNLOCK( const ::rtl::OUString & /*inPath*/, else { OSL_TRACE( "SerfSession::UNLOCK: unlocking of %s failed.", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1232,7 +1232,7 @@ const ucbhelper::InternetProxyServer & SerfSession::getProxySettings() const { // TODO: figure out, if this case can occur return m_rProxyDecider.getProxy( m_aUri.GetScheme(), - rtl::OUString() /* not used */, + OUString() /* not used */, -1 /* not used */ ); } } @@ -1246,7 +1246,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, { for ( sal_Int32 n = 0; n < rLocks.getLength(); ++n ) { - const uno::Sequence< rtl::OUString > & rTokens + const uno::Sequence< OUString > & rTokens = rLocks[ n ].LockTokens; for ( sal_Int32 m = 0; m < rTokens.getLength(); ++m ) { @@ -1261,7 +1261,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, */ // ------------------------------------------------------------------- -bool SerfSession::removeExpiredLocktoken( const rtl::OUString & /*inURL*/, +bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/, const DAVRequestEnvironment & /*rEnv*/ ) { return true; @@ -1276,7 +1276,7 @@ bool SerfSession::removeExpiredLocktoken( const rtl::OUString & /*inURL*/, // @@@ Alternative: use ne_lock_discover() => less overhead std::vector< DAVResource > aResources; - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; aPropNames.push_back( DAVProperties::LOCKDISCOVERY ); PROPFIND( rEnv.m_aRequestURI, DAVZERO, aPropNames, aResources, rEnv ); @@ -1313,7 +1313,7 @@ bool SerfSession::removeExpiredLocktoken( const rtl::OUString & /*inURL*/, // in propfind result -> not locked OSL_TRACE( "SerfSession::removeExpiredLocktoken: Removing " " expired lock token for %s. token: %s", - rtl::OUStringToOString( inURL, + OUStringToOString( inURL, RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); @@ -1364,7 +1364,7 @@ void SerfSession::HandleError( boost::shared_ptr rReqProc case NE_ERROR: // Generic error { - rtl::OUString aText = rtl::OUString::createFromAscii( + OUString aText = OUString::createFromAscii( ne_get_error( m_pHttpSession ) ); sal_uInt16 code = makeStatusCode( aText ); @@ -1441,7 +1441,7 @@ void SerfSession::HandleError( boost::shared_ptr rReqProc { OSL_TRACE( "SerfSession::HandleError : Unknown Serf error code!" ); throw DAVException( DAVException::DAV_HTTP_ERROR, - rtl::OUString::createFromAscii( + OUString::createFromAscii( ne_get_error( m_pHttpSession ) ) ); } } @@ -1540,17 +1540,17 @@ SerfSession::getDataFromInputStream( // --------------------------------------------------------------------- sal_Bool -SerfSession::isDomainMatch( rtl::OUString certHostName ) +SerfSession::isDomainMatch( OUString certHostName ) { - rtl::OUString hostName = getHostName(); + OUString hostName = getHostName(); if (hostName.equalsIgnoreAsciiCase( certHostName ) ) return sal_True; - if ( 0 == certHostName.indexOf( rtl::OUString::createFromAscii( "*" ) ) && + if ( 0 == certHostName.indexOf( OUString::createFromAscii( "*" ) ) && hostName.getLength() >= certHostName.getLength() ) { - rtl::OUString cmpStr = certHostName.copy( 1 ); + OUString cmpStr = certHostName.copy( 1 ); if ( hostName.matchIgnoreAsciiCase( cmpStr, hostName.getLength() - cmpStr.getLength() ) ) @@ -1561,7 +1561,7 @@ SerfSession::isDomainMatch( rtl::OUString certHostName ) /* // --------------------------------------------------------------------- -rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const +OUString SerfSession::makeAbsoluteURL( OUString const & rURL ) const { try { @@ -1569,7 +1569,7 @@ rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const if ( rURL[ 0 ] != sal_Unicode( '/' ) ) { // absolute. - return rtl::OUString( rURL ); + return OUString( rURL ); } else { @@ -1578,7 +1578,7 @@ rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const ne_fill_server_uri( m_pHttpSession, &aUri ); aUri.path - = ne_strdup( rtl::OUStringToOString( + = ne_strdup( OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); SerfUri aSerfUri( &aUri ); ne_uri_free( &aUri ); @@ -1589,7 +1589,7 @@ rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const { } // error. - return rtl::OUString(); + return OUString(); } */ diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index 73a44021cddd..585a28a2064f 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -50,7 +50,7 @@ private: SerfUri m_aUri; - rtl::OUString m_aProxyName; + OUString m_aProxyName; sal_Int32 m_nProxyPort; SerfConnection* m_pSerfConnection; @@ -69,14 +69,14 @@ private: char* getHostinfo(); bool isSSLNeeded(); - SerfRequestProcessor* createReqProc( const rtl::OUString & inPath ); + SerfRequestProcessor* createReqProc( const OUString & inPath ); protected: virtual ~SerfSession(); public: SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ); @@ -111,7 +111,7 @@ public: SerfConnection* getSerfConnection(); // DAVSession methods - virtual sal_Bool CanUse( const ::rtl::OUString & inUri ); + virtual sal_Bool CanUse( const OUString & inUri ); virtual sal_Bool UsesProxy(); @@ -120,30 +120,30 @@ public: // allprop & named virtual void - PROPFIND( const ::rtl::OUString & inPath, + PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // propnames virtual void - PROPFIND( const ::rtl::OUString & inPath, + PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo >& ioResInfo, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - PROPPATCH( const ::rtl::OUString & inPath, + PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); @@ -151,53 +151,53 @@ public: bool isHeadRequestInProgress(); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - PUT( const ::rtl::OUString & inPath, + PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, com::sun::star::uno::Reference< @@ -206,41 +206,41 @@ public: throw ( DAVException ); virtual void - MKCOL( const ::rtl::OUString & inPath, + MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - COPY( const ::rtl::OUString & inSourceURL, - const ::rtl::OUString & inDestinationURL, + COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ); virtual void - MOVE( const ::rtl::OUString & inSourceURL, - const ::rtl::OUString & inDestinationURL, + MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ); - virtual void DESTROY( const ::rtl::OUString & inPath, + virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // set new lock. - virtual void LOCK( const ::rtl::OUString & inURL, + virtual void LOCK( const OUString & inURL, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // refresh existing lock. - virtual sal_Int64 LOCK( const ::rtl::OUString & inURL, + virtual sal_Int64 LOCK( const OUString & inURL, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); - virtual void UNLOCK( const ::rtl::OUString & inURL, + virtual void UNLOCK( const OUString & inURL, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); @@ -248,13 +248,13 @@ public: virtual void abort() throw ( DAVException ); - const rtl::OUString & getHostName() const { return m_aUri.GetHost(); } + const OUString & getHostName() const { return m_aUri.GetHost(); } int getPort() const { return m_aUri.GetPort(); } const ::uno::Reference< ::lang::XMultiServiceFactory > getMSF() { return m_xFactory->getServiceFactory(); } - sal_Bool isDomainMatch( rtl::OUString certHostName ); + sal_Bool isDomainMatch( OUString certHostName ); private: friend class SerfLockStore; @@ -270,7 +270,7 @@ private: const ucbhelper::InternetProxyServer & getProxySettings() const; - bool removeExpiredLocktoken( const rtl::OUString & inURL, + bool removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ); // refresh lock, called by SerfLockStore::refreshLocks @@ -302,8 +302,8 @@ private: const char * buffer, //ne_block_reader reader, void * userdata, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer ); + const OUString & rContentType, + const OUString & rReferer ); */ // Helper: XInputStream -> Sequence< sal_Int8 > @@ -314,7 +314,7 @@ private: bool bAppendTrailingZeroByte ); /* - rtl::OUString makeAbsoluteURL( rtl::OUString const & rURL ) const; + OUString makeAbsoluteURL( OUString const & rURL ) const; */ }; diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx index 550524f965ae..a82418c0f175 100644 --- a/ucb/source/ucp/webdav/SerfUri.cxx +++ b/ucb/source/ucp/webdav/SerfUri.cxx @@ -39,7 +39,7 @@ using namespace http_dav_ucp; namespace { -inline bool matchIgnoreAsciiCase(rtl::OString const & rStr1, +inline bool matchIgnoreAsciiCase(OString const & rStr1, sal_Char const * pStr2, sal_Int32 nStr2Len) SAL_THROW(()) { @@ -74,7 +74,7 @@ SerfUri::SerfUri( const apr_uri_t * inUri ) calculateURI(); } -SerfUri::SerfUri( const rtl::OUString & inUri ) +SerfUri::SerfUri( const OUString & inUri ) throw ( DAVException ) : mAprUri() , mURI() @@ -88,9 +88,9 @@ SerfUri::SerfUri( const rtl::OUString & inUri ) throw DAVException( DAVException::DAV_INVALID_ARG ); // #i77023# - rtl::OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); + OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); - rtl::OString theInputUri( + OString theInputUri( aEscapedUri.getStr(), aEscapedUri.getLength(), RTL_TEXTENCODING_UTF8 ); if ( apr_uri_parse( apr_environment::AprEnv::getAprEnv()->getAprPool(), @@ -114,22 +114,22 @@ SerfUri::SerfUri( const rtl::OUString & inUri ) void SerfUri::init( const apr_uri_t * pUri ) { - mScheme = rtl::OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 ); - mUserInfo = rtl::OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 ); - mHostName = rtl::OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 ); + mScheme = OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 ); + mUserInfo = OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 ); + mHostName = OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 ); mPort = pUri->port; - mPath = rtl::OStringToOUString( pUri->path, RTL_TEXTENCODING_UTF8 ); + mPath = OStringToOUString( pUri->path, RTL_TEXTENCODING_UTF8 ); if ( pUri->query ) { - mPath += rtl::OUString::createFromAscii( "?" ); - mPath += rtl::OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 ); + mPath += OUString::createFromAscii( "?" ); + mPath += OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 ); } if ( pUri->fragment ) { - mPath += rtl::OUString::createFromAscii( "#" ); - mPath += rtl::OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 ); + mPath += OUString::createFromAscii( "#" ); + mPath += OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 ); } } @@ -139,7 +139,7 @@ SerfUri::~SerfUri( ) void SerfUri::calculateURI () { - rtl::OUStringBuffer aBuf( mScheme ); + OUStringBuffer aBuf( mScheme ); aBuf.append( "://" ); if ( mUserInfo.getLength() > 0 ) { @@ -174,14 +174,14 @@ void SerfUri::calculateURI () if ( bAppendPort ) { aBuf.append( ":" ); - aBuf.append( rtl::OUString::valueOf( mPort ) ); + aBuf.append( OUString::valueOf( mPort ) ); } aBuf.append( mPath ); mURI = aBuf.makeStringAndClear(); } -::rtl::OUString SerfUri::GetPathBaseName () const +OUString SerfUri::GetPathBaseName () const { sal_Int32 nPos = mPath.lastIndexOf ('/'); sal_Int32 nTrail = 0; @@ -193,7 +193,7 @@ void SerfUri::calculateURI () } if (nPos != -1) { - rtl::OUString aTemp( + OUString aTemp( mPath.copy (nPos + 1, mPath.getLength () - nPos - 1 - nTrail) ); // query, fragment present? @@ -207,7 +207,7 @@ void SerfUri::calculateURI () return aTemp; } else - return rtl::OUString::createFromAscii ("/"); + return OUString::createFromAscii ("/"); } bool SerfUri::operator== ( const SerfUri & rOther ) const @@ -215,22 +215,22 @@ bool SerfUri::operator== ( const SerfUri & rOther ) const return ( mURI == rOther.mURI ); } -::rtl::OUString SerfUri::GetPathBaseNameUnescaped () const +OUString SerfUri::GetPathBaseNameUnescaped () const { return unescape( GetPathBaseName() ); } -void SerfUri::AppendPath (const rtl::OUString& rPath) +void SerfUri::AppendPath (const OUString& rPath) { if (mPath.lastIndexOf ('/') != mPath.getLength () - 1) - mPath += rtl::OUString::createFromAscii ("/"); + mPath += OUString::createFromAscii ("/"); mPath += rPath; calculateURI (); }; // static -rtl::OUString SerfUri::escapeSegment( const rtl::OUString& segment ) +OUString SerfUri::escapeSegment( const OUString& segment ) { return rtl::Uri::encode( segment, rtl_UriCharClassPchar, @@ -239,7 +239,7 @@ rtl::OUString SerfUri::escapeSegment( const rtl::OUString& segment ) } // static -rtl::OUString SerfUri::unescape( const rtl::OUString& segment ) +OUString SerfUri::unescape( const OUString& segment ) { return rtl::Uri::decode( segment, rtl_UriDecodeWithCharset, @@ -247,10 +247,10 @@ rtl::OUString SerfUri::unescape( const rtl::OUString& segment ) } // static -rtl::OUString SerfUri::makeConnectionEndPointString( - const rtl::OUString & rHostName, int nPort ) +OUString SerfUri::makeConnectionEndPointString( + const OUString & rHostName, int nPort ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; // Is host a numeric IPv6 address? if ( ( rHostName.indexOf( ':' ) != -1 ) && @@ -268,7 +268,7 @@ rtl::OUString SerfUri::makeConnectionEndPointString( if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) ) { aBuf.append( ":" ); - aBuf.append( rtl::OUString::valueOf( sal_Int32( nPort ) ) ); + aBuf.append( OUString::valueOf( sal_Int32( nPort ) ) ); } return aBuf.makeStringAndClear(); } diff --git a/ucb/source/ucp/webdav/SerfUri.hxx b/ucb/source/ucp/webdav/SerfUri.hxx index 89298c09b2bb..15b0a6be60fb 100644 --- a/ucb/source/ucp/webdav/SerfUri.hxx +++ b/ucb/source/ucp/webdav/SerfUri.hxx @@ -39,18 +39,18 @@ class SerfUri { private: apr_uri_t mAprUri; - ::rtl::OUString mURI; - ::rtl::OUString mScheme; - ::rtl::OUString mUserInfo; - ::rtl::OUString mHostName; + OUString mURI; + OUString mScheme; + OUString mUserInfo; + OUString mHostName; sal_Int32 mPort; - ::rtl::OUString mPath; + OUString mPath; void init( const apr_uri_t * pUri ); void calculateURI (); public: - SerfUri( const ::rtl::OUString & inUri ) throw ( DAVException ); + SerfUri( const OUString & inUri ) throw ( DAVException ); SerfUri( const apr_uri_t * inUri ) throw ( DAVException ); ~SerfUri( ); @@ -62,36 +62,36 @@ class SerfUri { return &mAprUri; } - const ::rtl::OUString & GetURI( void ) const + const OUString & GetURI( void ) const { return mURI; }; - const ::rtl::OUString & GetScheme( void ) const + const OUString & GetScheme( void ) const { return mScheme; }; - const ::rtl::OUString & GetUserInfo( void ) const + const OUString & GetUserInfo( void ) const { return mUserInfo; }; - const ::rtl::OUString & GetHost( void ) const + const OUString & GetHost( void ) const { return mHostName; }; sal_Int32 GetPort( void ) const { return mPort; }; - const ::rtl::OUString & GetPath( void ) const + const OUString & GetPath( void ) const { return mPath; }; - ::rtl::OUString GetPathBaseName ( void ) const; + OUString GetPathBaseName ( void ) const; - ::rtl::OUString GetPathBaseNameUnescaped ( void ) const; + OUString GetPathBaseNameUnescaped ( void ) const; - void SetScheme (const ::rtl::OUString& scheme) + void SetScheme (const OUString& scheme) { mScheme = scheme; calculateURI (); }; - void AppendPath (const ::rtl::OUString& rPath); + void AppendPath (const OUString& rPath); - static ::rtl::OUString escapeSegment( const ::rtl::OUString& segment ); - static ::rtl::OUString unescape( const ::rtl::OUString& string ); + static OUString escapeSegment( const OUString& segment ); + static OUString unescape( const OUString& string ); // "host:port", omit ":port" for port 80 and 443 - static rtl::OUString makeConnectionEndPointString( - const rtl::OUString & rHostName, + static OUString makeConnectionEndPointString( + const OUString & rHostName, int nPort ); - rtl::OUString makeConnectionEndPointString() const + OUString makeConnectionEndPointString() const { return makeConnectionEndPointString( GetHost(), GetPort() ); } }; diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx index 828cb42d11bc..3a953d2e55ef 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx @@ -29,40 +29,40 @@ using namespace com::sun::star; struct UCBDeadPropertyValueParseContext { - rtl::OUString * pType; - rtl::OUString * pValue; + OUString * pType; + OUString * pValue; UCBDeadPropertyValueParseContext() : pType( 0 ), pValue( 0 ) {} ~UCBDeadPropertyValueParseContext() { delete pType; delete pValue; } }; // static -const rtl::OUString UCBDeadPropertyValue::aTypeString - = rtl::OUString::createFromAscii( "string" ); -const rtl::OUString UCBDeadPropertyValue::aTypeLong - = rtl::OUString::createFromAscii( "long" ); -const rtl::OUString UCBDeadPropertyValue::aTypeShort - = rtl::OUString::createFromAscii( "short" ); -const rtl::OUString UCBDeadPropertyValue::aTypeBoolean - = rtl::OUString::createFromAscii( "boolean" ); -const rtl::OUString UCBDeadPropertyValue::aTypeChar - = rtl::OUString::createFromAscii( "char" ); -const rtl::OUString UCBDeadPropertyValue::aTypeByte - = rtl::OUString::createFromAscii( "byte" ); -const rtl::OUString UCBDeadPropertyValue::aTypeHyper - = rtl::OUString::createFromAscii( "hyper" ); -const rtl::OUString UCBDeadPropertyValue::aTypeFloat - = rtl::OUString::createFromAscii( "float" ); -const rtl::OUString UCBDeadPropertyValue::aTypeDouble - = rtl::OUString::createFromAscii( "double" ); +const OUString UCBDeadPropertyValue::aTypeString + = OUString::createFromAscii( "string" ); +const OUString UCBDeadPropertyValue::aTypeLong + = OUString::createFromAscii( "long" ); +const OUString UCBDeadPropertyValue::aTypeShort + = OUString::createFromAscii( "short" ); +const OUString UCBDeadPropertyValue::aTypeBoolean + = OUString::createFromAscii( "boolean" ); +const OUString UCBDeadPropertyValue::aTypeChar + = OUString::createFromAscii( "char" ); +const OUString UCBDeadPropertyValue::aTypeByte + = OUString::createFromAscii( "byte" ); +const OUString UCBDeadPropertyValue::aTypeHyper + = OUString::createFromAscii( "hyper" ); +const OUString UCBDeadPropertyValue::aTypeFloat + = OUString::createFromAscii( "float" ); +const OUString UCBDeadPropertyValue::aTypeDouble + = OUString::createFromAscii( "double" ); // static -const rtl::OUString UCBDeadPropertyValue::aXMLPre - = rtl::OUString::createFromAscii( "" ); -const rtl::OUString UCBDeadPropertyValue::aXMLMid - = rtl::OUString::createFromAscii( "" ); -const rtl::OUString UCBDeadPropertyValue::aXMLEnd - = rtl::OUString::createFromAscii( "" ); +const OUString UCBDeadPropertyValue::aXMLPre + = OUString::createFromAscii( "" ); +const OUString UCBDeadPropertyValue::aXMLMid + = OUString::createFromAscii( "" ); +const OUString UCBDeadPropertyValue::aXMLEnd + = OUString::createFromAscii( "" ); #define STATE_TOP (1) @@ -116,7 +116,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( "UCBDeadPropertyValue_endelement_callback - " "Type already set!" ); pCtx->pType - = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = new OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); break; case STATE_VALUE: @@ -124,7 +124,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( "UCBDeadPropertyValue_endelement_callback - " "Value already set!" ); pCtx->pValue - = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = new OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); break; } return 0; // zero to continue, non-zero to abort parsing @@ -162,7 +162,7 @@ extern "C" int UCBDeadPropertyValue_endelement_callback( */ ////////////////////////////////////////////////////////////////////////// -static rtl::OUString encodeValue( const rtl::OUString & rValue ) +static OUString encodeValue( const OUString & rValue ) { // Note: I do not use the usual & + < + > encoding, because // I want to prevent any XML parser from trying to 'understand' @@ -177,7 +177,7 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) // PROPFIND: // - parser replaces < by > ==> error (not well formed) - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; const sal_Unicode * pValue = rValue.getStr(); sal_Int32 nCount = rValue.getLength(); @@ -194,14 +194,14 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) else aResult.append( c ); } - return rtl::OUString( aResult ); + return OUString( aResult ); } /* ////////////////////////////////////////////////////////////////////////// -static rtl::OUString decodeValue( const rtl::OUString & rValue ) +static OUString decodeValue( const OUString & rValue ) { - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; const sal_Unicode * pValue = rValue.getStr(); sal_Int32 nPos = 0; @@ -219,7 +219,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } c = pValue[ nPos ]; @@ -232,7 +232,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 'e' == pValue[ nPos + 1 ] ) @@ -248,7 +248,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'l' == c ) @@ -259,7 +259,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -273,7 +273,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'g' == c ) @@ -284,7 +284,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -298,14 +298,14 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else @@ -314,7 +314,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) nPos++; } - return rtl::OUString( aResult ); + return OUString( aResult ); } */ @@ -322,7 +322,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) // static bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) { - if ( ( rType != getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( ( rType != getCppuType( static_cast< const OUString * >( 0 ) ) ) && ( rType != getCppuType( static_cast< const sal_Int32 * >( 0 ) ) ) && @@ -348,7 +348,7 @@ bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) ////////////////////////////////////////////////////////////////////////// // static -bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, +bool UCBDeadPropertyValue::createFromXML( const OString & /*rInData*/, uno::Any & /*rOutData*/ ) { bool success = false; @@ -375,7 +375,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, if ( aCtx.pType && aCtx.pValue ) { // Decode aCtx.pValue! It may contain XML reserved chars. - rtl::OUString aStringValue = decodeValue( *aCtx.pValue ); + OUString aStringValue = decodeValue( *aCtx.pValue ); if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeString ) ) { rOutData <<= aStringValue; @@ -391,7 +391,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeBoolean ) ) { if ( aStringValue.equalsIgnoreAsciiCase( - rtl::OUString::createFromAscii( "true" ) ) ) + OUString::createFromAscii( "true" ) ) ) rOutData <<= sal_Bool( sal_True ); else rOutData <<= sal_Bool( sal_False ); @@ -435,17 +435,17 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, ////////////////////////////////////////////////////////////////////////// // static bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, - rtl::OUString & rOutData ) + OUString & rOutData ) { // the_typethe_value // Check property type. Extract type and value as string. const uno::Type& rType = rInData.getValueType(); - rtl::OUString aStringValue; - rtl::OUString aStringType; + OUString aStringValue; + OUString aStringType; - if ( rType == getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) ) { // string rInData >>= aStringValue; @@ -456,7 +456,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // long sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeLong; } else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) ) @@ -464,7 +464,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // short sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeShort; } else if ( rType == getCppuBooleanType() ) @@ -472,7 +472,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // boolean sal_Bool bValue = false; rInData >>= bValue; - aStringValue = rtl::OUString::valueOf( bValue ); + aStringValue = OUString::valueOf( bValue ); aStringType = aTypeBoolean; } else if ( rType == getCppuCharType() ) @@ -480,7 +480,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // char sal_Unicode cValue = 0; rInData >>= cValue; - aStringValue = rtl::OUString::valueOf( cValue ); + aStringValue = OUString::valueOf( cValue ); aStringType = aTypeChar; } else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) ) @@ -488,7 +488,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // byte sal_Int8 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( sal_Unicode( nValue ) ); + aStringValue = OUString::valueOf( sal_Unicode( nValue ) ); aStringType = aTypeByte; } else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) ) @@ -496,7 +496,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // hyper sal_Int64 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeHyper; } else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) ) @@ -504,7 +504,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // float float nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeFloat; } else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) ) @@ -512,7 +512,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // double double nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeDouble; } else diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx index 7ed138fa7c86..be752b28cb69 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx @@ -31,27 +31,27 @@ namespace http_dav_ucp class UCBDeadPropertyValue { private: - static const rtl::OUString aTypeString; - static const rtl::OUString aTypeLong; - static const rtl::OUString aTypeShort; - static const rtl::OUString aTypeBoolean; - static const rtl::OUString aTypeChar; - static const rtl::OUString aTypeByte; - static const rtl::OUString aTypeHyper; - static const rtl::OUString aTypeFloat; - static const rtl::OUString aTypeDouble; + static const OUString aTypeString; + static const OUString aTypeLong; + static const OUString aTypeShort; + static const OUString aTypeBoolean; + static const OUString aTypeChar; + static const OUString aTypeByte; + static const OUString aTypeHyper; + static const OUString aTypeFloat; + static const OUString aTypeDouble; - static const rtl::OUString aXMLPre; - static const rtl::OUString aXMLMid; - static const rtl::OUString aXMLEnd; + static const OUString aXMLPre; + static const OUString aXMLMid; + static const OUString aXMLEnd; public: static bool supportsType( const com::sun::star::uno::Type & rType ); - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Any & rOutData ); static bool toXML( const com::sun::star::uno::Any & rInData, - rtl::OUString & rOutData ); + OUString & rOutData ); }; } diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index ed7d56cfe6f3..d2fad399f4ad 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -188,7 +188,7 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) m_xSMgr, uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xCtx; xCtx.set( xProps->getPropertyValue( - rtl::OUString( "DefaultContext" ) ), + OUString( "DefaultContext" ) ), uno::UNO_QUERY_THROW ); uno::Reference< task::XInteractionHandler > xIH( @@ -323,21 +323,21 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getImplementationName() +OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString::createFromAscii( + return OUString::createFromAscii( "com.sun.star.comp.ucb.WebDAVContent" ); } //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = rtl::OUString::createFromAscii( WEBDAV_CONTENT_SERVICE_NAME ); + = OUString::createFromAscii( WEBDAV_CONTENT_SERVICE_NAME ); return aSNS; } @@ -348,7 +348,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { sal_Bool bFolder = sal_False; @@ -366,9 +366,9 @@ rtl::OUString SAL_CALL Content::getContentType() } if ( bFolder ) - return rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); + return OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); - return rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); + return OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); } //========================================================================= @@ -387,7 +387,7 @@ uno::Any SAL_CALL Content::execute( uno::RuntimeException ) { OSL_TRACE( ">>>>> Content::execute: start: command: %s, env: %s", - rtl::OUStringToOString( aCommand.Name, + OUStringToOString( aCommand.Name, RTL_TEXTENCODING_UTF8 ).getStr(), Environment.is() ? "present" : "missing" ); @@ -404,7 +404,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -425,7 +425,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -437,7 +437,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "No properties!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -477,7 +477,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -498,7 +498,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -560,7 +560,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -581,7 +581,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -621,7 +621,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -646,7 +646,7 @@ uno::Any SAL_CALL Content::execute( } OSL_TRACE( "<<<<< Content::execute: end: command: %s", - rtl::OUStringToOString( aCommand.Name, + OUStringToOString( aCommand.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); return aRet; @@ -683,7 +683,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) //========================================================================= // virtual -void SAL_CALL Content::addProperty( const rtl::OUString& Name, +void SAL_CALL Content::addProperty( const OUString& Name, sal_Int16 Attributes, const uno::Any& DefaultValue ) throw( beans::PropertyExistException, @@ -810,7 +810,7 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name, //========================================================================= // virtual -void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) +void SAL_CALL Content::removeProperty( const OUString& Name ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, uno::RuntimeException ) @@ -940,14 +940,14 @@ Content::queryCreatableContentsInfo() // document. aSeq.getArray()[ 0 ].Type - = rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); + = OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT; beans::Property aProp; m_pProvider->getProperty( - rtl::OUString( "Title" ), aProp ); + OUString( "Title" ), aProp ); uno::Sequence< beans::Property > aDocProps( 1 ); aDocProps.getArray()[ 0 ] = aProp; @@ -955,7 +955,7 @@ Content::queryCreatableContentsInfo() // folder. aSeq.getArray()[ 1 ].Type - = rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); + = OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; @@ -981,23 +981,23 @@ Content::createNewContent( const ucb::ContentInfo& Info ) ( Info.Type != WEBDAV_CONTENT_TYPE ) ) return uno::Reference< ucb::XContent >(); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); OSL_ENSURE( !aURL.isEmpty(), "WebdavContent::createNewContent - empty identifier!" ); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); sal_Bool isCollection; if ( Info.Type == WEBDAV_COLLECTION_TYPE ) { - aURL += rtl::OUString::createFromAscii( "New_Collection" ); + aURL += OUString::createFromAscii( "New_Collection" ); isCollection = sal_True; } else { - aURL += rtl::OUString::createFromAscii( "New_Content" ); + aURL += OUString::createFromAscii( "New_Content" ); isCollection = sal_False; } @@ -1021,7 +1021,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { // :// -> "" // ://foo -> "" @@ -1030,7 +1030,7 @@ rtl::OUString Content::getParentURL() // ://foo/bar/ -> ://foo/ // ://foo/bar/abc -> ://foo/bar/ - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nPos = aURL.lastIndexOf( '/' ); if ( nPos == ( aURL.getLength() - 1 ) ) @@ -1044,9 +1044,9 @@ rtl::OUString Content::getParentURL() nPos1 = aURL.lastIndexOf( '/', nPos1 ); if ( nPos1 == -1 ) - return rtl::OUString(); + return OUString(); - return rtl::OUString( aURL.copy( 0, nPos + 1 ) ); + return OUString( aURL.copy( 0, nPos + 1 ) ); } //========================================================================= @@ -1061,7 +1061,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, const ContentProperties& rData, const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, - const rtl::OUString& rContentId ) + const OUString& rContentId ) { // Note: Empty sequence means "get values of all supported properties". @@ -1148,7 +1148,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( std::auto_ptr< ContentProperties > xProps; std::auto_ptr< ContentProperties > xCachedProps; std::auto_ptr< DAVResourceAccess > xResAccess; - rtl::OUString aUnescapedTitle; + OUString aUnescapedTitle; bool bHasAll = false; uno::Reference< lang::XMultiServiceFactory > xSMgr; uno::Reference< ucb::XContentIdentifier > xIdentifier; @@ -1168,7 +1168,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) { // All properties are already in cache! No server access needed. @@ -1200,7 +1200,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) { @@ -1216,7 +1216,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( !bHasAll ) { // Only DAV resources support PROPFIND - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; uno::Sequence< beans::Property > aProperties( rProperties.getLength() ); @@ -1227,11 +1227,11 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( sal_Int32 nCount = rProperties.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString & rName = rProperties[ n ].Name; + const OUString & rName = rProperties[ n ].Name; - std::vector< rtl::OUString >::const_iterator it + std::vector< OUString >::const_iterator it = m_aFailedPropNames.begin(); - std::vector< rtl::OUString >::const_iterator end + std::vector< OUString >::const_iterator end = m_aFailedPropNames.end(); while ( it != end ) @@ -1297,7 +1297,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( bNetworkAccessAllowed ) { // All properties obtained already? - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( !( xProps.get() && xProps->containsAllNames( rProperties, aMissingProps ) ) @@ -1306,7 +1306,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Possibly the missing props can be obtained using a HEAD // request. - std::vector< rtl::OUString > aHeaderNames; + std::vector< OUString > aHeaderNames; ContentProperties::UCBNamesToHTTPNames( rProperties, aHeaderNames, @@ -1366,7 +1366,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( //xProps.reset( // new ContentProperties( aUnescapedTitle ) ); xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); } @@ -1376,16 +1376,16 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xProps.reset( new ContentProperties( aUnescapedTitle, false ) ); else xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); xProps->addProperty( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), uno::makeAny( false ), true ); xProps->addProperty( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), uno::makeAny( true ), true ); } @@ -1402,12 +1402,12 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( sal_Int32 nCount = rProperties.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString rName = rProperties[ n ].Name; + const OUString rName = rProperties[ n ].Name; if ( rName == "BaseURI" ) { // Add BaseURI property, if requested. xProps->addProperty( - rtl::OUString( "BaseURI" ), + OUString( "BaseURI" ), uno::makeAny( getBaseURI( xResAccess ) ), true ); } @@ -1416,10 +1416,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Add CreatableContentsInfo property, if requested. sal_Bool bFolder = sal_False; xProps->getValue( - rtl::OUString( "IsFolder" ) ) + OUString( "IsFolder" ) ) >>= bFolder; xProps->addProperty( - rtl::OUString( "CreatableContentsInfo" ), + OUString( "CreatableContentsInfo" ), uno::makeAny( bFolder ? queryCreatableContentsInfo() : uno::Sequence< ucb::ContentInfo >() ), @@ -1490,8 +1490,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( sal_Bool bTriedToGetAdditonalPropSet = sal_False; sal_Bool bExchange = sal_False; - rtl::OUString aNewTitle; - rtl::OUString aOldTitle; + OUString aNewTitle; + OUString aOldTitle; sal_Int32 nTitlePos = -1; uno::Reference< beans::XPropertySetInfo > xInfo; @@ -1501,7 +1501,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( for ( sal_Int32 n = 0; n < nCount; ++n ) { const beans::PropertyValue& rValue = pValues[ n ]; - const rtl::OUString & rName = rValue.Name; + const OUString & rName = rValue.Name; beans::Property aTmpProp; xProvider->getProperty( rName, aTmpProp ); @@ -1510,7 +1510,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; @@ -1524,7 +1524,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1532,7 +1532,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1540,13 +1540,13 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "Title" ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty titles! @@ -1574,7 +1574,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( catch ( DAVException const & ) { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Invalid content identifier!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); @@ -1583,7 +1583,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); @@ -1592,7 +1592,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1613,7 +1613,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // PROPPATCH::set would add the property automatically, which // is not allowed for "setPropertyValues" command! aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is unknown!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; @@ -1623,7 +1623,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1631,7 +1631,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1639,7 +1639,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1648,7 +1648,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Read-only property! // (but could be writable, if 'getcontenttype' would be) aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1656,7 +1656,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1722,7 +1722,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1785,9 +1785,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Assemble new content identifier... - rtl::OUString aNewURL = getParentURL(); + OUString aNewURL = getParentURL(); if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) ) - aNewURL += rtl::OUString::createFromAscii( "/" ); + aNewURL += OUString::createFromAscii( "/" ); aNewURL += SerfUri::escapeSegment( aNewTitle ); @@ -1826,18 +1826,18 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { // Do not set new title! - aNewTitle = rtl::OUString(); + aNewTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString::createFromAscii( "Exchange failed!" ), + OUString::createFromAscii( "Exchange failed!" ), static_cast< cppu::OWeakObject * >( this ) ); } } catch ( DAVException const & e ) { // Do not set new title! - aNewTitle = rtl::OUString(); + aNewTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= MapDAVException( e, sal_True ); @@ -1848,7 +1848,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" ); + aEvent.PropertyName = OUString::createFromAscii( "Title" ); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( aNewTitle ); @@ -1897,7 +1897,7 @@ uno::Any Content::open( { // Error: Not a folder! - rtl::OUStringBuffer aMsg; + OUStringBuffer aMsg; aMsg.appendAscii( "Non-folder resource cannot be " "opened as folder! Wrong Open Mode!" ); @@ -1923,14 +1923,14 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rArg.Mode ) ) ), xEnv ); // Unreachable } - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); uno::Reference< io::XOutputStream > xOut = uno::Reference< io::XOutputStream >( rArg.Sink, uno::UNO_QUERY ); if ( xOut.is() ) @@ -1948,7 +1948,7 @@ uno::Any Content::open( } DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; xResAccess->GET( xOut, aHeaders, aResource, xEnv ); m_bDidGetOrHead = true; @@ -1993,7 +1993,7 @@ uno::Any Content::open( // fill inputsream sync; return if all data present DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; uno::Reference< io::XInputStream > xIn = xResAccess->GET( aHeaders, aResource, xEnv ); @@ -2030,7 +2030,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2117,7 +2117,7 @@ void Content::post( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2136,13 +2136,13 @@ void Content::queryChildren( ContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); } sal_Int32 nLen = aURL.getLength(); @@ -2153,7 +2153,7 @@ void Content::queryChildren( ContentRefList& rChildren ) while ( it != end ) { ::ucbhelper::ContentImplHelperRef xChild = (*it); - rtl::OUString aChildURL + OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? @@ -2185,7 +2185,7 @@ void Content::insert( throw( uno::Exception ) { sal_Bool bTransient, bCollection; - rtl::OUString aEscapedTitle; + OUString aEscapedTitle; std::auto_ptr< DAVResourceAccess > xResAccess; { @@ -2203,11 +2203,11 @@ void Content::insert( { OSL_ENSURE( sal_False, "Content::insert - Title missing!" ); - uno::Sequence< rtl::OUString > aProps( 1 ); - aProps[ 0 ] = rtl::OUString::createFromAscii( "Title" ); + uno::Sequence< OUString > aProps( 1 ); + aProps[ 0 ] = OUString::createFromAscii( "Title" ); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), Environment ); @@ -2236,7 +2236,7 @@ void Content::insert( { #undef ERROR ucb::UnsupportedNameClashException aEx( - rtl::OUString::createFromAscii( "Unable to write without overwrite!" ), + OUString::createFromAscii( "Unable to write without overwrite!" ), static_cast< cppu::OWeakObject * >( this ), ucb::NameClash::ERROR ); @@ -2273,7 +2273,7 @@ void Content::insert( case ucbhelper::CONTINUATION_DISAPPROVE: // Abort. throw ucb::CommandFailedException( - rtl::OUString(), + OUString(), uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2283,7 +2283,7 @@ void Content::insert( "Content::insert - " "Unknown interaction selection!" ); throw ucb::CommandFailedException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Unknown interaction selection!" ), uno::Reference< uno::XInterface >(), aExAsAny ); @@ -2301,9 +2301,9 @@ void Content::insert( if ( bTransient ) { // Assemble new content identifier... - rtl::OUString aURL = getParentURL(); + OUString aURL = getParentURL(); if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); aURL += aEscapedTitle; @@ -2353,7 +2353,7 @@ void Content::insert( } else { - rtl::OUString aTitle; + OUString aTitle; try { SerfUri aURI( aURL ); @@ -2366,7 +2366,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTitle ) ), @@ -2400,7 +2400,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingInputStreamException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2443,7 +2443,7 @@ void Content::transfer( xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); } - rtl::OUString aTargetURI; + OUString aTargetURI; try { SerfUri sourceURI( rArgs.SourceURL ); @@ -2452,21 +2452,21 @@ void Content::transfer( // Check source's and target's URL scheme // - const rtl::OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); + const OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); if ( aScheme == WEBDAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAVS_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) ); + OUString::createFromAscii( HTTPS_URL_SCHEME ) ); } else { @@ -2475,7 +2475,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Unsupported URL scheme!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); @@ -2485,10 +2485,10 @@ void Content::transfer( if ( targetURI.GetScheme().toAsciiLowerCase() == WEBDAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); else if ( targetURI.GetScheme().toAsciiLowerCase() == DAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); // @@@ This implementation of 'transfer' only works // if the source and target are located at same host. @@ -2501,14 +2501,14 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Different hosts!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable } - rtl::OUString aTitle = rArgs.NewTitle; + OUString aTitle = rArgs.NewTitle; if ( aTitle.isEmpty() ) aTitle = sourceURI.GetPathBaseNameUnescaped(); @@ -2516,15 +2516,15 @@ void Content::transfer( if ( aTitle == "/" ) { // kso: ??? - aTitle = rtl::OUString(); + aTitle = OUString(); } targetURI.AppendPath( aTitle ); - rtl::OUString aTargetURL = xIdentifier->getContentIdentifier(); + OUString aTargetURL = xIdentifier->getContentIdentifier(); if ( ( aTargetURL.lastIndexOf( '/' ) + 1 ) != aTargetURL.getLength() ) - aTargetURL += rtl::OUString::createFromAscii( "/" ); + aTargetURL += OUString::createFromAscii( "/" ); aTargetURL += aTitle; @@ -2623,7 +2623,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTargetURI ) ), @@ -2642,7 +2642,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArgs.NameClash ) ), Environment ); @@ -2666,7 +2666,7 @@ void Content::destroy( sal_Bool bDeletePhysical ) throw( uno::Exception ) { // @@@ take care about bDeletePhysical -> trashcan support - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); uno::Reference< ucb::XContent > xThis = this; @@ -2730,7 +2730,7 @@ void Content::lock( uno::Any aOwnerAny; aOwnerAny - <<= rtl::OUString::createFromAscii( "http://ucb.openoffice.org" ); + <<= OUString::createFromAscii( "http://ucb.openoffice.org" ); ucb::Lock aLock( ucb::LockScope_EXCLUSIVE, @@ -2739,7 +2739,7 @@ void Content::lock( aOwnerAny, 180, // lock timeout in secs //-1, // infinite lock - uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString >() ); xResAccess->LOCK( aLock, Environment ); @@ -2805,7 +2805,7 @@ sal_Bool Content::exchangeIdentity( // Fail, if a content with given id already exists. // if ( !hasData( xNewId ) ) { - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); aGuard.clear(); if ( exchange( xNewId ) ) @@ -2825,9 +2825,9 @@ sal_Bool Content::exchangeIdentity( // Create new content identifier for the child... uno::Reference< ucb::XContentIdentifier > xOldChildId = xChild->getIdentifier(); - rtl::OUString aOldChildURL + OUString aOldChildURL = xOldChildId->getContentIdentifier(); - rtl::OUString aNewChildURL + OUString aNewChildURL = aOldChildURL.replaceAt( 0, aOldURL.getLength(), @@ -2864,7 +2864,7 @@ sal_Bool Content::isFolder( } uno::Sequence< beans::Property > aProperties( 1 ); - aProperties[ 0 ].Name = rtl::OUString::createFromAscii( "IsFolder" ); + aProperties[ 0 ].Name = OUString::createFromAscii( "IsFolder" ); aProperties[ 0 ].Handle = -1; uno::Reference< sdbc::XRow > xRow( getPropertyValues( aProperties, xEnv ) ); if ( xRow.is() ) @@ -2887,12 +2887,12 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) // Map DAVException... uno::Any aException; - rtl::OUString aURL; + OUString aURL; if ( m_bTransient ) { aURL = getParentURL(); if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); aURL += m_aEscapedTitle; } @@ -2907,13 +2907,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString::createFromAscii("Uri"), -1, + OUString::createFromAscii("Uri"), -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString::createFromAscii( "Not found!" ), + OUString::createFromAscii( "Not found!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -2948,7 +2948,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_HTTP_LOOKUP: aException <<= ucb::InteractiveNetworkResolveNameException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, e.getData() ); @@ -2965,7 +2965,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_HTTP_CONNECT: aException <<= ucb::InteractiveNetworkConnectException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, e.getData() ); @@ -2986,7 +2986,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_INVALID_ARG: aException <<= lang::IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ); break; @@ -2995,7 +2995,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) #if 1 aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString::createFromAscii( "Locked!" ), + OUString::createFromAscii( "Locked!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -3004,13 +3004,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString::createFromAscii("Uri"), -1, + OUString::createFromAscii("Uri"), -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString::createFromAscii( "Locked!" ), + OUString::createFromAscii( "Locked!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_LOCKING_VIOLATION, @@ -3022,7 +3022,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCKED_SELF: aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString::createFromAscii( "Locked (self)!" ), + OUString::createFromAscii( "Locked (self)!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -3032,7 +3032,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_NOT_LOCKED: aException <<= ucb::InteractiveLockingNotLockedException( - rtl::OUString::createFromAscii( "Not locked!" ), + OUString::createFromAscii( "Not locked!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3041,7 +3041,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCK_EXPIRED: aException <<= ucb::InteractiveLockingLockExpiredException( - rtl::OUString::createFromAscii( "Lock expired!" ), + OUString::createFromAscii( "Lock expired!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3050,7 +3050,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) default: aException <<= ucb::InteractiveNetworkGeneralException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR ); break; @@ -3085,7 +3085,7 @@ void Content::cancelCommandExecution( } //========================================================================= -const rtl::OUString +const OUString Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -3093,8 +3093,8 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) // First, try to obtain value of response header "Content-Location". if ( m_xCachedProps.get() ) { - rtl::OUString aLocation; - m_xCachedProps->getValue( rtl::OUString( + OUString aLocation; + m_xCachedProps->getValue( OUString( "Content-Location" ) ) >>= aLocation; if ( aLocation.getLength() ) { @@ -3112,7 +3112,7 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) } } - return rtl::OUString( rResAccess->getURL() ); + return OUString( rResAccess->getURL() ); } //========================================================================= @@ -3128,8 +3128,8 @@ const Content::ResourceType & Content::getResourceType( ResourceType eResourceType; eResourceType = m_eResourceType; - const rtl::OUString & rURL = rResAccess->getURL(); - const rtl::OUString aScheme( + const OUString & rURL = rResAccess->getURL(); + const OUString aScheme( rURL.copy( 0, rURL.indexOf( ':' ) ).toAsciiLowerCase() ); try @@ -3138,16 +3138,16 @@ const Content::ResourceType & Content::getResourceType( // used when loading documents... along with identifying whether // this is a DAV resource. std::vector< DAVResource > resources; - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; uno::Sequence< beans::Property > aProperties( 5 ); aProperties[ 0 ].Name - = rtl::OUString::createFromAscii( "IsFolder" ); + = OUString::createFromAscii( "IsFolder" ); aProperties[ 1 ].Name - = rtl::OUString::createFromAscii( "IsDocument" ); + = OUString::createFromAscii( "IsDocument" ); aProperties[ 2 ].Name - = rtl::OUString::createFromAscii( "IsReadOnly" ); + = OUString::createFromAscii( "IsReadOnly" ); aProperties[ 3 ].Name - = rtl::OUString::createFromAscii( "MediaType" ); + = OUString::createFromAscii( "MediaType" ); aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK; diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index 1e649f3071c1..6ffbd222b072 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -77,13 +77,13 @@ class Content : public ::ucbhelper::ContentImplHelper, std::auto_ptr< DAVResourceAccess > m_xResAccess; std::auto_ptr< CachableContentProperties > m_xCachedProps; // locally cached props - rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; ResourceType m_eResourceType; ContentProvider* m_pProvider; // No need for a ref, base class holds object bool m_bTransient; bool m_bCollection; bool m_bDidGetOrHead; - std::vector< rtl::OUString > m_aFailedPropNames; + std::vector< OUString > m_aFailedPropNames; private: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > @@ -92,7 +92,7 @@ private: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); sal_Bool isFolder( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -120,7 +120,7 @@ private: exchangeIdentity( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& xNewId ); - const rtl::OUString + const OUString getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ); const ResourceType & @@ -215,16 +215,16 @@ public: XTYPEPROVIDER_DECL() // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XContent - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); @@ -243,7 +243,7 @@ public: // XPropertyContainer virtual void SAL_CALL - addProperty( const rtl::OUString& Name, + addProperty( const OUString& Name, sal_Int16 Attributes, const com::sun::star::uno::Any& DefaultValue ) throw( com::sun::star::beans::PropertyExistException, @@ -252,7 +252,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeProperty( const rtl::OUString& Name ) + removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException ); @@ -286,7 +286,7 @@ public: const ContentProperties& rData, const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); }; } diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index 8a0e57ae90a8..f075ba0d6665 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -46,7 +46,7 @@ using namespace http_dav_ucp; //========================================================================= bool ContentProvider::getProperty( - const rtl::OUString & rPropName, beans::Property & rProp, bool bStrict ) + const OUString & rPropName, beans::Property & rProp, bool bStrict ) { if ( !m_pProps ) { @@ -62,15 +62,15 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -78,7 +78,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -86,16 +86,16 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); // Optional UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( "DateCreated" ), + OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -103,7 +103,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "DateModified" ), + OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -111,15 +111,15 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "MediaType" ), + OUString( "MediaType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( "Size" ), + OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -127,15 +127,15 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "BaseURI" ), + OUString( "BaseURI" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -149,7 +149,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::CREATIONDATE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -157,14 +157,14 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::DISPLAYNAME, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); m_pProps->insert( beans::Property( DAVProperties::GETCONTENTLANGUAGE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -172,7 +172,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETCONTENTLENGTH, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -180,7 +180,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETCONTENTTYPE , -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -188,7 +188,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETETAG, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -196,7 +196,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETLASTMODIFIED, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -213,7 +213,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::RESOURCETYPE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -231,7 +231,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::EXECUTABLE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); } } @@ -256,7 +256,7 @@ bool ContentProvider::getProperty( rProp = beans::Property( rPropName, - 1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); } @@ -289,7 +289,7 @@ uno::Sequence< beans::Property > Content::getProperties( xProvider.set( m_pProvider ); } - typedef std::set< rtl::OUString > StringSet; + typedef std::set< OUString > StringSet; StringSet aPropSet; // No server access for just created (not yet committed) objects. @@ -330,8 +330,8 @@ uno::Sequence< beans::Property > Content::getProperties( sal_Bool bHasCreatableInfos = sal_False; { - std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); - std::set< rtl::OUString >::const_iterator end = aPropSet.end(); + std::set< OUString >::const_iterator it = aPropSet.begin(); + std::set< OUString >::const_iterator end = aPropSet.end(); while ( it != end ) { if ( !bHasCreationDate && @@ -401,21 +401,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Add mandatory properties. if ( !bHasContentType ) aPropSet.insert( - rtl::OUString( "ContentType" ) ); + OUString( "ContentType" ) ); if ( !bHasIsDocument ) aPropSet.insert( - rtl::OUString( "IsDocument" ) ); + OUString( "IsDocument" ) ); if ( !bHasIsFolder ) aPropSet.insert( - rtl::OUString( "IsFolder" ) ); + OUString( "IsFolder" ) ); if ( !bHasTitle ) { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( "Title" ) ); + OUString( "Title" ) ); } // Add optional properties. @@ -424,34 +424,34 @@ uno::Sequence< beans::Property > Content::getProperties( { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( "BaseURI" ) ); + OUString( "BaseURI" ) ); } if ( !bHasDateCreated && bHasCreationDate ) aPropSet.insert( - rtl::OUString( "DateCreated" ) ); + OUString( "DateCreated" ) ); if ( !bHasDateModified && bHasGetLastModified ) aPropSet.insert( - rtl::OUString( "DateModified" ) ); + OUString( "DateModified" ) ); if ( !bHasMediaType && bHasGetContentType ) aPropSet.insert( - rtl::OUString( "MediaType" ) ); + OUString( "MediaType" ) ); if ( !bHasSize && bHasGetContentLength ) aPropSet.insert( - rtl::OUString( "Size" ) ); + OUString( "Size" ) ); if ( !bHasCreatableInfos ) aPropSet.insert( - rtl::OUString( + OUString( "CreatableContentsInfo" ) ); // Add cached properties, if present and still missing. if ( xCachedProps.get() ) { - const std::set< rtl::OUString >::const_iterator set_end + const std::set< OUString >::const_iterator set_end = aPropSet.end(); const std::auto_ptr< PropertyValueMap > & xProps @@ -473,7 +473,7 @@ uno::Sequence< beans::Property > Content::getProperties( sal_Int32 nCount = aPropSet.size(); uno::Sequence< beans::Property > aProperties( nCount ); - std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); + std::set< OUString >::const_iterator it = aPropSet.begin(); beans::Property aProp; for ( sal_Int32 n = 0; n < nCount; ++n, ++it ) @@ -500,23 +500,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ); aCmdInfo[ 3 ] = ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ); @@ -527,18 +527,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ); aCmdInfo[ 6 ] = ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ); @@ -549,7 +549,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - rtl::OUString( "post" ), + OUString( "post" ), -1, getCppuType( static_cast< ucb::PostCommandArgument2 * >( 0 ) ) ); @@ -582,13 +582,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ); @@ -603,13 +603,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "lock" ), + OUString( "lock" ), -1, getCppuVoidType() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "unlock" ), + OUString( "unlock" ), -1, getCppuVoidType() ); nPos++; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index 1d1523ff84de..a50bb7e312bf 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -43,7 +43,7 @@ namespace http_dav_ucp struct ResultListEntry { - rtl::OUString aId; + OUString aId; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; @@ -126,13 +126,13 @@ DataSupplier::~DataSupplier() //========================================================================= // virtual -rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( nIndex < m_pImpl->m_aResults.size() ) { - rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; if ( aId.getLength() ) { // Already cached. @@ -142,23 +142,23 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) if ( getResult( nIndex ) ) { - rtl::OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); + OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); const ContentProperties& props = *( m_pImpl->m_aResults[ nIndex ]->pData ); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString::createFromAscii( "/" ); + aId += OUString::createFromAscii( "/" ); aId += props.getEscapedTitle(); if ( props.isTrailingSlash() ) - aId += rtl::OUString::createFromAscii( "/" ); + aId += OUString::createFromAscii( "/" ); m_pImpl->m_aResults[ nIndex ]->aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -179,7 +179,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( aId.getLength() ) { uno::Reference< ucb::XContentIdentifier > xId @@ -342,7 +342,7 @@ sal_Bool DataSupplier::getData() if ( !m_pImpl->m_bCountFinal ) { - std::vector< rtl::OUString > propertyNames; + std::vector< OUString > propertyNames; ContentProperties::UCBNamesToDAVNames( getResultSet()->getProperties(), propertyNames ); @@ -350,9 +350,9 @@ sal_Bool DataSupplier::getData() // needed to get a valid ContentProperties::pIsFolder value, which // is needed for OpenMode handling. - std::vector< rtl::OUString >::const_iterator it + std::vector< OUString >::const_iterator it = propertyNames.begin(); - std::vector< rtl::OUString >::const_iterator end + std::vector< OUString >::const_iterator end = propertyNames.end(); while ( it != end ) @@ -389,7 +389,7 @@ sal_Bool DataSupplier::getData() { SerfUri aURI( m_pImpl->m_xContent->getResourceAccess().getURL() ); - rtl::OUString aPath = aURI.GetPath(); + OUString aPath = aURI.GetPath(); if ( aPath.getStr()[ aPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -409,7 +409,7 @@ sal_Bool DataSupplier::getData() try { SerfUri aCurrURI( rRes.uri ); - rtl::OUString aCurrPath = aCurrURI.GetPath(); + OUString aCurrPath = aCurrURI.GetPath(); if ( aCurrPath.getStr()[ aCurrPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -443,7 +443,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( + OUString( "IsFolder" ) ); rValue >>= bFolder; @@ -459,7 +459,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( + OUString( "IsDocument" ) ); rValue >>= bDocument; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx index 32db6aa01f1a..c645c47cae00 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx @@ -48,7 +48,7 @@ public: virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 21befa3fb5ea..0d4d0916bd9d 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -78,9 +78,9 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString::createFromAscii( + OUString::createFromAscii( "com.sun.star.comp.WebDAVContentProvider" ), - rtl::OUString::createFromAscii( + OUString::createFromAscii( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); //========================================================================= @@ -107,7 +107,7 @@ ContentProvider::queryContent( { // Check URL scheme... - const rtl::OUString aScheme + const OUString aScheme = Identifier->getContentProviderScheme().toAsciiLowerCase(); if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME && aScheme != WEBDAV_URL_SCHEME && aScheme != DAV_URL_SCHEME && @@ -115,7 +115,7 @@ ContentProvider::queryContent( throw ucb::IllegalIdentifierException(); // Normalize URL and create new Id, if nessacary. - rtl::OUString aURL = Identifier->getContentIdentifier(); + OUString aURL = Identifier->getContentIdentifier(); // At least: + "://" if ( aURL.getLength() < ( aScheme.getLength() + 3 ) ) @@ -133,7 +133,7 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, WEBDAV_URL_SCHEME_LENGTH, - rtl::OUString::createFromAscii( + OUString::createFromAscii( HTTP_URL_SCHEME ) ); bNewId = true; } @@ -141,7 +141,7 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, DAV_URL_SCHEME_LENGTH, - rtl::OUString::createFromAscii( + OUString::createFromAscii( HTTP_URL_SCHEME ) ); bNewId = true; } @@ -149,7 +149,7 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, DAVS_URL_SCHEME_LENGTH, - rtl::OUString::createFromAscii( + OUString::createFromAscii( HTTPS_URL_SCHEME ) ); bNewId = true; } @@ -165,7 +165,7 @@ ContentProvider::queryContent( nPos = aURL.indexOf( '/', nPos + 1 ); if ( nPos == -1 ) { - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); bNewId = true; } } diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index a09e420c91b2..ee5169ca0de4 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -104,7 +104,7 @@ public: rtl::Reference< DAVSessionFactory > getDAVSessionFactory() { return m_xDAVSessionFactory; } - bool getProperty( const ::rtl::OUString & rPropName, + bool getProperty( const OUString & rPropName, ::com::sun::star::beans::Property & rProp, bool bStrict = false ); }; diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index 32489d3a6ee4..f61efc81e220 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -48,10 +48,10 @@ namespace WebDAVNamespace_last }; - WebDAVNamespace StrToWebDAVNamespace(const rtl::OUString& rStr) + WebDAVNamespace StrToWebDAVNamespace(const OUString& rStr) { - static ::rtl::OUString aStrDAV(::rtl::OUString::createFromAscii("DAV:")); - static ::rtl::OUString aStrUcbOpenofficeOrgDAVProps(::rtl::OUString::createFromAscii("http://ucb.openoffice.org/dav/props/")); + static OUString aStrDAV(OUString::createFromAscii("DAV:")); + static OUString aStrUcbOpenofficeOrgDAVProps(OUString::createFromAscii("http://ucb.openoffice.org/dav/props/")); if(rStr.equals(aStrDAV)) { @@ -97,33 +97,33 @@ namespace WebDAVName_last }; - WebDAVName StrToWebDAVName(const rtl::OUString& rStr) + WebDAVName StrToWebDAVName(const OUString& rStr) { - typedef std::hash_map< rtl::OUString, WebDAVName, rtl::OUStringHash > WebDAVNameMapper; - typedef std::pair< rtl::OUString, WebDAVName > WebDAVNameValueType; + typedef std::hash_map< OUString, WebDAVName, OUStringHash > WebDAVNameMapper; + typedef std::pair< OUString, WebDAVName > WebDAVNameValueType; static WebDAVNameMapper aWebDAVNameMapperList; if(aWebDAVNameMapperList.empty()) { - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("multistatus"), WebDAVName_multistatus)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("response"), WebDAVName_response)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("href"), WebDAVName_href)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("propstat"), WebDAVName_propstat)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("prop"), WebDAVName_prop)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("resourcetype"), WebDAVName_resourcetype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("collection"), WebDAVName_collection)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getcontenttype"), WebDAVName_getcontenttype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("supportedlock"), WebDAVName_supportedlock)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("lockentry"), WebDAVName_lockentry)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("lockscope"), WebDAVName_lockscope)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("exclusive"), WebDAVName_exclusive)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("locktype"), WebDAVName_locktype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("write"), WebDAVName_write)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("shared"), WebDAVName_shared)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("status"), WebDAVName_status)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getlastmodified"), WebDAVName_getlastmodified)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("creationdate"), WebDAVName_creationdate)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getcontentlength"), WebDAVName_getcontentlength)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("multistatus"), WebDAVName_multistatus)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("response"), WebDAVName_response)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("href"), WebDAVName_href)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("propstat"), WebDAVName_propstat)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("prop"), WebDAVName_prop)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("resourcetype"), WebDAVName_resourcetype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("collection"), WebDAVName_collection)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("getcontenttype"), WebDAVName_getcontenttype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("supportedlock"), WebDAVName_supportedlock)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("lockentry"), WebDAVName_lockentry)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("lockscope"), WebDAVName_lockscope)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("exclusive"), WebDAVName_exclusive)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("locktype"), WebDAVName_locktype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("write"), WebDAVName_write)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("shared"), WebDAVName_shared)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("status"), WebDAVName_status)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("getlastmodified"), WebDAVName_getlastmodified)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("creationdate"), WebDAVName_creationdate)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("getcontentlength"), WebDAVName_getcontentlength)); } const WebDAVNameMapper::const_iterator aResult(aWebDAVNameMapperList.find(rStr)); @@ -144,37 +144,37 @@ namespace namespace { - typedef std::map< ::rtl::OUString, ::rtl::OUString > NamespaceMap; - typedef std::pair< const ::rtl::OUString, ::rtl::OUString > NamespaceValueType; + typedef std::map< OUString, OUString > NamespaceMap; + typedef std::pair< const OUString, OUString > NamespaceValueType; class WebDAVContext { private: WebDAVContext* mpParent; NamespaceMap maNamespaceMap; - ::rtl::OUString maWhiteSpace; + OUString maWhiteSpace; - ::rtl::OUString maNamespace; - ::rtl::OUString maName; + OUString maNamespace; + OUString maName; WebDAVNamespace maWebDAVNamespace; WebDAVName maWebDAVName; // local helpers void parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs); - ::rtl::OUString mapNamespaceToken(const ::rtl::OUString& rToken) const; - void splitName(const ::rtl::OUString& rSource); + OUString mapNamespaceToken(const OUString& rToken) const; + void splitName(const OUString& rSource); public: - WebDAVContext(WebDAVContext* pParent, const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs); + WebDAVContext(WebDAVContext* pParent, const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs); ~WebDAVContext(); WebDAVContext* getParent() const { return mpParent; } - ::rtl::OUString& getWhiteSpace() { return maWhiteSpace; } - void setWhiteSpace(const ::rtl::OUString& rNew) { maWhiteSpace = rNew; } + OUString& getWhiteSpace() { return maWhiteSpace; } + void setWhiteSpace(const OUString& rNew) { maWhiteSpace = rNew; } - const ::rtl::OUString& getNamespace() const { return maNamespace; } - const ::rtl::OUString& getName() const { return maName; } + const OUString& getNamespace() const { return maNamespace; } + const OUString& getName() const { return maName; } const WebDAVNamespace getWebDAVNamespace() const { return maWebDAVNamespace; } const WebDAVName getWebDAVName() const { return maWebDAVName; } }; @@ -182,11 +182,11 @@ namespace void WebDAVContext::parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs) { const sal_Int16 nAttributes(xAttribs->getLength()); - static ::rtl::OUString aStrXmlns(::rtl::OUString::createFromAscii("xmlns")); + static OUString aStrXmlns(OUString::createFromAscii("xmlns")); for(sal_Int16 a(0); a < nAttributes; a++) { - const ::rtl::OUString aName(xAttribs->getNameByIndex(a)); + const OUString aName(xAttribs->getNameByIndex(a)); const sal_Int32 nLen(aName.getLength()); if(nLen) @@ -197,7 +197,7 @@ namespace if(-1 != nIndex && nIndex + 1 < nLen) { - const ::rtl::OUString aToken(aName.copy(nIndex + 1)); + const OUString aToken(aName.copy(nIndex + 1)); maNamespaceMap.insert(NamespaceValueType(aToken, xAttribs->getValueByIndex(a))); } @@ -206,7 +206,7 @@ namespace } } - ::rtl::OUString WebDAVContext::mapNamespaceToken(const ::rtl::OUString& rToken) const + OUString WebDAVContext::mapNamespaceToken(const OUString& rToken) const { NamespaceMap::const_iterator iter = maNamespaceMap.find(rToken); @@ -227,7 +227,7 @@ namespace } } - void WebDAVContext::splitName(const ::rtl::OUString& rSource) + void WebDAVContext::splitName(const OUString& rSource) { const sal_Int32 nLen(rSource.getLength()); maNamespace = ""; @@ -245,7 +245,7 @@ namespace } } - WebDAVContext::WebDAVContext(WebDAVContext* pParent, const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs) + WebDAVContext::WebDAVContext(WebDAVContext* pParent, const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs) : mpParent(pParent), maNamespaceMap(), maWhiteSpace(), @@ -293,12 +293,12 @@ namespace std::vector< http_dav_ucp::DAVResourceInfo > maResult_PropName; WebDAVContext* mpContext; - ::rtl::OUString maHref; - ::rtl::OUString maStatus; + OUString maHref; + OUString maStatus; std::vector< http_dav_ucp::DAVPropertyValue > maResponseProperties; std::vector< http_dav_ucp::DAVPropertyValue > maPropStatProperties; - std::vector< ::rtl::OUString > maResponseNames; - std::vector< ::rtl::OUString > maPropStatNames; + std::vector< OUString > maResponseNames; + std::vector< OUString > maPropStatNames; uno::Sequence< ucb::LockEntry > maLockEntries; ucb::LockScope maLockScope; ucb::LockType maLockType; @@ -355,11 +355,11 @@ namespace // Methods XDocumentHandler virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException); const std::vector< http_dav_ucp::DAVResource >& getResult_PropFind() const { return maResult_PropFind; } @@ -405,7 +405,7 @@ namespace OSL_ENSURE(!mpContext, "Parser end with existing content (!)"); } - void SAL_CALL WebDAVResponseParser::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) { const sal_Int32 nLen(aName.getLength()); @@ -498,7 +498,7 @@ namespace } } - void SAL_CALL WebDAVResponseParser::endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) { const sal_Int32 nLen(aName.getLength()); OSL_ENSURE(mpContext, "Parser EndElement without content (!)"); @@ -550,7 +550,7 @@ namespace // getlastmodified end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getlastmodified")); + static OUString aStr(OUString::createFromAscii("DAV:getlastmodified")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -564,7 +564,7 @@ namespace // creationdate end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:creationdate")); + static OUString aStr(OUString::createFromAscii("DAV:creationdate")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -587,12 +587,12 @@ namespace // resourcetype end, check for collection if(hasParent(WebDAVName_prop)) { - static rtl::OUString aStrA(rtl::OUString::createFromAscii("DAV:resourcetype")); - static rtl::OUString aStrB(rtl::OUString::createFromAscii("collection")); + static OUString aStrA(OUString::createFromAscii("DAV:resourcetype")); + static OUString aStrB(OUString::createFromAscii("collection")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStrA; - aDAVPropertyValue.Value <<= (mbResourceTypeCollection ? aStrB : rtl::OUString()); + aDAVPropertyValue.Value <<= (mbResourceTypeCollection ? aStrB : OUString()); maPropStatProperties.push_back(aDAVPropertyValue); } break; @@ -602,7 +602,7 @@ namespace // getcontentlength end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getcontentlength")); + static OUString aStr(OUString::createFromAscii("DAV:getcontentlength")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -616,7 +616,7 @@ namespace // getcontenttype end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getcontenttype")); + static OUString aStr(OUString::createFromAscii("DAV:getcontenttype")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -630,7 +630,7 @@ namespace // supportedlock end if(hasParent(WebDAVName_prop) && maLockEntries.hasElements()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:supportedlock")); + static OUString aStr(OUString::createFromAscii("DAV:supportedlock")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -689,7 +689,7 @@ namespace // propstat end, check status if(maStatus.getLength()) { - static ::rtl::OUString aStrStatusOkay(::rtl::OUString::createFromAscii("HTTP/1.1 200 OK")); + static OUString aStrStatusOkay(OUString::createFromAscii("HTTP/1.1 200 OK")); if(maStatus.equals(aStrStatusOkay)) { @@ -759,7 +759,7 @@ namespace } } - void SAL_CALL WebDAVResponseParser::characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) { // collect whitespace over evtl. several calls in mpContext OSL_ENSURE(mpContext, "Parser characters without content (!)"); @@ -768,16 +768,16 @@ namespace if(mpContext && nLen) { // remove leading/trailing blanks and CRLF - const ::rtl::OUString aTrimmedChars(aChars.trim()); + const OUString aTrimmedChars(aChars.trim()); if(aTrimmedChars.getLength()) { - ::rtl::OUString aNew(mpContext->getWhiteSpace()); + OUString aNew(mpContext->getWhiteSpace()); if(aNew.getLength()) { // add one char when appending (see html1.1 spec) - aNew += ::rtl::OUString(sal_Unicode(' ')); + aNew += OUString(sal_Unicode(' ')); } aNew += aTrimmedChars; @@ -786,11 +786,11 @@ namespace } } - void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) throw (xml::sax::SAXException, uno::RuntimeException) { } - void SAL_CALL WebDAVResponseParser::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw (xml::sax::SAXException, uno::RuntimeException) { } diff --git a/ucb/workben/cachemap/cachemapobject1.cxx b/ucb/workben/cachemap/cachemapobject1.cxx index 7e5b5b4ff836..5d51267605b4 100644 --- a/ucb/workben/cachemap/cachemapobject1.cxx +++ b/ucb/workben/cachemap/cachemapobject1.cxx @@ -62,7 +62,7 @@ ObjectContainer1::ObjectContainer1() ObjectContainer1::~ObjectContainer1() SAL_THROW(()) {} -rtl::Reference< Object1 > ObjectContainer1::get(rtl::OUString const & rKey) +rtl::Reference< Object1 > ObjectContainer1::get(OUString const & rKey) { osl::MutexGuard aGuard(m_aMutex); Map::iterator aIt(m_aMap.find(rKey)); diff --git a/ucb/workben/cachemap/cachemapobject1.hxx b/ucb/workben/cachemap/cachemapobject1.hxx index 7e20a4eaa757..d459421cfc95 100644 --- a/ucb/workben/cachemap/cachemapobject1.hxx +++ b/ucb/workben/cachemap/cachemapobject1.hxx @@ -41,10 +41,10 @@ public: virtual ~ObjectContainer1() SAL_THROW(()); - rtl::Reference< Object1 > get(rtl::OUString const & rKey); + rtl::Reference< Object1 > get(OUString const & rKey); private: - typedef std::map< rtl::OUString, Object1 * > Map; + typedef std::map< OUString, Object1 * > Map; Map m_aMap; osl::Mutex m_aMutex; diff --git a/ucb/workben/cachemap/cachemapobject3.cxx b/ucb/workben/cachemap/cachemapobject3.cxx index 7ecd50a9ff60..da360809749e 100644 --- a/ucb/workben/cachemap/cachemapobject3.cxx +++ b/ucb/workben/cachemap/cachemapobject3.cxx @@ -63,7 +63,7 @@ ObjectContainer3::ObjectContainer3() ObjectContainer3::~ObjectContainer3() SAL_THROW(()) {} -rtl::Reference< Object3 > ObjectContainer3::get(rtl::OUString const & rKey) +rtl::Reference< Object3 > ObjectContainer3::get(OUString const & rKey) { osl::MutexGuard aGuard(m_aMutex); Map::iterator aIt(m_aMap.find(rKey)); diff --git a/ucb/workben/cachemap/cachemapobject3.hxx b/ucb/workben/cachemap/cachemapobject3.hxx index 181e18dc503b..6ef220ddadf8 100644 --- a/ucb/workben/cachemap/cachemapobject3.hxx +++ b/ucb/workben/cachemap/cachemapobject3.hxx @@ -41,10 +41,10 @@ public: virtual ~ObjectContainer3() SAL_THROW(()); - rtl::Reference< Object3 > get(rtl::OUString const & rKey); + rtl::Reference< Object3 > get(OUString const & rKey); private: - typedef std::map< rtl::OUString, Object3 * > Map; + typedef std::map< OUString, Object3 * > Map; Map m_aMap; osl::Mutex m_aMutex; diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.cxx b/ucb/workben/cachemap/cachemapobjectcontainer2.cxx index 063d06af677b..6578133c258c 100644 --- a/ucb/workben/cachemap/cachemapobjectcontainer2.cxx +++ b/ucb/workben/cachemap/cachemapobjectcontainer2.cxx @@ -36,7 +36,7 @@ ObjectContainer2::ObjectContainer2() ObjectContainer2::~ObjectContainer2() SAL_THROW(()) {} -rtl::Reference< Object2 > ObjectContainer2::get(rtl::OUString const & rKey) +rtl::Reference< Object2 > ObjectContainer2::get(OUString const & rKey) { rtl::Reference< Object2 > xElement; { diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx index 99b6a65895ac..b43de572c833 100644 --- a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx +++ b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx @@ -42,12 +42,12 @@ public: ~ObjectContainer2() SAL_THROW(()); - rtl::Reference< Object2 > get(rtl::OUString const & rKey); + rtl::Reference< Object2 > get(OUString const & rKey); private: - typedef boost::unordered_map< rtl::OUString, + typedef boost::unordered_map< OUString, com::sun::star::uno::WeakReference< Object2 >, - rtl::OUStringHash > + OUStringHash > Map; ObjectContainer2(ObjectContainer2 &); // not implemented diff --git a/ucb/workben/cachemap/cachemaptest.cxx b/ucb/workben/cachemap/cachemaptest.cxx index 336e8ae5dfeb..f9daee369b1d 100644 --- a/ucb/workben/cachemap/cachemaptest.cxx +++ b/ucb/workben/cachemap/cachemaptest.cxx @@ -44,13 +44,13 @@ template< typename Cont, typename ContRef, typename Obj > sal_uInt32 test(Obj *) { ContRef xCont(new Cont); - rtl::OUString aPrefix("key"); + OUString aPrefix("key"); sal_uInt32 nTimer = osl_getGlobalTimer(); for (int i = 0; i < 100000; i += 5) { - rtl::OUString + OUString aKey0(aPrefix - + rtl::OUString::valueOf(static_cast< sal_Int32 >( + + OUString::valueOf(static_cast< sal_Int32 >( i % 100))); rtl::Reference< Obj > xObj01(xCont->get(aKey0)); for (int j = 0; j < 50; ++j) @@ -63,9 +63,9 @@ sal_uInt32 test(Obj *) rtl::Reference< Obj > xRef(xObj02); } - rtl::OUString + OUString aKey1(aPrefix - + rtl::OUString::valueOf(static_cast< sal_Int32 >( + + OUString::valueOf(static_cast< sal_Int32 >( (i + 1) % 100))); rtl::Reference< Obj > xObj11(xCont->get(aKey1)); for (int j = 0; j < 50; ++j) @@ -78,9 +78,9 @@ sal_uInt32 test(Obj *) rtl::Reference< Obj > xRef(xObj12); } - rtl::OUString + OUString aKey2(aPrefix - + rtl::OUString::valueOf(static_cast< sal_Int32 >( + + OUString::valueOf(static_cast< sal_Int32 >( (i + 2) % 100))); rtl::Reference< Obj > xObj21(xCont->get(aKey2)); for (int j = 0; j < 50; ++j) @@ -93,9 +93,9 @@ sal_uInt32 test(Obj *) rtl::Reference< Obj > xRef(xObj22); } - rtl::OUString + OUString aKey3(aPrefix - + rtl::OUString::valueOf(static_cast< sal_Int32 >( + + OUString::valueOf(static_cast< sal_Int32 >( (i + 3) % 100))); rtl::Reference< Obj > xObj31(xCont->get(aKey3)); for (int j = 0; j < 50; ++j) @@ -108,9 +108,9 @@ sal_uInt32 test(Obj *) rtl::Reference< Obj > xRef(xObj32); } - rtl::OUString + OUString aKey4(aPrefix - + rtl::OUString::valueOf(static_cast< sal_Int32 >( + + OUString::valueOf(static_cast< sal_Int32 >( (i + 4) % 100))); rtl::Reference< Obj > xObj41(xCont->get(aKey4)); for (int j = 0; j < 50; ++j) diff --git a/ucb/workben/ucb/srcharg.cxx b/ucb/workben/ucb/srcharg.cxx index fb88da135c31..f6f417bf0f88 100644 --- a/ucb/workben/ucb/srcharg.cxx +++ b/ucb/workben/ucb/srcharg.cxx @@ -293,7 +293,7 @@ bool parseSearchArgument(String const & rInput, ucb::SearchInfo & rInfo) if (c == '"') { bHasOperand = true; - aTheOperand <<= rtl::OUString(aString); + aTheOperand <<= OUString(aString); nOperatorID = pTheOperator->m_nText; q = r; break; diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index 27fd41540777..e0818b9a48d3 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -166,7 +166,7 @@ class TestOutputStream: public cppu::OWeakObject, public io::XOutputStream { - rtl::OUString m_sStart; + OUString m_sStart; bool m_bMore; public: @@ -187,7 +187,7 @@ public: virtual void SAL_CALL closeOutput() throw() {}; - rtl::OUString getStart() const; + OUString getStart() const; }; //============================================================================ @@ -214,17 +214,17 @@ void SAL_CALL TestOutputStream::writeBytes( m_bMore = true; } m_sStart - += rtl::OUString(reinterpret_cast< const sal_Char * >(rData. + += OUString(reinterpret_cast< const sal_Char * >(rData. getConstArray()), nLen, RTL_TEXTENCODING_ISO_8859_1); } //============================================================================ -rtl::OUString TestOutputStream::getStart() const +OUString TestOutputStream::getStart() const { - rtl::OUString sResult = m_sStart; + OUString sResult = m_sStart; if (m_bMore) - sResult += rtl::OUString("..."); + sResult += OUString("..."); return sResult; } @@ -240,7 +240,7 @@ class ProgressHandler: { MessagePrinter & m_rPrinter; - rtl::OUString toString(const uno::Any & rStatus); + OUString toString(const uno::Any & rStatus); public: ProgressHandler(MessagePrinter & rThePrinter): m_rPrinter(rThePrinter) {} @@ -264,39 +264,39 @@ public: virtual void SAL_CALL pop() throw (uno::RuntimeException); }; -rtl::OUString ProgressHandler::toString(const uno::Any & rStatus) +OUString ProgressHandler::toString(const uno::Any & rStatus) { ucb::CHAOSProgressStart aStart; if (rStatus >>= aStart) { - rtl::OUString sResult; + OUString sResult; if (aStart.Text.getLength() > 0) { sResult = aStart.Text; - sResult += rtl::OUString(" "); + sResult += OUString(" "); } - sResult += rtl::OUString("["); - sResult += rtl::OUString::valueOf(aStart.Minimum); - sResult += rtl::OUString(".."); - sResult += rtl::OUString::valueOf(aStart.Maximum); - sResult += rtl::OUString("]"); + sResult += OUString("["); + sResult += OUString::valueOf(aStart.Minimum); + sResult += OUString(".."); + sResult += OUString::valueOf(aStart.Maximum); + sResult += OUString("]"); return sResult; } - rtl::OUString sText; + OUString sText; if (rStatus >>= sText) return sText; sal_Int32 nValue; if (rStatus >>= nValue) { - rtl::OUString sResult(".."); - sResult += rtl::OUString::valueOf(nValue); - sResult += rtl::OUString(".."); - return rtl::OUString(sResult); + OUString sResult(".."); + sResult += OUString::valueOf(nValue); + sResult += OUString(".."); + return OUString(sResult); } - return rtl::OUString("(Unknown object)"); + return OUString("(Unknown object)"); } //============================================================================ @@ -316,7 +316,7 @@ ProgressHandler::queryInterface( const uno::Type & rType ) void SAL_CALL ProgressHandler::push(const uno::Any & rStatus) throw (uno::RuntimeException) { - rtl::OUString sMessage("Status push: "); + OUString sMessage("Status push: "); sMessage += toString(rStatus); m_rPrinter.print(sMessage); } @@ -326,7 +326,7 @@ void SAL_CALL ProgressHandler::push(const uno::Any & rStatus) void SAL_CALL ProgressHandler::update(const uno::Any & rStatus) throw (uno::RuntimeException) { - rtl::OUString sMessage("Status update: "); + OUString sMessage("Status update: "); sMessage += toString(rStatus); m_rPrinter.print(sMessage); } @@ -352,16 +352,16 @@ private: uno::Reference< lang::XMultiServiceFactory > m_xFac; uno::Reference< ucb::XContentProvider > m_xProv; uno::Reference< ucb::XContentIdentifierFactory > m_xIdFac; - rtl::OUString m_aConfigurationKey1; - rtl::OUString m_aConfigurationKey2; + OUString m_aConfigurationKey1; + OUString m_aConfigurationKey2; sal_Bool m_bInited : 1; - static rtl::OUString getUnoURL(); + static OUString getUnoURL(); public: Ucb( uno::Reference< lang::XMultiServiceFactory >& rxFactory, - rtl::OUString const & rConfigurationKey1, - rtl::OUString const & rConfigurationKey2 ); + OUString const & rConfigurationKey1, + OUString const & rConfigurationKey2 ); ~Ucb(); sal_Bool init(); @@ -374,30 +374,30 @@ public: uno::Reference< ucb::XContentProvider > getContentProvider(); - static rtl::OUString m_aProtocol; + static OUString m_aProtocol; }; // static -rtl::OUString Ucb::m_aProtocol; +OUString Ucb::m_aProtocol; //------------------------------------------------------------------------- // static -rtl::OUString Ucb::getUnoURL() +OUString Ucb::getUnoURL() { - rtl::OUString aUnoURL( + OUString aUnoURL( "uno:socket,host=localhost,port=8121;"); if (m_aProtocol.getLength() == 0) - aUnoURL += rtl::OUString("urp"); + aUnoURL += OUString("urp"); else aUnoURL += m_aProtocol; - aUnoURL += rtl::OUString(";UCB.Factory"); + aUnoURL += OUString(";UCB.Factory"); return aUnoURL; } //------------------------------------------------------------------------- Ucb::Ucb( uno::Reference< lang::XMultiServiceFactory >& rxFactory, - rtl::OUString const & rConfigurationKey1, - rtl::OUString const & rConfigurationKey2 ) + OUString const & rConfigurationKey1, + OUString const & rConfigurationKey2 ) : m_xFac( rxFactory ), m_aConfigurationKey1( rConfigurationKey1 ), m_aConfigurationKey2( rConfigurationKey2 ), @@ -594,7 +594,7 @@ public: virtual ~UcbCommandProcessor(); - uno::Any executeCommand( const rtl::OUString& rName, + uno::Any executeCommand( const OUString& rName, const uno::Any& rArgument, bool bPrint = true ); }; @@ -626,7 +626,7 @@ UcbCommandProcessor::~UcbCommandProcessor() } //---------------------------------------------------------------------------- -uno::Any UcbCommandProcessor::executeCommand( const rtl::OUString& rName, +uno::Any UcbCommandProcessor::executeCommand( const OUString& rName, const uno::Any& rArgument, bool bPrint ) { @@ -742,23 +742,23 @@ public: uno::Sequence< ucb::CommandInfo > getCommands(); uno::Sequence< beans::Property > getProperties(); - uno::Any getPropertyValue( const rtl::OUString& rName ); - void setPropertyValue( const rtl::OUString& rName, const uno::Any& rValue ); - void addProperty ( const rtl::OUString& rName, const uno::Any& rValue ); - void removeProperty ( const rtl::OUString& rName ); + uno::Any getPropertyValue( const OUString& rName ); + void setPropertyValue( const OUString& rName, const uno::Any& rValue ); + void addProperty ( const OUString& rName, const uno::Any& rValue ); + void removeProperty ( const OUString& rName ); - rtl::OUString getStringPropertyValue( const rtl::OUString& rName ); - void setStringPropertyValue( const rtl::OUString& rName, - const rtl::OUString& rValue ); - void addStringProperty( const rtl::OUString& rName, - const rtl::OUString& rValue ); - void open( const rtl::OUString & rName, const OUString& rInput, + OUString getStringPropertyValue( const OUString& rName ); + void setStringPropertyValue( const OUString& rName, + const OUString& rValue ); + void addStringProperty( const OUString& rName, + const OUString& rValue ); + void open( const OUString & rName, const OUString& rInput, bool bPrint, bool bTiming, bool bSort, OpenStack * pStack = 0, sal_uInt32 nLevel = 0, sal_Int32 nFetchSize = 0 ); void openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort, sal_Int32 nFetchSize ); - void transfer( const rtl::OUString& rSourceURL, sal_Bool bMove ); + void transfer( const OUString& rSourceURL, sal_Bool bMove ); void destroy(); // XInterface @@ -860,7 +860,7 @@ UcbContent* UcbContent::create( { // Empty sequence -> interested in any property changes. xNotifier->addPropertiesChangeListener( - uno::Sequence< rtl::OUString >(), pNew ); + uno::Sequence< OUString >(), pNew ); } return pNew; @@ -893,7 +893,7 @@ void UcbContent::dispose() } //---------------------------------------------------------------------------- -void UcbContent::open( const rtl::OUString & rName, const OUString& rInput, +void UcbContent::open( const OUString & rName, const OUString& rInput, bool bPrint, bool bTiming, bool bSort, OpenStack * pStack, sal_uInt32 nLevel, sal_Int32 nFetchSize ) @@ -912,18 +912,18 @@ void UcbContent::open( const rtl::OUString & rName, const OUString& rInput, return; } aArgument.Properties.realloc(5); - aArgument.Properties[0].Name = rtl::OUString("Title"); + aArgument.Properties[0].Name = OUString("Title"); aArgument.Properties[0].Handle = -1; aArgument.Properties[1].Name - = rtl::OUString("DateCreated"); + = OUString("DateCreated"); aArgument.Properties[1].Handle = -1; - aArgument.Properties[2].Name = rtl::OUString("Size"); + aArgument.Properties[2].Name = OUString("Size"); aArgument.Properties[2].Handle = -1; aArgument.Properties[3].Name - = rtl::OUString("IsFolder"); + = OUString("IsFolder"); aArgument.Properties[3].Handle = -1; aArgument.Properties[4].Name - = rtl::OUString("IsDocument"); + = OUString("IsDocument"); aArgument.Properties[4].Handle = -1; aArg <<= aArgument; } @@ -936,19 +936,19 @@ void UcbContent::open( const rtl::OUString & rName, const OUString& rInput, // Property values which shall be in the result set... uno::Sequence< beans::Property > aProps( 5 ); beans::Property* pProps = aProps.getArray(); - pProps[ 0 ].Name = rtl::OUString("Title"); + pProps[ 0 ].Name = OUString("Title"); pProps[ 0 ].Handle = -1; // Important! -/**/ pProps[ 0 ].Type = getCppuType(static_cast< rtl::OUString * >(0)); +/**/ pProps[ 0 ].Type = getCppuType(static_cast< OUString * >(0)); // HACK for sorting... - pProps[ 1 ].Name = rtl::OUString("DateCreated"); + pProps[ 1 ].Name = OUString("DateCreated"); pProps[ 1 ].Handle = -1; // Important! - pProps[ 2 ].Name = rtl::OUString("Size"); + pProps[ 2 ].Name = OUString("Size"); pProps[ 2 ].Handle = -1; // Important! - pProps[ 3 ].Name = rtl::OUString("IsFolder"); + pProps[ 3 ].Name = OUString("IsFolder"); pProps[ 3 ].Handle = -1; // Important! /**/ pProps[ 3 ].Type = getCppuType(static_cast< sal_Bool * >(0)); // HACK for sorting... - pProps[ 4 ].Name = rtl::OUString("IsDocument"); + pProps[ 4 ].Name = OUString("IsDocument"); pProps[ 4 ].Handle = -1; // Important! aOpenArg.Properties = aProps; @@ -1000,7 +1000,7 @@ void UcbContent::open( const rtl::OUString & rName, const OUString& rInput, m_rUCB. getServiceFactory()-> createInstance( - rtl::OUString( "com.sun.star.ucb.SortedDynamic" + OUString( "com.sun.star.ucb.SortedDynamic" "ResultSetFactory")), uno::UNO_QUERY); uno::Reference< ucb::XDynamicResultSet > xSorted; @@ -1039,7 +1039,7 @@ void UcbContent::open( const rtl::OUString & rName, const OUString& rInput, try { xProperties-> - setPropertyValue(rtl::OUString( "FetchSize"), + setPropertyValue(OUString( "FetchSize"), uno::makeAny(nFetchSize)); bSet = true; } @@ -1228,7 +1228,7 @@ void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort, } //---------------------------------------------------------------------------- -void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove ) +void UcbContent::transfer( const OUString& rSourceURL, sal_Bool bMove ) { if ( bMove ) print( "Moving content..." ); @@ -1246,11 +1246,11 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove ) : ucb::TransferCommandOperation_COPY, rSourceURL, getURL(), - rtl::OUString(), - //rtl::OUString("NewTitle"), + OUString(), + //OUString("NewTitle"), ucb::NameClash::ERROR ); - ucb::Command aTransferCommand( rtl::OUString( "globalTransfer" ), + ucb::Command aTransferCommand( OUString( "globalTransfer" ), -1, uno::makeAny( aArg ) ); @@ -1282,10 +1282,10 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove ) uno::Any aArg; aArg <<= ucb::TransferInfo( - bMove, rSourceURL, rtl::OUString(), ucb::NameClash::ERROR ); - executeCommand( rtl::OUString("transfer"), aArg ); + bMove, rSourceURL, OUString(), ucb::NameClash::ERROR ); + executeCommand( OUString("transfer"), aArg ); -// executeCommand( rtl::OUString("flush"), Any() ); +// executeCommand( OUString("flush"), Any() ); #endif } @@ -1297,16 +1297,16 @@ void UcbContent::destroy() uno::Any aArg; aArg <<= sal_Bool( sal_True ); // delete physically, not only to trash. - executeCommand( rtl::OUString("delete"), aArg ); + executeCommand( OUString("delete"), aArg ); -// executeCommand( rtl::OUString("flush"), Any() ); +// executeCommand( OUString("flush"), Any() ); } //------------------------------------------------------------------------- uno::Sequence< ucb::CommandInfo > UcbContent::getCommands() { uno::Any aResult = executeCommand( - rtl::OUString("getCommandInfo"), uno::Any() ); + OUString("getCommandInfo"), uno::Any() ); uno::Reference< ucb::XCommandInfo > xInfo; if ( aResult >>= xInfo ) @@ -1334,7 +1334,7 @@ uno::Sequence< ucb::CommandInfo > UcbContent::getCommands() uno::Sequence< beans::Property > UcbContent::getProperties() { uno::Any aResult = executeCommand( - rtl::OUString("getPropertySetInfo"), uno::Any() ); + OUString("getPropertySetInfo"), uno::Any() ); uno::Reference< beans::XPropertySetInfo > xInfo; if ( aResult >>= xInfo ) @@ -1358,7 +1358,7 @@ uno::Sequence< beans::Property > UcbContent::getProperties() } //---------------------------------------------------------------------------- -uno::Any UcbContent::getPropertyValue( const rtl::OUString& rName ) +uno::Any UcbContent::getPropertyValue( const OUString& rName ) { uno::Sequence< beans::Property > aProps( 1 ); beans::Property& rProp = aProps.getArray()[ 0 ]; @@ -1372,7 +1372,7 @@ uno::Any UcbContent::getPropertyValue( const rtl::OUString& rName ) aArg <<= aProps; uno::Any aResult = executeCommand( - rtl::OUString("getPropertyValues"), aArg ); + OUString("getPropertyValues"), aArg ); uno::Reference< sdbc::XRow > xValues; if ( aResult >>= xValues ) @@ -1384,13 +1384,13 @@ uno::Any UcbContent::getPropertyValue( const rtl::OUString& rName ) } //---------------------------------------------------------------------------- -rtl::OUString UcbContent::getStringPropertyValue( const rtl::OUString& rName ) +OUString UcbContent::getStringPropertyValue( const OUString& rName ) { uno::Any aAny = getPropertyValue( rName ); - if ( aAny.getValueType() == getCppuType( (const ::rtl::OUString *)0 ) ) + if ( aAny.getValueType() == getCppuType( (const OUString *)0 ) ) { - const rtl::OUString aValue( - * static_cast< const rtl::OUString * >( aAny.getValue() ) ); + const OUString aValue( + * static_cast< const OUString * >( aAny.getValue() ) ); OUString aText = rName + " value: '" + aValue + "'"; print( aText ); @@ -1399,11 +1399,11 @@ rtl::OUString UcbContent::getStringPropertyValue( const rtl::OUString& rName ) } print( "getStringPropertyValue failed!" ); - return rtl::OUString(); + return OUString(); } //---------------------------------------------------------------------------- -void UcbContent::setPropertyValue( const rtl::OUString& rName, +void UcbContent::setPropertyValue( const OUString& rName, const uno::Any& rValue ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); @@ -1417,15 +1417,15 @@ void UcbContent::setPropertyValue( const rtl::OUString& rName, uno::Any aArg; aArg <<= aProps; - executeCommand( rtl::OUString("setPropertyValues"), + executeCommand( OUString("setPropertyValues"), aArg ); -// executeCommand( rtl::OUString("flush"), Any() ); +// executeCommand( OUString("flush"), Any() ); } //---------------------------------------------------------------------------- -void UcbContent::setStringPropertyValue( const rtl::OUString& rName, - const rtl::OUString& rValue ) +void UcbContent::setStringPropertyValue( const OUString& rName, + const OUString& rValue ) { uno::Any aAny; aAny <<= rValue; @@ -1436,7 +1436,7 @@ void UcbContent::setStringPropertyValue( const rtl::OUString& rName, } //---------------------------------------------------------------------------- -void UcbContent::addProperty( const rtl::OUString& rName, +void UcbContent::addProperty( const OUString& rName, const uno::Any& rValue ) { uno::Reference< beans::XPropertyContainer > xContainer( m_xContent, @@ -1475,7 +1475,7 @@ void UcbContent::addProperty( const rtl::OUString& rName, //---------------------------------------------------------------------------- void UcbContent::addStringProperty( - const rtl::OUString& rName, const rtl::OUString& rValue ) + const OUString& rName, const OUString& rValue ) { uno::Any aValue; aValue <<= rValue; @@ -1483,7 +1483,7 @@ void UcbContent::addStringProperty( } //---------------------------------------------------------------------------- -void UcbContent::removeProperty( const rtl::OUString& rName ) +void UcbContent::removeProperty( const OUString& rName ) { uno::Reference< beans::XPropertyContainer > xContainer( m_xContent, uno::UNO_QUERY ); @@ -1694,8 +1694,8 @@ private: public: MyWin( Window *pParent, WinBits nWinStyle, uno::Reference< lang::XMultiServiceFactory >& rxFactory, - rtl::OUString const & rConfigurationKey1, - rtl::OUString const & rConfigurationKey2 ); + OUString const & rConfigurationKey1, + OUString const & rConfigurationKey2 ); virtual ~MyWin(); void Resize( void ); @@ -1708,8 +1708,8 @@ public: //------------------------------------------------------------------------- MyWin::MyWin( Window *pParent, WinBits nWinStyle, uno::Reference< lang::XMultiServiceFactory >& rxFactory, - rtl::OUString const & rConfigurationKey1, - rtl::OUString const & rConfigurationKey2 ) + OUString const & rConfigurationKey1, + OUString const & rConfigurationKey2 ) : WorkWindow( pParent, nWinStyle ), m_pTool( NULL ), m_pOutEdit( NULL ), @@ -2010,7 +2010,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) if ( m_pContent ) m_pContent->addStringProperty( aCmdLine, - rtl::OUString("DefaultValue") ); + OUString("DefaultValue") ); else print( "No content!" ); @@ -2036,7 +2036,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) if ( m_pContent ) m_pContent->setStringPropertyValue( aCmdLine, - rtl::OUString("NewValue") ); + OUString("NewValue") ); else print( "No content!" ); @@ -2044,7 +2044,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) case MYWIN_ITEMID_OPEN: if ( m_pContent ) - m_pContent->open(rtl::OUString("open"), + m_pContent->open(OUString("open"), aCmdLine, !m_bTiming, m_bTiming, m_bSort, 0, 0, m_nFetchSize); else @@ -2063,7 +2063,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) case MYWIN_ITEMID_UPDATE: if ( m_pContent ) - m_pContent->open(rtl::OUString("update"), + m_pContent->open(OUString("update"), aCmdLine, !m_bTiming, m_bTiming, m_bSort, 0, 0, m_nFetchSize); else @@ -2073,7 +2073,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) case MYWIN_ITEMID_SYNCHRONIZE: if ( m_pContent ) - m_pContent->open(rtl::OUString("synchronize"), + m_pContent->open(OUString("synchronize"), aCmdLine, !m_bTiming, m_bTiming, m_bSort, 0, 0, m_nFetchSize); else @@ -2083,7 +2083,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) case MYWIN_ITEMID_SEARCH: if ( m_pContent ) - m_pContent->open(rtl::OUString("search"), + m_pContent->open(OUString("search"), aCmdLine, !m_bTiming, m_bTiming, m_bSort, 0, 0, m_nFetchSize); else @@ -2094,7 +2094,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) case MYWIN_ITEMID_REORGANIZE: if ( m_pContent ) m_pContent->executeCommand ( - rtl::OUString("reorganizeData"), + OUString("reorganizeData"), uno::Any()); else print( "No content!" ); @@ -2155,7 +2155,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) DBG_ASSERT(xManager.is(), "MyWin::ToolBarHandler(): Service lacks interface"); - rtl::OUString aURL(getLocalFileURL()); + OUString aURL(getLocalFileURL()); String aText("Local file URL: "); aText += String(aURL); @@ -2205,11 +2205,11 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) break; } - rtl::OUString aName; + OUString aName; uno::Any aArgument; if (nItemId == MYWIN_ITEMID_OFFLINE) { - aName = rtl::OUString("goOffline"); + aName = OUString("goOffline"); uno::Sequence< uno::Reference< ucb::XContentIdentifier > > @@ -2220,7 +2220,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) aArgument <<= aIdentifiers; } else - aName = rtl::OUString("goOnline"); + aName = OUString("goOnline"); UcbCommandProcessor(m_aUCB, xProcessor, m_pOutEdit). executeCommand(aName, aArgument); @@ -2256,8 +2256,8 @@ void MyApp::Main() // Read command line params. ////////////////////////////////////////////////////////////////////// - rtl::OUString aConfigurationKey1( UCB_CONFIGURATION_KEY1_LOCAL); - rtl::OUString aConfigurationKey2( UCB_CONFIGURATION_KEY2_OFFICE); + OUString aConfigurationKey1( UCB_CONFIGURATION_KEY1_LOCAL); + OUString aConfigurationKey2( UCB_CONFIGURATION_KEY2_OFFICE); USHORT nParams = Application::GetCommandLineParamCount(); for ( USHORT n = 0; n < nParams; ++n ) @@ -2273,7 +2273,7 @@ void MyApp::Main() { aConfigurationKey1 = aParam.Copy(RTL_CONSTASCII_LENGTH("-key=")); - aConfigurationKey2 = rtl::OUString(); + aConfigurationKey2 = OUString(); } else { diff --git a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx index c5e415b4c55b..67e000b33fb3 100644 --- a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx +++ b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx @@ -92,7 +92,7 @@ UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::ucb::IOEr const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rMessage = rtl::OUString(), + const OUString & rMessage = OUString(), const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandProcessor > & xContext = 0 ) diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx index 3cdee465bda0..0c5a2b45db5b 100644 --- a/ucbhelper/inc/ucbhelper/content.hxx +++ b/ucbhelper/inc/ucbhelper/content.hxx @@ -100,7 +100,7 @@ class UCBHELPER_DLLPUBLIC Content protected: ::com::sun::star::uno::Any createCursorAny( const ::com::sun::star::uno::Sequence< - rtl::OUString >& rPropertyNames, + OUString >& rPropertyNames, ResultSetInclude eMode ) throw( ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException, @@ -121,7 +121,7 @@ public: * implementation to interact with the client and to propagate * errors. */ - Content( const rtl::OUString& rURL, + Content( const OUString& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& rEnv, const ::com::sun::star::uno::Reference< @@ -178,7 +178,7 @@ public: * @return true, if the operation was successful - false, otherwise. */ static sal_Bool - create( const rtl::OUString& rURL, + create( const OUString& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& rEnv, const ::com::sun::star::uno::Reference< @@ -210,7 +210,7 @@ public: * * @return the URL of the content. */ - const ::rtl::OUString& getURL() const; + const OUString& getURL() const; ////////////////////////////////////////////////////////////////////// // Command environment. @@ -276,7 +276,7 @@ public: * @return the property value. */ ::com::sun::star::uno::Any - getPropertyValue( const rtl::OUString& rPropertyName ) + getPropertyValue( const OUString& rPropertyName ) throw( ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); @@ -305,7 +305,7 @@ public: * com::sun::star::ucb::IOErrorCode::ACCESS_DENIED. */ ::com::sun::star::uno::Any - setPropertyValue( const rtl::OUString& rPropertyName, + setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException, @@ -319,7 +319,7 @@ public: */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > getPropertyValues( const ::com::sun::star::uno::Sequence< - rtl::OUString >& rPropertyNames ) + OUString >& rPropertyNames ) throw( ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); @@ -332,7 +332,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > getPropertyValuesInterface( const ::com::sun::star::uno::Sequence< - rtl::OUString >& rPropertyNames ) + OUString >& rPropertyNames ) throw( ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); @@ -369,7 +369,7 @@ public: */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > setPropertyValues( const ::com::sun::star::uno::Sequence< - rtl::OUString >& rPropertyNames, + OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw( ::com::sun::star::ucb::CommandAbortedException, @@ -391,7 +391,7 @@ public: * @return the result of the command according to its specification. */ ::com::sun::star::uno::Any - executeCommand( const rtl::OUString& rCommandName, + executeCommand( const OUString& rCommandName, const ::com::sun::star::uno::Any& rCommandArgument ) throw( ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException, @@ -418,7 +418,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > createCursor( const ::com::sun::star::uno::Sequence< - rtl::OUString >& rPropertyNames, + OUString >& rPropertyNames, ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ) throw( ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException, @@ -440,7 +440,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > createDynamicCursor( const ::com::sun::star::uno::Sequence< - rtl::OUString >& rPropertyNames, + OUString >& rPropertyNames, ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ) throw( ::com::sun::star::ucb::CommandAbortedException, @@ -448,7 +448,7 @@ public: ::com::sun::star::uno::Exception ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > - createSortedCursor( const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames, + createSortedCursor( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompareFactory > rAnyCompareFactory, ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ) @@ -595,9 +595,9 @@ public: * with the new content. */ sal_Bool - insertNewContent( const ::rtl::OUString& rContentType, + insertNewContent( const OUString& rContentType, const ::com::sun::star::uno::Sequence< - rtl::OUString >& rPropertyNames, + OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rPropertyValues, Content& rNewContent ) @@ -631,9 +631,9 @@ public: * with the new content. */ sal_Bool - insertNewContent( const ::rtl::OUString& rContentType, + insertNewContent( const OUString& rContentType, const ::com::sun::star::uno::Sequence< - rtl::OUString >& rPropertyNames, + OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rPropertyValues, const ::com::sun::star::uno::Reference< @@ -674,12 +674,12 @@ public: sal_Bool transferContent( const Content& rSourceContent, InsertOperation eOperation, - const ::rtl::OUString & rTitle, + const OUString & rTitle, const sal_Int32 nNameClashAction, - const ::rtl::OUString & rMimeType = ::rtl::OUString( ), + const OUString & rMimeType = OUString( ), bool bMajorVersion = false, - const ::rtl::OUString & rCommentVersion = ::rtl::OUString( ), - ::rtl::OUString* pResultURL = NULL ) + const OUString & rCommentVersion = OUString( ), + OUString* pResultURL = NULL ) throw( ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); diff --git a/ucbhelper/inc/ucbhelper/contenthelper.hxx b/ucbhelper/inc/ucbhelper/contenthelper.hxx index 72049d76290b..e903d97f193a 100644 --- a/ucbhelper/inc/ucbhelper/contenthelper.hxx +++ b/ucbhelper/inc/ucbhelper/contenthelper.hxx @@ -148,7 +148,7 @@ private: * be returned. If your content has more than one parent you may * return the URL of one "preferred" parent or an empty string. */ - UCBHELPER_DLLPRIVATE virtual ::rtl::OUString getParentURL() = 0; + UCBHELPER_DLLPRIVATE virtual OUString getParentURL() = 0; protected: /** @@ -266,8 +266,8 @@ protected: * children described by rOldKey shall be renamed too. * @return True, if the operation succeeded - False, otherwise. */ - sal_Bool renameAdditionalPropertySet( const ::rtl::OUString& rOldKey, - const ::rtl::OUString& rNewKey, + sal_Bool renameAdditionalPropertySet( const OUString& rOldKey, + const OUString& rNewKey, sal_Bool bRecursive ); /** @@ -280,8 +280,8 @@ protected: * children described by rSourceKey shall be copied too. * @return True, if the operation succeeded - False, otherwise. */ - sal_Bool copyAdditionalPropertySet( const ::rtl::OUString& rSourceKey, - const ::rtl::OUString& rTargetKey, + sal_Bool copyAdditionalPropertySet( const OUString& rSourceKey, + const OUString& rTargetKey, sal_Bool bRecursive ); /** @@ -330,13 +330,13 @@ public: XTYPEPROVIDER_DECL() // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) = 0; virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) = 0; @@ -358,7 +358,7 @@ public: com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier() throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ) = 0; virtual void SAL_CALL @@ -391,13 +391,13 @@ public: // XPropertiesChangeNotifier virtual void SAL_CALL addPropertiesChangeListener( - const com::sun::star::uno::Sequence< rtl::OUString >& PropertyNames, + const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removePropertiesChangeListener( - const com::sun::star::uno::Sequence< rtl::OUString >& PropertyNames, + const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw( com::sun::star::uno::RuntimeException ); @@ -427,7 +427,7 @@ public: * implementation of getPropertyInfoTable. */ virtual void SAL_CALL - addProperty( const rtl::OUString& Name, + addProperty( const OUString& Name, sal_Int16 Attributes, const com::sun::star::uno::Any& DefaultValue ) throw( com::sun::star::beans::PropertyExistException, @@ -446,7 +446,7 @@ public: * implementation of getPropertyInfoTable. */ virtual void SAL_CALL - removeProperty( const rtl::OUString& Name ) + removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException ); diff --git a/ucbhelper/inc/ucbhelper/contentidentifier.hxx b/ucbhelper/inc/ucbhelper/contentidentifier.hxx index 31f0a276ea36..89573d52cc73 100644 --- a/ucbhelper/inc/ucbhelper/contentidentifier.hxx +++ b/ucbhelper/inc/ucbhelper/contentidentifier.hxx @@ -48,7 +48,7 @@ class UCBHELPER_DLLPUBLIC ContentIdentifier : public com::sun::star::ucb::XContentIdentifier { public: - ContentIdentifier( const rtl::OUString& rURL ); + ContentIdentifier( const OUString& rURL ); virtual ~ContentIdentifier(); // XInterface @@ -69,10 +69,10 @@ public: throw( com::sun::star::uno::RuntimeException ); // XContentIdentifier - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentIdentifier() throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentProviderScheme() throw( com::sun::star::uno::RuntimeException ); diff --git a/ucbhelper/inc/ucbhelper/contentinfo.hxx b/ucbhelper/inc/ucbhelper/contentinfo.hxx index 77dcd5850e58..347c86304359 100644 --- a/ucbhelper/inc/ucbhelper/contentinfo.hxx +++ b/ucbhelper/inc/ucbhelper/contentinfo.hxx @@ -58,7 +58,7 @@ class PropertySetInfo : ContentImplHelper* m_pContent; private: - sal_Bool queryProperty( const rtl::OUString& rName, + sal_Bool queryProperty( const OUString& rName, com::sun::star::beans::Property& rProp ); public: @@ -79,11 +79,11 @@ public: getProperties() throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::beans::Property SAL_CALL - getPropertyByName( const rtl::OUString& aName ) + getPropertyByName( const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasPropertyByName( const rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw( com::sun::star::uno::RuntimeException ); // Non-Interface methods. @@ -114,7 +114,7 @@ class CommandProcessorInfo : ContentImplHelper* m_pContent; private: - sal_Bool queryCommand( const rtl::OUString& rName, + sal_Bool queryCommand( const OUString& rName, com::sun::star::ucb::CommandInfo& rCommand ); sal_Bool queryCommand( sal_Int32 nHandle, com::sun::star::ucb::CommandInfo& rCommand ); @@ -137,7 +137,7 @@ public: getCommands() throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::ucb::CommandInfo SAL_CALL - getCommandInfoByName( const rtl::OUString& Name ) + getCommandInfoByName( const OUString& Name ) throw( com::sun::star::ucb::UnsupportedCommandException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::ucb::CommandInfo SAL_CALL @@ -145,7 +145,7 @@ public: throw( com::sun::star::ucb::UnsupportedCommandException, com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasCommandByName( const rtl::OUString& Name ) + hasCommandByName( const OUString& Name ) throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) diff --git a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx index b044c31db7c8..40c23045e5d4 100644 --- a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx +++ b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx @@ -43,7 +43,7 @@ namespace ucbhelper { either a 'root' URL for the most 'local' file content provider, or an empty string, if no such URL can meaningfully be constructed. */ -UCBHELPER_DLLPUBLIC rtl::OUString getLocalFileURL() +UCBHELPER_DLLPUBLIC OUString getLocalFileURL() SAL_THROW((com::sun::star::uno::RuntimeException)); //============================================================================ @@ -70,13 +70,13 @@ UCBHELPER_DLLPUBLIC rtl::OUString getLocalFileURL() @see com::sun::star::ucb::XFileIdentiferConverter::getFileURLFromSystemPath(). */ -UCBHELPER_DLLPUBLIC rtl::OUString +UCBHELPER_DLLPUBLIC OUString getFileURLFromSystemPath( com::sun::star::uno::Reference< com::sun::star::ucb::XUniversalContentBroker > const & rUcb, - rtl::OUString const & rBaseURL, - rtl::OUString const & rSystemPath) + OUString const & rBaseURL, + OUString const & rSystemPath) SAL_THROW((com::sun::star::uno::RuntimeException)); //============================================================================ @@ -100,12 +100,12 @@ getFileURLFromSystemPath( @see com::sun::star::ucb::XFileIdentiferConverter::getSystemPathFromFileURL(). */ -UCBHELPER_DLLPUBLIC rtl::OUString +UCBHELPER_DLLPUBLIC OUString getSystemPathFromFileURL( com::sun::star::uno::Reference< com::sun::star::ucb::XUniversalContentBroker > const & rUcb, - rtl::OUString const & rURL) + OUString const & rURL) SAL_THROW((com::sun::star::uno::RuntimeException)); } diff --git a/ucbhelper/inc/ucbhelper/interactionrequest.hxx b/ucbhelper/inc/ucbhelper/interactionrequest.hxx index 5a8b3d545cf8..6de19931238c 100644 --- a/ucbhelper/inc/ucbhelper/interactionrequest.hxx +++ b/ucbhelper/inc/ucbhelper/interactionrequest.hxx @@ -337,10 +337,10 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication : m_aRememberPasswordModes; com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > m_aRememberAccountModes; - rtl::OUString m_aRealm; - rtl::OUString m_aUserName; - rtl::OUString m_aPassword; - rtl::OUString m_aAccount; + OUString m_aRealm; + OUString m_aUserName; + OUString m_aPassword; + OUString m_aAccount; com::sun::star::ucb::RememberAuthentication m_eRememberPasswordMode; com::sun::star::ucb::RememberAuthentication m_eDefaultRememberPasswordMode; com::sun::star::ucb::RememberAuthentication m_eRememberAccountMode; @@ -454,21 +454,21 @@ public: canSetRealm() throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setRealm( const rtl::OUString& Realm ) + setRealm( const OUString& Realm ) throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL canSetUserName() throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setUserName( const rtl::OUString& UserName ) + setUserName( const OUString& UserName ) throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL canSetPassword() throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setPassword( const rtl::OUString& Password ) + setPassword( const OUString& Password ) throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Sequence< @@ -484,7 +484,7 @@ public: canSetAccount() throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setAccount( const rtl::OUString& Account ) + setAccount( const OUString& Account ) throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Sequence< @@ -510,7 +510,7 @@ public: * * @return the realm. */ - const rtl::OUString & getRealm() const { return m_aRealm; } + const OUString & getRealm() const { return m_aRealm; } /** * This method returns the username that was supplied by the interaction @@ -518,7 +518,7 @@ public: * * @return the username. */ - const rtl::OUString & getUserName() const { return m_aUserName; } + const OUString & getUserName() const { return m_aUserName; } /** * This method returns the password that was supplied by the interaction @@ -526,7 +526,7 @@ public: * * @return the password. */ - const rtl::OUString & getPassword() const { return m_aPassword; } + const OUString & getPassword() const { return m_aPassword; } /** * This method returns the account that was supplied by the interaction @@ -534,7 +534,7 @@ public: * * @return the account. */ - const rtl::OUString & getAccount() const { return m_aAccount; } + const OUString & getAccount() const { return m_aAccount; } /** * This method returns the authentication remember-mode for the password @@ -634,7 +634,7 @@ class InteractionSupplyName : public InteractionContinuation, public com::sun::star::lang::XTypeProvider, public com::sun::star::ucb::XInteractionSupplyName { - rtl::OUString m_aName; + OUString m_aName; public: InteractionSupplyName( InteractionRequest * pRequest ) @@ -662,7 +662,7 @@ public: throw( com::sun::star::uno::RuntimeException ); // XInteractionSupplyName - virtual void SAL_CALL setName( const ::rtl::OUString& Name ) + virtual void SAL_CALL setName( const OUString& Name ) throw ( com::sun::star::uno::RuntimeException ); // Non-interface methods. @@ -673,7 +673,7 @@ public: * * @return the name. */ - const rtl::OUString & getName() const { return m_aName; } + const OUString & getName() const { return m_aName; } }; //============================================================================ diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx index 386f8f1909ba..2f31e3098545 100644 --- a/ucbhelper/inc/ucbhelper/macros.hxx +++ b/ucbhelper/inc/ucbhelper/macros.hxx @@ -580,19 +580,19 @@ GETTYPES_IMPL_END //========================================================================= #define XSERVICEINFO_NOFACTORY_DECL() \ - virtual rtl::OUString SAL_CALL \ + virtual OUString SAL_CALL \ getImplementationName() \ throw( com::sun::star::uno::RuntimeException ); \ virtual sal_Bool SAL_CALL \ - supportsService( const rtl::OUString& ServiceName ) \ + supportsService( const OUString& ServiceName ) \ throw( com::sun::star::uno::RuntimeException ); \ - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL \ + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL \ getSupportedServiceNames() \ throw( com::sun::star::uno::RuntimeException ); \ \ - static rtl::OUString \ + static OUString \ getImplementationName_Static(); \ - static com::sun::star::uno::Sequence< rtl::OUString > \ + static com::sun::star::uno::Sequence< OUString > \ getSupportedServiceNames_Static(); #define XSERVICEINFO_DECL() \ @@ -610,24 +610,24 @@ GETTYPES_IMPL_END //========================================================================= #define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ -rtl::OUString SAL_CALL Class::getImplementationName() \ +OUString SAL_CALL Class::getImplementationName() \ throw( com::sun::star::uno::RuntimeException ) \ { \ return getImplementationName_Static(); \ } \ \ -rtl::OUString Class::getImplementationName_Static() \ +OUString Class::getImplementationName_Static() \ { \ return ImplName; \ } \ \ sal_Bool SAL_CALL \ -Class::supportsService( const rtl::OUString& ServiceName ) \ +Class::supportsService( const OUString& ServiceName ) \ throw( com::sun::star::uno::RuntimeException ) \ { \ - com::sun::star::uno::Sequence< rtl::OUString > aSNL = \ + com::sun::star::uno::Sequence< OUString > aSNL = \ getSupportedServiceNames(); \ - const rtl::OUString* pArray = aSNL.getArray(); \ + const OUString* pArray = aSNL.getArray(); \ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) \ { \ if( pArray[ i ] == ServiceName ) \ @@ -637,7 +637,7 @@ Class::supportsService( const rtl::OUString& ServiceName ) \ return sal_False; \ } \ \ -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL \ +com::sun::star::uno::Sequence< OUString > SAL_CALL \ Class::getSupportedServiceNames() \ throw( com::sun::star::uno::RuntimeException ) \ { \ @@ -697,17 +697,17 @@ Class::createServiceFactory( const com::sun::star::uno::Reference< \ #define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName ) \ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ \ -com::sun::star::uno::Sequence< rtl::OUString > \ +com::sun::star::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() // 1 service name #define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 ) \ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ \ -com::sun::star::uno::Sequence< rtl::OUString > \ +com::sun::star::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() \ { \ - com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 ); \ + com::sun::star::uno::Sequence< OUString > aSNS( 1 ); \ aSNS.getArray()[ 0 ] = Service1; \ return aSNS; \ } @@ -719,7 +719,7 @@ Class::getSupportedServiceNames_Static() \ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ \ -com::sun::star::uno::Sequence< rtl::OUString > \ +com::sun::star::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() // Own implementation of getSupportedServiceNames_Static(). @@ -727,7 +727,7 @@ Class::getSupportedServiceNames_Static() XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \ \ -com::sun::star::uno::Sequence< rtl::OUString > \ +com::sun::star::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() // 1 service name @@ -735,10 +735,10 @@ Class::getSupportedServiceNames_Static() XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ \ -com::sun::star::uno::Sequence< rtl::OUString > \ +com::sun::star::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() \ { \ - com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 ); \ + com::sun::star::uno::Sequence< OUString > aSNS( 1 ); \ aSNS.getArray()[ 0 ] = Service1; \ return aSNS; \ } @@ -748,10 +748,10 @@ Class::getSupportedServiceNames_Static() \ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \ \ -com::sun::star::uno::Sequence< rtl::OUString > \ +com::sun::star::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() \ { \ - com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 ); \ + com::sun::star::uno::Sequence< OUString > aSNS( 1 ); \ aSNS.getArray()[ 0 ] = Service1; \ return aSNS; \ } diff --git a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx index 7f44794e8428..91459e828ef3 100644 --- a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx +++ b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx @@ -89,7 +89,7 @@ public: wasNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); @@ -176,7 +176,7 @@ public: // XColumnLocate virtual sal_Int32 SAL_CALL - findColumn( const ::rtl::OUString& columnName ) + findColumn( const OUString& columnName ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); @@ -184,60 +184,60 @@ public: // Non-interface methods ////////////////////////////////////////////////////////////////////// - void appendString( const ::rtl::OUString& rPropName, const ::rtl::OUString& rValue ); - void appendString( const sal_Char* pAsciiPropName, const ::rtl::OUString& rValue ) + void appendString( const OUString& rPropName, const OUString& rValue ); + void appendString( const sal_Char* pAsciiPropName, const OUString& rValue ) { - appendString( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); + appendString( OUString::createFromAscii( pAsciiPropName ), rValue ); } - void appendString( const ::com::sun::star::beans::Property& rProp, const ::rtl::OUString& rValue ) + void appendString( const ::com::sun::star::beans::Property& rProp, const OUString& rValue ) { appendString( rProp.Name, rValue ); } - void appendBoolean( const ::rtl::OUString& rPropName, sal_Bool bValue ); + void appendBoolean( const OUString& rPropName, sal_Bool bValue ); void appendBoolean( const sal_Char* pAsciiPropName, sal_Bool bValue ) { - appendBoolean( ::rtl::OUString::createFromAscii( pAsciiPropName ), bValue ); + appendBoolean( OUString::createFromAscii( pAsciiPropName ), bValue ); } void appendBoolean( const ::com::sun::star::beans::Property& rProp, sal_Bool bValue ) { appendBoolean( rProp.Name, bValue ); } - void appendLong( const ::rtl::OUString& rPropName, sal_Int64 nValue ); + void appendLong( const OUString& rPropName, sal_Int64 nValue ); void appendLong( const sal_Char* pAsciiPropName, sal_Int64 nValue ) { - appendLong( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue ); + appendLong( OUString::createFromAscii( pAsciiPropName ), nValue ); } void appendLong( const ::com::sun::star::beans::Property& rProp, sal_Int64 nValue ) { appendLong( rProp.Name, nValue ); } - void appendTimestamp( const ::rtl::OUString& rPropName, const ::com::sun::star::util::DateTime& rValue ); + void appendTimestamp( const OUString& rPropName, const ::com::sun::star::util::DateTime& rValue ); void appendTimestamp( const sal_Char* pAsciiPropName, const ::com::sun::star::util::DateTime& rValue ) { - appendTimestamp( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); + appendTimestamp( OUString::createFromAscii( pAsciiPropName ), rValue ); } void appendTimestamp( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::util::DateTime& rValue ) { appendTimestamp( rProp.Name, rValue ); } - void appendObject( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rValue ); + void appendObject( const OUString& rPropName, const ::com::sun::star::uno::Any& rValue ); void appendObject( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Any& rValue ) { - appendObject( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); + appendObject( OUString::createFromAscii( pAsciiPropName ), rValue ); } void appendObject( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Any& rValue ) { appendObject( rProp.Name, rValue ); } - void appendVoid( const ::rtl::OUString& rPropName ); + void appendVoid( const OUString& rPropName ); void appendVoid( const sal_Char* pAsciiPropName) { - appendVoid( ::rtl::OUString::createFromAscii( pAsciiPropName ) ); + appendVoid( OUString::createFromAscii( pAsciiPropName ) ); } void appendVoid( const ::com::sun::star::beans::Property& rProp ) { diff --git a/ucbhelper/inc/ucbhelper/providerhelper.hxx b/ucbhelper/inc/ucbhelper/providerhelper.hxx index 24f63ebeef7e..827d5c8379b2 100644 --- a/ucbhelper/inc/ucbhelper/providerhelper.hxx +++ b/ucbhelper/inc/ucbhelper/providerhelper.hxx @@ -111,7 +111,7 @@ protected: * does not exist. */ rtl::Reference< ContentImplHelper > - queryExistingContent( const ::rtl::OUString& rURL ); + queryExistingContent( const OUString& rURL ); /** * This method registers a newly created content instance with the @@ -158,13 +158,13 @@ public: // XServiceInfo ////////////////////////////////////////////////////////////////////// - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) = 0; virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) = 0; @@ -228,7 +228,7 @@ public: */ ::com::sun::star::uno::Reference< com::sun::star::ucb::XPersistentPropertySet > - getAdditionalPropertySet( const ::rtl::OUString& rKey, sal_Bool bCreate ); + getAdditionalPropertySet( const OUString& rKey, sal_Bool bCreate ); /** * This method renames the propertyset containing the Additional Core @@ -240,8 +240,8 @@ public: * children described by rOldKey shall be renamed, too. * @return True, if the operation succeeded - False, otherwise. */ - sal_Bool renameAdditionalPropertySet( const ::rtl::OUString& rOldKey, - const ::rtl::OUString& rNewKey, + sal_Bool renameAdditionalPropertySet( const OUString& rOldKey, + const OUString& rNewKey, sal_Bool bRecursive ); /** @@ -254,8 +254,8 @@ public: * children described by rSourceKey shall be copied, too. * @return True, if the operation succeeded - False, otherwise. */ - sal_Bool copyAdditionalPropertySet( const ::rtl::OUString& rSourceKey, - const ::rtl::OUString& rTargetKey, + sal_Bool copyAdditionalPropertySet( const OUString& rSourceKey, + const OUString& rTargetKey, sal_Bool bRecursive ); /** @@ -267,7 +267,7 @@ public: * children described by rOldKey shall be removed, too. * @return True, if the operation succeeded - False, otherwise. */ - sal_Bool removeAdditionalPropertySet( const ::rtl::OUString& rKey, + sal_Bool removeAdditionalPropertySet( const OUString& rKey, sal_Bool bRecursive ); }; diff --git a/ucbhelper/inc/ucbhelper/proxydecider.hxx b/ucbhelper/inc/ucbhelper/proxydecider.hxx index fd59eae29b89..e3ec58180a00 100644 --- a/ucbhelper/inc/ucbhelper/proxydecider.hxx +++ b/ucbhelper/inc/ucbhelper/proxydecider.hxx @@ -40,7 +40,7 @@ struct InternetProxyServer /** * The name of the proxy server. */ - ::rtl::OUString aName; + OUString aName; /** * The port of the proxy server. @@ -101,8 +101,8 @@ public: * @return true if a proxy server should be used, false otherwise. */ bool - shouldUseProxy( const rtl::OUString & rProtocol, - const rtl::OUString & rHost, + shouldUseProxy( const OUString & rProtocol, + const OUString & rHost, sal_Int32 nPort ) const; /** @@ -123,8 +123,8 @@ public: * InternetProxyServer is empty no proxy server is to be used. */ const InternetProxyServer & - getProxy( const rtl::OUString & rProtocol, - const rtl::OUString & rHost, + getProxy( const OUString & rProtocol, + const OUString & rHost, sal_Int32 nPort ) const; private: diff --git a/ucbhelper/inc/ucbhelper/registerucb.hxx b/ucbhelper/inc/ucbhelper/registerucb.hxx index f89873193bb2..c86bf45cfef9 100644 --- a/ucbhelper/inc/ucbhelper/registerucb.hxx +++ b/ucbhelper/inc/ucbhelper/registerucb.hxx @@ -48,11 +48,11 @@ struct ContentProviderRegistrationInfo /** The arguments the content provider was instantiated with. */ - rtl::OUString m_aArguments; + OUString m_aArguments; /** The URL template the content provider is registered on. */ - rtl::OUString m_aTemplate; + OUString m_aTemplate; }; typedef std::vector< ContentProviderRegistrationInfo > @@ -66,20 +66,20 @@ struct ContentProviderData { /** The UNO service name to use to instanciate the content provider. */ - rtl::OUString ServiceName; + OUString ServiceName; /** The URL template to use to instanciate the content provider. */ - rtl::OUString URLTemplate; + OUString URLTemplate; /** The arguments to use to instanciate the content provider. */ - rtl::OUString Arguments; + OUString Arguments; ContentProviderData() {}; - ContentProviderData( const rtl::OUString & rService, - const rtl::OUString & rTemplate, - const rtl::OUString & rArgs ) + ContentProviderData( const OUString & rService, + const OUString & rTemplate, + const OUString & rArgs ) : ServiceName( rService ), URLTemplate( rTemplate ), Arguments( rArgs ) {} }; @@ -111,9 +111,9 @@ UCBHELPER_DLLPUBLIC bool registerAtUcb( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory, - rtl::OUString const & rName, - rtl::OUString const & rArguments, - rtl::OUString const & rTemplate, + OUString const & rName, + OUString const & rArguments, + OUString const & rTemplate, ContentProviderRegistrationInfo * pInfo) throw (com::sun::star::uno::RuntimeException); diff --git a/ucbhelper/inc/ucbhelper/resultset.hxx b/ucbhelper/inc/ucbhelper/resultset.hxx index 68ec9bcbb082..531955124f2b 100644 --- a/ucbhelper/inc/ucbhelper/resultset.hxx +++ b/ucbhelper/inc/ucbhelper/resultset.hxx @@ -130,7 +130,7 @@ public: throw( com::sun::star::uno::RuntimeException ); // XContentAccess - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL queryContentIdentifierString() throw( com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Reference< @@ -229,7 +229,7 @@ public: wasNull() throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); @@ -326,7 +326,7 @@ public: getPropertySetInfo() throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - setPropertyValue( const rtl::OUString& aPropertyName, + setPropertyValue( const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, @@ -334,33 +334,33 @@ public: com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Any SAL_CALL - getPropertyValue( const rtl::OUString& PropertyName ) + getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - addPropertyChangeListener( const rtl::OUString& aPropertyName, + addPropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removePropertyChangeListener( const rtl::OUString& aPropertyName, + removePropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - addVetoableChangeListener( const rtl::OUString& PropertyName, + addVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeVetoableChangeListener( const rtl::OUString& PropertyName, + removeVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, @@ -448,7 +448,7 @@ public: * of the supplier; must be non-negative. * @return the content's identifier string. */ - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ) = 0; + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) = 0; /** * This method returns the identifier of the content at the specified index. diff --git a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx b/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx index 129f1f8b90bf..35996657553a 100644 --- a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx +++ b/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx @@ -73,10 +73,10 @@ struct ResultSetColumnData sal_Int32 columnDisplaySize; /** @see ResultSetMetaData::getColumnLabel */ - ::rtl::OUString columnLabel; + OUString columnLabel; /** @see ResultSetMetaData::getSchemaName */ - ::rtl::OUString schemaName; + OUString schemaName; /** @see ResultSetMetaData::getPrecision */ sal_Int32 precision; @@ -85,13 +85,13 @@ struct ResultSetColumnData sal_Int32 scale; /** @see ResultSetMetaData::getTableName */ - ::rtl::OUString tableName; + OUString tableName; /** @see ResultSetMetaData::getCatalogName */ - ::rtl::OUString catalogName; + OUString catalogName; /** @see ResultSetMetaData::getColumnTypeName */ - ::rtl::OUString columnTypeName; + OUString columnTypeName; /** @see ResultSetMetaData::isReadOnly */ sal_Bool isReadOnly; @@ -103,7 +103,7 @@ struct ResultSetColumnData sal_Bool isDefinitelyWritable; /** @see ResultSetMetaData::getColumnServiceName */ - ::rtl::OUString columnServiceName; + OUString columnServiceName; inline ResultSetColumnData(); }; @@ -300,7 +300,7 @@ public: * be returned. The first column is 1, the second is 2, ... * @return the column label. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); @@ -311,7 +311,7 @@ public: * be returned. The first column is 1, the second is 2, ... * @return the name of the property that corresponds to column. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); @@ -325,7 +325,7 @@ public: * be returned. The first column is 1, the second is 2, ... * @return the schema name of column or an empty string. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); @@ -366,11 +366,11 @@ public: * be returned. The first column is 1, the second is 2, ... * @return the table name for column or an empty string. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL /** * Gets the catalog name for the table from which column of this * result set was derived. @@ -409,7 +409,7 @@ public: * be returned. The first column is 1, the second is 2, ... * @return the column type name. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); @@ -457,7 +457,7 @@ public: * @return the service name for column or an empty string, if no service * is applicable. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); diff --git a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx index c6ab78954e4d..7a084265003c 100644 --- a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx +++ b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx @@ -90,12 +90,12 @@ public: * @param bAllowUseSystemCredntials specifies if requesting client is * able to obtain and use system credentials for authentication */ - SimpleAuthenticationRequest( const rtl::OUString & rURL, - const rtl::OUString & rServerName, - const rtl::OUString & rRealm, - const rtl::OUString & rUserName, - const rtl::OUString & rPassword, - const rtl::OUString & rAccount, + SimpleAuthenticationRequest( const OUString & rURL, + const OUString & rServerName, + const OUString & rRealm, + const OUString & rUserName, + const OUString & rPassword, + const OUString & rAccount, sal_Bool bAllowPersistentStoring, sal_Bool bAllowUseSystemCredentials ); @@ -119,17 +119,17 @@ public: modifiable. * @param rAccount contains an account, if applicable. */ - SimpleAuthenticationRequest( const rtl::OUString & rURL, - const rtl::OUString & rServerName, + SimpleAuthenticationRequest( const OUString & rURL, + const OUString & rServerName, EntityType eRealmType, - const rtl::OUString & rRealm, + const OUString & rRealm, EntityType eUserNameType, - const rtl::OUString & rUserName, + const OUString & rUserName, EntityType ePasswordType, - const rtl::OUString & rPassword, + const OUString & rPassword, EntityType eAccountType = ENTITY_NA, - const rtl::OUString & rAccount - = rtl::OUString() ); + const OUString & rAccount + = OUString() ); /** * This method returns the supplier for the missing authentication data, diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx index 6d8dcced064c..3f761153582b 100644 --- a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx +++ b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx @@ -53,7 +53,7 @@ public: */ SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity, const com::sun::star::uno::Reference pCertificate, - const rtl::OUString & hostname ); + const OUString & hostname ); }; } // namespace ucbhelper diff --git a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx index 5def64c8af4d..d4c9c5277316 100644 --- a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx +++ b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx @@ -56,7 +56,7 @@ public: SimpleIOErrorRequest( const com::sun::star::ucb::IOErrorCode eError, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & rArgs, - const rtl::OUString & rMessage, + const OUString & rMessage, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandProcessor > & xContext ); diff --git a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx index d9084d034903..be789fd6a148 100644 --- a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx +++ b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx @@ -55,9 +55,9 @@ public: * InteractionReplaceExistingData continuation shall be supplied * with the interaction request. */ - SimpleNameClashResolveRequest( const rtl::OUString & rTargetFolderURL, - const rtl::OUString & rClashingName, - const rtl::OUString & rProposedNewName, + SimpleNameClashResolveRequest( const OUString & rTargetFolderURL, + const OUString & rClashingName, + const OUString & rProposedNewName, sal_Bool bSupportsOverwriteData = sal_True ); /** * This method returns the new name that was supplied by the interaction @@ -65,7 +65,7 @@ public: * * @return the new name, if supplied. */ - const rtl::OUString getNewName() const + const OUString getNewName() const { return m_xNameSupplier->getName(); } }; diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 62a384485ffc..b5f710e0cc14 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -166,7 +166,7 @@ class Content_Impl : public salhelper::SimpleReferenceObject { friend class ContentEventListener_Impl; - mutable rtl::OUString m_aURL; + mutable OUString m_aURL; Reference< XComponentContext > m_xCtx; Reference< XContent > m_xContent; Reference< XCommandProcessor > m_xCommandProcessor; @@ -186,7 +186,7 @@ public: virtual ~Content_Impl(); - const rtl::OUString& getURL() const; + const OUString& getURL() const; Reference< XContent > getContent(); Reference< XCommandProcessor > getCommandProcessor(); Reference< XComponentContext > getComponentContext() @@ -206,7 +206,7 @@ public: //========================================================================= static void ensureContentProviderForURL( const Reference< XUniversalContentBroker >& rBroker, - const rtl::OUString & rURL ) + const OUString & rURL ) throw ( ContentCreationException, RuntimeException ) { Reference< XContentProvider > xProv @@ -223,7 +223,7 @@ static void ensureContentProviderForURL( const Reference< XUniversalContentBroke //========================================================================= static Reference< XContentIdentifier > getContentIdentifier( const Reference< XUniversalContentBroker > & rBroker, - const rtl::OUString & rURL, + const OUString & rURL, bool bThrow ) throw ( ContentCreationException, RuntimeException ) { @@ -254,7 +254,7 @@ static Reference< XContent > getContent( throw ( ContentCreationException, RuntimeException ) { Reference< XContent > xContent; - rtl::OUString msg; + OUString msg; try { xContent = rBroker->queryContent( xId ); @@ -295,7 +295,7 @@ Content::Content() } //========================================================================= -Content::Content( const rtl::OUString& rURL, +Content::Content( const OUString& rURL, const Reference< XCommandEnvironment >& rEnv, const Reference< XComponentContext >& rCtx ) throw ( ContentCreationException, RuntimeException ) @@ -328,7 +328,7 @@ Content::Content( const Content& rOther ) //========================================================================= // static -sal_Bool Content::create( const rtl::OUString& rURL, +sal_Bool Content::create( const OUString& rURL, const Reference< XCommandEnvironment >& rEnv, const Reference< XComponentContext >& rCtx, Content& rContent ) @@ -370,7 +370,7 @@ Reference< XContent > Content::get() const } //========================================================================= -const rtl::OUString& Content::getURL() const +const OUString& Content::getURL() const { return m_xImpl->getURL(); } @@ -393,7 +393,7 @@ Reference< XCommandInfo > Content::getCommands() throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; - aCommand.Name = rtl::OUString("getCommandInfo"); + aCommand.Name = OUString("getCommandInfo"); aCommand.Handle = -1; // n/a aCommand.Argument = Any(); @@ -409,7 +409,7 @@ Reference< XPropertySetInfo > Content::getProperties() throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; - aCommand.Name = rtl::OUString("getPropertySetInfo"); + aCommand.Name = OUString("getPropertySetInfo"); aCommand.Handle = -1; // n/a aCommand.Argument = Any(); @@ -421,10 +421,10 @@ Reference< XPropertySetInfo > Content::getProperties() } //========================================================================= -Any Content::getPropertyValue( const rtl::OUString& rPropertyName ) +Any Content::getPropertyValue( const OUString& rPropertyName ) throw( CommandAbortedException, RuntimeException, Exception ) { - Sequence< rtl::OUString > aNames( 1 ); + Sequence< OUString > aNames( 1 ); aNames.getArray()[ 0 ] = rPropertyName; Sequence< Any > aRet = getPropertyValues( aNames ); @@ -432,11 +432,11 @@ Any Content::getPropertyValue( const rtl::OUString& rPropertyName ) } //========================================================================= -Any Content::setPropertyValue( const rtl::OUString& rName, +Any Content::setPropertyValue( const OUString& rName, const Any& rValue ) throw( CommandAbortedException, RuntimeException, Exception ) { - Sequence< rtl::OUString > aNames( 1 ); + Sequence< OUString > aNames( 1 ); aNames.getArray()[ 0 ] = rName; Sequence< Any > aValues( 1 ); @@ -448,7 +448,7 @@ Any Content::setPropertyValue( const rtl::OUString& rName, //========================================================================= Sequence< Any > Content::getPropertyValues( - const Sequence< rtl::OUString >& rPropertyNames ) + const Sequence< OUString >& rPropertyNames ) throw( CommandAbortedException, RuntimeException, Exception ) { Reference< XRow > xRow = getPropertyValuesInterface( rPropertyNames ); @@ -469,14 +469,14 @@ Sequence< Any > Content::getPropertyValues( //========================================================================= Reference< XRow > Content::getPropertyValuesInterface( - const Sequence< rtl::OUString >& rPropertyNames ) + const Sequence< OUString >& rPropertyNames ) throw( CommandAbortedException, RuntimeException, Exception ) { sal_Int32 nCount = rPropertyNames.getLength(); Sequence< Property > aProps( nCount ); Property* pProps = aProps.getArray(); - const rtl::OUString* pNames = rPropertyNames.getConstArray(); + const OUString* pNames = rPropertyNames.getConstArray(); for ( sal_Int32 n = 0; n< nCount; ++n ) { @@ -489,7 +489,7 @@ Reference< XRow > Content::getPropertyValuesInterface( } Command aCommand; - aCommand.Name = rtl::OUString("getPropertyValues"); + aCommand.Name = OUString("getPropertyValues"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aProps; @@ -502,7 +502,7 @@ Reference< XRow > Content::getPropertyValuesInterface( //========================================================================= Sequence< Any > Content::setPropertyValues( - const Sequence< rtl::OUString >& rPropertyNames, + const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rValues ) throw( CommandAbortedException, RuntimeException, Exception ) { @@ -510,7 +510,7 @@ Sequence< Any > Content::setPropertyValues( { ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString( + OUString( "Length of property names sequence and value " "sequence are unequal!" ), get(), @@ -523,7 +523,7 @@ Sequence< Any > Content::setPropertyValues( Sequence< PropertyValue > aProps( nCount ); PropertyValue* pProps = aProps.getArray(); - const rtl::OUString* pNames = rPropertyNames.getConstArray(); + const OUString* pNames = rPropertyNames.getConstArray(); const Any* pValues = rValues.getConstArray(); for ( sal_Int32 n = 0; n< nCount; ++n ) @@ -537,7 +537,7 @@ Sequence< Any > Content::setPropertyValues( } Command aCommand; - aCommand.Name = rtl::OUString("setPropertyValues"); + aCommand.Name = OUString("setPropertyValues"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aProps; @@ -549,7 +549,7 @@ Sequence< Any > Content::setPropertyValues( } //========================================================================= -Any Content::executeCommand( const rtl::OUString& rCommandName, +Any Content::executeCommand( const OUString& rCommandName, const Any& rCommandArgument ) throw( CommandAbortedException, RuntimeException, Exception ) { @@ -562,14 +562,14 @@ Any Content::executeCommand( const rtl::OUString& rCommandName, } //========================================================================= -Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames, +Any Content::createCursorAny( const Sequence< OUString >& rPropertyNames, ResultSetInclude eMode ) throw( CommandAbortedException, RuntimeException, Exception ) { sal_Int32 nCount = rPropertyNames.getLength(); Sequence< Property > aProps( nCount ); Property* pProps = aProps.getArray(); - const rtl::OUString* pNames = rPropertyNames.getConstArray(); + const OUString* pNames = rPropertyNames.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { Property& rProp = pProps[ n ]; @@ -587,7 +587,7 @@ Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames, aArg.Properties = aProps; Command aCommand; - aCommand.Name = rtl::OUString("open"); + aCommand.Name = OUString("open"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -596,7 +596,7 @@ Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames, //========================================================================= Reference< XResultSet > Content::createCursor( - const Sequence< rtl::OUString >& rPropertyNames, + const Sequence< OUString >& rPropertyNames, ResultSetInclude eMode ) throw( CommandAbortedException, RuntimeException, Exception ) { @@ -626,7 +626,7 @@ Reference< XResultSet > Content::createCursor( //========================================================================= Reference< XDynamicResultSet > Content::createDynamicCursor( - const Sequence< rtl::OUString >& rPropertyNames, + const Sequence< OUString >& rPropertyNames, ResultSetInclude eMode ) throw( CommandAbortedException, RuntimeException, Exception ) { @@ -640,7 +640,7 @@ Reference< XDynamicResultSet > Content::createDynamicCursor( //========================================================================= Reference< XResultSet > Content::createSortedCursor( - const Sequence< rtl::OUString >& rPropertyNames, + const Sequence< OUString >& rPropertyNames, const Sequence< NumberedSortingInfo >& rSortInfo, Reference< XAnyCompareFactory > rAnyCompareFactory, ResultSetInclude eMode ) @@ -706,7 +706,7 @@ Reference< XInputStream > Content::openStream() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString("open"); + aCommand.Name = OUString("open"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -731,7 +731,7 @@ Reference< XInputStream > Content::openStreamNoLock() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString("open"); + aCommand.Name = OUString("open"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -756,7 +756,7 @@ Reference< XStream > Content::openWriteableStream() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString("open"); + aCommand.Name = OUString("open"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -781,7 +781,7 @@ Reference< XStream > Content::openWriteableStreamNoLock() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString("open"); + aCommand.Name = OUString("open"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -804,7 +804,7 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink ) aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString("open"); + aCommand.Name = OUString("open"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -827,7 +827,7 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream ) aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString("open"); + aCommand.Name = OUString("open"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -846,7 +846,7 @@ void Content::writeStream( const Reference< XInputStream >& rStream, aArg.ReplaceExisting = bReplaceExisting; Command aCommand; - aCommand.Name = rtl::OUString("insert"); + aCommand.Name = OUString("insert"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -862,7 +862,7 @@ Sequence< ContentInfo > Content::queryCreatableContentsInfo() // First, try it using "CreatableContentsInfo" property -> the "new" way. Sequence< ContentInfo > aInfo; if ( getPropertyValue( - rtl::OUString("CreatableContentsInfo") ) + OUString("CreatableContentsInfo") ) >>= aInfo ) return aInfo; @@ -876,8 +876,8 @@ Sequence< ContentInfo > Content::queryCreatableContentsInfo() } //========================================================================= -sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, - const Sequence< rtl::OUString >& +sal_Bool Content::insertNewContent( const OUString& rContentType, + const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues, Content& rNewContent ) @@ -891,8 +891,8 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, } //========================================================================= -sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, - const Sequence< rtl::OUString >& +sal_Bool Content::insertNewContent( const OUString& rContentType, + const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues, const Reference< XInputStream >& rData, @@ -908,7 +908,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, aInfo.Attributes = 0; Command aCommand; - aCommand.Name = rtl::OUString("createNewContent"); + aCommand.Name = OUString("createNewContent"); aCommand.Handle = -1; // n/a aCommand.Argument <<= aInfo; @@ -943,7 +943,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, Content aNewContent( xNew, m_xImpl->getEnvironment(), m_xImpl->getComponentContext() ); aNewContent.setPropertyValues( rPropertyNames, rPropertyValues ); - aNewContent.executeCommand( rtl::OUString("insert"), + aNewContent.executeCommand( OUString("insert"), makeAny( InsertCommandArgument( rData.is() ? rData : new EmptyInputStream, @@ -957,12 +957,12 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, //========================================================================= sal_Bool Content::transferContent( const Content& rSourceContent, InsertOperation eOperation, - const rtl::OUString & rTitle, + const OUString & rTitle, const sal_Int32 nNameClashAction, - const rtl::OUString & rMimeType, + const OUString & rMimeType, bool bMajorVersion, - const rtl::OUString & rVersionComment, - rtl::OUString* pResultURL ) + const OUString & rVersionComment, + OUString* pResultURL ) throw( CommandAbortedException, RuntimeException, Exception ) { Reference< XUniversalContentBroker > pBroker( @@ -971,7 +971,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent, // Execute command "globalTransfer" at UCB. TransferCommandOperation eTransOp = TransferCommandOperation(); - rtl::OUString sCommand( "globalTransfer" ); + OUString sCommand( "globalTransfer" ); bool bCheckIn = false; switch ( eOperation ) { @@ -989,14 +989,14 @@ sal_Bool Content::transferContent( const Content& rSourceContent, case InsertOperation_CHECKIN: eTransOp = TransferCommandOperation_COPY; - sCommand = rtl::OUString( "checkin" ); + sCommand = OUString( "checkin" ); bCheckIn = true; break; default: ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString( + OUString( "Unknown transfer operation!" ), get(), -1 ) ), @@ -1036,13 +1036,13 @@ sal_Bool Content::isFolder() throw( CommandAbortedException, RuntimeException, Exception ) { sal_Bool bFolder = sal_False; - if ( getPropertyValue( rtl::OUString("IsFolder") ) + if ( getPropertyValue( OUString("IsFolder") ) >>= bFolder ) return bFolder; ucbhelper::cancelCommandExecution( makeAny( UnknownPropertyException( - rtl::OUString( + OUString( "Unable to retrieve value of property 'IsFolder'!" ), get() ) ), m_xImpl->getEnvironment() ); @@ -1057,13 +1057,13 @@ sal_Bool Content::isDocument() throw( CommandAbortedException, RuntimeException, Exception ) { sal_Bool bDoc = sal_False; - if ( getPropertyValue( rtl::OUString("IsDocument") ) + if ( getPropertyValue( OUString("IsDocument") ) >>= bDoc ) return bDoc; ucbhelper::cancelCommandExecution( makeAny( UnknownPropertyException( - rtl::OUString( + OUString( "Unable to retrieve value of property 'IsDocument'!" ), get() ) ), m_xImpl->getEnvironment() ); @@ -1171,7 +1171,7 @@ void Content_Impl::disposing( const EventObject& Source ) xContent = m_xContent; - m_aURL = rtl::OUString(); + m_aURL = OUString(); m_xCommandProcessor = 0; m_xContent = 0; } @@ -1189,7 +1189,7 @@ void Content_Impl::disposing( const EventObject& Source ) } //========================================================================= -const rtl::OUString& Content_Impl::getURL() const +const OUString& Content_Impl::getURL() const { if ( m_aURL.isEmpty() && m_xContent.is() ) { @@ -1292,7 +1292,7 @@ void Content_Impl::inserted() { // URL might have changed during 'insert' => recalculate in next getURL() osl::MutexGuard aGuard( m_aMutex ); - m_aURL = ::rtl::OUString(); + m_aURL = OUString(); } //========================================================================= diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx index 1f53b4a1035c..c1498cc21680 100644 --- a/ucbhelper/source/client/fileidentifierconverter.cxx +++ b/ucbhelper/source/client/fileidentifierconverter.cxx @@ -37,14 +37,14 @@ namespace ucbhelper { // //============================================================================ -rtl::OUString +OUString getLocalFileURL() SAL_THROW((uno::RuntimeException)) { // If there were more file systems than just "file:///" (e.g., the obsolete // "vnd.sun.star.wfs:///"), this code should query all relevant UCPs for // their com.sun.star.ucb.XFileIdentifierConverter.getFileProviderLocality // and return the most local one: - return rtl::OUString("file:///"); + return OUString("file:///"); } //============================================================================ @@ -53,11 +53,11 @@ getLocalFileURL() SAL_THROW((uno::RuntimeException)) // //============================================================================ -rtl::OUString +OUString getFileURLFromSystemPath( uno::Reference< ucb::XUniversalContentBroker > const & rUcb, - rtl::OUString const & rBaseURL, - rtl::OUString const & rSystemPath) + OUString const & rBaseURL, + OUString const & rSystemPath) SAL_THROW((uno::RuntimeException)) { OSL_ASSERT(rUcb.is()); @@ -67,7 +67,7 @@ getFileURLFromSystemPath( if (xConverter.is()) return xConverter->getFileURLFromSystemPath(rBaseURL, rSystemPath); else - return rtl::OUString(); + return OUString(); } //============================================================================ @@ -76,10 +76,10 @@ getFileURLFromSystemPath( // //============================================================================ -rtl::OUString +OUString getSystemPathFromFileURL( uno::Reference< ucb::XUniversalContentBroker > const & rUcb, - rtl::OUString const & rURL) + OUString const & rURL) SAL_THROW((uno::RuntimeException)) { OSL_ASSERT(rUcb.is()); @@ -89,7 +89,7 @@ getSystemPathFromFileURL( if (xConverter.is()) return xConverter->getSystemPathFromFileURL(rURL); else - return rtl::OUString(); + return OUString(); } } diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 4230eac91108..f449ff9b4f92 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -64,15 +64,15 @@ namespace proxydecider_impl class WildCard { private: - rtl::OString m_aWildString; + OString m_aWildString; public: - WildCard( const rtl::OUString& rWildCard ) + WildCard( const OUString& rWildCard ) : m_aWildString( - rtl::OUStringToOString( + OUStringToOString( rWildCard, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() ) {} - bool Matches( const rtl::OUString & rStr ) const; + bool Matches( const OUString & rStr ) const; }; //========================================================================= @@ -82,7 +82,7 @@ typedef std::pair< WildCard, WildCard > NoProxyListEntry; class HostnameCache { - typedef std::pair< rtl::OUString, rtl::OUString > HostListEntry; + typedef std::pair< OUString, OUString > HostListEntry; std::list< HostListEntry > m_aHostList; sal_uInt32 m_nCapacity; @@ -91,7 +91,7 @@ public: explicit HostnameCache( sal_uInt32 nCapacity ) : m_nCapacity( nCapacity ) {} - bool get( const rtl::OUString & rKey, rtl::OUString & rValue ) const + bool get( const OUString & rKey, OUString & rValue ) const { std::list< HostListEntry >::const_iterator it = m_aHostList.begin(); @@ -110,7 +110,7 @@ public: return false; } - void put( const rtl::OUString & rKey, const rtl::OUString & rValue ) + void put( const OUString & rKey, const OUString & rValue ) { if ( m_aHostList.size() == m_nCapacity ) m_aHostList.resize( m_nCapacity / 2 ); @@ -134,7 +134,7 @@ class InternetProxyDecider_Impl : mutable HostnameCache m_aHostnames; private: - bool shouldUseProxy( const rtl::OUString & rHost, + bool shouldUseProxy( const OUString & rHost, sal_Int32 nPort, bool bUseFullyQualified ) const; public: @@ -144,8 +144,8 @@ public: void dispose(); - const InternetProxyServer & getProxy( const rtl::OUString & rProtocol, - const rtl::OUString & rHost, + const InternetProxyServer & getProxy( const OUString & rProtocol, + const OUString & rHost, sal_Int32 nPort ) const; // XChangesListener @@ -157,7 +157,7 @@ public: throw( uno::RuntimeException ); private: - void setNoProxyList( const rtl::OUString & rNoProxyList ); + void setNoProxyList( const OUString & rNoProxyList ); }; //========================================================================= @@ -168,10 +168,10 @@ private: //========================================================================= //========================================================================= -bool WildCard::Matches( const rtl::OUString& rString ) const +bool WildCard::Matches( const OUString& rString ) const { - rtl::OString aString - = rtl::OUStringToOString( + OString aString + = OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase(); const char * pStr = aString.getStr(); const char * pWild = m_aWildString.getStr(); @@ -240,11 +240,11 @@ bool WildCard::Matches( const rtl::OUString& rString ) const bool getConfigStringValue( const uno::Reference< container::XNameAccess > & xNameAccess, const char * key, - rtl::OUString & value ) + OUString & value ) { try { - if ( !( xNameAccess->getByName( rtl::OUString::createFromAscii( key ) ) + if ( !( xNameAccess->getByName( OUString::createFromAscii( key ) ) >>= value ) ) { OSL_FAIL( "InternetProxyDecider - " @@ -272,7 +272,7 @@ bool getConfigInt32Value( try { uno::Any aValue = xNameAccess->getByName( - rtl::OUString::createFromAscii( key ) ); + OUString::createFromAscii( key ) ); if ( aValue.hasValue() && !( aValue >>= value ) ) { OSL_FAIL( "InternetProxyDecider - " @@ -314,11 +314,11 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( configuration::theDefaultProvider::get( rxContext ); uno::Sequence< uno::Any > aArguments( 1 ); - aArguments[ 0 ] <<= rtl::OUString( CONFIG_ROOT_KEY ); + aArguments[ 0 ] <<= OUString( CONFIG_ROOT_KEY ); uno::Reference< uno::XInterface > xInterface( xConfigProv->createInstanceWithArguments( - rtl::OUString( + OUString( "com.sun.star.configuration.ConfigurationAccess" ), aArguments ) ); @@ -339,7 +339,7 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( xNameAccess, PROXY_TYPE_KEY, m_nProxyType ); // *** No proxy list *** - rtl::OUString aNoProxyList; + OUString aNoProxyList; getConfigStringValue( xNameAccess, NO_PROXY_LIST_KEY, aNoProxyList ); setNoProxyList( aNoProxyList ); @@ -420,11 +420,11 @@ void InternetProxyDecider_Impl::dispose() } //========================================================================= -bool InternetProxyDecider_Impl::shouldUseProxy( const rtl::OUString & rHost, +bool InternetProxyDecider_Impl::shouldUseProxy( const OUString & rHost, sal_Int32 nPort, bool bUseFullyQualified ) const { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; if ( ( rHost.indexOf( ':' ) != -1 ) && ( rHost[ 0 ] != sal_Unicode( '[' ) ) ) @@ -441,8 +441,8 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const rtl::OUString & rHost, } aBuffer.append( sal_Unicode( ':' ) ); - aBuffer.append( rtl::OUString::valueOf( nPort ) ); - const rtl::OUString aHostAndPort( aBuffer.makeStringAndClear() ); + aBuffer.append( OUString::valueOf( nPort ) ); + const OUString aHostAndPort( aBuffer.makeStringAndClear() ); std::vector< NoProxyListEntry >::const_iterator it = m_aNoProxyList.begin(); @@ -469,8 +469,8 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const rtl::OUString & rHost, //========================================================================= const InternetProxyServer & InternetProxyDecider_Impl::getProxy( - const rtl::OUString & rProtocol, - const rtl::OUString & rHost, + const OUString & rProtocol, + const OUString & rHost, sal_Int32 nPort ) const { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -494,7 +494,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy( // Second, try match against full qualified hostname - #104401# ////////////////////////////////////////////////////////////////// - rtl::OUString aHost; + OUString aHost; if ( ( rHost[ 0 ] == sal_Unicode( '[' ) ) && ( rHost.getLength() > 1 ) ) @@ -508,7 +508,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy( aHost = rHost; } - rtl::OUString aFullyQualifiedHost; + OUString aFullyQualifiedHost; if ( !m_aHostnames.get( aHost, aFullyQualifiedHost ) ) { // This might be quite expensive (DNS lookup). @@ -575,7 +575,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( for ( sal_Int32 n = 0; n < nCount; ++n ) { const util::ElementChange& rElem = pElementChanges[ n ]; - rtl::OUString aKey; + OUString aKey; if ( ( rElem.Accessor >>= aKey ) && !aKey.isEmpty() ) { if ( aKey == PROXY_TYPE_KEY ) @@ -588,7 +588,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( } else if ( aKey == NO_PROXY_LIST_KEY ) { - rtl::OUString aNoProxyList; + OUString aNoProxyList; if ( !( rElem.Element >>= aNoProxyList ) ) { OSL_FAIL( "InternetProxyDecider - changesOccurred - " @@ -672,7 +672,7 @@ void SAL_CALL InternetProxyDecider_Impl::disposing(const lang::EventObject&) //========================================================================= void InternetProxyDecider_Impl::setNoProxyList( - const rtl::OUString & rNoProxyList ) + const OUString & rNoProxyList ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -692,12 +692,12 @@ void InternetProxyDecider_Impl::setNoProxyList( if ( nEnd == -1 ) nEnd = nLen; - rtl::OUString aToken = rNoProxyList.copy( nPos, nEnd - nPos ); + OUString aToken = rNoProxyList.copy( nPos, nEnd - nPos ); if ( !aToken.isEmpty() ) { - rtl::OUString aServer; - rtl::OUString aPort; + OUString aServer; + OUString aPort; // numerical IPv6 address? bool bIPv6Address = false; @@ -711,14 +711,14 @@ void InternetProxyDecider_Impl::setNoProxyList( if ( nColonPos == -1 ) { // No port given, server pattern equals current token - aPort = rtl::OUString("*"); + aPort = OUString("*"); if ( aToken.indexOf( '*' ) == -1 ) { // pattern describes exactly one server aServer = aToken; } - aToken += rtl::OUString(":*"); + aToken += OUString(":*"); } else { @@ -732,7 +732,7 @@ void InternetProxyDecider_Impl::setNoProxyList( } } - rtl::OUStringBuffer aFullyQualifiedHost; + OUStringBuffer aFullyQualifiedHost; if ( !aServer.isEmpty() ) { // Remember fully qualified server name if current list @@ -746,7 +746,7 @@ void InternetProxyDecider_Impl::setNoProxyList( // This might be quite expensive (DNS lookup). const osl::SocketAddr aAddr( aServer, 0 ); - rtl::OUString aTmp = aAddr.getHostname().toAsciiLowerCase(); + OUString aTmp = aAddr.getHostname().toAsciiLowerCase(); if ( aTmp != aServer.toAsciiLowerCase() ) { if ( bIPv6Address ) @@ -809,8 +809,8 @@ InternetProxyDecider::~InternetProxyDecider() } //========================================================================= -bool InternetProxyDecider::shouldUseProxy( const rtl::OUString & rProtocol, - const rtl::OUString & rHost, +bool InternetProxyDecider::shouldUseProxy( const OUString & rProtocol, + const OUString & rHost, sal_Int32 nPort ) const { const InternetProxyServer & rData = m_pImpl->getProxy( rProtocol, @@ -821,8 +821,8 @@ bool InternetProxyDecider::shouldUseProxy( const rtl::OUString & rProtocol, //========================================================================= const InternetProxyServer & InternetProxyDecider::getProxy( - const rtl::OUString & rProtocol, - const rtl::OUString & rHost, + const OUString & rProtocol, + const OUString & rHost, sal_Int32 nPort ) const { return m_pImpl->getProxy( rProtocol, rHost, nPort ); diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index 2d4d6af041f1..91bcd79f0295 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -65,7 +65,7 @@ void cancelCommandExecution( const uno::Any & rException, if ( xSelection.is() ) throw ucb::CommandFailedException( - rtl::OUString(), + OUString(), uno::Reference< uno::XInterface >(), rException ); } @@ -83,7 +83,7 @@ void cancelCommandExecution( const ucb::IOErrorCode eError, const uno::Sequence< uno::Any > & rArgs, const uno::Reference< ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rMessage, + const OUString & rMessage, const uno::Reference< ucb::XCommandProcessor > & xContext ) throw( uno::Exception ) @@ -103,7 +103,7 @@ void cancelCommandExecution( const ucb::IOErrorCode eError, = xRequest->getSelection(); if ( xSelection.is() ) - throw ucb::CommandFailedException( rtl::OUString(), + throw ucb::CommandFailedException( OUString(), xContext, xRequest->getRequest() ); } diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index c9ce548af225..2f1fde05a1f1 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -108,7 +108,7 @@ PropertiesEventListenerMap; struct equalStr { - bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const + bool operator()( const OUString& s1, const OUString& s2 ) const { return !!( s1 == s2 ); } @@ -116,7 +116,7 @@ struct equalStr struct hashStr { - size_t operator()( const rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } @@ -124,7 +124,7 @@ struct hashStr typedef cppu::OMultiTypeInterfaceContainerHelperVar < - rtl::OUString, + OUString, hashStr, equalStr > PropertyChangeListeners; @@ -265,11 +265,11 @@ XTYPEPROVIDER_IMPL_10( ContentImplHelper, // virtual sal_Bool SAL_CALL ContentImplHelper::supportsService( - const rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString* pArray = aSNL.getConstArray(); for ( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) { if ( pArray[ i ] == ServiceName ) @@ -425,7 +425,7 @@ sal_Int32 SAL_CALL ContentImplHelper::createCommandIdentifier() // virtual void SAL_CALL ContentImplHelper::addPropertiesChangeListener( - const uno::Sequence< rtl::OUString >& PropertyNames, + const uno::Sequence< OUString >& PropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& Listener ) throw( uno::RuntimeException ) { @@ -440,15 +440,15 @@ void SAL_CALL ContentImplHelper::addPropertiesChangeListener( { // Note: An empty sequence means a listener for "all" properties. m_pImpl->m_pPropertyChangeListeners->addInterface( - rtl::OUString(), Listener ); + OUString(), Listener ); } else { - const rtl::OUString* pSeq = PropertyNames.getConstArray(); + const OUString* pSeq = PropertyNames.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString& rName = pSeq[ n ]; + const OUString& rName = pSeq[ n ]; if ( !rName.isEmpty() ) m_pImpl->m_pPropertyChangeListeners->addInterface( rName, Listener ); @@ -459,7 +459,7 @@ void SAL_CALL ContentImplHelper::addPropertiesChangeListener( //========================================================================= // virtual void SAL_CALL ContentImplHelper::removePropertiesChangeListener( - const uno::Sequence< rtl::OUString >& PropertyNames, + const uno::Sequence< OUString >& PropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& Listener ) throw( uno::RuntimeException ) { @@ -473,15 +473,15 @@ void SAL_CALL ContentImplHelper::removePropertiesChangeListener( { // Note: An empty sequence means a listener for "all" properties. m_pImpl->m_pPropertyChangeListeners->removeInterface( - rtl::OUString(), Listener ); + OUString(), Listener ); } else { - const rtl::OUString* pSeq = PropertyNames.getConstArray(); + const OUString* pSeq = PropertyNames.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString& rName = pSeq[ n ]; + const OUString& rName = pSeq[ n ]; if ( !rName.isEmpty() ) m_pImpl->m_pPropertyChangeListeners->removeInterface( rName, Listener ); @@ -529,7 +529,7 @@ void SAL_CALL ContentImplHelper::removeCommandInfoChangeListener( // virtual void SAL_CALL ContentImplHelper::addProperty( - const rtl::OUString& Name, + const OUString& Name, sal_Int16 Attributes, const uno::Any& DefaultValue ) throw( beans::PropertyExistException, @@ -625,7 +625,7 @@ void SAL_CALL ContentImplHelper::addProperty( //========================================================================= // virtual -void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name ) +void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, uno::RuntimeException ) @@ -699,7 +699,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name ) xReg = xSet->getRegistry(); if ( xReg.is() ) { - rtl::OUString aKey( xSet->getKey() ); + OUString aKey( xSet->getKey() ); xSet = 0; xReg->removePropertySet( aKey ); } @@ -769,7 +769,7 @@ uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent() throw( uno::RuntimeException ) { uno::Reference< uno::XInterface > xParent; - rtl::OUString aURL = getParentURL(); + OUString aURL = getParentURL(); if ( !aURL.isEmpty() ) { @@ -812,8 +812,8 @@ ContentImplHelper::getAdditionalPropertySet( sal_Bool bCreate ) //========================================================================= sal_Bool ContentImplHelper::renameAdditionalPropertySet( - const rtl::OUString& rOldKey, - const rtl::OUString& rNewKey, + const OUString& rOldKey, + const OUString& rNewKey, sal_Bool bRecursive ) { return m_xProvider->renameAdditionalPropertySet( @@ -822,8 +822,8 @@ sal_Bool ContentImplHelper::renameAdditionalPropertySet( //========================================================================= sal_Bool ContentImplHelper::copyAdditionalPropertySet( - const rtl::OUString& rSourceKey, - const rtl::OUString& rTargetKey, + const OUString& rSourceKey, + const OUString& rTargetKey, sal_Bool bRecursive ) { return m_xProvider->copyAdditionalPropertySet( @@ -850,7 +850,7 @@ void ContentImplHelper::notifyPropertiesChange( // First, notify listeners interested in changes of every property. cppu::OInterfaceContainerHelper* pAllPropsContainer = m_pImpl->m_pPropertyChangeListeners->getContainer( - rtl::OUString() ); + OUString() ); if ( pAllPropsContainer ) { cppu::OInterfaceIteratorHelper aIter( *pAllPropsContainer ); @@ -871,7 +871,7 @@ void ContentImplHelper::notifyPropertiesChange( for ( sal_Int32 n = 0; n < nCount; ++n ) { const beans::PropertyChangeEvent& rEvent = pEvents[ n ]; - const rtl::OUString& rName = rEvent.PropertyName; + const OUString& rName = rEvent.PropertyName; cppu::OInterfaceContainerHelper* pPropsContainer = m_pImpl->m_pPropertyChangeListeners->getContainer( rName ); diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index e99b67fcffd0..c700e741d3b7 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ucb; -using ::rtl::OUString; namespace ucbhelper { diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index 54c62347e493..b9e8a258ed0d 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -151,7 +151,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() //========================================================================= // virtual beans::Property SAL_CALL PropertySetInfo::getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) { beans::Property aProp; @@ -164,7 +164,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName( //========================================================================= // virtual sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( - const rtl::OUString& Name ) + const OUString& Name ) throw( uno::RuntimeException ) { beans::Property aProp; @@ -186,7 +186,7 @@ void PropertySetInfo::reset() //========================================================================= sal_Bool PropertySetInfo::queryProperty( - const rtl::OUString& rName, beans::Property& rProp ) + const OUString& rName, beans::Property& rProp ) { osl::MutexGuard aGuard( m_aMutex ); @@ -298,7 +298,7 @@ CommandProcessorInfo::getCommands() // virtual com::sun::star::ucb::CommandInfo SAL_CALL CommandProcessorInfo::getCommandInfoByName( - const rtl::OUString& Name ) + const OUString& Name ) throw( com::sun::star::ucb::UnsupportedCommandException, uno::RuntimeException ) { @@ -326,7 +326,7 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) //========================================================================= // virtual sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( - const rtl::OUString& Name ) + const OUString& Name ) throw( uno::RuntimeException ) { com::sun::star::ucb::CommandInfo aInfo; @@ -358,7 +358,7 @@ void CommandProcessorInfo::reset() //========================================================================= sal_Bool CommandProcessorInfo::queryCommand( - const rtl::OUString& rName, + const OUString& rName, com::sun::star::ucb::CommandInfo& rCommand ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index acf2e73e512e..96f85778b2aa 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -775,7 +775,7 @@ InteractionSupplyAuthentication::canSetRealm() //========================================================================= // virtual void SAL_CALL -InteractionSupplyAuthentication::setRealm( const rtl::OUString& Realm ) +InteractionSupplyAuthentication::setRealm( const OUString& Realm ) throw( uno::RuntimeException ) { OSL_ENSURE( m_bCanSetPassword, @@ -797,7 +797,7 @@ InteractionSupplyAuthentication::canSetUserName() //========================================================================= // virtual void SAL_CALL -InteractionSupplyAuthentication::setUserName( const rtl::OUString& UserName ) +InteractionSupplyAuthentication::setUserName( const OUString& UserName ) throw( uno::RuntimeException ) { OSL_ENSURE( m_bCanSetUserName, @@ -819,7 +819,7 @@ InteractionSupplyAuthentication::canSetPassword() //========================================================================= // virtual void SAL_CALL -InteractionSupplyAuthentication::setPassword( const rtl::OUString& Password ) +InteractionSupplyAuthentication::setPassword( const OUString& Password ) throw( uno::RuntimeException ) { OSL_ENSURE( m_bCanSetPassword, @@ -862,7 +862,7 @@ InteractionSupplyAuthentication::canSetAccount() //========================================================================= // virtual void SAL_CALL -InteractionSupplyAuthentication::setAccount( const rtl::OUString& Account ) +InteractionSupplyAuthentication::setAccount( const OUString& Account ) throw( uno::RuntimeException ) { OSL_ENSURE( m_bCanSetAccount, @@ -1029,7 +1029,7 @@ void SAL_CALL InteractionSupplyName::select() // virtual void SAL_CALL -InteractionSupplyName::setName( const rtl::OUString& Name ) +InteractionSupplyName::setName( const OUString& Name ) throw( uno::RuntimeException ) { m_aName = Name; diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index 425f8024a5b3..3d8186f6a278 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -45,7 +45,6 @@ using namespace com::sun::star::script; using namespace com::sun::star::sdbc; using namespace com::sun::star::uno; using namespace com::sun::star::util; -using ::rtl::OUString; namespace ucbhelper_impl { @@ -79,7 +78,7 @@ const sal_uInt32 OBJECT_VALUE_SET = 0x00040000; struct PropertyValue { - ::rtl::OUString + OUString sPropertyName; sal_uInt32 nPropsSet; @@ -636,42 +635,42 @@ const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter() } //========================================================================= -void PropertyValueSet::appendString( const ::rtl::OUString& rPropName, +void PropertyValueSet::appendString( const OUString& rPropName, const OUString& rValue ) { SETVALUE_IMPL( rPropName, STRING_VALUE_SET, aString, rValue ); } //========================================================================= -void PropertyValueSet::appendBoolean( const ::rtl::OUString& rPropName, +void PropertyValueSet::appendBoolean( const OUString& rPropName, sal_Bool bValue ) { SETVALUE_IMPL( rPropName, BOOLEAN_VALUE_SET, bBoolean, bValue ); } //========================================================================= -void PropertyValueSet::appendLong( const ::rtl::OUString& rPropName, +void PropertyValueSet::appendLong( const OUString& rPropName, sal_Int64 nValue ) { SETVALUE_IMPL( rPropName, LONG_VALUE_SET, nLong, nValue ); } //========================================================================= -void PropertyValueSet::appendTimestamp( const ::rtl::OUString& rPropName, +void PropertyValueSet::appendTimestamp( const OUString& rPropName, const DateTime& rValue ) { SETVALUE_IMPL( rPropName, TIMESTAMP_VALUE_SET, aTimestamp, rValue ); } //========================================================================= -void PropertyValueSet::appendObject( const ::rtl::OUString& rPropName, +void PropertyValueSet::appendObject( const OUString& rPropName, const Any& rValue ) { SETVALUE_IMPL( rPropName, OBJECT_VALUE_SET, aObject, rValue ); } //========================================================================= -void PropertyValueSet::appendVoid( const ::rtl::OUString& rPropName ) +void PropertyValueSet::appendVoid( const OUString& rPropName ) { SETVALUE_IMPL( rPropName, NO_VALUE_SET, aObject, Any() ); } diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx index 5407df04d39c..28337b95219a 100644 --- a/ucbhelper/source/provider/providerhelper.cxx +++ b/ucbhelper/source/provider/providerhelper.cxx @@ -53,7 +53,7 @@ namespace ucbhelper_impl struct equalString { bool operator()( - const rtl::OUString& rKey11, const rtl::OUString& rKey22 ) const + const OUString& rKey11, const OUString& rKey22 ) const { return !!( rKey11 == rKey22 ); } @@ -61,7 +61,7 @@ struct equalString struct hashString { - size_t operator()( const rtl::OUString & rName ) const + size_t operator()( const OUString & rName ) const { return rName.hashCode(); } @@ -69,7 +69,7 @@ struct hashString typedef boost::unordered_map < - rtl::OUString, + OUString, uno::WeakReference< ucb::XContent >, hashString, equalString @@ -146,11 +146,11 @@ XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper, // virtual sal_Bool SAL_CALL ContentProviderImplHelper::supportsService( - const rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString* pArray = aSNL.getConstArray(); for ( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) { if ( pArray[ i ] == ServiceName ) @@ -174,8 +174,8 @@ sal_Int32 SAL_CALL ContentProviderImplHelper::compareContentIds( { // Simply do a string compare. - rtl::OUString aURL1( Id1->getContentIdentifier() ); - rtl::OUString aURL2( Id2->getContentIdentifier() ); + OUString aURL1( Id1->getContentIdentifier() ); + OUString aURL2( Id2->getContentIdentifier() ); return aURL1.compareTo( aURL2 ); } @@ -216,7 +216,7 @@ void ContentProviderImplHelper::removeContent( ContentImplHelper* pContent ) cleanupRegisteredContents(); - const rtl::OUString aURL( + const OUString aURL( pContent->getIdentifier()->getContentIdentifier() ); ucbhelper_impl::Contents::iterator it = m_pImpl->m_aContents.find( aURL ); @@ -236,7 +236,7 @@ ContentProviderImplHelper::queryExistingContent( //========================================================================= rtl::Reference< ContentImplHelper > -ContentProviderImplHelper::queryExistingContent( const rtl::OUString& rURL ) +ContentProviderImplHelper::queryExistingContent( const OUString& rURL ) { osl::MutexGuard aGuard( m_aMutex ); @@ -294,7 +294,7 @@ void ContentProviderImplHelper::registerNewContent( cleanupRegisteredContents(); - const rtl::OUString aURL( + const OUString aURL( xContent->getIdentifier()->getContentIdentifier() ); ucbhelper_impl::Contents::const_iterator it = m_pImpl->m_aContents.find( aURL ); @@ -318,7 +318,7 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry() // Open/create a registry. m_pImpl->m_xPropertySetRegistry - = xRegFac->createPropertySetRegistry( rtl::OUString() ); + = xRegFac->createPropertySetRegistry( OUString() ); OSL_ENSURE( m_pImpl->m_xPropertySetRegistry.is(), "ContentProviderImplHelper::getAdditionalPropertySet - " @@ -332,7 +332,7 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry() //========================================================================= uno::Reference< com::sun::star::ucb::XPersistentPropertySet > ContentProviderImplHelper::getAdditionalPropertySet( - const rtl::OUString& rKey, sal_Bool bCreate ) + const OUString& rKey, sal_Bool bCreate ) { // Get propertyset registry. getAdditionalPropertySetRegistry(); @@ -350,8 +350,8 @@ ContentProviderImplHelper::getAdditionalPropertySet( //========================================================================= sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet( - const rtl::OUString& rOldKey, - const rtl::OUString& rNewKey, + const OUString& rOldKey, + const OUString& rNewKey, sal_Bool bRecursive ) { if ( rOldKey == rNewKey ) @@ -370,34 +370,34 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet( m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY ); if ( xNameAccess.is() ) { - uno::Sequence< rtl::OUString > aKeys + uno::Sequence< OUString > aKeys = xNameAccess->getElementNames(); sal_Int32 nCount = aKeys.getLength(); if ( nCount > 0 ) { - rtl::OUString aOldKeyWithSlash = rOldKey; - rtl::OUString aOldKeyWithoutSlash; + OUString aOldKeyWithSlash = rOldKey; + OUString aOldKeyWithoutSlash; if ( aOldKeyWithSlash.lastIndexOf( sal_Unicode('/') != aOldKeyWithSlash.getLength() - 1 ) ) { - aOldKeyWithSlash += rtl::OUString( sal_Unicode('/') ); + aOldKeyWithSlash += OUString( sal_Unicode('/') ); aOldKeyWithoutSlash = rOldKey; } else if ( !rOldKey.isEmpty() ) aOldKeyWithoutSlash = rOldKey.copy( 0, rOldKey.getLength() - 1 ); - const rtl::OUString* pKeys = aKeys.getConstArray(); + const OUString* pKeys = aKeys.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString& rKey = pKeys[ n ]; + const OUString& rKey = pKeys[ n ]; if ( rKey.compareTo( aOldKeyWithSlash, aOldKeyWithSlash.getLength() ) == 0 || rKey.equals( aOldKeyWithoutSlash ) ) { - rtl::OUString aNewKey + OUString aNewKey = rKey.replaceAt( 0, rOldKey.getLength(), rNewKey ); if ( !renameAdditionalPropertySet( @@ -437,8 +437,8 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet( //========================================================================= sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet( - const rtl::OUString& rSourceKey, - const rtl::OUString& rTargetKey, + const OUString& rSourceKey, + const OUString& rTargetKey, sal_Bool bRecursive ) { if ( rSourceKey == rTargetKey ) @@ -457,34 +457,34 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet( m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY ); if ( xNameAccess.is() ) { - uno::Sequence< rtl::OUString > aKeys + uno::Sequence< OUString > aKeys = xNameAccess->getElementNames(); sal_Int32 nCount = aKeys.getLength(); if ( nCount > 0 ) { - rtl::OUString aSrcKeyWithSlash = rSourceKey; - rtl::OUString aSrcKeyWithoutSlash; + OUString aSrcKeyWithSlash = rSourceKey; + OUString aSrcKeyWithoutSlash; if ( aSrcKeyWithSlash.lastIndexOf( sal_Unicode('/') != aSrcKeyWithSlash.getLength() - 1 ) ) { - aSrcKeyWithSlash += rtl::OUString( sal_Unicode('/') ); + aSrcKeyWithSlash += OUString( sal_Unicode('/') ); aSrcKeyWithoutSlash = rSourceKey; } else if ( !rSourceKey.isEmpty() ) aSrcKeyWithoutSlash = rSourceKey.copy( 0, rSourceKey.getLength() - 1 ); - const rtl::OUString* pKeys = aKeys.getConstArray(); + const OUString* pKeys = aKeys.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString& rKey = pKeys[ n ]; + const OUString& rKey = pKeys[ n ]; if ( rKey.compareTo( aSrcKeyWithSlash, aSrcKeyWithSlash.getLength() ) == 0 || rKey.equals( aSrcKeyWithoutSlash ) ) { - rtl::OUString aNewKey + OUString aNewKey = rKey.replaceAt( 0, rSourceKey.getLength(), rTargetKey ); if ( !copyAdditionalPropertySet( @@ -581,7 +581,7 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet( //========================================================================= sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet( - const rtl::OUString& rKey, sal_Bool bRecursive ) + const OUString& rKey, sal_Bool bRecursive ) { osl::MutexGuard aGuard( m_aMutex ); @@ -596,28 +596,28 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet( m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY ); if ( xNameAccess.is() ) { - uno::Sequence< rtl::OUString > aKeys + uno::Sequence< OUString > aKeys = xNameAccess->getElementNames(); sal_Int32 nCount = aKeys.getLength(); if ( nCount > 0 ) { - rtl::OUString aKeyWithSlash = rKey; - rtl::OUString aKeyWithoutSlash; + OUString aKeyWithSlash = rKey; + OUString aKeyWithoutSlash; if ( aKeyWithSlash.lastIndexOf( sal_Unicode('/') != aKeyWithSlash.getLength() - 1 ) ) { - aKeyWithSlash += rtl::OUString( (sal_Unicode)'/' ); + aKeyWithSlash += OUString( (sal_Unicode)'/' ); aKeyWithoutSlash = rKey; } else if ( !rKey.isEmpty() ) aKeyWithoutSlash = rKey.copy( 0, rKey.getLength() - 1 ); - const rtl::OUString* pKeys = aKeys.getConstArray(); + const OUString* pKeys = aKeys.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString& rCurrKey = pKeys[ n ]; + const OUString& rCurrKey = pKeys[ n ]; if ( rCurrKey.compareTo( aKeyWithSlash, aKeyWithSlash.getLength() ) == 0 diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx index 33dd0c21f8ee..944fe01f1abc 100644 --- a/ucbhelper/source/provider/registerucb.cxx +++ b/ucbhelper/source/provider/registerucb.cxx @@ -43,9 +43,9 @@ bool registerAtUcb( uno::Reference< ucb::XContentProviderManager > const & rManager, uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory, - rtl::OUString const & rName, - rtl::OUString const & rArguments, - rtl::OUString const & rTemplate, + OUString const & rName, + OUString const & rArguments, + OUString const & rTemplate, ContentProviderRegistrationInfo * pInfo) throw (uno::RuntimeException) { @@ -53,7 +53,7 @@ registerAtUcb( "ucb::registerAtUcb(): No service factory"); bool bNoProxy = rArguments.startsWith("{noproxy}"); - rtl::OUString + OUString aProviderArguments(bNoProxy ? rArguments. copy(RTL_CONSTASCII_LENGTH("{noproxy}")) : @@ -68,7 +68,7 @@ registerAtUcb( { uno::Reference< beans::XPropertySet > xFactoryProperties( rServiceFactory, uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xContext = uno::Reference< uno::XComponentContext >( - xFactoryProperties->getPropertyValue( ::rtl::OUString( "DefaultContext" ) ), + xFactoryProperties->getPropertyValue( OUString( "DefaultContext" ) ), uno::UNO_QUERY ); xProxyFactory = uno::Reference< ucb::XContentProviderFactory >( diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 77409602b7df..858ebbad77d3 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -90,7 +90,7 @@ class PropertySetInfo : private: sal_Bool queryProperty( - const rtl::OUString& aName, beans::Property& rProp ); + const OUString& aName, beans::Property& rProp ); public: PropertySetInfo( @@ -108,9 +108,9 @@ public: virtual uno::Sequence< beans::Property > SAL_CALL getProperties() throw( uno::RuntimeException ); virtual beans::Property SAL_CALL getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( beans::UnknownPropertyException, uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasPropertyByName( const rtl::OUString& Name ) + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw( uno::RuntimeException ); }; @@ -122,7 +122,7 @@ public: struct equalStr_Impl { - bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const + bool operator()( const OUString& s1, const OUString& s2 ) const { return !!( s1 == s2 ); } @@ -130,7 +130,7 @@ struct equalStr_Impl struct hashStr_Impl { - size_t operator()( const rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } @@ -138,7 +138,7 @@ struct hashStr_Impl typedef cppu::OMultiTypeInterfaceContainerHelperVar < - rtl::OUString, + OUString, hashStr_Impl, equalStr_Impl > PropertyChangeListenerContainer; @@ -297,8 +297,8 @@ XTYPEPROVIDER_IMPL_9( ResultSet, //========================================================================= XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet, - rtl::OUString("ResultSet"), - rtl::OUString(RESULTSET_SERVICE_NAME ) ); + OUString("ResultSet"), + OUString(RESULTSET_SERVICE_NAME ) ); //========================================================================= // @@ -810,7 +810,7 @@ sal_Bool SAL_CALL ResultSet::wasNull() //========================================================================= // virtual -rtl::OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex ) +OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex ) throw( sdbc::SQLException, uno::RuntimeException ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) @@ -828,7 +828,7 @@ rtl::OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex ) m_pImpl->m_bWasNull = sal_True; m_pImpl->m_xDataSupplier->validate(); - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -1276,14 +1276,14 @@ void SAL_CALL ResultSet::close() //========================================================================= // virtual -rtl::OUString SAL_CALL ResultSet::queryContentIdentifierString() +OUString SAL_CALL ResultSet::queryContentIdentifierString() throw( uno::RuntimeException ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) return m_pImpl->m_xDataSupplier->queryContentIdentifierString( m_pImpl->m_nPos - 1 ); - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -1333,7 +1333,7 @@ ResultSet::getPropertySetInfo() //========================================================================= // virtual -void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName, +void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName, const uno::Any& ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -1345,13 +1345,13 @@ void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName, throw beans::UnknownPropertyException(); if ( aPropertyName.equals( - rtl::OUString("RowCount") ) ) + OUString("RowCount") ) ) { // property is read-only. throw lang::IllegalArgumentException(); } else if ( aPropertyName.equals( - rtl::OUString("IsRowCountFinal") ) ) + OUString("IsRowCountFinal") ) ) { // property is read-only. throw lang::IllegalArgumentException(); @@ -1365,7 +1365,7 @@ void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName, //========================================================================= // virtual uno::Any SAL_CALL ResultSet::getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -1376,12 +1376,12 @@ uno::Any SAL_CALL ResultSet::getPropertyValue( uno::Any aValue; if ( PropertyName.equals( - rtl::OUString("RowCount") ) ) + OUString("RowCount") ) ) { aValue <<= m_pImpl->m_xDataSupplier->currentCount(); } else if ( PropertyName.equals( - rtl::OUString("IsRowCountFinal") ) ) + OUString("IsRowCountFinal") ) ) { aValue <<= m_pImpl->m_xDataSupplier->isCountFinal(); } @@ -1396,7 +1396,7 @@ uno::Any SAL_CALL ResultSet::getPropertyValue( //========================================================================= // virtual void SAL_CALL ResultSet::addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1408,9 +1408,9 @@ void SAL_CALL ResultSet::addPropertyChangeListener( if ( !aPropertyName.isEmpty() && !aPropertyName.equals( - rtl::OUString("RowCount") ) && + OUString("RowCount") ) && !aPropertyName.equals( - rtl::OUString("IsRowCountFinal") ) ) + OUString("IsRowCountFinal") ) ) throw beans::UnknownPropertyException(); if ( !m_pImpl->m_pPropertyChangeListeners ) @@ -1424,7 +1424,7 @@ void SAL_CALL ResultSet::addPropertyChangeListener( //========================================================================= // virtual void SAL_CALL ResultSet::removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1434,9 +1434,9 @@ void SAL_CALL ResultSet::removePropertyChangeListener( if ( !aPropertyName.isEmpty() && !aPropertyName.equals( - rtl::OUString("RowCount") ) && + OUString("RowCount") ) && !aPropertyName.equals( - rtl::OUString("IsRowCountFinal") ) ) + OUString("IsRowCountFinal") ) ) throw beans::UnknownPropertyException(); if ( m_pImpl->m_pPropertyChangeListeners ) @@ -1448,7 +1448,7 @@ void SAL_CALL ResultSet::removePropertyChangeListener( //========================================================================= // virtual void SAL_CALL ResultSet::addVetoableChangeListener( - const rtl::OUString&, + const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1460,7 +1460,7 @@ void SAL_CALL ResultSet::addVetoableChangeListener( //========================================================================= // virtual void SAL_CALL ResultSet::removeVetoableChangeListener( - const rtl::OUString&, + const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1498,7 +1498,7 @@ void ResultSet::propertyChanged( const beans::PropertyChangeEvent& rEvt ) // Notify listeners interested in all properties. pPropsContainer - = m_pImpl->m_pPropertyChangeListeners->getContainer( rtl::OUString() ); + = m_pImpl->m_pPropertyChangeListeners->getContainer( OUString() ); if ( pPropsContainer ) { cppu::OInterfaceIteratorHelper aIter( *pPropsContainer ); @@ -1523,7 +1523,7 @@ void ResultSet::rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew ) propertyChanged( beans::PropertyChangeEvent( static_cast< cppu::OWeakObject * >( this ), - rtl::OUString("RowCount"), + OUString("RowCount"), sal_False, 1001, uno::makeAny( nOld ), // old value @@ -1539,7 +1539,7 @@ void ResultSet::rowCountFinal() propertyChanged( beans::PropertyChangeEvent( static_cast< cppu::OWeakObject * >( this ), - rtl::OUString("IsRowCountFinal"), + OUString("IsRowCountFinal"), sal_False, 1000, uno:: makeAny( sal_False ), // old value @@ -1586,7 +1586,7 @@ PropertySetInfo::PropertySetInfo( { beans::Property& rProp = pProperties[ n ]; - rProp.Name = rtl::OUString::createFromAscii( pEntry->pName ); + rProp.Name = OUString::createFromAscii( pEntry->pName ); rProp.Handle = pEntry->nHandle; rProp.Type = pEntry->pGetCppuType(); rProp.Attributes = pEntry->nAttributes; @@ -1639,7 +1639,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() //========================================================================= // virtual beans::Property SAL_CALL PropertySetInfo::getPropertyByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( beans::UnknownPropertyException, uno::RuntimeException ) { beans::Property aProp; @@ -1652,7 +1652,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName( //========================================================================= // virtual sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( - const rtl::OUString& Name ) + const OUString& Name ) throw( uno::RuntimeException ) { beans::Property aProp; @@ -1661,7 +1661,7 @@ sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( //========================================================================= sal_Bool PropertySetInfo::queryProperty( - const rtl::OUString& aName, beans::Property& rProp ) + const OUString& aName, beans::Property& rProp ) { sal_Int32 nCount = m_pProps->getLength(); const beans::Property* pProps = m_pProps->getConstArray(); diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index 7b3372111e8c..53a667b3c6c5 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -97,9 +97,9 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper, //========================================================================= XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper, - rtl::OUString( + OUString( "ResultSetImplHelper" ), - rtl::OUString( + OUString( DYNAMICRESULTSET_SERVICE_NAME ) ); //========================================================================= diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index 13e94ed2cc92..8329c2c86dc1 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -48,7 +48,6 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace com::sun::star::util; -using ::rtl::OUString; namespace ucbhelper_impl { @@ -443,7 +442,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) const Type& rType = m_aProps.getConstArray()[ column - 1 ].Type; sal_Int32 nType = DataType::OTHER; - if ( rType == getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) ) nType = DataType::VARCHAR; // XRow::getString else if ( rType == getCppuBooleanType() ) nType = DataType::BIT; // XRow::getBoolean diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx b/ucbhelper/source/provider/simpleauthenticationrequest.cxx index afe43e9e08c5..b66980f2422b 100644 --- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx +++ b/ucbhelper/source/provider/simpleauthenticationrequest.cxx @@ -26,12 +26,12 @@ using namespace ucbhelper; //========================================================================= SimpleAuthenticationRequest::SimpleAuthenticationRequest( - const rtl::OUString & rURL, - const rtl::OUString & rServerName, - const rtl::OUString & rRealm, - const rtl::OUString & rUserName, - const rtl::OUString & rPassword, - const rtl::OUString & rAccount, + const OUString & rURL, + const OUString & rServerName, + const OUString & rRealm, + const OUString & rUserName, + const OUString & rPassword, + const OUString & rAccount, sal_Bool bAllowPersistentStoring, sal_Bool bAllowUseSystemCredentials ) { @@ -66,16 +66,16 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest( //========================================================================= SimpleAuthenticationRequest::SimpleAuthenticationRequest( - const rtl::OUString & rURL, - const rtl::OUString & rServerName, + const OUString & rURL, + const OUString & rServerName, EntityType eRealmType, - const rtl::OUString & rRealm, + const OUString & rRealm, EntityType eUserNameType, - const rtl::OUString & rUserName, + const OUString & rUserName, EntityType ePasswordType, - const rtl::OUString & rPassword, + const OUString & rPassword, EntityType eAccountType, - const rtl::OUString & rAccount ) + const OUString & rAccount ) { // Fill request... ucb::URLAuthenticationRequest aRequest; diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx index d404b2eb3f07..f80e4bf1cd07 100644 --- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx +++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx @@ -26,7 +26,7 @@ using namespace ucbhelper; //========================================================================= SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity, const com::sun::star::uno::Reference pCertificate, - const rtl::OUString & hostname) + const OUString & hostname) { // Fill request... ucb::CertificateValidationRequest aRequest; diff --git a/ucbhelper/source/provider/simpleioerrorrequest.cxx b/ucbhelper/source/provider/simpleioerrorrequest.cxx index a23d02868750..fd859fa5c7eb 100644 --- a/ucbhelper/source/provider/simpleioerrorrequest.cxx +++ b/ucbhelper/source/provider/simpleioerrorrequest.cxx @@ -27,7 +27,7 @@ using namespace ucbhelper; SimpleIOErrorRequest::SimpleIOErrorRequest( const ucb::IOErrorCode eError, const uno::Sequence< uno::Any > & rArgs, - const rtl::OUString & rMessage, + const OUString & rMessage, const uno::Reference< ucb::XCommandProcessor > & xContext ) { // Fill request... diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx index 440104413c5f..fe7e42d2cebf 100644 --- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx +++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx @@ -25,9 +25,9 @@ using namespace ucbhelper; //========================================================================= SimpleNameClashResolveRequest::SimpleNameClashResolveRequest( - const rtl::OUString & rTargetFolderURL, - const rtl::OUString & rClashingName, - const rtl::OUString & rProposedNewName, + const OUString & rTargetFolderURL, + const OUString & rClashingName, + const OUString & rProposedNewName, sal_Bool bSupportsOverwriteData ) { // Fill request... diff --git a/unodevtools/inc/unodevtools/options.hxx b/unodevtools/inc/unodevtools/options.hxx index 7c1a9c1d5236..e1347829be7d 100644 --- a/unodevtools/inc/unodevtools/options.hxx +++ b/unodevtools/inc/unodevtools/options.hxx @@ -28,13 +28,13 @@ namespace unodevtools { //------------------------------------------------------------------------------- -sal_Bool readOption( rtl::OUString * pValue, const sal_Char * pOpt, - sal_uInt32 * pnIndex, const rtl::OUString & aArg) +sal_Bool readOption( OUString * pValue, const sal_Char * pOpt, + sal_uInt32 * pnIndex, const OUString & aArg) throw (com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------- sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt, - sal_uInt32 * pnIndex, const rtl::OUString & aArg); + sal_uInt32 * pnIndex, const OUString & aArg); } // end of namespace unodevtools diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 5604962bce0a..309f3c76ddad 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -120,8 +120,8 @@ OString generateCompHelperDeclaration(std::ostream & o, // generate component/service helper functions o << "// component and service helper functions:\n" - "::rtl::OUString SAL_CALL _getImplementationName();\n" - "css::uno::Sequence< ::rtl::OUString > SAL_CALL " + "OUString SAL_CALL _getImplementationName();\n" + "css::uno::Sequence< OUString > SAL_CALL " "_getSupportedServiceNames();\n" "css::uno::Reference< css::uno::XInterface > SAL_CALL _create(" " css::uno::Reference< css::uno::XComponentContext > const & " @@ -143,19 +143,19 @@ void generateCompHelperDefinition(std::ostream & o, OString nm; short nbrackets = generateNamespace(o, implname, true, nm); - o << "::rtl::OUString SAL_CALL _getImplementationName() {\n" - << " return ::rtl::OUString(\n" + o << "OUString SAL_CALL _getImplementationName() {\n" + << " return OUString(\n" << " \"" << implname << "\");\n}\n\n"; - o << "css::uno::Sequence< ::rtl::OUString > SAL_CALL " + o << "css::uno::Sequence< OUString > SAL_CALL " "_getSupportedServiceNames()\n{\n css::uno::Sequence< " - << "::rtl::OUString >" << " s(" << services.size() << ");\n"; + << "OUString >" << " s(" << services.size() << ");\n"; boost::unordered_set< OString, OStringHash >::const_iterator iter = services.begin(); short i=0; while (iter != services.end()) { - o << " s[" << i++ << "] = ::rtl::OUString(\"" + o << " s[" << i++ << "] = OUString(\"" << (*iter).replace('/','.') << "\");\n"; ++iter; } @@ -206,7 +206,7 @@ void generateXPropertySetBodies(std::ostream& o, << propertyhelper << " >::getPropertySetInfo();\n}\n\n"; - o << "void SAL_CALL " << classname << "setPropertyValue(const ::rtl::OUString" + o << "void SAL_CALL " << classname << "setPropertyValue(const OUString" " & aPropertyName, const css::uno::Any & aValue) throw (" "css::uno::RuntimeException, css::beans::UnknownPropertyException, " "css::beans::PropertyVetoException, css::lang::IllegalArgumentException, " @@ -215,13 +215,13 @@ void generateXPropertySetBodies(std::ostream& o, o << "css::uno::Any SAL_CALL " << classname << "getPropertyValue(const " - "::rtl::OUString & aPropertyName) throw (css::uno::RuntimeException, " + "OUString & aPropertyName) throw (css::uno::RuntimeException, " "css::beans::UnknownPropertyException, css::lang::WrappedTargetException)" "\n{\n return ::cppu::PropertySetMixin< " << propertyhelper << " >::getPropertyValue(aPropertyName);\n}\n\n"; o << "void SAL_CALL " << classname << "addPropertyChangeListener(const " - "::rtl::OUString & aPropertyName, const css::uno::Reference< " + "OUString & aPropertyName, const css::uno::Reference< " "css::beans::XPropertyChangeListener > & xListener) throw (" "css::uno::RuntimeException, css::beans::UnknownPropertyException, " "css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< " @@ -229,7 +229,7 @@ void generateXPropertySetBodies(std::ostream& o, << " >::addPropertyChangeListener(aPropertyName, xListener);\n}\n\n"; o << "void SAL_CALL " << classname << "removePropertyChangeListener(const " - "::rtl::OUString & aPropertyName, const css::uno::Reference< " + "OUString & aPropertyName, const css::uno::Reference< " "css::beans::XPropertyChangeListener > & xListener) throw (" "css::uno::RuntimeException, css::beans::UnknownPropertyException, " "css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< " @@ -237,7 +237,7 @@ void generateXPropertySetBodies(std::ostream& o, << " >::removePropertyChangeListener(aPropertyName, xListener);\n}\n\n"; o << "void SAL_CALL " << classname << "addVetoableChangeListener(const " - "::rtl::OUString & aPropertyName, const css::uno::Reference< " + "OUString & aPropertyName, const css::uno::Reference< " "css::beans::XVetoableChangeListener > & xListener) throw (" "css::uno::RuntimeException, css::beans::UnknownPropertyException, " "css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< " @@ -245,7 +245,7 @@ void generateXPropertySetBodies(std::ostream& o, << " >::addVetoableChangeListener(aPropertyName, xListener);\n}\n\n"; o << "void SAL_CALL " << classname << "removeVetoableChangeListener(const " - "::rtl::OUString & aPropertyName, const css::uno::Reference< " + "OUString & aPropertyName, const css::uno::Reference< " "css::beans::XVetoableChangeListener > & xListener) throw (" "css::uno::RuntimeException, css::beans::UnknownPropertyException, " "css::lang::WrappedTargetException)\n{\n ::cppu::PropertySetMixin< " @@ -309,54 +309,54 @@ void generateXAddInBodies(std::ostream& o, const OString & classname) { o << "// css::sheet::XAddIn:\n"; - o << "::rtl::OUString SAL_CALL " << classname << "getProgrammaticFuntionName(" - "const ::rtl::OUString & aDisplayName) throw (css::uno::RuntimeException)" - "\n{\n ::rtl::OUString ret;\n try {\n css::uno::Reference< " + o << "OUString SAL_CALL " << classname << "getProgrammaticFuntionName(" + "const OUString & aDisplayName) throw (css::uno::RuntimeException)" + "\n{\n OUString ret;\n try {\n css::uno::Reference< " "css::container::XNameAccess > xNAccess(m_xHAccess, css::uno::UNO_QUERY);\n" - " css::uno::Sequence< ::rtl::OUString > functions = " + " css::uno::Sequence< OUString > functions = " "xNAccess->getElementNames();\n sal_Int32 len = functions." - "getLength();\n ::rtl::OUString sDisplayName;\n" + "getLength();\n OUString sDisplayName;\n" " for (sal_Int32 i=0; i < len; ++i) {\n" " sDisplayName = getAddinProperty(functions[i], " - "::rtl::OUString(),\n " + "OUString(),\n " "sDISPLAYNAME);\n if (sDisplayName.equals(aDisplayName))\n" " return functions[i];\n }\n }\n" " catch ( const css::uno::RuntimeException & e ) {\n throw e;\n }\n" " catch ( css::uno::Exception & ) {\n }\n return ret;\n}\n\n"; - o << "::rtl::OUString SAL_CALL " << classname << "getDisplayFunctionName(const " - "::rtl::OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n" - "{\n return getAddinProperty(aProgrammaticName, ::rtl::OUString(), " + o << "OUString SAL_CALL " << classname << "getDisplayFunctionName(const " + "OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n" + "{\n return getAddinProperty(aProgrammaticName, OUString(), " "sDISPLAYNAME);\n}\n\n"; - o << "::rtl::OUString SAL_CALL " << classname << "getFunctionDescription(const " - "::rtl::OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n" - "{\n return getAddinProperty(aProgrammaticName, ::rtl::OUString(), " + o << "OUString SAL_CALL " << classname << "getFunctionDescription(const " + "OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n" + "{\n return getAddinProperty(aProgrammaticName, OUString(), " "sDESCRIPTION);\n}\n\n"; - o << "::rtl::OUString SAL_CALL " << classname << "getDisplayArgumentName(const " - "::rtl::OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw " + o << "OUString SAL_CALL " << classname << "getDisplayArgumentName(const " + "OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw " "(css::uno::RuntimeException)\n{\n return getAddinProperty(" "aProgrammaticFunctionName,\n m_functionMap[" "aProgrammaticFunctionName][nArgument],\n" " sDISPLAYNAME);\n}\n\n"; - o << "::rtl::OUString SAL_CALL " << classname << "getArgumentDescription(const " - "::rtl::OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw " + o << "OUString SAL_CALL " << classname << "getArgumentDescription(const " + "OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw " "(css::uno::RuntimeException)\n{\n return getAddinProperty(" "aProgrammaticFunctionName,\n " "m_functionMap[aProgrammaticFunctionName][nArgument],\n" " sDESCRIPTION);\n}\n\n"; - o << "::rtl::OUString SAL_CALL " << classname << "getProgrammaticCategoryName(" - "const ::rtl::OUString & aProgrammaticFunctionName) throw (" + o << "OUString SAL_CALL " << classname << "getProgrammaticCategoryName(" + "const OUString & aProgrammaticFunctionName) throw (" "css::uno::RuntimeException)\n{\n return getAddinProperty(" - "aProgrammaticFunctionName, ::rtl::OUString(), sCATEGORY);\n}\n\n"; + "aProgrammaticFunctionName, OUString(), sCATEGORY);\n}\n\n"; - o << "::rtl::OUString SAL_CALL " << classname << "getDisplayCategoryName(const " - "::rtl::OUString & aProgrammaticFunctionName) throw (" + o << "OUString SAL_CALL " << classname << "getDisplayCategoryName(const " + "OUString & aProgrammaticFunctionName) throw (" "css::uno::RuntimeException)\n{\n return getAddinProperty(" - "aProgrammaticFunctionName, ::rtl::OUString(), " + "aProgrammaticFunctionName, OUString(), " "sCATEGORYDISPLAYNAME);\n}\n\n"; } @@ -364,26 +364,26 @@ void generateXCompatibilityNamesBodies(std::ostream& o, const OString & classnam { o << "// css::sheet::XCompatibilityNames:\n" "css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL " << classname - << "getCompatibilityNames(const ::rtl::OUString & aProgrammaticName) throw " + << "getCompatibilityNames(const OUString & aProgrammaticName) throw " "(css::uno::RuntimeException)\n{\n css::uno::Sequence< " "css::sheet::LocalizedName > seqLocalizedNames;\n try {\n " - "::rtl::OUStringBuffer buf(" + "OUStringBuffer buf(" "aProgrammaticName);\n buf.appendAscii(\"/CompatibilityName\");\n" - " ::rtl::OUString hname(buf.makeStringAndClear());\n\n " + " OUString hname(buf.makeStringAndClear());\n\n " "if ( m_xCompAccess->hasByHierarchicalName(hname) ) {\n" " css::uno::Reference< css::container::XNameAccess > " "xNameAccess(\n" " m_xCompAccess->getByHierarchicalName(hname), " - "css::uno::UNO_QUERY);\n\n css::uno::Sequence< ::rtl::OUString" + "css::uno::UNO_QUERY);\n\n css::uno::Sequence< OUString" " > elems = \n xNameAccess->getElementNames();" "\n ::sal_Int32 len = elems.getLength();\n\n " - "seqLocalizedNames.realloc(len);\n\n ::rtl::OUString " + "seqLocalizedNames.realloc(len);\n\n OUString " "sCompatibilityName;\n for (::sal_Int32 i=0; i < len; ++i) {\n" - " ::rtl::OUString sLocale(elems[i]);\n " + " OUString sLocale(elems[i]);\n " "xNameAccess->getByName(sLocale) >>= sCompatibilityName;\n\n" " css::lang::Locale aLocale;\n " "::sal_Int32 nIndex = 0, nToken = 0;\n " - "do {\n ::rtl::OUString aToken = sLocale.getToken(0, '-', " + "do {\n OUString aToken = sLocale.getToken(0, '-', " "nIndex);\n switch (nToken++) {\n " "case 0:\n aLocale.Language = aToken;\n" " break;\n case 1:\n" @@ -461,7 +461,7 @@ void generateXDispatchProvider(std::ostream& o, o << "// css::frame::XDispatchProvider:\n" "css::uno::Reference< css::frame::XDispatch > SAL_CALL " << classname << "queryDispatch( const css::util::URL& aURL," - " const ::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags ) " + " const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) " "throw(css::uno::RuntimeException)\n{\n css::uno::Reference< " "css::frame::XDispatch > xRet;\n" " if ( !m_xFrame.is() )\n return 0;\n\n"; @@ -513,20 +513,20 @@ void generateAddinConstructorAndHelper(std::ostream& o, o << " css::uno::Reference< css::lang::XMultiServiceFactory > xProvider" "(\n m_xContext->getServiceManager()->createInstanceWithContext" - "(\n ::rtl::OUString(\n " + "(\n OUString(\n " " \"com.sun.star.configuration.ConfigurationProvider\")," "\n m_xContext ), css::uno::UNO_QUERY );\n\n"; - o << " ::rtl::OUString sReadOnlyView(\n" + o << " OUString sReadOnlyView(\n" " \"com.sun.star.configuration.ConfigurationAccess\");\n\n"; - o << " ::rtl::OUStringBuffer sPath(::rtl::OUString(\n" + o << " OUStringBuffer sPath(OUString(\n" " \"/org.openoffice.Office.CalcAddIns/AddInInfo/\"));\n" " sPath.appendAscii(sADDIN_SERVICENAME);\n" " sPath.appendAscii(\"/AddInFunctions\");\n\n" " // create arguments: nodepath\n" " css::beans::PropertyValue aArgument;\n" - " aArgument.Name = ::rtl::OUString(\"nodepath\");\n" + " aArgument.Name = OUString(\"nodepath\");\n" " aArgument.Value <<= sPath.makeStringAndClear();\n\n" " css::uno::Sequence< css::uno::Any > aArguments(1);\n" " aArguments[0] <<= aArgument;\n\n"; @@ -541,8 +541,8 @@ void generateAddinConstructorAndHelper(std::ostream& o, o << " // extend arguments to create a view for all locales to get " "simple\n // access to the compatibilityname property\n" - " aArgument.Name = ::rtl::OUString(\"locale\");\n" - " aArgument.Value <<= ::rtl::OUString(\"*\");\n" + " aArgument.Name = OUString(\"locale\");\n" + " aArgument.Value <<= OUString(\"*\");\n" " aArguments.realloc(2);\n" " aArguments[1] <<= aArgument;\n\n" " // create view for all locales\n" @@ -553,12 +553,12 @@ void generateAddinConstructorAndHelper(std::ostream& o, o << " }\n catch ( css::uno::Exception & ) {\n }\n}\n\n"; - o << "// addin configuration property helper function:\n::rtl::OUString " - "SAL_CALL " << classname << "::getAddinProperty(const ::rtl::OUString &" - " funcName, const ::rtl::OUString & paramName, const char * propName) " + o << "// addin configuration property helper function:\nOUString " + "SAL_CALL " << classname << "::getAddinProperty(const OUString &" + " funcName, const OUString & paramName, const char * propName) " "throw (css::uno::RuntimeException)\n{\n" - " ::rtl::OUString ret;\n try {\n " - "::rtl::OUStringBuffer buf(funcName);\n" + " OUString ret;\n try {\n " + "OUStringBuffer buf(funcName);\n" " if (!paramName.isEmpty()) {\n" " buf.appendAscii(\"/Parameters/\");\n" " buf.append(paramName);\n }\n\n" @@ -566,7 +566,7 @@ void generateAddinConstructorAndHelper(std::ostream& o, " m_xHAccess->getByHierarchicalName(\n" " buf.makeStringAndClear()), css::uno::UNO_QUERY);\n" " xPropSet->getPropertyValue(\n " - "::rtl::OUString(propName)) >>= ret;\n }\n" + "OUString(propName)) >>= ret;\n }\n" " catch ( const css::uno::RuntimeException & e ) {\n throw e;\n }\n" " catch ( css::uno::Exception & ) {\n }\n return ret;\n"; } @@ -665,8 +665,8 @@ OString generateClassDefinition(std::ostream& o, // generate component/service helper functions // o << " // component and service helper functions:\n" -// << " static ::rtl::OUString SAL_CALL _getImplementationName();\n" -// << " static css::uno::Sequence< ::rtl::OUString > SAL_CALL " +// << " static OUString SAL_CALL _getImplementationName();\n" +// << " static css::uno::Sequence< OUString > SAL_CALL " // << "_getSupportedServiceNames();\n" // << " static css::uno::Reference< css::uno::XInterface > SAL_CALL _create(" // << "\n css::uno::Reference< css::uno::XComponentContext > const & " @@ -717,12 +717,12 @@ OString generateClassDefinition(std::ostream& o, << " virtual ~" << classname << "() {}\n\n"; if (options.componenttype == 2) { - o << " typedef boost::unordered_map< ::sal_Int32, rtl::OUString, " + o << " typedef boost::unordered_map< ::sal_Int32, OUString, " "boost::hash<::sal_Int32> > ParamMap;\n" - " typedef boost::unordered_map< rtl::OUString, ParamMap, " - "rtl::OUStringHash > FunctionMap;\n\n" - " ::rtl::OUString SAL_CALL getAddinProperty(const ::rtl::OUString & " - "funcName, const ::rtl::OUString & paramName, const char * propName) " + " typedef boost::unordered_map< OUString, ParamMap, " + "OUStringHash > FunctionMap;\n\n" + " OUString SAL_CALL getAddinProperty(const OUString & " + "funcName, const OUString & paramName, const char * propName) " "throw (css::uno::RuntimeException);\n\n"; } @@ -829,7 +829,7 @@ OString generateClassDefinition(std::ostream& o, buffer.append("IMPLEMENTS_PROPERTY_ACCESS"); } o << buffer.makeStringAndClear() - << "), css::uno::Sequence< ::rtl::OUString >()),\n"; + << "), css::uno::Sequence< OUString >()),\n"; } o << " m_xContext(context)"; @@ -858,20 +858,20 @@ void generateXServiceInfoBodies(std::ostream& o, OString const & comphelpernamespace) { o << "// com.sun.star.uno.XServiceInfo:\n" - << "::rtl::OUString SAL_CALL " << classname << "getImplementationName() " + << "OUString SAL_CALL " << classname << "getImplementationName() " << "throw (css::uno::RuntimeException)\n{\n " << "return " << comphelpernamespace << "::_getImplementationName();\n}\n\n"; o << "::sal_Bool SAL_CALL " << classname - << "supportsService(::rtl::OUString const & " + << "supportsService(OUString const & " << "serviceName) throw (css::uno::RuntimeException)\n{\n " - << "css::uno::Sequence< ::rtl::OUString > serviceNames = " + << "css::uno::Sequence< OUString > serviceNames = " << comphelpernamespace << "::_getSupportedServiceNames();\n " << "for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {\n " << " if (serviceNames[i] == serviceName)\n return sal_True;\n" << " }\n return sal_False;\n}\n\n"; - o << "css::uno::Sequence< ::rtl::OUString > SAL_CALL " << classname + o << "css::uno::Sequence< OUString > SAL_CALL " << classname << "getSupportedServiceNames() throw (css::uno::RuntimeException)\n{\n " << "return " << comphelpernamespace << "::_getSupportedServiceNames();\n}\n\n"; diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index 640d0545464d..2a99b842fe87 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -318,10 +318,10 @@ void printSetPropertyMixinBody(std::ostream & o, o << " v <<= " << buffer2.makeStringAndClear() << ";\n\n"; } - o << " prepareSet(\n rtl::OUString(\"" + o << " prepareSet(\n OUString(\"" << fieldname << "\"),\n css::uno::Any(), v, "; } else { - o << " prepareSet(\n rtl::OUString(\"" + o << " prepareSet(\n OUString(\"" << fieldname << "\"),\n css::uno::Any(), css::uno::Any(), "; } @@ -409,9 +409,9 @@ void printMethods(std::ostream & o, if (body && options.componenttype == 2) { if (type.equals("com/sun/star/lang/XServiceName")) { o << "// ::com::sun::star::lang::XServiceName:\n" - "::rtl::OUString SAL_CALL " << classname << "getServiceName() " + "OUString SAL_CALL " << classname << "getServiceName() " "throw (css::uno::RuntimeException)\n{\n " - "return ::rtl::OUString(" + "return OUString(" "sADDIN_SERVICENAME);\n}\n"; generated.add(type); return; diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx index 1b63edaccdab..27703c7e3f40 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx @@ -32,7 +32,7 @@ using namespace ::codemaker::cpp; namespace skeletonmaker { -void printLicenseHeader(std::ostream& o, rtl::OString const & filename) +void printLicenseHeader(std::ostream& o, OString const & filename) { sal_Int32 index = -1; #ifdef SAL_UNX @@ -639,7 +639,7 @@ void generateFunctionParamterMap(std::ostream& o, for ( sal_uInt16 p = 0; p < reader.getMethodParameterCount(m); ++p ) { if ( options.language == 2 ) { o << " fpm[" << p - << "] = ::rtl::OUString(\"" + << "] = OUString(\"" << codemaker::convertString(reader.getMethodParameterName(m, p)) << "\");\n"; } @@ -658,7 +658,7 @@ void generateFunctionParamterMap(std::ostream& o, } if ( options.language == 2 ) { - o << " m_functionMap[::rtl::OUString(\"" + o << " m_functionMap[OUString(\"" << sMethod << "\")] = fpm;\n\n"; } else { diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.hxx b/unodevtools/source/skeletonmaker/skeletoncommon.hxx index 8fc3951c39d6..24206fe21812 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.hxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.hxx @@ -33,11 +33,11 @@ namespace skeletonmaker { -typedef ::std::map< ::rtl::OString, ::std::vector< ::rtl::OString >, - ::std::less< ::rtl::OString > > ProtocolCmdMap; +typedef ::std::map< OString, ::std::vector< OString >, + ::std::less< OString > > ProtocolCmdMap; -typedef ::std::vector< ::std::pair< rtl::OString, - ::std::pair< rtl::OString, sal_Int16 > > > AttributeInfo; +typedef ::std::vector< ::std::pair< OString, + ::std::pair< OString, sal_Int16 > > > AttributeInfo; struct ProgramOptions { @@ -61,8 +61,8 @@ struct ProgramOptions { // 2 = calc add-in // 3 = add-on short componenttype; - rtl::OString outputpath; - rtl::OString implname; + OString outputpath; + OString implname; ProtocolCmdMap protocolCmdMap; }; @@ -73,7 +73,7 @@ struct ProgramOptions { @param o specifies the output stream @param filename specifies the source file name */ -void printLicenseHeader(std::ostream& o, rtl::OString const & filename); +void printLicenseHeader(std::ostream& o, OString const & filename); /** create dependent on the output path, the implementation name and the @@ -92,34 +92,34 @@ void printLicenseHeader(std::ostream& o, rtl::OString const & filename); @return true if output is generated to standard out or else false */ bool getOutputStream(ProgramOptions const & options, - rtl::OString const & extension, + OString const & extension, std::ostream** ppOutputStream, - rtl::OString & targetSourceFileName, - rtl::OString & tmpSourceFileName); + OString & targetSourceFileName, + OString & tmpSourceFileName); codemaker::UnoType::Sort decomposeResolveAndCheck( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type, + rtl::Reference< TypeManager > const & manager, OString const & type, bool resolveTypedefs, bool allowVoid, bool allowExtraEntities, - RTTypeClass * typeClass, rtl::OString * name, sal_Int32 * rank, - std::vector< rtl::OString > * arguments); + RTTypeClass * typeClass, OString * name, sal_Int32 * rank, + std::vector< OString > * arguments); void checkType(rtl::Reference< TypeManager > const & manager, - rtl::OString const & type, - boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaceTypes, - boost::unordered_set< rtl::OString, rtl::OStringHash >& serviceTypes, + OString const & type, + boost::unordered_set< OString, OStringHash >& interfaceTypes, + boost::unordered_set< OString, OStringHash >& serviceTypes, AttributeInfo& properties); void checkDefaultInterfaces( - boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces, - const boost::unordered_set< rtl::OString, rtl::OStringHash >& services, - const rtl::OString & propertyhelper); + boost::unordered_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& services, + const OString & propertyhelper); -rtl::OString checkPropertyHelper( +OString checkPropertyHelper( ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, - const boost::unordered_set< rtl::OString, rtl::OStringHash >& services, - const boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& services, + const boost::unordered_set< OString, OStringHash >& interfaces, AttributeInfo& attributes, - boost::unordered_set< rtl::OString, rtl::OStringHash >& propinterfaces); + boost::unordered_set< OString, OStringHash >& propinterfaces); /** checks whether the return and parameters types are valid and allowed @@ -145,7 +145,7 @@ void checkAddInTypes(rtl::Reference< TypeManager > const & manager, @return true if XComponent have to be supported */ bool checkXComponentSupport(rtl::Reference< TypeManager > const & manager, - boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces); + boost::unordered_set< OString, OStringHash >& interfaces); sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader, @@ -155,7 +155,7 @@ sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader, void generateFunctionParameterMap(std::ostream& o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, - const boost::unordered_set< ::rtl::OString, ::rtl::OStringHash >& interfaces); + const boost::unordered_set< OString, OStringHash >& interfaces); } diff --git a/unodevtools/source/skeletonmaker/skeletoncpp.hxx b/unodevtools/source/skeletonmaker/skeletoncpp.hxx index 3ce20d13ab64..6c7aed726b27 100644 --- a/unodevtools/source/skeletonmaker/skeletoncpp.hxx +++ b/unodevtools/source/skeletonmaker/skeletoncpp.hxx @@ -36,13 +36,13 @@ namespace skeletonmaker { namespace cpp { void printType(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, codemaker::UnoType::Sort sort, RTTypeClass typeClass, - rtl::OString const & name, sal_Int32 rank, - std::vector< rtl::OString > const & arguments, + OString const & name, sal_Int32 rank, + std::vector< OString > const & arguments, short referenceType, bool defaultvalue=false); void printType(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, - rtl::OString const & type, short referenceType, + OString const & type, short referenceType, bool defaultvalue=false); @@ -51,14 +51,14 @@ bool printConstructorParameters(std::ostream & o, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, typereg::Reader const & outerReader, - std::vector< rtl::OString > const & arguments); + std::vector< OString > const & arguments); void printConstructor(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, - std::vector< rtl::OString > const & arguments); + std::vector< OString > const & arguments); void printMethodParameters(std::ostream & o, @@ -80,11 +80,11 @@ void printMethods(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, codemaker::GeneratedTypeSet & generated, - rtl::OString const & delegate, - rtl::OString const & classname=rtl::OString(), - rtl::OString const & indentation=rtl::OString(), + OString const & delegate, + OString const & classname=OString(), + OString const & indentation=OString(), bool defaultvalue=false, - rtl::OString const & propertyhelper=rtl::OString()); + OString const & propertyhelper=OString()); void printConstructionMethods(std::ostream & o, @@ -97,8 +97,8 @@ void printServiceMembers(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, - rtl::OString const & type, - rtl::OString const & delegate); + OString const & type, + OString const & delegate); void printMapsToCppType(std::ostream & o, @@ -106,26 +106,26 @@ void printMapsToCppType(std::ostream & o, rtl::Reference< TypeManager > const & manager, codemaker::UnoType::Sort sort, RTTypeClass typeClass, - rtl::OString const & name, + OString const & name, sal_Int32 rank, - std::vector< rtl::OString > const & arguments, + std::vector< OString > const & arguments, const char * cppTypeSort); void generateDocumentation(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, - rtl::OString const & type, - rtl::OString const & delegate); + OString const & type, + OString const & delegate); void generateSkeleton(ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, - std::vector< rtl::OString > const & types); + std::vector< OString > const & types); void generateCalcAddin(ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, - std::vector< rtl::OString > const & types); + std::vector< OString > const & types); } } diff --git a/unodevtools/source/skeletonmaker/skeletonjava.hxx b/unodevtools/source/skeletonmaker/skeletonjava.hxx index 41da0e06223c..4ff907f4088b 100644 --- a/unodevtools/source/skeletonmaker/skeletonjava.hxx +++ b/unodevtools/source/skeletonmaker/skeletonjava.hxx @@ -29,13 +29,13 @@ namespace skeletonmaker { namespace java { void printType(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, codemaker::UnoType::Sort sort, RTTypeClass typeClass, - rtl::OString const & name, sal_Int32 rank, - std::vector< rtl::OString > const & arguments, + OString const & name, sal_Int32 rank, + std::vector< OString > const & arguments, bool referenceType, bool defaultvalue=false); void printType(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, - rtl::OString const & type, bool referenceType, + OString const & type, bool referenceType, bool defaultvalue=false); bool printConstructorParameters(std::ostream & o, @@ -43,12 +43,12 @@ bool printConstructorParameters(std::ostream & o, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, typereg::Reader const & outerReader, - std::vector< rtl::OString > const & arguments); + std::vector< OString > const & arguments); void printConstructor(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, - std::vector< rtl::OString > const & arguments); + std::vector< OString > const & arguments); void printMethodParameters(std::ostream & o, ProgramOptions const & options, @@ -67,8 +67,8 @@ void printMethods(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, codemaker::GeneratedTypeSet & generated, - rtl::OString const & delegate, - rtl::OString const & indentation=rtl::OString(), + OString const & delegate, + OString const & indentation=OString(), bool defaultvalue=false, bool usepropertymixin=false); @@ -81,25 +81,25 @@ void printServiceMembers(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, - rtl::OString const & type, - rtl::OString const & delegate); + OString const & type, + OString const & delegate); void printMapsToJavaType(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, codemaker::UnoType::Sort sort, RTTypeClass typeClass, - rtl::OString const & name, sal_Int32 rank, - std::vector< rtl::OString > const & arguments, + OString const & name, sal_Int32 rank, + std::vector< OString > const & arguments, const char * javaTypeSort); void generateDocumentation(std::ostream & o, ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, - rtl::OString const & type, - rtl::OString const & delegate); + OString const & type, + OString const & delegate); -void generateSkeleton(ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, std::vector< rtl::OString > const & types); +void generateSkeleton(ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, std::vector< OString > const & types); } } diff --git a/unodevtools/source/unodevtools/typeblob.cxx b/unodevtools/source/unodevtools/typeblob.cxx index e65fdf69074b..7f2a6fdfe784 100644 --- a/unodevtools/source/unodevtools/typeblob.cxx +++ b/unodevtools/source/unodevtools/typeblob.cxx @@ -47,10 +47,6 @@ using namespace com::sun::star::container; using namespace com::sun::star::reflection; using namespace codemaker; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; namespace unodevtools { @@ -224,7 +220,7 @@ void writeAttributeMethodData( if (seqExcp.getLength() > 0) { rWriter.setMethodData(methodindex, OUString(), methodmode, xAttr->getMemberName(), - rtl::OUString("void"), + OUString("void"), 0, (sal_uInt16)seqExcp.getLength()); for (sal_Int32 i=0; i < seqExcp.getLength(); i++) { diff --git a/unoidl/inc/unoidl/legacyprovider.hxx b/unoidl/inc/unoidl/legacyprovider.hxx index 68db79c933c2..6f89f18d2d47 100644 --- a/unoidl/inc/unoidl/legacyprovider.hxx +++ b/unoidl/inc/unoidl/legacyprovider.hxx @@ -26,13 +26,13 @@ class LO_DLLPUBLIC_UNOIDL LegacyProvider: public Provider { public: // throws FileFormatException, NoSuchFileException: LegacyProvider( - rtl::Reference< Manager > const & manager, rtl::OUString const & uri); + rtl::Reference< Manager > const & manager, OUString const & uri); // throws FileFormatException: virtual rtl::Reference< MapCursor > createRootCursor() const; // throws FileFormatException: - virtual rtl::Reference< Entity > findEntity(rtl::OUString const & name) + virtual rtl::Reference< Entity > findEntity(OUString const & name) const; private: diff --git a/unoidl/inc/unoidl/unoidl.hxx b/unoidl/inc/unoidl/unoidl.hxx index 5597227c16e0..ad4702d50ca5 100644 --- a/unoidl/inc/unoidl/unoidl.hxx +++ b/unoidl/inc/unoidl/unoidl.hxx @@ -25,25 +25,25 @@ namespace unoidl { class LO_DLLPUBLIC_UNOIDL NoSuchFileException { public: - SAL_DLLPRIVATE NoSuchFileException(rtl::OUString const & uri): uri_(uri) {} + SAL_DLLPRIVATE NoSuchFileException(OUString const & uri): uri_(uri) {} SAL_DLLPRIVATE NoSuchFileException(NoSuchFileException const & other): uri_(other.uri_) {} virtual SAL_DLLPRIVATE ~NoSuchFileException() throw (); - rtl::OUString getUri() const { return uri_; } + OUString getUri() const { return uri_; } private: void operator =(NoSuchFileException) SAL_DELETED_FUNCTION; - rtl::OUString uri_; + OUString uri_; }; class LO_DLLPUBLIC_UNOIDL FileFormatException { public: SAL_DLLPRIVATE FileFormatException( - rtl::OUString const & uri, rtl::OUString const & detail): + OUString const & uri, OUString const & detail): uri_(uri), detail_(detail) {} @@ -53,15 +53,15 @@ public: virtual SAL_DLLPRIVATE ~FileFormatException() throw (); - rtl::OUString getUri() const { return uri_; } + OUString getUri() const { return uri_; } - rtl::OUString getDetail() const { return detail_; } + OUString getDetail() const { return detail_; } private: void operator =(FileFormatException) SAL_DELETED_FUNCTION; - rtl::OUString uri_; - rtl::OUString detail_; + OUString uri_; + OUString detail_; }; class LO_DLLPUBLIC_UNOIDL Entity: public salhelper::SimpleReferenceObject { @@ -88,7 +88,7 @@ private: class LO_DLLPUBLIC_UNOIDL MapCursor: public salhelper::SimpleReferenceObject { public: // throws FileFormatException: - virtual rtl::Reference< Entity > getNext(rtl::OUString * name) = 0; + virtual rtl::Reference< Entity > getNext(OUString * name) = 0; protected: SAL_DLLPRIVATE MapCursor() {} @@ -99,7 +99,7 @@ protected: class LO_DLLPUBLIC_UNOIDL ModuleEntity: public Entity { public: // throws FileFormatException: - virtual std::vector< rtl::OUString > getMemberNames() const = 0; + virtual std::vector< OUString > getMemberNames() const = 0; // throws FileFormatException: virtual rtl::Reference< MapCursor > createCursor() const = 0; @@ -128,11 +128,11 @@ private: class LO_DLLPUBLIC_UNOIDL EnumTypeEntity: public PublishableEntity { public: struct Member { - Member(rtl::OUString const & theName, sal_Int32 theValue): + Member(OUString const & theName, sal_Int32 theValue): name(theName), value(theValue) {} - rtl::OUString name; + OUString name; sal_Int32 value; }; @@ -153,23 +153,23 @@ private: class LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity: public PublishableEntity { public: struct Member { - Member(rtl::OUString const & theName, rtl::OUString const & theType): + Member(OUString const & theName, OUString const & theType): name(theName), type(theType) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; }; SAL_DLLPRIVATE PlainStructTypeEntity( - bool published, rtl::OUString const & directBase, + bool published, OUString const & directBase, std::vector< Member > const & directMembers): PublishableEntity(SORT_PLAIN_STRUCT_TYPE, published), directBase_(directBase), directMembers_(directMembers) {} - rtl::OUString getDirectBase() const { return directBase_; } + OUString getDirectBase() const { return directBase_; } std::vector< Member > const & getDirectMembers() const { return directMembers_; } @@ -177,7 +177,7 @@ public: private: virtual SAL_DLLPRIVATE ~PlainStructTypeEntity() throw (); - rtl::OUString directBase_; + OUString directBase_; std::vector< Member > directMembers_; }; @@ -187,26 +187,26 @@ class LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity: public: struct Member { Member( - rtl::OUString const & theName, rtl::OUString const & theType, + OUString const & theName, OUString const & theType, bool theParameterized): name(theName), type(theType), parameterized(theParameterized) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; bool parameterized; }; SAL_DLLPRIVATE PolymorphicStructTypeTemplateEntity( - bool published, std::vector< rtl::OUString > const & typeParameters, + bool published, std::vector< OUString > const & typeParameters, std::vector< Member > const & members): PublishableEntity(SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE, published), typeParameters_(typeParameters), members_(members) {} - std::vector< rtl::OUString > const & getTypeParameters() const + std::vector< OUString > const & getTypeParameters() const { return typeParameters_; } std::vector< Member > const & getMembers() const { return members_; } @@ -214,30 +214,30 @@ public: private: virtual SAL_DLLPRIVATE ~PolymorphicStructTypeTemplateEntity() throw (); - std::vector< rtl::OUString > typeParameters_; + std::vector< OUString > typeParameters_; std::vector< Member > members_; }; class LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity: public PublishableEntity { public: struct Member { - Member(rtl::OUString const & theName, rtl::OUString const & theType): + Member(OUString const & theName, OUString const & theType): name(theName), type(theType) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; }; SAL_DLLPRIVATE ExceptionTypeEntity( - bool published, rtl::OUString const & directBase, + bool published, OUString const & directBase, std::vector< Member > const & directMembers): PublishableEntity(SORT_EXCEPTION_TYPE, published), directBase_(directBase), directMembers_(directMembers) {} - rtl::OUString getDirectBase() const { return directBase_; } + OUString getDirectBase() const { return directBase_; } std::vector< Member > const & getDirectMembers() const { return directMembers_; } @@ -245,7 +245,7 @@ public: private: virtual SAL_DLLPRIVATE ~ExceptionTypeEntity() throw (); - rtl::OUString directBase_; + OUString directBase_; std::vector< Member > directMembers_; }; @@ -253,26 +253,26 @@ class LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity: public PublishableEntity { public: struct Attribute { Attribute( - rtl::OUString const & theName, rtl::OUString const & theType, + OUString const & theName, OUString const & theType, bool theBound, bool theReadOnly, - std::vector< rtl::OUString > const & theGetExceptions, - std::vector< rtl::OUString > const & theSetExceptions): + std::vector< OUString > const & theGetExceptions, + std::vector< OUString > const & theSetExceptions): name(theName), type(theType), bound(theBound), readOnly(theReadOnly), getExceptions(theGetExceptions), setExceptions(theSetExceptions) { assert(!theReadOnly || theSetExceptions.empty()); } - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; bool bound; bool readOnly; - std::vector< rtl::OUString > getExceptions; + std::vector< OUString > getExceptions; - std::vector< rtl::OUString > setExceptions; + std::vector< OUString > setExceptions; }; struct Method { @@ -280,39 +280,39 @@ public: enum Direction { DIRECTION_IN, DIRECTION_OUT, DIRECTION_IN_OUT }; Parameter( - rtl::OUString const & theName, rtl::OUString const & theType, + OUString const & theName, OUString const & theType, Direction theDirection): name(theName), type(theType), direction(theDirection) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; Direction direction; }; Method( - rtl::OUString const & theName, rtl::OUString const & theReturnType, + OUString const & theName, OUString const & theReturnType, std::vector< Parameter > const & theParameters, - std::vector< rtl::OUString > const & theExceptions): + std::vector< OUString > const & theExceptions): name(theName), returnType(theReturnType), parameters(theParameters), exceptions(theExceptions) {} - rtl::OUString name; + OUString name; - rtl::OUString returnType; + OUString returnType; std::vector< Parameter > parameters; - std::vector< rtl::OUString > exceptions; + std::vector< OUString > exceptions; }; SAL_DLLPRIVATE InterfaceTypeEntity( bool published, - std::vector< rtl::OUString > const & directMandatoryBases, - std::vector< rtl::OUString > const & directOptionalBases, + std::vector< OUString > const & directMandatoryBases, + std::vector< OUString > const & directOptionalBases, std::vector< Attribute > const & directAttributes, std::vector< Method > const & directMethods): PublishableEntity(SORT_INTERFACE_TYPE, published), @@ -321,10 +321,10 @@ public: directAttributes_(directAttributes), directMethods_(directMethods) {} - std::vector< rtl::OUString > const & getDirectMandatoryBases() const + std::vector< OUString > const & getDirectMandatoryBases() const { return directMandatoryBases_; } - std::vector< rtl::OUString > const & getDirectOptionalBases() const + std::vector< OUString > const & getDirectOptionalBases() const { return directOptionalBases_; } std::vector< Attribute > const & getDirectAttributes() const @@ -336,24 +336,24 @@ public: private: virtual SAL_DLLPRIVATE ~InterfaceTypeEntity() throw (); - std::vector< rtl::OUString > directMandatoryBases_; - std::vector< rtl::OUString > directOptionalBases_; + std::vector< OUString > directMandatoryBases_; + std::vector< OUString > directOptionalBases_; std::vector< Attribute > directAttributes_; std::vector< Method > directMethods_; }; class LO_DLLPUBLIC_UNOIDL TypedefEntity: public PublishableEntity { public: - SAL_DLLPRIVATE TypedefEntity(bool published, rtl::OUString const & type): + SAL_DLLPRIVATE TypedefEntity(bool published, OUString const & type): PublishableEntity(SORT_TYPEDEF, published), type_(type) {} - rtl::OUString getType() const { return type_; } + OUString getType() const { return type_; } private: virtual SAL_DLLPRIVATE ~TypedefEntity() throw (); - rtl::OUString type_; + OUString type_; }; struct LO_DLLPUBLIC_UNOIDL ConstantValue { @@ -412,11 +412,11 @@ struct LO_DLLPUBLIC_UNOIDL ConstantValue { class LO_DLLPUBLIC_UNOIDL ConstantGroupEntity: public PublishableEntity { public: struct Member { - Member(rtl::OUString const & theName, ConstantValue const & theValue): + Member(OUString const & theName, ConstantValue const & theValue): name(theName), value(theValue) {} - rtl::OUString name; + OUString name; ConstantValue value; }; @@ -441,14 +441,14 @@ public: struct Constructor { struct Parameter { Parameter( - rtl::OUString const & theName, rtl::OUString const & theType, + OUString const & theName, OUString const & theType, bool theRest): name(theName), type(theType), rest(theRest) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; bool rest; }; @@ -456,30 +456,30 @@ public: Constructor(): defaultConstructor(true) {} Constructor( - rtl::OUString const & theName, + OUString const & theName, std::vector< Parameter > const & theParameters, - std::vector< rtl::OUString > const & theExceptions): + std::vector< OUString > const & theExceptions): name(theName), parameters(theParameters), exceptions(theExceptions), defaultConstructor(false) {} - rtl::OUString name; + OUString name; std::vector< Parameter > parameters; - std::vector< rtl::OUString > exceptions; + std::vector< OUString > exceptions; bool defaultConstructor; }; SAL_DLLPRIVATE SingleInterfaceBasedServiceEntity( - bool published, rtl::OUString const & base, + bool published, OUString const & base, std::vector< Constructor > const & constructors): PublishableEntity(SORT_SINGLE_INTERFACE_BASED_SERVICE, published), base_(base), constructors_(constructors) {} - rtl::OUString getBase() const { return base_; } + OUString getBase() const { return base_; } std::vector< Constructor > const & getConstructors() const { return constructors_; } @@ -487,7 +487,7 @@ public: private: virtual SAL_DLLPRIVATE ~SingleInterfaceBasedServiceEntity() throw (); - rtl::OUString base_; + OUString base_; std::vector< Constructor > constructors_; }; @@ -509,24 +509,24 @@ public: }; Property( - rtl::OUString const & theName, rtl::OUString const & theType, + OUString const & theName, OUString const & theType, Attributes theAttributes): name(theName), type(theType), attributes(theAttributes) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; Attributes attributes; }; SAL_DLLPRIVATE AccumulationBasedServiceEntity( bool published, - std::vector< rtl::OUString > const & directMandatoryBaseServices, - std::vector< rtl::OUString > const & directOptionalBaseServices, - std::vector< rtl::OUString > const & directMandatoryBaseInterfaces, - std::vector< rtl::OUString > const & directOptionalBaseInterfaces, + std::vector< OUString > const & directMandatoryBaseServices, + std::vector< OUString > const & directOptionalBaseServices, + std::vector< OUString > const & directMandatoryBaseInterfaces, + std::vector< OUString > const & directOptionalBaseInterfaces, std::vector< Property > const & directProperties): PublishableEntity(SORT_ACCUMULATION_BASED_SERVICE, published), directMandatoryBaseServices_(directMandatoryBaseServices), @@ -536,17 +536,17 @@ public: directProperties_(directProperties) {} - std::vector< rtl::OUString > const & getDirectMandatoryBaseServices() const + std::vector< OUString > const & getDirectMandatoryBaseServices() const { return directMandatoryBaseServices_; } - std::vector< rtl::OUString > const & getDirectOptionalBaseServices() const + std::vector< OUString > const & getDirectOptionalBaseServices() const { return directOptionalBaseServices_; } - std::vector< rtl::OUString > const & getDirectMandatoryBaseInterfaces() + std::vector< OUString > const & getDirectMandatoryBaseInterfaces() const { return directMandatoryBaseInterfaces_; } - std::vector< rtl::OUString > const & getDirectOptionalBaseInterfaces() const + std::vector< OUString > const & getDirectOptionalBaseInterfaces() const { return directOptionalBaseInterfaces_; } std::vector< Property > const & getDirectProperties() const @@ -555,10 +555,10 @@ public: private: virtual SAL_DLLPRIVATE ~AccumulationBasedServiceEntity() throw (); - std::vector< rtl::OUString > directMandatoryBaseServices_; - std::vector< rtl::OUString > directOptionalBaseServices_; - std::vector< rtl::OUString > directMandatoryBaseInterfaces_; - std::vector< rtl::OUString > directOptionalBaseInterfaces_; + std::vector< OUString > directMandatoryBaseServices_; + std::vector< OUString > directOptionalBaseServices_; + std::vector< OUString > directMandatoryBaseInterfaces_; + std::vector< OUString > directOptionalBaseInterfaces_; std::vector< Property > directProperties_; }; @@ -567,33 +567,33 @@ class LO_DLLPUBLIC_UNOIDL InterfaceBasedSingletonEntity: { public: SAL_DLLPRIVATE InterfaceBasedSingletonEntity( - bool published, rtl::OUString const & base): + bool published, OUString const & base): PublishableEntity(SORT_INTERFACE_BASED_SINGLETON, published), base_(base) {} - rtl::OUString getBase() const { return base_; } + OUString getBase() const { return base_; } private: virtual SAL_DLLPRIVATE ~InterfaceBasedSingletonEntity() throw (); - rtl::OUString base_; + OUString base_; }; class LO_DLLPUBLIC_UNOIDL ServiceBasedSingletonEntity: public PublishableEntity { public: SAL_DLLPRIVATE ServiceBasedSingletonEntity( - bool published, rtl::OUString const & base): + bool published, OUString const & base): PublishableEntity(SORT_SERVICE_BASED_SINGLETON, published), base_(base) {} - rtl::OUString getBase() const { return base_; } + OUString getBase() const { return base_; } private: virtual SAL_DLLPRIVATE ~ServiceBasedSingletonEntity() throw (); - rtl::OUString base_; + OUString base_; }; class LO_DLLPUBLIC_UNOIDL Provider: public salhelper::SimpleReferenceObject { @@ -602,7 +602,7 @@ public: virtual rtl::Reference< MapCursor > createRootCursor() const = 0; // throws FileFormatException: - virtual rtl::Reference< Entity > findEntity(rtl::OUString const & name) + virtual rtl::Reference< Entity > findEntity(OUString const & name) const = 0; protected: @@ -618,7 +618,7 @@ public: void addProvider(rtl::Reference< Provider > const & provider); // throws FileFormatException: - rtl::Reference< Entity > findEntity(rtl::OUString const & name) const; + rtl::Reference< Entity > findEntity(OUString const & name) const; private: virtual SAL_DLLPRIVATE ~Manager() throw (); @@ -628,7 +628,7 @@ private: // throws FileFormatException, NoSuchFileException: LO_DLLPUBLIC_UNOIDL rtl::Reference< Provider > loadProvider( - rtl::Reference< Manager > const & manager, rtl::OUString const & uri); + rtl::Reference< Manager > const & manager, OUString const & uri); } diff --git a/unoidl/inc/unoidl/unoidlprovider.hxx b/unoidl/inc/unoidl/unoidlprovider.hxx index b72a629990ef..03739a1acc65 100644 --- a/unoidl/inc/unoidl/unoidlprovider.hxx +++ b/unoidl/inc/unoidl/unoidlprovider.hxx @@ -28,17 +28,17 @@ namespace unoidl { class LO_DLLPUBLIC_UNOIDL UnoidlProvider: public Provider { public: // throws FileFormatException, NoSuchFileException: - explicit UnoidlProvider(rtl::OUString const & uri); + explicit UnoidlProvider(OUString const & uri); // throws FileFormatException: virtual rtl::Reference< MapCursor > createRootCursor() const; // throws FileFormatException: - virtual rtl::Reference< Entity > findEntity(rtl::OUString const & name) + virtual rtl::Reference< Entity > findEntity(OUString const & name) const; // throws FileFormatException: - sal_uInt32 find(rtl::OUString const & name, bool * constant = 0) const; + sal_uInt32 find(OUString const & name, bool * constant = 0) const; // throws FileFormatException: rtl::Reference< Entity > getEntity(sal_uInt32 offset) const; diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx index 0aa6ec5b01fd..485b43d48055 100644 --- a/unoidl/source/legacyprovider.cxx +++ b/unoidl/source/legacyprovider.cxx @@ -762,7 +762,7 @@ rtl::Reference< MapCursor > LegacyProvider::createRootCursor() const { return new Cursor(manager_, ucr_, ucr_); } -rtl::Reference< Entity > LegacyProvider::findEntity(rtl::OUString const & name) +rtl::Reference< Entity > LegacyProvider::findEntity(OUString const & name) const { return readEntity(manager_, ucr_, ucr_, name.replace('.', '/'), true); diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx index 0ffeb6bdd014..19f2f41070e0 100644 --- a/unoidl/source/unoidl.cxx +++ b/unoidl/source/unoidl.cxx @@ -77,7 +77,7 @@ void Manager::addProvider(rtl::Reference< Provider > const & provider) { providers_.push_back(provider); } -rtl::Reference< Entity > Manager::findEntity(rtl::OUString const & name) const { +rtl::Reference< Entity > Manager::findEntity(OUString const & name) const { //TODO: add caching for (std::vector< rtl::Reference< Provider > >::const_iterator i( providers_.begin()); diff --git a/unotest/inc/unotest/bootstrapfixturebase.hxx b/unotest/inc/unotest/bootstrapfixturebase.hxx index 740799937907..a1986131c5b5 100644 --- a/unotest/inc/unotest/bootstrapfixturebase.hxx +++ b/unotest/inc/unotest/bootstrapfixturebase.hxx @@ -53,12 +53,12 @@ namespace test { class OOO_DLLPUBLIC_UNOTEST BootstrapFixtureBase : public CppUnit::TestFixture { protected: - ::rtl::OUString m_aSrcRootURL; - ::rtl::OUString m_aSrcRootPath; - ::rtl::OUString m_aSolverRootURL; - ::rtl::OUString m_aSolverRootPath; - ::rtl::OUString m_aWorkdirRootURL; - ::rtl::OUString m_aWorkdirRootPath; + OUString m_aSrcRootURL; + OUString m_aSrcRootPath; + OUString m_aSolverRootURL; + OUString m_aSolverRootPath; + OUString m_aWorkdirRootURL; + OUString m_aWorkdirRootPath; com::sun::star::uno::Reference m_xContext; com::sun::star::uno::Reference m_xSFactory; @@ -73,21 +73,21 @@ public: com::sun::star::uno::Reference getMultiServiceFactory() { return m_xSFactory; } - ::rtl::OUString getSrcRootURL() { return m_aSrcRootURL; } - ::rtl::OUString getSrcRootPath() { return m_aSrcRootPath; } + OUString getSrcRootURL() { return m_aSrcRootURL; } + OUString getSrcRootPath() { return m_aSrcRootPath; } // return a URL to a given c-str path from the source directory - ::rtl::OUString getURLFromSrc( const char *pPath ); + OUString getURLFromSrc( const char *pPath ); // return a Path to a given c-str path from the source directory - ::rtl::OUString getPathFromSrc( const char *pPath ); + OUString getPathFromSrc( const char *pPath ); // return a URL to a given c-str path from the workdir directory - ::rtl::OUString getURLFromWorkdir( const char *pPath ); + OUString getURLFromWorkdir( const char *pPath ); // return a Path to a given c-str path from the workdir directory - ::rtl::OUString getPathFromWorkdir( const char *pPath ); + OUString getPathFromWorkdir( const char *pPath ); virtual void setUp(); virtual void tearDown(); diff --git a/unotest/inc/unotest/filters-test.hxx b/unotest/inc/unotest/filters-test.hxx index 390ad05230a3..0825253400ea 100644 --- a/unotest/inc/unotest/filters-test.hxx +++ b/unotest/inc/unotest/filters-test.hxx @@ -53,11 +53,11 @@ class OOO_DLLPUBLIC_UNOTEST FiltersTest public: void testDir( //filter name - const rtl::OUString &rFilter, + const OUString &rFilter, //root dir of test files, must contain pass, fail, indeterminate - const rtl::OUString &rURL, + const OUString &rURL, //additional filter data for SfxFilter - const rtl::OUString &rUserData = rtl::OUString(), + const OUString &rUserData = OUString(), //SfxFilterFlags for SfxFilter unsigned int nFilterFlags = SFX_FILTER_IMPORT, //Clipboard id for SfxFilter @@ -66,9 +66,9 @@ public: unsigned int nFilterVersion = 0); virtual bool load( - const rtl::OUString &rFilter, - const rtl::OUString &rURL, - const rtl::OUString &rUserData, + const OUString &rFilter, + const OUString &rURL, + const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion) = 0; @@ -78,9 +78,9 @@ protected: void recursiveScan( filterStatus nExpected, - const rtl::OUString &rFilter, - const rtl::OUString &rURL, - const rtl::OUString &rUserData, + const OUString &rFilter, + const OUString &rURL, + const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion); diff --git a/unotest/inc/unotest/gettestargument.hxx b/unotest/inc/unotest/gettestargument.hxx index 02cf032ea767..ae4a7e36595a 100644 --- a/unotest/inc/unotest/gettestargument.hxx +++ b/unotest/inc/unotest/gettestargument.hxx @@ -31,7 +31,7 @@ namespace test { // Obtain the value of a test argument (tunneled in via an "arg-testarg." // bootstrap variable): OOO_DLLPUBLIC_UNOTEST bool getTestArgument( - rtl::OUString const & name, rtl::OUString * value); + OUString const & name, OUString * value); } diff --git a/unotest/inc/unotest/macros_test.hxx b/unotest/inc/unotest/macros_test.hxx index c3eb7ff5629c..d2c129102bdb 100644 --- a/unotest/inc/unotest/macros_test.hxx +++ b/unotest/inc/unotest/macros_test.hxx @@ -37,8 +37,8 @@ struct TestMacroInfo { - rtl::OUString sFileBaseName; - rtl::OUString sMacroUrl; + OUString sFileBaseName; + OUString sMacroUrl; }; namespace unotest { diff --git a/unotest/inc/unotest/toabsolutefileurl.hxx b/unotest/inc/unotest/toabsolutefileurl.hxx index ec3d3c18ec31..4e224d4cab0b 100644 --- a/unotest/inc/unotest/toabsolutefileurl.hxx +++ b/unotest/inc/unotest/toabsolutefileurl.hxx @@ -30,8 +30,8 @@ namespace test { // Convert a pathname in system notation, potentially relative to the process's // current working directory, to an absolute file URL: -OOO_DLLPUBLIC_UNOTEST rtl::OUString toAbsoluteFileUrl( - rtl::OUString const & relativePathname); +OOO_DLLPUBLIC_UNOTEST OUString toAbsoluteFileUrl( + OUString const & relativePathname); } diff --git a/unotest/inc/unotest/uniquepipename.hxx b/unotest/inc/unotest/uniquepipename.hxx index 6326fcf2c5b5..bbd90f69b4f2 100644 --- a/unotest/inc/unotest/uniquepipename.hxx +++ b/unotest/inc/unotest/uniquepipename.hxx @@ -29,7 +29,7 @@ namespace rtl { class OUString; } namespace test { // Create a system-wide unique name (for use with osl::Pipe): -OOO_DLLPUBLIC_UNOTEST rtl::OUString uniquePipeName(rtl::OUString const & name); +OOO_DLLPUBLIC_UNOTEST OUString uniquePipeName(OUString const & name); } diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index 90b3c1fb1e01..7f3fb84f33e9 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -55,15 +55,15 @@ test::BootstrapFixtureBase::BootstrapFixtureBase() #ifdef WNT if (pSrcRoot[1] == ':') { - m_aSrcRootURL += rtl::OUString::createFromAscii( "/" ); + m_aSrcRootURL += OUString::createFromAscii( "/" ); } if (pSolverRoot[1] == ':') { - m_aSolverRootURL += rtl::OUString::createFromAscii( "/" ); + m_aSolverRootURL += OUString::createFromAscii( "/" ); } if (pWorkdirRoot[1] == ':') { - m_aWorkdirRootURL += rtl::OUString::createFromAscii( "/" ); + m_aWorkdirRootURL += OUString::createFromAscii( "/" ); } #endif #else @@ -71,13 +71,13 @@ test::BootstrapFixtureBase::BootstrapFixtureBase() const char* pSolverRoot = "/assets"; const char* pWorkdirRoot = "/assets"; #endif - m_aSrcRootPath = rtl::OUString::createFromAscii( pSrcRoot ); + m_aSrcRootPath = OUString::createFromAscii( pSrcRoot ); m_aSrcRootURL += m_aSrcRootPath; - m_aSolverRootPath = rtl::OUString::createFromAscii( pSolverRoot ); + m_aSolverRootPath = OUString::createFromAscii( pSolverRoot ); m_aSolverRootURL += m_aSolverRootPath; - m_aWorkdirRootPath = rtl::OUString::createFromAscii( pWorkdirRoot ); + m_aWorkdirRootPath = OUString::createFromAscii( pWorkdirRoot ); m_aWorkdirRootURL += m_aWorkdirRootPath; } @@ -86,25 +86,25 @@ test::BootstrapFixtureBase::~BootstrapFixtureBase() { } -::rtl::OUString test::BootstrapFixtureBase::getURLFromSrc( const char *pPath ) +OUString test::BootstrapFixtureBase::getURLFromSrc( const char *pPath ) { - return m_aSrcRootURL + rtl::OUString::createFromAscii( pPath ); + return m_aSrcRootURL + OUString::createFromAscii( pPath ); } -::rtl::OUString test::BootstrapFixtureBase::getPathFromSrc( const char *pPath ) +OUString test::BootstrapFixtureBase::getPathFromSrc( const char *pPath ) { - return m_aSrcRootPath + rtl::OUString::createFromAscii( pPath ); + return m_aSrcRootPath + OUString::createFromAscii( pPath ); } -::rtl::OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath ) +OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath ) { - return m_aWorkdirRootURL + rtl::OUString::createFromAscii( pPath ); + return m_aWorkdirRootURL + OUString::createFromAscii( pPath ); } -::rtl::OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath ) +OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath ) { - return m_aWorkdirRootPath + rtl::OUString::createFromAscii( pPath ); + return m_aWorkdirRootPath + OUString::createFromAscii( pPath ); } @@ -112,8 +112,8 @@ void test::BootstrapFixtureBase::setUp() { // set UserInstallation to user profile dir in test/user-template rtl::Bootstrap aDefaultVars; - rtl::OUString sUserInstallURL = m_aSolverRootURL + rtl::OUString("/unittest"); - aDefaultVars.set(rtl::OUString("UserInstallation"), sUserInstallURL); + OUString sUserInstallURL = m_aSolverRootURL + OUString("/unittest"); + aDefaultVars.set(OUString("UserInstallation"), sUserInstallURL); m_xContext = comphelper::getProcessComponentContext(); m_xFactory = m_xContext->getServiceManager(); diff --git a/unotest/source/cpp/filters-test.cxx b/unotest/source/cpp/filters-test.cxx index 376118f35af5..87b4967fdf4c 100644 --- a/unotest/source/cpp/filters-test.cxx +++ b/unotest/source/cpp/filters-test.cxx @@ -36,7 +36,7 @@ namespace test { -void decode(const rtl::OUString& rIn, const rtl::OUString &rOut) +void decode(const OUString& rIn, const OUString &rOut) { rtlCipher cipher = rtl_cipher_create(rtl_Cipher_AlgorithmARCFOUR, rtl_Cipher_ModeStream); CPPUNIT_ASSERT_MESSAGE("cipher creation failed", cipher != 0); @@ -71,8 +71,8 @@ void decode(const rtl::OUString& rIn, const rtl::OUString &rOut) } void FiltersTest::recursiveScan(filterStatus nExpected, - const rtl::OUString &rFilter, const rtl::OUString &rURL, - const rtl::OUString &rUserData, unsigned int nFilterFlags, + const OUString &rFilter, const OUString &rURL, + const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion) { osl::Directory aDir(rURL); @@ -83,7 +83,7 @@ void FiltersTest::recursiveScan(filterStatus nExpected, while (aDir.getNextItem(aItem) == osl::FileBase::E_None) { aItem.getFileStatus(aFileStatus); - rtl::OUString sURL = aFileStatus.getFileURL(); + OUString sURL = aFileStatus.getFileURL(); if (aFileStatus.getFileType() == osl::FileStatus::Directory) { recursiveScan(nExpected, rFilter, sURL, rUserData, @@ -91,7 +91,7 @@ void FiltersTest::recursiveScan(filterStatus nExpected, } else { - rtl::OUString sTmpFile; + OUString sTmpFile; bool bEncrypted = false; sal_Int32 nLastSlash = sURL.lastIndexOf('/'); @@ -112,7 +112,7 @@ void FiltersTest::recursiveScan(filterStatus nExpected, } } - rtl::OString aRes(rtl::OUStringToOString(sURL, + OString aRes(OUStringToOString(sURL, osl_getThreadTextEncoding())); if (bEncrypted) @@ -143,20 +143,20 @@ void FiltersTest::recursiveScan(filterStatus nExpected, CPPUNIT_ASSERT(osl::FileBase::E_None == aDir.close()); } -void FiltersTest::testDir(const rtl::OUString &rFilter, - const rtl::OUString &rURL, const rtl::OUString &rUserData, +void FiltersTest::testDir(const OUString &rFilter, + const OUString &rURL, const OUString &rUserData, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion) { fprintf(stderr, "File tested,Test Result,Execution Time (ms)\n"); recursiveScan(test::pass, rFilter, - rURL + rtl::OUString("pass"), + rURL + OUString("pass"), rUserData, nFilterFlags, nClipboardID, nFilterVersion); recursiveScan(test::fail, rFilter, - rURL + rtl::OUString("fail"), + rURL + OUString("fail"), rUserData, nFilterFlags, nClipboardID, nFilterVersion); recursiveScan(test::indeterminate, rFilter, - rURL + rtl::OUString("indeterminate"), + rURL + OUString("indeterminate"), rUserData, nFilterFlags, nClipboardID, nFilterVersion); } diff --git a/unotest/source/cpp/getargument.cxx b/unotest/source/cpp/getargument.cxx index 83a4a02d2856..00206497f432 100644 --- a/unotest/source/cpp/getargument.cxx +++ b/unotest/source/cpp/getargument.cxx @@ -30,10 +30,10 @@ namespace test { namespace detail { -bool getArgument(rtl::OUString const & name, rtl::OUString * value) { +bool getArgument(OUString const & name, OUString * value) { OSL_ASSERT(value != 0); return rtl::Bootstrap::get( - rtl::OUString("arg-") + name, *value); + OUString("arg-") + name, *value); } } diff --git a/unotest/source/cpp/getargument.hxx b/unotest/source/cpp/getargument.hxx index 74fb44824dd1..3686cdef9602 100644 --- a/unotest/source/cpp/getargument.hxx +++ b/unotest/source/cpp/getargument.hxx @@ -29,7 +29,7 @@ namespace detail { // Obtain the value of an argument tunneled in via an "arg-" bootstrap // variable: bool getArgument( - rtl::OUString const & name, rtl::OUString * value); + OUString const & name, OUString * value); } diff --git a/unotest/source/cpp/gettestargument.cxx b/unotest/source/cpp/gettestargument.cxx index ed27b44ae5b0..86ca32b254aa 100644 --- a/unotest/source/cpp/gettestargument.cxx +++ b/unotest/source/cpp/gettestargument.cxx @@ -27,9 +27,9 @@ namespace test { -bool getTestArgument(rtl::OUString const & name, rtl::OUString * value) { +bool getTestArgument(OUString const & name, OUString * value) { return detail::getArgument( - rtl::OUString("testarg.") + name, value); + OUString("testarg.") + name, value); } } diff --git a/unotest/source/cpp/macros_test.cxx b/unotest/source/cpp/macros_test.cxx index b33492fdd694..9ba5fb00ac1f 100644 --- a/unotest/source/cpp/macros_test.cxx +++ b/unotest/source/cpp/macros_test.cxx @@ -57,9 +57,9 @@ uno::Reference< com::sun::star::lang::XComponent > MacrosTest::loadFromDesktop(c args[1].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; } - uno::Reference< com::sun::star::lang::XComponent> xComponent= xLoader->loadComponentFromURL(rURL, rtl::OUString("_default"), 0, args); - rtl::OUString sMessage = rtl::OUString( "loading failed: " ) + rURL; - CPPUNIT_ASSERT_MESSAGE(rtl::OUStringToOString( sMessage, RTL_TEXTENCODING_UTF8 ).getStr( ), xComponent.is()); + uno::Reference< com::sun::star::lang::XComponent> xComponent= xLoader->loadComponentFromURL(rURL, OUString("_default"), 0, args); + OUString sMessage = OUString( "loading failed: " ) + rURL; + CPPUNIT_ASSERT_MESSAGE(OUStringToOString( sMessage, RTL_TEXTENCODING_UTF8 ).getStr( ), xComponent.is()); return xComponent; } diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index e4b71eab2534..ea5a91036572 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -46,38 +46,38 @@ void OfficeConnection::setUp() { css::uno::Reference< css::bridge::XUnoUrlResolver > resolver( css::bridge::UnoUrlResolver::create( cppu::defaultBootstrap_InitialComponentContext())); - rtl::OUString desc; - rtl::OUString argSoffice; + OUString desc; + OUString argSoffice; CPPUNIT_ASSERT( detail::getArgument( - rtl::OUString("soffice"), + OUString("soffice"), &argSoffice)); if (argSoffice.match("path:")) { - desc = "pipe,name=" + uniquePipeName(rtl::OUString("oootest")); - rtl::OUString noquickArg("--quickstart=no"); - rtl::OUString nofirstArg("--nofirststartwizard"); - rtl::OUString norestoreArg("--norestore"); - rtl::OUString nologoArg("--nologo"); + desc = "pipe,name=" + uniquePipeName(OUString("oootest")); + OUString noquickArg("--quickstart=no"); + OUString nofirstArg("--nofirststartwizard"); + OUString norestoreArg("--norestore"); + OUString nologoArg("--nologo"); // disable use of the unix standalone splash screen app for the // tests (probably not needed in combination with --headless?) - rtl::OUString headlessArg("--headless"); - rtl::OUString acceptArg("--accept=" + desc + ";urp"); - rtl::OUString argUser; + OUString headlessArg("--headless"); + OUString acceptArg("--accept=" + desc + ";urp"); + OUString argUser; CPPUNIT_ASSERT( - detail::getArgument(rtl::OUString("user"), &argUser)); - rtl::OUString userArg( - rtl::OUString("-env:UserInstallation=") + + detail::getArgument(OUString("user"), &argUser)); + OUString userArg( + OUString("-env:UserInstallation=") + toAbsoluteFileUrl(argUser)); - rtl::OUString jreArg( + OUString jreArg( "-env:UNO_JAVA_JFW_ENV_JREHOME=true"); - rtl::OUString classpathArg("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true"); + OUString classpathArg("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true"); rtl_uString * args[] = { noquickArg.pData, nofirstArg.pData, norestoreArg.pData, nologoArg.pData, headlessArg.pData, acceptArg.pData, userArg.pData, jreArg.pData, classpathArg.pData }; rtl_uString ** envs = 0; - rtl::OUString argEnv; - if (detail::getArgument(rtl::OUString("env"), &argEnv)) + OUString argEnv; + if (detail::getArgument(OUString("env"), &argEnv)) { envs = &argEnv.pData; } @@ -100,9 +100,9 @@ void OfficeConnection::setUp() { context_ = css::uno::Reference< css::uno::XComponentContext >( resolver->resolve( - rtl::OUString("uno:") + + OUString("uno:") + desc + - rtl::OUString(";urp;StarOffice.ComponentContext")), + OUString(";urp;StarOffice.ComponentContext")), css::uno::UNO_QUERY_THROW); break; } catch (css::connection::NoConnectException &) {} diff --git a/unotest/source/cpp/toabsolutefileurl.cxx b/unotest/source/cpp/toabsolutefileurl.cxx index 67c415e93a09..6193c9814f70 100644 --- a/unotest/source/cpp/toabsolutefileurl.cxx +++ b/unotest/source/cpp/toabsolutefileurl.cxx @@ -29,33 +29,33 @@ namespace test { -rtl::OUString toAbsoluteFileUrl(rtl::OUString const & relativePathname) { - rtl::OUString cwd; +OUString toAbsoluteFileUrl(OUString const & relativePathname) { + OUString cwd; oslProcessError e1 = osl_getProcessWorkingDir(&cwd.pData); if (e1 != osl_Process_E_None) { throw css::uno::RuntimeException( - (rtl::OUString("osl_getProcessWorkingDir failed with ") + + (OUString("osl_getProcessWorkingDir failed with ") + OUString::number(e1)), css::uno::Reference< css::uno::XInterface >()); } - rtl::OUString url; + OUString url; osl::FileBase::RC e2 = osl::FileBase::getFileURLFromSystemPath( relativePathname, url); if (e2 != osl::FileBase::E_None) { throw css::uno::RuntimeException( - (rtl::OUString("osl::FileBase::getFileURLFromSystemPath(") + + (OUString("osl::FileBase::getFileURLFromSystemPath(") + relativePathname + - rtl::OUString(") failed with ") + + OUString(") failed with ") + OUString::number(e2)), css::uno::Reference< css::uno::XInterface >()); } - rtl::OUString absUrl; + OUString absUrl; e2 = osl::FileBase::getAbsoluteFileURL(cwd, url, absUrl); if (e2 != osl::FileBase::E_None) { throw css::uno::RuntimeException( - (rtl::OUString("osl::FileBase::getAbsoluteFileURL(") + - cwd + rtl::OUString(", ") + url + - rtl::OUString(") failed with ") + + (OUString("osl::FileBase::getAbsoluteFileURL(") + + cwd + OUString(", ") + url + + OUString(") failed with ") + OUString::number(e2)), css::uno::Reference< css::uno::XInterface >()); } diff --git a/unotest/source/cpp/uniquepipename.cxx b/unotest/source/cpp/uniquepipename.cxx index 667bc33ac1da..e75138076ff9 100644 --- a/unotest/source/cpp/uniquepipename.cxx +++ b/unotest/source/cpp/uniquepipename.cxx @@ -26,7 +26,7 @@ namespace test { -rtl::OUString uniquePipeName(rtl::OUString const & name) { +OUString uniquePipeName(OUString const & name) { oslProcessInfo info; info.Size = sizeof info; CPPUNIT_ASSERT_EQUAL( diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx index 3265f8801e1e..f05e59d3839d 100644 --- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx +++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx @@ -37,8 +37,8 @@ namespace { // Best effort conversion: -std::string convert(rtl::OUString const & s16) { - rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding())); +std::string convert(OUString const & s16) { + OString s8(OUStringToOString(s16, osl_getThreadTextEncoding())); BOOST_STATIC_ASSERT(sizeof (sal_Int32) <= sizeof (std::string::size_type)); // ensure following cast is legitimate return std::string( @@ -68,7 +68,7 @@ bool Prot::protect( context, CppUnit::Message( convert( - rtl::OUString("An uncaught exception of type ") + OUString("An uncaught exception of type ") + a.getValueTypeName()), convert(e.Message))); } diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx index 23418dea9a4b..530fa3173b73 100644 --- a/unotools/inc/unotools/bootstrap.hxx +++ b/unotools/inc/unotools/bootstrap.hxx @@ -21,10 +21,7 @@ #ifndef _UTL_BOOTSTRAP_HXX #define _UTL_BOOTSTRAP_HXX -namespace rtl -{ - class OUString; -} +#include namespace utl { @@ -41,16 +38,16 @@ namespace utl public: // some common information items /// retrieve the product key; defaults to executable name (without extension) - static rtl::OUString getProductKey(); + static OUString getProductKey(); /// retrieve the product key; uses the given default, if not found - static rtl::OUString getProductKey(rtl::OUString const& _sDefault); + static OUString getProductKey(OUString const& _sDefault); /// retrieve the BUILDID information item; uses the given default, if not found - static rtl::OUString getBuildIdData(rtl::OUString const& _sDefault); + static OUString getBuildIdData(OUString const& _sDefault); /// retrieve the BuildVersion information item; uses the given default, if not found - static rtl::OUString getBuildVersion(rtl::OUString const& _sDefault); + static OUString getBuildVersion(OUString const& _sDefault); /// reload cached data static void reloadData(); @@ -66,19 +63,19 @@ namespace utl }; /// get a file URL to the common base installation [${insturl}] - static PathStatus locateBaseInstallation(rtl::OUString& _rURL); + static PathStatus locateBaseInstallation(OUString& _rURL); /// get a file URL to the user installation [${userurl}] - static PathStatus locateUserInstallation(rtl::OUString& _rURL); + static PathStatus locateUserInstallation(OUString& _rURL); /// get a file URL to the user data directory [default is ${userurl}/user] - static PathStatus locateUserData(rtl::OUString& _rURL); + static PathStatus locateUserData(OUString& _rURL); // the next two items are mainly supported for diagnostic purposes. both items may be unused /// get a file URL to the bootstrap INI file used [e.g. ${insturl}/program/bootraprc] - static PathStatus locateBootstrapFile(rtl::OUString& _rURL); + static PathStatus locateBootstrapFile(OUString& _rURL); /// get a file URL to the version locator INI file used [e.g. ${SYSUSERCONFIG}/sversion.ini] - static PathStatus locateVersionFile(rtl::OUString& _rURL); + static PathStatus locateVersionFile(OUString& _rURL); public: // evaluate the validity of the installation /// high-level status of bootstrap success @@ -108,7 +105,7 @@ namespace utl /** Evaluates the status of the installation and returns a diagnostic message and error code corresponding to this status */ - static Status checkBootstrapStatus(rtl::OUString& _rDiagnosticMessage, FailureCode& _rErrCode); + static Status checkBootstrapStatus(OUString& _rDiagnosticMessage, FailureCode& _rErrCode); public: // singleton impl-class diff --git a/unotools/inc/unotools/componentresmodule.hxx b/unotools/inc/unotools/componentresmodule.hxx index 9437c156e8ea..0014794f3584 100644 --- a/unotools/inc/unotools/componentresmodule.hxx +++ b/unotools/inc/unotools/componentresmodule.hxx @@ -50,7 +50,7 @@ namespace utl ::std::auto_ptr< OComponentResModuleImpl > m_pImpl; public: - OComponentResourceModule( const ::rtl::OString& _rResFilePrefix ); + OComponentResourceModule( const OString& _rResFilePrefix ); ~OComponentResourceModule(); /// get the vcl res manager of the module @@ -161,7 +161,7 @@ namespace utl }; \ \ ModuleClass::ModuleClass() \ - :BaseClass( ::rtl::OString( resprefix ) ) \ + :BaseClass( OString( resprefix ) ) \ { \ } \ \ diff --git a/unotools/inc/unotools/configmgr.hxx b/unotools/inc/unotools/configmgr.hxx index 0e9a4505b192..9fc2c027ae78 100644 --- a/unotools/inc/unotools/configmgr.hxx +++ b/unotools/inc/unotools/configmgr.hxx @@ -39,27 +39,27 @@ namespace utl { class UNOTOOLS_DLLPUBLIC ConfigManager: private boost::noncopyable { public: - static rtl::OUString getAboutBoxProductVersion(); + static OUString getAboutBoxProductVersion(); - static rtl::OUString getAboutBoxProductVersionSuffix(); + static OUString getAboutBoxProductVersionSuffix(); - static rtl::OUString getDefaultCurrency(); + static OUString getDefaultCurrency(); - static rtl::OUString getLocale(); + static OUString getLocale(); - static rtl::OUString getProductExtension(); + static OUString getProductExtension(); - static rtl::OUString getProductName(); + static OUString getProductName(); - static rtl::OUString getProductXmlFileFormat(); + static OUString getProductXmlFileFormat(); - static rtl::OUString getProductXmlFileFormatVersion(); + static OUString getProductXmlFileFormatVersion(); - static rtl::OUString getProductVersion(); + static OUString getProductVersion(); - static rtl::OUString getVendor(); + static OUString getVendor(); - static rtl::OUString getWriterCompatibilityVersionOOo_1_1(); + static OUString getWriterCompatibilityVersionOOo_1_1(); static void storeConfigItems(); diff --git a/unotools/inc/unotools/confignode.hxx b/unotools/inc/unotools/confignode.hxx index 08e86429ede4..011229845215 100644 --- a/unotools/inc/unotools/confignode.hxx +++ b/unotools/inc/unotools/confignode.hxx @@ -61,10 +61,10 @@ namespace utl m_xDummy; sal_Bool m_bEscapeNames; /// escape names before accessing children ? - ::rtl::OUString + OUString m_sCompletePath; - OConfigurationNode insertNode(const ::rtl::OUString& _rName,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xNode) const throw(); + OConfigurationNode insertNode(const OUString& _rName,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xNode) const throw(); protected: /// constructs a node object with an interface representing a node @@ -88,19 +88,19 @@ namespace utl ~OConfigurationNode() {} /// returns the local name of the node - ::rtl::OUString getLocalName() const; + OUString getLocalName() const; /// returns the fully qualified path of the node - ::rtl::OUString getNodePath() const; + OUString getNodePath() const; /** open a sub node @param _rPath access path of the to-be-opened sub node. May be a hierarchical path. */ - OConfigurationNode openNode(const ::rtl::OUString& _rPath) const throw(); + OConfigurationNode openNode(const OUString& _rPath) const throw(); OConfigurationNode openNode( const sal_Char* _pAsciiPath ) const { - return openNode( ::rtl::OUString::createFromAscii( _pAsciiPath ) ); + return openNode( OUString::createFromAscii( _pAsciiPath ) ); } /** create a new child node @@ -111,11 +111,11 @@ namespace utl becomes a part of it's hierarchy, no explicit insertion is necessary. @param _rName name for the new child. Must be level-1-depth. */ - OConfigurationNode createNode(const ::rtl::OUString& _rName) const throw(); + OConfigurationNode createNode(const OUString& _rName) const throw(); OConfigurationNode createNode( const sal_Char* _pAsciiName ) const { - return createNode( ::rtl::OUString::createFromAscii( _pAsciiName ) ); + return createNode( OUString::createFromAscii( _pAsciiName ) ); } /** remove an existent child nod @@ -123,11 +123,11 @@ namespace utl If the object represents a set node, this method may be used to delete an existent child. For non-set-nodes, the method will fail. */ - sal_Bool removeNode(const ::rtl::OUString& _rName) const throw(); + sal_Bool removeNode(const OUString& _rName) const throw(); sal_Bool removeNode( const sal_Char* _pAsciiName ) const { - return removeNode( ::rtl::OUString::createFromAscii( _pAsciiName ) ); + return removeNode( OUString::createFromAscii( _pAsciiName ) ); } /** retrieves the content of a descendant @@ -138,12 +138,12 @@ namespace utl "the path does not exist" (besides the assertion made :), or if the value is really void. */ ::com::sun::star::uno::Any - getNodeValue(const ::rtl::OUString& _rPath) const throw(); + getNodeValue(const OUString& _rPath) const throw(); ::com::sun::star::uno::Any getNodeValue( const sal_Char* _pAsciiPath ) const { - return getNodeValue( ::rtl::OUString::createFromAscii( _pAsciiPath ) ); + return getNodeValue( OUString::createFromAscii( _pAsciiPath ) ); } /** write a node value

      @@ -152,15 +152,15 @@ namespace utl node. @return sal_True if and only if the write was successfull. */ - sal_Bool setNodeValue(const ::rtl::OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); + sal_Bool setNodeValue(const OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); sal_Bool setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const { - return setNodeValue( ::rtl::OUString::createFromAscii( _pAsciiPath ), _rValue ); + return setNodeValue( OUString::createFromAscii( _pAsciiPath ), _rValue ); } /// return the names of the existing children - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getNodeNames() const throw(); /** enables or disables name escaping when accessing direct children

      @@ -185,12 +185,12 @@ namespace utl sal_Bool isSetNode() const; /// checks whether or not a direct child with a given name exists - sal_Bool hasByName(const ::rtl::OUString& _rName) const throw(); - sal_Bool hasByName( const sal_Char* _pAsciiName ) const { return hasByName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); } + sal_Bool hasByName(const OUString& _rName) const throw(); + sal_Bool hasByName( const sal_Char* _pAsciiName ) const { return hasByName( OUString::createFromAscii( _pAsciiName ) ); } /// checks whether or not a descendent (no matter if direct or indirect) with the given name exists - sal_Bool hasByHierarchicalName( const ::rtl::OUString& _rName ) const throw(); - sal_Bool hasByHierarchicalName( const sal_Char* _pAsciiName ) const { return hasByHierarchicalName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); } + sal_Bool hasByHierarchicalName( const OUString& _rName ) const throw(); + sal_Bool hasByHierarchicalName( const sal_Char* _pAsciiName ) const { return hasByHierarchicalName( OUString::createFromAscii( _pAsciiName ) ); } /// check if the objects represents a valid configuration node sal_Bool isValid() const { return m_xHierarchyAccess.is(); } @@ -208,7 +208,7 @@ namespace utl NO_CONFIGURATION, /// the name came from a configuration node NO_CALLER /// the name came from a client of this class }; - ::rtl::OUString normalizeName(const ::rtl::OUString& _rName, NAMEORIGIN _eOrigin) const; + OUString normalizeName(const OUString& _rName, NAMEORIGIN _eOrigin) const; }; //======================================================================== @@ -250,7 +250,7 @@ namespace utl */ OConfigurationTreeRoot( const css::uno::Reference & i_rContext, - const ::rtl::OUString& i_rNodePath, + const OUString& i_rNodePath, const bool i_bUpdatable ); @@ -275,7 +275,7 @@ namespace utl */ static OConfigurationTreeRoot createWithProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider, - const ::rtl::OUString& _rPath, + const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True @@ -294,7 +294,7 @@ namespace utl @param _eMode specifies which privileges should be applied when retrieving the node */ static OConfigurationTreeRoot createWithComponentContext(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True); + const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True); /** tolerant version of the createWithServiceFactory @@ -303,7 +303,7 @@ namespace utl given node path does not exist) are still asserted.

      */ static OConfigurationTreeRoot tryCreateWithComponentContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True ); + const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True ); /** commit all changes made on the subtree the object is the root for

      All changes made on any OConfigurationNode object retrieved (maybe indirect) from this root diff --git a/unotools/inc/unotools/configpaths.hxx b/unotools/inc/unotools/configpaths.hxx index 9a19ba7c7454..d3e400ae1158 100644 --- a/unotools/inc/unotools/configpaths.hxx +++ b/unotools/inc/unotools/configpaths.hxx @@ -21,11 +21,7 @@ #ifndef UNOTOOLS_CONFIGPATHS_HXX_INCLUDED #define UNOTOOLS_CONFIGPATHS_HXX_INCLUDED #include - -namespace rtl -{ - class OUString; -} +#include //---------------------------------------------------------------------------- namespace utl @@ -56,9 +52,9 @@ namespace utl , if the path was a one-level path or an invalid path */ - UNOTOOLS_DLLPUBLIC sal_Bool splitLastFromConfigurationPath(::rtl::OUString const& _sInPath, - ::rtl::OUString& _rsOutPath, - ::rtl::OUString& _rsLocalName); + UNOTOOLS_DLLPUBLIC sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, + OUString& _rsOutPath, + OUString& _rsLocalName); //---------------------------------------------------------------------------- /** extract the first nodename from a configuration path. @@ -78,8 +74,8 @@ namespace utl configuration path, it is returned unaltered. */ - UNOTOOLS_DLLPUBLIC ::rtl::OUString extractFirstFromConfigurationPath( - ::rtl::OUString const& _sInPath, ::rtl::OUString* _sOutPath = 0); + UNOTOOLS_DLLPUBLIC OUString extractFirstFromConfigurationPath( + OUString const& _sInPath, OUString* _sOutPath = 0); //---------------------------------------------------------------------------- /** check whether a path is to a nested node with respect to a parent path. @@ -102,8 +98,8 @@ namespace utl If both paths are equal is returned. */ - sal_Bool isPrefixOfConfigurationPath(::rtl::OUString const& _sNestedPath, - ::rtl::OUString const& _sPrefixPath); + sal_Bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, + OUString const& _sPrefixPath); //---------------------------------------------------------------------------- /** get the relative path to a nested node with respect to a parent path. @@ -127,8 +123,8 @@ namespace utl _sNestedPath is returned unaltered. */ - UNOTOOLS_DLLPUBLIC ::rtl::OUString dropPrefixFromConfigurationPath(::rtl::OUString const& _sNestedPath, - ::rtl::OUString const& _sPrefixPath); + UNOTOOLS_DLLPUBLIC OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath, + OUString const& _sPrefixPath); //---------------------------------------------------------------------------- /** Create a one-level relative configuration path from a set element name @@ -143,7 +139,7 @@ namespace utl "*['']", where is properly escaped. */ - UNOTOOLS_DLLPUBLIC ::rtl::OUString wrapConfigurationElementName(::rtl::OUString const& _sElementName); + UNOTOOLS_DLLPUBLIC OUString wrapConfigurationElementName(OUString const& _sElementName); //---------------------------------------------------------------------------- /** Create a one-level relative configuration path from a set element name @@ -162,8 +158,8 @@ namespace utl "['']", where is properly escaped. */ - ::rtl::OUString wrapConfigurationElementName(::rtl::OUString const& _sElementName, - ::rtl::OUString const& _sTypeName); + OUString wrapConfigurationElementName(OUString const& _sElementName, + OUString const& _sTypeName); //---------------------------------------------------------------------------- } // namespace utl diff --git a/unotools/inc/unotools/configvaluecontainer.hxx b/unotools/inc/unotools/configvaluecontainer.hxx index b01eb9e8119c..2fa95c337bd0 100644 --- a/unotools/inc/unotools/configvaluecontainer.hxx +++ b/unotools/inc/unotools/configvaluecontainer.hxx @@ -165,7 +165,7 @@ namespace utl private: /// implements the ctors void implConstruct( - const ::rtl::OUString& _rConfigLocation, + const OUString& _rConfigLocation, const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels ); diff --git a/unotools/inc/unotools/docinfohelper.hxx b/unotools/inc/unotools/docinfohelper.hxx index 4de79c166816..be32c3bfc7c9 100644 --- a/unotools/inc/unotools/docinfohelper.hxx +++ b/unotools/inc/unotools/docinfohelper.hxx @@ -28,7 +28,7 @@ namespace utl class UNOTOOLS_DLLPUBLIC DocInfoHelper { public: - static ::rtl::OUString GetGeneratorString(); + static OUString GetGeneratorString(); }; diff --git a/unotools/inc/unotools/eventcfg.hxx b/unotools/inc/unotools/eventcfg.hxx index c18000807676..2ea72642805a 100644 --- a/unotools/inc/unotools/eventcfg.hxx +++ b/unotools/inc/unotools/eventcfg.hxx @@ -58,9 +58,9 @@ #define STR_EVENT_MODECHANGED 26 #define STR_EVENT_STORAGECHANGED 27 -typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventBindingHash; +typedef ::boost::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > EventBindingHash; typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > > FrameVector; -typedef ::std::vector< ::rtl::OUString > SupportedEventsVector; +typedef ::std::vector< OUString > SupportedEventsVector; class GlobalEventConfig_Impl : public utl::ConfigItem { @@ -74,16 +74,16 @@ public: GlobalEventConfig_Impl( ); ~GlobalEventConfig_Impl( ); - void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + void Notify( const com::sun::star::uno::Sequence& aPropertyNames); void Commit(); - void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString GetEventName( sal_Int32 nID ); + OUString GetEventName( sal_Int32 nID ); }; class UNOTOOLS_DLLPUBLIC GlobalEventConfig: @@ -95,13 +95,13 @@ class UNOTOOLS_DLLPUBLIC GlobalEventConfig: static ::osl::Mutex& GetOwnStaticMutex(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); - static ::rtl::OUString GetEventName( sal_Int32 nID ); + static OUString GetEventName( sal_Int32 nID ); private: static GlobalEventConfig_Impl* m_pImpl; diff --git a/unotools/inc/unotools/fltrcfg.hxx b/unotools/inc/unotools/fltrcfg.hxx index 9a7adfe67a9f..0356aeeb5d12 100644 --- a/unotools/inc/unotools/fltrcfg.hxx +++ b/unotools/inc/unotools/fltrcfg.hxx @@ -29,12 +29,12 @@ class UNOTOOLS_DLLPUBLIC SvtFilterOptions : public utl::ConfigItem { SvtFilterOptions_Impl* pImp; - const com::sun::star::uno::Sequence& GetPropertyNames(); + const com::sun::star::uno::Sequence& GetPropertyNames(); public: SvtFilterOptions(); virtual ~SvtFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); virtual void Commit(); void Load(); diff --git a/unotools/inc/unotools/fontcfg.hxx b/unotools/inc/unotools/fontcfg.hxx index 39a4fc0c419c..23ea55140655 100644 --- a/unotools/inc/unotools/fontcfg.hxx +++ b/unotools/inc/unotools/fontcfg.hxx @@ -72,7 +72,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration { // the real string used in the configuration // used to get rid of upper/lower case problems - rtl::OUString aConfigLocaleString; + OUString aConfigLocaleString; // xAccess is mutable to be able to be filled on demand mutable com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xAccess; }; @@ -82,7 +82,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration utl::LocaleHash > m_aConfig; - rtl::OUString tryLocale( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rType ) const; + OUString tryLocale( const com::sun::star::lang::Locale& rLocale, const OUString& rType ) const; public: DefaultFontConfiguration(); @@ -90,8 +90,8 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration static DefaultFontConfiguration& get(); - rtl::OUString getDefaultFont( const com::sun::star::lang::Locale& rLocale, int nType ) const; - rtl::OUString getUserInterfaceFont( const com::sun::star::lang::Locale& rLocale ) const; + OUString getDefaultFont( const com::sun::star::lang::Locale& rLocale, int nType ) const; + OUString getUserInterfaceFont( const com::sun::star::lang::Locale& rLocale ) const; }; // IMPL_FONT_ATTR_DEFAULT - Default-Font like Andale Sans UI, Palace Script, Albany, Thorndale, Cumberland, ... @@ -173,7 +173,7 @@ private: m_xConfigAccess; struct LocaleSubst { - rtl::OUString aConfigLocaleString; + OUString aConfigLocaleString; mutable bool bConfigRead; // note: aSubstAttributes must be sorted alphabetically by Name // searches on the substitutes are done with Name as key, where @@ -184,19 +184,19 @@ private: LocaleSubst() : bConfigRead( false ) {} }; boost::unordered_map< com::sun::star::lang::Locale, LocaleSubst, utl::LocaleHash > m_aSubst; - typedef boost::unordered_set< rtl::OUString, rtl::OUStringHash > UniqueSubstHash; + typedef boost::unordered_set< OUString, OUStringHash > UniqueSubstHash; mutable UniqueSubstHash maSubstHash; void fillSubstVector( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, - const rtl::OUString& rType, + const OUString& rType, std::vector< String >& rSubstVector ) const; FontWeight getSubstWeight( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, - const rtl::OUString& rType ) const; + const OUString& rType ) const; FontWidth getSubstWidth( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, - const rtl::OUString& rType ) const; + const OUString& rType ) const; unsigned long getSubstType( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, - const rtl::OUString& rType ) const; + const OUString& rType ) const; void readLocaleSubst( const com::sun::star::lang::Locale& rLocale ) const; public: FontSubstConfiguration(); diff --git a/unotools/inc/unotools/historyoptions.hxx b/unotools/inc/unotools/historyoptions.hxx index f69fd1730d13..3340a3ae9fdc 100644 --- a/unotools/inc/unotools/historyoptions.hxx +++ b/unotools/inc/unotools/historyoptions.hxx @@ -163,10 +163,10 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail: *//*-*****************************************************************************************************/ void AppendItem( EHistoryType eHistory , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sFilter , - const ::rtl::OUString& sTitle , - const ::rtl::OUString& sPassword ); + const OUString& sURL , + const OUString& sFilter , + const OUString& sTitle , + const OUString& sPassword ); private: diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx index 085bcc0fe260..1dc24c605702 100644 --- a/unotools/inc/unotools/lingucfg.hxx +++ b/unotools/inc/unotools/lingucfg.hxx @@ -41,8 +41,8 @@ class SvtLinguConfigItem; struct UNOTOOLS_DLLPUBLIC SvtLinguOptions { - ::com::sun::star::uno::Sequence< rtl::OUString > aActiveDics; - ::com::sun::star::uno::Sequence< rtl::OUString > aActiveConvDics; + ::com::sun::star::uno::Sequence< OUString > aActiveDics; + ::com::sun::star::uno::Sequence< OUString > aActiveConvDics; sal_Bool bROActiveDics; sal_Bool bROActiveConvDics; @@ -136,11 +136,11 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry { // the URL's pointing to the location of the files the dictionary consists of - com::sun::star::uno::Sequence< rtl::OUString > aLocations; + com::sun::star::uno::Sequence< OUString > aLocations; // the name of the dictionary format implement - rtl::OUString aFormatName; + OUString aFormatName; // the list of languages (ISO names) the dictionary can be used for - com::sun::star::uno::Sequence< rtl::OUString > aLocaleNames; + com::sun::star::uno::Sequence< OUString > aLocaleNames; }; ////////////////////////////////////////////////////////////////////// @@ -157,10 +157,10 @@ class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options com::sun::star::uno::Reference< com::sun::star::util::XChangesBatch > GetMainUpdateAccess() const; - com::sun::star::uno::Sequence< rtl::OUString > GetCurrentOrLastActiveDicts_Impl( const rtl::OUString &rPropName ) const; - void SetCurrentOrLastActiveDicts_Impl( const rtl::OUString &rPropName, const com::sun::star::uno::Sequence< rtl::OUString > &rDictionaries ) const; + com::sun::star::uno::Sequence< OUString > GetCurrentOrLastActiveDicts_Impl( const OUString &rPropName ) const; + void SetCurrentOrLastActiveDicts_Impl( const OUString &rPropName, const com::sun::star::uno::Sequence< OUString > &rDictionaries ) const; - rtl::OUString GetVendorImageUrl_Impl( const rtl::OUString &rServiceImplName, const rtl::OUString &rImageName ) const; + OUString GetVendorImageUrl_Impl( const OUString &rServiceImplName, const OUString &rImageName ) const; // disallow copy-constructor and assignment-operator for now SvtLinguConfig( const SvtLinguConfig & ); @@ -173,50 +173,50 @@ public: // // borrowed from utl::ConfigItem // - com::sun::star::uno::Sequence< rtl::OUString > - GetNodeNames( const rtl::OUString &rNode ); + com::sun::star::uno::Sequence< OUString > + GetNodeNames( const OUString &rNode ); // com::sun::star::uno::Sequence< com::sun::star::uno::Any > GetProperties( - const com::sun::star::uno::Sequence< rtl::OUString > &rNames ); + const com::sun::star::uno::Sequence< OUString > &rNames ); // sal_Bool ReplaceSetProperties( - const rtl::OUString &rNode, + const OUString &rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues ); com::sun::star::uno::Any - GetProperty( const rtl::OUString &rPropertyName ) const; + GetProperty( const OUString &rPropertyName ) const; com::sun::star::uno::Any GetProperty( sal_Int32 nPropertyHandle ) const; - sal_Bool SetProperty( const rtl::OUString &rPropertyName, + sal_Bool SetProperty( const OUString &rPropertyName, const com::sun::star::uno::Any &rValue ); sal_Bool SetProperty( sal_Int32 nPropertyHandle, const com::sun::star::uno::Any &rValue ); sal_Bool GetOptions( SvtLinguOptions &rOptions ) const; - sal_Bool IsReadOnly( const rtl::OUString &rPropertyName ) const; + sal_Bool IsReadOnly( const OUString &rPropertyName ) const; //! //! the following functions work on the 'ServiceManager' sub node of the //! linguistic configuration only //! - sal_Bool GetElementNamesFor( const rtl::OUString &rNodeName, com::sun::star::uno::Sequence< rtl::OUString > &rElementNames ) const; + sal_Bool GetElementNamesFor( const OUString &rNodeName, com::sun::star::uno::Sequence< OUString > &rElementNames ) const; // - sal_Bool GetSupportedDictionaryFormatsFor( const rtl::OUString &rSetName, const rtl::OUString &rSetEntry, com::sun::star::uno::Sequence< rtl::OUString > &rFormatList ) const; + sal_Bool GetSupportedDictionaryFormatsFor( const OUString &rSetName, const OUString &rSetEntry, com::sun::star::uno::Sequence< OUString > &rFormatList ) const; - sal_Bool GetDictionaryEntry( const rtl::OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const; + sal_Bool GetDictionaryEntry( const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const; - com::sun::star::uno::Sequence< rtl::OUString > GetDisabledDictionaries() const; + com::sun::star::uno::Sequence< OUString > GetDisabledDictionaries() const; - std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const rtl::OUString &rFormatName ); + std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const OUString &rFormatName ); // functions returning file URLs to the respective images (if found) and empty string otherwise - ::rtl::OUString GetSpellAndGrammarContextSuggestionImage( const ::rtl::OUString &rServiceImplName ) const; - ::rtl::OUString GetSpellAndGrammarContextDictionaryImage( const ::rtl::OUString &rServiceImplName ) const; - ::rtl::OUString GetSynonymsContextImage( const ::rtl::OUString &rServiceImplName ) const; + OUString GetSpellAndGrammarContextSuggestionImage( const OUString &rServiceImplName ) const; + OUString GetSpellAndGrammarContextDictionaryImage( const OUString &rServiceImplName ) const; + OUString GetSynonymsContextImage( const OUString &rServiceImplName ) const; bool HasGrammarChecker() const; }; diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx index 78321b6bbb2f..a198163831f7 100644 --- a/unotools/inc/unotools/localedatawrapper.hxx +++ b/unotools/inc/unotools/localedatawrapper.hxx @@ -62,14 +62,14 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable LanguageTag maLanguageTag; ::boost::shared_ptr< ::com::sun::star::i18n::Calendar2 > xDefaultCalendar; ::com::sun::star::i18n::LocaleDataItem aLocaleDataItem; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aReservedWordSeq; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aDateAcceptancePatterns; + ::com::sun::star::uno::Sequence< OUString > aReservedWordSeq; + ::com::sun::star::uno::Sequence< OUString > aDateAcceptancePatterns; ::com::sun::star::uno::Sequence< sal_Int32 > aGrouping; // cached items - rtl::OUString aLocaleItem[::com::sun::star::i18n::LocaleItem::COUNT]; - rtl::OUString aReservedWord[::com::sun::star::i18n::reservedWords::COUNT]; - rtl::OUString aCurrSymbol; - rtl::OUString aCurrBankSymbol; + OUString aLocaleItem[::com::sun::star::i18n::LocaleItem::COUNT]; + OUString aReservedWord[::com::sun::star::i18n::reservedWords::COUNT]; + OUString aCurrSymbol; + OUString aCurrBankSymbol; int nDateFormat; int nLongDateFormat; sal_uInt16 nCurrPositiveFormat; @@ -86,21 +86,21 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable void invalidateData(); void getOneLocaleItemImpl( sal_Int16 nItem ); - const rtl::OUString& getOneLocaleItem( sal_Int16 nItem ) const; + const OUString& getOneLocaleItem( sal_Int16 nItem ) const; void getOneReservedWordImpl( sal_Int16 nWord ); - const rtl::OUString& getOneReservedWord( sal_Int16 nWord ) const; + const OUString& getOneReservedWord( sal_Int16 nWord ) const; void getCurrSymbolsImpl(); void getCurrFormatsImpl(); - void scanCurrFormatImpl( const rtl::OUString& rCode, + void scanCurrFormatImpl( const OUString& rCode, sal_Int32 nStart, sal_Int32& nSign, sal_Int32& nPar, sal_Int32& nNum, sal_Int32& nBlank, sal_Int32& nSym ); void getDateFormatsImpl(); - DateFormat scanDateFormatImpl( const rtl::OUString& rCode ); + DateFormat scanDateFormatImpl( const OUString& rCode ); void getDefaultCalendarImpl(); @@ -149,14 +149,14 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 > getAllCurrencies() const; ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > getAllFormats() const; ::com::sun::star::i18n::ForbiddenCharacters getForbiddenCharacters() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > getReservedWord() const; + ::com::sun::star::uno::Sequence< OUString > getReservedWord() const; ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > getAllInstalledLocaleNames() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > getDateAcceptancePatterns() const; + ::com::sun::star::uno::Sequence< OUString > getDateAcceptancePatterns() const; /** Override locale's date acceptance patterns. An empty sequence resets the patterns to the locale's pattern sequence. */ - void setDateAcceptancePatterns( const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPatterns ); + void setDateAcceptancePatterns( const ::com::sun::star::uno::Sequence< OUString > & rPatterns ); /// same as the wrapper implementation but static static ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > getInstalledLocaleNames(); @@ -171,7 +171,7 @@ public: static ::com::sun::star::uno::Sequence< sal_uInt16 > getInstalledLanguageTypes(); /// maps the LocaleData string to the International enum - MeasurementSystem mapMeasurementStringToEnum( const rtl::OUString& rMS ) const; + MeasurementSystem mapMeasurementStringToEnum( const OUString& rMS ) const; /// Convenience method to obtain the default calendar. const ::boost::shared_ptr< ::com::sun::star::i18n::Calendar2 > getDefaultCalendar() const; @@ -196,46 +196,46 @@ public: // Functionality of class International methods, LocaleItem - const rtl::OUString& getDateSep() const + const OUString& getDateSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DATE_SEPARATOR ); } - const rtl::OUString& getNumThousandSep() const + const OUString& getNumThousandSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::THOUSAND_SEPARATOR ); } - const rtl::OUString& getNumDecimalSep() const + const OUString& getNumDecimalSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DECIMAL_SEPARATOR ); } - const rtl::OUString& getTimeSep() const + const OUString& getTimeSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_SEPARATOR ); } - const rtl::OUString& getTime100SecSep() const + const OUString& getTime100SecSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_100SEC_SEPARATOR ); } - const rtl::OUString& getListSep() const + const OUString& getListSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LIST_SEPARATOR ); } - const rtl::OUString& getQuotationMarkStart() const + const OUString& getQuotationMarkStart() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::SINGLE_QUOTATION_START ); } - const rtl::OUString& getQuotationMarkEnd() const + const OUString& getQuotationMarkEnd() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::SINGLE_QUOTATION_END ); } - const rtl::OUString& getDoubleQuotationMarkStart() const + const OUString& getDoubleQuotationMarkStart() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DOUBLE_QUOTATION_START ); } - const rtl::OUString& getDoubleQuotationMarkEnd() const + const OUString& getDoubleQuotationMarkEnd() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DOUBLE_QUOTATION_END ); } - const rtl::OUString& getMeasurementSystem() const + const OUString& getMeasurementSystem() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::MEASUREMENT_SYSTEM ); } MeasurementSystem getMeasurementSystemEnum() const { return mapMeasurementStringToEnum( getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::MEASUREMENT_SYSTEM ) ); } - const rtl::OUString& getTimeAM() const + const OUString& getTimeAM() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_AM ); } - const rtl::OUString& getTimePM() const + const OUString& getTimePM() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_PM ); } - const rtl::OUString& getLongDateDayOfWeekSep() const + const OUString& getLongDateDayOfWeekSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_DAY_OF_WEEK_SEPARATOR ); } - const rtl::OUString& getLongDateDaySep() const + const OUString& getLongDateDaySep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_DAY_SEPARATOR ); } - const rtl::OUString& getLongDateMonthSep() const + const OUString& getLongDateMonthSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_MONTH_SEPARATOR ); } - const rtl::OUString& getLongDateYearSep() const + const OUString& getLongDateYearSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_YEAR_SEPARATOR ); } // currency - const rtl::OUString& getCurrSymbol() const; - const rtl::OUString& getCurrBankSymbol() const; + const OUString& getCurrSymbol() const; + const OUString& getCurrBankSymbol() const; sal_uInt16 getCurrPositiveFormat() const; sal_uInt16 getCurrNegativeFormat() const; sal_uInt16 getCurrDigits() const; @@ -244,10 +244,10 @@ public: DateFormat getDateFormat() const; DateFormat getLongDateFormat() const; /// only numerical values of Gregorian calendar - rtl::OUString getDate( const Date& rDate ) const; - rtl::OUString getTime( const Time& rTime, sal_Bool bSec = sal_True, + OUString getDate( const Date& rDate ) const; + OUString getTime( const Time& rTime, sal_Bool bSec = sal_True, sal_Bool b100Sec = sal_False ) const; - rtl::OUString getDuration( const Time& rTime, + OUString getDuration( const Time& rTime, sal_Bool bSec = sal_True, sal_Bool b100Sec = sal_False ) const; /** The CalendarWrapper already MUST @@ -265,7 +265,7 @@ public: := full year := year % 100 */ - rtl::OUString getLongDate( const Date& rDate, + OUString getLongDate( const Date& rDate, CalendarWrapper& rCal, sal_Int16 nDisplayDayOfWeek = 1, sal_Bool bDayOfMonthWithLeadingZero = sal_False, @@ -282,18 +282,18 @@ public: := trailing zeros are only displayed if the value is not an integer value. */ - rtl::OUString getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, + OUString getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const; /// "Secure" currency formatted string. - rtl::OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, - const rtl::OUString& rCurrencySymbol, + OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, + const OUString& rCurrencySymbol, sal_Bool bUseThousandSep = sal_True ) const; /** Default currency formatted string, use with care as default currency may change in any locale, for example, DEM -> EUR */ - rtl::OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, + OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep = sal_True ) const { return getCurr( nNumber, nDecimals, getCurrSymbol(), bUseThousandSep ); } @@ -312,19 +312,19 @@ public: // reserved words - const rtl::OUString& getTrueWord() const + const OUString& getTrueWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::TRUE_WORD ); } - const rtl::OUString& getFalseWord() const + const OUString& getFalseWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::FALSE_WORD ); } /// return a quarter string matching nQuarter (0..3) => "1st quarter" .. "4th quarter" - const rtl::OUString& getQuarterWord( sal_Int16 nQuarter ) const + const OUString& getQuarterWord( sal_Int16 nQuarter ) const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::QUARTER1_WORD + nQuarter ); } - const rtl::OUString& getAboveWord() const + const OUString& getAboveWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::ABOVE_WORD ); } - const rtl::OUString& getBelowWord() const + const OUString& getBelowWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::BELOW_WORD ); } /// return a quarter abbreviation string matching nQuarter (0..3) => "Q1" .. "Q2" - const rtl::OUString& getQuarterAbbreviation( sal_Int16 nQuarter ) const + const OUString& getQuarterAbbreviation( sal_Int16 nQuarter ) const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::QUARTER1_ABBREVIATION + nQuarter ); } /** Return whether locale data checks are enabled. @@ -341,12 +341,12 @@ public: /** Append locale info to string, used with locale data checking. A string similar to "de_DE requested\n en_US loaded" is appended. */ - rtl::OUString appendLocaleInfo(const rtl::OUString& rDebugMsg) const; + OUString appendLocaleInfo(const OUString& rDebugMsg) const; /** Ouput a message during locale data checking. The (UTF-8) string is written to stderr and in a non-product build or if DBG_UTIL is enabled also raised as an assertion message box. */ - static void outputCheckMessage( const rtl::OUString& rMsg ); + static void outputCheckMessage( const OUString& rMsg ); static void outputCheckMessage( const char* pStr); private: diff --git a/unotools/inc/unotools/localfilehelper.hxx b/unotools/inc/unotools/localfilehelper.hxx index 963b6cadbb7d..4a1864b2f44f 100644 --- a/unotools/inc/unotools/localfilehelper.hxx +++ b/unotools/inc/unotools/localfilehelper.hxx @@ -35,7 +35,7 @@ namespace utl If no UCP is available for the local file system, sal_False and an empty URL is returned. Returning sal_True and an empty URL means that the URL doesn't point to a local file. */ - static bool ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl::OUString& rReturn); + static bool ConvertPhysicalNameToURL(const OUString& rName, OUString& rReturn); static sal_Bool ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn ); /** @@ -44,14 +44,14 @@ namespace utl otherwise sal_True and a valid URL, because a file name can always be converted if a UCP for the local file system is present ( watch: this doesn't mean that this file really exists! ) */ - static bool ConvertURLToPhysicalName( const rtl::OUString& rName, rtl::OUString& rReturn ); + static bool ConvertURLToPhysicalName( const OUString& rName, OUString& rReturn ); static sal_Bool ConvertURLToSystemPath( const OUString& rName, OUString& rReturn ); - static sal_Bool IsLocalFile(const rtl::OUString& rName); - static sal_Bool IsFileContent(const rtl::OUString& rName); + static sal_Bool IsLocalFile(const OUString& rName); + static sal_Bool IsFileContent(const OUString& rName); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > - GetFolderContents( const ::rtl::OUString& rFolder, sal_Bool bFolder ); + static ::com::sun::star::uno::Sequence< OUString > + GetFolderContents( const OUString& rFolder, sal_Bool bFolder ); }; } diff --git a/unotools/inc/unotools/moduleoptions.hxx b/unotools/inc/unotools/moduleoptions.hxx index ba77ba008302..2bf41dc46773 100644 --- a/unotools/inc/unotools/moduleoptions.hxx +++ b/unotools/inc/unotools/moduleoptions.hxx @@ -104,33 +104,33 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: virtual ~SvtModuleOptions(); sal_Bool IsModuleInstalled ( EModule eModule ) const; - ::rtl::OUString GetModuleName ( EModule eModule ) const; - ::rtl::OUString GetFactoryName ( EFactory eFactory ) const; - ::rtl::OUString GetFactoryStandardTemplate( EFactory eFactory ) const; - ::rtl::OUString GetFactoryEmptyDocumentURL( EFactory eFactory ) const; - ::rtl::OUString GetFactoryDefaultFilter ( EFactory eFactory ) const; + OUString GetModuleName ( EModule eModule ) const; + OUString GetFactoryName ( EFactory eFactory ) const; + OUString GetFactoryStandardTemplate( EFactory eFactory ) const; + OUString GetFactoryEmptyDocumentURL( EFactory eFactory ) const; + OUString GetFactoryDefaultFilter ( EFactory eFactory ) const; sal_Bool IsDefaultFilterReadonly ( EFactory eFactory ) const; sal_Int32 GetFactoryIcon ( EFactory eFactory ) const; - static sal_Bool ClassifyFactoryByName ( const ::rtl::OUString& sName , + static sal_Bool ClassifyFactoryByName ( const OUString& sName , EFactory& eFactory ); void SetFactoryStandardTemplate( EFactory eFactory , - const ::rtl::OUString& sTemplate ); + const OUString& sTemplate ); void SetFactoryDefaultFilter ( EFactory eFactory , - const ::rtl::OUString& sFilter ); + const OUString& sFilter ); //_______________________________________ /** @short return the corresponding application ID for the given document service name. */ - static EFactory ClassifyFactoryByServiceName(const ::rtl::OUString& sName); + static EFactory ClassifyFactoryByServiceName(const OUString& sName); //_______________________________________ /** @short return the corresponding application ID for the given short name. */ - static EFactory ClassifyFactoryByShortName(const ::rtl::OUString& sName); + static EFactory ClassifyFactoryByShortName(const OUString& sName); //_______________________________________ @@ -152,7 +152,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: @return A suitable enum value. See EFactory above. */ - static EFactory ClassifyFactoryByURL(const ::rtl::OUString& sURL , + static EFactory ClassifyFactoryByURL(const OUString& sURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lMediaDescriptor); //_______________________________________ @@ -172,7 +172,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: */ static EFactory ClassifyFactoryByModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel); - ::rtl::OUString GetDefaultModuleName(); + OUString GetDefaultModuleName(); sal_Bool IsMath () const; sal_Bool IsChart () const; @@ -183,7 +183,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: sal_Bool IsBasicIDE () const; sal_Bool IsDataBase () const; - ::com::sun::star::uno::Sequence < ::rtl::OUString > GetAllServiceNames(); + ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames(); private: UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex(); diff --git a/unotools/inc/unotools/nativenumberwrapper.hxx b/unotools/inc/unotools/nativenumberwrapper.hxx index dea1ee01e0f7..252a48d85a13 100644 --- a/unotools/inc/unotools/nativenumberwrapper.hxx +++ b/unotools/inc/unotools/nativenumberwrapper.hxx @@ -45,8 +45,8 @@ public: // Wrapper implementations of XNativeNumberSupplier - ::rtl::OUString getNativeNumberString( - const ::rtl::OUString& rNumberString, + OUString getNativeNumberString( + const OUString& rNumberString, const ::com::sun::star::lang::Locale& rLocale, sal_Int16 nNativeNumberMode ) const; diff --git a/unotools/inc/unotools/optionsdlg.hxx b/unotools/inc/unotools/optionsdlg.hxx index 86821832ece7..ba28032a49ea 100644 --- a/unotools/inc/unotools/optionsdlg.hxx +++ b/unotools/inc/unotools/optionsdlg.hxx @@ -34,12 +34,12 @@ public: SvtOptionsDialogOptions(); virtual ~SvtOptionsDialogOptions(); - sal_Bool IsGroupHidden ( const rtl::OUString& _rGroup ) const; - sal_Bool IsPageHidden ( const rtl::OUString& _rPage, - const rtl::OUString& _rGroup ) const; - sal_Bool IsOptionHidden ( const rtl::OUString& _rOption, - const rtl::OUString& _rPage, - const rtl::OUString& _rGroup ) const; + sal_Bool IsGroupHidden ( const OUString& _rGroup ) const; + sal_Bool IsPageHidden ( const OUString& _rPage, + const OUString& _rGroup ) const; + sal_Bool IsOptionHidden ( const OUString& _rOption, + const OUString& _rPage, + const OUString& _rGroup ) const; }; #endif diff --git a/unotools/inc/unotools/securityoptions.hxx b/unotools/inc/unotools/securityoptions.hxx index dd4548551e33..1c054e984bfe 100644 --- a/unotools/inc/unotools/securityoptions.hxx +++ b/unotools/inc/unotools/securityoptions.hxx @@ -89,15 +89,15 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail MA_RUN }; - typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > Certificate; + typedef ::com::sun::star::uno::Sequence< OUString > Certificate; /* // MT: Doesn't work for sequence... struct Certificate { - ::rtl::OUString SubjectName; - ::rtl::OUString SerialNumber; - ::rtl::OUString RawData; + OUString SubjectName; + OUString SerialNumber; + OUString RawData; }; */ @@ -152,8 +152,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail @onerror No error should occurre! *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSecureURLs( ) const ; - void SetSecureURLs( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqURLList ) ; + ::com::sun::star::uno::Sequence< OUString > GetSecureURLs( ) const ; + void SetSecureURLs( const ::com::sun::star::uno::Sequence< OUString >& seqURLList ) ; /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/StarOfficeBasic" @@ -194,8 +194,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail @onerror No error should occurre! *//*-*****************************************************************************************************/ - sal_Bool IsSecureURL( const ::rtl::OUString& sURL , - const ::rtl::OUString& sReferer ) const ; + sal_Bool IsSecureURL( const OUString& sURL , + const OUString& sReferer ) const ; ::com::sun::star::uno::Sequence< Certificate > GetTrustedAuthors ( ) const ; void SetTrustedAuthors ( const ::com::sun::star::uno::Sequence< Certificate >& rAuthors ) ; diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx index 2deffdc734ec..8c9378938ce0 100644 --- a/unotools/inc/unotools/syslocaleoptions.hxx +++ b/unotools/inc/unotools/syslocaleoptions.hxx @@ -97,8 +97,8 @@ public: // config value access methods /// The config string may be empty to denote the SYSTEM locale - const ::rtl::OUString& GetLocaleConfigString() const; - void SetLocaleConfigString( const ::rtl::OUString& rStr ); + const OUString& GetLocaleConfigString() const; + void SetLocaleConfigString( const OUString& rStr ); /** Get locale set, if empty denotes SYSTEM locale, not resolved to the real locale. */ LanguageTag GetLanguageTag() const; @@ -106,18 +106,18 @@ public: const LanguageTag& GetRealLanguageTag() const; /// The config string may be empty to denote the SYSTEM locale - void SetUILocaleConfigString( const ::rtl::OUString& rStr ); + void SetUILocaleConfigString( const OUString& rStr ); /** Get UI locale set, always resolved to the real locale. */ const LanguageTag& GetRealUILanguageTag() const; /// The config string may be empty to denote the default currency of the locale - const ::rtl::OUString& GetCurrencyConfigString() const; - void SetCurrencyConfigString( const ::rtl::OUString& rStr ); + const OUString& GetCurrencyConfigString() const; + void SetCurrencyConfigString( const OUString& rStr ); /** The config string may be empty to denote the default DateAcceptancePatterns of the locale */ - const ::rtl::OUString& GetDatePatternsConfigString() const; - void SetDatePatternsConfigString( const ::rtl::OUString& rStr ); + const OUString& GetDatePatternsConfigString() const; + void SetDatePatternsConfigString( const OUString& rStr ); // determine whether the decimal separator defined in the keyboard layout is used // or the one approriate to the locale @@ -135,10 +135,10 @@ public: static void GetCurrencyAbbrevAndLanguage( String& rAbbrev, LanguageType& eLang, - const ::rtl::OUString& rConfigString ); + const OUString& rConfigString ); /// Create an USD-en-US or EUR-de-DE string - static ::rtl::OUString CreateCurrencyConfigString( + static OUString CreateCurrencyConfigString( const String& rAbbrev, LanguageType eLang ); diff --git a/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx index 63ab0dece4e3..0b826102cb91 100644 --- a/unotools/inc/unotools/textsearch.hxx +++ b/unotools/inc/unotools/textsearch.hxx @@ -71,7 +71,7 @@ private: long nTransliterationFlags; public: - SearchParam( const rtl::OUString &rText, + SearchParam( const OUString &rText, SearchType eSrchType = SearchParam::SRCH_NORMAL, sal_Bool bCaseSensitive = sal_True, sal_Bool bWordOnly = sal_False, @@ -162,7 +162,7 @@ public: int SearchFrwrd( const String &rStr, xub_StrLen* pStart, xub_StrLen* pEnde, ::com::sun::star::util::SearchResult* pSrchResult = 0 ); - sal_Bool SearchForward( const ::rtl::OUString &rStr, + sal_Bool SearchForward( const OUString &rStr, sal_Int32* pStart, sal_Int32* pEnd, ::com::sun::star::util::SearchResult* pRes = 0 ); int SearchBkwrd( const String &rStr, diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx index 084db947853f..eb171591d69a 100644 --- a/unotools/inc/unotools/ucbhelper.hxx +++ b/unotools/inc/unotools/ucbhelper.hxx @@ -34,41 +34,41 @@ namespace ucbhelper { class Content; } namespace utl { namespace UCBContentHelper { -UNOTOOLS_DLLPUBLIC bool IsDocument(rtl::OUString const & url); +UNOTOOLS_DLLPUBLIC bool IsDocument(OUString const & url); -UNOTOOLS_DLLPUBLIC bool IsFolder(rtl::OUString const & url); +UNOTOOLS_DLLPUBLIC bool IsFolder(OUString const & url); /// @param title must not be null /// @return true iff title has been set (i.e., if obtaining the "Title" property /// of the given content yields a non-void value without raising a /// non-RuntimeException; RuntimeExceptions are passed through) UNOTOOLS_DLLPUBLIC bool GetTitle( - rtl::OUString const & url, rtl::OUString * title); + OUString const & url, OUString * title); -UNOTOOLS_DLLPUBLIC bool Kill(rtl::OUString const & url); +UNOTOOLS_DLLPUBLIC bool Kill(OUString const & url); UNOTOOLS_DLLPUBLIC com::sun::star::uno::Any GetProperty( - rtl::OUString const & url, rtl::OUString const & property); + OUString const & url, OUString const & property); UNOTOOLS_DLLPUBLIC bool MakeFolder( - ucbhelper::Content & parent, rtl::OUString const & title, + ucbhelper::Content & parent, OUString const & title, ucbhelper::Content & result, bool exclusive = false); /// @return the value of the "Size" property of the given content, or zero if /// obtaining the property yields a void value or raises a /// non-RuntimeException (RuntimeExceptions are passed through) -UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(rtl::OUString const & url); +UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(OUString const & url); UNOTOOLS_DLLPUBLIC bool IsYounger( - rtl::OUString const & younger, rtl::OUString const & older); + OUString const & younger, OUString const & older); -UNOTOOLS_DLLPUBLIC bool Exists(rtl::OUString const & url); +UNOTOOLS_DLLPUBLIC bool Exists(OUString const & url); UNOTOOLS_DLLPUBLIC bool IsSubPath( - rtl::OUString const & parent, rtl::OUString const & child); + OUString const & parent, OUString const & child); UNOTOOLS_DLLPUBLIC bool EqualURLs( - rtl::OUString const & url1, rtl::OUString const & url2); + OUString const & url1, OUString const & url2); } } diff --git a/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx index f3752c54e73b..77b71ee90bd1 100644 --- a/unotools/inc/unotools/useroptions.hxx +++ b/unotools/inc/unotools/useroptions.hxx @@ -58,31 +58,31 @@ public: static osl::Mutex& GetInitMutex (); // get the address token - rtl::OUString GetCompany () const; - rtl::OUString GetFirstName () const; - rtl::OUString GetLastName () const; - rtl::OUString GetID () const; - rtl::OUString GetStreet () const; - rtl::OUString GetCity () const; - rtl::OUString GetState () const; - rtl::OUString GetZip () const; - rtl::OUString GetCountry () const; - rtl::OUString GetPosition () const; - rtl::OUString GetTitle () const; - rtl::OUString GetTelephoneHome () const; - rtl::OUString GetTelephoneWork () const; - rtl::OUString GetFax () const; - rtl::OUString GetEmail () const; - rtl::OUString GetCustomerNumber () const; + OUString GetCompany () const; + OUString GetFirstName () const; + OUString GetLastName () const; + OUString GetID () const; + OUString GetStreet () const; + OUString GetCity () const; + OUString GetState () const; + OUString GetZip () const; + OUString GetCountry () const; + OUString GetPosition () const; + OUString GetTitle () const; + OUString GetTelephoneHome () const; + OUString GetTelephoneWork () const; + OUString GetFax () const; + OUString GetEmail () const; + OUString GetCustomerNumber () const; - rtl::OUString GetFullName () const; + OUString GetFullName () const; // set the address token - void SetCustomerNumber (rtl::OUString const&); + void SetCustomerNumber (OUString const&); sal_Bool IsTokenReadonly (sal_uInt16 nToken) const; - rtl::OUString GetToken (sal_uInt16 nToken) const; - void SetToken (sal_uInt16 nToken, rtl::OUString const& rNewToken); + OUString GetToken (sal_uInt16 nToken) const; + void SetToken (sal_uInt16 nToken, OUString const& rNewToken); private: class Impl; diff --git a/unotools/inc/unotools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx index 39164c201255..1c173050d31b 100644 --- a/unotools/inc/unotools/viewoptions.hxx +++ b/unotools/inc/unotools/viewoptions.hxx @@ -131,7 +131,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op *//*-*****************************************************************************************************/ SvtViewOptions( EViewType eType , - const ::rtl::OUString& sViewName ); + const OUString& sViewName ); virtual ~SvtViewOptions(); /*-****************************************************************************************************//** @@ -194,8 +194,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror - *//*-*****************************************************************************************************/ - ::rtl::OUString GetWindowState( ) const; - void SetWindowState( const ::rtl::OUString& sState ); + OUString GetWindowState( ) const; + void SetWindowState( const OUString& sState ); /*-****************************************************************************************************//** @short use it to set/get the page number which was the last active one @@ -254,8 +254,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror In the non-product version, an assertion is made. In a product version, errors are silently ignored. *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Any GetUserItem( const ::rtl::OUString& sName ) const; - void SetUserItem( const ::rtl::OUString& sName , + ::com::sun::star::uno::Any GetUserItem( const OUString& sName ) const; + void SetUserItem( const OUString& sName , const ::com::sun::star::uno::Any& aValue ); //------------------------------------------------------------------------------------------------------------- @@ -289,7 +289,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op /// specify which list of views in configuration is used! This can't be a static value!!! /// ... because we need this value to work with right static data container. EViewType m_eViewType ; - ::rtl::OUString m_sViewName ; + OUString m_sViewName ; /// - impl. data container as dynamic pointer for smaller memory requirements! /// - internal ref count mechanism diff --git a/unotools/inc/unotools/xmlaccelcfg.hxx b/unotools/inc/unotools/xmlaccelcfg.hxx index 48417b2a229a..d0e15dcfdbec 100644 --- a/unotools/inc/unotools/xmlaccelcfg.hxx +++ b/unotools/inc/unotools/xmlaccelcfg.hxx @@ -60,23 +60,23 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume virtual void SAL_CALL endDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( - const ::rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs ) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const ::rtl::OUString& aName) throw + virtual void SAL_CALL endElement(const OUString& aName) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const ::rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString& aWhitespaces) + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); private: - ::rtl::OUString getErrorLineString(); + OUString getErrorLineString(); int m_nElementDepth; sal_Bool m_bAcceleratorMode; @@ -101,7 +101,7 @@ class OWriteAccelatorDocumentHandler ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - ::rtl::OUString m_aAttributeType; + OUString m_aAttributeType; const SvtAcceleratorItemList& m_aWriteAcceleratorList; }; diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 505cf240b8ae..1a9df9c3b749 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -59,9 +59,6 @@ typedef char const * AsciiString; namespace utl { // --------------------------------------------------------------------------------------- - using ::rtl::OUString; - using ::rtl::OUStringBuffer; - using ::rtl::OString; // --------------------------------------------------------------------------------------- // Implementation class: Bootstrap::Impl @@ -330,7 +327,7 @@ PathStatus getDerivedPath( { OSL_PRECOND(_aBaseURL[_aBaseURL.getLength()-1] != cURLSeparator,"Unexpected: base URL ends in slash"); - sDerivedURL = rtl::OUStringBuffer(_aBaseURL).append(cURLSeparator).append(_sRelativeURL).makeStringAndClear(); + sDerivedURL = OUStringBuffer(_aBaseURL).append(cURLSeparator).append(_sRelativeURL).makeStringAndClear(); // a derived (nested) URL can only exist or have a lesser status, if the parent exists if (aStatus == Bootstrap::PATH_EXISTS) @@ -661,7 +658,7 @@ PathStatus Bootstrap::locateVersionFile(OUString& _rURL) } // --------------------------------------------------------------------------------------- -Bootstrap::Status Bootstrap::checkBootstrapStatus(rtl::OUString& _rDiagnosticMessage, FailureCode& _rErrCode) +Bootstrap::Status Bootstrap::checkBootstrapStatus(OUString& _rDiagnosticMessage, FailureCode& _rErrCode) { Impl const& aData = data(); diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index cbdc0345386c..85cf76ea0ce0 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -106,10 +106,10 @@ class SvtCmdOptions } private: - class CommandHashMap : public ::boost::unordered_map< ::rtl::OUString , + class CommandHashMap : public ::boost::unordered_map< OUString , sal_Int32 , OUStringHashCode , - ::std::equal_to< ::rtl::OUString > > + ::std::equal_to< OUString > > { public: inline void free() diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index 0807e2726042..c7b1426e7e97 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -283,8 +283,8 @@ class SvtCompatibilityOptions_Impl : public ConfigItem void Clear(); Sequence< Sequence< PropertyValue > > GetList() const; - void AppendItem( const ::rtl::OUString& _sName, - const ::rtl::OUString& _sModule, + void AppendItem( const OUString& _sName, + const OUString& _sModule, bool _bUsePrtMetrics, bool _bAddSpacing, bool _bAddSpacingAtPages, @@ -532,8 +532,8 @@ Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions_Impl::GetList() co // public method //***************************************************************************************************************** -void SvtCompatibilityOptions_Impl::AppendItem( const ::rtl::OUString& _sName, - const ::rtl::OUString& _sModule, +void SvtCompatibilityOptions_Impl::AppendItem( const OUString& _sName, + const OUString& _sModule, bool _bUsePrtMetrics, bool _bAddSpacing, bool _bAddSpacingAtPages, @@ -689,7 +689,7 @@ void SvtCompatibilityOptions::Clear() m_pDataContainer->Clear(); } -void SvtCompatibilityOptions::SetDefault( ::rtl::OUString sName, bool bValue ) +void SvtCompatibilityOptions::SetDefault( OUString sName, bool bValue ) { m_pDataContainer->SetDefault( sName, bValue ); } @@ -697,8 +697,8 @@ void SvtCompatibilityOptions::SetDefault( ::rtl::OUString sName, bool bValue ) //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtCompatibilityOptions::AppendItem( const ::rtl::OUString& sName, - const ::rtl::OUString& sModule, +void SvtCompatibilityOptions::AppendItem( const OUString& sName, + const OUString& sModule, bool bUsePrtMetrics, bool bAddSpacing, bool bAddSpacingAtPages, diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 501f66814015..7e89095e5e00 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -158,7 +158,7 @@ ConfigChangeListener_Impl::~ConfigChangeListener_Impl() } static sal_Bool lcl_Find( - const rtl::OUString& rTemp, + const OUString& rTemp, const OUString* pCheckPropertyNames, sal_Int32 nLength) { @@ -391,7 +391,7 @@ void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString > } } -Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const com::sun::star::uno::Sequence< rtl::OUString >& rNames) +Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const com::sun::star::uno::Sequence< OUString >& rNames) { sal_Int32 i; @@ -1101,7 +1101,7 @@ sal_Bool ConfigItem::ReplaceSetProperties( return bRet; } -sal_Bool ConfigItem::getUniqueSetElementName( const ::rtl::OUString& _rSetNode, ::rtl::OUString& _rName) +sal_Bool ConfigItem::getUniqueSetElementName( const OUString& _rSetNode, OUString& _rName) { Reference xHierarchyAccess = GetTree(); sal_Bool bRet = sal_False; @@ -1122,8 +1122,8 @@ sal_Bool ConfigItem::getUniqueSetElementName( const ::rtl::OUString& _rSetNode, for (; 1 != nFieldElement; nFieldElement = (nFieldElement * nEngendering) % nPrime) { - ::rtl::OUString sThisRoundTrial = _rName; - sThisRoundTrial += ::rtl::OUString::valueOf((sal_Int32)nFieldElement); + OUString sThisRoundTrial = _rName; + sThisRoundTrial += OUString::valueOf((sal_Int32)nFieldElement); if (!xSetNode->hasByName(sThisRoundTrial)) { @@ -1139,7 +1139,7 @@ sal_Bool ConfigItem::getUniqueSetElementName( const ::rtl::OUString& _rSetNode, return bRet; } -sal_Bool ConfigItem::AddNode(const rtl::OUString& rNode, const rtl::OUString& rNewNode) +sal_Bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode) { ValueCounter_Impl aCounter(pImpl->nInValueChange); sal_Bool bRet = sal_True; diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index ab5de4b8790f..cac6b8babe3d 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -78,7 +78,7 @@ OUString getConfigurationString(OUString const & module, OUString const & path) OUString("com.sun.star.configuration.ConfigurationAccess"), args), css::uno::UNO_QUERY_THROW)-> - getByHierarchicalName(path).get< rtl::OUString >(); + getByHierarchicalName(path).get< OUString >(); } struct theConfigManager: diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 9692bb083baa..93220536110c 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -128,9 +128,9 @@ namespace utl } //------------------------------------------------------------------------ - ::rtl::OUString OConfigurationNode::getLocalName() const + OUString OConfigurationNode::getLocalName() const { - ::rtl::OUString sLocalName; + OUString sLocalName; try { Reference< XNamed > xNamed( m_xDirectAccess, UNO_QUERY_THROW ); @@ -144,9 +144,9 @@ namespace utl } //------------------------------------------------------------------------ - ::rtl::OUString OConfigurationNode::getNodePath() const + OUString OConfigurationNode::getNodePath() const { - ::rtl::OUString sNodePath; + OUString sNodePath; try { Reference< XHierarchicalName > xNamed( m_xDirectAccess, UNO_QUERY_THROW ); @@ -160,9 +160,9 @@ namespace utl } //------------------------------------------------------------------------ - ::rtl::OUString OConfigurationNode::normalizeName(const ::rtl::OUString& _rName, NAMEORIGIN _eOrigin) const + OUString OConfigurationNode::normalizeName(const OUString& _rName, NAMEORIGIN _eOrigin) const { - ::rtl::OUString sName(_rName); + OUString sName(_rName); if (getEscape()) { Reference< XStringEscape > xEscaper(m_xDirectAccess, UNO_QUERY); @@ -185,17 +185,17 @@ namespace utl } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > OConfigurationNode::getNodeNames() const throw() + Sequence< OUString > OConfigurationNode::getNodeNames() const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::getNodeNames: object is invalid!"); - Sequence< ::rtl::OUString > aReturn; + Sequence< OUString > aReturn; if (m_xDirectAccess.is()) { try { aReturn = m_xDirectAccess->getElementNames(); // normalize the names - ::rtl::OUString* pNames = aReturn.getArray(); + OUString* pNames = aReturn.getArray(); for (sal_Int32 i=0; iremoveByName(sName); return sal_True; } catch (NoSuchElementException&) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aBuf( 256 ); + OStringBuffer aBuf( 256 ); aBuf.append("OConfigurationNode::removeNode: there is no element named!"); - aBuf.append( rtl::OUStringToOString( _rName, RTL_TEXTENCODING_ASCII_US ) ); + aBuf.append( OUStringToOString( _rName, RTL_TEXTENCODING_ASCII_US ) ); aBuf.append( "!" ); OSL_FAIL(aBuf.getStr()); #endif @@ -242,13 +242,13 @@ namespace utl return sal_False; } //------------------------------------------------------------------------ - OConfigurationNode OConfigurationNode::insertNode(const ::rtl::OUString& _rName,const Reference< XInterface >& _xNode) const throw() + OConfigurationNode OConfigurationNode::insertNode(const OUString& _rName,const Reference< XInterface >& _xNode) const throw() { if(_xNode.is()) { try { - ::rtl::OUString sName = normalizeName(_rName, NO_CALLER); + OUString sName = normalizeName(_rName, NO_CALLER); m_xContainerAccess->insertByName(sName, makeAny(_xNode)); // if we're here, all was ok ... return OConfigurationNode( _xNode ); @@ -267,7 +267,7 @@ namespace utl return OConfigurationNode(); } //------------------------------------------------------------------------ - OConfigurationNode OConfigurationNode::createNode(const ::rtl::OUString& _rName) const throw() + OConfigurationNode OConfigurationNode::createNode(const OUString& _rName) const throw() { Reference< XSingleServiceFactory > xChildFactory(m_xContainerAccess, UNO_QUERY); OSL_ENSURE(xChildFactory.is(), "OConfigurationNode::createNode: object is invalid or read-only!"); @@ -290,13 +290,13 @@ namespace utl } //------------------------------------------------------------------------ - OConfigurationNode OConfigurationNode::openNode(const ::rtl::OUString& _rPath) const throw() + OConfigurationNode OConfigurationNode::openNode(const OUString& _rPath) const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::openNode: object is invalid!"); OSL_ENSURE(m_xHierarchyAccess.is(), "OConfigurationNode::openNode: object is invalid!"); try { - ::rtl::OUString sNormalized = normalizeName(_rPath, NO_CALLER); + OUString sNormalized = normalizeName(_rPath, NO_CALLER); Reference< XInterface > xNode; if (m_xDirectAccess.is() && m_xDirectAccess->hasByName(sNormalized)) @@ -315,9 +315,9 @@ namespace utl catch(const NoSuchElementException&) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aBuf( 256 ); + OStringBuffer aBuf( 256 ); aBuf.append("OConfigurationNode::openNode: there is no element named "); - aBuf.append( rtl::OUStringToOString( _rPath, RTL_TEXTENCODING_ASCII_US ) ); + aBuf.append( OUStringToOString( _rPath, RTL_TEXTENCODING_ASCII_US ) ); aBuf.append("!"); OSL_FAIL(aBuf.getStr()); #endif @@ -342,20 +342,20 @@ namespace utl Reference< XServiceInfo > xSI(m_xHierarchyAccess, UNO_QUERY); if (xSI.is()) { - try { bIsSet = xSI->supportsService(::rtl::OUString("com.sun.star.configuration.SetAccess")); } + try { bIsSet = xSI->supportsService(OUString("com.sun.star.configuration.SetAccess")); } catch(Exception&) { } } return bIsSet; } - sal_Bool OConfigurationNode::hasByHierarchicalName( const ::rtl::OUString& _rName ) const throw() + sal_Bool OConfigurationNode::hasByHierarchicalName( const OUString& _rName ) const throw() { OSL_ENSURE( m_xHierarchyAccess.is(), "OConfigurationNode::hasByHierarchicalName: no hierarchy access!" ); try { if ( m_xHierarchyAccess.is() ) { - ::rtl::OUString sName = normalizeName( _rName, NO_CALLER ); + OUString sName = normalizeName( _rName, NO_CALLER ); return m_xHierarchyAccess->hasByHierarchicalName( sName ); } } @@ -366,12 +366,12 @@ namespace utl } //------------------------------------------------------------------------ - sal_Bool OConfigurationNode::hasByName(const ::rtl::OUString& _rName) const throw() + sal_Bool OConfigurationNode::hasByName(const OUString& _rName) const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::hasByName: object is invalid!"); try { - ::rtl::OUString sName = normalizeName(_rName, NO_CALLER); + OUString sName = normalizeName(_rName, NO_CALLER); if (m_xDirectAccess.is()) return m_xDirectAccess->hasByName(sName); } @@ -382,7 +382,7 @@ namespace utl } //------------------------------------------------------------------------ - sal_Bool OConfigurationNode::setNodeValue(const ::rtl::OUString& _rPath, const Any& _rValue) const throw() + sal_Bool OConfigurationNode::setNodeValue(const OUString& _rPath, const Any& _rValue) const throw() { sal_Bool bResult = false; @@ -392,7 +392,7 @@ namespace utl try { // check if _rPath is a level-1 path - ::rtl::OUString sNormalizedName = normalizeName(_rPath, NO_CALLER); + OUString sNormalizedName = normalizeName(_rPath, NO_CALLER); if (m_xReplaceAccess->hasByName(sNormalizedName)) { m_xReplaceAccess->replaceByName(sNormalizedName, _rValue); @@ -404,7 +404,7 @@ namespace utl { OSL_ASSERT(!_rPath.isEmpty()); - ::rtl::OUString sParentPath, sLocalName; + OUString sParentPath, sLocalName; if ( splitLastFromConfigurationPath(_rPath, sParentPath, sLocalName) ) { @@ -443,14 +443,14 @@ namespace utl } //------------------------------------------------------------------------ - Any OConfigurationNode::getNodeValue(const ::rtl::OUString& _rPath) const throw() + Any OConfigurationNode::getNodeValue(const OUString& _rPath) const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::hasByName: object is invalid!"); OSL_ENSURE(m_xHierarchyAccess.is(), "OConfigurationNode::hasByName: object is invalid!"); Any aReturn; try { - ::rtl::OUString sNormalizedPath = normalizeName(_rPath, NO_CALLER); + OUString sNormalizedPath = normalizeName(_rPath, NO_CALLER); if (m_xDirectAccess.is() && m_xDirectAccess->hasByName(sNormalizedPath) ) { aReturn = m_xDirectAccess->getByName(sNormalizedPath); @@ -498,7 +498,7 @@ namespace utl //-------------------------------------------------------------------- Reference< XInterface > lcl_createConfigurationRoot( const Reference< XMultiServiceFactory >& i_rxConfigProvider, - const ::rtl::OUString& i_rNodePath, const bool i_bUpdatable, const sal_Int32 i_nDepth, const bool i_bLazyWrite ) + const OUString& i_rNodePath, const bool i_bUpdatable, const sal_Int32 i_nDepth, const bool i_bLazyWrite ) { ENSURE_OR_RETURN( i_rxConfigProvider.is(), "invalid provider", NULL ); try @@ -508,9 +508,9 @@ namespace utl aArgs.put( "lazywrite", i_bLazyWrite ); aArgs.put( "depth", i_nDepth ); - ::rtl::OUString sAccessService( i_bUpdatable ? - ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ) : - ::rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" )); + OUString sAccessService( i_bUpdatable ? + OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ) : + OUString( "com.sun.star.configuration.ConfigurationAccess" )); Reference< XInterface > xRoot( i_rxConfigProvider->createInstanceWithArguments( sAccessService, aArgs.getWrappedPropertyValues() ), @@ -534,7 +534,7 @@ namespace utl } //------------------------------------------------------------------------ - OConfigurationTreeRoot::OConfigurationTreeRoot( const Reference & i_rContext, const ::rtl::OUString& i_rNodePath, const bool i_bUpdatable ) + OConfigurationTreeRoot::OConfigurationTreeRoot( const Reference & i_rContext, const OUString& i_rNodePath, const bool i_bUpdatable ) :OConfigurationNode( lcl_createConfigurationRoot( lcl_getConfigProvider( i_rContext ), i_rNodePath, i_bUpdatable, -1, false ).get() ) ,m_xCommitter() @@ -576,7 +576,7 @@ namespace utl } //------------------------------------------------------------------------ - OConfigurationTreeRoot OConfigurationTreeRoot::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const ::rtl::OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite) + OConfigurationTreeRoot OConfigurationTreeRoot::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite) { Reference< XInterface > xRoot( lcl_createConfigurationRoot( _rxConfProvider, _rPath, _eMode != CM_READONLY, _nDepth, _bLazyWrite ) ); @@ -586,14 +586,14 @@ namespace utl } //------------------------------------------------------------------------ - OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite ) + OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite ) { return createWithProvider( lcl_getConfigProvider( _rxContext ), _rPath, _nDepth, _eMode, _bLazyWrite ); } //------------------------------------------------------------------------ OConfigurationTreeRoot OConfigurationTreeRoot::tryCreateWithComponentContext( const Reference< XComponentContext >& rxContext, - const ::rtl::OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , sal_Bool _bLazyWrite ) + const OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , sal_Bool _bLazyWrite ) { OSL_ENSURE( rxContext.is(), "OConfigurationTreeRoot::tryCreateWithComponentContext: invalid XComponentContext!" ); try diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx index 53f6d1c9a458..7ff97d403f60 100644 --- a/unotools/source/config/configpaths.cxx +++ b/unotools/source/config/configpaths.cxx @@ -28,8 +28,6 @@ namespace utl { //---------------------------------------------------------------------------- - using ::rtl::OUString; - using ::rtl::OUStringBuffer; //---------------------------------------------------------------------------- @@ -253,7 +251,7 @@ OUString lcl_wrapName(const OUString& _sContent, const OUString& _sType) if (pBeginContent == pEndContent) return _sType; - rtl::OUStringBuffer aNormalized(_sType.getLength() + _sContent.getLength() + 4); // reserve approximate size initially + OUStringBuffer aNormalized(_sType.getLength() + _sContent.getLength() + 4); // reserve approximate size initially // prefix: type, opening bracket and quote aNormalized.append( _sType ).append( "['" ); diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index d41083b6cd21..4ec5810f24eb 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -50,18 +50,18 @@ namespace utl struct NodeValueAccessor { private: - ::rtl::OUString sRelativePath; // the relative path of the node + OUString sRelativePath; // the relative path of the node LocationType eLocationType; // the type of location where the value is stored void* pLocation; // the pointer to the location Type aDataType; // the type object pointed to by pLocation public: - NodeValueAccessor( const ::rtl::OUString& _rNodePath ); + NodeValueAccessor( const OUString& _rNodePath ); void bind( void* _pLocation, const Type& _rType ); bool isBound( ) const { return ( ltUnbound != eLocationType ) && ( NULL != pLocation ); } - const ::rtl::OUString& getPath( ) const { return sRelativePath; } + const OUString& getPath( ) const { return sRelativePath; } LocationType getLocType( ) const { return eLocationType; } void* getLocation( ) const { return pLocation; } const Type& getDataType( ) const { return aDataType; } @@ -70,7 +70,7 @@ namespace utl bool operator != ( const NodeValueAccessor& rhs ) const { return !operator == ( rhs ); } }; - NodeValueAccessor::NodeValueAccessor( const ::rtl::OUString& _rNodePath ) + NodeValueAccessor::NodeValueAccessor( const OUString& _rNodePath ) :sRelativePath( _rNodePath ) ,eLocationType( ltUnbound ) ,pLocation( NULL ) @@ -117,9 +117,9 @@ namespace utl (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); #ifdef DBG_UTIL - rtl::OStringBuffer aBuf( 256 ); + OStringBuffer aBuf( 256 ); aBuf.append("::utl::lcl_copyData( Accessor, Any ): could not assign the data (node path: "); - aBuf.append( rtl::OUStringToOString( _rAccessor.getPath(), RTL_TEXTENCODING_ASCII_US ) ); + aBuf.append( OUStringToOString( _rAccessor.getPath(), RTL_TEXTENCODING_ASCII_US ) ); aBuf.append( " !" ); DBG_ASSERT( bSuccess, aBuf.getStr() ); #endif @@ -234,7 +234,7 @@ namespace utl const sal_Char* _pConfigLocation, const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels ) :m_pImpl( new OConfigurationValueContainerImpl( _rxORB, _rAccessSafety ) ) { - implConstruct( ::rtl::OUString::createFromAscii( _pConfigLocation ), _nAccessFlags, _nLevels ); + implConstruct( OUString::createFromAscii( _pConfigLocation ), _nAccessFlags, _nLevels ); } OConfigurationValueContainer::~OConfigurationValueContainer() @@ -242,7 +242,7 @@ namespace utl delete m_pImpl; } - void OConfigurationValueContainer::implConstruct( const ::rtl::OUString& _rConfigLocation, + void OConfigurationValueContainer::implConstruct( const OUString& _rConfigLocation, const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels ) { DBG_ASSERT( !m_pImpl->aConfigRoot.isValid(), "OConfigurationValueContainer::implConstruct: already initialized!" ); @@ -257,9 +257,9 @@ namespace utl ( _nAccessFlags & CVC_IMMEDIATE_UPDATE ) ? sal_False : sal_True ); #ifdef DBG_UTIL - rtl::OStringBuffer aBuf(256); + OStringBuffer aBuf(256); aBuf.append("Could not access the configuration node located at "); - aBuf.append( rtl::OUStringToOString( _rConfigLocation, RTL_TEXTENCODING_ASCII_US ) ); + aBuf.append( OUStringToOString( _rConfigLocation, RTL_TEXTENCODING_ASCII_US ) ); aBuf.append( " !" ); DBG_ASSERT( m_pImpl->aConfigRoot.isValid(), aBuf.getStr() ); #endif @@ -281,7 +281,7 @@ namespace utl "OConfigurationValueContainer::registerExchangeLocation: invalid type!" ); // build an accessor for this container - NodeValueAccessor aNewAccessor( ::rtl::OUString::createFromAscii( _pRelativePath ) ); + NodeValueAccessor aNewAccessor( OUString::createFromAscii( _pRelativePath ) ); aNewAccessor.bind( _pContainer, _rValueType ); // insert it into our structure diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index f1c11964b06b..b31176cd6ed0 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.cxx @@ -36,7 +36,6 @@ using namespace osl; using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // define ---------------------------------------------------------------- @@ -95,7 +94,7 @@ public: String GetDefaultPath( sal_uInt16 nId ) const; virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); }; // global ---------------------------------------------------------------- @@ -174,7 +173,7 @@ Sequence< OUString > GetDefaultPropertyNames() return aNames; } -void SvtDefaultOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtDefaultOptions_Impl::Notify( const Sequence< OUString >& ) { // no notification, will never be changed } @@ -188,7 +187,7 @@ void SvtDefaultOptions_Impl::Commit() String SvtDefaultOptions_Impl::GetDefaultPath( sal_uInt16 nId ) const { - rtl::OUString aRet; + OUString aRet; sal_uInt16 nIdx = 0; while ( PathMap_Impl[nIdx]._ePath <= SvtPathOptions::PATH_WORK ) @@ -202,7 +201,7 @@ String SvtDefaultOptions_Impl::GetDefaultPath( sal_uInt16 nId ) const nId == SvtPathOptions::PATH_MODULE || nId == SvtPathOptions::PATH_PLUGIN ) { - rtl::OUString aTmp; + OUString aTmp; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aRet, aTmp ); aRet = aTmp; } diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx index 91c9569c1b4c..f9d5976dece6 100644 --- a/unotools/source/config/docinfohelper.cxx +++ b/unotools/source/config/docinfohelper.cxx @@ -28,15 +28,15 @@ using namespace ::com::sun::star; namespace utl { -::rtl::OUString DocInfoHelper::GetGeneratorString() +OUString DocInfoHelper::GetGeneratorString() { - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; // First product: branded name + version // version is _$ // plain product name - rtl::OUString aValue( utl::ConfigManager::getProductName() ); + OUString aValue( utl::ConfigManager::getProductName() ); if ( !aValue.isEmpty() ) { aResult.append( aValue.replace( ' ', '_' ) ); @@ -54,8 +54,8 @@ namespace utl } } - ::rtl::OUString os( "$_OS" ); - ::rtl::OUString arch( "$_ARCH" ); + OUString os( "$_OS" ); + OUString arch( "$_ARCH" ); ::rtl::Bootstrap::expandMacros(os); ::rtl::Bootstrap::expandMacros(arch); aResult.append( (sal_Unicode)'$' ); @@ -70,8 +70,8 @@ namespace utl // and ':' replaced by '-' { aResult.appendAscii( "LibreOffice_project/" ); - ::rtl::OUString aDefault; - ::rtl::OUString aBuildId( Bootstrap::getBuildIdData( aDefault ) ); + OUString aDefault; + OUString aBuildId( Bootstrap::getBuildIdData( aDefault ) ); for( sal_Int32 i=0; i < aBuildId.getLength(); i++ ) { sal_Unicode c = aBuildId[i]; diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 47896c5fe7e7..ed18ff1a2074 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -132,12 +132,12 @@ GlobalEventConfig_Impl::~GlobalEventConfig_Impl() } } -::rtl::OUString GlobalEventConfig_Impl::GetEventName( sal_Int32 nIndex ) +OUString GlobalEventConfig_Impl::GetEventName( sal_Int32 nIndex ) { if ( nIndex < (sal_Int32) m_supportedEvents.size() ) return m_supportedEvents[nIndex]; else - return rtl::OUString(); + return OUString(); } //***************************************************************************************************************** @@ -183,7 +183,7 @@ void GlobalEventConfig_Impl::Commit() if(it->second.isEmpty() ) continue; sNode = sPrefix + it->first + sPostfix; - OSL_TRACE("writing binding for: %s",::rtl::OUStringToOString(sNode , RTL_TEXTENCODING_ASCII_US ).pData->buffer); + OSL_TRACE("writing binding for: %s",OUStringToOString(sNode , RTL_TEXTENCODING_ASCII_US ).pData->buffer); seqValues[ 0 ].Name = sNode; seqValues[ 0 ].Value <<= it->second; //write the data to the registry @@ -214,7 +214,7 @@ void GlobalEventConfig_Impl::initBindingInfo() aBuffer.append( lEventNames[i] ); aBuffer.append( aCommandKey ); lMacros[0] = aBuffer.makeStringAndClear(); - OSL_TRACE("reading binding for: %s",::rtl::OUStringToOString(lMacros[0] , RTL_TEXTENCODING_ASCII_US ).pData->buffer); + OSL_TRACE("reading binding for: %s",OUStringToOString(lMacros[0] , RTL_TEXTENCODING_ASCII_US ).pData->buffer); Sequence< Any > lValues = GetProperties( lMacros ); OUString sMacroURL; if( lValues.getLength() > 0 ) @@ -280,8 +280,8 @@ Any SAL_CALL GlobalEventConfig_Impl::getByName( const OUString& aName ) throw (c Sequence< OUString > SAL_CALL GlobalEventConfig_Impl::getElementNames( ) throw (RuntimeException) { - const ::rtl::OUString* pRet = m_supportedEvents.empty() ? NULL : &m_supportedEvents[0]; - return uno::Sequence< ::rtl::OUString >(pRet, m_supportedEvents.size()); + const OUString* pRet = m_supportedEvents.empty() ? NULL : &m_supportedEvents[0]; + return uno::Sequence< OUString >(pRet, m_supportedEvents.size()); } sal_Bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw (RuntimeException) @@ -393,7 +393,7 @@ Mutex& GlobalEventConfig::GetOwnStaticMutex() return theGlobalEventConfigMutex::get(); } -::rtl::OUString GlobalEventConfig::GetEventName( sal_Int32 nIndex ) +OUString GlobalEventConfig::GetEventName( sal_Int32 nIndex ) { return GlobalEventConfig().m_pImpl->GetEventName( nIndex ); } diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 4893baa7d82b..72e216dba7e8 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -56,10 +56,10 @@ struct OUStringHashCode } }; -class ExtensionHashMap : public ::boost::unordered_map< ::rtl::OUString, +class ExtensionHashMap : public ::boost::unordered_map< OUString, sal_Int32, OUStringHashCode, - ::std::equal_to< ::rtl::OUString > > + ::std::equal_to< OUString > > { public: inline void free() diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 4a2369fc7da3..1f99d48fe723 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -61,7 +61,7 @@ public: bSaveVBA(sal_False) {} ~SvtAppFilterOptions_Impl(); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); void Load(); sal_Bool IsLoad() const {return bLoadVBA;} @@ -102,7 +102,7 @@ void SvtAppFilterOptions_Impl::Commit() PutProperties(aNames, aValues); } -void SvtAppFilterOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtAppFilterOptions_Impl::Notify( const Sequence< OUString >& ) { // no listeners supported yet } diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 223e42ec533a..9da6e05c0d67 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -46,7 +46,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::container; using namespace com::sun::star::configuration; -using ::rtl::OUString; /* * DefaultFontConfiguration @@ -285,7 +284,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const Locale& rLocale ) const sal_Unicode aSunGulim[] = { 0xC36C, 0xAD74, 0xB9BC, 0 }; const sal_Unicode aBaekmukGulim[] = { 0xBC31, 0xBC35, 0xAD74, 0xB9BC, 0 }; - rtl::OUStringBuffer aFallBackKoreanLocalized; + OUStringBuffer aFallBackKoreanLocalized; aFallBackKoreanLocalized.append(aSunGulim); aFallBackKoreanLocalized.append(';'); aFallBackKoreanLocalized.append(aBaekmukGulim); @@ -319,7 +318,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const Locale& rLocale ) const sal_Unicode aLXGothic[] = { 0x004C, 0x0058, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 }; const sal_Unicode aKochiGothic[] = { 0x6771, 0x98A8, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 }; - rtl::OUStringBuffer aFallBackJapaneseLocalized; + OUStringBuffer aFallBackJapaneseLocalized; aFallBackJapaneseLocalized.append("MS UI Gothic;"); aFallBackJapaneseLocalized.append(FALLBACKFONT_UI_SANS_JAPANESE1); aFallBackJapaneseLocalized.append(aMSPGothic); @@ -337,7 +336,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const Locale& rLocale ) return aFallBackJapaneseLocalized.makeStringAndClear(); } - return rtl::OUString(FALLBACKFONT_UI_SANS); + return OUString(FALLBACKFONT_UI_SANS); } // ------------------------------------------------------------------------------------ @@ -910,7 +909,7 @@ static const enum_convert pWidthNames[] = }; void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Reference< XNameAccess > xFont, - const rtl::OUString& rType, + const OUString& rType, std::vector< String >& rSubstVector ) const { try @@ -959,7 +958,7 @@ void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Referen } FontWeight FontSubstConfiguration::getSubstWeight( const com::sun::star::uno::Reference< XNameAccess > xFont, - const rtl::OUString& rType ) const + const OUString& rType ) const { int weight = -1; try @@ -991,7 +990,7 @@ FontWeight FontSubstConfiguration::getSubstWeight( const com::sun::star::uno::Re } FontWidth FontSubstConfiguration::getSubstWidth( const com::sun::star::uno::Reference< XNameAccess > xFont, - const rtl::OUString& rType ) const + const OUString& rType ) const { int width = -1; try @@ -1023,7 +1022,7 @@ FontWidth FontSubstConfiguration::getSubstWidth( const com::sun::star::uno::Refe } unsigned long FontSubstConfiguration::getSubstType( const com::sun::star::uno::Reference< XNameAccess > xFont, - const rtl::OUString& rType ) const + const OUString& rType ) const { unsigned long type = 0; try diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 1b19d3e5eb48..f2362b36379c 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -132,14 +132,14 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl() m_xCfg = Reference< css::container::XNameAccess > ( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - rtl::OUString(s_sHistories), + OUString(s_sHistories), ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY ); m_xCommonXCU = Reference< css::container::XNameAccess > ( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - rtl::OUString(s_sCommonHistory), + OUString(s_sCommonHistory), ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY ); } @@ -177,15 +177,15 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory ) switch( eHistory ) { case ePICKLIST: - xListAccess->getPropertyValue(rtl::OUString(s_sPickListSize)) >>= nSize; + xListAccess->getPropertyValue(OUString(s_sPickListSize)) >>= nSize; break; case eHISTORY: - xListAccess->getPropertyValue(rtl::OUString(s_sURLHistorySize)) >>= nSize; + xListAccess->getPropertyValue(OUString(s_sURLHistorySize)) >>= nSize; break; case eHELPBOOKMARKS: - xListAccess->getPropertyValue(rtl::OUString(s_sHelpBookmarksSize)) >>= nSize; + xListAccess->getPropertyValue(OUString(s_sHelpBookmarksSize)) >>= nSize; break; default: @@ -213,15 +213,15 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt switch( eHistory ) { case ePICKLIST: - m_xCfg->getByName(rtl::OUString(s_sPickList)) >>= xList; + m_xCfg->getByName(OUString(s_sPickList)) >>= xList; break; case eHISTORY: - m_xCfg->getByName(rtl::OUString(s_sURLHistory)) >>= xList; + m_xCfg->getByName(OUString(s_sURLHistory)) >>= xList; break; case eHELPBOOKMARKS: - m_xCfg->getByName(rtl::OUString(s_sHelpBookmarks)) >>= xList; + m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xList; break; default: @@ -233,18 +233,18 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt if ( ! xList.is()) return; - xList->getByName(rtl::OUString(s_sOrderList)) >>= xOrderList; - xList->getByName(rtl::OUString(s_sItemList)) >>= xItemList; + xList->getByName(OUString(s_sOrderList)) >>= xOrderList; + xList->getByName(OUString(s_sItemList)) >>= xItemList; const sal_uInt32 nLength = xOrderList->getElementNames().getLength(); if (nSize < nLength) { for (sal_uInt32 i=nLength-1; i>=nSize; --i) { - ::rtl::OUString sTmp; - const ::rtl::OUString sRemove = ::rtl::OUString::valueOf((sal_Int32)i); + OUString sTmp; + const OUString sRemove = OUString::valueOf((sal_Int32)i); xOrderList->getByName(sRemove) >>= xSet; - xSet->getPropertyValue(rtl::OUString(s_sHistoryItemRef)) >>= sTmp; + xSet->getPropertyValue(OUString(s_sHistoryItemRef)) >>= sTmp; xItemList->removeByName(sTmp); xOrderList->removeByName(sRemove); } @@ -266,7 +266,7 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory ) { css::uno::Reference< css::container::XNameAccess > xListAccess; css::uno::Reference< css::container::XNameContainer > xNode; - Sequence< ::rtl::OUString > lOrders; + Sequence< OUString > lOrders; try { @@ -274,19 +274,19 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory ) { case ePICKLIST: { - m_xCfg->getByName(rtl::OUString(s_sPickList)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sPickList)) >>= xListAccess; break; } case eHISTORY: { - m_xCfg->getByName(rtl::OUString(s_sURLHistory)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess; break; } case eHELPBOOKMARKS: { - m_xCfg->getByName(rtl::OUString(s_sHelpBookmarks)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess; break; } @@ -297,14 +297,14 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory ) if (xListAccess.is()) { // clear ItemList - xListAccess->getByName(rtl::OUString(s_sItemList)) >>= xNode ; + xListAccess->getByName(OUString(s_sItemList)) >>= xNode ; lOrders = xNode->getElementNames(); const sal_Int32 nLength = lOrders.getLength(); for(sal_Int32 i=0; iremoveByName(lOrders[i]); // clear OrderList - xListAccess->getByName(rtl::OUString(s_sOrderList)) >>= xNode ; + xListAccess->getByName(OUString(s_sOrderList)) >>= xNode ; lOrders = xNode->getElementNames(); for(sal_Int32 j=0; jremoveByName(lOrders[j]); @@ -328,7 +328,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT Sequence< Sequence< PropertyValue > > seqReturn; // Set default return value. Sequence< PropertyValue > seqProperties( 4 ); - Sequence< ::rtl::OUString > lOrders; + Sequence< OUString > lOrders; css::uno::Reference< css::container::XNameAccess > xListAccess; css::uno::Reference< css::container::XNameAccess > xItemList; @@ -346,19 +346,19 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT { case ePICKLIST: { - m_xCfg->getByName(rtl::OUString(s_sPickList)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sPickList)) >>= xListAccess; break; } case eHISTORY: { - m_xCfg->getByName(rtl::OUString(s_sURLHistory)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess; break; } case eHELPBOOKMARKS: { - m_xCfg->getByName(rtl::OUString(s_sHelpBookmarks)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess; break; } @@ -368,8 +368,8 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT if (xListAccess.is()) { - xListAccess->getByName(rtl::OUString(s_sItemList)) >>= xItemList; - xListAccess->getByName(rtl::OUString(s_sOrderList)) >>= xOrderList; + xListAccess->getByName(OUString(s_sItemList)) >>= xItemList; + xListAccess->getByName(OUString(s_sOrderList)) >>= xOrderList; const sal_Int32 nLength = xOrderList->getElementNames().getLength(); Sequence< Sequence< PropertyValue > > aRet(nLength); @@ -379,15 +379,15 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT { try { - ::rtl::OUString sUrl; - xOrderList->getByName(::rtl::OUString::valueOf(nItem)) >>= xSet; - xSet->getPropertyValue(rtl::OUString(s_sHistoryItemRef)) >>= sUrl; + OUString sUrl; + xOrderList->getByName(OUString::valueOf(nItem)) >>= xSet; + xSet->getPropertyValue(OUString(s_sHistoryItemRef)) >>= sUrl; xItemList->getByName(sUrl) >>= xSet; seqProperties[s_nOffsetURL ].Value <<= sUrl; - xSet->getPropertyValue(rtl::OUString(s_sFilter)) >>= seqProperties[s_nOffsetFilter ].Value; - xSet->getPropertyValue(rtl::OUString(s_sTitle)) >>= seqProperties[s_nOffsetTitle ].Value; - xSet->getPropertyValue(rtl::OUString(s_sPassword)) >>= seqProperties[s_nOffsetPassword ].Value; + xSet->getPropertyValue(OUString(s_sFilter)) >>= seqProperties[s_nOffsetFilter ].Value; + xSet->getPropertyValue(OUString(s_sTitle)) >>= seqProperties[s_nOffsetTitle ].Value; + xSet->getPropertyValue(OUString(s_sPassword)) >>= seqProperties[s_nOffsetPassword ].Value; aRet[nCount++] = seqProperties; } catch(const css::uno::Exception& ex) @@ -434,19 +434,19 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , { case ePICKLIST: { - m_xCfg->getByName(rtl::OUString(s_sPickList)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sPickList)) >>= xListAccess; nMaxSize = GetSize(ePICKLIST); } break; case eHISTORY: { - m_xCfg->getByName(rtl::OUString(s_sURLHistory)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess; nMaxSize = GetSize(eHISTORY); } break; case eHELPBOOKMARKS: { - m_xCfg->getByName(rtl::OUString(s_sHelpBookmarks)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess; nMaxSize = GetSize(eHELPBOOKMARKS); } break; @@ -463,37 +463,37 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , try { - xListAccess->getByName(rtl::OUString(s_sItemList)) >>= xItemList; - xListAccess->getByName(rtl::OUString(s_sOrderList)) >>= xOrderList; + xListAccess->getByName(OUString(s_sItemList)) >>= xItemList; + xListAccess->getByName(OUString(s_sOrderList)) >>= xOrderList; sal_Int32 nLength = xOrderList->getElementNames().getLength(); - rtl::OUString sHistoryItemRef(s_sHistoryItemRef); + OUString sHistoryItemRef(s_sHistoryItemRef); // The item to be appended is already existing! if (xItemList->hasByName(sURL)) { for (sal_Int32 i=0; igetByName(::rtl::OUString::valueOf(i)) >>= xSet; + OUString sTmp; + xOrderList->getByName(OUString::valueOf(i)) >>= xSet; xSet->getPropertyValue(sHistoryItemRef) >>= sTmp; if(sURL == sTmp) { - ::rtl::OUString sFind; - xOrderList->getByName( ::rtl::OUString::valueOf(i) ) >>= xSet; + OUString sFind; + xOrderList->getByName( OUString::valueOf(i) ) >>= xSet; xSet->getPropertyValue(sHistoryItemRef) >>= sFind; for (sal_Int32 j=i-1; j>=0; --j) { css::uno::Reference< css::beans::XPropertySet > xPrevSet; css::uno::Reference< css::beans::XPropertySet > xNextSet; - xOrderList->getByName( ::rtl::OUString::valueOf(j+1) ) >>= xPrevSet; - xOrderList->getByName( ::rtl::OUString::valueOf(j) ) >>= xNextSet; + xOrderList->getByName( OUString::valueOf(j+1) ) >>= xPrevSet; + xOrderList->getByName( OUString::valueOf(j) ) >>= xNextSet; - ::rtl::OUString sTemp; + OUString sTemp; xNextSet->getPropertyValue(sHistoryItemRef) >>= sTemp; xPrevSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sTemp)); } - xOrderList->getByName( ::rtl::OUString::valueOf((sal_Int32)0) ) >>= xSet; + xOrderList->getByName( OUString::valueOf((sal_Int32)0) ) >>= xSet; xSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sFind)); ::comphelper::ConfigurationHelper::flush(m_xCfg); @@ -513,8 +513,8 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , // Append new item to OrderList. if ( nLength == nMaxSize ) { - ::rtl::OUString sRemove; - xOrderList->getByName(::rtl::OUString::valueOf(nLength-1)) >>= xSet; + OUString sRemove; + xOrderList->getByName(OUString::valueOf(nLength-1)) >>= xSet; xSet->getPropertyValue(sHistoryItemRef) >>= sRemove; try { @@ -538,18 +538,18 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , { xFac = css::uno::Reference< css::lang::XSingleServiceFactory >(xOrderList, css::uno::UNO_QUERY); xInst = xFac->createInstance(); - ::rtl::OUString sPush = ::rtl::OUString::valueOf(nLength++); + OUString sPush = OUString::valueOf(nLength++); xOrderList->insertByName(sPush, css::uno::makeAny(xInst)); } for (sal_Int32 j=nLength-1; j>0; --j) { - xOrderList->getByName( ::rtl::OUString::valueOf(j) ) >>= xPrevSet; - xOrderList->getByName( ::rtl::OUString::valueOf(j-1) ) >>= xNextSet; - ::rtl::OUString sTemp; + xOrderList->getByName( OUString::valueOf(j) ) >>= xPrevSet; + xOrderList->getByName( OUString::valueOf(j-1) ) >>= xNextSet; + OUString sTemp; xNextSet->getPropertyValue(sHistoryItemRef) >>= sTemp; xPrevSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sTemp)); } - xOrderList->getByName( ::rtl::OUString::valueOf((sal_Int32)0) ) >>= xSet; + xOrderList->getByName( OUString::valueOf((sal_Int32)0) ) >>= xSet; xSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sURL)); // Append the item to ItemList. @@ -557,9 +557,9 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , xInst = xFac->createInstance(); xItemList->insertByName(sURL, css::uno::makeAny(xInst)); xSet = css::uno::Reference< css::beans::XPropertySet >(xInst, css::uno::UNO_QUERY); - xSet->setPropertyValue(rtl::OUString(s_sFilter), css::uno::makeAny(sFilter)); - xSet->setPropertyValue(rtl::OUString(s_sTitle), css::uno::makeAny(sTitle)); - xSet->setPropertyValue(rtl::OUString(s_sPassword), css::uno::makeAny(sPassword)); + xSet->setPropertyValue(OUString(s_sFilter), css::uno::makeAny(sFilter)); + xSet->setPropertyValue(OUString(s_sTitle), css::uno::makeAny(sTitle)); + xSet->setPropertyValue(OUString(s_sPassword), css::uno::makeAny(sPassword)); ::comphelper::ConfigurationHelper::flush(m_xCfg); } diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 8220c48ed28e..8abbb38e84e4 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -68,8 +68,8 @@ ItemHolder1::ItemHolder1() if(bMessage) { bMessage = sal_False; - ::rtl::OString sMsg("CreateInstance with arguments exception: "); - sMsg += ::rtl::OString(rEx.Message.getStr(), + OString sMsg("CreateInstance with arguments exception: "); + sMsg += OString(rEx.Message.getStr(), rEx.Message.getLength(), RTL_TEXTENCODING_ASCII_US); OSL_FAIL(sMsg.getStr()); @@ -221,19 +221,19 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem) break; case E_VIEWOPTIONS_DIALOG : - rItem.pItem = new SvtViewOptions(E_DIALOG, ::rtl::OUString()); + rItem.pItem = new SvtViewOptions(E_DIALOG, OUString()); break; case E_VIEWOPTIONS_TABDIALOG : - rItem.pItem = new SvtViewOptions(E_TABDIALOG, ::rtl::OUString()); + rItem.pItem = new SvtViewOptions(E_TABDIALOG, OUString()); break; case E_VIEWOPTIONS_TABPAGE : - rItem.pItem = new SvtViewOptions(E_TABPAGE, ::rtl::OUString()); + rItem.pItem = new SvtViewOptions(E_TABPAGE, OUString()); break; case E_VIEWOPTIONS_WINDOW : - rItem.pItem = new SvtViewOptions(E_WINDOW, ::rtl::OUString()); + rItem.pItem = new SvtViewOptions(E_WINDOW, OUString()); break; case E_USEROPTIONS : diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 24d8b196a9f8..484869e7de36 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -42,7 +42,6 @@ using namespace com::sun::star; -using ::rtl::OUString; using ::rtl::Uri; #define EXPAND_PROTOCOL "vnd.sun.star.expand:" @@ -152,7 +151,7 @@ public: virtual ~SvtLinguConfigItem(); // utl::ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); virtual void Commit(); // make some protected functions of utl::ConfigItem public @@ -165,24 +164,24 @@ public: com::sun::star::uno::Any - GetProperty( const rtl::OUString &rPropertyName ) const; + GetProperty( const OUString &rPropertyName ) const; com::sun::star::uno::Any GetProperty( sal_Int32 nPropertyHandle ) const; - sal_Bool SetProperty( const rtl::OUString &rPropertyName, + sal_Bool SetProperty( const OUString &rPropertyName, const com::sun::star::uno::Any &rValue ); sal_Bool SetProperty( sal_Int32 nPropertyHandle, const com::sun::star::uno::Any &rValue ); const SvtLinguOptions& GetOptions() const; - sal_Bool IsReadOnly( const rtl::OUString &rPropertyName ) const; + sal_Bool IsReadOnly( const OUString &rPropertyName ) const; sal_Bool IsReadOnly( sal_Int32 nPropertyHandle ) const; }; SvtLinguConfigItem::SvtLinguConfigItem() : - utl::ConfigItem( rtl::OUString("Office.Linguistic") ) + utl::ConfigItem( OUString("Office.Linguistic") ) { const uno::Sequence< OUString > &rPropertyNames = GetPropertyNames(); LoadOptions( rPropertyNames ); @@ -274,7 +273,7 @@ const uno::Sequence< OUString > SvtLinguConfigItem::GetPropertyNames() { const sal_Char *pFullPropName = aNamesToHdl[i].pFullPropName; if (pFullPropName) - pNames[ nIdx++ ] = ::rtl::OUString::createFromAscii( pFullPropName ); + pNames[ nIdx++ ] = OUString::createFromAscii( pFullPropName ); } aNames.realloc( nIdx ); @@ -738,7 +737,7 @@ sal_Bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProp return bRet; } -sal_Bool SvtLinguConfigItem::IsReadOnly( const rtl::OUString &rPropertyName ) const +sal_Bool SvtLinguConfigItem::IsReadOnly( const OUString &rPropertyName ) const { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); @@ -882,14 +881,14 @@ sal_Bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const return sal_True; } -sal_Bool SvtLinguConfig::IsReadOnly( const rtl::OUString &rPropertyName ) const +sal_Bool SvtLinguConfig::IsReadOnly( const OUString &rPropertyName ) const { return GetConfigItem().IsReadOnly( rPropertyName ); } sal_Bool SvtLinguConfig::GetElementNamesFor( - const rtl::OUString &rNodeName, - uno::Sequence< rtl::OUString > &rElementNames ) const + const OUString &rNodeName, + uno::Sequence< OUString > &rElementNames ) const { bool bSuccess = false; try @@ -907,9 +906,9 @@ sal_Bool SvtLinguConfig::GetElementNamesFor( } sal_Bool SvtLinguConfig::GetSupportedDictionaryFormatsFor( - const rtl::OUString &rSetName, - const rtl::OUString &rSetEntry, - uno::Sequence< rtl::OUString > &rFormatList ) const + const OUString &rSetName, + const OUString &rSetEntry, + uno::Sequence< OUString > &rFormatList ) const { if (rSetName.isEmpty() || rSetEntry.isEmpty()) return sal_False; @@ -972,7 +971,7 @@ static bool lcl_GetFileUrlFromOrigin( sal_Bool SvtLinguConfig::GetDictionaryEntry( - const rtl::OUString &rNodeName, + const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const { if (rNodeName.isEmpty()) @@ -1002,7 +1001,7 @@ sal_Bool SvtLinguConfig::GetDictionaryEntry( // get file URL's for the locations for (sal_Int32 i = 0; i < aLocations.getLength(); ++i) { - rtl::OUString &rLocation = aLocations[i]; + OUString &rLocation = aLocations[i]; if (!lcl_GetFileUrlFromOrigin( rLocation, rLocation )) bSuccess = false; } @@ -1022,9 +1021,9 @@ sal_Bool SvtLinguConfig::GetDictionaryEntry( return bSuccess; } -uno::Sequence< rtl::OUString > SvtLinguConfig::GetDisabledDictionaries() const +uno::Sequence< OUString > SvtLinguConfig::GetDisabledDictionaries() const { - uno::Sequence< rtl::OUString > aResult; + uno::Sequence< OUString > aResult; try { uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW ); @@ -1046,10 +1045,10 @@ std::vector< SvtLinguConfigDictionaryEntry > SvtLinguConfig::GetActiveDictionari try { - uno::Sequence< rtl::OUString > aElementNames; - GetElementNamesFor( rtl::OUString(aG_Dictionaries), aElementNames ); + uno::Sequence< OUString > aElementNames; + GetElementNamesFor( OUString(aG_Dictionaries), aElementNames ); sal_Int32 nLen = aElementNames.getLength(); - const rtl::OUString *pElementNames = aElementNames.getConstArray(); + const OUString *pElementNames = aElementNames.getConstArray(); SvtLinguConfigDictionaryEntry aDicEntry; for (sal_Int32 i = 0; i < nLen; ++i) @@ -1060,7 +1059,7 @@ std::vector< SvtLinguConfigDictionaryEntry > SvtLinguConfig::GetActiveDictionari { // check if it is active or not bool bDicIsActive = true; - const uno::Sequence< rtl::OUString > aDisabledDics( GetDisabledDictionaries() ); + const uno::Sequence< OUString > aDisabledDics( GetDisabledDictionaries() ); for (sal_Int32 k = 0; bDicIsActive && k < aDisabledDics.getLength(); ++k) { if (aDisabledDics[k] == pElementNames[i]) @@ -1119,11 +1118,11 @@ uno::Reference< util::XChangesBatch > SvtLinguConfig::GetMainUpdateAccess() cons } -rtl::OUString SvtLinguConfig::GetVendorImageUrl_Impl( - const rtl::OUString &rServiceImplName, - const rtl::OUString &rImageName ) const +OUString SvtLinguConfig::GetVendorImageUrl_Impl( + const OUString &rServiceImplName, + const OUString &rImageName ) const { - rtl::OUString aRes; + OUString aRes; try { uno::Reference< container::XNameAccess > xImagesNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW ); @@ -1132,14 +1131,14 @@ rtl::OUString SvtLinguConfig::GetVendorImageUrl_Impl( uno::Reference< container::XNameAccess > xNA( xImagesNA->getByName(OUString("ServiceNameEntries")), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName( rServiceImplName ), uno::UNO_QUERY_THROW ); uno::Any aAny(xNA->getByName(OUString("VendorImagesNode"))); - rtl::OUString aVendorImagesNode; + OUString aVendorImagesNode; if (aAny >>= aVendorImagesNode) { xNA = xImagesNA; xNA.set( xNA->getByName(OUString("VendorImages")), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName( aVendorImagesNode ), uno::UNO_QUERY_THROW ); aAny = xNA->getByName( rImageName ); - rtl::OUString aTmp; + OUString aTmp; if (aAny >>= aTmp) { if (lcl_GetFileUrlFromOrigin( aTmp, aTmp )) @@ -1155,11 +1154,11 @@ rtl::OUString SvtLinguConfig::GetVendorImageUrl_Impl( } -rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage( - const rtl::OUString &rServiceImplName +OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage( + const OUString &rServiceImplName ) const { - rtl::OUString aRes; + OUString aRes; if (!rServiceImplName.isEmpty()) { OUString aImageName( "SpellAndGrammarContextMenuSuggestionImage" ); @@ -1170,11 +1169,11 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage( } -rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( - const rtl::OUString &rServiceImplName +OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( + const OUString &rServiceImplName ) const { - rtl::OUString aRes; + OUString aRes; if (!rServiceImplName.isEmpty()) { OUString aImageName( "SpellAndGrammarContextMenuDictionaryImage" ); @@ -1184,11 +1183,11 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( return aRes; } -::rtl::OUString SvtLinguConfig::GetSynonymsContextImage( - const ::rtl::OUString &rServiceImplName +OUString SvtLinguConfig::GetSynonymsContextImage( + const OUString &rServiceImplName ) const { - rtl::OUString aRes; + OUString aRes; if (!rServiceImplName.isEmpty()) { OUString aImageName( "SynonymsContextMenuImage" ); diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index 85711cc4ed3a..569c9f475295 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; namespace utl { @@ -46,14 +45,14 @@ class SfxMiscCfg : public utl::ConfigItem sal_Bool bNotFound; sal_Int32 nYear2000; // two digit year representation - const com::sun::star::uno::Sequence GetPropertyNames(); + const com::sun::star::uno::Sequence GetPropertyNames(); void Load(); public: SfxMiscCfg( ); ~SfxMiscCfg( ); - virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); virtual void Commit(); sal_Bool IsNotFoundWarning() const {return bNotFound;} @@ -153,7 +152,7 @@ void SfxMiscCfg::Load() } } -void SfxMiscCfg::Notify( const com::sun::star::uno::Sequence& ) +void SfxMiscCfg::Notify( const com::sun::star::uno::Sequence& ) { Load(); } diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index e0152939d109..b982cb0e3fbf 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -51,17 +51,17 @@ e.g.: NAMELIST[ PROPERTYHANDLE_xxx ] => VALUELIST[ PROPERTYHANDLE_xxx ] *//*-*************************************************************************************************************/ -#define ROOTNODE_FACTORIES ::rtl::OUString("Setup/Office/Factories" ) -#define PATHSEPERATOR ::rtl::OUString("/" ) +#define ROOTNODE_FACTORIES OUString("Setup/Office/Factories" ) +#define PATHSEPERATOR OUString("/" ) // Attention: The property "ooSetupFactoryEmptyDocumentURL" is read from configuration but not used! There is // special code that uses hard coded strings to return them. -#define PROPERTYNAME_SHORTNAME ::rtl::OUString("ooSetupFactoryShortName" ) -#define PROPERTYNAME_TEMPLATEFILE ::rtl::OUString("ooSetupFactoryTemplateFile" ) -#define PROPERTYNAME_WINDOWATTRIBUTES ::rtl::OUString("ooSetupFactoryWindowAttributes") -#define PROPERTYNAME_EMPTYDOCUMENTURL ::rtl::OUString("ooSetupFactoryEmptyDocumentURL") -#define PROPERTYNAME_DEFAULTFILTER ::rtl::OUString("ooSetupFactoryDefaultFilter" ) -#define PROPERTYNAME_ICON ::rtl::OUString("ooSetupFactoryIcon" ) +#define PROPERTYNAME_SHORTNAME OUString("ooSetupFactoryShortName" ) +#define PROPERTYNAME_TEMPLATEFILE OUString("ooSetupFactoryTemplateFile" ) +#define PROPERTYNAME_WINDOWATTRIBUTES OUString("ooSetupFactoryWindowAttributes") +#define PROPERTYNAME_EMPTYDOCUMENTURL OUString("ooSetupFactoryEmptyDocumentURL") +#define PROPERTYNAME_DEFAULTFILTER OUString("ooSetupFactoryDefaultFilter" ) +#define PROPERTYNAME_ICON OUString("ooSetupFactoryIcon" ) #define PROPERTYHANDLE_SHORTNAME 0 #define PROPERTYHANDLE_TEMPLATEFILE 1 @@ -72,16 +72,16 @@ #define PROPERTYCOUNT 6 -#define FACTORYNAME_WRITER ::rtl::OUString("com.sun.star.text.TextDocument" ) -#define FACTORYNAME_WRITERWEB ::rtl::OUString("com.sun.star.text.WebDocument" ) -#define FACTORYNAME_WRITERGLOBAL ::rtl::OUString("com.sun.star.text.GlobalDocument" ) -#define FACTORYNAME_CALC ::rtl::OUString("com.sun.star.sheet.SpreadsheetDocument" ) -#define FACTORYNAME_DRAW ::rtl::OUString("com.sun.star.drawing.DrawingDocument" ) -#define FACTORYNAME_IMPRESS ::rtl::OUString("com.sun.star.presentation.PresentationDocument") -#define FACTORYNAME_MATH ::rtl::OUString("com.sun.star.formula.FormulaProperties" ) -#define FACTORYNAME_CHART ::rtl::OUString("com.sun.star.chart2.ChartDocument" ) -#define FACTORYNAME_DATABASE ::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument" ) -#define FACTORYNAME_STARTMODULE ::rtl::OUString("com.sun.star.frame.StartModule" ) +#define FACTORYNAME_WRITER OUString("com.sun.star.text.TextDocument" ) +#define FACTORYNAME_WRITERWEB OUString("com.sun.star.text.WebDocument" ) +#define FACTORYNAME_WRITERGLOBAL OUString("com.sun.star.text.GlobalDocument" ) +#define FACTORYNAME_CALC OUString("com.sun.star.sheet.SpreadsheetDocument" ) +#define FACTORYNAME_DRAW OUString("com.sun.star.drawing.DrawingDocument" ) +#define FACTORYNAME_IMPRESS OUString("com.sun.star.presentation.PresentationDocument") +#define FACTORYNAME_MATH OUString("com.sun.star.formula.FormulaProperties" ) +#define FACTORYNAME_CHART OUString("com.sun.star.chart2.ChartDocument" ) +#define FACTORYNAME_DATABASE OUString("com.sun.star.sdb.OfficeDatabaseDocument" ) +#define FACTORYNAME_STARTMODULE OUString("com.sun.star.frame.StartModule" ) #define FACTORYCOUNT 10 @@ -124,7 +124,7 @@ struct FactoryInfo // returns list of properties, which has changed only! // We use given value of sNodeBase to build full qualified paths ... // Last sign of it must be "/". because we use it directly, without any additional things! - css::uno::Sequence< css::beans::PropertyValue > getChangedProperties( const ::rtl::OUString& sNodeBase ) + css::uno::Sequence< css::beans::PropertyValue > getChangedProperties( const OUString& sNodeBase ) { // a) reserve memory for max. count of changed properties // b) add names and values of changed ones only and count it @@ -190,11 +190,11 @@ struct FactoryInfo // That's why we can't make our member public. We must use get/set/init methods // to control access on it! sal_Bool getInstalled () const { return bInstalled; }; - ::rtl::OUString getFactory () const { return sFactory; }; - ::rtl::OUString getShortName () const { return sShortName; }; - ::rtl::OUString getTemplateFile () const { return sTemplateFile; }; - ::rtl::OUString getWindowAttributes () const { return sWindowAttributes; }; - ::rtl::OUString getDefaultFilter () const { return sDefaultFilter; }; + OUString getFactory () const { return sFactory; }; + OUString getShortName () const { return sShortName; }; + OUString getTemplateFile () const { return sTemplateFile; }; + OUString getWindowAttributes () const { return sWindowAttributes; }; + OUString getDefaultFilter () const { return sDefaultFilter; }; sal_Bool isDefaultFilterReadonly() const { return bDefaultFilterReadonly; } sal_Int32 getIcon () const { return nIcon; }; @@ -202,16 +202,16 @@ struct FactoryInfo // If you call set-methods - we check for changes of valkues and mark it. // But if you whish to set it without that ... you must initialize it! void initInstalled ( sal_Bool bNewInstalled ) { bInstalled = bNewInstalled ; } - void initFactory ( const ::rtl::OUString& sNewFactory ) { sFactory = sNewFactory ; } - void initShortName ( const ::rtl::OUString& sNewShortName ) { sShortName = sNewShortName ; } - void initWindowAttributes ( const ::rtl::OUString& sNewWindowAttributes ) { sWindowAttributes = sNewWindowAttributes ; } - void initEmptyDocumentURL ( const ::rtl::OUString& sNewEmptyDocumentURL ) { sEmptyDocumentURL = sNewEmptyDocumentURL ; } - void initDefaultFilter ( const ::rtl::OUString& sNewDefaultFilter ) { sDefaultFilter = sNewDefaultFilter ; } + void initFactory ( const OUString& sNewFactory ) { sFactory = sNewFactory ; } + void initShortName ( const OUString& sNewShortName ) { sShortName = sNewShortName ; } + void initWindowAttributes ( const OUString& sNewWindowAttributes ) { sWindowAttributes = sNewWindowAttributes ; } + void initEmptyDocumentURL ( const OUString& sNewEmptyDocumentURL ) { sEmptyDocumentURL = sNewEmptyDocumentURL ; } + void initDefaultFilter ( const OUString& sNewDefaultFilter ) { sDefaultFilter = sNewDefaultFilter ; } void setDefaultFilterReadonly( const sal_Bool bVal){bDefaultFilterReadonly = bVal;} void initIcon ( sal_Int32 nNewIcon ) { nIcon = nNewIcon ; } //--------------------------------------------------------------------------------------------------------- - void initTemplateFile( const ::rtl::OUString& sNewTemplateFile ) + void initTemplateFile( const OUString& sNewTemplateFile ) { if ( !sNewTemplateFile.isEmpty() ) { @@ -226,7 +226,7 @@ struct FactoryInfo } //--------------------------------------------------------------------------------------------------------- - void setTemplateFile( const ::rtl::OUString& sNewTemplateFile ) + void setTemplateFile( const OUString& sNewTemplateFile ) { if( sTemplateFile != sNewTemplateFile ) { @@ -236,7 +236,7 @@ struct FactoryInfo }; //--------------------------------------------------------------------------------------------------------- - void setWindowAttributes( const ::rtl::OUString& sNewWindowAttributes ) + void setWindowAttributes( const OUString& sNewWindowAttributes ) { if( sWindowAttributes != sNewWindowAttributes ) { @@ -246,7 +246,7 @@ struct FactoryInfo }; //--------------------------------------------------------------------------------------------------------- - void setDefaultFilter( const ::rtl::OUString& sNewDefaultFilter ) + void setDefaultFilter( const OUString& sNewDefaultFilter ) { if( sDefaultFilter != sNewDefaultFilter ) { @@ -266,12 +266,12 @@ struct FactoryInfo } sal_Bool bInstalled ; - ::rtl::OUString sFactory ; - ::rtl::OUString sShortName ; - ::rtl::OUString sTemplateFile ; - ::rtl::OUString sWindowAttributes ; - ::rtl::OUString sEmptyDocumentURL ; - ::rtl::OUString sDefaultFilter ; + OUString sFactory ; + OUString sShortName ; + OUString sTemplateFile ; + OUString sWindowAttributes ; + OUString sEmptyDocumentURL ; + OUString sDefaultFilter ; sal_Int32 nIcon ; sal_Bool bChangedTemplateFile :1 ; @@ -313,35 +313,35 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem //--------------------------------------------------------------------------------------------------------- // overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- - virtual void Notify( const css::uno::Sequence< ::rtl::OUString >& lPropertyNames ); + virtual void Notify( const css::uno::Sequence< OUString >& lPropertyNames ); virtual void Commit( ); //--------------------------------------------------------------------------------------------------------- // public interface //--------------------------------------------------------------------------------------------------------- sal_Bool IsModuleInstalled ( SvtModuleOptions::EModule eModule ) const; - ::com::sun::star::uno::Sequence < ::rtl::OUString > GetAllServiceNames(); - ::rtl::OUString GetFactoryName ( SvtModuleOptions::EFactory eFactory ) const; - ::rtl::OUString GetFactoryShortName ( SvtModuleOptions::EFactory eFactory ) const; - ::rtl::OUString GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const; - ::rtl::OUString GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const; - ::rtl::OUString GetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory ) const; + ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames(); + OUString GetFactoryName ( SvtModuleOptions::EFactory eFactory ) const; + OUString GetFactoryShortName ( SvtModuleOptions::EFactory eFactory ) const; + OUString GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const; + OUString GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const; + OUString GetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory ) const; sal_Bool IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory ) const; sal_Int32 GetFactoryIcon ( SvtModuleOptions::EFactory eFactory ) const; - static sal_Bool ClassifyFactoryByName ( const ::rtl::OUString& sName , + static sal_Bool ClassifyFactoryByName ( const OUString& sName , SvtModuleOptions::EFactory& eFactory ); void SetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory , - const ::rtl::OUString& sTemplate ); + const OUString& sTemplate ); void SetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory , - const ::rtl::OUString& sFilter ); + const OUString& sFilter ); void MakeReadonlyStatesAvailable(); //------------------------------------------------------------------------------------------------------------- // private methods //------------------------------------------------------------------------------------------------------------- private: - static css::uno::Sequence< ::rtl::OUString > impl_ExpandSetNames ( const css::uno::Sequence< ::rtl::OUString >& lSetNames ); - void impl_Read ( const css::uno::Sequence< ::rtl::OUString >& lSetNames ); + static css::uno::Sequence< OUString > impl_ExpandSetNames ( const css::uno::Sequence< OUString >& lSetNames ); + void impl_Read ( const css::uno::Sequence< OUString >& lSetNames ); //------------------------------------------------------------------------------------------------------------- // private types @@ -380,7 +380,7 @@ SvtModuleOptions_Impl::SvtModuleOptions_Impl() // Get name list of all existing set node names in configuration to read her properties in impl_Read(). // These list is a list of long names of our factories. - const css::uno::Sequence< ::rtl::OUString > lFactories = GetNodeNames( ::rtl::OUString() ); + const css::uno::Sequence< OUString > lFactories = GetNodeNames( OUString() ); impl_Read( lFactories ); // Enable notification for changes by using configuration directly. @@ -430,7 +430,7 @@ SvtModuleOptions_Impl::~SvtModuleOptions_Impl() @onerror - @threadsafe no *//*-*************************************************************************************************************/ -void SvtModuleOptions_Impl::Notify( const css::uno::Sequence< ::rtl::OUString >& ) +void SvtModuleOptions_Impl::Notify( const css::uno::Sequence< OUString >& ) { OSL_FAIL( "SvtModuleOptions_Impl::Notify()\nNot implemented yet!\n" ); } @@ -460,7 +460,7 @@ void SvtModuleOptions_Impl::Commit() css::uno::Sequence< css::beans::PropertyValue > lCommitProperties( FACTORYCOUNT*PROPERTYCOUNT ); FactoryInfo* pInfo = NULL ; sal_Int32 nRealCount = 0 ; - ::rtl::OUString sBasePath ; + OUString sBasePath ; for( sal_Int32 nFactory=0; nFactory 0 ) { lCommitProperties.realloc( nRealCount ); - SetSetProperties( ::rtl::OUString(), lCommitProperties ); + SetSetProperties( OUString(), lCommitProperties ); } } @@ -539,7 +539,7 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo return bInstalled; } -::com::sun::star::uno::Sequence < ::rtl::OUString > SvtModuleOptions_Impl::GetAllServiceNames() +::com::sun::star::uno::Sequence < OUString > SvtModuleOptions_Impl::GetAllServiceNames() { sal_uInt32 nCount=0; if( m_lFactories[SvtModuleOptions::E_WRITER].getInstalled() ) @@ -563,7 +563,7 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo if( m_lFactories[SvtModuleOptions::E_SDATABASE].getInstalled() ) nCount++; - css::uno::Sequence < ::rtl::OUString > aRet( nCount ); + css::uno::Sequence < OUString > aRet( nCount ); sal_Int32 n=0; if( m_lFactories[SvtModuleOptions::E_WRITER].getInstalled() ) aRet[n++] = m_lFactories[SvtModuleOptions::E_WRITER].getFactory(); @@ -590,9 +590,9 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions_Impl::GetFactoryName( SvtModuleOptions::EFactory eFactory ) const +OUString SvtModuleOptions_Impl::GetFactoryName( SvtModuleOptions::EFactory eFactory ) const { - ::rtl::OUString sName; + OUString sName; if( eFactory>=0 && eFactory=0 && eFactory=0 && eFactory=0 && eFactory=0 && eFactory SvtModuleOptions_Impl::impl_ExpandSetNames( const css::uno::Sequence< ::rtl::OUString >& lSetNames ) +css::uno::Sequence< OUString > SvtModuleOptions_Impl::impl_ExpandSetNames( const css::uno::Sequence< OUString >& lSetNames ) { sal_Int32 nCount = lSetNames.getLength() ; - css::uno::Sequence< ::rtl::OUString > lPropNames ( nCount*PROPERTYCOUNT ); - ::rtl::OUString* pPropNames = lPropNames.getArray() ; + css::uno::Sequence< OUString > lPropNames ( nCount*PROPERTYCOUNT ); + OUString* pPropNames = lPropNames.getArray() ; sal_Int32 nPropStart = 0 ; for( sal_Int32 nName=0; nName SvtModuleOptions_Impl::impl_ExpandSetNames @onerror We return false. @threadsafe no *//*-*************************************************************************************************************/ -sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName( const ::rtl::OUString& sName, SvtModuleOptions::EFactory& eFactory ) +sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtModuleOptions::EFactory& eFactory ) { sal_Bool bState; @@ -882,11 +882,11 @@ sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName( const ::rtl::OUString& sN @onerror We do nothing. @threadsafe no *//*-*************************************************************************************************************/ -void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< ::rtl::OUString >& lFactories ) +void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFactories ) { // Expand every set node name in lFactories to full qualified paths to his properties // and get right values from configuration. - const css::uno::Sequence< ::rtl::OUString > lProperties = impl_ExpandSetNames( lFactories ); + const css::uno::Sequence< OUString > lProperties = impl_ExpandSetNames( lFactories ); const css::uno::Sequence< css::uno::Any > lValues = GetProperties( lProperties ); // Safe impossible cases. @@ -912,10 +912,10 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< ::rtl::OUString for( sal_Int32 nSetNode=0; nSetNode lFactories = GetNodeNames(::rtl::OUString()); + css::uno::Sequence< OUString > lFactories = GetNodeNames(OUString()); sal_Int32 c = lFactories.getLength(); sal_Int32 i = 0; for (i=0; i lReadonlyStates = GetReadOnlyStates(lFactories); for (i=0; iGetFactoryName( eFactory ); } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions::GetFactoryStandardTemplate( EFactory eFactory ) const +OUString SvtModuleOptions::GetFactoryStandardTemplate( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryStandardTemplate( eFactory ); } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions::GetFactoryEmptyDocumentURL( EFactory eFactory ) const +OUString SvtModuleOptions::GetFactoryEmptyDocumentURL( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryEmptyDocumentURL( eFactory ); } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions::GetFactoryDefaultFilter( EFactory eFactory ) const +OUString SvtModuleOptions::GetFactoryDefaultFilter( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryDefaultFilter( eFactory ); @@ -1083,7 +1083,7 @@ sal_Int32 SvtModuleOptions::GetFactoryIcon( EFactory eFactory ) const } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::ClassifyFactoryByName( const ::rtl::OUString& sName , +sal_Bool SvtModuleOptions::ClassifyFactoryByName( const OUString& sName , EFactory& eFactory ) { // We don't need any mutex here ... because we don't use any member here! @@ -1092,7 +1092,7 @@ sal_Bool SvtModuleOptions::ClassifyFactoryByName( const ::rtl::OUString& sName //***************************************************************************************************************** void SvtModuleOptions::SetFactoryStandardTemplate( EFactory eFactory , - const ::rtl::OUString& sTemplate ) + const OUString& sTemplate ) { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); m_pDataContainer->SetFactoryStandardTemplate( eFactory, sTemplate ); @@ -1100,7 +1100,7 @@ void SvtModuleOptions::SetFactoryStandardTemplate( EFactory eFacto //***************************************************************************************************************** void SvtModuleOptions::SetFactoryDefaultFilter( EFactory eFactory, - const ::rtl::OUString& sFilter ) + const OUString& sFilter ) { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); m_pDataContainer->SetFactoryDefaultFilter( eFactory, sFilter ); @@ -1183,29 +1183,29 @@ namespace return theModuleOptionsMutex::get(); } -::rtl::OUString SvtModuleOptions::GetModuleName( EModule eModule ) const +OUString SvtModuleOptions::GetModuleName( EModule eModule ) const { switch( eModule ) { - case SvtModuleOptions::E_SWRITER : { return ::rtl::OUString("Writer"); } - case SvtModuleOptions::E_SWEB : { return ::rtl::OUString("Web"); } - case SvtModuleOptions::E_SGLOBAL : { return ::rtl::OUString("Global"); } - case SvtModuleOptions::E_SCALC : { return ::rtl::OUString("Calc"); } - case SvtModuleOptions::E_SDRAW : { return ::rtl::OUString("Draw"); } - case SvtModuleOptions::E_SIMPRESS : { return ::rtl::OUString("Impress"); } - case SvtModuleOptions::E_SMATH : { return ::rtl::OUString("Math"); } - case SvtModuleOptions::E_SCHART : { return ::rtl::OUString("Chart"); } - case SvtModuleOptions::E_SBASIC : { return ::rtl::OUString("Basic"); } - case SvtModuleOptions::E_SDATABASE : { return ::rtl::OUString("Database"); } + case SvtModuleOptions::E_SWRITER : { return OUString("Writer"); } + case SvtModuleOptions::E_SWEB : { return OUString("Web"); } + case SvtModuleOptions::E_SGLOBAL : { return OUString("Global"); } + case SvtModuleOptions::E_SCALC : { return OUString("Calc"); } + case SvtModuleOptions::E_SDRAW : { return OUString("Draw"); } + case SvtModuleOptions::E_SIMPRESS : { return OUString("Impress"); } + case SvtModuleOptions::E_SMATH : { return OUString("Math"); } + case SvtModuleOptions::E_SCHART : { return OUString("Chart"); } + case SvtModuleOptions::E_SBASIC : { return OUString("Basic"); } + case SvtModuleOptions::E_SDATABASE : { return OUString("Database"); } default: OSL_FAIL( "unknown module" ); break; } - return ::rtl::OUString(); + return OUString(); } -SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const ::rtl::OUString& sName) +SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const OUString& sName) { if ( sName == "swriter" ) return E_WRITER; @@ -1231,7 +1231,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const :: return E_UNKNOWN_FACTORY; } -SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const ::rtl::OUString& sName) +SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const OUString& sName) { if (sName.equals(FACTORYNAME_WRITERGLOBAL)) return E_WRITERGLOBAL; @@ -1255,7 +1255,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const return E_UNKNOWN_FACTORY; } -SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::OUString& sURL , +SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor) { css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -1277,13 +1277,13 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O ::comphelper::SequenceAsHashMap stlDesc(lMediaDescriptor); // is there already a filter inside the descriptor? - ::rtl::OUString sFilterName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString("FilterName"), ::rtl::OUString()); + OUString sFilterName = stlDesc.getUnpackedValueOrDefault(OUString("FilterName"), OUString()); if (!sFilterName.isEmpty()) { try { ::comphelper::SequenceAsHashMap stlFilterProps (xFilterCfg->getByName(sFilterName)); - ::rtl::OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString("DocumentService"), ::rtl::OUString()); + OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(OUString("DocumentService"), OUString()); SvtModuleOptions::EFactory eApp = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService); if (eApp != E_UNKNOWN_FACTORY) @@ -1296,7 +1296,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O } // is there already a type inside the descriptor? - ::rtl::OUString sTypeName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString("TypeName"), ::rtl::OUString()); + OUString sTypeName = stlDesc.getUnpackedValueOrDefault(OUString("TypeName"), OUString()); if (sTypeName.isEmpty()) { // no :-( @@ -1313,9 +1313,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O try { ::comphelper::SequenceAsHashMap stlTypeProps (xTypeCfg->getByName(sTypeName)); - ::rtl::OUString sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(::rtl::OUString("PreferredFilter"), ::rtl::OUString()); + OUString sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(OUString("PreferredFilter"), OUString()); ::comphelper::SequenceAsHashMap stlFilterProps (xFilterCfg->getByName(sPreferredFilter)); - ::rtl::OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString("DocumentService"), ::rtl::OUString()); + OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(OUString("DocumentService"), OUString()); SvtModuleOptions::EFactory eApp = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService); if (eApp != E_UNKNOWN_FACTORY) @@ -1336,8 +1336,8 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByModel(const css::u if (!xInfo.is()) return E_UNKNOWN_FACTORY; - const css::uno::Sequence< ::rtl::OUString > lServices = xInfo->getSupportedServiceNames(); - const ::rtl::OUString* pServices = lServices.getConstArray(); + const css::uno::Sequence< OUString > lServices = xInfo->getSupportedServiceNames(); + const OUString* pServices = lServices.getConstArray(); for (sal_Int32 i=0; i SvtModuleOptions::GetAllServiceNames() +::com::sun::star::uno::Sequence < OUString > SvtModuleOptions::GetAllServiceNames() { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetAllServiceNames(); } -::rtl::OUString SvtModuleOptions::GetDefaultModuleName() +OUString SvtModuleOptions::GetDefaultModuleName() { - ::rtl::OUString aModule; + OUString aModule; if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SWRITER)) aModule = m_pDataContainer->GetFactoryShortName(SvtModuleOptions::E_WRITER); else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SCALC)) diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index ed16db9ac9bc..f204d203fc97 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.cxx @@ -33,7 +33,6 @@ using namespace utl; using namespace com::sun::star::beans ; using namespace com::sun::star::uno; -using ::rtl::OUString; #define CFG_FILENAME OUString( "Office.OptionsDialog" ) #define ROOT_NODE OUString( "OptionsDialogGroups" ) @@ -49,7 +48,7 @@ class SvtOptionsDlgOptions_Impl : public utl::ConfigItem private: struct OUStringHashCode { - size_t operator()( const ::rtl::OUString& sString ) const + size_t operator()( const OUString& sString ) const { return sString.hashCode(); } @@ -67,7 +66,7 @@ private: public: SvtOptionsDlgOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); static ::osl::Mutex & getInitMutex(); @@ -119,7 +118,7 @@ void SvtOptionsDlgOptions_Impl::Commit() // ----------------------------------------------------------------------- -void SvtOptionsDlgOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtOptionsDlgOptions_Impl::Notify( const Sequence< OUString >& ) { // nothing to notify } @@ -257,18 +256,18 @@ SvtOptionsDialogOptions::~SvtOptionsDialogOptions() } } -sal_Bool SvtOptionsDialogOptions::IsGroupHidden( const rtl::OUString& _rGroup ) const +sal_Bool SvtOptionsDialogOptions::IsGroupHidden( const OUString& _rGroup ) const { return m_pImp->IsGroupHidden( _rGroup ); } -sal_Bool SvtOptionsDialogOptions::IsPageHidden( const rtl::OUString& _rPage, const rtl::OUString& _rGroup ) const +sal_Bool SvtOptionsDialogOptions::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const { return m_pImp->IsPageHidden( _rPage, _rGroup ); } sal_Bool SvtOptionsDialogOptions::IsOptionHidden( - const rtl::OUString& _rOption, const rtl::OUString& _rPage, const rtl::OUString& _rGroup ) const + const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const { return m_pImp->IsOptionHidden( _rOption, _rPage, _rGroup ); } diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 314c22f39f88..4ca3fa3045ab 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -53,9 +53,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::util; using namespace com::sun::star::lang; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; #define SEARCHPATH_DELIMITER ';' #define SIGN_STARTVARIABLE OUString( "$(" ) @@ -71,7 +68,7 @@ using ::rtl::OStringToOUString; struct OUStringHashCode { - size_t operator()( const ::rtl::OUString& sString ) const + size_t operator()( const OUString& sString ) const { return sString.hashCode(); } @@ -83,7 +80,7 @@ enum VarNameProperty VAR_NEEDS_FILEURL }; -class NameToHandleMap : public ::boost::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > +class NameToHandleMap : public ::boost::unordered_map< OUString, sal_Int32, OUStringHashCode, ::std::equal_to< OUString > > { public: inline void free() { NameToHandleMap().swap( *this ); } @@ -173,9 +170,9 @@ class SvtPathOptions_Impl void SetUserConfigPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_USERCONFIG, rPath ); } void SetWorkPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_WORK, rPath ); } - rtl::OUString SubstVar( const rtl::OUString& rVar ) const; - rtl::OUString ExpandMacros( const rtl::OUString& rPath ) const; - rtl::OUString UsePathVariables( const rtl::OUString& rPath ) const; + OUString SubstVar( const OUString& rVar ) const; + OUString ExpandMacros( const OUString& rPath ) const; + OUString UsePathVariables( const OUString& rPath ) const; ::com::sun::star::lang::Locale GetLocale() const { return m_aLocale; } }; @@ -318,9 +315,9 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const String& rN //------------------------------------------------------------------------- -OUString SvtPathOptions_Impl::ExpandMacros( const rtl::OUString& rPath ) const +OUString SvtPathOptions_Impl::ExpandMacros( const OUString& rPath ) const { - ::rtl::OUString sExpanded( rPath ); + OUString sExpanded( rPath ); const INetURLObject aParser( rPath ); if ( aParser.GetProtocol() == INET_PROT_VND_SUN_STAR_EXPAND ) @@ -403,7 +400,7 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) const if ( bConvertLocal ) { // Convert the URL to a system path for special path variables - rtl::OUString aReturn; + OUString aReturn; utl::LocalFileHelper::ConvertURLToPhysicalName( aWorkText, aReturn ); return aReturn; } @@ -427,7 +424,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : // #112719#: check for existance OSL_FAIL( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" ); throw RuntimeException( - ::rtl::OUString( "Service com.sun.star.util.PathSettings cannot be created" ), + OUString( "Service com.sun.star.util.PathSettings cannot be created" ), Reference< XInterface >() ); } @@ -452,7 +449,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : for ( i = 0; i < nCount; i++ ) { NameToHandleMap::const_iterator pIter = - aTempHashMap.find( rtl::OUString::createFromAscii( aPropNames[i].pPropName )); + aTempHashMap.find( OUString::createFromAscii( aPropNames[i].pPropName )); if ( pIter != aTempHashMap.end() ) { @@ -865,7 +862,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath ) return sal_False; } - rtl::OUString aIniFile = pImp->SubstVar( rIniFile ); + OUString aIniFile = pImp->SubstVar( rIniFile ); sal_Bool bRet = sal_False; switch ( ePath ) @@ -879,7 +876,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath ) sal_Int32 nIniIndex = 0; do { - rtl::OUString aToken = aIniFile.getToken( 0, '/', nIniIndex ); + OUString aToken = aIniFile.getToken( 0, '/', nIniIndex ); aObj.insertName(aToken); } while ( nIniIndex >= 0 ); @@ -899,7 +896,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath ) default: { - rtl::OUString aPath; + OUString aPath; switch ( ePath ) { case PATH_ADDIN: aPath = GetAddinPath(); break; @@ -933,26 +930,26 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath ) do { sal_Bool bIsURL = sal_True; - rtl::OUString aPathToken = aPath.getToken( 0, SEARCHPATH_DELIMITER, nPathIndex ); + OUString aPathToken = aPath.getToken( 0, SEARCHPATH_DELIMITER, nPathIndex ); INetURLObject aObj( aPathToken ); if ( aObj.HasError() ) { bIsURL = sal_False; - rtl::OUString aURL; + OUString aURL; if ( LocalFileHelper::ConvertPhysicalNameToURL( aPathToken, aURL ) ) aObj.SetURL( aURL ); } if ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_EXPAND ) { Reference< XMacroExpander > xMacroExpander = theMacroExpander::get( ::comphelper::getProcessComponentContext() ); - const ::rtl::OUString sExpandedPath = xMacroExpander->expandMacros( aObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ) ); + const OUString sExpandedPath = xMacroExpander->expandMacros( aObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ) ); aObj.SetURL( sExpandedPath ); } sal_Int32 nIniIndex = 0; do { - rtl::OUString aToken = aIniFile.getToken( 0, '/', nIniIndex ); + OUString aToken = aIniFile.getToken( 0, '/', nIniIndex ); aObj.insertName(aToken); } while ( nIniIndex >= 0 ); @@ -963,7 +960,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath ) { if ( !bIsURL ) { - rtl::OUString sTmp(rIniFile); + OUString sTmp(rIniFile); ::utl::LocalFileHelper::ConvertURLToPhysicalName( aObj.GetMainURL( INetURLObject::NO_DECODE ), sTmp ); rIniFile = sTmp; diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index 8aebaca8bb27..04ac6e3d6f18 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -68,7 +68,7 @@ public: //--------------------------------------------------------------------------------------------------------- virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); //--------------------------------------------------------------------------------------------------------- // public interface @@ -216,7 +216,7 @@ void SvtPrintWarningOptions_Impl::Commit() PutProperties( aSeqNames, aSeqValues ); } -void SvtPrintWarningOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtPrintWarningOptions_Impl::Notify( const Sequence< OUString >& ) { } diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 513f2a334b11..9a25220f9a41 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -34,7 +34,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; class SvtSaveOptions_Impl; class SvtLoadOptions_Impl; @@ -95,7 +94,7 @@ public: SvtSaveOptions_Impl(); ~SvtSaveOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); sal_Int32 GetAutoSaveTime() const { return nAutoSaveTime; } @@ -570,23 +569,23 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() { css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - ::rtl::OUString("org.openoffice.Office.Recovery"), + OUString("org.openoffice.Office.Recovery"), ::comphelper::ConfigurationHelper::E_READONLY); ::comphelper::ConfigurationHelper::readRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("Enabled")) >>= bAutoSave; + OUString("AutoSave"), + OUString("Enabled")) >>= bAutoSave; ::comphelper::ConfigurationHelper::readRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("TimeIntervall")) >>= nAutoSaveTime; + OUString("AutoSave"), + OUString("TimeIntervall")) >>= nAutoSaveTime; ::comphelper::ConfigurationHelper::readRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("UserAutoSaveEnabled")) >>= bUserAutoSave; + OUString("AutoSave"), + OUString("UserAutoSaveEnabled")) >>= bUserAutoSave; } catch(const css::uno::Exception&) { OSL_FAIL("Could not find needed information for AutoSave feature."); } @@ -762,25 +761,25 @@ void SvtSaveOptions_Impl::Commit() css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - ::rtl::OUString("org.openoffice.Office.Recovery"), + OUString("org.openoffice.Office.Recovery"), ::comphelper::ConfigurationHelper::E_STANDARD); ::comphelper::ConfigurationHelper::writeRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("TimeIntervall"), + OUString("AutoSave"), + OUString("TimeIntervall"), css::uno::makeAny(nAutoSaveTime)); ::comphelper::ConfigurationHelper::writeRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("Enabled"), + OUString("AutoSave"), + OUString("Enabled"), css::uno::makeAny(bAutoSave)); ::comphelper::ConfigurationHelper::writeRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("UserAutoSaveEnabled"), + OUString("AutoSave"), + OUString("UserAutoSaveEnabled"), css::uno::makeAny(bUserAutoSave)); ::comphelper::ConfigurationHelper::flush(xCFG); @@ -788,7 +787,7 @@ void SvtSaveOptions_Impl::Commit() // ----------------------------------------------------------------------- -void SvtSaveOptions_Impl::Notify( const Sequence& ) +void SvtSaveOptions_Impl::Notify( const Sequence& ) { } @@ -802,7 +801,7 @@ public: SvtLoadOptions_Impl(); ~SvtLoadOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); void SetLoadUserSettings(sal_Bool b){bLoadUserDefinedSettings = b; SetModified();} @@ -838,7 +837,7 @@ void SvtLoadOptions_Impl::Commit() PutProperties( aNames, aValues ); } // ----------------------------------------------------------------------- -void SvtLoadOptions_Impl::Notify( const Sequence& ) +void SvtLoadOptions_Impl::Notify( const Sequence& ) { SAL_WARN( "unotools.config", "properties have been changed" ); } diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 9044db4ba05f..fa44fbfdcdfa 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -33,7 +33,6 @@ using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star::i18n; -using ::rtl::OUString; #define MAX_FLAGS_OFFSET 25 @@ -64,7 +63,7 @@ public: // ConfigItem virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); sal_Bool GetFlag( sal_uInt16 nOffset ) const; void SetFlag( sal_uInt16 nOffset, sal_Bool bVal ); @@ -94,7 +93,7 @@ void SvtSearchOptions_Impl::Commit() Save(); } -void SvtSearchOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtSearchOptions_Impl::Notify( const Sequence< OUString >& ) { } diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 94585fb23e5a..7766cde20f54 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -711,7 +711,7 @@ void SvtSecurityOptions_Impl::Commit() Sequence< Sequence< com::sun::star::beans::PropertyValue > > lPropertyValuesSeq( nCnt ); for( sal_Int32 i = 0 ; i < nCnt ; ++i ) { - rtl::OUString aPrefix = rtl::OUStringBuffer(s).append(i).append('/').makeStringAndClear(); + OUString aPrefix = OUStringBuffer(s).append(i).append('/').makeStringAndClear(); Sequence< com::sun::star::beans::PropertyValue > lPropertyValues( 3 ); lPropertyValues[ 0 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME; lPropertyValues[ 0 ].Value <<= m_seqTrustedAuthors[ i ][0]; diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index a77612016705..372387f2b1e9 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -39,7 +39,6 @@ using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; SvtSysLocaleOptions_Impl* SvtSysLocaleOptions::pOptions = NULL; sal_Int32 SvtSysLocaleOptions::nRefCount = 0; @@ -75,7 +74,7 @@ public: SvtSysLocaleOptions_Impl(); virtual ~SvtSysLocaleOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); const OUString& GetLocaleString() const @@ -470,7 +469,7 @@ void SvtSysLocaleOptions_Impl::SetIgnoreLanguageChange( sal_Bool bSet) } } -void SvtSysLocaleOptions_Impl::Notify( const Sequence< rtl::OUString >& seqPropertyNames ) +void SvtSysLocaleOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { sal_uLong nHint = 0; Sequence< Any > seqValues = GetProperties( seqPropertyNames ); @@ -669,7 +668,7 @@ sal_Bool SvtSysLocaleOptions::IsReadOnly( EOption eOption ) const // static void SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( String& rAbbrev, - LanguageType& eLang, const ::rtl::OUString& rConfigString ) + LanguageType& eLang, const OUString& rConfigString ) { sal_Int32 nDelim = rConfigString.indexOf( '-' ); if ( nDelim >= 0 ) @@ -687,13 +686,13 @@ void SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( String& rAbbrev, // static -::rtl::OUString SvtSysLocaleOptions::CreateCurrencyConfigString( +OUString SvtSysLocaleOptions::CreateCurrencyConfigString( const String& rAbbrev, LanguageType eLang ) { String aIsoStr( LanguageTag( eLang ).getBcp47() ); if ( aIsoStr.Len() ) { - ::rtl::OUStringBuffer aStr( rAbbrev.Len() + 1 + aIsoStr.Len() ); + OUStringBuffer aStr( rAbbrev.Len() + 1 + aIsoStr.Len() ); aStr.append( rAbbrev ); aStr.append( sal_Unicode('-') ); aStr.append( aIsoStr ); diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index 54365f8e9081..ac0e6067de5f 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -43,7 +43,6 @@ using namespace utl; using namespace com::sun::star; -using rtl::OUString; namespace { diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 9d77f4ec061c..1c88c9911b0b 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -44,7 +44,7 @@ #define PROPERTY_VISIBLE "Visible" #define PROPERTY_USERDATA "UserData" -#define DEFAULT_WINDOWSTATE ::rtl::OUString() +#define DEFAULT_WINDOWSTATE OUString() #define DEFAULT_USERDATA css::uno::Sequence< css::beans::NamedValue >() #define DEFAULT_PAGEID 0 #define DEFAULT_VISIBLE sal_False @@ -55,14 +55,14 @@ #define _LOG_COUNTER_( _SVIEW_, _NREAD_, _NWRITE_ ) \ { \ FILE* pFile = fopen( "viewdbg.txt", "a" ); \ - fprintf( pFile, "%s[%d, %d]\n", ::rtl::OUStringToOString(_SVIEW_, RTL_TEXTENCODING_UTF8).getStr(), _NREAD_, _NWRITE_ ); \ + fprintf( pFile, "%s[%d, %d]\n", OUStringToOString(_SVIEW_, RTL_TEXTENCODING_UTF8).getStr(), _NREAD_, _NWRITE_ ); \ fclose( pFile ); \ } #endif // DEBUG_VIEWOPTIONS #define SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION_PARAM_EXCEPTION) \ { \ - ::rtl::OUStringBuffer sMsg(256); \ + OUStringBuffer sMsg(256); \ sMsg.appendAscii("Unexpected exception catched. Original message was:\n\"" ); \ sMsg.append (SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION_PARAM_EXCEPTION.Message); \ sMsg.appendAscii("\"" ); \ @@ -116,7 +116,7 @@ class IMPL_TViewData //--------------------------------------------------------------------------------------------------------- // write access - with reseting of default state - void setWindowState( const ::rtl::OUString& sValue ) + void setWindowState( const OUString& sValue ) { m_bDefault = ( ( m_bDefault == sal_True ) && @@ -157,14 +157,14 @@ class IMPL_TViewData //--------------------------------------------------------------------------------------------------------- // read access - ::rtl::OUString getWindowState() { return m_sWindowState; } + OUString getWindowState() { return m_sWindowState; } css::uno::Sequence< css::beans::NamedValue > getUserData () { return m_lUserData ; } sal_Int32 getPageID () { return m_nPageID ; } sal_Bool getVisible () { return m_bVisible ; } //--------------------------------------------------------------------------------------------------------- // special operation for easy access on user data - void setUserItem( const ::rtl::OUString& sName , + void setUserItem( const OUString& sName , const css::uno::Any& aValue ) { // we change UserData in every case! @@ -196,7 +196,7 @@ class IMPL_TViewData } //--------------------------------------------------------------------------------------------------------- - css::uno::Any getUserItem( const ::rtl::OUString& sName ) + css::uno::Any getUserItem( const OUString& sName ) { // default value - if item not exist! css::uno::Any aValue; @@ -218,7 +218,7 @@ class IMPL_TViewData sal_Bool isDefault() { return m_bDefault; } private: - ::rtl::OUString m_sWindowState ; + OUString m_sWindowState ; css::uno::Sequence< css::beans::NamedValue > m_lUserData ; sal_Int32 m_nPageID ; sal_Bool m_bVisible ; @@ -228,16 +228,16 @@ class IMPL_TViewData struct IMPL_TStringHashCode { - size_t operator()(const ::rtl::OUString& sString) const + size_t operator()(const OUString& sString) const { return sString.hashCode(); } }; -typedef ::boost::unordered_map< ::rtl::OUString , +typedef ::boost::unordered_map< OUString , IMPL_TViewData , IMPL_TStringHashCode , - ::std::equal_to< ::rtl::OUString > > IMPL_TViewHash; + ::std::equal_to< OUString > > IMPL_TViewHash; /*-************************************************************************************************************//** @descr Implement base data container for view options elements. @@ -256,36 +256,36 @@ class SvtViewOptionsBase_Impl public: enum State { STATE_NONE, STATE_FALSE, STATE_TRUE }; - SvtViewOptionsBase_Impl ( const ::rtl::OUString& sList ); + SvtViewOptionsBase_Impl ( const OUString& sList ); virtual ~SvtViewOptionsBase_Impl ( ); - sal_Bool Exists ( const ::rtl::OUString& sName ); - sal_Bool Delete ( const ::rtl::OUString& sName ); - ::rtl::OUString GetWindowState ( const ::rtl::OUString& sName ); - void SetWindowState ( const ::rtl::OUString& sName , - const ::rtl::OUString& sState ); - css::uno::Sequence< css::beans::NamedValue > GetUserData ( const ::rtl::OUString& sName ); - void SetUserData ( const ::rtl::OUString& sName , + sal_Bool Exists ( const OUString& sName ); + sal_Bool Delete ( const OUString& sName ); + OUString GetWindowState ( const OUString& sName ); + void SetWindowState ( const OUString& sName , + const OUString& sState ); + css::uno::Sequence< css::beans::NamedValue > GetUserData ( const OUString& sName ); + void SetUserData ( const OUString& sName , const css::uno::Sequence< css::beans::NamedValue >& lData ); - sal_Int32 GetPageID ( const ::rtl::OUString& sName ); - void SetPageID ( const ::rtl::OUString& sName , + sal_Int32 GetPageID ( const OUString& sName ); + void SetPageID ( const OUString& sName , sal_Int32 nID ); - State GetVisible ( const ::rtl::OUString& sName ); - void SetVisible ( const ::rtl::OUString& sName , + State GetVisible ( const OUString& sName ); + void SetVisible ( const OUString& sName , sal_Bool bVisible ); - css::uno::Any GetUserItem ( const ::rtl::OUString& sName , - const ::rtl::OUString& sItem ); - void SetUserItem ( const ::rtl::OUString& sName , - const ::rtl::OUString& sItem , + css::uno::Any GetUserItem ( const OUString& sName , + const OUString& sItem ); + void SetUserItem ( const OUString& sName , + const OUString& sItem , const css::uno::Any& aValue ); //------------------------------------------------------------------------------------------------------------- private: - css::uno::Reference< css::uno::XInterface > impl_getSetNode( const ::rtl::OUString& sNode , + css::uno::Reference< css::uno::XInterface > impl_getSetNode( const OUString& sNode , sal_Bool bCreateIfMissing); //------------------------------------------------------------------------------------------------------------- private: - ::rtl::OUString m_sListName; + OUString m_sListName; css::uno::Reference< css::container::XNameAccess > m_xRoot; css::uno::Reference< css::container::XNameAccess > m_xSet; @@ -312,7 +312,7 @@ class SvtViewOptionsBase_Impl @param - @return - *//*-*************************************************************************************************************/ -SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const ::rtl::OUString& sList ) +SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const OUString& sList ) : m_sListName ( sList ) // we must know, which view type we must support #ifdef DEBUG_VIEWOPTIONS , m_nReadCount ( 0 ) @@ -378,7 +378,7 @@ SvtViewOptionsBase_Impl::~SvtViewOptionsBase_Impl() @return true , if item exist false, otherwise *//*-*************************************************************************************************************/ -sal_Bool SvtViewOptionsBase_Impl::Exists( const ::rtl::OUString& sName ) +sal_Bool SvtViewOptionsBase_Impl::Exists( const OUString& sName ) { sal_Bool bExists = sal_False; @@ -406,7 +406,7 @@ sal_Bool SvtViewOptionsBase_Impl::Exists( const ::rtl::OUString& sName ) @return true , if item not exist(!) or could be deleted (should be the same!) false, otherwise *//*-*************************************************************************************************************/ -sal_Bool SvtViewOptionsBase_Impl::Delete( const ::rtl::OUString& sName ) +sal_Bool SvtViewOptionsBase_Impl::Delete( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nWriteCount; @@ -440,13 +440,13 @@ sal_Bool SvtViewOptionsBase_Impl::Delete( const ::rtl::OUString& sName ) @param - @return - *//*-*************************************************************************************************************/ -::rtl::OUString SvtViewOptionsBase_Impl::GetWindowState( const ::rtl::OUString& sName ) +OUString SvtViewOptionsBase_Impl::GetWindowState( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; #endif - ::rtl::OUString sWindowState; + OUString sWindowState; try { css::uno::Reference< css::beans::XPropertySet > xNode( @@ -457,7 +457,7 @@ sal_Bool SvtViewOptionsBase_Impl::Delete( const ::rtl::OUString& sName ) } catch(const css::uno::Exception& ex) { - sWindowState = ::rtl::OUString(); + sWindowState = OUString(); SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(ex) } @@ -465,8 +465,8 @@ sal_Bool SvtViewOptionsBase_Impl::Delete( const ::rtl::OUString& sName ) } //***************************************************************************************************************** -void SvtViewOptionsBase_Impl::SetWindowState( const ::rtl::OUString& sName , - const ::rtl::OUString& sState ) +void SvtViewOptionsBase_Impl::SetWindowState( const OUString& sName , + const OUString& sState ) { #ifdef DEBUG_VIEWOPTIONS ++m_nWriteCount; @@ -487,7 +487,7 @@ void SvtViewOptionsBase_Impl::SetWindowState( const ::rtl::OUString& sName , } //***************************************************************************************************************** -css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserData( const ::rtl::OUString& sName ) +css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserData( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; @@ -503,8 +503,8 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserDat xNode->getByName(PROPERTY_USERDATA) >>= xUserData; if (xUserData.is()) { - const css::uno::Sequence< ::rtl::OUString > lNames = xUserData->getElementNames(); - const ::rtl::OUString* pNames = lNames.getConstArray(); + const css::uno::Sequence< OUString > lNames = xUserData->getElementNames(); + const OUString* pNames = lNames.getConstArray(); sal_Int32 c = lNames.getLength(); sal_Int32 i = 0; css::uno::Sequence< css::beans::NamedValue > lUserData(c); @@ -527,7 +527,7 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserDat } //***************************************************************************************************************** -void SvtViewOptionsBase_Impl::SetUserData( const ::rtl::OUString& sName , +void SvtViewOptionsBase_Impl::SetUserData( const OUString& sName , const css::uno::Sequence< css::beans::NamedValue >& lData ) { #ifdef DEBUG_VIEWOPTIONS @@ -563,8 +563,8 @@ void SvtViewOptionsBase_Impl::SetUserData( const ::rtl::OUString& } //***************************************************************************************************************** -css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const ::rtl::OUString& sName , - const ::rtl::OUString& sItem ) +css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const OUString& sName , + const OUString& sItem ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; @@ -594,8 +594,8 @@ css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const ::rtl::OUString& sName } //***************************************************************************************************************** -void SvtViewOptionsBase_Impl::SetUserItem( const ::rtl::OUString& sName , - const ::rtl::OUString& sItem , +void SvtViewOptionsBase_Impl::SetUserItem( const OUString& sName , + const OUString& sItem , const css::uno::Any& aValue ) { #ifdef DEBUG_VIEWOPTIONS @@ -625,7 +625,7 @@ void SvtViewOptionsBase_Impl::SetUserItem( const ::rtl::OUString& sName , } //***************************************************************************************************************** -sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const ::rtl::OUString& sName ) +sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; @@ -650,7 +650,7 @@ sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const ::rtl::OUString& sName ) } //***************************************************************************************************************** -void SvtViewOptionsBase_Impl::SetPageID( const ::rtl::OUString& sName , +void SvtViewOptionsBase_Impl::SetPageID( const OUString& sName , sal_Int32 nID ) { #ifdef DEBUG_VIEWOPTIONS @@ -672,7 +672,7 @@ void SvtViewOptionsBase_Impl::SetPageID( const ::rtl::OUString& sName , } //***************************************************************************************************************** -SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const ::rtl::OUString& sName ) +SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; @@ -702,7 +702,7 @@ SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const ::rtl: } //***************************************************************************************************************** -void SvtViewOptionsBase_Impl::SetVisible( const ::rtl::OUString& sName , +void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName , sal_Bool bVisible ) { #ifdef DEBUG_VIEWOPTIONS @@ -733,7 +733,7 @@ void SvtViewOptionsBase_Impl::SetVisible( const ::rtl::OUString& sName , @param "sNode", name of new entry @return - *//*-*************************************************************************************************************/ -css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSetNode( const ::rtl::OUString& sNode , +css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSetNode( const OUString& sNode , sal_Bool bCreateIfMissing) { css::uno::Reference< css::uno::XInterface > xNode; @@ -763,7 +763,7 @@ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSet // constructor //***************************************************************************************************************** SvtViewOptions::SvtViewOptions( EViewType eType , - const ::rtl::OUString& sViewName ) + const OUString& sViewName ) : m_eViewType ( eType ) , m_sViewName ( sViewName ) { @@ -945,12 +945,12 @@ sal_Bool SvtViewOptions::Delete() //***************************************************************************************************************** // public method //***************************************************************************************************************** -::rtl::OUString SvtViewOptions::GetWindowState() const +OUString SvtViewOptions::GetWindowState() const { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); - ::rtl::OUString sState; + OUString sState; switch( m_eViewType ) { case E_DIALOG : { @@ -976,7 +976,7 @@ sal_Bool SvtViewOptions::Delete() //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtViewOptions::SetWindowState( const ::rtl::OUString& sState ) +void SvtViewOptions::SetWindowState( const OUString& sState ) { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); @@ -1147,7 +1147,7 @@ void SvtViewOptions::SetUserData( const css::uno::Sequence< css::beans::NamedVal } //***************************************************************************************************************** -css::uno::Any SvtViewOptions::GetUserItem( const ::rtl::OUString& sName ) const +css::uno::Any SvtViewOptions::GetUserItem( const OUString& sName ) const { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); @@ -1176,7 +1176,7 @@ css::uno::Any SvtViewOptions::GetUserItem( const ::rtl::OUString& sName ) const } //***************************************************************************************************************** -void SvtViewOptions::SetUserItem( const ::rtl::OUString& sName , +void SvtViewOptions::SetUserItem( const OUString& sName , const css::uno::Any& aValue ) { // Ready for multithreading diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index 9280fade65b0..4c5fd9422098 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -27,7 +27,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::xml::sax; -using ::rtl::OUString; #define ELEMENT_ACCELERATORLIST "acceleratorlist" #define ELEMENT_ACCELERATORITEM "item" @@ -52,14 +51,14 @@ public: public: virtual sal_Int16 SAL_CALL getLength(void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw (::com::sun::star::uno::RuntimeException); public: - void addAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sType , const ::rtl::OUString &sValue ); + void addAttribute( const OUString &sName , const OUString &sType , const OUString &sValue ); private: struct AttributeListImpl_impl *m_pImpl; @@ -206,7 +205,7 @@ throw( SAXException, RuntimeException ) m_xLocator = xLocator; } -::rtl::OUString OReadAccelatorDocumentHandler::getErrorLineString() +OUString OReadAccelatorDocumentHandler::getErrorLineString() { char buffer[32]; @@ -295,7 +294,7 @@ throw( SAXException, RuntimeException ) } -void SAL_CALL OReadAccelatorDocumentHandler::characters(const rtl::OUString&) +void SAL_CALL OReadAccelatorDocumentHandler::characters(const OUString&) throw( SAXException, RuntimeException ) { } diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index f75b157d9c64..700a8d0d8500 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.cxx @@ -61,7 +61,7 @@ void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale& } -void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale ) +void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale ) { try { @@ -76,7 +76,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co } -::com::sun::star::uno::Sequence< ::rtl::OUString > CalendarWrapper::getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const +::com::sun::star::uno::Sequence< OUString > CalendarWrapper::getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const { try { @@ -88,11 +88,11 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e.Message ); } - return ::com::sun::star::uno::Sequence< ::rtl::OUString > (0); + return ::com::sun::star::uno::Sequence< OUString > (0); } -::rtl::OUString CalendarWrapper::getUniqueID() const +OUString CalendarWrapper::getUniqueID() const { try { @@ -103,7 +103,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co { SAL_WARN( "unotools.i18n", "getUniqueID: Exception caught " << e.Message ); } - return ::rtl::OUString(); + return OUString(); } diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx index bfa85dc81734..cd8d036ab601 100644 --- a/unotools/source/i18n/charclass.cxx +++ b/unotools/source/i18n/charclass.cxx @@ -270,7 +270,7 @@ sal_Bool CharClass::isLetterNumeric( const String& rStr ) const } } -rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount) const +OUString CharClass::titlecase(const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount) const { try { @@ -286,7 +286,7 @@ rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sa } } -::rtl::OUString CharClass::uppercase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const +OUString CharClass::uppercase( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const { try { @@ -302,7 +302,7 @@ rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sa } } -::rtl::OUString CharClass::lowercase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const +OUString CharClass::lowercase( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const { try { diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx index b64268ffe2cc..3a9cf3fd278f 100644 --- a/unotools/source/i18n/collatorwrapper.cxx +++ b/unotools/source/i18n/collatorwrapper.cxx @@ -33,7 +33,7 @@ CollatorWrapper::~CollatorWrapper() } sal_Int32 -CollatorWrapper::compareString (const ::rtl::OUString& s1, const ::rtl::OUString& s2) const +CollatorWrapper::compareString (const OUString& s1, const OUString& s2) const { try { @@ -48,7 +48,7 @@ CollatorWrapper::compareString (const ::rtl::OUString& s1, const ::rtl::OUString return 0; } -uno::Sequence< ::rtl::OUString > +uno::Sequence< OUString > CollatorWrapper::listCollatorAlgorithms (const lang::Locale& rLocale) const { try @@ -61,7 +61,7 @@ CollatorWrapper::listCollatorAlgorithms (const lang::Locale& rLocale) const SAL_WARN( "unotools.i18n","CollatorWrapper: listCollatorAlgorithms failed"); } - return uno::Sequence< ::rtl::OUString > (); + return uno::Sequence< OUString > (); } sal_Int32 @@ -81,7 +81,7 @@ CollatorWrapper::loadDefaultCollator (const lang::Locale& rLocale, sal_Int32 nOp } sal_Int32 -CollatorWrapper::loadCollatorAlgorithm (const ::rtl::OUString& rAlgorithm, +CollatorWrapper::loadCollatorAlgorithm (const OUString& rAlgorithm, const lang::Locale& rLocale, sal_Int32 nOptions) { try diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 293bd27e36cd..8f849d3e2892 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -120,20 +120,20 @@ const ::com::sun::star::lang::Locale& LocaleDataWrapper::getMyLocale() const void LocaleDataWrapper::invalidateData() { - aCurrSymbol = rtl::OUString(); - aCurrBankSymbol = rtl::OUString(); + aCurrSymbol = OUString(); + aCurrBankSymbol = OUString(); nDateFormat = nLongDateFormat = nDateFormatInvalid; nCurrPositiveFormat = nCurrNegativeFormat = nCurrDigits = nCurrFormatInvalid; if ( bLocaleDataItemValid ) { for (sal_Int32 j=0; j LocaleDataWrapper::getReservedWord() const +::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getReservedWord() const { try { @@ -226,7 +226,7 @@ void LocaleDataWrapper::invalidateData() { SAL_WARN( "unotools.i18n", "getReservedWord: Exception caught " << e.Message ); } - return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0); + return ::com::sun::star::uno::Sequence< OUString >(0); } @@ -302,7 +302,7 @@ void LocaleDataWrapper::invalidateData() { if (areChecksEnabled()) { - rtl::OUStringBuffer aMsg("LocaleDataWrapper::getInstalledLanguageTypes: Variants not supported, locale\n"); + OUStringBuffer aMsg("LocaleDataWrapper::getInstalledLanguageTypes: Variants not supported, locale\n"); aMsg.append(aDebugLocale); outputCheckMessage(aMsg.makeStringAndClear()); } @@ -314,7 +314,7 @@ void LocaleDataWrapper::invalidateData() // In checks, exclude known problems because no MS-LCID defined. if (areChecksEnabled() && eLang == LANGUAGE_DONTKNOW) { - rtl::OUStringBuffer aMsg("ConvertIsoNamesToLanguage: unknown MS-LCID for locale\n"); + OUStringBuffer aMsg("ConvertIsoNamesToLanguage: unknown MS-LCID for locale\n"); aMsg.append(aDebugLocale); outputCheckMessage(aMsg.makeStringAndClear()); } @@ -339,7 +339,7 @@ void LocaleDataWrapper::invalidateData() // && !aDebugLocale.EqualsAscii( "es-BR" ) // ?!? Brazil/es ) { - rtl::OUStringBuffer aMsg("ConvertIsoNamesToLanguage/ConvertLanguageToIsoNames: ambiguous locale (MS-LCID?)\n"); + OUStringBuffer aMsg("ConvertIsoNamesToLanguage/ConvertLanguageToIsoNames: ambiguous locale (MS-LCID?)\n"); aMsg.append(aDebugLocale); aMsg.appendAscii(" -> 0x"); aMsg.append(static_cast(eLang), 16); @@ -360,7 +360,7 @@ void LocaleDataWrapper::invalidateData() return rInstalledLanguageTypes; } -const rtl::OUString& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const +const OUString& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const { ::utl::ReadWriteGuard aGuard( aMutex ); if ( nItem >= LocaleItem::COUNT ) @@ -456,7 +456,7 @@ void LocaleDataWrapper::getOneReservedWordImpl( sal_Int16 nWord ) } -const rtl::OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const +const OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const { ::utl::ReadWriteGuard aGuard( aMutex ); if ( nWord < 0 || nWord >= reservedWords::COUNT ) @@ -473,7 +473,7 @@ const rtl::OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) co } -MeasurementSystem LocaleDataWrapper::mapMeasurementStringToEnum( const rtl::OUString& rMS ) const +MeasurementSystem LocaleDataWrapper::mapMeasurementStringToEnum( const OUString& rMS ) const { //! TODO: could be cached too if ( rMS.equalsIgnoreAsciiCase( "metric" ) ) @@ -533,7 +533,7 @@ const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > L // --- currencies ----------------------------------------------------- -const rtl::OUString& LocaleDataWrapper::getCurrSymbol() const +const OUString& LocaleDataWrapper::getCurrSymbol() const { ::utl::ReadWriteGuard aGuard( aMutex ); if (aCurrSymbol.isEmpty()) @@ -545,7 +545,7 @@ const rtl::OUString& LocaleDataWrapper::getCurrSymbol() const } -const rtl::OUString& LocaleDataWrapper::getCurrBankSymbol() const +const OUString& LocaleDataWrapper::getCurrBankSymbol() const { ::utl::ReadWriteGuard aGuard( aMutex ); if (aCurrBankSymbol.isEmpty()) @@ -608,15 +608,15 @@ void LocaleDataWrapper::getCurrSymbolsImpl() { if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::getCurrSymbolsImpl: no default currency" ); + OUString aMsg( "LocaleDataWrapper::getCurrSymbolsImpl: no default currency" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } nElem = 0; if ( nElem >= nCnt ) { if (areChecksEnabled()) - outputCheckMessage(rtl::OUString("LocaleDataWrapper::getCurrSymbolsImpl: no currency at all, using ShellsAndPebbles")); - aCurrSymbol = rtl::OUString("ShellsAndPebbles"); + outputCheckMessage(OUString("LocaleDataWrapper::getCurrSymbolsImpl: no currency at all, using ShellsAndPebbles")); + aCurrSymbol = OUString("ShellsAndPebbles"); aCurrBankSymbol = aCurrSymbol; nCurrPositiveFormat = nCurrNegativeFormat = nCurrFormatDefault; nCurrDigits = 2; @@ -629,7 +629,7 @@ void LocaleDataWrapper::getCurrSymbolsImpl() } -void LocaleDataWrapper::scanCurrFormatImpl( const rtl::OUString& rCode, +void LocaleDataWrapper::scanCurrFormatImpl( const OUString& rCode, sal_Int32 nStart, sal_Int32& nSign, sal_Int32& nPar, sal_Int32& nNum, sal_Int32& nBlank, sal_Int32& nSym ) { @@ -717,7 +717,7 @@ void LocaleDataWrapper::getCurrFormatsImpl() { // bad luck if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: no currency formats" ); + OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: no currency formats" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } nCurrPositiveFormat = nCurrNegativeFormat = nCurrFormatDefault; @@ -765,7 +765,7 @@ void LocaleDataWrapper::getCurrFormatsImpl() scanCurrFormatImpl( pFormatArr[nElem].Code, 0, nSign, nPar, nNum, nBlank, nSym ); if (areChecksEnabled() && (nNum == -1 || nSym == -1)) { - rtl::OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: CurrPositiveFormat?" ); + OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: CurrPositiveFormat?" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } if (nBlank == -1) @@ -788,12 +788,12 @@ void LocaleDataWrapper::getCurrFormatsImpl() nCurrNegativeFormat = nCurrFormatDefault; else { - const ::rtl::OUString& rCode = pFormatArr[nNeg].Code; + const OUString& rCode = pFormatArr[nNeg].Code; sal_Int32 nDelim = rCode.indexOf(';'); scanCurrFormatImpl( rCode, nDelim+1, nSign, nPar, nNum, nBlank, nSym ); if (areChecksEnabled() && (nNum == -1 || nSym == -1 || (nPar == -1 && nSign == -1))) { - rtl::OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: CurrNegativeFormat?" ); + OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: CurrNegativeFormat?" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } // NOTE: one of nPar or nSign are allowed to be -1 @@ -877,7 +877,7 @@ DateFormat LocaleDataWrapper::getLongDateFormat() const } -DateFormat LocaleDataWrapper::scanDateFormatImpl( const rtl::OUString& rCode ) +DateFormat LocaleDataWrapper::scanDateFormatImpl( const OUString& rCode ) { // Only some european versions were translated, the ones with different // keyword combinations are: @@ -929,7 +929,7 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const rtl::OUString& rCode ) { if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::scanDateFormat: not all DMY present" ); + OUString aMsg( "LocaleDataWrapper::scanDateFormat: not all DMY present" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } if (nDay == -1) @@ -951,7 +951,7 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const rtl::OUString& rCode ) { if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::scanDateFormat: no magic applyable" ); + OUString aMsg( "LocaleDataWrapper::scanDateFormat: no magic applyable" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } return DMY; @@ -969,7 +969,7 @@ void LocaleDataWrapper::getDateFormatsImpl() { // bad luck if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no date formats" ); + OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no date formats" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } nDateFormat = nLongDateFormat = DMY; @@ -1013,14 +1013,14 @@ void LocaleDataWrapper::getDateFormatsImpl() { if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no edit" ); + OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no edit" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } if ( nDef == -1 ) { if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no default" ); + OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no default" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } if ( nMedium != -1 ) @@ -1188,7 +1188,7 @@ static sal_Unicode* ImplAdd2UNum( sal_Unicode* pBuf, sal_uInt16 nNumber, int bLe } -inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const rtl::OUString& rStr ) +inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rStr ) { if ( rStr.getLength() == 1 ) *pBuf++ = rStr[0]; @@ -1280,7 +1280,7 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, } else { - const rtl::OUString& rThoSep = getNumThousandSep(); + const OUString& rThoSep = getNumThousandSep(); // copy number to buffer (excluding decimals) sal_uInt16 nNumLen2 = nNumLen-nDecimals; @@ -1328,7 +1328,7 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, // --- simple date and time formatting -------------------------------- -rtl::OUString LocaleDataWrapper::getDate( const Date& rDate ) const +OUString LocaleDataWrapper::getDate( const Date& rDate ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); //!TODO: leading zeros et al @@ -1371,11 +1371,11 @@ rtl::OUString LocaleDataWrapper::getDate( const Date& rDate ) const pBuf = ImplAdd2UNum( pBuf, nDay, sal_True /* IsDateDayLeadingZero() */ ); } - return rtl::OUString(aBuf, pBuf-aBuf); + return OUString(aBuf, pBuf-aBuf); } -rtl::OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const +OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); //!TODO: leading zeros et al @@ -1409,7 +1409,7 @@ rtl::OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_ } } - rtl::OUString aStr(aBuf, pBuf - aBuf); + OUString aStr(aBuf, pBuf - aBuf); if ( bHour12 ) { @@ -1423,7 +1423,7 @@ rtl::OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_ } -rtl::OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal, +OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal, sal_Int16 nDisplayDayOfWeek, sal_Bool bDayOfMonthWithLeadingZero, sal_Int16 nDisplayMonth, sal_Bool bTwoDigitYear ) const { @@ -1441,17 +1441,17 @@ rtl::OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper // day of month nVal = rCal.getValue( CalendarFieldIndex::DAY_OF_MONTH ); pBuf = ImplAdd2UNum( aBuf, nVal, bDayOfMonthWithLeadingZero ); - rtl::OUString aDay(aBuf, pBuf-aBuf); + OUString aDay(aBuf, pBuf-aBuf); // month of year nVal = rCal.getValue( CalendarFieldIndex::MONTH ); - rtl::OUString aMonth( rCal.getDisplayName( CalendarDisplayIndex::MONTH, nVal, nDisplayMonth ) ); + OUString aMonth( rCal.getDisplayName( CalendarDisplayIndex::MONTH, nVal, nDisplayMonth ) ); // year nVal = rCal.getValue( CalendarFieldIndex::YEAR ); if ( bTwoDigitYear ) pBuf = ImplAddUNum( aBuf, nVal % 100, 2 ); else pBuf = ImplAddUNum( aBuf, nVal ); - rtl::OUString aYear(aBuf, pBuf-aBuf); + OUString aYear(aBuf, pBuf-aBuf); // concatenate switch ( getLongDateFormat() ) { @@ -1480,7 +1480,7 @@ rtl::OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper } -rtl::OUString LocaleDataWrapper::getDuration( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const +OUString LocaleDataWrapper::getDuration( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); sal_Unicode aBuf[128]; @@ -1507,7 +1507,7 @@ rtl::OUString LocaleDataWrapper::getDuration( const Time& rTime, sal_Bool bSec, } } - return rtl::OUString(aBuf, pBuf-aBuf); + return OUString(aBuf, pBuf-aBuf); } @@ -1525,7 +1525,7 @@ inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal } -rtl::OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, +OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep, sal_Bool bTrailingZeros ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); @@ -1537,15 +1537,15 @@ rtl::OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals sal_Unicode* pBuf = ImplAddFormatNum( pBuffer, nNumber, nDecimals, bUseThousandSep, bTrailingZeros ); - rtl::OUString aStr(pBuffer, pBuf-pBuffer); + OUString aStr(pBuffer, pBuf-pBuffer); if ( pBuffer != aBuf ) delete [] pBuffer; return aStr; } -rtl::OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, - const rtl::OUString& rCurrencySymbol, sal_Bool bUseThousandSep ) const +OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, + const OUString& rCurrencySymbol, sal_Bool bUseThousandSep ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); sal_Unicode aBuf[192]; @@ -1735,7 +1735,7 @@ rtl::OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimal } } - rtl::OUString aNumber(pBuffer, pBuf-pBuffer); + OUString aNumber(pBuffer, pBuf-pBuffer); if ( pBuffer != aBuf ) delete [] pBuffer; @@ -1755,10 +1755,10 @@ LanguageTag LocaleDataWrapper::getLoadedLanguageTag() const } -rtl::OUString LocaleDataWrapper::appendLocaleInfo(const rtl::OUString& rDebugMsg) const +OUString LocaleDataWrapper::appendLocaleInfo(const OUString& rDebugMsg) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); - rtl::OUStringBuffer aDebugMsg(rDebugMsg); + OUStringBuffer aDebugMsg(rDebugMsg); aDebugMsg.append(static_cast('\n')); aDebugMsg.append(maLanguageTag.getBcp47()); aDebugMsg.appendAscii(" requested\n"); @@ -1770,9 +1770,9 @@ rtl::OUString LocaleDataWrapper::appendLocaleInfo(const rtl::OUString& rDebugMsg // static -void LocaleDataWrapper::outputCheckMessage( const rtl::OUString& rMsg ) +void LocaleDataWrapper::outputCheckMessage( const OUString& rMsg ) { - outputCheckMessage(rtl::OUStringToOString(rMsg, RTL_TEXTENCODING_UTF8).getStr()); + outputCheckMessage(OUStringToOString(rMsg, RTL_TEXTENCODING_UTF8).getStr()); } @@ -1836,7 +1836,7 @@ void LocaleDataWrapper::evaluateLocaleDataChecking() // --- XLocaleData4 ---------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > LocaleDataWrapper::getDateAcceptancePatterns() const +::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getDateAcceptancePatterns() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -1855,13 +1855,13 @@ void LocaleDataWrapper::evaluateLocaleDataChecking() { SAL_WARN( "unotools.i18n", "getDateAcceptancePatterns: Exception caught " << e.Message ); } - return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0); + return ::com::sun::star::uno::Sequence< OUString >(0); } // --- Override layer -------------------------------------------------------- void LocaleDataWrapper::setDateAcceptancePatterns( - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPatterns ) + const ::com::sun::star::uno::Sequence< OUString > & rPatterns ) { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nWrite ); diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx index 59238084f695..2a9ba2af0556 100644 --- a/unotools/source/i18n/nativenumberwrapper.cxx +++ b/unotools/source/i18n/nativenumberwrapper.cxx @@ -37,9 +37,9 @@ NativeNumberWrapper::~NativeNumberWrapper() } -::rtl::OUString +OUString NativeNumberWrapper::getNativeNumberString( - const ::rtl::OUString& rNumberString, + const OUString& rNumberString, const ::com::sun::star::lang::Locale& rLocale, sal_Int16 nNativeNumberMode ) const { @@ -52,7 +52,7 @@ NativeNumberWrapper::getNativeNumberString( { SAL_WARN( "unotools.i18n", "getNativeNumberString: Exception caught!" ); } - return ::rtl::OUString(); + return OUString(); } diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 7e4a2db179ec..dfb871e70439 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -36,7 +36,7 @@ namespace utl { // ............................................................................ -SearchParam::SearchParam( const rtl::OUString &rText, +SearchParam::SearchParam( const OUString &rText, SearchType eType, sal_Bool bCaseSensitive, sal_Bool bWrdOnly, @@ -237,7 +237,7 @@ int TextSearch::SearchFrwrd( const String & rStr, xub_StrLen* pStart, return nRet; } -sal_Bool TextSearch::SearchForward( const ::rtl::OUString &rStr, +sal_Bool TextSearch::SearchForward( const OUString &rStr, sal_Int32* pStart, sal_Int32* pEnd, ::com::sun::star::util::SearchResult* pRes) { @@ -305,7 +305,7 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr, { if( rResult.subRegExpressions > 0 ) { - rtl::OUString sTab( '\t' ); + OUString sTab( '\t' ); sal_Unicode sSrchChrs[] = {'\\', '&', '$', 0}; String sTmp; xub_StrLen nPos = 0; diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index 23d7acbfa374..703c37e148cc 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -120,17 +120,17 @@ void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang ) if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::SENTENCE_CASE ) { if( bLoad ) - loadModuleByImplName(rtl::OUString("SENTENCE_CASE"), nLang); + loadModuleByImplName(OUString("SENTENCE_CASE"), nLang); } else if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::TITLE_CASE ) { if( bLoad ) - loadModuleByImplName(rtl::OUString("TITLE_CASE"), nLang); + loadModuleByImplName(OUString("TITLE_CASE"), nLang); } else if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::TOGGLE_CASE ) { if( bLoad ) - loadModuleByImplName(rtl::OUString("TOGGLE_CASE"), nLang); + loadModuleByImplName(OUString("TOGGLE_CASE"), nLang); } else { diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index 3e30a9d3be2e..c0f8dded5d03 100644 --- a/unotools/source/misc/atom.cxx +++ b/unotools/source/misc/atom.cxx @@ -33,9 +33,9 @@ AtomProvider::~AtomProvider() { } -int AtomProvider::getAtom( const ::rtl::OUString& rString, sal_Bool bCreate ) +int AtomProvider::getAtom( const OUString& rString, sal_Bool bCreate ) { - ::boost::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash >::iterator it = m_aAtomMap.find( rString ); + ::boost::unordered_map< OUString, int, OUStringHash >::iterator it = m_aAtomMap.find( rString ); if( it != m_aAtomMap.end() ) return it->second; if( ! bCreate ) @@ -46,10 +46,10 @@ int AtomProvider::getAtom( const ::rtl::OUString& rString, sal_Bool bCreate ) return m_nAtoms-1; } -const ::rtl::OUString& AtomProvider::getString( int nAtom ) const +const OUString& AtomProvider::getString( int nAtom ) const { - static ::rtl::OUString aEmpty; - ::boost::unordered_map< int, ::rtl::OUString, ::boost::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); + static OUString aEmpty; + ::boost::unordered_map< int, OUString, ::boost::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); return it == m_aStringMap.end() ? aEmpty : it->second; } @@ -66,7 +66,7 @@ MultiAtomProvider::~MultiAtomProvider() delete it->second; } -int MultiAtomProvider::getAtom( int atomClass, const ::rtl::OUString& rString, sal_Bool bCreate ) +int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, sal_Bool bCreate ) { ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.find( atomClass ); @@ -82,14 +82,14 @@ int MultiAtomProvider::getAtom( int atomClass, const ::rtl::OUString& rString, s return INVALID_ATOM; } -const ::rtl::OUString& MultiAtomProvider::getString( int atomClass, int atom ) const +const OUString& MultiAtomProvider::getString( int atomClass, int atom ) const { ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) return it->second->getString( atom ); - static ::rtl::OUString aEmpty; + static OUString aEmpty; return aEmpty; } diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx index 933567b67be8..8573fd611a67 100644 --- a/unotools/source/misc/componentresmodule.cxx +++ b/unotools/source/misc/componentresmodule.cxx @@ -40,10 +40,10 @@ namespace utl private: ResMgr* m_pResources; bool m_bInitialized; - ::rtl::OString m_sResFilePrefix; + OString m_sResFilePrefix; public: - OComponentResModuleImpl( const ::rtl::OString& _rResFilePrefix ) + OComponentResModuleImpl( const OString& _rResFilePrefix ) :m_pResources( NULL ) ,m_bInitialized( false ) ,m_sResFilePrefix( _rResFilePrefix ) @@ -82,11 +82,11 @@ namespace utl if ( !m_pResources && !m_bInitialized ) { // create a manager with a fixed prefix - rtl::OString aMgrName = m_sResFilePrefix; + OString aMgrName = m_sResFilePrefix; m_pResources = ResMgr::CreateResMgr( aMgrName.getStr() ); OSL_ENSURE( m_pResources, - rtl::OStringBuffer( "OModuleImpl::getResManager: could not create the resource manager (file name: " ) + OStringBuffer( "OModuleImpl::getResManager: could not create the resource manager (file name: " ) .append(aMgrName) .append(")!").getStr() ); @@ -99,7 +99,7 @@ namespace utl //= OComponentResourceModule //==================================================================== //-------------------------------------------------------------------- - OComponentResourceModule::OComponentResourceModule( const ::rtl::OString& _rResFilePrefix ) + OComponentResourceModule::OComponentResourceModule( const OString& _rResFilePrefix ) :BaseClass() ,m_pImpl( new OComponentResModuleImpl( _rResFilePrefix ) ) { diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index 99e07ee538cf..ed34a5be3aab 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1534,7 +1534,7 @@ String GetFontToSubsFontName( FontToSubsFontConverter hConverter ) return String(); const char* pName = ((ConvertChar*)hConverter)->mpSubsFontName; - return rtl::OUString::createFromAscii( pName ); + return OUString::createFromAscii( pName ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index ad8ab621140b..4132b5d8e779 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -425,7 +425,7 @@ void GetEnglishSearchFontName( OUString& rName ) // translate normalized localized name to its normalized English ASCII name if( bNeedTranslation ) { - typedef boost::unordered_map FontNameDictionary; + typedef boost::unordered_map FontNameDictionary; static FontNameDictionary aDictionary( SAL_N_ELEMENTS(aImplLocalizedNamesList) ); // the font name dictionary needs to be intialized once if( aDictionary.empty() ) diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx index 3729c2c827c7..da0a198565b1 100644 --- a/unotools/source/streaming/streamhelper.cxx +++ b/unotools/source/streaming/streamhelper.cxx @@ -39,10 +39,10 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException) { if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(), static_cast(this)); + throw stario::BufferSizeExceededException(OUString(), static_cast(this)); ::osl::MutexGuard aGuard( m_aMutex ); aData.realloc(nBytesToRead); @@ -53,7 +53,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& m_nActPos += (sal_uInt32)nRead; if (nError != ERRCODE_NONE) - throw stario::IOException(::rtl::OUString(), static_cast(this)); + throw stario::IOException(OUString(), static_cast(this)); // adjust sequence if data read is lower than the desired data if (nRead < (sal_uInt32)nBytesToRead) @@ -101,10 +101,10 @@ void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); if (nBytesToSkip < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(), static_cast(this)); + throw stario::BufferSizeExceededException(OUString(), static_cast(this)); m_nActPos += nBytesToSkip; } @@ -115,7 +115,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::available() { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); return m_nAvailable; } @@ -126,7 +126,7 @@ void SAL_CALL OInputStreamHelper::closeInput() { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast(this)); + throw stario::NotConnectedException(OUString(), static_cast(this)); m_xLockBytes = NULL; } diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx index 0ae42190a7f6..4798af6d825f 100644 --- a/unotools/source/streaming/streamwrap.cxx +++ b/unotools/source/streaming/streamwrap.cxx @@ -66,7 +66,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& checkConnected(); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); ::osl::MutexGuard aGuard( m_aMutex ); @@ -88,7 +88,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int checkError(); if (nMaxBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); if (m_pSvStream->IsEof()) { @@ -144,7 +144,7 @@ void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedExcep void OInputStreamWrapper::checkConnected() const { if (!m_pSvStream) - throw stario::NotConnectedException(::rtl::OUString(), const_cast(static_cast(this))); + throw stario::NotConnectedException(OUString(), const_cast(static_cast(this))); } //------------------------------------------------------------------------------ @@ -154,7 +154,7 @@ void OInputStreamWrapper::checkError() const if (m_pSvStream->SvStream::GetError() != ERRCODE_NONE) // TODO: really evaluate the error - throw stario::NotConnectedException(::rtl::OUString(), const_cast(static_cast(this))); + throw stario::NotConnectedException(OUString(), const_cast(static_cast(this))); } //================================================================== @@ -229,7 +229,7 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 || (nWritten != (sal_uInt32)aData.getLength()) ) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); } } @@ -250,7 +250,7 @@ void OOutputStreamWrapper::checkError() const { if (rStream.GetError() != ERRCODE_NONE) // TODO: really evaluate the error - throw stario::NotConnectedException(::rtl::OUString(), const_cast(static_cast(this))); + throw stario::NotConnectedException(OUString(), const_cast(static_cast(this))); } //================================================================== @@ -342,7 +342,7 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD || (nWritten != (sal_uInt32)aData.getLength()) ) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast(this)); } } @@ -351,7 +351,7 @@ void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stari { m_pSvStream->Flush(); if (m_pSvStream->GetError() != ERRCODE_NONE) - throw stario::NotConnectedException(::rtl::OUString(),static_cast(this)); + throw stario::NotConnectedException(OUString(),static_cast(this)); } //------------------------------------------------------------------------------ diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx index 3cf3fa02ade3..0f0ea21181b1 100644 --- a/unotools/source/ucbhelper/XTempFile.hxx +++ b/unotools/source/ucbhelper/XTempFile.hxx @@ -82,9 +82,9 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRemoveFile( ::sal_Bool _removefile ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUri() + virtual OUString SAL_CALL getUri() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getResourceName() + virtual OUString SAL_CALL getResourceName() throw (::com::sun::star::uno::RuntimeException); // XInputStream @@ -121,16 +121,16 @@ public: virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); //::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > SAL_CALL XTempFile_createInstance( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); - static ::rtl::OUString getImplementationName_Static (); - static ::com::sun::star::uno::Sequence < ::rtl::OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static (); + static ::com::sun::star::uno::Sequence < OUString > getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleComponentFactory > createServiceFactory_Static(); diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx index e02da35de73d..25b2adfdbfbf 100644 --- a/unotools/source/ucbhelper/localfilehelper.cxx +++ b/unotools/source/ucbhelper/localfilehelper.cxx @@ -73,15 +73,15 @@ sal_Bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUStrin return !rReturn.isEmpty(); } -bool LocalFileHelper::ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl::OUString& rReturn) +bool LocalFileHelper::ConvertPhysicalNameToURL(const OUString& rName, OUString& rReturn) { - rReturn = ::rtl::OUString(); + rReturn = OUString(); Reference< XUniversalContentBroker > pBroker( UniversalContentBroker::create( comphelper::getProcessComponentContext() ) ); try { - rtl::OUString aBase( ::ucbhelper::getLocalFileURL() ); + OUString aBase( ::ucbhelper::getLocalFileURL() ); rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, aBase, rName ); } catch (const ::com::sun::star::uno::RuntimeException&) @@ -91,7 +91,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl:: return !rReturn.isEmpty(); } -bool LocalFileHelper::ConvertURLToPhysicalName(const rtl::OUString& rName, rtl::OUString& rReturn) +bool LocalFileHelper::ConvertURLToPhysicalName(const OUString& rName, OUString& rReturn) { rReturn = ""; Reference< XUniversalContentBroker > pBroker( @@ -111,21 +111,21 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const rtl::OUString& rName, rtl:: return !rReturn.isEmpty(); } -sal_Bool LocalFileHelper::IsLocalFile(const rtl::OUString& rName) +sal_Bool LocalFileHelper::IsLocalFile(const OUString& rName) { - rtl::OUString aTmp; + OUString aTmp; return ConvertURLToPhysicalName(rName, aTmp); } -sal_Bool LocalFileHelper::IsFileContent(const rtl::OUString& rName) +sal_Bool LocalFileHelper::IsFileContent(const OUString& rName) { OUString aTmp; return ConvertURLToSystemPath(rName, aTmp); } -typedef ::std::vector< ::rtl::OUString* > StringList_Impl; +typedef ::std::vector< OUString* > StringList_Impl; -::com::sun::star::uno::Sequence < ::rtl::OUString > LocalFileHelper::GetFolderContents( const ::rtl::OUString& rFolder, sal_Bool bFolder ) +::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, sal_Bool bFolder ) { StringList_Impl* pFiles = NULL; try @@ -134,8 +134,8 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl; rFolder, Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() ); Reference< ::com::sun::star::sdbc::XResultSet > xResultSet; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aProps(1); - ::rtl::OUString* pProps = aProps.getArray(); + ::com::sun::star::uno::Sequence< OUString > aProps(1); + OUString* pProps = aProps.getArray(); pProps[0] = "Url"; try @@ -158,8 +158,8 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl; { while ( xResultSet->next() ) { - ::rtl::OUString aId = xContentAccess->queryContentIdentifierString(); - ::rtl::OUString* pFile = new ::rtl::OUString( aId ); + OUString aId = xContentAccess->queryContentIdentifierString(); + OUString* pFile = new OUString( aId ); pFiles->push_back( pFile ); } } @@ -178,11 +178,11 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl; if ( pFiles ) { size_t nCount = pFiles->size(); - Sequence < ::rtl::OUString > aRet( nCount ); - ::rtl::OUString* pRet = aRet.getArray(); + Sequence < OUString > aRet( nCount ); + OUString* pRet = aRet.getArray(); for ( size_t i = 0; i < nCount; ++i ) { - ::rtl::OUString* pFile = (*pFiles)[ i ]; + OUString* pFile = (*pFiles)[ i ]; pRet[i] = *( pFile ); delete pFile; } @@ -190,7 +190,7 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl; return aRet; } else - return Sequence < ::rtl::OUString > (); + return Sequence < OUString > (); } } diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx index 8480bf18692a..0d8920bf9e64 100644 --- a/unotools/source/ucbhelper/progresshandlerwrap.cxx +++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx @@ -31,7 +31,7 @@ ProgressHandlerWrap::ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::co { } -sal_Bool getStatusFromAny_Impl( const Any& aAny, ::rtl::OUString& aText, sal_Int32& nNum ) +sal_Bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum ) { sal_Bool bNumIsSet = sal_False; @@ -54,7 +54,7 @@ void SAL_CALL ProgressHandlerWrap::push( const Any& Status ) if( !m_xStatusIndicator.is() ) return; - ::rtl::OUString aText; + OUString aText; sal_Int32 nRange; if( getStatusFromAny_Impl( Status, aText, nRange ) ) @@ -67,7 +67,7 @@ void SAL_CALL ProgressHandlerWrap::update( const Any& Status ) if( !m_xStatusIndicator.is() ) return; - ::rtl::OUString aText; + OUString aText; sal_Int32 nValue; if( getStatusFromAny_Impl( Status, aText, nValue ) ) diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 807c776826cb..798f61be5816 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -41,7 +41,7 @@ using namespace osl; namespace { struct TempNameBase_Impl - : public rtl::Static< ::rtl::OUString, TempNameBase_Impl > {}; + : public rtl::Static< OUString, TempNameBase_Impl > {}; } namespace utl @@ -59,23 +59,23 @@ struct TempFile_Impl {} }; -rtl::OUString getParentName( const rtl::OUString& aFileName ) +OUString getParentName( const OUString& aFileName ) { sal_Int32 lastIndex = aFileName.lastIndexOf( sal_Unicode('/') ); - rtl::OUString aParent = aFileName.copy( 0,lastIndex ); + OUString aParent = aFileName.copy( 0,lastIndex ); if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 ) - aParent += rtl::OUString("/"); + aParent += OUString("/"); if( 0 == aParent.compareToAscii( "file://" ) ) - aParent = rtl::OUString("file:///"); + aParent = OUString("file:///"); return aParent; } -sal_Bool ensuredir( const rtl::OUString& rUnqPath ) +sal_Bool ensuredir( const OUString& rUnqPath ) { - rtl::OUString aPath; + OUString aPath; if ( rUnqPath.isEmpty() ) return sal_False; @@ -106,7 +106,7 @@ umask(old_mode); if( !bSuccess ) { // perhaps parent(s) don't exist - rtl::OUString aParentDir = getParentName( aPath ); + OUString aParentDir = getParentName( aPath ); if ( aParentDir != aPath ) { bSuccess = ensuredir( getParentName( aPath ) ); @@ -135,10 +135,10 @@ String ConstructTempDir_Impl( const String* pParent ) comphelper::getProcessComponentContext() ) ); // if parent given try to use it - rtl::OUString aTmp( *pParent ); + OUString aTmp( *pParent ); // test for valid filename - rtl::OUString aRet; + OUString aRet; ::osl::FileBase::getFileURLFromSystemPath( ::ucbhelper::getSystemPathFromFileURL( pBroker, aTmp ), aRet ); @@ -156,10 +156,10 @@ String ConstructTempDir_Impl( const String* pParent ) if ( !aName.Len() ) { - ::rtl::OUString &rTempNameBase_Impl = TempNameBase_Impl::get(); + OUString &rTempNameBase_Impl = TempNameBase_Impl::get(); if (rTempNameBase_Impl.isEmpty()) { - ::rtl::OUString ustrTempDirURL; + OUString ustrTempDirURL; ::osl::FileBase::RC rc = ::osl::File::getTempDirURL( ustrTempDirURL ); if (rc == ::osl::FileBase::E_None) @@ -186,7 +186,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru unsigned const nRadix = 36; unsigned long const nMax = (nRadix*nRadix*nRadix*nRadix*nRadix*nRadix); String aName( rName ); - aName += rtl::OUString( "lu" ); + aName += OUString( "lu" ); rName.Erase(); static unsigned long u = Time::GetSystemTicks() % nMax; @@ -194,8 +194,8 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru { u %= nMax; String aTmp( aName ); - aTmp += rtl::OUString::valueOf(static_cast(u), nRadix); - aTmp += rtl::OUString( ".tmp" ); + aTmp += OUString::valueOf(static_cast(u), nRadix); + aTmp += OUString( ".tmp" ); if ( bDir ) { @@ -271,7 +271,7 @@ void lcl_createName(TempFile_Impl& _rImpl,const String& rLeadingChars,sal_Bool _ if ( pExtension ) aTmp += *pExtension; else - aTmp += rtl::OUString( ".tmp" ); + aTmp += OUString( ".tmp" ); if ( bDirectory ) { FileBase::RC err = Directory::create( aTmp ); @@ -329,7 +329,7 @@ String TempFile::CreateTempName( const String* pParent ) CreateTempName_Impl( aName, sal_False ); // convert to file URL - rtl::OUString aTmp; + OUString aTmp; if ( aName.Len() ) FileBase::getSystemPathFromFileURL( aName, aTmp ); return aTmp; @@ -387,7 +387,7 @@ sal_Bool TempFile::IsValid() const String TempFile::GetFileName() const { - rtl::OUString aTmp; + OUString aTmp; FileBase::getSystemPathFromFileURL( pImp->aName, aTmp ); return aTmp; } @@ -396,7 +396,7 @@ String TempFile::GetURL() const { if ( !pImp->aURL.Len() ) { - rtl::OUString aTmp; + OUString aTmp; LocalFileHelper::ConvertPhysicalNameToURL( GetFileName(), aTmp ); pImp->aURL = aTmp; } @@ -431,7 +431,7 @@ String TempFile::SetTempNameBaseDirectory( const String &rBaseName ) if( !rBaseName.Len() ) return String(); - rtl::OUString aUnqPath( rBaseName ); + OUString aUnqPath( rBaseName ); // remove trailing slash if ( rBaseName.GetChar( rBaseName.Len() - 1 ) == sal_Unicode( '/' ) ) @@ -447,14 +447,14 @@ String TempFile::SetTempNameBaseDirectory( const String &rBaseName ) bRet = sal_True; // failure to create base directory means returning an empty string - rtl::OUString aTmp; + OUString aTmp; if ( bRet ) { // append own internal directory bRet = sal_True; - ::rtl::OUString &rTempNameBase_Impl = TempNameBase_Impl::get(); + OUString &rTempNameBase_Impl = TempNameBase_Impl::get(); rTempNameBase_Impl = rBaseName; - rTempNameBase_Impl += rtl::OUString('/'); + rTempNameBase_Impl += OUString('/'); TempFile aBase( NULL, sal_True ); if ( aBase.IsValid() ) diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 6d00271eff1b..9dbd82a9b1cb 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -60,13 +60,13 @@ namespace { -rtl::OUString canonic(rtl::OUString const & url) { +OUString canonic(OUString const & url) { INetURLObject o(url); SAL_WARN_IF(o.HasError(), "unotools.ucbhelper", "Invalid URL \"" << url << '"'); return o.GetMainURL(INetURLObject::NO_DECODE); } -ucbhelper::Content content(rtl::OUString const & url) { +ucbhelper::Content content(OUString const & url) { return ucbhelper::Content( canonic(url), css::uno::Reference(), @@ -80,12 +80,12 @@ ucbhelper::Content content(INetURLObject const & url) { comphelper::getProcessComponentContext()); } -std::vector getContents(rtl::OUString const & url) { +std::vector getContents(OUString const & url) { try { - std::vector cs; + std::vector cs; ucbhelper::Content c(content(url)); - css::uno::Sequence args(1); - args[0] = rtl::OUString("Title"); + css::uno::Sequence args(1); + args[0] = OUString("Title"); css::uno::Reference res( c.createCursor(args, ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS), css::uno::UNO_SET_THROW); @@ -106,16 +106,16 @@ std::vector getContents(rtl::OUString const & url) { "unotools.ucbhelper", "getContents(" << url << ") " << e.getValueType().getTypeName() << " \"" << e.get().Message << '"'); - return std::vector(); + return std::vector(); } } -rtl::OUString getCasePreservingUrl(INetURLObject url) { +OUString getCasePreservingUrl(INetURLObject url) { return content(url).executeCommand( - rtl::OUString("getCasePreservingURL"), + OUString("getCasePreservingURL"), css::uno::Any()). - get(); + get(); } DateTime convert(css::util::DateTime const & dt) { @@ -126,7 +126,7 @@ DateTime convert(css::util::DateTime const & dt) { } -bool utl::UCBContentHelper::IsDocument(rtl::OUString const & url) { +bool utl::UCBContentHelper::IsDocument(OUString const & url) { try { return content(url).isDocument(); } catch (css::uno::RuntimeException const &) { @@ -146,7 +146,7 @@ bool utl::UCBContentHelper::IsDocument(rtl::OUString const & url) { } css::uno::Any utl::UCBContentHelper::GetProperty( - rtl::OUString const & url, rtl::OUString const & property) + OUString const & url, OUString const & property) { try { return content(url).getPropertyValue(property); @@ -166,7 +166,7 @@ css::uno::Any utl::UCBContentHelper::GetProperty( } } -bool utl::UCBContentHelper::IsFolder(rtl::OUString const & url) { +bool utl::UCBContentHelper::IsFolder(OUString const & url) { try { return content(url).isFolder(); } catch (css::uno::RuntimeException const &) { @@ -186,11 +186,11 @@ bool utl::UCBContentHelper::IsFolder(rtl::OUString const & url) { } bool utl::UCBContentHelper::GetTitle( - rtl::OUString const & url, rtl::OUString * title) + OUString const & url, OUString * title) { assert(title != 0); try { - return content(url).getPropertyValue(rtl::OUString("Title")) >>= *title; + return content(url).getPropertyValue(OUString("Title")) >>= *title; } catch (css::uno::RuntimeException const &) { throw; } catch (css::ucb::CommandAbortedException const &) { @@ -207,10 +207,10 @@ bool utl::UCBContentHelper::GetTitle( } } -bool utl::UCBContentHelper::Kill(rtl::OUString const & url) { +bool utl::UCBContentHelper::Kill(OUString const & url) { try { content(url).executeCommand( - rtl::OUString("delete"), + OUString("delete"), css::uno::makeAny(true)); return true; } catch (css::uno::RuntimeException const &) { @@ -230,7 +230,7 @@ bool utl::UCBContentHelper::Kill(rtl::OUString const & url) { } bool utl::UCBContentHelper::MakeFolder( - ucbhelper::Content & parent, rtl::OUString const & title, + ucbhelper::Content & parent, OUString const & title, ucbhelper::Content & result, bool exclusive) { bool exists = false; @@ -248,8 +248,8 @@ bool utl::UCBContentHelper::MakeFolder( { continue; } - css::uno::Sequence keys(1); - keys[0] = rtl::OUString("Title"); + css::uno::Sequence keys(1); + keys[0] = OUString("Title"); css::uno::Sequence values(1); values[0] <<= title; if (parent.insertNewContent(info[i].Type, keys, values, result)) @@ -293,10 +293,10 @@ bool utl::UCBContentHelper::MakeFolder( } } -sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) { +sal_Int64 utl::UCBContentHelper::GetSize(OUString const & url) { try { sal_Int64 n = 0; - bool ok = (content(url).getPropertyValue(rtl::OUString("Size")) >>= n); + bool ok = (content(url).getPropertyValue(OUString("Size")) >>= n); SAL_INFO_IF( !ok, "unotools.ucbhelper", "UCBContentHelper::GetSize(" << url @@ -319,17 +319,17 @@ sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) { } bool utl::UCBContentHelper::IsYounger( - rtl::OUString const & younger, rtl::OUString const & older) + OUString const & younger, OUString const & older) { try { return convert( content(younger).getPropertyValue( - rtl::OUString("DateModified")). + OUString("DateModified")). get()) > convert( content(older).getPropertyValue( - rtl::OUString("DateModified")). + OUString("DateModified")). get()); } catch (css::uno::RuntimeException const &) { throw; @@ -347,11 +347,11 @@ bool utl::UCBContentHelper::IsYounger( } } -bool utl::UCBContentHelper::Exists(rtl::OUString const & url) { - rtl::OUString pathname; +bool utl::UCBContentHelper::Exists(OUString const & url) { + OUString pathname; if (utl::LocalFileHelper::ConvertURLToPhysicalName(url, pathname)) { // Try to create a directory entry for the given URL: - rtl::OUString url2; + OUString url2; if (osl::FileBase::getFileURLFromSystemPath(pathname, url2) == osl::FileBase::E_None) { @@ -365,15 +365,15 @@ bool utl::UCBContentHelper::Exists(rtl::OUString const & url) { } else { // Divide URL into folder and name part: INetURLObject o(url); - rtl::OUString name( + OUString name( o.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET)); o.removeSegment(); o.removeFinalSlash(); - std::vector cs( + std::vector cs( getContents(o.GetMainURL(INetURLObject::NO_DECODE))); - for (std::vector::iterator i(cs.begin()); i != cs.end(); + for (std::vector::iterator i(cs.begin()); i != cs.end(); ++i) { if (INetURLObject(*i).getName( @@ -389,7 +389,7 @@ bool utl::UCBContentHelper::Exists(rtl::OUString const & url) { } bool utl::UCBContentHelper::IsSubPath( - rtl::OUString const & parent, rtl::OUString const & child) + OUString const & parent, OUString const & child) { // The comparison is done in the following way: // - First, compare case sensitively @@ -438,7 +438,7 @@ bool utl::UCBContentHelper::IsSubPath( } bool utl::UCBContentHelper::EqualURLs( - rtl::OUString const & url1, rtl::OUString const & url2) + OUString const & url1, OUString const & url2) { if (url1.isEmpty() || url2.isEmpty()) { return false; diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 086ee702582a..a5ff6fcad3f0 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -186,7 +186,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc for (i = 0; i < n; i++) { PropertyChangeEvent evt (rEvent[i]); - if (evt.PropertyName == ::rtl::OUString("DocumentHeader")) + if (evt.PropertyName == OUString("DocumentHeader")) { Sequence aHead; if (evt.NewValue >>= aHead) @@ -211,12 +211,12 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc m_xLockBytes->SetStreamValid_Impl(); } - else if (evt.PropertyName == rtl::OUString("PresentationURL")) + else if (evt.PropertyName == OUString("PresentationURL")) { - ::rtl::OUString aUrl; + OUString aUrl; if (evt.NewValue >>= aUrl) { - ::rtl::OUString aBad ("private:"); + OUString aBad ("private:"); if (!aUrl.startsWith(aBad)) { // URL changed (Redirection). @@ -224,9 +224,9 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc } } } - else if (evt.PropertyName == ::rtl::OUString("MediaType")) + else if (evt.PropertyName == OUString("MediaType")) { - ::rtl::OUString aContentType; + OUString aContentType; if (evt.NewValue >>= aContentType) m_xLockBytes->SetContentType_Impl( aContentType ); } @@ -905,7 +905,7 @@ static sal_Bool UCBOpenContentSync( Reference xContId( xContent.is() ? xContent->getIdentifier() : 0 ); - rtl::OUString aScheme; + OUString aScheme; if(xContId.is()) aScheme = xContId->getContentProviderScheme(); @@ -927,7 +927,7 @@ static sal_Bool UCBOpenContentSync( xListener = new UcbPropertiesChangeListener_Impl(xLockBytes); xProps->addPropertiesChangeListener( - Sequence< ::rtl::OUString >(), + Sequence< OUString >(), xListener); } @@ -1012,11 +1012,11 @@ static sal_Bool UCBOpenContentSync( INetURLObject aURL( xContId.is() ? xContId->getContentIdentifier() : - rtl::OUString() ); + OUString() ); aExcep.Server = aURL.GetHost(); aExcep.Classification = InteractionClassification_ERROR; aExcep.Message = - rtl::OUString( "server not responding after five seconds"); + OUString( "server not responding after five seconds"); Any request; request <<= aExcep; ucbhelper::InteractionRequest *ir = @@ -1128,7 +1128,7 @@ static sal_Bool UCBOpenContentSync( if ( xProps.is() ) xProps->removePropertiesChangeListener( - Sequence< ::rtl::OUString >(), + Sequence< OUString >(), xListener ); return ( bAborted || bException ); @@ -1150,7 +1150,7 @@ static sal_Bool _UCBOpenContentSync( xContent, new UcbTaskEnvironment( xInteract, xProgress ), comphelper::getProcessComponentContext() ); Reference < XContentIdentifier > xIdent = xContent->getIdentifier(); - ::rtl::OUString aScheme = xIdent->getContentProviderScheme(); + OUString aScheme = xIdent->getContentProviderScheme(); // http protocol must be handled in a special way: during the opening process the input stream may change // only the last inputstream after notifying the document headers is valid @@ -1160,7 +1160,7 @@ static sal_Bool _UCBOpenContentSync( Reference< XPropertiesChangeListener > xListener = new UcbPropertiesChangeListener_Impl( xLockBytes ); Reference< XPropertiesChangeNotifier > xProps ( xContent, UNO_QUERY ); if ( xProps.is() ) - xProps->addPropertiesChangeListener( Sequence< ::rtl::OUString >(), xListener ); + xProps->addPropertiesChangeListener( Sequence< OUString >(), xListener ); Any aResult; bool bException = false; @@ -1223,7 +1223,7 @@ static sal_Bool _UCBOpenContentSync( if ( xProps.is() ) - xProps->removePropertiesChangeListener( Sequence< ::rtl::OUString >(), xListener ); + xProps->removePropertiesChangeListener( Sequence< OUString >(), xListener ); return ( bAborted || bException ); } @@ -1621,7 +1621,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo { Reference < XCommandProcessor > xProcessor( xContent, UNO_QUERY ); Command aCommand; - aCommand.Name = ::rtl::OUString("setPropertyValues"); + aCommand.Name = OUString("setPropertyValues"); aCommand.Handle = -1; /* unknown */ aCommand.Argument <<= rProps; xProcessor->execute( aCommand, 0, Reference < XCommandEnvironment >() ); @@ -1632,7 +1632,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo aArgument.Mode = OpenMode::DOCUMENT; Command aCommand; - aCommand.Name = ::rtl::OUString( "open" ); + aCommand.Name = OUString( "open" ); aCommand.Argument <<= aArgument; Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) ); diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index bcad77d79020..1c9e39dc9658 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -60,7 +60,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode ::ucbhelper::Content aCnt( rFileName, Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); } catch ( const CommandAbortedException& ) @@ -93,7 +93,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode aInsertArg.ReplaceExisting = sal_False; Any aCmdArg; aCmdArg <<= aInsertArg; - aContent.executeCommand( ::rtl::OUString("insert"), aCmdArg ); + aContent.executeCommand( OUString("insert"), aCmdArg ); } // it is NOT an error when the stream already exists and no truncation was desired diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index b88949da771e..56405bbb4c99 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -27,7 +27,7 @@ OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentCont : ::cppu::PropertySetMixin< css::io::XTempFile >( context , static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS ) - , com::sun::star::uno::Sequence< rtl::OUString >() ) + , com::sun::star::uno::Sequence< OUString >() ) , mpStream( NULL ) , mbRemoveFile( sal_True ) , mbInClosed( sal_False ) @@ -123,7 +123,7 @@ throw ( css::uno::RuntimeException ) mbRemoveFile = _removefile; mpTempFile->EnableKillingFile( mbRemoveFile ); }; -::rtl::OUString SAL_CALL OTempFileService::getUri() +OUString SAL_CALL OTempFileService::getUri() throw ( css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -133,10 +133,10 @@ throw ( css::uno::RuntimeException ) throw css::uno::RuntimeException(); } - return ::rtl::OUString( mpTempFile->GetURL() ); + return OUString( mpTempFile->GetURL() ); }; -::rtl::OUString SAL_CALL OTempFileService::getResourceName() +OUString SAL_CALL OTempFileService::getResourceName() throw ( css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -146,7 +146,7 @@ throw ( css::uno::RuntimeException ) throw css::uno::RuntimeException(); } - return ::rtl::OUString( mpTempFile->GetFileName() ); + return OUString( mpTempFile->GetFileName() ); }; @@ -158,11 +158,11 @@ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); if (nBytesToRead < 0) - throw css::io::BufferSizeExceededException( ::rtl::OUString(), static_cast< css::uno::XWeak * >(this)); + throw css::io::BufferSizeExceededException( OUString(), static_cast< css::uno::XWeak * >(this)); aData.realloc(nBytesToRead); @@ -191,13 +191,13 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); checkError(); if (nMaxBytesToRead < 0) - throw css::io::BufferSizeExceededException( ::rtl::OUString(), static_cast < css::uno::XWeak * >( this ) ); + throw css::io::BufferSizeExceededException( OUString(), static_cast < css::uno::XWeak * >( this ) ); if (mpStream->IsEof()) { @@ -212,7 +212,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); checkError(); @@ -224,7 +224,7 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); @@ -245,7 +245,7 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); mbInClosed = sal_True; @@ -269,20 +269,20 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs { ::osl::MutexGuard aGuard( maMutex ); if ( mbOutClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); sal_uInt32 nWritten = mpStream->Write(aData.getConstArray(),aData.getLength()); checkError(); if ( nWritten != (sal_uInt32)aData.getLength()) - throw css::io::BufferSizeExceededException( ::rtl::OUString(),static_cast < css::uno::XWeak * > ( this ) ); + throw css::io::BufferSizeExceededException( OUString(),static_cast < css::uno::XWeak * > ( this ) ); } void SAL_CALL OTempFileService::flush( ) throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( mbOutClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); mpStream->Flush(); @@ -293,7 +293,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs { ::osl::MutexGuard aGuard( maMutex ); if ( mbOutClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); mbOutClosed = sal_True; @@ -325,7 +325,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs void OTempFileService::checkError () const { if (!mpStream || mpStream->SvStream::GetError () != ERRCODE_NONE ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); } void OTempFileService::checkConnected () { @@ -349,7 +349,7 @@ void OTempFileService::checkConnected () } if (!mpStream) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); } // XSeekable @@ -423,20 +423,20 @@ throw ( css::io::IOException, css::uno::RuntimeException ) // XServiceInfo -::rtl::OUString SAL_CALL OTempFileService::getImplementationName() +OUString SAL_CALL OTempFileService::getImplementationName() throw ( css::uno::RuntimeException ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL OTempFileService::supportsService( ::rtl::OUString const & rServiceName ) +sal_Bool SAL_CALL OTempFileService::supportsService( OUString const & rServiceName ) throw ( css::uno::RuntimeException ) { - css::uno::Sequence< ::rtl::OUString > aServices(getSupportedServiceNames_Static()); + css::uno::Sequence< OUString > aServices(getSupportedServiceNames_Static()); return rServiceName == aServices[0]; } -css::uno::Sequence < ::rtl::OUString > SAL_CALL OTempFileService::getSupportedServiceNames() +css::uno::Sequence < OUString > SAL_CALL OTempFileService::getSupportedServiceNames() throw ( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -444,13 +444,13 @@ throw ( css::uno::RuntimeException ) -::rtl::OUString OTempFileService::getImplementationName_Static () +OUString OTempFileService::getImplementationName_Static () { - return ::rtl::OUString ( "com.sun.star.io.comp.TempFile" ); + return OUString ( "com.sun.star.io.comp.TempFile" ); } -css::uno::Sequence < ::rtl::OUString > OTempFileService::getSupportedServiceNames_Static() +css::uno::Sequence < OUString > OTempFileService::getSupportedServiceNames_Static() { - css::uno::Sequence < ::rtl::OUString > aNames ( 1 ); + css::uno::Sequence < OUString > aNames ( 1 ); aNames[0] = "com.sun.star.io.TempFile"; return aNames; } diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index dc2ef6eadc19..dfa15b1f16be 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -98,7 +98,7 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if ((0 == m_aNodePtr) || (0 == m_aAttrPtr)) { - return ::rtl::OUString(); + return OUString(); } OUString const aName((char*)m_aAttrPtr->name, strlen((char*)m_aAttrPtr->name), RTL_TEXTENCODING_UTF8); @@ -148,10 +148,10 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if ((0 == m_aNodePtr) || (0 == m_aAttrPtr)) { - return ::rtl::OUString(); + return OUString(); } if (0 == m_aAttrPtr->children) { - return ::rtl::OUString(); + return OUString(); } char const*const pContent((m_aAttrPtr->children) ? reinterpret_cast(m_aAttrPtr->children->content) @@ -232,11 +232,11 @@ namespace DOM { ::osl::MutexGuard const g(m_rMutex); - if (!m_aNodePtr) { return ::rtl::OUString(); } + if (!m_aNodePtr) { return OUString(); } if (m_pNamespace.get()) { OSL_ASSERT(!m_aNodePtr->parent); - OUString const ret(::rtl::OStringToOUString( + OUString const ret(OStringToOUString( m_pNamespace->second, RTL_TEXTENCODING_UTF8)); return ret; } else { @@ -249,11 +249,11 @@ namespace DOM { ::osl::MutexGuard const g(m_rMutex); - if (!m_aNodePtr) { return ::rtl::OUString(); } + if (!m_aNodePtr) { return OUString(); } if (m_pNamespace.get()) { OSL_ASSERT(!m_aNodePtr->parent); - OUString const ret(::rtl::OStringToOUString( + OUString const ret(OStringToOUString( m_pNamespace->first, RTL_TEXTENCODING_UTF8)); return ret; } else { diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx index d4bc835f33e5..9a472b9e6b97 100644 --- a/unoxml/source/dom/attr.hxx +++ b/unoxml/source/dom/attr.hxx @@ -32,13 +32,12 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; namespace DOM { - typedef ::std::pair< ::rtl::OString, ::rtl::OString > stringpair_t; + typedef ::std::pair< OString, OString > stringpair_t; typedef ::cppu::ImplInheritanceHelper1< CNode, XAttr > CAttr_Base; diff --git a/unoxml/source/dom/attributesmap.hxx b/unoxml/source/dom/attributesmap.hxx index f57cddd3e11e..17afdacfefc9 100644 --- a/unoxml/source/dom/attributesmap.hxx +++ b/unoxml/source/dom/attributesmap.hxx @@ -30,7 +30,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/cdatasection.hxx b/unoxml/source/dom/cdatasection.hxx index 7fb8a2da4499..620296515b7c 100644 --- a/unoxml/source/dom/cdatasection.hxx +++ b/unoxml/source/dom/cdatasection.hxx @@ -26,7 +26,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx index eab4ae99d74d..e2b4ba97fa49 100644 --- a/unoxml/source/dom/characterdata.cxx +++ b/unoxml/source/dom/characterdata.cxx @@ -85,7 +85,7 @@ namespace DOM ::boost::shared_ptr const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast(pContent.get())); - OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -156,7 +156,7 @@ namespace DOM ::boost::shared_ptr const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast(pContent.get())); - OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -191,7 +191,7 @@ namespace DOM ::boost::shared_ptr const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast(pContent.get())); - OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0){ DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -246,7 +246,7 @@ namespace DOM ::boost::shared_ptr const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast(pContent.get())); - OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; diff --git a/unoxml/source/dom/characterdata.hxx b/unoxml/source/dom/characterdata.hxx index 7f2664732fa0..3debdd94d2ff 100644 --- a/unoxml/source/dom/characterdata.hxx +++ b/unoxml/source/dom/characterdata.hxx @@ -33,7 +33,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/childlist.hxx b/unoxml/source/dom/childlist.hxx index abdc1df8e373..baf91caf888c 100644 --- a/unoxml/source/dom/childlist.hxx +++ b/unoxml/source/dom/childlist.hxx @@ -30,7 +30,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/comment.hxx b/unoxml/source/dom/comment.hxx index 5edeaf14ed30..df095b223948 100644 --- a/unoxml/source/dom/comment.hxx +++ b/unoxml/source/dom/comment.hxx @@ -26,7 +26,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index 8dbb0ddd4311..0c69dfb64cee 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -481,7 +481,7 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); OString const oData( - ::rtl::OUStringToOString(data, RTL_TEXTENCODING_UTF8)); + OUStringToOString(data, RTL_TEXTENCODING_UTF8)); xmlChar const*const pData = reinterpret_cast(oData.getStr()); xmlNodePtr const pText = @@ -1020,7 +1020,7 @@ namespace DOM void SAL_CALL CDocument::fastSerialize( const Reference< XFastDocumentHandler >& i_xHandler, const Reference< XFastTokenHandler >& i_xTokenHandler, const Sequence< beans::StringPair >& i_rNamespaces, - const Sequence< beans::Pair< rtl::OUString, sal_Int32 > >& i_rRegisterNamespaces ) + const Sequence< beans::Pair< OUString, sal_Int32 > >& i_rRegisterNamespaces ) throw (SAXException, RuntimeException) { ::osl::MutexGuard const g(m_Mutex); diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx index f2c9a761cebb..97c08cfafc2c 100644 --- a/unoxml/source/dom/document.hxx +++ b/unoxml/source/dom/document.hxx @@ -50,7 +50,6 @@ using namespace std; -using ::rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::xml::sax; @@ -382,7 +381,7 @@ namespace DOM virtual void SAL_CALL fastSerialize( const Reference< XFastDocumentHandler >& handler, const Reference< XFastTokenHandler >& tokenHandler, const Sequence< beans::StringPair >& i_rNamespaces, - const Sequence< beans::Pair< rtl::OUString, sal_Int32 > >& namespaces ) + const Sequence< beans::Pair< OUString, sal_Int32 > >& namespaces ) throw (SAXException, RuntimeException); }; } diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index cbfe97a7eb71..8d434e74bf19 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -45,8 +45,6 @@ #include -using ::rtl::OUStringBuffer; -using ::rtl::OString; using ::com::sun::star::xml::sax::InputSource; using namespace ucbhelper; using namespace ::com::sun::star::ucb; diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx index 02bc8cf753b0..f1c5daf2ae91 100644 --- a/unoxml/source/dom/documentbuilder.hxx +++ b/unoxml/source/dom/documentbuilder.hxx @@ -40,7 +40,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx index 852e437ac448..d3f3ca941766 100644 --- a/unoxml/source/dom/documentfragment.hxx +++ b/unoxml/source/dom/documentfragment.hxx @@ -26,7 +26,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/documenttype.hxx b/unoxml/source/dom/documenttype.hxx index 8c03f6dfaced..17ca8fb942da 100644 --- a/unoxml/source/dom/documenttype.hxx +++ b/unoxml/source/dom/documenttype.hxx @@ -32,7 +32,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/domimplementation.hxx b/unoxml/source/dom/domimplementation.hxx index 9d8d2b338bed..29bade3aa45d 100644 --- a/unoxml/source/dom/domimplementation.hxx +++ b/unoxml/source/dom/domimplementation.hxx @@ -30,7 +30,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index 43624b5a8829..0149ca972768 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -231,7 +231,7 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } // search properties OString o1 = OUStringToOString(name, RTL_TEXTENCODING_UTF8); @@ -311,7 +311,7 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } OString o1 = OUStringToOString(localName, RTL_TEXTENCODING_UTF8); xmlChar const*const pName = @@ -322,7 +322,7 @@ namespace DOM ::boost::shared_ptr const pValue( xmlGetNsProp(m_aNodePtr, pName, pNS), xmlFree); if (0 == pValue) { - return ::rtl::OUString(); + return OUString(); } OUString const ret(reinterpret_cast(pValue.get()), strlen(reinterpret_cast(pValue.get())), @@ -372,7 +372,7 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } OUString const ret((sal_Char*)m_aNodePtr->name, strlen((char*)m_aNodePtr->name), RTL_TEXTENCODING_UTF8); @@ -501,7 +501,7 @@ namespace DOM Reference< XAttr > aAttr; if (!oldAttr->getNamespaceURI().isEmpty()) { - ::rtl::OUStringBuffer qname(oldAttr->getPrefix()); + OUStringBuffer qname(oldAttr->getPrefix()); if (0 != qname.getLength()) { qname.append(sal_Unicode(':')); } diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx index 11c1718e373f..26baa2ffc53c 100644 --- a/unoxml/source/dom/element.hxx +++ b/unoxml/source/dom/element.hxx @@ -31,7 +31,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index 090d873f1951..10c2144d04db 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -28,10 +28,10 @@ namespace DOM { - static xmlChar* lcl_initXmlString(::rtl::OUString const& rString) + static xmlChar* lcl_initXmlString(OUString const& rString) { - ::rtl::OString const os = - ::rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8); + OString const os = + OUStringToOString(rString, RTL_TEXTENCODING_UTF8); xmlChar *const pRet = new xmlChar[os.getLength() + 1]; strcpy(reinterpret_cast(pRet), os.getStr()); return pRet; diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx index b89965b8e5a8..5bfc422f806f 100644 --- a/unoxml/source/dom/elementlist.hxx +++ b/unoxml/source/dom/elementlist.hxx @@ -39,7 +39,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::dom::events; diff --git a/unoxml/source/dom/entitiesmap.hxx b/unoxml/source/dom/entitiesmap.hxx index edc909d563ef..0e857ed3e4fe 100644 --- a/unoxml/source/dom/entitiesmap.hxx +++ b/unoxml/source/dom/entitiesmap.hxx @@ -30,7 +30,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/entity.hxx b/unoxml/source/dom/entity.hxx index 8c9f8b433f76..64fd0feb5518 100644 --- a/unoxml/source/dom/entity.hxx +++ b/unoxml/source/dom/entity.hxx @@ -31,7 +31,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx index af8fab51ca0a..6368195e8659 100644 --- a/unoxml/source/dom/entityreference.hxx +++ b/unoxml/source/dom/entityreference.hxx @@ -28,7 +28,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 3fcb3dacfdc7..a071247a1a2b 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -469,7 +469,7 @@ namespace DOM throw (RuntimeException) { // see CElement/CAttr - return ::rtl::OUString(); + return OUString(); } diff --git a/unoxml/source/dom/node.hxx b/unoxml/source/dom/node.hxx index 3fe3ab62b99f..b7e29544300a 100644 --- a/unoxml/source/dom/node.hxx +++ b/unoxml/source/dom/node.hxx @@ -46,8 +46,6 @@ #include -using ::rtl::OUString; -using ::rtl::OString; using namespace sax_fastparser; using namespace com::sun::star::uno; using namespace com::sun::star::xml::sax; @@ -82,7 +80,7 @@ namespace DOM typedef std::vector< std::vector > NamespaceVectorType; typedef boost::unordered_map< OUString, sal_Int32, - rtl::OUStringHash > NamespaceMapType; + OUStringHash > NamespaceMapType; /// outer vector: xml context; inner vector: current NS NamespaceVectorType maNamespaces; diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx index e1965f423344..5aa1c0e2ced4 100644 --- a/unoxml/source/dom/notation.hxx +++ b/unoxml/source/dom/notation.hxx @@ -28,7 +28,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/notationsmap.hxx b/unoxml/source/dom/notationsmap.hxx index f8d234315f47..8a594a3bbbef 100644 --- a/unoxml/source/dom/notationsmap.hxx +++ b/unoxml/source/dom/notationsmap.hxx @@ -30,7 +30,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/processinginstruction.cxx b/unoxml/source/dom/processinginstruction.cxx index 9d1edd605aa6..99790e159c7c 100644 --- a/unoxml/source/dom/processinginstruction.cxx +++ b/unoxml/source/dom/processinginstruction.cxx @@ -52,13 +52,13 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } char const*const pContent( reinterpret_cast(m_aNodePtr->content)); if (0 == pContent) { - return ::rtl::OUString(); + return OUString(); } OUString const ret(pContent, strlen(pContent), RTL_TEXTENCODING_UTF8); return ret; @@ -73,13 +73,13 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } char const*const pName( reinterpret_cast(m_aNodePtr->name)); if (0 == pName) { - return ::rtl::OUString(); + return OUString(); } OUString const ret(pName, strlen(pName), RTL_TEXTENCODING_UTF8); return ret; @@ -98,7 +98,7 @@ namespace DOM } OString const data( - ::rtl::OUStringToOString(rData, RTL_TEXTENCODING_UTF8)); + OUStringToOString(rData, RTL_TEXTENCODING_UTF8)); xmlChar const*const pData( reinterpret_cast(data.getStr()) ); xmlFree(m_aNodePtr->content); @@ -111,7 +111,7 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } sal_Char const*const pName = diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx index 3501b99c6cd0..96141e6162e3 100644 --- a/unoxml/source/dom/processinginstruction.hxx +++ b/unoxml/source/dom/processinginstruction.hxx @@ -28,7 +28,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx index 9945548cf998..79956a2a1e1c 100644 --- a/unoxml/source/dom/saxbuilder.hxx +++ b/unoxml/source/dom/saxbuilder.hxx @@ -41,7 +41,6 @@ #include #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::sax; diff --git a/unoxml/source/dom/text.hxx b/unoxml/source/dom/text.hxx index fbb64bceb2d2..35d8c6b9802c 100644 --- a/unoxml/source/dom/text.hxx +++ b/unoxml/source/dom/text.hxx @@ -33,7 +33,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/events/eventdispatcher.hxx b/unoxml/source/events/eventdispatcher.hxx index cb2170199cc4..065be2d9c8d8 100644 --- a/unoxml/source/events/eventdispatcher.hxx +++ b/unoxml/source/events/eventdispatcher.hxx @@ -45,7 +45,7 @@ class CDocument; namespace events { typedef std::multimap< xmlNodePtr, Reference< com::sun::star::xml::dom::events::XEventListener> > ListenerMap; -typedef std::map< ::rtl::OUString, ListenerMap*> TypeListenerMap; +typedef std::map< OUString, ListenerMap*> TypeListenerMap; typedef std::vector ListenerPairVector; class CEventDispatcher @@ -57,20 +57,20 @@ private: public: void addListener( xmlNodePtr pNode, - ::rtl::OUString aType, + OUString aType, const Reference& aListener, sal_Bool bCapture); void removeListener( xmlNodePtr pNode, - ::rtl::OUString aType, + OUString aType, const Reference& aListener, sal_Bool bCapture); static void callListeners( TypeListenerMap const& rTMap, xmlNodePtr const pNode, - ::rtl::OUString aType, + OUString aType, const Reference< XEvent >& xEvent); bool dispatchEvent( diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx index 65be5507d7f1..92296c0fb1b3 100644 --- a/unoxml/source/events/mouseevent.hxx +++ b/unoxml/source/events/mouseevent.hxx @@ -27,9 +27,6 @@ #include "uievent.hxx" - -using ::rtl::OUString; - namespace DOM { namespace events { typedef ::cppu::ImplInheritanceHelper1< CUIEvent, XMouseEvent > diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx index f3604a94ed5d..8687233f6d37 100644 --- a/unoxml/source/events/mutationevent.hxx +++ b/unoxml/source/events/mutationevent.hxx @@ -32,9 +32,6 @@ #include "event.hxx" - -using ::rtl::OUString; - namespace DOM { namespace events { typedef ::cppu::ImplInheritanceHelper1< CEvent, XMutationEvent > diff --git a/unoxml/source/events/testlistener.hxx b/unoxml/source/events/testlistener.hxx index b9b3de599615..5d5b1e4f4fe5 100644 --- a/unoxml/source/events/testlistener.hxx +++ b/unoxml/source/events/testlistener.hxx @@ -37,7 +37,6 @@ #include -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::dom::events; diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx index ef0bfe88176b..1f9f70fad169 100644 --- a/unoxml/source/events/uievent.hxx +++ b/unoxml/source/events/uievent.hxx @@ -31,7 +31,6 @@ #include "event.hxx" -using ::rtl::OUString; using namespace com::sun::star::xml::dom::views; namespace DOM { namespace events { diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index 1ddbbbce8900..f4540cfd1d0f 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -41,15 +41,15 @@ public: virtual ~CBlankNode() {} // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception); // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); private: CBlankNode(const CBlankNode &); // not defined @@ -57,7 +57,7 @@ private: css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::rtl::OUString m_NodeID; + OUString m_NodeID; }; CBlankNode::CBlankNode(css::uno::Reference< css::uno::XComponentContext > const & context) : @@ -65,14 +65,14 @@ CBlankNode::CBlankNode(css::uno::Reference< css::uno::XComponentContext > const {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL CBlankNode::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL CBlankNode::getImplementationName() throw (css::uno::RuntimeException) { return comp_CBlankNode::_getImplementationName(); } -::sal_Bool SAL_CALL CBlankNode::supportsService(::rtl::OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL CBlankNode::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > serviceNames = comp_CBlankNode::_getSupportedServiceNames(); + css::uno::Sequence< OUString > serviceNames = comp_CBlankNode::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) return sal_True; @@ -80,7 +80,7 @@ CBlankNode::CBlankNode(css::uno::Reference< css::uno::XComponentContext > const return sal_False; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL CBlankNode::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL CBlankNode::getSupportedServiceNames() throw (css::uno::RuntimeException) { return comp_CBlankNode::_getSupportedServiceNames(); } @@ -90,14 +90,14 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star: { if (aArguments.getLength() != 1) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CBlankNode::initialize: " + OUString("CBlankNode::initialize: " "must give exactly 1 argument"), *this, 1); } - ::rtl::OUString arg; + OUString arg; if (!(aArguments[0] >>= arg)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CBlankNode::initialize: " + OUString("CBlankNode::initialize: " "argument must be string"), *this, 0); } @@ -106,13 +106,13 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star: m_NodeID = arg; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CBlankNode::initialize: " + OUString("CBlankNode::initialize: " "argument is not valid blank node ID"), *this, 0); } } // ::com::sun::star::rdf::XNode: -::rtl::OUString SAL_CALL CBlankNode::getStringValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CBlankNode::getStringValue() throw (css::uno::RuntimeException) { return m_NodeID; } @@ -124,8 +124,8 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star: // component helper namespace namespace comp_CBlankNode { -::rtl::OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString( "CBlankNode"); +OUString SAL_CALL _getImplementationName() { + return OUString( "CBlankNode"); } css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index 272f6d207cd9..14c3fca88d95 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -43,19 +43,19 @@ public: virtual ~CLiteral() {} // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception); // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); // ::com::sun::star::rdf::XLiteral: - virtual ::rtl::OUString SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException); private: @@ -64,8 +64,8 @@ private: css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::rtl::OUString m_Value; - ::rtl::OUString m_Language; + OUString m_Value; + OUString m_Language; css::uno::Reference< css::rdf::XURI > m_xDatatype; }; @@ -74,14 +74,14 @@ CLiteral::CLiteral(css::uno::Reference< css::uno::XComponentContext > const & co {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL CLiteral::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getImplementationName() throw (css::uno::RuntimeException) { return comp_CLiteral::_getImplementationName(); } -::sal_Bool SAL_CALL CLiteral::supportsService(::rtl::OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL CLiteral::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > serviceNames = comp_CLiteral::_getSupportedServiceNames(); + css::uno::Sequence< OUString > serviceNames = comp_CLiteral::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) return sal_True; @@ -89,7 +89,7 @@ CLiteral::CLiteral(css::uno::Reference< css::uno::XComponentContext > const & co return sal_False; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL CLiteral::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL CLiteral::getSupportedServiceNames() throw (css::uno::RuntimeException) { return comp_CLiteral::_getSupportedServiceNames(); } @@ -100,14 +100,14 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u const sal_Int32 len( aArguments.getLength() ); if (len < 1 || len > 2) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "must give 1 or 2 argument(s)"), *this, 2); } - ::rtl::OUString arg0; + OUString arg0; if (!(aArguments[0] >>= arg0)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "argument must be string"), *this, 0); } //FIXME: what is legal? @@ -115,19 +115,19 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u m_Value = arg0; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "argument is not valid literal value"), *this, 0); } if (len > 1) { - ::rtl::OUString arg1; + OUString arg1; css::uno::Reference< css::rdf::XURI > xURI; if ((aArguments[1] >>= arg1)) { if (!arg1.isEmpty()) { m_Language = arg1; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "argument is not valid language"), *this, 1); } } else if ((aArguments[1] >>= xURI)) { @@ -135,27 +135,27 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u m_xDatatype = xURI; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "argument is null"), *this, 1); } } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "argument must be string or URI"), *this, 1); } } } // ::com::sun::star::rdf::XNode: -::rtl::OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException) { if (!m_Language.isEmpty()) { - ::rtl::OUStringBuffer buf(m_Value); + OUStringBuffer buf(m_Value); buf.appendAscii("@"); buf.append(m_Language); return buf.makeStringAndClear(); } else if (m_xDatatype.is()) { - ::rtl::OUStringBuffer buf(m_Value); + OUStringBuffer buf(m_Value); buf.appendAscii("^^"); buf.append(m_xDatatype->getStringValue()); return buf.makeStringAndClear(); @@ -165,12 +165,12 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u } // ::com::sun::star::rdf::XLiteral: -::rtl::OUString SAL_CALL CLiteral::getValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getValue() throw (css::uno::RuntimeException) { return m_Value; } -::rtl::OUString SAL_CALL CLiteral::getLanguage() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getLanguage() throw (css::uno::RuntimeException) { return m_Language; } @@ -187,8 +187,8 @@ css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype() throw (cs // component helper namespace namespace comp_CLiteral { -::rtl::OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString( "CLiteral"); +OUString SAL_CALL _getImplementationName() { + return OUString( "CLiteral"); } css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() diff --git a/unoxml/source/rdf/CNodes.hxx b/unoxml/source/rdf/CNodes.hxx index 87e1344c7282..37ea5283fb2e 100644 --- a/unoxml/source/rdf/CNodes.hxx +++ b/unoxml/source/rdf/CNodes.hxx @@ -28,8 +28,8 @@ namespace comp_CBlankNode { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace @@ -39,8 +39,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc namespace comp_CURI { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace @@ -50,8 +50,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc namespace comp_CLiteral { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index c275b6861b3f..e7aa311ebb75 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -42,19 +42,19 @@ public: virtual ~CURI() {} // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception); // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); // ::com::sun::star::rdf::XURI: - virtual ::rtl::OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException); private: CURI(const CURI &); // not defined @@ -65,8 +65,8 @@ private: css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::rtl::OUString m_Namespace; - ::rtl::OUString m_LocalName; + OUString m_Namespace; + OUString m_LocalName; }; CURI::CURI(css::uno::Reference< css::uno::XComponentContext > const & context) : @@ -74,14 +74,14 @@ CURI::CURI(css::uno::Reference< css::uno::XComponentContext > const & context) : {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL CURI::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getImplementationName() throw (css::uno::RuntimeException) { return comp_CURI::_getImplementationName(); } -::sal_Bool SAL_CALL CURI::supportsService(::rtl::OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL CURI::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > serviceNames = comp_CURI::_getSupportedServiceNames(); + css::uno::Sequence< OUString > serviceNames = comp_CURI::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) return sal_True; @@ -89,7 +89,7 @@ CURI::CURI(css::uno::Reference< css::uno::XComponentContext > const & context) : return sal_False; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL CURI::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL CURI::getSupportedServiceNames() throw (css::uno::RuntimeException) { return comp_CURI::_getSupportedServiceNames(); } @@ -708,11 +708,11 @@ void SAL_CALL CURI::initFromConstant(const sal_Int16 i_Constant) default: throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "invalid URIs constant argument"), *this, 0); } - m_Namespace = ::rtl::OUString::createFromAscii(ns).intern(); - m_LocalName = ::rtl::OUString::createFromAscii(ln).intern(); + m_Namespace = OUString::createFromAscii(ns).intern(); + m_LocalName = OUString::createFromAscii(ln).intern(); return; } @@ -722,18 +722,18 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: sal_Int32 len = aArguments.getLength(); if ((len < 1) || (len > 2)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "must give 1 or 2 argument(s)"), *this, 2); } sal_Int16 arg(0); - ::rtl::OUString arg0; - ::rtl::OUString arg1; + OUString arg0; + OUString arg1; if ((aArguments[0] >>= arg)) { // integer argument: constant from rdf::URIs if (len != 1) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "must give 1 int argument"), *this, 1); } initFromConstant(arg); @@ -741,13 +741,13 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: } if (!(aArguments[0] >>= arg0)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "argument must be string or short"), *this, 0); } if (len > 1) { if (!(aArguments[1] >>= arg1)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "argument must be string"), *this, 1); } // just append the parameters and then split them again; seems simplest @@ -768,7 +768,7 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: } } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "argument not splittable: no separator [#/:]"), *this, 0); } @@ -777,7 +777,7 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: m_Namespace = arg0; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "argument is not valid namespace"), *this, 0); } //FIXME: what is legal? @@ -785,24 +785,24 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: m_LocalName = arg1; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "argument is not valid local name"), *this, 1); } } // ::com::sun::star::rdf::XNode: -::rtl::OUString SAL_CALL CURI::getStringValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getStringValue() throw (css::uno::RuntimeException) { return m_Namespace + m_LocalName; } // ::com::sun::star::rdf::XURI: -::rtl::OUString SAL_CALL CURI::getNamespace() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getNamespace() throw (css::uno::RuntimeException) { return m_Namespace; } -::rtl::OUString SAL_CALL CURI::getLocalName() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getLocalName() throw (css::uno::RuntimeException) { return m_LocalName; } @@ -814,8 +814,8 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: // component helper namespace namespace comp_CURI { -::rtl::OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString( +OUString SAL_CALL _getImplementationName() { + return OUString( "CURI"); } diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index be3e81f9dc12..eb1bb94c7b1a 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -85,7 +85,7 @@ class librdf_Repository; using namespace ::com::sun::star; -typedef std::map< ::rtl::OUString, ::rtl::Reference > +typedef std::map< OUString, ::rtl::Reference > NamedGraphMap_t; const char s_sparql [] = "sparql"; @@ -233,11 +233,11 @@ public: virtual ~librdf_Repository(); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( - const ::rtl::OUString & ServiceName) throw (uno::RuntimeException); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL + const OUString & ServiceName) throw (uno::RuntimeException); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // ::com::sun::star::rdf::XRepository: @@ -281,14 +281,14 @@ public: throw (uno::RuntimeException, rdf::RepositoryException); virtual uno::Reference< rdf::XQuerySelectResult > SAL_CALL - querySelect(const ::rtl::OUString & i_rQuery) + querySelect(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException); virtual uno::Reference< container::XEnumeration > SAL_CALL - queryConstruct(const ::rtl::OUString & i_rQuery) + queryConstruct(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException); - virtual ::sal_Bool SAL_CALL queryAsk(const ::rtl::OUString & i_rQuery) + virtual ::sal_Bool SAL_CALL queryAsk(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException); @@ -297,7 +297,7 @@ public: const uno::Reference< rdf::XResource > & i_xSubject, const uno::Sequence< uno::Reference< rdf::XURI > > & i_rPredicates, const uno::Reference< rdf::XMetadatable > & i_xObject, - const ::rtl::OUString & i_rRDFaContent, + const OUString & i_rRDFaContent, const uno::Reference< rdf::XURI > & i_xRDFaDatatype) throw (uno::RuntimeException, lang::IllegalArgumentException, rdf::RepositoryException); @@ -386,7 +386,7 @@ private: librdf_TypeConverter m_TypeConverter; /// set of xml:ids of elements with xhtml:content - ::std::set< ::rtl::OUString > m_RDFaXHTMLContentSet; + ::std::set< OUString > m_RDFaXHTMLContentSet; }; @@ -512,7 +512,7 @@ public: ::osl::Mutex & i_rMutex, boost::shared_ptr const& i_pQuery, boost::shared_ptr const& i_pQueryResult, - uno::Sequence< ::rtl::OUString > const& i_rBindingNames ) + uno::Sequence< OUString > const& i_rBindingNames ) : m_xRep(i_pRepository) , m_rMutex(i_rMutex) , m_pQuery(i_pQuery) @@ -530,7 +530,7 @@ public: lang::WrappedTargetException); // ::com::sun::star::rdf::XQuerySelectResult: - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getBindingNames() + virtual uno::Sequence< OUString > SAL_CALL getBindingNames() throw (uno::RuntimeException); private: @@ -545,7 +545,7 @@ private: // queries must be freed only after all the results are completely read boost::shared_ptr m_pQuery; boost::shared_ptr m_pQueryResult; - uno::Sequence< ::rtl::OUString > m_BindingNames; + uno::Sequence< OUString > m_BindingNames; }; @@ -609,7 +609,7 @@ throw (uno::RuntimeException, container::NoSuchElementException, } // ::com::sun::star::rdf::XQuerySelectResult: -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException) { return m_BindingNames; @@ -636,13 +636,13 @@ public: virtual ~librdf_NamedGraph() {} // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() + virtual OUString SAL_CALL getStringValue() throw (uno::RuntimeException); // ::com::sun::star::rdf::XURI: - virtual ::rtl::OUString SAL_CALL getNamespace() + virtual OUString SAL_CALL getNamespace() throw (uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLocalName() + virtual OUString SAL_CALL getLocalName() throw (uno::RuntimeException); // ::com::sun::star::rdf::XNamedGraph: @@ -680,20 +680,20 @@ private: // ::com::sun::star::rdf::XNode: -::rtl::OUString SAL_CALL librdf_NamedGraph::getStringValue() +OUString SAL_CALL librdf_NamedGraph::getStringValue() throw (uno::RuntimeException) { return m_xName->getStringValue(); } // ::com::sun::star::rdf::XURI: -::rtl::OUString SAL_CALL librdf_NamedGraph::getNamespace() +OUString SAL_CALL librdf_NamedGraph::getNamespace() throw (uno::RuntimeException) { return m_xName->getNamespace(); } -::rtl::OUString SAL_CALL librdf_NamedGraph::getLocalName() +OUString SAL_CALL librdf_NamedGraph::getLocalName() throw (uno::RuntimeException) { return m_xName->getLocalName(); @@ -811,16 +811,16 @@ librdf_Repository::~librdf_Repository() } // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL librdf_Repository::getImplementationName() +OUString SAL_CALL librdf_Repository::getImplementationName() throw (uno::RuntimeException) { return comp_librdf_Repository::_getImplementationName(); } ::sal_Bool SAL_CALL librdf_Repository::supportsService( - ::rtl::OUString const & serviceName) throw (uno::RuntimeException) + OUString const & serviceName) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > serviceNames + uno::Sequence< OUString > serviceNames = comp_librdf_Repository::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) @@ -829,7 +829,7 @@ throw (uno::RuntimeException) return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL librdf_Repository::getSupportedServiceNames() throw (uno::RuntimeException) { return comp_librdf_Repository::_getSupportedServiceNames(); @@ -854,7 +854,7 @@ throw (uno::RuntimeException) "librdf_Repository::createBlankNode: " "librdf_node_get_blank_identifier failed", *this); } - const ::rtl::OUString nodeID(::rtl::OUString::createFromAscii( + const OUString nodeID(OUString::createFromAscii( reinterpret_cast(id))); try { return rdf::BlankNode::create(m_xContext, nodeID); @@ -906,19 +906,19 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_Repository::importGraph: base URI is null", *this, 3); } OSL_ENSURE(i_xBaseURI.is(), "no base uri"); - const ::rtl::OUString baseURIU( i_xBaseURI->getStringValue() ); + const OUString baseURIU( i_xBaseURI->getStringValue() ); if (baseURIU.indexOf('#') >= 0) { throw lang::IllegalArgumentException( "librdf_Repository::importGraph: base URI is not absolute", *this, 3); } - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) { throw container::ElementExistException( "librdf_Repository::importGraph: graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -929,8 +929,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_Repository::importGraph: librdf_new_node_from_uri_string failed", *this); } - const ::rtl::OString baseURI( - ::rtl::OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) ); + const OString baseURI( + OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pBaseURI( librdf_new_uri(m_pWorld.get(), reinterpret_cast (baseURI.getStr())), @@ -1007,7 +1007,7 @@ void addChaffWhenEncryptedStorage(const uno::Reference< io::XOutputStream > &rSt reinterpret_cast(pBuffer), preamblelen); rStream->writeBytes(buf); - rtl::OStringBuffer aComment; + OStringBuffer aComment; aComment.append(""); @@ -1055,21 +1055,21 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "base URI is null", *this, 3); } OSL_ENSURE(i_xBaseURI.is(), "no base uri"); - const ::rtl::OUString baseURIU( i_xBaseURI->getStringValue() ); + const OUString baseURIU( i_xBaseURI->getStringValue() ); if (baseURIU.indexOf('#') >= 0) { throw lang::IllegalArgumentException( "librdf_Repository::exportGraph: " "base URI is not absolute", *this, 3); } - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (m_NamedGraphs.find(contextU) == m_NamedGraphs.end()) { throw container::NoSuchElementException( "librdf_Repository::exportGraph: " "no graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -1080,8 +1080,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_Repository::exportGraph: " "librdf_new_node_from_uri_string failed", *this); } - const ::rtl::OString baseURI( - ::rtl::OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) ); + const OString baseURI( + OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pBaseURI( librdf_new_uri(m_pWorld.get(), reinterpret_cast (baseURI.getStr())), @@ -1215,7 +1215,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, // NB: librdf does not have a concept of graphs as such; // a librdf named graph exists iff the model contains a statement with // the graph name as context - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) { throw container::ElementExistException( "librdf_Repository::createGraph: graph with given URI exists", *this); @@ -1282,12 +1282,12 @@ throw (uno::RuntimeException, rdf::RepositoryException) uno::Reference< rdf::XQuerySelectResult > SAL_CALL -librdf_Repository::querySelect(const ::rtl::OUString & i_rQuery) +librdf_Repository::querySelect(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) { ::osl::MutexGuard g(m_aMutex); - const ::rtl::OString query( - ::rtl::OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); + const OString query( + OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pQuery( librdf_new_query(m_pWorld.get(), s_sparql, NULL, reinterpret_cast (query.getStr()), NULL), @@ -1308,7 +1308,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) const int count( librdf_query_results_get_bindings_count(pResults.get()) ); if (count >= 0) { - uno::Sequence< ::rtl::OUString > names(count); + uno::Sequence< OUString > names(count); for (int i = 0; i < count; ++i) { const char* name( librdf_query_results_get_binding_name( pResults.get(), i) ); @@ -1317,7 +1317,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) "librdf_Repository::querySelect: binding is null", *this); } - names[i] = ::rtl::OUString::createFromAscii(name); + names[i] = OUString::createFromAscii(name); } return new librdf_QuerySelectResult(this, m_aMutex, @@ -1331,12 +1331,12 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) } uno::Reference< container::XEnumeration > SAL_CALL -librdf_Repository::queryConstruct(const ::rtl::OUString & i_rQuery) +librdf_Repository::queryConstruct(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) { ::osl::MutexGuard g(m_aMutex); - const ::rtl::OString query( - ::rtl::OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); + const OString query( + OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pQuery( librdf_new_query(m_pWorld.get(), s_sparql, NULL, reinterpret_cast (query.getStr()), NULL), @@ -1368,13 +1368,13 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) } ::sal_Bool SAL_CALL -librdf_Repository::queryAsk(const ::rtl::OUString & i_rQuery) +librdf_Repository::queryAsk(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) { ::osl::MutexGuard g(m_aMutex); - const ::rtl::OString query( - ::rtl::OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); + const OString query( + OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pQuery( librdf_new_query(m_pWorld.get(), s_sparql, NULL, reinterpret_cast (query.getStr()), NULL), @@ -1401,16 +1401,16 @@ void SAL_CALL librdf_Repository::setStatementRDFa( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Sequence< uno::Reference< rdf::XURI > > & i_rPredicates, const uno::Reference< rdf::XMetadatable > & i_xObject, - const ::rtl::OUString & i_rRDFaContent, + const OUString & i_rRDFaContent, const uno::Reference< rdf::XURI > & i_xRDFaDatatype) throw (uno::RuntimeException, lang::IllegalArgumentException, rdf::RepositoryException) { - static const ::rtl::OUString s_cell("com.sun.star.table.Cell"); - static const ::rtl::OUString s_cellprops("com.sun.star.text.CellProperties"); // for writer - static const ::rtl::OUString s_paragraph("com.sun.star.text.Paragraph"); - static const ::rtl::OUString s_bookmark("com.sun.star.text.Bookmark"); - static const ::rtl::OUString s_meta("com.sun.star.text.InContentMetadata"); + static const OUString s_cell("com.sun.star.table.Cell"); + static const OUString s_cellprops("com.sun.star.text.CellProperties"); // for writer + static const OUString s_paragraph("com.sun.star.text.Paragraph"); + static const OUString s_bookmark("com.sun.star.text.Bookmark"); + static const OUString s_meta("com.sun.star.text.InContentMetadata"); if (!i_xSubject.is()) { throw lang::IllegalArgumentException( @@ -1461,11 +1461,11 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_Repository::setStatementRDFa: " "ensureMetadataReference did not", *this); } - ::rtl::OUString const sXmlId(mdref.First + "#" + mdref.Second); + OUString const sXmlId(mdref.First + "#" + mdref.Second); uno::Reference xXmlId; try { xXmlId.set( rdf::URI::create(m_xContext, - ::rtl::OUString::createFromAscii(s_nsOOo) + sXmlId), + OUString::createFromAscii(s_nsOOo) + sXmlId), uno::UNO_QUERY_THROW); } catch (const lang::IllegalArgumentException & iae) { throw lang::WrappedTargetRuntimeException( @@ -1474,7 +1474,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, } ::osl::MutexGuard g(m_aMutex); - ::rtl::OUString const content( (i_rRDFaContent.isEmpty()) + OUString const content( (i_rRDFaContent.isEmpty()) ? xTextRange->getString() : i_rRDFaContent ); uno::Reference xContent; @@ -1522,7 +1522,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, uno::Reference xXmlId; try { xXmlId.set( rdf::URI::create(m_xContext, - ::rtl::OUString::createFromAscii(s_nsOOo) + OUString::createFromAscii(s_nsOOo) + mdref.First + "#" + mdref.Second), uno::UNO_QUERY_THROW); @@ -1549,11 +1549,11 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, if ((mdref.First.isEmpty()) || (mdref.Second.isEmpty())) { return beans::Pair< uno::Sequence, sal_Bool >(); } - ::rtl::OUString const sXmlId(mdref.First + "#" + mdref.Second); + OUString const sXmlId(mdref.First + "#" + mdref.Second); uno::Reference xXmlId; try { xXmlId.set( rdf::URI::create(m_xContext, - ::rtl::OUString::createFromAscii(s_nsOOo) + sXmlId), + OUString::createFromAscii(s_nsOOo) + sXmlId), uno::UNO_QUERY_THROW); } catch (const lang::IllegalArgumentException & iae) { throw lang::WrappedTargetRuntimeException( @@ -1666,15 +1666,15 @@ const NamedGraphMap_t::iterator SAL_CALL librdf_Repository::clearGraph( "librdf_Repository::clearGraph: URI is null", *this, 0); } ::osl::MutexGuard g(m_aMutex); - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); const NamedGraphMap_t::iterator iter( m_NamedGraphs.find(contextU) ); if (!i_Internal && iter == m_NamedGraphs.end()) { throw container::NoSuchElementException( "librdf_Repository::clearGraph: " "no graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -1718,14 +1718,14 @@ void librdf_Repository::addStatementGraph( } ::osl::MutexGuard g(m_aMutex); - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (!i_Internal && (m_NamedGraphs.find(contextU) == m_NamedGraphs.end())) { throw container::NoSuchElementException( "librdf_Repository::addStatement: " "no graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -1778,14 +1778,14 @@ void librdf_Repository::removeStatementsGraph( } ::osl::MutexGuard g(m_aMutex); - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (m_NamedGraphs.find(contextU) == m_NamedGraphs.end()) { throw container::NoSuchElementException( "librdf_Repository::removeStatements: " "no graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -1854,14 +1854,14 @@ librdf_Repository::getStatementsGraph( } ::osl::MutexGuard g(m_aMutex); - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (!i_Internal && (m_NamedGraphs.find(contextU) == m_NamedGraphs.end())) { throw container::NoSuchElementException( "librdf_Repository::getStatements: " "no graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -1961,8 +1961,8 @@ librdf_model *librdf_TypeConverter::createModel( librdf_uri* librdf_TypeConverter::mkURI( librdf_world* i_pWorld, const uno::Reference< rdf::XURI > & i_xURI) const { - const ::rtl::OString uri( - ::rtl::OUStringToOString(i_xURI->getStringValue(), + const OString uri( + OUStringToOString(i_xURI->getStringValue(), RTL_TEXTENCODING_UTF8) ); librdf_uri *pURI( librdf_new_uri(i_pWorld, reinterpret_cast(uri.getStr()))); @@ -1980,8 +1980,8 @@ librdf_node* librdf_TypeConverter::mkResource( librdf_world* i_pWorld, if (!i_xResource.is()) return 0; uno::Reference< rdf::XBlankNode > xBlankNode(i_xResource, uno::UNO_QUERY); if (xBlankNode.is()) { - const ::rtl::OString label( - ::rtl::OUStringToOString(xBlankNode->getStringValue(), + const OString label( + OUStringToOString(xBlankNode->getStringValue(), RTL_TEXTENCODING_UTF8) ); librdf_node *pNode( librdf_new_node_from_blank_identifier(i_pWorld, @@ -1993,8 +1993,8 @@ librdf_node* librdf_TypeConverter::mkResource( librdf_world* i_pWorld, } return pNode; } else { // assumption: everything else is URI - const ::rtl::OString uri( - ::rtl::OUStringToOString(i_xResource->getStringValue(), + const OString uri( + OUStringToOString(i_xResource->getStringValue(), RTL_TEXTENCODING_UTF8) ); librdf_node *pNode( librdf_new_node_from_uri_string(i_pWorld, @@ -2021,11 +2021,11 @@ librdf_node* librdf_TypeConverter::mkNode( librdf_world* i_pWorld, OSL_ENSURE(xLiteral.is(), "mkNode: someone invented a new rdf.XNode and did not tell me"); if (!xLiteral.is()) return 0; - const ::rtl::OString val( - ::rtl::OUStringToOString(xLiteral->getValue(), + const OString val( + OUStringToOString(xLiteral->getValue(), RTL_TEXTENCODING_UTF8) ); - const ::rtl::OString lang( - ::rtl::OUStringToOString(xLiteral->getLanguage(), + const OString lang( + OUStringToOString(xLiteral->getLanguage(), RTL_TEXTENCODING_UTF8) ); const uno::Reference< rdf::XURI > xType(xLiteral->getDatatype()); librdf_node * ret(0); @@ -2102,8 +2102,8 @@ librdf_TypeConverter::convertToXURI(librdf_uri* i_pURI) const "librdf_TypeConverter::convertToXURI: " "librdf_uri_as_string failed", m_rRep); } - ::rtl::OUString uriU( ::rtl::OStringToOUString( - ::rtl::OString(reinterpret_cast(uri)), + OUString uriU( OStringToOUString( + OString(reinterpret_cast(uri)), RTL_TEXTENCODING_UTF8) ); try { return rdf::URI::create(m_xContext, uriU); @@ -2143,8 +2143,8 @@ librdf_TypeConverter::convertToXResource(librdf_node* i_pNode) const "librdf_TypeConverter::convertToXResource: " "blank node has no label", m_rRep); } - ::rtl::OUString labelU( ::rtl::OStringToOUString( - ::rtl::OString(reinterpret_cast(label)), + OUString labelU( OStringToOUString( + OString(reinterpret_cast(label)), RTL_TEXTENCODING_UTF8) ); try { return uno::Reference( @@ -2178,12 +2178,12 @@ librdf_TypeConverter::convertToXNode(librdf_node* i_pNode) const librdf_uri* pType( librdf_node_get_literal_value_datatype_uri(i_pNode) ); OSL_ENSURE(!lang || !pType, "convertToXNode: invalid literal"); - const ::rtl::OUString valueU( ::rtl::OStringToOUString( - ::rtl::OString(reinterpret_cast(value)), + const OUString valueU( OStringToOUString( + OString(reinterpret_cast(value)), RTL_TEXTENCODING_UTF8) ); if (lang) { - const ::rtl::OUString langU( ::rtl::OStringToOUString( - ::rtl::OString(reinterpret_cast(lang)), + const OUString langU( OStringToOUString( + OString(reinterpret_cast(lang)), RTL_TEXTENCODING_UTF8) ); return uno::Reference( rdf::Literal::createWithLanguage(m_xContext, valueU, langU), @@ -2222,13 +2222,13 @@ librdf_TypeConverter::convertToStatement(librdf_statement* i_pStmt, // component helper namespace namespace comp_librdf_Repository { -::rtl::OUString SAL_CALL _getImplementationName() { - return rtl::OUString("librdf_Repository"); +OUString SAL_CALL _getImplementationName() { + return OUString("librdf_Repository"); } -uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > s(1); + uno::Sequence< OUString > s(1); s[0] = "com.sun.star.rdf.Repository"; return s; } diff --git a/unoxml/source/rdf/librdf_repository.hxx b/unoxml/source/rdf/librdf_repository.hxx index 5cfe623b8999..c3effbabaf71 100644 --- a/unoxml/source/rdf/librdf_repository.hxx +++ b/unoxml/source/rdf/librdf_repository.hxx @@ -28,8 +28,8 @@ namespace comp_librdf_Repository { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx index d568446b7d33..bc60fa5bc7bc 100644 --- a/unoxml/source/service/services.cxx +++ b/unoxml/source/service/services.cxx @@ -37,7 +37,6 @@ using namespace ::DOM; using namespace ::DOM::events; using namespace ::XPath; -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; diff --git a/unoxml/source/xpath/nodelist.hxx b/unoxml/source/xpath/nodelist.hxx index 2f800528f26e..3fcdee8aa9f4 100644 --- a/unoxml/source/xpath/nodelist.hxx +++ b/unoxml/source/xpath/nodelist.hxx @@ -35,8 +35,6 @@ #include - -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::xpath; diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index c9d7e64cd709..6a50933e47c5 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -265,7 +265,7 @@ namespace XPath static OUString make_error_message(xmlErrorPtr pError) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (pError->message) { buf.appendAscii(pError->message); } @@ -300,7 +300,7 @@ namespace XPath vsnprintf(str, sizeof(str), format, args); va_end(args); - ::rtl::OUStringBuffer buf( + OUStringBuffer buf( "libxml2 error:\n"); buf.appendAscii(str); OString msg = OUStringToOString(buf.makeStringAndClear(), @@ -311,7 +311,7 @@ namespace XPath static void structured_error_func(void * userData, xmlErrorPtr error) { (void) userData; - ::rtl::OUStringBuffer buf( + OUStringBuffer buf( "libxml2 error:\n"); if (error) { buf.append(make_error_message(error)); diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx index 89d00bd6067d..3e20adbd2e58 100644 --- a/unoxml/source/xpath/xpathapi.hxx +++ b/unoxml/source/xpath/xpathapi.hxx @@ -43,8 +43,6 @@ #include #include - -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::xpath; diff --git a/unoxml/source/xpath/xpathobject.hxx b/unoxml/source/xpath/xpathobject.hxx index f27a2bd23a27..57d181bd92f6 100644 --- a/unoxml/source/xpath/xpathobject.hxx +++ b/unoxml/source/xpath/xpathobject.hxx @@ -34,8 +34,6 @@ #include #include - -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::xpath; diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx index abd32f8fea02..f61831e689b2 100644 --- a/unoxml/test/domtest.cxx +++ b/unoxml/test/domtest.cxx @@ -124,7 +124,7 @@ struct DocumentHandler Element & 0xFFFF, Element & 0xFFFF0000); } - virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const uno::Reference< xml::sax::XFastAttributeList >& Attribs ) throw (xml::sax::SAXException, uno::RuntimeException) + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const uno::Reference< xml::sax::XFastAttributeList >& Attribs ) throw (xml::sax::SAXException, uno::RuntimeException) { } @@ -132,7 +132,7 @@ struct DocumentHandler { } - virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (xml::sax::SAXException, uno::RuntimeException) + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (xml::sax::SAXException, uno::RuntimeException) { } @@ -141,12 +141,12 @@ struct DocumentHandler return this; } - virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const uno::Reference< xml::sax::XFastAttributeList >& Attribs ) throw (xml::sax::SAXException, uno::RuntimeException) + virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const uno::Reference< xml::sax::XFastAttributeList >& Attribs ) throw (xml::sax::SAXException, uno::RuntimeException) { return this; } - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) { } @@ -167,18 +167,18 @@ struct DocumentHandler struct TokenHandler : public ::cppu::WeakImplHelper1< xml::sax::XFastTokenHandler > { - virtual ::sal_Int32 SAL_CALL getToken( const ::rtl::OUString& Identifier ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getToken( const OUString& Identifier ) throw (uno::RuntimeException) { CPPUNIT_ASSERT_MESSAGE( "TokenHandler::getToken() unexpected call", false ); return -1; } - virtual ::rtl::OUString SAL_CALL getIdentifier( ::sal_Int32 Token ) throw (uno::RuntimeException) + virtual OUString SAL_CALL getIdentifier( ::sal_Int32 Token ) throw (uno::RuntimeException) { CPPUNIT_ASSERT_MESSAGE( "TokenHandler::getIdentifier() unexpected call", false ); - return rtl::OUString(); + return OUString(); } virtual ::sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence< ::sal_Int8 >& Identifier ) throw (uno::RuntimeException) @@ -282,7 +282,7 @@ struct SerializerTest : public CppUnit::TestFixture rtl::Reference mxInStream; rtl::Reference mxHandler; rtl::Reference mxTokHandler; - uno::Sequence< beans::Pair< rtl::OUString, sal_Int32 > > maRegisteredNamespaces; + uno::Sequence< beans::Pair< OUString, sal_Int32 > > maRegisteredNamespaces; bool mbUnoInitialized; void setUp() @@ -293,12 +293,12 @@ struct SerializerTest : public CppUnit::TestFixture const char* pArgs( getForwardString() ); CPPUNIT_ASSERT_MESSAGE("Test file parameter", pArgs); - const rtl::OUString sBaseDir=rtl::OUString::createFromAscii(pArgs); + const OUString sBaseDir=OUString::createFromAscii(pArgs); // bootstrap UNO try { - ::rtl::OUString aIniUrl; + OUString aIniUrl; CPPUNIT_ASSERT_MESSAGE( "Converting ini file to URL", osl_getFileURLFromSystemPath( @@ -330,10 +330,10 @@ struct SerializerTest : public CppUnit::TestFixture maRegisteredNamespaces.realloc(2); maRegisteredNamespaces[0] = beans::make_Pair( - rtl::OUString( "urn:oasis:names:tc:opendocument:xmlns:office:1.0" ), + OUString( "urn:oasis:names:tc:opendocument:xmlns:office:1.0" ), xml::sax::FastToken::NAMESPACE); maRegisteredNamespaces[1] = beans::make_Pair( - rtl::OUString( "http://www.w3.org/1999/xlink" ), + OUString( "http://www.w3.org/1999/xlink" ), 2*xml::sax::FastToken::NAMESPACE); } diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index adab1d918a81..76a89243ee00 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -181,7 +181,7 @@ class StringCalculator : public ::cppu::WeakImplHelper1< ::com::sun::star::util: { } - sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& sString ) throw( ::com::sun::star::uno::RuntimeException ) + sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( ::com::sun::star::uno::RuntimeException ) { return (sal_Int32)(m_pDevice->GetTextWidth(String(sString))); } diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 2068ee80b77c..50e4d078b111 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -60,7 +60,7 @@ void executeLoginDialog( Window * pParent, LoginErrorInfo & rInfo, - rtl::OUString const & rRealm) + OUString const & rRealm) SAL_THROW((uno::RuntimeException)) { try @@ -190,7 +190,7 @@ handleAuthenticationRequest_( ucb::AuthenticationRequest const & rRequest, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations, - const rtl::OUString & rURL) + const OUString & rURL) SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionRetry > xRetry; @@ -275,7 +275,7 @@ handleAuthenticationRequest_( && xSupplyAuthentication->canSetUserName()); executeLoginDialog(pParent, aInfo, - rRequest.HasRealm ? rRequest.Realm : rtl::OUString()); + rRequest.HasRealm ? rRequest.Realm : OUString()); switch (aInfo.GetResult()) { case ERRCODE_BUTTON_OK: @@ -327,8 +327,8 @@ handleAuthenticationRequest_( { if (!aPwContainerHelper.addRecord( !rURL.isEmpty() ? rURL : rRequest.ServerName, - rtl::OUString(), // empty u/p -> sys creds - uno::Sequence< rtl::OUString >(), + OUString(), // empty u/p -> sys creds + uno::Sequence< OUString >(), xIH, ePreferredRememberMode == ucb::RememberAuthentication_PERSISTENT)) @@ -342,8 +342,8 @@ handleAuthenticationRequest_( { if (!aPwContainerHelper.addRecord( !rURL.isEmpty() ? rURL : rRequest.ServerName, - rtl::OUString(), // empty u/p -> sys creds - uno::Sequence< rtl::OUString >(), + OUString(), // empty u/p -> sys creds + uno::Sequence< OUString >(), xIH, false /* SESSION */)) { @@ -355,7 +355,7 @@ handleAuthenticationRequest_( // Empty user name can not be valid: else if (aInfo.GetUserName().Len() != 0) { - uno::Sequence< rtl::OUString > + uno::Sequence< OUString > aPassList(aInfo.GetAccount().Len() == 0 ? 1 : 2); aPassList[0] = aInfo.GetPassword(); if (aInfo.GetAccount().Len() != 0) @@ -411,7 +411,7 @@ executeMasterPasswordDialog( task::PasswordRequestMode nMode) SAL_THROW((uno::RuntimeException)) { - rtl::OString aMaster; + OString aMaster; try { SolarMutexGuard aGuard; @@ -423,7 +423,7 @@ executeMasterPasswordDialog( new MasterPasswordCreateDialog(pParent, xManager.get())); rInfo.SetResult(xDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL); - aMaster = rtl::OUStringToOString( + aMaster = OUStringToOString( xDialog->GetMasterPassword(), RTL_TEXTENCODING_UTF8); } else @@ -432,7 +432,7 @@ executeMasterPasswordDialog( new MasterPasswordDialog(pParent, nMode, xManager.get())); rInfo.SetResult(xDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL); - aMaster = rtl::OUStringToOString( + aMaster = OUStringToOString( xDialog->GetMasterPassword(), RTL_TEXTENCODING_UTF8); } } @@ -452,7 +452,7 @@ executeMasterPasswordDialog( 32, 1000); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; for (int i = 0; i < RTL_DIGEST_LENGTH_MD5; ++i) { aBuffer.append(static_cast< sal_Unicode >('a' + (aKey[i] >> 4))); @@ -507,7 +507,7 @@ executePasswordDialog( Window * pParent, LoginErrorInfo & rInfo, task::PasswordRequestMode nMode, - ::rtl::OUString aDocName, + OUString aDocName, bool bMSCryptoMode, bool bIsPasswordToModify, bool bIsSimplePasswordRequest ) @@ -569,7 +569,7 @@ handlePasswordRequest_( task::PasswordRequestMode nMode, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations, - ::rtl::OUString aDocumentName, + OUString aDocumentName, bool bMSCryptoMode, bool bIsPasswordToModify, bool bIsSimplePasswordRequest = false ) @@ -647,7 +647,7 @@ UUIInteractionHelper::handleAuthenticationRequest( m_xContext, aAuthenticationRequest, rRequest->getContinuations(), - rtl::OUString()); + OUString()); return true; } return false; @@ -680,7 +680,7 @@ UUIInteractionHelper::handlePasswordRequest( Window * pParent = getParentProperty(); task::PasswordRequestMode nMode = task::PasswordRequestMode_PASSWORD_ENTER; uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations = rRequest->getContinuations(); - ::rtl::OUString aDocumentName; + OUString aDocumentName; bool bMSCryptoMode = false; bool bIsPasswordToModify = false; @@ -745,7 +745,7 @@ UUIInteractionHelper::handlePasswordRequest( handlePasswordRequest_(getParentProperty(), aPasswordRequest.Mode, rRequest->getContinuations(), - rtl::OUString(), + OUString(), false /* bool bMSCryptoMode */, false /* bool bIsPasswordToModify */, true /* bool bIsSimplePasswordRequest */ ); diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 3827f0af7482..3208d23eba6a 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -44,8 +44,8 @@ sal_uInt16 executeErrorDialog( Window * pParent, task::InteractionClassification eClassification, - rtl::OUString const & rContext, - rtl::OUString const & rMessage, + OUString const & rContext, + OUString const & rMessage, WinBits nButtonMask) SAL_THROW((uno::RuntimeException)) { @@ -132,12 +132,12 @@ void UUIInteractionHelper::handleErrorHandlerRequest( task::InteractionClassification eClassification, ErrCode nErrorCode, - std::vector< rtl::OUString > const & rArguments, + std::vector< OUString > const & rArguments, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, - rtl::OUString & rErrorString) + OUString & rErrorString) SAL_THROW((uno::RuntimeException)) { if (bObtainErrorStringOnly) @@ -147,7 +147,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( return; } - rtl::OUString aMessage; + OUString aMessage; { enum Source { SOURCE_DEFAULT, SOURCE_CNT, SOURCE_SVX, SOURCE_UUI }; static char const * const aManager[4] = { "ofa", "cnt", "svx", "uui" }; @@ -250,7 +250,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( return; //TODO! remove this backwards compatibility? - rtl::OUString aContext(getContextProperty()); + OUString aContext(getContextProperty()); if (aContext.isEmpty() && nErrorCode != 0) { SolarMutexGuard aGuard; diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index dba372861772..d631d0479025 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -47,9 +47,9 @@ namespace { void executeFilterDialog( Window * pParent , - rtl::OUString const & rURL , + OUString const & rURL , uui::FilterNameList const & rFilters, - rtl::OUString & rFilter ) + OUString & rFilter ) SAL_THROW((uno::RuntimeException)) { try @@ -73,7 +73,7 @@ executeFilterDialog( catch (std::bad_alloc const &) { throw uno::RuntimeException( - rtl::OUString("out of memory"), + OUString("out of memory"), uno::Reference< uno::XInterface >()); } } @@ -106,7 +106,7 @@ handleNoSuchFilterRequest_( try { xFilterContainer.set( xContext->getServiceManager()->createInstanceWithContext( - ::rtl::OUString( "com.sun.star.document.FilterFactory"), xContext ), + OUString( "com.sun.star.document.FilterFactory"), xContext ), uno::UNO_QUERY ); } catch ( uno::Exception const & ) @@ -136,7 +136,7 @@ handleNoSuchFilterRequest_( // out by using DocumentService property later! uno::Reference< container::XEnumeration > xFilters = xFilterContainer->createSubSetEnumerationByQuery( - ::rtl::OUString( "_query_all:sort_prop=uiname:iflags=1:eflags=143360")); + OUString( "_query_all:sort_prop=uiname:iflags=1:eflags=143360")); while (xFilters->hasMoreElements()) { try @@ -145,9 +145,9 @@ handleNoSuchFilterRequest_( uui::FilterNamePair aPair; aPair.sInternal = lProps.getUnpackedValueOrDefault( - rtl::OUString("Name"), ::rtl::OUString()); + OUString("Name"), OUString()); aPair.sUI = lProps.getUnpackedValueOrDefault( - rtl::OUString("UIName"), ::rtl::OUString()); + OUString("UIName"), OUString()); if ( (!aPair.sInternal.Len()) || (!aPair.sUI.Len() ) ) { continue; @@ -173,7 +173,7 @@ handleNoSuchFilterRequest_( } // let the user select the right filter - rtl::OUString sSelectedFilter; + OUString sSelectedFilter; executeFilterDialog( pParent, rRequest.URL, lNames, @@ -212,7 +212,7 @@ handleAmbigousFilterRequest_( try { xFilterContainer.set( xContext->getServiceManager()->createInstanceWithContext( - ::rtl::OUString( "com.sun.star.document.FilterFactory"), xContext ), + OUString( "com.sun.star.document.FilterFactory"), xContext ), uno::UNO_QUERY ); } catch ( uno::Exception & ) @@ -239,7 +239,7 @@ handleAmbigousFilterRequest_( { if( lProps[nStep].Name.compareToAscii("UIName") == 0 ) { - ::rtl::OUString sTemp; + OUString sTemp; lProps[nStep].Value >>= sTemp; aPair.sUI = sTemp; aPair.sInternal = rRequest.SelectedFilter; @@ -261,7 +261,7 @@ handleAmbigousFilterRequest_( { if( lProps[nStep].Name.compareToAscii("UIName") == 0 ) { - ::rtl::OUString sTemp; + OUString sTemp; lProps[nStep].Value >>= sTemp; aPair.sUI = sTemp; aPair.sInternal = rRequest.DetectedFilter; @@ -279,7 +279,7 @@ handleAmbigousFilterRequest_( } else { - rtl::OUString sFilter; + OUString sFilter; executeFilterDialog( pParent, rRequest.URL, lNames, @@ -312,7 +312,7 @@ handleFilterOptionsRequest_( try { xFilterCFG.set( xContext->getServiceManager()->createInstanceWithContext( - ::rtl::OUString( "com.sun.star.document.FilterFactory" ), xContext ), + OUString( "com.sun.star.document.FilterFactory" ), xContext ), uno::UNO_QUERY ); } catch ( uno::Exception const & ) @@ -323,12 +323,12 @@ handleFilterOptionsRequest_( { try { - ::rtl::OUString aFilterName; + OUString aFilterName; sal_Int32 nPropCount = rRequest.rProperties.getLength(); for( sal_Int32 ind = 0; ind < nPropCount; ++ind ) { if( rRequest.rProperties[ind].Name.equals( - ::rtl::OUString("FilterName")) ) + OUString("FilterName")) ) { rRequest.rProperties[ind].Value >>= aFilterName; break; @@ -343,9 +343,9 @@ handleFilterOptionsRequest_( nProperty < nPropertyCount; ++nProperty ) if( aProps[nProperty].Name.equals( - ::rtl::OUString("UIComponent")) ) + OUString("UIComponent")) ) { - ::rtl::OUString aServiceName; + OUString aServiceName; aProps[nProperty].Value >>= aServiceName; if( !aServiceName.isEmpty() ) { diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx index 4c1953199d5e..d969e2553592 100644 --- a/uui/source/iahndl-ioexceptions.cxx +++ b/uui/source/iahndl-ioexceptions.cxx @@ -31,8 +31,8 @@ namespace { bool getStringRequestArgument(uno::Sequence< uno::Any > const & rArguments, - rtl::OUString const & rKey, - rtl::OUString * pValue) + OUString const & rKey, + OUString * pValue) SAL_THROW(()) { for (sal_Int32 i = 0; i < rArguments.getLength(); ++i) @@ -40,7 +40,7 @@ getStringRequestArgument(uno::Sequence< uno::Any > const & rArguments, beans::PropertyValue aProperty; if ((rArguments[i] >>= aProperty) && aProperty.Name == rKey) { - rtl::OUString aValue; + OUString aValue; if (aProperty.Value >>= aValue) { if (pValue) @@ -54,7 +54,7 @@ getStringRequestArgument(uno::Sequence< uno::Any > const & rArguments, bool getBoolRequestArgument(uno::Sequence< uno::Any > const & rArguments, - rtl::OUString const & rKey, + OUString const & rKey, bool * pValue) SAL_THROW(()) { @@ -77,7 +77,7 @@ getBoolRequestArgument(uno::Sequence< uno::Any > const & rArguments, bool getResourceNameRequestArgument(uno::Sequence< uno::Any > const & rArguments, - rtl::OUString * pValue) + OUString * pValue) SAL_THROW(()) { if (!getStringRequestArgument(rArguments, "Uri", pValue)) @@ -97,7 +97,7 @@ UUIInteractionHelper::handleInteractiveIOException( uno::Reference< task::XInteractionRequest > const & rRequest, bool bObtainErrorStringOnly, bool & bHasErrorString, - rtl::OUString & rErrorString) + OUString & rErrorString) SAL_THROW((uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); @@ -112,7 +112,7 @@ UUIInteractionHelper::handleInteractiveIOException( aRequestArguments = aAugmentedIoException.Arguments; ErrCode nErrorCode; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; static ErrCode const aErrorCode[ucb::IOErrorCode_WRONG_VERSION + 1][2] = { { ERRCODE_IO_ABORT, ERRCODE_UUI_IO_ABORT }, // ABORT @@ -212,7 +212,7 @@ UUIInteractionHelper::handleInteractiveIOException( case ucb::IOErrorCode_DEVICE_NOT_READY: { - rtl::OUString aArgUri; + OUString aArgUri; if (getResourceNameRequestArgument(aRequestArguments, &aArgUri)) { @@ -236,8 +236,8 @@ UUIInteractionHelper::handleInteractiveIOException( case ucb::IOErrorCode_DIFFERENT_DEVICES: { - rtl::OUString aArgVolume; - rtl::OUString aArgOtherVolume; + OUString aArgVolume; + OUString aArgOtherVolume; if (getStringRequestArgument(aRequestArguments, "Volume", &aArgVolume) && getStringRequestArgument(aRequestArguments, "OtherVolume", &aArgOtherVolume)) @@ -254,11 +254,11 @@ UUIInteractionHelper::handleInteractiveIOException( case ucb::IOErrorCode_NOT_EXISTING: { - rtl::OUString aArgUri; + OUString aArgUri; if (getResourceNameRequestArgument(aRequestArguments, &aArgUri)) { - rtl::OUString aResourceType; + OUString aResourceType; getStringRequestArgument(aRequestArguments, "ResourceType", &aResourceType); nErrorCode = aResourceType == "volume" @@ -275,7 +275,7 @@ UUIInteractionHelper::handleInteractiveIOException( default: { - rtl::OUString aArgUri; + OUString aArgUri; if (getResourceNameRequestArgument(aRequestArguments, &aArgUri)) { diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index cc392512da28..291d3825fed1 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -57,8 +57,8 @@ namespace { void handleLockedDocumentRequest_( Window * pParent, - const ::rtl::OUString& aDocumentURL, - const ::rtl::OUString& aInfo, + const OUString& aDocumentURL, + const OUString& aInfo, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations, sal_uInt16 nMode ) @@ -79,8 +79,8 @@ handleLockedDocumentRequest_( if (!xManager.get()) return; - ::rtl::OUString aMessage; - std::vector< rtl::OUString > aArguments; + OUString aMessage; + std::vector< OUString > aArguments; aArguments.push_back( aDocumentURL ); sal_Int32 nResult = RET_CANCEL; diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index c81aefc4a86e..922d587d62f8 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -61,7 +61,7 @@ getContentPart( const String& _rRawString ) int i = 0; while ( aIDs[i] ) { - String sPartId = rtl::OUString::createFromAscii( aIDs[i++] ); + String sPartId = OUString::createFromAscii( aIDs[i++] ); xub_StrLen nContStart = _rRawString.Search( sPartId ); if ( nContStart != STRING_NOTFOUND ) { @@ -77,10 +77,10 @@ getContentPart( const String& _rRawString ) bool isDomainMatch( - rtl::OUString hostName, uno::Sequence< ::rtl::OUString > certHostNames) + OUString hostName, uno::Sequence< OUString > certHostNames) { for ( int i = 0; i < certHostNames.getLength(); i++){ - ::rtl::OUString element = certHostNames[i]; + OUString element = certHostNames[i]; if (element.isEmpty()) continue; @@ -91,7 +91,7 @@ isDomainMatch( if ( 0 == element.indexOf( '*' ) && hostName.getLength() >= element.getLength() ) { - rtl::OUString cmpStr = element.copy( 1 ); + OUString cmpStr = element.copy( 1 ); if ( hostName.matchIgnoreAsciiCase( cmpStr, hostName.getLength() - cmpStr.getLength()) ) return true; @@ -101,12 +101,12 @@ isDomainMatch( return false; } -rtl::OUString +OUString getLocalizedDatTimeStr( uno::Reference< uno::XComponentContext> const & xContext, util::DateTime const & rDateTime ) { - rtl::OUString aDateTimeStr; + OUString aDateTimeStr; Date aDate( Date::EMPTY ); Time aTime( Time::EMPTY ); @@ -123,7 +123,7 @@ getLocalizedDatTimeStr( pNumberFormatter->GetOutputString( aDate - *pNullDate, nFormat, aTmpStr, &pColor ); - aDateTimeStr = aTmpStr + rtl::OUString(" "); + aDateTimeStr = aTmpStr + OUString(" "); nFormat = pNumberFormatter->GetStandardFormat( NUMBERFORMAT_TIME, eUILang ); pNumberFormatter->GetOutputString( @@ -152,9 +152,9 @@ executeUnknownAuthDialog( xManager.get())); // Get correct resource string - rtl::OUString aMessage; + OUString aMessage; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; aArguments.push_back( getContentPart( rXCert->getSubjectName()) ); if (xManager.get()) @@ -174,7 +174,7 @@ executeUnknownAuthDialog( catch (std::bad_alloc const &) { throw uno::RuntimeException( - rtl::OUString("out of memory"), + OUString("out of memory"), uno::Reference< uno::XInterface >()); } } @@ -185,7 +185,7 @@ executeSSLWarnDialog( uno::Reference< uno::XComponentContext > const & xContext, const uno::Reference< security::XCertificate >& rXCert, sal_Int32 const & failure, - const rtl::OUString & hostName ) + const OUString & hostName ) SAL_THROW((uno::RuntimeException)) { try @@ -200,8 +200,8 @@ executeSSLWarnDialog( xManager.get())); // Get correct resource string - rtl::OUString aMessage_1; - std::vector< rtl::OUString > aArguments_1; + OUString aMessage_1; + std::vector< OUString > aArguments_1; switch( failure ) { @@ -237,7 +237,7 @@ executeSSLWarnDialog( xDialog->setDescription1Text( aMessage_1 ); } - rtl::OUString aTitle; + OUString aTitle; ErrorResource(aResId).getString( ERRCODE_AREA_UUI_UNKNOWNAUTH + failure + TITLE, aTitle); xDialog->SetText( aTitle ); @@ -248,7 +248,7 @@ executeSSLWarnDialog( catch (std::bad_alloc const &) { throw uno::RuntimeException( - rtl::OUString("out of memory"), + OUString("out of memory"), uno::Reference< uno::XInterface >()); } } @@ -286,7 +286,7 @@ handleCertificateValidationRequest_( for (sal_Int32 i = 0 ; i < extensions.getLength(); i++){ uno::Reference< security::XCertificateExtension >element = extensions[i]; - rtl::OString aId ( (const sal_Char *)element->getExtensionId().getArray(), element->getExtensionId().getLength()); + OString aId ( (const sal_Char *)element->getExtensionId().getArray(), element->getExtensionId().getLength()); if (aId.equals(OID_SUBJECT_ALTERNATIVE_NAME)) { uno::Reference< security::XSanExtension > sanExtension ( element, uno::UNO_QUERY ); @@ -295,8 +295,8 @@ handleCertificateValidationRequest_( } } - ::rtl::OUString certHostName = getContentPart( rRequest.Certificate->getSubjectName() ); - uno::Sequence< ::rtl::OUString > certHostNames(altNames.getLength() + 1); + OUString certHostName = getContentPart( rRequest.Certificate->getSubjectName() ); + uno::Sequence< OUString > certHostNames(altNames.getLength() + 1); certHostNames[0] = certHostName; diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 2d6fb19bebc3..77fa9baa2587 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -122,7 +122,7 @@ public: } uno::Reference< task::XInteractionRequest > m_rRequest; bool bHandled; - beans::Optional< rtl::OUString > m_aResult; + beans::Optional< OUString > m_aResult; }; } /* namespace */ @@ -158,7 +158,7 @@ UUIInteractionHelper::handlerequest( UUIInteractionHelper* pUUI = static_cast< UUIInteractionHelper * >(pInteractionHelper); bool bDummy = false; - rtl::OUString aDummy; + OUString aDummy; pHND->bHandled = pUUI->handleRequest_impl(pHND->m_rRequest, false, bDummy, aDummy); pHND->set(); @@ -192,7 +192,7 @@ UUIInteractionHelper::handleRequest( else { bool bDummy = false; - rtl::OUString aDummy; + OUString aDummy; return handleRequest_impl(rRequest, false, bDummy, aDummy); } } @@ -208,13 +208,13 @@ UUIInteractionHelper::getstringfromrequest( return 0; } -beans::Optional< rtl::OUString > +beans::Optional< OUString > UUIInteractionHelper::getStringFromRequest_impl( uno::Reference< task::XInteractionRequest > const & rRequest) SAL_THROW((uno::RuntimeException)) { bool bSuccess = false; - rtl::OUString aMessage; + OUString aMessage; handleRequest_impl(rRequest, true, bSuccess, aMessage); OSL_ENSURE(bSuccess || @@ -223,10 +223,10 @@ UUIInteractionHelper::getStringFromRequest_impl( "Interaction request is a candidate for a string representation." "Please implement!"); - return beans::Optional< rtl::OUString >(bSuccess, aMessage); + return beans::Optional< OUString >(bSuccess, aMessage); } -beans::Optional< rtl::OUString > +beans::Optional< OUString > UUIInteractionHelper::getStringFromRequest( uno::Reference< task::XInteractionRequest > const & rRequest) SAL_THROW((uno::RuntimeException)) @@ -254,10 +254,10 @@ UUIInteractionHelper::getStringFromRequest( return getStringFromRequest_impl(rRequest); } -::rtl::OUString +OUString UUIInteractionHelper::replaceMessageWithArguments( - ::rtl::OUString aMessage, - std::vector< rtl::OUString > const & rArguments ) + OUString aMessage, + std::vector< OUString > const & rArguments ) { for (sal_Int32 i = 0;;) { @@ -271,8 +271,8 @@ UUIInteractionHelper::replaceMessageWithArguments( = aMessage.getStr()[i + RTL_CONSTASCII_LENGTH("$(ARG")]; if (c >= '1' && c <= '2') { - std::vector< rtl::OUString >::size_type nIndex - = static_cast< std::vector< rtl::OUString >::size_type >( + std::vector< OUString >::size_type nIndex + = static_cast< std::vector< OUString >::size_type >( c - '1'); if (nIndex < rArguments.size()) { @@ -338,16 +338,16 @@ UUIInteractionHelper::tryOtherInteractionHandler( namespace { // ................................................................................................................. - static bool lcl_matchesRequest( const Any& i_rRequest, const ::rtl::OUString& i_rTypeName, const ::rtl::OUString& i_rPropagation ) + static bool lcl_matchesRequest( const Any& i_rRequest, const OUString& i_rTypeName, const OUString& i_rPropagation ) { const ::com::sun::star::uno::TypeDescription aTypeDesc( i_rTypeName ); const typelib_TypeDescription* pTypeDesc = aTypeDesc.get(); if ( !pTypeDesc || !pTypeDesc->pWeakRef ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer aMessage; + OStringBuffer aMessage; aMessage.append( "no type found for '" ); - aMessage.append( ::rtl::OUStringToOString( i_rTypeName, RTL_TEXTENCODING_UTF8 ) ); + aMessage.append( OUStringToOString( i_rTypeName, RTL_TEXTENCODING_UTF8 ) ); aMessage.append( "'" ); OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif @@ -364,7 +364,7 @@ namespace } // --------------------------------------------------------------------------------------------------------------------- -bool UUIInteractionHelper::handleCustomRequest( const Reference< XInteractionRequest >& i_rRequest, const ::rtl::OUString& i_rServiceName ) const +bool UUIInteractionHelper::handleCustomRequest( const Reference< XInteractionRequest >& i_rRequest, const OUString& i_rServiceName ) const { try { @@ -407,29 +407,29 @@ bool UUIInteractionHelper::handleTypedHandlerImplementations( Reference< XIntera ) ); // loop through all registered implementations - const Sequence< ::rtl::OUString > aRegisteredHandlers( aConfigRoot.getNodeNames() ); - const ::rtl::OUString* pHandlerName = aRegisteredHandlers.getConstArray(); - const ::rtl::OUString* pHandlersEnd = aRegisteredHandlers.getConstArray() + aRegisteredHandlers.getLength(); + const Sequence< OUString > aRegisteredHandlers( aConfigRoot.getNodeNames() ); + const OUString* pHandlerName = aRegisteredHandlers.getConstArray(); + const OUString* pHandlersEnd = aRegisteredHandlers.getConstArray() + aRegisteredHandlers.getLength(); for ( ; pHandlerName != pHandlersEnd; ++pHandlerName ) { const ::utl::OConfigurationNode aHandlerNode( aConfigRoot.openNode( *pHandlerName ) ); const ::utl::OConfigurationNode aTypesNode( aHandlerNode.openNode( "HandledRequestTypes" ) ); // loop through all the types which the current handler is registered for - const Sequence< ::rtl::OUString > aHandledTypes( aTypesNode.getNodeNames() ); - const ::rtl::OUString* pType = aHandledTypes.getConstArray(); - const ::rtl::OUString* pTypesEnd = aHandledTypes.getConstArray() + aHandledTypes.getLength(); + const Sequence< OUString > aHandledTypes( aTypesNode.getNodeNames() ); + const OUString* pType = aHandledTypes.getConstArray(); + const OUString* pTypesEnd = aHandledTypes.getConstArray() + aHandledTypes.getLength(); for ( ; pType != pTypesEnd; ++pType ) { // the UNO type is the node name ::utl::OConfigurationNode aType( aTypesNode.openNode( *pType ) ); // and there's a child denoting how the responsibility propagates - ::rtl::OUString sPropagation; + OUString sPropagation; OSL_VERIFY( aType.getNodeValue( "Propagation" ) >>= sPropagation ); if ( lcl_matchesRequest( aRequest, *pType, sPropagation ) ) { // retrieve the service/implementation name of the handler - ::rtl::OUString sServiceName; + OUString sServiceName; OSL_VERIFY( aHandlerNode.getNodeValue( "ServiceName" ) >>= sServiceName ); // cache the information who feels responsible for requests of this type m_aTypedCustomHandlers[ aRequest.getValueTypeName() ] = sServiceName; @@ -447,7 +447,7 @@ UUIInteractionHelper::handleRequest_impl( uno::Reference< task::XInteractionRequest > const & rRequest, bool bObtainErrorStringOnly, bool & bHasErrorString, - rtl::OUString & rErrorString) + OUString & rErrorString) SAL_THROW((uno::RuntimeException)) { try @@ -461,16 +461,16 @@ UUIInteractionHelper::handleRequest_impl( if (aAnyRequest >>= aModSizeException ) { ErrCode nErrorCode = ERRCODE_UUI_IO_MODULESIZEEXCEEDED; - std::vector< rtl::OUString > aArguments; - uno::Sequence< rtl::OUString > sModules + std::vector< OUString > aArguments; + uno::Sequence< OUString > sModules = aModSizeException.Names; if ( sModules.getLength() ) { - rtl::OUString aName; + OUString aName; for ( sal_Int32 index=0; index< sModules.getLength(); ++index ) { if ( index ) - aName = aName + rtl::OUString( ',' ) + sModules[index]; + aName = aName + OUString( ',' ) + sModules[index]; else aName = sModules[index]; // 1st name } @@ -490,7 +490,7 @@ UUIInteractionHelper::handleRequest_impl( if (aAnyRequest >>= aNCException) { ErrCode nErrorCode = ERRCODE_UUI_IO_TARGETALREADYEXISTS; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; if( !aNCException.Name.isEmpty() ) { @@ -512,7 +512,7 @@ UUIInteractionHelper::handleRequest_impl( if (aAnyRequest >>= aUORequest) { ErrCode nErrorCode = ERRCODE_UUI_IO_UNSUPPORTEDOVERWRITE; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; uno::Reference< task::XInteractionApprove > xApprove; uno::Reference< task::XInteractionDisapprove > xDisapprove; @@ -541,7 +541,7 @@ UUIInteractionHelper::handleRequest_impl( ucb::InteractiveAppException aAppException; if (aAnyRequest >>= aAppException) { - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; handleErrorHandlerRequest( aAppException.Classification, aAppException.Code, aArguments, @@ -556,7 +556,7 @@ UUIInteractionHelper::handleRequest_impl( if (aAnyRequest >>= aNetworkException) { ErrCode nErrorCode; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; ucb::InteractiveNetworkOffLineException aOffLineException; ucb::InteractiveNetworkResolveNameException aResolveNameException; ucb::InteractiveNetworkConnectException aConnectException; @@ -602,8 +602,8 @@ UUIInteractionHelper::handleRequest_impl( { sal_Int32 nMedium = 0; aWrongMediumException.Medium >>= nMedium; - std::vector< rtl::OUString > aArguments; - aArguments.push_back(rtl::OUString::valueOf(nMedium + 1)); + std::vector< OUString > aArguments; + aArguments.push_back(OUString::valueOf(nMedium + 1)); handleErrorHandlerRequest(aWrongMediumException.Classification, ERRCODE_UUI_WRONGMEDIUM, aArguments, @@ -618,7 +618,7 @@ UUIInteractionHelper::handleRequest_impl( if (aAnyRequest >>= aWrongJavaVersionException) { ErrCode nErrorCode; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; if (aWrongJavaVersionException.DetectedVersion.isEmpty()) if (aWrongJavaVersionException.LowestSupportedVersion.isEmpty()) nErrorCode = ERRCODE_UUI_WRONGJAVA; @@ -656,7 +656,7 @@ UUIInteractionHelper::handleRequest_impl( ? ERRCODE_UUI_CONFIGURATION_BROKENDATA_WITHREMOVE : ERRCODE_UUI_CONFIGURATION_BROKENDATA_NOREMOVE; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; aArguments.push_back(aMergeRecoveryRequest.ErrorLayerId); handleErrorHandlerRequest(task::InteractionClassification_ERROR, @@ -676,11 +676,11 @@ UUIInteractionHelper::handleRequest_impl( { const ErrCode nErrorCode = ERRCODE_UUI_CONFIGURATION_BACKENDMISSING; - rtl::OUString aStratum = aStratumCreationException.StratumData; + OUString aStratum = aStratumCreationException.StratumData; if (aStratum.isEmpty()) aStratum = aStratumCreationException.StratumService; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; aArguments.push_back(aStratum); handleErrorHandlerRequest(task::InteractionClassification_ERROR, @@ -699,7 +699,7 @@ UUIInteractionHelper::handleRequest_impl( const ErrCode nErrorCode = ERRCODE_UUI_INVALID_XFORMS_SUBMISSION_DATA; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; handleErrorHandlerRequest(task::InteractionClassification_QUERY, nErrorCode, @@ -716,7 +716,7 @@ UUIInteractionHelper::handleRequest_impl( { ErrCode nErrorCode = aLLException.SelfOwned ? ERRCODE_UUI_LOCKING_LOCKED_SELF : ERRCODE_UUI_LOCKING_LOCKED; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; aArguments.push_back( aLLException.Url ); handleErrorHandlerRequest( aLLException.Classification, @@ -733,7 +733,7 @@ UUIInteractionHelper::handleRequest_impl( if (aAnyRequest >>= aLNLException) { ErrCode nErrorCode = ERRCODE_UUI_LOCKING_NOT_LOCKED; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; aArguments.push_back( aLNLException.Url ); handleErrorHandlerRequest( aLNLException.Classification, @@ -750,7 +750,7 @@ UUIInteractionHelper::handleRequest_impl( if (aAnyRequest >>= aLLEException) { ErrCode nErrorCode = ERRCODE_UUI_LOCKING_LOCK_EXPIRED; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; aArguments.push_back( aLLEException.Url ); handleErrorHandlerRequest( aLLEException.Classification, @@ -766,7 +766,7 @@ UUIInteractionHelper::handleRequest_impl( document::BrokenPackageRequest aBrokenPackageRequest; if (aAnyRequest >>= aBrokenPackageRequest) { - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; if( !aBrokenPackageRequest.aName.isEmpty() ) aArguments.push_back( aBrokenPackageRequest.aName ); @@ -785,7 +785,7 @@ UUIInteractionHelper::handleRequest_impl( // Sucky special handling for xlsx macro filter warning if ( (sal_uInt32)ERRCODE_SFX_VBASIC_CANTSAVE_STORAGE == (sal_uInt32)aErrorCodeRequest.ErrCode) { - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; handleErrorHandlerRequest( task::InteractionClassification_WARNING, ERRCODE_UUI_IO_WARN_CANTSAVE_MACROS, aArguments, @@ -820,7 +820,7 @@ UUIInteractionHelper::handleRequest_impl( if (aAnyRequest >>= aCannotActivateFactoryException) { ErrCode nErrorCode = ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY; - std::vector< rtl::OUString > aArguments; + std::vector< OUString > aArguments; aArguments.push_back( aCannotActivateFactoryException.Message ); handleErrorHandlerRequest( task::InteractionClassification_ERROR, @@ -941,7 +941,7 @@ UUIInteractionHelper::getInteractionHandlerList( uno::Reference< lang::XMultiServiceFactory > xConfigProv = configuration::theDefaultProvider::get( m_xContext ); - rtl::OUStringBuffer aFullPath; + OUStringBuffer aFullPath; aFullPath.appendAscii( "/org.openoffice.ucb.InteractionHandler/InteractionHandlers" ); @@ -966,8 +966,8 @@ UUIInteractionHelper::getInteractionHandlerList( "config access does not implement XNameAccess"), uno::Reference< uno::XInterface >()); - uno::Sequence< rtl::OUString > aElems = xNameAccess->getElementNames(); - const rtl::OUString* pElems = aElems.getConstArray(); + uno::Sequence< OUString > aElems = xNameAccess->getElementNames(); + const OUString* pElems = aElems.getConstArray(); sal_Int32 nCount = aElems.getLength(); if ( nCount > 0 ) @@ -983,7 +983,7 @@ UUIInteractionHelper::getInteractionHandlerList( // Iterate over children. for ( sal_Int32 n = 0; n < nCount; ++n ) { - rtl::OUStringBuffer aElemBuffer; + OUStringBuffer aElemBuffer; aElemBuffer.appendAscii( "['" ); aElemBuffer.append( pElems[ n ] ); @@ -992,10 +992,10 @@ UUIInteractionHelper::getInteractionHandlerList( InteractionHandlerData aInfo; // Obtain service name. - rtl::OUStringBuffer aKeyBuffer = aElemBuffer; + OUStringBuffer aKeyBuffer = aElemBuffer; aKeyBuffer.appendAscii( "']/ServiceName" ); - rtl::OUString aValue; + OUString aValue; if ( !( xHierNameAccess->getByHierarchicalName( aKeyBuffer.makeStringAndClear() ) >>= aValue ) ) { @@ -1047,7 +1047,7 @@ UUIInteractionHelper::getParentXWindow() const return m_xWindowParam; } -rtl::OUString +OUString UUIInteractionHelper::getContextProperty() SAL_THROW(()) { @@ -1068,8 +1068,8 @@ namespace { sal_uInt16 executeMessageBox( Window * pParent, - rtl::OUString const & rTitle, - rtl::OUString const & rMessage, + OUString const & rTitle, + OUString const & rMessage, WinBits nButtonMask ) SAL_THROW((uno::RuntimeException)) { @@ -1101,9 +1101,9 @@ executeMessageBox( } NameClashResolveDialogResult executeSimpleNameClashResolveDialog( Window *pParent, - rtl::OUString const & rTargetFolderURL, - rtl::OUString const & rClashingName, - rtl::OUString & rProposedNewName, + OUString const & rTargetFolderURL, + OUString const & rClashingName, + OUString & rProposedNewName, bool bAllowOverwrite ) { boost::scoped_ptr< ResMgr > xManager( ResMgr::CreateResMgr( "uui" ) ); @@ -1146,7 +1146,7 @@ UUIInteractionHelper::handleNameClashResolveRequest( "NameClashResolveRequest must contain SupplyName continuation" ); NameClashResolveDialogResult eResult = ABORT; - rtl::OUString aProposedNewName( rRequest.ProposedNewName ); + OUString aProposedNewName( rRequest.ProposedNewName ); eResult = executeSimpleNameClashResolveDialog( getParentProperty(), rRequest.TargetFolderURL, @@ -1182,7 +1182,7 @@ UUIInteractionHelper::handleGenericErrorRequest( task::XInteractionContinuation > > const & rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, - rtl::OUString & rErrorString) + OUString & rErrorString) SAL_THROW((uno::RuntimeException)) { if (bObtainErrorStringOnly) @@ -1243,9 +1243,9 @@ UUIInteractionHelper::handleGenericErrorRequest( void UUIInteractionHelper::handleMacroConfirmRequest( - const ::rtl::OUString& aDocumentURL, + const OUString& aDocumentURL, const uno::Reference< embed::XStorage >& xZipStorage, - const ::rtl::OUString& aDocumentVersion, + const OUString& aDocumentVersion, const uno::Sequence< security::DocumentSignatureInformation > aSignInfo, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations ) @@ -1355,12 +1355,12 @@ UUIInteractionHelper::handleFutureDocumentVersionUpdateRequest( void UUIInteractionHelper::handleBrokenPackageRequest( - std::vector< rtl::OUString > const & rArguments, + std::vector< OUString > const & rArguments, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, - rtl::OUString & rErrorString) + OUString & rErrorString) SAL_THROW((uno::RuntimeException)) { if (bObtainErrorStringOnly) @@ -1387,7 +1387,7 @@ UUIInteractionHelper::handleBrokenPackageRequest( else return; - ::rtl::OUString aMessage; + OUString aMessage; { SolarMutexGuard aGuard; boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); @@ -1452,7 +1452,7 @@ UUIInteractionHelper::handleBrokenPackageRequest( //========================================================================= bool -ErrorResource::getString(ErrCode nErrorCode, rtl::OUString &rString) +ErrorResource::getString(ErrCode nErrorCode, OUString &rString) const SAL_THROW(()) { ResId aResId(static_cast< sal_uInt16 >(nErrorCode & ERRCODE_RES_MASK), diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 8abe1fcb4b20..d1c553df1802 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -70,10 +70,10 @@ struct InteractionHandlerData { /** The UNO service name to use to instanciate the content provider. */ - rtl::OUString ServiceName; + OUString ServiceName; InteractionHandlerData() {}; - InteractionHandlerData(const rtl::OUString & rService) + InteractionHandlerData(const OUString & rService) : ServiceName( rService ){} }; @@ -81,7 +81,7 @@ typedef std::vector< InteractionHandlerData > InteractionHandlerDataList; typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > Continuations; -typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > StringHashMap; +typedef ::boost::unordered_map< OUString, OUString, OUStringHash > StringHashMap; //============================================================================ class UUIInteractionHelper @@ -116,17 +116,17 @@ public: com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); - com::sun::star::beans::Optional< rtl::OUString > + com::sun::star::beans::Optional< OUString > getStringFromRequest( com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); // Helper. - static ::rtl::OUString + static OUString replaceMessageWithArguments( - ::rtl::OUString aMessage, - std::vector< rtl::OUString > const & rArguments ); + OUString aMessage, + std::vector< OUString > const & rArguments ); ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > getORB() const @@ -138,13 +138,13 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest, bool bObtainErrorStringOnly, bool & bHasErrorString, - rtl::OUString & rErrorString) + OUString & rErrorString) SAL_THROW((com::sun::star::uno::RuntimeException)); static long handlerequest(void* pHandleData, void* pInteractionHandler); - com::sun::star::beans::Optional< rtl::OUString > + com::sun::star::beans::Optional< OUString > getStringFromRequest_impl( com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > const & rRequest) @@ -161,7 +161,7 @@ private: getParentXWindow() const SAL_THROW(()); - rtl::OUString + OUString getContextProperty() SAL_THROW(()); @@ -198,7 +198,7 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest, bool bObtainErrorStringOnly, bool & bHasErrorString, - rtl::OUString & rErrorString) + OUString & rErrorString) SAL_THROW((com::sun::star::uno::RuntimeException)); bool @@ -256,14 +256,14 @@ private: handleErrorHandlerRequest( com::sun::star::task::InteractionClassification eClassification, ErrCode nErrorCode, - std::vector< rtl::OUString > const & rArguments, + std::vector< OUString > const & rArguments, com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > const & rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, - rtl::OUString & rErrorString) + OUString & rErrorString) SAL_THROW((com::sun::star::uno::RuntimeException)); void @@ -275,15 +275,15 @@ private: rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, - rtl::OUString & rErrorString) + OUString & rErrorString) SAL_THROW((com::sun::star::uno::RuntimeException)); void handleMacroConfirmRequest( - const ::rtl::OUString& aDocumentURL, + const OUString& aDocumentURL, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xZipStorage, - const ::rtl::OUString& aDocumentVersion, + const OUString& aDocumentVersion, const ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > aSignInfo, @@ -305,14 +305,14 @@ private: void handleBrokenPackageRequest( - std::vector< rtl::OUString > const & rArguments, + std::vector< OUString > const & rArguments, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > const & rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, - rtl::OUString & rErrorString) + OUString & rErrorString) SAL_THROW((::com::sun::star::uno::RuntimeException)); bool handleLockedDocumentRequest( @@ -332,7 +332,7 @@ private: bool handleCustomRequest( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_rRequest, - const ::rtl::OUString& i_rServiceName + const OUString& i_rServiceName ) const; }; @@ -343,7 +343,7 @@ public: inline ~ErrorResource() SAL_THROW(()) { FreeResource(); } - bool getString(ErrCode nErrorCode, rtl::OUString &rString) const + bool getString(ErrCode nErrorCode, OUString &rString) const SAL_THROW(()); }; diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index bb5177e9c103..a6bbb280f7a5 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -38,17 +38,17 @@ UUIInteractionHandler::~UUIInteractionHandler() delete m_pImpl; } -rtl::OUString SAL_CALL UUIInteractionHandler::getImplementationName() +OUString SAL_CALL UUIInteractionHandler::getImplementationName() throw (uno::RuntimeException) { - return rtl::OUString::createFromAscii(m_aImplementationName); + return OUString::createFromAscii(m_aImplementationName); } sal_Bool SAL_CALL -UUIInteractionHandler::supportsService(rtl::OUString const & rServiceName) +UUIInteractionHandler::supportsService(OUString const & rServiceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > + uno::Sequence< OUString > aNames(getSupportedServiceNames_static()); for (sal_Int32 i = 0; i < aNames.getLength(); ++i) if (aNames[i] == rServiceName) @@ -56,7 +56,7 @@ UUIInteractionHandler::supportsService(rtl::OUString const & rServiceName) return false; } -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UUIInteractionHandler::getSupportedServiceNames() throw (uno::RuntimeException) { @@ -76,7 +76,7 @@ UUIInteractionHandler::initialize( // in Parent and Context values; for backwards compatibility, keep support // for a PropertyValue sequence, too: uno::Reference< awt::XWindow > xWindow; - rtl::OUString aContext; + OUString aContext; if (!((rArguments.getLength() == 1 && (rArguments[0] >>= xWindow)) || (rArguments.getLength() == 2 && (rArguments[0] >>= xWindow) && (rArguments[1] >>= aContext)))) diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx index c044fb48091c..a8d759554803 100644 --- a/uui/source/interactionhandler.hxx +++ b/uui/source/interactionhandler.hxx @@ -35,7 +35,7 @@ class UUIInteractionHandler: public: static char const m_aImplementationName[]; - static com::sun::star::uno::Sequence< rtl::OUString > + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(); static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > @@ -59,14 +59,14 @@ private: virtual ~UUIInteractionHandler() SAL_THROW(()); - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & + virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index aa25574c4873..a5d67b921f1f 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -244,8 +244,8 @@ LoginDialog::LoginDialog ( Window* pParent, sal_uInt16 nFlags, - const rtl::OUString& rServer, - const rtl::OUString& rRealm, + const OUString& rServer, + const OUString& rRealm, ResMgr* pResMgr ) : diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 2c3fc64888bd..71d6fbf2fc55 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -73,7 +73,7 @@ class LoginDialog : public ModalDialog public: LoginDialog( Window* pParent, sal_uInt16 nFlags, - const rtl::OUString& rServer, const rtl::OUString &rRealm, + const OUString& rServer, const OUString &rRealm, ResMgr * pResMgr ); virtual ~LoginDialog(); diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx index 444a327c47ec..20c8bad93c03 100644 --- a/uui/source/nameclashdlg.cxx +++ b/uui/source/nameclashdlg.cxx @@ -32,7 +32,7 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn ) if ( &maBtnRename == pBtn ) { nRet = (long) RENAME; - rtl::OUString aNewName = maEDNewName.GetText(); + OUString aNewName = maEDNewName.GetText(); if ( ( aNewName == maNewName ) || aNewName.isEmpty() ) { ErrorBox aError( NULL, WB_OK, maSameName ); @@ -51,9 +51,9 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn ) // ----------------------------------------------------------------------- NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr, - rtl::OUString const & rTargetFolderURL, - rtl::OUString const & rClashingName, - rtl::OUString const & rProposedNewName, + OUString const & rTargetFolderURL, + OUString const & rClashingName, + OUString const & rProposedNewName, bool bAllowOverwrite ) : ModalDialog( pParent, ResId( DLG_SIMPLE_NAME_CLASH, *pResMgr ) ), maFTMessage ( this, ResId( FT_FILE_EXISTS_WARNING, *pResMgr ) ), @@ -82,7 +82,7 @@ NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr, maBtnOverwrite.Hide(); } - rtl::OUString aPath; + OUString aPath; if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( rTargetFolderURL, aPath ) ) aPath = rTargetFolderURL; diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx index ed3588cd8584..362622a8bf35 100644 --- a/uui/source/nameclashdlg.hxx +++ b/uui/source/nameclashdlg.hxx @@ -37,18 +37,18 @@ class NameClashDialog : public ModalDialog PushButton maBtnRename; CancelButton maBtnCancel; HelpButton maBtnHelp; - rtl::OUString maSameName; - rtl::OUString maNewName; + OUString maSameName; + OUString maNewName; DECL_LINK( ButtonHdl_Impl, PushButton * ); public: NameClashDialog( Window* pParent, ResMgr* pResMgr, - rtl::OUString const & rTargetFolderURL, - rtl::OUString const & rClashingName, - rtl::OUString const & rProposedNewName, + OUString const & rTargetFolderURL, + OUString const & rClashingName, + OUString const & rProposedNewName, bool bAllowOverwrite ); - rtl::OUString getNewName() const { return maNewName; } + OUString getNewName() const { return maNewName; } }; #endif // UUI_COOKIEDG_HXX diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx index bbf192d02b18..ffa48d012a12 100644 --- a/uui/source/newerverwarn.cxx +++ b/uui/source/newerverwarn.cxx @@ -44,7 +44,7 @@ namespace uui { NewerVersionWarningDialog::NewerVersionWarningDialog( - Window* pParent, const ::rtl::OUString& rVersion, ResMgr& rResMgr ) : + Window* pParent, const OUString& rVersion, ResMgr& rResMgr ) : ModalDialog( pParent, ResId( RID_DLG_NEWER_VERSION_WARNING, rResMgr ) ), @@ -93,7 +93,7 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl) if ( !sNotifyURL.isEmpty() ) { xSystemShell->execute( - sNotifyURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + sNotifyURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); } } else @@ -127,7 +127,7 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl) xDispatchProvider = uno::Reference < frame::XDispatchProvider > ( xDesktop, uno::UNO_QUERY ); uno::Reference< frame::XDispatch > xDispatch = - xDispatchProvider->queryDispatch( aURL, rtl::OUString(), 0 ); + xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( aURL, uno::Sequence< beans::PropertyValue >() ); } diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx index 77f43be3cb4b..f724ce056687 100644 --- a/uui/source/newerverwarn.hxx +++ b/uui/source/newerverwarn.hxx @@ -36,7 +36,7 @@ namespace uui PushButton m_aUpdateBtn; CancelButton m_aLaterBtn; - ::rtl::OUString m_sVersion; + OUString m_sVersion; DECL_LINK(UpdateHdl, void *); DECL_LINK(LaterHdl, void *); @@ -44,7 +44,7 @@ namespace uui void InitButtonWidth(); public: - NewerVersionWarningDialog( Window* pParent, const ::rtl::OUString& rVersion, ResMgr& rResMgr ); + NewerVersionWarningDialog( Window* pParent, const OUString& rVersion, ResMgr& rResMgr ); ~NewerVersionWarningDialog(); }; } // namespace uui diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index cc3d5894f8fa..1ee48589f9b9 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -119,7 +119,7 @@ bool PasswordContainerHelper::handleAuthenticationRequest( ucb::AuthenticationRequest const & rRequest, uno::Reference< ucb::XInteractionSupplyAuthentication > const & xSupplyAuthentication, - rtl::OUString const & rURL, + OUString const & rURL, uno::Reference< task::XInteractionHandler2 > const & xIH ) SAL_THROW((uno::RuntimeException)) { @@ -143,7 +143,7 @@ bool PasswordContainerHelper::handleAuthenticationRequest( { // Runtime / Persistent info avail for current auth request? - rtl::OUString aResult = m_xPasswordContainer->findUrl( + OUString aResult = m_xPasswordContainer->findUrl( rURL.isEmpty() ? rRequest.ServerName : rURL ); if ( !aResult.isEmpty() ) { @@ -222,9 +222,9 @@ bool PasswordContainerHelper::handleAuthenticationRequest( //========================================================================= bool PasswordContainerHelper::addRecord( - rtl::OUString const & rURL, - rtl::OUString const & rUsername, - uno::Sequence< rtl::OUString > const & rPasswords, + OUString const & rURL, + OUString const & rUsername, + uno::Sequence< OUString > const & rPasswords, uno::Reference< task::XInteractionHandler2 > const & xIH, bool bPersist ) SAL_THROW((uno::RuntimeException)) @@ -294,7 +294,7 @@ PasswordContainerInteractionHandler::~PasswordContainerInteractionHandler() //========================================================================= // virtual -::rtl::OUString SAL_CALL +OUString SAL_CALL PasswordContainerInteractionHandler::getImplementationName() throw ( uno::RuntimeException ) { @@ -305,11 +305,11 @@ PasswordContainerInteractionHandler::getImplementationName() // virtual sal_Bool SAL_CALL PasswordContainerInteractionHandler::supportsService( - const ::rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString * pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for ( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) { if ( pArray[ i ] == ServiceName ) @@ -320,7 +320,7 @@ PasswordContainerInteractionHandler::supportsService( //========================================================================= // virtual -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL PasswordContainerInteractionHandler::getSupportedServiceNames() throw ( uno::RuntimeException ) { @@ -376,7 +376,7 @@ PasswordContainerInteractionHandler::handleInteractionRequest( if ( !( aAnyRequest >>= aAuthenticationRequest ) ) return false; - rtl::OUString aURL; + OUString aURL; ucb::URLAuthenticationRequest aURLAuthenticationRequest; if ( aAnyRequest >>= aURLAuthenticationRequest ) aURL = aURLAuthenticationRequest.URL; diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx index 03bdc56aacdb..ee410e9e8daa 100644 --- a/uui/source/passwordcontainer.hxx +++ b/uui/source/passwordcontainer.hxx @@ -88,7 +88,7 @@ public: com::sun::star::uno::Reference< com::sun::star::ucb::XInteractionSupplyAuthentication > const & xSupplyAuthentication, - rtl::OUString const & rURL, + OUString const & rURL, com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler2 > const & xIH ) SAL_THROW( (com::sun::star::uno::RuntimeException) ); @@ -120,9 +120,9 @@ public: False, otherwise. */ - bool addRecord( rtl::OUString const & rURL, - rtl::OUString const & rUsername, - com::sun::star::uno::Sequence< rtl::OUString > const & + bool addRecord( OUString const & rURL, + OUString const & rUsername, + com::sun::star::uno::Sequence< OUString > const & rPasswords, com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler2 > const & xIH, @@ -149,14 +149,14 @@ public: virtual ~PasswordContainerInteractionHandler(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( com::sun::star::uno::RuntimeException ); @@ -172,10 +172,10 @@ public: throw (::com::sun::star::uno::RuntimeException); // Non-UNO interfaces - static rtl::OUString + static OUString getImplementationName_Static(); - static com::sun::star::uno::Sequence< rtl::OUString > + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); static com::sun::star::uno::Reference< diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 1ebc8b58d627..74b12981e7dd 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -42,7 +42,7 @@ PasswordDialog::PasswordDialog( Window* _pParent, task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, - rtl::OUString& aDocURL, + OUString& aDocURL, bool bOpenToModify, bool bIsSimplePasswordRequest ) @@ -64,13 +64,13 @@ PasswordDialog::PasswordDialog( { const sal_uInt16 nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG; const sal_uInt16 nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId; - rtl::OUString aErrorMsg(ResId(nErrStrId, *pResourceMgr).toString()); + OUString aErrorMsg(ResId(nErrStrId, *pResourceMgr).toString()); ErrorBox aErrorBox( GetParent(), WB_OK, aErrorMsg ); aErrorBox.Execute(); } // default settings for enter password or reenter passwd... - rtl::OUString aTitle(ResId(STR_TITLE_ENTER_PASSWORD, *pResourceMgr).toString()); + OUString aTitle(ResId(STR_TITLE_ENTER_PASSWORD, *pResourceMgr).toString()); aFTConfirmPassword.Hide(); aEDConfirmPassword.Hide(); aFTConfirmPassword.Enable( sal_False ); diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index 6187d39a8997..5646016e8ecd 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -47,7 +47,7 @@ class PasswordDialog : public ModalDialog DECL_LINK(OKHdl_Impl, void *); public: - PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL, + PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, OUString& aDocURL, bool bOpenToModify = false, bool bIsSimplePasswordRequest = false ); void SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; } diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx index ea00c4d785d7..77642f4bc957 100644 --- a/uui/source/requeststringresolver.cxx +++ b/uui/source/requeststringresolver.cxx @@ -36,19 +36,19 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver() delete m_pImpl; } -rtl::OUString SAL_CALL +OUString SAL_CALL UUIInteractionRequestStringResolver::getImplementationName() throw (star::uno::RuntimeException) { - return rtl::OUString::createFromAscii(m_aImplementationName); + return OUString::createFromAscii(m_aImplementationName); } sal_Bool SAL_CALL UUIInteractionRequestStringResolver::supportsService( - rtl::OUString const & rServiceName) + OUString const & rServiceName) throw (star::uno::RuntimeException) { - star::uno::Sequence< rtl::OUString > + star::uno::Sequence< OUString > aNames(getSupportedServiceNames_static()); for (sal_Int32 i = 0; i < aNames.getLength(); ++i) if (aNames[i] == rServiceName) @@ -56,14 +56,14 @@ UUIInteractionRequestStringResolver::supportsService( return false; } -star::uno::Sequence< rtl::OUString > SAL_CALL +star::uno::Sequence< OUString > SAL_CALL UUIInteractionRequestStringResolver::getSupportedServiceNames() throw (star::uno::RuntimeException) { return getSupportedServiceNames_static(); } -star::beans::Optional< rtl::OUString > SAL_CALL +star::beans::Optional< OUString > SAL_CALL UUIInteractionRequestStringResolver::getStringFromInformationalRequest( const star::uno::Reference< star::task::XInteractionRequest >& Request ) diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx index a476c560f0ac..377d2c0b5934 100644 --- a/uui/source/requeststringresolver.hxx +++ b/uui/source/requeststringresolver.hxx @@ -35,7 +35,7 @@ class UUIInteractionRequestStringResolver: public: static char const m_aImplementationName[]; - static com::sun::star::uno::Sequence< rtl::OUString > + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(); static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > @@ -60,18 +60,18 @@ private: virtual ~UUIInteractionRequestStringResolver() SAL_THROW(()); - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & + virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::beans::Optional< rtl::OUString > SAL_CALL + virtual com::sun::star::beans::Optional< OUString > SAL_CALL getStringFromInformationalRequest( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& Request ) diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 8ad4e22f632c..aeaf423be667 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -324,7 +324,7 @@ void MacroWarning::FitControls() } void MacroWarning::SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStore, - const ::rtl::OUString& aODFVersion, + const OUString& aODFVersion, const css::uno::Sequence< security::DocumentSignatureInformation >& rInfos ) { mxStore = rxStore; @@ -333,7 +333,7 @@ void MacroWarning::SetStorage( const css::uno::Reference < css::embed::XStorage if( mxStore.is() && nCnt > 0 ) { mpInfos = &rInfos; - rtl::OUString aCN_Id("CN"); + OUString aCN_Id("CN"); String s; s = GetContentPart( rInfos[ 0 ].Signer->getSubjectName(), aCN_Id ); @@ -353,7 +353,7 @@ void MacroWarning::SetCertificate( const css::uno::Reference< css::security::XCe mxCert = _rxCert; if( mxCert.is() ) { - rtl::OUString aCN_Id("CN"); + OUString aCN_Id("CN"); String s; s = GetContentPart( mxCert->getSubjectName(), aCN_Id ); maSignsFI.SetText( s ); diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index b10a2bfb24b4..cd6a0cd79cbe 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -43,7 +43,7 @@ private: cssu::Reference< css::security::XCertificate > mxCert; cssu::Reference< css::embed::XStorage > mxStore; - ::rtl::OUString maODFVersion; + OUString maODFVersion; const cssu::Sequence< css::security::DocumentSignatureInformation >* mpInfos; FixedImage maSymbolImg; @@ -80,7 +80,7 @@ public: void SetDocumentURL( const String& rDocURL ); void SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore, - const ::rtl::OUString& aODFVersion, + const OUString& aODFVersion, const cssu::Sequence< css::security::DocumentSignatureInformation >& _rInfos ); void SetCertificate( const cssu::Reference< css::security::XCertificate >& _rxCert ); }; diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 4001c6c66cb4..4c9145b44f19 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; -using ::rtl::OUString; extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uui_component_getFactory(sal_Char const * pImplName, diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index 43363ca1f863..f5e5a122541d 100644 --- a/uui/source/sslwarndlg.hxx +++ b/uui/source/sslwarndlg.hxx @@ -61,7 +61,7 @@ private: Window* getParent() { return m_pParent; }; - void setDescription1Text( const rtl::OUString &aText ) { m_aLabel1.SetText( aText ); }; + void setDescription1Text( const OUString &aText ) { m_aLabel1.SetText( aText ); }; }; #endif // UUI_SSLWARN_HXX diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 46a08e78ac48..90d50edc7389 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -63,7 +63,7 @@ private: Window* getParent() { return m_pParent; }; - void setDescriptionText( const rtl::OUString &aText ) { m_aLabel1.SetText( aText ); }; + void setDescriptionText( const OUString &aText ) { m_aLabel1.SetText( aText ); }; }; diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx index b56d3f3360ea..11bbff2426a9 100644 --- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx +++ b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx @@ -45,7 +45,7 @@ namespace ooo VBAHELPER_DLLPRIVATE inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::Exception) { OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" ); - ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); + OUString sVarName( OUString::createFromAscii( _pAsciiName ) ); css::uno::Reference< css::uno::XInterface > xIf = getVBAServiceFactory( pShell )->createInstanceWithArguments( sVarName, aArgs ); return xIf; } diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx index d9900bb504d4..c63bce52c263 100644 --- a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx +++ b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx @@ -49,20 +49,20 @@ public: virtual void SAL_CALL setInteractive( ::sal_Bool bInteractive ) throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); virtual void SAL_CALL setVisible( ::sal_Bool bVisible ) throw (css::uno::RuntimeException); - virtual void SAL_CALL OnKey( const ::rtl::OUString& Key, const ::com::sun::star::uno::Any& Procedure ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL OnKey( const OUString& Key, const ::com::sun::star::uno::Any& Procedure ) throw (::com::sun::star::uno::RuntimeException); virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getVersion() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getVersion() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getVBE() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Run( const ::rtl::OUString& MacroName, const css::uno::Any& varg1, const css::uno::Any& varg2, const css::uno::Any& varg3, const css::uno::Any& varg4, const css::uno::Any& varg5, const css::uno::Any& varg6, const css::uno::Any& varg7, const css::uno::Any& varg8, const css::uno::Any& varg9, const css::uno::Any& varg10, const css::uno::Any& varg11, const css::uno::Any& varg12, const css::uno::Any& varg13, const css::uno::Any& varg14, const css::uno::Any& varg15, const css::uno::Any& varg16, const css::uno::Any& varg17, const css::uno::Any& varg18, const css::uno::Any& varg19, const css::uno::Any& varg20, const css::uno::Any& varg21, const css::uno::Any& varg22, const css::uno::Any& varg23, const css::uno::Any& varg24, const css::uno::Any& varg25, const css::uno::Any& varg26, const css::uno::Any& varg27, const css::uno::Any& varg28, const css::uno::Any& varg29, const css::uno::Any& varg30 ) throw (css::uno::RuntimeException); - virtual void SAL_CALL OnTime( const css::uno::Any& aEarliestTime, const ::rtl::OUString& aFunction, const css::uno::Any& aLatestTime, const css::uno::Any& aSchedule ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Run( const OUString& MacroName, const css::uno::Any& varg1, const css::uno::Any& varg2, const css::uno::Any& varg3, const css::uno::Any& varg4, const css::uno::Any& varg5, const css::uno::Any& varg6, const css::uno::Any& varg7, const css::uno::Any& varg8, const css::uno::Any& varg9, const css::uno::Any& varg10, const css::uno::Any& varg11, const css::uno::Any& varg12, const css::uno::Any& varg13, const css::uno::Any& varg14, const css::uno::Any& varg15, const css::uno::Any& varg16, const css::uno::Any& varg17, const css::uno::Any& varg18, const css::uno::Any& varg19, const css::uno::Any& varg20, const css::uno::Any& varg21, const css::uno::Any& varg22, const css::uno::Any& varg23, const css::uno::Any& varg24, const css::uno::Any& varg25, const css::uno::Any& varg26, const css::uno::Any& varg27, const css::uno::Any& varg28, const css::uno::Any& varg29, const css::uno::Any& varg30 ) throw (css::uno::RuntimeException); + virtual void SAL_CALL OnTime( const css::uno::Any& aEarliestTime, const OUString& aFunction, const css::uno::Any& aLatestTime, const css::uno::Any& aSchedule ) throw (css::uno::RuntimeException); virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException); virtual void SAL_CALL Undo() throw (css::uno::RuntimeException); virtual void SAL_CALL Quit() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx index aa963e0f5c18..780741e06a62 100644 --- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx +++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx @@ -177,16 +177,16 @@ public: virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException) { return Ifc1::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException) { return ( mXNamedVec.size() > 0 ); } // XNameAcess - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException) + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException) { if ( !hasByName(aName) ) throw css::container::NoSuchElementException(); return css::uno::makeAny( *cachePos ); } - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException) + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > sNames( mXNamedVec.size() ); - rtl::OUString* pString = sNames.getArray(); + css::uno::Sequence< OUString > sNames( mXNamedVec.size() ); + OUString* pString = sNames.getArray(); typename XNamedVec::iterator it = mXNamedVec.begin(); typename XNamedVec::iterator it_end = mXNamedVec.end(); @@ -197,7 +197,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException) { cachePos = mXNamedVec.begin(); typename XNamedVec::iterator it_end = mXNamedVec.end(); @@ -237,17 +237,17 @@ protected: css::uno::Reference< css::container::XNameAccess > m_xNameAccess; sal_Bool mbIgnoreCase; - virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException) + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException) { if ( !m_xNameAccess.is() ) - throw css::uno::RuntimeException( rtl::OUString( "ScVbaCollectionBase string index access not supported by this object" ), css::uno::Reference< css::uno::XInterface >() ); + throw css::uno::RuntimeException( OUString( "ScVbaCollectionBase string index access not supported by this object" ), css::uno::Reference< css::uno::XInterface >() ); if( mbIgnoreCase ) { - css::uno::Sequence< rtl::OUString > sElementNames = m_xNameAccess->getElementNames(); + css::uno::Sequence< OUString > sElementNames = m_xNameAccess->getElementNames(); for( sal_Int32 i = 0; i < sElementNames.getLength(); i++ ) { - rtl::OUString aName = sElementNames[i]; + OUString aName = sElementNames[i]; if( aName.equalsIgnoreAsciiCase( sIndex ) ) { return createCollectionObject( m_xNameAccess->getByName( aName ) ); @@ -260,11 +260,11 @@ protected: virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) { if ( !m_xIndexAccess.is() ) - throw css::uno::RuntimeException( rtl::OUString( "ScVbaCollectionBase numeric index access not supported by this object" ), css::uno::Reference< css::uno::XInterface >() ); + throw css::uno::RuntimeException( OUString( "ScVbaCollectionBase numeric index access not supported by this object" ), css::uno::Reference< css::uno::XInterface >() ); if ( nIndex <= 0 ) { throw css::lang::IndexOutOfBoundsException( - ::rtl::OUString( "index is 0 or negative" ), + OUString( "index is 0 or negative" ), css::uno::Reference< css::uno::XInterface >() ); } // need to adjust for vba index ( for which first element is 1 ) @@ -294,22 +294,22 @@ public: if ( ( Index1 >>= nIndex ) != sal_True ) { - rtl::OUString message; - message = rtl::OUString( "Couldn't convert index to Int32"); + OUString message; + message = OUString( "Couldn't convert index to Int32"); throw css::lang::IndexOutOfBoundsException( message, css::uno::Reference< css::uno::XInterface >() ); } return getItemByIntIndex( nIndex ); } - rtl::OUString aStringSheet; + OUString aStringSheet; Index1 >>= aStringSheet; return getItemByStringIndex( aStringSheet ); } // XDefaultMethod - ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException) + OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException) { - const static rtl::OUString sName( "Item" ); + const static OUString sName( "Item" ); return sName; } // XEnumerationAccess diff --git a/vbahelper/inc/vbahelper/vbadialogbase.hxx b/vbahelper/inc/vbahelper/vbadialogbase.hxx index b196c6bc3371..bb706cbaf17a 100644 --- a/vbahelper/inc/vbahelper/vbadialogbase.hxx +++ b/vbahelper/inc/vbahelper/vbadialogbase.hxx @@ -37,7 +37,7 @@ public: // Methods virtual void SAL_CALL Show() throw (css::uno::RuntimeException); - virtual rtl::OUString mapIndexToName( sal_Int32 nIndex ) = 0; + virtual OUString mapIndexToName( sal_Int32 nIndex ) = 0; }; #endif /* VBA_DIALOG_BASE_HXX */ diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/vbahelper/inc/vbahelper/vbadocumentbase.hxx index 642c08c4ae8e..77e799078a97 100644 --- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx +++ b/vbahelper/inc/vbahelper/vbadocumentbase.hxx @@ -39,9 +39,9 @@ public: virtual ~VbaDocumentBase() {} // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFullName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getFullName() throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException); virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getVBProject() throw (css::uno::RuntimeException); @@ -56,8 +56,8 @@ public: virtual void SAL_CALL Activate() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif /* VBA_DOCUMENTBASE_HXX */ diff --git a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx index 5f6bc26036ef..b8386d6e291e 100644 --- a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx +++ b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx @@ -52,7 +52,7 @@ public: protected: css::uno::Any createDocument() throw (css::uno::RuntimeException); void closeDocuments() throw (css::uno::RuntimeException); - css::uno::Any openDocument( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException); + css::uno::Any openDocument( const OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException); }; #endif /* SC_VBA_WORKBOOKS_HXX */ diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx index 43a58443661b..627970f9f623 100644 --- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx +++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx @@ -83,7 +83,7 @@ protected: { sal_Int32 mnEventId; sal_Int32 mnModuleType; - ::rtl::OUString maMacroName; + OUString maMacroName; sal_Int32 mnCancelIndex; css::uno::Any maUserData; }; @@ -133,12 +133,12 @@ protected: bool bCancel ) throw (css::uno::RuntimeException) = 0; /** Derived classes have to return the name of the Basic document module. */ - virtual ::rtl::OUString implGetDocumentModuleName( + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) = 0; private: - typedef ::std::map< sal_Int32, ::rtl::OUString > ModulePathMap; + typedef ::std::map< sal_Int32, OUString > ModulePathMap; /** Starts listening at the document model. */ void startListening(); @@ -149,7 +149,7 @@ private: const EventHandlerInfo& getEventHandlerInfo( sal_Int32 nEventId ) const throw (css::lang::IllegalArgumentException); /** Searches the event handler in the document and returns its full script path. */ - ::rtl::OUString getEventHandlerPath( + OUString getEventHandlerPath( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); @@ -157,10 +157,10 @@ private: void ensureVBALibrary() throw (css::uno::RuntimeException); /** Returns the type of the Basic module with the specified name. */ - sal_Int32 getModuleType( const ::rtl::OUString& rModuleName ) throw (css::uno::RuntimeException); + sal_Int32 getModuleType( const OUString& rModuleName ) throw (css::uno::RuntimeException); /** Updates the map containing paths to event handlers for a Basic module. */ - ModulePathMap& updateModulePathMap( const ::rtl::OUString& rModuleName ) throw (css::uno::RuntimeException); + ModulePathMap& updateModulePathMap( const OUString& rModuleName ) throw (css::uno::RuntimeException); protected: css::uno::Reference< css::frame::XModel > mxModel; @@ -168,12 +168,12 @@ protected: private: typedef ::std::map< sal_Int32, EventHandlerInfo > EventHandlerInfoMap; - typedef boost::unordered_map< ::rtl::OUString, ModulePathMap, ::rtl::OUStringHash > EventHandlerPathMap; + typedef boost::unordered_map< OUString, ModulePathMap, OUStringHash > EventHandlerPathMap; EventHandlerInfoMap maEventInfos; EventHandlerPathMap maEventPaths; css::uno::Reference< css::script::vba::XVBAModuleInfo > mxModuleInfos; - ::rtl::OUString maLibraryName; + OUString maLibraryName; bool mbDisposed; }; diff --git a/vbahelper/inc/vbahelper/vbaglobalbase.hxx b/vbahelper/inc/vbahelper/vbaglobalbase.hxx index 7ddcd5f53eea..4c30a26c95c0 100644 --- a/vbahelper/inc/vbahelper/vbaglobalbase.hxx +++ b/vbahelper/inc/vbahelper/vbaglobalbase.hxx @@ -26,19 +26,19 @@ typedef InheritedHelperInterfaceImpl1< ov::XGlobalsBase > Globals_BASE; class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE { protected: - rtl::OUString msDocCtxName; - rtl::OUString msApplication; + OUString msDocCtxName; + OUString msApplication; - bool hasServiceName( const rtl::OUString& serviceName ); + bool hasServiceName( const OUString& serviceName ); void init( const css::uno::Sequence< css::beans::PropertyValue >& aInitArgs ); public: - VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sDocCtxName ); + VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString& sDocCtxName ); virtual ~VbaGlobalsBase(); // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); }; #endif diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx index f6b1d5e9ec96..be5d73906c53 100644 --- a/vbahelper/inc/vbahelper/vbahelper.hxx +++ b/vbahelper/inc/vbahelper/vbahelper.hxx @@ -62,7 +62,7 @@ namespace ooo VBAHELPER_DLLPUBLIC css::uno::Reference< XHelperInterface > getUnoDocModule( const String& aModName, SfxObjectShell* pShell ); VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException); - css::uno::Reference< css::frame::XModel > getCurrentDoc( const rtl::OUString& sKey ) throw (css::uno::RuntimeException); + css::uno::Reference< css::frame::XModel > getCurrentDoc( const OUString& sKey ) throw (css::uno::RuntimeException); VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getThisExcelDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getThisWordDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentExcelDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); @@ -71,8 +71,8 @@ namespace ooo VBAHELPER_DLLPUBLIC css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException); VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); - VBAHELPER_DLLPUBLIC void dispatchRequests( const css::uno::Reference< css::frame::XModel>& xModel, const rtl::OUString& aUrl ); - VBAHELPER_DLLPUBLIC void dispatchRequests (const css::uno::Reference< css::frame::XModel>& xModel, const rtl::OUString & aUrl, const css::uno::Sequence< css::beans::PropertyValue >& sProps ); + VBAHELPER_DLLPUBLIC void dispatchRequests( const css::uno::Reference< css::frame::XModel>& xModel, const OUString& aUrl ); + VBAHELPER_DLLPUBLIC void dispatchRequests (const css::uno::Reference< css::frame::XModel>& xModel, const OUString & aUrl, const css::uno::Sequence< css::beans::PropertyValue >& sProps ); VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, sal_uInt16 nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON ); VBAHELPER_DLLPUBLIC sal_Int32 OORGBToXLRGB( sal_Int32 ); VBAHELPER_DLLPUBLIC sal_Int32 XLRGBToOORGB( sal_Int32 ); @@ -92,13 +92,13 @@ namespace ooo /** Extracts a string from the passed Any, which may contain a Boolean, a value, or a string. Throws, if the Any is empty or contains an incompatible type. */ - VBAHELPER_DLLPUBLIC ::rtl::OUString extractStringFromAny( const css::uno::Any& rAny, bool bUppercaseBool = false ) throw (css::uno::RuntimeException); + VBAHELPER_DLLPUBLIC OUString extractStringFromAny( const css::uno::Any& rAny, bool bUppercaseBool = false ) throw (css::uno::RuntimeException); /** Extracts a string from the passed Any, which may contain a Boolean, a value, or a string. Returns rDefault, if rAny is empty. Throws, if the Any contains an incompatible type. */ - VBAHELPER_DLLPUBLIC ::rtl::OUString extractStringFromAny( const css::uno::Any& rAny, const ::rtl::OUString& rDefault, bool bUppercaseBool = false ) throw (css::uno::RuntimeException); + VBAHELPER_DLLPUBLIC OUString extractStringFromAny( const css::uno::Any& rAny, const OUString& rDefault, bool bUppercaseBool = false ) throw (css::uno::RuntimeException); - VBAHELPER_DLLPUBLIC rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException ); - VBAHELPER_DLLPUBLIC rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic ) + VBAHELPER_DLLPUBLIC OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException ); + VBAHELPER_DLLPUBLIC OUString VBAToRegexp(const OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic ) VBAHELPER_DLLPUBLIC double getPixelTo100thMillimeterConversionFactor( const css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical); VBAHELPER_DLLPUBLIC double PointsToPixels( const css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical); VBAHELPER_DLLPUBLIC double PixelsToPoints( const css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical); @@ -107,9 +107,9 @@ namespace ooo VBAHELPER_DLLPUBLIC sal_Int32 getPointerStyle( const css::uno::Reference< css::frame::XModel >& ); VBAHELPER_DLLPUBLIC void setCursorHelper( const css::uno::Reference< css::frame::XModel >& xModel, const Pointer& rPointer, sal_Bool bOverWrite ); VBAHELPER_DLLPUBLIC void setDefaultPropByIntrospection( const css::uno::Any& aObj, const css::uno::Any& aValue ) throw ( css::uno::RuntimeException ); - VBAHELPER_DLLPUBLIC css::uno::Any getPropertyValue( const css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName ); - VBAHELPER_DLLPUBLIC sal_Bool setPropertyValue( css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName, const css::uno::Any& aValue ); - VBAHELPER_DLLPUBLIC void setOrAppendPropertyValue( css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName, const css::uno::Any& aValue ); + VBAHELPER_DLLPUBLIC css::uno::Any getPropertyValue( const css::uno::Sequence< css::beans::PropertyValue >& aProp, const OUString& aName ); + VBAHELPER_DLLPUBLIC sal_Bool setPropertyValue( css::uno::Sequence< css::beans::PropertyValue >& aProp, const OUString& aName, const css::uno::Any& aValue ); + VBAHELPER_DLLPUBLIC void setOrAppendPropertyValue( css::uno::Sequence< css::beans::PropertyValue >& aProp, const OUString& aName, const css::uno::Any& aValue ); class VBAHELPER_DLLPUBLIC Millimeter { @@ -229,19 +229,19 @@ class VBAHELPER_DLLPUBLIC ContainerUtilities { public: - static rtl::OUString getUniqueName( const css::uno::Sequence< ::rtl::OUString >& _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator); - static rtl::OUString getUniqueName( const css::uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix ); + static OUString getUniqueName( const css::uno::Sequence< OUString >& _slist, const OUString& _sElementName, const OUString& _sSuffixSeparator); + static OUString getUniqueName( const css::uno::Sequence< OUString >& _slist, const OUString _sElementName, const OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix ); - static sal_Int32 FieldInList( const css::uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString ); + static sal_Int32 FieldInList( const css::uno::Sequence< OUString >& SearchList, const OUString& SearchString ); }; // really just a a place holder to ease the porting pain class VBAHELPER_DLLPUBLIC DebugHelper { public: - static void exception( const rtl::OUString& DetailedMessage, const css::uno::Exception& ex, int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException ); + static void exception( const OUString& DetailedMessage, const css::uno::Exception& ex, int err, const OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException ); - static void exception( int err, const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException ); + static void exception( int err, const OUString& additionalArgument ) throw( css::script::BasicErrorException ); static void exception( const css::uno::Exception& ex ) throw( css::script::BasicErrorException ); }; diff --git a/vbahelper/inc/vbahelper/vbapropvalue.hxx b/vbahelper/inc/vbahelper/vbapropvalue.hxx index 71ade35048ea..816f93f8c445 100644 --- a/vbahelper/inc/vbahelper/vbapropvalue.hxx +++ b/vbahelper/inc/vbahelper/vbapropvalue.hxx @@ -46,7 +46,7 @@ public: virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return OUString("Value"); } }; #endif //SC_VBA_PROPVALULE_HXX diff --git a/vbahelper/inc/vbahelper/vbashape.hxx b/vbahelper/inc/vbahelper/vbashape.hxx index 423807229ef3..58e4f2865545 100644 --- a/vbahelper/inc/vbahelper/vbashape.hxx +++ b/vbahelper/inc/vbahelper/vbashape.hxx @@ -49,8 +49,8 @@ protected: virtual void addListeners(); virtual void removeShapeListener() throw( css::uno::RuntimeException ); virtual void removeShapesListener() throw( css::uno::RuntimeException ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); public: ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nType ) throw ( css::lang::IllegalArgumentException ); virtual ~ScVbaShape(); @@ -60,8 +60,8 @@ public: static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException); // Attributes - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException); virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException); virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException); virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException); diff --git a/vbahelper/inc/vbahelper/vbashaperange.hxx b/vbahelper/inc/vbahelper/vbashaperange.hxx index f31c9e243b26..e1a447ee3dbf 100644 --- a/vbahelper/inc/vbahelper/vbashaperange.hxx +++ b/vbahelper/inc/vbahelper/vbashaperange.hxx @@ -35,8 +35,8 @@ private: css::uno::Reference< css::drawing::XShapes > m_xShapes; protected: css::uno::Reference< css::frame::XModel > m_xModel; - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); css::uno::Reference< css::drawing::XShapes > getShapes() throw (css::uno::RuntimeException) ; public: ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XDrawPage>& xDrawShape, const css::uno::Reference< css::frame::XModel >& xModel ); @@ -47,8 +47,8 @@ public: virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException); virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException) ; virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException); virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException); virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException); virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException); diff --git a/vbahelper/inc/vbahelper/vbashapes.hxx b/vbahelper/inc/vbahelper/vbashapes.hxx index fc145f11f471..4c4b7c3e5a49 100644 --- a/vbahelper/inc/vbahelper/vbashapes.hxx +++ b/vbahelper/inc/vbahelper/vbashapes.hxx @@ -39,21 +39,21 @@ private: void initBaseCollection(); protected: css::uno::Reference< css::frame::XModel > m_xModel; - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); virtual css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException); - css::uno::Reference< css::drawing::XShape > createShape( rtl::OUString service ) throw (css::uno::RuntimeException); + css::uno::Reference< css::drawing::XShape > createShape( OUString service ) throw (css::uno::RuntimeException); css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException); css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException); css::uno::Any AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException); - rtl::OUString createName( rtl::OUString sName ); + OUString createName( OUString sName ); //TODO helperapi using a writer document //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument ); public: ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); static void setDefaultShapeProperties( css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException); - static void setShape_NameProperty( css::uno::Reference< css::drawing::XShape > xShape, rtl::OUString sName ); + static void setShape_NameProperty( css::uno::Reference< css::drawing::XShape > xShape, OUString sName ); //XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); diff --git a/vbahelper/inc/vbahelper/vbatextframe.hxx b/vbahelper/inc/vbahelper/vbatextframe.hxx index 97936e5eab2f..d8f44e32c826 100644 --- a/vbahelper/inc/vbahelper/vbatextframe.hxx +++ b/vbahelper/inc/vbahelper/vbatextframe.hxx @@ -31,11 +31,11 @@ protected: css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; protected: - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); virtual void setAsMSObehavior(); - sal_Int32 getMargin( rtl::OUString sMarginType ); - void setMargin( rtl::OUString sMarginType, float fMargin ); + sal_Int32 getMargin( OUString sMarginType ); + void setMargin( OUString sMarginType, float fMargin ); public: VbaTextFrame( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext , css::uno::Reference< css::drawing::XShape > xShape); virtual ~VbaTextFrame() {} diff --git a/vbahelper/inc/vbahelper/vbawindowbase.hxx b/vbahelper/inc/vbahelper/vbawindowbase.hxx index 53dfdfad7371..33ef793eecd8 100644 --- a/vbahelper/inc/vbahelper/vbawindowbase.hxx +++ b/vbahelper/inc/vbahelper/vbawindowbase.hxx @@ -54,8 +54,8 @@ public: virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException) ; // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); protected: css::uno::Reference< css::frame::XController > getController() throw (css::uno::RuntimeException); diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx index de7aa1a7c846..30f72379380b 100644 --- a/vbahelper/source/msforms/vbacombobox.cxx +++ b/vbahelper/source/msforms/vbacombobox.cxx @@ -120,7 +120,7 @@ void SAL_CALL ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) { // booleans are converted to uppercase strings - m_xProps->setPropertyValue( sSourceName, uno::Any( extractStringFromAny( _value, ::rtl::OUString(), true ) ) ); + m_xProps->setPropertyValue( sSourceName, uno::Any( extractStringFromAny( _value, OUString(), true ) ) ); } // see Value @@ -277,12 +277,12 @@ void SAL_CALL ScVbaComboBox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeEx ScVbaControl::setLocked( bLocked ); } -rtl::OUString SAL_CALL ScVbaComboBox::getLinkedCell() throw (uno::RuntimeException) +OUString SAL_CALL ScVbaComboBox::getLinkedCell() throw (uno::RuntimeException) { return ScVbaControl::getControlSource(); } -void SAL_CALL ScVbaComboBox::setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException) { ScVbaControl::setControlSource( _linkedcell ); } diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx index 06adc9df929a..c9959614be6c 100644 --- a/vbahelper/source/msforms/vbacombobox.hxx +++ b/vbahelper/source/msforms/vbacombobox.hxx @@ -69,8 +69,8 @@ public: virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException); virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException); + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (css::uno::RuntimeException); // Methods virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException); diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index cb66c476d880..90840918dcb5 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -488,7 +488,7 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex ) } catch (const uno::Exception&) { - // throw lang::WrappedTargetException( ::rtl::OUString( "Can not create AXControl!" ), + // throw lang::WrappedTargetException( OUString( "Can not create AXControl!" ), // uno::Reference< uno::XInterface >(), // uno::makeAny( e ) ); } diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx index 5007992f9629..9ea4058d54d4 100644 --- a/vbahelper/source/msforms/vbatextbox.hxx +++ b/vbahelper/source/msforms/vbatextbox.hxx @@ -33,8 +33,8 @@ public: // Attributes virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException); virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException); @@ -53,10 +53,10 @@ public: virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); // XDefaultProperty - rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } //XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence getServiceNames(); }; #endif //SC_VBA_TEXTBOX_HXX diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx index 7496d2b9af9a..b2dcc6695122 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.cxx +++ b/vbahelper/source/vbahelper/vbacolorformat.cxx @@ -66,7 +66,7 @@ ScVbaColorFormat::getRGB() throw (uno::RuntimeException) break; case ColorFormatType::LINEFORMAT_BACKCOLOR: //TODO BackColor not supported - // m_xPropertySet->setPropertyValue( rtl::OUString("Color"), uno::makeAny( nRGB ) ); + // m_xPropertySet->setPropertyValue( OUString("Color"), uno::makeAny( nRGB ) ); break; case ColorFormatType::FILLFORMAT_FORECOLOR: m_xPropertySet->getPropertyValue( "FillColor" ) >>= nRGB; diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 36abda68207d..e06e40c213fd 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -273,7 +273,7 @@ void VbaDocumentsBase::closeDocuments() throw (uno::RuntimeException) uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); - rtl::OUString url = rtl::OUString( ".uno:CloseDoc"); + OUString url = OUString( ".uno:CloseDoc"); dispatchRequests(xModel,url); */ } diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 4b2440d579ff..57d16c081e62 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -415,7 +415,7 @@ ScVbaShapes::setDefaultShapeProperties( uno::Reference< drawing::XShape > xShape xPropertySet->setPropertyValue( "FillColor", uno::makeAny( sal_Int32(0xFFFFFF) ) ); xPropertySet->setPropertyValue( "TextWordWrap", uno::makeAny( text::WrapTextMode_THROUGHT ) ); //not find in OOo2.3 - //xPropertySet->setPropertyValue( rtl::OUString("Opaque"), uno::makeAny( sal_True ) ); + //xPropertySet->setPropertyValue( OUString("Opaque"), uno::makeAny( sal_True ) ); } void diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index e67dc8f9d0f5..cd0390b146c1 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -230,9 +230,9 @@ class AndroidSalSystem : public SvpSalSystem { public: AndroidSalSystem() : SvpSalSystem() {} virtual ~AndroidSalSystem() {} - virtual int ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual int ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ); }; @@ -277,7 +277,7 @@ public: // Clobber the UI fonts #if 0 psp::FastPrintFontInfo aInfo; - aInfo.m_aFamilyName = rtl::OUString( "Roboto" ); + aInfo.m_aFamilyName = OUString( "Roboto" ); aInfo.m_eItalic = ITALIC_NORMAL; aInfo.m_eWeight = WEIGHT_NORMAL; aInfo.m_eWidth = WIDTH_NORMAL; @@ -285,7 +285,7 @@ public: #endif // FIXME: is 14 point enough ? - Font aFont( rtl::OUString( "Roboto" ), Size( 0, 14 ) ); + Font aFont( OUString( "Roboto" ), Size( 0, 14 ) ); StyleSettings aStyleSet = rSettings.GetStyleSettings(); aStyleSet.SetAppFont( aFont ); @@ -320,15 +320,15 @@ void InitSalData() {} void DeInitSalData() {} void InitSalMain() {} -void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore ) +void SalAbort( const OUString& rErrorText, bool bDumpCore ) { - rtl::OUString aError( rErrorText ); + OUString aError( rErrorText ); if( aError.isEmpty() ) - aError = rtl::OUString::createFromAscii("Unknown application error"); - LOGI("%s", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); + aError = OUString::createFromAscii("Unknown application error"); + LOGI("%s", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); LOGI("SalAbort: '%s'", - rtl::OUStringToOString(aError, RTL_TEXTENCODING_ASCII_US).getStr()); + OUStringToOString(aError, RTL_TEXTENCODING_ASCII_US).getStr()); if( bDumpCore ) abort(); else @@ -337,7 +337,7 @@ void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore ) const OUString& SalGetDesktopEnvironment() { - static rtl::OUString aEnv( "android" ); + static OUString aEnv( "android" ); return aEnv; } @@ -370,18 +370,18 @@ void DestroySalInstance( SalInstance *pInst ) #include -int AndroidSalSystem::ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, +int AndroidSalSystem::ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ) { (void)rButtons; (void)nDefButton; LOGI("LibreOffice native dialog '%s': '%s'", - rtl::OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(), - rtl::OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr()); + OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr()); LOGI("Dialog '%s': '%s'", - rtl::OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(), - rtl::OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr()); + OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr()); if (AndroidSalInstance::getInstance() != NULL) { diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 0c104009ea75..5a3ad3304768 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -120,12 +120,12 @@ NSMenu* AquaSalInstance::GetDynamicDockMenu() return pDockMenu; } -bool AquaSalInstance::isOnCommandLine( const rtl::OUString& rArg ) +bool AquaSalInstance::isOnCommandLine( const OUString& rArg ) { sal_uInt32 nArgs = osl_getCommandArgCount(); for( sal_uInt32 i = 0; i < nArgs; i++ ) { - rtl::OUString aArg; + OUString aArg; osl_getCommandArg( i, &aArg.pData ); if( aArg.equals( rArg ) ) return true; @@ -217,10 +217,10 @@ sal_Bool ImplSVMainHook( int * pnInit ) { [NSApp postEvent: pEvent atStart: NO]; - rtl::OUString aExeURL, aExe; + OUString aExeURL, aExe; osl_getExecutableFile( &aExeURL.pData ); osl_getSystemPathFromFileURL( aExeURL.pData, &aExe.pData ); - rtl::OString aByteExe( rtl::OUStringToOString( aExe, osl_getThreadTextEncoding() ) ); + OString aByteExe( OUStringToOString( aExe, osl_getThreadTextEncoding() ) ); #ifdef DEBUG aByteExe += OString ( " NSAccessibilityDebugLogLevel 1" ); @@ -241,13 +241,13 @@ sal_Bool ImplSVMainHook( int * pnInit ) // ======================================================================= -void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore ) +void SalAbort( const OUString& rErrorText, bool bDumpCore ) { if( rErrorText.isEmpty() ) fprintf( stderr, "Application Error " ); else fprintf( stderr, "%s ", - rtl::OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() ); + OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() ); if( bDumpCore ) abort(); else @@ -264,7 +264,7 @@ void InitSalData() // ----------------------------------------------------------------------- -const ::rtl::OUString& SalGetDesktopEnvironment() +const OUString& SalGetDesktopEnvironment() { static OUString aDesktopEnvironment( "MacOSX" ); return aDesktopEnvironment; @@ -923,7 +923,7 @@ void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) // ----------------------------------------------------------------------- -rtl::OUString AquaSalInstance::GetDefaultPrinter() +OUString AquaSalInstance::GetDefaultPrinter() { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); @@ -1013,7 +1013,7 @@ void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rRetur // We need to re-encode file urls because osl_getFileURLFromSystemPath converts // to UTF-8 before encoding non ascii characters, which is not what other apps expect. -static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) +static OUString translateToExternalUrl(const OUString& internalUrl) { uno::Reference< uno::XComponentContext > context( comphelper::getProcessComponentContext()); @@ -1023,7 +1023,7 @@ static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl) // #i104525# many versions of OSX have problems with some URLs: // when an app requests OSX to add one of these URLs to the "Recent Items" list // then this app gets killed (TextEdit, Preview, etc. and also OOo) -static bool isDangerousUrl( const rtl::OUString& rUrl ) +static bool isDangerousUrl( const OUString& rUrl ) { // use a heuristic that detects all known cases since there is no official comment // on the exact impact and root cause of the OSX bug @@ -1051,10 +1051,10 @@ static bool isDangerousUrl( const rtl::OUString& rUrl ) return false; } -void AquaSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/) +void AquaSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& /*rMimeType*/) { // Convert file URL for external use (see above) - rtl::OUString externalUrl = translateToExternalUrl(rFileUrl); + OUString externalUrl = translateToExternalUrl(rFileUrl); if( externalUrl.isEmpty() ) externalUrl = rFileUrl; diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index e849f013cbee..9886ecdf35b9 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -29,7 +29,6 @@ #include "svids.hrc" -using ::rtl::OUString; // ======================================================================= @@ -81,7 +80,7 @@ Rectangle AquaSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScr return aRet; } -rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen ) +OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen ) { NSArray* pScreens = [NSScreen screens]; OUString aRet; @@ -100,7 +99,7 @@ rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen ) static NSString* getStandardString( int nButtonId, bool bUseResources ) { - rtl::OUString aText; + OUString aText; if( bUseResources ) { aText = Button::GetStandardText( nButtonId ); @@ -109,19 +108,19 @@ static NSString* getStandardString( int nButtonId, bool bUseResources ) { switch( nButtonId ) { - case BUTTON_OK: aText = rtl::OUString( "OK" );break; - case BUTTON_ABORT: aText = rtl::OUString( "Abort" );break; - case BUTTON_CANCEL: aText = rtl::OUString( "Cancel" );break; - case BUTTON_RETRY: aText = rtl::OUString( "Retry" );break; - case BUTTON_YES: aText = rtl::OUString( "Yes" );break; - case BUTTON_NO : aText = rtl::OUString( "No" );break; + case BUTTON_OK: aText = OUString( "OK" );break; + case BUTTON_ABORT: aText = OUString( "Abort" );break; + case BUTTON_CANCEL: aText = OUString( "Cancel" );break; + case BUTTON_RETRY: aText = OUString( "Retry" );break; + case BUTTON_YES: aText = OUString( "Yes" );break; + case BUTTON_NO : aText = OUString( "No" );break; } } return aText.isEmpty() ? nil : CreateNSString( aText); } -int AquaSalSystem::ShowNativeMessageBox( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, +int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle, + const OUString& rMessage, int nButtonCombination, int nDefaultButton, bool bUseResources) { diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx index b030ac8e0fb1..7b5787149844 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx @@ -44,9 +44,6 @@ using namespace com::sun::star::lang; using namespace cppu; using namespace std; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; namespace // private { @@ -681,7 +678,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* systemFlavor return dp; } -bool DataFlavorMapper::isValidMimeContentType(const rtl::OUString& contentType) const +bool DataFlavorMapper::isValidMimeContentType(const OUString& contentType) const { bool result = true; diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx index 7ef36401c3ca..ed78689c426c 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx @@ -126,11 +126,11 @@ public: private: /* Determines if the provided Mime content type is valid. */ - bool isValidMimeContentType(const rtl::OUString& contentType) const; + bool isValidMimeContentType(const OUString& contentType) const; private: ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory; - typedef boost::unordered_map< rtl::OUString, NSString*, rtl::OUStringHash > OfficeOnlyTypes; + typedef boost::unordered_map< OUString, NSString*, OUStringHash > OfficeOnlyTypes; mutable OfficeOnlyTypes maOfficeOnlyTypes; }; diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx index 36b6a9fca71c..f2e6081be9ec 100644 --- a/vcl/aqua/source/dtrans/DragSource.cxx +++ b/vcl/aqua/source/dtrans/DragSource.cxx @@ -51,7 +51,6 @@ using namespace com::sun::star::lang; using namespace comphelper; using namespace std; -using ::rtl::OUString; // For OOo internal D&D we provide the Transferable without NSDragPboard // interference as a shortcut diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx index 5ca8ffc68aeb..2932a83e7cef 100644 --- a/vcl/aqua/source/dtrans/DragSource.hxx +++ b/vcl/aqua/source/dtrans/DragSource.hxx @@ -101,9 +101,9 @@ public: throw(com::sun::star::uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); virtual void saveMouseEvent(NSEvent* theEvent); virtual unsigned int getSupportedDragOperations(bool isLocal) const; diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index 1eeebc520186..6c359cc93430 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star; using namespace comphelper; -using ::rtl::OUString; OUString dropTarget_getImplementationName() { diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx index d2050eca5b4f..988943873e6c 100644 --- a/vcl/aqua/source/dtrans/DropTarget.hxx +++ b/vcl/aqua/source/dtrans/DropTarget.hxx @@ -118,9 +118,9 @@ public: virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); // NSDraggingDestination protocol functions virtual NSDragOperation draggingEntered(id sender); diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx index 5d541972f82b..c71bfc452b01 100644 --- a/vcl/aqua/source/dtrans/OSXTransferable.cxx +++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::container; -using ::rtl::OUString; namespace // private { diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index 0db1318695de..383c7488aa2f 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -36,7 +36,6 @@ using namespace osl; using namespace std; using namespace comphelper; -using ::rtl::OUString; @implementation EventListener; diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx index a12a3ec20f5e..2e7670588ede 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.hxx @@ -97,7 +97,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException ); //------------------------------------------------ @@ -127,13 +127,13 @@ public: // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); /* Get a reference to the used pastboard. diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx index ad62d0115355..06bf683afcb1 100644 --- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx +++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx @@ -236,7 +236,7 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs ) ByteCount nDummy; ATSUGetAttribute( mrATSUStyle, kATSUSizeTag, sizeof(fFontSize), &fFontSize, &nDummy); String aUniName( &rArgs.mpStr[rArgs.mnMinCharPos], mnCharCount ); - rtl::OString aCName(rtl::OUStringToOString(aUniName, RTL_TEXTENCODING_UTF8)); + OString aCName(OUStringToOString(aUniName, RTL_TEXTENCODING_UTF8)); fprintf( stderr, "ATSLayout( \"%s\" %d..%d of %d) with h=%4.1f\n", aCName.getStr(),rArgs.mnMinCharPos,rArgs.mnEndCharPos,rArgs.mnLength,Fix2X(fFontSize) ); #endif diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx index 1dae840c79b1..0c0f58023c94 100644 --- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx +++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx @@ -40,7 +40,7 @@ // and SFNT fonts on Mac usually do not contain an OS/2 table. static void UpdateAttributesFromPSName( const String& rPSName, ImplDevFontAttributes& rDFA ) { - rtl::OString aPSName( rtl::OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() ); + OString aPSName( OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() ); // TODO: use a multi-string ignore-case matcher once it becomes available if( (aPSName.indexOf("regular") != -1) diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx index 02e86b1da5a1..f4518f9fb461 100644 --- a/vcl/aqua/source/gdi/atsui/salgdi.cxx +++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx @@ -470,13 +470,13 @@ static bool AddLocalTempFontDirs( void ) // add private font files - rtl::OUString aBrandStr( "$BRAND_BASE_DIR" ); + OUString aBrandStr( "$BRAND_BASE_DIR" ); rtl_bootstrap_expandMacros( &aBrandStr.pData ); - rtl::OUString aBrandSysPath; + OUString aBrandSysPath; OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, &aBrandSysPath.pData ) == osl_File_E_None ); - rtl::OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 ); - aBrandFontDir.append( rtl::OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) ); + OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 ); + aBrandFontDir.append( OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) ); aBrandFontDir.append( "/share/fonts/truetype/" ); return AddTempFontDir( aBrandFontDir.getStr() ); } @@ -513,14 +513,14 @@ void AquaSalGraphics::ClearDevFontCache() // ----------------------------------------------------------------------- bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*, - const rtl::OUString& rFontFileURL, const rtl::OUString& /*rFontName*/ ) + const OUString& rFontFileURL, const OUString& /*rFontName*/ ) { - ::rtl::OUString aUSytemPath; + OUString aUSytemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) ); FSRef aNewRef; Boolean bIsDirectory = true; - ::rtl::OString aCFileName = rtl::OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 ); + OString aCFileName = OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 ); OSStatus eStatus = FSPathMakeRef( (UInt8*)aCFileName.getStr(), &aNewRef, &bIsDirectory ); DBG_ASSERT( (eStatus==noErr) && !bIsDirectory, "vcl AddTempDevFont() with invalid fontfile name!" ); if( eStatus != noErr ) @@ -774,11 +774,11 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac #if OSL_DEBUG_LEVEL > 3 fprintf( stderr, "SetFont to (\"%s\", \"%s\", fontid=%d) for (\"%s\" \"%s\" weight=%d, slant=%d size=%dx%d orientation=%d)\n", - ::rtl::OUStringToOString( pMacFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), - ::rtl::OUStringToOString( pMacFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( pMacFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( pMacFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(), (int)nFontID, - ::rtl::OUStringToOString( pReqFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), - ::rtl::OUStringToOString( pReqFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( pReqFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( pReqFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(), pReqFont->GetWeight(), pReqFont->GetSlant(), pReqFont->mnHeight, diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx index 5b78f3394f64..afedd3b9a339 100644 --- a/vcl/aqua/source/gdi/salgdicommon.cxx +++ b/vcl/aqua/source/gdi/salgdicommon.cxx @@ -136,7 +136,7 @@ static void AddPolyPolygonToPath( CGMutablePathRef xPath, } } -sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, +sal_Bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFontData, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, sal_Int32* pGlyphWidths, int nGlyphCount, @@ -145,11 +145,11 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, // TODO: move more of the functionality here into the generic subsetter code // prepare the requested file name for writing the font-subset file - rtl::OUString aSysPath; + OUString aSysPath; if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) ) return sal_False; const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding(); - const rtl::OString aToFile( rtl::OUStringToOString( aSysPath, aThreadEncoding ) ); + const OString aToFile( OUStringToOString( aSysPath, aThreadEncoding ) ); // get the raw-bytes from the font to be subset ByteVector aBuffer; diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx index a2586ac22cc3..8e2ef02b3bac 100644 --- a/vcl/aqua/source/gdi/salnativewidgets.cxx +++ b/vcl/aqua/source/gdi/salnativewidgets.cxx @@ -461,7 +461,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& ) + const OUString& ) { sal_Bool bOK = sal_False; @@ -1168,7 +1168,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType, * aCaption: A caption or title string (like button text etc) */ sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState /*nState*/, - const ImplControlValue& aValue, const rtl::OUString&, + const ImplControlValue& aValue, const OUString&, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index d32c6d943b0d..6b61398a87b5 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -44,8 +44,6 @@ using namespace vcl; using namespace com::sun::star; using namespace com::sun::star::beans; -using ::rtl::OUString; -using ::rtl::OStringToOUString; // ======================================================================= @@ -225,7 +223,7 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio if( pPaper ) { - NSString* pPaperName = [CreateNSString( rtl::OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease]; + NSString* pPaperName = [CreateNSString( OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease]; [mpPrintInfo setPaperName: pPaperName]; } else if( i_nWidth > 0 && i_nHeight > 0 ) @@ -286,9 +284,9 @@ sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* ) // ----------------------------------------------------------------------- -rtl::OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) +OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) { - return rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------- @@ -376,9 +374,9 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag return aPageSize; } -sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, - const rtl::OUString& i_rJobName, - const rtl::OUString& /*i_rAppName*/, +sal_Bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, + const OUString& i_rJobName, + const OUString& /*i_rAppName*/, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) @@ -401,7 +399,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, // do we want a progress panel ? sal_Bool bShowProgressPanel = sal_True; - beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( "MonitorVisible" ) ); + beans::PropertyValue* pMonitor = i_rController.getValue( OUString( "MonitorVisible" ) ); if( pMonitor ) pMonitor->Value >>= bShowProgressPanel; if( ! i_rController.isShowDialogs() ) @@ -409,7 +407,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, // possibly create one job for collated output sal_Bool bSinglePrintJobs = sal_False; - beans::PropertyValue* pSingleValue = i_rController.getValue( rtl::OUString( "PrintCollateAsSingleJobs" ) ); + beans::PropertyValue* pSingleValue = i_rController.getValue( OUString( "PrintCollateAsSingleJobs" ) ); if( pSingleValue ) { pSingleValue->Value >>= bSinglePrintJobs; @@ -621,9 +619,9 @@ AquaSalPrinter::~AquaSalPrinter() // ----------------------------------------------------------------------- -sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* i_pFileName, - const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, +sal_Bool AquaSalPrinter::StartJob( const OUString* i_pFileName, + const OUString& i_rJobName, + const OUString& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) { @@ -632,9 +630,9 @@ sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* i_pFileName, // ----------------------------------------------------------------------- -sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* /*i_pFileName*/, - const rtl::OUString& /*i_rJobName*/, - const rtl::OUString& /*i_rAppName*/, +sal_Bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/, + const OUString& /*i_rJobName*/, + const OUString& /*i_rAppName*/, sal_uLong /*i_nCopies*/, bool /*i_bCollate*/, bool /*i_bDirect*/, @@ -696,7 +694,7 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* ) { NSString* pPaper = [pPaperNames objectAtIndex: i]; // first try to match the name - rtl::OString aPaperName( [pPaper UTF8String] ); + OString aPaperName( [pPaper UTF8String] ); Paper ePaper = PaperInfo::fromPSName( aPaperName ); if( ePaper != PAPER_USER ) { diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 1d03c30d95eb..608e9d891305 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -308,7 +308,7 @@ sal_Bool AquaSalFrame::PostEvent( void *pData ) } // ----------------------------------------------------------------------- -void AquaSalFrame::SetTitle(const rtl::OUString& rTitle) +void AquaSalFrame::SetTitle(const OUString& rTitle) { if ( !mpWindow ) return; @@ -352,14 +352,14 @@ void AquaSalFrame::SetIcon( sal_uInt16 ) // ----------------------------------------------------------------------- -void AquaSalFrame::SetRepresentedURL( const rtl::OUString& i_rDocURL ) +void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL ) { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); if( i_rDocURL.indexOfAsciiL( "file:", 5 ) == 0 ) { - rtl::OUString aSysPath; + OUString aSysPath; osl_getSystemPathFromFileURL( i_rDocURL.pData, &aSysPath.pData ); NSString* pStr = CreateNSString( aSysPath ); if( pStr ) @@ -728,7 +728,7 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen) } } -void AquaSalFrame::SetApplicationID( const rtl::OUString &/*rApplicationID*/ ) +void AquaSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ ) { } @@ -1054,74 +1054,74 @@ void AquaSalFrame::EndExtTextInput( sal_uInt16 ) // ----------------------------------------------------------------------- -rtl::OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) +OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { - static std::map< sal_uInt16, rtl::OUString > aKeyMap; + static std::map< sal_uInt16, OUString > aKeyMap; if( aKeyMap.empty() ) { sal_uInt16 i; for( i = KEY_A; i <= KEY_Z; i++ ) - aKeyMap[ i ] = rtl::OUString( sal_Unicode( 'A' + (i - KEY_A) ) ); + aKeyMap[ i ] = OUString( sal_Unicode( 'A' + (i - KEY_A) ) ); for( i = KEY_0; i <= KEY_9; i++ ) - aKeyMap[ i ] = rtl::OUString( sal_Unicode( '0' + (i - KEY_0) ) ); + aKeyMap[ i ] = OUString( sal_Unicode( '0' + (i - KEY_0) ) ); for( i = KEY_F1; i <= KEY_F26; i++ ) { - rtl::OUStringBuffer aKey( 3 ); + OUStringBuffer aKey( 3 ); aKey.append( sal_Unicode( 'F' ) ); aKey.append( sal_Int32( i - KEY_F1 + 1 ) ); aKeyMap[ i ] = aKey.makeStringAndClear(); } - aKeyMap[ KEY_DOWN ] = rtl::OUString( sal_Unicode( 0x21e3 ) ); - aKeyMap[ KEY_UP ] = rtl::OUString( sal_Unicode( 0x21e1 ) ); - aKeyMap[ KEY_LEFT ] = rtl::OUString( sal_Unicode( 0x21e0 ) ); - aKeyMap[ KEY_RIGHT ] = rtl::OUString( sal_Unicode( 0x21e2 ) ); - aKeyMap[ KEY_HOME ] = rtl::OUString( sal_Unicode( 0x2196 ) ); - aKeyMap[ KEY_END ] = rtl::OUString( sal_Unicode( 0x2198 ) ); - aKeyMap[ KEY_PAGEUP ] = rtl::OUString( sal_Unicode( 0x21de ) ); - aKeyMap[ KEY_PAGEDOWN ] = rtl::OUString( sal_Unicode( 0x21df ) ); - aKeyMap[ KEY_RETURN ] = rtl::OUString( sal_Unicode( 0x21a9 ) ); - aKeyMap[ KEY_ESCAPE ] = rtl::OUString( "esc" ); - aKeyMap[ KEY_TAB ] = rtl::OUString( sal_Unicode( 0x21e5 ) ); - aKeyMap[ KEY_BACKSPACE ]= rtl::OUString( sal_Unicode( 0x232b ) ); - aKeyMap[ KEY_SPACE ] = rtl::OUString( sal_Unicode( 0x2423 ) ); - aKeyMap[ KEY_DELETE ] = rtl::OUString( sal_Unicode( 0x2326 ) ); - aKeyMap[ KEY_ADD ] = rtl::OUString( sal_Unicode( '+' ) ); - aKeyMap[ KEY_SUBTRACT ] = rtl::OUString( sal_Unicode( '-' ) ); - aKeyMap[ KEY_DIVIDE ] = rtl::OUString( sal_Unicode( '/' ) ); - aKeyMap[ KEY_MULTIPLY ] = rtl::OUString( sal_Unicode( '*' ) ); - aKeyMap[ KEY_POINT ] = rtl::OUString( sal_Unicode( '.' ) ); - aKeyMap[ KEY_COMMA ] = rtl::OUString( sal_Unicode( ',' ) ); - aKeyMap[ KEY_LESS ] = rtl::OUString( sal_Unicode( '<' ) ); - aKeyMap[ KEY_GREATER ] = rtl::OUString( sal_Unicode( '>' ) ); - aKeyMap[ KEY_EQUAL ] = rtl::OUString( sal_Unicode( '=' ) ); - aKeyMap[ KEY_OPEN ] = rtl::OUString( sal_Unicode( 0x23cf ) ); + aKeyMap[ KEY_DOWN ] = OUString( sal_Unicode( 0x21e3 ) ); + aKeyMap[ KEY_UP ] = OUString( sal_Unicode( 0x21e1 ) ); + aKeyMap[ KEY_LEFT ] = OUString( sal_Unicode( 0x21e0 ) ); + aKeyMap[ KEY_RIGHT ] = OUString( sal_Unicode( 0x21e2 ) ); + aKeyMap[ KEY_HOME ] = OUString( sal_Unicode( 0x2196 ) ); + aKeyMap[ KEY_END ] = OUString( sal_Unicode( 0x2198 ) ); + aKeyMap[ KEY_PAGEUP ] = OUString( sal_Unicode( 0x21de ) ); + aKeyMap[ KEY_PAGEDOWN ] = OUString( sal_Unicode( 0x21df ) ); + aKeyMap[ KEY_RETURN ] = OUString( sal_Unicode( 0x21a9 ) ); + aKeyMap[ KEY_ESCAPE ] = OUString( "esc" ); + aKeyMap[ KEY_TAB ] = OUString( sal_Unicode( 0x21e5 ) ); + aKeyMap[ KEY_BACKSPACE ]= OUString( sal_Unicode( 0x232b ) ); + aKeyMap[ KEY_SPACE ] = OUString( sal_Unicode( 0x2423 ) ); + aKeyMap[ KEY_DELETE ] = OUString( sal_Unicode( 0x2326 ) ); + aKeyMap[ KEY_ADD ] = OUString( sal_Unicode( '+' ) ); + aKeyMap[ KEY_SUBTRACT ] = OUString( sal_Unicode( '-' ) ); + aKeyMap[ KEY_DIVIDE ] = OUString( sal_Unicode( '/' ) ); + aKeyMap[ KEY_MULTIPLY ] = OUString( sal_Unicode( '*' ) ); + aKeyMap[ KEY_POINT ] = OUString( sal_Unicode( '.' ) ); + aKeyMap[ KEY_COMMA ] = OUString( sal_Unicode( ',' ) ); + aKeyMap[ KEY_LESS ] = OUString( sal_Unicode( '<' ) ); + aKeyMap[ KEY_GREATER ] = OUString( sal_Unicode( '>' ) ); + aKeyMap[ KEY_EQUAL ] = OUString( sal_Unicode( '=' ) ); + aKeyMap[ KEY_OPEN ] = OUString( sal_Unicode( 0x23cf ) ); /* yet unmapped KEYCODES: - aKeyMap[ KEY_INSERT ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_CUT ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_COPY ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_PASTE ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_UNDO ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_REPEAT ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_FIND ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_PROPERTIES ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_FRONT ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_CONTEXTMENU ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_MENU ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_HELP ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_HANGUL_HANJA ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_DECIMAL ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_TILDE ] = rtl::OUString( sal_Unicode( ) ); - aKeyMap[ KEY_QUOTELEFT ]= rtl::OUString( sal_Unicode( ) ); + aKeyMap[ KEY_INSERT ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_CUT ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_COPY ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_PASTE ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_UNDO ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_REPEAT ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_FIND ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_PROPERTIES ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_FRONT ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_CONTEXTMENU ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_MENU ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_HELP ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_HANGUL_HANJA ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_DECIMAL ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_TILDE ] = OUString( sal_Unicode( ) ); + aKeyMap[ KEY_QUOTELEFT ]= OUString( sal_Unicode( ) ); */ } - rtl::OUStringBuffer aResult( 16 ); + OUStringBuffer aResult( 16 ); sal_uInt16 nUnmodifiedCode = (nKeyCode & KEY_CODE); - std::map< sal_uInt16, rtl::OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode ); + std::map< sal_uInt16, OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode ); if( it != aKeyMap.end() ) { if( (nKeyCode & KEY_SHIFT) != 0 ) diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index 8f37ddc41d24..0bdf9ed8c729 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -62,11 +62,11 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; } else { - rtl::OUString aDialog; + OUString aDialog; if( nDialog == SHOWDIALOG_ID_ABOUT ) - aDialog = rtl::OUString("ABOUT"); + aDialog = OUString("ABOUT"); else if( nDialog == SHOWDIALOG_ID_PREFERENCES ) - aDialog = rtl::OUString("PREFERENCES"); + aDialog = OUString("PREFERENCES"); const ApplicationEvent* pAppEvent = new ApplicationEvent( ApplicationEvent::TYPE_SHOWDIALOG, aDialog); AquaSalInstance::aAppEventList.push_back( pAppEvent ); @@ -668,7 +668,7 @@ void AquaSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSMI, const Imag [pImage release]; } -void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const rtl::OUString& i_rText ) +void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const OUString& i_rText ) { if (!i_pSalMenuItem) return; @@ -703,7 +703,7 @@ void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, } } -void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& /*rKeyName*/ ) +void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& /*rKeyName*/ ) { sal_uInt16 nModifier; sal_Unicode nCommandKey = 0; @@ -779,7 +779,7 @@ void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, nItemModifier |= NSControlKeyMask; AquaSalMenuItem *pAquaSalMenuItem = (AquaSalMenuItem *) pSalMenuItem; - NSString* pString = CreateNSString( rtl::OUString( &nCommandKey, 1 ) ); + NSString* pString = CreateNSString( OUString( &nCommandKey, 1 ) ); [pAquaSalMenuItem->mpMenuItem setKeyEquivalent: pString]; [pAquaSalMenuItem->mpMenuItem setKeyEquivalentModifierMask: nItemModifier]; if (pString) diff --git a/vcl/coretext/salcoretextfontutils.cxx b/vcl/coretext/salcoretextfontutils.cxx index 3bcfa2285585..5b6b6c0027d3 100644 --- a/vcl/coretext/salcoretextfontutils.cxx +++ b/vcl/coretext/salcoretextfontutils.cxx @@ -155,7 +155,7 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo } CFStringRef string_ref = (CFStringRef)CTFontDescriptorCopyAttribute(font_descriptor, kCTFontStyleNameAttribute); - rtl::OUString style(GetOUString(string_ref).toAsciiLowerCase()); + OUString style(GetOUString(string_ref).toAsciiLowerCase()); CFRelease(string_ref); // heuristics to adjust font slant diff --git a/vcl/coretext/salgdi.cxx b/vcl/coretext/salgdi.cxx index 7fdd97532176..c1ace406d512 100644 --- a/vcl/coretext/salgdi.cxx +++ b/vcl/coretext/salgdi.cxx @@ -81,8 +81,8 @@ QuartzSalGraphics::~QuartzSalGraphics() #endif inline bool QuartzSalGraphics::AddTempDevFont( ImplDevFontList*, - const rtl::OUString& , - const rtl::OUString& ) + const OUString& , + const OUString& ) { OSL_ASSERT( FALSE ); return false; diff --git a/vcl/generic/app/gendisp.cxx b/vcl/generic/app/gendisp.cxx index f6d1e2e8c759..fffb5aac2d20 100644 --- a/vcl/generic/app/gendisp.cxx +++ b/vcl/generic/app/gendisp.cxx @@ -21,7 +21,6 @@ #include #include -using ::rtl::OUString; SalGenericDisplay::SalGenericDisplay() { diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index 863ee708f480..b2a2af528af6 100644 --- a/vcl/generic/fontmanager/fontcache.cxx +++ b/vcl/generic/fontmanager/fontcache.cxx @@ -45,9 +45,6 @@ using namespace std; using namespace psp; using namespace utl; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; /* * FontCache constructor @@ -103,7 +100,7 @@ void FontCache::flush() if( ! (aStream.IsOpen() && aStream.IsWritable()) ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "FontCache::flush: opening cache file %s failed\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); + fprintf( stderr, "FontCache::flush: opening cache file %s failed\n", OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); #endif return; } @@ -118,8 +115,8 @@ void FontCache::flush() { const FontDirMap& rDir( dir_it->second.m_aEntries ); - rtl::OString aDirectory(rManager.getDirectory(dir_it->first)); - rtl::OStringBuffer aLine("FontCacheDirectory:"); + OString aDirectory(rManager.getDirectory(dir_it->first)); + OStringBuffer aLine("FontCacheDirectory:"); aLine.append(dir_it->second.m_nTimestamp); aLine.append(':'); aLine.append(aDirectory); @@ -226,7 +223,7 @@ void FontCache::flush() } aStream.WriteLine(aLine.makeStringAndClear()); } - aStream.WriteLine(rtl::OString()); + aStream.WriteLine(OString()); } } m_bDoFlush = false; @@ -245,7 +242,7 @@ void FontCache::read() if( ! aStream.IsOpen() ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "FontCache::read: opening cache file %s failed\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); + fprintf( stderr, "FontCache::read: opening cache file %s failed\n", OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); #endif return; } @@ -256,7 +253,7 @@ void FontCache::read() if ( !(aLine == CACHE_MAGIC) ) { #if OSL_DEBUG_LEVEL >1 - fprintf( stderr, "FontCache::read: cache file %s fails magic test\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); + fprintf( stderr, "FontCache::read: cache file %s fails magic test\n", OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() ); #endif return; } @@ -278,7 +275,7 @@ void FontCache::read() sal_Int32 nTEnd = aLine.indexOf( ':', nSearchIndex ); if( nTEnd != -1 ) { - rtl::OString aTimeStamp = aLine.copy( nSearchIndex, nTEnd - nSearchIndex ); + OString aTimeStamp = aLine.copy( nSearchIndex, nTEnd - nSearchIndex ); nTimestamp = aTimeStamp.toInt64(); aDir = aLine.copy( nTEnd+1 ); } @@ -452,7 +449,7 @@ void FontCache::read() { if( pFont->m_bUserOverride ) { - rtl::OStringBuffer aFilePath(rManager.getDirectory(nDir)); + OStringBuffer aFilePath(rManager.getDirectory(nDir)); aFilePath.append('/').append(aFile); struct stat aStat; if( stat( aFilePath.getStr(), &aStat ) || diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 33aff6a36d3c..dc8dfa7976e1 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -94,9 +94,6 @@ using namespace psp; #include using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; namespace { @@ -124,8 +121,8 @@ public: FcResult LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **family, const char *elementtype, const char *elementlangtype); //to-do, make private and add some cleanish accessor methods - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized; - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical; + boost::unordered_map< OString, OString, OStringHash > m_aFontNameToLocalized; + boost::unordered_map< OString, OString, OStringHash > m_aLocalizedToCanonical; private: void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 *bestfontname, const std::vector< lang_and_element > &lang_and_elements); @@ -297,10 +294,10 @@ namespace /* FIXME-BCP47: once fontconfig supports language tags this * language-territory stuff needs to be changed! */ SAL_INFO_IF( !rLangTag.isIsoLocale(), "i18n", "localizedsorter::bestname - not an ISO locale"); - rtl::OString sLangMatch(rtl::OUStringToOString(rLangTag.getLanguage().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8)); - rtl::OString sFullMatch = sLangMatch; + OString sLangMatch(OUStringToOString(rLangTag.getLanguage().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8)); + OString sFullMatch = sLangMatch; sFullMatch += OString('-'); - sFullMatch += rtl::OUStringToOString(rLangTag.getCountry().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8); + sFullMatch += OUStringToOString(rLangTag.getCountry().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8); std::vector::const_iterator aEnd = elements.end(); bool alreadyclosematch = false; @@ -504,7 +501,7 @@ static void lcl_FcFontSetRemove(FcFontSet* pFSet, int i) memmove(pFSet->fonts + i, pFSet->fonts + i + 1, nTail*sizeof(FcPattern*)); } -void PrintFontManager::countFontconfigFonts( boost::unordered_map& o_rVisitedPaths ) +void PrintFontManager::countFontconfigFonts( boost::unordered_map& o_rVisitedPaths ) { #if OSL_DEBUG_LEVEL > 1 int nFonts = 0; @@ -696,7 +693,7 @@ void PrintFontManager::deinitFontconfig() FontCfgWrapper::release(); } -bool PrintFontManager::addFontconfigDir( const rtl::OString& rDirName ) +bool PrintFontManager::addFontconfigDir( const OString& rDirName ) { // workaround for a stability problems in older FC versions // when handling application specifc fonts @@ -714,7 +711,7 @@ bool PrintFontManager::addFontconfigDir( const rtl::OString& rDirName ) return false; // load dir-specific fc-config file too if available - const rtl::OString aConfFileName = rDirName + "/fc_local.conf"; + const OString aConfFileName = rDirName + "/fc_local.conf"; FILE* pCfgFile = fopen( aConfFileName.getStr(), "rb" ); if( pCfgFile ) { @@ -921,7 +918,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport) return 0; } -bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes ) +bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes ) { bool bRet = false; @@ -933,7 +930,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r // Prefer scalable fonts FcPatternAddBool(pPattern, FC_SCALABLE, FcTrue); - const rtl::OString aTargetName = rtl::OUStringToOString( rPattern.maTargetName, RTL_TEXTENCODING_UTF8 ); + const OString aTargetName = OUStringToOString( rPattern.maTargetName, RTL_TEXTENCODING_UTF8 ); const FcChar8* pTargetNameUtf8 = (FcChar8*)aTargetName.getStr(); FcPatternAddString(pPattern, FC_FAMILY, pTargetNameUtf8); @@ -1021,11 +1018,11 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r if( eFamilyRes == FcResultMatch ) { OString sFamily((sal_Char*)family); - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = + boost::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aFontNameToLocalized.find(sFamily); if (aI != rWrapper.m_aFontNameToLocalized.end()) sFamily = aI->second; - rPattern.maSearchName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 ); + rPattern.maSearchName = OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 ); bRet = true; } } @@ -1150,7 +1147,7 @@ ImplFontOptions* PrintFontManager::getFontOptions( OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 ); - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); + boost::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily); if (aI != rWrapper.m_aLocalizedToCanonical.end()) sFamily = aI->second; if( !sFamily.isEmpty() ) @@ -1220,7 +1217,7 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star // populate pattern with font characteristics const LanguageTag aLangTag(rLocale); - const rtl::OString aLangAttrib = mapToFontConfigLangTag(aLangTag); + const OString aLangAttrib = mapToFontConfigLangTag(aLangTag); if (!aLangAttrib.isEmpty()) FcPatternAddString(pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr()); diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 8a1a5e1ea6b5..e86fceb11ce2 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -87,14 +87,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::lang; using ::comphelper::string::getToken; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringHash; -using ::rtl::OStringBuffer; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringHash; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; /* * static helpers @@ -120,7 +112,7 @@ inline sal_uInt32 getUInt32BE( const sal_uInt8*& pBuffer ) // ------------------------------------------------------------------------- -static FontWeight parseWeight( const rtl::OString& rWeight ) +static FontWeight parseWeight( const OString& rWeight ) { FontWeight eWeight = WEIGHT_DONTKNOW; if (rWeight.indexOf("bold") != -1) @@ -237,7 +229,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr { bool bSuccess = false; - rtl::OString aFile( PrintFontManager::get().getFontFile( this ) ); + OString aFile( PrintFontManager::get().getFontFile( this ) ); TrueTypeFont* pTTFont = NULL; @@ -611,7 +603,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, m_eItalic = ITALIC_NONE; // weight - rtl::OString aWeight( pInfo->gfi->weight ); + OString aWeight( pInfo->gfi->weight ); m_eWeight = parseWeight( aWeight.toAsciiLowerCase() ); // pitch @@ -810,7 +802,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, continue; } - rtl::OStringBuffer aTranslate; + OStringBuffer aTranslate; if( pChar->code & 0xff000000 ) aTranslate.append((char)(pChar->code >> 24)); if( pChar->code & 0xffff0000 ) @@ -818,7 +810,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, if( pChar->code & 0xffffff00 ) aTranslate.append((char)((pChar->code & 0x0000ff00) >> 8 )); aTranslate.append((char)(pChar->code & 0xff)); - rtl::OUString aUni(rtl::OStringToOUString(aTranslate.makeStringAndClear(), m_aEncoding)); + OUString aUni(OStringToOUString(aTranslate.makeStringAndClear(), m_aEncoding)); pUnicodes[i] = aUni.toChar(); } else @@ -990,8 +982,8 @@ PrintFontManager::PrintFontManager() { for( unsigned int i = 0; i < SAL_N_ELEMENTS( aAdobeCodes ); i++ ) { - m_aUnicodeToAdobename.insert( ::boost::unordered_multimap< sal_Unicode, ::rtl::OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); - m_aAdobenameToUnicode.insert( ::boost::unordered_multimap< ::rtl::OString, sal_Unicode, ::rtl::OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); + m_aUnicodeToAdobename.insert( ::boost::unordered_multimap< sal_Unicode, OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) ); + m_aAdobenameToUnicode.insert( ::boost::unordered_multimap< OString, sal_Unicode, OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) ); if( aAdobeCodes[i].aAdobeStandardCode ) { m_aUnicodeToAdobecode.insert( ::boost::unordered_multimap< sal_Unicode, sal_uInt8 >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].aAdobeStandardCode ) ); @@ -1043,7 +1035,7 @@ int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate // ------------------------------------------------------------------------- -std::vector PrintFontManager::addFontFile( const ::rtl::OString& rFileName ) +std::vector PrintFontManager::addFontFile( const OString& rFileName ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); INetURLObject aPath( OStringToOUString( rFileName, aEncoding ), INetURLObject::FSYS_DETECT ); @@ -1103,7 +1095,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, :: } if (eFormat == UNKNOWN) { - rtl::OString aExt( rFontFile.copy( rFontFile.lastIndexOf( '.' )+1 ) ); + OString aExt( rFontFile.copy( rFontFile.lastIndexOf( '.' )+1 ) ); if( aExt.equalsIgnoreAsciiCase("pfb") || aExt.equalsIgnoreAsciiCase("pfa") ) eFormat = TYPE1; else if( aExt.equalsIgnoreAsciiCase("afm")) @@ -1124,7 +1116,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, :: for( unsigned int i = 0; i < SAL_N_ELEMENTS(pSuffix); i++ ) { - rtl::OString aName = rtl::OStringBuffer( + OString aName = OStringBuffer( rFontFile.copy(0, rFontFile.getLength() - 4)). append(pSuffix[i]).makeStringAndClear(); @@ -1470,7 +1462,7 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const { bool bSuccess = false; rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - rtl::OString aFile = getFontFile( pFont ); + OString aFile = getFontFile( pFont ); TrueTypeFont* pTTFont = NULL; TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont); @@ -1524,8 +1516,8 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const SAL_WARN_IF( !aInfo.psname, "vcl", "No PostScript name in font:" << aFile.getStr() ); - rtl::OUString sPSName = aInfo.psname ? - rtl::OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) : + OUString sPSName = aInfo.psname ? + OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) : m_pAtoms->getString(ATOM_FAMILYNAME, pFont->m_nFamilyName); // poor font does not have a postscript name pFont->m_nPSName = m_pAtoms->getAtom( ATOM_PSNAME, sPSName, sal_True ); @@ -1685,13 +1677,13 @@ void PrintFontManager::initialize() // part one - look for downloadable fonts rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - const ::rtl::OUString &rSalPrivatePath = psp::getFontPath(); + const OUString &rSalPrivatePath = psp::getFontPath(); // search for the fonts in SAL_PRIVATE_FONTPATH first; those are // the fonts installed with the office if( !rSalPrivatePath.isEmpty() ) { - OString aPath = rtl::OUStringToOString( rSalPrivatePath, aEncoding ); + OString aPath = OUStringToOString( rSalPrivatePath, aEncoding ); const bool bAreFCSubstitutionsEnabled = AreFCSubstitutionsEnabled(); sal_Int32 nIndex = 0; do @@ -1819,7 +1811,7 @@ void PrintFontManager::initialize() while( ! readdir_r( pDIR, (struct dirent*)aDirEntBuffer, &pDirEntry ) && pDirEntry ) { - rtl::OStringBuffer aFile(aDir); + OStringBuffer aFile(aDir); aFile.append('/').append(pDirEntry->d_name); struct stat aStat; if( ! stat( aFile.getStr(), &aStat ) @@ -1868,7 +1860,7 @@ void PrintFontManager::initialize() m_aFamilyTypes.find( font_it->second->m_nFamilyName ); if (it != m_aFamilyTypes.end()) continue; - const ::rtl::OUString& rFamily = + const OUString& rFamily = m_pAtoms->getString( ATOM_FAMILYNAME, font_it->second->m_nFamilyName); FontFamily eType = matchFamilyName( rFamily ); m_aFamilyTypes[ font_it->second->m_nFamilyName ] = eType; @@ -2213,7 +2205,7 @@ int PrintFontManager::getFontFaceNumber( fontID nFontID ) const // ------------------------------------------------------------------------- -FontFamily PrintFontManager::matchFamilyName( const ::rtl::OUString& rFamily ) const +FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const { typedef struct { const char* mpName; @@ -2251,7 +2243,7 @@ FontFamily PrintFontManager::matchFamilyName( const ::rtl::OUString& rFamily ) c { InitializeClass( "zapfchancery", FAMILY_SCRIPT ) } }; - rtl::OString aFamily = rtl::OUStringToOString( rFamily, RTL_TEXTENCODING_ASCII_US ); + OString aFamily = OUStringToOString( rFamily, RTL_TEXTENCODING_ASCII_US ); sal_uInt32 nLower = 0; sal_uInt32 nUpper = SAL_N_ELEMENTS(pFamilyMatch); @@ -2336,7 +2328,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const // ------------------------------------------------------------------------- -const ::rtl::OUString& PrintFontManager::getPSName( fontID nFontID ) const +const OUString& PrintFontManager::getPSName( fontID nFontID ) const { PrintFont* pFont = getFont( nFontID ); if( pFont && pFont->m_nPSName == 0 ) @@ -2442,7 +2434,7 @@ bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const if( pTTFontFile->m_nTypeFlags & TYPEFLAG_INVALID ) { TrueTypeFont* pTTFont = NULL; - rtl::OString aFile = getFontFile( pFont ); + OString aFile = getFontFile( pFont ); if( OpenTTFontFile( aFile.getStr(), pTTFontFile->m_nCollectionEntry, &pTTFont ) == SF_OK ) { // get type flags @@ -2616,7 +2608,7 @@ bool PrintFontManager::createFontSubset( // prepare system name for read access for subset source file // TODO: since this file is usually already mmapped there is no need to open it again - const rtl::OString aFromFile = getFontFile( pFont ); + const OString aFromFile = getFontFile( pFont ); TrueTypeFont* pTTFont = NULL; // TODO: rename to SfntFont TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont); @@ -2628,7 +2620,7 @@ bool PrintFontManager::createFontSubset( if( osl_File_E_None != osl_getSystemPathFromFileURL( rOutFile.pData, &aSysPath.pData ) ) return false; const rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - const rtl::OString aToFile( OUStringToOString( aSysPath, aEncoding ) ); + const OString aToFile( OUStringToOString( aSysPath, aEncoding ) ); // do CFF subsetting if possible int nCffLength = 0; @@ -2713,7 +2705,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont, { TrueTypeFont* pTTFont = NULL; TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont); - rtl::OString aFromFile = getFontFile( pFont ); + OString aFromFile = getFontFile( pFont ); if( OpenTTFontFile( aFromFile.getStr(), pTTFontFile->m_nCollectionEntry, &pTTFont ) != SF_OK ) return; int nGlyphs = GetTTGlyphCount( pTTFont ); @@ -2791,7 +2783,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont, // ------------------------------------------------------------------------- -const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( fontID nFont, const std::map< sal_Unicode, rtl::OString >** pNonEncoded ) const +const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( fontID nFont, const std::map< sal_Unicode, OString >** pNonEncoded ) const { PrintFont* pFont = getFont( nFont ); if( !pFont || @@ -2812,8 +2804,8 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const { - std::pair< boost::unordered_multimap< sal_Unicode, rtl::OString >::const_iterator, - boost::unordered_multimap< sal_Unicode, rtl::OString >::const_iterator > range + std::pair< boost::unordered_multimap< sal_Unicode, OString >::const_iterator, + boost::unordered_multimap< sal_Unicode, OString >::const_iterator > range = m_aUnicodeToAdobename.equal_range( aChar ); std::list< OString > aRet; @@ -2831,10 +2823,10 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha } // ------------------------------------------------------------------------- -std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const rtl::OString& rName ) const +std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OString& rName ) const { - std::pair< boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator, - boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator > range + std::pair< boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator, + boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator > range = m_aAdobenameToUnicode.equal_range( rName ); std::list< sal_Unicode > aRet; diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index a339ca9ff037..94dcda14e75a 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -60,7 +60,7 @@ class FcGlyphFallbackSubstititution { // TODO: add a cache public: - bool FindFontSubstitute( FontSelectPattern&, rtl::OUString& rMissingCodes ) const; + bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const; }; int SalGenericInstance::FetchFontSubstitutionFlags() @@ -116,7 +116,7 @@ void SalGenericInstance::RegisterFontSubstitutors( ImplDevFontList* pList ) // ----------------------------------------------------------------------- -static FontSelectPattern GetFcSubstitute(const FontSelectPattern &rFontSelData, rtl::OUString& rMissingCodes ) +static FontSelectPattern GetFcSubstitute(const FontSelectPattern &rFontSelData, OUString& rMissingCodes ) { FontSelectPattern aSubstituted(rFontSelData); psp::PrintFontManager& rMgr = psp::PrintFontManager::get(); @@ -193,9 +193,9 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut ); #ifdef DEBUG - const rtl::OString aOrigName(rtl::OUStringToOString(rFontSelData.maTargetName, + const OString aOrigName(OUStringToOString(rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8)); - const rtl::OString aSubstName(rtl::OUStringToOString(aOut.maSearchName, + const OString aSubstName(OUStringToOString(aOut.maSearchName, RTL_TEXTENCODING_UTF8)); printf( "FcPreMatchSubstititution \"%s\" bipw=%d%d%d%d -> ", aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(), @@ -223,7 +223,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa // ----------------------------------------------------------------------- bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, - rtl::OUString& rMissingCodes ) const + OUString& rMissingCodes ) const { // We dont' actually want to talk to Fontconfig at all for symbol fonts if( rFontSelData.IsSymbolFont() ) @@ -244,9 +244,9 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut ); #ifdef DEBUG - const rtl::OString aOrigName(rtl::OUStringToOString(rFontSelData.maTargetName, + const OString aOrigName(OUStringToOString(rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8)); - const rtl::OString aSubstName(rtl::OUStringToOString(aOut.maSearchName, + const OString aSubstName(OUStringToOString(aOut.maSearchName, RTL_TEXTENCODING_UTF8)); printf( "FcGFSubstititution \"%s\" bipw=%d%d%d%d ->", aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(), diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index 7b1a5713da12..33db29819c79 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -32,11 +32,6 @@ #include "rtl/bootstrap.hxx" using ::rtl::Bootstrap; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; namespace psp { @@ -166,7 +161,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub #ifdef SYSTEM_PPD_DIR if( pSubDir && rtl_str_compare( pSubDir, PRINTER_PPDDIR ) == 0 ) { - rPathList.push_back( rtl::OStringToOUString( rtl::OString( SYSTEM_PPD_DIR ), RTL_TEXTENCODING_UTF8 ) ); + rPathList.push_back( OStringToOUString( OString( SYSTEM_PPD_DIR ), RTL_TEXTENCODING_UTF8 ) ); } #endif @@ -360,7 +355,7 @@ void psp::normPath( OString& rPath ) // double slashes and slash at end are probably // removed by realpath anyway, but since this runs // on many different platforms let's play it safe - rtl::OString aPath = rPath.replaceAll("//", "/"); + OString aPath = rPath.replaceAll("//", "/"); if( !aPath.isEmpty() && aPath[aPath.getLength()-1] == '/' ) aPath = aPath.copy(0, aPath.getLength()-1); diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 17e089ff6642..09a00dba182e 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -156,7 +156,7 @@ static int nDefaultPrioAntiAlias = 1; // FreetypeManager // ======================================================================= -FtFontFile::FtFontFile( const ::rtl::OString& rNativeFileName ) +FtFontFile::FtFontFile( const OString& rNativeFileName ) : maNativeFileName( rNativeFileName ), mpFileMap( NULL ), mnFileSize( 0 ), @@ -184,7 +184,7 @@ FtFontFile::FtFontFile( const ::rtl::OString& rNativeFileName ) // ----------------------------------------------------------------------- -FtFontFile* FtFontFile::FindFontFile( const ::rtl::OString& rNativeFileName ) +FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName ) { // font file already known? (e.g. for ttc, synthetic, aliased fonts) const char* pFileName = rNativeFileName.getStr(); @@ -299,7 +299,7 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz // ======================================================================= FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes, - const ::rtl::OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic, + const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic, const ExtraKernInfo* pExtraKernInfo ) : maFaceFT( NULL ), @@ -568,7 +568,7 @@ FreetypeManager::~FreetypeManager() // ----------------------------------------------------------------------- -void FreetypeManager::AddFontFile( const rtl::OString& rNormalizedName, +void FreetypeManager::AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDevFontAttr, const ExtraKernInfo* pExtraKernInfo ) { @@ -885,7 +885,7 @@ boost::shared_ptr ServerFont::GetFontOptions() const return mpFontOptions; } -const ::rtl::OString* ServerFont::GetFontFileName() const +const OString* ServerFont::GetFontFileName() const { return mpFontInfo->GetFontFileName(); } diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index dea75b3b2332..2c31bb424449 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -37,20 +37,20 @@ class GraphiteFaceWrapper; class FtFontFile { public: - static FtFontFile* FindFontFile( const ::rtl::OString& rNativeFileName ); + static FtFontFile* FindFontFile( const OString& rNativeFileName ); bool Map(); void Unmap(); const unsigned char* GetBuffer() const { return mpFileMap; } int GetFileSize() const { return mnFileSize; } - const ::rtl::OString* GetFileName() const { return &maNativeFileName; } + const OString* GetFileName() const { return &maNativeFileName; } int GetLangBoost() const { return mnLangBoost; } private: - FtFontFile( const ::rtl::OString& rNativeFileName ); + FtFontFile( const OString& rNativeFileName ); - const ::rtl::OString maNativeFileName; + const OString maNativeFileName; const unsigned char* mpFileMap; int mnFileSize; int mnRefCount; @@ -64,7 +64,7 @@ class FtFontInfo { public: FtFontInfo( const ImplDevFontAttributes&, - const ::rtl::OString& rNativeFileName, + const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic, const ExtraKernInfo* ); ~FtFontInfo(); @@ -77,7 +77,7 @@ public: #endif void ReleaseFaceFT( FT_FaceRec_* ); - const ::rtl::OString* GetFontFileName() const { return mpFontFile->GetFileName(); } + const OString* GetFontFileName() const { return mpFontFile->GetFileName(); } int GetFaceNum() const { return mnFaceNum; } int GetSynthetic() const { return mnSynthetic; } sal_IntPtr GetFontId() const { return mnFontId; } @@ -148,7 +148,7 @@ public: FreetypeManager(); ~FreetypeManager(); - void AddFontFile( const rtl::OString& rNormalizedName, + void AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&, const ExtraKernInfo* ); void AnnounceFonts( ImplDevFontList* ) const; diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 3ceb72442516..fa3659a3990f 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -89,7 +89,7 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData if (rFontSelData.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) != -1) { - rtl::OString aFeatName = rtl::OUStringToOString( rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); + OString aFeatName = OUStringToOString( rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); nFontId ^= aFeatName.hashCode(); } #endif @@ -163,7 +163,7 @@ GlyphCache& GlyphCache::GetInstance() // ----------------------------------------------------------------------- -void GlyphCache::AddFontFile( const rtl::OString& rNormalizedName, int nFaceNum, +void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDFA, const ExtraKernInfo* pExtraKern ) { if( mpFtManager ) diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index 2e3739c063b3..42d98ad287d5 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -63,13 +63,13 @@ GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) thro rServerFont.GetGraphiteFace()->addFont(rServerFont.GetFontSelData().mnHeight, pFont); } maImpl.SetFont(pFont); - rtl::OString aLang(""); + OString aLang(""); if (rServerFont.GetFontSelData().meLanguage != LANGUAGE_DONTKNOW) { - aLang = rtl::OUStringToOString( LanguageTag( rServerFont.GetFontSelData().meLanguage ).getBcp47(), + aLang = OUStringToOString( LanguageTag( rServerFont.GetFontSelData().meLanguage ).getBcp47(), RTL_TEXTENCODING_UTF8 ); } - rtl::OString name = rtl::OUStringToOString( + OString name = OUStringToOString( rServerFont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 ); #ifdef DEBUG printf("GraphiteServerFontLayout %lx %s size %d %f\n", (long unsigned int)this, name.getStr(), @@ -79,17 +79,17 @@ GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) thro sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; if (nFeat > 0) { - rtl::OString aFeat = name.copy(nFeat, name.getLength() - nFeat); + OString aFeat = name.copy(nFeat, name.getLength() - nFeat); mpFeatures = new grutils::GrFeatureParser( rServerFont.GetGraphiteFace()->face(), aFeat, aLang); #ifdef DEBUG if (mpFeatures) printf("GraphiteServerFontLayout %s/%s/%s %x language %d features %d errors\n", - rtl::OUStringToOString( rServerFont.GetFontSelData().GetFamilyName(), + OUStringToOString( rServerFont.GetFontSelData().GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( rServerFont.GetFontSelData().maTargetName, + OUStringToOString( rServerFont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( rServerFont.GetFontSelData().maSearchName, + OUStringToOString( rServerFont.GetFontSelData().maSearchName, RTL_TEXTENCODING_UTF8 ).getStr(), rServerFont.GetFontSelData().meLanguage, (int)mpFeatures->numFeatures(), mpFeatures->parseErrors()); diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx index c460558f641d..260fbc951cd5 100644 --- a/vcl/generic/print/common_gfx.cxx +++ b/vcl/generic/print/common_gfx.cxx @@ -788,7 +788,7 @@ PrinterGfx::PSSetFont () && rCurrent.maEncoding <= RTL_TEXTENCODING_USER_END) ) { - rtl::OString aReencodedFont = + OString aReencodedFont = psp::GlyphSet::GetReencodedFontName (rCurrent.maEncoding, rCurrent.maFont); @@ -1163,9 +1163,9 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize // first search the BoundingBox of the EPS data SvMemoryStream aStream( pPtr, nSize, STREAM_READ ); aStream.Seek( STREAM_SEEK_TO_BEGIN ); - rtl::OString aLine; + OString aLine; - rtl::OString aDocTitle; + OString aDocTitle; double fLeft = 0, fRight = 0, fTop = 0, fBottom = 0; bool bEndComments = false; while( ! aStream.IsEof() @@ -1179,7 +1179,7 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize char cChar = aLine[1]; if( cChar == '%' ) { - if( aLine.matchIgnoreAsciiCase( rtl::OString( "%%BoundingBox:") ) ) + if( aLine.matchIgnoreAsciiCase( OString( "%%BoundingBox:") ) ) { aLine = WhitespaceToSpace( aLine.getToken(1, ':') ); if( !aLine.isEmpty() && aLine.indexOf( "atend" ) == -1 ) diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 583587002361..9ffb69cdcaa3 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -60,9 +60,6 @@ using namespace psp; using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringHash; -using ::rtl::OUStringToOString; /* * static helpers @@ -79,19 +76,19 @@ typedef int(*faxFunction)(OUString&); static faxFunction pFaxNrFunction = NULL; } -static rtl::OUString getPdfDir( const PrinterInfo& rInfo ) +static OUString getPdfDir( const PrinterInfo& rInfo ) { - rtl::OUString aDir; + OUString aDir; sal_Int32 nIndex = 0; while( nIndex != -1 ) { - rtl::OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); + OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); if( aToken.startsWith( "pdf=" ) ) { sal_Int32 nPos = 0; aDir = aToken.getToken( 1, '=', nPos ); if( aDir.isEmpty() && getenv( "HOME" ) ) - aDir = rtl::OUString( getenv( "HOME" ), strlen( getenv( "HOME" ) ), osl_getThreadTextEncoding() ); + aDir = OUString( getenv( "HOME" ), strlen( getenv( "HOME" ) ), osl_getThreadTextEncoding() ); break; } } @@ -227,14 +224,14 @@ static bool passFileToCommandLine( const OUString& rFilename, const OUString& rC bool bSuccess = false; rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - rtl::OString aCmdLine(rtl::OUStringToOString(rCommandLine, aEncoding)); - rtl::OString aFilename(rtl::OUStringToOString(rFilename, aEncoding)); + OString aCmdLine(OUStringToOString(rCommandLine, aEncoding)); + OString aFilename(OUStringToOString(rFilename, aEncoding)); bool bPipe = aCmdLine.indexOf( "(TMP)" ) != -1 ? false : true; // setup command line for exec if( ! bPipe ) - aCmdLine = aCmdLine.replaceAll(rtl::OString("(TMP)"), aFilename); + aCmdLine = aCmdLine.replaceAll(OString("(TMP)"), aFilename); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "%s commandline: \"%s\"\n", @@ -362,7 +359,7 @@ static bool sendAFax( const OUString& rFaxNumber, const OUString& rFileName, con bSuccess = false; // clean up temp file - unlink(rtl::OUStringToOString(rFileName, osl_getThreadTextEncoding()).getStr()); + unlink(OUStringToOString(rFileName, osl_getThreadTextEncoding()).getStr()); return bSuccess; #else @@ -465,7 +462,7 @@ void SalGenericInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) sal_Int32 nIndex = 0; while( nIndex != -1 ) { - rtl::OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); + OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); if( aToken.match( "pdf=" ) ) { pInfo->maLocation = getPdfDir( rInfo ); @@ -487,7 +484,7 @@ void SalGenericInstance::GetPrinterQueueState( SalPrinterQueueInfo* ) mbPrinterInit = true; } -rtl::OUString SalGenericInstance::GetDefaultPrinter() +OUString SalGenericInstance::GetDefaultPrinter() { mbPrinterInit = true; PrinterInfoManager& rManager( PrinterInfoManager::get() ); @@ -642,7 +639,7 @@ sal_Bool PspSalInfoPrinter::SetData( TenMuToPt( pJobSetup->mnPaperWidth ), TenMuToPt( pJobSetup->mnPaperHeight ) ); else - aPaper = rtl::OStringToOUString(PaperInfo::toPSName(pJobSetup->mePaperFormat), RTL_TEXTENCODING_ISO_8859_1); + aPaper = OStringToOUString(PaperInfo::toPSName(pJobSetup->mePaperFormat), RTL_TEXTENCODING_ISO_8859_1); pKey = aData.m_pParser->getKey( OUString("PageSize") ); pValue = pKey ? pKey->getValueCaseInsensitive( aPaper ) : NULL; @@ -779,7 +776,7 @@ sal_uLong PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup ) return pKey ? pKey->countValues() : 0; } -rtl::OUString PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin ) +OUString PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin ) { JobData aData; JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData ); @@ -879,9 +876,9 @@ PspSalPrinter::~PspSalPrinter() { } -static rtl::OUString getTmpName() +static OUString getTmpName() { - rtl::OUString aTmp, aSys; + OUString aTmp, aSys; osl_createTempFile( NULL, NULL, &aTmp.pData ); osl_getSystemPathFromFileURL( aTmp.pData, &aSys.pData ); @@ -889,9 +886,9 @@ static rtl::OUString getTmpName() } sal_Bool PspSalPrinter::StartJob( - const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + const OUString* pFileName, + const OUString& rJobName, + const OUString& rAppName, sal_uLong nCopies, bool bCollate, bool bDirect, @@ -902,8 +899,8 @@ sal_Bool PspSalPrinter::StartJob( m_bFax = false; m_bPdf = false; - m_aFileName = pFileName ? *pFileName : rtl::OUString(); - m_aTmpFile = rtl::OUString(); + m_aFileName = pFileName ? *pFileName : OUString(); + m_aTmpFile = OUString(); m_nCopies = nCopies; m_bCollate = bCollate; @@ -930,7 +927,7 @@ sal_Bool PspSalPrinter::StartJob( m_aTmpFile = getTmpName(); nMode = S_IRUSR | S_IWUSR; - ::boost::unordered_map< OUString, OUString, ::rtl::OUStringHash >::const_iterator it; + ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; it = pJobSetup->maValueMap.find( OUString("FAX#") ); if( it != pJobSetup->maValueMap.end() ) m_aFaxNr = it->second; @@ -948,7 +945,7 @@ sal_Bool PspSalPrinter::StartJob( if( m_aFileName.isEmpty() ) { - rtl::OUStringBuffer aFileName( getPdfDir( rInfo ) ); + OUStringBuffer aFileName( getPdfDir( rInfo ) ); aFileName.append( '/' ); aFileName.append( rJobName ); aFileName.appendAscii( ".pdf" ); @@ -1061,18 +1058,18 @@ struct PDFNewJobParameters struct PDFPrintFile { - rtl::OUString maTmpURL; + OUString maTmpURL; PDFNewJobParameters maParameters; - PDFPrintFile( const rtl::OUString& i_rURL, const PDFNewJobParameters& i_rNewParameters ) + PDFPrintFile( const OUString& i_rURL, const PDFNewJobParameters& i_rNewParameters ) : maTmpURL( i_rURL ) , maParameters( i_rNewParameters ) {} }; -sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::OUString& i_rJobName, const rtl::OUString& i_rAppName, +sal_Bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) { - OSL_TRACE( "StartJob with controller: pFilename = %s", i_pFileName ? rtl::OUStringToOString( *i_pFileName, RTL_TEXTENCODING_UTF8 ).getStr() : "" ); + OSL_TRACE( "StartJob with controller: pFilename = %s", i_pFileName ? OUStringToOString( *i_pFileName, RTL_TEXTENCODING_UTF8 ).getStr() : "" ); // mark for endjob m_bIsPDFWriterJob = true; // reset IsLastPage @@ -1174,7 +1171,7 @@ sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::O { // this is not a file URL, but it should // form it into a osl friendly file URL - rtl::OUString aTmp; + OUString aTmp; osl_getFileURLFromSystemPath( aPDFUrl.pData, &aTmp.pData ); aPDFUrl = aTmp; } @@ -1270,7 +1267,7 @@ sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::O break; } } while( nBytesRead == buffer.size() ); - rtl::OUStringBuffer aBuf( i_rJobName.getLength() + 8 ); + OUStringBuffer aBuf( i_rJobName.getLength() + 8 ); aBuf.append( i_rJobName ); if( i > 0 || nCurJob > 0 ) { @@ -1295,7 +1292,7 @@ sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::O for( size_t i = 0; i < aPDFFiles.size(); i++ ) { osl_removeFile( aPDFFiles[i].maTmpURL.pData ); - OSL_TRACE( "removed print PDF file %s", rtl::OUStringToOString( aPDFFiles[i].maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE( "removed print PDF file %s", OUStringToOString( aPDFFiles[i].maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() ); } } diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 98601f034410..a26a844a19c4 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -57,8 +57,6 @@ using namespace psp; -using ::rtl::OUString; -using ::rtl::OString; // ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer --------------- @@ -279,7 +277,7 @@ GenPspGraphics::GenPspGraphics() } void GenPspGraphics::Init( psp::JobData* pJob, psp::PrinterGfx* pGfx, - rtl::OUString* pPhone, bool bSwallow, + OUString* pPhone, bool bSwallow, SalInfoPrinter* pInfoPrinter ) { m_pJobData = pJob; @@ -700,7 +698,7 @@ private: bool mbVertical; bool mbArtItalic; bool mbArtBold; - rtl::OUString maText; + OUString maText; int mnMinCharPos; }; @@ -887,7 +885,7 @@ void GenPspGraphics::SetTextColor( SalColor nSalColor ) m_pPrinterGfx->SetTextColor (aColor); } -bool GenPspGraphics::AddTempDevFont( ImplDevFontList*, const rtl::OUString&,const rtl::OUString& ) +bool GenPspGraphics::AddTempDevFont( ImplDevFontList*, const OUString&,const OUString& ) { return false; } @@ -918,7 +916,7 @@ void GenPspGraphics::GetDevFontSubstList( OutputDevice* pOutDev ) const psp::PrinterInfo& rInfo = psp::PrinterInfoManager::get().getPrinterInfo( m_pJobData->m_aPrinterName ); if( rInfo.m_bPerformFontSubstitution ) { - for( boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) + for( boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it ) pOutDev->ImplAddDevFontSubstitute( it->first, it->second, FONT_SUBSTITUTE_ALWAYS ); } } @@ -1040,7 +1038,7 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe //-------------------------------------------------------------------------- sal_Bool GenPspGraphics::CreateFontSubset( - const rtl::OUString& rToFile, + const OUString& rToFile, const PhysicalFontFace* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -1171,8 +1169,8 @@ ImplDevFontAttributes GenPspGraphics::Info2DevFontAttributes( const psp::FastPri #if OSL_DEBUG_LEVEL > 2 if( bHasMapNames ) { - rtl::OString aOrigName(rtl::OUStringToOString(aDFA.GetFamilyName(), osl_getThreadTextEncoding())); - rtl::OString aAliasNames(rtl::OUStringToOString(aDFA.GetAliasNames(), osl_getThreadTextEncoding())); + OString aOrigName(OUStringToOString(aDFA.GetFamilyName(), osl_getThreadTextEncoding())); + OString aAliasNames(OUStringToOString(aDFA.GetAliasNames(), osl_getThreadTextEncoding())); SAL_INFO( "vcl.fonts", "using alias names " << aAliasNames.getStr() << " for font family " << aOrigName.getStr() ); } #endif @@ -1235,7 +1233,7 @@ void GenPspGraphics::AnnounceFonts( ImplDevFontList* pFontList, const psp::FastP pFontList->Add( pFD ); } -bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ) +bool GenPspGraphics::filterText( const OUString& rOrig, OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ) { if( ! m_pPhoneNr ) return false; @@ -1253,7 +1251,7 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew sal_Int32 nPos; sal_Int32 nStart = 0; sal_Int32 nStop = rLen; - rtl::OUString aPhone = rOrig.copy( nIndex, rLen ); + OUString aPhone = rOrig.copy( nIndex, rLen ); if( ! m_bPhoneCollectionActive ) { @@ -1282,7 +1280,7 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew m_aPhoneCollection += aPhone.copy( nTokenStart, nTokenStop - nTokenStart ); if( ! m_bPhoneCollectionActive ) { - rtl::OUStringBuffer aPhoneNr; + OUStringBuffer aPhoneNr; aPhoneNr.append( "" ); aPhoneNr.append( m_aPhoneCollection ); aPhoneNr.append( "" ); @@ -1303,7 +1301,7 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew rCutStart = nStart+nIndex; rCutStop = nStop+nIndex; if (rCutStart != rCutStop) - rNewText = ( rCutStart ? rOrig.copy( 0, rCutStart ) : rtl::OUString() ) + rOrig.copy( rCutStop ); + rNewText = ( rCutStart ? rOrig.copy( 0, rCutStart ) : OUString() ) + rOrig.copy( rCutStop ); } return bRet && m_bSwallowFaxNo; @@ -1391,8 +1389,8 @@ const void* GenPspGraphics::DoGetEmbedFontData( psp::fontID aFont, const sal_Ucs *pDataLen = aStat.st_size; #else // FIXME: test me ! ... - rtl::OUString aURL; - if( !osl::File::getFileURLFromSystemPath( rtl::OStringToOUString( aSysPath, osl_getThreadTextEncoding() ), aURL ) ) + OUString aURL; + if( !osl::File::getFileURLFromSystemPath( OStringToOUString( aSysPath, osl_getThreadTextEncoding() ), aURL ) ) return NULL; osl::File aFile( aURL ); if( aFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_NoLock ) != osl::File::E_None ) diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index d5635e7e4d5b..d22d2c89e56d 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -43,10 +43,6 @@ using namespace vcl; using namespace psp; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OUStringToOString; GlyphSet::GlyphSet (sal_Int32 nFontID, sal_Bool bVertical) : mnFontID (nFontID), diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx index f469d9b2a3af..a062bb829b1b 100644 --- a/vcl/generic/print/glyphset.hxx +++ b/vcl/generic/print/glyphset.hxx @@ -42,7 +42,7 @@ private: sal_Int32 mnFontID; sal_Bool mbVertical; - rtl::OString maBaseName; + OString maBaseName; fonttype::type meBaseType; rtl_TextEncoding mnBaseEncoding; bool mbUseFontEncoding; @@ -55,12 +55,12 @@ private: char_list_t maCharList; glyph_list_t maGlyphList; - rtl::OString GetGlyphSetName (sal_Int32 nGlyphSetID); - rtl::OString GetCharSetName (sal_Int32 nGlyphSetID); + OString GetGlyphSetName (sal_Int32 nGlyphSetID); + OString GetCharSetName (sal_Int32 nGlyphSetID); sal_Int32 GetGlyphSetEncoding (sal_Int32 nGlyphSetID); - rtl::OString GetGlyphSetEncodingName (sal_Int32 nGlyphSetID); + OString GetGlyphSetEncodingName (sal_Int32 nGlyphSetID); - rtl::OString GetReencodedFontName (sal_Int32 nGlyphSetID); + OString GetReencodedFontName (sal_Int32 nGlyphSetID); void PSDefineReencodedFont (osl::File* pOutFile, sal_Int32 nGlyphSetID); @@ -96,12 +96,12 @@ public: sal_Int32 GetFontID (); fonttype::type GetFontType (); - static rtl::OString + static OString GetReencodedFontName (rtl_TextEncoding nEnc, - const rtl::OString &rFontName); - static rtl::OString + const OString &rFontName); + static OString GetGlyphSetEncodingName (rtl_TextEncoding nEnc, - const rtl::OString &rFontName); + const OString &rFontName); sal_Bool IsVertical (); void DrawText (PrinterGfx &rGfx, const Point& rPoint, @@ -115,7 +115,7 @@ public: const sal_Int32* pDeltaArray, sal_Bool bUseGlyphs=sal_True); sal_Bool PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx); - sal_Bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< rtl::OString >& rSuppliedFonts ); + sal_Bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts ); }; diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx index 2d7ada98857c..5d61ff90a9bf 100644 --- a/vcl/generic/print/printerjob.cxx +++ b/vcl/generic/print/printerjob.cxx @@ -47,10 +47,6 @@ using namespace psp; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; -using ::rtl::OStringBuffer; // forward declaration @@ -94,16 +90,16 @@ AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer, */ osl::File* -PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rExtension) +PrinterJob::CreateSpoolFile (const OUString& rName, const OUString& rExtension) { osl::File* pFile = NULL; - rtl::OUString aFile = rName + rExtension; - rtl::OUString aFileURL; + OUString aFile = rName + rExtension; + OUString aFileURL; osl::File::RC nError = osl::File::getFileURLFromSystemPath( aFile, aFileURL ); if (nError != osl::File::E_None) return NULL; - aFileURL = maSpoolDirName + rtl::OUString("/") + aFileURL; + aFileURL = maSpoolDirName + OUString("/") + aFileURL; pFile = new osl::File (aFileURL); nError = pFile->open (osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); @@ -194,9 +190,9 @@ PrinterJob::PrinterJob () : /* remove all our temporary files, uses external program "rm", since osl functionality is inadequate */ void -removeSpoolDir (const rtl::OUString& rSpoolDir) +removeSpoolDir (const OUString& rSpoolDir) { - rtl::OUString aSysPath; + OUString aSysPath; if( osl::File::E_None != osl::File::getSystemPathFromFileURL( rSpoolDir, aSysPath ) ) { // Conversion did not work, as this is quite a dangerous action, @@ -204,8 +200,8 @@ removeSpoolDir (const rtl::OUString& rSpoolDir) OSL_FAIL( "psprint: couldn't remove spool directory" ); return; } - rtl::OString aSysPathByte = - rtl::OUStringToOString (aSysPath, osl_getThreadTextEncoding()); + OString aSysPathByte = + OUStringToOString (aSysPath, osl_getThreadTextEncoding()); sal_Char pSystem [128]; sal_Int32 nChar = 0; @@ -218,23 +214,23 @@ removeSpoolDir (const rtl::OUString& rSpoolDir) /* creates a spool directory with a "pidgin random" value based on current system time */ -rtl::OUString +OUString createSpoolDir () { TimeValue aCur; osl_getSystemTime( &aCur ); sal_Int32 nRand = aCur.Seconds ^ (aCur.Nanosec/1000); - rtl::OUString aTmpDir; + OUString aTmpDir; osl_getTempDirURL( &aTmpDir.pData ); do { - rtl::OUStringBuffer aDir( aTmpDir.getLength() + 16 ); + OUStringBuffer aDir( aTmpDir.getLength() + 16 ); aDir.append( aTmpDir ); aDir.appendAscii( "/psp" ); aDir.append(nRand); - rtl::OUString aResult = aDir.makeStringAndClear(); + OUString aResult = aDir.makeStringAndClear(); if( osl::Directory::create( aResult ) == osl::FileBase::E_None ) { osl::File::setAttributes( aResult, @@ -245,7 +241,7 @@ createSpoolDir () } nRand++; } while( nRand ); - return rtl::OUString(); + return OUString(); } PrinterJob::~PrinterJob () @@ -293,7 +289,7 @@ static void WriteLocalTimePS( osl::File *rFile ) WritePS( rFile, "Unknown-Time" ); } -static bool isAscii( const rtl::OUString& rStr ) +static bool isAscii( const OUString& rStr ) { sal_Int32 nLen = rStr.getLength(); for( sal_Int32 i = 0; i < nLen; i++ ) @@ -304,10 +300,10 @@ static bool isAscii( const rtl::OUString& rStr ) sal_Bool PrinterJob::StartJob ( - const rtl::OUString& rFileName, + const OUString& rFileName, int nMode, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + const OUString& rJobName, + const OUString& rAppName, const JobData& rSetupData, PrinterGfx* pGraphics, bool bIsQuickJob @@ -325,9 +321,9 @@ PrinterJob::StartJob ( maSpoolDirName = createSpoolDir (); maJobTitle = rJobName; - rtl::OUString aExt(".ps"); - mpJobHeader = CreateSpoolFile (rtl::OUString("psp_head"), aExt); - mpJobTrailer = CreateSpoolFile (rtl::OUString("psp_tail"), aExt); + OUString aExt(".ps"); + mpJobHeader = CreateSpoolFile (OUString("psp_head"), aExt); + mpJobTrailer = CreateSpoolFile (OUString("psp_tail"), aExt); if( ! (mpJobHeader && mpJobTrailer) ) // existing files are removed in destructor return sal_False; @@ -336,7 +332,7 @@ PrinterJob::StartJob ( "%!PS-Adobe-3.0\n" "%%BoundingBox: (atend)\n" ); - rtl::OUString aFilterWS; + OUString aFilterWS; // Creator (this application) aFilterWS = WhitespaceToSpace( rAppName, sal_False ); @@ -346,7 +342,7 @@ PrinterJob::StartJob ( // For (user name) osl::Security aSecurity; - rtl::OUString aUserName; + OUString aUserName; if( aSecurity.getUserName( aUserName ) ) { WritePS (mpJobHeader, "%%For: ("); @@ -369,7 +365,7 @@ PrinterJob::StartJob ( * else omit %%Title */ aFilterWS = WhitespaceToSpace( rJobName, sal_False ); - rtl::OUString aTitle( aFilterWS ); + OUString aTitle( aFilterWS ); if( ! isAscii( aTitle ) ) { sal_Int32 nIndex = 0; @@ -377,7 +373,7 @@ PrinterJob::StartJob ( aTitle = rFileName.getToken( 0, '/', nIndex ); aTitle = WhitespaceToSpace( aTitle, sal_False ); if( ! isAscii( aTitle ) ) - aTitle = rtl::OUString(); + aTitle = OUString(); } maJobTitle = aFilterWS; @@ -429,7 +425,7 @@ PrinterJob::EndJob () return sal_False; // write document trailer according to Document Structuring Conventions (DSC) - rtl::OStringBuffer aTrailer(512); + OStringBuffer aTrailer(512); aTrailer.append( "%%Trailer\n" ); aTrailer.append( "%%BoundingBox: 0 0 " ); aTrailer.append( (sal_Int32)mnMaxWidthPt ); @@ -454,7 +450,7 @@ PrinterJob::EndJob () sal_Bool bSpoolToFile = !maFileName.isEmpty(); if (bSpoolToFile) { - const rtl::OString aFileName = rtl::OUStringToOString (maFileName, + const OString aFileName = OUStringToOString (maFileName, osl_getThreadTextEncoding()); if( mnFileMode ) { @@ -556,7 +552,7 @@ PrinterJob::InitPaperSize (const JobData& rJobSetup) { int nRes = rJobSetup.m_aContext.getRenderResolution (); - rtl::OUString aPaper; + OUString aPaper; int nWidth, nHeight; rJobSetup.m_aContext.getPageSize (aPaper, nWidth, nHeight); @@ -590,11 +586,11 @@ PrinterJob::StartPage (const JobData& rJobSetup) { InitPaperSize (rJobSetup); - rtl::OUString aPageNo = rtl::OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1 - rtl::OUString aExt = aPageNo + rtl::OUString(".ps"); + OUString aPageNo = OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1 + OUString aExt = aPageNo + OUString(".ps"); - osl::File* pPageHeader = CreateSpoolFile ( rtl::OUString("psp_pghead"), aExt); - osl::File* pPageBody = CreateSpoolFile ( rtl::OUString("psp_pgbody"), aExt); + osl::File* pPageHeader = CreateSpoolFile ( OUString("psp_pghead"), aExt); + osl::File* pPageBody = CreateSpoolFile ( OUString("psp_pgbody"), aExt); maHeaderList.push_back (pPageHeader); maPageList.push_back (pPageBody); @@ -975,15 +971,15 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob ) WritePS (pFile, "%%BeginSetup\n%\n"); // download fonts - std::list< rtl::OString > aFonts[2]; + std::list< OString > aFonts[2]; m_pGraphics->writeResources( pFile, aFonts[0], aFonts[1] ); for( int i = 0; i < 2; i++ ) { if( !aFonts[i].empty() ) { - std::list< rtl::OString >::const_iterator it = aFonts[i].begin(); - rtl::OStringBuffer aLine( 256 ); + std::list< OString >::const_iterator it = aFonts[i].begin(); + OStringBuffer aLine( 256 ); if( i == 0 ) aLine.append( "%%DocumentSuppliedResources: font " ); else @@ -1009,7 +1005,7 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob ) if( ! bExternalDialog && rJob.m_nCopies > 1 ) { // setup code - rtl::OStringBuffer aLine("/#copies "); + OStringBuffer aLine("/#copies "); aLine.append(static_cast(rJob.m_nCopies)); aLine.append(" def\n"); sal_uInt64 nWritten = 0; diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx index e2d3ca4b1a89..81da3844c5f0 100644 --- a/vcl/generic/print/psputil.cxx +++ b/vcl/generic/print/psputil.cxx @@ -158,7 +158,7 @@ WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength) } sal_Bool -WritePS (osl::File* pFile, const rtl::OString &rString) +WritePS (osl::File* pFile, const OString &rString) { sal_uInt64 nInLength = rString.getLength(); sal_uInt64 nOutLength = 0; @@ -170,9 +170,9 @@ WritePS (osl::File* pFile, const rtl::OString &rString) } sal_Bool -WritePS (osl::File* pFile, const rtl::OUString &rString) +WritePS (osl::File* pFile, const OUString &rString) { - return WritePS (pFile, rtl::OUStringToOString(rString, RTL_TEXTENCODING_ASCII_US)); + return WritePS (pFile, OUStringToOString(rString, RTL_TEXTENCODING_ASCII_US)); } /* diff --git a/vcl/generic/print/psputil.hxx b/vcl/generic/print/psputil.hxx index 9187931e8f4c..55e3d3b4c129 100644 --- a/vcl/generic/print/psputil.hxx +++ b/vcl/generic/print/psputil.hxx @@ -43,8 +43,8 @@ sal_Int32 appendStr (const sal_Char* pSrc, sal_Char* pDst); sal_Bool WritePS (osl::File* pFile, const sal_Char* pString); sal_Bool WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength); -sal_Bool WritePS (osl::File* pFile, const rtl::OString &rString); -sal_Bool WritePS (osl::File* pFile, const rtl::OUString &rString); +sal_Bool WritePS (osl::File* pFile, const OString &rString); +sal_Bool WritePS (osl::File* pFile, const OUString &rString); class ConverterFactory { diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx index 633b7421b612..841a9db7a355 100644 --- a/vcl/generic/print/text_gfx.cxx +++ b/vcl/generic/print/text_gfx.cxx @@ -118,7 +118,7 @@ PrinterGfx::SetFont( // font and encoding will be set by drawText again immediately // before PSShowText mnFontID = nFontID; - maVirtualStatus.maFont = rtl::OString(); + maVirtualStatus.maFont = OString(); maVirtualStatus.maEncoding = RTL_TEXTENCODING_DONTKNOW; maVirtualStatus.mnTextHeight = nHeight; maVirtualStatus.mnTextWidth = nWidth; @@ -531,13 +531,13 @@ PrinterGfx::LicenseWarning(const Point& rPoint, const sal_Unicode* pStr, // they are installed on displays and printers, but get not embedded in // print files or documents because they are not licensed for use outside // the company. - rtl::OString aMessage( "The font " ); - aMessage += rtl::OUStringToOString( mrFontMgr.getPSName(mnFontID), + OString aMessage( "The font " ); + aMessage += OUStringToOString( mrFontMgr.getPSName(mnFontID), RTL_TEXTENCODING_ASCII_US ); aMessage += " could not be downloaded\nbecause its license does not allow for that"; PSComment( aMessage.getStr() ); - rtl::OString aFontName = rtl::OUStringToOString( + OString aFontName = OUStringToOString( mrFontMgr.getPSName(mnFontID), RTL_TEXTENCODING_ASCII_US); PSSetFont (aFontName, RTL_TEXTENCODING_ISO_8859_1); @@ -706,21 +706,21 @@ PrinterGfx::OnEndJob () } void -PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts ) +PrinterGfx::writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts, std::list< OString >& rNeededFonts ) { // write all type 1 fonts std::list< sal_Int32 >::iterator aFont; // already in the document header ? for (aFont = maPS1Font.begin(); aFont != maPS1Font.end(); ++aFont) { - const rtl::OString& rSysPath (mrFontMgr.getFontFileSysPath(*aFont) ); - rtl::OUString aUNCPath; + const OString& rSysPath (mrFontMgr.getFontFileSysPath(*aFont) ); + OUString aUNCPath; osl::File::getFileURLFromSystemPath (OStringToOUString (rSysPath, osl_getThreadTextEncoding()), aUNCPath); osl::File aFontFile (aUNCPath); // provide the pfb or pfa font as a (pfa-)font resource - rtl::OString aPostScriptName = - rtl::OUStringToOString ( mrFontMgr.getPSName(*aFont), + OString aPostScriptName = + OUStringToOString ( mrFontMgr.getPSName(*aFont), RTL_TEXTENCODING_ASCII_US ); WritePS (pFile, "%%BeginResource: font "); @@ -763,7 +763,7 @@ PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppli aIter->PSUploadEncoding (pFile, *this); if( aIter->GetFontType() == fonttype::Builtin ) rNeededFonts.push_back( - rtl::OUStringToOString( + OUStringToOString( mrFontMgr.getPSName( aIter->GetFontID() ), RTL_TEXTENCODING_ASCII_US ) ); } diff --git a/vcl/headless/svpelement.cxx b/vcl/headless/svpelement.cxx index 5458fe8a7539..8b6f3604ca41 100644 --- a/vcl/headless/svpelement.cxx +++ b/vcl/headless/svpelement.cxx @@ -158,21 +158,21 @@ IMPL_LINK( SvpElementContainer, processRequest, void*, pSocket ) { int nFile = (int)pSocket; - rtl::OStringBuffer aBuf( 256 ), aAnswer( 256 ); + OStringBuffer aBuf( 256 ), aAnswer( 256 ); char c; while( read( nFile, &c, 1 ) && c != '\n' ) aBuf.append( sal_Char(c) ); - rtl::OString aCommand( aBuf.makeStringAndClear() ); + OString aCommand( aBuf.makeStringAndClear() ); if( aCommand.startsWith( "list" ) ) { - boost::unordered_map< rtl::OString, std::list, rtl::OStringHash > aMap; + boost::unordered_map< OString, std::list, OStringHash > aMap; for( std::list< SvpElement* >::const_iterator it = m_aElements.begin(); it != m_aElements.end(); ++it ) { std::list& rList = aMap[matchType(*it)]; rList.push_back( *it ); } - for( boost::unordered_map< rtl::OString, std::list, rtl::OStringHash>::const_iterator hash_it = aMap.begin(); + for( boost::unordered_map< OString, std::list, OStringHash>::const_iterator hash_it = aMap.begin(); hash_it != aMap.end(); ++hash_it ) { aAnswer.append( "ElementType: " ); diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 41f4629cf75c..18c84f3ef9e5 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -191,7 +191,7 @@ void SvpSalFrame::PostPaint(bool bImmediate) const } } -void SvpSalFrame::SetTitle( const rtl::OUString& ) +void SvpSalFrame::SetTitle( const OUString& ) { } @@ -400,9 +400,9 @@ void SvpSalFrame::EndExtTextInput( sal_uInt16 ) { } -rtl::OUString SvpSalFrame::GetKeyName( sal_uInt16 ) +OUString SvpSalFrame::GetKeyName( sal_uInt16 ) { - return rtl::OUString(); + return OUString(); } sal_Bool SvpSalFrame::MapUnicodeToKeyCode( sal_Unicode, LanguageType, KeyCode& ) diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 96733ec97d8c..2c4412fb2705 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -48,7 +48,7 @@ rDevice { #if OSL_DEBUG_LEVEL > 2 static int dbgStreamNum = 0; - rtl::OStringBuffer aBuf( 256 ); + OStringBuffer aBuf( 256 ); aBuf.append( "debug" ); mkdir( aBuf.getStr(), 0777 ); aBuf.append( "/" ); diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 1e748231b637..717579f8e90a 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -341,7 +341,7 @@ void SvpSalGraphics::GetDevFontList( ImplDevFontList* pDevFontList ) // inform GlyphCache about this font provided by the PsPrint subsystem ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes( aInfo ); aDFA.mnQuality += 4096; - const rtl::OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); + const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA, pExtraKernInfo ); } diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h index 2faf8462fe1a..cb5941b9fce9 100644 --- a/vcl/inc/aqua/atsui/salgdi.h +++ b/vcl/inc/aqua/atsui/salgdi.h @@ -221,9 +221,9 @@ public: const Point& aPos, sal_Bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ); + const OUString& aCaption ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const rtl::OUString& aCaption, + const ImplControlValue& aValue, const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); // get device resolution @@ -270,7 +270,7 @@ public: // graphics should call ImplAddDevFontSubstitute on supplied // OutputDevice for all its device specific preferred font substitutions virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); // CreateFontSubset: a method to get a subset of glyhps of a font // inside a new valid font file // returns TRUE if creation of subset was successfull @@ -283,7 +283,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h index 39d9496a9fe0..ade5438ac580 100644 --- a/vcl/inc/aqua/salframe.h +++ b/vcl/inc/aqua/salframe.h @@ -107,9 +107,9 @@ public: virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const rtl::OUString& rTitle ); + virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); - virtual void SetRepresentedURL( const rtl::OUString& ); + virtual void SetRepresentedURL( const OUString& ); virtual void SetMenu( SalMenu* pSalMenu ); virtual void DrawMenuBar(); virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ); @@ -134,7 +134,7 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); @@ -147,7 +147,7 @@ public: virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetExtendedFrameStyle( SalExtStyle ); virtual void SetScreenNumber(unsigned int); - virtual void SetApplicationID( const rtl::OUString &rApplicationID ); + virtual void SetApplicationID( const OUString &rApplicationID ); // shaped system windows // set clip region to none (-> rectangular windows, normal state) diff --git a/vcl/inc/aqua/salinst.h b/vcl/inc/aqua/salinst.h index 7498d57ee7cb..89469c779ae7 100644 --- a/vcl/inc/aqua/salinst.h +++ b/vcl/inc/aqua/salinst.h @@ -67,7 +67,7 @@ class AquaSalInstance : public SalInstance public: SalYieldMutex* mpSalYieldMutex; // Sal-Yield-Mutex - rtl::OUString maDefaultPrinter; + OUString maDefaultPrinter; oslThreadIdentifier maMainThread; bool mbWaitingYield; int mnActivePrintJobs; @@ -102,7 +102,7 @@ public: virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ); virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ); virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ); - virtual rtl::OUString GetDefaultPrinter(); + virtual OUString GetDefaultPrinter(); virtual SalTimer* CreateSalTimer(); virtual SalI18NImeStatus* CreateI18NImeStatus(); virtual SalSystem* CreateSalSystem(); @@ -119,7 +119,7 @@ public: virtual void DestroyMenuItem( SalMenuItem* ); virtual SalSession* CreateSalSession(); virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); virtual void SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) ); virtual void SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) ); @@ -133,7 +133,7 @@ public: // check whether a particular string is passed on the command line // this is needed to avoid duplicate open events through a) command line and b) NSApp's openFile - static bool isOnCommandLine( const rtl::OUString& ); + static bool isOnCommandLine( const OUString& ); void wakeupYield(); diff --git a/vcl/inc/aqua/salmenu.h b/vcl/inc/aqua/salmenu.h index 2f0383f53476..326bcd7f4cf2 100644 --- a/vcl/inc/aqua/salmenu.h +++ b/vcl/inc/aqua/salmenu.h @@ -65,9 +65,9 @@ public: virtual void SetFrame( const SalFrame* pFrame ); virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ); + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags); virtual bool AddMenuBarButton( const SalMenuButtonItem& ); diff --git a/vcl/inc/aqua/salprn.h b/vcl/inc/aqua/salprn.h index 5245d6912c1f..443cbe421e4f 100644 --- a/vcl/inc/aqua/salprn.h +++ b/vcl/inc/aqua/salprn.h @@ -82,7 +82,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter long& o_rPageWidth, long& o_rPageHeight ); virtual sal_uLong GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType ); virtual sal_uLong GetPaperBinCount( const ImplJobSetup* i_pSetupData ); - virtual rtl::OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ); + virtual OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* i_pSetupData ); @@ -91,9 +91,9 @@ class AquaSalInfoPrinter : public SalInfoPrinter // so let's make AquaSalPrinter just a forwarder to AquaSalInfoPrinter // and concentrate the real work in one class // implement pull model print system - sal_Bool StartJob( const rtl::OUString* i_pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& i_rAppName, + sal_Bool StartJob( const OUString* i_pFileName, + const OUString& rJobName, + const OUString& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ); sal_Bool EndJob(); @@ -127,17 +127,17 @@ class AquaSalPrinter : public SalPrinter AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter ); virtual ~AquaSalPrinter(); - virtual sal_Bool StartJob( const rtl::OUString* i_pFileName, - const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, + virtual sal_Bool StartJob( const OUString* i_pFileName, + const OUString& i_rJobName, + const OUString& i_rAppName, sal_uLong i_nCopies, bool i_bCollate, bool i_bDirect, ImplJobSetup* i_pSetupData ); // implement pull model print system - virtual sal_Bool StartJob( const rtl::OUString* i_pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& i_rAppName, + virtual sal_Bool StartJob( const OUString* i_pFileName, + const OUString& rJobName, + const OUString& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rListener ); diff --git a/vcl/inc/aqua/salsys.h b/vcl/inc/aqua/salsys.h index 1a8bc8716b54..38bbe8a737c2 100644 --- a/vcl/inc/aqua/salsys.h +++ b/vcl/inc/aqua/salsys.h @@ -39,9 +39,9 @@ public: virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ); - virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ); - virtual int ShowNativeMessageBox( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, + virtual OUString GetDisplayScreenName( unsigned int nScreen ); + virtual int ShowNativeMessageBox( const OUString& rTitle, + const OUString& rMessage, int nButtonCombination, int nDefaultButton, bool bUseResources); }; diff --git a/vcl/inc/coretext/salgdi.h b/vcl/inc/coretext/salgdi.h index 4ca5eb638a67..220e2e368781 100644 --- a/vcl/inc/coretext/salgdi.h +++ b/vcl/inc/coretext/salgdi.h @@ -183,10 +183,10 @@ public: const Point& aPos, sal_Bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ); + const OUString& aCaption ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption, + const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); @@ -234,8 +234,8 @@ public: // graphics should call ImplAddDevFontSubstitute on supplied // OutputDevice for all its device specific preferred font substitutions virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, - const rtl::OUString& rFontName ); + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, + const OUString& rFontName ); // CreateFontSubset: a method to get a subset of glyhps of a font // inside a new valid font file // returns TRUE if creation of subset was successfull @@ -248,7 +248,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx index 02346cd31069..9a84b7790889 100644 --- a/vcl/inc/cupsmgr.hxx +++ b/vcl/inc/cupsmgr.hxx @@ -38,19 +38,19 @@ struct FPtrHash class CUPSManager : public PrinterInfoManager { - boost::unordered_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles; + boost::unordered_map< FILE*, OString, FPtrHash > m_aSpoolFiles; int m_nDests; void* m_pDests; bool m_bNewDests; - boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap; + boost::unordered_map< OUString, int, OUStringHash > m_aCUPSDestMap; - boost::unordered_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts; + boost::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts; - rtl::OString m_aUser; + OString m_aUser; // this is a security risk, but the CUPS API demands // to deliver a pointer to a static buffer containing // the password, so this cannot be helped - rtl::OString m_aPassword; + OString m_aPassword; osl::Mutex m_aCUPSMutex; oslThread m_aDestThread; @@ -72,27 +72,27 @@ public: static CUPSManager* tryLoadCUPS(); - const PPDParser* createCUPSParser( const rtl::OUString& rPrinter ); + const PPDParser* createCUPSParser( const OUString& rPrinter ); // wraps cupsGetPPD, so unlink after use ! const char* authenticateUser( const char* ); - virtual FILE* startSpool( const rtl::OUString& rPrinterName, bool bQuickCommand ); - virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); + virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ); + virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); virtual void setupJobContextData( JobData& rData ); // changes the info about a named printer - virtual void changePrinterInfo( const ::rtl::OUString& rPrinter, const PrinterInfo& rNewInfo ); + virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ); // check if the printer configuration has changed virtual bool checkPrintersChanged( bool bWait ); // members for administration (->padmin) // disable for CUPS - virtual bool addPrinter( const rtl::OUString& rPrinterName, const ::rtl::OUString& rDriverName ); - virtual bool removePrinter( const rtl::OUString& rPrinterName, bool bCheckOnly = false ); + virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName ); + virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false ); virtual bool writePrinterConfig(); - virtual bool setDefaultPrinter( const rtl::OUString& rPrinterName ); + virtual bool setDefaultPrinter( const OUString& rPrinterName ); virtual bool addOrRemovePossible() const; }; diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx index 8a9e736605d6..ad2a8bbd10ac 100644 --- a/vcl/inc/fontcache.hxx +++ b/vcl/inc/fontcache.hxx @@ -43,7 +43,7 @@ class VCL_PLUGIN_PUBLIC FontCache FontCacheEntry m_aEntry; }; - typedef boost::unordered_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap; + typedef boost::unordered_map< OString, FontFile, OStringHash > FontDirMap; struct FontDir { sal_Int64 m_nTimestamp; @@ -71,15 +71,15 @@ public: FontCache(); ~FontCache(); - bool getFontCacheFile( int nDirID, const rtl::OString& rFile, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const; + bool getFontCacheFile( int nDirID, const OString& rFile, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const; void updateFontCacheEntry( const PrintFontManager::PrintFont*, bool bFlush ); void markEmptyDir( int nDirID, bool bNoFiles = true ); // returns false for non cached directory // a cached but empty directory will return true but not append anything - bool listDirectory( const rtl::OString& rDir, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const; + bool listDirectory( const OString& rDir, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const; // returns true for directoris that contain only user overridden fonts - bool scanAdditionalFiles( const rtl::OString& rDir ); + bool scanAdditionalFiles( const OString& rDir ); void flush(); }; diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx index 67226b0a5239..123544f0e38c 100644 --- a/vcl/inc/generic/gendata.hxx +++ b/vcl/inc/generic/gendata.hxx @@ -49,9 +49,9 @@ class VCL_DLLPUBLIC SalGenericData : public SalData SalGenericDataType m_eType; SalGenericDisplay *m_pDisplay; // cached hostname to avoid slow lookup - rtl::OUString m_aHostname; + OUString m_aHostname; // for transient storage of unicode strings eg. 'u123' by input methods - rtl::OUString m_aUnicodeEntry; + OUString m_aUnicodeEntry; public: SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( NULL ) { m_pInstance = pInstance; SetSalData( this ); } virtual ~SalGenericData() {} @@ -60,13 +60,13 @@ class VCL_DLLPUBLIC SalGenericData : public SalData SalGenericDisplay *GetDisplay() const { return m_pDisplay; } void SetDisplay( SalGenericDisplay *pDisp ) { m_pDisplay = pDisp; } - const rtl::OUString& GetHostname() + const OUString& GetHostname() { if (m_aHostname.isEmpty()) osl_getLocalHostname( &m_aHostname.pData ); return m_aHostname; } - rtl::OUString &GetUnicodeCommand() + OUString &GetUnicodeCommand() { return m_aUnicodeEntry; } diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h index 9e2b5ca47512..de47409e4fff 100644 --- a/vcl/inc/generic/geninst.h +++ b/vcl/inc/generic/geninst.h @@ -95,7 +95,7 @@ public: virtual void GetPrinterQueueInfo ( ImplPrnQueueList* pList ); virtual void GetPrinterQueueState ( SalPrinterQueueInfo* pInfo ); virtual void DeletePrinterQueueInfo ( SalPrinterQueueInfo* pInfo ); - virtual rtl::OUString GetDefaultPrinter(); + virtual OUString GetDefaultPrinter(); virtual void PostPrintersChanged() = 0; virtual void updatePrinterUpdate(); virtual void jobStartedPrinterUpdate(); diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h index d7397b4d01d7..698cc3e95dfc 100644 --- a/vcl/inc/generic/genprn.h +++ b/vcl/inc/generic/genprn.h @@ -49,7 +49,7 @@ public: long& rPageWidth, long& rPageHeight ); virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); + virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; @@ -57,9 +57,9 @@ public: class VCL_DLLPUBLIC PspSalPrinter : public SalPrinter { public: - rtl::OUString m_aFileName; - rtl::OUString m_aTmpFile; - rtl::OUString m_aFaxNr; + OUString m_aFileName; + OUString m_aTmpFile; + OUString m_aFaxNr; bool m_bFax:1; bool m_bPdf:1; bool m_bSwallowFaxNo:1; @@ -76,16 +76,16 @@ public: virtual ~PspSalPrinter(); // overload all pure virtual methods - virtual sal_Bool StartJob( const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + virtual sal_Bool StartJob( const OUString* pFileName, + const OUString& rJobName, + const OUString& rAppName, sal_uIntPtr nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ); - virtual sal_Bool StartJob( const rtl::OUString*, - const rtl::OUString&, - const rtl::OUString&, + virtual sal_Bool StartJob( const OUString*, + const OUString&, + const OUString&, ImplJobSetup*, vcl::PrinterController& i_rController ); virtual sal_Bool EndJob(); diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 36c0e609fa67..4a1d8a00aa2b 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -39,9 +39,9 @@ class VCL_DLLPUBLIC GenPspGraphics : public SalGraphics protected: psp::JobData* m_pJobData; psp::PrinterGfx* m_pPrinterGfx; - rtl::OUString* m_pPhoneNr; + OUString* m_pPhoneNr; bool m_bSwallowFaxNo; - rtl::OUString m_aPhoneCollection; + OUString m_aPhoneCollection; bool m_bPhoneCollectionActive; ServerFont* m_pServerFont[ MAX_FALLBACK ]; @@ -52,7 +52,7 @@ public: virtual ~GenPspGraphics(); void Init( psp::JobData* pJob, psp::PrinterGfx* pGfx, - rtl::OUString* pPhone, bool bSwallow, + OUString* pPhone, bool bSwallow, SalInfoPrinter* pInfoPrinter ); // helper methods @@ -97,9 +97,9 @@ public: // graphics must drop any cached font info virtual void ClearDevFontCache(); virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -175,7 +175,7 @@ public: virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); - virtual bool filterText( const rtl::OUString& rOrigText, rtl::OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ); + virtual bool filterText( const OUString& rOrigText, OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ); virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h index d51f222a4855..d60cc1766b14 100644 --- a/vcl/inc/generic/gensys.h +++ b/vcl/inc/generic/gensys.h @@ -33,13 +33,13 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem public: SalGenericSystem(); virtual ~SalGenericSystem(); - virtual int ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual int ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ) = 0; - virtual int ShowNativeMessageBox( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, + virtual int ShowNativeMessageBox( const OUString& rTitle, + const OUString& rMessage, int nButtonCombination, int nDefaultButton, bool bUseResources); @@ -47,7 +47,7 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem // Simple helpers for X11 WM_CLASS hints static const char *getFrameResName(); static const char *getFrameClassName(); - static rtl::OString getFrameResName( SalExtStyle nStyle ); + static OString getFrameResName( SalExtStyle nStyle ); #endif }; diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 033b6463e984..24cda3c21040 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -72,7 +72,7 @@ public: static GlyphCache& GetInstance(); - void AddFontFile( const rtl::OString& rNormalizedName, + void AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&, const ExtraKernInfo* = NULL ); void AnnounceFonts( ImplDevFontList* ) const; @@ -184,7 +184,7 @@ public: ServerFont( const FontSelectPattern&, FtFontInfo* ); virtual ~ServerFont(); - const ::rtl::OString* GetFontFileName() const; + const OString* GetFontFileName() const; bool TestFont() const; FT_Face GetFtFace() const; int GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); } diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index d69837e05d97..68a1069c07dc 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -160,7 +160,7 @@ typedef enum { struct GraphicsStatus { - rtl::OString maFont; + OString maFont; rtl_TextEncoding maEncoding; bool mbArtItalic; bool mbArtBold; @@ -264,7 +264,7 @@ public: { maVirtualStatus.maColor = rColor; } void PSUploadPS1Font (sal_Int32 nFontID); - void PSSetFont (const rtl::OString& rName, + void PSSetFont (const OString& rName, rtl_TextEncoding nEncoding = RTL_TEXTENCODING_DONTKNOW) { maVirtualStatus.maFont = rName; maVirtualStatus.maEncoding = nEncoding; } @@ -302,7 +302,7 @@ public: void OnEndPage (); void OnEndJob (); - void writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts ); + void writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts, std::list< OString >& rNeededFonts ); PrintFontManager& GetFontMgr () { return mrFontMgr; } void drawVerticalizedText (const Point& rPoint, diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx index 055b92d5a944..b60cc098323b 100644 --- a/vcl/inc/generic/printerjob.hxx +++ b/vcl/inc/generic/printerjob.hxx @@ -36,9 +36,9 @@ class PrinterJob { private: // private data - rtl::OUString maSpoolDirName; - rtl::OUString maFileName; // empty: spool to command, else spool to named file - rtl::OUString maJobTitle; + OUString maSpoolDirName; + OUString maFileName; // empty: spool to command, else spool to named file + OUString maJobTitle; int mnFileMode; osl::File* mpJobHeader; @@ -73,8 +73,8 @@ private: // private data private: // private methods - osl::File* CreateSpoolFile (const rtl::OUString& rName, - const rtl::OUString& rExtension); + osl::File* CreateSpoolFile (const OUString& rName, + const OUString& rExtension); void InitPaperSize (const JobData& rJobSetup); bool writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup ); @@ -94,7 +94,7 @@ public: // for usage in PrinterGfx osl::File* GetCurrentPageHeader (); osl::File* GetCurrentPageBody (); - const ::rtl::OUString& GetPrinterName() const { return m_aLastJobData.m_aPrinterName; } + const OUString& GetPrinterName() const { return m_aLastJobData.m_aPrinterName; } public: PrinterJob (); @@ -114,10 +114,10 @@ public: * the quick command for spooling should be used instead * of the normal command */ - sal_Bool StartJob (const rtl::OUString& rFileName, + sal_Bool StartJob (const OUString& rFileName, int nMode, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + const OUString& rJobName, + const OUString& rAppName, const JobData& rSetupData, PrinterGfx* pGraphics, bool bIsQuickJob diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx index 26ff9b49198e..da8e619fd64c 100644 --- a/vcl/inc/graphite_features.hxx +++ b/vcl/inc/graphite_features.hxx @@ -40,8 +40,8 @@ namespace grutils static const char FEAT_PREFIX; static const char FEAT_SEPARATOR; static const char FEAT_ID_VALUE_SEPARATOR; - GrFeatureParser(const gr_face * face, const ::rtl::OString features, const ::rtl::OString lang); - GrFeatureParser(const gr_face * face, const ::rtl::OString lang); + GrFeatureParser(const gr_face * face, const OString features, const OString lang); + GrFeatureParser(const gr_face * face, const OString lang); ~GrFeatureParser(); //size_t getFontFeatures(gr::FeatureSetting settings[MAX_FEATURES]) const; bool parseErrors() { return mbErrors; }; @@ -53,10 +53,10 @@ namespace grutils gr_feature_val * values() const { return mpSettings; }; private: GrFeatureParser(const GrFeatureParser & copy); - void setLang(const gr_face * face, const ::rtl::OString & lang); - bool isCharId(const ::rtl::OString & id, size_t offset, size_t length); - gr_uint32 getCharId(const ::rtl::OString & id, size_t offset, size_t length); - short getIntValue(const ::rtl::OString & id, size_t offset, size_t length); + void setLang(const gr_face * face, const OString & lang); + bool isCharId(const OString & id, size_t offset, size_t length); + gr_uint32 getCharId(const OString & id, size_t offset, size_t length); + short getIntValue(const OString & id, size_t offset, size_t length); size_t mnNumSettings; FeatId maLang; bool mbErrors; diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index e4405c3d390c..147811d359c3 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -67,11 +67,11 @@ public: virtual unsigned int GetDisplayScreenCount(); virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ); - virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ); + virtual OUString GetDisplayScreenName( unsigned int nScreen ); - virtual int ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual int ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ); }; diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 342f542e2554..aa3cdd27ef9b 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -74,7 +74,7 @@ public: virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const rtl::OUString& rTitle ); + virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu* pMenu ); virtual void DrawMenuBar(); @@ -102,7 +102,7 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); @@ -124,7 +124,7 @@ public: /*TODO: functional implementation */ virtual void SetScreenNumber( unsigned int nScreen ) { (void)nScreen; } - virtual void SetApplicationID(const rtl::OUString &rApplicationID) { (void) rApplicationID; } + virtual void SetApplicationID(const OUString &rApplicationID) { (void) rApplicationID; } bool IsVisible() { return m_bVisible; } static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; } diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 50a3f872d5c6..3cf98ee2b1cc 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -120,8 +120,8 @@ public: virtual void GetDevFontList( ImplDevFontList* ); virtual void ClearDevFontCache(); virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index 176002e34d27..7f625e86f4de 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -135,7 +135,7 @@ public: virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ); virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ); virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ); - virtual rtl::OUString GetDefaultPrinter(); + virtual OUString GetDefaultPrinter(); virtual void PostPrintersChanged(); // SalTimer @@ -158,7 +158,7 @@ public: virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); virtual GenPspGraphics *CreatePrintGraphics(); }; diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index d2ae81f8ceff..a18b2931709c 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -496,8 +496,8 @@ public: sal_Bool IsSelectionChanged() const { return maLBWindow.IsSelectionChanged(); } sal_uInt16 GetSelectModifier() const { return maLBWindow.GetSelectModifier(); } - void SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep ); - rtl::OUString GetMRUEntries( sal_Unicode cSep ) const; + void SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ); + OUString GetMRUEntries( sal_Unicode cSep ) const; void SetMaxMRUCount( sal_uInt16 n ) { maLBWindow.GetEntryList()->SetMaxMRUCount( n ); } sal_uInt16 GetMaxMRUCount() const { return maLBWindow.GetEntryList()->GetMaxMRUCount(); } sal_uInt16 GetDisplayLineCount() const diff --git a/vcl/inc/image.h b/vcl/inc/image.h index f16b595c2709..ec12a3d41aba 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -68,18 +68,18 @@ enum ImageType { IMAGETYPE_BITMAP, IMAGETYPE_IMAGE }; struct ImageAryData { - ::rtl::OUString maName; + OUString maName; // Images identified by either name, or by id sal_uInt16 mnId; BitmapEx maBitmapEx; - ImageAryData( const rtl::OUString &aName, + ImageAryData( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmap ); ImageAryData( const ImageAryData& rData ); ~ImageAryData(); bool IsLoadable() { return maBitmapEx.IsEmpty() && !maName.isEmpty(); } - void Load(const rtl::OUString &rPrefix); + void Load(const OUString &rPrefix); ImageAryData& operator=( const ImageAryData& rData ); }; @@ -89,12 +89,12 @@ struct ImageAryData struct ImplImageList { typedef std::vector ImageAryDataVec; - typedef boost::unordered_map< rtl::OUString, ImageAryData *, rtl::OUStringHash > + typedef boost::unordered_map< OUString, ImageAryData *, OUStringHash > ImageAryDataNameHash; ImageAryDataVec maImages; ImageAryDataNameHash maNameHash; - rtl::OUString maPrefix; + OUString maPrefix; Size maImageSize; sal_uIntPtr mnRefCount; @@ -102,7 +102,7 @@ struct ImplImageList ImplImageList( const ImplImageList &aSrc ); ~ImplImageList(); - void AddImage( const ::rtl::OUString &aName, + void AddImage( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmapEx ); void RemoveImage( sal_uInt16 nPos ); }; diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx index 75009faafd5c..f42a0391bc90 100644 --- a/vcl/inc/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx @@ -45,14 +45,14 @@ public: ~ImplImageTree(); // check whether the icon style is installed - bool checkStyle(rtl::OUString const & style); + bool checkStyle(OUString const & style); bool loadImage( - rtl::OUString const & name, rtl::OUString const & style, + OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized = false, bool loadMissing = false ); bool loadDefaultImage( - rtl::OUString const & style, + OUString const & style, BitmapEx& bitmap); void shutDown(); @@ -62,34 +62,34 @@ public: private: bool doLoadImage( - rtl::OUString const & name, rtl::OUString const & style, + OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized); typedef std::list< std::pair< - rtl::OUString, + OUString, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > > > Paths; typedef boost::unordered_map< - rtl::OUString, bool, rtl::OUStringHash > CheckStyleCache; + OUString, bool, OUStringHash > CheckStyleCache; typedef boost::unordered_map< - rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache; + OUString, std::pair< bool, BitmapEx >, OUStringHash > IconCache; - rtl::OUString m_style; + OUString m_style; Paths m_paths; CheckStyleCache m_checkStyleCache; IconCache m_iconCache; bool m_cacheIcons; - void setStyle(rtl::OUString const & style ); + void setStyle(OUString const & style ); void resetPaths(); - bool checkStyleCacheLookup( rtl::OUString const & style, bool &exists ); - bool iconCacheLookup( rtl::OUString const & name, bool localized, BitmapEx & bitmap ); + bool checkStyleCacheLookup( OUString const & style, bool &exists ); + bool iconCacheLookup( OUString const & name, bool localized, BitmapEx & bitmap ); - bool find(std::vector< rtl::OUString > const & paths, BitmapEx & bitmap ); + bool find(std::vector< OUString > const & paths, BitmapEx & bitmap ); }; typedef salhelper::SingletonRef< ImplImageTree > ImplImageTreeSingletonRef; diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h index 529855895cec..262e8b5818da 100644 --- a/vcl/inc/jobset.h +++ b/vcl/inc/jobset.h @@ -45,8 +45,8 @@ struct ImplJobSetup { sal_uInt16 mnRefCount; // RefCount (only independ data) sal_uInt16 mnSystem; // Sytem - JOBSETUP_SYSTEM_xxxx - rtl::OUString maPrinterName; // Printer-Name - rtl::OUString maDriver; // Driver-Name + OUString maPrinterName; // Printer-Name + OUString maDriver; // Driver-Name Orientation meOrientation; // Orientation DuplexMode meDuplexMode; // Duplex sal_uInt16 mnPaperBin; // paper bin / in tray @@ -55,7 +55,7 @@ struct ImplJobSetup long mnPaperHeight; // paper height (100th mm) sal_uIntPtr mnDriverDataLen; // length of system specific data sal_uInt8* mpDriverData; // system specific data (will be streamed a byte block) - ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap; + ::boost::unordered_map< OUString, OUString, OUStringHash > maValueMap; ImplJobSetup(); ImplJobSetup( const ImplJobSetup& rJobSetup ); diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index 0842a013d1ac..cf5feb0093ca 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -189,7 +189,7 @@ class ImplGlyphFallbackFontSubstitution : public ImplFontSubstitution { public: - virtual bool FindFontSubstitute( FontSelectPattern&, rtl::OUString& rMissingCodes ) const = 0; + virtual bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const = 0; }; // ----------------- @@ -220,7 +220,7 @@ public: ImplFontEntry* GetFontEntry( ImplDevFontList*, FontSelectPattern&, ImplDirectFontSubstitution* pDevSpecific ); ImplFontEntry* GetGlyphFallbackFont( ImplDevFontList*, FontSelectPattern&, - int nFallbackLevel, rtl::OUString& rMissingCodes ); + int nFallbackLevel, OUString& rMissingCodes ); void Release( ImplFontEntry* ); void Invalidate(); }; diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 9d5066ba5af5..140af384f13a 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -238,7 +238,7 @@ public: // suggest fonts for glyph fallback ImplDevFontListData* GetGlyphFallbackFont( FontSelectPattern&, - rtl::OUString& rMissingCodes, int nFallbackLevel ) const; + OUString& rMissingCodes, int nFallbackLevel ) const; // prepare platform specific font substitutions void SetPreMatchHook( ImplPreMatchFontSubstitution* ); @@ -249,17 +249,17 @@ public: ImplGetDevFontList* GetDevFontList() const; ImplGetDevSizeList* GetDevSizeList( const String& rFontName ) const; - ImplDevFontListData* ImplFindByTokenNames(const rtl::OUString& rTokenStr) const; + ImplDevFontListData* ImplFindByTokenNames(const OUString& rTokenStr) const; protected: void InitMatchData() const; bool AreMapNamesAvailable() const { return mbMapNames; } - ImplDevFontListData* ImplFindByAliasName(const rtl::OUString& rSearchName, - const rtl::OUString& rShortName) const; + ImplDevFontListData* ImplFindByAliasName(const OUString& rSearchName, + const OUString& rShortName) const; ImplDevFontListData* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const; ImplDevFontListData* ImplFindByAttributes(sal_uLong nSearchType, FontWeight, FontWidth, - FontItalic, const rtl::OUString& rSearchFamily) const; + FontItalic, const OUString& rSearchFamily) const; ImplDevFontListData* FindDefaultFont() const; private: diff --git a/vcl/inc/print.h b/vcl/inc/print.h index aabe813704f0..bd642c66bdd9 100644 --- a/vcl/inc/print.h +++ b/vcl/inc/print.h @@ -52,16 +52,16 @@ struct ImplPrnQueueData class VCL_PLUGIN_PUBLIC ImplPrnQueueList { public: - boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash > + boost::unordered_map< OUString, sal_Int32, OUStringHash > m_aNameToIndex; std::vector< ImplPrnQueueData > m_aQueueInfos; - std::vector< rtl::OUString > m_aPrinterList; + std::vector< OUString > m_aPrinterList; ImplPrnQueueList() {} ~ImplPrnQueueList(); void Add( SalPrinterQueueInfo* pData ); - ImplPrnQueueData* Get( const rtl::OUString& rPrinter ); + ImplPrnQueueData* Get( const OUString& rPrinter ); }; // -------------- diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 296d5b89edea..30e5fe8e9b6b 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -52,8 +52,8 @@ namespace vcl Size maPreviewSize; VirtualDevice maPageVDev; Bitmap maPreviewBitmap; - rtl::OUString maReplacementString; - rtl::OUString maToolTipString; + OUString maReplacementString; + OUString maToolTipString; bool mbGreyscale; FixedLine maHorzDim; FixedLine maVertDim; @@ -70,8 +70,8 @@ namespace vcl virtual void DataChanged( const DataChangedEvent& ); void setPreview( const GDIMetaFile&, const Size& i_rPaperSize, - const rtl::OUString& i_rPaperName, - const rtl::OUString& i_rNoPageString, + const OUString& i_rPaperName, + const OUString& i_rNoPageString, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY, bool i_bGreyscale ); @@ -200,16 +200,16 @@ namespace vcl CancelButton* mpCancelButton; HelpButton* mpHelpButton; - rtl::OUString maPageStr; - rtl::OUString maNoPageStr; + OUString maPageStr; + OUString maNoPageStr; sal_Int32 mnCurPage; sal_Int32 mnCachedPages; - std::map< Window*, rtl::OUString > maControlToPropertyMap; - std::map< rtl::OUString, std::vector< Window* > > + std::map< Window*, OUString > maControlToPropertyMap; + std::map< OUString, std::vector< Window* > > maPropertyToWindowMap; std::map< Window*, sal_Int32 > maControlToNumValMap; - std::set< rtl::OUString > maReverseDependencySet; + std::set< OUString > maReverseDependencySet; Size maNupPortraitSize; Size maNupLandscapeSize; @@ -217,9 +217,9 @@ namespace vcl // internal, used for automatic Nup-Portrait/landscape Size maFirstPageSize; - rtl::OUString maPrintToFileText; - rtl::OUString maPrintText; - rtl::OUString maDefPrtText; + OUString maPrintToFileText; + OUString maPrintText; + OUString maDefPrtText; Size maDetailsCollapsedSize; Size maDetailsExpandedSize; @@ -235,7 +235,7 @@ namespace vcl void checkControlDependencies(); void checkOptionalControlDependencies(); void makeEnabled( Window* ); - void updateWindowFromProperty( const rtl::OUString& ); + void updateWindowFromProperty( const OUString& ); void setupOptionalUI(); void readFromSettings(); void storeToSettings(); diff --git a/vcl/inc/quartz/utils.h b/vcl/inc/quartz/utils.h index 0e0dfe5493ad..ed7e233a7285 100644 --- a/vcl/inc/quartz/utils.h +++ b/vcl/inc/quartz/utils.h @@ -34,10 +34,10 @@ #include -rtl::OUString GetOUString( CFStringRef ); -rtl::OUString GetOUString( NSString* ); -CFStringRef CreateCFString( const rtl::OUString& ); -NSString* CreateNSString( const rtl::OUString& ); +OUString GetOUString( CFStringRef ); +OUString GetOUString( NSString* ); +CFStringRef CreateCFString( const OUString& ); +NSString* CreateNSString( const OUString& ); std::ostream &operator <<(std::ostream& s, CGRect &rRect); diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 0e5a92bf1d48..531d0d4f50b1 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -94,9 +94,6 @@ typedef sal_uInt64 SalExtStyle; #define SAL_FRAME_POSSIZE_WIDTH ((sal_uInt16)0x0004) #define SAL_FRAME_POSSIZE_HEIGHT ((sal_uInt16)0x0008) -using ::rtl::OUString; -using ::rtl::OString; - struct SystemParentData; class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 21d73801b70d..f20cbe44592c 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -72,7 +72,7 @@ namespace basegfx { typedef sal_Unicode sal_Ucs; // TODO: use sal_UCS4 instead of sal_Unicode typedef std::map< sal_Ucs, sal_Int32 > Ucs2SIntMap; typedef std::map< sal_Ucs, sal_uInt32 > Ucs2UIntMap; -typedef std::map< sal_Ucs, rtl::OString > Ucs2OStrMap; +typedef std::map< sal_Ucs, OString > Ucs2OStrMap; typedef std::vector< sal_Int32 > Int32Vector; // note: if you add any new methods to class SalGraphics using coordinates @@ -152,9 +152,9 @@ protected: const Point& aPos, sal_Bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ); + const OUString& aCaption ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const rtl::OUString& aCaption, + const ImplControlValue& aValue, const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); /** Render bitmap with alpha channel @@ -251,7 +251,7 @@ public: // OutputDevice for all its device specific preferred font substitutions virtual void GetDevFontSubstList( OutputDevice* ) = 0; - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ) = 0; + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ) = 0; // CreateFontSubset: a method to get a subset of glyhps of a font // inside a new valid font file @@ -265,7 +265,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -346,7 +346,7 @@ public: true: a substitution has taken place and rNewText rLen, rCutStart and rCutStop have been filled accordingly false: no substitution has taken place, rNewText, rLen, rCutStart, rCutStop remain unchanged */ - virtual bool filterText( const rtl::OUString& rOrigText, rtl::OUString& rNewText, + virtual bool filterText( const OUString& rOrigText, OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ); virtual bool supportsOperation( OutDevSupportType ) const = 0; @@ -472,7 +472,7 @@ public: const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption, + const OUString& aCaption, const OutputDevice *pOutDev ); // Query the native control's actual drawing region (including adornment) @@ -481,7 +481,7 @@ public: const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption, + const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion, const OutputDevice *pOutDev ); diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 47bc126f7190..1dc696eb99ba 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -154,7 +154,7 @@ public: // this is a vehicle for PrintFontManager to bridge the gap between vcl and libvclplug_* // this is only necessary because PrintFontManager is an exported vcl API and therefore // needs to be in libvcl while libvclplug_* do not contain exported C++ API - virtual void FillFontPathList( std::list< rtl::OString >& o_rFontPaths ); + virtual void FillFontPathList( std::list< OString >& o_rFontPaths ); // dtrans implementation virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index 77b1cd7986ef..addedfd4972b 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -36,7 +36,7 @@ struct SalItemParams MenuItemType eType; // MenuItem-Type MenuItemBits nBits; // MenuItem-Bits Menu* pMenu; // Pointer to Menu - rtl::OUString aText; // Menu-Text + OUString aText; // Menu-Text Image aImage; // Image }; @@ -45,10 +45,10 @@ struct SalMenuButtonItem { sal_uInt16 mnId; Image maImage; - rtl::OUString maToolTipText; + OUString maToolTipText; SalMenuButtonItem() : mnId( 0 ) {} - SalMenuButtonItem( sal_uInt16 i_nId, const Image& rImg, const rtl::OUString& i_rTTText = rtl::OUString() ) + SalMenuButtonItem( sal_uInt16 i_nId, const Image& rImg, const OUString& i_rTTText = OUString() ) : mnId( i_nId ), maImage( rImg ), maToolTipText( i_rTTText ) {} }; @@ -74,9 +74,9 @@ public: virtual void SetFrame( const SalFrame* pFrame ) = 0; virtual void CheckItem( unsigned nPos, sal_Bool bCheck ) = 0; virtual void EnableItem( unsigned nPos, sal_Bool bEnable ) = 0; - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText )= 0; + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText )= 0; virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) = 0; - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ) = 0; + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ) = 0; virtual void GetSystemMenuData( SystemMenuData* pData ) = 0; virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags); virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index 63fbbc494c9c..9a23731e9b8e 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -35,13 +35,13 @@ namespace vcl { class PrinterController; } struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo { - rtl::OUString maPrinterName; - rtl::OUString maDriver; - rtl::OUString maLocation; - rtl::OUString maComment; + OUString maPrinterName; + OUString maDriver; + OUString maLocation; + OUString maComment; sal_uLong mnStatus; sal_uLong mnJobs; - rtl::OUString* mpSysData; + OUString* mpSysData; SalPrinterQueueInfo(); ~SalPrinterQueueInfo(); @@ -78,7 +78,7 @@ public: long& rPageWidth, long& rPageHeight ) = 0; virtual sal_uLong GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) = 0; virtual sal_uLong GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; - virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0; + virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0; // fills m_aPaperFormats and sets m_bPapersInit to true virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0; // returns angle that a landscape page will be turned counterclockwise wrt to portrait @@ -91,9 +91,9 @@ public: // public for Sal Implementation SalPrinter() {} virtual ~SalPrinter(); - virtual sal_Bool StartJob( const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + virtual sal_Bool StartJob( const OUString* pFileName, + const OUString& rJobName, + const OUString& rAppName, sal_uLong nCopies, bool bCollate, bool bDirect, @@ -101,9 +101,9 @@ public: // public for Sal Implementation // implement for pull model print systems only, // default implementations (see salvtables.cxx) just returns sal_False - virtual sal_Bool StartJob( const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + virtual sal_Bool StartJob( const OUString* pFileName, + const OUString& rJobName, + const OUString& rAppName, ImplJobSetup* pSetupData, vcl::PrinterController& rController ); diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 484205d223e9..629f10133f80 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -320,7 +320,7 @@ struct ImplSVData ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxAccessBridge; ::vcl::SettingsConfigItem* mpSettingsConfigItem; std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList; - boost::unordered_map< int, rtl::OUString >* mpPaperNames; + boost::unordered_map< int, OUString >* mpPaperNames; }; void ImplInitSVData(); diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 7fa82d9da609..6a00fadf6d07 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -60,7 +60,7 @@ struct ImplToolItem XubString maQuickHelpText; XubString maHelpText; String maCommandStr; - rtl::OString maHelpId; + OString maHelpId; Rectangle maRect; Rectangle maCalcRect; // the overall horizontal item size, including one or more of [image size + textlength + dropdown arrow] diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 9cf14676ad68..210053883ecb 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -201,8 +201,8 @@ class GtkSalFrame : public SalFrame bool m_bSendModChangeOnRelease; bool m_bWindowIsGtkPlug; bool m_bSetFocusOnMap; - rtl::OUString m_aTitle; - rtl::OUString m_sWMClass; + OUString m_aTitle; + OUString m_sWMClass; IMHandler* m_pIMHandler; @@ -351,7 +351,7 @@ public: // When Event is called, SalInstance::Yield() must be returned virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const rtl::OUString& rTitle ); + virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu *pSalMenu ); virtual SalMenu* GetMenu( void ); @@ -397,7 +397,7 @@ public: virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); // returns the input language used for the last key stroke @@ -427,7 +427,7 @@ public: virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetScreenNumber( unsigned int ); - virtual void SetApplicationID( const rtl::OUString &rWMClass ); + virtual void SetApplicationID( const OUString &rWMClass ); // shaped system windows // set clip region to none (-> rectangular windows, normal state) diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 86003edd94b6..0edab313bd6a 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -45,13 +45,13 @@ public: virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& rCaption ); + const OUString& rCaption ); virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& rCaption, + const OUString& rCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); void updateSettings( AllSettings& rSettings ); @@ -132,9 +132,9 @@ public: const Point& aPos, sal_Bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& rCaption ); + const OUString& rCaption ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const rtl::OUString& rCaption, + const ImplControlValue& aValue, const OUString& rCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); //helper methods for frame's UpdateSettings diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 4ad13a60e1db..83ea84fc5f61 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -109,7 +109,7 @@ public: virtual SalMenuItem* CreateMenuItem( const SalItemParams* ); virtual void DestroyMenuItem( SalMenuItem* pItem ); virtual SalTimer* CreateSalTimer(); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics*, long nDX, long nDY, sal_uInt16 nBitCount, diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx index f24d2c2a1428..b90379ad806e 100644 --- a/vcl/inc/unx/gtk/gtkprn.hxx +++ b/vcl/inc/unx/gtk/gtkprn.hxx @@ -46,15 +46,15 @@ public: using PspSalPrinter::StartJob; virtual sal_Bool StartJob( - const rtl::OUString* i_pFileName, const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, ImplJobSetup* io_pSetupData, + const OUString* i_pFileName, const OUString& i_rJobName, + const OUString& i_rAppName, ImplJobSetup* io_pSetupData, vcl::PrinterController& io_rController); virtual sal_Bool EndJob(); private: bool impl_doJob( - const rtl::OUString* i_pFileName, const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, ImplJobSetup* io_pSetupData, + const OUString* i_pFileName, const OUString& i_rJobName, + const OUString& i_rAppName, ImplJobSetup* io_pSetupData, int i_nCopies, bool i_bCollate, vcl::PrinterController& io_rController); private: diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index fc0632ffb87d..35915d8198e4 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -68,9 +68,9 @@ public: virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); virtual void ShowItem( unsigned nPos, sal_Bool bShow ); - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ); + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); virtual void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } @@ -84,7 +84,7 @@ public: virtual GActionGroup* GetActionGroup() { return mpActionGroup; } virtual sal_Bool IsItemVisible( unsigned nPos ); - void NativeSetItemText( unsigned nSection, unsigned nItemPos, const rtl::OUString& rText ); + void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText ); void NativeSetItemCommand( unsigned nSection, unsigned nItemPos, sal_uInt16 nId, @@ -94,7 +94,7 @@ public: gboolean bIsSubmenu ); void NativeSetEnableItem( gchar* aCommand, gboolean bEnable ); void NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItemBits bits, gboolean bCheck ); - void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); + void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const OUString& rKeyName ); void DispatchCommand( gint itemId, const gchar* aCommand ); void Activate( const gchar* aMenuCommand ); diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx index 3bd7988b07e7..c36c51149528 100644 --- a/vcl/inc/unx/gtk/gtksys.hxx +++ b/vcl/inc/unx/gtk/gtksys.hxx @@ -50,12 +50,12 @@ public: virtual bool IsUnifiedDisplay(); virtual unsigned int GetDisplayScreenCount(); virtual unsigned int GetDisplayBuiltInScreen(); - virtual rtl::OUString GetDisplayScreenName (unsigned int nScreen); + virtual OUString GetDisplayScreenName (unsigned int nScreen); virtual Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScreen); - virtual int ShowNativeDialog (const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual int ShowNativeDialog (const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton); SalX11Screen GetDisplayDefaultXScreen() { return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); } diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 2511495910b4..531c608327a0 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -310,8 +310,8 @@ public: void ModifierMapping(); void SimulateKeyPress( sal_uInt16 nKeyCode ); sal_uInt16 GetIndicatorState() const; - rtl::OUString GetKeyNameFromKeySym( KeySym keysym ) const; - rtl::OUString GetKeyName( sal_uInt16 nKeyCode ) const; + OUString GetKeyNameFromKeySym( KeySym keysym ) const; + OUString GetKeyName( sal_uInt16 nKeyCode ) const; sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const; KeySym GetKeySym( XKeyEvent *pEvent, unsigned char *pPrintable, @@ -410,8 +410,8 @@ public: // get foreign key names namespace vcl_sal { - rtl::OUString getKeysymReplacementName( - rtl::OUString pLang, + OUString getKeysymReplacementName( + OUString pLang, KeySym nSymbol ); } diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 28a5446331ac..9c89af934873 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -114,9 +114,9 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame // icon id int mnIconID; - rtl::OUString m_aTitle; + OUString m_aTitle; - rtl::OUString m_sWMClass; + OUString m_sWMClass; SystemChildData maSystemChildData; @@ -208,7 +208,7 @@ public: virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const rtl::OUString& rTitle ); + virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu* pMenu ); virtual void DrawMenuBar(); @@ -236,7 +236,7 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); @@ -249,7 +249,7 @@ public: virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetScreenNumber( unsigned int ); - virtual void SetApplicationID( const rtl::OUString &rWMClass ); + virtual void SetApplicationID( const OUString &rWMClass ); // shaped system windows // set clip region to none (-> rectangular windows, normal state) diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 503872f973ad..c7c80913e368 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -233,8 +233,8 @@ public: virtual void GetDevFontList( ImplDevFontList* ); virtual void ClearDevFontCache(); virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index ea41c55ccb5e..a997457e8a0d 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -61,7 +61,7 @@ public: virtual bool AnyInput( sal_uInt16 nType ); virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); - void FillFontPathList( std::list< rtl::OString >& o_rFontPaths ); + void FillFontPathList( std::list< OString >& o_rFontPaths ); void SetLib( SalXLib *pXLib ) { mpXLib = pXLib; } // dtrans implementation @@ -69,7 +69,7 @@ public: CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments ); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource(); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget(); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); }; #endif // _SV_SALINST_H diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h index 0daf6ebe591f..289b5dfb16bd 100644 --- a/vcl/inc/unx/salmenu.h +++ b/vcl/inc/unx/salmenu.h @@ -40,9 +40,9 @@ public: virtual void SetFrame( const SalFrame* pFrame ); virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ); + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); }; diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx index 855edb75ed9e..29897289637e 100644 --- a/vcl/inc/unx/sm.hxx +++ b/vcl/inc/unx/sm.hxx @@ -25,13 +25,10 @@ #include "boost/scoped_ptr.hpp" #include "tools/link.hxx" +#include #include "vclpluginapi.h" -namespace rtl { - class OString; - class OUString; -} class ICEConnectionObserver; class SalSession; @@ -40,7 +37,7 @@ class SessionManagerClient static SalSession * m_pSession; static boost::scoped_ptr< ICEConnectionObserver > m_pICEConnectionObserver; static SmcConn m_pSmcConnection; - static rtl::OString m_aClientID; + static OString m_aClientID; static bool m_bDocSaveDone; static void SaveYourselfProc( SmcConn connection, @@ -58,7 +55,7 @@ class SessionManagerClient static void InteractProc( SmcConn connection, SmPointer clientData ); - static rtl::OString getPreviousSessionID(); + static OString getPreviousSessionID(); DECL_STATIC_LINK( SessionManagerClient, ShutDownHdl, void* ); DECL_STATIC_LINK( SessionManagerClient, ShutDownCancelHdl, void* ); @@ -73,8 +70,8 @@ public: static void saveDone(); static void interactionDone( bool bCancelShutdown ); - static rtl::OUString getExecName(); - static VCLPLUG_GEN_PUBLIC rtl::OString getSessionID(); + static OUString getExecName(); + static VCLPLUG_GEN_PUBLIC OString getSessionID(); }; #endif diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx index f376743c321b..d3274645d219 100644 --- a/vcl/inc/unx/x11/x11sys.hxx +++ b/vcl/inc/unx/x11/x11sys.hxx @@ -38,10 +38,10 @@ public: virtual unsigned int GetDisplayBuiltInScreen(); virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ); - virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ); - virtual int ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual OUString GetDisplayScreenName( unsigned int nScreen ); + virtual int ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ); }; diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx index 349f9cc67cbb..71fffc718deb 100644 --- a/vcl/inc/vcl/button.hxx +++ b/vcl/inc/vcl/button.hxx @@ -190,7 +190,7 @@ public: void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } const Link& GetToggleHdl() const { return maToggleHdl; } - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; inline void PushButton::Check( sal_Bool bCheck ) @@ -399,7 +399,7 @@ public: */ std::vector GetRadioButtonGroup(bool bIncludeThis = true) const; - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); /* * Group this RadioButton with another @@ -500,7 +500,7 @@ public: bool IsLegacyNoTextAlign() { return mbLegacyNoTextAlign; } void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; } - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; inline void CheckBox::Check( sal_Bool bCheck ) diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx index 22ee5709e07f..f0637109716a 100644 --- a/vcl/inc/vcl/combobox.hxx +++ b/vcl/inc/vcl/combobox.hxx @@ -219,7 +219,7 @@ public: sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; #endif // _COMBOBOX_HXX diff --git a/vcl/inc/vcl/configsettings.hxx b/vcl/inc/vcl/configsettings.hxx index 3d8d5ace9b1f..47c96facd472 100644 --- a/vcl/inc/vcl/configsettings.hxx +++ b/vcl/inc/vcl/configsettings.hxx @@ -31,7 +31,7 @@ namespace vcl { //........................................................................ - typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > OUStrMap; + typedef boost::unordered_map< OUString, OUString, OUStringHash > OUStrMap; class SmallOUStrMap : public OUStrMap { public: SmallOUStrMap() : OUStrMap(1) {} }; //==================================================================== @@ -40,9 +40,9 @@ namespace vcl class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem { - boost::unordered_map< rtl::OUString, SmallOUStrMap, rtl::OUStringHash > m_aSettings; + boost::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); void getValues(); SettingsConfigItem(); @@ -51,8 +51,8 @@ namespace vcl static SettingsConfigItem* get(); - const rtl::OUString& getValue( const rtl::OUString& rGroup, const rtl::OUString& rKey ) const; - void setValue( const rtl::OUString& rGroup, const rtl::OUString& rKey, const rtl::OUString& rValue ); + const OUString& getValue( const OUString& rGroup, const OUString& rKey ) const; + void setValue( const OUString& rGroup, const OUString& rKey, const OUString& rValue ); virtual void Commit(); }; diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 4c7149a5493b..d7994c61580e 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -82,7 +82,7 @@ public: protected: Dialog( WindowType nType ); - Dialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, WindowType nType ); + Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); protected: @@ -92,7 +92,7 @@ protected: public: Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); - Dialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); virtual long Notify( NotifyEvent& rNEvt ); @@ -105,7 +105,7 @@ public: void setOptimalLayoutSize(); bool isCalculatingInitialLayoutSize() const { return mbIsCalculatingInitialLayoutSize; } virtual void queue_layout(); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); VclButtonBox* get_action_area(); VclBox* get_content_area(); @@ -153,7 +153,7 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog public: ModelessDialog( Window* pParent, const ResId& rResId ); - ModelessDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); }; // --------------- @@ -164,7 +164,7 @@ class VCL_DLLPUBLIC ModalDialog : public Dialog { public: ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL ); - ModalDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); ModalDialog( Window* pParent, const ResId& rResId ); protected: diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx index aaa6e3a62f78..488758ab7d4a 100644 --- a/vcl/inc/vcl/edit.hxx +++ b/vcl/inc/vcl/edit.hxx @@ -87,7 +87,7 @@ private: DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, void* ); - SAL_DLLPRIVATE bool ImplTruncateToMaxLen( rtl::OUString&, sal_uInt32 nSelectionLen ) const; + SAL_DLLPRIVATE bool ImplTruncateToMaxLen( OUString&, sal_uInt32 nSelectionLen ) const; SAL_DLLPRIVATE void ImplInitEditData(); SAL_DLLPRIVATE void ImplModified(); SAL_DLLPRIVATE OUString ImplGetText() const; @@ -227,7 +227,7 @@ public: AutocompleteAction GetAutocompleteAction() const { return meAutocompleteAction; } virtual Size CalcMinimumSize() const; - virtual Size CalcMinimumSizeForText(const rtl::OUString &rString) const; + virtual Size CalcMinimumSizeForText(const OUString &rString) const; virtual Size GetOptimalSize() const; virtual Size CalcSize( sal_uInt16 nChars ) const; virtual xub_StrLen GetMaxVisChars() const; @@ -243,9 +243,9 @@ public: static PopupMenu* CreatePopupMenu(); static void DeletePopupMenu( PopupMenu* pMenu ); - virtual rtl::OUString GetSurroundingText() const; + virtual OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); // returns the minimum size a bordered Edit should have given the current // global style settings (needed by sc's inputwin.cxx) diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx index 50888c6472ab..babab8da29d2 100644 --- a/vcl/inc/vcl/field.hxx +++ b/vcl/inc/vcl/field.hxx @@ -518,7 +518,7 @@ public: virtual void Down(); virtual void First(); virtual void Last(); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; @@ -589,7 +589,7 @@ public: MapUnit eInUnit, FieldUnit eOutUnit ) { return ConvertDoubleValue( static_cast(nValue), nDecDigits, eInUnit, eOutUnit ); } - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index c45762f867d7..b592d98a48d2 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -77,7 +77,7 @@ public: static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth); Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const; virtual Size GetOptimalSize() const; - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); void set_mnemonic_widget(Window *pWindow); Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; @@ -200,7 +200,7 @@ public: sal_Bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const; - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; #endif // _SV_FIXED_HXX diff --git a/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx index 98226249843a..d886d48b9854 100644 --- a/vcl/inc/vcl/font.hxx +++ b/vcl/inc/vcl/font.hxx @@ -64,7 +64,7 @@ public: void SetAlign( FontAlign ); FontAlign GetAlign() const; - void SetName( const rtl::OUString& rFamilyName ); + void SetName( const OUString& rFamilyName ); const String& GetName() const; void SetStyleName( const String& rStyleName ); const String& GetStyleName() const; diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx index 7490f018f174..05955f984710 100644 --- a/vcl/inc/vcl/fontmanager.hxx +++ b/vcl/inc/vcl/fontmanager.hxx @@ -76,9 +76,9 @@ struct FastPrintFontInfo fonttype::type m_eType; // font attributes - rtl::OUString m_aFamilyName; - rtl::OUString m_aStyleName; - std::list< rtl::OUString > m_aAliases; + OUString m_aFamilyName; + OUString m_aStyleName; + std::list< OUString > m_aAliases; FontFamily m_eFamilyStyle; FontItalic m_eItalic; FontWidth m_eWidth; @@ -193,7 +193,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager int m_nFamilyName; // atom std::list< int > m_aAliases; int m_nPSName; // atom - rtl::OUString m_aStyleName; + OUString m_aStyleName; FontItalic m_eItalic; FontWidth m_eWidth; FontWeight m_eWeight; @@ -214,7 +214,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager bool m_bUserOverride; std::map< sal_Unicode, sal_Int32 > m_aEncodingVector; - std::map< sal_Unicode, rtl::OString > m_aNonEncoded; + std::map< sal_Unicode, OString > m_aNonEncoded; PrintFont( fonttype::type eType ); virtual ~PrintFont(); @@ -226,8 +226,8 @@ class VCL_PLUGIN_PUBLIC PrintFontManager struct Type1FontFile : public PrintFont { int m_nDirectory; // atom containing system dependent path - rtl::OString m_aFontFile; // relative to directory - rtl::OString m_aMetricFile; // dito + OString m_aFontFile; // relative to directory + OString m_aMetricFile; // dito /* note: m_aFontFile and Metric file are not atoms because they should be fairly unique */ @@ -240,7 +240,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager struct TrueTypeFontFile : public PrintFont { int m_nDirectory; // atom containing system dependent path - rtl::OString m_aFontFile; // relative to directory + OString m_aFontFile; // relative to directory int m_nCollectionEntry; // 0 for regular fonts, 0 to ... for fonts stemming from collections unsigned int m_nTypeFlags; // copyright bits and PS-OpenType flag @@ -252,7 +252,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager struct BuiltinFont : public PrintFont { int m_nDirectory; // atom containing system dependent path - rtl::OString m_aMetricFile; + OString m_aMetricFile; BuiltinFont() : PrintFont( fonttype::Builtin ) {} virtual ~BuiltinFont(); @@ -262,22 +262,22 @@ class VCL_PLUGIN_PUBLIC PrintFontManager fontID m_nNextFontID; boost::unordered_map< fontID, PrintFont* > m_aFonts; boost::unordered_map< int, FontFamily > m_aFamilyTypes; - std::list< rtl::OUString > m_aPrinterDrivers; - std::list< rtl::OString > m_aFontDirectories; + std::list< OUString > m_aPrinterDrivers; + std::list< OString > m_aFontDirectories; std::list< int > m_aPrivateFontDirectories; utl::MultiAtomProvider* m_pAtoms; // for speeding up findFontFileID - boost::unordered_map< rtl::OString, std::set< fontID >, rtl::OStringHash > + boost::unordered_map< OString, std::set< fontID >, OStringHash > m_aFontFileToFontID; - boost::unordered_map< rtl::OString, int, rtl::OStringHash > + boost::unordered_map< OString, int, OStringHash > m_aDirToAtom; - boost::unordered_map< int, rtl::OString > m_aAtomToDir; + boost::unordered_map< int, OString > m_aAtomToDir; int m_nNextDirAtom; - boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash > + boost::unordered_multimap< OString, sal_Unicode, OStringHash > m_aAdobenameToUnicode; - boost::unordered_multimap< sal_Unicode, rtl::OString > + boost::unordered_multimap< sal_Unicode, OString > m_aUnicodeToAdobename; boost::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode; boost::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode; @@ -286,28 +286,28 @@ class VCL_PLUGIN_PUBLIC PrintFontManager mutable std::vector< fontID > m_aOverrideFonts; - rtl::OString getAfmFile( PrintFont* pFont ) const; - rtl::OString getFontFile( PrintFont* pFont ) const; + OString getAfmFile( PrintFont* pFont ) const; + OString getFontFile( PrintFont* pFont ) const; - bool analyzeFontFile( int nDirID, const rtl::OString& rFileName, std::list< PrintFont* >& rNewFonts, const char *pFormat=NULL ) const; - rtl::OUString convertTrueTypeName( void* pNameRecord ) const; // actually a NameRecord* formt font subsetting code - void analyzeTrueTypeFamilyName( void* pTTFont, std::list< rtl::OUString >& rnames ) const; // actually a TrueTypeFont* from font subsetting code + bool analyzeFontFile( int nDirID, const OString& rFileName, std::list< PrintFont* >& rNewFonts, const char *pFormat=NULL ) const; + OUString convertTrueTypeName( void* pNameRecord ) const; // actually a NameRecord* formt font subsetting code + void analyzeTrueTypeFamilyName( void* pTTFont, std::list< OUString >& rnames ) const; // actually a TrueTypeFont* from font subsetting code bool analyzeTrueTypeFile( PrintFont* pFont ) const; // finds the font id for the nFaceIndex face in this font file // There may be multiple font ids for TrueType collections - fontID findFontFileID( int nDirID, const rtl::OString& rFile, int nFaceIndex ) const; + fontID findFontFileID( int nDirID, const OString& rFile, int nFaceIndex ) const; // There may be multiple font ids for TrueType collections - std::vector findFontFileIDs( int nDirID, const rtl::OString& rFile ) const; + std::vector findFontFileIDs( int nDirID, const OString& rFile ) const; - bool knownFontFile( int nDirID, const rtl::OString& rFile ) const + bool knownFontFile( int nDirID, const OString& rFile ) const { return findFontFileID(nDirID, rFile, 0) != 0; } fontID findFontBuiltinID( int nPSNameAtom ) const; - FontFamily matchFamilyName( const rtl::OUString& rFamily ) const; + FontFamily matchFamilyName( const OUString& rFamily ) const; PrintFont* getFont( fontID nID ) const { @@ -318,15 +318,15 @@ class VCL_PLUGIN_PUBLIC PrintFontManager void fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const; void fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const; - rtl::OString getDirectory( int nAtom ) const; - int getDirectoryAtom( const rtl::OString& rDirectory, bool bCreate = false ); + OString getDirectory( int nAtom ) const; + int getDirectoryAtom( const OString& rDirectory, bool bCreate = false ); /* try to initialize fonts from libfontconfig called from initialize() */ void initFontconfig(); - void countFontconfigFonts( boost::unordered_map& o_rVisitedPaths ); + void countFontconfigFonts( boost::unordered_map& o_rVisitedPaths ); /* deinitialize fontconfig */ void deinitFontconfig(); @@ -341,7 +341,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager true if libfontconfig accepted the directory false else (e.g. no libfontconfig found) */ - bool addFontconfigDir(const rtl::OString& rDirectory); + bool addFontconfigDir(const OString& rDirectory); bool readOverrideMetrics(); @@ -357,7 +357,7 @@ public: static PrintFontManager& get(); // one instance only // There may be multiple font ids for TrueType collections - std::vector addFontFile( const rtl::OString& rFileName ); + std::vector addFontFile( const OString& rFileName ); void initialize(); @@ -383,7 +383,7 @@ public: // routines to get font info in small pieces // get a specific fonts PSName name - const rtl::OUString& getPSName( fontID nFontID ) const; + const OUString& getPSName( fontID nFontID ) const; // get a specific fonts family name aliases void getFontFamilyAliases( fontID nFontID ) const; @@ -438,7 +438,7 @@ public: } // get a specific fonts system dependent filename - rtl::OString getFontFileSysPath( fontID nFontID ) const + OString getFontFileSysPath( fontID nFontID ) const { return getFontFile( getFont( nFontID ) ); } @@ -473,7 +473,7 @@ public: // builtin; if ppNonEncoded is set and non encoded type1 glyphs exist // then *ppNonEncoded is set to the mapping for nonencoded glyphs. // the encoding vector contains -1 for non encoded glyphs - const std::map< sal_Unicode, sal_Int32 >* getEncodingMap( fontID nFontID, const std::map< sal_Unicode, rtl::OString >** ppNonEncoded ) const; + const std::map< sal_Unicode, sal_Int32 >* getEncodingMap( fontID nFontID, const std::map< sal_Unicode, OString >** ppNonEncoded ) const; // to get font substitution transparently use the // getKernPairs method of PrinterGfx @@ -485,7 +485,7 @@ public: bool isFontDownloadingAllowedForPrinting( fontID nFont ) const; // helper for type 1 fonts - std::list< rtl::OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const; + std::list< OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const; std::pair< boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator, boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator > @@ -493,7 +493,7 @@ public: { return m_aUnicodeToAdobecode.equal_range( aChar ); } - std::list< sal_Unicode > getUnicodeFromAdobeName( const rtl::OString& rName ) const; + std::list< sal_Unicode > getUnicodeFromAdobeName( const OString& rName ) const; std::pair< boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator, boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator > getUnicodeFromAdobeCode( sal_uInt8 aChar ) const @@ -515,7 +515,7 @@ public: // TODO: callers of this method should use its FontSubsetInfo counterpart directly bool createFontSubset( FontSubsetInfo&, fontID nFont, - const rtl::OUString& rOutFile, + const OUString& rOutFile, sal_Int32* pGlyphIDs, sal_uInt8* pNewEncoding, sal_Int32* pWidths, @@ -566,7 +566,7 @@ public: bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale ); ImplFontOptions* getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*)) const; - bool Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes ); + bool Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes ); int FreeTypeCharIndex( void *pFace, sal_uInt32 aChar ); }; diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index 51cff9fc4cb9..bbdf14177b3b 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -238,8 +238,8 @@ public: @param nDataSize Length, in byte, of raw data */ -MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererServiceName, - const rtl::OUString& rGraphicServiceName, +MetaCommentAction* makePluggableRendererAction( const OUString& rRendererServiceName, + const OUString& rGraphicServiceName, const void* pData, sal_uInt32 nDataSize ); diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx index 44a96cdb4c53..380298b500b8 100644 --- a/vcl/inc/vcl/gfxlink.hxx +++ b/vcl/inc/vcl/gfxlink.hxx @@ -51,7 +51,7 @@ struct ImpBuffer struct ImpSwap { - rtl::OUString maURL; + OUString maURL; sal_uLong mnDataSize; sal_uLong mnRefCount; diff --git a/vcl/inc/vcl/graphicfilter.hxx b/vcl/inc/vcl/graphicfilter.hxx index b415d8fe7cb5..8f42119360d1 100644 --- a/vcl/inc/vcl/graphicfilter.hxx +++ b/vcl/inc/vcl/graphicfilter.hxx @@ -233,7 +233,7 @@ private: protected: - rtl::OUString aFilterPath; + OUString aFilterPath; FilterConfigCache* pConfig; FilterErrorEx* pErrorEx; sal_Bool bAbort; @@ -245,7 +245,7 @@ public: GraphicFilter( sal_Bool bUseConfig = sal_True ); ~GraphicFilter(); - void SetFilterPath( const rtl::OUString& rFilterPath ) { aFilterPath = rFilterPath; }; + void SetFilterPath( const OUString& rFilterPath ) { aFilterPath = rFilterPath; }; sal_uInt16 GetImportFormatCount(); sal_uInt16 GetImportFormatNumber( const String& rFormatName ); diff --git a/vcl/inc/vcl/helper.hxx b/vcl/inc/vcl/helper.hxx index 839bf6a840f2..295df4a1a5e7 100644 --- a/vcl/inc/vcl/helper.hxx +++ b/vcl/inc/vcl/helper.hxx @@ -33,25 +33,25 @@ namespace osl { class File; } namespace psp { typedef int fontID; -void VCL_DLLPUBLIC getPrinterPathList( std::list< rtl::OUString >& rPathList, const char* pSubDir ); +void VCL_DLLPUBLIC getPrinterPathList( std::list< OUString >& rPathList, const char* pSubDir ); -// note: gcc 3.4.1 warns about visibility if we retunr a const rtl::OUString& here +// note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here // seems to be a bug in gcc, now we return an object instead of a reference -rtl::OUString VCL_DLLPUBLIC getFontPath(); +OUString VCL_DLLPUBLIC getFontPath(); bool VCL_DLLPUBLIC convertPfbToPfa( osl::File& rInFile, osl::File& rOutFile ); // normalized path (equivalent to realpath) -void VCL_DLLPUBLIC normPath( rtl::OString& rPath ); +void VCL_DLLPUBLIC normPath( OString& rPath ); // splits rOrgPath into dirname and basename // rOrgPath will be subject to normPath -void VCL_DLLPUBLIC splitPath( rtl::OString& rOrgPath, rtl::OString& rDir, rtl::OString& rBase ); +void VCL_DLLPUBLIC splitPath( OString& rOrgPath, OString& rDir, OString& rBase ); enum whichOfficePath { InstallationRootPath, UserPath, ConfigPath }; -// note: gcc 3.4.1 warns about visibility if we retunr a const rtl::OUString& here +// note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here // seems to be a bug in gcc, now we return an object instead of a reference -rtl::OUString VCL_DLLPUBLIC getOfficePath( enum whichOfficePath ePath ); +OUString VCL_DLLPUBLIC getOfficePath( enum whichOfficePath ePath ); } // namespace #endif // _PSPRINT_HELPER_HXX_ diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx index ae9a2d092627..8ece881a9b03 100644 --- a/vcl/inc/vcl/i18nhelp.hxx +++ b/vcl/inc/vcl/i18nhelp.hxx @@ -70,9 +70,9 @@ public: I18nHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ); ~I18nHelper(); - sal_Int32 CompareString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const; + sal_Int32 CompareString( const OUString& rStr1, const OUString& rStr2 ) const; - sal_Bool MatchString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const; + sal_Bool MatchString( const OUString& rStr1, const OUString& rStr2 ) const; sal_Bool MatchMnemonic( const String& rString, sal_Unicode cMnemonicChar ) const; String GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const; diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index 6c7ba0a70347..dc027f493a7f 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -84,14 +84,14 @@ class VCL_DLLPUBLIC ImageList public: ImageList( sal_uInt16 nInit = 8, sal_uInt16 nGrow = 4 ); ImageList( const ResId& rResId ); - ImageList( const ::std::vector< ::rtl::OUString >& rNameVector, - const ::rtl::OUString& rPrefix, + ImageList( const ::std::vector< OUString >& rNameVector, + const OUString& rPrefix, const Color* pMaskColor = NULL ); ImageList( const ImageList& rImageList ); ~ImageList(); void InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, - const std::vector< rtl::OUString > &rNameVector ); + const std::vector< OUString > &rNameVector ); void InsertFromHorizontalBitmap( const ResId& rResId, sal_uInt16 nCount, const Color *pNonAlphaMaskColor, @@ -102,23 +102,23 @@ public: sal_uInt16 GetImageCount() const; Size GetImageSize() const; - void AddImage( const ::rtl::OUString& rImageName, const Image& rImage ); + void AddImage( const OUString& rImageName, const Image& rImage ); - void ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ); + void ReplaceImage( const OUString& rImageName, const Image& rImage ); void RemoveImage( sal_uInt16 nId ); Image GetImage( sal_uInt16 nId ) const; - Image GetImage( const ::rtl::OUString& rImageName ) const; + Image GetImage( const OUString& rImageName ) const; sal_uInt16 GetImagePos( sal_uInt16 nId ) const; bool HasImageAtPos( sal_uInt16 nId ) const; - sal_uInt16 GetImagePos( const ::rtl::OUString& rImageName ) const; + sal_uInt16 GetImagePos( const OUString& rImageName ) const; sal_uInt16 GetImageId( sal_uInt16 nPos ) const; - ::rtl::OUString GetImageName( sal_uInt16 nPos ) const; - void GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const; + OUString GetImageName( sal_uInt16 nPos ) const; + void GetImageNames( ::std::vector< OUString >& rNames ) const; ImageList& operator=( const ImageList& rImageList ); sal_Bool operator==( const ImageList& rImageList ) const; @@ -130,13 +130,13 @@ private: sal_uInt16 mnInitSize; sal_uInt16 mnGrowSize; - SAL_DLLPRIVATE void ImplInitBitmapEx( const ::rtl::OUString& rUserImageName, - const ::std::vector< ::rtl::OUString >& rImageNames, - const ::rtl::OUString& rSymbolsStyle, + SAL_DLLPRIVATE void ImplInitBitmapEx( const OUString& rUserImageName, + const ::std::vector< OUString >& rImageNames, + const OUString& rSymbolsStyle, BitmapEx& rBmpEx, const Color* pMaskColor ) const; SAL_DLLPRIVATE void ImplInit( sal_uInt16 nItems, const Size &rSize ); - SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const ::rtl::OUString& rImageName ) const; + SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const OUString& rImageName ) const; }; #endif // _SV_IMAGE_HXX diff --git a/vcl/inc/vcl/imagerepository.hxx b/vcl/inc/vcl/imagerepository.hxx index cf7c14861399..45ee445edcd6 100644 --- a/vcl/inc/vcl/imagerepository.hxx +++ b/vcl/inc/vcl/imagerepository.hxx @@ -48,7 +48,7 @@ namespace vcl whether or not the image could be loaded successfully. */ static bool loadImage( - const ::rtl::OUString& _rName, + const OUString& _rName, BitmapEx& _out_rImage, bool bSearchLanguageDependent, bool loadMissing = false diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx index 3f81877f230f..f6fb94fccab2 100644 --- a/vcl/inc/vcl/jobdata.hxx +++ b/vcl/inc/vcl/jobdata.hxx @@ -44,7 +44,7 @@ struct VCL_DLLPUBLIC JobData int m_nColorDevice; // 0: no override, -1 grey scale, +1 color int m_nPDFDevice; // 0: no override, -1 PostScript, +1: Automatically PDF, +2: Explicitly PDF orientation::type m_eOrientation; - ::rtl::OUString m_aPrinterName; + OUString m_aPrinterName; const PPDParser* m_pParser; PPDContext m_aContext; diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx index a8cc29bb87ef..d8f489864297 100644 --- a/vcl/inc/vcl/jobset.hxx +++ b/vcl/inc/vcl/jobset.hxx @@ -53,15 +53,15 @@ public: JobSetup( const JobSetup& rJob ); ~JobSetup(); - rtl::OUString GetPrinterName() const; - rtl::OUString GetDriverName() const; + OUString GetPrinterName() const; + OUString GetDriverName() const; /* Get/SetValue are used to read/store additional * Parameters in the job setup that may be used * by the printer driver. One possible use are phone * numbers for faxes (which disguise as printers) */ - void SetValue( const rtl::OUString& rKey, const rtl::OUString& rValue ); + void SetValue( const OUString& rKey, const OUString& rValue ); JobSetup& operator=( const JobSetup& rJob ); diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx index e80ed7019f74..b0d57c392ab7 100644 --- a/vcl/inc/vcl/longcurr.hxx +++ b/vcl/inc/vcl/longcurr.hxx @@ -42,7 +42,7 @@ protected: BigInt mnMin; BigInt mnMax; BigInt mnCorrectedValue; - rtl::OUString maCurrencySymbol; + OUString maCurrencySymbol; sal_uInt16 mnType; sal_uInt16 mnDecimalDigits; sal_Bool mbThousandSep; diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx index 74dc854b8f44..79026116c473 100644 --- a/vcl/inc/vcl/lstbox.hxx +++ b/vcl/inc/vcl/lstbox.hxx @@ -223,7 +223,7 @@ public: sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; // ---------------- diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx index ba6038de8bcd..c9bc3b538711 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -289,8 +289,8 @@ public: void SetHelpCommand( sal_uInt16 nItemId, const XubString& rString ); const XubString& GetHelpCommand( sal_uInt16 nItemId ) const; - void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ); - rtl::OString GetHelpId( sal_uInt16 nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); + OString GetHelpId( sal_uInt16 nItemId ) const; void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; } const Link& GetActivateHdl() const { return aActivateHdl; } diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx index 4cad0a3fb8bf..961baaecd1ff 100644 --- a/vcl/inc/vcl/metaact.hxx +++ b/vcl/inc/vcl/metaact.hxx @@ -424,7 +424,7 @@ class VCL_DLLPUBLIC MetaTextAction : public MetaAction private: Point maPt; - rtl::OUString maStr; + OUString maStr; sal_uInt16 mnIndex; sal_uInt16 mnLen; @@ -433,14 +433,14 @@ private: public: DECL_META_ACTION( Text, META_TEXT_ACTION ) - MetaTextAction( const Point& rPt, const rtl::OUString& rStr, + MetaTextAction( const Point& rPt, const OUString& rStr, sal_uInt16 nIndex, sal_uInt16 nLen ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const Point& GetPoint() const { return maPt; } - const rtl::OUString& GetText() const { return maStr; } + const OUString& GetText() const { return maStr; } sal_uInt16 GetIndex() const { return mnIndex; } sal_uInt16 GetLen() const { return mnLen; } }; @@ -450,7 +450,7 @@ class VCL_DLLPUBLIC MetaTextArrayAction : public MetaAction private: Point maStartPt; - rtl::OUString maStr; + OUString maStr; sal_Int32* mpDXAry; sal_uInt16 mnIndex; sal_uInt16 mnLen; @@ -463,7 +463,7 @@ protected: public: MetaTextArrayAction(); MetaTextArrayAction( const MetaTextArrayAction& rAction ); - MetaTextArrayAction( const Point& rStartPt, const rtl::OUString& rStr, + MetaTextArrayAction( const Point& rStartPt, const OUString& rStr, const sal_Int32* pDXAry, sal_uInt16 nIndex, sal_uInt16 nLen ); @@ -478,7 +478,7 @@ public: virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); const Point& GetPoint() const { return maStartPt; } - const rtl::OUString& GetText() const { return maStr; } + const OUString& GetText() const { return maStr; } sal_uInt16 GetIndex() const { return mnIndex; } sal_uInt16 GetLen() const { return mnLen; } sal_Int32* GetDXArray() const { return mpDXAry; } @@ -489,7 +489,7 @@ class VCL_DLLPUBLIC MetaStretchTextAction : public MetaAction private: Point maPt; - rtl::OUString maStr; + OUString maStr; sal_uInt32 mnWidth; sal_uInt16 mnIndex; sal_uInt16 mnLen; @@ -500,14 +500,14 @@ public: DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, - const rtl::OUString& rStr, + const OUString& rStr, sal_uInt16 nIndex, sal_uInt16 nLen ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const Point& GetPoint() const { return maPt; } - const rtl::OUString& GetText() const { return maStr; } + const OUString& GetText() const { return maStr; } sal_uInt32 GetWidth() const { return mnWidth; } sal_uInt16 GetIndex() const { return mnIndex; } sal_uInt16 GetLen() const { return mnLen; } @@ -518,7 +518,7 @@ class VCL_DLLPUBLIC MetaTextRectAction : public MetaAction private: Rectangle maRect; - rtl::OUString maStr; + OUString maStr; sal_uInt16 mnStyle; virtual sal_Bool Compare( const MetaAction& ) const; @@ -527,13 +527,13 @@ public: DECL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) MetaTextRectAction( const Rectangle& rRect, - const rtl::OUString& rStr, sal_uInt16 nStyle ); + const OUString& rStr, sal_uInt16 nStyle ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const Rectangle& GetRect() const { return maRect; } - const rtl::OUString& GetText() const { return maStr; } + const OUString& GetText() const { return maStr; } sal_uInt16 GetStyle() const { return mnStyle; } }; @@ -1254,7 +1254,7 @@ class VCL_DLLPUBLIC MetaCommentAction : public MetaAction { private: - rtl::OString maComment; + OString maComment; sal_Int32 mnValue; sal_uInt32 mnDataSize; sal_uInt8* mpData; @@ -1268,7 +1268,7 @@ protected: public: MetaCommentAction( sal_Int32 nValue = 0L ); MetaCommentAction( const MetaCommentAction& rAct ); - MetaCommentAction( const rtl::OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL ); + MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -1278,7 +1278,7 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); - const rtl::OString& GetComment() const { return maComment; } + const OString& GetComment() const { return maComment; } sal_Int32 GetValue() const { return mnValue; } sal_uInt32 GetDataSize() const { return mnDataSize; } const sal_uInt8* GetData() const { return mpData; } diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index df433ff92e84..b0bb8e5c9389 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -1151,7 +1151,7 @@ public: const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - ::rtl::OUString aCaption ); + OUString aCaption ); // Query the native control's actual drawing region (including adornment) sal_Bool GetNativeControlRegion( ControlType nType, @@ -1159,7 +1159,7 @@ public: const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - ::rtl::OUString aCaption, + OUString aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) const; diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx index 3a0be8c5c199..59a118945cd4 100644 --- a/vcl/inc/vcl/pdfextoutdevdata.hxx +++ b/vcl/inc/vcl/pdfextoutdevdata.hxx @@ -54,7 +54,7 @@ struct PDFExtOutDevBookmarkEntry /** link target name, respectively destination name */ - rtl::OUString aBookmark; + OUString aBookmark; PDFExtOutDevBookmarkEntry() :nLinkId( -1 ) @@ -285,7 +285,7 @@ public : 0 for success -1 in case the link id does not exist */ - sal_Int32 SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ); + sal_Int32 SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ); /** Create a new outline item @param nParent @@ -302,7 +302,7 @@ public : @returns the outline item id of the new item */ - sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const rtl::OUString& rText = rtl::OUString(), sal_Int32 nDestID = -1 ); + sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const OUString& rText = OUString(), sal_Int32 nDestID = -1 ); /** Create a new note on a page @@ -354,7 +354,7 @@ public : @returns the id of the newly created structural element */ - sal_Int32 BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias = rtl::OUString() ); + sal_Int32 BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias = OUString() ); /** end a logical structure element @see BeginStructureElement diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index 4db5e293a5e5..3bfd5ed2f66f 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -224,9 +224,9 @@ public: protected: WidgetType Type; // primitive RTTI public: - rtl::OUString Name; // a distinct name to identify the control - rtl::OUString Description;// descriptive text for the contro (e.g. for tool tip) - rtl::OUString Text; // user text to appear on the control + OUString Name; // a distinct name to identify the control + OUString Description;// descriptive text for the contro (e.g. for tool tip) + OUString Text; // user text to appear on the control sal_uInt16 TextStyle; // style flags bool ReadOnly; Rectangle Location; // describes the area filled by the control @@ -319,7 +319,7 @@ public: will appear literally in the PDF file produced */ sal_Int32 Dest; - rtl::OUString URL; + OUString URL; bool Submit; bool SubmitGet; @@ -356,7 +356,7 @@ public: bool Selected; sal_Int32 RadioGroup; bool ButtonIsLeft; - rtl::OUString OnValue; // the value of the radio button if it is selected + OUString OnValue; // the value of the radio button if it is selected RadioButtonWidget() : AnyWidget( vcl::PDFWriter::RadioButton ), @@ -405,7 +405,7 @@ public: bool DropDown; bool Sort; bool MultiSelect; - std::vector Entries; + std::vector Entries; std::vector SelectedEntries; // if MultiSelect is false only the first entry of SelectedEntries // will be taken into account. the same is implicit for PDF < 1.4 @@ -428,7 +428,7 @@ public: struct ComboBoxWidget : public AnyWidget { bool Sort; - std::vector Entries; + std::vector Entries; // set the current value in AnyWidget::Text ComboBoxWidget() @@ -448,9 +448,9 @@ public: // the Location member of the AnyWidget which spcifies the coordinates // of the signature - rtl::OUString SigLocation; - rtl::OUString SigReason; - rtl::OUString SigContactInfo; + OUString SigLocation; + OUString SigReason; + OUString SigContactInfo; bool SigHidden; SignatureWidget() @@ -565,9 +565,9 @@ The following structure describes the permissions used in PDF security struct PDFWriterContext { /* must be a valid file: URL usable by osl */ - rtl::OUString URL; + OUString URL; /* the URL of the document being exported, used for relative links*/ - rtl::OUString BaseURL; + OUString BaseURL; /*if relative to file system should be formed*/ bool RelFsys;//i56629, i49415?, i64585? /*the action to set the PDF hyperlink to*/ @@ -622,10 +622,10 @@ The following structure describes the permissions used in PDF security PDFWriter::PDFDocInfo DocumentInfo; bool SignPDF; - rtl::OUString SignLocation; - rtl::OUString SignPassword; - rtl::OUString SignReason; - rtl::OUString SignContact; + OUString SignLocation; + OUString SignPassword; + OUString SignReason; + OUString SignContact; com::sun::star::lang::Locale DocumentLocale; // defines the document default language sal_uInt32 DPIx, DPIy; // how to handle MapMode( MAP_PIXEL ) // 0 here specifies a default handling @@ -726,8 +726,8 @@ The following structure describes the permissions used in PDF security std::set< ErrorCode > GetErrors(); static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > - InitEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, + InitEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ); @@ -895,7 +895,7 @@ The following structure describes the permissions used in PDF security the destination id (to be used in SetLinkDest) or -1 if page id does not exist */ - sal_Int32 CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ ); + sal_Int32 CreateNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ ); /** Create a new destination to be used in a link @param rRect @@ -979,7 +979,7 @@ The following structure describes the permissions used in PDF security 0 for success -1 in case the link id does not exist */ - sal_Int32 SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ); + sal_Int32 SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ); /** Resolve link in logical structure

      If a link is created after the corresponding visual appearance was drawn @@ -1026,7 +1026,7 @@ The following structure describes the permissions used in PDF security @returns the outline item id of the new item */ - sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const rtl::OUString& rText = rtl::OUString(), sal_Int32 nDestID = -1 ); + sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const OUString& rText = OUString(), sal_Int32 nDestID = -1 ); /** Set an outline item's parent @@ -1055,7 +1055,7 @@ The following structure describes the permissions used in PDF security 0 if the item exists and the text was changed -1 if the item does not exist */ - sal_Int32 SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText ); + sal_Int32 SetOutlineItemText( sal_Int32 nItem, const OUString& rText ); /** Set an outline item's destination @@ -1137,7 +1137,7 @@ The following structure describes the permissions used in PDF security @returns the new structure element's id for use in SetCurrentStructureElement */ - sal_Int32 BeginStructureElement( enum StructElement eType, const rtl::OUString& rAlias = rtl::OUString() ); + sal_Int32 BeginStructureElement( enum StructElement eType, const OUString& rAlias = OUString() ); /** end the current logical structure element

      diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx index ec04b2481763..80fbeaf4728a 100644 --- a/vcl/inc/vcl/ppdparser.hxx +++ b/vcl/inc/vcl/ppdparser.hxx @@ -57,7 +57,7 @@ class VCL_DLLPUBLIC PPDKey { friend class PPDParser; - typedef ::boost::unordered_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type; + typedef ::boost::unordered_map< OUString, PPDValue, OUStringHash > hash_type; typedef ::std::vector< PPDValue* > value_type; String m_aKey; @@ -121,7 +121,7 @@ class VCL_DLLPUBLIC PPDParser friend class CUPSManager; friend class PPDCache; - typedef ::boost::unordered_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type; + typedef ::boost::unordered_map< OUString, PPDKey*, OUStringHash > hash_type; typedef ::std::vector< PPDKey* > value_type; void insertKey( const String& rKey, PPDKey* pKey ); @@ -178,12 +178,12 @@ private: PPDParser( const String& rFile ); ~PPDParser(); - void parseOrderDependency(const rtl::OString& rLine); - void parseOpenUI(const rtl::OString& rLine); - void parseConstraint(const rtl::OString& rLine); - void parse( std::list< rtl::OString >& rLines ); + void parseOrderDependency(const OString& rLine); + void parseOpenUI(const OString& rLine); + void parseConstraint(const OString& rLine); + void parse( std::list< OString >& rLines ); - String handleTranslation(const rtl::OString& i_rString, bool i_bIsGlobalized); + String handleTranslation(const OString& i_rString, bool i_bIsGlobalized); static void scanPPDDir( const String& rDir ); static void initPPDFiles(); @@ -192,7 +192,7 @@ public: static const PPDParser* getParser( const String& rFile ); static String getPPDPrinterName( const String& rFile ); static void freeAll(); - static void getKnownPPDDrivers( std::list< rtl::OUString >& o_rDrivers, bool bRefresh = false ); + static void getKnownPPDDrivers( std::list< OUString >& o_rDrivers, bool bRefresh = false ); const String& getFilename() const { return m_aFile; } @@ -250,10 +250,10 @@ public: String getFont( int ) const; - rtl::OUString translateKey( const rtl::OUString& i_rKey, + OUString translateKey( const OUString& i_rKey, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; - rtl::OUString translateOption( const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, + OUString translateOption( const OUString& i_rKey, + const OUString& i_rOption, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; }; @@ -301,7 +301,7 @@ public: // width, height in points, paper will contain the name of the selected // paper after the call - void getPageSize( rtl::OUString& rPaper, int& rWidth, int& rHeight ) const; + void getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const; }; } // namespace diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx index e0a87e9af088..c40e8bc4ab4d 100644 --- a/vcl/inc/vcl/print.hxx +++ b/vcl/inc/vcl/print.hxx @@ -93,10 +93,10 @@ class VCL_DLLPUBLIC QueueInfo friend class Printer; private: - rtl::OUString maPrinterName; - rtl::OUString maDriver; - rtl::OUString maLocation; - rtl::OUString maComment; + OUString maPrinterName; + OUString maDriver; + OUString maLocation; + OUString maComment; sal_uInt32 mnStatus; sal_uInt32 mnJobs; @@ -105,10 +105,10 @@ public: QueueInfo( const QueueInfo& rInfo ); ~QueueInfo(); - const rtl::OUString& GetPrinterName() const { return maPrinterName; } - const rtl::OUString& GetDriver() const { return maDriver; } - const rtl::OUString& GetLocation() const { return maLocation; } - const rtl::OUString& GetComment() const { return maComment; } + const OUString& GetPrinterName() const { return maPrinterName; } + const OUString& GetDriver() const { return maDriver; } + const OUString& GetLocation() const { return maLocation; } + const OUString& GetComment() const { return maComment; } sal_uInt32 GetStatus() const { return mnStatus; } sal_uInt32 GetJobs() const { return mnJobs; } @@ -223,10 +223,10 @@ private: Printer* mpNext; VirtualDevice* mpDisplayDev; PrinterOptions* mpPrinterOptions; - rtl::OUString maPrinterName; - rtl::OUString maDriver; - rtl::OUString maPrintFile; - rtl::OUString maJobName; + OUString maPrinterName; + OUString maDriver; + OUString maPrintFile; + OUString maJobName; JobSetup maJobSetup; Point maPageOffset; Size maPaperSize; @@ -250,13 +250,13 @@ private: SAL_DLLPRIVATE void ImplInitData(); SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow ); - SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const rtl::OUString& rPrinterName, - const rtl::OUString* pDriver ); + SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const OUString& rPrinterName, + const OUString* pDriver ); SAL_DLLPRIVATE void ImplUpdatePageData(); SAL_DLLPRIVATE void ImplUpdateFontList(); SAL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest ); - SAL_DLLPRIVATE bool StartJob( const rtl::OUString& rJobName, boost::shared_ptr& ); + SAL_DLLPRIVATE bool StartJob( const OUString& rJobName, boost::shared_ptr& ); static SAL_DLLPRIVATE sal_uLong ImplSalPrinterErrorCodeToVCL( sal_uLong nError ); @@ -279,17 +279,17 @@ public: Printer(); Printer( const JobSetup& rJobSetup ); Printer( const QueueInfo& rQueueInfo ); - Printer( const rtl::OUString& rPrinterName ); + Printer( const OUString& rPrinterName ); virtual ~Printer(); - static const std::vector< rtl::OUString >& GetPrinterQueues(); - static const QueueInfo* GetQueueInfo( const rtl::OUString& rPrinterName, bool bStatusUpdate ); - static rtl::OUString GetDefaultPrinterName(); + static const std::vector< OUString >& GetPrinterQueues(); + static const QueueInfo* GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate ); + static OUString GetDefaultPrinterName(); virtual void Error(); - const rtl::OUString& GetName() const { return maPrinterName; } - const rtl::OUString& GetDriverName() const { return maDriver; } + const OUString& GetName() const { return maPrinterName; } + const OUString& GetDriverName() const { return maDriver; } sal_Bool IsDefPrinter() const { return mbDefPrinter; } sal_Bool IsDisplayPrinter() const { return mpDisplayDev != NULL; } sal_Bool IsValid() const { return !IsDisplayPrinter(); } @@ -299,7 +299,7 @@ public: sal_Bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - void SetJobValue( const rtl::OUString& rKey, const rtl::OUString& rValue ) { maJobSetup.SetValue( rKey, rValue ); } + void SetJobValue( const OUString& rKey, const OUString& rValue ) { maJobSetup.SetValue( rKey, rValue ); } sal_Bool Setup( Window* pWindow = NULL ); sal_Bool SetPrinterProps( const Printer* pPrinter ); @@ -325,16 +325,16 @@ public: sal_Bool SetPaperSizeUser( const Size& rSize ); sal_Bool SetPaperSizeUser( const Size& rSize, bool bMatchNearest ); Paper GetPaper() const; - static rtl::OUString GetPaperName( Paper ePaper ); + static OUString GetPaperName( Paper ePaper ); // return a UI string for the current paper; i_bPaperUser == false means an empty string for PAPER_USER - rtl::OUString GetPaperName( bool i_bPaperUser = true ) const; + OUString GetPaperName( bool i_bPaperUser = true ) const; // returns number of available paper formats int GetPaperInfoCount() const; // returns info about paper format nPaper const PaperInfo& GetPaperInfo( int nPaper ) const; sal_uInt16 GetPaperBinCount() const; - rtl::OUString GetPaperBinName( sal_uInt16 nPaperBin ) const; + OUString GetPaperBinName( sal_uInt16 nPaperBin ) const; const Size& GetPaperSizePixel() const { return maPaperSize; } Size GetPaperSize() const { return PixelToLogic( maPaperSize ); } @@ -347,7 +347,7 @@ public: sal_Bool IsPrinting() const { return mbPrinting; } - const rtl::OUString& GetCurJobName() const { return maJobName; } + const OUString& GetCurJobName() const { return maJobName; } sal_uInt16 GetCurPage() const { return mnCurPage; } sal_Bool IsJobActive() const { return mbJobActive; } @@ -445,20 +445,20 @@ public: /* get the PropertyValue of a Property */ - com::sun::star::beans::PropertyValue* getValue( const rtl::OUString& i_rPropertyName ); - const com::sun::star::beans::PropertyValue* getValue( const rtl::OUString& i_rPropertyName ) const; + com::sun::star::beans::PropertyValue* getValue( const OUString& i_rPropertyName ); + const com::sun::star::beans::PropertyValue* getValue( const OUString& i_rPropertyName ) const; /* get a bool property in case the property is unknown or not convertible to bool, i_bFallback is returned */ - sal_Bool getBoolProperty( const rtl::OUString& i_rPropertyName, sal_Bool i_bFallback ) const; + sal_Bool getBoolProperty( const OUString& i_rPropertyName, sal_Bool i_bFallback ) const; /* get an int property in case the property is unknown or not convertible to bool, i_nFallback is returned */ - sal_Int32 getIntProperty( const rtl::OUString& i_rPropertyName, sal_Int32 i_nFallback ) const; + sal_Int32 getIntProperty( const OUString& i_rPropertyName, sal_Int32 i_nFallback ) const; /* set a property value - can also be used to add another UI property */ - void setValue( const rtl::OUString& i_rPropertyName, const com::sun::star::uno::Any& i_rValue ); + void setValue( const OUString& i_rPropertyName, const com::sun::star::uno::Any& i_rValue ); void setValue( const com::sun::star::beans::PropertyValue& i_rValue ); /* return the currently active UI options. These are the same that were passed to setUIOptions. @@ -470,12 +470,12 @@ public: void setUIOptions( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); /* enable/disable an option; this can be used to implement dialog logic. */ - bool isUIOptionEnabled( const rtl::OUString& rPropName ) const; - bool isUIChoiceEnabled( const rtl::OUString& rPropName, sal_Int32 nChoice ) const; + bool isUIOptionEnabled( const OUString& rPropName ) const; + bool isUIChoiceEnabled( const OUString& rPropName, sal_Int32 nChoice ) const; /* returns the property name rPropName depends on or an empty string if no dependency exists. */ - rtl::OUString getDependency( const rtl::OUString& rPropName ) const; + OUString getDependency( const OUString& rPropName ) const; /* makeEnabled will chage the property rPropName depends on to the value that makes rPropName enabled. If the dependency itself is also disabled, no action will be performed. @@ -483,7 +483,7 @@ public: returns the property name rPropName depends on or an empty string if no change was made. */ - rtl::OUString makeEnabled( const rtl::OUString& rPropName ); + OUString makeEnabled( const OUString& rPropName ); virtual int getPageCount() const = 0; // must be overloaded by the app /* get the page parameters, namely the jobsetup that should be active for the page @@ -537,7 +537,7 @@ public: class VCL_DLLPUBLIC PrinterOptionsHelper { protected: - boost::unordered_map< rtl::OUString, com::sun::star::uno::Any, rtl::OUStringHash > m_aPropertyMap; + boost::unordered_map< OUString, com::sun::star::uno::Any, OUStringHash > m_aPropertyMap; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aUIProperties; public: @@ -553,7 +553,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper * if the optional output set is not NULL then the names of the changed properties are returned **/ bool processProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp, - std::set< rtl::OUString >* o_pChangeProp = NULL ); + std::set< OUString >* o_pChangeProp = NULL ); /* append to a sequence of property values the ui property sequence passed at creation * as the "ExtraPrintUIOptions" property. if that sequence was empty, no "ExtraPrintUIOptions" property * will be appended. @@ -561,38 +561,38 @@ class VCL_DLLPUBLIC PrinterOptionsHelper void appendPrintUIOptions( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& io_rProps ) const; // returns an empty Any for not existing properties - com::sun::star::uno::Any getValue( const rtl::OUString& i_rPropertyName ) const; + com::sun::star::uno::Any getValue( const OUString& i_rPropertyName ) const; - sal_Bool getBoolValue( const rtl::OUString& i_rPropertyName, sal_Bool i_bDefault = sal_False ) const; + sal_Bool getBoolValue( const OUString& i_rPropertyName, sal_Bool i_bDefault = sal_False ) const; // convenience for fixed strings sal_Bool getBoolValue( const char* i_pPropName, sal_Bool i_bDefault = sal_False ) const - { return getBoolValue( rtl::OUString::createFromAscii( i_pPropName ), i_bDefault ); } + { return getBoolValue( OUString::createFromAscii( i_pPropName ), i_bDefault ); } - sal_Int64 getIntValue( const rtl::OUString& i_rPropertyName, sal_Int64 i_nDefault = 0 ) const; + sal_Int64 getIntValue( const OUString& i_rPropertyName, sal_Int64 i_nDefault = 0 ) const; // convenience for fixed strings sal_Int64 getIntValue( const char* i_pPropName, sal_Int64 i_nDefault = 0 ) const - { return getIntValue( rtl::OUString::createFromAscii( i_pPropName ), i_nDefault ); } + { return getIntValue( OUString::createFromAscii( i_pPropName ), i_nDefault ); } - rtl::OUString getStringValue( const rtl::OUString& i_rPropertyName, const rtl::OUString& i_rDefault = rtl::OUString() ) const; + OUString getStringValue( const OUString& i_rPropertyName, const OUString& i_rDefault = OUString() ) const; // convenience for fixed strings - rtl::OUString getStringValue( const char* i_pPropName, const rtl::OUString& i_rDefault = rtl::OUString() ) const - { return getStringValue( rtl::OUString::createFromAscii( i_pPropName ), i_rDefault ); } + OUString getStringValue( const char* i_pPropName, const OUString& i_rDefault = OUString() ) const + { return getStringValue( OUString::createFromAscii( i_pPropName ), i_rDefault ); } // helper functions for user to create a single control struct UIControlOptions { - rtl::OUString maDependsOnName; + OUString maDependsOnName; sal_Int32 mnDependsOnEntry; sal_Bool mbAttachToDependency; - rtl::OUString maGroupHint; + OUString maGroupHint; sal_Bool mbInternalOnly; sal_Bool mbEnabled; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maAddProps; - UIControlOptions( const rtl::OUString& i_rDependsOnName = rtl::OUString(), + UIControlOptions( const OUString& i_rDependsOnName = OUString(), sal_Int32 i_nDependsOnEntry = -1, sal_Bool i_bAttachToDependency = sal_False, - const rtl::OUString& i_rGroupHint = rtl::OUString(), + const OUString& i_rGroupHint = OUString(), sal_Bool i_bInternalOnly = sal_False, sal_Bool i_bEnabled = sal_True ) @@ -604,56 +604,56 @@ class VCL_DLLPUBLIC PrinterOptionsHelper , mbEnabled( i_bEnabled ) {} }; - // note: in the following helper functions HelpIds are expected as an rtl::OUString - // the normal HelpId form is rtl::OString (byte string instead of UTF16 string) + // note: in the following helper functions HelpIds are expected as an OUString + // the normal HelpId form is OString (byte string instead of UTF16 string) // this is because the whole interface is base on UNO properties; in fact the structures // are passed over UNO interfaces. UNO does not know a byte string, hence the string is // transported via UTF16 strings. // Show general control - static com::sun::star::uno::Any setUIControlOpt( const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs, - const rtl::OUString& i_rTitle, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rType, + static com::sun::star::uno::Any setUIControlOpt( const com::sun::star::uno::Sequence< OUString >& i_rIDs, + const OUString& i_rTitle, + const com::sun::star::uno::Sequence< OUString >& i_rHelpId, + const OUString& i_rType, const com::sun::star::beans::PropertyValue* i_pValue = NULL, const UIControlOptions& i_rControlOptions = UIControlOptions() ); // Show and set the title of a TagPage of id i_rID - static com::sun::star::uno::Any setGroupControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId); + static com::sun::star::uno::Any setGroupControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId); // Show and set the label of a VclFrame of id i_rID - static com::sun::star::uno::Any setSubgroupControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, + static com::sun::star::uno::Any setSubgroupControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, const UIControlOptions& i_rControlOptions = UIControlOptions()); // Show a bool option as a checkbox - static com::sun::star::uno::Any setBoolControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, + static com::sun::star::uno::Any setBoolControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, sal_Bool i_bValue, const UIControlOptions& i_rControlOptions = UIControlOptions()); // Show a set of choices in a list box - static com::sun::star::uno::Any setChoiceListControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rProperty, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices, + static com::sun::star::uno::Any setChoiceListControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const com::sun::star::uno::Sequence< OUString >& i_rHelpId, + const OUString& i_rProperty, + const com::sun::star::uno::Sequence< OUString >& i_rChoices, sal_Int32 i_nValue, const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(), const UIControlOptions& i_rControlOptions = UIControlOptions()); // show a set of choices as radio buttons - static com::sun::star::uno::Any setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs, - const rtl::OUString& i_rTitle, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rProperty, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices, + static com::sun::star::uno::Any setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs, + const OUString& i_rTitle, + const com::sun::star::uno::Sequence< OUString >& i_rHelpId, + const OUString& i_rProperty, + const com::sun::star::uno::Sequence< OUString >& i_rChoices, sal_Int32 i_nValue, const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(), const UIControlOptions& i_rControlOptions = UIControlOptions()); @@ -661,10 +661,10 @@ class VCL_DLLPUBLIC PrinterOptionsHelper // show an integer range (e.g. a spin field) // note: max value < min value means do not apply min/max values - static com::sun::star::uno::Any setRangeControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, + static com::sun::star::uno::Any setRangeControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, sal_Int32 i_nValue, sal_Int32 i_nMinValue = -1, sal_Int32 i_nMaxValue = -2, @@ -672,11 +672,11 @@ class VCL_DLLPUBLIC PrinterOptionsHelper // show a string field // note: max value < min value means do not apply min/max values - static com::sun::star::uno::Any setEditControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, - const rtl::OUString& i_rValue, + static com::sun::star::uno::Any setEditControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, + const OUString& i_rValue, const UIControlOptions& i_rControlOptions = UIControlOptions()); }; diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/vcl/inc/vcl/printerinfomanager.hxx index f45737930a02..108b31504de1 100644 --- a/vcl/inc/vcl/printerinfomanager.hxx +++ b/vcl/inc/vcl/printerinfomanager.hxx @@ -38,18 +38,18 @@ class SystemQueueInfo; struct PrinterInfo : JobData { // basename of PPD - rtl::OUString m_aDriverName; + OUString m_aDriverName; // can be the queue - rtl::OUString m_aLocation; + OUString m_aLocation; // a user defined comment - rtl::OUString m_aComment; + OUString m_aComment; // a command line to pipe a PS-file to - rtl::OUString m_aCommand; + OUString m_aCommand; // a command line to pipe a PS-file to in case of direct print - rtl::OUString m_aQuickCommand; + OUString m_aQuickCommand; // a list of special features separated by ',' not used by psprint // but assigned from the outside (currently for "fax","pdf=","autoqueue","external_dialog") - rtl::OUString m_aFeatures; + OUString m_aFeatures; // a mapping of fonts to other fonts. // this provides a method for the user // to replace arbitrary fonts by printer builtin fonts @@ -60,7 +60,7 @@ struct PrinterInfo : JobData // this vector is currently implicitly given by the adobe // standard encoding bool m_bPerformFontSubstitution; - boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > + boost::unordered_map< OUString, OUString, OUStringHash > m_aFontSubstitutes; boost::unordered_map< fontID, fontID > m_aFontSubstitutions; @@ -78,9 +78,9 @@ public: struct SystemPrintQueue { - rtl::OUString m_aQueue; - rtl::OUString m_aLocation; - rtl::OUString m_aComment; + OUString m_aQueue; + OUString m_aLocation; + OUString m_aComment; }; protected: // needed for checkPrintersChanged: files (not necessarily existant) @@ -88,7 +88,7 @@ protected: struct WatchFile { // the file in question - rtl::OUString m_aFilePath; + OUString m_aFilePath; // the last know modification time or 0, if file did not exist TimeValue m_aModified; }; @@ -98,25 +98,25 @@ protected: { // configuration file containing this printer // empty means a freshly added printer that has to be saved yet - rtl::OUString m_aFile; + OUString m_aFile; // details other config files that have this printer // in case of removal all have to be removed - std::list< rtl::OUString > m_aAlternateFiles; + std::list< OUString > m_aAlternateFiles; // group in m_aFile containing the printer // this must be unique over all configuration files // it usually should be the printer name - rtl::OString m_aGroup; + OString m_aGroup; // whether changes need to be saved bool m_bModified; // the corresponding info and job data PrinterInfo m_aInfo; }; - boost::unordered_map< rtl::OUString, Printer, rtl::OUStringHash > m_aPrinters; + boost::unordered_map< OUString, Printer, OUStringHash > m_aPrinters; PrinterInfo m_aGlobalDefaults; std::list< WatchFile > m_aWatchFiles; - rtl::OUString m_aDefaultPrinter; - rtl::OUString m_aSystemPrintCommand; + OUString m_aDefaultPrinter; + OUString m_aSystemPrintCommand; std::list< SystemPrintQueue > m_aSystemPrintQueues; @@ -125,7 +125,7 @@ protected: Type m_eType; bool m_bUseIncludeFeature; bool m_bUseJobPatch; - rtl::OUString m_aSystemDefaultPaper; + OUString m_aSystemDefaultPaper; bool m_bDisableCUPS; @@ -154,21 +154,21 @@ public: Type getType() const { return m_eType; } // lists the names of all known printers - void listPrinters( std::list< rtl::OUString >& rList ) const; + void listPrinters( std::list< OUString >& rList ) const; // gets the number of known printers int countPrinters() const { return m_aPrinters.size(); } // gets info about a named printer - const PrinterInfo& getPrinterInfo( const rtl::OUString& rPrinter ) const; + const PrinterInfo& getPrinterInfo( const OUString& rPrinter ) const; // gets the name of the default printer - const rtl::OUString& getDefaultPrinter() const { return m_aDefaultPrinter; } + const OUString& getDefaultPrinter() const { return m_aDefaultPrinter; } virtual void setupJobContextData( JobData& rData ); // changes the info about a named printer - virtual void changePrinterInfo( const rtl::OUString& rPrinter, const PrinterInfo& rNewInfo ); + virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ); // check if the printer configuration has changed // if bwait is true, then this method waits for eventual asynchronous @@ -180,14 +180,14 @@ public: // add a named printer // addPrinter fails if a printer with the same name already exists // or the driver does not exist - virtual bool addPrinter( const rtl::OUString& rPrinterName, const rtl::OUString& rDriverName ); + virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName ); // remove a named printer // this fails if the config file belonging to this printer // is not writeable // if bCheckOnly is true, the printer is not really removed; // this is for checking if the removal would fail - virtual bool removePrinter( const rtl::OUString& rPrinterName, bool bCheckOnly = false ); + virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false ); // save the changes to all printers. this fails if there // is no writable config file at all @@ -195,24 +195,24 @@ public: // set a new default printer // fails if the specified printer does not exist - virtual bool setDefaultPrinter( const rtl::OUString& rPrinterName ); + virtual bool setDefaultPrinter( const OUString& rPrinterName ); // primarily used internally but also by padmin // returns the printer queue names virtual const std::list< SystemPrintQueue >& getSystemPrintQueues(); // similar but returnse whole commandlines - virtual void getSystemPrintCommands( std::list< rtl::OUString >& rCommands ); + virtual void getSystemPrintCommands( std::list< OUString >& rCommands ); // abstract print command // returns a stdio FILE* that a postscript file may be written to // this may either be a regular file or the result of popen() - virtual FILE* startSpool( const rtl::OUString& rPrinterName, bool bQuickCommand ); + virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ); // close the FILE* returned by startSpool and does the actual spooling // set bBanner to "false" will attempt to suppress banner printing // set bBanner to "true" will rely on the system default // returns a numerical job id - virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); + virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); // for spadmin: whether adding or removing a printer is possible virtual bool addOrRemovePossible() const; @@ -221,7 +221,7 @@ public: bool getUseJobPatch() const { return m_bUseJobPatch; } // check whether a printer's feature string contains a subfeature - bool checkFeatureToken( const rtl::OUString& rPrinterName, const char* pToken ) const; + bool checkFeatureToken( const OUString& rPrinterName, const char* pToken ) const; // set m_bDisableCUPS and update printer config void setCUPSDisabled( bool ); diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index ebb42c365c4d..19dc20f3ba12 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -835,7 +835,7 @@ public: void SetPreferredSymbolsStyle( sal_uLong nStyle ) { CopyData(); mpData->mnPreferredSymbolsStyle = nStyle; } - void SetPreferredSymbolsStyleName( const ::rtl::OUString &rName ); + void SetPreferredSymbolsStyleName( const OUString &rName ); sal_uLong GetPreferredSymbolsStyle() const { return mpData->mnPreferredSymbolsStyle; } // check whether the symbols style is supported (icons are installed) @@ -844,11 +844,11 @@ public: sal_uLong GetCurrentSymbolsStyle() const; - void SetSymbolsStyleName( const ::rtl::OUString &rName ) + void SetSymbolsStyleName( const OUString &rName ) { return SetSymbolsStyle( ImplNameToSymbolsStyle( rName ) ); } - ::rtl::OUString GetSymbolsStyleName() const + OUString GetSymbolsStyleName() const { return ImplSymbolsStyleToName( GetSymbolsStyle() ); } - ::rtl::OUString GetCurrentSymbolsStyleName() const + OUString GetCurrentSymbolsStyleName() const { return ImplSymbolsStyleToName( GetCurrentSymbolsStyle() ); } const Wallpaper& GetWorkspaceGradient() const @@ -877,8 +877,8 @@ public: { return !(*this == rSet); } protected: - ::rtl::OUString ImplSymbolsStyleToName( sal_uLong nStyle ) const; - sal_uLong ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const; + OUString ImplSymbolsStyleToName( sal_uLong nStyle ) const; + sal_uLong ImplNameToSymbolsStyle( const OUString &rName ) const; }; // ---------------- diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx index 4d38a2ea9dc0..4a902d17aeaa 100644 --- a/vcl/inc/vcl/spinfld.hxx +++ b/vcl/inc/vcl/spinfld.hxx @@ -101,7 +101,7 @@ public: const Link& GetLastHdl() const { return maLastHdlLink; } virtual Size CalcMinimumSize() const; - virtual Size CalcMinimumSizeForText(const rtl::OUString &rString) const; + virtual Size CalcMinimumSizeForText(const OUString &rString) const; virtual Size GetOptimalSize() const; virtual Size CalcSize( sal_uInt16 nChars ) const; }; diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx index 70ea7d65a62a..91aa97113179 100644 --- a/vcl/inc/vcl/status.hxx +++ b/vcl/inc/vcl/status.hxx @@ -160,8 +160,8 @@ public: using Window::GetQuickHelpText; const XubString& GetQuickHelpText( sal_uInt16 nItemId ) const; - void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ); - rtl::OString GetHelpId( sal_uInt16 nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); + OString GetHelpId( sal_uInt16 nItemId ) const; void StartProgressMode( const XubString& rText ); void SetProgressValue( sal_uInt16 nPercent ); @@ -175,9 +175,9 @@ public: const XubString& GetHelpText() const { return Window::GetHelpText(); } - void SetHelpId( const rtl::OString& rId ) + void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); } - const rtl::OString& GetHelpId() const + const OString& GetHelpId() const { return Window::GetHelpId(); } Size CalcWindowSizePixel() const; diff --git a/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx index 9a560d3b0bed..0d0949a3515f 100644 --- a/vcl/inc/vcl/strhelper.hxx +++ b/vcl/inc/vcl/strhelper.hxx @@ -29,16 +29,16 @@ namespace psp { VCL_DLLPUBLIC String GetCommandLineToken( int, const String& ); - VCL_DLLPUBLIC rtl::OString GetCommandLineToken(int, const rtl::OString&); + VCL_DLLPUBLIC OString GetCommandLineToken(int, const OString&); // gets one token of a unix command line style string // doublequote, singlequote and singleleftquote protect their respective // contents - VCL_DLLPUBLIC int GetCommandLineTokenCount(const rtl::OUString&); + VCL_DLLPUBLIC int GetCommandLineTokenCount(const OUString&); // returns number of tokens (zero if empty or whitespace only) VCL_DLLPUBLIC String WhitespaceToSpace( const String&, sal_Bool bProtect = sal_True ); - VCL_DLLPUBLIC rtl::OString WhitespaceToSpace(const rtl::OString&, sal_Bool bProtect = sal_True); + VCL_DLLPUBLIC OString WhitespaceToSpace(const OString&, sal_Bool bProtect = sal_True); // returns a string with multiple adjacent occurrences of whitespace // converted to a single space. if bProtect is sal_True (nonzero), then // doublequote, singlequote and singleleftquote protect their respective @@ -51,7 +51,7 @@ namespace psp return rtl::math::stringToDouble(rStr, sal_Unicode('.'), sal_Unicode(0)); } - VCL_DLLPUBLIC inline double StringToDouble(const rtl::OString& rStr) + VCL_DLLPUBLIC inline double StringToDouble(const OString& rStr) { return rtl::math::stringToDouble(rStr, '.', static_cast(0)); } @@ -61,7 +61,7 @@ namespace psp // returns the string len VCL_DLLPUBLIC inline int getValueOfDouble( char* pBuffer, double f, int nPrecision = 0) { - rtl::OString aStr( rtl::math::doubleToString( f, rtl_math_StringFormat_G, nPrecision, '.', true ) ); + OString aStr( rtl::math::doubleToString( f, rtl_math_StringFormat_G, nPrecision, '.', true ) ); int nLen = aStr.getLength(); std::strncpy( pBuffer, aStr.getStr(), nLen+1 ); // copy string including terminating zero return nLen; diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index e605f57e993c..3198a3d3be56 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -101,17 +101,17 @@ public: ApplicationEvent() {} explicit ApplicationEvent( - Type rEvent, const rtl::OUString& rData = rtl::OUString()): + Type rEvent, const OUString& rData = OUString()): aEvent(rEvent), aData(rData) {} Type GetEvent() const { return aEvent; } - const rtl::OUString& GetData() const { return aData; } + const OUString& GetData() const { return aData; } private: Type aEvent; - rtl::OUString aData; + OUString aData; }; @@ -348,7 +348,7 @@ public: /** Returns a string representing the desktop environment the process is currently running in. */ - static const ::rtl::OUString& GetDesktopEnvironment(); + static const OUString& GetDesktopEnvironment(); /** Add a file to the system shells recent document list if there is any. This function may have no effect under Unix because there is no @@ -362,7 +362,7 @@ public: If an empty string will be provided "application/octet-stream" will be used. */ - static void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + static void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); /** Do we have a native / system file selector available ? */ diff --git a/vcl/inc/vcl/svgdata.hxx b/vcl/inc/vcl/svgdata.hxx index 8de8d3a6bfa1..dccb08f8c579 100644 --- a/vcl/inc/vcl/svgdata.hxx +++ b/vcl/inc/vcl/svgdata.hxx @@ -53,7 +53,7 @@ private: sal_uInt32 mnSvgDataArrayLength; // The absolute Path if available - rtl::OUString maPath; + OUString maPath; // on demand created content basegfx::B2DRange maRange; @@ -65,13 +65,13 @@ private: void ensureSequenceAndRange(); public: - SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const rtl::OUString& rPath); - SvgData(const rtl::OUString& rPath); + SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath); + SvgData(const OUString& rPath); /// data read const SvgDataArray& getSvgDataArray() const { return maSvgDataArray; } sal_uInt32 getSvgDataArrayLength() const { return mnSvgDataArrayLength; } - const rtl::OUString& getPath() const { return maPath; } + const OUString& getPath() const { return maPath; } /// data read and evtl. on demand creation const basegfx::B2DRange& getRange() const; diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx index 1ec1f8876126..07661431a94a 100644 --- a/vcl/inc/vcl/syswin.hxx +++ b/vcl/inc/vcl/syswin.hxx @@ -188,7 +188,7 @@ public: sal_uInt16 GetIcon() const { return mnIcon; } // for systems like MacOSX which can display the URL a document is loaded from // separately from the window title - void SetRepresentedURL( const rtl::OUString& ); + void SetRepresentedURL( const OUString& ); void EnableSaveBackground( sal_Bool bSave = sal_True ); sal_Bool IsSaveBackgroundEnabled() const; @@ -212,8 +212,8 @@ public: const Size& GetMaxOutputSizePixel() const; Size GetResizeOutputSizePixel() const; - void SetWindowState(const rtl::OString& rStr); - rtl::OString GetWindowState(sal_uLong nMask = WINDOWSTATE_MASK_ALL) const; + void SetWindowState(const OString& rStr); + OString GetWindowState(sal_uLong nMask = WINDOWSTATE_MASK_ALL) const; void SetMenuBar( MenuBar* pMenuBar ); MenuBar* GetMenuBar() const { return mpMenuBar; } @@ -259,7 +259,7 @@ public: */ void SetScreenNumber( unsigned int nNewScreen ); - void SetApplicationID( const rtl::OUString &rApplicationID ); + void SetApplicationID( const OUString &rApplicationID ); void SetCloseHdl(const Link& rLink); const Link& GetCloseHdl() const; diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx index f2928d9cadd9..05b8313b537b 100644 --- a/vcl/inc/vcl/tabctrl.hxx +++ b/vcl/inc/vcl/tabctrl.hxx @@ -167,9 +167,9 @@ public: const XubString& GetHelpText() const { return Control::GetHelpText(); } - void SetHelpId( const rtl::OString& rId ) + void SetHelpId( const OString& rId ) { Control::SetHelpId( rId ); } - const rtl::OString& GetHelpId() const + const OString& GetHelpId() const { return Control::GetHelpId(); } void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; } diff --git a/vcl/inc/vcl/tabdlg.hxx b/vcl/inc/vcl/tabdlg.hxx index b6462b60b545..7555f3f01701 100644 --- a/vcl/inc/vcl/tabdlg.hxx +++ b/vcl/inc/vcl/tabdlg.hxx @@ -46,7 +46,7 @@ public: TabDialog( Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); TabDialog( Window* pParent, const ResId& rResId ); - TabDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); ~TabDialog(); virtual void StateChanged( StateChangedType nStateChange ); diff --git a/vcl/inc/vcl/textview.hxx b/vcl/inc/vcl/textview.hxx index e6147c0657f1..314e30fa4f1e 100644 --- a/vcl/inc/vcl/textview.hxx +++ b/vcl/inc/vcl/textview.hxx @@ -82,7 +82,7 @@ protected: void ImpHideDDCursor(); void ImpShowDDCursor(); - bool ImplTruncateNewText( rtl::OUString& rNewText ) const; + bool ImplTruncateNewText( OUString& rNewText ) const; sal_Bool ImplCheckTextLen( const String& rNewText ); VirtualDevice* GetVirtualDevice(); @@ -125,7 +125,7 @@ public: String GetSelected( LineEnd aSeparator ); void DeleteSelected(); - void InsertNewText( const rtl::OUString& rNew, sal_Bool bSelect = sal_False ); + void InsertNewText( const OUString& rNew, sal_Bool bSelect = sal_False ); // deprecated: use InsertNewText instead void InsertText( const String& rNew, sal_Bool bSelect = sal_False ); diff --git a/vcl/inc/vcl/throbber.hxx b/vcl/inc/vcl/throbber.hxx index c6563e44dd21..f2995d7555bc 100644 --- a/vcl/inc/vcl/throbber.hxx +++ b/vcl/inc/vcl/throbber.hxx @@ -66,7 +66,7 @@ public: void setImageList( ::std::vector< Image > const& i_images ); // default images - static ::std::vector< ::rtl::OUString > + static ::std::vector< OUString > getDefaultImageURLs( const ImageSet i_imageSet ); protected: diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index e0c3635f631f..6106bb1bf0ba 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -225,7 +225,7 @@ private: using Window::ImplInvalidate; SAL_DLLPRIVATE void ImplInvalidate( sal_Bool bNewCalc = sal_False, sal_Bool bFullPaint = sal_False ); SAL_DLLPRIVATE void ImplUpdateItem( sal_uInt16 nIndex = 0xFFFF ); - SAL_DLLPRIVATE const rtl::OUString ImplConvertMenuString( const XubString& rStr ); + SAL_DLLPRIVATE const OUString ImplConvertMenuString( const XubString& rStr ); SAL_DLLPRIVATE sal_Bool ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat = sal_False ); SAL_DLLPRIVATE sal_Bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCancel = sal_False ); SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus = sal_False ); @@ -442,8 +442,8 @@ public: void SetHelpText( sal_uInt16 nItemId, const XubString& rText ); const XubString& GetHelpText( sal_uInt16 nItemId ) const; - void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ); - rtl::OString GetHelpId( sal_uInt16 nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); + OString GetHelpId( sal_uInt16 nItemId ) const; // window size according to current alignment, floating state and number of lines Size CalcWindowSizePixel() const; @@ -490,9 +490,9 @@ public: const XubString& GetHelpText() const { return DockingWindow::GetHelpText(); } - void SetHelpId( const rtl::OString& rId ) + void SetHelpId( const OString& rId ) { DockingWindow::SetHelpId( rId ); } - const rtl::OString& GetHelpId() const + const OString& GetHelpId() const { return DockingWindow::GetHelpId(); } void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } diff --git a/vcl/inc/vcl/unohelp.hxx b/vcl/inc/vcl/unohelp.hxx index abbece972bb6..91168436c3ad 100644 --- a/vcl/inc/vcl/unohelp.hxx +++ b/vcl/inc/vcl/unohelp.hxx @@ -54,7 +54,7 @@ VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakI VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification> CreateCharacterClassification(); //Get access to singleton Natural String Sorter collating for Application::GetLocale VCL_DLLPUBLIC const comphelper::string::NaturalStringSorter& getNaturalStringSorterForAppLocale(); -VCL_DLLPUBLIC ::rtl::OUString CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ); +VCL_DLLPUBLIC OUString CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ); VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject ); }} // namespace vcl::unohelper diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx index 353cc94f203c..63caa3b4c352 100644 --- a/vcl/inc/vcl/vclmedit.hxx +++ b/vcl/inc/vcl/vclmedit.hxx @@ -129,7 +129,7 @@ public: void SetTextSelectable( sal_Bool bTextSelectable ); void EnableCursor( sal_Bool bEnable ); - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); }; inline sal_uLong VclMultiLineEdit::IsUpdateDataEnabled() const diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index fda621f83734..04bd8299a317 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -326,7 +326,7 @@ class VclSizeGroup; struct WindowResHeader { sal_uLong nObjMask; - rtl::OString aHelpId; + OString aHelpId; sal_uLong nRSStyle; }; @@ -929,11 +929,11 @@ public: void SetQuickHelpText( const XubString& rHelpText ); const XubString& GetQuickHelpText() const; - void SetHelpId( const rtl::OString& ); - const rtl::OString& GetHelpId() const; + void SetHelpId( const OString& ); + const OString& GetHelpId() const; - void SetUniqueId( const rtl::OString& ); - const rtl::OString& GetUniqueId() const; + void SetUniqueId( const OString& ); + const OString& GetUniqueId() const; Window* FindWindow( const Point& rPos ) const; @@ -1210,14 +1210,14 @@ public: * * @return false if property is unknown */ - virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue); /* * Sets a font attribute * * @return false if attribute is unknown */ - bool set_font_attribute(const rtl::OString &rKey, const rtl::OString &rValue); + bool set_font_attribute(const OString &rKey, const OString &rValue); /* * Adds this widget to the xGroup VclSizeGroup @@ -1269,7 +1269,7 @@ public: void SimulateKeyPress( sal_uInt16 nKeyCode ) const; - virtual rtl::OUString GetSurroundingText() const; + virtual OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; }; diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index b35e3be60044..436144833edb 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -160,7 +160,7 @@ void ImplClearHDCCache( SalData* pData ); HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp = 0 ); void ImplReleaseCachedDC( sal_uLong nID ); -bool ImplAddTempFont( SalData&, const rtl::OUString& rFontFileURL ); +bool ImplAddTempFont( SalData&, const OUString& rFontFileURL ); void ImplReleaseTempFonts( SalData& ); HCURSOR ImplLoadSalCursor( int nId ); diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 2a622195f37d..4076d61451d3 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -90,7 +90,7 @@ public: virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const rtl::OUString& rTitle ); + virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetMenu( SalMenu* pSalMenu ); virtual void DrawMenuBar(); @@ -117,7 +117,7 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); @@ -129,7 +129,7 @@ public: virtual void SetParent( SalFrame* pNewParent ); virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetScreenNumber( unsigned int ); - virtual void SetApplicationID( const rtl::OUString &rApplicationID ); + virtual void SetApplicationID( const OUString &rApplicationID ); virtual void ResetClipRegion(); virtual void BeginSetClipRegion( sal_uIntPtr nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); @@ -140,8 +140,8 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ); // get foreign key names namespace vcl_sal { - rtl::OUString getKeysReplacementName( - rtl::OUString pLang, + OUString getKeysReplacementName( + OUString pLang, LONG nSymbol ); } diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index dca9497efd3a..b26671b10985 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -241,9 +241,9 @@ protected: const Point& aPos, sal_Bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ); + const OUString& aCaption ); virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const rtl::OUString& aCaption, + const ImplControlValue& aValue, const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); virtual bool drawAlphaBitmap( const SalTwoRect&, @@ -299,7 +299,7 @@ public: // graphics should call ImplAddDevFontSubstitute on supplied // OutputDevice for all its device specific preferred font substitutions virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ); + virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); // CreateFontSubset: a method to get a subset of glyhps of a font // inside a new valid font file // returns TRUE if creation of subset was successfull @@ -312,7 +312,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, long* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h index e73070020b8c..5c3b0382870c 100644 --- a/vcl/inc/win/salinst.h +++ b/vcl/inc/win/salinst.h @@ -54,7 +54,7 @@ public: virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ); virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ); virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ); - virtual rtl::OUString GetDefaultPrinter(); + virtual OUString GetDefaultPrinter(); virtual SalTimer* CreateSalTimer(); virtual SalI18NImeStatus* CreateI18NImeStatus(); virtual SalSystem* CreateSalSystem(); @@ -72,7 +72,7 @@ public: virtual void DestroyMenuItem( SalMenuItem* ); virtual SalSession* CreateSalSession(); virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); + virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType); static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo); }; diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h index ff31f0531de1..67cffcfdb1f7 100644 --- a/vcl/inc/win/salmenu.h +++ b/vcl/inc/win/salmenu.h @@ -37,9 +37,9 @@ public: virtual void SetFrame( const SalFrame* pFrame ); virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ); + virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ); + virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); HMENU mhMenu; // the menu handle diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index 4911ce0f3d3a..d33716b9413d 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -50,9 +50,9 @@ class WinSalInfoPrinter : public SalInfoPrinter { public: WinSalGraphics* mpGraphics; // current Printer graphics - rtl::OUString maDriverName; // printer driver name - rtl::OUString maDeviceName; // printer device name - rtl::OUString maPortName; // printer port name + OUString maDriverName; // printer driver name + OUString maDeviceName; // printer device name + OUString maPortName; // printer port name HDC mhDC; // printer hdc sal_Bool mbGraphics; // is Graphics used public: @@ -70,7 +70,7 @@ public: long& rPageWidth, long& rPageHeight ); virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); + virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; @@ -98,9 +98,9 @@ public: virtual ~WinSalPrinter(); using SalPrinter::StartJob; - virtual sal_Bool StartJob( const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString& rAppName, + virtual sal_Bool StartJob( const OUString* pFileName, + const OUString& rJobName, + const OUString& rAppName, sal_uIntPtr nCopies, bool bCollate, bool bDirect, diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h index 3c0bdeb7fe92..9c80b0641bc2 100644 --- a/vcl/inc/win/salsys.h +++ b/vcl/inc/win/salsys.h @@ -30,15 +30,15 @@ class WinSalSystem : public SalSystem public: struct DisplayMonitor { - rtl::OUString m_aName; - rtl::OUString m_aDeviceName; + OUString m_aName; + OUString m_aDeviceName; Rectangle m_aArea; Rectangle m_aWorkArea; sal_Int32 m_nStateFlags; DisplayMonitor() : m_nStateFlags( 0 ) {} - DisplayMonitor( const rtl::OUString& rName, - const rtl::OUString& rDevName, + DisplayMonitor( const OUString& rName, + const OUString& rDevName, const Rectangle& rArea, const Rectangle& rWorkArea, DWORD nStateFlags ) @@ -53,7 +53,7 @@ class WinSalSystem : public SalSystem }; private: std::vector m_aMonitors; - std::map m_aDeviceNameToMonitor; + std::map m_aDeviceNameToMonitor; unsigned int m_nPrimary; public: WinSalSystem() : m_nPrimary( 0 ) {} @@ -63,9 +63,9 @@ public: virtual unsigned int GetDisplayBuiltInScreen(); virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen ); - virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ); - virtual int ShowNativeMessageBox( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, + virtual OUString GetDisplayScreenName( unsigned int nScreen ); + virtual int ShowNativeMessageBox( const OUString& rTitle, + const OUString& rMessage, int nButtonCombination, int nDefaultButton, bool bUseResources); bool initMonitors(); diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 55511918a635..97401f20d460 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -274,8 +274,8 @@ public: long mnY; long mnAbsScreenX; Point maPos; - rtl::OString maHelpId; - rtl::OString maUniqId; + OString maHelpId; + OString maUniqId; XubString maHelpText; XubString maQuickHelpText; InputContext maInputContext; diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 5b695f22bc95..a0893af2716a 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -133,9 +133,9 @@ class IosSalSystem : public SvpSalSystem { public: IosSalSystem() : SvpSalSystem() {} virtual ~IosSalSystem() {} - virtual int ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, + virtual int ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ); }; @@ -176,7 +176,7 @@ public: virtual void UpdateSettings( AllSettings &rSettings ) { // Clobber the UI fonts - Font aFont( rtl::OUString( "Helvetica" ), Size( 0, 14 ) ); + Font aFont( OUString( "Helvetica" ), Size( 0, 14 ) ); StyleSettings aStyleSet = rSettings.GetStyleSettings(); aStyleSet.SetAppFont( aFont ); @@ -251,9 +251,9 @@ void DestroySalInstance( SalInstance *pInst ) delete pInst; } -int IosSalSystem::ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, +int IosSalSystem::ShowNativeDialog( const OUString& rTitle, + const OUString& rMessage, + const std::list< OUString >& rButtons, int nDefButton ) { (void)rButtons; diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx index 3af6955cbe7c..a480856a0fba 100644 --- a/vcl/null/printerinfomanager.cxx +++ b/vcl/null/printerinfomanager.cxx @@ -24,10 +24,6 @@ using namespace psp; using namespace osl; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringHash; PrinterInfoManager& PrinterInfoManager::get() { @@ -141,7 +137,7 @@ const std::list< PrinterInfoManager::SystemPrintQueue >& PrinterInfoManager::get return m_aSystemPrintQueues; } -bool PrinterInfoManager::checkFeatureToken( const rtl::OUString& /* rPrinterName */, const char* /* pToken */ ) const +bool PrinterInfoManager::checkFeatureToken( const OUString& /* rPrinterName */, const char* /* pToken */ ) const { return false; } diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index bec3cc0d9c6d..8c57bc4e924e 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -46,8 +46,8 @@ class VclFiltersTest public: VclFiltersTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); /** @@ -60,8 +60,8 @@ public: CPPUNIT_TEST_SUITE_END(); }; -bool VclFiltersTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, +bool VclFiltersTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { GraphicFilter aGraphicFilter(false); @@ -73,33 +73,33 @@ bool VclFiltersTest::load(const rtl::OUString &, void VclFiltersTest::testCVEs() { #ifndef DISABLE_CVE_TESTS - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/wmf/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/emf/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/sgv/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/png/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/jpg/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/gif/"), - rtl::OUString()); + OUString()); - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/bmp/"), - rtl::OUString()); + OUString()); #endif } diff --git a/vcl/quartz/utils.cxx b/vcl/quartz/utils.cxx index 8319752016b6..390692c0ffc8 100644 --- a/vcl/quartz/utils.cxx +++ b/vcl/quartz/utils.cxx @@ -25,44 +25,44 @@ #include "quartz/utils.h" -rtl::OUString GetOUString( CFStringRef rStr ) +OUString GetOUString( CFStringRef rStr ) { if( rStr == 0 ) - return rtl::OUString(); + return OUString(); CFIndex nLength = CFStringGetLength( rStr ); if( nLength == 0 ) - return rtl::OUString(); + return OUString(); const UniChar* pConstStr = CFStringGetCharactersPtr( rStr ); if( pConstStr ) - return rtl::OUString( pConstStr, nLength ); + return OUString( pConstStr, nLength ); UniChar* pStr = reinterpret_cast( rtl_allocateMemory( sizeof(UniChar)*nLength ) ); CFRange aRange = { 0, nLength }; CFStringGetCharacters( rStr, aRange, pStr ); - rtl::OUString aRet( pStr, nLength ); + OUString aRet( pStr, nLength ); rtl_freeMemory( pStr ); return aRet; } -rtl::OUString GetOUString( NSString* pStr ) +OUString GetOUString( NSString* pStr ) { if( ! pStr ) - return rtl::OUString(); + return OUString(); int nLen = [pStr length]; if( nLen == 0 ) - return rtl::OUString(); + return OUString(); - rtl::OUStringBuffer aBuf( nLen+1 ); + OUStringBuffer aBuf( nLen+1 ); aBuf.setLength( nLen ); [pStr getCharacters: const_cast(aBuf.getStr())]; return aBuf.makeStringAndClear(); } -CFStringRef CreateCFString( const rtl::OUString& rStr ) +CFStringRef CreateCFString( const OUString& rStr ) { return CFStringCreateWithCharacters(kCFAllocatorDefault, rStr.getStr(), rStr.getLength() ); } -NSString* CreateNSString( const rtl::OUString& rStr ) +NSString* CreateNSString( const OUString& rStr ) { return [[NSString alloc] initWithCharacters: rStr.getStr() length: rStr.getLength()]; } diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 2729ae982263..00e3d031dd07 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -506,7 +506,7 @@ DbgWindow::DbgWindow() : SetOutputSizePixel( Size( 600, 480 ) ); if ( pData->aDbgWinState ) { - rtl::OString aState( pData->aDbgWinState ); + OString aState( pData->aDbgWinState ); SetWindowState( aState ); } @@ -520,7 +520,7 @@ DbgWindow::DbgWindow() : sal_Bool DbgWindow::Close() { // remember window position - rtl::OString aState( GetWindowState() ); + OString aState( GetWindowState() ); DbgData* pData = DbgGetData(); size_t nCopy = (sizeof( pData->aDbgWinState ) < size_t(aState.getLength() + 1U )) ? sizeof( pData->aDbgWinState ) : size_t(aState.getLength() + 1U ); @@ -574,7 +574,7 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt ) if ( rCommand.GetCommand() == COMMAND_CONTEXTMENU ) { PopupMenu aMenu; - aMenu.InsertItem( 1, rtl::OUString("copy to clipboard") ); + aMenu.InsertItem( 1, OUString("copy to clipboard") ); Point aPos; if ( rCommand.IsMouseEvent() ) @@ -593,9 +593,9 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt ) GetAssertionEntryRange( maLstBox.GetSelectEntryPos(), nAssertionFirst, nAssertionLast ); // build the string to copy to the clipboard - rtl::OUStringBuffer sAssertion; - rtl::OUString sLineFeed = convertLineEnd( - rtl::OUString("\n"), + OUStringBuffer sAssertion; + OUString sLineFeed = convertLineEnd( + OUString("\n"), GetSystemLineEnd()); while ( nAssertionFirst < nAssertionLast ) { @@ -782,7 +782,7 @@ DbgDialog::DbgDialog() : { maDebugName.Show(); - maDebugName.SetText(rtl::OStringToOUString(pData->aDebugName, RTL_TEXTENCODING_UTF8)); + maDebugName.SetText(OStringToOUString(pData->aDebugName, RTL_TEXTENCODING_UTF8)); maDebugName.SetMaxTextLen( sizeof( pData->aDebugName ) ); maDebugName.SetPosSizePixel( LogicToPixel( Point( 10, 130 ), aAppMap ), LogicToPixel( Size( 185, 14 ), aAppMap ) ); @@ -815,7 +815,7 @@ DbgDialog::DbgDialog() : { maInclClassFilter.Show(); - maInclClassFilter.SetText(rtl::OStringToOUString(pData->aInclClassFilter, RTL_TEXTENCODING_UTF8)); + maInclClassFilter.SetText(OStringToOUString(pData->aInclClassFilter, RTL_TEXTENCODING_UTF8)); maInclClassFilter.SetMaxTextLen( sizeof( pData->aInclClassFilter ) ); maInclClassFilter.SetPosSizePixel( LogicToPixel( Point( 10, 160 ), aAppMap ), LogicToPixel( Size( 95, 14 ), aAppMap ) ); @@ -830,7 +830,7 @@ DbgDialog::DbgDialog() : { maExclClassFilter.Show(); - maExclClassFilter.SetText(rtl::OStringToOUString(pData->aExclClassFilter, RTL_TEXTENCODING_UTF8)); + maExclClassFilter.SetText(OStringToOUString(pData->aExclClassFilter, RTL_TEXTENCODING_UTF8)); maExclClassFilter.SetMaxTextLen( sizeof( pData->aExclClassFilter ) ); maExclClassFilter.SetPosSizePixel( LogicToPixel( Point( 115, 160 ), aAppMap ), LogicToPixel( Size( 95, 14 ), aAppMap ) ); @@ -845,7 +845,7 @@ DbgDialog::DbgDialog() : { maInclFilter.Show(); - maInclFilter.SetText(rtl::OStringToOUString(pData->aInclFilter, RTL_TEXTENCODING_UTF8)); + maInclFilter.SetText(OStringToOUString(pData->aInclFilter, RTL_TEXTENCODING_UTF8)); maInclFilter.SetMaxTextLen( sizeof( pData->aInclFilter ) ); maInclFilter.SetPosSizePixel( LogicToPixel( Point( 10, 190 ), aAppMap ), LogicToPixel( Size( 95, 14 ), aAppMap ) ); @@ -860,7 +860,7 @@ DbgDialog::DbgDialog() : { maExclFilter.Show(); - maExclFilter.SetText(rtl::OStringToOUString(pData->aExclFilter, RTL_TEXTENCODING_UTF8)); + maExclFilter.SetText(OStringToOUString(pData->aExclFilter, RTL_TEXTENCODING_UTF8)); maExclFilter.SetMaxTextLen( sizeof( pData->aExclFilter ) ); maExclFilter.SetPosSizePixel( LogicToPixel( Point( 115, 190 ), aAppMap ), LogicToPixel( Size( 95, 14 ), aAppMap ) ); @@ -993,11 +993,11 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton ) aData.nWarningOut = ImplGetChannelId( maWarningBox, 0 ); aData.nErrorOut = ImplGetChannelId( maErrorBox, mnErrorOff ); - strncpy( aData.aDebugName, rtl::OUStringToOString(maDebugName.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aDebugName ) ); - strncpy( aData.aInclClassFilter, rtl::OUStringToOString(maInclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclClassFilter ) ); - strncpy( aData.aExclClassFilter, rtl::OUStringToOString(maExclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclClassFilter ) ); - strncpy( aData.aInclFilter, rtl::OUStringToOString(maInclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclFilter ) ); - strncpy( aData.aExclFilter, rtl::OUStringToOString(maExclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclFilter ) ); + strncpy( aData.aDebugName, OUStringToOString(maDebugName.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aDebugName ) ); + strncpy( aData.aInclClassFilter, OUStringToOString(maInclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclClassFilter ) ); + strncpy( aData.aExclClassFilter, OUStringToOString(maExclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclClassFilter ) ); + strncpy( aData.aInclFilter, OUStringToOString(maInclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclFilter ) ); + strncpy( aData.aExclFilter, OUStringToOString(maExclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclFilter ) ); aData.aDebugName[sizeof( aData.aDebugName )-1] = '\0'; aData.aInclClassFilter[sizeof( aData.aInclClassFilter )-1] = '\0'; aData.aExclClassFilter[sizeof( aData.aExclClassFilter )-1] = '\0'; @@ -1066,7 +1066,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton ) } if( (aData.nTestFlags & ~IMMEDIATE_FLAGS) != (pData->nTestFlags & ~IMMEDIATE_FLAGS) ) { - InfoBox aBox( this, rtl::OUString( + InfoBox aBox( this, OUString( "Some of the changed settings will only be active after " "restarting the process" ) ); @@ -1296,7 +1296,7 @@ void DbgDialogTest( Window* pWindow ) DbgOutTypef( DBG_OUT_ERROR, "%s should have a mnemonic char (~): %s", pClass, - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); // check text width int aWidth=0; @@ -1319,7 +1319,7 @@ void DbgDialogTest( Window* pWindow ) DbgOutTypef( DBG_OUT_ERROR, "%s exceeds window width: %s", pClass, - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } } @@ -1328,7 +1328,7 @@ void DbgDialogTest( Window* pWindow ) if ( pChild->GetSizePixel().Width() < pChild->GetTextWidth( aText ) ) DbgOutTypef( DBG_OUT_ERROR, "FixedLine exceeds window width: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } if ( pChild->GetType() == WINDOW_FIXEDTEXT ) @@ -1338,7 +1338,7 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "FixedText greater than one line, but WordBreak is not set: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } if ( pChild->IsVisible() ) @@ -1356,7 +1356,7 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "FixedText exceeds window width: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } } @@ -1386,13 +1386,13 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "Labels befor Fields (Edit,ListBox,...) should have a mnemonic char (~): %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } if ( !pTempChild->IsEnabled() && pChild->IsEnabled() ) { DbgOutTypef( DBG_OUT_ERROR, "Labels befor Fields (Edit,ListBox,...) should be disabled, when the field is disabled: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } } } @@ -1481,7 +1481,7 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "No Max-Value is set: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } if ( (pChild->GetType() == WINDOW_RADIOBUTTON) || @@ -1524,7 +1524,7 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "Possible wrong childorder for dialogcontrol: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } aTabPos = aNewPos; } @@ -1536,7 +1536,7 @@ void DbgDialogTest( Window* pWindow ) { DbgOutTypef( DBG_OUT_ERROR, "Window overlaps with sibling window: %s", - rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() ); } } pRectAry[i] = aChildRect; @@ -1565,7 +1565,7 @@ class DbgMessageBox : public ErrorBox m_aMessage( rMessage ) { SetText("Debug Output"); - AddButton(rtl::OUString("Copy"), COPY_BUTTON_ID, 0); + AddButton(OUString("Copy"), COPY_BUTTON_ID, 0); } virtual void Click() @@ -1737,7 +1737,7 @@ void DbgPrintWindow( const char* pLine ) void DbgAbort( char const * i_message ) { - ::rtl::OUString const message( i_message, strlen( i_message ), osl_getThreadTextEncoding() ); + OUString const message( i_message, strlen( i_message ), osl_getThreadTextEncoding() ); Application::Abort( message ); } diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 1ed6efceaa48..95d1f5a32de9 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -100,7 +100,7 @@ inline bool is_formatting_mark( sal_Unicode c ) String vcl::I18nHelper::filterFormattingChars( const String& rStr ) { sal_Int32 nUnicodes = rStr.Len(); - rtl::OUStringBuffer aBuf( nUnicodes ); + OUStringBuffer aBuf( nUnicodes ); const sal_Unicode* pStr = rStr.GetBuffer(); while( nUnicodes-- ) { @@ -111,7 +111,7 @@ String vcl::I18nHelper::filterFormattingChars( const String& rStr ) return aBuf.makeStringAndClear(); } -sal_Int32 vcl::I18nHelper::CompareString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const +sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& rStr2 ) const { ::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex ); @@ -130,7 +130,7 @@ sal_Int32 vcl::I18nHelper::CompareString( const rtl::OUString& rStr1, const rtl: return ImplGetTransliterationWrapper().compareString( aStr1, aStr2 ); } -sal_Bool vcl::I18nHelper::MatchString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const +sal_Bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rStr2 ) const { ::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex ); @@ -157,7 +157,7 @@ sal_Bool vcl::I18nHelper::MatchMnemonic( const String& rString, sal_Unicode cMne if ( n != STRING_NOTFOUND ) { String aMatchStr( rString, n+1, STRING_LEN ); // not only one char, because of transliteration... - bEqual = MatchString( rtl::OUString(cMnemonicChar), aMatchStr ); + bEqual = MatchString( OUString(cMnemonicChar), aMatchStr ); } return bEqual; } diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 00baac95ac45..6601446e97f2 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -47,7 +47,7 @@ void SalFrame::Flush( const Rectangle& ) // ----------------------------------------------------------------------- -void SalFrame::SetRepresentedURL( const rtl::OUString& ) +void SalFrame::SetRepresentedURL( const OUString& ) { // currently this is Mac only functionality } @@ -58,7 +58,7 @@ SalInstance::~SalInstance() { } -void SalInstance::FillFontPathList( std::list< rtl::OString >& ) +void SalInstance::FillFontPathList( std::list< OString >& ) { // do nothing } @@ -106,7 +106,7 @@ SalPrinter::~SalPrinter() { } -sal_Bool SalPrinter::StartJob( const rtl::OUString*, const rtl::OUString&, const rtl::OUString&, +sal_Bool SalPrinter::StartJob( const OUString*, const OUString&, const OUString&, ImplJobSetup*, vcl::PrinterController& ) { return sal_False; diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 728a1df66ef2..9c0f30b84fbb 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; -using ::rtl::OUString; SalSession::~SalSession() { @@ -341,7 +340,7 @@ OUString SAL_CALL vcl_session_getImplementationName() return OUString( "com.sun.star.frame.VCLSessionManagerClient" ); } -Sequence< rtl::OUString > SAL_CALL vcl_session_getSupportedServiceNames() +Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames() { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.frame.SessionManagerClient"; diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index adbadbe2ffb4..631b2e12f8a9 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -354,7 +354,7 @@ void ImplStyleData::SetStandardStyles() Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) ); aStdFont.SetCharSet( osl_getThreadTextEncoding() ); aStdFont.SetWeight( WEIGHT_NORMAL ); - aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( "en" ), rtl::OUString(), rtl::OUString() ) ) ); + aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( OUString( "en" ), OUString(), OUString() ) ) ); maAppFont = aStdFont; maHelpFont = aStdFont; maMenuFont = aStdFont; @@ -501,45 +501,45 @@ void StyleSettings::Set3DColors( const Color& rColor ) // ----------------------------------------------------------------------- -::rtl::OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const +OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const { switch ( nStyle ) { - case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString("default"); - case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString("hicontrast"); - case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString("tango"); // industrial is dead - case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString("crystal"); - case STYLE_SYMBOLS_TANGO: return ::rtl::OUString("tango"); - case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString("oxygen"); - case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString("classic"); - case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString("human"); - case STYLE_SYMBOLS_TANGO_TESTING: return ::rtl::OUString("tango_testing"); + case STYLE_SYMBOLS_DEFAULT: return OUString("default"); + case STYLE_SYMBOLS_HICONTRAST: return OUString("hicontrast"); + case STYLE_SYMBOLS_INDUSTRIAL: return OUString("tango"); // industrial is dead + case STYLE_SYMBOLS_CRYSTAL: return OUString("crystal"); + case STYLE_SYMBOLS_TANGO: return OUString("tango"); + case STYLE_SYMBOLS_OXYGEN: return OUString("oxygen"); + case STYLE_SYMBOLS_CLASSIC: return OUString("classic"); + case STYLE_SYMBOLS_HUMAN: return OUString("human"); + case STYLE_SYMBOLS_TANGO_TESTING: return OUString("tango_testing"); } - return ::rtl::OUString("auto"); + return OUString("auto"); } // ----------------------------------------------------------------------- -sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const +sal_uLong StyleSettings::ImplNameToSymbolsStyle( const OUString &rName ) const { - if ( rName == ::rtl::OUString("default") ) + if ( rName == OUString("default") ) return STYLE_SYMBOLS_DEFAULT; - else if ( rName == ::rtl::OUString("hicontrast") ) + else if ( rName == OUString("hicontrast") ) return STYLE_SYMBOLS_HICONTRAST; - else if ( rName == ::rtl::OUString("industrial") ) + else if ( rName == OUString("industrial") ) return STYLE_SYMBOLS_TANGO; // industrial is dead - else if ( rName == ::rtl::OUString("crystal") ) + else if ( rName == OUString("crystal") ) return STYLE_SYMBOLS_CRYSTAL; - else if ( rName == ::rtl::OUString("tango") ) + else if ( rName == OUString("tango") ) return STYLE_SYMBOLS_TANGO; - else if ( rName == ::rtl::OUString("oxygen") ) + else if ( rName == OUString("oxygen") ) return STYLE_SYMBOLS_OXYGEN; - else if ( rName == ::rtl::OUString("classic") ) + else if ( rName == OUString("classic") ) return STYLE_SYMBOLS_CLASSIC; - else if ( rName == ::rtl::OUString("human") ) + else if ( rName == OUString("human") ) return STYLE_SYMBOLS_HUMAN; - else if ( rName == ::rtl::OUString("tango_testing") ) + else if ( rName == OUString("tango_testing") ) return STYLE_SYMBOLS_TANGO_TESTING; return STYLE_SYMBOLS_AUTO; @@ -553,11 +553,11 @@ sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) we check if any registered style name is a case-insensitive substring of the preferred style name. */ -void StyleSettings::SetPreferredSymbolsStyleName( const ::rtl::OUString &rName ) +void StyleSettings::SetPreferredSymbolsStyleName( const OUString &rName ) { if ( !rName.isEmpty() ) { - ::rtl::OUString rNameLowCase( rName.toAsciiLowerCase() ); + OUString rNameLowCase( rName.toAsciiLowerCase() ); for( sal_uInt32 n = 0; n <= STYLE_SYMBOLS_THEMES_MAX; n++ ) if ( rNameLowCase.indexOf( ImplSymbolsStyleToName( n ) ) != -1 ) @@ -621,7 +621,7 @@ sal_uLong StyleSettings::GetCurrentSymbolsStyle() const sal_uLong StyleSettings::GetAutoSymbolsStyle() const { - rtl::OUString const & env = Application::GetDesktopEnvironment(); + OUString const & env = Application::GetDesktopEnvironment(); sal_uLong nRet; if ( env.equalsIgnoreAsciiCase("tde") || @@ -1047,10 +1047,10 @@ sal_Bool MiscSettings::GetDisablePrinting() const { if( mpData->mnDisablePrinting == (sal_uInt16)~0 ) { - rtl::OUString aEnable = + OUString aEnable = vcl::SettingsConfigItem::get()-> - getValue( rtl::OUString( "DesktopManagement" ), - rtl::OUString( "DisablePrinting" ) ); + getValue( OUString( "DesktopManagement" ), + OUString( "DisablePrinting" ) ); mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0; } @@ -1103,10 +1103,10 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const static const char* pEnv = getenv("SAL_ACCESSIBILITY_ENABLED" ); if( !pEnv || !*pEnv ) { - rtl::OUString aEnable = + OUString aEnable = vcl::SettingsConfigItem::get()-> - getValue( rtl::OUString( "Accessibility" ), - rtl::OUString( "EnableATToolSupport" ) ); + getValue( OUString( "Accessibility" ), + OUString( "EnableATToolSupport" ) ); mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0; } else @@ -1164,9 +1164,9 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable ) } vcl::SettingsConfigItem::get()-> - setValue( rtl::OUString( "Accessibility" ), - rtl::OUString( "EnableATToolSupport" ), - bEnable ? rtl::OUString("true") : rtl::OUString("false" ) ); + setValue( OUString( "Accessibility" ), + OUString( "EnableATToolSupport" ), + bEnable ? OUString("true") : OUString("false" ) ); mpData->mnEnableATT = bEnable ? 1 : 0; } } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 1692170517f0..b5acabe1fcc7 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -211,7 +211,7 @@ Application* GetpApp() Application::Application() { // useful for themes at least, perhaps extensions too - rtl::OUString aVar("LIBO_VERSION"), aValue(LIBO_VERSION_DOTTED); + OUString aVar("LIBO_VERSION"), aValue(LIBO_VERSION_DOTTED); osl_setEnvironment(aVar.pData, aValue.pData); if( ! ImplGetSVData() ) @@ -289,7 +289,7 @@ sal_uInt16 Application::GetCommandLineParamCount() XubString Application::GetCommandLineParam( sal_uInt16 nParam ) { - rtl::OUString aParam; + OUString aParam; osl_getCommandArg( nParam, &aParam.pData ); return aParam; } @@ -310,11 +310,11 @@ const XubString& Application::GetAppFileName() static String aAppFileName; if( !aAppFileName.Len() ) { - rtl::OUString aExeFileName; + OUString aExeFileName; osl_getExecutableFile( &aExeFileName.pData ); // convert path to native file format - rtl::OUString aNativeFileName; + OUString aNativeFileName; osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName ); aAppFileName = aNativeFileName; } @@ -338,17 +338,17 @@ sal_uInt16 Application::Exception( sal_uInt16 nError ) #ifdef DBG_UTIL case EXC_RSCNOTLOADED: - Abort(rtl::OUString("Resource not loaded")); + Abort(OUString("Resource not loaded")); break; case EXC_SYSOBJNOTCREATED: - Abort(rtl::OUString("System Object not created")); + Abort(OUString("System Object not created")); break; default: - Abort(rtl::OUString("Unknown Error")); + Abort(OUString("Unknown Error")); break; #else default: - Abort(rtl::OUString()); + Abort(OUString()); break; #endif } @@ -1600,7 +1600,7 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate ) { #ifndef DISABLE_DYNLOADING - ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( + OUString aLibName = ::vcl::unohelper::CreateLibraryName( #ifdef LIBO_MERGELIBS "merged", #else @@ -1758,7 +1758,7 @@ bool Application::IsHeadlessModeRequested() { sal_uInt32 n = rtl_getAppCommandArgCount(); for (sal_uInt32 i = 0; i < n; ++i) { - rtl::OUString arg; + OUString arg; rtl_getAppCommandArg(i, &arg.pData); if ( arg == "--headless" || arg == "-headless" ) { return true; @@ -1812,12 +1812,12 @@ bool Application::GetShowImeStatusWindowDefault() && aInfo.MaximumCharSize > 1; } -const ::rtl::OUString& Application::GetDesktopEnvironment() +const OUString& Application::GetDesktopEnvironment() { return SalGetDesktopEnvironment(); } -void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) +void Application::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType) { ImplSVData* pSVData = ImplGetSVData(); pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType); diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index f919af686e6d..feec982e32b4 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -57,7 +57,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::awt; -using ::rtl::OUString; // ======================================================================= @@ -79,7 +78,7 @@ SalSystem* ImplGetSalSystem() } -static rtl::OUString ReplaceJavaErrorMessages( const rtl::OUString& rString ) +static OUString ReplaceJavaErrorMessages( const OUString& rString ) { return rString.replaceAll("%OK", Button::GetStandardText(BUTTON_OK)). replaceAll("%IGNORE", Button::GetStandardText(BUTTON_IGNORE)). @@ -186,7 +185,7 @@ ResMgr* ImplGetResMgr() "Missing vcl resource. This indicates that files vital to localization are missing. " "You might have a corrupt installation."; fprintf( stderr, "%s\n", pMsg ); - ErrorBox aBox( NULL, WB_OK | WB_DEF_OK, rtl::OUString( pMsg, strlen( pMsg ), RTL_TEXTENCODING_ASCII_US ) ); + ErrorBox aBox( NULL, WB_OK | WB_DEF_OK, OUString( pMsg, strlen( pMsg ), RTL_TEXTENCODING_ASCII_US ) ); aBox.Execute(); } } @@ -237,7 +236,7 @@ FieldUnitStringList* ImplGetCleanedFieldUnits() pSVData->maCtrlData.mpCleanUnitStrings->reserve( nUnits ); for( size_t i = 0; i < nUnits; ++i ) { - rtl::OUString aUnit( (*pUnits)[i].first ); + OUString aUnit( (*pUnits)[i].first ); aUnit = comphelper::string::remove(aUnit, ' '); aUnit = aUnit.toAsciiLowerCase(); std::pair< String, FieldUnit > aElement( aUnit, (*pUnits)[i].second ); @@ -265,13 +264,13 @@ public: m_prevContext( context ) {} // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name ) + virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) throw (com::sun::star::uno::RuntimeException); private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_prevContext; }; -com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const rtl::OUString & Name ) +com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const OUString & Name ) throw (com::sun::star::uno::RuntimeException) { com::sun::star::uno::Any ret; @@ -347,8 +346,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - rtl::OUString aTitle(ResId(SV_ACCESSERROR_JAVA_NOT_CONFIGURED, *pResMgr).toString()); - rtl::OUStringBuffer aMessage((ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)).toString()); + OUString aTitle(ResId(SV_ACCESSERROR_JAVA_NOT_CONFIGURED, *pResMgr).toString()); + OUStringBuffer aMessage((ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)).toString()); aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString()); @@ -370,8 +369,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - rtl::OUString aTitle(ResId(SV_ACCESSERROR_FAULTY_JAVA, *pResMgr).toString()); - rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); + OUString aTitle(ResId(SV_ACCESSERROR_FAULTY_JAVA, *pResMgr).toString()); + OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString()); @@ -393,8 +392,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - rtl::OUString aTitle(ResId(SV_ACCESSERROR_MISSING_JAVA, *pResMgr).toString()); - rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); + OUString aTitle(ResId(SV_ACCESSERROR_MISSING_JAVA, *pResMgr).toString()); + OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString()); @@ -416,8 +415,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && bAllowCancel && pResMgr ) { - rtl::OUString aTitle(ResId(SV_ACCESSERROR_JAVA_DISABLED, *pResMgr).toString()); - rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); + OUString aTitle(ResId(SV_ACCESSERROR_JAVA_DISABLED, *pResMgr).toString()); + OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString()); aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString()); @@ -439,8 +438,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled) ResMgr *pResMgr = ImplGetResMgr(); if( bErrorMessage && pResMgr ) { - rtl::OUString aTitle; - rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr).toString()); + OUString aTitle; + OUStringBuffer aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr).toString()); if( e.Message.startsWith("ClassNotFound") ) { diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 303c0999d5f8..f7533fdb5f05 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -81,7 +81,6 @@ #include "rtl/strbuf.hxx" #endif -using ::rtl::OUString; using namespace ::com::sun::star; // ======================================================================= @@ -217,14 +216,14 @@ public: : m_xNextContext( ctx ) {} // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name ) + virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) throw (com::sun::star::uno::RuntimeException); private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext; }; -uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const rtl::OUString& Name) throw (uno::RuntimeException) +uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name) throw (uno::RuntimeException) { uno::Any retVal; @@ -284,11 +283,11 @@ sal_Bool InitVCL() pSVData->mpApp->Init(); // Fetch AppFileName and make it absolute before the workdir changes... - rtl::OUString aExeFileName; + OUString aExeFileName; osl_getExecutableFile( &aExeFileName.pData ); // convert path to native file format - rtl::OUString aNativeFileName; + OUString aNativeFileName; osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName ); pSVData->maAppData.mpAppFileName = new String( aNativeFileName ); @@ -362,7 +361,7 @@ void DeInitVCL() pSVData->mpImeStatus = NULL; #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aBuf( 256 ); + OStringBuffer aBuf( 256 ); aBuf.append( "DeInitVCL: some top Windows are still alive\n" ); long nTopWindowCount = Application::GetTopWindowCount(); long nBadTopWindows = nTopWindowCount; @@ -376,7 +375,7 @@ void DeInitVCL() else { aBuf.append( "text = \"" ); - aBuf.append( rtl::OUStringToOString( pWin->GetText(), osl_getThreadTextEncoding() ) ); + aBuf.append( OUStringToOString( pWin->GetText(), osl_getThreadTextEncoding() ) ); aBuf.append( "\" type = \"" ); aBuf.append( typeid(*pWin).name() ); aBuf.append( "\", ptr = 0x" ); diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index 3b15d25bd521..e5187c1d1dcc 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -45,7 +45,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte return i18n::CharacterClassification::create( comphelper::getProcessComponentContext() ); } -::rtl::OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ) +OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ) { // create variable library name suffixes OUString aDLLSuffix = OUString::createFromAscii( SAL_STRINGIFY( DLLPOSTFIX ) ); @@ -58,7 +58,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte { aLibName += aDLLSuffix; } - aLibName += rtl::OUString( ".dll" ); + aLibName += OUString( ".dll" ); #else aLibName = OUString( "lib" ); aLibName += OUString::createFromAscii( pModName ); diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index 9f1d9edf4df2..e2663669ef5c 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -77,7 +77,7 @@ namespace vcl { namespace unohelper { sal_uLong nT = SotExchange::GetFormat( rFlavor ); if ( nT == SOT_FORMAT_STRING ) { - aAny <<= (::rtl::OUString)GetString(); + aAny <<= (OUString)GetString(); } else { diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 18881de9e0cb..650fce07f7fc 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -43,7 +43,6 @@ #include "cppuhelper/compbase2.hxx" #include "cppuhelper/implbase1.hxx" -using rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -80,12 +79,12 @@ public: * XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName() throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); - static rtl::OUString getImplementationName_static(); - static Sequence< rtl::OUString > getSupportedServiceNames_static(); + static OUString getImplementationName_static(); + static Sequence< OUString > getSupportedServiceNames_static(); /* * XClipboard @@ -99,7 +98,7 @@ public: const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw(RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw(RuntimeException); /* @@ -125,29 +124,29 @@ GenericClipboard::~GenericClipboard() { } -rtl::OUString GenericClipboard::getImplementationName_static() +OUString GenericClipboard::getImplementationName_static() { - return rtl::OUString( "com.sun.star.datatransfer.VCLGenericClipboard" ); + return OUString( "com.sun.star.datatransfer.VCLGenericClipboard" ); } -Sequence< rtl::OUString > GenericClipboard::getSupportedServiceNames_static() +Sequence< OUString > GenericClipboard::getSupportedServiceNames_static() { Sequence< OUString > aRet(1); aRet[0] = OUString("com.sun.star.datatransfer.clipboard.SystemClipboard"); return aRet; } -rtl::OUString GenericClipboard::getImplementationName() throw( RuntimeException ) +OUString GenericClipboard::getImplementationName() throw( RuntimeException ) { return getImplementationName_static(); } -Sequence< rtl::OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException ) { return getSupportedServiceNames_static(); } -sal_Bool GenericClipboard::supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException ) +sal_Bool GenericClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException ) { Sequence< OUString > aServices( getSupportedServiceNames() ); sal_Int32 nServices = aServices.getLength(); @@ -190,9 +189,9 @@ void GenericClipboard::setContents( } } -rtl::OUString GenericClipboard::getName() throw( RuntimeException ) +OUString GenericClipboard::getName() throw( RuntimeException ) { - return rtl::OUString( "CLIPBOARD" ); + return OUString( "CLIPBOARD" ); } sal_Int8 GenericClipboard::getRenderingCapabilities() throw( RuntimeException ) diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 9fefd4ba7233..5218c28efe7b 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index e4187ccf7325..87be8e0995df 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -35,7 +35,6 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 29f98622dbf6..d21312d0d23f 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1007,7 +1007,7 @@ void PushButton::ImplDrawPushButton( bool bLayout ) nState |= CTRL_STATE_ROLLOVER; bNativeOK = DrawNativeControl( aCtrlType, PART_BUTTON_DOWN, aInRect, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); } } } @@ -1062,7 +1062,7 @@ void PushButton::ImplDrawPushButton( bool bLayout ) if( ((nState & CTRL_STATE_ROLLOVER)) || ! (GetStyle() & WB_FLATBUTTON) ) { bNativeOK = DrawNativeControl( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - aControlValue, rtl::OUString()/*PushButton::GetText()*/ ); + aControlValue, OUString()/*PushButton::GetText()*/ ); } else { @@ -1128,7 +1128,7 @@ void PushButton::ImplSetDefButton( sal_Bool bSet ) // get native size of a 'default' button // and adjust the VCL button if more space for adornment is required if( GetNativeControlRegion( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, - nState, aControlValue, rtl::OUString(), + nState, aControlValue, OUString(), aBound, aCont ) ) { dLeft = aCont.Left() - aBound.Left(); @@ -1707,7 +1707,7 @@ Size PushButton::GetOptimalSize() const return CalcMinimumSize(); } -bool PushButton::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool PushButton::set_property(const OString &rKey, const OString &rValue) { if (rKey == "has-default") { @@ -2036,7 +2036,7 @@ void RadioButton::ImplDrawRadioButtonState() nState |= CTRL_STATE_ROLLOVER; bNativeOK = DrawNativeControl( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRect, nState, - aControlValue,rtl::OUString() ); + aControlValue,OUString() ); } @@ -2838,7 +2838,7 @@ void RadioButton::SetState( sal_Bool bCheck ) } } -bool RadioButton::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool RadioButton::set_property(const OString &rKey, const OString &rValue) { if (rKey == "active") SetState(toBool(rValue)); @@ -2901,7 +2901,7 @@ Size RadioButton::ImplGetRadioImageSize() const // get native size of a radio button if( pThis->GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, - nState, aControlValue, rtl::OUString(), + nState, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { aSize = aContentRgn.GetSize(); @@ -3010,7 +3010,7 @@ void RadioButton::ImplSetMinimumNWFSize() // get native size of a radiobutton if( GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { Size aSize = aContentRgn.GetSize(); @@ -3203,7 +3203,7 @@ void CheckBox::ImplDrawCheckBoxState() nState |= CTRL_STATE_ROLLOVER; bNativeOK = DrawNativeControl( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); } if ( bNativeOK == sal_False ) @@ -3786,7 +3786,7 @@ void CheckBox::SetState( TriState eState ) } } -bool CheckBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool CheckBox::set_property(const OString &rKey, const OString &rValue) { if (rKey == "active") SetState(toBool(rValue) ? STATE_CHECK : STATE_NOCHECK); @@ -3835,7 +3835,7 @@ Size CheckBox::ImplGetCheckImageSize() const // get native size of a check box if( pThis->GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion, - nState, aControlValue, rtl::OUString(), + nState, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { aSize = aContentRgn.GetSize(); @@ -3923,7 +3923,7 @@ void CheckBox::ImplSetMinimumNWFSize() // get native size of a radiobutton if( GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { Size aSize = aContentRgn.GetSize(); @@ -4123,7 +4123,7 @@ void DisclosureButton::ImplDrawCheckBoxState() nState |= CTRL_STATE_ROLLOVER; if( ! DrawNativeControl( CTRL_LISTNODE, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - aControlValue, rtl::OUString() ) ) + aControlValue, OUString() ) ) { ImplSVCtrlData& rCtrlData( ImplGetSVData()->maCtrlData ); if( ! rCtrlData.mpDisclosurePlus ) diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index cc8282030c46..9c8e3b806754 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -130,7 +130,7 @@ void ComboBox::ImplCalcEditHeight() if( GetNativeControlRegion( aType, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, - aControlValue, rtl::OUString(), + aControlValue, OUString(), aBoundRegion, aContentRegion ) ) { const long nNCHeight = aBoundRegion.GetHeight(); @@ -1039,7 +1039,7 @@ long ComboBox::getMaxWidthScrollBarAndDownButton() const Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() ); if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_BUTTON_DOWN, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { nButtonDownWidth = aContent.getWidth(); } @@ -1156,7 +1156,7 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const { - long nCharWidth = GetTextWidth(rtl::OUString(static_cast('x'))); + long nCharWidth = GetTextWidth(OUString(static_cast('x'))); if ( !IsDropDownBox() ) { Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel(); @@ -1514,7 +1514,7 @@ ComboBox::ComboBoxBounds ComboBox::calcComboBoxDropDownComponentBounds(const Siz Rectangle aArea( aPoint, rBorderOutSz ); if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_BUTTON_DOWN, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { // convert back from border space to local coordinates aPoint = pBorder->ScreenToOutputPixel( OutputToScreenPixel( aPoint ) ); @@ -1525,7 +1525,7 @@ ComboBox::ComboBoxBounds ComboBox::calcComboBoxDropDownComponentBounds(const Siz // adjust the size of the edit field if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_SUB_EDIT, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { // convert back from border space to local coordinates aContent.Move(-aPoint.X(), -aPoint.Y()); @@ -1560,7 +1560,7 @@ void ComboBox::setMaxWidthChars(sal_Int32 nWidth) } } -bool ComboBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool ComboBox::set_property(const OString &rKey, const OString &rValue) { if (rKey == "max-width-chars") setMaxWidthChars(rValue.toInt32()); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index bde19723ca7b..ce26c501ad61 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -214,7 +214,7 @@ void Edit::SetWidthInChars(sal_Int32 nWidthInChars) } } -bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool Edit::set_property(const OString &rKey, const OString &rValue) { if (rKey == "width-chars") SetWidthInChars(rValue.toInt32()); @@ -473,7 +473,7 @@ OUString Edit::ImplGetText() const cEchoChar = mcEchoChar; else cEchoChar = '*'; - rtl::OUStringBuffer aText; + OUStringBuffer aText; comphelper::string::padToLength(aText, maText.getLength(), cEchoChar); return aText.makeStringAndClear(); } @@ -808,7 +808,7 @@ void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uI OUString Edit::ImplGetValidString( const OUString& rString ) const { - rtl::OUString aValidString( rString ); + OUString aValidString( rString ); aValidString = comphelper::string::remove(aValidString, _LF); aValidString = comphelper::string::remove(aValidString, _CR); aValidString = aValidString.replace('\t', ' '); @@ -854,7 +854,7 @@ void Edit::ShowTruncationWarning( Window* pParent ) // ----------------------------------------------------------------------- -bool Edit::ImplTruncateToMaxLen( rtl::OUString& rStr, sal_uInt32 nSelectionLen ) const +bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_uInt32 nSelectionLen ) const { bool bWasTruncated = false; const sal_uInt32 nMaxLen = mnMaxTextLen < 65534 ? mnMaxTextLen : 65534; @@ -951,7 +951,7 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, sal_B // the text that needs to be checked is only the one // before the current cursor position OUString aOldText( maText.getStr(), nTmpPos); - rtl::OUString aTmpText( aOldText ); + OUString aTmpText( aOldText ); if (bCTLSequenceCheckingTypeAndReplace) { xISC->correctInputSequence( aTmpText, nTmpPos - 1, cChar, nCheckMode ); @@ -1434,7 +1434,7 @@ void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC try { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; if( ImplTruncateToMaxLen( aText, maSelection.Len() ) ) ShowTruncationWarning( const_cast(this) ); @@ -1853,7 +1853,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) bDone = sal_True; // read characters also when in ReadOnly if ( !mbReadOnly ) { - ImplInsertText(rtl::OUString(rKEvt.GetCharCode()), 0, sal_True); + ImplInsertText(OUString(rKEvt.GetCharCode()), 0, sal_True); if ( maAutocompleteHdl.IsSet() ) { if ( (maSelection.Min() == maSelection.Max()) && (maSelection.Min() == maText.getLength()) ) @@ -2841,7 +2841,7 @@ void Edit::SetSubEdit( Edit* pEdit ) } } -Size Edit::CalcMinimumSizeForText(const rtl::OUString &rString) const +Size Edit::CalcMinimumSizeForText(const OUString &rString) const { Size aSize; if (mnWidthInChars != -1) @@ -2870,7 +2870,7 @@ Size Edit::CalcMinimumSizeForText(const rtl::OUString &rString) const Rectangle aContent, aBound; if( const_cast(this)->GetNativeControlRegion( CTRL_EDITBOX, PART_ENTIRE_CONTROL, - aRect, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aRect, 0, aControlValue, OUString(), aBound, aContent) ) { if( aBound.GetHeight() > aSize.Height() ) aSize.Height() = aBound.GetHeight(); @@ -2904,7 +2904,7 @@ Size Edit::CalcSize( xub_StrLen nChars ) const { // width for N characters, independent from content. // works only correct for fixed fonts, average otherwise - Size aSz( GetTextWidth( rtl::OUString('x') ), GetTextHeight() ); + Size aSz( GetTextWidth( OUString('x') ), GetTextHeight() ); aSz.Width() *= nChars; aSz.Width() += ImplGetExtraOffset() * 2; aSz = CalcWindowSize( aSz ); @@ -2917,7 +2917,7 @@ xub_StrLen Edit::GetMaxVisChars() const { const Window* pW = mpSubEdit ? mpSubEdit : this; long nOutWidth = pW->GetOutputSizePixel().Width(); - long nCharWidth = GetTextWidth( rtl::OUString('x') ); + long nCharWidth = GetTextWidth( OUString('x') ); return nCharWidth ? (xub_StrLen)(nOutWidth/nCharWidth) : 0; } @@ -3070,7 +3070,7 @@ void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& if ( xDataObj->isDataFlavorSupported( aFlavor ) ) { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; ImplInsertText( aText ); bChanges = sal_True; @@ -3101,7 +3101,7 @@ void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragE for( sal_Int32 i = 0; i < nEle; i++ ) { sal_Int32 nIndex = 0; - rtl::OUString aMimetype = rFlavors[i].MimeType.getToken( 0, ';', nIndex ); + OUString aMimetype = rFlavors[i].MimeType.getToken( 0, ';', nIndex ); if ( aMimetype == "text/plain" ) { mpDDInfo->bIsStringSupported = sal_True; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 3dead80ca9ed..1ee47e1dbf24 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -94,7 +94,7 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, sal_Bool bCurrency = sal_False ) { OUString aStr = rStr; - rtl::OUStringBuffer aStr1, aStr2; + OUStringBuffer aStr1, aStr2; sal_Bool bNegative = sal_False; sal_Int32 nDecPos; @@ -226,7 +226,7 @@ static void ImplUpdateSeparatorString( String& io_rText, const String& rOldDecSep, const String& rNewDecSep, const String& rOldThSep, const String& rNewThSep ) { - rtl::OUStringBuffer aBuf( io_rText.Len() ); + OUStringBuffer aBuf( io_rText.Len() ); xub_StrLen nIndexDec = 0, nIndexTh = 0, nIndex = 0; const sal_Unicode* pBuffer = io_rText.GetBuffer(); @@ -810,7 +810,7 @@ NumericField::NumericField( Window* pParent, const ResId& rResId ) : Show(); } -bool NumericField::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool NumericField::set_property(const OString &rKey, const OString &rValue) { if (rKey == "digits") SetDecimalDigits(rValue.toInt32()); @@ -935,15 +935,15 @@ namespace { Size calcMinimumSize(const SpinField &rSpinField, const NumericFormatter &rFormatter) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; sal_Int32 nTextLen; - nTextLen = rtl::OUString::valueOf(rFormatter.GetMin()).getLength(); + nTextLen = OUString::valueOf(rFormatter.GetMin()).getLength(); string::padToLength(aBuf, nTextLen, '9'); Size aMinTextSize = rSpinField.CalcMinimumSizeForText( rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64())); - nTextLen = rtl::OUString::valueOf(rFormatter.GetMax()).getLength(); + nTextLen = OUString::valueOf(rFormatter.GetMax()).getLength(); string::padToLength(aBuf, nTextLen, '9'); Size aMaxTextSize = rSpinField.CalcMinimumSizeForText( rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64())); @@ -1093,10 +1093,10 @@ static sal_Bool ImplMetricProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, // ----------------------------------------------------------------------- -static rtl::OUString ImplMetricGetUnitText(const rtl::OUString& rStr) +static OUString ImplMetricGetUnitText(const OUString& rStr) { // fetch unit text - rtl::OUStringBuffer aStr; + OUStringBuffer aStr; for (sal_Int32 i = rStr.getLength()-1; i >= 0; --i) { sal_Unicode c = rStr[i]; @@ -1131,7 +1131,7 @@ static const OUString ImplMetricToString( FieldUnit rUnit ) return OUString(); } -static FieldUnit ImplStringToMetric(const rtl::OUString &rMetricString) +static FieldUnit ImplStringToMetric(const OUString &rMetricString) { FieldUnitStringList* pList = ImplGetCleanedFieldUnits(); if( pList ) @@ -1151,9 +1151,9 @@ static FieldUnit ImplStringToMetric(const rtl::OUString &rMetricString) // ----------------------------------------------------------------------- -static FieldUnit ImplMetricGetUnit(const rtl::OUString& rStr) +static FieldUnit ImplMetricGetUnit(const OUString& rStr) { - rtl::OUString aStr = ImplMetricGetUnitText( rStr ); + OUString aStr = ImplMetricGetUnitText( rStr ); return ImplStringToMetric( aStr ); } @@ -1714,11 +1714,11 @@ Size MetricField::CalcMinimumSize() const return calcMinimumSize(*this, *this); } -bool MetricField::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool MetricField::set_property(const OString &rKey, const OString &rValue) { if (rKey == "format") { - maCustomUnitText = rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8); + maCustomUnitText = OStringToOUString(rValue, RTL_TEXTENCODING_UTF8); meUnit = FUNIT_CUSTOM; } else if (rKey == "digits") diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 785358017e41..97ec32d6bb44 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -158,7 +158,7 @@ static int ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask ) try { - rtl::OUString aCharStr(cChar); + OUString aCharStr(cChar); nType = ImplGetCharClass()->getStringType( aCharStr, 0, aCharStr.getLength(), Application::GetSettings().GetLanguageTag().getLocale() ); } @@ -209,7 +209,7 @@ static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask ) (cEditMask == EDITMASK_UPPERALPHANUM) || ( cEditMask == EDITMASK_UPPERALLCHAR ) ) { - cChar = ImplGetCharClass()->toUpper(rtl::OUString(cChar), 0, 1, + cChar = ImplGetCharClass()->toUpper(OUString(cChar), 0, 1, Application::GetSettings().GetLanguageTag().getLocale())[0]; } return cChar; @@ -429,7 +429,7 @@ static void ImplPatternProcessStrictModify( Edit* pEdit, // ----------------------------------------------------------------------- -static xub_StrLen ImplPatternLeftPos(const rtl::OString& rEditMask, xub_StrLen nCursorPos) +static xub_StrLen ImplPatternLeftPos(const OString& rEditMask, xub_StrLen nCursorPos) { // search non-literal predecessor xub_StrLen nNewPos = nCursorPos; @@ -448,7 +448,7 @@ static xub_StrLen ImplPatternLeftPos(const rtl::OString& rEditMask, xub_StrLen n // ----------------------------------------------------------------------- -static xub_StrLen ImplPatternRightPos( const OUString& rStr, const rtl::OString& rEditMask, +static xub_StrLen ImplPatternRightPos( const OUString& rStr, const OString& rEditMask, sal_uInt16 nFormatFlags, sal_Bool bSameMask, sal_Int32 nCursorPos ) { @@ -1304,7 +1304,7 @@ OUString DateFormatter::ImplGetDateAsText( const Date& rDate, } } - return rtl::OUString(aBuf, pBuf-aBuf); + return OUString(aBuf, pBuf-aBuf); } // ----------------------------------------------------------------------- @@ -2236,7 +2236,7 @@ static sal_Bool ImplTimeGetValue( const OUString& rStr, Time& rTime, // Search for separators if (!rLocaleDataWrapper.getTimeSep().isEmpty()) { - rtl::OUStringBuffer aSepStr(",.;:/"); + OUStringBuffer aSepStr(",.;:/"); if ( !bDuration ) aSepStr.append('-'); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 35a47f323e5d..c92685696899 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -215,7 +215,7 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); WinBits nWinStyle = GetStyle(); - rtl::OUString aText( GetText() ); + OUString aText( GetText() ); sal_uInt16 nTextStyle = FixedText::ImplGetTextStyle( nWinStyle ); Point aPos = rPos; @@ -449,7 +449,7 @@ void FixedText::setMinWidthChars(sal_Int32 nWidth) } } -bool FixedText::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool FixedText::set_property(const OString &rKey, const OString &rValue) { if (rKey == "max-width-chars") setMaxWidthChars(rValue.toInt32()); @@ -1213,7 +1213,7 @@ const Image& FixedImage::GetModeImage( ) const return maImage; } -bool FixedImage::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool FixedImage::set_property(const OString &rKey, const OString &rValue) { if (rKey == "pixbuf") { diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 73e5c5d9a774..9ab5da4e8ef3 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2662,7 +2662,7 @@ sal_Bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt ) // ----------------------------------------------------------------------- -void ImplListBox::SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep ) +void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ) { sal_Bool bChanges = GetEntryList()->GetMRUCount() ? sal_True : sal_False; @@ -2695,7 +2695,7 @@ void ImplListBox::SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep // ----------------------------------------------------------------------- -rtl::OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const +OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const { OUStringBuffer aEntries; for ( sal_uInt16 n = 0; n < GetEntryList()->GetMRUCount(); n++ ) @@ -2824,11 +2824,11 @@ void ImplWin::ImplDraw( bool bLayout ) { Rectangle aParentRect( Point( 0, 0 ), pWin->GetSizePixel() ); pWin->DrawNativeControl( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aParentRect, - nState, aControlValue, rtl::OUString() ); + nState, aControlValue, OUString() ); } bNativeOK = DrawNativeControl( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); } if( IsEnabled() ) diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 52f28e8cd470..73d164909495 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -123,7 +123,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue, { XubString aStr = rStr; XubString aStr1; - rtl::OUStringBuffer aStr2; + OUStringBuffer aStr2; sal_uInt16 nDecPos; sal_Bool bNegative = sal_False; diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 89de20bb4bcf..0ee0cfce13a5 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -121,7 +121,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle ) Rectangle aBoundingRgn( aCtrlRegion ); Rectangle aContentRgn( aCtrlRegion ); if( GetNativeControlRegion( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_ENABLED, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { sal_Int32 nHeight = aBoundingRgn.GetHeight(); @@ -630,7 +630,7 @@ void ListBox::Resize() Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() ); if ( GetNativeControlRegion( CTRL_LISTBOX, PART_BUTTON_DOWN, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { long nTop = 0; // Convert back from border space to local coordinates @@ -643,7 +643,7 @@ void ListBox::Resize() // Adjust the size of the edit field if ( GetNativeControlRegion( CTRL_LISTBOX, PART_SUB_EDIT, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { // Convert back from border space to local coordinates aContent.Move( -aPoint.X(), -aPoint.Y() ); @@ -1243,7 +1243,7 @@ Size ListBox::CalcMinimumSize() const Size aTestSize( 100, 20 ); Rectangle aArea( aPoint, aTestSize ); if( const_cast(this)->GetNativeControlRegion( - CTRL_LISTBOX, PART_SUB_EDIT, aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + CTRL_LISTBOX, PART_SUB_EDIT, aArea, 0, aControlValue, OUString(), aBound, aContent) ) { // use the themes drop down size aSz.Width() += aTestSize.Width() - aContent.GetWidth(); @@ -1260,7 +1260,7 @@ Size ListBox::CalcMinimumSize() const Rectangle aRect( Point( 0, 0 ), aSz ); Rectangle aContent, aBound; if( const_cast(this)->GetNativeControlRegion( - CTRL_LISTBOX, PART_ENTIRE_CONTROL, aRect, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + CTRL_LISTBOX, PART_ENTIRE_CONTROL, aRect, 0, aControlValue, OUString(), aBound, aContent) ) { if( aBound.GetHeight() > aSz.Height() ) aSz.Height() = aBound.GetHeight(); @@ -1352,7 +1352,7 @@ Size ListBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const // Width if ( nColumns ) - aSz.Width() = nColumns * GetTextWidth( rtl::OUString('X') ); + aSz.Width() = nColumns * GetTextWidth( OUString('X') ); else aSz.Width() = aMinSz.Width(); @@ -1374,7 +1374,7 @@ Size ListBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const void ListBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const { - long nCharWidth = GetTextWidth( rtl::OUString(static_cast('x')) ); + long nCharWidth = GetTextWidth( OUString(static_cast('x')) ); if ( !IsDropDownBox() ) { Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel(); @@ -1487,7 +1487,7 @@ void ListBox::setMaxWidthChars(sal_Int32 nWidth) } } -bool ListBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool ListBox::set_property(const OString &rKey, const OString &rValue) { if (rKey == "active") SelectEntryPos(rValue.toInt32()); diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index 36d038e101cb..d00944a06fc7 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -125,7 +125,7 @@ namespace vcl if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() ) { m_pData->sCurrentSearchString += c; - OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", rtl::OUStringToOString(m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8).getStr() ); + OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", OUStringToOString(m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8).getStr() ); if ( m_pData->sCurrentSearchString.Len() == 1 ) { // first character in the search -> remmeber diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 8a85bb5c8874..b3bc40906139 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -28,7 +28,6 @@ #include "rtl/string.hxx" #include "tools/rc.h" -using ::rtl::OUString; /* #i77549# @@ -319,9 +318,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) if ( GetStyle() & WB_HORZ ) { if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_LEFT, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn1Region ) && + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn1Region ) && GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_RIGHT, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn2Region ) ) + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn2Region ) ) { maBtn1Rect = aBtn1Region; maBtn2Rect = aBtn2Region; @@ -336,7 +335,7 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) } if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_HORZ_AREA, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aTrackRegion ) ) + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aTrackRegion ) ) maTrackRect = aTrackRegion; else maTrackRect = Rectangle( maBtn1Rect.TopRight(), maBtn2Rect.BottomLeft() ); @@ -360,9 +359,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) else { if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_UP, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn1Region ) && + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn1Region ) && GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_DOWN, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn2Region ) ) + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn2Region ) ) { maBtn1Rect = aBtn1Region; maBtn2Rect = aBtn2Region; @@ -377,7 +376,7 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) } if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_VERT_AREA, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aTrackRegion ) ) + aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aTrackRegion ) ) maTrackRect = aTrackRegion; else maTrackRect = Rectangle( maBtn1Rect.BottomLeft()+Point(0,1), maBtn2Rect.TopRight() ); @@ -548,7 +547,7 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) aCtrlRegion.Union( maPage2Rect ); aCtrlRegion.Union( maThumbRect ); bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, (bHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT), - aCtrlRegion, nState, scrValue, rtl::OUString() ); + aCtrlRegion, nState, scrValue, OUString() ); } else { @@ -578,11 +577,11 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) if ( nDrawFlags & SCRBAR_DRAW_PAGE1 ) bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1, - scrValue, rtl::OUString() ); + scrValue, OUString() ); if ( nDrawFlags & SCRBAR_DRAW_PAGE2 ) bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2, - scrValue, rtl::OUString() ); + scrValue, OUString() ); } if ( (nDrawFlags & SCRBAR_DRAW_BTN1) || (nDrawFlags & SCRBAR_DRAW_BTN2) ) { @@ -620,11 +619,11 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) if ( nDrawFlags & SCRBAR_DRAW_BTN1 ) bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1, - scrValue, rtl::OUString() ); + scrValue, OUString() ); if ( nDrawFlags & SCRBAR_DRAW_BTN2 ) bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2, - scrValue, rtl::OUString() ); + scrValue, OUString() ); } if ( (nDrawFlags & SCRBAR_DRAW_THUMB) && !maThumbRect.IsEmpty() ) { @@ -648,7 +647,7 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) } bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, (bHorz ? PART_THUMB_HORZ : PART_THUMB_VERT), - aCtrlRegion, nState, scrValue, rtl::OUString() ); + aCtrlRegion, nState, scrValue, OUString() ); } } } diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 6bfaa2a9fd91..5d1b7c8ebd47 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -144,7 +144,7 @@ void Slider::ImplUpdateRects( sal_Bool bUpdate ) const Rectangle aControlRegion( Rectangle( Point(0,0), Size( SLIDER_THUMB_SIZE, 10 ) ) ); Rectangle aThumbBounds, aThumbContent; if ( GetNativeControlRegion( CTRL_SLIDER, PART_THUMB_HORZ, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), + aControlRegion, 0, ImplControlValue(), OUString(), aThumbBounds, aThumbContent ) ) { maThumbRect.Left() = mnThumbPixPos - aThumbBounds.GetWidth()/2; @@ -178,7 +178,7 @@ void Slider::ImplUpdateRects( sal_Bool bUpdate ) const Rectangle aControlRegion( Rectangle( Point(0,0), Size( 10, SLIDER_THUMB_SIZE ) ) ); Rectangle aThumbBounds, aThumbContent; if ( GetNativeControlRegion( CTRL_SLIDER, PART_THUMB_VERT, - aControlRegion, 0, ImplControlValue(), rtl::OUString(), + aControlRegion, 0, ImplControlValue(), OUString(), aThumbBounds, aThumbContent ) ) { maThumbRect.Top() = mnThumbPixPos - aThumbBounds.GetHeight()/2; @@ -347,7 +347,7 @@ void Slider::ImplDraw( sal_uInt16 nDrawFlags ) const Rectangle aCtrlRegion( Point(0,0), GetOutputSizePixel() ); bool bNativeOK = DrawNativeControl( CTRL_SLIDER, nPart, - aCtrlRegion, nState, sldValue, rtl::OUString() ); + aCtrlRegion, nState, sldValue, OUString() ); if( bNativeOK ) return; diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 0c58aee8e531..16dea7e8d30c 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -85,7 +85,7 @@ sal_Bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbutt { // only paint the embedded spin buttons, all buttons are painted at once bNativeOK = pWin->DrawNativeControl( CTRL_SPINBOX, PART_ALL_BUTTONS, Rectangle(), CTRL_STATE_ENABLED, - rSpinbuttonValue, rtl::OUString() ); + rSpinbuttonValue, OUString() ); } else { @@ -108,14 +108,14 @@ sal_Bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbutt Rectangle aNatRgn( aPt, aSize ); if( ! ImplGetSVData()->maNWFData.mbCanDrawWidgetAnySize && pBorder->GetNativeControlRegion( CTRL_SPINBOX, PART_ENTIRE_CONTROL, - aNatRgn, 0, rSpinbuttonValue, rtl::OUString(), aBound, aContent) ) + aNatRgn, 0, rSpinbuttonValue, OUString(), aBound, aContent) ) { aSize = aContent.GetSize(); } Rectangle aRgn( aPt, aSize ); bNativeOK = pBorder->DrawNativeControl( CTRL_SPINBOX, PART_ENTIRE_CONTROL, aRgn, CTRL_STATE_ENABLED, - rSpinbuttonValue, rtl::OUString() ); + rSpinbuttonValue, OUString() ); pBorder->SetClipRegion(Region(oldRgn)); } @@ -131,7 +131,7 @@ sal_Bool ImplDrawNativeSpinbuttons( Window *pWin, const SpinbuttonValue& rSpinbu { // only paint the standalone spin buttons, all buttons are painted at once bNativeOK = pWin->DrawNativeControl( CTRL_SPINBUTTONS, PART_ALL_BUTTONS, Rectangle(), CTRL_STATE_ENABLED, - rSpinbuttonValue, rtl::OUString() ); + rSpinbuttonValue, OUString() ); } return bNativeOK; } @@ -709,9 +709,9 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec bNativeRegionOK = pWin->GetNativeControlRegion(CTRL_SPINBOX, PART_BUTTON_UP, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContentUp) && + aArea, 0, aControlValue, OUString(), aBound, aContentUp) && pWin->GetNativeControlRegion(CTRL_SPINBOX, PART_BUTTON_DOWN, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContentDown); + aArea, 0, aControlValue, OUString(), aBound, aContentDown); if( bNativeRegionOK ) { @@ -766,7 +766,7 @@ void SpinField::Resize() // adjust position and size of the edit field if ( GetNativeControlRegion(CTRL_SPINBOX, PART_SUB_EDIT, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { // convert back from border space to local coordinates aPoint = pBorder->ScreenToOutputPixel( OutputToScreenPixel( aPoint ) ); @@ -958,7 +958,7 @@ sal_Bool SpinField::ShowDropDown( sal_Bool ) return sal_False; } -Size SpinField::CalcMinimumSizeForText(const rtl::OUString &rString) const +Size SpinField::CalcMinimumSizeForText(const OUString &rString) const { Size aSz = Edit::CalcMinimumSizeForText(rString); @@ -971,9 +971,9 @@ Size SpinField::CalcMinimumSizeForText(const rtl::OUString &rString) const Rectangle aEntireBound, aEntireContent, aEditBound, aEditContent; if ( GetNativeControlRegion(CTRL_SPINBOX, PART_ENTIRE_CONTROL, - aArea, 0, aControlValue, rtl::OUString(), aEntireBound, aEntireContent) && + aArea, 0, aControlValue, OUString(), aEntireBound, aEntireContent) && GetNativeControlRegion(CTRL_SPINBOX, PART_SUB_EDIT, - aArea, 0, aControlValue, rtl::OUString(), aEditBound, aEditContent) + aArea, 0, aControlValue, OUString(), aEditBound, aEditContent) ) { aSz.Width() += (aEntireContent.GetWidth() - aEditContent.GetWidth()); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 3722f80505a7..fc5a4bf80d2c 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -299,7 +299,7 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth ) Rectangle aBoundingRgn, aContentRgn; const ImplControlValue aControlValue; if(GetNativeControlRegion( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_ENABLED, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { return aContentRgn.GetSize(); @@ -313,7 +313,7 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth ) // shorten Text if needed if ( aSize.Width()+4 >= nMaxWidth ) { - rtl::OUString aAppendStr("..."); + OUString aAppendStr("..."); pItem->maFormatText += aAppendStr; do { @@ -573,9 +573,9 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) if ( pOldPage ) { if ( mbRestoreHelpId ) - pCtrlParent->SetHelpId( rtl::OString() ); + pCtrlParent->SetHelpId( OString() ); if ( mbRestoreUnqId ) - pCtrlParent->SetUniqueId( rtl::OString() ); + pCtrlParent->SetUniqueId( OString() ); pOldPage->DeactivatePage(); } @@ -830,7 +830,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo tiValue.mnAlignment |= TABITEM_LAST_IN_GROUP; bNativeOK = DrawNativeControl( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, aCtrlRegion, nState, - tiValue, rtl::OUString() ); + tiValue, OUString() ); } if( ! bLayout && !bNativeOK ) @@ -1096,7 +1096,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) if( !aClipRgn.IsEmpty() ) bNativeOK = DrawNativeControl( CTRL_TAB_PANE, part, aRect, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); } else { @@ -1360,7 +1360,7 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + OUString aHelpId( OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); if ( !aHelpId.isEmpty() ) { // call Help if existing @@ -2039,7 +2039,7 @@ const XubString& TabControl::GetHelpText( sal_uInt16 nPageId ) const { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 7f5768056119..3197b257467c 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -88,11 +88,11 @@ namespace const Reference< com::sun::star::uno::XComponentContext > aContext( ::comphelper::getProcessComponentContext() ); const Reference< XGraphicProvider > xGraphicProvider( com::sun::star::graphic::GraphicProvider::create(aContext) ); - ::std::vector< ::rtl::OUString > aImageURLs( Throbber::getDefaultImageURLs( i_imageSet ) ); + ::std::vector< OUString > aImageURLs( Throbber::getDefaultImageURLs( i_imageSet ) ); aImages.reserve( aImageURLs.size() ); ::comphelper::NamedValueCollection aMediaProperties; - for ( ::std::vector< ::rtl::OUString >::const_iterator imageURL = aImageURLs.begin(); + for ( ::std::vector< OUString >::const_iterator imageURL = aImageURLs.begin(); imageURL != aImageURLs.end(); ++imageURL ) @@ -220,9 +220,9 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList } //---------------------------------------------------------------------------------------------------------------------- -::std::vector< ::rtl::OUString > Throbber::getDefaultImageURLs( const ImageSet i_imageSet ) +::std::vector< OUString > Throbber::getDefaultImageURLs( const ImageSet i_imageSet ) { - ::std::vector< ::rtl::OUString > aImageURLs; + ::std::vector< OUString > aImageURLs; sal_Char const* const pResolutions[] = { "16", "32", "64" }; size_t const nImageCounts[] = { 6, 12, 12 }; @@ -242,7 +242,7 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList aImageURLs.reserve( nImageCounts[index] ); for ( size_t i=0; iSetFont( maFont); Size aTextSize; - aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString(" ")); + aTextSize.Width() = mpRefDev->GetTextWidth(OUString(" ")); aTextSize.Height() = mpRefDev->GetTextHeight(); if ( !aTextSize.Width() ) - aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString("XXXX")); + aTextSize.Width() = mpRefDev->GetTextWidth(OUString("XXXX")); mnDefTab = (sal_uInt16)aTextSize.Width(); if ( !mnDefTab ) @@ -658,7 +658,7 @@ sal_Bool TextEngine::IsInputSequenceCheckingRequired( sal_Unicode c, const TextS aCTLOptions.IsCTLFontEnabled() && aCTLOptions.IsCTLSequenceChecking() && nFirstPos != 0 && /* first char needs not to be checked */ - xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( rtl::OUString( c ), 0 ); + xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( OUString( c ), 0 ); return bIsSequenceChecking; } @@ -711,8 +711,8 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, // the text that needs to be checked is only the one // before the current cursor position - rtl::OUString aOldText( mpDoc->GetText( aPaM.GetPara() ).Copy(0, nTmpPos) ); - rtl::OUString aNewText( aOldText ); + OUString aOldText( mpDoc->GetText( aPaM.GetPara() ).Copy(0, nTmpPos) ); + OUString aNewText( aOldText ); if (aCTLOptions.IsCTLSequenceCheckingTypeAndReplace()) { xISC->correctInputSequence( aNewText, nTmpPos - 1, c, nCheckMode ); @@ -752,7 +752,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, if ( IsUndoEnabled() && !IsInUndo() ) { - TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, rtl::OUString(c) ); + TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) ); sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False; InsertUndo( pNewUndo, bTryMerge ); } @@ -2556,14 +2556,14 @@ sal_Bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel ) if ( aSel.HasRange() ) aSel = ImpDeleteText( aSel ); - rtl::OString aLine; + OString aLine; sal_Bool bDone = rInput.ReadLine( aLine ); - rtl::OUString aTmpStr(rtl::OStringToOUString(aLine, rInput.GetStreamCharSet())); + OUString aTmpStr(OStringToOUString(aLine, rInput.GetStreamCharSet())); while ( bDone ) { aSel = ImpInsertText( aSel, aTmpStr ); bDone = rInput.ReadLine( aLine ); - aTmpStr = rtl::OStringToOUString(aLine, rInput.GetStreamCharSet()); + aTmpStr = OStringToOUString(aLine, rInput.GetStreamCharSet()); if ( bDone ) aSel = ImpInsertParaBreak( aSel.GetEnd() ); } @@ -2657,7 +2657,7 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo aText.AppendAscii( "

      " ); } - rOutput.WriteLine(rtl::OUStringToOString(aText, + rOutput.WriteLine(OUStringToOString(aText, rOutput.GetStreamCharSet())); } diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index 153e3db8c323..17a29181134f 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -38,7 +38,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; @@ -56,7 +56,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; @@ -74,7 +74,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; @@ -93,7 +93,7 @@ public: virtual sal_Bool Merge( SfxUndoAction *pNextAction ); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; @@ -110,7 +110,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; @@ -127,7 +127,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual rtl::OUString GetComment () const; + virtual OUString GetComment () const; }; #endif // _TEXTUND2_HXX diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx index 2b38fc220090..3cbb85d6999c 100644 --- a/vcl/source/edit/textundo.cxx +++ b/vcl/source/edit/textundo.cxx @@ -41,7 +41,7 @@ namespace { // Shorten() -- inserts ellipsis (...) in the middle of a long text -void Shorten (rtl::OUString& rString) +void Shorten (OUString& rString) { unsigned nLen = rString.getLength(); if (nLen > 48) @@ -149,9 +149,9 @@ TextUndo::~TextUndo() { } -rtl::OUString TextUndo::GetComment() const +OUString TextUndo::GetComment() const { - return rtl::OUString(); + return OUString(); } void TextUndo::SetSelection( const TextSelection& rSel ) @@ -214,7 +214,7 @@ void TextUndoDelPara::Redo() SetSelection( aPaM ); } -rtl::OUString TextUndoDelPara::GetComment () const +OUString TextUndoDelPara::GetComment () const { return ResId(STR_TEXTUNDO_DELPARA, *ImplGetResMgr()); } @@ -248,7 +248,7 @@ void TextUndoConnectParas::Redo() SetSelection( aPaM ); } -rtl::OUString TextUndoConnectParas::GetComment () const +OUString TextUndoConnectParas::GetComment () const { return ResId(STR_TEXTUNDO_CONNECTPARAS, *ImplGetResMgr()); } @@ -282,7 +282,7 @@ void TextUndoSplitPara::Redo() SetSelection( aPaM ); } -rtl::OUString TextUndoSplitPara::GetComment () const +OUString TextUndoSplitPara::GetComment () const { return ResId(STR_TEXTUNDO_SPLITPARA, *ImplGetResMgr()); } @@ -334,12 +334,12 @@ sal_Bool TextUndoInsertChars::Merge( SfxUndoAction* pNextAction ) return sal_False; } -rtl::OUString TextUndoInsertChars::GetComment () const +OUString TextUndoInsertChars::GetComment () const { // multiple lines? - rtl::OUString sText(maText); + OUString sText(maText); Shorten(sText); - return rtl::OUString(ResId(STR_TEXTUNDO_INSERTCHARS, *ImplGetResMgr())).replaceAll("$1", sText); + return OUString(ResId(STR_TEXTUNDO_INSERTCHARS, *ImplGetResMgr())).replaceAll("$1", sText); } @@ -371,12 +371,12 @@ void TextUndoRemoveChars::Redo() SetSelection( aPaM ); } -rtl::OUString TextUndoRemoveChars::GetComment () const +OUString TextUndoRemoveChars::GetComment () const { // multiple lines? - rtl::OUString sText(maText); + OUString sText(maText); Shorten(sText); - return rtl::OUString(ResId(STR_TEXTUNDO_REMOVECHARS, *ImplGetResMgr())).replaceAll("$1", sText); + return OUString(ResId(STR_TEXTUNDO_REMOVECHARS, *ImplGetResMgr())).replaceAll("$1", sText); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx index 1474376f4464..a461bd78e7b0 100644 --- a/vcl/source/edit/textundo.hxx +++ b/vcl/source/edit/textundo.hxx @@ -73,7 +73,7 @@ public: virtual void Undo() = 0; virtual void Redo() = 0; - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; #endif // _TEXTUNDO_HXX diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index ff061bbd9b69..05ea5f2e16dc 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -107,7 +107,7 @@ uno::Any TETextDataObject::getTransferData( const datatransfer::DataFlavor& rFla sal_uLong nT = SotExchange::GetFormat( rFlavor ); if ( nT == SOT_FORMAT_STRING ) { - aAny <<= (::rtl::OUString)GetText(); + aAny <<= (OUString)GetText(); } else if ( nT == SOT_FORMATSTR_ID_HTML ) { @@ -706,7 +706,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) { if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsShift() && !rKeyEvent.GetKeyCode().IsMod1() && !rKeyEvent.GetKeyCode().IsMod2() && - ImplCheckTextLen( rtl::OUString('x') ) ) + ImplCheckTextLen( OUString('x') ) ) { aCurSel = mpImpl->mpTextEngine->ImpInsertText( aCurSel, '\t', !IsInsertMode() ); bModified = sal_True; @@ -720,7 +720,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) // Shift-RETURN darf nicht geschluckt werden, weil dann keine // mehrzeilige Eingabe in Dialogen/Property-Editor moeglich. if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsMod1() && - !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( rtl::OUString('x') ) ) + !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( OUString('x') ) ) { mpImpl->mpTextEngine->UndoActionStart(); aCurSel = mpImpl->mpTextEngine->ImpInsertParaBreak( aCurSel ); @@ -755,7 +755,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) if ( TextEngine::IsSimpleCharInput( rKeyEvent ) ) { sal_Unicode nCharCode = rKeyEvent.GetCharCode(); - if ( !mpImpl->mbReadOnly && ImplCheckTextLen( rtl::OUString(nCharCode) ) ) // sonst trotzdem das Zeichen schlucken... + if ( !mpImpl->mbReadOnly && ImplCheckTextLen( OUString(nCharCode) ) ) // sonst trotzdem das Zeichen schlucken... { aCurSel = mpImpl->mpTextEngine->ImpInsertText( nCharCode, aCurSel, !IsInsertMode(), sal_True ); bModified = sal_True; @@ -1176,7 +1176,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC try { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; bool bWasTruncated = false; if( mpImpl->mpTextEngine->GetMaxTextLen() != 0 ) @@ -1342,7 +1342,7 @@ void TextView::InsertText( const XubString& rStr, sal_Bool bSelect ) InsertNewText( rStr, bSelect ); } -void TextView::InsertNewText( const rtl::OUString& rStr, sal_Bool bSelect ) +void TextView::InsertNewText( const OUString& rStr, sal_Bool bSelect ) { // HideSelection(); mpImpl->mpTextEngine->UndoActionStart(); @@ -1957,7 +1957,7 @@ sal_Bool TextView::Read( SvStream& rInput ) return bDone; } -bool TextView::ImplTruncateNewText( rtl::OUString& rNewText ) const +bool TextView::ImplTruncateNewText( OUString& rNewText ) const { bool bTruncated = false; @@ -2095,7 +2095,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv if ( xDataObj->isDataFlavorSupported( aFlavor ) ) { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aOUString; + OUString aOUString; aData >>= aOUString; aText = convertLineEnd(aOUString, LINEEND_LF); } diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index e7bc99cac493..c13fc5529e05 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -295,7 +295,7 @@ void ImpVclMEdit::ImpInitScrollBars() { ImpSetScrollBarRanges(); Size aCharBox; - aCharBox.Width() = mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) ); + aCharBox.Width() = mpTextWindow->GetTextWidth( OUString(sampleChar) ); aCharBox.Height() = mpTextWindow->GetTextHeight(); Size aOutSz = mpTextWindow->GetOutputSizePixel(); if ( mpHScrollBar ) @@ -653,7 +653,7 @@ Size ImpVclMEdit::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const Size aSz; Size aCharSz; - aCharSz.Width() = mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) ); + aCharSz.Width() = mpTextWindow->GetTextWidth( OUString(sampleChar) ); aCharSz.Height() = mpTextWindow->GetTextHeight(); if ( nLines ) @@ -678,7 +678,7 @@ void ImpVclMEdit::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLi { static const sal_Unicode sampleChar = { 'x' }; Size aOutSz = mpTextWindow->GetOutputSizePixel(); - Size aCharSz( mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) ), mpTextWindow->GetTextHeight() ); + Size aCharSz( mpTextWindow->GetTextWidth( OUString(sampleChar) ), mpTextWindow->GetTextHeight() ); rnCols = (sal_uInt16) (aOutSz.Width()/aCharSz.Width()); rnLines = (sal_uInt16) (aOutSz.Height()/aCharSz.Height()); } @@ -779,7 +779,7 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent ) { // Damit die Selektion erhalten bleibt mbActivePopup = sal_True; - rtl::OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() ); + OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() ); if (!aChars.isEmpty()) { mpExtTextView->InsertText( aChars ); @@ -880,7 +880,7 @@ void TextWindow::Command( const CommandEvent& rCEvt ) break; case SV_MENU_EDIT_INSERTSYMBOL: { - rtl::OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() ); + OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() ); if (!aChars.isEmpty()) { mpExtTextView->InsertText( aChars ); @@ -1370,7 +1370,7 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& } } - rtl::OUString aText = GetText(); + OUString aText = GetText(); Size aTextSz( pDev->GetTextWidth( aText ), pDev->GetTextHeight() ); sal_uLong nLines = (sal_uLong) (aSize.Height() / aTextSz.Height()); if ( !nLines ) @@ -1565,7 +1565,7 @@ void VclMultiLineEdit::EnableCursor( sal_Bool bEnable ) GetTextView()->EnableCursor( bEnable ); } -bool VclMultiLineEdit::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclMultiLineEdit::set_property(const OString &rKey, const OString &rValue) { if (rKey == "cursor-visible") EnableCursor(toBool(rValue)); diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx index 4fe25637a86e..e9b4e73a27b4 100644 --- a/vcl/source/edit/xtextedt.cxx +++ b/vcl/source/edit/xtextedt.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; // ------------------------------------------------------------------------- // class ExtTextEngine // ------------------------------------------------------------------------- -ExtTextEngine::ExtTextEngine() : maGroupChars(rtl::OUString("(){}[]")) +ExtTextEngine::ExtTextEngine() : maGroupChars(OUString("(){}[]")) { } diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index b0a8bcfa5ba9..e354457bf676 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -87,7 +87,7 @@ sal_Bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUSt if ( sFilterName.EqualsIgnoreCaseAscii( *pPtr ) ) bIsPixelFormat = sal_True; } - rtl::OUString sTemp(SVLIBRARY("?")); + OUString sTemp(SVLIBRARY("?")); sal_Int32 nIndex = sTemp.indexOf(static_cast('?')); sFilterName = sTemp.replaceAt(nIndex, 1, sFilterName); } @@ -194,7 +194,7 @@ void FilterConfigCache::ImplInit() else if (lFlags[0].equalsIgnoreAsciiCase("export")) aEntry.nFlags = 2; - ::rtl::OUString sFormatName; + OUString sFormatName; xFilterSet->getPropertyValue(SFORMATNAME) >>= sFormatName; aEntry.CreateFilterName( sFormatName ); @@ -286,7 +286,7 @@ void FilterConfigCache::ImplInitSmart() aEntry.sType = sExtension; aEntry.sUIName = sExtension; - rtl::OString sFlags( *pPtr++ ); + OString sFlags( *pPtr++ ); aEntry.nFlags = sFlags.toInt32(); OUString sUserData( OUString::createFromAscii( *pPtr ) ); @@ -427,7 +427,7 @@ String FilterConfigCache::GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntr { String aWildcard( GetImportFormatExtension( nFormat, nEntry ) ); if ( aWildcard.Len() ) - aWildcard.Insert( rtl::OUString("*."), 0 ); + aWildcard.Insert( OUString("*."), 0 ); return aWildcard; } @@ -541,7 +541,7 @@ String FilterConfigCache::GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntr { String aWildcard( GetExportFormatExtension( nFormat, nEntry ) ); if ( aWildcard.Len() ) - aWildcard.Insert( rtl::OUString("*."), 0 ); + aWildcard.Insert( OUString("*."), 0 ); return aWildcard; } diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 6423a90073e0..ceafbdec57b9 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -29,7 +29,6 @@ #include #include -using ::rtl::OUString; using namespace ::utl ; // getProcessServiceFactory using namespace ::com::sun::star::lang ; // XMultiServiceFactory using namespace ::com::sun::star::beans ; // PropertyValue @@ -40,7 +39,7 @@ using namespace ::com::sun::star::container ; // using namespace ::com::sun::star::configuration; // using namespace ::com::sun::star::task ; // XStatusIndicator -static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, const rtl::OUString& rTree ) +static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, const OUString& rTree ) { sal_Bool bAvailable = !rTree.isEmpty(); if ( bAvailable ) @@ -89,7 +88,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv bAvailable = sal_False; else { - rtl::OUString aNode( getToken(rTree, i, '/') ); + OUString aNode( getToken(rTree, i, '/') ); if ( !xHierarchicalNameAccess->hasByHierarchicalName( aNode ) ) bAvailable = sal_False; else @@ -420,7 +419,7 @@ Sequence< PropertyValue > FilterConfigItem::GetFilterData() const Reference< XStatusIndicator > FilterConfigItem::GetStatusIndicator() const { Reference< XStatusIndicator > xStatusIndicator; - const rtl::OUString sStatusIndicator( "StatusIndicator" ); + const OUString sStatusIndicator( "StatusIndicator" ); sal_Int32 i, nCount = aFilterData.getLength(); for ( i = 0; i < nCount; i++ ) diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index f031b550c159..ecfd46976800 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -335,7 +335,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio } rStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); if (bOK && !rStream.GetError()) { - rFormatExtension = rtl::OUString("MET"); + rFormatExtension = OUString("MET"); return sal_True; } } @@ -369,7 +369,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio sFirstBytes[14+nOffs] == 0x28 || sFirstBytes[14+nOffs] == 0x0c ) { - rFormatExtension = rtl::OUString("BMP"); + rFormatExtension = OUString("BMP"); return sal_True; } } @@ -385,13 +385,13 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio if ( nFirstLong==0xd7cdc69a || nFirstLong==0x01000900 ) { - rFormatExtension = rtl::OUString("WMF"); + rFormatExtension = OUString("WMF"); return sal_True; } else if( nFirstLong == 0x01000000 && sFirstBytes[ 40 ] == 0x20 && sFirstBytes[ 41 ] == 0x45 && sFirstBytes[ 42 ] == 0x4d && sFirstBytes[ 43 ] == 0x46 ) { - rFormatExtension = rtl::OUString("EMF"); + rFormatExtension = OUString("EMF"); return sal_True; } } @@ -406,7 +406,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio sal_uInt8 nEncoding=sFirstBytes[2]; if( ( nVersion==0 || nVersion==2 || nVersion==3 || nVersion==5 ) && nEncoding<=1 ) { - rFormatExtension = rtl::OUString("PCX"); + rFormatExtension = OUString("PCX"); return sal_True; } } @@ -418,7 +418,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if ( nFirstLong==0x49492a00 || nFirstLong==0x4d4d002a ) { - rFormatExtension = rtl::OUString("TIF"); + rFormatExtension = OUString("TIF"); return sal_True; } } @@ -429,7 +429,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if ( nFirstLong==0x47494638 && (sFirstBytes[4]==0x37 || sFirstBytes[4]==0x39) && sFirstBytes[5]==0x61 ) { - rFormatExtension = rtl::OUString("GIF"); + rFormatExtension = OUString("GIF"); return sal_True; } } @@ -440,7 +440,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if (nFirstLong==0x89504e47 && nSecondLong==0x0d0a1a0a) { - rFormatExtension = rtl::OUString("PNG"); + rFormatExtension = OUString("PNG"); return sal_True; } } @@ -452,7 +452,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio if ( ( nFirstLong==0xffd8ffe0 && sFirstBytes[6]==0x4a && sFirstBytes[7]==0x46 && sFirstBytes[8]==0x49 && sFirstBytes[9]==0x46 ) || ( nFirstLong==0xffd8fffe ) || ( 0xffd8ff00 == ( nFirstLong & 0xffffff00 ) ) ) { - rFormatExtension = rtl::OUString("JPG"); + rFormatExtension = OUString("JPG"); return sal_True; } } @@ -463,13 +463,13 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if( nFirstLong==0x53564744 && sFirstBytes[4]==0x49 ) { - rFormatExtension = rtl::OUString("SVM"); + rFormatExtension = OUString("SVM"); return sal_True; } else if( sFirstBytes[0]==0x56 && sFirstBytes[1]==0x43 && sFirstBytes[2]==0x4C && sFirstBytes[3]==0x4D && sFirstBytes[4]==0x54 && sFirstBytes[5]==0x46 ) { - rFormatExtension = rtl::OUString("SVM"); + rFormatExtension = OUString("SVM"); return sal_True; } } @@ -486,7 +486,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio if( strncmp( sBuf, "PCD_IPI", 7 ) == 0 ) { - rFormatExtension = rtl::OUString("PCD"); + rFormatExtension = OUString("PCD"); return sal_True; } } @@ -498,7 +498,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested = sal_True; if ( ( nFirstLong == 0x38425053 ) && ( (nSecondLong >> 16 ) == 1 ) ) { - rFormatExtension = rtl::OUString("PSD"); + rFormatExtension = OUString("PSD"); return sal_True; } } @@ -510,7 +510,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio if ( ( nFirstLong == 0xC5D0D3C6 ) || ( ImplSearchEntry( sFirstBytes, (sal_uInt8*)"%!PS-Adobe", 10, 10 ) && ImplSearchEntry( &sFirstBytes[15], (sal_uInt8*)"EPS", 3, 3 ) ) ) { - rFormatExtension = rtl::OUString("EPS"); + rFormatExtension = OUString("EPS"); return sal_True; } } @@ -521,7 +521,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio //Binary DXF File Format if( strncmp( (const char*) sFirstBytes, "AutoCAD Binary DXF", 18 ) == 0 ) { - rFormatExtension = rtl::OUString("DXF"); + rFormatExtension = OUString("DXF"); return sal_True; } @@ -543,7 +543,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio if (i+7<256 && (strncmp((const char*)(sFirstBytes+i),"SECTION",7)==0)) { - rFormatExtension = rtl::OUString("DXF"); + rFormatExtension = OUString("DXF"); return sal_True; } } @@ -556,7 +556,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested = sal_True; if (isPCT(rStream, nStreamPos, nStreamLen)) { - rFormatExtension = rtl::OUString("PCT"); + rFormatExtension = OUString("PCT"); return sal_True; } } @@ -574,17 +574,17 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio { case '1' : case '4' : - rFormatExtension = rtl::OUString("PBM"); + rFormatExtension = OUString("PBM"); return sal_True; case '2' : case '5' : - rFormatExtension = rtl::OUString("PGM"); + rFormatExtension = OUString("PGM"); return sal_True; case '3' : case '6' : - rFormatExtension = rtl::OUString("PPM"); + rFormatExtension = OUString("PPM"); return sal_True; } } @@ -596,7 +596,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if( nFirstLong == 0x59a66a95 ) { - rFormatExtension = rtl::OUString("RAS"); + rFormatExtension = OUString("RAS"); return sal_True; } } @@ -607,7 +607,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested = sal_True; if( ImplSearchEntry( sFirstBytes, (sal_uInt8*)"/* XPM */", 256, 9 ) ) { - rFormatExtension = rtl::OUString("XPM"); + rFormatExtension = OUString("XPM"); return sal_True; } } @@ -631,7 +631,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio { if( ImplSearchEntry( pPtr, (sal_uInt8*)"_width", pBuf + nSize - pPtr, 6 ) ) { - rFormatExtension = rtl::OUString("XBM"); + rFormatExtension = OUString("XBM"); delete[] pBuf; return sal_True; } @@ -763,7 +763,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio bSomethingTested=sal_True; if( sFirstBytes[ 0 ] == 'J' && sFirstBytes[ 1 ] == 'J' ) { - rFormatExtension = rtl::OUString("SGF"); + rFormatExtension = OUString("SGF"); return sal_True; } } @@ -925,14 +925,14 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r static String ImpCreateFullFilterPath( const String& rPath, const String& rFilterName ) { - ::rtl::OUString aPathURL; + OUString aPathURL; ::osl::FileBase::getFileURLFromSystemPath( rPath, aPathURL ); - aPathURL += rtl::OUString( '/' ); + aPathURL += OUString( '/' ); - ::rtl::OUString aSystemPath; + OUString aSystemPath; ::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath ); - aSystemPath += ::rtl::OUString( rFilterName ); + aSystemPath += OUString( rFilterName ); return String( aSystemPath ); } @@ -990,7 +990,7 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction() if( !mpfnImport ) { #ifndef DISABLE_DYNLOADING - mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(rtl::OUString(IMPORT_FUNCTION_NAME)); + mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(OUString(IMPORT_FUNCTION_NAME)); #else if( maFiltername.EqualsAscii( "icd" ) ) mpfnImport = icdGraphicImport; @@ -1136,7 +1136,7 @@ void GraphicFilter::ImplInit() if( bUseConfig ) { - rtl::OUString url("$BRAND_BASE_DIR/program"); + OUString url("$BRAND_BASE_DIR/program"); rtl::Bootstrap::expandMacros(url); //TODO: detect failure utl::LocalFileHelper::ConvertURLToPhysicalName(url, aFilterPath); } @@ -2108,7 +2108,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& String aPhysicalName( ImpCreateFullFilterPath( getToken(aFilterPath, i, ';'), aFilterName ) ); osl::Module aLibrary( aPhysicalName ); - PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(rtl::OUString(EXPORT_FUNCTION_NAME)); + PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(OUString(EXPORT_FUNCTION_NAME)); // Dialog in DLL ausfuehren #else PFilterCall pFunc = NULL; @@ -2178,7 +2178,7 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData ) if( pData ) { sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW; - rtl::OString aShortName; + OString aShortName; switch( pData->mnFormat ) { case( CVT_BMP ): aShortName = BMP_SHORTNAME; break; @@ -2199,14 +2199,14 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData ) if( GRAPHIC_NONE == pData->maGraphic.GetType() || pData->maGraphic.GetContext() ) // Import { // Import - nFormat = GetImportFormatNumberForShortName( rtl::OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) ); + nFormat = GetImportFormatNumberForShortName( OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) ); nRet = ImportGraphic( pData->maGraphic, String(), pData->mrStm, nFormat ) == 0; } #ifndef DISABLE_EXPORT else if( !aShortName.isEmpty() ) { // Export - nFormat = GetExportFormatNumberForShortName( rtl::OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) ); + nFormat = GetExportFormatNumberForShortName( OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) ); nRet = ExportGraphic( pData->maGraphic, String(), pData->mrStm, nFormat ) == 0; } #endif diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 22bb1891bef4..24a182dd2435 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -1128,7 +1128,7 @@ String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat ) case( GFF_SVG ) : pKeyName = "svg"; break; } - return rtl::OUString::createFromAscii(pKeyName); + return OUString::createFromAscii(pKeyName); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index fd231ff88fbb..baba25d5facd 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -45,7 +45,7 @@ GIFReader::GIFReader( SvStream& rStm ) : bGCTransparent ( sal_False ), bImGraphicReady ( sal_False ) { - maUpperName = rtl::OUString("SVIGIF"); + maUpperName = OUString("SVIGIF"); pSrcBuf = new sal_uInt8[ 256 ]; ClearImageExtensions(); } @@ -249,8 +249,8 @@ sal_Bool GIFReader::ReadExtension() // Appl.-Extension hat Laenge 11 if ( cSize == 0x0b ) { - rtl::OString aAppId = read_uInt8s_ToOString(rIStm, 8); - rtl::OString aAppCode = read_uInt8s_ToOString(rIStm, 3); + OString aAppId = read_uInt8s_ToOString(rIStm, 8); + OString aAppCode = read_uInt8s_ToOString(rIStm, 3); rIStm >> cSize; // NetScape-Extension diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index c3f83dfd79f9..fc725f00b096 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -36,7 +36,7 @@ XBMReader::XBMReader( SvStream& rStm ) : bStatus ( sal_True ) { pHexTable = new short[ 256 ]; - maUpperName = rtl::OUString("SVIXBM"); + maUpperName = OUString("SVIXBM"); InitTable(); } @@ -90,10 +90,10 @@ void XBMReader::InitTable() // ------------------------------------------------------------------------ -rtl::OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, +OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, const char* pTok2, const char* pTok3 ) { - rtl::OString aRet; + OString aRet; sal_Int32 nPos1, nPos2, nPos3; bStatus = sal_False; @@ -186,9 +186,9 @@ long XBMReader::ParseDefine( const sal_Char* pDefine ) // ------------------------------------------------------------------------ -sal_Bool XBMReader::ParseData( SvStream* pInStm, const rtl::OString& aLastLine, XBMFormat eFormat ) +sal_Bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat ) { - rtl::OString aLine; + OString aLine; long nRow = 0; long nCol = 0; long nBits = ( eFormat == XBM10 ) ? 16 : 8; @@ -218,7 +218,7 @@ sal_Bool XBMReader::ParseData( SvStream* pInStm, const rtl::OString& aLastLine, for( sal_Int32 i = 0; ( i < nCount ) && ( nRow < nHeight ); ++i ) { - const rtl::OString aToken(comphelper::string::getToken(aLine,i, ',')); + const OString aToken(comphelper::string::getToken(aLine,i, ',')); const sal_Int32 nLen = aToken.getLength(); sal_Bool bProcessed = sal_False; @@ -274,7 +274,7 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic ) { rIStm.Seek( nLastPos ); bStatus = sal_False; - rtl::OString aLine = FindTokenLine( &rIStm, "#define", "_width" ); + OString aLine = FindTokenLine( &rIStm, "#define", "_width" ); if ( bStatus ) { diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx index 387430887660..4b5b60124d19 100644 --- a/vcl/source/filter/ixbm/xbmread.hxx +++ b/vcl/source/filter/ixbm/xbmread.hxx @@ -52,10 +52,10 @@ class XBMReader : public GraphicReader sal_Bool bStatus; void InitTable(); - rtl::OString FindTokenLine( SvStream* pInStm, const char* pTok1, + OString FindTokenLine( SvStream* pInStm, const char* pTok1, const char* pTok2 = NULL, const char* pTok3 = NULL ); long ParseDefine( const sal_Char* pDefine ); - sal_Bool ParseData( SvStream* pInStm, const rtl::OString& aLastLine, XBMFormat eFormat ); + sal_Bool ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat ); public: diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index 6977ed2ca197..947e53d67ab8 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -941,7 +941,7 @@ sal_Bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath sal_Bool bRdFlag=sal_False; // Grafikentry gelesen ? sal_Bool bRet=sal_False; // Returncode - aIniPath.Append(rtl::OUString("sgf.ini")); + aIniPath.Append(OUString("sgf.ini")); pSgfFonts = new SgfFontLst; diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 0d08ba310ef4..36564cc4fab3 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -327,7 +327,7 @@ public: String SVFName; // z.B. "Times New Roman" = 15 Chars sal_uInt16 SVWidth; // Durchschnittliche Zeichenbreite in % SgfFontOne(); - void ReadOne(const rtl::OString& rID, rtl::OString& rDsc); + void ReadOne(const OString& rID, OString& rDsc); }; class SgfFontLst { diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index b011da279064..e4a5f4429c59 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -545,32 +545,32 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, sal_Bool Kapt, s case 92500: case 92501: case 92504: case 92505: { #if defined(WNT) - FNam=rtl::OUString("Times New Roman"); // CG Times ist unter Windows Times New Roman + FNam=OUString("Times New Roman"); // CG Times ist unter Windows Times New Roman #else - FNam=rtl::OUString("Times"); // ansonsten ist das einfach Times + FNam=OUString("Times"); // ansonsten ist das einfach Times #endif StdBrei=40; aFont.SetFamily(FAMILY_ROMAN); } break; case 94021: case 94022: case 94023: case 94024: { #if defined(WNT) - FNam=rtl::OUString("Arial"); // Univers ist unter Windows Arial + FNam=OUString("Arial"); // Univers ist unter Windows Arial #else - FNam=rtl::OUString("Helvetica"); // und ansonsten Helvetica + FNam=OUString("Helvetica"); // und ansonsten Helvetica #endif aFont.SetFamily(FAMILY_SWISS); StdBrei=47; } break; case 93950: case 93951: case 93952: case 93953: { #if defined(WNT) - FNam=rtl::OUString("Courier New"); // Der Vector-Courierfont unter Windows heisst Courier New + FNam=OUString("Courier New"); // Der Vector-Courierfont unter Windows heisst Courier New #else - FNam=rtl::OUString("Courier"); // ansonsten ist und bleibt Courier immer Courier + FNam=OUString("Courier"); // ansonsten ist und bleibt Courier immer Courier #endif aFont.SetFamily(FAMILY_ROMAN); aFont.SetPitch(PITCH_FIXED); } break; - default: FNam = rtl::OUString("Helvetica"); + default: FNam = OUString("Helvetica"); } aFont.SetName(FNam); //aFont.SetCharSet(CHARSET_SYSTEM); @@ -666,7 +666,7 @@ sal_uInt16 GetCharWidth(OutputDevice& rOut, UCHAR c) if (c==' ') { - ChrWidth=(sal_uInt16)rOut.GetTextWidth( rtl::OUString('A') ); + ChrWidth=(sal_uInt16)rOut.GetTextWidth( OUString('A') ); if (rOut.GetFont().GetPitch()!=PITCH_FIXED) { ChrWidth=MulDiv(ChrWidth,DefaultSpace,100); } @@ -679,11 +679,11 @@ sal_uInt16 GetCharWidth(OutputDevice& rOut, UCHAR c) BOOST_STATIC_ASSERT(sizeof(UCHAR) == 1); if (c>=MinChar /*&& c<=MaxChar*/) { - ChrWidth=(sal_uInt16)rOut.GetTextWidth(rtl::OUString(reinterpret_cast(&c), 1, RTL_TEXTENCODING_IBM_437)); + ChrWidth=(sal_uInt16)rOut.GetTextWidth(OUString(reinterpret_cast(&c), 1, RTL_TEXTENCODING_IBM_437)); } else { - ChrWidth=(sal_uInt16)rOut.GetTextWidth(rtl::OUString(static_cast('A'))); + ChrWidth=(sal_uInt16)rOut.GetTextWidth(OUString(static_cast('A'))); } } return ChrWidth; @@ -951,7 +951,7 @@ void DrawChar(OutputDevice& rOut, UCHAR c, ObjTextType T, PointType Pos, sal_uIn { SetTextContext(rOut,T,UpcasePossible(c),DrehWink,FitXMul,FitXDiv,FitYMul,FitYDiv); if ((T.Schnitt & TextKaptBit)!=0 && UpcasePossible(c)) c=Upcase(c); - rtl::OUString s(reinterpret_cast(&c), 1, + OUString s(reinterpret_cast(&c), 1, RTL_TEXTENCODING_IBM_437); rOut.DrawText( Point( Pos.x, Pos.y ), s ); } @@ -1130,7 +1130,7 @@ SgfFontOne::SgfFontOne() SVWidth=40; } -void SgfFontOne::ReadOne( const rtl::OString& rID, rtl::OString& Dsc ) +void SgfFontOne::ReadOne( const OString& rID, OString& Dsc ) { if ( Dsc.getLength() < 4 || ( Dsc[0] != '(' ) ) return; @@ -1148,14 +1148,14 @@ void SgfFontOne::ReadOne( const rtl::OString& rID, rtl::OString& Dsc ) i--; j++; } - SVFName = rtl::OStringToOUString(Dsc.copy(i+1,j), RTL_TEXTENCODING_IBM_437); // SV-Fontname rausholen - Dsc = rtl::OStringBuffer(Dsc).remove(i,j).makeStringAndClear(); + SVFName = OStringToOUString(Dsc.copy(i+1,j), RTL_TEXTENCODING_IBM_437); // SV-Fontname rausholen + Dsc = OStringBuffer(Dsc).remove(i,j).makeStringAndClear(); IFID = (sal_uInt32)rID.toInt32(); sal_Int32 nTokenCount = comphelper::string::getTokenCount(Dsc, ' '); for (sal_Int32 nIdx = 0; nIdx < nTokenCount; ++nIdx) { - rtl::OString s(Dsc.getToken(nIdx, ' ')); + OString s(Dsc.getToken(nIdx, ' ')); if (!s.isEmpty()) { s = s.toAsciiUpperCase(); @@ -1227,8 +1227,8 @@ void SgfFontLst::ReadList() aCfg.SetGroup("SGV Fonts fuer StarView"); sal_uInt16 Anz=aCfg.GetKeyCount(); sal_uInt16 i; - rtl::OString FID; - rtl::OString Dsc; + OString FID; + OString Dsc; for (i=0;i 1 ) { - nNormWidth = pDX[ nLen - 2 ] + maVDev.GetTextWidth( rtl::OUString(rText.GetChar( nLen - 1 )) ); + nNormWidth = pDX[ nLen - 2 ] + maVDev.GetTextWidth( OUString(rText.GetChar( nLen - 1 )) ); if( nWidth && nNormWidth && ( nWidth != nNormWidth ) ) { @@ -1507,7 +1507,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) break; default: - OSL_FAIL(rtl::OStringBuffer( + OSL_FAIL(OStringBuffer( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ). append(static_cast(nType)).getStr()); break; diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index ec9a1b10e031..c19e48efd95d 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -245,7 +245,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC) // debug code - write the stream to debug file /tmp/emf-stream.emf EMFP_DEBUG(int pos = pWMF->Tell(); pWMF->Seek(0); - SvFileStream file( rtl::OUString( "/tmp/emf-stream.emf" ), STREAM_WRITE | STREAM_TRUNC ); + SvFileStream file( OUString( "/tmp/emf-stream.emf" ), STREAM_WRITE | STREAM_TRUNC ); *pWMF >> file; file.Flush(); @@ -1083,7 +1083,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() *pWMF >> nChar; lfFaceName[ i ] = nChar; } - aLogFont.alfFaceName = rtl::OUString( lfFaceName ); + aLogFont.alfFaceName = OUString( lfFaceName ); pOut->CreateObject( nIndex, GDI_FONT, new WinMtfFontStyle( aLogFont ) ); } } @@ -1144,7 +1144,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() for ( i = 0, j = 0; i < aText.Len(); i++ ) { sal_Unicode cUniChar = aText.GetChar(i); - rtl::OString aCharacter(&cUniChar, 1, pOut->GetCharSet()); + OString aCharacter(&cUniChar, 1, pOut->GetCharSet()); pDX[ i ] = 0; for (sal_Int32 k = 0; ( k < aCharacter.getLength() ) && ( j < nLen ) && ( i < aText.Len() ); ++k) pDX[ i ] += pOldDx[ j++ ]; @@ -1168,7 +1168,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() *pTmp = nTmp; } #endif - aText = rtl::OUString(pBuf, nLen); + aText = OUString(pBuf, nLen); delete[] pBuf; } } diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 5e8f5f29a43b..63af42605fa3 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -283,7 +283,7 @@ void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags ) { if ( ( nAssertCount == 0 ) || ( bOnlyOnce == sal_False ) ) { - rtl::OStringBuffer aText("WMF/EMF Import: "); + OStringBuffer aText("WMF/EMF Import: "); if (pAction) aText.append(pAction); aText.append(" needs to be implemented"); @@ -321,7 +321,7 @@ WinMtf::WinMtf( WinMtfOutput* pWinMtfOutput, SvStream& rStreamWMF, FilterConfigI xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -1615,7 +1615,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry if( pDXArry ) { sal_uInt32 nLen = rText.Len(); - nTextWidth = aVDev.GetTextWidth( rtl::OUString(rText.GetChar( (sal_uInt16)( nLen - 1 ) )) ); + nTextWidth = aVDev.GetTextWidth( OUString(rText.GetChar( (sal_uInt16)( nLen - 1 ) )) ); if( nLen > 1 ) nTextWidth += pDXArry[ nLen - 2 ]; } diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 133df403bc31..e1dfed1ea678 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -508,7 +508,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) if ( nNewTextLen != nOriginalTextLen ) { sal_Unicode nUniChar = aText.GetChar(i); - rtl::OString aTmp(&nUniChar, 1, pOut->GetCharSet()); + OString aTmp(&nUniChar, 1, pOut->GetCharSet()); if ( aTmp.getLength() > 1 ) { sal_Int32 nDxCount = aTmp.getLength() - 1; diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 4f10ee17828e..1b862bab8005 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -336,7 +336,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont) } *pWMF << nPitchFamily; - rtl::OString aFontName(rtl::OUStringToOString(rFont.GetName(), eFontNameEncoding)); + OString aFontName(OUStringToOString(rFont.GetName(), eFontNameEncoding)); for ( i = 0; i < W_LF_FACESIZE; i++ ) { sal_Char nChar = ( i < aFontName.getLength() ) ? aFontName[i] : 0; @@ -438,8 +438,8 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String& { const sal_Unicode* pBuf = rUniStr.GetBuffer(); const rtl_TextEncoding aTextEncodingOrg = aSrcFont.GetCharSet(); - rtl::OString aByteStr(rtl::OUStringToOString(rUniStr, aTextEncodingOrg)); - rtl::OUString aUniStr2(rtl::OStringToOUString(aByteStr, aTextEncodingOrg)); + OString aByteStr(OUStringToOString(rUniStr, aTextEncodingOrg)); + OUString aUniStr2(OStringToOUString(aByteStr, aTextEncodingOrg)); const sal_Unicode* pConversion = aUniStr2.getStr(); // this is the unicode array after bytestring <-> unistring conversion for ( i = 0; i < nStringLen; i++ ) { @@ -460,8 +460,8 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String& aTextEncoding = getBestMSEncodingByChar(*pCheckChar); // try the next character } - aByteStr = rtl::OUStringToOString(rUniStr, aTextEncoding); - aUniStr2 = rtl::OStringToOUString(aByteStr, aTextEncoding); + aByteStr = OUStringToOString(rUniStr, aTextEncoding); + aUniStr2 = OStringToOUString(aByteStr, aTextEncoding); pConversion = aUniStr2.getStr(); // this is the unicode array after bytestring <-> unistring conversion for ( i = 0; i < nStringLen; i++ ) { @@ -535,12 +535,12 @@ void WMFWriter::WMFRecord_ExtTextOut( const Point & rPoint, return; } rtl_TextEncoding eChrSet = aSrcFont.GetCharSet(); - rtl::OString aByteString(rtl::OUStringToOString(rString, eChrSet)); + OString aByteString(OUStringToOString(rString, eChrSet)); TrueExtTextOut(rPoint,rString,aByteString,pDXAry); } void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString, - const rtl::OString& rByteString, const sal_Int32 * pDXAry ) + const OString& rByteString, const sal_Int32 * pDXAry ) { WriteRecordHeader( 0, W_META_EXTTEXTOUT ); WritePointYX( rPoint ); @@ -565,7 +565,7 @@ void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString, if ( nOriginalTextLen < nNewTextLen ) { sal_Unicode nUniChar = rString.GetChar(i); - rtl::OString aTemp(&nUniChar, 1, aSrcFont.GetCharSet()); + OString aTemp(&nUniChar, 1, aSrcFont.GetCharSet()); j = aTemp.getLength(); while ( --j > 0 ) *pWMF << (sal_uInt16)0; @@ -822,11 +822,11 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, void WMFWriter::WMFRecord_TextOut(const Point & rPoint, const String & rStr) { rtl_TextEncoding eChrSet = aSrcFont.GetCharSet(); - rtl::OString aString(rtl::OUStringToOString(rStr, eChrSet)); + OString aString(OUStringToOString(rStr, eChrSet)); TrueTextOut(rPoint, aString); } -void WMFWriter::TrueTextOut(const Point & rPoint, const rtl::OString& rString) +void WMFWriter::TrueTextOut(const Point & rPoint, const OString& rString) { WriteRecordHeader(0,W_META_TEXTOUT); @@ -1730,7 +1730,7 @@ sal_Bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index b05a8d217ec1..63c42ff31d27 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -158,8 +158,8 @@ private: void WMFRecord_ExtTextOut(const Point & rPoint, const String & rString, const sal_Int32 * pDXAry); void TrueExtTextOut(const Point & rPoint, const String & rString, - const rtl::OString& rByteString, const sal_Int32 * pDXAry); - void TrueTextOut(const Point & rPoint, const rtl::OString& rString); + const OString& rByteString, const sal_Int32 * pDXAry); + void TrueTextOut(const Point & rPoint, const OString& rString); void WMFRecord_LineTo(const Point & rPoint); void WMFRecord_MoveTo(const Point & rPoint); void WMFRecord_Pie(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt); diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 442af4ada75f..22f82249ef43 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -732,7 +732,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) rOStm << nDummy32; // Unused rOStm << nDummy32; // Unused rOStm << nDummy32; // Unused - write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); // dummy + write_lenPrefixed_uInt8s_FromOString(rOStm, OString()); // dummy rOStm << nRest; // Count of remaining structures } } diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx index fe620e72367f..7f9165258944 100644 --- a/vcl/source/gdi/base14.cxx +++ b/vcl/source/gdi/base14.cxx @@ -23,8 +23,6 @@ using namespace vcl; -using ::rtl::OString; -using ::rtl::OStringBuffer; OString PDFWriterImpl::BuiltinFont::getNameObject() const { diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 6f7147792804..8ea7a832c4c8 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -89,14 +89,14 @@ BitmapEx::BitmapEx( const ResId& rResId ) : pResMgr->ReadLong(); const String aFileName( pResMgr->ReadString() ); - ::rtl::OUString aCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString aCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); if( !aImageTree->loadImage( aFileName, aCurrentSymbolsStyle, *this, true ) ) { #ifdef DBG_UTIL - rtl::OStringBuffer aErrorStr( + OStringBuffer aErrorStr( "BitmapEx::BitmapEx( const ResId& rResId ): could not load image <"); - aErrorStr.append(rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_ASCII_US)).append('>'); + aErrorStr.append(OUStringToOString(aFileName, RTL_TEXTENCODING_ASCII_US)).append('>'); OSL_FAIL(aErrorStr.getStr()); #endif } diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx index f76035df87dc..e42a28e1c3b5 100644 --- a/vcl/source/gdi/bmpconv.cxx +++ b/vcl/source/gdi/bmpconv.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::reflection; using namespace com::sun::star::awt; -using ::rtl::OUString; namespace vcl { diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index e8614e028d96..30b6f463f38c 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -33,7 +33,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; -using ::rtl::OUString; #define SETTINGS_CONFIGNODE "VCL/Settings" @@ -65,7 +64,7 @@ void SettingsConfigItem::Commit() if( ! IsValidConfigMgr() ) return; - boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group; + boost::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group; for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group ) { @@ -145,7 +144,7 @@ void SettingsConfigItem::getValues() const OUString& SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const { - ::boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); + ::boost::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() ) { static OUString aEmpty; diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 0b669f10e28a..bdc23db0293a 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -199,7 +199,7 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont, char aName[32]; short nWeight; - rtl::OString aByteName(rtl::OUStringToOString(rFont.GetName(), + OString aByteName(OUStringToOString(rFont.GetName(), rOStm.GetStreamCharSet())); strncpy( aName, aByteName.getStr(), 32 ); @@ -849,12 +849,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nAryLen; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); + OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); - OUString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet)); + OUString aStr(OStringToOUString(aByteStr, eActualCharSet)); if( nAryLen > 0L ) { @@ -912,12 +912,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nWidth; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_INT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); + OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); - OUString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet)); + OUString aStr(OStringToOUString(aByteStr, eActualCharSet)); if ( nUnicodeCommentActionNumber == i ) ImplReadUnicodeComment( nUnicodeCommentStreamPos, rIStm, aStr ); rMtf.AddAction( new MetaStretchTextAction( aPt, nWidth, aStr, (sal_uInt16) nIndex, (sal_uInt16) nLen ) ); @@ -1278,7 +1278,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_uInt8* pData; sal_Int32 nFollowingActionCount; - rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString(rIStm); + OString aComment = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> nValue >> nDataSize; if( nDataSize ) @@ -1678,7 +1678,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaTextAction* pAct = (MetaTextAction*) pAction; String aUniText( pAct->GetText() ); - rtl::OString aText(rtl::OUStringToOString(aUniText, + OString aText(OUStringToOString(aUniText, rActualCharSet)); const sal_uLong nStrLen = aText.getLength(); @@ -1699,7 +1699,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, case( META_TEXTARRAY_ACTION ): { MetaTextArrayAction* pAct = (MetaTextArrayAction*)pAction; - rtl::OString aText(rtl::OUStringToOString(pAct->GetText(), + OString aText(OUStringToOString(pAct->GetText(), rActualCharSet)); String aUniText( pAct->GetText(), pAct->GetIndex(), pAct->GetLen() ); sal_uLong nAryLen; @@ -1743,7 +1743,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction; String aUniText( pAct->GetText() ); - rtl::OString aText(rtl::OUStringToOString(aUniText, + OString aText(OUStringToOString(aUniText, rActualCharSet)); const sal_uLong nStrLen = aText.getLength(); @@ -2406,7 +2406,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, #ifdef DBG_UTIL default: { - rtl::OStringBuffer aStr("Missing implementation for Action#: "); + OStringBuffer aStr("Missing implementation for Action#: "); aStr.append(static_cast(pAction->GetType())); aStr.append('!'); OSL_FAIL(aStr.getStr()); diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 50c105dc3ca9..4d313c5f1d43 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -334,7 +334,7 @@ void Font::SetAlign( FontAlign eAlign ) } } -void Font::SetName( const rtl::OUString& rFamilyName ) +void Font::SetName( const OUString& rFamilyName ) { DBG_CHKTHIS( Font, NULL ); @@ -783,7 +783,7 @@ namespace if( aInfo.ufamily ) o_rResult.SetName( aInfo.ufamily ); else if( aInfo.family ) - o_rResult.SetName( rtl::OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) ); + o_rResult.SetName( OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) ); // set weight if( aInfo.weight ) { @@ -838,9 +838,9 @@ namespace // set style name if( aInfo.usubfamily ) - o_rResult.SetStyleName( rtl::OUString( aInfo.usubfamily ) ); + o_rResult.SetStyleName( OUString( aInfo.usubfamily ) ); else if( aInfo.subfamily ) - o_rResult.SetStyleName( rtl::OUString::createFromAscii( aInfo.subfamily ) ); + o_rResult.SetStyleName( OUString::createFromAscii( aInfo.subfamily ) ); // cleanup CloseTTFont( pTTF ); @@ -898,7 +898,7 @@ namespace pClose++; if( pClose - pOpen > 1 ) { - o_rResult.SetName( rtl::OStringToOUString( rtl::OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) ); + o_rResult.SetName( OStringToOUString( OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) ); } } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index da87d3174044..da38c34e68fc 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -417,7 +417,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S if( xBitmapCanvas.is() ) { args[0] = uno::Any( xBitmapCanvas ); - xMtfRenderer.set( xFactory->createInstanceWithArguments( ::rtl::OUString("com.sun.star.rendering.MtfRenderer"), + xMtfRenderer.set( xFactory->createInstanceWithArguments( OUString("com.sun.star.rendering.MtfRenderer"), args ), uno::UNO_QUERY ); if( xMtfRenderer.is() ) @@ -484,15 +484,15 @@ void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, if( !pData ) return; - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; while( pData(*pData++)); - const ::rtl::OUString aRendererServiceName=aBuffer.makeStringAndClear(); + const OUString aRendererServiceName=aBuffer.makeStringAndClear(); ++pData; while( pData(*pData++)); - const ::rtl::OUString aGraphicServiceName=aBuffer.makeStringAndClear(); + const OUString aGraphicServiceName=aBuffer.makeStringAndClear(); ++pData; uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); @@ -1602,7 +1602,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai MetaTextLineAction* pAct = (MetaTextLineAction*) pAction; // measure a test string to get ascend and descent right static const sal_Unicode pStr[] = { 0xc4, 0x67, 0 }; - rtl::OUString aStr( pStr ); + OUString aStr( pStr ); Rectangle aRect; aMapVDev.GetTextBoundRect( aRect, aStr, 0, 0, aStr.getLength(), 0, NULL ); @@ -3000,19 +3000,19 @@ void GDIMetaFile::UseCanvas( sal_Bool _bUseCanvas ) bUseCanvas = _bUseCanvas; } -MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererServiceName, - const rtl::OUString& rGraphicServiceName, +MetaCommentAction* makePluggableRendererAction( const OUString& rRendererServiceName, + const OUString& rGraphicServiceName, const void* _pData, sal_uInt32 nDataSize ) { const sal_uInt8* pData=(sal_uInt8*)_pData; // FIXME: Data gets copied twice, unfortunately - rtl::OString aRendererServiceName( + OString aRendererServiceName( rRendererServiceName.getStr(), rRendererServiceName.getLength(), RTL_TEXTENCODING_ASCII_US); - rtl::OString aGraphicServiceName( + OString aGraphicServiceName( rGraphicServiceName.getStr(), rGraphicServiceName.getLength(), RTL_TEXTENCODING_ASCII_US); diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 415ae1413c88..11cb3b6c3268 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -329,7 +329,7 @@ ImageList::ImageList( const ResId& rResId ) : BitmapEx aEmpty; for( sal_Int32 i = 0; i < nCount; ++i ) { - rtl::OUString aName = pResMgr->ReadString(); + OUString aName = pResMgr->ReadString(); sal_uInt16 nId = static_cast< sal_uInt16 >( pResMgr->ReadLong() ); mpImplData->AddImage( aName, nId, aEmpty ); } @@ -339,8 +339,8 @@ ImageList::ImageList( const ResId& rResId ) : } } -ImageList::ImageList( const ::std::vector< ::rtl::OUString >& rNameVector, - const ::rtl::OUString& rPrefix, +ImageList::ImageList( const ::std::vector< OUString >& rNameVector, + const OUString& rPrefix, const Color* ) : mpImplData( NULL ), mnInitSize( 1 ), @@ -386,15 +386,15 @@ void ImageList::ImplInit( sal_uInt16 nItems, const Size &rSize ) mpImplData->maImageSize = rSize; } -void ImageAryData::Load(const rtl::OUString &rPrefix) +void ImageAryData::Load(const OUString &rPrefix) { static ImplImageTreeSingletonRef aImageTree; - ::rtl::OUString aSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString aSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); BitmapEx aBmpEx; - rtl::OUString aFileName = rPrefix; + OUString aFileName = rPrefix; aFileName += maName; #if OSL_DEBUG_LEVEL > 0 bool bSuccess = @@ -403,9 +403,9 @@ void ImageAryData::Load(const rtl::OUString &rPrefix) #if OSL_DEBUG_LEVEL > 0 if ( !bSuccess ) { - ::rtl::OStringBuffer aMessage; + OStringBuffer aMessage; aMessage.append( "ImageAryData::Load: failed to load image '" ); - aMessage.append( ::rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() ); + aMessage.append( OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() ); aMessage.append( "'" ); OSL_FAIL( aMessage.makeStringAndClear().getStr() ); } @@ -452,7 +452,7 @@ BitmapEx ImageList::GetAsHorizontalStrip() const } void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, - const std::vector< rtl::OUString > &rNameVector ) + const std::vector< OUString > &rNameVector ) { sal_uInt16 nItems = sal::static_int_cast< sal_uInt16 >( rNameVector.size() ); @@ -490,11 +490,11 @@ void ImageList::InsertFromHorizontalBitmap( const ResId& rResId, if ( nColorCount && pSearchColors && pReplaceColors ) aBmpEx.Replace( pSearchColors, pReplaceColors, nColorCount ); - std::vector< rtl::OUString > aNames( nCount ); + std::vector< OUString > aNames( nCount ); InsertFromHorizontalStrip( aBmpEx, aNames ); } -sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const +sal_uInt16 ImageList::ImplGetImageId( const OUString& rImageName ) const { DBG_CHKTHIS( ImageList, NULL ); @@ -505,7 +505,7 @@ sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const return 0; } -void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage ) +void ImageList::AddImage( const OUString& rImageName, const Image& rImage ) { DBG_ASSERT( GetImagePos( rImageName ) == IMAGELIST_IMAGE_NOTFOUND, "ImageList::AddImage() - ImageName already exists" ); @@ -516,7 +516,7 @@ void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage rImage.GetBitmapEx() ); } -void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ) +void ImageList::ReplaceImage( const OUString& rImageName, const Image& rImage ) { const sal_uInt16 nId = ImplGetImageId( rImageName ); @@ -577,7 +577,7 @@ Image ImageList::GetImage( sal_uInt16 nId ) const return aRet; } -Image ImageList::GetImage( const ::rtl::OUString& rImageName ) const +Image ImageList::GetImage( const OUString& rImageName ) const { if( mpImplData ) { @@ -622,7 +622,7 @@ bool ImageList::HasImageAtPos( sal_uInt16 nId ) const return GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND; } -sal_uInt16 ImageList::GetImagePos( const ::rtl::OUString& rImageName ) const +sal_uInt16 ImageList::GetImagePos( const OUString& rImageName ) const { DBG_CHKTHIS( ImageList, NULL ); @@ -648,29 +648,29 @@ sal_uInt16 ImageList::GetImageId( sal_uInt16 nPos ) const return 0; } -::rtl::OUString ImageList::GetImageName( sal_uInt16 nPos ) const +OUString ImageList::GetImageName( sal_uInt16 nPos ) const { DBG_CHKTHIS( ImageList, NULL ); if( mpImplData && (nPos < GetImageCount()) ) return mpImplData->maImages[ nPos ]->maName; - return ::rtl::OUString(); + return OUString(); } -void ImageList::GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const +void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const { RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::GetImageNames" ); DBG_CHKTHIS( ImageList, NULL ); - rNames = ::std::vector< ::rtl::OUString >(); + rNames = ::std::vector< OUString >(); if( mpImplData ) { for( sal_uInt32 i = 0; i < mpImplData->maImages.size(); i++ ) { - const rtl::OUString& rName( mpImplData->maImages[ i ]->maName ); + const OUString& rName( mpImplData->maImages[ i ]->maName ); if( !rName.isEmpty()) rNames.push_back( rName ); } diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx index b201a263a70a..63aee8a202a0 100644 --- a/vcl/source/gdi/imagerepository.cxx +++ b/vcl/source/gdi/imagerepository.cxx @@ -32,9 +32,9 @@ namespace vcl //= ImageRepository //==================================================================== //-------------------------------------------------------------------- - bool ImageRepository::loadImage( const ::rtl::OUString& _rName, BitmapEx& _out_rImage, bool _bSearchLanguageDependent, bool loadMissing ) + bool ImageRepository::loadImage( const OUString& _rName, BitmapEx& _out_rImage, bool _bSearchLanguageDependent, bool loadMissing ) { - ::rtl::OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); ImplImageTreeSingletonRef aImplImageTree; return aImplImageTree->loadImage( _rName, sCurrentSymbolsStyle, _out_rImage, _bSearchLanguageDependent, loadMissing ); @@ -42,7 +42,7 @@ namespace vcl bool ImageRepository::loadDefaultImage( BitmapEx& _out_rImage) { - ::rtl::OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); ImplImageTreeSingletonRef aImplImageTree; return aImplImageTree->loadDefaultImage( sCurrentSymbolsStyle,_out_rImage); } diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 2e90cf7d29a2..d980fc5f09c4 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -368,7 +368,7 @@ void ImpGraphic::ImplClear() ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1096,7 +1096,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1286,7 +1286,7 @@ sal_Bool ImpGraphic::ImplSwapOut() ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1392,7 +1392,7 @@ sal_Bool ImpGraphic::ImplSwapIn() ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1655,7 +1655,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) if(mnSvgDataArrayLength) { SvgDataArray aNewData(new sal_uInt8[mnSvgDataArrayLength]); - rtl::OUString aPath; + OUString aPath; rIStm.Read(aNewData.get(), mnSvgDataArrayLength); aPath = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); @@ -1666,7 +1666,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) new SvgData( aNewData, mnSvgDataArrayLength, - rtl::OUString(aPath))); + OUString(aPath))); rImpGraphic = aSvgDataPtr; } diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 7bb76da3f510..f61a34588f27 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -38,7 +38,7 @@ ImageAryData::ImageAryData( const ImageAryData& rData ) : { } -ImageAryData::ImageAryData( const rtl::OUString &aName, +ImageAryData::ImageAryData( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmap ) : maName( aName ), mnId( nId ), maBitmapEx( aBitmap ) { @@ -82,7 +82,7 @@ ImplImageList::~ImplImageList() delete *aIt; } -void ImplImageList::AddImage( const ::rtl::OUString &aName, +void ImplImageList::AddImage( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmapEx ) { ImageAryData *pImg = new ImageAryData( aName, nId, aBitmapEx ); diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 4b4cc078558a..29f3e7a1e2a9 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -63,10 +63,10 @@ namespace { -rtl::OUString createPath( - rtl::OUString const & name, sal_Int32 pos, rtl::OUString const & locale) +OUString createPath( + OUString const & name, sal_Int32 pos, OUString const & locale) { - rtl::OUStringBuffer b(name.copy(0, pos + 1)); + OUStringBuffer b(name.copy(0, pos + 1)); b.append(locale); b.append(name.copy(pos)); return b.makeStringAndClear(); @@ -94,7 +94,7 @@ boost::shared_ptr< SvStream > wrapFile(osl::File & file) void loadFromFile( osl::File & file, - rtl::OUString const & path, BitmapEx & bitmap) + OUString const & path, BitmapEx & bitmap) { boost::shared_ptr< SvStream > s(wrapFile(file)); if (path.endsWith(".png")) @@ -131,7 +131,7 @@ boost::shared_ptr< SvStream > wrapStream( void loadFromStream( css::uno::Reference< css::io::XInputStream > const & stream, - rtl::OUString const & path, BitmapEx & bitmap) + OUString const & path, BitmapEx & bitmap) { boost::shared_ptr< SvStream > s(wrapStream(stream)); if (path.endsWith(".png")) @@ -150,7 +150,7 @@ ImplImageTree::ImplImageTree() { m_cacheIcons = true; } ImplImageTree::~ImplImageTree() {} -bool ImplImageTree::checkStyle(rtl::OUString const & style) +bool ImplImageTree::checkStyle(OUString const & style) { bool exists; @@ -163,9 +163,9 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style) setStyle(style); exists = false; - const rtl::OUString sBrandURLSuffix("_brand"); + const OUString sBrandURLSuffix("_brand"); for (Paths::iterator i(m_paths.begin()); i != m_paths.end() && !exists; ++i) { - ::rtl::OUString aURL = i->first; + OUString aURL = i->first; sal_Int32 nFromIndex = aURL.getLength() - sBrandURLSuffix.getLength(); // skip brand-specific icon themes; they are incomplete and thus not useful for this check if (nFromIndex < 0 || !aURL.match(sBrandURLSuffix, nFromIndex)) { @@ -190,7 +190,7 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style) } bool ImplImageTree::loadImage( - rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap, + OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized, bool loadMissing ) { bool found = false; @@ -210,17 +210,17 @@ bool ImplImageTree::loadImage( } bool ImplImageTree::loadDefaultImage( - rtl::OUString const & style, + OUString const & style, BitmapEx& bitmap) { return doLoadImage( - rtl::OUString("res/grafikde.png"), + OUString("res/grafikde.png"), style, bitmap, false); } bool ImplImageTree::doLoadImage( - rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap, + OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized) { setStyle(style); @@ -230,7 +230,7 @@ bool ImplImageTree::doLoadImage( if (!bitmap.IsEmpty()) { bitmap.SetEmpty(); } - std::vector< rtl::OUString > paths; + std::vector< OUString > paths; paths.push_back(name); if (localized) { sal_Int32 pos = name.lastIndexOf('/'); @@ -240,10 +240,10 @@ bool ImplImageTree::doLoadImage( Application::GetSettings().GetUILanguageTag().getLocale(); paths.push_back(createPath(name, pos, loc.Language)); if (!loc.Country.isEmpty()) { - rtl::OUStringBuffer b(loc.Language); + OUStringBuffer b(loc.Language); b.append(sal_Unicode('-')); b.append(loc.Country); - rtl::OUString p(createPath(name, pos, b.makeStringAndClear())); + OUString p(createPath(name, pos, b.makeStringAndClear())); paths.push_back(p); if (!loc.Variant.isEmpty()) { b.append(p); @@ -270,14 +270,14 @@ bool ImplImageTree::doLoadImage( } void ImplImageTree::shutDown() { - m_style = rtl::OUString(); + m_style = OUString(); // for safety; empty m_style means "not initialized" m_paths.clear(); m_iconCache.clear(); m_checkStyleCache.clear(); } -void ImplImageTree::setStyle(rtl::OUString const & style) { +void ImplImageTree::setStyle(OUString const & style) { OSL_ASSERT(!style.isEmpty()); // empty m_style means "not initialized" if (style != m_style) { m_style = style; @@ -289,7 +289,7 @@ void ImplImageTree::setStyle(rtl::OUString const & style) { void ImplImageTree::resetPaths() { m_paths.clear(); { - rtl::OUString url( + OUString url( "$BRAND_BASE_DIR/program/edition/images"); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); @@ -300,12 +300,12 @@ void ImplImageTree::resetPaths() { css::uno::Reference< css::container::XNameAccess >())); } { - rtl::OUString url( + OUString url( "$BRAND_BASE_DIR/share/config"); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); OSL_ASSERT(!u.HasError()); - rtl::OUStringBuffer b; + OUStringBuffer b; b.appendAscii("images_"); b.append(m_style); b.appendAscii("_brand"); @@ -317,19 +317,19 @@ void ImplImageTree::resetPaths() { css::uno::Reference< css::container::XNameAccess >())); } { - rtl::OUString url( "$BRAND_BASE_DIR/share/config/images_brand"); + OUString url( "$BRAND_BASE_DIR/share/config/images_brand"); rtl::Bootstrap::expandMacros(url); m_paths.push_back( std::make_pair( url, css::uno::Reference< css::container::XNameAccess >())); } { - rtl::OUString url( + OUString url( "$BRAND_BASE_DIR/share/config"); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); OSL_ASSERT(!u.HasError()); - rtl::OUStringBuffer b; + OUStringBuffer b; b.appendAscii("images_"); b.append(m_style); bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL); @@ -341,7 +341,7 @@ void ImplImageTree::resetPaths() { } if ( m_style == "default" ) { - rtl::OUString url( "$BRAND_BASE_DIR/share/config/images"); + OUString url( "$BRAND_BASE_DIR/share/config/images"); rtl::Bootstrap::expandMacros(url); m_paths.push_back( std::make_pair( @@ -350,7 +350,7 @@ void ImplImageTree::resetPaths() { } bool ImplImageTree::checkStyleCacheLookup( - rtl::OUString const & style, bool &exists) + OUString const & style, bool &exists) { CheckStyleCache::iterator i(m_checkStyleCache.find(style)); if (i != m_checkStyleCache.end()) { @@ -362,7 +362,7 @@ bool ImplImageTree::checkStyleCacheLookup( } bool ImplImageTree::iconCacheLookup( - rtl::OUString const & name, bool localized, BitmapEx & bitmap) + OUString const & name, bool localized, BitmapEx & bitmap) { IconCache::iterator i(m_iconCache.find(name)); if (i != m_iconCache.end() && i->second.first == localized) { @@ -374,11 +374,11 @@ bool ImplImageTree::iconCacheLookup( } bool ImplImageTree::find( - std::vector< rtl::OUString > const & paths, BitmapEx & bitmap) + std::vector< OUString > const & paths, BitmapEx & bitmap) { if (!m_cacheIcons) { for (Paths::iterator i(m_paths.begin()); i != m_paths.end(); ++i) { - for (std::vector< rtl::OUString >::const_reverse_iterator j( + for (std::vector< OUString >::const_reverse_iterator j( paths.rbegin()); j != paths.rend(); ++j) { @@ -399,7 +399,7 @@ bool ImplImageTree::find( try { i->second.set( comphelper::getProcessServiceFactory()->createInstanceWithArguments( - rtl::OUString( "com.sun.star.packages.zip.ZipFileAccess"), + OUString( "com.sun.star.packages.zip.ZipFileAccess"), args), css::uno::UNO_QUERY_THROW); } catch (css::uno::RuntimeException &) { @@ -411,7 +411,7 @@ bool ImplImageTree::find( continue; } } - for (std::vector< rtl::OUString >::const_reverse_iterator j( + for (std::vector< OUString >::const_reverse_iterator j( paths.rbegin()); j != paths.rend(); ++j) { diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 9b9b960c5cba..9ec7cf07f743 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -150,23 +150,23 @@ JobSetup::~JobSetup() } } -rtl::OUString JobSetup::GetPrinterName() const +OUString JobSetup::GetPrinterName() const { if ( mpData ) return mpData->maPrinterName; else - return rtl::OUString(); + return OUString(); } -rtl::OUString JobSetup::GetDriverName() const +OUString JobSetup::GetDriverName() const { if ( mpData ) return mpData->maDriver; else - return rtl::OUString(); + return OUString(); } -void JobSetup::SetValue( const rtl::OUString& rKey, const rtl::OUString& rValue ) +void JobSetup::SetValue( const OUString& rKey, const OUString& rValue ) { if( ! mpData ) mpData = new ImplJobSetup(); @@ -349,9 +349,9 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) ImplOldJobSetupData aOldData; memset( &aOldData, 0, sizeof( aOldData ) ); - rtl::OString aPrnByteName(rtl::OUStringToOString(rJobSetup.GetPrinterName(), RTL_TEXTENCODING_UTF8)); + OString aPrnByteName(OUStringToOString(rJobSetup.GetPrinterName(), RTL_TEXTENCODING_UTF8)); strncpy( aOldData.cPrinterName, aPrnByteName.getStr(), 63 ); - rtl::OString aDriverByteName(rtl::OUStringToOString(rJobSetup.GetDriverName(), RTL_TEXTENCODING_UTF8)); + OString aDriverByteName(OUStringToOString(rJobSetup.GetDriverName(), RTL_TEXTENCODING_UTF8)); strncpy( aOldData.cDriverName, aDriverByteName.getStr(), 31 ); // nLen = sizeof( aOldData ) + 4 + nOldJobDataSize + pJobData->mnDriverDataLen; int nPos = rOStream.Tell(); @@ -360,7 +360,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) rOStream.Write( (char*)&aOldData, sizeof( aOldData ) ); rOStream.Write( (char*)&aOldJobData, nOldJobDataSize ); rOStream.Write( (char*)pJobData->mpDriverData, pJobData->mnDriverDataLen ); - ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; + ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { write_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index c9c5e086e170..ef702cc969cd 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1181,7 +1181,7 @@ IMPL_META_ACTION( Text, META_TEXT_ACTION ) // ------------------------------------------------------------------------ -MetaTextAction::MetaTextAction( const Point& rPt, const rtl::OUString& rStr, +MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, sal_uInt16 nIndex, sal_uInt16 nLen ) : MetaAction ( META_TEXT_ACTION ), maPt ( rPt ), @@ -1291,7 +1291,7 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : // ------------------------------------------------------------------------ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, - const rtl::OUString& rStr, + const OUString& rStr, const sal_Int32* pDXAry, sal_uInt16 nIndex, sal_uInt16 nLen ) : @@ -1452,7 +1452,7 @@ IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) // ------------------------------------------------------------------------ MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, - const rtl::OUString& rStr, + const OUString& rStr, sal_uInt16 nIndex, sal_uInt16 nLen ) : MetaAction ( META_STRETCHTEXT_ACTION ), maPt ( rPt ), @@ -1541,7 +1541,7 @@ IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) // ------------------------------------------------------------------------ MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, - const rtl::OUString& rStr, sal_uInt16 nStyle ) : + const OUString& rStr, sal_uInt16 nStyle ) : MetaAction ( META_TEXTRECT_ACTION ), maRect ( rRect ), maStr ( rStr ), @@ -3956,7 +3956,7 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : // ------------------------------------------------------------------------ -MetaCommentAction::MetaCommentAction( const rtl::OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : +MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : MetaAction ( META_COMMENT_ACTION ), maComment ( rComment ), mnValue ( nValue ) diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index cfe02e9ea513..e47acb0afa66 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -1283,7 +1283,7 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const } ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& rFontSelData, - rtl::OUString& rMissingCodes, int nFallbackLevel ) const + OUString& rMissingCodes, int nFallbackLevel ) const { ImplDevFontListData* pFallbackData = NULL; @@ -1318,11 +1318,11 @@ ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& r if( !bCached || (rFontSelData.maSearchName != aFontName) ) pRemainingCodes[ nRemainingLength++ ] = cChar; } - rMissingCodes = rtl::OUString( pRemainingCodes, nRemainingLength ); + rMissingCodes = OUString( pRemainingCodes, nRemainingLength ); } else { - rtl::OUString aOldMissingCodes = rMissingCodes; + OUString aOldMissingCodes = rMissingCodes; // call the hook to query the best matching glyph fallback font if( mpFallbackHook->FindFontSubstitute( rFontSelData, rMissingCodes ) ) // apply outdev3.cxx specific fontname normalization @@ -1417,8 +1417,8 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySearchName( const OUString& rSea return pFoundData; } -ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const rtl::OUString& rSearchName, - const rtl::OUString& rShortName) const +ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const OUString& rSearchName, + const OUString& rShortName) const { // short circuit for impossible font name alias if (rSearchName.isEmpty()) @@ -1462,7 +1462,7 @@ ImplDevFontListData* ImplDevFontList::FindFontFamily( const String& rFontName ) return pFound; } -ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const rtl::OUString& rTokenStr) const +ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const OUString& rTokenStr) const { ImplDevFontListData* pFoundData = NULL; @@ -1536,7 +1536,7 @@ void ImplDevFontList::InitMatchData() const ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong nSearchType, FontWeight eSearchWeight, FontWidth eSearchWidth, - FontItalic eSearchItalic, const rtl::OUString& rSearchFamilyName ) const + FontItalic eSearchItalic, const OUString& rSearchFamilyName ) const { if( (eSearchItalic != ITALIC_NONE) && (eSearchItalic != ITALIC_DONTKNOW) ) nSearchType |= IMPL_FONT_ATTR_ITALIC; @@ -2316,7 +2316,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList, namespace { - rtl::OUString stripCharSetFromName(rtl::OUString aName) + OUString stripCharSetFromName(OUString aName) { //I worry that someone will have a font which *does* have //e.g. "Greek" legitimately at the end of its name :-( @@ -2439,7 +2439,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD, //Win 3.1/Win95 style fontnames which attempt to put the //charset encoding into the filename //http://www.webcenter.ru/~kazarn/eng/fonts_ttf.htm - rtl::OUString sStrippedName = stripCharSetFromName(rFSD.maTargetName); + OUString sStrippedName = stripCharSetFromName(rFSD.maTargetName); if (!sStrippedName.equals(rFSD.maTargetName)) { rFSD.maTargetName = sStrippedName; @@ -2672,7 +2672,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD, } ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( ImplDevFontList* pFontList, - FontSelectPattern& rFontSelData, int nFallbackLevel, rtl::OUString& rMissingCodes ) + FontSelectPattern& rFontSelData, int nFallbackLevel, OUString& rMissingCodes ) { // get a candidate font for glyph fallback // unless the previously selected font got a device specific substitution @@ -3938,7 +3938,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, sal_Unicode aChars[nMaxStrikeStrLen+1]; // +1 for valgrind... for( int i = 0; i < nTestStrLen; ++i) aChars[i] = cStrikeoutChar; - const rtl::OUString aStrikeoutTest(aChars, nTestStrLen); + const OUString aStrikeoutTest(aChars, nTestStrLen); // calculate approximation of strikeout atom size long nStrikeoutWidth = 0; @@ -3958,7 +3958,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, // build the strikeout string for( int i = nTestStrLen; i < nStrikeStrLen; ++i) aChars[i] = cStrikeoutChar; - const rtl::OUString aStrikeoutText(aChars, nStrikeStrLen); + const OUString aStrikeoutText(aChars, nStrikeStrLen); if( mpFontEntry->mnOrientation ) ImplRotatePos( 0, 0, nDistX, nDistY, mpFontEntry->mnOrientation ); @@ -4699,7 +4699,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, rLineInfo.Clear(); if ( !rStr.isEmpty() && (nWidth > 0) ) { - ::rtl::OUString aText( rStr ); + OUString aText( rStr ); uno::Reference < i18n::XBreakIterator > xBI; // get service provider uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); @@ -5992,11 +5992,11 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay // get list of unicodes that need glyph fallback int nCharPos = -1; bool bRTL = false; - rtl::OUStringBuffer aMissingCodeBuf; + OUStringBuffer aMissingCodeBuf; while( rLayoutArgs.GetNextPos( &nCharPos, &bRTL) ) aMissingCodeBuf.append( rLayoutArgs.mpStr[ nCharPos ] ); rLayoutArgs.ResetPos(); - rtl::OUString aMissingCodes = aMissingCodeBuf.makeStringAndClear(); + OUString aMissingCodes = aMissingCodeBuf.makeStringAndClear(); FontSelectPattern aFontSelData = mpFontEntry->maFontSelData; @@ -6142,7 +6142,7 @@ xub_StrLen OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth, xub_StrLen nRetVal = sal::static_int_cast(pSalLayout->GetTextBreak( nTextPixelWidth, nExtraPixelWidth, nSubPixelFactor )); // calculate hyphenated break position - rtl::OUString aHyphenatorStr(nHyphenatorChar); + OUString aHyphenatorStr(nHyphenatorChar); sal_Int32 nTempLen = 1; SalLayout* pHyphenatorLayout = ImplLayout( aHyphenatorStr, 0, nTempLen ); if( pHyphenatorLayout ) @@ -6712,8 +6712,8 @@ OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, } else if ( nStyle & TEXT_DRAW_PATHELLIPSIS ) { - rtl::OUString aPath( rOrigStr ); - rtl::OUString aAbbreviatedPath; + OUString aPath( rOrigStr ); + OUString aAbbreviatedPath; osl_abbreviateSystemPath( aPath.pData, &aAbbreviatedPath.pData, nIndex, NULL ); aStr = aAbbreviatedPath; } diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 685f33e9f506..8e9535bece34 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -1126,7 +1126,7 @@ void OutputDevice::Erase() if( pWindow->IsEnabled() ) nState |= CTRL_STATE_ENABLED; bNativeOK = pWindow->DrawNativeControl( CTRL_WINDOW_BACKGROUND, aCtrlPart, aCtrlRegion, - nState, aControlValue, rtl::OUString() ); + nState, aControlValue, OUString() ); } } diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index 449af1b598f0..4727ba6dedef 100644 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -268,7 +268,7 @@ sal_Bool OutputDevice::DrawNativeControl( ControlType nType, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - ::rtl::OUString aCaption ) + OUString aCaption ) { if( !lcl_enableNativeWidget( *this ) ) return sal_False; @@ -310,7 +310,7 @@ sal_Bool OutputDevice::GetNativeControlRegion( ControlType nType, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - ::rtl::OUString aCaption, + OUString aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) const { diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 45eb7ed3de70..9895867062b4 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -81,7 +81,7 @@ struct SAL_DLLPRIVATE GlobalSyncData std::deque< Rectangle > mParaRects; std::deque< sal_Int32 > mParaInts; std::deque< sal_uInt32 > mParauInts; - std::deque< rtl::OUString > mParaOUStrings; + std::deque< OUString > mParaOUStrings; std::deque< PDFWriter::DestAreaType > mParaDestAreaTypes; std::deque< PDFNote > mParaPDFNotes; std::deque< PDFWriter::PageTransition > mParaPageTransitions; @@ -290,7 +290,7 @@ struct SAL_DLLPRIVATE PageSyncData std::deque< PDFExtOutDevDataSync > mActions; std::deque< Rectangle > mParaRects; std::deque< sal_Int32 > mParaInts; - std::deque< rtl::OUString > mParaOUStrings; + std::deque< OUString > mParaOUStrings; std::deque< PDFWriter::StructElement > mParaStructElements; std::deque< PDFWriter::StructAttribute > mParaStructAttributes; std::deque< PDFWriter::StructAttributeValue > mParaStructAttributeValues; @@ -691,14 +691,14 @@ sal_Int32 PDFExtOutDevData::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ) mpGlobalSyncData->mParaInts.push_back( nDestId ); return 0; } -sal_Int32 PDFExtOutDevData::SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ) +sal_Int32 PDFExtOutDevData::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ) { mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetLinkURL ); mpGlobalSyncData->mParaInts.push_back( nLinkId ); mpGlobalSyncData->mParaOUStrings.push_back( rURL ); return 0; } -sal_Int32 PDFExtOutDevData::CreateOutlineItem( sal_Int32 nParent, const rtl::OUString& rText, sal_Int32 nDestID ) +sal_Int32 PDFExtOutDevData::CreateOutlineItem( sal_Int32 nParent, const OUString& rText, sal_Int32 nDestID ) { mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::CreateOutlineItem ); mpGlobalSyncData->mParaInts.push_back( nParent ); @@ -724,7 +724,7 @@ void PDFExtOutDevData::SetPageTransition( PDFWriter::PageTransition eType, sal_u /* local (page), actions have to be played synchroniously to the actions of of the recorded metafile (created by each xRenderable->render()) */ - sal_Int32 PDFExtOutDevData::BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ) + sal_Int32 PDFExtOutDevData::BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ) { mpPageSyncData->PushAction( mrOutDev, PDFExtOutDevDataSync::BeginStructureElement ); mpPageSyncData->mParaStructElements.push_back( eType ); diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index 855e844caa1b..21ed0cc8e664 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -326,7 +326,7 @@ sal_Int32 PDFWriter::RegisterDestReference( sal_Int32 nDestId, const Rectangle& return pImplementation->registerDestReference( nDestId, rRect, nPageNr, eType ); } //--->i56629 -sal_Int32 PDFWriter::CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) +sal_Int32 PDFWriter::CreateNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) { return pImplementation->createNamedDest( sDestName, rRect, nPageNr, eType ); } @@ -340,7 +340,7 @@ sal_Int32 PDFWriter::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ) return pImplementation->setLinkDest( nLinkId, nDestId ); } -sal_Int32 PDFWriter::SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ) +sal_Int32 PDFWriter::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ) { return pImplementation->setLinkURL( nLinkId, rURL ); } @@ -350,7 +350,7 @@ void PDFWriter::SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyId ) pImplementation->setLinkPropertyId( nLinkId, nPropertyId ); } -sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const rtl::OUString& rText, sal_Int32 nDestID ) +sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const OUString& rText, sal_Int32 nDestID ) { return pImplementation->createOutlineItem( nParent, rText, nDestID ); } @@ -360,7 +360,7 @@ sal_Int32 PDFWriter::SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent return pImplementation->setOutlineItemParent( nItem, nNewParent ); } -sal_Int32 PDFWriter::SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText ) +sal_Int32 PDFWriter::SetOutlineItemText( sal_Int32 nItem, const OUString& rText ) { return pImplementation->setOutlineItemText( nItem, rText ); } @@ -375,7 +375,7 @@ void PDFWriter::CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_In pImplementation->createNote( rRect, rNote, nPageNr ); } -sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ) +sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ) { return pImplementation->beginStructureElement( eType, rAlias ); } @@ -445,8 +445,8 @@ std::set< PDFWriter::ErrorCode > PDFWriter::GetErrors() } com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > -PDFWriter::InitEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, +PDFWriter::InitEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ) { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index c7cf75b32adf..6eefa3c1b5f7 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -85,13 +85,6 @@ using namespace vcl; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; -using ::rtl::OStringHash; -using ::rtl::OUStringHash; -using ::rtl::OStringBuffer; -using ::rtl::OUStringBuffer; #if (OSL_DEBUG_LEVEL < 3) #define COMPRESS_PAGES @@ -129,9 +122,9 @@ void PDFTestOutputStream::write( const com::sun::star::uno::Reference< com::sun: void doTestCode() { static const char* pHome = getenv( "HOME" ); - rtl::OUString aTestFile( "file://" ); - aTestFile += rtl::OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 ); - aTestFile += rtl::OUString( "/pdf_export_test.pdf" ); + OUString aTestFile( "file://" ); + aTestFile += OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 ); + aTestFile += OUString( "/pdf_export_test.pdf" ); PDFWriter::PDFWriterContext aContext; aContext.URL = aTestFile; @@ -620,7 +613,7 @@ static void appendLiteralString( const sal_Char* pStr, sal_Int32 nLength, OStrin * Fhurter limitation: it is advisable to use standard ASCII characters for * OOo bookmarks. */ -static void appendDestinationName( const rtl::OUString& rString, OStringBuffer& rBuffer ) +static void appendDestinationName( const OUString& rString, OStringBuffer& rBuffer ) { const sal_Unicode* pStr = rString.getStr(); sal_Int32 nLen = rString.getLength(); @@ -645,7 +638,7 @@ static void appendDestinationName( const rtl::OUString& rString, OStringBuffer& } //<--- i56629 -static void appendUnicodeTextString( const rtl::OUString& rString, OStringBuffer& rBuffer ) +static void appendUnicodeTextString( const OUString& rString, OStringBuffer& rBuffer ) { rBuffer.append( "FEFF" ); const sal_Unicode* pStr = rString.getStr(); @@ -700,7 +693,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // find or create a hierarchical field // first find the fully qualified name up to this field aDomain = aFullName.copy( 0, nTokenIndex-1 ); - boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it == m_aFieldNameMap.end() ) { // create new hierarchy field @@ -761,7 +754,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // insert widget into its hierarchy field if( !aDomain.isEmpty() ) { - boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it != m_aFieldNameMap.end() ) { OSL_ENSURE( it->second >= 0 && it->second < sal_Int32( m_aWidgets.size() ), "invalid field index" ); @@ -1874,14 +1867,14 @@ void PDFWriterImpl::setupDocInfo() void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIdentifier, const vcl::PDFWriter::PDFDocInfo& i_rDocInfo, - rtl::OString& o_rCString1, - rtl::OString& o_rCString2 + OString& o_rCString1, + OString& o_rCString2 ) { o_rIdentifier.clear(); //build the document id - rtl::OString aInfoValuesOut; + OString aInfoValuesOut; OStringBuffer aID( 1024 ); if( i_rDocInfo.Title.Len() ) appendUnicodeTextString( i_rDocInfo.Title, aID ); @@ -1901,7 +1894,7 @@ void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIden osl_getSystemTime( &aGMT ); osl_getLocalTimeFromSystemTime( &aGMT, &aTVal ); osl_getDateTimeFromTimeValue( &aTVal, &aDT ); - rtl::OStringBuffer aCreationDateString(64), aCreationMetaDateString(64); + OStringBuffer aCreationDateString(64), aCreationMetaDateString(64); aCreationDateString.append( "D:" ); aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/1000)%10)) ); aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/100)%10)) ); @@ -2006,7 +1999,7 @@ void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIden check if the Unicode string must be encrypted or not, perform the requested task, append the string as unicode hex, encrypted if needed */ -inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) +inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) { rOutBuffer.append( "<" ); if( m_aContext.Encryption.Encrypt() ) @@ -2041,7 +2034,7 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const rtl::OUString& rOutBuffer.append( ">" ); } -inline void PDFWriterImpl::appendLiteralStringEncrypt( rtl::OStringBuffer& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ) +inline void PDFWriterImpl::appendLiteralStringEncrypt( OStringBuffer& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) { rOutBuffer.append( "(" ); sal_Int32 nChars = rInString.getLength(); @@ -2058,17 +2051,17 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt( rtl::OStringBuffer& rInSt rOutBuffer.append( ")" ); } -inline void PDFWriterImpl::appendLiteralStringEncrypt( const rtl::OString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ) +inline void PDFWriterImpl::appendLiteralStringEncrypt( const OString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) { - rtl::OStringBuffer aBufferString( rInString ); + OStringBuffer aBufferString( rInString ); appendLiteralStringEncrypt( aBufferString, nInObjectNumber, rOutBuffer); } -void PDFWriterImpl::appendLiteralStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc ) +void PDFWriterImpl::appendLiteralStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc ) { - rtl::OString aBufferString( rtl::OUStringToOString( rInString, nEnc ) ); + OString aBufferString( OUStringToOString( rInString, nEnc ) ); sal_Int32 nLen = aBufferString.getLength(); - rtl::OStringBuffer aBuf( nLen ); + OStringBuffer aBuf( nLen ); const sal_Char* pT = aBufferString.getStr(); for( sal_Int32 i = 0; i < nLen; i++, pT++ ) @@ -2247,8 +2240,8 @@ inline const ImplPdfBuiltinFontData* GetPdfFontData( const PhysicalFontFace* pFo static ImplDevFontAttributes GetDevFontAttributes( const PDFWriterImpl::BuiltinFont& rBuiltin ) { ImplDevFontAttributes aDFA; - aDFA.SetFamilyName( rtl::OUString::createFromAscii( rBuiltin.m_pName ) ); - aDFA.SetStyleName( rtl::OUString::createFromAscii( rBuiltin.m_pStyleName ) ); + aDFA.SetFamilyName( OUString::createFromAscii( rBuiltin.m_pName ) ); + aDFA.SetStyleName( OUString::createFromAscii( rBuiltin.m_pStyleName ) ); aDFA.SetFamilyType( rBuiltin.m_eFamily ); aDFA.SetSymbolFlag( rBuiltin.m_eCharSet != RTL_TEXTENCODING_MS_1252 ); aDFA.SetPitch( rBuiltin.m_ePitch ); @@ -2336,7 +2329,7 @@ public: const PDFWriterImpl::BuiltinFont&, long nPixelPerEM, int nOrientation ); - void SetText( const rtl::OUString& rText ) { maOrigText = rText; } + void SetText( const OUString& rText ) { maOrigText = rText; } virtual bool LayoutText( ImplLayoutArgs& ); virtual void InitFont() const; virtual void DrawText( SalGraphics& ) const; @@ -2361,7 +2354,7 @@ PDFSalLayout::PDFSalLayout( PDFWriterImpl& rPDFWriterImpl, bool PDFSalLayout::LayoutText( ImplLayoutArgs& rArgs ) { - const rtl::OUString aText(rArgs.mpStr+rArgs.mnMinCharPos, rArgs.mnEndCharPos-rArgs.mnMinCharPos); + const OUString aText(rArgs.mpStr+rArgs.mnMinCharPos, rArgs.mnEndCharPos-rArgs.mnMinCharPos); SetText( aText ); SetUnitsPerPixel( 1000 ); @@ -3106,7 +3099,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const PhysicalFo } sal_Int32 nFontDescriptor = 0; - rtl::OString aSubType( "/Type1" ); + OString aSubType( "/Type1" ); FontSubsetInfo aInfo; // fill in dummy values aInfo.m_nAscent = 1000; @@ -3136,7 +3129,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const PhysicalFo } else if( pFont->mbSubsettable ) { - aSubType = rtl::OString( "/TrueType" ); + aSubType = OString( "/TrueType" ); Int32Vector aGlyphWidths; Ucs2UIntMap aUnicodeMap; m_pReferenceDevice->mpGraphics->GetGlyphWidths( pFont, false, aGlyphWidths, aUnicodeMap ); @@ -3645,7 +3638,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical } else { - rtl::OStringBuffer aErrorComment( 256 ); + OStringBuffer aErrorComment( 256 ); aErrorComment.append( "GetEmbedFontData failed for font \"" ); aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) ); aErrorComment.append( '\"' ); @@ -3732,7 +3725,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical aUnicodes.clear(); for( std::vector< EmbedCode >::iterator str_it = enc_it->m_aEncVector.begin(); str_it != enc_it->m_aEncVector.end(); ++str_it ) { - rtl::OUString aStr( str_it->m_aUnicode ); + OUString aStr( str_it->m_aUnicode ); aEncWidths[nEncoded] = pRef->GetTextWidth( aStr ); nEncodedCodes[nEncoded] = str_it->m_aUnicode; nEncoding[nEncoded] = sal::static_int_cast(nEncoded); @@ -4234,7 +4227,7 @@ bool PDFWriterImpl::emitFonts() else { const PhysicalFontFace* pFont = it->first; - rtl::OStringBuffer aErrorComment( 256 ); + OStringBuffer aErrorComment( 256 ); aErrorComment.append( "CreateFontSubset failed for font \"" ); aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) ); aErrorComment.append( '\"' ); @@ -4617,7 +4610,7 @@ we check in the following sequence: } } - rtl::OUString aFileExtension = aTargetURL.GetFileExtension(); + OUString aFileExtension = aTargetURL.GetFileExtension(); // Check if the URL ends in '/': if yes it's a directory, // it will be forced to a URI link. @@ -4631,21 +4624,21 @@ we check in the following sequence: { sal_Int32 bChangeFileExtensionToPDF = false; //examine the file type (.odm .odt. .odp, odg, ods) - if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odm" ) ) ) + if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odm" ) ) ) bChangeFileExtensionToPDF = true; - if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odt" ) ) ) + if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odt" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odp" ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odp" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odg" ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odg" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "ods" ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "ods" ) ) ) bChangeFileExtensionToPDF = true; if( bChangeFileExtensionToPDF ) - aTargetURL.setExtension(rtl::OUString( "pdf" ) ); + aTargetURL.setExtension(OUString( "pdf" ) ); } //check if extension is pdf, see if GoToR should be forced - bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(rtl::OUString( "pdf" ) ); + bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(OUString( "pdf" ) ); if( m_aContext.ForcePDFAction && bTargetHasPDFExtension ) nSetGoToRMode++; } @@ -4668,7 +4661,7 @@ we check in the following sequence: if( m_aContext.RelFsys && eBaseProtocol == eTargetProtocol && eTargetProtocol == INET_PROT_FILE ) bSetRelative = true; - rtl::OUString aFragment = aTargetURL.GetMark( INetURLObject::NO_DECODE /*DECODE_WITH_CHARSET*/ ); //fragment as is, + OUString aFragment = aTargetURL.GetMark( INetURLObject::NO_DECODE /*DECODE_WITH_CHARSET*/ ); //fragment as is, if( nSetGoToRMode == 0 ) { switch( m_aContext.DefaultLinkAction ) @@ -4703,7 +4696,7 @@ we check in the following sequence: if( nSetGoToRMode ) { //add the fragment - rtl::OUString aURLNoMark = aTargetURL.GetURLNoMark( INetURLObject::DECODE_WITH_CHARSET ); + OUString aURLNoMark = aTargetURL.GetURLNoMark( INetURLObject::DECODE_WITH_CHARSET ); aLine.append("/GoToR"); aLine.append("/F"); bFileSpec = true; @@ -4729,7 +4722,7 @@ we check in the following sequence: //substitute the fragment aTargetURL.SetMark( aLineLoc.getStr() ); } - rtl::OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE ); + OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE ); appendLiteralStringEncrypt(bSetRelative ? INetURLObject::GetRelURL( m_aContext.BaseURL, aURL, INetURLObject::WAS_ENCODED, bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE @@ -5329,7 +5322,7 @@ bool PDFWriterImpl::emitAppearances( PDFWidget& rWidget, OStringBuffer& rAnnotDi { // TODO: check and insert default streams - rtl::OString aStandardAppearance; + OString aStandardAppearance; switch( rWidget.m_eType ) { case PDFWriter::CheckBox: @@ -5502,7 +5495,7 @@ bool PDFWriterImpl::emitWidgetAnnotations() appendUnicodeTextStringEncrypt( rWidget.m_aListEntries[ rWidget.m_aSelectedEntries[0] ], rWidget.m_nObject, aValue ); } else - appendUnicodeTextStringEncrypt( rtl::OUString(), rWidget.m_nObject, aValue ); + appendUnicodeTextStringEncrypt( OUString(), rWidget.m_nObject, aValue ); aLine.append( "Ch" ); break; case PDFWriter::ComboBox: @@ -6416,7 +6409,7 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations() OUString( "http://ahost.ax" ) ); //dummy location, won't be used aLocalURL.SetMark( rDest.m_aDestName ); - const rtl::OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as + const OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as // in link creation ( see PDFWriterImpl::emitLinkAnnotations ) const PDFPage& rDestPage = m_aPages[ rDest.m_nPage ]; @@ -6554,7 +6547,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() aLine.append( " 0 obj\n" "<'): - rValue += rtl::OUString( ">" ); + rValue += OUString( ">" ); break; case sal_Unicode('\''): - rValue += rtl::OUString( "'" ); + rValue += OUString( "'" ); break; case sal_Unicode('"'): - rValue += rtl::OUString( """ ); + rValue += OUString( """ ); break; default: - rValue += rtl::OUString( *pUni ); + rValue += OUString( *pUni ); break; } } @@ -6636,7 +6629,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " \n" ); aMetadataStream.append( " \n" ); aMetadataStream.append( " " ); - rtl::OUString aTitle; + OUString aTitle; escapeStringXML( m_aContext.DocumentInfo.Title, aTitle ); aMetadataStream.append( OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "\n" ); @@ -6648,7 +6641,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " \n" ); aMetadataStream.append( " \n" ); aMetadataStream.append( " " ); - rtl::OUString aAuthor; + OUString aAuthor; escapeStringXML( m_aContext.DocumentInfo.Author, aAuthor ); aMetadataStream.append( OUStringToOString( aAuthor , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "\n" ); @@ -6661,7 +6654,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " \n" ); aMetadataStream.append( " \n" ); aMetadataStream.append( " " ); - rtl::OUString aSubject; + OUString aSubject; escapeStringXML( m_aContext.DocumentInfo.Subject, aSubject ); aMetadataStream.append( OUStringToOString( aSubject , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "\n" ); @@ -6680,7 +6673,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() if( m_aContext.DocumentInfo.Producer.Len() ) { aMetadataStream.append( " " ); - rtl::OUString aProducer; + OUString aProducer; escapeStringXML( m_aContext.DocumentInfo.Producer, aProducer ); aMetadataStream.append( OUStringToOString( aProducer , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "\n" ); @@ -6688,7 +6681,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() if( m_aContext.DocumentInfo.Keywords.Len() ) { aMetadataStream.append( " " ); - rtl::OUString aKeywords; + OUString aKeywords; escapeStringXML( m_aContext.DocumentInfo.Keywords, aKeywords ); aMetadataStream.append( OUStringToOString( aKeywords , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "\n" ); @@ -6701,7 +6694,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() if( m_aContext.DocumentInfo.Creator.Len() ) { aMetadataStream.append( " " ); - rtl::OUString aCreator; + OUString aCreator; escapeStringXML( m_aContext.DocumentInfo.Creator, aCreator ); aMetadataStream.append( OUStringToOString( aCreator , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "\n" ); @@ -7328,7 +7321,7 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs, cChar -= 0xf000; else { - rtl::OString aChar(&cChar, 1, RTL_TEXTENCODING_MS_1252); + OString aChar(&cChar, 1, RTL_TEXTENCODING_MS_1252); cChar = ((sal_Ucs)aChar[0]) & 0x00ff; } } @@ -8116,7 +8109,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const String& rOrigStr, sa // multiline text if ( nStyle & TEXT_DRAW_MULTILINE ) { - rtl::OUString aLastLine; + OUString aLastLine; ImplMultiTextLineInfo aMultiLineInfo; ImplTextLineInfo* pLineInfo; xub_StrLen i; @@ -8580,7 +8573,7 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, long nWidth, FontStrik //See qadevOOo/testdocs/StrikeThrough.odt for examples if you need //to tweak this - rtl::OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? rtl::OUString("/") : rtl::OUString("X"); + OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? OUString("/") : OUString("X"); String aStrikeout = aStrikeoutChar; while( m_pReferenceDevice->GetTextWidth( aStrikeout ) < nWidth ) aStrikeout.Append( aStrikeout ); @@ -10869,7 +10862,7 @@ sal_Int32 PDFWriterImpl::createLink( const Rectangle& rRect, sal_Int32 nPageNr ) } //--->i56629 -sal_Int32 PDFWriterImpl::createNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) +sal_Int32 PDFWriterImpl::createNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) { if( nPageNr < 0 ) nPageNr = m_nCurrentPage; @@ -11155,7 +11148,7 @@ bool PDFWriterImpl::checkEmitStructure() return bEmit; } -sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ) +sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ) { if( m_nCurrentPage < 0 ) return -1; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b9fd8f8d143e..81ccbf649341 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -92,12 +92,12 @@ public: FontItalic m_eItalic; // Italic int m_aWidths[256]; // character metrics - rtl::OString getNameObject() const; + OString getNameObject() const; }; enum ResourceKind { ResXObject, ResExtGState, ResShading, ResPattern }; - typedef std::map< rtl::OString, sal_Int32 > ResourceMap; + typedef std::map< OString, sal_Int32 > ResourceMap; struct ResourceDict { // note: handle fonts globally for performance @@ -106,7 +106,7 @@ public: ResourceMap m_aShadings; ResourceMap m_aPatterns; - void append( rtl::OStringBuffer&, sal_Int32 nFontDictObject ); + void append( OStringBuffer&, sal_Int32 nFontDictObject ); }; struct PDFPage @@ -140,35 +140,35 @@ public: // to page (useful for transformation matrices // if pOutPoint is set it will be updated to the emitted point // (in PDF map mode, that is 10th of point) - void appendPoint( const Point& rPoint, rtl::OStringBuffer& rBuffer, bool bNeg = false, Point* pOutPoint = NULL ) const; + void appendPoint( const Point& rPoint, OStringBuffer& rBuffer, bool bNeg = false, Point* pOutPoint = NULL ) const; // appends a B2DPoint without further transformation - void appendPixelPoint( const basegfx::B2DPoint& rPoint, rtl::OStringBuffer& rBuffer ) const; + void appendPixelPoint( const basegfx::B2DPoint& rPoint, OStringBuffer& rBuffer ) const; // appends a rectangle - void appendRect( const Rectangle& rRect, rtl::OStringBuffer& rBuffer ) const; + void appendRect( const Rectangle& rRect, OStringBuffer& rBuffer ) const; // converts a rectangle to 10th points page space void convertRect( Rectangle& rRect ) const; // appends a polygon optionally closing it - void appendPolygon( const Polygon& rPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolygon( const Polygon& rPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polygon optionally closing it - void appendPolygon( const basegfx::B2DPolygon& rPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolygon( const basegfx::B2DPolygon& rPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polypolygon optionally closing the subpaths - void appendPolyPolygon( const PolyPolygon& rPolyPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolyPolygon( const PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polypolygon optionally closing the subpaths - void appendPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // converts a length (either vertical or horizontal; this // can be important if the source MapMode is not // symmetrical) to page length and appends it to the buffer // if pOutLength is set it will be updated to the emitted length // (in PDF map mode, that is 10th of point) - void appendMappedLength( sal_Int32 nLength, rtl::OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL ) const; + void appendMappedLength( sal_Int32 nLength, OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL ) const; // the same for double values - void appendMappedLength( double fLength, rtl::OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL, sal_Int32 nPrecision = 5 ) const; + void appendMappedLength( double fLength, OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL, sal_Int32 nPrecision = 5 ) const; // appends LineInfo // returns false if too many dash array entry were created for // the implementation limits of some PDF readers - bool appendLineInfo( const LineInfo& rInfo, rtl::OStringBuffer& rBuffer ) const; + bool appendLineInfo( const LineInfo& rInfo, OStringBuffer& rBuffer ) const; // appends a horizontal waveline with vertical offset (helper for drawWaveLine) - void appendWaveLine( sal_Int32 nLength, sal_Int32 nYOffset, sal_Int32 nDelta, rtl::OStringBuffer& rBuffer ) const; + void appendWaveLine( sal_Int32 nLength, sal_Int32 nYOffset, sal_Int32 nDelta, OStringBuffer& rBuffer ) const; sal_Int32 getWidth() const { return m_nPageWidth ? m_nPageWidth : m_pWriter->m_nInheritedPageWidth; } sal_Int32 getHeight() const { return m_nPageHeight ? m_nPageHeight : m_pWriter->m_nInheritedPageHeight; } @@ -345,7 +345,7 @@ public: struct EmbedCode { sal_Ucs m_aUnicode; - rtl::OString m_aName; + OString m_aName; }; struct EmbedEncoding { @@ -372,7 +372,7 @@ public: //--->i56629 struct PDFNamedDest { - rtl::OUString m_aDestName; + OUString m_aDestName; sal_Int32 m_nPage; PDFWriter::DestAreaType m_eType; Rectangle m_aRect; @@ -386,7 +386,7 @@ public: sal_Int32 m_nNextObject; sal_Int32 m_nPrevObject; std::vector< sal_Int32 > m_aChildren; - rtl::OUString m_aTitle; + OUString m_aTitle; sal_Int32 m_nDestID; PDFOutlineEntry() @@ -414,7 +414,7 @@ public: struct PDFLink : public PDFAnnotation { sal_Int32 m_nDest; // set to -1 for URL, to a dest else - rtl::OUString m_aURL; + OUString m_aURL; sal_Int32 m_nStructParent; // struct parent entry PDFLink() @@ -431,21 +431,21 @@ public: {} }; - typedef boost::unordered_map< rtl::OString, SvMemoryStream*, rtl::OStringHash > PDFAppearanceStreams; - typedef boost::unordered_map< rtl::OString, PDFAppearanceStreams, rtl::OStringHash > PDFAppearanceMap; + typedef boost::unordered_map< OString, SvMemoryStream*, OStringHash > PDFAppearanceStreams; + typedef boost::unordered_map< OString, PDFAppearanceStreams, OStringHash > PDFAppearanceMap; struct PDFWidget : public PDFAnnotation { PDFWriter::WidgetType m_eType; - rtl::OString m_aName; - rtl::OUString m_aDescription; - rtl::OUString m_aText; + OString m_aName; + OUString m_aDescription; + OUString m_aText; sal_uInt16 m_nTextStyle; - rtl::OUString m_aValue; - rtl::OString m_aDAString; - rtl::OString m_aDRDict; - rtl::OString m_aMKDict; - rtl::OString m_aMKDictCAString; // i12626, added to be able to encrypt the /CA text string + OUString m_aValue; + OString m_aDAString; + OString m_aDRDict; + OString m_aMKDict; + OString m_aMKDictCAString; // i12626, added to be able to encrypt the /CA text string // since the object number is not known at the moment // of filling m_aMKDict, the string will be encrypted when emitted. // the /CA string MUST BE the last added to m_aMKDict @@ -454,14 +454,14 @@ public: sal_Int32 m_nParent; // if not 0, parent's object number std::vector m_aKids; // widget children, contains object numbers std::vector m_aKidsIndex; // widget children, contains index to m_aWidgets - rtl::OUString m_aOnValue; + OUString m_aOnValue; sal_Int32 m_nTabOrder; // lowest number gets first in tab order sal_Int32 m_nRadioGroup; sal_Int32 m_nMaxLen; bool m_bSubmit; bool m_bSubmitGet; sal_Int32 m_nDest; - std::vector m_aListEntries; + std::vector m_aListEntries; std::vector m_aSelectedEntries; PDFAppearanceMap m_aAppearances; PDFWidget() @@ -514,7 +514,7 @@ public: { sal_Int32 m_nObject; PDFWriter::StructElement m_eType; - rtl::OString m_aAlias; + OString m_aAlias; sal_Int32 m_nOwnElement; // index into structure vector sal_Int32 m_nParentElement; // index into structure vector sal_Int32 m_nFirstPageObject; @@ -523,8 +523,8 @@ public: std::list< PDFStructureElementKid > m_aKids; PDFStructAttributes m_aAttributes; Rectangle m_aBBox; - rtl::OUString m_aActualText; - rtl::OUString m_aAltText; + OUString m_aActualText; + OUString m_aAltText; com::sun::star::lang::Locale m_aLocale; // m_aContents contains the element's marked content sequence @@ -544,7 +544,7 @@ public: struct PDFAddStream { - rtl::OUString m_aMimeType; + OUString m_aMimeType; PDFOutputStream* m_pStream; sal_Int32 m_nStreamObject; bool m_bCompress; @@ -632,13 +632,13 @@ private: */ sal_Int32 m_nCurrentStructElement; /* structure parent tree */ - std::vector< rtl::OString > m_aStructParentTree; + std::vector< OString > m_aStructParentTree; /* emit strucure marks currently (aka. NonStructElement or not) */ bool m_bEmitStructure; bool m_bNewMCID; /* role map of struct tree root */ - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > + boost::unordered_map< OString, OString, OStringHash > m_aRoleMap; /* contains all widgets used in the PDF @@ -647,7 +647,7 @@ private: /* maps radio group id to index of radio group control in m_aWidgets */ std::map< sal_Int32, sal_Int32 > m_aRadioGroupWidgets; /* boost::unordered_map for field names, used to ensure unique field names */ - boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash > m_aFieldNameMap; + boost::unordered_map< OString, sal_Int32, OStringHash > m_aFieldNameMap; /* contains Bitmaps for gradient functions until they are written * to the file stream */ @@ -807,9 +807,9 @@ i12626 /* the numerical value of the access permissions, according to PDF spec, must be signed */ sal_Int32 m_nAccessPermissions; /* string to hold the PDF creation date */ - rtl::OString m_aCreationDateString; + OString m_aCreationDateString; /* string to hold the PDF creation date, for PDF/A metadata */ - rtl::OString m_aCreationMetaDateString; + OString m_aCreationMetaDateString; /* the buffer where the data are encrypted, dynamically allocated */ sal_uInt8 *m_pEncryptionBuffer; /* size of the buffer */ @@ -826,19 +826,19 @@ i12626 void enableStringEncryption( register sal_Int32 nObject ); // test if the encryption is active, if yes than encrypt the unicode string and add to the OStringBuffer parameter - void appendUnicodeTextStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ); + void appendUnicodeTextStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ); - void appendLiteralStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc = RTL_TEXTENCODING_ASCII_US ); - void appendLiteralStringEncrypt( const rtl::OString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ); - void appendLiteralStringEncrypt( rtl::OStringBuffer& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ); + void appendLiteralStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc = RTL_TEXTENCODING_ASCII_US ); + void appendLiteralStringEncrypt( const OString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ); + void appendLiteralStringEncrypt( OStringBuffer& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ); /* creates fonts and subsets that will be emitted later */ void registerGlyphs( int nGlyphs, sal_GlyphId* pGlyphs, sal_Int32* pGlpyhWidths, sal_Ucs* pUnicodes, sal_Int32* pUnicodesPerGlyph, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, const PhysicalFontFace* pFallbackFonts[] ); /* emits a text object according to the passed layout */ /* TODO: remove rText as soon as SalLayout will change so that rText is not necessary anymore */ - void drawVerticalGlyphs( const std::vector& rGlyphs, rtl::OStringBuffer& rLine, const Point& rAlignOffset, const Matrix3& rRotScale, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight ); - void drawHorizontalGlyphs( const std::vector& rGlyphs, rtl::OStringBuffer& rLine, const Point& rAlignOffset, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight, sal_Int32 nPixelFontHeight ); + void drawVerticalGlyphs( const std::vector& rGlyphs, OStringBuffer& rLine, const Point& rAlignOffset, const Matrix3& rRotScale, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight ); + void drawHorizontalGlyphs( const std::vector& rGlyphs, OStringBuffer& rLine, const Point& rAlignOffset, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight, sal_Int32 nPixelFontHeight ); void drawLayout( SalLayout& rLayout, const String& rText, bool bTextLines ); void drawRelief( SalLayout& rLayout, const String& rText, bool bTextLines ); void drawShadow( SalLayout& rLayout, const String& rText, bool bTextLines ); @@ -899,9 +899,9 @@ i12626 return m_nFontDictObject; } /* push resource into current (redirected) resource dict */ - void pushResource( ResourceKind eKind, const rtl::OString& rResource, sal_Int32 nObject ); + void pushResource( ResourceKind eKind, const OString& rResource, sal_Int32 nObject ); - void appendBuiltinFontsToDict( rtl::OStringBuffer& rDict ) const; + void appendBuiltinFontsToDict( OStringBuffer& rDict ) const; /* writes a the font dictionary and emits all font objects * returns object id of font directory (or 0 on error) */ @@ -911,13 +911,13 @@ i12626 */ sal_Int32 emitResources(); // appends a dest - bool appendDest( sal_Int32 nDestID, rtl::OStringBuffer& rBuffer ); + bool appendDest( sal_Int32 nDestID, OStringBuffer& rBuffer ); // write all links bool emitLinkAnnotations(); // write all notes bool emitNoteAnnotations(); // write the appearance streams of a widget - bool emitAppearances( PDFWidget& rWidget, rtl::OStringBuffer& rAnnotDict ); + bool emitAppearances( PDFWidget& rWidget, OStringBuffer& rAnnotDict ); // clean up radio button "On" values void ensureUniqueRadioOnValues(); // write all widgets @@ -932,7 +932,7 @@ i12626 sal_Int32 emitOutline(); // puts the attribute objects of a structure element into the returned string, // helper for emitStructure - rtl::OString emitStructureAttributes( PDFStructureElement& rEle ); + OString emitStructureAttributes( PDFStructureElement& rEle ); //--->i94258 // the maximum array elements allowed for PDF array object static const sal_uInt32 ncMaxPDFArraySize = 8191; @@ -1023,7 +1023,7 @@ i12626 methods for PDF security pad a password according algorithm 3.2, step 1 */ - static void padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW ); + static void padPassword( const OUString& i_rPassword, sal_uInt8* o_pPaddedPW ); /* algorithm 3.2: compute an encryption key */ static bool computeEncryptionKey( EncHashTransporter*, vcl::PDFWriter::PDFEncryptionProperties& io_rProperties, @@ -1043,8 +1043,8 @@ i12626 static void computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIdentifier, const vcl::PDFWriter::PDFDocInfo& i_rDocInfo, - rtl::OString& o_rCString1, - rtl::OString& o_rCString2 + OString& o_rCString1, + OString& o_rCString2 ); static sal_Int32 computeAccessPermissions( const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties, sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength ); @@ -1063,15 +1063,15 @@ i12626 void writeG4Stream( BitmapReadAccess* i_pBitmap ); // color helper functions - void appendStrokingColor( const Color& rColor, rtl::OStringBuffer& rBuffer ); - void appendNonStrokingColor( const Color& rColor, rtl::OStringBuffer& rBuffer ); + void appendStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); + void appendNonStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); public: PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >&, PDFWriter& ); ~PDFWriterImpl(); static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > - initEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, + initEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ); /* for OutputDevice so the reference device can have a list @@ -1217,9 +1217,9 @@ public: bool bTextLines = true ); void drawText( const Rectangle& rRect, const String& rOrigStr, sal_uInt16 nStyle, bool bTextLines = true ); void drawTextLine( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bUnderlineAbove ); - void drawWaveTextLine( rtl::OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); - void drawStraightTextLine( rtl::OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); - void drawStrikeoutLine( rtl::OStringBuffer& aLine, long nWidth, FontStrikeout eStrikeout, Color aColor ); + void drawWaveTextLine( OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); + void drawStraightTextLine( OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); + void drawStrikeoutLine( OStringBuffer& aLine, long nWidth, FontStrikeout eStrikeout, Color aColor ); void drawStrikeoutChar( const Point& rPos, long nWidth, FontStrikeout eStrikeout ); void drawLine( const Point& rStart, const Point& rStop ); @@ -1251,7 +1251,7 @@ public: void emitComment( const char* pComment ); //--->i56629 named destinations - sal_Int32 createNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); + sal_Int32 createNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); //--->i59651 //emits output intent @@ -1265,19 +1265,19 @@ public: sal_Int32 createDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); sal_Int32 registerDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); sal_Int32 setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ); - sal_Int32 setLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ); + sal_Int32 setLinkURL( sal_Int32 nLinkId, const OUString& rURL ); void setLinkPropertyId( sal_Int32 nLinkId, sal_Int32 nPropertyId ); // outline - sal_Int32 createOutlineItem( sal_Int32 nParent = 0, const rtl::OUString& rText = rtl::OUString(), sal_Int32 nDestID = -1 ); + sal_Int32 createOutlineItem( sal_Int32 nParent = 0, const OUString& rText = OUString(), sal_Int32 nDestID = -1 ); sal_Int32 setOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent ); - sal_Int32 setOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText ); + sal_Int32 setOutlineItemText( sal_Int32 nItem, const OUString& rText ); sal_Int32 setOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID ); // notes void createNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 ); // structure elements - sal_Int32 beginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ); + sal_Int32 beginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ); void endStructureElement(); bool setCurrentStructureElement( sal_Int32 nElement ); bool setStructureAttribute( enum PDFWriter::StructAttribute eAttr, enum PDFWriter::StructAttributeValue eVal ); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 03401a3b99d9..1252a122e879 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -543,7 +543,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa { SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ ); sal_Bool bSkipSequence = sal_False; - rtl::OString sSeqEnd; + OString sSeqEnd; if( pA->GetComment() == "XPATHSTROKE_SEQ_BEGIN" ) { @@ -740,7 +740,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa pAction = aMtf.GetAction( i ); if ( pAction->GetType() == META_COMMENT_ACTION ) { - rtl::OString sComment( ((MetaCommentAction*)pAction)->GetComment() ); + OString sComment( ((MetaCommentAction*)pAction)->GetComment() ); if (sComment == sSeqEnd) break; } @@ -1185,8 +1185,8 @@ void PDFWriterImpl::enableStringEncryption( register sal_Int32 nObject ) 1. init the document id, used both for building the document id and for building the encryption key(s) 2. build the encryption key following algorithms described in the PDF specification */ -uno::Reference< beans::XMaterialHolder > PDFWriterImpl::initEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, +uno::Reference< beans::XMaterialHolder > PDFWriterImpl::initEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ) { @@ -1279,10 +1279,10 @@ begin i12626 methods Implements Algorithm 3.2, step 1 only */ -void PDFWriterImpl::padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW ) +void PDFWriterImpl::padPassword( const OUString& i_rPassword, sal_uInt8* o_pPaddedPW ) { // get ansi-1252 version of the password string CHECKIT ! i12626 - rtl::OString aString( rtl::OUStringToOString( i_rPassword, RTL_TEXTENCODING_MS_1252 ) ); + OString aString( OUStringToOString( i_rPassword, RTL_TEXTENCODING_MS_1252 ) ); //copy the string to the target sal_Int32 nToCopy = ( aString.getLength() < ENCRYPTED_PWD_SIZE ) ? aString.getLength() : ENCRYPTED_PWD_SIZE; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 920d8277ad46..12b184169036 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -160,15 +160,15 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile ) Sequence< Any > aArgs(1); PropertyValue aVal; - aVal.Name = rtl::OUString( "nodepath" ); + aVal.Name = OUString( "nodepath" ); if( i_bFile ) - aVal.Value <<= rtl::OUString( "/org.openoffice.Office.Common/Print/Option/File" ); + aVal.Value <<= OUString( "/org.openoffice.Office.Common/Print/Option/File" ); else - aVal.Value <<= rtl::OUString( "/org.openoffice.Office.Common/Print/Option/Printer" ); + aVal.Value <<= OUString( "/org.openoffice.Office.Common/Print/Option/Printer" ); aArgs.getArray()[0] <<= aVal; xConfigAccess = Reference< XNameAccess >( xConfigProvider->createInstanceWithArguments( - rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ), + OUString( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ), UNO_QUERY ); if( xConfigAccess.is() ) { @@ -326,7 +326,7 @@ ImplPrnQueueList::~ImplPrnQueueList() void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) { - boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >::iterator it = + boost::unordered_map< OUString, sal_Int32, OUStringHash >::iterator it = m_aNameToIndex.find( pData->maPrinterName ); if( it == m_aNameToIndex.end() ) { @@ -348,10 +348,10 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) // ----------------------------------------------------------------------- -ImplPrnQueueData* ImplPrnQueueList::Get( const rtl::OUString& rPrinter ) +ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter ) { ImplPrnQueueData* pData = NULL; - boost::unordered_map::iterator it = + boost::unordered_map::iterator it = m_aNameToIndex.find( rPrinter ); if( it != m_aNameToIndex.end() ) pData = &m_aQueueInfos[it->second]; @@ -387,7 +387,7 @@ void ImplDeletePrnQueueList() // ----------------------------------------------------------------------- -const std::vector& Printer::GetPrinterQueues() +const std::vector& Printer::GetPrinterQueues() { ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maGDIData.mpPrinterQueueList ) @@ -396,7 +396,7 @@ const std::vector& Printer::GetPrinterQueues() } // ----------------------------------------------------------------------- -const QueueInfo* Printer::GetQueueInfo( const rtl::OUString& rPrinterName, bool bStatusUpdate ) +const QueueInfo* Printer::GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate ) { ImplSVData* pSVData = ImplGetSVData(); @@ -425,7 +425,7 @@ const QueueInfo* Printer::GetQueueInfo( const rtl::OUString& rPrinterName, bool // ----------------------------------------------------------------------- -rtl::OUString Printer::GetDefaultPrinterName() +OUString Printer::GetDefaultPrinterName() { static const char* pEnv = getenv( "SAL_DISABLE_DEFAULTPRINTER" ); if( !pEnv || !*pEnv ) @@ -434,7 +434,7 @@ rtl::OUString Printer::GetDefaultPrinterName() return pSVData->mpDefInst->GetDefaultPrinter(); } - return rtl::OUString(); + return OUString(); } // ======================================================================= @@ -549,8 +549,8 @@ void Printer::ImplInitDisplay( const Window* pWindow ) // ----------------------------------------------------------------------- -SalPrinterQueueInfo* Printer::ImplGetQueueInfo( const rtl::OUString& rPrinterName, - const rtl::OUString* pDriver ) +SalPrinterQueueInfo* Printer::ImplGetQueueInfo( const OUString& rPrinterName, + const OUString* pDriver ) { ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maGDIData.mpPrinterQueueList ) @@ -666,7 +666,7 @@ Printer::Printer( const QueueInfo& rQueueInfo ) // ----------------------------------------------------------------------- -Printer::Printer( const rtl::OUString& rPrinterName ) +Printer::Printer( const OUString& rPrinterName ) { ImplInitData(); SalPrinterQueueInfo* pInfo = ImplGetQueueInfo( rPrinterName, NULL ); @@ -934,7 +934,7 @@ sal_Bool Printer::SetPrinterProps( const Printer* pPrinter ) } // Neuen Printer bauen - rtl::OUString aDriver = pPrinter->GetDriverName(); + OUString aDriver = pPrinter->GetDriverName(); SalPrinterQueueInfo* pInfo = ImplGetQueueInfo( pPrinter->GetName(), &aDriver ); if ( pInfo ) { @@ -1239,12 +1239,12 @@ int Printer::GetPaperInfoCount() const // ----------------------------------------------------------------------- -rtl::OUString Printer::GetPaperName( Paper ePaper ) +OUString Printer::GetPaperName( Paper ePaper ) { ImplSVData* pSVData = ImplGetSVData(); if( ! pSVData->mpPaperNames ) { - pSVData->mpPaperNames = new boost::unordered_map< int, rtl::OUString >(); + pSVData->mpPaperNames = new boost::unordered_map< int, OUString >(); if( ImplGetResMgr() ) { ResStringArray aPaperStrings( VclResId( RID_STR_PAPERNAMES ) ); @@ -1265,19 +1265,19 @@ rtl::OUString Printer::GetPaperName( Paper ePaper ) } } - boost::unordered_map::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper ); - return (it != pSVData->mpPaperNames->end()) ? it->second : rtl::OUString(); + boost::unordered_map::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper ); + return (it != pSVData->mpPaperNames->end()) ? it->second : OUString(); } // ----------------------------------------------------------------------- -rtl::OUString Printer::GetPaperName( bool i_bPaperUser ) const +OUString Printer::GetPaperName( bool i_bPaperUser ) const { Size aPageSize = PixelToLogic( GetPaperSizePixel(), MAP_100TH_MM ); Paper ePaper = ImplGetPaperFormat( aPageSize.Width(), aPageSize.Height() ); if( ePaper == PAPER_USER ) ePaper = ImplGetPaperFormat( aPageSize.Height(), aPageSize.Width() ); - return (ePaper != PAPER_USER || i_bPaperUser ) ? GetPaperName( ePaper ) : rtl::OUString(); + return (ePaper != PAPER_USER || i_bPaperUser ) ? GetPaperName( ePaper ) : OUString(); } // ----------------------------------------------------------------------- @@ -1356,7 +1356,7 @@ sal_uInt16 Printer::GetPaperBinCount() const // ----------------------------------------------------------------------- -rtl::OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const +OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const { if ( IsDisplayPrinter() ) return ImplGetSVEmptyStr(); @@ -1425,7 +1425,7 @@ sal_Bool Printer::EndJob() mbPrinting = sal_False; mnCurPrintPage = 0; - maJobName = rtl::OUString(); + maJobName = OUString(); mbDevOutput = sal_False; bRet = mpPrinter->EndJob(); diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index c7ec909f1a1a..3d0e4b0390b5 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -130,15 +130,15 @@ class vcl::ImplPrinterControllerData public: struct ControlDependency { - rtl::OUString maDependsOnName; + OUString maDependsOnName; sal_Int32 mnDependsOnEntry; ControlDependency() : mnDependsOnEntry( -1 ) {} }; - typedef boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap; - typedef boost::unordered_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap; - typedef boost::unordered_map< rtl::OUString, Sequence< sal_Bool >, rtl::OUStringHash > ChoiceDisableMap; + typedef boost::unordered_map< OUString, size_t, OUStringHash > PropertyToIndexMap; + typedef boost::unordered_map< OUString, ControlDependency, OUStringHash > ControlDependencyMap; + typedef boost::unordered_map< OUString, Sequence< sal_Bool >, OUStringHash > ChoiceDisableMap; boost::shared_ptr mpPrinter; Sequence< PropertyValue > maUIOptions; @@ -211,9 +211,9 @@ PrinterController::PrinterController( const boost::shared_ptr& i_pPrint mpImplData->mpPrinter = i_pPrinter; } -static rtl::OUString queryFile( Printer* pPrinter ) +static OUString queryFile( Printer* pPrinter ) { - rtl::OUString aResult; + OUString aResult; uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference< ui::dialogs::XFilePicker3 > xFilePicker = ui::dialogs::FilePicker::createWithMode(xContext, ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION); @@ -236,7 +236,7 @@ static rtl::OUString queryFile( Printer* pPrinter ) xFilePicker->appendFilter( OUString( "Portable Document Format" ), OUString( "*.pdf" ) ); #elif defined WNT (void)pPrinter; - xFilePicker->appendFilter( ::rtl::OUString( "*.PRN" ), ::rtl::OUString( "*.prn" ) ); + xFilePicker->appendFilter( OUString( "*.PRN" ), OUString( "*.prn" ) ); #endif // add arbitrary files xFilePicker->appendFilter(VclResId(SV_STDTEXT_ALLFILETYPES), "*.*"); @@ -248,7 +248,7 @@ static rtl::OUString queryFile( Printer* pPrinter ) if( xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK ) { - uno::Sequence< ::rtl::OUString > aPathSeq( xFilePicker->getFiles() ); + uno::Sequence< OUString > aPathSeq( xFilePicker->getFiles() ); INetURLObject aObj( aPathSeq[0] ); aResult = aObj.PathToFileName(); } @@ -284,7 +284,7 @@ void Printer::PrintJob( const boost::shared_ptr& i_pControlle ) { sal_Bool bSynchronous = sal_False; - beans::PropertyValue* pVal = i_pController->getValue( rtl::OUString( "Wait" ) ); + beans::PropertyValue* pVal = i_pController->getValue( OUString( "Wait" ) ); if( pVal ) pVal->Value >>= bSynchronous; @@ -313,7 +313,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr& i_pContr ErrorBox aBox( NULL, VclResId( SV_PRINT_NOPRINTERWARNING ) ); aBox.Execute(); } - pController->setValue( rtl::OUString( "IsDirect" ), + pController->setValue( OUString( "IsDirect" ), makeAny( sal_False ) ); } @@ -323,7 +323,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr& i_pContr // if no specific printer is already set, create the default printer if( ! pController->getPrinter() ) { - rtl::OUString aPrinterName( i_rInitSetup.GetPrinterName() ); + OUString aPrinterName( i_rInitSetup.GetPrinterName() ); boost::shared_ptr pPrinter( new Printer( aPrinterName ) ); pPrinter->SetJobSetup( i_rInitSetup ); pController->setPrinter( pPrinter ); @@ -350,7 +350,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr& i_pContr beans::PropertyValue* pPagesVal = i_pController->getValue( OUString( "Pages" ) ); if( pPagesVal ) { - rtl::OUString aPagesVal; + OUString aPagesVal; pPagesVal->Value >>= aPagesVal; if( !aPagesVal.isEmpty() ) { @@ -374,7 +374,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr& i_pContr { // do not overwrite PageRange if it is already set beans::PropertyValue* pRangeVal = i_pController->getValue( OUString( "PageRange" ) ); - rtl::OUString aRange; + OUString aRange; if( pRangeVal ) pRangeVal->Value >>= aRange; if( aRange.isEmpty() ) @@ -382,7 +382,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr& i_pContr sal_Int32 nPages = i_pController->getPageCount(); if( nPages > 0 ) { - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.appendAscii( "1" ); if( nPages > 1 ) { @@ -405,35 +405,35 @@ void Printer::ImplPrintJob( const boost::shared_ptr& i_pContr } // setup NUp printing from properties - sal_Int32 nRows = i_pController->getIntProperty( rtl::OUString( "NUpRows" ), 1 ); - sal_Int32 nCols = i_pController->getIntProperty( rtl::OUString( "NUpColumns" ), 1 ); + sal_Int32 nRows = i_pController->getIntProperty( OUString( "NUpRows" ), 1 ); + sal_Int32 nCols = i_pController->getIntProperty( OUString( "NUpColumns" ), 1 ); if( nRows > 1 || nCols > 1 ) { PrinterController::MultiPageSetup aMPS; aMPS.nRows = nRows > 1 ? nRows : 1; aMPS.nColumns = nCols > 1 ? nCols : 1; - sal_Int32 nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginLeft" ), aMPS.nLeftMargin ); + sal_Int32 nValue = i_pController->getIntProperty( OUString( "NUpPageMarginLeft" ), aMPS.nLeftMargin ); if( nValue >= 0 ) aMPS.nLeftMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginRight" ), aMPS.nRightMargin ); + nValue = i_pController->getIntProperty( OUString( "NUpPageMarginRight" ), aMPS.nRightMargin ); if( nValue >= 0 ) aMPS.nRightMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginTop" ), aMPS.nTopMargin ); + nValue = i_pController->getIntProperty( OUString( "NUpPageMarginTop" ), aMPS.nTopMargin ); if( nValue >= 0 ) aMPS.nTopMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginBottom" ), aMPS.nBottomMargin ); + nValue = i_pController->getIntProperty( OUString( "NUpPageMarginBottom" ), aMPS.nBottomMargin ); if( nValue >= 0 ) aMPS.nBottomMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpHorizontalSpacing" ), aMPS.nHorizontalSpacing ); + nValue = i_pController->getIntProperty( OUString( "NUpHorizontalSpacing" ), aMPS.nHorizontalSpacing ); if( nValue >= 0 ) aMPS.nHorizontalSpacing = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpVerticalSpacing" ), aMPS.nVerticalSpacing ); + nValue = i_pController->getIntProperty( OUString( "NUpVerticalSpacing" ), aMPS.nVerticalSpacing ); if( nValue >= 0 ) aMPS.nVerticalSpacing = nValue; - aMPS.bDrawBorder = i_pController->getBoolProperty( rtl::OUString( "NUpDrawBorder" ), aMPS.bDrawBorder ); + aMPS.bDrawBorder = i_pController->getBoolProperty( OUString( "NUpDrawBorder" ), aMPS.bDrawBorder ); aMPS.nOrder = static_cast(i_pController->getIntProperty( OUString( "NUpSubPageOrder" ), aMPS.nOrder )); aMPS.aPaperSize = i_pController->getPrinter()->PixelToLogic( i_pController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ); - beans::PropertyValue* pPgSizeVal = i_pController->getValue( rtl::OUString( "NUpPaperSize" ) ); + beans::PropertyValue* pPgSizeVal = i_pController->getValue( OUString( "NUpPaperSize" ) ); awt::Size aSizeVal; if( pPgSizeVal && (pPgSizeVal->Value >>= aSizeVal) ) { @@ -473,18 +473,18 @@ void Printer::ImplPrintJob( const boost::shared_ptr& i_pContr } if( aDlg.isPrintToFile() ) { - rtl::OUString aFile = queryFile( pController->getPrinter().get() ); + OUString aFile = queryFile( pController->getPrinter().get() ); if( aFile.isEmpty() ) { i_pController->abortJob(); return; } - pController->setValue( rtl::OUString( "LocalFileName" ), + pController->setValue( OUString( "LocalFileName" ), makeAny( aFile ) ); } else if( aDlg.isSingleJobs() ) { - pController->setValue( rtl::OUString( "PrintCollateAsSingleJobs" ), + pController->setValue( OUString( "PrintCollateAsSingleJobs" ), makeAny( sal_True ) ); } } @@ -495,8 +495,8 @@ void Printer::ImplPrintJob( const boost::shared_ptr& i_pContr pController->pushPropertiesToPrinter(); - rtl::OUString aJobName; - beans::PropertyValue* pJobNameVal = pController->getValue( rtl::OUString( "JobName" ) ); + OUString aJobName; + beans::PropertyValue* pJobNameVal = pController->getValue( OUString( "JobName" ) ); if( pJobNameVal ) pJobNameVal->Value >>= aJobName; @@ -505,7 +505,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr& i_pContr pController->jobFinished( pController->getJobState() ); } -bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr& i_pController ) +bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr& i_pController ) { mnError = PRINTER_OK; @@ -547,16 +547,16 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptrgetValue( rtl::OUString( "PrintCollateAsSingleJobs" ) ); + beans::PropertyValue* pSingleValue = i_pController->getValue( OUString( "PrintCollateAsSingleJobs" ) ); if( pSingleValue ) { pSingleValue->Value >>= bSinglePrintJobs; } - beans::PropertyValue* pFileValue = i_pController->getValue( rtl::OUString( "LocalFileName" ) ); + beans::PropertyValue* pFileValue = i_pController->getValue( OUString( "LocalFileName" ) ); if( pFileValue ) { - rtl::OUString aFile; + OUString aFile; pFileValue->Value >>= aFile; if( !aFile.isEmpty() ) { @@ -566,7 +566,7 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptrReadFromConfig( mbPrintFile ); @@ -721,8 +721,8 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptrisShowDialogs() && ! i_pController->isDirectPrint() ) { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPrinterUsed" ), + pItem->setValue( OUString( "PrintDialog" ), + OUString( "LastPrinterUsed" ), GetName() ); } @@ -753,8 +753,8 @@ const boost::shared_ptr& PrinterController::getPrinter() const void PrinterController::setPrinter( const boost::shared_ptr& i_rPrinter ) { mpImplData->mpPrinter = i_rPrinter; - setValue( rtl::OUString( "Name" ), - makeAny( rtl::OUString( i_rPrinter->GetName() ) ) ); + setValue( OUString( "Name" ), + makeAny( OUString( i_rPrinter->GetName() ) ) ); mpImplData->mnDefaultPaperBin = mpImplData->mpPrinter->GetPaperBin(); mpImplData->mnFixedPaperBin = -1; } @@ -791,7 +791,7 @@ bool PrinterController::setupPrinter( Window* i_pParent ) awt::Size aOverrideSize; aOverrideSize.Width = aNewPaperSize.Width(); aOverrideSize.Height = aNewPaperSize.Height(); - setValue( rtl::OUString( "OverridePageSize" ), + setValue( OUString( "OverridePageSize" ), makeAny( aOverrideSize ) ); mpImplData->mnFixedPaperBin = nNewPaperBin; } @@ -1286,7 +1286,7 @@ bool PrinterController::getReversePrint() const Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< PropertyValue >& i_rMergeList ) const { - boost::unordered_set< rtl::OUString, rtl::OUStringHash > aMergeSet; + boost::unordered_set< OUString, OUStringHash > aMergeSet; size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3; for( int i = 0; i < i_rMergeList.getLength(); i++ ) aMergeSet.insert( i_rMergeList[i].Name ); @@ -1301,26 +1301,26 @@ Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< P aResult[nCur++] = mpImplData->maUIProperties[i]; } // append IsFirstPage - if( aMergeSet.find( rtl::OUString( "IsFirstPage" ) ) == aMergeSet.end() ) + if( aMergeSet.find( OUString( "IsFirstPage" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = rtl::OUString( "IsFirstPage" ); + aVal.Name = OUString( "IsFirstPage" ); aVal.Value <<= mpImplData->mbFirstPage; aResult[nCur++] = aVal; } // append IsLastPage - if( aMergeSet.find( rtl::OUString( "IsLastPage" ) ) == aMergeSet.end() ) + if( aMergeSet.find( OUString( "IsLastPage" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = rtl::OUString( "IsLastPage" ); + aVal.Name = OUString( "IsLastPage" ); aVal.Value <<= mpImplData->mbLastPage; aResult[nCur++] = aVal; } // append IsPrinter - if( aMergeSet.find( rtl::OUString( "IsPrinter" ) ) == aMergeSet.end() ) + if( aMergeSet.find( OUString( "IsPrinter" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = rtl::OUString( "IsPrinter" ); + aVal.Name = OUString( "IsPrinter" ); aVal.Value <<= sal_True; aResult[nCur++] = aVal; } @@ -1333,21 +1333,21 @@ const Sequence< beans::PropertyValue >& PrinterController::getUIOptions() const return mpImplData->maUIOptions; } -beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) +beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } -const beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) const +const beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) const { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } -void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rValue ) +void PrinterController::setValue( const OUString& i_rName, const Any& i_rValue ) { beans::PropertyValue aVal; aVal.Name = i_rName; @@ -1358,7 +1358,7 @@ void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rVa void PrinterController::setValue( const beans::PropertyValue& i_rValue ) { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rValue.Name ); if( it != mpImplData->maPropertyToIndex.end() ) mpImplData->maUIProperties[ it->second ] = i_rValue; @@ -1383,7 +1383,7 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_ i_rOptions[i].Value >>= aOptProp; bool bIsEnabled = true; bool bHaveProperty = false; - rtl::OUString aPropName; + OUString aPropName; vcl::ImplPrinterControllerData::ControlDependency aDep; Sequence< sal_Bool > aChoicesDisabled; for( int n = 0; n < aOptProp.getLength(); n++ ) @@ -1435,10 +1435,10 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_ } } -bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) const +bool PrinterController::isUIOptionEnabled( const OUString& i_rProperty ) const { bool bEnabled = false; - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator prop_it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator prop_it = mpImplData->maPropertyToIndex.find( i_rProperty ); if( prop_it != mpImplData->maPropertyToIndex.end() ) { @@ -1489,7 +1489,7 @@ bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) co return bEnabled; } -bool PrinterController::isUIChoiceEnabled( const rtl::OUString& i_rProperty, sal_Int32 i_nValue ) const +bool PrinterController::isUIChoiceEnabled( const OUString& i_rProperty, sal_Int32 i_nValue ) const { bool bEnabled = true; ImplPrinterControllerData::ChoiceDisableMap::const_iterator it = @@ -1503,9 +1503,9 @@ bool PrinterController::isUIChoiceEnabled( const rtl::OUString& i_rProperty, sal return bEnabled; } -rtl::OUString PrinterController::getDependency( const rtl::OUString& i_rProperty ) const +OUString PrinterController::getDependency( const OUString& i_rProperty ) const { - rtl::OUString aDependency; + OUString aDependency; vcl::ImplPrinterControllerData::ControlDependencyMap::const_iterator it = mpImplData->maControlDependencies.find( i_rProperty ); @@ -1515,9 +1515,9 @@ rtl::OUString PrinterController::getDependency( const rtl::OUString& i_rProperty return aDependency; } -rtl::OUString PrinterController::makeEnabled( const rtl::OUString& i_rProperty ) +OUString PrinterController::makeEnabled( const OUString& i_rProperty ) { - rtl::OUString aDependency; + OUString aDependency; vcl::ImplPrinterControllerData::ControlDependencyMap::const_iterator it = mpImplData->maControlDependencies.find( i_rProperty ); @@ -1565,12 +1565,12 @@ void PrinterController::createProgressDialog() if( ! mpImplData->mpProgress ) { sal_Bool bShow = sal_True; - beans::PropertyValue* pMonitor = getValue( rtl::OUString( "MonitorVisible" ) ); + beans::PropertyValue* pMonitor = getValue( OUString( "MonitorVisible" ) ); if( pMonitor ) pMonitor->Value >>= bShow; else { - const com::sun::star::beans::PropertyValue* pVal = getValue( rtl::OUString( "IsApi" ) ); + const com::sun::star::beans::PropertyValue* pVal = getValue( OUString( "IsApi" ) ); if( pVal ) { sal_Bool bApi = sal_False; @@ -1608,17 +1608,17 @@ void PrinterController::pushPropertiesToPrinter() { sal_Int32 nCopyCount = 1; // set copycount and collate - const beans::PropertyValue* pVal = getValue( rtl::OUString( "CopyCount" ) ); + const beans::PropertyValue* pVal = getValue( OUString( "CopyCount" ) ); if( pVal ) pVal->Value >>= nCopyCount; sal_Bool bCollate = sal_False; - pVal = getValue( rtl::OUString( "Collate" ) ); + pVal = getValue( OUString( "Collate" ) ); if( pVal ) pVal->Value >>= bCollate; mpImplData->mpPrinter->SetCopyCount( static_cast(nCopyCount), bCollate ); // duplex mode - pVal = getValue( rtl::OUString( "DuplexMode" ) ); + pVal = getValue( OUString( "DuplexMode" ) ); if( pVal ) { sal_Int16 nDuplex = view::DuplexMode::UNKNOWN; @@ -1634,17 +1634,17 @@ void PrinterController::pushPropertiesToPrinter() bool PrinterController::isShowDialogs() const { - sal_Bool bApi = getBoolProperty( rtl::OUString( "IsApi" ), sal_False ); + sal_Bool bApi = getBoolProperty( OUString( "IsApi" ), sal_False ); return ! bApi && ! Application::IsHeadlessModeEnabled(); } bool PrinterController::isDirectPrint() const { - sal_Bool bDirect = getBoolProperty( rtl::OUString( "IsDirect" ), sal_False ); + sal_Bool bDirect = getBoolProperty( OUString( "IsDirect" ), sal_False ); return bDirect == sal_True; } -sal_Bool PrinterController::getBoolProperty( const rtl::OUString& i_rProperty, sal_Bool i_bFallback ) const +sal_Bool PrinterController::getBoolProperty( const OUString& i_rProperty, sal_Bool i_bFallback ) const { sal_Bool bRet = i_bFallback; const com::sun::star::beans::PropertyValue* pVal = getValue( i_rProperty ); @@ -1653,7 +1653,7 @@ sal_Bool PrinterController::getBoolProperty( const rtl::OUString& i_rProperty, s return bRet; } -sal_Int32 PrinterController::getIntProperty( const rtl::OUString& i_rProperty, sal_Int32 i_nFallback ) const +sal_Int32 PrinterController::getIntProperty( const OUString& i_rProperty, sal_Int32 i_nFallback ) const { sal_Int32 nRet = i_nFallback; const com::sun::star::beans::PropertyValue* pVal = getValue( i_rProperty ); @@ -1665,39 +1665,39 @@ sal_Int32 PrinterController::getIntProperty( const rtl::OUString& i_rProperty, s /* * PrinterOptionsHelper **/ -Any PrinterOptionsHelper::getValue( const rtl::OUString& i_rPropertyName ) const +Any PrinterOptionsHelper::getValue( const OUString& i_rPropertyName ) const { Any aRet; - boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, Any, OUStringHash >::const_iterator it = m_aPropertyMap.find( i_rPropertyName ); if( it != m_aPropertyMap.end() ) aRet = it->second; return aRet; } -sal_Bool PrinterOptionsHelper::getBoolValue( const rtl::OUString& i_rPropertyName, sal_Bool i_bDefault ) const +sal_Bool PrinterOptionsHelper::getBoolValue( const OUString& i_rPropertyName, sal_Bool i_bDefault ) const { sal_Bool bRet = sal_False; Any aVal( getValue( i_rPropertyName ) ); return (aVal >>= bRet) ? bRet : i_bDefault; } -sal_Int64 PrinterOptionsHelper::getIntValue( const rtl::OUString& i_rPropertyName, sal_Int64 i_nDefault ) const +sal_Int64 PrinterOptionsHelper::getIntValue( const OUString& i_rPropertyName, sal_Int64 i_nDefault ) const { sal_Int64 nRet = 0; Any aVal( getValue( i_rPropertyName ) ); return (aVal >>= nRet) ? nRet : i_nDefault; } -rtl::OUString PrinterOptionsHelper::getStringValue( const rtl::OUString& i_rPropertyName, const rtl::OUString& i_rDefault ) const +OUString PrinterOptionsHelper::getStringValue( const OUString& i_rPropertyName, const OUString& i_rDefault ) const { - rtl::OUString aRet; + OUString aRet; Any aVal( getValue( i_rPropertyName ) ); return (aVal >>= aRet) ? aRet : i_rDefault; } bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i_rNewProp, - std::set< rtl::OUString >* o_pChangeProp ) + std::set< OUString >* o_pChangeProp ) { bool bChanged = false; @@ -1710,7 +1710,7 @@ bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i for( sal_Int32 i = 0; i < nElements; i++ ) { bool bElementChanged = false; - boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::iterator it = + boost::unordered_map< OUString, Any, OUStringHash >::iterator it = m_aPropertyMap.find( pVals[ i ].Name ); if( it != m_aPropertyMap.end() ) { @@ -1738,16 +1738,16 @@ void PrinterOptionsHelper::appendPrintUIOptions( uno::Sequence< beans::PropertyV sal_Int32 nIndex = io_rProps.getLength(); io_rProps.realloc( nIndex+1 ); PropertyValue aVal; - aVal.Name = rtl::OUString( "ExtraPrintUIOptions" ); + aVal.Name = OUString( "ExtraPrintUIOptions" ); aVal.Value = makeAny( m_aUIProperties ); io_rProps[ nIndex ] = aVal; } } -Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs, - const rtl::OUString& i_rTitle, - const Sequence< rtl::OUString >& i_rHelpIds, - const rtl::OUString& i_rType, +Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs, + const OUString& i_rTitle, + const Sequence< OUString >& i_rHelpIds, + const OUString& i_rType, const PropertyValue* i_pVal, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { @@ -1774,51 +1774,51 @@ Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< r sal_Int32 nUsed = 0; if( !i_rTitle.isEmpty() ) { - aCtrl[nUsed ].Name = rtl::OUString( "Text" ); + aCtrl[nUsed ].Name = OUString( "Text" ); aCtrl[nUsed++].Value = makeAny( i_rTitle ); } if( i_rHelpIds.getLength() ) { - aCtrl[nUsed ].Name = rtl::OUString( "HelpId" ); + aCtrl[nUsed ].Name = OUString( "HelpId" ); aCtrl[nUsed++].Value = makeAny( i_rHelpIds ); } - aCtrl[nUsed ].Name = rtl::OUString( "ControlType" ); + aCtrl[nUsed ].Name = OUString( "ControlType" ); aCtrl[nUsed++].Value = makeAny( i_rType ); - aCtrl[nUsed ].Name = rtl::OUString( "ID" ); + aCtrl[nUsed ].Name = OUString( "ID" ); aCtrl[nUsed++].Value = makeAny( i_rIDs ); if( i_pVal ) { - aCtrl[nUsed ].Name = rtl::OUString( "Property" ); + aCtrl[nUsed ].Name = OUString( "Property" ); aCtrl[nUsed++].Value = makeAny( *i_pVal ); } if( !i_rControlOptions.maDependsOnName.isEmpty() ) { - aCtrl[nUsed ].Name = rtl::OUString( "DependsOnName" ); + aCtrl[nUsed ].Name = OUString( "DependsOnName" ); aCtrl[nUsed++].Value = makeAny( i_rControlOptions.maDependsOnName ); if( i_rControlOptions.mnDependsOnEntry != -1 ) { - aCtrl[nUsed ].Name = rtl::OUString( "DependsOnEntry" ); + aCtrl[nUsed ].Name = OUString( "DependsOnEntry" ); aCtrl[nUsed++].Value = makeAny( i_rControlOptions.mnDependsOnEntry ); } if( i_rControlOptions.mbAttachToDependency ) { - aCtrl[nUsed ].Name = rtl::OUString( "AttachToDependency" ); + aCtrl[nUsed ].Name = OUString( "AttachToDependency" ); aCtrl[nUsed++].Value = makeAny( i_rControlOptions.mbAttachToDependency ); } } if( !i_rControlOptions.maGroupHint.isEmpty() ) { - aCtrl[nUsed ].Name = rtl::OUString( "GroupingHint" ); + aCtrl[nUsed ].Name = OUString( "GroupingHint" ); aCtrl[nUsed++].Value <<= i_rControlOptions.maGroupHint; } if( i_rControlOptions.mbInternalOnly ) { - aCtrl[nUsed ].Name = rtl::OUString( "InternalUIOnly" ); + aCtrl[nUsed ].Name = OUString( "InternalUIOnly" ); aCtrl[nUsed++].Value <<= sal_True; } if( ! i_rControlOptions.mbEnabled ) { - aCtrl[nUsed ].Name = rtl::OUString( "Enabled" ); + aCtrl[nUsed ].Name = OUString( "Enabled" ); aCtrl[nUsed++].Value <<= sal_False; } @@ -1831,45 +1831,45 @@ Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< r return makeAny( aCtrl ); } -Any PrinterOptionsHelper::setGroupControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId) +Any PrinterOptionsHelper::setGroupControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); *aHelpId.getArray() = i_rHelpId; } - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Group"); } -Any PrinterOptionsHelper::setSubgroupControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, +Any PrinterOptionsHelper::setSubgroupControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); *aHelpId.getArray() = i_rHelpId; } - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Subgroup", NULL, i_rControlOptions); } -Any PrinterOptionsHelper::setBoolControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, +Any PrinterOptionsHelper::setBoolControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, sal_Bool i_bValue, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); @@ -1878,16 +1878,16 @@ Any PrinterOptionsHelper::setBoolControlOpt(const rtl::OUString& i_rID, PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_bValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Bool", &aVal, i_rControlOptions); } -Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs, - const rtl::OUString& i_rTitle, - const Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rProperty, - const Sequence< rtl::OUString >& i_rChoices, +Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs, + const OUString& i_rTitle, + const Sequence< OUString >& i_rHelpId, + const OUString& i_rProperty, + const Sequence< OUString >& i_rChoices, sal_Int32 i_nValue, const Sequence< sal_Bool >& i_rDisabledChoices, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) @@ -1895,11 +1895,11 @@ Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::S UIControlOptions aOpt( i_rControlOptions ); sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 1 + (i_rDisabledChoices.getLength() ? 1 : 0) ); - aOpt.maAddProps[nUsed].Name = rtl::OUString( "Choices" ); + aOpt.maAddProps[nUsed].Name = OUString( "Choices" ); aOpt.maAddProps[nUsed].Value = makeAny( i_rChoices ); if( i_rDisabledChoices.getLength() ) { - aOpt.maAddProps[nUsed+1].Name = rtl::OUString( "ChoicesDisabled" ); + aOpt.maAddProps[nUsed+1].Name = OUString( "ChoicesDisabled" ); aOpt.maAddProps[nUsed+1].Value = makeAny( i_rDisabledChoices ); } @@ -1909,11 +1909,11 @@ Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::S return setUIControlOpt(i_rIDs, i_rTitle, i_rHelpId, "Radio", &aVal, aOpt); } -Any PrinterOptionsHelper::setChoiceListControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rProperty, - const Sequence< rtl::OUString >& i_rChoices, +Any PrinterOptionsHelper::setChoiceListControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const Sequence< OUString >& i_rHelpId, + const OUString& i_rProperty, + const Sequence< OUString >& i_rChoices, sal_Int32 i_nValue, const Sequence< sal_Bool >& i_rDisabledChoices, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) @@ -1921,26 +1921,26 @@ Any PrinterOptionsHelper::setChoiceListControlOpt(const rtl::OUString& i_rID, UIControlOptions aOpt( i_rControlOptions ); sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 1 + (i_rDisabledChoices.getLength() ? 1 : 0) ); - aOpt.maAddProps[nUsed].Name = rtl::OUString( "Choices" ); + aOpt.maAddProps[nUsed].Name = OUString( "Choices" ); aOpt.maAddProps[nUsed].Value = makeAny( i_rChoices ); if( i_rDisabledChoices.getLength() ) { - aOpt.maAddProps[nUsed+1].Name = rtl::OUString( "ChoicesDisabled" ); + aOpt.maAddProps[nUsed+1].Name = OUString( "ChoicesDisabled" ); aOpt.maAddProps[nUsed+1].Value = makeAny( i_rDisabledChoices ); } PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_nValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, i_rHelpId, "List", &aVal, aOpt); } -Any PrinterOptionsHelper::setRangeControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, +Any PrinterOptionsHelper::setRangeControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, sal_Int32 i_nValue, sal_Int32 i_nMinValue, sal_Int32 i_nMaxValue, @@ -1951,13 +1951,13 @@ Any PrinterOptionsHelper::setRangeControlOpt(const rtl::OUString& i_rID, { sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 2 ); - aOpt.maAddProps[nUsed ].Name = rtl::OUString( "MinValue" ); + aOpt.maAddProps[nUsed ].Name = OUString( "MinValue" ); aOpt.maAddProps[nUsed++].Value = makeAny( i_nMinValue ); - aOpt.maAddProps[nUsed ].Name = rtl::OUString( "MaxValue" ); + aOpt.maAddProps[nUsed ].Name = OUString( "MaxValue" ); aOpt.maAddProps[nUsed++].Value = makeAny( i_nMaxValue ); } - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); @@ -1966,19 +1966,19 @@ Any PrinterOptionsHelper::setRangeControlOpt(const rtl::OUString& i_rID, PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_nValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Range", &aVal, aOpt); } -Any PrinterOptionsHelper::setEditControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, - const rtl::OUString& i_rValue, +Any PrinterOptionsHelper::setEditControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, + const OUString& i_rValue, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); @@ -1987,7 +1987,7 @@ Any PrinterOptionsHelper::setEditControlOpt(const rtl::OUString& i_rID, PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_rValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Edit", &aVal, i_rControlOptions); } diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 5b6ec445da52..01137b635ae2 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -752,7 +752,7 @@ bool SalGraphics::DrawAlphaRect( long nX, long nY, long nWidth, long nHeight, return drawAlphaRect( nX, nY, nWidth, nHeight, nTransparency ); } -bool SalGraphics::filterText( const rtl::OUString&, rtl::OUString&, sal_Int32, sal_Int32&, sal_Int32&, sal_Int32& ) +bool SalGraphics::filterText( const OUString&, OUString&, sal_Int32, sal_Int32&, sal_Int32&, sal_Int32& ) { return false; } diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index dfbb40a4b792..13789539a4c3 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -20,7 +20,6 @@ #include -using ::rtl::OUString; /**************************************************************** * Placeholder for no native widgets diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index 1db7c37e088a..e175edafcbb7 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -47,7 +47,7 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( // create replacement graphic from maSequence // create XPrimitive2DRenderer uno::Reference< lang::XMultiServiceFactory > xFactory(::comphelper::getProcessServiceFactory()); - const rtl::OUString aServiceName("com.sun.star.graphic.Primitive2DTools"); + const OUString aServiceName("com.sun.star.graphic.Primitive2DTools"); try { @@ -124,7 +124,7 @@ void SvgData::ensureSequenceAndRange() { // create SVG interpreter uno::Reference< lang::XMultiServiceFactory > xFactory(::comphelper::getProcessServiceFactory()); - const rtl::OUString aServiceName("com.sun.star.graphic.SvgTools"); + const OUString aServiceName("com.sun.star.graphic.SvgTools"); try { @@ -170,7 +170,7 @@ void SvgData::ensureSequenceAndRange() ////////////////////////////////////////////////////////////////////////////// -SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const rtl::OUString& rPath) +SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath) : maSvgDataArray(rSvgDataArray), mnSvgDataArrayLength(nSvgDataArrayLength), maPath(rPath), diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 1e79f32731a9..a081188181ba 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -203,9 +203,9 @@ namespace vcl #if OSL_DEBUG_LEVEL > 1 if ( _pDXAry ) { - ::rtl::OStringBuffer aTrace; + OStringBuffer aTrace; aTrace.append( "ReferenceDeviceTextLayout::GetTextArray( " ); - aTrace.append( ::rtl::OUStringToOString( _rText, RTL_TEXTENCODING_UTF8 ) ); + aTrace.append( OUStringToOString( _rText, RTL_TEXTENCODING_UTF8 ) ); aTrace.append( " ): " ); aTrace.append( nTextWidth ); aTrace.append( " = ( " ); diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx index 1bff1e40373e..ec335005c60c 100644 --- a/vcl/source/glyphs/graphite_features.cxx +++ b/vcl/source/glyphs/graphite_features.cxx @@ -38,14 +38,14 @@ const char GrFeatureParser::FEAT_PREFIX = ':'; const char GrFeatureParser::FEAT_SEPARATOR = '&'; const char GrFeatureParser::FEAT_ID_VALUE_SEPARATOR = '='; -GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString lang) +GrFeatureParser::GrFeatureParser(const gr_face * pFace, const OString lang) : mnNumSettings(0), mbErrors(false), mpSettings(NULL) { maLang.label[0] = maLang.label[1] = maLang.label[2] = maLang.label[3] = '\0'; setLang(pFace, lang); } -GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString features, const ::rtl::OString lang) +GrFeatureParser::GrFeatureParser(const gr_face * pFace, const OString features, const OString lang) : mnNumSettings(0), mbErrors(false), mpSettings(NULL) { sal_Int32 nEquals = 0; @@ -62,7 +62,7 @@ GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString fea break; } // check for a lang=xxx specification - const ::rtl::OString aLangPrefix("lang"); + const OString aLangPrefix("lang"); if (features.match(aLangPrefix, pos )) { pos = nEquals + 1; @@ -146,7 +146,7 @@ GrFeatureParser::GrFeatureParser(const gr_face * pFace, const ::rtl::OString fea } } -void GrFeatureParser::setLang(const gr_face * pFace, const rtl::OString & lang) +void GrFeatureParser::setLang(const gr_face * pFace, const OString & lang) { FeatId aLang; aLang.num = 0; @@ -201,7 +201,7 @@ GrFeatureParser::~GrFeatureParser() } } -bool GrFeatureParser::isCharId(const rtl::OString & id, size_t offset, size_t length) +bool GrFeatureParser::isCharId(const OString & id, size_t offset, size_t length) { if (length > 4) return false; for (size_t i = 0; i < length; i++) @@ -215,7 +215,7 @@ bool GrFeatureParser::isCharId(const rtl::OString & id, size_t offset, size_t le return true; } -gr_uint32 GrFeatureParser::getCharId(const rtl::OString & id, size_t offset, size_t length) +gr_uint32 GrFeatureParser::getCharId(const OString & id, size_t offset, size_t length) { FeatId charId; charId.num = 0; @@ -233,7 +233,7 @@ gr_uint32 GrFeatureParser::getCharId(const rtl::OString & id, size_t offset, siz return charId.num; } -short GrFeatureParser::getIntValue(const rtl::OString & id, size_t offset, size_t length) +short GrFeatureParser::getIntValue(const OString & id, size_t offset, size_t length) { short value = 0; int sign = 1; diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 5b38618a5277..6951b95b857d 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -675,7 +675,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, s (m_pBmpAcc->HasPalette() ? m_pBmpAcc->GetPaletteEntryCount() : 0 ) : 0 ); OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range"); if( nIndex < 0 || nIndex >= nCount ) - throw lang::IndexOutOfBoundsException(::rtl::OUString("Palette index out of range"), + throw lang::IndexOutOfBoundsException(OUString("Palette index out of range"), static_cast(this)); const BitmapColor aCol = m_pBmpAcc->GetPaletteColor(sal::static_int_cast(nIndex)); @@ -697,7 +697,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range"); if( nIndex < 0 || nIndex >= nCount ) - throw lang::IndexOutOfBoundsException(::rtl::OUString("Palette index out of range"), + throw lang::IndexOutOfBoundsException(OUString("Palette index out of range"), static_cast(this)); return sal_False; // read-only implementation diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx index 954413b603a2..7511ea0d2705 100644 --- a/vcl/source/helper/strhelper.cxx +++ b/vcl/source/helper/strhelper.cxx @@ -158,10 +158,10 @@ String GetCommandLineToken( int nToken, const String& rLine ) *pLeap = 0; - return rtl::OUString(pBuffer); + return OUString(pBuffer); } -rtl::OString GetCommandLineToken(int nToken, const rtl::OString& rLine) +OString GetCommandLineToken(int nToken, const OString& rLine) { sal_Int32 nLen = rLine.getLength(); if (!nLen) @@ -208,10 +208,10 @@ rtl::OString GetCommandLineToken(int nToken, const rtl::OString& rLine) *pLeap = 0; - return rtl::OString(pBuffer); + return OString(pBuffer); } -int GetCommandLineTokenCount(const rtl::OUString& rLine) +int GetCommandLineTokenCount(const OUString& rLine) { if (rLine.isEmpty()) return 0; @@ -314,10 +314,10 @@ String WhitespaceToSpace( const String& rLine, sal_Bool bProtect ) if( *pLeap == ' ' ) *pLeap = 0; - return rtl::OUString(*pBuffer == ' ' ? pBuffer+1 : pBuffer); + return OUString(*pBuffer == ' ' ? pBuffer+1 : pBuffer); } -rtl::OString WhitespaceToSpace(const rtl::OString& rLine, sal_Bool bProtect) +OString WhitespaceToSpace(const OString& rLine, sal_Bool bProtect) { sal_Int32 nLen = rLine.getLength(); if (!nLen) @@ -370,7 +370,7 @@ rtl::OString WhitespaceToSpace(const rtl::OString& rLine, sal_Bool bProtect) if( *pLeap == ' ' ) *pLeap = 0; - return rtl::OString(*pBuffer == ' ' ? pBuffer+1 : pBuffer); + return OString(*pBuffer == ' ' ? pBuffer+1 : pBuffer); } } // namespace diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index 69136d6b0b05..887060fb2269 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -29,7 +29,6 @@ using namespace vcl; using namespace com::sun::star::uno; using namespace com::sun::star::awt; -using ::rtl::OUString; DisplayConnection::DisplayConnection() { diff --git a/vcl/source/uipreviewer/previewer.cxx b/vcl/source/uipreviewer/previewer.cxx index 939c55342744..9cf4fe7177a5 100644 --- a/vcl/source/uipreviewer/previewer.cxx +++ b/vcl/source/uipreviewer/previewer.cxx @@ -30,10 +30,10 @@ using namespace com::sun::star; int UIPreviewApp::Main() { - std::vector uifiles; + std::vector uifiles; for (sal_uInt16 i = 0; i < GetCommandLineParamCount(); ++i) { - rtl::OUString aFileUrl; + OUString aFileUrl; osl::File::getFileURLFromSystemPath(GetCommandLineParam(i), aFileUrl); uifiles.push_back(aFileUrl); } @@ -65,7 +65,7 @@ int UIPreviewApp::Main() Dialog *pDialog = new Dialog(DIALOG_NO_PARENT, WB_STDDIALOG); { - VclBuilder aBuilder(pDialog, rtl::OUString(), uifiles[0]); + VclBuilder aBuilder(pDialog, OUString(), uifiles[0]); Dialog *pRealDialog = dynamic_cast(aBuilder.get_widget_root()); if (!pRealDialog) @@ -73,7 +73,7 @@ int UIPreviewApp::Main() if (pRealDialog) { - pRealDialog->SetText(rtl::OUString("LibreOffice ui-previewer")); + pRealDialog->SetText(OUString("LibreOffice ui-previewer")); pRealDialog->SetStyle(pDialog->GetStyle()|WB_CLOSEABLE); pRealDialog->Execute(); } @@ -83,7 +83,7 @@ int UIPreviewApp::Main() } catch (const uno::Exception &e) { - fprintf(stderr, "fatal error: %s\n", rtl::OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr()); + fprintf(stderr, "fatal error: %s\n", OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr()); } return EXIT_SUCCESS; diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index f2a8cb64d0d9..8e0af1615d41 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -39,7 +39,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( CUI_DLL_NAME ), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( VclAbstractDialogFactory* (SAL_CALL*)() ) - aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory") ); + aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") ); #else fp = CreateDialogFactory; #endif diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 60b20a6ab623..cbe9dec1bfb7 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1156,7 +1156,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei Rectangle aBounds( aCtrlRegion ); Rectangle aContent( aCtrlRegion ); if( pWin->GetNativeControlRegion( aCtrlType, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_ENABLED, aControlValue, OUString(), aBounds, aContent ) ) { mnLeftBorder = aContent.Left() - aBounds.Left(); @@ -1367,14 +1367,14 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* Rectangle aContentRgn( aCtrlRegion ); if( ! ImplGetSVData()->maNWFData.mbCanDrawWidgetAnySize && pWin->GetNativeControlRegion( aCtrlType, aCtrlPart, aCtrlRegion, - nState, aControlValue, rtl::OUString(), + nState, aControlValue, OUString(), aBoundingRgn, aContentRgn )) { aCtrlRegion=aContentRgn; } bNativeOK = pWin->DrawNativeControl( aCtrlType, aCtrlPart, aCtrlRegion, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); // if the native theme draws the spinbuttons in one call, make sure the proper settings // are passed, this might force a redraw though.... (TODO: improve) diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 77c0e9c8cb8c..1f7de7a612f6 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -663,13 +663,13 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, Rectangle aBound, aContent; Rectangle aNatRgn( rRect ); if( pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER, - aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aNatRgn, 0, aControlValue, OUString(), aBound, aContent) ) { // if bNoDraw is true then don't call the drawing routine // but just update the target rectangle if( bNoDraw || pWin->DrawNativeControl( CTRL_FRAME, PART_BORDER, aContent, CTRL_STATE_ENABLED, - aControlValue, rtl::OUString()) ) + aControlValue, OUString()) ) { rRect = aContent; return; @@ -1072,7 +1072,7 @@ void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, boo ImplControlValue aValue; ControlState nState = 0; Rectangle aRect(rStart,rStop); - if(nativeSupported && pWin->DrawNativeControl(CTRL_FIXEDLINE,nPart,aRect,nState,aValue,rtl::OUString())) + if(nativeSupported && pWin->DrawNativeControl(CTRL_FIXEDLINE,nPart,aRect,nState,aValue,OUString())) return; } diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 30e757170b4f..c37588a74fde 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -50,9 +50,9 @@ // ======================================================================= -static rtl::OString ImplGetDialogText( Dialog* pDialog ) +static OString ImplGetDialogText( Dialog* pDialog ) { - rtl::OStringBuffer aErrorStr(rtl::OUStringToOString( + OStringBuffer aErrorStr(OUStringToOString( pDialog->GetText(), RTL_TEXTENCODING_UTF8)); if ( (pDialog->GetType() == WINDOW_MESSBOX) || (pDialog->GetType() == WINDOW_INFOBOX) || @@ -61,7 +61,7 @@ static rtl::OString ImplGetDialogText( Dialog* pDialog ) (pDialog->GetType() == WINDOW_QUERYBOX) ) { aErrorStr.append(", "); - aErrorStr.append(rtl::OUStringToOString( + aErrorStr.append(OUStringToOString( ((MessBox*)pDialog)->GetMessText(), RTL_TEXTENCODING_UTF8)); } return aErrorStr.makeStringAndClear(); @@ -477,18 +477,18 @@ Dialog::Dialog( WindowType nType ) ImplInitDialogData(); } -#define BASEPATH_SHARE_LAYER rtl::OUString("UIConfig") -#define RELPATH_SHARE_LAYER rtl::OUString("soffice.cfg") -#define SERVICENAME_PATHSETTINGS rtl::OUString("com.sun.star.util.PathSettings") +#define BASEPATH_SHARE_LAYER OUString("UIConfig") +#define RELPATH_SHARE_LAYER OUString("soffice.cfg") +#define SERVICENAME_PATHSETTINGS OUString("com.sun.star.util.PathSettings") -rtl::OUString VclBuilderContainer::getUIRootDir() +OUString VclBuilderContainer::getUIRootDir() { /*to-do, check if user config has an override before using shared one, etc*/ css::uno::Reference< css::beans::XPropertySet > xPathSettings( ::comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_PATHSETTINGS), css::uno::UNO_QUERY_THROW); - ::rtl::OUString sShareLayer; + OUString sShareLayer; xPathSettings->getPropertyValue(BASEPATH_SHARE_LAYER) >>= sShareLayer; // "UIConfig" is a "multi path" ... use first part only here! @@ -520,7 +520,7 @@ void Dialog::doDeferredInit(bool bResizable) mbIsDefferedInit = false; } -Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription) +Dialog::Dialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : SystemWindow( WINDOW_DIALOG ) , mbIsDefferedInit(true) { @@ -529,7 +529,7 @@ Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rU m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID); } -Dialog::Dialog(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, WindowType nType) +Dialog::Dialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType) : SystemWindow( nType ) , mbIsDefferedInit(true) { @@ -815,7 +815,7 @@ sal_Bool Dialog::ImplStartExecuteModal() if ( mbInExecute ) { #ifdef DBG_UTIL - rtl::OStringBuffer aErrorStr; + OStringBuffer aErrorStr; aErrorStr.append("Dialog::StartExecuteModal() is called in Dialog::StartExecuteModal(): "); aErrorStr.append(ImplGetDialogText(this)); OSL_FAIL(aErrorStr.getStr()); @@ -1261,7 +1261,7 @@ void Dialog::Resize() queue_layout(); } -bool Dialog::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool Dialog::set_property(const OString &rKey, const OString &rValue) { if (rKey == "border-width") set_border_width(rValue.toInt32()); @@ -1293,7 +1293,7 @@ ModelessDialog::ModelessDialog( Window* pParent, const ResId& rResId ) : Show(); } -ModelessDialog::ModelessDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ) : +ModelessDialog::ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODELESSDIALOG) { } @@ -1315,7 +1315,7 @@ ModalDialog::ModalDialog( Window* pParent, const ResId& rResId ) : init( pParent, rResId ); } -ModalDialog::ModalDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ) : +ModalDialog::ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODALDIALOG) { } diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 32a32c8ecbaf..132722b44e34 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -419,7 +419,7 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Uni xCharClass = vcl::unohelper::CreateCharacterClassification(); const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); - cCharCode = xCharClass->toUpper( rtl::OUString(cCharCode), 0, 1, rLocale )[0]; + cCharCode = xCharClass->toUpper( OUString(cCharCode), 0, 1, rLocale )[0]; if ( i < nFormEnd ) pWindow = ImplGetNextWindow( pParent, i, i, sal_True ); @@ -432,7 +432,7 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Uni while ( nPos != STRING_NOTFOUND ) { cCompareChar = aStr.GetChar( nPos+1 ); - cCompareChar = xCharClass->toUpper( rtl::OUString(cCompareChar), 0, 1, rLocale )[0]; + cCompareChar = xCharClass->toUpper( OUString(cCompareChar), 0, 1, rLocale )[0]; if ( cCompareChar == cCharCode ) { if (pWindow->GetType() == WINDOW_FIXEDTEXT) diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index c79c226a8e22..70a1b5d7b5c8 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -185,7 +185,7 @@ void DockingAreaWindow::Paint( const Rectangle& ) Rectangle aCtrlRegion( tmp, GetOutputSizePixel() ); DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, - aCtrlRegion, nState, aControlValue, rtl::OUString() ); + aCtrlRegion, nState, aControlValue, OUString() ); if( !ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames ) { @@ -248,7 +248,7 @@ void DockingAreaWindow::Paint( const Rectangle& ) aTBRect.Bottom() = aOutSz.Height() - 1; } DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, - aTBRect, nState, aControlValue, rtl::OUString() ); + aTBRect, nState, aControlValue, OUString() ); } } } diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index d1ac53b4dade..27bb34dec24d 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -291,7 +291,7 @@ void VclBox::setAllocation(const Size &rAllocation) } } -bool VclBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclBox::set_property(const OString &rKey, const OString &rValue) { if (rKey == "spacing") set_spacing(rValue.toInt32()); @@ -490,7 +490,7 @@ Size VclButtonBox::calculateRequisition() const return addSpacing(addReqGroups(aReq), nVisibleChildren); } -bool VclButtonBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclButtonBox::set_property(const OString &rKey, const OString &rValue) { if (rKey == "layout-style") { @@ -1026,12 +1026,12 @@ void VclGrid::setAllocation(const Size& rAllocation) } } -bool toBool(const rtl::OString &rValue) +bool toBool(const OString &rValue) { return (rValue[0] == 't' || rValue[0] == 'T' || rValue[0] == '1'); } -bool VclGrid::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclGrid::set_property(const OString &rKey, const OString &rValue) { if (rKey == "row-spacing") set_row_spacing(rValue.toInt32()); @@ -1177,7 +1177,7 @@ Window *VclFrame::get_child() return const_cast(const_cast(this)->get_child()); } -void VclFrame::set_label(const rtl::OUString &rLabel) +void VclFrame::set_label(const OUString &rLabel) { Window *pLabel = get_label_widget(); assert(pLabel); @@ -1223,7 +1223,7 @@ void VclAlignment::setAllocation(const Size &rAllocation) setLayoutAllocation(*pChild, aChildPos, aAllocation); } -bool VclAlignment::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclAlignment::set_property(const OString &rKey, const OString &rValue) { if (rKey == "bottom-padding") m_nBottomPadding = rValue.toInt32(); @@ -1348,7 +1348,7 @@ void VclExpander::setAllocation(const Size &rAllocation) } } -bool VclExpander::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclExpander::set_property(const OString &rKey, const OString &rValue) { if (rKey == "expanded") m_aDisclosureButton.Check(toBool(rValue)); @@ -1452,7 +1452,7 @@ Size VclScrolledWindow::getVisibleChildSize() const return aRet; } -bool VclScrolledWindow::set_property(const rtl::OString &rKey, const rtl::OString &rValue) +bool VclScrolledWindow::set_property(const OString &rKey, const OString &rValue) { bool bRet = VclBin::set_property(rKey, rValue); m_aVScroll.Show((GetStyle() & WB_VSCROLL) != 0); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index c8e02adada28..f0e7cf315031 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -98,7 +98,7 @@ static sal_Bool ImplAccelDisabled() if( nAccelDisabled == -1 ) { - rtl::OUString aStr = + OUString aStr = vcl::SettingsConfigItem::get()-> getValue( "Menu", "SuppressAccelerators" ); nAccelDisabled = aStr.equalsIgnoreAsciiCase("true") ? 1 : 0; @@ -838,14 +838,14 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt1 // is an id available, then call help with the id, otherwise // use help-index String aCommand = pMenu->GetItemCommand( nId ); - rtl::OString aHelpId( pMenu->GetHelpId( nId ) ); + OString aHelpId( pMenu->GetHelpId( nId ) ); if( aHelpId.isEmpty() ) aHelpId = OOO_HELP_INDEX; if ( aCommand.Len() ) pHelp->Start( aCommand, NULL ); else - pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); + pHelp->Start( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); } bDone = sal_True; } @@ -1298,7 +1298,7 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) if ( nObjMask & RSC_MENUITEM_HELPID ) { - rtl::OString aHelpId( ReadByteStringRes() ); + OString aHelpId( ReadByteStringRes() ); if ( !bSep ) SetHelpId( nItemId, aHelpId ); } @@ -2035,7 +2035,7 @@ const XubString& Menu::ImplGetHelpText( sal_uInt16 nItemId ) const pData->aHelpText = pHelp->GetHelpText( pData->aCommandStr, NULL ); if( !pData->aHelpText.Len() && !pData->aHelpId.isEmpty() ) - pData->aHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pData->aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); + pData->aHelpText = pHelp->GetHelpText( OStringToOUString( pData->aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); } } @@ -2068,7 +2068,7 @@ const XubString& Menu::GetTipHelpText( sal_uInt16 nItemId ) const return ImplGetSVEmptyStr(); } -void Menu::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) +void Menu::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { MenuItemData* pData = pItemList->GetData( nItemId ); @@ -2076,9 +2076,9 @@ void Menu::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) pData->aHelpId = rHelpId; } -rtl::OString Menu::GetHelpId( sal_uInt16 nItemId ) const +OString Menu::GetHelpId( sal_uInt16 nItemId ) const { - rtl::OString aRet; + OString aRet; MenuItemData* pData = pItemList->GetData( nItemId ); @@ -2087,7 +2087,7 @@ rtl::OString Menu::GetHelpId( sal_uInt16 nItemId ) const if ( !pData->aHelpId.isEmpty() ) aRet = pData->aHelpId; else - aRet = ::rtl::OUStringToOString( pData->aCommandStr, RTL_TEXTENCODING_UTF8 ); + aRet = OUStringToOString( pData->aCommandStr, RTL_TEXTENCODING_UTF8 ); } return aRet; @@ -2582,7 +2582,7 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, aCtrlRegion, nState, aControlValue, - rtl::OUString() ); + OUString() ); } if( ! bNativeOk ) @@ -2603,7 +2603,7 @@ static String getShortenedString( const String& i_rLong, Window* i_pWin, long i_ { if( nPos < aNonMnem.Len() && i_rLong.GetChar(nPos+1) == aNonMnem.GetChar(nPos) ) { - rtl::OUStringBuffer aBuf( i_rLong.Len() ); + OUStringBuffer aBuf( i_rLong.Len() ); aBuf.append( aNonMnem.GetBuffer(), nPos ); aBuf.append( sal_Unicode('~') ); aBuf.append( aNonMnem.GetBuffer()+nPos ); @@ -3674,7 +3674,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) { - rtl::OUString aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) ); + OUString aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) ); MenuItemData* pData = pItemList->Insert( 0xFFFF, MENUITEM_STRING, 0, aTmpEntryText, Image(), NULL, 0xFFFF, OString() ); pData->bIsTemporary = sal_True; @@ -5579,7 +5579,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight ) Point aPt; Rectangle aCtrlRect( aPt, GetOutputSizePixel() ); - DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, aMenubarValue, rtl::OUString() ); + DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, aMenubarValue, OUString() ); } ImplAddNWFSeparator( this, aMenubarValue ); @@ -5813,7 +5813,7 @@ void MenuBarWindow::Paint( const Rectangle& ) Point aPt; Rectangle aCtrlRegion( aPt, GetOutputSizePixel() ); - DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, aMenubarValue, rtl::OUString() ); + DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, aMenubarValue, OUString() ); } ImplAddNWFSeparator( this, aMenubarValue ); diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 83c6f63c6177..45ceac4f7ffb 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -273,7 +273,7 @@ sal_Bool MnemonicGenerator::CreateMnemonic( XubString& rKey ) if ( maMnemonics[nMnemonicIndex] ) { maMnemonics[nMnemonicIndex] = 0; - rtl::OUString aStr = rtl::OUStringBuffer(). + OUString aStr = OUStringBuffer(). append('(').append(MNEMONIC_CHAR).append(c). append(')').makeStringAndClear(); nIndex = rKey.Len(); diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index baf837054f0d..c7f7da7a31ab 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -171,7 +171,7 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) : sal_uInt16 nLoButtons = ReadShortRes(); sal_uInt16 nHiDefButton = ReadShortRes(); sal_uInt16 nLoDefButton = ReadShortRes(); - rtl::OString aHelpId( ReadByteStringRes() ); + OString aHelpId( ReadByteStringRes() ); /* sal_uInt16 bSysModal = */ ReadShortRes(); SetHelpId( aHelpId ); WinBits nBits = (((sal_uLong)nHiButtons << 16) + nLoButtons) | @@ -252,10 +252,10 @@ void MessBox::ImplPosControls() // Message-Text um Tabs bereinigen - rtl::OUString aTabStr(" "); + OUString aTabStr(" "); sal_uInt16 nIndex = 0; while ( nIndex != STRING_NOTFOUND ) - nIndex = aMessText.SearchAndReplace( rtl::OUString('\t'), aTabStr, nIndex ); + nIndex = aMessText.SearchAndReplace( OUString('\t'), aTabStr, nIndex ); // Wenn Fenster zu schmall, machen wir Dialog auch breiter if ( mpWindowImpl->mbFrame ) diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index d31b346c258a..b6751b2d07e7 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -202,14 +202,14 @@ void PrintDialog::PrintPreviewWindow::Command( const CommandEvent& rEvt ) void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPreview, const Size& i_rOrigSize, - const rtl::OUString& i_rPaperName, - const rtl::OUString& i_rReplacement, + const OUString& i_rPaperName, + const OUString& i_rReplacement, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY, bool i_bGreyscale ) { - rtl::OUStringBuffer aBuf( 256 ); + OUStringBuffer aBuf( 256 ); aBuf.append( maToolTipString ); SetQuickHelpText( aBuf.makeStringAndClear() ); maMtf = i_rNewPreview; @@ -325,7 +325,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect ) Font aFont( GetSettings().GetStyleSettings().GetFieldFont() ); aFont.SetSize( Size( 0, 24 ) ); SetFont( aFont ); - Size aSampleTextSize( GetTextWidth( rtl::OUString::valueOf( sal_Int32(nPages+1) ) ), GetTextHeight() ); + Size aSampleTextSize( GetTextWidth( OUString::valueOf( sal_Int32(nPages+1) ) ), GetTextHeight() ); Size aOutSize( GetOutputSizePixel() ); Size aSubSize( aOutSize.Width() / mnColumns, aOutSize.Height() / mnRows ); @@ -341,7 +341,7 @@ void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect ) long nTextHeight = GetTextHeight(); for( int i = 0; i < nPages; i++ ) { - rtl::OUString aPageText( rtl::OUString::valueOf( sal_Int32(i+1) ) ); + OUString aPageText( OUString::valueOf( sal_Int32(i+1) ) ); int nX = 0, nY = 0; switch( mnOrderMode ) { @@ -499,10 +499,10 @@ PrintDialog::JobTabPage::JobTabPage( VclBuilder* pUIBuilder ) void PrintDialog::JobTabPage::readFromSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - rtl::OUString aValue; + OUString aValue; - aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "CollateBox" ) ); + aValue = pItem->getValue( OUString( "PrintDialog" ), + OUString( "CollateBox" ) ); if( aValue.equalsIgnoreAsciiCase("alwaysoff") ) { mnCollateUIMode = 1; @@ -512,8 +512,8 @@ void PrintDialog::JobTabPage::readFromSettings() else { mnCollateUIMode = 0; - aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "Collate" ) ); + aValue = pItem->getValue( OUString( "PrintDialog" ), + OUString( "Collate" ) ); mpCollateBox->Check( aValue.equalsIgnoreAsciiCase("true") ); } } @@ -521,13 +521,13 @@ void PrintDialog::JobTabPage::readFromSettings() void PrintDialog::JobTabPage::storeToSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "CopyCount" ), + pItem->setValue( OUString( "PrintDialog" ), + OUString( "CopyCount" ), mpCopyCountField->GetText() ); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "Collate" ), - mpCollateBox->IsChecked() ? rtl::OUString("true") : - rtl::OUString("false") ); + pItem->setValue( OUString( "PrintDialog" ), + OUString( "Collate" ), + mpCollateBox->IsChecked() ? OUString("true") : + OUString("false") ); } PrintDialog::OutputOptPage::OutputOptPage( VclBuilder *pUIBuilder ) @@ -539,9 +539,9 @@ PrintDialog::OutputOptPage::OutputOptPage( VclBuilder *pUIBuilder ) void PrintDialog::OutputOptPage::readFromSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - rtl::OUString aValue; - aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "CollateSingleJobs" ) ); + OUString aValue; + aValue = pItem->getValue( OUString( "PrintDialog" ), + OUString( "CollateSingleJobs" ) ); if ( aValue.equalsIgnoreAsciiCase("true") ) { mpCollateSingleJobsBox->Check( sal_True ); @@ -555,14 +555,14 @@ void PrintDialog::OutputOptPage::readFromSettings() void PrintDialog::OutputOptPage::storeToSettings() { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "ToFile" ), - mpToFileBox->IsChecked() ? rtl::OUString("true") - : rtl::OUString("false") ); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "CollateSingleJobs" ), - mpCollateSingleJobsBox->IsChecked() ? rtl::OUString("true") : - rtl::OUString("false") ); + pItem->setValue( OUString( "PrintDialog" ), + OUString( "ToFile" ), + mpToFileBox->IsChecked() ? OUString("true") + : OUString("false") ); + pItem->setValue( OUString( "PrintDialog" ), + OUString( "CollateSingleJobs" ), + mpCollateSingleJobsBox->IsChecked() ? OUString("true") : + OUString("false") ); } PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr& i_rController ) @@ -602,8 +602,8 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptrCheck( maPController->getReversePrint() ); // fill printer listbox - const std::vector< rtl::OUString >& rQueues( Printer::GetPrinterQueues() ); - for( std::vector< rtl::OUString >::const_iterator it = rQueues.begin(); + const std::vector< OUString >& rQueues( Printer::GetPrinterQueues() ); + for( std::vector< OUString >::const_iterator it = rQueues.begin(); it != rQueues.end(); ++it ) { maJobPage.mpPrinters->InsertEntry( *it ); @@ -617,8 +617,8 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptrgetValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPrinter" ) ) ); + String aValue( pItem->getValue( OUString( "PrintDialog" ), + OUString( "LastPrinter" ) ) ); if( maJobPage.mpPrinters->GetEntryPos( aValue ) != LISTBOX_ENTRY_NOTFOUND ) { maJobPage.mpPrinters->SelectEntry( aValue ); @@ -703,7 +703,7 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptrgetBoolProperty( rtl::OUString( "HideHelpButton" ), sal_False ) ) + if ( maPController->getBoolProperty( OUString( "HideHelpButton" ), sal_False ) ) mpHelpButton->Hide(); // set initial focus to "Number of copies" maJobPage.mpCopyCountField->GrabFocus(); @@ -725,8 +725,8 @@ void PrintDialog::readFromSettings() // read last selected tab page; if it exists, actiavte it SettingsConfigItem* pItem = SettingsConfigItem::get(); - rtl::OUString aValue = pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPage" ) ); + OUString aValue = pItem->getValue( OUString( "PrintDialog" ), + OUString( "LastPage" ) ); sal_uInt16 nCount = mpTabCtrl->GetPageCount(); for( sal_uInt16 i = 0; i < nCount; i++ ) { @@ -740,10 +740,10 @@ void PrintDialog::readFromSettings() mpOKButton->SetText( maOptionsPage.mpToFileBox->IsChecked() ? maPrintToFileText : maPrintText ); // persistent window state - rtl::OUString aWinState( pItem->getValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "WindowState" ) ) ); + OUString aWinState( pItem->getValue( OUString( "PrintDialog" ), + OUString( "WindowState" ) ) ); if( !aWinState.isEmpty() ) - SetWindowState( rtl::OUStringToOString( aWinState, RTL_TEXTENCODING_UTF8 ) ); + SetWindowState( OUStringToOString( aWinState, RTL_TEXTENCODING_UTF8 ) ); if( maOptionsPage.mpToFileBox->IsChecked() ) { @@ -760,16 +760,16 @@ void PrintDialog::storeToSettings() // store last selected printer SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPrinter" ), + pItem->setValue( OUString( "PrintDialog" ), + OUString( "LastPrinter" ), maJobPage.mpPrinters->GetSelectEntry() ); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPage" ), + pItem->setValue( OUString( "PrintDialog" ), + OUString( "LastPage" ), mpTabCtrl->GetPageText( mpTabCtrl->GetCurPageId() ) ); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "WindowState" ), - rtl::OStringToOUString( GetWindowState(), RTL_TEXTENCODING_UTF8 ) + pItem->setValue( OUString( "PrintDialog" ), + OUString( "WindowState" ), + OStringToOUString( GetWindowState(), RTL_TEXTENCODING_UTF8 ) ); pItem->Commit(); } @@ -789,13 +789,13 @@ bool PrintDialog::isSingleJobs() return maOptionsPage.mpCollateSingleJobsBox->IsChecked(); } -void setHelpId( Window* i_pWindow, const Sequence< rtl::OUString >& i_rHelpIds, sal_Int32 i_nIndex ) +void setHelpId( Window* i_pWindow, const Sequence< OUString >& i_rHelpIds, sal_Int32 i_nIndex ) { if( i_nIndex >= 0 && i_nIndex < i_rHelpIds.getLength() ) - i_pWindow->SetHelpId( rtl::OUStringToOString( i_rHelpIds.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8 ) ); + i_pWindow->SetHelpId( OUStringToOString( i_rHelpIds.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8 ) ); } -static void setHelpText( Window* i_pWindow, const Sequence< rtl::OUString >& i_rHelpTexts, sal_Int32 i_nIndex ) +static void setHelpText( Window* i_pWindow, const Sequence< OUString >& i_rHelpTexts, sal_Int32 i_nIndex ) { // without a help text set and the correct smartID, // help texts will be retrieved from the online help system @@ -810,7 +810,7 @@ void PrintDialog::setupOptionalUI() { if (rOptions[i].Name == "OptionsUIFile") { - rtl::OUString sOptionsUIFile; + OUString sOptionsUIFile; rOptions[i].Value >>= sOptionsUIFile; Window *pCustom = get("customcontents"); @@ -826,18 +826,18 @@ void PrintDialog::setupOptionalUI() rOptions[i].Value >>= aOptProp; // extract ui element - rtl::OUString aCtrlType; - rtl::OString aID; - rtl::OUString aText; - rtl::OUString aPropertyName; - Sequence< rtl::OUString > aChoices; + OUString aCtrlType; + OString aID; + OUString aText; + OUString aPropertyName; + Sequence< OUString > aChoices; Sequence< sal_Bool > aChoicesDisabled; - Sequence< rtl::OUString > aHelpTexts; - Sequence< rtl::OUString > aIDs; - Sequence< rtl::OUString > aHelpIds; + Sequence< OUString > aHelpTexts; + Sequence< OUString > aIDs; + Sequence< OUString > aHelpIds; sal_Int64 nMinValue = 0, nMaxValue = 0; - rtl::OUString aGroupingHint; - rtl::OUString aDependsOnName; + OUString aGroupingHint; + OUString aDependsOnName; sal_Int32 nDependsOnValue = 0; sal_Bool bUseDependencyRow = sal_False; @@ -847,7 +847,7 @@ void PrintDialog::setupOptionalUI() if ( rEntry.Name == "ID" ) { rEntry.Value >>= aIDs; - aID = rtl::OUStringToOString(aIDs[0], RTL_TEXTENCODING_UTF8); + aID = OUStringToOString(aIDs[0], RTL_TEXTENCODING_UTF8); } if ( rEntry.Name == "Text" ) { @@ -904,7 +904,7 @@ void PrintDialog::setupOptionalUI() { if( ! (rEntry.Value >>= aHelpTexts) ) { - rtl::OUString aHelpText; + OUString aHelpText; if( (rEntry.Value >>= aHelpText) ) { aHelpTexts.realloc( 1 ); @@ -916,7 +916,7 @@ void PrintDialog::setupOptionalUI() { if( ! (rEntry.Value >>= aHelpIds ) ) { - rtl::OUString aHelpId; + OUString aHelpId; if( (rEntry.Value >>= aHelpId) ) { aHelpIds.realloc( 1 ); @@ -943,7 +943,7 @@ void PrintDialog::setupOptionalUI() // set help id if (aHelpIds.getLength() > 0) - mpTabCtrl->SetHelpId(nPageId, rtl::OUStringToOString(aHelpIds.getConstArray()[0], RTL_TEXTENCODING_UTF8)); + mpTabCtrl->SetHelpId(nPageId, OUStringToOString(aHelpIds.getConstArray()[0], RTL_TEXTENCODING_UTF8)); // set help text if (aHelpTexts.getLength() > 0) @@ -1024,7 +1024,7 @@ void PrintDialog::setupOptionalUI() pVal->Value >>= nSelectVal; for( sal_Int32 m = 0; m < aChoices.getLength(); m++ ) { - aID = rtl::OUStringToOString(aIDs[m], RTL_TEXTENCODING_UTF8); + aID = OUStringToOString(aIDs[m], RTL_TEXTENCODING_UTF8); RadioButton* pBtn = get(aID); if (!pBtn && mpCustomOptionsUIBuilder) pBtn = mpCustomOptionsUIBuilder->get(aID); @@ -1108,7 +1108,7 @@ void PrintDialog::setupOptionalUI() if (!pField && mpCustomOptionsUIBuilder) pField = mpCustomOptionsUIBuilder->get(aID); - rtl::OUString aCurVal; + OUString aCurVal; PropertyValue* pVal = maPController->getValue( aPropertyName ); if( pVal && pVal->Value.hasValue() ) pVal->Value >>= aCurVal; @@ -1126,9 +1126,9 @@ void PrintDialog::setupOptionalUI() } else { - rtl::OStringBuffer sMessage; + OStringBuffer sMessage; sMessage.append("Unsupported UI option: \""); - sMessage.append(rtl::OUStringToOString(aCtrlType, RTL_TEXTENCODING_UTF8)); + sMessage.append(OUStringToOString(aCtrlType, RTL_TEXTENCODING_UTF8)); sMessage.append('"'); OSL_FAIL( sMessage.getStr() ); } @@ -1189,7 +1189,7 @@ void PrintDialog::checkControlDependencies() void PrintDialog::checkOptionalControlDependencies() { - for( std::map< Window*, rtl::OUString >::iterator it = maControlToPropertyMap.begin(); + for( std::map< Window*, OUString >::iterator it = maControlToPropertyMap.begin(); it != maControlToPropertyMap.end(); ++it ) { bool bShouldbeEnabled = maPController->isUIOptionEnabled( it->second ); @@ -1204,7 +1204,7 @@ void PrintDialog::checkOptionalControlDependencies() // "Page Range" instead of "Print All" if the Edit gets modified if( maReverseDependencySet.find( it->second ) != maReverseDependencySet.end() ) { - rtl::OUString aDep( maPController->getDependency( it->second ) ); + OUString aDep( maPController->getDependency( it->second ) ); // if the dependency is at least enabled, then enable this control anyway if( !aDep.isEmpty() && maPController->isUIOptionEnabled( aDep ) ) bShouldbeEnabled = true; @@ -1228,12 +1228,12 @@ void PrintDialog::checkOptionalControlDependencies() } } -static rtl::OUString searchAndReplace( const rtl::OUString& i_rOrig, const char* i_pRepl, sal_Int32 i_nReplLen, const rtl::OUString& i_rRepl ) +static OUString searchAndReplace( const OUString& i_rOrig, const char* i_pRepl, sal_Int32 i_nReplLen, const OUString& i_rRepl ) { sal_Int32 nPos = i_rOrig.indexOfAsciiL( i_pRepl, i_nReplLen ); if( nPos != -1 ) { - rtl::OUStringBuffer aBuf( i_rOrig.getLength() ); + OUStringBuffer aBuf( i_rOrig.getLength() ); aBuf.append( i_rOrig.getStr(), nPos ); aBuf.append( i_rRepl ); if( nPos + i_nReplLen < i_rOrig.getLength() ) @@ -1245,14 +1245,14 @@ static rtl::OUString searchAndReplace( const rtl::OUString& i_rOrig, const char* void PrintDialog::updatePrinterText() { - const rtl::OUString aDefPrt( Printer::GetDefaultPrinterName() ); + const OUString aDefPrt( Printer::GetDefaultPrinterName() ); const QueueInfo* pInfo = Printer::GetQueueInfo( maJobPage.mpPrinters->GetSelectEntry(), true ); if( pInfo ) { maJobPage.mpLocationTxt->SetText( pInfo->GetLocation() ); maJobPage.mpCommentTxt->SetText( pInfo->GetComment() ); // FIXME: status text - rtl::OUString aStatus; + OUString aStatus; if( aDefPrt == pInfo->GetPrinterName() ) aStatus = maDefPrtText; maJobPage.mpStatusTxt->SetText( aStatus ); @@ -1267,7 +1267,7 @@ void PrintDialog::updatePrinterText() void PrintDialog::setPreviewText( sal_Int32 ) { - rtl::OUString aNewText( searchAndReplace( maPageStr, "%n", 2, rtl::OUString::valueOf( mnCachedPages ) ) ); + OUString aNewText( searchAndReplace( maPageStr, "%n", 2, OUString::valueOf( mnCachedPages ) ) ); mpNumPagesText->SetText( aNewText ); } @@ -1306,7 +1306,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache ) Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ); mpPreviewWindow->setPreview( aMtf, aCurPageSize, aPrt->GetPaperName( false ), - nPages > 0 ? rtl::OUString() : maNoPageStr, + nPages > 0 ? OUString() : maNoPageStr, aPrt->ImplGetDPIX(), aPrt->ImplGetDPIY(), aPrt->GetPrinterOptions().IsConvertToGreyscales() ); @@ -1517,7 +1517,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) Help* pHelp = Application::GetHelp(); if( pHelp ) { - pHelp->Start( rtl::OUString("vcl/ui/printdialog"), mpOKButton ); + pHelp->Start( OUString("vcl/ui/printdialog"), mpOKButton ); } } else if( pButton == mpForwardBtn ) @@ -1562,7 +1562,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) } else if( pButton == maJobPage.mpCollateBox ) { - maPController->setValue( rtl::OUString( "Collate" ), + maPController->setValue( OUString( "Collate" ), makeAny( sal_Bool(isCollate()) ) ); checkControlDependencies(); } @@ -1570,7 +1570,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) { sal_Bool bChecked = maJobPage.mpReverseOrderBox->IsChecked(); maPController->setReversePrint( bChecked ); - maPController->setValue( rtl::OUString( "PrintReverse" ), + maPController->setValue( OUString( "PrintReverse" ), makeAny( bChecked ) ); preparePreview( true, true ); } @@ -1606,9 +1606,9 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit ) } else if( pEdit == maJobPage.mpCopyCountField ) { - maPController->setValue( rtl::OUString( "CopyCount" ), + maPController->setValue( OUString( "CopyCount" ), makeAny( sal_Int32(maJobPage.mpCopyCountField->GetValue()) ) ); - maPController->setValue( rtl::OUString( "Collate" ), + maPController->setValue( OUString( "Collate" ), makeAny( sal_Bool(isCollate()) ) ); } return 0; @@ -1623,7 +1623,7 @@ IMPL_LINK_NOARG(PrintDialog, UIOptionsChanged) PropertyValue* PrintDialog::getValueForWindow( Window* i_pWindow ) const { PropertyValue* pVal = NULL; - std::map< Window*, rtl::OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); + std::map< Window*, OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); if( it != maControlToPropertyMap.end() ) { pVal = maPController->getValue( it->second ); @@ -1636,10 +1636,10 @@ PropertyValue* PrintDialog::getValueForWindow( Window* i_pWindow ) const return pVal; } -void PrintDialog::updateWindowFromProperty( const rtl::OUString& i_rProperty ) +void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty ) { beans::PropertyValue* pValue = maPController->getValue( i_rProperty ); - std::map< rtl::OUString, std::vector< Window* > >::const_iterator it = maPropertyToWindowMap.find( i_rProperty ); + std::map< OUString, std::vector< Window* > >::const_iterator it = maPropertyToWindowMap.find( i_rProperty ); if( pValue && it != maPropertyToWindowMap.end() ) { const std::vector< Window* >& rWindows( it->second ); @@ -1690,10 +1690,10 @@ void PrintDialog::updateWindowFromProperty( const rtl::OUString& i_rProperty ) void PrintDialog::makeEnabled( Window* i_pWindow ) { - std::map< Window*, rtl::OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); + std::map< Window*, OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); if( it != maControlToPropertyMap.end() ) { - rtl::OUString aDependency( maPController->makeEnabled( it->second ) ); + OUString aDependency( maPController->makeEnabled( it->second ) ); if( !aDependency.isEmpty() ) updateWindowFromProperty( aDependency ); } @@ -1781,7 +1781,7 @@ IMPL_LINK( PrintDialog, UIOption_ModifyHdl, Edit*, i_pBox ) } else { - rtl::OUString aVal( i_pBox->GetText() ); + OUString aVal( i_pBox->GetText() ); pVal->Value <<= aVal; } @@ -1871,7 +1871,7 @@ void PrintProgressDialog::implCalcProgressRect() Rectangle aControlRegion( Point(), Size( 100, mnProgressHeight ) ); Rectangle aNativeControlRegion, aNativeContentRegion; if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) ) { mnProgressHeight = aNativeControlRegion.GetHeight(); @@ -1894,8 +1894,8 @@ void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax ) if( mnMax < 1 ) mnMax = 1; - rtl::OUString aNewText( searchAndReplace( maStr, "%p", 2, rtl::OUString::valueOf( mnCur ) ) ); - aNewText = searchAndReplace( aNewText, "%n", 2, rtl::OUString::valueOf( mnMax ) ); + OUString aNewText( searchAndReplace( maStr, "%p", 2, OUString::valueOf( mnCur ) ) ); + aNewText = searchAndReplace( aNewText, "%n", 2, OUString::valueOf( mnMax ) ); maText.SetText( aNewText ); // update progress diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index fca03519c4ff..505177d9836b 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -76,7 +76,7 @@ struct ImplStatusItem XubString maText; XubString maHelpText; XubString maQuickHelpText; - rtl::OString maHelpId; + OString maHelpId; void* mpUserData; sal_Bool mbVisible; XubString maAccessibleName; @@ -528,7 +528,7 @@ void DrawProgress( Window* pWindow, const Point& rPos, pWindow->IntersectClipRegion( rFramePosSize ); } sal_Bool bNativeOK = pWindow->DrawNativeControl( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString() ); + CTRL_STATE_ENABLED, aValue, OUString() ); if( bNeedErase ) pWindow->Pop(); if( bNativeOK ) @@ -669,7 +669,7 @@ void StatusBar::ImplCalcProgressRect() Rectangle aControlRegion( Rectangle( (const Point&)Point(), maPrgsFrameRect.GetSize() ) ); Rectangle aNativeControlRegion, aNativeContentRegion; if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) ) != sal_False ) { long nProgressHeight = aNativeControlRegion.GetHeight(); @@ -833,7 +833,7 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { String aCommand = GetItemCommand( nItemId ); - rtl::OString aHelpId( GetHelpId( nItemId ) ); + OString aHelpId( GetHelpId( nItemId ) ); if ( aCommand.Len() || !aHelpId.isEmpty() ) { @@ -844,7 +844,7 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) if ( aCommand.Len() ) pHelp->Start( aCommand, this ); else if ( !aHelpId.isEmpty() ) - pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pHelp->Start( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return; } @@ -1236,7 +1236,7 @@ const XubString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const if ( pItem->maCommand.Len() ) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommand, this ); if ( !pItem->maHelpText.Len() && !pItem->maHelpId.isEmpty() ) - pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } } @@ -1273,7 +1273,7 @@ const XubString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void StatusBar::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) +void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1283,18 +1283,18 @@ void StatusBar::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) // ----------------------------------------------------------------------- -rtl::OString StatusBar::GetHelpId( sal_uInt16 nItemId ) const +OString StatusBar::GetHelpId( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); - rtl::OString aRet; + OString aRet; if ( nPos != STATUSBAR_ITEM_NOTFOUND ) { ImplStatusItem* pItem = (*mpItemList)[ nPos ]; if ( !pItem->maHelpId.isEmpty() ) aRet = pItem->maHelpId; else - aRet = ::rtl::OUStringToOString( pItem->maCommand, RTL_TEXTENCODING_UTF8 ); + aRet = OUStringToOString( pItem->maCommand, RTL_TEXTENCODING_UTF8 ); } return aRet; @@ -1428,7 +1428,7 @@ Size StatusBar::CalcWindowSizePixel() const Rectangle aControlRegion( (const Point&)Point(), Size( nCalcWidth, nMinHeight ) ); Rectangle aNativeControlRegion, aNativeContentRegion; if( pThis->GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) ) { nProgressHeight = aNativeControlRegion.GetHeight(); @@ -1442,7 +1442,7 @@ Size StatusBar::CalcWindowSizePixel() const Rectangle aBound, aContent; Rectangle aNatRgn( Point( 0, 0 ), Size( 150, 50 ) ); if( pThis->GetNativeControlRegion(CTRL_FRAME, PART_BORDER, - aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aNatRgn, 0, aControlValue, OUString(), aBound, aContent) ) { mpImplData->mnItemBorderWidth = ( aBound.GetHeight() - aContent.GetHeight() ) / 2; diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index c2f2f13a6f64..0a98fc2f4b57 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -190,12 +190,12 @@ void SystemChildWindow::ImplTestJavaException( void* pEnv ) jclass jcThrowable = pJavaEnv->FindClass("java/lang/Throwable"); jmethodID jmThrowable_getMessage = pJavaEnv->GetMethodID(jcThrowable, "getMessage", "()Ljava/lang/String;"); jstring jsMessage = (jstring) pJavaEnv->CallObjectMethod(jtThrowable, jmThrowable_getMessage); - ::rtl::OUString ouMessage; + OUString ouMessage; if(jsMessage) { const jchar * jcMessage = pJavaEnv->GetStringChars(jsMessage, NULL); - ouMessage = ::rtl::OUString(jcMessage); + ouMessage = OUString(jcMessage); pJavaEnv->ReleaseStringChars(jsMessage, jcMessage); } diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 57f555258ad3..d37abdd4c16b 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -45,7 +45,7 @@ public: TaskPaneList* mpTaskPaneList; Size maMaxOutSize; - rtl::OUString maRepresentedURL; + OUString maRepresentedURL; Link maCloseHdl; }; @@ -229,7 +229,7 @@ void SystemWindow::Resizing( Size& ) // ----------------------------------------------------------------------- -void SystemWindow::SetRepresentedURL( const rtl::OUString& i_rURL ) +void SystemWindow::SetRepresentedURL( const OUString& i_rURL ) { bool bChanged = (i_rURL != mpImplData->maRepresentedURL); mpImplData->maRepresentedURL = i_rURL; @@ -437,11 +437,11 @@ Size SystemWindow::GetResizeOutputSizePixel() const // ----------------------------------------------------------------------- static void ImplWindowStateFromStr(WindowStateData& rData, - const rtl::OString& rStr) + const OString& rStr) { sal_uLong nValidMask = 0; sal_Int32 nIndex = 0; - rtl::OString aTokenStr; + OString aTokenStr; aTokenStr = rStr.getToken(0, ',', nIndex); if (!aTokenStr.isEmpty()) @@ -552,13 +552,13 @@ static void ImplWindowStateFromStr(WindowStateData& rData, // ----------------------------------------------------------------------- -static rtl::OString ImplWindowStateToStr(const WindowStateData& rData) +static OString ImplWindowStateToStr(const WindowStateData& rData) { sal_uLong nValidMask = rData.GetMask(); if ( !nValidMask ) - return rtl::OString(); + return OString(); - rtl::OStringBuffer rStrBuf; + OStringBuffer rStrBuf; if ( nValidMask & WINDOWSTATE_MASK_X ) rStrBuf.append(static_cast(rData.GetX())); @@ -895,7 +895,7 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const // ----------------------------------------------------------------------- -void SystemWindow::SetWindowState(const rtl::OString& rStr) +void SystemWindow::SetWindowState(const OString& rStr) { if (rStr.isEmpty()) return; @@ -907,7 +907,7 @@ void SystemWindow::SetWindowState(const rtl::OString& rStr) // ----------------------------------------------------------------------- -rtl::OString SystemWindow::GetWindowState( sal_uLong nMask ) const +OString SystemWindow::GetWindowState( sal_uLong nMask ) const { WindowStateData aData; aData.SetMask( nMask ); @@ -1016,7 +1016,7 @@ void SystemWindow::SetScreenNumber(unsigned int nDisplayScreen) mpWindowImpl->mpFrame->SetScreenNumber( nDisplayScreen ); } -void SystemWindow::SetApplicationID(const rtl::OUString &rApplicationID) +void SystemWindow::SetApplicationID(const OUString &rApplicationID) { mpWindowImpl->mpFrame->SetApplicationID( rApplicationID ); } diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index 7dfeb14c4a20..cedf2ea6756d 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -231,7 +231,7 @@ TabDialog::TabDialog( Window* pParent, const ResId& rResId ) : init(pParent, rResId); } -TabDialog::TabDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ) : +TabDialog::TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : Dialog(pParent, rID, rUIXMLDescription, WINDOW_TABDIALOG) { ImplInitTabDialogData(); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 5a57d4e42710..67225eaac30a 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -95,7 +95,7 @@ TabPage::TabPage( Window* pParent, const ResId& rResId ) : Show(); } -TabPage::TabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription) +TabPage::TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : Window(WINDOW_TABPAGE) { ImplInit(pParent, 0); @@ -156,7 +156,7 @@ void TabPage::Paint( const Rectangle& ) // that has to be scaled properly, clipping makes sure that we do not paint too much Rectangle aCtrlRegion( aPoint, GetOutputSizePixel() ); DrawNativeControl( CTRL_TAB_BODY, part, aCtrlRegion, nState, - aControlValue, rtl::OUString() ); + aControlValue, OUString() ); } } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 2e7bddf1d908..809c8cd375ad 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -175,7 +175,7 @@ int ToolBox::ImplGetDragWidth( ToolBox* pThis ) Rectangle aArea( aPoint, pThis->GetOutputSizePixel() ); if ( pThis->GetNativeControlRegion(CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_VERT : PART_THUMB_HORZ, - aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) ) + aArea, 0, aControlValue, OUString(), aBound, aContent) ) { width = pThis->mbHorz ? aContent.GetWidth() : aContent.GetHeight(); } @@ -301,7 +301,7 @@ void ToolBox::ImplDrawGrip( ToolBox* pThis ) ControlState nState = CTRL_STATE_ENABLED; bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_VERT : PART_THUMB_HORZ, - aCtrlRegion, nState, aToolbarValue, rtl::OUString() ); + aCtrlRegion, nState, aToolbarValue, OUString() ); } if( bNativeOk ) @@ -497,7 +497,7 @@ sal_Bool ToolBox::ImplDrawNativeBackground( ToolBox* pThis, const Region & ) ControlState nState = CTRL_STATE_ENABLED; return pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, - aCtrlRegion, nState, ImplControlValue(), rtl::OUString() ); + aCtrlRegion, nState, ImplControlValue(), OUString() ); } void ToolBox::ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegion ) @@ -2936,7 +2936,7 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ) ImplControlValue aControlValue; ControlState nState = 0; bNativeOk = DrawNativeControl( CTRL_TOOLBAR, nPart, - rRect, nState, aControlValue, rtl::OUString() ); + rRect, nState, aControlValue, OUString() ); } /* Draw the widget only if it can't be drawn natively. */ @@ -2993,7 +2993,7 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 h bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, - rRect, nState, aControlValue, rtl::OUString() ); + rRect, nState, aControlValue, OUString() ); } if( !bNativeOk ) @@ -4241,7 +4241,7 @@ const XubString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const if ( pItem->maCommandStr.Len() ) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommandStr, this ); if ( !pItem->maHelpText.Len() && !pItem->maHelpId.isEmpty() ) - pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } } @@ -4307,7 +4307,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { String aCommand = GetItemCommand( nItemId ); - rtl::OString aHelpId( GetHelpId( nItemId ) ); + OString aHelpId( GetHelpId( nItemId ) ); if ( aCommand.Len() || !aHelpId.isEmpty() ) { @@ -4318,7 +4318,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) if ( aCommand.Len() ) pHelp->Start( aCommand, this ); else if ( !aHelpId.isEmpty() ) - pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pHelp->Start( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return; } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 85f7ca9c8830..c90b075c3c79 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -42,7 +42,6 @@ using namespace vcl; -using ::rtl::OUString; // ======================================================================= @@ -353,9 +352,9 @@ sal_Bool ImplToolItem::IsClipped() const // ----------------------------------------------------------------------- // ----------------------------------------------------------------------- -const rtl::OUString ToolBox::ImplConvertMenuString( const XubString& rStr ) +const OUString ToolBox::ImplConvertMenuString( const XubString& rStr ) { - rtl::OUString aCvtStr( rStr ); + OUString aCvtStr( rStr ); if ( mbMenuStrings ) aCvtStr = comphelper::string::stripEnd(aCvtStr, '.'); aCvtStr = MnemonicGenerator::EraseAllMnemonicChars( aCvtStr ); @@ -1693,7 +1692,7 @@ const XubString& ToolBox::GetHelpText( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void ToolBox::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) +void ToolBox::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -1703,9 +1702,9 @@ void ToolBox::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) // ----------------------------------------------------------------------- -rtl::OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const +OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const { - rtl::OString aRet; + OString aRet; ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -1714,7 +1713,7 @@ rtl::OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const if ( !pItem->maHelpId.isEmpty() ) aRet = pItem->maHelpId; else - aRet = ::rtl::OUStringToOString( pItem->maCommandStr, RTL_TEXTENCODING_UTF8 ); + aRet = OUStringToOString( pItem->maCommandStr, RTL_TEXTENCODING_UTF8 ); } return aRet; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 629a1cf8bc5d..137bc26485a9 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -105,7 +105,6 @@ using namespace ::com::sun::star::datatransfer::dnd; using namespace ::com::sun::star; using namespace com::sun; -using ::rtl::OUString; using ::com::sun::star::awt::XTopWindow; @@ -238,7 +237,7 @@ void Window::ImplInitAppFontData( Window* pWindow ) Rectangle aBoundingRgn( aCtrlRegion ); Rectangle aContentRgn( aCtrlRegion ); if( pWindow->GetNativeControlRegion( CTRL_EDITBOX, PART_ENTIRE_CONTROL, aCtrlRegion, - CTRL_STATE_ENABLED, aControlValue, rtl::OUString(), + CTRL_STATE_ENABLED, aControlValue, OUString(), aBoundingRgn, aContentRgn ) ) { // comment: the magical +6 is for the extra border in bordered @@ -1221,9 +1220,9 @@ void Window::ImplCallMove() // ----------------------------------------------------------------------- -static rtl::OString ImplAutoHelpID( ResMgr* pResMgr ) +static OString ImplAutoHelpID( ResMgr* pResMgr ) { - rtl::OString aRet; + OString aRet; if( pResMgr && Application::IsAutoHelpIdEnabled() ) aRet = pResMgr->GetAutoHelpId(); @@ -4215,7 +4214,7 @@ Window::Window( Window* pParent, const ResId& rResId ) #if OSL_DEBUG_LEVEL > 0 namespace { - rtl::OString lcl_createWindowInfo(const Window& i_rWindow) + OString lcl_createWindowInfo(const Window& i_rWindow) { // skip border windows, they don't carry information which helps diagnosing the problem const Window* pWindow( &i_rWindow ); @@ -4224,11 +4223,11 @@ namespace if ( !pWindow ) pWindow = &i_rWindow; - rtl::OStringBuffer aErrorString; + OStringBuffer aErrorString; aErrorString.append(' '); aErrorString.append(typeid( *pWindow ).name()); aErrorString.append(" ("); - aErrorString.append(rtl::OUStringToOString(pWindow->GetText(), RTL_TEXTENCODING_UTF8)); + aErrorString.append(OUStringToOString(pWindow->GetText(), RTL_TEXTENCODING_UTF8)); aErrorString.append(")"); return aErrorString.makeStringAndClear(); } @@ -4358,7 +4357,7 @@ Window::~Window() #if OSL_DEBUG_LEVEL > 0 if ( sal_True ) // always perform these tests in non-pro versions { - rtl::OStringBuffer aErrorStr; + OStringBuffer aErrorStr; sal_Bool bError = sal_False; Window* pTempWin; if (mpWindowImpl->mpFrameData != 0) @@ -4375,15 +4374,15 @@ Window::~Window() } if ( bError ) { - rtl::OStringBuffer aTempStr; + OStringBuffer aTempStr; aTempStr.append("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") with live SystemWindows destroyed: "); aTempStr.append(aErrorStr.toString()); OSL_FAIL(aTempStr.getStr()); // abort in non-pro version, this must be fixed! - GetpApp()->Abort(rtl::OStringToOUString( + GetpApp()->Abort(OStringToOUString( aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); } } @@ -4401,18 +4400,18 @@ Window::~Window() } if ( bError ) { - rtl::OStringBuffer aTempStr( "Window (" ); - aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTempStr( "Window (" ); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") with live SystemWindows destroyed: "); aTempStr.append(aErrorStr.toString()); OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! + GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! } if ( mpWindowImpl->mpFirstChild ) { - rtl::OStringBuffer aTempStr("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTempStr("Window ("); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") with live children destroyed: "); pTempWin = mpWindowImpl->mpFirstChild; while ( pTempWin ) @@ -4421,13 +4420,13 @@ Window::~Window() pTempWin = pTempWin->mpWindowImpl->mpNext; } OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! + GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! } if ( mpWindowImpl->mpFirstOverlap ) { - rtl::OStringBuffer aTempStr("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTempStr("Window ("); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") with live SystemWindows destroyed: "); pTempWin = mpWindowImpl->mpFirstOverlap; while ( pTempWin ) @@ -4436,7 +4435,7 @@ Window::~Window() pTempWin = pTempWin->mpWindowImpl->mpNext; } OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! + GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! } Window* pMyParent = this; @@ -4450,11 +4449,11 @@ Window::~Window() } if ( pMySysWin && pMySysWin->ImplIsInTaskPaneList( this ) ) { - rtl::OStringBuffer aTempStr("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTempStr("Window ("); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") still in TaskPanelList!"); OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! + GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed! } } #endif @@ -4476,8 +4475,8 @@ Window::~Window() } else { - rtl::OStringBuffer aTempStr("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTempStr("Window ("); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)); aTempStr.append(") not found in TaskPanelList!"); OSL_FAIL( aTempStr.getStr() ); } @@ -4518,12 +4517,12 @@ Window::~Window() // #122232#, this must not happen and is an application bug ! but we try some cleanup to hopefully avoid crashes, see below bHasFocussedChild = sal_True; #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aTempStr("Window ("); - aTempStr.append(rtl::OUStringToOString(GetText(), + OStringBuffer aTempStr("Window ("); + aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8)). append(") with focussed child window destroyed ! THIS WILL LEAD TO CRASHES AND MUST BE FIXED !"); OSL_FAIL( aTempStr.getStr() ); - GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8 )); // abort in non-pro version, this must be fixed! + GetpApp()->Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8 )); // abort in non-pro version, this must be fixed! #endif } @@ -4900,7 +4899,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) } else { - String aStrHelpId( rtl::OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + String aStrHelpId( OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); if ( aStrHelpId.Len() == 0 && ImplGetParent() ) ImplGetParent()->RequestHelp( rHEvt ); else @@ -4911,7 +4910,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) if( aStrHelpId.Len() > 0 ) pHelp->Start( aStrHelpId, this ); else - pHelp->Start( rtl::OUString( OOO_HELP_INDEX ), this ); + pHelp->Start( OUString( OOO_HELP_INDEX ), this ); } } } @@ -7926,7 +7925,7 @@ const XubString& Window::GetHelpText() const { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); - String aStrHelpId( rtl::OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + String aStrHelpId( OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); bool bStrHelpId = (aStrHelpId.Len() > 0); if ( !mpWindowImpl->maHelpText.Len() && bStrHelpId ) @@ -7946,10 +7945,10 @@ const XubString& Window::GetHelpText() const static const char* pEnv = getenv( "HELP_DEBUG" ); if( pEnv && *pEnv ) { - rtl::OUStringBuffer aTxt( 64+mpWindowImpl->maHelpText.Len() ); + OUStringBuffer aTxt( 64+mpWindowImpl->maHelpText.Len() ); aTxt.append( mpWindowImpl->maHelpText ); aTxt.appendAscii( "\n------------------\n" ); - aTxt.append( rtl::OUString( aStrHelpId ) ); + aTxt.append( OUString( aStrHelpId ) ); mpWindowImpl->maHelpText = aTxt.makeStringAndClear(); } mpWindowImpl->mbHelpTextDynamic = sal_False; @@ -9689,9 +9688,9 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& / SetParent( pRealParent ); } -rtl::OUString Window::GetSurroundingText() const +OUString Window::GetSurroundingText() const { - return rtl::OUString(); + return OUString(); } Selection Window::GetSurroundingTextSelection() const diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx index 4a89bd5aec31..5816244c1372 100644 --- a/vcl/test/canvasbitmaptest.cxx +++ b/vcl/test/canvasbitmaptest.cxx @@ -66,7 +66,7 @@ SAL_IMPLEMENT_MAIN() uno::Reference< lang::XMultiServiceFactory > xMS; xMS = cppu::createRegistryServiceFactory( - rtl::OUString( "applicat.rdb" ), + OUString( "applicat.rdb" ), sal_True ); comphelper::setProcessServiceFactory( xMS ); @@ -111,7 +111,7 @@ class TestWindow : public Dialog public: TestWindow() : Dialog( (Window *) NULL ) { - SetText( rtl::OUString("CanvasBitmap test harness") ); + SetText( OUString("CanvasBitmap test harness") ); SetSizePixel( Size( 1024, 1024 ) ); EnablePaint( true ); Show(); @@ -1024,7 +1024,7 @@ void Main() { TestWindow aWindow; aWindow.Execute(); - aWindow.SetText( rtl::OUString( "VCL - canvasbitmaptest" ) ); + aWindow.SetText( OUString( "VCL - canvasbitmaptest" ) ); Application::Execute(); } diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx index 83c98872f0ad..b2cf7ada6761 100644 --- a/vcl/test/dndtest.cxx +++ b/vcl/test/dndtest.cxx @@ -181,7 +181,7 @@ void MyApp::Main() MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); - aMainWin.SetText( rtl::OUString( "Drag And Drop - Workbench" ) ); + aMainWin.SetText( OUString( "Drag And Drop - Workbench" ) ); aMainWin.Show(); // test the clipboard code diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 7ff60cb3ed83..d29b43dd74d8 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -384,7 +384,7 @@ PreeditDrawCallback(XIC ic, XPointer client_data, pPreeditData->aInputEv.mpTextAttr = Preedit_FeedbackToSAL( pPreeditData->aText.pCharStyle, pPreeditData->aText.nLength, pPreeditData->aInputFlags); pPreeditData->aInputEv.mnCursorPos = call_data->caret; - pPreeditData->aInputEv.maText = rtl::OUString(pPreeditData->aText.pUnicodeBuffer, + pPreeditData->aInputEv.maText = OUString(pPreeditData->aText.pUnicodeBuffer, pPreeditData->aText.nLength); pPreeditData->aInputEv.mnCursorFlags = 0; // default: make cursor visible pPreeditData->aInputEv.mnDeltaStart = 0; // call_data->chg_first; @@ -546,7 +546,7 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data) else { fprintf( stderr, "XIMStatusDataType %s not supported\n", - call_data->type == XIMBitmapType ? "XIMBitmapType" : rtl::OString::valueOf(static_cast(call_data->type)).getStr() ); + call_data->type == XIMBitmapType ? "XIMBitmapType" : OString::valueOf(static_cast(call_data->type)).getStr() ); } #endif return; @@ -556,7 +556,7 @@ void SwitchIMCallback (XIC, XPointer, XPointer call_data) { XIMSwitchIMNotifyCallbackStruct* pCallData = (XIMSwitchIMNotifyCallbackStruct*)call_data; - ::vcl::I18NStatus::get().changeIM( rtl::OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) ); + ::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) ); } // ---------------------------------------------------------------------------------- diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index dd8abd8cc16b..54a0ae670258 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -568,7 +568,7 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength) aTextEvent.mnTime = 0; aTextEvent.mpTextAttr = 0; aTextEvent.mnCursorPos = nLength; - aTextEvent.maText = rtl::OUString(pText, nLength); + aTextEvent.maText = OUString(pText, nLength); aTextEvent.mnCursorFlags = 0; aTextEvent.mnDeltaStart = 0; aTextEvent.mbOnlyCursor = False; diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 430aea2f43d7..0ba5fc14b54e 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -167,7 +167,7 @@ SetSystemLocale( const char* p_inlocale ) #ifdef SOLARIS static void -SetSystemEnvironment( const rtl::OUString& rLocale ) +SetSystemEnvironment( const OUString& rLocale ) { OUString LC_ALL_Var("LC_ALL"); osl_setEnvironment(LC_ALL_Var.pData, rLocale.pData); diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 53fa8c270ef2..5d7e7f20ea4b 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -597,7 +597,7 @@ void I18NStatus::setStatusText( const String& rText ) else pBuffer[i] = pCopy[i]; } - rtl::OUString aText( pBuffer ); + OUString aText( pBuffer ); m_pStatusWindow->setText( aText ); m_pStatusWindow->setPosition( m_pParent ); diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index b733c734e719..6356c61b3ba5 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -461,7 +461,7 @@ namespace vcl_sal { }; // translate keycodes, used within the displayed menu shortcuts - rtl::OUString getKeysymReplacementName( rtl::OUString pLang, KeySym nSymbol ) + OUString getKeysymReplacementName( OUString pLang, KeySym nSymbol ) { for( unsigned int n = 0; n < SAL_N_ELEMENTS(aKeyboards); n++ ) { @@ -471,7 +471,7 @@ namespace vcl_sal { for( int m = aKeyboards[n].nReplacements ; m ; ) { if( nSymbol == pRepl[--m].aSymbol ) - return rtl::OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); + return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); } } } @@ -481,10 +481,10 @@ namespace vcl_sal { for( int m = SAL_N_ELEMENTS(aImplReplacements_English); m ; ) { if( nSymbol == pRepl[--m].aSymbol ) - return rtl::OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); + return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); } - return rtl::OUString(); + return OUString(); } } diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index c7f5351dc137..6202b34c077f 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -405,15 +405,15 @@ void SalXLib::Init() // is there a -display command line parameter? sal_uInt32 nParams = osl_getCommandArgCount(); - rtl::OUString aParam; - rtl::OString aDisplay; + OUString aParam; + OString aDisplay; for (sal_uInt16 i=0; i= 50) && (nDPI <= 500) ) @@ -723,10 +722,10 @@ sal_uInt16 SalDisplay::GetIndicatorState() const return nState; } -rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const +OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const { - rtl::OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage(); - rtl::OUString aRet; + OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage(); + OUString aRet; // return an empty string for keysyms that are not bound to // any key code @@ -734,7 +733,7 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const if( aKeyCode != 0 && aKeyCode != NoSymbol ) { if( !nKeySym ) - aRet = rtl::OUString( "???" ); + aRet = OUString( "???" ); else { aRet = ::vcl_sal::getKeysymReplacementName( aLang, nKeySym ); @@ -743,9 +742,9 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const const char *pString = XKeysymToString( nKeySym ); int n = strlen( pString ); if( n > 2 && pString[n-2] == '_' ) - aRet = rtl::OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 ); + aRet = OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 ); else - aRet = rtl::OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 ); + aRet = OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 ); } } } @@ -789,7 +788,7 @@ void SalDisplay::ModifierMapping() XFreeModifiermap( pXModMap ); } -rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const +OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const { String aStrMap; String aCustomKeyName; diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 7cb72e8d5bf0..cfa587ec7f57 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -138,7 +138,7 @@ SalSession * SessionManagerClient::m_pSession = NULL; boost::scoped_ptr< ICEConnectionObserver > SessionManagerClient::m_pICEConnectionObserver; SmcConn SessionManagerClient::m_pSmcConnection = NULL; -rtl::OString SessionManagerClient::m_aClientID; +OString SessionManagerClient::m_aClientID; bool SessionManagerClient::m_bDocSaveDone = false; // HACK extern "C" { @@ -164,7 +164,7 @@ static void BuildSmPropertyList() { if( ! pSmProps ) { - rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding())); + OString aExec(OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding())); nSmProps = 5; pSmProps = new SmProp[ nSmProps ]; @@ -198,8 +198,8 @@ static void BuildSmPropertyList() pSmProps[ 2 ].vals[2].length = aRestartOptionNoLogo.getLength()+1; pSmProps[ 2 ].vals[2].value = strdup(aRestartOptionNoLogo.getStr()); - rtl::OUString aUserName; - rtl::OString aUser; + OUString aUserName; + OString aUser; oslSecurity aSec = osl_getCurrentSecurity(); if( aSec ) { @@ -431,7 +431,7 @@ void SessionManagerClient::open(SalSession * pSession) aCallbacks.save_complete.client_data = NULL; aCallbacks.shutdown_cancelled.callback = ShutdownCanceledProc; aCallbacks.shutdown_cancelled.client_data = NULL; - rtl::OString aPrevId(getPreviousSessionID()); + OString aPrevId(getPreviousSessionID()); char* pClientID = NULL; char aErrBuf[1024]; m_pSmcConnection = SmcOpenConnection( NULL, @@ -476,7 +476,7 @@ void SessionManagerClient::open(SalSession * pSession) } } -rtl::OString SessionManagerClient::getSessionID() +OString SessionManagerClient::getSessionID() { return m_aClientID; } @@ -522,9 +522,9 @@ void SessionManagerClient::interactionDone( bool bCancelShutdown ) } -rtl::OUString SessionManagerClient::getExecName() +OUString SessionManagerClient::getExecName() { - rtl::OUString aExec, aSysExec; + OUString aExec, aSysExec; osl_getExecutableFile( &aExec.pData ); osl_getSystemPathFromFileURL( aExec.pData, &aSysExec.pData ); @@ -534,18 +534,18 @@ rtl::OUString SessionManagerClient::getExecName() } -rtl::OString SessionManagerClient::getPreviousSessionID() +OString SessionManagerClient::getPreviousSessionID() { - rtl::OString aPrevId; + OString aPrevId; sal_uInt32 n = rtl_getAppCommandArgCount(); for (sal_uInt32 i = 0; i != n; ++i) { - ::rtl::OUString aArg; + OUString aArg; rtl_getAppCommandArg( i, &aArg.pData ); if(aArg.match("--session=")) { - aPrevId = rtl::OUStringToOString( + aPrevId = OUStringToOString( aArg.copy(RTL_CONSTASCII_LENGTH("--session=")), osl_getThreadTextEncoding()); break; diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index b2de7a048333..c5fa4bc0540c 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -211,7 +211,7 @@ WMAdaptor* WMAdaptor::createWMAdaptor( SalDisplay* pSalDisplay ) #if OSL_DEBUG_LEVEL > 1 fprintf(stderr, "Window Manager's name is \"%s\"\n", - rtl::OUStringToOString(pAdaptor->getWindowManagerName(), + OUStringToOString(pAdaptor->getWindowManagerName(), RTL_TEXTENCODING_UTF8).getStr()); #endif return pAdaptor; @@ -843,7 +843,7 @@ bool WMAdaptor::getNetWmName() && nItems != 0 ) { - rtl::OUString aMetaVersion( (sal_Char*)pProperty, nItems, RTL_TEXTENCODING_UTF8 ); + OUString aMetaVersion( (sal_Char*)pProperty, nItems, RTL_TEXTENCODING_UTF8 ); nVersionMajor = aMetaVersion.getToken(0, '.').toInt32(); nVersionMinor = aMetaVersion.getToken(1, '.').toInt32(); } @@ -888,8 +888,8 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const pWMA->m_bWMshouldSwitchWorkspace = true; vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get(); - rtl::OUString aSetting( pItem->getValue( rtl::OUString( "WM" ), - rtl::OUString( "ShouldSwitchWorkspace" ) ) ); + OUString aSetting( pItem->getValue( OUString( "WM" ), + OUString( "ShouldSwitchWorkspace" ) ) ); if( aSetting.isEmpty() ) { if( m_aWMName.EqualsAscii( "awesome" ) ) @@ -981,27 +981,27 @@ void GnomeWMAdaptor::initAtoms() void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const { - rtl::OString aTitle(rtl::OUStringToOString(rWMName, + OString aTitle(OUStringToOString(rWMName, osl_getThreadTextEncoding())); /* FIXME-BCP47: what slumbering dogs may we wake up here? */ - ::rtl::OString aWMLocale; + OString aWMLocale; rtl_Locale* pLocale = NULL; osl_getProcessLocale( &pLocale ); if( pLocale ) { - ::rtl::OUString aLocaleString( pLocale->Language ); - ::rtl::OUString aCountry( pLocale->Country ); - ::rtl::OUString aVariant( pLocale->Variant ); + OUString aLocaleString( pLocale->Language ); + OUString aCountry( pLocale->Country ); + OUString aVariant( pLocale->Variant ); if( !aCountry.isEmpty() ) { - aLocaleString += ::rtl::OUString("_"); + aLocaleString += OUString("_"); aLocaleString += aCountry; } if( !aVariant.isEmpty() ) aLocaleString += aVariant; - aWMLocale = ::rtl::OUStringToOString( aLocaleString, RTL_TEXTENCODING_ISO_8859_1 ); + aWMLocale = OUStringToOString( aLocaleString, RTL_TEXTENCODING_ISO_8859_1 ); } else { @@ -1101,7 +1101,7 @@ void NetWMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const { WMAdaptor::setWMName( pFrame, rWMName ); - rtl::OString aTitle(rtl::OUStringToOString(rWMName, RTL_TEXTENCODING_UTF8)); + OString aTitle(OUStringToOString(rWMName, RTL_TEXTENCODING_UTF8)); const SystemEnvData* pEnv = pFrame->GetSystemData(); if( m_aWMAtoms[ NET_WM_NAME ] ) XChangeProperty( m_pDisplay, @@ -2386,7 +2386,7 @@ void WMAdaptor::setPID( X11SalFrame* i_pFrame ) const */ void WMAdaptor::setClientMachine( X11SalFrame* i_pFrame ) const { - rtl::OString aWmClient( rtl::OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) ); + OString aWmClient( OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) ); XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(), XA_STRING, 8, sal::static_int_cast( aWmClient.getLength() ) }; XSetWMClientMachine( m_pDisplay, i_pFrame->GetShellWindow(), &aClientProp ); } diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index e98dfc2dce8f..465326b4209a 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -35,8 +35,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OString; static bool is_gnome_desktop( Display* pDisplay ) { @@ -246,7 +244,7 @@ static bool is_kde_desktop( Display* pDisplay ) return true; // does not exist => KDE3 } - rtl::OUString aVer( "3" ); + OUString aVer( "3" ); if ( aVer.equalsIgnoreAsciiCaseAscii( pVer ) ) { return true; @@ -263,7 +261,7 @@ static bool is_kde4_desktop( Display* pDisplay ) { if ( NULL != getenv( "KDE_FULL_SESSION" ) ) { - rtl::OUString aVer( "4" ); + OUString aVer( "4" ); const char *pVer = getenv( "KDE_SESSION_VERSION" ); if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) ) diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index dee55c4b47c1..82f1ce9ee34c 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -44,7 +44,6 @@ using namespace cppu; using namespace osl; using namespace x11; -using ::rtl::OUString; X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : ::cppu::WeakComponentImplHelper2< diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index 19f56e842780..18c08b036f7e 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -61,7 +61,7 @@ namespace x11 { X11Clipboard( SelectionManager& rManager, Atom aSelection ); virtual ~X11Clipboard(); - static X11Clipboard* get( const ::rtl::OUString& rDisplayName, Atom aSelection ); + static X11Clipboard* get( const OUString& rDisplayName, Atom aSelection ); /* * XInitialization @@ -72,13 +72,13 @@ namespace x11 { * XServiceInfo */ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); /* @@ -93,7 +93,7 @@ namespace x11 { const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw(RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw(RuntimeException); /* @@ -125,7 +125,7 @@ namespace x11 { // ------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL X11Clipboard_getSupportedServiceNames(); + Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames(); com::sun::star::uno::Reference< XInterface > SAL_CALL X11Clipboard_createInstance( const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx index f995006f5356..f262003e10f9 100644 --- a/vcl/unx/generic/dtrans/X11_droptarget.cxx +++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::awt; using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::dnd; -using ::rtl::OUString; DropTarget::DropTarget() : ::cppu::WeakComponentImplHelper3< diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 46c2910ed8fb..90e14923b31f 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -82,9 +82,6 @@ using namespace cppu; using namespace x11; -using ::rtl::OUString; -using ::rtl::OUStringHash; -using ::rtl::OStringToOUString; // stubs to satisfy solaris compiler's rather rigid linking warning extern "C" @@ -1022,7 +1019,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In // ------------------------------------------------------------------------ -bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rType, Sequence< sal_Int8 >& rData ) +bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData ) { bool bSuccess = false; diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 823cd5f259b7..5e6d45e1342c 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -51,7 +51,7 @@ namespace x11 { class PixmapHolder; // in bmp.hxx // ------------------------------------------------------------------------ - rtl_TextEncoding getTextPlainEncoding( const ::rtl::OUString& rMimeType ); + rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType ); class SelectionAdaptor { @@ -106,9 +106,9 @@ namespace x11 { virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual OUString SAL_CALL getImplementationName() throw(); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(); }; @@ -127,9 +127,9 @@ namespace x11 { virtual ~SelectionManagerHolder(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual OUString SAL_CALL getImplementationName() throw(); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(); // XInitialization @@ -157,7 +157,7 @@ namespace x11 { >, public SelectionAdaptor { - static ::boost::unordered_map< ::rtl::OUString, SelectionManager*, ::rtl::OUStringHash >& getInstances(); + static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& getInstances(); // for INCR type selection transfer // INCR protocol is used if the data cannot @@ -361,9 +361,9 @@ namespace x11 { Atom m_nXdndActionPrivate; // caching for atoms - ::boost::unordered_map< Atom, ::rtl::OUString > + ::boost::unordered_map< Atom, OUString > m_aAtomToString; - ::boost::unordered_map< ::rtl::OUString, Atom, ::rtl::OUStringHash > + ::boost::unordered_map< OUString, Atom, OUStringHash > m_aStringToAtom; // the registered selections @@ -426,13 +426,13 @@ namespace x11 { bool handleXEvent( XEvent& rEvent ); // compound text conversion - ::rtl::OString convertToCompound( const ::rtl::OUString& rText ); - ::rtl::OUString convertFromCompound( const char* pText, int nLen = -1 ); + OString convertToCompound( const OUString& rText ); + OUString convertFromCompound( const char* pText, int nLen = -1 ); sal_Int8 getUserDragAction() const; sal_Int32 getSelectionTimeout(); public: - static SelectionManager& get( const ::rtl::OUString& rDisplayName = ::rtl::OUString() ); + static SelectionManager& get( const OUString& rDisplayName = OUString() ); Display * getDisplay() { return m_pDisplay; }; XLIB_Window getWindow() { return m_aWindow; }; @@ -446,19 +446,19 @@ namespace x11 { osl::Mutex& getMutex() { return m_aMutex; } - Atom getAtom( const ::rtl::OUString& rString ); - const ::rtl::OUString& getString( Atom nAtom ); + Atom getAtom( const OUString& rString ); + const OUString& getString( Atom nAtom ); // type conversion // note: convertTypeToNative does NOT clear the list, so you can append // multiple types to the same list - void convertTypeToNative( const ::rtl::OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront = false ); - ::rtl::OUString convertTypeFromNative( Atom nType, Atom selection, int& rFormat ); + void convertTypeToNative( const OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront = false ); + OUString convertTypeFromNative( Atom nType, Atom selection, int& rFormat ); void getNativeTypeList( const Sequence< com::sun::star::datatransfer::DataFlavor >& rTypes, std::list< Atom >& rOutTypeList, Atom targetselection ); // methods for transferable bool getPasteDataTypes( Atom selection, Sequence< ::com::sun::star::datatransfer::DataFlavor >& rTypes ); - bool getPasteData( Atom selection, const ::rtl::OUString& rType, Sequence< sal_Int8 >& rData ); + bool getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData ); // for XDropTarget to register/deregister itself void registerDropTarget( XLIB_Window aXLIB_Window, DropTarget* pTarget ); @@ -511,11 +511,11 @@ namespace x11 { // ------------------------------------------------------------------------ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL Xdnd_getSupportedServiceNames(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL Xdnd_dropTarget_getSupportedServiceNames(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_dropTarget_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index dc2ff1766ee2..efc36b74205a 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::awt; using namespace x11; -using ::rtl::OUString; Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames() { @@ -62,7 +61,7 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments ) { - static boost::unordered_map< OUString, ::boost::unordered_map< Atom, Reference< XClipboard > >, ::rtl::OUStringHash > m_aInstances; + static boost::unordered_map< OUString, ::boost::unordered_map< Atom, Reference< XClipboard > >, OUStringHash > m_aInstances; OUString aDisplayName; Atom nSelection; diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index ccc78570344d..bcf54b664d0f 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -35,7 +35,6 @@ using namespace osl; using namespace x11; -using ::rtl::OUString; X11Transferable::X11Transferable( diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index 1b49496e1770..4266f1c5ca31 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -33,7 +33,7 @@ class DtransX11ConfigItem : public ::utl::ConfigItem { sal_Int32 m_nSelectionTimeout; - virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames ); virtual void Commit(); public: DtransX11ConfigItem(); @@ -48,7 +48,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace x11; -using ::rtl::OUString; sal_Int32 SelectionManager::getSelectionTimeout() { diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 8cec77e5bda5..30a1e3b1e6e0 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -88,7 +88,6 @@ struct _XRegion BOX *rects; BOX extents; }; -using ::rtl::OUString; // =========================================================================== // PspKernInfo allows on-demand-querying of psprint provided kerning info (#i29881#) @@ -529,10 +528,10 @@ X11SalGraphics::SetTextColor( SalColor nSalColor ) // ---------------------------------------------------------------------------- bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList, - const rtl::OUString& rFileURL, const rtl::OUString& rFontName ) + const OUString& rFileURL, const OUString& rFontName ) { // inform PSP font manager - rtl::OUString aUSystemPath; + OUString aUSystemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFileURL, aUSystemPath ) ); rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); OString aOFileName( OUStringToOString( aUSystemPath, aEncoding ) ); @@ -556,7 +555,7 @@ bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList, int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID ); - const rtl::OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); + const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA ); } @@ -603,7 +602,7 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList ) // inform GlyphCache about this font provided by the PsPrint subsystem ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes( aInfo ); aDFA.mnQuality += 4096; - const rtl::OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); + const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA, pExtraKernInfo ); } @@ -787,7 +786,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const //-------------------------------------------------------------------------- sal_Bool X11SalGraphics::CreateFontSubset( - const rtl::OUString& rToFile, + const OUString& rToFile, const PhysicalFontFace* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index cbe539420a05..2eec71744955 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -33,8 +33,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; extern "C" { typedef SalInstance*(*salFactoryProc)( oslModule pModule); } @@ -205,7 +203,7 @@ static SalInstance* autodetect_plugin() SalInstance* pInst = NULL; while( pList[nListEntry] && pInst == NULL ) { - rtl::OUString aTry( rtl::OUString::createFromAscii( pList[nListEntry] ) ); + OUString aTry( OUString::createFromAscii( pList[nListEntry] ) ); pInst = tryInstance( aTry ); #if OSL_DEBUG_LEVEL > 1 if( pInst ) @@ -277,12 +275,12 @@ void InitSalMain() { } -void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore ) +void SalAbort( const OUString& rErrorText, bool bDumpCore ) { if( rErrorText.isEmpty() ) std::fprintf( stderr, "Application Error\n" ); else - std::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); + std::fprintf( stderr, "%s\n", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); if( bDumpCore ) abort(); else @@ -293,10 +291,10 @@ static const char * desktop_strings[] = { "none", "unknown", "GNOME", "TDE", "KD const OUString& SalGetDesktopEnvironment() { - static rtl::OUString aRet; + static OUString aRet; if( aRet.isEmpty()) { - rtl::OUStringBuffer buf( 8 ); + OUStringBuffer buf( 8 ); buf.appendAscii( desktop_strings[ get_desktop_environment() ] ); aRet = buf.makeStringAndClear(); } diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 102d19c7e5b8..fe163bb4b35a 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -40,12 +40,6 @@ using namespace psp; using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringHash; -using ::rtl::OString; struct GetPPDAttribs { @@ -576,7 +570,7 @@ void CUPSManager::setupJobContextData( JobData& rData ) FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand ) { OSL_TRACE( "endSpool: %s, %s", - rtl::OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(), bQuickCommand ? "true" : "false" ); if( m_aCUPSDestMap.find( rPrintername ) == m_aCUPSDestMap.end() ) @@ -635,7 +629,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner if( rJob.m_nPDFDevice > 0 && rJob.m_nCopies > 1 ) { - rtl::OString aVal( rtl::OString::valueOf( sal_Int32( rJob.m_nCopies ) ) ); + OString aVal( OString::valueOf( sal_Int32( rJob.m_nCopies ) ) ); rNumOptions = cupsAddOption( "copies", aVal.getStr(), rNumOptions, (cups_option_t**)rOptions ); } if( ! bBanner ) @@ -647,8 +641,8 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ) { OSL_TRACE( "endSpool: %s, %s, copy count = %d", - rtl::OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( rJobTitle, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( rJobTitle, RTL_TEXTENCODING_UTF8 ).getStr(), rDocumentJobData.m_nCopies ); diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index c55f64aad12f..d40fffd913a7 100644 --- a/vcl/unx/generic/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx @@ -79,7 +79,7 @@ bool JobData::setPaper( int i_nWidth, int i_nHeight ) bool bSuccess = false; if( m_pParser ) { - rtl::OUString aPaper( m_pParser->matchPaper( i_nWidth, i_nHeight ) ); + OUString aPaper( m_pParser->matchPaper( i_nWidth, i_nHeight ) ); const PPDKey* pKey = m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) ); const PPDValue* pValue = pKey ? pKey->getValueCaseInsensitive( aPaper ) : NULL; @@ -114,12 +114,12 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes ) SvMemoryStream aStream; // write header job data - aStream.WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("JobData 1"))); + aStream.WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("JobData 1"))); - rtl::OStringBuffer aLine; + OStringBuffer aLine; aLine.append(RTL_CONSTASCII_STRINGPARAM("printer=")); - aLine.append(rtl::OUStringToOString(m_aPrinterName, RTL_TEXTENCODING_UTF8)); + aLine.append(OUStringToOString(m_aPrinterName, RTL_TEXTENCODING_UTF8)); aStream.WriteLine(aLine.makeStringAndClear()); aLine.append(RTL_CONSTASCII_STRINGPARAM("orientation=")); @@ -176,7 +176,7 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes ) bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobData ) { SvMemoryStream aStream( pData, bytes, STREAM_READ ); - rtl::OString aLine; + OString aLine; bool bVersion = false; bool bPrinter = false; bool bOrientation = false; @@ -205,7 +205,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(printerEquals))) { bPrinter = true; - rJobData.m_aPrinterName = rtl::OStringToOUString(aLine.copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8); + rJobData.m_aPrinterName = OStringToOUString(aLine.copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8); } else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(orientatationEquals))) { @@ -220,7 +220,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(margindajustmentEquals))) { bMargin = true; - rtl::OString aValues(aLine.copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals))); + OString aValues(aLine.copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals))); rJobData.m_nLeftMarginAdjust = aValues.getToken(0, ',').toInt32(); rJobData.m_nRightMarginAdjust = aValues.getToken(1, ',').toInt32(); rJobData.m_nTopMarginAdjust = aValues.getToken(2, ',').toInt32(); diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index de65253f3f2a..6b464e9d1cf9 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -70,8 +70,8 @@ namespace psp } }; - typedef boost::unordered_map< com::sun::star::lang::Locale, rtl::OUString, LocaleHash, LocaleEqual > translation_map; - typedef boost::unordered_map< rtl::OUString, translation_map, rtl::OUStringHash > key_translation_map; + typedef boost::unordered_map< com::sun::star::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map; + typedef boost::unordered_map< OUString, translation_map, OUStringHash > key_translation_map; key_translation_map m_aTranslations; public: @@ -80,46 +80,46 @@ namespace psp void insertValue( - const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, - const rtl::OUString& i_rValue, - const rtl::OUString& i_rTranslation, + const OUString& i_rKey, + const OUString& i_rOption, + const OUString& i_rValue, + const OUString& i_rTranslation, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ); - void insertOption( const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, - const rtl::OUString& i_rTranslation, + void insertOption( const OUString& i_rKey, + const OUString& i_rOption, + const OUString& i_rTranslation, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) { - insertValue( i_rKey, i_rOption, rtl::OUString(), i_rTranslation, i_rLocale ); + insertValue( i_rKey, i_rOption, OUString(), i_rTranslation, i_rLocale ); } - void insertKey( const rtl::OUString& i_rKey, - const rtl::OUString& i_rTranslation, + void insertKey( const OUString& i_rKey, + const OUString& i_rTranslation, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) { - insertValue( i_rKey, rtl::OUString(), rtl::OUString(), i_rTranslation, i_rLocale ); + insertValue( i_rKey, OUString(), OUString(), i_rTranslation, i_rLocale ); } - rtl::OUString translateValue( - const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, - const rtl::OUString& i_rValue, + OUString translateValue( + const OUString& i_rKey, + const OUString& i_rOption, + const OUString& i_rValue, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; - rtl::OUString translateOption( const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, + OUString translateOption( const OUString& i_rKey, + const OUString& i_rOption, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const { - return translateValue( i_rKey, i_rOption, rtl::OUString(), i_rLocale ); + return translateValue( i_rKey, i_rOption, OUString(), i_rLocale ); } - rtl::OUString translateKey( const rtl::OUString& i_rKey, + OUString translateKey( const OUString& i_rKey, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const { - return translateValue( i_rKey, rtl::OUString(), rtl::OUString(), i_rLocale ); + return translateValue( i_rKey, OUString(), OUString(), i_rLocale ); } }; @@ -138,14 +138,14 @@ namespace psp static const char* pEnvLocale = getenv( "SAL_PPDPARSER_LOCALE" ); if( pEnvLocale && *pEnvLocale ) { - rtl::OString aStr( pEnvLocale ); + OString aStr( pEnvLocale ); sal_Int32 nLen = aStr.getLength(); - aLoc.Language = rtl::OStringToOUString( aStr.copy( 0, nLen > 2 ? 2 : nLen ), RTL_TEXTENCODING_MS_1252 ); + aLoc.Language = OStringToOUString( aStr.copy( 0, nLen > 2 ? 2 : nLen ), RTL_TEXTENCODING_MS_1252 ); if( nLen >=5 && aStr.getStr()[2] == '_' ) - aLoc.Country = rtl::OStringToOUString( aStr.copy( 3, 2 ), RTL_TEXTENCODING_MS_1252 ); + aLoc.Country = OStringToOUString( aStr.copy( 3, 2 ), RTL_TEXTENCODING_MS_1252 ); else - aLoc.Country = rtl::OUString(); - aLoc.Variant = rtl::OUString(); + aLoc.Country = OUString(); + aLoc.Variant = OUString(); } #endif } @@ -157,14 +157,14 @@ namespace psp } void PPDTranslator::insertValue( - const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, - const rtl::OUString& i_rValue, - const rtl::OUString& i_rTranslation, + const OUString& i_rKey, + const OUString& i_rOption, + const OUString& i_rValue, + const OUString& i_rTranslation, const com::sun::star::lang::Locale& i_rLocale ) { - rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); + OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); aKey.append( i_rKey ); if( !i_rOption.isEmpty() || !i_rValue.isEmpty() ) { @@ -178,7 +178,7 @@ namespace psp } if( aKey.getLength() && !i_rTranslation.isEmpty() ) { - rtl::OUString aK( aKey.makeStringAndClear() ); + OUString aK( aKey.makeStringAndClear() ); com::sun::star::lang::Locale aLoc; aLoc.Language = i_rLocale.Language.toAsciiLowerCase(); aLoc.Country = i_rLocale.Country.toAsciiUpperCase(); @@ -187,16 +187,16 @@ namespace psp } } - rtl::OUString PPDTranslator::translateValue( - const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, - const rtl::OUString& i_rValue, + OUString PPDTranslator::translateValue( + const OUString& i_rKey, + const OUString& i_rOption, + const OUString& i_rValue, const com::sun::star::lang::Locale& i_rLocale ) const { - rtl::OUString aResult; + OUString aResult; - rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); + OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 ); aKey.append( i_rKey ); if( !i_rOption.isEmpty() || !i_rValue.isEmpty() ) { @@ -210,7 +210,7 @@ namespace psp } if( aKey.getLength() ) { - rtl::OUString aK( aKey.makeStringAndClear() ); + OUString aK( aKey.makeStringAndClear() ); key_translation_map::const_iterator it = m_aTranslations.find( aK ); if( it != m_aTranslations.end() ) { @@ -227,9 +227,9 @@ namespace psp } switch( nTry ) { - case 0: aLoc.Variant = rtl::OUString();break; - case 1: aLoc.Country = rtl::OUString();break; - case 2: aLoc.Language = rtl::OUString();break; + case 0: aLoc.Variant = OUString();break; + case 1: aLoc.Country = OUString();break; + case 2: aLoc.Language = OUString();break; } } } @@ -241,7 +241,7 @@ namespace psp { public: std::list< PPDParser* > aAllParsers; - boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >* pAllPPDFiles; + boost::unordered_map< OUString, OUString, OUStringHash >* pAllPPDFiles; PPDCache() : pAllPPDFiles(NULL) {} @@ -260,12 +260,9 @@ namespace psp using namespace psp; -using ::rtl::OUString; -using ::rtl::OStringBuffer; -using ::rtl::OUStringHash; #if OSL_DEBUG_LEVEL > 2 -#define BSTRING(x) rtl::OUStringToOString( x, osl_getThreadTextEncoding() ) +#define BSTRING(x) OUStringToOString( x, osl_getThreadTextEncoding() ) #endif namespace @@ -277,25 +274,25 @@ class PPDDecompressStream { SvFileStream* mpFileStream; SvMemoryStream* mpMemStream; - rtl::OUString maFileName; + OUString maFileName; // forbid copying PPDDecompressStream( const PPDDecompressStream& ); PPDDecompressStream& operator=(const PPDDecompressStream& ); public: - PPDDecompressStream( const rtl::OUString& rFile ); + PPDDecompressStream( const OUString& rFile ); ~PPDDecompressStream(); bool IsOpen() const; bool IsEof() const; - rtl::OString ReadLine(); - void Open( const rtl::OUString& i_rFile ); + OString ReadLine(); + void Open( const OUString& i_rFile ); void Close(); - const rtl::OUString& GetFileName() const { return maFileName; } + const OUString& GetFileName() const { return maFileName; } }; -PPDDecompressStream::PPDDecompressStream( const rtl::OUString& i_rFile ) : +PPDDecompressStream::PPDDecompressStream( const OUString& i_rFile ) : mpFileStream( NULL ), mpMemStream( NULL ) { @@ -307,7 +304,7 @@ PPDDecompressStream::~PPDDecompressStream() Close(); } -void PPDDecompressStream::Open( const rtl::OUString& i_rFile ) +void PPDDecompressStream::Open( const OUString& i_rFile ) { Close(); @@ -320,7 +317,7 @@ void PPDDecompressStream::Open( const rtl::OUString& i_rFile ) return; } - rtl::OString aLine; + OString aLine; mpFileStream->ReadLine( aLine ); mpFileStream->Seek( 0 ); @@ -371,9 +368,9 @@ bool PPDDecompressStream::IsEof() const return ( mpMemStream ? mpMemStream->IsEof() : ( mpFileStream ? mpFileStream->IsEof() : true ) ); } -rtl::OString PPDDecompressStream::ReadLine() +OString PPDDecompressStream::ReadLine() { - rtl::OString o_rLine; + OString o_rLine; if( mpMemStream ) mpMemStream->ReadLine( o_rLine ); else if( mpFileStream ) @@ -381,7 +378,7 @@ rtl::OString PPDDecompressStream::ReadLine() return o_rLine; } -static osl::FileBase::RC resolveLink( const rtl::OUString& i_rURL, rtl::OUString& o_rResolvedURL, rtl::OUString& o_rBaseName, osl::FileStatus::Type& o_rType, int nLinkLevel = 10 ) +static osl::FileBase::RC resolveLink( const OUString& i_rURL, OUString& o_rResolvedURL, OUString& o_rBaseName, osl::FileStatus::Type& o_rType, int nLinkLevel = 10 ) { salhelper::LinkResolver aResolver(osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type | @@ -423,12 +420,12 @@ void PPDParser::scanPPDDir( const String& rDir ) osl::FileStatus aStatus( osl_FileStatus_Mask_FileName ); if( aItem.getFileStatus( aStatus ) == osl::FileBase::E_None ) { - rtl::OUStringBuffer aURLBuf( rDir.Len() + 64 ); + OUStringBuffer aURLBuf( rDir.Len() + 64 ); aURLBuf.append( rDir ); aURLBuf.append( sal_Unicode( '/' ) ); aURLBuf.append( aStatus.getFileName() ); - rtl::OUString aFileURL, aFileName; + OUString aFileURL, aFileName; osl::FileStatus::Type eType = osl::FileStatus::Unknown; if( resolveLink( aURLBuf.makeStringAndClear(), aFileURL, aFileName, eType ) == osl::FileBase::E_None ) @@ -487,7 +484,7 @@ void PPDParser::initPPDFiles() INetURLObject aDir( aExe ); aDir.removeSegment(); #ifdef DEBUG - fprintf( stderr, "scanning last chance dir: %s\n", rtl::OUStringToOString( aDir.GetMainURL( INetURLObject::NO_DECODE ), osl_getThreadTextEncoding() ).getStr() ); + fprintf( stderr, "scanning last chance dir: %s\n", OUStringToOString( aDir.GetMainURL( INetURLObject::NO_DECODE ), osl_getThreadTextEncoding() ).getStr() ); #endif scanPPDDir( aDir.GetMainURL( INetURLObject::NO_DECODE ) ); #ifdef DEBUG @@ -497,7 +494,7 @@ void PPDParser::initPPDFiles() } } -void PPDParser::getKnownPPDDrivers( std::list< rtl::OUString >& o_rDrivers, bool bRefresh ) +void PPDParser::getKnownPPDDrivers( std::list< OUString >& o_rDrivers, bool bRefresh ) { PPDCache &rPPDCache = thePPDCache::get(); @@ -531,7 +528,7 @@ String PPDParser::getPPDFile( const String& rFile ) initPPDFiles(); // some PPD files contain dots beside the extension, so try name first // and cut of points after that - rtl::OUString aBase( rFile ); + OUString aBase( rFile ); sal_Int32 nLastIndex = aBase.lastIndexOf( sal_Unicode( '/' ) ); if( nLastIndex >= 0 ) aBase = aBase.copy( nLastIndex+1 ); @@ -560,7 +557,7 @@ String PPDParser::getPPDFile( const String& rFile ) String aRet; if( aStream.IsOpen() ) { - rtl::OString aLine = aStream.ReadLine(); + OString aLine = aStream.ReadLine(); if (aLine.indexOfL(RTL_CONSTASCII_STRINGPARAM("*PPD-Adobe")) == 0) aRet = aStream.GetFileName(); else @@ -590,8 +587,8 @@ String PPDParser::getPPDPrinterName( const String& rFile ) String aCurLine; while( ! aStream.IsEof() && aStream.IsOpen() ) { - rtl::OString aByteLine = aStream.ReadLine(); - aCurLine = rtl::OStringToOUString(aByteLine, RTL_TEXTENCODING_MS_1252); + OString aByteLine = aStream.ReadLine(); + aCurLine = OStringToOUString(aByteLine, RTL_TEXTENCODING_MS_1252); if( aCurLine.CompareIgnoreCaseToAscii( "*include:", 9 ) == COMPARE_EQUAL ) { aCurLine.Erase( 0, 9 ); @@ -630,7 +627,7 @@ const PPDParser* PPDParser::getParser( const String& rFile ) if( ! aFile.Len() ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "Could not get printer PPD file \"%s\" !\n", ::rtl::OUStringToOString( rFile, osl_getThreadTextEncoding() ).getStr() ); + fprintf( stderr, "Could not get printer PPD file \"%s\" !\n", OUStringToOString( rFile, osl_getThreadTextEncoding() ).getStr() ); #endif return NULL; } @@ -682,17 +679,17 @@ PPDParser::PPDParser( const String& rFile ) : m_pTranslator( new PPDTranslator() ) { // read in the file - std::list< rtl::OString > aLines; + std::list< OString > aLines; PPDDecompressStream aStream( m_aFile ); if( aStream.IsOpen() ) { bool bLanguageEncoding = false; while( ! aStream.IsEof() ) { - rtl::OString aCurLine = aStream.ReadLine(); + OString aCurLine = aStream.ReadLine(); if( aCurLine[0] == '*' ) { - if (aCurLine.matchIgnoreAsciiCase(rtl::OString("*include:"))) + if (aCurLine.matchIgnoreAsciiCase(OString("*include:"))) { aCurLine = aCurLine.copy(9); aCurLine = comphelper::string::stripStart(aCurLine, ' '); @@ -704,14 +701,14 @@ PPDParser::PPDParser( const String& rFile ) : aCurLine = comphelper::string::stripStart(aCurLine, '"'); aCurLine = comphelper::string::stripEnd(aCurLine, '"'); aStream.Close(); - aStream.Open(getPPDFile(rtl::OStringToOUString(aCurLine, m_aFileEncoding))); + aStream.Open(getPPDFile(OStringToOUString(aCurLine, m_aFileEncoding))); continue; } else if( ! bLanguageEncoding && - aCurLine.matchIgnoreAsciiCase(rtl::OString("*languageencoding")) ) + aCurLine.matchIgnoreAsciiCase(OString("*languageencoding")) ) { bLanguageEncoding = true; // generally only the first one counts - rtl::OString aLower = aCurLine.toAsciiLowerCase(); + OString aLower = aCurLine.toAsciiLowerCase(); if( aLower.indexOfL(RTL_CONSTASCII_STRINGPARAM("isolatin1"), 17 ) != -1 || aLower.indexOfL(RTL_CONSTASCII_STRINGPARAM("windowsansi"), 17 ) != -1 ) m_aFileEncoding = RTL_TEXTENCODING_MS_1252; @@ -798,12 +795,12 @@ PPDParser::PPDParser( const String& rFile ) : if (m_pImageableAreas == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no ImageableArea in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } if (m_pDefaultImageableArea == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no DefaultImageableArea in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } m_pPaperDimensions = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PaperDimension" ) ) ); @@ -812,12 +809,12 @@ PPDParser::PPDParser( const String& rFile ) : if (m_pPaperDimensions == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no PaperDimensions in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } if (m_pDefaultPaperDimension == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no DefaultPaperDimensions in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } m_pResolutions = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Resolution" ) ) ); @@ -826,12 +823,12 @@ PPDParser::PPDParser( const String& rFile ) : if (m_pResolutions == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no Resolution in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } if (m_pDefaultResolution == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no DefaultResolution in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } m_pInputSlots = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ); @@ -840,12 +837,12 @@ PPDParser::PPDParser( const String& rFile ) : if (m_pInputSlots == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no InputSlot in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } if (m_pDefaultInputSlot == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no DefaultInputSlot in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } m_pDuplexTypes = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) ); @@ -856,7 +853,7 @@ PPDParser::PPDParser( const String& rFile ) : if (m_pFontList == 0) { OSL_TRACE( OSL_LOG_PREFIX "Warning: no Font in %s\n", - rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()); } // fill in direct values @@ -917,7 +914,7 @@ static sal_uInt8 getNibble( sal_Char cChar ) return nRet; } -String PPDParser::handleTranslation(const rtl::OString& i_rString, bool bIsGlobalized) +String PPDParser::handleTranslation(const OString& i_rString, bool bIsGlobalized) { sal_Int32 nOrigLen = i_rString.getLength(); OStringBuffer aTrans( nOrigLen ); @@ -945,7 +942,7 @@ String PPDParser::handleTranslation(const rtl::OString& i_rString, bool bIsGloba namespace { - bool oddDoubleQuoteCount(rtl::OStringBuffer &rBuffer) + bool oddDoubleQuoteCount(OStringBuffer &rBuffer) { bool bHasOddCount = false; for (sal_Int32 i = 0; i < rBuffer.getLength(); ++i) @@ -957,20 +954,20 @@ namespace } } -void PPDParser::parse( ::std::list< rtl::OString >& rLines ) +void PPDParser::parse( ::std::list< OString >& rLines ) { - std::list< rtl::OString >::iterator line = rLines.begin(); + std::list< OString >::iterator line = rLines.begin(); PPDParser::hash_type::const_iterator keyit; while( line != rLines.end() ) { - rtl::OString aCurrentLine( *line ); + OString aCurrentLine( *line ); ++line; if( aCurrentLine[0] != '*' ) continue; if( aCurrentLine[1] == '%' ) continue; - rtl::OString aKey = GetCommandLineToken( 0, comphelper::string::getToken(aCurrentLine, 0, ':') ); + OString aKey = GetCommandLineToken( 0, comphelper::string::getToken(aCurrentLine, 0, ':') ); sal_Int32 nPos = aKey.indexOf('/'); if (nPos != -1) aKey = aKey.copy(0, nPos); @@ -1015,7 +1012,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) bQuery = true; } - String aUniKey(rtl::OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252)); + String aUniKey(OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252)); // handle CUPS extension for globalized PPDs bool bIsGlobalizedLine = false; com::sun::star::lang::Locale aTransLocale; @@ -1040,7 +1037,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) nPos = aCurrentLine.indexOf(':'); if( nPos != -1 ) { - aOption = rtl::OStringToOUString( aCurrentLine.copy( 1, nPos-1 ), RTL_TEXTENCODING_MS_1252 ); + aOption = OStringToOUString( aCurrentLine.copy( 1, nPos-1 ), RTL_TEXTENCODING_MS_1252 ); aOption = GetCommandLineToken( 1, aOption ); int nTransPos = aOption.Search( '/' ); if( nTransPos != STRING_NOTFOUND ) @@ -1049,12 +1046,12 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) PPDValueType eType = eNo; String aValue; - rtl::OUString aOptionTranslation; - rtl::OUString aValueTranslation; + OUString aOptionTranslation; + OUString aValueTranslation; if( nPos != STRING_NOTFOUND ) { // found a colon, there may be an option - rtl::OString aLine = aCurrentLine.copy( 1, nPos-1 ); + OString aLine = aCurrentLine.copy( 1, nPos-1 ); aLine = WhitespaceToSpace( aLine ); sal_Int32 nTransPos = aLine.indexOf('/'); if (nTransPos != -1) @@ -1064,7 +1061,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) aLine = aCurrentLine.copy( nPos+1 ); if (!aLine.isEmpty()) { - rtl::OStringBuffer aBuffer(aLine); + OStringBuffer aBuffer(aLine); while (line != rLines.end() && oddDoubleQuoteCount(aBuffer)) { // copy the newlines also @@ -1092,7 +1089,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) nTransPos = aLine.indexOf('"'); if (nTransPos == -1) nTransPos = aLine.getLength(); - aValue = rtl::OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252); + aValue = OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252); // after the second doublequote can follow a / and a translation if (nTransPos < aLine.getLength() - 2) { @@ -1109,7 +1106,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) else if(aLine[0] == '^') { aLine = aLine.copy(1); - aValue = rtl::OStringToOUString(aLine, RTL_TEXTENCODING_MS_1252); + aValue = OStringToOUString(aLine, RTL_TEXTENCODING_MS_1252); eType = eSymbol; } else @@ -1122,7 +1119,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) nTransPos = aLine.indexOf('/'); if (nTransPos == -1) nTransPos = aLine.getLength(); - aValue = rtl::OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252); + aValue = OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252); if (nTransPos+1 < aLine.getLength()) aValueTranslation = handleTranslation( aLine.copy( nTransPos+1 ), bIsGlobalizedLine ); eType = eString; @@ -1183,15 +1180,15 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) // second pass: fill in defaults for( line = rLines.begin(); line != rLines.end(); ++line ) { - rtl::OString aLine(*line); + OString aLine(*line); if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM("*Default"))) { - String aKey(rtl::OStringToOUString(aLine.copy(8), RTL_TEXTENCODING_MS_1252)); + String aKey(OStringToOUString(aLine.copy(8), RTL_TEXTENCODING_MS_1252)); sal_uInt16 nPos = aKey.Search( ':' ); if( nPos != STRING_NOTFOUND ) { aKey.Erase( nPos ); - rtl::OUString aOption(rtl::OStringToOUString( + OUString aOption(OStringToOUString( WhitespaceToSpace(aLine.copy(nPos+9)), RTL_TEXTENCODING_MS_1252)); keyit = m_aKeys.find( aKey ); @@ -1223,10 +1220,10 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines ) } } -void PPDParser::parseOpenUI(const rtl::OString& rLine) +void PPDParser::parseOpenUI(const OString& rLine) { String aTranslation; - rtl::OString aKey = rLine; + OString aKey = rLine; sal_Int32 nPos = aKey.indexOf(':'); if( nPos != -1 ) @@ -1240,7 +1237,7 @@ void PPDParser::parseOpenUI(const rtl::OString& rLine) aKey = GetCommandLineToken( 1, aKey ); aKey = aKey.copy(1); - String aUniKey(rtl::OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252)); + String aUniKey(OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252)); PPDParser::hash_type::const_iterator keyit = m_aKeys.find( aUniKey ); PPDKey* pKey; if( keyit == m_aKeys.end() ) @@ -1255,7 +1252,7 @@ void PPDParser::parseOpenUI(const rtl::OString& rLine) m_pTranslator->insertKey( pKey->getKey(), aTranslation ); sal_Int32 nIndex = 0; - rtl::OString aValue = WhitespaceToSpace( rLine.getToken( 1, ':', nIndex ) ); + OString aValue = WhitespaceToSpace( rLine.getToken( 1, ':', nIndex ) ); if( aValue.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("boolean"))) pKey->m_eUIType = PPDKey::Boolean; else if (aValue.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("pickmany"))) @@ -1264,16 +1261,16 @@ void PPDParser::parseOpenUI(const rtl::OString& rLine) pKey->m_eUIType = PPDKey::PickOne; } -void PPDParser::parseOrderDependency(const rtl::OString& rLine) +void PPDParser::parseOrderDependency(const OString& rLine) { - rtl::OString aLine(rLine); + OString aLine(rLine); sal_Int32 nPos = aLine.indexOf(':'); if( nPos != -1 ) aLine = aLine.copy( nPos+1 ); sal_Int32 nOrder = GetCommandLineToken( 0, aLine ).toInt32(); - rtl::OString aSetup = GetCommandLineToken( 1, aLine ); - String aKey(rtl::OStringToOUString(GetCommandLineToken(2, aLine), RTL_TEXTENCODING_MS_1252)); + OString aSetup = GetCommandLineToken( 1, aLine ); + String aKey(OStringToOUString(GetCommandLineToken(2, aLine), RTL_TEXTENCODING_MS_1252)); if( aKey.GetChar( 0 ) != '*' ) return; // invalid order depency aKey.Erase( 0, 1 ); @@ -1303,11 +1300,11 @@ void PPDParser::parseOrderDependency(const rtl::OString& rLine) pKey->m_eSetupType = PPDKey::AnySetup; } -void PPDParser::parseConstraint( const rtl::OString& rLine ) +void PPDParser::parseConstraint( const OString& rLine ) { bool bFailed = false; - String aLine(rtl::OStringToOUString(rLine, RTL_TEXTENCODING_MS_1252)); + String aLine(OStringToOUString(rLine, RTL_TEXTENCODING_MS_1252)); aLine.Erase(0, rLine.indexOf(':') + 1); PPDConstraint aConstraint; int nTokens = GetCommandLineTokenCount( aLine ); @@ -1515,20 +1512,20 @@ String PPDParser::getFont( int nFont ) const return String(); } -rtl::OUString PPDParser::translateKey( const rtl::OUString& i_rKey, +OUString PPDParser::translateKey( const OUString& i_rKey, const com::sun::star::lang::Locale& i_rLocale ) const { - rtl::OUString aResult( m_pTranslator->translateKey( i_rKey, i_rLocale ) ); + OUString aResult( m_pTranslator->translateKey( i_rKey, i_rLocale ) ); if( aResult.isEmpty() ) aResult = i_rKey; return aResult; } -rtl::OUString PPDParser::translateOption( const rtl::OUString& i_rKey, - const rtl::OUString& i_rOption, +OUString PPDParser::translateOption( const OUString& i_rKey, + const OUString& i_rOption, const com::sun::star::lang::Locale& i_rLocale ) const { - rtl::OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, i_rLocale ) ); + OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, i_rLocale ) ); if( aResult.isEmpty() ) aResult = i_rOption; return aResult; @@ -1879,12 +1876,12 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const hash_type::const_iterator it; for( it = m_aCurrentValues.begin(); it != m_aCurrentValues.end(); ++it ) { - rtl::OString aCopy(rtl::OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252)); + OString aCopy(OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252)); rBytes += aCopy.getLength(); rBytes += 1; // for ':' if( it->second ) { - aCopy = rtl::OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252); + aCopy = OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252); rBytes += aCopy.getLength(); } else @@ -1897,13 +1894,13 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const char* pRun = pBuffer; for( it = m_aCurrentValues.begin(); it != m_aCurrentValues.end(); ++it ) { - rtl::OString aCopy(rtl::OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252)); + OString aCopy(OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252)); int nBytes = aCopy.getLength(); memcpy( pRun, aCopy.getStr(), nBytes ); pRun += nBytes; *pRun++ = ':'; if( it->second ) - aCopy = rtl::OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252); + aCopy = OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252); else aCopy = "*nil"; nBytes = aCopy.getLength(); @@ -1927,15 +1924,15 @@ void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes ) char* pRun = pBuffer; while( nBytes && *pRun ) { - rtl::OString aLine( pRun ); + OString aLine( pRun ); sal_Int32 nPos = aLine.indexOf(':'); if( nPos != -1 ) { - const PPDKey* pKey = m_pParser->getKey( rtl::OStringToOUString( aLine.copy( 0, nPos ), RTL_TEXTENCODING_MS_1252 ) ); + const PPDKey* pKey = m_pParser->getKey( OStringToOUString( aLine.copy( 0, nPos ), RTL_TEXTENCODING_MS_1252 ) ); if( pKey ) { const PPDValue* pValue = NULL; - rtl::OUString aOption(rtl::OStringToOUString(aLine.copy(nPos+1), RTL_TEXTENCODING_MS_1252)); + OUString aOption(OStringToOUString(aLine.copy(nPos+1), RTL_TEXTENCODING_MS_1252)); if (aOption != "*nil") pValue = pKey->getValue( aOption ); m_aCurrentValues[ pKey ] = pValue; @@ -1977,10 +1974,10 @@ int PPDContext::getRenderResolution() const // ------------------------------------------------------------------- -void PPDContext::getPageSize( rtl::OUString& rPaper, int& rWidth, int& rHeight ) const +void PPDContext::getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const { // initialize to reasonable default, if parser is not set - rPaper = rtl::OUString( "A4" ); + rPaper = OUString( "A4" ); rWidth = 595; rHeight = 842; if( m_pParser ) diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 3f3353259189..cfe471f4ab20 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -54,10 +54,6 @@ using namespace psp; using namespace osl; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringHash; namespace psp { @@ -162,7 +158,7 @@ void PrinterInfoManager::setCUPSDisabled( bool bDisable ) void PrinterInfoManager::initSystemDefaultPaper() { - m_aSystemDefaultPaper = rtl::OStringToOUString( + m_aSystemDefaultPaper = OStringToOUString( PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper()), RTL_TEXTENCODING_UTF8); } @@ -258,11 +254,11 @@ void PrinterInfoManager::initialize() if( aConfig.HasGroup( GLOBAL_DEFAULTS_GROUP ) ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "found global defaults in %s\n", rtl::OUStringToOString( aFile.PathToFileName(), RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + fprintf( stderr, "found global defaults in %s\n", OUStringToOString( aFile.PathToFileName(), RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif aConfig.SetGroup( GLOBAL_DEFAULTS_GROUP ); - rtl::OString aValue( aConfig.ReadKey( "Copies" ) ); + OString aValue( aConfig.ReadKey( "Copies" ) ); if (!aValue.isEmpty()) m_aGlobalDefaults.m_nCopies = aValue.toInt32(); @@ -318,16 +314,16 @@ void PrinterInfoManager::initialize() // get the PPDContext of global JobData for( int nKey = 0; nKey < aConfig.GetKeyCount(); ++nKey ) { - rtl::OString aKey( aConfig.GetKeyName( nKey ) ); + OString aKey( aConfig.GetKeyName( nKey ) ); if (aKey.matchL(RTL_CONSTASCII_STRINGPARAM("PPD_"))) { aValue = aConfig.ReadKey( aKey ); - const PPDKey* pKey = m_aGlobalDefaults.m_pParser->getKey(rtl::OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1)); + const PPDKey* pKey = m_aGlobalDefaults.m_pParser->getKey(OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1)); if( pKey ) { m_aGlobalDefaults.m_aContext. setValue( pKey, - aValue.equals("*nil") ? NULL : pKey->getValue(rtl::OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), + aValue.equals("*nil") ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), sal_True ); } } @@ -384,7 +380,7 @@ void PrinterInfoManager::initialize() for( int nGroup = 0; nGroup < aConfig.GetGroupCount(); nGroup++ ) { aConfig.SetGroup( aConfig.GetGroupName( nGroup ) ); - rtl::OString aValue = aConfig.ReadKey( "Printer" ); + OString aValue = aConfig.ReadKey( "Printer" ); if (!aValue.isEmpty()) { OUString aPrinterName; @@ -403,10 +399,10 @@ void PrinterInfoManager::initialize() aPrinter.m_aInfo.m_aFontSubstitutes.clear(); aPrinter.m_aInfo.m_aFontSubstitutions.clear(); - aPrinterName = rtl::OStringToOUString(aValue.copy(nNamePos+1), + aPrinterName = OStringToOUString(aValue.copy(nNamePos+1), RTL_TEXTENCODING_UTF8); aPrinter.m_aInfo.m_aPrinterName = aPrinterName; - aPrinter.m_aInfo.m_aDriverName = rtl::OStringToOUString(aValue.copy(0, nNamePos), RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aDriverName = OStringToOUString(aValue.copy(0, nNamePos), RTL_TEXTENCODING_UTF8); // set parser, merge settings // don't do this for CUPS printers as this is done @@ -460,14 +456,14 @@ void PrinterInfoManager::initialize() aValue = "lpr"; #endif } - aPrinter.m_aInfo.m_aCommand = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); } aValue = aConfig.ReadKey( "QuickCommand" ); - aPrinter.m_aInfo.m_aQuickCommand = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aQuickCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); aValue = aConfig.ReadKey( "Features" ); - aPrinter.m_aInfo.m_aFeatures = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aFeatures = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); // override the settings in m_aGlobalDefaults if keys exist aValue = aConfig.ReadKey( "DefaultPrinter" ); @@ -475,10 +471,10 @@ void PrinterInfoManager::initialize() aDefaultPrinter = aPrinterName; aValue = aConfig.ReadKey( "Location" ); - aPrinter.m_aInfo.m_aLocation = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aLocation = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); aValue = aConfig.ReadKey( "Comment" ); - aPrinter.m_aInfo.m_aComment = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); + aPrinter.m_aInfo.m_aComment = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8); aValue = aConfig.ReadKey( "Copies" ); if (!aValue.isEmpty()) @@ -526,16 +522,16 @@ void PrinterInfoManager::initialize() // 2. Font substitution table for( int nKey = 0; nKey < aConfig.GetKeyCount(); ++nKey ) { - rtl::OString aKey( aConfig.GetKeyName( nKey ) ); + OString aKey( aConfig.GetKeyName( nKey ) ); if( aKey.matchL(RTL_CONSTASCII_STRINGPARAM("PPD_")) && aPrinter.m_aInfo.m_pParser ) { aValue = aConfig.ReadKey( aKey ); - const PPDKey* pKey = aPrinter.m_aInfo.m_pParser->getKey(rtl::OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1)); + const PPDKey* pKey = aPrinter.m_aInfo.m_pParser->getKey(OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1)); if( pKey ) { aPrinter.m_aInfo.m_aContext. setValue( pKey, - aValue.equals("*nil") ? NULL : pKey->getValue(rtl::OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), + aValue.equals("*nil") ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), sal_True ); } } @@ -622,7 +618,7 @@ void PrinterInfoManager::initialize() aPrinter.m_aInfo.m_aComment = it->m_aComment; aPrinter.m_aInfo.m_aLocation = it->m_aLocation; aPrinter.m_bModified = false; - aPrinter.m_aGroup = rtl::OUStringToOString(aPrinterName, aEncoding); //provide group name in case user makes this one permanent in padmin + aPrinter.m_aGroup = OUStringToOString(aPrinterName, aEncoding); //provide group name in case user makes this one permanent in padmin m_aPrinters[ aPrinterName ] = aPrinter; } @@ -766,22 +762,22 @@ bool PrinterInfoManager::writePrinterConfig() pConfig->DeleteGroup( it->second.m_aGroup ); // else some old keys may remain pConfig->SetGroup( it->second.m_aGroup ); - rtl::OStringBuffer aValue(rtl::OUStringToOString(it->second.m_aInfo.m_aDriverName, RTL_TEXTENCODING_UTF8)); + OStringBuffer aValue(OUStringToOString(it->second.m_aInfo.m_aDriverName, RTL_TEXTENCODING_UTF8)); aValue.append('/'); - aValue.append(rtl::OUStringToOString(it->first, RTL_TEXTENCODING_UTF8)); + aValue.append(OUStringToOString(it->first, RTL_TEXTENCODING_UTF8)); pConfig->WriteKey("Printer", aValue.makeStringAndClear()); pConfig->WriteKey( "DefaultPrinter", it->first == m_aDefaultPrinter ? "1" : "0" ); - pConfig->WriteKey( "Location", rtl::OUStringToOString(it->second.m_aInfo.m_aLocation, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey( "Comment", rtl::OUStringToOString(it->second.m_aInfo.m_aComment, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey( "Command", rtl::OUStringToOString(it->second.m_aInfo.m_aCommand, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey( "QuickCommand", rtl::OUStringToOString(it->second.m_aInfo.m_aQuickCommand, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey( "Features", rtl::OUStringToOString(it->second.m_aInfo.m_aFeatures, RTL_TEXTENCODING_UTF8) ); - pConfig->WriteKey("Copies", rtl::OString::valueOf(static_cast(it->second.m_aInfo.m_nCopies))); + pConfig->WriteKey( "Location", OUStringToOString(it->second.m_aInfo.m_aLocation, RTL_TEXTENCODING_UTF8) ); + pConfig->WriteKey( "Comment", OUStringToOString(it->second.m_aInfo.m_aComment, RTL_TEXTENCODING_UTF8) ); + pConfig->WriteKey( "Command", OUStringToOString(it->second.m_aInfo.m_aCommand, RTL_TEXTENCODING_UTF8) ); + pConfig->WriteKey( "QuickCommand", OUStringToOString(it->second.m_aInfo.m_aQuickCommand, RTL_TEXTENCODING_UTF8) ); + pConfig->WriteKey( "Features", OUStringToOString(it->second.m_aInfo.m_aFeatures, RTL_TEXTENCODING_UTF8) ); + pConfig->WriteKey("Copies", OString::valueOf(static_cast(it->second.m_aInfo.m_nCopies))); pConfig->WriteKey( "Orientation", it->second.m_aInfo.m_eOrientation == orientation::Landscape ? "Landscape" : "Portrait" ); - pConfig->WriteKey("PSLevel", rtl::OString::valueOf(static_cast(it->second.m_aInfo.m_nPSLevel))); - pConfig->WriteKey("PDFDevice", rtl::OString::valueOf(static_cast(it->second.m_aInfo.m_nPDFDevice))); - pConfig->WriteKey("ColorDevice", rtl::OString::valueOf(static_cast(it->second.m_aInfo.m_nColorDevice))); - pConfig->WriteKey("ColorDepth", rtl::OString::valueOf(static_cast(it->second.m_aInfo.m_nColorDepth))); + pConfig->WriteKey("PSLevel", OString::valueOf(static_cast(it->second.m_aInfo.m_nPSLevel))); + pConfig->WriteKey("PDFDevice", OString::valueOf(static_cast(it->second.m_aInfo.m_nPDFDevice))); + pConfig->WriteKey("ColorDevice", OString::valueOf(static_cast(it->second.m_aInfo.m_nColorDevice))); + pConfig->WriteKey("ColorDepth", OString::valueOf(static_cast(it->second.m_aInfo.m_nColorDepth))); aValue.append(static_cast(it->second.m_aInfo.m_nLeftMarginAdjust)); aValue.append(','); aValue.append(static_cast(it->second.m_aInfo.m_nRightMarginAdjust)); @@ -797,12 +793,12 @@ bool PrinterInfoManager::writePrinterConfig() for( int i = 0; i < it->second.m_aInfo.m_aContext.countValuesModified(); i++ ) { const PPDKey* pKey = it->second.m_aInfo.m_aContext.getModifiedKey( i ); - rtl::OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("PPD_")); - aKey.append(rtl::OUStringToOString(pKey->getKey(), RTL_TEXTENCODING_ISO_8859_1)); + OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("PPD_")); + aKey.append(OUStringToOString(pKey->getKey(), RTL_TEXTENCODING_ISO_8859_1)); const PPDValue* pValue = it->second.m_aInfo.m_aContext.getValue( pKey ); if (pValue) - aValue.append(rtl::OUStringToOString(pValue->m_aOption, RTL_TEXTENCODING_ISO_8859_1)); + aValue.append(OUStringToOString(pValue->m_aOption, RTL_TEXTENCODING_ISO_8859_1)); else aValue.append(RTL_CONSTASCII_STRINGPARAM("*nil")); pConfig->WriteKey(aKey.makeStringAndClear(), aValue.makeStringAndClear()); @@ -814,9 +810,9 @@ bool PrinterInfoManager::writePrinterConfig() for( ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator subst = it->second.m_aInfo.m_aFontSubstitutes.begin(); subst != it->second.m_aInfo.m_aFontSubstitutes.end(); ++subst ) { - rtl::OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("SubstFont_")); - aKey.append(rtl::OUStringToOString(subst->first, RTL_TEXTENCODING_ISO_8859_1)); - pConfig->WriteKey( aKey.makeStringAndClear(), rtl::OUStringToOString( subst->second, RTL_TEXTENCODING_ISO_8859_1 ) ); + OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("SubstFont_")); + aKey.append(OUStringToOString(subst->first, RTL_TEXTENCODING_ISO_8859_1)); + pConfig->WriteKey( aKey.makeStringAndClear(), OUStringToOString( subst->second, RTL_TEXTENCODING_ISO_8859_1 ) ); } } } @@ -871,7 +867,7 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin bSuccess = true; #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "new printer %s, level = %d, pdfdevice = %d, colordevice = %d, depth = %d\n", - rtl::OUStringToOString( rPrinterName, osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( rPrinterName, osl_getThreadTextEncoding() ).getStr(), m_aPrinters[rPrinterName].m_aInfo.m_nPSLevel, m_aPrinters[rPrinterName].m_aInfo.m_nPDFDevice, m_aPrinters[rPrinterName].m_aInfo.m_nColorDevice, @@ -1044,12 +1040,12 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const fprintf( stderr, "substitute %s %s %d %d\n" " -> %s %s %d %d\n", - rtl::OUStringToOString( it->m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), + OUStringToOString( it->m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), it->m_eItalic == ITALIC_NONE ? "r" : it->m_eItalic == ITALIC_OBLIQUE ? "o" : it->m_eItalic == ITALIC_NORMAL ? "i" : "u", it->m_eWeight, it->m_eWidth, - rtl::OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), + OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), aInfo.m_eItalic == ITALIC_NONE ? "r" : aInfo.m_eItalic == ITALIC_OBLIQUE ? "o" : aInfo.m_eItalic == ITALIC_NORMAL ? "i" : "u", aInfo.m_eWeight, aInfo.m_eWidth @@ -1095,7 +1091,7 @@ const std::list< PrinterInfoManager::SystemPrintQueue >& PrinterInfoManager::get return m_aSystemPrintQueues; } -bool PrinterInfoManager::checkFeatureToken( const rtl::OUString& rPrinterName, const char* pToken ) const +bool PrinterInfoManager::checkFeatureToken( const OUString& rPrinterName, const char* pToken ) const { const PrinterInfo& rPrinterInfo( getPrinterInfo( rPrinterName ) ); sal_Int32 nIndex = 0; @@ -1113,10 +1109,10 @@ bool PrinterInfoManager::checkFeatureToken( const rtl::OUString& rPrinterName, c FILE* PrinterInfoManager::startSpool( const OUString& rPrintername, bool bQuickCommand ) { const PrinterInfo& rPrinterInfo = getPrinterInfo (rPrintername); - const rtl::OUString& rCommand = (bQuickCommand && !rPrinterInfo.m_aQuickCommand.isEmpty() ) ? + const OUString& rCommand = (bQuickCommand && !rPrinterInfo.m_aQuickCommand.isEmpty() ) ? rPrinterInfo.m_aQuickCommand : rPrinterInfo.m_aCommand; - rtl::OString aShellCommand = rtl::OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1); - aShellCommand += rtl::OString( " 2>/dev/null" ); + OString aShellCommand = OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1); + aShellCommand += OString( " 2>/dev/null" ); return popen (aShellCommand.getStr(), "w"); } @@ -1155,7 +1151,7 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "not setting default paper, already set %s\n", - ::rtl::OUStringToOString( rContext.getValue( pPageSizeKey )->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + OUStringToOString( rContext.getValue( pPageSizeKey )->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif return; } @@ -1172,12 +1168,12 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const if( pPaperVal ) { #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "setting default paper %s\n", ::rtl::OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + fprintf( stderr, "setting default paper %s\n", OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif rContext.setValue( pPageSizeKey, pPaperVal ); #if OSL_DEBUG_LEVEL > 1 pPaperVal = rContext.getValue( pPageSizeKey ); - fprintf( stderr, "-> got paper %s\n", ::rtl::OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + fprintf( stderr, "-> got paper %s\n", OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif } } @@ -1221,7 +1217,7 @@ OUString SystemQueueInfo::getCommand() const } struct SystemCommandParameters; -typedef void(* tokenHandler)(const std::list< rtl::OString >&, +typedef void(* tokenHandler)(const std::list< OString >&, std::list< PrinterInfoManager::SystemPrintQueue >&, const SystemCommandParameters*); @@ -1237,7 +1233,7 @@ struct SystemCommandParameters #if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)) static void lpgetSysQueueTokenHandler( - const std::list< rtl::OString >& i_rLines, + const std::list< OString >& i_rLines, std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues, const SystemCommandParameters* ) { @@ -1251,9 +1247,9 @@ static void lpgetSysQueueTokenHandler( // printers are to be used for this user at all // find _all: line - rtl::OString aAllLine( "_all:" ); - rtl::OString aAllAttr( "all=" ); - for( std::list< rtl::OString >::const_iterator it = i_rLines.begin(); + OString aAllLine( "_all:" ); + OString aAllAttr( "all=" ); + for( std::list< OString >::const_iterator it = i_rLines.begin(); it != i_rLines.end(); ++it ) { if( it->indexOf( aAllLine, 0 ) == 0 ) @@ -1262,7 +1258,7 @@ static void lpgetSysQueueTokenHandler( ++it; while( it != i_rLines.end() ) { - rtl::OString aClean( WhitespaceToSpace( *it ) ); + OString aClean( WhitespaceToSpace( *it ) ); if( aClean.indexOf( aAllAttr, 0 ) == 0 ) { // insert the comma separated entries into the set of printers to use @@ -1271,7 +1267,7 @@ static void lpgetSysQueueTokenHandler( { OString aTok( aClean.getToken( 0, ',', nPos ) ); if( !aTok.isEmpty() ) - aOnlySet.insert( rtl::OStringToOUString( aTok, aEncoding ) ); + aOnlySet.insert( OStringToOUString( aTok, aEncoding ) ); } break; } @@ -1281,9 +1277,9 @@ static void lpgetSysQueueTokenHandler( } bool bInsertAttribute = false; - rtl::OString aDescrStr( "description=" ); - rtl::OString aLocStr( "location=" ); - for( std::list< rtl::OString >::const_iterator it = i_rLines.begin(); + OString aDescrStr( "description=" ); + OString aLocStr( "location=" ); + for( std::list< OString >::const_iterator it = i_rLines.begin(); it != i_rLines.end(); ++it ) { sal_Int32 nPos = 0; @@ -1291,7 +1287,7 @@ static void lpgetSysQueueTokenHandler( nPos = it->indexOf( ':', 0 ); if( nPos != -1 ) { - OUString aSysQueue( rtl::OStringToOUString( it->copy( 0, nPos ), aEncoding ) ); + OUString aSysQueue( OStringToOUString( it->copy( 0, nPos ), aEncoding ) ); // do not insert duplicates (e.g. lpstat tends to produce such lines) // in case there was a "_all" section, insert only those printer explicitly // set in the "all" attribute @@ -1315,18 +1311,18 @@ static void lpgetSysQueueTokenHandler( nPos = it->indexOf( aDescrStr, 0 ); if( nPos != -1 ) { - rtl::OString aComment( WhitespaceToSpace( it->copy(nPos+12) ) ); + OString aComment( WhitespaceToSpace( it->copy(nPos+12) ) ); if( !aComment.isEmpty() ) - o_rQueues.back().m_aComment = rtl::OStringToOUString(aComment, aEncoding); + o_rQueues.back().m_aComment = OStringToOUString(aComment, aEncoding); continue; } // look for "location" attribute, inser as location nPos = it->indexOf( aLocStr, 0 ); if( nPos != -1 ) { - rtl::OString aLoc( WhitespaceToSpace( it->copy(nPos+9) ) ); + OString aLoc( WhitespaceToSpace( it->copy(nPos+9) ) ); if( !aLoc.isEmpty() ) - o_rQueues.back().m_aLocation = rtl::OStringToOUString(aLoc, aEncoding); + o_rQueues.back().m_aLocation = OStringToOUString(aLoc, aEncoding); continue; } } @@ -1334,17 +1330,17 @@ static void lpgetSysQueueTokenHandler( } #endif static void standardSysQueueTokenHandler( - const std::list< rtl::OString >& i_rLines, + const std::list< OString >& i_rLines, std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues, const SystemCommandParameters* i_pParms) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); boost::unordered_set< OUString, OUStringHash > aUniqueSet; - rtl::OString aForeToken( i_pParms->pForeToken ); - rtl::OString aAftToken( i_pParms->pAftToken ); + OString aForeToken( i_pParms->pForeToken ); + OString aAftToken( i_pParms->pAftToken ); /* Normal Unix print queue discovery, also used for Darwin 5 LPR printing */ - for( std::list< rtl::OString >::const_iterator it = i_rLines.begin(); + for( std::list< OString >::const_iterator it = i_rLines.begin(); it != i_rLines.end(); ++it ) { sal_Int32 nPos = 0; @@ -1364,7 +1360,7 @@ static void standardSysQueueTokenHandler( if( nAftPos != -1 ) { // get the queue name between fore and aft tokens - OUString aSysQueue( rtl::OStringToOUString( it->copy( nPos, nAftPos - nPos ), aEncoding ) ); + OUString aSysQueue( OStringToOUString( it->copy( nPos, nAftPos - nPos ), aEncoding ) ); // do not insert duplicates (e.g. lpstat tends to produce such lines) if( aUniqueSet.find( aSysQueue ) == aUniqueSet.end() ) { @@ -1396,13 +1392,13 @@ void SystemQueueInfo::run() { char pBuffer[1024]; FILE *pPipe; - std::list< rtl::OString > aLines; + std::list< OString > aLines; /* Discover which command we can use to get a list of all printer queues */ for( unsigned int i = 0; i < SAL_N_ELEMENTS(aParms); i++ ) { aLines.clear(); - rtl::OStringBuffer aCmdLine( 128 ); + OStringBuffer aCmdLine( 128 ); aCmdLine.append( aParms[i].pQueueCommand ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "trying print queue command \"%s\" ... ", aParms[i].pQueueCommand ); @@ -1411,7 +1407,7 @@ void SystemQueueInfo::run() if( (pPipe = popen( aCmdLine.getStr(), "r" )) ) { while( fgets( pBuffer, 1024, pPipe ) ) - aLines.push_back( rtl::OString( pBuffer ) ); + aLines.push_back( OString( pBuffer ) ); if( ! pclose( pPipe ) ) { std::list< PrinterInfoManager::SystemPrintQueue > aSysPrintQueues; @@ -1419,7 +1415,7 @@ void SystemQueueInfo::run() MutexGuard aGuard( m_aMutex ); m_bChanged = true; m_aQueues = aSysPrintQueues; - m_aCommand = rtl::OUString::createFromAscii( aParms[i].pPrintCommand ); + m_aCommand = OUString::createFromAscii( aParms[i].pPrintCommand ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "success\n" ); #endif diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 3ea05095faac..ec482e7801e2 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -1951,7 +1951,7 @@ void X11SalFrame::SetScreenNumber( unsigned int nNewScreen ) } } -void X11SalFrame::SetApplicationID( const rtl::OUString &rWMClass ) +void X11SalFrame::SetApplicationID( const OUString &rWMClass ) { if( rWMClass != m_sWMClass && ! IsChildWindow() ) { @@ -1966,10 +1966,10 @@ void X11SalFrame::SetApplicationID( const rtl::OUString &rWMClass ) void X11SalFrame::updateWMClass() { XClassHint* pClass = XAllocClassHint(); - rtl::OString aResName = SalGenericSystem::getFrameResName( mnExtStyle ); + OString aResName = SalGenericSystem::getFrameResName( mnExtStyle ); pClass->res_name = const_cast(aResName.getStr()); - rtl::OString aResClass = rtl::OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US); + OString aResClass = OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US); const char *pResClass = !aResClass.isEmpty() ? aResClass.getStr() : SalGenericSystem::getFrameClassName(); @@ -2305,7 +2305,7 @@ sal_Bool X11SalFrame::PostEvent( void *pData ) // Title -void X11SalFrame::SetTitle( const rtl::OUString& rTitle ) +void X11SalFrame::SetTitle( const OUString& rTitle ) { if( ! ( IsChildWindow() || (nStyle_ & SAL_FRAME_STYLE_FLOAT ) ) ) { @@ -2377,7 +2377,7 @@ void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags ) // ----------------------------------------------------------------------- -rtl::OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) +OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) { return GetDisplay()->GetKeyName( nKeyCode ); } @@ -2882,13 +2882,13 @@ GetAlternateKeyCode( const sal_uInt16 nKeyCode ) void X11SalFrame::beginUnicodeSequence() { - rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); + OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); DeletionListener aDeleteWatch( this ); if( !rSeq.isEmpty() ) endUnicodeSequence(); - rSeq = rtl::OUString( "u" ); + rSeq = OUString( "u" ); if( ! aDeleteWatch.isDeleted() ) { @@ -2909,7 +2909,7 @@ void X11SalFrame::beginUnicodeSequence() bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) { bool bRet = false; - rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); + OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); if( !rSeq.isEmpty() ) { // range check @@ -2917,7 +2917,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) (c >= sal_Unicode('a') && c <= sal_Unicode('f')) || (c >= sal_Unicode('A') && c <= sal_Unicode('F')) ) { - rtl::OUStringBuffer aBuf( rSeq.getLength() + 1 ); + OUStringBuffer aBuf( rSeq.getLength() + 1 ); aBuf.append( rSeq ); aBuf.append( c ); rSeq = aBuf.makeStringAndClear(); @@ -2945,20 +2945,20 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) bool X11SalFrame::endUnicodeSequence() { - rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); + OUString& rSeq( GetGenericData()->GetUnicodeCommand() ); DeletionListener aDeleteWatch( this ); if( rSeq.getLength() > 1 && rSeq.getLength() < 6 ) { // cut the "u" - rtl::OUString aNumbers( rSeq.copy( 1 ) ); + OUString aNumbers( rSeq.copy( 1 ) ); sal_Int32 nValue = aNumbers.toInt32( 16 ); if( nValue >= 32 ) { sal_uInt16 nTextAttr = EXTTEXTINPUT_ATTR_UNDERLINE; SalExtTextInputEvent aEv; aEv.mnTime = 0; - aEv.maText = rtl::OUString( sal_Unicode(nValue) ); + aEv.maText = OUString( sal_Unicode(nValue) ); aEv.mpTextAttr = &nTextAttr; aEv.mnCursorPos = 0; aEv.mnDeltaStart = 0; @@ -2968,7 +2968,7 @@ bool X11SalFrame::endUnicodeSequence() } } bool bWasInput = !rSeq.isEmpty(); - rSeq = rtl::OUString(); + rSeq = OUString(); if( bWasInput && ! aDeleteWatch.isDeleted() ) CallCallback(SALEVENT_ENDEXTTEXTINPUT, NULL); return bWasInput; diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx index d4153786c8ff..3dbce852a1e8 100644 --- a/vcl/unx/gtk/a11y/atkaction.cxx +++ b/vcl/unx/gtk/a11y/atkaction.cxx @@ -36,10 +36,10 @@ using namespace ::com::sun::star; // FIXME static G_CONST_RETURN gchar * -getAsConst( const rtl::OString& rString ) +getAsConst( const OString& rString ) { static const int nMax = 10; - static rtl::OString aUgly[nMax]; + static OString aUgly[nMax]; static int nIdx = 0; nIdx = (nIdx + 1) % nMax; aUgly[nIdx] = rString; @@ -116,13 +116,13 @@ action_wrapper_get_localized_name (AtkAction *, gint) } #define ACTION_NAME_PAIR( OOoName, AtkName ) \ - std::pair< const rtl::OUString, const gchar * > ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OOoName ) ), AtkName ) + std::pair< const OUString, const gchar * > ( OUString( RTL_CONSTASCII_USTRINGPARAM( OOoName ) ), AtkName ) static G_CONST_RETURN gchar * action_wrapper_get_name (AtkAction *action, gint i) { - static std::map< rtl::OUString, const gchar * > aNameMap; + static std::map< OUString, const gchar * > aNameMap; if( aNameMap.empty() ) { @@ -135,15 +135,15 @@ action_wrapper_get_name (AtkAction *action, accessibility::XAccessibleAction* pAction = getAction( action ); if( pAction ) { - std::map< rtl::OUString, const gchar * >::iterator iter; + std::map< OUString, const gchar * >::iterator iter; - rtl::OUString aDesc( pAction->getAccessibleActionDescription( i ) ); + OUString aDesc( pAction->getAccessibleActionDescription( i ) ); iter = aNameMap.find( aDesc ); if( iter != aNameMap.end() ) return iter->second; - std::pair< const rtl::OUString, const gchar * > aNewVal( aDesc, + std::pair< const OUString, const gchar * > aNewVal( aDesc, g_strdup( OUStringToConstGChar(aDesc) ) ); if( aNameMap.insert( aNewVal ).second ) @@ -166,7 +166,7 @@ action_wrapper_get_name (AtkAction *action, */ static inline void -appendKeyStrokes(rtl::OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& rKeyStrokes) +appendKeyStrokes(OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& rKeyStrokes) { for( sal_Int32 i = 0; i < rKeyStrokes.getLength(); i++ ) { @@ -222,7 +222,7 @@ action_wrapper_get_keybinding (AtkAction *action, if( xBinding.is() ) { - rtl::OStringBuffer aRet; + OStringBuffer aRet; sal_Int32 nmax = std::min( xBinding->getAccessibleKeyBindingCount(), (sal_Int32) 3 ); for( sal_Int32 n = 0; n < nmax; n++ ) diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx index d0aabd69feb0..7f1d5bd3fe99 100644 --- a/vcl/unx/gtk/a11y/atkeditabletext.cxx +++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx @@ -84,7 +84,7 @@ editable_text_wrapper_set_text_contents( AtkEditableText *text, accessibility::XAccessibleEditableText* pEditableText = getEditableText( text ); if( pEditableText ) { - rtl::OUString aString ( string, strlen(string), RTL_TEXTENCODING_UTF8 ); + OUString aString ( string, strlen(string), RTL_TEXTENCODING_UTF8 ); pEditableText->setText( aString ); } } @@ -103,7 +103,7 @@ editable_text_wrapper_insert_text( AtkEditableText *text, accessibility::XAccessibleEditableText* pEditableText = getEditableText( text ); if( pEditableText ) { - rtl::OUString aString ( string, length, RTL_TEXTENCODING_UTF8 ); + OUString aString ( string, length, RTL_TEXTENCODING_UTF8 ); if( pEditableText->insertText( aString, *pos ) ) *pos += length; } diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index ed4333ede35c..d7a3852d9cbb 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -60,7 +60,7 @@ hyper_link_get_uri( AtkHyperlink *pLink, { try { uno::Any aAny = getHyperlink( pLink )->getAccessibleActionObject( i ); - rtl::OUString aUri = aAny.get< rtl::OUString > (); + OUString aUri = aAny.get< OUString > (); return OUStringToGChar(aUri); } catch(const uno::Exception& e) { diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx index 8e833225b833..c58a54eef5e5 100644 --- a/vcl/unx/gtk/a11y/atkimage.cxx +++ b/vcl/unx/gtk/a11y/atkimage.cxx @@ -28,13 +28,13 @@ using namespace ::com::sun::star; // FIXME static G_CONST_RETURN gchar * -getAsConst( rtl::OUString rString ) +getAsConst( OUString rString ) { static const int nMax = 10; - static rtl::OString aUgly[nMax]; + static OString aUgly[nMax]; static int nIdx = 0; nIdx = (nIdx + 1) % nMax; - aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); + aUgly[nIdx] = OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); return aUgly[ nIdx ].getStr(); } diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx index 8d1b1bd616c8..f4d02cea0cb5 100644 --- a/vcl/unx/gtk/a11y/atklistener.cxx +++ b/vcl/unx/gtk/a11y/atklistener.cxx @@ -289,22 +289,22 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven case accessibility::AccessibleEventId::NAME_CHANGED: { - rtl::OUString aName; + OUString aName; if( aEvent.NewValue >>= aName ) { atk_object_set_name(atk_obj, - rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr()); } } break; case accessibility::AccessibleEventId::DESCRIPTION_CHANGED: { - rtl::OUString aDescription; + OUString aDescription; if( aEvent.NewValue >>= aDescription ) { atk_object_set_description(atk_obj, - rtl::OUStringToOString(aDescription, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aDescription, RTL_TEXTENCODING_UTF8).getStr()); } } break; diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx index f823d32a3725..662eec113b52 100644 --- a/vcl/unx/gtk/a11y/atktable.cxx +++ b/vcl/unx/gtk/a11y/atktable.cxx @@ -45,13 +45,13 @@ atk_object_wrapper_conditional_ref( const uno::Reference< accessibility::XAccess // FIXME static G_CONST_RETURN gchar * -getAsConst( rtl::OUString rString ) +getAsConst( OUString rString ) { static const int nMax = 10; - static rtl::OString aUgly[nMax]; + static OString aUgly[nMax]; static int nIdx = 0; nIdx = (nIdx + 1) % nMax; - aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); + aUgly[nIdx] = OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); return aUgly[ nIdx ].getStr(); } diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx index f8b06e5f4944..5ac6856222b7 100644 --- a/vcl/unx/gtk/a11y/atktext.cxx +++ b/vcl/unx/gtk/a11y/atktext.cxx @@ -68,7 +68,7 @@ adjust_boundaries( accessibility::XAccessibleText* pText, gint * start_offset, gint * end_offset ) { accessibility::TextSegment aTextSegment; - rtl::OUString aString; + OUString aString; gint start = 0, end = 0; if( !rTextSegment.SegmentText.isEmpty() ) @@ -274,7 +274,7 @@ text_wrapper_get_text (AtkText *text, if( pTextSegment->SegmentStart == start_offset && pTextSegment->SegmentEnd == end_offset ) { - rtl::OString aUtf8 = rtl::OUStringToOString( pTextSegment->SegmentText, RTL_TEXTENCODING_UTF8 ); + OString aUtf8 = OUStringToOString( pTextSegment->SegmentText, RTL_TEXTENCODING_UTF8 ); return g_strdup( aUtf8.getStr() ); } } @@ -283,7 +283,7 @@ text_wrapper_get_text (AtkText *text, accessibility::XAccessibleText* pText = getText( text ); if( pText ) { - rtl::OUString aText; + OUString aText; sal_Int32 n = pText->getCharacterCount(); if( -1 == end_offset ) @@ -291,7 +291,7 @@ text_wrapper_get_text (AtkText *text, else if( start_offset < n ) aText = pText->getTextRange(start_offset, end_offset); - ret = g_strdup( rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8 ).getStr() ); + ret = g_strdup( OUStringToOString(aText, RTL_TEXTENCODING_UTF8 ).getStr() ); } } catch(const uno::Exception& e) { @@ -537,7 +537,7 @@ text_wrapper_get_run_attributes( AtkText *text, if( pText && pTextAttributes ) { uno::Sequence< beans::PropertyValue > aAttributeList = - pTextAttributes->getRunAttributes( offset, uno::Sequence< rtl::OUString > () ); + pTextAttributes->getRunAttributes( offset, uno::Sequence< OUString > () ); pSet = attribute_set_new_from_property_values( aAttributeList, true, text ); // #i100938# @@ -615,7 +615,7 @@ text_wrapper_get_default_attributes( AtkText *text ) if( pTextAttributes ) { uno::Sequence< beans::PropertyValue > aAttributeList = - pTextAttributes->getDefaultAttributes( uno::Sequence< rtl::OUString > () ); + pTextAttributes->getDefaultAttributes( uno::Sequence< OUString > () ); pSet = attribute_set_new_from_property_values( aAttributeList, false, text ); } diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 23738f9009b9..a5612b43e39f 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -532,7 +532,7 @@ String2Underline( uno::Any& rAny, const gchar * value ) static gchar* GetString(const uno::Any& rAny) { - rtl::OString aFontName = rtl::OUStringToOString( rAny.get< rtl::OUString > (), RTL_TEXTENCODING_UTF8 ); + OString aFontName = OUStringToOString( rAny.get< OUString > (), RTL_TEXTENCODING_UTF8 ); if( !aFontName.isEmpty() ) return g_strdup( aFontName.getStr() ); @@ -543,11 +543,11 @@ GetString(const uno::Any& rAny) static bool SetString( uno::Any& rAny, const gchar * value ) { - rtl::OString aFontName( value ); + OString aFontName( value ); if( !aFontName.isEmpty() ) { - rAny = uno::makeAny( rtl::OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ) ); + rAny = uno::makeAny( OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ) ); return true; } @@ -709,8 +709,8 @@ Locale2String(const uno::Any& rAny) { lang::Locale aLocale = rAny.get (); return g_strdup_printf( "%s-%s", - rtl::OUStringToOString( aLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(), - rtl::OUStringToOString( aLocale.Country, RTL_TEXTENCODING_ASCII_US).toAsciiLowerCase().getStr() ); + OUStringToOString( aLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString( aLocale.Country, RTL_TEXTENCODING_ASCII_US).toAsciiLowerCase().getStr() ); } static bool @@ -725,11 +725,11 @@ String2Locale( uno::Any& rAny, const gchar * value ) lang::Locale aLocale; - aLocale.Language = rtl::OUString::createFromAscii(str_array[0]); + aLocale.Language = OUString::createFromAscii(str_array[0]); if( str_array[1] != NULL ) { gchar * country = g_ascii_strup(str_array[1], -1); - aLocale.Country = rtl::OUString::createFromAscii(country); + aLocale.Country = OUString::createFromAscii(country); g_free(country); } @@ -1339,7 +1339,7 @@ attribute_set_map_to_property_values( if( ! g_TextAttrMap[text_attr].toPropertyValue( aAttributeList[nIndex].Value, attribute->value) ) return false; - aAttributeList[nIndex].Name = rtl::OUString::createFromAscii( g_TextAttrMap[text_attr].name ); + aAttributeList[nIndex].Name = OUString::createFromAscii( g_TextAttrMap[text_attr].name ); aAttributeList[nIndex].State = beans::PropertyState_DIRECT_VALUE; ++nIndex; } diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index e5de208d6281..fd396c8f7083 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -95,7 +95,7 @@ init_from_window( AtkObject *accessible, Window *pWindow ) { role = ATK_ROLE_TOOL_TIP; pChild->SetAccessibleRole( AccessibleRole::LABEL ); - accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() ); + accessible->name = g_strdup( OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() ); } else if ( pWindow->GetType() == WINDOW_BORDERWINDOW && pChild->GetType() == WINDOW_FLOATINGWINDOW ) { @@ -105,7 +105,7 @@ init_from_window( AtkObject *accessible, Window *pWindow ) // This is a top-level menu popup. Register it. role = ATK_ROLE_POPUP_MENU; pChild->SetAccessibleRole( AccessibleRole::POPUP_MENU ); - accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() ); + accessible->name = g_strdup( OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() ); } } } diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 2e7824eb0f94..4c9d5d612d33 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -325,8 +325,8 @@ wrapper_get_name( AtkObject *atk_obj ) { uno::Reference< accessibility::XAccessibleContext > xContext(obj->mpContext); try { - rtl::OString aName = - rtl::OUStringToOString( + OString aName = + OUStringToOString( xContext->getAccessibleName(), RTL_TEXTENCODING_UTF8); @@ -357,8 +357,8 @@ wrapper_get_description( AtkObject *atk_obj ) { uno::Reference< accessibility::XAccessibleContext > xContext(obj->mpContext); try { - rtl::OString aDescription = - rtl::OUStringToOString( + OString aDescription = + OUStringToOString( xContext->getAccessibleDescription(), RTL_TEXTENCODING_UTF8); @@ -711,7 +711,7 @@ ensureTypeFor( uno::XInterface *pAccessible ) { int i; int bTypes[ aTypeTableSize ] = { 0, }; - rtl::OString aTypeName( "OOoAtkObj" ); + OString aTypeName( "OOoAtkObj" ); for( i = 0; i < aTypeTableSize; i++ ) { diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index 1427a26d45a3..e613cfa1e90d 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.hxx +++ b/vcl/unx/gtk/a11y/atkwrapper.hxx @@ -65,7 +65,7 @@ struct _AtkObjectWrapper AtkObject *child_about_to_be_removed; gint index_of_child_about_to_be_removed; -// ::rtl::OString * m_pKeyBindings +// OString * m_pKeyBindings }; struct _AtkObjectWrapperClass @@ -106,13 +106,13 @@ void valueIfaceInit(AtkValueIface *iface); (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT_WRAPPER, AtkObjectWrapper)) static inline gchar * -OUStringToGChar(const rtl::OUString& rString ) +OUStringToGChar(const OUString& rString ) { - rtl::OString aUtf8 = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); + OString aUtf8 = OUStringToOString( rString, RTL_TEXTENCODING_UTF8 ); return g_strdup( aUtf8.getStr() ); } -#define OUStringToConstGChar( string ) rtl::OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr() +#define OUStringToConstGChar( string ) OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr() #endif /* __ATK_WRAPPER_HXX__ */ diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index af98ba210736..dac0f28f4105 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -49,7 +49,6 @@ using namespace vcl_sal; -using ::rtl::OUString; /*************************************************************** * class GtkSalDisplay * @@ -680,7 +679,7 @@ void GtkData::Init() osl_getExecutableFile( &aProgramFileURL.pData ); OUString aProgramSystemPath; osl_getSystemPathFromFileURL (aProgramFileURL.pData, &aProgramSystemPath.pData); - OString aProgramName = rtl::OUStringToOString( + OString aProgramName = OUStringToOString( aProgramSystemPath, osl_getThreadTextEncoding() ); fprintf( stderr, "%s X11 error: Can't open display: %s\n", diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 07172468846d..554c26c9be97 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -279,22 +279,22 @@ extern "C" typedef void(* addItemFnc)(void *, const char *); } -void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) +void GtkInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType) { - rtl::OString sGtkURL; + OString sGtkURL; rtl_TextEncoding aSystemEnc = osl_getThreadTextEncoding(); if ((aSystemEnc == RTL_TEXTENCODING_UTF8) || !rFileUrl.startsWith( "file://" )) - sGtkURL = rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8); + sGtkURL = OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8); else { //Non-utf8 locales are a bad idea if trying to work with non-ascii filenames //Decode %XX components - rtl::OUString sDecodedUri = rtl::Uri::decode(rFileUrl.copy(7), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8); + OUString sDecodedUri = rtl::Uri::decode(rFileUrl.copy(7), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8); //Convert back to system locale encoding - rtl::OString sSystemUrl = rtl::OUStringToOString(sDecodedUri, aSystemEnc); + OString sSystemUrl = OUStringToOString(sDecodedUri, aSystemEnc); //Encode to an escaped ASCII-encoded URI gchar *g_uri = g_filename_to_uri(sSystemUrl.getStr(), NULL, NULL); - sGtkURL = rtl::OString(g_uri); + sGtkURL = OString(g_uri); g_free(g_uri); } #if GTK_CHECK_VERSION(2,10,0) diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index bc06b25a1ccc..e389eb4ae0a4 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -242,14 +242,14 @@ Rectangle GtkSalSystem::GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScre return GetDisplayScreenPosSizePixel( nScreen ); } -rtl::OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen) +OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen) { gchar *pStr; gint nMonitor; GdkScreen *pScreen; pScreen = getScreenMonitorFromIdx (nScreen, nMonitor); if (!pScreen) - return rtl::OUString(); + return OUString(); #if GTK_CHECK_VERSION(3,0,0) || GTK_CHECK_VERSION(2,14,0) pStr = gdk_screen_get_monitor_plug_name (pScreen, nMonitor); @@ -267,23 +267,23 @@ rtl::OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen) else pStr = g_strdup_printf ("%d", nScreen); #endif - rtl::OUString aRet (pStr, strlen (pStr), RTL_TEXTENCODING_UTF8); + OUString aRet (pStr, strlen (pStr), RTL_TEXTENCODING_UTF8); g_free (pStr); return aRet; } // convert ~ to indicate mnemonic to '_' -static rtl::OString MapToGtkAccelerator(const rtl::OUString &rStr) +static OString MapToGtkAccelerator(const OUString &rStr) { - return rtl::OUStringToOString(rStr.replaceFirst("~", "_"), RTL_TEXTENCODING_UTF8); + return OUStringToOString(rStr.replaceFirst("~", "_"), RTL_TEXTENCODING_UTF8); } -int GtkSalSystem::ShowNativeDialog (const rtl::OUString& rTitle, const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtonNames, +int GtkSalSystem::ShowNativeDialog (const OUString& rTitle, const OUString& rMessage, + const std::list< OUString >& rButtonNames, int nDefaultButton) { - rtl::OString aTitle (rtl::OUStringToOString (rTitle, RTL_TEXTENCODING_UTF8)); - rtl::OString aMessage (rtl::OUStringToOString (rMessage, RTL_TEXTENCODING_UTF8)); + OString aTitle (OUStringToOString (rTitle, RTL_TEXTENCODING_UTF8)); + OString aMessage (OUStringToOString (rMessage, RTL_TEXTENCODING_UTF8)); GtkDialog *pDialog = GTK_DIALOG ( g_object_new (GTK_TYPE_MESSAGE_DIALOG, @@ -292,7 +292,7 @@ int GtkSalSystem::ShowNativeDialog (const rtl::OUString& rTitle, const rtl::OUSt "text", aMessage.getStr(), NULL)); int nButton = 0; - std::list< rtl::OUString >::const_iterator it; + std::list< OUString >::const_iterator it; for (it = rButtonNames.begin(); it != rButtonNames.end(); ++it) gtk_dialog_add_button (pDialog, MapToGtkAccelerator(*it).getStr(), nButton++); gtk_dialog_set_default_response (pDialog, nDefaultButton); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index eebfe68c3b01..5672b030b76e 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -236,7 +236,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext gtk_container_add (GTK_CONTAINER (m_pFilterExpander), scrolled_window); gtk_widget_show (scrolled_window); - rtl::OString sExpand(getenv("SAL_EXPANDFPICKER")); + OString sExpand(getenv("SAL_EXPANDFPICKER")); sal_Int32 nExpand = sExpand.toInt32(); switch (nExpand) { @@ -368,22 +368,22 @@ void SalGtkFilePicker::impl_controlStateChanged( FilePickerEvent aEvent ) struct FilterEntry { protected: - ::rtl::OUString m_sTitle; - ::rtl::OUString m_sFilter; + OUString m_sTitle; + OUString m_sFilter; UnoFilterList m_aSubFilters; public: - FilterEntry( const ::rtl::OUString& _rTitle, const ::rtl::OUString& _rFilter ) + FilterEntry( const OUString& _rTitle, const OUString& _rFilter ) :m_sTitle( _rTitle ) ,m_sFilter( _rFilter ) { } - FilterEntry( const ::rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters ); + FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ); - ::rtl::OUString getTitle() const { return m_sTitle; } - ::rtl::OUString getFilter() const { return m_sFilter; } + OUString getTitle() const { return m_sTitle; } + OUString getFilter() const { return m_sFilter; } /// determines if the filter has sub filter (i.e., the filter is a filter group in real) sal_Bool hasSubFilters( ) const; @@ -402,7 +402,7 @@ public: //===================================================================== //--------------------------------------------------------------------- -FilterEntry::FilterEntry( const ::rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters ) +FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) :m_sTitle( _rTitle ) ,m_aSubFilters( _rSubFilters ) { @@ -422,13 +422,13 @@ sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList ) } static bool -isFilterString( const rtl::OUString &rFilterString, const char *pMatch ) +isFilterString( const OUString &rFilterString, const char *pMatch ) { sal_Int32 nIndex = 0; - rtl::OUString aToken; + OUString aToken; bool bIsFilter = true; - rtl::OUString aMatch(rtl::OUString::createFromAscii(pMatch)); + OUString aMatch(OUString::createFromAscii(pMatch)); do { @@ -444,8 +444,8 @@ isFilterString( const rtl::OUString &rFilterString, const char *pMatch ) return bIsFilter; } -static rtl::OUString -shrinkFilterName( const rtl::OUString &rFilterName, bool bAllowNoStar = false ) +static OUString +shrinkFilterName( const OUString &rFilterName, bool bAllowNoStar = false ) { int i; int nBracketLen = -1; @@ -463,11 +463,11 @@ shrinkFilterName( const rtl::OUString &rFilterName, bool bAllowNoStar = false ) if( nBracketEnd <= 0 ) continue; if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), "*." ) ) - aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); + aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() ); else if (bAllowNoStar) { if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), ".") ) - aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); + aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() ); } } } @@ -503,10 +503,10 @@ namespace { struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > { protected: - const ::rtl::OUString& rTitle; + const OUString& rTitle; public: - FilterTitleMatch( const ::rtl::OUString& _rTitle ) : rTitle( _rTitle ) { } + FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { } //............................................................................ bool operator () ( const FilterEntry& _rEntry ) @@ -536,7 +536,7 @@ namespace { //------------------------------------------------------------------------------------ -sal_Bool SalGtkFilePicker::FilterNameExists( const ::rtl::OUString& rTitle ) +sal_Bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) { sal_Bool bRet = sal_False; @@ -574,7 +574,7 @@ sal_Bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilte } //------------------------------------------------------------------------------------ -void SalGtkFilePicker::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter ) +void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter ) { if( !m_pFilterList ) { @@ -591,7 +591,7 @@ void SalGtkFilePicker::ensureFilterList( const ::rtl::OUString& _rInitialCurrent // //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter ) +void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SolarMutexGuard g; @@ -612,7 +612,7 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const rtl::OUString& aTitle, const // //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::setCurrentFilter( const rtl::OUString& aTitle ) +void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SolarMutexGuard g; @@ -679,7 +679,7 @@ void SalGtkFilePicker::UpdateFilterfromUI() } } -rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -699,7 +699,7 @@ rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeE // XFilterGroupManager functions //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::appendFilterGroup( const rtl::OUString& /*sGroupTitle*/, const uno::Sequence& aFilters ) +void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence& aFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SolarMutexGuard g; @@ -713,7 +713,7 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const rtl::OUString& /*sGroup throw IllegalArgumentException(); // ensure that we have a filter list - ::rtl::OUString sInitialCurrentFilter; + OUString sInitialCurrentFilter; if( aFilters.getLength() ) sInitialCurrentFilter = aFilters[0].First; @@ -740,7 +740,7 @@ void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( u gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER(m_pDialog), bMode ); } -void SAL_CALL SalGtkFilePicker::setDefaultName( const rtl::OUString& aName ) +void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName ) throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -755,7 +755,7 @@ void SAL_CALL SalGtkFilePicker::setDefaultName( const rtl::OUString& aName ) gtk_file_chooser_set_current_name( GTK_FILE_CHOOSER( m_pDialog ), aStr.getStr() ); } -void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory ) +void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const OUString& rDirectory ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SolarMutexGuard g; @@ -763,18 +763,18 @@ void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const rtl::OUString& rDirec implsetDisplayDirectory(rDirectory); } -rtl::OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException ) { SolarMutexGuard g; return implgetDisplayDirectory(); } -uno::Sequence SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException ) +uno::Sequence SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException ) { // no member access => no mutex needed - uno::Sequence< rtl::OUString > aFiles = getSelectedFiles(); + uno::Sequence< OUString > aFiles = getSelectedFiles(); /* The previous multiselection API design was completely broken and unimplementable for some hetrogenous pseudo-URIs eg. search:// @@ -784,7 +784,7 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getFiles() throw( uno::R return aFiles; } -uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException ) +uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -800,7 +800,7 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() throw GtkFileChooserAction eAction = gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog )); - uno::Sequence< rtl::OUString > aSelectedFiles(nCount); + uno::Sequence< OUString > aSelectedFiles(nCount); // Convert to OOo for( GSList *pElem = pPathList; pElem; pElem = pElem->next) @@ -828,7 +828,7 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() throw { if( aSelectedFiles[nIndex].indexOf('.') > 0 ) { - rtl::OUString sExtension; + OUString sExtension; nTokenIndex = 0; do sExtension = aSelectedFiles[nIndex].getToken( 0, '.', nTokenIndex ); @@ -838,8 +838,8 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() throw { static const OUString aStarDot( "*." ); - ::rtl::OUString aNewFilter; - ::rtl::OUString aOldFilter = getCurrentFilter(); + OUString aNewFilter; + OUString aOldFilter = getCurrentFilter(); sal_Bool bChangeFilter = sal_True; for ( FilterList::iterator aListIter = m_pFilterList->begin(); aListIter != m_pFilterList->end(); @@ -886,8 +886,8 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() throw OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr() ); nTokenIndex = 0; - rtl::OUString sToken; - // rtl::OUString strExt; + OUString sToken; + // OUString strExt; do { sToken = aFilter.getToken( 0, '.', nTokenIndex ); @@ -930,7 +930,7 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() throw // XExecutableDialog functions //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::setTitle( const rtl::OUString& rTitle ) throw( uno::RuntimeException ) +void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -1131,11 +1131,11 @@ static void HackWidthToFirst(GtkComboBox *pWidget) gtk_widget_set_size_request(GTK_WIDGET(pWidget), requisition.width, -1); } -static void ComboBoxAppendText(GtkComboBox *pCombo, const rtl::OUString &rStr) +static void ComboBoxAppendText(GtkComboBox *pCombo, const OUString &rStr) { GtkTreeIter aIter; GtkListStore *pStore = GTK_LIST_STORE(gtk_combo_box_get_model(pCombo)); - rtl::OString aStr = rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8); + OString aStr = OUStringToOString(rStr, RTL_TEXTENCODING_UTF8); gtk_list_store_append(pStore, &aIter); gtk_list_store_set(pStore, &aIter, 0, aStr.getStr(), -1); } @@ -1349,7 +1349,7 @@ throw( uno::RuntimeException ) OSL_TRACE("enable unknown control %d", nControlId ); } -void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& rLabel ) +void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel ) throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -1386,7 +1386,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUS OSL_TRACE("Can't set label on list"); } -rtl::OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) +OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -1469,8 +1469,8 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection ) { gchar *title; gtk_tree_model_get (model, &iter, 2, &title, -1); - aLabel += rtl::OUString( ": " ); - aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 ); + aLabel += OUString( ": " ); + aLabel += OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 ); g_free (title); } gtk_expander_set_label (GTK_EXPANDER (m_pFilterExpander), @@ -1604,7 +1604,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence& aArgu uno::Any aAny; if( 0 == aArguments.getLength() ) throw lang::IllegalArgumentException( - rtl::OUString( "no arguments" ), + OUString( "no arguments" ), static_cast( this ), 1 ); aAny = aArguments[0]; @@ -1612,7 +1612,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence& aArgu if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) throw lang::IllegalArgumentException( - rtl::OUString( "invalid argument type" ), + OUString( "invalid argument type" ), static_cast( this ), 1 ); sal_Int16 templateId = -1; @@ -1701,7 +1701,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence& aArgu break; default: throw lang::IllegalArgumentException( - rtl::OUString( "Unknown template" ), + OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -1831,7 +1831,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O GtkFileFilter *filter = gtk_file_filter_new(); OUString aShrunkName = shrinkFilterName( rFilter ); - OString aFilterName = rtl::OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 ); + OString aFilterName = OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 ); gtk_file_filter_set_name( filter, aFilterName.getStr() ); static const OUString aStarDot( "*." ); @@ -1843,7 +1843,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O else { sal_Int32 nIndex = 0; - rtl::OUString aToken; + OUString aToken; do { aToken = rType.getToken( 0, ';', nIndex ); @@ -1858,16 +1858,16 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O aTokens = aTokens += aToken; gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI, case_insensitive_filter, - g_strdup( rtl::OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ), + g_strdup( OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ), (GDestroyNotify) g_free ); - OSL_TRACE( "fustering with %s", rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr()); + OSL_TRACE( "fustering with %s", OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr()); } #if OSL_DEBUG_LEVEL > 0 else { g_warning( "Duff filter token '%s'\n", - rtl::OUStringToOString( + OUStringToOString( rType.getToken( 0, ';', nIndex ), RTL_TEXTENCODING_UTF8 ).getStr() ); } #endif @@ -1906,7 +1906,7 @@ void SalGtkFilePicker::SetFilters() if (m_aInitialFilter.isEmpty()) m_aInitialFilter = m_aCurrentFilter; - rtl::OUString sPseudoFilter; + OUString sPseudoFilter; if( GTK_FILE_CHOOSER_ACTION_SAVE == gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ) ) { std::set aAllFormats; @@ -1932,7 +1932,7 @@ void SalGtkFilePicker::SetFilters() } if (aAllFormats.size() > 1) { - rtl::OUString sAllFilter; + OUString sAllFilter; std::set::const_iterator aEnd = aAllFormats.end(); for (std::set::const_iterator aIter = aAllFormats.begin(); aIter != aEnd; ++aIter) { diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index c9fbb9ab8fc9..6a2df47f0707 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -37,8 +37,6 @@ // Implementation class for the XFilePicker Interface //---------------------------------------------------------- -using ::rtl::OUString; -using ::rtl::OString; struct FilterEntry; struct ElementEntry_Impl; @@ -80,7 +78,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base // XExecutableDialog functions //------------------------------------------------------------------------------------ - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute() @@ -93,44 +91,44 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setDefaultName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory ) + virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayDirectory( ) + virtual OUString SAL_CALL getDisplayDirectory( ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException ); //------------------------------------------------------------------------------------ // XFilePicker2 functions //------------------------------------------------------------------------------------ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------ // XFilterManager functions //------------------------------------------------------------------------------------ - virtual void SAL_CALL appendFilter( const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilter ) + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCurrentFilter( ) + virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException ); //------------------------------------------------------------------------------------ // XFilterGroupManager functions //------------------------------------------------------------------------------------ - virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------ @@ -146,10 +144,10 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const ::rtl::OUString& aLabel ) + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId ) + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------ @@ -208,10 +206,10 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base SalGtkFilePicker( const SalGtkFilePicker& ); SalGtkFilePicker& operator=( const SalGtkFilePicker& ); - sal_Bool FilterNameExists( const ::rtl::OUString& rTitle ); + sal_Bool FilterNameExists( const OUString& rTitle ); sal_Bool FilterNameExists( const UnoFilterList& _rGroupedFilters ); - void ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter ); + void ensureFilterList( const OUString& _rInitialCurrentFilter ); void impl_fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); void impl_directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); @@ -220,7 +218,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base private: ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener; - ::rtl::OUString msPlayLabel; + OUString msPlayLabel; FilterList *m_pFilterList; GtkWidget *m_pVBox; @@ -244,7 +242,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base bool mbToggleVisibility[TOGGLE_LAST]; bool mbToggleChecked[TOGGLE_LAST]; - static const rtl::OString m_ToggleLabels[TOGGLE_LAST]; + static const OString m_ToggleLabels[TOGGLE_LAST]; enum { PLAY, @@ -269,8 +267,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base gulong mnHID_FolderChange; gulong mnHID_SelectionChange; - ::rtl::OUString m_aCurrentFilter; - ::rtl::OUString m_aInitialFilter; + OUString m_aCurrentFilter; + OUString m_aInitialFilter; bool bVersionWidthUnset; sal_Bool mbPreviewState; diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index d950dd8dbf9c..e08fdf78f2c4 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -70,7 +70,7 @@ void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& ) { } -void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory ) +void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirectory ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { SolarMutexGuard g; @@ -91,7 +91,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const rtl::OUString& aDir aTxt.getStr() ); } -rtl::OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -105,7 +105,7 @@ rtl::OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::Run return aCurrentFolderName; } -rtl::OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException ) { SolarMutexGuard g; @@ -119,7 +119,7 @@ rtl::OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeExc return aSelectedFolderName; } -void SAL_CALL SalGtkFolderPicker::setDescription( const rtl::OUString& /*rDescription*/ ) +void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription*/ ) throw( uno::RuntimeException ) { } @@ -128,13 +128,13 @@ void SAL_CALL SalGtkFolderPicker::setDescription( const rtl::OUString& /*rDescri // XExecutableDialog functions //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFolderPicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException ) +void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException ) { SolarMutexGuard g; OSL_ASSERT( m_pDialog != NULL ); - ::rtl::OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ); + OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ); gtk_window_set_title( GTK_WINDOW( m_pDialog ), aWindowTitle.getStr() ); } diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index ca0746288b85..2e7aef490fa8 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -41,7 +41,7 @@ class SalGtkFolderPicker : // XExecutableDialog functions //------------------------------------------------------------------------------------ - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute( ) @@ -51,16 +51,16 @@ class SalGtkFolderPicker : // XFolderPicker functions //------------------------------------------------------------------------------------ - virtual void SAL_CALL setDisplayDirectory( const rtl::OUString& rDirectory ) + virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getDisplayDirectory( ) + virtual OUString SAL_CALL getDisplayDirectory( ) throw( com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL getDirectory( ) + virtual OUString SAL_CALL getDirectory( ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDescription( const rtl::OUString& rDescription ) + virtual void SAL_CALL setDescription( const OUString& rDescription ) throw( com::sun::star::uno::RuntimeException ); //------------------------------------------------ diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index db74fc750d38..f69adf4a6bdf 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -42,12 +42,12 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; -rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) +OUString SalGtkPicker::uritounicode(const gchar* pIn) { if (!pIn) - return rtl::OUString(); + return OUString(); - rtl::OUString sURL( const_cast(pIn), strlen(pIn), + OUString sURL( const_cast(pIn), strlen(pIn), RTL_TEXTENCODING_UTF8 ); INetURLObject aURL(sURL); @@ -58,7 +58,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) gchar *pEncodedFileName = g_filename_from_uri(pIn, NULL, NULL); if ( pEncodedFileName ) { - rtl::OUString sEncoded(pEncodedFileName, strlen(pEncodedFileName), + OUString sEncoded(pEncodedFileName, strlen(pEncodedFileName), osl_getThreadTextEncoding()); INetURLObject aCurrentURL(sEncoded, INetURLObject::FSYS_UNX); aCurrentURL.SetHost(aURL.GetHost()); @@ -74,7 +74,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn) return sURL; } -rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL) +OString SalGtkPicker::unicodetouri(const OUString &rURL) { // all the URLs are handled by office in UTF-8 ( and encoded with "%xx" codes based on UTF-8 ) // so the Gnome FP related URLs should be converted accordingly @@ -182,7 +182,7 @@ void SalGtkPicker::setGtkLanguage() OUString aLocaleString( Application::GetSettings().GetUILanguageTag().getGlibcLocaleString( ".UTF-8")); if (!aLocaleString.isEmpty()) { - rtl::OUString envVar( "LANGUAGE" ); + OUString envVar( "LANGUAGE" ); osl_setEnvironment( envVar.pData, aLocaleString.pData ); } bSet = true; @@ -204,7 +204,7 @@ SalGtkPicker::~SalGtkPicker() } } -void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory ) +void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); @@ -223,23 +223,23 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const rtl::OUString& aDirec aTxt.getStr() ); } -rtl::OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() throw( uno::RuntimeException ) +OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); gchar* pCurrentFolder = gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ) ); - ::rtl::OUString aCurrentFolderName = uritounicode(pCurrentFolder); + OUString aCurrentFolderName = uritounicode(pCurrentFolder); g_free( pCurrentFolder ); return aCurrentFolderName; } -void SAL_CALL SalGtkPicker::implsetTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException ) +void SAL_CALL SalGtkPicker::implsetTitle( const OUString& aTitle ) throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); - ::rtl::OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ); + OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ); gtk_window_set_title( GTK_WINDOW( m_pDialog ), aWindowTitle.getStr() ); } diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index 196e8e901f6b..477c707dd71f 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -48,21 +48,21 @@ class SalGtkPicker osl::Mutex m_rbHelperMtx; GtkWidget *m_pDialog; protected: - virtual void SAL_CALL implsetTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL implsetTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL implsetDisplayDirectory( const rtl::OUString& rDirectory ) + virtual void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL implgetDisplayDirectory( ) + virtual OUString SAL_CALL implgetDisplayDirectory( ) throw( com::sun::star::uno::RuntimeException ); - rtl::OUString uritounicode(const gchar *pIn); - rtl::OString unicodetouri(const rtl::OUString &rURL); + OUString uritounicode(const gchar *pIn); + OString unicodetouri(const OUString &rURL); // to instantiate own services ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - rtl::OUString getResString( sal_Int32 aId ); + OUString getResString( sal_Int32 aId ); private: void setGtkLanguage(); }; diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index 498a74ce4579..ec588c1f00c3 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -68,9 +68,9 @@ static sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) return -1; } -rtl::OUString SalGtkPicker::getResString( sal_Int32 aId ) +OUString SalGtkPicker::getResString( sal_Int32 aId ) { - rtl::OUString aResString; + OUString aResString; try { // translate the control id to a resource id diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx index 83c92b2cf792..df123c5cc1a7 100644 --- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx +++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx @@ -80,9 +80,9 @@ GtkPrintWrapper::~GtkPrintWrapper() void GtkPrintWrapper::impl_load() { - m_aModule.load(rtl::OUString("libgtk-x11-2.0.so.0")); + m_aModule.load(OUString("libgtk-x11-2.0.so.0")); if (!m_aModule.is()) - m_aModule.load(rtl::OUString("libgtk-x11-2.0.so")); + m_aModule.load(OUString("libgtk-x11-2.0.so")); if (!m_aModule.is()) return; diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 405fcc3a65c8..4ece2aa4c1ce 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -60,7 +60,6 @@ GtkSalGraphics::~GtkSalGraphics() { } -using ::rtl::OUString; /************************************* * Cached native widget objects diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index c97e16e01212..c87f7652d18a 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -95,7 +95,7 @@ public: } void updateControllerPrintRange(); #if 0 - void ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings* pSettings) const; + void ExportAsPDF(const OUString &rFileURL, GtkPrintSettings* pSettings) const; #endif ~GtkPrintDialog(); @@ -130,7 +130,7 @@ private: private: GtkWidget* m_pDialog; vcl::PrinterController& m_rController; - std::map m_aControlToPropertyMap; + std::map m_aControlToPropertyMap; std::map m_aControlToNumValMap; boost::shared_ptr m_pWrapper; }; @@ -138,8 +138,8 @@ private: struct GtkSalPrinter_Impl { - rtl::OString m_sSpoolFile; - rtl::OUString m_sJobName; + OString m_sSpoolFile; + OUString m_sJobName; GtkPrinter* m_pPrinter; GtkPrintSettings* m_pSettings; @@ -197,9 +197,9 @@ GtkSalPrinter::GtkSalPrinter(SalInfoPrinter* const i_pInfoPrinter) bool GtkSalPrinter::impl_doJob( - const rtl::OUString* const i_pFileName, - const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, + const OUString* const i_pFileName, + const OUString& i_rJobName, + const OUString& i_rAppName, ImplJobSetup* const io_pSetupData, const int i_nCopies, const bool i_bCollate, @@ -231,9 +231,9 @@ GtkSalPrinter::impl_doJob( sal_Bool GtkSalPrinter::StartJob( - const rtl::OUString* const i_pFileName, - const rtl::OUString& i_rJobName, - const rtl::OUString& i_rAppName, + const OUString* const i_pFileName, + const OUString& i_rJobName, + const OUString& i_rAppName, ImplJobSetup* io_pSetupData, vcl::PrinterController& io_rController) { @@ -245,9 +245,9 @@ GtkSalPrinter::StartJob( m_pImpl.reset(new GtkSalPrinter_Impl()); m_pImpl->m_sJobName = i_rJobName; - rtl::OString sFileName; + OString sFileName; if (i_pFileName) - sFileName = rtl::OUStringToOString(*i_pFileName, osl_getThreadTextEncoding()); + sFileName = OUStringToOString(*i_pFileName, osl_getThreadTextEncoding()); GtkPrintDialog aDialog(io_rController); if (!aDialog.run()) @@ -265,7 +265,7 @@ GtkSalPrinter::StartJob( const gchar *pStr = gtk_print_settings_get(m_pImpl->m_pSettings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT); if (pStr && !strcmp(pStr, "pdf")) { - aDialog.ExportAsPDF(rtl::OUString((const sal_Char *)uri, strlen((const sal_Char *)uri), RTL_TEXTENCODING_UTF8), m_pImpl->m_pSettings); + aDialog.ExportAsPDF(OUString((const sal_Char *)uri, strlen((const sal_Char *)uri), RTL_TEXTENCODING_UTF8), m_pImpl->m_pSettings); bDoJob = false; } } @@ -277,10 +277,10 @@ GtkSalPrinter::StartJob( bool bCollate = false; //To-Do proper name, watch for encodings - sFileName = rtl::OString("/tmp/hacking.ps"); + sFileName = OString("/tmp/hacking.ps"); m_pImpl->m_sSpoolFile = sFileName; - rtl::OUString aFileName = rtl::OStringToOUString(sFileName, osl_getThreadTextEncoding()); + OUString aFileName = OStringToOUString(sFileName, osl_getThreadTextEncoding()); //To-Do, swap ps/pdf for gtk_printer_accepts_ps()/gtk_printer_accepts_pdf() ? @@ -315,7 +315,7 @@ GtkSalPrinter::EndJob() #endif GtkPrintJob* const pJob = pWrapper->print_job_new( - rtl::OUStringToOString(m_pImpl->m_sJobName, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(m_pImpl->m_sJobName, RTL_TEXTENCODING_UTF8).getStr(), m_pImpl->m_pPrinter, m_pImpl->m_pSettings, pPageSetup); GError* error = NULL; @@ -344,13 +344,13 @@ namespace void lcl_setHelpText( GtkWidget* const io_pWidget, - const uno::Sequence& i_rHelpTexts, + const uno::Sequence& i_rHelpTexts, const sal_Int32 i_nIndex) { #if GTK_CHECK_VERSION(2,12,0) if (i_nIndex >= 0 && i_nIndex < i_rHelpTexts.getLength()) gtk_widget_set_tooltip_text(io_pWidget, - rtl::OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr()); #else (void)io_pWidget; (void)i_rHelpTexts; @@ -362,8 +362,8 @@ lcl_setHelpText( static GtkWidget* lcl_makeFrame( GtkWidget* const i_pChild, - const rtl::OUString &i_rText, - const uno::Sequence &i_rHelpTexts, + const OUString &i_rText, + const uno::Sequence &i_rHelpTexts, sal_Int32* const io_pCurHelpText) { GtkWidget* const pLabel = gtk_label_new(NULL); @@ -372,7 +372,7 @@ lcl_makeFrame( { gchar* const pText = g_markup_printf_escaped("%s", - rtl::OUStringToOString(i_rText, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(i_rText, RTL_TEXTENCODING_UTF8).getStr()); gtk_label_set_markup_with_mnemonic(GTK_LABEL(pLabel), pText); g_free(pText); } @@ -391,11 +391,11 @@ lcl_makeFrame( void lcl_extractHelpTextsOrIds( const beans::PropertyValue& rEntry, - uno::Sequence& rHelpStrings) + uno::Sequence& rHelpStrings) { if (!(rEntry.Value >>= rHelpStrings)) { - rtl::OUString aHelpString; + OUString aHelpString; if ((rEntry.Value >>= aHelpString)) { rHelpStrings.realloc(1); @@ -473,8 +473,8 @@ GtkPrintDialog::impl_initDialog() void GtkPrintDialog::impl_initCustomTab() { - typedef std::map DependencyMap_t; - typedef std::vector > CustomTabs_t; + typedef std::map DependencyMap_t; + typedef std::vector > CustomTabs_t; const uno::Sequence& rOptions(m_rController.getUIOptions()); DependencyMap_t aPropertyToDependencyRowMap; @@ -489,15 +489,15 @@ GtkPrintDialog::impl_initCustomTab() uno::Sequence aOptProp; rOptions[i].Value >>= aOptProp; - rtl::OUString aCtrlType; - rtl::OUString aText; - rtl::OUString aPropertyName; - uno::Sequence aChoices; + OUString aCtrlType; + OUString aText; + OUString aPropertyName; + uno::Sequence aChoices; uno::Sequence aChoicesDisabled; - uno::Sequence aHelpTexts; + uno::Sequence aHelpTexts; sal_Int64 nMinValue = 0, nMaxValue = 0; sal_Int32 nCurHelpText = 0; - rtl::OUString aDependsOnName; + OUString aDependsOnName; sal_Int32 nDependsOnValue = 0; sal_Bool bUseDependencyRow = sal_False; sal_Bool bIgnore = sal_False; @@ -509,7 +509,7 @@ GtkPrintDialog::impl_initCustomTab() const beans::PropertyValue& rEntry(aOptProp[ n ]); if ( rEntry.Name == "Text" ) { - rtl::OUString aValue; + OUString aValue; rEntry.Value >>= aValue; aText = aValue.replace('~', '_'); } @@ -537,7 +537,7 @@ GtkPrintDialog::impl_initCustomTab() rEntry.Value >>= nMaxValue; else if ( rEntry.Name == "HelpId" ) { - uno::Sequence aHelpIds; + uno::Sequence aHelpIds; lcl_extractHelpTextsOrIds(rEntry, aHelpIds); Help* const pHelp = Application::GetHelp(); if (pHelp) @@ -619,7 +619,7 @@ GtkPrintDialog::impl_initCustomTab() if (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bool")) && pCurParent) { pWidget = gtk_check_button_new_with_mnemonic( - rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr()); lcl_setHelpText(pWidget, aHelpTexts, 0); m_aControlToPropertyMap[pWidget] = aPropertyName; @@ -649,14 +649,14 @@ GtkPrintDialog::impl_initCustomTab() { pWidget = gtk_radio_button_new_with_mnemonic_from_widget( GTK_RADIO_BUTTON(m == 0 ? NULL : pWidget), - rtl::OUStringToOString(aChoices[m].replace('~', '_'), RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aChoices[m].replace('~', '_'), RTL_TEXTENCODING_UTF8).getStr()); lcl_setHelpText(pWidget, aHelpTexts, nCurHelpText++); m_aControlToPropertyMap[pWidget] = aPropertyName; m_aControlToNumValMap[pWidget] = m; GtkWidget* const pRow = gtk_hbox_new(FALSE, 12); gtk_box_pack_start(GTK_BOX(pVbox), pRow, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0); - aPropertyToDependencyRowMap[aPropertyName + rtl::OUString::valueOf(m)] = pRow; + aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(m)] = pRow; gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pWidget), m == nSelectVal); gtk_widget_set_sensitive(pWidget, m_rController.isUIOptionEnabled(aPropertyName) && pVal != NULL); @@ -684,7 +684,7 @@ GtkPrintDialog::impl_initCustomTab() for (sal_Int32 m = 0; m != aChoices.getLength(); m++) { lcl_combo_box_text_append(pWidget, - rtl::OUStringToOString(aChoices[m], RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aChoices[m], RTL_TEXTENCODING_UTF8).getStr()); } sal_Int32 nSelectVal = 0; @@ -698,12 +698,12 @@ GtkPrintDialog::impl_initCustomTab() { pWidget = gtk_entry_new(); - rtl::OUString aCurVal; + OUString aCurVal; pVal = m_rController.getValue(aPropertyName); if (pVal && pVal->Value.hasValue()) pVal->Value >>= aCurVal; gtk_entry_set_text(GTK_ENTRY(pWidget), - rtl::OUStringToOString(aCurVal, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aCurVal, RTL_TEXTENCODING_UTF8).getStr()); } else if (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Range")) && pCurParent) { @@ -725,7 +725,7 @@ GtkPrintDialog::impl_initCustomTab() if (!aText.isEmpty()) { GtkWidget* const pLabel = gtk_label_new_with_mnemonic( - rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr()); gtk_label_set_mnemonic_widget(GTK_LABEL(pLabel), pWidget); gtk_box_pack_start(GTK_BOX(pHbox), pLabel, FALSE, FALSE, 0); } @@ -743,7 +743,7 @@ GtkPrintDialog::impl_initCustomTab() { if (bUseDependencyRow && !aDependsOnName.isEmpty()) { - pRow = aPropertyToDependencyRowMap[aDependsOnName + rtl::OUString::valueOf(nDependsOnValue)]; + pRow = aPropertyToDependencyRowMap[aDependsOnName + OUString::valueOf(nDependsOnValue)]; if (!pRow) { gtk_widget_destroy(pWidget); @@ -759,7 +759,7 @@ GtkPrintDialog::impl_initCustomTab() gtk_box_pack_start(GTK_BOX(pCurParent), pRow, FALSE, FALSE, 0); } if (!pGroup) - aPropertyToDependencyRowMap[aPropertyName + rtl::OUString::valueOf(sal_Int32(0))] = pRow; + aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(sal_Int32(0))] = pRow; gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0); } } @@ -773,7 +773,7 @@ GtkPrintDialog::impl_initCustomTab() { gtk_widget_show_all(aI->first); m_pWrapper->print_unix_dialog_add_custom_tab(GTK_PRINT_UNIX_DIALOG(m_pDialog), aI->first, - gtk_label_new(rtl::OUStringToOString(aI->second, RTL_TEXTENCODING_UTF8).getStr())); + gtk_label_new(OUStringToOString(aI->second, RTL_TEXTENCODING_UTF8).getStr())); } } @@ -798,7 +798,7 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence const& i_rDisabled } beans::PropertyValue* const pPrintContent( - m_rController.getValue(rtl::OUString("PrintContent"))); + m_rController.getValue(OUString("PrintContent"))); if (pPrintContent) { @@ -835,7 +835,7 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence const& i_rDisabled void GtkPrintDialog::impl_checkOptionalControlDependencies() { - for (std::map::iterator it = m_aControlToPropertyMap.begin(); + for (std::map::iterator it = m_aControlToPropertyMap.begin(); it != m_aControlToPropertyMap.end(); ++it) { gtk_widget_set_sensitive(it->first, m_rController.isUIOptionEnabled(it->second)); @@ -847,7 +847,7 @@ beans::PropertyValue* GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const { beans::PropertyValue* pVal(0); - std::map::const_iterator aIt(m_aControlToPropertyMap.find(i_pWidget)); + std::map::const_iterator aIt(m_aControlToPropertyMap.find(i_pWidget)); if (aIt != m_aControlToPropertyMap.end()) { pVal = m_rController.getValue(aIt->second); @@ -936,7 +936,7 @@ GtkPrintDialog::run() } #if 0 -void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings *pSettings) const +void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSettings) const { uno::Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Reference < XFrame > xFrame(xDesktop->getActiveFrame()); @@ -944,7 +944,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings xFrame = uno::Reference < XFrame >(xDesktop, UNO_QUERY); uno::Reference < XFilter > xFilter( - ::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.document.PDFFilter")), + ::comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.document.PDFFilter")), UNO_QUERY); if (xFilter.is()) @@ -962,9 +962,9 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings uno::Reference< XExporter > xExport(xFilter, UNO_QUERY); xExport->setSourceDocument(xDoc); uno::Sequence aFilterData(2); - aFilterData[0].Name = rtl::OUString("PageLayout"); + aFilterData[0].Name = OUString("PageLayout"); aFilterData[0].Value <<= sal_Int32(0); - aFilterData[1].Name = rtl::OUString("FirstPageOnLeft"); + aFilterData[1].Name = OUString("FirstPageOnLeft"); aFilterData[1].Value <<= sal_False; @@ -987,8 +987,8 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings aRangeText.AppendAscii(","); } aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange"); - aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(aRangeText); + aFilterData[aFilterData.getLength()-1].Name = OUString("PageRange"); + aFilterData[aFilterData.getLength()-1].Value <<= OUString(aRangeText); } else if (pStr && !strcmp(pStr, "current")) { @@ -1012,7 +1012,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings xSheets = uno::Reference< XIndexAccess >(xSheetDoc->getSheets(), UNO_QUERY); if (xSheets.is()) { - const rtl::OUString &rName = xName->getName(); + const OUString &rName = xName->getName(); sal_Int32 i; @@ -1027,8 +1027,8 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings if (i < xSheets->getCount()) { aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange"); - aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(OUString::number(i + 1)); + aFilterData[aFilterData.getLength()-1].Name = OUString("PageRange"); + aFilterData[aFilterData.getLength()-1].Value <<= OUString(OUString::number(i + 1)); } } } @@ -1053,15 +1053,15 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings if (aSelection.hasValue()) { aFilterData.realloc(aFilterData.getLength()+1); - aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("Selection"); + aFilterData[aFilterData.getLength()-1].Name = OUString("Selection"); aFilterData[aFilterData.getLength()-1].Value <<= aSelection; } } #endif uno::Sequence aArgs(2); - aArgs[0].Name = rtl::OUString("FilterData"); + aArgs[0].Name = OUString("FilterData"); aArgs[0].Value <<= aFilterData; - aArgs[1].Name = rtl::OUString("OutputStream"); + aArgs[1].Name = OUString("OutputStream"); aArgs[1].Value <<= xOStm; xFilter->filter(aArgs); } @@ -1076,9 +1076,9 @@ GtkPrintDialog::updateControllerPrintRange() // TODO: use get_print_pages if (const gchar* const pStr = m_pWrapper->print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES)) { - beans::PropertyValue* pVal = m_rController.getValue(rtl::OUString("PrintRange")); + beans::PropertyValue* pVal = m_rController.getValue(OUString("PrintRange")); if (!pVal) - pVal = m_rController.getValue(rtl::OUString("PrintContent")); + pVal = m_rController.getValue(OUString("PrintContent")); SAL_WARN_IF(!pVal, "vcl.gtk", "Nothing to map standard print options to!"); if (pVal) { @@ -1093,11 +1093,11 @@ GtkPrintDialog::updateControllerPrintRange() if (nVal == 1) { - pVal = m_rController.getValue(rtl::OUString("PageRange")); + pVal = m_rController.getValue(OUString("PageRange")); SAL_WARN_IF(!pVal, "vcl.gtk", "PageRange doesn't exist!"); if (pVal) { - rtl::OUStringBuffer sBuf; + OUStringBuffer sBuf; gint num_ranges; const GtkPageRange* const pRanges = m_pWrapper->print_settings_get_page_ranges(pSettings, &num_ranges); for (gint i = 0; i != num_ranges && pRanges; ++i) @@ -1133,11 +1133,11 @@ GtkPrintDialog::impl_readFromSettings() vcl::SettingsConfigItem* const pItem(vcl::SettingsConfigItem::get()); GtkPrintSettings* const pSettings(getSettings()); - const rtl::OUString aPrintDialogStr("PrintDialog"); - const rtl::OUString aCopyCount(pItem->getValue(aPrintDialogStr, - rtl::OUString("CopyCount"))); - const rtl::OUString aCollate(pItem->getValue(aPrintDialogStr, - rtl::OUString("Collate"))); + const OUString aPrintDialogStr("PrintDialog"); + const OUString aCopyCount(pItem->getValue(aPrintDialogStr, + OUString("CopyCount"))); + const OUString aCollate(pItem->getValue(aPrintDialogStr, + OUString("Collate"))); bool bChanged(false); @@ -1171,17 +1171,17 @@ const vcl::SettingsConfigItem* const pItem(vcl::SettingsConfigItem::get()); GtkPrintSettings* const pSettings(getSettings()); - const rtl::OUString aPrintDialogStr("PrintDialog"); + const OUString aPrintDialogStr("PrintDialog"); pItem->setValue(aPrintDialogStr, - rtl::OUString("CopyCount"), - rtl::OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings)))); + OUString("CopyCount"), + OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings)))); pItem->setValue(aPrintDialogStr, - rtl::OUString("Collate"), + OUString("Collate"), m_pWrapper->print_settings_get_collate(pSettings) - ? rtl::OUString("true") - : rtl::OUString("false")) + ? OUString("true") + : OUString("false")) ; - // pItem->setValue(aPrintDialog, rtl::OUString::createFromAscii("ToFile"), ); + // pItem->setValue(aPrintDialog, OUString::createFromAscii("ToFile"), ); g_object_unref(G_OBJECT(pSettings)); pItem->Commit(); } diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 3e9da947db95..efd6c13800d8 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -1333,11 +1333,11 @@ sal_Bool GtkSalFrame::PostEvent( void* pData ) return sal_True; } -void GtkSalFrame::SetTitle( const rtl::OUString& rTitle ) +void GtkSalFrame::SetTitle( const OUString& rTitle ) { m_aTitle = rTitle; if( m_pWindow && ! isChild() ) - gtk_window_set_title( GTK_WINDOW(m_pWindow), rtl::OUStringToOString( rTitle, RTL_TEXTENCODING_UTF8 ).getStr() ); + gtk_window_set_title( GTK_WINDOW(m_pWindow), OUStringToOString( rTitle, RTL_TEXTENCODING_UTF8 ).getStr() ); } static inline sal_uInt8 * @@ -1552,7 +1552,7 @@ static void initClientId() if (!bOnce) { bOnce = true; - const rtl::OString& rID = SessionManagerClient::getSessionID(); + const OString& rID = SessionManagerClient::getSessionID(); if (!rID.isEmpty()) gdk_set_sm_client_id(rID.getStr()); } @@ -2133,7 +2133,7 @@ void GtkSalFrame::SetScreenNumber( unsigned int nNewScreen ) void GtkSalFrame::updateWMClass() { - rtl::OString aResClass = rtl::OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US); + OString aResClass = OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US); const char *pResClass = !aResClass.isEmpty() ? aResClass.getStr() : SalGenericSystem::getFrameClassName(); Display *display; @@ -2150,7 +2150,7 @@ void GtkSalFrame::updateWMClass() if( IS_WIDGET_REALIZED( m_pWindow ) ) { XClassHint* pClass = XAllocClassHint(); - rtl::OString aResName = SalGenericSystem::getFrameResName( m_nExtStyle ); + OString aResName = SalGenericSystem::getFrameResName( m_nExtStyle ); pClass->res_name = const_cast(aResName.getStr()); pClass->res_class = const_cast(pResClass); XSetClassHint( display, @@ -2160,7 +2160,7 @@ void GtkSalFrame::updateWMClass() } } -void GtkSalFrame::SetApplicationID( const rtl::OUString &rWMClass ) +void GtkSalFrame::SetApplicationID( const OUString &rWMClass ) { if( rWMClass != m_sWMClass && ! isChild() ) { @@ -2548,14 +2548,14 @@ void GtkSalFrame::Sync() gdk_display_sync( getGdkDisplay() ); } -rtl::OUString GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode ) +OUString GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { #if !GTK_CHECK_VERSION(3,0,0) return getDisplay()->GetKeyName( nKeyCode ); #else (void)nKeyCode; # warning FIXME - key names - return rtl::OUString(); + return OUString(); #endif } @@ -4200,13 +4200,13 @@ gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon if (xText.is()) { sal_uInt32 nPosition = xText->getCaretPosition(); - rtl::OUString sAllText = xText->getText(); + OUString sAllText = xText->getText(); if (sAllText.isEmpty()) return sal_False; - rtl::OString sUTF = rtl::OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8); - rtl::OUString sCursorText(sAllText.copy(0, nPosition)); + OString sUTF = OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8); + OUString sCursorText(sAllText.copy(0, nPosition)); gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(), - rtl::OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength()); + OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength()); return sal_True; } diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 132d3a301c25..688fda4a9419 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -49,8 +49,8 @@ static gchar* GetCommandForItem( GtkSalMenuItem* pSalMenuItem, gchar* aCurrentCo if ( !pMenu ) return NULL; - rtl::OUString aMenuCommand = pMenu->GetItemCommand( nId ); - gchar* aCommandStr = g_strdup( rtl::OUStringToOString( aMenuCommand, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUString aMenuCommand = pMenu->GetItemCommand( nId ); + gchar* aCommandStr = g_strdup( OUStringToOString( aMenuCommand, RTL_TEXTENCODING_UTF8 ).getStr() ); aCommand = g_strdup( aCommandStr ); // Some items could have duplicated commands. A new one should be generated. @@ -551,12 +551,12 @@ void GtkSalMenu::NativeSetEnableItem( gchar* aCommand, gboolean bEnable ) g_lo_action_group_set_action_enabled( pActionGroup, aCommand, bEnable ); } -void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const rtl::OUString& rText ) +void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText ) { SolarMutexGuard aGuard; // Replace the '~' character with '_'. - rtl::OUString aText = rText.replace( '~', '_' ); - rtl::OString aConvertedText = OUStringToOString( aText, RTL_TEXTENCODING_UTF8 ); + OUString aText = rText.replace( '~', '_' ); + OString aConvertedText = OUStringToOString( aText, RTL_TEXTENCODING_UTF8 ); // Update item text only when necessary. gchar* aLabel = g_lo_menu_get_label_from_item_in_section( G_LO_MENU( mpMenuModel ), nSection, nItemPos ); @@ -568,7 +568,7 @@ void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const g_free( aLabel ); } -void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ) +void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const OUString& rKeyName ) { SolarMutexGuard aGuard; @@ -662,7 +662,7 @@ GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar* aCommand, gboolean bGetSub GtkSalMenuItem *pSalItem = maItems[ nPos ]; String aItemCommand = mpVCLMenu->GetItemCommand( pSalItem->mnId ); - gchar* aItemCommandStr = (gchar*) rtl::OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ).getStr(); + gchar* aItemCommandStr = (gchar*) OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ).getStr(); if ( g_strcmp0( aItemCommandStr, aCommand ) == 0 ) { @@ -764,7 +764,7 @@ void GtkSalMenu::ShowItem( unsigned nPos, sal_Bool bShow ) } -void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const rtl::OUString& ) +void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const OUString& ) { } @@ -772,7 +772,7 @@ void GtkSalMenu::SetItemImage( unsigned, SalMenuItem*, const Image& ) { } -void GtkSalMenu::SetAccelerator( unsigned, SalMenuItem*, const KeyCode&, const rtl::OUString& ) +void GtkSalMenu::SetAccelerator( unsigned, SalMenuItem*, const KeyCode&, const OUString& ) { } diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 281be6f42c3e..50a2003192a3 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -773,7 +773,7 @@ void GtkSalGraphics::PaintCombobox( GtkStyleContext *context, sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& ) + const OUString& ) { GtkStateFlags flags; GtkShadowType shadow; @@ -997,7 +997,7 @@ void GtkSalGraphics::renderAreaToPix( cairo_t *cr, } sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState, - const ImplControlValue&, const rtl::OUString&, + const ImplControlValue&, const OUString&, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { /* TODO: all this funcions needs improvements */ @@ -1306,7 +1306,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILanguageTag().getLocale() ); fprintf( stderr, "font match %s, name AFTER: \"%s\"\n", aInfo.m_nID != 0 ? "succeeded" : "failed", - rtl::OUStringToOString( aInfo.m_aStyleName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); + OUStringToOString( aInfo.m_aStyleName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); int nPointHeight = 0; /*sal_Int32 nDispDPIY = GetDisplay()->GetResolution().B(); diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx index c7f30edeabe9..d281949f6e37 100644 --- a/vcl/unx/kde/UnxCommandThread.cxx +++ b/vcl/unx/kde/UnxCommandThread.cxx @@ -50,26 +50,26 @@ sal_Bool SAL_CALL UnxFilePickerCommandThread::result() return m_aResult; } -::rtl::OUString SAL_CALL UnxFilePickerCommandThread::getCurrentFilter() +OUString SAL_CALL UnxFilePickerCommandThread::getCurrentFilter() { ::osl::MutexGuard aGuard( m_aMutex ); return m_aGetCurrentFilter; } -::rtl::OUString SAL_CALL UnxFilePickerCommandThread::getDirectory() +OUString SAL_CALL UnxFilePickerCommandThread::getDirectory() { ::osl::MutexGuard aGuard( m_aMutex ); return m_aGetDirectory; } -uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePickerCommandThread::getFiles() +uno::Sequence< OUString > SAL_CALL UnxFilePickerCommandThread::getFiles() { ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nSize = m_aGetFiles.size(); - uno::Sequence< ::rtl::OUString > aFiles( ( nSize > 1 )? nSize + 1: nSize ); + uno::Sequence< OUString > aFiles( ( nSize > 1 )? nSize + 1: nSize ); if ( nSize == 1 ) aFiles[0] = m_aGetFiles.front(); @@ -78,18 +78,18 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePickerCommandThread::getFiles() // First entry in the sequence must be the dirname, the others are the // filenames, so we have to rearrange the list... - ::rtl::OUString aFront = m_aGetFiles.front(); + OUString aFront = m_aGetFiles.front(); sal_Int32 nLastSlash = aFront.lastIndexOf( '/' ); - aFiles[0] = ( nLastSlash >= 0 )? aFront.copy( 0, nLastSlash ): ::rtl::OUString(); + aFiles[0] = ( nLastSlash >= 0 )? aFront.copy( 0, nLastSlash ): OUString(); ++nLastSlash; sal_Int32 nIdx = 1; - for ( ::std::list< ::rtl::OUString >::const_iterator it = m_aGetFiles.begin(); + for ( ::std::list< OUString >::const_iterator it = m_aGetFiles.begin(); it != m_aGetFiles.end(); ++it, ++nIdx ) { sal_Int32 nLength = (*it).getLength() - nLastSlash; - aFiles[nIdx] = ( nLength >= 0 )? (*it).copy( nLastSlash, nLength ): ::rtl::OUString(); + aFiles[nIdx] = ( nLength >= 0 )? (*it).copy( nLastSlash, nLength ): OUString(); } } @@ -133,7 +133,7 @@ void SAL_CALL UnxFilePickerCommandThread::run() if ( strcmp( pEntryBegin, "exited" ) == 0 ) bShouldExit = sal_True; else - handleCommand( ::rtl::OUString( pEntryBegin, pEntryEnd - pEntryBegin, RTL_TEXTENCODING_UTF8 )/*, bQuit*/ ); + handleCommand( OUString( pEntryBegin, pEntryEnd - pEntryBegin, RTL_TEXTENCODING_UTF8 )/*, bQuit*/ ); pEntryBegin = pEntryEnd + 1; } @@ -162,7 +162,7 @@ void SAL_CALL UnxFilePickerCommandThread::run() } } -void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &rCommand ) +void SAL_CALL UnxFilePickerCommandThread::handleCommand( const OUString &rCommand ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -171,12 +171,12 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & OUStringToOString( rCommand, RTL_TEXTENCODING_ASCII_US ).getStr() << "\"" << ::std::endl; #endif - ::std::list< ::rtl::OUString > aList = tokenize( rCommand ); + ::std::list< OUString > aList = tokenize( rCommand ); if ( aList.empty() ) return; - ::rtl::OUString aCommandName = aList.front(); + OUString aCommandName = aList.front(); aList.pop_front(); if ( aCommandName == "accept" ) @@ -201,7 +201,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & } else if ( aCommandName == "value" ) { - ::rtl::OUString aType; + OUString aType; if ( !aList.empty() ) { aType = aList.front(); @@ -226,7 +226,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & } else if ( aType == "string" ) { - ::rtl::OUString aValue; + OUString aValue; if ( !aList.empty() ) aValue = aList.front(); @@ -235,9 +235,9 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & } else if ( aType == "stringList" ) { - uno::Sequence< ::rtl::OUString > aSequence( aList.size() ); + uno::Sequence< OUString > aSequence( aList.size() ); sal_Int32 nIdx = 0; - for ( ::std::list< ::rtl::OUString >::const_iterator it = aList.begin(); it != aList.end(); ++it, ++nIdx ) + for ( ::std::list< OUString >::const_iterator it = aList.begin(); it != aList.end(); ++it, ++nIdx ) aSequence[nIdx] = (*it); m_aGetValue <<= aSequence; @@ -251,12 +251,12 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & } else if ( aCommandName == "currentFilter" ) { - m_aGetCurrentFilter = aList.empty()? ::rtl::OUString(): aList.front(); + m_aGetCurrentFilter = aList.empty()? OUString(): aList.front(); m_aGetCurrentFilterCondition.set(); } else if ( aCommandName == "currentDirectory" ) { - m_aGetDirectory = aList.empty()? ::rtl::OUString(): aList.front(); + m_aGetDirectory = aList.empty()? OUString(): aList.front(); m_aGetDirectoryCondition.set(); } else @@ -268,10 +268,10 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString & } } -::std::list< ::rtl::OUString > SAL_CALL UnxFilePickerCommandThread::tokenize( const ::rtl::OUString &rCommand ) +::std::list< OUString > SAL_CALL UnxFilePickerCommandThread::tokenize( const OUString &rCommand ) { - ::std::list< ::rtl::OUString > aList; - ::rtl::OUStringBuffer aBuffer( 1024 ); + ::std::list< OUString > aList; + OUStringBuffer aBuffer( 1024 ); const sal_Unicode *pUnicode = rCommand.getStr(); const sal_Unicode *pEnd = pUnicode + rCommand.getLength(); diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx index 787899af7fbc..ef569740eaec 100644 --- a/vcl/unx/kde/UnxCommandThread.hxx +++ b/vcl/unx/kde/UnxCommandThread.hxx @@ -84,13 +84,13 @@ protected: sal_Bool m_aResult; ::osl::Condition m_aGetCurrentFilterCondition; - ::rtl::OUString m_aGetCurrentFilter; + OUString m_aGetCurrentFilter; ::osl::Condition m_aGetDirectoryCondition; - ::rtl::OUString m_aGetDirectory; + OUString m_aGetDirectory; ::osl::Condition m_aGetFilesCondition; - ::std::list< ::rtl::OUString > m_aGetFiles; + ::std::list< OUString > m_aGetFiles; ::osl::Condition m_aGetValueCondition; ::com::sun::star::uno::Any m_aGetValue; @@ -103,13 +103,13 @@ public: sal_Bool SAL_CALL result(); ::osl::Condition& SAL_CALL getCurrentFilterCondition() { return m_aGetCurrentFilterCondition; } - ::rtl::OUString SAL_CALL getCurrentFilter(); + OUString SAL_CALL getCurrentFilter(); ::osl::Condition& SAL_CALL getDirectoryCondition() { return m_aGetDirectoryCondition; } - ::rtl::OUString SAL_CALL getDirectory(); + OUString SAL_CALL getDirectory(); ::osl::Condition& SAL_CALL getFilesCondition() { return m_aGetFilesCondition; } - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles(); ::osl::Condition& SAL_CALL getValueCondition() { return m_aGetValueCondition; } ::com::sun::star::uno::Any SAL_CALL getValue(); @@ -117,8 +117,8 @@ public: protected: virtual void SAL_CALL run(); - virtual void SAL_CALL handleCommand( const ::rtl::OUString &rCommand/*, sal_Bool &rQuit*/ ); - ::std::list< ::rtl::OUString > SAL_CALL tokenize( const ::rtl::OUString &rCommand ); + virtual void SAL_CALL handleCommand( const OUString &rCommand/*, sal_Bool &rQuit*/ ); + ::std::list< OUString > SAL_CALL tokenize( const OUString &rCommand ); }; #endif // _UNXCOMMANDTHREAD_HXX_ diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index afd4350f8719..5ccc84251544 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -68,15 +68,15 @@ namespace const bool STARTUP_SUSPENDED = true; const bool STARTUP_ALIVE = false; - uno::Sequence SAL_CALL FilePicker_getSupportedServiceNames() + uno::Sequence SAL_CALL FilePicker_getSupportedServiceNames() { - uno::Sequence aRet(3); - aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker"); + uno::Sequence aRet(3); + aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker"); + aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker"); #if ENABLE_TDE - aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.TDEFilePicker"); + aRet[2] = OUString("com.sun.star.ui.dialogs.TDEFilePicker"); #else // ENABLE_TDE - aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDEFilePicker"); + aRet[2] = OUString("com.sun.star.ui.dialogs.KDEFilePicker"); #endif // ENABLE_TDE return aRet; } @@ -101,7 +101,7 @@ UnxFilePicker::~UnxFilePicker() { if ( m_nFilePickerPid > 0 ) { - sendCommand( ::rtl::OUString( "exit" ) ); + sendCommand( OUString( "exit" ) ); waitpid( m_nFilePickerPid, NULL, 0 ); } @@ -148,13 +148,13 @@ void SAL_CALL UnxFilePicker::removeFilePickerListener( const uno::ReferenceremoveFilePickerListener( xListener ); } -void SAL_CALL UnxFilePicker::setTitle( const rtl::OUString &rTitle ) +void SAL_CALL UnxFilePicker::setTitle( const OUString &rTitle ) throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setTitle " ); appendEscaped( aBuffer, rTitle ); @@ -170,7 +170,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute() // this is _not_ an osl::Condition, see i#93366 m_pCommandThread->execCondition().reset(); - sendCommand( ::rtl::OUString( "exec" )); + sendCommand( OUString( "exec" )); m_pCommandThread->execCondition().wait(); @@ -183,20 +183,20 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode ) checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString aString = bMode? - ::rtl::OUString( "setMultiSelection true" ): - ::rtl::OUString( "setMultiSelection false" ); + OUString aString = bMode? + OUString( "setMultiSelection true" ): + OUString( "setMultiSelection false" ); sendCommand( aString ); } -void SAL_CALL UnxFilePicker::setDefaultName( const ::rtl::OUString &rName ) +void SAL_CALL UnxFilePicker::setDefaultName( const OUString &rName ) throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setDefaultName " ); appendEscaped( aBuffer, rName ); @@ -204,13 +204,13 @@ void SAL_CALL UnxFilePicker::setDefaultName( const ::rtl::OUString &rName ) sendCommand( aBuffer.makeStringAndClear() ); } -void SAL_CALL UnxFilePicker::setDisplayDirectory( const rtl::OUString &rDirectory ) +void SAL_CALL UnxFilePicker::setDisplayDirectory( const OUString &rDirectory ) throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setDirectory " ); appendEscaped( aBuffer, rDirectory ); @@ -218,37 +218,37 @@ void SAL_CALL UnxFilePicker::setDisplayDirectory( const rtl::OUString &rDirector sendCommand( aBuffer.makeStringAndClear() ); } -rtl::OUString SAL_CALL UnxFilePicker::getDisplayDirectory() +OUString SAL_CALL UnxFilePicker::getDisplayDirectory() throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString( "getDirectory" ), + sendCommand( OUString( "getDirectory" ), m_pCommandThread->getDirectoryCondition() ); return m_pCommandThread->getDirectory(); } -uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getFiles() +uno::Sequence< OUString > SAL_CALL UnxFilePicker::getFiles() throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString( "getFiles" ), + sendCommand( OUString( "getFiles" ), m_pCommandThread->getFilesCondition() ); return m_pCommandThread->getFiles(); } -void SAL_CALL UnxFilePicker::appendFilter( const ::rtl::OUString &rTitle, const ::rtl::OUString &rFilter ) +void SAL_CALL UnxFilePicker::appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "appendFilter " ); appendEscaped( aBuffer, rTitle ); @@ -258,13 +258,13 @@ void SAL_CALL UnxFilePicker::appendFilter( const ::rtl::OUString &rTitle, const sendCommand( aBuffer.makeStringAndClear() ); } -void SAL_CALL UnxFilePicker::setCurrentFilter( const rtl::OUString &rTitle ) +void SAL_CALL UnxFilePicker::setCurrentFilter( const OUString &rTitle ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setCurrentFilter " ); appendEscaped( aBuffer, rTitle ); @@ -272,25 +272,25 @@ void SAL_CALL UnxFilePicker::setCurrentFilter( const rtl::OUString &rTitle ) sendCommand( aBuffer.makeStringAndClear() ); } -rtl::OUString SAL_CALL UnxFilePicker::getCurrentFilter() +OUString SAL_CALL UnxFilePicker::getCurrentFilter() throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString( "getCurrentFilter" ), + sendCommand( OUString( "getCurrentFilter" ), m_pCommandThread->getCurrentFilterCondition() ); return m_pCommandThread->getCurrentFilter(); } -void SAL_CALL UnxFilePicker::appendFilterGroup( const rtl::OUString &rGroupTitle, const uno::Sequence &rFilters ) +void SAL_CALL UnxFilePicker::appendFilterGroup( const OUString &rGroupTitle, const uno::Sequence &rFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "appendFilterGroup " ); appendEscaped( aBuffer, rGroupTitle ); @@ -314,13 +314,13 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString aType; - ::rtl::OUString aAction; + OUString aType; + OUString aAction; sal_Int32 nTitleId; if ( controlIdInfo( nControlId, aType, nTitleId ) && controlActionInfo( nControlAction, aAction ) ) { - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setValue " ); aBuffer.append( static_cast< sal_Int32 >( nControlId ) ); @@ -342,7 +342,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA case ControlActions::ADD_ITEM: case ControlActions::SET_HELP_URL: { - ::rtl::OUString aString; + OUString aString; if ( rValue >>= aString ) { aBuffer.appendAscii( " ", 1 ); @@ -353,7 +353,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA case ControlActions::ADD_ITEMS: { - uno::Sequence< ::rtl::OUString > aSequence; + uno::Sequence< OUString > aSequence; if ( rValue >>= aSequence ) { for ( sal_Int32 nIdx = 0; nIdx < aSequence.getLength(); ++nIdx ) @@ -395,11 +395,11 @@ uno::Any SAL_CALL UnxFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nCont checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString aAction; + OUString aAction; if ( controlActionInfo( nControlAction, aAction ) ) { - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "getValue " ); aBuffer.append( static_cast< sal_Int32 >( nControlId ) ); @@ -421,7 +421,7 @@ void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnab checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "enableControl " ); aBuffer.append( static_cast< sal_Int32 >( nControlId ) ); @@ -430,13 +430,13 @@ void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnab sendCommand( aBuffer.makeStringAndClear() ); } -void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString &rLabel ) +void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw( uno::RuntimeException ) { checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "setLabel " ); aBuffer.append( static_cast< sal_Int32 >( nControlId ) ); @@ -446,7 +446,7 @@ void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUStri sendCommand( aBuffer.makeStringAndClear() ); } -rtl::OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/) +OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/) throw ( uno::RuntimeException ) { // FIXME getLabel() is not yet implemented @@ -454,7 +454,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/) ::osl::MutexGuard aGuard( m_aMutex ); // TODO return m_pImpl->getLabel(nControlId); - return ::rtl::OUString(); + return OUString(); } /* TODO @@ -531,21 +531,21 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence &rArgumen uno::Any aAny; if ( 0 == rArguments.getLength( ) ) throw lang::IllegalArgumentException( - rtl::OUString( "no arguments" ), + OUString( "no arguments" ), static_cast< XFilePicker2* >( this ), 1 ); aAny = rArguments[0]; if ( ( aAny.getValueType() != ::getCppuType( (sal_Int16*)0 ) ) && ( aAny.getValueType() != ::getCppuType( (sal_Int8*)0 ) ) ) throw lang::IllegalArgumentException( - rtl::OUString( "invalid argument type" ), + OUString( "invalid argument type" ), static_cast< XFilePicker2* >( this ), 1 ); sal_Int16 templateId = -1; aAny >>= templateId; - ::rtl::OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" )); - ::rtl::OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" )); + OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" )); + OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" )); switch ( templateId ) { @@ -622,7 +622,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence &rArgumen default: throw lang::IllegalArgumentException( - rtl::OUString( "Unknown template" ), + OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -647,16 +647,16 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent ) removeFilePickerListener( xFilePickerListener ); } -rtl::OUString SAL_CALL UnxFilePicker::getImplementationName() +OUString SAL_CALL UnxFilePicker::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); + return OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); } -sal_Bool SAL_CALL UnxFilePicker::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL UnxFilePicker::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames(); + uno::Sequence< OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames(); for ( sal_Int32 n = SupportedServicesNames.getLength(); n--; ) { @@ -667,7 +667,7 @@ sal_Bool SAL_CALL UnxFilePicker::supportsService( const rtl::OUString& ServiceNa return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSupportedServiceNames() throw( uno::RuntimeException ) { return FilePicker_getSupportedServiceNames(); @@ -704,14 +704,14 @@ void UnxFilePicker::initFilePicker() // The executable name #if ENABLE_TDE - rtl::OUString helperurl("${ORIGIN}/tdefilepicker"); + OUString helperurl("${ORIGIN}/tdefilepicker"); #else // ENABLE_TDE - rtl::OUString helperurl("${ORIGIN}/kdefilepicker"); + OUString helperurl("${ORIGIN}/kdefilepicker"); #endif // ENABLE_TDE rtl::Bootstrap::expandMacros( helperurl ); - rtl::OUString helperpath; + OUString helperpath; osl::FileBase::getSystemPathFromFileURL( helperurl, helperpath ); - rtl::OString helper( rtl::OUStringToOString( helperpath, osl_getThreadTextEncoding())); + OString helper( OUStringToOString( helperpath, osl_getThreadTextEncoding())); // ID of the main window const int nIdLen = 20; @@ -769,17 +769,17 @@ void UnxFilePicker::checkFilePicker() throw( ::com::sun::star::uno::RuntimeExcep else { throw uno::RuntimeException( - ::rtl::OUString( "the external file picker does not run" ), + OUString( "the external file picker does not run" ), *this ); } } -void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand ) +void UnxFilePicker::sendCommand( const OUString &rCommand ) { if ( m_nFilePickerWrite < 0 ) return; - ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString( "\n" ), RTL_TEXTENCODING_UTF8 ); + OString aUtfString = OUStringToOString( rCommand + OUString( "\n" ), RTL_TEXTENCODING_UTF8 ); #if OSL_DEBUG_LEVEL > 0 ::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl; @@ -788,7 +788,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand ) write( m_nFilePickerWrite, aUtfString.getStr(), aUtfString.getLength() ); } -void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand, ::osl::Condition &rCondition ) +void UnxFilePicker::sendCommand( const OUString &rCommand, ::osl::Condition &rCondition ) { rCondition.reset(); @@ -797,7 +797,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand, ::osl::Conditi rCondition.wait(); } -void UnxFilePicker::appendEscaped( ::rtl::OUStringBuffer &rBuffer, const ::rtl::OUString &rString ) +void UnxFilePicker::appendEscaped( OUStringBuffer &rBuffer, const OUString &rString ) { const sal_Unicode *pUnicode = rString.getStr(); const sal_Unicode *pEnd = pUnicode + rString.getLength(); @@ -819,20 +819,20 @@ void UnxFilePicker::appendEscaped( ::rtl::OUStringBuffer &rBuffer, const ::rtl:: rBuffer.appendAscii( "\"", 1 ); } -sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rType, sal_Int32 &rTitleId ) +sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ) { typedef struct { sal_Int16 nId; - const ::rtl::OUString *pType; + const OUString *pType; sal_Int32 nTitle; } ElementToName; - const ::rtl::OUString aCheckBox( "checkbox" ); - const ::rtl::OUString aControl( "control" ); - const ::rtl::OUString aEdit( "edit" ); - const ::rtl::OUString aLabel( "label" ); - const ::rtl::OUString aListBox( "listbox" ); - const ::rtl::OUString aPushButton( "pushbutton" ); + const OUString aCheckBox( "checkbox" ); + const OUString aControl( "control" ); + const OUString aEdit( "edit" ); + const OUString aLabel( "label" ); + const OUString aListBox( "listbox" ); + const OUString aPushButton( "pushbutton" ); const ElementToName *pPtr; const ElementToName pArray[] = @@ -873,27 +873,27 @@ sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rT return sal_False; } -sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, ::rtl::OUString &rType ) +sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, OUString &rType ) { typedef struct { sal_Int16 nId; - const ::rtl::OUString pType; + const OUString pType; } ElementToName; const ElementToName *pPtr; const ElementToName pArray[] = { - { ControlActions::ADD_ITEM, ::rtl::OUString( "addItem" ) }, - { ControlActions::ADD_ITEMS, ::rtl::OUString( "addItems" ) }, - { ControlActions::DELETE_ITEM, ::rtl::OUString( "deleteItem" ) }, - { ControlActions::DELETE_ITEMS, ::rtl::OUString( "deleteItems" ) }, - { ControlActions::SET_SELECT_ITEM, ::rtl::OUString( "setSelectedItem" ) }, - { ControlActions::GET_ITEMS, ::rtl::OUString( "getItems" ) }, - { ControlActions::GET_SELECTED_ITEM, ::rtl::OUString( "getSelectedItem" ) }, - { ControlActions::GET_SELECTED_ITEM_INDEX, ::rtl::OUString( "getSelectedItemIndex" ) }, - { ControlActions::SET_HELP_URL, ::rtl::OUString( "setHelpURL" ) }, - { ControlActions::GET_HELP_URL, ::rtl::OUString( "getHelpURL" ) }, - { 0, ::rtl::OUString( "noAction" ) } + { ControlActions::ADD_ITEM, OUString( "addItem" ) }, + { ControlActions::ADD_ITEMS, OUString( "addItems" ) }, + { ControlActions::DELETE_ITEM, OUString( "deleteItem" ) }, + { ControlActions::DELETE_ITEMS, OUString( "deleteItems" ) }, + { ControlActions::SET_SELECT_ITEM, OUString( "setSelectedItem" ) }, + { ControlActions::GET_ITEMS, OUString( "getItems" ) }, + { ControlActions::GET_SELECTED_ITEM, OUString( "getSelectedItem" ) }, + { ControlActions::GET_SELECTED_ITEM_INDEX, OUString( "getSelectedItemIndex" ) }, + { ControlActions::SET_HELP_URL, OUString( "setHelpURL" ) }, + { ControlActions::GET_HELP_URL, OUString( "getHelpURL" ) }, + { 0, OUString( "noAction" ) } }; for ( pPtr = pArray; pPtr->nId && ( pPtr->nId != nControlAction ); ++pPtr ) @@ -906,12 +906,12 @@ sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, ::rtl::OUSt void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId ) { - ::rtl::OUString aType; + OUString aType; sal_Int32 nTitleId; if ( controlIdInfo( nControlId, aType, nTitleId ) ) { - ::rtl::OUStringBuffer aBuffer( 1024 ); + OUStringBuffer aBuffer( 1024 ); aBuffer.appendAscii( "appendControl " ); aBuffer.append( static_cast< sal_Int32 >( nControlId ) ); @@ -924,7 +924,7 @@ void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId ) } } -uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getSelectedFiles() +uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSelectedFiles() throw( uno::RuntimeException ) { return getFiles(); diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx index afc5b6cae4d1..198eba03a962 100644 --- a/vcl/unx/kde/UnxFilePicker.hxx +++ b/vcl/unx/kde/UnxFilePicker.hxx @@ -83,34 +83,34 @@ public: // XExecutableDialog functions - virtual void SAL_CALL setTitle( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException ); // XFilePicker functions virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDefaultName( const ::rtl::OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); // XFilterManager functions - virtual void SAL_CALL appendFilter( const ::rtl::OUString &rTitle, const ::rtl::OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XFilePickerControlAccess functions virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const ::rtl::OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); /* TODO XFilePreview @@ -125,7 +125,7 @@ public: // XFilePicker2 - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -142,9 +142,9 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); private: // prevent copy and assignment @@ -156,14 +156,14 @@ protected: void checkFilePicker() throw( ::com::sun::star::uno::RuntimeException ); // Async sendCommand - void sendCommand( const ::rtl::OUString &rCommand ); + void sendCommand( const OUString &rCommand ); // Synchronized sendCommand - void sendCommand( const ::rtl::OUString &rCommand, ::osl::Condition &rCondition ); - void appendEscaped( ::rtl::OUStringBuffer &rBuffer, const ::rtl::OUString &rString ); + void sendCommand( const OUString &rCommand, ::osl::Condition &rCondition ); + void appendEscaped( OUStringBuffer &rBuffer, const OUString &rString ); private: - sal_Bool controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rType, sal_Int32 &rTitleId ); - sal_Bool controlActionInfo( sal_Int16 nControlId, ::rtl::OUString &rType ); + sal_Bool controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ); + sal_Bool controlActionInfo( sal_Int16 nControlId, OUString &rType ); void sendAppendControlCommand( sal_Int16 nControlId ); }; diff --git a/vcl/unx/kde/UnxNotifyThread.hxx b/vcl/unx/kde/UnxNotifyThread.hxx index 36e74cef1de7..266f190f49e9 100644 --- a/vcl/unx/kde/UnxNotifyThread.hxx +++ b/vcl/unx/kde/UnxNotifyThread.hxx @@ -65,7 +65,7 @@ public: void SAL_CALL fileSelectionChanged(); /* TODO void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); - rtl::OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const; + OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const; void SAL_CALL controlStateChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); void SAL_CALL dialogSizeChanged( ); */ diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index 07706b2ec921..9c6e19d4a3ed 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -127,8 +127,8 @@ void KDEXLib::Init() m_nFakeCmdLineArgs = 1; sal_uInt16 nIdx; int nParams = osl_getCommandArgCount(); - rtl::OString aDisplay; - rtl::OUString aParam, aBin; + OString aDisplay; + OUString aParam, aBin; for ( nIdx = 0; nIdx < nParams; ++nIdx ) { @@ -136,7 +136,7 @@ void KDEXLib::Init() if ( !m_pFreeCmdLineArgs && aParam == "-display" && nIdx + 1 < nParams ) { osl_getCommandArg( nIdx + 1, &aParam.pData ); - aDisplay = rtl::OUStringToOString( aParam, osl_getThreadTextEncoding() ); + aDisplay = OUStringToOString( aParam, osl_getThreadTextEncoding() ); m_nFakeCmdLineArgs = 3; m_pFreeCmdLineArgs = new char*[ m_nFakeCmdLineArgs ]; @@ -149,7 +149,7 @@ void KDEXLib::Init() osl_getExecutableFile( &aParam.pData ); osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData ); - rtl::OString aExec = rtl::OUStringToOString( aBin, osl_getThreadTextEncoding() ); + OString aExec = OUStringToOString( aBin, osl_getThreadTextEncoding() ); m_pFreeCmdLineArgs[0] = strdup( aExec.getStr() ); // make a copy of the string list for freeing it since @@ -214,7 +214,7 @@ extern "C" { if( ! ( pNoXInitThreads && *pNoXInitThreads ) ) XInitThreads(); - rtl::OString aVersion( qVersion() ); + OString aVersion( qVersion() ); SAL_INFO( "vcl.kde", "qt version string is \"" << aVersion << "\"" ); sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0, nMicro = 0; diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index cd20d3da69e6..d2731b095168 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -74,23 +74,23 @@ namespace const bool STARTUP_SUSPENDED = true; const bool STARTUP_ALIVE = false; - uno::Sequence SAL_CALL FilePicker_getSupportedServiceNames() + uno::Sequence SAL_CALL FilePicker_getSupportedServiceNames() { - uno::Sequence aRet(3); - aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker"); - aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDE4FilePicker"); + uno::Sequence aRet(3); + aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker"); + aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker"); + aRet[2] = OUString("com.sun.star.ui.dialogs.KDE4FilePicker"); return aRet; } } -rtl::OUString toOUString(const QString& s) +OUString toOUString(const QString& s) { // QString stores UTF16, just like OUString - return rtl::OUString(reinterpret_cast(s.data()), s.length()); + return OUString(reinterpret_cast(s.data()), s.length()); } -QString toQString(const rtl::OUString& s) +QString toQString(const OUString& s) { return QString::fromUtf16(s.getStr(), s.getLength()); } @@ -133,7 +133,7 @@ void SAL_CALL KDE4FilePicker::removeFilePickerListener( const uno::ReferencesetCaption(toQString(title)); @@ -194,28 +194,28 @@ void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect ) _dialog->setMode(KFile::File | KFile::LocalOnly); } -void SAL_CALL KDE4FilePicker::setDefaultName( const ::rtl::OUString &name ) +void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name ) throw( uno::RuntimeException ) { const QString url = toQString(name); _dialog->setSelection(url); } -void SAL_CALL KDE4FilePicker::setDisplayDirectory( const rtl::OUString &dir ) +void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir ) throw( uno::RuntimeException ) { const QString url = toQString(dir); _dialog->setUrl(KUrl(url)); } -rtl::OUString SAL_CALL KDE4FilePicker::getDisplayDirectory() +OUString SAL_CALL KDE4FilePicker::getDisplayDirectory() throw( uno::RuntimeException ) { QString dir = _dialog->baseUrl().url(); return toOUString(dir); } -uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles() +uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles() throw( uno::RuntimeException ) { QStringList rawFiles = _dialog->selectedFiles(); @@ -252,10 +252,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles() } // add all files and leading directory to outgoing OO sequence - uno::Sequence< ::rtl::OUString > seq(files.size()); + uno::Sequence< OUString > seq(files.size()); for (int i = 0; i < files.size(); ++i) { - rtl::OUString aFile(toOUString(files[i])), aURL; + OUString aFile(toOUString(files[i])), aURL; osl_getFileURLFromSystemPath(aFile.pData, &aURL.pData ); seq[i] = aURL; } @@ -263,13 +263,13 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles() return seq; } -uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getSelectedFiles() +uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles() throw( uno::RuntimeException ) { return getFiles(); } -void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const ::rtl::OUString &filter ) +void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUString &filter ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { QString t = toQString(title); @@ -291,7 +291,7 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const _filter.append(QString("%1|%2").arg(f).arg(t)); } -void SAL_CALL KDE4FilePicker::setCurrentFilter( const rtl::OUString &title ) +void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { QString t = toQString(title); @@ -299,7 +299,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const rtl::OUString &title ) _dialog->filterWidget()->setCurrentFilter(t); } -rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter() +OUString SAL_CALL KDE4FilePicker::getCurrentFilter() throw( uno::RuntimeException ) { // _dialog->currentFilter() wouldn't quite work, because it returns only e.g. "*.doc", @@ -315,7 +315,7 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter() return toOUString(filter); } -void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString& , const uno::Sequence& filters) +void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& , const uno::Sequence& filters) throw( lang::IllegalArgumentException, uno::RuntimeException ) { const sal_uInt16 length = filters.getLength(); @@ -419,7 +419,7 @@ void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enabl } } -void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const ::rtl::OUString &label ) +void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &label ) throw( uno::RuntimeException ) { QWidget* widget = _customWidgets[controlId]; @@ -453,7 +453,7 @@ void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const ::rtl::OUStri } } -rtl::OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId) +OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId) throw ( uno::RuntimeException ) { QWidget* widget = _customWidgets[controlId]; @@ -550,7 +550,7 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId) if (_resMgr && resId != -1) { - rtl::OUString s = String(ResId( resId, *_resMgr )); + OUString s = String(ResId( resId, *_resMgr )); label = toQString(s); label.replace("~", "&"); } @@ -591,7 +591,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence &args ) if (args.getLength() == 0) { throw lang::IllegalArgumentException( - rtl::OUString( "no arguments" ), + OUString( "no arguments" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -601,7 +601,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence &args ) ( arg.getValueType() != ::getCppuType((sal_Int8*)0))) { throw lang::IllegalArgumentException( - rtl::OUString( "invalid argument type" ), + OUString( "invalid argument type" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -673,7 +673,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence &args ) default: throw lang::IllegalArgumentException( - rtl::OUString( "Unknown template" ), + OUString( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } @@ -699,16 +699,16 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent ) } } -rtl::OUString SAL_CALL KDE4FilePicker::getImplementationName() +OUString SAL_CALL KDE4FilePicker::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); + return OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); } -sal_Bool SAL_CALL KDE4FilePicker::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL KDE4FilePicker::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames(); + uno::Sequence< OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames(); for ( sal_Int32 n = SupportedServicesNames.getLength(); n--; ) { @@ -719,7 +719,7 @@ sal_Bool SAL_CALL KDE4FilePicker::supportsService( const rtl::OUString& ServiceN return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames() throw( uno::RuntimeException ) { return FilePicker_getSupportedServiceNames(); diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx index 1170f96597b8..01eb8084c81d 100644 --- a/vcl/unx/kde4/KDE4FilePicker.hxx +++ b/vcl/unx/kde4/KDE4FilePicker.hxx @@ -88,34 +88,34 @@ public: // XExecutableDialog functions - virtual void SAL_CALL setTitle( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException ); // XFilePicker functions virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDefaultName( const ::rtl::OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); // XFilterManager functions - virtual void SAL_CALL appendFilter( const ::rtl::OUString &rTitle, const ::rtl::OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XFilePickerControlAccess functions virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setLabel( sal_Int16 nControlId, const ::rtl::OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); /* TODO XFilePreview @@ -130,7 +130,7 @@ public: // XFilePicker2 functions - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -148,9 +148,9 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); private: // prevent copy and assignment diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index 39c3a52a48ab..b25afd652564 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -67,7 +67,7 @@ class KDESalGraphics : public X11SalGraphics virtual sal_Bool drawNativeControl( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ); + const OUString& aCaption ); /** Check if the bounding regions match. @@ -89,7 +89,7 @@ class KDESalGraphics : public X11SalGraphics virtual sal_Bool getNativeControlRegion( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& aValue, - const rtl::OUString& aCaption, + const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); }; diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 73915ee74cfe..0e5a88b16558 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -122,8 +122,8 @@ void KDEXLib::Init() sal_uInt16 nIdx; int nParams = osl_getCommandArgCount(); - rtl::OString aDisplay; - rtl::OUString aParam, aBin; + OString aDisplay; + OUString aParam, aBin; for ( nIdx = 0; nIdx < nParams; ++nIdx ) { @@ -131,7 +131,7 @@ void KDEXLib::Init() if ( !m_pFreeCmdLineArgs && aParam == "-display" && nIdx + 1 < nParams ) { osl_getCommandArg( nIdx + 1, &aParam.pData ); - aDisplay = rtl::OUStringToOString( aParam, osl_getThreadTextEncoding() ); + aDisplay = OUStringToOString( aParam, osl_getThreadTextEncoding() ); m_pFreeCmdLineArgs = new char*[ m_nFakeCmdLineArgs + 2 ]; m_pFreeCmdLineArgs[ m_nFakeCmdLineArgs + 0 ] = strdup( "-display" ); @@ -144,7 +144,7 @@ void KDEXLib::Init() osl_getExecutableFile( &aParam.pData ); osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData ); - rtl::OString aExec = rtl::OUStringToOString( aBin, osl_getThreadTextEncoding() ); + OString aExec = OUStringToOString( aBin, osl_getThreadTextEncoding() ); m_pFreeCmdLineArgs[0] = strdup( aExec.getStr() ); m_pFreeCmdLineArgs[1] = strdup( "--nocrashhandler" ); diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx index 45c158437b4f..1061e39e5580 100644 --- a/vcl/unx/kde4/main.cxx +++ b/vcl/unx/kde4/main.cxx @@ -60,7 +60,7 @@ extern "C" { #if QT_VERSION < 0x050000 // Qt 4.x support needs >= 4.1.0 - rtl::OString aVersion( qVersion() ); + OString aVersion( qVersion() ); SAL_INFO( "vcl.kde4", "qt version string is " << aVersion ); sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0; diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx index d911b5c8205c..66a07753271c 100644 --- a/vcl/unx/x11/x11sys.cxx +++ b/vcl/unx/x11/x11sys.cxx @@ -90,17 +90,17 @@ Rectangle X11SalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScre return GetDisplayScreenPosSizePixel( nScreen ); } -rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen ) +OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen ) { - rtl::OUString aScreenName; + OUString aScreenName; SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay(); if( pSalDisp->IsXinerama() ) { const std::vector< Rectangle >& rScreens = pSalDisp->GetXineramaScreens(); if( nScreen >= rScreens.size() ) nScreen = 0; - rtl::OUStringBuffer aBuf( 256 ); - aBuf.append( rtl::OStringToOUString( rtl::OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) ); + OUStringBuffer aBuf( 256 ); + aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) ); aBuf.appendAscii( " [" ); aBuf.append( static_cast(nScreen) ); aBuf.append( sal_Unicode(']') ); @@ -110,8 +110,8 @@ rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen ) { if( nScreen >= static_cast(pSalDisp->GetXScreenCount()) ) nScreen = 0; - rtl::OUStringBuffer aBuf( 256 ); - aBuf.append( rtl::OStringToOUString( rtl::OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) ); + OUStringBuffer aBuf( 256 ); + aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) ); // search backwards for ':' int nPos = aBuf.getLength(); if( nPos > 0 ) @@ -131,7 +131,7 @@ rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen ) return aScreenName; } -int X11SalSystem::ShowNativeDialog( const rtl::OUString& rTitle, const rtl::OUString& rMessage, const std::list< rtl::OUString >& rButtons, int nDefButton ) +int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons, int nDefButton ) { int nRet = -1; @@ -144,7 +144,7 @@ int X11SalSystem::ShowNativeDialog( const rtl::OUString& rTitle, const rtl::OUSt aWarn.Clear(); sal_uInt16 nButton = 0; - for( std::list< rtl::OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it ) + for( std::list< OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it ) { aWarn.AddButton( *it, nButton+1, nButton == (sal_uInt16)nDefButton ? BUTTONDIALOG_DEFBUTTON : 0 ); nButton++; diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index 1fdf622e98c7..3262ce31ab72 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -63,8 +63,8 @@ sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr, s if( GetMonitorInfoW( reinterpret_cast(hMonitor), &aInfo ) ) { aInfo.szDevice[CCHDEVICENAME-1] = 0; - rtl::OUString aDeviceName( reinterpret_cast(aInfo.szDevice) ); - std::map< rtl::OUString, unsigned int >::const_iterator it = + OUString aDeviceName( reinterpret_cast(aInfo.szDevice) ); + std::map< OUString, unsigned int >::const_iterator it = m_aDeviceNameToMonitor.find( aDeviceName ); if( it != m_aDeviceNameToMonitor.end() ) { @@ -100,12 +100,12 @@ bool WinSalSystem::initMonitors() { int w = GetSystemMetrics( SM_CXSCREEN ); int h = GetSystemMetrics( SM_CYSCREEN ); - m_aMonitors.push_back( DisplayMonitor( rtl::OUString(), - rtl::OUString(), + m_aMonitors.push_back( DisplayMonitor( OUString(), + OUString(), Rectangle( Point(), Size( w, h ) ), Rectangle( Point(), Size( w, h ) ), 0 ) ); - m_aDeviceNameToMonitor[ rtl::OUString() ] = 0; + m_aDeviceNameToMonitor[ OUString() ] = 0; m_nPrimary = 0; RECT aWorkRect; if( SystemParametersInfo( SPI_GETWORKAREA, 0, &aWorkRect, 0 ) ) @@ -117,7 +117,7 @@ bool WinSalSystem::initMonitors() DISPLAY_DEVICEW aDev; aDev.cb = sizeof( aDev ); DWORD nDevice = 0; - boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount; + boost::unordered_map< OUString, int, OUStringHash > aDeviceStringCount; while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) ) { if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE) @@ -125,8 +125,8 @@ bool WinSalSystem::initMonitors() { aDev.DeviceName[31] = 0; aDev.DeviceString[127] = 0; - rtl::OUString aDeviceName( reinterpret_cast(aDev.DeviceName) ); - rtl::OUString aDeviceString( reinterpret_cast(aDev.DeviceString) ); + OUString aDeviceName( reinterpret_cast(aDev.DeviceName) ); + OUString aDeviceString( reinterpret_cast(aDev.DeviceString) ); if( aDeviceStringCount.find( aDeviceString ) == aDeviceStringCount.end() ) aDeviceStringCount[ aDeviceString ] = 1; else @@ -143,15 +143,15 @@ bool WinSalSystem::initMonitors() EnumDisplayMonitors( aDesktopRC, NULL, ImplEnumMonitorProc, reinterpret_cast(this) ); // append monitor numbers to name strings - boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDevCount( aDeviceStringCount ); + boost::unordered_map< OUString, int, OUStringHash > aDevCount( aDeviceStringCount ); unsigned int nMonitorCount = m_aMonitors.size(); for( unsigned int i = 0; i < nMonitorCount; i++ ) { - const rtl::OUString& rDev( m_aMonitors[i].m_aName ); + const OUString& rDev( m_aMonitors[i].m_aName ); if( aDeviceStringCount[ rDev ] > 1 ) { int nInstance = aDeviceStringCount[ rDev ] - (-- aDevCount[ rDev ] ); - rtl::OUStringBuffer aBuf( rDev.getLength() + 8 ); + OUStringBuffer aBuf( rDev.getLength() + 8 ); aBuf.append( rDev ); aBuf.appendAscii( " (" ); aBuf.append( sal_Int32( nInstance ) ); @@ -188,10 +188,10 @@ Rectangle WinSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScre return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aWorkArea : Rectangle(); } -rtl::OUString WinSalSystem::GetDisplayScreenName( unsigned int nScreen ) +OUString WinSalSystem::GetDisplayScreenName( unsigned int nScreen ) { initMonitors(); - return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aName : rtl::OUString(); + return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aName : OUString(); } // ----------------------------------------------------------------------- @@ -211,7 +211,7 @@ static int DEFAULT_BTN_MAPPING_TABLE[][8] = { MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON2, MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON1, MB_DEFBUTTON1 } //RETRY_CANCEL }; -int WinSalSystem::ShowNativeMessageBox(const rtl::OUString& rTitle, const rtl::OUString& rMessage, int nButtonCombination, int nDefaultButton, SAL_UNUSED_PARAMETER bool) +int WinSalSystem::ShowNativeMessageBox(const OUString& rTitle, const OUString& rMessage, int nButtonCombination, int nDefaultButton, SAL_UNUSED_PARAMETER bool) { DBG_ASSERT( nButtonCombination >= SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK && nButtonCombination <= SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_RETRY_CANCEL && diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 021ebc75e0c6..26e75a0bba54 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -70,7 +70,7 @@ // ======================================================================= -void SalAbort( const rtl::OUString& rErrorText, bool ) +void SalAbort( const OUString& rErrorText, bool ) { ImplFreeSalGDI(); @@ -1015,9 +1015,9 @@ void* WinSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn @param aFileUrl The file url of the document. */ -void WinSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/) +void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& /*rMimeType*/) { - rtl::OUString system_path; + OUString system_path; osl::FileBase::RC rc = osl::FileBase::getSystemPathFromFileURL(rFileUrl, system_path); OSL_ENSURE(osl::FileBase::E_None == rc, "Invalid file url"); @@ -1059,9 +1059,9 @@ SalI18NImeStatus* WinSalInstance::CreateI18NImeStatus() // ----------------------------------------------------------------------- -const ::rtl::OUString& SalGetDesktopEnvironment() +const OUString& SalGetDesktopEnvironment() { - static ::rtl::OUString aDesktopEnvironment( "Windows" ); + static OUString aDesktopEnvironment( "Windows" ); return aDesktopEnvironment; } diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 4ac1f4b983a5..51c8a5b8d831 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -37,7 +37,6 @@ #include -using ::rtl::OStringBuffer; // ======================================================================= // comment out to prevent use of beziers on GDI functions diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 3d7a40017689..1d08d50585bf 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -93,7 +93,7 @@ class ImplFontAttrCache { private: FontAttrMap aFontAttributes; - rtl::OUString aCacheFileName; + OUString aCacheFileName; String aBaseURL; sal_Bool bModified; @@ -184,7 +184,7 @@ ImplFontAttrCache::~ImplFontAttrCache() ++aIter; } // EOF Marker - write_lenPrefixed_uInt8s_FromOString(aCacheFile, rtl::OString()); + write_lenPrefixed_uInt8s_FromOString(aCacheFile, OString()); } } } @@ -439,10 +439,10 @@ class WinGlyphFallbackSubstititution public: explicit WinGlyphFallbackSubstititution( HDC ); - bool FindFontSubstitute( FontSelectPattern&, rtl::OUString& rMissingChars ) const; + bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingChars ) const; private: HDC mhDC; - bool HasMissingChars( const PhysicalFontFace*, const rtl::OUString& rMissingChars ) const; + bool HasMissingChars( const PhysicalFontFace*, const OUString& rMissingChars ) const; }; inline WinGlyphFallbackSubstititution::WinGlyphFallbackSubstititution( HDC hDC ) @@ -453,7 +453,7 @@ void ImplGetLogFontFromFontSelect( HDC, const FontSelectPattern*, LOGFONTW&, bool /*bTestVerticalAvail*/ ); // does a font face hold the given missing characters? -bool WinGlyphFallbackSubstititution::HasMissingChars( const PhysicalFontFace* pFace, const rtl::OUString& rMissingChars ) const +bool WinGlyphFallbackSubstititution::HasMissingChars( const PhysicalFontFace* pFace, const OUString& rMissingChars ) const { const ImplWinFontData* pWinFont = static_cast(pFace); const ImplFontCharMap* pCharMap = pWinFont->GetImplFontCharMap(); @@ -512,14 +512,14 @@ namespace // get the default font for a specified locale const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get(); - const rtl::OUString aDefault = rDefaults.getUserInterfaceFont(rLocale); + const OUString aDefault = rDefaults.getUserInterfaceFont(rLocale); return rDevFontList.ImplFindByTokenNames(aDefault); } } // find a fallback font for missing characters // TODO: should stylistic matches be searched and prefered? -bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, rtl::OUString& rMissingChars ) const +bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, OUString& rMissingChars ) const { // guess a locale matching to the missing chars com::sun::star::lang::Locale aLocale; @@ -990,7 +990,7 @@ static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogF void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) { - rtl::OUString aFontName( reinterpret_cast(rLogFont.lfFaceName) ); + OUString aFontName( reinterpret_cast(rLogFont.lfFaceName) ); if (!aFontName.isEmpty()) { rFont.SetName( aFontName ); @@ -1870,7 +1870,7 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont, pInfo->mbCourier = ImplSalWICompareAscii( pLogFont->elfLogFont.lfFaceName, "Courier" ) == 0; else pInfo->mbCourier = FALSE; - String aName = rtl::OUString(reinterpret_cast(pLogFont->elfLogFont.lfFaceName)); + String aName = OUString(reinterpret_cast(pLogFont->elfLogFont.lfFaceName)); pInfo->mpName = &aName; memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) ); pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet; @@ -1906,8 +1906,8 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont, struct TempFontItem { - ::rtl::OUString maFontFilePath; - ::rtl::OString maResourcePath; + OUString maFontFilePath; + OString maResourcePath; TempFontItem* mpNextItem; }; @@ -1936,10 +1936,10 @@ static int WINAPI __AddFontResourceExW( LPCWSTR lpszfileName, DWORD fl, PVOID pd } #endif -bool ImplAddTempFont( SalData& rSalData, const rtl::OUString& rFontFileURL ) +bool ImplAddTempFont( SalData& rSalData, const OUString& rFontFileURL ) { int nRet = 0; - ::rtl::OUString aUSytemPath; + OUString aUSytemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) ); #ifdef FR_PRIVATE @@ -1961,7 +1961,7 @@ bool ImplAddTempFont( SalData& rSalData, const rtl::OUString& rFontFileURL ) ::DeleteFileA( aResourceName ); rtl_TextEncoding theEncoding = osl_getThreadTextEncoding(); - ::rtl::OString aCFileName = rtl::OUStringToOString( aUSytemPath, theEncoding ); + OString aCFileName = OUStringToOString( aUSytemPath, theEncoding ); // TODO: font should be private => need to investigate why it doesn't work then if( !::CreateScalableFontResourceA( 0, aResourceName, aCFileName.getStr(), NULL ) ) return false; @@ -1971,7 +1971,7 @@ bool ImplAddTempFont( SalData& rSalData, const rtl::OUString& rFontFileURL ) if( nRet > 0 ) { TempFontItem* pNewItem = new TempFontItem; - pNewItem->maResourcePath = rtl::OString( aResourceName ); + pNewItem->maResourcePath = OString( aResourceName ); pNewItem->maFontFilePath = aUSytemPath.getStr(); pNewItem->mpNextItem = rSalData.mpTempFontItem; rSalData.mpTempFontItem = pNewItem; @@ -2017,7 +2017,7 @@ void ImplReleaseTempFonts( SalData& rSalData ) static bool ImplGetFontAttrFromFile( const String& rFontFileURL, ImplDevFontAttributes& rDFA ) { - ::rtl::OUString aUSytemPath; + OUString aUSytemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) ); // get FontAttributes from a *fot file @@ -2042,11 +2042,11 @@ static bool ImplGetFontAttrFromFile( const String& rFontFileURL, // Create font resource file (typically with a .fot file name extension). rtl_TextEncoding theEncoding = osl_getThreadTextEncoding(); - ::rtl::OString aCFileName = rtl::OUStringToOString( aUSytemPath, theEncoding ); + OString aCFileName = OUStringToOString( aUSytemPath, theEncoding ); ::CreateScalableFontResourceA( 0, aResourceName, aCFileName.getStr(), NULL ); // Open and read the font resource file - rtl::OUString aFotFileName = rtl::OStringToOUString( aResourceName, osl_getThreadTextEncoding() ); + OUString aFotFileName = OStringToOUString( aResourceName, osl_getThreadTextEncoding() ); osl::FileBase::getFileURLFromSystemPath( aFotFileName, aFotFileName ); osl::File aFotFile( aFotFileName ); osl::FileBase::RC aError = aFotFile.open( osl_File_OpenFlag_Read ); @@ -2110,9 +2110,9 @@ static bool ImplGetFontAttrFromFile( const String& rFontFileURL, // ----------------------------------------------------------------------- bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList, - const rtl::OUString& rFontFileURL, const rtl::OUString& rFontName ) + const OUString& rFontFileURL, const OUString& rFontName ) { - RTL_LOGFILE_TRACE1( "WinSalGraphics::AddTempDevFont(): %s", rtl::OUStringToOString( rFontFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + RTL_LOGFILE_TRACE1( "WinSalGraphics::AddTempDevFont(): %s", OUStringToOString( rFontFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); ImplDevFontAttributes aDFA; aDFA.SetFamilyName(rFontName); @@ -2179,7 +2179,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) // since we are only interested in fonts that could not be // registered before because of missing administration rights // only the font path of the user installation is needed - ::rtl::OUString aPath; + OUString aPath; osl_getExecutableFile( &aPath.pData ); aPath = aPath.copy( 0, aPath.lastIndexOf('/') ); String aFontDirUrl = aPath.copy( 0, aPath.lastIndexOf('/') ); @@ -2193,12 +2193,12 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) osl::DirectoryItem aDirItem; String aEmptyString; - ::rtl::OUString aBootStrap; + OUString aBootStrap; rtl::Bootstrap::get( String( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aBootStrap ); aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); rtl::Bootstrap aBootstrap( aBootStrap ); - ::rtl::OUString aUserPath; - aBootstrap.getFrom( rtl::OUString( "UserInstallation" ), aUserPath ); + OUString aUserPath; + aBootstrap.getFrom( OUString( "UserInstallation" ), aUserPath ); aUserPath += String( RTL_CONSTASCII_USTRINGPARAM("/user/config/fontnames.dat") ); String aBaseURL = aPath.copy( 0, aPath.lastIndexOf('/')+1 ); mpFontAttrCache = new ImplFontAttrCache( aUserPath, aBaseURL ); @@ -2548,7 +2548,7 @@ int ScopedTrueTypeFont::open(void * pBuffer, sal_uInt32 nLen, return OpenTTFontBuffer(pBuffer, nLen, nFaceNum, &m_pFont); } -sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, +sal_Bool WinSalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, long* pGlyphIDs, sal_uInt8* pEncoding, sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rInfo ) { @@ -2577,11 +2577,11 @@ sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, DBG_ASSERT( aWinMetric.tmPitchAndFamily & TMPF_TRUETYPE, "can only subset TT font" ); #endif - rtl::OUString aSysPath; + OUString aSysPath; if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) ) return FALSE; const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding(); - const rtl::OString aToFile(rtl::OUStringToOString(aSysPath, aThreadEncoding)); + const OString aToFile(OUStringToOString(aSysPath, aThreadEncoding)); // check if the font has a CFF-table const DWORD nCffTag = CalcTag( "CFF " ); @@ -2736,7 +2736,7 @@ const void* WinSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, nFNLen--; if( nFNLen == 0 ) *pDataLen = 0; - rInfo.m_aPSName = rtl::OUString(reinterpret_cast(aFaceName), nFNLen); + rInfo.m_aPSName = OUString(reinterpret_cast(aFaceName), nFNLen); rInfo.m_nAscent = +aTm.tmAscent; rInfo.m_nDescent = -aTm.tmDescent; rInfo.m_aFontBBox = Rectangle( Point( -aTm.tmOverhang, -aTm.tmDescent ), diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 4ee3f60c1bd2..842d06d63917 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -49,7 +49,6 @@ using namespace std; -using ::rtl::OUString; typedef map< wstring, HTHEME > ThemeMap; static ThemeMap aThemeMap; diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index dda80b3ca9a6..113fb1887d46 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -91,7 +91,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ui::dialogs; -using ::rtl::OUString; // ======================================================================= @@ -181,7 +180,7 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) for ( i = 0; i < nInfoPrn4; i++ ) { SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo; - pInfo->maPrinterName = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo4[i].pPrinterName) ); + pInfo->maPrinterName = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo4[i].pPrinterName) ); pInfo->mnStatus = 0; pInfo->mnJobs = 0; pInfo->mpSysData = NULL; @@ -208,22 +207,22 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) if( GetPrinterW( hPrinter, 2, (LPBYTE)pWinInfo2, nBytes, &nBytes ) ) { if( pWinInfo2->pDriverName ) - pInfo->maDriver = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pDriverName) ); + pInfo->maDriver = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pDriverName) ); XubString aPortName; if ( pWinInfo2->pPortName ) - aPortName = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pPortName) ); + aPortName = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pPortName) ); // pLocation can be 0 (the Windows docu doesn't describe this) if ( pWinInfo2->pLocation && *pWinInfo2->pLocation ) - pInfo->maLocation = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pLocation) ); + pInfo->maLocation = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pLocation) ); else pInfo->maLocation = aPortName; // pComment can be 0 (the Windows docu doesn't describe this) if ( pWinInfo2->pComment ) - pInfo->maComment = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pComment) ); + pInfo->maComment = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pComment) ); pInfo->mnStatus = ImplWinQueueStatusToSal( pWinInfo2->Status ); pInfo->mnJobs = pWinInfo2->cJobs; if( ! pInfo->mpSysData ) - pInfo->mpSysData = new rtl::OUString(aPortName); + pInfo->mpSysData = new OUString(aPortName); } rtl_freeMemory(pWinInfo2); } @@ -240,7 +239,7 @@ void WinSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) } // ----------------------------------------------------------------------- -rtl::OUString WinSalInstance::GetDefaultPrinter() +OUString WinSalInstance::GetDefaultPrinter() { DWORD nChars = 0; GetDefaultPrinterW( NULL, &nChars ); @@ -270,7 +269,7 @@ rtl::OUString WinSalInstance::GetDefaultPrinter() return ImplSalGetUniString( pBuf, (xub_StrLen)(pTmp-pBuf) ); } else - return rtl::OUString(); + return OUString(); } // ======================================================================= @@ -1118,7 +1117,7 @@ SalInfoPrinter* WinSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn pPrinter->maDeviceName = pQueueInfo->maPrinterName; pPrinter->maPortName = pQueueInfo->mpSysData ? *pQueueInfo->mpSysData - : rtl::OUString(); + : OUString(); // check if the provided setup data match the actual printer ImplTestSalJobSetup( pPrinter, pSetupData, TRUE ); @@ -1279,7 +1278,7 @@ sal_uLong WinSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pSetupData ) // ----------------------------------------------------------------------- -rtl::OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) +OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) { XubString aPaperBinName; @@ -1519,9 +1518,9 @@ static int lcl_StartDocW( HDC hDC, DOCINFOW* pInfo, WinSalPrinter* pPrt ) return nRet; } -sal_Bool WinSalPrinter::StartJob( const rtl::OUString* pFileName, - const rtl::OUString& rJobName, - const rtl::OUString&, +sal_Bool WinSalPrinter::StartJob( const OUString* pFileName, + const OUString& rJobName, + const OUString&, sal_uLong nCopies, bool bCollate, bool /*bDirect*/, diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index bc3f8021743c..e9a28031d54c 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -59,9 +59,6 @@ typedef boost::unordered_map IntMap; #define DROPPED_OUTGLYPH 0xFFFF -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; #include @@ -2752,14 +2749,14 @@ GraphiteWinLayout::GraphiteWinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplW mpFont = gr_make_font_with_advance_fn(static_cast(-aLogFont.lfHeight), hDC, gr_fontAdvance, rWFD.GraphiteFace()); maImpl.SetFont(mpFont); - const rtl::OString aLang = OUStringToOString( LanguageTag( rWFE.maFontSelData.meLanguage ).getBcp47(), + const OString aLang = OUStringToOString( LanguageTag( rWFE.maFontSelData.meLanguage ).getBcp47(), RTL_TEXTENCODING_ASCII_US); - rtl::OString name = rtl::OUStringToOString( + OString name = OUStringToOString( rWFE.maFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; if (nFeat > 0) { - rtl::OString aFeat = name.copy(nFeat, name.getLength() - nFeat); + OString aFeat = name.copy(nFeat, name.getLength() - nFeat); mpFeatures = new grutils::GrFeatureParser(rWFD.GraphiteFace(), aFeat.getStr(), aLang.getStr()); } else diff --git a/vcl/win/source/window/keynames.cxx b/vcl/win/source/window/keynames.cxx index 0d53261a8eeb..ad16a6432e63 100644 --- a/vcl/win/source/window/keynames.cxx +++ b/vcl/win/source/window/keynames.cxx @@ -183,7 +183,7 @@ namespace vcl_sal { }; // translate keycodes, used within the displayed menu shortcuts - rtl::OUString getKeysReplacementName( rtl::OUString pLang, LONG nSymbol ) + OUString getKeysReplacementName( OUString pLang, LONG nSymbol ) { for( unsigned int n = 0; n < SAL_N_ELEMENTS(aKeyboards); n++ ) { @@ -193,12 +193,12 @@ namespace vcl_sal { for( int m = aKeyboards[n].nReplacements ; m ; ) { if( nSymbol == pRepl[--m].aSymbol ) - return rtl::OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); + return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 ); } } } - return rtl::OUString(); + return OUString(); } } diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index a668d72551d3..145cabec1ac5 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -90,7 +90,6 @@ using ::std::max; #include #endif -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -1096,7 +1095,7 @@ sal_Bool WinSalFrame::PostEvent( void* pData ) // ----------------------------------------------------------------------- -void WinSalFrame::SetTitle( const rtl::OUString& rTitle ) +void WinSalFrame::SetTitle( const OUString& rTitle ) { DBG_ASSERT( sizeof( WCHAR ) == sizeof( sal_Unicode ), "WinSalFrame::SetTitle(): WCHAR != sal_Unicode" ); @@ -1897,7 +1896,7 @@ void WinSalFrame::SetScreenNumber( unsigned int nNewScreen ) } } -void WinSalFrame::SetApplicationID( const rtl::OUString &/*rApplicationID*/ ) +void WinSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ ) { } @@ -2385,8 +2384,8 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, int nKeyLen = 0; if ( lParam ) { - rtl::OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage(); - rtl::OUString aRet; + OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage(); + OUString aRet; aRet = ::vcl_sal::getKeysReplacementName( aLang, lParam ); if( aRet.isEmpty() ) @@ -2446,7 +2445,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, // ----------------------------------------------------------------------- -rtl::OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) +OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { static const UINT nMaxKeyLen = 350; sal_Unicode aKeyBuf[ nMaxKeyLen ]; @@ -2641,9 +2640,9 @@ rtl::OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) } if( !nKeyBufLen ) - return rtl::OUString(); + return OUString(); - return rtl::OUString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) ); + return OUString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) ); } // ----------------------------------------------------------------------- @@ -5166,7 +5165,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, { WCHAR* pTextBuf = new WCHAR[nTextLen]; ImmGetCompositionStringW( hIMC, GCS_RESULTSTR, pTextBuf, nTextLen*sizeof( WCHAR ) ); - aEvt.maText = rtl::OUString( reinterpret_cast(pTextBuf), (sal_Int32)nTextLen ); + aEvt.maText = OUString( reinterpret_cast(pTextBuf), (sal_Int32)nTextLen ); delete [] pTextBuf; } @@ -5192,7 +5191,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, { WCHAR* pTextBuf = new WCHAR[nTextLen]; ImmGetCompositionStringW( hIMC, GCS_COMPSTR, pTextBuf, nTextLen*sizeof( WCHAR ) ); - aEvt.maText = rtl::OUString( reinterpret_cast(pTextBuf), (sal_Int32)nTextLen ); + aEvt.maText = OUString( reinterpret_cast(pTextBuf), (sal_Int32)nTextLen ); delete [] pTextBuf; BYTE* pAttrBuf = NULL; @@ -5450,7 +5449,7 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam ) LPRECONVERTSTRING pReconvertString = (LPRECONVERTSTRING) lParam; LRESULT nRet = 0; SalSurroundingTextRequestEvent aEvt; - aEvt.maText = rtl::OUString(); + aEvt.maText = OUString(); aEvt.mnStart = aEvt.mnEnd = 0; UINT nImeProps = ImmGetProperty( GetKeyboardLayout( 0 ), IGP_SETCOMPSTR ); @@ -5504,7 +5503,7 @@ static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam ) WinSalFrame* pFrame = GetWindowPtr( hWnd ); LPRECONVERTSTRING pReconvertString = (LPRECONVERTSTRING) lParam; SalSurroundingTextRequestEvent aEvt; - aEvt.maText = rtl::OUString(); + aEvt.maText = OUString(); aEvt.mnStart = aEvt.mnEnd = 0; pFrame->CallCallback( SALEVENT_SURROUNDINGTEXTREQUEST, (void*)&aEvt ); diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index d292708fc1ab..a82af6558903 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -312,7 +312,7 @@ void WinSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, con } } -void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText ) +void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) { if( pSalMenuItem ) { @@ -344,7 +344,7 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rt } } -void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode&, const rtl::OUString& rKeyName ) +void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode&, const OUString& rKeyName ) { if( pSalMenuItem ) { diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 703bb00bdadb..261643dedfbc 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -68,7 +68,7 @@ class TestWindow : public Dialog public: TestWindow() : Dialog( (Window *) NULL ) { - SetText( rtl::OUString("OutDev grinding") ); + SetText( OUString("OutDev grinding") ); SetSizePixel( Size( 1024, 1024 ) ); EnablePaint( true ); Show(); @@ -888,7 +888,7 @@ int GrindApp::Main() for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ ) { - ::rtl::OUString aParam = GetCommandLineParam( i ); + OUString aParam = GetCommandLineParam( i ); if( aParam == "--help" || aParam == "-h" ) bHelp = true; diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index a77bcb1171cc..b085d9824634 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -73,7 +73,7 @@ public: void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); - aMainWin.SetText(rtl::OUString("VCL - Workbench")); + aMainWin.SetText(OUString("VCL - Workbench")); aMainWin.Show(); Application::Execute(); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 60c9659f96ed..d5b196460236 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -53,12 +53,6 @@ using namespace comphelper; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringBuffer; -using ::rtl::OStringBuffer; // Forward declaration void Main(); @@ -112,8 +106,8 @@ public: sal_Bool Close(); - void parseList( const rtl::OString& rList ); - rtl::OString processCommand( const rtl::OString& rCommand ); + void parseList( const OString& rList ); + OString processCommand( const OString& rCommand ); DECL_LINK( ListHdl, Button* ); DECL_LINK( SelectHdl, ListBox* ); @@ -123,7 +117,7 @@ public: void Main() { MyWin aMainWin( NULL, WB_STDWORK ); - aMainWin.SetText( rtl::OUString( "SvpClient" ) ); + aMainWin.SetText( OUString( "SvpClient" ) ); aMainWin.Show(); Application::Execute(); @@ -163,34 +157,34 @@ sal_Bool MyWin::Close() return bRet; } -void MyWin::parseList( const rtl::OString& rList ) +void MyWin::parseList( const OString& rList ) { sal_Int32 nTokenPos = 0; - rtl::OUString aElementType; + OUString aElementType; m_aSvpBitmaps.Clear(); while( nTokenPos >= 0 ) { - rtl::OString aLine = rList.getToken( 0, '\n', nTokenPos ); + OString aLine = rList.getToken( 0, '\n', nTokenPos ); if( ! aLine.getLength() || *aLine.getStr() == '#' ) continue; if( aLine.startsWith( "ElementType: " ) ) - aElementType = rtl::OStringToOUString( aLine.copy( 13 ), RTL_TEXTENCODING_ASCII_US ); + aElementType = OStringToOUString( aLine.copy( 13 ), RTL_TEXTENCODING_ASCII_US ); else { - rtl::OUStringBuffer aNewElement( 64 ); + OUStringBuffer aNewElement( 64 ); aNewElement.append( aElementType ); aNewElement.appendAscii( ": " ); - aNewElement.append( rtl::OStringToOUString( aLine, RTL_TEXTENCODING_ASCII_US ) ); + aNewElement.append( OStringToOUString( aLine, RTL_TEXTENCODING_ASCII_US ) ); m_aSvpBitmaps.InsertEntry( aNewElement.makeStringAndClear() ); } } } -rtl::OString MyWin::processCommand( const rtl::OString& rCommand ) +OString MyWin::processCommand( const OString& rCommand ) { static const char* pEnv = getenv("SVP_LISTENER_PORT"); - rtl::OStringBuffer aAnswer; + OStringBuffer aAnswer; int nPort = (pEnv && *pEnv) ? atoi(pEnv) : 8000; int nSocket = socket( PF_INET, SOCK_STREAM, 0 ); if( nSocket >= 0) @@ -243,7 +237,7 @@ IMPL_LINK( MyWin, SelectHdl, ListBox*, ) { OStringBuffer aCommand( 64 ); aCommand.append( "get " ); - aCommand.append( rtl::OUStringToOString( aEntry.Copy( nPos+2 ), RTL_TEXTENCODING_ASCII_US ) ); + aCommand.append( OUStringToOString( aEntry.Copy( nPos+2 ), RTL_TEXTENCODING_ASCII_US ) ); OString aAnswer( processCommand( aCommand.makeStringAndClear() ) ); SvMemoryStream aStream( aAnswer.getLength() ); aStream.Write( aAnswer.getStr(), aAnswer.getLength() ); diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index ef95b371f756..52b13a0ccc17 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // Forward declaration void Main(); @@ -53,7 +51,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( rtl::OUString( "types.rdb" ), rtl::OUString( "applicat.rdb" ), sal_True ); + xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), sal_True ); comphelper::setProcessServiceFactory( xMS ); @@ -84,7 +82,7 @@ public: void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); - aMainWin.SetText( rtl::OUString( "VCL - Workbench" ) ); + aMainWin.SetText( OUString( "VCL - Workbench" ) ); aMainWin.Show(); Application::Execute(); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 32cd9a21059e..af7c7cf02890 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -46,7 +46,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( rtl::OUString( "types.rdb" ), rtl::OUString( "applicat.rdb" ), sal_True ); + xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), sal_True ); comphelper::setProcessServiceFactory( xMS ); @@ -76,7 +76,7 @@ public: void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); - aMainWin.SetText( rtl::OUString( "VCLDemo - VCL Workbench" ) ); + aMainWin.SetText( OUString( "VCLDemo - VCL Workbench" ) ); aMainWin.Show(); Application::Execute(); diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx index 9c382466ab51..837128ba5ae9 100644 --- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx +++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx @@ -81,8 +81,8 @@ namespace testdoctok OSL_ASSERT(xFactory.is()); uno::Sequence aUcbInitSequence(2); - aUcbInitSequence[0] <<= rtl::OUString("Local"); - aUcbInitSequence[1] <<= rtl::OUString("Office"); + aUcbInitSequence[0] <<= OUString("Local"); + aUcbInitSequence[1] <<= OUString("Office"); uno::Reference xServiceFactory(xFactory, uno::UNO_QUERY); @@ -99,7 +99,7 @@ namespace testdoctok { uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xNameContainer(xFactory->createInstanceWithContext - (::rtl::OUString::createFromAscii + (OUString::createFromAscii ("com.sun.star.ucb.SimpleFileAccess" ), xComponentContext), uno::UNO_QUERY ); @@ -130,7 +130,7 @@ namespace testdoctok rtl_uString *absfile=NULL; rtl_uString_newConcat(&absfile, dir, fname); - rtl::OUString sInputFileURL( absfile ); + OUString sInputFileURL( absfile ); for (sal_uInt32 n = 0; n < sInputFileURL.getLength(); ++n) { diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx index 69e0e7b998f9..8b6d256f3020 100644 --- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx +++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx @@ -45,8 +45,8 @@ public: virtual void setUp(); - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); void test(); @@ -65,8 +65,8 @@ void RtfTest::setUp() m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW); } -bool RtfTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, +bool RtfTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { uno::Sequence< beans::PropertyValue > aDescriptor(1); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index eb45169be270..20413490b68f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3132,9 +3132,9 @@ void DomainMapper_Impl::CloseFieldCommand() case FIELD_SEQ : { // command looks like: " SEQ Table \* ARABIC " - ::rtl::OUString sCmd(pContext->GetCommand()); + OUString sCmd(pContext->GetCommand()); // find the sequence name, e.g. "SEQ" - ::rtl::OUString sSeqName = lcl_FindQuotedText(sCmd, "SEQ ", '\\'); + OUString sSeqName = lcl_FindQuotedText(sCmd, "SEQ ", '\\'); sSeqName = sSeqName.trim(); // create a sequence field master using the sequence name diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 6a0a2ce9575e..d5a509fcd25e 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -934,9 +934,9 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) text::GraphicCrop aGraphicCrop( 0, 0, 0, 0 ); uno::Reference< beans::XPropertySet > xSourceGraphProps( xShape, uno::UNO_QUERY ); - uno::Any aAny = xSourceGraphProps->getPropertyValue( rtl::OUString("GraphicCrop")); + uno::Any aAny = xSourceGraphProps->getPropertyValue( OUString("GraphicCrop")); if(aAny >>= aGraphicCrop) { - xGraphProps->setPropertyValue( rtl::OUString("GraphicCrop"), + xGraphProps->setPropertyValue( OUString("GraphicCrop"), uno::makeAny( aGraphicCrop ) ); } diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index e4eda7312c19..102c0ba3e045 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -83,11 +83,6 @@ break using std::make_pair; -using rtl::OString; -using rtl::OStringBuffer; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; namespace writerfilter { namespace rtftok { @@ -326,12 +321,12 @@ void RTFDocumentImpl::setSuperstream(RTFDocumentImpl *pSuperstream) m_pSuperstream = pSuperstream; } -void RTFDocumentImpl::setAuthor(rtl::OUString& rAuthor) +void RTFDocumentImpl::setAuthor(OUString& rAuthor) { m_aAuthor = rAuthor; } -void RTFDocumentImpl::setAuthorInitials(rtl::OUString& rAuthorInitials) +void RTFDocumentImpl::setAuthorInitials(OUString& rAuthorInitials) { m_aAuthorInitials = rAuthorInitials; } @@ -3179,16 +3174,16 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) break; case RTF_TRRH: { - rtl::OUString hRule = rtl::OUString::createFromAscii("auto"); + OUString hRule = OUString::createFromAscii("auto"); if ( nParam < 0 ) { RTFValue::Pointer_t pAbsValue(new RTFValue(-nParam)); pIntValue.swap( pAbsValue ); - hRule = rtl::OUString::createFromAscii("exact"); + hRule = OUString::createFromAscii("exact"); } else if ( nParam > 0 ) - hRule = rtl::OUString::createFromAscii("atLeast"); + hRule = OUString::createFromAscii("atLeast"); lcl_putNestedAttribute(m_aStates.top().aTableRowSprms, NS_ooxml::LN_CT_TrPrBase_trHeight, NS_ooxml::LN_CT_Height_val, pIntValue); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 6690680e44fb..16e149326464 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -256,7 +256,7 @@ namespace writerfilter { { public: RTFShape(); - std::vector< std::pair > aProperties; + std::vector< std::pair > aProperties; sal_Int32 nLeft; sal_Int32 nTop; sal_Int32 nRight; @@ -405,7 +405,7 @@ namespace writerfilter { int nMinute; /// Text from special destinations. - rtl::OUStringBuffer aDestinationText; + OUStringBuffer aDestinationText; /// Same as the int value of NS_rtf::LN_ISTD in aParagraphAttributes, for performance reasons. int nCurrentStyleIndex; @@ -441,15 +441,15 @@ namespace writerfilter { Stream& Mapper(); void setSubstream(bool bIsSubtream); void setSuperstream(RTFDocumentImpl *pSuperstream); - void setAuthor(rtl::OUString& rAuthor); - void setAuthorInitials(rtl::OUString& rAuthorInitials); + void setAuthor(OUString& rAuthor); + void setAuthorInitials(OUString& rAuthorInitials); bool isSubstream() const; void finishSubstream(); - void setIgnoreFirst(rtl::OUString& rIgnoreFirst); + void setIgnoreFirst(OUString& rIgnoreFirst); void seek(sal_uInt32 nPos); uno::Reference getModelFactory(); RTFParserState& getState(); - void setDestinationText(rtl::OUString& rString); + void setDestinationText(OUString& rString); /// Resolve a picture: If not inline, then anchored. int resolvePict(bool bInline); void replayShapetext(); @@ -487,9 +487,9 @@ namespace writerfilter { void resetSprms(); void resetAttributes(); void resolveSubstream(sal_uInt32 nPos, Id nId); - void resolveSubstream(sal_uInt32 nPos, Id nId, rtl::OUString& rIgnoreFirst); + void resolveSubstream(sal_uInt32 nPos, Id nId, OUString& rIgnoreFirst); - void text(rtl::OUString& rString); + void text(OUString& rString); // Sends a single character to dmapper, taking care of buffering. void singleChar(sal_uInt8 nValue, bool bRunProps = false); // Sends run properties to dmapper, taking care of buffering. @@ -558,15 +558,15 @@ namespace writerfilter { std::queue< std::pair > m_nHeaderFooterPositions; sal_uInt32 m_nGroupStartPos; /// Ignore the first occurrence of this text. - rtl::OUString m_aIgnoreFirst; + OUString m_aIgnoreFirst; /// Bookmark name <-> index map. - std::map m_aBookmarks; + std::map m_aBookmarks; /// Revision index <-> author map. - std::map m_aAuthors; + std::map m_aAuthors; /// Annotation author of the next annotation. - rtl::OUString m_aAuthor; + OUString m_aAuthor; /// Initials of author of the next annotation. - rtl::OUString m_aAuthorInitials; + OUString m_aAuthorInitials; RTFSprms m_aFormfieldSprms; RTFSprms m_aFormfieldAttributes; @@ -592,9 +592,9 @@ namespace writerfilter { /// If a frame start token is already sent to dmapper (nesting them is not OK). bool m_bIsInFrame; // Unicode characters are collected here so we don't have to send them one by one. - rtl::OUStringBuffer m_aUnicodeBuffer; + OUStringBuffer m_aUnicodeBuffer; /// Same for hex characters. - rtl::OStringBuffer m_aHexBuffer; + OStringBuffer m_aHexBuffer; /// Formula import. oox::formulaimport::XmlStreamBuilder m_aMathBuffer; /// Normal text property, that is math italic and math spacing are not applied to the current run. diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 864a8bda7962..b7d0e1941326 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -43,11 +43,6 @@ #include "../dmapper/GraphicHelpers.hxx" #include -using rtl::OString; -using rtl::OStringBuffer; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; namespace writerfilter { namespace rtftok { @@ -105,7 +100,7 @@ void RTFSdrImport::resolve(RTFShape& rShape) // Default line width is 0.75 pt (26 mm100) in Word, 0 in Writer. uno::Any aLineWidth = uno::makeAny(sal_Int32(26)); - for (std::vector< std::pair >::iterator i = rShape.aProperties.begin(); + for (std::vector< std::pair >::iterator i = rShape.aProperties.begin(); i != rShape.aProperties.end(); ++i) { if ( i->first == "shapeType" ) diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx index 9e5645fe54d3..a508f7752687 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.hxx +++ b/writerfilter/source/rtftok/rtfsdrimport.hxx @@ -44,7 +44,7 @@ namespace writerfilter { void resolveDhgt(uno::Reference xPropertySet, sal_Int32 nZOrder); void resolveFLine(uno::Reference xPropertySet, sal_Int32 nFLine); private: - void createShape(rtl::OUString aService, uno::Reference& xShape, uno::Reference& xPropertySet); + void createShape(OUString aService, uno::Reference& xShape, uno::Reference& xPropertySet); RTFDocumentImpl& m_rImport; uno::Reference m_xDrawPage; diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index 1c3c5a517f68..5dbce120e36c 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -32,7 +32,6 @@ #include #include // NS_rtf namespace -using rtl::OStringBuffer; namespace writerfilter { namespace rtftok { diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index a19beac6b8f6..ebd549aa0f8f 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -34,11 +34,6 @@ #include #include -using rtl::OString; -using rtl::OStringBuffer; -using rtl::OUString; -using rtl::OUStringBuffer; -using rtl::OUStringToOString; namespace writerfilter { namespace rtftok { diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx index cca18bebfbcc..e77d10dcd52d 100644 --- a/writerfilter/source/rtftok/rtftokenizer.hxx +++ b/writerfilter/source/rtftok/rtftokenizer.hxx @@ -54,7 +54,7 @@ namespace writerfilter { private: SvStream& Strm(); int resolveKeyword(); - int dispatchKeyword(rtl::OString& rKeyword, bool bParam, int nParam); + int dispatchKeyword(OString& rKeyword, bool bParam, int nParam); RTFDocumentImpl& m_rImport; SvStream* m_pInStream; diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx index e4dd41fbc4b1..7fecd8e3978e 100644 --- a/writerfilter/source/rtftok/rtfvalue.cxx +++ b/writerfilter/source/rtftok/rtfvalue.cxx @@ -31,10 +31,8 @@ namespace writerfilter { namespace rtftok { -using rtl::OString; -using rtl::OUString; -RTFValue::RTFValue(int nValue, rtl::OUString sValue, RTFSprms rAttributes, +RTFValue::RTFValue(int nValue, OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference xShape, uno::Reference xStream, uno::Reference xObject, bool bForceString) : m_nValue(nValue), diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index 6199a8a0de4a..23e9d822cc2c 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -42,19 +42,19 @@ namespace writerfilter { { public: typedef boost::shared_ptr Pointer_t; - RTFValue(int nValue, rtl::OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference rShape, + RTFValue(int nValue, OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference rShape, uno::Reference rStream, uno::Reference rObject, bool bForceString); RTFValue(int nValue); - RTFValue(rtl::OUString sValue, bool bForce = false); + RTFValue(OUString sValue, bool bForce = false); RTFValue(RTFSprms rAttributes); RTFValue(RTFSprms rAttributes, RTFSprms rSprms); RTFValue(uno::Reference rShape); RTFValue(uno::Reference rStream); RTFValue(uno::Reference rObject); virtual ~RTFValue(); - void setString(rtl::OUString sValue); + void setString(OUString sValue); virtual int getInt() const; - virtual rtl::OUString getString() const; + virtual OUString getString() const; virtual uno::Any getAny() const; virtual writerfilter::Reference::Pointer_t getProperties(); virtual writerfilter::Reference::Pointer_t getStream(); @@ -67,7 +67,7 @@ namespace writerfilter { private: RTFValue& operator=(RTFValue const& rOther); int m_nValue; - rtl::OUString m_sValue; + OUString m_sValue; boost::shared_ptr m_pAttributes; boost::shared_ptr m_pSprms; uno::Reference m_xShape; diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index cab021519304..04837f2deed9 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -152,20 +152,20 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getImplementationName() +OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString( "CHelpContent" ); + return OUString( "CHelpContent" ); } //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = rtl::OUString( MYUCP_CONTENT_SERVICE_NAME ); + = OUString( MYUCP_CONTENT_SERVICE_NAME ); return aSNS; } @@ -176,10 +176,10 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { - return rtl::OUString( MYUCP_CONTENT_TYPE ); + return OUString( MYUCP_CONTENT_TYPE ); } //========================================================================= @@ -450,7 +450,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( rProp.Name == "ContentType" ) xRow->appendString( rProp, - rtl::OUString( + OUString( "application/vnd.sun.star.help" ) ); else if ( rProp.Name == "Title" ) xRow->appendString ( rProp,m_aURLParameter.get_title() ); @@ -470,18 +470,18 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if( m_aURLParameter.isPicture() ) xRow->appendString( rProp, - rtl::OUString( "image/gif" ) ); + OUString( "image/gif" ) ); else if( m_aURLParameter.isActive() ) xRow->appendString( rProp, - rtl::OUString( "text/plain" ) ); + OUString( "text/plain" ) ); else if( m_aURLParameter.isFile() ) xRow->appendString( - rProp,rtl::OUString( "text/html" ) ); + rProp,OUString( "text/html" ) ); else if( m_aURLParameter.isRoot() ) xRow->appendString( rProp, - rtl::OUString( "text/css" ) ); + OUString( "text/css" ) ); else xRow->appendVoid( rProp ); else if( m_aURLParameter.isModule() ) @@ -531,9 +531,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( } else if ( rProp.Name == "SearchScopes" ) { - uno::Sequence< rtl::OUString > seq( 2 ); - seq[0] = rtl::OUString( "Heading" ); - seq[1] = rtl::OUString( "FullText" ); + uno::Sequence< OUString > seq( 2 ); + seq[0] = OUString( "Heading" ); + seq[1] = OUString( "FullText" ); uno::Any aAny; aAny <<= seq; xRow->appendObject( rProp,aAny ); diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx index f8a1a63914b7..98b80dcee541 100644 --- a/xmlhelp/source/cxxhelp/provider/content.hxx +++ b/xmlhelp/source/cxxhelp/provider/content.hxx @@ -86,7 +86,7 @@ namespace chelp throw( ::com::sun::star::uno::RuntimeException ); // XContent - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 4d5328c2335e..2428c66741d3 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -77,14 +77,14 @@ using namespace com::sun::star::deployment; using namespace com::sun::star::beans; -rtl::OUString Databases::expandURL( const rtl::OUString& aURL ) +OUString Databases::expandURL( const OUString& aURL ) { osl::MutexGuard aGuard( m_aMutex ); - rtl::OUString aRetURL = expandURL( aURL, m_xContext ); + OUString aRetURL = expandURL( aURL, m_xContext ); return aRetURL; } -rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::XComponentContext > xContext ) +OUString Databases::expandURL( const OUString& aURL, Reference< uno::XComponentContext > xContext ) { static Reference< util::XMacroExpander > xMacroExpander; static Reference< uri::XUriReferenceFactory > xFac; @@ -96,7 +96,7 @@ rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::X xMacroExpander = util::theMacroExpander::get(xContext); } - rtl::OUString aRetURL = aURL; + OUString aRetURL = aURL; if( xMacroExpander.is() ) { Reference< uri::XUriReference > uriRef; @@ -117,11 +117,11 @@ rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::X } Databases::Databases( sal_Bool showBasic, - const rtl::OUString& instPath, - const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths, - const rtl::OUString& productName, - const rtl::OUString& productVersion, - const rtl::OUString& styleSheet, + const OUString& instPath, + const com::sun::star::uno::Sequence< OUString >& imagesZipPaths, + const OUString& productName, + const OUString& productVersion, + const OUString& styleSheet, Reference< uno::XComponentContext > xContext ) : m_xContext( xContext ), m_bShowBasic(showBasic), @@ -129,13 +129,13 @@ Databases::Databases( sal_Bool showBasic, m_nCustomCSSDocLength( 0 ), m_pCustomCSSDoc( 0 ), m_aCSS(styleSheet.toAsciiLowerCase()), - newProdName(rtl::OUString( "$[officename]" ) ), - newProdVersion(rtl::OUString( "$[officeversion]" ) ), - prodName( rtl::OUString( "%PRODUCTNAME" ) ), - prodVersion( rtl::OUString( "%PRODUCTVERSION" ) ), - vendName( rtl::OUString( "%VENDORNAME" ) ), - vendVersion( rtl::OUString( "%VENDORVERSION" ) ), - vendShort( rtl::OUString( "%VENDORSHORT" ) ), + newProdName(OUString( "$[officename]" ) ), + newProdVersion(OUString( "$[officeversion]" ) ), + prodName( OUString( "%PRODUCTNAME" ) ), + prodVersion( OUString( "%PRODUCTVERSION" ) ), + vendName( OUString( "%VENDORNAME" ) ), + vendVersion( OUString( "%VENDORVERSION" ) ), + vendShort( OUString( "%VENDORSHORT" ) ), m_aImagesZipPaths( imagesZipPaths ), m_aSymbolsStyleName( "" ) { @@ -206,21 +206,21 @@ Databases::~Databases() } static bool impl_getZipFile( - Sequence< rtl::OUString > & rImagesZipPaths, - const rtl::OUString & rZipName, - rtl::OUString & rFileName ) + Sequence< OUString > & rImagesZipPaths, + const OUString & rZipName, + OUString & rFileName ) { - rtl::OUString aWorkingDir; + OUString aWorkingDir; osl_getProcessWorkingDir( &aWorkingDir.pData ); - const rtl::OUString *pPathArray = rImagesZipPaths.getArray(); + const OUString *pPathArray = rImagesZipPaths.getArray(); for ( int i = 0; i < rImagesZipPaths.getLength(); ++i ) { - rtl::OUString aFileName = pPathArray[ i ]; + OUString aFileName = pPathArray[ i ]; if ( !aFileName.isEmpty() ) { if ( 1 + aFileName.lastIndexOf( '/' ) != aFileName.getLength() ) { - aFileName += rtl::OUString( "/" ); + aFileName += OUString( "/" ); } aFileName += rZipName; // the icons are not read when the URL is a symlink @@ -235,7 +235,7 @@ static bool impl_getZipFile( return false; } -rtl::OString Databases::getImagesZipFileURL() +OString Databases::getImagesZipFileURL() { OUString aSymbolsStyleName; try @@ -246,18 +246,18 @@ rtl::OString Databases::getImagesZipFileURL() // set root path uno::Sequence < uno::Any > lParams(1); beans::PropertyValue aParam ; - aParam.Name = ::rtl::OUString("nodepath"); - aParam.Value <<= ::rtl::OUString("org.openoffice.Office.Common"); + aParam.Name = OUString("nodepath"); + aParam.Value <<= OUString("org.openoffice.Office.Common"); lParams[0] = uno::makeAny(aParam); // open it uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"), + OUString("com.sun.star.configuration.ConfigurationAccess"), lParams) ); bool bChanged = false; uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW); - uno::Any aResult = xAccess->getByHierarchicalName(::rtl::OUString("Misc/SymbolStyle")); + uno::Any aResult = xAccess->getByHierarchicalName(OUString("Misc/SymbolStyle")); if ( (aResult >>= aSymbolsStyleName) && m_aSymbolsStyleName != aSymbolsStyleName ) { m_aSymbolsStyleName = aSymbolsStyleName; @@ -266,7 +266,7 @@ rtl::OString Databases::getImagesZipFileURL() if ( m_aImagesZipFileURL.isEmpty() || bChanged ) { - rtl::OUString aImageZip; + OUString aImageZip; bool bFound = false; if ( !aSymbolsStyleName.isEmpty() ) @@ -282,20 +282,20 @@ rtl::OString Databases::getImagesZipFileURL() else aSymbolsStyleName = "tango"; } - rtl::OUString aZipName = rtl::OUString( "images_" ); + OUString aZipName = OUString( "images_" ); aZipName += aSymbolsStyleName; - aZipName += rtl::OUString( ".zip" ); + aZipName += OUString( ".zip" ); bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip ); } if ( ! bFound ) - bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString( "images.zip" ), aImageZip ); + bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip ); if ( ! bFound ) - aImageZip = rtl::OUString(); + aImageZip = OUString(); - m_aImagesZipFileURL = rtl::OUStringToOString( + m_aImagesZipFileURL = OUStringToOString( rtl::Uri::encode( aImageZip, rtl_UriCharClassPchar, @@ -310,11 +310,11 @@ rtl::OString Databases::getImagesZipFileURL() return m_aImagesZipFileURL; } -void Databases::replaceName( rtl::OUString& oustring ) const +void Databases::replaceName( OUString& oustring ) const { sal_Int32 idx = -1,idx1 = -1,idx2 = -1,k = 0,off; bool cap = false; - rtl::OUStringBuffer aStrBuf( 0 ); + OUStringBuffer aStrBuf( 0 ); while( true ) { @@ -376,18 +376,18 @@ void Databases::replaceName( rtl::OUString& oustring ) const } } -rtl::OUString Databases::getInstallPathAsURL() +OUString Databases::getInstallPathAsURL() { osl::MutexGuard aGuard( m_aMutex ); return m_aInstallDirectory; } -const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUString& Language ) +const std::vector< OUString >& Databases::getModuleList( const OUString& Language ) { if( m_avModules.empty() ) { - rtl::OUString fileName,dirName = getInstallPathAsURL() + processLang( Language ); + OUString fileName,dirName = getInstallPathAsURL() + processLang( Language ); osl::Directory dirFile( dirName ); osl::DirectoryItem aDirItem; @@ -430,12 +430,12 @@ const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUStrin -StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OUString& Module, - const rtl::OUString& Language ) +StaticModuleInformation* Databases::getStaticInformationForModule( const OUString& Module, + const OUString& Language ) { osl::MutexGuard aGuard( m_aMutex ); - rtl::OUString key = processLang(Language) + rtl::OUString( "/" ) + Module; + OUString key = processLang(Language) + OUString( "/" ) + Module; std::pair< ModInfoTable::iterator,bool > aPair = m_aModInfo.insert( ModInfoTable::value_type( key,(StaticModuleInformation*)0 ) ); @@ -446,7 +446,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU { osl::File cfgFile( getInstallPathAsURL() + key + - rtl::OUString( ".cfg" ) ); + OUString( ".cfg" ) ); if( osl::FileBase::E_None != cfgFile.open( osl_File_OpenFlag_Read ) ) it->second = 0; @@ -456,16 +456,16 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU sal_uInt64 nRead; sal_Char buffer[2048]; sal_Unicode lineBuffer[1028]; - rtl::OUString fileContent; + OUString fileContent; while( osl::FileBase::E_None == cfgFile.read( &buffer,2048,nRead ) && nRead ) - fileContent += rtl::OUString( buffer,sal_Int32( nRead ),RTL_TEXTENCODING_UTF8 ); + fileContent += OUString( buffer,sal_Int32( nRead ),RTL_TEXTENCODING_UTF8 ); cfgFile.close(); const sal_Unicode* str = fileContent.getStr(); - rtl::OUString current,lang_,program,startid,title,heading,fulltext; - rtl::OUString order( "1" ); + OUString current,lang_,program,startid,title,heading,fulltext; + OUString order( "1" ); for( sal_Int32 i = 0;i < fileContent.getLength();i++ ) { @@ -474,7 +474,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU { if( pos ) { - current = rtl::OUString( lineBuffer,pos ); + current = OUString( lineBuffer,pos ); if( current.startsWith("Title") ) { @@ -526,11 +526,11 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU -rtl::OUString Databases::processLang( const rtl::OUString& Language ) +OUString Databases::processLang( const OUString& Language ) { osl::MutexGuard aGuard( m_aMutex ); - rtl::OUString ret; + OUString ret; LangSetTable::iterator it = m_aLangSet.find( Language ); if( it == m_aLangSet.end() ) @@ -559,21 +559,21 @@ rtl::OUString Databases::processLang( const rtl::OUString& Language ) } -rtl::OUString Databases::country( const rtl::OUString& Language ) +OUString Databases::country( const OUString& Language ) { sal_Int32 idx; if( ( idx = Language.indexOf( '-' ) ) != -1 || ( idx = Language.indexOf( '_' ) ) != -1 ) return Language.copy( 1+idx ); - return rtl::OUString(); + return OUString(); } -helpdatafileproxy::Hdf* Databases::getHelpDataFile( const rtl::OUString& Database, - const rtl::OUString& Language, bool helpText, - const rtl::OUString* pExtensionPath ) +helpdatafileproxy::Hdf* Databases::getHelpDataFile( const OUString& Database, + const OUString& Language, bool helpText, + const OUString* pExtensionPath ) { if( Database.isEmpty() || Language.isEmpty() ) return 0; @@ -581,9 +581,9 @@ helpdatafileproxy::Hdf* Databases::getHelpDataFile( const rtl::OUString& Databas osl::MutexGuard aGuard( m_aMutex ); - rtl::OUString aFileExt( helpText ? rtl::OUString(".ht") : rtl::OUString(".db") ); - rtl::OUString dbFileName = rtl::OUStringBuffer().append('/').append(Database).append(aFileExt).makeStringAndClear(); - rtl::OUString key; + OUString aFileExt( helpText ? OUString(".ht") : OUString(".db") ); + OUString dbFileName = OUStringBuffer().append('/').append(Database).append(aFileExt).makeStringAndClear(); + OUString key; if( pExtensionPath == NULL ) key = processLang( Language ) + dbFileName; else @@ -598,16 +598,16 @@ helpdatafileproxy::Hdf* Databases::getHelpDataFile( const rtl::OUString& Databas { helpdatafileproxy::Hdf* pHdf = 0; - rtl::OUString fileURL; + OUString fileURL; if( pExtensionPath ) fileURL = expandURL(*pExtensionPath) + Language + dbFileName; else fileURL = getInstallPathAsURL() + key; - rtl::OUString fileNameHDFHelp( fileURL ); + OUString fileNameHDFHelp( fileURL ); //Extensions always use the new format if( pExtensionPath != NULL ) - fileNameHDFHelp += rtl::OUString( "_" ); + fileNameHDFHelp += OUString( "_" ); //SimpleFileAccess takes file URLs as arguments!!! Using filenames works accidentally but //fails for example when using long path names on Windows (starting with \\?\) if( m_xSFA->exists( fileNameHDFHelp ) ) @@ -622,12 +622,12 @@ helpdatafileproxy::Hdf* Databases::getHelpDataFile( const rtl::OUString& Databas } Reference< XCollator > -Databases::getCollator( const rtl::OUString& Language, - const rtl::OUString& System ) +Databases::getCollator( const OUString& Language, + const OUString& System ) { (void)System; - rtl::OUString key = Language; + OUString key = Language; osl::MutexGuard aGuard( m_aMutex ); @@ -637,32 +637,32 @@ Databases::getCollator( const rtl::OUString& Language, if( ! it->second.is() ) { it->second = Collator::create(m_xContext); - rtl::OUString langStr = processLang(Language); - rtl::OUString countryStr = country(Language); + OUString langStr = processLang(Language); + OUString countryStr = country(Language); if( countryStr.isEmpty() ) { if( langStr.compareToAscii("de") == 0 ) - countryStr = rtl::OUString("DE"); + countryStr = OUString("DE"); else if( langStr.compareToAscii("en") == 0 ) - countryStr = rtl::OUString("US"); + countryStr = OUString("US"); else if( langStr.compareToAscii("es") == 0 ) - countryStr = rtl::OUString("ES"); + countryStr = OUString("ES"); else if( langStr.compareToAscii("it") == 0 ) - countryStr = rtl::OUString("IT"); + countryStr = OUString("IT"); else if( langStr.compareToAscii("fr") == 0 ) - countryStr = rtl::OUString("FR"); + countryStr = OUString("FR"); else if( langStr.compareToAscii("sv") == 0 ) - countryStr = rtl::OUString("SE"); + countryStr = OUString("SE"); else if( langStr.compareToAscii("ja") == 0 ) - countryStr = rtl::OUString("JP"); + countryStr = OUString("JP"); else if( langStr.compareToAscii("ko") == 0 ) - countryStr = rtl::OUString("KR"); + countryStr = OUString("KR"); } /* FIXME-BCP47: all this does not look right for language tag context, * also check processLang() and country() methods */ it->second->loadDefaultCollator( Locale( langStr, countryStr, - rtl::OUString() ), + OUString() ), 0 ); } @@ -682,8 +682,8 @@ namespace chelp { bool operator()( const KeywordInfo::KeywordElement& la, const KeywordInfo::KeywordElement& ra ) const { - const rtl::OUString& l = la.key; - const rtl::OUString& r = ra.key; + const OUString& l = la.key; + const OUString& r = ra.key; bool ret; @@ -723,8 +723,8 @@ namespace chelp { KeywordInfo::KeywordElement::KeywordElement( Databases *pDatabases, helpdatafileproxy::Hdf* pHdf, - rtl::OUString& ky, - rtl::OUString& data ) + OUString& ky, + OUString& data ) : key( ky ) { pDatabases->replaceName( key ); @@ -733,10 +733,10 @@ KeywordInfo::KeywordElement::KeywordElement( Databases *pDatabases, -void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const rtl::OUString& ids ) +void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids ) { const sal_Unicode* idstr = ids.getStr(); - std::vector< rtl::OUString > id,anchor; + std::vector< OUString > id,anchor; int idx = -1,k; while( ( idx = ids.indexOf( ';',k = ++idx ) ) != -1 ) { @@ -744,13 +744,13 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy: if( h < idx ) { // found an anchor - id.push_back( rtl::OUString( &idstr[k],h-k ) ); - anchor.push_back( rtl::OUString( &idstr[h+1],idx-h-1 ) ); + id.push_back( OUString( &idstr[k],h-k ) ); + anchor.push_back( OUString( &idstr[h+1],idx-h-1 ) ); } else { - id.push_back( rtl::OUString( &idstr[k],idx-k ) ); - anchor.push_back( rtl::OUString() ); + id.push_back( OUString( &idstr[k],idx-k ) ); + anchor.push_back( OUString() ); } } @@ -769,7 +769,7 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy: pData = pEmpty; if( pHdf ) { - rtl::OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 ); + OString idi( id[i].getStr(),id[i].getLength(),RTL_TEXTENCODING_UTF8 ); helpdatafileproxy::HDFData aHDFData; bool bSuccess = pHdf->getValueForKey( idi, aHDFData ); if( bSuccess ) @@ -778,7 +778,7 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy: DbtToStringConverter converter( pData ); - rtl::OUString title = converter.getTitle(); + OUString title = converter.getTitle(); pDatabases->replaceName( title ); listTitle[i] = title; } @@ -802,7 +802,7 @@ KeywordInfo::KeywordInfo( const std::vector< KeywordElement >& aVec ) } bool Databases::checkModuleMatchForExtension - ( const rtl::OUString& Database, const rtl::OUString& doclist ) + ( const OUString& Database, const OUString& doclist ) { bool bBelongsToDatabase = true; @@ -825,8 +825,8 @@ bool Databases::checkModuleMatchForExtension break; } - rtl::OUString aModule = doclist.copy( nFound + 1, nLastFound - nFound - 1 ); - std::vector< rtl::OUString >::iterator result = std::find( m_avModules.begin(), m_avModules.end(), aModule ); + OUString aModule = doclist.copy( nFound + 1, nLastFound - nFound - 1 ); + std::vector< OUString >::iterator result = std::find( m_avModules.begin(), m_avModules.end(), aModule ); if( result != m_avModules.end() ) { bFoundAtLeastOneModule = true; @@ -850,12 +850,12 @@ bool Databases::checkModuleMatchForExtension } -KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, - const rtl::OUString& Language ) +KeywordInfo* Databases::getKeyword( const OUString& Database, + const OUString& Language ) { osl::MutexGuard aGuard( m_aMutex ); - rtl::OUString key = processLang(Language) + rtl::OUString( "/" ) + Database; + OUString key = processLang(Language) + OUString( "/" ) + Database; std::pair< KeywordInfoTable::iterator,bool > aPair = m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,(KeywordInfo*)0 ) ); @@ -867,13 +867,13 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, std::vector aVector; KeyDataBaseFileIterator aDbFileIt( m_xContext, *this, Database, Language ); - rtl::OUString fileURL; + OUString fileURL; bool bExtension = false; while( !(fileURL = aDbFileIt.nextDbFile( bExtension )).isEmpty() ) { - rtl::OUString fileNameHDFHelp( fileURL ); + OUString fileNameHDFHelp( fileURL ); if( bExtension ) - fileNameHDFHelp += rtl::OUString::createFromAscii( "_" ); + fileNameHDFHelp += OUString::createFromAscii( "_" ); if( m_xSFA->exists( fileNameHDFHelp ) ) { helpdatafileproxy::Hdf aHdf( fileNameHDFHelp, m_xSFA ); @@ -891,9 +891,9 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, while( aHdf.getNextKeyAndValue( aKey, aValue ) ) { - rtl::OUString keyword( aKey.getData(), aKey.getSize(), + OUString keyword( aKey.getData(), aKey.getSize(), RTL_TEXTENCODING_UTF8 ); - rtl::OUString doclist( aValue.getData(), aValue.getSize(), + OUString doclist( aValue.getData(), aValue.getSize(), RTL_TEXTENCODING_UTF8 ); bool bBelongsToDatabase = true; @@ -917,7 +917,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, } // sorting - Reference< XCollator > xCollator = getCollator( Language,rtl::OUString()); + Reference< XCollator > xCollator = getCollator( Language,OUString()); KeywordElementComparator aComparator( xCollator ); std::sort(aVector.begin(),aVector.end(),aComparator); @@ -928,14 +928,14 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, return it->second; } -Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& jar, - const rtl::OUString& Language ) +Reference< XHierarchicalNameAccess > Databases::jarFile( const OUString& jar, + const OUString& Language ) { if( jar.isEmpty() || Language.isEmpty() ) { return Reference< XHierarchicalNameAccess >( 0 ); } - rtl::OUString key = rtl::OUStringBuffer(processLang(Language)).append('/').append(jar).makeStringAndClear(); + OUString key = OUStringBuffer(processLang(Language)).append('/').append(jar).makeStringAndClear(); osl::MutexGuard aGuard( m_aMutex ); @@ -944,7 +944,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja if( ! it->second.is() ) { - rtl::OUString zipFile; + OUString zipFile; try { // Extension jar file? Search for ? @@ -952,10 +952,10 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja sal_Int32 nQuestionMark2 = jar.lastIndexOf( sal_Unicode('?') ); if( nQuestionMark1 != -1 && nQuestionMark2 != -1 && nQuestionMark1 != nQuestionMark2 ) { - ::rtl::OUString aExtensionPath = jar.copy( nQuestionMark1 + 1, nQuestionMark2 - nQuestionMark1 - 1 ); - ::rtl::OUString aPureJar = jar.copy( nQuestionMark2 + 1 ); + OUString aExtensionPath = jar.copy( nQuestionMark1 + 1, nQuestionMark2 - nQuestionMark1 - 1 ); + OUString aPureJar = jar.copy( nQuestionMark2 + 1 ); - rtl::OUStringBuffer aStrBuf; + OUStringBuffer aStrBuf; aStrBuf.append( aExtensionPath ); aStrBuf.append( '/' ); aStrBuf.append( aPureJar ); @@ -983,13 +983,13 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = ::rtl::OUString( "StorageFormat" ); + aArg.Name = OUString( "StorageFormat" ); aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; Reference< XInterface > xIfc = m_xSMgr->createInstanceWithArgumentsAndContext( - rtl::OUString( + OUString( "com.sun.star.packages.comp.ZipPackage" ), aArguments, m_xContext ); @@ -1015,9 +1015,9 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja } Reference< XHierarchicalNameAccess > Databases::findJarFileForPath - ( const rtl::OUString& jar, const rtl::OUString& Language, - const rtl::OUString& path, rtl::OUString* o_pExtensionPath, - rtl::OUString* o_pExtensionRegistryPath ) + ( const OUString& jar, const OUString& Language, + const OUString& path, OUString* o_pExtensionPath, + OUString* o_pExtensionRegistryPath ) { Reference< XHierarchicalNameAccess > xNA; if( jar.isEmpty() || Language.isEmpty() ) @@ -1035,16 +1035,16 @@ Reference< XHierarchicalNameAccess > Databases::findJarFileForPath bool bSuccess = true; if( xParentPackageBundle.is() ) { - rtl::OUString aIdentifierInPath; + OUString aIdentifierInPath; sal_Int32 nFindSlash = path.indexOf( '/' ); if( nFindSlash != -1 ) aIdentifierInPath = path.copy( 0, nFindSlash ); - beans::Optional aIdentifierOptional = xParentPackageBundle->getIdentifier(); + beans::Optional aIdentifierOptional = xParentPackageBundle->getIdentifier(); if( !aIdentifierInPath.isEmpty() && aIdentifierOptional.IsPresent ) { - rtl::OUString aUnencodedIdentifier = aIdentifierOptional.Value; - rtl::OUString aIdentifier = rtl::Uri::encode( aUnencodedIdentifier, + OUString aUnencodedIdentifier = aIdentifierOptional.Value; + OUString aIdentifier = rtl::Uri::encode( aUnencodedIdentifier, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); if( !aIdentifierInPath.equals( aIdentifier ) ) @@ -1092,12 +1092,12 @@ void Databases::popupDocument( URLParameter* urlPar,char **buffer,int *byteCount const sal_Int32 l5 = strlen( pop5 ); sal_Int32 l2,l4; - rtl::OUString val = urlPar->get_id(); - rtl::OString pop2O( val.getStr(),l2 = val.getLength(),RTL_TEXTENCODING_UTF8 ); + OUString val = urlPar->get_id(); + OString pop2O( val.getStr(),l2 = val.getLength(),RTL_TEXTENCODING_UTF8 ); const char* pop2 = pop2O.getStr(); val = urlPar->get_eid(); - rtl::OString pop4O( val.getStr(),l4 = val.getLength(),RTL_TEXTENCODING_UTF8 ); + OString pop4O( val.getStr(),l4 = val.getLength(),RTL_TEXTENCODING_UTF8 ); const char* pop4 = pop4O.getStr(); (*byteCount) = l1 + l2 + l3 + l4 + l5; @@ -1113,7 +1113,7 @@ void Databases::popupDocument( URLParameter* urlPar,char **buffer,int *byteCount } -void Databases::changeCSS(const rtl::OUString& newStyleSheet) +void Databases::changeCSS(const OUString& newStyleSheet) { m_aCSS = newStyleSheet.toAsciiLowerCase(); delete[] m_pCustomCSSDoc, m_pCustomCSSDoc = 0,m_nCustomCSSDocLength = 0; @@ -1121,7 +1121,7 @@ void Databases::changeCSS(const rtl::OUString& newStyleSheet) -void Databases::cascadingStylesheet( const rtl::OUString& Language, +void Databases::cascadingStylesheet( const OUString& Language, char** buffer, int* byteCount ) { @@ -1129,10 +1129,10 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, { int retry = 2; bool error = true; - rtl::OUString fileURL; + OUString fileURL; sal_Bool bHighContrastMode = sal_False; - rtl::OUString aCSS( m_aCSS ); + OUString aCSS( m_aCSS ); if ( aCSS.compareToAscii( "default" ) == 0 ) { // #i50760: "default" needs to adapt HC mode @@ -1144,9 +1144,9 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, uno::Reference< awt::XVclWindowPeer > xVclWindowPeer( xTopWindow, uno::UNO_QUERY ); if ( xVclWindowPeer.is() ) { - uno::Any aHCMode = xVclWindowPeer->getProperty( rtl::OUString( "HighContrastMode" ) ); + uno::Any aHCMode = xVclWindowPeer->getProperty( OUString( "HighContrastMode" ) ); if ( ( aHCMode >>= bHighContrastMode ) && bHighContrastMode ) - aCSS = rtl::OUString( "highcontrastblack" ); + aCSS = OUString( "highcontrastblack" ); } } } @@ -1158,14 +1158,14 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, fileURL = getInstallPathAsURL() + processLang( Language ) + - rtl::OUString( "/" ) + + OUString( "/" ) + aCSS + - rtl::OUString( ".css" ); + OUString( ".css" ); else if( retry == 1 ) fileURL = getInstallPathAsURL() + aCSS + - rtl::OUString( ".css" ); + OUString( ".css" ); osl::DirectoryItem aDirItem; osl::File aFile( fileURL ); @@ -1190,7 +1190,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, if ( !retry && error && bHighContrastMode ) { // fall back to default css - aCSS = rtl::OUString( "default" ); + aCSS = OUString( "default" ); retry = 2; bHighContrastMode = sal_False; } @@ -1211,16 +1211,16 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, } -void Databases::setActiveText( const rtl::OUString& Module, - const rtl::OUString& Language, - const rtl::OUString& Id, +void Databases::setActiveText( const OUString& Module, + const OUString& Language, + const OUString& Id, char** buffer, int* byteCount ) { DataBaseIterator aDbIt( m_xContext, *this, Module, Language, true ); // #i84550 Cache information about failed ids - rtl::OString id( Id.getStr(),Id.getLength(),RTL_TEXTENCODING_UTF8 ); + OString id( Id.getStr(),Id.getLength(),RTL_TEXTENCODING_UTF8 ); EmptyActiveTextSet::iterator it = m_aEmptyActiveTextSet.find( id ); bool bFoundAsEmpty = ( it != m_aEmptyActiveTextSet.end() ); helpdatafileproxy::HDFData aHDFData; @@ -1243,14 +1243,14 @@ void Databases::setActiveText( const rtl::OUString& Module, if( bSuccess ) { // ensure existence of tmp after for - rtl::OString tmp; + OString tmp; for( int i = 0; i < nSize; ++i ) if( pData[i] == '%' || pData[i] == '$' ) { // need of replacement - rtl::OUString temp = rtl::OUString( pData, nSize, RTL_TEXTENCODING_UTF8 ); + OUString temp = OUString( pData, nSize, RTL_TEXTENCODING_UTF8 ); replaceName( temp ); - tmp = rtl::OString( temp.getStr(), + tmp = OString( temp.getStr(), temp.getLength(), RTL_TEXTENCODING_UTF8 ); nSize = tmp.getLength(); @@ -1273,7 +1273,7 @@ void Databases::setActiveText( const rtl::OUString& Module, } -void Databases::setInstallPath( const rtl::OUString& aInstDir ) +void Databases::setInstallPath( const OUString& aInstDir ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1281,7 +1281,7 @@ void Databases::setInstallPath( const rtl::OUString& aInstDir ) //TODO: check returned error code if( m_aInstallDirectory.lastIndexOf( sal_Unicode( '/' ) ) != m_aInstallDirectory.getLength() - 1 ) - m_aInstallDirectory += rtl::OUString( "/" ); + m_aInstallDirectory += OUString( "/" ); } @@ -1291,7 +1291,7 @@ void Databases::setInstallPath( const rtl::OUString& aInstDir ) ExtensionHelpExistanceMap ExtensionIteratorBase::aHelpExistanceMap; ExtensionIteratorBase::ExtensionIteratorBase( Reference< XComponentContext > xContext, - Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage ) + Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ) : m_xContext( xContext ) , m_rDatabases( rDatabases ) , m_eState( INITIAL_MODULE ) @@ -1303,7 +1303,7 @@ ExtensionIteratorBase::ExtensionIteratorBase( Reference< XComponentContext > xCo } ExtensionIteratorBase::ExtensionIteratorBase( Databases& rDatabases, - const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage ) + const OUString& aInitialModule, const OUString& aLanguage ) : m_xContext( comphelper::getProcessComponentContext() ) , m_rDatabases( rDatabases ) , m_eState( INITIAL_MODULE ) @@ -1335,7 +1335,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP return xHelpPackage; // #i84550 Cache information about help content in extension - rtl::OUString aExtensionPath = xPackage->getURL(); + OUString aExtensionPath = xPackage->getURL(); ExtensionHelpExistanceMap::iterator it = aHelpExistanceMap.find( aExtensionPath ); bool bFound = ( it != aHelpExistanceMap.end() ); bool bHasHelp = bFound ? it->second : false; @@ -1354,7 +1354,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP } if( bRegistered ) { - rtl::OUString aHelpMediaType( "application/vnd.sun.star.help" ); + OUString aHelpMediaType( "application/vnd.sun.star.help" ); if( xPackage->isBundle() ) { Sequence< Reference< deployment::XPackage > > aPkgSeq = xPackage->getBundle @@ -1365,7 +1365,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP { const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ]; const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType(); - rtl::OUString aMediaType = xPackageTypeInfo->getMediaType(); + OUString aMediaType = xPackageTypeInfo->getMediaType(); if( aMediaType.equals( aHelpMediaType ) ) { xHelpPackage = xSubPkg; @@ -1377,7 +1377,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP else { const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType(); - rtl::OUString aMediaType = xPackageTypeInfo->getMediaType(); + OUString aMediaType = xPackageTypeInfo->getMediaType(); if( aMediaType.equals( aHelpMediaType ) ) xHelpPackage = xPackage; } @@ -1398,7 +1398,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack { Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext); m_aUserPackagesSeq = xExtensionManager->getDeployedExtensions - ( rtl::OUString("user"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); + ( OUString("user"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); m_bUserPackagesLoaded = true; } @@ -1426,7 +1426,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa { Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext); m_aSharedPackagesSeq = xExtensionManager->getDeployedExtensions - ( rtl::OUString("shared"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); + ( OUString("shared"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); m_bSharedPackagesLoaded = true; } @@ -1454,7 +1454,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP { Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext); m_aBundledPackagesSeq = xExtensionManager->getDeployedExtensions - ( rtl::OUString("bundled"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); + ( OUString("bundled"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); m_bBundledPackagesLoaded = true; } @@ -1474,17 +1474,17 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP return xHelpPackage; } -rtl::OUString ExtensionIteratorBase::implGetFileFromPackage( - const rtl::OUString& rFileExtension, Reference< deployment::XPackage > xPackage ) +OUString ExtensionIteratorBase::implGetFileFromPackage( + const OUString& rFileExtension, Reference< deployment::XPackage > xPackage ) { // No extension -> search for pure language folder bool bLangFolderOnly = rFileExtension.isEmpty(); - rtl::OUString aFile; - rtl::OUString aLanguage = m_aLanguage; + OUString aFile; + OUString aLanguage = m_aLanguage; for( sal_Int32 iPass = 0 ; iPass < 2 ; ++iPass ) { - rtl::OUStringBuffer aStrBuf; + OUStringBuffer aStrBuf; aStrBuf.append( xPackage->getRegistrationDataURL().Value); aStrBuf.append( '/' ); aStrBuf.append( aLanguage ); @@ -1501,9 +1501,9 @@ rtl::OUString ExtensionIteratorBase::implGetFileFromPackage( if( m_xSFA->exists( aFile ) ) break; - ::std::vector< ::rtl::OUString > av; + ::std::vector< OUString > av; implGetLanguageVectorFromPackage( av, xPackage ); - ::std::vector< ::rtl::OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage ); + ::std::vector< OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage ); if( pFound != av.end() ) aLanguage = *pFound; } @@ -1516,24 +1516,24 @@ inline bool isLetter( sal_Unicode c ) return comphelper::string::isalphaAscii(c); } -void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv, +void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ) { rv.clear(); - rtl::OUString aExtensionPath = xPackage->getURL(); - Sequence< rtl::OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true ); + OUString aExtensionPath = xPackage->getURL(); + Sequence< OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true ); - const rtl::OUString* pSeq = aEntrySeq.getConstArray(); + const OUString* pSeq = aEntrySeq.getConstArray(); sal_Int32 nCount = aEntrySeq.getLength(); for( sal_Int32 i = 0 ; i < nCount ; ++i ) { - rtl::OUString aEntry = pSeq[i]; + OUString aEntry = pSeq[i]; if( m_xSFA->isFolder( aEntry ) ) { sal_Int32 nLastSlash = aEntry.lastIndexOf( '/' ); if( nLastSlash != -1 ) { - rtl::OUString aPureEntry = aEntry.copy( nLastSlash + 1 ); + OUString aPureEntry = aEntry.copy( nLastSlash + 1 ); // Check language scheme int nLen = aPureEntry.getLength(); @@ -1552,7 +1552,7 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::r //=================================================================== // class DataBaseIterator -helpdatafileproxy::Hdf* DataBaseIterator::nextHdf( rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath ) +helpdatafileproxy::Hdf* DataBaseIterator::nextHdf( OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath ) { helpdatafileproxy::Hdf* pRetHdf = NULL; @@ -1611,10 +1611,10 @@ helpdatafileproxy::Hdf* DataBaseIterator::nextHdf( rtl::OUString* o_pExtensionPa } helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( Reference< deployment::XPackage > xPackage, - rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath ) + OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath ) { - beans::Optional< ::rtl::OUString> optRegData; + beans::Optional< OUString> optRegData; try { optRegData = xPackage->getRegistrationDataURL(); @@ -1627,20 +1627,20 @@ helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( Reference< depl helpdatafileproxy::Hdf* pRetHdf = NULL; if (optRegData.IsPresent && !optRegData.Value.isEmpty()) { - rtl::OUString aRegDataUrl = rtl::OUStringBuffer(optRegData.Value).append('/').makeStringAndClear(); + OUString aRegDataUrl = OUStringBuffer(optRegData.Value).append('/').makeStringAndClear(); - rtl::OUString aHelpFilesBaseName("help"); + OUString aHelpFilesBaseName("help"); - rtl::OUString aUsedLanguage = m_aLanguage; + OUString aUsedLanguage = m_aLanguage; pRetHdf = m_rDatabases.getHelpDataFile( aHelpFilesBaseName, aUsedLanguage, m_bHelpText, &aRegDataUrl); // Language fallback if( !pRetHdf ) { - ::std::vector< ::rtl::OUString > av; + ::std::vector< OUString > av; implGetLanguageVectorFromPackage( av, xPackage ); - ::std::vector< ::rtl::OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage ); + ::std::vector< OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage ); if( pFound != av.end() ) { aUsedLanguage = *pFound; @@ -1653,7 +1653,7 @@ helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( Reference< depl *o_pExtensionPath = aRegDataUrl + aUsedLanguage; if( o_pExtensionRegistryPath ) - *o_pExtensionRegistryPath = rtl::OUStringBuffer(xPackage->getURL()).append('/').append(aUsedLanguage).makeStringAndClear(); + *o_pExtensionRegistryPath = OUStringBuffer(xPackage->getURL()).append('/').append(aUsedLanguage).makeStringAndClear(); } return pRetHdf; @@ -1664,16 +1664,16 @@ helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( Reference< depl // class KeyDataBaseFileIterator //returns a file URL -rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension ) +OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension ) { - rtl::OUString aRetFile; + OUString aRetFile; while( aRetFile.isEmpty() && m_eState != END_REACHED ) { switch( m_eState ) { case INITIAL_MODULE: - aRetFile = rtl::OUStringBuffer(m_rDatabases.getInstallPathAsURL()). + aRetFile = OUStringBuffer(m_rDatabases.getInstallPathAsURL()). append(m_rDatabases.processLang(m_aLanguage)).append('/'). append(m_aInitialModule).append(".key").makeStringAndClear(); @@ -1732,11 +1732,11 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension ) } //Returns a file URL, that does not contain macros -rtl::OUString KeyDataBaseFileIterator::implGetDbFileFromPackage +OUString KeyDataBaseFileIterator::implGetDbFileFromPackage ( Reference< deployment::XPackage > xPackage ) { - rtl::OUString aExpandedURL = - implGetFileFromPackage( rtl::OUString( ".key" ), xPackage ); + OUString aExpandedURL = + implGetFileFromPackage( OUString( ".key" ), xPackage ); return aExpandedURL; } @@ -1747,7 +1747,7 @@ rtl::OUString KeyDataBaseFileIterator::implGetDbFileFromPackage Reference< XHierarchicalNameAccess > JarFileIterator::nextJarFile ( Reference< deployment::XPackage >& o_xParentPackageBundle, - rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath ) + OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath ) { Reference< XHierarchicalNameAccess > xNA; @@ -1804,12 +1804,12 @@ Reference< XHierarchicalNameAccess > JarFileIterator::nextJarFile } Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage -( Reference< deployment::XPackage > xPackage, rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath ) +( Reference< deployment::XPackage > xPackage, OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath ) { Reference< XHierarchicalNameAccess > xNA; - rtl::OUString zipFile = - implGetFileFromPackage( rtl::OUString( ".jar" ), xPackage ); + OUString zipFile = + implGetFileFromPackage( OUString( ".jar" ), xPackage ); try { @@ -1818,14 +1818,14 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = ::rtl::OUString( "StorageFormat" ); + aArg.Name = OUString( "StorageFormat" ); aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; Reference< XMultiComponentFactory >xSMgr( m_xContext->getServiceManager(), UNO_QUERY ); Reference< XInterface > xIfc = xSMgr->createInstanceWithArgumentsAndContext( - rtl::OUString( + OUString( "com.sun.star.packages.comp.ZipPackage" ), aArguments, m_xContext ); @@ -1852,7 +1852,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage if( o_pExtensionRegistryPath != NULL ) { - rtl::OUString& rPath = *o_pExtensionPath; + OUString& rPath = *o_pExtensionPath; sal_Int32 nLastSlashInPath = rPath.lastIndexOf( '/', rPath.getLength() - 1 ); *o_pExtensionRegistryPath = xPackage->getURL(); @@ -1867,16 +1867,16 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage //=================================================================== // class IndexFolderIterator -rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o_rbTemporary ) +OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o_rbTemporary ) { - rtl::OUString aIndexFolder; + OUString aIndexFolder; while( aIndexFolder.isEmpty() && m_eState != END_REACHED ) { switch( m_eState ) { case INITIAL_MODULE: - aIndexFolder = rtl::OUStringBuffer(m_rDatabases.getInstallPathAsURL()). + aIndexFolder = OUStringBuffer(m_rDatabases.getInstallPathAsURL()). append(m_rDatabases.processLang(m_aLanguage)).append('/'). append(m_aInitialModule).append(".idxl").makeStringAndClear(); @@ -1935,23 +1935,23 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o return aIndexFolder; } -rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary, Reference< deployment::XPackage > xPackage ) +OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary, Reference< deployment::XPackage > xPackage ) { - rtl::OUString aIndexFolder = - implGetFileFromPackage( rtl::OUString( ".idxl" ), xPackage ); + OUString aIndexFolder = + implGetFileFromPackage( OUString( ".idxl" ), xPackage ); o_rbTemporary = false; if( !m_xSFA->isFolder( aIndexFolder ) ) { // i98680: Missing index? Try to generate now - rtl::OUString aLangURL = implGetFileFromPackage( rtl::OUString(), xPackage ); + OUString aLangURL = implGetFileFromPackage( OUString(), xPackage ); if( m_xSFA->isFolder( aLangURL ) ) { // Test write access (shared extension may be read only) bool bIsWriteAccess = false; try { - rtl::OUString aCreateTestFolder = aLangURL + rtl::OUString( "CreateTestFolder" ); + OUString aCreateTestFolder = aLangURL + OUString( "CreateTestFolder" ); m_xSFA->createFolder( aCreateTestFolder ); if( m_xSFA->isFolder( aCreateTestFolder ) ) bIsWriteAccess = true; @@ -1967,23 +1967,23 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp try { - rtl::OUString aLang; + OUString aLang; sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' ); if( nLastSlash != -1 ) aLang = aLangURL.copy( nLastSlash + 1 ); else - aLang = rtl::OUString( "en" ); + aLang = OUString( "en" ); - rtl::OUString aMod("help"); + OUString aMod("help"); - rtl::OUString aZipDir = aLangURL; + OUString aZipDir = aLangURL; if( !bIsWriteAccess ) { - rtl::OUString aTempFileURL; + OUString aTempFileURL; ::osl::FileBase::RC eErr = ::osl::File::createTempFile( 0, 0, &aTempFileURL ); if( eErr == ::osl::FileBase::E_None ) { - rtl::OUString aTempDirURL = aTempFileURL; + OUString aTempDirURL = aTempFileURL; try { m_xSFA->kill( aTempDirURL ); @@ -2002,9 +2002,9 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp aIndexer.indexDocuments(); if( bIsWriteAccess ) - aIndexFolder = implGetFileFromPackage( rtl::OUString( ".idxl" ), xPackage ); + aIndexFolder = implGetFileFromPackage( OUString( ".idxl" ), xPackage ); else - aIndexFolder = aZipDir + rtl::OUString( "/help.idxl" ); + aIndexFolder = aZipDir + OUString( "/help.idxl" ); } catch (const Exception &) { @@ -2015,12 +2015,12 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp return aIndexFolder; } -void IndexFolderIterator::deleteTempIndexFolder( const rtl::OUString& aIndexFolder ) +void IndexFolderIterator::deleteTempIndexFolder( const OUString& aIndexFolder ) { sal_Int32 nLastSlash = aIndexFolder.lastIndexOf( '/' ); if( nLastSlash != -1 ) { - rtl::OUString aTmpFolder = aIndexFolder.copy( 0, nLastSlash ); + OUString aTmpFolder = aIndexFolder.copy( 0, nLastSlash ); try { m_xSFA->kill( aTmpFolder ); diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index afb9cb70f567..905c86cf0f4d 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -60,22 +60,22 @@ namespace chelp { { private: - rtl::OUString m_aStartId; - rtl::OUString m_aProgramSwitch; - rtl::OUString m_aTitle; - rtl::OUString m_aHeading; - rtl::OUString m_aFulltext; + OUString m_aStartId; + OUString m_aProgramSwitch; + OUString m_aTitle; + OUString m_aHeading; + OUString m_aFulltext; int m_nOrder; public: - StaticModuleInformation( rtl::OUString aTitle, - rtl::OUString aStartId, - rtl::OUString aProgramSwitch, - rtl::OUString aHeading, - rtl::OUString aFulltext, - rtl::OUString aOrder ) + StaticModuleInformation( OUString aTitle, + OUString aStartId, + OUString aProgramSwitch, + OUString aHeading, + OUString aFulltext, + OUString aOrder ) : m_aStartId( aStartId ), m_aProgramSwitch( aProgramSwitch ), m_aTitle( aTitle ), @@ -87,11 +87,11 @@ namespace chelp { ~StaticModuleInformation() { } - rtl::OUString get_title() const { return m_aTitle; } - rtl::OUString get_id() const { return m_aStartId; } - rtl::OUString get_program() const { return m_aProgramSwitch; } - rtl::OUString get_heading() const { return m_aHeading; } - rtl::OUString get_fulltext() const { return m_aFulltext; } + OUString get_title() const { return m_aTitle; } + OUString get_id() const { return m_aStartId; } + OUString get_program() const { return m_aProgramSwitch; } + OUString get_heading() const { return m_aHeading; } + OUString get_fulltext() const { return m_aFulltext; } int get_order() const { return m_nOrder; } }; // end class StaticModuleInformation @@ -110,17 +110,17 @@ namespace chelp { KeywordElement( Databases* pDatabases, helpdatafileproxy::Hdf* pHdf, - rtl::OUString& key, - rtl::OUString& ids ); + OUString& key, + OUString& ids ); private: - rtl::OUString key; - com::sun::star::uno::Sequence< rtl::OUString > listId; - com::sun::star::uno::Sequence< rtl::OUString > listAnchor; - com::sun::star::uno::Sequence< rtl::OUString > listTitle; + OUString key; + com::sun::star::uno::Sequence< OUString > listId; + com::sun::star::uno::Sequence< OUString > listAnchor; + com::sun::star::uno::Sequence< OUString > listTitle; - void init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const rtl::OUString& ids ); + void init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids ); }; @@ -128,22 +128,22 @@ namespace chelp { ~KeywordInfo() { }; - com::sun::star::uno::Sequence< rtl::OUString >& + com::sun::star::uno::Sequence< OUString >& getKeywordList() { return listKey; } - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > >& + com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > >& getIdList() { return listId; } - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > >& + com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > >& getAnchorList() { return listAnchor; } - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > >& + com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > >& getTitleList() { return listTitle; } private: - com::sun::star::uno::Sequence< rtl::OUString > listKey; - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > > listId,listAnchor,listTitle; + com::sun::star::uno::Sequence< OUString > listKey; + com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > > listId,listAnchor,listTitle; }; // end class KeywordInfo @@ -154,7 +154,7 @@ namespace chelp { struct eq { - bool operator()( const rtl::OUString& rKey1, const rtl::OUString& rKey2 ) const + bool operator()( const OUString& rKey1, const OUString& rKey2 ) const { return rKey1.compareTo( rKey2 ) == 0; } @@ -162,7 +162,7 @@ namespace chelp { struct ha { - size_t operator()( const rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } @@ -174,31 +174,31 @@ namespace chelp { */ Databases( sal_Bool showBasic, - const rtl::OUString& instPath, - const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths, - const rtl::OUString& productName, - const rtl::OUString& productVersion, - const rtl::OUString& styleSheet, + const OUString& instPath, + const com::sun::star::uno::Sequence< OUString >& imagesZipPaths, + const OUString& productName, + const OUString& productVersion, + const OUString& styleSheet, com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext ); ~Databases(); - rtl::OString getImagesZipFileURL(); + OString getImagesZipFileURL(); - rtl::OUString getInstallPathAsURL(); + OUString getInstallPathAsURL(); - const std::vector< rtl::OUString >& getModuleList( const rtl::OUString& Language ); + const std::vector< OUString >& getModuleList( const OUString& Language ); - StaticModuleInformation* getStaticInformationForModule( const rtl::OUString& Module, - const rtl::OUString& Language ); + StaticModuleInformation* getStaticInformationForModule( const OUString& Module, + const OUString& Language ); - bool checkModuleMatchForExtension( const rtl::OUString& Database, const rtl::OUString& doclist ); - KeywordInfo* getKeyword( const rtl::OUString& Module, - const rtl::OUString& Language ); + bool checkModuleMatchForExtension( const OUString& Database, const OUString& doclist ); + KeywordInfo* getKeyword( const OUString& Module, + const OUString& Language ); - helpdatafileproxy::Hdf* getHelpDataFile( const rtl::OUString& Module, - const rtl::OUString& Language, bool helpText = false, - const rtl::OUString* pExtensionPath = NULL ); + helpdatafileproxy::Hdf* getHelpDataFile( const OUString& Module, + const OUString& Language, bool helpText = false, + const OUString* pExtensionPath = NULL ); /** @@ -206,8 +206,8 @@ namespace chelp { */ com::sun::star::uno::Reference< com::sun::star::i18n::XCollator > - getCollator( const rtl::OUString& Language, - const rtl::OUString& System ); // System not used by current implementation + getCollator( const OUString& Language, + const OUString& System ); // System not used by current implementation // // of XCollator /** @@ -222,7 +222,7 @@ namespace chelp { * First try is language directory, second try is main installation directory. */ - void cascadingStylesheet( const rtl::OUString& Language, + void cascadingStylesheet( const OUString& Language, char** buffer, int* byteCount ); @@ -231,16 +231,16 @@ namespace chelp { * Changes the stylesheet for further reads. */ - void changeCSS(const rtl::OUString& newStyleSheet); + void changeCSS(const OUString& newStyleSheet); /** * Returns the active help text for the given module, language and id. */ - void setActiveText( const rtl::OUString& Module, - const rtl::OUString& Language, - const rtl::OUString& Id, + void setActiveText( const OUString& Module, + const OUString& Language, + const OUString& Id, char** buffer, int* byteCount ); @@ -249,19 +249,19 @@ namespace chelp { */ com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > - jarFile( const rtl::OUString& jar, - const rtl::OUString& Language ); + jarFile( const OUString& jar, + const OUString& Language ); com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > - findJarFileForPath( const rtl::OUString& jar, const rtl::OUString& Language, - const rtl::OUString& path, rtl::OUString* o_pExtensionPath = NULL, - rtl::OUString* o_pExtensionRegistryPath = NULL ); + findJarFileForPath( const OUString& jar, const OUString& Language, + const OUString& path, OUString* o_pExtensionPath = NULL, + OUString* o_pExtensionRegistryPath = NULL ); /** * Maps a given language-locale combination to language. */ - rtl::OUString processLang( const rtl::OUString& Language ); + OUString processLang( const OUString& Language ); /** @@ -269,17 +269,17 @@ namespace chelp { * The returned string maybe empty */ - rtl::OUString country( const rtl::OUString& Language ); + OUString country( const OUString& Language ); - void replaceName( rtl::OUString& oustring ) const; + void replaceName( OUString& oustring ) const; - rtl::OUString getProductName() const { return m_vReplacement[0]; } - rtl::OUString getProductVersion() const { return m_vReplacement[1]; } + OUString getProductName() const { return m_vReplacement[0]; } + OUString getProductVersion() const { return m_vReplacement[1]; } - rtl::OUString expandURL( const rtl::OUString& aURL ); + OUString expandURL( const OUString& aURL ); - static rtl::OUString expandURL( const rtl::OUString& aURL, + static OUString expandURL( const OUString& aURL, com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext ); private: @@ -294,7 +294,7 @@ namespace chelp { int m_nCustomCSSDocLength; char* m_pCustomCSSDoc; - rtl::OUString m_aCSS; + OUString m_aCSS; enum { PRODUCTNAME = 0, @@ -307,32 +307,32 @@ namespace chelp { }; int m_vAdd[7]; - rtl::OUString m_vReplacement[7]; - rtl::OUString newProdName,newProdVersion, + OUString m_vReplacement[7]; + OUString newProdName,newProdVersion, prodName,prodVersion,vendName,vendVersion,vendShort; - rtl::OUString m_aInstallDirectory; // Installation directory - com::sun::star::uno::Sequence< rtl::OUString > m_aImagesZipPaths; - rtl::OString m_aImagesZipFileURL; - rtl::OUString m_aSymbolsStyleName; + OUString m_aInstallDirectory; // Installation directory + com::sun::star::uno::Sequence< OUString > m_aImagesZipPaths; + OString m_aImagesZipFileURL; + OUString m_aSymbolsStyleName; - std::vector< rtl::OUString > m_avModules; + std::vector< OUString > m_avModules; - typedef boost::unordered_map< rtl::OUString,helpdatafileproxy::Hdf*,ha,eq > DatabasesTable; + typedef boost::unordered_map< OUString,helpdatafileproxy::Hdf*,ha,eq > DatabasesTable; DatabasesTable m_aDatabases; // Language and module dependent databases - typedef boost::unordered_map< rtl::OUString,rtl::OUString,ha,eq > LangSetTable; + typedef boost::unordered_map< OUString,OUString,ha,eq > LangSetTable; LangSetTable m_aLangSet; // Mapping to of lang-country to lang - typedef boost::unordered_map< rtl::OUString,StaticModuleInformation*,ha,eq > ModInfoTable; + typedef boost::unordered_map< OUString,StaticModuleInformation*,ha,eq > ModInfoTable; ModInfoTable m_aModInfo; // Module information - typedef boost::unordered_map< rtl::OUString,KeywordInfo*,ha,eq > KeywordInfoTable; + typedef boost::unordered_map< OUString,KeywordInfo*,ha,eq > KeywordInfoTable; KeywordInfoTable m_aKeywordInfo; // Module information typedef boost::unordered_map< - rtl::OUString, + OUString, ::com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >, ha, eq > ZipFileTable; @@ -340,7 +340,7 @@ namespace chelp { typedef boost::unordered_map< - rtl::OUString, + OUString, ::com::sun::star::uno::Reference< com::sun::star::i18n::XCollator >, ha, eq > CollatorTable; @@ -349,7 +349,7 @@ namespace chelp { struct ostring_eq { - bool operator()( const rtl::OString& rKey1, const rtl::OString& rKey2 ) const + bool operator()( const OString& rKey1, const OString& rKey2 ) const { return rKey1.compareTo( rKey2 ) == 0; } @@ -357,7 +357,7 @@ namespace chelp { struct ostring_ha { - size_t operator()( const rtl::OString& rName ) const + size_t operator()( const OString& rName ) const { return rName.hashCode(); } @@ -365,7 +365,7 @@ namespace chelp { typedef boost::unordered_set< - rtl::OString, + OString, ostring_ha, ostring_eq > EmptyActiveTextSet; EmptyActiveTextSet m_aEmptyActiveTextSet; @@ -373,7 +373,7 @@ namespace chelp { // methods - void setInstallPath( const rtl::OUString& aInstallDirectory ); + void setInstallPath( const OUString& aInstallDirectory ); }; // end class Databases @@ -392,7 +392,7 @@ namespace chelp { // Hashtable to cache extension help status typedef boost::unordered_map < - ::rtl::OUString, + OUString, bool, Databases::ha, Databases::eq @@ -406,9 +406,9 @@ namespace chelp { public: ExtensionIteratorBase( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, - Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage ); - ExtensionIteratorBase( Databases& rDatabases, const rtl::OUString& aInitialModule, - const rtl::OUString& aLanguage ); + Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ); + ExtensionIteratorBase( Databases& rDatabases, const OUString& aInitialModule, + const OUString& aLanguage ); void init( void ); private: @@ -423,9 +423,9 @@ namespace chelp { ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextBundledHelpPackage ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); - rtl::OUString implGetFileFromPackage( const rtl::OUString& rFileExtension, + OUString implGetFileFromPackage( const OUString& rFileExtension, com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); - void implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv, + void implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; @@ -433,10 +433,10 @@ namespace chelp { Databases& m_rDatabases; IteratorState m_eState; - rtl::OUString m_aExtensionPath; + OUString m_aExtensionPath; - rtl::OUString m_aInitialModule; - rtl::OUString m_aLanguage; + OUString m_aInitialModule; + OUString m_aLanguage; com::sun::star::uno::Sequence< com::sun::star::uno::Reference < com::sun::star::deployment::XPackage > > m_aUserPackagesSeq; @@ -462,23 +462,23 @@ namespace chelp { { public: DataBaseIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, - Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage, bool bHelpText ) + Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage, bool bHelpText ) : ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage ) , m_bHelpText( bHelpText ) {} - DataBaseIterator( Databases& rDatabases, const rtl::OUString& aInitialModule, - const rtl::OUString& aLanguage, bool bHelpText ) + DataBaseIterator( Databases& rDatabases, const OUString& aInitialModule, + const OUString& aLanguage, bool bHelpText ) : ExtensionIteratorBase( rDatabases, aInitialModule, aLanguage ) , m_bHelpText( bHelpText ) {} - helpdatafileproxy::Hdf* nextHdf( rtl::OUString* o_pExtensionPath = NULL, rtl::OUString* o_pExtensionRegistryPath = NULL ); + helpdatafileproxy::Hdf* nextHdf( OUString* o_pExtensionPath = NULL, OUString* o_pExtensionRegistryPath = NULL ); private: helpdatafileproxy::Hdf* implGetHdfFromPackage( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage, - rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath ); + OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath ); bool m_bHelpText; @@ -489,14 +489,14 @@ namespace chelp { { public: KeyDataBaseFileIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, - Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage ) + Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ) : ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage ) {} //Returns a file URL - rtl::OUString nextDbFile( bool& o_rbExtension ); + OUString nextDbFile( bool& o_rbExtension ); private: - rtl::OUString implGetDbFileFromPackage( + OUString implGetDbFileFromPackage( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); }; // end class KeyDataBaseFileIterator @@ -506,18 +506,18 @@ namespace chelp { { public: JarFileIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, - Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage ) + Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ) : ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage ) {} com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > nextJarFile( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle, - rtl::OUString* o_pExtensionPath = NULL, rtl::OUString* o_pExtensionRegistryPath = NULL ); + OUString* o_pExtensionPath = NULL, OUString* o_pExtensionRegistryPath = NULL ); private: com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > implGetJarFromPackage(com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage, - rtl::OUString* o_pExtensionPath = NULL, rtl::OUString* o_pExtensionRegistryPath = NULL ); + OUString* o_pExtensionPath = NULL, OUString* o_pExtensionRegistryPath = NULL ); }; // end class JarFileIterator @@ -525,15 +525,15 @@ namespace chelp { class IndexFolderIterator : public ExtensionIteratorBase { public: - IndexFolderIterator( Databases& rDatabases, const rtl::OUString& aInitialModule, const rtl::OUString& aLanguage ) + IndexFolderIterator( Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ) : ExtensionIteratorBase( rDatabases, aInitialModule, aLanguage ) {} - rtl::OUString nextIndexFolder( bool& o_rbExtension, bool& o_rbTemporary ); - void deleteTempIndexFolder( const rtl::OUString& aIndexFolder ); + OUString nextIndexFolder( bool& o_rbExtension, bool& o_rbTemporary ); + void deleteTempIndexFolder( const OUString& aIndexFolder ); private: - rtl::OUString implGetIndexFolderFromPackage( bool& o_rbTemporary, + OUString implGetIndexFolderFromPackage( bool& o_rbTemporary, com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); }; // end class KeyDataBaseFileIterator diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx index 6fe749017b94..d97077e89ca7 100644 --- a/xmlhelp/source/cxxhelp/provider/db.cxx +++ b/xmlhelp/source/cxxhelp/provider/db.cxx @@ -93,7 +93,7 @@ void Hdf::createHashMap( bool bOptimizeForPerformance ) if( !implReadLenAndData( pData, iPos, aDBKey ) ) break; - rtl::OString aOKeyStr = aDBKey.getData(); + OString aOKeyStr = aDBKey.getData(); // Read val len const char* pStartPtr = pData + iPos; @@ -107,7 +107,7 @@ void Hdf::createHashMap( bool bOptimizeForPerformance ) if( bOptimizeForPerformance ) { const char* pValSrc = pData + iPos; - rtl::OString aValStr( pValSrc, nValLen ); + OString aValStr( pValSrc, nValLen ); (*m_pStringToDataMap)[aOKeyStr] = aValStr; } else @@ -137,7 +137,7 @@ void Hdf::releaseHashMap( void ) } -bool Hdf::getValueForKey( const rtl::OString& rKey, HDFData& rValue ) +bool Hdf::getValueForKey( const OString& rKey, HDFData& rValue ) { bool bSuccess = false; if( !m_xSFA.is() ) @@ -188,7 +188,7 @@ bool Hdf::getValueForKey( const rtl::OString& rKey, HDFData& rValue ) StringToDataMap::const_iterator it = m_pStringToDataMap->find( rKey ); if( it != m_pStringToDataMap->end() ) { - const rtl::OString& rValueStr = it->second; + const OString& rValueStr = it->second; int nValueLen = rValueStr.getLength(); const char* pData = rValueStr.getStr(); rValue.copyToBuffer( pData, nValueLen ); diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index 429fd24bdbe2..d00fbaba4a50 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -67,22 +67,22 @@ namespace helpdatafileproxy { struct eq { - bool operator()( const rtl::OString& rKey1, const rtl::OString& rKey2 ) const + bool operator()( const OString& rKey1, const OString& rKey2 ) const { return rKey1.compareTo( rKey2 ) == 0; } }; struct ha { - size_t operator()( const rtl::OString& rName ) const + size_t operator()( const OString& rName ) const { return rName.hashCode(); } }; - typedef boost::unordered_map< rtl::OString,std::pair,ha,eq > StringToValPosMap; - typedef boost::unordered_map< rtl::OString,rtl::OString,ha,eq > StringToDataMap; + typedef boost::unordered_map< OString,std::pair,ha,eq > StringToValPosMap; + typedef boost::unordered_map< OString,OString,ha,eq > StringToDataMap; class Hdf : hdf_internal::Noncopyable { - rtl::OUString m_aFileURL; + OUString m_aFileURL; StringToDataMap* m_pStringToDataMap; StringToValPosMap* m_pStringToValPosMap; com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > @@ -100,7 +100,7 @@ namespace helpdatafileproxy { //HDFHelp must get a fileURL which can then directly be used by simple file access. //SimpleFileAccess requires file URLs as arguments. Passing file path may work but fails //for example when using long file paths on Windows, which start with "\\?\" - Hdf( const rtl::OUString& rFileURL, + Hdf( const OUString& rFileURL, com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > xSFA ) : m_aFileURL( rFileURL ) , m_pStringToDataMap( NULL ) @@ -118,7 +118,7 @@ namespace helpdatafileproxy { void createHashMap( bool bOptimizeForPerformance = false ); void releaseHashMap( void ); - bool getValueForKey( const rtl::OString& rKey, HDFData& rValue ); + bool getValueForKey( const OString& rKey, HDFData& rValue ); bool startIteration( void ); bool getNextKeyAndValue( HDFData& rKey, HDFData& rValue ); diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index 6ef2b30ee645..33d8556ebdc6 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -27,7 +27,7 @@ using namespace com::sun::star::ucb; -XInputStream_impl::XInputStream_impl( const rtl::OUString& aUncPath ) +XInputStream_impl::XInputStream_impl( const OUString& aUncPath ) : m_bIsOpen( false ), m_aFile( aUncPath ) { @@ -128,7 +128,7 @@ XInputStream_impl::skipBytes( { if (m_aFile.setPos(osl_Pos_Current, sal_uInt64(nBytesToSkip)) != osl::FileBase::E_None) { - throw io::IOException(::rtl::OUString( + throw io::IOException(OUString( "XInputStream_impl::skipBytes failed seek"), uno::Reference< uno::XInterface >()); } } diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index ad3994393642..e2ee1dbe6b39 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -104,23 +104,23 @@ XTYPEPROVIDER_IMPL_5( ContentProvider, // //========================================================================= -rtl::OUString SAL_CALL ContentProvider::getImplementationName() +OUString SAL_CALL ContentProvider::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); } -rtl::OUString ContentProvider::getImplementationName_Static() +OUString ContentProvider::getImplementationName_Static() { - return rtl::OUString("CHelpContentProvider" ); + return OUString("CHelpContentProvider" ); } sal_Bool SAL_CALL -ContentProvider::supportsService(const rtl::OUString& ServiceName ) +ContentProvider::supportsService(const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString* pArray = aSNL.getArray(); + uno::Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString* pArray = aSNL.getArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) { if( pArray[ i ] == ServiceName ) @@ -130,7 +130,7 @@ ContentProvider::supportsService(const rtl::OUString& ServiceName ) return sal_False; } -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames() throw( uno::RuntimeException ) { @@ -147,15 +147,15 @@ ContentProvider_CreateInstance( return uno::Reference< uno::XInterface >::query( pX ); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ContentProvider::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSNS( 2 ); + uno::Sequence< OUString > aSNS( 2 ); aSNS.getArray()[ 0 ] = - rtl::OUString( + OUString( MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 ); aSNS.getArray()[ 1 ] = - rtl::OUString( + OUString( MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 ); return aSNS; @@ -233,12 +233,12 @@ ContentProvider::elementReplaced(const container::ContainerEvent& Event) if(!m_pDatabases) return; - rtl::OUString accessor; + OUString accessor; Event.Accessor >>= accessor; if(accessor.compareToAscii("HelpStyleSheet")) return; - rtl::OUString replacedElement,element; + OUString replacedElement,element; Event.ReplacedElement >>= replacedElement; Event.Element >>= element; @@ -259,14 +259,14 @@ void ContentProvider::init() getHierAccess( sProvider, "org.openoffice.Office.Common" ) ); - rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) ); + OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) ); if( instPath.isEmpty() ) // try to determine path from default - instPath = rtl::OUString( "$(instpath)/help" ); + instPath = OUString( "$(instpath)/help" ); // replace anything like $(instpath); subst( instPath ); - rtl::OUString stylesheet( getKey( xHierAccess,"Help/HelpStyleSheet" ) ); + OUString stylesheet( getKey( xHierAccess,"Help/HelpStyleSheet" ) ); try { // now adding as configuration change listener for the stylesheet @@ -275,7 +275,7 @@ void ContentProvider::init() if( xAccess.is() ) { uno::Any aAny = - xAccess->getByName( rtl::OUString( "Help" ) ); + xAccess->getByName( OUString( "Help" ) ); aAny >>= m_xContainer; if( m_xContainer.is() ) m_xContainer->addContainerListener( this ); @@ -287,9 +287,9 @@ void ContentProvider::init() xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" ); - rtl::OUString setupversion( + OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) ); - rtl::OUString setupextension; + OUString setupextension; try { @@ -298,17 +298,17 @@ void ContentProvider::init() uno::Sequence < uno::Any > lParams(1); beans::PropertyValue aParam ; - aParam.Name = ::rtl::OUString("nodepath"); - aParam.Value <<= ::rtl::OUString("/org.openoffice.Setup/Product"); + aParam.Name = OUString("nodepath"); + aParam.Value <<= OUString("/org.openoffice.Setup/Product"); lParams[0] = uno::makeAny(aParam); // open it uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"), + OUString("com.sun.star.configuration.ConfigurationAccess"), lParams) ); uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY); - uno::Any aRet = xDirectAccess->getByName(::rtl::OUString("ooSetupExtension")); + uno::Any aRet = xDirectAccess->getByName(OUString("ooSetupExtension")); aRet >>= setupextension; } @@ -316,19 +316,19 @@ void ContentProvider::init() { } - rtl::OUString productversion( + OUString productversion( setupversion + - rtl::OUString( " " ) + + OUString( " " ) + setupextension ); - uno::Sequence< rtl::OUString > aImagesZipPaths( 2 ); + uno::Sequence< OUString > aImagesZipPaths( 2 ); xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" ); - rtl::OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) ); + OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) ); subst( aPath ); aImagesZipPaths[ 0 ] = aPath; - aPath = rtl::OUString("$BRAND_BASE_DIR/share/config"); + aPath = OUString("$BRAND_BASE_DIR/share/config"); rtl::Bootstrap::expandMacros(aPath); aImagesZipPaths[ 1 ] = aPath; @@ -371,11 +371,11 @@ ContentProvider::getHierAccess( if( sProvider.is() ) { uno::Sequence< uno::Any > seq( 1 ); - rtl::OUString sReaderService( - rtl::OUString( + OUString sReaderService( + OUString( "com.sun.star.configuration.ConfigurationAccess" ) ); - seq[ 0 ] <<= rtl::OUString::createFromAscii( file ); + seq[ 0 ] <<= OUString::createFromAscii( file ); try { @@ -394,12 +394,12 @@ ContentProvider::getHierAccess( -rtl::OUString +OUString ContentProvider::getKey( const uno::Reference< container::XHierarchicalNameAccess >& xHierAccess, const char* key ) const { - rtl::OUString instPath; + OUString instPath; if( xHierAccess.is() ) { uno::Any aAny; @@ -407,7 +407,7 @@ ContentProvider::getKey( { aAny = xHierAccess->getByHierarchicalName( - rtl::OUString::createFromAscii( key ) ); + OUString::createFromAscii( key ) ); } catch( const container::NoSuchElementException& ) { @@ -430,7 +430,7 @@ ContentProvider::getBooleanKey( { aAny = xHierAccess->getByHierarchicalName( - rtl::OUString::createFromAscii( key ) ); + OUString::createFromAscii( key ) ); } catch( const container::NoSuchElementException& ) { @@ -440,7 +440,7 @@ ContentProvider::getBooleanKey( return ret; } -void ContentProvider::subst( rtl::OUString& instpath ) const +void ContentProvider::subst( OUString& instpath ) const { uno::Reference< frame::XConfigManager > xCfgMgr; if( m_xContext.is() ) diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index 7f81469d4d03..75ae7b4a8370 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -382,7 +382,7 @@ ResultSetBase::close( } -rtl::OUString SAL_CALL +OUString SAL_CALL ResultSetBase::queryContentIdentifierString( void ) throw( uno::RuntimeException ) @@ -390,7 +390,7 @@ ResultSetBase::queryContentIdentifierString( if( 0 <= m_nRow && sal::static_int_cast( m_nRow ) < m_aItems.size() ) return m_aPath[m_nRow]; else - return rtl::OUString(); + return OUString(); } @@ -401,7 +401,7 @@ ResultSetBase::queryContentIdentifier( { if( 0 <= m_nRow && sal::static_int_cast( m_nRow ) < m_aItems.size() ) { - rtl::OUString url = queryContentIdentifierString(); + OUString url = queryContentIdentifierString(); if( ! m_aIdents[m_nRow].is() && !url.isEmpty() ) m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >( new ::ucbhelper::ContentIdentifier( url ) ); @@ -463,7 +463,7 @@ public: return m_aSeq; } - beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) + beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw( beans::UnknownPropertyException, uno::RuntimeException) { @@ -473,7 +473,7 @@ public: throw beans::UnknownPropertyException(); } - sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) + sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw( uno::RuntimeException ) { for( int i = 0; i < m_aSeq.getLength(); ++i ) @@ -495,12 +495,12 @@ ResultSetBase::getPropertySetInfo() throw( uno::RuntimeException) { uno::Sequence< beans::Property > seq(2); - seq[0].Name = rtl::OUString( "RowCount" ); + seq[0].Name = OUString( "RowCount" ); seq[0].Handle = -1; seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) ); seq[0].Attributes = beans::PropertyAttribute::READONLY; - seq[1].Name = rtl::OUString( "IsRowCountFinal" ); + seq[1].Name = OUString( "IsRowCountFinal" ); seq[1].Handle = -1; seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) ); seq[1].Attributes = beans::PropertyAttribute::READONLY; @@ -512,7 +512,7 @@ ResultSetBase::getPropertySetInfo() void SAL_CALL ResultSetBase::setPropertyValue( - const rtl::OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& aValue ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, @@ -521,8 +521,8 @@ void SAL_CALL ResultSetBase::setPropertyValue( { (void)aValue; - if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) || - aPropertyName == rtl::OUString( "RowCount" ) ) + if( aPropertyName == OUString( "IsRowCountFinal" ) || + aPropertyName == OUString( "RowCount" ) ) return; throw beans::UnknownPropertyException(); @@ -530,18 +530,18 @@ void SAL_CALL ResultSetBase::setPropertyValue( uno::Any SAL_CALL ResultSetBase::getPropertyValue( - const rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( PropertyName == rtl::OUString( "IsRowCountFinal" ) ) + if( PropertyName == OUString( "IsRowCountFinal" ) ) { uno::Any aAny; aAny <<= m_bRowCountFinal; return aAny; } - else if ( PropertyName == rtl::OUString( "RowCount" ) ) + else if ( PropertyName == OUString( "RowCount" ) ) { uno::Any aAny; sal_Int32 count = m_aItems.size(); @@ -554,13 +554,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue( void SAL_CALL ResultSetBase::addPropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) ) + if( aPropertyName == OUString( "IsRowCountFinal" ) ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) @@ -569,7 +569,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( m_pIsFinalListeners->addInterface( xListener ); } - else if ( aPropertyName == rtl::OUString( "RowCount" ) ) + else if ( aPropertyName == OUString( "RowCount" ) ) { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) @@ -583,19 +583,19 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( void SAL_CALL ResultSetBase::removePropertyChangeListener( - const rtl::OUString& aPropertyName, + const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) && + if( aPropertyName == OUString( "IsRowCountFinal" ) && m_pIsFinalListeners ) { osl::MutexGuard aGuard( m_aMutex ); m_pIsFinalListeners->removeInterface( aListener ); } - else if ( aPropertyName == rtl::OUString( "RowCount" ) && + else if ( aPropertyName == OUString( "RowCount" ) && m_pRowCountListeners ) { osl::MutexGuard aGuard( m_aMutex ); @@ -607,7 +607,7 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener( void SAL_CALL ResultSetBase::addVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -619,7 +619,7 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener( void SAL_CALL ResultSetBase::removeVetoableChangeListener( - const rtl::OUString& PropertyName, + const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index 4d87543f1124..d030e7735f2c 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -65,11 +65,11 @@ using namespace com::sun::star::lang; struct HitItem { - rtl::OUString m_aURL; + OUString m_aURL; float m_fScore; HitItem( void ) {} - HitItem( const rtl::OUString& aURL, float fScore ) + HitItem( const OUString& aURL, float fScore ) : m_aURL( aURL ) , m_fScore( fScore ) {} @@ -91,23 +91,23 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte { Reference< XExtendedTransliteration > xTrans = Transliteration::create( rxContext ); Locale aLocale( aURLParameter.get_language(), - rtl::OUString(), - rtl::OUString() ); + OUString(), + OUString() ); xTrans->loadModule(TransliterationModules_UPPERCASE_LOWERCASE, aLocale ); - vector< vector< rtl::OUString > > queryList; + vector< vector< OUString > > queryList; { sal_Int32 idx; - rtl::OUString query = m_aURLParameter.get_query(); + OUString query = m_aURLParameter.get_query(); while( !query.isEmpty() ) { idx = query.indexOf( sal_Unicode( ' ' ) ); if( idx == -1 ) idx = query.getLength(); - vector< rtl::OUString > currentQuery; - rtl::OUString tmp(query.copy( 0,idx )); + vector< OUString > currentQuery; + OUString tmp(query.copy( 0,idx )); rtl:: OUString toliterate = tmp; Sequence aSeq; toliterate = xTrans->transliterate( @@ -118,19 +118,19 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte int nCpy = 1 + idx; if( nCpy >= query.getLength() ) - query = rtl::OUString(); + query = OUString(); else query = query.copy( 1 + idx ); } } - vector< rtl::OUString > aCompleteResultVector; - rtl::OUString scope = m_aURLParameter.get_scope(); + vector< OUString > aCompleteResultVector; + OUString scope = m_aURLParameter.get_scope(); bool bCaptionsOnly = ( scope.compareToAscii( "Heading" ) == 0 ); sal_Int32 hitCount = m_aURLParameter.get_hitCount(); IndexFolderIterator aIndexFolderIt( *pDatabases, m_aURLParameter.get_module(), m_aURLParameter.get_language() ); - rtl::OUString idxDir; + OUString idxDir; bool bExtension = false; int iDir = 0; vector< vector* > aIndexFolderResultVectorVector; @@ -143,7 +143,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte try { vector< vector* > aQueryListResultVectorVector; - set< rtl::OUString > aSet,aCurrent,aResultSet; + set< OUString > aSet,aCurrent,aResultSet; int nQueryListSize = queryList.size(); if( nQueryListSize > 1 ) @@ -163,12 +163,12 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte } pQueryResultVector->reserve( hitCount ); - rtl::OUString aLang = m_aURLParameter.get_language(); - const std::vector< rtl::OUString >& aListItem = queryList[i]; - ::rtl::OUString aNewQueryStr = aListItem[0]; + OUString aLang = m_aURLParameter.get_language(); + const std::vector< OUString >& aListItem = queryList[i]; + OUString aNewQueryStr = aListItem[0]; vector aScoreVector; - vector aPathVector; + vector aPathVector; try { @@ -313,14 +313,14 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte delete pIndexFolderVector; } - sal_Int32 replIdx = rtl::OUString( "#HLP#" ).getLength(); - rtl::OUString replWith = rtl::OUString( "vnd.sun.star.help://" ); + sal_Int32 replIdx = OUString( "#HLP#" ).getLength(); + OUString replWith = OUString( "vnd.sun.star.help://" ); int nResultCount = aCompleteResultVector.size(); for( int r = 0 ; r < nResultCount ; ++r ) { - rtl::OUString aURL = aCompleteResultVector[r]; - rtl::OUString aResultStr = replWith + aURL.copy(replIdx); + OUString aURL = aCompleteResultVector[r]; + OUString aResultStr = replWith + aURL.copy(replIdx); m_aPath.push_back( aResultStr ); } @@ -328,16 +328,16 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte m_aIdents.resize( m_aPath.size() ); Command aCommand; - aCommand.Name = rtl::OUString( "getPropertyValues" ); + aCommand.Name = OUString( "getPropertyValues" ); aCommand.Argument <<= m_sProperty; for( m_nRow = 0; sal::static_int_cast( m_nRow ) < m_aPath.size(); ++m_nRow ) { m_aPath[m_nRow] = m_aPath[m_nRow] + - rtl::OUString( "?Language=" ) + + OUString( "?Language=" ) + m_aURLParameter.get_language() + - rtl::OUString( "&System=" ) + + OUString( "&System=" ) + m_aURLParameter.get_system(); uno::Reference< XContent > content = queryContent(); diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx index 5de197881271..aace7a6236a4 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx @@ -46,17 +46,17 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext m_aIdents.resize( m_aPath.size() ); Command aCommand; - aCommand.Name = rtl::OUString( "getPropertyValues" ); + aCommand.Name = OUString( "getPropertyValues" ); aCommand.Argument <<= m_sProperty; for( sal_uInt32 i = 0; i < m_aPath.size(); ++i ) { m_aPath[i] = - rtl::OUString( "vnd.sun.star.help://" ) + + OUString( "vnd.sun.star.help://" ) + m_aPath[i] + - rtl::OUString( "?Language=" ) + + OUString( "?Language=" ) + m_aURLParameter.get_language() + - rtl::OUString( "&System=" ) + + OUString( "&System=" ) + m_aURLParameter.get_system(); m_nRow = sal_Int32( i ); diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 2f968f64a36f..254be3166ff3 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -78,7 +78,7 @@ using namespace com::sun::star::container; using namespace chelp; -URLParameter::URLParameter( const rtl::OUString& aURL, +URLParameter::URLParameter( const OUString& aURL, Databases* pDatabases ) throw( com::sun::star::ucb::IllegalIdentifierException ) : m_pDatabases( pDatabases ), @@ -104,9 +104,9 @@ bool URLParameter::isErrorDocument() } -rtl::OString URLParameter::getByName( const char* par ) +OString URLParameter::getByName( const char* par ) { - rtl::OUString val; + OUString val; if( strcmp( par,"Program" ) == 0 ) val = get_program(); @@ -125,11 +125,11 @@ rtl::OString URLParameter::getByName( const char* par ) else if( strcmp( par,"HelpPrefix" ) == 0 ) val = get_prefix(); - return rtl::OString( val.getStr(),val.getLength(),RTL_TEXTENCODING_UTF8 ); + return OString( val.getStr(),val.getLength(),RTL_TEXTENCODING_UTF8 ); } -rtl::OUString URLParameter::get_id() +OUString URLParameter::get_id() { if( m_aId.compareToAscii("start") == 0 ) { // module is set @@ -145,7 +145,7 @@ rtl::OUString URLParameter::get_id() return m_aId; } -rtl::OUString URLParameter::get_tag() +OUString URLParameter::get_tag() { if( isFile() ) return get_the_tag(); @@ -154,7 +154,7 @@ rtl::OUString URLParameter::get_tag() } -rtl::OUString URLParameter::get_title() +OUString URLParameter::get_title() { if( isFile() ) return get_the_title(); @@ -167,13 +167,13 @@ rtl::OUString URLParameter::get_title() m_aTitle = inf->get_title(); } else // This must be the root - m_aTitle = rtl::OUString("root"); + m_aTitle = OUString("root"); return m_aTitle; } -rtl::OUString URLParameter::get_language() +OUString URLParameter::get_language() { if( m_aLanguage.isEmpty() ) return m_aDefaultLanguage; @@ -182,7 +182,7 @@ rtl::OUString URLParameter::get_language() } -rtl::OUString URLParameter::get_program() +OUString URLParameter::get_program() { if( m_aProgram.isEmpty() ) { @@ -207,7 +207,7 @@ void URLParameter::init( bool bDefaultLanguageIsInitialized ) } -rtl::OUString URLParameter::get_the_tag() +OUString URLParameter::get_the_tag() { if(m_bUseDB) { if( ! m_bHelpDataFileRead ) @@ -218,12 +218,12 @@ rtl::OUString URLParameter::get_the_tag() return m_aTag; } else - return rtl::OUString(); + return OUString(); } -rtl::OUString URLParameter::get_the_path() +OUString URLParameter::get_the_path() { if(m_bUseDB) { if( ! m_bHelpDataFileRead ) @@ -238,7 +238,7 @@ rtl::OUString URLParameter::get_the_path() -rtl::OUString URLParameter::get_the_title() +OUString URLParameter::get_the_title() { if(m_bUseDB) { if( ! m_bHelpDataFileRead ) @@ -248,11 +248,11 @@ rtl::OUString URLParameter::get_the_title() return m_aTitle; } else - return rtl::OUString(); + return OUString(); } -rtl::OUString URLParameter::get_the_jar() +OUString URLParameter::get_the_jar() { if(m_bUseDB) { if( ! m_bHelpDataFileRead ) @@ -262,7 +262,7 @@ rtl::OUString URLParameter::get_the_jar() return m_aJar; } else - return get_module() + rtl::OUString(".jar"); + return get_module() + OUString(".jar"); } @@ -271,8 +271,8 @@ void URLParameter::readHelpDataFile() if( get_id().compareToAscii("") == 0 ) return; - rtl::OUString aModule = get_module(); - rtl::OUString aLanguage = get_language(); + OUString aModule = get_module(); + OUString aLanguage = get_language(); DataBaseIterator aDbIt( *m_pDatabases, aModule, aLanguage, false ); bool bSuccess = false; @@ -280,15 +280,15 @@ void URLParameter::readHelpDataFile() const sal_Char* pData = NULL; helpdatafileproxy::HDFData aHDFData; - rtl::OUString aExtensionPath; - rtl::OUString aExtensionRegistryPath; + OUString aExtensionPath; + OUString aExtensionRegistryPath; while( true ) { helpdatafileproxy::Hdf* pHdf = aDbIt.nextHdf( &aExtensionPath, &aExtensionRegistryPath ); if( !pHdf ) break; - rtl::OString keyStr( m_aId.getStr(),m_aId.getLength(),RTL_TEXTENCODING_UTF8 ); + OString keyStr( m_aId.getStr(),m_aId.getLength(),RTL_TEXTENCODING_UTF8 ); bSuccess = pHdf->getValueForKey( keyStr, aHDFData ); if( bSuccess ) { @@ -306,7 +306,7 @@ void URLParameter::readHelpDataFile() m_aJar = converter.getDatabase(); if( !aExtensionPath.isEmpty() ) { - rtl::OUStringBuffer aExtendedJarStrBuf; + OUStringBuffer aExtendedJarStrBuf; aExtendedJarStrBuf.append( '?' ); aExtendedJarStrBuf.append( aExtensionPath ); aExtendedJarStrBuf.append( '?' ); @@ -405,10 +405,10 @@ void URLParameter::open( const Command& aCommand, { Reference< XInputStream > xStream; Reference< XHierarchicalNameAccess > xNA = - m_pDatabases->jarFile( rtl::OUString( "picture.jar" ), + m_pDatabases->jarFile( OUString( "picture.jar" ), get_language() ); - rtl::OUString path = get_path(); + OUString path = get_path(); if( xNA.is() ) { try @@ -473,10 +473,10 @@ void URLParameter::open( const Command& aCommand, { Reference< XInputStream > xStream; Reference< XHierarchicalNameAccess > xNA = - m_pDatabases->jarFile( rtl::OUString( "picture.jar" ), + m_pDatabases->jarFile( OUString( "picture.jar" ), get_language() ); - rtl::OUString path = get_path(); + OUString path = get_path(); if( xNA.is() ) { try @@ -522,12 +522,12 @@ bool URLParameter::scheme() if( m_aExpr.startsWith("vnd.sun.star.help:///") ) { sal_Int32 nLen = m_aExpr.getLength(); - rtl::OUString aLastStr = + OUString aLastStr = m_aExpr.copy(sal::static_int_cast(nLen) - 6); if( aLastStr.compareToAscii( "DbPAR=" ) == 0 ) { - rtl::OUString aNewExpr = m_aExpr.copy( 0, 20 ); - rtl::OUString aSharedStr("shared"); + OUString aNewExpr = m_aExpr.copy( 0, 20 ); + OUString aSharedStr("shared"); aNewExpr += aSharedStr; aNewExpr += m_aExpr.copy( 20 ); aNewExpr += aSharedStr; @@ -593,7 +593,7 @@ bool URLParameter::name( bool modulePresent ) bool URLParameter::query() { - rtl::OUString query_; + OUString query_; if( m_aExpr.isEmpty() ) return true; @@ -605,7 +605,7 @@ bool URLParameter::query() bool ret = true; sal_Int32 delimIdx,equalIdx; - rtl::OUString parameter,value; + OUString parameter,value; while( !query_.isEmpty() ) { @@ -615,7 +615,7 @@ bool URLParameter::query() if( delimIdx == -1 ) { value = query_.copy( equalIdx + 1 ).trim(); - query_ = rtl::OUString(); + query_ = OUString(); } else { @@ -640,7 +640,7 @@ bool URLParameter::query() if( m_aQuery.isEmpty() ) m_aQuery = value; else - m_aQuery += ( rtl::OUString( " " ) + value ); + m_aQuery += ( OUString( " " ) + value ); } else if( parameter.compareToAscii( "Scope" ) == 0 ) m_aScope = value; @@ -707,14 +707,14 @@ helpMatch(const char * URI) { static void * fileOpen(const char *URI) { - osl::File *pRet = new osl::File(rtl::OUString(URI, strlen(URI), RTL_TEXTENCODING_UTF8)); + osl::File *pRet = new osl::File(OUString(URI, strlen(URI), RTL_TEXTENCODING_UTF8)); pRet->open(osl_File_OpenFlag_Read); return pRet; } static void * zipOpen(SAL_UNUSED_PARAMETER const char *) { - rtl::OUString language,jar,path; + OUString language,jar,path; if( !ugblData->m_pInitial->get_eid().isEmpty() ) return (void*)(new Reference< XHierarchicalNameAccess >); @@ -753,9 +753,9 @@ zipOpen(SAL_UNUSED_PARAMETER const char *) { static void * helpOpen(const char * URI) { - rtl::OUString language,jar,path; + OUString language,jar,path; - URLParameter urlpar( rtl::OUString::createFromAscii( URI ), + URLParameter urlpar( OUString::createFromAscii( URI ), ugblData->m_pDatabases ); jar = urlpar.get_jar(); @@ -868,43 +868,43 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, { UserData userData( this,urlParam,pDatabases ); - // Uses the implementation detail, that rtl::OString::getStr returns a zero terminated character-array + // Uses the implementation detail, that OString::getStr returns a zero terminated character-array const char* parameter[47]; - rtl::OString parString[46]; + OString parString[46]; int last = 0; parString[last++] = "Program"; - rtl::OString aPureProgramm( urlParam->getByName( "Program" ) ); - parString[last++] = rtl::OString('\'') + aPureProgramm + rtl::OString('\''); + OString aPureProgramm( urlParam->getByName( "Program" ) ); + parString[last++] = OString('\'') + aPureProgramm + OString('\''); parString[last++] = "Database"; - parString[last++] = rtl::OString('\'') + urlParam->getByName( "DatabasePar" ) + rtl::OString('\''); + parString[last++] = OString('\'') + urlParam->getByName( "DatabasePar" ) + OString('\''); parString[last++] = "Id"; - parString[last++] = rtl::OString('\'') + urlParam->getByName( "Id" ) + rtl::OString('\''); + parString[last++] = OString('\'') + urlParam->getByName( "Id" ) + OString('\''); parString[last++] = "Path"; - rtl::OString aPath( urlParam->getByName( "Path" ) ); - parString[last++] = rtl::OString('\'') + aPath + rtl::OString('\''); + OString aPath( urlParam->getByName( "Path" ) ); + parString[last++] = OString('\'') + aPath + OString('\''); - rtl::OString aPureLanguage = urlParam->getByName( "Language" ); + OString aPureLanguage = urlParam->getByName( "Language" ); parString[last++] = "Language"; - parString[last++] = rtl::OString('\'') + aPureLanguage + rtl::OString('\''); + parString[last++] = OString('\'') + aPureLanguage + OString('\''); parString[last++] = "System"; - parString[last++] = rtl::OString('\'') + urlParam->getByName( "System" ) + rtl::OString('\''); + parString[last++] = OString('\'') + urlParam->getByName( "System" ) + OString('\''); parString[last++] = "productname"; - parString[last++] = rtl::OString('\'') + rtl::OString( + parString[last++] = OString('\'') + OString( pDatabases->getProductName().getStr(), pDatabases->getProductName().getLength(), - RTL_TEXTENCODING_UTF8 ) + rtl::OString('\''); + RTL_TEXTENCODING_UTF8 ) + OString('\''); parString[last++] = "productversion"; - parString[last++] = rtl::OString('\'') + - rtl::OString( pDatabases->getProductVersion().getStr(), + parString[last++] = OString('\'') + + OString( pDatabases->getProductVersion().getStr(), pDatabases->getProductVersion().getLength(), - RTL_TEXTENCODING_UTF8 ) + rtl::OString('\''); + RTL_TEXTENCODING_UTF8 ) + OString('\''); parString[last++] = "imgrepos"; - parString[last++] = rtl::OString('\'') + pDatabases->getImagesZipFileURL() + rtl::OString('\''); + parString[last++] = OString('\'') + pDatabases->getImagesZipFileURL() + OString('\''); parString[last++] = "hp"; - parString[last++] = rtl::OString('\'') + urlParam->getByName( "HelpPrefix" ) + rtl::OString('\''); + parString[last++] = OString('\'') + urlParam->getByName( "HelpPrefix" ) + OString('\''); if( !parString[last-1].isEmpty() ) { @@ -926,19 +926,19 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, parString[last++] = "'css'"; parString[last++] = "vendorname"; - parString[last++] = rtl::OString("''"); + parString[last++] = OString("''"); parString[last++] = "vendorversion"; - parString[last++] = rtl::OString("''"); + parString[last++] = OString("''"); parString[last++] = "vendorshort"; - parString[last++] = rtl::OString("''"); + parString[last++] = OString("''"); } // Do we need to add extension path? - ::rtl::OUString aExtensionPath; - rtl::OUString aJar = urlParam->get_jar(); + OUString aExtensionPath; + OUString aJar = urlParam->get_jar(); bool bAddExtensionPath = false; - rtl::OUString aExtensionRegistryPath; + OUString aExtensionRegistryPath; sal_Int32 nQuestionMark1 = aJar.indexOf( sal_Unicode('?') ); sal_Int32 nQuestionMark2 = aJar.lastIndexOf( sal_Unicode('?') ); if( nQuestionMark1 != -1 && nQuestionMark2 != -1 && nQuestionMark1 != nQuestionMark2 ) @@ -961,29 +961,29 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); - rtl::OUString aOUExpandedExtensionPath = Databases::expandURL( aExtensionRegistryPath, xContext ); - rtl::OString aExpandedExtensionPath = rtl::OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() ); + OUString aOUExpandedExtensionPath = Databases::expandURL( aExtensionRegistryPath, xContext ); + OString aExpandedExtensionPath = OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() ); parString[last++] = "ExtensionPath"; - parString[last++] = rtl::OString('\'') + aExpandedExtensionPath + rtl::OString('\''); + parString[last++] = OString('\'') + aExpandedExtensionPath + OString('\''); // ExtensionId - rtl::OString aPureExtensionId; + OString aPureExtensionId; sal_Int32 iSlash = aPath.indexOf( '/' ); if( iSlash != -1 ) aPureExtensionId = aPath.copy( 0, iSlash ); parString[last++] = "ExtensionId"; - parString[last++] = rtl::OString('\'') + aPureExtensionId + rtl::OString('\''); + parString[last++] = OString('\'') + aPureExtensionId + OString('\''); } for( int i = 0; i < last; ++i ) parameter[i] = parString[i].getStr(); parameter[last] = 0; - rtl::OUString xslURL = pDatabases->getInstallPathAsURL(); + OUString xslURL = pDatabases->getInstallPathAsURL(); - rtl::OString xslURLascii( + OString xslURLascii( xslURL.getStr(), xslURL.getLength(), RTL_TEXTENCODING_UTF8); diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx index 2e7ba31e1463..fa57a89c0365 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx @@ -44,27 +44,27 @@ namespace chelp { } - rtl::OUString getHash() + OUString getHash() { if( m_ptr ) { sal_Int32 sizeOfFile = ( sal_Int32 ) m_ptr[0]; - rtl::OUString Hash( m_ptr+1,sizeOfFile,RTL_TEXTENCODING_UTF8 ); + OUString Hash( m_ptr+1,sizeOfFile,RTL_TEXTENCODING_UTF8 ); sal_Int32 idx; if( ( idx = Hash.indexOf( sal_Unicode( '#' ) ) ) != -1 ) return Hash.copy( 1+idx ); } - return rtl::OUString(); + return OUString(); } - rtl::OUString getFile() + OUString getFile() { if( ! m_ptr ) - return rtl::OUString(); + return OUString(); sal_Int32 sizeOfFile = ( sal_Int32 ) m_ptr[0]; - rtl::OUString File( m_ptr+1,sizeOfFile,RTL_TEXTENCODING_UTF8 ); + OUString File( m_ptr+1,sizeOfFile,RTL_TEXTENCODING_UTF8 ); sal_Int32 idx; if( ( idx = File.indexOf( sal_Unicode( '#' ) ) ) != -1 ) return File.copy( 0,idx ); @@ -73,24 +73,24 @@ namespace chelp { } - rtl::OUString getDatabase() + OUString getDatabase() { if( ! m_ptr ) - return rtl::OUString(); + return OUString(); sal_Int32 sizeOfDatabase = ( int ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ]; - return rtl::OUString( m_ptr + 2 + ( sal_Int32 ) m_ptr[0],sizeOfDatabase,RTL_TEXTENCODING_UTF8 ); + return OUString( m_ptr + 2 + ( sal_Int32 ) m_ptr[0],sizeOfDatabase,RTL_TEXTENCODING_UTF8 ); } - rtl::OUString getTitle() + OUString getTitle() { if( ! m_ptr ) - return rtl::OUString(); + return OUString(); sal_Int32 sizeOfTitle = ( sal_Int32 ) m_ptr[ 2 + m_ptr[0] + ( sal_Int32 ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ] ]; - return rtl::OUString( m_ptr + 3 + m_ptr[0] + ( sal_Int32 ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ], + return OUString( m_ptr + 3 + m_ptr[0] + ( sal_Int32 ) m_ptr[ 1+ ( sal_Int32 ) m_ptr[0] ], sizeOfTitle, RTL_TEXTENCODING_UTF8 ); } @@ -109,7 +109,7 @@ namespace chelp { { public: - URLParameter( const rtl::OUString& aURL, + URLParameter( const OUString& aURL, Databases* pDatabases ) throw( com::sun::star::ucb::IllegalIdentifierException ); @@ -122,27 +122,27 @@ namespace chelp { bool isRoot() const { return m_aModule.isEmpty(); } bool isErrorDocument(); - rtl::OUString get_url() const { return m_aURL; } + OUString get_url() const { return m_aURL; } - rtl::OUString get_id(); + OUString get_id(); - rtl::OUString get_tag(); + OUString get_tag(); // Not called for an directory - rtl::OUString get_path() { return get_the_path(); } + OUString get_path() { return get_the_path(); } - rtl::OUString get_eid() const { return m_aEid; } + OUString get_eid() const { return m_aEid; } - rtl::OUString get_title(); + OUString get_title(); - rtl::OUString get_jar() { return get_the_jar(); } + OUString get_jar() { return get_the_jar(); } - rtl::OUString get_ExtensionRegistryPath() const { return m_aExtensionRegistryPath; } + OUString get_ExtensionRegistryPath() const { return m_aExtensionRegistryPath; } - rtl::OUString get_module() const { return m_aModule; } + OUString get_module() const { return m_aModule; } - rtl::OUString get_dbpar() const + OUString get_dbpar() const { if( !m_aDbPar.isEmpty() ) return m_aDbPar; @@ -150,23 +150,23 @@ namespace chelp { return m_aModule; } - rtl::OUString get_prefix() const { return m_aPrefix; } + OUString get_prefix() const { return m_aPrefix; } - rtl::OUString get_language(); + OUString get_language(); - rtl::OUString get_device() const { return m_aDevice; } + OUString get_device() const { return m_aDevice; } - rtl::OUString get_program(); + OUString get_program(); - rtl::OUString get_query() const { return m_aQuery; } + OUString get_query() const { return m_aQuery; } - rtl::OUString get_scope() const { return m_aScope; } + OUString get_scope() const { return m_aScope; } - rtl::OUString get_system() const { return m_aSystem; } + OUString get_system() const { return m_aSystem; } sal_Int32 get_hitCount() const { return m_nHitCount; } - rtl::OString getByName( const char* par ); + OString getByName( const char* par ); void open( const com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, @@ -186,31 +186,31 @@ namespace chelp { bool m_bStart; bool m_bUseDB; - rtl::OUString m_aURL; + OUString m_aURL; - rtl::OUString m_aTag; - rtl::OUString m_aId; - rtl::OUString m_aPath; - rtl::OUString m_aModule; - rtl::OUString m_aTitle; - rtl::OUString m_aJar; - rtl::OUString m_aExtensionRegistryPath; - rtl::OUString m_aEid; - rtl::OUString m_aDbPar; + OUString m_aTag; + OUString m_aId; + OUString m_aPath; + OUString m_aModule; + OUString m_aTitle; + OUString m_aJar; + OUString m_aExtensionRegistryPath; + OUString m_aEid; + OUString m_aDbPar; - rtl::OUString m_aDefaultLanguage; - rtl::OUString m_aLanguage; + OUString m_aDefaultLanguage; + OUString m_aLanguage; - rtl::OUString m_aPrefix; - rtl::OUString m_aDevice; - rtl::OUString m_aProgram; - rtl::OUString m_aSystem; - rtl::OUString m_aActive; + OUString m_aPrefix; + OUString m_aDevice; + OUString m_aProgram; + OUString m_aSystem; + OUString m_aActive; - rtl::OUString m_aQuery; - rtl::OUString m_aScope; + OUString m_aQuery; + OUString m_aScope; - rtl::OUString m_aExpr; + OUString m_aExpr; sal_Int32 m_nHitCount; // The default maximum hitcount @@ -219,13 +219,13 @@ namespace chelp { void init( bool bDefaultLanguageIsInitialized ); - rtl::OUString get_the_tag(); + OUString get_the_tag(); - rtl::OUString get_the_path(); + OUString get_the_path(); - rtl::OUString get_the_title(); + OUString get_the_title(); - rtl::OUString get_the_jar(); + OUString get_the_jar(); void readHelpDataFile(); diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx index aa927650ef27..e2ee86611c09 100644 --- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx +++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx @@ -43,7 +43,7 @@ extern RandomAccessStream* theFile(); void print_rtl_OUString( const OUString bla ) { - rtl::OString bluber = rtl::OString( bla.getStr(),bla.getLength(),RTL_TEXTENCODING_UTF8 ); + OString bluber = OString( bla.getStr(),bla.getLength(),RTL_TEXTENCODING_UTF8 ); char* bluberChr = new char[ 1+bluber.getLength() ]; const sal_Char* jux = bluber.getStr(); diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index ee443f786b7a..d6dddaf05564 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -96,7 +96,7 @@ XTYPEPROVIDER_IMPL_3( TVFactory, // XServiceInfo methods. -rtl::OUString SAL_CALL +OUString SAL_CALL TVFactory::getImplementationName() throw( RuntimeException ) { @@ -106,7 +106,7 @@ TVFactory::getImplementationName() sal_Bool SAL_CALL TVFactory::supportsService( - const rtl::OUString& ServiceName ) + const OUString& ServiceName ) throw( RuntimeException ) { return @@ -115,7 +115,7 @@ TVFactory::supportsService( } -Sequence< rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL TVFactory::getSupportedServiceNames( void ) throw( RuntimeException ) { @@ -128,15 +128,15 @@ TVFactory::getSupportedServiceNames( void ) Reference< XInterface > SAL_CALL TVFactory::createInstance( - const rtl::OUString& aServiceSpecifier ) + const OUString& aServiceSpecifier ) throw( Exception, RuntimeException ) { Any aAny; - aAny <<= rtl::OUString(); + aAny <<= OUString(); Sequence< Any > seq( 1 ); seq[0] <<= PropertyValue( - rtl::OUString( "nodepath" ), + OUString( "nodepath" ), -1, aAny, PropertyState_DIRECT_VALUE ); @@ -148,7 +148,7 @@ TVFactory::createInstance( Reference< XInterface > SAL_CALL TVFactory::createInstanceWithArguments( - const rtl::OUString& ServiceSpecifier, + const OUString& ServiceSpecifier, const Sequence< Any >& Arguments ) throw( Exception, RuntimeException ) @@ -163,7 +163,7 @@ TVFactory::createInstanceWithArguments( Reference< XInterface > ret = m_xHDS; - rtl::OUString hierview; + OUString hierview; for( int i = 0; i < Arguments.getLength(); ++i ) { PropertyValue pV; @@ -192,12 +192,12 @@ TVFactory::createInstanceWithArguments( } -Sequence< rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL TVFactory::getAvailableServiceNames( ) throw( RuntimeException ) { - Sequence< rtl::OUString > seq( 1 ); - seq[0] = rtl::OUString( "com.sun.star.ucb.HierarchyDataReadAccess" ); + Sequence< OUString > seq( 1 ); + seq[0] = OUString( "com.sun.star.ucb.HierarchyDataReadAccess" ); return seq; } @@ -206,19 +206,19 @@ TVFactory::getAvailableServiceNames( ) // static -rtl::OUString SAL_CALL +OUString SAL_CALL TVFactory::getImplementationName_static() { - return rtl::OUString( "com.sun.star.help.TreeViewImpl" ); + return OUString( "com.sun.star.help.TreeViewImpl" ); } -Sequence< rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL TVFactory::getSupportedServiceNames_static() { - Sequence< rtl::OUString > seq( 2 ); - seq[0] = rtl::OUString( "com.sun.star.help.TreeView" ); - seq[1] = rtl::OUString( "com.sun.star.ucb.HiearchyDataSource" ); + Sequence< OUString > seq( 2 ); + seq[0] = OUString( "com.sun.star.help.TreeView" ); + seq[1] = OUString( "com.sun.star.ucb.HiearchyDataSource" ); return seq; } diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 9d926b107f8f..83ebfd7ca012 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -97,40 +97,40 @@ namespace treeview { void setApplication( const char* appl ) { - application = rtl::OUString( (sal_Char*)(appl), + application = OUString( (sal_Char*)(appl), strlen( appl ), RTL_TEXTENCODING_UTF8 ); } void setTitle( const char* itle ) { - title += rtl::OUString( (sal_Char*)(itle), + title += OUString( (sal_Char*)(itle), strlen( itle ), RTL_TEXTENCODING_UTF8 ); } void setTitle( const XML_Char* itle,int len ) { - title += rtl::OUString( (sal_Char*)(itle), + title += OUString( (sal_Char*)(itle), len, RTL_TEXTENCODING_UTF8 ); } void setId( const char* d ) { - id = rtl::OUString( (sal_Char*)(d), + id = OUString( (sal_Char*)(d), strlen( d ), RTL_TEXTENCODING_UTF8 ); } void setAnchor( const char* nchor ) { - anchor = rtl::OUString( (sal_Char*)(nchor), + anchor = OUString( (sal_Char*)(nchor), strlen( nchor ), RTL_TEXTENCODING_UTF8 ); } - rtl::OUString getTargetURL() + OUString getTargetURL() { if( targetURL.isEmpty() ) { @@ -142,7 +142,7 @@ namespace treeview { break; } - rtl::OUStringBuffer strBuff( 22 + len + id.getLength() ); + OUStringBuffer strBuff( 22 + len + id.getLength() ); strBuff.appendAscii( "vnd.sun.star.help://" ).append(id); @@ -156,11 +156,11 @@ namespace treeview { private: Kind kind; - rtl::OUString application; - rtl::OUString title; - rtl::OUString id; - rtl::OUString anchor; - rtl::OUString targetURL; + OUString application; + OUString title; + OUString id; + OUString anchor; + OUString targetURL; TVDom *parent; std::vector< TVDom* > children; @@ -191,11 +191,11 @@ ConfigData::ConfigData() { } -void SAL_CALL ConfigData::replaceName( rtl::OUString& oustring ) const +void SAL_CALL ConfigData::replaceName( OUString& oustring ) const { sal_Int32 idx = -1,k = 0,off; bool cap = false; - rtl::OUStringBuffer aStrBuf( 0 ); + OUStringBuffer aStrBuf( 0 ); while( ( idx = oustring.indexOf( sal_Unicode('%'),++idx ) ) != -1 ) { @@ -306,7 +306,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom ) { TargetURL = ( tvDom->getTargetURL() + configData.appendix ); if( !tvDom->anchor.isEmpty() ) - TargetURL += ( rtl::OUString( "#" ) + + TargetURL += ( OUString( "#" ) + tvDom->anchor ); } else @@ -327,7 +327,7 @@ TVRead::~TVRead() // XNameAccess Any SAL_CALL -TVRead::getByName( const rtl::OUString& aName ) +TVRead::getByName( const OUString& aName ) throw( NoSuchElementException, WrappedTargetException, RuntimeException ) @@ -355,15 +355,15 @@ TVRead::getByName( const rtl::OUString& aName ) -Sequence< rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL TVRead::getElementNames( ) throw( RuntimeException ) { - Sequence< rtl::OUString > seq( 3 ); + Sequence< OUString > seq( 3 ); - seq[0] = rtl::OUString( "Title" ); - seq[1] = rtl::OUString( "TargetURL" ); - seq[2] = rtl::OUString( "Children" ); + seq[0] = OUString( "Title" ); + seq[1] = OUString( "TargetURL" ); + seq[2] = OUString( "Children" ); return seq; } @@ -371,7 +371,7 @@ TVRead::getElementNames( ) sal_Bool SAL_CALL -TVRead::hasByName( const rtl::OUString& aName ) +TVRead::hasByName( const OUString& aName ) throw( RuntimeException ) { if( aName.compareToAscii( "Title" ) == 0 || @@ -386,12 +386,12 @@ TVRead::hasByName( const rtl::OUString& aName ) // XHierarchicalNameAccess Any SAL_CALL -TVRead::getByHierarchicalName( const rtl::OUString& aName ) +TVRead::getByHierarchicalName( const OUString& aName ) throw( NoSuchElementException, RuntimeException ) { sal_Int32 idx; - rtl::OUString name( aName ); + OUString name( aName ); if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 && name.copy( 0,idx ).compareToAscii( "Children" ) == 0 ) @@ -404,11 +404,11 @@ TVRead::getByHierarchicalName( const rtl::OUString& aName ) sal_Bool SAL_CALL -TVRead::hasByHierarchicalName( const rtl::OUString& aName ) +TVRead::hasByHierarchicalName( const OUString& aName ) throw( RuntimeException ) { sal_Int32 idx; - rtl::OUString name( aName ); + OUString name( aName ); if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 && name.copy( 0,idx ).compareToAscii( "Children" ) == 0 ) @@ -613,12 +613,12 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom) } Any SAL_CALL -TVChildTarget::getByName( const rtl::OUString& aName ) +TVChildTarget::getByName( const OUString& aName ) throw( NoSuchElementException, WrappedTargetException, RuntimeException ) { - rtl::OUString num( aName.getStr()+2,aName.getLength()-4 ); + OUString num( aName.getStr()+2,aName.getLength()-4 ); sal_Int32 idx = num.toInt32() - 1; if( idx < 0 || Elements.size() <= sal_uInt32( idx ) ) throw NoSuchElementException(); @@ -632,13 +632,13 @@ TVChildTarget::getByName( const rtl::OUString& aName ) -Sequence< rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL TVChildTarget::getElementNames( ) throw( RuntimeException ) { - Sequence< rtl::OUString > seq( Elements.size() ); + Sequence< OUString > seq( Elements.size() ); for( unsigned i = 0; i < Elements.size(); ++i ) - seq[i] = rtl::OUString::valueOf( sal_Int32( 1+i ) ); + seq[i] = OUString::valueOf( sal_Int32( 1+i ) ); return seq; } @@ -646,10 +646,10 @@ TVChildTarget::getElementNames( ) sal_Bool SAL_CALL -TVChildTarget::hasByName( const rtl::OUString& aName ) +TVChildTarget::hasByName( const OUString& aName ) throw( RuntimeException ) { - rtl::OUString num( aName.getStr()+2,aName.getLength()-4 ); + OUString num( aName.getStr()+2,aName.getLength()-4 ); sal_Int32 idx = num.toInt32() - 1; if( idx < 0 || Elements.size() <= sal_uInt32( idx ) ) return false; @@ -662,16 +662,16 @@ TVChildTarget::hasByName( const rtl::OUString& aName ) // XHierarchicalNameAccess Any SAL_CALL -TVChildTarget::getByHierarchicalName( const rtl::OUString& aName ) +TVChildTarget::getByHierarchicalName( const OUString& aName ) throw( NoSuchElementException, RuntimeException ) { sal_Int32 idx; - rtl::OUString name( aName ); + OUString name( aName ); if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 ) { - rtl::OUString num( name.getStr()+2,idx-4 ); + OUString num( name.getStr()+2,idx-4 ); sal_Int32 pref = num.toInt32() - 1; if( pref < 0 || Elements.size() <= sal_uInt32( pref ) ) @@ -686,15 +686,15 @@ TVChildTarget::getByHierarchicalName( const rtl::OUString& aName ) sal_Bool SAL_CALL -TVChildTarget::hasByHierarchicalName( const rtl::OUString& aName ) +TVChildTarget::hasByHierarchicalName( const OUString& aName ) throw( RuntimeException ) { sal_Int32 idx; - rtl::OUString name( aName ); + OUString name( aName ); if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 ) { - rtl::OUString num( name.getStr()+2,idx-4 ); + OUString num( name.getStr()+2,idx-4 ); sal_Int32 pref = num.toInt32() - 1; if( pref < 0 || Elements.size() <= sal_uInt32( pref ) ) return false; @@ -721,12 +721,12 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) Reference< XHierarchicalNameAccess > xHierAccess( getHierAccess( sProvider, "org.openoffice.Office.Common" ) ); - rtl::OUString system( getKey( xHierAccess,"Help/System" ) ); + OUString system( getKey( xHierAccess,"Help/System" ) ); sal_Bool showBasic( getBooleanKey(xHierAccess,"Help/ShowBasic") ); - rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) ); + OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) ); if( instPath.isEmpty() ) // try to determine path from default - instPath = rtl::OUString( "$(instpath)/help" ); + instPath = OUString( "$(instpath)/help" ); // replace anything like $(instpath); subst( xSMgr,instPath ); @@ -738,8 +738,8 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" ); - rtl::OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) ); - rtl::OUString setupextension; + OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) ); + OUString setupextension; try { @@ -747,17 +747,17 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) uno::Sequence < uno::Any > lParams(1); beans::PropertyValue aParam ; - aParam.Name = ::rtl::OUString("nodepath"); - aParam.Value <<= ::rtl::OUString("/org.openoffice.Setup/Product"); + aParam.Name = OUString("nodepath"); + aParam.Value <<= OUString("/org.openoffice.Setup/Product"); lParams[0] = uno::makeAny(aParam); // open it uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"), + OUString("com.sun.star.configuration.ConfigurationAccess"), lParams) ); uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY); - uno::Any aRet = xDirectAccess->getByName(::rtl::OUString("ooSetupExtension")); + uno::Any aRet = xDirectAccess->getByName(OUString("ooSetupExtension")); aRet >>= setupextension; } @@ -765,19 +765,19 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) { } - rtl::OUString productVersion( setupversion + - rtl::OUString( " " ) + + OUString productVersion( setupversion + + OUString( " " ) + setupextension ); - rtl::OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) ); + OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) ); // Determine fileurl from url and locale - rtl::OUString url; + OUString url; osl::FileBase::RC errFile = osl::FileBase::getFileURLFromSystemPath( instPath,url ); if( errFile != osl::FileBase::E_None ) return configData; if( url.lastIndexOf( sal_Unicode( '/' ) ) != url.getLength() - 1 ) - url += rtl::OUString( "/" ); - rtl::OUString ret; + url += OUString( "/" ); + OUString ret; sal_Int32 idx; osl::DirectoryItem aDirItem; if( osl::FileBase::E_None == osl::DirectoryItem::get( url + locale,aDirItem ) ) @@ -789,8 +789,8 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) ret = locale.copy( 0,idx ); else { - locale = rtl::OUString( "en-US" ); - ret = rtl::OUString("en"); + locale = OUString( "en-US" ); + ret = OUString("en"); } url = url + ret; @@ -798,7 +798,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) // Start with extensions to set them at the end of the list TreeFileIterator aTreeIt( locale ); - rtl::OUString aTreeFile; + OUString aTreeFile; sal_Int32 nFileSize; while( !(aTreeFile = aTreeIt.nextTreeFile( nFileSize ) ).isEmpty() ) { @@ -811,7 +811,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) if( osl::Directory::E_None == aDirectory.open() ) { int idx_ = 0; - rtl::OUString aFileUrl, aFileName; + OUString aFileUrl, aFileName; while( aDirectory.getNextItem( aDirItem ) == osl::FileBase::E_None && aDirItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None && aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) && @@ -834,7 +834,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) OSL_ENSURE( aFileStatus.isValid( osl_FileStatus_Mask_FileSize ), "invalid file size" ); - rtl::OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase(); + OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase(); if(! showBasic && baseName.compareToAscii("sbasic") == 0 ) continue; osl::File aFile( aFileUrl ); @@ -863,11 +863,11 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) configData.system = system; configData.locale = locale; configData.appendix = - rtl::OUString( "?Language=" ) + + OUString( "?Language=" ) + configData.locale + - rtl::OUString( "&System=" ) + + OUString( "&System=" ) + configData.system + - rtl::OUString( "&UseDB=no" ) ; + OUString( "&UseDB=no" ) ; return configData; } @@ -910,10 +910,10 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider if( sProvider.is() ) { Sequence< Any > seq(1); - rtl::OUString sReaderService = - rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" ); + OUString sReaderService = + OUString( "com.sun.star.configuration.ConfigurationAccess" ); - seq[0] <<= rtl::OUString::createFromAscii( file ); + seq[0] <<= OUString::createFromAscii( file ); try { @@ -932,18 +932,18 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider -rtl::OUString +OUString TVChildTarget::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess, const char* key ) const { - rtl::OUString instPath; + OUString instPath; if( xHierAccess.is() ) { Any aAny; try { aAny = - xHierAccess->getByHierarchicalName( rtl::OUString::createFromAscii( key ) ); + xHierAccess->getByHierarchicalName( OUString::createFromAscii( key ) ); } catch( const com::sun::star::container::NoSuchElementException& ) { @@ -967,7 +967,7 @@ TVChildTarget::getBooleanKey(const Reference< { aAny = xHierAccess->getByHierarchicalName( - rtl::OUString::createFromAscii(key)); + OUString::createFromAscii(key)); } catch( const com::sun::star::container::NoSuchElementException& ) { @@ -979,7 +979,7 @@ TVChildTarget::getBooleanKey(const Reference< void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr, - rtl::OUString& instpath ) const + OUString& instpath ) const { Reference< XConfigManager > xCfgMgr; if( m_xSMgr.is() ) @@ -988,7 +988,7 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr, { xCfgMgr = Reference< XConfigManager >( - m_xSMgr->createInstance( rtl::OUString( "com.sun.star.config.SpecialConfigManager" ) ), + m_xSMgr->createInstance( OUString( "com.sun.star.config.SpecialConfigManager" ) ), UNO_QUERY ); } catch( const com::sun::star::uno::Exception& ) @@ -1007,11 +1007,11 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr, //=================================================================== // class ExtensionIteratorBase -static rtl::OUString aSlash("/"); -static rtl::OUString aHelpFilesBaseName("help"); -static rtl::OUString aHelpMediaType("application/vnd.sun.star.help"); +static OUString aSlash("/"); +static OUString aHelpFilesBaseName("help"); +static OUString aHelpMediaType("application/vnd.sun.star.help"); -ExtensionIteratorBase::ExtensionIteratorBase( const rtl::OUString& aLanguage ) +ExtensionIteratorBase::ExtensionIteratorBase( const OUString& aLanguage ) : m_eState( USER_EXTENSIONS ) , m_aLanguage( aLanguage ) { @@ -1024,7 +1024,7 @@ void ExtensionIteratorBase::init() if( !m_xContext.is() ) { throw RuntimeException( - ::rtl::OUString( "ExtensionIteratorBase::init(), no XComponentContext" ), + OUString( "ExtensionIteratorBase::init(), no XComponentContext" ), Reference< XInterface >() ); } @@ -1070,7 +1070,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP { const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ]; const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xSubPkg->getPackageType(); - rtl::OUString aMediaType = xPackageTypeInfo->getMediaType(); + OUString aMediaType = xPackageTypeInfo->getMediaType(); if( aMediaType.equals( aHelpMediaType ) ) { xHelpPackage = xSubPkg; @@ -1082,7 +1082,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetHelpPackageFromP else { const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType(); - rtl::OUString aMediaType = xPackageTypeInfo->getMediaType(); + OUString aMediaType = xPackageTypeInfo->getMediaType(); if( aMediaType.equals( aHelpMediaType ) ) xHelpPackage = xPackage; } @@ -1098,7 +1098,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack if( !m_bUserPackagesLoaded ) { Reference< XPackageManager > xUserManager = - thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString("user") ); + thePackageManagerFactory::get( m_xContext )->getPackageManager( OUString("user") ); m_aUserPackagesSeq = xUserManager->getDeployedPackages ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); @@ -1128,7 +1128,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa if( !m_bSharedPackagesLoaded ) { Reference< XPackageManager > xSharedManager = - thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString("shared") ); + thePackageManagerFactory::get( m_xContext )->getPackageManager( OUString("shared") ); m_aSharedPackagesSeq = xSharedManager->getDeployedPackages ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); @@ -1158,7 +1158,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP if( !m_bBundledPackagesLoaded ) { Reference< XPackageManager > xBundledManager = - thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString("bundled") ); + thePackageManagerFactory::get( m_xContext )->getPackageManager( OUString("bundled") ); m_aBundledPackagesSeq = xBundledManager->getDeployedPackages ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); @@ -1185,24 +1185,24 @@ inline bool isLetter( sal_Unicode c ) return comphelper::string::isalphaAscii(c); } -void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv, +void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ) { rv.clear(); - rtl::OUString aExtensionPath = xPackage->getURL(); - Sequence< rtl::OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true ); + OUString aExtensionPath = xPackage->getURL(); + Sequence< OUString > aEntrySeq = m_xSFA->getFolderContents( aExtensionPath, true ); - const rtl::OUString* pSeq = aEntrySeq.getConstArray(); + const OUString* pSeq = aEntrySeq.getConstArray(); sal_Int32 nCount = aEntrySeq.getLength(); for( sal_Int32 i = 0 ; i < nCount ; ++i ) { - rtl::OUString aEntry = pSeq[i]; + OUString aEntry = pSeq[i]; if( m_xSFA->isFolder( aEntry ) ) { sal_Int32 nLastSlash = aEntry.lastIndexOf( '/' ); if( nLastSlash != -1 ) { - rtl::OUString aPureEntry = aEntry.copy( nLastSlash + 1 ); + OUString aPureEntry = aEntry.copy( nLastSlash + 1 ); // Check language sceme int nLen = aPureEntry.getLength(); @@ -1221,9 +1221,9 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::r //=================================================================== // class TreeFileIterator -rtl::OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize ) +OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize ) { - rtl::OUString aRetFile; + OUString aRetFile; while( aRetFile.isEmpty() && m_eState != END_REACHED ) { @@ -1270,7 +1270,7 @@ rtl::OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize ) return aRetFile; } -rtl::OUString TreeFileIterator::expandURL( const rtl::OUString& aURL ) +OUString TreeFileIterator::expandURL( const OUString& aURL ) { static Reference< util::XMacroExpander > xMacroExpander; static Reference< uri::XUriReferenceFactory > xFac; @@ -1284,7 +1284,7 @@ rtl::OUString TreeFileIterator::expandURL( const rtl::OUString& aURL ) xMacroExpander = util::theMacroExpander::get(m_xContext); } - rtl::OUString aRetURL = aURL; + OUString aRetURL = aURL; Reference< uri::XUriReference > uriRef; for (;;) { @@ -1301,14 +1301,14 @@ rtl::OUString TreeFileIterator::expandURL( const rtl::OUString& aURL ) return aRetURL; } -rtl::OUString TreeFileIterator::implGetTreeFileFromPackage +OUString TreeFileIterator::implGetTreeFileFromPackage ( sal_Int32& rnFileSize, Reference< deployment::XPackage > xPackage ) { - rtl::OUString aRetFile; - rtl::OUString aLanguage = m_aLanguage; + OUString aRetFile; + OUString aLanguage = m_aLanguage; for( sal_Int32 iPass = 0 ; iPass < 2 ; ++iPass ) { - rtl::OUStringBuffer aStrBuf; + OUStringBuffer aStrBuf; aStrBuf.append( xPackage->getURL() ); aStrBuf.append( aSlash ); aStrBuf.append( aLanguage ); @@ -1322,9 +1322,9 @@ rtl::OUString TreeFileIterator::implGetTreeFileFromPackage if( m_xSFA->exists( aRetFile ) ) break; - ::std::vector< ::rtl::OUString > av; + ::std::vector< OUString > av; implGetLanguageVectorFromPackage( av, xPackage ); - ::std::vector< ::rtl::OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage ); + ::std::vector< OUString >::const_iterator pFound = LanguageTag::getFallback( av, m_aLanguage ); if( pFound != av.end() ) aLanguage = *pFound; } @@ -1334,7 +1334,7 @@ rtl::OUString TreeFileIterator::implGetTreeFileFromPackage if( m_xSFA->exists( aRetFile ) ) rnFileSize = m_xSFA->getSize( aRetFile ); else - aRetFile = rtl::OUString(); + aRetFile = OUString(); return aRetFile; } diff --git a/xmlhelp/source/treeview/tvread.hxx b/xmlhelp/source/treeview/tvread.hxx index bc8f52091ae6..1a9649b8edb0 100644 --- a/xmlhelp/source/treeview/tvread.hxx +++ b/xmlhelp/source/treeview/tvread.hxx @@ -47,15 +47,15 @@ namespace treeview { VENDORSHORT }; ConfigData(); int m_vAdd[5]; - rtl::OUString m_vReplacement[5]; - rtl::OUString prodName,prodVersion,vendName,vendVersion,vendShort; + OUString m_vReplacement[5]; + OUString prodName,prodVersion,vendName,vendVersion,vendShort; std::vector< sal_uInt64 > vFileLen; - std::vector< rtl::OUString > vFileURL; - rtl::OUString locale,system; - rtl::OUString appendix; + std::vector< OUString > vFileURL; + OUString locale,system; + OUString appendix; - void SAL_CALL replaceName( rtl::OUString& oustring ) const; + void SAL_CALL replaceName( OUString& oustring ) const; }; @@ -162,29 +162,29 @@ namespace treeview { // XNameAccess virtual com::sun::star::uno::Any SAL_CALL - getByName( const rtl::OUString& aName ) + getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException) = 0; - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException ) = 0; virtual sal_Bool SAL_CALL - hasByName( const rtl::OUString& aName ) + hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ) = 0; // XHierarchicalNameAccess virtual com::sun::star::uno::Any SAL_CALL - getByHierarchicalName( const rtl::OUString& aName ) + getByHierarchicalName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::uno::RuntimeException ) = 0; virtual sal_Bool SAL_CALL - hasByHierarchicalName( const rtl::OUString& aName ) + hasByHierarchicalName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ) = 0; }; // end class TVBase @@ -206,36 +206,36 @@ namespace treeview { // XNameAccess virtual com::sun::star::uno::Any SAL_CALL - getByName( const rtl::OUString& aName ) + getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByName( const rtl::OUString& aName ) + hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); // XHierarchicalNameAccess virtual com::sun::star::uno::Any SAL_CALL - getByHierarchicalName( const rtl::OUString& aName ) + getByHierarchicalName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByHierarchicalName( const rtl::OUString& aName ) + hasByHierarchicalName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); private: - rtl::OUString Title; - rtl::OUString TargetURL; + OUString Title; + OUString TargetURL; rtl::Reference< TVChildTarget > Children; }; // end class TVRead @@ -257,29 +257,29 @@ namespace treeview { ~TVChildTarget(); virtual com::sun::star::uno::Any SAL_CALL - getByName( const rtl::OUString& aName ) + getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByName( const rtl::OUString& aName ) + hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); // XHierarchicalNameAccess virtual com::sun::star::uno::Any SAL_CALL - getByHierarchicalName( const rtl::OUString& aName ) + getByHierarchicalName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - hasByHierarchicalName( const rtl::OUString& aName ) + hasByHierarchicalName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); @@ -297,7 +297,7 @@ namespace treeview { getHierAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxProvider, const char* file ) const; - ::rtl::OUString + OUString getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, const char* key ) const; @@ -308,7 +308,7 @@ namespace treeview { void subst( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSgr, - rtl::OUString& instpath ) const; + OUString& instpath ) const; bool SearchAndInsert(TVDom* p, TVDom* tvDom); @@ -328,7 +328,7 @@ namespace treeview { class ExtensionIteratorBase { public: - ExtensionIteratorBase( const rtl::OUString& aLanguage ); + ExtensionIteratorBase( const OUString& aLanguage ); void init( void ); private: @@ -344,7 +344,7 @@ namespace treeview { com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextBundledHelpPackage ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); - void implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv, + void implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); osl::Mutex m_aMutex; @@ -352,7 +352,7 @@ namespace treeview { com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA; IteratorState m_eState; - rtl::OUString m_aLanguage; + OUString m_aLanguage; com::sun::star::uno::Sequence< com::sun::star::uno::Reference < com::sun::star::deployment::XPackage > > m_aUserPackagesSeq; @@ -377,15 +377,15 @@ namespace treeview { class TreeFileIterator : public ExtensionIteratorBase { public: - TreeFileIterator( const rtl::OUString& aLanguage ) + TreeFileIterator( const OUString& aLanguage ) : ExtensionIteratorBase( aLanguage ) {} - rtl::OUString nextTreeFile( sal_Int32& rnFileSize ); + OUString nextTreeFile( sal_Int32& rnFileSize ); private: - rtl::OUString expandURL( const rtl::OUString& aURL ); - rtl::OUString implGetTreeFileFromPackage( sal_Int32& rnFileSize, + OUString expandURL( const OUString& aURL ); + OUString implGetTreeFileFromPackage( sal_Int32& rnFileSize, com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); }; // end class TreeFileIterator diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx index acd276dba74b..f8aef32d5a79 100644 --- a/xmloff/inc/AttributeContainerHandler.hxx +++ b/xmloff/inc/AttributeContainerHandler.hxx @@ -32,8 +32,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_ATTRIBUTECONTAINERHANDLER_HXX diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx index 8d473c104cb8..5ec4ed355359 100644 --- a/xmloff/inc/DomBuilderContext.hxx +++ b/xmloff/inc/DomBuilderContext.hxx @@ -54,12 +54,12 @@ public: /** default constructor: create new DOM tree */ DomBuilderContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); /** constructor: create DOM subtree under the given node */ DomBuilderContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, com::sun::star::uno::Reference& ); virtual ~DomBuilderContext(); @@ -79,7 +79,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ); virtual void StartElement( @@ -87,7 +87,7 @@ public: virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif diff --git a/xmloff/inc/EnhancedCustomShapeToken.hxx b/xmloff/inc/EnhancedCustomShapeToken.hxx index 42d95abca597..573bd917e993 100644 --- a/xmloff/inc/EnhancedCustomShapeToken.hxx +++ b/xmloff/inc/EnhancedCustomShapeToken.hxx @@ -152,8 +152,8 @@ namespace xmloff { namespace EnhancedCustomShapeToken { EAS_NotFound }; - EnhancedCustomShapeTokenEnum EASGet( const rtl::OUString& ); - rtl::OUString EASGet( const EnhancedCustomShapeTokenEnum ); + EnhancedCustomShapeTokenEnum EASGet( const OUString& ); + OUString EASGet( const EnhancedCustomShapeTokenEnum ); } } diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx index 2d4881a0f01e..f9cd2af67982 100644 --- a/xmloff/inc/MetaExportComponent.hxx +++ b/xmloff/inc/MetaExportComponent.hxx @@ -56,11 +56,11 @@ protected: // global functions to support the component -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLMetaExportComponent_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLMetaExportComponent_getImplementationName() +OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx index 27568e9cf19f..42b53aed3fe5 100644 --- a/xmloff/inc/MetaImportComponent.hxx +++ b/xmloff/inc/MetaImportComponent.hxx @@ -46,7 +46,7 @@ protected: virtual SvXMLImportContext* CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -58,11 +58,11 @@ protected: // global functions to support the component -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLMetaImportComponent_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLMetaImportComponent_getImplementationName() +OUString SAL_CALL XMLMetaImportComponent_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx index b1f115aa48e1..452ff19939a1 100644 --- a/xmloff/inc/MultiPropertySetHelper.hxx +++ b/xmloff/inc/MultiPropertySetHelper.hxx @@ -55,14 +55,14 @@ namespace com { namespace sun { namespace star { class MultiPropertySetHelper { /// names of all properties - ::rtl::OUString* pPropertyNames; + OUString* pPropertyNames; /// length of pPropertyNames array sal_Int16 nLength; /// the sequence of property names that the current (multi) /// property set implementation supports - ::com::sun::star::uno::Sequence< ::rtl::OUString > aPropertySequence; + ::com::sun::star::uno::Sequence< OUString > aPropertySequence; /// an array of indices that maps from pPropertyNames indices to /// aPropertySequence indices diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx index e22f48db789f..7cfc6142a93b 100644 --- a/xmloff/inc/PageMasterImportContext.hxx +++ b/xmloff/inc/PageMasterImportContext.hxx @@ -25,19 +25,19 @@ class PageStyleContext : public XMLPropStyleContext { - ::rtl::OUString sPageUsage; + OUString sPageUsage; protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_Bool bDefaultStyle=sal_False); @@ -45,7 +45,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void FillPropertySet( diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx index 1ba599433269..2dd144089e78 100644 --- a/xmloff/inc/RDFaExportHelper.hxx +++ b/xmloff/inc/RDFaExportHelper.hxx @@ -45,14 +45,14 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XDocumentRepository> m_xRepository; - typedef ::std::map< ::rtl::OUString, ::rtl::OUString > + typedef ::std::map< OUString, OUString > BlankNodeMap_t; BlankNodeMap_t m_BlankNodeMap; long m_Counter; - ::rtl::OUString + OUString LookupBlankNode( ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XBlankNode> const & i_xBlankNode); diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx index 3ebd96a5edb0..6d710aa97fe3 100644 --- a/xmloff/inc/RDFaImportHelper.hxx +++ b/xmloff/inc/RDFaImportHelper.hxx @@ -25,9 +25,7 @@ #include #include - - -namespace rtl { class OUString; } +#include namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } @@ -62,10 +60,10 @@ public: /** Parse RDFa attributes */ ::boost::shared_ptr ParseRDFa( - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype); + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype); /** Add a RDFa statement; must have been parsed with ParseRDFa */ void AddRDFa( @@ -77,10 +75,10 @@ public: void ParseAndAddRDFa( ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable> const & i_xObject, - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype); + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype); /** Insert all added statements into the RDF repository.

      This is done after the input file has been read, diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx index 46f63c9aa5af..a585eecb46f9 100644 --- a/xmloff/inc/SchXMLExport.hxx +++ b/xmloff/inc/SchXMLExport.hxx @@ -62,7 +62,7 @@ public: UniReference< XMLPropertySetMapper > GetPropertySetMapper() const; // XServiceInfo ( : SvXMLExport ) - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); }; #endif // SCH_XMLEXPORT_HXX_ diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx index ad9efe967d27..d1e7b85dc159 100644 --- a/xmloff/inc/SchXMLImport.hxx +++ b/xmloff/inc/SchXMLImport.hxx @@ -159,7 +159,7 @@ private: protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); public: @@ -171,9 +171,9 @@ public: virtual ~SchXMLImport() throw (); // XServiceInfo ( : SvXMLExport ) - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - SvXMLImportContext* CreateStylesContext( const ::rtl::OUString& rLocalName, + SvXMLImportContext* CreateStylesContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); // XImporter diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index 5195c5ce155d..f71b530a45f6 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -27,10 +27,10 @@ struct StyleNameKey_Impl { sal_uInt16 m_nFamily; - ::rtl::OUString m_aName; + OUString m_aName; inline StyleNameKey_Impl( sal_uInt16 nFamily, - const ::rtl::OUString& rName ) : + const OUString& rName ) : m_nFamily( nFamily ), m_aName( rName ) { @@ -64,7 +64,7 @@ inline bool StyleNameHash_Impl::operator()( class StyleMap : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XUnoTunnel>, - public ::boost::unordered_map< StyleNameKey_Impl, ::rtl::OUString, + public ::boost::unordered_map< StyleNameKey_Impl, OUString, StyleNameHash_Impl, StyleNameHash_Impl > { diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx index 075e81f31ce8..f991cc83089b 100644 --- a/xmloff/inc/TransGradientStyle.hxx +++ b/xmloff/inc/TransGradientStyle.hxx @@ -22,6 +22,7 @@ #include +#include class SvXMLImport; class SvXMLExport; @@ -30,7 +31,6 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } namespace uno { class Any; } } } } -namespace rtl { class OUString; } class XMLTransGradientStyleImport @@ -45,7 +45,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, - ::rtl::OUString& rStrName ); + OUString& rStrName ); }; class XMLTransGradientStyleExport @@ -56,7 +56,7 @@ public: XMLTransGradientStyleExport( SvXMLExport& rExport ); ~XMLTransGradientStyleExport(); - sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); + sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; #endif // _XMLOFF_TRANSGRADIENTSTYLE_HXX diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx index b391632805cc..1f84f6520ed0 100644 --- a/xmloff/inc/XMLBackgroundImageContext.hxx +++ b/xmloff/inc/XMLBackgroundImageContext.hxx @@ -34,8 +34,8 @@ class XMLBackgroundImageContext : public XMLElementPropertyContext XMLPropertyState aTransparencyProp; ::com::sun::star::style::GraphicLocation ePos; - ::rtl::OUString sURL; - ::rtl::OUString sFilter; + OUString sURL; + OUString sFilter; sal_Int8 nTransparency; ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream; @@ -51,7 +51,7 @@ public: XMLBackgroundImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const XMLPropertyState& rProp, @@ -63,7 +63,7 @@ public: virtual ~XMLBackgroundImageContext(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx index a87393a1b893..583d17c50a64 100644 --- a/xmloff/inc/XMLBackgroundImageExport.hxx +++ b/xmloff/inc/XMLBackgroundImageExport.hxx @@ -47,7 +47,7 @@ public: const ::com::sun::star::uno::Any *pFilter, const ::com::sun::star::uno::Any *pTransparency, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); }; diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx index 09013db7f19c..795b8d15d58c 100644 --- a/xmloff/inc/XMLBasicExportFilter.hxx +++ b/xmloff/inc/XMLBasicExportFilter.hxx @@ -46,16 +46,16 @@ public: throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) + virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx index 03fa669af6a7..afed18063218 100644 --- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx +++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx @@ -40,13 +40,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx index 6ab3a0f8a518..a42281ebbff5 100644 --- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx +++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx @@ -32,8 +32,8 @@ struct SvXMLEnumMapEntry; class XMLBitmapRepeatOffsetPropertyHandler: public XMLPropertyHandler { sal_Bool mbX; - ::rtl::OUString msVertical; - ::rtl::OUString msHorizontal; + OUString msVertical; + OUString msHorizontal; public: XMLBitmapRepeatOffsetPropertyHandler( sal_Bool bX ); @@ -43,13 +43,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx index 1735ef9a7d4d..c6805ac32e68 100644 --- a/xmloff/inc/XMLChartPropertySetMapper.hxx +++ b/xmloff/inc/XMLChartPropertySetMapper.hxx @@ -57,8 +57,8 @@ public: class XMLChartExportPropertyMapper : public SvXMLExportPropertyMapper { private: - const rtl::OUString msTrue; - const rtl::OUString msFalse; + const OUString msTrue; + const OUString msFalse; bool mbAdaptPercentage; SvXMLExport& mrExport; @@ -107,7 +107,7 @@ public: virtual bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx index 2d8897547b39..3caac13fd6c0 100644 --- a/xmloff/inc/XMLChartStyleContext.hxx +++ b/xmloff/inc/XMLChartStyleContext.hxx @@ -24,22 +24,22 @@ class XMLChartStyleContext : public XMLShapeStyleContext { private: - ::rtl::OUString msDataStyleName; - ::rtl::OUString msPercentageDataStyleName; + OUString msDataStyleName; + OUString msPercentageDataStyleName; SvXMLStylesContext& mrStyles; protected: /// is called when an attribute at the (auto)style element is found virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLChartStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily ); virtual ~XMLChartStyleContext(); @@ -52,7 +52,7 @@ public: /// necessary for property context (element-property symbol-image) virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx index d37c3f6235f6..2df7f08bd596 100644 --- a/xmloff/inc/XMLClipPropertyHandler.hxx +++ b/xmloff/inc/XMLClipPropertyHandler.hxx @@ -33,8 +33,8 @@ public: virtual ~XMLClipPropertyHandler(); virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx index 67cf2e4c5fad..a9472c7bfbfa 100644 --- a/xmloff/inc/XMLElementPropertyContext.hxx +++ b/xmloff/inc/XMLElementPropertyContext.hxx @@ -46,7 +46,7 @@ public: TYPEINFO(); XMLElementPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx index 39cac6b56a5f..4c3d08b6df43 100644 --- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx +++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx @@ -33,33 +33,33 @@ class XMLEmbeddedObjectImportContext : public SvXMLImportContext ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp; - ::rtl::OUString sFilterService; + OUString sFilterService; // #100592# - ::rtl::OUString sCLSID; + OUString sCLSID; public: TYPEINFO(); - const ::rtl::OUString& GetFilterServiceName() const { return sFilterService; } + const OUString& GetFilterServiceName() const { return sFilterService; } // #100592# - const ::rtl::OUString& GetFilterCLSID() const { return sCLSID; } + const OUString& GetFilterCLSID() const { return sCLSID; } XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLEmbeddedObjectImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); sal_Bool SetComponent( ::com::sun::star::uno::Reference< diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx index 871b496867ca..5d5455fa5195 100644 --- a/xmloff/inc/XMLEventImportHelper.hxx +++ b/xmloff/inc/XMLEventImportHelper.hxx @@ -35,8 +35,8 @@ class XMLEventContextFactory; class XMLEventsImportContext; struct XMLEventNameTranslation; -typedef ::std::map< ::rtl::OUString, XMLEventContextFactory* > FactoryMap; -typedef ::std::map< XMLEventName, ::rtl::OUString > NameMap; +typedef ::std::map< OUString, XMLEventContextFactory* > FactoryMap; +typedef ::std::map< XMLEventName, OUString > NameMap; typedef ::std::list< NameMap* > NameMapList; @@ -70,7 +70,7 @@ public: ~XMLEventImportHelper(); /// register a handler for a particular language type - void RegisterFactory( const ::rtl::OUString& rLanguage, + void RegisterFactory( const OUString& rLanguage, XMLEventContextFactory* aFactory ); /// add event name translation to the internal table @@ -86,12 +86,12 @@ public: SvXMLImportContext* CreateContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList, XMLEventsImportContext* rEvents, - const ::rtl::OUString& rXmlEventName, - const ::rtl::OUString& rLanguage); + const OUString& rXmlEventName, + const OUString& rLanguage); }; diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx index e058a04d7b84..6f562179434e 100644 --- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx +++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx @@ -40,13 +40,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx index 4058a8d66343..d99441edabdc 100644 --- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx +++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx @@ -33,29 +33,29 @@ class SvXMLImport; /// import footnote and endnote configuration elements class XMLFootnoteConfigurationImportContext : public SvXMLStyleContext { - const ::rtl::OUString sPropertyAnchorCharStyleName; - const ::rtl::OUString sPropertyCharStyleName; - const ::rtl::OUString sPropertyNumberingType; - const ::rtl::OUString sPropertyPageStyleName; - const ::rtl::OUString sPropertyParagraphStyleName; - const ::rtl::OUString sPropertyPrefix; - const ::rtl::OUString sPropertyStartAt; - const ::rtl::OUString sPropertySuffix; - const ::rtl::OUString sPropertyPositionEndOfDoc; - const ::rtl::OUString sPropertyFootnoteCounting; - const ::rtl::OUString sPropertyEndNotice; - const ::rtl::OUString sPropertyBeginNotice; + const OUString sPropertyAnchorCharStyleName; + const OUString sPropertyCharStyleName; + const OUString sPropertyNumberingType; + const OUString sPropertyPageStyleName; + const OUString sPropertyParagraphStyleName; + const OUString sPropertyPrefix; + const OUString sPropertyStartAt; + const OUString sPropertySuffix; + const OUString sPropertyPositionEndOfDoc; + const OUString sPropertyFootnoteCounting; + const OUString sPropertyEndNotice; + const OUString sPropertyBeginNotice; - ::rtl::OUString sCitationStyle; - ::rtl::OUString sAnchorStyle; - ::rtl::OUString sDefaultStyle; - ::rtl::OUString sPageStyle; - ::rtl::OUString sPrefix; - ::rtl::OUString sSuffix; - ::rtl::OUString sNumFormat; - ::rtl::OUString sNumSync; - ::rtl::OUString sBeginNotice; - ::rtl::OUString sEndNotice; + OUString sCitationStyle; + OUString sAnchorStyle; + OUString sDefaultStyle; + OUString sPageStyle; + OUString sPrefix; + OUString sSuffix; + OUString sNumFormat; + OUString sNumSync; + OUString sBeginNotice; + OUString sEndNotice; SvXMLTokenMap* pAttrTokenMap; @@ -71,7 +71,7 @@ public: XMLFootnoteConfigurationImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); @@ -85,7 +85,7 @@ public: /// for footnotes, also parse begin and end notices virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); @@ -104,10 +104,10 @@ public: ::com::sun::star::beans::XPropertySet> & rConfig); /// for helper class: set begin notice - void SetBeginNotice( ::rtl::OUString sText); + void SetBeginNotice( OUString sText); /// for helper class: set end notice - void SetEndNotice( ::rtl::OUString sText); + void SetEndNotice( OUString sText); }; #endif diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx index 9e5a84f6f9fa..ffacc723f735 100644 --- a/xmloff/inc/XMLImageMapContext.hxx +++ b/xmloff/inc/XMLImageMapContext.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { class XMLImageMapContext : public SvXMLImportContext { - const ::rtl::OUString sImageMap; + const OUString sImageMap; /// the image map to be imported ::com::sun::star::uno::Reference< @@ -50,7 +50,7 @@ public: XMLImageMapContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropertySet); @@ -58,7 +58,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx index 5c7fa58f0eba..ceb132bbb731 100644 --- a/xmloff/inc/XMLImageMapExport.hxx +++ b/xmloff/inc/XMLImageMapExport.hxx @@ -35,17 +35,17 @@ class SvXMLExport; */ class XMLImageMapExport { - const ::rtl::OUString msBoundary; - const ::rtl::OUString msCenter; - const ::rtl::OUString msDescription; - const ::rtl::OUString msImageMap; - const ::rtl::OUString msIsActive; - const ::rtl::OUString msName; - const ::rtl::OUString msPolygon; - const ::rtl::OUString msRadius; - const ::rtl::OUString msTarget; - const ::rtl::OUString msURL; - const ::rtl::OUString msTitle; + const OUString msBoundary; + const OUString msCenter; + const OUString msDescription; + const OUString msImageMap; + const OUString msIsActive; + const OUString msName; + const OUString msPolygon; + const OUString msRadius; + const OUString msTarget; + const OUString msURL; + const OUString msTitle; SvXMLExport& mrExport; diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx index f3b732694c24..2c6e67110dc7 100644 --- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx +++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx @@ -42,20 +42,20 @@ namespace com { namespace sun { namespace star { */ class XMLIndexBibliographyConfigurationContext : public SvXMLStyleContext { - const ::rtl::OUString sFieldMaster_Bibliography; - const ::rtl::OUString sBracketBefore; - const ::rtl::OUString sBracketAfter; - const ::rtl::OUString sIsNumberEntries; - const ::rtl::OUString sIsSortByPosition; - const ::rtl::OUString sSortKeys; - const ::rtl::OUString sSortKey; - const ::rtl::OUString sIsSortAscending; - const ::rtl::OUString sSortAlgorithm; - const ::rtl::OUString sLocale; + const OUString sFieldMaster_Bibliography; + const OUString sBracketBefore; + const OUString sBracketAfter; + const OUString sIsNumberEntries; + const OUString sIsSortByPosition; + const OUString sSortKeys; + const OUString sSortKey; + const OUString sIsSortAscending; + const OUString sSortAlgorithm; + const OUString sLocale; - ::rtl::OUString sSuffix; - ::rtl::OUString sPrefix; - ::rtl::OUString sAlgorithm; + OUString sSuffix; + OUString sPrefix; + OUString sAlgorithm; ::com::sun::star::lang::Locale aLocale; sal_Bool bNumberedEntries; sal_Bool bSortByPosition; @@ -70,7 +70,7 @@ public: XMLIndexBibliographyConfigurationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); @@ -86,14 +86,14 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); void ProcessAttribute( sal_uInt16 nPrefix, - const ::rtl::OUString sLocalName, - const ::rtl::OUString sValue); + const OUString sLocalName, + const OUString sValue); }; #endif diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx index cb6609408d68..e2691960595b 100644 --- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx +++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx @@ -32,11 +32,11 @@ public: virtual ~XMLIsPercentagePropertyHandler (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx index c9fed5d134e9..ae3e6dd17016 100644 --- a/xmloff/inc/XMLLineNumberingImportContext.hxx +++ b/xmloff/inc/XMLLineNumberingImportContext.hxx @@ -50,22 +50,22 @@ enum LineNumberingToken /** import elements */ class XMLLineNumberingImportContext : public SvXMLStyleContext { - const ::rtl::OUString sCharStyleName; - const ::rtl::OUString sCountEmptyLines; - const ::rtl::OUString sCountLinesInFrames; - const ::rtl::OUString sDistance; - const ::rtl::OUString sInterval; - const ::rtl::OUString sSeparatorText; - const ::rtl::OUString sNumberPosition; - const ::rtl::OUString sNumberingType; - const ::rtl::OUString sIsOn; - const ::rtl::OUString sRestartAtEachPage; - const ::rtl::OUString sSeparatorInterval; + const OUString sCharStyleName; + const OUString sCountEmptyLines; + const OUString sCountLinesInFrames; + const OUString sDistance; + const OUString sInterval; + const OUString sSeparatorText; + const OUString sNumberPosition; + const OUString sNumberingType; + const OUString sIsOn; + const OUString sRestartAtEachPage; + const OUString sSeparatorInterval; - ::rtl::OUString sStyleName; - ::rtl::OUString sNumFormat; - ::rtl::OUString sNumLetterSync; - ::rtl::OUString sSeparator; + OUString sStyleName; + OUString sNumFormat; + OUString sNumLetterSync; + OUString sSeparator; sal_Int32 nOffset; sal_Int16 nNumberPosition; sal_Int16 nIncrement; @@ -82,14 +82,14 @@ public: XMLLineNumberingImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); ~XMLLineNumberingImportContext(); // to be used by child context: set separator info - void SetSeparatorText(const ::rtl::OUString& sText); + void SetSeparatorText(const OUString& sText); void SetSeparatorIncrement(sal_Int16 nIncr); protected: @@ -100,19 +100,19 @@ protected: void ProcessAttribute( enum LineNumberingToken eToken, - ::rtl::OUString sValue); + OUString sValue); virtual void CreateAndInsert(sal_Bool bOverwrite); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); void ProcessAttribute( - const ::rtl::OUString sLocalName, - const ::rtl::OUString sValue); + const OUString sLocalName, + const OUString sValue); }; #endif diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx index 2e39d1752448..afc000e6b4a3 100644 --- a/xmloff/inc/XMLNumberStylesImport.hxx +++ b/xmloff/inc/XMLNumberStylesImport.hxx @@ -44,14 +44,14 @@ private: bool compareStyle( const SdXMLFixedDataStyle* pStyle, sal_Int16& nIndex ) const; protected: - void add( rtl::OUString& rNumberStyle, sal_Bool bLong, sal_Bool bTextual, sal_Bool bDecimal02, rtl::OUString& rText ); + void add( OUString& rNumberStyle, sal_Bool bLong, sal_Bool bTextual, sal_Bool bDecimal02, OUString& rText ); public: TYPEINFO(); SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles); @@ -59,7 +59,7 @@ public: virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); sal_Int32 GetDrawKey() const { return mnKey; } diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx index 687754d2268f..a7f94b43ac87 100644 --- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx +++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx @@ -34,11 +34,11 @@ public: virtual ~XMLPercentOrMeasurePropertyHandler (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx index f175f0521ff8..8c1be6c4c439 100644 --- a/xmloff/inc/XMLRectangleMembersHandler.hxx +++ b/xmloff/inc/XMLRectangleMembersHandler.hxx @@ -42,13 +42,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx index cb1508b10ddd..419693d7784d 100644 --- a/xmloff/inc/XMLReplacementImageContext.hxx +++ b/xmloff/inc/XMLReplacementImageContext.hxx @@ -35,8 +35,8 @@ class XMLReplacementImageContext : public SvXMLImportContext ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > m_xPropSet; - ::rtl::OUString m_sHRef; - const ::rtl::OUString m_sGraphicURL; + OUString m_sHRef; + const OUString m_sGraphicURL; public: @@ -44,7 +44,7 @@ public: XMLReplacementImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & rAttrList, const ::com::sun::star::uno::Reference < @@ -54,7 +54,7 @@ public: virtual void EndElement(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx index cdefc788f359..15d5668d0b18 100644 --- a/xmloff/inc/XMLScriptContextFactory.hxx +++ b/xmloff/inc/XMLScriptContextFactory.hxx @@ -33,9 +33,9 @@ class XMLEventsImportContext; class XMLScriptContextFactory : public XMLEventContextFactory { - const ::rtl::OUString sEventType; - const ::rtl::OUString sScript; - const ::rtl::OUString sURL; + const OUString sEventType; + const OUString sScript; + const OUString sURL; public: XMLScriptContextFactory(); @@ -44,16 +44,16 @@ public: virtual SvXMLImportContext * CreateContext(SvXMLImport & rImport, /// import context sal_uInt16 nPrefix, /// element: namespace prefix - const ::rtl::OUString & rLocalName, /// element: local name + const OUString & rLocalName, /// element: local name /// attribute list const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList, /// the context for the enclosing element XMLEventsImportContext * rEvents, /// the event name (as understood by the API) - const ::rtl::OUString & rApiEventName, + const OUString & rApiEventName, /// the event type name (as registered) - const ::rtl::OUString & rLanguage); + const OUString & rLanguage); }; #endif // _XMLOFF_XMLSCRIPTCONTEXTFACTORY_HXX diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx index a34bcc1d7bdf..e1963e7e83c6 100644 --- a/xmloff/inc/XMLScriptExportHandler.hxx +++ b/xmloff/inc/XMLScriptExportHandler.hxx @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { class XMLScriptExportHandler : public XMLEventExportHandler { - const ::rtl::OUString sURL; + const OUString sURL; public: XMLScriptExportHandler(); @@ -42,7 +42,7 @@ public: virtual void Export( SvXMLExport& rExport, - const ::rtl::OUString& rEventName, + const OUString& rEventName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rValues, sal_Bool bUseWhitespace); diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx index 35092774cab8..54c28ca372c2 100644 --- a/xmloff/inc/XMLShapePropertySetContext.hxx +++ b/xmloff/inc/XMLShapePropertySetContext.hxx @@ -32,7 +32,7 @@ public: TYPEINFO(); XMLShapePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFam, @@ -45,7 +45,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp); diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx index 31d0a63599fd..d4d6654a647d 100644 --- a/xmloff/inc/XMLStarBasicContextFactory.hxx +++ b/xmloff/inc/XMLStarBasicContextFactory.hxx @@ -34,10 +34,10 @@ class XMLEventsImportContext; class XMLStarBasicContextFactory : public XMLEventContextFactory { - const ::rtl::OUString sEventType; - const ::rtl::OUString sLibrary; - const ::rtl::OUString sMacroName; - const ::rtl::OUString sStarBasic; + const OUString sEventType; + const OUString sLibrary; + const OUString sMacroName; + const OUString sStarBasic; public: XMLStarBasicContextFactory(); @@ -46,15 +46,15 @@ public: virtual SvXMLImportContext* CreateContext( SvXMLImport& rImport, /// import context sal_uInt16 nPrefix, /// element: namespace prefix - const ::rtl::OUString& rLocalName, /// element: local name + const OUString& rLocalName, /// element: local name const ::com::sun::star::uno::Reference< /// attribute list ::com::sun::star::xml::sax::XAttributeList> & xAttrList, /// the context for the enclosing element XMLEventsImportContext* rEvents, /// the event name (as understood by the API) - const ::rtl::OUString& rApiEventName, + const OUString& rApiEventName, /// the event type name (as registered) - const ::rtl::OUString& rLanguage); + const OUString& rLanguage); }; #endif diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx index fae36291fc24..1ba34a9577ab 100644 --- a/xmloff/inc/XMLStarBasicExportHandler.hxx +++ b/xmloff/inc/XMLStarBasicExportHandler.hxx @@ -34,11 +34,11 @@ namespace com { namespace sun { namespace star { class XMLStarBasicExportHandler : public XMLEventExportHandler { - const ::rtl::OUString sStarBasic; - const ::rtl::OUString sLibrary; - const ::rtl::OUString sMacroName; - const ::rtl::OUString sStarOffice; - const ::rtl::OUString sApplication; + const OUString sStarBasic; + const OUString sLibrary; + const OUString sMacroName; + const OUString sStarOffice; + const OUString sApplication; public: XMLStarBasicExportHandler(); @@ -46,7 +46,7 @@ public: virtual void Export( SvXMLExport& rExport, - const ::rtl::OUString& rEventName, + const OUString& rEventName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rValues, sal_Bool bUseWhitespace); diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx index b0d9e1a015bf..d710de80e13e 100644 --- a/xmloff/inc/XMLStringBufferImportContext.hxx +++ b/xmloff/inc/XMLStringBufferImportContext.hxx @@ -32,7 +32,7 @@ */ class XMLStringBufferImportContext : public SvXMLImportContext { - ::rtl::OUStringBuffer& rTextBuffer; + OUStringBuffer& rTextBuffer; public: @@ -41,19 +41,19 @@ public: XMLStringBufferImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& sLocalName, - ::rtl::OUStringBuffer& rBuffer); + const OUString& sLocalName, + OUStringBuffer& rBuffer); virtual ~XMLStringBufferImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void Characters( - const ::rtl::OUString& rChars ); + const OUString& rChars ); virtual void EndElement(); }; diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx index 46c796cde163..d1c39181ae72 100644 --- a/xmloff/inc/XMLTextColumnsContext.hxx +++ b/xmloff/inc/XMLTextColumnsContext.hxx @@ -30,14 +30,14 @@ class SvXMLTokenMap; class XMLTextColumnsContext :public XMLElementPropertyContext { - const ::rtl::OUString sSeparatorLineIsOn; - const ::rtl::OUString sSeparatorLineWidth; - const ::rtl::OUString sSeparatorLineColor; - const ::rtl::OUString sSeparatorLineRelativeHeight; - const ::rtl::OUString sSeparatorLineVerticalAlignment; - const ::rtl::OUString sIsAutomatic; - const ::rtl::OUString sAutomaticDistance; - const ::rtl::OUString sSeparatorLineStyle; + const OUString sSeparatorLineIsOn; + const OUString sSeparatorLineWidth; + const OUString sSeparatorLineColor; + const OUString sSeparatorLineRelativeHeight; + const OUString sSeparatorLineVerticalAlignment; + const OUString sIsAutomatic; + const OUString sAutomaticDistance; + const OUString sSeparatorLineStyle; XMLTextColumnsArray_Impl *pColumns; @@ -53,7 +53,7 @@ public: XMLTextColumnsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const XMLPropertyState& rProp, @@ -62,7 +62,7 @@ public: virtual ~XMLTextColumnsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx index aabfe82756fb..c931b92298a1 100644 --- a/xmloff/inc/XMLTextColumnsExport.hxx +++ b/xmloff/inc/XMLTextColumnsExport.hxx @@ -27,14 +27,14 @@ class XMLTextColumnsExport { SvXMLExport& rExport; - const ::rtl::OUString sSeparatorLineIsOn; - const ::rtl::OUString sSeparatorLineWidth; - const ::rtl::OUString sSeparatorLineColor; - const ::rtl::OUString sSeparatorLineRelativeHeight; - const ::rtl::OUString sSeparatorLineVerticalAlignment; - const ::rtl::OUString sIsAutomatic; - const ::rtl::OUString sAutomaticDistance; - const ::rtl::OUString sSeparatorLineStyle; + const OUString sSeparatorLineIsOn; + const OUString sSeparatorLineWidth; + const OUString sSeparatorLineColor; + const OUString sSeparatorLineRelativeHeight; + const OUString sSeparatorLineVerticalAlignment; + const OUString sIsAutomatic; + const OUString sAutomaticDistance; + const OUString sSeparatorLineStyle; protected: diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx index a3caad1e4ddb..6a533e7080fc 100644 --- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx +++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx @@ -36,11 +36,11 @@ public: /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx index 73102fc7d4c2..18a407970cee 100644 --- a/xmloff/inc/XMLTextHeaderFooterContext.hxx +++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx @@ -34,12 +34,12 @@ class XMLTextHeaderFooterContext: public SvXMLImportContext ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > xPropSet; - const ::rtl::OUString sOn; - const ::rtl::OUString sShareContent; - const ::rtl::OUString sShareContentFirst; - const ::rtl::OUString sText; - const ::rtl::OUString sTextFirst; - const ::rtl::OUString sTextLeft; + const OUString sOn; + const OUString sShareContent; + const OUString sShareContentFirst; + const OUString sText; + const OUString sTextFirst; + const OUString sTextLeft; sal_Bool bInsertContent : 1; sal_Bool bLeft : 1; @@ -49,7 +49,7 @@ public: TYPEINFO(); XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const ::com::sun::star::uno::Reference < @@ -60,7 +60,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx index 655487b1cd33..eacbea8b3c42 100644 --- a/xmloff/inc/animationimport.hxx +++ b/xmloff/inc/animationimport.hxx @@ -45,14 +45,14 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParentNode, SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, AnimationsImportHelperImpl* mpImpl = NULL ); virtual ~AnimationNodeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); static void postProcessRootNode( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps ); diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx index 5b9ed8511e79..2b381700b2e1 100644 --- a/xmloff/inc/animimp.hxx +++ b/xmloff/inc/animimp.hxx @@ -37,11 +37,11 @@ public: XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~XMLAnimationsContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx index cf423d27c9f2..25c3d4544ea6 100644 --- a/xmloff/inc/forms/property_handler.hxx +++ b/xmloff/inc/forms/property_handler.hxx @@ -44,18 +44,18 @@ namespace xmloff public: /** retrieves the XML attribute value for the given property values */ - virtual ::rtl::OUString + virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const = 0; /** is a convenience method for XML attributes whose value comprises of only one UNO API property */ - virtual ::rtl::OUString + virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const = 0; /** retrieves the values of the properties controlled by an XML attributed, described by a given attribute value */ virtual bool - getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const = 0; + getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const = 0; virtual ~IPropertyHandler() { } }; diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index a83b61ed02cc..2297e94233f5 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -157,7 +157,7 @@ class XMLTextFieldExport /// store used text field master names (NULL means: don't collect) ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >, - ::std::set< ::rtl::OUString > > * + ::std::set< OUString > > * pUsedMasters; public: @@ -207,7 +207,7 @@ public: static enum ::xmloff::token::XMLTokenEnum MapReferenceSource(sal_Int16 nType); static enum ::xmloff::token::XMLTokenEnum MapReferenceType(sal_Int16 nType); static enum ::xmloff::token::XMLTokenEnum MapCountFieldName(FieldIdEnum nToken); - static enum ::xmloff::token::XMLTokenEnum MapBibliographyFieldName(::rtl::OUString sName); + static enum ::xmloff::token::XMLTokenEnum MapBibliographyFieldName(OUString sName); static enum ::xmloff::token::XMLTokenEnum MapMeasureKind(sal_Int16 nKind); enum ::xmloff::token::XMLTokenEnum MapPageNumberName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropSet, @@ -239,14 +239,14 @@ protected: /// export an element with string content void ExportElement(enum ::xmloff::token::XMLTokenEnum eElement, /// element token - const ::rtl::OUString& sContent, /// element content + const OUString& sContent, /// element content sal_Bool bAddSpace = sal_False); /// add blanks around /// element? /// export a macro (as used in the macro field) void ExportMacro( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, - const ::rtl::OUString& rContent); + const OUString& rContent); /// export text:meta-field (RDF metadata) void ExportMetaField( const ::com::sun::star::uno::Reference< @@ -273,7 +273,7 @@ protected: /// export a string attribute void ProcessString( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) - const ::rtl::OUString& sValue, /// attribute value + const OUString& sValue, /// attribute value sal_Bool bOmitEmpty = sal_False, /// omit attribute, if value is empty sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix @@ -281,7 +281,7 @@ protected: void ProcessString( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) sal_uInt16 nValuePrefix, - const ::rtl::OUString& sValue, /// attribute value + const OUString& sValue, /// attribute value sal_Bool bOmitEmpty = sal_False, /// omit attribute, if value is empty sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix @@ -289,16 +289,16 @@ protected: /// export a string attribute, omit if default void ProcessString( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) - const ::rtl::OUString& sValue, /// attribute value - const ::rtl::OUString& sDefault, /// default value; omit if equal + const OUString& sValue, /// attribute value + const OUString& sDefault, /// default value; omit if equal sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export a string attribute, omit if default void ProcessString( enum ::xmloff::token::XMLTokenEnum eXmlName, /// attribute token (namespace text) sal_uInt16 nValuePrefix, - const ::rtl::OUString& sValue, /// attribute value - const ::rtl::OUString& sDefault, /// default value; omit if equal + const OUString& sValue, /// attribute value + const OUString& sDefault, /// default value; omit if equal sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix /// export a string attribute @@ -318,7 +318,7 @@ protected: /// export a string as a sequence of paragraphs void ProcessParagraphSequence( /// string containing the paragraphs - const ::rtl::OUString& sParagraphSequence); + const OUString& sParagraphSequence); /// export a numbering format (numeric, roman, alphabetic, etc.) void ProcessNumberingType( @@ -333,8 +333,8 @@ protected: void ProcessValueAndType( sal_Bool bIsString, /// do we process a string or a number? sal_Int32 nFormatKey, /// format key for NumberFormatter; possibly -1 - const ::rtl::OUString& sContent, /// string content; possibly invalid - const ::rtl::OUString& sDefault, /// default string + const OUString& sContent, /// string content; possibly invalid + const OUString& sDefault, /// default string double fValue, /// float content; possibly invalid sal_Bool bExportValue, /// export value attribute? sal_Bool bExportValueType, /// export value-type attribute? @@ -377,17 +377,17 @@ protected: sal_Int32 nCommandType); /// com::sun::star::sdb::CommandType void ProcessStringSequence( - const ::com::sun::star::uno::Sequence& rSequence, - const rtl::OUString sSelected ); + const ::com::sun::star::uno::Sequence& rSequence, + const OUString sSelected ); void ProcessStringSequence( - const ::com::sun::star::uno::Sequence& rSequence, + const ::com::sun::star::uno::Sequence& rSequence, sal_Int32 nSelected ); /// export attributes that describe a data source void ExportDataBaseElement( enum ::xmloff::token::XMLTokenEnum eElement, - const ::rtl::OUString& sContent, + const OUString& sContent, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropertySet, const ::com::sun::star::uno::Reference < @@ -413,7 +413,7 @@ protected: ::com::sun::star::beans::XPropertySet > & xPropSet); /// get field ID from XTextField service name (and it's PropertySet) - enum FieldIdEnum MapFieldName(const ::rtl::OUString& sFieldName, + enum FieldIdEnum MapFieldName(const OUString& sFieldName, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet> & xPropSet); @@ -425,100 +425,100 @@ protected: /// explode a field master name into field type and field name sal_Bool ExplodeFieldMasterName( - const ::rtl::OUString& sMasterName, /// name as returned by SO API - ::rtl::OUString& sFieldType, /// out: field type - ::rtl::OUString& sVarName); /// out: variable name + const OUString& sMasterName, /// name as returned by SO API + OUString& sFieldType, /// out: field type + OUString& sVarName); /// out: variable name /// make reference name for a foot- or endnote - static ::rtl::OUString MakeFootnoteRefName(sal_Int16 nSeqNo); + static OUString MakeFootnoteRefName(sal_Int16 nSeqNo); /// make reference name for a sequence field - static ::rtl::OUString MakeSequenceRefName(sal_Int16 nSeqNo, - const ::rtl::OUString& rSeqName); + static OUString MakeSequenceRefName(sal_Int16 nSeqNo, + const OUString& rSeqName); private: // constants // service names - const ::rtl::OUString sServicePrefix; - const ::rtl::OUString sFieldMasterPrefix; - const ::rtl::OUString sPresentationServicePrefix; + const OUString sServicePrefix; + const OUString sFieldMasterPrefix; + const OUString sPresentationServicePrefix; // property names - const ::rtl::OUString sPropertyAdjust; - const ::rtl::OUString sPropertyAuthor; - const ::rtl::OUString sPropertyChapterFormat; - const ::rtl::OUString sPropertyChapterNumberingLevel; - const ::rtl::OUString sPropertyCharStyleNames; - const ::rtl::OUString sPropertyCondition; - const ::rtl::OUString sPropertyContent; - const ::rtl::OUString sPropertyDataBaseName; - const ::rtl::OUString sPropertyDataBaseURL; - const ::rtl::OUString sPropertyDataColumnName; - const ::rtl::OUString sPropertyDataCommandType; - const ::rtl::OUString sPropertyDataTableName; - const ::rtl::OUString sPropertyDate; - const ::rtl::OUString sPropertyDateTime; - const ::rtl::OUString sPropertyDateTimeValue; - const ::rtl::OUString sPropertyDDECommandElement; - const ::rtl::OUString sPropertyDDECommandFile; - const ::rtl::OUString sPropertyDDECommandType; - const ::rtl::OUString sPropertyDependentTextFields; - const ::rtl::OUString sPropertyFalseContent; - const ::rtl::OUString sPropertyFields; - const ::rtl::OUString sPropertyFieldSubType; - const ::rtl::OUString sPropertyFileFormat; - const ::rtl::OUString sPropertyFullName; - const ::rtl::OUString sPropertyHint; - const ::rtl::OUString sPropertyInitials; - const ::rtl::OUString sPropertyInstanceName; - const ::rtl::OUString sPropertyIsAutomaticUpdate; - const ::rtl::OUString sPropertyIsConditionTrue; - const ::rtl::OUString sPropertyIsDataBaseFormat; - const ::rtl::OUString sPropertyIsDate; - const ::rtl::OUString sPropertyIsExpression; - const ::rtl::OUString sPropertyIsFixed; - const ::rtl::OUString sPropertyIsFixedLanguage; - const ::rtl::OUString sPropertyIsHidden; - const ::rtl::OUString sPropertyIsInput; - const ::rtl::OUString sPropertyIsShowFormula; - const ::rtl::OUString sPropertyIsVisible; - const ::rtl::OUString sPropertyItems; - const ::rtl::OUString sPropertyLevel; - const ::rtl::OUString sPropertyMacro; - const ::rtl::OUString sPropertyMeasureKind; - const ::rtl::OUString sPropertyName; - const ::rtl::OUString sPropertyNumberFormat; - const ::rtl::OUString sPropertyNumberingSeparator; - const ::rtl::OUString sPropertyNumberingType; - const ::rtl::OUString sPropertyOffset; - const ::rtl::OUString sPropertyOn; - const ::rtl::OUString sPropertyPlaceholder; - const ::rtl::OUString sPropertyPlaceholderType; - const ::rtl::OUString sPropertyReferenceFieldPart; - const ::rtl::OUString sPropertyReferenceFieldSource; - const ::rtl::OUString sPropertyReferenceFieldType; - const ::rtl::OUString sPropertyRevision; - const ::rtl::OUString sPropertyScriptType; - const ::rtl::OUString sPropertySelectedItem; - const ::rtl::OUString sPropertySequenceNumber; - const ::rtl::OUString sPropertySequenceValue; - const ::rtl::OUString sPropertySetNumber; - const ::rtl::OUString sPropertySourceName; - const ::rtl::OUString sPropertySubType; - const ::rtl::OUString sPropertyTargetFrame; - const ::rtl::OUString sPropertyTrueContent; - const ::rtl::OUString sPropertyURL; - const ::rtl::OUString sPropertyURLContent; - const ::rtl::OUString sPropertyUserText; - const ::rtl::OUString sPropertyValue; - const ::rtl::OUString sPropertyVariableName; - const ::rtl::OUString sPropertyVariableSubType; - const ::rtl::OUString sPropertyHelp; - const ::rtl::OUString sPropertyTooltip; - const ::rtl::OUString sPropertyTextRange; + const OUString sPropertyAdjust; + const OUString sPropertyAuthor; + const OUString sPropertyChapterFormat; + const OUString sPropertyChapterNumberingLevel; + const OUString sPropertyCharStyleNames; + const OUString sPropertyCondition; + const OUString sPropertyContent; + const OUString sPropertyDataBaseName; + const OUString sPropertyDataBaseURL; + const OUString sPropertyDataColumnName; + const OUString sPropertyDataCommandType; + const OUString sPropertyDataTableName; + const OUString sPropertyDate; + const OUString sPropertyDateTime; + const OUString sPropertyDateTimeValue; + const OUString sPropertyDDECommandElement; + const OUString sPropertyDDECommandFile; + const OUString sPropertyDDECommandType; + const OUString sPropertyDependentTextFields; + const OUString sPropertyFalseContent; + const OUString sPropertyFields; + const OUString sPropertyFieldSubType; + const OUString sPropertyFileFormat; + const OUString sPropertyFullName; + const OUString sPropertyHint; + const OUString sPropertyInitials; + const OUString sPropertyInstanceName; + const OUString sPropertyIsAutomaticUpdate; + const OUString sPropertyIsConditionTrue; + const OUString sPropertyIsDataBaseFormat; + const OUString sPropertyIsDate; + const OUString sPropertyIsExpression; + const OUString sPropertyIsFixed; + const OUString sPropertyIsFixedLanguage; + const OUString sPropertyIsHidden; + const OUString sPropertyIsInput; + const OUString sPropertyIsShowFormula; + const OUString sPropertyIsVisible; + const OUString sPropertyItems; + const OUString sPropertyLevel; + const OUString sPropertyMacro; + const OUString sPropertyMeasureKind; + const OUString sPropertyName; + const OUString sPropertyNumberFormat; + const OUString sPropertyNumberingSeparator; + const OUString sPropertyNumberingType; + const OUString sPropertyOffset; + const OUString sPropertyOn; + const OUString sPropertyPlaceholder; + const OUString sPropertyPlaceholderType; + const OUString sPropertyReferenceFieldPart; + const OUString sPropertyReferenceFieldSource; + const OUString sPropertyReferenceFieldType; + const OUString sPropertyRevision; + const OUString sPropertyScriptType; + const OUString sPropertySelectedItem; + const OUString sPropertySequenceNumber; + const OUString sPropertySequenceValue; + const OUString sPropertySetNumber; + const OUString sPropertySourceName; + const OUString sPropertySubType; + const OUString sPropertyTargetFrame; + const OUString sPropertyTrueContent; + const OUString sPropertyURL; + const OUString sPropertyURLContent; + const OUString sPropertyUserText; + const OUString sPropertyValue; + const OUString sPropertyVariableName; + const OUString sPropertyVariableSubType; + const OUString sPropertyHelp; + const OUString sPropertyTooltip; + const OUString sPropertyTextRange; - const ::rtl::OUString sEmpty; + const OUString sEmpty; XMLPropertyState* pCombinedCharactersPropertyState; diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 691de3d07a46..43b8b1ba510d 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -731,7 +731,7 @@ protected: /** import user docinfo field () */ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext { - rtl::OUString aName; + OUString aName; const OUString sPropertyName; const OUString sPropertyNumberFormat; const OUString sPropertyIsFixedLanguage; @@ -1450,20 +1450,20 @@ protected: /** dropdown field (filter legacy) */ class XMLDropDownFieldImportContext : public XMLTextFieldImportContext { - std::vector aLabels; - rtl::OUString sName; - rtl::OUString sHelp; - rtl::OUString sHint; + std::vector aLabels; + OUString sName; + OUString sHelp; + OUString sHint; sal_Int32 nSelected; bool bNameOK; bool bHelpOK; bool bHintOK; - const rtl::OUString sPropertyItems; - const rtl::OUString sPropertySelectedItem; - const rtl::OUString sPropertyName; - const rtl::OUString sPropertyHelp; - const rtl::OUString sPropertyToolTip; + const OUString sPropertyItems; + const OUString sPropertySelectedItem; + const OUString sPropertyName; + const OUString sPropertyHelp; + const OUString sPropertyToolTip; public: TYPEINFO(); diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx index f079ae47e623..bff6a0bedf96 100644 --- a/xmloff/inc/txtlists.hxx +++ b/xmloff/inc/txtlists.hxx @@ -58,35 +58,35 @@ class XMLTextListsHelper : private boost::noncopyable // keeping track of processed lists for import and export // Add optional parameter (#i92811#) - void KeepListAsProcessed( ::rtl::OUString sListId, - ::rtl::OUString sListStyleName, - ::rtl::OUString sContinueListId, - ::rtl::OUString sListStyleDefaultListId = ::rtl::OUString() ); + void KeepListAsProcessed( OUString sListId, + OUString sListStyleName, + OUString sContinueListId, + OUString sListStyleDefaultListId = OUString() ); - sal_Bool IsListProcessed( const ::rtl::OUString sListId ) const; - ::rtl::OUString GetListStyleOfProcessedList( - const ::rtl::OUString sListId ) const; - ::rtl::OUString GetContinueListIdOfProcessedList( - const ::rtl::OUString sListId ) const; - const ::rtl::OUString& GetLastProcessedListId() const; - const ::rtl::OUString& GetListStyleOfLastProcessedList() const; + sal_Bool IsListProcessed( const OUString sListId ) const; + OUString GetListStyleOfProcessedList( + const OUString sListId ) const; + OUString GetContinueListIdOfProcessedList( + const OUString sListId ) const; + const OUString& GetLastProcessedListId() const; + const OUString& GetListStyleOfLastProcessedList() const; - ::rtl::OUString GenerateNewListId() const; + OUString GenerateNewListId() const; // Provide list id for a certain list block for import (#i92811#) - ::rtl::OUString GetListIdForListBlock( XMLTextListBlockContext& rListBlock ); + OUString GetListIdForListBlock( XMLTextListBlockContext& rListBlock ); // keep track of continue list chain for export - void StoreLastContinuingList( ::rtl::OUString sListId, - ::rtl::OUString sContinuingListId ); + void StoreLastContinuingList( OUString sListId, + OUString sContinuingListId ); - ::rtl::OUString GetLastContinuingListId( ::rtl::OUString sListId ) const; + OUString GetLastContinuingListId( OUString sListId ) const; // keep track of opened list elements of a certain list for export - void PushListOnStack( ::rtl::OUString sListId, - ::rtl::OUString sListStyleName ); + void PushListOnStack( OUString sListId, + OUString sListStyleName ); void PopListFromStack(); - sal_Bool EqualsToTopListStyleOnStack( const ::rtl::OUString sListId ) const; + sal_Bool EqualsToTopListStyleOnStack( const OUString sListId ) const; /** for importing numbered-paragraph note that the ID namespace for numbered-paragraph and regular list @@ -96,13 +96,13 @@ class XMLTextListsHelper : private boost::noncopyable ::com::sun::star::container::XIndexReplace> EnsureNumberedParagraph( SvXMLImport & i_rImport, - const ::rtl::OUString i_ListId, - sal_Int16 & io_rLevel, const ::rtl::OUString i_StyleName); + const OUString i_ListId, + sal_Int16 & io_rLevel, const OUString i_StyleName); /// get ID of the last numbered-paragraph iff it has given style-name - ::rtl::OUString GetNumberedParagraphListId( + OUString GetNumberedParagraphListId( const sal_uInt16 i_Level, - const ::rtl::OUString i_StyleName); + const OUString i_StyleName); /** Creates a NumRule from given style-name. @param i_rImport the SvXMLImport @@ -118,8 +118,8 @@ class XMLTextListsHelper : private boost::noncopyable SvXMLImport & i_rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>& i_xNumRule, - const ::rtl::OUString i_ParentStyleName, - const ::rtl::OUString i_StyleName, + const OUString i_ParentStyleName, + const OUString i_StyleName, sal_Int16 & io_rLevel, sal_Bool* o_pRestartNumbering = 0, sal_Bool* io_pSetDefaults = 0); @@ -137,12 +137,12 @@ class XMLTextListsHelper : private boost::noncopyable // container type for processed lists: // map with as key and pair( ) // as value - typedef ::std::map< ::rtl::OUString, - ::std::pair< ::rtl::OUString, ::rtl::OUString >, + typedef ::std::map< OUString, + ::std::pair< OUString, OUString >, ::comphelper::UStringLess > tMapForLists; tMapForLists* mpProcessedLists; - ::rtl::OUString msLastProcessedListId; - ::rtl::OUString msListStyleOfLastProcessedList; + OUString msLastProcessedListId; + OUString msListStyleOfLastProcessedList; /* additional container for processed lists. map with as key and pair( ) @@ -153,28 +153,28 @@ class XMLTextListsHelper : private boost::noncopyable // container type to build up continue list chain: // map with of master list as key and of last list // continuing the master list as value - typedef ::std::map< ::rtl::OUString, ::rtl::OUString, + typedef ::std::map< OUString, OUString, ::comphelper::UStringLess > tMapForContinuingLists; tMapForContinuingLists* mpContinuingLists; // stack type for opened list elements and its list style: // vector with pair( , ) as value - typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > + typedef ::std::vector< ::std::pair< OUString, OUString > > tStackForLists; tStackForLists* mpListStack; /// to connect numbered-paragraphs that have no list-id attribute: /// vector of pair of style-name and list-id (indexed by level) - typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > + typedef ::std::vector< ::std::pair< OUString, OUString > > LastNumberedParagraphs_t; LastNumberedParagraphs_t mLastNumberedParagraphs; /// numbered-paragraphs - typedef ::std::vector< ::std::pair< ::rtl::OUString, + typedef ::std::vector< ::std::pair< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > > > NumParaList_t; - ::std::map< ::rtl::OUString, NumParaList_t > mNPLists; + ::std::map< OUString, NumParaList_t > mNPLists; }; #endif diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index 9fb15011a4e5..95f2391aa30c 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -46,20 +46,20 @@ enum VarType class XMLValueImportHelper { - const ::rtl::OUString sPropertyContent; - const ::rtl::OUString sPropertyValue; - const ::rtl::OUString sPropertyFormula; - const ::rtl::OUString sPropertyNumberFormat; - const ::rtl::OUString sPropertyIsFixedLanguage; + const OUString sPropertyContent; + const OUString sPropertyValue; + const OUString sPropertyFormula; + const OUString sPropertyNumberFormat; + const OUString sPropertyIsFixedLanguage; SvXMLImport& rImport; XMLTextImportHelper& rHelper; - ::rtl::OUString sValue; /// string value (only valid if bStringValueOK) + OUString sValue; /// string value (only valid if bStringValueOK) double fValue; /// double value (only valid if bFloatValueOK) sal_Int32 nFormatKey; /// format key (only valid of bFormatOK) - ::rtl::OUString sFormula; /// formula string - ::rtl::OUString sDefault; /// default (see bStringDefault/bFormulaDef.) + OUString sFormula; /// formula string + OUString sDefault; /// default (see bStringDefault/bFormulaDef.) sal_Bool bIsDefaultLanguage;/// format (of nFormatKey) has system language? sal_Bool bStringType; /// is this a string (or a float) type? @@ -90,7 +90,7 @@ public: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ); + const OUString& sAttrValue ); /// prepare XTextField for insertion into document virtual void PrepareField( @@ -103,7 +103,7 @@ public: /// has format been read? inline sal_Bool IsFormatOK() { return bFormatOK; } - inline void SetDefault(const ::rtl::OUString& sStr) { sDefault = sStr; } + inline void SetDefault(const OUString& sStr) { sDefault = sStr; } }; @@ -135,20 +135,20 @@ public: class XMLVarFieldImportContext : public XMLTextFieldImportContext { protected: - const ::rtl::OUString sPropertyContent; - const ::rtl::OUString sPropertyHint; - const ::rtl::OUString sPropertyHelp; - const ::rtl::OUString sPropertyTooltip; - const ::rtl::OUString sPropertyIsVisible; - const ::rtl::OUString sPropertyIsDisplayFormula; - const ::rtl::OUString sPropertyCurrentPresentation; + const OUString sPropertyContent; + const OUString sPropertyHint; + const OUString sPropertyHelp; + const OUString sPropertyTooltip; + const OUString sPropertyIsVisible; + const OUString sPropertyIsDisplayFormula; + const OUString sPropertyCurrentPresentation; private: - ::rtl::OUString sName; /// name attribute - ::rtl::OUString sFormula; /// formula attribute - ::rtl::OUString sDescription; /// description - ::rtl::OUString sHelp; /// help text - ::rtl::OUString sHint; /// hint + OUString sName; /// name attribute + OUString sFormula; /// formula attribute + OUString sDescription; /// description + OUString sHelp; /// help text + OUString sHint; /// hint XMLValueImportHelper aValueHelper; /// value, value-type, and style sal_Bool bDisplayFormula; /// display formula?(rather than value) sal_Bool bDisplayNone; /// hide field? @@ -179,7 +179,7 @@ public: XMLTextImportHelper& rHlp, /// text import helper const sal_Char* pServiceName, /// name of SO API service sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName, /// element name w/o prefix + const OUString& rLocalName, /// element name w/o prefix // config variables for PrepareField behavior: sal_Bool bFormula, /// set Formula property sal_Bool bFormulaDefault, /// use content as default for formula @@ -196,7 +196,7 @@ public: protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ); + const OUString& sAttrValue ); /// prepare XTextField for insertion into document virtual void PrepareField( @@ -204,7 +204,7 @@ protected: ::com::sun::star::beans::XPropertySet> & xPropertySet); // various accessor methods: - inline ::rtl::OUString GetName() { return sName; } + inline OUString GetName() { return sName; } inline sal_Bool IsStringValue() { return aValueHelper.IsStringValue();} inline sal_Bool IsNameOK() { return bNameOK; } inline sal_Bool IsFormulaOK() { return bFormulaOK; } @@ -217,7 +217,7 @@ protected: /** import variable get fields () */ class XMLVariableGetFieldImportContext : public XMLVarFieldImportContext { - const ::rtl::OUString sPropertySubType; + const OUString sPropertySubType; public: @@ -227,7 +227,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix protected: @@ -242,7 +242,7 @@ protected: /** import expression fields () */ class XMLExpressionFieldImportContext : public XMLVarFieldImportContext { - const ::rtl::OUString sPropertySubType; + const OUString sPropertySubType; public: @@ -252,7 +252,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& sLocalName); /// element name w/o prefix + const OUString& sLocalName); /// element name w/o prefix protected: virtual void PrepareField( @@ -263,7 +263,7 @@ protected: /*** import text input fields () */ class XMLTextInputFieldImportContext : public XMLVarFieldImportContext { - const ::rtl::OUString sPropertyContent; + const OUString sPropertyContent; public: @@ -273,7 +273,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& sLocalName); /// element name w/o prefix + const OUString& sLocalName); /// element name w/o prefix protected: virtual void PrepareField( @@ -304,7 +304,7 @@ public: XMLTextImportHelper& rHlp, /// see XMLTextFieldImportContext const sal_Char* pServiceName, /// see XMLTextFieldImportContext sal_uInt16 nPrfx, /// see XMLTextFieldImportContext - const ::rtl::OUString& rLocalName, /// see XMLTextFieldImportContext + const OUString& rLocalName, /// see XMLTextFieldImportContext // for finding appropriate field master (see EndElement()) VarType eVarType, /// variable type // config variables: @@ -337,7 +337,7 @@ protected: /** import variable set fields () */ class XMLVariableSetFieldImportContext : public XMLSetVarFieldImportContext { - const ::rtl::OUString sPropertySubType; + const OUString sPropertySubType; public: @@ -347,7 +347,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix protected: /// prepare XTextField for insertion into document @@ -361,8 +361,8 @@ protected: /** variable input fields () */ class XMLVariableInputFieldImportContext : public XMLSetVarFieldImportContext { - const ::rtl::OUString sPropertySubType; - const ::rtl::OUString sPropertyIsInput; + const OUString sPropertySubType; + const OUString sPropertyIsInput; public: @@ -372,7 +372,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix protected: @@ -396,7 +396,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix }; /** user input fields () */ @@ -411,7 +411,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix virtual void PrepareField( const ::com::sun::star::uno::Reference< @@ -423,13 +423,13 @@ public: /** sequence fields () */ class XMLSequenceFieldImportContext : public XMLSetVarFieldImportContext { - const ::rtl::OUString sPropertyFormula; - const ::rtl::OUString sPropertyNumberFormat; - const ::rtl::OUString sPropertySequenceValue; - ::rtl::OUString sFormula; - ::rtl::OUString sNumFormat; - ::rtl::OUString sNumFormatSync; - ::rtl::OUString sRefName; + const OUString sPropertyFormula; + const OUString sPropertyNumberFormat; + const OUString sPropertySequenceValue; + OUString sFormula; + OUString sNumFormat; + OUString sNumFormatSync; + OUString sRefName; sal_Bool bRefNameOK; @@ -441,13 +441,13 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ); + const OUString& sAttrValue ); /// prepare XTextField for insertion into document virtual void PrepareField( @@ -477,12 +477,12 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName, /// element name w/o prefix + const OUString& rLocalName, /// element name w/o prefix enum VarType eVarType); /// variable type virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; @@ -493,13 +493,13 @@ public: */ class XMLVariableDeclImportContext : public SvXMLImportContext { - const ::rtl::OUString sPropertyName; - const ::rtl::OUString sPropertySubType; - const ::rtl::OUString sPropertyNumberingLevel; - const ::rtl::OUString sPropertyNumberingSeparator; - const ::rtl::OUString sPropertyIsExpression; + const OUString sPropertyName; + const OUString sPropertySubType; + const OUString sPropertyNumberingLevel; + const OUString sPropertyNumberingSeparator; + const OUString sPropertyIsExpression; - ::rtl::OUString sName; + OUString sName; XMLValueImportHelper aValueHelper; sal_Int8 nNumLevel; sal_Unicode cSeparationChar; @@ -512,7 +512,7 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName, /// element name w/o prefix + const OUString& rLocalName, /// element name w/o prefix const ::com::sun::star::uno::Reference< /// list of element attributes ::com::sun::star::xml::sax::XAttributeList> & xAttrList, enum VarType eVarType); /// variable type @@ -522,7 +522,7 @@ public: ::com::sun::star::beans::XPropertySet> & xMaster, SvXMLImport& rImport, XMLTextImportHelper& rHelper, - const ::rtl::OUString& sVarName, + const OUString& sVarName, enum VarType eVarType); }; @@ -531,14 +531,14 @@ public: /** import table formula fields (deprecated; for Writer 2.0 compatibility) */ class XMLTableFormulaImportContext : public XMLTextFieldImportContext { - const ::rtl::OUString sPropertyNumberFormat; - const ::rtl::OUString sPropertyContent; - const ::rtl::OUString sPropertyIsShowFormula; - const ::rtl::OUString sPropertyCurrentPresentation; + const OUString sPropertyNumberFormat; + const OUString sPropertyContent; + const OUString sPropertyIsShowFormula; + const OUString sPropertyCurrentPresentation; XMLValueImportHelper aValueHelper; - ::rtl::OUString sFormula; + OUString sFormula; sal_Bool bIsShowFormula; @@ -550,14 +550,14 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix virtual ~XMLTableFormulaImportContext(); protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ); + const OUString& sAttrValue ); /// prepare XTextField for insertion into document virtual void PrepareField( @@ -570,14 +570,14 @@ protected: /** import database display fields () */ class XMLDatabaseDisplayImportContext : public XMLDatabaseFieldImportContext { - const ::rtl::OUString sPropertyColumnName; - const ::rtl::OUString sPropertyDatabaseFormat; - const ::rtl::OUString sPropertyCurrentPresentation; - const ::rtl::OUString sPropertyIsVisible; + const OUString sPropertyColumnName; + const OUString sPropertyDatabaseFormat; + const OUString sPropertyCurrentPresentation; + const OUString sPropertyIsVisible; XMLValueImportHelper aValueHelper; - ::rtl::OUString sColumnName; + OUString sColumnName; sal_Bool bColumnOK; sal_Bool bDisplay; @@ -591,13 +591,13 @@ public: SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& rLocalName); /// element name w/o prefix + const OUString& rLocalName); /// element name w/o prefix protected: /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ); + const OUString& sAttrValue ); /// create, prepare and insert database field master and database field virtual void EndElement(); diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx index 661884de81b6..b17b85c63415 100644 --- a/xmloff/inc/xexptran.hxx +++ b/xmloff/inc/xexptran.hxx @@ -56,7 +56,7 @@ typedef ::std::vector< ImpSdXMLExpTransObj3DBase* > ImpSdXMLExpTransObj3DBaseLis class SdXMLImExTransform2D { ImpSdXMLExpTransObj2DBaseList maList; - rtl::OUString msString; + OUString msString; void EmptyList(); @@ -70,8 +70,8 @@ public: bool NeedsAction() const { return !maList.empty(); } void GetFullTransform(::basegfx::B2DHomMatrix& rFullTrans); - const rtl::OUString& GetExportString(const SvXMLUnitConverter& rConv); - void SetString(const rtl::OUString& rNew, const SvXMLUnitConverter& rConv); + const OUString& GetExportString(const SvXMLUnitConverter& rConv); + void SetString(const OUString& rNew, const SvXMLUnitConverter& rConv); }; ////////////////////////////////////////////////////////////////////////////// @@ -79,13 +79,13 @@ public: class SdXMLImExTransform3D { ImpSdXMLExpTransObj3DBaseList maList; - rtl::OUString msString; + OUString msString; void EmptyList(); public: SdXMLImExTransform3D() {} - SdXMLImExTransform3D(const rtl::OUString& rNew, const SvXMLUnitConverter& rConv); + SdXMLImExTransform3D(const OUString& rNew, const SvXMLUnitConverter& rConv); ~SdXMLImExTransform3D() { EmptyList(); } void AddMatrix(const ::basegfx::B3DHomMatrix& rNew); @@ -94,15 +94,15 @@ public: bool NeedsAction() const { return !maList.empty(); } void GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans); bool GetFullHomogenTransform(com::sun::star::drawing::HomogenMatrix& xHomMat); - const rtl::OUString& GetExportString(const SvXMLUnitConverter& rConv); - void SetString(const rtl::OUString& rNew, const SvXMLUnitConverter& rConv); + const OUString& GetExportString(const SvXMLUnitConverter& rConv); + void SetString(const OUString& rNew, const SvXMLUnitConverter& rConv); }; ////////////////////////////////////////////////////////////////////////////// class SdXMLImExViewBox { - rtl::OUString msString; + OUString msString; sal_Int32 mnX; sal_Int32 mnY; sal_Int32 mnW; @@ -110,20 +110,20 @@ class SdXMLImExViewBox public: SdXMLImExViewBox(sal_Int32 nX = 0L, sal_Int32 nY = 0L, sal_Int32 nW = 1000L, sal_Int32 nH = 1000L); - SdXMLImExViewBox(const rtl::OUString& rNew, const SvXMLUnitConverter& rConv); + SdXMLImExViewBox(const OUString& rNew, const SvXMLUnitConverter& rConv); sal_Int32 GetX() const { return mnX; } sal_Int32 GetY() const { return mnY; } sal_Int32 GetWidth() const { return mnW; } sal_Int32 GetHeight() const { return mnH; } - const rtl::OUString& GetExportString(); + const OUString& GetExportString(); }; ////////////////////////////////////////////////////////////////////////////// class SdXMLImExPointsElement { - rtl::OUString msString; + OUString msString; com::sun::star::drawing::PointSequenceSequence maPoly; public: @@ -133,13 +133,13 @@ public: const com::sun::star::awt::Size& rObjectSize, // #96328# const bool bClosed = true); - SdXMLImExPointsElement(const rtl::OUString& rNew, + SdXMLImExPointsElement(const OUString& rNew, const SdXMLImExViewBox& rViewBox, const com::sun::star::awt::Point& rObjectPos, const com::sun::star::awt::Size& rObjectSize, const SvXMLUnitConverter& rConv); - const rtl::OUString& GetExportString() const { return msString; } + const OUString& GetExportString() const { return msString; } const com::sun::star::drawing::PointSequenceSequence& GetPointSequenceSequence() const { return maPoly; } }; @@ -147,7 +147,7 @@ public: class SdXMLImExSvgDElement { - rtl::OUString msString; + OUString msString; const SdXMLImExViewBox& mrViewBox; bool mbIsClosed; bool mbIsCurve; @@ -159,7 +159,7 @@ class SdXMLImExSvgDElement public: SdXMLImExSvgDElement(const SdXMLImExViewBox& rViewBox, const SvXMLExport& rExport); - SdXMLImExSvgDElement(const rtl::OUString& rNew, + SdXMLImExSvgDElement(const OUString& rNew, const SdXMLImExViewBox& rViewBox, const com::sun::star::awt::Point& rObjectPos, const com::sun::star::awt::Size& rObjectSize, @@ -172,7 +172,7 @@ public: const com::sun::star::awt::Size& rObjectSize, bool bClosed = false); - const rtl::OUString& GetExportString() const { return msString; } + const OUString& GetExportString() const { return msString; } bool IsClosed() const { return mbIsClosed; } bool IsCurve() const { return mbIsCurve; } const com::sun::star::drawing::PointSequenceSequence& GetPointSequenceSequence() const { return maPoly.Coordinates; } diff --git a/xmloff/inc/xmloff/DashStyle.hxx b/xmloff/inc/xmloff/DashStyle.hxx index 6d1b801eb34d..91c51d96f946 100644 --- a/xmloff/inc/xmloff/DashStyle.hxx +++ b/xmloff/inc/xmloff/DashStyle.hxx @@ -46,7 +46,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, - ::rtl::OUString& rStrName ); + OUString& rStrName ); }; @@ -58,7 +58,7 @@ public: XMLDashStyleExport( SvXMLExport& rExport ); ~XMLDashStyleExport(); - sal_Bool exportXML( const ::rtl::OUString& rStrName, + sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; diff --git a/xmloff/inc/xmloff/DocumentSettingsContext.hxx b/xmloff/inc/xmloff/DocumentSettingsContext.hxx index d45a3017fe8d..a9277946ca9a 100644 --- a/xmloff/inc/xmloff/DocumentSettingsContext.hxx +++ b/xmloff/inc/xmloff/DocumentSettingsContext.hxx @@ -35,13 +35,13 @@ class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext ::std::auto_ptr< XMLDocumentSettingsContext_Data > m_pData; public: - XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~XMLDocumentSettingsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/xmloff/inc/xmloff/EnumPropertyHdl.hxx b/xmloff/inc/xmloff/EnumPropertyHdl.hxx index 9084b6884e3a..f2ef26d4c974 100644 --- a/xmloff/inc/xmloff/EnumPropertyHdl.hxx +++ b/xmloff/inc/xmloff/EnumPropertyHdl.hxx @@ -37,8 +37,8 @@ public: XMLEnumPropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) : mpEnumMap( pEnumMap ), mrType( rType ) {} virtual ~XMLEnumPropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_ENUMPROPERTYHANDLER_HXX diff --git a/xmloff/inc/xmloff/GradientStyle.hxx b/xmloff/inc/xmloff/GradientStyle.hxx index 95153d204f16..145ba554505d 100644 --- a/xmloff/inc/xmloff/GradientStyle.hxx +++ b/xmloff/inc/xmloff/GradientStyle.hxx @@ -23,6 +23,7 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include +#include class SvXMLImport; class SvXMLExport; @@ -31,7 +32,6 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } namespace uno { class Any; } } } } -namespace rtl { class OUString; } class XMLOFF_DLLPUBLIC XMLGradientStyleImport @@ -46,7 +46,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, - ::rtl::OUString& rStrName ); + OUString& rStrName ); }; @@ -59,7 +59,7 @@ public: ~XMLGradientStyleExport(); sal_Bool exportXML( - const ::rtl::OUString& rStrName, + const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; diff --git a/xmloff/inc/xmloff/HatchStyle.hxx b/xmloff/inc/xmloff/HatchStyle.hxx index 7ae6870dba9e..6cdceb618f10 100644 --- a/xmloff/inc/xmloff/HatchStyle.hxx +++ b/xmloff/inc/xmloff/HatchStyle.hxx @@ -23,6 +23,7 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include +#include class SvXMLImport; class SvXMLExport; @@ -31,7 +32,6 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } namespace uno { class Any; } } } } -namespace rtl { class OUString; } class XMLOFF_DLLPUBLIC XMLHatchStyleImport @@ -46,7 +46,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ::com::sun::star::uno::Any& rValue, - ::rtl::OUString& rStrName ); + OUString& rStrName ); }; class XMLOFF_DLLPUBLIC XMLHatchStyleExport @@ -57,7 +57,7 @@ public: XMLHatchStyleExport( SvXMLExport& rExport ); ~XMLHatchStyleExport(); - sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); + sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; #endif // _XMLOFF_HATCHELEMENT_HXX diff --git a/xmloff/inc/xmloff/ImageStyle.hxx b/xmloff/inc/xmloff/ImageStyle.hxx index c09bb760a599..5c0dfd6ff820 100644 --- a/xmloff/inc/xmloff/ImageStyle.hxx +++ b/xmloff/inc/xmloff/ImageStyle.hxx @@ -37,15 +37,15 @@ public: XMLImageStyle(); ~XMLImageStyle(); - sal_Bool exportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport ); - sal_Bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName, SvXMLImport& rImport ); + sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport ); + sal_Bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); private: - SAL_DLLPRIVATE sal_Bool ImpExportXML( const ::rtl::OUString& rStrName, const ::com::sun::star::uno::Any& rValue, + SAL_DLLPRIVATE sal_Bool ImpExportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport ); SAL_DLLPRIVATE sal_Bool ImpImportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - ::com::sun::star::uno::Any& rValue, ::rtl::OUString& rStrName, + ::com::sun::star::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); }; diff --git a/xmloff/inc/xmloff/MarkerStyle.hxx b/xmloff/inc/xmloff/MarkerStyle.hxx index b3bc3d0e2870..5cff7cb23745 100644 --- a/xmloff/inc/xmloff/MarkerStyle.hxx +++ b/xmloff/inc/xmloff/MarkerStyle.hxx @@ -23,6 +23,7 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include +#include class SvXMLImport; class SvXMLExport; @@ -31,7 +32,6 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } namespace uno { class Any; } } } } -namespace rtl { class OUString; } class XMLOFF_DLLPUBLIC XMLMarkerStyleImport @@ -46,7 +46,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, - ::rtl::OUString& rStrName ); + OUString& rStrName ); }; class XMLOFF_DLLPUBLIC XMLMarkerStyleExport @@ -58,7 +58,7 @@ public: ~XMLMarkerStyleExport(); sal_Bool exportXML( - const ::rtl::OUString& rStrName, + const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); }; diff --git a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx b/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx index 349f11dc421a..e6dc49c20fff 100644 --- a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx +++ b/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx @@ -31,11 +31,11 @@ class XMLNamedBoolPropertyHdl : public XMLPropertyHandler { private: - const ::rtl::OUString maTrueStr; - const ::rtl::OUString maFalseStr; + const OUString maTrueStr; + const OUString maFalseStr; public: - XMLNamedBoolPropertyHdl( const ::rtl::OUString& rTrueStr, const ::rtl::OUString& rFalseStr ) : maTrueStr( rTrueStr ), maFalseStr( rFalseStr ) {} + XMLNamedBoolPropertyHdl( const OUString& rTrueStr, const OUString& rFalseStr ) : maTrueStr( rTrueStr ), maFalseStr( rFalseStr ) {} XMLNamedBoolPropertyHdl( ::xmloff::token::XMLTokenEnum eTrue, @@ -47,8 +47,8 @@ public: virtual ~XMLNamedBoolPropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_NAMEDBOOLPROPERTYHANDLER_HXX diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/xmloff/inc/xmloff/ProgressBarHelper.hxx index e558b0f6b29d..e34e6a07919d 100644 --- a/xmloff/inc/xmloff/ProgressBarHelper.hxx +++ b/xmloff/inc/xmloff/ProgressBarHelper.hxx @@ -48,7 +48,7 @@ public: const sal_Bool bStrict); ~ProgressBarHelper(); - void SetText(::rtl::OUString& rText) { if (xStatusIndicator.is()) xStatusIndicator->setText(rText); } + void SetText(OUString& rText) { if (xStatusIndicator.is()) xStatusIndicator->setText(rText); } void SetRange(sal_Int32 nVal) { nRange = nVal; } void SetReference(sal_Int32 nVal) { nReference = nVal; } void SetValue(sal_Int32 nValue); diff --git a/xmloff/inc/xmloff/SchXMLExportHelper.hxx b/xmloff/inc/xmloff/SchXMLExportHelper.hxx index 5b31acf19a53..7413438fe8f7 100644 --- a/xmloff/inc/xmloff/SchXMLExportHelper.hxx +++ b/xmloff/inc/xmloff/SchXMLExportHelper.hxx @@ -50,7 +50,7 @@ public: virtual ~SchXMLExportHelper(); /// returns the string corresponding to the current FileFormat CLSID for Chart - const rtl::OUString& getChartCLSID(); + const OUString& getChartCLSID(); private: SchXMLExportHelper(); // not defined diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx index 24718d13acc7..5981597c68bd 100644 --- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx +++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx @@ -91,7 +91,7 @@ public: */ SvXMLImportContext* CreateChartContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::frame::XModel > xChartModel, const com::sun::star::uno::Reference< @@ -138,7 +138,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xDoc, sal_Int32 nCoordinateSystemIndex, - const ::rtl::OUString & rChartTypeName, + const OUString & rChartTypeName, bool bPushLastChartType = false ); static void DeleteDataSeries( diff --git a/xmloff/inc/xmloff/SettingsExportHelper.hxx b/xmloff/inc/xmloff/SettingsExportHelper.hxx index 5b950317906e..e790e09860da 100644 --- a/xmloff/inc/xmloff/SettingsExportHelper.hxx +++ b/xmloff/inc/xmloff/SettingsExportHelper.hxx @@ -46,49 +46,49 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringSubstitution > mxStringSubsitution; - const rtl::OUString msPrinterIndependentLayout; - const rtl::OUString msColorTableURL; - const rtl::OUString msLineEndTableURL; - const rtl::OUString msHatchTableURL; - const rtl::OUString msDashTableURL; - const rtl::OUString msGradientTableURL; - const rtl::OUString msBitmapTableURL; + const OUString msPrinterIndependentLayout; + const OUString msColorTableURL; + const OUString msLineEndTableURL; + const OUString msHatchTableURL; + const OUString msDashTableURL; + const OUString msGradientTableURL; + const OUString msBitmapTableURL; - void ManipulateSetting( com::sun::star::uno::Any& rAny, const rtl::OUString& rName ) const; + void ManipulateSetting( com::sun::star::uno::Any& rAny, const OUString& rName ) const; void CallTypeFunction(const com::sun::star::uno::Any& rAny, - const rtl::OUString& rName) const; + const OUString& rName) const; - void exportBool(const sal_Bool bValue, const rtl::OUString& rName) const; - void exportByte(const sal_Int8 nValue, const rtl::OUString& rName) const; - void exportShort(const sal_Int16 nValue, const rtl::OUString& rName) const; - void exportInt(const sal_Int32 nValue, const rtl::OUString& rName) const; - void exportLong(const sal_Int64 nValue, const rtl::OUString& rName) const; - void exportDouble(const double fValue, const rtl::OUString& rName) const; - void exportString(const rtl::OUString& sValue, const rtl::OUString& rName) const; - void exportDateTime(const com::sun::star::util::DateTime& aValue, const rtl::OUString& rName) const; + void exportBool(const sal_Bool bValue, const OUString& rName) const; + void exportByte(const sal_Int8 nValue, const OUString& rName) const; + void exportShort(const sal_Int16 nValue, const OUString& rName) const; + void exportInt(const sal_Int32 nValue, const OUString& rName) const; + void exportLong(const sal_Int64 nValue, const OUString& rName) const; + void exportDouble(const double fValue, const OUString& rName) const; + void exportString(const OUString& sValue, const OUString& rName) const; + void exportDateTime(const com::sun::star::util::DateTime& aValue, const OUString& rName) const; void exportSequencePropertyValue( const com::sun::star::uno::Sequence& aProps, - const rtl::OUString& rName) const; + const OUString& rName) const; void exportbase64Binary( const com::sun::star::uno::Sequence& aProps, - const rtl::OUString& rName) const; + const OUString& rName) const; void exportMapEntry(const com::sun::star::uno::Any& rAny, - const rtl::OUString& rName, + const OUString& rName, const sal_Bool bNameAccess) const; void exportNameAccess( const com::sun::star::uno::Reference& aNamed, - const rtl::OUString& rName) const; + const OUString& rName) const; void exportIndexAccess( const com::sun::star::uno::Reference aIndexed, - const rtl::OUString rName) const; + const OUString rName) const; void exportSymbolDescriptors( const com::sun::star::uno::Sequence < com::sun::star::formula::SymbolDescriptor > &rProps, - const rtl::OUString rName) const; + const OUString rName) const; void exportForbiddenCharacters( const com::sun::star::uno::Any &rAny, - const rtl::OUString rName) const; + const OUString rName) const; public: XMLSettingsExportHelper( ::xmloff::XMLSettingsExportContext& i_rContext ); @@ -96,7 +96,7 @@ public: void exportAllSettings( const com::sun::star::uno::Sequence& aProps, - const rtl::OUString& rName) const; + const OUString& rName) const; }; #endif diff --git a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx index e59820ea98e7..576339d9c9de 100644 --- a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx +++ b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx @@ -36,11 +36,11 @@ SinglePropertySetInfoMap_Impl; class SinglePropertySetInfoCache : private SinglePropertySetInfoMap_Impl { - ::rtl::OUString sName; + OUString sName; public: - inline SinglePropertySetInfoCache( const ::rtl::OUString& rName ); + inline SinglePropertySetInfoCache( const OUString& rName ); ~SinglePropertySetInfoCache() {}; sal_Bool hasProperty( @@ -54,7 +54,7 @@ public: }; inline SinglePropertySetInfoCache::SinglePropertySetInfoCache( - const ::rtl::OUString& rName ) : + const OUString& rName ) : sName( rName ) { } diff --git a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx index 7fa4e8014b91..6430b8258c6e 100644 --- a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx +++ b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx @@ -38,8 +38,8 @@ public: XMLWordWrapPropertyHdl( SvXMLImport* pImport ); virtual ~XMLWordWrapPropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_NAMEDBOOLPROPERTYHANDLER_HXX diff --git a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx index f18137f6c026..d2804928a324 100644 --- a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx +++ b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx @@ -32,13 +32,13 @@ class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOut; - ::rtl::OUString sBase64CharsLeft; + OUString sBase64CharsLeft; public: TYPEINFO(); XMLBase64ImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, const ::com::sun::star::uno::Reference< @@ -48,7 +48,7 @@ public: virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; diff --git a/xmloff/inc/xmloff/XMLCharContext.hxx b/xmloff/inc/xmloff/XMLCharContext.hxx index 085e44b52062..644b03877d64 100644 --- a/xmloff/inc/xmloff/XMLCharContext.hxx +++ b/xmloff/inc/xmloff/XMLCharContext.hxx @@ -38,14 +38,14 @@ public: XMLCharContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Unicode c, sal_Bool bCount ); XMLCharContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Int16 nControl ); @@ -57,7 +57,7 @@ public: virtual void EndElement(); virtual void InsertControlCharacter(sal_Int16 _nControl); - virtual void InsertString(const ::rtl::OUString& _sString); + virtual void InsertString(const OUString& _sString); }; // --------------------------------------------------------------------- #endif // INCLUDED__XMLOFF_CHARCONTEXT_HXX diff --git a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx b/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx index 01545fc519c3..cad125159d11 100644 --- a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx +++ b/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx @@ -47,13 +47,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; /// Exports the given value in cas of the given XML-data-type virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx index df02b80b0d5d..40f42b6be202 100644 --- a/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx +++ b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx @@ -45,17 +45,17 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL startElement(const ::rtl::OUString& aName, + virtual void SAL_CALL startElement(const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const ::rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const ::rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString& aWhitespaces) + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL processingInstruction(const ::rtl::OUString& aTarget, - const ::rtl::OUString& aData) + virtual void SAL_CALL processingInstruction(const OUString& aTarget, + const OUString& aData) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -63,20 +63,20 @@ public: // ::com::sun::star::xml::sax::XExtendedDocumentHandler virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL comment(const ::rtl::OUString& sComment) + virtual void SAL_CALL comment(const OUString& sComment) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL allowLineBreak(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL unknown(const ::rtl::OUString& sString) + virtual void SAL_CALL unknown(const OUString& sString) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/xmloff/inc/xmloff/XMLEventExport.hxx b/xmloff/inc/xmloff/XMLEventExport.hxx index 6a942fb8e738..52b77daa8764 100644 --- a/xmloff/inc/xmloff/XMLEventExport.hxx +++ b/xmloff/inc/xmloff/XMLEventExport.hxx @@ -38,8 +38,8 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -typedef ::std::map< ::rtl::OUString, XMLEventExportHandler* > HandlerMap; -typedef ::std::map< ::rtl::OUString, XMLEventName > NameMap; +typedef ::std::map< OUString, XMLEventExportHandler* > HandlerMap; +typedef ::std::map< OUString, XMLEventName > NameMap; /** * Export instances of EventsSupplier services. To use this class you @@ -58,7 +58,7 @@ typedef ::std::map< ::rtl::OUString, XMLEventName > NameMap; */ class XMLOFF_DLLPUBLIC XMLEventExport { - const ::rtl::OUString sEventType; + const OUString sEventType; SvXMLExport& rExport; @@ -77,7 +77,7 @@ public: /// The handlers will be deleted when the object is destroyed, hence /// no pointers to a handler registered with AddHandler() should be /// held by anyone. - void AddHandler( const ::rtl::OUString& rName, + void AddHandler( const OUString& rName, XMLEventExportHandler* rHandler ); /// register additional event names @@ -108,7 +108,7 @@ public: void ExportSingleEvent( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rEventValues, - const ::rtl::OUString& rApiEventName, + const OUString& rApiEventName, sal_Bool bUseWhitespace = sal_True ); private: diff --git a/xmloff/inc/xmloff/XMLEventsImportContext.hxx b/xmloff/inc/xmloff/XMLEventsImportContext.hxx index 179b97b1c09a..aa093714ae56 100644 --- a/xmloff/inc/xmloff/XMLEventsImportContext.hxx +++ b/xmloff/inc/xmloff/XMLEventsImportContext.hxx @@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { namespace rtl { class OUString; } typedef ::std::pair< - ::rtl::OUString, + OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> > EventNameValuesPair; @@ -70,26 +70,26 @@ public: XMLEventsImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName); + const OUString& rLocalName); XMLEventsImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventsSupplier> & xEventsSupplier); XMLEventsImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace> & xNameRepl); ~XMLEventsImportContext(); void AddEventValues( - const ::rtl::OUString& rEventName, + const OUString& rEventName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rValues); @@ -108,7 +108,7 @@ public: /// if the import operates indelayed mode, you can use this method /// to obtain the value sequence for a specific event sal_Bool GetEventSequence( - const ::rtl::OUString& rName, + const OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rSequence ); @@ -122,7 +122,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx index ad6a46d81b8e..8ee84d8686df 100644 --- a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx +++ b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx @@ -28,7 +28,7 @@ #include class XMLFontAutoStylePool_Impl; -typedef std::set XMLFontAutoStylePoolNames_Impl; +typedef std::set XMLFontAutoStylePoolNames_Impl; class SvXMLExport; class XMLOFF_DLLPUBLIC XMLFontAutoStylePool : public UniRefBase @@ -50,20 +50,20 @@ public: XMLFontAutoStylePool( SvXMLExport& rExport, bool tryToEmbedFonts = false ); ~XMLFontAutoStylePool(); - ::rtl::OUString Add( - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + OUString Add( + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFamily, FontPitch nPitch, rtl_TextEncoding eEnc ); - ::rtl::OUString Find( - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + OUString Find( + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFamily, FontPitch nPitch, rtl_TextEncoding eEnc )const; - ::rtl::OUString Find( const ::rtl::OUString& rInternalName ) const; + OUString Find( const OUString& rInternalName ) const; void exportXML(); }; diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/xmloff/inc/xmloff/XMLFontStylesContext.hxx index afd495c17b44..c04d5c12230a 100644 --- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx +++ b/xmloff/inc/xmloff/XMLFontStylesContext.hxx @@ -47,7 +47,7 @@ class XMLOFF_DLLPUBLIC XMLFontStylesContext : public SvXMLStylesContext protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -56,7 +56,7 @@ public: TYPEINFO(); XMLFontStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, rtl_TextEncoding eDfltEnc ); @@ -67,7 +67,7 @@ public: return *pFontStyleAttrTokenMap; } - sal_Bool FillProperties( const ::rtl::OUString& rName, + sal_Bool FillProperties( const OUString& rName, ::std::vector< XMLPropertyState > &rProps, sal_Int32 nFamilyNameIdx, sal_Int32 nStyleNameIdx, diff --git a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx b/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx index 068fb89bc9cf..06fee705d04d 100644 --- a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx +++ b/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx @@ -35,7 +35,7 @@ public: TYPEINFO(); XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles); @@ -44,7 +44,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); // This method is called for every default style diff --git a/xmloff/inc/xmloff/XMLPageExport.hxx b/xmloff/inc/xmloff/XMLPageExport.hxx index ae2e1c497f6e..c30dbe43d786 100644 --- a/xmloff/inc/xmloff/XMLPageExport.hxx +++ b/xmloff/inc/xmloff/XMLPageExport.hxx @@ -44,8 +44,8 @@ class SvXMLExportPropertyMapper; struct XMLPageExportNameEntry { - ::rtl::OUString sPageMasterName; - ::rtl::OUString sStyleName; + OUString sPageMasterName; + OUString sStyleName; }; //______________________________________________________________________________ @@ -54,14 +54,14 @@ class XMLOFF_DLLPUBLIC XMLPageExport : public UniRefBase { SvXMLExport& rExport; - const ::rtl::OUString sIsPhysical; - const ::rtl::OUString sFollowStyle; + const OUString sIsPhysical; + const OUString sFollowStyle; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xPageStyles; ::std::vector< XMLPageExportNameEntry > aNameVector; - SAL_DLLPRIVATE sal_Bool findPageMasterName( const ::rtl::OUString& rStyleName, ::rtl::OUString& rPMName ) const; + SAL_DLLPRIVATE sal_Bool findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const; UniReference < XMLPropertyHandlerFactory > xPageMasterPropHdlFactory; UniReference < XMLPropertySetMapper > xPageMasterPropSetMapper; @@ -74,7 +74,7 @@ protected: virtual void collectPageMasterAutoStyle( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, - ::rtl::OUString& rPageMasterName ); + OUString& rPageMasterName ); virtual void exportMasterPageContent( const ::com::sun::star::uno::Reference < diff --git a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx b/xmloff/inc/xmloff/XMLSettingsExportContext.hxx index 46e51baa69aa..819da2b41d77 100644 --- a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx +++ b/xmloff/inc/xmloff/XMLSettingsExportContext.hxx @@ -36,7 +36,7 @@ namespace xmloff { public: virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, - const ::rtl::OUString& i_rValue ) = 0; + const OUString& i_rValue ) = 0; virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue ) = 0; @@ -44,7 +44,7 @@ namespace xmloff const sal_Bool i_bIgnoreWhitespace ) = 0; virtual void EndElement( const sal_Bool i_bIgnoreWhitespace ) = 0; - virtual void Characters( const ::rtl::OUString& i_rCharacters ) = 0; + virtual void Characters( const OUString& i_rCharacters ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const = 0; diff --git a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx b/xmloff/inc/xmloff/XMLShapeStyleContext.hxx index 720d300cb5cf..2f39eee0e08f 100644 --- a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx +++ b/xmloff/inc/xmloff/XMLShapeStyleContext.hxx @@ -33,21 +33,21 @@ class SvXMLImport; class XMLOFF_DLLPUBLIC XMLShapeStyleContext: public XMLPropStyleContext { protected: - ::rtl::OUString m_sControlDataStyleName; - ::rtl::OUString m_sListStyleName; + OUString m_sControlDataStyleName; + OUString m_sListStyleName; sal_Bool m_bIsNumRuleAlreadyConverted; protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLShapeStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_GRAPHICS_ID); @@ -55,7 +55,7 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void Finish( sal_Bool bOverwrite ); diff --git a/xmloff/inc/xmloff/XMLStringVector.hxx b/xmloff/inc/xmloff/XMLStringVector.hxx index 7d42bb747123..863ec7aa4d3e 100644 --- a/xmloff/inc/xmloff/XMLStringVector.hxx +++ b/xmloff/inc/xmloff/XMLStringVector.hxx @@ -24,7 +24,7 @@ #include -typedef ::std::vector < ::rtl::OUString> XMLStringVector; +typedef ::std::vector < OUString> XMLStringVector; #endif // _XMLOFF_XMLSTRINGVECTOR_HXX diff --git a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx index aabe1f4612a6..d8a209c795ac 100644 --- a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx +++ b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx @@ -33,7 +33,7 @@ namespace rtl { class OUString; } class XMLTextListAutoStylePool_Impl; -typedef std::set XMLTextListAutoStylePoolNames_Impl; +typedef std::set XMLTextListAutoStylePoolNames_Impl; class XMLTextListAutoStylePoolEntry_Impl; class SvXMLExport; @@ -41,7 +41,7 @@ class XMLOFF_DLLPUBLIC XMLTextListAutoStylePool { SvXMLExport& rExport; - ::rtl::OUString sPrefix; + OUString sPrefix; XMLTextListAutoStylePool_Impl *pPool; XMLTextListAutoStylePoolNames_Impl m_aNames; @@ -58,16 +58,16 @@ public: XMLTextListAutoStylePool( SvXMLExport& rExport ); ~XMLTextListAutoStylePool(); - void RegisterName( const ::rtl::OUString& rName ); + void RegisterName( const OUString& rName ); - ::rtl::OUString Add( + OUString Add( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > & rNumRules ); - ::rtl::OUString Find( + OUString Find( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > & rNumRules ) const; - ::rtl::OUString Find( const ::rtl::OUString& rInternalName ) const; + OUString Find( const OUString& rInternalName ) const; void exportXML() const; }; diff --git a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx index 16ae31080147..c0965e7564f9 100644 --- a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx +++ b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx @@ -31,11 +31,11 @@ namespace com { namespace sun { namespace star { class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext { - const ::rtl::OUString sIsPhysical; - const ::rtl::OUString sPageStyleLayout; - const ::rtl::OUString sFollowStyle; - ::rtl::OUString sFollow; - ::rtl::OUString sPageMasterName; + const OUString sIsPhysical; + const OUString sPageStyleLayout; + const OUString sFollowStyle; + OUString sFollow; + OUString sPageMasterName; ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > xStyle; @@ -62,7 +62,7 @@ public: TYPEINFO(); XMLTextMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Bool bOverwrite ); @@ -70,12 +70,12 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bFooter, const sal_Bool bLeft, diff --git a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx index cad00c29728c..8ef0dcaef6a6 100644 --- a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx +++ b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx @@ -32,19 +32,19 @@ namespace com { namespace sun { namespace star { class XMLOFF_DLLPUBLIC XMLTextMasterPageExport : public XMLPageExport { - const ::rtl::OUString sHeaderText; - const ::rtl::OUString sHeaderOn; - const ::rtl::OUString sHeaderShareContent; - const ::rtl::OUString sHeaderTextFirst; - const ::rtl::OUString sHeaderTextLeft; + const OUString sHeaderText; + const OUString sHeaderOn; + const OUString sHeaderShareContent; + const OUString sHeaderTextFirst; + const OUString sHeaderTextLeft; - const ::rtl::OUString sFirstShareContent; + const OUString sFirstShareContent; - const ::rtl::OUString sFooterText; - const ::rtl::OUString sFooterOn; - const ::rtl::OUString sFooterShareContent; - const ::rtl::OUString sFooterTextFirst; - const ::rtl::OUString sFooterTextLeft; + const OUString sFooterText; + const OUString sFooterOn; + const OUString sFooterShareContent; + const OUString sFooterTextFirst; + const OUString sFooterTextLeft; protected: diff --git a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx b/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx index dfcf1df2f045..9d03c401b900 100644 --- a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx +++ b/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx @@ -28,12 +28,12 @@ class XMLOFF_DLLPUBLIC XMLTextMasterStylesContext : public SvXMLStylesContext { protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -43,7 +43,7 @@ public: TYPEINFO(); XMLTextMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); diff --git a/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx index 556b035fff12..46d77a487297 100644 --- a/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx +++ b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx @@ -28,9 +28,9 @@ class XMLOFF_DLLPUBLIC XMLTextShapeImportHelper : public XMLShapeImportHelper { SvXMLImport& rImport; - const ::rtl::OUString sAnchorType; - const ::rtl::OUString sAnchorPageNo; - const ::rtl::OUString sVertOrientPosition; + const OUString sAnchorType; + const OUString sAnchorPageNo; + const OUString sVertOrientPosition; public: diff --git a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx b/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx index e8916051579d..922153a9188a 100644 --- a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx +++ b/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx @@ -25,7 +25,7 @@ class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext : public XMLShapeStyleContext { - const ::rtl::OUString sIsAutoUpdate; + const OUString sIsAutoUpdate; sal_Bool bAutoUpdate : 1; @@ -34,15 +34,15 @@ class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext : public XMLShapeStyleContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLTextShapeStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, @@ -51,7 +51,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); sal_Bool IsAutoUpdate() const { return bAutoUpdate; } diff --git a/xmloff/inc/xmloff/XMLTextTableContext.hxx b/xmloff/inc/xmloff/XMLTextTableContext.hxx index 42fbef77be38..c0a3df1aa88c 100644 --- a/xmloff/inc/xmloff/XMLTextTableContext.hxx +++ b/xmloff/inc/xmloff/XMLTextTableContext.hxx @@ -41,7 +41,7 @@ public: XMLTextTableContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~XMLTextTableContext(); virtual ::com::sun::star::uno::Reference < diff --git a/xmloff/inc/xmloff/attrlist.hxx b/xmloff/inc/xmloff/attrlist.hxx index 69b56b54b2d5..cc0d6aa14f65 100644 --- a/xmloff/inc/xmloff/attrlist.hxx +++ b/xmloff/inc/xmloff/attrlist.hxx @@ -57,27 +57,27 @@ public: // ::com::sun::star::xml::sax::XAttributeList virtual sal_Int16 SAL_CALL getLength(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::util::XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw( ::com::sun::star::uno::RuntimeException ); // methods that are not contained in any interface - void AddAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sValue ); + void AddAttribute( const OUString &sName , const OUString &sValue ); void Clear(); - void RemoveAttribute( const ::rtl::OUString sName ); + void RemoveAttribute( const OUString sName ); void AppendAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & ); - void SetValueByIndex( sal_Int16 i, const ::rtl::OUString& rValue ); + void SetValueByIndex( sal_Int16 i, const OUString& rValue ); void RemoveAttributeByIndex( sal_Int16 i ); - void RenameAttributeByIndex( sal_Int16 i, const ::rtl::OUString& rNewName ); - sal_Int16 GetIndexByName( const ::rtl::OUString& rName ) const; + void RenameAttributeByIndex( sal_Int16 i, const OUString& rNewName ); + sal_Int16 GetIndexByName( const OUString& rName ) const; private: - const ::rtl::OUString sType; // "CDATA" + const OUString sType; // "CDATA" }; diff --git a/xmloff/inc/xmloff/controlpropertyhdl.hxx b/xmloff/inc/xmloff/controlpropertyhdl.hxx index 6f2dbcc45820..3e2cbfd51e23 100644 --- a/xmloff/inc/xmloff/controlpropertyhdl.hxx +++ b/xmloff/inc/xmloff/controlpropertyhdl.hxx @@ -46,8 +46,8 @@ namespace xmloff public: ORotationAngleHandler(); - virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; //===================================================================== @@ -58,8 +58,8 @@ namespace xmloff public: OFontWidthHandler(); - virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; //===================================================================== @@ -76,8 +76,8 @@ namespace xmloff OControlBorderHandler( const BorderFacet _eFacet ); - virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; private: BorderFacet m_eFacet; @@ -91,8 +91,8 @@ namespace xmloff public: OControlTextEmphasisHandler(); - virtual sal_Bool importXML( const ::rtl::OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; //===================================================================== diff --git a/xmloff/inc/xmloff/formlayerexport.hxx b/xmloff/inc/xmloff/formlayerexport.hxx index 405e1849da10..5774988f42d8 100644 --- a/xmloff/inc/xmloff/formlayerexport.hxx +++ b/xmloff/inc/xmloff/formlayerexport.hxx @@ -88,7 +88,7 @@ namespace xmloff @see seekPage */ - ::rtl::OUString getControlId( + OUString getControlId( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl); /** retrieves the style name for the control's number style. @@ -102,7 +102,7 @@ namespace xmloff @see examineForms @see seekPage */ - ::rtl::OUString getControlNumberStyle( + OUString getControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl ); /** examines the forms collection given. diff --git a/xmloff/inc/xmloff/formlayerimport.hxx b/xmloff/inc/xmloff/formlayerimport.hxx index ea582b78863e..9a05b73c9ec0 100644 --- a/xmloff/inc/xmloff/formlayerimport.hxx +++ b/xmloff/inc/xmloff/formlayerimport.hxx @@ -68,7 +68,7 @@ namespace xmloff SvXMLImportContext* createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName); + const OUString& _rLocalName); /** create an SvXMLImportContext instance which is able to import the <form:form> element. @@ -80,7 +80,7 @@ namespace xmloff */ SvXMLImportContext* createContext( const sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName, + const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttribs); /** lookup a control given by id. @@ -92,7 +92,7 @@ namespace xmloff @see startPage */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - lookupControl(const ::rtl::OUString& _rId); + lookupControl(const OUString& _rId); /** end importing the forms of the current page @@ -115,7 +115,7 @@ namespace xmloff */ void applyControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rControlNumerStyleName + const OUString& _rControlNumerStyleName ); /** to be called when the document has been completely imported diff --git a/xmloff/inc/xmloff/i18nmap.hxx b/xmloff/inc/xmloff/i18nmap.hxx index 6b83bac09649..22b8ad862a29 100644 --- a/xmloff/inc/xmloff/i18nmap.hxx +++ b/xmloff/inc/xmloff/i18nmap.hxx @@ -29,9 +29,9 @@ class SvI18NMapEntry_Key { sal_uInt16 nKind; - rtl::OUString aName; + OUString aName; public: - SvI18NMapEntry_Key( sal_uInt16 nKnd, const rtl::OUString& rName ) : + SvI18NMapEntry_Key( sal_uInt16 nKnd, const OUString& rName ) : nKind( nKnd ), aName( rName ) { @@ -51,7 +51,7 @@ public: } }; -typedef std::map SvI18NMap_Impl; +typedef std::map SvI18NMap_Impl; class XMLOFF_DLLPUBLIC SvI18NMap { @@ -59,13 +59,13 @@ class XMLOFF_DLLPUBLIC SvI18NMap public: // Add a name mapping - bool Add( sal_uInt16 nKind, const rtl::OUString& rName, - const rtl::OUString& rNewName ); + bool Add( sal_uInt16 nKind, const OUString& rName, + const OUString& rNewName ); // Return a mapped name. If the name could not be found, return the // original name. - const rtl::OUString& Get( sal_uInt16 nKind, - const rtl::OUString& rName ) const; + const OUString& Get( sal_uInt16 nKind, + const OUString& rName ) const; }; #endif // _XMLOFF_I18NMAP_HXX diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx index 5adb38662627..fe7492cf5e75 100644 --- a/xmloff/inc/xmloff/nmspmap.hxx +++ b/xmloff/inc/xmloff/nmspmap.hxx @@ -43,17 +43,17 @@ class NameSpaceEntry : public cppu::OWeakObject { public: // sName refers to the full namespace name - ::rtl::OUString sName; + OUString sName; // sPrefix is the prefix used to declare a given item to be from a given namespace - ::rtl::OUString sPrefix; + OUString sPrefix; // nKey is the unique identifier of a namespace sal_uInt16 nKey; }; struct OUStringEqFunc { - sal_Bool operator()( const rtl::OUString &r1, - const rtl::OUString &r2) const + sal_Bool operator()( const OUString &r1, + const OUString &r2) const { return r1 == r2; } @@ -67,7 +67,7 @@ struct uInt32lt return r1 < r2; } }; -typedef ::std::pair < sal_uInt16, rtl::OUString > QNamePair; +typedef ::std::pair < sal_uInt16, OUString > QNamePair; struct QNamePairHash { @@ -77,20 +77,20 @@ struct QNamePairHash } }; -typedef ::boost::unordered_map < QNamePair, ::rtl::OUString, QNamePairHash > QNameCache; -typedef ::boost::unordered_map < ::rtl::OUString, ::rtl::Reference , rtl::OUStringHash, OUStringEqFunc > NameSpaceHash; +typedef ::boost::unordered_map < QNamePair, OUString, QNamePairHash > QNameCache; +typedef ::boost::unordered_map < OUString, ::rtl::Reference , OUStringHash, OUStringEqFunc > NameSpaceHash; typedef ::std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry >, uInt32lt > NameSpaceMap; class XMLOFF_DLLPUBLIC SvXMLNamespaceMap { - const ::rtl::OUString sXMLNS; - const ::rtl::OUString sEmpty; + const OUString sXMLNS; + const OUString sEmpty; NameSpaceHash aNameHash; mutable NameSpaceHash aNameCache; NameSpaceMap aNameMap; mutable QNameCache aQNameCache; - SAL_DLLPRIVATE sal_uInt16 _Add( const rtl::OUString& rPrefix, const rtl::OUString &rName, sal_uInt16 nKey ); + SAL_DLLPRIVATE sal_uInt16 _Add( const OUString& rPrefix, const OUString &rName, sal_uInt16 nKey ); public: @@ -102,34 +102,34 @@ public: void operator =( const SvXMLNamespaceMap& rCmp ); int operator ==( const SvXMLNamespaceMap& rCmp ) const; - sal_uInt16 Add( const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rName, + sal_uInt16 Add( const OUString& rPrefix, + const OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN ); - sal_uInt16 AddIfKnown( const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rName ); + sal_uInt16 AddIfKnown( const OUString& rPrefix, + const OUString& rName ); - sal_uInt16 GetKeyByName( const ::rtl::OUString& rName ) const; - const ::rtl::OUString& GetNameByKey( sal_uInt16 nKey ) const; + sal_uInt16 GetKeyByName( const OUString& rName ) const; + const OUString& GetNameByKey( sal_uInt16 nKey ) const; - sal_uInt16 GetKeyByPrefix( const ::rtl::OUString& rPrefix ) const; - const ::rtl::OUString& GetPrefixByKey( sal_uInt16 nKey ) const; + sal_uInt16 GetKeyByPrefix( const OUString& rPrefix ) const; + const OUString& GetPrefixByKey( sal_uInt16 nKey ) const; - ::rtl::OUString GetQNameByKey( sal_uInt16 nKey, - const ::rtl::OUString& rLocalName, + OUString GetQNameByKey( sal_uInt16 nKey, + const OUString& rLocalName, sal_Bool bCache = sal_True) const; - ::rtl::OUString GetAttrNameByKey( sal_uInt16 nKey ) const; + OUString GetAttrNameByKey( sal_uInt16 nKey ) const; /* This will replace the version with the unused 5th default parameter */ - sal_uInt16 _GetKeyByAttrName( const ::rtl::OUString& rAttrName, - ::rtl::OUString *pPrefix, - ::rtl::OUString *pLocalName, - ::rtl::OUString *pNamespace = 0, + sal_uInt16 _GetKeyByAttrName( const OUString& rAttrName, + OUString *pPrefix, + OUString *pLocalName, + OUString *pNamespace = 0, sal_Bool bCache = sal_True) const; /* This will replace the version with the unused 3rd default parameter */ - sal_uInt16 _GetKeyByAttrName( const ::rtl::OUString& rAttrName, - ::rtl::OUString *pLocalName = 0, + sal_uInt16 _GetKeyByAttrName( const OUString& rAttrName, + OUString *pLocalName = 0, sal_Bool bCache = sal_True) const; sal_uInt16 GetFirstKey() const; @@ -140,28 +140,28 @@ public: This might be replaced by a better interface later. */ const NameSpaceHash& GetAllEntries() const { return aNameHash; } - static sal_Bool NormalizeOasisURN( ::rtl::OUString& rName ); - static sal_Bool NormalizeW3URI( ::rtl::OUString& rName ); - static sal_Bool NormalizeURI( ::rtl::OUString& rName ); + static sal_Bool NormalizeOasisURN( OUString& rName ); + static sal_Bool NormalizeW3URI( OUString& rName ); + static sal_Bool NormalizeURI( OUString& rName ); -/* deprecated */ sal_Bool AddAtIndex( sal_uInt16 nIdx, const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN ); +/* deprecated */ sal_Bool AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix, + const OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN ); /* deprecated */ sal_uInt16 GetIndexByKey( sal_uInt16 nKey ) const; -/* deprecated */ sal_uInt16 GetIndexByPrefix( const ::rtl::OUString& rPrefix ) const; +/* deprecated */ sal_uInt16 GetIndexByPrefix( const OUString& rPrefix ) const; /* deprecated */ sal_uInt16 GetFirstIndex() const; /* deprecated */ sal_uInt16 GetNextIndex( sal_uInt16 nOldIdx ) const; -/* deprecated */ const ::rtl::OUString& GetPrefixByIndex( sal_uInt16 nIdx ) const; -/* deprecated */ const ::rtl::OUString& GetNameByIndex( sal_uInt16 nIdx ) const; -/* deprecated */ ::rtl::OUString GetAttrNameByIndex( sal_uInt16 nIdx ) const; -/* deprecated */ ::rtl::OUString GetQNameByIndex( sal_uInt16 nIdx, - const ::rtl::OUString& rLocalName ) const; -/* deprecated */ sal_uInt16 GetKeyByAttrName( const ::rtl::OUString& rAttrName, - ::rtl::OUString *pPrefix, - ::rtl::OUString *pLocalName, - ::rtl::OUString *pNamespace=0, +/* deprecated */ const OUString& GetPrefixByIndex( sal_uInt16 nIdx ) const; +/* deprecated */ const OUString& GetNameByIndex( sal_uInt16 nIdx ) const; +/* deprecated */ OUString GetAttrNameByIndex( sal_uInt16 nIdx ) const; +/* deprecated */ OUString GetQNameByIndex( sal_uInt16 nIdx, + const OUString& rLocalName ) const; +/* deprecated */ sal_uInt16 GetKeyByAttrName( const OUString& rAttrName, + OUString *pPrefix, + OUString *pLocalName, + OUString *pNamespace=0, sal_uInt16 nIdxGuess = USHRT_MAX ) const; -/* deprecated */ sal_uInt16 GetKeyByAttrName( const ::rtl::OUString& rAttrName, - ::rtl::OUString *pLocalName = 0, +/* deprecated */ sal_uInt16 GetKeyByAttrName( const OUString& rAttrName, + OUString *pLocalName = 0, sal_uInt16 nIdxGuess = USHRT_MAX ) const; }; diff --git a/xmloff/inc/xmloff/numehelp.hxx b/xmloff/inc/xmloff/numehelp.hxx index 3cc3404de346..00b5a7a7988b 100644 --- a/xmloff/inc/xmloff/numehelp.hxx +++ b/xmloff/inc/xmloff/numehelp.hxx @@ -36,12 +36,12 @@ namespace rtl struct XMLNumberFormat { - rtl::OUString sCurrency; + OUString sCurrency; sal_Int32 nNumberFormat; sal_Int16 nType; sal_Bool bIsStandard : 1; XMLNumberFormat() : nNumberFormat(0), nType(0) {} - XMLNumberFormat(const rtl::OUString& sTempCurrency, sal_Int32 nTempFormat, + XMLNumberFormat(const OUString& sTempCurrency, sal_Int32 nTempFormat, sal_Int16 nTempType) : sCurrency(sTempCurrency), nNumberFormat(nTempFormat), nType(nTempType) {} }; @@ -60,18 +60,18 @@ class XMLOFF_DLLPUBLIC XMLNumberFormatAttributesExportHelper { ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > xNumberFormats; SvXMLExport* pExport; - const rtl::OUString sEmpty; - const rtl::OUString sStandardFormat; - const rtl::OUString sType; - const rtl::OUString sAttrValueType; - const rtl::OUString sAttrValue; - const rtl::OUString sAttrDateValue; - const rtl::OUString sAttrTimeValue; - const rtl::OUString sAttrBooleanValue; - const rtl::OUString sAttrStringValue; - const rtl::OUString sAttrCurrency; - const rtl::OUString msCurrencySymbol; - const rtl::OUString msCurrencyAbbreviation; + const OUString sEmpty; + const OUString sStandardFormat; + const OUString sType; + const OUString sAttrValueType; + const OUString sAttrValue; + const OUString sAttrDateValue; + const OUString sAttrTimeValue; + const OUString sAttrBooleanValue; + const OUString sAttrStringValue; + const OUString sAttrCurrency; + const OUString msCurrencySymbol; + const OUString msCurrencyAbbreviation; XMLNumberFormatSet aNumberFormats; public : XMLNumberFormatAttributesExportHelper(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier); @@ -80,13 +80,13 @@ public : ~XMLNumberFormatAttributesExportHelper(); void SetExport(SvXMLExport* pExp) { this->pExport = pExp; } - sal_Int16 GetCellType(const sal_Int32 nNumberFormat, rtl::OUString& sCurrency, bool& bIsStandard); + sal_Int16 GetCellType(const sal_Int32 nNumberFormat, OUString& sCurrency, bool& bIsStandard); static void WriteAttributes(SvXMLExport& rXMLExport, const sal_Int16 nTypeKey, const double& rValue, - const rtl::OUString& rCurrencySymbol, + const OUString& rCurrencySymbol, sal_Bool bExportValue = sal_True); - static sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, rtl::OUString& rCurrencySymbol, + static sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol, ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier); static sal_Int16 GetCellType(const sal_Int32 nNumberFormat, sal_Bool& bIsStandard, ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier); @@ -95,22 +95,22 @@ public : const double& rValue, sal_Bool bExportValue = sal_True); static void SetNumberFormatAttributes(SvXMLExport& rXMLExport, - const rtl::OUString& rValue, - const rtl::OUString& rCharacters, + const OUString& rValue, + const OUString& rCharacters, sal_Bool bExportValue = sal_True, sal_Bool bExportTypeAttribute = sal_True); - sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, rtl::OUString& rCurrencySymbol); + sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol); sal_Int16 GetCellType(const sal_Int32 nNumberFormat, bool& bIsStandard); void WriteAttributes(const sal_Int16 nTypeKey, const double& rValue, - const rtl::OUString& rCurrencySymbol, + const OUString& rCurrencySymbol, sal_Bool bExportValue = sal_True); void SetNumberFormatAttributes(const sal_Int32 nNumberFormat, const double& rValue, sal_Bool bExportValue = sal_True); - void SetNumberFormatAttributes(const rtl::OUString& rValue, - const rtl::OUString& rCharacters, + void SetNumberFormatAttributes(const OUString& rValue, + const OUString& rCharacters, sal_Bool bExportValue = sal_True, sal_Bool bExportTypeAttribute = sal_True); }; diff --git a/xmloff/inc/xmloff/prstylei.hxx b/xmloff/inc/xmloff/prstylei.hxx index 1f144b4db54e..3ec8114c6507 100644 --- a/xmloff/inc/xmloff/prstylei.hxx +++ b/xmloff/inc/xmloff/prstylei.hxx @@ -35,8 +35,8 @@ namespace com { namespace sun { namespace star { class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext { - const ::rtl::OUString msIsPhysical; - const ::rtl::OUString msFollowStyle; + const OUString msIsPhysical; + const OUString msFollowStyle; ::std::vector< XMLPropertyState > maProperties; ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > mxStyle; SvXMLImportContextRef mxStyles; @@ -47,8 +47,8 @@ class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); SvXMLStylesContext *GetStyles() { return (SvXMLStylesContext *)&mxStyles; } ::std::vector< XMLPropertyState > & GetProperties() { return maProperties; } @@ -63,7 +63,7 @@ public: TYPEINFO(); XMLPropStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = 0, sal_Bool bDefaultStyle=sal_False ); @@ -71,7 +71,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void FillPropertySet( diff --git a/xmloff/inc/xmloff/shapeexport.hxx b/xmloff/inc/xmloff/shapeexport.hxx index 55cc16037b65..8dfaa0f89d5e 100644 --- a/xmloff/inc/xmloff/shapeexport.hxx +++ b/xmloff/inc/xmloff/shapeexport.hxx @@ -126,8 +126,8 @@ enum XmlShapeType /** caches style and type info after a collectShapeAutostyle for later use in exportShape */ struct ImplXMLShapeExportInfo { - rtl::OUString msStyleName; - rtl::OUString msTextStyleName; + OUString msStyleName; + OUString msTextStyleName; sal_Int32 mnFamily; XmlShapeType meShapeType; @@ -168,7 +168,7 @@ private: sal_Bool mbExportLayer; ImplXMLShapeExportInfoVector maShapeInfos; ImplXMLShapeExportInfoVector::iterator maCurrentInfo; - rtl::OUString msPresentationStylePrefix; + OUString msPresentationStylePrefix; // #88546# possibility to swich progress bar handling on/off sal_Bool mbHandleProgressBar; @@ -182,30 +182,30 @@ private: SAL_DLLPRIVATE UniReference< SvXMLExportPropertyMapper > GetPropertySetMapper() const { return mxPropertySetMapper; } - const rtl::OUString msZIndex; - const rtl::OUString msPrintable; - const rtl::OUString msVisible; + const OUString msZIndex; + const OUString msPrintable; + const OUString msVisible; - const rtl::OUString msEmptyPres; - const rtl::OUString msModel; - const rtl::OUString msStartShape; - const rtl::OUString msEndShape; - const rtl::OUString msOnClick; - const rtl::OUString msEventType; - const rtl::OUString msPresentation; - const rtl::OUString msMacroName; - const rtl::OUString msScript; - const rtl::OUString msLibrary; - const rtl::OUString msClickAction; - const rtl::OUString msBookmark; - const rtl::OUString msEffect; - const rtl::OUString msPlayFull; - const rtl::OUString msVerb; - const rtl::OUString msSoundURL; - const rtl::OUString msSpeed; - const rtl::OUString msStarBasic; + const OUString msEmptyPres; + const OUString msModel; + const OUString msStartShape; + const OUString msEndShape; + const OUString msOnClick; + const OUString msEventType; + const OUString msPresentation; + const OUString msMacroName; + const OUString msScript; + const OUString msLibrary; + const OUString msClickAction; + const OUString msBookmark; + const OUString msEffect; + const OUString msPlayFull; + const OUString msVerb; + const OUString msSoundURL; + const OUString msSpeed; + const OUString msStarBasic; - rtl::OUStringBuffer msBuffer; + OUStringBuffer msBuffer; SAL_DLLPRIVATE void ImpCalcShapeType(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType& eShapeType); @@ -213,7 +213,7 @@ private: SAL_DLLPRIVATE void ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet); SAL_DLLPRIVATE void ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMat, ::basegfx::B2DTuple& rTRScale, double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, com::sun::star::awt::Point* pRefPoint); SAL_DLLPRIVATE void ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTRScale, double fTRShear, double fTRRotate, ::basegfx::B2DTuple& rTRTranslate, const sal_Int32 nFeatures); - SAL_DLLPRIVATE sal_Bool ImpExportPresentationAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, const rtl::OUString& rClass ); + SAL_DLLPRIVATE sal_Bool ImpExportPresentationAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, const OUString& rClass ); SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); SAL_DLLPRIVATE void ImpExportEvents( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); SAL_DLLPRIVATE void ImpExportDescription( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); // #i68101# @@ -304,7 +304,7 @@ public: void enableHandleProgressBar( sal_Bool bEnable = sal_True ) { mbHandleProgressBar = bEnable; } sal_Bool IsHandleProgressBarEnabled() const { return mbHandleProgressBar; } - void setPresentationStylePrefix( const rtl::OUString& rPrefix ) { msPresentationStylePrefix = rPrefix; } + void setPresentationStylePrefix( const OUString& rPrefix ) { msPresentationStylePrefix = rPrefix; } /** helper for chart that adds all attributes of a 3d scene element to the export */ void export3DSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ); diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx index 361ec0539f20..6de02130f243 100644 --- a/xmloff/inc/xmloff/shapeimport.hxx +++ b/xmloff/inc/xmloff/shapeimport.hxx @@ -188,7 +188,7 @@ public: SdXML3DLightContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXML3DLightContext(); @@ -234,10 +234,10 @@ public: ~SdXML3DSceneAttributesHelper(); /** creates a 3d ligth context and adds it to the internal list for later processing */ - SvXMLImportContext * create3DLightContext( sal_uInt16 nPrfx, const rtl::OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + SvXMLImportContext * create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); /** this should be called for each scene attribute */ - void processSceneAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + void processSceneAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); /** this sets the scene attributes at this propertyset */ void setSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ); @@ -250,17 +250,17 @@ class SvXMLShapeContext : public SvXMLImportContext protected: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; sal_Bool mbTemporaryShape; - rtl::OUString msHyperlink; + OUString msHyperlink; public: SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, sal_Bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {} + const OUString& rLName, sal_Bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {} TYPEINFO(); const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& getShape() const { return mxShape; } - void setHyperlink( const ::rtl::OUString& rHyperlink ); + void setHyperlink( const OUString& rHyperlink ); }; ////////////////////////////////////////////////////////////////////////////// @@ -299,10 +299,10 @@ class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public UniRefBase SvXMLTokenMap* mpPathShapeAttrTokenMap; SvXMLTokenMap* mpPolygonShapeAttrTokenMap; - const ::rtl::OUString msStartShape; - const ::rtl::OUString msEndShape; - const ::rtl::OUString msStartGluePointIndex; - const ::rtl::OUString msEndGluePointIndex; + const OUString msStartShape; + const OUString msEndShape; + const OUString msStartGluePointIndex; + const OUString msEndGluePointIndex; rtl::Reference< XMLTableImport > mxShapeTableImport; @@ -317,22 +317,22 @@ public: ~XMLShapeImportHelper(); SvXMLShapeContext* CreateGroupChildContext( - SvXMLImport& rImport, sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape = sal_False); SvXMLShapeContext* CreateFrameChildContext( - SvXMLImport& rImport, sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xFrameAttrList); SvXMLImportContext* CreateFrameChildContext( - SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); SvXMLShapeContext* Create3DSceneChildContext( - SvXMLImport& rImport, sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); @@ -379,7 +379,7 @@ public: void addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape, sal_Bool bStart, - const rtl::OUString& rDestShapeId, + const OUString& rDestShapeId, sal_Int32 nDestGlueId ); /** adds a mapping for a glue point identifier from an xml file to the identifier created after inserting diff --git a/xmloff/inc/xmloff/styleexp.hxx b/xmloff/inc/xmloff/styleexp.hxx index 076b4128be05..367c6d44b402 100644 --- a/xmloff/inc/xmloff/styleexp.hxx +++ b/xmloff/inc/xmloff/styleexp.hxx @@ -52,18 +52,18 @@ class XMLOFF_DLLPUBLIC XMLStyleExport : public UniRefBase { SvXMLExport& rExport; protected: - const ::rtl::OUString sIsPhysical; - const ::rtl::OUString sIsAutoUpdate; - const ::rtl::OUString sFollowStyle; - const ::rtl::OUString sNumberingStyleName; - const ::rtl::OUString sOutlineLevel; + const OUString sIsPhysical; + const OUString sIsAutoUpdate; + const OUString sFollowStyle; + const OUString sNumberingStyleName; + const OUString sOutlineLevel; SvXMLExport& GetExport() { return rExport; } const SvXMLExport& GetExport() const { return rExport; } private: - const ::rtl::OUString sPoolStyleName; + const OUString sPoolStyleName; SvXMLAutoStylePoolP *pAutoStylePool; @@ -72,10 +72,10 @@ protected: virtual sal_Bool exportStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & rStyle, - const ::rtl::OUString& rXMLFamily, + const OUString& rXMLFamily, const UniReference < SvXMLExportPropertyMapper >& rPropMapper, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xStyles, - const ::rtl::OUString* pPrefix = 0L ); + const OUString* pPrefix = 0L ); virtual void exportStyleAttributes( const ::com::sun::star::uno::Reference< @@ -87,39 +87,39 @@ protected: public: XMLStyleExport( SvXMLExport& rExp, - const ::rtl::OUString& rPoolStyleName, + const OUString& rPoolStyleName, SvXMLAutoStylePoolP *pAutoStyleP=0 ); virtual ~XMLStyleExport(); // void exportStyleFamily( -// const ::rtl::OUString& rFamily, const ::rtl::OUString& rXMLFamily, +// const OUString& rFamily, const OUString& rXMLFamily, // const UniReference < XMLPropertySetMapper >& rPropMapper, // sal_Bool bUsed, sal_uInt16 nFamily = 0, -// const ::rtl::OUString* pPrefix = 0L); +// const OUString* pPrefix = 0L); // void exportStyleFamily( -// const sal_Char *pFamily, const ::rtl::OUString& rXMLFamily, +// const sal_Char *pFamily, const OUString& rXMLFamily, // const UniReference < XMLPropertySetMapper >& rPropMapper, // sal_Bool bUsed, sal_uInt16 nFamily = 0, -// const ::rtl::OUString* pPrefix = 0L); +// const OUString* pPrefix = 0L); virtual sal_Bool exportDefaultStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropSet, - const ::rtl::OUString& rXMLFamily, + const OUString& rXMLFamily, const UniReference < SvXMLExportPropertyMapper >& rPropMapper ); void exportStyleFamily( - const ::rtl::OUString& rFamily, const ::rtl::OUString& rXMLFamily, + const OUString& rFamily, const OUString& rXMLFamily, const UniReference < SvXMLExportPropertyMapper >& rPropMapper, sal_Bool bUsed, sal_uInt16 nFamily = 0, - const ::rtl::OUString* pPrefix = 0L); + const OUString* pPrefix = 0L); void exportStyleFamily( - const sal_Char *pFamily, const ::rtl::OUString& rXMLFamily, + const sal_Char *pFamily, const OUString& rXMLFamily, const UniReference < SvXMLExportPropertyMapper >& rPropMapper, sal_Bool bUsed, sal_uInt16 nFamily = 0, - const ::rtl::OUString* pPrefix = 0L); + const OUString* pPrefix = 0L); }; #endif diff --git a/xmloff/inc/xmloff/table/XMLTableExport.hxx b/xmloff/inc/xmloff/table/XMLTableExport.hxx index 588d5ab0532b..e93c0a244a51 100644 --- a/xmloff/inc/xmloff/table/XMLTableExport.hxx +++ b/xmloff/inc/xmloff/table/XMLTableExport.hxx @@ -49,14 +49,14 @@ class SvXMLExport; class SvXMLExportPropertyMapper; -typedef ::std::map< const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >, rtl::OUString > TableStyleMap; +typedef ::std::map< const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >, OUString > TableStyleMap; struct XMLTableInfo { TableStyleMap maColumnStyleMap; TableStyleMap maRowStyleMap; TableStyleMap maCellStyleMap; - std::vector< ::rtl::OUString > maDefaultRowCellStyles; + std::vector< OUString > maDefaultRowCellStyles; }; typedef ::std::map< const ::com::sun::star::uno::Reference< com::sun::star::table::XColumnRowRange >, boost::shared_ptr< XMLTableInfo > > TableInfoMap; @@ -96,7 +96,7 @@ private: SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell ); - void ExportCell( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell, const boost::shared_ptr< XMLTableInfo >& pTableInfo, const ::rtl::OUString& sDefaultCellStyle ); + void ExportCell( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell, const boost::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& sDefaultCellStyle ); void ExportTableColumns( const com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess >& xtableColumns, const boost::shared_ptr< XMLTableInfo >& pTableInfo ); }; diff --git a/xmloff/inc/xmloff/table/XMLTableImport.hxx b/xmloff/inc/xmloff/table/XMLTableImport.hxx index 3d61dde50c2a..fec6b37e0eaa 100644 --- a/xmloff/inc/xmloff/table/XMLTableImport.hxx +++ b/xmloff/inc/xmloff/table/XMLTableImport.hxx @@ -35,8 +35,8 @@ class SvXMLStyleContext; -typedef std::map< ::rtl::OUString, ::rtl::OUString > XMLTableTemplate; -typedef std::map < ::rtl::OUString, boost::shared_ptr< XMLTableTemplate > > XMLTableTemplateMap; +typedef std::map< OUString, OUString > XMLTableTemplate; +typedef std::map < OUString, boost::shared_ptr< XMLTableTemplate > > XMLTableTemplateMap; class XMLTableImport : public UniRefBase { @@ -46,16 +46,16 @@ public: XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLPropertySetMapper >& xCellPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef ); virtual ~XMLTableImport(); - SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const OUString& rLName, ::com::sun::star::uno::Reference< ::com::sun::star::table::XColumnRowRange >& xColumnRowRange ); - SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); rtl::Reference< SvXMLImportPropertyMapper > GetCellImportPropertySetMapper() const { return mxCellImportPropertySetMapper; } rtl::Reference< SvXMLImportPropertyMapper > GetRowImportPropertySetMapper() const { return mxRowImportPropertySetMapper; } rtl::Reference< SvXMLImportPropertyMapper > GetColumnImportPropertySetMapper() const { return mxColumnImportPropertySetMapper; } - void addTableTemplate( const rtl::OUString& rsStyleName, XMLTableTemplate& xTableTemplate ); + void addTableTemplate( const OUString& rsStyleName, XMLTableTemplate& xTableTemplate ); void finishStyles(); private: diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx index 000399109615..2ac668de2d5a 100644 --- a/xmloff/inc/xmloff/txtimp.hxx +++ b/xmloff/inc/xmloff/txtimp.hxx @@ -380,7 +380,7 @@ private: protected: virtual SvXMLImportContext *CreateTableChildContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -388,7 +388,7 @@ protected: // Code is implemented in XMLPropertyBackpatcher.cxx inline XMLPropertyBackpatcher& GetFootnoteBP(); inline XMLPropertyBackpatcher& GetSequenceIdBP(); - inline XMLPropertyBackpatcher< ::rtl::OUString> & GetSequenceNameBP(); + inline XMLPropertyBackpatcher< OUString> & GetSequenceNameBP(); public: @@ -414,7 +414,7 @@ public: SvXMLImportContext *CreateTextChildContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, XMLTextType eType = XML_TEXT_TYPE_SHAPE ); @@ -445,15 +445,15 @@ public: bool IsOrganizerMode() const; bool IsProgress() const; - ::rtl::OUString ConvertStarFonts( const ::rtl::OUString& rChars, - const ::rtl::OUString& rStyleName, + OUString ConvertStarFonts( const OUString& rChars, + const OUString& rStyleName, sal_uInt8& rFlags, sal_Bool bPara, SvXMLImport& rImport ) const; // insert a string without special whitespace processing enabled - void InsertString( const ::rtl::OUString& rChars ); + void InsertString( const OUString& rChars ); // insert a string with special whitespace processing enabled - void InsertString( const ::rtl::OUString& rChars, + void InsertString( const OUString& rChars, sal_Bool& rIgnoreLeadingSpace ); // Delete current paragraph void DeleteParagraph(); @@ -464,11 +464,11 @@ public: // Add parameter (#i73509#) // Add parameter in order to suppress the handling of the list attributes (#i80724#) - ::rtl::OUString SetStyleAndAttrs( + OUString SetStyleAndAttrs( SvXMLImport& rImport, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor >& rCursor, - const ::rtl::OUString& rStyleName, + const OUString& rStyleName, sal_Bool bPara, sal_Bool bOutlineLevelAttrFound = sal_False, sal_Int8 nOutlineLevel = -1, @@ -479,12 +479,12 @@ public: * name for that level. Otherwise, leave rStyleName unmodified. */ // Adjust 2nd parameter (#i69629#) - void FindOutlineStyleName( ::rtl::OUString& rStyleName, + void FindOutlineStyleName( OUString& rStyleName, sal_Int8 nOutlineLevel ); // Change method name to reflect change of data structure (#i69629#) void AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel, - const ::rtl::OUString& rStyleName ); + const OUString& rStyleName ); void SetOutlineStyles( sal_Bool bSetEmpty ); @@ -492,34 +492,34 @@ public: SvXMLImport& rImport, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor >& rCursor, - const ::rtl::OUString& rHRef, - const ::rtl::OUString& rName, - const ::rtl::OUString& rTargetFrameName, - const ::rtl::OUString& rStyleName, - const ::rtl::OUString& rVisitedStyleName, + const OUString& rHRef, + const OUString& rName, + const OUString& rTargetFrameName, + const OUString& rStyleName, + const OUString& rVisitedStyleName, XMLEventsImportContext* pEvents = NULL); void SetRuby( SvXMLImport& rImport, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor >& rCursor, - const ::rtl::OUString& rStyleName, - const ::rtl::OUString& rTextStyleName, - const ::rtl::OUString& rText ); + const OUString& rStyleName, + const OUString& rTextStyleName, + const OUString& rText ); /// return key appropriate for use with NumberFormat property /// return -1 if style is not found /// (may return whether data style uses the system language) - sal_Int32 GetDataStyleKey( const ::rtl::OUString& sStyleName, + sal_Int32 GetDataStyleKey( const OUString& sStyleName, sal_Bool* pIsSystemLanguage = NULL ); const SvxXMLListStyleContext *FindAutoListStyle( - const ::rtl::OUString& rName ) const; + const OUString& rName ) const; XMLPropStyleContext *FindAutoFrameStyle( - const ::rtl::OUString& rName ) const; + const OUString& rName ) const; XMLPropStyleContext* FindSectionStyle( - const ::rtl::OUString& rName ) const; + const OUString& rName ) const; XMLPropStyleContext* FindPageMaster( - const ::rtl::OUString& rName ) const; + const OUString& rName ) const; const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer> & GetParaStyles() const; @@ -541,9 +541,9 @@ public: ::com::sun::star::container::XIndexReplace > & GetChapterNumbering() const; - sal_Bool HasFrameByName( const ::rtl::OUString& rName ) const; - void ConnectFrameChains( const ::rtl::OUString& rFrmName, - const ::rtl::OUString& rNextFrmName, + sal_Bool HasFrameByName( const OUString& rName ) const; + void ConnectFrameChains( const OUString& rFrmName, + const OUString& rNextFrmName, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rFrmPropSet ); @@ -566,56 +566,56 @@ public: /// save the start of a range reference void InsertBookmarkStartRange( - const ::rtl::OUString & sName, + const OUString & sName, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & rRange, - ::rtl::OUString const& i_rXmlId, + OUString const& i_rXmlId, ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > & i_rpRDFaAttributes); /// process the start of a range reference sal_Bool FindAndRemoveBookmarkStartRange( - const ::rtl::OUString & sName, + const OUString & sName, ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & o_rRange, - ::rtl::OUString & o_rXmlId, + OUString & o_rXmlId, ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > & o_rpRDFaAttributes); - ::rtl::OUString FindActiveBookmarkName(); + OUString FindActiveBookmarkName(); - void pushFieldCtx( ::rtl::OUString name, ::rtl::OUString type ); + void pushFieldCtx( OUString name, OUString type ); void popFieldCtx(); - void addFieldParam( ::rtl::OUString name, ::rtl::OUString value ); + void addFieldParam( OUString name, OUString value ); void setCurrentFieldParamsTo(::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField> &xFormField); - ::rtl::OUString getCurrentFieldType(); + OUString getCurrentFieldType(); bool hasCurrentFieldCtx(); /// insert new footnote ID. /// Also fixup open references from the backpatch list to this ID. // Code is implemented in XMLPropertyBackpatcher.cxx - void InsertFootnoteID(const ::rtl::OUString& sXMLId, sal_Int16 nAPIId); + void InsertFootnoteID(const OUString& sXMLId, sal_Int16 nAPIId); /// set the proper footnote reference ID, /// or put into backpatch list if ID is unknown // Code is implemented in XMLPropertyBackpatcher.cxx void ProcessFootnoteReference( - const ::rtl::OUString& sXMLId, + const OUString& sXMLId, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropSet); /// insert new sequence ID /// Also fixup open references from backpatch list to this ID. // Code is implemented in XMLPropertyBackpatcher.cxx - void InsertSequenceID(const ::rtl::OUString& sXMLId, - const ::rtl::OUString& sName, + void InsertSequenceID(const OUString& sXMLId, + const OUString& sName, sal_Int16 nAPIId); /// set sequence ID or insert into backpatch list // Code is implemented in XMLPropertyBackpatcher.cxx void ProcessSequenceReference( - const ::rtl::OUString& sXMLId, + const OUString& sXMLId, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropSet); @@ -625,47 +625,47 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertOLEObject( SvXMLImport& rImport, - const ::rtl::OUString& rHRef, - const ::rtl::OUString &rStyleName, - const ::rtl::OUString &rTblName, + const OUString& rHRef, + const OUString &rStyleName, + const OUString &rTblName, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertOOoLink( SvXMLImport& rImport, - const ::rtl::OUString& rHRef, - const ::rtl::OUString &rStyleName, - const ::rtl::OUString &rTblName, + const OUString& rHRef, + const OUString &rStyleName, + const OUString &rTblName, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertApplet( - const ::rtl::OUString &rName, - const ::rtl::OUString &rCode, + const OUString &rName, + const OUString &rCode, sal_Bool bMayScript, - const ::rtl::OUString& rHRef, + const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertPlugin( - const ::rtl::OUString &rMimeType, - const ::rtl::OUString& rHRef, + const OUString &rMimeType, + const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertFloatingFrame( - const ::rtl::OUString &rName, - const ::rtl::OUString &rHRef, - const ::rtl::OUString &rStyleName, + const OUString &rName, + const OUString &rHRef, + const OUString &rStyleName, sal_Int32 nWidth, sal_Int32 nHeight ); virtual void endAppletOrPlugin( const com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> &rPropSet, - ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess > &rParamMap ); + ::std::map < const OUString, OUString, ::comphelper::UStringLess > &rParamMap ); // applet helper methods // implemented in sw/filter/xml/txtparai.hxx @@ -674,19 +674,19 @@ public: // (to be implemented in sw/filter/xml/txtparai.hxx) virtual void RedlineAdd( - const ::rtl::OUString& rType, /// redline type (insert, del,... ) - const ::rtl::OUString& rId, /// use to identify this redline - const ::rtl::OUString& rAuthor, /// name of the author - const ::rtl::OUString& rComment, /// redline comment + const OUString& rType, /// redline type (insert, del,... ) + const OUString& rId, /// use to identify this redline + const OUString& rAuthor, /// name of the author + const OUString& rComment, /// redline comment const ::com::sun::star::util::DateTime& rDateTime, /// date+time sal_Bool bMergeLastParagraph); /// merge last paras virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> RedlineCreateText( ::com::sun::star::uno::Reference< /// needed to get the document ::com::sun::star::text::XTextCursor> & rOldCursor, - const ::rtl::OUString& rId); /// ID used to RedlineAdd() call + const OUString& rId); /// ID used to RedlineAdd() call virtual void RedlineSetCursor( - const ::rtl::OUString& rId, /// ID used to RedlineAdd() call + const OUString& rId, /// ID used to RedlineAdd() call sal_Bool bStart, /// start or end Cursor sal_Bool bIsOutsideOfParagraph); /// range is not within virtual void RedlineAdjustStartNodeCursor( @@ -697,8 +697,8 @@ public: const ::com::sun::star::uno::Sequence & rProtectionKey ); // access to the last open redline ID: - ::rtl::OUString GetOpenRedlineId(); - void SetOpenRedlineId( ::rtl::OUString& rId); + OUString GetOpenRedlineId(); + void SetOpenRedlineId( OUString& rId); void ResetOpenRedlineId(); // #107848# @@ -716,8 +716,8 @@ public: /// pop the list context stack void PopListContext(); - void SetCellParaStyleDefault(::rtl::OUString const& rNewValue); - ::rtl::OUString const& GetCellParaStyleDefault(); + void SetCellParaStyleDefault(OUString const& rNewValue); + OUString const& GetCellParaStyleDefault(); }; #endif diff --git a/xmloff/inc/xmloff/txtimppr.hxx b/xmloff/inc/xmloff/txtimppr.hxx index cd2cc34ddb78..ae58bdd9f55e 100644 --- a/xmloff/inc/xmloff/txtimppr.hxx +++ b/xmloff/inc/xmloff/txtimppr.hxx @@ -52,7 +52,7 @@ protected: virtual bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; public: diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx index d4f71ba96586..8e432e8cf7d7 100644 --- a/xmloff/inc/xmloff/txtparae.hxx +++ b/xmloff/inc/xmloff/txtparae.hxx @@ -80,7 +80,7 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport const ::std::auto_ptr< ::xmloff::BoundFrameSets > pBoundFrameSets; XMLTextFieldExport *pFieldExport; - std::vector *pListElements; + std::vector *pListElements; XMLTextListAutoStylePool *pListAutoPool; XMLSectionExport *pSectionExport; XMLIndexMarkExport *pIndexMarkExport; diff --git a/xmloff/inc/xmloff/txtstyli.hxx b/xmloff/inc/xmloff/txtstyli.hxx index b3cde20dc460..d645cfc11281 100644 --- a/xmloff/inc/xmloff/txtstyli.hxx +++ b/xmloff/inc/xmloff/txtstyli.hxx @@ -28,20 +28,20 @@ class XMLEventsImportContext; class XMLOFF_DLLPUBLIC XMLTextStyleContext : public XMLPropStyleContext { - ::rtl::OUString sListStyleName; - ::rtl::OUString sCategoryVal; - ::rtl::OUString sDropCapTextStyleName; - ::rtl::OUString sMasterPageName; - ::rtl::OUString sDataStyleName; // for grid columns only - const ::rtl::OUString sIsAutoUpdate; - const ::rtl::OUString sCategory; - const ::rtl::OUString sNumberingStyleName; - const ::rtl::OUString sOutlineLevel; + OUString sListStyleName; + OUString sCategoryVal; + OUString sDropCapTextStyleName; + OUString sMasterPageName; + OUString sDataStyleName; // for grid columns only + const OUString sIsAutoUpdate; + const OUString sCategory; + const OUString sNumberingStyleName; + const OUString sOutlineLevel; public: - const ::rtl::OUString sDropCapCharStyleName; + const OUString sDropCapCharStyleName; private: - const ::rtl::OUString sPageDescName; + const OUString sPageDescName; sal_Int8 nOutlineLevel; @@ -58,15 +58,15 @@ private: protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: TYPEINFO(); XMLTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, @@ -75,22 +75,22 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); sal_Bool IsAutoUpdate() const { return bAutoUpdate; } - const ::rtl::OUString& GetListStyle() const { return sListStyleName; } + const OUString& GetListStyle() const { return sListStyleName; } // XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#) sal_Bool IsListStyleSet() const { return mbListStyleSet; } - const ::rtl::OUString& GetMasterPageName() const { return sMasterPageName; } + const OUString& GetMasterPageName() const { return sMasterPageName; } sal_Bool HasMasterPageName() const { return bHasMasterPageName; } - const ::rtl::OUString& GetDropCapStyleName() const { return sDropCapTextStyleName; } - const ::rtl::OUString& GetDataStyleName() const { return sDataStyleName; } + const OUString& GetDropCapStyleName() const { return sDropCapTextStyleName; } + const OUString& GetDataStyleName() const { return sDataStyleName; } virtual void CreateAndInsert( sal_Bool bOverwrite ); virtual void Finish( sal_Bool bOverwrite ); diff --git a/xmloff/inc/xmloff/unoatrcn.hxx b/xmloff/inc/xmloff/unoatrcn.hxx index 726ea7627456..616d1db4f740 100644 --- a/xmloff/inc/xmloff/unoatrcn.hxx +++ b/xmloff/inc/xmloff/unoatrcn.hxx @@ -40,7 +40,7 @@ class XMLOFF_DLLPUBLIC SvUnoAttributeContainer: private: SvXMLAttrContainerData* mpContainer; - SAL_DLLPRIVATE sal_uInt16 getIndexByName(const ::rtl::OUString& aName ) + SAL_DLLPRIVATE sal_uInt16 getIndexByName(const OUString& aName ) const; public: @@ -57,21 +57,21 @@ public: virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName(const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL replaceByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName(const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeByName(const ::rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); friend ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvUnoAttributeContainer_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) throw( ::com::sun::star::uno::Exception ); }; diff --git a/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx b/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx index 03d30332c2da..e538cbe176e0 100644 --- a/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx +++ b/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx @@ -31,7 +31,7 @@ namespace comphelper { -typedef ::std::map< rtl::OUString, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > IdMap_t; +typedef ::std::map< OUString, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > IdMap_t; class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper { @@ -41,30 +41,30 @@ public: /** returns a unique identifier for the given uno object. IF a uno object is registered more than once, the returned identifier is always the same. */ - const rtl::OUString& registerReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); + const OUString& registerReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); /** registers the given uno object with the given identifier. @returns false, if the given identifier already exists and is not associated with the given interface */ - bool registerReference( const rtl::OUString& rIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); + bool registerReference( const OUString& rIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); /** @returns the identifier for the given uno object. If this uno object is not already registered, an empty string is returned */ - const rtl::OUString& getIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ) const; + const OUString& getIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ) const; /** @returns the uno object that is registered with the given identifier. If no uno object is registered with the given identifier, an empty reference is returned. */ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& getReference( const rtl::OUString& rIdentifier ) const; + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& getReference( const OUString& rIdentifier ) const; private: bool findReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface, IdMap_t::const_iterator& rIter ) const; - bool findIdentifier( const rtl::OUString& rIdentifier, IdMap_t::const_iterator& rIter ) const; + bool findIdentifier( const OUString& rIdentifier, IdMap_t::const_iterator& rIter ) const; IdMap_t maEntries; sal_Int32 mnNextId; diff --git a/xmloff/inc/xmloff/xformsexport.hxx b/xmloff/inc/xmloff/xformsexport.hxx index d527d7115468..802180126f1b 100644 --- a/xmloff/inc/xmloff/xformsexport.hxx +++ b/xmloff/inc/xmloff/xformsexport.hxx @@ -20,6 +20,7 @@ #define _XMLOFF_XFORMSEXPORT_HXX #include "xmloff/dllapi.h" +#include class SvXMLExport; namespace com { namespace sun { namespace star { @@ -29,17 +30,16 @@ namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; struct PropertyValue; } namespace container { class XNameAccess; } } } } -namespace rtl { class OUString; } /** export an XForms model. */ void SAL_DLLPRIVATE exportXForms( SvXMLExport& ); -rtl::OUString SAL_DLLPRIVATE getXFormsBindName( const com::sun::star::uno::Reference& xBinding ); +OUString SAL_DLLPRIVATE getXFormsBindName( const com::sun::star::uno::Reference& xBinding ); -rtl::OUString SAL_DLLPRIVATE getXFormsListBindName( const com::sun::star::uno::Reference& xBinding ); +OUString SAL_DLLPRIVATE getXFormsListBindName( const com::sun::star::uno::Reference& xBinding ); -rtl::OUString SAL_DLLPRIVATE getXFormsSubmissionName( const com::sun::star::uno::Reference& xBinding ); +OUString SAL_DLLPRIVATE getXFormsSubmissionName( const com::sun::star::uno::Reference& xBinding ); /** returns the settings of the given XForms container, to be exported as document specific settings diff --git a/xmloff/inc/xmloff/xformsimport.hxx b/xmloff/inc/xmloff/xformsimport.hxx index f98a3356858c..9be4bc3bdcb6 100644 --- a/xmloff/inc/xmloff/xformsimport.hxx +++ b/xmloff/inc/xmloff/xformsimport.hxx @@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName ); + const OUString& rLocalName ); /** perform the actual binding of an XForms-binding with the suitable control * @param document which contains the XForms-model(s) @@ -48,7 +48,7 @@ XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext( */ void bindXFormsValueBinding( com::sun::star::uno::Reference, - std::pair,rtl::OUString> ); + std::pair,OUString> ); /** perform the actual binding of an XForms-binding as list source with a list control @@ -57,7 +57,7 @@ void bindXFormsValueBinding( */ void bindXFormsListBinding( com::sun::star::uno::Reference, - std::pair,rtl::OUString> ); + std::pair,OUString> ); /** perform the actual binding of an XForms submission with the suitable control * @param document which contains the XForms-model(s) @@ -65,7 +65,7 @@ void bindXFormsListBinding( */ void bindXFormsSubmission( com::sun::star::uno::Reference, - std::pair,rtl::OUString> ); + std::pair,OUString> ); /** applies the given settings to the given XForms container */ diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx index 2482c8026bdf..e08b027ddb0f 100644 --- a/xmloff/inc/xmloff/xmlaustp.hxx +++ b/xmloff/inc/xmloff/xmlaustp.hxx @@ -77,37 +77,37 @@ public: if bAsFamily is sal_False, the family name is used as element name */ // TODO: Remove this ugly method as soon as possible - void AddFamily( sal_Int32 nFamily, const ::rtl::OUString& rStrName, SvXMLExportPropertyMapper* pMapper, ::rtl::OUString aStrPrefix, sal_Bool bAsFamily = sal_True ); - void AddFamily( sal_Int32 nFamily, const ::rtl::OUString& rStrName, + void AddFamily( sal_Int32 nFamily, const OUString& rStrName, SvXMLExportPropertyMapper* pMapper, OUString aStrPrefix, sal_Bool bAsFamily = sal_True ); + void AddFamily( sal_Int32 nFamily, const OUString& rStrName, const UniReference< SvXMLExportPropertyMapper >& rMapper, - const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); + const OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); void SetFamilyPropSetMapper( sal_Int32 nFamily, const UniReference< SvXMLExportPropertyMapper >& rMapper ); /// Register a name that must not be used as a generated name. - void RegisterName( sal_Int32 nFamily, const ::rtl::OUString& rName ); + void RegisterName( sal_Int32 nFamily, const OUString& rName ); /// retrieve the registered names (names + families) void GetRegisteredNames( com::sun::star::uno::Sequence& aFamilies, - com::sun::star::uno::Sequence& aNames ); + com::sun::star::uno::Sequence& aNames ); /// register (families + names) void RegisterNames( com::sun::star::uno::Sequence& aFamilies, - com::sun::star::uno::Sequence& aNames ); + com::sun::star::uno::Sequence& aNames ); /// Add an item set to the pool and return its generated name. - ::rtl::OUString Add( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ); - ::rtl::OUString Add( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek = false ); - sal_Bool Add( ::rtl::OUString& rName, sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); + OUString Add( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ); + OUString Add( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek = false ); + sal_Bool Add( OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); /// Add an item set with a pre-defined name (needed for saving sheets separately in Calc). - sal_Bool AddNamed( const ::rtl::OUString& rName, sal_Int32 nFamily, const ::rtl::OUString& rParent, + sal_Bool AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); /// Find an item set's name. - ::rtl::OUString Find( sal_Int32 nFamily, const ::rtl::OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const; + OUString Find( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const; /** Export all item sets ofs a certain class in the order in that they have been added. */ void exportXML( sal_Int32 nFamily diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx index 6eaac83a0d99..1243c2f59b02 100644 --- a/xmloff/inc/xmloff/xmlcnimp.hxx +++ b/xmloff/inc/xmloff/xmlcnimp.hxx @@ -39,33 +39,33 @@ public: int operator ==( const SvXMLAttrContainerData& rCmp ) const; - sal_Bool AddAttr( const ::rtl::OUString& rLName, const rtl::OUString& rValue ); - sal_Bool AddAttr( const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace, - const ::rtl::OUString& rLName, const rtl::OUString& rValue ); - sal_Bool AddAttr( const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ); + sal_Bool AddAttr( const OUString& rLName, const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, const OUString& rNamespace, + const OUString& rLName, const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ); size_t GetAttrCount() const; - const rtl::OUString GetAttrNamespace( size_t i ) const; - const rtl::OUString GetAttrPrefix( size_t i ) const; - const rtl::OUString& GetAttrLName( size_t i ) const; - const rtl::OUString& GetAttrValue( size_t i ) const; + const OUString GetAttrNamespace( size_t i ) const; + const OUString GetAttrPrefix( size_t i ) const; + const OUString& GetAttrLName( size_t i ) const; + const OUString& GetAttrValue( size_t i ) const; sal_uInt16 GetFirstNamespaceIndex() const; sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const; - const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const; - const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const; + const OUString& GetNamespace( sal_uInt16 i ) const; + const OUString& GetPrefix( sal_uInt16 i ) const; sal_Bool SetAt( size_t i, - const ::rtl::OUString& rLName, const rtl::OUString& rValue ); + const OUString& rLName, const OUString& rValue ); sal_Bool SetAt( size_t i, - const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace, - const ::rtl::OUString& rLName, const rtl::OUString& rValue ); + const OUString& rPrefix, const OUString& rNamespace, + const OUString& rLName, const OUString& rValue ); sal_Bool SetAt( size_t i, - const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ); + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ); void Remove( size_t i ); }; diff --git a/xmloff/inc/xmloff/xmlerror.hxx b/xmloff/inc/xmloff/xmlerror.hxx index e526f7cd03c8..2400631d3cbb 100644 --- a/xmloff/inc/xmloff/xmlerror.hxx +++ b/xmloff/inc/xmloff/xmlerror.hxx @@ -119,18 +119,18 @@ public: void AddRecord( sal_Int32 nId, /// error ID == error flags + error class + error number const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rParams, /// parameters for error message - const ::rtl::OUString& rExceptionMessage, /// original exception string + OUString> & rParams, /// parameters for error message + const OUString& rExceptionMessage, /// original exception string sal_Int32 nRow, /// XLocator: file row number sal_Int32 nColumn, /// XLocator: file column number - const ::rtl::OUString& rPublicId, /// XLocator: file public ID - const ::rtl::OUString& rSystemId ); /// XLocator: file system ID + const OUString& rPublicId, /// XLocator: file public ID + const OUString& rSystemId ); /// XLocator: file system ID void AddRecord( sal_Int32 nId, /// error ID == error flags + error class + error number const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rParams, /// parameters for error message - const ::rtl::OUString& rExceptionMessage, /// original exception string + OUString> & rParams, /// parameters for error message + const OUString& rExceptionMessage, /// original exception string const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator> & rLocator); /// location diff --git a/xmloff/inc/xmloff/xmlevent.hxx b/xmloff/inc/xmloff/xmlevent.hxx index d9ceb372c2dd..a6d0763e3df0 100644 --- a/xmloff/inc/xmloff/xmlevent.hxx +++ b/xmloff/inc/xmloff/xmlevent.hxx @@ -45,15 +45,15 @@ class XMLEventsImportContext; struct XMLEventName { sal_uInt16 m_nPrefix; - ::rtl::OUString m_aName; + OUString m_aName; XMLEventName() : m_nPrefix( 0 ) {} XMLEventName( sal_uInt16 n, const sal_Char *p ) : m_nPrefix( n ), - m_aName( ::rtl::OUString::createFromAscii(p) ) + m_aName( OUString::createFromAscii(p) ) {} - XMLEventName( sal_uInt16 n, const ::rtl::OUString& r ) : + XMLEventName( sal_uInt16 n, const OUString& r ) : m_nPrefix( n ), m_aName( r ) {} @@ -96,7 +96,7 @@ public: virtual void Export( SvXMLExport& rExport, /// the current XML export - const ::rtl::OUString& rEventQName, /// the XML name of the event + const OUString& rEventQName, /// the XML name of the event ::com::sun::star::uno::Sequence< /// the values for the event ::com::sun::star::beans::PropertyValue> & rValues, sal_Bool bUseWhitespace) = 0; /// create whitespace around elements? @@ -129,15 +129,15 @@ public: virtual SvXMLImportContext* CreateContext( SvXMLImport& rImport, /// import context sal_uInt16 nPrefix, /// element: namespace prefix - const ::rtl::OUString& rLocalName, /// element: local name + const OUString& rLocalName, /// element: local name const ::com::sun::star::uno::Reference< /// attribute list ::com::sun::star::xml::sax::XAttributeList> & xAttrList, /// the context for the enclosing element XMLEventsImportContext* rEvents, /// the event name (as understood by the API) - const ::rtl::OUString& rApiEventName, + const OUString& rApiEventName, /// the event type name (as registered) - const ::rtl::OUString& rApiLanguage) = 0; + const OUString& rApiLanguage) = 0; }; diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index cf68b628c3ed..b4f635d522ab 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -121,10 +121,10 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6< SvXMLAttributeList *mpAttrList; // a common attribute list ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > mxAttrList; // and an interface of it - ::rtl::OUString msOrigFileName; // the original URL - ::rtl::OUString msGraphicObjectProtocol; - ::rtl::OUString msEmbeddedObjectProtocol; - ::rtl::OUString msFilterName; + OUString msOrigFileName; // the original URL + OUString msGraphicObjectProtocol; + OUString msEmbeddedObjectProtocol; + OUString msFilterName; SvXMLNamespaceMap *mpNamespaceMap; // the namepspace map SvXMLUnitConverter *mpUnitConv; // the unit converter SvXMLNumFmtExport *mpNumExport; @@ -152,7 +152,7 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6< public: - const ::rtl::OUString msWS; // " " + const OUString msWS; // " " private: @@ -271,13 +271,13 @@ public: SvXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - const ::rtl::OUString& rFileName, + const OUString& rFileName, sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler); SvXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - const ::rtl::OUString& rFileName, + const OUString& rFileName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &, sal_Int16 const eDefaultFieldUnit ); @@ -298,13 +298,13 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); @@ -337,18 +337,18 @@ public: void AddAttributeASCII( sal_uInt16 nPrefix, const sal_Char *pName, const sal_Char *pValue ); void AddAttribute( sal_uInt16 nPrefix, const sal_Char *pName, - const ::rtl::OUString& rValue ); - void AddAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rName, - const ::rtl::OUString& rValue ); + const OUString& rValue ); + void AddAttribute( sal_uInt16 nPrefix, const OUString& rName, + const OUString& rValue ); void AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, - const ::rtl::OUString& rValue ); + const OUString& rValue ); void AddAttribute( sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, enum ::xmloff::token::XMLTokenEnum eValue ); - void AddAttribute( const ::rtl::OUString& rQName, - const ::rtl::OUString& rValue ); - void AddAttribute( const ::rtl::OUString& rQName, + void AddAttribute( const OUString& rQName, + const OUString& rValue ); + void AddAttribute( const OUString& rQName, enum ::xmloff::token::XMLTokenEnum eValue ); // add several attributes to the common attribute list void AddAttributeList( const ::com::sun::star::uno::Reference< @@ -367,7 +367,7 @@ public: } // Get original ::com::sun::star::util::URL. - const ::rtl::OUString& GetOrigFileName() const { return msOrigFileName; } + const OUString& GetOrigFileName() const { return msOrigFileName; } // Get (const) namespace map. const SvXMLNamespaceMap& GetNamespaceMap() const { return *mpNamespaceMap; } @@ -385,7 +385,7 @@ public: virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ); virtual void exportDataStyles(); virtual void exportAutoDataStyles(); - virtual rtl::OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; + virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; sal_Int32 dataStyleForceSystemLanguage(sal_Int32 nFormat) const; virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape); @@ -438,17 +438,17 @@ public: /// get the export for image maps XMLImageMapExport& GetImageMapExport(); - ::rtl::OUString AddEmbeddedGraphicObject( - const ::rtl::OUString& rGraphicObjectURL ); + OUString AddEmbeddedGraphicObject( + const OUString& rGraphicObjectURL ); sal_Bool AddEmbeddedGraphicObjectAsBase64( - const ::rtl::OUString& rGraphicObjectURL ); + const OUString& rGraphicObjectURL ); - ::rtl::OUString AddEmbeddedObject( - const ::rtl::OUString& rEmbeddedObjectURL ); + OUString AddEmbeddedObject( + const OUString& rEmbeddedObjectURL ); sal_Bool AddEmbeddedObjectAsBase64( - const ::rtl::OUString& rEmbeddedObjectURL ); + const OUString& rEmbeddedObjectURL ); - ::rtl::OUString EncodeStyleName( const ::rtl::OUString& rName, + OUString EncodeStyleName( const OUString& rName, sal_Bool *pEncoded=0 ) const; // save linked sections? @@ -461,19 +461,19 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rComp ); - rtl::OUString GetRelativeReference(const rtl::OUString& rValue); + OUString GetRelativeReference(const OUString& rValue); // methods for accessing the document handler and handling SAX errors void StartElement(sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, sal_Bool bIgnWSOutside ); - void StartElement(const ::rtl::OUString& rName, + void StartElement(const OUString& rName, sal_Bool bIgnWSOutside ); - void Characters(const ::rtl::OUString& rChars); + void Characters(const OUString& rChars); void EndElement(sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, sal_Bool bIgnWSInside ); - void EndElement(const ::rtl::OUString& rName, + void EndElement(const OUString& rName, sal_Bool bIgnWSInside ); void IgnorableWhitespace(); @@ -486,16 +486,16 @@ public: /// error ID, may contain an error flag sal_Int32 nId, /// string parameters for the error message - const ::com::sun::star::uno::Sequence< ::rtl::OUString> & rMsgParams, + const ::com::sun::star::uno::Sequence< OUString> & rMsgParams, /// original exception message (if applicable) - const ::rtl::OUString& rExceptionMessage, + const OUString& rExceptionMessage, /// error location (if applicable) const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator> & rLocator ); void SetError( sal_Int32 nId, - const ::com::sun::star::uno::Sequence< ::rtl::OUString> & rMsgParams); + const ::com::sun::star::uno::Sequence< OUString> & rMsgParams); /** return current error flags (logical 'or' of all error flags so far) */ sal_uInt16 GetErrorFlags() { return mnErrorFlags; } @@ -522,13 +522,13 @@ public: SvtSaveOptions::ODFDefaultVersion getDefaultVersion() const; /// name of stream in package, e.g., "content.xml" - ::rtl::OUString GetStreamName() const; + OUString GetStreamName() const; // FIXME: this is only for legacy stuff that has not yet been adapted // to implement XMetadatable; this can write duplicate IDs! /// add xml:id and legacy namespace id void SAL_DLLPRIVATE AddAttributeIdLegacy( - sal_uInt16 const nLegacyPrefix, ::rtl::OUString const& rValue); + sal_uInt16 const nLegacyPrefix, OUString const& rValue); /// add xml:id attribute (for RDF metadata) void AddAttributeXmlId(::com::sun::star::uno::Reference< @@ -621,12 +621,12 @@ inline void SvXMLExport::SetGraphicResolver( class XMLOFF_DLLPUBLIC SvXMLElementExport { SvXMLExport& rExport; - ::rtl::OUString aName; + OUString aName; sal_Bool bIgnWS : 1; sal_Bool bDoSomething : 1; SAL_DLLPRIVATE void StartElement( SvXMLExport& rExp, sal_uInt16 nPrefix, - const ::rtl::OUString& rName, + const OUString& rName, sal_Bool bIgnWSOutside ); public: @@ -637,12 +637,12 @@ public: const sal_Char *pName, sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, - const ::rtl::OUString& rName, + const OUString& rName, sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); - SvXMLElementExport( SvXMLExport& rExp, const ::rtl::OUString& rQName, + SvXMLElementExport( SvXMLExport& rExp, const OUString& rQName, sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); // Thes constructors do nothing if bDoSomething is not set diff --git a/xmloff/inc/xmloff/xmlexppr.hxx b/xmloff/inc/xmloff/xmlexppr.hxx index f116217828c3..db1f043a0d3b 100644 --- a/xmloff/inc/xmloff/xmlexppr.hxx +++ b/xmloff/inc/xmloff/xmlexppr.hxx @@ -49,7 +49,7 @@ class XMLOFF_DLLPUBLIC SvXMLExportPropertyMapper : public UniRefBase protected: UniReference< XMLPropertySetMapper > maPropMapper; - rtl::OUString maStyleName; + OUString maStyleName; /** Filter all properties we don't want to export: Take all properties of the XPropertySet which are also found in the @@ -181,7 +181,7 @@ public: inline const UniReference< XMLPropertySetMapper >& getPropertySetMapper() const { return maPropMapper; } - void SetStyleName( const rtl::OUString& rStyleName ) { maStyleName = rStyleName; } + void SetStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; } }; #endif // _XMLOFF_XMLEXPPR_HXX diff --git a/xmloff/inc/xmloff/xmlictxt.hxx b/xmloff/inc/xmloff/xmlictxt.hxx index 198475ecabfc..37903e4b4f8a 100644 --- a/xmloff/inc/xmloff/xmlictxt.hxx +++ b/xmloff/inc/xmloff/xmlictxt.hxx @@ -39,7 +39,7 @@ class XMLOFF_DLLPUBLIC SvXMLImportContext : public SvRefBase SvXMLImport& mrImport; sal_uInt16 mnPrefix; - ::rtl::OUString maLocalName; + OUString maLocalName; SvXMLNamespaceMap *mpRewindMap; @@ -56,14 +56,14 @@ public: TYPEINFO(); sal_uInt16 GetPrefix() const { return mnPrefix; } - const ::rtl::OUString& GetLocalName() const { return maLocalName; } + const OUString& GetLocalName() const { return maLocalName; } // A contexts constructor does anything that is required if an element // starts. Namespace processing has been done already. // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. SvXMLImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); // A contexts destructor does anything that is required if an element // ends. By default, nothing is done. @@ -74,7 +74,7 @@ public: // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and @@ -89,7 +89,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; SV_DECL_REF( SvXMLImportContext ) diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx index eb2a15caa9bc..32d78d4d334c 100644 --- a/xmloff/inc/xmloff/xmlimppr.hxx +++ b/xmloff/inc/xmloff/xmlimppr.hxx @@ -97,7 +97,7 @@ public: virtual bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; @@ -177,7 +177,7 @@ public: ::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo, const UniReference & rPropMapper, _ContextID_Index_Pair* pSpecialContextIds, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames, + ::com::sun::star::uno::Sequence< OUString >& rNames, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues); }; diff --git a/xmloff/inc/xmloff/xmlmetae.hxx b/xmloff/inc/xmloff/xmlmetae.hxx index 48543c4a75f4..3b99cbfabfdf 100644 --- a/xmloff/inc/xmloff/xmlmetae.hxx +++ b/xmloff/inc/xmloff/xmlmetae.hxx @@ -59,7 +59,7 @@ private: std::vector< ::com::sun::star::beans::StringPair > m_preservedNSs; SAL_DLLPRIVATE void SimpleStringElement( - const ::rtl::OUString& rText, sal_uInt16 nNamespace, + const OUString& rText, sal_uInt16 nNamespace, enum ::xmloff::token::XMLTokenEnum eElementName ); SAL_DLLPRIVATE void SimpleDateTimeElement( const ::com::sun::star::util::DateTime & rDate, sal_uInt16 nNamespace, @@ -78,7 +78,7 @@ public: /// export via XSAXWriter interface, with fallback to _MExport void Export(); - static ::rtl::OUString GetISODateTimeString( + static OUString GetISODateTimeString( const ::com::sun::star::util::DateTime& rDateTime ); // ::com::sun::star::xml::sax::XDocumentHandler: @@ -88,23 +88,23 @@ public: virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL startElement(const ::rtl::OUString & i_rName, + virtual void SAL_CALL startElement(const OUString & i_rName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & i_xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL endElement(const ::rtl::OUString & i_rName) + virtual void SAL_CALL endElement(const OUString & i_rName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); - virtual void SAL_CALL characters(const ::rtl::OUString & i_rChars) + virtual void SAL_CALL characters(const OUString & i_rChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL ignorableWhitespace( - const ::rtl::OUString & i_rWhitespaces) + const OUString & i_rWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL processingInstruction( - const ::rtl::OUString & i_rTarget, const ::rtl::OUString & i_rData) + const OUString & i_rTarget, const OUString & i_rData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException); virtual void SAL_CALL setDocumentLocator( diff --git a/xmloff/inc/xmloff/xmlmetai.hxx b/xmloff/inc/xmloff/xmlmetai.hxx index 5b6790298c29..061bd78e6df0 100644 --- a/xmloff/inc/xmloff/xmlmetai.hxx +++ b/xmloff/inc/xmloff/xmlmetai.hxx @@ -43,14 +43,14 @@ private: public: SvXMLMetaDocumentContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties>& xDocProps); virtual ~SvXMLMetaDocumentContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -60,7 +60,7 @@ public: virtual void EndElement(); public: - static void setBuildId(const ::rtl::OUString & rGenerator, + static void setBuildId(const OUString & rGenerator, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xImportInfo ); }; diff --git a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx b/xmloff/inc/xmloff/xmlmultiimagehelper.hxx index 4628677d1025..cb0a290b1bbd 100644 --- a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx +++ b/xmloff/inc/xmloff/xmlmultiimagehelper.hxx @@ -33,7 +33,7 @@ private: protected: /// helper to get the created xShape instance, needs to be overloaded - virtual rtl::OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const = 0; + virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const = 0; virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const = 0; public: diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx index 93a7260137dc..78e7cbfdd191 100644 --- a/xmloff/inc/xmloff/xmlnume.hxx +++ b/xmloff/inc/xmloff/xmlnume.hxx @@ -41,11 +41,11 @@ class XMLTextListAutoStylePool; class SvxXMLNumRuleExport { SvXMLExport& rExport; - const ::rtl::OUString sCDATA; - const ::rtl::OUString sWS; - const ::rtl::OUString sNumberingRules; - const ::rtl::OUString sIsPhysical; - const ::rtl::OUString sIsContinuousNumbering; + const OUString sCDATA; + const OUString sWS; + const OUString sNumberingRules; + const OUString sIsPhysical; + const OUString sIsContinuousNumbering; // Boolean indicating, if properties for position-and-space-mode LABEL_ALIGNEMNT // are exported or not. (#i89178#) // These properties have been introduced in ODF 1.2. Thus, its export have @@ -84,7 +84,7 @@ public: XMLTextListAutoStylePool *pPool, sal_Bool bExportChapterNumbering = sal_True ); void exportNumberingRule( - const ::rtl::OUString& rName, sal_Bool bIsHidden, + const OUString& rName, sal_Bool bIsHidden, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > & xNumRule ); }; diff --git a/xmloff/inc/xmloff/xmlnumfe.hxx b/xmloff/inc/xmloff/xmlnumfe.hxx index 112c846fc4b5..20029a6f99b7 100644 --- a/xmloff/inc/xmloff/xmlnumfe.hxx +++ b/xmloff/inc/xmloff/xmlnumfe.hxx @@ -44,41 +44,41 @@ class XMLOFF_DLLPUBLIC SvXMLNumFmtExport { private: SvXMLExport& rExport; - ::rtl::OUString sPrefix; + OUString sPrefix; SvNumberFormatter* pFormatter; - ::rtl::OUStringBuffer sTextContent; + OUStringBuffer sTextContent; SvXMLNumUsedList_Impl* pUsedList; CharClass* pCharClass; LocaleDataWrapper* pLocaleData; - SAL_DLLPRIVATE void AddCalendarAttr_Impl( const ::rtl::OUString& rCalendar ); + SAL_DLLPRIVATE void AddCalendarAttr_Impl( const OUString& rCalendar ); SAL_DLLPRIVATE void AddStyleAttr_Impl( sal_Bool bLong ); SAL_DLLPRIVATE void AddTextualAttr_Impl( sal_Bool bText ); SAL_DLLPRIVATE void AddLanguageAttr_Impl( sal_Int32 nLang ); - SAL_DLLPRIVATE void AddToTextElement_Impl( const ::rtl::OUString& rString ); + SAL_DLLPRIVATE void AddToTextElement_Impl( const OUString& rString ); SAL_DLLPRIVATE void FinishTextElement_Impl(); SAL_DLLPRIVATE void WriteColorElement_Impl( const Color& rColor ); SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, sal_Int32 nInteger, - const ::rtl::OUString& rDashStr, sal_Bool bVarDecimals, + const OUString& rDashStr, sal_Bool bVarDecimals, sal_Bool bGrouping, sal_Int32 nTrailingThousands, const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries ); SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, sal_Int32 nInteger, sal_Bool bGrouping, sal_Int32 nExp ); SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, sal_Bool bGrouping, sal_Int32 nNumeratorDigits, sal_Int32 nDenominatorDigits, sal_Int32 nDenominator ); - SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const ::rtl::OUString& rString, - const ::rtl::OUString& rExt ); + SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const OUString& rString, + const OUString& rExt ); SAL_DLLPRIVATE void WriteBooleanElement_Impl(); SAL_DLLPRIVATE void WriteTextContentElement_Impl(); - SAL_DLLPRIVATE void WriteDayElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong ); - SAL_DLLPRIVATE void WriteMonthElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong, sal_Bool bText ); - SAL_DLLPRIVATE void WriteYearElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong ); - SAL_DLLPRIVATE void WriteEraElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong ); - SAL_DLLPRIVATE void WriteDayOfWeekElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong ); - SAL_DLLPRIVATE void WriteWeekElement_Impl( const ::rtl::OUString& rCalendar ); - SAL_DLLPRIVATE void WriteQuarterElement_Impl( const ::rtl::OUString& rCalendar, sal_Bool bLong ); + SAL_DLLPRIVATE void WriteDayElement_Impl( const OUString& rCalendar, sal_Bool bLong ); + SAL_DLLPRIVATE void WriteMonthElement_Impl( const OUString& rCalendar, sal_Bool bLong, sal_Bool bText ); + SAL_DLLPRIVATE void WriteYearElement_Impl( const OUString& rCalendar, sal_Bool bLong ); + SAL_DLLPRIVATE void WriteEraElement_Impl( const OUString& rCalendar, sal_Bool bLong ); + SAL_DLLPRIVATE void WriteDayOfWeekElement_Impl( const OUString& rCalendar, sal_Bool bLong ); + SAL_DLLPRIVATE void WriteWeekElement_Impl( const OUString& rCalendar ); + SAL_DLLPRIVATE void WriteQuarterElement_Impl( const OUString& rCalendar, sal_Bool bLong ); SAL_DLLPRIVATE void WriteHoursElement_Impl( sal_Bool bLong ); SAL_DLLPRIVATE void WriteMinutesElement_Impl( sal_Bool bLong ); SAL_DLLPRIVATE void WriteSecondsElement_Impl( sal_Bool bLong, sal_uInt16 nDecimals ); @@ -87,7 +87,7 @@ private: sal_Int32 nKey, sal_Int32 nPart ); SAL_DLLPRIVATE void WriteRepeatedElement_Impl( sal_Unicode ch ); - SAL_DLLPRIVATE sal_Bool WriteTextWithCurrency_Impl( const ::rtl::OUString& rString, + SAL_DLLPRIVATE sal_Bool WriteTextWithCurrency_Impl( const OUString& rString, const ::com::sun::star::lang::Locale& rLocale ); SAL_DLLPRIVATE void ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt32 nKey, sal_uInt16 nPart, sal_Bool bDefPart ); @@ -101,7 +101,7 @@ public: SvXMLNumFmtExport( SvXMLExport& rExport, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& rSupp, - const rtl::OUString& rPrefix ); + const OUString& rPrefix ); virtual ~SvXMLNumFmtExport(); @@ -112,7 +112,7 @@ public: void SetUsed( sal_uInt32 nKey ); // get the style name that was generated for a key - ::rtl::OUString GetStyleName( sal_uInt32 nKey ); + OUString GetStyleName( sal_uInt32 nKey ); void GetWasUsed(com::sun::star::uno::Sequence& rWasUsed); void SetWasUsed(const com::sun::star::uno::Sequence& rWasUsed); diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx index 71a6a82af454..34bb91cbe9fe 100644 --- a/xmloff/inc/xmloff/xmlnumfi.hxx +++ b/xmloff/inc/xmloff/xmlnumfi.hxx @@ -86,7 +86,7 @@ public: ~SvXMLNumFmtHelper(); SvXMLStyleContext* CreateChildContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles); @@ -95,7 +95,7 @@ public: const SvXMLTokenMap& GetStylesElemTokenMap(); -// sal_uInt32 GetKeyForName( const rtl::OUString& rName ); +// sal_uInt32 GetKeyForName( const OUString& rName ); }; // SvXMLNumFmtDefaults is used in import and export @@ -113,8 +113,8 @@ public: struct MyCondition { - rtl::OUString sCondition; - rtl::OUString sMapName; + OUString sCondition; + OUString sMapName; }; class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext @@ -124,11 +124,11 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext std::vector aMyConditions; sal_uInt16 nType; sal_Int32 nKey; -// rtl::OUString sFormatName; - rtl::OUString sFormatTitle; -// rtl::OUString sMapName; - rtl::OUString sCalendar; - rtl::OUString sFormatString; +// OUString sFormatName; + OUString sFormatTitle; +// OUString sMapName; + OUString sCalendar; + OUString sFormatString; LanguageType nFormatLang; com::sun::star::lang::Locale aLocale; sal_Bool bAutoOrder; @@ -137,8 +137,8 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext sal_Bool bAutoDec; // set in AddNumber sal_Bool bAutoInt; // set in AddNumber sal_Bool bHasExtraText; - rtl::OUStringBuffer aFormatCode; - rtl::OUStringBuffer aConditions; + OUStringBuffer aFormatCode; + OUStringBuffer aConditions; sal_Bool bHasLongDoW; sal_Bool bHasEra; sal_Bool bHasDateTime; @@ -158,13 +158,13 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext public: SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles ); SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const sal_Int32 nKey, @@ -172,7 +172,7 @@ public: virtual ~SvXMLNumFormatContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void CreateAndInsert(sal_Bool bOverwrite); @@ -190,19 +190,19 @@ public: sal_Bool HasEra() const { return bHasEra; } void SetHasEra(sal_Bool bSet) { bHasEra = bSet; } - void UpdateCalendar( const rtl::OUString& rNewCalendar ); + void UpdateCalendar( const OUString& rNewCalendar ); const LocaleDataWrapper& GetLocaleData() const; - void AddToCode( const rtl::OUString& rString ); + void AddToCode( const OUString& rString ); void AddToCode( sal_Unicode c ); void AddNumber( const SvXMLNumberInfo& rInfo ); - void AddCurrency( const rtl::OUString& rContent, LanguageType nLang ); + void AddCurrency( const OUString& rContent, LanguageType nLang ); void AddNfKeyword( sal_uInt16 nIndex ); sal_Bool ReplaceNfKeyword( sal_uInt16 nOld, sal_uInt16 nNew ); void AddCondition( const sal_Int32 nIndex ); - void AddCondition( const rtl::OUString& rCondition, const rtl::OUString& rApplyName ); + void AddCondition( const OUString& rCondition, const OUString& rApplyName ); void AddColor( sal_uInt32 const nColor ); /// determine whether number format uses the system language diff --git a/xmloff/inc/xmloff/xmlnumi.hxx b/xmloff/inc/xmloff/xmlnumi.hxx index 1061b318507c..ea547379f261 100644 --- a/xmloff/inc/xmloff/xmlnumi.hxx +++ b/xmloff/inc/xmloff/xmlnumi.hxx @@ -31,10 +31,10 @@ class SvxXMLListStyle_Impl; class SvxXMLListStyleContext : public SvXMLStyleContext { - const ::rtl::OUString sIsPhysical; - const ::rtl::OUString sNumberingRules; - const ::rtl::OUString sName; - const ::rtl::OUString sIsContinuousNumbering; + const OUString sIsPhysical; + const OUString sNumberingRules; + const OUString sName; + const OUString sIsContinuousNumbering; ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > xNumRules; @@ -48,8 +48,8 @@ class SvxXMLListStyleContext : public SvXMLStyleContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); public: @@ -57,7 +57,7 @@ public: SvxXMLListStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_Bool bOutl=sal_False ); @@ -66,7 +66,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/inc/xmloff/xmlprcon.hxx b/xmloff/inc/xmloff/xmlprcon.hxx index 69b49ec56761..f6fb48cee4b6 100644 --- a/xmloff/inc/xmloff/xmlprcon.hxx +++ b/xmloff/inc/xmloff/xmlprcon.hxx @@ -42,7 +42,7 @@ public: SvXMLPropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, @@ -52,14 +52,14 @@ public: virtual ~SvXMLPropertySetContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // This method is called from this instance implementation of // CreateChildContext if the element matches an entry in the // SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT_ITEM_IMPORT virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ); diff --git a/xmloff/inc/xmloff/xmlprhdl.hxx b/xmloff/inc/xmloff/xmlprhdl.hxx index 91a762615a3f..746e9e39d3e7 100644 --- a/xmloff/inc/xmloff/xmlprhdl.hxx +++ b/xmloff/inc/xmloff/xmlprhdl.hxx @@ -23,9 +23,9 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include +#include namespace com{ namespace sun{ namespace star{ namespace uno{ class Any; } } } } -namespace rtl{ class OUString; } class SvXMLUnitConverter; struct XMLPropertyState; @@ -48,9 +48,9 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; /// Imports the given value in cas of the given XML-data-type - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; /// Exports the given value in cas of the given XML-data-type - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; }; #endif // _XMLOFF_PROPERTYHANDLERBASE_HXX diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/xmloff/inc/xmloff/xmlprmap.hxx index 8fc4aefe7286..0da806ea6768 100644 --- a/xmloff/inc/xmloff/xmlprmap.hxx +++ b/xmloff/inc/xmloff/xmlprmap.hxx @@ -53,8 +53,8 @@ class XMLPropertyHandler; */ struct XMLPropertySetMapperEntry_Impl { - ::rtl::OUString sXMLAttributeName; - ::rtl::OUString sAPIPropertyName; + OUString sXMLAttributeName; + OUString sAPIPropertyName; sal_uInt16 nXMLNameSpace; sal_Int32 nType; sal_Int16 nContextId; @@ -114,14 +114,14 @@ public: } /** Returns the 'local' XML-name of the entry */ - const ::rtl::OUString& GetEntryXMLName( sal_Int32 nIndex ) const + const OUString& GetEntryXMLName( sal_Int32 nIndex ) const { DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" ); return aMapEntries[nIndex].sXMLAttributeName; } /** Returns the entry API name */ - const ::rtl::OUString& GetEntryAPIName( sal_Int32 nIndex ) const + const OUString& GetEntryAPIName( sal_Int32 nIndex ) const { DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" ); return aMapEntries[nIndex].sAPIPropertyName; @@ -144,7 +144,7 @@ public: /** Returns the index of an entry with the given XML-name and namespace If there is no matching entry the method returns -1 */ sal_Int32 GetEntryIndex( sal_uInt16 nNamespace, - const ::rtl::OUString& rStrName, + const OUString& rStrName, sal_uInt32 nPropType, sal_Int32 nStartAt = -1 ) const; @@ -157,17 +157,17 @@ public: /** import/export This methods calls the respective im/export-method of the respective PropertyHandler. */ - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, + virtual sal_Bool exportXML( OUString& rStrExpValue, const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, + virtual sal_Bool importXML( const OUString& rStrImpValue, XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter ) const; /** searches for an entry that matches the given api name, namespace and local name or -1 if nothing found */ sal_Int32 FindEntryIndex( const sal_Char* sApiName, sal_uInt16 nNameSpace, - const ::rtl::OUString& sXMLName ) const; + const OUString& sXMLName ) const; /** searches for an entry that matches the given ContextId or gives -1 if nothing found */ sal_Int32 FindEntryIndex( const sal_Int16 nContextId ) const; diff --git a/xmloff/inc/xmloff/xmlscripti.hxx b/xmloff/inc/xmloff/xmlscripti.hxx index 9c32eb442163..031e33511a91 100644 --- a/xmloff/inc/xmloff/xmlscripti.hxx +++ b/xmloff/inc/xmloff/xmlscripti.hxx @@ -35,14 +35,14 @@ private: public: XMLScriptContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& rDocModel ); virtual ~XMLScriptContext(); // Create child element. virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx index 8296b24799a0..86641f067982 100644 --- a/xmloff/inc/xmloff/xmlstyle.hxx +++ b/xmloff/inc/xmloff/xmlstyle.hxx @@ -60,14 +60,14 @@ enum XMLStyleStylesElemTokens class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext { - ::rtl::OUString maName; - ::rtl::OUString maDisplayName; - ::rtl::OUString maAutoName; - ::rtl::OUString maParentName;// Will be moved to XMLPropStyle soon!!!! - ::rtl::OUString maFollow; // Will be moved to XMLPropStyle soon!!!! + OUString maName; + OUString maDisplayName; + OUString maAutoName; + OUString maParentName;// Will be moved to XMLPropStyle soon!!!! + OUString maFollow; // Will be moved to XMLPropStyle soon!!!! sal_Bool mbHidden; - ::rtl::OUString maHelpFile; // Will be removed very soon!!!! + OUString maHelpFile; // Will be removed very soon!!!! sal_uInt32 mnHelpId; // Will be removed very soon!!!! sal_uInt16 mnFamily; @@ -82,18 +82,18 @@ class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ); + const OUString& rLocalName, + const OUString& rValue ); void SetFamily( sal_uInt16 nSet ) { mnFamily = nSet; } - void SetAutoName( const ::rtl::OUString& rName ) { maAutoName = rName; } + void SetAutoName( const OUString& rName ) { maAutoName = rName; } public: TYPEINFO(); SvXMLStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt16 nFamily=0, sal_Bool bDefaultStyle = sal_False ); @@ -101,7 +101,7 @@ public: virtual ~SvXMLStyleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -109,13 +109,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - const ::rtl::OUString& GetName() const { return maName; } - const ::rtl::OUString& GetDisplayName() const { return maDisplayName.getLength() ? maDisplayName : maName; } - const ::rtl::OUString& GetAutoName() const { return maAutoName; } - const ::rtl::OUString& GetParentName() const { return maParentName; } - const ::rtl::OUString& GetFollow() const { return maFollow; } + const OUString& GetName() const { return maName; } + const OUString& GetDisplayName() const { return maDisplayName.getLength() ? maDisplayName : maName; } + const OUString& GetAutoName() const { return maAutoName; } + const OUString& GetParentName() const { return maParentName; } + const OUString& GetFollow() const { return maFollow; } - const ::rtl::OUString& GetHelpFile() const { return maHelpFile; } + const OUString& GetHelpFile() const { return maHelpFile; } sal_uInt32 GetHelpId() const { return mnHelpId; } sal_uInt16 GetFamily() const { return mnFamily; } @@ -158,8 +158,8 @@ public: class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext { - const ::rtl::OUString msParaStyleServiceName; - const ::rtl::OUString msTextStyleServiceName; + const OUString msParaStyleServiceName; + const OUString msTextStyleServiceName; SvXMLStylesContext_Impl *mpImpl; SvXMLTokenMap *mpStyleStylesElemTokenMap; @@ -195,18 +195,18 @@ protected: const SvXMLStyleContext *GetStyle( sal_uInt32 i ) const; virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -216,7 +216,7 @@ public: TYPEINFO(); SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Bool bAutomatic = sal_False ); @@ -225,7 +225,7 @@ public: // Create child element. virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -237,16 +237,16 @@ public: const SvXMLStyleContext *FindStyleChildContext( sal_uInt16 nFamily, - const ::rtl::OUString& rName, + const OUString& rName, sal_Bool bCreateIndex=sal_False ) const; - virtual sal_uInt16 GetFamily( const ::rtl::OUString& rFamily ) const; + virtual sal_uInt16 GetFamily( const OUString& rFamily ) const; virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper( sal_uInt16 nFamily ) const; virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; - virtual ::rtl::OUString GetServiceName( sal_uInt16 nFamily ) const; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const; virtual ::com::sun::star::uno::Reference < ::com::sun::star::style::XAutoStyleFamily > GetAutoStyles( sal_uInt16 nFamily ) const; diff --git a/xmloff/inc/xmloff/xmltkmap.hxx b/xmloff/inc/xmloff/xmltkmap.hxx index bd10d0f07000..e05885574195 100644 --- a/xmloff/inc/xmloff/xmltkmap.hxx +++ b/xmloff/inc/xmloff/xmltkmap.hxx @@ -45,14 +45,14 @@ class XMLOFF_DLLPUBLIC SvXMLTokenMap SvXMLTokenMap_Impl *pImpl; SAL_DLLPRIVATE SvXMLTokenMapEntry_Impl *_Find( - sal_uInt16 nKind, const ::rtl::OUString& rName ) const; + sal_uInt16 nKind, const OUString& rName ) const; public: SvXMLTokenMap( const SvXMLTokenMapEntry* pMap ); ~SvXMLTokenMap(); - sal_uInt16 Get( sal_uInt16 nPrefix, const ::rtl::OUString& rLName ) const; + sal_uInt16 Get( sal_uInt16 nPrefix, const OUString& rLName ) const; }; #endif // _XMLOFF_XMLTKMAP_HXX diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index 8ca24b48a4a9..e19043a36850 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -23,9 +23,7 @@ #include "sal/config.h" #include "xmloff/dllapi.h" #include - -namespace rtl { class OUString; } - +#include /** * Handling of tokens in XML: @@ -3191,12 +3189,12 @@ namespace xmloff { namespace token { /// return the OUString representation for eToken - XMLOFF_DLLPUBLIC const ::rtl::OUString& GetXMLToken( + XMLOFF_DLLPUBLIC const OUString& GetXMLToken( enum XMLTokenEnum eToken ); /// compare eToken to the string XMLOFF_DLLPUBLIC sal_Bool IsXMLToken( - const ::rtl::OUString& rString, + const OUString& rString, enum XMLTokenEnum eToken ); // gives all allocated memory for OUString* back diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx index 7e6e33a82256..bc4ddb6b6dbd 100644 --- a/xmloff/inc/xmloff/xmluconv.hxx +++ b/xmloff/inc/xmloff/xmluconv.hxx @@ -28,6 +28,8 @@ #include #include +#include +#include #include #include #include @@ -42,11 +44,6 @@ // predeclarations class Time; -namespace rtl -{ -class OUString; -class OUStringBuffer; -} namespace com { namespace sun { namespace star { namespace util { struct DateTime; } @@ -61,14 +58,14 @@ namespace basegfx class XMLOFF_DLLPUBLIC SvXMLTokenEnumerator { private: - const ::rtl::OUString& maTokenString; + const OUString& maTokenString; sal_Int32 mnNextTokenPos; sal_Unicode mcSeperator; public: - SvXMLTokenEnumerator( const ::rtl::OUString& rString, sal_Unicode cSeperator = sal_Unicode(' ') ); + SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeperator = sal_Unicode(' ') ); - sal_Bool getNextToken( ::rtl::OUString& rToken ); + sal_Bool getNextToken( OUString& rToken ); }; /** the SvXMLTypeConverter converts values of various types from @@ -118,31 +115,31 @@ public: /** convert string to measure with meCoreMeasureUnit, using optional min and max values*/ bool convertMeasureToCore( sal_Int32& rValue, - const ::rtl::OUString& rString, + const OUString& rString, sal_Int32 nMin = SAL_MIN_INT32, sal_Int32 nMax = SAL_MAX_INT32) const; /** convert measure to string: from meCoreMeasureUnit to meXMLMeasureUnit */ - void convertMeasureToXML( ::rtl::OUStringBuffer& rBuffer, + void convertMeasureToXML( OUStringBuffer& rBuffer, sal_Int32 nMeasure ) const; /** convert string to enum using given enum map, if the enum is not found in the map, this method will return false */ static sal_Bool convertEnum( sal_uInt16& rEnum, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLEnumMapEntry *pMap ); /** convert string to enum using given token map, if the enum is not found in the map, this method will return false */ static sal_Bool convertEnum( sal_uInt16& rEnum, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLEnumStringMapEntry *pMap ); /** convert enum to string using given enum map with an optional default token. If the enum is not found in the map, this method will either use the given default or return false if not default is set */ - static sal_Bool convertEnum( ::rtl::OUStringBuffer& rBuffer, + static sal_Bool convertEnum( OUStringBuffer& rBuffer, unsigned int nValue, const SvXMLEnumMapEntry *pMap, enum ::xmloff::token::XMLTokenEnum eDefault = @@ -150,65 +147,65 @@ public: /** convert double number to string (using ::rtl::math) and DO convert to export MapUnit using meCoreMeasureUnit/meXMLMeasureUnit */ - void convertDouble(::rtl::OUStringBuffer& rBuffer, + void convertDouble(OUStringBuffer& rBuffer, double fNumber, sal_Bool bWriteUnits) const; /** convert string to double number (using ::rtl::math) and DO convert. */ - sal_Bool convertDouble(double& rValue, const ::rtl::OUString& rString, sal_Bool bLookForUnits) const; + sal_Bool convertDouble(double& rValue, const OUString& rString, sal_Bool bLookForUnits) const; /** get the Null Date of the XModel and set it to the UnitConverter */ sal_Bool setNullDate ( const com::sun::star::uno::Reference & xModel); /** convert double to ISO Date Time String */ - void convertDateTime( ::rtl::OUStringBuffer& rBuffer, + void convertDateTime( OUStringBuffer& rBuffer, const double& fDateTime, bool const bAddTimeIf0AM = false); /** convert ISO Date Time String to double */ bool convertDateTime(double& fDateTime, - const ::rtl::OUString& rString); + const OUString& rString); /// these 2 functions use tools Date, so they're not yet moved to sax /** convert double to ISO Date Time String */ - static void convertDateTime( ::rtl::OUStringBuffer& rBuffer, + static void convertDateTime( OUStringBuffer& rBuffer, const double& fDateTime, const com::sun::star::util::Date& aNullDate, sal_Bool bAddTimeIf0AM=sal_False); /** convert ISO Date Time String to double */ static sal_Bool convertDateTime( double& fDateTime, - const ::rtl::OUString& rString, + const OUString& rString, const com::sun::star::util::Date& aNullDate); /** convert string to ::basegfx::B3DVector */ static sal_Bool convertB3DVector( ::basegfx::B3DVector& rVector, - const ::rtl::OUString& rValue ); + const OUString& rValue ); /** convert B3DVector to string */ - static void convertB3DVector( ::rtl::OUStringBuffer &rBuffer, + static void convertB3DVector( OUStringBuffer &rBuffer, const ::basegfx::B3DVector& rVector ); /** convert string to Position3D */ sal_Bool convertPosition3D( com::sun::star::drawing::Position3D& rPosition, - const ::rtl::OUString& rValue ); + const OUString& rValue ); /** convert Position3D to string */ - void convertPosition3D( ::rtl::OUStringBuffer &rBuffer, + void convertPosition3D( OUStringBuffer &rBuffer, const com::sun::star::drawing::Position3D& rVector ); /** convert num-forat and num-letter-sync values to NumberingType */ sal_Bool convertNumFormat( sal_Int16& rType, - const ::rtl::OUString& rNumFormat, - const ::rtl::OUString& rNumLetterSync, + const OUString& rNumFormat, + const OUString& rNumLetterSync, sal_Bool bNumberNone = sal_False ) const; /** convert NumberingType to num-forat and num-letter-sync values */ - void convertNumFormat( ::rtl::OUStringBuffer& rBuffer, + void convertNumFormat( OUStringBuffer& rBuffer, sal_Int16 nType ) const; - void convertNumLetterSync( ::rtl::OUStringBuffer& rBuffer, + void convertNumLetterSync( OUStringBuffer& rBuffer, sal_Int16 nType ) const; static void convertPropertySet(com::sun::star::uno::Sequence& rProps, @@ -216,14 +213,14 @@ public: static void convertPropertySet(com::sun::star::uno::Reference& rProperties, const com::sun::star::uno::Sequence& aProps); - ::rtl::OUString encodeStyleName( const ::rtl::OUString& rName, + OUString encodeStyleName( const OUString& rName, sal_Bool *pEncoded=0 ) const; /** convert string (hex) to number (sal_uInt32) */ static sal_Bool convertHex( sal_uInt32& nVal, - const ::rtl::OUString& rValue ); + const OUString& rValue ); /** convert number (sal_uInt32) to string (hex) */ - static void convertHex( ::rtl::OUStringBuffer& rBuffer, + static void convertHex( OUStringBuffer& rBuffer, sal_uInt32 nVal ); }; diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx index 4649a7f13f7e..af2bc956e6d2 100644 --- a/xmloff/inc/xmltabi.hxx +++ b/xmloff/inc/xmltabi.hxx @@ -39,14 +39,14 @@ public: TYPEINFO(); SvxXMLTabStopImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); virtual ~SvxXMLTabStopImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index 1d7595e89e62..95ff607683c2 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -41,7 +41,7 @@ public: XMLVersionListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions, - const rtl::OUString &rFileName, + const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler ); virtual ~XMLVersionListExport() {} @@ -62,7 +62,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -87,14 +87,14 @@ public: XMLVersionListContext( XMLVersionListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ~XMLVersionListContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -107,14 +107,14 @@ private: XMLVersionListImport& rLocalRef; static sal_Bool ParseISODateTimeString( - const rtl::OUString& rString, + const OUString& rString, com::sun::star::util::DateTime& rDateTime ); public: XMLVersionContext( XMLVersionListImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -130,11 +130,11 @@ public: virtual void SAL_CALL store( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag >& List ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); }; -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLVersionListPersistence_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLVersionPersistence_getImplementationName() +OUString SAL_CALL XMLVersionPersistence_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx index 0fad212ae246..e171214592e5 100644 --- a/xmloff/source/chart/ColorPropertySet.cxx +++ b/xmloff/source/chart/ColorPropertySet.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star::beans; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; using ::com::sun::star::uno::RuntimeException; // ================================================================================ diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx index 07c9d71b88b4..ad9639d35fd1 100644 --- a/xmloff/source/chart/ColorPropertySet.hxx +++ b/xmloff/source/chart/ColorPropertySet.hxx @@ -43,7 +43,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -51,30 +51,30 @@ protected: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& aPropertyName, + const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& PropertyName, + const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, @@ -82,19 +82,19 @@ protected: // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) + const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyToDefault( - const ::rtl::OUString& PropertyName ) + const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( - const ::rtl::OUString& aPropertyName ) + const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -102,7 +102,7 @@ protected: private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xInfo; - ::rtl::OUString m_aColorPropName; + OUString m_aColorPropName; sal_Int32 m_nColor; bool m_bIsFillColor; sal_Int32 m_nDefaultColor; diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx index c2ca2f7c1a32..793354ee6d00 100644 --- a/xmloff/source/chart/MultiPropertySetHandler.hxx +++ b/xmloff/source/chart/MultiPropertySetHandler.hxx @@ -46,7 +46,7 @@ public: /** @descr Create a class instance and store the given name. @param rName The name of the property. */ - PropertyWrapperBase (const ::rtl::OUString & rName) + PropertyWrapperBase (const OUString & rName) : msName (rName) {} virtual ~PropertyWrapperBase() @@ -57,7 +57,7 @@ public: */ virtual void SetValue (const ::com::sun::star::uno::Any & rValue) = 0; - const ::rtl::OUString msName; + const OUString msName; }; @@ -71,7 +71,7 @@ template class PropertyWrapper : public PropertyWrapperBase public: /** @descr Create a wrapper for a property of type T. */ - PropertyWrapper (const ::rtl::OUString & rName, T & rValue) + PropertyWrapper (const OUString & rName, T & rValue) : PropertyWrapperBase (rName), mrValue (rValue) {} @@ -98,7 +98,7 @@ class OUStringComparison { public: /// Compare two strings. Returns true if the first is before the second. - inline bool operator() (const ::rtl::OUString & a, const ::rtl::OUString & b) const + inline bool operator() (const OUString & a, const OUString & b) const { return (a.compareTo (b) < 0); } @@ -141,7 +141,7 @@ public: @param rValue Reference to a variable whose value is set by the call to GetProperties to the property's value. */ - template void Add (const ::rtl::OUString & sName, T& rValue) + template void Add (const OUString & sName, T& rValue) { aPropertyList[sName] = new PropertyWrapper (sName, rValue); } @@ -163,7 +163,7 @@ private: @return True if values could be derived. */ inline sal_Bool MultiGet (const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rNameList); + OUString> & rNameList); /** @descr Try to use the XPropertySet interface to get the property values. @@ -172,13 +172,13 @@ private: @return True if values could be derived. */ inline sal_Bool SingleGet (const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rNameList); + OUString> & rNameList); /** @descr STL map that maps from property names to polymorphic instances of PropertyWrapper. It uses OUStringComparison for sorting the property names. */ - ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison> aPropertyList; + ::std::map< OUString, PropertyWrapperBase*, OUStringComparison> aPropertyList; /// The object from which to get the property values. ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> mxObject; @@ -199,7 +199,7 @@ MultiPropertySetHandler::MultiPropertySetHandler (::com::sun::star::uno::Referen MultiPropertySetHandler::~MultiPropertySetHandler (void) { - ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; + ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; for (I=aPropertyList.begin(); I!=aPropertyList.end(); ++I) delete I->second; } @@ -208,8 +208,8 @@ MultiPropertySetHandler::~MultiPropertySetHandler (void) sal_Bool MultiPropertySetHandler::GetProperties (void) { - ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; - ::com::sun::star::uno::Sequence< ::rtl::OUString> aNameList (aPropertyList.size()); + ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; + ::com::sun::star::uno::Sequence< OUString> aNameList (aPropertyList.size()); int i; for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) aNameList[i++] = I->second->msName; @@ -223,14 +223,14 @@ sal_Bool MultiPropertySetHandler::GetProperties (void) sal_Bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rNameList) + OUString> & rNameList) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet> xMultiSet ( mxObject, ::com::sun::star::uno::UNO_QUERY); if (xMultiSet.is()) try { - ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; + ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; int i; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> aValueList = xMultiSet->getPropertyValues (rNameList); @@ -251,14 +251,14 @@ sal_Bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Se sal_Bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequence< - ::rtl::OUString> & rNameList) + OUString> & rNameList) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xSingleSet ( mxObject, ::com::sun::star::uno::UNO_QUERY); if (xSingleSet.is()) try { - ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; + ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; int i; for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) I->second->SetValue (xSingleSet->getPropertyValue (rNameList[i++])); diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 0831d3a05944..b6590c072c89 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -202,7 +202,7 @@ void XMLChartExportPropertyMapper::ContextFilter( std::vector< XMLPropertyState >& rProperties, uno::Reference< beans::XPropertySet > rPropSet ) const { - ::rtl::OUString aAutoPropName; + OUString aAutoPropName; sal_Bool bCheckAuto = sal_False; // filter properties @@ -287,12 +287,12 @@ void XMLChartExportPropertyMapper::handleElementItem( { case XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE: { - ::rtl::OUString aURLStr; + OUString aURLStr; rProperty.maValue >>= aURLStr; // export as XLink reference into the package // if embedding is off - ::rtl::OUString sTempURL( mrExport.AddEmbeddedGraphicObject( aURLStr )); + OUString sTempURL( mrExport.AddEmbeddedGraphicObject( aURLStr )); if( !sTempURL.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sTempURL ); @@ -320,7 +320,7 @@ void XMLChartExportPropertyMapper::handleElementItem( case XML_SCH_CONTEXT_SPECIAL_LABEL_SEPARATOR: { - ::rtl::OUString aSeparator; + OUString aSeparator; rProperty.maValue >>= aSeparator; if( !aSeparator.isEmpty() ) @@ -359,10 +359,10 @@ void XMLChartExportPropertyMapper::handleSpecialItem( { bHandled = sal_True; - rtl::OUString sAttrName = maPropMapper->GetEntryXMLName( rProperty.mnIndex ); + OUString sAttrName = maPropMapper->GetEntryXMLName( rProperty.mnIndex ); sal_uInt16 nNameSpace = maPropMapper->GetEntryNameSpace( rProperty.mnIndex ); - rtl::OUStringBuffer sValueBuffer; - rtl::OUString sValue; + OUStringBuffer sValueBuffer; + OUString sValue; sal_Int32 nValue = 0; sal_Bool bValue = sal_False; @@ -490,7 +490,7 @@ XMLChartImportPropertyMapper::~XMLChartImportPropertyMapper() bool XMLChartImportPropertyMapper::handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const { diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx index 4951ea156f77..5ea101713c01 100644 --- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx +++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx @@ -65,7 +65,7 @@ void SchXMLAutoStylePoolP::exportStyleAttributes( if( ( iter->maValue >>= nNumberFormat ) && ( nNumberFormat != -1 )) { - rtl::OUString sAttrValue = mrSchXMLExport.getDataStyleName( nNumberFormat ); + OUString sAttrValue = mrSchXMLExport.getDataStyleName( nNumberFormat ); if( !sAttrValue.isEmpty() ) { mrSchXMLExport.AddAttribute( diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx index 22697c7a758d..b166e97d254b 100644 --- a/xmloff/source/chart/SchXMLAxisContext.hxx +++ b/xmloff/source/chart/SchXMLAxisContext.hxx @@ -28,10 +28,10 @@ class SchXMLAxisContext : public SvXMLImportContext { public: SchXMLAxisContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, + SvXMLImport& rImport, const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > xDiagram, std::vector< SchXMLAxis >& aAxes, - ::rtl::OUString& rCategoriesAddress, + OUString& rCategoriesAddress, bool bAddMissingXAxisForNetCharts, bool bAdaptWrongPercentScaleValues, bool bAdaptXAxisOrientationForOld2DBarCharts, @@ -42,12 +42,12 @@ public: virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); static void CorrectAxisPositions( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xNewDoc, - const ::rtl::OUString& rChartTypeServiceName, - const ::rtl::OUString& rODFVersionOfFile, + const OUString& rChartTypeServiceName, + const OUString& rODFVersionOfFile, bool bAxisPositionAttributeImported ); private: @@ -56,8 +56,8 @@ private: SchXMLAxis m_aCurrentAxis; std::vector< SchXMLAxis >& m_rAxes; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAxisProps; - rtl::OUString m_aAutoStyleName; - rtl::OUString& m_rCategoriesAddress; + OUString m_aAutoStyleName; + OUString& m_rCategoriesAddress; sal_Int32 m_nAxisType;//::com::sun::star::chart::ChartAxisType bool m_bAxisTypeImported; bool m_bDateScaleImported; @@ -67,7 +67,7 @@ private: bool& m_rbAxisPositionAttributeImported; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTitleShape(); - void CreateGrid( ::rtl::OUString sAutoStyleName, bool bIsMajor ); + void CreateGrid( OUString sAutoStyleName, bool bIsMajor ); void CreateAxis(); void SetAxisTitle(); }; diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx index 72fbcf420575..33971e260969 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx @@ -29,8 +29,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -39,7 +37,7 @@ using namespace ::xmloff::token; SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 p_nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) : SvXMLImportContext ( rImport, p_nPrefix, rLocalName ) @@ -48,20 +46,20 @@ SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + const OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; const sal_uInt16 nPrefix = rMap.GetKeyByAttrName(sAttrName, &aLocalName ); if ( nPrefix == XML_NAMESPACE_TABLE && IsXMLToken( aLocalName, XML_DATE_VALUE ) ) { util::DateTime aNullDate; - const rtl::OUString sValue = xAttrList->getValueByIndex( i ); + const OUString sValue = xAttrList->getValueByIndex( i ); ::sax::Converter::convertDateTime(aNullDate, sValue); m_aNullDate <<= aNullDate; } } } SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) { return new SchXMLCalculationSettingsContext(GetImport(),nPrefix,rLocalName,xAttrList); diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx index 74c7cb1ffbcb..22492eb0e501 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx @@ -28,12 +28,12 @@ class SchXMLCalculationSettingsContext : public SvXMLImportContext public: SchXMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 6dbf23c3b654..034a2f6d794a 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -59,7 +59,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; using com::sun::star::uno::Reference; using namespace ::SchXMLTools; @@ -68,7 +67,7 @@ namespace void lcl_setRoleAtLabeledSequence( const uno::Reference< chart2::data::XLabeledDataSequence > & xLSeq, - const ::rtl::OUString &rRole ) + const OUString &rRole ) { // set role of sequence uno::Reference< chart2::data::XDataSequence > xValues( xLSeq->getValues()); @@ -111,7 +110,7 @@ void lcl_MoveDataToCandleStickSeries( void lcl_setRoleAtFirstSequence( const uno::Reference< chart2::XDataSeries > & xSeries, - const ::rtl::OUString & rRole ) + const OUString & rRole ) { uno::Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY ); if( xSource.is()) @@ -163,12 +162,12 @@ void lcl_removeEmptyChartTypeGroups( const uno::Reference< chart2::XChartDocumen } catch(const uno::Exception& ex) { - rtl::OString aBStr(rtl::OUStringToOString(ex.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(ex.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE( "Exception caught while removing empty chart types: %s", aBStr.getStr()); } } -uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const ::rtl::OUString& rStr, bool bAddOneToEachOldIndex ) +uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const OUString& rStr, bool bAddOneToEachOldIndex ) { const sal_Unicode aSpace( ' ' ); @@ -224,7 +223,7 @@ uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const ::rtl::OUStrin // ---------------------------------------- SchXMLChartContext::SchXMLChartContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName ) : + SvXMLImport& rImport, const OUString& rLocalName ) : SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), mrImportHelper( rImpHelper ), m_bHasRangeAtPlotArea( false ), @@ -254,15 +253,15 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut // this flag is necessarry for pie charts in the core sal_Bool bSetSwitchData = sal_False; - ::rtl::OUString sAutoStyleName; - ::rtl::OUString aOldChartTypeName; + OUString sAutoStyleName; + OUString aOldChartTypeName; bool bHasAddin = false; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) @@ -273,7 +272,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut case XML_TOK_CHART_CLASS: { - rtl::OUString sClassName; + OUString sClassName; sal_uInt16 nClassPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( aValue, &sClassName ); @@ -335,7 +334,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut { OSL_FAIL( "need a charttype to create a diagram" ); //set a fallback value: - ::rtl::OUString aChartClass_Bar( GetXMLToken(XML_BAR ) ); + OUString aChartClass_Bar( GetXMLToken(XML_BAR ) ); aOldChartTypeName = SchXMLTools::GetChartTypeByClassName( aChartClass_Bar, true /* bUseOldNames */ ); maChartTypeServiceName = SchXMLTools::GetChartTypeByClassName( aChartClass_Bar, false /* bUseOldNames */ ); } @@ -355,9 +354,9 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut { try { - xDocProp->getPropertyValue( ::rtl::OUString( "BaseDiagram" )) >>= aOldChartTypeName; + xDocProp->getPropertyValue( OUString( "BaseDiagram" )) >>= aOldChartTypeName; maChartTypeServiceName = SchXMLTools::GetNewChartTypeName( aOldChartTypeName ); - xDocProp->setPropertyValue( rtl::OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_False) ); + xDocProp->setPropertyValue( OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_False) ); } catch(const uno::Exception&) { @@ -389,11 +388,11 @@ struct NewDonutSeries { ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > m_xSeries; - ::rtl::OUString msStyleName; + OUString msStyleName; sal_Int32 mnAttachedAxis; - ::std::vector< ::rtl::OUString > m_aSeriesStyles; - ::std::vector< ::rtl::OUString > m_aPointStyles; + ::std::vector< OUString > m_aSeriesStyles; + ::std::vector< OUString > m_aPointStyles; NewDonutSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32 nPointCount ) @@ -404,14 +403,14 @@ struct NewDonutSeries m_aSeriesStyles.resize(nPointCount); } - void setSeriesStyleNameToPoint( const ::rtl::OUString& rStyleName, sal_Int32 nPointIndex ) + void setSeriesStyleNameToPoint( const OUString& rStyleName, sal_Int32 nPointIndex ) { DBG_ASSERT(nPointIndex < static_cast(m_aSeriesStyles.size()),"donut point <-> series count mismatch"); if( nPointIndex < static_cast(m_aSeriesStyles.size()) ) m_aSeriesStyles[nPointIndex]=rStyleName; } - void setPointStyleNameToPoint( const ::rtl::OUString& rStyleName, sal_Int32 nPointIndex ) + void setPointStyleNameToPoint( const OUString& rStyleName, sal_Int32 nPointIndex ) { DBG_ASSERT(nPointIndex < static_cast(m_aPointStyles.size()),"donut point <-> series count mismatch"); if( nPointIndex < static_cast(m_aPointStyles.size()) ) @@ -427,8 +426,8 @@ struct NewDonutSeries aRet.push_back( aSeriesStyle ); sal_Int32 nPointIndex=0; - ::std::vector< ::rtl::OUString >::iterator aPointIt( m_aPointStyles.begin() ); - ::std::vector< ::rtl::OUString >::iterator aPointEnd( m_aPointStyles.end() ); + ::std::vector< OUString >::iterator aPointIt( m_aPointStyles.begin() ); + ::std::vector< OUString >::iterator aPointEnd( m_aPointStyles.end() ); while( aPointIt != aPointEnd ) { DataRowPointStyle aPointStyle( DataRowPointStyle::DATA_POINT @@ -569,7 +568,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle } bool lcl_SpecialHandlingForDonutChartNeeded( - const ::rtl::OUString & rServiceName, + const OUString & rServiceName, const SvXMLImport & rImport ) { bool bResult = false; @@ -585,12 +584,12 @@ bool lcl_SpecialHandlingForDonutChartNeeded( static void lcl_ApplyDataFromRectangularRangeToDiagram( const uno::Reference< chart2::XChartDocument >& xNewDoc - , const rtl::OUString& rRectangularRange + , const OUString& rRectangularRange , ::com::sun::star::chart::ChartDataRowSource eDataRowSource , bool bRowHasLabels, bool bColHasLabels , bool bSwitchOnLabelsAndCategoriesForOwnData - , const rtl::OUString& sColTrans - , const rtl::OUString& sRowTrans ) + , const OUString& sColTrans + , const OUString& sRowTrans ) { if( !xNewDoc.is() ) return; @@ -613,15 +612,15 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( uno::Sequence< beans::PropertyValue > aArgs( 3 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString( "CellRangeRepresentation" ), + OUString( "CellRangeRepresentation" ), -1, uno::makeAny( rRectangularRange ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString( "DataRowSource" ), + OUString( "DataRowSource" ), -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString( "FirstCellAsLabel" ), + OUString( "FirstCellAsLabel" ), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); @@ -629,7 +628,7 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( { aArgs.realloc( aArgs.getLength() + 1 ); aArgs[ sal::static_int_cast(aArgs.getLength()) - 1 ] = beans::PropertyValue( - ::rtl::OUString( "SequenceMapping" ), + OUString( "SequenceMapping" ), -1, uno::makeAny( !sColTrans.isEmpty() ? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) : lcl_getNumberSequenceFromString( sRowTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) ), @@ -638,24 +637,24 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( //work around wrong writer ranges ( see Issue 58464 ) { - rtl::OUString aChartOleObjectName; + OUString aChartOleObjectName; uno::Reference< frame::XModel > xModel(xNewDoc, uno::UNO_QUERY ); if( xModel.is() ) { comphelper::MediaDescriptor aMediaDescriptor( xModel->getArgs() ); comphelper::MediaDescriptor::const_iterator aIt( - aMediaDescriptor.find( rtl::OUString( "HierarchicalDocumentName" ))); + aMediaDescriptor.find( OUString( "HierarchicalDocumentName" ))); if( aIt != aMediaDescriptor.end() ) { - aChartOleObjectName = (*aIt).second.get< ::rtl::OUString >(); + aChartOleObjectName = (*aIt).second.get< OUString >(); } } if( !aChartOleObjectName.isEmpty() ) { aArgs.realloc( aArgs.getLength() + 1 ); aArgs[ sal::static_int_cast(aArgs.getLength()) - 1 ] = beans::PropertyValue( - ::rtl::OUString( "ChartOleObjectName" ), + OUString( "ChartOleObjectName" ), -1, uno::makeAny( aChartOleObjectName ), beans::PropertyState_DIRECT_VALUE ); } @@ -667,11 +666,11 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram( aArgs.realloc( aArgs.getLength() + 2 ); aArgs[ sal::static_int_cast(aArgs.getLength()) - 2 ] = beans::PropertyValue( - ::rtl::OUString( "HasCategories" ), + OUString( "HasCategories" ), -1, uno::makeAny( bHasCateories ), beans::PropertyState_DIRECT_VALUE ); aArgs[ sal::static_int_cast(aArgs.getLength()) - 1 ] = beans::PropertyValue( - ::rtl::OUString("UseCategoriesAsX"), + OUString("UseCategoriesAsX"), -1, uno::makeAny( sal_False ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui) beans::PropertyState_DIRECT_VALUE ); @@ -695,7 +694,7 @@ void SchXMLChartContext::EndElement() { uno::Any aAny; aAny <<= maMainTitle; - xTitleProp->setPropertyValue( rtl::OUString( "String" ), aAny ); + xTitleProp->setPropertyValue( OUString( "String" ), aAny ); } catch(const beans::UnknownPropertyException&) { @@ -712,7 +711,7 @@ void SchXMLChartContext::EndElement() { uno::Any aAny; aAny <<= maSubTitle; - xTitleProp->setPropertyValue( rtl::OUString( "String" ), aAny ); + xTitleProp->setPropertyValue( OUString( "String" ), aAny ); } catch(const beans::UnknownPropertyException&) { @@ -731,13 +730,13 @@ void SchXMLChartContext::EndElement() if( xDiaProp.is()) { if( maSeriesDefaultsAndStyles.maStackedDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString("Stacked"),maSeriesDefaultsAndStyles.maStackedDefault); + xDiaProp->setPropertyValue(OUString("Stacked"),maSeriesDefaultsAndStyles.maStackedDefault); if( maSeriesDefaultsAndStyles.maPercentDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString("Percent"),maSeriesDefaultsAndStyles.maPercentDefault); + xDiaProp->setPropertyValue(OUString("Percent"),maSeriesDefaultsAndStyles.maPercentDefault); if( maSeriesDefaultsAndStyles.maDeepDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString("Deep"),maSeriesDefaultsAndStyles.maDeepDefault); + xDiaProp->setPropertyValue(OUString("Deep"),maSeriesDefaultsAndStyles.maDeepDefault); if( maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString("StackedBarsConnected"),maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault); + xDiaProp->setPropertyValue(OUString("StackedBarsConnected"),maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault); } //the OOo 2.0 implementation and older has a bug with donuts @@ -808,7 +807,7 @@ void SchXMLChartContext::EndElement() try { if( bOlderThan2_3 && xDiaProp.is() )//for older charts the hidden cells were removed by calc on the fly - xDiaProp->setPropertyValue(::rtl::OUString("IncludeHiddenCells"),uno::makeAny(false)); + xDiaProp->setPropertyValue(OUString("IncludeHiddenCells"),uno::makeAny(false)); // note: mbRowHasLabels means the first row contains labels, that means we have "column-descriptions", // (analogously mbColHasLabels means we have "row-descriptions") @@ -874,7 +873,7 @@ void SchXMLChartContext::EndElement() // set autostyles for series and data points const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext(); const SvXMLStyleContext* pStyle = NULL; - ::rtl::OUString sCurrStyleName; + OUString sCurrStyleName; if( pStylesCtxt ) { @@ -906,7 +905,7 @@ void SchXMLChartContext::EndElement() } if( xProp.is()) - xProp->setPropertyValue( rtl::OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_True) ); + xProp->setPropertyValue( OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_True) ); } void SchXMLChartContext::MergeSeriesForStockChart() @@ -934,7 +933,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() { xDSContainer.set( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xCTProp( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW ); - xCTProp->getPropertyValue( ::rtl::OUString( "Japanese" )) >>= bHasJapaneseCandlestick; + xCTProp->getPropertyValue( OUString( "Japanese" )) >>= bHasJapaneseCandlestick; break; } } @@ -989,7 +988,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() SvXMLImportContext* SchXMLChartContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { static const sal_Bool bTrue = sal_True; @@ -1019,7 +1018,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( xProp.is()) { - xProp->setPropertyValue( rtl::OUString( "HasMainTitle" ), aTrueBool ); + xProp->setPropertyValue( OUString( "HasMainTitle" ), aTrueBool ); } uno::Reference< drawing::XShape > xTitleShape( xDoc->getTitle(), uno::UNO_QUERY ); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), @@ -1032,7 +1031,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( xProp.is()) { - xProp->setPropertyValue( rtl::OUString( "HasSubTitle" ), aTrueBool ); + xProp->setPropertyValue( OUString( "HasSubTitle" ), aTrueBool ); } uno::Reference< drawing::XShape > xTitleShape( xDoc->getSubTitle(), uno::UNO_QUERY ); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), @@ -1140,8 +1139,8 @@ void SchXMLChartContext::InitChart( // ---------------------------------------- SchXMLTitleContext::SchXMLTitleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, - rtl::OUString& rTitle, + const OUString& rLocalName, + OUString& rTitle, uno::Reference< drawing::XShape >& xTitleShape ) : SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), mrImportHelper( rImpHelper ), @@ -1163,9 +1162,9 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_SVG ) @@ -1214,7 +1213,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut SvXMLImportContext* SchXMLTitleContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index 2a6258cd734a..91057b84f16a 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -79,7 +79,7 @@ class SchXMLChartContext : public SvXMLImportContext { public: SchXMLChartContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName ); + SvXMLImport& rImport, const OUString& rLocalName ); virtual ~SchXMLChartContext(); virtual void StartElement( const com::sun::star::uno::Reference< @@ -87,7 +87,7 @@ public: virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -95,9 +95,9 @@ private: SchXMLTable maTable; SchXMLImportHelper& mrImportHelper; - ::rtl::OUString maMainTitle, maSubTitle; + OUString maMainTitle, maSubTitle; com::sun::star::awt::Point maMainTitlePos, maSubTitlePos, maLegendPos; - ::rtl::OUString m_aXLinkHRefAttributeToIndicateDataProvider; + OUString m_aXLinkHRefAttributeToIndicateDataProvider; bool m_bHasRangeAtPlotArea; bool m_bHasTableElement; sal_Bool mbAllRangeAddressesAvailable; @@ -107,16 +107,16 @@ private: bool mbIsStockChart; com::sun::star::uno::Sequence< com::sun::star::chart::ChartSeriesAddress > maSeriesAddresses; - ::rtl::OUString msCategoriesAddress; - ::rtl::OUString msChartAddress; + OUString msCategoriesAddress; + OUString msChartAddress; SeriesDefaultsAndStyles maSeriesDefaultsAndStyles; tSchXMLLSequencesPerIndex maLSequencesPerIndex; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxDrawPage; - ::rtl::OUString msColTrans; - ::rtl::OUString msRowTrans; - ::rtl::OUString maChartTypeServiceName; + OUString msColTrans; + OUString msRowTrans; + OUString maChartTypeServiceName; ::com::sun::star::awt::Size maChartSize; @@ -126,7 +126,7 @@ private: @param bSetWitchData Indicates whether the data set takes it's data series from rows or from columns. */ - void InitChart (const ::rtl::OUString & rChartTypeServiceName, + void InitChart (const OUString & rChartTypeServiceName, sal_Bool bSetSwitchData); void MergeSeriesForStockChart(); @@ -138,14 +138,14 @@ class SchXMLTitleContext : public SvXMLImportContext { private: SchXMLImportHelper& mrImportHelper; - rtl::OUString& mrTitle; + OUString& mrTitle; com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxTitleShape; - rtl::OUString msAutoStyleName; + OUString msAutoStyleName; public: SchXMLTitleContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, - rtl::OUString& rTitle, + SvXMLImport& rImport, const OUString& rLocalName, + OUString& rTitle, com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xTitleShape ); virtual ~SchXMLTitleContext(); @@ -153,7 +153,7 @@ public: com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx index c3ddabd3af83..9350f8676267 100644 --- a/xmloff/source/chart/SchXMLEnumConverter.cxx +++ b/xmloff/source/chart/SchXMLEnumConverter.cxx @@ -26,7 +26,6 @@ // header for rtl::Static #include -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star; diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 11cac872a45c..ee01a6ad3e18 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -109,9 +109,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OUStringToOString; using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -161,9 +158,9 @@ public: UniReference< XMLPropertySetMapper > GetPropertySetMapper() const; - void SetChartRangeAddress( const ::rtl::OUString& rAddress ) + void SetChartRangeAddress( const OUString& rAddress ) { msChartAddress = rAddress; } - void SetTableNumberList( const ::rtl::OUString& rList ) + void SetTableNumberList( const OUString& rList ) { msTableNumberList = rList; } void InitRangeSegmentationProperties( @@ -177,7 +174,7 @@ public: /** first parseDocument: collect autostyles and store names in this queue second parseDocument: export content and use names from this queue */ - ::std::queue< ::rtl::OUString > maAutoStyleNameQueue; + ::std::queue< OUString > maAutoStyleNameQueue; void CollectAutoStyle( const std::vector< XMLPropertyState >& aStates ); void AddAutoStyleAttribute( @@ -251,7 +248,7 @@ public: /// fills the member msString with the appropriate String (i.e. "A3") void getCellAddress( sal_Int32 nCol, sal_Int32 nRow ); /// exports a string as a paragraph element - void exportText( const ::rtl::OUString& rText, bool bConvertTabsLFs = false ); + void exportText( const OUString& rText, bool bConvertTabsLFs = false ); void exportErrorBarRanges(); private: @@ -264,24 +261,24 @@ public: UniReference< XMLPropertySetMapper > mxPropertySetMapper; UniReference< XMLChartExportPropertyMapper > mxExpPropMapper; - rtl::OUString msTableName; - rtl::OUStringBuffer msStringBuffer; - rtl::OUString msString; + OUString msTableName; + OUStringBuffer msStringBuffer; + OUString msString; // members filled by InitRangeSegmentationProperties (retrieved from DataProvider) sal_Bool mbHasSeriesLabels; sal_Bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false sal_Bool mbRowSourceColumns; - rtl::OUString msChartAddress; - rtl::OUString msTableNumberList; + OUString msChartAddress; + OUString msTableNumberList; ::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping; - rtl::OUString msCLSID; + OUString msCLSID; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes; tDataSequenceCont m_aDataSequencesToExport; - rtl::OUString maCategoriesRange; + OUString maCategoriesRange; }; namespace @@ -488,7 +485,7 @@ bool lcl_isSeriesAttachedToFirstAxis( return bResult; } -OUString lcl_ConvertRange( const ::rtl::OUString & rRange, const Reference< chart2::XChartDocument > & xDoc ) +OUString lcl_ConvertRange( const OUString & rRange, const Reference< chart2::XChartDocument > & xDoc ) { OUString aResult = rRange; if( !xDoc.is() ) @@ -593,10 +590,10 @@ sal_Int32 lcl_getMaxSequenceLength( return nResult; } -uno::Sequence< rtl::OUString > lcl_DataSequenceToStringSequence( +uno::Sequence< OUString > lcl_DataSequenceToStringSequence( const uno::Reference< chart2::data::XDataSequence >& xDataSequence ) { - uno::Sequence< rtl::OUString > aResult; + uno::Sequence< OUString > aResult; if(!xDataSequence.is()) return aResult; @@ -662,7 +659,7 @@ uno::Sequence< rtl::OUString > lcl_DataSequenceToStringSequence( { //no double value is countained //is there any text? - uno::Sequence< rtl::OUString > aStrings( lcl_DataSequenceToStringSequence( xSeq ) ); + uno::Sequence< OUString > aStrings( lcl_DataSequenceToStringSequence( xSeq ) ); sal_Int32 nTextCount = aStrings.getLength(); for( sal_Int32 j = 0; j < nTextCount; ++j ) { @@ -977,7 +974,7 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE( "chart:exporting error bar ranges: %s", aBStr.getStr()); #else (void)rEx; // avoid warning @@ -988,7 +985,7 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea return aResult; } -bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequence > xValues, rtl::OUString& rFirstRangeForThisDomainIndex, SvXMLExport& rExport ) +bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequence > xValues, OUString& rFirstRangeForThisDomainIndex, SvXMLExport& rExport ) { bool bDomainExported = false; if( xValues.is()) @@ -1078,7 +1075,7 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl( mbHasSeriesLabels( sal_False ), mbHasCategoryLabels( sal_False ), mbRowSourceColumns( sal_True ), - msCLSID( rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName())) + msCLSID( OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName())) { msTableName = OUString( "local-table" ); @@ -1104,13 +1101,13 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl( XML_STYLE_FAMILY_TEXT_PARAGRAPH, GetXMLToken( XML_PARAGRAPH ), mxExpPropMapper.get(), - rtl::OUString( 'P' )); + OUString( 'P' )); // register text family also for shapes mrAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_TEXT, GetXMLToken( XML_TEXT ), mxExpPropMapper.get(), - rtl::OUString( 'T' )); + OUString( 'T' )); } SchXMLExportHelper_Impl::~SchXMLExportHelper_Impl() @@ -1129,7 +1126,7 @@ void SchXMLExportHelper_Impl::exportChart( Reference< chart::XChartDocument > rC DBG_ASSERT( maAutoStyleNameQueue.empty(), "There are still remaining autostyle names in the queue" ); } -static ::rtl::OUString lcl_GetStringFromNumberSequence( const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ ) +static OUString lcl_GetStringFromNumberSequence( const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ ) { const sal_Int32* pArray = rSequenceMapping.getConstArray(); const sal_Int32 nSize = rSequenceMapping.getLength(); @@ -1230,7 +1227,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& { SvXMLElementExport aSet( mrExport, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, sal_True, sal_True ); { - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDateTime(sBuffer, aNullDate); mrExport.AddAttribute( XML_NAMESPACE_TABLE,XML_DATE_VALUE,sBuffer.makeStringAndClear()); SvXMLElementExport aNull( mrExport, XML_NAMESPACE_TABLE, XML_NULL_DATE, sal_True, sal_True ); @@ -1300,7 +1297,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& enum XMLTokenEnum eTransToken = ::xmloff::token::XML_ROW_MAPPING; if( mbRowSourceColumns ) eTransToken = ::xmloff::token::XML_COLUMN_MAPPING; - ::rtl::OUString aSequenceMappingStr( lcl_GetStringFromNumberSequence( + OUString aSequenceMappingStr( lcl_GetStringFromNumberSequence( maSequenceMapping, mbHasCategoryLabels && !xNewDoc->hasInternalDataProvider() ) ); mrExport.AddAttribute( XML_NAMESPACE_CHART, @@ -1458,7 +1455,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& { awt::Size aSize( xLegendShape->getSize() ); addSize( aSize, true ); - rtl::OUStringBuffer aAspectRatioString; + OUStringBuffer aAspectRatioString; ::sax::Converter::convertDouble( aAspectRatioString, double(aSize.Width)/double(aSize.Height)); @@ -1988,7 +1985,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE("chart:TableNumberList property caught: %s", aBStr.getStr()); #else (void)rEx; // avoid warning @@ -2024,7 +2021,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE( "chart:exportPlotAreaException caught: %s", aBStr.getStr()); #else (void)rEx; // avoid warning @@ -2609,7 +2606,7 @@ namespace Reference< chart2::data::XTextualDataSequence > xTextualDataSequence( xDataSequence, uno::UNO_QUERY ); if( xTextualDataSequence.is() ) { - uno::Sequence< rtl::OUString > aStrings( xTextualDataSequence->getTextualData() ); + uno::Sequence< OUString > aStrings( xTextualDataSequence->getTextualData() ); sal_Int32 nCount = aStrings.getLength(); for( sal_Int32 i = 0; i < nCount; ++i ) { @@ -3083,7 +3080,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const ReferencegetPropertyValue( bYError ? rtl::OUString("ErrorBarY") : rtl::OUString("ErrorBarX") ); + aAny = xSeriesProp->getPropertyValue( bYError ? OUString("ErrorBarY") : OUString("ErrorBarX") ); aAny >>= xErrorBarProp; if ( xErrorBarProp.is() ) @@ -3121,7 +3118,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const Reference SvtSaveOptions::ODFVER_012 ) { - rtl::OUString aRole, aRange; + OUString aRole, aRange; Reference< beans::XPropertySet > xSeqProp( *aIt, uno::UNO_QUERY_THROW ); xSeqProp->getPropertyValue("Role") >>= aRole; @@ -3739,7 +3736,7 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference< { Reference< chart2::data::XDataSource > xDataSource( lcl_pressUsedDataIntoRectangularFormat( xChartDoc, mbHasCategoryLabels )); Sequence< beans::PropertyValue > aArgs( xDataProvider->detectArguments( xDataSource )); - ::rtl::OUString sCellRange, sBrokenRange; + OUString sCellRange, sBrokenRange; bool bBrokenRangeAvailable = false; for( sal_Int32 i=0; igetNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) diff --git a/xmloff/source/chart/SchXMLLegendContext.hxx b/xmloff/source/chart/SchXMLLegendContext.hxx index 88ab218f811c..980af704bc82 100644 --- a/xmloff/source/chart/SchXMLLegendContext.hxx +++ b/xmloff/source/chart/SchXMLLegendContext.hxx @@ -26,7 +26,7 @@ class SchXMLLegendContext : public SvXMLImportContext { public: - SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const rtl::OUString& rLocalName ); + SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName ); virtual ~SchXMLLegendContext(); virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx index 9195e6644b2c..f74095ee732e 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -25,7 +25,6 @@ #include #include -using ::rtl::OUString; using namespace com::sun::star; using namespace ::xmloff::token; @@ -53,8 +52,8 @@ void SchXMLParagraphContext::StartElement( const uno::Reference< xml::sax::XAttr for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if (IsXMLToken(aLocalName, XML_ID)) diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx index ba246ee75a11..8c2b922f60b4 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.hxx +++ b/xmloff/source/chart/SchXMLParagraphContext.hxx @@ -30,25 +30,25 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax { class SchXMLParagraphContext : public SvXMLImportContext { private: - ::rtl::OUString& mrText; - ::rtl::OUString* mpId; - ::rtl::OUStringBuffer maBuffer; + OUString& mrText; + OUString* mpId; + OUStringBuffer maBuffer; public: SchXMLParagraphContext( SvXMLImport& rImport, - const ::rtl::OUString& rLocalName, - ::rtl::OUString& rText, - ::rtl::OUString * pOutId = 0 ); + const OUString& rLocalName, + OUString& rText, + OUString * pOutId = 0 ); virtual ~SchXMLParagraphContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void Characters( const rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _SCH_XMLPARAGRAPHCONTEXT_HXX_ diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index a6ca2b526c5b..8fef27b02dbc 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -64,7 +64,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; using com::sun::star::uno::Reference; namespace @@ -78,7 +77,7 @@ struct lcl_AxisHasCategories : public ::std::unary_function< SchXMLAxis, bool > } }; -OUString lcl_ConvertRange( const ::rtl::OUString & rRange, const uno::Reference< chart2::XChartDocument > & xDoc ) +OUString lcl_ConvertRange( const OUString & rRange, const uno::Reference< chart2::XChartDocument > & xDoc ) { OUString aResult = rRange; if(!xDoc.is()) @@ -108,7 +107,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe if( xProp.is() ) { drawing::CameraGeometry aCamGeo; - xProp->getPropertyValue( ::rtl::OUString( "D3DCameraGeometry" )) >>= aCamGeo; + xProp->getPropertyValue( OUString( "D3DCameraGeometry" )) >>= aCamGeo; maVRP.setX( aCamGeo.vrp.PositionX ); maVRP.setY( aCamGeo.vrp.PositionY ); maVRP.setZ( aCamGeo.vrp.PositionZ ); @@ -123,7 +122,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE( "Exception caught for property NumberOfLines: %s", aBStr.getStr()); #else (void)rEx; // avoid warning for pro build @@ -137,17 +136,17 @@ SchXML3DSceneAttributesHelper::~SchXML3DSceneAttributesHelper() SchXMLPlotAreaContext::SchXMLPlotAreaContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, - const rtl::OUString& rXLinkHRefAttributeToIndicateDataProvider, - ::rtl::OUString& rCategoriesAddress, - ::rtl::OUString& rChartAddress, + SvXMLImport& rImport, const OUString& rLocalName, + const OUString& rXLinkHRefAttributeToIndicateDataProvider, + OUString& rCategoriesAddress, + OUString& rChartAddress, bool& rbHasRangeAtPlotArea, sal_Bool & rAllRangeAddressesAvailable, sal_Bool & rColHasLabels, sal_Bool & rRowHasLabels, chart::ChartDataRowSource & rDataRowSource, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, - const ::rtl::OUString& aChartTypeServiceName, + const OUString& aChartTypeServiceName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, const awt::Size & rChartSize ) : SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), @@ -199,36 +198,36 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( try { xProp->setPropertyValue( - rtl::OUString( "HasXAxis" ), aFalseBool ); + OUString( "HasXAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasXAxisGrid" ), aFalseBool ); + OUString( "HasXAxisGrid" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasXAxisDescription" ), aFalseBool ); + OUString( "HasXAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasSecondaryXAxis" ), aFalseBool ); + OUString( "HasSecondaryXAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasSecondaryXAxisDescription" ), aFalseBool ); + OUString( "HasSecondaryXAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasYAxis" ), aFalseBool ); + OUString( "HasYAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasYAxisGrid" ), aFalseBool ); + OUString( "HasYAxisGrid" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasYAxisDescription" ), aFalseBool ); + OUString( "HasYAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasSecondaryYAxis" ), aFalseBool ); + OUString( "HasSecondaryYAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasSecondaryYAxisDescription" ), aFalseBool ); + OUString( "HasSecondaryYAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasZAxis" ), aFalseBool ); + OUString( "HasZAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString( "HasZAxisDescription" ), aFalseBool ); + OUString( "HasZAxisDescription" ), aFalseBool ); uno::Any aAny; chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS; aAny <<= eSource; - xProp->setPropertyValue( rtl::OUString( "DataRowSource" ), aAny ); + xProp->setPropertyValue( OUString( "DataRowSource" ), aAny ); } catch( const beans::UnknownPropertyException & ) { @@ -249,9 +248,9 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) @@ -306,12 +305,12 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri uno::Any aAny; aAny <<= (sal_Bool)(mrColHasLabels); xDocProp->setPropertyValue( - ::rtl::OUString( "DataSourceLabelsInFirstColumn" ), + OUString( "DataSourceLabelsInFirstColumn" ), aAny ); aAny <<= (sal_Bool)(mrRowHasLabels); xDocProp->setPropertyValue( - ::rtl::OUString( "DataSourceLabelsInFirstRow" ), + OUString( "DataSourceLabelsInFirstRow" ), aAny ); } catch( const beans::UnknownPropertyException & ) @@ -341,13 +340,13 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri pPropStyleContext->FillPropertySet( xProp ); // get the data row source that was set without having data - xProp->getPropertyValue( ::rtl::OUString( "DataRowSource" )) + xProp->getPropertyValue( OUString( "DataRowSource" )) >>= mrDataRowSource; //lines on/off //this old property is not supported fully anymore with the new chart, so we need to get the information a little bit different from similar properties mrSeriesDefaultsAndStyles.maLinesOnProperty = SchXMLTools::getPropertyFromContext( - ::rtl::OUString("Lines"), pPropStyleContext, pStylesCtxt ); + OUString("Lines"), pPropStyleContext, pStylesCtxt ); //handle automatic position and size m_aOuterPositioning.readAutomaticPositioningProperties( pPropStyleContext, pStylesCtxt ); @@ -356,12 +355,12 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan3_0( GetImport().GetModel() ) ) { bool bIs3d = false; - if( xProp.is() && ( xProp->getPropertyValue(::rtl::OUString("Dim3D")) >>= bIs3d ) && + if( xProp.is() && ( xProp->getPropertyValue(OUString("Dim3D")) >>= bIs3d ) && bIs3d ) { if( maChartTypeServiceName == "com.sun.star.chart2.PieChartType" || maChartTypeServiceName == "com.sun.star.chart2.DonutChartType" ) { - ::rtl::OUString aPropName( ::rtl::OUString("StartingAngle") ); + OUString aPropName( OUString("StartingAngle") ); uno::Any aAStartingAngle( SchXMLTools::getPropertyFromContext( aPropName, pPropStyleContext, pStylesCtxt ) ); if( !aAStartingAngle.hasValue() ) xProp->setPropertyValue( aPropName, uno::makeAny(sal_Int32(0)) ) ; @@ -378,28 +377,28 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri { try { - mrSeriesDefaultsAndStyles.maSymbolTypeDefault = xProp->getPropertyValue(::rtl::OUString("SymbolType")); - mrSeriesDefaultsAndStyles.maDataCaptionDefault = xProp->getPropertyValue(::rtl::OUString("DataCaption")); + mrSeriesDefaultsAndStyles.maSymbolTypeDefault = xProp->getPropertyValue(OUString("SymbolType")); + mrSeriesDefaultsAndStyles.maDataCaptionDefault = xProp->getPropertyValue(OUString("DataCaption")); - mrSeriesDefaultsAndStyles.maMeanValueDefault = xProp->getPropertyValue(::rtl::OUString("MeanValue")); - mrSeriesDefaultsAndStyles.maRegressionCurvesDefault = xProp->getPropertyValue(::rtl::OUString("RegressionCurves")); + mrSeriesDefaultsAndStyles.maMeanValueDefault = xProp->getPropertyValue(OUString("MeanValue")); + mrSeriesDefaultsAndStyles.maRegressionCurvesDefault = xProp->getPropertyValue(OUString("RegressionCurves")); bool bStacked = false; - mrSeriesDefaultsAndStyles.maStackedDefault = xProp->getPropertyValue(::rtl::OUString("Stacked")); + mrSeriesDefaultsAndStyles.maStackedDefault = xProp->getPropertyValue(OUString("Stacked")); mrSeriesDefaultsAndStyles.maStackedDefault >>= bStacked; - mrSeriesDefaultsAndStyles.maPercentDefault = xProp->getPropertyValue(::rtl::OUString("Percent")); + mrSeriesDefaultsAndStyles.maPercentDefault = xProp->getPropertyValue(OUString("Percent")); mrSeriesDefaultsAndStyles.maPercentDefault >>= mbPercentStacked; - mrSeriesDefaultsAndStyles.maStackedBarsConnectedDefault = xProp->getPropertyValue(::rtl::OUString("StackedBarsConnected")); + mrSeriesDefaultsAndStyles.maStackedBarsConnectedDefault = xProp->getPropertyValue(OUString("StackedBarsConnected")); // deep - uno::Any aDeepProperty( xProp->getPropertyValue(::rtl::OUString("Deep"))); + uno::Any aDeepProperty( xProp->getPropertyValue(OUString("Deep"))); // #124488# old versions store a 3d area and 3D line deep chart with Deep==false => workaround for this if( ! (bStacked || mbPercentStacked )) { if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan2_3( GetImport().GetModel() ) ) { bool bIs3d = false; - if( ( xProp->getPropertyValue(::rtl::OUString("Dim3D")) >>= bIs3d ) && + if( ( xProp->getPropertyValue(OUString("Dim3D")) >>= bIs3d ) && bIs3d ) { if( maChartTypeServiceName == "com.sun.star.chart2.AreaChartType" || maChartTypeServiceName == "com.sun.star.chart2.LineChartType" ) @@ -411,13 +410,13 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri } mrSeriesDefaultsAndStyles.maDeepDefault = aDeepProperty; - xProp->getPropertyValue(::rtl::OUString("NumberOfLines")) >>= mnNumOfLinesProp; - xProp->getPropertyValue(::rtl::OUString("Volume")) >>= mbStockHasVolume; + xProp->getPropertyValue(OUString("NumberOfLines")) >>= mnNumOfLinesProp; + xProp->getPropertyValue(OUString("Volume")) >>= mbStockHasVolume; } catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE("PlotAreaContext:EndElement(): Exception caught: %s", aBStr.getStr()); #else (void)rEx; // avoid warning for pro build @@ -442,13 +441,13 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri // data yet. mxNewDoc->createInternalDataProvider( false /* bCloneExistingData */ ); if( xProp.is() && mrDataRowSource!=chart::ChartDataRowSource_COLUMNS ) - xProp->setPropertyValue( rtl::OUString( "DataRowSource" ), uno::makeAny(mrDataRowSource) ); + xProp->setPropertyValue( OUString( "DataRowSource" ), uno::makeAny(mrDataRowSource) ); } } SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext* pContext = 0; @@ -570,7 +569,7 @@ void SchXMLPlotAreaContext::EndElement() if( xDiaProp.is()) { sal_Bool bIsThreeDim = sal_False; - uno::Any aAny = xDiaProp->getPropertyValue( ::rtl::OUString( "Dim3D" )); + uno::Any aAny = xDiaProp->getPropertyValue( OUString( "Dim3D" )); aAny >>= bIsThreeDim; // set 3d scene attributes @@ -585,13 +584,13 @@ void SchXMLPlotAreaContext::EndElement() { try { - xDiaProp->setPropertyValue( ::rtl::OUString( "NumberOfLines" ), + xDiaProp->setPropertyValue( OUString( "NumberOfLines" ), uno::makeAny( mnNumOfLinesProp )); } catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE( "Exception caught for property NumberOfLines: %s", aBStr.getStr()); #else (void)rEx; // avoid warning for pro build @@ -605,13 +604,13 @@ void SchXMLPlotAreaContext::EndElement() { try { - xDiaProp->setPropertyValue( ::rtl::OUString( "Volume" ), + xDiaProp->setPropertyValue( OUString( "Volume" ), uno::makeAny( true )); } catch( const uno::Exception & rEx ) { #ifdef DBG_UTIL - rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); + OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US)); OSL_TRACE("Exception caught for property Volume: %s", aBStr.getStr()); #else (void)rEx; // avoid warning for pro build @@ -644,7 +643,7 @@ void SchXMLPlotAreaContext::EndElement() // ======================================== -SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const rtl::OUString& rLocalName, +SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, ::std::list< DataRowPointStyle >& rStyleList, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, @@ -665,13 +664,13 @@ SchXMLDataPointContext::~SchXMLDataPointContext() void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - ::rtl::OUString sAutoStyleName; + OUString sAutoStyleName; sal_Int32 nRepeat = 1; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_CHART ) @@ -734,7 +733,7 @@ awt::Rectangle SchXMLPositonAttributesHelper::getRectangle() const return awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height ); } -bool SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +bool SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { //returns true if the attribute was proccessed bool bReturn = true; @@ -781,9 +780,9 @@ void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropS { //handle automatic position and size SchXMLTools::getPropertyFromContext( - ::rtl::OUString("AutomaticSize"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize; + OUString("AutomaticSize"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize; SchXMLTools::getPropertyFromContext( - ::rtl::OUString("AutomaticPosition"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition; + OUString("AutomaticPosition"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition; } } @@ -792,7 +791,7 @@ void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropS SchXMLCoordinateRegionContext::SchXMLCoordinateRegionContext( SvXMLImport& rImport , sal_uInt16 nPrefix - , const rtl::OUString& rLocalName + , const OUString& rLocalName , SchXMLPositonAttributesHelper& rPositioning ) : SvXMLImportContext( rImport, nPrefix, rLocalName ) , m_rPositioning( rPositioning ) @@ -810,9 +809,9 @@ void SchXMLCoordinateRegionContext::StartElement( const uno::Reference< xml::sax for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); m_rPositioning.readPositioningAttribute( nPrefix, aLocalName, aValue ); } @@ -824,7 +823,7 @@ SchXMLWallFloorContext::SchXMLWallFloorContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, uno::Reference< chart::XDiagram >& xDiagram, ContextType eContextType ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), @@ -843,12 +842,12 @@ void SchXMLWallFloorContext::StartElement( const uno::Reference< xml::sax::XAttr if( mxWallFloorSupplier.is()) { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - rtl::OUString sAutoStyleName; + OUString sAutoStyleName; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_CHART && @@ -887,7 +886,7 @@ SchXMLStockContext::SchXMLStockContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, uno::Reference< chart::XDiagram >& xDiagram, ContextType eContextType ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), @@ -906,12 +905,12 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut if( mxStockPropProvider.is()) { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - rtl::OUString sAutoStyleName; + OUString sAutoStyleName; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_CHART && @@ -957,7 +956,7 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocument > &xDoc, const uno::Reference< beans::XPropertySet > &xBarProp, - const rtl::OUString &aXMLRange, + const OUString &aXMLRange, bool bPositiveValue, bool bYError, tSchXMLLSequencesPerIndex& rSequences) { @@ -967,7 +966,7 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume assert( xDataSink.is() && xDataSource.is() && xDataProvider.is() ); - rtl::OUString aRange(lcl_ConvertRange(aXMLRange,xDoc)); + OUString aRange(lcl_ConvertRange(aXMLRange,xDoc)); uno::Reference< chart2::data::XDataSequence > xNewSequence( xDataProvider->createDataSequenceByRangeRepresentation( aRange )); @@ -976,7 +975,7 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume { SchXMLTools::setXMLRangePropertyAtDataSequence(xNewSequence,aXMLRange); - rtl::OUStringBuffer aRoleBuffer("error-bars-"); + OUStringBuffer aRoleBuffer("error-bars-"); if( bYError ) aRoleBuffer.append( sal_Unicode( 'y' )); else @@ -989,7 +988,7 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume else aRoleBuffer = aRoleBuffer.appendAscii( "negative" ); - rtl::OUString aRole = aRoleBuffer.makeStringAndClear(); + OUString aRole = aRoleBuffer.makeStringAndClear(); Reference< beans::XPropertySet > xSeqProp( xNewSequence, uno::UNO_QUERY ); @@ -1019,8 +1018,8 @@ SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, - const rtl::OUString &rSeriesStyleName, + const OUString& rLocalName, + const OUString &rSeriesStyleName, ::std::list< DataRowPointStyle >& rStyleList, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, @@ -1159,15 +1158,15 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - ::rtl::OUString sAutoStyleName; - rtl::OUString aPosRange; - rtl::OUString aNegRange; + OUString sAutoStyleName; + OUString aPosRange; + OUString aNegRange; bool bYError = true; /// Default errorbar, to be backward compatible with older files! for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_CHART ) @@ -1246,7 +1245,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax SvXMLImportContext* SchXMLStatisticsObjectContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext* pContext = 0; @@ -1271,7 +1270,7 @@ SchXMLEquationContext::SchXMLEquationContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, const awt::Size & rChartSize, @@ -1302,9 +1301,9 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) @@ -1337,7 +1336,7 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri uno::Reference< lang::XMultiServiceFactory > xFact( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); if( xFact.is()) xEqProp.set( xFact->createInstance( - ::rtl::OUString( "com.sun.star.chart2.RegressionEquation" )), uno::UNO_QUERY ); + OUString( "com.sun.star.chart2.RegressionEquation" )), uno::UNO_QUERY ); if( xEqProp.is()) { if( !sAutoStyleName.isEmpty() ) diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index 3f4d1337b7e1..cf945c142567 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -64,7 +64,7 @@ public: SchXMLPositonAttributesHelper( SvXMLImport& rImporter ); ~SchXMLPositonAttributesHelper(); - bool readPositioningAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + bool readPositioningAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); void readAutomaticPositioningProperties( XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); bool hasPosSize() const; @@ -95,17 +95,17 @@ class SchXMLPlotAreaContext : public SvXMLImportContext { public: SchXMLPlotAreaContext( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, - const rtl::OUString& rXLinkHRefAttributeToIndicateDataProvider, - ::rtl::OUString& rCategoriesAddress, - ::rtl::OUString& rChartAddress, + SvXMLImport& rImport, const OUString& rLocalName, + const OUString& rXLinkHRefAttributeToIndicateDataProvider, + OUString& rCategoriesAddress, + OUString& rChartAddress, bool& bHasRangeAtPlotArea, sal_Bool & rAllRangeAddressesAvailable, sal_Bool & rColHasLabels, sal_Bool & rRowHasLabels, ::com::sun::star::chart::ChartDataRowSource & rDataRowSource, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, - const ::rtl::OUString& aChartTypeServiceName, + const OUString& aChartTypeServiceName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, const ::com::sun::star::awt::Size & rChartSize ); virtual ~SchXMLPlotAreaContext(); @@ -113,7 +113,7 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -122,7 +122,7 @@ private: ::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram; ::com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxNewDoc; ::std::vector< SchXMLAxis > maAxes; - rtl::OUString& mrCategoriesAddress; + OUString& mrCategoriesAddress; SeriesDefaultsAndStyles& mrSeriesDefaultsAndStyles; sal_Int32 mnNumOfLinesProp; sal_Bool mbStockHasVolume; @@ -134,14 +134,14 @@ private: SchXMLPositonAttributesHelper m_aInnerPositioning;//excluding axes and axes titles bool mbPercentStacked; bool m_bAxisPositionAttributeImported; - ::rtl::OUString msAutoStyleName; - const ::rtl::OUString& m_rXLinkHRefAttributeToIndicateDataProvider; - ::rtl::OUString& mrChartAddress; + OUString msAutoStyleName; + const OUString& m_rXLinkHRefAttributeToIndicateDataProvider; + OUString& mrChartAddress; bool& m_rbHasRangeAtPlotArea; sal_Bool & mrColHasLabels; sal_Bool & mrRowHasLabels; ::com::sun::star::chart::ChartDataRowSource & mrDataRowSource; - ::rtl::OUString maChartTypeServiceName; + OUString maChartTypeServiceName; tSchXMLLSequencesPerIndex & mrLSequencesPerIndex; @@ -161,7 +161,7 @@ private: bool mbSymbolSizeForSeriesIsMissingInFile; public: - SchXMLDataPointContext( SvXMLImport& rImport, const rtl::OUString& rLocalName, + SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, ::std::list< DataRowPointStyle >& rStyleList, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32& rIndex, @@ -179,7 +179,7 @@ public: SchXMLCoordinateRegionContext( SvXMLImport& rImport , sal_uInt16 nPrefix - , const rtl::OUString& rLocalName + , const OUString& rLocalName , SchXMLPositonAttributesHelper& rPositioning ); virtual ~SchXMLCoordinateRegionContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -208,7 +208,7 @@ public: SchXMLWallFloorContext( SchXMLImportHelper& rImportHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, ContextType eContextType ); virtual ~SchXMLWallFloorContext(); @@ -236,7 +236,7 @@ public: SchXMLStockContext( SchXMLImportHelper& rImportHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, ContextType eContextType ); virtual ~SchXMLStockContext(); @@ -259,8 +259,8 @@ public: SchXMLImportHelper& rImportHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, - const rtl::OUString &rSeriesStyleName, + const OUString& rLocalName, + const OUString &rSeriesStyleName, ::std::list< DataRowPointStyle >& rStyleList, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, @@ -273,7 +273,7 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); private: @@ -283,7 +283,7 @@ private: ::com::sun::star::chart2::XDataSeries > m_xSeries; ContextType meContextType; ::com::sun::star::awt::Size maChartSize; - rtl::OUString maSeriesStyleName; + OUString maSeriesStyleName; tSchXMLLSequencesPerIndex& mrLSequencesPerIndex; }; @@ -296,7 +296,7 @@ public: SchXMLImportHelper& rImportHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, const ::com::sun::star::awt::Size & rChartSize, diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 5f4bf115a088..527bbd51c436 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -57,8 +57,6 @@ using namespace ::xmloff::token; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ================================================================================ @@ -73,7 +71,7 @@ private: public: SchXMLDomain2Context( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, ::std::vector< OUString > & rAddresses ); virtual ~SchXMLDomain2Context(); virtual void StartElement( const Reference< xml::sax::XAttributeList >& xAttrList ); @@ -82,8 +80,8 @@ public: SchXMLDomain2Context::SchXMLDomain2Context( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, - ::std::vector< ::rtl::OUString > & rAddresses ) : + const OUString& rLocalName, + ::std::vector< OUString > & rAddresses ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), mrAddresses( rAddresses ) { @@ -99,8 +97,8 @@ void SchXMLDomain2Context::StartElement( const uno::Reference< xml::sax::XAttrib for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_TABLE && @@ -145,7 +143,7 @@ void lcl_setAutomaticSymbolSize( const uno::Reference< beans::XPropertySet >& xS aSymbolSize.Width = aSymbolSize.Height; } } - xSeriesOrPointProp->setPropertyValue(::rtl::OUString("SymbolSize"),uno::makeAny( aSymbolSize )); + xSeriesOrPointProp->setPropertyValue(OUString("SymbolSize"),uno::makeAny( aSymbolSize )); } void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSeriesOrPointProp, const SvXMLImport& rImport ) @@ -154,14 +152,14 @@ void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSe return; sal_Int32 nSymbolType = chart::ChartSymbolType::NONE; - if( xSeriesOrPointProp.is() && ( xSeriesOrPointProp->getPropertyValue(::rtl::OUString("SymbolType")) >>= nSymbolType) ) + if( xSeriesOrPointProp.is() && ( xSeriesOrPointProp->getPropertyValue(OUString("SymbolType")) >>= nSymbolType) ) { if(chart::ChartSymbolType::NONE!=nSymbolType) { if( chart::ChartSymbolType::BITMAPURL==nSymbolType ) { //set special size for graphics to indicate to use the bitmap size itself - xSeriesOrPointProp->setPropertyValue(::rtl::OUString("SymbolSize"),uno::makeAny( awt::Size(-1,-1) )); + xSeriesOrPointProp->setPropertyValue(OUString("SymbolSize"),uno::makeAny( awt::Size(-1,-1) )); } else { @@ -174,7 +172,7 @@ void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSe void lcl_resetSymbolSizeForPointsIfNecessary( const uno::Reference< beans::XPropertySet >& xPointProp, const SvXMLImport& rImport , const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ) { - uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( ::rtl::OUString("SymbolSize"), pPropStyleContext, pStylesCtxt ) ); + uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( OUString("SymbolSize"), pPropStyleContext, pStylesCtxt ) ); if( !aASymbolSize.hasValue() ) lcl_setSymbolSizeIfNeeded( xPointProp, rImport ); } @@ -187,8 +185,8 @@ void lcl_insertErrorBarLSequencesToMap( Reference< chart2::data::XDataSource > xErrorBarSource; const OUString aPropName( bYError - ? ::rtl::OUString( "ErrorBarY" ) - : ::rtl::OUString( "ErrorBarX" )); + ? OUString( "ErrorBarY" ) + : OUString( "ErrorBarX" )); if( ( xSeriesProp->getPropertyValue( aPropName ) >>= xErrorBarSource ) && xErrorBarSource.is() ) { @@ -204,8 +202,8 @@ void lcl_insertErrorBarLSequencesToMap( } } -Reference< chart2::data::XLabeledDataSequence2 > lcl_createAndAddSequenceToSeries( const rtl::OUString& rRole - , const rtl::OUString& rRange +Reference< chart2::data::XLabeledDataSequence2 > lcl_createAndAddSequenceToSeries( const OUString& rRole + , const OUString& rRange , const Reference< chart2::XChartDocument >& xChartDoc , const Reference< chart2::XDataSeries >& xSeries ) { @@ -245,7 +243,7 @@ Reference< chart2::data::XLabeledDataSequence2 > lcl_createAndAddSequenceToSerie SchXMLSeries2Context::SchXMLSeries2Context( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, + SvXMLImport& rImport, const OUString& rLocalName, const Reference< chart2::XChartDocument > & xNewDoc, std::vector< SchXMLAxis >& rAxes, ::std::list< DataRowPointStyle >& rStyleList, @@ -299,9 +297,9 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; + OUString aValue = xAttrList->getValueByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) @@ -392,7 +390,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib // set default color for range-line to black (before applying styles) Reference< beans::XPropertySet > xSeriesProp( m_xSeries, uno::UNO_QUERY ); if( xSeriesProp.is()) - xSeriesProp->setPropertyValue( ::rtl::OUString("Color"), + xSeriesProp->setPropertyValue( OUString("Color"), uno::makeAny( sal_Int32( 0x000000 ))); // black } else if ( maSeriesChartTypeName == "com.sun.star.chart2.PieChartType" ) @@ -400,7 +398,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib //@todo: this property should be saved Reference< beans::XPropertySet > xSeriesProp( m_xSeries, uno::UNO_QUERY ); if( xSeriesProp.is()) - xSeriesProp->setPropertyValue( ::rtl::OUString("VaryColorsByPoint"), + xSeriesProp->setPropertyValue( OUString("VaryColorsByPoint"), uno::makeAny( true )); } @@ -448,10 +446,10 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib catch( const uno::Exception & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( "Exception caught. Type: " ) + - ::rtl::OUString::createFromAscii( typeid( ex ).name()) + - ::rtl::OUString( ", Message: " ) + + OSL_FAIL( OUStringToOString( + OUString( "Exception caught. Type: " ) + + OUString::createFromAscii( typeid( ex ).name()) + + OUString( ", Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } @@ -468,7 +466,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib const XMLPropStyleContext* pPropStyleContext = dynamic_cast< const XMLPropStyleContext * >( pStyle ); - uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( ::rtl::OUString("SymbolSize") + uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( OUString("SymbolSize") , pPropStyleContext, pStylesCtxt ) ); mbSymbolSizeIsMissingInFile = !aASymbolSize.hasValue(); } @@ -481,12 +479,12 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib struct DomainInfo { - DomainInfo( const rtl::OUString& rRole, const rtl::OUString& rRange, sal_Int32 nIndex ) + DomainInfo( const OUString& rRole, const OUString& rRange, sal_Int32 nIndex ) : aRole(rRole), aRange(rRange), nIndexForLocalData(nIndex) {} - rtl::OUString aRole; - rtl::OUString aRange; + OUString aRole; + OUString aRange; sal_Int32 nIndexForLocalData; }; @@ -623,7 +621,7 @@ void SchXMLSeries2Context::EndElement() SvXMLImportContext* SchXMLSeries2Context::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -728,27 +726,27 @@ void SchXMLSeries2Context::setDefaultsToSeries( SeriesDefaultsAndStyles& rSeries continue; if( rSeriesDefaultsAndStyles.maSymbolTypeDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("SymbolType"),rSeriesDefaultsAndStyles.maSymbolTypeDefault); + xSeries->setPropertyValue(OUString("SymbolType"),rSeriesDefaultsAndStyles.maSymbolTypeDefault); if( rSeriesDefaultsAndStyles.maDataCaptionDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("DataCaption"),rSeriesDefaultsAndStyles.maDataCaptionDefault); + xSeries->setPropertyValue(OUString("DataCaption"),rSeriesDefaultsAndStyles.maDataCaptionDefault); if( rSeriesDefaultsAndStyles.maErrorIndicatorDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("ErrorIndicator"),rSeriesDefaultsAndStyles.maErrorIndicatorDefault); + xSeries->setPropertyValue(OUString("ErrorIndicator"),rSeriesDefaultsAndStyles.maErrorIndicatorDefault); if( rSeriesDefaultsAndStyles.maErrorCategoryDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("ErrorCategory"),rSeriesDefaultsAndStyles.maErrorCategoryDefault); + xSeries->setPropertyValue(OUString("ErrorCategory"),rSeriesDefaultsAndStyles.maErrorCategoryDefault); if( rSeriesDefaultsAndStyles.maConstantErrorLowDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("ConstantErrorLow"),rSeriesDefaultsAndStyles.maConstantErrorLowDefault); + xSeries->setPropertyValue(OUString("ConstantErrorLow"),rSeriesDefaultsAndStyles.maConstantErrorLowDefault); if( rSeriesDefaultsAndStyles.maConstantErrorHighDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("ConstantErrorHigh"),rSeriesDefaultsAndStyles.maConstantErrorHighDefault); + xSeries->setPropertyValue(OUString("ConstantErrorHigh"),rSeriesDefaultsAndStyles.maConstantErrorHighDefault); if( rSeriesDefaultsAndStyles.maPercentageErrorDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("PercentageError"),rSeriesDefaultsAndStyles.maPercentageErrorDefault); + xSeries->setPropertyValue(OUString("PercentageError"),rSeriesDefaultsAndStyles.maPercentageErrorDefault); if( rSeriesDefaultsAndStyles.maErrorMarginDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("ErrorMargin"),rSeriesDefaultsAndStyles.maErrorMarginDefault); + xSeries->setPropertyValue(OUString("ErrorMargin"),rSeriesDefaultsAndStyles.maErrorMarginDefault); if( rSeriesDefaultsAndStyles.maMeanValueDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("MeanValue"),rSeriesDefaultsAndStyles.maMeanValueDefault); + xSeries->setPropertyValue(OUString("MeanValue"),rSeriesDefaultsAndStyles.maMeanValueDefault); if( rSeriesDefaultsAndStyles.maRegressionCurvesDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString("RegressionCurves"),rSeriesDefaultsAndStyles.maRegressionCurvesDefault); + xSeries->setPropertyValue(OUString("RegressionCurves"),rSeriesDefaultsAndStyles.maRegressionCurvesDefault); } catch( uno::Exception & ) { @@ -761,7 +759,7 @@ void SchXMLSeries2Context::setDefaultsToSeries( SeriesDefaultsAndStyles& rSeries void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , ::rtl::OUString& rCurrStyleName + , OUString& rCurrStyleName , SchXMLImportHelper& rImportHelper , const SvXMLImport& rImport , bool bIsStockChart @@ -782,7 +780,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe if( iStyle->mnAttachedAxis != 1 ) { - xSeriesProp->setPropertyValue( rtl::OUString( "Axis" ) + xSeriesProp->setPropertyValue( OUString( "Axis" ) , uno::makeAny(chart::ChartAxisAssign::SECONDARY_Y) ); } @@ -807,7 +805,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe // this property) bool bHasErrorBarRangesFromData = false; { - const ::rtl::OUString aErrorBarStylePropName( "ErrorBarStyle"); + const OUString aErrorBarStylePropName( "ErrorBarStyle"); uno::Any aErrorBarStyle( SchXMLTools::getPropertyFromContext( aErrorBarStylePropName, pPropStyleContext, pStylesCtxt )); if( aErrorBarStyle.hasValue()) @@ -854,7 +852,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , ::rtl::OUString& rCurrStyleName ) + , OUString& rCurrStyleName ) { ::std::list< DataRowPointStyle >::iterator iStyle; @@ -946,7 +944,7 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , ::rtl::OUString& rCurrStyleName + , OUString& rCurrStyleName , SchXMLImportHelper& rImportHelper , const SvXMLImport& rImport , bool bIsStockChart, bool bIsDonutChart, bool bSwitchOffLinesForScatter ) @@ -1006,7 +1004,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri { //need to set this explicitly here for old files as the new api does not support this property fully anymore if( bSwitchOffLinesForScatter ) - xPointProp->setPropertyValue(::rtl::OUString("Lines"),uno::makeAny(sal_False)); + xPointProp->setPropertyValue(OUString("Lines"),uno::makeAny(sal_False)); } catch( const uno::Exception & ) { @@ -1057,7 +1055,7 @@ void SchXMLSeries2Context::switchSeriesLinesOff( ::std::list< DataRowPointStyle if( !xSeries.is() ) continue; - xSeries->setPropertyValue(::rtl::OUString("Lines"),uno::makeAny(sal_False)); + xSeries->setPropertyValue(OUString("Lines"),uno::makeAny(sal_False)); } catch( uno::Exception & ) { diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx index 3ff16788f405..44819bb9a38b 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.hxx +++ b/xmloff/source/chart/SchXMLSeries2Context.hxx @@ -57,12 +57,12 @@ private: SchXMLAxis* mpAttachedAxis; sal_Int32 mnAttachedAxis; - ::rtl::OUString msAutoStyleName; - ::std::vector< ::rtl::OUString > maDomainAddresses; - ::rtl::OUString maGlobalChartTypeName; - ::rtl::OUString maSeriesChartTypeName; - ::rtl::OUString m_aSeriesRange; - ::rtl::OUString m_aSeriesLabelRange; + OUString msAutoStyleName; + ::std::vector< OUString > maDomainAddresses; + OUString maGlobalChartTypeName; + OUString maSeriesChartTypeName; + OUString m_aSeriesRange; + OUString m_aSeriesLabelRange; bool m_bHasDomainContext; tSchXMLLSequencesPerIndex & mrLSequencesPerIndex; tSchXMLLSequencesPerIndex maPostponedSequences; @@ -72,7 +72,7 @@ private: public: SchXMLSeries2Context( SchXMLImportHelper& rImpHelper, - SvXMLImport& rImport, const rtl::OUString& rLocalName, + SvXMLImport& rImport, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xNewDoc, std::vector< SchXMLAxis >& rAxes, @@ -80,7 +80,7 @@ public: sal_Int32 nSeriesIndex, sal_Bool bStockHasVolume, GlobalSeriesImportInfo& rGlobalSeriesImportInfo, - const ::rtl::OUString & aGlobalChartTypeName, + const OUString & aGlobalChartTypeName, tSchXMLLSequencesPerIndex & rLSequencesPerIndex, bool& rGlobalChartTypeUsedBySeries, const ::com::sun::star::awt::Size & rChartSize ); @@ -89,7 +89,7 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -101,7 +101,7 @@ public: static void setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , ::rtl::OUString& rCurrStyleName + , OUString& rCurrStyleName , SchXMLImportHelper& rImportHelper , const SvXMLImport& rImport , bool bIsStockChart @@ -110,12 +110,12 @@ public: static void setStylesToStatisticsObjects( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , rtl::OUString &rCurrStyleName ); + , OUString &rCurrStyleName ); static void setStylesToDataPoints( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const SvXMLStylesContext* pStylesCtxt , const SvXMLStyleContext*& rpStyle - , ::rtl::OUString& rCurrStyleName + , OUString& rCurrStyleName , SchXMLImportHelper& rImportHelper , const SvXMLImport& rImport , bool bIsStockChart, bool bIsDonutChart, bool bSwitchOffLinesForScatter ); diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index d2a804369c2a..2c2ca93babee 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -54,7 +54,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace { @@ -62,7 +61,7 @@ namespace const char aLabelPrefix[] = "label "; const char aCategoriesRange[] = "categories"; -typedef ::std::multimap< ::rtl::OUString, ::rtl::OUString > +typedef ::std::multimap< OUString, OUString > lcl_tOriginalRangeToInternalRangeMap; struct lcl_ApplyCellToData : public ::std::unary_function< SchXMLCell, void > @@ -194,8 +193,8 @@ bool lcl_mapContainsRange( } bool lcl_tableOfRangeMatches( - const ::rtl::OUString & rRange, - const ::rtl::OUString & rTableName ) + const OUString & rRange, + const OUString & rTableName ) { // both strings are non-empty and the table name is part of the range return ( !rRange.isEmpty() && @@ -221,7 +220,7 @@ template< typename T > SchXMLTableContext::SchXMLTableContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLName, + const OUString& rLName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLName ), mrImportHelper( rImpHelper ), @@ -241,7 +240,7 @@ SchXMLTableContext::~SchXMLTableContext() SvXMLImportContext *SchXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -285,8 +284,8 @@ void SchXMLTableContext::StartElement( const uno::Reference< xml::sax::XAttribut for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if ( nPrefix == XML_NAMESPACE_TABLE ) { @@ -423,7 +422,7 @@ void SchXMLTableContext::setColumnPermutation( const uno::Sequence< sal_Int32 > SchXMLTableColumnsContext::SchXMLTableColumnsContext( SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ), mrTable( aTable ) @@ -436,7 +435,7 @@ SchXMLTableColumnsContext::~SchXMLTableColumnsContext() SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -458,7 +457,7 @@ SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext( SchXMLTableColumnContext::SchXMLTableColumnContext( SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ), mrTable( aTable ) @@ -474,21 +473,21 @@ void SchXMLTableColumnContext::StartElement( const uno::Reference< xml::sax::XAt for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix == XML_NAMESPACE_TABLE && IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) ) { - rtl::OUString aValue = xAttrList->getValueByIndex( i ); + OUString aValue = xAttrList->getValueByIndex( i ); if( !aValue.isEmpty()) nRepeated = aValue.toInt32(); } else if( nPrefix == XML_NAMESPACE_TABLE && IsXMLToken( aLocalName, XML_VISIBILITY ) ) { - rtl::OUString aVisibility = xAttrList->getValueByIndex( i ); + OUString aVisibility = xAttrList->getValueByIndex( i ); bHidden = aVisibility.equals( GetXMLToken( XML_COLLAPSE ) ); } } @@ -525,7 +524,7 @@ SchXMLTableColumnContext::~SchXMLTableColumnContext() SchXMLTableRowsContext::SchXMLTableRowsContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ), mrImportHelper( rImpHelper ), @@ -539,7 +538,7 @@ SchXMLTableRowsContext::~SchXMLTableRowsContext() SvXMLImportContext* SchXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -564,7 +563,7 @@ SvXMLImportContext* SchXMLTableRowsContext::CreateChildContext( SchXMLTableRowContext::SchXMLTableRowContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ), mrImportHelper( rImpHelper ), @@ -585,7 +584,7 @@ SchXMLTableRowContext::~SchXMLTableRowContext() SvXMLImportContext* SchXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -615,19 +614,19 @@ class SchXMLRangeSomewhereContext : public SvXMLImportContext //-> use description at an empty group element for now private: - ::rtl::OUString& mrRangeString; - ::rtl::OUStringBuffer maRangeStringBuffer; + OUString& mrRangeString; + OUStringBuffer maRangeStringBuffer; public: SchXMLRangeSomewhereContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - ::rtl::OUString& rRangeString ); + const OUString& rLocalName, + OUString& rRangeString ); virtual ~SchXMLRangeSomewhereContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); }; @@ -646,7 +645,7 @@ public: SchXMLTableCellContext::SchXMLTableCellContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ) : SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ), mrImportHelper( rImpHelper ), @@ -661,15 +660,15 @@ SchXMLTableCellContext::~SchXMLTableCellContext() void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - rtl::OUString aValue; - rtl::OUString aLocalName; - rtl::OUString aCellContent; + OUString aValue; + OUString aLocalName; + OUString aCellContent; SchXMLCellType eValueType = SCH_CELL_TYPE_UNKNOWN; const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetCellAttrTokenMap(); for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString sAttrName = xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName )) @@ -711,7 +710,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr SvXMLImportContext* SchXMLTableCellContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -1024,7 +1023,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( if( xDataSource.is() ) { bool bHasUnhiddenColumns = false; - rtl::OUString aRange; + OUString aRange; uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequences( xDataSource->getDataSequences() ); for( sal_Int32 nN=0; nN< aSequences.getLength(); ++nN ) { @@ -1069,7 +1068,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( { //first detect which collumns are really used std::map< sal_Int32, bool > aUsageMap; - rtl::OUString aRange; + OUString aRange; Sequence< Reference< chart2::data::XLabeledDataSequence > > aUsedSequences( xDataSource->getDataSequences() ); for( sal_Int32 nN=0; nN< aUsedSequences.getLength(); ++nN ) { diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx index d983fc03a4e0..1d06dd50c613 100644 --- a/xmloff/source/chart/SchXMLTableContext.hxx +++ b/xmloff/source/chart/SchXMLTableContext.hxx @@ -51,13 +51,13 @@ private: public: SchXMLTableContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -71,8 +71,8 @@ public: class SchXMLTableHelper { private: - static void GetCellAddress( const rtl::OUString& rStr, sal_Int32& rCol, sal_Int32& rRow ); - static sal_Bool GetCellRangeAddress( const rtl::OUString& rStr, SchNumericCellRangeAddress& rResult ); + static void GetCellAddress( const OUString& rStr, sal_Int32& rCol, sal_Int32& rRow ); + static sal_Bool GetCellRangeAddress( const OUString& rStr, SchNumericCellRangeAddress& rResult ); static void PutTableContentIntoSequence( const SchXMLTable& rTable, SchNumericCellRangeAddress& rAddress, @@ -112,13 +112,13 @@ private: public: SchXMLTableColumnsContext( SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableColumnsContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; @@ -131,7 +131,7 @@ private: public: SchXMLTableColumnContext( SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableColumnContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -150,13 +150,13 @@ private: public: SchXMLTableRowsContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableRowsContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; @@ -171,13 +171,13 @@ private: public: SchXMLTableRowContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableRowContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; @@ -190,20 +190,20 @@ class SchXMLTableCellContext : public SvXMLImportContext private: SchXMLImportHelper& mrImportHelper; SchXMLTable& mrTable; - rtl::OUString maCellContent; - rtl::OUString maRangeId; + OUString maCellContent; + OUString maRangeId; sal_Bool mbReadText; public: SchXMLTableCellContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - const rtl::OUString& rLocalName, + const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableCellContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx index f9d17e03d81a..fbf15a2481ec 100644 --- a/xmloff/source/chart/SchXMLTextListContext.cxx +++ b/xmloff/source/chart/SchXMLTextListContext.cxx @@ -26,7 +26,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using namespace com::sun::star; @@ -43,11 +42,11 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); private: - ::rtl::OUString& m_rText; + OUString& m_rText; }; SchXMLListItemContext::SchXMLListItemContext( diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx index 283685f56735..27089c000040 100644 --- a/xmloff/source/chart/SchXMLTextListContext.hxx +++ b/xmloff/source/chart/SchXMLTextListContext.hxx @@ -31,20 +31,20 @@ class SchXMLTextListContext : public SvXMLImportContext { public: SchXMLTextListContext( SvXMLImport& rImport, - const ::rtl::OUString& rLocalName, - ::com::sun::star::uno::Sequence< ::rtl::OUString>& rTextList ); + const OUString& rLocalName, + ::com::sun::star::uno::Sequence< OUString>& rTextList ); virtual ~SchXMLTextListContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); private: - ::com::sun::star::uno::Sequence< ::rtl::OUString>& m_rTextList; - std::vector< ::rtl::OUString> m_aTextVector; + ::com::sun::star::uno::Sequence< OUString>& m_rTextList; + std::vector< OUString> m_aTextVector; }; #endif // _SCH_XMLTEXTLISTCONTEXT_HXX_ diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 9d95a61fa60c..482f4f525bb3 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -57,17 +57,15 @@ using namespace com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; namespace { -rtl::OUString lcl_getGeneratorFromModel( const uno::Reference< frame::XModel >& xChartModel ) +OUString lcl_getGeneratorFromModel( const uno::Reference< frame::XModel >& xChartModel ) { - ::rtl::OUString aGenerator; + OUString aGenerator; uno::Reference< document::XDocumentPropertiesSupplier> xChartDocumentPropertiesSupplier( xChartModel, uno::UNO_QUERY ); if( xChartDocumentPropertiesSupplier.is() ) { @@ -79,9 +77,9 @@ rtl::OUString lcl_getGeneratorFromModel( const uno::Reference< frame::XModel >& return aGenerator; } -rtl::OUString lcl_getGeneratorFromModelOrItsParent( const uno::Reference< frame::XModel >& xChartModel ) +OUString lcl_getGeneratorFromModelOrItsParent( const uno::Reference< frame::XModel >& xChartModel ) { - ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); + OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); if( aGenerator.isEmpty() ) //try to get the missing info from the parent document { uno::Reference< container::XChild > xChild( xChartModel, uno::UNO_QUERY ); @@ -91,7 +89,7 @@ rtl::OUString lcl_getGeneratorFromModelOrItsParent( const uno::Reference< frame: return aGenerator; } -sal_Int32 lcl_getBuildIDFromGenerator( const ::rtl::OUString& rGenerator ) +sal_Int32 lcl_getBuildIDFromGenerator( const OUString& rGenerator ) { //returns -1 if nothing found sal_Int32 nBuildId = -1; @@ -105,7 +103,7 @@ sal_Int32 lcl_getBuildIDFromGenerator( const ::rtl::OUString& rGenerator ) return nBuildId; } -OUString lcl_ConvertRange( const ::rtl::OUString & rRange, const Reference< chart2::data::XDataProvider >& xDataProvider ) +OUString lcl_ConvertRange( const OUString & rRange, const Reference< chart2::data::XDataProvider >& xDataProvider ) { OUString aResult = rRange; Reference< chart2::data::XRangeXMLConversion > xRangeConversion( xDataProvider, uno::UNO_QUERY ); @@ -161,42 +159,42 @@ SchXMLChartTypeEnum GetChartTypeEnum( const OUString& rClassName ) return SchXMLChartTypeEnum(nEnumVal); } -typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakeStringStringMap; +typedef ::comphelper::MakeMap< OUString, OUString > tMakeStringStringMap; //static const tMakeStringStringMap& lcl_getChartTypeNameMap() { //shape property -- chart model object property static tMakeStringStringMap g_aChartTypeNameMap = tMakeStringStringMap - ( ::rtl::OUString( "com.sun.star.chart.LineDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.LineChartType" ) ) + ( OUString( "com.sun.star.chart.LineDiagram" ) + , OUString( "com.sun.star.chart2.LineChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.AreaDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.AreaChartType" ) ) + ( OUString( "com.sun.star.chart.AreaDiagram" ) + , OUString( "com.sun.star.chart2.AreaChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.BarDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.ColumnChartType" ) ) + ( OUString( "com.sun.star.chart.BarDiagram" ) + , OUString( "com.sun.star.chart2.ColumnChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.PieDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.PieChartType" ) ) + ( OUString( "com.sun.star.chart.PieDiagram" ) + , OUString( "com.sun.star.chart2.PieChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.DonutDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.DonutChartType" ) ) + ( OUString( "com.sun.star.chart.DonutDiagram" ) + , OUString( "com.sun.star.chart2.DonutChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.XYDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.ScatterChartType" ) ) + ( OUString( "com.sun.star.chart.XYDiagram" ) + , OUString( "com.sun.star.chart2.ScatterChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.NetDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.NetChartType" ) ) + ( OUString( "com.sun.star.chart.NetDiagram" ) + , OUString( "com.sun.star.chart2.NetChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.FilledNetDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.FilledNetChartType" ) ) + ( OUString( "com.sun.star.chart.FilledNetDiagram" ) + , OUString( "com.sun.star.chart2.FilledNetChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.StockDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.CandleStickChartType" ) ) + ( OUString( "com.sun.star.chart.StockDiagram" ) + , OUString( "com.sun.star.chart2.CandleStickChartType" ) ) - ( ::rtl::OUString( "com.sun.star.chart.BubbleDiagram" ) - , ::rtl::OUString( "com.sun.star.chart2.BubbleChartType" ) ) + ( OUString( "com.sun.star.chart.BubbleDiagram" ) + , OUString( "com.sun.star.chart2.BubbleChartType" ) ) ; return g_aChartTypeNameMap; @@ -482,8 +480,8 @@ void CreateCategories( catch( const lang::IllegalArgumentException & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( "IllegalArgumentException caught, Message: " ) + + OSL_FAIL( OUStringToOString( + OUString( "IllegalArgumentException caught, Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } aData.Categories.set( xLabeledSeq ); @@ -509,7 +507,7 @@ void CreateCategories( } -uno::Any getPropertyFromContext( const rtl::OUString& rPropertyName, const XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ) +uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ) { uno::Any aRet; if( !pPropStyleContext || !pStylesCtxt ) @@ -586,7 +584,7 @@ void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsL } } -void exportRangeToSomewhere( SvXMLExport& rExport, const ::rtl::OUString& rValue ) +void exportRangeToSomewhere( SvXMLExport& rExport, const OUString& rValue ) { //with issue #i366# and CWS chart20 ranges for error bars were introduced //to keep them during copy paste from calc to impress for example it @@ -658,8 +656,8 @@ void setXMLRangePropertyAtDataSequence( catch( const uno::Exception & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( "Exception caught, Message: " ) + + OSL_FAIL( OUStringToOString( + OUString( "Exception caught, Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } } @@ -688,8 +686,8 @@ bool getXMLRangePropertyFromDataSequence( catch( const uno::Exception & ex ) { (void)ex; // avoid warning for pro build - OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( "Exception caught, Message: " ) + + OSL_FAIL( OUStringToOString( + OUString( "Exception caught, Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } } @@ -760,7 +758,7 @@ bool switchBackToDataProviderFromParent( const Reference< chart2::XChartDocument void setBuildIDAtImportInfo( uno::Reference< frame::XModel > xModel, Reference< beans::XPropertySet > xImportInfo ) { - ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xModel) ); + OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xModel) ); if( !aGenerator.isEmpty() ) SvXMLMetaDocumentContext::setBuildId( aGenerator, xImportInfo ); } @@ -770,7 +768,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const uno::Reference< frame: bool bResult = isDocumentGeneratedWithOpenOfficeOlderThan3_0( xChartModel ); if( !bResult ) { - ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); + OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); if( aGenerator.indexOf( "OpenOffice.org_project/3" ) != -1 ) { if( aGenerator.indexOf( "OpenOffice.org_project/300m" ) != -1 ) @@ -793,7 +791,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const uno::Reference< frame: bool bResult = isDocumentGeneratedWithOpenOfficeOlderThan2_3( xChartModel ); if( !bResult ) { - ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); + OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); if( aGenerator.indexOf( "OpenOffice.org_project/680m" ) != -1 ) bResult= true; } @@ -817,7 +815,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_4( const uno::Reference< frame: bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame::XModel >& xChartModel ) { bool bResult = false; - ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); + OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); //if there is a meta stream at the chart object it was not written with an older OpenOffice version < 2.3 if( aGenerator.isEmpty() ) { @@ -845,7 +843,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame: bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel) { bool bResult = false; - ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) ); + OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) ); if( ( aGenerator.indexOf( "OpenOffice.org 1" ) == 0 ) || ( aGenerator.indexOf( "StarOffice 6" ) == 0 ) || ( aGenerator.indexOf( "StarOffice 7" ) == 0 ) diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx index 5273f23a4c24..e50d7f523fe2 100644 --- a/xmloff/source/chart/SchXMLTools.hxx +++ b/xmloff/source/chart/SchXMLTools.hxx @@ -67,37 +67,37 @@ namespace SchXMLTools XML_CHART_CLASS_UNKNOWN }; - SchXMLChartTypeEnum GetChartTypeEnum( const ::rtl::OUString& rClassName ); + SchXMLChartTypeEnum GetChartTypeEnum( const OUString& rClassName ); - ::rtl::OUString GetChartTypeByClassName( - const ::rtl::OUString & rClassName, bool bUseOldNames ); + OUString GetChartTypeByClassName( + const OUString & rClassName, bool bUseOldNames ); ::xmloff::token::XMLTokenEnum getTokenByChartType( - const ::rtl::OUString & rChartTypeService, bool bUseOldNames ); + const OUString & rChartTypeService, bool bUseOldNames ); - ::rtl::OUString GetNewChartTypeName( const ::rtl::OUString & rOldChartTypeName ); + OUString GetNewChartTypeName( const OUString & rOldChartTypeName ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence2 > GetNewLabeledDataSequence(); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > CreateDataSequence( - const ::rtl::OUString& rRange, + const OUString& rRange, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc ); void CreateCategories( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > & xDataProvider, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xNewDoc, - const ::rtl::OUString & rRangeAddress, + const OUString & rRangeAddress, sal_Int32 nCooSysIndex, sal_Int32 nDimensionIndex, tSchXMLLSequencesPerIndex * pLSequencesPerIndex = 0 ); - ::com::sun::star::uno::Any getPropertyFromContext( const ::rtl::OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); + ::com::sun::star::uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); - void exportText( SvXMLExport& rExport, const ::rtl::OUString& rText, bool bConvertTabsLFs ); + void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsLFs ); - void exportRangeToSomewhere( SvXMLExport& rExport, const ::rtl::OUString& rValue ); + void exportRangeToSomewhere( SvXMLExport& rExport, const OUString& rValue ); /** returns the properties of the equation of the first regression curve that is no mean-value line @@ -113,7 +113,7 @@ namespace SchXMLTools void setXMLRangePropertyAtDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xDataSequence, - const ::rtl::OUString & rXMLRange ); + const OUString & rXMLRange ); /** checks if the data sequence has the property "CachedXMLRange" (true for internal data sequences), and if so retrieves this property and applies @@ -127,7 +127,7 @@ namespace SchXMLTools bool getXMLRangePropertyFromDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xDataSequence, - ::rtl::OUString & rOutXMLRange, + OUString & rOutXMLRange, bool bClearProp = false ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > getDataProviderFromParent( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc ); diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx index df4986d9ba1c..89e62cfc8184 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx @@ -31,8 +31,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace com::sun::star; @@ -87,7 +85,7 @@ sal_Bool XMLAxisPositionPropertyHdl::exportXML( OUString& rStrExpValue, { sal_Bool bResult = sal_False; - rtl::OUStringBuffer sValueBuffer; + OUStringBuffer sValueBuffer; if( m_bCrossingValue ) { if(rStrExpValue.isEmpty()) diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx index 3449bbf41cc2..01601fc00a85 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx @@ -27,8 +27,8 @@ public: XMLAxisPositionPropertyHdl( bool bCrossingValue ); virtual ~XMLAxisPositionPropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; private: bool m_bCrossingValue; diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx index 832cd96c2df5..a1290e557289 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.cxx +++ b/xmloff/source/chart/XMLChartPropertyContext.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; XMLChartPropertyContext::XMLChartPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState >& rProps, @@ -44,7 +44,7 @@ XMLChartPropertyContext::~XMLChartPropertyContext() SvXMLImportContext* XMLChartPropertyContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ) diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx index 42d33607ebf0..ab1f07938fb7 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.hxx +++ b/xmloff/source/chart/XMLChartPropertyContext.hxx @@ -27,7 +27,7 @@ public: TYPEINFO(); XMLChartPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFamily, @@ -38,7 +38,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx index 4af474b75ee6..f836d8c1b2f4 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -41,8 +41,8 @@ TYPEINIT1( XMLChartStyleContext, XMLPropStyleContext ); void XMLChartStyleContext::SetAttribute( sal_uInt16 nPrefixKey, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rValue ) + const OUString& rLocalName, + const OUString& rValue ) { if( IsXMLToken( rLocalName, XML_DATA_STYLE_NAME ) ) { @@ -63,7 +63,7 @@ void XMLChartStyleContext::SetAttribute( // CTOR XMLChartStyleContext::XMLChartStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily ) : @@ -78,7 +78,7 @@ XMLChartStyleContext::~XMLChartStyleContext() namespace { - void lcl_NumberFormatStyleToProperty( const ::rtl::OUString& rStyleName, const ::rtl::OUString& rPropertyName, + void lcl_NumberFormatStyleToProperty( const OUString& rStyleName, const OUString& rPropertyName, const SvXMLStylesContext& rStylesContext, const uno::Reference< beans::XPropertySet >& rPropSet ) { @@ -116,7 +116,7 @@ void XMLChartStyleContext::FillPropertySet( SvXMLImportContext *XMLChartStyleContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext* pContext = NULL; diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx index 8f6149f91fea..3eee9e4e1e96 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx @@ -23,7 +23,6 @@ #include #include -using ::rtl::OUString; using namespace com::sun::star; XMLErrorBarStylePropertyHdl::XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx index 9aa21a51816d..6cc4dfe70cf7 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx @@ -27,7 +27,7 @@ public: XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ); virtual ~XMLErrorBarStylePropertyHdl(); - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLERRORBARSTYLEPROPERTYHDL_HXX_ diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx index 43667465daf6..d3f64b356965 100644 --- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx +++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; XMLErrorIndicatorPropertyHdl::~XMLErrorIndicatorPropertyHdl() {} -sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const ::rtl::OUString& rStrImpValue, +sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { bool bValue(false); @@ -78,10 +78,10 @@ sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const ::rtl::OUString& rStrImp return sal_True; } -sal_Bool XMLErrorIndicatorPropertyHdl::exportXML( ::rtl::OUString& rStrExpValue, +sal_Bool XMLErrorIndicatorPropertyHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; chart::ChartErrorIndicatorType eType; rValue >>= eType; diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx index 8421428e34e7..3b8ebcab1e2f 100644 --- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx @@ -31,8 +31,8 @@ public: {} virtual ~XMLErrorIndicatorPropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLERRORINDICATORPROPERTYHDL_HXX_ diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx index e34870028629..f19c68b57895 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; XMLLabelSeparatorContext::XMLLabelSeparatorContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ) : XMLElementPropertyContext( @@ -49,7 +49,7 @@ void XMLLabelSeparatorContext::StartElement( const uno::Reference< xml::sax::XAt } SvXMLImportContext* XMLLabelSeparatorContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/ ) { SvXMLImportContext* pContext = NULL; diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx index 5b9942d5f964..e2baa0f80e15 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx @@ -27,7 +27,7 @@ public: TYPEINFO(); XMLLabelSeparatorContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLLabelSeparatorContext(); @@ -35,12 +35,12 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); private: - ::rtl::OUString m_aSeparator; + OUString m_aSeparator; }; #endif // _XMLOFF_SYMBOLIMAGECONTEXT_HXX_ diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index 9b0f06ce95f2..d57534fb2f95 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -50,7 +50,7 @@ static SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] = XMLSymbolImageContext::XMLSymbolImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ) : XMLElementPropertyContext( @@ -64,16 +64,16 @@ XMLSymbolImageContext::~XMLSymbolImageContext() void XMLSymbolImageContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLTokenMap aTokenMap( aSymbolImageAttrTokenMap ); - ::rtl::OUString aLocalName; + OUString aLocalName; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { - const ::rtl::OUString& rAttrName = xAttrList->getNameByIndex( i ); + const OUString& rAttrName = xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ); - const ::rtl::OUString& rValue = xAttrList->getValueByIndex( i ); + const OUString& rValue = xAttrList->getValueByIndex( i ); switch( aTokenMap.Get( nPrefix, aLocalName ) ) { @@ -91,7 +91,7 @@ void XMLSymbolImageContext::StartElement( const uno::Reference< xml::sax::XAttri } SvXMLImportContext* XMLSymbolImageContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -117,7 +117,7 @@ SvXMLImportContext* XMLSymbolImageContext::CreateChildContext( void XMLSymbolImageContext::EndElement() { - ::rtl::OUString sResolvedURL; + OUString sResolvedURL; if( !msURL.isEmpty() ) { diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx index d3add4cc933f..215f6a641352 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.hxx +++ b/xmloff/source/chart/XMLSymbolImageContext.hxx @@ -31,7 +31,7 @@ public: TYPEINFO(); XMLSymbolImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLSymbolImageContext(); @@ -39,12 +39,12 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); private: - ::rtl::OUString msURL; + OUString msURL; ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; }; diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx index 5abdd61c6724..ac537488b4db 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx @@ -23,8 +23,6 @@ #include using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace { diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx index 2f46b6cb2060..f7b4c9cdb6ef 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx @@ -27,8 +27,8 @@ public: XMLSymbolTypePropertyHdl( bool bIsNamedSymbol ); virtual ~XMLSymbolTypePropertyHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; private: bool m_bIsNamedSymbol; diff --git a/xmloff/source/chart/XMLTextOrientationHdl.cxx b/xmloff/source/chart/XMLTextOrientationHdl.cxx index 191d199e5670..b206f45e6406 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.cxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.cxx @@ -29,7 +29,7 @@ XMLTextOrientationHdl::~XMLTextOrientationHdl() } sal_Bool XMLTextOrientationHdl::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { @@ -50,7 +50,7 @@ sal_Bool XMLTextOrientationHdl::importXML( } sal_Bool XMLTextOrientationHdl::exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { diff --git a/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx index 514e71baba78..8c50a0757aea 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.hxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx @@ -27,10 +27,10 @@ private: public: virtual ~XMLTextOrientationHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index 37eb7e2d4819..8f5f9e245b34 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -42,17 +42,17 @@ public: SchXMLBodyContext_Impl( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~SchXMLBodyContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ); }; SchXMLBodyContext_Impl::SchXMLBodyContext_Impl( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName ) : + sal_uInt16 nPrfx, const OUString& rLName ) : SvXMLImportContext( rImport, nPrfx, rLName ), mrImportHelper( rImpHelper ) { @@ -64,7 +64,7 @@ SchXMLBodyContext_Impl::~SchXMLBodyContext_Impl() SvXMLImportContext *SchXMLBodyContext_Impl::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & ) { return new SchXMLBodyContext( mrImportHelper, GetImport(), nPrefix, @@ -76,7 +76,7 @@ SvXMLImportContext *SchXMLBodyContext_Impl::CreateChildContext( SchXMLDocContext::SchXMLDocContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLName ) : + const OUString& rLName ) : SvXMLImportContext( rImport, nPrefix, rLName ), mrImportHelper( rImpHelper ) { @@ -95,7 +95,7 @@ TYPEINIT1( SchXMLDocContext, SvXMLImportContext ); SvXMLImportContext* SchXMLDocContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext* pContext = 0; @@ -140,7 +140,7 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext( SchXMLFlatDocContext_Impl::SchXMLFlatDocContext_Impl( SchXMLImportHelper& i_rImpHelper, SchXMLImport& i_rImport, - sal_uInt16 i_nPrefix, const ::rtl::OUString & i_rLName, + sal_uInt16 i_nPrefix, const OUString & i_rLName, const uno::Reference& i_xDocProps) : SvXMLImportContext(i_rImport, i_nPrefix, i_rLName), SchXMLDocContext(i_rImpHelper, i_rImport, i_nPrefix, i_rLName), @@ -153,7 +153,7 @@ SchXMLFlatDocContext_Impl::~SchXMLFlatDocContext_Impl() { } SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext( - sal_uInt16 i_nPrefix, const ::rtl::OUString& i_rLocalName, + sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference& i_xAttrList) { // behave like meta base class iff we encounter office:meta @@ -173,7 +173,7 @@ SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext( SchXMLBodyContext::SchXMLBodyContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLName ) : + const OUString& rLName ) : SvXMLImportContext( rImport, nPrefix, rLName ), mrImportHelper( rImpHelper ) { @@ -191,7 +191,7 @@ void SchXMLBodyContext::EndElement() SvXMLImportContext* SchXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext* pContext = 0; diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx index 186c98f3838c..4a7b830a8740 100644 --- a/xmloff/source/chart/contexts.hxx +++ b/xmloff/source/chart/contexts.hxx @@ -48,14 +48,14 @@ public: SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLName ); + const OUString& rLName ); virtual ~SchXMLDocContext(); TYPEINFO(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; @@ -69,13 +69,13 @@ public: SchXMLFlatDocContext_Impl( SchXMLImportHelper& i_rImpHelper, SchXMLImport& i_rImport, - sal_uInt16 i_nPrefix, const ::rtl::OUString & i_rLName, + sal_uInt16 i_nPrefix, const OUString & i_rLName, const com::sun::star::uno::Reference& i_xDocProps); virtual ~SchXMLFlatDocContext_Impl(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 i_nPrefix, const ::rtl::OUString& i_rLocalName, + sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const com::sun::star::uno::Reference& i_xAttrList); }; @@ -91,13 +91,13 @@ public: SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLName ); + const OUString& rLName ); virtual ~SchXMLBodyContext(); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); }; diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx index 17728ed4adc1..92efcae36400 100644 --- a/xmloff/source/chart/transporttypes.hxx +++ b/xmloff/source/chart/transporttypes.hxx @@ -35,11 +35,11 @@ enum SchXMLCellType struct SchXMLCell { - rtl::OUString aString; - ::com::sun::star::uno::Sequence< rtl::OUString > aComplexString; + OUString aString; + ::com::sun::star::uno::Sequence< OUString > aComplexString; double fValue; SchXMLCellType eType; - rtl::OUString aRangeId; + OUString aRangeId; SchXMLCell(): fValue( 0.0 ), eType( SCH_CELL_TYPE_UNKNOWN ) {} @@ -58,7 +58,7 @@ struct SchXMLTable bool bHasHeaderRow; bool bHasHeaderColumn; - ::rtl::OUString aTableNameOfFile; /// the table name read at the table:table element + OUString aTableNameOfFile; /// the table name read at the table:table element ::std::vector< sal_Int32 > aHiddenColumns; @@ -122,8 +122,8 @@ struct SchXMLAxis { enum SchXMLAxisDimension eDimension; sal_Int8 nAxisIndex;//0->primary axis; 1->secondary axis - rtl::OUString aName; - rtl::OUString aTitle; + OUString aName; + OUString aTitle; bool bHasCategories; SchXMLAxis() : eDimension( SCH_XML_AXIS_UNDEF ), nAxisIndex( 0 ), bHasCategories( false ) {} @@ -144,10 +144,10 @@ struct GlobalSeriesImportInfo sal_Int32 nCurrentDataIndex; - ::rtl::OUString aFirstFirstDomainAddress; + OUString aFirstFirstDomainAddress; sal_Int32 nFirstFirstDomainIndex; - ::rtl::OUString aFirstSecondDomainAddress; + OUString aFirstSecondDomainAddress; sal_Int32 nFirstSecondDomainIndex; }; @@ -175,8 +175,8 @@ struct DataRowPointStyle ::com::sun::star::beans::XPropertySet > m_xEquationProperties; sal_Int32 m_nPointIndex; sal_Int32 m_nPointRepeat; - ::rtl::OUString msStyleName; - ::rtl::OUString msSeriesStyleNameForDonuts; + OUString msStyleName; + OUString msSeriesStyleNameForDonuts; sal_Int32 mnAttachedAxis; bool mbSymbolSizeForSeriesIsMissingInFile; @@ -185,7 +185,7 @@ struct DataRowPointStyle ::com::sun::star::chart2::XDataSeries >& xSeries , sal_Int32 nPointIndex , sal_Int32 nPointRepeat - , ::rtl::OUString sStyleName + , OUString sStyleName , sal_Int32 nAttachedAxis = 0 ) : meType( eType ), m_xSeries( xSeries ), @@ -198,7 +198,7 @@ struct DataRowPointStyle {} }; -typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Reference< +typedef ::std::multimap< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > > tSchXMLRangeSequenceMap; #endif // SCH_XML_TRANSPORTTYPES_HXX_ diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 6379a13c4284..f963983e6041 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -129,7 +129,7 @@ protected: com::sun::star::uno::Any& mrAny; XMLConfigBaseContext* mpBaseContext; public: - XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, com::sun::star::uno::Any& rAny, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigBaseContext(); @@ -141,27 +141,27 @@ public: class XMLConfigItemContext : public SvXMLImportContext { - rtl::OUString msType; - rtl::OUString msValue; + OUString msType; + OUString msValue; uno::Sequence maDecoded; com::sun::star::uno::Any& mrAny; - const rtl::OUString mrItemName; + const OUString mrItemName; XMLConfigBaseContext* mpBaseContext; public: - XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, - const rtl::OUString& rItemName, + const OUString& rItemName, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigItemContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); @@ -173,7 +173,7 @@ public: class XMLConfigItemSetContext : public XMLConfigBaseContext { public: - XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, @@ -181,7 +181,7 @@ public: virtual ~XMLConfigItemSetContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -193,7 +193,7 @@ public: class XMLConfigItemMapNamedContext : public XMLConfigBaseContext { public: - XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, @@ -201,7 +201,7 @@ public: virtual ~XMLConfigItemMapNamedContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -213,20 +213,20 @@ public: class XMLConfigItemMapIndexedContext : public XMLConfigBaseContext { private: - rtl::OUString maConfigItemName; + OUString maConfigItemName; public: XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rAny, - const rtl::OUString& rConfigItemName, + const OUString& rConfigItemName, XMLConfigBaseContext* pBaseContext); virtual ~XMLConfigItemMapIndexedContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -236,21 +236,21 @@ public: //============================================================================= SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, sal_uInt16 p_nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference& xAttrList, beans::PropertyValue& rProp, XMLConfigBaseContext* pBaseContext) { SvXMLImportContext *pContext = 0; - rProp.Name = rtl::OUString(); + rProp.Name = OUString(); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_CONFIG) { @@ -283,7 +283,7 @@ namespace { struct SettingsGroup { - ::rtl::OUString sGroupName; + OUString sGroupName; uno::Any aSettings; SettingsGroup() @@ -292,7 +292,7 @@ namespace { } - SettingsGroup( const ::rtl::OUString& _rGroupName, const uno::Any& _rSettings ) + SettingsGroup( const OUString& _rGroupName, const uno::Any& _rSettings ) :sGroupName( _rGroupName ) ,aSettings( _rSettings ) { @@ -309,7 +309,7 @@ struct XMLDocumentSettingsContext_Data //============================================================================= -XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, +XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference& ) : SvXMLImportContext( rImport, nPrfx, rLName ) , m_pData( new XMLDocumentSettingsContext_Data ) @@ -322,21 +322,21 @@ XMLDocumentSettingsContext::~XMLDocumentSettingsContext() } SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p_nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext *pContext = 0; - rtl::OUString sName; + OUString sName; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_CONFIG) { @@ -349,7 +349,7 @@ SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p { if (IsXMLToken(rLocalName, XML_CONFIG_ITEM_SET)) { - ::rtl::OUString aLocalConfigName; + OUString aLocalConfigName; sal_uInt16 nConfigPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sName, &aLocalConfigName ); @@ -422,11 +422,11 @@ void XMLDocumentSettingsContext::EndElement() while ( ( i >= 0 ) && nFound < 2 ) { - rtl::OUString sProp( aSeqConfigProps[i].Name ); + OUString sProp( aSeqConfigProps[i].Name ); if ( sProp.compareToAscii("PrinterName") == 0 ) { - rtl::OUString sEmpty; + OUString sEmpty; aSeqConfigProps[i].Value = uno::makeAny( sEmpty ); nFound++; } @@ -458,7 +458,7 @@ void XMLDocumentSettingsContext::EndElement() //============================================================================= XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, com::sun::star::uno::Any& rTempAny, + const OUString& rLName, com::sun::star::uno::Any& rTempAny, XMLConfigBaseContext* pTempBaseContext) : SvXMLImportContext( rImport, nPrfx, rLName ), maProps( rImport.GetComponentContext() ), @@ -475,7 +475,7 @@ XMLConfigBaseContext::~XMLConfigBaseContext() //============================================================================= XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, com::sun::star::uno::Any& rAny, @@ -490,7 +490,7 @@ XMLConfigItemSetContext::~XMLConfigItemSetContext() } SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -506,11 +506,11 @@ void XMLConfigItemSetContext::EndElement() //============================================================================= -XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, +XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Any& rTempAny, - const rtl::OUString& rTempItemName, + const OUString& rTempItemName, XMLConfigBaseContext* pTempBaseContext) : SvXMLImportContext(rImport, nPrfx, rLName), mrAny(rTempAny), @@ -520,11 +520,11 @@ XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrf sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_CONFIG) { @@ -539,7 +539,7 @@ XMLConfigItemContext::~XMLConfigItemContext() } SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& ) { @@ -547,19 +547,19 @@ SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix return pContext; } -void XMLConfigItemContext::Characters( const ::rtl::OUString& rChars ) +void XMLConfigItemContext::Characters( const OUString& rChars ) { if (IsXMLToken(msType, XML_BASE64BINARY)) { - rtl::OUString sTrimmedChars( rChars.trim() ); + OUString sTrimmedChars( rChars.trim() ); if( !sTrimmedChars.isEmpty() ) { - rtl::OUString sChars; + OUString sChars; if( !msValue.isEmpty() ) { sChars = msValue; sChars += sTrimmedChars; - msValue = rtl::OUString(); + msValue = OUString(); } else { @@ -658,7 +658,7 @@ void XMLConfigItemContext::ManipulateConfigItem() { if( mrItemName == "PrinterIndependentLayout" ) { - rtl::OUString sValue; + OUString sValue; mrAny >>= sValue; sal_Int16 nTmp = document::PrinterIndependentLayout::HIGH_RESOLUTION; @@ -683,7 +683,7 @@ void XMLConfigItemContext::ManipulateConfigItem() uno::Reference< uno::XComponentContext > xContext( GetImport().GetComponentContext() ); uno::Reference< util::XStringSubstitution > xStringSubsitution( util::PathSubstitution::create(xContext) ); - rtl::OUString aURL; + OUString aURL; mrAny >>= aURL; aURL = xStringSubsitution->substituteVariables( aURL, sal_False ); mrAny <<= aURL; @@ -697,7 +697,7 @@ void XMLConfigItemContext::ManipulateConfigItem() //============================================================================= -XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, +XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, com::sun::star::uno::Any& rAny, @@ -711,7 +711,7 @@ XMLConfigItemMapNamedContext::~XMLConfigItemMapNamedContext() } SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -733,11 +733,11 @@ void XMLConfigItemMapNamedContext::EndElement() //============================================================================= XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, com::sun::star::uno::Any& rAny, - const ::rtl::OUString& rConfigItemName, + const OUString& rConfigItemName, XMLConfigBaseContext* pBaseContext) : XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext), maConfigItemName( rConfigItemName ) @@ -749,7 +749,7 @@ XMLConfigItemMapIndexedContext::~XMLConfigItemMapIndexedContext() } SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -789,11 +789,11 @@ void XMLConfigItemMapIndexedContext::EndElement() beans::PropertyValue *pForChar = aProps.getArray(); i18n::ForbiddenCharacters aForbid; lang::Locale aLocale; - const rtl::OUString sLanguage ( "Language" ); - const rtl::OUString sCountry ( "Country" ); - const rtl::OUString sVariant ( "Variant" ); - const rtl::OUString sBeginLine ( "BeginLine" ); - const rtl::OUString sEndLine ( "EndLine" ); + const OUString sLanguage ( "Language" ); + const OUString sCountry ( "Country" ); + const OUString sVariant ( "Variant" ); + const OUString sBeginLine ( "BeginLine" ); + const OUString sEndLine ( "EndLine" ); sal_Bool bHaveLanguage = sal_False, bHaveCountry = sal_False, bHaveVariant = sal_False, bHaveBegin = sal_False, bHaveEnd = sal_False; @@ -857,16 +857,16 @@ void XMLConfigItemMapIndexedContext::EndElement() formula::SymbolDescriptor *pDescriptor = aSymbolList.getArray(); - const rtl::OUString sName ( "Name" ); - const rtl::OUString sExportName ( "ExportName" ); - const rtl::OUString sFontName ( "FontName" ); - const rtl::OUString sSymbolSet ( "SymbolSet" ); - const rtl::OUString sCharacter ( "Character" ); - const rtl::OUString sCharSet ( "CharSet" ); - const rtl::OUString sFamily ( "Family" ); - const rtl::OUString sPitch ( "Pitch" ); - const rtl::OUString sWeight ( "Weight" ); - const rtl::OUString sItalic ( "Italic" ); + const OUString sName ( "Name" ); + const OUString sExportName ( "ExportName" ); + const OUString sFontName ( "FontName" ); + const OUString sSymbolSet ( "SymbolSet" ); + const OUString sCharacter ( "Character" ); + const OUString sCharSet ( "CharSet" ); + const OUString sFamily ( "Family" ); + const OUString sPitch ( "Pitch" ); + const OUString sWeight ( "Weight" ); + const OUString sItalic ( "Italic" ); sal_Int16 nNumFullEntries = 0; for ( sal_Int32 i = 0; i < nCount; i++ ) diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx index c35b9763ad0d..8d02dd45972d 100644 --- a/xmloff/source/core/DomBuilderContext.cxx +++ b/xmloff/source/core/DomBuilderContext.cxx @@ -54,7 +54,6 @@ using com::sun::star::xml::dom::XNode; using com::sun::star::xml::dom::XElement; using com::sun::star::xml::sax::XAttributeList; using com::sun::star::xml::dom::NodeType_ELEMENT_NODE; -using rtl::OUString; // helper functions; implemented below diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 1266815f8342..7e87c621aba2 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -54,8 +54,6 @@ using std::vector; using namespace com::sun::star::xml::dom; -using rtl::OUString; -using rtl::OUStringBuffer; class DomVisitor diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx index edebc2bda0a7..43355a5925b4 100644 --- a/xmloff/source/core/PropertySetMerger.cxx +++ b/xmloff/source/core/PropertySetMerger.cxx @@ -20,7 +20,6 @@ #include #include "PropertySetMerger.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx index 2b278b242ac0..eb7936047b09 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -57,18 +57,18 @@ using namespace ::com::sun::star; namespace xmloff { -static ::rtl::OUString +static OUString makeCURIE(SvXMLExport * i_pExport, uno::Reference const & i_xURI) { OSL_ENSURE(i_xURI.is(), "makeCURIE: null URI"); if (!i_xURI.is()) throw uno::RuntimeException(); - const ::rtl::OUString Namespace( i_xURI->getNamespace() ); + const OUString Namespace( i_xURI->getNamespace() ); OSL_ENSURE(!Namespace.isEmpty(), "makeCURIE: no namespace"); if (Namespace.isEmpty()) throw uno::RuntimeException(); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( i_pExport->EnsureNamespace(Namespace) ); buf.append( static_cast(':') ); // N.B.: empty LocalName is valid! @@ -80,12 +80,12 @@ makeCURIE(SvXMLExport * i_pExport, // #i112473# SvXMLExport::GetRelativeReference() not right for RDF on SaveAs // because the URIs in the repository are not rewritten on SaveAs, the // URI of the loaded document has to be used, not the URI of the target doc. -static ::rtl::OUString -getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI) +static OUString +getRelativeReference(SvXMLExport const& rExport, OUString const& rURI) { uno::Reference< rdf::XURI > const xModelURI( rExport.GetModel(), uno::UNO_QUERY_THROW ); - ::rtl::OUString const baseURI( xModelURI->getStringValue() ); + OUString const baseURI( xModelURI->getStringValue() ); uno::Reference xContext( comphelper::getProcessComponentContext() ); uno::Reference const xUriFactory = @@ -98,7 +98,7 @@ getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI) uno::Reference< uri::XUriReference > const xRelativeURI( xUriFactory->makeRelative(xBaseURI, xAbsoluteURI, true, true, false), uno::UNO_SET_THROW ); - ::rtl::OUString const relativeURI(xRelativeURI->getUriReference()); + OUString const relativeURI(xRelativeURI->getUriReference()); return relativeURI; } @@ -116,13 +116,13 @@ RDFaExportHelper::RDFaExportHelper(SvXMLExport & i_rExport) m_xRepository.set(xRS->getRDFRepository(), uno::UNO_QUERY_THROW); } -::rtl::OUString +OUString RDFaExportHelper::LookupBlankNode( uno::Reference const & i_xBlankNode) { OSL_ENSURE(i_xBlankNode.is(), "null BlankNode?"); if (!i_xBlankNode.is()) throw uno::RuntimeException(); - ::rtl::OUString & rEntry( + OUString & rEntry( m_BlankNodeMap[ i_xBlankNode->getStringValue() ] ); if (rEntry.isEmpty()) { @@ -160,9 +160,9 @@ RDFaExportHelper::AddRDFa( } static const sal_Unicode s_OpenBracket ('['); static const sal_Unicode s_CloseBracket(']'); - const ::rtl::OUString about( xSubjectURI.is() + const OUString about( xSubjectURI.is() ? getRelativeReference(m_rExport, xSubjectURI->getStringValue()) - : ::rtl::OUStringBuffer().append(s_OpenBracket).append( + : OUStringBuffer().append(s_OpenBracket).append( LookupBlankNode(xSubjectBNode)).append(s_CloseBracket) .makeStringAndClear() ); @@ -172,7 +172,7 @@ RDFaExportHelper::AddRDFa( const uno::Reference xDatatype(xContent->getDatatype()); if (xDatatype.is()) { - const ::rtl::OUString datatype( + const OUString datatype( makeCURIE(&m_rExport, xDatatype) ); m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_DATATYPE, datatype); @@ -183,7 +183,7 @@ RDFaExportHelper::AddRDFa( xContent->getValue()); } - ::rtl::OUStringBuffer property; + OUStringBuffer property; ::comphelper::intersperse( ::boost::make_transform_iterator( ::comphelper::stl_begin(rStatements), @@ -195,7 +195,7 @@ RDFaExportHelper::AddRDFa( ::boost::bind(&makeCURIE, &m_rExport, ::boost::bind(&rdf::Statement::Predicate, _1))), ::comphelper::OUStringBufferAppender(property), - ::rtl::OUString(" ")); + OUString(" ")); m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_PROPERTY, property.makeStringAndClear()); diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx index 5ae9760fa116..e37789435fea 100644 --- a/xmloff/source/core/RDFaImportHelper.cxx +++ b/xmloff/source/core/RDFaImportHelper.cxx @@ -58,7 +58,7 @@ class SAL_DLLPRIVATE RDFaReader const SvXMLImport & GetImport() const { return m_rImport; } //FIXME: this is an ugly hack to workaround buggy SvXMLImport::GetAbsolute - ::rtl::OUString GetAbsoluteReference(::rtl::OUString const & i_rURI) const + OUString GetAbsoluteReference(OUString const & i_rURI) const { if (i_rURI.isEmpty() || i_rURI[0] == '#') { @@ -76,13 +76,13 @@ public: { } // returns URI or blank node! - ::rtl::OUString ReadCURIE(::rtl::OUString const & i_rCURIE) const; + OUString ReadCURIE(OUString const & i_rCURIE) const; - std::vector< ::rtl::OUString > - ReadCURIEs(::rtl::OUString const & i_rCURIEs) const; + std::vector< OUString > + ReadCURIEs(OUString const & i_rCURIEs) const; - ::rtl::OUString - ReadURIOrSafeCURIE( ::rtl::OUString const & i_rURIOrSafeCURIE) const; + OUString + ReadURIOrSafeCURIE( OUString const & i_rURIOrSafeCURIE) const; }; /** helper to insert RDFa statements into the RDF repository */ @@ -91,7 +91,7 @@ class SAL_DLLPRIVATE RDFaInserter const uno::Reference m_xContext; uno::Reference< rdf::XDocumentRepository > m_xRepository; - typedef ::std::map< ::rtl::OUString, uno::Reference< rdf::XBlankNode > > + typedef ::std::map< OUString, uno::Reference< rdf::XBlankNode > > BlankNodeMap_t; BlankNodeMap_t m_BlankNodeMap; @@ -104,13 +104,13 @@ public: {} uno::Reference< rdf::XBlankNode > - LookupBlankNode(::rtl::OUString const & i_rNodeId ); + LookupBlankNode(OUString const & i_rNodeId ); uno::Reference< rdf::XURI > - MakeURI( ::rtl::OUString const & i_rURI) const; + MakeURI( OUString const & i_rURI) const; uno::Reference< rdf::XResource> - MakeResource( ::rtl::OUString const & i_rResource); + MakeResource( OUString const & i_rResource); void InsertRDFaEntry(struct RDFaEntry const & i_rEntry); }; @@ -118,16 +118,16 @@ public: /** store parsed RDFa attributes */ struct SAL_DLLPRIVATE ParsedRDFaAttributes { - ::rtl::OUString m_About; - ::std::vector< ::rtl::OUString > m_Properties; - ::rtl::OUString m_Content; - ::rtl::OUString m_Datatype; + OUString m_About; + ::std::vector< OUString > m_Properties; + OUString m_Content; + OUString m_Datatype; ParsedRDFaAttributes( - ::rtl::OUString const & i_rAbout, - ::std::vector< ::rtl::OUString > const & i_rProperties, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + ::std::vector< OUString > const & i_rProperties, + OUString const & i_rContent, + OUString const & i_rDatatype) : m_About(i_rAbout) , m_Properties(i_rProperties) , m_Content(i_rContent) @@ -157,7 +157,7 @@ static inline bool isWS(const sal_Unicode i_Char) || (' ' == i_Char); } -static ::rtl::OUString splitAtWS(::rtl::OUString & io_rString) +static OUString splitAtWS(OUString & io_rString) { const sal_Int32 len( io_rString.getLength() ); sal_Int32 idxstt(0); @@ -166,21 +166,21 @@ static ::rtl::OUString splitAtWS(::rtl::OUString & io_rString) sal_Int32 idxend(idxstt); while ((idxend < len) && (!isWS(io_rString[idxend]))) ++idxend; // the CURIE - const ::rtl::OUString ret(io_rString.copy(idxstt, idxend - idxstt)); + const OUString ret(io_rString.copy(idxstt, idxend - idxstt)); io_rString = io_rString.copy(idxend); // rest return ret; } -::rtl::OUString -RDFaReader::ReadCURIE(::rtl::OUString const & i_rCURIE) const +OUString +RDFaReader::ReadCURIE(OUString const & i_rCURIE) const { // the RDFa spec says that a prefix is required (it may be empty: ":foo") const sal_Int32 idx( i_rCURIE.indexOf(':') ); if (idx >= 0) { - ::rtl::OUString Prefix; - ::rtl::OUString LocalName; - ::rtl::OUString Namespace; + OUString Prefix; + OUString LocalName; + OUString Namespace; sal_uInt16 nKey( GetImport().GetNamespaceMap()._GetKeyByAttrName( i_rCURIE, &Prefix, &LocalName, &Namespace) ); if ( Prefix == "_" ) @@ -196,30 +196,30 @@ RDFaReader::ReadCURIE(::rtl::OUString const & i_rCURIE) const (XML_NAMESPACE_XMLNS != nKey)) { // N.B.: empty LocalName is valid! - const ::rtl::OUString URI(Namespace + LocalName); + const OUString URI(Namespace + LocalName); return GetAbsoluteReference(URI); } else { OSL_TRACE( "ReadCURIE: invalid CURIE: invalid prefix" ); - return ::rtl::OUString(); + return OUString(); } } } OSL_TRACE( "ReadCURIE: invalid CURIE: no prefix" ); - return ::rtl::OUString(); + return OUString(); } -::std::vector< ::rtl::OUString > -RDFaReader::ReadCURIEs(::rtl::OUString const & i_rCURIEs) const +::std::vector< OUString > +RDFaReader::ReadCURIEs(OUString const & i_rCURIEs) const { - std::vector< ::rtl::OUString > vec; - ::rtl::OUString CURIEs(i_rCURIEs); + std::vector< OUString > vec; + OUString CURIEs(i_rCURIEs); do { - ::rtl::OUString curie( splitAtWS(CURIEs) ); + OUString curie( splitAtWS(CURIEs) ); if (!curie.isEmpty()) { - const ::rtl::OUString uri(ReadCURIE(curie)); + const OUString uri(ReadCURIE(curie)); if (!uri.isEmpty()) { vec.push_back(uri); @@ -234,8 +234,8 @@ RDFaReader::ReadCURIEs(::rtl::OUString const & i_rCURIEs) const return vec; } -::rtl::OUString -RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const +OUString +RDFaReader::ReadURIOrSafeCURIE(OUString const & i_rURIOrSafeCURIE) const { const sal_Int32 len(i_rURIOrSafeCURIE.getLength()); if (len && (i_rURIOrSafeCURIE[0] == '[')) @@ -247,7 +247,7 @@ RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const else { OSL_TRACE( "ReadURIOrSafeCURIE: invalid SafeCURIE" ); - return ::rtl::OUString(); + return OUString(); } } else @@ -255,7 +255,7 @@ RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const if (i_rURIOrSafeCURIE.matchAsciiL("_:", 2)) // blank node { OSL_TRACE( "ReadURIOrSafeCURIE: invalid URI: scheme is _" ); - return ::rtl::OUString(); + return OUString(); } else { @@ -267,7 +267,7 @@ RDFaReader::ReadURIOrSafeCURIE(::rtl::OUString const & i_rURIOrSafeCURIE) const //////////////////////////////////////////////////////////////////////////// uno::Reference< rdf::XBlankNode > -RDFaInserter::LookupBlankNode(::rtl::OUString const & i_rNodeId ) +RDFaInserter::LookupBlankNode(OUString const & i_rNodeId ) { uno::Reference< rdf::XBlankNode > & rEntry( m_BlankNodeMap[ i_rNodeId ] ); if (!rEntry.is()) @@ -278,7 +278,7 @@ RDFaInserter::LookupBlankNode(::rtl::OUString const & i_rNodeId ) } uno::Reference< rdf::XURI > -RDFaInserter::MakeURI( ::rtl::OUString const & i_rURI) const +RDFaInserter::MakeURI( OUString const & i_rURI) const { if (i_rURI.matchAsciiL("_:", 2)) // blank node { @@ -300,14 +300,14 @@ RDFaInserter::MakeURI( ::rtl::OUString const & i_rURI) const } uno::Reference< rdf::XResource> -RDFaInserter::MakeResource( ::rtl::OUString const & i_rResource) +RDFaInserter::MakeResource( OUString const & i_rResource) { if (i_rResource.matchAsciiL("_:", 2)) // blank node { // we cannot use the blank node label as-is: it must be distinct // from labels in other graphs, so create fresh ones per XML stream // N.B.: content.xml and styles.xml are distinct graphs - ::rtl::OUString name( i_rResource.copy(2) ); + OUString name( i_rResource.copy(2) ); const uno::Reference< rdf::XBlankNode > xBNode( LookupBlankNode(name) ); OSL_ENSURE(xBNode.is(), "no blank node?"); return uno::Reference( xBNode, uno::UNO_QUERY); @@ -405,10 +405,10 @@ RDFaImportHelper::~RDFaImportHelper() ::boost::shared_ptr RDFaImportHelper::ParseRDFa( - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype) { if (i_rProperty.isEmpty()) { @@ -417,18 +417,18 @@ RDFaImportHelper::ParseRDFa( } // must parse CURIEs here: need namespace declaration context RDFaReader reader(GetImport()); - const ::rtl::OUString about( reader.ReadURIOrSafeCURIE(i_rAbout) ); + const OUString about( reader.ReadURIOrSafeCURIE(i_rAbout) ); if (about.isEmpty()) { return ::boost::shared_ptr(); } - const ::std::vector< ::rtl::OUString > properties( + const ::std::vector< OUString > properties( reader.ReadCURIEs(i_rProperty) ); if (!properties.size()) { return ::boost::shared_ptr(); } - const ::rtl::OUString datatype( !i_rDatatype.isEmpty() + const OUString datatype( !i_rDatatype.isEmpty() ? reader.ReadCURIE(i_rDatatype) - : ::rtl::OUString() ); + : OUString() ); return ::boost::shared_ptr( new ParsedRDFaAttributes(about, properties, i_rContent, datatype)); } @@ -454,10 +454,10 @@ RDFaImportHelper::AddRDFa( void RDFaImportHelper::ParseAndAddRDFa( uno::Reference const & i_xObject, - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype) { ::boost::shared_ptr pAttributes( ParseRDFa(i_rAbout, i_rProperty, i_rContent, i_rDatatype) ); diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index a1de3f713322..b8d2a571c442 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -62,7 +62,7 @@ XMLSettingsExportHelper::~XMLSettingsExportHelper() } void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, - const rtl::OUString& rName) const + const OUString& rName) const { uno::Any aAny( rAny ); ManipulateSetting( aAny, rName ); @@ -122,7 +122,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, break; case uno::TypeClass_STRING: { - rtl::OUString sString; + OUString sString; aAny >>= sString; exportString(sString, rName); } @@ -180,13 +180,13 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny, } } -void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_BOOLEAN ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUString sValue; + OUString sValue; if (bValue) sValue = GetXMLToken(XML_TRUE); else @@ -195,7 +195,7 @@ void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const rtl::OUStr m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const OUString& rName) const { (void) nValue; (void) rName; OSL_ENSURE(false, "XMLSettingsExportHelper::exportByte(): #i114162#:\n" @@ -203,54 +203,54 @@ void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUStr "so storing them is disabled!\n" "Use a different type instead (e.g. \"short\")."); } -void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_SHORT ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, sal_Int32(nValue)); m_rContext.Characters( sBuffer.makeStringAndClear() ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_INT ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nValue); m_rContext.Characters( sBuffer.makeStringAndClear() ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_LONG ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUString sValue(rtl::OUString::valueOf(nValue)); + OUString sValue(OUString::valueOf(nValue)); m_rContext.Characters( sValue ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportDouble(const double fValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportDouble(const double fValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_DOUBLE ); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDouble(sBuffer, fValue); m_rContext.Characters( sBuffer.makeStringAndClear() ); m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportString(const rtl::OUString& sValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportString(const OUString& sValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); @@ -261,12 +261,12 @@ void XMLSettingsExportHelper::exportString(const rtl::OUString& sValue, const rt m_rContext.EndElement( sal_False ); } -void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const rtl::OUString& rName) const +void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.AddAttribute( XML_TYPE, XML_DATETIME ); - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDateTime(sBuffer, aValue); m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); m_rContext.Characters( sBuffer.makeStringAndClear() ); @@ -275,7 +275,7 @@ void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const void XMLSettingsExportHelper::exportSequencePropertyValue( const uno::Sequence& aProps, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); sal_Int32 nLength(aProps.getLength()); @@ -290,20 +290,20 @@ void XMLSettingsExportHelper::exportSequencePropertyValue( } void XMLSettingsExportHelper::exportSymbolDescriptors( const uno::Sequence < formula::SymbolDescriptor > &rProps, - const rtl::OUString rName) const + const OUString rName) const { uno::Reference< container::XIndexContainer > xBox = document::IndexedPropertyValues::create(m_rContext.GetComponentContext()); - const rtl::OUString sName ( "Name" ); - const rtl::OUString sExportName ( "ExportName" ); - const rtl::OUString sSymbolSet ( "SymbolSet" ); - const rtl::OUString sCharacter ( "Character" ); - const rtl::OUString sFontName ( "FontName" ); - const rtl::OUString sCharSet ( "CharSet" ); - const rtl::OUString sFamily ( "Family" ); - const rtl::OUString sPitch ( "Pitch" ); - const rtl::OUString sWeight ( "Weight" ); - const rtl::OUString sItalic ( "Italic" ); + const OUString sName ( "Name" ); + const OUString sExportName ( "ExportName" ); + const OUString sSymbolSet ( "SymbolSet" ); + const OUString sCharacter ( "Character" ); + const OUString sFontName ( "FontName" ); + const OUString sCharSet ( "CharSet" ); + const OUString sFamily ( "Family" ); + const OUString sPitch ( "Pitch" ); + const OUString sWeight ( "Weight" ); + const OUString sItalic ( "Italic" ); sal_Int32 nCount = rProps.getLength(); const formula::SymbolDescriptor *pDescriptor = rProps.getConstArray(); @@ -342,7 +342,7 @@ void XMLSettingsExportHelper::exportSymbolDescriptors( } void XMLSettingsExportHelper::exportbase64Binary( const uno::Sequence& aProps, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); sal_Int32 nLength(aProps.getLength()); @@ -351,7 +351,7 @@ void XMLSettingsExportHelper::exportbase64Binary( m_rContext.StartElement( XML_CONFIG_ITEM, sal_True ); if(nLength) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::encodeBase64(sBuffer, aProps); m_rContext.Characters( sBuffer.makeStringAndClear() ); } @@ -359,7 +359,7 @@ void XMLSettingsExportHelper::exportbase64Binary( } void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny, - const rtl::OUString& rName, + const OUString& rName, const sal_Bool bNameAccess) const { DBG_ASSERT((bNameAccess && !rName.isEmpty()) || !bNameAccess, "no name"); @@ -379,7 +379,7 @@ void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny, void XMLSettingsExportHelper::exportNameAccess( const uno::Reference& aNamed, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); DBG_ASSERT(aNamed->getElementType().equals(getCppuType( (uno::Sequence *)0 ) ), @@ -388,7 +388,7 @@ void XMLSettingsExportHelper::exportNameAccess( { m_rContext.AddAttribute( XML_NAME, rName ); m_rContext.StartElement( XML_CONFIG_ITEM_MAP_NAMED, sal_True ); - uno::Sequence< rtl::OUString > aNames(aNamed->getElementNames()); + uno::Sequence< OUString > aNames(aNamed->getElementNames()); for (sal_Int32 i = 0; i < aNames.getLength(); i++) exportMapEntry(aNamed->getByName(aNames[i]), aNames[i], sal_True); m_rContext.EndElement( sal_True ); @@ -397,12 +397,12 @@ void XMLSettingsExportHelper::exportNameAccess( void XMLSettingsExportHelper::exportIndexAccess( const uno::Reference aIndexed, - const rtl::OUString rName) const + const OUString rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); DBG_ASSERT(aIndexed->getElementType().equals(getCppuType( (uno::Sequence *)0 ) ), "wrong IndexAccess" ); - rtl::OUString sEmpty; + OUString sEmpty; if(aIndexed->hasElements()) { m_rContext.AddAttribute( XML_NAME, rName ); @@ -418,7 +418,7 @@ void XMLSettingsExportHelper::exportIndexAccess( void XMLSettingsExportHelper::exportForbiddenCharacters( const uno::Any &rAny, - const rtl::OUString rName) const + const OUString rName) const { uno::Reference xForbChars; uno::Reference xLocales; @@ -437,11 +437,11 @@ void XMLSettingsExportHelper::exportForbiddenCharacters( const sal_Int32 nCount = aLocales.getLength(); - const rtl::OUString sLanguage ( "Language" ); - const rtl::OUString sCountry ( "Country" ); - const rtl::OUString sVariant ( "Variant" ); - const rtl::OUString sBeginLine ( "BeginLine" ); - const rtl::OUString sEndLine ( "EndLine" ); + const OUString sLanguage ( "Language" ); + const OUString sCountry ( "Country" ); + const OUString sVariant ( "Variant" ); + const OUString sBeginLine ( "BeginLine" ); + const OUString sEndLine ( "EndLine" ); sal_Int32 nPos = 0; for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++, pLocales++ ) @@ -474,7 +474,7 @@ void XMLSettingsExportHelper::exportForbiddenCharacters( void XMLSettingsExportHelper::exportAllSettings( const uno::Sequence& aProps, - const rtl::OUString& rName) const + const OUString& rName) const { DBG_ASSERT(!rName.isEmpty(), "no name"); exportSequencePropertyValue(aProps, rName); @@ -485,7 +485,7 @@ void XMLSettingsExportHelper::exportAllSettings( * from their XML settings representation. This is your chance to do * so! */ -void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const rtl::OUString& rName ) const +void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const OUString& rName ) const { if( rName == msPrinterIndependentLayout ) { @@ -493,11 +493,11 @@ void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const rtl::OUSt if( rAny >>= nTmp ) { if( nTmp == document::PrinterIndependentLayout::LOW_RESOLUTION ) - rAny <<= rtl::OUString("low-resolution"); + rAny <<= OUString("low-resolution"); else if( nTmp == document::PrinterIndependentLayout::DISABLED ) - rAny <<= rtl::OUString("disabled"); + rAny <<= OUString("disabled"); else if( nTmp == document::PrinterIndependentLayout::HIGH_RESOLUTION ) - rAny <<= rtl::OUString("high-resolution"); + rAny <<= OUString("high-resolution"); } } else if( (rName == msColorTableURL) || (rName == msLineEndTableURL) || (rName == msHatchTableURL) || @@ -518,7 +518,7 @@ void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const rtl::OUSt if( mxStringSubsitution.is() ) { - ::rtl::OUString aURL; + OUString aURL; rAny >>= aURL; aURL = mxStringSubsitution->reSubstituteVariables( aURL ); rAny <<= aURL; diff --git a/xmloff/source/core/SvXMLAttr.cxx b/xmloff/source/core/SvXMLAttr.cxx index 2a42dff11760..4ce1a12d99fd 100644 --- a/xmloff/source/core/SvXMLAttr.cxx +++ b/xmloff/source/core/SvXMLAttr.cxx @@ -31,8 +31,8 @@ #include //USHRT_MAX #include "SvXMLAttr.hxx" -SvXMLAttr::SvXMLAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ) : +SvXMLAttr::SvXMLAttr( const OUString& rLName, + const OUString& rValue ) : aPrefixPos(USHRT_MAX), aLName(rLName), aValue(rValue) @@ -40,8 +40,8 @@ SvXMLAttr::SvXMLAttr( const rtl::OUString& rLName, } SvXMLAttr::SvXMLAttr( const sal_uInt16 nPos, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) : + const OUString& rLName, + const OUString& rValue ) : aPrefixPos(nPos), aLName(rLName), aValue(rValue) @@ -60,12 +60,12 @@ sal_uInt16 SvXMLAttr::getPrefixPos() const return aPrefixPos; } -const rtl::OUString& SvXMLAttr::getLName() const +const OUString& SvXMLAttr::getLName() const { return aLName; } -const rtl::OUString& SvXMLAttr::getValue() const { +const OUString& SvXMLAttr::getValue() const { return aValue; } diff --git a/xmloff/source/core/SvXMLAttr.hxx b/xmloff/source/core/SvXMLAttr.hxx index 6ac9cd954ceb..82f8e95151ef 100644 --- a/xmloff/source/core/SvXMLAttr.hxx +++ b/xmloff/source/core/SvXMLAttr.hxx @@ -31,26 +31,26 @@ #ifndef _XMLOFF_SVXMLATTR_HXX #define _XMLOFF_SVXMLATTR_HXX -#include //rtl::OUString +#include //OUString class SvXMLAttr { private: sal_uInt16 aPrefixPos; - rtl::OUString aLName; - rtl::OUString aValue; + OUString aLName; + OUString aValue; public: // Assuming OUString is well behaved, the default copy constructor and // assignment operator are fine. - SvXMLAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ); + SvXMLAttr( const OUString& rLName, + const OUString& rValue ); SvXMLAttr( const sal_uInt16 nPos, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rLName, + const OUString& rValue ); bool operator== (const SvXMLAttr &rCmp) const; sal_uInt16 getPrefixPos() const; - const rtl::OUString& getLName() const; - const rtl::OUString& getValue() const; + const OUString& getLName() const; + const OUString& getValue() const; }; #endif /* _XMLOFF_SVXMLATTR_HXX */ diff --git a/xmloff/source/core/SvXMLAttrCollection.cxx b/xmloff/source/core/SvXMLAttrCollection.cxx index 748ed5dff3a2..2c3bbf2da966 100644 --- a/xmloff/source/core/SvXMLAttrCollection.cxx +++ b/xmloff/source/core/SvXMLAttrCollection.cxx @@ -37,26 +37,26 @@ bool SvXMLAttrCollection::operator ==( const SvXMLAttrCollection& rCmp ) const (rCmp.aAttrs == aAttrs); } -sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rLName, + const OUString& rValue ) { aAttrs.push_back( SvXMLAttr(rLName, rValue) ); return sal_True; } -sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { sal_uInt16 nPos = aNamespaceMap.Add( rPrefix, rNamespace ); aAttrs.push_back( SvXMLAttr(nPos, rLName, rValue) ); return sal_True; } -sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrCollection::AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { sal_uInt16 nPos = aNamespaceMap.GetIndexByPrefix( rPrefix ); if( USHRT_MAX == nPos ) @@ -66,8 +66,8 @@ sal_Bool SvXMLAttrCollection::AddAttr( const rtl::OUString& rPrefix, } sal_Bool SvXMLAttrCollection::SetAt( size_t i, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rLName, + const OUString& rValue ) { if( i >= GetAttrCount() ) return sal_False; @@ -76,10 +76,10 @@ sal_Bool SvXMLAttrCollection::SetAt( size_t i, } sal_Bool SvXMLAttrCollection::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { if( i >= GetAttrCount() ) return sal_False; @@ -93,9 +93,9 @@ sal_Bool SvXMLAttrCollection::SetAt( size_t i, } sal_Bool SvXMLAttrCollection::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { if( i >= GetAttrCount() ) return sal_False; @@ -125,21 +125,21 @@ size_t SvXMLAttrCollection::GetAttrCount() const return aAttrs.size(); } -const rtl::OUString& SvXMLAttrCollection::GetAttrLName(size_t i) const +const OUString& SvXMLAttrCollection::GetAttrLName(size_t i) const { OSL_ENSURE( i < aAttrs.size(), "SvXMLAttrContainerData::GetLName: illegal index" ); return aAttrs[i].getLName(); } -const rtl::OUString& SvXMLAttrCollection::GetAttrValue(size_t i) const +const OUString& SvXMLAttrCollection::GetAttrValue(size_t i) const { OSL_ENSURE( i < aAttrs.size(), "SvXMLAttrContainerData::GetValue: illegal index" ); return aAttrs[i].getValue(); } -const rtl::OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const +const OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const { - rtl::OUString sRet; + OUString sRet; sal_uInt16 nPos = GetPrefixPos( i ); //Does this point to a valid namespace entry? if( USHRT_MAX != nPos ) @@ -147,9 +147,9 @@ const rtl::OUString SvXMLAttrCollection::GetAttrNamespace( size_t i ) const return sRet; } -const rtl::OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const +const OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const { - rtl::OUString sRet; + OUString sRet; sal_uInt16 nPos = GetPrefixPos( i ); //Does this point to a valid namespace entry? if( USHRT_MAX != nPos ) @@ -157,12 +157,12 @@ const rtl::OUString SvXMLAttrCollection::GetAttrPrefix( size_t i ) const return sRet; } -const rtl::OUString& SvXMLAttrCollection::GetNamespace( sal_uInt16 i ) const +const OUString& SvXMLAttrCollection::GetNamespace( sal_uInt16 i ) const { return aNamespaceMap.GetNameByIndex( i ); } -const rtl::OUString& SvXMLAttrCollection::GetPrefix( sal_uInt16 i ) const +const OUString& SvXMLAttrCollection::GetPrefix( sal_uInt16 i ) const { return aNamespaceMap.GetPrefixByIndex( i ); } diff --git a/xmloff/source/core/SvXMLAttrCollection.hxx b/xmloff/source/core/SvXMLAttrCollection.hxx index 96fb88a5ace2..852ca4eba9e2 100644 --- a/xmloff/source/core/SvXMLAttrCollection.hxx +++ b/xmloff/source/core/SvXMLAttrCollection.hxx @@ -34,7 +34,7 @@ #include "SvXMLAttr.hxx" #include //SvXMLNamespaceMap -#include //rtl::OUString +#include //OUString #include //sal_uInt16 and sal_Bool #include @@ -45,38 +45,38 @@ public: std::vector aAttrs; bool operator==(const SvXMLAttrCollection &rCmp) const; - sal_Bool AddAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ); - sal_Bool AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); - sal_Bool AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + sal_Bool AddAttr( const OUString& rLName, + const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ); + sal_Bool AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ); sal_Bool SetAt( size_t i, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rLName, + const OUString& rValue ); sal_Bool SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ); sal_Bool SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ); + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ); void Remove( size_t i ); size_t GetAttrCount() const; - const rtl::OUString& GetAttrLName(size_t i) const; - const rtl::OUString& GetAttrValue(size_t i) const; - const rtl::OUString GetAttrNamespace( size_t i ) const; - const rtl::OUString GetAttrPrefix( size_t i ) const; - const rtl::OUString& GetNamespace( sal_uInt16 i ) const; - const rtl::OUString& GetPrefix( sal_uInt16 i ) const; + const OUString& GetAttrLName(size_t i) const; + const OUString& GetAttrValue(size_t i) const; + const OUString GetAttrNamespace( size_t i ) const; + const OUString GetAttrPrefix( size_t i ) const; + const OUString& GetNamespace( sal_uInt16 i ) const; + const OUString& GetPrefix( sal_uInt16 i ) const; sal_uInt16 GetFirstNamespaceIndex() const; sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const; diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx index b402f985e6c9..45e20ce0087d 100644 --- a/xmloff/source/core/XMLBase64Export.cxx +++ b/xmloff/source/core/XMLBase64Export.cxx @@ -30,8 +30,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #define INPUT_BUFFER_SIZE 54 #define OUTPUT_BUFFER_SIZE 72 diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx index cfca4e01b290..22a6f464b6b9 100644 --- a/xmloff/source/core/XMLBase64ImportContext.cxx +++ b/xmloff/source/core/XMLBase64ImportContext.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -56,7 +54,7 @@ void XMLBase64ImportContext::EndElement() xOut->closeOutput(); } -void XMLBase64ImportContext::Characters( const ::rtl::OUString& rChars ) +void XMLBase64ImportContext::Characters( const OUString& rChars ) { OUString sTrimmedChars( rChars. trim() ); if( !sTrimmedChars.isEmpty() ) diff --git a/xmloff/source/core/XMLBasicExportFilter.cxx b/xmloff/source/core/XMLBasicExportFilter.cxx index cb226621f586..abc408cc4e55 100644 --- a/xmloff/source/core/XMLBasicExportFilter.cxx +++ b/xmloff/source/core/XMLBasicExportFilter.cxx @@ -58,7 +58,7 @@ void XMLBasicExportFilter::endDocument() // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::startElement( const ::rtl::OUString& aName, +void XMLBasicExportFilter::startElement( const OUString& aName, const Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, RuntimeException) { @@ -68,7 +68,7 @@ void XMLBasicExportFilter::startElement( const ::rtl::OUString& aName, // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::endElement( const ::rtl::OUString& aName ) +void XMLBasicExportFilter::endElement( const OUString& aName ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) @@ -77,7 +77,7 @@ void XMLBasicExportFilter::endElement( const ::rtl::OUString& aName ) // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::characters( const ::rtl::OUString& aChars ) +void XMLBasicExportFilter::characters( const OUString& aChars ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) @@ -86,7 +86,7 @@ void XMLBasicExportFilter::characters( const ::rtl::OUString& aChars ) // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) +void XMLBasicExportFilter::ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) @@ -95,8 +95,8 @@ void XMLBasicExportFilter::ignorableWhitespace( const ::rtl::OUString& aWhitespa // ----------------------------------------------------------------------------- -void XMLBasicExportFilter::processingInstruction( const ::rtl::OUString& aTarget, - const ::rtl::OUString& aData ) +void XMLBasicExportFilter::processingInstruction( const OUString& aTarget, + const OUString& aData ) throw (xml::sax::SAXException, RuntimeException) { if ( m_xHandler.is() ) diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx index f49a9f29ad48..fa8cdffc28dc 100644 --- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx @@ -19,7 +19,6 @@ #include "xmloff/XMLEmbeddedObjectExportFilter.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index fa5a264ebf78..b00df847f95f 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -32,8 +32,6 @@ #include "xmloff/XMLFilterServiceNames.h" #include "XMLEmbeddedObjectImportContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -76,21 +74,21 @@ public: TYPEINFO(); XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rHandler ); virtual ~XMLEmbeddedObjectImportContext_Impl(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; TYPEINIT1( XMLEmbeddedObjectImportContext_Impl, SvXMLImportContext ); @@ -219,7 +217,7 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext( }; for (int k=0; aTmp[k]; k++) { - ::rtl::OUString sTmpString = ::rtl::OUString::createFromAscii(aTmp[k]); + OUString sTmpString = OUString::createFromAscii(aTmp[k]); if( sMime.matchAsciiL( aTmp[k], sTmpString.getLength() ) ) { sClass = sMime.copy( sTmpString.getLength() ); @@ -325,7 +323,7 @@ void XMLEmbeddedObjectImportContext::EndElement() } } -void XMLEmbeddedObjectImportContext::Characters( const ::rtl::OUString& rChars ) +void XMLEmbeddedObjectImportContext::Characters( const OUString& rChars ) { if( xHandler.is() ) xHandler->characters( rChars ); diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index 6ae6031cfaee..c625ae5792a9 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -26,7 +26,6 @@ #include -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star; @@ -197,7 +196,7 @@ void SvXMLAttributeList::AppendAttributeList( const uno::Reference< ::com::sun:: } void SvXMLAttributeList::SetValueByIndex( sal_Int16 i, - const ::rtl::OUString& rValue ) + const OUString& rValue ) { if( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 689b314885d3..1b7e60196768 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -33,7 +33,6 @@ using namespace com::sun::star; -using ::rtl::OUString; #define SERVICE( className ) \ extern OUString SAL_CALL className##_getImplementationName() throw(); \ diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx index c61a986f4b8b..7f4d69eb5bab 100644 --- a/xmloff/source/core/i18nmap.cxx +++ b/xmloff/source/core/i18nmap.cxx @@ -21,8 +21,8 @@ #include #include "xmloff/i18nmap.hxx" -bool SvI18NMap::Add( sal_uInt16 nKind, const rtl::OUString& rName, - const rtl::OUString& rNewName ) +bool SvI18NMap::Add( sal_uInt16 nKind, const OUString& rName, + const OUString& rNewName ) { SvI18NMapEntry_Key aKey(nKind, rName); bool bIsNewInsertion = m_aMap.insert(SvI18NMap_Impl::value_type(aKey, rNewName)).second; @@ -30,7 +30,7 @@ bool SvI18NMap::Add( sal_uInt16 nKind, const rtl::OUString& rName, return bIsNewInsertion; } -const rtl::OUString& SvI18NMap::Get( sal_uInt16 nKind, const rtl::OUString& rName ) const +const OUString& SvI18NMap::Get( sal_uInt16 nKind, const OUString& rName ) const { SvI18NMapEntry_Key aKey(nKind, rName); SvI18NMap_Impl::const_iterator aI = m_aMap.find(aKey); diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index ebf268c26dd7..03e5e13edd08 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -29,8 +29,6 @@ #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; /* The basic idea of this class is that we have two two ways to search our @@ -179,7 +177,7 @@ OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const if (aIter != aNameMap.end()) { sAttrName.append( sXMLNS ); - const ::rtl::OUString & prefix( (*aIter).second->sPrefix ); + const OUString & prefix( (*aIter).second->sPrefix ); if (!prefix.isEmpty()) // not default namespace { sAttrName.append( sal_Unicode(':') ); @@ -444,7 +442,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName, return _GetKeyByAttrName ( rAttrName, pPrefix, pLocalName, pNamespace ); } -sal_Bool SvXMLNamespaceMap::NormalizeURI( ::rtl::OUString& rName ) +sal_Bool SvXMLNamespaceMap::NormalizeURI( OUString& rName ) { // try OASIS + W3 URI normalization sal_Bool bSuccess = NormalizeOasisURN( rName ); @@ -453,7 +451,7 @@ sal_Bool SvXMLNamespaceMap::NormalizeURI( ::rtl::OUString& rName ) return bSuccess; } -sal_Bool SvXMLNamespaceMap::NormalizeW3URI( ::rtl::OUString& rName ) +sal_Bool SvXMLNamespaceMap::NormalizeW3URI( OUString& rName ) { // check if URI matches: // http://www.w3.org/[0-9]*/[:letter:]* @@ -477,7 +475,7 @@ sal_Bool SvXMLNamespaceMap::NormalizeW3URI( ::rtl::OUString& rName ) return bSuccess; } -sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( ::rtl::OUString& rName ) +sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( OUString& rName ) { // #i38644# // we exported the wrong namespace for smil, so we correct this here on load diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 8cbebdd55778..cc51124ead99 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -27,8 +27,6 @@ #include "xmloff/unoatrcn.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx index 4b1d1336b8c0..87e54d711e21 100644 --- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx +++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx @@ -23,7 +23,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; -using ::rtl::OUString; namespace comphelper { diff --git a/xmloff/source/core/xmlcnimp.cxx b/xmloff/source/core/xmlcnimp.cxx index 2cb1deb0a8be..ca467fba0a29 100644 --- a/xmloff/source/core/xmlcnimp.cxx +++ b/xmloff/source/core/xmlcnimp.cxx @@ -41,47 +41,47 @@ int SvXMLAttrContainerData::operator ==( const SvXMLAttrContainerData& rCmp ) co return ( *(rCmp.pimpl) == *(pimpl) ); } -sal_Bool SvXMLAttrContainerData::AddAttr( const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rLName, + const OUString& rValue ) { return pimpl->AddAttr(rLName, rValue); } -sal_Bool SvXMLAttrContainerData::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { return pimpl->AddAttr(rPrefix, rNamespace, rLName, rValue); } -sal_Bool SvXMLAttrContainerData::AddAttr( const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) +sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { return pimpl->AddAttr(rPrefix, rLName, rValue); } sal_Bool SvXMLAttrContainerData::SetAt( size_t i, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rLName, + const OUString& rValue ) { return pimpl->SetAt(i, rLName, rValue); } sal_Bool SvXMLAttrContainerData::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rNamespace, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rNamespace, + const OUString& rLName, + const OUString& rValue ) { return pimpl->SetAt(i, rPrefix, rNamespace, rLName, rValue); } sal_Bool SvXMLAttrContainerData::SetAt( size_t i, - const rtl::OUString& rPrefix, - const rtl::OUString& rLName, - const rtl::OUString& rValue ) + const OUString& rPrefix, + const OUString& rLName, + const OUString& rValue ) { return pimpl->SetAt(i, rPrefix, rLName, rValue); } @@ -96,32 +96,32 @@ size_t SvXMLAttrContainerData::GetAttrCount() const return pimpl->GetAttrCount(); } -const rtl::OUString& SvXMLAttrContainerData::GetAttrLName(size_t i) const +const OUString& SvXMLAttrContainerData::GetAttrLName(size_t i) const { return pimpl->GetAttrLName(i); } -const rtl::OUString& SvXMLAttrContainerData::GetAttrValue(size_t i) const +const OUString& SvXMLAttrContainerData::GetAttrValue(size_t i) const { return pimpl->GetAttrValue(i); } -const rtl::OUString SvXMLAttrContainerData::GetAttrNamespace( size_t i ) const +const OUString SvXMLAttrContainerData::GetAttrNamespace( size_t i ) const { return pimpl->GetAttrNamespace(i); } -const rtl::OUString SvXMLAttrContainerData::GetAttrPrefix( size_t i ) const +const OUString SvXMLAttrContainerData::GetAttrPrefix( size_t i ) const { return pimpl->GetAttrPrefix(i); } -const rtl::OUString& SvXMLAttrContainerData::GetNamespace( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerData::GetNamespace( sal_uInt16 i ) const { return pimpl->GetNamespace(i); } -const rtl::OUString& SvXMLAttrContainerData::GetPrefix( sal_uInt16 i ) const +const OUString& SvXMLAttrContainerData::GetPrefix( sal_uInt16 i ) const { return pimpl->GetPrefix(i); } diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index 76463aa2fa84..c9fd6bd25e23 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -31,8 +31,6 @@ -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; @@ -181,7 +179,7 @@ void XMLErrors::AddRecord( } // convert to byte string and signal the error - rtl::OString aError(rtl::OUStringToOString(sMessage.makeStringAndClear(), + OString aError(OUStringToOString(sMessage.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)); OSL_FAIL( aError.getStr() ); #endif diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index c82a6809ff3d..82ba7252f4d7 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -88,7 +88,6 @@ #include -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star; @@ -155,7 +154,7 @@ public: } virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, - const ::rtl::OUString& i_rValue ); + const OUString& i_rValue ); virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue ); @@ -163,16 +162,16 @@ public: const sal_Bool i_bIgnoreWhitespace ); virtual void EndElement( const sal_Bool i_bIgnoreWhitespace ); - virtual void Characters( const ::rtl::OUString& i_rCharacters ); + virtual void Characters( const OUString& i_rCharacters ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const; private: SvXMLExport& m_rExport; - ::std::stack< ::rtl::OUString > m_aElements; + ::std::stack< OUString > m_aElements; }; -void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue ) +void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ) { m_rExport.AddAttribute( XML_NAMESPACE_CONFIG, i_eName, i_rValue ); } @@ -184,19 +183,19 @@ void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eN void SettingsExportFacade::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace ) { - const ::rtl::OUString sElementName( m_rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_CONFIG, GetXMLToken( i_eName ) ) ); + const OUString sElementName( m_rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_CONFIG, GetXMLToken( i_eName ) ) ); m_rExport.StartElement( sElementName, i_bIgnoreWhitespace ); m_aElements.push( sElementName ); } void SettingsExportFacade::EndElement( const sal_Bool i_bIgnoreWhitespace ) { - const ::rtl::OUString sElementName( m_aElements.top() ); + const OUString sElementName( m_aElements.top() ); m_rExport.EndElement( sElementName, i_bIgnoreWhitespace ); m_aElements.pop(); } -void SettingsExportFacade::Characters( const ::rtl::OUString& i_rCharacters ) +void SettingsExportFacade::Characters( const OUString& i_rCharacters ) { m_rExport.GetDocHandler()->characters( i_rCharacters ); } @@ -251,8 +250,8 @@ public: ::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper; uno::Reference< uri::XUriReferenceFactory > mxUriReferenceFactory; - rtl::OUString msPackageURI; - rtl::OUString msPackageURIScheme; + OUString msPackageURI; + OUString msPackageURIScheme; // Written OpenDocument file format doesn't fit to the created text document (#i69627#) sal_Bool mbOutlineStyleAsNormalListStyle; sal_Bool mbSaveBackwardCompatibleODF; @@ -262,10 +261,10 @@ public: SvtSaveOptions maSaveOptions; /// relative path of stream in package, e.g. "someobject/content.xml" - ::rtl::OUString mStreamPath; + OUString mStreamPath; /// name of stream in package, e.g., "content.xml" - ::rtl::OUString mStreamName; + OUString mStreamName; /// stack of backed up namespace maps /// long: depth at which namespace map has been backed up into the stack @@ -278,7 +277,7 @@ public: sal_Bool mbExportTextNumberElement; sal_Bool mbNullDateInitialized; - void SetSchemeOf( const ::rtl::OUString& rOrigFileName ) + void SetSchemeOf( const OUString& rOrigFileName ) { sal_Int32 nSep = rOrigFileName.indexOf(':'); if( nSep != -1 ) @@ -775,7 +774,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen mpImpl->mStreamName = sName; // Note: may be empty (XSLT) // Written OpenDocument file format doesn't fit to the created text document (#i69627#) - const ::rtl::OUString sOutlineStyleAsNormalListStyle( + const OUString sOutlineStyleAsNormalListStyle( "OutlineStyleAsNormalListStyle" ); if( xPropertySetInfo->hasPropertyByName( sOutlineStyleAsNormalListStyle ) ) { @@ -787,7 +786,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen if( xPropertySetInfo->hasPropertyByName( sTargetStorage ) ) mxExportInfo->getPropertyValue( sTargetStorage ) >>= mpImpl->mxTargetStorage; - const ::rtl::OUString sExportTextNumberElement( + const OUString sExportTextNumberElement( "ExportTextNumberElement" ); if( xPropertySetInfo->hasPropertyByName( sExportTextNumberElement ) ) { @@ -841,12 +840,12 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue if (GetModel().is()) { // print a trace message with the URL - rtl::OString aUrl(rtl::OUStringToOString(GetModel()->getURL(), + OString aUrl(OUStringToOString(GetModel()->getURL(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "%s", aUrl.getStr() ); // we also want a trace message with the document class - rtl::OString aClass(rtl::OUStringToOString(GetXMLToken(meClass), + OString aClass(OUStringToOString(GetXMLToken(meClass), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "class=\"%s\"", aClass.getStr() ); @@ -875,13 +874,13 @@ void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException) SetError(XMLERROR_CANCEL|XMLERROR_FLAG_SEVERE, aEmptySeq); } -::rtl::OUString SAL_CALL SvXMLExport::getName( ) +OUString SAL_CALL SvXMLExport::getName( ) throw (::com::sun::star::uno::RuntimeException) { return msFilterName; } -void SAL_CALL SvXMLExport::setName( const ::rtl::OUString& ) +void SAL_CALL SvXMLExport::setName( const OUString& ) throw (::com::sun::star::uno::RuntimeException) { // do nothing, because it is not possible to set the FilterName @@ -913,11 +912,11 @@ uno::Sequence< OUString > SAL_CALL SvXMLExport::getSupportedServiceNames( ) /////////////////////////////////////////////////////////////////////// -::rtl::OUString -SvXMLExport::EnsureNamespace(::rtl::OUString const & i_rNamespace, - ::rtl::OUString const & i_rPreferredPrefix) +OUString +SvXMLExport::EnsureNamespace(OUString const & i_rNamespace, + OUString const & i_rPreferredPrefix) { - ::rtl::OUString sPrefix; + OUString sPrefix; sal_uInt16 nKey( _GetNamespaceMap().GetKeyByName( i_rNamespace ) ); if( XML_NAMESPACE_UNKNOWN == nKey ) { @@ -926,7 +925,7 @@ SvXMLExport::EnsureNamespace(::rtl::OUString const & i_rNamespace, sPrefix = i_rPreferredPrefix; nKey = _GetNamespaceMap().GetKeyByPrefix( sPrefix ); sal_Int32 n( 0 ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; while( nKey != USHRT_MAX ) { buf.append( i_rPreferredPrefix ); @@ -1006,15 +1005,15 @@ void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey, GetXMLToken(eValue) ); } -void SvXMLExport::AddAttribute( const ::rtl::OUString& rQName, - const ::rtl::OUString& rValue ) +void SvXMLExport::AddAttribute( const OUString& rQName, + const OUString& rValue ) { mpAttrList->AddAttribute( rQName, rValue ); } -void SvXMLExport::AddAttribute( const ::rtl::OUString& rQName, +void SvXMLExport::AddAttribute( const OUString& rQName, enum ::xmloff::token::XMLTokenEnum eValue ) { mpAttrList->AddAttribute( @@ -1222,7 +1221,7 @@ void SvXMLExport::addChaffWhenEncryptedStorage() if (xEncr.is() && xEncr->hasEncryptionData() && mxExtHandler.is()) { - mxExtHandler->comment(rtl::OStringToOUString(comphelper::xml::makeXMLChaff(), RTL_TEXTENCODING_ASCII_US)); + mxExtHandler->comment(OStringToOUString(comphelper::xml::makeXMLChaff(), RTL_TEXTENCODING_ASCII_US)); } } @@ -1266,7 +1265,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) ::comphelper::PropertyMapEntry aInfoMap[] = { { "Class", sizeof("Class")-1, 0, - &::getCppuType((::rtl::OUString*)0), + &::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID, 0}, { NULL, 0, 0, NULL, 0, 0 } }; @@ -1481,8 +1480,8 @@ void SvXMLExport::_ExportScripts() // export Basic macros (only for FlatXML) if ( mnExportFlags & EXPORT_EMBEDDED ) { - ::rtl::OUString aValue( GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) ); - aValue += ::rtl::OUString( ":Basic" ); + OUString aValue( GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) ); + aValue += OUString( ":Basic" ); AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, aValue ); SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT, sal_True, sal_True ); @@ -1492,7 +1491,7 @@ void SvXMLExport::_ExportScripts() { Reference< beans::XPropertySet > xPSet( mxModel, UNO_QUERY ); if ( xPSet.is() ) - xPSet->getPropertyValue( ::rtl::OUString( "BasicLibraries" ) ); + xPSet->getPropertyValue( OUString( "BasicLibraries" ) ); } Reference < XDocumentHandler > xHdl( new XMLBasicExportFilter( mxHandler ) ); @@ -2201,7 +2200,7 @@ void SvXMLExport::StartElement(const OUString& rName, ++mpImpl->mDepth; // increment nesting depth counter } -void SvXMLExport::Characters(const ::rtl::OUString& rChars) +void SvXMLExport::Characters(const OUString& rChars) { if ((mnErrorFlags & ERROR_DO_NOTHING) != ERROR_DO_NOTHING) { @@ -2361,14 +2360,14 @@ SvtSaveOptions::ODFDefaultVersion SvXMLExport::getDefaultVersion() const return SvtSaveOptions::ODFVER_012; } -::rtl::OUString SvXMLExport::GetStreamName() const +OUString SvXMLExport::GetStreamName() const { return mpImpl->mStreamName; } void SvXMLExport::AddAttributeIdLegacy( - sal_uInt16 const nLegacyPrefix, ::rtl::OUString const& rValue) + sal_uInt16 const nLegacyPrefix, OUString const& rValue) { switch (getDefaultVersion()) { case SvtSaveOptions::ODFVER_011: // fall thru @@ -2399,7 +2398,7 @@ SvXMLExport::AddAttributeXmlId(uno::Reference const & i_xIfc) const beans::StringPair mdref( xMeta->getMetadataReference() ); if ( !mdref.Second.isEmpty() ) { - const ::rtl::OUString streamName( GetStreamName() ); + const OUString streamName( GetStreamName() ); if ( !streamName.isEmpty() ) { if ( streamName.equals(mdref.First) ) diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx index fd1e3b8e8867..f748d04fbbca 100644 --- a/xmloff/source/core/xmlictxt.cxx +++ b/xmloff/source/core/xmlictxt.cxx @@ -28,8 +28,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 07c1f4c8298b..b9de04c615c7 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -62,8 +62,6 @@ using ::com::sun::star::beans::XPropertySetInfo; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::osl; using namespace ::com::sun::star; @@ -269,9 +267,9 @@ public: INetURLObject aDocBase; /// name of stream in package, e.g., "content.xml" - ::rtl::OUString mStreamName; + OUString mStreamName; - ::rtl::OUString aODFVersion; + OUString aODFVersion; // Boolean, indicating that position attributes // of shapes are given in horizontal left-to-right layout. This is the case @@ -689,7 +687,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName, #ifdef TIMELOG // If we do profiling, we want a trace message for the first element // in order to identify the stream. - rtl::OString aString(rtl::OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); + OString aString(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_TRACE_AUTHOR1( "xmloff", "unknown", "SvXMLImport::StartElement( \"%s\", ... )", aString.getStr() ); @@ -1160,7 +1158,7 @@ const Reference< container::XNameContainer > & SvXMLImport::GetDashHelper() return mxDashHelper; } -sal_Bool SvXMLImport::IsPackageURL( const ::rtl::OUString& rURL ) const +sal_Bool SvXMLImport::IsPackageURL( const OUString& rURL ) const { // if, and only if, only parts are imported, then we're in a package @@ -1206,16 +1204,16 @@ sal_Bool SvXMLImport::IsPackageURL( const ::rtl::OUString& rURL ) const return sal_True; } -::rtl::OUString SvXMLImport::ResolveGraphicObjectURL( const ::rtl::OUString& rURL, +OUString SvXMLImport::ResolveGraphicObjectURL( const OUString& rURL, sal_Bool bLoadOnDemand ) { - ::rtl::OUString sRet; + OUString sRet; if( IsPackageURL( rURL ) ) { if( !bLoadOnDemand && mxGraphicResolver.is() ) { - ::rtl::OUString aTmp( msPackageProtocol ); + OUString aTmp( msPackageProtocol ); aTmp += rURL; sRet = mxGraphicResolver->resolveGraphicObjectURL( aTmp ); } @@ -1244,7 +1242,7 @@ Reference< XOutputStream > SvXMLImport::GetStreamForGraphicObjectURLFromBase64() return xOStm; } -::rtl::OUString SvXMLImport::ResolveGraphicObjectURLFromBase64( +OUString SvXMLImport::ResolveGraphicObjectURLFromBase64( const Reference < XOutputStream >& rOut ) { OUString sURL; @@ -1255,11 +1253,11 @@ Reference< XOutputStream > SvXMLImport::GetStreamForGraphicObjectURLFromBase64() return sURL; } -::rtl::OUString SvXMLImport::ResolveEmbeddedObjectURL( - const ::rtl::OUString& rURL, - const ::rtl::OUString& rClassId ) +OUString SvXMLImport::ResolveEmbeddedObjectURL( + const OUString& rURL, + const OUString& rClassId ) { - ::rtl::OUString sRet; + OUString sRet; if( IsPackageURL( rURL ) ) { @@ -1304,9 +1302,9 @@ Reference < XOutputStream > return xOLEStream; } -::rtl::OUString SvXMLImport::ResolveEmbeddedObjectURLFromBase64() +OUString SvXMLImport::ResolveEmbeddedObjectURLFromBase64() { - ::rtl::OUString sRet; + OUString sRet; if( mxEmbeddedResolver.is() ) { @@ -1373,7 +1371,7 @@ void SvXMLImport::SetConfigurationSettings(const com::sun::star::uno::Sequence& _rSettings) +void SvXMLImport::SetDocumentSpecificSettings(const OUString& _rSettingsGroupName, const uno::Sequence& _rSettings) { (void)_rSettingsGroupName; (void)_rSettings; @@ -1489,7 +1487,7 @@ void SvXMLImport::SetAutoStyles( SvXMLStylesContext *pAutoStyles ) if (pAutoStyles && mxNumberStyles.is() && (mnImportFlags & IMPORT_CONTENT) ) { uno::Reference xAttrList; - uno::Sequence< ::rtl::OUString > aNames = mxNumberStyles->getElementNames(); + uno::Sequence< OUString > aNames = mxNumberStyles->getElementNames(); sal_uInt32 nCount(aNames.getLength()); if (nCount) { @@ -1566,7 +1564,7 @@ OUString SvXMLImport::GetAbsoluteReference(const OUString& rValue) const return rValue; } -sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion ) +sal_Bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion ) { // the check returns sal_False only if the storage version could be retrieved sal_Bool bResult = sal_True; @@ -1582,7 +1580,7 @@ sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion uno::Reference< beans::XPropertySet > xStorProps( xStor, uno::UNO_QUERY_THROW ); // the check should be done only for OASIS format - ::rtl::OUString aMediaType; + OUString aMediaType; xStorProps->getPropertyValue( "MediaType" ) >>= aMediaType; if ( ::comphelper::OStorageHelper::GetXStorageFormat( xStor ) >= SOFFICE_FILEFORMAT_8 ) { @@ -1597,7 +1595,7 @@ sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion // check only if not in Repair mode if ( !bRepairPackage ) { - ::rtl::OUString aStorVersion; + OUString aStorVersion; xStorProps->getPropertyValue( "Version" ) >>= aStorVersion; @@ -1773,17 +1771,17 @@ SvXMLImport::GetComponentContext() const return mpImpl->mxComponentContext; } -::rtl::OUString SvXMLImport::GetBaseURL() const +OUString SvXMLImport::GetBaseURL() const { return mpImpl->aBaseURL.GetMainURL( INetURLObject::NO_DECODE ); } -::rtl::OUString SvXMLImport::GetDocumentBase() const +OUString SvXMLImport::GetDocumentBase() const { return mpImpl->aDocBase.GetMainURL( INetURLObject::NO_DECODE ); } -::rtl::OUString SvXMLImport::GetStreamName() const +OUString SvXMLImport::GetStreamName() const { return mpImpl->mStreamName; } @@ -1847,14 +1845,14 @@ bool SvXMLImport::isGraphicLoadOnDemandSupported() const return mbIsGraphicLoadOnDemandSupported; } -::rtl::OUString SvXMLImport::GetODFVersion() const +OUString SvXMLImport::GetODFVersion() const { return mpImpl->aODFVersion; } // xml:id for RDF metadata void SvXMLImport::SetXmlId(uno::Reference const & i_xIfc, - ::rtl::OUString const & i_rXmlId) + OUString const & i_rXmlId) { if (!i_rXmlId.isEmpty()) { try { @@ -1888,10 +1886,10 @@ SvXMLImport::GetRDFaImportHelper() void SvXMLImport::AddRDFa(uno::Reference i_xObject, - ::rtl::OUString const & i_rAbout, - ::rtl::OUString const & i_rProperty, - ::rtl::OUString const & i_rContent, - ::rtl::OUString const & i_rDatatype) + OUString const & i_rAbout, + OUString const & i_rProperty, + OUString const & i_rContent, + OUString const & i_rDatatype) { // N.B.: we only get called if i_xObject had xhtml:about attribute // (an empty attribute value is valid) diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx index e060de15c2d3..b1ad7bb1ae19 100644 --- a/xmloff/source/core/xmlmultiimagehelper.cxx +++ b/xmloff/source/core/xmlmultiimagehelper.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; namespace { - sal_uInt32 getQualityIndex(const rtl::OUString& rString) + sal_uInt32 getQualityIndex(const OUString& rString) { sal_uInt32 nRetval(0); @@ -100,7 +100,7 @@ void multiImageImportHelper::solveMultipleImages() for(a = 0; a < maImplContextVector.size(); a++) { - const rtl::OUString aStreamURL(getGraphicURLFromImportContext(**maImplContextVector[a])); + const OUString aStreamURL(getGraphicURLFromImportContext(**maImplContextVector[a])); const sal_uInt32 nNewQuality(getQualityIndex(aStreamURL)); if(nNewQuality > nBestQuality) diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx index d88c287ab4ba..1087017ca1ae 100644 --- a/xmloff/source/core/xmltkmap.cxx +++ b/xmloff/source/core/xmltkmap.cxx @@ -24,7 +24,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; class SvXMLTokenMapEntry_Impl { diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index b195b94c41ad..da73b1606aef 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -22,7 +22,6 @@ #include #include -using ::rtl::OUString; namespace xmloff { namespace token { @@ -33,7 +32,7 @@ namespace xmloff { namespace token { { sal_Int32 nLength; const sal_Char* pChar; - ::rtl::OUString* pOUString; + OUString* pOUString; #if OSL_DEBUG_LEVEL > 0 XMLTokenEnum eToken; #endif diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 604c0cd6d90b..056a5c8306e4 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -53,8 +53,6 @@ using namespace com::sun::star::style; using namespace ::com::sun::star::i18n; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 11; const sal_Int8 XML_MAXDIGITSCOUNT_DATETIME = 6; @@ -274,7 +272,7 @@ void SvXMLUnitConverter::convertDouble(OUStringBuffer& rBuffer, /** convert string to double number (using ::rtl::math) */ sal_Bool SvXMLUnitConverter::convertDouble(double& rValue, - const ::rtl::OUString& rString, sal_Bool bLookForUnits) const + const OUString& rString, sal_Bool bLookForUnits) const { if(bLookForUnits) { @@ -297,13 +295,13 @@ sal_Bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference xPropertySet = xNumberFormatsSupplier->getNumberFormatSettings(); - return xPropertySet.is() && (xPropertySet->getPropertyValue(rtl::OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate); + return xPropertySet.is() && (xPropertySet->getPropertyValue(OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate); } return sal_False; } /** convert double to ISO Date Time String */ -void SvXMLUnitConverter::convertDateTime(::rtl::OUStringBuffer& rBuffer, +void SvXMLUnitConverter::convertDateTime(OUStringBuffer& rBuffer, const double& fDateTime, bool const bAddTimeIf0AM) { convertDateTime(rBuffer, fDateTime, m_pImpl->m_aNullDate, bAddTimeIf0AM); @@ -311,7 +309,7 @@ void SvXMLUnitConverter::convertDateTime(::rtl::OUStringBuffer& rBuffer, /** convert ISO Date Time String to double */ bool SvXMLUnitConverter::convertDateTime(double& fDateTime, - const ::rtl::OUString& rString) + const OUString& rString) { return convertDateTime(fDateTime, rString, m_pImpl->m_aNullDate); } diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx index ba70abd924c5..6f9c520e0211 100644 --- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx +++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx @@ -180,7 +180,7 @@ static const TokenTable pTokenTableArray[] = { "NotFound", EAS_NotFound } }; -EnhancedCustomShapeTokenEnum EASGet( const rtl::OUString& rShapeType ) +EnhancedCustomShapeTokenEnum EASGet( const OUString& rShapeType ) { if ( !pHashMap ) { // init hash map @@ -208,12 +208,12 @@ EnhancedCustomShapeTokenEnum EASGet( const rtl::OUString& rShapeType ) return eRetValue; } -rtl::OUString EASGet( const EnhancedCustomShapeTokenEnum eToken ) +OUString EASGet( const EnhancedCustomShapeTokenEnum eToken ) { sal_uInt32 i = eToken >= EAS_Last ? (sal_uInt32)EAS_NotFound : (sal_uInt32)eToken; - return rtl::OUString::createFromAscii( pTokenTableArray[ i ].pS ); + return OUString::createFromAscii( pTokenTableArray[ i ].pS ); } } diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index f66dcd655e31..761b07005b47 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -27,8 +27,6 @@ #include "XMLShapePropertySetContext.hxx" #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 5f63f6e9a534..efa3b48c18ab 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XPropertySetInfo; using ::com::sun::star::container::XIndexContainer; @@ -102,26 +100,26 @@ class XMLImageMapObjectContext : public SvXMLImportContext protected: - const ::rtl::OUString sBoundary; - const ::rtl::OUString sCenter; - const ::rtl::OUString sTitle; - const ::rtl::OUString sDescription; - const ::rtl::OUString sImageMap; - const ::rtl::OUString sIsActive; - const ::rtl::OUString sName; - const ::rtl::OUString sPolygon; - const ::rtl::OUString sRadius; - const ::rtl::OUString sTarget; - const ::rtl::OUString sURL; + const OUString sBoundary; + const OUString sCenter; + const OUString sTitle; + const OUString sDescription; + const OUString sImageMap; + const OUString sIsActive; + const OUString sName; + const OUString sPolygon; + const OUString sRadius; + const OUString sTarget; + const OUString sURL; Reference xImageMap; /// the image map Reference xMapEntry; /// one map-entry (one area) - ::rtl::OUString sUrl; - ::rtl::OUString sTargt; - ::rtl::OUStringBuffer sDescriptionBuffer; - ::rtl::OUStringBuffer sTitleBuffer; - ::rtl::OUString sNam; + OUString sUrl; + OUString sTargt; + OUStringBuffer sDescriptionBuffer; + OUStringBuffer sTitleBuffer; + OUString sNam; sal_Bool bIsActive; sal_Bool bValid; @@ -132,7 +130,7 @@ public: XMLImageMapObjectContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap, const sal_Char* pServiceName); @@ -145,7 +143,7 @@ public: SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); @@ -153,7 +151,7 @@ protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< @@ -326,7 +324,7 @@ public: XMLImageMapRectangleContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap); @@ -335,7 +333,7 @@ public: protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< @@ -424,8 +422,8 @@ void XMLImageMapRectangleContext::Prepare( class XMLImageMapPolygonContext : public XMLImageMapObjectContext { - ::rtl::OUString sViewBoxString; - ::rtl::OUString sPointsString; + OUString sViewBoxString; + OUString sPointsString; sal_Bool bViewBoxOK; sal_Bool bPointsOK; @@ -436,7 +434,7 @@ public: XMLImageMapPolygonContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap); @@ -445,7 +443,7 @@ public: protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< @@ -537,7 +535,7 @@ public: XMLImageMapCircleContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap); @@ -546,7 +544,7 @@ public: protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 80efd4a1c955..c6e40115597a 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Sequence; diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index b748383a158f..26dd94a1063d 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -31,7 +31,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; struct SdXMLDataStyleNumber { @@ -500,26 +499,26 @@ public: SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ); virtual ~SdXMLNumberFormatMemberImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; TYPEINIT1( SdXMLNumberFormatMemberImportContext, SvXMLImportContext ); -SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) +SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpParent( pParent ), maNumberStyle( rLocalName ), @@ -561,7 +560,7 @@ SdXMLNumberFormatMemberImportContext::~SdXMLNumberFormatMemberImportContext() } SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) { return mpSlaveContext->CreateChildContext( nPrefix, rLocalName, xAttrList ); @@ -580,7 +579,7 @@ void SdXMLNumberFormatMemberImportContext::EndElement() mpParent->add( maNumberStyle, mbLong, mbTextual, mbDecimal02, maText ); } -void SdXMLNumberFormatMemberImportContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLNumberFormatMemberImportContext::Characters( const OUString& rChars ) { mpSlaveContext->Characters( rChars ); maText += rChars; @@ -589,7 +588,7 @@ void SdXMLNumberFormatMemberImportContext::Characters( const ::rtl::OUString& rC TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext ); -SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) +SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) : SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles), mbAutomatic( sal_False ), mnIndex(0), @@ -723,7 +722,7 @@ void SdXMLNumberFormatImportContext::EndElement() } } -SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLNumberFormatMemberImportContext( GetImport(), nPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nPrefix, rLocalName, xAttrList ) ); } diff --git a/xmloff/source/draw/XMLNumberStylesExport.hxx b/xmloff/source/draw/XMLNumberStylesExport.hxx index f91d0d3c7b5a..e087873b14e4 100644 --- a/xmloff/source/draw/XMLNumberStylesExport.hxx +++ b/xmloff/source/draw/XMLNumberStylesExport.hxx @@ -37,8 +37,8 @@ public: static sal_Int32 getDateStyleCount() { return SdXMLDateFormatCount; } static sal_Int32 getTimeStyleCount() { return SdXMLTimeFormatCount; } - static rtl::OUString getTimeStyleName(const sal_Int32 nTimeFormat ); - static rtl::OUString getDateStyleName(const sal_Int32 nDateFormat ); + static OUString getTimeStyleName(const sal_Int32 nTimeFormat ); + static OUString getDateStyleName(const sal_Int32 nDateFormat ); }; #endif // _XMLOFF_NUMBERSTYLESEXPORT_HXX diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index a03e74c950d2..a8c1b340555c 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -26,7 +26,6 @@ #include #include "XMLReplacementImageContext.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::makeAny; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index ae013324ab1b..22aacdf9cfdf 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -26,8 +26,6 @@ #include "sdpropls.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index ca735da1a56d..d144656e7a34 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -34,8 +34,6 @@ #include "sdpropls.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -65,7 +63,7 @@ XMLShapeStyleContext::~XMLShapeStyleContext() { } -void XMLShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void XMLShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, const OUString& rValue ) { if (m_sControlDataStyleName.isEmpty() && (::xmloff::token::GetXMLToken(::xmloff::token::XML_DATA_STYLE_NAME) == rLocalName)) { diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 8d6efb698e28..f3ba9647105e 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -67,8 +67,6 @@ #include "animations.hxx" #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -1053,7 +1051,7 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >& if( 0 == ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ) ) { // issue 146582 - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::sax::Converter::convertDuration(buf, fTemp / (24*60*60)); mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, buf.makeStringAndClear()); diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 0f237bbc6a79..67e4f44a1cc6 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -67,8 +67,6 @@ #include "animations.hxx" #include "animationimport.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -630,7 +628,7 @@ TYPEINIT1( AnimationNodeContext, SvXMLImportContext ); AnimationNodeContext::AnimationNodeContext( const Reference< XAnimationNode >& xParentNode, - SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, AnimationsImportHelperImpl* pHelper /* = NULL */ ) : SvXMLImportContext(rImport, nPrfx, rLocalName), @@ -1245,7 +1243,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : } } -SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( mxNode.is()) diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index e14541f2481e..90cc84697499 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -36,8 +36,6 @@ #include #include "anim.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 53269439fae3..f6964886d45e 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -37,8 +37,6 @@ #include "anim.hxx" #include "animimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -662,7 +660,7 @@ void XMLAnimationsEffectContext::EndElement() TYPEINIT1( XMLAnimationsContext, SvXMLImportContext ); -XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, +XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& ) : SvXMLImportContext(rImport, nPrfx, rLocalName) { @@ -674,7 +672,7 @@ XMLAnimationsContext::~XMLAnimationsContext() delete mpImpl; } -SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return new XMLAnimationsEffectContext( GetImport(), nPrefix, rLocalName, xAttrList, mpImpl ); diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index 63081f3c1be0..3d1417af3ca7 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -27,8 +27,6 @@ #include "descriptionimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -75,7 +73,7 @@ void SdXMLDescriptionContext::EndElement() // This method is called for all characters that are contained in the // current element. The default is to ignore them. -void SdXMLDescriptionContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLDescriptionContext::Characters( const OUString& rChars ) { msText += rChars; } diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index cab44cf6eaf3..5b77fa96b9c0 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -30,13 +30,13 @@ class SdXMLDescriptionContext : public SvXMLImportContext { private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; - ::rtl::OUString msText; + OUString msText; public: TYPEINFO(); SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rxShape ); virtual ~SdXMLDescriptionContext(); @@ -45,7 +45,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_EVENTIMP_HXX diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index fb711d8a1fef..ba288e63b02b 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -38,8 +38,6 @@ #include "eventimp.hxx" #include "anim.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -265,7 +263,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons } else { - const rtl::OUString &rTmp = + const OUString &rTmp = rImp.GetAbsoluteReference(sValue); INetURLObject::translateToInternal( rTmp, msBookmark, INetURLObject::DECODE_UNAMBIGUOUS, @@ -509,7 +507,7 @@ SdXMLEventsContext::~SdXMLEventsContext() { } -SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName, +SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLEventContext( GetImport(), nPrfx, rLocalName, xAttrList, mxShape ); diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx index 6663767cfc3d..8704d9978fcf 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -36,12 +36,12 @@ public: SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rxShape ); virtual ~SdXMLEventsContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index e7b0de74e955..2069915cb39e 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -28,8 +28,6 @@ #include #include "layerexp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using namespace ::cppu; diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 8404552cb551..dd5731775231 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -31,8 +31,6 @@ #include #include "layerimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #include "XMLStringBufferImportContext.hxx" @@ -55,14 +53,14 @@ public: SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager ); virtual ~SdXMLLayerContext(); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); virtual void EndElement(); private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager; - ::rtl::OUString msName; - ::rtl::OUStringBuffer sDescriptionBuffer; - ::rtl::OUStringBuffer sTitleBuffer; + OUString msName; + OUStringBuffer sDescriptionBuffer; + OUStringBuffer sTitleBuffer; }; SdXMLLayerContext::SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager ) @@ -91,7 +89,7 @@ SdXMLLayerContext::~SdXMLLayerContext() { } -SvXMLImportContext * SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& ) +SvXMLImportContext * SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& ) { if( (XML_NAMESPACE_SVG == nPrefix) && IsXMLToken(rLocalName, XML_TITLE) ) { @@ -145,7 +143,7 @@ void SdXMLLayerContext::EndElement() TYPEINIT1( SdXMLLayerSetContext, SvXMLImportContext ); -SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, +SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>&) : SvXMLImportContext(rImport, nPrfx, rLocalName) { @@ -159,7 +157,7 @@ SdXMLLayerSetContext::~SdXMLLayerSetContext() { } -SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLLayerContext( GetImport(), nPrefix, rLocalName, xAttrList, mxLayerManager ); diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx index 09464a995deb..c6754e179c04 100644 --- a/xmloff/source/draw/layerimp.hxx +++ b/xmloff/source/draw/layerimp.hxx @@ -36,11 +36,11 @@ public: SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLLayerSetContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx index c381e69be389..96043fa6be7e 100644 --- a/xmloff/source/draw/numithdl.cxx +++ b/xmloff/source/draw/numithdl.cxx @@ -41,12 +41,12 @@ bool XMLNumRulePropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const return mxNumRuleCompare.is() && mxNumRuleCompare->compare( r1, r2 ) == 0; } -sal_Bool XMLNumRulePropHdl::importXML( const ::rtl::OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +sal_Bool XMLNumRulePropHdl::importXML( const OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { return sal_False; } -sal_Bool XMLNumRulePropHdl::exportXML( ::rtl::OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +sal_Bool XMLNumRulePropHdl::exportXML( OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { return sal_False; } diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx index a9f40177452d..2acaa39bad78 100644 --- a/xmloff/source/draw/numithdl.hxx +++ b/xmloff/source/draw/numithdl.hxx @@ -37,8 +37,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; /// NumRules will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_NUMRULE_HXX diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx index 3d6dc4a59d83..51394da2e074 100644 --- a/xmloff/source/draw/propimp0.cxx +++ b/xmloff/source/draw/propimp0.cxx @@ -28,8 +28,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; @@ -247,13 +245,13 @@ XMLDateTimeFormatHdl::~XMLDateTimeFormatHdl() { } -sal_Bool XMLDateTimeFormatHdl::importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const +sal_Bool XMLDateTimeFormatHdl::importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const { rValue <<= rStrImpValue; return true; } -sal_Bool XMLDateTimeFormatHdl::exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const +sal_Bool XMLDateTimeFormatHdl::exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nNumberFormat = 0; if( mpExport && (rValue >>= nNumberFormat) ) diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx index 4ba946d66e83..0324a7e41a69 100644 --- a/xmloff/source/draw/propimp0.hxx +++ b/xmloff/source/draw/propimp0.hxx @@ -29,8 +29,8 @@ class XMLDurationPropertyHdl : public XMLPropertyHandler { public: virtual ~XMLDurationPropertyHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class SvXMLImport; @@ -41,16 +41,16 @@ private: public: XMLOpacityPropertyHdl( SvXMLImport* pImport ); virtual ~XMLOpacityPropertyHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLTextAnimationStepPropertyHdl : public XMLPropertyHandler { public: virtual ~XMLTextAnimationStepPropertyHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class SvXMLExport; @@ -62,8 +62,8 @@ private: public: XMLDateTimeFormatHdl( SvXMLExport* pExport ); virtual ~XMLDateTimeFormatHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 273517bccb0a..9fa89b35f7d7 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -68,8 +68,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -740,11 +738,11 @@ class XMLCaptionEscapeRelative : public XMLPropertyHandler { public: virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; @@ -782,11 +780,11 @@ public: XMLMoveSizeProtectHdl( sal_Int32 nType ) : mnType( nType ) {} virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; private: @@ -825,8 +823,8 @@ class XMLSdHeaderFooterVisibilityTypeHdl : public XMLPropertyHandler public: virtual ~XMLSdHeaderFooterVisibilityTypeHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl() @@ -834,7 +832,7 @@ XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl() } sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const { diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index c49200f3ff79..77bfe0053df7 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -254,9 +254,9 @@ private: SvxXMLNumRuleExport maNumRuleExp; sal_Bool mbIsInAutoStyles; - const rtl::OUString msCDATA; - const rtl::OUString msTrue; - const rtl::OUString msFalse; + const OUString msCDATA; + const OUString msTrue; + const OUString msFalse; protected: virtual void ContextFilter( @@ -291,9 +291,9 @@ class XMLPageExportPropertyMapper : public SvXMLExportPropertyMapper private: SvXMLExport& mrExport; - const rtl::OUString msCDATA; - const rtl::OUString msTrue; - const rtl::OUString msFalse; + const OUString msCDATA; + const OUString msTrue; + const OUString msFalse; protected: virtual void ContextFilter( diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 78563fb77cd7..6e86da36ed2f 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -76,8 +76,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1877,7 +1875,7 @@ void SdXMLExport::_ExportContent() OUString aBookmarkName( aBookmarkURL.copy( nIndex+1 ) ); aBookmarkURL = GetRelativeReference( aFileName ); - aBookmarkURL += rtl::OUString(static_cast('#')); + aBookmarkURL += OUString(static_cast('#')); aBookmarkURL += aBookmarkName; } diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index ccc34b204bea..506981d978f0 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -69,14 +69,14 @@ DECLARE_STL_STDKEY_SET( sal_Int32, SdXMLFormatMap ); struct HeaderFooterPageSettingsImpl { - rtl::OUString maStrHeaderDeclName; - rtl::OUString maStrFooterDeclName; - rtl::OUString maStrDateTimeDeclName; + OUString maStrHeaderDeclName; + OUString maStrFooterDeclName; + OUString maStrDateTimeDeclName; }; struct DateTimeDeclImpl { - rtl::OUString maStrText; + OUString maStrText; sal_Bool mbFixed; sal_Int32 mnFormat; }; @@ -101,17 +101,17 @@ class SdXMLExport : public SvXMLExport ImpXMLEXPPageMasterInfo* mpHandoutPageMaster; ImpXMLAutoLayoutInfoList* mpAutoLayoutInfoList; - com::sun::star::uno::Sequence< ::rtl::OUString > maDrawPagesAutoLayoutNames; + com::sun::star::uno::Sequence< OUString > maDrawPagesAutoLayoutNames; - ::std::vector< ::rtl::OUString > maDrawPagesStyleNames; - ::std::vector< ::rtl::OUString > maDrawNotesPagesStyleNames; - ::std::vector< ::rtl::OUString > maMasterPagesStyleNames; - ::rtl::OUString maHandoutMasterStyleName; + ::std::vector< OUString > maDrawPagesStyleNames; + ::std::vector< OUString > maDrawNotesPagesStyleNames; + ::std::vector< OUString > maMasterPagesStyleNames; + OUString maHandoutMasterStyleName; ::std::vector< HeaderFooterPageSettingsImpl > maDrawPagesHeaderFooterSettings; ::std::vector< HeaderFooterPageSettingsImpl > maDrawNotesPagesHeaderFooterSettings; - ::std::vector< ::rtl::OUString > maHeaderDeclsVector; - ::std::vector< ::rtl::OUString > maFooterDeclsVector; + ::std::vector< OUString > maHeaderDeclsVector; + ::std::vector< OUString > maFooterDeclsVector; ::std::vector< DateTimeDeclImpl > maDateTimeDeclsVector; HeaderFooterPageSettingsImpl maHandoutPageHeaderFooterSettings; @@ -127,12 +127,12 @@ class SdXMLExport : public SvXMLExport sal_Bool mbFamilyGraphicUsed; sal_Bool mbFamilyPresentationUsed; - const rtl::OUString msZIndex; - const rtl::OUString msEmptyPres; - const rtl::OUString msModel; - const rtl::OUString msStartShape; - const rtl::OUString msEndShape; - const rtl::OUString msPageLayoutNames; + const OUString msZIndex; + const OUString msEmptyPres; + const OUString msModel; + const OUString msStartShape; + const OUString msEndShape; + const OUString msPageLayoutNames; virtual void _ExportStyles(sal_Bool bUsed); virtual void _ExportAutoStyles(); @@ -148,14 +148,14 @@ class SdXMLExport : public SvXMLExport void ImpWritePageMasterInfos(); void ImpPrepAutoLayoutInfos(); HeaderFooterPageSettingsImpl ImpPrepDrawPageHeaderFooterDecls( const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xDrawPage ); - ImpXMLEXPPageMasterInfo* ImpGetPageMasterInfoByName(const rtl::OUString& rName); + ImpXMLEXPPageMasterInfo* ImpGetPageMasterInfoByName(const OUString& rName); void ImpPrepDrawPageInfos(); void ImpPrepMasterPageInfos(); void ImpWritePresentationStyles(); - ::rtl::OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference xDrawPage, bool bExportBackground = true ); + OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference xDrawPage, bool bExportBackground = true ); - sal_Bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, rtl::OUString& rName); + sal_Bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, OUString& rName); void ImpWriteAutoLayoutInfos(); void ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect); void ImpWriteHeaderFooterDecls(); @@ -167,7 +167,7 @@ class SdXMLExport : public SvXMLExport // #82003# helper function for recursive object count sal_uInt32 ImpRecursiveObjectCount( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xShapes); - rtl::OUString getNavigationOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); + OUString getNavigationOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); void collectAnnotationAutoStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); void exportAnnotations( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); @@ -204,10 +204,10 @@ public: virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ); virtual void exportDataStyles(); virtual void exportAutoDataStyles(); - virtual rtl::OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; + virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; // XServiceInfo ( : SvXMLExport ) - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); }; #endif // _SDXMLEXP_HXX diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 741a6852e961..afa0ea68d27d 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -48,8 +48,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -434,7 +432,7 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen if( xInfoSetInfo->hasPropertyByName( msPreview ) ) xInfoSet->getPropertyValue( msPreview ) >>= mbPreview; - ::rtl::OUString const sOrganizerMode( + OUString const sOrganizerMode( "OrganizerMode"); if (xInfoSetInfo->hasPropertyByName(sOrganizerMode)) { @@ -1011,19 +1009,19 @@ OUString SAL_CALL SdXMLImport::getImplementationName() throw( uno::RuntimeExcept } } -void SdXMLImport::AddHeaderDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ) +void SdXMLImport::AddHeaderDecl( const OUString& rName, const OUString& rText ) { if( !rName.isEmpty() && !rText.isEmpty() ) maHeaderDeclsMap[rName] = rText; } -void SdXMLImport::AddFooterDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ) +void SdXMLImport::AddFooterDecl( const OUString& rName, const OUString& rText ) { if( !rName.isEmpty() && !rText.isEmpty() ) maFooterDeclsMap[rName] = rText; } -void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText, sal_Bool bFixed, const ::rtl::OUString& rDateTimeFormat ) +void SdXMLImport::AddDateTimeDecl( const OUString& rName, const OUString& rText, sal_Bool bFixed, const OUString& rDateTimeFormat ) { if( !rName.isEmpty() && (!rText.isEmpty() || !bFixed) ) { @@ -1035,9 +1033,9 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OU } } -::rtl::OUString SdXMLImport::GetHeaderDecl( const ::rtl::OUString& rName ) const +OUString SdXMLImport::GetHeaderDecl( const OUString& rName ) const { - ::rtl::OUString aRet; + OUString aRet; HeaderFooterDeclMap::const_iterator aIter( maHeaderDeclsMap.find( rName ) ); if( aIter != maHeaderDeclsMap.end() ) aRet = (*aIter).second; @@ -1045,9 +1043,9 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OU return aRet; } -::rtl::OUString SdXMLImport::GetFooterDecl( const ::rtl::OUString& rName ) const +OUString SdXMLImport::GetFooterDecl( const OUString& rName ) const { - ::rtl::OUString aRet; + OUString aRet; HeaderFooterDeclMap::const_iterator aIter( maFooterDeclsMap.find( rName ) ); if( aIter != maFooterDeclsMap.end() ) aRet = (*aIter).second; @@ -1055,7 +1053,7 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OU return aRet; } -::rtl::OUString SdXMLImport::GetDateTimeDecl( const ::rtl::OUString& rName, sal_Bool& rbFixed, ::rtl::OUString& rDateTimeFormat ) +OUString SdXMLImport::GetDateTimeDecl( const OUString& rName, sal_Bool& rbFixed, OUString& rDateTimeFormat ) { DateTimeDeclContextImpl aDecl; diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 43ba353e17b3..1a50eb9fc799 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -166,14 +166,14 @@ class SdXMLMasterStylesContext; struct DateTimeDeclContextImpl { - rtl::OUString maStrText; + OUString maStrText; sal_Bool mbFixed; - rtl::OUString maStrDateTimeFormat; + OUString maStrDateTimeFormat; DateTimeDeclContextImpl() : mbFixed(sal_True) {} }; -DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, HeaderFooterDeclMap ); +DECLARE_STL_USTRINGACCESS_MAP( OUString, HeaderFooterDeclMap ); DECLARE_STL_USTRINGACCESS_MAP( DateTimeDeclContextImpl, DateTimeDeclMap ); ////////////////////////////////////////////////////////////////////////////// @@ -211,8 +211,8 @@ class SdXMLImport: public SvXMLImport DrawPageIdMap maDrawPageIds; - ::rtl::OUString msPageLayouts; - ::rtl::OUString msPreview; + OUString msPageLayouts; + OUString msPreview; HeaderFooterDeclMap maHeaderDeclsMap; HeaderFooterDeclMap maFooterDeclsMap; @@ -222,7 +222,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); @@ -244,18 +244,18 @@ public: // namespace office // NB: in contrast to other CreateFooContexts, this particular one handles // the root element (i.e. office:document-meta) - SvXMLImportContext* CreateMetaContext(const rtl::OUString& rLocalName, + SvXMLImportContext* CreateMetaContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLImportContext* CreateScriptContext( const ::rtl::OUString& rLocalName ); - SvXMLImportContext* CreateBodyContext(const rtl::OUString& rLocalName, + SvXMLImportContext* CreateScriptContext( const OUString& rLocalName ); + SvXMLImportContext* CreateBodyContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLStylesContext* CreateStylesContext(const rtl::OUString& rLocalName, + SvXMLStylesContext* CreateStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLStylesContext* CreateAutoStylesContext(const rtl::OUString& rLocalName, + SvXMLStylesContext* CreateAutoStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLImportContext* CreateMasterStylesContext(const rtl::OUString& rLocalName, + SvXMLImportContext* CreateMasterStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLImportContext *CreateFontDeclsContext(const ::rtl::OUString& rLocalName, + SvXMLImportContext *CreateFontDeclsContext(const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); // Styles and AutoStyles contexts @@ -300,15 +300,15 @@ public: sal_Bool IsPreview() const { return mbPreview; } // XServiceInfo ( : SvXMLExport ) - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - void AddHeaderDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ); - void AddFooterDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ); - void AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText, sal_Bool bFixed, const ::rtl::OUString& rDateTimeFormat ); + void AddHeaderDecl( const OUString& rName, const OUString& rText ); + void AddFooterDecl( const OUString& rName, const OUString& rText ); + void AddDateTimeDecl( const OUString& rName, const OUString& rText, sal_Bool bFixed, const OUString& rDateTimeFormat ); - ::rtl::OUString GetHeaderDecl( const ::rtl::OUString& rName ) const; - ::rtl::OUString GetFooterDecl( const ::rtl::OUString& rName ) const; - ::rtl::OUString GetDateTimeDecl( const ::rtl::OUString& rName, sal_Bool& rbFixed, ::rtl::OUString& rDateTimeFormat ); + OUString GetHeaderDecl( const OUString& rName ) const; + OUString GetFooterDecl( const OUString& rName ) const; + OUString GetDateTimeDecl( const OUString& rName, sal_Bool& rbFixed, OUString& rDateTimeFormat ); virtual void NotifyEmbeddedFontRead() SAL_OVERRIDE; }; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index db38c9d649c3..51f0427ea1bb 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -155,10 +155,10 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement { uno::Sequence< uno::Any > aArgument( 1 ); uno::Sequence< beans::PropertyValue > aPropValues( 2 ); - aPropValues[ 0 ].Name = rtl::OUString( "CustomShape" ); + aPropValues[ 0 ].Name = OUString( "CustomShape" ); aPropValues[ 0 ].Value <<= xShape; sal_Bool bForceGroupWithText = sal_True; - aPropValues[ 1 ].Name = rtl::OUString( "ForceGroupWithText" ); + aPropValues[ 1 ].Name = OUString( "ForceGroupWithText" ); aPropValues[ 1 ].Value <<= bForceGroupWithText; aArgument[ 0 ] <<= aPropValues; uno::Reference< uno::XInterface > xInterface( xFactory->createInstanceWithArguments( aEngine, aArgument ) ); @@ -321,7 +321,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap uno::Reference< beans::XPropertySet > xControlModel(xControl->getControl(), uno::UNO_QUERY); DBG_ASSERT(xControlModel.is(), "XMLShapeExport::collectShapeAutoStyles: no control model on the control shape!"); - ::rtl::OUString sNumberStyle = mrExport.GetFormExport()->getControlNumberStyle(xControlModel); + OUString sNumberStyle = mrExport.GetFormExport()->getControlNumberStyle(xControlModel); if (!sNumberStyle.isEmpty()) { sal_Int32 nIndex = GetPropertySetMapper()->getPropertySetMapper()->FindEntryIndex(CTF_SD_CONTROL_SHAPE_DATA_STYLE); @@ -383,7 +383,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap // * defaults for style properties are not written, but we need to write the "left", // because we need to distiguish this "left" from the case where not align attribute // is present which means "void" - static const ::rtl::OUString s_sParaAdjustPropertyName( "ParaAdjust" ); + static const OUString s_sParaAdjustPropertyName( "ParaAdjust" ); if ( xPropSetInfo->hasPropertyByName( s_sParaAdjustPropertyName ) && ( beans::PropertyState_DEFAULT_VALUE == xPropState->getPropertyState( s_sParaAdjustPropertyName ) ) ) @@ -1077,14 +1077,14 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x if(xPropSet.is()) { - rtl::OUString sCLSID; + OUString sCLSID; if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) { if (sCLSID.equals(mrExport.GetChartExport()->getChartCLSID())) { eShapeType = XmlShapeTypeDrawChartShape; } - else if (sCLSID.equals(rtl::OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName()))) + else if (sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName()))) { eShapeType = XmlShapeTypeDrawSheetShape; } @@ -1127,7 +1127,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x if(xPropSet.is()) try { - rtl::OUString sCLSID; + OUString sCLSID; if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) { if( sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())) ) diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 4f00fe33305a..58cb26e03d1a 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -53,8 +53,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -226,7 +224,7 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR ////////////////////////////////////////////////////////////////////////////// -sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const rtl::OUString& rClass ) +sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const OUString& rClass ) { sal_Bool bIsEmpty = sal_False; @@ -1143,12 +1141,12 @@ void XMLShapeExport::ImpExportGraphicObjectShape( xPropSet->getPropertyValue( OUString("GraphicURL")) >>= sImageURL; OUString aResolveURL( sImageURL ); - const rtl::OUString sPackageURL( "vnd.sun.star.Package:" ); + const OUString sPackageURL( "vnd.sun.star.Package:" ); // sj: trying to preserve the filename if ( aStreamURL.match( sPackageURL, 0 ) ) { - rtl::OUString sRequestedName( aStreamURL.copy( sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) ); + OUString sRequestedName( aStreamURL.copy( sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) ); sal_Int32 nLastIndex = sRequestedName.lastIndexOf( '/' ) + 1; if ( ( nLastIndex > 0 ) && ( nLastIndex < sRequestedName.getLength() ) ) sRequestedName = sRequestedName.copy( nLastIndex, sRequestedName.getLength() - nLastIndex ); @@ -1717,9 +1715,9 @@ void XMLShapeExport::ImpExportOLE2Shape( // this is an alien object ( currently MSOLE is the only supported type of such objects ) // in case it is not an OASIS format the object should be asked to store replacement image if possible - ::rtl::OUString sURLRequest( sURL ); + OUString sURLRequest( sURL ); if ( ( mrExport.getExportFlags() & EXPORT_OASIS ) == 0 ) - sURLRequest += ::rtl::OUString( "?oasis=false" ); + sURLRequest += OUString( "?oasis=false" ); mrExport.AddEmbeddedObjectAsBase64( sURLRequest ); } } @@ -1987,7 +1985,7 @@ void XMLShapeExport::ImpExportPluginShape( static void lcl_CopyStream( uno::Reference const& xInStream, uno::Reference const& xTarget, - ::rtl::OUString const& rPath) + OUString const& rPath) { ::comphelper::LifecycleProxy proxy; uno::Reference const xStream( @@ -1999,19 +1997,19 @@ static void lcl_CopyStream( { SAL_WARN("xmloff", "no output stream"); throw uno::Exception( - ::rtl::OUString("no output stream"),0); + OUString("no output stream"),0); } uno::Reference< beans::XPropertySet > const xStreamProps(xStream, uno::UNO_QUERY); if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage xStreamProps->setPropertyValue( - ::rtl::OUString("MediaType"), - uno::makeAny(::rtl::OUString( + OUString("MediaType"), + uno::makeAny(OUString( //FIXME how to detect real media type? //but currently xmloff has this one hardcoded anyway... "application/vnd.sun.star.media"))); xStreamProps->setPropertyValue( // turn off compression - ::rtl::OUString("Compressed"), + OUString("Compressed"), uno::makeAny(sal_False)); } ::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream); @@ -2021,10 +2019,10 @@ static void lcl_CopyStream( static char const s_PkgScheme[] = "vnd.sun.star.Package:"; -static ::rtl::OUString +static OUString lcl_StoreMediaAndGetURL(SvXMLExport & rExport, uno::Reference const& xPropSet, - ::rtl::OUString const& rURL) + OUString const& rURL) { if (0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( rURL.getStr(), rURL.getLength(), @@ -2036,16 +2034,16 @@ lcl_StoreMediaAndGetURL(SvXMLExport & rExport, rExport.GetTargetStorage(), uno::UNO_QUERY_THROW); uno::Reference xInStream; xPropSet->getPropertyValue( - ::rtl::OUString("PrivateStream")) + OUString("PrivateStream")) >>= xInStream; if (!xInStream.is()) { SAL_WARN("xmloff", "no input stream"); - return ::rtl::OUString(); + return OUString(); } - ::rtl::OUString const urlPath( + OUString const urlPath( rURL.copy(SAL_N_ELEMENTS(s_PkgScheme)-1)); lcl_CopyStream(xInStream, xTarget, rURL); @@ -2057,7 +2055,7 @@ lcl_StoreMediaAndGetURL(SvXMLExport & rExport, SAL_INFO("xmloff", "exception while storing embedded media: '" << e.Message << "'"); } - return ::rtl::OUString(); + return OUString(); } else { diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx index 9b5df3529e06..2cd8574b8754 100644 --- a/xmloff/source/draw/shapeexport3.cxx +++ b/xmloff/source/draw/shapeexport3.cxx @@ -41,8 +41,6 @@ #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 7e21572c7d83..fb411104985a 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -43,8 +43,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; @@ -993,7 +991,7 @@ void XMLShapeImportHelper::shapeWithZIndexAdded( com::sun::star::uno::Reference< void XMLShapeImportHelper::addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape, sal_Bool bStart, - const rtl::OUString& rDestShapeId, + const OUString& rDestShapeId, sal_Int32 nDestGlueId ) { ConnectionHint aHint; diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 9d30a46b82ba..2bed18d85f32 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -33,8 +33,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; @@ -150,7 +148,7 @@ void Imp_PutNumberCharWithSpace(OUString& rStr, sal_Int32 nValue) const sal_Int32 aLen(rStr.getLength()); if(aLen) if(Imp_IsOnNumberChar(rStr, aLen - 1, false) && nValue >= 0) - rStr += rtl::OUString(static_cast(' ')); + rStr += OUString(static_cast(' ')); Imp_PutNumberChar(rStr, nValue); } @@ -1348,12 +1346,12 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints, // X and comma Imp_PutNumberChar(aNewString, nX); - aNewString += rtl::OUString(static_cast(',')); + aNewString += OUString(static_cast(',')); // Y and space (not for last) Imp_PutNumberChar(aNewString, nY); if(a + 1 != nCnt) - aNewString += rtl::OUString(static_cast(' ')); + aNewString += OUString(static_cast(' ')); // next point pArray++; @@ -1817,7 +1815,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('t')) - aNewString += rtl::OUString(static_cast('t')); + aNewString += OUString(static_cast('t')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -1827,7 +1825,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('T')) - aNewString += rtl::OUString(static_cast('T')); + aNewString += OUString(static_cast('T')); Imp_PutNumberCharWithSpace(aNewString, nX); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -1847,7 +1845,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('q')) - aNewString += rtl::OUString(static_cast('q')); + aNewString += OUString(static_cast('q')); Imp_PutNumberCharWithSpace(aNewString, nX1 - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY1 - mnLastY); @@ -1859,7 +1857,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('Q')) - aNewString += rtl::OUString(static_cast('Q')); + aNewString += OUString(static_cast('Q')); Imp_PutNumberCharWithSpace(aNewString, nX1); Imp_PutNumberCharWithSpace(aNewString, nY1); @@ -1906,7 +1904,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('s')) - aNewString += rtl::OUString(static_cast('s')); + aNewString += OUString(static_cast('s')); Imp_PutNumberCharWithSpace(aNewString, nX2 - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY2 - mnLastY); @@ -1918,7 +1916,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('S')) - aNewString += rtl::OUString(static_cast('S')); + aNewString += OUString(static_cast('S')); Imp_PutNumberCharWithSpace(aNewString, nX2); Imp_PutNumberCharWithSpace(aNewString, nY2); @@ -1940,7 +1938,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('c')) - aNewString += rtl::OUString(static_cast('c')); + aNewString += OUString(static_cast('c')); Imp_PutNumberCharWithSpace(aNewString, nX1 - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY1 - mnLastY); @@ -1954,7 +1952,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('C')) - aNewString += rtl::OUString(static_cast('C')); + aNewString += OUString(static_cast('C')); Imp_PutNumberCharWithSpace(aNewString, nX1); Imp_PutNumberCharWithSpace(aNewString, nY1); @@ -1996,7 +1994,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('v')) - aNewString += rtl::OUString(static_cast('v')); + aNewString += OUString(static_cast('v')); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -2005,7 +2003,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('V')) - aNewString += rtl::OUString(static_cast('V')); + aNewString += OUString(static_cast('V')); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -2017,7 +2015,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('h')) - aNewString += rtl::OUString(static_cast('h')); + aNewString += OUString(static_cast('h')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); @@ -2026,7 +2024,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('H')) - aNewString += rtl::OUString(static_cast('H')); + aNewString += OUString(static_cast('H')); Imp_PutNumberCharWithSpace(aNewString, nX); @@ -2038,7 +2036,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('l')) - aNewString += rtl::OUString(static_cast('l')); + aNewString += OUString(static_cast('l')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -2048,7 +2046,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('L')) - aNewString += rtl::OUString(static_cast('L')); + aNewString += OUString(static_cast('L')); Imp_PutNumberCharWithSpace(aNewString, nX); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -2062,7 +2060,7 @@ void SdXMLImExSvgDElement::AddPolygon( // write as start point if(mbRelative) { - aNewString += rtl::OUString(static_cast('m')); + aNewString += OUString(static_cast('m')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -2071,7 +2069,7 @@ void SdXMLImExSvgDElement::AddPolygon( } else { - aNewString += rtl::OUString(static_cast('M')); + aNewString += OUString(static_cast('M')); Imp_PutNumberCharWithSpace(aNewString, nX); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -2099,9 +2097,9 @@ void SdXMLImExSvgDElement::AddPolygon( if(bClosed) { if(mbRelative) - aNewString += rtl::OUString(static_cast('z')); + aNewString += OUString(static_cast('z')); else - aNewString += rtl::OUString(static_cast('Z')); + aNewString += OUString(static_cast('Z')); // update current point - we're back at the start if( bDidWriteStart ) diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 2da5687532b0..da119f19dd6c 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -32,8 +32,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index e35b14c7cebd..42dcde876762 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -46,7 +46,7 @@ public: SdXML3DObjectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -70,7 +70,7 @@ public: TYPEINFO(); SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -94,7 +94,7 @@ public: TYPEINFO(); SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -109,14 +109,14 @@ public: class SdXML3DPolygonBasedShapeContext : public SdXML3DObjectContext { - rtl::OUString maPoints; - rtl::OUString maViewBox; + OUString maPoints; + OUString maViewBox; public: TYPEINFO(); SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -135,7 +135,7 @@ public: TYPEINFO(); SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -154,7 +154,7 @@ public: TYPEINFO(); SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 4bfaa552f691..6eac43a8cc4e 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -30,8 +30,6 @@ #include "eventimp.hxx" #include "descriptionimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -42,7 +40,7 @@ using namespace ::xmloff::token; SdXML3DLightContext::SdXML3DLightContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName), maDiffuseColor(0x00000000), @@ -243,7 +241,7 @@ SdXML3DSceneAttributesHelper::~SdXML3DSceneAttributesHelper() } /** creates a 3d ligth context and adds it to the internal list for later processing */ -SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uInt16 nPrfx, const rtl::OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) +SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) { SvXMLImportContext* pContext = new SdXML3DLightContext(mrImport, nPrfx, rLName, xAttrList); @@ -258,7 +256,7 @@ SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uIn } /** this should be called for each scene attribute */ -void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DR3D == nPrefix ) { diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index d1a32bfd21b0..8eea3ac00d27 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -49,7 +49,7 @@ public: SdXML3DSceneShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -59,7 +59,7 @@ public: virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() const diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index dc4f534836ef..4f0ac3300fe9 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -37,8 +37,6 @@ #include "PropertySetMerger.hxx" #include "animationimport.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx index a4a8fd542087..2e6b3b8d6337 100644 --- a/xmloff/source/draw/ximpbody.hxx +++ b/xmloff/source/draw/ximpbody.hxx @@ -30,21 +30,21 @@ class SdXMLDrawPageContext : public SdXMLGenericPageContext { - rtl::OUString maName; - rtl::OUString maMasterPageName; - rtl::OUString maStyleName; - rtl::OUString maHREF; + OUString maName; + OUString maMasterPageName; + OUString maStyleName; + OUString maHREF; bool mbHadSMILNodes; public: SdXMLDrawPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); virtual ~SdXMLDrawPageContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -59,11 +59,11 @@ class SdXMLBodyContext : public SvXMLImportContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName ); + SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName ); virtual ~SdXMLBodyContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 1a280ef14347..5dd0f00ef5e9 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -55,7 +55,7 @@ TYPEINIT1( XMLEnhancedCustomShapeContext, SvXMLImportContext ); XMLEnhancedCustomShapeContext::XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), mrUnitConverter( rImport.GetMM100UnitConverter() ), @@ -73,7 +73,7 @@ const SvXMLEnumMapEntry aXML_GluePointEnumMap[] = { XML_TOKEN_INVALID, 0 } }; void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { bool bAttrBool; if (::sax::Converter::convertBool( bAttrBool, rValue )) @@ -86,7 +86,7 @@ void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nAttrNumber; if (::sax::Converter::convertNumber( nAttrNumber, rValue )) @@ -99,7 +99,7 @@ void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { double fAttrDouble; if (::sax::Converter::convertDouble( fAttrDouble, rValue )) @@ -112,7 +112,7 @@ void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDistance( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { double fAttrDouble; sal_Int16 const eSrcUnit( ::sax::Converter::GetUnitFromString( @@ -128,7 +128,7 @@ void GetDistance( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { beans::PropertyValue aProp; aProp.Name = EASGet( eDestProp ); @@ -137,7 +137,7 @@ void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, const SvXMLEnumMapEntry& rMap ) { sal_uInt16 eKind; @@ -152,7 +152,7 @@ void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int16 const eSrcUnit = ::sax::Converter::GetUnitFromString( rValue, util::MeasureUnit::MM_100TH); @@ -172,7 +172,7 @@ void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& r } void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { ::basegfx::B3DVector aB3DVector; if ( SvXMLUnitConverter::convertB3DVector( aB3DVector, rValue ) ) @@ -185,7 +185,7 @@ void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -sal_Bool GetEquationName( const rtl::OUString& rEquation, const sal_Int32 nStart, rtl::OUString& rEquationName ) +sal_Bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUString& rEquationName ) { sal_Int32 nIndex = nStart; while( nIndex < rEquation.getLength() ) @@ -208,7 +208,7 @@ sal_Bool GetEquationName( const rtl::OUString& rEquation, const sal_Int32 nStart return bValid; } -sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const rtl::OUString& rParaString ) +sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) { if ( nIndex >= rParaString.getLength() ) return sal_False; @@ -228,7 +228,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter { nIndex++; bNumberRequired = sal_False; - rtl::OUString aEquationName; + OUString aEquationName; bValid = GetEquationName( rParaString, nIndex, aEquationName ); if ( bValid ) { @@ -397,7 +397,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter bValid = sal_False; if ( bValid ) { - rtl::OUString aNumber( rParaString.copy( nStartIndex, nIndex - nStartIndex ) ); + OUString aNumber( rParaString.copy( nStartIndex, nIndex - nStartIndex ) ); if ( bE || bDot ) { double fAttrDouble; @@ -426,7 +426,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter } void GetPosition3D( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:extrusion-viewpoint - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, SvXMLUnitConverter& rUnitConverter ) { drawing::Position3D aPosition3D; @@ -440,14 +440,14 @@ void GetPosition3D( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDoubleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:glue-point-leaving-directions - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< double > vDirection; sal_Int32 nIndex = 0; do { double fAttrDouble; - rtl::OUString aToken( rValue.getToken( 0, ',', nIndex ) ); + OUString aToken( rValue.getToken( 0, ',', nIndex ) ); if (!::sax::Converter::convertDouble( fAttrDouble, aToken )) break; else @@ -473,14 +473,14 @@ void GetDoubleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDe } void GetSizeSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< sal_Int32 > vNum; sal_Int32 nIndex = 0; do { sal_Int32 n; - rtl::OUString aToken( rValue.getToken( 0, ' ', nIndex ) ); + OUString aToken( rValue.getToken( 0, ' ', nIndex ) ); if (!::sax::Converter::convertNumber( n, aToken )) break; else @@ -510,7 +510,7 @@ void GetSizeSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest } void GetEnhancedParameter( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nIndex = 0; com::sun::star::drawing::EnhancedCustomShapeParameter aParameter; @@ -524,7 +524,7 @@ void GetEnhancedParameter( std::vector< com::sun::star::beans::PropertyValue >& } void GetEnhancedParameterPair( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nIndex = 0; com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair; @@ -539,7 +539,7 @@ void GetEnhancedParameterPair( std::vector< com::sun::star::beans::PropertyValue } sal_Int32 GetEnhancedParameterPairSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:glue-points - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vParameter; com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameter; @@ -569,7 +569,7 @@ sal_Int32 GetEnhancedParameterPairSequence( std::vector< com::sun::star::beans:: } void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:text-areas - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeTextFrame > vTextFrame; com::sun::star::drawing::EnhancedCustomShapeTextFrame aParameter; @@ -601,7 +601,7 @@ void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyV } void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:enhanced-path - const rtl::OUString& rValue ) + const OUString& rValue ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vCoordinates; std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment > vSegments; @@ -855,7 +855,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest } void GetAdjustmentValues( std::vector< com::sun::star::beans::PropertyValue >& rDest, // draw:adjustments - const rtl::OUString& rValue ) + const OUString& rValue ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > vAdjustmentValue; com::sun::star::drawing::EnhancedCustomShapeParameter aParameter; @@ -900,8 +900,8 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax sal_Int32 nAttrNumber; for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { - rtl::OUString aLocalName; - const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr ); + OUString aLocalName; + const OUString& rValue = xAttrList->getValueByIndex( nAttr ); /* sven fixme, this must be checked! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName ); switch( EASGet( aLocalName ) ) @@ -959,7 +959,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax ::sax::Converter::GetUnitFromString( rValue, util::MeasureUnit::MM_100TH)); - rtl::OUStringBuffer aUnitStr; + OUStringBuffer aUnitStr; double fFactor = ::sax::Converter::GetConversionFactor( aUnitStr, util::MeasureUnit::MM_100TH, eSrcUnit); if ( ( fFactor != 1.0 ) && ( fFactor != 0.0 ) ) @@ -1153,7 +1153,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, const std::vector< beans::PropertyValues >& rElement, - const rtl::OUString& rElementName ) + const OUString& rElementName ) { if ( !rElement.empty() ) { @@ -1173,15 +1173,15 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, - const std::vector< rtl::OUString >& rElement, - const rtl::OUString& rElementName ) + const std::vector< OUString >& rElement, + const OUString& rElementName ) { if ( !rElement.empty() ) { - uno::Sequence< rtl::OUString > aPropSeq( rElement.size() ); - std::vector< rtl::OUString >::const_iterator aIter = rElement.begin(); - std::vector< rtl::OUString >::const_iterator aEnd = rElement.end(); - rtl::OUString* pValues = aPropSeq.getArray(); + uno::Sequence< OUString > aPropSeq( rElement.size() ); + std::vector< OUString >::const_iterator aIter = rElement.begin(); + std::vector< OUString >::const_iterator aEnd = rElement.end(); + OUString* pValues = aPropSeq.getArray(); while ( aIter != aEnd ) *pValues++ = *aIter++; @@ -1195,7 +1195,7 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, const std::vector< com::sun::star::beans::PropertyValue >& rElement, - const rtl::OUString& rElementName ) + const OUString& rElementName ) { if ( !rElement.empty() ) { @@ -1214,15 +1214,15 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, OUStringEqFunc> EquationHashMap; +typedef boost::unordered_map< OUString, sal_Int32, OUStringHash, OUStringEqFunc> EquationHashMap; /* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation - will be converted from rtl::OUString to index */ + will be converted from OUString to index */ void CheckAndResolveEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rPara, EquationHashMap* pH ) { if ( rPara.Type == com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION ) { - rtl::OUString aEquationName; + OUString aEquationName; if ( rPara.Value >>= aEquationName ) { sal_Int32 nIndex = 0; @@ -1241,8 +1241,8 @@ void XMLEnhancedCustomShapeContext::EndElement() { // creating hash map containing the name and index of each equation EquationHashMap* pH = new EquationHashMap; - std::vector< rtl::OUString >::iterator aEquationNameIter = maEquationNames.begin(); - std::vector< rtl::OUString >::iterator aEquationNameEnd = maEquationNames.end(); + std::vector< OUString >::iterator aEquationNameIter = maEquationNames.begin(); + std::vector< OUString >::iterator aEquationNameEnd = maEquationNames.end(); while( aEquationNameIter != aEquationNameEnd ) { (*pH)[ *aEquationNameIter ] = (sal_Int32)( aEquationNameIter - maEquationNames.begin() ); @@ -1250,8 +1250,8 @@ void XMLEnhancedCustomShapeContext::EndElement() } // resolve equation - std::vector< rtl::OUString >::iterator aEquationIter = maEquations.begin(); - std::vector< rtl::OUString >::iterator aEquationEnd = maEquations.end(); + std::vector< OUString >::iterator aEquationIter = maEquations.begin(); + std::vector< OUString >::iterator aEquationEnd = maEquations.end(); while( aEquationIter != aEquationEnd ) { sal_Int32 nIndexOf = 0; @@ -1260,16 +1260,16 @@ void XMLEnhancedCustomShapeContext::EndElement() nIndexOf = aEquationIter->indexOf( '?', nIndexOf ); if ( nIndexOf != -1 ) { - rtl::OUString aEquationName; + OUString aEquationName; if ( GetEquationName( *aEquationIter, nIndexOf + 1, aEquationName ) ) { // copying first characters inclusive '?' - rtl::OUString aNew( aEquationIter->copy( 0, nIndexOf + 1 ) ); + OUString aNew( aEquationIter->copy( 0, nIndexOf + 1 ) ); sal_Int32 nIndex = 0; EquationHashMap::iterator aHashIter( pH->find( aEquationName ) ); if ( aHashIter != pH->end() ) nIndex = (*aHashIter).second; - aNew += rtl::OUString::valueOf( nIndex ); + aNew += OUString::valueOf( nIndex ); aNew += aEquationIter->copy( nIndexOf + aEquationName.getLength() + 1 ); *aEquationIter = aNew; } @@ -1368,7 +1368,7 @@ void XMLEnhancedCustomShapeContext::EndElement() SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maHandles, EASGet( EAS_Handles ) ); } -SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const rtl::OUString& rLocalName, +SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList> & xAttrList ) { EnhancedCustomShapeTokenEnum aTokenEnum = EASGet( rLocalName ); @@ -1377,12 +1377,12 @@ SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt1 sal_Int16 nLength = xAttrList->getLength(); if ( nLength ) { - rtl::OUString aFormula; - rtl::OUString aFormulaName; + OUString aFormula; + OUString aFormulaName; for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { - rtl::OUString aLocalName; - const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr ); + OUString aLocalName; + const OUString& rValue = xAttrList->getValueByIndex( nAttr ); /* fixme sven, this needs to be chekced! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName ); switch( EASGet( aLocalName ) ) @@ -1410,8 +1410,8 @@ SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt1 const sal_Int16 nLength = xAttrList->getLength(); for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { - rtl::OUString aLocalName; - const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr ); + OUString aLocalName; + const OUString& rValue = xAttrList->getValueByIndex( nAttr ); /* fixme sven, this needs to be chekced! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName ); switch( EASGet( aLocalName ) ) { diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index 1c0e4f28cfdd..008ba4a08da7 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -46,20 +46,20 @@ class XMLEnhancedCustomShapeContext : public SvXMLImportContext std::vector< com::sun::star::beans::PropertyValue > maPath; std::vector< com::sun::star::beans::PropertyValue > maTextPath; std::vector< com::sun::star::beans::PropertyValues > maHandles; - std::vector< rtl::OUString > maEquations; - std::vector< rtl::OUString > maEquationNames; + std::vector< OUString > maEquations; + std::vector< OUString > maEquationNames; public: TYPEINFO(); XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ); + const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 513b39d27728..8747bdadb58c 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -24,8 +24,6 @@ #include "eventimp.hxx" #include "descriptionimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index bfae703b22e5..b24414e91cb6 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -42,14 +42,14 @@ protected: public: TYPEINFO(); - SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); virtual ~SdXMLGroupShapeContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual void EndElement(); diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx index c277a907d353..92f99c004c28 100644 --- a/xmloff/source/draw/ximplink.cxx +++ b/xmloff/source/draw/ximplink.cxx @@ -21,8 +21,6 @@ #include "ximplink.hxx" #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index 3b60b21b2c04..d2d33779787e 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -37,18 +37,18 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext { // the parent shape group this link is placed in com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxParent; - rtl::OUString msHyperlink; + OUString msHyperlink; public: TYPEINFO(); - SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); virtual ~SdXMLShapeLinkContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual void EndElement(); diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx index b92a14fcf37d..52f90ad8f02e 100644 --- a/xmloff/source/draw/ximpnote.cxx +++ b/xmloff/source/draw/ximpnote.cxx @@ -20,8 +20,6 @@ #include "ximpnote.hxx" #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx index 1f013726357e..89ec7e3163b5 100644 --- a/xmloff/source/draw/ximpnote.hxx +++ b/xmloff/source/draw/ximpnote.hxx @@ -31,17 +31,17 @@ class SdXMLNotesContext : public SdXMLGenericPageContext { private: - rtl::OUString msPageMasterName; + OUString msPageMasterName; public: SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); virtual ~SdXMLNotesContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); }; diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 576b543d6fdf..3a9c5ab0db0d 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -38,8 +38,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -63,7 +61,7 @@ class DrawAnnotationContext : public SvXMLImportContext public: DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess ); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); private: @@ -360,7 +358,7 @@ void SdXMLGenericPageContext::EndElement() SetNavigationOrder(); } -void SdXMLGenericPageContext::SetStyle( rtl::OUString& rStyleName ) +void SdXMLGenericPageContext::SetStyle( OUString& rStyleName ) { // set PageProperties? if(!rStyleName.isEmpty()) diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx index 486846f55855..cb5b01a63035 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -38,17 +38,17 @@ class SdXMLGenericPageContext : public SvXMLImportContext ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationAccess > mxAnnotationAccess; protected: - rtl::OUString maPageLayoutName; - rtl::OUString maUseHeaderDeclName; - rtl::OUString maUseFooterDeclName; - rtl::OUString maUseDateTimeDeclName; - rtl::OUString msNavOrder; + OUString maPageLayoutName; + OUString maUseHeaderDeclName; + OUString maUseFooterDeclName; + OUString maUseDateTimeDeclName; + OUString msNavOrder; void SetLocalShapesContext(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rNew) { mxShapes = rNew; } /** sets the page style on this page */ - void SetStyle( rtl::OUString& rStyleName ); + void SetStyle( OUString& rStyleName ); /** sets the presentation layout at this page. It is used for drawing pages and for the handout master */ void SetLayout(); @@ -60,21 +60,21 @@ protected: SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } /** sets the properties from a page master style with the given name on this contexts page */ - void SetPageMaster( rtl::OUString& rsPageMasterName ); + void SetPageMaster( OUString& rsPageMasterName ); void SetNavigationOrder(); public: TYPEINFO(); - SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); virtual ~SdXMLGenericPageContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index c38f45faf326..f853c3ddc895 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -77,8 +77,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -117,7 +115,7 @@ SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[] = //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -static bool ImpIsEmptyURL( const ::rtl::OUString& rURL ) +static bool ImpIsEmptyURL( const OUString& rURL ) { if( rURL.isEmpty() ) return true; @@ -364,7 +362,7 @@ void SdXMLShapeContext::EndElement() { uno::Reference< beans::XPropertySet > xProp( mxShape, uno::UNO_QUERY ); - rtl::OUString sLink( "Hyperlink" ); + OUString sLink( "Hyperlink" ); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName( sLink ) ) xProp->setPropertyValue( sLink, uno::Any( msHyperlink ) ); Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY_THROW ); @@ -443,10 +441,10 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) { uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY_THROW ); if( !mbVisible ) - xSet->setPropertyValue( rtl::OUString( "Visible" ), uno::Any( sal_False ) ); + xSet->setPropertyValue( OUString( "Visible" ), uno::Any( sal_False ) ); if( !mbPrintable ) - xSet->setPropertyValue( rtl::OUString( "Printable" ), uno::Any( sal_False ) ); + xSet->setPropertyValue( OUString( "Printable" ), uno::Any( sal_False ) ); } catch(const Exception&) { @@ -511,7 +509,7 @@ void SdXMLShapeContext::AddShape(const char* pServiceName ) } catch(const uno::Exception& e) { - uno::Sequence aSeq( 1 ); + uno::Sequence aSeq( 1 ); aSeq[0] = OUString::createFromAscii(pServiceName); GetImport().SetError( XMLERROR_FLAG_ERROR | XMLERROR_API, aSeq, e.Message, NULL ); @@ -782,7 +780,7 @@ void SdXMLShapeContext::SetThumbnail() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { bool bHaveXmlId( false ); if( (XML_NAMESPACE_DRAW == nPrefix) || (XML_NAMESPACE_DRAW_EXT == nPrefix) ) @@ -945,7 +943,7 @@ SdXMLRectShapeContext::~SdXMLRectShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -1023,7 +1021,7 @@ SdXMLLineShapeContext::~SdXMLLineShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1152,7 +1150,7 @@ SdXMLEllipseShapeContext::~SdXMLEllipseShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1274,7 +1272,7 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1373,7 +1371,7 @@ SdXMLPathShapeContext::~SdXMLPathShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1507,7 +1505,7 @@ SdXMLTextBoxShapeContext::~SdXMLTextBoxShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -1681,7 +1679,7 @@ SdXMLControlShapeContext::~SdXMLControlShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -1761,7 +1759,7 @@ SdXMLConnectorShapeContext::~SdXMLConnectorShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -1994,7 +1992,7 @@ SdXMLMeasureShapeContext::~SdXMLMeasureShapeContext() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -2114,7 +2112,7 @@ SdXMLPageShapeContext::~SdXMLPageShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -2267,7 +2265,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -2313,7 +2311,7 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_XLINK == nPrefix ) { @@ -2438,7 +2436,7 @@ void SdXMLGraphicObjectShapeContext::EndElement() ////////////////////////////////////////////////////////////////////////////// SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -2567,13 +2565,13 @@ void SdXMLChartShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -void SdXMLChartShapeContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLChartShapeContext::Characters( const OUString& rChars ) { if( mpChartContext ) mpChartContext->Characters( rChars ); } -SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( mpChartContext ) @@ -2587,7 +2585,7 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre TYPEINIT1( SdXMLObjectShapeContext, SdXMLShapeContext ); SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) @@ -2731,7 +2729,7 @@ void SdXMLObjectShapeContext::EndElement() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -2755,7 +2753,7 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl: } SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference& xAttrList ) { // #100592# @@ -2804,7 +2802,7 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( TYPEINIT1( SdXMLAppletShapeContext, SdXMLShapeContext ); SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) @@ -2833,7 +2831,7 @@ void SdXMLAppletShapeContext::StartElement( const ::com::sun::star::uno::Referen } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -2912,7 +2910,7 @@ void SdXMLAppletShapeContext::EndElement() xProps->setPropertyValue( OUString( "AppletCode" ), aAny ); } - aAny <<= ::rtl::OUString( GetImport().GetDocumentBase() ); + aAny <<= OUString( GetImport().GetDocumentBase() ); xProps->setPropertyValue( OUString( "AppletDocBase" ), aAny ); SetThumbnail(); @@ -2921,7 +2919,7 @@ void SdXMLAppletShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -2969,7 +2967,7 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n TYPEINIT1( SdXMLPluginShapeContext, SdXMLShapeContext ); SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) : @@ -3049,12 +3047,12 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen } } -static ::rtl::OUString -lcl_GetMediaReference(SvXMLImport const& rImport, ::rtl::OUString const& rURL) +static OUString +lcl_GetMediaReference(SvXMLImport const& rImport, OUString const& rURL) { if (rImport.IsPackageURL(rURL)) { - return ::rtl::OUString( "vnd.sun.star.Package:") + rURL; + return OUString( "vnd.sun.star.Package:") + rURL; } else { @@ -3063,7 +3061,7 @@ lcl_GetMediaReference(SvXMLImport const& rImport, ::rtl::OUString const& rURL) } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -3096,7 +3094,7 @@ void SdXMLPluginShapeContext::EndElement() if ( maSize.Width && maSize.Height ) { - const rtl::OUString sVisibleArea( "VisibleArea" ); + const OUString sVisibleArea( "VisibleArea" ); uno::Reference< beans::XPropertySetInfo > aXPropSetInfo( xProps->getPropertySetInfo() ); if ( !aXPropSetInfo.is() || aXPropSetInfo->hasPropertyByName( sVisibleArea ) ) { @@ -3197,7 +3195,7 @@ void SdXMLPluginShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -3245,7 +3243,7 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n TYPEINIT1( SdXMLFloatingFrameShapeContext, SdXMLShapeContext ); SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) @@ -3294,7 +3292,7 @@ void SdXMLFloatingFrameShapeContext::StartElement( const ::com::sun::star::uno:: } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLFloatingFrameShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLFloatingFrameShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -3342,7 +3340,7 @@ void SdXMLFloatingFrameShapeContext::EndElement() TYPEINIT1( SdXMLFrameShapeContext, SdXMLShapeContext ); SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) @@ -3400,9 +3398,9 @@ void SdXMLFrameShapeContext::removeGraphicFromImportContext(const SvXMLImportCon } } -rtl::OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const +OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const { - rtl::OUString aRetval; + OUString aRetval; const SdXMLGraphicObjectShapeContext* pSdXMLGraphicObjectShapeContext = dynamic_cast< const SdXMLGraphicObjectShapeContext* >(&rContext); if(pSdXMLGraphicObjectShapeContext) @@ -3591,7 +3589,7 @@ void SdXMLFrameShapeContext::EndElement() } void SdXMLFrameShapeContext::processAttribute( sal_uInt16, - const ::rtl::OUString&, const ::rtl::OUString& ) + const OUString&, const OUString& ) { // ignore } @@ -3618,7 +3616,7 @@ SdXMLCustomShapeContext::~SdXMLCustomShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLCustomShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLCustomShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -3682,7 +3680,7 @@ void SdXMLCustomShapeContext::EndElement() { if ( !maCustomShapeGeometry.empty() ) { - const rtl::OUString sCustomShapeGeometry ( "CustomShapeGeometry" ); + const OUString sCustomShapeGeometry ( "CustomShapeGeometry" ); // converting the vector to a sequence uno::Sequence< beans::PropertyValue > aSeq( maCustomShapeGeometry.size() ); @@ -3715,7 +3713,7 @@ void SdXMLCustomShapeContext::EndElement() Reference< drawing::XEnhancedCustomShapeDefaulter > xDefaulter( mxShape, UNO_QUERY ); if( xDefaulter.is() ) { - rtl::OUString aEmptyType; + OUString aEmptyType; xDefaulter->createCustomShapeDefaults( aEmptyType ); } } @@ -3727,7 +3725,7 @@ void SdXMLCustomShapeContext::EndElement() ////////////////////////////////////////////////////////////////////////////// SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -3753,7 +3751,7 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( TYPEINIT1( SdXMLTableShapeContext, SdXMLShapeContext ); -SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) +SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, sal_False ) { memset( &maTemplateStylesUsed, 0, sizeof( maTemplateStylesUsed ) ); @@ -3865,7 +3863,7 @@ void SdXMLTableShapeContext::EndElement() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( nPrefix == XML_NAMESPACE_TABLE ) { @@ -3893,7 +3891,7 @@ void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:: SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference& xAttrList ) +SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference& xAttrList ) { if( mxTableImportContext.Is() && (nPrefix == XML_NAMESPACE_TABLE) ) return mxTableImportContext->CreateChildContext(nPrefix, rLocalName, xAttrList); diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 56c428c55188..951fe905c426 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -50,11 +50,11 @@ protected: com::sun::star::uno::Reference< com::sun::star::container::XIdentifierContainer > mxGluePoints; com::sun::star::uno::Reference< com::sun::star::document::XActionLockable > mxLockable; - rtl::OUString maDrawStyleName; - rtl::OUString maTextStyleName; - rtl::OUString maPresentationClass; - rtl::OUString maShapeName; - rtl::OUString maThumbnailURL; + OUString maDrawStyleName; + OUString maTextStyleName; + OUString maPresentationClass; + OUString maShapeName; + OUString maThumbnailURL; /// whether to restore list context (#91964#) bool mbListContextPushed; @@ -65,12 +65,12 @@ protected: bool mbClearDefaultAttributes; sal_Bool mbIsUserTransformed; sal_Int32 mnZOrder; - rtl::OUString maShapeId; - rtl::OUString maLayerName; + OUString maShapeId; + OUString maLayerName; // #i68101# - rtl::OUString maShapeTitle; - rtl::OUString maShapeDescription; + OUString maShapeTitle; + OUString maShapeDescription; SdXMLImExTransform2D mnTransform; com::sun::star::awt::Size maSize; @@ -100,7 +100,7 @@ public: SdXMLShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -109,11 +109,11 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -127,7 +127,7 @@ public: TYPEINFO(); SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -135,7 +135,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -152,7 +152,7 @@ public: TYPEINFO(); SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -160,7 +160,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -180,7 +180,7 @@ public: TYPEINFO(); SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -188,7 +188,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -196,22 +196,22 @@ public: class SdXMLPolygonShapeContext : public SdXMLShapeContext { - rtl::OUString maPoints; - rtl::OUString maViewBox; + OUString maPoints; + OUString maViewBox; sal_Bool mbClosed; public: TYPEINFO(); SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bClosed, sal_Bool bTemporaryShape); virtual ~SdXMLPolygonShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -219,14 +219,14 @@ public: class SdXMLPathShapeContext : public SdXMLShapeContext { - rtl::OUString maD; - rtl::OUString maViewBox; + OUString maD; + OUString maViewBox; public: TYPEINFO(); SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -234,7 +234,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -248,7 +248,7 @@ public: TYPEINFO(); SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -256,7 +256,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -265,13 +265,13 @@ public: class SdXMLControlShapeContext : public SdXMLShapeContext { private: - rtl::OUString maFormId; + OUString maFormId; public: TYPEINFO(); SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -279,7 +279,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -293,9 +293,9 @@ private: sal_uInt16 mnType; - rtl::OUString maStartShapeId; + OUString maStartShapeId; sal_Int32 mnStartGlueId; - rtl::OUString maEndShapeId; + OUString maEndShapeId; sal_Int32 mnEndGlueId; sal_Int32 mnDelta1; @@ -308,7 +308,7 @@ public: TYPEINFO(); SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -316,7 +316,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -332,7 +332,7 @@ public: TYPEINFO(); SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -341,7 +341,7 @@ public: virtual void EndElement(); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -355,7 +355,7 @@ public: TYPEINFO(); SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -363,7 +363,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -379,7 +379,7 @@ public: TYPEINFO(); SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -387,7 +387,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -396,14 +396,14 @@ public: class SdXMLGraphicObjectShapeContext : public SdXMLShapeContext { private: - ::rtl::OUString maURL; + OUString maURL; ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: TYPEINFO(); SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -411,11 +411,11 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -429,7 +429,7 @@ public: TYPEINFO(); SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -437,8 +437,8 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual void Characters( const OUString& rChars ); + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; @@ -448,8 +448,8 @@ public: class SdXMLObjectShapeContext : public SdXMLShapeContext { private: - rtl::OUString maCLSID; - rtl::OUString maHref; + OUString maCLSID; + OUString maHref; // #100592# ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; @@ -458,7 +458,7 @@ public: TYPEINFO(); SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -468,11 +468,11 @@ public: virtual void EndElement(); // #100592# - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -481,9 +481,9 @@ public: class SdXMLAppletShapeContext : public SdXMLShapeContext { private: - rtl::OUString maAppletName; - rtl::OUString maAppletCode; - rtl::OUString maHref; + OUString maAppletName; + OUString maAppletCode; + OUString maHref; sal_Bool mbIsScript; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; @@ -492,7 +492,7 @@ public: TYPEINFO(); SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -501,11 +501,11 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -514,8 +514,8 @@ public: class SdXMLPluginShapeContext : public SdXMLShapeContext { private: - rtl::OUString maMimeType; - rtl::OUString maHref; + OUString maMimeType; + OUString maHref; bool mbMedia; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; @@ -524,7 +524,7 @@ public: TYPEINFO(); SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -533,11 +533,11 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -546,14 +546,14 @@ public: class SdXMLFloatingFrameShapeContext : public SdXMLShapeContext { private: - rtl::OUString maFrameName; - rtl::OUString maHref; + OUString maFrameName; + OUString maHref; public: TYPEINFO(); SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -563,7 +563,7 @@ public: virtual void EndElement(); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -578,26 +578,26 @@ private: protected: /// helper to get the created xShape instance, needs to be overloaded - virtual rtl::OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const; + virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const; virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const; public: TYPEINFO(); SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); virtual ~SdXMLFrameShapeContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; class SdXMLCustomShapeContext : public SdXMLShapeContext @@ -605,8 +605,8 @@ class SdXMLCustomShapeContext : public SdXMLShapeContext protected : - rtl::OUString maCustomShapeEngine; - rtl::OUString maCustomShapeData; + OUString maCustomShapeEngine; + OUString maCustomShapeData; std::vector< com::sun::star::beans::PropertyValue > maCustomShapeGeometry; @@ -614,7 +614,7 @@ public: TYPEINFO(); - SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape); @@ -623,11 +623,11 @@ public: virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -639,7 +639,7 @@ public: TYPEINFO(); SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ); virtual ~SdXMLTableShapeContext(); @@ -647,14 +647,14 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); private: SvXMLImportContextRef mxTableImportContext; - rtl::OUString msTemplateStyleName; + OUString msTemplateStyleName; sal_Bool maTemplateStylesUsed[6]; }; diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index fe6ebd919781..d80c71d43ecb 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -34,8 +34,6 @@ #include #include "ximpshow.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index 116bb8eebb2b..a6190f0c6de8 100644 --- a/xmloff/source/draw/ximpshow.hxx +++ b/xmloff/source/draw/ximpshow.hxx @@ -37,11 +37,11 @@ public: SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLShowsContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 61c1a48cd461..db902df9a80a 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -45,8 +45,6 @@ #include "XMLNumberStylesImport.hxx" #include "xmloff/xmlerror.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -62,7 +60,7 @@ public: TYPEINFO(); SdXMLDrawingPagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProps, @@ -72,7 +70,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp); @@ -143,7 +141,7 @@ public: SdXMLDrawingPageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID); @@ -151,7 +149,7 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void Finish( sal_Bool bOverwrite ); @@ -1270,8 +1268,8 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co try { uno::Reference< container::XNameAccess > xMasterPageStyles( rStyleFamilies->getByName(rMaster.GetDisplayName()), UNO_QUERY_THROW ); - rtl::OUString sPrefix(rMaster.GetDisplayName()); - sPrefix += rtl::OUString(static_cast('-')); + OUString sPrefix(rMaster.GetDisplayName()); + sPrefix += OUString(static_cast('-')); ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix); } catch (const uno::Exception&) @@ -1291,7 +1289,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles() const const OUString sGraphicStyleName(OUString("graphics")); uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sGraphicStyleName), uno::UNO_QUERY_THROW ); - ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, rtl::OUString()); + ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, OUString()); } catch( uno::Exception& ) { @@ -1306,7 +1304,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const const OUString sCellStyleName(OUString("cell")); uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sCellStyleName), uno::UNO_QUERY_THROW ); - ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, rtl::OUString()); + ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, OUString()); } catch( uno::Exception& ) { @@ -1317,7 +1315,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const ////////////////////////////////////////////////////////////////////////////// // help function used by ImpSetGraphicStyles() and ImpSetMasterPageStyles() // -void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const rtl::OUString& rPrefix) const +void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const OUString& rPrefix) const { sal_Int32 nPrefLen(rPrefix.getLength()); @@ -1449,7 +1447,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc if(xStyle.is()) { // set parent style name - ::rtl::OUString sParentStyleDisplayName( const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() ) ); + OUString sParentStyleDisplayName( const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() ) ); if( nPrefLen ) { sal_Int32 nStylePrefLen = sParentStyleDisplayName.lastIndexOf( sal_Unicode('-') ) + 1; @@ -1498,7 +1496,7 @@ TYPEINIT1( SdXMLMasterStylesContext, SvXMLImportContext ); SdXMLMasterStylesContext::SdXMLMasterStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName) + const OUString& rLName) : SvXMLImportContext( rImport, nPrfx, rLName) { } @@ -1512,7 +1510,7 @@ SdXMLMasterStylesContext::~SdXMLMasterStylesContext() SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList) { SvXMLImportContext* pContext = 0; @@ -1586,7 +1584,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( /////////////////////////////////////////////////////////////////////// SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList ) { @@ -1640,7 +1638,7 @@ void SdXMLHeaderFooterDeclContext::EndElement() } } -void SdXMLHeaderFooterDeclContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLHeaderFooterDeclContext::Characters( const OUString& rChars ) { maStrText += rChars; } diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index 05e13038ded7..3b572bfc5223 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -52,7 +52,7 @@ public: SdXMLPageMasterStyleContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPageMasterStyleContext(); @@ -70,7 +70,7 @@ public: class SdXMLPageMasterContext: public SvXMLStyleContext { - rtl::OUString msName; + OUString msName; SdXMLPageMasterStyleContext*mpPageMasterStyle; const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); } @@ -82,15 +82,15 @@ public: SdXMLPageMasterContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPageMasterContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); - const rtl::OUString& GetName() const { return msName; } + const OUString& GetName() const { return msName; } const SdXMLPageMasterStyleContext* GetPageMasterStyle() const { return mpPageMasterStyle; } }; @@ -99,10 +99,10 @@ public: class SdXMLMasterPageContext: public SdXMLGenericPageContext { - rtl::OUString msPageMasterName; - rtl::OUString msName; - rtl::OUString msDisplayName; - rtl::OUString msStyleName; + OUString msPageMasterName; + OUString msName; + OUString msDisplayName; + OUString msStyleName; public: TYPEINFO(); @@ -110,20 +110,20 @@ public: SdXMLMasterPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); virtual ~SdXMLMasterPageContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - const rtl::OUString& GetPageMasterName() const { return msPageMasterName; } - const rtl::OUString& GetEncodedName() const { return msName; } - const rtl::OUString& GetDisplayName() const { return msDisplayName; } + const OUString& GetPageMasterName() const { return msPageMasterName; } + const OUString& GetEncodedName() const { return msName; } + const OUString& GetDisplayName() const { return msDisplayName; } }; typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList; @@ -133,7 +133,7 @@ typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList; class SdXMLPresentationPlaceholderContext: public SvXMLImportContext { - rtl::OUString msName; + OUString msName; sal_Int32 mnX; sal_Int32 mnY; sal_Int32 mnWidth; @@ -146,11 +146,11 @@ public: SdXMLPresentationPlaceholderContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPresentationPlaceholderContext(); - const rtl::OUString& GetName() const { return msName; } + const OUString& GetName() const { return msName; } sal_Int32 GetX() const { return mnX; } sal_Int32 GetY() const { return mnY; } sal_Int32 GetWidth() const { return mnWidth; } @@ -163,7 +163,7 @@ typedef ::std::vector< SdXMLPresentationPlaceholderContext* > ImpPlaceholderList class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext { - rtl::OUString msName; + OUString msName; ImpPlaceholderList maList; sal_uInt16 mnTypeId; @@ -176,12 +176,12 @@ public: SdXMLPresentationPageLayoutContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPresentationPageLayoutContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -204,23 +204,23 @@ class SdXMLStylesContext : public SvXMLStylesContext void ImpSetGraphicStyles() const; void ImpSetCellStyles() const; void ImpSetGraphicStyles( com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xPageStyles, - sal_uInt16 nFamily, const rtl::OUString& rPrefix) const; + sal_uInt16 nFamily, const OUString& rPrefix) const; protected: virtual SvXMLStyleContext* CreateStyleChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -229,12 +229,12 @@ public: SdXMLStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_Bool bIsAutoStyle); virtual ~SdXMLStylesContext(); - virtual sal_uInt16 GetFamily( const rtl::OUString& rFamily ) const; + virtual sal_uInt16 GetFamily( const OUString& rFamily ) const; virtual void EndElement(); virtual UniReference< SvXMLImportPropertyMapper > GetImportPropertyMapper(sal_uInt16 nFamily) const; @@ -259,12 +259,12 @@ public: SdXMLMasterStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName); + const OUString& rLName); virtual ~SdXMLMasterStylesContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); const ImpMasterPageList& GetMasterPageList() const { return maMasterPageList; } @@ -277,17 +277,17 @@ class SdXMLHeaderFooterDeclContext : public SvXMLStyleContext { public: SdXMLHeaderFooterDeclContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual sal_Bool IsTransient() const; virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); private: - ::rtl::OUString maStrName; - ::rtl::OUString maStrText; - ::rtl::OUString maStrDateTimeFormat; + OUString maStrName; + OUString maStrText; + OUString maStrDateTimeFormat; sal_Bool mbFixed; }; diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx index 8d74287dd640..37a965967046 100644 --- a/xmloff/source/forms/attriblistmerge.cxx +++ b/xmloff/source/forms/attriblistmerge.cxx @@ -60,7 +60,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OAttribListMerger::seekToName(const ::rtl::OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) + sal_Bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) { for ( ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin(); aLookupSublist != m_aLists.end(); @@ -91,37 +91,37 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToIndex(i, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); return xSubList->getNameByIndex(nLocalIndex); } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToIndex(i, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); return xSubList->getTypeByIndex(nLocalIndex); } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getTypeByName( const ::rtl::OUString& _rName ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getTypeByName( const OUString& _rName ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToName(_rName, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); // though we're in getTypeByName here, we reroute this to the getTypeByIndex of the sub list, // assuming that this is faster @@ -129,25 +129,25 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToIndex(i, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); return xSubList->getValueByIndex(nLocalIndex); } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getValueByName( const ::rtl::OUString& _rName ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getValueByName( const OUString& _rName ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToName(_rName, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); // though we're in getValueByName here, we reroute this to the getValueByIndex of the sub list, // assuming that this is faster diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index 8b80bf2638fd..8cdd67642e24 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -57,15 +57,15 @@ namespace xmloff // XAttributeList virtual sal_Int16 SAL_CALL getLength( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTypeByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTypeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValueByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValueByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNameByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTypeByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTypeByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getValueByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); protected: sal_Bool seekToIndex(sal_Int16 _nGlobalIndex, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); - sal_Bool seekToName(const ::rtl::OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); + sal_Bool seekToName(const OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); }; diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx index 77ad6ccfeed1..311846b11131 100644 --- a/xmloff/source/forms/callbacks.hxx +++ b/xmloff/source/forms/callbacks.hxx @@ -48,7 +48,7 @@ namespace xmloff virtual void exportCollectionElements( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxCollection) = 0; - virtual ::rtl::OUString getObjectStyleName( + virtual OUString getObjectStyleName( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) = 0; protected: diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index 15b96431a2be..d89f2eb23bc6 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -143,9 +143,9 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlTextEmphasisHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlTextEmphasisHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { - ::rtl::OUStringBuffer aReturn; + OUStringBuffer aReturn; sal_Bool bSuccess = sal_False; sal_Int16 nFontEmphasis = sal_Int16(); if (_rValue >>= nFontEmphasis) @@ -170,7 +170,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlTextEmphasisHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlTextEmphasisHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { sal_Bool bSuccess = sal_True; sal_uInt16 nEmphasis = awt::FontEmphasisMark::NONE; @@ -178,7 +178,7 @@ namespace xmloff sal_Bool bBelow = sal_False; sal_Bool bHasPos = sal_False, bHasType = sal_False; - ::rtl::OUString sToken; + OUString sToken; SvXMLTokenEnumerator aTokenEnum(_rStrImpValue); while (aTokenEnum.getNextToken(sToken)) { @@ -228,9 +228,9 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlBorderHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlBorderHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { - ::rtl::OUString sToken; + OUString sToken; SvXMLTokenEnumerator aTokens(_rStrImpValue); sal_uInt16 nStyle = 1; @@ -266,11 +266,11 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlBorderHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlBorderHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { sal_Bool bSuccess = sal_False; - ::rtl::OUStringBuffer aOut; + OUStringBuffer aOut; switch ( m_eFacet ) { case STYLE: @@ -311,7 +311,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OFontWidthHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OFontWidthHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { sal_Int32 nWidth = 0; bool const bSuccess = ::sax::Converter::convertMeasure( @@ -323,10 +323,10 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OFontWidthHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OFontWidthHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { sal_Int16 nWidth = 0; - ::rtl::OUStringBuffer aResult; + OUStringBuffer aResult; if (_rValue >>= nWidth) { ::sax::Converter::convertMeasure(aResult, nWidth, @@ -346,7 +346,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool ORotationAngleHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool ORotationAngleHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { double fValue; bool const bSucces = @@ -361,14 +361,14 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool ORotationAngleHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool ORotationAngleHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { float fAngle = 0; sal_Bool bSuccess = (_rValue >>= fAngle); if (bSuccess) { - rtl::OUStringBuffer sValue; + OUStringBuffer sValue; ::sax::Converter::convertDouble(sValue, ((double)fAngle) / 10); _rStrExpValue = sValue.makeStringAndClear(); } diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 768c76a02158..bc53c1e213bb 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -173,13 +173,13 @@ namespace xmloff return; } - ::rtl::OUString sServiceName = xPersistence->getServiceName(); + OUString sServiceName = xPersistence->getServiceName(); // we don't want to write the old service name directly: it's a name used for compatibility reasons, but // as we start some kind of new file format here (with this xml export), we don't care about // compatibility ... // So we translate the old persistence service name into new ones, if possible - ::rtl::OUString sToWriteServiceName = sServiceName; + OUString sToWriteServiceName = sServiceName; #define CHECK_N_TRANSLATE( name ) \ else if (sServiceName.equals(SERVICE_PERSISTENT_COMPONENT_##name)) \ sToWriteServiceName = SERVICE_##name @@ -247,7 +247,7 @@ namespace xmloff //===================================================================== //--------------------------------------------------------------------- OControlExport::OControlExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, - const ::rtl::OUString& _rControlId, const ::rtl::OUString& _rReferringControls, + const OUString& _rControlId, const OUString& _rReferringControls, const Sequence< ScriptEventDescriptor >& _rEvents) :OElementExport(_rContext, _rxControl, _rEvents) ,m_sControlId(_rControlId) @@ -358,14 +358,14 @@ namespace xmloff const XMLPropertyMapEntry* pCharAttributeProperties = XMLTextPropertySetMapper::getPropertyMapForType( TEXT_PROP_MAP_TEXT ); while ( pCharAttributeProperties->msApiName ) { - exportedProperty( ::rtl::OUString::createFromAscii( pCharAttributeProperties->msApiName ) ); + exportedProperty( OUString::createFromAscii( pCharAttributeProperties->msApiName ) ); ++pCharAttributeProperties; } const XMLPropertyMapEntry* pParaAttributeProperties = XMLTextPropertySetMapper::getPropertyMapForType( TEXT_PROP_MAP_SHAPE_PARA ); while ( pParaAttributeProperties->msApiName ) { - exportedProperty( ::rtl::OUString::createFromAscii( pParaAttributeProperties->msApiName ) ); + exportedProperty( OUString::createFromAscii( pParaAttributeProperties->msApiName ) ); ++pParaAttributeProperties; } @@ -421,7 +421,7 @@ namespace xmloff break; case COMBOBOX: { // a combox box description has sub elements: the items - DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< ::rtl::OUString > ); + DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< OUString > ); // don't export the list entries if the are not provided by the user, but obtained implicitly // from other sources @@ -429,10 +429,10 @@ namespace xmloff if ( controlHasUserSuppliedListEntries() ) { // get the item list - Sequence< ::rtl::OUString > aListItems; + Sequence< OUString > aListItems; m_xProps->getPropertyValue(PROPERTY_STRING_ITEM_LIST) >>= aListItems; // loop through it and write the sub elements - const ::rtl::OUString* pListItems = aListItems.getConstArray(); + const OUString* pListItems = aListItems.getConstArray(); for (sal_Int32 i=0; ipropertyGroup == NO_GROUP ) { // that's a property which has a direct mapping to an attribute @@ -571,7 +571,7 @@ namespace xmloff CCA_LABEL, CCA_TITLE }; // the names of all properties which are expected to be of type string - static ::rtl::OUString aStringPropertyNames[] = + static OUString aStringPropertyNames[] = { OUString(PROPERTY_LABEL), OUString(PROPERTY_TITLE) }; @@ -746,7 +746,7 @@ namespace xmloff // However, if the model has a property "PersistenceMaxTextLength", then we prefer this // determine the name of the property to export - ::rtl::OUString sTextLenPropertyName( PROPERTY_MAXTEXTLENGTH ); + OUString sTextLenPropertyName( PROPERTY_MAXTEXTLENGTH ); if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_PERSISTENCE_MAXTEXTLENGTH ) ) sTextLenPropertyName = PROPERTY_PERSISTENCE_MAXTEXTLENGTH; @@ -823,7 +823,7 @@ namespace xmloff // don't export the current-value if this value originates from a data binding // #i26944# if ( controlHasActiveDataBinding() ) - exportedProperty( ::rtl::OUString::createFromAscii( pCurrentValuePropertyName ) ); + exportedProperty( OUString::createFromAscii( pCurrentValuePropertyName ) ); else exportGenericPropertyAttribute( nCurrentValueAttributeNamespaceKey, @@ -1078,7 +1078,7 @@ namespace xmloff if ( SCA_STEP_SIZE & m_nIncludeSpecial ) { - ::rtl::OUString sPropertyName; + OUString sPropertyName; if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_LINE_INCREMENT ) ) sPropertyName = PROPERTY_LINE_INCREMENT; else if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_SPIN_INCREMENT ) ) @@ -1152,7 +1152,7 @@ namespace xmloff aDuration.Seconds = aTime.GetSec(); aDuration.MilliSeconds = nRepeatDelay % 1000; - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::sax::Converter::convertDuration(buf, aDuration); AddAttribute(OAttributeMetaData::getSpecialAttributeNamespace( SCA_REPEAT_DELAY ) ,OAttributeMetaData::getSpecialAttributeName( SCA_REPEAT_DELAY ) @@ -1177,7 +1177,7 @@ namespace xmloff m_xProps->getPropertyValue(PROPERTY_ECHO_CHAR) >>= nValue; if (nValue) { - ::rtl::OUString sCharacter(reinterpret_cast(&nValue), 1); + OUString sCharacter(reinterpret_cast(&nValue), 1); AddAttribute( OAttributeMetaData::getSpecialAttributeNamespace(SCA_ECHO_CHAR), OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR), @@ -1276,13 +1276,13 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OControlExport::getScalarListSourceValue() const + OUString OControlExport::getScalarListSourceValue() const { - ::rtl::OUString sListSource; + OUString sListSource; Any aListSource = m_xProps->getPropertyValue( PROPERTY_LISTSOURCE ); if ( !( aListSource >>= sListSource ) ) { - Sequence< ::rtl::OUString > aListSourceSequence; + Sequence< OUString > aListSourceSequence; aListSource >>= aListSourceSequence; if ( aListSourceSequence.getLength() ) sListSource = aListSourceSequence[ 0 ]; @@ -1296,7 +1296,7 @@ namespace xmloff // DA_LIST_SOURCE needs some special handling DBG_CHECK_PROPERTY_NO_TYPE( PROPERTY_LISTSOURCE ); - ::rtl::OUString sListSource = getScalarListSourceValue(); + OUString sListSource = getScalarListSourceValue(); if ( !sListSource.isEmpty() ) { // the ListSource property needs to be exported as attribute, and it is not empty AddAttribute( @@ -1309,7 +1309,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlExport::getSequenceInt16PropertyAsSet(const ::rtl::OUString& _rPropertyName, Int16Set& _rOut) + void OControlExport::getSequenceInt16PropertyAsSet(const OUString& _rPropertyName, Int16Set& _rOut) { Sequence< sal_Int16 > aValueSequence; DBG_CHECK_PROPERTY(_rPropertyName, Sequence< sal_Int16 >); @@ -1324,11 +1324,11 @@ namespace xmloff void OControlExport::exportListSourceAsElements() { // the string lists - Sequence< ::rtl::OUString > aItems, aValues; - DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< ::rtl::OUString > ); + Sequence< OUString > aItems, aValues; + DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< OUString > ); m_xProps->getPropertyValue(PROPERTY_STRING_ITEM_LIST) >>= aItems; - DBG_CHECK_PROPERTY( PROPERTY_LISTSOURCE, Sequence< ::rtl::OUString > ); + DBG_CHECK_PROPERTY( PROPERTY_LISTSOURCE, Sequence< OUString > ); if ( 0 == ( m_nIncludeDatabase & DA_LIST_SOURCE ) ) m_xProps->getPropertyValue(PROPERTY_LISTSOURCE) >>= aValues; // if we exported the list source as attribute, we do not repeat it as sub elements @@ -1339,14 +1339,14 @@ namespace xmloff getSequenceInt16PropertyAsSet(PROPERTY_DEFAULT_SELECT_SEQ, aDefaultSelection); // the string for "true" - ::rtl::OUString sTrue; - ::rtl::OUStringBuffer sBuffer; + OUString sTrue; + OUStringBuffer sBuffer; ::sax::Converter::convertBool(sBuffer, true); sTrue = sBuffer.makeStringAndClear(); // loop through both lists ('til the maximum of both lengths) - const ::rtl::OUString* pItems = aItems.getConstArray(); - const ::rtl::OUString* pValues = aValues.getConstArray(); + const OUString* pItems = aItems.getConstArray(); + const OUString* pValues = aValues.getConstArray(); sal_Int32 nItems = aItems.getLength(); sal_Int32 nValues = aValues.getLength(); @@ -1842,7 +1842,7 @@ namespace xmloff { sal_Int16 nLinkageType = aHelper.isCellIntegerBinding( xBinding ) ? 1 : 0; - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; m_rContext.getGlobalContext().GetMM100UnitConverter().convertEnum( sBuffer, (sal_uInt16)nLinkageType, @@ -1867,19 +1867,19 @@ namespace xmloff //--------------------------------------------------------------------- void OControlExport::exportXFormsBindAttributes() { - rtl::OUString sBindName = getXFormsBindName( m_xProps ); + OUString sBindName = getXFormsBindName( m_xProps ); AddAttribute( XML_NAMESPACE_XFORMS, XML_BIND, sBindName ); } //--------------------------------------------------------------------- void OControlExport::exportXFormsListAttributes() { - rtl::OUString sBindName = getXFormsListBindName( m_xProps ); + OUString sBindName = getXFormsListBindName( m_xProps ); AddAttribute( XML_NAMESPACE_FORM, XML_XFORMS_LIST_SOURCE, sBindName ); } //--------------------------------------------------------------------- void OControlExport::exportXFormsSubmissionAttributes() { - rtl::OUString sSubmission = getXFormsSubmissionName( m_xProps ); + OUString sSubmission = getXFormsSubmissionName( m_xProps ); AddAttribute( XML_NAMESPACE_FORM, XML_XFORMS_SUBMISSION, sSubmission ); } //--------------------------------------------------------------------- @@ -1963,7 +1963,7 @@ namespace xmloff try { // currently exchanging the data with a database column? - ::rtl::OUString sBoundFieldPropertyName( "BoundField" ); + OUString sBoundFieldPropertyName( "BoundField" ); if ( m_xPropertyInfo.is() && m_xPropertyInfo->hasPropertyByName( sBoundFieldPropertyName ) ) { Reference< XPropertySet > xBoundField; @@ -2022,9 +2022,9 @@ namespace xmloff //= OColumnExport //===================================================================== //--------------------------------------------------------------------- - OColumnExport::OColumnExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, const ::rtl::OUString& _rControlId, + OColumnExport::OColumnExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, const OUString& _rControlId, const Sequence< ScriptEventDescriptor >& _rEvents) - :OControlExport(_rContext, _rxControl, _rControlId, ::rtl::OUString(), _rEvents) + :OControlExport(_rContext, _rxControl, _rControlId, OUString(), _rEvents) { } @@ -2038,8 +2038,8 @@ namespace xmloff void OColumnExport::exportServiceNameAttribute() { // the attribute "service name" (which has a slightly different meaning for columns - DBG_CHECK_PROPERTY( PROPERTY_COLUMNSERVICENAME, ::rtl::OUString ); - ::rtl::OUString sColumnServiceName; + DBG_CHECK_PROPERTY( PROPERTY_COLUMNSERVICENAME, OUString ); + OUString sColumnServiceName; m_xProps->getPropertyValue(PROPERTY_COLUMNSERVICENAME) >>= sColumnServiceName; // the service name is a full qualified one (i.e. com.sun.star.form.TextField), but the // real service name for the column (for use with the XGridColumnFactory) is only the last @@ -2077,7 +2077,7 @@ namespace xmloff PROPERTY_LABEL); // the style attribute - ::rtl::OUString sStyleName = m_rContext.getObjectStyleName( m_xProps ); + OUString sStyleName = m_rContext.getObjectStyleName( m_xProps ); if ( !sStyleName.isEmpty() ) { AddAttribute( @@ -2126,7 +2126,7 @@ namespace xmloff if ( m_bCreateConnectionResourceElement && m_xProps.is() ) { m_rContext.getGlobalContext().ClearAttrList(); - ::rtl::OUString sPropValue; + OUString sPropValue; m_xProps->getPropertyValue( PROPERTY_DATASOURCENAME ) >>= sPropValue; // if set it is a file url if ( sPropValue.isEmpty() ) m_xProps->getPropertyValue( PROPERTY_URL ) >>= sPropValue; @@ -2163,7 +2163,7 @@ namespace xmloff { faName, /*faAction,*/ faCommand, faFilter, faOrder }; - static ::rtl::OUString aStringPropertyNames[] = + static OUString aStringPropertyNames[] = { OUString(PROPERTY_NAME), /*OUString(PROPERTY_TARGETURL),*/ OUString(PROPERTY_COMMAND), OUString(PROPERTY_FILTER), OUString(PROPERTY_ORDER) }; @@ -2182,7 +2182,7 @@ namespace xmloff // #i112082# xlink:type is added as part of exportTargetLocationAttribute // now export the data source name or databaselocation or connection resource - ::rtl::OUString sPropValue; + OUString sPropValue; m_xProps->getPropertyValue( PROPERTY_DATASOURCENAME ) >>= sPropValue; m_bCreateConnectionResourceElement = sPropValue.isEmpty(); if ( !m_bCreateConnectionResourceElement ) diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index 2da6cd91ccd8..d4b3e0a90476 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -92,8 +92,8 @@ namespace xmloff DECLARE_STL_STDKEY_SET(sal_Int16, Int16Set); // used below - ::rtl::OUString m_sControlId; // the control id to use when exporting - ::rtl::OUString m_sReferringControls; // list of referring controls (i.e. their id's) + OUString m_sControlId; // the control id to use when exporting + OUString m_sReferringControls; // list of referring controls (i.e. their id's) sal_Int16 m_nClassId; // class id of the control we're representing ElementType m_eType; // (XML) type of the control we're representing sal_Int32 m_nIncludeCommon; // common control attributes to include @@ -118,8 +118,8 @@ namespace xmloff */ OControlExport(IFormsExportContext& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rControlId, - const ::rtl::OUString& _rReferringControls, + const OUString& _rControlId, + const OUString& _rReferringControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents); ~OControlExport(); @@ -207,7 +207,7 @@ namespace xmloff @param _rOut out parameter. The set of integers. */ - void getSequenceInt16PropertyAsSet(const ::rtl::OUString& _rPropertyName, Int16Set& _rOut); + void getSequenceInt16PropertyAsSet(const OUString& _rPropertyName, Int16Set& _rOut); /** exports the attribute which descrives a cell value binding of a control in a spreadsheet document @@ -244,7 +244,7 @@ namespace xmloff /** retrieves the string specifying the ListSource of a list or combo box */ - ::rtl::OUString getScalarListSourceValue() const; + OUString getScalarListSourceValue() const; /** determines whether the list entries (of a combo or list box) are supplied by the user @@ -272,7 +272,7 @@ namespace xmloff */ OColumnExport(IFormsExportContext& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rControlId, + const OUString& _rControlId, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents); ~OColumnExport(); diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 7c01677cbb0f..9e2bb7ef6742 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -88,13 +88,13 @@ namespace xmloff }; //===================================================================== - struct PropertyValueCompare : public ::std::binary_function< PropertyValue, ::rtl::OUString, bool> + struct PropertyValueCompare : public ::std::binary_function< PropertyValue, OUString, bool> { - bool operator() (const PropertyValue& lhs, const ::rtl::OUString& rhs) const + bool operator() (const PropertyValue& lhs, const OUString& rhs) const { return lhs.Name == rhs; } - bool operator() (const ::rtl::OUString& lhs, const PropertyValue& rhs) const + bool operator() (const OUString& lhs, const PropertyValue& rhs) const { return lhs == rhs.Name; } @@ -125,12 +125,12 @@ namespace xmloff } //--------------------------------------------------------------------- - OControlElement::ElementType OElementNameMap::getElementType(const ::rtl::OUString& _rName) + OControlElement::ElementType OElementNameMap::getElementType(const OUString& _rName) { if ( s_sElementTranslations.empty() ) { // initialize for (ElementType eType=(ElementType)0; eType& _rxParentContainer) :OPropertyImport(_rImport, _nPrefix, _rName) ,m_rFormImport(_rImport) @@ -161,9 +161,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OElementImport::determineDefaultServiceName() const + OUString OElementImport::determineDefaultServiceName() const { - return ::rtl::OUString(); + return OUString(); } //--------------------------------------------------------------------- @@ -172,13 +172,13 @@ namespace xmloff ENTER_LOG_CONTEXT( "xmloff::OElementImport - importing one element" ); const SvXMLNamespaceMap& rMap = m_rContext.getGlobalContext().GetNamespaceMap(); - const ::rtl::OUString sImplNameAttribute = rMap.GetQNameByKey( XML_NAMESPACE_FORM, GetXMLToken( XML_CONTROL_IMPLEMENTATION ) ); - const ::rtl::OUString sControlImplementation = _rxAttrList->getValueByName( sImplNameAttribute ); + const OUString sImplNameAttribute = rMap.GetQNameByKey( XML_NAMESPACE_FORM, GetXMLToken( XML_CONTROL_IMPLEMENTATION ) ); + const OUString sControlImplementation = _rxAttrList->getValueByName( sImplNameAttribute ); // retrieve the service name if ( !sControlImplementation.isEmpty() ) { - ::rtl::OUString sOOoImplementationName; + OUString sOOoImplementationName; const sal_uInt16 nImplPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sControlImplementation, &sOOoImplementationName ); m_sServiceName = ( nImplPrefix == XML_NAMESPACE_OOO ) ? sOOoImplementationName : sControlImplementation; } @@ -199,7 +199,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken(_rLocalName, token::XML_EVENT_LISTENERS) && (XML_NAMESPACE_OFFICE == _nPrefix)) @@ -228,7 +228,7 @@ namespace xmloff new OGridColumnPropertyTranslator( Reference< XMultiPropertySet >( m_xElement, UNO_QUERY ) ); const_cast< XMLTextStyleContext* >( m_pStyleElement )->FillPropertySet( xPropTranslation ); - const ::rtl::OUString sNumberStyleName = const_cast< XMLTextStyleContext* >( m_pStyleElement )->GetDataStyleName( ); + const OUString sNumberStyleName = const_cast< XMLTextStyleContext* >( m_pStyleElement )->GetDataStyleName( ); if ( !sNumberStyleName.isEmpty() ) // the style also has a number (sub) style m_rContext.applyControlNumberStyle( m_xElement, sNumberStyleName ); @@ -266,8 +266,8 @@ namespace xmloff ) { OSL_ENSURE(m_xInfo->hasPropertyByName(aCheck->Name), - ::rtl::OStringBuffer("OElementImport::implApplySpecificProperties: read a property ("). - append(rtl::OUStringToOString(aCheck->Name, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("OElementImport::implApplySpecificProperties: read a property ("). + append(OUStringToOString(aCheck->Name, RTL_TEXTENCODING_ASCII_US)). append(") which does not exist on the element!").getStr()); } } @@ -284,8 +284,8 @@ namespace xmloff ::std::sort( m_aValues.begin(), m_aValues.end(), PropertyValueLess()); // the names - Sequence< ::rtl::OUString > aNames(m_aValues.size()); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames(m_aValues.size()); + OUString* pNames = aNames.getArray(); // the values Sequence< Any > aValues(m_aValues.size()); Any* pValues = aValues.getArray(); @@ -328,8 +328,8 @@ namespace xmloff } catch(Exception&) { - OSL_FAIL(::rtl::OStringBuffer("OElementImport::implApplySpecificProperties: could not set the property \""). - append(rtl::OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OElementImport::implApplySpecificProperties: could not set the property \""). + append(OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). append("\"!").getStr()); } } @@ -362,8 +362,8 @@ namespace xmloff if ( !xDynamicProperties.is() ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString aMessage( "OElementImport::implApplyGenericProperties: encountered an unknown property (" ); - aMessage += ::rtl::OUStringToOString( aPropValues->Name, RTL_TEXTENCODING_ASCII_US ); + OString aMessage( "OElementImport::implApplyGenericProperties: encountered an unknown property (" ); + aMessage += OUStringToOString( aPropValues->Name, RTL_TEXTENCODING_ASCII_US ); aMessage += "), but component is no PropertyBag!"; OSL_FAIL( aMessage.getStr() ); #endif @@ -470,32 +470,32 @@ namespace xmloff } catch(Exception&) { - OSL_FAIL(::rtl::OStringBuffer("OElementImport::EndElement: could not set the property \""). - append(::rtl::OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OElementImport::EndElement: could not set the property \""). + append(OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). append("\"!").getStr()); } } } //--------------------------------------------------------------------- - ::rtl::OUString OElementImport::implGetDefaultName() const + OUString OElementImport::implGetDefaultName() const { // no optimization here. If this method gets called, the XML stream did not contain a name for the // element, which is a heavy error. So in this case we don't care for performance - static const ::rtl::OUString sUnnamedName("unnamed"); + static const OUString sUnnamedName("unnamed"); OSL_ENSURE(m_xParentContainer.is(), "OElementImport::implGetDefaultName: no parent container!"); if (!m_xParentContainer.is()) return sUnnamedName; - Sequence< ::rtl::OUString > aNames = m_xParentContainer->getElementNames(); + Sequence< OUString > aNames = m_xParentContainer->getElementNames(); - ::rtl::OUString sReturn; - const ::rtl::OUString* pNames = NULL; - const ::rtl::OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); + OUString sReturn; + const OUString* pNames = NULL; + const OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); for (sal_Int32 i=0; i<32768; ++i) // the limit is nearly arbitrary ... { // assemble the new name (suggestion) sReturn = sUnnamedName; - sReturn += ::rtl::OUString::valueOf(i); + sReturn += OUString::valueOf(i); // check the existence (this is the bad performance part ....) for (pNames = aNames.getConstArray(); pNames xContext = m_rFormImport.getGlobalContext().GetComponentContext(); Reference< XInterface > xPure = xContext->getServiceManager()->createInstanceWithContext(m_sServiceName, xContext); OSL_ENSURE(xPure.is(), - ::rtl::OStringBuffer("OElementImport::createElement: service factory gave me no object (service name: ").append(rtl::OUStringToOString(m_sServiceName, RTL_TEXTENCODING_ASCII_US)).append(")!").getStr()); + OStringBuffer("OElementImport::createElement: service factory gave me no object (service name: ").append(OUStringToOString(m_sServiceName, RTL_TEXTENCODING_ASCII_US)).append(")!").getStr()); xReturn = Reference< XPropertySet >(xPure, UNO_QUERY); } else @@ -662,15 +662,15 @@ namespace xmloff } //--------------------------------------------------------------------- - void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault) + void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault) { OSL_ENSURE( m_xInfo.is(), "OPropertyImport::simulateDefaultedAttribute: the component should be more gossipy about it's properties!" ); if ( !m_xInfo.is() || m_xInfo->hasPropertyByName( _rPropertyName ) ) { - ::rtl::OUString sLocalAttrName = ::rtl::OUString::createFromAscii(_pAttributeName); + OUString sLocalAttrName = OUString::createFromAscii(_pAttributeName); if ( !encounteredAttribute( sLocalAttrName ) ) - OSL_VERIFY( handleAttribute( XML_NAMESPACE_FORM, sLocalAttrName, ::rtl::OUString::createFromAscii( _pAttributeDefault ) ) ); + OSL_VERIFY( handleAttribute( XML_NAMESPACE_FORM, sLocalAttrName, OUString::createFromAscii( _pAttributeDefault ) ) ); } } @@ -678,7 +678,7 @@ namespace xmloff //= OControlImport //===================================================================== //--------------------------------------------------------------------- - OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) ,m_eElementType(OControlElement::UNKNOWN) @@ -687,7 +687,7 @@ namespace xmloff } //--------------------------------------------------------------------- - OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) ,m_eElementType(_eType) @@ -696,7 +696,7 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OControlImport::determineDefaultServiceName() const + OUString OControlImport::determineDefaultServiceName() const { const sal_Char* pServiceName = NULL; switch ( m_eElementType ) @@ -722,8 +722,8 @@ namespace xmloff default: break; } if ( pServiceName != NULL ) - return ::rtl::OUString::createFromAscii( pServiceName ); - return ::rtl::OUString(); + return OUString::createFromAscii( pServiceName ); + return OUString(); } //--------------------------------------------------------------------- @@ -734,7 +734,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* pLinkedCellAttributeName = OAttributeMetaData::getBindingAttributeName(BA_LINKED_CELL); @@ -915,9 +915,9 @@ namespace xmloff // transfer the name if (PROPID_VALUE == aValueProps->Handle) - aValueProps->Name = ::rtl::OUString::createFromAscii(pValueProperty); + aValueProps->Name = OUString::createFromAscii(pValueProperty); else - aValueProps->Name = ::rtl::OUString::createFromAscii(pCurrentValueProperty); + aValueProps->Name = OUString::createFromAscii(pCurrentValueProperty); bSuccess = true; } break; @@ -943,9 +943,9 @@ namespace xmloff // transfer the name if (PROPID_MIN_VALUE == aValueProps->Handle) - aValueProps->Name = ::rtl::OUString::createFromAscii(pMinValueProperty); + aValueProps->Name = OUString::createFromAscii(pMinValueProperty); else - aValueProps->Name = ::rtl::OUString::createFromAscii(pMaxValueProperty); + aValueProps->Name = OUString::createFromAscii(pMaxValueProperty); bSuccess = true; } break; @@ -972,7 +972,7 @@ namespace xmloff // retrieve the type of the property Property aProp = _rxPropInfo->getPropertyByName(_rPropValue.Name); // the untranslated string value as read in handleAttribute - ::rtl::OUString sValue; + OUString sValue; #if OSL_DEBUG_LEVEL > 0 sal_Bool bSuccess = #endif @@ -1063,7 +1063,7 @@ namespace xmloff // found it -> need to remember (and restore) the "value property value", which is not set explicitly try { - aValuePropertyValue = m_xElement->getPropertyValue( ::rtl::OUString::createFromAscii( pValueProperty ) ); + aValuePropertyValue = m_xElement->getPropertyValue( OUString::createFromAscii( pValueProperty ) ); } catch( const Exception& ) { @@ -1080,7 +1080,7 @@ namespace xmloff { try { - m_xElement->setPropertyValue( ::rtl::OUString::createFromAscii( pValueProperty ), aValuePropertyValue ); + m_xElement->setPropertyValue( OUString::createFromAscii( pValueProperty ), aValuePropertyValue ); } catch( const Exception& ) { @@ -1106,7 +1106,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ) + void OControlImport::doRegisterCellValueBinding( const OUString& _rBoundCellAddress ) { OSL_PRECOND( m_xElement.is(), "OControlImport::doRegisterCellValueBinding: invalid element!" ); OSL_PRECOND( !_rBoundCellAddress.isEmpty(), @@ -1116,7 +1116,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterXFormsValueBinding( const ::rtl::OUString& _rBindingID ) + void OControlImport::doRegisterXFormsValueBinding( const OUString& _rBindingID ) { OSL_PRECOND( m_xElement.is(), "need element" ); OSL_PRECOND( !_rBindingID.isEmpty(), "binding ID is not valid" ); @@ -1125,7 +1125,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterXFormsListBinding( const ::rtl::OUString& _rBindingID ) + void OControlImport::doRegisterXFormsListBinding( const OUString& _rBindingID ) { OSL_PRECOND( m_xElement.is(), "need element" ); OSL_PRECOND( !_rBindingID.isEmpty(), "binding ID is not valid" ); @@ -1134,7 +1134,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterXFormsSubmission( const ::rtl::OUString& _rSubmissionID ) + void OControlImport::doRegisterXFormsSubmission( const OUString& _rSubmissionID ) { OSL_PRECOND( m_xElement.is(), "need element" ); OSL_PRECOND( !_rSubmissionID.isEmpty(), "binding ID is not valid" ); @@ -1164,7 +1164,7 @@ namespace xmloff //===================================================================== //--------------------------------------------------------------------- OImagePositionImport::OImagePositionImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, + sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ) :OControlImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) ,m_nImagePosition( -1 ) @@ -1174,8 +1174,8 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue ) + bool OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, + const OUString& _rValue ) { if ( _rLocalName == GetXMLToken( XML_IMAGE_POSITION ) ) { @@ -1226,7 +1226,7 @@ namespace xmloff //===================================================================== //--------------------------------------------------------------------- OReferredControlImport::OReferredControlImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType ) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) @@ -1244,10 +1244,10 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue) + bool OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, + const OUString& _rValue) { - static const ::rtl::OUString s_sReferenceAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_FOR)); + static const OUString s_sReferenceAttributeName = OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_FOR)); if (_rLocalName == s_sReferenceAttributeName) { m_sReferringControls = _rValue; @@ -1260,16 +1260,16 @@ namespace xmloff //= OPasswordImport //===================================================================== //--------------------------------------------------------------------- - OPasswordImport::OPasswordImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OPasswordImport::OPasswordImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) { } //--------------------------------------------------------------------- - bool OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { - static const ::rtl::OUString s_sEchoCharAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR)); + static const OUString s_sEchoCharAttributeName = OUString::createFromAscii(OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR)); if (_rLocalName == s_sEchoCharAttributeName) { // need a special handling for the EchoChar property @@ -1291,14 +1291,14 @@ namespace xmloff //= ORadioImport //===================================================================== //--------------------------------------------------------------------- - ORadioImport::ORadioImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + ORadioImport::ORadioImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OImagePositionImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) { } //--------------------------------------------------------------------- - bool ORadioImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool ORadioImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { // need special handling for the State & CurrentState properties: // they're stored as booleans, but expected to be int16 properties @@ -1329,7 +1329,7 @@ namespace xmloff //===================================================================== //= OURLReferenceImport //===================================================================== - OURLReferenceImport::OURLReferenceImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OURLReferenceImport::OURLReferenceImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OImagePositionImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1337,7 +1337,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* s_pTargetLocationAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCA_TARGET_LOCATION ); static const sal_Char* s_pImageDataAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCA_IMAGE_DATA ); @@ -1356,7 +1356,7 @@ namespace xmloff if ( bMakeAbsolute && !_rValue.isEmpty() ) { // make a global URL out of the local one - ::rtl::OUString sAdjustedValue; + OUString sAdjustedValue; // only resolve image related url // we don't want say form url targets to be resolved // using ResolveGraphicObjectURL @@ -1374,7 +1374,7 @@ namespace xmloff //= OButtonImport //===================================================================== //--------------------------------------------------------------------- - OButtonImport::OButtonImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OButtonImport::OButtonImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OURLReferenceImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1395,7 +1395,7 @@ namespace xmloff //= OValueRangeImport //===================================================================== //--------------------------------------------------------------------- - OValueRangeImport::OValueRangeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OValueRangeImport::OValueRangeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ) :OControlImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) ,m_nStepSizeValue( 1 ) @@ -1404,7 +1404,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OValueRangeImport::handleAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue ) + bool OValueRangeImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ) { if ( _rLocalName.equalsAscii( OAttributeMetaData::getSpecialAttributeName( SCA_STEP_SIZE ) ) ) { @@ -1432,7 +1432,7 @@ namespace xmloff //= OTextLikeImport //===================================================================== //--------------------------------------------------------------------- - OTextLikeImport::OTextLikeImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OTextLikeImport::OTextLikeImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1442,7 +1442,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList ) { if ( ( XML_NAMESPACE_TEXT == _nPrefix ) && _rLocalName.equalsIgnoreAsciiCase("p") ) @@ -1553,8 +1553,8 @@ namespace xmloff //--------------------------------------------------------------------- struct EqualName : public ::std::unary_function< PropertyValue, bool > { - const ::rtl::OUString m_sName; - EqualName( const ::rtl::OUString& _rName ) : m_sName( _rName ) { } + const OUString m_sName; + EqualName( const OUString& _rName ) : m_sName( _rName ) { } inline bool operator()( const PropertyValue& _rProp ) { @@ -1571,11 +1571,11 @@ namespace xmloff PropertyValueArray::iterator aDefaultControlPropertyPos = ::std::find_if( m_aValues.begin(), m_aValues.end(), - EqualName( ::rtl::OUString( "DefaultControl" ) ) + EqualName( OUString( "DefaultControl" ) ) ); if ( aDefaultControlPropertyPos != m_aValues.end() ) { - ::rtl::OUString sDefaultControl; + OUString sDefaultControl; OSL_VERIFY( aDefaultControlPropertyPos->Value >>= sDefaultControl ); if ( sDefaultControl == "stardiv.one.form.control.Edit" ) { @@ -1608,7 +1608,7 @@ namespace xmloff // TODO (fs): stole this code somewhere - why don't we fix the text import?? m_xCursor->gotoEnd( sal_False ); m_xCursor->goLeft( 1, sal_True ); - m_xCursor->setString( ::rtl::OUString() ); + m_xCursor->setString( OUString() ); // reset cursor xTextImportHelper->ResetCursor(); @@ -1623,7 +1623,7 @@ namespace xmloff //= OListAndComboImport //===================================================================== //--------------------------------------------------------------------- - OListAndComboImport::OListAndComboImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListAndComboImport::OListAndComboImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1637,16 +1637,16 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OListAndComboImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OListAndComboImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { // is it the "option" sub tag of a listbox ? - static const ::rtl::OUString s_sOptionElementName("option"); + static const OUString s_sOptionElementName("option"); if (s_sOptionElementName == _rLocalName) return new OListOptionImport(GetImport(), _nPrefix, _rLocalName, this); // is it the "item" sub tag of a combobox ? - static const ::rtl::OUString s_sItemElementName("item"); + static const OUString s_sItemElementName("item"); if (s_sItemElementName == _rLocalName) return new OComboItemImport(GetImport(), _nPrefix, _rLocalName, this); @@ -1718,23 +1718,23 @@ namespace xmloff } //--------------------------------------------------------------------- - void OListAndComboImport::doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ) + void OListAndComboImport::doRegisterCellValueBinding( const OUString& _rBoundCellAddress ) { - ::rtl::OUString sBoundCellAddress( _rBoundCellAddress ); + OUString sBoundCellAddress( _rBoundCellAddress ); if ( m_bLinkWithIndexes ) { // This is a HACK. We register a string which is no valid address, but allows // (somewhere else) to determine that a non-standard binding should be created. // This hack is acceptable for OOo 1.1.1, since the file format for value // bindings of form controls is to be changed afterwards, anyway. - sBoundCellAddress += ::rtl::OUString( ":index" ); + sBoundCellAddress += OUString( ":index" ); } OControlImport::doRegisterCellValueBinding( sBoundCellAddress ); } //--------------------------------------------------------------------- - bool OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* pListSourceAttributeName = OAttributeMetaData::getDatabaseAttributeName(DA_LIST_SOURCE); if ( _rLocalName.equalsAscii(pListSourceAttributeName) ) @@ -1753,7 +1753,7 @@ namespace xmloff // a listbox which has a list-source attribute must have a list-source-type of something // not equal to ValueList. // In this case, the list-source value is simply the one and only element of the ListSource property. - Sequence< ::rtl::OUString > aListSourcePropValue( 1 ); + Sequence< OUString > aListSourcePropValue( 1 ); aListSourcePropValue[0] = _rValue; aListSource.Value <<= aListSourcePropValue; } @@ -1786,7 +1786,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OListAndComboImport::implPushBackLabel(const ::rtl::OUString& _rLabel) + void OListAndComboImport::implPushBackLabel(const OUString& _rLabel) { OSL_ENSURE(!m_nEmptyListItems, "OListAndComboImport::implPushBackValue: label list is already done!"); if (!m_nEmptyListItems) @@ -1794,7 +1794,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OListAndComboImport::implPushBackValue(const ::rtl::OUString& _rValue) + void OListAndComboImport::implPushBackValue(const OUString& _rValue) { OSL_ENSURE(!m_nEmptyValueItems, "OListAndComboImport::implPushBackValue: value list is already done!"); if (!m_nEmptyValueItems) @@ -1845,7 +1845,7 @@ namespace xmloff //= OListOptionImport //===================================================================== //--------------------------------------------------------------------- - OListOptionImport::OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListOptionImport::OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xListBoxImport(_rListBox) @@ -1857,14 +1857,14 @@ namespace xmloff { // the label and the value const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); - const ::rtl::OUString sLabelAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString("label")); - const ::rtl::OUString sValueAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString("value")); + const OUString sLabelAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString("label")); + const OUString sValueAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString("value")); // ------------------- // the label attribute - ::rtl::OUString sValue = _rxAttrList->getValueByName(sLabelAttribute); + OUString sValue = _rxAttrList->getValueByName(sLabelAttribute); sal_Bool bNonexistentAttribute = sal_False; if (sValue.isEmpty()) if (_rxAttrList->getTypeByName(sLabelAttribute).isEmpty()) @@ -1891,10 +1891,10 @@ namespace xmloff m_xListBoxImport->implPushBackValue( sValue ); // the current-selected and selected - const ::rtl::OUString sSelectedAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_CURRENT_SELECTED))); - const ::rtl::OUString sDefaultSelectedAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED))); + const OUString sSelectedAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_CURRENT_SELECTED))); + const OUString sDefaultSelectedAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED))); // propagate the selected flag bool bSelected(false); @@ -1917,7 +1917,7 @@ namespace xmloff //= OComboItemImport //===================================================================== //--------------------------------------------------------------------- - OComboItemImport::OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OComboItemImport::OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xListBoxImport(_rListBox) @@ -1927,8 +1927,8 @@ namespace xmloff //--------------------------------------------------------------------- void OComboItemImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { - const ::rtl::OUString sLabelAttributeName = GetImport().GetNamespaceMap().GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL))); + const OUString sLabelAttributeName = GetImport().GetNamespaceMap().GetQNameByKey( + GetPrefix(), OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL))); m_xListBoxImport->implPushBackLabel(_rxAttrList->getValueByName(sLabelAttributeName)); SvXMLImportContext::StartElement(_rxAttrList); @@ -1939,7 +1939,7 @@ namespace xmloff //= OColumnWrapperImport //===================================================================== //--------------------------------------------------------------------- - OColumnWrapperImport::OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OColumnWrapperImport::OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName) ,m_xParentContainer(_rxParentContainer) @@ -1948,7 +1948,7 @@ namespace xmloff { } //--------------------------------------------------------------------- - SvXMLImportContext* OColumnWrapperImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OColumnWrapperImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { OControlImport* pReturn = implCreateChildContext(_nPrefix, _rLocalName, OElementNameMap::getElementType(_rLocalName)); @@ -1974,7 +1974,7 @@ namespace xmloff //--------------------------------------------------------------------- OControlImport* OColumnWrapperImport::implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType) { OSL_ENSURE( (OControlElement::TEXT == _eType) @@ -2010,7 +2010,7 @@ namespace xmloff //= OGridImport //===================================================================== //--------------------------------------------------------------------- - OGridImport::OGridImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OGridImport::OGridImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OGridImport_Base(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, "column") @@ -2019,7 +2019,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OGridImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName) + SvXMLImportContext* OGridImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName) { return new OColumnWrapperImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer); } @@ -2028,7 +2028,7 @@ namespace xmloff //= OFormImport //===================================================================== //--------------------------------------------------------------------- - OFormImport::OFormImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormImport::OFormImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OFormImport_Base(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, "control") { @@ -2036,7 +2036,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken(_rLocalName, token::XML_FORM) ) @@ -2072,18 +2072,18 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OFormImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName) + SvXMLImportContext* OFormImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName) { OSL_ENSURE( !this, "illegal call to OFormImport::implCreateControlWrapper" ); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName ); } //--------------------------------------------------------------------- - bool OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { // handle the master/details field attributes (they're way too special to let the OPropertyImport handle them) - static const ::rtl::OUString s_sMasterFieldsAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faMasterFields)); - static const ::rtl::OUString s_sDetailFieldsAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faDetailFiels)); + static const OUString s_sMasterFieldsAttributeName = OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faMasterFields)); + static const OUString s_sDetailFieldsAttributeName = OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faDetailFiels)); if ( s_sMasterFieldsAttributeName == _rLocalName ) { @@ -2101,19 +2101,19 @@ namespace xmloff } //--------------------------------------------------------------------- - void OFormImport::implTranslateStringListProperty(const ::rtl::OUString& _rPropertyName, const ::rtl::OUString& _rValue) + void OFormImport::implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue) { PropertyValue aProp; aProp.Name = _rPropertyName; - Sequence< ::rtl::OUString > aList; + Sequence< OUString > aList; // split up the value string if (!_rValue.isEmpty()) { // For the moment, we build a vector instead of a Sequence. It's easier to handle because of it's // push_back method - ::std::vector< ::rtl::OUString > aElements; + ::std::vector< OUString > aElements; // estimate the number of tokens sal_Int32 nEstimate = 0, nLength = _rValue.getLength(); const sal_Unicode* pChars = _rValue.getStr(); @@ -2127,7 +2127,7 @@ namespace xmloff sal_Int32 nElementStart = 0; sal_Int32 nNextSep = 0; sal_Int32 nElementLength; - ::rtl::OUString sElement; + OUString sElement; do { // extract the current element @@ -2152,8 +2152,8 @@ namespace xmloff } while (nElementStart < nLength); - ::rtl::OUString *pElements = aElements.empty() ? 0 : &aElements[0]; - aList = Sequence< ::rtl::OUString >(pElements, aElements.size()); + OUString *pElements = aElements.empty() ? 0 : &aElements[0]; + aList = Sequence< OUString >(pElements, aElements.size()); } else { @@ -2171,7 +2171,7 @@ namespace xmloff OXMLDataSourceImport::OXMLDataSourceImport( SvXMLImport& _rImport ,sal_uInt16 nPrfx - , const ::rtl::OUString& _sLocalName + , const OUString& _sLocalName ,const Reference< ::com::sun::star::xml::sax::XAttributeList > & _xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xElement) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) @@ -2182,15 +2182,15 @@ namespace xmloff sal_Int16 nLength = (_xElement.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - ::rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName, &sLocalName ); if ( ( nPrefix == OAttributeMetaData::getCommonControlAttributeNamespace( CCA_TARGET_LOCATION ) ) && ( sLocalName.equalsAscii( OAttributeMetaData::getCommonControlAttributeName( CCA_TARGET_LOCATION ) ) ) ) { - ::rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); INetURLObject aURL(sValue); if ( aURL.GetProtocol() == INET_PROT_FILE ) @@ -2203,7 +2203,7 @@ namespace xmloff } //--------------------------------------------------------------------- OControlImport* OFormImport::implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType ) { switch (_eType) diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index 61fb2b2f0e82..b9792808b905 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -60,7 +60,7 @@ namespace xmloff OElementNameMap() { } public: - static ElementType getElementType(const ::rtl::OUString& _rName); + static ElementType getElementType(const OUString& _rName); }; //===================================================================== @@ -74,8 +74,8 @@ namespace xmloff ,public OStackedLogging { protected: - ::rtl::OUString m_sServiceName; // the service name as extracted from the service-name attribute - ::rtl::OUString m_sName; // the name of the object (redundant, already contained in the base class' array) + OUString m_sServiceName; // the service name as extracted from the service-name attribute + OUString m_sName; // the name of the object (redundant, already contained in the base class' array) OFormLayerXMLImport_Impl& m_rFormImport; // the form import context IEventAttacherManager& m_rEventManager; // the event attacher manager @@ -111,7 +111,7 @@ namespace xmloff */ OElementImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer ); virtual ~OElementImport(); @@ -121,14 +121,14 @@ namespace xmloff virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); // IEventAttacher virtual void registerEvents( @@ -150,12 +150,12 @@ namespace xmloff property value as if the attribute was encountered.

      @see encounteredAttribute */ - void simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault); + void simulateDefaultedAttribute(const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault); /** to be called from within handleAttribute, checks whether the given attribute is covered by our generic attribute handler mechanisms */ - bool tryGenericAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue ); + bool tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ); /** controls whether |handleAttribute| implicitly calls |tryGenericAttribute|, or whether the derived class must do this explicitly at a suitable place in its own |handleAttribute| @@ -163,7 +163,7 @@ namespace xmloff void disableImplicitGenericAttributeHandling() { m_bImplicitGenericAttributeHandling = false; } private: - ::rtl::OUString implGetDefaultName() const; + OUString implGetDefaultName() const; void implApplyGenericProperties(); void implApplySpecificProperties(); @@ -173,7 +173,7 @@ namespace xmloff PropertyGroups::const_iterator impl_matchPropertyGroup( const PropertyGroups& i_propertyGroups ) const; - virtual ::rtl::OUString determineDefaultServiceName() const; + virtual OUString determineDefaultServiceName() const; }; //===================================================================== @@ -186,7 +186,7 @@ namespace xmloff ,public OValuePropertiesMetaData { protected: - ::rtl::OUString m_sControlId; + OUString m_sControlId; OControlElement::ElementType m_eElementType; PropertyValueArray m_aValueProperties; @@ -201,29 +201,29 @@ namespace xmloff /** the address of the calc cell which the control model should be bound to, if applicable */ - ::rtl::OUString m_sBoundCellAddress; + OUString m_sBoundCellAddress; /** name of a value binding (xforms:bind attribute) */ - ::rtl::OUString m_sBindingID; + OUString m_sBindingID; /** name of a list binding (form:xforms-list-source attribute) */ - ::rtl::OUString m_sListBindingID; + OUString m_sListBindingID; /** name of a submission (xforms:submission attribute) */ - ::rtl::OUString m_sSubmissionID; + OUString m_sSubmissionID; protected: // for use by derived classes only OControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer ); public: OControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -235,8 +235,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); void addOuterAttributes(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxOuterAttribs); @@ -248,7 +248,7 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, ::com::sun::star::beans::PropertyValue& /* [in/out] */ _rPropValue); - virtual ::rtl::OUString determineDefaultServiceName() const; + virtual OUString determineDefaultServiceName() const; /** registers the given cell address as value binding address for our element @@ -260,16 +260,16 @@ namespace xmloff @precond we have a valid element (m_xElement) */ - virtual void doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ); + virtual void doRegisterCellValueBinding( const OUString& _rBoundCellAddress ); /** register the given XForms binding */ - virtual void doRegisterXFormsValueBinding( const ::rtl::OUString& ); + virtual void doRegisterXFormsValueBinding( const OUString& ); /** register the given XForms list binding */ - virtual void doRegisterXFormsListBinding( const ::rtl::OUString& ); + virtual void doRegisterXFormsListBinding( const OUString& ); /** register the given XForms submission */ - virtual void doRegisterXFormsSubmission( const ::rtl::OUString& ); + virtual void doRegisterXFormsSubmission( const OUString& ); protected: @@ -294,7 +294,7 @@ namespace xmloff public: OImagePositionImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -306,8 +306,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute( sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue + const OUString& _rLocalName, + const OUString& _rValue ); }; @@ -317,11 +317,11 @@ namespace xmloff class OReferredControlImport : public OControlImport { protected: - ::rtl::OUString m_sReferringControls; // the list of ids of controls referring to the one beeing imported + OUString m_sReferringControls; // the list of ids of controls referring to the one beeing imported public: OReferredControlImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -332,8 +332,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -343,15 +343,15 @@ namespace xmloff { public: OPasswordImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -361,7 +361,7 @@ namespace xmloff { public: ORadioImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -369,8 +369,8 @@ namespace xmloff protected: // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -383,7 +383,7 @@ namespace xmloff { public: OURLReferenceImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -391,8 +391,8 @@ namespace xmloff protected: // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -405,7 +405,7 @@ namespace xmloff { public: OButtonImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -429,7 +429,7 @@ namespace xmloff public: OValueRangeImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -441,8 +441,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute( sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue ); + const OUString& _rLocalName, + const OUString& _rValue ); }; //===================================================================== @@ -460,7 +460,7 @@ namespace xmloff public: OTextLikeImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -469,7 +469,7 @@ namespace xmloff virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); @@ -490,9 +490,9 @@ namespace xmloff friend class OComboItemImport; protected: - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aListSource; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aValueList; ::com::sun::star::uno::Sequence< sal_Int16 > @@ -500,7 +500,7 @@ namespace xmloff ::com::sun::star::uno::Sequence< sal_Int16 > m_aDefaultSelectedSeq; - ::rtl::OUString m_sCellListSource; /// the cell range which acts as list source for the control + OUString m_sCellListSource; /// the cell range which acts as list source for the control sal_Int32 m_nEmptyListItems; /// number of empty list items encountered during reading sal_Int32 m_nEmptyValueItems; /// number of empty value items encountered during reading @@ -512,7 +512,7 @@ namespace xmloff public: OListAndComboImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -521,21 +521,21 @@ namespace xmloff virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); // OControlImport ovrridables - virtual void doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ); + virtual void doRegisterCellValueBinding( const OUString& _rBoundCellAddress ); protected: - void implPushBackLabel(const ::rtl::OUString& _rLabel); - void implPushBackValue(const ::rtl::OUString& _rValue); + void implPushBackLabel(const OUString& _rLabel); + void implPushBackValue(const OUString& _rValue); void implEmptyLabelFound(); void implEmptyValueFound(); @@ -556,7 +556,7 @@ namespace xmloff OListAndComboImportRef m_xListBoxImport; public: - OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox); virtual void StartElement( @@ -574,7 +574,7 @@ namespace xmloff OListAndComboImportRef m_xListBoxImport; public: - OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox); protected: @@ -595,20 +595,20 @@ namespace xmloff protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xMeAsContainer; - ::rtl::OUString m_sWrapperElementName; + OUString m_sWrapperElementName; protected: - OContainerImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OContainerImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, const sal_Char* _pWrapperElementName) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) - ,m_sWrapperElementName(::rtl::OUString::createFromAscii(_pWrapperElementName)) + ,m_sWrapperElementName(OUString::createFromAscii(_pWrapperElementName)) { } // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); @@ -619,7 +619,7 @@ namespace xmloff // create the child context for the given control type virtual SvXMLImportContext* implCreateControlWrapper( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName) = 0; + sal_uInt16 _nPrefix, const OUString& _rLocalName) = 0; }; //===================================================================== @@ -638,7 +638,7 @@ namespace xmloff m_xColumnFactory; public: - OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); @@ -662,18 +662,18 @@ namespace xmloff IEventAttacherManager& m_rEventManager; public: - OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer); // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); protected: OControlImport* implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType); }; @@ -687,14 +687,14 @@ namespace xmloff { public: OGridImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); protected: // OContainerImport overridables virtual SvXMLImportContext* implCreateControlWrapper( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName); + sal_uInt16 _nPrefix, const OUString& _rLocalName); }; //===================================================================== @@ -707,14 +707,14 @@ namespace xmloff { public: OFormImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer ); protected: // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); @@ -722,19 +722,19 @@ namespace xmloff // OContainerImport overridables virtual SvXMLImportContext* implCreateControlWrapper( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName); + sal_uInt16 _nPrefix, const OUString& _rLocalName); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); OControlImport* implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType ); - void implTranslateStringListProperty(const ::rtl::OUString& _rPropertyName, const ::rtl::OUString& _rValue); + void implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue); }; //===================================================================== @@ -745,7 +745,7 @@ namespace xmloff public: OXMLDataSourceImport( SvXMLImport& _rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xElement); }; diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index 18d2d426f6cc..e9c245c9e5d5 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -32,7 +32,7 @@ //------------------------------------------------------------------------- template inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) { // maybe it's a sub control @@ -88,7 +88,7 @@ inline void OContainerImport< BASE >::EndElement() //========================================================================= //------------------------------------------------------------------------- template -OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx index 0cd93ed2b570..c35d201a3321 100644 --- a/xmloff/source/forms/eventexport.cxx +++ b/xmloff/source/forms/eventexport.cxx @@ -43,8 +43,8 @@ namespace xmloff // translate the events const ScriptEventDescriptor* pEvents = _rEvents.getConstArray(); - ::rtl::OUString sName; - ::rtl::OUString sLibrary, sLocalMacroName; + OUString sName; + OUString sLibrary, sLocalMacroName; for (sal_Int32 i=0; i(this), 1); + OUString("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1); } //--------------------------------------------------------------------- - Any SAL_CALL OEventDescriptorMapper::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL OEventDescriptorMapper::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); if (m_aMappedEvents.end() == aPos) throw NoSuchElementException( - ::rtl::OUString("There is no element named ") += _rName, + OUString("There is no element named ") += _rName, static_cast< ::cppu::OWeakObject* >(this)); return makeAny(aPos->second); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OEventDescriptorMapper::getElementNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL OEventDescriptorMapper::getElementNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aReturn(m_aMappedEvents.size()); - ::rtl::OUString* pReturn = aReturn.getArray(); + Sequence< OUString > aReturn(m_aMappedEvents.size()); + OUString* pReturn = aReturn.getArray(); for ( ConstMapString2PropertyValueSequenceIterator aCollect = m_aMappedEvents.begin(); aCollect != m_aMappedEvents.end(); ++aCollect, ++pReturn @@ -126,7 +126,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException) + sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const OUString& _rName ) throw(RuntimeException) { ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); return m_aMappedEvents.end() != aPos; diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx index d0c9d36be38a..b919236275fa 100644 --- a/xmloff/source/forms/eventexport.hxx +++ b/xmloff/source/forms/eventexport.hxx @@ -57,12 +57,12 @@ namespace xmloff const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx index 20d184d83c68..d61fe5f4f9b7 100644 --- a/xmloff/source/forms/eventimport.cxx +++ b/xmloff/source/forms/eventimport.cxx @@ -37,7 +37,7 @@ namespace xmloff //= OFormEventsImportContext //===================================================================== //--------------------------------------------------------------------- - OFormEventsImportContext::OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, IEventAttacher& _rEventAttacher) + OFormEventsImportContext::OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rLocalName, IEventAttacher& _rEventAttacher) :XMLEventsImportContext(_rImport, _nPrefix, _rLocalName) ,m_rEventAttacher(_rEventAttacher) { @@ -64,7 +64,7 @@ namespace xmloff pTranslated->ListenerType = aEvent->first.copy(0, nSeparatorPos); pTranslated->EventMethod = aEvent->first.copy(nSeparatorPos + sizeof(EVENT_NAME_SEPARATOR) - 1); - ::rtl::OUString sLibrary; + OUString sLibrary; // the local macro name and the event type are specified as properties pEventDescription = aEvent->second.getConstArray(); @@ -89,7 +89,7 @@ namespace xmloff { // for StarBasic, the library is prepended sal_Unicode cLibSeparator = ':'; - sLibrary += ::rtl::OUString( &cLibSeparator, 1 ); + sLibrary += OUString( &cLibSeparator, 1 ); } sLibrary += pTranslated->ScriptCode; pTranslated->ScriptCode = sLibrary; diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx index d0ea88f31fb4..af7df463bade 100644 --- a/xmloff/source/forms/eventimport.hxx +++ b/xmloff/source/forms/eventimport.hxx @@ -40,7 +40,7 @@ namespace xmloff IEventAttacher& m_rEventAttacher; public: - OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rLocalName, IEventAttacher& _rEventAttacher); protected: diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index aaafb1b08910..b944f5c1981e 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -251,7 +251,7 @@ namespace xmloff //--------------------------------------------------------------------- const OAttribute2Property::AttributeAssignment* OAttribute2Property::getAttributeTranslation( - const ::rtl::OUString& _rAttribName) + const OUString& _rAttribName) { ConstAttributeAssignmentsIterator aPos = m_aKnownProperties.find(_rAttribName); if (m_aKnownProperties.end() != aPos) @@ -261,19 +261,19 @@ namespace xmloff //--------------------------------------------------------------------- void OAttribute2Property::addStringProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault) { - implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), - _pAttributeDefault ? ::rtl::OUString::createFromAscii(_pAttributeDefault) : ::rtl::OUString()); + implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< OUString* >(NULL) ), + _pAttributeDefault ? OUString::createFromAscii(_pAttributeDefault) : OUString()); } //--------------------------------------------------------------------- void OAttribute2Property::addBooleanProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Bool _bAttributeDefault, const sal_Bool _bInverseSemantics) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; ::sax::Converter::convertBool(aDefault, _bAttributeDefault); AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, ::getBooleanCppuType(), aDefault.makeStringAndClear()); aAssignment.bInverseSemantics = _bInverseSemantics; @@ -281,31 +281,31 @@ namespace xmloff //--------------------------------------------------------------------- void OAttribute2Property::addInt16Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int16 _nAttributeDefault) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; ::sax::Converter::convertNumber(aDefault, (sal_Int32)_nAttributeDefault); implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< sal_Int16* >(NULL) ), aDefault.makeStringAndClear()); } //--------------------------------------------------------------------- void OAttribute2Property::addInt32Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int32 _nAttributeDefault) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; ::sax::Converter::convertNumber( aDefault, _nAttributeDefault ); implAdd( _pAttributeName, _rPropertyName, ::getCppuType( static_cast< sal_Int32* >(NULL) ), aDefault.makeStringAndClear() ); } //--------------------------------------------------------------------- void OAttribute2Property::addEnumProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, const ::com::sun::star::uno::Type* _pType) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; SvXMLUnitConverter::convertEnum(aDefault, _nAttributeDefault, _pValueMap); AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, _pType ? *_pType : ::getCppuType( static_cast< sal_Int32* >(NULL) ), @@ -316,13 +316,13 @@ namespace xmloff //--------------------------------------------------------------------- OAttribute2Property::AttributeAssignment& OAttribute2Property::implAdd( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, const ::rtl::OUString& /*_rDefaultString*/) + const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const ::com::sun::star::uno::Type& _rType, const OUString& /*_rDefaultString*/) { - OSL_ENSURE(m_aKnownProperties.end() == m_aKnownProperties.find(::rtl::OUString::createFromAscii(_pAttributeName)), + OSL_ENSURE(m_aKnownProperties.end() == m_aKnownProperties.find(OUString::createFromAscii(_pAttributeName)), "OAttribute2Property::implAdd: already have this attribute!"); - ::rtl::OUString sAttributeName = ::rtl::OUString::createFromAscii(_pAttributeName); + OUString sAttributeName = OUString::createFromAscii(_pAttributeName); AttributeAssignment aAssignment; aAssignment.sAttributeName = sAttributeName; diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index 0c9d16b561e6..f535d0172ba0 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -237,10 +237,10 @@ namespace xmloff // store it's instances in a map, but in a vector for faster access. struct AttributeAssignment { - ::rtl::OUString sAttributeName; // the attribute name - ::rtl::OUString sPropertyName; // the property name + OUString sAttributeName; // the attribute name + OUString sPropertyName; // the property name ::com::sun::star::uno::Type aPropertyType; // the property type - ::rtl::OUString sAttributeDefault; // the default if the attribute is not present + OUString sAttributeDefault; // the default if the attribute is not present // entries which are special to some value types const SvXMLEnumMapEntry* pEnumMap; // the enum map, if appliable @@ -266,7 +266,7 @@ namespace xmloff does not represent a property. */ const AttributeAssignment* getAttributeTranslation( - const ::rtl::OUString& _rAttribName); + const OUString& _rAttribName); /** add a attribute assignment referring to a string property to the map @param _pAttributeName @@ -278,7 +278,7 @@ namespace xmloff an empty string. */ void addStringProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault = NULL); /** add a attribute assignment referring to a boolean property to the map @@ -294,7 +294,7 @@ namespace xmloff if , the attribute value is used as property value directly */ void addBooleanProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Bool _bAttributeDefault, const sal_Bool _bInverseSemantics = sal_False); /** add a attribute assignment referring to an int16 property to the map @@ -307,7 +307,7 @@ namespace xmloff the default value for the attribute. */ void addInt16Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int16 _nAttributeDefault); /** add a attribute assignment referring to an int32 property to the map @@ -320,7 +320,7 @@ namespace xmloff the default value for the attribute. */ void addInt32Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int32 _nAttributeDefault ); /** add a attribute assignment referring to an enum property to the map @@ -337,15 +337,15 @@ namespace xmloff the type of the property. May be NULL, in this case 32bit integer is assumed. */ void addEnumProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, const ::com::sun::star::uno::Type* _pType = NULL); protected: /// some common code for the various add*Property methods AttributeAssignment& implAdd( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, const ::rtl::OUString& _rDefaultString); + const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const ::com::sun::star::uno::Type& _rType, const OUString& _rDefaultString); }; //......................................................................... } // namespace xmloff diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index 72c39c791c2e..a874c132ea62 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -86,15 +86,15 @@ namespace } //.................................................................... - struct StringCompare : public ::std::unary_function< ::rtl::OUString, bool > + struct StringCompare : public ::std::unary_function< OUString, bool > { private: - const ::rtl::OUString m_sReference; + const OUString m_sReference; public: - StringCompare( const ::rtl::OUString& _rReference ) : m_sReference( _rReference ) { } + StringCompare( const OUString& _rReference ) : m_sReference( _rReference ) { } - inline bool operator()( const ::rtl::OUString& _rCompare ) + inline bool operator()( const OUString& _rCompare ) { return ( _rCompare == m_sReference ); } @@ -124,7 +124,7 @@ sal_Bool FormCellBindingHelper::livesInSpreadsheetDocument( const Reference< XPr } //------------------------------------------------------------------------ -bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress, sal_Int16 /*_nAssumeSheet*/ ) const +bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress, sal_Int16 /*_nAssumeSheet*/ ) const { Any aAddress; return doConvertAddressRepresentations( @@ -138,7 +138,7 @@ bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddre } //------------------------------------------------------------------------ -bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, +bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellRangeAddress& /* [out] */ _rAddress ) const { Any aAddress; @@ -153,7 +153,7 @@ bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddre } //------------------------------------------------------------------------ -Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAddress( const ::rtl::OUString& _rAddress, bool _bUseIntegerBinding ) const +Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAddress( const OUString& _rAddress, bool _bUseIntegerBinding ) const { Reference< XValueBinding > xBinding; if ( !m_xDocument.is() ) @@ -175,7 +175,7 @@ Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAdd } //------------------------------------------------------------------------ -Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const +Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStringAddress( const OUString& _rAddress ) const { Reference< XListEntrySource > xSource; @@ -194,11 +194,11 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } //------------------------------------------------------------------------ -::rtl::OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const +OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const { OSL_PRECOND( !_rxBinding.is() || isCellBinding( _rxBinding ), "FormCellBindingHelper::getStringAddressFromCellBinding: this is no cell binding!" ); - ::rtl::OUString sAddress; + OUString sAddress; try { Reference< XPropertySet > xBindingProps( _rxBinding, UNO_QUERY ); @@ -224,11 +224,11 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } //------------------------------------------------------------------------ -::rtl::OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const +OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const { OSL_PRECOND( !_rxSource.is() || isCellRangeListSource( _rxSource ), "FormCellBindingHelper::getStringAddressFromCellListSource: this is no cell list source!" ); - ::rtl::OUString sAddress; + OUString sAddress; try { Reference< XPropertySet > xSourceProps( _rxSource, UNO_QUERY ); @@ -253,7 +253,7 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } //------------------------------------------------------------------------ -bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< XSpreadsheetDocument >& _rxDocument, const ::rtl::OUString& _rService ) SAL_THROW(()) +bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< XSpreadsheetDocument >& _rxDocument, const OUString& _rService ) SAL_THROW(()) { bool bYesItIs = false; @@ -265,11 +265,11 @@ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< Reference< XMultiServiceFactory > xDocumentFactory( _rxDocument, UNO_QUERY ); OSL_ENSURE( xDocumentFactory.is(), "FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies: spreadsheet document, but no factory?" ); - Sequence< ::rtl::OUString > aAvailableServices; + Sequence< OUString > aAvailableServices; if ( xDocumentFactory.is() ) aAvailableServices = xDocumentFactory->getAvailableServiceNames( ); - const ::rtl::OUString* pFound = ::std::find_if( + const OUString* pFound = ::std::find_if( aAvailableServices.getConstArray(), aAvailableServices.getConstArray() + aAvailableServices.getLength(), StringCompare( _rService ) @@ -289,7 +289,7 @@ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< } //------------------------------------------------------------------------ -bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const SAL_THROW(()) +bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const SAL_THROW(()) { return isSpreadsheetDocumentWhichSupplies( m_xDocument, _rService ); } @@ -361,7 +361,7 @@ bool FormCellBindingHelper::isCellRangeListSource( const Reference< XListEntrySo } //------------------------------------------------------------------------ -bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const ::rtl::OUString& _rService ) const +bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const { Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY ); bool bDoes = xSI.is() && xSI->supportsService( _rService ); @@ -407,7 +407,7 @@ void FormCellBindingHelper::setListSource( const Reference< XListEntrySource >& } //------------------------------------------------------------------------ -Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( const ::rtl::OUString& _rService, const ::rtl::OUString& _rArgumentName, +Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, const Any& _rArgumentValue ) const { Reference< XInterface > xReturn; @@ -443,15 +443,15 @@ Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( } //------------------------------------------------------------------------ -bool FormCellBindingHelper::doConvertAddressRepresentations( const ::rtl::OUString& _rInputProperty, const Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) +bool FormCellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue, + const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) { bool bSuccess = false; Reference< XPropertySet > xConverter( createDocumentDependentInstance( _bIsRange ? OUString(SERVICE_RANGEADDRESS_CONVERSION) : OUString(SERVICE_ADDRESS_CONVERSION), - ::rtl::OUString(), + OUString(), Any() ), UNO_QUERY diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx index 1ab30cd87f8e..55d3f885ce9e 100644 --- a/xmloff/source/forms/formcellbinding.hxx +++ b/xmloff/source/forms/formcellbinding.hxx @@ -77,14 +77,14 @@ namespace xmloff */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > createCellBindingFromStringAddress( - const ::rtl::OUString& _rAddress, + const OUString& _rAddress, bool _bUseIntegerBinding ) const; /** gets a cell range list source binding for the given address */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > - createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const; + createCellListSourceFromStringAddress( const OUString& _rAddress ) const; /** creates a string representation for the given value binding's address @@ -95,7 +95,7 @@ namespace xmloff The binding is a valid cell binding, or @see isCellBinding */ - ::rtl::OUString getStringAddressFromCellBinding( + OUString getStringAddressFromCellBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding ) const; @@ -109,7 +109,7 @@ namespace xmloff The object is a valid cell range list source, or @see isCellRangeListSource */ - ::rtl::OUString getStringAddressFromCellListSource( + OUString getStringAddressFromCellListSource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ) const; @@ -186,7 +186,7 @@ namespace xmloff /** creates an address object from a string representation of a cell address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellAddress& /* [out] */ _rAddress, sal_Int16 _nAssumeSheet = -1 ) const; @@ -194,28 +194,28 @@ namespace xmloff /** creates an address range object from a string representation of a cell range address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellRangeAddress& /* [out] */ _rAddress ) const; /** determines if our document is a spreadsheet document, *and* can supply the given service */ - bool isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const SAL_THROW(()); + bool isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const SAL_THROW(()); /** determines if our document is a spreadsheet document, *and* can supply the given service */ static bool isSpreadsheetDocumentWhichSupplies( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _rxDocument, - const ::rtl::OUString& _rService + const OUString& _rService ) SAL_THROW(()); /** checkes whether a given component supports a given servive */ bool doesComponentSupport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, - const ::rtl::OUString& _rService + const OUString& _rService ) const; /** uses the document (it's factory interface, respectively) to create a component instance @@ -230,8 +230,8 @@ namespace xmloff */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createDocumentDependentInstance( - const ::rtl::OUString& _rService, - const ::rtl::OUString& _rArgumentName, + const OUString& _rService, + const OUString& _rArgumentName, const ::com::sun::star::uno::Any& _rArgumentValue ) const; @@ -256,9 +256,9 @@ namespace xmloff @see com::sun::star::table::CellRangeAddressConversion */ bool doConvertAddressRepresentations( - const ::rtl::OUString& _rInputProperty, + const OUString& _rInputProperty, const ::com::sun::star::uno::Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, + const OUString& _rOutputProperty, ::com::sun::star::uno::Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()); diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx index 4219b3c308e2..b200503caad7 100644 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -71,13 +71,13 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport::getControlId(const Reference< XPropertySet >& _rxControl) + OUString OFormLayerXMLExport::getControlId(const Reference< XPropertySet >& _rxControl) { return m_pImpl->getControlId(_rxControl); } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) + OUString OFormLayerXMLExport::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) { return m_pImpl->getControlNumberStyle(_rxControl); } diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx index c9e06a012145..80245da6195b 100644 --- a/xmloff/source/forms/formlayerimport.cxx +++ b/xmloff/source/forms/formlayerimport.cxx @@ -68,7 +68,7 @@ namespace xmloff } //--------------------------------------------------------------------- - Reference< XPropertySet > OFormLayerXMLImport::lookupControl(const ::rtl::OUString& _rId) + Reference< XPropertySet > OFormLayerXMLImport::lookupControl(const OUString& _rId) { return m_pImpl->lookupControlId(_rId); } @@ -77,20 +77,20 @@ namespace xmloff SvXMLImportContext* OFormLayerXMLImport::createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName) + const OUString& _rLocalName) { return m_pImpl->createOfficeFormsContext(_rImport, _nPrefix, _rLocalName); } //--------------------------------------------------------------------- - SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const rtl::OUString& _rLocalName, + SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< xml::sax::XAttributeList >& _rxAttribs) { return m_pImpl->createContext(_nPrefix, _rLocalName, _rxAttribs); } //--------------------------------------------------------------------- - void OFormLayerXMLImport::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rControlNumerStyleName) + void OFormLayerXMLImport::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName) { m_pImpl->applyControlNumberStyle(_rxControlModel, _rControlNumerStyleName); } diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index 86fa2046359c..c8c553629b4f 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -54,11 +54,11 @@ namespace xmloff } //---------------------------------------------------------------- - sal_Int32 findStringElement( const Sequence< ::rtl::OUString >& _rNames, const ::rtl::OUString& _rName ) + sal_Int32 findStringElement( const Sequence< OUString >& _rNames, const OUString& _rName ) { - const ::rtl::OUString* pStart = _rNames.getConstArray(); - const ::rtl::OUString* pEnd = _rNames.getConstArray() + _rNames.getLength(); - const ::rtl::OUString* pPos = ::std::find( pStart, pEnd, _rName ); + const OUString* pStart = _rNames.getConstArray(); + const OUString* pEnd = _rNames.getConstArray() + _rNames.getLength(); + const OUString* pPos = ::std::find( pStart, pEnd, _rName ); if ( pPos != pEnd ) return pPos - pStart; return -1; @@ -138,8 +138,8 @@ namespace xmloff // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException); }; //---------------------------------------------------------------- @@ -170,7 +170,7 @@ namespace xmloff } //---------------------------------------------------------------- - Property SAL_CALL OMergedPropertySetInfo::getPropertyByName( const ::rtl::OUString& aName ) throw (UnknownPropertyException, RuntimeException) + Property SAL_CALL OMergedPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException) { if ( aName == getParaAlignProperty() ) return Property( getParaAlignProperty(), -1, @@ -183,7 +183,7 @@ namespace xmloff } //---------------------------------------------------------------- - ::sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const ::rtl::OUString& Name ) throw (RuntimeException) + ::sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const OUString& Name ) throw (RuntimeException) { if ( Name == getParaAlignProperty() ) return sal_True; @@ -221,7 +221,7 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::setPropertyValue( const OUString& _rPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // we implement this by delegating it to setPropertyValues, which is to ignore unknown properties. On the other hand, our // contract requires us to throw a UnknownPropertyException for unknown properties, so check this first. @@ -229,15 +229,15 @@ namespace xmloff if ( !getPropertySetInfo()->hasPropertyByName( _rPropertyName ) ) throw UnknownPropertyException( _rPropertyName, *this ); - Sequence< ::rtl::OUString > aNames( &_rPropertyName, 1 ); + Sequence< OUString > aNames( &_rPropertyName, 1 ); Sequence< Any > aValues( &aValue, 1 ); setPropertyValues( aNames, aValues ); } //-------------------------------------------------------------------- - Any SAL_CALL OGridColumnPropertyTranslator::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + Any SAL_CALL OGridColumnPropertyTranslator::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - Sequence< ::rtl::OUString > aNames( &PropertyName, 1 ); + Sequence< OUString > aNames( &PropertyName, 1 ); Sequence< Any > aValues = getPropertyValues( aNames ); OSL_ENSURE( aValues.getLength() == 1, "OGridColumnPropertyTranslator::getPropertyValue: nonsense!" ); if ( aValues.getLength() == 1 ) @@ -246,31 +246,31 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addPropertyChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::removePropertyChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addVetoableChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::removeVetoableChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { if ( !m_xGridColumn.is() ) return; @@ -278,7 +278,7 @@ namespace xmloff // if there's ever the need for more than one property being translated, then we should // certainly have a more clever implementation than this ... - Sequence< ::rtl::OUString > aTranslatedNames( aPropertyNames ); + Sequence< OUString > aTranslatedNames( aPropertyNames ); Sequence< Any > aTranslatedValues( aValues ); sal_Int32 nParaAlignPos = findStringElement( aTranslatedNames, getParaAlignProperty() ); @@ -292,13 +292,13 @@ namespace xmloff } //-------------------------------------------------------------------- - Sequence< Any > SAL_CALL OGridColumnPropertyTranslator::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) throw (RuntimeException) + Sequence< Any > SAL_CALL OGridColumnPropertyTranslator::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException) { Sequence< Any > aValues( aPropertyNames.getLength() ); if ( !m_xGridColumn.is() ) return aValues; - Sequence< ::rtl::OUString > aTranslatedNames( aPropertyNames ); + Sequence< OUString > aTranslatedNames( aPropertyNames ); sal_Int32 nAlignPos = findStringElement( aTranslatedNames, getParaAlignProperty() ); if ( nAlignPos != -1 ) aTranslatedNames[ nAlignPos ] = getAlignProperty(); @@ -311,7 +311,7 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addPropertiesChangeListener: not implemented - this should not be needed!" ); } @@ -323,7 +323,7 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::firePropertiesChangeEvent: not implemented - this should not be needed!" ); } diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx index ce391297496f..6c9313bdc7e7 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.hxx +++ b/xmloff/source/forms/gridcolumnproptranslator.hxx @@ -51,19 +51,19 @@ namespace xmloff // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); }; //........................................................................ diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx index eeea8e4ca831..b306a65ce04b 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.cxx +++ b/xmloff/source/forms/handler/vcl_date_handler.cxx @@ -47,14 +47,14 @@ namespace xmloff } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLDateHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const + OUString VCLDateHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const { OSL_ENSURE( false, "VCLDateHandler::getAttributeValue: unexpected call!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLDateHandler::getAttributeValue( const Any& i_propertyValue ) const + OUString VCLDateHandler::getAttributeValue( const Any& i_propertyValue ) const { sal_Int32 nVCLDate(0); OSL_VERIFY( i_propertyValue >>= nVCLDate ); @@ -65,13 +65,13 @@ namespace xmloff aDateTime.Month = aVCLDate.GetMonth(); aDateTime.Year = aVCLDate.GetYear(); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertDateTime( aBuffer, aDateTime, false ); return aBuffer.makeStringAndClear(); } //------------------------------------------------------------------------------------------------------------------ - bool VCLDateHandler::getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const + bool VCLDateHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const { sal_Int32 nVCLDate(0); diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx index 6863dbc802bb..720270ba04b0 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.hxx +++ b/xmloff/source/forms/handler/vcl_date_handler.hxx @@ -36,9 +36,9 @@ namespace xmloff VCLDateHandler(); // IPropertyHandler - virtual ::rtl::OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; - virtual ::rtl::OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; - virtual bool getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const; + virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; + virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; + virtual bool getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const; }; //...................................................................................................................... diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx index 4a29fbd71301..4339ed75c791 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.cxx +++ b/xmloff/source/forms/handler/vcl_time_handler.cxx @@ -47,14 +47,14 @@ namespace xmloff } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLTimeHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const + OUString VCLTimeHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const { OSL_ENSURE( false, "VCLTimeHandler::getAttributeValue: unexpected call!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const + OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const { sal_Int32 nVCLTime(0); OSL_VERIFY( i_propertyValue >>= nVCLTime ); @@ -66,13 +66,13 @@ namespace xmloff aDuration.Seconds = aVCLTime.GetSec(); aDuration.MilliSeconds = aVCLTime.Get100Sec() * 10; - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertDuration( aBuffer, aDuration ); return aBuffer.makeStringAndClear(); } //------------------------------------------------------------------------------------------------------------------ - bool VCLTimeHandler::getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const + bool VCLTimeHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const { sal_Int32 nVCLTime(0); diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx index d9631f02d2c9..5785a78cbb08 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.hxx +++ b/xmloff/source/forms/handler/vcl_time_handler.hxx @@ -36,9 +36,9 @@ namespace xmloff VCLTimeHandler(); // IPropertyHandler - virtual ::rtl::OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; - virtual ::rtl::OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; - virtual bool getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const; + virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; + virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; + virtual bool getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const; }; //...................................................................................................................... diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 13e0ed37a93b..2b065c7d5165 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -74,9 +74,9 @@ namespace xmloff //= OFormLayerXMLExport_Impl //===================================================================== //--------------------------------------------------------------------- - const ::rtl::OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix() + const OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix() { - static const ::rtl::OUString s_sControlNumberStyleNamePrefix("C"); + static const OUString s_sControlNumberStyleNamePrefix("C"); return s_sControlNumberStyleNamePrefix; } @@ -96,7 +96,7 @@ namespace xmloff m_rContext.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_CONTROL_ID, token::GetXMLToken(token::XML_PARAGRAPH), m_xStyleExportMapper.get(), - ::rtl::OUString( XML_STYLE_FAMILY_CONTROL_PREFIX ) + OUString( XML_STYLE_FAMILY_CONTROL_PREFIX ) ); // add our event translation table @@ -150,13 +150,13 @@ namespace xmloff const Sequence< ScriptEventDescriptor >& _rEvents) { // the list of the referring controls - ::rtl::OUString sReferringControls; + OUString sReferringControls; MapPropertySet2String::const_iterator aReferring = m_aCurrentPageReferring->second.find(_rxControl); if (aReferring != m_aCurrentPageReferring->second.end()) sReferringControls = aReferring->second; // the control id (should already have been created in examineForms) - ::rtl::OUString sControlId( getControlId( _rxControl ) ); + OUString sControlId( getControlId( _rxControl ) ); // do the exporting OControlExport aExportImpl(*this, _rxControl, sControlId, sReferringControls, _rEvents); @@ -241,9 +241,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getObjectStyleName( const Reference< XPropertySet >& _rxObject ) + OUString OFormLayerXMLExport_Impl::getObjectStyleName( const Reference< XPropertySet >& _rxObject ) { - ::rtl::OUString aObjectStyle; + OUString aObjectStyle; MapPropertySet2String::const_iterator aObjectStylePos = m_aGridColumnStyles.find( _rxObject ); if ( m_aGridColumnStyles.end() != aObjectStylePos ) @@ -389,10 +389,10 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getControlId(const Reference< XPropertySet >& _rxControl) + OUString OFormLayerXMLExport_Impl::getControlId(const Reference< XPropertySet >& _rxControl) { if (m_aCurrentPageIds == m_aControlIds.end()) - return ::rtl::OUString(); + return OUString(); OSL_ENSURE(m_aCurrentPageIds->second.end() != m_aCurrentPageIds->second.find(_rxControl), "OFormLayerXMLExport_Impl::getControlId: can not find the control!"); @@ -400,9 +400,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getImmediateNumberStyle( const Reference< XPropertySet >& _rxObject ) + OUString OFormLayerXMLExport_Impl::getImmediateNumberStyle( const Reference< XPropertySet >& _rxObject ) { - ::rtl::OUString sNumberStyle; + OUString sNumberStyle; sal_Int32 nOwnFormatKey = implExamineControlNumberFormat( _rxObject ); if ( -1 != nOwnFormatKey ) @@ -412,9 +412,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) + OUString OFormLayerXMLExport_Impl::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) { - ::rtl::OUString sNumberStyle; + OUString sNumberStyle; ConstMapPropertySet2IntIterator aControlFormatPos = m_aControlNumberFormats.find(_rxControl); if (m_aControlNumberFormats.end() != aControlFormatPos) @@ -503,13 +503,13 @@ namespace xmloff } }; - ::rtl::OUString lcl_findFreeControlId( const MapPropertySet2Map& _rAllPagesControlIds ) + OUString lcl_findFreeControlId( const MapPropertySet2Map& _rAllPagesControlIds ) { - static const ::rtl::OUString sControlIdBase( "control" ); - ::rtl::OUString sControlId = sControlIdBase; + static const OUString sControlIdBase( "control" ); + OUString sControlId = sControlIdBase; size_t nKnownControlCount = ::std::accumulate( _rAllPagesControlIds.begin(), _rAllPagesControlIds.end(), (size_t)0, AccumulateSize() ); - sControlId += ::rtl::OUString::valueOf( (sal_Int32)nKnownControlCount + 1 ); + sControlId += OUString::valueOf( (sal_Int32)nKnownControlCount + 1 ); #ifdef DBG_UTIL // Check if the id is already used. It shouldn't, as we currently have no mechanism for removing entries @@ -545,7 +545,7 @@ namespace xmloff // generate a new control id // find a free id - ::rtl::OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); + OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); // add it to the map m_aCurrentPageIds->second[_rxObject] = sCurrentId; @@ -556,11 +556,11 @@ namespace xmloff Reference< XPropertySet > xCurrentReference( _rxObject->getPropertyValue( PROPERTY_CONTROLLABEL ), UNO_QUERY ); if (xCurrentReference.is()) { - ::rtl::OUString& sReferencedBy = m_aCurrentPageReferring->second[xCurrentReference]; + OUString& sReferencedBy = m_aCurrentPageReferring->second[xCurrentReference]; if (!sReferencedBy.isEmpty()) // it's not the first _rxObject referring to the xCurrentReference // -> separate the id - sReferencedBy += ::rtl::OUString(","); + sReferencedBy += OUString(","); sReferencedBy += sCurrentId; } } @@ -618,7 +618,7 @@ namespace xmloff // generate a new control id // find a free id - ::rtl::OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); + OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); // add it to the map m_aCurrentPageIds->second[ xColumnProperties ] = sCurrentId; @@ -629,7 +629,7 @@ namespace xmloff ::std::vector< XMLPropertyState > aPropertyStates = m_xStyleExportMapper->Filter( xColumnProperties ); // care for the number format, additionally - ::rtl::OUString sColumnNumberStyle; + OUString sColumnNumberStyle; if ( xColumnPropertiesMeta.is() && xColumnPropertiesMeta->hasPropertyByName( PROPERTY_FORMATKEY ) ) sColumnNumberStyle = getImmediateNumberStyle( xColumnProperties ); @@ -656,7 +656,7 @@ namespace xmloff if ( !aPropertyStates.empty() ) { // add to the style pool - ::rtl::OUString sColumnStyleName = m_rContext.GetAutoStylePool()->Add( XML_STYLE_FAMILY_CONTROL_ID, aPropertyStates ); + OUString sColumnStyleName = m_rContext.GetAutoStylePool()->Add( XML_STYLE_FAMILY_CONTROL_ID, aPropertyStates ); OSL_ENSURE( m_aGridColumnStyles.end() == m_aGridColumnStyles.find( xColumnProperties ), "OFormLayerXMLExport_Impl::collectGridColumnStylesAndIds: already have a style for this column!" ); @@ -723,7 +723,7 @@ namespace xmloff // obtain the persistent (does not depend on the formats supplier) representation of the control's format Locale aFormatLocale; - ::rtl::OUString sFormatDescription; + OUString sFormatDescription; if (xControlFormats.is()) { Reference< XPropertySet > xControlFormat = xControlFormats->getByKey(nControlFormatKey); @@ -762,9 +762,9 @@ namespace xmloff { // create it for en-US (does not really matter, as we will specify a locale for every // concrete language to use) - Locale aLocale ( ::rtl::OUString("en"), - ::rtl::OUString("US"), - ::rtl::OUString() + Locale aLocale ( OUString("en"), + OUString("US"), + OUString() ); xFormatsSupplier = NumberFormatsSupplier::createWithLocale( m_rContext.getComponentContext(), aLocale ); m_xControlNumberFormats = xFormatsSupplier->getNumberFormats(); diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index 12fe435417cf..bd25986b478e 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -44,7 +44,7 @@ namespace xmloff // maps objects (property sets) to strings, e.g. control ids. typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - , ::rtl::OUString + , OUString , OPropertySetCompare > MapPropertySet2String; @@ -157,7 +157,7 @@ namespace xmloff

      You must have sought to the page of the control before calling this.

      */ - ::rtl::OUString + OUString getControlId(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl); /** retrieves the style name for the control's number style. @@ -165,13 +165,13 @@ namespace xmloff

      For performance reasons, this method is allowed to be called for any controls, even those which do not have a number style. In this case, an empty string is returned.

      */ - ::rtl::OUString + OUString getControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl ); // IFormsExportContext virtual void exportCollectionElements(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxCollection); virtual SvXMLExport& getGlobalContext(); - virtual ::rtl::OUString getObjectStyleName( + virtual OUString getObjectStyleName( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); virtual ::rtl::Reference< SvXMLExportPropertyMapper > getStylePropertyMapper(); @@ -283,12 +283,12 @@ namespace xmloff /** determines the number format style for the given object without remembering it */ - ::rtl::OUString + OUString getImmediateNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); /** returns the prefix to be used for control number styles */ - static const ::rtl::OUString& getControlNumberStyleNamePrefix(); + static const OUString& getControlNumberStyleNamePrefix(); /** exclude the given control (model) from export. diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index f87c791e6470..bbbb8d59405a 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -109,7 +109,7 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) // properties not added because they're already present in another form OSL_ENSURE( - 0 == ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_LOCATION)).compareToAscii( + 0 == OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_LOCATION)).compareToAscii( OAttributeMetaData::getFormAttributeName(faAction)), "OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl: invalid attribute names (1)!"); // if this fails, we would have to add a translation from faAction->PROPERTY_TARGETURL @@ -117,7 +117,7 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) // and CCA_TARGET_LOCATION and faAction should be represented by the same attribute OSL_ENSURE( - 0 == ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_NAME)).compareToAscii( + 0 == OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_NAME)).compareToAscii( OAttributeMetaData::getFormAttributeName(faName)), "OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl: invalid attribute names (2)!"); // the same for faName, CCA_NAME and PROPERTY_NAME @@ -252,7 +252,7 @@ void OFormLayerXMLImport_Impl::setAutoStyleContext(SvXMLStylesContext* _pNewCont } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rControlNumerStyleName) +void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName) { OSL_ENSURE(_rxControlModel.is() && (!_rControlNumerStyleName.isEmpty()), "OFormLayerXMLImport_Impl::applyControlNumberStyle: invalid arguments (this will crash)!"); @@ -304,7 +304,7 @@ void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropert } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rCellAddress ) +void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPropertySet >& _rxControlModel, const OUString& _rCellAddress ) { OSL_ENSURE( _rxControlModel.is() && !_rCellAddress.isEmpty(), "OFormLayerXMLImport_Impl::registerCellValueBinding: invalid arguments!" ); @@ -314,7 +314,7 @@ void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPrope //--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsValueBinding( const Reference< XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID ) + const OUString& _rBindingID ) { // TODO: is an empty binding name allowed? OSL_ENSURE( _rxControlModel.is(), "need model" ); @@ -326,7 +326,7 @@ void OFormLayerXMLImport_Impl::registerXFormsValueBinding( //--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsListBinding( const Reference< XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID ) + const OUString& _rBindingID ) { // TODO: is an empty binding name allowed? OSL_ENSURE( _rxControlModel.is(), "need model" ); @@ -338,7 +338,7 @@ void OFormLayerXMLImport_Impl::registerXFormsListBinding( //--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsSubmission( const Reference< XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rSubmissionID ) + const OUString& _rSubmissionID ) { // TODO: is an empty binding name allowed? OSL_ENSURE( _rxControlModel.is(), "need model" ); @@ -348,14 +348,14 @@ void OFormLayerXMLImport_Impl::registerXFormsSubmission( } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerCellRangeListSource( const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rCellRangeAddress ) +void OFormLayerXMLImport_Impl::registerCellRangeListSource( const Reference< XPropertySet >& _rxControlModel, const OUString& _rCellRangeAddress ) { OSL_ENSURE( _rxControlModel.is() && !_rCellRangeAddress.isEmpty(), "OFormLayerXMLImport_Impl::registerCellRangeListSource: invalid arguments!" ); m_aCellRangeListSources.push_back( ModelStringPair( _rxControlModel, _rCellRangeAddress ) ); } //--------------------------------------------------------------------- -const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const ::rtl::OUString& _rStyleName) const +const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const OUString& _rStyleName) const { OSL_ENSURE( m_pAutoStyles, "OFormLayerXMLImport_Impl::getStyleElement: have no auto style context!" ); // did you use setAutoStyleContext? @@ -363,7 +363,7 @@ const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const ::rtl:: const SvXMLStyleContext* pControlStyle = m_pAutoStyles ? m_pAutoStyles->FindStyleChildContext( XML_STYLE_FAMILY_TEXT_PARAGRAPH, _rStyleName ) : NULL; OSL_ENSURE( pControlStyle || !m_pAutoStyles, - ::rtl::OStringBuffer("OFormLayerXMLImport_Impl::getStyleElement: did not find the style named \"").append(rtl::OUStringToOString(_rStyleName, RTL_TEXTENCODING_ASCII_US)).append("\"!").getStr() ); + OStringBuffer("OFormLayerXMLImport_Impl::getStyleElement: did not find the style named \"").append(OUStringToOString(_rStyleName, RTL_TEXTENCODING_ASCII_US)).append("\"!").getStr() ); return pControlStyle; } @@ -383,7 +383,7 @@ void OFormLayerXMLImport_Impl::leaveEventContext() } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet >& _rxControl, const ::rtl::OUString& _rId) +void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet >& _rxControl, const OUString& _rId) { OSL_ENSURE(m_aCurrentPageIds != m_aControlIds.end(), "OFormLayerXMLImport_Impl::registerControlId: no current page!"); OSL_ENSURE(!_rId.isEmpty(), "OFormLayerXMLImport_Impl::registerControlId: invalid (empty) control id!"); @@ -393,7 +393,7 @@ void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet > } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPropertySet >& _rxControl, const ::rtl::OUString& _rReferringControls) +void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPropertySet >& _rxControl, const OUString& _rReferringControls) { OSL_ENSURE(!_rReferringControls.isEmpty(), "OFormLayerXMLImport_Impl::registerControlReferences: invalid (empty) control id list!"); OSL_ENSURE(_rxControl.is(), "OFormLayerXMLImport_Impl::registerControlReferences: invalid (NULL) control!"); @@ -428,9 +428,9 @@ void OFormLayerXMLImport_Impl::endPage() try { static const sal_Unicode s_nSeparator = ','; - ::rtl::OUString sReferring; - ::rtl::OUString sCurrentReferring; - ::rtl::OUString sSeparator(&s_nSeparator, 1); + OUString sReferring; + OUString sCurrentReferring; + OUString sSeparator(&s_nSeparator, 1); Reference< XPropertySet > xCurrentReferring; sal_Int32 nSeparator, nPrevSep; ::std::vector< ModelStringPair >::const_iterator aEnd = m_aControlReferences.end(); @@ -479,7 +479,7 @@ void OFormLayerXMLImport_Impl::endPage() } //--------------------------------------------------------------------- -Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const ::rtl::OUString& _rControlId) +Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const OUString& _rControlId) { OSL_ENSURE(m_aCurrentPageIds != m_aControlIds.end(), "OFormLayerXMLImport_Impl::lookupControlId: no current page!"); Reference< XPropertySet > xReturn; @@ -498,13 +498,13 @@ Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const ::rtl: SvXMLImportContext* OFormLayerXMLImport_Impl::createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName) + const OUString& _rLocalName) { return new OFormsRootImport( _rImport, _nPrefix, _rLocalName ); } //--------------------------------------------------------------------- -SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const rtl::OUString& _rLocalName, +SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< xml::sax::XAttributeList >&) { SvXMLImportContext* pContext = NULL; @@ -557,7 +557,7 @@ void OFormLayerXMLImport_Impl::documentDone( ) { // There are special bindings for listboxes. See // OListAndComboImport::doRegisterCellValueBinding for a comment on this HACK. - ::rtl::OUString sBoundCellAddress( aCellBindings->second ); + OUString sBoundCellAddress( aCellBindings->second ); sal_Int32 nIndicator = sBoundCellAddress.lastIndexOf( s_sIndex ); bool bUseIndexBinding = false; diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx index 1e7fb1427a2b..cb1b68d46435 100644 --- a/xmloff/source/forms/layerimport.hxx +++ b/xmloff/source/forms/layerimport.hxx @@ -67,7 +67,7 @@ namespace xmloff MapDrawPage2Map m_aControlIds; // ids of the controls on all known page MapDrawPage2MapIterator m_aCurrentPageIds; // ifs of the controls on the current page - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::rtl::OUString > + typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, OUString > ModelStringPair; ::std::vector< ModelStringPair > m_aControlReferences; // control reference descriptions for current page @@ -89,44 +89,44 @@ namespace xmloff // IControlIdMap void registerControlId( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rId); + const OUString& _rId); void registerControlReferences( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rReferringControls); + const OUString& _rReferringControls); // OFormLayerXMLImport_Impl inline OAttribute2Property& getAttributeMap() { return m_aAttributeMetaData; } inline SvXMLImport& getGlobalContext() { return m_rImporter; } - const SvXMLStyleContext* getStyleElement(const ::rtl::OUString& _rStyleName) const; + const SvXMLStyleContext* getStyleElement(const OUString& _rStyleName) const; void enterEventContext(); void leaveEventContext(); void applyControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rControlNumerStyleName + const OUString& _rControlNumerStyleName ); void registerCellValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rCellAddress + const OUString& _rCellAddress ); void registerCellRangeListSource( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rCellRangeAddress + const OUString& _rCellRangeAddress ); void registerXFormsValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID + const OUString& _rBindingID ); void registerXFormsListBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID + const OUString& _rBindingID ); void registerXFormsSubmission( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rSubmissionID + const OUString& _rSubmissionID ); protected: @@ -147,20 +147,20 @@ namespace xmloff SvXMLImportContext* createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName); + const OUString& _rLocalName); /** create an SvXMLImportContext instance which is able to import the <form:form> element. */ SvXMLImportContext* createContext( const sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName, + const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttribs); /** get the control with the given id */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - lookupControlId(const ::rtl::OUString& _rControlId); + lookupControlId(const OUString& _rControlId); /** announces the auto-style context to the form importer */ diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index 35c6b33570d1..1b1aeed8c461 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -48,7 +48,7 @@ namespace xmloff //========================================================================= TYPEINIT1(OFormsRootImport, SvXMLImportContext); //------------------------------------------------------------------------- - OFormsRootImport::OFormsRootImport( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName ) + OFormsRootImport::OFormsRootImport( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName ) :SvXMLImportContext(rImport, nPrfx, rLocalName) { } @@ -59,7 +59,7 @@ namespace xmloff } //------------------------------------------------------------------------- - SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList>& xAttrList ) { return GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList ); @@ -68,15 +68,15 @@ namespace xmloff //------------------------------------------------------------------------- void OFormsRootImport::implImportBool(const Reference< XAttributeList >& _rxAttributes, OfficeFormsAttributes _eAttribute, const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, sal_Bool _bDefault) + const OUString& _rPropName, sal_Bool _bDefault) { // the complete attribute name to look for - ::rtl::OUString sCompleteAttributeName = GetImport().GetNamespaceMap().GetQNameByIndex( + OUString sCompleteAttributeName = GetImport().GetNamespaceMap().GetQNameByIndex( OAttributeMetaData::getOfficeFormsAttributeNamespace(_eAttribute), - ::rtl::OUString::createFromAscii(OAttributeMetaData::getOfficeFormsAttributeName(_eAttribute))); + OUString::createFromAscii(OAttributeMetaData::getOfficeFormsAttributeName(_eAttribute))); // get and convert the value - ::rtl::OUString sAttributeValue = _rxAttributes->getValueByName(sCompleteAttributeName); + OUString sAttributeValue = _rxAttributes->getValueByName(sCompleteAttributeName); bool bValue = _bDefault; ::sax::Converter::convertBool(bValue, sAttributeValue); @@ -141,7 +141,7 @@ namespace xmloff //------------------------------------------------------------------------- void OFormsRootExport::implExportBool(SvXMLExport& _rExp, OfficeFormsAttributes _eAttribute, const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, sal_Bool _bDefault) + const OUString& _rPropName, sal_Bool _bDefault) { // retrieve the property value sal_Bool bValue = _bDefault; @@ -149,7 +149,7 @@ namespace xmloff bValue = ::cppu::any2bool(_rxProps->getPropertyValue(_rPropName)); // convert into a string - ::rtl::OUStringBuffer aValue; + OUStringBuffer aValue; ::sax::Converter::convertBool(aValue, bValue); // add the attribute diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index 338d06adfdd1..7225ce9280b8 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -42,11 +42,11 @@ namespace xmloff public: TYPEINFO(); - OFormsRootImport( SvXMLImport& _rImport, sal_uInt16 _nPrfx, const rtl::OUString& _rLocalName); + OFormsRootImport( SvXMLImport& _rImport, sal_uInt16 _nPrfx, const OUString& _rLocalName); virtual ~OFormsRootImport(); // SvXMLImportContext overriabled - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ); virtual void EndElement(); @@ -57,7 +57,7 @@ namespace xmloff OfficeFormsAttributes _eAttribute, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, + const OUString& _rPropName, sal_Bool _bDefault ); }; @@ -82,7 +82,7 @@ namespace xmloff OfficeFormsAttributes _eAttribute, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, + const OUString& _rPropName, sal_Bool _bDefault ); }; diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx index 488e625c28f9..170b23d52269 100644 --- a/xmloff/source/forms/property_description.hxx +++ b/xmloff/source/forms/property_description.hxx @@ -70,7 +70,7 @@ namespace xmloff struct PropertyDescription { /// is the name of the property - const ::rtl::OUString propertyName; + const OUString propertyName; /** denotes the attribute which represents the property. Note that multiple properties might comprise a single attribute value. */ @@ -100,7 +100,7 @@ namespace xmloff } PropertyDescription( - const ::rtl::OUString& i_propertyName, + const OUString& i_propertyName, const sal_uInt16 i_namespacePrefix, const ::xmloff::token::XMLTokenEnum i_attributeToken, const PropertyHandlerFactory i_factory, diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index d3d0ceba6611..c9583fff4976 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -74,7 +74,7 @@ namespace xmloff { namespace metadata // for some attribute or property, and otherwise delegate to the next instance. //.............................................................................................................. - typedef ::boost::unordered_map< ::rtl::OUString, const PropertyDescription*, ::rtl::OUStringHash > DescriptionsByName; + typedef ::boost::unordered_map< OUString, const PropertyDescription*, OUStringHash > DescriptionsByName; //.............................................................................................................. const DescriptionsByName& lcl_getPropertyDescriptions() @@ -115,7 +115,7 @@ namespace xmloff { namespace metadata } //.............................................................................................................. - typedef ::boost::unordered_map< ::rtl::OUString, XMLTokenEnum, ::rtl::OUStringHash > ReverseTokenLookup; + typedef ::boost::unordered_map< OUString, XMLTokenEnum, OUStringHash > ReverseTokenLookup; //.............................................................................................................. const ReverseTokenLookup& getReverseTokenLookup() @@ -192,7 +192,7 @@ namespace xmloff { namespace metadata } //------------------------------------------------------------------------------------------------------------------ - const PropertyDescription* getPropertyDescription( const ::rtl::OUString& i_propertyName ) + const PropertyDescription* getPropertyDescription( const OUString& i_propertyName ) { const DescriptionsByName& rAllDescriptions( lcl_getPropertyDescriptions() ); DescriptionsByName::const_iterator pos = rAllDescriptions.find( i_propertyName ); @@ -248,7 +248,7 @@ namespace xmloff { namespace metadata } //------------------------------------------------------------------------------------------------------------------ - AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const ::rtl::OUString& i_attributeName ) + AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ) { AttributeDescription attribute; const ReverseTokenLookup& rTokenLookup( getReverseTokenLookup() ); diff --git a/xmloff/source/forms/property_meta_data.hxx b/xmloff/source/forms/property_meta_data.hxx index 27d21b9bef0d..7db6912190da 100644 --- a/xmloff/source/forms/property_meta_data.hxx +++ b/xmloff/source/forms/property_meta_data.hxx @@ -27,7 +27,7 @@ namespace xmloff { namespace metadata { //...................................................................................................................... - const PropertyDescription* getPropertyDescription( const ::rtl::OUString& i_propertyName ); + const PropertyDescription* getPropertyDescription( const OUString& i_propertyName ); /** retries the descriptions of all properties which add to the given XML attribute @@ -49,7 +49,7 @@ namespace xmloff { namespace metadata /** retrieves the attribute descriptor for the attribute given by namespace prefix and attribute name */ AttributeDescription - getAttributeDescription( const sal_uInt16 i_namespacePrefix, const ::rtl::OUString& i_attributeName ); + getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ); //...................................................................................................................... } } // namespace xmloff::metadata diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index c86c6ac6ea72..a0de21a02029 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -65,7 +65,7 @@ namespace xmloff ,m_xPropertyState( _rxProps, UNO_QUERY ) { // caching - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertBool(aBuffer, true); m_sValueTrue = aBuffer.makeStringAndClear(); ::sax::Converter::convertBool(aBuffer, false); @@ -78,7 +78,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OPropertyExport::shouldExportProperty( const ::rtl::OUString& i_propertyName ) const + bool OPropertyExport::shouldExportProperty( const OUString& i_propertyName ) const { // if the property state is DEFAULT, it does not need to be written - at least // if it's a built-in property, and not a dynamically-added one. @@ -96,7 +96,7 @@ namespace xmloff OSequenceIterator< T > i(value); while (i.hasMoreElements()) { - ::rtl::OUString sValue(implConvertAny(i.nextElement())); + OUString sValue(implConvertAny(i.nextElement())); AddAttribute(XML_NAMESPACE_OFFICE, eValueAttName, sValue ); SvXMLElementExport aValueTag( m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, @@ -112,7 +112,7 @@ namespace xmloff try { Any aValue; - ::rtl::OUString sValue; + OUString sValue; // loop through all the properties which are yet to be exported for ( ConstStringSetIterator aProperty = m_aRemainingProps.begin(); @@ -123,7 +123,7 @@ namespace xmloff DBG_CHECK_PROPERTY_NO_TYPE(*aProperty); #if OSL_DEBUG_LEVEL > 0 - const ::rtl::OUString sPropertyName = *aProperty; (void)sPropertyName; + const OUString sPropertyName = *aProperty; (void)sPropertyName; #endif if ( !shouldExportProperty( *aProperty ) ) continue; @@ -194,7 +194,7 @@ namespace xmloff switch ( aExportType.getTypeClass() ) { case TypeClass_STRING: - exportRemainingPropertiesSequence< ::rtl::OUString >( + exportRemainingPropertiesSequence< OUString >( aValue, eValueAttName); break; case TypeClass_DOUBLE: @@ -257,9 +257,9 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName ) + const OUString& _rPropertyName ) { - DBG_CHECK_PROPERTY( _rPropertyName, ::rtl::OUString ); + DBG_CHECK_PROPERTY( _rPropertyName, OUString ); // no try-catch here, this would be to expensive. The outer scope has to handle exceptions (which should not // happen if we're used correctly :) @@ -267,7 +267,7 @@ namespace xmloff // this is way simple, as we don't need to convert anything (the property already is a string) // get the string - ::rtl::OUString sPropValue; + OUString sPropValue; m_xProps->getPropertyValue( _rPropertyName ) >>= sPropValue; // add the attribute @@ -280,7 +280,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportBooleanPropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags) + const OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags) { DBG_CHECK_PROPERTY_NO_TYPE( _rPropertyName ); // no check of the property value type: this method is allowed to be called with any interger properties @@ -319,7 +319,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportInt16PropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, const sal_Int16 _nDefault) + const OUString& _rPropertyName, const sal_Int16 _nDefault) { DBG_CHECK_PROPERTY( _rPropertyName, sal_Int16 ); @@ -331,7 +331,7 @@ namespace xmloff if (_nDefault != nCurrentValue) { // let the formatter of the export context build a string - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, (sal_Int32)nCurrentValue); AddAttribute(_nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear()); @@ -343,7 +343,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, const sal_Int32 _nDefault ) + const OUString& _rPropertyName, const sal_Int32 _nDefault ) { DBG_CHECK_PROPERTY( _rPropertyName, sal_Int32 ); @@ -355,7 +355,7 @@ namespace xmloff if ( _nDefault != nCurrentValue ) { // let the formatter of the export context build a string - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber( sBuffer, nCurrentValue ); AddAttribute( _nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear() ); @@ -368,7 +368,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportEnumPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const rtl::OUString &rPropertyName, const SvXMLEnumMapEntry* _pValueMap, + const OUString &rPropertyName, const SvXMLEnumMapEntry* _pValueMap, const sal_Int32 _nDefault, const sal_Bool _bVoidDefault) { // get the value @@ -384,7 +384,7 @@ namespace xmloff { // the default does not equal the value, or the default is void and the value isn't // let the formatter of the export context build a string - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; m_rContext.getGlobalContext().GetMM100UnitConverter().convertEnum(sBuffer, (sal_uInt16)nCurrentValue, _pValueMap); AddAttribute(_nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear()); @@ -403,9 +403,9 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportTargetFrameAttribute() { - DBG_CHECK_PROPERTY( PROPERTY_TARGETFRAME, ::rtl::OUString ); + DBG_CHECK_PROPERTY( PROPERTY_TARGETFRAME, OUString ); - ::rtl::OUString sTargetFrame = comphelper::getString(m_xProps->getPropertyValue(PROPERTY_TARGETFRAME)); + OUString sTargetFrame = comphelper::getString(m_xProps->getPropertyValue(PROPERTY_TARGETFRAME)); if (0 != sTargetFrame.compareToAscii("_blank")) { // an empty string and "_blank" have the same meaning and don't have to be written AddAttribute(OAttributeMetaData::getCommonControlAttributeNamespace(CCA_TARGET_FRAME) @@ -419,9 +419,9 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportRelativeTargetLocation(const OUString& _sPropertyName,sal_Int32 _nProperty,bool _bAddType) { - DBG_CHECK_PROPERTY( _sPropertyName, ::rtl::OUString ); + DBG_CHECK_PROPERTY( _sPropertyName, OUString ); - ::rtl::OUString sTargetLocation = comphelper::getString(m_xProps->getPropertyValue(_sPropertyName)); + OUString sTargetLocation = comphelper::getString(m_xProps->getPropertyValue(_sPropertyName)); if ( !sTargetLocation.isEmpty() ) // If this isn't a GraphicObject then GetRelativeReference // will be called anyway ( in AddEmbeddedGraphic ) @@ -467,7 +467,7 @@ namespace xmloff { DBG_CHECK_PROPERTY_ASCII_NO_TYPE( _pPropertyName ); - ::rtl::OUString sPropertyName = ::rtl::OUString::createFromAscii(_pPropertyName); + OUString sPropertyName = OUString::createFromAscii(_pPropertyName); exportedProperty(sPropertyName); Any aCurrentValue = m_xProps->getPropertyValue(sPropertyName); @@ -475,7 +475,7 @@ namespace xmloff // nothing to do without a concrete value return; - ::rtl::OUString sValue = implConvertAny(aCurrentValue); + OUString sValue = implConvertAny(aCurrentValue); if (sValue.isEmpty() && (TypeClass_STRING == aCurrentValue.getValueTypeClass())) { // check whether or not the property is allowed to be VOID @@ -492,26 +492,26 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportStringSequenceAttribute(const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Unicode _aQuoteCharacter, const sal_Unicode _aListSeparator) { - DBG_CHECK_PROPERTY( _rPropertyName, Sequence< ::rtl::OUString > ); + DBG_CHECK_PROPERTY( _rPropertyName, Sequence< OUString > ); OSL_ENSURE(_aListSeparator != 0, "OPropertyExport::exportStringSequenceAttribute: invalid separator character!"); - Sequence< ::rtl::OUString > aItems; + Sequence< OUString > aItems; m_xProps->getPropertyValue( _rPropertyName ) >>= aItems; - ::rtl::OUString sFinalList; + OUString sFinalList; // unfortunately the OUString can't append single sal_Unicode characters ... - const ::rtl::OUString sQuote(&_aQuoteCharacter, 1); - const ::rtl::OUString sSeparator(&_aListSeparator, 1); + const OUString sQuote(&_aQuoteCharacter, 1); + const OUString sSeparator(&_aListSeparator, 1); const sal_Bool bQuote = !sQuote.isEmpty(); // concatenate the string items - const ::rtl::OUString* pItems = aItems.getConstArray(); - const ::rtl::OUString* pEnd = pItems + aItems.getLength(); - const ::rtl::OUString* pLastElement = pEnd - 1; + const OUString* pItems = aItems.getConstArray(); + const OUString* pEnd = pItems + aItems.getLength(); + const OUString* pLastElement = pEnd - 1; for ( ; pItems != pEnd; ++pItems @@ -539,14 +539,14 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OPropertyExport::implConvertAny(const Any& _rValue) + OUString OPropertyExport::implConvertAny(const Any& _rValue) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; switch (_rValue.getValueTypeClass()) { case TypeClass_STRING: { // extract the string - ::rtl::OUString sCurrentValue; + OUString sCurrentValue; _rValue >>= sCurrentValue; aBuffer.append(sCurrentValue); } @@ -646,16 +646,16 @@ namespace xmloff #ifdef DBG_UTIL //--------------------------------------------------------------------- - void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const ::rtl::OUString& _rValue) + void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue) { - OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::rtl::OUString::createFromAscii(_pName)).isEmpty(), + OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(), "OPropertyExport::AddAttribute: already have such an attribute"); m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, _rValue); } //--------------------------------------------------------------------- - void OPropertyExport::AddAttribute( sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue ) + void OPropertyExport::AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName( _rName ).isEmpty(), "OPropertyExport::AddAttribute: already have such an attribute"); @@ -666,14 +666,14 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::AddAttributeASCII(sal_uInt16 _nPrefix, const sal_Char* _pName, const sal_Char *pValue) { - OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::rtl::OUString::createFromAscii(_pName)).isEmpty(), + OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(), "OPropertyExport::AddAttributeASCII: already have such an attribute"); m_rContext.getGlobalContext().AddAttributeASCII(_nPrefix, _pName, pValue); } //--------------------------------------------------------------------- - void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const ::rtl::OUString& _rValue) + void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::xmloff::token::GetXMLToken(_eName)).isEmpty(), "OPropertyExport::AddAttribute: already have such an attribute"); @@ -691,15 +691,15 @@ namespace xmloff } //--------------------------------------------------------------------- - void OPropertyExport::dbg_implCheckProperty(const ::rtl::OUString& _rPropertyName, const Type* _pType) + void OPropertyExport::dbg_implCheckProperty(const OUString& _rPropertyName, const Type* _pType) { try { // the property must exist if (!m_xPropertyInfo->hasPropertyByName(_rPropertyName)) { - rtl::OStringBuffer aBuf("OPropertyExport::dbg_implCheckProperty: no property with the name "); - aBuf.append(rtl::OUStringToOString(_rPropertyName, RTL_TEXTENCODING_ASCII_US)).append('!'); + OStringBuffer aBuf("OPropertyExport::dbg_implCheckProperty: no property with the name "); + aBuf.append(OUStringToOString(_rPropertyName, RTL_TEXTENCODING_ASCII_US)).append('!'); OSL_FAIL(aBuf.getStr()); return; } diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index 315edcee9007..3e59dc179288 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -58,7 +58,7 @@ namespace xmloff class OPropertyExport { private: - DECLARE_STL_STDKEY_SET(::rtl::OUString, StringSet); + DECLARE_STL_STDKEY_SET(OUString, StringSet); StringSet m_aRemainingProps; // see examinePersistence @@ -75,8 +75,8 @@ namespace xmloff m_xPropertyState; // caching - ::rtl::OUString m_sValueTrue; - ::rtl::OUString m_sValueFalse; + OUString m_sValueTrue; + OUString m_sValueFalse; public: /** constructs an object capable of handling attributes for export @@ -113,7 +113,7 @@ namespace xmloff

      In this case you should call exportedProperty for every property you export yourself, so the property will be flagged as already handled

      */ - void exportedProperty(const ::rtl::OUString& _rPropertyName) + void exportedProperty(const OUString& _rPropertyName) { m_aRemainingProps.erase(_rPropertyName); } /** add an attribute which is represented by a string property to the export context @@ -129,7 +129,7 @@ namespace xmloff void exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName + const OUString& _rPropertyName ); /** add an attribute which is represented by a boolean property to the export context @@ -147,7 +147,7 @@ namespace xmloff void exportBooleanPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags); /** add an attribute which is represented by a sal_Int16 property to the export context @@ -166,7 +166,7 @@ namespace xmloff void exportInt16PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Int16 _nDefault); /** add an attribute which is represented by a sal_Int32 property to the export context @@ -185,7 +185,7 @@ namespace xmloff void exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Int32 _nDefault); /** add an attribute which is represented by a enum property to the export context @@ -206,7 +206,7 @@ namespace xmloff void exportEnumPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const SvXMLEnumMapEntry* _pValueMap, const sal_Int32 _nDefault, const sal_Bool _bVoidDefault = sal_False); @@ -301,7 +301,7 @@ namespace xmloff void exportStringSequenceAttribute( const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Unicode _aQuoteCharacter = '"', const sal_Unicode _aListSeparator = ','); @@ -311,7 +311,7 @@ namespace xmloff or whether the property is a dynamic property (i.e. added via an XPropertyContainer). So, take care when using the method - the heuristics is not applicable for all properties.

      */ - bool shouldExportProperty( const ::rtl::OUString& i_propertyName ) const; + bool shouldExportProperty( const OUString& i_propertyName ) const; /** tries to convert an arbitrary Any into an string @@ -321,7 +321,7 @@ namespace xmloff @param _rValue the value to convert */ - ::rtl::OUString implConvertAny( + OUString implConvertAny( const ::com::sun::star::uno::Any& _rValue); /** @@ -341,20 +341,20 @@ namespace xmloff ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType); #ifdef DBG_UTIL - void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const ::rtl::OUString& _rValue); - void AddAttribute( sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue ); + void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue); + void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ); void AddAttributeASCII( sal_uInt16 nPrefix, const sal_Char *pName, const sal_Char *pValue ); - void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const ::rtl::OUString& _rValue); + void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue); void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue ); #else // in the product version, inline this, so it does not cost us extra time calling into our method - inline void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const ::rtl::OUString& _rValue) + inline void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, _rValue); } - inline void AddAttribute( sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue ) + inline void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ) { m_rContext.getGlobalContext().AddAttribute( _nPrefix, _rName, _rValue ); } inline void AddAttributeASCII( sal_uInt16 _nPrefix, const sal_Char* _pName, const sal_Char *pValue ) { m_rContext.getGlobalContext().AddAttributeASCII(_nPrefix, _pName, pValue); } - inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const ::rtl::OUString& _rValue) + inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _rValue); } inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue ) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _eValue); } @@ -373,14 +373,14 @@ namespace xmloff @return sal_True, if the property exists and is of the correct type */ void dbg_implCheckProperty( - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const ::com::sun::star::uno::Type* _pType); // void dbg_implCheckProperty( // const sal_Char* _rPropertyName, // const ::com::sun::star::uno::Type* _pType) // { -// dbg_implCheckProperty(::rtl::OUString::createFromAscii(_rPropertyName), _pType); +// dbg_implCheckProperty(OUString::createFromAscii(_rPropertyName), _pType); // } #endif }; @@ -396,7 +396,7 @@ namespace xmloff dbg_implCheckProperty(name, NULL) #define DBG_CHECK_PROPERTY_ASCII_NO_TYPE( name ) \ - dbg_implCheckProperty( ::rtl::OUString::createFromAscii( name ), NULL ) + dbg_implCheckProperty( OUString::createFromAscii( name ), NULL ) #else #define DBG_CHECK_PROPERTY(name, type) #define DBG_CHECK_PROPERTY_NO_TYPE(name) diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 8bd21c6ecb77..a6c667c27166 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -93,7 +93,7 @@ namespace //--------------------------------------------------------------------- Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType, - const ::rtl::OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const sal_Bool _bInvertBoolean ) + const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const sal_Bool _bInvertBoolean ) { Any aReturn; sal_Bool bEnumAsInt = sal_False; @@ -107,8 +107,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a boolean!").getStr()); aReturn = ::cppu::bool2any(_bInvertBoolean ? !bValue : bValue); } @@ -123,8 +123,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into an integer!").getStr()); if (TypeClass_SHORT == _rExpectedType.getTypeClass()) aReturn <<= (sal_Int16)nValue; @@ -164,8 +164,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a double!").getStr()); aReturn <<= (double)nValue; } @@ -192,8 +192,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a double!").getStr()); // then convert it into the target type @@ -243,7 +243,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun } //--------------------------------------------------------------------- -Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType ) +Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType ) { Type aUnoType( ::getVoidCppuType() ); @@ -252,7 +252,7 @@ Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType ) { s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] = ::getBooleanCppuType(); s_aTypeNameMap[ token::GetXMLToken( token::XML_FLOAT ) ] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING ) ] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING ) ] = ::getCppuType( static_cast< OUString* >(NULL) ); s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID ) ] = ::getVoidCppuType(); } @@ -268,7 +268,7 @@ Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType ) //= OPropertyImport //===================================================================== //--------------------------------------------------------------------- -OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName) +OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const OUString& _rName) :SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName) ,m_rContext(_rImport) ,m_bTrackAttributes(sal_False) @@ -276,7 +276,7 @@ OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 } //--------------------------------------------------------------------- -SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, +SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken( _rLocalName, token::XML_PROPERTIES) ) @@ -286,8 +286,8 @@ SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, con } else { - OSL_FAIL(::rtl::OStringBuffer("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is "). - append(rtl::OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is "). + append(OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). append(")!").getStr()); return SvXMLImportContext::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList); } @@ -305,7 +305,7 @@ void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrLis const SvXMLNamespaceMap& rMap = m_rContext.getGlobalContext().GetNamespaceMap(); sal_uInt16 nNamespace; - ::rtl::OUString sLocalName; + OUString sLocalName; for (sal_Int16 i=0; igetNameByIndex(i), &sLocalName); @@ -321,14 +321,14 @@ void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrLis } //--------------------------------------------------------------------- -sal_Bool OPropertyImport::encounteredAttribute(const ::rtl::OUString& _rAttributeName) const +sal_Bool OPropertyImport::encounteredAttribute(const OUString& _rAttributeName) const { OSL_ENSURE(m_bTrackAttributes, "OPropertyImport::encounteredAttribute: attribute tracking not enabled!"); return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(_rAttributeName); } //--------------------------------------------------------------------- -void OPropertyImport::Characters(const ::rtl::OUString& +void OPropertyImport::Characters(const OUString& #if OSL_DEBUG_LEVEL > 0 _rChars #endif @@ -339,7 +339,7 @@ _rChars } //--------------------------------------------------------------------- -bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) +bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const OUString& _rLocalName, const OUString& _rValue) { const OAttribute2Property::AttributeAssignment* pProperty = m_rContext.getAttributeMap().getAttributeTranslation(_rLocalName); if (pProperty) @@ -356,11 +356,11 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl if (!token::IsXMLToken(_rLocalName, token::XML_TYPE)) // xlink:type is valid but ignored for { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "OPropertyImport::handleAttribute: Can't handle the following:\n" ); - sMessage += ::rtl::OString( " Attribute name: " ); - sMessage += ::rtl::OString( _rLocalName.getStr(), _rLocalName.getLength(), osl_getThreadTextEncoding() ); - sMessage += ::rtl::OString( "\n value: " ); - sMessage += ::rtl::OString( _rValue.getStr(), _rValue.getLength(), osl_getThreadTextEncoding() ); + OString sMessage( "OPropertyImport::handleAttribute: Can't handle the following:\n" ); + sMessage += OString( " Attribute name: " ); + sMessage += OString( _rLocalName.getStr(), _rLocalName.getLength(), osl_getThreadTextEncoding() ); + sMessage += OString( "\n value: " ); + sMessage += OString( _rValue.getStr(), _rValue.getLength(), osl_getThreadTextEncoding() ); OSL_FAIL( sMessage.getStr() ); #endif return false; @@ -372,7 +372,7 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl //= OPropertyElementsContext //===================================================================== //--------------------------------------------------------------------- -OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xPropertyImporter(_rPropertyImporter) @@ -380,7 +380,7 @@ OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uI } //--------------------------------------------------------------------- -SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, +SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { if( token::IsXMLToken( _rLocalName, token::XML_PROPERTY ) ) @@ -393,8 +393,8 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr } else { - OSL_FAIL(::rtl::OStringBuffer("OPropertyElementsContext::CreateChildContext: unknown child element (\""). - append(::rtl::OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OPropertyElementsContext::CreateChildContext: unknown child element (\""). + append(OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr()); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName); } @@ -409,7 +409,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr } //--------------------------------------------------------------------- - void OPropertyElementsContext::Characters(const ::rtl::OUString& _rChars) + void OPropertyElementsContext::Characters(const OUString& _rChars) { OSL_ENSURE(0 == _rChars.trim(), "OPropertyElementsContext::Characters: non-whitespace characters detected!"); SvXMLImportContext::Characters(_rChars); @@ -421,7 +421,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr //= OSinglePropertyContext //===================================================================== //--------------------------------------------------------------------- -OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xPropertyImporter(_rPropertyImporter) @@ -429,11 +429,11 @@ OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 } //--------------------------------------------------------------------- -SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, +SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { - OSL_FAIL(::rtl::OStringBuffer("OSinglePropertyContext::CreateChildContext: unknown child element (\""). - append(::rtl::OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OSinglePropertyContext::CreateChildContext: unknown child element (\""). + append(OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr()); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName); } @@ -444,14 +444,14 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx ::com::sun::star::beans::PropertyValue aPropValue; // the property the instance imports currently ::com::sun::star::uno::Type aPropType; // the type of the property the instance imports currently - ::rtl::OUString sType, sValue; + OUString sType, sValue; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); const sal_Int16 nAttrCount = _rxAttrList.is() ? _rxAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const ::rtl::OUString& rAttrName = _rxAttrList->getNameByIndex( i ); + const OUString& rAttrName = _rxAttrList->getNameByIndex( i ); - ::rtl::OUString aLocalName; + OUString aLocalName; sal_uInt16 nPrefix = rMap.GetKeyByAttrName( rAttrName, &aLocalName ); @@ -500,7 +500,7 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx //= OListPropertyContext //===================================================================== //--------------------------------------------------------------------- -OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter ) :SvXMLImportContext( _rImport, _nPrefix, _rName ) ,m_xPropertyImporter( _rPropertyImporter ) @@ -513,7 +513,7 @@ void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxA sal_Int32 nAttributeCount = _rxAttrList->getLength(); sal_uInt16 nNamespace; - ::rtl::OUString sAttributeName; + OUString sAttributeName; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); for ( sal_Int16 i = 0; i < nAttributeCount; ++i ) { @@ -532,8 +532,8 @@ void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxA } else { - OSL_FAIL( ::rtl::OStringBuffer( "OListPropertyContext::StartElement: unknown child element (\""). - append(rtl::OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL( OStringBuffer( "OListPropertyContext::StartElement: unknown child element (\""). + append(OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr() ); } } @@ -551,7 +551,7 @@ void OListPropertyContext::EndElement() Sequence< Any > aListElements( m_aListValues.size() ); Any* pListElement = aListElements.getArray(); com::sun::star::uno::Type aType = PropertyConversion::xmlTypeToUnoType( m_sPropertyType ); - for ( ::std::vector< ::rtl::OUString >::const_iterator values = m_aListValues.begin(); + for ( ::std::vector< OUString >::const_iterator values = m_aListValues.begin(); values != m_aListValues.end(); ++values, ++pListElement ) @@ -567,7 +567,7 @@ void OListPropertyContext::EndElement() } //--------------------------------------------------------------------- -SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, const Reference< XAttributeList >& /*_rxAttrList*/ ) +SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& /*_rxAttrList*/ ) { if ( token::IsXMLToken( _rLocalName, token::XML_LIST_VALUE ) ) { @@ -576,8 +576,8 @@ SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefi } else { - OSL_FAIL( ::rtl::OStringBuffer("OListPropertyContext::CreateChildContext: unknown child element (\""). - append(rtl::OUStringToOString(_rLocalName.getStr(), RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL( OStringBuffer("OListPropertyContext::CreateChildContext: unknown child element (\""). + append(OUStringToOString(_rLocalName.getStr(), RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr() ); return new SvXMLImportContext( GetImport(), _nPrefix, _rLocalName ); } @@ -587,7 +587,7 @@ SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefi //= OListValueContext //===================================================================== //--------------------------------------------------------------------- -OListValueContext::OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, ::rtl::OUString& _rListValueHolder ) +OListValueContext::OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, OUString& _rListValueHolder ) :SvXMLImportContext( _rImport, _nPrefix, _rName ) ,m_rListValueHolder( _rListValueHolder ) { @@ -599,7 +599,7 @@ void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttr const sal_Int32 nAttributeCount = _rxAttrList->getLength(); sal_uInt16 nNamespace; - ::rtl::OUString sAttributeName; + OUString sAttributeName; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); for ( sal_Int16 i = 0; i < nAttributeCount; ++i ) { @@ -616,8 +616,8 @@ void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttr } } - OSL_FAIL( ::rtl::OStringBuffer( "OListValueContext::StartElement: unknown child element (\""). - append(rtl::OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL( OStringBuffer( "OListValueContext::StartElement: unknown child element (\""). + append(OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr() ); } } diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index 9f890d33c65e..e813d383e348 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -46,12 +46,12 @@ namespace xmloff static ::com::sun::star::uno::Any convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType, - const ::rtl::OUString& _rReadCharacters, + const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap = NULL, const sal_Bool _bInvertBoolean = sal_False ); - static ::com::sun::star::uno::Type xmlTypeToUnoType( const ::rtl::OUString& _rType ); + static ::com::sun::star::uno::Type xmlTypeToUnoType( const OUString& _rType ); }; class OFormLayerXMLImport_Impl; @@ -74,7 +74,7 @@ namespace xmloff PropertyValueArray m_aGenericValues; // the values which the instance collects between StartElement and EndElement - DECLARE_STL_STDKEY_SET( ::rtl::OUString, StringSet ); + DECLARE_STL_STDKEY_SET( OUString, StringSet ); StringSet m_aEncounteredAttributes; OFormLayerXMLImport_Impl& m_rContext; @@ -86,15 +86,15 @@ namespace xmloff // style properties) can be done in our own EndElement instead of letting derived classes do this. public: - OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName); + OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const OUString& _rName); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); - virtual void Characters(const ::rtl::OUString& _rChars); + virtual void Characters(const OUString& _rChars); protected: /** handle one single attribute. @@ -112,20 +112,20 @@ namespace xmloff attribute value */ virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); /** determine if the element imported by the object had an given attribute.

      Please be aware of the fact that the name given must be a local name, i.e. not contain a namespace. All form relevant attributes are in the same namespace, so this would be an redundant information.

      */ - sal_Bool encounteredAttribute(const ::rtl::OUString& _rAttributeName) const; + sal_Bool encounteredAttribute(const OUString& _rAttributeName) const; /** determine if the element imported by the object had an given attribute.

      Please be aware of the fact that the name given must be a local name, i.e. not contain a namespace. All form relevant attributes are in the same namespace, so this would be an redundant information.

      */ - sal_Bool encounteredAttribute(const sal_Char* _pAttributeName) const { return encounteredAttribute(::rtl::OUString::createFromAscii(_pAttributeName)); } + sal_Bool encounteredAttribute(const sal_Char* _pAttributeName) const { return encounteredAttribute(OUString::createFromAscii(_pAttributeName)); } /** enables the tracking of the encountered attributes

      The tracking will raise the import costs a little bit, but it's cheaper than @@ -138,7 +138,7 @@ namespace xmloff m_aValues.push_back(_rProp); } - inline void implPushBackPropertyValue( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rValue ) + inline void implPushBackPropertyValue( const OUString& _rName, const ::com::sun::star::uno::Any& _rValue ) { m_aValues.push_back( ::com::sun::star::beans::PropertyValue( _rName, -1, _rValue, ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) ); @@ -162,17 +162,17 @@ namespace xmloff OPropertyImportRef m_xPropertyImporter; // to add the properties public: - OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); #if OSL_DEBUG_LEVEL > 0 virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); - virtual void Characters(const ::rtl::OUString& _rChars); + virtual void Characters(const OUString& _rChars); #endif }; @@ -186,11 +186,11 @@ namespace xmloff OPropertyImportRef m_xPropertyImporter; // to add the properties public: - OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( @@ -203,12 +203,12 @@ namespace xmloff class OListPropertyContext : public SvXMLImportContext { OPropertyImportRef m_xPropertyImporter; - ::rtl::OUString m_sPropertyName; - ::rtl::OUString m_sPropertyType; - ::std::vector< ::rtl::OUString > m_aListValues; + OUString m_sPropertyName; + OUString m_sPropertyType; + ::std::vector< OUString > m_aListValues; public: - OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter ); virtual void StartElement( @@ -217,7 +217,7 @@ namespace xmloff virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); }; @@ -226,11 +226,11 @@ namespace xmloff //===================================================================== class OListValueContext : public SvXMLImportContext { - ::rtl::OUString& m_rListValueHolder; + OUString& m_rListValueHolder; public: - OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, - ::rtl::OUString& _rListValueHolder ); + OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, + OUString& _rListValueHolder ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ); diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 515879dbaf8c..72ea7bd85244 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -81,7 +81,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) ::comphelper::PropertyMapEntry aInfoMap[] = { { "Class", sizeof("Class")-1, 0, - &::getCppuType((::rtl::OUString*)0), + &::getCppuType((OUString*)0), beans::PropertyAttribute::MAYBEVOID, 0}, { NULL, 0, 0, NULL, 0, 0 } }; @@ -92,7 +92,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) uno::Any aAny; aAny <<= GetXMLToken( XML_TEXT ); xConvPropSet->setPropertyValue( - ::rtl::OUString("Class"), aAny ); + OUString("Class"), aAny ); uno::Reference< beans::XPropertySet > xPropSet = getExportInfo().is() @@ -149,7 +149,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) if( pVersion ) AddAttribute( XML_NAMESPACE_OFFICE, XML_VERSION, - ::rtl::OUString::createFromAscii(pVersion) ); + OUString::createFromAscii(pVersion) ); SvXMLElementExport aDocElem( *this, XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, sal_True, sal_True ); @@ -164,7 +164,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) void XMLMetaExportComponent::_ExportMeta() { if (mxDocProps.is()) { - ::rtl::OUString generator( ::utl::DocInfoHelper::GetGeneratorString() ); + OUString generator( ::utl::DocInfoHelper::GetGeneratorString() ); // update generator here mxDocProps->setGenerator(generator); SvXMLMetaExport * pMeta = new SvXMLMetaExport(*this, mxDocProps); @@ -181,18 +181,18 @@ void XMLMetaExportComponent::_ExportMasterStyles() {} void XMLMetaExportComponent::_ExportContent() {} -uno::Sequence< rtl::OUString > SAL_CALL XMLMetaExportComponent_getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL XMLMetaExportComponent_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( + const OUString aServiceName( "com.sun.star.document.XMLOasisMetaExporter" ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -rtl::OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw() +OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw() { - return rtl::OUString( "XMLMetaExportComponent" ); + return OUString( "XMLMetaExportComponent" ); } uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance( @@ -202,18 +202,18 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance return (cppu::OWeakObject*)new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), EXPORT_META|EXPORT_OASIS); } -uno::Sequence< rtl::OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( + const OUString aServiceName( "com.sun.star.document.XMLMetaExporter" ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -rtl::OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw() +OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw() { - return rtl::OUString( "XMLMetaExportOOo" ); + return OUString( "XMLMetaExportOOo" ); } uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance( diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx index d19bb05492b8..07bf460122be 100644 --- a/xmloff/source/meta/MetaImportComponent.cxx +++ b/xmloff/source/meta/MetaImportComponent.cxx @@ -46,7 +46,7 @@ XMLMetaImportComponent::~XMLMetaImportComponent() throw() SvXMLImportContext* XMLMetaImportComponent::CreateContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference & xAttrList ) { if ( (XML_NAMESPACE_OFFICE == nPrefix) && @@ -77,7 +77,7 @@ void SAL_CALL XMLMetaImportComponent::setTargetDocument( "XDocumentProperties"), uno::Reference(*this), 0); } -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL XMLMetaImportComponent_getSupportedServiceNames() throw() { diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 6bba79c777d6..cae4ee1e3426 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -46,19 +46,19 @@ using namespace ::xmloff::token; //------------------------------------------------------------------------- -static void lcl_AddTwoDigits( rtl::OUStringBuffer& rStr, sal_Int32 nVal ) +static void lcl_AddTwoDigits( OUStringBuffer& rStr, sal_Int32 nVal ) { if ( nVal < 10 ) rStr.append( sal_Unicode('0') ); rStr.append( nVal ); } -rtl::OUString +OUString SvXMLMetaExport::GetISODateTimeString( const util::DateTime& rDateTime ) { // return ISO date string "YYYY-MM-DDThh:mm:ss" - rtl::OUStringBuffer sTmp; + OUStringBuffer sTmp; sTmp.append( (sal_Int32) rDateTime.Year ); sTmp.append( sal_Unicode('-') ); lcl_AddTwoDigits( sTmp, rDateTime.Month ); @@ -76,7 +76,7 @@ SvXMLMetaExport::GetISODateTimeString( const util::DateTime& rDateTime ) //------------------------------------------------------------------------- -void SvXMLMetaExport::SimpleStringElement( const rtl::OUString& rText, +void SvXMLMetaExport::SimpleStringElement( const OUString& rText, sal_uInt16 nNamespace, enum XMLTokenEnum eElementName ) { if ( !rText.isEmpty() ) { @@ -90,7 +90,7 @@ void SvXMLMetaExport::SimpleDateTimeElement( const util::DateTime & rDate, sal_uInt16 nNamespace, enum XMLTokenEnum eElementName ) { if (rDate.Month != 0) { // invalid dates are 0-0-0 - rtl::OUString sValue = GetISODateTimeString( rDate ); + OUString sValue = GetISODateTimeString( rDate ); if ( !sValue.isEmpty() ) { SvXMLElementExport aElem( mrExport, nNamespace, eElementName, sal_True, sal_False ); @@ -139,7 +139,7 @@ void SvXMLMetaExport::_MExport() XML_NAMESPACE_META, XML_PRINT_DATE ); // keywords - const uno::Sequence< ::rtl::OUString > keywords = mxDocProps->getKeywords(); + const uno::Sequence< OUString > keywords = mxDocProps->getKeywords(); for (sal_Int32 i = 0; i < keywords.getLength(); ++i) { SvXMLElementExport aKwElem( mrExport, XML_NAMESPACE_META, XML_KEYWORD, sal_True, sal_False ); @@ -149,11 +149,11 @@ void SvXMLMetaExport::_MExport() // document language { const lang::Locale aLocale = mxDocProps->getLanguage(); - ::rtl::OUString sValue = aLocale.Language; + OUString sValue = aLocale.Language; if (!sValue.isEmpty()) { if ( !aLocale.Country.isEmpty() ) { - sValue += rtl::OUString::valueOf((sal_Unicode)'-'); + sValue += OUString::valueOf((sal_Unicode)'-'); sValue += aLocale.Country; } SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DC, XML_LANGUAGE, @@ -167,7 +167,7 @@ void SvXMLMetaExport::_MExport() SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_EDITING_CYCLES, sal_True, sal_False ); - mrExport.Characters( ::rtl::OUString::valueOf( + mrExport.Characters( OUString::valueOf( static_cast(mxDocProps->getEditingCycles()) ) ); } @@ -178,14 +178,14 @@ void SvXMLMetaExport::_MExport() SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_EDITING_DURATION, sal_True, sal_False ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::sax::Converter::convertDuration(buf, util::Duration( false, 0, 0, 0, secs/3600, (secs%3600)/60, secs%60, 0)); mrExport.Characters(buf.makeStringAndClear()); } // default target - const ::rtl::OUString sDefTarget = mxDocProps->getDefaultTarget(); + const OUString sDefTarget = mxDocProps->getDefaultTarget(); if ( !sDefTarget.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME, @@ -201,14 +201,14 @@ void SvXMLMetaExport::_MExport() } // auto-reload - const ::rtl::OUString sReloadURL = mxDocProps->getAutoloadURL(); + const OUString sReloadURL = mxDocProps->getAutoloadURL(); const sal_Int32 sReloadDelay = mxDocProps->getAutoloadSecs(); if (sReloadDelay != 0 || !sReloadURL.isEmpty()) { mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference( sReloadURL ) ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::sax::Converter::convertDuration(buf, util::Duration(false, 0, 0, 0, sReloadDelay/3600, (sReloadDelay%3600)/60, sReloadDelay%60, 0)); mrExport.AddAttribute( XML_NAMESPACE_META, XML_DELAY, @@ -219,7 +219,7 @@ void SvXMLMetaExport::_MExport() } // template - const rtl::OUString sTplPath = mxDocProps->getTemplateURL(); + const OUString sTplPath = mxDocProps->getTemplateURL(); if ( !sTplPath.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); @@ -247,8 +247,8 @@ void SvXMLMetaExport::_MExport() const uno::Sequence< beans::PropertyValue > props = xUserDefined->getPropertyValues(); for (sal_Int32 i = 0; i < props.getLength(); ++i) { - ::rtl::OUStringBuffer sValueBuffer; - ::rtl::OUStringBuffer sType; + OUStringBuffer sValueBuffer; + OUStringBuffer sType; if (!::sax::Converter::convertAny(sValueBuffer, sType, props[i].Value)) { continue; @@ -271,7 +271,7 @@ void SvXMLMetaExport::_MExport() sal_Int32 nValue = 0; if ( aDocStatistic[nInd].Value >>= nValue ) { - ::rtl::OUString aValue = rtl::OUString::valueOf( nValue ); + OUString aValue = OUString::valueOf( nValue ); if ( aDocStatistic[nInd].Name == "TableCount" ) mrExport.AddAttribute( XML_NAMESPACE_META, XML_TABLE_COUNT, aValue ); @@ -339,7 +339,7 @@ void SvXMLMetaExport::Export() for (sal_uInt16 key = rNsMap.GetFirstKey(); key != USHRT_MAX; key = rNsMap.GetNextKey(key)) { beans::StringPair ns; - const ::rtl::OUString attrname = rNsMap.GetAttrNameByKey(key); + const OUString attrname = rNsMap.GetAttrNameByKey(key); if (attrname.matchAsciiL(s_xmlns2, strlen(s_xmlns2))) { ns.First = attrname.copy(strlen(s_xmlns2)); } else if (attrname.equalsAsciiL(s_xmlns, strlen(s_xmlns))) { @@ -379,7 +379,7 @@ SvXMLMetaExport::endDocument() // unfortunately, this method contains far too much ugly namespace mangling. void SAL_CALL -SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, +SvXMLMetaExport::startElement(const OUString & i_rName, const uno::Reference< xml::sax::XAttributeList > & i_xAttribs) throw (uno::RuntimeException, xml::sax::SAXException) { @@ -389,7 +389,7 @@ SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, // non-default ones must be preserved here const sal_Int16 nCount = i_xAttribs->getLength(); for (sal_Int16 i = 0; i < nCount; ++i) { - const ::rtl::OUString name(i_xAttribs->getNameByIndex(i)); + const OUString name(i_xAttribs->getNameByIndex(i)); if (name.matchAsciiL(s_xmlns, strlen(s_xmlns))) { bool found(false); const SvXMLNamespaceMap & rNsMap(mrExport.GetNamespaceMap()); @@ -415,12 +415,12 @@ SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, // attach preserved namespace decls from root node here for (std::vector::const_iterator iter = m_preservedNSs.begin(); iter != m_preservedNSs.end(); ++iter) { - const ::rtl::OUString ns(iter->First); + const OUString ns(iter->First); bool found(false); // but only if it is not already there const sal_Int16 nCount = i_xAttribs->getLength(); for (sal_Int16 i = 0; i < nCount; ++i) { - const ::rtl::OUString name(i_xAttribs->getNameByIndex(i)); + const OUString name(i_xAttribs->getNameByIndex(i)); if (ns.equals(name)) { found = true; break; @@ -438,8 +438,8 @@ SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, // xlink:href attributes; these must be made relative const sal_Int16 nLength = i_xAttribs->getLength(); for (sal_Int16 i = 0; i < nLength; ++i) { - const ::rtl::OUString name (i_xAttribs->getNameByIndex (i)); - ::rtl::OUString value(i_xAttribs->getValueByIndex(i)); + const OUString name (i_xAttribs->getNameByIndex (i)); + OUString value(i_xAttribs->getValueByIndex(i)); if (name.matchAsciiL(s_href, strlen(s_href))) { value = mrExport.GetRelativeReference(value); } @@ -448,8 +448,8 @@ SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, } else { const sal_Int16 nLength = i_xAttribs->getLength(); for (sal_Int16 i = 0; i < nLength; ++i) { - const ::rtl::OUString name (i_xAttribs->getNameByIndex(i)); - const ::rtl::OUString value (i_xAttribs->getValueByIndex(i)); + const OUString name (i_xAttribs->getNameByIndex(i)); + const OUString value (i_xAttribs->getValueByIndex(i)); mrExport.AddAttribute(name, value); } } @@ -462,7 +462,7 @@ SvXMLMetaExport::startElement(const ::rtl::OUString & i_rName, } void SAL_CALL -SvXMLMetaExport::endElement(const ::rtl::OUString & i_rName) +SvXMLMetaExport::endElement(const OUString & i_rName) throw (uno::RuntimeException, xml::sax::SAXException) { --m_level; @@ -475,22 +475,22 @@ SvXMLMetaExport::endElement(const ::rtl::OUString & i_rName) } void SAL_CALL -SvXMLMetaExport::characters(const ::rtl::OUString & i_rChars) +SvXMLMetaExport::characters(const OUString & i_rChars) throw (uno::RuntimeException, xml::sax::SAXException) { mrExport.Characters(i_rChars); } void SAL_CALL -SvXMLMetaExport::ignorableWhitespace(const ::rtl::OUString & /*i_rWhitespaces*/) +SvXMLMetaExport::ignorableWhitespace(const OUString & /*i_rWhitespaces*/) throw (uno::RuntimeException, xml::sax::SAXException) { mrExport.IgnorableWhitespace(/*i_rWhitespaces*/); } void SAL_CALL -SvXMLMetaExport::processingInstruction(const ::rtl::OUString & i_rTarget, - const ::rtl::OUString & i_rData) +SvXMLMetaExport::processingInstruction(const OUString & i_rTarget, + const OUString & i_rData) throw (uno::RuntimeException, xml::sax::SAXException) { // ignore; the exporter cannot handle these diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index f7be45771743..28a49edcfb0a 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -32,8 +32,6 @@ #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace com::sun::star; using namespace ::xmloff::token; @@ -49,7 +47,7 @@ private: public: XMLDocumentBuilderContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const ::com::sun::star::uno::Reference< @@ -58,20 +56,20 @@ public: virtual ~XMLDocumentBuilderContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; XMLDocumentBuilderContext::XMLDocumentBuilderContext(SvXMLImport& rImport, - sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference&, const uno::Reference& rDocBuilder) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -85,7 +83,7 @@ XMLDocumentBuilderContext::~XMLDocumentBuilderContext() SvXMLImportContext * XMLDocumentBuilderContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& rAttrs) { return new XMLDocumentBuilderContext( @@ -100,7 +98,7 @@ void XMLDocumentBuilderContext::StartElement( xAttrList); } -void XMLDocumentBuilderContext::Characters( const ::rtl::OUString& rChars ) +void XMLDocumentBuilderContext::Characters( const OUString& rChars ) { mxDocBuilder->characters(rChars); } @@ -137,7 +135,7 @@ lcl_initDocumentProperties(SvXMLImport & rImport, throw; } catch (const uno::Exception& e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "SvXMLMetaDocumentContext::initDocumentProperties: " "properties init exception"), rImport, makeAny(e)); @@ -156,7 +154,7 @@ lcl_initGenerator(SvXMLImport & rImport, xPath->registerNS(GetXMLToken(XML_NP_OFFICE),GetXMLToken(XML_N_OFFICE)); xPath->registerNS(GetXMLToken(XML_NP_META), GetXMLToken(XML_N_META)); - ::rtl::OUString const expr( "string(/office:document-meta/office:meta/meta:generator)"); + OUString const expr( "string(/office:document-meta/office:meta/meta:generator)"); uno::Reference< xml::xpath::XXPathObject > const xObj( xPath->eval(xDoc.get(), expr), uno::UNO_SET_THROW); OUString const value(xObj->getString()); @@ -165,14 +163,14 @@ lcl_initGenerator(SvXMLImport & rImport, throw; } catch (const uno::Exception& e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "SvXMLMetaDocumentContext::initGenerator: exception"), rImport, makeAny(e)); } } SvXMLMetaDocumentContext::SvXMLMetaDocumentContext(SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference& xDocProps) : SvXMLImportContext( rImport, nPrfx, rLName ), mxDocProps(xDocProps), @@ -189,7 +187,7 @@ SvXMLMetaDocumentContext::~SvXMLMetaDocumentContext() } SvXMLImportContext *SvXMLMetaDocumentContext::CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference& rAttrs) { if ( (XML_NAMESPACE_OFFICE == nPrefix) && @@ -233,7 +231,7 @@ void SvXMLMetaDocumentContext::EndElement() } } -void SvXMLMetaDocumentContext::setBuildId(::rtl::OUString const& i_rBuildId, const uno::Reference& xImportInfo ) +void SvXMLMetaDocumentContext::setBuildId(OUString const& i_rBuildId, const uno::Reference& xImportInfo ) { OUString sBuildId; // skip to second product diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index ab6ed5402b7c..899eccb90aa1 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -using ::rtl::OUString; // ------------------------------------------------------------------------ @@ -237,7 +236,7 @@ XMLVersionContext::~XMLVersionContext( void ) // ------------------------------------------------------------------------ sal_Bool XMLVersionContext::ParseISODateTimeString( - const rtl::OUString& rString, + const OUString& rString, util::DateTime& rDateTime ) { sal_Bool bSuccess = sal_True; @@ -404,7 +403,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con if ( xProps.is() ) { try { - xProps->getPropertyValue( ::rtl::OUString("URL") ) >>= aParserInput.sSystemId; + xProps->getPropertyValue( OUString("URL") ) >>= aParserInput.sSystemId; } catch( uno::Exception& ) {} @@ -447,18 +446,18 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con return aVersions; } -uno::Sequence< rtl::OUString > SAL_CALL XMLVersionListPersistence_getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL XMLVersionListPersistence_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( + const OUString aServiceName( "com.sun.star.document.DocumentRevisionListPersistence" ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -rtl::OUString SAL_CALL XMLVersionListPersistence_getImplementationName() throw() +OUString SAL_CALL XMLVersionListPersistence_getImplementationName() throw() { - return rtl::OUString( "XMLVersionListPersistence" ); + return OUString( "XMLVersionListPersistence" ); } uno::Reference< uno::XInterface > SAL_CALL XMLVersionListPersistence_createInstance( @@ -468,18 +467,18 @@ uno::Reference< uno::XInterface > SAL_CALL XMLVersionListPersistence_createInsta return (cppu::OWeakObject*)new XMLVersionListPersistence; } -uno::Sequence< rtl::OUString > SAL_CALL XMLVersionImExportOOO_getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL XMLVersionImExportOOO_getSupportedServiceNames() throw() { - const rtl::OUString aServiceName( + const OUString aServiceName( "com.sun.star.document.DocumentRevisionListPersistence" ); - const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 ); + const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } -rtl::OUString SAL_CALL XMLVersionImExportOOO_getImplementationName() throw() +OUString SAL_CALL XMLVersionImExportOOO_getImplementationName() throw() { - return rtl::OUString( "XMLVersionImExportOOo" ); + return OUString( "XMLVersionImExportOOo" ); } uno::Reference< uno::XInterface > SAL_CALL XMLVersionImExportOOO_createInstance( diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index 0eda53dfbf7f..e619d96a6db2 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno; using std::map; -using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::document::XEventsSupplier; using ::com::sun::star::container::XNameReplace; @@ -146,8 +145,8 @@ void XMLEventExport::Export( Reference & rAccess, else { // don't proceed further - ::rtl::OString aStr("Unknown event name:" ); - aStr += ::rtl::OUStringToOString( aNames[i], RTL_TEXTENCODING_UTF8 ); + OString aStr("Unknown event name:" ); + aStr += OUStringToOString( aNames[i], RTL_TEXTENCODING_UTF8 ); OSL_FAIL( aStr.getStr() ); } #endif @@ -196,8 +195,8 @@ void XMLEventExport::ExportSingleEvent( else { // don't proceed further - ::rtl::OString aStr("Unknown event name:" ); - aStr += ::rtl::OUStringToOString( rApiEventName, RTL_TEXTENCODING_UTF8 ); + OString aStr("Unknown event name:" ); + aStr += OUStringToOString( rApiEventName, RTL_TEXTENCODING_UTF8 ); OSL_FAIL( aStr.getStr() ); } #endif diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx index 810070283a64..cdd7f008d308 100644 --- a/xmloff/source/script/XMLEventImportHelper.cxx +++ b/xmloff/source/script/XMLEventImportHelper.cxx @@ -25,7 +25,6 @@ #include "xmloff/xmlnmspe.hxx" #include "xmloff/xmlerror.hxx" -using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx index 8326b7fc050f..1f3329de7105 100644 --- a/xmloff/source/script/XMLEventsImportContext.cxx +++ b/xmloff/source/script/XMLEventsImportContext.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::container::XNameReplace; diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx index 1990d67fa581..b867ad0e7fa1 100644 --- a/xmloff/source/script/XMLScriptContextFactory.cxx +++ b/xmloff/source/script/XMLScriptContextFactory.cxx @@ -27,7 +27,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx index 51057b71a62d..ff3a09ce0926 100644 --- a/xmloff/source/script/XMLScriptExportHandler.cxx +++ b/xmloff/source/script/XMLScriptExportHandler.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx index b9825be04b74..0eee892b033d 100644 --- a/xmloff/source/script/XMLStarBasicContextFactory.cxx +++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx @@ -27,7 +27,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx index bfa115505b81..66eb60c450da 100644 --- a/xmloff/source/script/XMLStarBasicExportHandler.cxx +++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx @@ -29,8 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::PropertyValue; diff --git a/xmloff/source/script/xmlbasici.cxx b/xmloff/source/script/xmlbasici.cxx index b67b56fe8955..107e47feb878 100644 --- a/xmloff/source/script/xmlbasici.cxx +++ b/xmloff/source/script/xmlbasici.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::uno; // XMLBasicImportContext // ============================================================================= -XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, +XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< frame::XModel >& rxModel ) :SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xModel( rxModel ) @@ -53,7 +53,7 @@ XMLBasicImportContext::~XMLBasicImportContext() // ----------------------------------------------------------------------------- SvXMLImportContext* XMLBasicImportContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& ) { SvXMLImportContext* pContext = 0; @@ -84,7 +84,7 @@ void XMLBasicImportContext::StartElement( sal_uInt16 nPos = rNamespaceMap.GetFirstKey(); while ( nPos != USHRT_MAX ) { - ::rtl::OUString aAttrName( rNamespaceMap.GetAttrNameByKey( nPos ) ); + OUString aAttrName( rNamespaceMap.GetAttrNameByKey( nPos ) ); if ( xAttrList->getValueByName( aAttrName ).isEmpty() ) pAttrList->AddAttribute( aAttrName, rNamespaceMap.GetNameByKey( nPos ) ); nPos = rNamespaceMap.GetNextKey( nPos ); @@ -110,7 +110,7 @@ void XMLBasicImportContext::EndElement() // ----------------------------------------------------------------------------- -void XMLBasicImportContext::Characters( const ::rtl::OUString& rChars ) +void XMLBasicImportContext::Characters( const OUString& rChars ) { if ( m_xHandler.is() ) m_xHandler->characters( rChars ); @@ -121,7 +121,7 @@ void XMLBasicImportContext::Characters( const ::rtl::OUString& rChars ) // XMLBasicImportChildContext // ============================================================================= -XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, +XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XDocumentHandler >& rxHandler ) :SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xHandler( rxHandler ) @@ -137,7 +137,7 @@ XMLBasicImportChildContext::~XMLBasicImportChildContext() // ----------------------------------------------------------------------------- SvXMLImportContext* XMLBasicImportChildContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& ) { return new XMLBasicImportChildContext( GetImport(), nPrefix, rLocalName, m_xHandler ); @@ -169,7 +169,7 @@ void XMLBasicImportChildContext::EndElement() // ----------------------------------------------------------------------------- -void XMLBasicImportChildContext::Characters( const ::rtl::OUString& rChars ) +void XMLBasicImportChildContext::Characters( const OUString& rChars ) { if ( m_xHandler.is() ) m_xHandler->characters( rChars ); diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx index 207f296e0627..8c79d2edf764 100644 --- a/xmloff/source/script/xmlbasici.hxx +++ b/xmloff/source/script/xmlbasici.hxx @@ -36,19 +36,19 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::document::XXMLOasisBasicImporter > m_xHandler; public: - XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel ); virtual ~XMLBasicImportContext(); - virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rxAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rxAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; @@ -62,19 +62,19 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; public: - XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rxHandler ); virtual ~XMLBasicImportChildContext(); - virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_XMLBASICI_HXX diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx index 6269493e8f6b..87f24b3def7d 100644 --- a/xmloff/source/script/xmlscripti.cxx +++ b/xmloff/source/script/xmlscripti.cxx @@ -29,7 +29,6 @@ #include #include -using ::rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -38,7 +37,6 @@ using namespace com::sun::star::document; using namespace com::sun::star::xml::sax; using namespace ::xmloff::token; -using rtl::OUString; // ============================================================================= // XMLScriptChildContext: context for element @@ -49,15 +47,15 @@ class XMLScriptChildContext : public SvXMLImportContext private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > m_xDocumentScripts; - ::rtl::OUString m_aLanguage; + OUString m_aLanguage; public: - XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, + XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& rxModel, - const ::rtl::OUString& rLanguage ); + const OUString& rLanguage ); virtual ~XMLScriptChildContext(); - virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -65,8 +63,8 @@ public: // ----------------------------------------------------------------------------- -XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, - const Reference< frame::XModel >& rxModel, const ::rtl::OUString& rLanguage ) +XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, + const Reference< frame::XModel >& rxModel, const OUString& rLanguage ) :SvXMLImportContext( rImport, nPrfx, rLName ) ,m_xModel( rxModel ) ,m_xDocumentScripts( rxModel, UNO_QUERY ) @@ -83,7 +81,7 @@ XMLScriptChildContext::~XMLScriptChildContext() // ----------------------------------------------------------------------------- SvXMLImportContext* XMLScriptChildContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -143,11 +141,11 @@ SvXMLImportContext* XMLScriptContext::CreateChildContext( } else if ( IsXMLToken( rLName, XML_SCRIPT ) ) { - ::rtl::OUString aAttrName( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_SCRIPT ) ); + OUString aAttrName( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_SCRIPT ) ); aAttrName += ":language"; if ( xAttrList.is() ) { - ::rtl::OUString aLanguage = xAttrList->getValueByName( aAttrName ); + OUString aLanguage = xAttrList->getValueByName( aAttrName ); if ( m_xModel.is() ) { diff --git a/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx index 3ba4d49394c6..169e1cd22c80 100644 --- a/xmloff/source/style/AttributeContainerHandler.cxx +++ b/xmloff/source/style/AttributeContainerHandler.cxx @@ -25,8 +25,6 @@ #include "AttributeContainerHandler.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 547901446c8d..20ae5d287852 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -37,8 +37,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx index 71dbb57891a9..b39140babc76 100644 --- a/xmloff/source/style/DrawAspectHdl.cxx +++ b/xmloff/source/style/DrawAspectHdl.cxx @@ -32,8 +32,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/DrawAspectHdl.hxx b/xmloff/source/style/DrawAspectHdl.hxx index 66d3f3ace5ea..786fc2fdad29 100644 --- a/xmloff/source/style/DrawAspectHdl.hxx +++ b/xmloff/source/style/DrawAspectHdl.hxx @@ -30,8 +30,8 @@ class DrawAspectHdl : public XMLPropertyHandler public: virtual ~DrawAspectHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_DRAWASPECTHDL_HXX diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx index 826a5ad03c52..789baa04e799 100644 --- a/xmloff/source/style/EnumPropertyHdl.cxx +++ b/xmloff/source/style/EnumPropertyHdl.cxx @@ -24,8 +24,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 563da21714eb..015629e628b8 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -32,8 +32,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; ////////////////////////////////////////////////////////////////////////////// @@ -148,7 +146,7 @@ XMLBitmapStyleContext::~XMLBitmapStyleContext() { } -SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) +SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; if( (XML_NAMESPACE_OFFICE == nPrefix) && xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) ) diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx index b8d1d795864b..6bfae84fb858 100644 --- a/xmloff/source/style/FillStyleContext.hxx +++ b/xmloff/source/style/FillStyleContext.hxx @@ -31,12 +31,12 @@ class XMLGradientStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; public: TYPEINFO(); - XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLGradientStyleContext(); @@ -52,12 +52,12 @@ class XMLHatchStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; public: TYPEINFO(); - XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLHatchStyleContext(); @@ -73,19 +73,19 @@ class XMLBitmapStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: TYPEINFO(); - XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLBitmapStyleContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void EndElement(); @@ -100,12 +100,12 @@ class XMLTransGradientStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; public: TYPEINFO(); - XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLTransGradientStyleContext(); @@ -121,12 +121,12 @@ class XMLMarkerStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; public: TYPEINFO(); - XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLMarkerStyleContext(); @@ -142,12 +142,12 @@ class XMLDashStyleContext: public SvXMLStyleContext { private: ::com::sun::star::uno::Any maAny; - rtl::OUString maStrName; + OUString maStrName; public: TYPEINFO(); - XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, + XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLDashStyleContext(); diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index eb432e7dba01..bc200d8ef6a2 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -39,8 +39,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index eef90629013c..5d852c952d9d 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -36,8 +36,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index ff4be1d1235f..de3bfc8f3e8f 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -32,8 +32,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index 2bdc23d7eaaf..53bf23eca1d6 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -31,8 +31,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx index c1e450cea5ca..298f7293594a 100644 --- a/xmloff/source/style/MultiPropertySetHelper.cxx +++ b/xmloff/source/style/MultiPropertySetHelper.cxx @@ -38,7 +38,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; using ::comphelper::UStringLess; -using ::rtl::OUString; using ::std::sort; diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx index 148afc01c42d..7dacca646b3d 100644 --- a/xmloff/source/style/NamedBoolPropertyHdl.cxx +++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx @@ -24,8 +24,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index 6d7e7788f4a5..b58301f48b1b 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -30,7 +30,7 @@ using ::xmloff::token::XML_HEADER_FOOTER_PROPERTIES; PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, ::std::vector< XMLPropertyState > & rTempProperties, @@ -51,7 +51,7 @@ PageHeaderFooterContext::~PageHeaderFooterContext() } SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx index 7180c4063a5d..21710ee69f4a 100644 --- a/xmloff/source/style/PageHeaderFooterContext.hxx +++ b/xmloff/source/style/PageHeaderFooterContext.hxx @@ -32,7 +32,7 @@ class PageHeaderFooterContext : public SvXMLImportContext public: PageHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ::std::vector< XMLPropertyState > & rProperties, @@ -43,7 +43,7 @@ public: virtual ~PageHeaderFooterContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index 7fc9a3b88f96..72fcc6796d68 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -63,7 +63,7 @@ static void lcl_RemoveStateIfZero16( XMLPropertyState* pState ) lcl_RemoveState( pState ); } -static void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int32 nIndex, const rtl::OUString& rProperty, uno::Reference< beans::XPropertySet >& xProps) +static void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int32 nIndex, const OUString& rProperty, uno::Reference< beans::XPropertySet >& xProps) { if(::cppu::any2bool(xProps->getPropertyValue(rProperty))) rPropState.push_back(XMLPropertyState (nIndex, cppu::bool2any(sal_True))); diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index fe312d6d9a7d..10bdf96fe3f6 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -34,8 +34,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; void PageStyleContext::SetAttribute( sal_uInt16 nPrefixKey, - const rtl::OUString& rLocalName, - const rtl::OUString& rValue ) + const OUString& rLocalName, + const OUString& rValue ) { // TODO: use a map here if( XML_NAMESPACE_STYLE == nPrefixKey && IsXMLToken( rLocalName, XML_PAGE_USAGE ) ) @@ -51,7 +51,7 @@ void PageStyleContext::SetAttribute( sal_uInt16 nPrefixKey, TYPEINIT1( PageStyleContext, XMLPropStyleContext ); PageStyleContext::PageStyleContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_Bool bDefaultStyle) : @@ -66,7 +66,7 @@ PageStyleContext::~PageStyleContext() SvXMLImportContext *PageStyleContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = NULL; diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx index c060b09dde36..056b80cf8bba 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.cxx +++ b/xmloff/source/style/PageMasterImportPropMapper.cxx @@ -50,7 +50,7 @@ PageMasterImportPropertyMapper::~PageMasterImportPropertyMapper() bool PageMasterImportPropertyMapper::handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const { @@ -60,7 +60,7 @@ bool PageMasterImportPropertyMapper::handleSpecialItem( if( CTF_PM_REGISTER_STYLE==nContextID ) { - ::rtl::OUString sDisplayName( rImport.GetStyleDisplayName( + OUString sDisplayName( rImport.GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_PARAGRAPH, rValue ) ); Reference < XNameContainer > xParaStyles = rImport.GetTextImport()->GetParaStyles(); diff --git a/xmloff/source/style/PageMasterImportPropMapper.hxx b/xmloff/source/style/PageMasterImportPropMapper.hxx index 1911f83efaf5..effb6c61a129 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.hxx +++ b/xmloff/source/style/PageMasterImportPropMapper.hxx @@ -41,7 +41,7 @@ public: virtual bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx index 399a853e6c90..d37db396b9b1 100644 --- a/xmloff/source/style/PageMasterPropHdl.cxx +++ b/xmloff/source/style/PageMasterPropHdl.cxx @@ -32,8 +32,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx index 421fa7a07bc1..43b2ec371909 100644 --- a/xmloff/source/style/PageMasterPropHdl.hxx +++ b/xmloff/source/style/PageMasterPropHdl.hxx @@ -37,12 +37,12 @@ public: const ::com::sun::star::uno::Any& rAny2 ) const; virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -57,12 +57,12 @@ class XMLPMPropHdl_NumFormat : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_NumFormat(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -77,12 +77,12 @@ class XMLPMPropHdl_NumLetterSync : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_NumLetterSync(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -97,12 +97,12 @@ class XMLPMPropHdl_PaperTrayNumber : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_PaperTrayNumber(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -115,19 +115,19 @@ public: class XMLPMPropHdl_Print : public XMLPropertyHandler { protected: - ::rtl::OUString sAttrValue; + OUString sAttrValue; public: XMLPMPropHdl_Print( enum ::xmloff::token::XMLTokenEnum eValue ); virtual ~XMLPMPropHdl_Print(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -141,12 +141,12 @@ class XMLPMPropHdl_CenterHorizontal : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_CenterHorizontal(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; @@ -157,12 +157,12 @@ class XMLPMPropHdl_CenterVertical : public XMLPropertyHandler public: virtual ~XMLPMPropHdl_CenterVertical(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index 21b4dcc64366..0923cee3a5f8 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx @@ -29,8 +29,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; using namespace ::com::sun::star; diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx index 82b73338dff1..7f194e15ce7a 100644 --- a/xmloff/source/style/PagePropertySetContext.cxx +++ b/xmloff/source/style/PagePropertySetContext.cxx @@ -24,7 +24,6 @@ #include #include "XMLFootnoteSeparatorImport.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx index 756ad5f27cc0..45c68b46b208 100644 --- a/xmloff/source/style/PagePropertySetContext.hxx +++ b/xmloff/source/style/PagePropertySetContext.hxx @@ -35,7 +35,7 @@ class PagePropertySetContext : public SvXMLPropertySetContext public: PagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFam, @@ -48,7 +48,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp); diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index d2d64f07dba0..41ab751b8b28 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -38,8 +38,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index 138db8f1307a..04623adf6d0f 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -26,8 +26,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index b1ea5193d1c6..aba949681f76 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -33,8 +33,6 @@ #include #include "XMLBackgroundImageContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx index 1ecd5c1a34cd..362c84af2792 100644 --- a/xmloff/source/style/XMLBackgroundImageExport.cxx +++ b/xmloff/source/style/XMLBackgroundImageExport.cxx @@ -28,8 +28,6 @@ #include #include "XMLBackgroundImageExport.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -50,7 +48,7 @@ void XMLBackgroundImageExport::exportXML( const Any& rURL, const Any *pFilter, const Any *pTransparency, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName ) + const OUString& rLocalName ) { GraphicLocation ePos; if( !(pPos && ((*pPos) >>= ePos)) ) diff --git a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx index 9a6c6f4f60ca..8e926ff2f0a6 100644 --- a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx @@ -25,8 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; XMLBitmapLogicalSizePropertyHandler::XMLBitmapLogicalSizePropertyHandler() diff --git a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx index 983d67eca7a1..5dd665793559 100644 --- a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::xmloff::token::GetXMLToken; diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx index ec0e1d59de1a..bdcc4fe0e8cc 100644 --- a/xmloff/source/style/XMLClipPropertyHandler.cxx +++ b/xmloff/source/style/XMLClipPropertyHandler.cxx @@ -24,8 +24,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx index 2e26d62d1840..096891164b17 100644 --- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx +++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx @@ -23,8 +23,6 @@ #include using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::xmloff::token::XMLTokenEnum; diff --git a/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx index 33e4f355a4fc..d4f9241c09b9 100644 --- a/xmloff/source/style/XMLElementPropertyContext.cxx +++ b/xmloff/source/style/XMLElementPropertyContext.cxx @@ -19,7 +19,6 @@ #include "XMLElementPropertyContext.hxx" -using ::rtl::OUString; TYPEINIT1( XMLElementPropertyContext , SvXMLImportContext ); diff --git a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx index 8d0d5ac17e8c..61269a6f805d 100644 --- a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx @@ -27,8 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; XMLFillBitmapSizePropertyHandler::XMLFillBitmapSizePropertyHandler() diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index 8f603ab0419a..1f56d66dfa2f 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -32,8 +32,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -51,16 +49,16 @@ class XMLFontAutoStylePoolEntry_Impl public: inline XMLFontAutoStylePoolEntry_Impl( - const ::rtl::OUString& rName, - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + const OUString& rName, + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFamily, FontPitch nPitch, rtl_TextEncoding eEnc ); inline XMLFontAutoStylePoolEntry_Impl( - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFamily, FontPitch nPitch, rtl_TextEncoding eEnc ); @@ -75,9 +73,9 @@ public: inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl( - const ::rtl::OUString& rName, - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + const OUString& rName, + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFam, FontPitch nP, rtl_TextEncoding eE ) : @@ -91,8 +89,8 @@ inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl( } inline XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl( - const ::rtl::OUString& rFamilyName, - const ::rtl::OUString& rStyleName, + const OUString& rFamilyName, + const OUString& rStyleName, FontFamily nFam, FontPitch nP, rtl_TextEncoding eE ) : @@ -200,7 +198,7 @@ OUString XMLFontAutoStylePool::Add( return sPoolName; } -::rtl::OUString XMLFontAutoStylePool::Find( +OUString XMLFontAutoStylePool::Find( const OUString& rFamilyName, const OUString& rStyleName, FontFamily nFamily, diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 37de311e0d78..4887f013940e 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -35,8 +35,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -178,7 +176,7 @@ void XMLFontStyleContextFontFace::FillProperties( SvXMLImportContext * XMLFontStyleContextFontFace::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) { if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, XML_FONT_FACE_SRC )) @@ -206,7 +204,7 @@ XMLFontStyleContextFontFaceSrc::XMLFontStyleContextFontFaceSrc( SvXMLImport& rIm SvXMLImportContext * XMLFontStyleContextFontFaceSrc::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) { if( nPrefix == XML_NAMESPACE_SVG && IsXMLToken( rLocalName, XML_FONT_FACE_URI )) @@ -265,7 +263,7 @@ void XMLFontStyleContextFontFaceUri::handleEmbeddedFont( const OUString& url ) SvXMLStyleContext *XMLFontStylesContext::CreateStyleChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) { diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx index 1787bf2faddb..6a794b9668bc 100644 --- a/xmloff/source/style/XMLFontStylesContext_impl.hxx +++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx @@ -43,7 +43,7 @@ public: TYPEINFO(); XMLFontStyleContextFontFace( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, XMLFontStylesContext& rStyles ); @@ -63,7 +63,7 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; @@ -76,12 +76,12 @@ public: TYPEINFO(); XMLFontStyleContextFontFaceSrc( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const XMLFontStyleContextFontFace& font ); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); }; @@ -95,7 +95,7 @@ public: TYPEINFO(); XMLFontStyleContextFontFaceUri( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const XMLFontStyleContextFontFace& font ); diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 1eec7273d7bf..761ffdccd8ff 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUStringBuffer; using ::std::vector; XMLFootnoteSeparatorExport::XMLFootnoteSeparatorExport(SvXMLExport& rExp) : diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 226b052a9107..6b129d06d67d 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; using ::std::vector; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx index b4fb27482cf2..dbc5f932ef04 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx @@ -54,7 +54,7 @@ public: XMLFootnoteSeparatorImport( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::std::vector & rProperties, const UniReference & rMapperRef, sal_Int32 nIndex); diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx index 03078be257dd..628805ee9069 100644 --- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx +++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx @@ -23,8 +23,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; XMLIsPercentagePropertyHandler::~XMLIsPercentagePropertyHandler() diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 371bf42ecf42..48e429550dd7 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -33,8 +33,6 @@ #include "PageMasterPropMapper.hxx" #include "PageMasterExportPropMapper.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -202,9 +200,9 @@ void XMLPageExport::exportStyles( sal_Bool bUsed, sal_Bool bAutoStyles ) { if( xPageStyles.is() ) { - uno::Sequence< ::rtl::OUString> aSeq = xPageStyles->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + uno::Sequence< OUString> aSeq = xPageStyles->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { Reference< XStyle > xStyle(xPageStyles->getByName( *pIter ),uno::UNO_QUERY); diff --git a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx index d1bd289c492d..fc13561ed928 100644 --- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx +++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx @@ -30,8 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; XMLPercentOrMeasurePropertyHandler::XMLPercentOrMeasurePropertyHandler( sal_Bool bPercent ) diff --git a/xmloff/source/style/XMLRectangleMembersHandler.cxx b/xmloff/source/style/XMLRectangleMembersHandler.cxx index 0477f3e5de07..5233ef6fb25a 100644 --- a/xmloff/source/style/XMLRectangleMembersHandler.cxx +++ b/xmloff/source/style/XMLRectangleMembersHandler.cxx @@ -27,8 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; XMLRectangleMembersHdl::XMLRectangleMembersHdl( sal_Int32 nType ) @@ -105,7 +103,7 @@ sal_Bool XMLRectangleMembersHdl::exportXML( break; } - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; rUnitConverter.convertMeasureToXML( sBuffer, nValue ); rStrExpValue = sBuffer.makeStringAndClear(); return sal_True; diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx index b7d7fe2b3266..1f10b2a8fb7e 100644 --- a/xmloff/source/style/adjushdl.cxx +++ b/xmloff/source/style/adjushdl.cxx @@ -26,8 +26,6 @@ #include using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/style/adjushdl.hxx b/xmloff/source/style/adjushdl.hxx index c3cac7998706..634b5cfa2404 100644 --- a/xmloff/source/style/adjushdl.hxx +++ b/xmloff/source/style/adjushdl.hxx @@ -30,8 +30,8 @@ class XMLParaAdjustPropHdl : public XMLPropertyHandler public: virtual ~XMLParaAdjustPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -42,8 +42,8 @@ class XMLLastLineAdjustPropHdl : public XMLPropertyHandler public: virtual ~XMLLastLineAdjustPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_ADJUSTTYPES_HXX diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx index b9567cef7d66..53cc76470408 100644 --- a/xmloff/source/style/backhdl.cxx +++ b/xmloff/source/style/backhdl.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/backhdl.hxx b/xmloff/source/style/backhdl.hxx index 77a0b015fd77..13e0df9aaec2 100644 --- a/xmloff/source/style/backhdl.hxx +++ b/xmloff/source/style/backhdl.hxx @@ -33,8 +33,8 @@ public: /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. using XMLPropertyHandler::importXML; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; private: void MergeXMLHoriPos( ::com::sun::star::style::GraphicLocation& ePos, ::com::sun::star::style::GraphicLocation eHori ) const; diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index 9da972d28779..736551b9cb68 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -26,8 +26,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/bordrhdl.hxx b/xmloff/source/style/bordrhdl.hxx index 41beb8be5642..95c4ed203e96 100644 --- a/xmloff/source/style/bordrhdl.hxx +++ b/xmloff/source/style/bordrhdl.hxx @@ -30,8 +30,8 @@ class XMLBorderWidthHdl : public XMLPropertyHandler public: virtual ~XMLBorderWidthHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLBorderHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLBorderHdl : public XMLPropertyHandler public: virtual ~XMLBorderHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CHARLOCALETYPES_HXX diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx index c82daaf4a37a..3e9f15c8f79e 100644 --- a/xmloff/source/style/breakhdl.cxx +++ b/xmloff/source/style/breakhdl.cxx @@ -24,8 +24,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/breakhdl.hxx b/xmloff/source/style/breakhdl.hxx index 5e3dfc6fef46..51d2c9959fe1 100644 --- a/xmloff/source/style/breakhdl.hxx +++ b/xmloff/source/style/breakhdl.hxx @@ -30,8 +30,8 @@ class XMLFmtBreakBeforePropHdl : public XMLPropertyHandler public: virtual ~XMLFmtBreakBeforePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -42,8 +42,8 @@ class XMLFmtBreakAfterPropHdl : public XMLPropertyHandler public: virtual ~XMLFmtBreakAfterPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_BREAKTYPES_HXX diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx index 8ea49063b909..c92b30b04016 100644 --- a/xmloff/source/style/cdouthdl.cxx +++ b/xmloff/source/style/cdouthdl.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::awt; diff --git a/xmloff/source/style/cdouthdl.hxx b/xmloff/source/style/cdouthdl.hxx index d4edabf4b3c6..bcb636965141 100644 --- a/xmloff/source/style/cdouthdl.hxx +++ b/xmloff/source/style/cdouthdl.hxx @@ -30,8 +30,8 @@ class XMLCrossedOutTypePropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutTypePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCrossedOutStylePropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCrossedOutStylePropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutStylePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCrossedOutWidthPropHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLCrossedOutWidthPropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutWidthPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCrossedOutTextPropHdl : public XMLPropertyHandler @@ -57,8 +57,8 @@ class XMLCrossedOutTextPropHdl : public XMLPropertyHandler public: virtual ~XMLCrossedOutTextPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CROSSEDOUTTYPES_HXX diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx index 36bf6bb36609..3d2602aa22b0 100644 --- a/xmloff/source/style/chrhghdl.cxx +++ b/xmloff/source/style/chrhghdl.cxx @@ -28,8 +28,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/style/chrhghdl.hxx b/xmloff/source/style/chrhghdl.hxx index be6e4f70bc38..80b6517d27dc 100644 --- a/xmloff/source/style/chrhghdl.hxx +++ b/xmloff/source/style/chrhghdl.hxx @@ -30,8 +30,8 @@ class XMLCharHeightHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCharHeightPropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCharHeightPropHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCharHeightDiffHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLCharHeightDiffHdl : public XMLPropertyHandler public: virtual ~XMLCharHeightDiffHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CHARHEIGHTTYPES_HXX diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx index 486fe1d85a78..9a702723f8a7 100644 --- a/xmloff/source/style/chrlohdl.cxx +++ b/xmloff/source/style/chrlohdl.cxx @@ -24,8 +24,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/chrlohdl.hxx b/xmloff/source/style/chrlohdl.hxx index 44e31cef830c..241b96279d5e 100644 --- a/xmloff/source/style/chrlohdl.hxx +++ b/xmloff/source/style/chrlohdl.hxx @@ -32,8 +32,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCharCountryHdl : public XMLPropertyHandler @@ -43,8 +43,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CHARLOCALETYPES_HXX diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx index 33193747ef87..1df628f8d48d 100644 --- a/xmloff/source/style/csmaphdl.cxx +++ b/xmloff/source/style/csmaphdl.cxx @@ -24,8 +24,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/csmaphdl.hxx b/xmloff/source/style/csmaphdl.hxx index 00cffdec3195..e098cc38cf62 100644 --- a/xmloff/source/style/csmaphdl.hxx +++ b/xmloff/source/style/csmaphdl.hxx @@ -30,8 +30,8 @@ class XMLCaseMapPropHdl : public XMLPropertyHandler public: virtual ~XMLCaseMapPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLCaseMapVariantHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLCaseMapVariantHdl : public XMLPropertyHandler public: virtual ~XMLCaseMapVariantHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CASEMAPTYPES_HXX diff --git a/xmloff/source/style/durationhdl.cxx b/xmloff/source/style/durationhdl.cxx index 7db11c30c233..73cae30f78be 100644 --- a/xmloff/source/style/durationhdl.cxx +++ b/xmloff/source/style/durationhdl.cxx @@ -23,8 +23,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; diff --git a/xmloff/source/style/durationhdl.hxx b/xmloff/source/style/durationhdl.hxx index cae2e2704398..70bc47f14579 100644 --- a/xmloff/source/style/durationhdl.hxx +++ b/xmloff/source/style/durationhdl.hxx @@ -30,8 +30,8 @@ class XMLDurationMS16PropHdl_Impl : public XMLPropertyHandler public: virtual ~XMLDurationMS16PropHdl_Impl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_FMTSPLITTYPES_HXX diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx index f3d4b0e92566..0bfd631c84dd 100644 --- a/xmloff/source/style/escphdl.cxx +++ b/xmloff/source/style/escphdl.cxx @@ -26,8 +26,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/escphdl.hxx b/xmloff/source/style/escphdl.hxx index 031b369c68bb..a5b1d932fc8d 100644 --- a/xmloff/source/style/escphdl.hxx +++ b/xmloff/source/style/escphdl.hxx @@ -30,8 +30,8 @@ class XMLEscapementPropHdl : public XMLPropertyHandler public: virtual ~XMLEscapementPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLEscapementHeightPropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLEscapementHeightPropHdl : public XMLPropertyHandler public: virtual ~XMLEscapementHeightPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_ESCAPETYPES_HXX diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index fb9f18c049c8..f65efea29b7c 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -28,8 +28,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/fonthdl.hxx b/xmloff/source/style/fonthdl.hxx index 5c7718fe787d..10a89234c31e 100644 --- a/xmloff/source/style/fonthdl.hxx +++ b/xmloff/source/style/fonthdl.hxx @@ -30,8 +30,8 @@ class XMLFontFamilyNamePropHdl : public XMLPropertyHandler public: virtual ~XMLFontFamilyNamePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -42,8 +42,8 @@ class XMLFontFamilyPropHdl : public XMLPropertyHandler public: virtual ~XMLFontFamilyPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -54,8 +54,8 @@ class XMLFontEncodingPropHdl : public XMLPropertyHandler public: virtual ~XMLFontEncodingPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -66,8 +66,8 @@ class XMLFontPitchPropHdl : public XMLPropertyHandler public: virtual ~XMLFontPitchPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx index fbd1a66389bd..b71368e93650 100644 --- a/xmloff/source/style/impastp1.cxx +++ b/xmloff/source/style/impastp1.cxx @@ -20,7 +20,6 @@ #include #include "impastpl.hxx" -using ::rtl::OUString; //############################################################################# // @@ -34,7 +33,7 @@ using ::rtl::OUString; XMLFamilyData_Impl::XMLFamilyData_Impl( sal_Int32 nFamily, - const ::rtl::OUString& rStrName, + const OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > &rMapper, const OUString& rStrPrefix, sal_Bool bAsFam ) diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx index fe3978b2e84b..1cf90cd79ce5 100644 --- a/xmloff/source/style/impastp2.cxx +++ b/xmloff/source/style/impastp2.cxx @@ -22,8 +22,6 @@ using namespace std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; //############################################################################# // diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx index e134053f7492..41693a5d37d1 100644 --- a/xmloff/source/style/impastp3.cxx +++ b/xmloff/source/style/impastp3.cxx @@ -22,7 +22,6 @@ using namespace std; -using ::rtl::OUString; //############################################################################# // diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index 286785819bff..4b2a31394349 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -30,8 +30,6 @@ #include using namespace ::std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 61226700f09f..0b8daed91579 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -34,7 +34,7 @@ class SvXMLAutoStylePoolP; class SvXMLAutoStylePoolParentsP_Impl; -typedef std::set SvXMLAutoStylePoolNamesP_Impl; +typedef std::set SvXMLAutoStylePoolNamesP_Impl; class SvXMLExportPropertyMapper; class SvXMLExport; @@ -45,7 +45,7 @@ class SvXMLExport; // Implementationclass for stylefamily-information // -typedef ::rtl::OUString* OUStringPtr; +typedef OUString* OUStringPtr; typedef ::std::vector< OUStringPtr > SvXMLAutoStylePoolCache_Impl; class XMLFamilyData_Impl @@ -53,20 +53,20 @@ class XMLFamilyData_Impl public: SvXMLAutoStylePoolCache_Impl *pCache; sal_uInt32 mnFamily; - ::rtl::OUString maStrFamilyName; + OUString maStrFamilyName; UniReference < SvXMLExportPropertyMapper > mxMapper; SvXMLAutoStylePoolParentsP_Impl* mpParentList; SvXMLAutoStylePoolNamesP_Impl* mpNameList; sal_uInt32 mnCount; sal_uInt32 mnName; - ::rtl::OUString maStrPrefix; + OUString maStrPrefix; sal_Bool bAsFamily; public: - XMLFamilyData_Impl( sal_Int32 nFamily, const ::rtl::OUString& rStrName, + XMLFamilyData_Impl( sal_Int32 nFamily, const OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > & rMapper, - const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); + const OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); XMLFamilyData_Impl( sal_Int32 nFamily ) : pCache( 0 ), @@ -91,7 +91,7 @@ typedef boost::ptr_set XMLFamilyDataList_Impl; class SvXMLAutoStylePoolPropertiesP_Impl { - ::rtl::OUString msName; + OUString msName; ::std::vector< XMLPropertyState > maProperties; sal_uInt32 mnPos; @@ -103,11 +103,11 @@ public: { } - const ::rtl::OUString& GetName() const { return msName; } + const OUString& GetName() const { return msName; } const ::std::vector< XMLPropertyState >& GetProperties() const { return maProperties; } sal_uInt32 GetPos() const { return mnPos; } - void SetName( const ::rtl::OUString& rNew ) { msName = rNew; } + void SetName( const OUString& rNew ) { msName = rNew; } }; typedef SvXMLAutoStylePoolPropertiesP_Impl* SvXMLAutoStylePoolPropertiesPPtr; @@ -120,25 +120,25 @@ typedef ::std::vector< SvXMLAutoStylePoolPropertiesPPtr > SvXMLAutoStylePoolProp class SvXMLAutoStylePoolParentP_Impl { - ::rtl::OUString msParent; + OUString msParent; SvXMLAutoStylePoolPropertiesPList_Impl maPropertiesList; public: - SvXMLAutoStylePoolParentP_Impl( const ::rtl::OUString & rParent ) : + SvXMLAutoStylePoolParentP_Impl( const OUString & rParent ) : msParent( rParent ) { } ~SvXMLAutoStylePoolParentP_Impl(); - sal_Bool Add( XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, ::rtl::OUString& rName, bool bDontSeek = false ); + sal_Bool Add( XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek = false ); - sal_Bool AddNamed( XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, const ::rtl::OUString& rName ); + sal_Bool AddNamed( XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, const OUString& rName ); - ::rtl::OUString Find( const XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties ) const; + OUString Find( const XMLFamilyData_Impl& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties ) const; - const ::rtl::OUString& GetParent() const { return msParent; } + const OUString& GetParent() const { return msParent; } const SvXMLAutoStylePoolPropertiesPList_Impl& GetPropertiesList() const { @@ -177,26 +177,26 @@ public: SvXMLExport& GetExport() const { return rExport; } - void AddFamily( sal_Int32 nFamily, const ::rtl::OUString& rStrName, + void AddFamily( sal_Int32 nFamily, const OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > & rMapper, - const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); + const OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); void SetFamilyPropSetMapper( sal_Int32 nFamily, const UniReference < SvXMLExportPropertyMapper > & rMapper ); - void RegisterName( sal_Int32 nFamily, const ::rtl::OUString& rName ); + void RegisterName( sal_Int32 nFamily, const OUString& rName ); void GetRegisteredNames( com::sun::star::uno::Sequence& aFamilies, - com::sun::star::uno::Sequence& aNames ); + com::sun::star::uno::Sequence& aNames ); - sal_Bool Add( ::rtl::OUString& rName, sal_Int32 nFamily, - const ::rtl::OUString& rParent, + sal_Bool Add( OUString& rName, sal_Int32 nFamily, + const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties, sal_Bool bCache = sal_False, bool bDontSeek = false ); - sal_Bool AddNamed( const ::rtl::OUString& rName, sal_Int32 nFamily, - const ::rtl::OUString& rParent, + sal_Bool AddNamed( const OUString& rName, sal_Int32 nFamily, + const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ); - ::rtl::OUString Find( sal_Int32 nFamily, const ::rtl::OUString& rParent, + OUString Find( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const; void exportXML( sal_Int32 nFamily, @@ -210,7 +210,7 @@ public: struct SvXMLAutoStylePoolPExport_Impl { - const ::rtl::OUString *mpParent; + const OUString *mpParent; const SvXMLAutoStylePoolPropertiesP_Impl *mpProperties; }; diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx index 2f857d595892..74051eb33ff3 100644 --- a/xmloff/source/style/kernihdl.cxx +++ b/xmloff/source/style/kernihdl.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/style/kernihdl.hxx b/xmloff/source/style/kernihdl.hxx index b23ba10a7abb..c7989629724f 100644 --- a/xmloff/source/style/kernihdl.hxx +++ b/xmloff/source/style/kernihdl.hxx @@ -30,8 +30,8 @@ class XMLKerningPropHdl : public XMLPropertyHandler public: virtual ~XMLKerningPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_KERNINGTYPES_HXX diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx index 78373198f18d..a6fd84667e6e 100644 --- a/xmloff/source/style/lspachdl.cxx +++ b/xmloff/source/style/lspachdl.cxx @@ -26,8 +26,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using ::xmloff::token::IsXMLToken; diff --git a/xmloff/source/style/lspachdl.hxx b/xmloff/source/style/lspachdl.hxx index 38275f65485c..2de45b94011f 100644 --- a/xmloff/source/style/lspachdl.hxx +++ b/xmloff/source/style/lspachdl.hxx @@ -30,8 +30,8 @@ class XMLLineHeightHdl : public XMLPropertyHandler public: virtual ~XMLLineHeightHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLLineHeightAtLeastHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLLineHeightAtLeastHdl : public XMLPropertyHandler public: virtual ~XMLLineHeightAtLeastHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLLineSpacingHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLLineSpacingHdl : public XMLPropertyHandler public: virtual ~XMLLineSpacingHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_CHARHEIGHTTYPES_HXX diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index f5e0241de3ff..fcefcc690784 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -77,7 +77,7 @@ XMLNumberFormatAttributesExportHelper::~XMLNumberFormatAttributesExportHelper() { } -sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, rtl::OUString& sCurrency, bool& bIsStandard) +sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, OUString& sCurrency, bool& bIsStandard) { XMLNumberFormat aFormat(sEmpty, nNumberFormat, 0); XMLNumberFormatSet::iterator aItr(aNumberFormats.find(aFormat)); @@ -103,7 +103,7 @@ sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExport, const sal_Int16 nTypeKey, const double& rValue, - const rtl::OUString& rCurrency, + const OUString& rCurrency, sal_Bool bExportValue) { sal_Bool bWasSetTypeAttribute = sal_False; @@ -140,7 +140,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp if (bExportValue) { - rtl::OUString sValue( ::rtl::math::doubleToUString( rValue, + OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', sal_True)); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE, sValue); @@ -159,7 +159,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp { if ( rXMLExport.SetNullDateOnUnitConverter() ) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; rXMLExport.GetMM100UnitConverter().convertDateTime(sBuffer, rValue); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_DATE_VALUE, sBuffer.makeStringAndClear()); } @@ -175,7 +175,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp } if (bExportValue) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDuration(sBuffer, rValue); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_TIME_VALUE, sBuffer.makeStringAndClear()); } @@ -203,7 +203,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp } else { - rtl::OUString sValue( ::rtl::math::doubleToUString( + OUString sValue( ::rtl::math::doubleToUString( fTempValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', @@ -222,7 +222,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp bWasSetTypeAttribute = sal_True; if (bExportValue) { - rtl::OUString sValue( ::rtl::math::doubleToUString( rValue, + OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', sal_True)); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE, sValue); @@ -233,7 +233,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp } } -sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, rtl::OUString& sCurrencySymbol, +sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& sCurrencySymbol, uno::Reference & xNumberFormatsSupplier) { if (xNumberFormatsSupplier.is()) @@ -302,14 +302,14 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExpor { sal_Bool bIsStandard; sal_Int16 nTypeKey = GetCellType(nNumberFormat, bIsStandard, rXMLExport.GetNumberFormatsSupplier()); - rtl::OUString sCurrency; + OUString sCurrency; if ((nTypeKey & ~util::NumberFormat::DEFINED) == util::NumberFormat::CURRENCY) GetCurrencySymbol(nNumberFormat, sCurrency, rXMLExport.GetNumberFormatsSupplier()); WriteAttributes(rXMLExport, nTypeKey, rValue, sCurrency, bExportValue); } void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExport& rXMLExport, - const rtl::OUString& rValue, const rtl::OUString& rCharacters, + const OUString& rValue, const OUString& rCharacters, sal_Bool bExportValue, sal_Bool bExportTypeAttribute) { if (bExportTypeAttribute) @@ -318,7 +318,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExpor rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_STRING_VALUE, rValue); } -sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, rtl::OUString& rCurrencySymbol) +sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol) { if (!xNumberFormats.is() && pExport && pExport->GetNumberFormatsSupplier().is()) xNumberFormats.set(pExport->GetNumberFormatsSupplier()->getNumberFormats()); @@ -383,7 +383,7 @@ sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu void XMLNumberFormatAttributesExportHelper::WriteAttributes( const sal_Int16 nTypeKey, const double& rValue, - const rtl::OUString& rCurrency, + const OUString& rCurrency, sal_Bool bExportValue) { if (!pExport) @@ -423,7 +423,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( if (bExportValue) { - rtl::OUString sValue( ::rtl::math::doubleToUString( rValue, + OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', sal_True)); pExport->AddAttribute(sAttrValue, sValue); @@ -442,7 +442,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( { if ( pExport->SetNullDateOnUnitConverter() ) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; pExport->GetMM100UnitConverter().convertDateTime(sBuffer, rValue); pExport->AddAttribute(sAttrDateValue, sBuffer.makeStringAndClear()); } @@ -458,7 +458,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( } if (bExportValue) { - rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertDuration(sBuffer, rValue); pExport->AddAttribute(sAttrTimeValue, sBuffer.makeStringAndClear()); } @@ -486,7 +486,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( } else { - rtl::OUString sValue( ::rtl::math::doubleToUString( + OUString sValue( ::rtl::math::doubleToUString( fTempValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', @@ -505,7 +505,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( bWasSetTypeAttribute = sal_True; if (bExportValue) { - rtl::OUString sValue( ::rtl::math::doubleToUString( rValue, + OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', sal_True)); pExport->AddAttribute(sAttrValue, sValue); @@ -522,7 +522,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes( if (pExport) { bool bIsStandard; - rtl::OUString sCurrency; + OUString sCurrency; sal_Int16 nTypeKey = GetCellType(nNumberFormat, sCurrency, bIsStandard); WriteAttributes(nTypeKey, rValue, sCurrency, bExportValue); } @@ -532,7 +532,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes( } void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes( - const rtl::OUString& rValue, const rtl::OUString& rCharacters, + const OUString& rValue, const OUString& rCharacters, sal_Bool bExportValue, sal_Bool bExportTypeAttribute) { if (pExport) diff --git a/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx index fad5621cb4f0..d61e576f01bf 100644 --- a/xmloff/source/style/opaquhdl.cxx +++ b/xmloff/source/style/opaquhdl.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/style/opaquhdl.hxx b/xmloff/source/style/opaquhdl.hxx index 223347e6c96b..c73abd18f099 100644 --- a/xmloff/source/style/opaquhdl.hxx +++ b/xmloff/source/style/opaquhdl.hxx @@ -30,8 +30,8 @@ class XMLOpaquePropHdl : public XMLPropertyHandler public: virtual ~XMLOpaquePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_OPAQUETYPES_HXX diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx index 20d02abb8895..a05fa74a8aa0 100644 --- a/xmloff/source/style/postuhdl.cxx +++ b/xmloff/source/style/postuhdl.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/postuhdl.hxx b/xmloff/source/style/postuhdl.hxx index df33ccd8ea34..8bf2c2079927 100644 --- a/xmloff/source/style/postuhdl.hxx +++ b/xmloff/source/style/postuhdl.hxx @@ -30,8 +30,8 @@ class XMLPosturePropHdl : public XMLPropertyHandler public: virtual ~XMLPosturePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_POSTURETYPES_HXX diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index e68261e02719..dcdb0ed533af 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -35,8 +35,6 @@ #include #include "xmloff/xmlerror.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -196,15 +194,15 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite ) { aValues.realloc( nLen + 2 ); PropertyValue *pProps = aValues.getArray() + nLen; - pProps->Name = rtl::OUString("ParaStyleName"); + pProps->Name = OUString("ParaStyleName"); OUString sParent( GetParentName() ); if( !sParent.isEmpty() ) sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent ); else - sParent = rtl::OUString("Standard"); + sParent = OUString("Standard"); pProps->Value <<= sParent; ++pProps; - pProps->Name = rtl::OUString("ParaConditionalStyleName"); + pProps->Name = OUString("ParaConditionalStyleName"); pProps->Value <<= sParent; } @@ -213,8 +211,8 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite ) { Sequence< OUString > aPropNames(1); aPropNames[0] = GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ? - rtl::OUString("ParaAutoStyleName") : - rtl::OUString("CharAutoStyleName"); + OUString("ParaAutoStyleName") : + OUString("CharAutoStyleName"); Sequence< Any > aAny = xAutoStyle->getPropertyValues( aPropNames ); if( aAny.hasElements() ) { diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx index 8df434f91be0..596694793860 100644 --- a/xmloff/source/style/shadwhdl.cxx +++ b/xmloff/source/style/shadwhdl.cxx @@ -28,8 +28,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/shadwhdl.hxx b/xmloff/source/style/shadwhdl.hxx index 952db4be6bc4..f49e0b56f6db 100644 --- a/xmloff/source/style/shadwhdl.hxx +++ b/xmloff/source/style/shadwhdl.hxx @@ -30,8 +30,8 @@ class XMLShadowPropHdl : public XMLPropertyHandler public: virtual ~XMLShadowPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx index d0ef5dc084da..7fd14b598a2a 100644 --- a/xmloff/source/style/shdwdhdl.cxx +++ b/xmloff/source/style/shdwdhdl.cxx @@ -24,8 +24,6 @@ // -- #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/style/shdwdhdl.hxx b/xmloff/source/style/shdwdhdl.hxx index a5259b4b45b3..265ace288f95 100644 --- a/xmloff/source/style/shdwdhdl.hxx +++ b/xmloff/source/style/shdwdhdl.hxx @@ -30,8 +30,8 @@ class XMLShadowedPropHdl : public XMLPropertyHandler public: virtual ~XMLShadowedPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_SHADOWEDTYPES_HXX diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx index 5017f60ac4e9..4001950c3d0f 100644 --- a/xmloff/source/style/tabsthdl.cxx +++ b/xmloff/source/style/tabsthdl.cxx @@ -70,12 +70,12 @@ bool XMLTabStopPropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const return bEqual; } -sal_Bool XMLTabStopPropHdl::importXML( const ::rtl::OUString&, ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const +sal_Bool XMLTabStopPropHdl::importXML( const OUString&, ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const { return sal_False; } -sal_Bool XMLTabStopPropHdl::exportXML( ::rtl::OUString&, const ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const +sal_Bool XMLTabStopPropHdl::exportXML( OUString&, const ::com::sun::star::uno::Any&, const SvXMLUnitConverter& ) const { return sal_False; } diff --git a/xmloff/source/style/tabsthdl.hxx b/xmloff/source/style/tabsthdl.hxx index 5d1254b31cca..fb44c93ee405 100644 --- a/xmloff/source/style/tabsthdl.hxx +++ b/xmloff/source/style/tabsthdl.hxx @@ -33,8 +33,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_TABSTOPTYPES_HXX diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx index a4b4907ec4a0..b238491958de 100644 --- a/xmloff/source/style/undlihdl.cxx +++ b/xmloff/source/style/undlihdl.cxx @@ -26,8 +26,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::awt; diff --git a/xmloff/source/style/undlihdl.hxx b/xmloff/source/style/undlihdl.hxx index ce9cd4847f4e..53308a135a1a 100644 --- a/xmloff/source/style/undlihdl.hxx +++ b/xmloff/source/style/undlihdl.hxx @@ -30,8 +30,8 @@ class XMLUnderlineTypePropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineTypePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLUnderlineStylePropHdl : public XMLPropertyHandler @@ -39,8 +39,8 @@ class XMLUnderlineStylePropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineStylePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLUnderlineWidthPropHdl : public XMLPropertyHandler @@ -48,8 +48,8 @@ class XMLUnderlineWidthPropHdl : public XMLPropertyHandler public: virtual ~XMLUnderlineWidthPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_UNDERLINETYPES_HXX diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx index ec506bc6fe09..0ef9c84ff701 100644 --- a/xmloff/source/style/weighhdl.cxx +++ b/xmloff/source/style/weighhdl.cxx @@ -35,8 +35,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/style/weighhdl.hxx b/xmloff/source/style/weighhdl.hxx index 4bcf0239f67a..54f47d29e8c5 100644 --- a/xmloff/source/style/weighhdl.hxx +++ b/xmloff/source/style/weighhdl.hxx @@ -30,8 +30,8 @@ class XMLFontWeightPropHdl : public XMLPropertyHandler public: virtual ~XMLFontWeightPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index dbdae04a8903..ef4718b309a9 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -33,8 +33,6 @@ using namespace ::std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -47,7 +45,7 @@ namespace { DBG_ASSERT( _rxMapper.is(), "xmloff::lcl_exportDataStyle: invalid property mapper!" ); // obtain the data style name - ::rtl::OUString sDataStyleName; + OUString sDataStyleName; _rProperty.maValue >>= sDataStyleName; DBG_ASSERT( !sDataStyleName.isEmpty(), "xmloff::lcl_exportDataStyle: invalid property value for the data style name!" ); diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index c2462c2e7f9c..9a7c0ed582bd 100644 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx @@ -26,8 +26,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx index bc26c14dafdc..3f32dc5b607a 100644 --- a/xmloff/source/style/xmlbahdl.hxx +++ b/xmloff/source/style/xmlbahdl.hxx @@ -36,8 +36,8 @@ public: XMLNumberPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLNumberPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -45,15 +45,15 @@ public: */ class XMLNumberNonePropHdl : public XMLPropertyHandler { - ::rtl::OUString sZeroStr; + OUString sZeroStr; sal_Int8 nBytes; public: XMLNumberNonePropHdl( sal_Int8 nB = 4 ); XMLNumberNonePropHdl( enum ::xmloff::token::XMLTokenEnum eZeroString, sal_Int8 nB = 4 ); virtual ~XMLNumberNonePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -66,8 +66,8 @@ public: XMLMeasurePropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLMeasurePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -80,8 +80,8 @@ public: XMLPercentPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLPercentPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -90,8 +90,8 @@ public: */ class XMLDoublePercentPropHdl : public XMLPropertyHandler { - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -104,8 +104,8 @@ public: XMLNegPercentPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLNegPercentPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -118,8 +118,8 @@ public: XMLMeasurePxPropHdl( sal_Int8 nB=4 ) : nBytes( nB ) {} virtual ~XMLMeasurePxPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -130,8 +130,8 @@ class XMLBoolPropHdl : public XMLPropertyHandler public: virtual ~XMLBoolPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLBoolFalsePropHdl : public XMLBoolPropHdl @@ -139,8 +139,8 @@ class XMLBoolFalsePropHdl : public XMLBoolPropHdl public: virtual ~XMLBoolFalsePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; @@ -152,8 +152,8 @@ class XMLColorPropHdl : public XMLPropertyHandler public: virtual ~XMLColorPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -164,8 +164,8 @@ class XMLHexPropHdl : public XMLPropertyHandler public: virtual ~XMLHexPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -176,8 +176,8 @@ class XMLStringPropHdl : public XMLPropertyHandler public: virtual ~XMLStringPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -188,7 +188,7 @@ class XMLStyleNamePropHdl : public XMLStringPropHdl public: virtual ~XMLStyleNamePropHdl(); - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; @@ -200,8 +200,8 @@ class XMLDoublePropHdl : public XMLPropertyHandler public: virtual ~XMLDoublePropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -212,8 +212,8 @@ class XMLNBoolPropHdl : public XMLPropertyHandler public: virtual ~XMLNBoolPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -221,14 +221,14 @@ public: */ class XMLColorTransparentPropHdl : public XMLPropertyHandler { - const ::rtl::OUString sTransparent; + const OUString sTransparent; public: XMLColorTransparentPropHdl( enum ::xmloff::token::XMLTokenEnum eTransparent = xmloff::token::XML_TOKEN_INVALID ); virtual ~XMLColorTransparentPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -236,7 +236,7 @@ public: */ class XMLIsTransparentPropHdl : public XMLPropertyHandler { - const ::rtl::OUString sTransparent; + const OUString sTransparent; sal_Bool bTransPropValue; public: @@ -244,8 +244,8 @@ public: sal_Bool bTransPropValue = sal_True ); virtual ~XMLIsTransparentPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -257,8 +257,8 @@ public: XMLColorAutoPropHdl(); virtual ~XMLColorAutoPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -270,8 +270,8 @@ public: XMLIsAutoColorPropHdl(); virtual ~XMLIsAutoColorPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; @@ -284,8 +284,8 @@ class XMLCompareOnlyPropHdl : public XMLPropertyHandler public: virtual ~XMLCompareOnlyPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -300,8 +300,8 @@ public: XMLNumberWithoutZeroPropHdl( sal_Int8 nB = 4 ); virtual ~XMLNumberWithoutZeroPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; /** @@ -314,8 +314,8 @@ class XMLNumberWithAutoInsteadZeroPropHdl : public XMLNumberWithoutZeroPropHdl public: virtual ~XMLNumberWithAutoInsteadZeroPropHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index d8f0999fe765..c2c414b100d7 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -39,8 +39,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; @@ -155,13 +153,13 @@ void XMLPropertyStates_Impl::FillPropertyStateVector( class FilterPropertyInfo_Impl { - const rtl::OUString sApiName; + const OUString sApiName; std::list aIndexes; sal_uInt32 nCount; public: - FilterPropertyInfo_Impl( const rtl::OUString& rApiName, + FilterPropertyInfo_Impl( const OUString& rApiName, const sal_uInt32 nIndex); const OUString& GetApiName() const { return sApiName; } @@ -181,7 +179,7 @@ public: }; FilterPropertyInfo_Impl::FilterPropertyInfo_Impl( - const rtl::OUString& rApiName, + const OUString& rApiName, const sal_uInt32 nIndex ) : sApiName( rApiName ), aIndexes(), @@ -206,7 +204,7 @@ public: FilterPropertiesInfo_Impl(); ~FilterPropertiesInfo_Impl(); - void AddProperty(const rtl::OUString& rApiName, const sal_uInt32 nIndex); + void AddProperty(const OUString& rApiName, const sal_uInt32 nIndex); const uno::Sequence& GetApiNames(); void FillPropertyStateArray( vector< XMLPropertyState >& rPropStates, @@ -261,7 +259,7 @@ FilterPropertiesInfo_Impl::~FilterPropertiesInfo_Impl() } void FilterPropertiesInfo_Impl::AddProperty( - const rtl::OUString& rApiName, const sal_uInt32 nIndex) + const OUString& rApiName, const sal_uInt32 nIndex) { aPropInfos.push_back(FilterPropertyInfo_Impl(rApiName, nIndex)); nCount++; diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 23f8fcc24d78..5bf11a0404d9 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::xmloff::token; @@ -57,8 +55,6 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::beans::UnknownPropertyException; using ::com::sun::star::beans::PropertyVetoException; -using rtl::OUString; -using rtl::OUStringBuffer; SvXMLImportPropertyMapper::SvXMLImportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, @@ -713,7 +709,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet( { Sequence aSeq(1); aSeq[0] = aResults[i].Name; - rtl::OUString sMessage; + OUString sMessage; switch (aResults[i].Result) { case TolerantPropertySetResultType::UNKNOWN_PROPERTY : diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 364860513f5c..7cbc207cc981 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -50,8 +50,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index c34a0e679794..8beeab70abe3 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -48,8 +48,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -101,9 +99,9 @@ struct SvXMLEmbeddedTextEntry { sal_uInt16 nSourcePos; // position in NumberFormat (to skip later) sal_Int32 nFormatPos; // resulting position in embedded-text element - rtl::OUString aText; + OUString aText; - SvXMLEmbeddedTextEntry( sal_uInt16 nSP, sal_Int32 nFP, const rtl::OUString& rT ) : + SvXMLEmbeddedTextEntry( sal_uInt16 nSP, sal_Int32 nFP, const OUString& rT ) : nSourcePos(nSP), nFormatPos(nFP), aText(rT) {} }; @@ -257,7 +255,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport( SvXMLExport& rExp, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& rSupp, - const rtl::OUString& rPrefix ) : + const OUString& rPrefix ) : rExport( rExp ), sPrefix( rPrefix ), pFormatter( NULL ), @@ -301,7 +299,7 @@ SvXMLNumFmtExport::~SvXMLNumFmtExport() // helper methods // -static OUString lcl_CreateStyleName( sal_Int32 nKey, sal_Int32 nPart, sal_Bool bDefPart, const rtl::OUString& rPrefix ) +static OUString lcl_CreateStyleName( sal_Int32 nKey, sal_Int32 nPart, sal_Bool bDefPart, const OUString& rPrefix ) { OUStringBuffer aFmtName( 10L ); aFmtName.append( rPrefix ); @@ -628,7 +626,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl( sal_True, sal_False ); // text as element content - rtl::OUString aContent( pObj->aText ); + OUString aContent( pObj->aText ); while ( nEntry+1 < nEntryCount && rEmbeddedEntries[nEntry+1].nFormatPos == pObj->nFormatPos ) { // The array can contain several elements for the same position in the number @@ -1755,7 +1753,7 @@ OUString SvXMLNumFmtExport::GetStyleName( sal_uInt32 nKey ) else { OSL_FAIL("There is no written Data-Style"); - return rtl::OUString(); + return OUString(); } } diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index d2c589657085..beb620591c3a 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -46,8 +46,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -56,11 +54,11 @@ using namespace ::xmloff::token; struct SvXMLNumFmtEntry { - rtl::OUString aName; + OUString aName; sal_uInt32 nKey; sal_Bool bRemoveAfterUse; - SvXMLNumFmtEntry( const rtl::OUString& rN, sal_uInt32 nK, sal_Bool bR ) : + SvXMLNumFmtEntry( const OUString& rN, sal_uInt32 nK, sal_Bool bR ) : aName(rN), nKey(nK), bRemoveAfterUse(bR) {} }; @@ -69,9 +67,9 @@ typedef ::boost::ptr_vector SvXMLNumFmtEntryArr; struct SvXMLEmbeddedElement { sal_Int32 nFormatPos; - rtl::OUString aText; + OUString aText; - SvXMLEmbeddedElement( sal_Int32 nFP, const rtl::OUString& rT ) : + SvXMLEmbeddedElement( sal_Int32 nFP, const OUString& rT ) : nFormatPos(nFP), aText(rT) {} // comparison operators for PTRARR sorting - sorted by position @@ -107,8 +105,8 @@ public: const SvXMLTokenMap& GetStyleAttrTokenMap(); const SvXMLTokenMap& GetStyleElemAttrTokenMap(); const LocaleDataWrapper& GetLocaleData( LanguageType nLang ); - sal_uInt32 GetKeyForName( const rtl::OUString& rName ); - void AddKey( sal_uInt32 nKey, const rtl::OUString& rName, sal_Bool bRemoveAfterUse ); + sal_uInt32 GetKeyForName( const OUString& rName ); + void AddKey( sal_uInt32 nKey, const OUString& rName, sal_Bool bRemoveAfterUse ); void SetUsed( sal_uInt32 nKey ); void RemoveVolatileFormats(); }; @@ -140,51 +138,51 @@ class SvXMLNumFmtElementContext : public SvXMLImportContext { SvXMLNumFormatContext& rParent; sal_uInt16 nType; - rtl::OUStringBuffer aContent; + OUStringBuffer aContent; SvXMLNumberInfo aNumInfo; LanguageType nElementLang; sal_Bool bLong; sal_Bool bTextual; - rtl::OUString sCalendar; + OUString sCalendar; public: SvXMLNumFmtElementContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtElementContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); - void AddEmbeddedElement( sal_Int32 nFormatPos, const rtl::OUString& rContent ); + void AddEmbeddedElement( sal_Int32 nFormatPos, const OUString& rContent ); }; class SvXMLNumFmtEmbeddedTextContext : public SvXMLImportContext { SvXMLNumFmtElementContext& rParent; - rtl::OUStringBuffer aContent; + OUStringBuffer aContent; sal_Int32 nTextPosition; public: SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, SvXMLNumFmtElementContext& rParentContext, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtEmbeddedTextContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; @@ -192,22 +190,22 @@ public: class SvXMLNumFmtMapContext : public SvXMLImportContext { SvXMLNumFormatContext& rParent; - rtl::OUString sCondition; - rtl::OUString sName; + OUString sCondition; + OUString sName; public: SvXMLNumFmtMapContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, SvXMLNumFormatContext& rParentContext, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtMapContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; @@ -220,17 +218,17 @@ class SvXMLNumFmtPropContext : public SvXMLImportContext public: SvXMLNumFmtPropContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, SvXMLNumFormatContext& rParentContext, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtPropContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void Characters( const rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; @@ -402,7 +400,7 @@ SvXMLNumImpData::~SvXMLNumImpData() delete pLocaleData; } -sal_uInt32 SvXMLNumImpData::GetKeyForName( const rtl::OUString& rName ) +sal_uInt32 SvXMLNumImpData::GetKeyForName( const OUString& rName ) { sal_uInt16 nCount = aNameEntries.size(); for (sal_uInt16 i=0; i& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -641,14 +639,14 @@ SvXMLNumFmtMapContext::~SvXMLNumFmtMapContext() } SvXMLImportContext* SvXMLNumFmtMapContext::CreateChildContext( - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference& ) { // no elements supported - use default context return new SvXMLImportContext( GetImport(), nPrfx, rLName ); } -void SvXMLNumFmtMapContext::Characters( const rtl::OUString& ) +void SvXMLNumFmtMapContext::Characters( const OUString& ) { } @@ -664,7 +662,7 @@ void SvXMLNumFmtMapContext::EndElement() // SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFormatContext& rParentContext, const uno::Reference& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -690,14 +688,14 @@ SvXMLNumFmtPropContext::~SvXMLNumFmtPropContext() } SvXMLImportContext* SvXMLNumFmtPropContext::CreateChildContext( - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference& ) { // no elements supported - use default context return new SvXMLImportContext( GetImport(), nPrfx, rLName ); } -void SvXMLNumFmtPropContext::Characters( const rtl::OUString& ) +void SvXMLNumFmtPropContext::Characters( const OUString& ) { } @@ -714,7 +712,7 @@ void SvXMLNumFmtPropContext::EndElement() // SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFmtElementContext& rParentContext, const uno::Reference& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -743,14 +741,14 @@ SvXMLNumFmtEmbeddedTextContext::~SvXMLNumFmtEmbeddedTextContext() } SvXMLImportContext* SvXMLNumFmtEmbeddedTextContext::CreateChildContext( - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference& ) { // no elements supported - use default context return new SvXMLImportContext( GetImport(), nPrfx, rLName ); } -void SvXMLNumFmtEmbeddedTextContext::Characters( const rtl::OUString& rChars ) +void SvXMLNumFmtEmbeddedTextContext::Characters( const OUString& rChars ) { aContent.append( rChars ); } @@ -808,7 +806,7 @@ static sal_Bool lcl_ValidChar( sal_Unicode cChar, const SvXMLNumFormatContext& r return sal_False; } -static void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNumFormatContext& rParent ) +static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumFormatContext& rParent ) { sal_Bool bQuote = sal_True; sal_Int32 nLength = rContent.getLength(); @@ -828,7 +826,7 @@ static void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNu // the percent character in percentage styles must be left out of quoting // (one occurrence is enough even if there are several percent characters in the string) - rtl::OUString aString( rContent.getStr() ); + OUString aString( rContent.getStr() ); sal_Int32 nPos = aString.indexOf( (sal_Unicode) '%' ); if ( nPos >= 0 ) { @@ -917,7 +915,7 @@ static void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNu const sal_Int32 MAX_SECOND_DIGITS = 20; // fdo#58539 & gnome#627420: limit number of digits during import SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType, const uno::Reference& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -1017,7 +1015,7 @@ SvXMLNumFmtElementContext::~SvXMLNumFmtElementContext() } SvXMLImportContext* SvXMLNumFmtElementContext::CreateChildContext( - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference& xAttrList ) { // only number:number supports number:embedded-text child element @@ -1031,12 +1029,12 @@ SvXMLImportContext* SvXMLNumFmtElementContext::CreateChildContext( return new SvXMLImportContext( GetImport(), nPrfx, rLName ); } -void SvXMLNumFmtElementContext::Characters( const rtl::OUString& rChars ) +void SvXMLNumFmtElementContext::Characters( const OUString& rChars ) { aContent.append( rChars ); } -void SvXMLNumFmtElementContext::AddEmbeddedElement( sal_Int32 nFormatPos, const rtl::OUString& rContent ) +void SvXMLNumFmtElementContext::AddEmbeddedElement( sal_Int32 nFormatPos, const OUString& rContent ) { if ( !rContent.isEmpty() ) { @@ -1277,7 +1275,7 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes // SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const uno::Reference& xAttrList, SvXMLStylesContext& rStyles ) : @@ -1391,7 +1389,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, { aFormatCode.append( "][$-" ); // language code in upper hex: - aFormatCode.append(rtl::OUString::valueOf(sal_Int32(eLang), 16).toAsciiUpperCase()); + aFormatCode.append(OUString::valueOf(sal_Int32(eLang), 16).toAsciiUpperCase()); } aFormatCode.append( sal_Unicode(']') ); } @@ -1399,7 +1397,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, } SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference& xAttrList, const sal_Int32 nTempKey, SvXMLStylesContext& rStyles ) : @@ -1437,7 +1435,7 @@ SvXMLNumFormatContext::~SvXMLNumFormatContext() } SvXMLImportContext* SvXMLNumFormatContext::CreateChildContext( - sal_uInt16 nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -1719,7 +1717,7 @@ void SvXMLNumFormatContext::AddToCode( sal_Unicode c ) bHasExtraText = sal_True; } -void SvXMLNumFormatContext::AddToCode( const rtl::OUString& rString ) +void SvXMLNumFormatContext::AddToCode( const OUString& rString ) { aFormatCode.append( rString ); bHasExtraText = sal_True; @@ -1863,7 +1861,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo ) } } -void SvXMLNumFormatContext::AddCurrency( const rtl::OUString& rContent, LanguageType nLang ) +void SvXMLNumFormatContext::AddCurrency( const OUString& rContent, LanguageType nLang ) { sal_Bool bAutomatic = sal_False; OUString aSymbol = rContent; @@ -1904,7 +1902,7 @@ void SvXMLNumFormatContext::AddCurrency( const rtl::OUString& rContent, Language if ( nFirst >= 0 ) { // remove both quotes from aFormatCode - rtl::OUString aOld = aFormatCode.makeStringAndClear(); + OUString aOld = aFormatCode.makeStringAndClear(); if ( nFirst > 0 ) aFormatCode.append( aOld.copy( 0, nFirst ) ); if ( nLength > nFirst + 2 ) @@ -1924,7 +1922,7 @@ void SvXMLNumFormatContext::AddCurrency( const rtl::OUString& rContent, Language { // '-' sign and language code in hex: aFormatCode.append( (sal_Unicode) '-' ); - aFormatCode.append(rtl::OUString::valueOf(sal_Int32(nLang), 16).toAsciiUpperCase()); + aFormatCode.append(OUString::valueOf(sal_Int32(nLang), 16).toAsciiUpperCase()); } aFormatCode.append( (sal_Unicode) ']' ); // end of "new" currency symbol @@ -1996,7 +1994,7 @@ void SvXMLNumFormatContext::AddNfKeyword( sal_uInt16 nIndex ) } } -static sal_Bool lcl_IsAtEnd( rtl::OUStringBuffer& rBuffer, const OUString& rToken ) +static sal_Bool lcl_IsAtEnd( OUStringBuffer& rBuffer, const OUString& rToken ) { sal_Int32 nBufLen = rBuffer.getLength(); sal_Int32 nTokLen = rToken.getLength(); @@ -2091,7 +2089,7 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex ) } } -void SvXMLNumFormatContext::AddCondition( const rtl::OUString& rCondition, const rtl::OUString& rApplyName ) +void SvXMLNumFormatContext::AddCondition( const OUString& rCondition, const OUString& rApplyName ) { MyCondition aCondition; aCondition.sCondition = rCondition; @@ -2121,7 +2119,7 @@ void SvXMLNumFormatContext::AddColor( sal_uInt32 const nColor ) } } -void SvXMLNumFormatContext::UpdateCalendar( const rtl::OUString& rNewCalendar ) +void SvXMLNumFormatContext::UpdateCalendar( const OUString& rNewCalendar ) { if ( rNewCalendar != sCalendar ) { diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx index 1fcf7dff95c9..7c0594ad0831 100644 --- a/xmloff/source/style/xmlprcon.cxx +++ b/xmloff/source/style/xmlprcon.cxx @@ -22,8 +22,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::std; @@ -83,7 +81,7 @@ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( */ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >&, ::std::vector< XMLPropertyState > &, const XMLPropertyState& ) diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index c0094284c222..351c9127cb6c 100644 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx @@ -29,8 +29,6 @@ using namespace ::std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index 4a8e14c769db..f8f2d42ed807 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -28,8 +28,6 @@ #include #include "xmloff/xmltabe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index a457d5d10928..dad659ecdfc7 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -29,8 +29,6 @@ #include #include "xmltabi.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index 5be12e5a9a4f..651533c785b8 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -43,7 +43,6 @@ #include #include "table.hxx" -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 099b48825b66..59254909af26 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -44,7 +44,6 @@ // -------------------------------------------------------------------- -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; @@ -237,7 +236,7 @@ SvXMLStyleContext* XMLTableImport::CreateTableTemplateContext( sal_uInt16 nPrfx, // -------------------------------------------------------------------- -void XMLTableImport::addTableTemplate( const rtl::OUString& rsStyleName, XMLTableTemplate& xTableTemplate ) +void XMLTableImport::addTableTemplate( const OUString& rsStyleName, XMLTableTemplate& xTableTemplate ) { boost::shared_ptr< XMLTableTemplate > xPtr( new XMLTableTemplate ); xPtr->swap( xTableTemplate ); diff --git a/xmloff/source/table/table.hxx b/xmloff/source/table/table.hxx index 56cdace50126..77ef971627ea 100644 --- a/xmloff/source/table/table.hxx +++ b/xmloff/source/table/table.hxx @@ -27,7 +27,7 @@ struct XMLPropertyMapEntry; struct TableStyleElement { ::xmloff::token::XMLTokenEnum meElement; - ::rtl::OUString msStyleName; + OUString msStyleName; }; extern const TableStyleElement* getTableStyleMap(); diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx index 59b1b3f0f967..01049e5dc01e 100644 --- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx +++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx @@ -30,14 +30,14 @@ public: virtual ~XMLAnchorTypePropHdl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - static sal_Bool convert( const ::rtl::OUString& rStrImpValue, + static sal_Bool convert( const OUString& rStrImpValue, ::com::sun::star::text::TextContentAnchorType& rType ); }; diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx index 00cc9bf51b12..0d846b66178f 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.cxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx @@ -28,7 +28,6 @@ #include -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx index 73135cf9c52f..165cf33483f6 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.hxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx @@ -33,7 +33,7 @@ namespace rtl { class OUString; } class XMLAutoMarkFileContext : public SvXMLImportContext { - const ::rtl::OUString sIndexAutoMarkFileURL; + const OUString sIndexAutoMarkFileURL; public: @@ -42,7 +42,7 @@ public: XMLAutoMarkFileContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName); + const OUString& rLocalName); ~XMLAutoMarkFileContext(); diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx index e805cc9b8799..3d6a2186a297 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx index 57e9ea3021c4..d262a4998f27 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx @@ -48,7 +48,7 @@ public: XMLAutoTextContainerEventImport( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > & rEvents ); @@ -59,7 +59,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 95e28fb9e7d0..0212621ad528 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::set; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::PropertyValue; diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx index c90615b4a846..7aa502da04ca 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.hxx +++ b/xmloff/source/text/XMLAutoTextEventExport.hxx @@ -50,8 +50,8 @@ class XMLAutoTextEventExport : public SvXMLExport ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> xEvents; - const ::rtl::OUString sEventType; - const ::rtl::OUString sNone; + const OUString sEventType; + const OUString sNone; public: @@ -102,11 +102,11 @@ protected: // global functions to support the component -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() +OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL @@ -115,11 +115,11 @@ protected: ::com::sun::star::lang::XMultiServiceFactory > & ) throw( ::com::sun::star::uno::Exception ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventExportOOO_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() +OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 0f6b43ca75c6..d7902c629b09 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx index ec4de83c9d2b..62e122116d6a 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextEventImport.hxx @@ -63,7 +63,7 @@ protected: virtual SvXMLImportContext* CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); @@ -72,11 +72,11 @@ protected: // global functions to support the component -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventImport_getSupportedServiceNames() throw(); -::rtl::OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() +OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx index 8229bdd02820..8c1b410cbb88 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.cxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx @@ -31,8 +31,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -41,7 +39,7 @@ using namespace ::xmloff::token; XMLCalculationSettingsContext::XMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 p_nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) : SvXMLImportContext ( rImport, p_nPrefix, rLocalName ) @@ -50,11 +48,11 @@ XMLCalculationSettingsContext::XMLCalculationSettingsContext( SvXMLImport& rImpo sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); - rtl::OUString aLocalName; + OUString sAttrName = xAttrList->getNameByIndex( i ); + OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); - rtl::OUString sValue = xAttrList->getValueByIndex( i ); + OUString sValue = xAttrList->getValueByIndex( i ); if (nPrefix == XML_NAMESPACE_TABLE) { diff --git a/xmloff/source/text/XMLCalculationSettingsContext.hxx b/xmloff/source/text/XMLCalculationSettingsContext.hxx index 9a3e3fbd7040..5851d08a6aaf 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.hxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.hxx @@ -28,7 +28,7 @@ class XMLCalculationSettingsContext : public SvXMLImportContext public: XMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx index 971ebb599af3..551729bb8137 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -27,7 +27,6 @@ -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; using ::xmloff::token::IsXMLToken; diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index 5246fb110d09..43a6810379d9 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -53,7 +53,7 @@ public: XMLChangeElementImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, /// accept text content (paragraphs) in element as redline content? sal_Bool bAcceptContent, /// context of enclosing element @@ -61,7 +61,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx index 0e17413d5761..f05b5fd95ffe 100644 --- a/xmloff/source/text/XMLChangeImportContext.cxx +++ b/xmloff/source/text/XMLChangeImportContext.cxx @@ -25,7 +25,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::text::XTextRange; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx index e17a28d39cb3..8edaed4e783e 100644 --- a/xmloff/source/text/XMLChangeImportContext.hxx +++ b/xmloff/source/text/XMLChangeImportContext.hxx @@ -60,7 +60,7 @@ public: XMLChangeImportContext( SvXMLImport& rImport, sal_Int16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, sal_Bool bIsStart, /// mark start of a change sal_Bool bIsEnd, /// mark end of a change /// true if change mark is encountered outside of a paragraph diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx index e20092db1f0c..ac02dc335f30 100644 --- a/xmloff/source/text/XMLChangeInfoContext.cxx +++ b/xmloff/source/text/XMLChangeInfoContext.cxx @@ -30,7 +30,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx index d5fe167a0141..9a292b7377d0 100644 --- a/xmloff/source/text/XMLChangeInfoContext.hxx +++ b/xmloff/source/text/XMLChangeInfoContext.hxx @@ -41,11 +41,11 @@ class XMLChangedRegionImportContext; */ class XMLChangeInfoContext : public SvXMLImportContext { - const ::rtl::OUString& rType; + const OUString& rType; - ::rtl::OUStringBuffer sAuthorBuffer; - ::rtl::OUStringBuffer sDateTimeBuffer; - ::rtl::OUStringBuffer sCommentBuffer; + OUStringBuffer sAuthorBuffer; + OUStringBuffer sDateTimeBuffer; + OUStringBuffer sCommentBuffer; XMLChangedRegionImportContext& rChangedRegion; @@ -56,9 +56,9 @@ public: XMLChangeInfoContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, XMLChangedRegionImportContext& rChangedRegion, - const ::rtl::OUString& rChangeType); + const OUString& rChangeType); ~XMLChangeInfoContext(); @@ -68,7 +68,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx index 3db31fd5d9d5..4d857501b63c 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.cxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx @@ -33,7 +33,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::text::XTextCursor; using namespace ::com::sun::star; diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx index 7a8e3a840db8..c43df94f94d3 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.hxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx @@ -40,14 +40,14 @@ namespace rtl { class XMLChangedRegionImportContext : public SvXMLImportContext { - const ::rtl::OUString sEmpty; + const OUString sEmpty; /// if we replace the current XTextCursor/XText by the ones for /// the redline, we remember the old cursor here. ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> xOldCursor; - ::rtl::OUString sID; /// redline-ID + OUString sID; /// redline-ID sal_Bool bMergeLastPara; /// merge-last-paragraph flag @@ -58,7 +58,7 @@ public: XMLChangedRegionImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName); + const OUString& rLocalName); ~XMLChangedRegionImportContext(); @@ -68,7 +68,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); @@ -76,10 +76,10 @@ public: /// change info: To be called from change-info context - void SetChangeInfo(const ::rtl::OUString& rType, - const ::rtl::OUString& rAuthor, - const ::rtl::OUString& rComment, - const ::rtl::OUString& rDate); + void SetChangeInfo(const OUString& rType, + const OUString& rAuthor, + const OUString& rComment, + const OUString& rDate); /// create redline XText/XTextCursor on demand and register with /// XMLTextImportHelper diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx index 135fc97ae860..8a7f5faf7bf2 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx @@ -26,7 +26,6 @@ #include "xmloff/xmlnmspe.hxx" #include -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx index a7b2e00c95da..53cb17b0efdc 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx @@ -45,13 +45,13 @@ public: XMLFootnoteBodyImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 3088962b5595..cdcba8c49c6c 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -42,8 +42,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index 4957980a28f4..9146a9f3b53b 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -37,8 +37,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx index 235982dd716a..9209e84bd56e 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteImportContext.hxx @@ -41,7 +41,7 @@ class XMLTextImportHelper; /// import footnote elements () class XMLFootnoteImportContext : public SvXMLImportContext { - const ::rtl::OUString sPropertyReferenceId; + const OUString sPropertyReferenceId; /// old document cursor ::com::sun::star::uno::Reference< @@ -65,7 +65,7 @@ public: SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); protected: @@ -74,13 +74,13 @@ protected: ::com::sun::star::xml::sax::XAttributeList> & xAttrList); virtual void Characters( - const ::rtl::OUString& rChars); + const OUString& rChars); virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx index d050131ad381..28acc591322d 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx @@ -40,7 +40,6 @@ -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx index 6123e2b8ff04..6ae1f7fd7651 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx @@ -37,22 +37,22 @@ namespace rtl { class OUString; } */ class XMLIndexAlphabeticalSourceContext : public XMLIndexSourceBaseContext { - const ::rtl::OUString sMainEntryCharacterStyleName; - const ::rtl::OUString sUseAlphabeticalSeparators; - const ::rtl::OUString sUseCombinedEntries; - const ::rtl::OUString sIsCaseSensitive; - const ::rtl::OUString sUseKeyAsEntry; - const ::rtl::OUString sUseUpperCase; - const ::rtl::OUString sUseDash; - const ::rtl::OUString sUsePP; - const ::rtl::OUString sIsCommaSeparated; - const ::rtl::OUString sSortAlgorithm; - const ::rtl::OUString sLocale; + const OUString sMainEntryCharacterStyleName; + const OUString sUseAlphabeticalSeparators; + const OUString sUseCombinedEntries; + const OUString sIsCaseSensitive; + const OUString sUseKeyAsEntry; + const OUString sUseUpperCase; + const OUString sUseDash; + const OUString sUsePP; + const OUString sIsCommaSeparated; + const OUString sSortAlgorithm; + const OUString sLocale; ::com::sun::star::lang::Locale aLocale; - ::rtl::OUString sAlgorithm; + OUString sAlgorithm; - ::rtl::OUString sMainEntryStyleName; + OUString sMainEntryStyleName; sal_Bool bMainEntryStyleNameOK; sal_Bool bSeparators; @@ -71,7 +71,7 @@ public: XMLIndexAlphabeticalSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -81,13 +81,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index 36f2a1e6847a..e838485154c1 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::XPropertySet; @@ -222,7 +221,7 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(sal_Bool) Reference xFactory(GetImport().GetModel(),UNO_QUERY); if( xFactory.is() ) { - Sequence aServices = xFactory->getAvailableServiceNames(); + Sequence aServices = xFactory->getAvailableServiceNames(); sal_Bool bFound(sal_False); sal_Int32 i(0); sal_Int32 nServiceCount(aServices.getLength()); diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx index 0d5be554541b..ad4eaa217481 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::text; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx index 374497031384..b07c349838e0 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx @@ -52,7 +52,7 @@ public: SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexBibliographyEntryContext(); diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx index 11535cef776c..fd8b6ae3b5b7 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx @@ -35,7 +35,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx index 4bfcbf2a211c..b3377daea3e2 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx @@ -44,7 +44,7 @@ public: XMLIndexBibliographySourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -54,13 +54,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx index 8994532b5a74..6ea03369103c 100644 --- a/xmloff/source/text/XMLIndexBodyContext.cxx +++ b/xmloff/source/text/XMLIndexBodyContext.cxx @@ -23,7 +23,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; @@ -33,7 +32,7 @@ TYPEINIT1( XMLIndexBodyContext, SvXMLImportContext); XMLIndexBodyContext::XMLIndexBodyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ) : + const OUString& rLocalName ) : SvXMLImportContext(rImport, nPrfx, rLocalName), bHasContent(sal_False) { diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx index 7f7e65d1cf70..0161481daf70 100644 --- a/xmloff/source/text/XMLIndexBodyContext.hxx +++ b/xmloff/source/text/XMLIndexBodyContext.hxx @@ -47,7 +47,7 @@ public: XMLIndexBodyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexBodyContext(); @@ -58,7 +58,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index acbba31c4f47..20e08d6f9221 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::text; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx index 861484eef724..bd47cd15f5cf 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx @@ -52,7 +52,7 @@ public: SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, sal_Bool bTOC ); ~XMLIndexChapterInfoEntryContext(); diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx index dcc32e722ef6..812c2b9af18e 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx @@ -29,7 +29,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx index 3900377a7ca3..d1d0a70152d7 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx @@ -46,7 +46,7 @@ public: XMLIndexIllustrationSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -56,7 +56,7 @@ protected: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx index bd67bd5b069c..f829c796f36f 100644 --- a/xmloff/source/text/XMLIndexMarkExport.cxx +++ b/xmloff/source/text/XMLIndexMarkExport.cxx @@ -31,8 +31,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XPropertySetInfo; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx index e5b3cc492308..a46864b56c9f 100644 --- a/xmloff/source/text/XMLIndexMarkExport.hxx +++ b/xmloff/source/text/XMLIndexMarkExport.hxx @@ -43,18 +43,18 @@ namespace rtl { */ class XMLIndexMarkExport { - ::rtl::OUString sLevel; - ::rtl::OUString sUserIndexName; - ::rtl::OUString sPrimaryKey; - ::rtl::OUString sSecondaryKey; - ::rtl::OUString sDocumentIndexMark; - ::rtl::OUString sIsStart; - ::rtl::OUString sIsCollapsed; - ::rtl::OUString sAlternativeText; - ::rtl::OUString sTextReading; - ::rtl::OUString sPrimaryKeyReading; - ::rtl::OUString sSecondaryKeyReading; - ::rtl::OUString sMainEntry; + OUString sLevel; + OUString sUserIndexName; + OUString sPrimaryKey; + OUString sSecondaryKey; + OUString sDocumentIndexMark; + OUString sIsStart; + OUString sIsCollapsed; + OUString sAlternativeText; + OUString sTextReading; + OUString sPrimaryKeyReading; + OUString sSecondaryKeyReading; + OUString sMainEntry; SvXMLExport& rExport; @@ -97,7 +97,7 @@ protected: /// create a numerical ID for this index mark /// (represented by its properties) void GetID( - ::rtl::OUStringBuffer& sBuffer, + OUStringBuffer& sBuffer, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx index ac542b01bba9..fc4e0e5339c6 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx @@ -38,7 +38,6 @@ #include -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx index 329c19b8cc9b..2b318d9b2fa6 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx @@ -36,11 +36,11 @@ namespace rtl { class OUString; } */ class XMLIndexObjectSourceContext : public XMLIndexSourceBaseContext { - const ::rtl::OUString sCreateFromStarCalc; - const ::rtl::OUString sCreateFromStarChart; - const ::rtl::OUString sCreateFromStarDraw; - const ::rtl::OUString sCreateFromStarMath; - const ::rtl::OUString sCreateFromOtherEmbeddedObjects; + const OUString sCreateFromStarCalc; + const OUString sCreateFromStarChart; + const OUString sCreateFromStarDraw; + const OUString sCreateFromStarMath; + const OUString sCreateFromOtherEmbeddedObjects; sal_Bool bUseCalc; sal_Bool bUseChart; @@ -55,7 +55,7 @@ public: XMLIndexObjectSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -65,13 +65,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx index c0bd8222ba09..934129b37df3 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -27,7 +27,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx index a88f7b090616..28f7b807f794 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx @@ -39,11 +39,11 @@ class XMLIndexSimpleEntryContext : public SvXMLImportContext { // entry type - const ::rtl::OUString& rEntryType; + const OUString& rEntryType; protected: // character style - ::rtl::OUString sCharStyleName; + OUString sCharStyleName; sal_Bool bCharStyleNameOK; // surrounding template @@ -58,10 +58,10 @@ public: XMLIndexSimpleEntryContext( SvXMLImport& rImport, - const ::rtl::OUString& rEntry, + const OUString& rEntry, XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexSimpleEntryContext(); diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx index d29edc6ac512..eb44e58fea08 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -36,7 +36,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx index b3714e2b5e04..31ffd2662e43 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx @@ -73,8 +73,8 @@ enum IndexSourceParamEnum */ class XMLIndexSourceBaseContext : public SvXMLImportContext { - const ::rtl::OUString sCreateFromChapter; - const ::rtl::OUString sIsRelativeTabstops; + const OUString sCreateFromChapter; + const OUString sIsRelativeTabstops; sal_Bool bUseLevelFormats; @@ -94,7 +94,7 @@ public: XMLIndexSourceBaseContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, sal_Bool bLevelFormats); @@ -109,13 +109,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx index 285f30d13e4b..3c3ca1c76231 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx @@ -23,7 +23,6 @@ #include -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::com::sun::star::beans::PropertyValue; diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx index f6fed5d421ed..fa61ca00ca91 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx @@ -36,7 +36,7 @@ namespace rtl { class OUString; } */ class XMLIndexSpanEntryContext : public XMLIndexSimpleEntryContext { - ::rtl::OUStringBuffer sContent; + OUStringBuffer sContent; public: @@ -46,14 +46,14 @@ public: SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexSpanEntryContext(); protected: /// Collect element contents - virtual void Characters(const ::rtl::OUString& sString); + virtual void Characters(const OUString& sString); /// add Text PropertyValue virtual void FillPropertyValues( diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index 4a92646df876..628c955c26ba 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx index 4f05179124e1..c7e95af0db08 100644 --- a/xmloff/source/text/XMLIndexTOCContext.hxx +++ b/xmloff/source/text/XMLIndexTOCContext.hxx @@ -55,9 +55,9 @@ enum IndexTypeEnum */ class XMLIndexTOCContext : public SvXMLImportContext { - const ::rtl::OUString sTitle; - const ::rtl::OUString sIsProtected; - const ::rtl::OUString sName; + const OUString sTitle; + const OUString sIsProtected; + const OUString sName; /** XPropertySet of the index */ ::com::sun::star::uno::Reference< @@ -76,7 +76,7 @@ public: XMLIndexTOCContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexTOCContext(); @@ -90,7 +90,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx index 98ce76534549..e7b3f1f93434 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx @@ -36,7 +36,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx index 9cb29f1ffe71..10c4c23ae133 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx @@ -36,11 +36,11 @@ namespace rtl { class OUString; } */ class XMLIndexTOCSourceContext : public XMLIndexSourceBaseContext { - const ::rtl::OUString sCreateFromMarks; - const ::rtl::OUString sLevel; - const ::rtl::OUString sCreateFromChapter; - const ::rtl::OUString sCreateFromOutline; - const ::rtl::OUString sCreateFromLevelParagraphStyles; + const OUString sCreateFromMarks; + const OUString sLevel; + const OUString sCreateFromChapter; + const OUString sCreateFromOutline; + const OUString sCreateFromLevelParagraphStyles; sal_Int32 nOutlineLevel; sal_Bool bUseOutline; @@ -54,7 +54,7 @@ public: XMLIndexTOCSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -64,13 +64,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx index 1270461101ee..877acc01a563 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx @@ -33,7 +33,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx index 4da8248503ca..b5c68fc8bd19 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx @@ -43,14 +43,14 @@ namespace rtl { class OUString; } */ class XMLIndexTOCStylesContext : public SvXMLImportContext { - const ::rtl::OUString sLevelParagraphStyles; + const OUString sLevelParagraphStyles; /// XPropertySet of the index ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rTOCPropertySet; /// style names for this level - ::std::vector< ::rtl::OUString > aStyleNames; + ::std::vector< OUString > aStyleNames; /// outline level sal_Int32 nOutlineLevel; @@ -64,7 +64,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexTOCStylesContext(); @@ -78,7 +78,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index d9bff350c7fe..eb87456201d6 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -35,7 +35,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx index 3b36fa824f06..f27901d4ecf0 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx @@ -37,7 +37,7 @@ class XMLIndexTemplateContext; */ class XMLIndexTabStopEntryContext : public XMLIndexSimpleEntryContext { - ::rtl::OUString sLeaderChar; /// fill ("leader") character + OUString sLeaderChar; /// fill ("leader") character sal_Int32 nTabPosition; /// tab position sal_Bool bTabPositionOK; /// is tab right aligned? sal_Bool bTabRightAligned; /// is nTabPosition valid? @@ -52,7 +52,7 @@ public: SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLIndexTabStopEntryContext(); diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index ab11324247e3..38bce6e3f88b 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::text; using namespace ::xmloff::token; -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx index 593acd663533..30b0d1b2c876 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx @@ -36,11 +36,11 @@ namespace rtl { class OUString; } */ class XMLIndexTableSourceContext : public XMLIndexSourceBaseContext { - const ::rtl::OUString sCreateFromLabels; - const ::rtl::OUString sLabelCategory; - const ::rtl::OUString sLabelDisplayType; + const OUString sCreateFromLabels; + const OUString sLabelCategory; + const OUString sLabelDisplayType; - ::rtl::OUString sSequence; + OUString sSequence; sal_Int16 nDisplayFormat; sal_Bool bSequenceOK; @@ -54,7 +54,7 @@ public: XMLIndexTableSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -64,13 +64,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index ec7eac4fede4..71ffbb9c2ed2 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -39,8 +39,6 @@ using namespace ::std; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index 079da8b695c2..369eab7fe2b7 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -69,7 +69,7 @@ class XMLIndexTemplateContext : public SvXMLImportContext // pick up PropertyValues to be turned into a sequence. ::std::vector< ::com::sun::star::beans::PropertyValues > aValueVector; - ::rtl::OUString sStyleName; + OUString sStyleName; const SvXMLEnumMapEntry* pOutlineLevelNameMap; enum ::xmloff::token::XMLTokenEnum eOutlineLevelAttrName; @@ -89,28 +89,28 @@ public: // constants made available to other contexts (template entry // contexts, in particular) - const ::rtl::OUString sTokenEntryNumber; - const ::rtl::OUString sTokenEntryText; - const ::rtl::OUString sTokenTabStop; - const ::rtl::OUString sTokenText; - const ::rtl::OUString sTokenPageNumber; - const ::rtl::OUString sTokenChapterInfo; - const ::rtl::OUString sTokenHyperlinkStart; - const ::rtl::OUString sTokenHyperlinkEnd; - const ::rtl::OUString sTokenBibliographyDataField; + const OUString sTokenEntryNumber; + const OUString sTokenEntryText; + const OUString sTokenTabStop; + const OUString sTokenText; + const OUString sTokenPageNumber; + const OUString sTokenChapterInfo; + const OUString sTokenHyperlinkStart; + const OUString sTokenHyperlinkEnd; + const OUString sTokenBibliographyDataField; - const ::rtl::OUString sCharacterStyleName; - const ::rtl::OUString sTokenType; - const ::rtl::OUString sText; - const ::rtl::OUString sTabStopRightAligned; - const ::rtl::OUString sTabStopPosition; - const ::rtl::OUString sTabStopFillCharacter; - const ::rtl::OUString sBibliographyDataField; - const ::rtl::OUString sChapterFormat; - const ::rtl::OUString sChapterLevel;//i53420 + const OUString sCharacterStyleName; + const OUString sTokenType; + const OUString sText; + const OUString sTabStopRightAligned; + const OUString sTabStopPosition; + const OUString sTabStopFillCharacter; + const OUString sBibliographyDataField; + const OUString sChapterFormat; + const OUString sChapterLevel;//i53420 - const ::rtl::OUString sLevelFormat; - const ::rtl::OUString sParaStyleLevel; + const OUString sLevelFormat; + const OUString sParaStyleLevel; TYPEINFO(); @@ -120,7 +120,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const SvXMLEnumMapEntry* aLevelNameMap, enum ::xmloff::token::XMLTokenEnum eLevelAttrName, const sal_Char** aLevelStylePropNameMap, @@ -143,7 +143,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx index 7a42c49c6c36..3b2ee8ce6c27 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -25,8 +25,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx index 876c8c2bf6c8..fd60dd7022de 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx @@ -38,15 +38,15 @@ namespace com { namespace sun { namespace star { class XMLIndexTitleTemplateContext : public SvXMLImportContext { - const ::rtl::OUString sTitle; - const ::rtl::OUString sParaStyleHeading; + const OUString sTitle; + const OUString sParaStyleHeading; // paragraph style - ::rtl::OUString sStyleName; + OUString sStyleName; sal_Bool bStyleNameOK; // content - ::rtl::OUStringBuffer sContent; + OUStringBuffer sContent; // TOC property set ::com::sun::star::uno::Reference< @@ -61,7 +61,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName); + const OUString& rLocalName); ~XMLIndexTitleTemplateContext(); @@ -76,7 +76,7 @@ protected: virtual void EndElement(); /** pick up title characters */ - virtual void Characters(const ::rtl::OUString& sString); + virtual void Characters(const OUString& sString); }; #endif diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx index 09ff595493ae..f3a714a3722c 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.cxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx @@ -33,7 +33,6 @@ #include -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx index 0ef806fa3039..476b9920404f 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.hxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx @@ -36,14 +36,14 @@ namespace rtl { class OUString; } */ class XMLIndexUserSourceContext : public XMLIndexSourceBaseContext { - const ::rtl::OUString sCreateFromEmbeddedObjects; - const ::rtl::OUString sCreateFromGraphicObjects; - const ::rtl::OUString sCreateFromMarks; - const ::rtl::OUString sCreateFromTables; - const ::rtl::OUString sCreateFromTextFrames; - const ::rtl::OUString sUseLevelFromSource; - const ::rtl::OUString sCreateFromLevelParagraphStyles; - const ::rtl::OUString sUserIndexName; + const OUString sCreateFromEmbeddedObjects; + const OUString sCreateFromGraphicObjects; + const OUString sCreateFromMarks; + const OUString sCreateFromTables; + const OUString sCreateFromTextFrames; + const OUString sUseLevelFromSource; + const OUString sCreateFromLevelParagraphStyles; + const OUString sUserIndexName; sal_Bool bUseObjects; sal_Bool bUseGraphic; @@ -52,7 +52,7 @@ class XMLIndexUserSourceContext : public XMLIndexSourceBaseContext sal_Bool bUseFrames; sal_Bool bUseLevelFromSource; sal_Bool bUseLevelParagraphStyles; - ::rtl::OUString sIndexName; + OUString sIndexName; public: @@ -61,7 +61,7 @@ public: XMLIndexUserSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); @@ -71,13 +71,13 @@ protected: virtual void ProcessAttribute( enum IndexSourceParamEnum eParam, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx index 86c31ff6abb0..41eb51523f1b 100644 --- a/xmloff/source/text/XMLLineNumberingExport.cxx +++ b/xmloff/source/text/XMLLineNumberingExport.cxx @@ -33,8 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::text::XLineNumberingProperties; diff --git a/xmloff/source/text/XMLLineNumberingExport.hxx b/xmloff/source/text/XMLLineNumberingExport.hxx index 6a9f8d995ed5..726511d64e06 100644 --- a/xmloff/source/text/XMLLineNumberingExport.hxx +++ b/xmloff/source/text/XMLLineNumberingExport.hxx @@ -29,17 +29,17 @@ class SvXMLExport; /** export and it's child elements */ class XMLLineNumberingExport { - const ::rtl::OUString sCharStyleName; - const ::rtl::OUString sCountEmptyLines; - const ::rtl::OUString sCountLinesInFrames; - const ::rtl::OUString sDistance; - const ::rtl::OUString sInterval; - const ::rtl::OUString sSeparatorText; - const ::rtl::OUString sNumberPosition; - const ::rtl::OUString sNumberingType; - const ::rtl::OUString sIsOn; - const ::rtl::OUString sRestartAtEachPage; - const ::rtl::OUString sSeparatorInterval; + const OUString sCharStyleName; + const OUString sCountEmptyLines; + const OUString sCountLinesInFrames; + const OUString sDistance; + const OUString sInterval; + const OUString sSeparatorText; + const OUString sNumberPosition; + const OUString sNumberingType; + const OUString sIsOn; + const OUString sRestartAtEachPage; + const OUString sSeparatorInterval; SvXMLExport& rExport; diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 77dd3ba1da2c..b6cd75e719c1 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -40,7 +40,6 @@ using namespace ::xmloff::token; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::text::XLineNumberingProperties; -using ::rtl::OUString; TYPEINIT1( XMLLineNumberingImportContext, SvXMLStyleContext ); diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx index e01d7a07f22f..a67f88eefcf9 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx @@ -31,8 +31,6 @@ using namespace ::com::sun::star::uno; using ::com::sun::star::xml::sax::XAttributeList; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_INCREMENT; diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx index c15224c167a5..6cff4014ed0c 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx @@ -35,7 +35,7 @@ class XMLLineNumberingImportContext; /** import elements */ class XMLLineNumberingSeparatorImportContext : public SvXMLImportContext { - ::rtl::OUStringBuffer sSeparatorBuf; + OUStringBuffer sSeparatorBuf; XMLLineNumberingImportContext& rLineNumberingContext; public: @@ -45,7 +45,7 @@ public: XMLLineNumberingSeparatorImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, XMLLineNumberingImportContext& rLineNumbering); ~XMLLineNumberingSeparatorImportContext(); @@ -56,7 +56,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void EndElement(); }; diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx index de91fc51df28..7807dc73b82e 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.cxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx @@ -26,7 +26,6 @@ #include // XMLTextImportHelper partially implemented here -using ::rtl::OUString; using ::std::vector; using ::std::map; using ::com::sun::star::uno::Reference; @@ -36,7 +35,7 @@ using ::com::sun::star::beans::XPropertySet; template XMLPropertyBackpatcher::XMLPropertyBackpatcher( - const ::rtl::OUString& sPropName) + const OUString& sPropName) : sPropertyName(sPropName) , bDefaultHandling(sal_False) , bPreserveProperty(sal_False) @@ -164,7 +163,7 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::BackpatcherImpl ::std::auto_ptr< XMLPropertyBackpatcher > m_pSequenceIdBackpatcher; - ::std::auto_ptr< XMLPropertyBackpatcher< ::rtl::OUString> > + ::std::auto_ptr< XMLPropertyBackpatcher< OUString> > m_pSequenceNameBackpatcher; SAL_WNODEPRECATED_DECLARATIONS_POP }; @@ -176,9 +175,9 @@ XMLTextImportHelper::MakeBackpatcherImpl() return ::boost::shared_ptr(new BackpatcherImpl); } -static ::rtl::OUString const& GetSequenceNumber() +static OUString const& GetSequenceNumber() { - static ::rtl::OUString s_SequenceNumber("SequenceNumber"); + static OUString s_SequenceNumber("SequenceNumber"); return s_SequenceNumber; } diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx index 38c7da5acc8e..de4fe8819e1f 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.hxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx @@ -61,7 +61,7 @@ class XMLPropertyBackpatcher { /// name of property that gets set or backpatched - ::rtl::OUString sPropertyName; + OUString sPropertyName; /// should a default value be set for unresolved properties sal_Bool bDefaultHandling; @@ -70,7 +70,7 @@ class XMLPropertyBackpatcher sal_Bool bPreserveProperty; /// name of the property to preserve - ::rtl::OUString sPreservePropertyName; + OUString sPreservePropertyName; /// default value for unresolved properties (if bDefaultHandling) A aDefault; @@ -85,23 +85,23 @@ class XMLPropertyBackpatcher >1200 chars. */ /// backpatch list for unresolved IDs - //::std::map aBackpatchListMap; - ::std::map aBackpatchListMap; + //::std::map aBackpatchListMap; + ::std::map aBackpatchListMap; /// mapping of names -> IDs - ::std::map aIDMap; + ::std::map aIDMap; public: XMLPropertyBackpatcher( - const ::rtl::OUString& sPropertyName); + const OUString& sPropertyName); ~XMLPropertyBackpatcher(); /// resolve a known ID. /// Call this as soon as the value for a particular name is known. void ResolveId( - const ::rtl::OUString& sName, + const OUString& sName, A aValue); /// Set property with the proper value for this name. If the value @@ -111,13 +111,13 @@ public: void SetProperty( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropSet, - const ::rtl::OUString& sName); + const OUString& sName); /// non-const version of SetProperty void SetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropSet, - const ::rtl::OUString& sName); + const OUString& sName); /// set default (if bDefaultHandling) for unresolved names /// called by destructor diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index 41171e4dce39..6cc8f2d74c36 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -55,8 +55,6 @@ using ::com::sun::star::text::XTextSection; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::std::list; diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx index 258a7e5b6190..175c40ac5974 100644 --- a/xmloff/source/text/XMLRedlineExport.hxx +++ b/xmloff/source/text/XMLRedlineExport.hxx @@ -56,32 +56,32 @@ typedef ::std::map< */ class XMLRedlineExport { - const ::rtl::OUString sDelete; - const ::rtl::OUString sDeletion; - const ::rtl::OUString sFormat; - const ::rtl::OUString sFormatChange; - const ::rtl::OUString sInsert; - const ::rtl::OUString sInsertion; - const ::rtl::OUString sIsCollapsed; - const ::rtl::OUString sIsStart; - const ::rtl::OUString sRedlineAuthor; - const ::rtl::OUString sRedlineComment; - const ::rtl::OUString sRedlineDateTime; - const ::rtl::OUString sRedlineSuccessorData; - const ::rtl::OUString sRedlineText; - const ::rtl::OUString sRedlineType; - const ::rtl::OUString sStyle; - const ::rtl::OUString sTextTable; - const ::rtl::OUString sUnknownChange; - const ::rtl::OUString sStartRedline; - const ::rtl::OUString sEndRedline; - const ::rtl::OUString sRedlineIdentifier; - const ::rtl::OUString sIsInHeaderFooter; - const ::rtl::OUString sRedlineProtectionKey; - const ::rtl::OUString sRecordChanges; - const ::rtl::OUString sMergeLastPara; + const OUString sDelete; + const OUString sDeletion; + const OUString sFormat; + const OUString sFormatChange; + const OUString sInsert; + const OUString sInsertion; + const OUString sIsCollapsed; + const OUString sIsStart; + const OUString sRedlineAuthor; + const OUString sRedlineComment; + const OUString sRedlineDateTime; + const OUString sRedlineSuccessorData; + const OUString sRedlineText; + const OUString sRedlineType; + const OUString sStyle; + const OUString sTextTable; + const OUString sUnknownChange; + const OUString sStartRedline; + const OUString sEndRedline; + const OUString sRedlineIdentifier; + const OUString sIsInHeaderFooter; + const OUString sRedlineProtectionKey; + const OUString sRecordChanges; + const OUString sMergeLastPara; - const ::rtl::OUString sChangePrefix; + const OUString sChangePrefix; SvXMLExport& rExport; @@ -188,15 +188,15 @@ private: ::com::sun::star::beans::PropertyValue> & rValues); /// convert the change type from API to XML names - const ::rtl::OUString ConvertTypeName(const ::rtl::OUString& sApiName); + const OUString ConvertTypeName(const OUString& sApiName); /// Get ID string! - const ::rtl::OUString GetRedlineID( + const OUString GetRedlineID( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet); /// write a comment string as sequence of elements - void WriteComment(const ::rtl::OUString& rComment); + void WriteComment(const OUString& rComment); }; #endif diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 3fd68776628a..38330c77d5a2 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -62,8 +62,6 @@ using namespace ::com::sun::star::uno; using namespace ::std; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index b1c972e634a8..f0cabf3ea614 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -74,65 +74,65 @@ enum SectionTypeEnum */ class XMLSectionExport { - const ::rtl::OUString sCondition; - const ::rtl::OUString sCreateFromChapter; - const ::rtl::OUString sCreateFromEmbeddedObjects; - const ::rtl::OUString sCreateFromGraphicObjects; - const ::rtl::OUString sCreateFromLabels; - const ::rtl::OUString sCreateFromMarks; - const ::rtl::OUString sCreateFromOtherEmbeddedObjects; - const ::rtl::OUString sCreateFromOutline; - const ::rtl::OUString sCreateFromStarCalc; - const ::rtl::OUString sCreateFromStarChart; - const ::rtl::OUString sCreateFromStarDraw; - const ::rtl::OUString sCreateFromStarImage; - const ::rtl::OUString sCreateFromStarMath; - const ::rtl::OUString sCreateFromTables; - const ::rtl::OUString sCreateFromTextFrames; - const ::rtl::OUString sDdeCommandElement; - const ::rtl::OUString sDdeCommandFile; - const ::rtl::OUString sDdeCommandType; - const ::rtl::OUString sFileLink; - const ::rtl::OUString sIsCaseSensitive; - const ::rtl::OUString sIsProtected; - const ::rtl::OUString sIsVisible; - const ::rtl::OUString sLabelCategory; - const ::rtl::OUString sLabelDisplayType; - const ::rtl::OUString sLevel; - const ::rtl::OUString sLevelFormat; - const ::rtl::OUString sLevelParagraphStyles; - const ::rtl::OUString sLinkRegion; - const ::rtl::OUString sMainEntryCharacterStyleName; - const ::rtl::OUString sParaStyleHeading; - const ::rtl::OUString sParaStyleLevel; - const ::rtl::OUString sTitle; - const ::rtl::OUString sName; - const ::rtl::OUString sUseAlphabeticalSeparators; - const ::rtl::OUString sUseCombinedEntries; - const ::rtl::OUString sUseDash; - const ::rtl::OUString sUseKeyAsEntry; - const ::rtl::OUString sUseLevelFromSource; - const ::rtl::OUString sUsePP; - const ::rtl::OUString sUseUpperCase; - const ::rtl::OUString sIsCommaSeparated; - const ::rtl::OUString sIsAutomaticUpdate; - const ::rtl::OUString sIsRelativeTabstops; - const ::rtl::OUString sCreateFromLevelParagraphStyles; - const ::rtl::OUString sDocumentIndex; - const ::rtl::OUString sContentSection; - const ::rtl::OUString sHeaderSection; + const OUString sCondition; + const OUString sCreateFromChapter; + const OUString sCreateFromEmbeddedObjects; + const OUString sCreateFromGraphicObjects; + const OUString sCreateFromLabels; + const OUString sCreateFromMarks; + const OUString sCreateFromOtherEmbeddedObjects; + const OUString sCreateFromOutline; + const OUString sCreateFromStarCalc; + const OUString sCreateFromStarChart; + const OUString sCreateFromStarDraw; + const OUString sCreateFromStarImage; + const OUString sCreateFromStarMath; + const OUString sCreateFromTables; + const OUString sCreateFromTextFrames; + const OUString sDdeCommandElement; + const OUString sDdeCommandFile; + const OUString sDdeCommandType; + const OUString sFileLink; + const OUString sIsCaseSensitive; + const OUString sIsProtected; + const OUString sIsVisible; + const OUString sLabelCategory; + const OUString sLabelDisplayType; + const OUString sLevel; + const OUString sLevelFormat; + const OUString sLevelParagraphStyles; + const OUString sLinkRegion; + const OUString sMainEntryCharacterStyleName; + const OUString sParaStyleHeading; + const OUString sParaStyleLevel; + const OUString sTitle; + const OUString sName; + const OUString sUseAlphabeticalSeparators; + const OUString sUseCombinedEntries; + const OUString sUseDash; + const OUString sUseKeyAsEntry; + const OUString sUseLevelFromSource; + const OUString sUsePP; + const OUString sUseUpperCase; + const OUString sIsCommaSeparated; + const OUString sIsAutomaticUpdate; + const OUString sIsRelativeTabstops; + const OUString sCreateFromLevelParagraphStyles; + const OUString sDocumentIndex; + const OUString sContentSection; + const OUString sHeaderSection; - const ::rtl::OUString sTextSection; - const ::rtl::OUString sIsGlobalDocumentSection; - const ::rtl::OUString sProtectionKey; - const ::rtl::OUString sSortAlgorithm; - const ::rtl::OUString sLocale; - const ::rtl::OUString sUserIndexName; + const OUString sTextSection; + const OUString sIsGlobalDocumentSection; + const OUString sProtectionKey; + const OUString sSortAlgorithm; + const OUString sLocale; + const OUString sUserIndexName; - const ::rtl::OUString sIsCurrentlyVisible; - const ::rtl::OUString sHeadingStyleName; + const OUString sIsCurrentlyVisible; + const OUString sHeadingStyleName; - const ::rtl::OUString sEmpty; + const OUString sEmpty; SvXMLExport& rExport; XMLTextParagraphExport& rParaExport; @@ -282,7 +282,7 @@ protected: ::com::sun::star::text::XDocumentIndex > & rIndex) const; /// map service name to section type - enum SectionTypeEnum MapSectionType(const ::rtl::OUString& rSectionName); + enum SectionTypeEnum MapSectionType(const OUString& rSectionName); /** * Export the index element start (for all index types). @@ -349,7 +349,7 @@ protected: void ExportBoolean( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropSet, - const ::rtl::OUString& sPropertyName, + const OUString& sPropertyName, enum ::xmloff::token::XMLTokenEnum eAttributeName, sal_Bool bDefault, sal_Bool bInvert = sal_False); diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index ac7d6a380940..05e3ab7f436e 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -40,8 +40,6 @@ using namespace ::xmloff::token; using ::std::vector; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::style::NumberingType::ARABIC; diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index f96ef8c1d7b5..506db5b89e6d 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -40,7 +40,6 @@ using namespace ::xmloff::token; using namespace ::com::sun::star::style; -using ::rtl::OUString; using ::std::vector; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx index 4bbbed985213..a38632f82a28 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx @@ -53,7 +53,7 @@ public: XMLSectionFootnoteConfigImport( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::std::vector & rProperties, const UniReference & rMapperRef); diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 00dc2780238b..689c3b716c02 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -36,7 +36,6 @@ #include -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx index 6feb1b492088..5ffc1df8d81f 100644 --- a/xmloff/source/text/XMLSectionImportContext.hxx +++ b/xmloff/source/text/XMLSectionImportContext.hxx @@ -52,19 +52,19 @@ class XMLSectionImportContext : public SvXMLImportContext ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xSectionPropertySet; - const ::rtl::OUString sTextSection; - const ::rtl::OUString sIndexHeaderSection; - const ::rtl::OUString sCondition; - const ::rtl::OUString sIsVisible; - const ::rtl::OUString sProtectionKey; - const ::rtl::OUString sIsProtected; - const ::rtl::OUString sIsCurrentlyVisible; - const ::rtl::OUString sEmpty; + const OUString sTextSection; + const OUString sIndexHeaderSection; + const OUString sCondition; + const OUString sIsVisible; + const OUString sProtectionKey; + const OUString sIsProtected; + const OUString sIsCurrentlyVisible; + const OUString sEmpty; - ::rtl::OUString sXmlId; - ::rtl::OUString sStyleName; - ::rtl::OUString sName; - ::rtl::OUString sCond; + OUString sXmlId; + OUString sStyleName; + OUString sName; + OUString sCond; ::com::sun::star::uno::Sequence aSequence; sal_Bool bProtect; sal_Bool bCondOK; @@ -83,7 +83,7 @@ public: XMLSectionImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); ~XMLSectionImportContext(); @@ -97,7 +97,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx index d719fce62da7..5e7c20e4d9ba 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx @@ -32,7 +32,6 @@ #include #include -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XMultiPropertySet; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx index a8437246be2a..f8077299933c 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx @@ -34,10 +34,10 @@ class XMLSectionSourceDDEImportContext : public SvXMLImportContext ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rSectionPropertySet; - const ::rtl::OUString sDdeCommandFile; - const ::rtl::OUString sDdeCommandType; - const ::rtl::OUString sDdeCommandElement; - const ::rtl::OUString sIsAutomaticUpdate; + const OUString sDdeCommandFile; + const OUString sDdeCommandType; + const OUString sDdeCommandElement; + const OUString sIsAutomaticUpdate; public: @@ -46,7 +46,7 @@ public: XMLSectionSourceDDEImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rSectPropSet); @@ -62,7 +62,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx index 9162e64e8667..043725c7f375 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx @@ -30,7 +30,6 @@ #include -using ::rtl::OUString; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx index 637c5071af2b..9f8c94e3cf2e 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx @@ -41,7 +41,7 @@ public: XMLSectionSourceImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rSectPropSet); @@ -57,7 +57,7 @@ protected: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx index 51e8426a0298..3971dc1f0b21 100644 --- a/xmloff/source/text/XMLStringBufferImportContext.cxx +++ b/xmloff/source/text/XMLStringBufferImportContext.cxx @@ -22,8 +22,6 @@ #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; using ::xmloff::token::IsXMLToken; diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx index 004cb6590f15..9d2e5a41d860 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx @@ -28,7 +28,6 @@ namespace com { namespace sun { namespace star { using namespace ::com::sun::star::uno; using ::com::sun::star::beans::XPropertySet; -using ::rtl::OUString; using namespace ::xmloff::token; XMLTextCharStyleNamesElementExport::XMLTextCharStyleNamesElementExport( diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx index 1048f43a0da4..62995b94d62f 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx @@ -32,7 +32,7 @@ class SvXMLExport; class XMLTextCharStyleNamesElementExport { SvXMLExport& rExport; - ::rtl::OUString aName; + OUString aName; sal_Int32 nCount; public: @@ -41,7 +41,7 @@ public: SvXMLExport& rExp, sal_Bool bDoSomething, sal_Bool bAllStyles, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, - const ::rtl::OUString& rPropName ); + const OUString& rPropName ); ~XMLTextCharStyleNamesElementExport(); }; diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index a1cc8c3b1cc0..f046245f557a 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -31,8 +31,6 @@ #include #include "XMLTextColumnsContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx index f301aed9fb70..f3b268537490 100644 --- a/xmloff/source/text/XMLTextColumnsExport.cxx +++ b/xmloff/source/text/XMLTextColumnsExport.cxx @@ -37,8 +37,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 6ed30d38fdf9..826b9e8c3e6c 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -56,8 +56,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -79,7 +77,7 @@ using ::com::sun::star::document::XEventsSupplier; #define XML_TEXT_FRAME_PLUGIN 6 #define XML_TEXT_FRAME_FLOATING_FRAME 7 -typedef ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess> ParamMap; +typedef ::std::map < const OUString, OUString, ::comphelper::UStringLess> ParamMap; class XMLTextFrameContextHyperlink_Impl { @@ -122,7 +120,7 @@ public: XMLTextFrameTitleOrDescContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, OUString& rTitleOrDesc ); virtual ~XMLTextFrameTitleOrDescContext_Impl(); @@ -159,7 +157,7 @@ public: TYPEINFO(); XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_uInt16 nType, @@ -175,7 +173,7 @@ XMLTextFrameParam_Impl::~XMLTextFrameParam_Impl() XMLTextFrameParam_Impl::XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_uInt16 /*nType*/, @@ -217,7 +215,7 @@ public: TYPEINFO(); XMLTextFrameContourContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const Reference < XPropertySet >& rPropSet, @@ -348,44 +346,44 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext /// old list item and block (#89891#) bool mbListContextPushed; - const ::rtl::OUString sWidth; - const ::rtl::OUString sWidthType; - const ::rtl::OUString sRelativeWidth; - const ::rtl::OUString sHeight; - const ::rtl::OUString sRelativeHeight; - const ::rtl::OUString sSizeType; - const ::rtl::OUString sIsSyncWidthToHeight; - const ::rtl::OUString sIsSyncHeightToWidth; - const ::rtl::OUString sHoriOrient; - const ::rtl::OUString sHoriOrientPosition; - const ::rtl::OUString sVertOrient; - const ::rtl::OUString sVertOrientPosition; - const ::rtl::OUString sChainNextName; - const ::rtl::OUString sAnchorType; - const ::rtl::OUString sAnchorPageNo; - const ::rtl::OUString sGraphicURL; - const ::rtl::OUString sGraphicFilter; - const ::rtl::OUString sTitle; - const ::rtl::OUString sDescription; - const ::rtl::OUString sFrameStyleName; - const ::rtl::OUString sGraphicRotation; - const ::rtl::OUString sTextBoxServiceName; - const ::rtl::OUString sGraphicServiceName; + const OUString sWidth; + const OUString sWidthType; + const OUString sRelativeWidth; + const OUString sHeight; + const OUString sRelativeHeight; + const OUString sSizeType; + const OUString sIsSyncWidthToHeight; + const OUString sIsSyncHeightToWidth; + const OUString sHoriOrient; + const OUString sHoriOrientPosition; + const OUString sVertOrient; + const OUString sVertOrientPosition; + const OUString sChainNextName; + const OUString sAnchorType; + const OUString sAnchorPageNo; + const OUString sGraphicURL; + const OUString sGraphicFilter; + const OUString sTitle; + const OUString sDescription; + const OUString sFrameStyleName; + const OUString sGraphicRotation; + const OUString sTextBoxServiceName; + const OUString sGraphicServiceName; - ::rtl::OUString sName; - ::rtl::OUString sStyleName; - ::rtl::OUString sNextName; - ::rtl::OUString sHRef; - ::rtl::OUString sFilterName; - ::rtl::OUString sCode; - ::rtl::OUString sObject; - ::rtl::OUString sArchive; - ::rtl::OUString sMimeType; - ::rtl::OUString sFrameName; - ::rtl::OUString sAppletName; - ::rtl::OUString sFilterService; - ::rtl::OUString sBase64CharsLeft; - ::rtl::OUString sTblName; + OUString sName; + OUString sStyleName; + OUString sNextName; + OUString sHRef; + OUString sFilterName; + OUString sCode; + OUString sObject; + OUString sArchive; + OUString sMimeType; + OUString sFrameName; + OUString sAppletName; + OUString sFilterService; + OUString sBase64CharsLeft; + OUString sTblName; ParamMap aParamMap; @@ -421,7 +419,7 @@ public: XMLTextFrameContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & rAttrList, ::com::sun::star::text::TextContentAnchorType eAnchorType, @@ -432,22 +430,22 @@ public: virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - void SetHyperlink( const ::rtl::OUString& rHRef, - const ::rtl::OUString& rName, - const ::rtl::OUString& rTargetFrameName, + void SetHyperlink( const OUString& rHRef, + const OUString& rName, + const OUString& rTargetFrameName, sal_Bool bMap ); // Implement Title/Description Elements UI (#i73249#) - void SetTitle( const ::rtl::OUString& rTitle ); + void SetTitle( const OUString& rTitle ); - void SetDesc( const ::rtl::OUString& rDesc ); + void SetDesc( const OUString& rDesc ); ::com::sun::star::text::TextContentAnchorType GetAnchorType() const { return eAnchorType; } @@ -798,9 +796,9 @@ void XMLTextFrameContext::removeGraphicFromImportContext(const SvXMLImportContex } } -rtl::OUString XMLTextFrameContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const +OUString XMLTextFrameContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const { - rtl::OUString aRetval; + OUString aRetval; const XMLTextFrameContext_Impl* pXMLTextFrameContext_Impl = dynamic_cast< const XMLTextFrameContext_Impl* >(&rContext); if(pXMLTextFrameContext_Impl) @@ -1251,8 +1249,8 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef, { static OUString s_HyperLinkURL("HyperLinkURL"); static OUString s_HyperLinkName("HyperLinkName"); - static ::rtl::OUString s_HyperLinkTarget("HyperLinkTarget"); - static ::rtl::OUString s_ServerMap("ServerMap"); + static OUString s_HyperLinkTarget("HyperLinkTarget"); + static OUString s_ServerMap("ServerMap"); if( !xPropSet.is() ) return; diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index 2a4adfb0651a..818b3069222b 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -40,8 +40,8 @@ class XMLTextFrameContext : public SvXMLImportContext, public multiImageImportHe XMLTextFrameContextHyperlink_Impl *m_pHyperlink; // Implement Title/Description Elements UI (#i73249#) - ::rtl::OUString m_sTitle; - ::rtl::OUString m_sDesc; + OUString m_sTitle; + OUString m_sDesc; ::com::sun::star::text::TextContentAnchorType m_eDefaultAnchorType; @@ -59,7 +59,7 @@ class XMLTextFrameContext : public SvXMLImportContext, public multiImageImportHe protected: /// helper to get the created xShape instance, needs to be overloaded - virtual rtl::OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const; + virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const; virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const; public: @@ -68,7 +68,7 @@ public: XMLTextFrameContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, ::com::sun::star::text::TextContentAnchorType eDfltAnchorType ); @@ -77,13 +77,13 @@ public: virtual void EndElement(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - void SetHyperlink( const ::rtl::OUString& rHRef, - const ::rtl::OUString& rName, - const ::rtl::OUString& rTargetFrameName, + void SetHyperlink( const OUString& rHRef, + const OUString& rName, + const OUString& rTargetFrameName, sal_Bool bMap ); ::com::sun::star::text::TextContentAnchorType GetAnchorType() const; diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx index 14c6e0a2eb67..73c99546fd8e 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx @@ -30,8 +30,6 @@ // OD 2004-04-21 #i26791# #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx index 5046831b236b..b44603938ace 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx @@ -31,9 +31,9 @@ namespace com { namespace sun { namespace star { class XMLTextFrameHyperlinkContext : public SvXMLImportContext { - ::rtl::OUString sHRef; - ::rtl::OUString sName; - ::rtl::OUString sTargetFrameName; + OUString sHRef; + OUString sName; + OUString sTargetFrameName; ::com::sun::star::text::TextContentAnchorType eDefaultAnchorType; SvXMLImportContextRef xFrameContext; sal_Bool bMap; @@ -44,7 +44,7 @@ public: XMLTextFrameHyperlinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, ::com::sun::star::text::TextContentAnchorType eDefaultAnchorType ); @@ -53,7 +53,7 @@ public: virtual void EndElement(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index f152f1c8351e..8e4c2a68ebc2 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -26,8 +26,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index 5a0a0ea45846..73385016f615 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -27,8 +27,6 @@ #include "xmloff/XMLTextListAutoStylePool.hxx" #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -217,7 +215,7 @@ OUString XMLTextListAutoStylePool::Add( return sName; } -::rtl::OUString XMLTextListAutoStylePool::Find( +OUString XMLTextListAutoStylePool::Find( const Reference < XIndexReplace > & rNumRules ) const { OUString sName; @@ -230,7 +228,7 @@ OUString XMLTextListAutoStylePool::Add( return sName; } -::rtl::OUString XMLTextListAutoStylePool::Find( +OUString XMLTextListAutoStylePool::Find( const OUString& rInternalName ) const { OUString sName; diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index 0efd44f557d8..c57baee421c1 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -31,8 +31,6 @@ #include "XMLTextListBlockContext.hxx" #include "txtlists.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -62,7 +60,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( , msListId() , msContinueListId() { - static ::rtl::OUString s_PropNameDefaultListId("DefaultListId"); + static OUString s_PropNameDefaultListId("DefaultListId"); { // get the parent list block context (if any); this is a bit ugly... XMLTextListBlockContext * pLB(0); @@ -139,7 +137,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( { XMLTextListsHelper& rTextListsHelper( mrTxtImport.GetTextListHelper() ); // Inconsistent behavior regarding lists (#i92811#) - ::rtl::OUString sListStyleDefaultListId; + OUString sListStyleDefaultListId; { uno::Reference< beans::XPropertySet > xNumRuleProps( mxNumRules, UNO_QUERY ); if ( xNumRuleProps.is() ) @@ -190,7 +188,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( if ( bIsContinueNumberingAttributePresent && !mbRestartNumbering && msContinueListId.isEmpty() ) { - ::rtl::OUString Last( rTextListsHelper.GetLastProcessedListId() ); + OUString Last( rTextListsHelper.GetLastProcessedListId() ); if ( rTextListsHelper.GetListStyleOfLastProcessedList() == msListStyleName && Last != msListId ) { @@ -208,7 +206,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( { // search continue list chain for master list and // continue the master list. - ::rtl::OUString sTmpStr = + OUString sTmpStr = rTextListsHelper.GetContinueListIdOfProcessedList( msContinueListId ); while ( !sTmpStr.isEmpty() ) { @@ -283,12 +281,12 @@ SvXMLImportContext *XMLTextListBlockContext::CreateChildContext( return pContext; } -const ::rtl::OUString& XMLTextListBlockContext::GetListId() const +const OUString& XMLTextListBlockContext::GetListId() const { return msListId; } -const ::rtl::OUString& XMLTextListBlockContext::GetContinueListId() const +const OUString& XMLTextListBlockContext::GetContinueListId() const { return msContinueListId; } diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx index d69b5a3e9e77..7d9440c70af3 100644 --- a/xmloff/source/text/XMLTextListBlockContext.hxx +++ b/xmloff/source/text/XMLTextListBlockContext.hxx @@ -33,8 +33,8 @@ class XMLTextListBlockContext : public SvXMLImportContext ::com::sun::star::container::XIndexReplace > mxNumRules; // text:style-name property of element - ::rtl::OUString msListStyleName; - ::rtl::OUString sXmlId; + OUString msListStyleName; + OUString sXmlId; SvXMLImportContextRef mxParentListBlock; @@ -43,9 +43,9 @@ class XMLTextListBlockContext : public SvXMLImportContext sal_Bool mbSetDefaults; // text:id property of element, only valid for root element - ::rtl::OUString msListId; + OUString msListId; // text:continue-list property of element, only valid for root element - ::rtl::OUString msContinueListId; + OUString msContinueListId; public: @@ -56,7 +56,7 @@ public: SvXMLImport& rImport, XMLTextImportHelper& rTxtImp, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bRestartNumberingAtSubList = sal_False ); @@ -65,11 +65,11 @@ public: virtual void EndElement(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - const ::rtl::OUString& GetListStyleName() const { return msListStyleName; } + const OUString& GetListStyleName() const { return msListStyleName; } sal_Int16 GetLevel() const { return mnLevel; } sal_Bool IsRestartNumbering() const { return mbRestartNumbering; } void ResetRestartNumbering() { mbRestartNumbering = sal_False; } @@ -78,8 +78,8 @@ public: ::com::sun::star::container::XIndexReplace >& GetNumRules() const { return mxNumRules; } - const ::rtl::OUString& GetListId() const; - const ::rtl::OUString& GetContinueListId() const; + const OUString& GetListId() const; + const OUString& GetContinueListId() const; }; diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx index 41c488a617d2..46378f4ef374 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -30,8 +30,6 @@ #include #include "XMLTextListItemContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -52,7 +50,7 @@ XMLTextListItemContext::XMLTextListItemContext( mnSubListCount( 0 ), mxNumRulesOverride() { - static ::rtl::OUString s_NumberingRules("NumberingRules"); + static OUString s_NumberingRules("NumberingRules"); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { @@ -73,7 +71,7 @@ XMLTextListItemContext::XMLTextListItemContext( else if ( nPrefix == XML_NAMESPACE_TEXT && IsXMLToken( aLocalName, XML_STYLE_OVERRIDE ) ) { - const ::rtl::OUString sListStyleOverrideName = rValue; + const OUString sListStyleOverrideName = rValue; if ( !sListStyleOverrideName.isEmpty() ) { OUString sDisplayStyleName( diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx index 3e11beb42a1a..ac71e7a2c99e 100644 --- a/xmloff/source/text/XMLTextListItemContext.hxx +++ b/xmloff/source/text/XMLTextListItemContext.hxx @@ -44,7 +44,7 @@ public: SvXMLImport& rImport, XMLTextImportHelper& rTxtImp, const sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bIsHeader = sal_False ); @@ -53,7 +53,7 @@ public: virtual void EndElement(); SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 2e6823000fd9..ae89ab099658 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -40,8 +40,6 @@ #include "RDFaImportHelper.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::text; @@ -52,7 +50,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; -using rtl::OUString; XMLFieldParamImportContext::XMLFieldParamImportContext( @@ -69,8 +66,8 @@ XMLFieldParamImportContext::XMLFieldParamImportContext( void XMLFieldParamImportContext::StartElement(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList) { SvXMLImport& rImport = GetImport(); - ::rtl::OUString sName; - ::rtl::OUString sValue; + OUString sName; + OUString sValue; sal_Int16 nLength = xAttrList->getLength(); for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++) @@ -130,7 +127,7 @@ static SvXMLEnumMapEntry const lcl_aMarkTypeMap[] = }; -static const char *lcl_getFormFieldmarkName(rtl::OUString &name) +static const char *lcl_getFormFieldmarkName(OUString &name) { static const char sCheckbox[]=ODF_FORMCHECKBOX; static const char sFormDropDown[]=ODF_FORMDROPDOWN; @@ -146,14 +143,14 @@ static const char *lcl_getFormFieldmarkName(rtl::OUString &name) return NULL; } -static rtl::OUString lcl_getFieldmarkName(rtl::OUString &name) +static OUString lcl_getFieldmarkName(OUString &name) { static const char sFormtext[]=ODF_FORMTEXT; if (name.compareToAscii("msoffice.field.FORMTEXT")==0 || name.compareToAscii("ecma.office-open-xml.field.FORMTEXT")==0) - return rtl::OUString::createFromAscii(sFormtext); + return OUString::createFromAscii(sFormtext); else if (name.compareToAscii(ODF_FORMTEXT)==0) - return rtl::OUString::createFromAscii(sFormtext); + return OUString::createFromAscii(sFormtext); else return name; } @@ -205,7 +202,7 @@ void XMLTextMarkImportContext::EndElement() sAPI_reference_mark, m_sBookmarkName, m_rHelper.GetCursorAsRange()->getStart(), - ::rtl::OUString()); + OUString()); break; case TypeFieldmark: @@ -224,7 +221,7 @@ void XMLTextMarkImportContext::EndElement() if (xContent.is() && bImportAsField) { // setup fieldmark... Reference< ::com::sun::star::text::XFormField> xFormField(xContent, UNO_QUERY); - xFormField->setFieldType(rtl::OUString::createFromAscii(formFieldmarkName)); + xFormField->setFieldType(OUString::createFromAscii(formFieldmarkName)); if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) { m_rHelper.setCurrentFieldParamsTo(xFormField); } @@ -314,8 +311,8 @@ void XMLTextMarkImportContext::EndElement() // setup fieldmark... Reference< ::com::sun::star::text::XFormField> xFormField(xContent, UNO_QUERY); if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) { - rtl::OUString givenTypeName=m_rHelper.getCurrentFieldType(); - rtl::OUString fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName); + OUString givenTypeName=m_rHelper.getCurrentFieldType(); + OUString fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName); xFormField->setFieldType(fieldmarkTypeName); m_rHelper.setCurrentFieldParamsTo(xFormField); @@ -344,7 +341,7 @@ void XMLTextMarkImportContext::EndElement() } SvXMLImportContext *XMLTextMarkImportContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) { return new XMLFieldParamImportContext(GetImport(), m_rHelper, diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx index 3e58e7867991..758f3b1b96ae 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.hxx +++ b/xmloff/source/text/XMLTextMarkImportContext.hxx @@ -47,7 +47,7 @@ public: SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); virtual void StartElement( const ::com::sun::star::uno::Reference< @@ -66,15 +66,15 @@ class XMLTextMarkImportContext : public SvXMLImportContext { XMLTextImportHelper & m_rHelper; - ::rtl::OUString m_sBookmarkName; - ::rtl::OUString m_sFieldName; - ::rtl::OUString m_sXmlId; + OUString m_sBookmarkName; + OUString m_sFieldName; + OUString m_sXmlId; // RDFa bool m_bHaveAbout; - ::rtl::OUString m_sAbout; - ::rtl::OUString m_sProperty; - ::rtl::OUString m_sContent; - ::rtl::OUString m_sDatatype; + OUString m_sAbout; + OUString m_sProperty; + OUString m_sContent; + OUString m_sDatatype; public: @@ -84,7 +84,7 @@ public: SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, - const ::rtl::OUString& rLocalName ); + const OUString& rLocalName ); protected: @@ -94,18 +94,18 @@ protected: virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); public: static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > CreateAndInsertMark( SvXMLImport& rImport, - const ::rtl::OUString& sServiceName, - const ::rtl::OUString& sMarkName, + const OUString& sServiceName, + const OUString& sMarkName, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & rRange, - const ::rtl::OUString& i_rXmlId = ::rtl::OUString()); + const OUString& i_rXmlId = OUString()); sal_Bool FindName( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 9f97d4b72828..3f2fb301eb8c 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -30,8 +30,6 @@ #include "PageMasterImportContext.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -237,7 +235,7 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateChildContext( SvXMLImportContext *XMLTextMasterPageContext::CreateHeaderFooterContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bFooter, const sal_Bool bLeft, diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index ab7f854bf07a..aafe94acd921 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -26,8 +26,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx index 182411b288c9..119920ba25b5 100644 --- a/xmloff/source/text/XMLTextMasterStylesContext.cxx +++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx @@ -25,8 +25,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx index fd219c2535f8..d78f5664501b 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -27,7 +27,6 @@ #include "XMLTextNumRuleInfo.hxx" #include "xmloff/XMLTextListAutoStylePool.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -201,7 +200,7 @@ void XMLTextNumRuleInfo::Set( } } - msListLabelString = ::rtl::OUString(); + msListLabelString = OUString(); if ( bExportTextNumberElement && xPropSetInfo->hasPropertyByName( msListLabelStringProp ) ) { diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index 255bb335850f..5c919f267b55 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -38,24 +38,24 @@ class XMLTextListAutoStylePool; */ class XMLTextNumRuleInfo { - const ::rtl::OUString msNumberingRules; - const ::rtl::OUString msNumberingLevel; - const ::rtl::OUString msNumberingStartValue; - const ::rtl::OUString msParaIsNumberingRestart; - const ::rtl::OUString msNumberingIsNumber; - const ::rtl::OUString msNumberingIsOutline; - const ::rtl::OUString msPropNameListId; - const ::rtl::OUString msPropNameStartWith; - const ::rtl::OUString msContinueingPreviousSubTree; - const ::rtl::OUString msListLabelStringProp; + const OUString msNumberingRules; + const OUString msNumberingLevel; + const OUString msNumberingStartValue; + const OUString msParaIsNumberingRestart; + const OUString msNumberingIsNumber; + const OUString msNumberingIsOutline; + const OUString msPropNameListId; + const OUString msPropNameStartWith; + const OUString msContinueingPreviousSubTree; + const OUString msListLabelStringProp; // numbering rules instance and its name ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > mxNumRules; - ::rtl::OUString msNumRulesName; + OUString msNumRulesName; // paragraph's list attributes - ::rtl::OUString msListId; + OUString msListId; sal_Int16 mnListStartValue; sal_Int16 mnListLevel; sal_Bool mbIsNumbered; @@ -68,7 +68,7 @@ class XMLTextNumRuleInfo sal_Bool mbOutlineStyleAsNormalListStyle; sal_Bool mbContinueingPreviousSubTree; - ::rtl::OUString msListLabelString; + OUString msListLabelString; public: @@ -83,7 +83,7 @@ public: const sal_Bool bExportTextNumberElement ); inline void Reset(); - inline const ::rtl::OUString& GetNumRulesName() const + inline const OUString& GetNumRulesName() const { return msNumRulesName; } @@ -97,7 +97,7 @@ public: return mnListLevelStartValue; } - inline const ::rtl::OUString& GetListId() const + inline const OUString& GetListId() const { return msListId; } @@ -136,7 +136,7 @@ public: { return mbContinueingPreviousSubTree; } - inline const ::rtl::OUString& ListLabelString() const + inline const OUString& ListLabelString() const { return msListLabelString; } diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx index 9a34c0d80f55..33cb64542399 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.cxx +++ b/xmloff/source/text/XMLTextPropertySetContext.cxx @@ -27,7 +27,6 @@ #include "xmltabi.hxx" #include "txtdropi.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx index c138a70de636..ef36f5a980a6 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.hxx +++ b/xmloff/source/text/XMLTextPropertySetContext.hxx @@ -28,23 +28,23 @@ class XMLTextPropertySetContext : public SvXMLPropertySetContext // SvXMLImportContextRef xTabStop; // SvXMLImportContextRef xBackground; // SvXMLImportContextRef xDropCap; - ::rtl::OUString& rDropCapTextStyleName; + OUString& rDropCapTextStyleName; public: XMLTextPropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, const UniReference < SvXMLImportPropertyMapper > &rMap, - ::rtl::OUString& rDopCapTextStyleName ); + OUString& rDopCapTextStyleName ); virtual ~XMLTextPropertySetContext(); using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp); diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index ab5ca78df7fe..842253308dc6 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -31,8 +31,6 @@ #include #include "xmloff/XMLTextShapeImportHelper.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index 9b84ef671e4b..9296c3f45db4 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -31,8 +31,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::document; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/XMLTextTableContext.cxx b/xmloff/source/text/XMLTextTableContext.cxx index f110d29f747c..51f07557857f 100644 --- a/xmloff/source/text/XMLTextTableContext.cxx +++ b/xmloff/source/text/XMLTextTableContext.cxx @@ -19,7 +19,6 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx index b29465e291f0..1fcba989081d 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx @@ -28,7 +28,6 @@ #include -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx index 53ac92838d0c..c0fc2d23c899 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx @@ -45,7 +45,7 @@ public: XMLTrackedChangesImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName); + const OUString& rLocalName); ~XMLTrackedChangesImportContext(); @@ -55,7 +55,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList); }; diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx index 94b76c870c8c..d3372cd4d582 100644 --- a/xmloff/source/text/txtdrope.cxx +++ b/xmloff/source/text/txtdrope.cxx @@ -29,8 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::style; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::xmloff::token; diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx index 76cfa30df9f5..7e56f6081f3b 100644 --- a/xmloff/source/text/txtdrope.hxx +++ b/xmloff/source/text/txtdrope.hxx @@ -36,7 +36,7 @@ public: void exportXML( const ::com::sun::star::uno::Any& rAny, sal_Bool bWholeWord, - const ::rtl::OUString& rStyleName ); + const OUString& rStyleName ); }; diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx index dd23d7e0fe76..f2957d24abde 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.cxx @@ -31,8 +31,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx index 77cb73a15c68..463ea8b86945 100644 --- a/xmloff/source/text/txtdropi.hxx +++ b/xmloff/source/text/txtdropi.hxx @@ -28,7 +28,7 @@ namespace rtl { class OUString; } class XMLTextDropCapImportContext :public XMLElementPropertyContext { XMLPropertyState aWholeWordProp; - ::rtl::OUString sStyleName; + OUString sStyleName; private: void ProcessAttrs( @@ -40,7 +40,7 @@ public: XMLTextDropCapImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const XMLPropertyState& rProp, @@ -51,7 +51,7 @@ public: virtual void EndElement(); - const ::rtl::OUString& GetStyleName() const { return sStyleName; } + const OUString& GetStyleName() const { return sStyleName; } }; diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 5392b229f66f..eb89488e1054 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -33,8 +33,6 @@ #include #include "XMLSectionFootnoteConfigExport.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index c8213eabae77..2736cd22b7f7 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -31,7 +31,7 @@ class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper { SvXMLExport& rExport; - ::rtl::OUString sDropCharStyle; + OUString sDropCharStyle; sal_Bool bDropWholeWord; void ContextFontFilter( diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 62c8bdf288fb..e53736572f27 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -69,8 +69,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; @@ -1498,7 +1496,7 @@ void XMLTextFieldExport::ExportFieldHelper( sPropertyIsFixedLanguage, rPropSet, xPropSetInfo, sal_False )); uno::Any aAny = rPropSet->getPropertyValue( sPropertyName ); - ::rtl::OUString sName; + OUString sName; aAny >>= sName; ProcessString(XML_NAME, sName); ProcessBoolean(XML_FIXED, GetBoolProperty(sPropertyIsFixed, rPropSet), sal_False); @@ -2481,8 +2479,8 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, /// export a string attribute void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, - const ::rtl::OUString& sValue, - const ::rtl::OUString& sDefault, + const OUString& sValue, + const OUString& sDefault, sal_uInt16 nPrefix) { if (sValue != sDefault) @@ -2494,8 +2492,8 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, /// export a string attribute void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, sal_uInt16 nValuePrefix, - const ::rtl::OUString& sValue, - const ::rtl::OUString& sDefault, + const OUString& sValue, + const OUString& sDefault, sal_uInt16 nPrefix) { if (sValue != sDefault) @@ -2539,7 +2537,7 @@ void XMLTextFieldExport::ProcessString( /// export a string as a sequence of paragraphs void XMLTextFieldExport::ProcessParagraphSequence( - const ::rtl::OUString& sParagraphSequence) + const OUString& sParagraphSequence) { // iterate over all string-pieces separated by return (0x0a) and // put each inside a paragraph element. diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 7e1fb2915450..cf6bc1024837 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -66,8 +66,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1241,7 +1239,7 @@ XMLDateFieldImportContext::XMLDateFieldImportContext( void XMLDateFieldImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { switch (nAttrToken) { @@ -1527,7 +1525,7 @@ TYPEINIT1( XMLDatabaseSelectImportContext, XMLDatabaseNextImportContext ); XMLDatabaseSelectImportContext::XMLDatabaseSelectImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, - sal_uInt16 nPrfx, const ::rtl::OUString& sLocalName) : + sal_uInt16 nPrfx, const OUString& sLocalName) : XMLDatabaseNextImportContext(rImport, rHlp, sAPI_database_select, nPrfx, sLocalName), sPropertySetNumber(sAPI_set_number), @@ -1538,7 +1536,7 @@ XMLDatabaseSelectImportContext::XMLDatabaseSelectImportContext( void XMLDatabaseSelectImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { if (XML_TOK_TEXTFIELD_ROW_NUMBER == nAttrToken) { @@ -2283,7 +2281,7 @@ XMLFileNameImportContext::XMLFileNameImportContext( void XMLFileNameImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { switch (nAttrToken) { @@ -2665,7 +2663,7 @@ XMLPageVarSetFieldImportContext::XMLPageVarSetFieldImportContext( void XMLPageVarSetFieldImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { switch (nAttrToken) { @@ -3197,7 +3195,7 @@ XMLDdeFieldImportContext::XMLDdeFieldImportContext( void XMLDdeFieldImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { if (XML_TOK_TEXTFIELD_CONNECTION_NAME == nAttrToken) { @@ -3282,7 +3280,7 @@ XMLSheetNameImportContext::XMLSheetNameImportContext( void XMLSheetNameImportContext::ProcessAttribute( sal_uInt16, - const ::rtl::OUString& ) + const OUString& ) { // no attributes -> nothing to be done } @@ -3977,7 +3975,7 @@ XMLDropDownFieldImportContext::XMLDropDownFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, - const ::rtl::OUString& sLocalName) : + const OUString& sLocalName) : XMLTextFieldImportContext( rImport, rHlp, sAPI_drop_down, nPrfx, sLocalName ), aLabels(), @@ -4049,7 +4047,7 @@ SvXMLImportContext* XMLDropDownFieldImportContext::CreateChildContext( void XMLDropDownFieldImportContext::ProcessAttribute( sal_uInt16 nAttrToken, - const ::rtl::OUString& sAttrValue ) + const OUString& sAttrValue ) { if( nAttrToken == XML_TOK_TEXTFIELD_NAME ) { @@ -4118,7 +4116,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& sLocalName) /// element name w/o prefix + const OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_header, nPrfx, sLocalName ) { sServicePrefix = OUString(sAPI_presentation_prefix ); @@ -4126,7 +4124,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext( } /// process attribute values -void XMLHeaderFieldImportContext::ProcessAttribute( sal_uInt16, const ::rtl::OUString& ) +void XMLHeaderFieldImportContext::ProcessAttribute( sal_uInt16, const OUString& ) { } @@ -4142,7 +4140,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& sLocalName) /// element name w/o prefix + const OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_footer, nPrfx, sLocalName ) { sServicePrefix = OUString(sAPI_presentation_prefix ); @@ -4150,7 +4148,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext( } /// process attribute values -void XMLFooterFieldImportContext::ProcessAttribute( sal_uInt16, const ::rtl::OUString& ) +void XMLFooterFieldImportContext::ProcessAttribute( sal_uInt16, const OUString& ) { } @@ -4167,7 +4165,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper sal_uInt16 nPrfx, /// namespace prefix - const ::rtl::OUString& sLocalName) /// element name w/o prefix + const OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_datetime, nPrfx, sLocalName ) { sServicePrefix = OUString(sAPI_presentation_prefix ); @@ -4176,7 +4174,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext( /// process attribute values void XMLDateTimeFieldImportContext::ProcessAttribute( sal_uInt16, - const ::rtl::OUString& ) + const OUString& ) { } diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx index a24597e646ff..237c16033f7f 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -53,8 +53,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 871a2e2e2bb3..a5f49f0b1881 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -34,7 +34,6 @@ #define XML_LINE_TOP 2 #define XML_LINE_BOTTOM 3 -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -44,7 +43,7 @@ using namespace ::com::sun::star::text; bool XMLTextImportPropertyMapper::handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, - const ::rtl::OUString& rValue, + const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const { diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index dad878cb1d5c..cdbb3c59ea87 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -133,10 +133,10 @@ void XMLTextListsHelper::SetListItem( XMLTextListItemContext *i_pListItem ) } // Handling for parameter (#i92811#) -void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, - ::rtl::OUString sListStyleName, - ::rtl::OUString sContinueListId, - ::rtl::OUString sListStyleDefaultListId ) +void XMLTextListsHelper::KeepListAsProcessed( OUString sListId, + OUString sListStyleName, + OUString sContinueListId, + OUString sListStyleDefaultListId ) { if ( IsListProcessed( sListId ) ) { @@ -150,7 +150,7 @@ void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, mpProcessedLists = new tMapForLists(); } - ::std::pair< ::rtl::OUString, ::rtl::OUString > + ::std::pair< OUString, OUString > aListData( sListStyleName, sContinueListId ); (*mpProcessedLists)[ sListId ] = aListData; @@ -168,7 +168,7 @@ void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, if ( mpMapListIdToListStyleDefaultListId->find( sListStyleName ) == mpMapListIdToListStyleDefaultListId->end() ) { - ::std::pair< ::rtl::OUString, ::rtl::OUString > + ::std::pair< OUString, OUString > aListIdMapData( sListId, sListStyleDefaultListId ); (*mpMapListIdToListStyleDefaultListId)[ sListStyleName ] = aListIdMapData; @@ -176,7 +176,7 @@ void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, } } -sal_Bool XMLTextListsHelper::IsListProcessed( const ::rtl::OUString sListId ) const +sal_Bool XMLTextListsHelper::IsListProcessed( const OUString sListId ) const { if ( mpProcessedLists == 0 ) { @@ -186,8 +186,8 @@ sal_Bool XMLTextListsHelper::IsListProcessed( const ::rtl::OUString sListId ) co return mpProcessedLists->find( sListId ) != mpProcessedLists->end(); } -::rtl::OUString XMLTextListsHelper::GetListStyleOfProcessedList( - const ::rtl::OUString sListId ) const +OUString XMLTextListsHelper::GetListStyleOfProcessedList( + const OUString sListId ) const { if ( mpProcessedLists != 0 ) { @@ -198,11 +198,11 @@ sal_Bool XMLTextListsHelper::IsListProcessed( const ::rtl::OUString sListId ) co } } - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString XMLTextListsHelper::GetContinueListIdOfProcessedList( - const ::rtl::OUString sListId ) const +OUString XMLTextListsHelper::GetContinueListIdOfProcessedList( + const OUString sListId ) const { if ( mpProcessedLists != 0 ) { @@ -213,30 +213,30 @@ sal_Bool XMLTextListsHelper::IsListProcessed( const ::rtl::OUString sListId ) co } } - return ::rtl::OUString(); + return OUString(); } -const ::rtl::OUString& XMLTextListsHelper::GetLastProcessedListId() const +const OUString& XMLTextListsHelper::GetLastProcessedListId() const { return msLastProcessedListId; } -const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() const +const OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() const { return msListStyleOfLastProcessedList; } -::rtl::OUString XMLTextListsHelper::GenerateNewListId() const +OUString XMLTextListsHelper::GenerateNewListId() const { // Value of xml:id in element has to be a valid ID type (#i92478#) - ::rtl::OUString sTmpStr( "list" ); + OUString sTmpStr( "list" ); sal_Int64 n = Time( Time::SYSTEM ).GetTime(); n += Date( Date::SYSTEM ).GetDate(); n += rand(); // Value of xml:id in element has to be a valid ID type (#i92478#) - sTmpStr += ::rtl::OUString::valueOf( n ); + sTmpStr += OUString::valueOf( n ); - ::rtl::OUString sNewListId( sTmpStr ); + OUString sNewListId( sTmpStr ); if ( mpProcessedLists != 0 ) { long nHitCount = 0; @@ -244,7 +244,7 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con { ++nHitCount; sNewListId = sTmpStr; - sNewListId += ::rtl::OUString::valueOf( nHitCount ); + sNewListId += OUString::valueOf( nHitCount ); } } @@ -252,9 +252,9 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con } // Provide list id for a certain list block for import (#i92811#) -::rtl::OUString XMLTextListsHelper::GetListIdForListBlock( XMLTextListBlockContext& rListBlock ) +OUString XMLTextListsHelper::GetListIdForListBlock( XMLTextListBlockContext& rListBlock ) { - ::rtl::OUString sListBlockListId( rListBlock.GetContinueListId() ); + OUString sListBlockListId( rListBlock.GetContinueListId() ); if ( sListBlockListId.isEmpty() ) { sListBlockListId = rListBlock.GetListId(); @@ -264,7 +264,7 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con { if ( !sListBlockListId.isEmpty() ) { - const ::rtl::OUString sListStyleName = + const OUString sListStyleName = GetListStyleOfProcessedList( sListBlockListId ); tMapForLists::const_iterator aIter = @@ -282,8 +282,8 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con return sListBlockListId; } -void XMLTextListsHelper::StoreLastContinuingList( ::rtl::OUString sListId, - ::rtl::OUString sContinuingListId ) +void XMLTextListsHelper::StoreLastContinuingList( OUString sListId, + OUString sContinuingListId ) { if ( mpContinuingLists == 0 ) { @@ -293,8 +293,8 @@ void XMLTextListsHelper::StoreLastContinuingList( ::rtl::OUString sListId, (*mpContinuingLists)[ sListId ] = sContinuingListId; } -::rtl::OUString XMLTextListsHelper::GetLastContinuingListId( - ::rtl::OUString sListId ) const +OUString XMLTextListsHelper::GetLastContinuingListId( + OUString sListId ) const { if ( mpContinuingLists != 0) { @@ -309,14 +309,14 @@ void XMLTextListsHelper::StoreLastContinuingList( ::rtl::OUString sListId, return sListId; } -void XMLTextListsHelper::PushListOnStack( ::rtl::OUString sListId, - ::rtl::OUString sListStyleName ) +void XMLTextListsHelper::PushListOnStack( OUString sListId, + OUString sListStyleName ) { if ( mpListStack == 0 ) { mpListStack = new tStackForLists(); } - ::std::pair< ::rtl::OUString, ::rtl::OUString > + ::std::pair< OUString, OUString > aListData( sListId, sListStyleName ); mpListStack->push_back( aListData ); } @@ -329,17 +329,17 @@ void XMLTextListsHelper::PopListFromStack() } } -sal_Bool XMLTextListsHelper::EqualsToTopListStyleOnStack( const ::rtl::OUString sListId ) const +sal_Bool XMLTextListsHelper::EqualsToTopListStyleOnStack( const OUString sListId ) const { return mpListStack != 0 ? sListId == mpListStack->back().second : sal_False; } -::rtl::OUString +OUString XMLTextListsHelper::GetNumberedParagraphListId( const sal_uInt16 i_Level, - const ::rtl::OUString i_StyleName) + const OUString i_StyleName) { if (i_StyleName.isEmpty()) { OSL_FAIL("invalid numbered-paragraph: no style-name"); @@ -372,13 +372,13 @@ ClampLevel(uno::Reference const& i_xNumRules, uno::Reference XMLTextListsHelper::EnsureNumberedParagraph( SvXMLImport & i_rImport, - const ::rtl::OUString i_ListId, - sal_Int16 & io_rLevel, const ::rtl::OUString i_StyleName) + const OUString i_ListId, + sal_Int16 & io_rLevel, const OUString i_StyleName) { OSL_ENSURE(!i_ListId.isEmpty(), "invalid ListId"); OSL_ENSURE(io_rLevel >= 0, "invalid Level"); NumParaList_t & rNPList( mNPLists[i_ListId] ); - const ::rtl::OUString none; // default + const OUString none; // default if ( rNPList.empty() && (0 != io_rLevel)) { // create default list style for top level sal_Int16 lev(0); @@ -434,17 +434,17 @@ uno::Reference XMLTextListsHelper::MakeNumRule( SvXMLImport & i_rImport, const uno::Reference& i_rNumRule, - const ::rtl::OUString i_ParentStyleName, - const ::rtl::OUString i_StyleName, + const OUString i_ParentStyleName, + const OUString i_StyleName, sal_Int16 & io_rLevel, sal_Bool* o_pRestartNumbering, sal_Bool* io_pSetDefaults) { - static ::rtl::OUString s_NumberingRules( "NumberingRules"); + static OUString s_NumberingRules( "NumberingRules"); uno::Reference xNumRules(i_rNumRule); if ( !i_StyleName.isEmpty() && i_StyleName != i_ParentStyleName ) { - const ::rtl::OUString sDisplayStyleName( + const OUString sDisplayStyleName( i_rImport.GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_LIST, i_StyleName) ); const uno::Reference < container::XNameContainer >& rNumStyles( diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index cf8dcc8fbc7e..647aeff463df 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -112,8 +112,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; @@ -403,14 +401,14 @@ void FieldParamExporter::Export() // Save the OLE object Reference< embed::XStorage > xTargetStg = m_pExport->GetTargetStorage(); Reference< embed::XStorage > xDstStg = xTargetStg->openStorageElement( - rtl::OUString("OLELinks"), embed::ElementModes::WRITE ); + OUString("OLELinks"), embed::ElementModes::WRITE ); if ( !xDstStg->hasByName( sValue ) ) { Reference< XStorageBasedDocument > xStgDoc ( m_pExport->GetModel( ), UNO_QUERY ); Reference< embed::XStorage > xDocStg = xStgDoc->getDocumentStorage(); Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement( - rtl::OUString("OLELinks"), embed::ElementModes::READ ); + OUString("OLELinks"), embed::ElementModes::READ ); xOleStg->copyElementTo( sValue, xDstStg, sValue ); Reference< embed::XTransactedObject > xTransact( xDstStg, UNO_QUERY ); @@ -838,7 +836,7 @@ void XMLTextParagraphExport::exportListChange( do { for(size_t j = 0; j < 2; ++j) { - rtl::OUString aElem(pListElements->back()); + OUString aElem(pListElements->back()); pListElements->pop_back(); GetExport().EndElement(aElem, sal_True); } @@ -878,10 +876,10 @@ void XMLTextParagraphExport::exportListChange( if ( nListLevelsToBeOpened > 0 ) { - const ::rtl::OUString sListStyleName( rNextInfo.GetNumRulesName() ); + const OUString sListStyleName( rNextInfo.GetNumRulesName() ); // Currently only the text documents support . // Thus, for other document types is empty. - const ::rtl::OUString sListId( rNextInfo.GetListId() ); + const OUString sListId( rNextInfo.GetListId() ); bool bExportListStyle( true ); bool bRestartNumberingAtContinuedList( false ); sal_Int32 nRestartValueForContinuedList( -1 ); @@ -907,11 +905,11 @@ void XMLTextParagraphExport::exportListChange( } mpTextListsHelper->KeepListAsProcessed( sListId, sListStyleName, - ::rtl::OUString() ); + OUString() ); } else { - const ::rtl::OUString sNewListId( + const OUString sNewListId( mpTextListsHelper->GenerateNewListId() ); if ( bExportODF && eODFDefaultVersion >= SvtSaveOptions::ODFVER_012 && @@ -925,7 +923,7 @@ void XMLTextParagraphExport::exportListChange( sNewListId ); } - const ::rtl::OUString sContinueListId = + const OUString sContinueListId = mpTextListsHelper->GetLastContinuingListId( sListId ); // store that list with list id is last list, // which has continued list with list id @@ -1003,14 +1001,14 @@ void XMLTextParagraphExport::exportListChange( enum XMLTokenEnum eLName = XML_LIST; - rtl::OUString aElem(GetExport().GetNamespaceMap().GetQNameByKey( + OUString aElem(GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(eLName) ) ); GetExport().IgnorableWhitespace(); GetExport().StartElement(aElem, sal_False); if(!pListElements) - pListElements = new std::vector; + pListElements = new std::vector; pListElements->push_back(aElem); mpTextListsHelper->PushListOnStack( sListId, @@ -1043,7 +1041,7 @@ void XMLTextParagraphExport::exportListChange( eLName = ( rNextInfo.IsNumbered() || nListLevelsToBeOpened > 1 ) ? XML_LIST_ITEM : XML_LIST_HEADER; - aElem = rtl::OUString( GetExport().GetNamespaceMap().GetQNameByKey( + aElem = OUString( GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(eLName) ) ); GetExport().IgnorableWhitespace(); @@ -1055,7 +1053,7 @@ void XMLTextParagraphExport::exportListChange( eLName == XML_LIST_ITEM && nListLevelsToBeOpened == 1 && // last iteration --> last opened !rNextInfo.ListLabelString().isEmpty() ) { - const ::rtl::OUString aTextNumberElem = + const OUString aTextNumberElem = OUString( GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(XML_NUMBER) ) ); @@ -1112,7 +1110,7 @@ void XMLTextParagraphExport::exportListChange( if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) != 0 && GetExport().getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) { - const ::rtl::OUString sListStyleName( rNextInfo.GetNumRulesName() ); + const OUString sListStyleName( rNextInfo.GetNumRulesName() ); if ( !mpTextListsHelper->EqualsToTopListStyleOnStack( sListStyleName ) ) { GetExport().AddAttribute( XML_NAMESPACE_TEXT, @@ -1120,7 +1118,7 @@ void XMLTextParagraphExport::exportListChange( GetExport().EncodeStyleName( sListStyleName ) ); } } - rtl::OUString aElem( GetExport().GetNamespaceMap().GetQNameByKey( + OUString aElem( GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(XML_LIST_ITEM) ) ); GetExport().IgnorableWhitespace(); @@ -1131,7 +1129,7 @@ void XMLTextParagraphExport::exportListChange( if ( GetExport().exportTextNumberElement() && !rNextInfo.ListLabelString().isEmpty() ) { - const ::rtl::OUString aTextNumberElem = + const OUString aTextNumberElem = OUString( GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT, GetXMLToken(XML_NUMBER) ) ); @@ -1517,7 +1515,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres { Reference < XPropertySet > xSet( xTextField, UNO_QUERY ); Reference < XText > xText; - Any a = xSet->getPropertyValue( ::rtl::OUString("TextRange") ); + Any a = xSet->getPropertyValue( OUString("TextRange") ); a >>= xText; if ( xText.is() ) { @@ -2207,7 +2205,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( if (xPropInfo->hasPropertyByName(sTextPortionType)) { - rtl::OUString sType; + OUString sType; xPropSet->getPropertyValue(sTextPortionType) >>= sType; if( sType.equals(sText)) diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 039e9d45569f..90322650be13 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -58,8 +58,6 @@ class XMLHints_Impl : public boost::ptr_vector {}; // OD 2004-04-21 #i26791# -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -153,7 +151,7 @@ void XMLCharContext::InsertControlCharacter(sal_Int16 _nControl) { GetImport().GetTextImport()->InsertControlCharacter( _nControl ); } -void XMLCharContext::InsertString(const ::rtl::OUString& _sString) +void XMLCharContext::InsertString(const OUString& _sString) { GetImport().GetTextImport()->InsertString( _sString ); } @@ -827,10 +825,10 @@ class XMLMetaImportContext : public XMLMetaImportContextBase { // RDFa bool m_bHaveAbout; - ::rtl::OUString m_sAbout; - ::rtl::OUString m_sProperty; - ::rtl::OUString m_sContent; - ::rtl::OUString m_sDatatype; + OUString m_sAbout; + OUString m_sProperty; + OUString m_sContent; + OUString m_sDatatype; public: TYPEINFO(); @@ -1000,8 +998,8 @@ void XMLMetaFieldImportContext::InsertMeta( if (-1 != nKey) { - static ::rtl::OUString sPropertyIsFixedLanguage( - ::rtl::OUString("IsFixedLanguage") ); + static OUString sPropertyIsFixedLanguage( + OUString("IsFixedLanguage") ); Any any; any <<= nKey; xPropertySet->setPropertyValue( @@ -2315,7 +2313,7 @@ XMLNumberedParaContext::XMLNumberedParaContext( m_ListId(), m_xNumRules() { - ::rtl::OUString StyleName; + OUString StyleName; const SvXMLTokenMap& rTokenMap( i_rImport.GetTextImport()->GetTextNumberedParagraphAttrTokenMap() ); @@ -2324,10 +2322,10 @@ XMLNumberedParaContext::XMLNumberedParaContext( i_xAttrList->getLength() : 0 ); for ( sal_Int16 i=0; i < nAttrCount; i++ ) { - const ::rtl::OUString& rAttrName( i_xAttrList->getNameByIndex( i ) ); - const ::rtl::OUString& rValue ( i_xAttrList->getValueByIndex( i ) ); + const OUString& rAttrName( i_xAttrList->getNameByIndex( i ) ); + const OUString& rValue ( i_xAttrList->getValueByIndex( i ) ); - ::rtl::OUString aLocalName; + OUString aLocalName; const sal_uInt16 nPrefix( GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ) ); diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index 0dc04ddce741..e4557ad8c847 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -37,12 +37,12 @@ class XMLParaContext : public SvXMLImportContext { ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextRange > xStart; // xub_StrLen nStart; - ::rtl::OUString sStyleName; - ::rtl::OUString m_sXmlId; - ::rtl::OUString m_sAbout; - ::rtl::OUString m_sProperty; - ::rtl::OUString m_sContent; - ::rtl::OUString m_sDatatype; + OUString sStyleName; + OUString m_sXmlId; + OUString m_sAbout; + OUString m_sProperty; + OUString m_sContent; + OUString m_sDatatype; bool m_bHaveAbout; sal_Int8 nOutlineLevel; XMLHints_Impl *pHints; @@ -61,7 +61,7 @@ public: XMLParaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_Bool bHeading ); @@ -69,11 +69,11 @@ public: virtual ~XMLParaContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; @@ -84,9 +84,9 @@ class XMLNumberedParaContext : public SvXMLImportContext /// text:start-value sal_Int16 m_StartValue; /// xml:id - ::rtl::OUString m_XmlId; + OUString m_XmlId; /// text:list-id - ::rtl::OUString m_ListId; + OUString m_ListId; /// text:style-name ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace > m_xNumRules; @@ -97,7 +97,7 @@ public: XMLNumberedParaContext( SvXMLImport& i_rImport, sal_uInt16 i_nPrefix, - const ::rtl::OUString& i_rLocalName, + const OUString& i_rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & i_xAttrList ); @@ -106,7 +106,7 @@ public: virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, - const ::rtl::OUString& i_rLocalName, + const OUString& i_rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & i_xAttrList ); @@ -114,7 +114,7 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexReplace >& GetNumRules() const { return m_xNumRules; } - const ::rtl::OUString& GetListId() const { return m_ListId; } + const OUString& GetListId() const { return m_ListId; } sal_Int16 GetStartValue() const { return m_StartValue; } }; diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx index c04c14e5f6ae..893eb51da47f 100644 --- a/xmloff/source/text/txtparaimphint.hxx +++ b/xmloff/source/text/txtparaimphint.hxx @@ -25,7 +25,6 @@ #include "XMLTextFrameContext.hxx" #include -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index b86be39f7e06..3f2f5bee9de0 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -47,8 +47,6 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -260,11 +258,11 @@ public: /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -313,11 +311,11 @@ public: virtual ~XMLOpaquePropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -365,11 +363,11 @@ public: virtual ~XMLContourModePropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -417,11 +415,11 @@ public: virtual ~XMLParagraphOnlyPropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -483,11 +481,11 @@ public: virtual ~XMLWrapPropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -539,11 +537,11 @@ public: virtual ~XMLFrameProtectPropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -741,11 +739,11 @@ public: virtual ~XMLHoriMirrorPropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -796,11 +794,11 @@ public: virtual ~XMLGrfMirrorPropHdl_Impl (); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -897,11 +895,11 @@ public: virtual ~XMLTextEmphasizePropHdl_Impl(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -1001,11 +999,11 @@ public: virtual ~XMLTextCombineCharPropHdl_Impl(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -1047,11 +1045,11 @@ public: virtual ~XMLTextRelWidthHeightPropHdl_Impl(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -1104,11 +1102,11 @@ public: virtual ~XMLTextSyncWidthHeightPropHdl_Impl(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -1153,11 +1151,11 @@ public: virtual ~XMLTextRotationAnglePropHdl_Impl(); virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; @@ -1217,11 +1215,11 @@ public: virtual ~XMLNumber8OneBasedHdl() {}; virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const; }; diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx index 1456b8c412ee..2ac90d804233 100644 --- a/xmloff/source/text/txtsecte.cxx +++ b/xmloff/source/text/txtsecte.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::std; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index 3186708cb1ea..b507b09c9087 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -34,8 +34,6 @@ #include "txtexppr.hxx" #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 348a9a042d17..4f30fa5890c4 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -49,8 +49,6 @@ #include #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 58b25938a5fa..f837a561ffff 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -84,8 +84,6 @@ static const sal_Char sAPI_sequence_value[] = "SequenceValue"; static const sal_Char sAPI_is_fixed_language[] = "IsFixedLanguage"; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx index 3a0de59726ac..d0a177bbea26 100644 --- a/xmloff/source/transform/ChartOASISTContext.cxx +++ b/xmloff/source/transform/ChartOASISTContext.cxx @@ -25,7 +25,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ChartOASISTContext.hxx b/xmloff/source/transform/ChartOASISTContext.hxx index 498a096308aa..ec4157d0ddd5 100644 --- a/xmloff/source/transform/ChartOASISTContext.hxx +++ b/xmloff/source/transform/ChartOASISTContext.hxx @@ -28,7 +28,7 @@ public: TYPEINFO(); XMLChartOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLChartOASISTransformerContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx index 1fe094c3f971..de86f2895b0f 100644 --- a/xmloff/source/transform/ChartOOoTContext.cxx +++ b/xmloff/source/transform/ChartOOoTContext.cxx @@ -25,7 +25,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ChartOOoTContext.hxx b/xmloff/source/transform/ChartOOoTContext.hxx index 642d11cc043e..16c9372c586b 100644 --- a/xmloff/source/transform/ChartOOoTContext.hxx +++ b/xmloff/source/transform/ChartOOoTContext.hxx @@ -28,7 +28,7 @@ public: TYPEINFO(); XMLChartOOoTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLChartOOoTransformerContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx index bccdb14a6f86..18a56b465a72 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; class XMLAxisOASISContext : public XMLPersElemContentTContext { @@ -38,14 +37,14 @@ public: TYPEINFO(); XMLAxisOASISContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, ::rtl::Reference< XMLPersAttrListTContext > & rOutCategoriesContext ); ~XMLAxisOASISContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const Reference< xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const Reference< xml::sax::XAttributeList >& rAttrList ); @@ -62,7 +61,7 @@ TYPEINIT1( XMLAxisOASISContext, XMLPersElemContentTContext ); XMLAxisOASISContext::XMLAxisOASISContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, ::rtl::Reference< XMLPersAttrListTContext > & rOutCategoriesContext ) : XMLPersElemContentTContext( rTransformer, rQName ), m_rCategoriesContext( rOutCategoriesContext ), @@ -74,8 +73,8 @@ XMLAxisOASISContext::~XMLAxisOASISContext() XMLTransformerContext * XMLAxisOASISContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const Reference< xml::sax::XAttributeList >& xAttrList ) { XMLTransformerContext * pContext = 0; @@ -196,7 +195,7 @@ bool XMLAxisOASISContext::IsCategoryAxis() const TYPEINIT1( XMLChartPlotAreaOASISTContext, XMLProcAttrTransformerContext ); XMLChartPlotAreaOASISTContext::XMLChartPlotAreaOASISTContext( - XMLTransformerBase & rTransformer, const ::rtl::OUString & rQName ) : + XMLTransformerBase & rTransformer, const OUString & rQName ) : XMLProcAttrTransformerContext( rTransformer, rQName, OASIS_SHAPE_ACTIONS ) { } @@ -206,8 +205,8 @@ XMLChartPlotAreaOASISTContext::~XMLChartPlotAreaOASISTContext() XMLTransformerContext * XMLChartPlotAreaOASISTContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { XMLTransformerContext *pContext = 0; diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx index 79d6017bbf98..ce63a8c88127 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx @@ -29,12 +29,12 @@ public: TYPEINFO(); explicit XMLChartPlotAreaOASISTContext( - XMLTransformerBase & rTransformer, const ::rtl::OUString & rQName ); + XMLTransformerBase & rTransformer, const OUString & rQName ); virtual ~XMLChartPlotAreaOASISTContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx index 3feefcfcd758..65769067fe4b 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; class XMLAxisOOoContext : public XMLPersElemContentTContext { @@ -38,7 +37,7 @@ public: TYPEINFO(); XMLAxisOOoContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); ~XMLAxisOOoContext(); virtual void StartElement( const Reference< xml::sax::XAttributeList >& rAttrList ); @@ -53,7 +52,7 @@ TYPEINIT1( XMLAxisOOoContext, XMLPersElemContentTContext ); XMLAxisOOoContext::XMLAxisOOoContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ) : + const OUString& rQName ) : XMLPersElemContentTContext( rTransformer, rQName ), m_bIsCategoryAxis( false ) {} @@ -128,7 +127,7 @@ bool XMLAxisOOoContext::IsCategoryAxis() const TYPEINIT1( XMLChartPlotAreaOOoTContext, XMLProcAttrTransformerContext ) XMLChartPlotAreaOOoTContext::XMLChartPlotAreaOOoTContext( - XMLTransformerBase & rTransformer, const ::rtl::OUString & rQName ) : + XMLTransformerBase & rTransformer, const OUString & rQName ) : XMLProcAttrTransformerContext( rTransformer, rQName, OOO_SHAPE_ACTIONS ) { } @@ -138,8 +137,8 @@ XMLChartPlotAreaOOoTContext::~XMLChartPlotAreaOOoTContext() XMLTransformerContext * XMLChartPlotAreaOOoTContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { XMLTransformerContext *pContext = 0; diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx index 74623dcbc541..c7528033fb50 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx @@ -35,12 +35,12 @@ public: TYPEINFO(); explicit XMLChartPlotAreaOOoTContext( - XMLTransformerBase & rTransformer, const ::rtl::OUString & rQName ); + XMLTransformerBase & rTransformer, const OUString & rQName ); virtual ~XMLChartPlotAreaOOoTContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); virtual void ExportContent(); diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx index f1508a2be68c..740b43cc8792 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -26,7 +26,6 @@ #include "TransformerBase.hxx" #include "ControlOASISTContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx index 2fbdcd9531eb..42a217c5ad3c 100644 --- a/xmloff/source/transform/ControlOASISTContext.hxx +++ b/xmloff/source/transform/ControlOASISTContext.hxx @@ -24,14 +24,14 @@ class XMLControlOASISTransformerContext : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; sal_Bool m_bCreateControl; public: TYPEINFO(); XMLControlOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bCreateControl ); virtual ~XMLControlOASISTransformerContext(); diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx index d9dea42969bf..2b1d3faaab76 100644 --- a/xmloff/source/transform/ControlOOoTContext.cxx +++ b/xmloff/source/transform/ControlOOoTContext.cxx @@ -26,7 +26,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx index a0c4115623ec..f37fd776d1eb 100644 --- a/xmloff/source/transform/ControlOOoTContext.hxx +++ b/xmloff/source/transform/ControlOOoTContext.hxx @@ -27,26 +27,26 @@ class XMLControlOOoTransformerContext : public XMLTransformerContext ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; public: TYPEINFO(); XMLControlOOoTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLControlOOoTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_CONTROLOOOTCONTEXT_HXX diff --git a/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx index 42c66c30d8e1..09d3b8d78a63 100644 --- a/xmloff/source/transform/CreateElemTContext.cxx +++ b/xmloff/source/transform/CreateElemTContext.cxx @@ -26,7 +26,6 @@ #include "AttrTransformerAction.hxx" #include -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx index 69a7eae9454a..780a16d95522 100644 --- a/xmloff/source/transform/CreateElemTContext.hxx +++ b/xmloff/source/transform/CreateElemTContext.hxx @@ -35,7 +35,7 @@ public: TYPEINFO(); XMLCreateElemTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); virtual ~XMLCreateElemTransformerContext(); diff --git a/xmloff/source/transform/DeepTContext.cxx b/xmloff/source/transform/DeepTContext.cxx index f8ac54925ee5..7fb2d0f53aa9 100644 --- a/xmloff/source/transform/DeepTContext.cxx +++ b/xmloff/source/transform/DeepTContext.cxx @@ -25,7 +25,6 @@ #include "PersMixedContentTContext.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx index 1f2556b572ab..7155384eaf17 100644 --- a/xmloff/source/transform/DeepTContext.hxx +++ b/xmloff/source/transform/DeepTContext.hxx @@ -35,22 +35,22 @@ public: // element content persistence only XMLPersElemContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // element content persistence + attribute processing XMLPersElemContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); // element content persistence + renaming XMLPersElemContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); // element content persistence + renaming + attribute processing XMLPersElemContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); @@ -58,8 +58,8 @@ public: virtual ~XMLPersElemContentTContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); void AddContent( XMLTransformerContext *pContent ); diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx index 4ce12e0cc63f..72d60397b40b 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -25,7 +25,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/DlgOASISTContext.hxx b/xmloff/source/transform/DlgOASISTContext.hxx index 5e660f72ceae..3e3cf9527988 100644 --- a/xmloff/source/transform/DlgOASISTContext.hxx +++ b/xmloff/source/transform/DlgOASISTContext.hxx @@ -28,7 +28,7 @@ public: TYPEINFO(); XMLDlgOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLDlgOASISTransformerContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx index 164e83fdea15..6b162736270a 100644 --- a/xmloff/source/transform/DocumentTContext.cxx +++ b/xmloff/source/transform/DocumentTContext.cxx @@ -31,7 +31,6 @@ #include "DocumentTContext.hxx" -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; @@ -83,7 +82,7 @@ void XMLDocumentTransformerContext::StartElement( const Reference< XAttributeLis }; for (int k=0; aTmp[k]; k++) { - ::rtl::OUString sTmpString = ::rtl::OUString::createFromAscii(aTmp[k]); + OUString sTmpString = OUString::createFromAscii(aTmp[k]); if( rValue.matchAsciiL( aTmp[k], sTmpString.getLength() ) ) { aClass = rValue.copy( sTmpString.getLength() ); diff --git a/xmloff/source/transform/DocumentTContext.hxx b/xmloff/source/transform/DocumentTContext.hxx index 5652d08e3e40..06c44215b500 100644 --- a/xmloff/source/transform/DocumentTContext.hxx +++ b/xmloff/source/transform/DocumentTContext.hxx @@ -32,7 +32,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLDocumentTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // A contexts destructor does anything that is required if an element // ends. By default, nothing is done. diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index dc582a444708..99e3af1740a6 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -35,14 +35,13 @@ #include -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOASISEventMap_Impl: - public ::boost::unordered_map< NameKey_Impl, ::rtl::OUString, + public ::boost::unordered_map< NameKey_Impl, OUString, NameHash_Impl, NameHash_Impl > { public: diff --git a/xmloff/source/transform/EventOASISTContext.hxx b/xmloff/source/transform/EventOASISTContext.hxx index 23e9d1aa20e4..6a8c38f81c18 100644 --- a/xmloff/source/transform/EventOASISTContext.hxx +++ b/xmloff/source/transform/EventOASISTContext.hxx @@ -30,14 +30,14 @@ public: TYPEINFO(); XMLEventOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLEventOASISTransformerContext(); static XMLTransformerOASISEventMap_Impl *CreateFormEventMap(); static XMLTransformerOASISEventMap_Impl *CreateEventMap(); static void FlushEventMap( XMLTransformerOASISEventMap_Impl *p ); - static ::rtl::OUString GetEventName( sal_uInt16 nPrefix, - const ::rtl::OUString& rName, + static OUString GetEventName( sal_uInt16 nPrefix, + const OUString& rName, XMLTransformerOASISEventMap_Impl& rMap, XMLTransformerOASISEventMap_Impl* pMap2 ); diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index a648ba41afe2..6165c9fd184c 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -30,15 +30,13 @@ #include -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; class XMLTransformerOOoEventMap_Impl: - public ::boost::unordered_map< ::rtl::OUString, NameKey_Impl, - ::rtl::OUStringHash, ::comphelper::UStringEqual > + public ::boost::unordered_map< OUString, NameKey_Impl, + OUStringHash, ::comphelper::UStringEqual > { public: diff --git a/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx index 4d936dbf34b5..76b955ae99d8 100644 --- a/xmloff/source/transform/EventOOoTContext.hxx +++ b/xmloff/source/transform/EventOOoTContext.hxx @@ -32,21 +32,21 @@ public: TYPEINFO(); XMLEventOOoTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bPersistent = sal_False ); virtual ~XMLEventOOoTransformerContext(); static XMLTransformerOOoEventMap_Impl *CreateEventMap(); static void FlushEventMap( XMLTransformerOOoEventMap_Impl *p ); - static sal_uInt16 GetEventName( const ::rtl::OUString& rName, - ::rtl::OUString& rNewName, + static sal_uInt16 GetEventName( const OUString& rName, + OUString& rNewName, XMLTransformerOOoEventMap_Impl& rMap ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual sal_Bool IsPersistent() const; diff --git a/xmloff/source/transform/FlatTContext.cxx b/xmloff/source/transform/FlatTContext.cxx index 8ec800964652..c591877ac470 100644 --- a/xmloff/source/transform/FlatTContext.cxx +++ b/xmloff/source/transform/FlatTContext.cxx @@ -20,7 +20,6 @@ #include "FlatTContext.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx index 256970de850a..2fd24b408def 100644 --- a/xmloff/source/transform/FlatTContext.hxx +++ b/xmloff/source/transform/FlatTContext.hxx @@ -25,7 +25,7 @@ class XMLPersTextContentTContext : public XMLPersAttrListTContext { - ::rtl::OUString m_aCharacters; + OUString m_aCharacters; public: TYPEINFO(); @@ -35,11 +35,11 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLPersTextContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // attr list/text content persistence + renaming XMLPersTextContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); @@ -51,11 +51,11 @@ public: // This method is called for all characters that are contained in the // current element. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void ExportContent(); - const ::rtl::OUString& GetTextContent() const { return m_aCharacters; } + const OUString& GetTextContent() const { return m_aCharacters; } }; #endif // _XMLOFF_FLATTCONTEXT_HXX diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index 34e68e998590..56430f1df32e 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -26,7 +26,6 @@ #include "TransformerBase.hxx" #include "FormPropOASISTContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx index 898442d5a706..1dc4e7d02c40 100644 --- a/xmloff/source/transform/FormPropOASISTContext.hxx +++ b/xmloff/source/transform/FormPropOASISTContext.hxx @@ -28,13 +28,13 @@ class XMLFormPropOASISTransformerContext : sal_Bool m_bIsList; sal_Bool m_bIsListValue; - ::xmloff::token::XMLTokenEnum GetValueType( const ::rtl::OUString& rValue ); + ::xmloff::token::XMLTokenEnum GetValueType( const OUString& rValue ); public: TYPEINFO(); XMLFormPropOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, ::xmloff::token::XMLTokenEnum eLocalName ); virtual ~XMLFormPropOASISTransformerContext(); diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index 61f65494f501..2547fad99cfe 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -27,7 +27,6 @@ #include "TransformerBase.hxx" #include "FormPropOOoTContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; @@ -35,7 +34,7 @@ using namespace ::xmloff::token; class XMLFormPropValueTContext_Impl : public XMLTransformerContext { OUString m_aAttrQName; - ::rtl::OUString m_aCharacters; + OUString m_aCharacters; sal_Bool m_bPersistent; sal_Bool m_bIsVoid; @@ -56,19 +55,19 @@ public: virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual sal_Bool IsPersistent() const; sal_Bool IsVoid() const { return m_bIsVoid; } - const ::rtl::OUString& GetTextContent() const { return m_aCharacters; } + const OUString& GetTextContent() const { return m_aCharacters; } }; TYPEINIT1( XMLFormPropValueTContext_Impl, XMLTransformerContext ); XMLFormPropValueTContext_Impl::XMLFormPropValueTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ) : + const OUString& rQName ) : XMLTransformerContext( rTransformer, rQName ), m_bPersistent( sal_True ), m_bIsVoid( sal_False ) @@ -77,7 +76,7 @@ XMLFormPropValueTContext_Impl::XMLFormPropValueTContext_Impl( XMLFormPropValueTContext_Impl::XMLFormPropValueTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nAttrPrefix, XMLTokenEnum eAttrToken ) : XMLTransformerContext( rTransformer, rQName ), diff --git a/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx index 9b02cac4af84..e8c6f21f6f3a 100644 --- a/xmloff/source/transform/FormPropOOoTContext.hxx +++ b/xmloff/source/transform/FormPropOOoTContext.hxx @@ -32,7 +32,7 @@ class XMLFormPropOOoTransformerContext : public XMLTransformerContext ::rtl::Reference< XMLFormPropValueTContext_Impl > m_xValueContext; - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; sal_Int16 m_nValueTypeAttr; @@ -45,13 +45,13 @@ public: TYPEINFO(); XMLFormPropOOoTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLFormPropOOoTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx index b0e8baaebbe7..20a825b82982 100644 --- a/xmloff/source/transform/FrameOASISTContext.cxx +++ b/xmloff/source/transform/FrameOASISTContext.cxx @@ -26,7 +26,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx index 31e7c60d6918..6128eb6e0072 100644 --- a/xmloff/source/transform/FrameOASISTContext.hxx +++ b/xmloff/source/transform/FrameOASISTContext.hxx @@ -27,12 +27,12 @@ class XMLFrameOASISTransformerContext : public XMLTransformerContext ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; bool m_bIgnoreElement; sal_Bool IsLinkedEmbeddedObject( - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ); @@ -40,20 +40,20 @@ public: TYPEINFO(); XMLFrameOASISTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLFrameOASISTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_FRAMEOASISTCONTEXT_HXX diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx index ddb67c49d399..6e84be6533df 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -28,7 +28,6 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx index 0ce53074b8f5..6169cd313033 100644 --- a/xmloff/source/transform/FrameOOoTContext.hxx +++ b/xmloff/source/transform/FrameOOoTContext.hxx @@ -24,26 +24,26 @@ class XMLFrameOOoTransformerContext : public XMLPersElemContentTContext { - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; public: TYPEINFO(); XMLFrameOOoTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLFrameOOoTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual sal_Bool IsPersistent() const; }; diff --git a/xmloff/source/transform/IgnoreTContext.cxx b/xmloff/source/transform/IgnoreTContext.cxx index 2378ece7788e..75eae9cc1763 100644 --- a/xmloff/source/transform/IgnoreTContext.cxx +++ b/xmloff/source/transform/IgnoreTContext.cxx @@ -20,7 +20,6 @@ #include "IgnoreTContext.hxx" #include "TransformerBase.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -41,7 +40,7 @@ XMLIgnoreTransformerContext::XMLIgnoreTransformerContext( XMLIgnoreTransformerContext::XMLIgnoreTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bAllowCharactersRecursive ) : XMLTransformerContext( rTransformer, rQName ), m_bIgnoreCharacters( sal_False ), diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx index 17630bfe999c..b5053a21beeb 100644 --- a/xmloff/source/transform/IgnoreTContext.hxx +++ b/xmloff/source/transform/IgnoreTContext.hxx @@ -38,7 +38,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLIgnoreTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bIgnoreCharacters, sal_Bool bIgnoreElements ); // A contexts constructor does anything that is required if an element @@ -46,7 +46,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLIgnoreTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bAllowCharactersRecursive ); // A contexts destructor does anything that is required if an element @@ -58,8 +58,8 @@ public: // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and @@ -74,7 +74,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_IGNORETCONTEXT_HXX diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 50330339b2c9..cbe26744ce26 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -26,7 +26,6 @@ #include "IgnoreTContext.hxx" #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; @@ -37,15 +36,15 @@ public: TYPEINFO(); XMLParagraphTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLParagraphTransformerContext(); // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and @@ -60,7 +59,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; TYPEINIT1( XMLParagraphTransformerContext, XMLTransformerContext ); @@ -112,19 +111,19 @@ public: XMLPersTextContentRNGTransformTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); virtual ~XMLPersTextContentRNGTransformTContext(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; TYPEINIT1( XMLPersTextContentRNGTransformTContext, XMLPersAttrListTContext ); XMLPersTextContentRNGTransformTContext::XMLPersTextContentRNGTransformTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ) : XMLPersTextContentTContext( @@ -134,7 +133,7 @@ XMLPersTextContentRNGTransformTContext::XMLPersTextContentRNGTransformTContext( XMLPersTextContentRNGTransformTContext::~XMLPersTextContentRNGTransformTContext() {} -void XMLPersTextContentRNGTransformTContext::Characters( const ::rtl::OUString& rChars ) +void XMLPersTextContentRNGTransformTContext::Characters( const OUString& rChars ) { OUString aConvChars( rChars ); GetTransformer().ConvertRNGDateTimeToISO( aConvChars ); diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx index e276b9931601..557795c569ca 100644 --- a/xmloff/source/transform/MergeElemTContext.hxx +++ b/xmloff/source/transform/MergeElemTContext.hxx @@ -41,21 +41,21 @@ public: TYPEINFO(); XMLMergeElemTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); virtual ~XMLMergeElemTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_MERGEELEMCONTEXT_HXX diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx index 3a3f9c748bd8..b64e61d9a35f 100644 --- a/xmloff/source/transform/MetaTContext.cxx +++ b/xmloff/source/transform/MetaTContext.cxx @@ -29,7 +29,6 @@ #include "MutableAttrList.hxx" #include "MetaTContext.hxx" -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx index ada6e60dab37..3fbf4b5854bc 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -26,7 +26,7 @@ #include "FlatTContext.hxx" -typedef ::std::multimap< ::rtl::OUString, +typedef ::std::multimap< OUString, ::rtl::Reference< XMLPersTextContentTContext >, ::comphelper::UStringLess > XMLMetaContexts_Impl; @@ -43,7 +43,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLMetaTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // A contexts destructor does anything that is required if an element // ends. By default, nothing is done. @@ -54,8 +54,8 @@ public: // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // EndElement is called before a context will be destructed, but @@ -65,7 +65,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_METATCONTEXT_HXX diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx index 084f9e106903..22607ee99650 100644 --- a/xmloff/source/transform/MutableAttrList.cxx +++ b/xmloff/source/transform/MutableAttrList.cxx @@ -25,7 +25,6 @@ #include #include "MutableAttrList.hxx" -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star::uno; @@ -139,7 +138,7 @@ Reference< XCloneable > XMLMutableAttributeList::createClone() } void XMLMutableAttributeList::SetValueByIndex( sal_Int16 i, - const ::rtl::OUString& rValue ) + const OUString& rValue ) { GetMutableAttrList()->SetValueByIndex( i, rValue ); } diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx index 41d83af42561..921cd2ba8f87 100644 --- a/xmloff/source/transform/MutableAttrList.hxx +++ b/xmloff/source/transform/MutableAttrList.hxx @@ -54,24 +54,24 @@ public: // ::com::sun::star::xml::sax::XAttributeList virtual sal_Int16 SAL_CALL getLength(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::util::XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw( ::com::sun::star::uno::RuntimeException ); // methods that are not contained in any interface - void SetValueByIndex( sal_Int16 i, const ::rtl::OUString& rValue ); - void AddAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sValue ); + void SetValueByIndex( sal_Int16 i, const OUString& rValue ); + void AddAttribute( const OUString &sName , const OUString &sValue ); // void Clear(); void RemoveAttributeByIndex( sal_Int16 i ); - void RenameAttributeByIndex( sal_Int16 i, const ::rtl::OUString& rNewName ); + void RenameAttributeByIndex( sal_Int16 i, const OUString& rNewName ); void AppendAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & ); - sal_Int16 GetIndexByName( const ::rtl::OUString& rName ) const; + sal_Int16 GetIndexByName( const OUString& rName ) const; }; diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx index ade3370c2f6a..19b52c6c5628 100644 --- a/xmloff/source/transform/NotesTContext.cxx +++ b/xmloff/source/transform/NotesTContext.cxx @@ -35,7 +35,6 @@ #include "NotesTContext.hxx" -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx index efd2354157c2..4666e824a433 100644 --- a/xmloff/source/transform/NotesTContext.hxx +++ b/xmloff/source/transform/NotesTContext.hxx @@ -32,15 +32,15 @@ public: TYPEINFO(); XMLNotesTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, ::xmloff::token::XMLTokenEnum m_eToken, sal_Bool bPersistent ); virtual ~XMLNotesTransformerContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index fc351f51fdd6..b4ac5caf2f9c 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -39,7 +39,6 @@ #include "TransformerActions.hxx" #include "OOo2Oasis.hxx" -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -1087,16 +1086,16 @@ static XMLTokenEnum aTokenMap[] = class XMLDocumentTransformerContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; - ::rtl::OUString m_aOldClass; + OUString m_aElemQName; + OUString m_aOldClass; public: TYPEINFO(); XMLDocumentTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); XMLDocumentTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); @@ -1245,7 +1244,7 @@ public: TYPEINFO(); XMLBodyTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLBodyTransformerContext_Impl(); @@ -1309,7 +1308,7 @@ public: TYPEINFO(); XMLTabStopOOoTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLTabStopOOoTContext_Impl(); @@ -1412,7 +1411,7 @@ public: TYPEINFO(); XMLTrackedChangesOOoTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, XMLTokenEnum eToken ); @@ -1484,13 +1483,13 @@ void XMLTrackedChangesOOoTContext_Impl::StartElement( class XMLTableOOoTransformerContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; public: TYPEINFO(); XMLTableOOoTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLTableOOoTransformerContext_Impl(); diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx index cfcc58cdfa3b..224e67b3881b 100644 --- a/xmloff/source/transform/OOo2Oasis.hxx +++ b/xmloff/source/transform/OOo2Oasis.hxx @@ -32,8 +32,8 @@ class OOo2OasisTransformer : public ::com::sun::star::document::XImporter, public ::com::sun::star::document::XFilter { - ::rtl::OUString m_aImplName; - ::rtl::OUString m_aSubServiceName; + OUString m_aImplName; + OUString m_aSubServiceName; XMLTransformerActions *m_aActions[MAX_OOO_ACTIONS]; XMLTransformerOOoEventMap_Impl *m_pEventMap; @@ -41,7 +41,7 @@ protected: virtual XMLTransformerContext *CreateUserDefinedContext( const TransformerAction_Impl& rAction, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bPersistent=sal_False ); virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ); @@ -74,9 +74,9 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); @@ -97,7 +97,7 @@ public: virtual void SAL_CALL startDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString GetEventName( const ::rtl::OUString& rName, + virtual OUString GetEventName( const OUString& rName, sal_Bool bForm = sal_False ); }; diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index ea698e99588a..80edd1b0d5f2 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -43,8 +43,6 @@ #include #include "Oasis2OOo.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::osl; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; @@ -1150,13 +1148,13 @@ static XMLTokenEnum aTokenMap[] = class XMLTableTransformerContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; public: TYPEINFO(); XMLTableTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLTableTransformerContext_Impl(); @@ -1260,15 +1258,15 @@ public: TYPEINFO(); XMLBodyOASISTransformerContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLBodyOASISTransformerContext_Impl(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); }; @@ -1293,8 +1291,8 @@ void XMLBodyOASISTransformerContext_Impl::StartElement( } XMLTransformerContext* XMLBodyOASISTransformerContext_Impl::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) { if (!m_bFirstChild) @@ -1322,7 +1320,7 @@ public: TYPEINFO(); XMLTabStopOASISTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLTabStopOASISTContext_Impl(); @@ -1449,7 +1447,7 @@ void XMLTabStopOASISTContext_Impl::StartElement( class XMLConfigItemTContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aContent; + OUString m_aContent; sal_Bool m_bIsRedlineProtectionKey; sal_Bool m_bIsCursorX; sal_Bool m_bIsCursorY; @@ -1459,14 +1457,14 @@ public: TYPEINFO(); XMLConfigItemTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLConfigItemTContext_Impl(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; TYPEINIT1( XMLConfigItemTContext_Impl, XMLTransformerContext ); @@ -1521,9 +1519,9 @@ void XMLConfigItemTContext_Impl::StartElement( XMLTransformerContext::StartElement( xAttrList ); } -void XMLConfigItemTContext_Impl::Characters( const ::rtl::OUString& rChars ) +void XMLConfigItemTContext_Impl::Characters( const OUString& rChars ) { - rtl::OUString sChars(rChars); + OUString sChars(rChars); if (m_bIsRedlineProtectionKey) m_aContent += rChars; else if (m_bIsCursorX || m_bIsCursorY) @@ -1534,7 +1532,7 @@ void XMLConfigItemTContext_Impl::Characters( const ::rtl::OUString& rChars ) else if (m_bIsCursorY && nPos > 31999) nPos = 31999; - sChars = ::rtl::OUString::valueOf(nPos); + sChars = OUString::valueOf(nPos); } XMLTransformerContext::Characters( sChars ); @@ -1569,14 +1567,14 @@ void XMLConfigItemTContext_Impl::EndElement() class XMLTrackedChangesOASISTContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aAttrQName; + OUString m_aAttrQName; public: TYPEINFO(); XMLTrackedChangesOASISTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, XMLTokenEnum eToken ); diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx index c2e903edb99a..cb8b4e74a2e1 100644 --- a/xmloff/source/transform/Oasis2OOo.hxx +++ b/xmloff/source/transform/Oasis2OOo.hxx @@ -35,7 +35,7 @@ protected: virtual XMLTransformerContext *CreateUserDefinedContext( const TransformerAction_Impl& rAction, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bPersistent=sal_False ); virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ); @@ -47,14 +47,14 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString GetEventName( const ::rtl::OUString& rName, + virtual OUString GetEventName( const OUString& rName, sal_Bool bForm ); }; diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx index 702a8017afc6..14abd51cdc33 100644 --- a/xmloff/source/transform/PersAttrListTContext.cxx +++ b/xmloff/source/transform/PersAttrListTContext.cxx @@ -24,7 +24,6 @@ #include #include "PersAttrListTContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -44,7 +43,7 @@ void XMLPersAttrListTContext::AddAttribute( void XMLPersAttrListTContext::AddAttribute( sal_uInt16 nAPrefix, ::xmloff::token::XMLTokenEnum eAToken, - const ::rtl::OUString & rValue ) + const OUString & rValue ) { OUString aAttrQName( GetTransformer().GetNamespaceMap().GetQNameByKey( nAPrefix, ::xmloff::token::GetXMLToken( eAToken ) ) ); diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index 5ff1e83e81c5..346c1bf7d284 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -29,12 +29,12 @@ class XMLPersAttrListTContext : public XMLTransformerContext ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; sal_uInt16 m_nActionMap; protected: - void SetExportQName( const ::rtl::OUString& r ) { m_aElemQName = r; } + void SetExportQName( const OUString& r ) { m_aElemQName = r; } public: TYPEINFO(); @@ -44,22 +44,22 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLPersAttrListTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // attr list persistence + attribute processing XMLPersAttrListTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); // attr list persistence + renaming XMLPersAttrListTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); // attr list persistence + renaming + attribute processing XMLPersAttrListTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); @@ -73,8 +73,8 @@ public: // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and @@ -89,13 +89,13 @@ public: // This method is called for all characters that are contained in the // current element. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual sal_Bool IsPersistent() const; virtual void Export(); virtual void ExportContent(); - const ::rtl::OUString& GetExportQName() const { return m_aElemQName; } + const OUString& GetExportQName() const { return m_aElemQName; } void AddAttribute( sal_uInt16 nAPrefix, ::xmloff::token::XMLTokenEnum eAToken, @@ -103,7 +103,7 @@ public: void AddAttribute( sal_uInt16 nAPrefix, ::xmloff::token::XMLTokenEnum eAToken, - const ::rtl::OUString & rValue ); + const OUString & rValue ); ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx index 0e83032b2060..7d20c02be1b1 100644 --- a/xmloff/source/transform/PersMixedContentTContext.cxx +++ b/xmloff/source/transform/PersMixedContentTContext.cxx @@ -21,33 +21,32 @@ #include "TransformerBase.hxx" #include "PersMixedContentTContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; //------------------------------------------------------------------------------ class XMLPersTextTContext_Impl : public XMLTransformerContext { - ::rtl::OUString m_aCharacters; + OUString m_aCharacters; public: TYPEINFO(); XMLPersTextTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rChars ); + const OUString& rChars ); virtual ~XMLPersTextTContext_Impl(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual sal_Bool IsPersistent() const; virtual void Export(); - const ::rtl::OUString& GetText() const { return m_aCharacters; } + const OUString& GetText() const { return m_aCharacters; } }; TYPEINIT1( XMLPersTextTContext_Impl, XMLTransformerContext ); diff --git a/xmloff/source/transform/PersMixedContentTContext.hxx b/xmloff/source/transform/PersMixedContentTContext.hxx index 48f5cd91372a..f0564fb4ea67 100644 --- a/xmloff/source/transform/PersMixedContentTContext.hxx +++ b/xmloff/source/transform/PersMixedContentTContext.hxx @@ -32,27 +32,27 @@ public: // mixed content persistence only XMLPersMixedContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // mixed content persistence + attribute processing XMLPersMixedContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); // mixed content persistence + renaming XMLPersMixedContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); // mixed content persistence + renaming + attribute processing XMLPersMixedContentTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual ~XMLPersMixedContentTContext(); }; diff --git a/xmloff/source/transform/ProcAddAttrTContext.cxx b/xmloff/source/transform/ProcAddAttrTContext.cxx index 8bfb9e0cd8c8..0c7f4fc70478 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.cxx +++ b/xmloff/source/transform/ProcAddAttrTContext.cxx @@ -22,7 +22,6 @@ #include "TransformerBase.hxx" #include -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx index c49043187ce6..cda05fe5e825 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.hxx +++ b/xmloff/source/transform/ProcAddAttrTContext.hxx @@ -24,14 +24,14 @@ class XMLProcAddAttrTransformerContext : public XMLProcAttrTransformerContext { - ::rtl::OUString m_aAttrQName; - ::rtl::OUString m_aAttrValue; + OUString m_aAttrQName; + OUString m_aAttrValue; public: TYPEINFO(); XMLProcAddAttrTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap, diff --git a/xmloff/source/transform/ProcAttrTContext.cxx b/xmloff/source/transform/ProcAttrTContext.cxx index 0bf6adc41e54..4fc4de96f4b1 100644 --- a/xmloff/source/transform/ProcAttrTContext.cxx +++ b/xmloff/source/transform/ProcAttrTContext.cxx @@ -23,7 +23,6 @@ #include "TransformerActions.hxx" #include -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ProcAttrTContext.hxx b/xmloff/source/transform/ProcAttrTContext.hxx index 214221f4200a..aa57ac1e2468 100644 --- a/xmloff/source/transform/ProcAttrTContext.hxx +++ b/xmloff/source/transform/ProcAttrTContext.hxx @@ -25,23 +25,23 @@ class XMLProcAttrTransformerContext : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; + OUString m_aElemQName; sal_uInt16 m_nActionMap; protected: - const ::rtl::OUString& GetElemQName() const { return m_aElemQName; } + const OUString& GetElemQName() const { return m_aElemQName; } sal_uInt16 GetActionMap() const { return m_nActionMap; } public: TYPEINFO(); XMLProcAttrTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nActionMap ); XMLProcAttrTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); diff --git a/xmloff/source/transform/RenameElemTContext.cxx b/xmloff/source/transform/RenameElemTContext.cxx index 3cc491efe96c..1b7544462694 100644 --- a/xmloff/source/transform/RenameElemTContext.cxx +++ b/xmloff/source/transform/RenameElemTContext.cxx @@ -22,7 +22,6 @@ #include "TransformerBase.hxx" #include -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/RenameElemTContext.hxx b/xmloff/source/transform/RenameElemTContext.hxx index 673acb8d4ba5..b33a018110dc 100644 --- a/xmloff/source/transform/RenameElemTContext.hxx +++ b/xmloff/source/transform/RenameElemTContext.hxx @@ -26,9 +26,9 @@ class XMLRenameElemTransformerContext : public XMLTransformerContext { - ::rtl::OUString m_aElemQName; - ::rtl::OUString m_aAttrQName; - ::rtl::OUString m_aAttrValue; + OUString m_aElemQName; + OUString m_aAttrQName; + OUString m_aAttrValue; public: TYPEINFO(); @@ -36,7 +36,7 @@ public: // The following consutructor renames the element names "rQName" // to bPrefix/eToken XMLRenameElemTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ); @@ -44,7 +44,7 @@ public: // to bPrefix/eToken and adds an attribute nAPrefix/eAToken that has // the value eVToken. XMLRenameElemTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nAPrefix, diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index fb05750b6e72..badf7df3af6d 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -37,7 +37,6 @@ #include "StyleOASISTContext.hxx" #include -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -70,11 +69,11 @@ class XMLPropertiesTContext_Impl : public XMLPersElemContentTContext XMLPropType m_ePropType; sal_Bool m_bControlStyle; - ::rtl::OUString m_aStyleFamily; + OUString m_aStyleFamily; public: - void SetQNameAndPropType( const ::rtl::OUString& rQName, + void SetQNameAndPropType( const OUString& rQName, XMLPropType ePropType ) { m_ePropType = ePropType; @@ -84,9 +83,9 @@ public: TYPEINFO(); XMLPropertiesTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, XMLPropType eP, - const ::rtl::OUString& rStyleFamily, + const OUString& rStyleFamily, sal_Bool _bControlStyle = sal_False ); virtual ~XMLPropertiesTContext_Impl(); @@ -108,7 +107,7 @@ TYPEINIT1( XMLPropertiesTContext_Impl, XMLPersElemContentTContext ); XMLPropertiesTContext_Impl::XMLPropertiesTContext_Impl( XMLTransformerBase& rImp, const OUString& rQName, XMLPropType eP, - const ::rtl::OUString& rStyleFamily, sal_Bool _bControlStyle ) : + const OUString& rStyleFamily, sal_Bool _bControlStyle ) : XMLPersElemContentTContext( rImp, rQName, XML_NAMESPACE_STYLE, XML_PROPERTIES), m_ePropType( eP ), @@ -465,7 +464,7 @@ void XMLPropertiesTContext_Impl::StartElement( if( nValue ) { nValue *= 100; - rtl::OUStringBuffer aOut; + OUStringBuffer aOut; ::sax::Converter::convertPercent(aOut, nValue); aAttrValue = aOut.makeStringAndClear(); } @@ -506,7 +505,7 @@ void XMLPropertiesTContext_Impl::StartElement( { if ( !aNewAttrValue.isEmpty() ) { - aNewAttrValue += rtl::OUString(" " ); + aNewAttrValue += OUString(" " ); } if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_EVEN ) ) @@ -552,7 +551,7 @@ void XMLPropertiesTContext_Impl::StartElement( } nValue = 100 - nValue; - rtl::OUStringBuffer aOut; + OUStringBuffer aOut; ::sax::Converter::convertPercent(aOut, nValue); pAttrList->AddAttribute( rAttrName, aOut.makeStringAndClear() ); } @@ -587,7 +586,7 @@ void XMLPropertiesTContext_Impl::StartElement( if( nIntervalMinorDivisor != 0) fIntervalMinor = fIntervalMajor / static_cast< double >( nIntervalMinorDivisor ); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertDouble( aBuf, fIntervalMinor ); pAttrList->AddAttribute( GetTransformer().GetNamespaceMap().GetQNameByKey( diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx index aba09c3c0e58..a037c58655ac 100644 --- a/xmloff/source/transform/StyleOASISTContext.hxx +++ b/xmloff/source/transform/StyleOASISTContext.hxx @@ -33,15 +33,15 @@ class XMLStyleOASISTContext : public XMLPersElemContentTContext sal_Bool m_bPersistent; sal_Bool m_bControlStyle; - ::rtl::OUString m_aStyleFamily; + OUString m_aStyleFamily; public: TYPEINFO(); XMLStyleOASISTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bPersistent=sal_False ); XMLStyleOASISTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, sal_Bool bPersistent=sal_False ); @@ -49,13 +49,13 @@ public: virtual ~XMLStyleOASISTContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void ExportContent(); diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 5f5930c44964..5432f85e5d61 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -42,7 +42,6 @@ #include #include -using ::rtl::OUString; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -155,15 +154,15 @@ public: TYPEINFO(); XMLTypedPropertiesOOoTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); virtual ~XMLTypedPropertiesOOoTContext_Impl(); using XMLPersAttrListTContext::AddAttribute; - void AddAttribute( const ::rtl::OUString &sName , - const ::rtl::OUString &sValue ); + void AddAttribute( const OUString &sName , + const OUString &sValue ); void AddAttribute( sal_uInt16 nPrefix, XMLTokenEnum eToken, - const ::rtl::OUString &sValue ); + const OUString &sValue ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rAttrList ); @@ -185,8 +184,8 @@ XMLTypedPropertiesOOoTContext_Impl::~XMLTypedPropertiesOOoTContext_Impl() } void XMLTypedPropertiesOOoTContext_Impl::AddAttribute( - const ::rtl::OUString &sName , - const ::rtl::OUString &sValue ) + const OUString &sName , + const OUString &sValue ) { static_cast< XMLMutableAttributeList * >( m_xAttrList.get() ) ->AddAttribute( sName, sValue ); @@ -194,7 +193,7 @@ void XMLTypedPropertiesOOoTContext_Impl::AddAttribute( void XMLTypedPropertiesOOoTContext_Impl::AddAttribute( sal_uInt16 nPrefix, XMLTokenEnum eToken, - const ::rtl::OUString &sValue ) + const OUString &sValue ) { OUString sName( GetTransformer().GetNamespaceMap().GetQNameByKey( @@ -246,7 +245,7 @@ public: TYPEINFO(); XMLPropertiesOOoTContext_Impl( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, XMLPropTypes& rTypes, sal_Bool bPersistent ); @@ -262,7 +261,7 @@ public: virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual void Export(); @@ -344,20 +343,20 @@ XMLTypedPropertiesOOoTContext_Impl XML_PROP_TYPE_END==m_aPropTypes[1] || (i' ); + aTmp += OString::valueOf( '>' ); OSL_FAIL(aTmp.getStr()); } @@ -875,7 +874,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( if( nValue ) { nValue /= 100; - rtl::OUStringBuffer aOut; + OUStringBuffer aOut; ::sax::Converter::convertPercent( aOut, nValue ); aAttrValue = aOut.makeStringAndClear(); } @@ -919,7 +918,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( { if ( !aStyleMirrorAttrValue.isEmpty() ) { - aStyleMirrorAttrValue += rtl::OUString(" " ); + aStyleMirrorAttrValue += OUString(" " ); } if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_LEFT_PAGES ) ) @@ -944,7 +943,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( double fValue = sAttrValue.toDouble(); sal_Int32 nValue = (sal_Int32)((fValue * 100.0) + ( fValue > 0 ? 0.5 : - 0.5 ) ); - rtl::OUStringBuffer aOut; + OUStringBuffer aOut; ::sax::Converter::convertPercent( aOut, nValue ); OUString aAttrValue( aOut.makeStringAndClear() ); pContext->AddAttribute( sAttrName, aAttrValue ); @@ -963,7 +962,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( } nValue = 100 - nValue; - rtl::OUStringBuffer aOut; + OUStringBuffer aOut; ::sax::Converter::convertPercent( aOut, nValue ); pContext->AddAttribute( sAttrName, aOut.makeStringAndClear() ); } @@ -1021,7 +1020,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( sal_Int32 nIntervalMinorDivisor = static_cast< sal_Int32 >( ::rtl::math::round( fIntervalMajor / fIntervalMinor )); - ::rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; ::sax::Converter::convertNumber( aBuf, nIntervalMinorDivisor ); pIntervalMinorDivisorContext->AddAttribute( GetTransformer().GetNamespaceMap().GetQNameByKey( diff --git a/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx index 4bad415410bb..351cc03166fa 100644 --- a/xmloff/source/transform/StyleOOoTContext.hxx +++ b/xmloff/source/transform/StyleOOoTContext.hxx @@ -37,11 +37,11 @@ public: TYPEINFO(); XMLStyleOOoTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, XMLFamilyType eType, sal_Bool bPersistent ); XMLStyleOOoTContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName, + const OUString& rQName, XMLFamilyType eType, sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken, @@ -50,13 +50,13 @@ public: virtual ~XMLStyleOOoTContext(); virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); virtual sal_Bool IsPersistent() const; static XMLTransformerActions *CreateTransformerActions( sal_uInt16 nType ); diff --git a/xmloff/source/transform/TransformerActions.cxx b/xmloff/source/transform/TransformerActions.cxx index 2f065a11aafd..a89424af8695 100644 --- a/xmloff/source/transform/TransformerActions.cxx +++ b/xmloff/source/transform/TransformerActions.cxx @@ -20,7 +20,6 @@ #include "TransformerActions.hxx" -using ::rtl::OUString; using namespace ::osl; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx index d8d876e8f279..03d272325d0a 100644 --- a/xmloff/source/transform/TransformerActions.hxx +++ b/xmloff/source/transform/TransformerActions.hxx @@ -30,7 +30,7 @@ struct NameKey_Impl { sal_uInt16 m_nPrefix; - ::rtl::OUString m_aLocalName; + OUString m_aLocalName; inline NameKey_Impl( sal_uInt16 nPrfx, ::xmloff::token::XMLTokenEnum eLclNm ) : @@ -39,7 +39,7 @@ struct NameKey_Impl { } - inline NameKey_Impl( sal_uInt16 nPrfx, const ::rtl::OUString& rLclNm ) : + inline NameKey_Impl( sal_uInt16 nPrfx, const OUString& rLclNm ) : m_nPrefix( nPrfx ), m_aLocalName( rLclNm ) { diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 00665efdeda2..5619a0d24da9 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -41,8 +41,6 @@ #include "TransformerBase.hxx" #include "TContextVector.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::osl; using namespace ::xmloff::token; using namespace ::com::sun::star; @@ -602,7 +600,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( ? ((nMeasure*127+36)/72) : ((nMeasure*127-36)/72) ); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertMeasure(aBuffer, nMeasure, util::MeasureUnit::MM_100TH, nDestUnit ); @@ -1235,14 +1233,14 @@ sal_Bool XMLTransformerBase::NegPercent( OUString& rValue ) return bRet; } -sal_Bool XMLTransformerBase::AddNamespacePrefix( ::rtl::OUString& rName, +sal_Bool XMLTransformerBase::AddNamespacePrefix( OUString& rName, sal_uInt16 nPrefix ) const { rName = GetNamespaceMap().GetQNameByKey( nPrefix, rName, sal_False ); return sal_True; } -sal_Bool XMLTransformerBase::RemoveNamespacePrefix( ::rtl::OUString& rName, +sal_Bool XMLTransformerBase::RemoveNamespacePrefix( OUString& rName, sal_uInt16 nPrefixOnly ) const { OUString aLocalName; @@ -1256,7 +1254,7 @@ sal_Bool XMLTransformerBase::RemoveNamespacePrefix( ::rtl::OUString& rName, return bRet; } -sal_Bool XMLTransformerBase::ConvertURIToOASIS( ::rtl::OUString& rURI, +sal_Bool XMLTransformerBase::ConvertURIToOASIS( OUString& rURI, sal_Bool bSupportPackage ) const { sal_Bool bRet = sal_False; @@ -1326,7 +1324,7 @@ sal_Bool XMLTransformerBase::ConvertURIToOASIS( ::rtl::OUString& rURI, return bRet; } -sal_Bool XMLTransformerBase::ConvertURIToOOo( ::rtl::OUString& rURI, +sal_Bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI, sal_Bool bSupportPackage ) const { sal_Bool bRet = sal_False; @@ -1405,7 +1403,7 @@ sal_Bool XMLTransformerBase::RenameAttributeValue( } // static -bool XMLTransformerBase::ConvertRNGDateTimeToISO( ::rtl::OUString& rDateTime ) +bool XMLTransformerBase::ConvertRNGDateTimeToISO( OUString& rDateTime ) { if( !rDateTime.isEmpty() && rDateTime.indexOf( sal_Unicode('.')) != -1 ) diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index a3f8b23f37fe..d8de75a1fb0f 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -59,8 +59,8 @@ class XMLTransformerBase : public XMLTransformer ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > xCharClass; - ::rtl::OUString m_aExtPathPrefix; - ::rtl::OUString m_aClass; + OUString m_aExtPathPrefix; + OUString m_aClass; SvXMLNamespaceMap *m_pNamespaceMap; SvXMLNamespaceMap *m_pReplaceNamespaceMap; @@ -74,8 +74,8 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. XMLTransformerContext *CreateContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName ); + const OUString& rLocalName, + const OUString& rQName ); // this method may return an empty reference when the transformer service // was created outside the xmloff environment. @@ -92,17 +92,17 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL startElement(const ::rtl::OUString& aName, + virtual void SAL_CALL startElement(const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const ::rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const ::rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString& aWhitespaces) + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL processingInstruction(const ::rtl::OUString& aTarget, - const ::rtl::OUString& aData) + virtual void SAL_CALL processingInstruction(const OUString& aTarget, + const OUString& aData) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -110,11 +110,11 @@ public: // ::com::sun::star::xml::sax::XExtendedDocumentHandler virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL comment(const ::rtl::OUString& sComment) + virtual void SAL_CALL comment(const OUString& sComment) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL allowLineBreak(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL unknown(const ::rtl::OUString& sString) + virtual void SAL_CALL unknown(const OUString& sString) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); // XInitialization @@ -134,9 +134,9 @@ public: virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ); virtual XMLTransformerContext *CreateUserDefinedContext( const TransformerAction_Impl& rAction, - const ::rtl::OUString& rQName, + const OUString& rQName, sal_Bool bPersistent=sal_False ) = 0; - virtual ::rtl::OUString GetEventName( const ::rtl::OUString& rName, + virtual OUString GetEventName( const OUString& rName, sal_Bool bForm = sal_False ) = 0; @@ -144,30 +144,30 @@ public: ::com::sun::star::xml::sax::XAttributeList >& rAttrList, sal_uInt16 nActionMap, sal_Bool bClone ); - static sal_Bool ReplaceSingleInchWithIn( ::rtl::OUString& rValue ); - static sal_Bool ReplaceSingleInWithInch( ::rtl::OUString& rValue ); - static sal_Bool ReplaceInchWithIn( ::rtl::OUString& rValue ); - static sal_Bool ReplaceInWithInch( ::rtl::OUString& rValue ); + static sal_Bool ReplaceSingleInchWithIn( OUString& rValue ); + static sal_Bool ReplaceSingleInWithInch( OUString& rValue ); + static sal_Bool ReplaceInchWithIn( OUString& rValue ); + static sal_Bool ReplaceInWithInch( OUString& rValue ); - sal_Bool EncodeStyleName( ::rtl::OUString& rName ) const; - static sal_Bool DecodeStyleName( ::rtl::OUString& rName ); - static sal_Bool NegPercent( ::rtl::OUString& rValue ); + sal_Bool EncodeStyleName( OUString& rName ) const; + static sal_Bool DecodeStyleName( OUString& rName ); + static sal_Bool NegPercent( OUString& rValue ); - sal_Bool AddNamespacePrefix( ::rtl::OUString& rName, + sal_Bool AddNamespacePrefix( OUString& rName, sal_uInt16 nPrefix ) const; - sal_Bool RemoveNamespacePrefix( ::rtl::OUString& rName, + sal_Bool RemoveNamespacePrefix( OUString& rName, sal_uInt16 nPrefixOnly=0xffffU ) const; - sal_Bool ConvertURIToOASIS( ::rtl::OUString& rURI, + sal_Bool ConvertURIToOASIS( OUString& rURI, sal_Bool bSupportPackage=sal_False ) const; - sal_Bool ConvertURIToOOo( ::rtl::OUString& rURI, + sal_Bool ConvertURIToOOo( OUString& rURI, sal_Bool bSupportPackage=sal_False ) const; /** renames the given rOutAttributeValue if one of the parameters contains a matching token in its lower 16 bits. The value is converted to the token that is given in the upper 16 bits of the matching parameter. */ - sal_Bool RenameAttributeValue( ::rtl::OUString& rOutAttributeValue, + sal_Bool RenameAttributeValue( OUString& rOutAttributeValue, sal_Int32 nParam1, sal_Int32 nParam2, sal_Int32 nParam3 ); @@ -180,16 +180,16 @@ public: was found. @return if the given string was changed */ - static bool ConvertRNGDateTimeToISO( ::rtl::OUString& rDateTime ); + static bool ConvertRNGDateTimeToISO( OUString& rDateTime ); - ::xmloff::token::XMLTokenEnum GetToken( const ::rtl::OUString& rStr ) const; + ::xmloff::token::XMLTokenEnum GetToken( const OUString& rStr ) const; const XMLTransformerContext *GetCurrentContext() const; const XMLTransformerContext *GetAncestorContext( sal_uInt32 i ) const; // C++ - inline void SetClass( const ::rtl::OUString& r ) { m_aClass = r; } - inline const ::rtl::OUString& GetClass() const { return m_aClass; } + inline void SetClass( const OUString& r ) { m_aClass = r; } + inline const OUString& GetClass() const { return m_aClass; } bool isWriter() const; diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx index b511ecec2778..a193c65d500d 100644 --- a/xmloff/source/transform/TransformerContext.cxx +++ b/xmloff/source/transform/TransformerContext.cxx @@ -27,7 +27,6 @@ #include "TransformerContext.hxx" -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx index c05c6bb9d7ad..a5eb385ee912 100644 --- a/xmloff/source/transform/TransformerContext.hxx +++ b/xmloff/source/transform/TransformerContext.hxx @@ -36,7 +36,7 @@ class XMLTransformerContext : public ::salhelper::SimpleReferenceObject XMLTransformerBase& m_rTransformer; - ::rtl::OUString m_aQName; + OUString m_aQName; SvXMLNamespaceMap *m_pRewindMap; @@ -48,12 +48,12 @@ protected: XMLTransformerBase& GetTransformer() { return m_rTransformer; } const XMLTransformerBase& GetTransformer() const { return m_rTransformer; } - void SetQName( const ::rtl::OUString& rQName ) { m_aQName = rQName; } + void SetQName( const OUString& rQName ) { m_aQName = rQName; } public: TYPEINFO(); - const ::rtl::OUString& GetQName() const { return m_aQName; } + const OUString& GetQName() const { return m_aQName; } sal_Bool HasQName( sal_uInt16 nPrefix, ::xmloff::token::XMLTokenEnum eToken ) const; sal_Bool HasNamespace( sal_uInt16 nPrefix ) const; @@ -63,7 +63,7 @@ public: // Note that virtual methods cannot be used inside constructors. Use // StartElement instead if this is required. XMLTransformerContext( XMLTransformerBase& rTransformer, - const ::rtl::OUString& rQName ); + const OUString& rQName ); // A contexts destructor does anything that is required if an element // ends. By default, nothing is done. @@ -74,8 +74,8 @@ public: // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, - const ::rtl::OUString& rQName, + const OUString& rLocalName, + const OUString& rQName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); // StartElement is called after a context has been constructed and @@ -90,7 +90,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); // Is the current context a persistent one (i.e. one that saves is content // rather than exporting it directly? diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx index 02b65d9112df..d69373e17962 100644 --- a/xmloff/source/transform/TransformerTokenMap.hxx +++ b/xmloff/source/transform/TransformerTokenMap.hxx @@ -29,8 +29,8 @@ class XMLTransformerTokenMap : - public ::boost::unordered_map< ::rtl::OUString, ::xmloff::token::XMLTokenEnum, - ::rtl::OUStringHash, ::comphelper::UStringEqual > + public ::boost::unordered_map< OUString, ::xmloff::token::XMLTokenEnum, + OUStringHash, ::comphelper::UStringEqual > { public: XMLTransformerTokenMap( ::xmloff::token::XMLTokenEnum *pInit ); diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index 95c3ddec2c4c..6bd93ff06249 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -25,8 +25,8 @@ using namespace ::com::sun::star; #define DECLARE_SERVICE( classname ) \ - extern ::rtl::OUString SAL_CALL classname##_getImplementationName() throw(); \ - extern uno::Sequence< ::rtl::OUString > SAL_CALL classname##_getSupportedServiceNames() throw(); \ + extern OUString SAL_CALL classname##_getImplementationName() throw(); \ + extern uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw(); \ extern uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance( \ const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); @@ -70,8 +70,8 @@ DECLARE_SERVICE( XMLImpressImportOOO ) // ---------------------------------------------------------------------------- namespace { - typedef ::rtl::OUString (SAL_CALL * GetImplementationName)(); - typedef uno::Sequence< ::rtl::OUString > (SAL_CALL * GetSupportedServiceNames)(); + typedef OUString (SAL_CALL * GetImplementationName)(); + typedef uno::Sequence< OUString > (SAL_CALL * GetSupportedServiceNames)(); typedef uno::Reference< ::uno::XInterface > (SAL_CALL * CreateInstance)( const uno::Reference< lang::XMultiServiceFactory >& ); diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx index 35a34ce11a76..393b3e6b4b1e 100644 --- a/xmloff/source/xforms/SchemaContext.cxx +++ b/xmloff/source/xforms/SchemaContext.cxx @@ -32,7 +32,6 @@ #include #include -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::Any; using com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx index 916e762b2ba1..449b6ab04abb 100644 --- a/xmloff/source/xforms/SchemaContext.hxx +++ b/xmloff/source/xforms/SchemaContext.hxx @@ -46,7 +46,7 @@ public: SchemaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference& rRepository ); virtual ~SchemaContext(); @@ -59,12 +59,12 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ); }; diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index 071a5afa05d1..facfafbcdc07 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -42,7 +42,6 @@ #include -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::Exception; using com::sun::star::uno::Any; diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx index 22f29946cb4c..47c5c5124058 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.hxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx @@ -42,16 +42,16 @@ class SchemaRestrictionContext : public TokenContext { com::sun::star::uno::Reference mxRepository; com::sun::star::uno::Reference mxDataType; - ::rtl::OUString msTypeName; - ::rtl::OUString msBaseName; + OUString msTypeName; + OUString msBaseName; public: SchemaRestrictionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, com::sun::star::uno::Reference& rRepository, - const ::rtl::OUString& sTypeName ); + const OUString& sTypeName ); virtual ~SchemaRestrictionContext(); @@ -66,12 +66,12 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ); }; diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx index 5a773ef81052..747dd2288444 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx @@ -30,7 +30,6 @@ #include #include -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::Any; using com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx index f27f7ce2774b..4b91e8bf0607 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx @@ -41,13 +41,13 @@ class SvXMLImportContext; class SchemaSimpleTypeContext : public TokenContext { com::sun::star::uno::Reference mxRepository; - rtl::OUString msTypeName; + OUString msTypeName; public: SchemaSimpleTypeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference& rRepository ); virtual ~SchemaSimpleTypeContext(); @@ -61,12 +61,12 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ); }; diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx index 24f3fe2fd7f8..3790018ff531 100644 --- a/xmloff/source/xforms/TokenContext.cxx +++ b/xmloff/source/xforms/TokenContext.cxx @@ -25,7 +25,6 @@ #include -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::xml::sax::XAttributeList; @@ -124,7 +123,7 @@ static bool lcl_IsWhiteSpace( sal_Unicode c ) || c == sal_Unicode( 0x0D ); } -void TokenContext::Characters( const ::rtl::OUString& rCharacters ) +void TokenContext::Characters( const OUString& rCharacters ) { // get iterators for string data const sal_Unicode* pBegin = rCharacters.getStr(); diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index a7ced8e7936b..0e74939bc8a5 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -49,7 +49,7 @@ public: TokenContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const SvXMLTokenMapEntry* pAttributes = NULL, const SvXMLTokenMapEntry* pChildren = NULL ); @@ -72,20 +72,20 @@ public: * handling of defaults. */ virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ); /** Create a warning for all non-namespace character * content. Classes that wish to deal with character content have * to overload this method anyway, and will thus get rid of the * warnings. */ - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); protected: /** will be called for each attribute */ virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ) = 0; + const OUString& rValue ) = 0; /** will be called for each child element */ virtual SvXMLImportContext* HandleChild( @@ -94,7 +94,7 @@ protected: // the following attributes are mainly to be used for child // context creation sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ) = 0; }; diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx index 452156c65e85..4358dd76bd18 100644 --- a/xmloff/source/xforms/XFormsBindContext.cxx +++ b/xmloff/source/xforms/XFormsBindContext.cxx @@ -34,7 +34,6 @@ #include -using rtl::OUString; using com::sun::star::beans::XPropertySet; using com::sun::star::uno::Reference; using com::sun::star::uno::makeAny; diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx index d376c60f7db3..1705b2f4cde1 100644 --- a/xmloff/source/xforms/XFormsBindContext.hxx +++ b/xmloff/source/xforms/XFormsBindContext.hxx @@ -48,7 +48,7 @@ public: XFormsBindContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xModel ); virtual ~XFormsBindContext(); @@ -62,12 +62,12 @@ public: protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nNamespace, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ); }; diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index 1e437fa4902e..fbc218545537 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -38,7 +38,6 @@ #include -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::makeAny; using com::sun::star::uno::UNO_QUERY; @@ -121,7 +120,7 @@ void XFormsInstanceContext::EndElement() void XFormsInstanceContext::HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ) + const OUString& rValue ) { switch( nToken ) { diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx index 30b50c2176e5..d19fbadd52d4 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.hxx +++ b/xmloff/source/xforms/XFormsInstanceContext.hxx @@ -44,14 +44,14 @@ class XFormsInstanceContext : public TokenContext { com::sun::star::uno::Reference mxModel; com::sun::star::uno::Reference mxInstance; - rtl::OUString msId; - rtl::OUString msURL; + OUString msId; + OUString msURL; public: XFormsInstanceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference & xModel ); virtual ~XFormsInstanceContext(); @@ -65,7 +65,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ); virtual void EndElement(); @@ -74,12 +74,12 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nNamespace, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ); }; diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index 0cccc425188b..947981dbc350 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -38,7 +38,6 @@ #include -using rtl::OUString; using com::sun::star::xml::sax::XAttributeList; using com::sun::star::beans::XPropertySet; using com::sun::star::util::XUpdatable; diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx index 9339bc59eccd..8e538328dae9 100644 --- a/xmloff/source/xforms/XFormsModelContext.hxx +++ b/xmloff/source/xforms/XFormsModelContext.hxx @@ -46,7 +46,7 @@ public: XFormsModelContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName ); + const OUString& rLName ); virtual ~XFormsModelContext(); com::sun::star::uno::Reference getModel(); @@ -61,12 +61,12 @@ protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ); }; diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx index 23e470cdf619..fb0bdbbf0a3a 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.cxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx @@ -36,7 +36,6 @@ #include -using rtl::OUString; using com::sun::star::beans::XPropertySet; using com::sun::star::container::XNameContainer; using com::sun::star::xml::sax::XAttributeList; diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx index 0c56d8bec171..bc09a4b6658f 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.hxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx @@ -47,7 +47,7 @@ public: XFormsSubmissionContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xModel ); virtual ~XFormsSubmissionContext(); @@ -58,12 +58,12 @@ public: protected: virtual void HandleAttribute( sal_uInt16 nToken, - const rtl::OUString& rValue ); + const OUString& rValue ); virtual SvXMLImportContext* HandleChild( sal_uInt16 nToken, sal_uInt16 nNamespace, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference& xAttrList ); }; diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index b73af0ab43ca..9f1b32ce5c99 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -39,7 +39,6 @@ #include #include -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::Sequence; using com::sun::star::uno::UNO_QUERY; @@ -98,7 +97,7 @@ void xforms_addXFormsModel( static Reference lcl_findXFormsBindingOrSubmission( Reference& xDocument, - const rtl::OUString& rBindingID, + const OUString& rBindingID, bool bBinding ) { // find binding by iterating over all models, and look for the @@ -153,14 +152,14 @@ static Reference lcl_findXFormsBindingOrSubmission( Reference xforms_findXFormsBinding( Reference& xDocument, - const rtl::OUString& rBindingID ) + const OUString& rBindingID ) { return lcl_findXFormsBindingOrSubmission( xDocument, rBindingID, true ); } Reference xforms_findXFormsSubmission( Reference& xDocument, - const rtl::OUString& rBindingID ) + const OUString& rBindingID ) { return lcl_findXFormsBindingOrSubmission( xDocument, rBindingID, false ); } @@ -265,7 +264,7 @@ sal_uInt16 xforms_getTypeClass( } -rtl::OUString xforms_getTypeName( +OUString xforms_getTypeName( const Reference& xRepository, const SvXMLNamespaceMap& rNamespaceMap, const OUString& rXMLName ) @@ -279,7 +278,7 @@ rtl::OUString xforms_getTypeName( : xforms_getBasicTypeName( xRepository, rNamespaceMap, rXMLName ); } -rtl::OUString xforms_getBasicTypeName( +OUString xforms_getBasicTypeName( const Reference& xRepository, const SvXMLNamespaceMap& rNamespaceMap, const OUString& rXMLName ) diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx index 75115b90c1e0..577599e18205 100644 --- a/xmloff/source/xforms/xformsapi.hxx +++ b/xmloff/source/xforms/xformsapi.hxx @@ -41,19 +41,19 @@ void xforms_addXFormsModel( const com::sun::star::uno::Reference& xDocument, const com::sun::star::uno::Reference& xModel ); -com::sun::star::uno::Reference xforms_findXFormsBinding( com::sun::star::uno::Reference&, const rtl::OUString& ); +com::sun::star::uno::Reference xforms_findXFormsBinding( com::sun::star::uno::Reference&, const OUString& ); -com::sun::star::uno::Reference xforms_findXFormsSubmission( com::sun::star::uno::Reference&, const rtl::OUString& ); +com::sun::star::uno::Reference xforms_findXFormsSubmission( com::sun::star::uno::Reference&, const OUString& ); void xforms_setValue( com::sun::star::uno::Reference& xPropSet, - const rtl::OUString& rName, + const OUString& rName, const com::sun::star::uno::Any rAny ); template void xforms_setValue( com::sun::star::uno::Reference& xPropSet, - const rtl::OUString& rName, + const OUString& rName, T& aValue ) { xforms_setValue( xPropSet, rName, com::sun::star::uno::makeAny( aValue ) ); @@ -62,17 +62,17 @@ void xforms_setValue( sal_uInt16 xforms_getTypeClass( const com::sun::star::uno::Reference& xRepository, const SvXMLNamespaceMap& rNamespaceMap, - const rtl::OUString& rXMLName ); + const OUString& rXMLName ); -rtl::OUString xforms_getTypeName( +OUString xforms_getTypeName( const com::sun::star::uno::Reference& xRepository, const SvXMLNamespaceMap& rNamespaceMap, - const rtl::OUString& rXMLName ); + const OUString& rXMLName ); -rtl::OUString xforms_getBasicTypeName( +OUString xforms_getBasicTypeName( const com::sun::star::uno::Reference& xRepository, const SvXMLNamespaceMap& rNamespaceMap, - const rtl::OUString& rXMLName ); + const OUString& rXMLName ); #endif diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index cda917f4c515..a19d11acf6f9 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -64,8 +64,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace xmloff::token; -using rtl::OUString; -using rtl::OUStringBuffer; using com::sun::star::beans::XPropertySet; using com::sun::star::beans::XPropertySetInfo; using com::sun::star::container::XIndexAccess; @@ -792,11 +790,11 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop // are the names of the XForm models, and which in turn provides named sequences of // PropertyValues - which denote the actual property values of the given named model. - Sequence< ::rtl::OUString > aModelNames( _rXForms->getElementNames() ); + Sequence< OUString > aModelNames( _rXForms->getElementNames() ); Reference< XNameContainer > xModelSettings = document::NamedPropertyValues::create( comphelper::getProcessComponentContext() ); - for ( const ::rtl::OUString* pModelName = aModelNames.getConstArray(); + for ( const OUString* pModelName = aModelNames.getConstArray(); pModelName != aModelNames.getConstArray() + aModelNames.getLength(); ++pModelName ) diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx index b12ae09cfea5..daa9b23c90ef 100644 --- a/xmloff/source/xforms/xformsimport.cxx +++ b/xmloff/source/xforms/xformsimport.cxx @@ -54,12 +54,11 @@ using com::sun::star::form::binding::XListEntrySource; using com::sun::star::form::binding::XListEntrySink; using com::sun::star::form::submission::XSubmission; using com::sun::star::form::submission::XSubmissionSupplier; -using rtl::OUString; SvXMLImportContext* createXFormsModelContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName ) + const OUString& rLocalName ) { return new XFormsModelContext( rImport, nPrefix, rLocalName ); } @@ -153,8 +152,8 @@ void applyXFormsSettings( const Reference< XNameAccess >& _rXForms, const Sequen try { - Sequence< ::rtl::OUString > aSettingsForModels( xModelSettings->getElementNames() ); - for ( const ::rtl::OUString* pModelName = aSettingsForModels.getConstArray(); + Sequence< OUString > aSettingsForModels( xModelSettings->getElementNames() ); + for ( const OUString* pModelName = aSettingsForModels.getConstArray(); pModelName != aSettingsForModels.getConstArray() + aSettingsForModels.getLength(); ++pModelName ) diff --git a/xmlreader/inc/xmlreader/pad.hxx b/xmlreader/inc/xmlreader/pad.hxx index 886af52b1945..0b8e1f3b7453 100644 --- a/xmlreader/inc/xmlreader/pad.hxx +++ b/xmlreader/inc/xmlreader/pad.hxx @@ -43,7 +43,7 @@ private: SAL_DLLPRIVATE void flushSpan(); Span span_; - rtl::OStringBuffer buffer_; + OStringBuffer buffer_; }; } diff --git a/xmlreader/inc/xmlreader/span.hxx b/xmlreader/inc/xmlreader/span.hxx index b8c28db0f42b..4f3e4d1c285d 100644 --- a/xmlreader/inc/xmlreader/span.hxx +++ b/xmlreader/inc/xmlreader/span.hxx @@ -24,11 +24,10 @@ #include "rtl/string.hxx" #include "rtl/stringutils.hxx" +#include "rtl/ustring.hxx" #include "sal/types.h" #include "xmlreader/detail/xmlreaderdllapi.hxx" -namespace rtl { class OUString; } - namespace xmlreader { struct OOO_DLLPUBLIC_XMLREADER Span { @@ -54,7 +53,7 @@ struct OOO_DLLPUBLIC_XMLREADER Span { return equals(Span(textBegin, textLength)); } - inline bool equals(rtl::OString const & text) const { + inline bool equals(OString const & text) const { return rtl_str_compare_WithLength( begin, length, text.getStr(), text.getLength()) == 0; } @@ -70,7 +69,7 @@ struct OOO_DLLPUBLIC_XMLREADER Span { return rtl_str_compare_WithLength( begin, length, literal, rtl::internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0; } - rtl::OUString convertFromUtf8() const; + OUString convertFromUtf8() const; }; } diff --git a/xmlreader/inc/xmlreader/xmlreader.hxx b/xmlreader/inc/xmlreader/xmlreader.hxx index b6de02734e84..90770a9432da 100644 --- a/xmlreader/inc/xmlreader/xmlreader.hxx +++ b/xmlreader/inc/xmlreader/xmlreader.hxx @@ -39,7 +39,7 @@ namespace xmlreader { class OOO_DLLPUBLIC_XMLREADER XmlReader: private boost::noncopyable { public: - explicit XmlReader(rtl::OUString const & fileUrl) + explicit XmlReader(OUString const & fileUrl) SAL_THROW(( com::sun::star::container::NoSuchElementException, com::sun::star::uno::RuntimeException)); @@ -67,7 +67,7 @@ public: int getNamespaceId(Span const & prefix) const; - rtl::OUString getUrl() const; + OUString getUrl() const; private: typedef std::vector< Span > NamespaceIris; @@ -170,7 +170,7 @@ private: SAL_DLLPRIVATE int toNamespaceId(NamespaceIris::size_type pos); - rtl::OUString fileUrl_; + OUString fileUrl_; oslFileHandle fileHandle_; sal_uInt64 fileSize_; void * fileAddress_; diff --git a/xmlreader/source/span.cxx b/xmlreader/source/span.cxx index 70739e094697..92a218f1941e 100644 --- a/xmlreader/source/span.cxx +++ b/xmlreader/source/span.cxx @@ -32,7 +32,7 @@ namespace xmlreader { -rtl::OUString Span::convertFromUtf8() const { +OUString Span::convertFromUtf8() const { assert(is()); rtl_uString * s = 0; if (!rtl_convertStringToUString( @@ -42,10 +42,10 @@ rtl::OUString Span::convertFromUtf8() const { RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))) { throw css::uno::RuntimeException( - rtl::OUString("cannot convert from UTF-8"), + OUString("cannot convert from UTF-8"), css::uno::Reference< css::uno::XInterface >()); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } } diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index 1da81d4a854c..ca819c40a9e4 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -55,7 +55,7 @@ bool isSpace(char c) { } -XmlReader::XmlReader(rtl::OUString const & fileUrl) +XmlReader::XmlReader(OUString const & fileUrl) SAL_THROW(( css::container::NoSuchElementException, css::uno::RuntimeException)): fileUrl_(fileUrl) @@ -71,8 +71,8 @@ XmlReader::XmlReader(rtl::OUString const & fileUrl) fileUrl_, css::uno::Reference< css::uno::XInterface >()); default: throw css::uno::RuntimeException( - (rtl::OUString("cannot open ") + - fileUrl_ + rtl::OUString(": ") + + (OUString("cannot open ") + + fileUrl_ + OUString(": ") + OUString::number(e)), css::uno::Reference< css::uno::XInterface >()); } @@ -209,7 +209,7 @@ int XmlReader::getNamespaceId(Span const & prefix) const { return NAMESPACE_UNKNOWN; } -rtl::OUString XmlReader::getUrl() const { +OUString XmlReader::getUrl() const { return fileUrl_; } @@ -250,7 +250,7 @@ bool XmlReader::skipComment() { pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("--")); if (i < 0) { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "premature end (within comment) of ")) + fileUrl_), @@ -259,7 +259,7 @@ bool XmlReader::skipComment() { pos_ += i + RTL_CONSTASCII_LENGTH("--"); if (read() != '>') { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal \"--\" within comment in ")) + fileUrl_), @@ -273,7 +273,7 @@ void XmlReader::skipProcessingInstruction() { pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("?>")); if (i < 0) { throw css::uno::RuntimeException( - (rtl::OUString("bad '()); } @@ -288,7 +288,7 @@ void XmlReader::skipDocumentTypeDeclaration() { switch (c) { case '\0': // i.e., EOF throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "premature end (within DTD) of ")) + fileUrl_), @@ -300,7 +300,7 @@ void XmlReader::skipDocumentTypeDeclaration() { pos_, end_ - pos_, c); if (i < 0) { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "premature end (within DTD) of ")) + fileUrl_), @@ -317,7 +317,7 @@ void XmlReader::skipDocumentTypeDeclaration() { switch (c) { case '\0': // i.e., EOF throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "premature end (within DTD) of ")) + fileUrl_), @@ -329,7 +329,7 @@ void XmlReader::skipDocumentTypeDeclaration() { pos_, end_ - pos_, c); if (i < 0) { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "premature end (within DTD) of ")) + fileUrl_), @@ -342,7 +342,7 @@ void XmlReader::skipDocumentTypeDeclaration() { switch (read()) { case '\0': // i.e., EOF throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "premature end (within DTD) of ")) + fileUrl_), @@ -361,7 +361,7 @@ void XmlReader::skipDocumentTypeDeclaration() { skipSpace(); if (read() != '>') { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "missing \">\" of DTD in ")) + fileUrl_), @@ -392,7 +392,7 @@ Span XmlReader::scanCdataSection() { pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("]]>")); if (i < 0) { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( RTL_CONSTASCII_USTRINGPARAM( "premature end (within CDATA section) of ")) + fileUrl_), @@ -459,7 +459,7 @@ char const * XmlReader::handleReference(char const * position, char const * end) } if (val > 0x10FFFF) { // avoid overflow throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( "'&#x...' too large in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); @@ -476,7 +476,7 @@ char const * XmlReader::handleReference(char const * position, char const * end) } if (val > 0x10FFFF) { // avoid overflow throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( "'&#...' too large in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); @@ -485,7 +485,7 @@ char const * XmlReader::handleReference(char const * position, char const * end) } if (position == p || *position++ != ';') { throw css::uno::RuntimeException( - (rtl::OUString("'&#...' missing ';' in ") + + (OUString("'&#...' missing ';' in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -494,7 +494,7 @@ char const * XmlReader::handleReference(char const * position, char const * end) (val >= 0xD800 && val <= 0xDFFF) || val == 0xFFFE || val == 0xFFFF) { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( "character reference denoting invalid character in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); @@ -552,7 +552,7 @@ char const * XmlReader::handleReference(char const * position, char const * end) } } throw css::uno::RuntimeException( - (rtl::OUString("unknown entity reference in ") + + (OUString("unknown entity reference in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -663,7 +663,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { char const * nameColon = 0; if (!scanName(&nameColon)) { throw css::uno::RuntimeException( - (rtl::OUString("bad tag name in ") + + (OUString("bad tag name in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -680,7 +680,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { } if (pos_ == p) { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( "missing whitespace before attribute in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); @@ -689,7 +689,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { char const * attrNameColon = 0; if (!scanName(&attrNameColon)) { throw css::uno::RuntimeException( - (rtl::OUString("bad attribute name in ") + + (OUString("bad attribute name in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -697,7 +697,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { skipSpace(); if (read() != '=') { throw css::uno::RuntimeException( - (rtl::OUString("missing '=' in ") + + (OUString("missing '=' in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -705,7 +705,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { char del = read(); if (del != '\'' && del != '"') { throw css::uno::RuntimeException( - (rtl::OUString("bad attribute value in ") + + (OUString("bad attribute value in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -713,7 +713,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { sal_Int32 i = rtl_str_indexOfChar_WithLength(pos_, end_ - pos_, del); if (i < 0) { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( "unterminated attribute value in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); @@ -753,7 +753,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { } if (peek() != '>') { throw css::uno::RuntimeException( - (rtl::OUString("missing '>' in ") + + (OUString("missing '>' in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -775,7 +775,7 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { XmlReader::Result XmlReader::handleEndTag() { if (elements_.empty()) { throw css::uno::RuntimeException( - (rtl::OUString("spurious end tag in ") + + (OUString("spurious end tag in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -785,7 +785,7 @@ XmlReader::Result XmlReader::handleEndTag() { !elements_.top().name.equals(nameBegin, pos_ - nameBegin)) { throw css::uno::RuntimeException( - (rtl::OUString("tag mismatch in ") + + (OUString("tag mismatch in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -793,7 +793,7 @@ XmlReader::Result XmlReader::handleEndTag() { skipSpace(); if (peek() != '>') { throw css::uno::RuntimeException( - (rtl::OUString("missing '>' in ") + + (OUString("missing '>' in ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -813,7 +813,7 @@ XmlReader::Result XmlReader::handleSkippedText(Span * data, int * nsId) { sal_Int32 i = rtl_str_indexOfChar_WithLength(pos_, end_ - pos_, '<'); if (i < 0) { throw css::uno::RuntimeException( - (rtl::OUString("premature end of ") + + (OUString("premature end of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); } @@ -844,7 +844,7 @@ XmlReader::Result XmlReader::handleRawText(Span * text) { switch (peek()) { case '\0': // i.e., EOF throw css::uno::RuntimeException( - (rtl::OUString("premature end of ") + + (OUString("premature end of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); case '\x0D': @@ -911,7 +911,7 @@ XmlReader::Result XmlReader::handleNormalizedText(Span * text) { switch (peek()) { case '\0': // i.e., EOF throw css::uno::RuntimeException( - (rtl::OUString("premature end of ") + + (OUString("premature end of ") + fileUrl_), css::uno::Reference< css::uno::XInterface >()); case '\x09': diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx index 9511030b0159..afb9a6d54422 100644 --- a/xmlscript/source/xml_helper/xml_element.cxx +++ b/xmlscript/source/xml_helper/xml_element.cxx @@ -23,7 +23,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; -using ::rtl::OUString; namespace xmlscript { diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 30b662836d1e..9f8d8814a538 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace xmlscript { diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index 7b855d893337..e9a27608165f 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -62,8 +62,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace xmlscript { diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index eccf7eaf1b5a..d756612f2c02 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -34,7 +34,6 @@ #include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace xmlscript { diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index 98fe378ab9a9..6a520ffa1626 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -57,7 +57,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; -using ::rtl::OUString; namespace xmlscript { @@ -876,7 +875,7 @@ bool ImportContext::importImageURLProperty( OUString const & rPropName, OUString const & rAttrName, Reference< xml::input::XAttributes > const & xAttributes ) { - rtl::OUString sURL = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, rAttrName ); + OUString sURL = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, rAttrName ); if ( !sURL.isEmpty() ) { Reference< document::XStorageBasedDocument > xDocStorage( _pImport->getDocOwner(), UNO_QUERY ); @@ -919,7 +918,7 @@ bool ImportContext::importImageURLProperty( } //__________________________________________________________________________________________________ bool ImportContext::importDataAwareProperty( - ::rtl::OUString const & rPropName, + OUString const & rPropName, Reference const & xAttributes ) { OUString sLinkedCell; @@ -1681,7 +1680,7 @@ ElementBase::~ElementBase() } #if OSL_DEBUG_LEVEL > 1 - ::rtl::OString aStr( ::rtl::OUStringToOString( + OString aStr( OUStringToOString( _aLocalName, RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "ElementBase::~ElementBase(): %s", aStr.getStr() ); #endif @@ -1795,7 +1794,7 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel( SAL_THROW( (Exception) ) { // single set of styles and stylenames apply to all containees - :: boost::shared_ptr< ::std::vector< ::rtl::OUString > > pStyleNames( new ::std::vector< ::rtl::OUString > ); + :: boost::shared_ptr< ::std::vector< OUString > > pStyleNames( new ::std::vector< OUString > ); :: boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > pStyles( new ::std::vector< css::uno::Reference< css::xml::input::XElement > > ); return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx index c20b53e23609..1b37365b7719 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx @@ -59,7 +59,7 @@ namespace xmlscript virtual ~XMLBasicExporterBase(); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -90,9 +90,9 @@ namespace xmlscript virtual ~XMLBasicExporter(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; @@ -109,9 +109,9 @@ namespace xmlscript virtual ~XMLOasisBasicExporter(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx index 5f16ea61204e..060a72d453ff 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx @@ -51,15 +51,15 @@ namespace xmlscript protected: BasicImport* m_pImport; BasicElementBase* m_pParent; - ::rtl::OUString m_aLocalName; + OUString m_aLocalName; ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes > m_xAttributes; - bool getBoolAttr( sal_Bool* pRet, const ::rtl::OUString& rAttrName, + bool getBoolAttr( sal_Bool* pRet, const OUString& rAttrName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, sal_Int32 nUid ); public: - BasicElementBase( const ::rtl::OUString& rLocalName, + BasicElementBase( const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport ); virtual ~BasicElementBase(); @@ -67,23 +67,23 @@ namespace xmlscript // XElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL getParent() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLocalName() + virtual OUString SAL_CALL getLocalName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getUid() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes > SAL_CALL getAttributes() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement( - sal_Int32 nUid, const ::rtl::OUString& rLocalName, + sal_Int32 nUid, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& rChars ) + virtual void SAL_CALL characters( const OUString& rChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL ignorableWhitespace( - const ::rtl::OUString& rWhitespaces ) + const OUString& rWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL processingInstruction( - const ::rtl::OUString& rTarget, const ::rtl::OUString& rData ) + const OUString& rTarget, const OUString& rData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endElement() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); @@ -100,14 +100,14 @@ namespace xmlscript ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 > m_xLibContainer; public: - BasicLibrariesElement( const ::rtl::OUString& rLocalName, + BasicLibrariesElement( const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 >& rxLibContainer ); // XElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement( - sal_Int32 nUid, const ::rtl::OUString& rLocalName, + sal_Int32 nUid, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endElement() @@ -124,19 +124,19 @@ namespace xmlscript private: ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 > m_xLibContainer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLib; - ::rtl::OUString m_aLibName; + OUString m_aLibName; bool m_bReadOnly; public: - BasicEmbeddedLibraryElement( const ::rtl::OUString& rLocalName, + BasicEmbeddedLibraryElement( const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer2 >& rxLibContainer, - const ::rtl::OUString& rLibName, bool bReadOnly ); + const OUString& rLibName, bool bReadOnly ); // XElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement( - sal_Int32 nUid, const ::rtl::OUString& rLocalName, + sal_Int32 nUid, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endElement() @@ -152,18 +152,18 @@ namespace xmlscript { private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLib; - ::rtl::OUString m_aName; + OUString m_aName; public: - BasicModuleElement( const ::rtl::OUString& rLocalName, + BasicModuleElement( const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxLib, - const ::rtl::OUString& rName ); + const OUString& rName ); // XElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement( - sal_Int32 nUid, const ::rtl::OUString& rLocalName, + sal_Int32 nUid, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endElement() @@ -179,18 +179,18 @@ namespace xmlscript { private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xLib; - ::rtl::OUString m_aName; - ::rtl::OUStringBuffer m_aBuffer; + OUString m_aName; + OUStringBuffer m_aBuffer; public: - BasicSourceCodeElement( const ::rtl::OUString& rLocalName, + BasicSourceCodeElement( const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxLib, - const ::rtl::OUString& rName ); + const OUString& rName ); // XElement - virtual void SAL_CALL characters( const ::rtl::OUString& rChars ) + virtual void SAL_CALL characters( const OUString& rChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endElement() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); @@ -228,13 +228,13 @@ namespace xmlscript virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL processingInstruction( - const ::rtl::OUString& rTarget, const ::rtl::OUString& rData ) + const OUString& rTarget, const OUString& rData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startRootElement( - sal_Int32 nUid, const ::rtl::OUString& rLocalName, + sal_Int32 nUid, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); }; @@ -263,7 +263,7 @@ namespace xmlscript virtual ~XMLBasicImporterBase(); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XImporter @@ -275,16 +275,16 @@ namespace xmlscript throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) + virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); @@ -303,9 +303,9 @@ namespace xmlscript virtual ~XMLBasicImporter(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; @@ -322,9 +322,9 @@ namespace xmlscript virtual ~XMLOasisBasicImporter(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/xmlscript/source/xmllib_imexp/xmllib_export.cxx b/xmlscript/source/xmllib_imexp/xmllib_export.cxx index 3d1e3dad2d36..5df774515f83 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_export.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_export.cxx @@ -24,7 +24,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star; -using ::rtl::OUString; namespace xmlscript { diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx index abf5f0ac3abf..cbdb625db17f 100644 --- a/xmlscript/source/xmlmod_imexp/imp_share.hxx +++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx @@ -91,7 +91,7 @@ protected: OUString _aLocalName; Reference< xml::input::XAttributes > _xAttributes; - ::rtl::OUStringBuffer _StrBuffer; + OUStringBuffer _StrBuffer; public: ModuleElement( diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx index 8708f9b795e1..f7c3c6124a63 100644 --- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx +++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx @@ -26,8 +26,8 @@ #include #include "com/sun/star/uno/Sequence.h" -rtl::OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial ); -::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( rtl::OUString serialNumber ); +OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial ); +::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( OUString serialNumber ); #endif diff --git a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx index ecf54af7ebb5..850bb6ab4f29 100644 --- a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx +++ b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx @@ -23,7 +23,7 @@ #include #include -rtl::OUString certificateValidityToOUString( ::sal_Int32 certValidity ) ; +OUString certificateValidityToOUString( ::sal_Int32 certValidity ) ; #endif diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index 26b6c036a61c..3ca9f757a601 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -113,13 +113,13 @@ private: //Checks if a particular stream is a valid xml stream. Those are treated differently //when they are signed (c14n transformation) - bool isXML(const ::rtl::OUString& rURI ); + bool isXML(const OUString& rURI ); bool canAddRemove(); public: DigitalSignaturesDialog( Window* pParent, cssu::Reference< cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode, - sal_Bool bReadOnly, const ::rtl::OUString& sODFVersion, bool bHasDocumentSignature); + sal_Bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature); ~DigitalSignaturesDialog(); // Initialize the dialog and the security environment, returns TRUE on success diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx index c4d6fb15cb43..35315c819d2b 100644 --- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx @@ -72,21 +72,21 @@ public: static SignatureStreamHelper OpenSignatureStream( const css::uno::Reference < css::embed::XStorage >& rxStore, sal_Int32 nOpenMode, DocumentSignatureMode eDocSigMode ); - static std::vector< rtl::OUString > CreateElementList( + static std::vector< OUString > CreateElementList( const css::uno::Reference < css::embed::XStorage >& rxStore, - const ::rtl::OUString rRootStorageName, DocumentSignatureMode eMode, + const OUString rRootStorageName, DocumentSignatureMode eMode, const DocumentSignatureAlgorithm mode); - static bool isODFPre_1_2(const ::rtl::OUString & sODFVersion); + static bool isODFPre_1_2(const OUString & sODFVersion); static bool isOOo3_2_Signature(const SignatureInformation & sigInfo); static DocumentSignatureAlgorithm getDocumentAlgorithm( - const ::rtl::OUString & sODFVersion, const SignatureInformation & sigInfo); - static bool checkIfAllFilesAreSigned( const ::std::vector< ::rtl::OUString > & sElementList, + const OUString & sODFVersion, const SignatureInformation & sigInfo); + static bool checkIfAllFilesAreSigned( const ::std::vector< OUString > & sElementList, const SignatureInformation & sigInfo, const DocumentSignatureAlgorithm alg); static bool equalsReferenceUriManifestPath( - const ::rtl::OUString & rUri, const ::rtl::OUString & rPath); - static ::rtl::OUString GetDocumentContentSignatureDefaultStreamName(); - static ::rtl::OUString GetScriptingContentSignatureDefaultStreamName(); - static ::rtl::OUString GetPackageSignatureDefaultStreamName(); + const OUString & rUri, const OUString & rPath); + static OUString GetDocumentContentSignatureDefaultStreamName(); + static OUString GetScriptingContentSignatureDefaultStreamName(); + static OUString GetPackageSignatureDefaultStreamName(); }; diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx index 657ba6b61c49..77ab5d85defd 100644 --- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx +++ b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx @@ -36,10 +36,10 @@ struct SignatureReferenceInformation { sal_Int32 nType; - rtl::OUString ouURI; - rtl::OUString ouDigestValue; + OUString ouURI; + OUString ouDigestValue; - SignatureReferenceInformation( sal_Int32 type, rtl::OUString uri ) + SignatureReferenceInformation( sal_Int32 type, OUString uri ) { nType = type; ouURI = uri; @@ -54,10 +54,10 @@ struct SignatureInformation sal_Int32 nSecurityEnvironmentIndex; ::com::sun::star::xml::crypto::SecurityOperationStatus nStatus; SignatureReferenceInformations vSignatureReferenceInfors; - rtl::OUString ouX509IssuerName; - rtl::OUString ouX509SerialNumber; - rtl::OUString ouX509Certificate; - rtl::OUString ouSignatureValue; + OUString ouX509IssuerName; + OUString ouX509SerialNumber; + OUString ouX509Certificate; + OUString ouSignatureValue; ::com::sun::star::util::DateTime stDateTime; //We also keep the date and time as string. This is done when this @@ -71,9 +71,9 @@ struct SignatureInformation //milli seconds (because the document was created by an application other than OOo) //and the converted time is written back, then the string looks different //and the signature is broken. - rtl::OUString ouDateTime; - rtl::OUString ouSignatureId; - rtl::OUString ouPropertyId; + OUString ouDateTime; + OUString ouSignatureId; + OUString ouPropertyId; SignatureInformation( sal_Int32 nId ) { diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx index 4e06d45d75e0..b9e85e781412 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx @@ -130,7 +130,7 @@ public: // Set the storage which should be used by the default UriBinding // Must be set before StatrtMission(). //sODFVersion indicates the ODF version - void SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage, ::rtl::OUString sODFVersion ); + void SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage, OUString sODFVersion ); // Argument for the Link is a uno::Reference< xml::sax::XAttributeList >* // Return 1 to verify, 0 to skip. @@ -166,12 +166,12 @@ public: for finding the certificate apparently use memcmp - hence they fail to find the certificate. */ - void SetX509Certificate(sal_Int32 nSecurityId, const rtl::OUString& ouX509IssuerName, - const rtl::OUString& ouX509SerialNumber, const rtl::OUString& ouX509Cert); + void SetX509Certificate(sal_Int32 nSecurityId, const OUString& ouX509IssuerName, + const OUString& ouX509SerialNumber, const OUString& ouX509Cert); void SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime ); - void AddForSigning( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& objectURL, sal_Bool bBinary ); + void AddForSigning( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, sal_Bool bBinary ); bool CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler ); bool ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream ); diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx index f223bfb4abcb..04ed64fd564e 100644 --- a/xmlsecurity/qa/certext/SanCertExt.cxx +++ b/xmlsecurity/qa/certext/SanCertExt.cxx @@ -56,7 +56,7 @@ namespace { uno::Reference< xml::crypto::XSecurityEnvironment > initUno(); void init(); - rtl::OString getB64CertFromFile(const char filename[]); + OString getB64CertFromFile(const char filename[]); test::OfficeConnection connection_; public: @@ -130,7 +130,7 @@ namespace { uno::Reference< lang::XMultiServiceFactory > factory(context->getServiceManager(), uno::UNO_QUERY_THROW); uno::Reference< xml::crypto::XSEInitializer > xSEInitializer = xml::crypto::SEInitializer::create(context); uno::Reference< xml::crypto::XXMLSecurityContext > xSecurityContext( - xSEInitializer->createSecurityContext(rtl::OUString())); + xSEInitializer->createSecurityContext(OUString())); return xSecurityContext->getSecurityEnvironment(); } @@ -138,14 +138,14 @@ namespace { void Test::init() { uno::Reference< xml::crypto::XSecurityEnvironment > xSecurityEnv = initUno(); - rtl::OString b64Cert(getB64CertFromFile("User_35_Root_11.crt")); + OString b64Cert(getB64CertFromFile("User_35_Root_11.crt")); uno::Reference< security::XCertificate > xCert = xSecurityEnv->createCertificateFromAscii( - rtl::OStringToOUString( b64Cert, RTL_TEXTENCODING_ASCII_US ) ); + OStringToOUString( b64Cert, RTL_TEXTENCODING_ASCII_US ) ); uno::Sequence< uno::Reference< security::XCertificateExtension > > extensions = xCert->getExtensions(); for (sal_Int32 i = 0 ; i < extensions.getLength(); i++) { uno::Reference< security::XCertificateExtension >element = extensions[i]; - rtl::OString aId ( (const sal_Char *)element->getExtensionId().getArray(), element->getExtensionId().getLength()); + OString aId ( (const sal_Char *)element->getExtensionId().getArray(), element->getExtensionId().getLength()); if (aId.equals(OID_SUBJECT_ALTERNATIVE_NAME)) { uno::Reference< security::XSanExtension > sanExtension ( element, uno::UNO_QUERY ); @@ -155,11 +155,11 @@ namespace { } } - rtl::OString Test::getB64CertFromFile(const char filename[]) + OString Test::getB64CertFromFile(const char filename[]) { ne_ssl_certificate* cert = ne_ssl_cert_read(filename); char* certExportB64 = ne_ssl_cert_export(cert); - rtl::OString certB64( certExportB64 ); + OString certB64( certExportB64 ); return certB64; } @@ -179,7 +179,7 @@ namespace { ::com::sun::star::beans::NamedValue otherNameProp; if (altNames[n].Value >>= otherNameProp) { - CPPUNIT_ASSERT_EQUAL( rtl::OUString::createFromAscii("1.2.3.4"), otherNameProp.Name); + CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("1.2.3.4"), otherNameProp.Name); uno::Sequence< sal_Int8 > ipAddress; otherNameProp.Value >>= ipAddress; CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT( ipAddress.getLength() > 0 ) ); @@ -194,9 +194,9 @@ namespace { { if (altNames[n].Type == security::ExtAltNameType_RFC822_NAME) { - rtl::OUString value; + OUString value; altNames[n].Value >>= value; - CPPUNIT_ASSERT_EQUAL( rtl::OUString::createFromAscii("my@other.address"), value); + CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("my@other.address"), value); } } } @@ -207,9 +207,9 @@ namespace { { if (altNames[n].Type == security::ExtAltNameType_DNS_NAME) { - rtl::OUString value; + OUString value; altNames[n].Value >>= value; - CPPUNIT_ASSERT_EQUAL( rtl::OUString::createFromAscii("alt.openoffice.org"), value); + CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("alt.openoffice.org"), value); } } } @@ -224,9 +224,9 @@ namespace { { if (altNames[n].Type == security::ExtAltNameType_URL) { - rtl::OUString value; + OUString value; altNames[n].Value >>= value; - CPPUNIT_ASSERT_EQUAL( rtl::OUString::createFromAscii("http://my.url.here/"), value); + CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("http://my.url.here/"), value); } } } @@ -251,9 +251,9 @@ namespace { { if (altNames[n].Type == security::ExtAltNameType_REGISTERED_ID) { - rtl::OUString value; + OUString value; altNames[n].Value >>= value; - CPPUNIT_ASSERT( rtl::OUString::createFromAscii("1.2.3.4").equals(value)); + CPPUNIT_ASSERT( OUString::createFromAscii("1.2.3.4").equals(value)); } } } diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx index 9ce0685e1cd9..7fc736b4bdf9 100644 --- a/xmlsecurity/source/component/certificatecontainer.cxx +++ b/xmlsecurity/source/component/certificatecontainer.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno; sal_Bool -CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, Map &_certMap ) +CertificateContainer::searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap ) { Map::iterator p = _certMap.find(url); @@ -44,7 +44,7 @@ CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUStr // ------------------------------------------------------------------- sal_Bool -CertificateContainer::isTemporaryCertificate ( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) +CertificateContainer::isTemporaryCertificate ( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException) { return searchMap( url, certificate_name, certMap); @@ -53,7 +53,7 @@ CertificateContainer::isTemporaryCertificate ( const ::rtl::OUString & url, cons // ------------------------------------------------------------------- sal_Bool -CertificateContainer::isCertificateTrust ( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) +CertificateContainer::isCertificateTrust ( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException) { return searchMap( url, certificate_name, certTrustMap); @@ -61,7 +61,7 @@ CertificateContainer::isCertificateTrust ( const ::rtl::OUString & url, const :: // ------------------------------------------------------------------- sal_Bool -CertificateContainer::addCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, ::sal_Bool trust ) +CertificateContainer::addCertificate( const OUString & url, const OUString & certificate_name, ::sal_Bool trust ) throw(::com::sun::star::uno::RuntimeException) { certMap.insert( Map::value_type( url, certificate_name ) ); @@ -75,7 +75,7 @@ CertificateContainer::addCertificate( const ::rtl::OUString & url, const ::rtl:: //------------------------------------------------------------------------- ::security::CertificateContainerStatus -CertificateContainer::hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException) +CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException) { if ( isTemporaryCertificate( url, certificate_name ) ) { @@ -90,7 +90,7 @@ CertificateContainer::hasCertificate( const ::rtl::OUString & url, const ::rtl:: } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL +OUString SAL_CALL CertificateContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { @@ -100,7 +100,7 @@ CertificateContainer::getImplementationName( ) //------------------------------------------------------------------------- sal_Bool SAL_CALL -CertificateContainer::supportsService( const ::rtl::OUString& ServiceName ) +CertificateContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { if ( ServiceName.compareToAscii("com.sun.star.security.CertificateContainer") == 0 ) @@ -111,7 +111,7 @@ CertificateContainer::supportsService( const ::rtl::OUString& ServiceName ) //------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL CertificateContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { @@ -120,22 +120,22 @@ CertificateContainer::getSupportedServiceNames( ) //------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL +Sequence< OUString > SAL_CALL CertificateContainer::impl_getStaticSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { - Sequence< ::rtl::OUString > aRet(1); - *aRet.getArray() = ::rtl::OUString("com.sun.star.security.CertificateContainer"); + Sequence< OUString > aRet(1); + *aRet.getArray() = OUString("com.sun.star.security.CertificateContainer"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL +OUString SAL_CALL CertificateContainer::impl_getStaticImplementationName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.security.CertificateContainer"); + return OUString("com.sun.star.security.CertificateContainer"); } //------------------------------------------------------------------------- diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx index 0bd92f617445..03b60863e387 100644 --- a/xmlsecurity/source/component/certificatecontainer.hxx +++ b/xmlsecurity/source/component/certificatecontainer.hxx @@ -42,38 +42,38 @@ using namespace ::com::sun::star::lang; class CertificateContainer : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::security::XCertificateContainer > { private: - typedef std::map< ::rtl::OUString, ::rtl::OUString > Map; + typedef std::map< OUString, OUString > Map; Map certMap; Map certTrustMap; - ::sal_Bool SAL_CALL searchMap( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, Map &_certMap ); - virtual ::sal_Bool SAL_CALL isTemporaryCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isCertificateTrust( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap ); + virtual ::sal_Bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException); public: CertificateContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) {}; virtual ~CertificateContainer(){}; - virtual ::sal_Bool SAL_CALL addCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, ::sal_Bool trust ) throw(::com::sun::star::uno::RuntimeException); - virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, ::sal_Bool trust ) throw(::com::sun::star::uno::RuntimeException); + virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException); // provide factory - static ::rtl::OUString SAL_CALL + static OUString SAL_CALL impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 542518917fbc..4d366f42518b 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -118,7 +118,7 @@ void DocumentDigitalSignatures::showDocumentContentSignatures( ImplViewSignatures( rxStorage, xSignInStream, SignatureModeDocumentContent, true ); } -::rtl::OUString DocumentDigitalSignatures::getDocumentContentSignatureDefaultStreamName() +OUString DocumentDigitalSignatures::getDocumentContentSignatureDefaultStreamName() throw (css::uno::RuntimeException) { return DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName(); @@ -150,7 +150,7 @@ void DocumentDigitalSignatures::showScriptingContentSignatures( ImplViewSignatures( rxStorage, xSignInStream, SignatureModeMacros, true ); } -::rtl::OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamName() +OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamName() throw (css::uno::RuntimeException) { return DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName(); @@ -182,7 +182,7 @@ void DocumentDigitalSignatures::showPackageSignatures( ImplViewSignatures( rxStorage, xSignInStream, SignatureModePackage, true ); } -::rtl::OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName( ) +OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException) { return DocumentSignatureHelper::GetPackageSignatureDefaultStreamName(); @@ -294,9 +294,9 @@ DocumentDigitalSignatures::ImplVerifySignatures( { DocumentSignatureAlgorithm mode = DocumentSignatureHelper::getDocumentAlgorithm( m_sODFVersion, aSignInfos[n]); - const std::vector< rtl::OUString > aElementsToBeVerified = + const std::vector< OUString > aElementsToBeVerified = DocumentSignatureHelper::CreateElementList( - rxStorage, ::rtl::OUString(), eMode, mode); + rxStorage, OUString(), eMode, mode); const SignatureInformation& rInfo = aSignInfos[n]; css::security::DocumentSignatureInformation& rSigInfo = arInfos[n]; @@ -398,7 +398,7 @@ void DocumentDigitalSignatures::showCertificate( Reference xSerialNumberAdapter = ::com::sun::star::security::SerialNumberAdapter::create(mxCtx); - ::rtl::OUString sSerialNum = xSerialNumberAdapter->toString( Author->getSerialNumber() ); + OUString sSerialNum = xSerialNumberAdapter->toString( Author->getSerialNumber() ); Sequence< SvtSecurityOptions::Certificate > aTrustedAuthors = SvtSecurityOptions().GetTrustedAuthors(); const SvtSecurityOptions::Certificate* pAuthors = aTrustedAuthors.getConstArray(); @@ -438,15 +438,15 @@ Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertif } -::sal_Bool DocumentDigitalSignatures::isLocationTrusted( const ::rtl::OUString& Location ) throw (RuntimeException) +::sal_Bool DocumentDigitalSignatures::isLocationTrusted( const OUString& Location ) throw (RuntimeException) { sal_Bool bFound = sal_False; INetURLObject aLocObj( Location ); INetURLObject aLocObjLowCase( Location.toAsciiLowerCase() ); // will be used for case insensitive comparing - Sequence< ::rtl::OUString > aSecURLs = SvtSecurityOptions().GetSecureURLs(); - const ::rtl::OUString* pSecURLs = aSecURLs.getConstArray(); - const ::rtl::OUString* pSecURLsEnd = pSecURLs + aSecURLs.getLength(); + Sequence< OUString > aSecURLs = SvtSecurityOptions().GetSecureURLs(); + const OUString* pSecURLs = aSecURLs.getConstArray(); + const OUString* pSecURLsEnd = pSecURLs + aSecURLs.getLength(); for ( ; pSecURLs != pSecURLsEnd && !bFound; ++pSecURLs ) bFound = ::utl::UCBContentHelper::IsSubPath( *pSecURLs, Location ); @@ -465,7 +465,7 @@ void DocumentDigitalSignatures::addAuthorToTrustedSources( aNewCert[ 0 ] = Author->getIssuerName(); aNewCert[ 1 ] = xSerialNumberAdapter->toString( Author->getSerialNumber() ); - rtl::OUStringBuffer aStrBuffer; + OUStringBuffer aStrBuffer; ::sax::Converter::encodeBase64(aStrBuffer, Author->getEncoded()); aNewCert[ 2 ] = aStrBuffer.makeStringAndClear(); @@ -478,11 +478,11 @@ void DocumentDigitalSignatures::addAuthorToTrustedSources( aSecOpts.SetTrustedAuthors( aTrustedAuthors ); } -void DocumentDigitalSignatures::addLocationToTrustedSources( const ::rtl::OUString& Location ) throw (RuntimeException) +void DocumentDigitalSignatures::addLocationToTrustedSources( const OUString& Location ) throw (RuntimeException) { SvtSecurityOptions aSecOpt; - Sequence< ::rtl::OUString > aSecURLs = aSecOpt.GetSecureURLs(); + Sequence< OUString > aSecURLs = aSecOpt.GetSecureURLs(); sal_Int32 nCnt = aSecURLs.getLength(); aSecURLs.realloc( nCnt + 1 ); aSecURLs[ nCnt ] = Location; @@ -490,16 +490,16 @@ void DocumentDigitalSignatures::addLocationToTrustedSources( const ::rtl::OUStri aSecOpt.SetSecureURLs( aSecURLs ); } -rtl::OUString DocumentDigitalSignatures::GetImplementationName() throw (RuntimeException) +OUString DocumentDigitalSignatures::GetImplementationName() throw (RuntimeException) { - return rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" ); + return OUString( "com.sun.star.security.DocumentDigitalSignatures" ); } -Sequence< rtl::OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (css::uno::RuntimeException) +Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (css::uno::RuntimeException) { - Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" ); + Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString( "com.sun.star.security.DocumentDigitalSignatures" ); return aRet; } diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx index 141bc911ca1d..a9f07d6f50b0 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.hxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx @@ -44,7 +44,7 @@ class DocumentDigitalSignatures : public cppu::WeakImplHelper2 private: com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxCtx; // will be set by XInitialization. If not we assume true. false means an earlier version. - ::rtl::OUString m_sODFVersion; + OUString m_sODFVersion; //The number of arguments which were passed in XInitialization::initialize int m_nArgumentsCount; //Indicates if the document already contains a document signature @@ -58,8 +58,8 @@ public: DocumentDigitalSignatures( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext>& rxCtx ); // for service registration... - static ::rtl::OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence < ::rtl::OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + static OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence < OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); //XInitialization void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) @@ -69,21 +69,21 @@ public: ::sal_Bool SAL_CALL signDocumentContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); void SAL_CALL showDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getDocumentContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getDocumentContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL signScriptingContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); void SAL_CALL showScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getScriptingContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getScriptingContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL signPackage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); void SAL_CALL showPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString SAL_CALL getPackageSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getPackageSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException); void SAL_CALL showCertificate( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Certificate ) throw (::com::sun::star::uno::RuntimeException); void SAL_CALL manageTrustedSources( ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL isAuthorTrusted( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL isLocationTrusted( const ::rtl::OUString& Location ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException); void SAL_CALL addAuthorToTrustedSources( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addLocationToTrustedSources( const ::rtl::OUString& Location ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL addLocationToTrustedSources( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL chooseCertificate( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index 3fc1011615fe..82ccbec2924f 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -36,14 +36,14 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_ uno::Reference< XInterface > xFactory; //Decryptor - rtl::OUString implName = rtl::OUString::createFromAscii( pImplName ); + OUString implName = OUString::createFromAscii( pImplName ); if ( pServiceManager && implName.equals( DocumentDigitalSignatures::GetImplementationName() ) ) { // DocumentDigitalSignatures xFactory = cppu::createSingleComponentFactory( DocumentDigitalSignatures_CreateInstance, - rtl::OUString::createFromAscii( pImplName ), + OUString::createFromAscii( pImplName ), DocumentDigitalSignatures::GetSupportedServiceNames() ); } else if ( pServiceManager && implName.equals( CertificateContainer::impl_getStaticImplementationName() )) @@ -51,7 +51,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_ // CertificateContainer xFactory = cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ), - rtl::OUString::createFromAscii( pImplName ), + OUString::createFromAscii( pImplName ), CertificateContainer::impl_createInstance, CertificateContainer::impl_getStaticSupportedServiceNames() ); } diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index f57ab567afce..28613293f4b2 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -141,7 +141,7 @@ void CertificateChooser::ImplInitialize() // Do we already use that? if( nCertificatesToIgnore ) { - rtl::OUString aIssuerName = xCert->getIssuerName(); + OUString aIssuerName = xCert->getIssuerName(); for( sal_Int32 nSig = 0; nSig < nCertificatesToIgnore; ++nSig ) { const SignatureInformation& rInf = maCertsToIgnore[ nSig ]; diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 3703542c7cf3..36461fe48922 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -266,7 +266,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif OUString aLBEntry; OUString aDetails; // Certificate Versions are reported wrong (#i35107#) - 0 == "V1", 1 == "V2", ..., n = "V(n+1)" - aLBEntry = rtl::OUString( "V" ); + aLBEntry = OUString( "V" ); aLBEntry += OUString::valueOf( sal_Int32( xCert->getVersion() + 1 ) ); InsertElement( XMLSEC_RES( STR_VERSION ), aLBEntry, aLBEntry ); Sequence< sal_Int8 > aSeq = xCert->getSerialNumber(); @@ -274,7 +274,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif aDetails = XmlSec::GetHexString( aSeq, pHexSep, nLineBreak ); InsertElement( XMLSEC_RES( STR_SERIALNUM ), aLBEntry, aDetails, true ); - std::pair< ::rtl::OUString, ::rtl::OUString> pairIssuer = + std::pair< OUString, OUString> pairIssuer = XmlSec::GetDNForCertDetailsView(xCert->getIssuerName()); aLBEntry = pairIssuer.first; aDetails = pairIssuer.second; @@ -283,16 +283,16 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif DateTime aDateTime( DateTime::EMPTY ); utl::typeConvert( xCert->getNotValidBefore(), aDateTime ); aLBEntry = GetSettings().GetUILocaleDataWrapper().getDate( aDateTime.GetDate() ); - aLBEntry += rtl::OUString( " " ); + aLBEntry += OUString( " " ); aLBEntry += GetSettings().GetUILocaleDataWrapper().getTime( aDateTime.GetTime() ); InsertElement( XMLSEC_RES( STR_VALIDFROM ), aLBEntry, aLBEntry ); utl::typeConvert( xCert->getNotValidAfter(), aDateTime ); aLBEntry = GetSettings().GetUILocaleDataWrapper().getDate( aDateTime.GetDate() ); - aLBEntry += rtl::OUString( " " ); + aLBEntry += OUString( " " ); aLBEntry += GetSettings().GetUILocaleDataWrapper().getTime( aDateTime.GetTime() ); InsertElement( XMLSEC_RES( STR_VALIDTO ), aLBEntry, aLBEntry ); - std::pair< ::rtl::OUString, ::rtl::OUString > pairSubject = + std::pair< OUString, OUString > pairSubject = XmlSec::GetDNForCertDetailsView(xCert->getSubjectName()); aLBEntry = pairSubject.first; aDetails = pairSubject.second; diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 58c5e8b7e2b4..1d43341e2025 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -75,7 +75,7 @@ namespace sal_Int16 m_nODF; public: virtual void Commit(); - virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); SaveODFItem(); //See group ODF in Common.xcs bool isLessODF1_2() @@ -85,9 +85,9 @@ namespace }; void SaveODFItem::Commit() {} -void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} +void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} - SaveODFItem::SaveODFItem(): utl::ConfigItem(::rtl::OUString( + SaveODFItem::SaveODFItem(): utl::ConfigItem(OUString( "Office.Common/Save")), m_nODF(0) { OUString sDef("ODF/DefaultVersion"); @@ -115,7 +115,7 @@ void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString > The parameter is an encoded uri. However, the manifest contains paths. Therefore the path is encoded as uri, so they can be compared. */ -bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI ) +bool DigitalSignaturesDialog::isXML(const OUString& rURI ) { OSL_ASSERT(mxStore.is()); @@ -171,7 +171,7 @@ bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI ) DigitalSignaturesDialog::DigitalSignaturesDialog( Window* pParent, uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode, - sal_Bool bReadOnly, const ::rtl::OUString& sODFVersion, bool bHasDocumentSignature) + sal_Bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature) : ModalDialog(pParent, "DigitalSignaturesDialog", "xmlsec/ui/digitalsignaturesdialog.ui") , mxCtx(rxCtx) , maSignatureHelper(rxCtx) @@ -428,7 +428,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl) SAL_WARN( "xmlsecurity.dialogs", "no certificate selected" ); return -1; } - rtl::OUString aCertSerial = xSerialNumberAdapter->toString( xCert->getSerialNumber() ); + OUString aCertSerial = xSerialNumberAdapter->toString( xCert->getSerialNumber() ); if ( aCertSerial.isEmpty() ) { OSL_FAIL( "Error in Certificate, problem with serial number!" ); @@ -439,16 +439,16 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl) sal_Int32 nSecurityId = maSignatureHelper.GetNewSecurityId(); - rtl::OUStringBuffer aStrBuffer; + OUStringBuffer aStrBuffer; ::sax::Converter::encodeBase64(aStrBuffer, xCert->getEncoded()); maSignatureHelper.SetX509Certificate( nSecurityId, xCert->getIssuerName(), aCertSerial, aStrBuffer.makeStringAndClear()); - std::vector< rtl::OUString > aElements = + std::vector< OUString > aElements = DocumentSignatureHelper::CreateElementList( - mxStore, rtl::OUString(), meSignatureMode, OOo3_2Document); + mxStore, OUString(), meSignatureMode, OOo3_2Document); sal_Int32 nElements = aElements.size(); for ( sal_Int32 n = 0; n < nElements; n++ ) @@ -585,9 +585,9 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() { DocumentSignatureAlgorithm mode = DocumentSignatureHelper::getDocumentAlgorithm( m_sODFVersion, maCurrentSignatureInformations[n]); - std::vector< rtl::OUString > aElementsToBeVerified = + std::vector< OUString > aElementsToBeVerified = DocumentSignatureHelper::CreateElementList( - mxStore, ::rtl::OUString(), meSignatureMode, mode); + mxStore, OUString(), meSignatureMode, mode); const SignatureInformation& rInfo = maCurrentSignatureInformations[n]; //First we try to get the certificate which is embedded in the XML Signature diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index ab8cd6d5ec02..73d483f45347 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -240,12 +240,12 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl) if( ui::dialogs::ExecutableDialogResults::OK != nRet ) return 0; - rtl::OUString aPathStr = xFolderPicker->getDirectory(); + OUString aPathStr = xFolderPicker->getDirectory(); INetURLObject aNewObj( aPathStr ); aNewObj.removeFinalSlash(); // then the new path also an URL else system path - ::rtl::OUString aSystemFileURL = ( aNewObj.GetProtocol() != INET_PROT_NOT_VALID ) ? + OUString aSystemFileURL = ( aNewObj.GetProtocol() != INET_PROT_NOT_VALID ) ? aPathStr : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT ); OUString aNewPathStr(aSystemFileURL); @@ -311,7 +311,7 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void ) { for( sal_uInt32 nEntry = 0 ; nEntry < nEntries ; ++nEntry ) { - css::uno::Sequence< ::rtl::OUString >& rEntry = maTrustedAuthors[ nEntry ]; + css::uno::Sequence< OUString >& rEntry = maTrustedAuthors[ nEntry ]; uno::Reference< css::security::XCertificate > xCert; // create from RawData @@ -384,7 +384,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, M FillCertLB(); - css::uno::Sequence< rtl::OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs(); + css::uno::Sequence< OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs(); mbURLsReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_SECUREURLS ); m_pTrustFileROFI->Show( mbURLsReadonly ); m_pTrustFileLocLB->Enable( !mbURLsReadonly ); @@ -393,7 +393,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, M sal_Int32 nEntryCnt = aSecureURLs.getLength(); for( sal_Int32 i = 0 ; i < nEntryCnt ; ++i ) { - ::rtl::OUString aSystemFileURL( aSecureURLs[ i ] ); + OUString aSystemFileURL( aSecureURLs[ i ] ); osl::FileBase::getSystemPathFromFileURL( aSystemFileURL, aSystemFileURL ); m_pTrustFileLocLB->InsertEntry( aSystemFileURL ); } @@ -415,10 +415,10 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void ) sal_uInt16 nEntryCnt = m_pTrustFileLocLB->GetEntryCount(); if( nEntryCnt ) { - css::uno::Sequence< rtl::OUString > aSecureURLs( nEntryCnt ); + css::uno::Sequence< OUString > aSecureURLs( nEntryCnt ); for( sal_uInt16 i = 0 ; i < nEntryCnt ; ++i ) { - ::rtl::OUString aURL( m_pTrustFileLocLB->GetEntry( i ) ); + OUString aURL( m_pTrustFileLocLB->GetEntry( i ) ); osl::FileBase::getFileURLFromSystemPath( aURL, aURL ); aSecureURLs[ i ] = aURL; } @@ -428,7 +428,7 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void ) // Trusted Path could not be removed (#i33584#) // don't forget to remove the old saved SecureURLs else - mpDlg->maSecOptions.SetSecureURLs( css::uno::Sequence< rtl::OUString >() ); + mpDlg->maSecOptions.SetSecureURLs( css::uno::Sequence< OUString >() ); mpDlg->maSecOptions.SetTrustedAuthors( maTrustedAuthors ); } diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index 817ec2be3712..defcae055dd0 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -84,7 +84,7 @@ namespace XmlSec pair< OUString, OUString> GetDNForCertDetailsView( const OUString & rRawString) { vector< pair< OUString, OUString > > vecAttrValueOfDN = parseDN(rRawString); - ::rtl::OUStringBuffer s1, s2; + OUStringBuffer s1, s2; OUString sEqual(" = "); typedef vector< pair < OUString, OUString > >::const_iterator CIT; for (CIT i = vecAttrValueOfDN.begin(); i < vecAttrValueOfDN.end(); ++i) @@ -117,7 +117,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) bool bInType = true; sal_Int32 nTypeNameStart = 0; OUString sType; - ::rtl::OUStringBuffer sbufValue; + OUStringBuffer sbufValue; sal_Int32 length = rRawString.getLength(); for (sal_Int32 i = 0; i < length; i++) @@ -203,7 +203,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) bool bInType = true; sal_Int32 nTypeNameStart = 0; OUString sType; - ::rtl::OUStringBuffer sbufValue; + OUStringBuffer sbufValue; sal_Int32 length = rRawString.getLength(); for (sal_Int32 i = 0; i < length; i++) diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx index d23c656872a9..2e10b880b2ce 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.hxx +++ b/xmlsecurity/source/dialogs/resourcemanager.hxx @@ -41,10 +41,10 @@ namespace XmlSec OUString GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT ); OUString GetDateString( const ::com::sun::star::util::DateTime& _rDT ); - std::vector< std::pair< ::rtl::OUString, ::rtl::OUString> > - parseDN(const ::rtl::OUString& rRawString); - std::pair< ::rtl::OUString, ::rtl::OUString> GetDNForCertDetailsView( - const ::rtl::OUString & rRawString); + std::vector< std::pair< OUString, OUString> > + parseDN(const OUString& rRawString); + std::pair< OUString, OUString> GetDNForCertDetailsView( + const OUString & rRawString); OUString GetContentPart( const OUString& _rRawString ); OUString GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", sal_uInt16 _nLineBreak = 0xFFFF ); diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx index 974ddb9ddce7..eabf2a684aa1 100644 --- a/xmlsecurity/source/framework/buffernode.cxx +++ b/xmlsecurity/source/framework/buffernode.cxx @@ -223,7 +223,7 @@ void BufferNode::setBlocker(const ElementMark* pBlocker) } } -rtl::OUString BufferNode::printChildren() const +OUString BufferNode::printChildren() const /****** BufferNode/printChildren ********************************************* * * NAME @@ -246,39 +246,39 @@ rtl::OUString BufferNode::printChildren() const * Email: michael.mi@sun.com ******************************************************************************/ { - rtl::OUString rc; + OUString rc; std::vector< const ElementCollector* >::const_iterator ii = m_vElementCollectors.begin(); for( ; ii != m_vElementCollectors.end() ; ++ii ) { - rc += rtl::OUString( "BufID=" ); - rc += rtl::OUString::valueOf((*ii)->getBufferId()); + rc += OUString( "BufID=" ); + rc += OUString::valueOf((*ii)->getBufferId()); if (((ElementCollector*)(*ii))->getModify()) { - rc += rtl::OUString( "[M]" ); + rc += OUString( "[M]" ); } - rc += rtl::OUString( ",Pri=" ); + rc += OUString( ",Pri=" ); switch (((ElementCollector*)(*ii))->getPriority()) { case cssxc::sax::ElementMarkPriority_BEFOREMODIFY: - rc += rtl::OUString( "BEFOREMODIFY" ); + rc += OUString( "BEFOREMODIFY" ); break; case cssxc::sax::ElementMarkPriority_AFTERMODIFY: - rc += rtl::OUString( "AFTERMODIFY" ); + rc += OUString( "AFTERMODIFY" ); break; default: - rc += rtl::OUString( "UNKNOWN" ); + rc += OUString( "UNKNOWN" ); break; } - rc += rtl::OUString( "(" ); - rc += rtl::OUString( "SecID=" ); - rc += rtl::OUString::valueOf(((ElementCollector*)(*ii))->getSecurityId()); - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )); - rc += rtl::OUString( " " ); + rc += OUString( "(" ); + rc += OUString( "SecID=" ); + rc += OUString::valueOf(((ElementCollector*)(*ii))->getSecurityId()); + rc += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )); + rc += OUString( " " ); } return rc; diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx index fb68f036b0e9..8685d7f6282a 100644 --- a/xmlsecurity/source/framework/buffernode.hxx +++ b/xmlsecurity/source/framework/buffernode.hxx @@ -93,7 +93,7 @@ public: void removeElementCollector(const ElementCollector* pElementCollector); ElementMark* getBlocker() const; void setBlocker(const ElementMark* pBlocker); - rtl::OUString printChildren() const; + OUString printChildren() const; bool hasAnything() const; bool hasChildren() const; std::vector< const BufferNode* >* getChildren() const; diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx index 35d032b15bd8..512c9c79bffa 100644 --- a/xmlsecurity/source/framework/decryptorimpl.cxx +++ b/xmlsecurity/source/framework/decryptorimpl.cxx @@ -165,7 +165,7 @@ void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg { OSL_ASSERT(aArguments.getLength() == 5); - rtl::OUString ouTempString; + OUString ouTempString; aArguments[0] >>= ouTempString; m_nSecurityId = ouTempString.toInt32(); @@ -176,24 +176,24 @@ void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg aArguments[4] >>= m_xXMLEncryption; } -rtl::OUString DecryptorImpl_getImplementationName () +OUString DecryptorImpl_getImplementationName () throw (cssu::RuntimeException) { - return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } -sal_Bool SAL_CALL DecryptorImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL DecryptorImpl_supportsService( const OUString& ServiceName ) throw (cssu::RuntimeException) { return ServiceName == SERVICE_NAME; } -cssu::Sequence< rtl::OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ) throw (cssu::RuntimeException) { - cssu::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + cssu::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); return aRet; } #undef SERVICE_NAME @@ -205,17 +205,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const } /* XServiceInfo */ -rtl::OUString SAL_CALL DecryptorImpl::getImplementationName( ) +OUString SAL_CALL DecryptorImpl::getImplementationName( ) throw (cssu::RuntimeException) { return DecryptorImpl_getImplementationName(); } -sal_Bool SAL_CALL DecryptorImpl::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL DecryptorImpl::supportsService( const OUString& rServiceName ) throw (cssu::RuntimeException) { return DecryptorImpl_supportsService( rServiceName ); } -cssu::Sequence< rtl::OUString > SAL_CALL DecryptorImpl::getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL DecryptorImpl::getSupportedServiceNames( ) throw (cssu::RuntimeException) { return DecryptorImpl_getSupportedServiceNames(); diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx index 04c9bd030ecd..1a9b110a7fae 100644 --- a/xmlsecurity/source/framework/decryptorimpl.hxx +++ b/xmlsecurity/source/framework/decryptorimpl.hxx @@ -85,21 +85,21 @@ public: throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); /* XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (com::sun::star::uno::RuntimeException); }; -rtl::OUString DecryptorImpl_getImplementationName() +OUString DecryptorImpl_getImplementationName() throw ( com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL DecryptorImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL DecryptorImpl_supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ) +com::sun::star::uno::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ) throw ( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx index 7565fc8894fa..00d10dedc901 100644 --- a/xmlsecurity/source/framework/encryptionengine.cxx +++ b/xmlsecurity/source/framework/encryptionengine.cxx @@ -112,7 +112,7 @@ void EncryptionEngine::tryToPerform( ) { if (checkReady()) { - const rtl::OUString sEncryptionTemplate ( + const OUString sEncryptionTemplate ( RTL_CONSTASCII_USTRINGPARAM( ENCRYPTION_TEMPLATE ) ); cssu::Reference < cssxc::XXMLEncryptionTemplate > xEncryptionTemplate( mxMSF->createInstance( sEncryptionTemplate ), cssu::UNO_QUERY ); diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx index 8d1f3e899181..a83281fa3da2 100644 --- a/xmlsecurity/source/framework/encryptorimpl.cxx +++ b/xmlsecurity/source/framework/encryptorimpl.cxx @@ -199,7 +199,7 @@ void SAL_CALL EncryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg { OSL_ASSERT(aArguments.getLength() == 5); - rtl::OUString ouTempString; + OUString ouTempString; aArguments[0] >>= ouTempString; m_nSecurityId = ouTempString.toInt32(); @@ -211,24 +211,24 @@ void SAL_CALL EncryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg } -rtl::OUString EncryptorImpl_getImplementationName () +OUString EncryptorImpl_getImplementationName () throw (cssu::RuntimeException) { - return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } -sal_Bool SAL_CALL EncryptorImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL EncryptorImpl_supportsService( const OUString& ServiceName ) throw (cssu::RuntimeException) { return ServiceName == SERVICE_NAME; } -cssu::Sequence< rtl::OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) throw (cssu::RuntimeException) { - cssu::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + cssu::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); return aRet; } #undef SERVICE_NAME @@ -241,17 +241,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL EncryptorImpl_createInstance( } /* XServiceInfo */ -rtl::OUString SAL_CALL EncryptorImpl::getImplementationName( ) +OUString SAL_CALL EncryptorImpl::getImplementationName( ) throw (cssu::RuntimeException) { return EncryptorImpl_getImplementationName(); } -sal_Bool SAL_CALL EncryptorImpl::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL EncryptorImpl::supportsService( const OUString& rServiceName ) throw (cssu::RuntimeException) { return EncryptorImpl_supportsService( rServiceName ); } -cssu::Sequence< rtl::OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames( ) throw (cssu::RuntimeException) { return EncryptorImpl_getSupportedServiceNames(); diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx index 0aaedd48b5a2..572dc61f2f18 100644 --- a/xmlsecurity/source/framework/encryptorimpl.hxx +++ b/xmlsecurity/source/framework/encryptorimpl.hxx @@ -99,21 +99,21 @@ public: throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); /* XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (com::sun::star::uno::RuntimeException); }; -rtl::OUString EncryptorImpl_getImplementationName() +OUString EncryptorImpl_getImplementationName() throw ( com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL EncryptorImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL EncryptorImpl_supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) +com::sun::star::uno::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) throw ( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index d0d42fae4e1e..e5da48beafba 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -310,7 +310,7 @@ void SAXEventKeeperImpl::removeElementMarkBuffer(sal_Int32 nId) } } -rtl::OUString SAXEventKeeperImpl::printBufferNode( +OUString SAXEventKeeperImpl::printBufferNode( BufferNode* pBufferNode, sal_Int32 nIndent) const /****** SAXEventKeeperImpl/printBufferNode *********************************** * @@ -344,48 +344,48 @@ rtl::OUString SAXEventKeeperImpl::printBufferNode( * Email: michael.mi@sun.com ******************************************************************************/ { - rtl::OUString rc; + OUString rc; for ( int i=0; igetNodeName(pBufferNode->getXMLElement()); BufferNode* pParent = (BufferNode*)pBufferNode->getParent(); if (pParent != NULL) { - rc += rtl::OUString( "[" ); + rc += OUString( "[" ); rc += m_xXMLDocument->getNodeName(pParent->getXMLElement()); - rc += rtl::OUString( "]" ); + rc += OUString( "]" ); } - rc += rtl::OUString( ":EC=" ); + rc += OUString( ":EC=" ); rc += pBufferNode->printChildren(); - rc += rtl::OUString( " BR=" ); + rc += OUString( " BR=" ); ElementMark * pBlocker = pBufferNode->getBlocker(); if (pBlocker != NULL) { - rc += rtl::OUString::valueOf( pBlocker->getBufferId() ); - rc += rtl::OUString( "(SecId=" ); - rc += rtl::OUString::valueOf( pBlocker->getSecurityId() ); - rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )); - rc += rtl::OUString( " " ); + rc += OUString::valueOf( pBlocker->getBufferId() ); + rc += OUString( "(SecId=" ); + rc += OUString::valueOf( pBlocker->getSecurityId() ); + rc += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )); + rc += OUString( " " ); } - rc += rtl::OUString( "\n" ); + rc += OUString( "\n" ); std::vector< const BufferNode* >* vChildren = pBufferNode->getChildren(); std::vector< const BufferNode* >::const_iterator jj = vChildren->begin(); @@ -1051,16 +1051,16 @@ cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextH return xOldHandler; } -rtl::OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree() +OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree() throw (cssu::RuntimeException) { - rtl::OUString rc; + OUString rc; - rc += rtl::OUString( "ElementMarkBuffers: size = " ); - rc += rtl::OUString::valueOf((sal_Int32)m_vElementMarkBuffers.size()); - rc += rtl::OUString( "\nCurrentBufferNode: " ); + rc += OUString( "ElementMarkBuffers: size = " ); + rc += OUString::valueOf((sal_Int32)m_vElementMarkBuffers.size()); + rc += OUString( "\nCurrentBufferNode: " ); rc += m_xXMLDocument->getNodeName(m_pCurrentBufferNode->getXMLElement()); - rc += rtl::OUString( "\n" ); + rc += OUString( "\n" ); rc += printBufferNode(m_pRootBufferNode, 0); return rc; @@ -1191,7 +1191,7 @@ void SAL_CALL SAXEventKeeperImpl::endDocument( ) } void SAL_CALL SAXEventKeeperImpl::startElement( - const rtl::OUString& aName, + const OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs ) throw (cssxs::SAXException, cssu::RuntimeException) { @@ -1236,7 +1236,7 @@ void SAL_CALL SAXEventKeeperImpl::startElement( } } -void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName ) +void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName ) throw (cssxs::SAXException, cssu::RuntimeException) { sal_Bool bIsCurrent = m_xXMLDocument->isCurrent(m_pCurrentBufferNode->getXMLElement()); @@ -1293,7 +1293,7 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName ) } } -void SAL_CALL SAXEventKeeperImpl::characters( const rtl::OUString& aChars ) +void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars ) throw (cssxs::SAXException, cssu::RuntimeException) { if (!m_bIsForwarding) @@ -1315,14 +1315,14 @@ void SAL_CALL SAXEventKeeperImpl::characters( const rtl::OUString& aChars ) } } -void SAL_CALL SAXEventKeeperImpl::ignorableWhitespace( const rtl::OUString& aWhitespaces ) +void SAL_CALL SAXEventKeeperImpl::ignorableWhitespace( const OUString& aWhitespaces ) throw (cssxs::SAXException, cssu::RuntimeException) { characters( aWhitespaces ); } void SAL_CALL SAXEventKeeperImpl::processingInstruction( - const rtl::OUString& aTarget, const rtl::OUString& aData ) + const OUString& aTarget, const OUString& aData ) throw (cssxs::SAXException, cssu::RuntimeException) { if (!m_bIsForwarding) @@ -1365,24 +1365,24 @@ void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& m_pCurrentBufferNode = m_pRootBufferNode; } -rtl::OUString SAXEventKeeperImpl_getImplementationName () +OUString SAXEventKeeperImpl_getImplementationName () throw (cssu::RuntimeException) { - return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } -sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const OUString& ServiceName ) throw (cssu::RuntimeException) { return ServiceName == SERVICE_NAME; } -cssu::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( ) throw (cssu::RuntimeException) { - cssu::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + cssu::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); return aRet; } #undef SERVICE_NAME @@ -1395,17 +1395,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance( } /* XServiceInfo */ -rtl::OUString SAL_CALL SAXEventKeeperImpl::getImplementationName( ) +OUString SAL_CALL SAXEventKeeperImpl::getImplementationName( ) throw (cssu::RuntimeException) { return SAXEventKeeperImpl_getImplementationName(); } -sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const OUString& rServiceName ) throw (cssu::RuntimeException) { return SAXEventKeeperImpl_supportsService( rServiceName ); } -cssu::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames( ) throw (cssu::RuntimeException) { return SAXEventKeeperImpl_getSupportedServiceNames(); diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx index df0ac8b54f6e..deb5e062dc14 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx @@ -192,7 +192,7 @@ private: void removeElementMarkBuffer(sal_Int32 nId); - rtl::OUString printBufferNode( + OUString printBufferNode( BufferNode* pBufferNode, sal_Int32 nIndent) const; com::sun::star::uno::Sequence< com::sun::star::uno::Reference< @@ -251,7 +251,7 @@ public: setNextHandler( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xNewHandler ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL printBufferNodeTree() + virtual OUString SAL_CALL printBufferNodeTree() throw (com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL @@ -302,18 +302,18 @@ public: virtual void SAL_CALL endDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const rtl::OUString& aName ) + virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const rtl::OUString& aChars ) + virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL processingInstruction( - const rtl::OUString& aTarget, const rtl::OUString& aData ) + const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) @@ -325,21 +325,21 @@ public: throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); /* XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (com::sun::star::uno::RuntimeException); }; -rtl::OUString SAXEventKeeperImpl_getImplementationName() +OUString SAXEventKeeperImpl_getImplementationName() throw ( com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( ) +com::sun::star::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( ) throw ( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index 7550d519aff9..294ad99787c1 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -212,7 +212,7 @@ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any { OSL_ASSERT(aArguments.getLength() == 5); - rtl::OUString ouTempString; + OUString ouTempString; aArguments[0] >>= ouTempString; m_nSecurityId = ouTempString.toInt32(); @@ -224,24 +224,24 @@ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any } -rtl::OUString SignatureCreatorImpl_getImplementationName () +OUString SignatureCreatorImpl_getImplementationName () throw (cssu::RuntimeException) { - return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } -sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const OUString& ServiceName ) throw (cssu::RuntimeException) { return ServiceName == SERVICE_NAME; } -cssu::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ) throw (cssu::RuntimeException) { - cssu::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + cssu::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); return aRet; } #undef SERVICE_NAME @@ -254,17 +254,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance } /* XServiceInfo */ -rtl::OUString SAL_CALL SignatureCreatorImpl::getImplementationName( ) +OUString SAL_CALL SignatureCreatorImpl::getImplementationName( ) throw (cssu::RuntimeException) { return SignatureCreatorImpl_getImplementationName(); } -sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const OUString& rServiceName ) throw (cssu::RuntimeException) { return SignatureCreatorImpl_supportsService( rServiceName ); } -cssu::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames( ) throw (cssu::RuntimeException) { return SignatureCreatorImpl_getSupportedServiceNames(); diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx index 76c841da5f7d..5256d07f0654 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx @@ -96,21 +96,21 @@ public: throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); /* XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (com::sun::star::uno::RuntimeException); }; -rtl::OUString SignatureCreatorImpl_getImplementationName() +OUString SignatureCreatorImpl_getImplementationName() throw ( com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ) +com::sun::star::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ) throw ( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx index b7f96b2e63f9..1269f4680b01 100644 --- a/xmlsecurity/source/framework/signatureengine.cxx +++ b/xmlsecurity/source/framework/signatureengine.cxx @@ -113,7 +113,7 @@ void SignatureEngine::tryToPerform( ) { if (checkReady()) { - const rtl::OUString ouSignatureTemplate ( + const OUString ouSignatureTemplate ( RTL_CONSTASCII_USTRINGPARAM( SIGNATURE_TEMPLATE ) ); cssu::Reference < cssxc::XXMLSignatureTemplate > xSignatureTemplate( mxMSF->createInstance( ouSignatureTemplate ), cssu::UNO_QUERY ); @@ -217,7 +217,7 @@ void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id ) /* XUriBinding */ void SAL_CALL SignatureEngine::setUriBinding( - const rtl::OUString& uri, + const OUString& uri, const cssu::Reference< com::sun::star::io::XInputStream >& aInputStream ) throw (cssu::Exception, cssu::RuntimeException) { @@ -225,7 +225,7 @@ void SAL_CALL SignatureEngine::setUriBinding( m_vXInputStreams.push_back(aInputStream); } -cssu::Reference< com::sun::star::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const rtl::OUString& uri ) +cssu::Reference< com::sun::star::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const OUString& uri ) throw (cssu::Exception, cssu::RuntimeException) { cssu::Reference< com::sun::star::io::XInputStream > xInputStream; diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx index bfde8fe93860..7844269977c0 100644 --- a/xmlsecurity/source/framework/signatureengine.hxx +++ b/xmlsecurity/source/framework/signatureengine.hxx @@ -82,7 +82,7 @@ protected: * the m_vUris is used to hold the Uri strings, and the m_vXInputStreams is used * to hold corresponding binded XInputStream interface. */ - std::vector< rtl::OUString > m_vUris; + std::vector< OUString > m_vUris; std::vector< com::sun::star::uno::Reference< com::sun::star::io::XInputStream > > m_vXInputStreams; @@ -115,12 +115,12 @@ public: /* XUriBinding */ virtual void SAL_CALL setUriBinding( - const rtl::OUString& uri, + const OUString& uri, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - SAL_CALL getUriBinding( const rtl::OUString& uri ) + SAL_CALL getUriBinding( const OUString& uri ) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); }; diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index c680e32d57f6..f24d8bc35e4b 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -158,7 +158,7 @@ void SAL_CALL SignatureVerifierImpl::initialize( { OSL_ASSERT(aArguments.getLength() == 5); - rtl::OUString ouTempString; + OUString ouTempString; aArguments[0] >>= ouTempString; m_nSecurityId = ouTempString.toInt32(); @@ -170,25 +170,25 @@ void SAL_CALL SignatureVerifierImpl::initialize( } -rtl::OUString SignatureVerifierImpl_getImplementationName () +OUString SignatureVerifierImpl_getImplementationName () throw (cssu::RuntimeException) { - return rtl::OUString( + return OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } -sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const OUString& ServiceName ) throw (cssu::RuntimeException) { return ServiceName == SERVICE_NAME; } -cssu::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( ) throw (cssu::RuntimeException) { - cssu::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + cssu::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); return aRet; } #undef SERVICE_NAME @@ -201,17 +201,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstanc } /* XServiceInfo */ -rtl::OUString SAL_CALL SignatureVerifierImpl::getImplementationName( ) +OUString SAL_CALL SignatureVerifierImpl::getImplementationName( ) throw (cssu::RuntimeException) { return SignatureVerifierImpl_getImplementationName(); } -sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const OUString& rServiceName ) throw (cssu::RuntimeException) { return SignatureVerifierImpl_supportsService( rServiceName ); } -cssu::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames( ) throw (cssu::RuntimeException) { return SignatureVerifierImpl_getSupportedServiceNames(); diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx index a021d61206d2..bc46c23a6648 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx @@ -85,21 +85,21 @@ public: throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); /* XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (com::sun::star::uno::RuntimeException); }; -rtl::OUString SignatureVerifierImpl_getImplementationName() +OUString SignatureVerifierImpl_getImplementationName() throw ( com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( ) +com::sun::star::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( ) throw ( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx index 7c0f75053d78..6fde83aefb24 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star::uno ; using ::com::sun::star::lang::XMultiServiceFactory ; using ::com::sun::star::lang::XSingleServiceFactory ; -using ::rtl::OUString ; using ::com::sun::star::xml::wrapper::XXMLElementWrapper ; using ::com::sun::star::xml::crypto::XXMLEncryptionTemplate ; diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx index 0bd4c305a863..6084c1f2abb7 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx @@ -79,18 +79,18 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper3< ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; //Methods from XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName + const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for XServiceInfo - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ; + static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; - static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for registry static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ; diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx index 9a654335b6fb..15cb47c18268 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star::uno ; using ::com::sun::star::lang::XMultiServiceFactory ; using ::com::sun::star::lang::XSingleServiceFactory ; -using ::rtl::OUString ; using ::com::sun::star::xml::wrapper::XXMLElementWrapper ; using ::com::sun::star::xml::crypto::XXMLSignatureTemplate ; diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx index 9da6bfdc885a..87dba97b1efc 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx @@ -89,18 +89,18 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper3< ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; //Methods from XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName + const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for XServiceInfo - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ; + static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; - static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for registry static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ; diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 2d7a921cc893..7d1fdd56027e 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -32,11 +32,10 @@ #include "rtl/uri.hxx" using namespace ::com::sun::star::uno; -using rtl::OUString; namespace { -::rtl::OUString getElement(::rtl::OUString const & version, ::sal_Int32 * index) +OUString getElement(OUString const & version, ::sal_Int32 * index) { while (*index < version.getLength() && version[*index] == '0') { ++*index; @@ -49,11 +48,11 @@ namespace // Return 1 if version1 is greater then version 2, 0 if they are equal //and -1 if version1 is less version 2 int compareVersions( - ::rtl::OUString const & version1, ::rtl::OUString const & version2) + OUString const & version1, OUString const & version2) { for (::sal_Int32 i1 = 0, i2 = 0; i1 >= 0 || i2 >= 0;) { - ::rtl::OUString e1(getElement(version1, &i1)); - ::rtl::OUString e2(getElement(version2, &i2)); + OUString e1(getElement(version1, &i1)); + OUString e2(getElement(version2, &i2)); if (e1.getLength() < e2.getLength()) { return -1; } else if (e1.getLength() > e2.getLength()) { @@ -76,18 +75,18 @@ int compareVersions( //If 'bSigning' is false, then we validate. If the user enabled validating according to OOo 3.0 //then mimetype and all content of META-INF must be excluded. void ImplFillElementList( - std::vector< rtl::OUString >& rList, const Reference < css::embed::XStorage >& rxStore, - const ::rtl::OUString rRootStorageName, const bool bRecursive, + std::vector< OUString >& rList, const Reference < css::embed::XStorage >& rxStore, + const OUString rRootStorageName, const bool bRecursive, const DocumentSignatureAlgorithm mode) { - ::rtl::OUString aMetaInfName( "META-INF" ); - ::rtl::OUString sMimeTypeName ("mimetype"); - ::rtl::OUString aSep( "/" ); + OUString aMetaInfName( "META-INF" ); + OUString sMimeTypeName ("mimetype"); + OUString aSep( "/" ); Reference < css::container::XNameAccess > xElements( rxStore, UNO_QUERY ); - Sequence< ::rtl::OUString > aElements = xElements->getElementNames(); + Sequence< OUString > aElements = xElements->getElementNames(); sal_Int32 nElements = aElements.getLength(); - const ::rtl::OUString* pNames = aElements.getConstArray(); + const OUString* pNames = aElements.getConstArray(); for ( sal_Int32 n = 0; n < nElements; n++ ) { @@ -99,11 +98,11 @@ void ImplFillElementList( } else { - ::rtl::OUString sEncName = ::rtl::Uri::encode( + OUString sEncName = ::rtl::Uri::encode( pNames[n], rtl_UriCharClassRelSegment, rtl_UriEncodeStrict, RTL_TEXTENCODING_UTF8); if (sEncName.isEmpty() && !pNames[n].isEmpty()) - throw css::uno::Exception(::rtl::OUString( + throw css::uno::Exception(OUString( "Failed to encode element name of XStorage"), 0); if ( rxStore->isStreamElement( pNames[n] ) ) @@ -112,13 +111,13 @@ void ImplFillElementList( if (pNames[n].equals( DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName())) continue; - ::rtl::OUString aFullName( rRootStorageName + sEncName ); + OUString aFullName( rRootStorageName + sEncName ); rList.push_back(aFullName); } else if ( bRecursive && rxStore->isStorageElement( pNames[n] ) ) { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( pNames[n], css::embed::ElementModes::READ ); - rtl::OUString aFullRootName( rRootStorageName + sEncName + aSep ); + OUString aFullRootName( rRootStorageName + sEncName + aSep ); ImplFillElementList(rList, xSubStore, aFullRootName, bRecursive, mode); } } @@ -126,7 +125,7 @@ void ImplFillElementList( } -bool DocumentSignatureHelper::isODFPre_1_2(const ::rtl::OUString & sVersion) +bool DocumentSignatureHelper::isODFPre_1_2(const OUString & sVersion) { //The property version exists only if the document is at least version 1.2 //That is, if the document has version 1.1 and sVersion is empty. @@ -138,7 +137,7 @@ bool DocumentSignatureHelper::isODFPre_1_2(const ::rtl::OUString & sVersion) bool DocumentSignatureHelper::isOOo3_2_Signature(const SignatureInformation & sigInfo) { - ::rtl::OUString sManifestURI("META-INF/manifest.xml"); + OUString sManifestURI("META-INF/manifest.xml"); bool bOOo3_2 = false; typedef ::std::vector< SignatureReferenceInformation >::const_iterator CIT; for (CIT i = sigInfo.vSignatureReferenceInfors.begin(); @@ -155,7 +154,7 @@ bool DocumentSignatureHelper::isOOo3_2_Signature(const SignatureInformation & si DocumentSignatureAlgorithm DocumentSignatureHelper::getDocumentAlgorithm( - const ::rtl::OUString & sODFVersion, const SignatureInformation & sigInfo) + const OUString & sODFVersion, const SignatureInformation & sigInfo) { OSL_ASSERT(!sODFVersion.isEmpty()); DocumentSignatureAlgorithm mode = OOo3_2Document; @@ -184,14 +183,14 @@ DocumentSignatureHelper::getDocumentAlgorithm( // //When a signature is created then we always use the latest algorithm. That is, we use //that of OOo 3.2 -std::vector< rtl::OUString > +std::vector< OUString > DocumentSignatureHelper::CreateElementList( const Reference < css::embed::XStorage >& rxStore, - const ::rtl::OUString /*rRootStorageName*/, DocumentSignatureMode eMode, + const OUString /*rRootStorageName*/, DocumentSignatureMode eMode, const DocumentSignatureAlgorithm mode) { - std::vector< rtl::OUString > aElements; - ::rtl::OUString aSep( "/" ); + std::vector< OUString > aElements; + OUString aSep( "/" ); switch ( eMode ) { @@ -200,10 +199,10 @@ DocumentSignatureHelper::CreateElementList( if (mode == OOo2Document) //that is, ODF 1.0, 1.1 { // 1) Main content - ImplFillElementList(aElements, rxStore, ::rtl::OUString(), false, mode); + ImplFillElementList(aElements, rxStore, OUString(), false, mode); // 2) Pictures... - rtl::OUString aSubStorageName( "Pictures" ); + OUString aSubStorageName( "Pictures" ); try { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); @@ -214,7 +213,7 @@ DocumentSignatureHelper::CreateElementList( ; // Doesn't have to exist... } // 3) OLE.... - aSubStorageName = rtl::OUString("ObjectReplacements"); + aSubStorageName = OUString("ObjectReplacements"); try { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); @@ -222,11 +221,11 @@ DocumentSignatureHelper::CreateElementList( xSubStore.clear(); // Object folders... - rtl::OUString aMatchStr( "Object " ); + OUString aMatchStr( "Object " ); Reference < css::container::XNameAccess > xElements( rxStore, UNO_QUERY ); - Sequence< ::rtl::OUString > aElementNames = xElements->getElementNames(); + Sequence< OUString > aElementNames = xElements->getElementNames(); sal_Int32 nElements = aElementNames.getLength(); - const ::rtl::OUString* pNames = aElementNames.getConstArray(); + const OUString* pNames = aElementNames.getConstArray(); for ( sal_Int32 n = 0; n < nElements; n++ ) { if ( ( pNames[n].match( aMatchStr ) ) && rxStore->isStorageElement( pNames[n] ) ) @@ -244,14 +243,14 @@ DocumentSignatureHelper::CreateElementList( else { // Everything except META-INF - ImplFillElementList(aElements, rxStore, ::rtl::OUString(), true, mode); + ImplFillElementList(aElements, rxStore, OUString(), true, mode); } } break; case SignatureModeMacros: { // 1) Macros - rtl::OUString aSubStorageName( "Basic" ); + OUString aSubStorageName( "Basic" ); try { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); @@ -263,7 +262,7 @@ DocumentSignatureHelper::CreateElementList( } // 2) Dialogs - aSubStorageName = rtl::OUString("Dialogs") ; + aSubStorageName = OUString("Dialogs") ; try { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); @@ -274,7 +273,7 @@ DocumentSignatureHelper::CreateElementList( ; // Doesn't have to exist... } // 3) Scripts - aSubStorageName = rtl::OUString("Scripts") ; + aSubStorageName = OUString("Scripts") ; try { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); @@ -289,7 +288,7 @@ DocumentSignatureHelper::CreateElementList( case SignatureModePackage: { // Everything except META-INF - ImplFillElementList(aElements, rxStore, ::rtl::OUString(), true, mode); + ImplFillElementList(aElements, rxStore, OUString(), true, mode); } break; } @@ -308,11 +307,11 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream( try { - ::rtl::OUString aSIGStoreName( "META-INF" ); + OUString aSIGStoreName( "META-INF" ); aHelper.xSignatureStorage = rxStore->openStorageElement( aSIGStoreName, nSubStorageOpenMode ); if ( aHelper.xSignatureStorage.is() ) { - ::rtl::OUString aSIGStreamName; + OUString aSIGStreamName; if ( eDocSigMode == SignatureModeDocumentContent ) aSIGStreamName = DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName(); else if ( eDocSigMode == SignatureModeMacros ) @@ -338,7 +337,7 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream( //the uri s in the Reference elements in the signature, were not properly encoded. // For example: bool DocumentSignatureHelper::checkIfAllFilesAreSigned( - const ::std::vector< ::rtl::OUString > & sElementList, + const ::std::vector< OUString > & sElementList, const SignatureInformation & sigInfo, const DocumentSignatureAlgorithm alg) { @@ -350,7 +349,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned( // There is also an extra entry of type TYPE_SAMEDOCUMENT_REFERENCE because of signature date. if ( ( rInf.nType == TYPE_BINARYSTREAM_REFERENCE ) || ( rInf.nType == TYPE_XMLSTREAM_REFERENCE ) ) { - ::rtl::OUString sReferenceURI = rInf.ouURI; + OUString sReferenceURI = rInf.ouURI; if (alg == OOo2Document) { //Comparing URIs is a difficult. Therefore we kind of normalize @@ -362,10 +361,10 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned( } //find the file in the element list - typedef ::std::vector< ::rtl::OUString >::const_iterator CIT; + typedef ::std::vector< OUString >::const_iterator CIT; for (CIT aIter = sElementList.begin(); aIter != sElementList.end(); ++aIter) { - ::rtl::OUString sElementListURI = *aIter; + OUString sElementListURI = *aIter; if (alg == OOo2Document) { sElementListURI = @@ -433,19 +432,19 @@ bool DocumentSignatureHelper::equalsReferenceUriManifestPath( return retVal; } -::rtl::OUString DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName() +OUString DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName() { - return ::rtl::OUString( "documentsignatures.xml" ); + return OUString( "documentsignatures.xml" ); } -::rtl::OUString DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName() +OUString DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName() { - return ::rtl::OUString( "macrosignatures.xml" ); + return OUString( "macrosignatures.xml" ); } -::rtl::OUString DocumentSignatureHelper::GetPackageSignatureDefaultStreamName() +OUString DocumentSignatureHelper::GetPackageSignatureDefaultStreamName() { - return ::rtl::OUString( "packagesignatures.xml" ); + return OUString( "packagesignatures.xml" ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index 51d8111b787d..6aeb9965ec79 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -68,14 +68,14 @@ bool XMLSignatureHelper::Init() mxSEInitializer = com::sun::star::xml::crypto::SEInitializer::create( mxCtx ); if ( mxSEInitializer.is() ) - mxSecurityContext = mxSEInitializer->createSecurityContext( ::rtl::OUString() ); + mxSecurityContext = mxSEInitializer->createSecurityContext( OUString() ); return mxSecurityContext.is(); } void XMLSignatureHelper::SetStorage( const Reference < css::embed::XStorage >& rxStorage, - ::rtl::OUString sODFVersion) + OUString sODFVersion) { DBG_ASSERT( !mxUriBinding.is(), "SetStorage - UriBinding already set!" ); mxUriBinding = new UriBindingHelper( rxStorage ); @@ -110,9 +110,9 @@ sal_Int32 XMLSignatureHelper::GetNewSecurityId() void XMLSignatureHelper::SetX509Certificate( sal_Int32 nSecurityId, - const rtl::OUString& ouX509IssuerName, - const rtl::OUString& ouX509SerialNumber, - const rtl::OUString& ouX509Cert) + const OUString& ouX509IssuerName, + const OUString& ouX509SerialNumber, + const OUString& ouX509Cert) { mpXSecController->setX509Certificate( nSecurityId, @@ -134,7 +134,7 @@ void XMLSignatureHelper::SetDateTime( sal_Int32 nSecurityId, const Date& rDate, mpXSecController->setDate( nSecurityId, stDateTime ); } -void XMLSignatureHelper::AddForSigning( sal_Int32 nSecurityId, const rtl::OUString& uri, const rtl::OUString& objectURL, sal_Bool bBinary ) +void XMLSignatureHelper::AddForSigning( sal_Int32 nSecurityId, const OUString& uri, const OUString& objectURL, sal_Bool bBinary ) { mpXSecController->signAStream( nSecurityId, uri, objectURL, bBinary ); } @@ -157,17 +157,17 @@ uno::Reference XMLSignatureHelper::CreateDocumentHandlerWithH /* * write the xml context for signatures */ - rtl::OUString tag_AllSignatures(TAG_DOCUMENTSIGNATURES); + OUString tag_AllSignatures(TAG_DOCUMENTSIGNATURES); SvXMLAttributeList *pAttributeList = new SvXMLAttributeList(); - rtl::OUString sNamespace; + OUString sNamespace; if (mbODFPre1_2) - sNamespace = rtl::OUString(NS_DOCUMENTSIGNATURES); + sNamespace = OUString(NS_DOCUMENTSIGNATURES); else - sNamespace = rtl::OUString(NS_DOCUMENTSIGNATURES_ODF_1_2); + sNamespace = OUString(NS_DOCUMENTSIGNATURES_ODF_1_2); pAttributeList->AddAttribute( - rtl::OUString(ATTR_XMLNS), + OUString(ATTR_XMLNS), sNamespace); xSaxWriter->startDocument(); @@ -180,7 +180,7 @@ uno::Reference XMLSignatureHelper::CreateDocumentHandlerWithH void XMLSignatureHelper::CloseDocumentHandler( const uno::Reference& xDocumentHandler ) { - rtl::OUString tag_AllSignatures(TAG_DOCUMENTSIGNATURES); + OUString tag_AllSignatures(TAG_DOCUMENTSIGNATURES); xDocumentHandler->endElement( tag_AllSignatures ); xDocumentHandler->endDocument(); } diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index edc6ee371301..d8b35863a73f 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -84,10 +84,10 @@ void SAL_CALL ImplXMLSignatureListener::endDocument( ) } } -void SAL_CALL ImplXMLSignatureListener::startElement( const rtl::OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) +void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) { - if ( aName == rtl::OUString("Signature") ) + if ( aName == OUString("Signature") ) { maStartVerifySignatureElementListener.Call( (void*)&xAttribs ); } @@ -98,7 +98,7 @@ void SAL_CALL ImplXMLSignatureListener::startElement( const rtl::OUString& aName } } -void SAL_CALL ImplXMLSignatureListener::endElement( const rtl::OUString& aName ) +void SAL_CALL ImplXMLSignatureListener::endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) { if (m_xNextHandler.is()) @@ -107,7 +107,7 @@ void SAL_CALL ImplXMLSignatureListener::endElement( const rtl::OUString& aName ) } } -void SAL_CALL ImplXMLSignatureListener::characters( const rtl::OUString& aChars ) +void SAL_CALL ImplXMLSignatureListener::characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) { if (m_xNextHandler.is()) @@ -116,7 +116,7 @@ void SAL_CALL ImplXMLSignatureListener::characters( const rtl::OUString& aChars } } -void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const rtl::OUString& aWhitespaces ) +void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) { if (m_xNextHandler.is()) @@ -125,7 +125,7 @@ void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const rtl::OUString } } -void SAL_CALL ImplXMLSignatureListener::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData ) +void SAL_CALL ImplXMLSignatureListener::processingInstruction( const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) { if (m_xNextHandler.is()) @@ -157,12 +157,12 @@ UriBindingHelper::UriBindingHelper( const com::sun::star::uno::Reference < com:: } -void SAL_CALL UriBindingHelper::setUriBinding( const rtl::OUString& /*uri*/, const uno::Reference< io::XInputStream >&) +void SAL_CALL UriBindingHelper::setUriBinding( const OUString& /*uri*/, const uno::Reference< io::XInputStream >&) throw (uno::Exception, uno::RuntimeException) { } -uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( const rtl::OUString& uri ) +uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( const OUString& uri ) throw (uno::Exception, uno::RuntimeException) { uno::Reference< io::XInputStream > xInputStream; @@ -182,7 +182,7 @@ uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( con return xInputStream; } -uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno::Reference < embed::XStorage >& rxStore, const rtl::OUString& rURI ) +uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno::Reference < embed::XStorage >& rxStore, const OUString& rURI ) { OSL_ASSERT(!rURI.isEmpty()); uno::Reference < io::XInputStream > xInStream; @@ -192,10 +192,10 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno { // Cloning because of I can't keep all storage references open // MBA with think about a better API... - const ::rtl::OUString sName = ::rtl::Uri::decode( + const OUString sName = ::rtl::Uri::decode( rURI, rtl_UriDecodeStrict, rtl_UriCharClassRelSegment); if (sName.isEmpty() && !rURI.isEmpty()) - throw uno::Exception(::rtl::OUString( + throw uno::Exception(OUString( "Could not decode URI for stream element."), 0); uno::Reference< io::XStream > xStream; @@ -206,14 +206,14 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno } else { - const rtl::OUString aStoreName = ::rtl::Uri::decode( + const OUString aStoreName = ::rtl::Uri::decode( rURI.copy( 0, nSepPos ), rtl_UriDecodeStrict, rtl_UriCharClassRelSegment); if (aStoreName.isEmpty() && !rURI.isEmpty()) throw uno::Exception( - ::rtl::OUString( + OUString( "Could not decode URI for stream element."), 0); - rtl::OUString aElement = rURI.copy( nSepPos+1 ); + OUString aElement = rURI.copy( nSepPos+1 ); uno::Reference < embed::XStorage > xSubStore = rxStore->openStorageElement( aStoreName, embed::ElementModes::READ ); xInStream = OpenInputStream( xSubStore, aElement ); } diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx index 5cb27a116212..53a216a1dd16 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx @@ -70,7 +70,7 @@ public: throw (com::sun::star::uno::RuntimeException); // com::sun::star::xml::sax::XDocumentHandler - virtual void SAL_CALL startElement( const rtl::OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) + virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL startDocument( ) @@ -79,16 +79,16 @@ public: virtual void SAL_CALL endDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const rtl::OUString& aName ) + virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const rtl::OUString& aChars ) + virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData ) + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) @@ -113,13 +113,13 @@ public: UriBindingHelper(); UriBindingHelper( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage ); - void SAL_CALL setUriBinding( const rtl::OUString& uri, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) + void SAL_CALL setUriBinding( const OUString& uri, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getUriBinding( const rtl::OUString& uri ) + com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri ) throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - static com::sun::star::uno::Reference < com::sun::star::io::XInputStream > OpenInputStream( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStore, const rtl::OUString& rURI ); + static com::sun::star::uno::Reference < com::sun::star::io::XInputStream > OpenInputStream( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStore, const OUString& rURI ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 340f7bda7f7d..733022c43678 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -68,7 +68,7 @@ XSecController::~XSecController() */ /** convert string to number with optional min and max values */ sal_Bool XSecController::convertNumber( sal_Int32& rValue, - const rtl::OUString& rString, + const OUString& rString, sal_Int32 /*nMin*/, sal_Int32 /*nMax*/ ) { sal_Bool bNeg = sal_False; @@ -105,7 +105,7 @@ sal_Bool XSecController::convertNumber( sal_Int32& rValue, } /** convert util::DateTime to ISO Date String */ -void XSecController::convertDateTime( ::rtl::OUStringBuffer& rBuffer, +void XSecController::convertDateTime( OUStringBuffer& rBuffer, const com::sun::star::util::DateTime& rDateTime ) { rBuffer.append((sal_Int32) rDateTime.Year); @@ -146,11 +146,11 @@ void XSecController::convertDateTime( ::rtl::OUStringBuffer& rBuffer, /** convert ISO Date String to util::DateTime */ sal_Bool XSecController::convertDateTime( com::sun::star::util::DateTime& rDateTime, - const ::rtl::OUString& rString ) + const OUString& rString ) { sal_Bool bSuccess = sal_True; - rtl::OUString aDateStr, aTimeStr, sHundredth; + OUString aDateStr, aTimeStr, sHundredth; sal_Int32 nPos = rString.indexOf( (sal_Unicode) 'T' ); sal_Int32 nPos2 = rString.indexOf( (sal_Unicode) ',' ); if ( nPos >= 0 ) @@ -176,14 +176,14 @@ sal_Bool XSecController::convertDateTime( com::sun::star::util::DateTime& rDateT sHundredth = rString.copy(nPos2 + 1); sal_Int32 len = sHundredth.getLength(); if (len == 1) - sHundredth += rtl::OUString("0"); + sHundredth += OUString("0"); if (len > 2) sHundredth = sHundredth.copy(0, 2); } else { aTimeStr = rString.copy(nPos + 1); - sHundredth = rtl::OUString("0"); + sHundredth = OUString("0"); } } else @@ -324,9 +324,9 @@ void XSecController::createXSecComponent( ) * Email: michael.mi@sun.com ******************************************************************************/ { - rtl::OUString sSAXEventKeeper( SAXEVENTKEEPER_COMPONENT ); - rtl::OUString sXMLSignature( XMLSIGNATURE_COMPONENT ); - rtl::OUString sXMLDocument( XMLDOCUMENTWRAPPER_COMPONENT ); + OUString sSAXEventKeeper( SAXEVENTKEEPER_COMPONENT ); + OUString sXMLSignature( XMLSIGNATURE_COMPONENT ); + OUString sXMLDocument( XMLDOCUMENTWRAPPER_COMPONENT ); /* * marks all security components are not available. @@ -644,7 +644,7 @@ void XSecController::initializeSAXChain() } cssu::Reference< com::sun::star::io::XInputStream > - XSecController::getObjectInputStream( const rtl::OUString& objectURL ) + XSecController::getObjectInputStream( const OUString& objectURL ) /****** XSecController/getObjectInputStream ************************************ * * NAME @@ -895,26 +895,26 @@ void XSecController::exportSignature( /* * defines all element tags in Signature element. */ - rtl::OUString tag_Signature(TAG_SIGNATURE); - rtl::OUString tag_SignedInfo(TAG_SIGNEDINFO); - rtl::OUString tag_CanonicalizationMethod(TAG_CANONICALIZATIONMETHOD); - rtl::OUString tag_SignatureMethod(TAG_SIGNATUREMETHOD); - rtl::OUString tag_Reference(TAG_REFERENCE); - rtl::OUString tag_Transforms(TAG_TRANSFORMS); - rtl::OUString tag_Transform(TAG_TRANSFORM); - rtl::OUString tag_DigestMethod(TAG_DIGESTMETHOD); - rtl::OUString tag_DigestValue(TAG_DIGESTVALUE); - rtl::OUString tag_SignatureValue(TAG_SIGNATUREVALUE); - rtl::OUString tag_KeyInfo(TAG_KEYINFO); - rtl::OUString tag_X509Data(TAG_X509DATA); - rtl::OUString tag_X509IssuerSerial(TAG_X509ISSUERSERIAL); - rtl::OUString tag_X509IssuerName(TAG_X509ISSUERNAME); - rtl::OUString tag_X509SerialNumber(TAG_X509SERIALNUMBER); - rtl::OUString tag_X509Certificate(TAG_X509CERTIFICATE); - rtl::OUString tag_Object(TAG_OBJECT); - rtl::OUString tag_SignatureProperties(TAG_SIGNATUREPROPERTIES); - rtl::OUString tag_SignatureProperty(TAG_SIGNATUREPROPERTY); - rtl::OUString tag_Date(TAG_DATE); + OUString tag_Signature(TAG_SIGNATURE); + OUString tag_SignedInfo(TAG_SIGNEDINFO); + OUString tag_CanonicalizationMethod(TAG_CANONICALIZATIONMETHOD); + OUString tag_SignatureMethod(TAG_SIGNATUREMETHOD); + OUString tag_Reference(TAG_REFERENCE); + OUString tag_Transforms(TAG_TRANSFORMS); + OUString tag_Transform(TAG_TRANSFORM); + OUString tag_DigestMethod(TAG_DIGESTMETHOD); + OUString tag_DigestValue(TAG_DIGESTVALUE); + OUString tag_SignatureValue(TAG_SIGNATUREVALUE); + OUString tag_KeyInfo(TAG_KEYINFO); + OUString tag_X509Data(TAG_X509DATA); + OUString tag_X509IssuerSerial(TAG_X509ISSUERSERIAL); + OUString tag_X509IssuerName(TAG_X509ISSUERNAME); + OUString tag_X509SerialNumber(TAG_X509SERIALNUMBER); + OUString tag_X509Certificate(TAG_X509CERTIFICATE); + OUString tag_Object(TAG_OBJECT); + OUString tag_SignatureProperties(TAG_SIGNATUREPROPERTIES); + OUString tag_SignatureProperty(TAG_SIGNATUREPROPERTY); + OUString tag_Date(TAG_DATE); const SignatureReferenceInformations& vReferenceInfors = signatureInfo.vSignatureReferenceInfors; SvXMLAttributeList *pAttributeList; @@ -924,14 +924,14 @@ void XSecController::exportSignature( */ pAttributeList = new SvXMLAttributeList(); pAttributeList->AddAttribute( - rtl::OUString(ATTR_XMLNS), - rtl::OUString(NS_XMLDSIG)); + OUString(ATTR_XMLNS), + OUString(NS_XMLDSIG)); if (!signatureInfo.ouSignatureId.isEmpty()) { pAttributeList->AddAttribute( - rtl::OUString(ATTR_ID), - rtl::OUString(signatureInfo.ouSignatureId)); + OUString(ATTR_ID), + OUString(signatureInfo.ouSignatureId)); } xDocumentHandler->startElement( tag_Signature, cssu::Reference< cssxs::XAttributeList > (pAttributeList)); @@ -944,16 +944,16 @@ void XSecController::exportSignature( /* Write CanonicalizationMethod element */ pAttributeList = new SvXMLAttributeList(); pAttributeList->AddAttribute( - rtl::OUString(ATTR_ALGORITHM), - rtl::OUString(ALGO_C14N)); + OUString(ATTR_ALGORITHM), + OUString(ALGO_C14N)); xDocumentHandler->startElement( tag_CanonicalizationMethod, cssu::Reference< cssxs::XAttributeList > (pAttributeList) ); xDocumentHandler->endElement( tag_CanonicalizationMethod ); /* Write SignatureMethod element */ pAttributeList = new SvXMLAttributeList(); pAttributeList->AddAttribute( - rtl::OUString(ATTR_ALGORITHM), - rtl::OUString(ALGO_RSASHA1)); + OUString(ATTR_ALGORITHM), + OUString(ALGO_RSASHA1)); xDocumentHandler->startElement( tag_SignatureMethod, cssu::Reference< cssxs::XAttributeList > (pAttributeList) ); xDocumentHandler->endElement( tag_SignatureMethod ); @@ -972,7 +972,7 @@ void XSecController::exportSignature( */ { pAttributeList->AddAttribute( - rtl::OUString(ATTR_URI), + OUString(ATTR_URI), refInfor.ouURI); } else @@ -981,8 +981,8 @@ void XSecController::exportSignature( */ { pAttributeList->AddAttribute( - rtl::OUString(ATTR_URI), - rtl::OUString(CHAR_FRAGMENT)+refInfor.ouURI); + OUString(ATTR_URI), + OUString(CHAR_FRAGMENT)+refInfor.ouURI); } xDocumentHandler->startElement( tag_Reference, cssu::Reference< cssxs::XAttributeList > (pAttributeList) ); @@ -999,8 +999,8 @@ void XSecController::exportSignature( { pAttributeList = new SvXMLAttributeList(); pAttributeList->AddAttribute( - rtl::OUString(ATTR_ALGORITHM), - rtl::OUString(ALGO_C14N)); + OUString(ATTR_ALGORITHM), + OUString(ALGO_C14N)); xDocumentHandler->startElement( tag_Transform, cssu::Reference< cssxs::XAttributeList > (pAttributeList) ); @@ -1012,8 +1012,8 @@ void XSecController::exportSignature( /* Write DigestMethod element */ pAttributeList = new SvXMLAttributeList(); pAttributeList->AddAttribute( - rtl::OUString(ATTR_ALGORITHM), - rtl::OUString(ALGO_XMLDSIGSHA1)); + OUString(ATTR_ALGORITHM), + OUString(ALGO_XMLDSIGSHA1)); xDocumentHandler->startElement( tag_DigestMethod, cssu::Reference< cssxs::XAttributeList > (pAttributeList) ); @@ -1096,11 +1096,11 @@ void XSecController::exportSignature( /* Write SignatureProperty element */ pAttributeList = new SvXMLAttributeList(); pAttributeList->AddAttribute( - rtl::OUString(ATTR_ID), + OUString(ATTR_ID), signatureInfo.ouPropertyId); pAttributeList->AddAttribute( - rtl::OUString(ATTR_TARGET), - rtl::OUString(CHAR_FRAGMENT)+signatureInfo.ouSignatureId); + OUString(ATTR_TARGET), + OUString(CHAR_FRAGMENT)+signatureInfo.ouSignatureId); xDocumentHandler->startElement( tag_SignatureProperty, cssu::Reference< cssxs::XAttributeList > (pAttributeList)); @@ -1109,18 +1109,18 @@ void XSecController::exportSignature( pAttributeList = new SvXMLAttributeList(); pAttributeList->AddAttribute( - rtl::OUString(ATTR_XMLNS) - +rtl::OUString(":") - +rtl::OUString(NSTAG_DC), - rtl::OUString(NS_DC)); + OUString(ATTR_XMLNS) + +OUString(":") + +OUString(NSTAG_DC), + OUString(NS_DC)); xDocumentHandler->startElement( - rtl::OUString(NSTAG_DC) - +rtl::OUString(":") + OUString(NSTAG_DC) + +OUString(":") +tag_Date, cssu::Reference< cssxs::XAttributeList > (pAttributeList)); - ::rtl::OUStringBuffer buffer; + OUStringBuffer buffer; //If the xml signature was already contained in the document, //then we use the original date and time string, rather then the //converted one. When the original string is converted to the DateTime @@ -1136,8 +1136,8 @@ void XSecController::exportSignature( xDocumentHandler->characters( buffer.makeStringAndClear() ); xDocumentHandler->endElement( - rtl::OUString(NSTAG_DC) - +rtl::OUString(":") + OUString(NSTAG_DC) + +OUString(":") +tag_Date); } xDocumentHandler->endElement( tag_SignatureProperty ); diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx index 207c36d2bda4..6014807de6bc 100644 --- a/xmlsecurity/source/helper/xsecctl.hxx +++ b/xmlsecurity/source/helper/xsecctl.hxx @@ -133,7 +133,7 @@ public: xReferenceResolvedListener = xListener; } - void addReference( sal_Int32 type, rtl::OUString uri, sal_Int32 keeperId ) + void addReference( sal_Int32 type, OUString uri, sal_Int32 keeperId ) { signatureInfor.vSignatureReferenceInfors.push_back( SignatureReferenceInformation(type, uri)); @@ -345,9 +345,9 @@ private: /* * Common methods */ - sal_Bool convertNumber( sal_Int32& rValue, const rtl::OUString& rString, sal_Int32 nMin, sal_Int32 nMax ); - void convertDateTime( ::rtl::OUStringBuffer& rBuffer, const com::sun::star::util::DateTime& rDateTime ); - sal_Bool convertDateTime( com::sun::star::util::DateTime& rDateTime, const ::rtl::OUString& rString ); + sal_Bool convertNumber( sal_Int32& rValue, const OUString& rString, sal_Int32 nMin, sal_Int32 nMax ); + void convertDateTime( OUStringBuffer& rBuffer, const com::sun::star::util::DateTime& rDateTime ); + sal_Bool convertDateTime( com::sun::star::util::DateTime& rDateTime, const OUString& rString ); void createXSecComponent( ); int findSignatureInfor( sal_Int32 nSecurityId ) const; @@ -357,14 +357,14 @@ private: void initializeSAXChain(); com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > getObjectInputStream( const rtl::OUString& objectURL ); + com::sun::star::io::XInputStream > getObjectInputStream( const OUString& objectURL ); //sal_Int32 getFastPropertyIndex(sal_Int32 nHandle) const; /* * For signature generation */ - rtl::OUString createId(); + OUString createId(); com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToWrite( InternalSignatureInformation& signatureInfo ); @@ -373,22 +373,22 @@ private: * For signature verification */ void addSignature(); - void addReference( const rtl::OUString& ouUri); + void addReference( const OUString& ouUri); void addStreamReference( - const rtl::OUString& ouUri, + const OUString& ouUri, bool isBinary ); void setReferenceCount() const; - void setX509IssuerName( rtl::OUString& ouX509IssuerName ); - void setX509SerialNumber( rtl::OUString& ouX509SerialNumber ); - void setX509Certificate( rtl::OUString& ouX509Certificate ); - void setSignatureValue( rtl::OUString& ouSignatureValue ); - void setDigestValue( rtl::OUString& ouDigestValue ); + void setX509IssuerName( OUString& ouX509IssuerName ); + void setX509SerialNumber( OUString& ouX509SerialNumber ); + void setX509Certificate( OUString& ouX509Certificate ); + void setSignatureValue( OUString& ouSignatureValue ); + void setDigestValue( OUString& ouDigestValue ); - void setDate( rtl::OUString& ouDate ); + void setDate( OUString& ouDate ); - void setId( rtl::OUString& ouId ); - void setPropertyId( rtl::OUString& ouPropertyId ); + void setId( OUString& ouId ); + void setPropertyId( OUString& ouPropertyId ); com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToRead( @@ -428,7 +428,7 @@ public: /* * For signature generation */ - void signAStream( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& objectURL, sal_Bool isBinary); + void signAStream( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, sal_Bool isBinary); /** sets data that describes the certificate. @@ -451,16 +451,16 @@ public: */ void setX509Certificate( sal_Int32 nSecurityId, - const rtl::OUString& ouX509IssuerName, - const rtl::OUString& ouX509SerialNumber, - const rtl::OUString& ouX509Cert); + const OUString& ouX509IssuerName, + const OUString& ouX509SerialNumber, + const OUString& ouX509Cert); // see the other setX509Certifcate function void setX509Certificate( sal_Int32 nSecurityId, const sal_Int32 nSecurityEnvironmentIndex, - const rtl::OUString& ouX509IssuerName, - const rtl::OUString& ouX509SerialNumber, - const rtl::OUString& ouX509Cert); + const OUString& ouX509IssuerName, + const OUString& ouX509SerialNumber, + const OUString& ouX509Cert); void setDate( sal_Int32 nSecurityId, @@ -474,7 +474,7 @@ public: /* * For signature verification */ - void collectToVerify( const rtl::OUString& referenceId ); + void collectToVerify( const OUString& referenceId ); void addSignature( sal_Int32 nSignatureId ); com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > createSignatureReader(); void releaseSignatureReader(); diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index 547ec823580a..85557a149831 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -38,15 +38,15 @@ XSecParser::XSecParser( { } -rtl::OUString XSecParser::getIdAttr(const cssu::Reference< cssxs::XAttributeList >& xAttribs ) +OUString XSecParser::getIdAttr(const cssu::Reference< cssxs::XAttributeList >& xAttribs ) { - rtl::OUString ouIdAttr = xAttribs->getValueByName( - rtl::OUString(RTL_ASCII_USTRINGPARAM("id"))); + OUString ouIdAttr = xAttribs->getValueByName( + OUString(RTL_ASCII_USTRINGPARAM("id"))); if (ouIdAttr == NULL) { ouIdAttr = xAttribs->getValueByName( - rtl::OUString(RTL_ASCII_USTRINGPARAM("Id"))); + OUString(RTL_ASCII_USTRINGPARAM("Id"))); } return ouIdAttr; @@ -81,19 +81,19 @@ void SAL_CALL XSecParser::endDocument( ) } void SAL_CALL XSecParser::startElement( - const rtl::OUString& aName, + const OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs ) throw (cssxs::SAXException, cssu::RuntimeException) { try { - rtl::OUString ouIdAttr = getIdAttr(xAttribs); + OUString ouIdAttr = getIdAttr(xAttribs); if (ouIdAttr != NULL) { m_pXSecController->collectToVerify( ouIdAttr ); } - if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATURE)) ) + if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATURE)) ) { m_pXSecController->addSignature(); if (ouIdAttr != NULL) @@ -101,9 +101,9 @@ void SAL_CALL XSecParser::startElement( m_pXSecController->setId( ouIdAttr ); } } - else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_REFERENCE)) ) + else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_REFERENCE)) ) { - rtl::OUString ouUri = xAttribs->getValueByName(rtl::OUString(RTL_ASCII_USTRINGPARAM(ATTR_URI))); + OUString ouUri = xAttribs->getValueByName(OUString(RTL_ASCII_USTRINGPARAM(ATTR_URI))); DBG_ASSERT( ouUri != NULL, "URI == NULL" ); if (ouUri.startsWith(CHAR_FRAGMENT)) @@ -122,13 +122,13 @@ void SAL_CALL XSecParser::startElement( m_bReferenceUnresolved = true; } } - else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_TRANSFORM))) + else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_TRANSFORM))) { if ( m_bReferenceUnresolved ) { - rtl::OUString ouAlgorithm = xAttribs->getValueByName(rtl::OUString(RTL_ASCII_USTRINGPARAM(ATTR_ALGORITHM))); + OUString ouAlgorithm = xAttribs->getValueByName(OUString(RTL_ASCII_USTRINGPARAM(ATTR_ALGORITHM))); - if (ouAlgorithm != NULL && ouAlgorithm == rtl::OUString(RTL_ASCII_USTRINGPARAM(ALGO_C14N))) + if (ouAlgorithm != NULL && ouAlgorithm == OUString(RTL_ASCII_USTRINGPARAM(ALGO_C14N))) /* * a xml stream */ @@ -138,43 +138,43 @@ void SAL_CALL XSecParser::startElement( } } } - else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509ISSUERNAME))) + else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509ISSUERNAME))) { - m_ouX509IssuerName = rtl::OUString(); + m_ouX509IssuerName = OUString(); m_bInX509IssuerName = true; } - else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509SERIALNUMBER))) + else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509SERIALNUMBER))) { - m_ouX509SerialNumber = rtl::OUString(); + m_ouX509SerialNumber = OUString(); m_bInX509SerialNumber = true; } - else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509CERTIFICATE))) + else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509CERTIFICATE))) { - m_ouX509Certificate = rtl::OUString(); + m_ouX509Certificate = OUString(); m_bInX509Certificate = true; } - else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREVALUE))) + else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREVALUE))) { - m_ouSignatureValue = rtl::OUString(); + m_ouSignatureValue = OUString(); m_bInSignatureValue = true; } - else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE))) + else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE))) { - m_ouDigestValue = rtl::OUString(); + m_ouDigestValue = OUString(); m_bInDigestValue = true; } - else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTY)) ) + else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTY)) ) { if (ouIdAttr != NULL) { m_pXSecController->setPropertyId( ouIdAttr ); } } - else if (aName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC)) - +rtl::OUString(":") - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE))) + else if (aName == OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC)) + +OUString(":") + +OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE))) { - m_ouDate = rtl::OUString(); + m_ouDate = OUString(); m_bInDate = true; } @@ -187,28 +187,28 @@ void SAL_CALL XSecParser::startElement( {//getCaughtException MUST be the first line in the catch block cssu::Any exc = cppu::getCaughtException(); throw cssxs::SAXException( - rtl::OUString( + OUString( "xmlsecurity: Exception in XSecParser::startElement"), 0, exc); } catch (...) { throw cssxs::SAXException( - rtl::OUString("xmlsecurity: unexpected exception in XSecParser::startElement"), 0, + OUString("xmlsecurity: unexpected exception in XSecParser::startElement"), 0, cssu::Any()); } } -void SAL_CALL XSecParser::endElement( const rtl::OUString& aName ) +void SAL_CALL XSecParser::endElement( const OUString& aName ) throw (cssxs::SAXException, cssu::RuntimeException) { try { - if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE))) + if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE))) { m_bInDigestValue = false; } - else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_REFERENCE)) ) + else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_REFERENCE)) ) { if ( m_bReferenceUnresolved ) /* @@ -221,33 +221,33 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName ) m_pXSecController->setDigestValue( m_ouDigestValue ); } - else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNEDINFO)) ) + else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNEDINFO)) ) { m_pXSecController->setReferenceCount(); } - else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREVALUE)) ) + else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREVALUE)) ) { m_pXSecController->setSignatureValue( m_ouSignatureValue ); m_bInSignatureValue = false; } - else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509ISSUERNAME))) + else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509ISSUERNAME))) { m_pXSecController->setX509IssuerName( m_ouX509IssuerName ); m_bInX509IssuerName = false; } - else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509SERIALNUMBER))) + else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509SERIALNUMBER))) { m_pXSecController->setX509SerialNumber( m_ouX509SerialNumber ); m_bInX509SerialNumber = false; } - else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509CERTIFICATE))) + else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509CERTIFICATE))) { m_pXSecController->setX509Certificate( m_ouX509Certificate ); m_bInX509Certificate = false; } - else if (aName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC)) - +rtl::OUString(":") - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE))) + else if (aName == OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC)) + +OUString(":") + +OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE))) { m_pXSecController->setDate( m_ouDate ); m_bInDate = false; @@ -262,19 +262,19 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName ) {//getCaughtException MUST be the first line in the catch block cssu::Any exc = cppu::getCaughtException(); throw cssxs::SAXException( - rtl::OUString( + OUString( "xmlsecurity: Exception in XSecParser::endElement"), 0, exc); } catch (...) { throw cssxs::SAXException( - rtl::OUString("xmlsecurity: unexpected exception in XSecParser::endElement"), 0, + OUString("xmlsecurity: unexpected exception in XSecParser::endElement"), 0, cssu::Any()); } } -void SAL_CALL XSecParser::characters( const rtl::OUString& aChars ) +void SAL_CALL XSecParser::characters( const OUString& aChars ) throw (cssxs::SAXException, cssu::RuntimeException) { if (m_bInX509IssuerName) @@ -308,7 +308,7 @@ void SAL_CALL XSecParser::characters( const rtl::OUString& aChars ) } } -void SAL_CALL XSecParser::ignorableWhitespace( const rtl::OUString& aWhitespaces ) +void SAL_CALL XSecParser::ignorableWhitespace( const OUString& aWhitespaces ) throw (cssxs::SAXException, cssu::RuntimeException) { if (m_xNextHandler.is()) @@ -317,7 +317,7 @@ void SAL_CALL XSecParser::ignorableWhitespace( const rtl::OUString& aWhitespaces } } -void SAL_CALL XSecParser::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData ) +void SAL_CALL XSecParser::processingInstruction( const OUString& aTarget, const OUString& aData ) throw (cssxs::SAXException, cssu::RuntimeException) { if (m_xNextHandler.is()) diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx index f5d3fae39f8a..f37df23a8a60 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -58,12 +58,12 @@ private: * the following members are used to reserve the signature information, * including X509IssuerName, X509SerialNumber, and X509Certificate,etc. */ - rtl::OUString m_ouX509IssuerName; - rtl::OUString m_ouX509SerialNumber; - rtl::OUString m_ouX509Certificate; - rtl::OUString m_ouDigestValue; - rtl::OUString m_ouSignatureValue; - rtl::OUString m_ouDate; + OUString m_ouX509IssuerName; + OUString m_ouX509SerialNumber; + OUString m_ouX509Certificate; + OUString m_ouDigestValue; + OUString m_ouSignatureValue; + OUString m_ouDate; /* * whether inside a particular element @@ -93,11 +93,11 @@ private: * only after the Transforms element is read in, so we have to reserve the reference's * URI when the startElement event is met. */ - rtl::OUString m_currentReferenceURI; + OUString m_currentReferenceURI; bool m_bReferenceUnresolved; private: - rtl::OUString getIdAttr(const com::sun::star::uno::Reference< + OUString getIdAttr(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ); public: @@ -116,23 +116,23 @@ public: throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const rtl::OUString& aName ) + virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const rtl::OUString& aChars ) + virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL processingInstruction( - const rtl::OUString& aTarget, - const rtl::OUString& aData ) + const OUString& aTarget, + const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx index 431c26153891..4fbfb40b2864 100644 --- a/xmlsecurity/source/helper/xsecsign.cxx +++ b/xmlsecurity/source/helper/xsecsign.cxx @@ -41,7 +41,7 @@ namespace cssxs = com::sun::star::xml::sax; #define SIGNATURECREATOR_COMPONENT "com.sun.star.xml.crypto.sax.SignatureCreator" /* protected: for signature generation */ -rtl::OUString XSecController::createId() +OUString XSecController::createId() { cssu::Sequence< sal_Int8 > aSeq( 16 ); rtl_createUuid ((sal_uInt8 *)aSeq.getArray(), 0, sal_True); @@ -53,7 +53,7 @@ rtl::OUString XSecController::createId() length += sprintf(str+length, "%04x", (unsigned char)aSeq[i]); } - return rtl::OUString::createFromAscii(str); + return OUString::createFromAscii(str); } cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepareSignatureToWrite( @@ -76,15 +76,15 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() ); xReferenceResolvedListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >( xMCF->createInstanceWithContext( - rtl::OUString(SIGNATURECREATOR_COMPONENT), mxCtx), + OUString(SIGNATURECREATOR_COMPONENT), mxCtx), cssu::UNO_QUERY); cssu::Reference xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY); cssu::Sequence args(5); - args[0] = cssu::makeAny(rtl::OUString::valueOf(nSecurityId)); + args[0] = cssu::makeAny(OUString::valueOf(nSecurityId)); args[1] = cssu::makeAny(m_xSAXEventKeeper); - args[2] = cssu::makeAny(rtl::OUString::valueOf(nIdOfSignatureElementCollector)); + args[2] = cssu::makeAny(OUString::valueOf(nIdOfSignatureElementCollector)); //i39448 : for nss, the internal module is used for signing, which needs to be improved later sal_Int32 nEnvIndex = internalSignatureInfor.signatureInfor.nSecurityEnvironmentIndex; @@ -175,15 +175,15 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar for(i=0; i XSecController::prepar cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() ); xReferenceResolvedListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >( xMCF->createInstanceWithContext( - rtl::OUString( SIGNATUREVERIFIER_COMPONENT ), mxCtx), + OUString( SIGNATUREVERIFIER_COMPONENT ), mxCtx), cssu::UNO_QUERY); cssu::Reference xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY); cssu::Sequence args(5); - args[0] = cssu::makeAny(rtl::OUString::valueOf(nSecurityId)); + args[0] = cssu::makeAny(OUString::valueOf(nSecurityId)); args[1] = cssu::makeAny(m_xSAXEventKeeper); - args[2] = cssu::makeAny(rtl::OUString::valueOf(nIdOfSignatureElementCollector)); + args[2] = cssu::makeAny(OUString::valueOf(nIdOfSignatureElementCollector)); args[3] = cssu::makeAny(m_xSecurityContext); args[4] = cssu::makeAny(m_xXMLSignature); xInitialization->initialize(args); @@ -111,7 +111,7 @@ void XSecController::addSignature() m_vInternalSignatureInformations.push_back( isi ); } -void XSecController::addReference( const rtl::OUString& ouUri) +void XSecController::addReference( const OUString& ouUri) { if (m_vInternalSignatureInformations.empty()) { @@ -123,7 +123,7 @@ void XSecController::addReference( const rtl::OUString& ouUri) } void XSecController::addStreamReference( - const rtl::OUString& ouUri, + const OUString& ouUri, bool isBinary ) { sal_Int32 type = (isBinary?TYPE_BINARYSTREAM_REFERENCE:TYPE_XMLSTREAM_REFERENCE); @@ -188,7 +188,7 @@ void XSecController::setReferenceCount() const } } -void XSecController::setX509IssuerName( rtl::OUString& ouX509IssuerName ) +void XSecController::setX509IssuerName( OUString& ouX509IssuerName ) { if (m_vInternalSignatureInformations.empty()) { @@ -199,7 +199,7 @@ void XSecController::setX509IssuerName( rtl::OUString& ouX509IssuerName ) isi.signatureInfor.ouX509IssuerName = ouX509IssuerName; } -void XSecController::setX509SerialNumber( rtl::OUString& ouX509SerialNumber ) +void XSecController::setX509SerialNumber( OUString& ouX509SerialNumber ) { if (m_vInternalSignatureInformations.empty()) { @@ -210,7 +210,7 @@ void XSecController::setX509SerialNumber( rtl::OUString& ouX509SerialNumber ) isi.signatureInfor.ouX509SerialNumber = ouX509SerialNumber; } -void XSecController::setX509Certificate( rtl::OUString& ouX509Certificate ) +void XSecController::setX509Certificate( OUString& ouX509Certificate ) { if (m_vInternalSignatureInformations.empty()) { @@ -221,7 +221,7 @@ void XSecController::setX509Certificate( rtl::OUString& ouX509Certificate ) isi.signatureInfor.ouX509Certificate = ouX509Certificate; } -void XSecController::setSignatureValue( rtl::OUString& ouSignatureValue ) +void XSecController::setSignatureValue( OUString& ouSignatureValue ) { if (m_vInternalSignatureInformations.empty()) { @@ -232,7 +232,7 @@ void XSecController::setSignatureValue( rtl::OUString& ouSignatureValue ) isi.signatureInfor.ouSignatureValue = ouSignatureValue; } -void XSecController::setDigestValue( rtl::OUString& ouDigestValue ) +void XSecController::setDigestValue( OUString& ouDigestValue ) { if (m_vInternalSignatureInformations.empty()) { @@ -250,7 +250,7 @@ void XSecController::setDigestValue( rtl::OUString& ouDigestValue ) reference.ouDigestValue = ouDigestValue; } -void XSecController::setDate( rtl::OUString& ouDate ) +void XSecController::setDate( OUString& ouDate ) { if (m_vInternalSignatureInformations.empty()) { @@ -262,7 +262,7 @@ void XSecController::setDate( rtl::OUString& ouDate ) isi.signatureInfor.ouDateTime = ouDate; } -void XSecController::setId( rtl::OUString& ouId ) +void XSecController::setId( OUString& ouId ) { if (m_vInternalSignatureInformations.empty()) { @@ -273,7 +273,7 @@ void XSecController::setId( rtl::OUString& ouId ) isi.signatureInfor.ouSignatureId = ouId; } -void XSecController::setPropertyId( rtl::OUString& ouPropertyId ) +void XSecController::setPropertyId( OUString& ouPropertyId ) { if (m_vInternalSignatureInformations.empty()) { @@ -285,7 +285,7 @@ void XSecController::setPropertyId( rtl::OUString& ouPropertyId ) } /* public: for signature verify */ -void XSecController::collectToVerify( const rtl::OUString& referenceId ) +void XSecController::collectToVerify( const OUString& referenceId ) { /* DBG_ASSERT( m_xSAXEventKeeper.is(), "the SAXEventKeeper is NULL" ); */ diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx index 652e130f845d..ae63a291836d 100644 --- a/xmlsecurity/source/xmlsec/biginteger.cxx +++ b/xmlsecurity/source/xmlsec/biginteger.cxx @@ -24,7 +24,6 @@ #include using namespace ::com::sun::star::uno ; -using ::rtl::OUString ; Sequence< sal_Int8 > numericStringToBigInteger ( OUString numeral ) { @@ -35,7 +34,7 @@ Sequence< sal_Int8 > numericStringToBigInteger ( OUString numeral ) xmlSecSize length ; xmlSecBn bn ; - rtl::OString onumeral = rtl::OUStringToOString( numeral , RTL_TEXTENCODING_ASCII_US ) ; + OString onumeral = OUStringToOString( numeral , RTL_TEXTENCODING_ASCII_US ) ; chNumeral = xmlStrndup( ( const xmlChar* )onumeral.getStr(), ( int )onumeral.getLength() ) ; diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx index f4e270972a12..04736cbc5787 100644 --- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx @@ -25,7 +25,6 @@ #endif using namespace ::com::sun::star::uno ; -using ::rtl::OUString ; using ::com::sun::star::security::XCertificateExtension ; diff --git a/xmlsecurity/source/xmlsec/certvalidity.cxx b/xmlsecurity/source/xmlsec/certvalidity.cxx index dfe46fad3de8..f27dd208de19 100644 --- a/xmlsecurity/source/xmlsec/certvalidity.cxx +++ b/xmlsecurity/source/xmlsec/certvalidity.cxx @@ -21,7 +21,6 @@ #include #include -using ::rtl::OUString ; using namespace ::com::sun::star::security ; #define VALID_STR "valid certificate" @@ -42,7 +41,7 @@ using namespace ::com::sun::star::security ; #define ROOT_INVALID_STR "invalid root certificate" #define CHAIN_INCOMPLETE_STR "invalid certification path" -rtl::OUString certificateValidityToOUString( ::sal_Int32 certValidity ) { +OUString certificateValidityToOUString( ::sal_Int32 certValidity ) { OUString aValidity ; if( certValidity == CertificateValidity::VALID ) { diff --git a/xmlsecurity/source/xmlsec/diagnose.cxx b/xmlsecurity/source/xmlsec/diagnose.cxx index 913c87c7e025..0e24b6dd1cd6 100644 --- a/xmlsecurity/source/xmlsec/diagnose.cxx +++ b/xmlsecurity/source/xmlsec/diagnose.cxx @@ -29,9 +29,9 @@ struct UseDiagnose : public rtl::StaticWithInit< bool, UseDiagnose> { bool operator () () const { - ::rtl::OUString value; + OUString value; sal_Bool res = rtl::Bootstrap::get( - ::rtl::OUString("XMLSECURITY_TRACE"), value); + OUString("XMLSECURITY_TRACE"), value); return res == sal_True ? true : false; } }; diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx index 1fa81720f00f..29e928ce37ad 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::security ; -using ::rtl::OUString ; using ::com::sun::star::security::XCertificateExtension ; @@ -79,7 +78,7 @@ sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno: PCERT_OTHER_NAME pOtherName = pEntry->pOtherName; ::com::sun::star::beans::NamedValue otherNameProp; - otherNameProp.Name = ::rtl::OUString::createFromAscii(pOtherName->pszObjId); + otherNameProp.Name = OUString::createFromAscii(pOtherName->pszObjId); Sequence< sal_Int8 > otherName( pOtherName->Value.cbData ) ; for( unsigned int n = 0; n < (unsigned int) pOtherName->Value.cbData ; n ++ ) @@ -92,11 +91,11 @@ sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno: } case CERT_ALT_NAME_RFC822_NAME : arrCertAltNameEntry[i].Type = ExtAltNameType_RFC822_NAME; - arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Unicode*)pEntry->pwszRfc822Name); + arrCertAltNameEntry[i].Value <<= OUString((const sal_Unicode*)pEntry->pwszRfc822Name); break; case CERT_ALT_NAME_DNS_NAME : arrCertAltNameEntry[i].Type = ExtAltNameType_DNS_NAME; - arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Unicode*)pEntry->pwszDNSName); + arrCertAltNameEntry[i].Value <<= OUString((const sal_Unicode*)pEntry->pwszDNSName); break; case CERT_ALT_NAME_DIRECTORY_NAME : { @@ -105,7 +104,7 @@ sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno: } case CERT_ALT_NAME_URL : arrCertAltNameEntry[i].Type = ExtAltNameType_URL; - arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Unicode*)pEntry->pwszURL); + arrCertAltNameEntry[i].Value <<= OUString((const sal_Unicode*)pEntry->pwszURL); break; case CERT_ALT_NAME_IP_ADDRESS : { @@ -120,7 +119,7 @@ sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno: } case CERT_ALT_NAME_REGISTERED_ID : arrCertAltNameEntry[i].Type = ExtAltNameType_REGISTERED_ID; - arrCertAltNameEntry[i].Value <<= ::rtl::OUString::createFromAscii(pEntry->pszRegisteredID); + arrCertAltNameEntry[i].Value <<= OUString::createFromAscii(pEntry->pszRegisteredID); break; } } diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index c1b2194efc4d..3bdcd562dd98 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using ::com::sun::star::lang::XMultiServiceFactory ; using ::com::sun::star::lang::XSingleServiceFactory ; -using ::rtl::OUString ; using ::com::sun::star::xml::crypto::XSecurityEnvironment ; using ::com::sun::star::security::XCertificate ; @@ -537,7 +536,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con encoding = osl_getTextEncodingFromLocale( pLocale ) ; //Create cert info from issue and serial - rtl::OString oissuer = rtl::OUStringToOString( issuerName , encoding ) ; + OString oissuer = OUStringToOString( issuerName , encoding ) ; pszName = ( char* )oissuer.getStr() ; if( ! ( CertStrToName( @@ -865,7 +864,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: createCertificateFr xmlChar* chCert ; xmlSecSize certSize ; - rtl::OString oscert = rtl::OUStringToOString( asciiCertificate , RTL_TEXTENCODING_ASCII_US ) ; + OString oscert = OUStringToOString( asciiCertificate , RTL_TEXTENCODING_ASCII_US ) ; chCert = xmlStrndup( ( const xmlChar* )oscert.getStr(), ( int )oscert.getLength() ) ; @@ -1159,9 +1158,9 @@ X509Certificate_MSCryptImpl* MswcryCertContextToXCert( PCCERT_CONTEXT cert ) return xcert ; } -::rtl::OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException ) +OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException ) { - return rtl::OUString("Microsoft Crypto API"); + return OUString("Microsoft Crypto API"); } /* Native methods */ diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index e721b36c176b..23352433adac 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -88,13 +88,13 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4< throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( - const ::rtl::OUString& issuerName, + const OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( - const ::rtl::OUString& issuerName, - const ::rtl::OUString& serialNumber ) + const OUString& issuerName, + const OUString& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL buildCertificatePath( @@ -106,7 +106,7 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4< throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( - const ::rtl::OUString& asciiCertificate ) + const OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; virtual ::sal_Int32 SAL_CALL verifyCertificate( @@ -119,7 +119,7 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4< const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert ) throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getSecurityEnvironmentInformation( ) + virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) throw (::com::sun::star::uno::RuntimeException); @@ -129,18 +129,18 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4< ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; //Methods from XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName + const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for XServiceInfo - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ; + static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; - static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for registry static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx index 9f69255fe98f..36ea2903ae1b 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx @@ -47,7 +47,7 @@ SEInitializer_MSCryptImpl::~SEInitializer_MSCryptImpl() /* XSEInitializer */ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL SEInitializer_MSCryptImpl::createSecurityContext( - const rtl::OUString& sCertDB ) + const OUString& sCertDB ) throw (cssu::RuntimeException) { const char* n_pCertStore ; @@ -56,7 +56,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL //Initialize the crypto engine if( sCertDB.getLength() > 0 ) { - rtl::OString sCertDir(sCertDB.getStr(), sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US); + OString sCertDir(sCertDB.getStr(), sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US); n_pCertStore = sCertDir.getStr(); n_hStoreHandle = CertOpenSystemStore( NULL, n_pCertStore ) ; if( n_hStoreHandle == NULL ) @@ -74,7 +74,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL try { /* Build Security Environment */ - const rtl::OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) ); + const OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) ); cssu::Reference< cssxc::XSecurityEnvironment > xSecEnv( mxMSF->createInstance ( sSecyrutyEnvironment ), cssu::UNO_QUERY ); if( !xSecEnv.is() ) { @@ -123,7 +123,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL } /* Build XML Security Context */ - const rtl::OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) ); + const OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) ); cssu::Reference< cssxc::XXMLSecurityContext > xSecCtx( mxMSF->createInstance ( sSecyrutyContext ), cssu::UNO_QUERY ); if( !xSecCtx.is() ) { @@ -181,24 +181,24 @@ void SAL_CALL SEInitializer_MSCryptImpl::freeSecurityContext( const cssu::Refere xmlSecMSCryptoAppShutdown() ; } -rtl::OUString SEInitializer_MSCryptImpl_getImplementationName () +OUString SEInitializer_MSCryptImpl_getImplementationName () throw (cssu::RuntimeException) { - return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } -sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const OUString& ServiceName ) throw (cssu::RuntimeException) { return ServiceName == SERVICE_NAME; } -cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames( ) throw (cssu::RuntimeException) { - cssu::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + cssu::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); return aRet; } #undef SERVICE_NAME @@ -210,17 +210,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SEInitializer_MSCryptImpl_createIns } /* XServiceInfo */ -rtl::OUString SAL_CALL SEInitializer_MSCryptImpl::getImplementationName( ) +OUString SAL_CALL SEInitializer_MSCryptImpl::getImplementationName( ) throw (cssu::RuntimeException) { return SEInitializer_MSCryptImpl_getImplementationName(); } -sal_Bool SAL_CALL SEInitializer_MSCryptImpl::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL SEInitializer_MSCryptImpl::supportsService( const OUString& rServiceName ) throw (cssu::RuntimeException) { return SEInitializer_MSCryptImpl_supportsService( rServiceName ); } -cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl::getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl::getSupportedServiceNames( ) throw (cssu::RuntimeException) { return SEInitializer_MSCryptImpl_getSupportedServiceNames(); diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx index 3b1ae78346e3..e622f933f3be 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx @@ -60,7 +60,7 @@ public: /* XSEInitializer */ virtual com::sun::star::uno::Reference< com::sun::star::xml::crypto::XXMLSecurityContext > - SAL_CALL createSecurityContext( const rtl::OUString& certDB ) + SAL_CALL createSecurityContext( const OUString& certDB ) throw (com::sun::star::uno::RuntimeException); virtual void SAL_CALL freeSecurityContext( const com::sun::star::uno::Reference< @@ -68,23 +68,23 @@ public: throw (com::sun::star::uno::RuntimeException); /* XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (com::sun::star::uno::RuntimeException); }; -rtl::OUString SEInitializer_MSCryptImpl_getImplementationName() +OUString SEInitializer_MSCryptImpl_getImplementationName() throw ( com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames( ) +com::sun::star::uno::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames( ) throw ( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx index bf9b518cfc2b..2ec2145a7ca6 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::security ; -using ::rtl::OUString ; using ::com::sun::star::security::XCertificate ; using ::com::sun::star::util::DateTime ; @@ -196,7 +195,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su } } -::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) { +OUString SAL_CALL X509Certificate_MSCryptImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) { if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) { char* issuer ; DWORD cbIssuer ; @@ -245,7 +244,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su } } -::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) { if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) { @@ -378,7 +377,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su pExtn = &(m_pCertContext->pCertInfo->rgExtension[i]) ; - ::rtl::OUString objId = ::rtl::OUString::createFromAscii( pExtn->pszObjId ); + OUString objId = OUString::createFromAscii( pExtn->pszObjId ); if ( objId == "2.5.29.17" ) xExtn = (CertificateExtension_XmlSecImpl*) new SanExtensionImpl() ; @@ -497,7 +496,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c return NULL ; } -::rtl::OUString findOIDDescription(char *oid) +OUString findOIDDescription(char *oid) { OUString ouOID = OUString::createFromAscii( oid ); for (int i=0; i(); } -::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm() +OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm() throw ( ::com::sun::star::uno::RuntimeException) { if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) @@ -573,7 +572,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c } } -::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl::getSignatureAlgorithm() +OUString SAL_CALL X509Certificate_MSCryptImpl::getSignatureAlgorithm() throw ( ::com::sun::star::uno::RuntimeException) { if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx index 1d327251add2..73801d8e1bc2 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx @@ -52,8 +52,8 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper2< virtual sal_Int16 SAL_CALL getVersion() throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber() throw ( ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidBefore() throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidAfter() throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID() throw ( ::com::sun::star::uno::RuntimeException) ; @@ -61,11 +61,11 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper2< virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL getExtensions() throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getEncoded() throw ( ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getSubjectPublicKeyAlgorithm() + virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm() throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue() throw ( ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getSignatureAlgorithm() + virtual OUString SAL_CALL getSignatureAlgorithm() throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint() throw ( ::com::sun::star::uno::RuntimeException) ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx index 2addf5505c63..5020c2c71597 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using ::com::sun::star::lang::XMultiServiceFactory ; using ::com::sun::star::lang::XSingleServiceFactory ; -using ::rtl::OUString ; using ::com::sun::star::xml::wrapper::XXMLElementWrapper ; using ::com::sun::star::xml::wrapper::XXMLDocumentWrapper ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx index 470557b9b545..80fe3ff1971a 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx @@ -67,18 +67,18 @@ class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper3< ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; //Methods from XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName + const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for XServiceInfo - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ; + static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; - static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for registry static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index 1aa241ad9a1a..fd67c7e3997c 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using ::com::sun::star::lang::XMultiServiceFactory ; using ::com::sun::star::lang::XSingleServiceFactory ; -using ::rtl::OUString ; using ::com::sun::star::xml::crypto::XSecurityEnvironment ; using ::com::sun::star::xml::crypto::XXMLSecurityContext ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx index 9ee8e029647f..16416b8cf93b 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx @@ -81,18 +81,18 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper3< ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; //Methods from XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName + const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for XServiceInfo - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ; + static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; - static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for registry static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index 73a17612ea7d..2f3907ab3411 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using ::com::sun::star::lang::XMultiServiceFactory ; using ::com::sun::star::lang::XSingleServiceFactory ; -using ::rtl::OUString ; using ::com::sun::star::xml::wrapper::XXMLElementWrapper ; using ::com::sun::star::xml::wrapper::XXMLDocumentWrapper ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx index 40bb7c1ce447..3d231ad41254 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx @@ -67,18 +67,18 @@ class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper3< ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; //Methods from XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName + const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for XServiceInfo - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ; + static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; - static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for registry static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ; diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx index 23961db9e350..018b9991b4b0 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx @@ -187,7 +187,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::finalizeCipherContextAndDis // if it is decryption, the amount of data should be rounded to the block size even in case of padding if ( ( !m_bPadding || !m_bEncryption ) && nSizeForPadding ) - throw uno::RuntimeException( ::rtl::OUString( "The data should contain complete blocks only." ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "The data should contain complete blocks only." ), uno::Reference< uno::XInterface >() ); if ( m_bW3CPadding && m_bEncryption ) { diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 24df691143c4..3ec0106ab6c6 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -70,8 +70,6 @@ namespace cssl = css::lang; using namespace xmlsecurity; using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OString; #define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.NSSInitializer_NssImpl" @@ -162,7 +160,7 @@ void deleteRootsModule() } } -::rtl::OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponentContext > &rxContext ) +OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponentContext > &rxContext ) { // first, try to get the profile from "MOZILLA_CERTIFICATE_FOLDER" const char* pEnv = getenv("MOZILLA_CERTIFICATE_FOLDER"); @@ -171,14 +169,14 @@ void deleteRootsModule() SAL_INFO( "xmlsecurity.xmlsec", "Using Mozilla profile from MOZILLA_CERTIFICATE_FOLDER=" << pEnv); - return rtl::OString(pEnv); + return OString(pEnv); } // second, try to get saved user-preference try { - rtl::OUString sUserSetCertPath = - officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(rtl::OUString()); + OUString sUserSetCertPath = + officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString()); if (!sUserSetCertPath.isEmpty()) { @@ -186,7 +184,7 @@ void deleteRootsModule() "xmlsecurity.xmlsec", "Using Mozilla profile from /org.openoffice.Office.Common/" "Security/Scripting/CertDir: " << sUserSetCertPath); - return rtl::OUStringToOString(sUserSetCertPath, osl_getThreadTextEncoding()); + return OUStringToOString(sUserSetCertPath, osl_getThreadTextEncoding()); } } catch (const uno::Exception &e) @@ -214,21 +212,21 @@ void deleteRootsModule() { for (int i=0; igetDefaultProfile(productTypes[i]); + OUString profile = xMozillaBootstrap->getDefaultProfile(productTypes[i]); if (!profile.isEmpty()) { - rtl::OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile ); + OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile ); SAL_INFO( "xmlsecurity.xmlsec", "Using Mozilla profile " << sProfilePath); - return rtl::OUStringToOString(sProfilePath, osl_getThreadTextEncoding()); + return OUStringToOString(sProfilePath, osl_getThreadTextEncoding()); } } } SAL_INFO("xmlsecurity.xmlsec", "No Mozilla profile found"); - return rtl::OString(); + return OString(); } //Older versions of Firefox (FF), for example FF2, and Thunderbird (TB) 2 write @@ -257,7 +255,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex bool return_value = true; // this method must be called only once, no need for additional lock - rtl::OString sCertDir; + OString sCertDir; #ifdef XMLSEC_CRYPTO_NSS sCertDir = getMozillaCurrentProfile(rxContext); @@ -321,8 +319,8 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex OUString rootModulePath; if (::osl::File::E_None == ::osl::File::getSystemPathFromFileURL(rootModule, rootModulePath)) { - ::rtl::OString ospath = ::rtl::OUStringToOString(rootModulePath, osl_getThreadTextEncoding()); - ::rtl::OStringBuffer pkcs11moduleSpec; + OString ospath = OUStringToOString(rootModulePath, osl_getThreadTextEncoding()); + OStringBuffer pkcs11moduleSpec; pkcs11moduleSpec.append("name=\""); pkcs11moduleSpec.append(ROOT_CERTS); pkcs11moduleSpec.append("\" library=\""); @@ -437,10 +435,10 @@ css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL ONSSInitializer b1KData = ( nDigestID == css::xml::crypto::DigestID::SHA1_1K ); } else - throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected digest requested." ), css::uno::Reference< css::uno::XInterface >(), 1 ); + throw css::lang::IllegalArgumentException( OUString( "Unexpected digest requested." ), css::uno::Reference< css::uno::XInterface >(), 1 ); if ( aParams.getLength() ) - throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected arguments provided for digest creation." ), css::uno::Reference< css::uno::XInterface >(), 2 ); + throw css::lang::IllegalArgumentException( OUString( "Unexpected arguments provided for digest creation." ), css::uno::Reference< css::uno::XInterface >(), 2 ); css::uno::Reference< css::xml::crypto::XDigestContext > xResult; if( initNSS( m_xContext ) ) @@ -464,19 +462,19 @@ css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL ONSSInitializer bW3CPadding = true; if ( aKey.getLength() != 16 && aKey.getLength() != 24 && aKey.getLength() != 32 ) - throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected key length." ), css::uno::Reference< css::uno::XInterface >(), 2 ); + throw css::lang::IllegalArgumentException( OUString( "Unexpected key length." ), css::uno::Reference< css::uno::XInterface >(), 2 ); if ( aParams.getLength() ) - throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected arguments provided for cipher creation." ), css::uno::Reference< css::uno::XInterface >(), 5 ); + throw css::lang::IllegalArgumentException( OUString( "Unexpected arguments provided for cipher creation." ), css::uno::Reference< css::uno::XInterface >(), 5 ); } else - throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected cipher requested." ), css::uno::Reference< css::uno::XInterface >(), 1 ); + throw css::lang::IllegalArgumentException( OUString( "Unexpected cipher requested." ), css::uno::Reference< css::uno::XInterface >(), 1 ); css::uno::Reference< css::xml::crypto::XCipherContext > xResult; if( initNSS( m_xContext ) ) { if ( aInitializationVector.getLength() != PK11_GetIVLength( nNSSCipherID ) ) - throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected length of initialization vector." ), css::uno::Reference< css::uno::XInterface >(), 3 ); + throw css::lang::IllegalArgumentException( OUString( "Unexpected length of initialization vector." ), css::uno::Reference< css::uno::XInterface >(), 3 ); xResult = OCipherContext::Create( nNSSCipherID, aKey, aInitializationVector, bEncryption, bW3CPadding ); } @@ -484,25 +482,25 @@ css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL ONSSInitializer return xResult; } -rtl::OUString ONSSInitializer_getImplementationName () +OUString ONSSInitializer_getImplementationName () throw (cssu::RuntimeException) { - return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } -sal_Bool SAL_CALL ONSSInitializer_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ONSSInitializer_supportsService( const OUString& ServiceName ) throw (cssu::RuntimeException) { return ServiceName == NSS_SERVICE_NAME; } -cssu::Sequence< rtl::OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( ) throw (cssu::RuntimeException) { - cssu::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) ); + cssu::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) ); return aRet; } @@ -513,17 +511,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL ONSSInitializer_createInstance( con } /* XServiceInfo */ -rtl::OUString SAL_CALL ONSSInitializer::getImplementationName() +OUString SAL_CALL ONSSInitializer::getImplementationName() throw (cssu::RuntimeException) { return ONSSInitializer_getImplementationName(); } -sal_Bool SAL_CALL ONSSInitializer::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL ONSSInitializer::supportsService( const OUString& rServiceName ) throw (cssu::RuntimeException) { return ONSSInitializer_supportsService( rServiceName ); } -cssu::Sequence< rtl::OUString > SAL_CALL ONSSInitializer::getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL ONSSInitializer::getSupportedServiceNames( ) throw (cssu::RuntimeException) { return ONSSInitializer_getSupportedServiceNames(); diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx index 4e6197d0e923..5e4fa780e61e 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx @@ -53,23 +53,23 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aKey, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aInitializationVector, ::sal_Bool bEncryption, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); /* XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; -rtl::OUString ONSSInitializer_getImplementationName() +OUString ONSSInitializer_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL ONSSInitializer_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ONSSInitializer_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames() +com::sun::star::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx index e9ac78e694ac..f0782d0d780a 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::security ; -using ::rtl::OUString ; using ::com::sun::star::security::XCertificateExtension ; @@ -111,7 +110,7 @@ namespace { case certOtherName: { arrCertAltNameEntry[i].Type = ExtAltNameType_OTHER_NAME; ::com::sun::star::beans::PropertyValue otherNameProp; - otherNameProp.Name = ::rtl::OUString::createFromAscii(CERT_GetOidString(¤t->name.OthName.oid)); + otherNameProp.Name = OUString::createFromAscii(CERT_GetOidString(¤t->name.OthName.oid)); Sequence< sal_Int8 > otherName( current->name.OthName.name.len ) ; for( unsigned int r = 0; r < current->name.OthName.name.len ; r ++ ) @@ -124,11 +123,11 @@ namespace { } case certRFC822Name: arrCertAltNameEntry[i].Type = ExtAltNameType_RFC822_NAME; - arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US); + arrCertAltNameEntry[i].Value <<= OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US); break; case certDNSName: arrCertAltNameEntry[i].Type = ExtAltNameType_DNS_NAME; - arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US); + arrCertAltNameEntry[i].Value <<= OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US); break; case certX400Address: { // unsupported @@ -147,7 +146,7 @@ namespace { } case certURI: arrCertAltNameEntry[i].Type = ExtAltNameType_URL; - arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US); + arrCertAltNameEntry[i].Value <<= OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US); break; case certIPAddress: { arrCertAltNameEntry[i].Type = ExtAltNameType_IP_ADDRESS; @@ -163,9 +162,9 @@ namespace { arrCertAltNameEntry[i].Type = ExtAltNameType_REGISTERED_ID; - rtl::OString nssOid = ::rtl::OString(CERT_GetOidString(¤t->name.other)); - rtl::OString unoOid = removeOIDFromString(nssOid); - arrCertAltNameEntry[i].Value <<= rtl::OStringToOUString( unoOid, RTL_TEXTENCODING_ASCII_US ); + OString nssOid = OString(CERT_GetOidString(¤t->name.other)); + OString unoOid = removeOIDFromString(nssOid); + arrCertAltNameEntry[i].Value <<= OStringToOUString( unoOid, RTL_TEXTENCODING_ASCII_US ); break; } current = CERT_GetNextGeneralName(current); @@ -183,10 +182,10 @@ namespace { return m_Entries; } -::rtl::OString SanExtensionImpl :: removeOIDFromString( const ::rtl::OString &oidString) +OString SanExtensionImpl :: removeOIDFromString( const OString &oidString) { - ::rtl::OString objID; - ::rtl::OString oid("OID."); + OString objID; + OString oid("OID."); if (oidString.match(oid)) objID = oidString.copy(oid.getLength()); else diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx index 84f7f095fecc..ec9588da59d7 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx @@ -39,7 +39,7 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ; ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > m_Entries; - ::rtl::OString removeOIDFromString( const ::rtl::OString &oid); + OString removeOIDFromString( const OString &oid); public : SanExtensionImpl() ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 8201fadbd0c5..1d38b2a5f15f 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -53,7 +53,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using ::com::sun::star::lang::XMultiServiceFactory ; using ::com::sun::star::lang::XSingleServiceFactory ; -using ::rtl::OUString ; using ::com::sun::star::xml::crypto::XSecurityEnvironment ; using ::com::sun::star::security::XCertificate ; @@ -100,14 +99,14 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ ) task::PasswordRequestMode eMode = bRetry ? task::PasswordRequestMode_PASSWORD_REENTER : task::PasswordRequestMode_PASSWORD_ENTER; ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest( - ::comphelper::DocPasswordRequestType_STANDARD, eMode, ::rtl::OUString::createFromAscii(PK11_GetTokenName(pSlot)) ); + ::comphelper::DocPasswordRequestType_STANDARD, eMode, OUString::createFromAscii(PK11_GetTokenName(pSlot)) ); uno::Reference< task::XInteractionRequest > xRequest( pPasswordRequest ); xInteractionHandler->handle( xRequest ); if ( pPasswordRequest->isPassword() ) { - rtl::OString aPassword(rtl::OUStringToOString( + OString aPassword(OUStringToOString( pPasswordRequest->getPassword(), osl_getThreadTextEncoding())); sal_Int32 nLen = aPassword.getLength(); @@ -224,12 +223,12 @@ const Sequence< sal_Int8>& SecurityEnvironment_NssImpl :: getUnoTunnelId() { return theSecurityEnvironment_NssImplUnoTunnelId::get().getSeq(); } -::rtl::OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException ) +OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException ) { - ::rtl::OUStringBuffer buff; + OUStringBuffer buff; for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); is++) { - buff.append(rtl::OUString::createFromAscii(PK11_GetTokenName(*is))); + buff.append(OUString::createFromAscii(PK11_GetTokenName(*is))); buff.appendAscii("\n"); } return buff.makeStringAndClear(); @@ -560,7 +559,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O throw RuntimeException() ; // Create cert info from issue and serial - rtl::OString ostr = rtl::OUStringToOString( issuerName , RTL_TEXTENCODING_UTF8 ) ; + OString ostr = OUStringToOString( issuerName , RTL_TEXTENCODING_UTF8 ) ; chIssuer = PL_strndup( ( char* )ostr.getStr(), ( int )ostr.getLength() ) ; nmIssuer = CERT_AsciiToName( chIssuer ) ; if( nmIssuer == NULL ) { @@ -686,7 +685,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: createCertificateFromAs xmlChar* chCert ; xmlSecSize certSize ; - rtl::OString oscert = rtl::OUStringToOString( asciiCertificate , RTL_TEXTENCODING_ASCII_US ) ; + OString oscert = OUStringToOString( asciiCertificate , RTL_TEXTENCODING_ASCII_US ) ; chCert = xmlStrndup( ( const xmlChar* )oscert.getStr(), ( int )oscert.getLength() ) ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index c8c0be10b4eb..482909936a91 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -77,18 +77,18 @@ private : ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; //Methods from XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName + const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for XServiceInfo - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ; + static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; - static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for registry static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ; @@ -105,7 +105,7 @@ private : virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert ) throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getSecurityEnvironmentInformation( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) throw (::com::sun::star::uno::RuntimeException); //Methods from XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) @@ -132,13 +132,13 @@ private : virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL getPersonalCertificates() throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const ::rtl::OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const ::rtl::OUString& issuerName, const ::rtl::OUString& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const OUString& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL buildCertificatePath( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& beginCert ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromRaw( const ::com::sun::star::uno::Sequence< sal_Int8 >& rawCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const ::rtl::OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; //Native mehtods diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 980ff36a189d..740b02f12e3b 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -57,8 +57,6 @@ namespace cssl = css::lang; namespace cssxc = css::xml::crypto; using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OString; #define SE_SERVICE_NAME "com.sun.star.xml.crypto.SEInitializer" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl" @@ -76,7 +74,7 @@ SEInitializer_NssImpl::~SEInitializer_NssImpl() /* XSEInitializer */ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL - SEInitializer_NssImpl::createSecurityContext( const ::rtl::OUString& ) + SEInitializer_NssImpl::createSecurityContext( const OUString& ) throw (uno::RuntimeException) { CERTCertDBHandle *pCertHandle = NULL ; @@ -89,12 +87,12 @@ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL try { /* Build XML Security Context */ - const rtl::OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) ); + const OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) ); uno::Reference< cssxc::XXMLSecurityContext > xSecCtx( m_xContext->getServiceManager()->createInstanceWithContext(sSecyrutyContext, m_xContext), uno::UNO_QUERY ); if( !xSecCtx.is() ) return NULL; - const rtl::OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) ); + const OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) ); uno::Reference< cssxc::XSecurityEnvironment > xSecEnv( m_xContext->getServiceManager()->createInstanceWithContext(sSecyrutyEnvironment, m_xContext), uno::UNO_QUERY ); uno::Reference< cssl::XUnoTunnel > xEnvTunnel( xSecEnv , uno::UNO_QUERY ) ; if( !xEnvTunnel.is() ) @@ -129,26 +127,26 @@ void SAL_CALL SEInitializer_NssImpl::freeSecurityContext( const uno::Reference< //NSS_Shutdown(); } -rtl::OUString SEInitializer_NssImpl_getImplementationName () +OUString SEInitializer_NssImpl_getImplementationName () throw (uno::RuntimeException) { - return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } -sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return ( ServiceName == SE_SERVICE_NAME || ServiceName == NSS_SERVICE_NAME ); } -uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence < rtl::OUString > aRet(2); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SE_SERVICE_NAME ) ); - pArray[1] = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) ); + uno::Sequence < OUString > aRet(2); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SE_SERVICE_NAME ) ); + pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) ); return aRet; } @@ -159,17 +157,17 @@ uno::Reference< uno::XInterface > SAL_CALL SEInitializer_NssImpl_createInstance( } /* XServiceInfo */ -rtl::OUString SAL_CALL SEInitializer_NssImpl::getImplementationName( ) +OUString SAL_CALL SEInitializer_NssImpl::getImplementationName( ) throw (uno::RuntimeException) { return SEInitializer_NssImpl_getImplementationName(); } -sal_Bool SAL_CALL SEInitializer_NssImpl::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL SEInitializer_NssImpl::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) { return SEInitializer_NssImpl_supportsService( rServiceName ); } -uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl::getSupportedServiceNames( ) throw (uno::RuntimeException) { return SEInitializer_NssImpl_getSupportedServiceNames(); diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx index f75f8dbb8e83..f379edc7772a 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx @@ -42,7 +42,7 @@ public: /* XSEInitializer */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext > - SAL_CALL createSecurityContext( const ::rtl::OUString& ) + SAL_CALL createSecurityContext( const OUString& ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL freeSecurityContext( const com::sun::star::uno::Reference< @@ -50,23 +50,23 @@ public: throw (com::sun::star::uno::RuntimeException); /* XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; -rtl::OUString SEInitializer_NssImpl_getImplementationName() +OUString SEInitializer_NssImpl_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ) +com::sun::star::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index 45f477e5b963..3e81cd6b102f 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::security ; -using ::rtl::OUString ; using ::com::sun::star::security::XCertificate ; using ::com::sun::star::util::DateTime ; @@ -76,7 +75,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s } } -::rtl::OUString SAL_CALL X509Certificate_NssImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) { +OUString SAL_CALL X509Certificate_NssImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) { if( m_pCert != NULL ) { return OUString(m_pCert->issuerName , PL_strlen(m_pCert->issuerName) , RTL_TEXTENCODING_UTF8) ; } else { @@ -84,7 +83,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s } } -::rtl::OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) { +OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) { if( m_pCert != NULL ) { return OUString(m_pCert->subjectName , PL_strlen(m_pCert->subjectName) , RTL_TEXTENCODING_UTF8); } else { @@ -186,11 +185,11 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s for( extns = m_pCert->extensions, len = 0; *extns != NULL; extns ++, len ++ ) { const SECItem id = (*extns)->id; - ::rtl::OString oidString(CERT_GetOidString(&id)); + OString oidString(CERT_GetOidString(&id)); // remove "OID." prefix if existing - ::rtl::OString objID; - ::rtl::OString oid("OID."); + OString objID; + OString oid("OID."); if (oidString.match(oid)) objID = oidString.copy(oid.getLength()); else @@ -230,7 +229,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s for( extns = m_pCert->extensions; *extns != NULL; extns ++ ) { if( SECITEM_CompareItem( &idItem, &(*extns)->id ) == SECEqual ) { const SECItem id = (*extns)->id; - ::rtl::OString objId(CERT_GetOidString(&id)); + OString objId(CERT_GetOidString(&id)); if ( objId.equals("OID.2.5.29.17") ) pExtn = (CertificateExtension_XmlSecImpl*) new SanExtensionImpl() ; else @@ -322,14 +321,14 @@ const Sequence< sal_Int8>& X509Certificate_NssImpl :: getUnoTunnelId() { return theX509Certificate_NssImplUnoTunnelId::get().getSeq(); } -::rtl::OUString getAlgorithmDescription(SECAlgorithmID *aid) +OUString getAlgorithmDescription(SECAlgorithmID *aid) { SECOidTag tag; tag = SECOID_GetAlgorithmTag(aid); const char *pDesc = SECOID_FindOIDTagDescription(tag); - return rtl::OUString::createFromAscii( pDesc ) ; + return OUString::createFromAscii( pDesc ) ; } ::com::sun::star::uno::Sequence< sal_Int8 > getThumbprint(CERTCertificate *pCert, SECOidTag id) @@ -354,7 +353,7 @@ const Sequence< sal_Int8>& X509Certificate_NssImpl :: getUnoTunnelId() { return ::com::sun::star::uno::Sequence< sal_Int8 >(); } -::rtl::OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm() +OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm() throw ( ::com::sun::star::uno::RuntimeException) { if( m_pCert != NULL ) @@ -390,7 +389,7 @@ const Sequence< sal_Int8>& X509Certificate_NssImpl :: getUnoTunnelId() { return ::com::sun::star::uno::Sequence< sal_Int8 >(); } -::rtl::OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm() +OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm() throw ( ::com::sun::star::uno::RuntimeException) { if( m_pCert != NULL ) diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx index 01ae74ee742a..ccc721151519 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx @@ -47,8 +47,8 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper2< virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber( ) throw ( ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getIssuerName( ) throw ( ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getSubjectName( ) throw ( ::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getIssuerName( ) throw ( ::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getSubjectName( ) throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidBefore( ) throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidAfter( ) throw ( ::com::sun::star::uno::RuntimeException) ; @@ -62,13 +62,13 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper2< virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getEncoded( ) throw ( ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getSubjectPublicKeyAlgorithm() + virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm() throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue() throw ( ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getSignatureAlgorithm() + virtual OUString SAL_CALL getSignatureAlgorithm() throw ( ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint() diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index 6e04c9decc31..ff797df81d67 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using ::com::sun::star::lang::XMultiServiceFactory ; using ::com::sun::star::lang::XSingleServiceFactory ; -using ::rtl::OUString ; using ::com::sun::star::xml::wrapper::XXMLElementWrapper ; using ::com::sun::star::xml::wrapper::XXMLDocumentWrapper ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx index d79cfdb2ade4..2c56aea0f234 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx @@ -67,18 +67,18 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper3< ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; //Methods from XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName + const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for XServiceInfo - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ; + static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; - static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for registry static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index a53955db733e..cd3c863d3e7f 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using ::com::sun::star::lang::XMultiServiceFactory ; using ::com::sun::star::lang::XSingleServiceFactory ; -using ::rtl::OUString ; using ::com::sun::star::xml::crypto::XSecurityEnvironment ; using ::com::sun::star::xml::crypto::XXMLSecurityContext ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx index acfcdc40b046..9e9928aa8c9a 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx @@ -85,18 +85,18 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper3< ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; //Methods from XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName + const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for XServiceInfo - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ; + static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; - static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for registry static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 97fdb27454c5..9d7029c7b212 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using ::com::sun::star::lang::XMultiServiceFactory ; using ::com::sun::star::lang::XSingleServiceFactory ; -using ::rtl::OUString ; using ::com::sun::star::xml::wrapper::XXMLElementWrapper ; using ::com::sun::star::xml::wrapper::XXMLDocumentWrapper ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx index 0dab87bc8e44..b3f123c54b92 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx @@ -67,18 +67,18 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper3< ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; //Methods from XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& ServiceName + const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for XServiceInfo - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ; + static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; - static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; //Helper for registry static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ; diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 5bac10de7c8a..8a6447dbe92f 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -35,9 +35,9 @@ namespace cssxcsax = com::sun::star::xml::csax; * The return value is NULL terminated. The application has the responsibilty to * deallocte the return value. */ -xmlChar* ous_to_xmlstr( const rtl::OUString& oustr ) +xmlChar* ous_to_xmlstr( const OUString& oustr ) { - rtl::OString ostr = rtl::OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ; + OString ostr = OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ; return xmlStrndup( ( xmlChar* )ostr.getStr(), ( int )ostr.getLength() ) ; } @@ -45,9 +45,9 @@ xmlChar* ous_to_xmlstr( const rtl::OUString& oustr ) * The return value is NULL terminated. The application has the responsibilty to * deallocte the return value. */ -xmlChar* ous_to_nxmlstr( const rtl::OUString& oustr, int& length ) +xmlChar* ous_to_nxmlstr( const OUString& oustr, int& length ) { - rtl::OString ostr = rtl::OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ; + OString ostr = OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ; length = ostr.getLength(); return xmlStrndup( ( xmlChar* )ostr.getStr(), length ) ; @@ -264,7 +264,7 @@ void SAXHelper::endDocument( void ) * XDocumentHandler -- start an xml element */ void SAXHelper::startElement( - const rtl::OUString& aName, + const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes ) throw( cssxs::SAXException , cssu::RuntimeException ) { @@ -301,7 +301,7 @@ void SAXHelper::startElement( /** * XDocumentHandler -- end an xml element */ -void SAXHelper::endElement( const rtl::OUString& aName ) +void SAXHelper::endElement( const OUString& aName ) throw( cssxs::SAXException , cssu::RuntimeException ) { xmlChar* fullname = NULL ; @@ -319,7 +319,7 @@ void SAXHelper::endElement( const rtl::OUString& aName ) /** * XDocumentHandler -- an xml element or cdata characters */ -void SAXHelper::characters( const rtl::OUString& aChars ) +void SAXHelper::characters( const OUString& aChars ) throw( cssxs::SAXException , cssu::RuntimeException ) { const xmlChar* chars = NULL ; @@ -337,7 +337,7 @@ void SAXHelper::characters( const rtl::OUString& aChars ) /** * XDocumentHandler -- ignorable xml white space */ -void SAXHelper::ignorableWhitespace( const rtl::OUString& aWhitespaces ) +void SAXHelper::ignorableWhitespace( const OUString& aWhitespaces ) throw( cssxs::SAXException , cssu::RuntimeException ) { const xmlChar* chars = NULL ; @@ -356,8 +356,8 @@ void SAXHelper::ignorableWhitespace( const rtl::OUString& aWhitespaces ) * XDocumentHandler -- preaorocessing instruction */ void SAXHelper::processingInstruction( - const rtl::OUString& aTarget, - const rtl::OUString& aData ) + const OUString& aTarget, + const OUString& aData ) throw( cssxs::SAXException , cssu::RuntimeException ) { xmlChar* target = NULL ; diff --git a/xmlsecurity/source/xmlsec/saxhelper.hxx b/xmlsecurity/source/xmlsec/saxhelper.hxx index e6c0d4e8a329..d11b3e505205 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.hxx +++ b/xmlsecurity/source/xmlsec/saxhelper.hxx @@ -52,23 +52,23 @@ class SAXHelper throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; void startElement( - const ::rtl::OUString& aName , + const OUString& aName , const com::sun::star::uno::Sequence< com::sun::star::xml::csax::XMLAttribute >& aAttributes ) throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; - void endElement( const ::rtl::OUString& aName ) + void endElement( const OUString& aName ) throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; - void characters( const ::rtl::OUString& aChars ) + void characters( const OUString& aChars ) throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; - void ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) + void ignorableWhitespace( const OUString& aWhitespaces ) throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; void processingInstruction( - const ::rtl::OUString& aTarget , - const ::rtl::OUString& aData ) + const OUString& aTarget , + const OUString& aData ) throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; void setDocumentLocator( const ::com::sun::star::uno::Reference< diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx index 987d00c6986c..86159fc53d3c 100644 --- a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx @@ -37,9 +37,9 @@ namespace xml_security { namespace serial_number_adapter { css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const &); -rtl::OUString implementationName() throw (css::uno::RuntimeException); +OUString implementationName() throw (css::uno::RuntimeException); -css::uno::Sequence< rtl::OUString > serviceNames() +css::uno::Sequence< OUString > serviceNames() throw (css::uno::RuntimeException); } } diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index fbbb16ae4595..6e5159734367 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -64,7 +64,7 @@ XMLDocumentWrapper_XmlSecImpl::XMLDocumentWrapper_XmlSecImpl( ) /* * creates the virtual root element */ - saxHelper.startElement(rtl::OUString(RTL_UTF8_USTRINGPARAM( "root" )), cssu::Sequence()); + saxHelper.startElement(OUString(RTL_UTF8_USTRINGPARAM( "root" )), cssu::Sequence()); m_pRootElement = saxHelper.getCurrentNode(); m_pCurrentElement = m_pRootElement; @@ -221,16 +221,16 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement( if (pNsDef->prefix == NULL) { pAttributeList->AddAttribute( - rtl::OUString(RTL_UTF8_USTRINGPARAM( STRXMLNS )), - rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsHref ))); + OUString(RTL_UTF8_USTRINGPARAM( STRXMLNS )), + OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsHref ))); } else { pAttributeList->AddAttribute( - rtl::OUString(RTL_UTF8_USTRINGPARAM( STRXMLNS )) - +rtl::OUString(RTL_UTF8_USTRINGPARAM( ":" )) - +rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsPrefix )), - rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsHref ))); + OUString(RTL_UTF8_USTRINGPARAM( STRXMLNS )) + +OUString(RTL_UTF8_USTRINGPARAM( ":" )) + +OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsPrefix )), + OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsHref ))); } pNsDef = pNsDef->next; @@ -243,35 +243,35 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement( const xmlChar* pAttrName = pAttr->name; xmlNsPtr pAttrNs = pAttr->ns; - rtl::OUString ouAttrName; + OUString ouAttrName; if (pAttrNs == NULL) { - ouAttrName = rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrName )); + ouAttrName = OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrName )); } else { - ouAttrName = rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrNs->prefix)) - +rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)":" )) - +rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrName )); + ouAttrName = OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrNs->prefix)) + +OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)":" )) + +OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrName )); } pAttributeList->AddAttribute( ouAttrName, - rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)(pAttr->children->content)))); + OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)(pAttr->children->content)))); pAttr = pAttr->next; } - rtl::OString sNodeName = getNodeQName(pNode); + OString sNodeName = getNodeQName(pNode); if (xHandler.is()) { xHandler->startElement( - rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )), + OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )), xAttrList); } xHandler2->startElement( - rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )), + OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )), xAttrList); } @@ -309,14 +309,14 @@ void XMLDocumentWrapper_XmlSecImpl::sendEndElement( * Email: michael.mi@sun.com ******************************************************************************/ { - rtl::OString sNodeName = getNodeQName(pNode); + OString sNodeName = getNodeQName(pNode); if (xHandler.is()) { - xHandler->endElement(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) ))); + xHandler->endElement(OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) ))); } - xHandler2->endElement(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) ))); + xHandler2->endElement(OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) ))); } void XMLDocumentWrapper_XmlSecImpl::sendNode( @@ -363,27 +363,27 @@ void XMLDocumentWrapper_XmlSecImpl::sendNode( { if (xHandler.is()) { - xHandler->characters(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) ))); + xHandler->characters(OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) ))); } - xHandler2->characters(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) ))); + xHandler2->characters(OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) ))); } else if (type == XML_PI_NODE) { if (xHandler.is()) { xHandler->processingInstruction( - rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->name)) )), - rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) ))); + OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->name)) )), + OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) ))); } xHandler2->processingInstruction( - rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->name)) )), - rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) ))); + OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->name)) )), + OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) ))); } } -rtl::OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode) const +OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode) const /****** XMLDocumentWrapper_XmlSecImpl/getNodeQName **************************** * * NAME @@ -406,15 +406,15 @@ rtl::OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode) * Email: michael.mi@sun.com ******************************************************************************/ { - rtl::OString sNodeName((const sal_Char*)pNode->name); + OString sNodeName((const sal_Char*)pNode->name); if (pNode->ns != NULL) { xmlNsPtr pNs = pNode->ns; if (pNs->prefix != NULL) { - rtl::OString sPrefix((const sal_Char*)pNs->prefix); - sNodeName = sPrefix+rtl::OString(":")+sNodeName; + OString sPrefix((const sal_Char*)pNs->prefix); + sNodeName = sPrefix+OString(":")+sNodeName; } } @@ -744,7 +744,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement( ) * the current node as well. */ saxHelper.endElement( - rtl::OUString( + OUString( RTL_UTF8_USTRINGPARAM ( (sal_Char*)(pOldCurrentElement->name) ))); @@ -776,11 +776,11 @@ sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrentElementEmpty( ) return rc; } -rtl::OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getNodeName( const cssu::Reference< cssxw::XXMLElementWrapper >& node ) +OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getNodeName( const cssu::Reference< cssxw::XXMLElementWrapper >& node ) throw (cssu::RuntimeException) { xmlNodePtr pNode = checkElement(node); - return rtl::OUString(RTL_UTF8_USTRINGPARAM ( (sal_Char*)pNode->name )); + return OUString(RTL_UTF8_USTRINGPARAM ( (sal_Char*)pNode->name )); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::clearUselessData( @@ -957,7 +957,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endDocument( ) { } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const rtl::OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs ) throw (cssxs::SAXException, cssu::RuntimeException) { sal_Int32 nLength = xAttribs->getLength(); @@ -972,26 +972,26 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const rtl::OUString& _startElement(aName, aAttributes); } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const rtl::OUString& aName ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const OUString& aName ) throw (cssxs::SAXException, cssu::RuntimeException) { saxHelper.endElement(aName); m_pCurrentElement = saxHelper.getCurrentNode(); } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::characters( const rtl::OUString& aChars ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::characters( const OUString& aChars ) throw (cssxs::SAXException, cssu::RuntimeException) { saxHelper.characters(aChars); } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::ignorableWhitespace( const rtl::OUString& aWhitespaces ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::ignorableWhitespace( const OUString& aWhitespaces ) throw (cssxs::SAXException, cssu::RuntimeException) { saxHelper.ignorableWhitespace(aWhitespaces); } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::processingInstruction( const OUString& aTarget, const OUString& aData ) throw (cssxs::SAXException, cssu::RuntimeException) { saxHelper.processingInstruction(aTarget, aData); @@ -1014,7 +1014,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endDocument( ) { } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const rtl::OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes ) throw (cssxs::SAXException, cssu::RuntimeException) { saxHelper.startElement(aName, aAttributes); @@ -1023,53 +1023,53 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const rtl::OUString& buildIDAttr( m_pCurrentElement ); } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endElement( const rtl::OUString& aName ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endElement( const OUString& aName ) throw (cssxs::SAXException, cssu::RuntimeException) { endElement( aName ); } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_characters( const rtl::OUString& aChars ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_characters( const OUString& aChars ) throw (cssxs::SAXException, cssu::RuntimeException) { characters( aChars ); } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_ignorableWhitespace( const rtl::OUString& aWhitespaces ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_ignorableWhitespace( const OUString& aWhitespaces ) throw (cssxs::SAXException, cssu::RuntimeException) { ignorableWhitespace( aWhitespaces ); } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_processingInstruction( const OUString& aTarget, const OUString& aData ) throw (cssxs::SAXException, cssu::RuntimeException) { processingInstruction( aTarget, aData ); } -void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_setDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const rtl::OUString& /*publicId*/, const rtl::OUString& /*systemId*/ ) +void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_setDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const OUString& /*publicId*/, const OUString& /*systemId*/ ) throw (cssxs::SAXException, cssu::RuntimeException) { } -rtl::OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName () +OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName () throw (cssu::RuntimeException) { - return rtl::OUString ( RTL_ASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( RTL_ASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } -sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const OUString& ServiceName ) throw (cssu::RuntimeException) { return ServiceName == SERVICE_NAME; } -cssu::Sequence< rtl::OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( ) throw (cssu::RuntimeException) { - cssu::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString ( RTL_ASCII_USTRINGPARAM ( SERVICE_NAME ) ); + cssu::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_ASCII_USTRINGPARAM ( SERVICE_NAME ) ); return aRet; } #undef SERVICE_NAME @@ -1082,17 +1082,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_creat } /* XServiceInfo */ -rtl::OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getImplementationName( ) +OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getImplementationName( ) throw (cssu::RuntimeException) { return XMLDocumentWrapper_XmlSecImpl_getImplementationName(); } -sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::supportsService( const OUString& rServiceName ) throw (cssu::RuntimeException) { return XMLDocumentWrapper_XmlSecImpl_supportsService( rServiceName ); } -cssu::Sequence< rtl::OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getSupportedServiceNames( ) throw (cssu::RuntimeException) { return XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(); diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index 1394fa6edd3e..3536a3b5054e 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -112,7 +112,7 @@ private: const xmlNodePtr pNode) const throw (com::sun::star::xml::sax::SAXException); - rtl::OString getNodeQName(const xmlNodePtr pNode) const; + OString getNodeQName(const xmlNodePtr pNode) const; sal_Int32 recursiveDelete( const xmlNodePtr pNode); @@ -150,7 +150,7 @@ public: virtual sal_Bool SAL_CALL isCurrentElementEmpty( ) throw (com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getNodeName( const com::sun::star::uno::Reference< + virtual OUString SAL_CALL getNodeName( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node ) throw (com::sun::star::uno::RuntimeException); @@ -192,20 +192,20 @@ public: throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const rtl::OUString& aName ) + virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const rtl::OUString& aChars ) + virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData ) + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) @@ -219,48 +219,48 @@ public: throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL _startElement( - const rtl::OUString& aName, + const OUString& aName, const com::sun::star::uno::Sequence< com::sun::star::xml::csax::XMLAttribute >& aAttributes ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL _endElement( const rtl::OUString& aName ) + virtual void SAL_CALL _endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL _characters( const rtl::OUString& aChars ) + virtual void SAL_CALL _characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL _ignorableWhitespace( const rtl::OUString& aWhitespaces ) + virtual void SAL_CALL _ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL _processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData ) + virtual void SAL_CALL _processingInstruction( const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); virtual void SAL_CALL _setDocumentLocator( sal_Int32 columnNumber, sal_Int32 lineNumber, - const rtl::OUString& publicId, - const rtl::OUString& systemId ) + const OUString& publicId, + const OUString& systemId ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); /* com::sun::star::lang::XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (com::sun::star::uno::RuntimeException); }; -rtl::OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName() +OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName() throw ( com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL +com::sun::star::uno::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( ) throw ( com::sun::star::uno::RuntimeException ); diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index d0363b38e4a9..de4570134736 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -70,24 +70,24 @@ sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Seque } -rtl::OUString XMLElementWrapper_XmlSecImpl_getImplementationName () +OUString XMLElementWrapper_XmlSecImpl_getImplementationName () throw (cssu::RuntimeException) { - return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } -sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const OUString& ServiceName ) throw (cssu::RuntimeException) { return ServiceName == SERVICE_NAME; } -cssu::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ) throw (cssu::RuntimeException) { - cssu::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + cssu::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); return aRet; } #undef SERVICE_NAME @@ -101,17 +101,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL } /* XServiceInfo */ -rtl::OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName( ) +OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName( ) throw (cssu::RuntimeException) { return XMLElementWrapper_XmlSecImpl_getImplementationName(); } -sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const rtl::OUString& rServiceName ) +sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const OUString& rServiceName ) throw (cssu::RuntimeException) { return XMLElementWrapper_XmlSecImpl_supportsService( rServiceName ); } -cssu::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames( ) +cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames( ) throw (cssu::RuntimeException) { return XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(); diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index 73b0b21ebbfc..8bc32f95b595 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -69,11 +69,11 @@ public: throw(com::sun::star::uno::RuntimeException); /* com::sun::star::lang::XServiceInfo */ - virtual rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (com::sun::star::uno::RuntimeException); public: @@ -81,13 +81,13 @@ public: void setNativeElement(const xmlNodePtr pNode); }; -rtl::OUString XMLElementWrapper_XmlSecImpl_getImplementationName() +OUString XMLElementWrapper_XmlSecImpl_getImplementationName() throw ( com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ) +com::sun::star::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ) throw ( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 43a8d6ace97f..91f2d9084dd3 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -53,8 +53,8 @@ int xmlStreamMatch( const char* uri ) //first. If this failed it would try this //again with the original escaped string. However, it does not get this far, because there //is another callback registered by libxml which claims to be able to handle this uri. - ::rtl::OUString sUri = - ::rtl::Uri::encode( ::rtl::OUString::createFromAscii( uri ), + OUString sUri = + ::rtl::Uri::encode( OUString::createFromAscii( uri ), rtl_UriCharClassUric, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8); xInputStream = m_xUriBinding->getUriBinding( sUri ) ; if (!xInputStream.is()) @@ -62,7 +62,7 @@ int xmlStreamMatch( const char* uri ) //Try the passed in uri directly. //For old documents prior OOo 3.0. We did not use URIs then. xInputStream = m_xUriBinding->getUriBinding( - ::rtl::OUString::createFromAscii(uri)); + OUString::createFromAscii(uri)); } } if (xInputStream.is()) @@ -82,8 +82,8 @@ void* xmlStreamOpen( const char* uri ) return NULL ; //see xmlStreamMatch - ::rtl::OUString sUri = - ::rtl::Uri::encode( ::rtl::OUString::createFromAscii( uri ), + OUString sUri = + ::rtl::Uri::encode( OUString::createFromAscii( uri ), rtl_UriCharClassUric, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8); xInputStream = m_xUriBinding->getUriBinding( sUri ) ; if (!xInputStream.is()) @@ -91,7 +91,7 @@ void* xmlStreamOpen( const char* uri ) //For old documents. //try the passed in uri directly. xInputStream = m_xUriBinding->getUriBinding( - ::rtl::OUString::createFromAscii(uri)); + OUString::createFromAscii(uri)); } if( xInputStream.is() ) { diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index 0497179069ed..754239c722f5 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -246,11 +246,11 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : maHintText.Show(); // Help the user with some default values - ::rtl::OUString aTempDirURL; + OUString aTempDirURL; ::osl::File::getTempDirURL( aTempDirURL ); INetURLObject aURLObj( aTempDirURL ); aURLObj.insertName( "nss", true ); - ::rtl::OUString aNSSFolder = aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ); + OUString aNSSFolder = aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ); maEditXMLFileName.SetText( aNSSFolder + "demo-sample.xml" ); maEditBINFileName.SetText( aNSSFolder + "demo-sample.gif" ); maEditDOCFileName.SetText( aNSSFolder + "demo-sample.sxw" ); @@ -282,7 +282,7 @@ IMPL_LINK_NOARG(MyWin, CryptoCheckBoxHdl) IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl) { - rtl::OUString aDocFileName = maEditDOCFileName.GetText(); + OUString aDocFileName = maEditDOCFileName.GetText(); uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() ); @@ -296,7 +296,7 @@ IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl) IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl) { - rtl::OUString aDocFileName = maEditDOCFileName.GetText(); + OUString aDocFileName = maEditDOCFileName.GetText(); uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() );